ChangeSet@1.2332, 2006-10-24 19:05:11+02:00, mmj@tiger.local +2 -0
  Bug #23427: incompatible ABI change in 5.0.26?
  Revert 1 June change enough to restore ABI compatibility with previous
  versions.

  include/mysql.h@1.168, 2006-10-24 19:03:29+02:00, mmj@tiger.local +0 -6
    Revert patch that breaks ABI compatibility

  libmysqld/lib_sql.cc@1.121, 2006-10-24 19:03:29+02:00, mmj@tiger.local +0 -1
    Remove useless assignment.

ChangeSet@1.2331, 2006-10-23 09:48:36+02:00, jonas@perch.ndb.mysql.com +1 -0
  5.1.12 - release clone
    ndb - revert fix bug#21052 as it's wrong, and induces bus-error on node crashes

  storage/ndb/src/mgmsrv/Services.cpp@1.76, 2006-10-23 09:48:34+02:00, jonas@perch.ndb.mysql.com +1 -7
    5.1.12 - release clone
      ndb - revert fix bug#21052 as it's wrong, and induces bus-error on node crashes

ChangeSet@1.2330, 2006-10-20 20:18:44+02:00, kent@mysql.com +1 -0
  make_win_bin_dist:
    Aligned script with updated 5.0 version

  scripts/make_win_bin_dist@1.2, 2006-10-20 20:16:14+02:00, kent@mysql.com +329 -90
    Aligned script with updated 5.0 version

ChangeSet@1.2329, 2006-10-19 15:56:37+02:00, andrey@example.com +1 -0
  Fix small glitch during parsing of ALTER EVENT xyz
  with only COMMENT clause. Strangely it has manifestated itself
  only on two platforms. This is a fix for bug#23423 
  "Syntax error for "ALTER EVENT ... COMMENT ..." on just two platforms"

  sql/sql_yacc.yy@1.508, 2006-10-19 15:56:27+02:00, andrey@example.com +1 -0
    if COMMENT is used mark it as used.
    There was a missing setting to 1 of $$. If COMMENT
    was used in combinations with other clauses then it
    was passing.

ChangeSet@1.2328, 2006-10-19 16:39:24+05:00, holyfoot@mysql.com +2 -0
  libmysqld/Makefile.am  fixed

  config/ac-macros/plugins.m4@1.20, 2006-10-19 16:39:20+05:00, holyfoot@mysql.com +5 -5
    code moved to the proper place

  libmysqld/Makefile.am@1.101, 2006-10-19 16:39:20+05:00, holyfoot@mysql.com +3 -3
    "" removed

ChangeSet@1.2327, 2006-10-19 04:38:16+02:00, kent@mysql.com +1 -0
  Makefile.am:
    Quote variable in "for"-loop head, in case it can be empty.

  libmysqld/Makefile.am@1.100, 2006-10-19 04:37:29+02:00, kent@mysql.com +3 -3
    Quote variable in "for"-loop head, in case it can be empty.

ChangeSet@1.2323.1.2, 2006-10-18 18:48:38+05:00, holyfoot@mysql.com +1 -0
  letter's case fixed

  config/ac-macros/plugins.m4@1.19, 2006-10-18 18:48:35+05:00, holyfoot@mysql.com +3 -3
    x->X

ChangeSet@1.2323.1.1, 2006-10-18 17:03:37+05:00, holyfoot@mysql.com +7 -0
  bug #23369 (Embedded library can't be linked)
  Problem is that some files moved to storage/*/ still are dependent
  on sql/ code (usually use members of THD structure)
  that can get different being compiled with another #define-s
  Code added to recompile these for the embedded server

  config/ac-macros/plugins.m4@1.18, 2006-10-18 17:03:30+05:00, holyfoot@mysql.com +35 -3
    macros added to check if the storage has sql/ - dependent code

  libmysqld/Makefile.am@1.99, 2006-10-18 17:03:30+05:00, holyfoot@mysql.com +12 -2
    symlink files from storage/*/ needed to be recompiled
    with EMBEDDED_LIBRARY

  storage/federated/plug.in@1.2, 2006-10-18 17:03:30+05:00, holyfoot@mysql.com +1 -0
    ha_federated.cc uses THD structure

  storage/heap/plug.in@1.2, 2006-10-18 17:03:30+05:00, holyfoot@mysql.com +1 -0
    ha_heap.cc uses THD structure

  storage/innobase/plug.in@1.4, 2006-10-18 17:03:30+05:00, holyfoot@mysql.com +1 -0
    ha_innodb.cc uses THD structure

  storage/myisam/plug.in@1.2, 2006-10-18 17:03:31+05:00, holyfoot@mysql.com +1 -0
    ha_myisam.cc uses THD structure

  storage/myisammrg/plug.in@1.2, 2006-10-18 17:03:31+05:00, holyfoot@mysql.com +1 -0
    ha_myisammrg.cc uses THD structure

ChangeSet@1.2325, 2006-10-18 12:35:45+02:00, kent@mysql.com +1 -0
  mysql.spec.sh:
    Aligned test flags to TAR builds

  support-files/mysql.spec.sh@1.168, 2006-10-18 12:32:41+02:00, kent@mysql.com +7 -6
    Aligned test flags to TAR builds

ChangeSet@1.2324, 2006-10-18 10:07:02+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    Fix uninit variable, causing problems with auto-increment on rhas3-x86 (only found on this platform, really weird)

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.46, 2006-10-18 10:07:00+02:00, jonas@perch.ndb.mysql.com +6 -9
    Fix uninit variable, causing problems with auto-increment on rhas3-x86 (only found on this platform, really weird)

ChangeSet@1.2323, 2006-10-17 15:05:31+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - remove duplicate solution to ndb_restore_compat make_binary_distribution problem

  scripts/make_binary_distribution.sh@1.131, 2006-10-17 15:05:29+02:00, jonas@perch.ndb.mysql.com +2 -11
    ndb - remove duplicate solution to ndb_restore_compat make_binary_distribution problem

ChangeSet@1.2322, 2006-10-17 13:34:00+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - ndb_restore_compat
    Update make_binary_distribution.sh
    Make sure all files needed for testing are included

  scripts/make_binary_distribution.sh@1.130, 2006-10-17 13:33:58+02:00, jonas@perch.ndb.mysql.com +2 -0
    Make sure all files needed for testing are included

ChangeSet@1.2321, 2006-10-16 23:37:00+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - fix some ndb strict-alias problems
    found with gcc 4.0.2 on Itanium2
    (ndb_dd_* failures)

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp@1.17, 2006-10-16 23:36:56+02:00, jonas@perch.ndb.mysql.com +37 -21
    Fix some potentil alias problems

  storage/ndb/src/kernel/vm/Pool.hpp@1.9, 2006-10-16 23:36:56+02:00, jonas@perch.ndb.mysql.com +5 -1
    Fix potential alias problem

ChangeSet@1.2320, 2006-10-16 02:07:50+02:00, kent@mysql.com +2 -0
  make_binary_distribution.sh:
    Split copy of result files to avoid shell limit.
    Added copy of mysql-test/std_data/ndb_backup5{0,1}.
  configure.in:
    Look for dlopen() even if --with-mysqld-ldflags constains "-static",
    as this is not the same as the flag to "ld", it just informs
    "libtool" to link static with libraries created part of the build,
    even if there exists shared versions.

  configure.in@1.387, 2006-10-15 19:45:29+02:00, kent@mysql.com +2 -2
    Look for dlopen() even if --with-mysqld-ldflags constains "-static",
    as this is not the same as the flag to "ld", it just informs
    "libtool" to link static with libraries created part of the build,
    even if there exists shared versions.

  scripts/make_binary_distribution.sh@1.129, 2006-10-16 01:58:08+02:00, kent@mysql.com +11 -2
    Split copy of result files to avoid shell limit.
    Added copy of mysql-test/std_data/ndb_backup5{0,1}.

ChangeSet@1.2319, 2006-10-14 20:03:49+02:00, kent@mysql.com +1 -0
  Makefile.am:
    Configure flags makes "lex_hash.h" differ, don't distribute
    pregenerated file, build it after configure (bug#18888).

  sql/Makefile.am@1.162, 2006-10-14 20:00:26+02:00, kent@mysql.com +8 -8
    Configure flags makes "lex_hash.h" differ, don't distribute
    pregenerated file, build it after configure (bug#18888).

ChangeSet@1.2318, 2006-10-13 21:48:27+02:00, kent@mysql.com +1 -0
  CMakeLists.txt:
    Added mysql_upgrade target to Windows CMake build

  client/CMakeLists.txt@1.13, 2006-10-13 21:47:43+02:00, kent@mysql.com +3 -0
    Added mysql_upgrade target to Windows CMake build

ChangeSet@1.2317, 2006-10-13 10:11:18+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - fix memleak (due to incorrect merge of bug#21941)
    recommit into release-clone

  storage/ndb/src/ndbapi/NdbScanOperation.cpp@1.98, 2006-10-13 10:11:14+02:00, jonas@perch.ndb.mysql.com +2 -2
    fix missing "if" statement

ChangeSet@1.2314.1.1, 2006-10-13 03:32:38+02:00, kent@mysql.com +2 -0
  log_event.cc, sql_class.cc:
    VisualStudio needs cast from (byte*) to (const char*), 3rd arg to _db_dump_()

  sql/log_event.cc@1.247, 2006-10-13 03:30:45+02:00, kent@mysql.com +2 -2
    VisualStudio needs cast from (byte*) to (const char*), 3rd arg to _db_dump_()

  sql/sql_class.cc@1.294, 2006-10-13 03:29:55+02:00, kent@mysql.com +4 -4
    VisualStudio needs cast from (byte*) to (const char*), 3rd arg to _db_dump_()

ChangeSet@1.2315, 2006-10-12 22:42:43+02:00, joerg@trift2. +1 -0
  unittest/mytap/tap.c  :
  Do not (try to) set a signal handler action unless a signal is defined on the platform.

  unittest/mytap/tap.c@1.7, 2006-10-12 22:42:40+02:00, joerg@trift2. +13 -5
    Do not (try to) set a signal handler action unless a signal is defined on the platform.
    SIGXCPU, SIGXFSZ, SIGSYS, and SIGTRAP were reported as undefined in Netware build of 5.1.12-beta.

ChangeSet@1.2314, 2006-10-12 19:43:47+02:00, kent@mysql.com +3 -0
  thr_alarm.c, thr_lock.c, my_global.h:
    Avoid multiple define of DBUG_OFF (bug#21749)

  include/my_global.h@1.148, 2006-10-12 19:42:01+02:00, kent@mysql.com +7 -2
    Avoid multiple define of DBUG_OFF (bug#21749)

  mysys/thr_alarm.c@1.51, 2006-10-12 19:41:06+02:00, kent@mysql.com +1 -2
    Avoid multiple define of DBUG_OFF (bug#21749)

  mysys/thr_lock.c@1.54, 2006-10-12 19:41:32+02:00, kent@mysql.com +1 -1
    Avoid multiple define of DBUG_OFF (bug#21749)

ChangeSet@1.2311.1.1, 2006-10-12 18:26:17+02:00, kent@mysql.com +1 -0
  mysql.spec.sh:
    Corrected path to mysql-test directory
    Removed man1/mysql_explain_log.1

  support-files/mysql.spec.sh@1.167, 2006-10-12 18:24:26+02:00, kent@mysql.com +2 -3
    Corrected path to mysql-test directory
    Removed man1/mysql_explain_log.1

ChangeSet@1.2312, 2006-10-12 18:25:27+02:00, joerg@trift2. +4 -0
  Various tool fixes, necessary to build 5.1.12-beta on Netware.

  netware/BUILD/compile-AUTOTOOLS@1.7, 2006-10-12 18:25:23+02:00, joerg@trift2. +5 -1
    Fixes for Netware builds:
    1) The "autotools" used there have problems with changing variables in Makefiles
       after the initial setting.
    2) "storage/innobase" does not need an autotool run any more.
    3) "automake --verbose" may be able to help if new problems arise.

  netware/BUILD/compile-netware-START@1.8, 2006-10-12 18:25:23+02:00, joerg@trift2. +0 -1
    The CSV engine is now mandatory in 5.1, must not be de-configured.

  netware/BUILD/mwenv@1.17, 2006-10-12 18:25:23+02:00, joerg@trift2. +1 -1
    When testing for a possibly empty shell variable, it is mandatory to use quotes!

  netware/BUILD/nwbootstrap@1.13, 2006-10-12 18:25:23+02:00, joerg@trift2. +9 -8
    The "mwenv" file has been changed, reflect these changes here:
    1) It is no longer necessary to set the variables WINE_BUILD_DIR, BUILD_DIR, and VERSION.
    2) The handling of MYDEV there has changed, the "export" line may be indented.

ChangeSet@1.2311, 2006-10-11 15:32:32+02:00, joerg@trift2. +1 -0
  Override "read-only" permissions when doing "make distcheck".

  Docs/Makefile.am@1.61, 2006-10-11 15:32:28+02:00, joerg@trift2. +1 -1
    Override "read-only" permissions on "manual.chm".

ChangeSet@1.2310, 2006-10-11 15:53:56+04:00, ted@ted.mysql.internal +3 -0
  BUG#21524 ps.test updated to meet recent changes in SQL parser

  mysql-test/r/ps.result@1.79, 2006-10-11 15:53:52+04:00, ted@ted.mysql.internal +239 -222
    brand new ps.result recorded out of updated ps.test output

  mysql-test/t/disabled.def@1.207, 2006-10-11 15:53:53+04:00, ted@ted.mysql.internal +0 -1
    ps.test enabled anew

  mysql-test/t/ps.test@1.76, 2006-10-11 15:53:53+04:00, ted@ted.mysql.internal +51 -54
    ps.test updated to ensure FLUSH/RESET are not allowed in stored functions at both
    parse and execution time

ChangeSet@1.2301.1.2, 2006-10-10 15:26:39+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    ndb_restore Return OK even if temporary errors
      (otherwise mysql-test-run/ndb_restore can fail on really slow machines)

  storage/ndb/tools/restore/restore_main.cpp@1.46.1.1, 2006-10-10 15:26:38+02:00, jonas@perch.ndb.mysql.com +1 -2
    Return OK even if temporary errors

ChangeSet@1.2273.115.1, 2006-10-10 15:18:21+02:00, mats@romeo.(none) +2 -0
  BUG#21474 (There is a rotation before the last table map):
  Removing code to step the group log position and just stepping
  the event log position.  If the group log position were stepped
  one time too many, it might be that the group starts at a position
  that is not possible, e.g., at a Rows_log_event, or between an
  Intvar_log_event and the following associated Query_log_event.

  sql/log_event.cc@1.244.2.1, 2006-10-10 15:18:03+02:00, mats@romeo.(none) +13 -13
    Removing code to step the group log position and just stepping
    the event log position.  If the group log position were stepped
    one time too many, it might be that the group starts at a position
    that is not possible, e.g., at a Rows_log_event, or between an
    Intvar_log_event and the following associated Query_log_event.

  sql/slave.cc@1.285.1.1, 2006-10-10 15:18:03+02:00, mats@romeo.(none) +16 -11
    Removing code to step the group log position and just stepping
    the event log position when executing a Format_description_log_event.
    If the group log position were stepped one time too many, it might be that the group starts at a position
    that is not possible, e.g., at a Rows_log_event, or between an
    Intvar_log_event and the following associated Query_log_event.

ChangeSet@1.2273.109.12, 2006-10-10 14:58:40+02:00, mats@romeo.(none) +1 -0
  Fixes to make replication team tree build on Windows.

  sql/log_event.cc@1.244.1.2, 2006-10-10 14:58:17+02:00, mats@romeo.(none) +3 -3
    Adding casts to make it compile on Windows.

ChangeSet@1.2273.109.11, 2006-10-10 12:29:24+02:00, mats@romeo.(none) +1 -0
  Fix to make it build on all platforms.
  Replacing C++ code with C code in a C file.

  mysys/mf_iocache2.c@1.30, 2006-10-10 12:29:21+02:00, mats@romeo.(none) +2 -1
    There shall not be C++ code in C files.

ChangeSet@1.1810.2123.12, 2006-10-10 09:47:30+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#23107
    fix bug in test prg

  ndb/test/ndbapi/testTimeout.cpp@1.11.3.2, 2006-10-10 09:47:29+02:00, jonas@perch.ndb.mysql.com +2 -2
    ndb - bug#23107
      fix bug in test prg

ChangeSet@1.1810.2123.11, 2006-10-10 09:37:54+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#23107
    fix bug in handling of inactive timeout for scan, when all is delivered

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.73.29.1, 2006-10-10 09:37:52+02:00, jonas@perch.ndb.mysql.com +23 -0
    1) set timeout if all scans are at api
    2) Use c_appl_timeout_value when getting scan timeout

  ndb/test/ndbapi/testTimeout.cpp@1.11.3.1, 2006-10-10 09:37:52+02:00, jonas@perch.ndb.mysql.com +49 -1
    test program

ChangeSet@1.2273.109.10, 2006-10-09 13:47:06+02:00, mats@romeo.(none) +1 -0
  Post-merge fixes.

  mysql-test/t/view.test@1.165.1.1, 2006-10-09 13:47:02+02:00, mats@romeo.(none) +10 -10
    Switching to using symbolic error numbers instead of numbers.
    Using numbers caused test to fail.

ChangeSet@1.1810.2193.6, 2006-10-08 22:34:32+05:00, svoj@mysql.com +1 -0
  After merge fix.

  sql/ha_myisammrg.cc@1.59.6.1, 2006-10-08 22:34:30+05:00, svoj@mysql.com +1 -1
    After merge fix.

ChangeSet@1.1616.2781.1, 2006-10-06 15:17:42+05:00, svoj@mysql.com +1 -0
  BUG#22937 - Valgrind failure in 'merge' test (ha_myisammrg.cc:329)
  
  This is addition to fix for bug21617. Valgrind reports an error when
  opening merge table that has underlying tables with less indexes than
  in a merge table itself.
  
  Copy at most min(file->keys, table->key_parts) elements from rec_per_key array.
  This fixes problems when merge table and subtables have different number of keys.

  sql/ha_myisammrg.cc@1.51.1.12, 2006-10-06 15:17:41+05:00, svoj@mysql.com +14 -1
    Copy at most min(file->keys, table->key_parts) elements from rec_per_key array.
    This fixes problems when merge table and subtables have different number of keys.

ChangeSet@1.1616.2780.3, 2006-10-06 14:47:58+05:00, svoj@mysql.com +2 -0
  Per discussion with pekka removed non-deterministic test case for bug#21381.

  mysql-test/r/ndb_update.result@1.2.1.4, 2006-10-06 14:47:57+05:00, svoj@mysql.com +0 -8
    Per discussion with pekka removed non-deterministic test case for bug#21381.

  mysql-test/t/ndb_update.test@1.2.1.5, 2006-10-06 14:47:57+05:00, svoj@mysql.com +0 -9
    Per discussion with pekka removed non-deterministic test case for bug#21381.

ChangeSet@1.2181.185.3, 2006-10-06 10:17:02+02:00, mats@romeo.(none) +5 -0
  BUG#19459 (BINLOG RBR command does not lock tables correctly causing
  crash for, e.g., NDB):
  
  Before, mysqlbinlog printed table map events as a separate statement, so
  when executing the event, the opened table was subsequently closed
  when the statement ended. Instead, the row-based events that make up
  a statement are now printed as *one* BINLOG statement, which means
  that the table maps and the following *_rows_log_event events are
  executed fully before the statement ends.
  
  Changing implementation of BINLOG statement to be able to read the 
  emitted format, which now consists of several chunks of BASE64-encoded
  data.

  client/mysqlbinlog.cc@1.130.1.1, 2006-10-06 10:16:56+02:00, mats@romeo.(none) +29 -6
    Using IO_CACHE to print events instead of directly to file.
    Factoring out code to write event header and base64 representation into
    separate function.

  mysys/mf_iocache2.c@1.29, 2006-10-06 10:16:56+02:00, mats@romeo.(none) +1 -1
    Correcting name in documentation.

  sql/log_event.cc@1.226.2.1, 2006-10-06 10:16:57+02:00, mats@romeo.(none) +370 -205
    Adding class Write_on_release_cache that holds an IO_CACHE and that
    will write contents of IO_CACHE to a designated file on destruction.
    
    Changing signature of event printing functions print_header() and print_base64()
    to write to IO_CACHE and changing *all* calls in those functions in accordance.
    This means that all printing functions now print to an IO_CACHE instead of to a file,
    and that the IO_CACHE is then copied to the file.
    
    The print() function have the same signature as before, but since it is
    using print_header() and print_base64(), the data will now be printed
    to an IO_CACHE and then copied to the file.
    
    Changing row-based replication events to incrementally build one
    BINLOG statement for all events making up a statement.

  sql/log_event.h@1.133.2.3, 2006-10-06 10:16:57+02:00, mats@romeo.(none) +26 -4
    Changing signature of event printing functions print_header() and
    print_base64() to write to an IO_CACHE instead of a file.
    
    Changing row-based replication events to incrementally build one
    BINLOG statement for all events making up a statement.
    
    Adding a head_cache and a body_cache to cache statement comment 
    and statement body respectively. In addition, the head_cache is used
    when printing other events than the RBR events.

  sql/sql_binlog.cc@1.3, 2006-10-06 10:16:57+02:00, mats@romeo.(none) +91 -40
    Changing code to be able to decode several pieces of base64-encoded data
    for a BINLOG statement. The BINLOG statement now consists of several pieces
    of BASE64-encoded data, so once a block has been decoded and executed, the
    next block has to be read from the statement until there is no more
    data to read.

ChangeSet@1.2273.109.8, 2006-10-06 08:41:34+02:00, mats@romeo.(none) +1 -0
  Fix to build on 64-bit systems where sizeof(unsigned long long)
  > sizeof(unsigned long).

  sql/log.cc@1.234.2.3, 2006-10-06 08:41:31+02:00, mats@romeo.(none) +4 -7
    Replacing enum constant that contained an unsigned long long constant
    on some platforms with a macro (an enumeration constant is limited
    to the range of values covered by signed or unsigned long).

ChangeSet@1.2273.113.6, 2006-10-06 11:11:47+05:00, svoj@mysql.com +1 -0
  Addition to fix for bug#10974. Fixed spelling.

  mysql-test/r/windows.result@1.2.1.2, 2006-10-06 11:11:44+05:00, svoj@mysql.com +1 -1
    Addition to fix for bug#10974. Fixed spelling.

ChangeSet@1.1810.2193.3, 2006-10-06 11:03:14+05:00, svoj@mysql.com +1 -0
  Addition to fix for bug#10974. Fixed spelling.

  sql/share/errmsg.txt@1.42.1.32, 2006-10-06 11:03:12+05:00, svoj@mysql.com +1 -1
    Addition to fix for bug#10974. Fixed spelling.

ChangeSet@1.1616.2780.2, 2006-10-06 10:54:47+05:00, svoj@mysql.com +2 -0
  Addition to fix for bug#10974. Fixed spelling.

  sql/share/english/errmsg.txt@1.70.34.1, 2006-10-06 10:54:46+05:00, svoj@mysql.com +1 -1
    Addition to fix for bug#10974. Fixed spelling.

  mysql-test/r/merge.result@1.32.1.11, 2006-10-06 10:54:46+05:00, svoj@mysql.com +4 -4
    Addition to fix for bug#10974. Fixed spelling.

ChangeSet@1.2273.109.7, 2006-10-05 22:16:19+02:00, mats@romeo.(none) +2 -0
  Post-merge fixes.

  sql/log.cc@1.234.2.2, 2006-10-05 22:16:13+02:00, mats@romeo.(none) +10 -10
    Post-merge fixes.

  sql/sql_insert.cc@1.226.2.2, 2006-10-05 22:16:14+02:00, mats@romeo.(none) +1 -1
    Post-merge fixes.

ChangeSet@1.2273.113.4, 2006-10-06 00:22:41+05:00, svoj@mysql.com +1 -0
  After merge fix.

  mysql-test/r/ndb_update.result@1.10, 2006-10-06 00:22:39+05:00, svoj@mysql.com +1 -1
    After merge fix.

ChangeSet@1.1616.2779.1, 2006-10-05 18:23:53+05:00, svoj@mysql.com +3 -0
  BUG#21381 - Engine not notified about multi-table UPDATE IGNORE
  
  Though this is not storage engine specific problem, I was able to
  repeat this problem with BDB and NDB engines only. That was the
  reason to add a test case into ndb_update.test. As a result
  different bad things could happen.
  
  BDB has removed duplicate rows which is not expected.
  NDB returns an error.
  
  For multi table update notify storage engine about UPDATE IGNORE
  as it is done in single table UPDATE.

  mysql-test/r/ndb_update.result@1.2.1.3, 2006-10-05 18:23:51+05:00, svoj@mysql.com +8 -0
    A test case for bug#21381.

  mysql-test/t/ndb_update.test@1.2.1.4, 2006-10-05 18:23:51+05:00, svoj@mysql.com +9 -0
    A test case for bug#21381.

  sql/sql_update.cc@1.83.2.74, 2006-10-05 18:23:51+05:00, svoj@mysql.com +6 -0
    For multi table update notify storage engine about UPDATE IGNORE
    as it is done in single table UPDATE.

ChangeSet@1.2301, 2006-10-05 14:25:18+02:00, jonas@perch.ndb.mysql.com +7 -0
  ndb - bug#17929
    guess which scan type to use in handler

  sql/ha_ndbcluster.cc@1.357, 2006-10-05 14:25:16+02:00, jonas@perch.ndb.mysql.com +26 -4
    Add guessing of scan type when starting full-table-scan

  storage/ndb/include/ndbapi/NdbDictionary.hpp@1.85, 2006-10-05 14:25:16+02:00, jonas@perch.ndb.mysql.com +10 -0
    Add methods to check properties of a bitmap of columns

  storage/ndb/include/ndbapi/NdbScanOperation.hpp@1.43, 2006-10-05 14:25:16+02:00, jonas@perch.ndb.mysql.com +2 -1
    Add DiskScanFlag

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.152, 2006-10-05 14:25:16+02:00, jonas@perch.ndb.mysql.com +53 -0
    Add aggregate of #disk columns

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp@1.69, 2006-10-05 14:25:16+02:00, jonas@perch.ndb.mysql.com +1 -1
    Add #disk columns

  storage/ndb/src/ndbapi/NdbScanOperation.cpp@1.97, 2006-10-05 14:25:16+02:00, jonas@perch.ndb.mysql.com +6 -1
    Add disk scan flag

  storage/ndb/tools/delete_all.cpp@1.21, 2006-10-05 14:25:16+02:00, jonas@perch.ndb.mysql.com +12 -1
    Add tupscan/diskscan to delete_all

ChangeSet@1.1810.2192.1, 2006-10-05 18:51:13+10:00, stewart@willster.(none) +7 -0
  BUG#13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd
  
  smaller patch for 5.0.
  
  complete patch going to 5.1 due to more intrusiveness for 'list sessions' etc

  ndb/include/mgmapi/mgmapi.h@1.42.13.1, 2006-10-05 18:51:06+10:00, stewart@willster.(none) +13 -0
    add internal get_fd to use in test

  ndb/include/util/InputStream.hpp@1.3.2.1, 2006-10-05 18:51:06+10:00, stewart@willster.(none) +1 -0
    - add this weird startover member to SocketInputStream
        - this helps work out if we've read a newline yet and should start inserting
             into buffer from the start

  ndb/src/common/util/InputStream.cpp@1.3.2.1, 2006-10-05 18:51:06+10:00, stewart@willster.(none) +24 -15
    remove evil, add more.
    
    keep track internally we've retrieved a newline yet (m_startover)

  ndb/src/common/util/Parser.cpp@1.6.5.1, 2006-10-05 18:51:06+10:00, stewart@willster.(none) +20 -15
    change way detecting of NoLine
    
    remove some trailing whitespace that was uglying the place up a bit

  ndb/src/common/util/socket_io.cpp@1.7.3.1, 2006-10-05 18:51:06+10:00, stewart@willster.(none) +14 -14
    Always retrieve data from the OS so that we instantly get EOF on disconnect
    and don't end up spinning looking for a newline.

  ndb/src/mgmapi/mgmapi.cpp@1.44.27.1, 2006-10-05 18:51:07+10:00, stewart@willster.(none) +15 -11
    add internal ndb_mgm_get_fd() for internal testing
    
    handle 'node status' a bit better

  ndb/test/ndbapi/testMgm.cpp@1.4.2.1, 2006-10-05 18:51:07+10:00, stewart@willster.(none) +27 -0
    Add test for MgmApiSession disconnection (mgmd at 100%)
    
    not fully automated due to smaller patch for 5.0
    
    will be complete in 5.1

ChangeSet@1.2245.12.1, 2006-10-05 10:46:14+02:00, mats@romeo.(none) +4 -0
  I had forgotten to delete an already disabled line of C++ code.
  ---
  BUG#20265 (Replication of CREATE-SELECT does not work correctly):
  Fixing bug by making binary log handle statement transactions.
  The binary log transaction cache can now be truncated to remove 
  events inserted during this statement or transaction. Also, the
  binary log participate in XA transaction handling, although not
  as a full 2pc resource.

  mysql-test/r/binlog_row_mix_innodb_myisam.result@1.13, 2006-10-05 10:46:09+02:00, mats@romeo.(none) +0 -18
    Result change

  sql/log.cc@1.222.2.1, 2006-10-05 10:46:09+02:00, mats@romeo.(none) +404 -133
    Making change to binlog_end_trans() to support that it can be called
    for statement transactions as well.

  sql/sql_class.h@1.304.9.1, 2006-10-05 10:46:09+02:00, mats@romeo.(none) +1 -0
    Adding function THD::binlog_start_trans_and_stmt() to start a real transaction
    (if necessary) and also a statement transaction.

  sql/sql_insert.cc@1.214.2.1, 2006-10-05 10:46:09+02:00, mats@romeo.(none) +97 -55
    I had forgotten to delete this line (it was already disabled using //;
    this line was not needed because we do the empty() every time
    we write to the binlog (in MYSQL_LOG::write());
    t/binlog_stm_binlog.test already tests that the empty() indeed happens
    for INSERT DELAYED.
    ---
    Changes to use the statement transactions that the binary log now can handle.

ChangeSet@1.2273.63.27, 2006-10-05 00:41:29-07:00, brian@zim.(none) +16 -0
  Added license information display to output of plugins schema, and tagged all plugins with GPL flag. 

  include/mysql/plugin.h@1.21, 2006-10-05 00:41:25-07:00, brian@zim.(none) +10 -0
    Adding license information.

  plugin/fulltext/plugin_example.c@1.14, 2006-10-05 00:41:25-07:00, brian@zim.(none) +1 -0
    License

  sql/ha_ndbcluster.cc@1.348.4.22, 2006-10-05 00:41:25-07:00, brian@zim.(none) +1 -0
    License

  sql/ha_partition.cc@1.77, 2006-10-05 00:41:25-07:00, brian@zim.(none) +1 -0
    License

  sql/handler.h@1.244, 2006-10-05 00:41:25-07:00, brian@zim.(none) +1 -0
    License

  sql/log.cc@1.237, 2006-10-05 00:41:25-07:00, brian@zim.(none) +1 -0
    License

  sql/sql_show.cc@1.366, 2006-10-05 00:41:25-07:00, brian@zim.(none) +17 -0
    Additional PLUIN display information

  storage/archive/ha_archive.cc@1.108, 2006-10-05 00:41:25-07:00, brian@zim.(none) +1 -0
    License information added

  storage/blackhole/ha_blackhole.cc@1.44, 2006-10-05 00:41:25-07:00, brian@zim.(none) +1 -0
    License information added

  storage/csv/ha_tina.cc@1.64.1.1, 2006-10-05 00:41:25-07:00, brian@zim.(none) +1 -0
    License Information

  storage/example/ha_example.cc@1.46, 2006-10-05 00:41:25-07:00, brian@zim.(none) +1 -0
    License information

  storage/federated/ha_federated.cc@1.83, 2006-10-05 00:41:25-07:00, brian@zim.(none) +1 -0
    License Information

  storage/heap/ha_heap.cc@1.102, 2006-10-05 00:41:25-07:00, brian@zim.(none) +1 -0
    License Information

  storage/innobase/handler/ha_innodb.cc@1.305, 2006-10-05 00:41:26-07:00, brian@zim.(none) +1 -0
    License Information

  storage/myisam/ha_myisam.cc@1.198, 2006-10-05 00:41:26-07:00, brian@zim.(none) +1 -0
    License Information

  storage/myisammrg/ha_myisammrg.cc@1.103, 2006-10-05 00:41:26-07:00, brian@zim.(none) +1 -0
    License Information

ChangeSet@1.2298.1.1, 2006-10-05 00:56:06+10:00, stewart@willster.(none) +1 -0
  BUG#20809 mysqldump does not backup TS and LG information correctly
  
  restore of the dump (ndb_dd_dump test) was failing for probably a merge problem. fixed now.

  client/mysqldump.c@1.252, 2006-10-05 00:56:02+10:00, stewart@willster.(none) +3 -1
    fix query to make dump restorable

ChangeSet@1.1810.2127.6, 2006-10-04 02:38:31+10:00, stewart@willster.(none) +12 -0
  BUG#21154 The management server consumes too much CPU
  BUG#13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd
  
  fix the actual problem (getting incomplete line of data), introduced with previous
  improvement.
  
  also add list sessions, get session and get session id to mgmapi to allow
  the implementation of a test case for this exact problem.

  ndb/include/mgmapi/mgmapi.h@1.42.12.1, 2006-10-04 02:38:27+10:00, stewart@willster.(none) +13 -0
    Add internal ndb_mgm_get_fd for use in test case

  ndb/include/mgmapi/mgmapi_debug.h@1.7.1.1, 2006-10-04 02:38:27+10:00, stewart@willster.(none) +14 -0
    Add internal get_session_id and get_session 

  ndb/include/util/InputStream.hpp@1.3.1.1, 2006-10-04 02:38:28+10:00, stewart@willster.(none) +10 -0
    - fix warning when building with gcc 4
    - add mutex to be UNLOCKED when blocking (e.g. select(2))
      - this means we can list sessions in a threadsafe way
    - add this weird startover member to SocketInputStream
    	- this helps work out if we've read a newline yet and should start inserting
    	  into buffer from the start

  ndb/include/util/Parser.hpp@1.3.2.1, 2006-10-04 02:38:28+10:00, stewart@willster.(none) +4 -1
    add mutex to context to pass down to SocketInputStream

  ndb/include/util/socket_io.h@1.3.1.1, 2006-10-04 02:38:28+10:00, stewart@willster.(none) +6 -1
    readln_socket accepts mutex to UNLOCK around select(2)

  ndb/src/common/util/InputStream.cpp@1.3.1.1, 2006-10-04 02:38:28+10:00, stewart@willster.(none) +24 -15
    remove evil, add more.
    
    As 

  ndb/src/common/util/Parser.cpp@1.6.4.1, 2006-10-04 02:38:28+10:00, stewart@willster.(none) +23 -15
    set mutex for passing down to InputStream to unlock on select(2).
    
    change way detecting of NoLine

  ndb/src/common/util/socket_io.cpp@1.7.2.1, 2006-10-04 02:38:28+10:00, stewart@willster.(none) +20 -15
    unlock a mutex around select so that we can nicely do thread safe
    listing of sessions.
    
    Always retrieve data from the OS so that we instantly get EOF on disconnect
    and don't end up spinning looking for a newline.

  ndb/src/mgmapi/mgmapi.cpp@1.44.26.1, 2006-10-04 02:38:28+10:00, stewart@willster.(none) +115 -11
    add internal ndb_mgm_get_fd() for internal testing
    
    internal/debug:
    ndb_mgm_get_session_id
    
    ndb_mgm_get_session

  ndb/src/mgmsrv/Services.cpp@1.45.30.1, 2006-10-04 02:38:28+10:00, stewart@willster.(none) +153 -9
    Add list sessions, get session id and get session.
    
    introduce a session mutex

  ndb/src/mgmsrv/Services.hpp@1.13.7.1, 2006-10-04 02:38:28+10:00, stewart@willster.(none) +16 -2
    Add list and get session.
    
    Add session_id to MgmApiSession.

  ndb/test/ndbapi/testMgm.cpp@1.4.1.1, 2006-10-04 02:38:28+10:00, stewart@willster.(none) +45 -0
    Add test for MgmApiSession disconnection (mgmd at 100%)

ChangeSet@1.2273.109.5, 2006-10-03 18:48:50+05:00, bar@mysql.com +9 -0
  Automerge fix: "Out of range value" error message adjusted to 5.1. 

  mysql-test/r/log_tables.result@1.11, 2006-10-03 18:48:45+05:00, bar@mysql.com +2 -2
    Automerge fix: "Out of range value" error message adjusted to 5.1. 

  mysql-test/r/ps_2myisam.result@1.49, 2006-10-03 18:48:45+05:00, bar@mysql.com +12 -12
    Automerge fix: "Out of range value" error message adjusted to 5.1. 

  mysql-test/r/ps_3innodb.result@1.52, 2006-10-03 18:48:45+05:00, bar@mysql.com +12 -12
    Automerge fix: "Out of range value" error message adjusted to 5.1. 

  mysql-test/r/ps_4heap.result@1.48, 2006-10-03 18:48:45+05:00, bar@mysql.com +12 -12
    Automerge fix: "Out of range value" error message adjusted to 5.1. 

  mysql-test/r/ps_5merge.result@1.49, 2006-10-03 18:48:45+05:00, bar@mysql.com +24 -24
    Automerge fix: "Out of range value" error message adjusted to 5.1. 

  mysql-test/r/ps_7ndb.result@1.47, 2006-10-03 18:48:45+05:00, bar@mysql.com +12 -12
    Automerge fix: "Out of range value" error message adjusted to 5.1. 

  mysql-test/r/round.result@1.2, 2006-10-03 18:48:45+05:00, bar@mysql.com +16 -16
    Automerge fix: "Out of range value" error message adjusted to 5.1. 

  mysql-test/r/select.result@1.137, 2006-10-03 18:48:45+05:00, bar@mysql.com +1 -11
    Automerge fix: "Out of range value" error message adjusted to 5.1. 

  mysql-test/r/strict_autoinc_4bdb.result@1.2, 2006-10-03 18:48:45+05:00, bar@mysql.com +3 -3
    Automerge fix: "Out of range value" error message adjusted to 5.1. 

ChangeSet@1.2273.114.2, 2006-10-03 17:07:30+04:00, kroki@moonlight.intranet +2 -0
  After merge fix.

  mysql-test/extra/rpl_tests/rpl_insert_id.test@1.14, 2006-10-03 17:07:27+04:00, kroki@moonlight.intranet +17 -0
    Enhance test for bug#21726 to cover statement-based replication of
    function calls.

  sql/sql_class.cc@1.293, 2006-10-03 17:07:27+04:00, kroki@moonlight.intranet +3 -1
    Fix typo and whitespace.

ChangeSet@1.2273.109.4, 2006-10-03 17:05:33+05:00, bar@mysql.com +2 -0
  sql_yacc.yy:
    After merge fix.
  field.cc:
    After merge fix

  sql/field.cc@1.342.2.2, 2006-10-03 17:05:00+05:00, bar@mysql.com +0 -1
    After merge fix

  sql/sql_yacc.yy@1.502.1.4, 2006-10-03 17:05:11+05:00, bar@mysql.com +1 -1
    After merge fix.

ChangeSet@1.2273.113.1, 2006-10-03 16:50:15+05:00, svoj@mysql.com +2 -0
  BUG#22924 - windows test fails with wrong errno
  
  Fixed a test case according to fix for bug10974.

  mysql-test/r/windows.result@1.2.1.1, 2006-10-03 16:50:12+05:00, svoj@mysql.com +1 -1
    Fixed a test case according to fix for bug10974.

  mysql-test/t/windows.test@1.2.1.1, 2006-10-03 16:50:12+05:00, svoj@mysql.com +1 -1
    Fixed a test case according to fix for bug10974.

ChangeSet@1.1810.2189.4, 2006-10-03 12:44:59+03:00, jani@ua141d10.elisa.omakaista.fi +1 -0
  Added a missing breakpoint. This could cause
  wrong results in order by in some rare cases.

  sql/filesort.cc@1.105.1.2, 2006-10-03 12:44:57+03:00, jani@ua141d10.elisa.omakaista.fi +1 -0
    Added a missing breakpoint. This could cause
    wrong results in order by in some rare cases.

ChangeSet@1.1810.2166.9, 2006-10-03 13:38:16+04:00, kroki@moonlight.intranet +9 -0
  Fix for the patch for bug#21726: Incorrect result with multiple
  invocations of LAST_INSERT_ID.
  
  Reding of LAST_INSERT_ID inside stored function wasn't noted by caller,
  and no LAST_INSERT_ID_EVENT was issued for binary log.
  
  The solution is to add THD::last_insert_id_used_bin_log, which is much
  like THD::last_insert_id_used, but is reset only for upper-level
  statements.  This new variable is used to issue LAST_INSERT_ID_EVENT.

  mysql-test/r/rpl_insert_id.result@1.12.3.7, 2006-10-03 13:38:12+04:00, kroki@moonlight.intranet +18 -0
    For bug#21726, add result for statement-based replication of function
    calls.

  mysql-test/t/rpl_insert_id.test@1.13.1.8, 2006-10-03 13:38:12+04:00, kroki@moonlight.intranet +17 -0
    For bug#21726, add test case for statement-based replication of function
    calls.

  sql/item_func.cc@1.270.1.36, 2006-10-03 13:38:12+04:00, kroki@moonlight.intranet +1 -0
    Set THD::last_insert_id_used_bin_log for issuing of LAST_INSERT_ID_EVENT.

  sql/log.cc@1.158.12.1, 2006-10-03 13:38:13+04:00, kroki@moonlight.intranet +2 -2
    Issue LAST_INSERT_ID_EVENT if THD::last_insert_id_used_bin_log is set.

  sql/set_var.cc@1.125.13.2, 2006-10-03 13:38:13+04:00, kroki@moonlight.intranet +1 -0
    Set THD::last_insert_id_used_bin_log for issuing of LAST_INSERT_ID_EVENT.

  sql/sql_class.cc@1.223.1.26, 2006-10-03 13:38:13+04:00, kroki@moonlight.intranet +6 -4
    Initialize THD::last_insert_id_used_bin_log.
    Fix typo, add whitespace.

  sql/sql_class.h@1.230.38.2, 2006-10-03 13:38:13+04:00, kroki@moonlight.intranet +11 -2
    Add THD::last_insert_id_used_bin_log.

  sql/sql_parse.cc@1.426.1.156, 2006-10-03 13:38:13+04:00, kroki@moonlight.intranet +1 -0
    Reset THD::last_insert_id_used_bin_log for upper-level statements.

  sql/sql_select.cc@1.312.97.2, 2006-10-03 13:38:13+04:00, kroki@moonlight.intranet +4 -4
    Set THD::last_insert_id_used_bin_log for issuing of LAST_INSERT_ID_EVENT.

ChangeSet@1.2273.96.14, 2006-10-03 11:05:25+05:00, ramil@mysql.com +1 -0
  after-merge fix: warning adjusted.

  mysql-test/r/type_bit.result@1.22, 2006-10-03 11:05:21+05:00, ramil@mysql.com +1 -1
    after-merge fix: warning adjusted.

ChangeSet@1.1810.2137.19, 2006-10-02 23:05:52-04:00, scottlee@calico.site +1 -0
  Back port change from 5.1 that adds the Windows database files to the source package.
  This is needed for WiX pacakging.

  Makefile.am@1.68.1.17, 2006-10-02 23:05:48-04:00, scottlee@calico.site +10 -0
    Back port change from 5.1 that adds the Windows database files to the source package.
    This is needed for WiX pacakging.

ChangeSet@1.1616.2766.15, 2006-10-03 00:48:26+02:00, msvensson@shellback.(none) +2 -0
  Add ATTRIBUTE_FORMAT_FPTR macro for setting format specifier also on function pointers
  This was available from gcc 3.1, so diable it before that
  Update m_ctype.h to use the new macro

  include/m_ctype.h@1.102.1.7, 2006-10-03 00:48:23+02:00, msvensson@shellback.(none) +1 -1
    Use macro ATTRIBUTE_FORMAT_FPTR on function pointer

  include/my_global.h@1.47.1.63, 2006-10-03 00:48:23+02:00, msvensson@shellback.(none) +13 -3
    Add ATTRIBUTE_FORMAT_FPTR macro for setting format specifier also on function pointers
    This was available from gcc 3.1, so diable it before that

ChangeSet@1.1810.2189.2, 2006-10-02 15:15:16+02:00, bteam@mysql.com +1 -0
  Raise version number

  configure.in@1.245.1.154, 2006-10-02 15:15:02+02:00, bteam@mysql.com +2 -2
    Raise version number

ChangeSet@1.2181.185.2, 2006-10-02 15:08:40+02:00, mats@romeo.(none) +2 -0
  BUG#19459 (BINLOG RBR command does not lock tables correctly causing
  crash for, e.g., NDB):
  Adding new function my_b_copy_to_file() to copy an IO_CACHE to a file.

  include/my_sys.h@1.199.1.1, 2006-10-02 15:08:36+02:00, mats@romeo.(none) +1 -0
    Adding new function my_b_copy_to_file() to copy an IO_CACHE to a file.

  mysys/mf_iocache2.c@1.28, 2006-10-02 15:08:36+02:00, mats@romeo.(none) +47 -0
    Adding new function my_b_copy_to_file() to copy an IO_CACHE to a file.

ChangeSet@1.2181.185.1, 2006-10-02 15:05:05+02:00, mats@romeo.(none) +5 -0
  BUG#19459 (BINLOG RBR command does not lock tables correctly causing
  crash for, e.g., NDB):
  Submitting patch to base64_decode() adding extra parameter.

  include/base64.h@1.9, 2006-10-02 15:04:54+02:00, mats@romeo.(none) +2 -1
    Adding parameter to base64_decode() to return the position just after
    the string that was decoded.

  mysys/base64.c@1.12.1.1, 2006-10-02 15:04:54+02:00, mats@romeo.(none) +46 -17
    Adding comment to base64_decode().
    Adding parameter to base64_decode() to return the position just after
    the string that was decoded.

  sql/share/errmsg.txt@1.109.1.1, 2006-10-02 15:04:54+02:00, mats@romeo.(none) +3 -0
    Adding error message.

  storage/ndb/src/mgmapi/mgmapi.cpp@1.64.1.1, 2006-10-02 15:04:55+02:00, mats@romeo.(none) +1 -1
    Parameters to base64_decode() changed.

  unittest/mysys/base64-t.c@1.5, 2006-10-02 15:04:55+02:00, mats@romeo.(none) +1 -1
    Parameters to base64_decode() changed.

ChangeSet@1.1616.2766.14, 2006-10-02 14:05:36+02:00, msvensson@neptunus.(none) +1 -0
  Remove faulty merge 

  mysql-test/r/ctype_utf8.result@1.45.1.32, 2006-10-02 14:05:35+02:00, msvensson@neptunus.(none) +0 -1
    Remove faulty merge 

ChangeSet@1.1616.2766.13, 2006-10-02 13:53:10+02:00, msvensson@neptunus.(none) +1 -0
  When compiling with qcc on QNC the define __GNUC__will be set although it doesn't support full GNU syntax
   - disable __attribute__ when using qcc

  include/my_global.h@1.47.1.62, 2006-10-02 13:53:06+02:00, msvensson@neptunus.(none) +3 -0
    Disable __attribute__ when compiling with qcc

ChangeSet@1.1616.2766.12, 2006-10-02 13:47:18+02:00, msvensson@neptunus.(none) +2 -0
  Remove faulty merge causing ctype_utf8 failure

  mysql-test/r/ctype_utf8.result@1.45.1.31, 2006-10-02 13:47:15+02:00, msvensson@neptunus.(none) +0 -12
    Remove faulty merge causing ctype_utf8 failure

  mysql-test/t/ctype_utf8.test@1.57.1.21, 2006-10-02 13:47:15+02:00, msvensson@neptunus.(none) +0 -17
    Remove faulty merge causing ctype_utf8 failure

ChangeSet@1.1616.2766.11, 2006-10-02 13:46:40+02:00, msvensson@neptunus.(none) +1 -0
  Fix __attribute__(A) macro (it formerly used bogus __cplusplus__ symbol)

  include/my_global.h@1.47.1.61, 2006-10-02 13:46:38+02:00, msvensson@neptunus.(none) +1 -1
    Fix __attribute__(A) macro (it formerly used bogus __cplusplus__ symbol)

ChangeSet@1.2273.108.1, 2006-10-02 13:38:06+02:00, mats@romeo.(none) +6 -0
  BUG#22550 (Replication of BIT column failing):
  Adding test case.

  mysql-test/extra/rpl_tests/rpl_row_basic.test@1.3, 2006-10-02 10:41:33+02:00, mats@romeo.(none) +0 -0
    Rename: mysql-test/include/rpl_row_basic.inc -> mysql-test/extra/rpl_tests/rpl_row_basic.test

  mysql-test/r/rpl_row_basic_11bugs.result@1.11, 2006-10-02 13:38:00+02:00, mats@romeo.(none) +21 -1
    Result change

  mysql-test/t/rpl_row_basic_11bugs.test@1.10, 2006-10-02 13:38:00+02:00, mats@romeo.(none) +21 -1
    Adding test case for bug.

  mysql-test/t/rpl_row_basic_2myisam.test@1.2, 2006-10-02 13:38:00+02:00, mats@romeo.(none) +1 -1
    Moving test include file to extra/rpl_tests

  mysql-test/t/rpl_row_basic_3innodb.test@1.2, 2006-10-02 13:38:00+02:00, mats@romeo.(none) +1 -1
    Moving test include file to extra/rpl_tests

  mysql-test/t/rpl_row_basic_7ndb.test@1.3, 2006-10-02 13:38:00+02:00, mats@romeo.(none) +1 -1
    Moving test include file to extra/rpl_tests

ChangeSet@1.2273.107.2, 2006-10-02 15:26:01+04:00, kroki@moonlight.intranet +2 -0
  Fix after manual merge: add tests from 5.0.

  mysql-test/extra/rpl_tests/rpl_insert_id.test@1.13, 2006-10-02 15:25:58+04:00, kroki@moonlight.intranet +129 -0
    Add test case for bug#21726: Incorrect result with multiple invocations
    of LAST_INSERT_ID, and 5.0 version of test case for bug#20339: stored
    procedure using LAST_INSERT_ID() does not replicate statement-based.

  mysql-test/r/rpl_insert_id.result@1.25, 2006-10-02 15:25:58+04:00, kroki@moonlight.intranet +5 -0
    Update result.

ChangeSet@1.1810.2166.8, 2006-10-02 14:28:23+04:00, kroki@moonlight.intranet +14 -0
  BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID
  
  Non-upper-level INSERTs (the ones in the body of stored procedure,
  stored function, or trigger) into a table that have AUTO_INCREMENT
  column didn't affected the result of LAST_INSERT_ID() on this level.
  
  The problem was introduced with the fix of bug 6880, which in turn was
  introduced with the fix of bug 3117, where current insert_id value was
  remembered on the first call to LAST_INSERT_ID() (bug 3117) and was
  returned from that function until it was reset before the next
  _upper-level_ statement (bug 6880).
  
  The fix for bug#21726 brings back the behaviour of version 4.0, and
  implements the following: remember insert_id value at the beginning
  of the statement or expression (which at that point equals to
  the first insert_id value generated by the previous statement), and
  return that remembered value from LAST_INSERT_ID() or @@LAST_INSERT_ID.
  
  Thus, the value returned by LAST_INSERT_ID() is not affected by values
  generated by current statement, nor by LAST_INSERT_ID(expr) calls in
  this statement.
  
  Version 5.1 does not have this bug (it was fixed by WL 3146).

  mysql-test/r/rpl_insert_id.result@1.12.3.6, 2006-10-02 14:28:18+04:00, kroki@moonlight.intranet +129 -0
    Add results for bug#21726: Incorrect result with multiple invocations
    of LAST_INSERT_ID, and bug#20339: stored procedure using LAST_INSERT_ID()
    does not replicate statement-based.

  mysql-test/t/rpl_insert_id.test@1.13.1.7, 2006-10-02 14:28:18+04:00, kroki@moonlight.intranet +112 -0
    Add test cases for bug#21726: Incorrect result with multiple invocations
    of LAST_INSERT_ID, and bug#20339: stored procedure using LAST_INSERT_ID()
    does not replicate statement-based.

  sql/item_func.cc@1.270.1.35, 2006-10-02 14:28:18+04:00, kroki@moonlight.intranet +32 -3
    Add implementation of Item_func_last_insert_id::fix_fields(), where we
    remember in THD::current_insert_id the first value generated during
    execution of the previous statement, which is returned then from
    Item_func_last_insert_id::val_int().

  sql/item_func.h@1.136.17.1, 2006-10-02 14:28:18+04:00, kroki@moonlight.intranet +1 -0
    Add declaration of Item_func_last_insert_id::fix_fields().

  sql/log_event.cc@1.174.1.38, 2006-10-02 14:28:18+04:00, kroki@moonlight.intranet +0 -1
    Do not set THD::last_insert_id_used on LAST_INSERT_ID_EVENT.  Though we
    know the statement will call LAST_INSERT_ID(), it wasn't called yet.

  sql/set_var.cc@1.125.13.1, 2006-10-02 14:28:18+04:00, kroki@moonlight.intranet +11 -2
    In sys_var_last_insert_id::value_ptr() remember in
    THD::current_insert_id the first value generated during execution of the
    previous statement, and return this value for @@LAST_INSERT_ID.

  sql/sql_class.cc@1.223.1.25, 2006-10-02 14:28:19+04:00, kroki@moonlight.intranet +15 -1
    Reset THD::last_insert_id_used after each statement execution.

  sql/sql_class.h@1.230.38.1, 2006-10-02 14:28:19+04:00, kroki@moonlight.intranet +33 -15
    Rather then remember current insert_id value on first invocation of
    THD::insert_id(), remember it in Item_func_last_insert_id::fix_fields(),
    sys_var_last_insert_id::value_ptr(), or mysql_execute_command().
    Remove THD::insert_id(), as it lost its value now.

  sql/sql_insert.cc@1.146.36.1, 2006-10-02 14:28:19+04:00, kroki@moonlight.intranet +3 -5
    THD::insert_id() is removed, use THD::last_insert_id directly.

  sql/sql_load.cc@1.78.1.21, 2006-10-02 14:28:19+04:00, kroki@moonlight.intranet +4 -8
    THD::insert_id() is removed, using THD::last_insert_id directly is OK.

  sql/sql_parse.cc@1.426.1.155, 2006-10-02 14:28:19+04:00, kroki@moonlight.intranet +15 -1
    Remember in THD::current_insert_id first generated insert id value of
    the previous statement in mysql_execute_command().
    No need to reset THD::last_insert_id_used in
    mysql_reset_thd_for_next_command(), it will be reset after each
    statement.

  sql/sql_select.cc@1.312.97.1, 2006-10-02 14:28:19+04:00, kroki@moonlight.intranet +9 -2
    If "IS NULL" is replaced with "= <LAST_INSERT_ID>", use right value,
    which is THD::current_insert_id, and also set THD::last_insert_id_used
    to issue binary log LAST_INSERT_ID_EVENT.

  sql/sql_update.cc@1.154.20.1, 2006-10-02 14:28:20+04:00, kroki@moonlight.intranet +2 -2
    THD::insert_id() is removed, use THD::last_insert_id directly.

  tests/mysql_client_test.c@1.167.1.42, 2006-10-02 14:28:20+04:00, kroki@moonlight.intranet +39 -1
    Add test case for bug#21726: Incorrect result with multiple invocations
    of LAST_INSERT_ID.

ChangeSet@1.1810.2157.6, 2006-10-02 14:17:41+05:00, bar@mysql.com +1 -0
  bug#6147 - fixing ndb test results (forgot to include into the main commit)

  mysql-test/r/ps_7ndb.result@1.26.1.20, 2006-10-02 14:17:38+05:00, bar@mysql.com +24 -24
    bug#6147 - fixing ndb test results (forgot to include into the main commit)

ChangeSet@1.2273.85.5, 2006-10-02 10:07:46+02:00, msvensson@neptunus.(none) +1 -0
  Don't run crash_commit_before under valgrind

  mysql-test/t/crash_commit_before.test@1.3, 2006-10-02 10:07:44+02:00, msvensson@neptunus.(none) +5 -0
    Don't run crash_commit_before under valgrind

ChangeSet@1.2273.106.2, 2006-10-01 11:17:59-07:00, brian@zim.(none) +2 -0
  This  patch makes ndbcluster_hton not static. I have a second patch for ndbcluster_hton to be static, but I want to talk to Jonas first. 

  sql/ha_ndbcluster.cc@1.348.4.21, 2006-10-01 11:17:56-07:00, brian@zim.(none) +1 -1
    Can't quite make  it static yet :)

  sql/ha_ndbcluster_binlog.h@1.18, 2006-10-01 11:17:57-07:00, brian@zim.(none) +2 -1
    Moving bad extern replacement

ChangeSet@1.2273.98.4, 2006-09-30 19:08:13-07:00, brian@zim.(none) +1 -0
  Merge fix. 

  sql/sql_cursor.cc@1.10, 2006-09-30 19:08:11-07:00, brian@zim.(none) +1 -1
    Merge bit...

ChangeSet@1.2273.105.3, 2006-09-30 18:31:13-07:00, brian@zim.(none) +9 -0
  This patch updates to remove most global hton needs. Cleans up wrong message in partition. 

  mysql-test/r/partition.result@1.57.1.1, 2006-09-30 18:31:09-07:00, brian@zim.(none) +3 -3
    Updated results

  sql/ha_ndbcluster.cc@1.348.4.20, 2006-09-30 18:31:09-07:00, brian@zim.(none) +1 -1
    Updated hton

  sql/ha_partition.cc@1.76, 2006-09-30 18:31:10-07:00, brian@zim.(none) +1 -1
    Removed need for global internal hton.

  sql/handler.cc@1.273, 2006-09-30 18:31:10-07:00, brian@zim.(none) +3 -5
    Removed need for global mrg

  sql/mysql_priv.h@1.441.3.2, 2006-09-30 18:31:10-07:00, brian@zim.(none) +0 -4
    Updated needs for global variables.

  sql/mysqld.cc@1.578.1.2, 2006-09-30 18:31:10-07:00, brian@zim.(none) +1 -2
    Removed needs around hton

  sql/partition_info.cc@1.24, 2006-09-30 18:31:10-07:00, brian@zim.(none) +1 -2
    Removed bug.... aka what happens if tables are neither?

  sql/share/errmsg.txt@1.122.4.1, 2006-09-30 18:31:10-07:00, brian@zim.(none) +3 -3
    Made error message more generic. 

  sql/sql_cache.cc@1.98, 2006-09-30 18:31:10-07:00, brian@zim.(none) +2 -2
    Removed specific hton reference

ChangeSet@1.2273.105.2, 2006-09-30 12:49:46-07:00, brian@zim.(none) +27 -0
  This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch).
  Partitioning now has a flag to allow disabling of engines from being compatible with partitioning. Cleaned up heap naming convention on panic call. 

  include/heap.h@1.29, 2006-09-30 12:49:42-07:00, brian@zim.(none) +1 -0
    Added new function

  sql/ha_ndbcluster.cc@1.348.4.19, 2006-09-30 12:49:42-07:00, brian@zim.(none) +31 -17
    Updated hanlderton functions

  sql/ha_ndbcluster_binlog.cc@1.84, 2006-09-30 12:49:42-07:00, brian@zim.(none) +4 -2
    Updated handlerton functions.

  sql/handler.cc@1.272, 2006-09-30 12:49:42-07:00, brian@zim.(none) +59 -32
    Updated handlerton functions. 

  sql/handler.h@1.240.2.2, 2006-09-30 12:49:42-07:00, brian@zim.(none) +39 -33
    Updated hanlderton functions

  sql/log.cc@1.234, 2006-09-30 12:49:42-07:00, brian@zim.(none) +15 -14
    Updated handlerton functions

  sql/mysql_priv.h@1.441.3.1, 2006-09-30 12:49:42-07:00, brian@zim.(none) +0 -8
    Updated handlerton functions

  sql/mysqld.cc@1.578.1.1, 2006-09-30 12:49:42-07:00, brian@zim.(none) +9 -0
    Added Legacy handlerton functions

  sql/partition_info.cc@1.23, 2006-09-30 12:49:42-07:00, brian@zim.(none) +1 -2
    Added flag support for marking engines not compatible with partitioning

  sql/sql_cursor.cc@1.7.1.1, 2006-09-30 12:49:42-07:00, brian@zim.(none) +6 -6
    Updated hanlderton functions

  sql/sql_show.cc@1.363.1.1, 2006-09-30 12:49:42-07:00, brian@zim.(none) +1 -1
    Updated hanlderton functions

  sql/sql_tablespace.cc@1.8, 2006-09-30 12:49:43-07:00, brian@zim.(none) +2 -2
    Update for handlerton functions

  storage/archive/ha_archive.cc@1.106, 2006-09-30 12:49:43-07:00, brian@zim.(none) +4 -3
    Update for hanlderton functions

  storage/archive/ha_archive.h@1.50.1.2, 2006-09-30 12:49:43-07:00, brian@zim.(none) +0 -2
    Update for handlerton functions

  storage/blackhole/ha_blackhole.cc@1.43, 2006-09-30 12:49:43-07:00, brian@zim.(none) +1 -1
    Update for handlerton functions

  storage/csv/ha_tina.cc@1.60.2.3, 2006-09-30 12:49:43-07:00, brian@zim.(none) +6 -3
    Update for handlerton functions

  storage/csv/ha_tina.h@1.23, 2006-09-30 12:49:43-07:00, brian@zim.(none) +0 -2
    Update for handlerton functions

  storage/federated/ha_federated.cc@1.82, 2006-09-30 12:49:43-07:00, brian@zim.(none) +17 -16
    Updated for handlerton functions

  storage/federated/ha_federated.h@1.39, 2006-09-30 12:49:43-07:00, brian@zim.(none) +0 -3
    Updated for handlerton functions

  storage/heap/ha_heap.cc@1.101, 2006-09-30 12:49:43-07:00, brian@zim.(none) +7 -1
    Update for handlerton functions

  storage/heap/hp_panic.c@1.7, 2006-09-30 12:49:43-07:00, brian@zim.(none) +3 -3
    Update of function name

  storage/heap/hp_test1.c@1.17, 2006-09-30 12:49:43-07:00, brian@zim.(none) +1 -1
    Update of function name

  storage/heap/hp_test2.c@1.27, 2006-09-30 12:49:43-07:00, brian@zim.(none) +2 -2
    Update of function name.

  storage/innobase/handler/ha_innodb.cc@1.295.5.2, 2006-09-30 12:49:43-07:00, brian@zim.(none) +104 -75
    Update of function name

  storage/innobase/handler/ha_innodb.h@1.126.2.2, 2006-09-30 12:49:43-07:00, brian@zim.(none) +15 -8
    Update of function name

  storage/myisam/ha_myisam.cc@1.195.1.2, 2006-09-30 12:49:43-07:00, brian@zim.(none) +9 -2
    Update of function name. 

  storage/myisammrg/ha_myisammrg.cc@1.102, 2006-09-30 12:49:43-07:00, brian@zim.(none) +13 -9
    Update of function name

ChangeSet@1.1810.2096.42, 2006-09-30 02:00:04-06:00, tsmith@siva.hindu.god +1 -0
  Fix __attribute__(A) macro (it formerly used bogus __cplusplus__ symbol)

  include/my_global.h@1.96.1.30, 2006-09-30 02:00:01-06:00, tsmith@siva.hindu.god +1 -1
    Change __cplusplus__ to __cplusplus in #define __attribute__(A) macro

ChangeSet@1.2273.104.2, 2006-09-30 11:58:45+04:00, dlenev@mockturtle.local +1 -0
  After merge fix. Removed method which is no longer used.

  sql/sql_trigger.cc@1.69, 2006-09-30 11:58:43+04:00, dlenev@mockturtle.local +0 -32
    After merge fix. Removed method which is no longer used.

ChangeSet@1.2273.96.5, 2006-09-30 01:21:27-06:00, tsmith@siva.hindu.god +4 -0
  Post-merge fix.  New error ER_NON_INSERTABLE_TABLE put at end of errmsg.txt, means that the error number in 5.1 is 1573, while in 5.0 it is 1471.

  mysql-test/r/ctype_ucs.result@1.50.1.2, 2006-09-30 01:21:23-06:00, tsmith@siva.hindu.god +2 -2
    Post-merge fix

  mysql-test/r/ctype_utf8.result@1.98.1.7, 2006-09-30 01:21:23-06:00, tsmith@siva.hindu.god +0 -13
    Post-merge fix

  mysql-test/t/ctype_utf8.test@1.89.1.7, 2006-09-30 01:21:23-06:00, tsmith@siva.hindu.god +0 -17
    Post-merge fix

  mysql-test/t/view.test@1.160.2.3, 2006-09-30 01:21:23-06:00, tsmith@siva.hindu.god +10 -10
    Post-merge fix

ChangeSet@1.1616.2717.5, 2006-09-29 19:28:16-07:00, jimw@rama.(none) +1 -0
  Disable __attribute__ entirely on g++ < 3.4. (Bug #2717)

  include/my_global.h@1.47.15.1, 2006-09-29 19:27:38-07:00, jimw@rama.(none) +15 -10
    Disable __attribute__ on g++ < 3.4. There are actually some forms of it that
    are supported, but rather than create more ATTRIBUTE_<foo> macros to handle
    them, it is easier to just disable them all. We will catch the compiler warnings
    with more recent versions of g++.
    

ChangeSet@1.2273.105.1, 2006-09-29 17:19:02-07:00, brian@zim.(none) +24 -0
  This removes the passing of global hton to engine instance. 

  sql/ha_ndbcluster.cc@1.348.4.18, 2006-09-29 17:18:57-07:00, brian@zim.(none) +6 -5
    Removed global hton

  sql/ha_ndbcluster.h@1.152, 2006-09-29 17:18:57-07:00, brian@zim.(none) +1 -1
    Removed global hton need

  sql/ha_partition.cc@1.75, 2006-09-29 17:18:57-07:00, brian@zim.(none) +9 -7
    Removed global hton

  sql/ha_partition.h@1.28, 2006-09-29 17:18:57-07:00, brian@zim.(none) +2 -2
    Removed global hton

  sql/handler.cc@1.271, 2006-09-29 17:18:57-07:00, brian@zim.(none) +4 -4
    Removed global hton

  sql/handler.h@1.240.2.1, 2006-09-29 17:18:57-07:00, brian@zim.(none) +1 -1
    Removed global hton

  storage/archive/ha_archive.cc@1.105, 2006-09-29 17:18:57-07:00, brian@zim.(none) +9 -5
    Removed global hton

  storage/archive/ha_archive.h@1.50.1.1, 2006-09-29 17:18:57-07:00, brian@zim.(none) +1 -1
    Global hton removed

  storage/blackhole/ha_blackhole.cc@1.42, 2006-09-29 17:18:57-07:00, brian@zim.(none) +6 -4
    Global removed hton

  storage/blackhole/ha_blackhole.h@1.10, 2006-09-29 17:18:57-07:00, brian@zim.(none) +1 -1
    Global hton removal

  storage/csv/ha_tina.cc@1.60.2.2, 2006-09-29 17:18:58-07:00, brian@zim.(none) +9 -5
    Global hton removal

  storage/csv/ha_tina.h@1.22, 2006-09-29 17:18:58-07:00, brian@zim.(none) +1 -1
    Removed global removed

  storage/example/ha_example.cc@1.45, 2006-09-29 17:18:58-07:00, brian@zim.(none) +9 -5
    Global removed hton

  storage/example/ha_example.h@1.15, 2006-09-29 17:18:58-07:00, brian@zim.(none) +1 -1
    Global removed hton

  storage/federated/ha_federated.cc@1.81, 2006-09-29 17:18:58-07:00, brian@zim.(none) +8 -5
    Global removed hton

  storage/federated/ha_federated.h@1.38, 2006-09-29 17:18:58-07:00, brian@zim.(none) +1 -1
    Global removed hton

  storage/heap/ha_heap.cc@1.100, 2006-09-29 17:18:58-07:00, brian@zim.(none) +9 -5
    Global removed hton

  storage/heap/ha_heap.h@1.47, 2006-09-29 17:18:58-07:00, brian@zim.(none) +1 -1
    Global removed hton

  storage/innobase/handler/ha_innodb.cc@1.295.5.1, 2006-09-29 17:18:58-07:00, brian@zim.(none) +7 -4
    Global removed hton

  storage/innobase/handler/ha_innodb.h@1.126.2.1, 2006-09-29 17:18:58-07:00, brian@zim.(none) +1 -1
    Removed global hton

  storage/myisam/ha_myisam.cc@1.195.1.1, 2006-09-29 17:18:58-07:00, brian@zim.(none) +11 -9
    Globally removed hton

  storage/myisam/ha_myisam.h@1.77, 2006-09-29 17:18:58-07:00, brian@zim.(none) +1 -1
    Globally removed hton

  storage/myisammrg/ha_myisammrg.cc@1.101, 2006-09-29 17:18:58-07:00, brian@zim.(none) +5 -4
    Globally removed hton

  storage/myisammrg/ha_myisammrg.h@1.46, 2006-09-29 17:18:58-07:00, brian@zim.(none) +1 -1
    Globaly removed hton

ChangeSet@1.1810.2186.1, 2006-09-29 12:52:48-06:00, tsmith@siva.hindu.god +2 -0
  WL #3516: MySQL Enterprise: implement Version Display Specification
  
  Print version_comment after server version in:
  mysql.cc:  Welcome message and 'status' command output
  log.cc: Top of log files

  client/mysql.cc@1.199.1.21, 2006-09-29 12:52:45-06:00, tsmith@siva.hindu.god +44 -10
    Add server_version_string() function to return a buffer with the server version and version_comment combined.
    Use server_version_string() instead of mysql_get_server_info() for Welcome! message and 'status' command

  sql/log.cc@1.158.1.37, 2006-09-29 12:52:45-06:00, tsmith@siva.hindu.god +7 -4
    MYSQL_LOG::open():
    - print MYSQL_COMPILATION_COMMENT after the server_version at the top of log files

ChangeSet@1.2273.63.18, 2006-09-29 21:05:12+04:00, dlenev@mockturtle.local +2 -0
  After merge fixes.

  mysql-test/r/sp.result@1.230, 2006-09-29 21:05:09+04:00, dlenev@mockturtle.local +1 -1
    After merge fix.

  mysql-test/t/sp.test@1.209, 2006-09-29 21:05:09+04:00, dlenev@mockturtle.local +26 -19
    After merge fixes. Restored test for bug 21002 which has mysteriously
    disappeared from 5.1 tree.

ChangeSet@1.2273.95.6, 2006-09-29 20:42:37+04:00, sergefp@mysql.com +2 -0
  BUG#14940: Update test results

  mysql-test/r/greedy_optimizer.result@1.9, 2006-09-29 20:42:33+04:00, sergefp@mysql.com +8 -8
    BUG#14940: Update test results

  mysql-test/r/order_by.result@1.56, 2006-09-29 20:42:33+04:00, sergefp@mysql.com +4 -4
    BUG#14940: Update test results

ChangeSet@1.1810.2184.2, 2006-09-29 21:36:17+05:00, svoj@mysql.com +1 -0
  Fixed that max_zfile_size was incorrectly calculated on big-endian boxes.
  Was introduced with patch for bug#21675.

  sql/ha_archive.cc@1.60.7.1, 2006-09-29 21:36:16+05:00, svoj@mysql.com +11 -1
    Fixed that max_zfile_size was incorrectly calculated on big-endian boxes.
    Was introduced with patch for bug#21675.

ChangeSet@1.2255.81.2, 2006-09-29 18:26:57+04:00, sergefp@mysql.com +1 -0
  Remove empty line

  sql/sql_select.cc@1.430.1.2, 2006-09-29 18:26:53+04:00, sergefp@mysql.com +0 -1
    Remove empty line

ChangeSet@1.1616.2144.200, 2006-09-29 19:00:52+05:00, svoj@mysql.com +2 -0
  Fix a test case according to fix for bug#10974.

  mysql-test/r/lowercase_table3.result@1.5.1.2, 2006-09-29 19:00:51+05:00, svoj@mysql.com +1 -1
    Fix a test case according to fix for bug#10974.

  mysql-test/t/lowercase_table3.test@1.6.1.3, 2006-09-29 19:00:51+05:00, svoj@mysql.com +1 -1
    Fix a test case according to fix for bug#10974.

ChangeSet@1.2273.101.1, 2006-09-29 09:12:23-04:00, cmiller@zippy.cornsilk.net +2 -0
  Update from Stefan.  2006-09-29  msg id <451BEF1.4030506@mysql.com>

  mysql-test/r/partition.result@1.58, 2006-09-29 09:12:20-04:00, cmiller@zippy.cornsilk.net +3 -3
    Altered results after errmsg update.

  sql/share/errmsg.txt@1.127, 2006-09-29 09:12:21-04:00, cmiller@zippy.cornsilk.net +13 -4
    Update from Stefan.  2006-09-29  msg id <451BEF1.4030506@mysql.com>

ChangeSet@1.2273.95.4, 2006-09-29 15:10:20+02:00, gkodinov@dl145s.mysql.com +2 -0
  merge fixes

  mysql-test/t/view.test@1.165, 2006-09-29 15:09:52+02:00, gkodinov@dl145s.mysql.com +10 -10
    moved the new error message last

  sql/share/errmsg.txt@1.125.1.2, 2006-09-29 15:09:52+02:00, gkodinov@dl145s.mysql.com +2 -2
    moved the new error message last

ChangeSet@1.2255.81.1, 2006-09-29 15:58:47+04:00, sergefp@mysql.com +4 -0
  BUG#14940: Slow join order is chosen: [2nd commit with post-review fixes]
  - Re-worked the prev_record_reads() function to return the lower bound of
    number of different table access scans that will be performed.

  mysql-test/r/join.result@1.41, 2006-09-29 15:58:44+04:00, sergefp@mysql.com +28 -0
    BUG#14940: testcase

  mysql-test/t/join.test@1.35, 2006-09-29 15:58:44+04:00, sergefp@mysql.com +21 -0
    BUG#14940: testcase

  sql/sql_select.cc@1.430.1.1, 2006-09-29 15:58:44+04:00, sergefp@mysql.com +98 -13
    BUG#14940: Slow join order is chosen: 
    - Re-worked the prev_record_reads() function to return the lower bound of
      number of different table access scans that will be performed.

  sql/sql_select.h@1.111, 2006-09-29 15:58:44+04:00, sergefp@mysql.com +14 -0
    BUG#14940: Slow join order is chosen:
    - Added comments in struct POSITION
    - Added POSITION::ref_depend_map: bitmap of tables that the table access
      method depends on.

ChangeSet@1.1810.2157.4, 2006-09-29 16:29:39+05:00, bar@mysql.com +2 -0
  Bug#21263 mysql client XML output does not distinguish between NULL and string 'NULL'
    
    Fix: "mysql --xml" now print NULL values the same way that "mysqldump --xml" does:
    
      <field name="name" xsi:nil="true" />
    
    to distinguish from empty strings:
    
      <field name="name"></field>
    
    and from string "NULL":
    
      <field name="name">NULL</field>

  client/mysql.cc@1.199.15.1, 2006-09-29 16:29:33+05:00, bar@mysql.com +8 -3
    Fixing to print NULLs differently from empty strings

  mysql-test/r/client_xml.result@1.4, 2006-09-29 16:29:34+05:00, bar@mysql.com +1 -1
    Fixing test result accordingly

ChangeSet@1.1810.2157.3, 2006-09-29 16:24:11+05:00, bar@mysql.com +3 -0
  Bug#21620 ALTER TABLE affects other columns
    Problem: for character sets having mbmaxlen==2,
    any ALTER TABLE changed TEXT column type to MEDIUMTEXT,
    due to wrong "internal length to create length" formula.
    Fix: removing rounding code introduced in early 4.1 time,
    which is not correct anymore.

  mysql-test/r/ctype_gbk.result@1.4, 2006-09-29 16:24:06+05:00, bar@mysql.com +10 -0
    Adding test case

  mysql-test/t/ctype_gbk.test@1.5, 2006-09-29 16:24:06+05:00, bar@mysql.com +10 -0
    Adding test case

  sql/field.cc@1.256.30.1, 2006-09-29 16:24:06+05:00, bar@mysql.com +1 -1
    Fixing "internal length to create length" formula.
    

ChangeSet@1.2273.54.8, 2006-09-29 13:23:33+02:00, istruewing@chilla.local +2 -0
  Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
  Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
  Merge from 5.0.
  Changed auto_increment handling to the 5.1 pattern.

  mysql-test/r/delayed.result@1.13, 2006-09-29 13:23:30+02:00, istruewing@chilla.local +1 -1
    Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
    Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
    Merge from 5.0.
    Updated the test result.

  sql/sql_insert.cc@1.223.2.2, 2006-09-29 13:23:30+02:00, istruewing@chilla.local +49 -38
    Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
    Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
    Merge from 5.0.
    Changed auto_increment handling to the 5.1 pattern.

ChangeSet@1.1810.2157.2, 2006-09-29 16:15:57+05:00, bar@mysql.com +3 -0
  Bug#19960 Inconsistent results when joining InnoDB tables using partial UTF8 indexes
    Adding a multibyte-aware VARCHAR copying function, to put correct column prefix,
    taking in account number of characters (instead just limiting on number of bytes).
    For example, for a KEY(col(3)) on a UTF8 column when copying the string 'foo bar foo',
    we should put only 3 leftmost characters: 'foo'.
    9 characters were incorrectly put before this fix.

  mysql-test/r/ctype_utf8.result@1.85.7.1, 2006-09-29 16:15:52+05:00, bar@mysql.com +18 -0
    Adding test case

  mysql-test/t/ctype_utf8.test@1.84.6.1, 2006-09-29 16:15:52+05:00, bar@mysql.com +20 -0
    Adding test case

  sql/field_conv.cc@1.52.1.5, 2006-09-29 16:15:52+05:00, bar@mysql.com +17 -1
    Adding multibyte aware copy function for VARCHAR

ChangeSet@1.1810.2078.20, 2006-09-29 12:27:21+04:00, dlenev@mockturtle.local +1 -0
  Fixed test-case after merge (removed duplicate part).

  mysql-test/t/sp.test@1.174.1.28, 2006-09-29 12:27:18+04:00, dlenev@mockturtle.local +0 -11
    Fixed test-case after merge (removed duplicate part).

ChangeSet@1.1810.2182.3, 2006-09-28 20:15:58-07:00, jimw@rama.(none) +2 -0
  Fix merge of __attribute__ cleanup.

  include/my_sys.h@1.178.2.8, 2006-09-28 20:15:55-07:00, jimw@rama.(none) +1 -1
    Fix bad merge

  sql/set_var.cc@1.125.5.23, 2006-09-28 20:15:56-07:00, jimw@rama.(none) +2 -2
    Fix bad __attribute__ usage.

ChangeSet@1.1810.2183.1, 2006-09-28 21:40:43-04:00, cmiller@zippy.cornsilk.net +1 -0
  Fixed bad fix for a bad merge.

  mysql-test/r/ctype_utf8.result@1.85.5.8, 2006-09-28 21:40:40-04:00, cmiller@zippy.cornsilk.net +0 -1
    Fixed bad fix for a bad merge.

ChangeSet@1.1810.2166.7, 2006-09-29 01:35:11+04:00, evgen@moonbone.local +1 -0
  view.test:
    After merge fix
  TAG: clone-5.0.26-build

  mysql-test/t/view.test@1.126.1.40, 2006-09-29 01:34:46+04:00, evgen@moonbone.local +10 -10
    After merge fix

ChangeSet@1.1810.2181.1, 2006-09-29 01:00:18+04:00, evgen@moonbone.local +6 -0
  Fixed bug#5505: Wrong error message on INSERT into a view
  
  On an INSERT into an updatable but non-insertable view an error message was
  issued stating the view being not updatable. This can lead to a confusion of a
  user.
  
  A new error message is introduced. Is is showed when a user tries to insert
  into a non-insertable view.

  mysql-test/r/view.result@1.138.20.1, 2006-09-29 01:00:02+04:00, evgen@moonbone.local +17 -10
    Added the test case for bug#5505: Wrong error message on INSERT into a view
    Corrected a few test cases after fixing bug#5505

  mysql-test/t/view.test@1.126.18.1, 2006-09-29 01:00:05+04:00, evgen@moonbone.local +22 -10
    Added the test case for bug#5505: Wrong error message on INSERT into a view
    Corrected a few test cases after fixing bug#5505

  sql/share/errmsg.txt@1.42.20.1, 2006-09-29 01:00:06+04:00, evgen@moonbone.local +3 -0
    Fixed bug#5505: Wrong error message on INSERT into a view
    Added the ER_NON_INSERTABLE_TABLE error definition.

  sql/sql_base.cc@1.235.71.2, 2006-09-29 00:59:58+04:00, evgen@moonbone.local +4 -1
    Fixed bug#5505: Wrong error message on INSERT into a view
    The update_non_unique_table_error() function now issues proper
    error for an INSERT.

  sql/sql_insert.cc@1.146.1.56, 2006-09-29 01:00:00+04:00, evgen@moonbone.local +2 -2
    Fixed bug#5505: Wrong error message on INSERT into a view
    Issue the ER_NON_INSERTABLE_TABLE error instead of the 
    ER_NON_UPDATABLE_TABLE on insert into a view.

  sql/sql_view.cc@1.78.11.2, 2006-09-29 01:00:01+04:00, evgen@moonbone.local +1 -1
    Fixed bug#5505: Wrong error message on INSERT into a view
    Issue the ER_NON_INSERTABLE_TABLE error instead of the
    ER_NON_UPDATABLE_TABLE on insert into a view.

ChangeSet@1.2273.71.9, 2006-09-29 01:36:17+05:00, svoj@mysql.com +2 -0
  After merge fix.

  mysql-test/r/merge.result@1.57, 2006-09-29 01:36:14+05:00, svoj@mysql.com +1 -1
    After merge fix.

  mysql-test/t/merge.test@1.47, 2006-09-29 01:36:14+05:00, svoj@mysql.com +1 -0
    After merge fix.

ChangeSet@1.1616.2770.4, 2006-09-28 23:47:49+04:00, dlenev@mockturtle.local +1 -0
  Fix for bug#22338 "Valgrind warning: uninitialized variable in
  create_tmp_table()".
  
  The fix for bug 21787 "COUNT(*) + ORDER BY + LIMIT returns wrong
  result" introduced valgrind warnings which occured during execution
  of information_schema.test and sp-prelocking.test in version 5.0.
  There were no user visible effects.
  
  The latter fix made create_tmp_table() dependant on
  THD::lex::current_select value. Valgrind warnings occured when this
  function was executed and THD::lex::current_select member pointed
  to uninitialized SELECT_LEX instance.
  
  This fix tries to remove this dependancy by moving some logic
  outside of create_tmp_table() function.

  sql/sql_select.cc@1.216.136.3, 2006-09-28 23:47:48+04:00, dlenev@mockturtle.local +24 -19
    create_tmp_table():
      Moved code which is responsible for determining if optimization
      which pushes down LIMIT clause to temporary table creation is
      applicable out of this function.
      Such move made this function independant of THD::lex::current_select
      value and removed valgrind warnings which occured in cases when this
      member pointed to uninitialized SELECT_LEX object (particularly these
      warnings occured in sp-prelocking.test and information_schema.test
      in 5.0). This seems like a better solution than trying to force this
      pointer always to point to relevant select because:
      - In some cases when we use create_tmp_table() there are no relevant
        SELECT_LEX object (we use it just to create temporary table/object).
      - There is only one place in code where we call this funciton and
        where this optimization can be enabled. And in this place we
        already have some logic which tries to determine if it is applicable.

ChangeSet@1.1810.2179.1, 2006-09-28 15:45:17-04:00, cmiller@zippy.cornsilk.net +2 -0
  Fixed incorrect merge of gluh's reversion of B-g#21432.

  mysql-test/r/ctype_utf8.result@1.85.5.7, 2006-09-28 15:45:14-04:00, cmiller@zippy.cornsilk.net +0 -12
    Removed test that should have been reverted with gluh's reversion of 
    B-g#21432.

  mysql-test/t/ctype_utf8.test@1.84.4.7, 2006-09-28 15:45:15-04:00, cmiller@zippy.cornsilk.net +0 -18
    Removed test that should have been reverted with gluh's reversion of 
    B-g#21432.

ChangeSet@1.1810.2177.2, 2006-09-28 15:18:33-04:00, iggy@rolltop.ignatz42.dyndns.org +2 -0
  Bug#22224: Windows build depends on ib_config.h
    
  This change has already been made to 5.1.

  CMakeLists.txt@1.1.1.1, 2006-09-28 15:18:30-04:00, iggy@rolltop.ignatz42.dyndns.org +4 -2
    Removed dependancy on ib_config.h
    Added conditionals for InnoDB and BDB directories.

  innobase/include/univ.i@1.40.7.1, 2006-09-28 15:18:31-04:00, iggy@rolltop.ignatz42.dyndns.org +2 -0
    ib_config.h is not required for Windows.

ChangeSet@1.1616.2756.6, 2006-09-28 14:30:20-04:00, iggy@rolltop.ignatz42.dyndns.org +3 -0
  Bug#20305: PROCEDURE ANALYSE() returns wrong M for FLOAT(M, D) and DOUBLE(M, D)

  mysql-test/r/analyse.result@1.14.1.5, 2006-09-28 14:30:18-04:00, iggy@rolltop.ignatz42.dyndns.org +13 -0
    Added Results

  mysql-test/t/analyse.test@1.12.1.4, 2006-09-28 14:30:19-04:00, iggy@rolltop.ignatz42.dyndns.org +13 -1
    Added test cases to make sure field_str and field_real return correctly.

  sql/sql_analyse.cc@1.45.1.10, 2006-09-28 14:30:19-04:00, iggy@rolltop.ignatz42.dyndns.org +4 -4
    According the manaul, when declaring a FLOAT(M, N), N equals the number of decimal places and M equals the total number of
    digits in the number.

ChangeSet@1.1810.2177.1, 2006-09-28 13:58:53-04:00, iggy@rolltop.ignatz42.dyndns.org +1 -0
  Bug #21449 How to Resolve Stack Trace URL in MySQLD error log is incorrect.

  sql/stacktrace.c@1.18.1.3, 2006-09-28 13:58:44-04:00, iggy@rolltop.ignatz42.dyndns.org +1 -1
    URL is case sensitive

ChangeSet@1.1616.2775.1, 2006-09-28 22:10:06+05:00, svoj@mysql.com +5 -0
  BUG#21617 - crash when selecting from merge table with inconsistent indexes
  
  Crash may happen when selecting from a merge table that has underlying
  tables with less indexes than in a merge table itself.
  
  If number of keys in merge table is not bigger than requested key number,
  return error.

  mysql-test/r/merge.result@1.32.2.1, 2006-09-28 22:10:05+05:00, svoj@mysql.com +6 -0
    A test case for bug#21617.

  mysql-test/t/merge.test@1.28.2.1, 2006-09-28 22:10:05+05:00, svoj@mysql.com +11 -0
    A test case for bug#21617.

  mysys/queues.c@1.15.1.1, 2006-09-28 22:10:05+05:00, svoj@mysql.com +19 -29
    Replaced annoying ifndef DBUG_OFF with DBUG_ASSERT, fixed coding style.
    The problem was that having queue overrun in debug build was hidden
    with this ifdef.

  myisammrg/myrg_open.c@1.27.8.1, 2006-09-28 22:10:05+05:00, svoj@mysql.com +5 -2
    Store min(number of keys) in m_info instead of number of keys in last
    underlying table.

  myisammrg/myrg_queue.c@1.10.3.1, 2006-09-28 22:10:05+05:00, svoj@mysql.com +2 -0
    Return error if inx passed to _myrg_init_queue function is not less
    than number of keys.

ChangeSet@1.2273.70.6, 2006-09-28 18:42:41+03:00, aelkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi +1 -0
  Result of a binlog_statement_insert_delayed was affected by recent fixing of
    binlog_row_binlog.test failure in team tree.
    Fixing the result that gets wrong with --binlog-format=mixed
  (so that skipped on pushbuild currently)

  mysql-test/r/binlog_stm_binlog.result@1.15, 2006-09-28 18:42:38+03:00, aelkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi +14 -21
    Fixing the result.

ChangeSet@1.1810.2175.1, 2006-09-28 20:30:15+05:00, svoj@mysql.com +2 -0
  BUG#21675 - engine=archive 2GB file limit, when reached mysqld restarts on any query
  
  If mysqld is linked against system installed zlib (which is likely compiled w/o
  LFS) and archive table exceedes 2G, mysqld will likely be terminated with SIGXFSZ.
  
  Prior to actual write perform a check if there is space in data file. This fixes
  abnormal process termination with SIGXFSZ.
  
  No test case for this bugfix.

  sql/ha_archive.cc@1.60.5.1, 2006-09-28 20:30:14+05:00, svoj@mysql.com +20 -4
    Prior to actual write perform a check if there is space in data file. This fixes
    abnormal process termination with SIGXFSZ.

  sql/ha_archive.h@1.31.1.3, 2006-09-28 20:30:14+05:00, svoj@mysql.com +1 -0
    Added approximate archive data file size to archive share.

ChangeSet@1.2273.70.5, 2006-09-28 17:55:45+03:00, aelkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi +1 -0
  the results of binlog_statement_insert_delayed in STATEMENT - non-recommended mode i.e not checked
  by make test - got changed due to show binlog events relocation to deterministic
  position at extra/binlog_tests/binlog_insert_delayed.test.

  mysql-test/r/binlog_statement_insert_delayed.result@1.4, 2006-09-28 17:55:40+03:00, aelkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi +7 -11
    results changed due to moving a binlog check affront of indetermistic queries.

ChangeSet@1.1810.2154.7, 2006-09-28 16:21:21+02:00, msvensson@neptunus.(none) +1 -0
  Reduce code for SSL_connect and SSL_accept
  There is no need to call SSL_set_accept_state + SSL_do_handshake when we know that SSL_accept should be done. 

  vio/viossl.c@1.34.2.1, 2006-09-28 16:21:19+02:00, msvensson@neptunus.(none) +4 -6
    Replace the double calls to "SSL_set_accept_state" and "SSL_do_handshake" with one call to "SSL_accept"
    Same with "SSL_connect"

ChangeSet@1.1810.2096.30, 2006-09-28 09:51:06-04:00, cmiller@zippy.cornsilk.net +1 -0
  Additional patch to Bug#21476:  Free newly-allocated memory in mysqltest.

  client/mysqltest.c@1.155.9.52, 2006-09-28 09:51:04-04:00, cmiller@zippy.cornsilk.net +5 -1
    Free the dynstr.

ChangeSet@1.2273.91.2, 2006-09-28 18:00:44+05:00, gluh@mysql.com +4 -0
  after merge fix

  sql/log.h@1.16, 2006-09-28 18:00:39+05:00, gluh@mysql.com +1 -1
    after merge fix

  sql/sp.cc@1.121.1.2, 2006-09-28 18:00:39+05:00, gluh@mysql.com +2 -2
    after merge fix

  sql/sp_head.cc@1.240, 2006-09-28 18:00:39+05:00, gluh@mysql.com +1 -1
    after merge fix

  sql/table.cc@1.239.7.2, 2006-09-28 18:00:39+05:00, gluh@mysql.com +0 -1
    after merge fix

ChangeSet@1.1810.2171.2, 2006-09-28 17:00:29+05:00, ramil@mysql.com +3 -0
  Fix for bug #22271: data casting may affect data stored in the next column(s?)
  
  Using wrong filling value may cause unneeded extra bit rewriting.
  
  Fix: use proper value to fill uneven bits.

  mysql-test/r/type_bit.result@1.14.1.4, 2006-09-28 17:00:25+05:00, ramil@mysql.com +8 -0
    Fix for bug #22271: data casting may affect data stored in the next column(s?)
      - test case.

  mysql-test/t/type_bit.test@1.17, 2006-09-28 17:00:25+05:00, ramil@mysql.com +8 -0
    Fix for bug #22271: data casting may affect data stored in the next column(s?)
      - test result.

  sql/field.cc@1.256.29.1, 2006-09-28 17:00:25+05:00, ramil@mysql.com +1 -1
    Fix for bug #22271: data casting may affect data stored in the next column(s?)
      - use ((1 << bit_len) - 1) instead of 0xff to fill uneven bits 
        in order not to change other's bits.

ChangeSet@1.2273.92.2, 2006-09-28 15:40:23+04:00, anozdrin@alik. +4 -0
  5.0-rt -> 5.1-rt after-merge fixes.

  mysql-test/lib/mtr_im.pl@1.2, 2006-09-28 15:40:21+04:00, anozdrin@alik. +4 -4
    Fix merge.

  mysql-test/lib/mtr_process.pl@1.50.1.2, 2006-09-28 15:40:21+04:00, anozdrin@alik. +1 -23
    Fix merge.

  mysql-test/r/im_daemon_life_cycle.result@1.8, 2006-09-28 15:40:21+04:00, anozdrin@alik. +2 -2
    Fix merge.

  mysql-test/t/im_daemon_life_cycle.imtest@1.7, 2006-09-28 15:40:21+04:00, anozdrin@alik. +1 -1
    Fix merge.

ChangeSet@1.2273.93.1, 2006-09-28 13:19:43+02:00, gbichot@dl145h.mysql.com +4 -0
  In the handlerton, cursor creation function don't have an argument
  and so the engine calls current_thd to derive transaction information;
  instead we now pass THD to those functions, it looks more logical
  (it makes the implicit current_thd parameter more visible).
  Approved by Brian and Monty.

  sql/handler.h@1.240.1.1, 2006-09-28 13:19:33+02:00, gbichot@dl145h.mysql.com +3 -3
    cursor's creation functions in the handlerton need a THD,
    it's better than have the engine call current_thd

  sql/sql_cursor.cc@1.8, 2006-09-28 13:19:34+02:00, gbichot@dl145h.mysql.com +4 -4
    pass the THD instead of letting the engine call current_thd

  storage/innobase/handler/ha_innodb.cc@1.295.4.1, 2006-09-28 13:19:34+02:00, gbichot@dl145h.mysql.com +8 -4
    use the passed THD instead of current_thd

  storage/innobase/handler/ha_innodb.h@1.126.1.1, 2006-09-28 13:19:34+02:00, gbichot@dl145h.mysql.com +8 -3
    use the passed THD instead of current_thd

ChangeSet@1.2273.69.18, 2006-09-28 11:53:42+02:00, msvensson@neptunus.(none) +1 -0
  Increase time to wait for mysqld to get restarted(it will take some time when running in valgrind)

  mysql-test/include/wait_until_connected_again.inc@1.2, 2006-09-28 11:53:40+02:00, msvensson@neptunus.(none) +1 -1
    Increase time to wait for mysqld to get restarted(it will take some time when running in valgrind)

ChangeSet@1.1346.884.1, 2006-09-28 11:41:38+02:00, istruewing@chilla.local +1 -0
  Bug#22384 - DELETE FROM table causes "Incorrect key file for table"
  
  Deletes on a big index could crash the index when it needs to
  shrink.
  
  Put a forgotten negation operator in.
  
  No test case. It is too big for the test suite. And it does not
  work with 4.0, only with higher versions. It is attached to the
  bug report.

  myisam/mi_delete.c@1.14.1.1, 2006-09-28 11:41:37+02:00, istruewing@chilla.local +1 -1
    Bug#22384 - DELETE FROM table causes "Incorrect key file for table"
    Put a negation operator ('!') before _mi_get_last_key() in del().
    It returns NULL on error, non-NULL on success.

ChangeSet@1.2273.85.3, 2006-09-28 09:37:34+02:00, msvensson@neptunus.(none) +2 -0
  Directory mySTL has moved from extra/yassl/mySTL to extra/yassl/taocrypt/mySTL

  extra/yassl/CMakeLists.txt@1.6, 2006-09-28 09:37:32+02:00, msvensson@neptunus.(none) +1 -1
    Directory mySTL has moved from extra/yassl/mySTL to extra/yassl/taocrypt/mySTL

  extra/yassl/taocrypt/CMakeLists.txt@1.8, 2006-09-28 09:37:32+02:00, msvensson@neptunus.(none) +1 -1
    Directory mySTL has moved from extra/yassl/mySTL to extra/yassl/taocrypt/mySTL

ChangeSet@1.1810.2154.6, 2006-09-28 09:30:24+02:00, msvensson@neptunus.(none) +1 -0
  Increase test suite timeout to 3 hours

  mysql-test/mysql-test-run.pl@1.30.44.2, 2006-09-28 09:30:17+02:00, msvensson@neptunus.(none) +1 -1
    Increase test suite timeout to 3 hours

ChangeSet@1.1810.2163.5, 2006-09-27 19:26:25-04:00, cmiller@zippy.cornsilk.net +3 -0
  Bug #20778: strange characters in warning message 1366 when called in SP
  
  The function receives an exactly-sized buffer (not a C NUL-terminated string)
  and passes it into a printf function to be interpreted with "%s".
  
  Instead, create an intermediate String object, and copy the data into it, 
  and pass in a pointer to the String's NUL-terminated buffer.

  mysql-test/r/warnings.result@1.34.1.5, 2006-09-27 19:26:23-04:00, cmiller@zippy.cornsilk.net +56 -0
    Test that warnings do not read outside its intended memory space.

  mysql-test/t/warnings.test@1.22.1.4, 2006-09-27 19:26:23-04:00, cmiller@zippy.cornsilk.net +57 -1
    Test that warnings do not read outside its intended memory space.

  sql/field.cc@1.256.1.68, 2006-09-27 19:26:24-04:00, cmiller@zippy.cornsilk.net +14 -2
    Create a new String object and use a pointer to its data instead of the 
    exactly-sized buffer to be interpreted as a C string deep within the 
    errmsg.txt list via printf.

ChangeSet@1.1810.2171.1, 2006-09-27 17:13:58-04:00, elliot@mysql.com +1 -0
  Temporary fix for bug#22268 (official patch will come soon)
  Don't cap threads at 1000 on Windows any more.

  innobase/srv/srv0start.c@1.80.14.1, 2006-09-27 17:13:52-04:00, elliot@mysql.com +1 -1
    Temporary fix for bug#22268 (official patch will come soon)
    Don't cap threads at 1000 on Windows any more.

ChangeSet@1.2273.44.9, 2006-09-27 22:14:31+02:00, andrey@example.com +1 -0
  post-merge fix

  mysql-test/r/sp.result@1.223.1.3, 2006-09-27 22:14:24+02:00, andrey@example.com +7 -0
    post-merge fix

ChangeSet@1.1810.2170.1, 2006-09-27 21:23:17+02:00, andrey@example.com +3 -0
  Fix for bug#21311: Possible stack overrun if SP has non-latin1 name
    
  There was possible stack overrun in an edge case which handles invalid body of
  a SP in mysql.proc . That should be case when mysql.proc has been changed
  manually. Though, due to bug 21513, it can be exploited without having access
  to mysql.proc only being able to create a stored routine.

  mysql-test/r/sp.result@1.170.25.1, 2006-09-27 21:23:13+02:00, andrey@example.com +7 -0
    update result

  mysql-test/t/sp.test@1.174.20.1, 2006-09-27 21:23:13+02:00, andrey@example.com +13 -0
    add a test case for the bug

  sql/sp.cc@1.82.20.1, 2006-09-27 21:23:13+02:00, andrey@example.com +11 -1
    Fix stack overrun. This happen mostly when mysql.proc is damaged, though
    it's possible due to another bug which creates invalid SP body in mysql.proc
    (leading quote from a label being cut) to create stack overrun even without
    having direct access to mysql.proc

ChangeSet@1.1810.2169.1, 2006-09-27 23:11:45+04:00, kroki@moonlight.intranet +3 -0
  BUG#21081: SELECT inside stored procedure returns wrong results
  
  Re-execution of a parametrized prepared statement or a stored routine
  with a SELECT that use LEFT JOIN with second table having only one row
  could yield incorrect result.
  
  The problem appeared only for left joins with second table having only
  one row (aka const table) and equation conditions in ON or WHERE clauses
  that depend on the argument passed.  Once the condition was false for
  second const table, a NULL row was created for it, and any field involved
  got NULL-value flag, which then was never reset.
  
  The cause of the problem was that Item_field::null_value could be set
  without being reset for re-execution.  The solution is to reset
  Item_field::null_value in Item_field::cleanup().

  mysql-test/r/ps.result@1.56.3.1, 2006-09-27 23:11:42+04:00, kroki@moonlight.intranet +21 -0
    Add result for bug#21081: SELECT inside stored procedure returns wrong
    results.

  mysql-test/t/ps.test@1.56.3.1, 2006-09-27 23:11:42+04:00, kroki@moonlight.intranet +27 -0
    Add test case for bug#21081: SELECT inside stored procedure returns wrong
    results.

  sql/item.cc@1.113.52.1, 2006-09-27 23:11:42+04:00, kroki@moonlight.intranet +1 -0
    Reset Item_field::null_value flag for re-execution.

ChangeSet@1.1810.2168.1, 2006-09-27 14:42:56-04:00, cmiller@zippy.cornsilk.net +7 -0
  Bug#21476: (Thread stack overrun not caught, causing SEGV)
  
  The STACK_MIN_SIZE is currently set to 8192, when we actually need 
  (emperically discovered) 9236 bytes to raise an fatal error, on Ubuntu 
  Dapper Drake, libc6 2.3.6-0ubuntu2, Linux kernel 2.6.15-27-686, on x86.
  
  I'm taking that as a new lower bound, plus 100B of wiggle-room for sundry
  word sizes and stack behaviors.
  
  The added test verifies in a cross-platform way that there are no gaps 
  between the space that we think we need and what we actually need to report 
  an error.
  
  DOCUMENTERS:  This also adds "let" to the mysqltest commands that evaluate
  an argument to expand variables therein.  (Only right of the "=", of course.)

  BitKeeper/etc/collapsed@1.4.1.2, 2006-09-27 13:42:06-04:00, cmiller@zippy.cornsilk.net +2 -0

  client/mysqltest.c@1.155.9.51, 2006-09-27 14:42:54-04:00, cmiller@zippy.cornsilk.net +9 -3
    Add "let" to the list of mysqltest commands that evaluates its arguments (only
    the right-hand-side of the equals-sign expression).  

  mysql-test/r/execution_constants.result@1.1, 2006-09-27 14:42:54-04:00, cmiller@zippy.cornsilk.net +12 -0
    New BitKeeper file ``mysql-test/r/execution_constants.result''

  mysql-test/r/execution_constants.result@1.0, 2006-09-27 14:42:54-04:00, cmiller@zippy.cornsilk.net +0 -0

  mysql-test/r/mysqltest.result@1.24.1.12, 2006-09-27 14:42:54-04:00, cmiller@zippy.cornsilk.net +4 -1
    Added test to show that mysqltest "let" will evaluate the RHS correctly (and 
    expand the backslash test).

  mysql-test/t/execution_constants.test@1.1, 2006-09-27 14:42:54-04:00, cmiller@zippy.cornsilk.net +74 -0
    New BitKeeper file ``mysql-test/t/execution_constants.test''

  mysql-test/t/execution_constants.test@1.0, 2006-09-27 14:42:54-04:00, cmiller@zippy.cornsilk.net +0 -0

  mysql-test/t/mysqltest.test@1.24.1.21, 2006-09-27 14:42:54-04:00, cmiller@zippy.cornsilk.net +12 -0
    Added test to show that mysqltest "let" will evaluate the RHS correctly (and 
    expand the backslash test).

  sql/mysql_priv.h@1.290.65.1, 2006-09-27 14:42:54-04:00, cmiller@zippy.cornsilk.net +12 -1
    Increase the amount we require to be available for the stack, since 
    experience told us that the previous amount was too little by at least
    1044 bytes.  

ChangeSet@1.1810.2154.5, 2006-09-27 18:10:15+02:00, msvensson@neptunus.(none) +1 -0
  Add suppressions seen on maint1, nothing new just a nother version of libc

  mysql-test/valgrind.supp@1.3.1.4, 2006-09-27 18:10:11+02:00, msvensson@neptunus.(none) +27 -0
    Add suppressions seen on maint1, nothing new just a nother version of libc

ChangeSet@1.1810.2167.1, 2006-09-27 17:11:19+02:00, msvensson@neptunus.(none) +3 -0
  Build fixes for netware/ directory
   - Create the file netware/libmysql.imp from libmysql/libmysql.def
   - Remove the outdated netware/libmysql.imp file from version control

  BitKeeper/deleted/.del-libmysql.imp@1.3, 2006-09-27 15:31:42+02:00, msvensson@neptunus.(none) +0 -0
    Delete: netware/libmysql.imp

  BitKeeper/etc/ignore@1.210.6.1, 2006-09-27 17:11:17+02:00, msvensson@neptunus.(none) +1 -0
    Added netware/libmysql.imp to the ignore list

  netware/Makefile.am@1.15.1.3, 2006-09-27 17:11:17+02:00, msvensson@neptunus.(none) +14 -2
    Build libmysql.imp from libmysql/libmysql.def

ChangeSet@1.1810.2166.3, 2006-09-27 20:11:11+05:00, gluh@mysql.com +3 -0
  additional 'after merge' fix

  sql/mysql_priv.h@1.290.64.1, 2006-09-27 20:11:08+05:00, gluh@mysql.com +1 -1
    additional 'after merge' fix

  sql/sql_parse.cc@1.426.1.154, 2006-09-27 20:11:08+05:00, gluh@mysql.com +5 -6
    additional 'after merge' fix

  sql/sql_yacc.yy@1.371.1.119, 2006-09-27 20:11:08+05:00, gluh@mysql.com +3 -3
    additional 'after merge' fix

ChangeSet@1.1810.2163.4, 2006-09-27 16:51:59+02:00, msvensson@neptunus.(none) +2 -0
  The mySTL directory has moved from yassl/mySTL to yassl/taocrypt/mySTL

  extra/yassl/CMakeLists.txt@1.1.1.1, 2006-09-27 16:51:57+02:00, msvensson@neptunus.(none) +1 -1
    The mySTL directory has moved from yassl/mySTL to yassl/taocrypt/mySTL

  extra/yassl/taocrypt/CMakeLists.txt@1.1.1.1, 2006-09-27 16:51:57+02:00, msvensson@neptunus.(none) +1 -1
    The mySTL directory has moved from yassl/mySTL to yassl/taocrypt/mySTL

ChangeSet@1.2273.82.3, 2006-09-27 17:49:51+03:00, gkodinov@macbook.gmz +2 -0
  merge fixes 5.0-opt -> 5.1-opt

  mysql-test/r/ctype_ucs.result@1.52, 2006-09-27 17:49:43+03:00, gkodinov@macbook.gmz +2 -2
    merge fixes 5.0-opt -> 5.1-opt

  sql/unireg.cc@1.86, 2006-09-27 17:49:44+03:00, gkodinov@macbook.gmz +2 -1
    merge fixes 5.0-opt -> 5.1-opt

ChangeSet@1.1810.2163.3, 2006-09-27 16:45:44+02:00, msvensson@neptunus.(none) +1 -0
  Fix compile failure on Sun C++ 5.7 in yaSSL code
   - Trying to use unctions declared as static being used from another file, change them to be inline

  extra/yassl/taocrypt/mySTL/helpers.hpp@1.2, 2006-09-27 16:45:42+02:00, msvensson@neptunus.(none) +2 -2
    Change 'GetMemory' and 'FreeMemory' function te be inline instead of static.

ChangeSet@1.1810.2166.2, 2006-09-27 19:21:29+05:00, gluh@mysql.com +8 -0
  after merge fix

  include/mysql_com.h@1.100.6.2, 2006-09-27 19:21:21+05:00, gluh@mysql.com +1 -1
    after merge fix

  sql/slave.h@1.85.1.12, 2006-09-27 19:21:21+05:00, gluh@mysql.com +1 -1
    after merge fix

  sql/sp.cc@1.82.19.1, 2006-09-27 19:21:21+05:00, gluh@mysql.com +4 -4
    after merge fix

  sql/sp_head.cc@1.200.1.24, 2006-09-27 19:21:21+05:00, gluh@mysql.com +3 -3
    after merge fix

  sql/sql_acl.cc@1.128.38.2, 2006-09-27 19:21:21+05:00, gluh@mysql.com +10 -11
    after merge fix

  sql/sql_class.h@1.230.1.70, 2006-09-27 19:21:21+05:00, gluh@mysql.com +1 -1
    after merge fix

  sql/sql_parse.cc@1.426.1.153, 2006-09-27 19:21:22+05:00, gluh@mysql.com +1 -1
    after merge fix

  sql/sql_repl.h@1.37.1.2, 2006-09-27 19:21:22+05:00, gluh@mysql.com +1 -1
    after merge fix

ChangeSet@1.2273.44.7, 2006-09-27 17:48:00+04:00, petr@mysql.com +3 -0
  Remove unused error messages (no release contains them
  at the moment, so we can safely do that). Update an error
  mesage to make it translateable.

  mysql-test/r/log_tables.result@1.10, 2006-09-27 17:47:49+04:00, petr@mysql.com +5 -5
    update result file

  sql/share/errmsg.txt@1.124, 2006-09-27 17:47:49+04:00, petr@mysql.com +2 -7
    remove unused error messages

  sql/sql_table.cc@1.370, 2006-09-27 17:47:49+04:00, petr@mysql.com +2 -2
    Use name of the statements rather then English words.
    This way error message is translateable.

ChangeSet@1.1810.2137.9, 2006-09-27 18:33:31+05:00, svoj@mysql.com +2 -0
  After merge fix.

  mysql-test/r/merge.result@1.43.1.9, 2006-09-27 18:33:28+05:00, svoj@mysql.com +9 -9
    After merge fix.

  sql/share/errmsg.txt@1.42.1.30, 2006-09-27 18:33:28+05:00, svoj@mysql.com +1 -1
    After merge fix.

ChangeSet@1.1616.2770.2, 2006-09-27 17:49:16+05:00, gluh@mysql.com +7 -0
  Patch for bug#21432 is reverted

  include/mysql_com.h@1.67.1.42, 2006-09-27 17:49:12+05:00, gluh@mysql.com +0 -3
    Patch for bug#21432 is reverted

  mysql-test/r/ctype_utf8.result@1.45.8.1, 2006-09-27 17:49:12+05:00, gluh@mysql.com +0 -12
    Patch for bug#21432 is reverted

  mysql-test/t/ctype_utf8.test@1.57.8.1, 2006-09-27 17:49:12+05:00, gluh@mysql.com +0 -16
    Patch for bug#21432 is reverted

  sql-common/client.c@1.46.1.47, 2006-09-27 17:49:13+05:00, gluh@mysql.com +3 -3
    Patch for bug#21432 is reverted

  sql/sql_acl.cc@1.74.1.106, 2006-09-27 17:49:13+05:00, gluh@mysql.com +1 -5
    Patch for bug#21432 is reverted

  sql/sql_parse.cc@1.271.1.217, 2006-09-27 17:49:13+05:00, gluh@mysql.com +2 -2
    Patch for bug#21432 is reverted

  sql/table.cc@1.111.6.1, 2006-09-27 17:49:13+05:00, gluh@mysql.com +2 -4
    Patch for bug#21432 is reverted

ChangeSet@1.1810.2163.2, 2006-09-27 14:36:12+02:00, msvensson@neptunus.(none) +7 -0
  Import yaSSL version 1.4.3

  extra/yassl/examples/echoserver/echoserver.cpp@1.5, 2006-09-26 23:09:44+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/examples/server/server.cpp@1.4, 2006-09-26 23:09:44+02:00, msvensson@neptunus.(none) +12 -15
    Import patch yassl.diff

  extra/yassl/include/openssl/ssl.h@1.14.1.3, 2006-09-26 23:09:44+02:00, msvensson@neptunus.(none) +1 -1
    Import patch yassl.diff

  extra/yassl/src/template_instnt.cpp@1.10.1.3, 2006-09-27 14:27:49+02:00, msvensson@neptunus.(none) +1 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/crypto.cpp@1.1, 2006-09-26 23:09:44+02:00, msvensson@neptunus.(none) +39 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/crypto.cpp@1.0, 2006-09-26 23:09:44+02:00, msvensson@neptunus.(none) +0 -0

  extra/yassl/taocrypt/src/misc.cpp@1.17, 2006-09-26 23:09:44+02:00, msvensson@neptunus.(none) +1 -0
    Import patch yassl.diff

  extra/yassl/testsuite/test.hpp@1.8, 2006-09-26 23:09:44+02:00, msvensson@neptunus.(none) +1 -1
    Import patch yassl.diff

ChangeSet@1.1810.2154.4, 2006-09-27 13:42:16+02:00, msvensson@neptunus.(none) +1 -0
  When valgrinding add /usr/lib/debug" to LD_LIBRARY_PATH if available 

  mysql-test/mysql-test-run.pl@1.30.44.1, 2006-09-27 13:42:14+02:00, msvensson@neptunus.(none) +26 -11
    Rewrite the setup of LD_LIBRARY_PATH and DYLD_LIBRARY_PATH to make it easier to modify
    Valgrind need to be run with debug libraries  otherwise it's almost impossible to add
    correct supressions, that means if "/usr/lib/debug" is available, it should be added to
    LD_LIBRARY_PATH

ChangeSet@1.2273.82.2, 2006-09-27 13:11:00+03:00, gkodinov@macbook.gmz +3 -0
  Bug#21174: Index degrades sort performance and optimizer does not honor IGNORE INDEX
   - fix moved to 5.1

  mysql-test/r/group_by.result@1.74, 2006-09-27 13:10:48+03:00, gkodinov@macbook.gmz +9 -0
    Bug#21174: Index degrades sort performance and optimizer does not honor IGNORE INDEX
     - fix moved to 5.1

  mysql-test/t/group_by.test@1.60, 2006-09-27 13:10:49+03:00, gkodinov@macbook.gmz +12 -0
    Bug#21174: Index degrades sort performance and optimizer does not honor IGNORE INDEX
     - fix moved to 5.1

  sql/sql_select.cc@1.443, 2006-09-27 13:10:50+03:00, gkodinov@macbook.gmz +2 -0
    Bug#21174: Index degrades sort performance and optimizer does not honor IGNORE INDEX
     - fix moved to 5.1

ChangeSet@1.2273.83.1, 2006-09-27 13:05:29+03:00, aelkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi +2 -0
  One more fix for binlog_row_binlog due to interminism of checking with
  SHOW BINLOG event. The latter should be either fixed or replaced to favor
  reading from binlog as the check.

  mysql-test/extra/binlog_tests/binlog_insert_delayed.test@1.4, 2006-09-27 13:05:24+03:00, aelkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi +7 -3
    interminism of binlogging of multi-row insert delayed forced to relocate the show

  mysql-test/r/binlog_row_binlog.result@1.8, 2006-09-27 13:05:24+03:00, aelkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi +13 -21
    new results

ChangeSet@1.1616.2769.3, 2006-09-27 11:55:30+02:00, istruewing@chilla.local +1 -0
  Bug#20719 - Reading dynamic records with write buffer could fail
  After merge fix.

  myisam/mi_dynrec.c@1.36.1.4, 2006-09-27 11:55:28+02:00, istruewing@chilla.local +0 -3
    Bug#20719 - Reading dynamic records with write buffer could fail
    After merge fix.

ChangeSet@1.1810.2139.9, 2006-09-27 12:53:53+03:00, gkodinov@macbook.gmz +3 -0
  Bug #21174: Index degrades sort performance and optimizer does not honor IGNORE INDEX
   - reversed the patch for 5.0 and moved to 5.1

  mysql-test/r/group_by.result@1.69.1.3, 2006-09-27 12:53:44+03:00, gkodinov@macbook.gmz +0 -9
    Bug #21174: Index degrades sort performance and optimizer does not honor IGNORE INDEX
     - reversed the patch for 5.0

  mysql-test/t/group_by.test@1.59, 2006-09-27 12:53:45+03:00, gkodinov@macbook.gmz +0 -12
    Bug #21174: Index degrades sort performance and optimizer does not honor IGNORE INDEX
     - reversed the patch for 5.0

  sql/sql_select.cc@1.312.1.144, 2006-09-27 12:53:46+03:00, gkodinov@macbook.gmz +0 -2
    Bug #21174: Index degrades sort performance and optimizer does not honor IGNORE INDEX
     - reversed the patch for 5.0

ChangeSet@1.2273.80.1, 2006-09-26 21:26:04-07:00, brian@zim.(none) +13 -0
  Removed Field (this came in as an idea from a previous patch by Serg)

  include/mysql/plugin.h@1.20, 2006-09-26 21:25:59-07:00, brian@zim.(none) +0 -1
    Field Removed

  sql/ha_ndbcluster.cc@1.348.11.1, 2006-09-26 21:25:59-07:00, brian@zim.(none) +1 -1
    Field Removed

  sql/ha_partition.cc@1.74, 2006-09-26 21:25:59-07:00, brian@zim.(none) +1 -1
    Field Removed

  sql/log.cc@1.231.1.1, 2006-09-26 21:25:59-07:00, brian@zim.(none) +1 -1
    Removed Field

  storage/archive/ha_archive.cc@1.104, 2006-09-26 21:25:59-07:00, brian@zim.(none) +1 -1
    Removed Field

  storage/blackhole/ha_blackhole.cc@1.41, 2006-09-26 21:25:59-07:00, brian@zim.(none) +1 -1
    Removed Field

  storage/csv/ha_tina.cc@1.60.2.1, 2006-09-26 21:25:59-07:00, brian@zim.(none) +1 -1
    Removed Field

  storage/example/ha_example.cc@1.44, 2006-09-26 21:25:59-07:00, brian@zim.(none) +1 -1
    Removed Field

  storage/federated/ha_federated.cc@1.80, 2006-09-26 21:25:59-07:00, brian@zim.(none) +1 -1
    Removed Field

  storage/heap/ha_heap.cc@1.99, 2006-09-26 21:25:59-07:00, brian@zim.(none) +1 -1
    Removed Field

  storage/innobase/handler/ha_innodb.cc@1.295.3.1, 2006-09-26 21:25:59-07:00, brian@zim.(none) +1 -1
    Removed Field

  storage/myisam/ha_myisam.cc@1.195, 2006-09-26 21:26:00-07:00, brian@zim.(none) +1 -1
    Removed Field

  storage/myisammrg/ha_myisammrg.cc@1.100, 2006-09-26 21:26:00-07:00, brian@zim.(none) +1 -1
    Removed Field

ChangeSet@1.2273.52.10, 2006-09-26 20:52:54+04:00, evgen@moonbone.local +7 -0
  Fixed bug #18360: Type aggregation for IN and CASE may lead to a wrong
  result
  
  The IN function aggregates result types of all expressions. It uses that 
  type in comparison of left expression and expressions in right part. 
  This approach works in most cases. But let's consider the case when the
  right part contains both strings and integers. In that case this approach may
  cause wrong results because all strings which do not start with a digit are
  evaluated as 0.
  CASE uses the same approach when a CASE expression is given thus it's also
  affected.
  
  The idea behind this fix is to make IN function to compare expressions with
  different result types differently. For example a string in the left
  part will be compared as string with strings specified in right part and
  will be converted to real for comparison to int or real items in the right
  part.
  
  A new function called collect_cmp_types() is added. It collects different
  result types for comparison of first item in the provided list with each 
  other item in the list. 
  
  The Item_func_in class now can refer up to 5 cmp_item objects: 1 for each
  result type for comparison purposes. cmp_item objects are allocated according
  to found result types. The comparison of the left expression with any
  right part expression is now based only on result types of these expressions.
  
  The Item_func_case class is modified in the similar way when a CASE
  expression is specified. Now it can allocate up to 5 cmp_item objects
  to compare CASE expression with WHEN expressions of different types.
  The comparison of the CASE expression with any WHEN expression now based only 
  on result types of these expressions.
  

  mysql-test/r/func_in.result@1.30, 2006-09-26 20:52:14+04:00, evgen@moonbone.local +68 -0
    Added a test case for bug#18360: Type aggregation for IN and CASE may lead to a wrong
    result

  mysql-test/t/func_in.test@1.23, 2006-09-26 20:51:34+04:00, evgen@moonbone.local +24 -0
    Added a test case for bug#18360: Type aggregation for IN and CASE may lead to a wrong
    result

  mysql-test/t/view.test@1.161, 2006-09-26 20:48:04+04:00, evgen@moonbone.local +1 -1
    Added a test comment

  sql/item.cc@1.210.1.1, 2006-09-26 20:46:24+04:00, evgen@moonbone.local +0 -5
    Cleaned up an outdated comment.

  sql/item_cmpfunc.cc@1.222, 2006-09-26 20:46:34+04:00, evgen@moonbone.local +184 -112
        Fixed bug #18360: Type aggregation for IN and CASE may lead to a wrong result
        A new function called collect_cmp_types() is added. It collects different
        result types for comparison of first item in the provided list with each 
        other item in the list. 
        The Item_func_in class now can refer up to 5 cmp_item objects: 1 for each
        result type for comparison purposes. cmp_item objects are allocated according
        to found result types. The comparison of the left expression with any
        right part expression is now based only on result types of these expressions.
        The Item_func_case class is modified in the similar way when a CASE
        expression is specified. Now it can allocate up to 5 cmp_item objects
        to compare CASE expression with WHEN expressions of different types.
        The comparison of the CASE expression with any WHEN expression now based only 
        on result types of these expressions.

  sql/item_cmpfunc.h@1.135, 2006-09-26 20:47:02+04:00, evgen@moonbone.local +116 -48
        Fixed bug#18360: Type aggregation for IN and CASE may lead to a wrong result
        The Item_func_in class now can refer up to 5 cmp_item objects.
        The Item_func_case class is modified in the similar way.

  sql/opt_range.cc@1.233.1.1, 2006-09-26 20:47:21+04:00, evgen@moonbone.local +9 -1
        Fixed bug #18360: Type aggregation for IN and CASE may lead to a wrong
        resultSmall code changes due to changes in Item_func_in class.

ChangeSet@1.1810.2154.3, 2006-09-26 17:52:15+02:00, msvensson@neptunus.(none) +1 -0
  Fir problem with winepath in mwenv

  netware/BUILD/mwenv@1.12.2.3, 2006-09-26 17:52:13+02:00, msvensson@neptunus.(none) +2 -2
    Add extra / after $base for winepath to work correctly
    Add / between $base and WINE_BUILD_DIR

ChangeSet@1.1810.2154.2, 2006-09-26 16:25:01+02:00, msvensson@neptunus.(none) +1 -0
  Hardcode the fact that we are using zlib 1.2.3(previously done via symlink zlib-1.1.4)

  netware/BUILD/mwenv@1.12.2.2, 2006-09-26 16:24:59+02:00, msvensson@neptunus.(none) +2 -2
    Hardcode the fact that we are using zlib 1.2.3(previously done via symlink zlib-1.1.4)

ChangeSet@1.2273.63.12, 2006-09-26 17:20:14+03:00, jani@a88-112-41-254.elisa-laajakaista.fi +2 -0
  Added more tests of field conversions.

  mysql-test/r/union.result@1.92, 2006-09-26 17:20:11+03:00, jani@a88-112-41-254.elisa-laajakaista.fi +27 -0
    Added more tests of field conversions.

  mysql-test/t/union.test@1.99, 2006-09-26 17:20:11+03:00, jani@a88-112-41-254.elisa-laajakaista.fi +15 -0
    Added more tests of field conversions.

ChangeSet@1.2273.78.2, 2006-09-26 16:01:16+02:00, msvensson@neptunus.(none) +1 -0
  Update patch that restores slave databases from snapshots before start for 5.1

  mysql-test/mysql-test-run.pl@1.183.1.2, 2006-09-26 16:01:12+02:00, msvensson@neptunus.(none) +6 -4
    Update patch that restores slave databases from snapshots before start for 5.1

ChangeSet@1.1616.2761.4, 2006-09-26 15:20:10+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#15303
    Fix take-over during SR, remove coupling to lcp/gcp (if systemRestartOngoing())

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.14.5.3, 2006-09-26 15:20:09+02:00, jonas@perch.ndb.mysql.com +30 -7
    Fix take-over during SR

ChangeSet@1.1616.2761.3, 2006-09-26 15:04:44+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#22672
    handle also CS_CONNECTED as "abort" in handleFailedApi to keep from falling on assertion in releaseApiCon
      in case of committed dirtyRead

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.42.6.3, 2006-09-26 15:04:43+02:00, jonas@perch.ndb.mysql.com +0 -7
    handle also CS_CONNECTED as "abort" to keep from falling on assertion in releaseApiCon
      in case of committed dirtyRead

ChangeSet@1.2273.77.1, 2006-09-26 14:21:52+02:00, pekka@orca.ndb.mysql.com +6 -0
  ndb - bug#21690: cleanup: set column properties in any order before create

  storage/ndb/include/ndbapi/NdbDictionary.hpp@1.84, 2006-09-26 14:16:27+02:00, pekka@orca.ndb.mysql.com +31 -0
    compute aggregates only before create table or by user request.
    remove distribution key hacks (set by user/set by us..)

  storage/ndb/src/ndbapi/NdbDictionary.cpp@1.64, 2006-09-26 14:16:27+02:00, pekka@orca.ndb.mysql.com +14 -3
    compute aggregates only before create table or by user request.
    remove distribution key hacks (set by user/set by us..)

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.151, 2006-09-26 14:16:27+02:00, pekka@orca.ndb.mysql.com +23 -19
    compute aggregates only before create table or by user request.
    remove distribution key hacks (set by user/set by us..)

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp@1.68, 2006-09-26 14:16:27+02:00, pekka@orca.ndb.mysql.com +4 -5
    compute aggregates only before create table or by user request.
    remove distribution key hacks (set by user/set by us..)

  storage/ndb/test/include/NDBT_Table.hpp@1.13, 2006-09-26 14:16:27+02:00, pekka@orca.ndb.mysql.com +5 -0
    compute aggregates only before create table or by user request.
    remove distribution key hacks (set by user/set by us..)

  storage/ndb/test/src/NDBT_Tables.cpp@1.21, 2006-09-26 14:16:27+02:00, pekka@orca.ndb.mysql.com +5 -0
    compute aggregates only before create table or by user request.
    remove distribution key hacks (set by user/set by us..)

ChangeSet@1.2270.2.26, 2006-09-26 14:08:20+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - post merge fixes...

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.98.1.2, 2006-09-26 14:08:18+02:00, jonas@perch.ndb.mysql.com +1 -1
    merge

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.125, 2006-09-26 14:08:18+02:00, jonas@perch.ndb.mysql.com +1 -1
    merge

  storage/ndb/src/ndbapi/NdbTransaction.cpp@1.57.1.2, 2006-09-26 14:08:18+02:00, jonas@perch.ndb.mysql.com +1 -1
    merge

ChangeSet@1.1810.2165.1, 2006-09-26 13:49:42+02:00, msvensson@neptunus.(none) +1 -0
  Bug#18969 race condition involving slave and mysqltest. was rpl_insert_id test case fails
   - As the slaves are restarted for each testcase, take the opportunity to restore their databases to a known state with the help of the snapshot(s)
   - Count max number of slaves used in testcases
   - Use copy_install_db to speed up "Installing db" phase

  mysql-test/mysql-test-run.pl@1.30.43.1, 2006-09-26 13:49:39+02:00, msvensson@neptunus.(none) +48 -15
    Count max number of slaves used for a test run and use that when installing slave databases etc.
    Use "copy_install_db" for all but the first db to install
    After having stopped the slave database, restore it's database files from the snapshot.

ChangeSet@1.1616.2761.2, 2006-09-26 13:19:00+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#20895
    Fix occational LCP hang!!!
    Make sure only to consider alive nodes in startNextChkpt

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.14.5.2, 2006-09-26 13:18:59+02:00, jonas@perch.ndb.mysql.com +71 -60
    Make sure only to consider alive nodes in startNextChkpt

ChangeSet@1.2273.63.11, 2006-09-26 13:19:25+03:00, jani@a88-112-41-254.elisa-laajakaista.fi +2 -0
  Fix for bug#20208
  A better fix for bug#10025.
  
  Fixed test case plus added new tests.
  
  After fixing Bug#20208 "Blobs greater than 8K are being truncated to 8K"
  the fix to bug#10025 "Misleading error with COLLATE mediumtext and UNION"
  became more accurate. Earlier mediumtext got converted to longtext,
  although mediumtext was enough to contain the results. Now it converts
  correctly to mediumtext, if the length does not exceed that and if none
  of the original fields were type longtext.
  
  Type longtext still converts correctly to type longtext, as the extra
  tests prove.

  mysql-test/r/union.result@1.91, 2006-09-26 13:19:21+03:00, jani@a88-112-41-254.elisa-laajakaista.fi +29 -0
    Fixed an earlier test case plus added two new tests.

  mysql-test/t/union.test@1.98, 2006-09-26 13:19:21+03:00, jani@a88-112-41-254.elisa-laajakaista.fi +30 -0
    Fixed an earlier test case plus added two new tests.

ChangeSet@1.1616.2773.1, 2006-09-26 11:03:11+08:00, dli@dev3-76.dev.cn.tlan +4 -0
  fix for bug#19651, if temporary error occured while retoring, report it in the restore result.

  ndb/tools/restore/consumer.hpp@1.5.1.1, 2006-09-26 11:03:10+08:00, dli@dev3-76.dev.cn.tlan +1 -0
    added a function to judge whether there is temporary error.

  ndb/tools/restore/consumer_restore.cpp@1.9.1.5, 2006-09-26 11:03:10+08:00, dli@dev3-76.dev.cn.tlan +6 -0
    record when temporary error occured in restore.

  ndb/tools/restore/consumer_restore.hpp@1.7.1.1, 2006-09-26 11:03:10+08:00, dli@dev3-76.dev.cn.tlan +3 -0
    added a member to record temporary error in restore.

  ndb/tools/restore/restore_main.cpp@1.25.1.4, 2006-09-26 11:03:10+08:00, dli@dev3-76.dev.cn.tlan +11 -0
    report temporary error in restore.

ChangeSet@1.2273.71.3, 2006-09-25 11:48:51-07:00, acurtis@xiphis.org +1 -0
  Bug#20615
    "plugin name lost when loading an already-loaded name"
    Do not delete existing plugin when loading a new plugin which has the
    same name.

  sql/sql_plugin.cc@1.36, 2006-09-25 11:48:49-07:00, acurtis@xiphis.org +1 -1
    Bug#20615
      Don't delete the plugin if it wasn't added.

ChangeSet@1.2273.76.2, 2006-09-25 20:28:40+02:00, msvensson@neptunus.(none) +1 -0
  Return from function 'collect_one_test_case' as sson it's detected that testcase should be skipped

  mysql-test/lib/mtr_cases.pl@1.36, 2006-09-25 20:28:36+02:00, msvensson@neptunus.(none) +12 -0
    Return from function 'collect_one_test_case' as sson it's detected that testcase should be skipped

ChangeSet@1.1616.2772.1, 2006-09-25 20:01:39+02:00, msvensson@neptunus.(none) +1 -0
  Bug#18888 Trying to overwrite sql/lex_hash.h during build
   -Backport fix for bug19738 to 4.1 

  sql/Makefile.am@1.77.1.40, 2006-09-25 20:01:37+02:00, msvensson@neptunus.(none) +6 -2
    Generated source should depend on their sources not the tool

ChangeSet@1.2273.71.2, 2006-09-25 10:59:49-07:00, acurtis@xiphis.org +1 -0
  Bug#21610
    "Loaded engine does not load after restart."
    Junk characters caused plugin load to fail silently.

  sql/sql_plugin.cc@1.35, 2006-09-25 10:59:45-07:00, acurtis@xiphis.org +9 -7
    junk characters cause plugin load to fail.
    eliminate use of strlen().

ChangeSet@1.2273.75.1, 2006-09-25 09:04:19-07:00, acurtis@xiphis.org +3 -0
  Bug#22080
    "CHECK fails to identify some corruption"
    change to allow it to detect more errors in data format

  mysql-test/r/csv.result@1.13, 2006-09-25 09:04:15-07:00, acurtis@xiphis.org +19 -0
    Test for bug

  mysql-test/t/csv.test@1.16, 2006-09-25 09:04:15-07:00, acurtis@xiphis.org +23 -0
    Test for bug

  storage/csv/ha_tina.cc@1.60.1.2, 2006-09-25 09:04:15-07:00, acurtis@xiphis.org +18 -16
    Bug#22080
      "CHECK fails to identify some corruption"
      change to allow it to detect more errors in data format

ChangeSet@1.2273.73.3, 2006-09-25 17:22:23+02:00, andrey@example.com +4 -0
  Fix for bug#22662  Inconsistent values displayed for event_scheduler
  when set to DISABLED
    
  It was a silly ordering number error.
  

  mysql-test/r/events_restart_phase0.result@1.1, 2006-09-25 17:22:18+02:00, andrey@example.com +22 -0
    New BitKeeper file ``mysql-test/r/events_restart_phase0.result''

  mysql-test/r/events_restart_phase0.result@1.0, 2006-09-25 17:22:18+02:00, andrey@example.com +0 -0

  mysql-test/t/events_restart_phase0.log@1.1, 2006-09-25 17:22:18+02:00, andrey@example.com +22 -0
    New BitKeeper file ``mysql-test/t/events_restart_phase0.log''

  mysql-test/t/events_restart_phase0.log@1.0, 2006-09-25 17:22:18+02:00, andrey@example.com +0 -0

  mysql-test/t/events_restart_phase0.result@1.1, 2006-09-25 17:22:19+02:00, andrey@example.com +22 -0
    New BitKeeper file ``mysql-test/t/events_restart_phase0.result''

  mysql-test/t/events_restart_phase0.result@1.0, 2006-09-25 17:22:19+02:00, andrey@example.com +0 -0

  sql/events.h@1.50, 2006-09-25 17:22:18+02:00, andrey@example.com +1 -1
    fix ordinal number, the cause for bug #22662
    Inconsistent values displayed for event_scheduler when set to DISABLED

ChangeSet@1.2273.73.2, 2006-09-25 16:49:25+02:00, andrey@example.com +3 -0
  Fix for bug#22397 Events: crash with procedure which alters events
    
  ALTER EVENT in stored procedure body led to a crash during the
  procedure call. Affected was only ALTER EVENT which changed the
  interval of the event. No problems with AT, STARTS, ENDS and so on.
  

  mysql-test/r/events_bugs.result@1.22, 2006-09-25 16:49:22+02:00, andrey@example.com +13 -0
    fix result

  mysql-test/t/events_bugs.test@1.18, 2006-09-25 16:49:22+02:00, andrey@example.com +19 -0
    add test case for bug 22397 : Events, crash with procedure which alters body

  sql/event_data_objects.cc@1.77, 2006-09-25 16:49:22+02:00, andrey@example.com +1 -1
    fix copy&paste error in code, which resulted in bug#22397
    Events: crash with procedure which alters body
    

ChangeSet@1.1810.2163.1, 2006-09-25 16:40:29+02:00, msvensson@neptunus.(none) +74 -0
  Import yaSSL version 1.4.0

  BitKeeper/deleted/.del-algorithm.hpp@1.3, 2006-09-25 15:45:19+02:00, msvensson@neptunus.(none) +0 -0
    Delete: extra/yassl/mySTL/algorithm.hpp

  BitKeeper/deleted/.del-helpers.hpp@1.13, 2006-09-25 15:45:23+02:00, msvensson@neptunus.(none) +0 -0
    Delete: extra/yassl/mySTL/helpers.hpp

  BitKeeper/deleted/.del-list.hpp@1.9, 2006-09-25 15:45:31+02:00, msvensson@neptunus.(none) +0 -0
    Delete: extra/yassl/mySTL/list.hpp

  BitKeeper/deleted/.del-memory.hpp@1.5, 2006-09-25 15:45:59+02:00, msvensson@neptunus.(none) +0 -0
    Delete: extra/yassl/mySTL/memory.hpp

  BitKeeper/deleted/.del-pair.hpp@1.3, 2006-09-25 15:45:38+02:00, msvensson@neptunus.(none) +0 -0
    Delete: extra/yassl/mySTL/pair.hpp

  BitKeeper/deleted/.del-stdexcept.hpp@1.7, 2006-09-25 15:45:44+02:00, msvensson@neptunus.(none) +0 -0
    Delete: extra/yassl/mySTL/stdexcept.hpp

  BitKeeper/deleted/.del-vector.hpp@1.8, 2006-09-25 15:45:54+02:00, msvensson@neptunus.(none) +0 -0
    Delete: extra/yassl/mySTL/vector.hpp

  extra/yassl/FLOSS-EXCEPTIONS@1.2, 2006-08-31 23:56:41+02:00, msvensson@neptunus.(none) +2 -1
    Import patch yassl.diff

  extra/yassl/Makefile.am@1.2.1.3, 2006-09-25 16:40:26+02:00, msvensson@neptunus.(none) +1 -1
    mySTL directory has moved from yassl/ to yassl/taocrypt

  extra/yassl/README@1.6, 2006-08-13 23:41:21+02:00, msvensson@neptunus.(none) +12 -1
    Import patch yassl.diff

  extra/yassl/examples/client/client.cpp@1.4, 2006-09-21 16:47:09+02:00, msvensson@neptunus.(none) +28 -3
    Import patch yassl.diff

  extra/yassl/examples/echoclient/echoclient.cpp@1.3, 2006-09-21 16:47:09+02:00, msvensson@neptunus.(none) +14 -1
    Import patch yassl.diff

  extra/yassl/examples/echoserver/echoserver.cpp@1.4, 2006-09-21 16:47:09+02:00, msvensson@neptunus.(none) +29 -7
    Import patch yassl.diff

  extra/yassl/examples/server/server.cpp@1.3, 2006-09-25 09:42:14+02:00, msvensson@neptunus.(none) +19 -7
    Import patch yassl.diff

  extra/yassl/include/buffer.hpp@1.6, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +5 -2
    Import patch yassl.diff

  extra/yassl/include/cert_wrapper.hpp@1.4, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +8 -3
    Import patch yassl.diff

  extra/yassl/include/crypto_wrapper.hpp@1.5, 2006-08-29 22:06:44+02:00, msvensson@neptunus.(none) +11 -1
    Import patch yassl.diff

  extra/yassl/include/factory.hpp@1.5, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +11 -7
    Import patch yassl.diff

  extra/yassl/include/openssl/ssl.h@1.14.1.2, 2006-09-18 22:19:21+02:00, msvensson@neptunus.(none) +3 -1
    Import patch yassl.diff

  extra/yassl/include/socket_wrapper.hpp@1.8, 2006-08-13 03:34:24+02:00, msvensson@neptunus.(none) +2 -0
    Import patch yassl.diff

  extra/yassl/include/yassl_error.hpp@1.6, 2006-08-30 00:52:55+02:00, msvensson@neptunus.(none) +5 -1
    Import patch yassl.diff

  extra/yassl/include/yassl_imp.hpp@1.6, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +5 -2
    Import patch yassl.diff

  extra/yassl/include/yassl_int.hpp@1.11.1.2, 2006-09-18 22:19:21+02:00, msvensson@neptunus.(none) +99 -7
    Import patch yassl.diff

  extra/yassl/include/yassl_types.hpp@1.14, 2006-09-25 12:28:29+02:00, msvensson@neptunus.(none) +37 -1
    Import patch yassl.diff

  extra/yassl/src/Makefile.am@1.10.2.1, 2006-09-25 16:40:26+02:00, msvensson@neptunus.(none) +1 -1
    mySTL directory has moved from yassl/ to yassl/taocrypt

  extra/yassl/src/cert_wrapper.cpp@1.9, 2006-08-29 22:06:44+02:00, msvensson@neptunus.(none) +24 -7
    Import patch yassl.diff

  extra/yassl/src/crypto_wrapper.cpp@1.9, 2006-08-29 22:06:44+02:00, msvensson@neptunus.(none) +33 -2
    Import patch yassl.diff

  extra/yassl/src/handshake.cpp@1.13, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +39 -44
    Import patch yassl.diff

  extra/yassl/src/socket_wrapper.cpp@1.13, 2006-08-24 17:58:30+02:00, msvensson@neptunus.(none) +10 -2
    Import patch yassl.diff

  extra/yassl/src/ssl.cpp@1.16.1.3, 2006-08-30 00:52:56+02:00, msvensson@neptunus.(none) +179 -30
    Import patch yassl.diff

  extra/yassl/src/template_instnt.cpp@1.10.1.2, 2006-09-25 12:26:59+02:00, msvensson@neptunus.(none) +17 -0
    Import patch yassl.diff

  extra/yassl/src/yassl.cpp@1.3, 2006-08-29 22:06:44+02:00, msvensson@neptunus.(none) +0 -12
    Import patch yassl.diff

  extra/yassl/src/yassl_error.cpp@1.8, 2006-08-30 00:52:56+02:00, msvensson@neptunus.(none) +13 -1
    Import patch yassl.diff

  extra/yassl/src/yassl_imp.cpp@1.8.1.3, 2006-08-30 00:52:56+02:00, msvensson@neptunus.(none) +37 -9
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp@1.19.1.3, 2006-08-30 00:52:56+02:00, msvensson@neptunus.(none) +229 -20
    Import patch yassl.diff

  extra/yassl/taocrypt/COPYING@1.1, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +340 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/COPYING@1.0, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +0 -0

  extra/yassl/taocrypt/INSTALL@1.1, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +229 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/INSTALL@1.0, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +0 -0

  extra/yassl/taocrypt/Makefile.am@1.1.1.4, 2006-09-25 16:40:26+02:00, msvensson@neptunus.(none) +1 -1
    mySTL directory has moved from yassl/ to yassl/taocrypt

  extra/yassl/taocrypt/README@1.1, 2006-09-18 23:08:52+02:00, msvensson@neptunus.(none) +37 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/README@1.0, 2006-09-18 23:08:52+02:00, msvensson@neptunus.(none) +0 -0

  extra/yassl/taocrypt/benchmark/Makefile.am@1.1.1.1, 2006-09-25 16:40:26+02:00, msvensson@neptunus.(none) +1 -1
    mySTL directory has moved from yassl/ to yassl/taocrypt

  extra/yassl/taocrypt/include/asn.hpp@1.10, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +4 -2
    Import patch yassl.diff

  extra/yassl/taocrypt/include/block.hpp@1.9, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +7 -5
    Import patch yassl.diff

  extra/yassl/taocrypt/include/blowfish.hpp@1.3, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +5 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/include/error.hpp@1.5, 2006-08-29 22:06:44+02:00, msvensson@neptunus.(none) +2 -2
    Import patch yassl.diff

  extra/yassl/taocrypt/include/file.hpp@1.4, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +1 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/include/integer.hpp@1.11, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +1 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/include/misc.hpp@1.14, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +17 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/pwdbased.hpp@1.3, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +1 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/include/twofish.hpp@1.3, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +5 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/mySTL/algorithm.hpp@1.1, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +115 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/mySTL/algorithm.hpp@1.0, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +0 -0

  extra/yassl/taocrypt/mySTL/helpers.hpp@1.1, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +160 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/mySTL/helpers.hpp@1.0, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +0 -0

  extra/yassl/taocrypt/mySTL/list.hpp@1.1, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +374 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/mySTL/list.hpp@1.0, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +0 -0

  extra/yassl/taocrypt/mySTL/memory.hpp@1.1, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +143 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/mySTL/memory.hpp@1.0, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +0 -0

  extra/yassl/taocrypt/mySTL/memory_array.hpp@1.1, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +142 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/mySTL/memory_array.hpp@1.0, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +0 -0

  extra/yassl/taocrypt/mySTL/pair.hpp@1.1, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +65 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/mySTL/pair.hpp@1.0, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +0 -0

  extra/yassl/taocrypt/mySTL/stdexcept.hpp@1.1, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +84 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/mySTL/stdexcept.hpp@1.0, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +0 -0

  extra/yassl/taocrypt/mySTL/vector.hpp@1.1, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +161 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/mySTL/vector.hpp@1.0, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +0 -0

  extra/yassl/taocrypt/src/Makefile.am@1.13.1.1, 2006-09-25 16:40:26+02:00, msvensson@neptunus.(none) +1 -1
    mySTL directory has moved from yassl/ to yassl/taocrypt

  extra/yassl/taocrypt/src/algebra.cpp@1.11, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +10 -5
    Import patch yassl.diff

  extra/yassl/taocrypt/src/asn.cpp@1.11, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +5 -4
    Import patch yassl.diff

  extra/yassl/taocrypt/src/blowfish.cpp@1.3, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +1 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/src/des.cpp@1.4, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +6 -3
    Import patch yassl.diff

  extra/yassl/taocrypt/src/dh.cpp@1.8, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +1 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/src/integer.cpp@1.25, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +6 -6
    Import patch yassl.diff

  extra/yassl/taocrypt/src/md4.cpp@1.3, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +6 -4
    Import patch yassl.diff

  extra/yassl/taocrypt/src/md5.cpp@1.5, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +7 -4
    Import patch yassl.diff

  extra/yassl/taocrypt/src/misc.cpp@1.16, 2006-09-25 16:40:26+02:00, msvensson@neptunus.(none) +0 -10
    Remove the functions CRYPTO_lock and CRYPTO_add_lock as they would collide with OpenSSL functions 

  extra/yassl/taocrypt/src/random.cpp@1.10, 2006-09-25 11:58:53+02:00, msvensson@neptunus.(none) +66 -2
    Import patch yassl.diff

  extra/yassl/taocrypt/src/ripemd.cpp@1.5, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +6 -4
    Import patch yassl.diff

  extra/yassl/taocrypt/src/sha.cpp@1.5, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +7 -4
    Import patch yassl.diff

  extra/yassl/taocrypt/src/template_instnt.cpp@1.12, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +7 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/test/Makefile.am@1.1.1.1, 2006-09-25 16:40:26+02:00, msvensson@neptunus.(none) +1 -1
    mySTL directory has moved from yassl/ to yassl/taocrypt

  extra/yassl/testsuite/Makefile.am@1.3.2.1, 2006-09-25 16:40:26+02:00, msvensson@neptunus.(none) +1 -1
    mySTL directory has moved from yassl/ to yassl/taocrypt

  extra/yassl/testsuite/test.hpp@1.7, 2006-09-21 16:47:10+02:00, msvensson@neptunus.(none) +42 -7
    Import patch yassl.diff

ChangeSet@1.2273.70.2, 2006-09-25 16:58:07+03:00, aelkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi +1 -0
  Result of a binlog_statement_insert_delayed was affected by recent fixing of
  binlog_row_binlog.test failure in team tree.
  Fixing the result.
  

  mysql-test/r/binlog_statement_insert_delayed.result@1.3, 2006-09-25 16:54:25+03:00, aelkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi +1 -0

ChangeSet@1.2273.73.1, 2006-09-25 15:50:49+02:00, andrey@example.com +3 -0
  cleanups - fix a test and remove unneeded declaration

  mysql-test/r/events.result@1.45, 2006-09-25 15:50:41+02:00, andrey@example.com +24 -39
    test result

  mysql-test/t/events.test@1.42, 2006-09-25 15:50:41+02:00, andrey@example.com +11 -20
    fix test

  sql/sql_show.cc@1.360.2.1, 2006-09-25 15:50:41+02:00, andrey@example.com +0 -2
    remove unneeded declaration

ChangeSet@1.1810.2161.1, 2006-09-25 06:15:14-07:00, igor@rurik.mysql.com +5 -0
  Fixed bug #21646.
  Presence of a subquery in the ON expression of a join 
  should not block merging the view that contains this join.
  Before this patch the such views were converted into 
  into temporary table views.

  mysql-test/r/view.result@1.138.19.3, 2006-09-25 06:15:04-07:00, igor@rurik.mysql.com +14 -0
    Added a test case for bug #21646.

  mysql-test/t/view.test@1.126.17.3, 2006-09-25 06:15:04-07:00, igor@rurik.mysql.com +18 -0
    Added a test case for bug #21646.

  sql/mysql_priv.h@1.290.1.121, 2006-09-25 06:15:04-07:00, igor@rurik.mysql.com +2 -1
    Fixed bug #21646.
    Added a new parsing state 'IN_ON', true when
    the parser is in an ON expression of a join.

  sql/sql_lex.cc@1.142.1.59, 2006-09-25 06:15:04-07:00, igor@rurik.mysql.com +2 -1
    Fixed bug #21646.
    Presence of a subquery in the ON expression of a join 
    should not block merging the view that contains this join.

  sql/sql_yacc.yy@1.371.83.1, 2006-09-25 06:15:04-07:00, igor@rurik.mysql.com +8 -0
    Fixed bug #21646.
    Added a new parsing state 'IN_ON', true when
    the parser is in an ON expression of a join.

ChangeSet@1.1616.2771.1, 2006-09-25 05:24:07-07:00, igor@rurik.mysql.com +3 -0
  Fixed bug #21853: assert failure for a grouping query with
  an ALL/ANY quantified subquery in HAVING.
  The Item::split_sum_func2 method should not create Item_ref
  for objects of any class derived from Item_subselect.

  mysql-test/r/subselect.result@1.67.1.116, 2006-09-25 05:24:04-07:00, igor@rurik.mysql.com +36 -0
    Added a test case for bug #21853.

  mysql-test/t/subselect.test@1.58.1.102, 2006-09-25 05:24:04-07:00, igor@rurik.mysql.com +37 -0
    Added a test case for bug #21853.

  sql/item.cc@1.58.1.175, 2006-09-25 05:24:04-07:00, igor@rurik.mysql.com +1 -0
    Fixed bug #21853: assert failure for a grouping query with
    an ALL/ANY quantified subquery in HAVING.
    The Item::split_sum_func2 method should not create Item_ref
    for objects of any class derived from Item_subselect.

ChangeSet@1.1810.2141.5, 2006-09-25 12:50:32+04:00, kaa@polly.local +1 -0
  Fixed broken 'strict' test which relied on incorrect behaviour of my_strtod() (fixed in bug #22129)

  mysql-test/r/strict.result@1.25.4.1, 2006-09-25 12:50:28+04:00, kaa@polly.local +2 -2
    Fixed broken 'strict' test which relied on incorrect behaviour of my_strtod() (fixed in bug #22129)

ChangeSet@1.2273.63.10, 2006-09-25 10:30:23+03:00, jani@a88-112-41-254.elisa-laajakaista.fi +1 -0
  Fixed a test result. Value of MAX_BLOB_WIDTH changed.

  mysql-test/r/gis.result@1.38, 2006-09-25 10:30:19+03:00, jani@a88-112-41-254.elisa-laajakaista.fi +1 -1
    Fixed a test result. Value of MAX_BLOB_WIDTH changed.

ChangeSet@1.1810.2159.1, 2006-09-25 09:28:52+02:00, msvensson@neptunus.(none) +3 -0
  Bug #22379 im_daemon_life_cycle.test fails on merge of 5.1 -> 5.1-engines
  Remove race situations that occur when removing pidfiles. Primarily each process should remove its own
  pidfile, secondly it should be removed by the process that created it and _only_ if it's
  certain the process is dead. Third, mysql-test-run.pl will remove the pidfile when process has been killed.
  - Set state of an instance to STARTING _before_ calling instance->start()
  - Check that pidfile of instance has been created before changing STARTING => STARTED
  - Only remove the pidfile if IM kills an instance with SIGKILL, otherwise the instance will remove it itself

  server-tools/instance-manager/guardian.cc@1.20.1.3, 2006-09-25 09:28:49+02:00, msvensson@neptunus.(none) +21 -6
    If state of an instance is STARTING, chech that the instance pidfile has been created
    before changing state to STARTED
    Set state to STARTING before calling instance->start(), it can take some time
    before it is fully started and during that time it should be in state STARTING

  server-tools/instance-manager/instance.cc@1.32.2.1, 2006-09-25 09:28:49+02:00, msvensson@neptunus.(none) +13 -12
    Only remove the pid file of instance manager when a SIGKILL has 
    been performed sucessfully

  server-tools/instance-manager/instance_options.cc@1.29.1.3, 2006-09-25 09:28:49+02:00, msvensson@neptunus.(none) +2 -1
    Check that fscanf returns 1 which is the number of args that should be scanned from
    the pid file

ChangeSet@1.1616.2770.1, 2006-09-25 00:54:46+02:00, kent@mysql.com +1 -0
  mysql_config.sh:
    Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
    Filter out icc specific options from cflags/libs(_r)

  scripts/mysql_config.sh@1.23.1.2, 2006-09-25 00:52:56+02:00, kent@mysql.com +1 -1
    Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>

  scripts/mysql_config.sh@1.23.1.1, 2006-09-25 00:46:34+02:00, kent@mysql.com +7 -6
    Filter out icc specific options from cflags/libs(_r)

ChangeSet@1.2273.72.1, 2006-09-24 00:41:20+02:00, kent@mysql.com +2 -0
  mysql.spec.sh:
    Added "test" RPM package
    Install all binaries "make install" would
  make_binary_distribution.sh:
    Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)

  scripts/make_binary_distribution.sh@1.128, 2006-09-24 00:27:10+02:00, kent@mysql.com +2 -1
    Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)

  support-files/mysql.spec.sh@1.164.1.1, 2006-09-24 00:28:20+02:00, kent@mysql.com +17 -6
    Removed the rest of the "bench" sub RPM, but added a new "test" sub
    RPM containing the "mysql-test" directory earlier in the "bench" sub
    RPM. The new sub RPM "Obsoltes" "mysql-bench" as well.
    
    Added the rest of the binaries that "make install" would install
    
      bin/ndb_print_backup_file
      bin/ndb_print_schema_file
      bin/ndb_print_sys_file
      sbin/ndb_cpcd

ChangeSet@1.2273.65.12, 2006-09-23 15:24:45+03:00, aelkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi +3 -0
  binlog_row_binlog test gained some indeterministic checks with changes due to
  ChangeSet@1.2309.1.12, 2006-09-12 15:42:13+02:00, guilhem@gbichot3.local +14 -0
    Fixing problems I identified in my auto_increment work pushed in July
    (as part of the auto_increment cleanup of WL #3146; ...
  The problem is in that show binlog events in indeterministic, row events can be compressed,
  so that 2 seconds original delay does not guard from inconsistency.
  
  We syncronize test's current inserted rows counter with system insert delayed thread
  per each query.
  
  From another side there is no requirement for binlog to be event per row and then 
  to verify if binlog has recorded what was recently inserted is better
  via reading from it instead of 'show binlog events'. 

  mysql-test/extra/binlog_tests/binlog_insert_delayed.test@1.3, 2006-09-23 15:24:41+03:00, aelkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi +21 -11
    removing sleeps, syncronizing with system delayed thread per each statement,
    note that an insert statement is performed atomically including writing to binlog,
    so that concurrent selects are waiting. That's why the wait macro is safe.

  mysql-test/include/wait_until_rows_count.inc@1.1, 2006-09-23 15:24:41+03:00, aelkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi +52 -0
    macro implements waiting until a targeted table has a prescribed rows number.
    

  mysql-test/include/wait_until_rows_count.inc@1.0, 2006-09-23 15:24:41+03:00, aelkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi +0 -0

  mysql-test/r/binlog_row_binlog.result@1.7, 2006-09-23 15:24:41+03:00, aelkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi +1 -0
    new result

ChangeSet@1.2273.60.2, 2006-09-22 23:32:47-07:00, brian@zim.(none) +1 -0
  Required file for next tests (taken from work by JimW in Falcon)

  mysql-test/r/true.require@1.1, 2006-09-22 23:32:43-07:00, brian@zim.(none) +2 -0
    New BitKeeper file ``mysql-test/r/true.require''

  mysql-test/r/true.require@1.0, 2006-09-22 23:32:43-07:00, brian@zim.(none) +0 -0

ChangeSet@1.2273.62.8, 2006-09-23 07:07:29+02:00, lars@mysql.com +1 -0
  Disabling test case

  mysql-test/t/disabled.def@1.204.2.2, 2006-09-23 07:07:26+02:00, lars@mysql.com +1 -0
    Disabling test case

ChangeSet@1.1810.2154.1, 2006-09-22 17:43:05+02:00, msvensson@neptunus.(none) +3 -0
  Netware changes for build with  yaSSL
  - Make mwenv automatically adapt the setting to current build dir.
  - Fix include paths that mwccnlm does not understand
  - Link libmysl with yassl  

  netware/BUILD/mwccnlm@1.8, 2006-09-22 17:43:03+02:00, msvensson@neptunus.(none) +6 -3
    Update mwccnlm to convert -I../.. to -I../../

  netware/BUILD/mwenv@1.12.2.1, 2006-09-22 17:43:03+02:00, msvensson@neptunus.(none) +28 -8
    Automatically detect current build dir and based on that calculate current build dir in winw format.
    Allow caller to define MYDEV to override the defatul "F:/mydev"
    Set all paths from these three variables 

  netware/Makefile.am@1.15.1.2, 2006-09-22 17:43:03+02:00, msvensson@neptunus.(none) +2 -1
    Link libmysql with yassl_libs 

ChangeSet@1.1616.2765.2, 2006-09-22 19:23:58+04:00, kaa@polly.local +3 -0
  Fixed bug #22129: A small double precision number becomes zero
  Better checks for underflow/overflow

  mysql-test/r/type_float.result@1.25.1.11, 2006-09-22 19:23:57+04:00, kaa@polly.local +7 -0
    Added testcase for bug #22129

  mysql-test/t/type_float.test@1.15.1.7, 2006-09-22 19:23:57+04:00, kaa@polly.local +10 -1
    Added testcase for bug #22129

  strings/strtod.c@1.15.2.1, 2006-09-22 19:23:57+04:00, kaa@polly.local +44 -25
    Fixed bug #22129: A small double precision number becomes zero
    Better checks for underflow/overflow

ChangeSet@1.1346.883.2, 2006-09-22 17:23:25+02:00, istruewing@chilla.local +1 -0
  Bug#14400 - Query joins wrong rows from table which is subject of
              "concurrent insert"
  After merge fix.

  myisam/mi_rkey.c@1.11.1.7, 2006-09-22 17:23:24+02:00, istruewing@chilla.local +1 -0
    Bug#14400 - Query joins wrong rows from table which is subject of
                "concurrent insert"
    After merge fix.

ChangeSet@1.2181.184.1, 2006-09-22 16:35:52+03:00, jani@ua141d10.elisa.omakaista.fi +9 -0
  Fixed result file. Blob width 8192 changed to 16777216.

  mysql-test/r/ps_6bdb.result@1.45.1.1, 2006-09-22 16:35:49+03:00, jani@ua141d10.elisa.omakaista.fi +136 -136
    Fixed result file. Blob width 8192 changed to 16777216.

  include/mysql_com.h@1.108.1.1, 2006-09-22 16:35:49+03:00, jani@ua141d10.elisa.omakaista.fi +1 -1
    Fix for Bug#20208 "Blobs greater than 8K are being truncated to 8K"
    
    

  mysql-test/r/ps_2myisam.result@1.43.1.1, 2006-09-22 16:35:49+03:00, jani@ua141d10.elisa.omakaista.fi +136 -136
    Fixed result file. Blob width 8192 changed to 16777216.

  mysql-test/r/ps_3innodb.result@1.46.1.1, 2006-09-22 16:35:49+03:00, jani@ua141d10.elisa.omakaista.fi +136 -136
    Fixed result file. Blob width 8192 changed to 16777216.

  mysql-test/r/ps_4heap.result@1.42.1.1, 2006-09-22 16:35:49+03:00, jani@ua141d10.elisa.omakaista.fi +136 -136
    Fixed result file. Blob width 8192 changed to 16777216.

  mysql-test/r/ps_5merge.result@1.43.1.1, 2006-09-22 16:35:49+03:00, jani@ua141d10.elisa.omakaista.fi +272 -272
    Fixed result file. Blob width 8192 changed to 16777216.

  sql/filesort.cc@1.109.1.1, 2006-09-22 16:35:49+03:00, jani@ua141d10.elisa.omakaista.fi +1 -0
    Added a missing break point.

  sql/item.cc@1.195.1.1, 2006-09-22 16:35:49+03:00, jani@ua141d10.elisa.omakaista.fi +9 -3
    Made a function of a block of code.

  sql/item.h@1.203.1.1, 2006-09-22 16:35:49+03:00, jani@ua141d10.elisa.omakaista.fi +1 -0
    Added function string_field_type()

ChangeSet@1.1810.2151.5, 2006-09-22 14:42:43+02:00, georg@lmy002.wdf.sap.corp +6 -0
  Fix for bug #19121: Windows incompatible udf_example

  sql/CMakeLists.txt@1.1.1.1, 2006-09-22 14:42:40+02:00, georg@lmy002.wdf.sap.corp +4 -1
    Added missing udf_example

  BitKeeper/etc/collapsed@1.4.1.1, 2006-09-22 14:42:01+02:00, georg@lmy002.wdf.sap.corp +1 -0

  mysql-test/mysql-test-run.pl@1.30.42.1, 2006-09-22 14:42:40+02:00, georg@lmy002.wdf.sap.corp +3 -1
    fixed path for udf_example.so when running testsuite on Windows

  sql/Makefile.am@1.103.4.1, 2006-09-22 14:42:40+02:00, georg@lmy002.wdf.sap.corp +2 -1
    Added udf_example files for make dist

  sql/udf_example.c@1.29.1.1, 2006-09-22 14:42:40+02:00, georg@lmy002.wdf.sap.corp +11 -0
    fix for Windows: Windows doesn't have socket.h and friends
    
    Added replacements for strmov,bzero and memcpy_fixed when compiling standalone.

  sql/udf_example.def@1.1, 2006-09-22 14:42:40+02:00, georg@lmy002.wdf.sap.corp +24 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/sql/udf_example.def

  sql/udf_example.def@1.0, 2006-09-22 14:42:40+02:00, georg@lmy002.wdf.sap.corp +0 -0

ChangeSet@1.2289.1.1, 2006-09-22 20:22:50+08:00, gni@dev3-127.(none) +3 -0
  BUG@21585  The --help option shows a screen of command options for the ndbd, ndb_mgmd, ndb_mgm
             and other commands related to ndb. For all of these, the help screen contains 
             "Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete.

  storage/ndb/include/util/ndb_opts.h@1.17, 2006-09-22 20:22:47+08:00, gni@dev3-127.(none) +1 -1
    Change help information from including "Ndb.cfg" to "my.cnf" in the header file.

  storage/ndb/test/ndbapi/flexScan.cpp@1.11, 2006-09-22 20:22:47+08:00, gni@dev3-127.(none) +2 -2
    Change help information from including "Ndb.cfg" to "my.cnf".

  storage/ndb/tools/ndb_condig.cpp@1.12.1.1, 2006-09-22 20:22:47+08:00, gni@dev3-127.(none) +1 -1
    Change help information from including "Ndb.cfg" to "my.cnf".

ChangeSet@1.1810.2153.1, 2006-09-22 20:13:03+08:00, gni@dev3-127.(none) +3 -0
  BUG#21585 The --help option shows a screen of command options for ndbd, ndb_mgmd, ndb_mgm 
            and other commands related to ndb. For all of these, the help screen contains
            "Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete.

  ndb/include/util/ndb_opts.h@1.10.6.1, 2006-09-22 20:13:00+08:00, gni@dev3-127.(none) +1 -1
    Change help info from "Ndb.cfg" string to "my.cnf" string in the header file.

  ndb/test/ndbapi/flexScan.cpp@1.9.2.1, 2006-09-22 20:13:00+08:00, gni@dev3-127.(none) +2 -2
    Change help info from including "Ndb.cfg" to "my.cnf".

  ndb/tools/ndb_config.cpp@1.4.9.1, 2006-09-22 20:13:00+08:00, gni@dev3-127.(none) +1 -1
    Change help info from including "Ndb.cfg" to "my.cnf".

ChangeSet@1.1810.2096.27, 2006-09-22 14:46:18+05:00, ramil@mysql.com +1 -0
  Fix for bug #22227: ulong not defined for client library
    - don't use (ulong) type cast in the include/mysql_com.h as it's not 
      a standard type and might cause compilation errors on some platforms.

  include/mysql_com.h@1.100.1.10, 2006-09-22 14:46:13+05:00, ramil@mysql.com +4 -4
    Fix for bug #22227: ulong not defined for client library
      - use UL istead of (ulong) type cast.

ChangeSet@1.2273.67.1, 2006-09-22 11:08:47+03:00, aelkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi +1 -0
  BUG#22067 rpl_rbr_to_sbr and some other fail if NDB is default storage
  
  local file slipped into a previous commit, fixing ignore.

  BitKeeper/etc/ignore@1.246.4.2, 2006-09-22 11:08:43+03:00, aelkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi +0 -1
    fixing a slip in previous bk citool invokation.

ChangeSet@1.2273.32.40, 2006-09-22 09:00:23+02:00, msvensson@neptunus.(none) +1 -0
  Fix windows and aix compile problem
   - Variables must be declared first in each block

  storage/innobase/row/row0row.c@1.25, 2006-09-22 09:00:17+02:00, msvensson@neptunus.(none) +2 -1
    Variables must be declared first in each block

ChangeSet@1.1810.2151.4, 2006-09-22 07:38:24+02:00, georg@lmy002.wdf.sap.corp +1 -0
  Added build rule for mysql_upgrade.exe

  client/CMakeLists.txt@1.1.1.1, 2006-09-22 06:50:58+02:00, georg@lmy002.wdf.sap.corp +3 -0
    Added build rule for mysql_upgrade.exe

ChangeSet@1.1810.2096.26, 2006-09-21 21:45:42+02:00, knielsen@bk-internal.mysql.com +1 -0
  After-merge fix (null merge).

  ndb/config/type_ndbapitools.mk.am@1.8.1.2, 2006-09-21 21:45:19+02:00, knielsen@bk-internal.mysql.com +1 -1
    After-merge fix (null merge).

ChangeSet@1.2273.32.38, 2006-09-21 20:37:35+02:00, msvensson@shellback.(none) +1 -0
  Fix Solaris 10  compile failure
   - Void function can't return a value

  storage/innobase/dict/dict0dict.c@1.90, 2006-09-21 20:37:31+02:00, msvensson@shellback.(none) +1 -1
    Void function can't return a value

ChangeSet@1.2273.45.12, 2006-09-21 18:05:02+02:00, mats@romeo.(none) +2 -0
  BUG#22550 (Replication of BIT column failing):
  Using move_field_offset() to move field pointer to other record before
  calling pack()/unpack().

  sql/log_event.cc@1.242.1.1, 2006-09-21 18:04:58+02:00, mats@romeo.(none) +9 -2
    Using move_field_offset() to move the field pointer. It is necessary
    for unpack() and pack() of BIT fields to operate correctly.
    Adding debug printouts.

  sql/sql_class.cc@1.285.1.5, 2006-09-21 18:04:59+02:00, mats@romeo.(none) +11 -2
    Using move_field_offset() to move the field pointer. It is necessary
    for unpack() and pack() of BIT fields to operate correctly.
    Adding debug printouts to packing of update rows event.

ChangeSet@1.1810.2152.2, 2006-09-21 17:38:42+02:00, joerg@trift2. +1 -0
  Add a dummy file for "Docs/manual.chm" as we need it for "make dist" to work.

  Docs/manual.chm@1.1, 2006-09-21 17:37:19+02:00, joerg@trift2. +14 -0
    BitKeeper file /MySQL/M50/push-5.0/Docs/manual.chm

  Docs/manual.chm@1.0, 2006-09-21 17:37:19+02:00, joerg@trift2. +0 -0

ChangeSet@1.2273.62.5, 2006-09-21 15:56:14+02:00, georg@lmy002.wdf.sap.corp +1 -0
  added udf_example.def for make dist

  sql/Makefile.am@1.155.2.1, 2006-09-21 15:56:10+02:00, georg@lmy002.wdf.sap.corp +1 -1
    added udf_example.def for make dist

ChangeSet@1.2273.62.4, 2006-09-21 15:19:20+02:00, georg@lmy002.wdf.sap.corp +6 -0
  Windows 64bit fixes
  Fixed udf_example, so tests now can also run udf on win.

  sql/udf_example.def@1.1, 2006-09-21 15:06:01+02:00, georg@lmy002.wdf.sap.corp +24 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-5.1-win/sql/udf_example.def

  sql/udf_example.def@1.0, 2006-09-21 15:06:01+02:00, georg@lmy002.wdf.sap.corp +0 -0

  include/config-win.h@1.91, 2006-09-21 15:19:15+02:00, georg@lmy002.wdf.sap.corp +0 -1
    removed USE_32_BIT_TIME

  include/my_time.h@1.15, 2006-09-21 15:19:15+02:00, georg@lmy002.wdf.sap.corp +5 -0
    Fixed size of my_time for Win64 (should be 64bit)

  mysql-test/mysql-test-run.pl@1.170.1.1, 2006-09-21 15:19:15+02:00, georg@lmy002.wdf.sap.corp +3 -1
    Added windows paths for udf_example

  sql/CMakeLists.txt@1.27.1.1, 2006-09-21 15:19:16+02:00, georg@lmy002.wdf.sap.corp +4 -0
    Added udf_example.dll

  sql/udf_example.c@1.30, 2006-09-21 15:19:16+02:00, georg@lmy002.wdf.sap.corp +4 -0
    Windows doesn't know about socket.h and friends. Use winsock.h instead

ChangeSet@1.2273.65.9, 2006-09-21 14:19:17+02:00, lars@mysql.com +5 -0
  After merge fixes

  mysql-test/extra/rpl_tests/rpl_insert_id.test@1.12, 2006-09-21 14:19:13+02:00, lars@mysql.com +41 -17
    After merge fixes

  mysql-test/r/rpl_insert_id.result@1.23, 2006-09-21 14:19:13+02:00, lars@mysql.com +13 -8
    After merge fixes

  mysql-test/r/rpl_row_max_relay_size.result@1.4, 2006-09-21 14:19:13+02:00, lars@mysql.com +230 -18
    After merge fixes

  mysql-test/r/rpl_stm_max_relay_size.result@1.23, 2006-09-21 14:19:13+02:00, lars@mysql.com +18 -18
    After merge fixes

  mysql-test/t/rpl_row_max_relay_size.test@1.3, 2006-09-21 14:19:14+02:00, lars@mysql.com +3 -1
    After merge fixes

ChangeSet@1.1810.2150.5, 2006-09-21 13:38:01+02:00, lars@mysql.com +2 -0
  After merge fixes

  mysql-test/r/rpl_insert_id.result@1.12.3.5, 2006-09-21 13:37:57+02:00, lars@mysql.com +4 -1
    After merge fixes

  mysql-test/r/rpl_max_relay_size.result@1.20.1.2, 2006-09-21 13:37:57+02:00, lars@mysql.com +32 -29
    After merge fixes

ChangeSet@1.1616.2767.3, 2006-09-21 13:19:52+02:00, lars@mysql.com +2 -0
  Adding proper setup phase for test case rpl_insert_id

  mysql-test/r/rpl_insert_id.result@1.10.1.3, 2006-09-21 13:19:50+02:00, lars@mysql.com +24 -0
    Updated result file

  mysql-test/t/rpl_insert_id.test@1.9.1.4, 2006-09-21 13:19:50+02:00, lars@mysql.com +31 -13
    Adding proper setup phase for test case rpl_insert_id

ChangeSet@1.1616.2768.2, 2006-09-21 16:05:01+05:00, ramil@mysql.com +3 -0
  Fix for bug #20204: "order by" changes the results returned
  
  Item_substr's results are improperly stored in a temporary table due to       
  wrongly calculated max_length value for multi-byte charsets if two            
  arguments specified.                                                          

  mysql-test/r/ctype_utf8.result@1.45.1.28, 2006-09-21 16:04:58+05:00, ramil@mysql.com +13 -0
    Fix for bug #20204: "order by" changes the results returned
      - test case.

  mysql-test/t/ctype_utf8.test@1.57.1.18, 2006-09-21 16:04:58+05:00, ramil@mysql.com +12 -0
    Fix for bug #20204: "order by" changes the results returned
      - test result.

  sql/item_strfunc.cc@1.196.6.18, 2006-09-21 16:04:58+05:00, ramil@mysql.com +2 -1
    Fix for bug #20204: "order by" changes the results returned
      - always take into account current mbmaxlen value calculating max_length.

ChangeSet@1.2273.65.7, 2006-09-21 13:04:33+02:00, lars@mysql.com +2 -0
  If mysqlslap schema does not exists, it should be an error, so no need for IF EXISTS
  Setting default database back to 'test', so that next test case don't use the wrong database

  mysql-test/r/rpl_insert.result@1.3, 2006-09-21 13:04:30+02:00, lars@mysql.com +8 -1
    result file update

  mysql-test/t/rpl_insert.test@1.6, 2006-09-21 13:04:30+02:00, lars@mysql.com +9 -6
    If mysqlslap schema does not exists, it should be an error, so no need for IF EXISTS
    Setting default database back to 'test', so that next test case don't use the wrong database

ChangeSet@1.2273.65.6, 2006-09-21 11:45:16+02:00, lars@mysql.com +1 -0
  Added master-slave synchronization to make sure truncate happen before slave manipulations on every platform

  mysql-test/extra/rpl_tests/rpl_row_tabledefs.test@1.5, 2006-09-21 11:45:12+02:00, lars@mysql.com +6 -0
    Added master-slave synchronization to make sure truncate happen before slave manipulations on every platform

ChangeSet@1.2255.61.7, 2006-09-21 13:39:29+04:00, dlenev@mockturtle.local +7 -0
  Fix for bug#20670 "UPDATE using key and invoking trigger that modifies
  this key does not stop" (5.1 version).
  
  UPDATE statement which WHERE clause used key and which invoked trigger
  that modified field in this key worked indefinetely.
  
  This problem occured because in cases when UPDATE statement was
  executed in update-on-the-fly mode (in which row is updated right
  during evaluation of select for WHERE clause) the new version of
  the row became visible to select representing WHERE clause and was
  updated again and again.
  We already solve this problem for UPDATE statements which does not
  invoke triggers by detecting the fact that we are going to update
  field in key used for scanning and performing update in two steps,
  during the first step we gather information about the rows to be
  updated and then doing actual updates. We also do this for
  MULTI-UPDATE and in its case we even detect situation when such
  fields are updated in triggers (actually we simply assume that
  we always update fields used in key if we have before update
  trigger).
  
  The fix simply extends this check which is done with help of
  check_if_key_used()/QUICK_SELECT_I::check_if_keys_used()
  routine/method in such way that it also detects cases when
  field used in key is updated in trigger. We do this by
  changing check_if_key_used() to take field bitmap instead
  field list as argument and passing TABLE::write_set
  to it (we also have to add info about fields used in
  triggers to this bitmap a bit earlier).
  As nice side-effect we have more precise and thus more optimal
  perfomance-wise check for the MULTI-UPDATE.
  Also check_if_key_used() routine and similar method were renamed
  to is_key_used()/is_keys_used() in order to better reflect that
  it is simple boolean predicate.
  Finally, partition_key_modified() routine now also takes field
  bitmap instead of field list as argument.

  sql/key.cc@1.44, 2006-09-21 13:39:27+04:00, dlenev@mockturtle.local +21 -23
    Now check_if_key_used() takes field bitmap instead of field list as
    argument (bitmaps are also used in its implementation).
    It is no longer responsible for checking if key uses automatically
    updated TIMESTAMP fields, instead callers should properly mark such
    fields in field bitmap.
    Also renamed this function to is_key_used().

  sql/mysql_priv.h@1.432.1.1, 2006-09-21 13:39:27+04:00, dlenev@mockturtle.local +1 -1
    Renamed check_if_key_used() to is_key_used(), also now this routine
    takes field bitmap instead of field list as argument. 

  sql/opt_range.cc@1.228.2.1, 2006-09-21 13:39:27+04:00, dlenev@mockturtle.local +8 -8
    QUICK_SELECT_I::check_if_keys_used() method and check_if_key_used()
    routine were renamed to is_keys_used()/is_key_used(). Also now they
    take bitmap instead of field list as argument.

  sql/opt_range.h@1.62.1.1, 2006-09-21 13:39:27+04:00, dlenev@mockturtle.local +5 -6
    QUICK_SELECT_I::check_if_key_used() method was renamed to is_keys_used().
    Now it takes field bitmap instead of field list as argument and no
    longer responsible for checking if key uses automatically updated
    TIMESTAMP fields. Instead callers should properly mark such fields
    in field bitmap.

  sql/sql_partition.cc@1.82.2.3, 2006-09-21 13:39:27+04:00, dlenev@mockturtle.local +5 -7
    partition_key_modified() now takes field bitmap instead of list
    as argument.

  sql/sql_partition.h@1.11, 2006-09-21 13:39:27+04:00, dlenev@mockturtle.local +1 -1
    partition_key_modified() now takes field bitmap as argument
    instead of field list. 

  sql/sql_update.cc@1.204.1.1, 2006-09-21 13:39:27+04:00, dlenev@mockturtle.local +15 -21
    To detect situation in which trigger modifies part of key which is
    going to be used for processing of where clause and thus makes
    processing of this update with update-on-the-fly method unsafe
    we use check_if_key_used() routine and similar method (which were
    renamed to is_key_used()) plus information from TABLE::write_map
    bitmap. Note that we have to call TABLE::mark_columns_needed_for_update()
    method earlier now to fill this bitmap with information about fields
    updated in triggers.
    safe_update_on_fly() routine now uses the same approach and no
    longer needs list of fields as argument.

ChangeSet@1.1810.2131.17, 2006-09-21 11:37:08+02:00, msvensson@shellback.(none) +4 -0
  Use a direct reference to the yassl and taocrypt libtool libraries to link with 

  config/ac-macros/yassl.m4@1.10.2.1, 2006-09-21 11:37:05+02:00, msvensson@shellback.(none) +2 -1
    Use a direct reference to the yassl and taocrypt libtool libraries to link with 

  extra/yassl/taocrypt/benchmark/Makefile.am@1.2, 2006-09-21 11:37:05+02:00, msvensson@shellback.(none) +1 -3
    Use a direct reference to the yassl and taocrypt libtool libraries to link with 

  extra/yassl/taocrypt/test/Makefile.am@1.2, 2006-09-21 11:37:05+02:00, msvensson@shellback.(none) +1 -3
    Use a direct reference to the yassl and taocrypt libtool libraries to link with 

  extra/yassl/testsuite/Makefile.am@1.3.1.2, 2006-09-21 11:37:05+02:00, msvensson@shellback.(none) +2 -3
    Use a direct reference to the yassl and taocrypt libtool libraries to link with 

ChangeSet@1.2273.66.2, 2006-09-21 01:39:09-06:00, tsmith@siva.hindu.god +86 -0
  Applied innodb-5.1 snapshots ss799 and ss854
  
  Bugs fixed:
  - Bug #20877: InnoDB data dictionary memory footprint is too big
  - Bug #13544: Second delete of same row in transaction illustrates non-optimal locking
  - Bug #20791: valgrind errors in InnoDB

  storage/innobase/btr/btr0btr.c@1.50, 2006-09-21 01:38:39-06:00, tsmith@siva.hindu.god +211 -232
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r823:
    Minor cleanup related to Bug #20877.
    
    btr_print_recursive(): Replace tree->tree_indexes with tree->index.
    This should have been done in r453.
    
    univ.i: Add UNIV_BTR_PRINT.
    
    rw_lock_t: Reduce writer_is_wait_ex to a bit and move it close to
    other bitfields.  Change the types to unsigned, in case ulint or ibool
    bitfields will not work.
    
    
    Revision r828:
    Remove dict_tree_t, which should have been removed in r453.
    There always was a one-to-one mapping between dict_tree_t and dict_index_t.
    
    This saves 6 machine words per B-tree index in the data dictionary
    cache plus the memory allocation overhead.  We save one mem_heap_t
    object per index (15 machine words).  Considering the internal
    fragmentation of the buddy allocator in mem_area_alloc(), this should
    save 32 machine words per index (128 bytes on 32-bit systems and 256
    bytes on 64-bit systems).  (Bug #20877)
    
    struct dict_tree_struct, dict_tree_t: Remove.
    
    struct dict_index_struct: Add page and lock.
    
    dict_tree_create(): Remove.  Replace the invocation with
    assignment to index->page and a call to rw_lock_create(&index->lock).
    
    dict_tree_free(): Remove.  Replace the invocation wtih
    a call to rw_lock_free(&index->lock).
    
    dict_index_get_tree(): Remove.
    
    dict_tree_get_space_reserve(): Rename to dict_index_get_space_reserve()
    and remove the parameter, which was unused.
    
    btr_level_list_remove(): Remove the unused parameter "tree".
    
    Replace the occurrences of "tree" with "index" in names of variables,
    functions and data types, e.g. "dict_tree_t tree" becomes
    "dict_index_t index".  Remove local variables "tree" or "index" of
    functions that needed both "tree" and "index".
    
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.
    
    
    Revision r837:
    page_offset(): New function to replace many ut_align_offset(., UNIV_PAGE_SIZE)
    calls.
    
    dict_index_build_node_ptr(): Correct a typo in a comment.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/btr/btr0cur.c@1.56, 2006-09-21 01:38:39-06:00, tsmith@siva.hindu.god +88 -106
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r816:
    Remove more remnants of mixed indexes.
    
    Revision r828:
    Remove dict_tree_t, which should have been removed in r453.
    There always was a one-to-one mapping between dict_tree_t and dict_index_t.
    
    This saves 6 machine words per B-tree index in the data dictionary
    cache plus the memory allocation overhead.  We save one mem_heap_t
    object per index (15 machine words).  Considering the internal
    fragmentation of the buddy allocator in mem_area_alloc(), this should
    save 32 machine words per index (128 bytes on 32-bit systems and 256
    bytes on 64-bit systems).  (Bug #20877)
    
    struct dict_tree_struct, dict_tree_t: Remove.
    
    struct dict_index_struct: Add page and lock.
    
    dict_tree_create(): Remove.  Replace the invocation with
    assignment to index->page and a call to rw_lock_create(&index->lock).
    
    dict_tree_free(): Remove.  Replace the invocation wtih
    a call to rw_lock_free(&index->lock).
    
    dict_index_get_tree(): Remove.
    
    dict_tree_get_space_reserve(): Rename to dict_index_get_space_reserve()
    and remove the parameter, which was unused.
    
    btr_level_list_remove(): Remove the unused parameter "tree".
    
    Replace the occurrences of "tree" with "index" in names of variables,
    functions and data types, e.g. "dict_tree_t tree" becomes
    "dict_index_t index".  Remove local variables "tree" or "index" of
    functions that needed both "tree" and "index".
    
    
    Revision r830:
    page_align(ptr): New utility function to replace
    ut_align_down(ptr, UNIV_PAGE_SIZE) calls.
    
    
    Revision r837:
    page_offset(): New function to replace many ut_align_offset(., UNIV_PAGE_SIZE)
    calls.
    
    dict_index_build_node_ptr(): Correct a typo in a comment.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/btr/btr0pcur.c@1.23, 2006-09-21 01:38:39-06:00, tsmith@siva.hindu.god +39 -42
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r828:
    Remove dict_tree_t, which should have been removed in r453.
    There always was a one-to-one mapping between dict_tree_t and dict_index_t.
    
    This saves 6 machine words per B-tree index in the data dictionary
    cache plus the memory allocation overhead.  We save one mem_heap_t
    object per index (15 machine words).  Considering the internal
    fragmentation of the buddy allocator in mem_area_alloc(), this should
    save 32 machine words per index (128 bytes on 32-bit systems and 256
    bytes on 64-bit systems).  (Bug #20877)
    
    struct dict_tree_struct, dict_tree_t: Remove.
    
    struct dict_index_struct: Add page and lock.
    
    dict_tree_create(): Remove.  Replace the invocation with
    assignment to index->page and a call to rw_lock_create(&index->lock).
    
    dict_tree_free(): Remove.  Replace the invocation wtih
    a call to rw_lock_free(&index->lock).
    
    dict_index_get_tree(): Remove.
    
    dict_tree_get_space_reserve(): Rename to dict_index_get_space_reserve()
    and remove the parameter, which was unused.
    
    btr_level_list_remove(): Remove the unused parameter "tree".
    
    Replace the occurrences of "tree" with "index" in names of variables,
    functions and data types, e.g. "dict_tree_t tree" becomes
    "dict_index_t index".  Remove local variables "tree" or "index" of
    functions that needed both "tree" and "index".
    
    
    Revision r830:
    page_align(ptr): New utility function to replace
    ut_align_down(ptr, UNIV_PAGE_SIZE) calls.
    
    
    Revision r837:
    page_offset(): New function to replace many ut_align_offset(., UNIV_PAGE_SIZE)
    calls.
    
    dict_index_build_node_ptr(): Correct a typo in a comment.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/btr/btr0sea.c@1.47, 2006-09-21 01:38:39-06:00, tsmith@siva.hindu.god +84 -87
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.
    
    
    Revision r816:
    Remove more remnants of mixed indexes.
    
    Revision r824:
    Reduce the size of btr_search_t from 13 machine words to 7.  This
    structure is reserved for every index in the data dictionary cache.
    (Bug #20877)
    
    We could shrink the structure further to three 32-bit words or two
    64-bit words by turning the remaining fields to bit-fields.
    Unfortunately, the fields are not protected by any mutex, and thus we
    would better keep each field aligned to a machine word.
    
    btr_search_t, buf_block_t: Rename "ulint side" to "ibool left_side".
    Remove BTR_SEARCH_LEFT_SIDE and BTR_SEARCH_RIGHT_SIDE, and also rename
    some local variables and function parameters from "ulint side" to
    "ibool left_side".
    
    btr_search_t: Remove the unused fields last_search, n_direction, direction,
    and modify_clock.  Remove the unused constants BTR_SEA_NO_DIRECTION,
    BTR_SEA_LEFT, BTR_SEA_RIGHT, and BTR_SEA_SAME_REC.
    
    btr_search_t: Remove magic_n unless #defined UNIV_DEBUG.  Turn an assertion
    about the magic number into a debug assertion.
    
    
    Revision r828:
    Remove dict_tree_t, which should have been removed in r453.
    There always was a one-to-one mapping between dict_tree_t and dict_index_t.
    
    This saves 6 machine words per B-tree index in the data dictionary
    cache plus the memory allocation overhead.  We save one mem_heap_t
    object per index (15 machine words).  Considering the internal
    fragmentation of the buddy allocator in mem_area_alloc(), this should
    save 32 machine words per index (128 bytes on 32-bit systems and 256
    bytes on 64-bit systems).  (Bug #20877)
    
    struct dict_tree_struct, dict_tree_t: Remove.
    
    struct dict_index_struct: Add page and lock.
    
    dict_tree_create(): Remove.  Replace the invocation with
    assignment to index->page and a call to rw_lock_create(&index->lock).
    
    dict_tree_free(): Remove.  Replace the invocation wtih
    a call to rw_lock_free(&index->lock).
    
    dict_index_get_tree(): Remove.
    
    dict_tree_get_space_reserve(): Rename to dict_index_get_space_reserve()
    and remove the parameter, which was unused.
    
    btr_level_list_remove(): Remove the unused parameter "tree".
    
    Replace the occurrences of "tree" with "index" in names of variables,
    functions and data types, e.g. "dict_tree_t tree" becomes
    "dict_index_t index".  Remove local variables "tree" or "index" of
    functions that needed both "tree" and "index".
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/buf/buf0buf.c@1.59, 2006-09-21 01:38:39-06:00, tsmith@siva.hindu.god +31 -30
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r824:
    Reduce the size of btr_search_t from 13 machine words to 7.  This
    structure is reserved for every index in the data dictionary cache.
    (Bug #20877)
    
    We could shrink the structure further to three 32-bit words or two
    64-bit words by turning the remaining fields to bit-fields.
    Unfortunately, the fields are not protected by any mutex, and thus we
    would better keep each field aligned to a machine word.
    
    btr_search_t, buf_block_t: Rename "ulint side" to "ibool left_side".
    Remove BTR_SEARCH_LEFT_SIDE and BTR_SEARCH_RIGHT_SIDE, and also rename
    some local variables and function parameters from "ulint side" to
    "ibool left_side".
    
    btr_search_t: Remove the unused fields last_search, n_direction, direction,
    and modify_clock.  Remove the unused constants BTR_SEA_NO_DIRECTION,
    BTR_SEA_LEFT, BTR_SEA_RIGHT, and BTR_SEA_SAME_REC.
    
    btr_search_t: Remove magic_n unless #defined UNIV_DEBUG.  Turn an assertion
    about the magic number into a debug assertion.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/buf/buf0flu.c@1.35, 2006-09-21 01:38:39-06:00, tsmith@siva.hindu.god +2 -2
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/buf/buf0lru.c@1.31, 2006-09-21 01:38:39-06:00, tsmith@siva.hindu.god +4 -4
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/buf/buf0rea.c@1.22, 2006-09-21 01:38:39-06:00, tsmith@siva.hindu.god +8 -8
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/data/data0data.c@1.22, 2006-09-21 01:38:39-06:00, tsmith@siva.hindu.god +4 -4
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/data/data0type.c@1.29, 2006-09-21 01:38:39-06:00, tsmith@siva.hindu.god +11 -45
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.
    
    
    Revision r816:
    Remove more remnants of mixed indexes.
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.

  storage/innobase/dict/dict0boot.c@1.18, 2006-09-21 01:38:39-06:00, tsmith@siva.hindu.god +51 -54
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.
    
    
    Revision r816:
    Remove more remnants of mixed indexes.
    
    Revision r827:
    Make dict_index_find_cols() always succeed.
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/dict/dict0crea.c@1.40, 2006-09-21 01:38:39-06:00, tsmith@siva.hindu.god +38 -37
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.
    
    
    Revision r816:
    Remove more remnants of mixed indexes.
    
    Revision r827:
    Make dict_index_find_cols() always succeed.
    
    Revision r828:
    Remove dict_tree_t, which should have been removed in r453.
    There always was a one-to-one mapping between dict_tree_t and dict_index_t.
    
    This saves 6 machine words per B-tree index in the data dictionary
    cache plus the memory allocation overhead.  We save one mem_heap_t
    object per index (15 machine words).  Considering the internal
    fragmentation of the buddy allocator in mem_area_alloc(), this should
    save 32 machine words per index (128 bytes on 32-bit systems and 256
    bytes on 64-bit systems).  (Bug #20877)
    
    struct dict_tree_struct, dict_tree_t: Remove.
    
    struct dict_index_struct: Add page and lock.
    
    dict_tree_create(): Remove.  Replace the invocation with
    assignment to index->page and a call to rw_lock_create(&index->lock).
    
    dict_tree_free(): Remove.  Replace the invocation wtih
    a call to rw_lock_free(&index->lock).
    
    dict_index_get_tree(): Remove.
    
    dict_tree_get_space_reserve(): Rename to dict_index_get_space_reserve()
    and remove the parameter, which was unused.
    
    btr_level_list_remove(): Remove the unused parameter "tree".
    
    Replace the occurrences of "tree" with "index" in names of variables,
    functions and data types, e.g. "dict_tree_t tree" becomes
    "dict_index_t index".  Remove local variables "tree" or "index" of
    functions that needed both "tree" and "index".
    
    
    Revision r832:
    Add dict_table_get_col_name() in preparation for getting rid of
    dict_col_t::name, and use it instead of col->name everywhere.
    
    Revision r833:
    Tweak the bit-field definitions introduced since r813 to address Bug #20877.
    
    rw_lock_t: Do not make writer_is_wait_ex a bit-field.  There are no fields
    yet that could be fused to the same machine word, but we play it safe,
    because the field writer_is_wait_ex may be modified by several threads
    simultaneously.  Such fields should always be allocated an own machine
    word.
    
    dict_table_t: Change the type of all bit-fields to "unsigned".  Make
    "space" a bit-field of 32 bits.  Move name_hash and id_hash after all
    bit-fields, so that the bit-fields can be allocated together.  Do not
    make autoinc_inited a bit-field, as we cannot allocate any field
    from the same machine word.
    
    dict_build_table_def_step(): Pass a local variable to
    fil_create_new_single_table_tablespace() and initialize table->space
    from it after the call, now that table->space is a bit-field.
    
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/dict/dict0dict.c@1.89, 2006-09-21 01:38:39-06:00, tsmith@siva.hindu.god +320 -496
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.
    
    
    Revision r816:
    Remove more remnants of mixed indexes.
    
    Revision r818:
    Remove dict_col_t::hash, dict_col_t::table,
    dict_sys->col_hash, and DICT_POOL_PER_COL_HASH.  (Bug #20877)
    
    The col->table pointer was only needed for maintaining a hash table of
    all defined columns in all tables.  The hash table was only looked up
    in dict_index_find_cols().  Removing the col->hash and col->table
    pointers reduces the size of a table column by two machine words
    (usually 8 or 16 bytes).
    
    dict_col_add_to_cache(), dict_col_reposition_in_cache(),
    dict_col_remove_from_cache(): Remove.  These only updated dict_sys->col_hash.
    
    dict_index_find_cols(): Use a linear search instead of the hash table.
    The time complexity is affected, but this function is only invoked by
    dict_index_add_to_cache(), and we only search the columns of a single
    table (typically at most a few dozen) as opposed to all columns of all
    tables.
    
    
    Revision r819:
    dict_col_t: Reduce ord_part to one bit.
    
    dict_index_add_to_cache(): Instead of incrementing ord_part, set it.
    
    dict_index_remove_from_cache(): Do not touch ord_part.
    
    dtype_t: Reduce mbminlen from 3 to 2 bits.
    
    row_upd(): Add a UNIV_LIKELY hint around node->in_mysql_interface.
    
    
    Revision r820:
    Remove dict_col_t::clust_pos.
    
    dict_col_get_clust_pos(): Add parameter clust_index.  Replace the
    look-up with a linear search of all columns in the clustered index.
    
    row_upd_index_replace_new_col_vals(): Compute clust_index outside
    the loops.  Compute clust_pos outside the inner loop.
    
    row_upd_changes_ord_field_binary(), row_upd_changes_first_fields_binary():
    Compute clust_index outside the loops.  Declare the auxiliary variables
    inside the loop scope.
    
    
    Revision r821:
    dict_table_t: Rename the integer field max_row_size
    to the Boolean field big_rows.  (Bug #20877)
    
    BIG_ROW_SIZE: Move the definition from row0sel.c to dict_table_add_to_cache().
    
    
    Revision r826:
    The code base was reindented in r763 and automatic .emacs indentation
    settings introduced. Some problems were found, so from this commit on one
    additional indentation rule is introduced:
    
     (add-to-list 'c-offsets-alist '(arglist-intro . +))
    
    Note that fixing some of the unfortunate line-splits done in r764 will be
    done in a future change.
    
    Revision r827:
    Make dict_index_find_cols() always succeed.
    
    Revision r828:
    Remove dict_tree_t, which should have been removed in r453.
    There always was a one-to-one mapping between dict_tree_t and dict_index_t.
    
    This saves 6 machine words per B-tree index in the data dictionary
    cache plus the memory allocation overhead.  We save one mem_heap_t
    object per index (15 machine words).  Considering the internal
    fragmentation of the buddy allocator in mem_area_alloc(), this should
    save 32 machine words per index (128 bytes on 32-bit systems and 256
    bytes on 64-bit systems).  (Bug #20877)
    
    struct dict_tree_struct, dict_tree_t: Remove.
    
    struct dict_index_struct: Add page and lock.
    
    dict_tree_create(): Remove.  Replace the invocation with
    assignment to index->page and a call to rw_lock_create(&index->lock).
    
    dict_tree_free(): Remove.  Replace the invocation wtih
    a call to rw_lock_free(&index->lock).
    
    dict_index_get_tree(): Remove.
    
    dict_tree_get_space_reserve(): Rename to dict_index_get_space_reserve()
    and remove the parameter, which was unused.
    
    btr_level_list_remove(): Remove the unused parameter "tree".
    
    Replace the occurrences of "tree" with "index" in names of variables,
    functions and data types, e.g. "dict_tree_t tree" becomes
    "dict_index_t index".  Remove local variables "tree" or "index" of
    functions that needed both "tree" and "index".
    
    
    Revision r831:
    Add dict_col_get_clust_pos_noninline(), which was forgotten from r820.
    
    
    Revision r832:
    Add dict_table_get_col_name() in preparation for getting rid of
    dict_col_t::name, and use it instead of col->name everywhere.
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.
    
    
    Revision r836:
    Remove dict_col_t::name, replace it with a packed array of column names in
    dict_table_t. This saves 8-15+ bytes of memory per column on 64-bit
    machines.
    
    Revision r837:
    page_offset(): New function to replace many ut_align_offset(., UNIV_PAGE_SIZE)
    calls.
    
    dict_index_build_node_ptr(): Correct a typo in a comment.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.
    
    Revision r845:
    Split long lines with [] operators better.

  storage/innobase/dict/dict0load.c@1.52, 2006-09-21 01:38:39-06:00, tsmith@siva.hindu.god +58 -50
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.
    
    
    Revision r832:
    Add dict_table_get_col_name() in preparation for getting rid of
    dict_col_t::name, and use it instead of col->name everywhere.
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/dict/dict0mem.c@1.24, 2006-09-21 01:38:40-06:00, tsmith@siva.hindu.god +91 -13
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.
    
    
    Revision r818:
    Remove dict_col_t::hash, dict_col_t::table,
    dict_sys->col_hash, and DICT_POOL_PER_COL_HASH.  (Bug #20877)
    
    The col->table pointer was only needed for maintaining a hash table of
    all defined columns in all tables.  The hash table was only looked up
    in dict_index_find_cols().  Removing the col->hash and col->table
    pointers reduces the size of a table column by two machine words
    (usually 8 or 16 bytes).
    
    dict_col_add_to_cache(), dict_col_reposition_in_cache(),
    dict_col_remove_from_cache(): Remove.  These only updated dict_sys->col_hash.
    
    dict_index_find_cols(): Use a linear search instead of the hash table.
    The time complexity is affected, but this function is only invoked by
    dict_index_add_to_cache(), and we only search the columns of a single
    table (typically at most a few dozen) as opposed to all columns of all
    tables.
    
    
    Revision r820:
    Remove dict_col_t::clust_pos.
    
    dict_col_get_clust_pos(): Add parameter clust_index.  Replace the
    look-up with a linear search of all columns in the clustered index.
    
    row_upd_index_replace_new_col_vals(): Compute clust_index outside
    the loops.  Compute clust_pos outside the inner loop.
    
    row_upd_changes_ord_field_binary(), row_upd_changes_first_fields_binary():
    Compute clust_index outside the loops.  Declare the auxiliary variables
    inside the loop scope.
    
    
    Revision r821:
    dict_table_t: Rename the integer field max_row_size
    to the Boolean field big_rows.  (Bug #20877)
    
    BIG_ROW_SIZE: Move the definition from row0sel.c to dict_table_add_to_cache().
    
    
    Revision r828:
    Remove dict_tree_t, which should have been removed in r453.
    There always was a one-to-one mapping between dict_tree_t and dict_index_t.
    
    This saves 6 machine words per B-tree index in the data dictionary
    cache plus the memory allocation overhead.  We save one mem_heap_t
    object per index (15 machine words).  Considering the internal
    fragmentation of the buddy allocator in mem_area_alloc(), this should
    save 32 machine words per index (128 bytes on 32-bit systems and 256
    bytes on 64-bit systems).  (Bug #20877)
    
    struct dict_tree_struct, dict_tree_t: Remove.
    
    struct dict_index_struct: Add page and lock.
    
    dict_tree_create(): Remove.  Replace the invocation with
    assignment to index->page and a call to rw_lock_create(&index->lock).
    
    dict_tree_free(): Remove.  Replace the invocation wtih
    a call to rw_lock_free(&index->lock).
    
    dict_index_get_tree(): Remove.
    
    dict_tree_get_space_reserve(): Rename to dict_index_get_space_reserve()
    and remove the parameter, which was unused.
    
    btr_level_list_remove(): Remove the unused parameter "tree".
    
    Replace the occurrences of "tree" with "index" in names of variables,
    functions and data types, e.g. "dict_tree_t tree" becomes
    "dict_index_t index".  Remove local variables "tree" or "index" of
    functions that needed both "tree" and "index".
    
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.
    
    
    Revision r836:
    Remove dict_col_t::name, replace it with a packed array of column names in
    dict_table_t. This saves 8-15+ bytes of memory per column on 64-bit
    machines.

  storage/innobase/eval/eval0eval.c@1.12, 2006-09-21 01:38:40-06:00, tsmith@siva.hindu.god +1 -1
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r826:
    The code base was reindented in r763 and automatic .emacs indentation
    settings introduced. Some problems were found, so from this commit on one
    additional indentation rule is introduced:
    
     (add-to-list 'c-offsets-alist '(arglist-intro . +))
    
    Note that fixing some of the unfortunate line-splits done in r764 will be
    done in a future change.

  storage/innobase/eval/eval0proc.c@1.7, 2006-09-21 01:38:40-06:00, tsmith@siva.hindu.god +2 -2
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/fil/fil0fil.c@1.71, 2006-09-21 01:38:40-06:00, tsmith@siva.hindu.god +30 -31
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/fsp/fsp0fsp.c@1.34, 2006-09-21 01:38:40-06:00, tsmith@siva.hindu.god +66 -65
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.
    
    Revision r845:
    Split long lines with [] operators better.

  storage/innobase/handler/ha_innodb.cc@1.298, 2006-09-21 01:38:41-06:00, tsmith@siva.hindu.god +21 -30
    Applied innodb-5.1 snapshots ss799 and ss854

  storage/innobase/handler/ha_innodb.h@1.127, 2006-09-21 01:38:42-06:00, tsmith@siva.hindu.god +0 -2
    Applied innodb-5.1 snapshots ss799 and ss854

  storage/innobase/ibuf/ibuf0ibuf.c@1.49, 2006-09-21 01:38:42-06:00, tsmith@siva.hindu.god +72 -68
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.
    
    
    Revision r828:
    Remove dict_tree_t, which should have been removed in r453.
    There always was a one-to-one mapping between dict_tree_t and dict_index_t.
    
    This saves 6 machine words per B-tree index in the data dictionary
    cache plus the memory allocation overhead.  We save one mem_heap_t
    object per index (15 machine words).  Considering the internal
    fragmentation of the buddy allocator in mem_area_alloc(), this should
    save 32 machine words per index (128 bytes on 32-bit systems and 256
    bytes on 64-bit systems).  (Bug #20877)
    
    struct dict_tree_struct, dict_tree_t: Remove.
    
    struct dict_index_struct: Add page and lock.
    
    dict_tree_create(): Remove.  Replace the invocation with
    assignment to index->page and a call to rw_lock_create(&index->lock).
    
    dict_tree_free(): Remove.  Replace the invocation wtih
    a call to rw_lock_free(&index->lock).
    
    dict_index_get_tree(): Remove.
    
    dict_tree_get_space_reserve(): Rename to dict_index_get_space_reserve()
    and remove the parameter, which was unused.
    
    btr_level_list_remove(): Remove the unused parameter "tree".
    
    Replace the occurrences of "tree" with "index" in names of variables,
    functions and data types, e.g. "dict_tree_t tree" becomes
    "dict_index_t index".  Remove local variables "tree" or "index" of
    functions that needed both "tree" and "index".
    
    
    Revision r832:
    Add dict_table_get_col_name() in preparation for getting rid of
    dict_col_t::name, and use it instead of col->name everywhere.
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/include/btr0btr.h@1.18, 2006-09-21 01:38:43-06:00, tsmith@siva.hindu.god +15 -15
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r828:
    Remove dict_tree_t, which should have been removed in r453.
    There always was a one-to-one mapping between dict_tree_t and dict_index_t.
    
    This saves 6 machine words per B-tree index in the data dictionary
    cache plus the memory allocation overhead.  We save one mem_heap_t
    object per index (15 machine words).  Considering the internal
    fragmentation of the buddy allocator in mem_area_alloc(), this should
    save 32 machine words per index (128 bytes on 32-bit systems and 256
    bytes on 64-bit systems).  (Bug #20877)
    
    struct dict_tree_struct, dict_tree_t: Remove.
    
    struct dict_index_struct: Add page and lock.
    
    dict_tree_create(): Remove.  Replace the invocation with
    assignment to index->page and a call to rw_lock_create(&index->lock).
    
    dict_tree_free(): Remove.  Replace the invocation wtih
    a call to rw_lock_free(&index->lock).
    
    dict_index_get_tree(): Remove.
    
    dict_tree_get_space_reserve(): Rename to dict_index_get_space_reserve()
    and remove the parameter, which was unused.
    
    btr_level_list_remove(): Remove the unused parameter "tree".
    
    Replace the occurrences of "tree" with "index" in names of variables,
    functions and data types, e.g. "dict_tree_t tree" becomes
    "dict_index_t index".  Remove local variables "tree" or "index" of
    functions that needed both "tree" and "index".

  storage/innobase/include/btr0btr.ic@1.11, 2006-09-21 01:38:43-06:00, tsmith@siva.hindu.god +1 -1
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r837:
    page_offset(): New function to replace many ut_align_offset(., UNIV_PAGE_SIZE)
    calls.
    
    dict_index_build_node_ptr(): Correct a typo in a comment.

  storage/innobase/include/btr0cur.h@1.21, 2006-09-21 01:38:43-06:00, tsmith@siva.hindu.god +6 -6
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r828:
    Remove dict_tree_t, which should have been removed in r453.
    There always was a one-to-one mapping between dict_tree_t and dict_index_t.
    
    This saves 6 machine words per B-tree index in the data dictionary
    cache plus the memory allocation overhead.  We save one mem_heap_t
    object per index (15 machine words).  Considering the internal
    fragmentation of the buddy allocator in mem_area_alloc(), this should
    save 32 machine words per index (128 bytes on 32-bit systems and 256
    bytes on 64-bit systems).  (Bug #20877)
    
    struct dict_tree_struct, dict_tree_t: Remove.
    
    struct dict_index_struct: Add page and lock.
    
    dict_tree_create(): Remove.  Replace the invocation with
    assignment to index->page and a call to rw_lock_create(&index->lock).
    
    dict_tree_free(): Remove.  Replace the invocation wtih
    a call to rw_lock_free(&index->lock).
    
    dict_index_get_tree(): Remove.
    
    dict_tree_get_space_reserve(): Rename to dict_index_get_space_reserve()
    and remove the parameter, which was unused.
    
    btr_level_list_remove(): Remove the unused parameter "tree".
    
    Replace the occurrences of "tree" with "index" in names of variables,
    functions and data types, e.g. "dict_tree_t tree" becomes
    "dict_index_t index".  Remove local variables "tree" or "index" of
    functions that needed both "tree" and "index".

  storage/innobase/include/btr0cur.ic@1.12, 2006-09-21 01:38:43-06:00, tsmith@siva.hindu.god +11 -25
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r828:
    Remove dict_tree_t, which should have been removed in r453.
    There always was a one-to-one mapping between dict_tree_t and dict_index_t.
    
    This saves 6 machine words per B-tree index in the data dictionary
    cache plus the memory allocation overhead.  We save one mem_heap_t
    object per index (15 machine words).  Considering the internal
    fragmentation of the buddy allocator in mem_area_alloc(), this should
    save 32 machine words per index (128 bytes on 32-bit systems and 256
    bytes on 64-bit systems).  (Bug #20877)
    
    struct dict_tree_struct, dict_tree_t: Remove.
    
    struct dict_index_struct: Add page and lock.
    
    dict_tree_create(): Remove.  Replace the invocation with
    assignment to index->page and a call to rw_lock_create(&index->lock).
    
    dict_tree_free(): Remove.  Replace the invocation wtih
    a call to rw_lock_free(&index->lock).
    
    dict_index_get_tree(): Remove.
    
    dict_tree_get_space_reserve(): Rename to dict_index_get_space_reserve()
    and remove the parameter, which was unused.
    
    btr_level_list_remove(): Remove the unused parameter "tree".
    
    Replace the occurrences of "tree" with "index" in names of variables,
    functions and data types, e.g. "dict_tree_t tree" becomes
    "dict_index_t index".  Remove local variables "tree" or "index" of
    functions that needed both "tree" and "index".

  storage/innobase/include/btr0pcur.h@1.11, 2006-09-21 01:38:43-06:00, tsmith@siva.hindu.god +8 -4
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r817:
    btr0pcur.h: Change FIXME to TODO.

  storage/innobase/include/btr0sea.h@1.12, 2006-09-21 01:38:44-06:00, tsmith@siva.hindu.god +17 -32
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r824:
    Reduce the size of btr_search_t from 13 machine words to 7.  This
    structure is reserved for every index in the data dictionary cache.
    (Bug #20877)
    
    We could shrink the structure further to three 32-bit words or two
    64-bit words by turning the remaining fields to bit-fields.
    Unfortunately, the fields are not protected by any mutex, and thus we
    would better keep each field aligned to a machine word.
    
    btr_search_t, buf_block_t: Rename "ulint side" to "ibool left_side".
    Remove BTR_SEARCH_LEFT_SIDE and BTR_SEARCH_RIGHT_SIDE, and also rename
    some local variables and function parameters from "ulint side" to
    "ibool left_side".
    
    btr_search_t: Remove the unused fields last_search, n_direction, direction,
    and modify_clock.  Remove the unused constants BTR_SEA_NO_DIRECTION,
    BTR_SEA_LEFT, BTR_SEA_RIGHT, and BTR_SEA_SAME_REC.
    
    btr_search_t: Remove magic_n unless #defined UNIV_DEBUG.  Turn an assertion
    about the magic number into a debug assertion.

  storage/innobase/include/buf0buf.h@1.36, 2006-09-21 01:38:46-06:00, tsmith@siva.hindu.god +2 -5
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r824:
    Reduce the size of btr_search_t from 13 machine words to 7.  This
    structure is reserved for every index in the data dictionary cache.
    (Bug #20877)
    
    We could shrink the structure further to three 32-bit words or two
    64-bit words by turning the remaining fields to bit-fields.
    Unfortunately, the fields are not protected by any mutex, and thus we
    would better keep each field aligned to a machine word.
    
    btr_search_t, buf_block_t: Rename "ulint side" to "ibool left_side".
    Remove BTR_SEARCH_LEFT_SIDE and BTR_SEARCH_RIGHT_SIDE, and also rename
    some local variables and function parameters from "ulint side" to
    "ibool left_side".
    
    btr_search_t: Remove the unused fields last_search, n_direction, direction,
    and modify_clock.  Remove the unused constants BTR_SEA_NO_DIRECTION,
    BTR_SEA_LEFT, BTR_SEA_RIGHT, and BTR_SEA_SAME_REC.
    
    btr_search_t: Remove magic_n unless #defined UNIV_DEBUG.  Turn an assertion
    about the magic number into a debug assertion.

  storage/innobase/include/data0data.ic@1.13, 2006-09-21 01:38:46-06:00, tsmith@siva.hindu.god +1 -1
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.

  storage/innobase/include/data0type.h@1.28, 2006-09-21 01:38:47-06:00, tsmith@siva.hindu.god +71 -62
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.
    
    
    Revision r816:
    Remove more remnants of mixed indexes.
    
    Revision r819:
    dict_col_t: Reduce ord_part to one bit.
    
    dict_index_add_to_cache(): Instead of incrementing ord_part, set it.
    
    dict_index_remove_from_cache(): Do not touch ord_part.
    
    dtype_t: Reduce mbminlen from 3 to 2 bits.
    
    row_upd(): Add a UNIV_LIKELY hint around node->in_mysql_interface.
    
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.

  storage/innobase/include/data0type.ic@1.31, 2006-09-21 01:38:47-06:00, tsmith@siva.hindu.god +145 -123
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.
    
    
    Revision r816:
    Remove more remnants of mixed indexes.
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/include/dict0boot.h@1.8, 2006-09-21 01:38:47-06:00, tsmith@siva.hindu.god +1 -1
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r816:
    Remove more remnants of mixed indexes.

  storage/innobase/include/dict0dict.h@1.47, 2006-09-21 01:38:47-06:00, tsmith@siva.hindu.god +131 -93
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r816:
    Remove more remnants of mixed indexes.
    
    Revision r818:
    Remove dict_col_t::hash, dict_col_t::table,
    dict_sys->col_hash, and DICT_POOL_PER_COL_HASH.  (Bug #20877)
    
    The col->table pointer was only needed for maintaining a hash table of
    all defined columns in all tables.  The hash table was only looked up
    in dict_index_find_cols().  Removing the col->hash and col->table
    pointers reduces the size of a table column by two machine words
    (usually 8 or 16 bytes).
    
    dict_col_add_to_cache(), dict_col_reposition_in_cache(),
    dict_col_remove_from_cache(): Remove.  These only updated dict_sys->col_hash.
    
    dict_index_find_cols(): Use a linear search instead of the hash table.
    The time complexity is affected, but this function is only invoked by
    dict_index_add_to_cache(), and we only search the columns of a single
    table (typically at most a few dozen) as opposed to all columns of all
    tables.
    
    
    Revision r820:
    Remove dict_col_t::clust_pos.
    
    dict_col_get_clust_pos(): Add parameter clust_index.  Replace the
    look-up with a linear search of all columns in the clustered index.
    
    row_upd_index_replace_new_col_vals(): Compute clust_index outside
    the loops.  Compute clust_pos outside the inner loop.
    
    row_upd_changes_ord_field_binary(), row_upd_changes_first_fields_binary():
    Compute clust_index outside the loops.  Declare the auxiliary variables
    inside the loop scope.
    
    
    Revision r827:
    Make dict_index_find_cols() always succeed.
    
    Revision r828:
    Remove dict_tree_t, which should have been removed in r453.
    There always was a one-to-one mapping between dict_tree_t and dict_index_t.
    
    This saves 6 machine words per B-tree index in the data dictionary
    cache plus the memory allocation overhead.  We save one mem_heap_t
    object per index (15 machine words).  Considering the internal
    fragmentation of the buddy allocator in mem_area_alloc(), this should
    save 32 machine words per index (128 bytes on 32-bit systems and 256
    bytes on 64-bit systems).  (Bug #20877)
    
    struct dict_tree_struct, dict_tree_t: Remove.
    
    struct dict_index_struct: Add page and lock.
    
    dict_tree_create(): Remove.  Replace the invocation with
    assignment to index->page and a call to rw_lock_create(&index->lock).
    
    dict_tree_free(): Remove.  Replace the invocation wtih
    a call to rw_lock_free(&index->lock).
    
    dict_index_get_tree(): Remove.
    
    dict_tree_get_space_reserve(): Rename to dict_index_get_space_reserve()
    and remove the parameter, which was unused.
    
    btr_level_list_remove(): Remove the unused parameter "tree".
    
    Replace the occurrences of "tree" with "index" in names of variables,
    functions and data types, e.g. "dict_tree_t tree" becomes
    "dict_index_t index".  Remove local variables "tree" or "index" of
    functions that needed both "tree" and "index".
    
    
    Revision r831:
    Add dict_col_get_clust_pos_noninline(), which was forgotten from r820.
    
    
    Revision r832:
    Add dict_table_get_col_name() in preparation for getting rid of
    dict_col_t::name, and use it instead of col->name everywhere.
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.
    
    
    Revision r836:
    Remove dict_col_t::name, replace it with a packed array of column names in
    dict_table_t. This saves 8-15+ bytes of memory per column on 64-bit
    machines.

  storage/innobase/include/dict0dict.ic@1.19, 2006-09-21 01:38:47-06:00, tsmith@siva.hindu.god +146 -101
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.
    
    
    Revision r820:
    Remove dict_col_t::clust_pos.
    
    dict_col_get_clust_pos(): Add parameter clust_index.  Replace the
    look-up with a linear search of all columns in the clustered index.
    
    row_upd_index_replace_new_col_vals(): Compute clust_index outside
    the loops.  Compute clust_pos outside the inner loop.
    
    row_upd_changes_ord_field_binary(), row_upd_changes_first_fields_binary():
    Compute clust_index outside the loops.  Declare the auxiliary variables
    inside the loop scope.
    
    
    Revision r828:
    Remove dict_tree_t, which should have been removed in r453.
    There always was a one-to-one mapping between dict_tree_t and dict_index_t.
    
    This saves 6 machine words per B-tree index in the data dictionary
    cache plus the memory allocation overhead.  We save one mem_heap_t
    object per index (15 machine words).  Considering the internal
    fragmentation of the buddy allocator in mem_area_alloc(), this should
    save 32 machine words per index (128 bytes on 32-bit systems and 256
    bytes on 64-bit systems).  (Bug #20877)
    
    struct dict_tree_struct, dict_tree_t: Remove.
    
    struct dict_index_struct: Add page and lock.
    
    dict_tree_create(): Remove.  Replace the invocation with
    assignment to index->page and a call to rw_lock_create(&index->lock).
    
    dict_tree_free(): Remove.  Replace the invocation wtih
    a call to rw_lock_free(&index->lock).
    
    dict_index_get_tree(): Remove.
    
    dict_tree_get_space_reserve(): Rename to dict_index_get_space_reserve()
    and remove the parameter, which was unused.
    
    btr_level_list_remove(): Remove the unused parameter "tree".
    
    Replace the occurrences of "tree" with "index" in names of variables,
    functions and data types, e.g. "dict_tree_t tree" becomes
    "dict_index_t index".  Remove local variables "tree" or "index" of
    functions that needed both "tree" and "index".
    
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.

  storage/innobase/include/dict0mem.h@1.32, 2006-09-21 01:38:47-06:00, tsmith@siva.hindu.god +94 -74
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.
    
    
    Revision r815:
    dict_index_t: Remove tree_indexes.  It should have been removed in r453
    when the list in dict_tree_t was replaced with the pointer tree_index.
    
    
    Revision r818:
    Remove dict_col_t::hash, dict_col_t::table,
    dict_sys->col_hash, and DICT_POOL_PER_COL_HASH.  (Bug #20877)
    
    The col->table pointer was only needed for maintaining a hash table of
    all defined columns in all tables.  The hash table was only looked up
    in dict_index_find_cols().  Removing the col->hash and col->table
    pointers reduces the size of a table column by two machine words
    (usually 8 or 16 bytes).
    
    dict_col_add_to_cache(), dict_col_reposition_in_cache(),
    dict_col_remove_from_cache(): Remove.  These only updated dict_sys->col_hash.
    
    dict_index_find_cols(): Use a linear search instead of the hash table.
    The time complexity is affected, but this function is only invoked by
    dict_index_add_to_cache(), and we only search the columns of a single
    table (typically at most a few dozen) as opposed to all columns of all
    tables.
    
    
    Revision r819:
    dict_col_t: Reduce ord_part to one bit.
    
    dict_index_add_to_cache(): Instead of incrementing ord_part, set it.
    
    dict_index_remove_from_cache(): Do not touch ord_part.
    
    dtype_t: Reduce mbminlen from 3 to 2 bits.
    
    row_upd(): Add a UNIV_LIKELY hint around node->in_mysql_interface.
    
    
    Revision r820:
    Remove dict_col_t::clust_pos.
    
    dict_col_get_clust_pos(): Add parameter clust_index.  Replace the
    look-up with a linear search of all columns in the clustered index.
    
    row_upd_index_replace_new_col_vals(): Compute clust_index outside
    the loops.  Compute clust_pos outside the inner loop.
    
    row_upd_changes_ord_field_binary(), row_upd_changes_first_fields_binary():
    Compute clust_index outside the loops.  Declare the auxiliary variables
    inside the loop scope.
    
    
    Revision r821:
    dict_table_t: Rename the integer field max_row_size
    to the Boolean field big_rows.  (Bug #20877)
    
    BIG_ROW_SIZE: Move the definition from row0sel.c to dict_table_add_to_cache().
    
    
    Revision r828:
    Remove dict_tree_t, which should have been removed in r453.
    There always was a one-to-one mapping between dict_tree_t and dict_index_t.
    
    This saves 6 machine words per B-tree index in the data dictionary
    cache plus the memory allocation overhead.  We save one mem_heap_t
    object per index (15 machine words).  Considering the internal
    fragmentation of the buddy allocator in mem_area_alloc(), this should
    save 32 machine words per index (128 bytes on 32-bit systems and 256
    bytes on 64-bit systems).  (Bug #20877)
    
    struct dict_tree_struct, dict_tree_t: Remove.
    
    struct dict_index_struct: Add page and lock.
    
    dict_tree_create(): Remove.  Replace the invocation with
    assignment to index->page and a call to rw_lock_create(&index->lock).
    
    dict_tree_free(): Remove.  Replace the invocation wtih
    a call to rw_lock_free(&index->lock).
    
    dict_index_get_tree(): Remove.
    
    dict_tree_get_space_reserve(): Rename to dict_index_get_space_reserve()
    and remove the parameter, which was unused.
    
    btr_level_list_remove(): Remove the unused parameter "tree".
    
    Replace the occurrences of "tree" with "index" in names of variables,
    functions and data types, e.g. "dict_tree_t tree" becomes
    "dict_index_t index".  Remove local variables "tree" or "index" of
    functions that needed both "tree" and "index".
    
    
    Revision r833:
    Tweak the bit-field definitions introduced since r813 to address Bug #20877.
    
    rw_lock_t: Do not make writer_is_wait_ex a bit-field.  There are no fields
    yet that could be fused to the same machine word, but we play it safe,
    because the field writer_is_wait_ex may be modified by several threads
    simultaneously.  Such fields should always be allocated an own machine
    word.
    
    dict_table_t: Change the type of all bit-fields to "unsigned".  Make
    "space" a bit-field of 32 bits.  Move name_hash and id_hash after all
    bit-fields, so that the bit-fields can be allocated together.  Do not
    make autoinc_inited a bit-field, as we cannot allocate any field
    from the same machine word.
    
    dict_build_table_def_step(): Pass a local variable to
    fil_create_new_single_table_tablespace() and initialize table->space
    from it after the call, now that table->space is a bit-field.
    
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.
    
    
    Revision r835:
    Change the recently introduced ulint bit-fields to unsigned.
    
    
    Revision r836:
    Remove dict_col_t::name, replace it with a packed array of column names in
    dict_table_t. This saves 8-15+ bytes of memory per column on 64-bit
    machines.

  storage/innobase/include/dict0types.h@1.5, 2006-09-21 01:38:47-06:00, tsmith@siva.hindu.god +0 -1
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r828:
    Remove dict_tree_t, which should have been removed in r453.
    There always was a one-to-one mapping between dict_tree_t and dict_index_t.
    
    This saves 6 machine words per B-tree index in the data dictionary
    cache plus the memory allocation overhead.  We save one mem_heap_t
    object per index (15 machine words).  Considering the internal
    fragmentation of the buddy allocator in mem_area_alloc(), this should
    save 32 machine words per index (128 bytes on 32-bit systems and 256
    bytes on 64-bit systems).  (Bug #20877)
    
    struct dict_tree_struct, dict_tree_t: Remove.
    
    struct dict_index_struct: Add page and lock.
    
    dict_tree_create(): Remove.  Replace the invocation with
    assignment to index->page and a call to rw_lock_create(&index->lock).
    
    dict_tree_free(): Remove.  Replace the invocation wtih
    a call to rw_lock_free(&index->lock).
    
    dict_index_get_tree(): Remove.
    
    dict_tree_get_space_reserve(): Rename to dict_index_get_space_reserve()
    and remove the parameter, which was unused.
    
    btr_level_list_remove(): Remove the unused parameter "tree".
    
    Replace the occurrences of "tree" with "index" in names of variables,
    functions and data types, e.g. "dict_tree_t tree" becomes
    "dict_index_t index".  Remove local variables "tree" or "index" of
    functions that needed both "tree" and "index".

  storage/innobase/include/ibuf0ibuf.ic@1.8, 2006-09-21 01:38:48-06:00, tsmith@siva.hindu.god +2 -2
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/include/page0page.h@1.11, 2006-09-21 01:38:48-06:00, tsmith@siva.hindu.god +18 -0
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r830:
    page_align(ptr): New utility function to replace
    ut_align_down(ptr, UNIV_PAGE_SIZE) calls.
    
    
    Revision r837:
    page_offset(): New function to replace many ut_align_offset(., UNIV_PAGE_SIZE)
    calls.
    
    dict_index_build_node_ptr(): Correct a typo in a comment.

  storage/innobase/include/page0page.ic@1.19, 2006-09-21 01:38:48-06:00, tsmith@siva.hindu.god +36 -14
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r830:
    page_align(ptr): New utility function to replace
    ut_align_down(ptr, UNIV_PAGE_SIZE) calls.
    
    
    Revision r837:
    page_offset(): New function to replace many ut_align_offset(., UNIV_PAGE_SIZE)
    calls.
    
    dict_index_build_node_ptr(): Correct a typo in a comment.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/include/read0read.ic@1.6, 2006-09-21 01:38:48-06:00, tsmith@siva.hindu.god +3 -3
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/include/rem0cmp.h@1.13, 2006-09-21 01:38:48-06:00, tsmith@siva.hindu.god +13 -10
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.

  storage/innobase/include/rem0cmp.ic@1.8, 2006-09-21 01:38:48-06:00, tsmith@siva.hindu.god +12 -6
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.

  storage/innobase/include/rem0rec.h@1.19, 2006-09-21 01:38:48-06:00, tsmith@siva.hindu.god +0 -5
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.

  storage/innobase/include/rem0rec.ic@1.27, 2006-09-21 01:38:49-06:00, tsmith@siva.hindu.god +17 -17
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/include/rem0types.h@1.3, 2006-09-21 01:38:49-06:00, tsmith@siva.hindu.god +4 -0
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.

  storage/innobase/include/row0upd.ic@1.13, 2006-09-21 01:38:49-06:00, tsmith@siva.hindu.god +2 -2
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.

  storage/innobase/include/sync0rw.h@1.16, 2006-09-21 01:38:49-06:00, tsmith@siva.hindu.god +11 -12
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.
    
    
    Revision r823:
    Minor cleanup related to Bug #20877.
    
    btr_print_recursive(): Replace tree->tree_indexes with tree->index.
    This should have been done in r453.
    
    univ.i: Add UNIV_BTR_PRINT.
    
    rw_lock_t: Reduce writer_is_wait_ex to a bit and move it close to
    other bitfields.  Change the types to unsigned, in case ulint or ibool
    bitfields will not work.
    
    
    Revision r833:
    Tweak the bit-field definitions introduced since r813 to address Bug #20877.
    
    rw_lock_t: Do not make writer_is_wait_ex a bit-field.  There are no fields
    yet that could be fused to the same machine word, but we play it safe,
    because the field writer_is_wait_ex may be modified by several threads
    simultaneously.  Such fields should always be allocated an own machine
    word.
    
    dict_table_t: Change the type of all bit-fields to "unsigned".  Make
    "space" a bit-field of 32 bits.  Move name_hash and id_hash after all
    bit-fields, so that the bit-fields can be allocated together.  Do not
    make autoinc_inited a bit-field, as we cannot allocate any field
    from the same machine word.
    
    dict_build_table_def_step(): Pass a local variable to
    fil_create_new_single_table_tablespace() and initialize table->space
    from it after the call, now that table->space is a bit-field.

  storage/innobase/include/univ.i@1.56, 2006-09-21 01:38:49-06:00, tsmith@siva.hindu.god +1 -0
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r823:
    Minor cleanup related to Bug #20877.
    
    btr_print_recursive(): Replace tree->tree_indexes with tree->index.
    This should have been done in r453.
    
    univ.i: Add UNIV_BTR_PRINT.
    
    rw_lock_t: Reduce writer_is_wait_ex to a bit and move it close to
    other bitfields.  Change the types to unsigned, in case ulint or ibool
    bitfields will not work.

  storage/innobase/lock/lock0lock.c@1.70, 2006-09-21 01:38:49-06:00, tsmith@siva.hindu.god +61 -56
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/log/log0log.c@1.53, 2006-09-21 01:38:50-06:00, tsmith@siva.hindu.god +47 -48
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/log/log0recv.c@1.61, 2006-09-21 01:38:50-06:00, tsmith@siva.hindu.god +122 -121
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/mem/mem0dbg.c@1.23, 2006-09-21 01:38:50-06:00, tsmith@siva.hindu.god +2 -2
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/mem/mem0pool.c@1.25, 2006-09-21 01:38:50-06:00, tsmith@siva.hindu.god +2 -2
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/mtr/mtr0log.c@1.15, 2006-09-21 01:38:50-06:00, tsmith@siva.hindu.god +17 -15
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.
    
    
    Revision r832:
    Add dict_table_get_col_name() in preparation for getting rid of
    dict_col_t::name, and use it instead of col->name everywhere.
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/mtr/mtr0mtr.c@1.14, 2006-09-21 01:38:50-06:00, tsmith@siva.hindu.god +3 -3
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/os/os0file.c@1.122, 2006-09-21 01:38:51-06:00, tsmith@siva.hindu.god +6 -6
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/os/os0thread.c@1.37, 2006-09-21 01:38:51-06:00, tsmith@siva.hindu.god +3 -2
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/page/page0cur.c@1.29, 2006-09-21 01:38:51-06:00, tsmith@siva.hindu.god +21 -19
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r837:
    page_offset(): New function to replace many ut_align_offset(., UNIV_PAGE_SIZE)
    calls.
    
    dict_index_build_node_ptr(): Correct a typo in a comment.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/page/page0page.c@1.34, 2006-09-21 01:38:51-06:00, tsmith@siva.hindu.god +3 -3
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.
    
    
    Revision r837:
    page_offset(): New function to replace many ut_align_offset(., UNIV_PAGE_SIZE)
    calls.
    
    dict_index_build_node_ptr(): Correct a typo in a comment.

  storage/innobase/pars/pars0opt.c@1.16, 2006-09-21 01:38:51-06:00, tsmith@siva.hindu.god +13 -12
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/pars/pars0pars.c@1.21, 2006-09-21 01:38:52-06:00, tsmith@siva.hindu.god +52 -45
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.
    
    
    Revision r832:
    Add dict_table_get_col_name() in preparation for getting rid of
    dict_col_t::name, and use it instead of col->name everywhere.
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/pars/pars0sym.c@1.9, 2006-09-21 01:38:52-06:00, tsmith@siva.hindu.god +3 -3
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.

  storage/innobase/read/read0read.c@1.12, 2006-09-21 01:38:52-06:00, tsmith@siva.hindu.god +11 -10
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/rem/rem0cmp.c@1.34, 2006-09-21 01:38:52-06:00, tsmith@siva.hindu.god +99 -88
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/rem/rem0rec.c@1.22, 2006-09-21 01:38:52-06:00, tsmith@siva.hindu.god +43 -41
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/row/row0ins.c@1.82, 2006-09-21 01:38:52-06:00, tsmith@siva.hindu.god +137 -136
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/row/row0mysql.c@1.134, 2006-09-21 01:38:53-06:00, tsmith@siva.hindu.god +125 -131
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r828:
    Remove dict_tree_t, which should have been removed in r453.
    There always was a one-to-one mapping between dict_tree_t and dict_index_t.
    
    This saves 6 machine words per B-tree index in the data dictionary
    cache plus the memory allocation overhead.  We save one mem_heap_t
    object per index (15 machine words).  Considering the internal
    fragmentation of the buddy allocator in mem_area_alloc(), this should
    save 32 machine words per index (128 bytes on 32-bit systems and 256
    bytes on 64-bit systems).  (Bug #20877)
    
    struct dict_tree_struct, dict_tree_t: Remove.
    
    struct dict_index_struct: Add page and lock.
    
    dict_tree_create(): Remove.  Replace the invocation with
    assignment to index->page and a call to rw_lock_create(&index->lock).
    
    dict_tree_free(): Remove.  Replace the invocation wtih
    a call to rw_lock_free(&index->lock).
    
    dict_index_get_tree(): Remove.
    
    dict_tree_get_space_reserve(): Rename to dict_index_get_space_reserve()
    and remove the parameter, which was unused.
    
    btr_level_list_remove(): Remove the unused parameter "tree".
    
    Replace the occurrences of "tree" with "index" in names of variables,
    functions and data types, e.g. "dict_tree_t tree" becomes
    "dict_index_t index".  Remove local variables "tree" or "index" of
    functions that needed both "tree" and "index".
    
    
    Revision r832:
    Add dict_table_get_col_name() in preparation for getting rid of
    dict_col_t::name, and use it instead of col->name everywhere.
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/row/row0purge.c@1.27, 2006-09-21 01:38:53-06:00, tsmith@siva.hindu.god +11 -11
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r828:
    Remove dict_tree_t, which should have been removed in r453.
    There always was a one-to-one mapping between dict_tree_t and dict_index_t.
    
    This saves 6 machine words per B-tree index in the data dictionary
    cache plus the memory allocation overhead.  We save one mem_heap_t
    object per index (15 machine words).  Considering the internal
    fragmentation of the buddy allocator in mem_area_alloc(), this should
    save 32 machine words per index (128 bytes on 32-bit systems and 256
    bytes on 64-bit systems).  (Bug #20877)
    
    struct dict_tree_struct, dict_tree_t: Remove.
    
    struct dict_index_struct: Add page and lock.
    
    dict_tree_create(): Remove.  Replace the invocation with
    assignment to index->page and a call to rw_lock_create(&index->lock).
    
    dict_tree_free(): Remove.  Replace the invocation wtih
    a call to rw_lock_free(&index->lock).
    
    dict_index_get_tree(): Remove.
    
    dict_tree_get_space_reserve(): Rename to dict_index_get_space_reserve()
    and remove the parameter, which was unused.
    
    btr_level_list_remove(): Remove the unused parameter "tree".
    
    Replace the occurrences of "tree" with "index" in names of variables,
    functions and data types, e.g. "dict_tree_t tree" becomes
    "dict_index_t index".  Remove local variables "tree" or "index" of
    functions that needed both "tree" and "index".
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/row/row0row.c@1.24, 2006-09-21 01:38:53-06:00, tsmith@siva.hindu.god +49 -40
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/row/row0sel.c@1.112, 2006-09-21 01:38:53-06:00, tsmith@siva.hindu.god +152 -141
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r820:
    Remove dict_col_t::clust_pos.
    
    dict_col_get_clust_pos(): Add parameter clust_index.  Replace the
    look-up with a linear search of all columns in the clustered index.
    
    row_upd_index_replace_new_col_vals(): Compute clust_index outside
    the loops.  Compute clust_pos outside the inner loop.
    
    row_upd_changes_ord_field_binary(), row_upd_changes_first_fields_binary():
    Compute clust_index outside the loops.  Declare the auxiliary variables
    inside the loop scope.
    
    
    Revision r821:
    dict_table_t: Rename the integer field max_row_size
    to the Boolean field big_rows.  (Bug #20877)
    
    BIG_ROW_SIZE: Move the definition from row0sel.c to dict_table_add_to_cache().
    
    
    Revision r825:
    row_search_for_mysql(): Skip setting the next-key lock on an already 
    delete-marked record in a clustered index where the search criteria is 
    unique, within the same transaction (Bug #13544).
    
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.
    
    
    Revision r837:
    page_offset(): New function to replace many ut_align_offset(., UNIV_PAGE_SIZE)
    calls.
    
    dict_index_build_node_ptr(): Correct a typo in a comment.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.
    
    Revision r845:
    Split long lines with [] operators better.

  storage/innobase/row/row0uins.c@1.13, 2006-09-21 01:38:53-06:00, tsmith@siva.hindu.god +2 -2
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/row/row0umod.c@1.24, 2006-09-21 01:38:54-06:00, tsmith@siva.hindu.god +25 -25
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/row/row0upd.c@1.46, 2006-09-21 01:38:54-06:00, tsmith@siva.hindu.god +97 -78
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.
    
    
    Revision r819:
    dict_col_t: Reduce ord_part to one bit.
    
    dict_index_add_to_cache(): Instead of incrementing ord_part, set it.
    
    dict_index_remove_from_cache(): Do not touch ord_part.
    
    dtype_t: Reduce mbminlen from 3 to 2 bits.
    
    row_upd(): Add a UNIV_LIKELY hint around node->in_mysql_interface.
    
    
    Revision r820:
    Remove dict_col_t::clust_pos.
    
    dict_col_get_clust_pos(): Add parameter clust_index.  Replace the
    look-up with a linear search of all columns in the clustered index.
    
    row_upd_index_replace_new_col_vals(): Compute clust_index outside
    the loops.  Compute clust_pos outside the inner loop.
    
    row_upd_changes_ord_field_binary(), row_upd_changes_first_fields_binary():
    Compute clust_index outside the loops.  Declare the auxiliary variables
    inside the loop scope.
    
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.
    
    Revision r851:
    row_upd_sec_step(): Fix false comment.

  storage/innobase/row/row0vers.c@1.22, 2006-09-21 01:38:54-06:00, tsmith@siva.hindu.god +3 -3
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/srv/srv0srv.c@1.103, 2006-09-21 01:38:54-06:00, tsmith@siva.hindu.god +15 -15
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.
    
    
    Revision r832:
    Add dict_table_get_col_name() in preparation for getting rid of
    dict_col_t::name, and use it instead of col->name everywhere.
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/srv/srv0start.c@1.99, 2006-09-21 01:38:55-06:00, tsmith@siva.hindu.god +29 -30
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/sync/sync0arr.c@1.26, 2006-09-21 01:38:55-06:00, tsmith@siva.hindu.god +6 -6
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/sync/sync0rw.c@1.25, 2006-09-21 01:38:55-06:00, tsmith@siva.hindu.god +3 -2
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r813:
    Reduce the size of the data dictionary cache.  (Bug #20877)
    
    dtype_t: Remove unused field "prec", which was supposed to be used for
    the precision of decimal columns in stand-alone InnoDB.
    
    dtype_get_prec(): Remove.
    
    dtype_set(), dict_mem_table_add_col(): Remove parameter "prec".
    
    dtype_t: Turn all fields (mtype, prtype, len, mbminlen, mbmaxlen, len)
    into bit-fields.
    
    dict_table_t, dict_index_t, dict_tree_t: Omit magic_n from non-debug builds.
    
    dict_col_t: Turn ind, clust_pos, and ord_part into bit-fields.
    
    Replace the default clust_pos value ULINT_UNDEFINED with
    REC_MAX_N_FIELDS and replace all references to clust_pos with calls to
    the accessor function dict_col_get_clust_pos().
    
    dict_field_t: Turn prefix_len and fixed_len into bit-fields.
    
    dict_tree_t: Remove pad[64].
    
    dict_table_t: Turn the fields ibd_file_missing, tablespace_discarded,
    cached, flags, stat_initialized, and autoinc_inited into bit-fields.
    Remove does_not_fit_in_memory from non-debug builds.
    
    dict_index_t: Turn the fields trx_id_offset, n_user_defined_cols,
    n_uniq, n_def, n_fields, n_nullable, and cached into bit-fields.
    
    dict_foreign_struct: Turn n_fields and type into bit-fields.
    
    rw_lock_t: Turn cline, last_s_line, and last_x_line into bit-fields.
    Omit level unless #defined UNIV_SYNC_DEBUG.
    
    Move REC_MAX_N_FIELDS (and REC_MAX_HEAP_NO and REC_MAX_N_OWNED)
    from rem0rec.c to rem0types.h, as they are needed in dict0dict.ic.
    dict_col_get_clust_pos(): Map REC_MAX_N_FIELDS to ULINT_UNDEFINED.

  storage/innobase/sync/sync0sync.c@1.42, 2006-09-21 01:38:55-06:00, tsmith@siva.hindu.god +7 -7
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/trx/trx0purge.c@1.24, 2006-09-21 01:38:55-06:00, tsmith@siva.hindu.god +11 -11
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/trx/trx0rec.c@1.27, 2006-09-21 01:38:55-06:00, tsmith@siva.hindu.god +19 -19
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r834:
    dict_col_t: Copy the fields of "dtype_t type" directly to this structure,
    so that all integer fields can be packed into 64 bits.  (Bug #20877)
    
    dtype_t: Change the type of all bit-fields to unsigned.
    
    dict_table_get_nth_col(), dict_table_get_sys_col_noninline(),
    dict_table_get_sys_col(), dict_field_get_col(): Return const
    dict_col_t*, so that changes to dict_col_t can be detected more
    easily.  Add const to many dict_col_t* declarations.
    
    dict_index_get_nth_type(): Replace with dict_index_get_nth_col().
    
    dict_col_get_type(): Replace with dict_col_copy_type().
    
    dict_col_get_min_size(), dict_col_get_max_size(), dict_col_get_fixed_size(),
    dict_col_get_sql_null_size(): New functions.
    
    dtype_get_at_most_n_mbchars(): Replace the parameter dtype
    with the parameters prtype, mbminlen, mbmaxlen.
    
    dtype_get_pad_char(), cmp_data_data(), cmp_data_data_slow(),
    cmp_whole_field(): Replace the dtype_t* parameter with the ulint
    parameters mtype, prtype.
    
    dtype_copy(): Add a const qualifier to type2 (the one being copied from).
    
    dtype_set_mblen(): Replaced with dtype_get_mblen().
    
    dtype_get_fixed_size_low(), dtype_get_min_size_low(),
    dtype_get_fixed_max_low(): Replace dtype_get_fixed_size(),
    dtype_get_min_size(), and dtype_get_max_size().  These are used by the
    dict_col_get_{fixed,min,max}_size() functions.
    
    cmp_types_are_equal(): Replace with cmp_cols_are_equal().
    
    dict_table_get_col_name(): Add a const qualifier parameter to the
    parameter "table".
    
    dtype_binary, dtype_binary_val: Remove.
    
    dtype_is_fixed_size(): Remove.
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/trx/trx0rseg.c@1.10, 2006-09-21 01:38:56-06:00, tsmith@siva.hindu.god +6 -6
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/trx/trx0sys.c@1.40, 2006-09-21 01:38:56-06:00, tsmith@siva.hindu.god +46 -45
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r829:
    Erase the magic number in the trx sys header using a redo-logged write;
    it should be redo-logged because the data structure is file-based;
    this patch does not fix any bug; the original erase operation was added
    in r781 to fix Valgrind Bug #20791
    
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/trx/trx0trx.c@1.68, 2006-09-21 01:38:56-06:00, tsmith@siva.hindu.god +20 -20
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

  storage/innobase/trx/trx0undo.c@1.28, 2006-09-21 01:38:56-06:00, tsmith@siva.hindu.god +10 -10
    Applied innodb-5.1 snapshots ss799 and ss854
    
    Revision r838:
    Revamp the line splits done in r763 and r764 that can now be done better,
    thanks to r826.

ChangeSet@1.1810.2027.16, 2006-09-21 11:35:38+04:00, dlenev@mockturtle.local +9 -0
  Fix for bug#20670 "UPDATE using key and invoking trigger that modifies
  this key does not stop" (version for 5.0 only).
  
  UPDATE statement which WHERE clause used key and which invoked trigger
  that modified field in this key worked indefinetely.
  
  This problem occured because in cases when UPDATE statement was
  executed in update-on-the-fly mode (in which row is updated right
  during evaluation of select for WHERE clause) the new version of
  the row became visible to select representing WHERE clause and was
  updated again and again.
  We already solve this problem for UPDATE statements which does not
  invoke triggers by detecting the fact that we are going to update
  field in key used for scanning and performing update in two steps,
  during the first step we gather information about the rows to be
  updated and then doing actual updates. We also do this for
  MULTI-UPDATE and in its case we even detect situation when such
  fields are updated in triggers (actually we simply assume that
  we always update fields used in key if we have before update
  trigger).
  
  The fix simply extends this check which is done in check_if_key_used()/
  QUICK_SELECT_I::check_if_keys_used() routine/method in such way that
  it also detects cases when field used in key is updated in trigger.
  As nice side-effect we have more precise and thus more optimal
  perfomance-wise check for the MULTI-UPDATE.
  Also check_if_key_used()/QUICK_SELECT_I::check_if_keys_used() were
  renamed to is_key_used()/QUICK_SELECT_I::is_keys_used() in order to
  better reflect that boolean predicate.
  
  Note that this check is implemented in much more elegant way in 5.1 

  mysql-test/r/trigger.result@1.29.9.1, 2006-09-21 11:35:36+04:00, dlenev@mockturtle.local +12 -0
    Added test case for bug#20670 "UPDATE using key and invoking trigger that
    modifies this key does not stop".

  mysql-test/t/trigger.test@1.34.9.1, 2006-09-21 11:35:36+04:00, dlenev@mockturtle.local +19 -0
    Added test case for bug#20670 "UPDATE using key and invoking trigger that
    modifies this key does not stop".

  sql/key.cc@1.34.1.3, 2006-09-21 11:35:36+04:00, dlenev@mockturtle.local +20 -4
    Renamed check_if_key_used() to is_key_used(). Also this routine checks if
    key uses field which can be updated by before update trigger defined on the
    table. As result we avoid using update-on-the-fly method in cases when trigger
    updates part of key which is used by select which filters rows to be updated
    and thus avoid infinite updates. By doing such check here we cover both UPDATE
    and MULTI-UPDATE cases.

  sql/mysql_priv.h@1.290.62.1, 2006-09-21 11:35:36+04:00, dlenev@mockturtle.local +1 -1
    Renamed check_if_key_used() to is_key_used().

  sql/opt_range.cc@1.159.24.1, 2006-09-21 11:35:37+04:00, dlenev@mockturtle.local +8 -8
    Renamed check_if_key_used()/QUICK_SELECT_I::check_if_keys_used() to
    is_key_used()/QUICK_SELECT_I::is_keys_used().

  sql/opt_range.h@1.57.2.1, 2006-09-21 11:35:37+04:00, dlenev@mockturtle.local +5 -4
    Renamed QUICK_SELECT_I::check_if_keys_used() method to is_keys_used(),
    also updated comment describing it to reflect its extended semantics
    (this change was caused by change in check_if_key_used()/is_key_used()
     routine semantics).

  sql/sql_trigger.cc@1.35.1.21, 2006-09-21 11:35:37+04:00, dlenev@mockturtle.local +32 -0
    Introduced Table_triggers_list::is_updated_in_before_update_triggers()
    method which is needed for checking if field of subject table can be
    changed in before update trigger.

  sql/sql_trigger.h@1.19.1.3, 2006-09-21 11:35:37+04:00, dlenev@mockturtle.local +2 -5
    Table_triggers_list:
      Removed has_before_update_triggers() method which is not used any longer.
      Added declaration of is_updated_in_before_update_triggers() which is
      needed for checking if field of subject table can be changed by before
      update trigger.

  sql/sql_update.cc@1.154.19.1, 2006-09-21 11:35:37+04:00, dlenev@mockturtle.local +5 -11
    safe_update_on_fly():
      check_if_key_used() routine and check_if_keys_used() method were
      renamed to is_key_used()/is_keys_used(). 
      Now cases when trigger updates fields which are part of key used for
      filtering rows for update are caught directly in is_key_used().
      This also allows to cover both UPDATE and MULTI-UPDATE cases.

ChangeSet@1.2273.66.1, 2006-09-21 01:33:50-06:00, tsmith@siva.hindu.god +2 -0
  Fix typos, evidently from previous bad merges, in mysql-test-run.pl and sql_yacc.yy

  mysql-test/mysql-test-run.pl@1.179.1.1, 2006-09-21 01:33:39-06:00, tsmith@siva.hindu.god +1 -1
    Fix typo or bad merge (if -> elsif)

  sql/sql_yacc.yy@1.498.1.1, 2006-09-21 01:33:39-06:00, tsmith@siva.hindu.god +2 -2
    Fix apparent bad merge: add ';' before ev_schedule_time: rule.

ChangeSet@1.2273.64.2, 2006-09-21 08:57:47+02:00, georg@lmy002.wdf.sap.corp +6 -0
  Deleted old storage directories (introduced by a buggy 5.0 -> 5.1 merge).
  Fix for win/Makefile.am

  BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d@1.2, 2006-09-21 08:53:39+02:00, georg@lmy002.wdf.sap.corp +0 -0
    Delete: innobase/CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~4ef559bc8b4695f7@1.2, 2006-09-21 08:53:08+02:00, georg@lmy002.wdf.sap.corp +0 -0
    Delete: heap/CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~84669765249a4bad@1.2, 2006-09-21 08:54:04+02:00, georg@lmy002.wdf.sap.corp +0 -0
    Delete: myisammrg/CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~c20dcd005f596740@1.2, 2006-09-21 08:52:34+02:00, georg@lmy002.wdf.sap.corp +0 -0
    Delete: myisam/CMakeLists.txt

  BitKeeper/deleted/.del-CMakeLists.txt~dd682cce1d53c0b4@1.2, 2006-09-21 08:52:12+02:00, georg@lmy002.wdf.sap.corp +0 -0
    Delete: bdb/CMakeLists.txt

  win/Makefile.am@1.3, 2006-09-21 08:57:43+02:00, georg@lmy002.wdf.sap.corp +1 -1
    added missing support for 64-bit build file (make dist)

ChangeSet@1.1616.2767.2, 2006-09-21 03:32:42+02:00, lars@mysql.com +2 -0
  Vertical printout in test to make easier to read

  mysql-test/t/rpl_max_relay_size.test@1.8.1.5, 2006-09-21 03:32:36+02:00, lars@mysql.com +38 -3
    Vertical printout in test to make easier to read

  mysql-test/r/rpl_max_relay_size.result@1.12.1.2, 2006-09-21 03:32:36+02:00, lars@mysql.com +225 -18
    Vertical printout in test to make easier to read

ChangeSet@1.2273.65.5, 2006-09-21 02:44:58+02:00, lars@mysql.com +1 -0
  Version 5.1 needs one connection less

  mysql-test/r/status.result@1.15, 2006-09-21 02:44:54+02:00, lars@mysql.com +5 -5
    Version 5.1 needs one connection less

ChangeSet@1.2273.65.4, 2006-09-21 02:39:47+02:00, lars@mysql.com +3 -0
  Result file fixes after merge

  mysql-test/r/mysqldump.result@1.130, 2006-09-21 02:39:44+02:00, lars@mysql.com +54 -47
    Result file fixes after merge

  mysql-test/r/rpl_view.result@1.13, 2006-09-21 02:39:44+02:00, lars@mysql.com +0 -1
    Result file fixes after merge

  mysql-test/t/mysqldump.test@1.122, 2006-09-21 02:39:44+02:00, lars@mysql.com +78 -76
    Result file fixes after merge

ChangeSet@1.1810.2150.2, 2006-09-21 00:59:48+02:00, lars@mysql.com +3 -0
  Fix of result files from merge

  mysql-test/r/mysqldump.result@1.83.1.33, 2006-09-21 00:59:41+02:00, lars@mysql.com +241 -1
    Fix of result file (adding the echo's)

  mysql-test/r/rpl_view.result@1.3.1.4, 2006-09-21 00:59:41+02:00, lars@mysql.com +1 -0
    Added end of 5.0 echo

  mysql-test/t/rpl_view.test@1.3.1.3, 2006-09-21 00:59:41+02:00, lars@mysql.com +1 -0
    Added end of 5.0 echo

ChangeSet@1.1810.2149.1, 2006-09-20 13:00:49-06:00, tsmith@siva.hindu.god +4 -0
  Applied innodb snapshot ss792 and ss854.
  
  This ChangeSet will be null-merged to mysql-5.1.
  
  Bugs fixed:
  - Bug #21638:  InnoDB: possible segfault in page_copy_rec_list_end_no_locks
    If prefix_len is specified, write it to the insert buffer instead of type->len
  - bug #10746:  InnoDB: Error: stored_select_lock_type is 0 inside ::start_stmt()!
    INSERT ... SELECT uses LOCK_NONE in innodb_locks_unsafe_for_binlog mode, so do
    not check for LOCK_X or LOCK_S in start_stmt()

  sql/ha_innodb.cc@1.202.25.1, 2006-09-20 13:00:47-06:00, tsmith@siva.hindu.god +0 -13
    Applied innodb snapshot ss792 and ss854.
    
    ha_innobase::start_stmt(): Remove the check for
    prebuilt->stored_select_lock_type being LOCK_X or LOCK_S.
    This would cause false alarms with INSERT ... SELECT, which would use
    LOCK_NONE in innodb_locks_unsafe_for_binlog mode.  (Bug #10746)

  innobase/ibuf/ibuf0ibuf.c@1.36.6.1, 2006-09-20 13:00:46-06:00, tsmith@siva.hindu.god +10 -9
    Applied innodb snapshot ss792 and ss854.
    
    ibuf_entry_build(): Write prefix_len to the insert buffer instead of type->len
    when prefix_len is specified.  Otherwise, btr_page_reorganize() during
    insert buffer merge would fail on ROW_FORMAT=COMPACT tables.  (Bug #21638)

  innobase/include/data0type.h@1.20.3.1, 2006-09-20 13:00:47-06:00, tsmith@siva.hindu.god +3 -1
    Applied innodb snapshot ss792 and ss854.
    
    ibuf_entry_build(): Write prefix_len to the insert buffer instead of type->len
    when prefix_len is specified.  Otherwise, btr_page_reorganize() during
    insert buffer merge would fail on ROW_FORMAT=COMPACT tables.  (Bug #21638)

  innobase/include/data0type.ic@1.24.4.1, 2006-09-20 13:00:47-06:00, tsmith@siva.hindu.god +7 -2
    Applied innodb snapshot ss792 and ss854.
    
    ibuf_entry_build(): Write prefix_len to the insert buffer instead of type->len
    when prefix_len is specified.  Otherwise, btr_page_reorganize() during
    insert buffer merge would fail on ROW_FORMAT=COMPACT tables.  (Bug #21638)

ChangeSet@1.2273.63.2, 2006-09-20 20:04:58+02:00, mskold@mysql.com +1 -0
  bug#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS,: Updated reslt file

  mysql-test/r/rpl_ndb_dd_advance.result@1.7, 2006-09-20 20:04:33+02:00, mskold@mysql.com +3 -2
    bug#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS,: Updated result file

ChangeSet@1.1616.2735.28, 2006-09-20 09:46:12-07:00, igor@rurik.mysql.com +4 -0
  Fixed bug #20108.
  Any default value for a enum fields over UCS2 charsets was corrupted
  when we put it into the frm file, as it had been overwritten by its
  HEX representation.
  To fix it now we save a copy of structure that represents the enum
  type and when putting the default values we use this copy. 

  mysql-test/r/ctype_ucs.result@1.11.1.23, 2006-09-20 09:46:10-07:00, igor@rurik.mysql.com +21 -0
    Added a test case for bug #20108.

  mysql-test/t/ctype_ucs.test@1.15.1.19, 2006-09-20 09:46:10-07:00, igor@rurik.mysql.com +21 -0
    Added a test case for bug #20108.

  sql/field.h@1.120.1.13, 2006-09-20 09:46:10-07:00, igor@rurik.mysql.com +2 -0
    Fixed bug #20108.
    Any default value for a enum fields over UCS2 charsets was corrupted
    when we put it into the frm file, as it had been overwritten by its
    HEX representation.
    To fix it now we save a copy of structure that represents the enum
    type and when putting the default values we use this copy. 

  sql/unireg.cc@1.43.1.7, 2006-09-20 09:46:10-07:00, igor@rurik.mysql.com +32 -7
    Fixed bug #20108.
    Any default value for a enum fields over UCS2 charsets was corrupted
    when we put it into the frm file, as it had been overwritten by its
    HEX representation.
    To fix it now we save a copy of structure that represents the enum
    type and when putting the default values we use this copy. 

ChangeSet@1.1810.2144.3, 2006-09-20 08:08:57-07:00, igor@rurik.mysql.com +3 -0
  Fixed bug #22015: crash with GROUP_CONCAT over a derived table
  that returns the results of aggregation by GROUP_CONCAT.
  The crash was due to an overflow happened for the field
  sortoder->length.
  The fix prevents this overflow exploiting the fact that the
  value of sortoder->length cannot be greater than the value of
  thd->variables.max_sort_length.   

  mysql-test/r/func_gconcat.result@1.52.1.9, 2006-09-20 08:08:54-07:00, igor@rurik.mysql.com +9 -0
    Added a test case for bug #22015.

  mysql-test/t/func_gconcat.test@1.44.1.2, 2006-09-20 08:08:54-07:00, igor@rurik.mysql.com +15 -0
    Added a test case for bug #22015.

  sql/filesort.cc@1.105.1.1, 2006-09-20 08:08:54-07:00, igor@rurik.mysql.com +1 -0
    Fixed bug #22015: crash with GROUP_CONCAT over a derived table
    that returns the results of aggregation by GROUP_CONCAT.
    The crash was due to an overflow happened for the field
    sortoder->length.
    The fix prevents this overflow exploiting the fact that the
    value of sortoder->length cannot be greater than the value of
    thd->variables.max_sort_length.   

ChangeSet@1.2273.58.3, 2006-09-20 16:46:54+02:00, mskold@mysql.com +2 -0
  Bug#18976  CRBR: multiple binlog, second binlog may miss schema log events:Change test back to verify again

  mysql-test/r/ndb_binlog_ddl_multi.result@1.13, 2006-09-20 16:46:28+02:00, mskold@mysql.com +1 -1
    Bug#18976  CRBR: multiple binlog, second binlog may miss schema log events:Change test back to verify again

  mysql-test/t/ndb_binlog_ddl_multi.test@1.13, 2006-09-20 16:46:28+02:00, mskold@mysql.com +4 -4
    Bug#18976  CRBR: multiple binlog, second binlog may miss schema log events:Change test back to verify again

ChangeSet@1.1810.2131.16, 2006-09-20 15:41:46+02:00, msvensson@shellback.(none) +1 -0
  Fix problem with testcase timeouts not working. The timeout value was always multiplied with 10
  since the $opt_valgrind variable was initialised to 0, thus being "defined"

  mysql-test/mysql-test-run.pl@1.30.41.5, 2006-09-20 15:41:43+02:00, msvensson@shellback.(none) +2 -2
    Increase the timeout values if $opt_valgrind are greater than 0. By default $opt_valgrind is set to 0.

ChangeSet@1.1810.2137.6, 2006-09-20 17:12:37+05:00, svoj@mysql.com +1 -0
  BUG#21459 - myisam_ftdump gives bad counts for common words
  
  This problem affects myisam_ftdump tool only.
  
  For fulltext index positive subkeys means word weight, negative subkeys
  means number of documents in level 2 fulltext index.
  
  Fixed that document counter was not properly updated for keys having
  level 2 fulltext index.
  
  No test case for this bug.

  myisam/myisam_ftdump.c@1.36.3.1, 2006-09-20 17:12:35+05:00, svoj@mysql.com +1 -2
    For fulltext index positive subkeys means word weight, negative subkeys
    means number of documents in level 2 fulltext index.
    
    Fixed that document counter was not properly updated for keys having
    level 2 fulltext index.

ChangeSet@1.2291.1.1, 2006-09-20 10:56:37+00:00, lzhou@dev3-138.dev.cn.tlan +1 -0
  BUG#21799 manual modify variable name.

  storage/ndb/src/ndbapi/NdbScanOperation.cpp@1.95, 2006-09-20 10:56:35+00:00, lzhou@dev3-138.dev.cn.tlan +2 -2
    manual modify variable name.

ChangeSet@1.1810.2148.1, 2006-09-20 18:51:32+08:00, Justin.He@qa3-104.qa.cn.tlan +2 -0
  BUG #21036, myOperation->getBlobHandle(..) on non-existing column cause segmentation fault
  
  add judgement to avoid NULL pointer's operation(segmentaion fault)

  ndb/src/ndbapi/NdbOperation.cpp@1.15.2.1, 2006-09-20 18:51:27+08:00, Justin.He@qa3-104.qa.cn.tlan +20 -2
    if getColumn return NULL, set error code and return NULL in getBlobHandle

  ndb/src/ndbapi/ndberror.c@1.30.30.1, 2006-09-20 18:51:27+08:00, Justin.He@qa3-104.qa.cn.tlan +1 -1
    change the err message more appropriate

ChangeSet@1.1810.2146.1, 2006-09-20 11:05:11+02:00, istruewing@chilla.local +3 -0
  Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
  Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
  
  INSERT DELAYED ignored an explicitly set INSERT_ID and session
  specific auto_increment_* variables.
  
  The problem was that the inserts are done by a system thread,
  which does not have access to the session variables of the user
  thread.
  
  On a proposal of Guilhem I fixed it so that the variables are
  copied to the data structure for every delayed row. The system
  thread sets its session variables from these values.

  mysql-test/r/delayed.result@1.12, 2006-09-20 11:05:07+02:00, istruewing@chilla.local +174 -0
    Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
    Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
    Turned some sleeps into FLUSH TABLEs.
    Added test cases.

  mysql-test/t/delayed.test@1.11.1.3, 2006-09-20 11:05:07+02:00, istruewing@chilla.local +142 -6
    Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
    Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
    Turned some sleeps into FLUSH TABLEs.
    Added test cases.

  sql/sql_insert.cc@1.146.29.5, 2006-09-20 11:05:07+02:00, istruewing@chilla.local +46 -0
    Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
    Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
    Added auto_increment/insert_id related variables to 'delayed_row'.
    The session values are copied to 'delayed_row' by the user thread.
    The delayed insert thread copies them to his session variables.

ChangeSet@1.1810.2139.3, 2006-09-20 12:02:58+03:00, gkodinov@rakia.(none) +1 -0
  fixed merge

  mysql-test/r/func_group.result@1.49.1.4, 2006-09-20 12:02:35+03:00, gkodinov@rakia.(none) +1 -1
    fixed merge

ChangeSet@1.2273.30.8, 2006-09-20 09:28:12+02:00, msvensson@shellback.(none) +2 -0
  Bug#19738 "make install" tries to build files that "make" should already have built
   - Move comp_err to EXTRA_PROGRAMS, it will not be installed from 5.1 and up.

  extra/Makefile.am@1.37.1.3, 2006-09-20 09:28:07+02:00, msvensson@shellback.(none) +2 -1
    Move comp_err to EXTRA_PROGRAMS, it will only be built if any of the files it prodcues need to be rebuilt 

  support-files/mysql.spec.sh@1.163.1.1, 2006-09-20 09:28:07+02:00, msvensson@shellback.(none) +0 -1
    Remove comp_err from files to install

ChangeSet@1.1810.2145.1, 2006-09-20 08:56:57+02:00, msvensson@shellback.(none) +1 -0
  Bug#19738 "make install" tries to build files that "make" should already have built
   - Move gen_lex_hash to EXTRA_PROGRAMS

  sql/Makefile.am@1.103.3.2, 2006-09-20 08:56:54+02:00, msvensson@shellback.(none) +1 -1
    Move gen_lex_hash to EXTRA_PROGRAMS, this will make it be built only when lex_hash.h need to be rebuilt

ChangeSet@1.2273.32.32, 2006-09-20 07:43:03+02:00, msvensson@neptunus.(none) +1 -0
  Fix check of parameter type in mysqld_start. 

  mysql-test/mysql-test-run.pl@1.180, 2006-09-20 07:42:59+02:00, msvensson@neptunus.(none) +2 -2
    Fix check of parameter type in mysqld_start. 

ChangeSet@1.2273.60.1, 2006-09-19 13:58:12-07:00, brian@zim.(none) +17 -0
  Removed ifdef need.
  Cleaned up test to no longer need have_

  BitKeeper/deleted/.del-have_archive.require@1.2, 2006-09-18 14:56:05-07:00, brian@zim.(none) +0 -0
    Delete: mysql-test/r/have_archive.require

  BitKeeper/deleted/.del-have_blackhole.require@1.2, 2006-09-18 14:56:05-07:00, brian@zim.(none) +0 -0
    Delete: mysql-test/r/have_blackhole.require

  BitKeeper/deleted/.del-have_csv.require@1.2, 2006-09-18 14:56:05-07:00, brian@zim.(none) +0 -0
    Delete: mysql-test/r/have_csv.require

  BitKeeper/deleted/.del-have_exampledb.require@1.3, 2006-09-18 14:56:05-07:00, brian@zim.(none) +0 -0
    Delete: mysql-test/r/have_exampledb.require

  BitKeeper/deleted/.del-have_federated_db.require@1.3, 2006-09-18 14:56:05-07:00, brian@zim.(none) +0 -0
    Delete: mysql-test/r/have_federated_db.require

  BitKeeper/deleted/.del-have_innodb.require@1.4, 2006-09-18 14:56:06-07:00, brian@zim.(none) +0 -0
    Delete: mysql-test/r/have_innodb.require

  BitKeeper/deleted/.del-have_ndb.require@1.2, 2006-09-18 14:56:06-07:00, brian@zim.(none) +0 -0
    Delete: mysql-test/r/have_ndb.require

  BitKeeper/deleted/.del-have_raid.require@1.3, 2006-09-18 14:57:17-07:00, brian@zim.(none) +0 -0
    Delete: mysql-test/r/have_raid.require

  mysql-test/include/have_archive.inc@1.3, 2006-09-19 13:58:09-07:00, brian@zim.(none) +2 -2
    Rewrite of test to use new syntax

  mysql-test/include/have_blackhole.inc@1.2, 2006-09-19 13:58:09-07:00, brian@zim.(none) +2 -2
    Test rewritten to use new syntax

  mysql-test/include/have_csv.inc@1.2, 2006-09-19 13:58:09-07:00, brian@zim.(none) +2 -2
    Test rewrite

  mysql-test/include/have_exampledb.inc@1.2, 2006-09-19 13:58:09-07:00, brian@zim.(none) +2 -2
    Test rewrite

  mysql-test/include/have_federated_db.inc@1.3, 2006-09-19 13:58:09-07:00, brian@zim.(none) +2 -2
    Test rewrite

  mysql-test/include/have_innodb.inc@1.4, 2006-09-19 13:58:09-07:00, brian@zim.(none) +2 -2
    Test rewrite

  mysql-test/include/have_multi_ndb.inc@1.3, 2006-09-19 13:58:09-07:00, brian@zim.(none) +4 -4
    Test rewrite

  mysql-test/include/have_ndb.inc@1.9.1.1, 2006-09-19 13:58:09-07:00, brian@zim.(none) +2 -2
    Test rewrite

  sql/mysql_priv.h@1.438.1.1, 2006-09-19 13:58:09-07:00, brian@zim.(none) +7 -40
    Removed unneeded ifdef 

ChangeSet@1.1616.2144.196, 2006-09-20 01:40:59+05:00, svoj@mysql.com +6 -0
  BUG#10974 - No error message if merge table based on union of innodb, memory
  
  Fixed confusing error message from the storage engine when
  it fails to open underlying table. The error message is issued
  when a table is _opened_ (not when it is created).

  sql/share/english/errmsg.txt@1.70.33.1, 2006-09-20 01:40:58+05:00, svoj@mysql.com +1 -1
    Better error message if we fail to open underlying table.

  mysql-test/r/merge.result@1.32.1.9, 2006-09-20 01:40:58+05:00, svoj@mysql.com +11 -2
    A test case for bug#10974.

  mysql-test/r/repair.result@1.14.1.4, 2006-09-20 01:40:58+05:00, svoj@mysql.com +1 -1
    Fixed a test case according to patch for bug#10974.

  mysql-test/t/merge.test@1.28.1.11, 2006-09-20 01:40:58+05:00, svoj@mysql.com +16 -2
    A test case for bug#10974.

  sql/table.cc@1.111.4.7, 2006-09-20 01:40:58+05:00, svoj@mysql.com +8 -1
    Report error from handler with print_error instead of frm_error. This
    fixes confusing error message from the handler. Actually this is
    backported from 5.0.

  myisammrg/myrg_open.c@1.27.5.2, 2006-09-20 01:40:58+05:00, svoj@mysql.com +3 -0
    Set my_errno to HA_ERR_WRONG_MRG_TABLE_DEF if attempt to open
    underlying table failed.

ChangeSet@1.1810.2144.2, 2006-09-19 12:18:24-07:00, igor@rurik.mysql.com +2 -0
  Post-merge corrections.

  mysql-test/r/ps.result@1.56.1.18, 2006-09-19 12:18:21-07:00, igor@rurik.mysql.com +49 -49
    Post-merge corrections.

  mysql-test/t/ps.test@1.56.1.15, 2006-09-19 12:18:21-07:00, igor@rurik.mysql.com +54 -54
    Post-merge corrections.

ChangeSet@1.1810.2131.15, 2006-09-19 19:41:41+02:00, msvensson@shellback.(none) +1 -0
  Increase suite timeout even more - 6 times - when running with  valgrind

  mysql-test/mysql-test-run.pl@1.30.41.4, 2006-09-19 19:41:38+02:00, msvensson@shellback.(none) +1 -1
    Increase suite timeout even more when running with  valgrind

ChangeSet@1.1810.2131.14, 2006-09-19 18:39:04+02:00, msvensson@shellback.(none) +1 -0
  Pass --debug arguments to mysqld also when bootstrapping if --debug is tunrned on

  mysql-test/mysql-test-run.pl@1.30.41.3, 2006-09-19 18:39:01+02:00, msvensson@shellback.(none) +15 -8
    Pass --debug arguments to mysqld also when bootstrapping if --debug is tunrned on

ChangeSet@1.2273.59.1, 2006-09-19 17:45:27+02:00, msvensson@shellback.(none) +2 -0
  Fix warnings in mysql-test-run.pl

  mysql-test/lib/mtr_cases.pl@1.35, 2006-09-19 17:45:20+02:00, msvensson@shellback.(none) +1 -3
    Remove "chomp" on undefined 

  mysql-test/mysql-test-run.pl@1.176, 2006-09-19 17:45:19+02:00, msvensson@shellback.(none) +6 -1
    Initialise pid to 0 in arrays of masters and slaves
    Fix merge error

ChangeSet@1.1810.2115.3, 2006-09-19 17:40:09+02:00, Kristofer.Pettersson@naruto. +3 -0
  Bug#20789 Merge Subtable Rename Causes Crash
  - When a MyISAM table which belongs to a merge table union and is 
    renamed the associated file descriptors are closed on windows.
    This causes a server crash next time an insert or update is 
    performed on the merge table.
  - This patch prevents the system from crashing on windows by
    checking for bad file descriptors every time the MyISAM table
    is locked by associated the merge table.

  myisam/mi_locking.c@1.38.4.1, 2006-09-19 17:40:05+02:00, Kristofer.Pettersson@naruto. +15 -0
    - Added check for bad file descriptors when table is part of merge union.
    - This patch prevents the server from crash on windows.

  myisam/myisamdef.h@1.74.10.1, 2006-09-19 17:40:05+02:00, Kristofer.Pettersson@naruto. +3 -0
    Added boolean value to indicate that this myisam table is part of
    a merge union.

  myisammrg/myrg_locking.c@1.7.1.1, 2006-09-19 17:40:06+02:00, Kristofer.Pettersson@naruto. +12 -1
    Added paramter owned_by_merge=TRUE for mi_lock_database through MYRG_TABLE struct.

ChangeSet@1.1810.2131.13, 2006-09-19 16:48:01+02:00, msvensson@shellback.(none) +1 -0
  Don't bother to remove the pid_file in mtr_kill_leftovers as it could potentially remove a the pidfile before the process is killed.
  The pid file will be removed later when var/ directory is recreated.

  mysql-test/lib/mtr_process.pl@1.25.3.2, 2006-09-19 16:47:58+02:00, msvensson@shellback.(none) +0 -8
    Don't bother to remove the pid_file in mtr_kill_leftovers as it could potentially remove a the pidfile before the process is killed.
    The pid file will be removed later when var/ directory is recreated.

ChangeSet@1.1810.2131.12, 2006-09-19 16:43:42+02:00, msvensson@shellback.(none) +2 -0
  Fix warnings in mysql-test-run.pl

  mysql-test/lib/mtr_stress.pl@1.2.1.2, 2006-09-19 16:43:38+02:00, msvensson@shellback.(none) +0 -1
    Remove duplicate definition of variable

  mysql-test/mysql-test-run.pl@1.30.41.2, 2006-09-19 16:43:38+02:00, msvensson@shellback.(none) +3 -3
    Fix spelling error
    Fix warning about uninitialised warning

ChangeSet@1.2273.58.2, 2006-09-19 15:18:43+02:00, mskold@mysql.com +1 -0
  C style comments

  client/mysqltest.c@1.226, 2006-09-19 15:18:32+02:00, mskold@mysql.com +2 -2
    C style comments

ChangeSet@1.1810.2137.5, 2006-09-19 14:26:18+02:00, istruewing@chilla.local +1 -0
  After merge fix.

  sql/sql_select.cc@1.312.94.2, 2006-09-19 14:26:16+02:00, istruewing@chilla.local +7 -6
    After merge fix.

ChangeSet@1.1616.2765.1, 2006-09-19 12:40:31+02:00, thek@kpdesk.mysql.com +1 -0
  Bug#21139 Handling of database differs in "embedded" , test lowercase_fs_off fails
  - Access checks are omitted when compliled without --with-embedded-privilege-control
  - Patch: skip this test

  mysql-test/t/lowercase_fs_off.test@1.2, 2006-09-19 12:40:30+02:00, thek@kpdesk.mysql.com +1 -0
    Added test to check if this embedded built in which case we just skip this test.

ChangeSet@1.2273.21.14, 2006-09-19 11:31:55+02:00, mskold@mysql.com +2 -0
  Bug #18679  rpl_ndb_dd_advance.test fails randomly

  client/mysqltest.c@1.225, 2006-09-19 11:31:22+02:00, mskold@mysql.com +90 -39
    Bug #18679  rpl_ndb_dd_advance.test fails randomly

  mysql-test/t/disabled.def@1.196.4.1, 2006-09-19 11:31:22+02:00, mskold@mysql.com +0 -1
    Bug #18679  rpl_ndb_dd_advance.test fails randomly

ChangeSet@1.1810.2142.1, 2006-09-19 16:25:31+08:00, gni@dev3-127.(none) +3 -0
  BUG#20575 If the stopped node ids are transmitted to ndbd, 
            the following start, stop and restart operations aren't execute correctly

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@1.14.15.1, 2006-09-19 16:25:29+08:00, gni@dev3-127.(none) +26 -0
    Adding some source codes check node list whether or not stopped for STOP_REQ signal.
    If all of these nodes have stopped, then STOP_CONF signal will return. 

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.24.1, 2006-09-19 16:25:30+08:00, gni@dev3-127.(none) +1 -1
    Ensure ndb_mgm can only transmit the valid range node id to management server.
    if the node id is greater than MAX_NODES, management server will exit abnormally.

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.73.38.1, 2006-09-19 16:25:30+08:00, gni@dev3-127.(none) +5 -0
    Ensure management server can only transmit the data node id to data node process.

ChangeSet@1.2273.57.1, 2006-09-19 17:07:21+10:00, stewart@willster.(none) +1 -0
  BUG#20809 mysqldump does not backup TS and LG information correctly.
  
  We were not parsing the EXTRA field to get UNDO_BUFFER_SIZE for the
  CREATE LOGFILE GROUP statement in the dump.

  client/mysqldump.c@1.245.3.1, 2006-09-19 17:07:17+10:00, stewart@willster.(none) +17 -2
    parse the EXTRA field of INFORMATION_SCHEMA.FILES to determine the UNDO_BUFFER_SIZE

ChangeSet@1.1810.2141.2, 2006-09-19 08:15:42+02:00, msvensson@shellback.(none) +1 -0
  Bug#19738 "make install" tries to build files that "make" should already have built
   - Remove the wildcard dependcy on the charset xml files

  extra/Makefile.am@1.30.2.2, 2006-09-19 08:15:39+02:00, msvensson@shellback.(none) +1 -2
    Remove the "wildcard" dependency

ChangeSet@1.1616.2747.3, 2006-09-19 11:15:50+08:00, gni@dev3-127.(none) +3 -0
  BUG#21585  The --help option shows a screen of command options for the ndbd,ndb_mgmd, ndb_mgm 
             and other commands related to ndb. For all of these, the help screen contains 
            "Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete.

  ndb/include/util/ndb_opts.h@1.4.1.4, 2006-09-19 11:15:48+08:00, gni@dev3-127.(none) +1 -1
    Change help info from Ndb.cfg to my.cnf in the header file.

  ndb/test/ndbapi/flexScan.cpp@1.9.1.1, 2006-09-19 11:15:48+08:00, gni@dev3-127.(none) +2 -2
    Change help info from Ndb.cfg to my.cnf.

  ndb/tools/ndb_config.cpp@1.3.3.3, 2006-09-19 11:15:48+08:00, gni@dev3-127.(none) +1 -1
    Change help info from Ndb.cfg to my.cnf

ChangeSet@1.2273.55.2, 2006-09-18 19:31:08-07:00, acurtis@xiphis.org +10 -0
  Bug#22417
    "plug.in not included in dist source"

  storage/archive/Makefile.am@1.8, 2006-09-18 19:31:04-07:00, acurtis@xiphis.org +1 -1
    plug.in needs to be included in dist

  storage/blackhole/Makefile.am@1.5, 2006-09-18 19:31:04-07:00, acurtis@xiphis.org +1 -1
    plug.in needs to be included in dist

  storage/csv/Makefile.am@1.10, 2006-09-18 19:31:04-07:00, acurtis@xiphis.org +1 -1
    plug.in needs to be included in dist

  storage/example/Makefile.am@1.11, 2006-09-18 19:31:04-07:00, acurtis@xiphis.org +1 -1
    plug.in needs to be included in dist

  storage/federated/Makefile.am@1.2, 2006-09-18 19:31:04-07:00, acurtis@xiphis.org +1 -1
    plug.in needs to be included in dist

  storage/heap/Makefile.am@1.19, 2006-09-18 19:31:04-07:00, acurtis@xiphis.org +1 -1
    plug.in needs to be included in dist

  storage/innobase/Makefile.am@1.20.1.2, 2006-09-18 19:31:04-07:00, acurtis@xiphis.org +1 -1
    plug.in needs to be included in dist

  storage/myisam/Makefile.am@1.38, 2006-09-18 19:31:04-07:00, acurtis@xiphis.org +1 -1
    plug.in needs to be included in dist

  storage/myisammrg/Makefile.am@1.20, 2006-09-18 19:31:04-07:00, acurtis@xiphis.org +1 -1
    plug.in needs to be included in dist

  storage/ndb/Makefile.am@1.19, 2006-09-18 19:31:04-07:00, acurtis@xiphis.org +1 -1
    plug.in needs to be included in dist

ChangeSet@1.2273.54.5, 2006-09-18 15:52:16-07:00, acurtis@xiphis.org +6 -0
  post merge fixes

  BitKeeper/deleted/.del-strict_autoinc_4bdb.test@1.2, 2006-09-18 13:34:09-07:00, acurtis@xiphis.org +0 -0
    Delete: mysql-test/t/strict_autoinc_4bdb.test

  mysql-test/r/strict_autoinc_1myisam.result@1.2, 2006-09-18 15:52:12-07:00, acurtis@xiphis.org +3 -3
    post merge fixes, error message was changed

  mysql-test/r/strict_autoinc_2innodb.result@1.2, 2006-09-18 15:52:12-07:00, acurtis@xiphis.org +3 -3
    post merge fixes, error message was changed

  mysql-test/r/strict_autoinc_3heap.result@1.2, 2006-09-18 15:52:12-07:00, acurtis@xiphis.org +3 -3
    post merge fixes, error message was changed

  mysql-test/r/strict_autoinc_5ndb.result@1.2, 2006-09-18 15:52:12-07:00, acurtis@xiphis.org +3 -3
    post merge fixes, error message was changed

  sql/handler.cc@1.269, 2006-09-18 15:52:12-07:00, acurtis@xiphis.org +2 -2
    post merge fixes

ChangeSet@1.1810.2141.1, 2006-09-18 21:11:34+02:00, msvensson@shellback.(none) +2 -0
  BUG#19738 "make install" tries to build files that "make" should already have built
   - Make built sources only depend on it's sources not the built tool

  extra/Makefile.am@1.30.2.1, 2006-09-18 21:11:29+02:00, msvensson@shellback.(none) +8 -3
    The files built by "comp_err" should only depend on their sources not the tool comp_err
    The built sources should only be cleaned by "make distclean"  

  sql/Makefile.am@1.103.3.1, 2006-09-18 21:11:29+02:00, msvensson@shellback.(none) +5 -1
    The built file "lex_hash.h" should depend on it's sources  

ChangeSet@1.2273.45.10, 2006-09-18 21:09:48+02:00, mats@romeo.(none) +1 -0
  Fixing and checking result for mysqldump test.

  mysql-test/r/mysqldump.result@1.125.1.3, 2006-09-18 21:09:45+02:00, mats@romeo.(none) +98 -144
    Result change

ChangeSet@1.2273.32.26, 2006-09-18 19:38:59+02:00, msvensson@shellback.(none) +1 -0
  Fix merge error, path_mysock has been renamed to path_sock

  mysql-test/mysql-test-run.pl@1.175, 2006-09-18 19:38:53+02:00, msvensson@shellback.(none) +1 -1
    Fix merge error, path_mysock has been renamed to path_sock

ChangeSet@1.1810.2131.11, 2006-09-18 19:37:22+02:00, msvensson@shellback.(none) +3 -0
  Add directive to not update files from bitkeeper

  extra/yassl/src/Makefile.am@1.10.1.1, 2006-09-18 19:37:19+02:00, msvensson@shellback.(none) +4 -0
    Add directive to not update files from bitkeeper

  extra/yassl/taocrypt/src/Makefile.am@1.14, 2006-09-18 19:37:19+02:00, msvensson@shellback.(none) +4 -0
    Add directive to not update files from bitkeeper

  extra/yassl/testsuite/Makefile.am@1.3.1.1, 2006-09-18 19:37:19+02:00, msvensson@shellback.(none) +4 -0
    Add directive to not update files from bitkeeper

ChangeSet@1.1810.2131.10, 2006-09-18 17:46:36+02:00, msvensson@shellback.(none) +1 -0
  Add character-sets-dir argument to "mysql". That avoids a local 
  installed charset dir being used.

  mysql-test/mysql-test-run.pl@1.30.41.1, 2006-09-18 17:46:33+02:00, msvensson@shellback.(none) +2 -1
    Add character-sets-dir argument to "mysql". That avoids a local
    installed charset dir being used.

ChangeSet@1.2273.56.1, 2006-09-19 01:44:32+10:00, stewart@willster.(none) +4 -0
  BUG#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS,
  
  Change things around so that we add a row for each log file group that lists
  the free space for that log file group.

  client/mysqldump.c@1.245.2.1, 2006-09-19 01:44:26+10:00, stewart@willster.(none) +1 -0
    dump logfile groups correctly (ignore row for the log file group itself)

  mysql-test/r/ndb_dd_dump.result@1.5, 2006-09-19 01:44:27+10:00, stewart@willster.(none) +1 -0
    update results with new row for log file groups

  sql/ha_ndbcluster.cc@1.348.9.1, 2006-09-19 01:44:27+10:00, stewart@willster.(none) +114 -1
    for fill_files_table:
    - set null bits properly
    - add rows for log file groups with free undo space.

  sql/sql_show.cc@1.354.15.1, 2006-09-19 01:44:27+10:00, stewart@willster.(none) +21 -21
    make most I_S.FILES columns nullable to better fit with reality.

ChangeSet@1.2273.55.1, 2006-09-18 17:28:17+02:00, georg@lmy002.wdf.sap.corp +1 -0
  In current 5.1 build we don't build embedded server for windows (this will be
  fixed when 5.1-win will be pushed into main tree).
  Commenting the libmysqld and libmysqld/example subdirectories will allow us 
  to upgrade from cmake 2.2 to 2.4.

  CMakeLists.txt@1.24, 2006-09-18 17:28:14+02:00, georg@lmy002.wdf.sap.corp +4 -2
    comment libmysqld and libmysqld/example directories

ChangeSet@1.2273.43.8, 2006-09-18 16:55:56+02:00, mleich@three.local.lan +7 -0
  1. Cumulated fix for Bug#22398, #22404 and #22405
  2. Correct some logical bugs within the tests, which were caused by
     automatic resolve of BitKeeper

  mysql-test/include/mix1.inc@1.12, 2006-09-18 16:55:52+02:00, mleich@three.local.lan +18 -10
    - Remove hardcoded assignment of storage engine, because this violates the logics of
      refactored tests
    - Remove trailing spaces
    - Move the FOREIGN KEY creation(probably not really needed for the testcase) out of 
      the CREATE TABLE statement + let the FK creation depend on the storage engine capabilities

  mysql-test/r/index_merge_innodb.result@1.2, 2006-09-18 16:55:52+02:00, mleich@three.local.lan +40 -0
    Updated result

  mysql-test/r/index_merge_myisam.result@1.4, 2006-09-18 16:55:52+02:00, mleich@three.local.lan +40 -0
    Updated result

  mysql-test/r/innodb_mysql.result@1.11, 2006-09-18 16:55:52+02:00, mleich@three.local.lan +22 -3
    Updated result

  mysql-test/t/disabled.def@1.203, 2006-09-18 16:55:52+02:00, mleich@three.local.lan +0 -3
    Reenable the fixed tests 

  mysql-test/t/index_merge_innodb.test@1.2, 2006-09-18 16:55:52+02:00, mleich@three.local.lan +5 -1
    Important comment describing how to modify the tests when some issues
    (most probably no bugs) are fixed.

  mysql-test/t/innodb_mysql.test@1.3, 2006-09-18 16:55:52+02:00, mleich@three.local.lan +2 -0
    Introduction of a variable for switching FOREIGN KEY on/off

ChangeSet@1.2273.52.5, 2006-09-18 18:30:51+04:00, gkodinov@dl145s.mysql.com +7 -0
  merge fixes

  mysql-test/r/create.result@1.127, 2006-09-18 18:30:07+04:00, gkodinov@dl145s.mysql.com +2 -0
    merge fixes

  mysql-test/r/func_group_innodb.result@1.2, 2006-09-18 18:30:07+04:00, gkodinov@dl145s.mysql.com +4 -4
    merge fixes

  mysql-test/r/func_str.result@1.126, 2006-09-18 18:30:07+04:00, gkodinov@dl145s.mysql.com +3 -3
    merge fixes

  mysql-test/r/func_time.result@1.77, 2006-09-18 18:30:07+04:00, gkodinov@dl145s.mysql.com +2 -2
    merge fixes

  mysql-test/r/insert_update.result@1.23, 2006-09-18 18:30:07+04:00, gkodinov@dl145s.mysql.com +2 -2
    merge fixes

  mysql-test/r/row.result@1.26, 2006-09-18 18:30:07+04:00, gkodinov@dl145s.mysql.com +14 -14
    merge fixes

  mysql-test/r/sp.result@1.225, 2006-09-18 18:30:07+04:00, gkodinov@dl145s.mysql.com +0 -35
    merge fixes

ChangeSet@1.2273.32.24, 2006-09-18 13:24:03+02:00, msvensson@shellback.(none) +1 -0
  Fix spelling error in Makefile

  mysql-test/Makefile.am@1.85, 2006-09-18 13:23:59+02:00, msvensson@shellback.(none) +1 -1
    Fix spelling error in Makefile

ChangeSet@1.2273.21.13, 2006-09-18 13:00:21+02:00, mskold@mysql.com +2 -0
  Bug #21378  Alter table from X storage engine to NDB could cause data loss: added show tables to ensure tables are gone

  mysql-test/r/ndb_multi.result@1.11, 2006-09-18 13:00:03+02:00, mskold@mysql.com +2 -0
    Bug #21378  Alter table from X storage engine to NDB could cause data loss: added show tables to ensure tables are gone

  mysql-test/t/ndb_multi.test@1.12.2.2, 2006-09-18 13:00:03+02:00, mskold@mysql.com +1 -0
    Bug #21378  Alter table from X storage engine to NDB could cause data loss: added show tables to ensure tables are gone

ChangeSet@1.2255.80.1, 2006-09-18 14:49:54+04:00, sergefp@mysql.com +3 -0
  BUG#22393: Very wrong E(#rows(ref(const)) for key with skewed distribution
  - Check if we have E(#rows) for 'range' access on the smaller interval 
    on the same index. If yes, adjust the estimate.

  mysql-test/r/range.result@1.47.1.1, 2006-09-18 14:49:51+04:00, sergefp@mysql.com +14 -0
    BUG#22393: Testcase

  mysql-test/t/range.test@1.40.1.1, 2006-09-18 14:49:51+04:00, sergefp@mysql.com +27 -0
    BUG#22393: Testcase

  sql/sql_select.cc@1.433.2.1, 2006-09-18 14:49:51+04:00, sergefp@mysql.com +23 -0
    BUG#22393: Very wrong E(#rows(ref(const)) for key with skewed distribution
    - Check if we have E(#rows) for 'range' access on the smaller interval 
      on the same index. If yes, adjust the estimate.

ChangeSet@1.2273.32.23, 2006-09-18 12:45:04+02:00, msvensson@shellback.(none) +3 -0
  No need to use environment variable NDB_STATUS_OK and NDB_SLAVE_STATUS_OK anymore
  when mysql-test-run.pl has full control of all ndb processes. It will now know if
  install has failed.

  BitKeeper/deleted/.del-have_ndb_status_ok.require@1.2, 2006-09-18 12:37:02+02:00, msvensson@shellback.(none) +0 -0
    Delete: mysql-test/r/have_ndb_status_ok.require

  mysql-test/include/have_ndb.inc@1.10, 2006-09-18 12:45:00+02:00, msvensson@shellback.(none) +0 -8
    Remove the test to check if environment variable NDB_STATUS_OK is set

  mysql-test/mysql-test-run.pl@1.173, 2006-09-18 12:45:00+02:00, msvensson@shellback.(none) +6 -9
    Don't set env variable NDB_STATUS_OK or NDB_SLAVE_STATUS_OK
    Use 1 and 0 to indicate if cluster has been installed ok.

ChangeSet@1.2273.32.22, 2006-09-18 12:24:10+02:00, msvensson@shellback.(none) +1 -0
  Remove extra semicolon

  mysql-test/mysql-test-run.pl@1.172, 2006-09-18 12:24:02+02:00, msvensson@shellback.(none) +1 -1
    Remove extra semicolon

ChangeSet@1.1810.2133.4, 2006-09-18 12:14:27+02:00, gkodinov@dl145s.mysql.com +9 -0
  merge fixes

  mysql-test/r/func_time.result@1.47.11.2, 2006-09-18 12:12:45+02:00, gkodinov@dl145s.mysql.com +3 -4

  mysql-test/r/query_cache.result@1.65.4.2, 2006-09-18 12:12:45+02:00, gkodinov@dl145s.mysql.com +6 -6

  mysql-test/r/subselect.result@1.134.1.25, 2006-09-18 12:12:45+02:00, gkodinov@dl145s.mysql.com +2 -2

  mysql-test/r/view.result@1.138.19.2, 2006-09-18 12:12:45+02:00, gkodinov@dl145s.mysql.com +2 -2

  mysql-test/t/func_time.test@1.41.10.2, 2006-09-18 12:12:45+02:00, gkodinov@dl145s.mysql.com +1 -1

  mysql-test/t/view.test@1.126.17.2, 2006-09-18 12:12:45+02:00, gkodinov@dl145s.mysql.com +2 -2

  sql/item_cmpfunc.cc@1.187.9.3, 2006-09-18 12:12:45+02:00, gkodinov@dl145s.mysql.com +3 -1

  sql/opt_range.cc@1.159.1.66, 2006-09-18 12:12:45+02:00, gkodinov@dl145s.mysql.com +0 -15

  sql/opt_range.h@1.57.1.5, 2006-09-18 12:12:45+02:00, gkodinov@dl145s.mysql.com +1 -1

ChangeSet@1.2255.68.3, 2006-09-18 13:53:30+04:00, evgen@moonbone.local +1 -0
  disabled.def:
    Enabled rpl_sp_effects test due to fixed bug.

  mysql-test/t/disabled.def@1.184.9.1, 2006-09-18 13:52:22+04:00, evgen@moonbone.local +0 -1
    Enabled rpl_sp_effects test due to fixed bug.

ChangeSet@1.2273.32.19, 2006-09-18 11:27:21+02:00, msvensson@shellback.(none) +2 -0
  Remove trailing whitespace
  Add linebreak

  BitKeeper/etc/ignore@1.246.1.13, 2006-09-18 11:27:18+02:00, msvensson@shellback.(none) +1 -0
    Added mysql-test/mysql-test-run-shell to the ignore list

  mysql-test/Makefile.am@1.84, 2006-09-18 11:27:18+02:00, msvensson@shellback.(none) +4 -3
    Remove trailing whitespace
    Add linebreak

ChangeSet@1.2273.32.18, 2006-09-18 11:22:51+02:00, msvensson@shellback.(none) +2 -0
  Move mysql-test-run.sh to new name mysql-test-run-shell.sh
  Symlink mysql-test-run to mysql-test-run.pl

  mysql-test/Makefile.am@1.83, 2006-09-18 11:22:48+02:00, msvensson@shellback.(none) +7 -2
    Build a link to mysql-test-run.pl called mysql-test-run

  mysql-test/mysql-test-run-shell.sh@1.331, 2006-09-17 20:56:12+02:00, msvensson@shellback.(none) +0 -0
    Rename: mysql-test/mysql-test-run.sh -> mysql-test/mysql-test-run-shell.sh

ChangeSet@1.2273.21.12, 2006-09-18 10:42:59+02:00, mskold@mysql.com +1 -0
  Added InnoDB dependency

  mysql-test/t/ndb_dd_advance.test@1.3.1.1, 2006-09-18 10:42:22+02:00, mskold@mysql.com +1 -0
    Added InnoDB dependency

ChangeSet@1.2273.45.9, 2006-09-18 10:08:10+02:00, mats@romeo.(none) +1 -0
  Adding tests lost in the merge.

  mysql-test/t/mysqldump.test@1.118.1.4, 2006-09-18 10:08:05+02:00, mats@romeo.(none) +25 -0
    Adding tests lost in the merge.

ChangeSet@1.1810.2119.5, 2006-09-18 09:24:30+02:00, mskold@mysql.com +1 -0
  Bug #21056  ndb pushdown equal/setValue error on datetime: thread safe bitmap not needed

  sql/ha_ndbcluster.h@1.82.4.5, 2006-09-18 09:24:21+02:00, mskold@mysql.com +3 -3
    Bug #21056  ndb pushdown equal/setValue error on datetime: thread safe bitmap not needed

ChangeSet@1.1810.2073.11, 2006-09-18 13:28:30+08:00, gni@dev3-127.(none) +1 -0
  merge exit status from 4.1 to 5.0

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.23.2, 2006-09-18 13:28:29+08:00, gni@dev3-127.(none) +1 -0
    add right braces

ChangeSet@1.1810.2120.4, 2006-09-18 03:21:00+04:00, aivanov@mysql.com +3 -0
  BUG#19419: VIEW: View that the column name is different
   by master and slave is made.

  mysql-test/r/rpl_view.result@1.3.1.3, 2006-09-18 03:20:56+04:00, aivanov@mysql.com +15 -0
    BUG#19419: VIEW: View that the column name is different
     by master and slave is made.
     Fixed result for the added test case.

  mysql-test/t/rpl_view.test@1.3.1.2, 2006-09-18 03:20:56+04:00, aivanov@mysql.com +20 -0
    BUG#19419: VIEW: View that the column name is different
     by master and slave is made.
     Added test case.

  sql/sql_parse.cc@1.426.105.2, 2006-09-18 03:20:56+04:00, aivanov@mysql.com +13 -0
    BUG#19419: VIEW: View that the column name is different
     by master and slave is made.
     Fixed: Add column_list to to the view creation statement
     which is written to binlog.

ChangeSet@1.2273.32.17, 2006-09-17 20:54:06+02:00, msvensson@shellback.(none) +3 -0
  BUG#22396 crash_commit_before
   - Disable generation of core file and stacktrace when running this testcase, which would
     otherwise mark the whole testsuite as failed.

  mysql-test/mysql-test-run.pl@1.169.1.1, 2006-09-17 20:53:59+02:00, msvensson@shellback.(none) +15 -5
    Allow --skip-core-file to be specified in master.opt file, which will turn
    off the default behaviour to generate core file.
    Remove the option --exit-info from being passed to myslqd when it's started. If used 
    it will just overwrite all the options for skip-stack-trace etc.

  mysql-test/t/crash_commit_before-master.opt@1.1, 2006-09-17 20:53:59+02:00, msvensson@shellback.(none) +2 -0
    Run crash_commit_before test case without core file and stack trace.

  mysql-test/t/crash_commit_before-master.opt@1.0, 2006-09-17 20:53:59+02:00, msvensson@shellback.(none) +0 -0

  mysql-test/t/disabled.def@1.196.2.3, 2006-09-17 20:53:59+02:00, msvensson@shellback.(none) +0 -1
    Enable crash_commit_before

ChangeSet@1.1616.2763.1, 2006-09-16 11:50:00-07:00, igor@rurik.mysql.com +3 -0
  Fixed bug #22085: Crash on the execution of a prepared 
  statement that uses an aggregating IN subquery with 
  HAVING clause.
  A wrong order of the call of split_sum_func2 for the HAVING
  clause of the subquery and the transformation for the 
  subquery resulted in the creation of a andor structure
  that could not be restored at an execution of the prepared
  statement.

  mysql-test/r/ps.result@1.31.3.2, 2006-09-16 11:49:58-07:00, igor@rurik.mysql.com +47 -0
    Added a test cases for bug #22085.

  mysql-test/t/ps.test@1.27.1.25, 2006-09-16 11:49:58-07:00, igor@rurik.mysql.com +52 -0
    Added a test cases for bug #22085.

  sql/sql_select.cc@1.216.125.9, 2006-09-16 11:49:58-07:00, igor@rurik.mysql.com +3 -2
    Fixed bug #22085: Crash on the execution of a prepared 
    statement that uses an aggregating IN subquery with 
    HAVING clause.
    A wrong order of the call of split_sum_func2 for the HAVING
    clause of the subquery and the transformation for the 
    subquery resulted in the creation of a andor structure
    that could not be restored at an execution of the prepared
    statement.

ChangeSet@1.2273.43.7, 2006-09-16 20:32:01+02:00, istruewing@chilla.local +1 -0
  Merge 5.1 -> 5.1-engines
  Disabled im_instance_conf to get autopush through

  mysql-test/t/disabled.def@1.202, 2006-09-16 20:31:58+02:00, istruewing@chilla.local +1 -0
    Merge 5.1 -> 5.1-engines
    Disabled im_instance_conf to get autopush through

ChangeSet@1.1810.2084.11, 2006-09-16 09:50:48-07:00, igor@rurik.mysql.com +8 -0
  Fixed bug #21493: crash for the second execution of a function
  containing a select statement that uses an aggregating IN subquery.
  Added a parameter to the function fix_prepare_information 
  to restore correctly the having clause for the second execution.
  Saved andor structure of the having conditions at the proper moment
  before any calls of split_sum_func2 that could modify the having structure
  adding new Item_ref objects. (These additions, are produced not with 
  the statement mem_root, but rather with the execution mem_root.)

  mysql-test/r/sp.result@1.170.23.1, 2006-09-16 09:50:44-07:00, igor@rurik.mysql.com +63 -0
    Added a test case for bug #21493.

  mysql-test/t/sp.test@1.174.18.1, 2006-09-16 09:50:44-07:00, igor@rurik.mysql.com +67 -0
    Added a test case for bug #21493.

  sql/sql_delete.cc@1.144.1.35, 2006-09-16 09:50:44-07:00, igor@rurik.mysql.com +2 -1
    Fixed bug #21493: crash for the second execution of a function
    containing a select statement that uses an aggregating IN subquery.
    Added a parameter to the function fix_prepare_information 
    to restore correctly the having clause for the second execution.

  sql/sql_insert.cc@1.146.34.1, 2006-09-16 09:50:44-07:00, igor@rurik.mysql.com +1 -1
    Fixed bug #21493: crash for the second execution of a function
    containing a select statement that uses an aggregating IN subquery.
    Added a parameter to the function fix_prepare_information 
    to restore correctly the having clause for the second execution.

  sql/sql_lex.cc@1.142.22.2, 2006-09-16 09:50:44-07:00, igor@rurik.mysql.com +19 -4
    Fixed bug #21493: crash for the second execution of a function
    containing a select statement that uses an aggregating IN subquery.
    Added a parameter to the function fix_prepare_information 
    to restore correctly the having clause for the second execution.

  sql/sql_lex.h@1.175.21.2, 2006-09-16 09:50:44-07:00, igor@rurik.mysql.com +1 -1
    Fixed bug #21493: crash for the second execution of a function
    containing a select statement that uses an aggregating IN subquery.
    Added a parameter to the function fix_prepare_information 
    to restore correctly the having clause for the second execution.

  sql/sql_select.cc@1.312.89.6, 2006-09-16 09:50:44-07:00, igor@rurik.mysql.com +3 -3
    Fixed bug #21493: crash for the second execution of a function
    containing a select statement that uses an aggregating IN subquery.
    Added a parameter to the function fix_prepare_information 
    to restore correctly the having clause for the second execution.
    Saved andor structure of the having conditions at the proper moment
    before any calls of split_sum_func2 that could modify the having structure
    adding new Item_ref objects. (These additions, are produced not with 
    the statement mem_root, but rather with the execution mem_root.)

  sql/sql_update.cc@1.154.2.43, 2006-09-16 09:50:44-07:00, igor@rurik.mysql.com +2 -1
    Fixed bug #21493: crash for the second execution of a function
    containing a select statement that uses an aggregating IN subquery.
    Added a parameter to the function fix_prepare_information 
    to restore correctly the having clause for the second execution.

ChangeSet@1.2273.45.8, 2006-09-16 13:20:06+02:00, lars@mysql.com +3 -0
  Test case fixes

  mysql-test/r/rpl_row_tabledefs_2myisam.result@1.4.1.1, 2006-09-16 13:20:02+02:00, lars@mysql.com +4 -4
    Change error code of new error

  mysql-test/r/rpl_switch_stm_row_mixed.result@1.15, 2006-09-16 13:20:02+02:00, lars@mysql.com +1 -1
    Change of result file

  mysql-test/t/mysqldump.test@1.118.1.3, 2006-09-16 13:20:02+02:00, lars@mysql.com +0 -1
    incorrect merge

ChangeSet@1.2273.43.6, 2006-09-15 21:42:49+02:00, istruewing@chilla.local +1 -0
  Merge 5.1 -> 5.1-engines
  Disabled innodb_mysql to get autopush through

  mysql-test/t/disabled.def@1.201, 2006-09-15 21:42:47+02:00, istruewing@chilla.local +1 -0
    Merge 5.1 -> 5.1-engines
    Disabled innodb_mysql to get autopush through

ChangeSet@1.2273.43.5, 2006-09-15 20:32:09+02:00, istruewing@chilla.local +1 -0
  Merge 5.1 -> 5.1-engines
  Disabled index_merge_myisam to get autopush through

  mysql-test/t/disabled.def@1.200, 2006-09-15 20:32:05+02:00, istruewing@chilla.local +1 -0
    Merge 5.1 -> 5.1-engines
    Disabled index_merge_myisam to get autopush through

ChangeSet@1.2273.43.4, 2006-09-15 19:31:42+02:00, istruewing@chilla.local +1 -0
  Merge 5.1 -> 5.1-engines
  Disabled index_merge_innodb to get autopush through

  mysql-test/t/disabled.def@1.199, 2006-09-15 19:31:38+02:00, istruewing@chilla.local +1 -0
    Merge 5.1 -> 5.1-engines
    Disabled index_merge_innodb to get autopush through

ChangeSet@1.2273.34.3, 2006-09-15 10:28:00-07:00, brian@zim.(none) +30 -0
  This changes the order of the universe, black is now the new white.
  
  In practice this means that handlerton is now created by the server and is passed to the engine. Plugin startups can now also control how plugins are inited (and can optionally pass values). Bit more flexibility to those who want to write plugin interfaces to the database. 

  include/mysql/plugin.h@1.19, 2006-09-15 10:27:53-07:00, brian@zim.(none) +2 -2
    Optional to pass parameter now to init and deinit functions

  sql/ha_ndbcluster.cc@1.348.8.1, 2006-09-15 10:27:53-07:00, brian@zim.(none) +30 -27
    Cleanup, handlerton is now a pointer. 

  sql/ha_ndbcluster_binlog.cc@1.80.1.1, 2006-09-15 10:27:54-07:00, brian@zim.(none) +4 -4
    Cleanup (handlerton is now a pointer)

  sql/ha_ndbcluster_binlog.h@1.15.1.1, 2006-09-15 10:27:54-07:00, brian@zim.(none) +3 -3
    Cleanup (handlerton is now a pointer)

  sql/ha_partition.cc@1.73, 2006-09-15 10:27:54-07:00, brian@zim.(none) +17 -13
    Cleaned up handlerton change

  sql/handler.cc@1.265.1.1, 2006-09-15 10:27:54-07:00, brian@zim.(none) +33 -2
    Cheanup of handlerton change

  sql/item_sum.cc@1.188.1.1, 2006-09-15 10:27:54-07:00, brian@zim.(none) +1 -1
    Cleanedup of handlerton change

  sql/log.cc@1.228.2.1, 2006-09-15 10:27:54-07:00, brian@zim.(none) +31 -31
    Cleanup of handlerton change

  sql/mysql_priv.h@1.436.2.1, 2006-09-15 10:27:54-07:00, brian@zim.(none) +24 -22
    Reverted patch for variables (what would have happen previously if a have_ would have been called that was dynamically loaded? boom!)

  sql/mysqld.cc@1.564.17.1, 2006-09-15 10:27:54-07:00, brian@zim.(none) +49 -2
    Cleanup of handlerton changes and reverted have variable patch

  sql/partition_info.cc@1.22, 2006-09-15 10:27:54-07:00, brian@zim.(none) +3 -3
    Cleanup of handlerton (we need to clean this up a bit more). 

  sql/set_var.cc@1.178.1.14, 2006-09-15 10:27:54-07:00, brian@zim.(none) +1 -1
    Cleanup related to handlerton changes

  sql/sql_cache.cc@1.97, 2006-09-15 10:27:54-07:00, brian@zim.(none) +2 -2
    Handlerton changes cleanup

  sql/sql_insert.cc@1.223.1.1, 2006-09-15 10:27:54-07:00, brian@zim.(none) +2 -2
    Handlerton changes cleanup. 

  sql/sql_partition.cc@1.89, 2006-09-15 10:27:54-07:00, brian@zim.(none) +2 -2
    Handlerton cleanup changes

  sql/sql_plugin.cc@1.34, 2006-09-15 10:27:54-07:00, brian@zim.(none) +31 -27
    Handlerton changes.
    
    init() can now be controlled by a plugin specific startup. 
    
    There was also an issue with how we deinited the status variables. It should have been occuring before we shut down the engines. 

  sql/sql_select.cc@1.437.1.1, 2006-09-15 10:27:54-07:00, brian@zim.(none) +8 -8
    Handlerton cleanup changes

  sql/sql_show.cc@1.354.14.1, 2006-09-15 10:27:54-07:00, brian@zim.(none) +1 -1
    Handlerton cleanup changes

  sql/sql_table.cc@1.368.1.1, 2006-09-15 10:27:55-07:00, brian@zim.(none) +4 -4
    Handlerton cleanup changes

  sql/table.cc@1.239.6.1, 2006-09-15 10:27:55-07:00, brian@zim.(none) +1 -1
    Cleanup

  storage/archive/ha_archive.cc@1.100.1.1, 2006-09-15 10:27:55-07:00, brian@zim.(none) +13 -13
    Cleanup

  storage/archive/ha_archive.h@1.50, 2006-09-15 10:27:55-07:00, brian@zim.(none) +0 -1
    Cleanup

  storage/blackhole/ha_blackhole.cc@1.40, 2006-09-15 10:27:55-07:00, brian@zim.(none) +9 -8
    Cleanup

  storage/csv/ha_tina.cc@1.60.1.1, 2006-09-15 10:27:55-07:00, brian@zim.(none) +13 -14
    Cleanup

  storage/example/ha_example.cc@1.43, 2006-09-15 10:27:55-07:00, brian@zim.(none) +10 -9
    Cleanup

  storage/federated/ha_federated.cc@1.79, 2006-09-15 10:27:55-07:00, brian@zim.(none) +20 -20
    Cleanup

  storage/heap/ha_heap.cc@1.97, 2006-09-15 10:27:55-07:00, brian@zim.(none) +11 -9
    Cleanup

  storage/innobase/handler/ha_innodb.cc@1.293.2.1, 2006-09-15 10:27:55-07:00, brian@zim.(none) +51 -50
    Cleanup

  storage/myisam/ha_myisam.cc@1.191.2.1, 2006-09-15 10:27:55-07:00, brian@zim.(none) +10 -9
    Cleanup

  storage/myisammrg/ha_myisammrg.cc@1.98, 2006-09-15 10:27:55-07:00, brian@zim.(none) +12 -9
    Cleanup

ChangeSet@1.2273.45.7, 2006-09-15 18:24:12+02:00, lars@mysql.com +1 -0
  modifying disabled file so it is a copy of main tree

  mysql-test/t/disabled.def@1.196.1.3, 2006-09-15 18:24:08+02:00, lars@mysql.com +9 -20
    modifying disabled file so it is a copy of main tree

ChangeSet@1.2273.51.2, 2006-09-15 17:59:16+02:00, msvensson@shellback.(none) +1 -0
  Removing disabling of func_group

  mysql-test/t/disabled.def@1.196.2.2, 2006-09-15 17:59:13+02:00, msvensson@shellback.(none) +0 -1
    Removing disabling of func_group

ChangeSet@1.2273.51.1, 2006-09-15 17:57:56+02:00, msvensson@shellback.(none) +1 -0
  Remove disabling of func_in

  mysql-test/t/disabled.def@1.196.2.1, 2006-09-15 17:57:51+02:00, msvensson@shellback.(none) +0 -1
    Remove disabling of func_in

ChangeSet@1.1810.2131.9, 2006-09-15 17:53:45+02:00, msvensson@shellback.(none) +1 -0
  Add definition of SHUT_RDWR for compiling on windows

  include/my_net.h@1.15.1.1, 2006-09-15 17:53:43+02:00, msvensson@shellback.(none) +8 -0
    Add definition of SHUT_RDWR for compiling on windows

ChangeSet@1.2273.43.2, 2006-09-15 17:17:56+02:00, istruewing@chilla.local +1 -0
  Merge 5.1 -> 5.1-engines
  Disabled im_daemon_life_cycle with permission by Calvin

  mysql-test/t/disabled.def@1.198, 2006-09-15 17:17:53+02:00, istruewing@chilla.local +1 -0
    Merge 5.1 -> 5.1-engines
    Disabled im_daemon_life_cycle with permission by Calvin

ChangeSet@1.2273.50.1, 2006-09-15 17:00:35+02:00, aelkin@dl145h.mysql.com +1 -0
  bug#19259 rpl_ndb_dd_partitions fails because of limitation
  
  re-activating the bug to fix related to the limitation tests.

  mysql-test/t/disabled.def@1.196.1.2, 2006-09-15 17:00:32+02:00, aelkin@dl145h.mysql.com +1 -0
    re-disabling

ChangeSet@1.1810.2130.5, 2006-09-15 16:35:50+02:00, hartmut@mysql.com +1 -0
  Add SSL specific linker flags to --libmysqld-libs (Bug #21239)

  scripts/mysql_config.sh@1.24, 2006-09-15 16:35:43+02:00, hartmut@mysql.com +1 -1
    Add SSL specific linker flags to --libmysqld-libs (Bug #21239)

ChangeSet@1.1810.2123.7, 2006-09-15 16:28:38+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - bug#21941
    Fix so that scans closed before execute are removed from "scans to send list"

  ndb/include/ndbapi/NdbTransaction.hpp@1.41.5.1, 2006-09-15 16:28:36+02:00, jonas@perch.ndb.mysql.com +4 -1
    Fix so that scans closed before execute are removed from "scans to send list"

  ndb/src/ndbapi/NdbScanOperation.cpp@1.66.14.1, 2006-09-15 16:28:36+02:00, jonas@perch.ndb.mysql.com +20 -2
    Fix so that scans closed before execute are removed from "scans to send list"

  ndb/src/ndbapi/NdbTransaction.cpp@1.43.10.1, 2006-09-15 16:28:36+02:00, jonas@perch.ndb.mysql.com +48 -17
    Fix so that scans closed before execute are removed from "scans to send list"

ChangeSet@1.2273.48.1, 2006-09-15 17:25:13+03:00, aelkin@dsl-hkigw8-fe00f800-98.dhcp.inet.fi +8 -0
  Bug#22067  	rpl_rbr_to_sbr and some other fail if NDB is default storage
  
  A query SET @@GLOBAL.binlog_format = ... returns an error when NDB is the
  default storage. This fails some tests invoking the set binlog_format explicitly.
  because the var turns to be read-only.
    
    In the following are files and method to fix if needed.
    
    t/
    ndb_binlog_basic2.test         # here the failure is benign
    rpl_rbr_to_sbr.test            # does not check any ndb features =>           
   
    .                              # => not_ndb_default is enough
    rpl_row_basic_8partition.test  # set binlog_format can be replaced
    rpl_switch_stm_row_mixed.test  # does not check any ndb features =>
    .                              # => not_ndb_default is enough
    
    two more invoking invoke extra/rpl_truncate_helper.test
    
    rpl_truncate_2myisam           # to be fixed with not_ndb_default
    rpl_truncate_3innodb           # same as above
    .                              # because there is a dedicated to ndb .        
   
    .                              # rpl_truncate_7ndb* suit.
  
  Adapting/testing a new implement
  --source include/safe_set_to_maybe_ro_var.inc
  to avoid abort due to the error using binlog_format as application.

  BitKeeper/etc/ignore@1.246.3.1, 2006-09-15 17:25:09+03:00, aelkin@dsl-hkigw8-fe00f800-98.dhcp.inet.fi +1 -0
    Added mysql-test/t/rpl_truncate_4ndb.test to the ignore list

  mysql-test/include/safe_set_to_maybe_ro_var.inc@1.1, 2006-09-15 17:25:10+03:00, aelkin@dsl-hkigw8-fe00f800-98.dhcp.inet.fi +23 -0
    pseudo-macro to make read-only global/session vars "settable" in sense that
    SET var= val won't produce any error nor aborts testing.
    

  mysql-test/include/safe_set_to_maybe_ro_var.inc@1.0, 2006-09-15 17:25:10+03:00, aelkin@dsl-hkigw8-fe00f800-98.dhcp.inet.fi +0 -0

  mysql-test/r/rpl_row_basic_8partition.result@1.4, 2006-09-15 17:25:09+03:00, aelkin@dsl-hkigw8-fe00f800-98.dhcp.inet.fi +4 -1
    new results

  mysql-test/t/rpl_rbr_to_sbr.test@1.5, 2006-09-15 17:25:10+03:00, aelkin@dsl-hkigw8-fe00f800-98.dhcp.inet.fi +1 -0
    # does not check any ndb features => not_ndb_default is enough

  mysql-test/t/rpl_row_basic_8partition.test@1.5, 2006-09-15 17:25:10+03:00, aelkin@dsl-hkigw8-fe00f800-98.dhcp.inet.fi +6 -1
    set binlog_format can be read-only because of e.g default storage ndb.
    adapting/testing a new implement
    --source include/safe_set_to_maybe_ro_var.inc
    to avoid abort due to the error.
    
    Note, that it this particular test we could simply remove SET binlog_format because
    there is have_binlog_format_row require, as the test is about RBR.
    Futhermore utilizing safe_set_to_maybe_ro_var is redundat as well as long as
    we keep non_ndb_default guard.
    The latter is introduced because of ndb partitioning per-key limitation 
    #19259: rpl_ndb_dd_partitions fails on solaris. The page is updated to refer to this
    test's.
     

  mysql-test/t/rpl_switch_stm_row_mixed.test@1.12, 2006-09-15 17:25:10+03:00, aelkin@dsl-hkigw8-fe00f800-98.dhcp.inet.fi +1 -0
    excluding ndb option, no ndb features 

  mysql-test/t/rpl_truncate_2myisam.test@1.2, 2006-09-15 17:25:10+03:00, aelkin@dsl-hkigw8-fe00f800-98.dhcp.inet.fi +1 -1
    ndb checks truncate separately

  mysql-test/t/rpl_truncate_3innodb.test@1.2, 2006-09-15 17:25:10+03:00, aelkin@dsl-hkigw8-fe00f800-98.dhcp.inet.fi +1 -0
    ndb checks truncate separately

ChangeSet@1.1810.2119.4, 2006-09-15 15:51:05+02:00, mskold@mysql.com +2 -0
  Bug #21056  ndb pushdown equal/setValue error on datetime: post review fixes, use my_bitmap

  sql/ha_ndbcluster.cc@1.175.53.4, 2006-09-15 15:50:20+02:00, mskold@mysql.com +10 -10
    Bug #21056  ndb pushdown equal/setValue error on datetime: post review fixes, use my_bitmap

  sql/ha_ndbcluster.h@1.82.4.4, 2006-09-15 15:50:20+02:00, mskold@mysql.com +39 -20
    Bug #21056  ndb pushdown equal/setValue error on datetime: post review fixes, use my_bitmap

ChangeSet@1.1810.2131.4, 2006-09-15 15:41:04+02:00, msvensson@shellback.(none) +1 -0
  Bug#22326  	Build problems on hurd-i386: conflicting declaration of socklen_t

  extra/yassl/testsuite/test.hpp@1.6, 2006-09-15 15:41:00+02:00, msvensson@shellback.(none) +1 -1
    Remove define for __MACH__
    http://bugs.debian.org/387369

ChangeSet@1.2273.45.4, 2006-09-15 15:15:24+02:00, guilhem@gbichot3.local +3 -0
  WL#3504 "plugin actions for engines' and plugins' unit tests"
  for push in 5.1 (I will inform Trudy).
  Storage engines and plugins can now have unit tests to test their components; such
  test must be an executable C/C++ program which name ends with '-t' and which is
  obeys the mytap protocol, it must be stored in the storage engine's or plugin's
  source directory (storage/<engine> or plugin/<plugin>) or any subdirectories of
  this.
  The top-level Makefile target "test-unit" will run all unit tests: it will scan
  the engines' and plugins' directories, recursively, and execute all executable
  files which name ends with '-t'."

  Makefile.am@1.97, 2006-09-15 15:15:19+02:00, guilhem@gbichot3.local +2 -2
    "unittest" directory must be built before "storage" and "plugin"
    because the unit tests in these directories may need libmytap.a
    which is in unittest/mytap.

  config/ac-macros/plugins.m4@1.17, 2006-09-15 15:15:19+02:00, guilhem@gbichot3.local +10 -2
    When enabling engine "X", we add "../storage/X" to the unit tests
    directories which unittest/unit.pl should traverse looking for
    tests to execute. Same for plugins.

  unittest/Makefile.am@1.12, 2006-09-15 15:15:19+02:00, guilhem@gbichot3.local +1 -1
    Those variables contain all enabled engines and plugins.

ChangeSet@1.1810.2131.3, 2006-09-15 14:27:45+02:00, msvensson@shellback.(none) +2 -0
  Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown

  sql/mysqld.cc@1.439.1.133, 2006-09-15 14:27:41+02:00, msvensson@shellback.(none) +8 -8
    Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown

  vio/viosocket.c@1.37.3.1, 2006-09-15 14:27:42+02:00, msvensson@shellback.(none) +1 -1
    Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown

ChangeSet@1.1616.2747.2, 2006-09-15 20:04:59+08:00, gni@dev3-127.(none) +1 -0
  BUG#21530 The ndb_mgm management client doesn't set the exit status on errors, making it 
            almost useless for any kind of shell script automation.
            Now add the return value that indicates the execution whether or not success 
            for many methods.

  ndb/src/mgmclient/CommandInterpreter.cpp@1.44.3.1, 2006-09-15 20:04:58+08:00, gni@dev3-127.(none) +194 -122
    Many methods add the return value that indicates whether the execution of operatioin succeeds.
    This can make ndb_mgm management client set the exit status on errors.

ChangeSet@1.1616.2761.1, 2006-09-15 11:34:06+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21756
    Fix for alter table when node is down...that could cause pain and misery

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.26.2.19, 2006-09-15 11:34:05+02:00, jonas@perch.ndb.mysql.com +2 -1
    Make sure to check table version before retriving from disk

ChangeSet@1.1810.2123.5, 2006-09-15 11:18:17+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21535
    review, Fix also master being "old" version

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.66.29.3, 2006-09-15 11:18:15+02:00, jonas@perch.ndb.mysql.com +22 -17
    Fix also master being "old" version

ChangeSet@1.2273.46.1, 2006-09-15 13:07:23+04:00, petr@mysql.com +8 -0
  Post-review fixes for
  Bug #18559 "log tables cannot change engine, and
              gets deadlocked when dropping w/ log on":
  1) Add more generic error messages
  2) Add new handlerton flag for engines, which support
     log tables
  3) Remove (log-tables related) mutex lock in myisam to
     improve performance

  mysql-test/r/log_tables.result@1.9, 2006-09-15 13:07:07+04:00, petr@mysql.com +9 -9
    update result file to use new error messages

  mysql-test/t/log_tables.test@1.13, 2006-09-15 13:07:07+04:00, petr@mysql.com +9 -9
    update test file with new error messages

  sql/handler.h@1.235.1.1, 2006-09-15 13:07:08+04:00, petr@mysql.com +1 -0
    Add new handlerton flag, to mark whether engine
    supports log tables

  sql/share/errmsg.txt@1.110.8.1, 2006-09-15 13:07:08+04:00, petr@mysql.com +4 -0
    Add more generic error messages

  sql/sql_table.cc@1.366.1.1, 2006-09-15 13:07:08+04:00, petr@mysql.com +4 -5
    Update error messages

  storage/csv/ha_tina.cc@1.57.2.1, 2006-09-15 13:07:08+04:00, petr@mysql.com +1 -1
    CSV supports log tables

  storage/myisam/ha_myisam.cc@1.190.1.1, 2006-09-15 13:07:08+04:00, petr@mysql.com +1 -1
    MyISAM supports log tables

  storage/myisam/mi_write.c@1.60, 2006-09-15 13:07:08+04:00, petr@mysql.com +4 -4
    remove mutex lock to improve performance

ChangeSet@1.2273.45.2, 2006-09-15 03:15:06+02:00, lars@mysql.com +1 -0
  Merge main->rpl

  mysql-test/r/variables.result@1.93, 2006-09-15 03:15:02+02:00, lars@mysql.com +6 -0
    Merge main->rpl

ChangeSet@1.1810.2120.3, 2006-09-15 03:02:01+02:00, lars@mysql.com +2 -0
  Merge fixes, added printout to result file

  mysql-test/r/mysqldump.result@1.83.15.2, 2006-09-15 03:01:57+02:00, lars@mysql.com +168 -56
    Merge fixes, added printout to result file

  mysql-test/t/mysqldump.test@1.76.15.2, 2006-09-15 03:01:58+02:00, lars@mysql.com +173 -173
    Merge fixes, added printout to result file

ChangeSet@1.1810.2131.2, 2006-09-15 04:01:47+04:00, ted@ted.mysql.internal +1 -0
  Bug#21011 The [client] group header was overwritten by "password" option in upgrade_defaults file which confused mysqlcheck thus used to prevent the whole thing from running correctly when the "--password=" option is specified on mysql_upgrade command line with no corresponding "--user=" option

  client/mysql_upgrade.c@1.6.1.1, 2006-09-15 04:01:45+04:00, ted@ted.mysql.internal +1 -1
    The "password" option should be issued after group header to upgrade_defaults file whenever it is used

ChangeSet@1.1810.2106.5, 2006-09-15 02:18:30+04:00, evgen@sunlight.local +8 -0
  type_date.result:
    Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN
    Corrected a test case after removal of fix for bug#16377
  query_cache.result, func_time.test, view.result, view.test, func_time.result:
    Corrected a test case after removal of fix for bug#16377
  type_date.test:
    Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN
     Corrected a test case after removal of fix for bug#16377
  item_cmpfunc.cc:
    Removed changes to the Item_func_between::fix_length_and_dec() made in the fix for bug#16377
  TAG: mysql-5.0.25

  mysql-test/r/func_time.result@1.47.1.21, 2006-09-15 02:13:45+04:00, evgen@sunlight.local +11 -14
    Corrected a test case after removal of fix for bug#16377

  mysql-test/r/query_cache.result@1.65.1.9, 2006-09-15 02:13:42+04:00, evgen@sunlight.local +6 -6
    Corrected a test case after removal of fix for bug#16377

  mysql-test/r/type_date.result@1.13.1.1, 2006-09-15 02:13:24+04:00, evgen@sunlight.local +8 -2
    Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN
    Corrected a test case after removal of fix for bug#16377

  mysql-test/r/view.result@1.138.1.37, 2006-09-15 02:13:21+04:00, evgen@sunlight.local +2 -2
    Corrected a test case after removal of fix for bug#16377

  mysql-test/t/func_time.test@1.41.1.15, 2006-09-15 02:13:12+04:00, evgen@sunlight.local +11 -11
    Corrected a test case after removal of fix for bug#16377

  mysql-test/t/type_date.test@1.11.1.1, 2006-09-15 02:12:29+04:00, evgen@sunlight.local +9 -2
    Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN
     Corrected a test case after removal of fix for bug#16377

  mysql-test/t/view.test@1.126.1.36, 2006-09-15 02:11:17+04:00, evgen@sunlight.local +2 -2
    Corrected a test case after removal of fix for bug#16377

  sql/item_cmpfunc.cc@1.187.8.1, 2006-09-15 02:16:09+04:00, evgen@sunlight.local +29 -122
    Removed changes to the Item_func_between::fix_length_and_dec() made in the fix for bug#16377

ChangeSet@1.2273.20.9, 2006-09-14 23:25:59+02:00, andrey@example.com +1 -0
  Fix an assert on AIX 5.2, 64bit. COND_queue_state wasn't
  initialized prior to usage as well as deinitialized on shutdown.

  sql/event_queue.cc@1.18, 2006-09-14 23:25:55+02:00, andrey@example.com +2 -0
    Deinitialize and initialize COND_queue_state

ChangeSet@1.2273.41.4, 2006-09-14 14:59:14-06:00, tsmith@siva.hindu.god +1 -0
  Post-merge fix: remove dup() call in ha_archive.cc which resulted in a memory leak.

  storage/archive/ha_archive.cc@1.102, 2006-09-14 14:59:11-06:00, tsmith@siva.hindu.god +1 -1
    Remove dup() call from azdopen(&archive, create_file, ...), as it resulted in a memory leak.

ChangeSet@1.1810.2123.4, 2006-09-14 22:05:35+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21535
    remove accidently left debug code

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.66.29.2, 2006-09-14 22:05:34+02:00, jonas@perch.ndb.mysql.com +0 -11
    remove accidently left debug code

ChangeSet@1.1810.2123.3, 2006-09-14 22:01:26+02:00, jonas@perch.ndb.mysql.com +8 -0
  ndb - bug#21535
    send new fragdistkeys to all replicas during node recovery
    to make sure that not 3rd or 4th replicas fragDistKey becomes out of sync

  ndb/include/kernel/GlobalSignalNumbers.h@1.7.15.1, 2006-09-14 22:01:24+02:00, jonas@perch.ndb.mysql.com +1 -0
    new signal UpdateFragDistKeyOrd

  ndb/include/kernel/signaldata/CopyFrag.hpp@1.1.1.1, 2006-09-14 22:01:24+02:00, jonas@perch.ndb.mysql.com +13 -1
    new signal UpdateFragDistKeyOrd

  ndb/include/ndb_version.h.in@1.1.7.1, 2006-09-14 22:01:24+02:00, jonas@perch.ndb.mysql.com +2 -0
    online software upgrade for new signal UpdateFragDistKeyOrd

  ndb/src/common/debugger/signaldata/SignalNames.cpp@1.6.6.1, 2006-09-14 22:01:24+02:00, jonas@perch.ndb.mysql.com +2 -1
    new signal UpdateFragDistKeyOrd

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.24.48.1, 2006-09-14 22:01:24+02:00, jonas@perch.ndb.mysql.com +4 -1
    Send noew list of all replicas in copyfragreq

  ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.32.10.1, 2006-09-14 22:01:24+02:00, jonas@perch.ndb.mysql.com +1 -0
    new signal UpdateFragDistKeyOrd

  ndb/src/kernel/blocks/dblqh/DblqhInit.cpp@1.14.2.1, 2006-09-14 22:01:24+02:00, jonas@perch.ndb.mysql.com +3 -1
    new signal UpdateFragDistKeyOrd

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.66.29.1, 2006-09-14 22:01:24+02:00, jonas@perch.ndb.mysql.com +65 -1
    new signal UpdateFragDistKeyOrd

ChangeSet@1.1810.2131.1, 2006-09-14 14:56:14-04:00, iggy@rolltop.ignatz42.dyndns.org +3 -0
  Bug#21424 mysqldump failing to export/import views.                                                                                                                                                                  
  
  Dumps are created for the tables in each specified database then for the views in each specified database. This bug occurs when any database's views depend on the mysql database's table data while being restored. 
  Added command line option --flush-privileges to the mysqldump utility which causes a FLUSH PRIVILIGES statement to be written to the dump after the mysql database.

  client/mysqldump.c@1.214.1.28, 2006-09-14 14:56:11-04:00, iggy@rolltop.ignatz42.dyndns.org +13 -1
    When the flush-privileges command line option is specified, make sure to FLUSH PRIVILEGES after only the mysql database's tables' data is restored so that grant tables are current.

  mysql-test/r/mysqldump.result@1.83.1.31, 2006-09-14 14:56:11-04:00, iggy@rolltop.ignatz42.dyndns.org +19 -1
    Added Results.

  mysql-test/t/mysqldump.test@1.76.1.28, 2006-09-14 14:56:12-04:00, iggy@rolltop.ignatz42.dyndns.org +34 -3
    Expanded existing test case for bug 21527 to also test for bug 21424. 
    Exercises new --flush-priviliges command line option.
    Test ignores log tables.

ChangeSet@1.1810.1698.127, 2006-09-14 16:47:01+00:00, lzhou@dev3-138.dev.cn.tlan +1 -0
  BUG#21799 scan time out report temp failures 4008

  ndb/src/ndbapi/NdbScanOperation.cpp@1.66.13.1, 2006-09-14 16:46:59+00:00, lzhou@dev3-138.dev.cn.tlan +7 -1
    set error code to 4008 when a scan time out

ChangeSet@1.1810.2129.2, 2006-09-14 10:57:00-04:00, iggy@rolltop.ignatz42.dyndns.org +1 -0
  /usr/sbin not always in PATH environment variable.

  BitKeeper/triggers/post-commit@1.26.1.14, 2006-09-14 10:56:57-04:00, iggy@rolltop.ignatz42.dyndns.org +9 -3
    Attempt to default to /usr/sbin/sendmail if it exists, otherwise use sendmail.

ChangeSet@1.1616.2742.3, 2006-09-14 16:55:57+02:00, istruewing@chilla.local +1 -0
  Bug#14400 - Query joins wrong rows from table which is subject of
              "concurrent insert"
  After merge fix.

  myisam/mi_rkey.c@1.16.2.3, 2006-09-14 16:55:56+02:00, istruewing@chilla.local +2 -2
    Bug#14400 - Query joins wrong rows from table which is subject of
                "concurrent insert"
    After merge fix.

ChangeSet@1.1616.2757.3, 2006-09-14 18:45:23+04:00, evgen@moonbone.local +2 -0
  type_date.test, type_date.result:
    Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN

  mysql-test/r/type_date.result@1.12.1.2, 2006-09-14 18:45:04+04:00, evgen@moonbone.local +6 -0
    Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN

  mysql-test/t/type_date.test@1.13, 2006-09-14 18:44:24+04:00, evgen@moonbone.local +7 -0
    Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN

ChangeSet@1.1810.2106.4, 2006-09-14 16:34:35+02:00, joerg@trift-lap.fambruehe +2 -0
  Include "manual.chm" in the source distribution, because we now use it for Windows builds unchanged.

  Docs/Makefile.am@1.57.1.1, 2006-09-14 16:34:32+02:00, joerg@trift-lap.fambruehe +1 -1
    Include "manual.chm" in the source distribution, because we now use it for Windows builds unchanged.

  configure.in@1.245.62.2, 2006-09-14 16:34:32+02:00, joerg@trift-lap.fambruehe +1 -0
    Include "manual.chm" in the source distribution, because we now use it for Windows builds unchanged.

ChangeSet@1.1810.2073.9, 2006-09-14 14:34:06+00:00, lzhou@dev3-138.dev.cn.tlan +1 -0
  BUG#19787 Modify correct message when some important variables are changed but cannot be applied by online

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.24.47.1, 2006-09-14 14:34:05+00:00, lzhou@dev3-138.dev.cn.tlan +7 -1
    Modify error message when illegal configuration changed.

ChangeSet@1.2273.20.8, 2006-09-14 13:49:26+02:00, andrey@example.com +1 -0
  Temporary fix for a deadlock. Needed so we can go with cloning
  5.1.12.

  sql/event_queue.cc@1.17, 2006-09-14 13:49:22+02:00, andrey@example.com +13 -5
    Temporary workaround to drop the event outside of the
    scope where LOCK_queue is locked. If it's done inside
    the scope a possible deadlock can happen, and it happens
    quite often, escpecially on Windows.

ChangeSet@1.2273.1.36, 2006-09-14 12:32:49+02:00, mskold@mysql.com +4 -0
  ndb_multi.test:
    Removed replication dependency
  ndb_dd_alter.test, ndb_dd_alter.result:
    Added innodb dependency and regenerated result file
  ndb_dd_sql_features.result:
    Regenerated result file

  mysql-test/r/ndb_dd_alter.result@1.2, 2006-09-14 12:18:24+02:00, mskold@mysql.com +3 -3
    Added innodb dependency and regenerated result file

  mysql-test/r/ndb_dd_sql_features.result@1.3, 2006-09-14 12:21:35+02:00, mskold@mysql.com +4 -4
    Regenerated result file

  mysql-test/t/ndb_dd_alter.test@1.2, 2006-09-14 12:18:24+02:00, mskold@mysql.com +1 -0
    Added innodb dependency and regenerated result file

  mysql-test/t/ndb_multi.test@1.12.1.1, 2006-09-14 12:27:50+02:00, mskold@mysql.com +0 -1
    Removed replication dependency

ChangeSet@1.1810.2123.2, 2006-09-14 11:57:15+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#22195
    also bind client to local host name if specified

  ndb/src/common/transporter/Transporter.cpp@1.18.4.1, 2006-09-14 11:57:14+02:00, jonas@perch.ndb.mysql.com +14 -4
    Add binding also of transporter connection (to hostname specified in config file)

ChangeSet@1.1810.2115.2, 2006-09-14 11:37:33+02:00, Kristofer.Pettersson@naruto. +3 -0
  Cset exclude: Kristofer.Pettersson@naruto.|ChangeSet|20060912122341|50740

  mysql-test/r/windows.result@1.3, 2006-09-14 11:37:18+02:00, Kristofer.Pettersson@naruto. +0 -0
    Exclude

  mysql-test/t/windows.test@1.3, 2006-09-14 11:37:18+02:00, Kristofer.Pettersson@naruto. +0 -0
    Exclude

  myisam/mi_locking.c@1.38.3.1, 2006-09-14 11:37:17+02:00, Kristofer.Pettersson@naruto. +0 -0
    Exclude

ChangeSet@1.2273.39.1, 2006-09-14 11:47:19+05:00, bar@mysql.com +4 -0
  Bug#20854 XML functions: wrong result in ExtractValue

  mysql-test/r/xml.result@1.18, 2006-09-14 11:47:14+05:00, bar@mysql.com +27 -1
    - Adding test case
    - Fixing error message

  mysql-test/t/xml.test@1.17, 2006-09-14 11:47:14+05:00, bar@mysql.com +16 -0
    Adding test case

  sql/item_xmlfunc.cc@1.20, 2006-09-14 11:47:14+05:00, bar@mysql.com +58 -6
    For grammar rules with loops like:
    
      AdditiveExpr ::= MultiplicativeExpr ('+' MultiplicativeExpr)*
    
    If we scanned scanned '+' and then met an error when parsing
    MultiplicativeExpr, then we should fully stop parsing - without
    trying to apply any other rules.
    
    Fix: add "error" member into MY_XPATH structure,
    and make my_xpath_parse_term() never return success
    as soon as error set.

  strings/xml.c@1.13, 2006-09-14 11:47:14+05:00, bar@mysql.com +51 -9
    Adding my_xml_ctype map for flags, indicating
    whether a character is a space character, is a
    valid identifier start character, is a valid
    identifier body character. Using this map to
    properly scan identifiers. Also, using this map
    to scan spaces faster (instead of strchr).

ChangeSet@1.2273.38.1, 2006-09-13 22:09:04-07:00, brian@dib. +3 -0
  This fixes support for building mysql on Solaris with GNU tools. 

  BUILD/check-cpu@1.15.1.1, 2006-09-13 22:01:38-07:00, brian@dib. +4 -0
    Simple Solaris support

  BUILD/compile-solaris-sparc@1.11, 2006-09-13 22:01:45-07:00, brian@dib. +5 -9
    Cleanup of Solars support

  BUILD/compile-solaris-sparc-debug@1.5, 2006-09-13 22:01:56-07:00, brian@dib. +5 -9
    Cleanup of solaris support

ChangeSet@1.2273.37.1, 2006-09-14 05:35:50+04:00, aivanov@mysql.com +1 -0
  WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
   tables to INFORMATION_SCHEMA.

  mysql-test/r/mysqlshow.result@1.6, 2006-09-14 05:35:47+04:00, aivanov@mysql.com +8 -0
    WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
     tables to INFORMATION_SCHEMA.
     Fixed test cases result (changes are due to addition of new tables).

ChangeSet@1.2273.25.14, 2006-09-13 19:58:57+02:00, guilhem@gbichot3.local +1 -0
  fixes for the my_atomic-t unit test:
  - compiler warning
  - detection of pthread_create failure (you will see this message
  only if you run with "make test-verbose" in unittest; otherwise
  unit.pl masks all messages from the test but "ok" ones.
  - the test fails randomly on some machines (I filed it as BUG#22320),
  on one host it looks like a crash at exit() which a sleep(2) makes
  disappear. So I add the sleep(2), which can be removed
  when BUG#22320 is fixed. 

  unittest/mysys/my_atomic-t.c@1.6, 2006-09-13 19:58:55+02:00, guilhem@gbichot3.local +17 -3
    - fix for compiler warning on 64-bit "cast from pointer to integer of
    different size". Casting to long and then to int. We'll use intptr
    instead later.
    - detect if pthread_create fails.
    - sleep(2) until BUG#22320 is fixed

ChangeSet@1.2273.25.13, 2006-09-14 03:37:40+04:00, aivanov@mysql.com +8 -0
  WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
   tables to INFORMATION_SCHEMA.

  mysql-test/r/information_schema.result@1.134, 2006-09-14 03:37:34+04:00, aivanov@mysql.com +15 -1
    WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
     tables to INFORMATION_SCHEMA.
     Fixed test cases result (changes are due to the new tables added).

  mysql-test/r/information_schema_db.result@1.18, 2006-09-14 03:37:35+04:00, aivanov@mysql.com +4 -0
    WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
     tables to INFORMATION_SCHEMA.
     Fixed test cases result (changes are due to the new tables added).

  mysql-test/r/status.result@1.12.1.1, 2006-09-14 03:37:35+04:00, aivanov@mysql.com +23 -0
    WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
     tables to INFORMATION_SCHEMA.
     Fixed results for added testcases.

  mysql-test/r/variables.result@1.88.1.1, 2006-09-14 03:37:35+04:00, aivanov@mysql.com +151 -0
    WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
     tables to INFORMATION_SCHEMA.
     Fixed results for added test cases.

  mysql-test/t/status.test@1.17, 2006-09-14 03:37:35+04:00, aivanov@mysql.com +7 -0
    WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
     tables to INFORMATION_SCHEMA.
     Added test cases.

  mysql-test/t/variables.test@1.61.1.1, 2006-09-14 03:37:35+04:00, aivanov@mysql.com +50 -0
    WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
     tables to INFORMATION_SCHEMA.
     Added test cases.

  sql/sql_show.cc@1.354.13.2, 2006-09-14 03:37:35+04:00, aivanov@mysql.com +225 -8
    WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
     tables to INFORMATION_SCHEMA.
     Implementation of the new I_S tables.
     Also, show_status_array(): argument 'ucase_names' is added (true means that
     all variable names are to be converted to upper case).

  sql/table.h@1.148.1.3, 2006-09-14 03:37:35+04:00, aivanov@mysql.com +4 -0
    WL#3247,#3248: Adding [GLOBAL|SESSION]_STATUS and [GLOBAL|SESSION]_VARIABLES
     tables to INFORMATION_SCHEMA.
     Implementation of the new I_S tables.

ChangeSet@1.1810.2127.4, 2006-09-14 00:12:17+02:00, hartmut@mysql.com +1 -0
  Changed to use NdbAutoPtr instead of explicit free() calls 
  as suggested by Jonas (still Bug #17582)

  ndb/tools/ndb_config.cpp@1.4.7.5, 2006-09-14 00:12:14+02:00, hartmut@mysql.com +3 -9
    Changed to use NdbAutoPtr instead of explicit free() calls 
    as suggested by Jonas (still Bug #17582)

ChangeSet@1.1810.2127.3, 2006-09-13 23:40:28+02:00, hartmut@mysql.com +1 -0
  Make ndb_config use the same default options
  as any other ndb tool in the distribution (Bug #22295)

  ndb/tools/ndb_config.cpp@1.4.7.4, 2006-09-13 23:40:26+02:00, hartmut@mysql.com +6 -38
    Make ndb_config use the same default options
    as any other ndb tool in the distribution (Bug #22295)

ChangeSet@1.2273.33.2, 2006-09-13 15:37:35-06:00, tsmith@siva.hindu.god +7 -0
  Post-merge fixes:
  - Remove extra EXTRA_DIST from several Makefile.ams
  - Add dummy primary key to test table in loaddata_autocom.inc

  client/Makefile.am@1.76, 2006-09-13 15:37:31-06:00, tsmith@siva.hindu.god +0 -2
    Post-merge fix

  mysql-test/include/loaddata_autocom.inc@1.2, 2006-09-13 15:37:31-06:00, tsmith@siva.hindu.god +5 -3
    Add dummy primary key to test table, because NDB doesn't like BLOB w/ no PK

  mysql-test/r/loaddata_autocom_innodb.result@1.2, 2006-09-13 15:37:31-06:00, tsmith@siva.hindu.god +3 -3
    Adapt test results to modified loaddata_autocom.inc

  mysql-test/r/loaddata_autocom_ndb.result@1.2, 2006-09-13 15:37:31-06:00, tsmith@siva.hindu.god +3 -3
    Adapt test results to modified loaddata_autocom.inc

  server-tools/instance-manager/Makefile.am@1.40, 2006-09-13 15:37:31-06:00, tsmith@siva.hindu.god +1 -2
    Post-merge fix

  sql/log.h@1.15, 2006-09-13 15:37:31-06:00, tsmith@siva.hindu.god +1 -1
    Post-merge fix

  storage/innobase/Makefile.am@1.19.1.3, 2006-09-13 15:37:31-06:00, tsmith@siva.hindu.god +0 -1
    Post-merge fix

ChangeSet@1.1810.2127.2, 2006-09-13 23:19:18+02:00, hartmut@mysql.com +3 -0
  Fixed host name comparison (still Bug #17582)

  mysql-test/r/ndb_config.result@1.6.1.1, 2006-09-13 23:19:14+02:00, hartmut@mysql.com +3 -0
    test case for Bug #17582

  mysql-test/t/ndb_config.test@1.11.1.1, 2006-09-13 23:19:15+02:00, hartmut@mysql.com +5 -0
    test case for Bug #17582

  ndb/tools/ndb_config.cpp@1.4.7.3, 2006-09-13 23:19:15+02:00, hartmut@mysql.com +19 -4
    gethostname() returns a pointer to a static buffer so we 
    need to create a copy of the results before calling it on
    the 2nd host name, else we're effectively comparing a 
    hostname to itself which is of course always true
    (Bug #17582)

ChangeSet@1.1810.2129.1, 2006-09-13 14:15:22-04:00, iggy@rolltop.ignatz42.dyndns.org +2 -0
  These bitKeeper changes will allow Windows to be used as a primary development platform.

  BitKeeper/etc/ignore@1.210.4.1, 2006-09-13 14:15:20-04:00, iggy@rolltop.ignatz42.dyndns.org +17 -0
    Exclude files created during the Windows build process.

  BitKeeper/triggers/post-commit@1.26.1.13, 2006-09-13 14:15:20-04:00, iggy@rolltop.ignatz42.dyndns.org +9 -3
    post-commit trigger writes emails to file in the BitKeeper/tmp directory before sending in case of failure.
    Now uses bk sendmail instead of hardcoded /usr/sbin/sendmail to send message.

ChangeSet@1.1616.2759.3, 2006-09-13 19:56:02+02:00, mskold@mysql.com +1 -0
  Bug #21378  Alter table from X storage engine to NDB could cause data loss: updated results

  mysql-test/r/ndb_multi.result@1.3.3.2, 2006-09-13 19:55:37+02:00, mskold@mysql.com +1 -1
    Bug #21378  Alter table from X storage engine to NDB could cause data loss: updated results

ChangeSet@1.2273.32.5, 2006-09-13 21:25:33+04:00, kaa@polly.local +3 -0
  Fixed the faulty merge

  sql/item_func.cc@1.314, 2006-09-13 21:25:28+04:00, kaa@polly.local +5 -3
    Fixed the faulty merge

  sql/log_event.cc@1.237.2.3, 2006-09-13 21:25:28+04:00, kaa@polly.local +1 -1
    Fixed the faulty merge

  sql/sql_class.h@1.304.1.16, 2006-09-13 21:25:28+04:00, kaa@polly.local +1 -0
    Fixed the faulty merge

ChangeSet@1.2245.1.13, 2006-09-13 19:25:12+02:00, mats@romeo.(none) +9 -0
  WL#3259 (RBR with more columns on slave than master):
  Incorporating changes from review.
  Fixing one bug that surfaced.

  mysql-test/extra/rpl_tests/rpl_row_tabledefs.test@1.4, 2006-09-13 19:25:08+02:00, mats@romeo.(none) +66 -2
    Adding tests that UPDATE and DELETE does not generate an error.

  mysql-test/r/rpl_row_tabledefs_2myisam.result@1.5, 2006-09-13 19:25:08+02:00, mats@romeo.(none) +100 -5
    Result change.

  mysql-test/r/rpl_row_tabledefs_3innodb.result@1.3, 2006-09-13 19:25:08+02:00, mats@romeo.(none) +96 -1
    Result change.

  mysql-test/t/disabled.def@1.182.1.3, 2006-09-13 19:25:09+02:00, mats@romeo.(none) +0 -1
    Enabling rpl_sp_effects (even though it gives a result mismatch currently).

  sql/field.cc@1.327.1.3, 2006-09-13 19:25:09+02:00, mats@romeo.(none) +8 -2
    Using constant to denote undefined last null byte.

  sql/field.h@1.186.1.1, 2006-09-13 19:25:09+02:00, mats@romeo.(none) +28 -3
    Using constant to denote undefined last null byte.
    Adding documentation.

  sql/log_event.cc@1.242, 2006-09-13 19:25:09+02:00, mats@romeo.(none) +72 -38
    Not generating error for non-NULL no-DEFAULT columns when updating or deleting row.
    Better documentation and comments.

  sql/rpl_utility.cc@1.3, 2006-09-13 19:25:09+02:00, mats@romeo.(none) +0 -5
    Moving documentation to header file.

  sql/rpl_utility.h@1.2, 2006-09-13 19:25:09+02:00, mats@romeo.(none) +71 -5
    Documenting class and members.

ChangeSet@1.1616.2759.2, 2006-09-13 18:49:05+02:00, mskold@mysql.com +1 -0
  Bug #21378  Alter table from X storage engine to NDB could cause data loss: skip autodiscover of local tables

  sql/ha_ndbcluster.cc@1.114.22.3, 2006-09-13 18:48:22+02:00, mskold@mysql.com +7 -1
    Bug #21378  Alter table from X storage engine to NDB could cause data loss: skip autodiscover of local tables

ChangeSet@1.1810.2128.1, 2006-09-13 11:41:41-04:00, cmiller@zippy.cornsilk.net +3 -0
  Bug #21618: NULL shown as empty string in client
  
  The column's NOT NULL flag doesn't affect what we should print.  Remove the
  wrong logic that does check it.
  
  Also, verify that this and the previous two tests print the same data as 
  other output formats.

  client/mysql.cc@1.199.14.1, 2006-09-13 11:41:39-04:00, cmiller@zippy.cornsilk.net +1 -5
    Don't check the column's NOT NULL flag when determining whether to print 
    "NULL" or not.

  mysql-test/r/mysql.result@1.11.2.1, 2006-09-13 11:41:39-04:00, cmiller@zippy.cornsilk.net +17 -0
    Add results and confirm that the other output forms give the same results
    for other similar tests.

  mysql-test/t/mysql.test@1.4.4.1, 2006-09-13 11:41:39-04:00, cmiller@zippy.cornsilk.net +8 -0
    Add regression tests for this bug and two similar bugs.

ChangeSet@1.1810.2122.3, 2006-09-13 19:32:21+04:00, kaa@polly.local +3 -0
  Fixed the faulty merge

  sql/item_func.cc@1.270.1.33, 2006-09-13 19:32:17+04:00, kaa@polly.local +5 -3
    Fixed the faulty merge

  sql/log_event.cc@1.174.1.37, 2006-09-13 19:32:18+04:00, kaa@polly.local +1 -1
    Fixed the faulty merge

  sql/sql_class.h@1.230.1.68, 2006-09-13 19:32:18+04:00, kaa@polly.local +1 -0
    Fixed the faulty merge

ChangeSet@1.2273.20.7, 2006-09-13 16:55:15+02:00, ahristov@bk-internal.mysql.com +1 -0
  event_queue.cc:
    fix sigsegv

  sql/event_queue.cc@1.16, 2006-09-13 16:54:34+02:00, ahristov@bk-internal.mysql.com +1 -1
    fix sigsegv

ChangeSet@1.2273.21.7, 2006-09-13 13:41:05+02:00, mskold@mysql.com +1 -0
  Bug #21378  Alter table from X storage engine to NDB could cause data loss: post review fix

  sql/ha_ndbcluster_binlog.cc@1.82, 2006-09-13 13:40:53+02:00, mskold@mysql.com +2 -2
    Bug #21378  Alter table from X storage engine to NDB could cause data loss: post review fix

ChangeSet@1.1616.2756.5, 2006-09-13 14:41:28+04:00, kaa@polly.local +14 -0
  Cset exclude: kaa@polly.local|ChangeSet|20060912122540|09861
  Cset exclude: kaa@polly.local|ChangeSet|20060908100829|09983

  mysql-test/r/case.result@1.14.1.6, 2006-09-13 14:41:25+04:00, kaa@polly.local +0 -0
    Exclude

  mysql-test/r/func_if.result@1.11.1.7, 2006-09-13 14:41:25+04:00, kaa@polly.local +0 -0
    Exclude

  mysql-test/r/func_test.result@1.20.2.4, 2006-09-13 14:41:25+04:00, kaa@polly.local +0 -0
    Exclude

  mysql-test/r/user_var.result@1.14.2.14, 2006-09-13 14:41:25+04:00, kaa@polly.local +0 -0
    Exclude

  mysql-test/t/case.test@1.14.1.6, 2006-09-13 14:41:25+04:00, kaa@polly.local +0 -0
    Exclude

  mysql-test/t/func_if.test@1.10.1.8, 2006-09-13 14:41:25+04:00, kaa@polly.local +0 -0
    Exclude

  mysql-test/t/func_test.test@1.22.1.4, 2006-09-13 14:41:25+04:00, kaa@polly.local +0 -0
    Exclude

  mysql-test/t/user_var.test@1.13.1.12, 2006-09-13 14:41:25+04:00, kaa@polly.local +0 -0
    Exclude

  sql/item_cmpfunc.cc@1.111.24.2, 2006-09-13 14:41:24+04:00, kaa@polly.local +0 -0
    Exclude

  sql/item_cmpfunc.h@1.73.11.2, 2006-09-13 14:41:24+04:00, kaa@polly.local +0 -0
    Exclude

  sql/item_func.cc@1.124.42.13, 2006-09-13 14:41:24+04:00, kaa@polly.local +0 -0
    Exclude

  sql/item_func.h@1.68.22.3, 2006-09-13 14:41:24+04:00, kaa@polly.local +0 -0
    Exclude

  sql/log_event.cc@1.113.1.77, 2006-09-13 14:41:24+04:00, kaa@polly.local +0 -0
    Exclude

  sql/sql_class.h@1.146.58.2, 2006-09-13 14:41:24+04:00, kaa@polly.local +0 -0
    Exclude

ChangeSet@1.1810.2123.1, 2006-09-13 10:09:23+02:00, jonas@perch.ndb.mysql.com +7 -0
  ndb - bug#22195
    allow bind address for ndbd

  ndb/include/mgmapi/mgmapi.h@1.42.11.1, 2006-09-13 10:09:21+02:00, jonas@perch.ndb.mysql.com +12 -1
    Add support for setting local address in NdbMgmHandle

  ndb/include/mgmcommon/ConfigRetriever.hpp@1.16.3.1, 2006-09-13 10:09:21+02:00, jonas@perch.ndb.mysql.com +2 -1
    Add support for specifying local bindaddress to ConfigRetreiver

  ndb/include/util/SocketClient.hpp@1.4.1.1, 2006-09-13 10:09:21+02:00, jonas@perch.ndb.mysql.com +2 -1
    Add support for setting local address in NdbMgmHandle

  ndb/src/common/mgmcommon/ConfigRetriever.cpp@1.24.10.1, 2006-09-13 10:09:21+02:00, jonas@perch.ndb.mysql.com +11 -1
    Add support for setting local address in NdbMgmHandle

  ndb/src/common/util/SocketClient.cpp@1.6.3.1, 2006-09-13 10:09:21+02:00, jonas@perch.ndb.mysql.com +64 -9
    Add support for setting local address in NdbMgmHandle

  ndb/src/kernel/vm/Configuration.cpp@1.39.9.1, 2006-09-13 10:09:21+02:00, jonas@perch.ndb.mysql.com +9 -2
    Add support for specifying local bindaddress to ndbd

  ndb/src/mgmapi/mgmapi.cpp@1.44.25.1, 2006-09-13 10:09:21+02:00, jonas@perch.ndb.mysql.com +68 -6
    Add support for setting local address in NdbMgmHandle

ChangeSet@1.2255.37.5, 2006-09-12 21:38:57+05:00, svoj@april.(none) +2 -0
  After merge fix.

  mysql-test/r/index_merge_myisam.result@1.3, 2006-09-12 21:38:54+05:00, svoj@april.(none) +31 -0
    After merge fix.

  sql/handler.cc@1.254.2.2, 2006-09-12 21:38:54+05:00, svoj@april.(none) +4 -2
    After merge fix.

ChangeSet@1.2273.20.6, 2006-09-12 17:48:26+02:00, andrey@example.com +1 -0
  ws fix

  sql/events.h@1.49, 2006-09-12 17:48:20+02:00, andrey@example.com +1 -0
    additional line

ChangeSet@1.1616.2757.2, 2006-09-12 19:06:26+04:00, evgen@moonbone.local +2 -0
  item_cmpfunc.cc:
    Removed changes to the Item_func_between::fix_length_and_dec() made in the fix for bug#16377
  query_cache.result:
    Corrected a test case after removing a fix for bug#16377

  mysql-test/r/query_cache.result@1.26.1.36, 2006-09-12 19:05:18+04:00, evgen@moonbone.local +3 -0
    Corrected a test case after removing a fix for bug#16377

  sql/item_cmpfunc.cc@1.111.23.12, 2006-09-12 19:06:03+04:00, evgen@moonbone.local +24 -2
    Removed changes to the Item_func_between::fix_length_and_dec() made in the fix for bug#16377

ChangeSet@1.1810.2120.1, 2006-09-12 17:50:24+03:00, timour@lamia.home +5 -0
  Fix for BUG#21774: Column count doesn't match value count at row x
  
  The cause of the bug was an incomplete fix for bug 18080.
  The problem was that setup_tables() unconditionally reset the
  name resolution context to its 'tables' argument, which pointed
  to the first table of an SQL statement.
  
  The bug fix limits resetting of the name resolution context in
  setup_tables() only in the cases when the context was not set
  by earlier parser/optimizer phases.

  mysql-test/r/insert_select.result@1.35.1.6, 2006-09-12 17:50:21+03:00, timour@lamia.home +10 -0
    Test for BUG#21774.

  mysql-test/t/insert_select.test@1.33, 2006-09-12 17:50:21+03:00, timour@lamia.home +18 -0
    Test for BUG#21774.

  sql/sql_base.cc@1.235.70.1, 2006-09-12 17:50:22+03:00, timour@lamia.home +14 -1
    Do not reset the name resolution contect unconditionally.
    Instead set the context to 'tables' only if it was not
    set before calling setup_tables().

  sql/sql_insert.cc@1.146.1.54, 2006-09-12 17:50:22+03:00, timour@lamia.home +9 -0
    Added asserts to make sure that in the case of INSERT ... VALUES ...
    statements it is not necessary to reset the name resolution context
    to the first table, because there is only one table in the list of
    tables anyway. The actual code is not removed in order not to
    confuse it with the actual bug fix.

  sql/sql_parse.cc@1.426.105.1, 2006-09-12 17:50:22+03:00, timour@lamia.home +0 -2
    Removed unnecessary reset of the name resolution context.
    The context is anyway unconditionally reset in mysql_insert()
    and mysql_prepare_insert().

ChangeSet@1.2273.31.5, 2006-09-12 16:43:57+02:00, msvensson@neptunus.(none) +1 -0
  Correct faulty merge, "mysql_priv.h" must be included for the ifdef WITH_INNOBASE_STORAGE_ENGINE to work

  storage/innobase/handler/ha_innodb.cc@1.293.1.3, 2006-09-12 16:43:55+02:00, msvensson@neptunus.(none) +2 -2
    Correct faulty merge, "mysql_priv.h" must be included for the ifdef WITH_INNOBASE_STORAGE_ENGINE to work

ChangeSet@1.2273.13.5, 2006-09-12 16:34:12+02:00, mskold@mysql.com +2 -0
  Bug #21378  Alter table from X storage engine to NDB could cause data loss: don't overwrite local tables when pushing out schema changes

  sql/ha_ndbcluster_binlog.cc@1.81, 2006-09-12 16:33:54+02:00, mskold@mysql.com +49 -7
    Bug #21378  Alter table from X storage engine to NDB could cause data loss: don't overwrite local tables when pushing out schema changes

  sql/ha_ndbcluster_binlog.h@1.16, 2006-09-12 16:33:54+02:00, mskold@mysql.com +2 -0
    Bug #21378  Alter table from X storage engine to NDB could cause data loss: don't overwrite local tables when pushing out schema changes

ChangeSet@1.1810.2117.2, 2006-09-12 18:28:36+04:00, kaa@polly.local +1 -0
  Fixed compilation

  sql/item_func.cc@1.270.20.2, 2006-09-12 18:28:33+04:00, kaa@polly.local +5 -5
    Fixed compilation

ChangeSet@1.1616.2759.1, 2006-09-12 16:04:52+02:00, mskold@mysql.com +3 -0
  Bug #21378  Alter table from X storage engine to NDB could cause data loss: Added warning if local table shadows ndb table

  mysql-test/r/ndb_multi.result@1.3.3.1, 2006-09-12 16:03:42+02:00, mskold@mysql.com +32 -0
    Bug #21378  Alter table from X storage engine to NDB could cause data loss: Added warning if local table shadows ndb table

  mysql-test/t/ndb_multi.test@1.5.3.1, 2006-09-12 16:03:42+02:00, mskold@mysql.com +22 -0
    Bug #21378  Alter table from X storage engine to NDB could cause data loss: Added warning if local table shadows ndb table

  sql/ha_ndbcluster.cc@1.114.22.2, 2006-09-12 16:02:52+02:00, mskold@mysql.com +13 -4

ChangeSet@1.1810.2116.1, 2006-09-12 15:47:48+02:00, msvensson@shellback.(none) +1 -0
  Bug#14862 undefined reference to `isinf' on SOLARIS - strings/strtod.c
   - Change the configure test looking for 'isinf' so the value returned from isinf is used. That avoids the call to isinf being optimized away. 

  configure.in@1.245.63.1, 2006-09-12 15:47:45+02:00, msvensson@shellback.(none) +1 -1
    Use the value returned from isinf so it's not optimized away by the compiler(i.e gcc 4.1)

ChangeSet@1.2273.25.12, 2006-09-12 15:42:13+02:00, guilhem@gbichot3.local +14 -0
  Fixing problems I identified in my auto_increment work pushed in July
  (as part of the auto_increment cleanup of WL#3146; let's not be
  sad, that monster push still removed serious bugs):
  one problem with INSERT DELAYED (unexpected interval releases),
  one with stored functions (wrong auto_inc binlogging).
  These bugs were not released.

  mysql-test/extra/binlog_tests/binlog_insert_delayed.test@1.2, 2006-09-12 15:42:08+02:00, guilhem@gbichot3.local +9 -3
        more tests of binlogging of INSERT DELAYED: with multi-row INSERTs.
        I identified why sleeps are needed to get a repeatable row-based
        binlogged: because without sleeps rows sometimes get groupped
        and so generate different row based events.

  mysql-test/extra/rpl_tests/rpl_foreign_key.test@1.5, 2006-09-12 15:42:09+02:00, guilhem@gbichot3.local +1 -1
    don't forget to drop tables on slave too, otherwise it leaves
    an orphan innodb table leading to rpl_insert_id failing sometimes
    (like in pushbuild "sapsrv2 -max").

  mysql-test/extra/rpl_tests/rpl_insert_id.test@1.11, 2006-09-12 15:42:09+02:00, guilhem@gbichot3.local +23 -1
        testing that if some statement does not update any row, it does
        not pollute the auto_inc binlog variables of the next statement;
        the test has to use stored procedures because with plain statements,
        mysql_reset_thd_for_next_command() does the resetting (and thus
        there is no problem); mysql_reset_thd_for_next_command() is not
        called inside routines.

  mysql-test/r/binlog_row_binlog.result@1.6, 2006-09-12 15:42:09+02:00, guilhem@gbichot3.local +18 -0
    result additions

  mysql-test/r/binlog_statement_insert_delayed.result@1.2, 2006-09-12 15:42:09+02:00, guilhem@gbichot3.local +14 -0
    result additions

  mysql-test/r/binlog_stm_binlog.result@1.14, 2006-09-12 15:42:09+02:00, guilhem@gbichot3.local +18 -0
    result additions

  mysql-test/r/rpl_insert_id.result@1.21, 2006-09-12 15:42:09+02:00, guilhem@gbichot3.local +26 -1
    result additions

  mysql-test/r/rpl_loaddata.result@1.34, 2006-09-12 15:42:09+02:00, guilhem@gbichot3.local +3 -3
        With the change to log.cc reverted, the result changes and is better:
        the change to log.cc had caused some INSERT_ID events to disappear
        though they were necessary (but testsuite could not catch that because
        it's single-threaded).

  mysql-test/r/rpl_ndb_insert_ignore.result@1.3, 2006-09-12 15:42:09+02:00, guilhem@gbichot3.local +4 -4
    NDB is now like other engines regarding INSERT IGNORE: autoincrement
    values which caused a duplicate key are re-used for next row, not lost.
    rpl_ndb_insert_ignore.result is now identical to rpl_insert_ignore.result.

  sql/log.cc@1.225.2.2, 2006-09-12 15:42:09+02:00, guilhem@gbichot3.local +0 -3
        LOAD DATA INFILE is binlogged as several events, and the last of them must
        have the auto_inc id. So it's wrong to reset the auto_inc id after every
        binlog write (because then it's lost after the first event of LOAD
        DATA INFILE and so missing for the last one)/
        Another problem: MYSQL_LOG::write() is not always called (for example
        if no row was updated), so we were missing reset in some cases.

  sql/sp_head.cc@1.232.1.4, 2006-09-12 15:42:09+02:00, guilhem@gbichot3.local +12 -1
        SELECT func1(),func2() generates two binlog events, so needs to
        clear auto_increment binlog variables after each binlog event
        (it would be more natural to clear them in the log write code,
        but LOAD DATA INFILE would suffer from this see the cset comment
        for log.cc). Without the clearing, the problem is:
        > exec func1()
        >> call cleanup_after_query() (which does not clear our vars here)
        >> binlog SELECT func1()
        <
        > exec func2()
        and so SELECT func2() is binlogged with the auto_inc of SELECT func1().

  sql/sql_class.cc@1.285.3.2, 2006-09-12 15:42:09+02:00, guilhem@gbichot3.local +6 -0
        after every statement we should clear auto_inc variables used for
        binlogging, except if this was a function/trigger (in which case
        it may be "INSERT SELECT func()", where the cleanup_after_query()
        executed in func() should not reset the auto_inc binlog variables
        as they'll be necessary when binlogging the INSERT SELECT later).

  sql/sql_insert.cc@1.221.1.2, 2006-09-12 15:42:09+02:00, guilhem@gbichot3.local +18 -3
        - as INSERT DELAYED uses the same TABLE object as the delayed_insert
        system thread, we should not call ha_release_auto_increment()
        from INSERT DELAYED (and btw it's logical as we reserve nothing
        as we don't perform the insert). Calling the function caused us to
        release values being used by the delayed_insert thread.
        So I do the call only if this is a non-DELAYED INSERT.
        - Assuming two INSERT DELAYED which get grouped by the delayed_insert
        thread, the second may use values reserved by the first, which is ok
        per se, but is a problem in statement-based binlogging:
        the 2nd INSERT gets binlogged with the "interval start" value
        of the first INSERT (=> duplicate error in slave).
        - no reason to ha_release_auto_increment() after every inserted row
        in INSERT SELECT; more efficient to do it only when the statement ends

  sql/sql_parse.cc@1.567.5.1, 2006-09-12 15:42:09+02:00, guilhem@gbichot3.local +7 -2
    a comment

ChangeSet@1.1810.1922.12, 2006-09-12 18:25:35+05:00, svoj@april.(none) +7 -0
  BUG#20256 - LOCK WRITE - MyISAM
  Only MyISAM tables locked with LOCK TABLES ... WRITE were affected.
  
  A query that is optimized with index_merge doesn't reflect rows
  inserted within LOCK TABLES.
  
  MyISAM doesn't flush a state within LOCK TABLES. index_merge
  optimization creates a copy of the handler, which thus gets
  outdated MyISAM state.
  
  New handler->clone() method is introduced to fix this problem.
  For non-MyISAM storage engines it allocates a handler and opens
  it with ha_open(). For MyISAM it additionally copies MyISAM state
  pointer to cloned handler.

  mysql-test/r/index_merge.result@1.19.1.1, 2006-09-12 18:25:33+05:00, svoj@april.(none) +31 -0
    A test case for bug#20256.

  mysql-test/t/index_merge.test@1.14.1.1, 2006-09-12 18:25:33+05:00, svoj@april.(none) +32 -0
    A test case for bug#20256.

  sql/handler.cc@1.167.20.1, 2006-09-12 18:25:33+05:00, svoj@april.(none) +9 -0
    clone method added to handler class.

  sql/handler.h@1.138.16.1, 2006-09-12 18:25:33+05:00, svoj@april.(none) +1 -0
    clone method added to handler class.

  sql/opt_range.cc@1.159.21.1, 2006-09-12 18:25:33+05:00, svoj@april.(none) +1 -4
    Use handler clone method.

  sql/ha_myisam.cc@1.147.5.1, 2006-09-12 18:25:33+05:00, svoj@april.(none) +8 -0
    clone method added to handler class.

  sql/ha_myisam.h@1.68.1.1, 2006-09-12 18:25:33+05:00, svoj@april.(none) +1 -0
    clone method added to handler class.

ChangeSet@1.2273.20.5, 2006-09-12 14:45:31+02:00, andrey@example.com +1 -0
  remove warning

  sql/events.h@1.48, 2006-09-12 14:45:26+02:00, andrey@example.com +1 -1
    remove warning

ChangeSet@1.2273.20.4, 2006-09-12 13:24:07+02:00, andrey@example.com +1 -0
  correct prototype

  sql/table.h@1.152, 2006-09-12 13:24:04+02:00, andrey@example.com +1 -1
    correct prototype

ChangeSet@1.1810.2075.2, 2006-09-12 14:56:25+04:00, kroki@moonlight.intranet +5 -0
  BUG#21414: SP: Procedure undroppable, to some extent
  
  The problem was that if after FLUSH TABLES WITH READ LOCK the user
  issued DROP/ALTER PROCEDURE/FUNCTION the operation would fail (as
  expected), but after UNLOCK TABLE any attempt to execute the same
  operation would lead to the error 1305 "PROCEDURE/FUNCTION does not
  exist", and an attempt to execute any stored function will also fail.
  
  This happened because under FLUSH TABLES WITH READ LOCK we couldn't open
  and lock mysql.proc table for update, and this fact was erroneously
  remembered by setting mysql_proc_table_exists to false, so subsequent
  statements believed that mysql.proc doesn't exist, and thus that there
  are no functions and procedures in the database.
  
  As a solution, we remove mysql_proc_table_exists flag completely.  The
  reason is that this optimization didn't work most of the time anyway.
  Even if open of mysql.proc failed for some reason when we were trying to
  call a function or a procedure, we were setting mysql_proc_table_exists
  back to true to force table reopen for the sake of producing the same
  error message (the open can fail for number of reasons).  The solution
  could have been to remember the reason why open failed, but that's a lot
  of code for optimization of a rare case.  Hence we simply remove this
  optimization.

  mysql-test/r/sp.result@1.170.22.1, 2006-09-12 14:56:21+04:00, kroki@moonlight.intranet +8 -0
    Add result for bug#21414: SP: Procedure undroppable, to some extent.

  mysql-test/t/sp.test@1.174.17.1, 2006-09-12 14:56:21+04:00, kroki@moonlight.intranet +22 -5
    Remove no longer relevant comment.
    Add test case for bug#21414: SP: Procedure undroppable, to some extent.

  sql/mysql_priv.h@1.290.59.3, 2006-09-12 14:56:21+04:00, kroki@moonlight.intranet +0 -1
    Remove declaration of mysql_proc_table_exists.

  sql/sp.cc@1.82.18.1, 2006-09-12 14:56:21+04:00, kroki@moonlight.intranet +0 -27
    Remove references to mysql_proc_table_exists.

  sql/sql_acl.cc@1.128.33.2, 2006-09-12 14:56:21+04:00, kroki@moonlight.intranet +0 -1
    Remove reference to mysql_proc_table_exists.

ChangeSet@1.2273.20.3, 2006-09-12 12:26:12+02:00, andrey@example.com +12 -0
  WL#3337 (Event scheduler new architecture)
  
  Remove SHOW SCHEDULER STATUS command and migrate the
  information output to `mysqladmin debug` (COM_DEBUG)
  
  SHOW SCHEDULER STATUS was introduced in 5.1.11, provided
  some debug information about event scheduler internals and
  was enabled only in debug builds.

  sql/event_queue.cc@1.15, 2006-09-12 12:26:05+02:00, andrey@example.com +23 -94
    Remove SHOW SCHEDULER STATUS. Reporting still will be
    there but through COM_DEBUG (mysqladmin debug)

  sql/event_queue.h@1.12, 2006-09-12 12:26:05+02:00, andrey@example.com +3 -2
    dump_internal_status cannot return an error, therefore it
    should be void.

  sql/event_scheduler.cc@1.27, 2006-09-12 12:26:05+02:00, andrey@example.com +16 -96
    Remove SHOW SCHEDULER STATUS. Reporting still will be
    there but through COM_DEBUG (mysqladmin debug)

  sql/event_scheduler.h@1.18, 2006-09-12 12:26:05+02:00, andrey@example.com +2 -2
    dump_internal_status cannot return an error, therefore it
    should be void.

  sql/events.cc@1.65, 2006-09-12 12:26:05+02:00, andrey@example.com +8 -20
    Change from outputting the internal data from
    the wire to the standard output. SHOW SCHEDULER STATUS was
    removed.

  sql/events.h@1.47, 2006-09-12 12:26:05+02:00, andrey@example.com +2 -2
    dump_internal_status() cannot return an error, therefore
    it should be void

  sql/lex.h@1.164, 2006-09-12 12:26:05+02:00, andrey@example.com +0 -1
    remove SCHEDULER as recognized word. This is part
    of removing SHOW SCHEDULER STATUS

  sql/sp_head.cc@1.236, 2006-09-12 12:26:05+02:00, andrey@example.com +0 -1
    SQLCOM_SHOW_SCHEDULER_STATUS has been removed

  sql/sql_lex.h@1.241, 2006-09-12 12:26:05+02:00, andrey@example.com +0 -1
    SQLCOM_SHOW_SCHEDULER_STATUS has been removed

  sql/sql_parse.cc@1.574, 2006-09-12 12:26:05+02:00, andrey@example.com +0 -7
    SQLCOM_SHOW_SCHEDULER_STATUS has been removed

  sql/sql_test.cc@1.47, 2006-09-12 12:26:06+02:00, andrey@example.com +4 -0
    Dump Events' internal information on COM_DEBUG

  sql/sql_yacc.yy@1.496, 2006-09-12 12:26:06+02:00, andrey@example.com +0 -11
    SQLCOM_SHOW_SCHEDULER_STATUS has been removed

ChangeSet@1.1810.2103.3, 2006-09-12 11:34:46+02:00, msvensson@shellback.(none) +1 -0
  Bug#22139 undefined reference to `my_memmem' when compiling tests/mysql_client_test
  - Build mysql_client_test from mysql_client_test.c and mysys/my_memmem.c

  tests/Makefile.am@1.23.2.1, 2006-09-12 11:34:44+02:00, msvensson@shellback.(none) +3 -6
    Build mysql_client_test from mysql_client_test.c and mysys/my_memmem.c

ChangeSet@1.2273.21.4, 2006-09-12 04:46:41+02:00, rburnett@production.mysql.com +1 -0
  log.cc:
    Fixing failed merge

  sql/log.cc@1.227, 2006-09-12 04:46:28+02:00, rburnett@production.mysql.com +6 -3
    Fixing failed merge

ChangeSet@1.2273.29.6, 2006-09-12 03:39:58+02:00, cmiller@maint1.mysql.com +1 -0
  Change stolen from the -win tree.
  
  More specifically, the scripts/Makefile isn't created and it doesn't
  translate mysql_fix_privilege_tables ".sh" .  So, 
  mysql-test/mysql-test-run.pl doesn't find the binary and substitutes 
  /bin/false instead.  That obviously doesn't "fix" anything and the 
  test fails because of it.

  mysql-test/t/system_mysql_db_fix.test@1.24, 2006-09-12 03:39:55+02:00, cmiller@maint1.mysql.com +3 -0
    Change stolen from the -win tree.

ChangeSet@1.1810.2113.1, 2006-09-11 16:23:45-07:00, jimw@rama.(none) +1 -0
  Bug #18246: compilation error with tcp_wrapper
  
    Fix the functions in my_libwrap.c to return the results of the
    underlying call to libwrap.

  mysys/my_libwrap.c@1.3, 2006-09-11 16:23:44-07:00, jimw@rama.(none) +2 -2
    Make my_hosts_access() and my_eval_client() return their results

ChangeSet@1.2273.25.11, 2006-09-11 19:45:09+02:00, lars@mysql.com +1 -0
  manual merge

  sql/sql_yacc.yy@1.484.10.2, 2006-09-11 19:45:04+02:00, lars@mysql.com +1 -4
    Manual merge

ChangeSet@1.1616.2758.1, 2006-09-11 16:49:44+02:00, knielsen@ymer.(none) +4 -0
  BUG#16282
  
  Build gcc.o as a small library, instead of passing .cpp sources to the
  linker command (causes problems with parallel make on Solaris).
  
  This fix is for 4.1. In 5.0 and up a different fix is used.

  ndb/config/common.mk.am@1.6.2.1, 2006-09-11 16:49:41+02:00, knielsen@ymer.(none) +1 -1
    Build gcc.o as a small library, instead of passing .cpp sources to the
    linker command (causes problems with parallel make on Solaris).

  ndb/config/type_ndbapitools.mk.am@1.8.1.1, 2006-09-11 16:49:41+02:00, knielsen@ymer.(none) +1 -1
    Build gcc.o as a small library, instead of passing .cpp sources to the
    linker command (causes problems with parallel make on Solaris).

  ndb/src/common/portlib/Makefile.am@1.8.2.1, 2006-09-11 16:49:41+02:00, knielsen@ymer.(none) +2 -1
    Build gcc.o as a small library, instead of passing .cpp sources to the
    linker command (causes problems with parallel make on Solaris).

  ndb/src/kernel/Makefile.am@1.10.3.1, 2006-09-11 16:49:41+02:00, knielsen@ymer.(none) +2 -1
    Build gcc.o as a small library, instead of passing .cpp sources to the
    linker command (causes problems with parallel make on Solaris).

ChangeSet@1.1810.1972.30, 2006-09-11 14:45:40+02:00, lars@mysql.com +1 -0
  Fix WARN_DEPRECATED for 5.0 (it is in 5.1 we should have the extra arguments)

  sql/sql_yacc.yy@1.371.81.2, 2006-09-11 14:45:38+02:00, lars@mysql.com +2 -2
    Fix WARN_DEPRECATED for 5.0 (it is in 5.1 we should have the extra arguments)

ChangeSet@1.1810.2104.4, 2006-09-11 17:27:35+05:00, gluh@mysql.com +1 -0
  Bug#20862 truncated result with show variables like 'innodb_data_file_path'
  The size of 'value' field is increased to FN_REFLEN

  sql/sql_show.cc@1.253.1.76, 2006-09-11 17:27:31+05:00, gluh@mysql.com +1 -1
    Bug#20862 truncated result with show variables like 'innodb_data_file_path'
    The size of 'value' field is increased to FN_REFLEN

ChangeSet@1.2273.29.5, 2006-09-11 12:15:04+02:00, msvensson@shellback.(none) +1 -0
  Use the mtr_file_exists function to detect if ndbapi_example is available

  mysql-test/mysql-test-run.pl@1.166, 2006-09-11 12:15:00+02:00, msvensson@shellback.(none) +2 -3
    Use the mtr_file_exists function to detect if ndbapi_example is available

ChangeSet@1.2245.11.2, 2006-09-11 10:19:11+02:00, mats@romeo.(none) +1 -0
  WL#3259 (More columns on slave than on master):
  Adding files to CMakeLists.txt

  sql/CMakeLists.txt@1.23.2.1, 2006-09-11 10:19:07+02:00, mats@romeo.(none) +1 -1
    Adding rpl_utility.cc

ChangeSet@1.1810.2112.1, 2006-09-11 11:03:14+08:00, dli@dev3-76.dev.cn.tlan +5 -0
  Fix for Bug #20395 Cluster datanodes always assigned to nodegroup 0 during single user mode.
  Data node is not allowed to get added in the cluster when it is in single user mode.

  ndb/include/kernel/signaldata/CmRegSignalData.hpp@1.1.2.1, 2006-09-11 11:03:12+08:00, dli@dev3-76.dev.cn.tlan +5 -1
    Data node is not allowed to get added in the cluster when it is in single user mode.

  ndb/include/mgmapi/ndbd_exit_codes.h@1.2.4.1, 2006-09-11 11:03:12+08:00, dli@dev3-76.dev.cn.tlan +2 -0
    Data node is not allowed to get added in the cluster when it is in single user mode.

  ndb/include/ndb_version.h.in@1.1.6.1, 2006-09-11 11:03:12+08:00, dli@dev3-76.dev.cn.tlan +1 -0
    added version macro for version 5.0.25.

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@1.13.21.1, 2006-09-11 11:03:12+08:00, dli@dev3-76.dev.cn.tlan +49 -2
    Data node is not allowed to get added in the cluster when it is in single user mode.

  ndb/src/kernel/error/ndbd_exit_codes.c@1.1.6.1, 2006-09-11 11:03:12+08:00, dli@dev3-76.dev.cn.tlan +3 -0
    Data node is not allowed to get added in the cluster when it is in single user mode.

ChangeSet@1.2273.15.2, 2006-09-10 21:58:51+02:00, pekka@orca.ndb.mysql.com +3 -0
  ndb - bug#20612 ins-del fix in tup

  mysql-test/r/ndb_dd_basic.result@1.10.2.1, 2006-09-10 21:55:23+02:00, pekka@orca.ndb.mysql.com +20 -0
    test INS-DEL via assert in disk data code

  mysql-test/t/ndb_dd_basic.test@1.6.1.1, 2006-09-10 21:55:23+02:00, pekka@orca.ndb.mysql.com +26 -0
    test INS-DEL via assert in disk data code

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.45, 2006-09-10 20:41:02+02:00, pekka@orca.ndb.mysql.com +9 -1
    allocate separate copy tuple for delete after insert or update in same tx, instead of sharing pointer to same copy tuple.  this is an easy fix independent of commit/abort order of operations

ChangeSet@1.1810.2111.1, 2006-09-09 09:43:09-07:00, igor@rurik.mysql.com +6 -0
  Post-pushbuild corrections for fix of bug #21698.

  mysql-test/r/func_str.result@1.110.1.10, 2006-09-09 09:43:03-07:00, igor@rurik.mysql.com +2 -2
    Post-pushbuild corrections for fix of bug #21698.

  mysql-test/t/func_str.test@1.92.1.2, 2006-09-09 09:43:04-07:00, igor@rurik.mysql.com +2 -2
    Post-pushbuild corrections for fix of bug #21698.

  sql/item.h@1.183.10.2, 2006-09-09 09:43:04-07:00, igor@rurik.mysql.com +27 -0
    Post-pushbuild corrections for fix of bug #21698.

  sql/item_cmpfunc.cc@1.187.6.2, 2006-09-09 09:43:04-07:00, igor@rurik.mysql.com +1 -1
    Post-pushbuild corrections for fix of bug #21698.

  sql/item_func.cc@1.270.19.2, 2006-09-09 09:43:04-07:00, igor@rurik.mysql.com +1 -1
    Post-pushbuild corrections for fix of bug #21698.

  sql/sql_select.cc@1.312.89.4, 2006-09-09 09:43:04-07:00, igor@rurik.mysql.com +2 -2
    Post-pushbuild corrections for fix of bug #21698.

ChangeSet@1.2273.25.8, 2006-09-09 10:39:12+02:00, serg@janus.mylan +1 -0
  bugfix

  sql/sql_plugin.cc@1.33, 2006-09-09 10:39:09+02:00, serg@janus.mylan +1 -1
    bugfix

ChangeSet@1.1810.2110.1, 2006-09-08 19:04:46+03:00, gkodinov@macbook.gmz +4 -0
  Bug #21540: Subqueries with no from and aggregate functions return
              wrong results
   Mark the containing Item(s) (Item_subselect descendant usually) of 
   a subselect as containing aggregate functions if it has references
   to aggregates functions that are calculated outside its context.
   This tels end_send_group() not to make an Item_subselect descendant in
   select list a copy and causes the correct value being returned.

  mysql-test/r/func_group.result@1.49.2.1, 2006-09-08 19:04:38+03:00, gkodinov@macbook.gmz +1 -1
    Bug #21540: Subqueries with no from and aggregate functions return
                wrong results
     - test cases

  mysql-test/r/subselect.result@1.134.7.1, 2006-09-08 19:04:39+03:00, gkodinov@macbook.gmz +61 -0
    Bug #21540: Subqueries with no from and aggregate functions return
                wrong results
     - fixed the result of an existing testcase.

  mysql-test/t/subselect.test@1.125.1.1, 2006-09-08 19:04:40+03:00, gkodinov@macbook.gmz +31 -0
    Bug #21540: Subqueries with no from and aggregate functions return
                wrong results
     - test cases

  sql/item_sum.cc@1.170.5.1, 2006-09-08 19:04:41+03:00, gkodinov@macbook.gmz +21 -1
    Bug #21540: Subqueries with no from and aggregate functions return
                wrong results
     Mark the containing Item (Item_subselect descendant usually) of 
     a subselect as containing aggregate functions if it has references
     to aggregates functions that are calculated outside its context.
     This tels end_send_group() not to make an Item_subselect descendant in
     select list a copy and causes the correct value being returned.

ChangeSet@1.1810.2109.1, 2006-09-08 11:39:03-04:00, cmiller@zippy.cornsilk.net +1 -0
  Fix initialized memory.  Count the number of failures in shm-closing 
  functions and return it.

  vio/viosocket.c@1.37.2.1, 2006-09-08 11:39:02-04:00, cmiller@zippy.cornsilk.net +27 -2
    Initialize the return code and set it according to errors in the closing 
    functions.

ChangeSet@1.2273.29.4, 2006-09-08 16:26:35+02:00, msvensson@shellback.(none) +1 -0
  "crash_commit_before" need innodb

  mysql-test/t/crash_commit_before.test@1.2, 2006-09-08 16:26:27+02:00, msvensson@shellback.(none) +1 -0
    Server need to be compiled with innodb support for this test case to suceed

ChangeSet@1.2273.29.2, 2006-09-08 15:55:11+02:00, msvensson@shellback.(none) +1 -0
  Fix problem running mysql-test-run.pl when running in a clone not compiled with ndb support

  mysql-test/mysql-test-run.pl@1.150.3.7, 2006-09-08 15:55:07+02:00, msvensson@shellback.(none) +10 -15
    Don't set LD_LIBRARY_PATH  to the ndb dirs if ndb support is not available

ChangeSet@1.2273.29.1, 2006-09-08 15:42:49+02:00, msvensson@shellback.(none) +1 -0
  Bug#21855 Compilation error in ha_innodb.cc
   - Add ifdefs in ha_innodb.cc so it's only compiled if we have selected to build mysqld with innodb.
     This is inline with how it's done in other handlers.

  sql/ha_innodb.cc@1.284.7.1, 2006-09-08 15:42:42+02:00, msvensson@shellback.(none) +3 -0
    Add ifdef for WITH_INNOBASE_STORAGE_ENGINE around all code in ha_innodb.cc so it's only included if we have defined --with-innodb to configure

ChangeSet@1.1810.2078.14, 2006-09-08 16:41:35+04:00, anozdrin@alik. +1 -0
  Fix for BUG#22074: mysql-test-run.pl abort test run if it fails
  to start instance manager.
  
  The problem was that if IM failed to start, test suite aborts.
  
  The fix is to mark current test as failed, and continue running
  test suite.
  
  The fix affects only test suite.

  mysql-test/mysql-test-run.pl@1.30.1.84, 2006-09-08 16:41:33+04:00, anozdrin@alik. +4 -1
    Report IM-test as failed if IM failed to start.

ChangeSet@1.1810.2078.13, 2006-09-08 16:19:19+04:00, anozdrin@alik. +4 -0
  This is another patch for test suite to make IM tests work smoothly.
  The patch affects only test suite and has the following changes:
  
  1. On starting Instance Manager -- added code for waiting for guarded
  mysqld instances to create PID files;
  2. Polishing;
  3. Move IM-related operations out of mtr_process.pl into new dedicated
  for IM file -- mtr_im.pl

  BitKeeper/etc/collapsed@1.5, 2006-09-08 15:58:27+04:00, anozdrin@alik. +2 -0

  mysql-test/lib/mtr_im.pl@1.1, 2006-09-08 16:19:18+04:00, anozdrin@alik. +761 -0
    File for IM-related operations.

  mysql-test/lib/mtr_im.pl@1.0, 2006-09-08 16:19:18+04:00, anozdrin@alik. +0 -0

  mysql-test/lib/mtr_process.pl@1.25.2.10, 2006-09-08 16:19:18+04:00, anozdrin@alik. +8 -692
    Move IM-related operations to new file.

  mysql-test/mysql-test-run.pl@1.30.1.83, 2006-09-08 16:19:17+04:00, anozdrin@alik. +15 -6
    1. Require new file with IM-related operations;
    2. Added timeout to wait for PID files of guarded instances;
    3. Polishing.

ChangeSet@1.1810.2105.3, 2006-09-08 16:16:39+05:00, gluh@mysql.com +4 -0
  after merge fix

  sql/mysql_priv.h@1.290.1.119, 2006-09-08 16:16:35+05:00, gluh@mysql.com +2 -1
    after merge fix
    added charset parameter to check_string_length() function

  sql/slave.h@1.85.1.11, 2006-09-08 16:16:35+05:00, gluh@mysql.com +1 -1
    after merge fix
    USERNAME_LENGTH const is changed to USERNAME_BYTE_LENGTH

  sql/sql_parse.cc@1.426.1.146, 2006-09-08 16:16:35+05:00, gluh@mysql.com +6 -8
    after merge fix
    added charset parameter to check_string_length() function

  sql/sql_yacc.yy@1.371.1.114, 2006-09-08 16:16:35+05:00, gluh@mysql.com +6 -4
    after merge fix
    added charset parameter to check_string_length() function

ChangeSet@1.1810.2084.9, 2006-09-08 13:10:14+03:00, gkodinov@macbook.gmz +3 -0
  Bug #21772: can not name a column 'upgrade' when create a table in version 5.0.24
  Upgrade was a reserved word. Unreserve UPGRADE so it can be used in unquoted identifiers.

  mysql-test/r/create.result@1.107.1.15, 2006-09-08 13:10:05+03:00, gkodinov@macbook.gmz +2 -0
    Bug #21772: can not name a column 'upgrade' when create a table in version 5.0.24
     - test case

  mysql-test/t/create.test@1.71.1.10, 2006-09-08 13:10:06+03:00, gkodinov@macbook.gmz +6 -0
    Bug #21772: can not name a column 'upgrade' when create a table in version 5.0.24
     - test case

  sql/sql_yacc.yy@1.371.79.4, 2006-09-08 13:10:07+03:00, gkodinov@macbook.gmz +1 -0
    Bug #21772: can not name a column 'upgrade' when create a table in version 5.0.24
     - unreserve UPGRADE.

ChangeSet@1.1810.2107.3, 2006-09-08 11:25:08+02:00, msvensson@shellback.(none) +1 -0
  Speed up "bk citool" for msvensson:

  BitKeeper/etc/config@1.13.1.12, 2006-09-08 11:25:04+02:00, msvensson@shellback.(none) +1 -0
    Speed up "bk citool" for msvensson:

ChangeSet@1.2245.10.1, 2006-09-08 10:20:14+02:00, mats@romeo.(none) +2 -0
  Patches to fix problems on Windows

  sql/log_event.cc@1.239.1.1, 2006-09-08 10:20:09+02:00, mats@romeo.(none) +1 -1
    Adding cast since byte is unsigned char on Windows

  sql/rpl_utility.cc@1.2, 2006-09-08 10:20:09+02:00, mats@romeo.(none) +2 -0
    Adding missing return statement.

ChangeSet@1.1616.2735.23, 2006-09-08 10:24:14+03:00, gkodinov@macbook.gmz +3 -0
  Bug#21555: incorrect behavior with INSERT ... ON DUPL KEY UPDATE and VALUES
   VALUES() was considered a constant. This caused replacing 
   (or pre-calculating) it using uninitialized values before the actual
   execution takes place.
   Mark it as a non-constant (still not dependent of tables) to prevent
   the pre-calculation.

  mysql-test/r/insert_update.result@1.9.7.2, 2006-09-08 10:24:07+03:00, gkodinov@macbook.gmz +24 -2
    Bug#21555: incorrect behavior with INSERT ... ON DUPL KEY UPDATE and VALUES
     - test case.
     - EXPLAIN output changed due to VALUES() not being considered a constant 
       anymore

  mysql-test/t/insert_update.test@1.13.1.5, 2006-09-08 10:24:07+03:00, gkodinov@macbook.gmz +23 -0
    Bug#21555: incorrect behavior with INSERT ... ON DUPL KEY UPDATE and VALUES
     - test case.

  sql/item.h@1.56.1.140, 2006-09-08 10:24:08+03:00, gkodinov@macbook.gmz +5 -1
    Bug#21555: incorrect behavior with INSERT ... ON DUPL KEY UPDATE and VALUES
     - mark Item_insert_value as non-constant to prevent early calculation.

ChangeSet@1.2273.25.6, 2006-09-07 16:17:16-07:00, brian@zim.(none) +3 -0
  Warning fixes for Windows, and an include fix for Windows for Innodb.

  storage/archive/azio.c@1.9, 2006-09-07 16:17:13-07:00, brian@zim.(none) +2 -2
    Fixed warnings for windows

  storage/federated/ha_federated.cc@1.78, 2006-09-07 16:17:13-07:00, brian@zim.(none) +3 -5
    Warning fixes for Windows

  storage/innobase/CMakeLists.txt@1.9, 2006-09-07 16:17:13-07:00, brian@zim.(none) +6 -1
    Fixed includes for Windows

ChangeSet@1.2273.20.2, 2006-09-08 00:49:37+02:00, andrey@example.com +6 -0
  fix build

  mysql-test/r/events.result@1.44, 2006-09-08 00:49:27+02:00, andrey@example.com +4 -4
    fix build

  mysql-test/r/events_bugs.result@1.21, 2006-09-08 00:49:27+02:00, andrey@example.com +5 -6
    fix build

  mysql-test/t/events.test@1.41, 2006-09-08 00:49:27+02:00, andrey@example.com +4 -4
    fix build

  mysql-test/t/events_bugs.test@1.17, 2006-09-08 00:49:27+02:00, andrey@example.com +5 -5
    fix build

  sql/mysqld.cc@1.572, 2006-09-08 00:49:27+02:00, andrey@example.com +0 -3
    fix build

  sql/share/errmsg.txt@1.121, 2006-09-08 00:49:28+02:00, andrey@example.com +4 -0
    fix build

ChangeSet@1.1616.2757.1, 2006-09-08 00:59:34+04:00, evgen@moonbone.local +6 -0
  query_cache.result, func_time.test, type_date.result, func_time.result:
    Corrected test case after removal of fix for bug#16377         
  type_date.test:
    Corrected test case after removal of fix for bug#16377
  item_cmpfunc.cc:
    Removed changes to the agg_cmp_type() made in the for bug#16377

  mysql-test/r/func_time.result@1.23.8.1, 2006-09-08 00:57:42+04:00, evgen@moonbone.local +11 -12
    Corrected test case after removal of fix for bug#16377         

  mysql-test/r/query_cache.result@1.26.1.35, 2006-09-08 00:57:33+04:00, evgen@moonbone.local +0 -3
    Corrected test case after removal of fix for bug#16377         

  mysql-test/r/type_date.result@1.12.1.1, 2006-09-08 00:57:07+04:00, evgen@moonbone.local +2 -2
    Corrected test case after removal of fix for bug#16377         

  mysql-test/t/func_time.test@1.21.7.1, 2006-09-08 00:56:50+04:00, evgen@moonbone.local +11 -11
    Corrected test case after removal of fix for bug#16377         

  mysql-test/t/type_date.test@1.12, 2006-09-08 00:56:11+04:00, evgen@moonbone.local +2 -2
    Corrected test case after removal of fix for bug#16377

  sql/item_cmpfunc.cc@1.111.23.11, 2006-09-08 00:58:26+04:00, evgen@moonbone.local +3 -108
    Removed changes to the agg_cmp_type() made in the for bug#16377

ChangeSet@1.2273.25.5, 2006-09-07 12:35:52-07:00, brian@zim.(none) +1 -0
  Add support for Falcon, so that partitioning can be tested. 

  sql/handler.h@1.238, 2006-09-07 12:35:49-07:00, brian@zim.(none) +1 -0
    Adding Falcon

ChangeSet@1.2273.25.4, 2006-09-07 12:34:12-07:00, brian@zim.(none) +2 -0
  Fix for a compile problem in Windows. 

  sql/CMakeLists.txt@1.23.1.9, 2006-09-07 12:34:10-07:00, brian@zim.(none) +1 -1
    Compile problem for Windoows

  storage/innobase/handler/ha_innodb.cc@1.284.5.5, 2006-09-07 12:34:10-07:00, brian@zim.(none) +0 -28
    Removed some dead code (Marko approved)

ChangeSet@1.2273.25.3, 2006-09-07 12:12:52-07:00, brian@zim.(none) +1 -0
  Adding in a few more engines to the now defunct (but still used) handler enum's since its the only way to enable for partitioning. 

  sql/handler.h@1.237, 2006-09-07 12:12:49-07:00, brian@zim.(none) +5 -1
    Extended to add in more DB types for partioning. 

ChangeSet@1.2273.1.33, 2006-09-07 21:00:00+02:00, knielsen@ymer.(none) +3 -0
  Fix compilation errors in gcc -ansi -pedantic.

  storage/ndb/include/kernel/signaldata/CreateIndx.hpp@1.11, 2006-09-07 20:59:57+02:00, knielsen@ymer.(none) +1 -1
    Fix trailing comma in enum.

  storage/ndb/include/kernel/signaldata/CreateTable.hpp@1.9, 2006-09-07 20:59:57+02:00, knielsen@ymer.(none) +1 -1
    Fix trailing comma in enum.

  storage/ndb/tools/listTables.cpp@1.28, 2006-09-07 20:59:57+02:00, knielsen@ymer.(none) +1 -1
    Fix trailing comma in enum.

ChangeSet@1.1810.2108.1, 2006-09-07 11:06:37-07:00, igor@rurik.mysql.com +10 -0
  Fixed bug #21698: erroneously a field could be replaced by an
  equal constant under any circumstances.
  In fact this substitution can be allowed if the field is
  not of a type string or if the field reference serves as 
  an argument of a comparison predicate.  

  mysql-test/r/func_str.result@1.110.1.9, 2006-09-07 11:06:33-07:00, igor@rurik.mysql.com +35 -0
    Added test cases for bug #21698.

  mysql-test/r/heap_hash.result@1.17.1.3, 2006-09-07 11:06:33-07:00, igor@rurik.mysql.com +1 -1
    Adjusted results after the fix for bug #21198.

  mysql-test/t/func_str.test@1.92.1.1, 2006-09-07 11:06:33-07:00, igor@rurik.mysql.com +27 -0
    Added test cases for bug #21698.

  sql/item.cc@1.113.51.1, 2006-09-07 11:06:33-07:00, igor@rurik.mysql.com +38 -3
    Fixed bug #21198.
    Added a method to check whether a field reference can be 
    substituted for a constant equal to the field.
    This substitution is allowed if the field is not of a type string
    or if the field reference serves as an argument of a comparison
    predicate.  

  sql/item.h@1.183.10.1, 2006-09-07 11:06:33-07:00, igor@rurik.mysql.com +17 -1
    Fixed bug #21698.
    Added a new virtual transformation method for a item 'compile'
    with two callback function parameters.
    Added a new virtual method 'subst_argument_checker' to be used
    as an amnalyzer method.
    This method is supposed to set its in/out argument to NULL for
    the nodes where substitution of a string field for a constant
    is not valid.

  sql/item_cmpfunc.cc@1.187.6.1, 2006-09-07 11:06:34-07:00, igor@rurik.mysql.com +55 -6
    Fixed bug #21698.
    Added an implementation of the compile method for class Item_cond.
    First it processes the Item_cond node with a callback function and if
    the latter returns TRUE it proceeds with a transformation performed by
    another callback function. 

  sql/item_cmpfunc.h@1.122.2.6, 2006-09-07 11:06:34-07:00, igor@rurik.mysql.com +4 -0
    Fixed bug #21698.
    Added the implementations of 'subst_argument_checker'
    for the Item_func and Item_cond classes.
    This method is supposed to set its in/out argument to NULL for
    the nodes where substitution of a string field for a constant
    is not valid.
    Added the declaration of an implementation of the compile method for 
    class Item_cond.
    First it processes the Item_cond node with a callback function and if
    the latter returns TRUE it proceeds with a transformation performed by
    another callback function. 

  sql/item_func.cc@1.270.19.1, 2006-09-07 11:06:34-07:00, igor@rurik.mysql.com +56 -8
    Fixed bug #21698.
    Added an implementation of the compile method for class Item_func.
    First it processes the Item_func node with a callback function and if
    the latter returns TRUE it proceeds with a transformation performed by
    another callback function. 

  sql/item_func.h@1.136.13.1, 2006-09-07 11:06:34-07:00, igor@rurik.mysql.com +2 -0
    Fixed bug #21698.
    Added the declaration of the implementation of the compile method for
    class Item_func.
    First it processes the Item_func node with a callback function and if
    the latter returns TRUE it proceeds with a transformation performed by
    another callback function.
     

  sql/sql_select.cc@1.312.92.1, 2006-09-07 11:06:34-07:00, igor@rurik.mysql.com +12 -5
    Fixed bug #21698.
    Limited the conditions at which a field can be substituted 
    a for an equal constant in a formula. 
    This substitution is allowed if the field is not of a type string
    or if the field reference serves as an argument of a comparison
    predicate.  

ChangeSet@1.2245.1.10, 2006-09-07 18:01:42+02:00, guilhem@gbichot3.local +1 -0
  Removing sleeps; rpl_row_basic_8partition falls from 2 minutes
  15 seconds to less than a second.
  The sleeps used to be necessary but not anymore as NDB has been fixed
  wrt sync_slave_with_master.

  mysql-test/include/rpl_multi_engine3.inc@1.5, 2006-09-07 18:01:39+02:00, guilhem@gbichot3.local +0 -3
    Sleeps are not necessary anymore
    because NDB has been fixed wrt sync_slave_with_master.

ChangeSet@1.1810.2107.2, 2006-09-07 17:51:28+02:00, joerg@trift2. +1 -0
  configure.in  :    NDB version and general version must be (kept) in sync - do that.

  configure.in@1.245.58.8, 2006-09-07 17:51:25+02:00, joerg@trift2. +1 -1
    NDB version and general version must be (kept) in sync - do that.

ChangeSet@1.1810.2106.1, 2006-09-07 17:37:51+02:00, joerg@trift2. +1 -0
  Fix a change to "configure.in" that broke building commercial sources.
  To be pushed to both the cloned 5.0.25 and the general 5.0 tree.

  configure.in@1.245.62.1, 2006-09-07 17:37:48+02:00, joerg@trift2. +2 -1
    When creating "commercial" sources, this file gets modified by "mysql-copyright".
    For this, it is essential that the string 'cmd-line-utils/readline/Makefile'
    be alone on its line ...

ChangeSet@1.2273.28.1, 2006-09-07 08:23:58-07:00, brian@zim.(none) +8 -0
  Moves Innodb handler to the Innodb storage directory.

  libmysqld/Makefile.am@1.94.1.7, 2006-09-07 08:23:53-07:00, brian@zim.(none) +1 -1
    Removed Innodb specific mention

  sql/Makefile.am@1.145.1.10, 2006-09-07 08:23:53-07:00, brian@zim.(none) +1 -2
    Updated to remove innodb

  storage/innobase/CMakeLists.txt@1.8, 2006-09-07 08:23:53-07:00, brian@zim.(none) +2 -1
    Added include directory

  storage/innobase/Makefile.am@1.16.1.2, 2006-09-07 08:23:53-07:00, brian@zim.(none) +3 -0
    Updated to add in handler

  storage/innobase/handler/Makefile.am@1.1, 2006-09-07 08:23:54-07:00, brian@zim.(none) +29 -0
    New BitKeeper file ``storage/innobase/handler/Makefile.am''

  storage/innobase/handler/Makefile.am@1.0, 2006-09-07 08:23:54-07:00, brian@zim.(none) +0 -0

  storage/innobase/handler/ha_innodb.cc@1.284.5.4, 2006-09-07 08:23:53-07:00, brian@zim.(none) +2 -3
    Adjusted include files, also disabled replication code which was not being used. 

  storage/innobase/handler/ha_innodb.cc@1.284.5.3, 2006-09-06 18:41:57-07:00, brian@zim.(none) +0 -0
    Rename: sql/ha_innodb.cc -> storage/innobase/handler/ha_innodb.cc

  storage/innobase/handler/ha_innodb.h@1.126, 2006-09-06 18:42:02-07:00, brian@zim.(none) +0 -0
    Rename: sql/ha_innodb.h -> storage/innobase/handler/ha_innodb.h

  storage/innobase/plug.in@1.3, 2006-09-07 08:23:53-07:00, brian@zim.(none) +1 -0
    Added additional Makefile

ChangeSet@1.1346.880.2, 2006-09-07 15:39:31+02:00, istruewing@chilla.local +3 -0
  Bug#14400 - Query joins wrong rows from table which is subject of
              "concurrent insert"
  Additional fix for full keys and test case.

  mysql-test/r/myisam.result@1.10.3.2, 2006-09-07 15:39:30+02:00, istruewing@chilla.local +13 -0
    Bug#14400 - Query joins wrong rows from table which is subject of
                "concurrent insert"
    Additional results.

  mysql-test/t/myisam.test@1.7.3.2, 2006-09-07 15:39:30+02:00, istruewing@chilla.local +18 -0
    Bug#14400 - Query joins wrong rows from table which is subject of
                "concurrent insert"
    Additional test case.

  myisam/mi_rkey.c@1.11.2.2, 2006-09-07 15:39:30+02:00, istruewing@chilla.local +22 -16
    Bug#14400 - Query joins wrong rows from table which is subject of
                "concurrent insert"
    Additional fix for full keys.

ChangeSet@1.1810.2105.2, 2006-09-07 18:09:49+05:00, gluh@mysql.com +9 -0
  after merge fix

  include/mysql_com.h@1.100.1.9, 2006-09-07 18:09:43+05:00, gluh@mysql.com +1 -1
    USERNAME_LENGTH is changed to USERNAME_BYTE_LENGTH

  mysql-test/r/ctype_utf8.result@1.85.5.3, 2006-09-07 18:09:43+05:00, gluh@mysql.com +9 -8
    result fix

  mysql-test/t/ctype_utf8.test@1.84.4.3, 2006-09-07 18:09:43+05:00, gluh@mysql.com +1 -0
    test fix

  sql/sp.cc@1.82.1.35, 2006-09-07 18:09:43+05:00, gluh@mysql.com +4 -4
    NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
    USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer

  sql/sp_head.cc@1.200.1.23, 2006-09-07 18:09:43+05:00, gluh@mysql.com +3 -3
    NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
    USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer

  sql/sql_acl.cc@1.128.1.80, 2006-09-07 18:09:43+05:00, gluh@mysql.com +5 -5
    NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
    USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer

  sql/sql_class.h@1.230.1.65, 2006-09-07 18:09:43+05:00, gluh@mysql.com +1 -1
    NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer

  sql/sql_parse.cc@1.426.1.145, 2006-09-07 18:09:44+05:00, gluh@mysql.com +5 -2
    NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
    Function check_string_length() is fixed, now it check string lenght in symbols

  sql/sql_repl.h@1.37.1.1, 2006-09-07 18:09:44+05:00, gluh@mysql.com +1 -1
    NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
    USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer

ChangeSet@1.2273.27.1, 2006-09-07 15:09:34+02:00, knielsen@ymer.(none) +18 -0
  NDB temporary tables.
  
  Temporary tables are not written to disk by DDL operations. This makes
  DDL much faster (useful for tests), but tables are lost after system
  restart.
  
  New commit, since this feature will not be available in 5.1.

  storage/ndb/include/kernel/signaldata/CreateIndx.hpp@1.10, 2006-09-07 15:09:30+02:00, knielsen@ymer.(none) +4 -1
    Add new error messages for temporary tables.

  storage/ndb/include/kernel/signaldata/CreateTable.hpp@1.8, 2006-09-07 15:09:30+02:00, knielsen@ymer.(none) +2 -1
    Add new error messages for temporary tables.

  storage/ndb/include/kernel/signaldata/DiAddTab.hpp@1.4, 2006-09-07 15:09:30+02:00, knielsen@ymer.(none) +3 -2
    Add parameter for making table temporary.

  storage/ndb/include/kernel/signaldata/DictTabInfo.hpp@1.32, 2006-09-07 15:09:30+02:00, knielsen@ymer.(none) +4 -1
    Add parameter for making table temporary.

  storage/ndb/include/kernel/signaldata/ListTables.hpp@1.3, 2006-09-07 15:09:30+02:00, knielsen@ymer.(none) +14 -2
    Add parameter for making table temporary.

  storage/ndb/include/ndb_constants.h@1.13, 2006-09-07 15:09:30+02:00, knielsen@ymer.(none) +7 -1
    Add parameter for making table temporary.

  storage/ndb/include/ndbapi/NdbDictionary.hpp@1.83, 2006-09-07 15:09:30+02:00, knielsen@ymer.(none) +10 -2
    Add parameter for making table temporary.

  storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp@1.18, 2006-09-07 15:09:30+02:00, knielsen@ymer.(none) +2 -0
    Add parameter for making table temporary.

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.100.1.1, 2006-09-07 15:09:30+02:00, knielsen@ymer.(none) +244 -56
    Implement temporary tables.

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp@1.43, 2006-09-07 15:09:31+02:00, knielsen@ymer.(none) +6 -3
    Implement temporary tables.

  storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp@1.5, 2006-09-07 15:09:31+02:00, knielsen@ymer.(none) +2 -1
    Implement temporary tables.

  storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.21, 2006-09-07 15:09:31+02:00, knielsen@ymer.(none) +6 -1
    Implement temporary tables.

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.81.1.1, 2006-09-07 15:09:31+02:00, knielsen@ymer.(none) +27 -14
    Implement temporary tables.

  storage/ndb/src/ndbapi/NdbDictionary.cpp@1.63, 2006-09-07 15:09:31+02:00, knielsen@ymer.(none) +20 -0
    Implement temporary tables.

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.148.1.1, 2006-09-07 15:09:31+02:00, knielsen@ymer.(none) +15 -1
    Implement temporary tables.

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp@1.67, 2006-09-07 15:09:31+02:00, knielsen@ymer.(none) +2 -0
    Implement temporary tables.

  storage/ndb/src/ndbapi/ndberror.c@1.71.1.1, 2006-09-07 15:09:31+02:00, knielsen@ymer.(none) +4 -1
    Add new error messages for temporary tables.

  storage/ndb/tools/listTables.cpp@1.27, 2006-09-07 15:09:31+02:00, knielsen@ymer.(none) +65 -8
    Add display of table and index temporary status.

ChangeSet@1.2273.26.2, 2006-09-07 15:01:36+02:00, serg@janus.mylan +1 -0
  cleanup of pligin removal code
  fixed multiple and missing deinitializations, moved all
  deinit/del code in one place

  sql/sql_plugin.cc@1.32, 2006-09-07 15:01:33+02:00, serg@janus.mylan +78 -94
    cleanup of pligin removal code
    fixed multiple and missing deinitializations, moved all
    deinit/del code in one place

ChangeSet@1.2273.26.1, 2006-09-07 12:56:32+02:00, serg@janus.mylan +3 -0
  minor plugin api fixes:
  remove #define __attribute__(A) from plugin.h
  increase API version because placeholders were added
  more robust definition of min_plugin_interface_version

  include/mysql/plugin.h@1.18, 2006-09-07 12:56:29+02:00, serg@janus.mylan +1 -5
    move #define __attribute__(A) out of plugin.h (not part of the API)
    increase API version because placeholders were added

  plugin/fulltext/plugin_example.c@1.13, 2006-09-07 12:56:29+02:00, serg@janus.mylan +4 -0
    compilation failure on non-GCC compilers

  sql/sql_plugin.cc@1.31, 2006-09-07 12:56:29+02:00, serg@janus.mylan +1 -1
    more robust definition of min_plugin_interface_version
    it should work even when we forget to update it

ChangeSet@1.2273.25.1, 2006-09-07 13:52:30+10:00, arjen@mysql.com +3 -0
  errmsg.txt:
    Update of Dutch errmsg translations (not complete yet)
  errmsg.h:
    Fixup of changed error message file path in comment
  authors.h:
    Ego add.

  include/errmsg.h@1.29, 2006-09-07 13:48:41+10:00, arjen@mysql.com +1 -1
    Fixup of changed error message file path in comment

  sql/authors.h@1.15, 2006-09-07 13:48:41+10:00, arjen@mysql.com +2 -0
    Ego add.

  sql/share/errmsg.txt@1.110.6.1, 2006-09-07 13:48:41+10:00, arjen@mysql.com +26 -0
    Update of Dutch errmsg translations (not complete yet)

ChangeSet@1.2273.16.47, 2006-09-07 04:18:17+02:00, tnurnberg@mysql.com +1 -0
  make partition_mgm test deterministic wrt results of ls

  mysql-test/t/partition_mgm.test@1.7, 2006-09-07 04:18:12+02:00, tnurnberg@mysql.com +6 -2
    make partition_mgm test deterministic

ChangeSet@1.1810.2103.1, 2006-09-07 00:54:48+02:00, tsmith@maint1.mysql.com +2 -0
  Force conflict to avoid bk automerge behavior; will be undone during merge.

  sql/stacktrace.c@1.16.2.1, 2006-09-07 00:54:23+02:00, tsmith@maint1.mysql.com +1 -0
    Force conflict to avoid bk automerge behavior; will be undone during merge.

  sql/stacktrace.h@1.3.2.1, 2006-09-07 00:54:23+02:00, tsmith@maint1.mysql.com +1 -1
    Force conflict to avoid bk automerge behavior; will be undone during merge.

ChangeSet@1.1616.2756.2, 2006-09-07 00:11:43+02:00, tsmith@maint1.mysql.com +1 -0
  Bug #21054: myisam_stats_method ignored in my.cnf and cmdline
  Fix OPT_MYISAM_STATS_METHOD case, where the NULLS_EQUAL and NULLS_NOT_EQUAL methods were mixed up

  sql/mysqld.cc@1.356.108.1, 2006-09-07 00:09:58+02:00, tsmith@maint1.mysql.com +2 -2
    Fix OPT_MYISAM_STATS_METHOD case, bug #21054

ChangeSet@1.1616.2756.1, 2006-09-07 00:01:00+02:00, tsmith@maint1.mysql.com +2 -0
  Bug #21250: esolve stack traces on AMD64 (backport to mysql-4.1)

  sql/stacktrace.c@1.16.1.1, 2006-09-07 00:00:06+02:00, tsmith@maint1.mysql.com +40 -15
    stacktrace dumps for amd64 (backport fix for bug 21250 to mysql-4.1)

  sql/stacktrace.h@1.3.1.1, 2006-09-07 00:00:06+02:00, tsmith@maint1.mysql.com +6 -2
    stacktrace dumps for amd64 (backport fix for bug 21250 to mysql-4.1)

ChangeSet@1.2273.23.1, 2006-09-06 17:10:58-04:00, cmiller@zippy.cornsilk.net +1 -0
  Fix build problem for when not compiled with debugging.

  dbug/dbug.c@1.32, 2006-09-06 17:10:56-04:00, cmiller@zippy.cornsilk.net +8 -3
    Don't try to force DBUG on.
    
    Conditionally compile this file, as the headers we load may change the 
    value of DBUG_OFF /after/ we set it.

ChangeSet@1.2273.19.3, 2006-09-06 14:23:39-04:00, cmiller@zippy.cornsilk.net +3 -0
  Fix merge problems; work around disparate "ls" behaviors.

  mysql-test/r/ctype_recoding.result@1.34, 2006-09-06 14:23:37-04:00, cmiller@zippy.cornsilk.net +1 -1
    Case change in 5.1.

  mysql-test/t/heap_btree.test@1.22, 2006-09-06 14:23:37-04:00, cmiller@zippy.cornsilk.net +0 -12
    Fixes bad merge.

  mysql-test/t/partition.test@1.52, 2006-09-06 14:23:37-04:00, cmiller@zippy.cornsilk.net +10 -6
    Split terrible "ls" test into two parts so that the different sorting orders
    of sundry OSes don't affect the output.

ChangeSet@1.2273.1.31, 2006-09-06 19:42:01+02:00, jmiller@mysql.com +4 -0
  Updated test case due to pb test failure on sol10-sparc-a' -max

  mysql-test/r/ndb_dd_disk2memory.result@1.6.1.2, 2006-09-06 19:32:49+02:00, jmiller@mysql.com +17 -7
    Updated test case due to pb test failure on sol10-sparc-a' -max

  mysql-test/r/ndb_dd_sql_features.result@1.2, 2006-09-06 19:41:19+02:00, jmiller@mysql.com +2 -2
    Updated test case due to pb test failure on sol10-sparc-a' -max

  mysql-test/t/ndb_dd_disk2memory.test@1.3, 2006-09-06 19:32:33+02:00, jmiller@mysql.com +5 -5
    Updated test case due to pb test failure on sol10-sparc-a' -max

  mysql-test/t/ndb_dd_sql_features.test@1.2, 2006-09-06 19:41:31+02:00, jmiller@mysql.com +2 -2
    Updated test case due to pb test failure on sol10-sparc-a' -max

ChangeSet@1.1810.2102.1, 2006-09-06 17:56:59+02:00, bteam@mysql.com +1 -0
  Raise version number

  configure.in@1.245.58.6, 2006-09-06 17:56:38+02:00, bteam@mysql.com +1 -1
    Raise version number

ChangeSet@1.2245.9.1, 2006-09-06 17:45:27+02:00, mats@romeo.(none) +3 -0
  BUG#17620: Row-based replication fails when query cache enabled on slave
  Invalidating query cache when processing rows for a statement on the slave.

  mysql-test/r/rpl_row_basic_11bugs.result@1.10, 2006-09-06 17:45:24+02:00, mats@romeo.(none) +40 -0
    Result file change

  mysql-test/t/rpl_row_basic_11bugs.test@1.9, 2006-09-06 17:45:25+02:00, mats@romeo.(none) +40 -0
    Adding test to trigger failure

  sql/log_event.cc@1.237.1.1, 2006-09-06 17:45:25+02:00, mats@romeo.(none) +6 -0
    Adding code to invalidate the query cache just after opening the tables
    for processing the rows of one statement.

ChangeSet@1.1810.2101.1, 2006-09-06 08:21:43-07:00, igor@rurik.mysql.com +8 -0
  Fixed bug #5500: EXPLAIN returned a wrong select_type for queries using views.
  Select_type in the EXPLAIN output for the query SELECT * FROM t1 was
  'SIMPLE', while for the query SELECT * FROM v1, where the view v1
  was defined as SELECT * FROM t1, the EXPLAIN output contained 'PRIMARY'
  for the select_type column.
   

  mysql-test/r/group_by.result@1.69.1.2, 2006-09-06 08:21:35-07:00, igor@rurik.mysql.com +2 -2
    Adjusted results after the fix for bug #5500.

  mysql-test/r/information_schema.result@1.87.1.27, 2006-09-06 08:21:36-07:00, igor@rurik.mysql.com +1 -1
    Adjusted results after the fix for bug #5500.

  mysql-test/r/olap.result@1.33.1.1, 2006-09-06 08:21:36-07:00, igor@rurik.mysql.com +1 -1
    Adjusted results after the fix for bug #5500.

  mysql-test/r/range.result@1.44.1.6, 2006-09-06 08:21:36-07:00, igor@rurik.mysql.com +4 -4
    Adjusted results after the fix for bug #5500.

  mysql-test/r/view.result@1.138.18.1, 2006-09-06 08:21:36-07:00, igor@rurik.mysql.com +35 -16
    Added a test case for bug #5500.
    Adjusted other results.

  mysql-test/r/view_grant.result@1.8.1.11, 2006-09-06 08:21:36-07:00, igor@rurik.mysql.com +3 -3
    Adjusted results after the fix for bug #5500.

  mysql-test/t/view.test@1.126.16.1, 2006-09-06 08:21:36-07:00, igor@rurik.mysql.com +18 -0
    Added a test case for bug #5500.

  sql/sql_select.cc@1.312.91.1, 2006-09-06 08:21:36-07:00, igor@rurik.mysql.com +7 -4
    Fixed bug #5500: EXPLAIN returned a wrong select_type for queries using views.
    Select_type in the EXPLAIN output for the query SELECT * FROM t1 was
    'SIMPLE', while for the query SELECT * FROM v1, where the view v1
    was defined as SELECT * FROM t1, the EXPLAIN output contained 'PRIMARY'
    for the select_type column.
     

ChangeSet@1.1616.2755.1, 2006-09-06 19:56:19+05:00, holyfoot@mysql.com +1 -0
  bug #12991 (compile error --without-geometry)

  myisam/mi_check.c@1.105.8.1, 2006-09-06 19:56:16+05:00, holyfoot@mysql.com +4 -1
    proper #ifdef-s added

ChangeSet@1.1810.2100.1, 2006-09-06 15:06:22+02:00, msvensson@neptunus.(none) +1 -0
  Removed unused variable "glob_cygwin_shell"

  mysql-test/mysql-test-run.pl@1.30.39.1, 2006-09-06 15:06:17+02:00, msvensson@neptunus.(none) +0 -4
    Removed unused variable "glob_cygwin_shell"

ChangeSet@1.2273.19.2, 2006-09-06 15:05:19+02:00, guilhem@gbichot3.local +1 -0
  mi_test_all.sh needs "./" before the executable names otherwise they
  are not found

  storage/myisam/mi_test_all.sh@1.9, 2006-09-06 15:05:16+02:00, guilhem@gbichot3.local +136 -136
    need "./" before the executable names otherwise they are not found

ChangeSet@1.2273.18.1, 2006-09-06 12:50:42+02:00, guilhem@gbichot3.local +3 -0
  New way to fix BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE".
  This bug report was two problems:
  1) LAST_INSERT_ID() returns a value which does not exist in the table
  2) the reporter would want it to return the autoinc id of the updated
  row.
  1) is a real bug, 2) is a feature request.
  In July I implemented 2) in 5.1 (which automatically fixes 1).
  This has not yet been documented or released, so is changeable.
  Precisely, recently Paul and a user found an easy workaround to give
  2), which works in 4.1-5.0-5.1. So I can revert my code for 2),
  because it's not needed, that's what I do here;
  we forget about 2) (we will document the workaround).
  But when I revert my code for 2), 1) comes back. We solve 1) by saying
  that if INSERT ON DUPLICATE KEY UPDATE updates a row, it's like a
  regular UPDATE: LAST_INSERT_ID() should not be affected (instead of
  returning a non-existent value).
  So note: no behaviour change compared to the last released 5.1; just
  a bugfix for 1).

  mysql-test/t/innodb_mysql.test@1.7.1.3, 2006-09-06 12:50:20+02:00, guilhem@gbichot3.local +18 -3
        test for the new way to fix BUG#19243: that if INSERT ON DUPLICATE
        KEY UPDATE updates a row, SELECT LAST_INSERT_ID() is not affected.
        Test of the workaround for people who want SELECT LAST_INSERT_ID()
        to return the autoinc id of the updated row.

  mysql-test/r/innodb_mysql.result@1.7.1.3, 2006-09-06 12:50:20+02:00, guilhem@gbichot3.local +26 -4
    result update

  sql/sql_insert.cc@1.222, 2006-09-06 12:50:20+02:00, guilhem@gbichot3.local +7 -8
    No need to change LAST_INSERT_ID() if INSERT ON DUPLICATE KEY UPDATE
    updates a row, there is a workaround to achieve this without changing
    code: just add "autoinc_col=LAST_INSERT_ID(autoinc_col)" to your
    ON DUPLICATE KEY UPDATE clause.
    Prevent LAST_INSERT_ID() to contain an inexistent value in this case:
    if the row is updated it should be like a regular UPDATE: don't
    affect LAST_INSERT_ID() (achieved by marking that we didn't generate
    an id for this row: insert_id_for_cur_row=0).

ChangeSet@1.1810.2097.2, 2006-09-06 11:54:01+02:00, mskold@mysql.com +2 -0
  Bug #21056  ndb pushdown equal/setValue error on datetime: Added missing order by

  mysql-test/r/ndb_condition_pushdown.result@1.15.2.2, 2006-09-06 11:53:34+02:00, mskold@mysql.com +4 -4
    Bug #21056  ndb pushdown equal/setValue error on datetime: Added missing order by

  mysql-test/t/ndb_condition_pushdown.test@1.16.1.4, 2006-09-06 11:53:34+02:00, mskold@mysql.com +4 -4
    Bug #21056  ndb pushdown equal/setValue error on datetime: Added missing order by

ChangeSet@1.2273.11.4, 2006-09-06 10:22:59+02:00, serg@janus.mylan +3 -0
  converting plugin states to bitmask to simplify testing.
  state_mask argument to plugin_foreach()

  sql/sql_plugin.cc@1.30, 2006-09-06 10:22:57+02:00, serg@janus.mylan +9 -7
    converting plugin states to bitmask to simplify testing.
    state_mask argument to plugin_foreach()

  sql/sql_plugin.h@1.12, 2006-09-06 10:22:57+02:00, serg@janus.mylan +15 -10
    converting plugin states to bitmask to simplify testing.
    state_mask argument to plugin_foreach()

  sql/sql_show.cc@1.354.13.1, 2006-09-06 10:22:57+02:00, serg@janus.mylan +3 -2
    state_mask argument to plugin_foreach()

ChangeSet@1.1810.2099.1, 2006-09-06 10:06:03+05:00, bar@mysql.com +2 -0
  Adding a new test for bug N17939

  mysql-test/r/mysql.result@1.16, 2006-09-06 10:06:00+05:00, bar@mysql.com +10 -0
    Adding a new test for bug N17939

  mysql-test/t/mysql.test@1.4.1.12, 2006-09-06 10:06:00+05:00, bar@mysql.com +6 -0
    Adding a new test for bug N17939

ChangeSet@1.2273.11.3, 2006-09-05 23:59:16+02:00, serg@janus.mylan +1 -0
  plugin_foreach - don't hold the lock when calling the function

  sql/sql_plugin.cc@1.29, 2006-09-05 23:59:13+02:00, serg@janus.mylan +40 -18
    plugin_foreach - don't hold the lock when calling the function

ChangeSet@1.2273.16.26, 2006-09-05 16:28:31-04:00, cmiller@zippy.cornsilk.net +2 -0
  Fix bad manual merge.

  mysql-test/r/grant.result@1.58.1.6, 2006-09-05 16:28:29-04:00, cmiller@zippy.cornsilk.net +0 -313
    Fix bad merge.

  sql/mysqld.cc@1.564.14.6, 2006-09-05 14:23:44-04:00, cmiller@zippy.cornsilk.net +0 -4
    Fixes bad merge.

ChangeSet@1.1810.2084.7, 2006-09-05 19:07:55+03:00, gkodinov@macbook.gmz +3 -0
  Merge bug #16792 4.1->5.0

  mysql-test/r/func_group.result@1.49.1.2, 2006-09-05 19:07:46+03:00, gkodinov@macbook.gmz +14 -14
    Merge bug #16792 4.1->5.0

  mysql-test/r/innodb_mysql.result@1.3.4.4, 2006-09-05 19:07:47+03:00, gkodinov@macbook.gmz +4 -4
    Merge bug #16792 4.1->5.0

  mysql-test/r/union.result@1.80.1.6, 2006-09-05 19:07:48+03:00, gkodinov@macbook.gmz +1 -1
    Merge bug #16792 4.1->5.0

ChangeSet@1.1810.2097.1, 2006-09-05 17:07:00+02:00, mskold@mysql.com +4 -0
  Bug #21056  ndb pushdown equal/setValue error on datetime: only pushdown like of string type fields

  mysql-test/r/ndb_condition_pushdown.result@1.15.2.1, 2006-09-05 17:06:37+02:00, mskold@mysql.com +22 -0
    Bug #21056  ndb pushdown equal/setValue error on datetime: only pushdown like of string type fields

  mysql-test/t/ndb_condition_pushdown.test@1.16.1.3, 2006-09-05 17:06:37+02:00, mskold@mysql.com +10 -0
    Bug #21056  ndb pushdown equal/setValue error on datetime: only pushdown like of string type fields

  sql/ha_ndbcluster.cc@1.175.54.1, 2006-09-05 17:06:37+02:00, mskold@mysql.com +5 -0
    Bug #21056  ndb pushdown equal/setValue error on datetime: only pushdown like of string type fields

  sql/ha_ndbcluster.h@1.82.4.3, 2006-09-05 17:06:37+02:00, mskold@mysql.com +26 -2
    Bug #21056  ndb pushdown equal/setValue error on datetime: only pushdown like of string type fields

ChangeSet@1.1810.2096.1, 2006-09-05 16:52:05+02:00, guilhem@gbichot3.local +10 -0
  Fix for BUG#11151 "LOAD DATA INFILE commits transaction in 5.0".
  In 5.0 we made LOAD DATA INFILE autocommit in all engines, while
  only NDB wanted that. Users and trainers complained that it affected
  InnoDB and was a change compared to 4.1 where only NDB autocommitted.
  To revert to the behaviour of 4.1, we move the autocommit logic out of mysql_load() into
  ha_ndbcluster::external_lock().
  The result is that LOAD DATA INFILE commits all uncommitted changes
  of NDB if this is an NDB table, its own changes if this is an NDB
  table, but does not affect other engines.
  Note: even though there is no "commit the full transaction at end"
  anymore, LOAD DATA INFILE stays disabled in routines (re-entrency
  problems per a comment of Pem).
  Note: ha_ndbcluster::has_transactions() does not give reliable results
  because it says "yes" even if transactions are disabled in this engine...

  mysql-test/include/loaddata_autocom.inc@1.1, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +21 -0
    test for engines to see if they autocommit or not in LOAD DATA INFILE

  mysql-test/include/loaddata_autocom.inc@1.0, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +0 -0

  mysql-test/r/loaddata_autocom_innodb.result@1.1, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +21 -0
    result for InnoDB (no autocommit)

  mysql-test/r/loaddata_autocom_innodb.result@1.0, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +0 -0

  mysql-test/r/loaddata_autocom_ndb.result@1.1, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +23 -0
    result for NDB (autocommit)

  mysql-test/r/loaddata_autocom_ndb.result@1.0, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +0 -0

  mysql-test/r/rpl_ndb_innodb_trans.result@1.1, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +103 -0
    result for InnoDB+NDB transactions. Observe that when ROLLBACK
    cannot rollback the LOAD DATA INFILE in NDB it issues warning 1196
    as appropriate.

  mysql-test/r/rpl_ndb_innodb_trans.result@1.0, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +0 -0

  mysql-test/t/loaddata_autocom_innodb.test@1.1, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +4 -0
    test that InnoDB does not autocommit in LOAD DATA INFILE.

  mysql-test/t/loaddata_autocom_innodb.test@1.0, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +0 -0

  mysql-test/t/loaddata_autocom_ndb.test@1.1, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +4 -0
    test that NDB does autocommit in LOAD DATA INFIL

  mysql-test/t/loaddata_autocom_ndb.test@1.0, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +0 -0

  mysql-test/t/rpl_ndb_innodb_trans-slave.opt@1.1, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +1 -0
    need to tell the slave to use innodb

  mysql-test/t/rpl_ndb_innodb_trans-slave.opt@1.0, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +0 -0

  mysql-test/t/rpl_ndb_innodb_trans.test@1.1, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +66 -0
    test of transactions mixing NDB and InnoDB. To see if ROLLBACK
    rolls back in both engines, with the exception of LOAD DATA INFILE
    which does not roll back NDB: we see that a LOAD DATA INFILE in NDB
    commits all what has been done in NDB so far, commits its changes,
    but does not commit in other engines.

  mysql-test/t/rpl_ndb_innodb_trans.test@1.0, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +0 -0

  sql/ha_ndbcluster.cc@1.175.53.1, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +8 -1
    NDB wants to do autocommit if this is LOAD DATA INFILE.
    For this to not affect all other engines, we move the logic
    inside ha_ndbcluster.

  sql/sql_load.cc@1.78.1.20, 2006-09-05 16:52:03+02:00, guilhem@gbichot3.local +0 -5
    This ha_enable_transaction() in mysql_load() forced an autocommit
    in all engines, while only NDB wants to do that.
    So we move the logic inside ha_ndbcluster.cc.

ChangeSet@1.2273.16.3, 2006-09-05 10:01:52-04:00, cmiller@zippy.cornsilk.net +1 -0
  Removed duplicate code from bad merge.

  sql/ha_innodb.cc@1.292, 2006-09-05 10:01:02-04:00, cmiller@zippy.cornsilk.net +0 -13
    Removed duplicate code from bad merge.

ChangeSet@1.2273.16.2, 2006-09-05 03:52:15+02:00, tsmith@maint1.mysql.com +127 -0
  Applied InnoDB 5.1 snapshot ss787.
  
  Bugs fixed:
  - Bug #20791    valgrind errors in InnoDB
    Remove Valgrind warning of Bug #20791 : in new database
    creation, we read the doublewrite buffer magic number from
    uninitialized memory; the code worked because it was extremely
    unlikely that the memory would contain the magic number
  - Bug #21784    DROP TABLE crashes 5.1.12-pre if concurrent
    queries on the table
    remove update_thd() in ::store_lock()
  
  
  Also includes numerous coding style fixes, etc.  See file-level
  comments for details.

  storage/innobase/Makefile.am@1.19, 2006-09-05 01:16:03+02:00, tsmith@maint1.mysql.com +2 -1
    Applied InnoDB 5.1 snapshot ss787.
    
      r772:
      Merge changes from MySQL AB:
    
      ChangeSet
        2006/08/23 13:59:16-07:00 brian@zim.(none)
        This patch removes need for a innodb to have its own configure.

  storage/innobase/btr/btr0btr.c@1.49, 2006-09-05 01:16:03+02:00, tsmith@maint1.mysql.com +286 -264
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r764:
      Split lines before an opening parenthesis, not after one.
    
      Replace some printf(...) in debug builds with fprintf(stderr, ...).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/btr/btr0cur.c@1.55, 2006-09-05 01:16:03+02:00, tsmith@maint1.mysql.com +348 -327
    Applied InnoDB 5.1 snapshot ss787.
    
      r761:
      btr_cur_search_to_nth_level(): Document where cursor is left at in
      PAGE_CUR_LE searches.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/btr/btr0pcur.c@1.22, 2006-09-05 01:16:03+02:00, tsmith@maint1.mysql.com +49 -45
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/btr/btr0sea.c@1.46, 2006-09-05 01:16:03+02:00, tsmith@maint1.mysql.com +114 -101
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/buf/buf0buf.c@1.58, 2006-09-05 01:16:03+02:00, tsmith@maint1.mysql.com +253 -205
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r764:
      Split lines before an opening parenthesis, not after one.
    
      Replace some printf(...) in debug builds with fprintf(stderr, ...).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/buf/buf0flu.c@1.34, 2006-09-05 01:16:04+02:00, tsmith@maint1.mysql.com +115 -96
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r764:
      Split lines before an opening parenthesis, not after one.
    
      Replace some printf(...) in debug builds with fprintf(stderr, ...).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/buf/buf0lru.c@1.30, 2006-09-05 01:16:04+02:00, tsmith@maint1.mysql.com +90 -63
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r764:
      Split lines before an opening parenthesis, not after one.
    
      Replace some printf(...) in debug builds with fprintf(stderr, ...).

  storage/innobase/buf/buf0rea.c@1.21, 2006-09-05 01:16:04+02:00, tsmith@maint1.mysql.com +85 -84
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/data/data0data.c@1.21, 2006-09-05 01:16:04+02:00, tsmith@maint1.mysql.com +38 -32
    Applied InnoDB 5.1 snapshot ss787.
    
      r743:
      dfield_print_raw(): Make static.  Print at most 1000 bytes to avoid
      excessive space usage of the error log.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/data/data0type.c@1.28, 2006-09-05 01:16:04+02:00, tsmith@maint1.mysql.com +13 -13
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/dict/dict0boot.c@1.17, 2006-09-05 01:16:04+02:00, tsmith@maint1.mysql.com +47 -37
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/dict/dict0crea.c@1.39, 2006-09-05 01:16:04+02:00, tsmith@maint1.mysql.com +102 -89
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/dict/dict0dict.c@1.88, 2006-09-05 01:16:05+02:00, tsmith@maint1.mysql.com +317 -273
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r764:
      Split lines before an opening parenthesis, not after one.
    
      Replace some printf(...) in debug builds with fprintf(stderr, ...).
    
      r765:
      Split lines before binary operators, not after them.
    
      r767:
      Remove dict_col_t::aux, which was only used when copying an index definition
      to the data dictionary cache.

  storage/innobase/dict/dict0load.c@1.51, 2006-09-05 01:16:07+02:00, tsmith@maint1.mysql.com +110 -103
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/dict/dict0mem.c@1.23, 2006-09-05 01:16:07+02:00, tsmith@maint1.mysql.com +4 -4
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/eval/eval0eval.c@1.11, 2006-09-05 01:16:07+02:00, tsmith@maint1.mysql.com +16 -15
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/eval/eval0proc.c@1.6, 2006-09-05 01:16:07+02:00, tsmith@maint1.mysql.com +5 -4
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/fil/fil0fil.c@1.70, 2006-09-05 01:16:07+02:00, tsmith@maint1.mysql.com +464 -333
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r764:
      Split lines before an opening parenthesis, not after one.
    
      Replace some printf(...) in debug builds with fprintf(stderr, ...).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/fsp/fsp0fsp.c@1.33, 2006-09-05 01:16:07+02:00, tsmith@maint1.mysql.com +350 -321
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r764:
      Split lines before an opening parenthesis, not after one.
    
      Replace some printf(...) in debug builds with fprintf(stderr, ...).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/fut/fut0lst.c@1.8, 2006-09-05 01:16:08+02:00, tsmith@maint1.mysql.com +26 -26
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/ha/ha0ha.c@1.20, 2006-09-05 01:16:08+02:00, tsmith@maint1.mysql.com +5 -3
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  sql/ha_innodb.cc@1.291, 2006-09-05 01:16:02+02:00, tsmith@maint1.mysql.com +29 -10
    Applied InnoDB 5.1 snapshot ss787.
    
      r755:
      Merge a patch from MySQL AB (Mats Kindal):
    
      Lock and unlock prepare_commit_mutex under the same conditions.
    
      r782:
      Fix bug #21784 of a crash in DROP TABLE with concurrent queries on the table

  storage/innobase/ibuf/ibuf0ibuf.c@1.48, 2006-09-05 01:16:08+02:00, tsmith@maint1.mysql.com +290 -269
    Applied InnoDB 5.1 snapshot ss787.
    
      r735:
      Remove all traces of the obsolete concept of replicate spaces.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r764:
      Split lines before an opening parenthesis, not after one.
    
      Replace some printf(...) in debug builds with fprintf(stderr, ...).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/include/btr0btr.ic@1.10, 2006-09-05 01:16:08+02:00, tsmith@maint1.mysql.com +10 -9
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/btr0cur.h@1.20, 2006-09-05 01:16:08+02:00, tsmith@maint1.mysql.com +5 -3
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/btr0cur.ic@1.11, 2006-09-05 01:16:08+02:00, tsmith@maint1.mysql.com +7 -7
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/btr0pcur.ic@1.10, 2006-09-05 01:16:09+02:00, tsmith@maint1.mysql.com +8 -8
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/buf0buf.h@1.35, 2006-09-05 01:16:09+02:00, tsmith@maint1.mysql.com +2 -2
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/buf0buf.ic@1.25, 2006-09-05 01:16:09+02:00, tsmith@maint1.mysql.com +31 -25
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/buf0flu.ic@1.6, 2006-09-05 01:16:09+02:00, tsmith@maint1.mysql.com +2 -2
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/buf0rea.h@1.5, 2006-09-05 01:16:09+02:00, tsmith@maint1.mysql.com +2 -1
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/data0data.h@1.16, 2006-09-05 01:16:09+02:00, tsmith@maint1.mysql.com +0 -8
    Applied InnoDB 5.1 snapshot ss787.
    
      r743:
      dfield_print_raw(): Make static.  Print at most 1000 bytes to avoid
      excessive space usage of the error log.

  storage/innobase/include/data0data.ic@1.12, 2006-09-05 01:16:09+02:00, tsmith@maint1.mysql.com +7 -7
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/data0type.ic@1.30, 2006-09-05 01:16:10+02:00, tsmith@maint1.mysql.com +95 -94
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/dict0boot.h@1.7, 2006-09-05 01:16:10+02:00, tsmith@maint1.mysql.com +2 -1
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/dict0dict.ic@1.18, 2006-09-05 01:16:10+02:00, tsmith@maint1.mysql.com +9 -9
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/dict0mem.h@1.31, 2006-09-05 01:16:11+02:00, tsmith@maint1.mysql.com +0 -2
    Applied InnoDB 5.1 snapshot ss787.
    
      r767:
      Remove dict_col_t::aux, which was only used when copying an index definition
      to the data dictionary cache.

  storage/innobase/include/eval0eval.ic@1.6, 2006-09-05 01:16:11+02:00, tsmith@maint1.mysql.com +2 -2
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/fut0lst.ic@1.5, 2006-09-05 01:16:11+02:00, tsmith@maint1.mysql.com +4 -4
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/ibuf0ibuf.ic@1.7, 2006-09-05 01:16:11+02:00, tsmith@maint1.mysql.com +4 -4
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/lock0lock.ic@1.5, 2006-09-05 01:16:11+02:00, tsmith@maint1.mysql.com +1 -1
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/log0log.ic@1.12, 2006-09-05 01:16:12+02:00, tsmith@maint1.mysql.com +10 -10
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/log0recv.h@1.15, 2006-09-05 01:16:12+02:00, tsmith@maint1.mysql.com +0 -26
    Applied InnoDB 5.1 snapshot ss787.
    
      r735:
      Remove all traces of the obsolete concept of replicate spaces.

  storage/innobase/include/mach0data.ic@1.10, 2006-09-05 01:16:12+02:00, tsmith@maint1.mysql.com +4 -32
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/mem0mem.ic@1.17, 2006-09-05 01:16:12+02:00, tsmith@maint1.mysql.com +16 -15
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/include/mtr0log.ic@1.11, 2006-09-05 01:16:12+02:00, tsmith@maint1.mysql.com +4 -4
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/mtr0mtr.h@1.15, 2006-09-05 01:16:12+02:00, tsmith@maint1.mysql.com +2 -1
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/os0file.h@1.46, 2006-09-05 01:16:12+02:00, tsmith@maint1.mysql.com +4 -2
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/page0cur.ic@1.8, 2006-09-05 01:16:12+02:00, tsmith@maint1.mysql.com +6 -6
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/page0page.ic@1.18, 2006-09-05 01:16:13+02:00, tsmith@maint1.mysql.com +48 -47
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r764:
      Split lines before an opening parenthesis, not after one.
    
      Replace some printf(...) in debug builds with fprintf(stderr, ...).

  storage/innobase/include/que0que.ic@1.7, 2006-09-05 01:16:13+02:00, tsmith@maint1.mysql.com +4 -4
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/read0read.ic@1.5, 2006-09-05 01:16:13+02:00, tsmith@maint1.mysql.com +3 -2
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/rem0cmp.ic@1.7, 2006-09-05 01:16:13+02:00, tsmith@maint1.mysql.com +5 -4
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/rem0rec.ic@1.26, 2006-09-05 01:16:13+02:00, tsmith@maint1.mysql.com +53 -49
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/include/row0mysql.h@1.49, 2006-09-05 01:16:13+02:00, tsmith@maint1.mysql.com +4 -3
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/row0purge.h@1.5, 2006-09-05 01:16:13+02:00, tsmith@maint1.mysql.com +2 -1
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/row0row.h@1.9, 2006-09-05 01:16:13+02:00, tsmith@maint1.mysql.com +3 -5
    Applied InnoDB 5.1 snapshot ss787.
    
      r777:
      Remove unused code.
    
      row_build(): Remove type==ROW_COPY_ALSO_EXTERNALS, because it is never
      passed.

  storage/innobase/include/row0row.ic@1.5, 2006-09-05 01:16:14+02:00, tsmith@maint1.mysql.com +5 -5
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/row0sel.h@1.11, 2006-09-05 01:16:14+02:00, tsmith@maint1.mysql.com +11 -9
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/row0sel.ic@1.7, 2006-09-05 01:16:14+02:00, tsmith@maint1.mysql.com +4 -4
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/row0undo.h@1.6, 2006-09-05 01:16:14+02:00, tsmith@maint1.mysql.com +2 -1
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/row0upd.ic@1.12, 2006-09-05 01:16:14+02:00, tsmith@maint1.mysql.com +3 -3
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/sync0rw.h@1.15, 2006-09-05 01:16:14+02:00, tsmith@maint1.mysql.com +2 -2
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/sync0rw.ic@1.15, 2006-09-05 01:16:14+02:00, tsmith@maint1.mysql.com +8 -8
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/sync0sync.h@1.27, 2006-09-05 01:16:15+02:00, tsmith@maint1.mysql.com +3 -2
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/sync0sync.ic@1.21, 2006-09-05 01:16:15+02:00, tsmith@maint1.mysql.com +36 -33
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/trx0rec.ic@1.4, 2006-09-05 01:16:15+02:00, tsmith@maint1.mysql.com +1 -1
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/trx0rseg.ic@1.8, 2006-09-05 01:16:15+02:00, tsmith@maint1.mysql.com +7 -5
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/include/trx0sys.ic@1.8, 2006-09-05 01:16:15+02:00, tsmith@maint1.mysql.com +16 -16
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/include/trx0trx.h@1.55, 2006-09-05 01:16:15+02:00, tsmith@maint1.mysql.com +5 -3
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/trx0trx.ic@1.6, 2006-09-05 01:16:15+02:00, tsmith@maint1.mysql.com +1 -1
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/trx0undo.h@1.9, 2006-09-05 01:16:15+02:00, tsmith@maint1.mysql.com +4 -4
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/trx0undo.ic@1.5, 2006-09-05 01:16:16+02:00, tsmith@maint1.mysql.com +4 -4
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/trx0xa.h@1.6, 2006-09-05 01:16:16+02:00, tsmith@maint1.mysql.com +2 -1
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/univ.i@1.55, 2006-09-05 01:16:16+02:00, tsmith@maint1.mysql.com +0 -2
    Applied InnoDB 5.1 snapshot ss787.
    
      r772:
      Merge changes from MySQL AB:
    
      ChangeSet
        2006/08/23 13:59:16-07:00 brian@zim.(none)Â·
        This patch removes need for a innodb to have its own configure.Â·
    
      univ.i: Replace ../ib_config.h with config.h.
    
      r777:
      Remove unused code.
    
      univ.i: Do not #define YYDEBUG, because it is only useful for debugging
      the grammar of the Bison-generated InnoDB SQL parser.

  storage/innobase/include/ut0byte.ic@1.7, 2006-09-05 01:16:16+02:00, tsmith@maint1.mysql.com +1 -1
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/include/ut0rnd.ic@1.7, 2006-09-05 01:16:17+02:00, tsmith@maint1.mysql.com +3 -4
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/lock/lock0lock.c@1.69, 2006-09-05 01:16:17+02:00, tsmith@maint1.mysql.com +297 -261
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r764:
      Split lines before an opening parenthesis, not after one.
    
      Replace some printf(...) in debug builds with fprintf(stderr, ...).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/log/log0log.c@1.52, 2006-09-05 01:16:17+02:00, tsmith@maint1.mysql.com +264 -234
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r764:
      Split lines before an opening parenthesis, not after one.
    
      Replace some printf(...) in debug builds with fprintf(stderr, ...).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/log/log0recv.c@1.60, 2006-09-05 01:16:18+02:00, tsmith@maint1.mysql.com +526 -640
    Applied InnoDB 5.1 snapshot ss787.
    
      r735:
      Remove all traces of the obsolete concept of replicate spaces.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r764:
      Split lines before an opening parenthesis, not after one.
    
      Replace some printf(...) in debug builds with fprintf(stderr, ...).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/mem/mem0dbg.c@1.22, 2006-09-05 01:16:18+02:00, tsmith@maint1.mysql.com +93 -58
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/mem/mem0mem.c@1.18, 2006-09-05 01:16:18+02:00, tsmith@maint1.mysql.com +2 -2
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/mem/mem0pool.c@1.24, 2006-09-05 01:16:18+02:00, tsmith@maint1.mysql.com +35 -25
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/mtr/mtr0log.c@1.14, 2006-09-05 01:16:18+02:00, tsmith@maint1.mysql.com +27 -21
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/mtr/mtr0mtr.c@1.13, 2006-09-05 01:16:18+02:00, tsmith@maint1.mysql.com +15 -13
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/os/os0file.c@1.121, 2006-09-05 01:16:19+02:00, tsmith@maint1.mysql.com +356 -275
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/os/os0proc.c@1.18, 2006-09-05 01:16:19+02:00, tsmith@maint1.mysql.com +131 -100
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/os/os0sync.c@1.31, 2006-09-05 01:16:19+02:00, tsmith@maint1.mysql.com +27 -24
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/os/os0thread.c@1.36, 2006-09-05 01:16:19+02:00, tsmith@maint1.mysql.com +19 -17
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/page/page0cur.c@1.28, 2006-09-05 01:16:19+02:00, tsmith@maint1.mysql.com +119 -105
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/page/page0page.c@1.33, 2006-09-05 01:16:19+02:00, tsmith@maint1.mysql.com +145 -119
    Applied InnoDB 5.1 snapshot ss787.
    
      r761:
      btr_cur_search_to_nth_level(): Document where cursor is left at in
      PAGE_CUR_LE searches.
    
      r762:
      page_validate(): Add missing space to error print, for real this time,
      following an error in r761.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r764:
      Split lines before an opening parenthesis, not after one.
    
      Replace some printf(...) in debug builds with fprintf(stderr, ...).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/pars/pars0opt.c@1.15, 2006-09-05 01:16:20+02:00, tsmith@maint1.mysql.com +59 -57
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/pars/pars0pars.c@1.20, 2006-09-05 01:16:20+02:00, tsmith@maint1.mysql.com +80 -83
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r764:
      Split lines before an opening parenthesis, not after one.
    
      Replace some printf(...) in debug builds with fprintf(stderr, ...).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/que/que0que.c@1.27, 2006-09-05 01:16:20+02:00, tsmith@maint1.mysql.com +23 -20
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/read/read0read.c@1.11, 2006-09-05 01:16:20+02:00, tsmith@maint1.mysql.com +27 -26
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/rem/rem0cmp.c@1.33, 2006-09-05 01:16:20+02:00, tsmith@maint1.mysql.com +71 -71
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r764:
      Split lines before an opening parenthesis, not after one.
    
      Replace some printf(...) in debug builds with fprintf(stderr, ...).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/rem/rem0rec.c@1.21, 2006-09-05 01:16:20+02:00, tsmith@maint1.mysql.com +81 -72
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/row/row0ins.c@1.81, 2006-09-05 01:16:20+02:00, tsmith@maint1.mysql.com +218 -210
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r764:
      Split lines before an opening parenthesis, not after one.
    
      Replace some printf(...) in debug builds with fprintf(stderr, ...).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/row/row0mysql.c@1.133, 2006-09-05 01:16:21+02:00, tsmith@maint1.mysql.com +663 -560
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r764:
      Split lines before an opening parenthesis, not after one.
    
      Replace some printf(...) in debug builds with fprintf(stderr, ...).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/row/row0purge.c@1.26, 2006-09-05 01:16:21+02:00, tsmith@maint1.mysql.com +33 -31
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/row/row0row.c@1.23, 2006-09-05 01:16:21+02:00, tsmith@maint1.mysql.com +37 -45
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.
    
      r777:
      Remove unused code.
    
      row_build(): Remove type==ROW_COPY_ALSO_EXTERNALS, because it is never
      passed.

  storage/innobase/row/row0sel.c@1.111, 2006-09-05 01:16:21+02:00, tsmith@maint1.mysql.com +442 -419
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r764:
      Split lines before an opening parenthesis, not after one.
    
      Replace some printf(...) in debug builds with fprintf(stderr, ...).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/row/row0uins.c@1.12, 2006-09-05 01:16:22+02:00, tsmith@maint1.mysql.com +9 -9
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/row/row0umod.c@1.23, 2006-09-05 01:16:22+02:00, tsmith@maint1.mysql.com +55 -57
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/row/row0undo.c@1.17, 2006-09-05 01:16:22+02:00, tsmith@maint1.mysql.com +13 -11
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/row/row0upd.c@1.45, 2006-09-05 01:16:22+02:00, tsmith@maint1.mysql.com +129 -129
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/row/row0vers.c@1.21, 2006-09-05 01:16:22+02:00, tsmith@maint1.mysql.com +38 -35
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/srv/srv0srv.c@1.102, 2006-09-05 01:16:22+02:00, tsmith@maint1.mysql.com +226 -182
    Applied InnoDB 5.1 snapshot ss787.
    
      r741:
      srv_master_thread(): Add OS_THREAD_DUMMY_RETURN to get rid of a compiler
      warning "no return value from a function returning non-void".
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r764:
      Split lines before an opening parenthesis, not after one.
    
      Replace some printf(...) in debug builds with fprintf(stderr, ...).
    
      r765:
      Split lines before binary operators, not after them.
    
      r780:
      Add a warning comment above the place where we set srv_main_thread_op_info
      to "waiting for server activity" that mentions that this string should not
      be changed.

  storage/innobase/srv/srv0start.c@1.98, 2006-09-05 01:16:23+02:00, tsmith@maint1.mysql.com +372 -272
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/sync/sync0arr.c@1.25, 2006-09-05 01:16:23+02:00, tsmith@maint1.mysql.com +44 -35
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/sync/sync0rw.c@1.24, 2006-09-05 01:16:23+02:00, tsmith@maint1.mysql.com +46 -41
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/sync/sync0sync.c@1.41, 2006-09-05 01:16:23+02:00, tsmith@maint1.mysql.com +73 -59
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/thr/thr0loc.c@1.11, 2006-09-05 01:16:23+02:00, tsmith@maint1.mysql.com +5 -5
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/trx/trx0purge.c@1.23, 2006-09-05 01:16:23+02:00, tsmith@maint1.mysql.com +80 -78
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/trx/trx0rec.c@1.26, 2006-09-05 01:16:23+02:00, tsmith@maint1.mysql.com +83 -72
    Applied InnoDB 5.1 snapshot ss787.
    
      r735:
      Remove all traces of the obsolete concept of replicate spaces.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/trx/trx0roll.c@1.33, 2006-09-05 01:16:24+02:00, tsmith@maint1.mysql.com +42 -36
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/trx/trx0rseg.c@1.9, 2006-09-05 01:16:24+02:00, tsmith@maint1.mysql.com +13 -14
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/trx/trx0sys.c@1.39, 2006-09-05 01:16:24+02:00, tsmith@maint1.mysql.com +214 -174
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/trx/trx0trx.c@1.67, 2006-09-05 01:16:24+02:00, tsmith@maint1.mysql.com +115 -97
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r764:
      Split lines before an opening parenthesis, not after one.
    
      Replace some printf(...) in debug builds with fprintf(stderr, ...).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/trx/trx0undo.c@1.27, 2006-09-05 01:16:24+02:00, tsmith@maint1.mysql.com +100 -98
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/ut/ut0byte.c@1.8, 2006-09-05 01:16:24+02:00, tsmith@maint1.mysql.com +1 -1
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/ut/ut0dbg.c@1.16, 2006-09-05 01:16:25+02:00, tsmith@maint1.mysql.com +10 -8
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r764:
      Split lines before an opening parenthesis, not after one.
    
      Replace some printf(...) in debug builds with fprintf(stderr, ...).

  storage/innobase/ut/ut0mem.c@1.32, 2006-09-05 01:16:25+02:00, tsmith@maint1.mysql.com +53 -39
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/ut/ut0ut.c@1.37, 2006-09-05 01:16:25+02:00, tsmith@maint1.mysql.com +41 -40
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).
    
      r765:
      Split lines before binary operators, not after them.

  storage/innobase/ut/ut0vec.c@1.2, 2006-09-05 01:16:25+02:00, tsmith@maint1.mysql.com +1 -1
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

  storage/innobase/ut/ut0wqueue.c@1.2, 2006-09-05 01:16:25+02:00, tsmith@maint1.mysql.com +1 -1
    Applied InnoDB 5.1 snapshot ss787.
    
      r763:
      Reindent the code base (except for ha_innodb.{cc,h} and generated parser
      and lexer files).

ChangeSet@1.1810.2095.1, 2006-09-04 18:16:12+00:00, lzhou@dev3-138.dev.cn.tlan +4 -0
  #BUG21128 add function of get_cluster_loglever().

  ndb/include/mgmapi/mgmapi.h@1.42.10.1, 2006-09-04 18:16:09+00:00, lzhou@dev3-138.dev.cn.tlan +14 -0
    add one function 

  ndb/src/mgmapi/mgmapi.cpp@1.44.24.1, 2006-09-04 18:16:09+00:00, lzhou@dev3-138.dev.cn.tlan +39 -0
    add one function to get cluster loglevel

  ndb/src/mgmsrv/Services.cpp@1.45.29.1, 2006-09-04 18:16:09+00:00, lzhou@dev3-138.dev.cn.tlan +27 -0
    addn one function to deal with get log level

  ndb/src/mgmsrv/Services.hpp@1.13.6.1, 2006-09-04 18:16:09+00:00, lzhou@dev3-138.dev.cn.tlan +2 -0
    add getClusterLogLevel() function define

ChangeSet@1.1616.2737.2, 2006-09-04 18:40:30+03:00, gkodinov@macbook.gmz +5 -0
  Bug #21392: multi-table delete with alias table name fails with
              1003: Incorrect table name
  in multi-table DELETE the set of tables to delete from actually 
  references then tables in the other list, e.g:
  DELETE alias_of_t1 FROM t1 alias_of_t1 WHERE ....
  is a valid statement.
  So we must turn off table name syntactical validity check for alias_of_t1 
  because it's not a table name (even if it looks like one).
  In order to do that we add a special flag (TL_OPTION_ALIAS) to 
  disable the name checking for the aliases in multi-table DELETE.

  mysql-test/r/delete.result@1.21.1.1, 2006-09-04 18:40:20+03:00, gkodinov@macbook.gmz +4 -0
    Bug #21392: multi-table delete with alias table name fails with
                1003: Incorrect table name
     - test case

  mysql-test/t/delete.test@1.19.1.2, 2006-09-04 18:40:20+03:00, gkodinov@macbook.gmz +10 -0
    Bug #21392: multi-table delete with alias table name fails with
                1003: Incorrect table name
     - test case

  sql/mysql_priv.h@1.186.106.1, 2006-09-04 18:40:21+03:00, gkodinov@macbook.gmz +1 -0
    Bug #21392: multi-table delete with alias table name fails with
                1003: Incorrect table name
     - add a special flag to disable the name checking for the aliases
       in multi-table DELETE

  sql/sql_parse.cc@1.271.127.1, 2006-09-04 18:40:22+03:00, gkodinov@macbook.gmz +3 -1
    Bug #21392: multi-table delete with alias table name fails with
                1003: Incorrect table name
     - add a special flag to disable the name checking for the aliases
       in multi-table DELETE

  sql/sql_yacc.yy@1.203.128.1, 2006-09-04 18:40:23+03:00, gkodinov@macbook.gmz +5 -2
    Bug #21392: multi-table delete with alias table name fails with
                1003: Incorrect table name
     - add a special flag to disable the name checking for the aliases
       in multi-table DELETE

ChangeSet@1.1616.2753.1, 2006-09-04 19:47:24+05:00, holyfoot@mysql.com +2 -0
  bug #12620 (UTF-8 indexing causes ER_NO_KEYFILE error)
  
  The problem is that on some Mac OS X-es the file writing/reading
  call with zero bytes to read/write returns error.
  So here i try to eliminate that kinds of calls.

  mysys/my_chsize.c@1.15.1.1, 2006-09-04 19:47:21+05:00, holyfoot@mysql.com +3 -1
    no file operations if it's not necessary

  myisam/mi_check.c@1.105.1.54, 2006-09-04 19:47:21+05:00, holyfoot@mysql.com +6 -3
    zero length copying avoided

ChangeSet@1.1810.2093.1, 2006-09-04 16:33:56+02:00, hartmut@mysql.com +14 -0
  added print_defaults() calls to --help output for all binaries (Bug #21994)

  ndb/src/cw/cpcd/main.cpp@1.7.4.1, 2006-09-04 16:33:53+02:00, hartmut@mysql.com +2 -0
    added print_defaults() calls to --help output for all binaries

  ndb/src/kernel/vm/Configuration.cpp@1.39.8.1, 2006-09-04 16:33:53+02:00, hartmut@mysql.com +4 -1
    added print_defaults() calls to --help output for all binaries

  ndb/src/mgmclient/main.cpp@1.20.4.1, 2006-09-04 16:33:53+02:00, hartmut@mysql.com +3 -1
    added print_defaults() calls to --help output for all binaries

  ndb/src/mgmsrv/main.cpp@1.41.7.1, 2006-09-04 16:33:53+02:00, hartmut@mysql.com +3 -1
    added print_defaults() calls to --help output for all binaries

  ndb/tools/delete_all.cpp@1.16.3.1, 2006-09-04 16:33:53+02:00, hartmut@mysql.com +4 -1
    added print_defaults() calls to --help output for all binaries

  ndb/tools/desc.cpp@1.18.2.1, 2006-09-04 16:33:53+02:00, hartmut@mysql.com +5 -1
    added print_defaults() calls to --help output for all binaries

  ndb/tools/drop_index.cpp@1.13.3.1, 2006-09-04 16:33:53+02:00, hartmut@mysql.com +5 -1
    added print_defaults() calls to --help output for all binaries

  ndb/tools/drop_tab.cpp@1.14.1.1, 2006-09-04 16:33:53+02:00, hartmut@mysql.com +6 -2
    added print_defaults() calls to --help output for all binaries

  ndb/tools/listTables.cpp@1.20.3.1, 2006-09-04 16:33:53+02:00, hartmut@mysql.com +4 -1
    added print_defaults() calls to --help output for all binaries

  ndb/tools/ndb_config.cpp@1.4.7.2, 2006-09-04 16:33:53+02:00, hartmut@mysql.com +4 -1
    added print_defaults() calls to --help output for all binaries

  ndb/tools/restore/restore_main.cpp@1.29.8.1, 2006-09-04 16:33:53+02:00, hartmut@mysql.com +4 -1
    added print_defaults() calls to --help output for all binaries

  ndb/tools/select_all.cpp@1.22.1.1, 2006-09-04 16:33:53+02:00, hartmut@mysql.com +4 -1
    added print_defaults() calls to --help output for all binaries

  ndb/tools/select_count.cpp@1.19.1.1, 2006-09-04 16:33:53+02:00, hartmut@mysql.com +5 -1
    added print_defaults() calls to --help output for all binaries

  ndb/tools/waiter.cpp@1.23.2.1, 2006-09-04 16:33:53+02:00, hartmut@mysql.com +5 -1
    added print_defaults() calls to --help output for all binaries

ChangeSet@1.1616.2735.20, 2006-09-04 16:53:03+03:00, timour@lamia.home +1 -0
  BUG#21787: COUNT(*) + ORDER BY + LIMIT returns wrong result
  
  Fix an error in the bug fix.

  sql/sql_select.cc@1.216.125.7, 2006-09-04 16:53:01+03:00, timour@lamia.home +8 -7
    Use a local variable to iterate over group items, since
    'group' is used later in a condition.

ChangeSet@1.2270.2.23, 2006-09-04 14:26:18+02:00, jonas@perch.ndb.mysql.com +1 -0
  bug#21965
      merge to 5.1 - yet another merge fix

  sql/log.cc@1.223.1.2, 2006-09-04 14:26:16+02:00, jonas@perch.ndb.mysql.com +1 -1
    yet another merge fix

ChangeSet@1.2270.2.22, 2006-09-04 14:19:39+02:00, jonas@perch.ndb.mysql.com +1 -0
  bug#21965
    merge to 5.1

  sql/log.h@1.14, 2006-09-04 14:19:37+02:00, jonas@perch.ndb.mysql.com +1 -0
    merge to 5.1

ChangeSet@1.1616.2712.13, 2006-09-04 13:43:34+02:00, jonas@perch.ndb.mysql.com +3 -0
  bug#21965 - replication
    fix deadlock if master switches log file in parallell with "show master logs"
    

  sql/log.cc@1.108.8.1, 2006-09-04 13:43:32+02:00, jonas@perch.ndb.mysql.com +7 -2
    add raw_get_current_log which dont take log mutex

  sql/sql_class.h@1.146.57.1, 2006-09-04 13:43:32+02:00, jonas@perch.ndb.mysql.com +1 -0
    add raw_get_current_log which dont take log mutex

  sql/sql_repl.cc@1.102.1.36, 2006-09-04 13:43:32+02:00, jonas@perch.ndb.mysql.com +6 -2
    Fix lock order i.e first log_lock then index_lock

ChangeSet@1.1810.2078.7, 2006-09-04 11:30:04+02:00, msvensson@neptunus.(none) +1 -0
  Fix problem where mysql-test-run.pl fails to start up the mysqld after a failed test. Shows up on win hosts where one failed test case make subsequent ones fails with error "Could not open connection 'default': 2003 Can't connect to MySQL server on 'localhost'" 

  mysql-test/lib/mtr_process.pl@1.25.3.1, 2006-09-04 11:30:02+02:00, msvensson@neptunus.(none) +3 -0
    Reset the associated "pid" of masters and slave when building the list of processes to shutdown.

ChangeSet@1.1616.2751.1, 2006-09-04 09:13:40+02:00, tnurnberg@salvation.intern.azundris.com +3 -0
  Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
  
  Variable character_set_results can legally be NULL (for "no conversion.")
  This could result in a NULL deref that crashed the server.  Fixed.
  
  (Although ran some additional precursory tests to see whether I could break
  anything else, but no breakage so far.)

  mysql-test/r/func_time.result@1.23.7.1, 2006-09-04 09:13:37+02:00, tnurnberg@salvation.intern.azundris.com +12 -0
    Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
    
    Prove DATE_FORMAT() no longer crashes the server when character_set_results is
    NULL (which is a legal value and means, "no conversion").

  mysql-test/t/func_time.test@1.21.6.1, 2006-09-04 09:13:37+02:00, tnurnberg@salvation.intern.azundris.com +18 -0
    Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
    
    Prove DATE_FORMAT() no longer crashes the server when character_set_results is
    NULL (which is a legal value and means, "no conversion").

  sql/sql_string.cc@1.77.3.1, 2006-09-04 09:13:37+02:00, tnurnberg@salvation.intern.azundris.com +6 -1
    Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
    
    Avoid NULL deref in my_charset_same() -- if !to_cs, we won't need to compare
    because it is magic for, "no conversion."

ChangeSet@1.1616.2750.1, 2006-09-04 06:16:34+02:00, tnurnberg@salvation.intern.azundris.com +3 -0
  Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
  
  Variable character_set_results can legally be NULL (for "no conversion.")
  This could result in a NULL deref that crashed the server.  Fixed.
  
  (Although ran some additional precursory tests to see whether I could break
  anything else, but no breakage so far.)

  mysql-test/r/func_time.result@1.23.4.5, 2006-09-04 06:16:28+02:00, tnurnberg@salvation.intern.azundris.com +12 -0
    Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
    
    Prove DATE_FORMAT() no longer crashes the server when character_set_results is
    NULL (which is a legal value and means, "no conversion").

  mysql-test/t/func_time.test@1.21.3.5, 2006-09-04 06:16:28+02:00, tnurnberg@salvation.intern.azundris.com +18 -0
    Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
    
    Prove DATE_FORMAT() no longer crashes the server when character_set_results is
    NULL (which is a legal value and means, "no conversion").

  sql/sql_string.cc@1.77.1.18, 2006-09-04 06:16:28+02:00, tnurnberg@salvation.intern.azundris.com +6 -1
    Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
    
    Avoid NULL deref in my_charset_same() -- if !to_cs, we won't need to compare
    because it is magic for, "no conversion."

ChangeSet@1.2285, 2006-09-04 09:43:47+08:00, gni@dev3-127.(none) +1 -0
  recovery

  mysql-test/r/ctype_utf8.result@1.101, 2006-09-04 09:43:45+08:00, gni@dev3-127.(none) +16 -0
    recovery

ChangeSet@1.2273.15.1, 2006-09-03 16:13:59+02:00, pekka@orca.ndb.mysql.com +3 -0
  ndb - bug#21754 ndb api events: fix sizes for blobs + remove expensive loop

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.70, 2006-09-03 16:09:36+02:00, pekka@orca.ndb.mysql.com +125 -46
    1. fix list size info to account for blobs and merges so that cleanups and reports trigger as intended
    2. remove big poorly-local loop from free_list which affected also non-blob tables (1. was needed for this)

  storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp@1.30, 2006-09-03 16:09:36+02:00, pekka@orca.ndb.mysql.com +79 -31
    1. fix list size info to account for blobs and merges so that cleanups and reports trigger as intended
    2. remove big poorly-local loop from free_list which affected also non-blob tables (1. was needed for this)

  storage/ndb/test/ndbapi/test_event_merge.cpp@1.14, 2006-09-03 15:47:26+02:00, pekka@orca.ndb.mysql.com +36 -25
    minor

ChangeSet@1.2273.14.2, 2006-09-03 11:11:37+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb -
    fix ndb-violations of strict aliasing found by gcc4.1
    (crashes in ndb_dd_*)

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.101, 2006-09-03 11:11:35+02:00, jonas@perch.ndb.mysql.com +2 -2
    Fix strict-aliasing

  storage/ndb/src/kernel/vm/KeyTable2Ref.hpp@1.2, 2006-09-03 11:11:35+02:00, jonas@perch.ndb.mysql.com +18 -4
    Fix strict-aliasing

  storage/ndb/src/kernel/vm/Pool.hpp@1.8, 2006-09-03 11:11:35+02:00, jonas@perch.ndb.mysql.com +4 -1
    Fix strict-aliasing

ChangeSet@1.2273.14.1, 2006-09-03 10:57:34+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    gcc-4.1.1 work-around for bug in strict-aliasing

  storage/ndb/src/kernel/blocks/restore.cpp@1.8, 2006-09-03 10:57:32+02:00, jonas@perch.ndb.mysql.com +19 -21
    gcc-4.1.1 work-around for bug in strict-aliasing

ChangeSet@1.2255.51.22, 2006-09-02 13:30:37+02:00, cmiller@maint1.mysql.com +1 -0
  mysql-test-run.pl:
    'reorder' default off until test cases fixed.

  mysql-test/mysql-test-run.pl@1.162.1.3, 2006-09-02 13:29:51+02:00, cmiller@maint1.mysql.com +1 -1
    'reorder' default off until test cases fixed.

ChangeSet@1.1810.2028.2, 2006-09-01 21:53:23+02:00, cmiller@maint1.mysql.com +1 -0
  mtr_cases.pl:
    Provide a more extensible, easier-to-change way of reordering
    test cases.

  mysql-test/lib/mtr_cases.pl@1.12.1.7, 2006-09-01 21:49:08+02:00, cmiller@maint1.mysql.com +31 -27
    Provide a more extensible, easier-to-change way of reordering
    test cases.

ChangeSet@1.1810.2071.9, 2006-09-01 23:11:45+04:00, anozdrin@alik. +1 -0
  Trivial fix: pid file must exist when kill_n_check.sh is started.

  mysql-test/t/kill_n_check.sh@1.4, 2006-09-01 23:11:43+04:00, anozdrin@alik. +1 -1
    Trivial fix: pid file must exist when kill_n_check.sh is started.

ChangeSet@1.2273.12.3, 2006-09-01 20:56:34+02:00, mskold@mysql.com +1 -0
  Added missing return

  storage/ndb/src/ndbapi/ndb_cluster_connection.cpp@1.44, 2006-09-01 20:56:12+02:00, mskold@mysql.com +1 -1
    Added missing return

ChangeSet@1.2255.77.1, 2006-09-01 10:39:48-07:00, jimw@rama.(none) +3 -0
  Bug #19874: SHOW COLUMNS and SHOW KEYS handle identifiers containing \ incorrectly
  
    Identifiers with embedded escape characters were not handled correctly by
    some SHOW statements due to some old code that was doing some extra unescaping.

  mysql-test/r/show_check.result@1.103, 2006-09-01 10:39:45-07:00, jimw@rama.(none) +15 -0
    Add new results

  mysql-test/t/show_check.test@1.68, 2006-09-01 10:39:46-07:00, jimw@rama.(none) +13 -0
    Add new regression test

  sql/sql_parse.cc@1.567.4.1, 2006-09-01 10:39:46-07:00, jimw@rama.(none) +0 -36
    Remove remove_escape() -- it is not actually necessary, and now harmful because
    identifiers may include escape characters.

ChangeSet@1.2255.73.6, 2006-09-01 16:56:46+02:00, msvensson@neptunus.(none) +1 -0
  Turn on reorder as default.

  mysql-test/mysql-test-run.pl@1.162.1.2, 2006-09-01 16:56:44+02:00, msvensson@neptunus.(none) +1 -1
    Turn on reorder as default.

ChangeSet@1.1810.2085.5, 2006-09-01 16:55:35+02:00, georg@lmy002.wdf.sap.corp +1 -0
  included make_win_bin_dist (required for pushbuild) into distribution (make dist)

  scripts/Makefile.am@1.43.1.9, 2006-09-01 16:55:30+02:00, georg@lmy002.wdf.sap.corp +2 -1
    included make_win_bin_dist (required for pushbuild) into distribution (make dist)

ChangeSet@1.2255.73.5, 2006-09-01 16:51:37+02:00, msvensson@neptunus.(none) +4 -0
  Move test that requires innodb to "mysql_innodb"

  mysql-test/t/innodb_mysql.test@1.7.2.1, 2006-09-01 16:51:35+02:00, msvensson@neptunus.(none) +37 -0
    Move test that requires innodb to "mysql_innodb"

  mysql-test/r/auto_increment.result@1.47, 2006-09-01 16:51:35+02:00, msvensson@neptunus.(none) +0 -46
    Move test that requires innodb to "mysql_innodb"

  mysql-test/r/innodb_mysql.result@1.7.2.1, 2006-09-01 16:51:35+02:00, msvensson@neptunus.(none) +46 -0
    Move test that requires innodb to "mysql_innodb"

  mysql-test/t/auto_increment.test@1.29, 2006-09-01 16:51:35+02:00, msvensson@neptunus.(none) +0 -36
    Move test that requires innodb to "mysql_innodb"

ChangeSet@1.1810.2071.8, 2006-09-01 18:21:19+04:00, anozdrin@alik. +1 -0
  Fix typo, which prevents test suite from correct cleanup.

  mysql-test/lib/mtr_process.pl@1.25.2.8, 2006-09-01 18:21:18+04:00, anozdrin@alik. +5 -6
    Fix typo, which prevents test suite from correct cleanup.

ChangeSet@1.1810.2071.7, 2006-09-01 18:20:33+04:00, anozdrin@alik. +3 -0
  Fix for BUG#12751: Instance Manager: client hangs after
  start instance; kill mysqlmanager; show ...
  
  The problem was that Instance Manager didn't close client
  sockets (sockets for client connections) on execing mysqld
  instance. So, mysqld-instance inherits these descriptors.
  
  The fix is to set close-on-exec flag for each client socket.

  mysql-test/r/im_daemon_life_cycle.result@1.2.1.4, 2006-09-01 18:20:31+04:00, anozdrin@alik. +14 -0
    Updated result file.

  mysql-test/t/im_daemon_life_cycle.imtest@1.1.1.4, 2006-09-01 18:20:31+04:00, anozdrin@alik. +44 -0
    Test for BUG#12751.

  server-tools/instance-manager/listener.cc@1.24.1.2, 2006-09-01 18:20:31+04:00, anozdrin@alik. +23 -19
    Set close-on-exec flag for each client socket.

ChangeSet@1.2255.67.3, 2006-09-01 16:14:59+02:00, mskold@mysql.com +4 -0
  Removed absolute path

  mysql-test/r/ndbapi.result@1.2, 2006-09-01 16:14:38+02:00, mskold@mysql.com +7 -7
    Removed absolute path

  mysql-test/r/rpl_ndbapi_multi.result@1.2, 2006-09-01 16:14:38+02:00, mskold@mysql.com +2 -1
    Removed absolute path

  mysql-test/t/ndbapi.test@1.2, 2006-09-01 16:14:38+02:00, mskold@mysql.com +8 -8
    Removed absolute path

  mysql-test/t/rpl_ndbapi_multi.test@1.2, 2006-09-01 16:14:38+02:00, mskold@mysql.com +2 -1
    Removed absolute path

ChangeSet@1.1810.2085.4, 2006-09-01 16:04:59+02:00, georg@lmy002.wdf.sap.corp +1 -0
  Modification for win subdirectory

  configure.in@1.245.58.5, 2006-09-01 16:04:54+02:00, georg@lmy002.wdf.sap.corp +1 -1
    added win subdir

ChangeSet@1.2255.67.2, 2006-09-01 15:14:50+02:00, mskold@mysql.com +28 -0
  Fixed ndbapi-examples, and added tests for mysql-test-run.pl

  mysql-test/include/have_ndbapi_examples.inc@1.1, 2006-09-01 15:09:29+02:00, mskold@mysql.com +4 -0
    BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/mysql-test/include/have_ndbapi_examples.inc

  mysql-test/include/have_ndbapi_examples.inc@1.0, 2006-09-01 15:09:29+02:00, mskold@mysql.com +0 -0

  mysql-test/mysql-test-run.pl@1.150.4.1, 2006-09-01 15:14:09+02:00, mskold@mysql.com +24 -0
    Fixed ndbapi-examples, and added tests for mysql-test-run.pl

  mysql-test/r/have_ndbapi_examples.require@1.1, 2006-09-01 15:10:30+02:00, mskold@mysql.com +2 -0
    BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/mysql-test/r/have_ndbapi_examples.require

  mysql-test/r/have_ndbapi_examples.require@1.0, 2006-09-01 15:10:30+02:00, mskold@mysql.com +0 -0

  mysql-test/r/ndbapi.result@1.1, 2006-09-01 15:10:47+02:00, mskold@mysql.com +22 -0
    BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/mysql-test/r/ndbapi.result

  mysql-test/r/ndbapi.result@1.0, 2006-09-01 15:10:47+02:00, mskold@mysql.com +0 -0

  mysql-test/r/rpl_ndbapi_multi.result@1.1, 2006-09-01 15:11:03+02:00, mskold@mysql.com +7 -0
    BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/mysql-test/r/rpl_ndbapi_multi.result

  mysql-test/r/rpl_ndbapi_multi.result@1.0, 2006-09-01 15:11:03+02:00, mskold@mysql.com +0 -0

  mysql-test/t/ndbapi.test@1.1, 2006-09-01 15:09:51+02:00, mskold@mysql.com +44 -0
    BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/mysql-test/t/ndbapi.test

  mysql-test/t/ndbapi.test@1.0, 2006-09-01 15:09:51+02:00, mskold@mysql.com +0 -0

  mysql-test/t/rpl_ndbapi_multi.test@1.1, 2006-09-01 15:10:04+02:00, mskold@mysql.com +10 -0
    BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/mysql-test/t/rpl_ndbapi_multi.test

  mysql-test/t/rpl_ndbapi_multi.test@1.0, 2006-09-01 15:10:04+02:00, mskold@mysql.com +0 -0

  storage/ndb/ndbapi-examples/Makefile@1.10, 2006-09-01 15:14:09+02:00, mskold@mysql.com +3 -1
    Fixed ndbapi-examples, and added tests for mysql-test-run.pl

  storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile@1.2, 2006-09-01 15:14:09+02:00, mskold@mysql.com +1 -0
    Fixed ndbapi-examples, and added tests for mysql-test-run.pl

  storage/ndb/ndbapi-examples/mgmapi_logevent/mgmapi_logevent.cpp@1.2, 2006-09-01 15:14:09+02:00, mskold@mysql.com +18 -4
    Fixed ndbapi-examples, and added tests for mysql-test-run.pl

  storage/ndb/ndbapi-examples/mgmapi_logevent_dual/Makefile@1.1, 2006-09-01 15:08:42+02:00, mskold@mysql.com +24 -0
    BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/storage/ndb/ndbapi-examples/mgmapi_logevent_dual/Makefile

  storage/ndb/ndbapi-examples/mgmapi_logevent_dual/Makefile@1.0, 2006-09-01 15:08:42+02:00, mskold@mysql.com +0 -0

  storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent_dual.cpp@1.1, 2006-09-01 15:08:56+02:00, mskold@mysql.com +225 -0
    BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent_dual.cpp

  storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent_dual.cpp@1.0, 2006-09-01 15:08:56+02:00, mskold@mysql.com +0 -0

  storage/ndb/ndbapi-examples/ndbapi_async/Makefile@1.2, 2006-09-01 15:14:09+02:00, mskold@mysql.com +1 -0
    Fixed ndbapi-examples, and added tests for mysql-test-run.pl

  storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async.cpp@1.2, 2006-09-01 15:14:09+02:00, mskold@mysql.com +41 -25
    Fixed ndbapi-examples, and added tests for mysql-test-run.pl

  storage/ndb/ndbapi-examples/ndbapi_async1/Makefile@1.2, 2006-09-01 15:14:09+02:00, mskold@mysql.com +3 -2
    Fixed ndbapi-examples, and added tests for mysql-test-run.pl

  storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1.cpp@1.2, 2006-09-01 15:14:10+02:00, mskold@mysql.com +68 -13
    Fixed ndbapi-examples, and added tests for mysql-test-run.pl

  storage/ndb/ndbapi-examples/ndbapi_event/Makefile@1.4, 2006-09-01 15:14:10+02:00, mskold@mysql.com +1 -0
    Fixed ndbapi-examples, and added tests for mysql-test-run.pl

  storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp@1.5, 2006-09-01 15:14:10+02:00, mskold@mysql.com +13 -6
    Fixed ndbapi-examples, and added tests for mysql-test-run.pl

  storage/ndb/ndbapi-examples/ndbapi_retries/Makefile@1.2, 2006-09-01 15:14:10+02:00, mskold@mysql.com +3 -2
    Fixed ndbapi-examples, and added tests for mysql-test-run.pl

  storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries.cpp@1.2, 2006-09-01 15:14:10+02:00, mskold@mysql.com +61 -6
    Fixed ndbapi-examples, and added tests for mysql-test-run.pl

  storage/ndb/ndbapi-examples/ndbapi_scan/Makefile@1.2, 2006-09-01 15:14:10+02:00, mskold@mysql.com +1 -0
    Fixed ndbapi-examples, and added tests for mysql-test-run.pl

  storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan.cpp@1.2, 2006-09-01 15:14:10+02:00, mskold@mysql.com +31 -11
    Fixed ndbapi-examples, and added tests for mysql-test-run.pl

  storage/ndb/ndbapi-examples/ndbapi_simple/Makefile@1.2, 2006-09-01 15:14:10+02:00, mskold@mysql.com +1 -0
    Fixed ndbapi-examples, and added tests for mysql-test-run.pl

  storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple.cpp@1.2, 2006-09-01 15:14:10+02:00, mskold@mysql.com +24 -6
    Fixed ndbapi-examples, and added tests for mysql-test-run.pl

  storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile@1.1, 2006-09-01 15:08:03+02:00, mskold@mysql.com +24 -0
    BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile

  storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile@1.0, 2006-09-01 15:08:03+02:00, mskold@mysql.com +0 -0

  storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual.cpp@1.1, 2006-09-01 15:08:15+02:00, mskold@mysql.com +348 -0
    BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual.cpp

  storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual.cpp@1.0, 2006-09-01 15:08:15+02:00, mskold@mysql.com +0 -0

  storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile@1.2, 2006-09-01 15:14:10+02:00, mskold@mysql.com +1 -0
    Fixed ndbapi-examples, and added tests for mysql-test-run.pl

  storage/ndb/ndbapi-examples/ndbapi_simple_index/ndbapi_simple_index.cpp@1.2, 2006-09-01 15:14:10+02:00, mskold@mysql.com +11 -4
    Fixed ndbapi-examples, and added tests for mysql-test-run.pl

ChangeSet@1.1810.2085.3, 2006-09-01 14:34:37+02:00, georg@lmy002.wdf.sap.corp +8 -0
  Fixes for crashes and test failures

  scripts/make_win_bin_dist@1.1, 2006-09-01 14:30:56+02:00, georg@lmy002.wdf.sap.corp +345 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/scripts/make_win_bin_dist

  scripts/make_win_bin_dist@1.0, 2006-09-01 14:30:56+02:00, georg@lmy002.wdf.sap.corp +0 -0

  client/mysqlbinlog.cc@1.123.1.6, 2006-09-01 14:34:32+02:00, georg@lmy002.wdf.sap.corp +2 -3
    Fix for cmake build: Cmake doesn't use the VC++ files

  extra/comp_err.c@1.23.1.1, 2006-09-01 14:34:32+02:00, georg@lmy002.wdf.sap.corp +2 -1
    fixed windows crash (debug): We can't call DBUG_RETURN after my_end.

  include/my_dbug.h@1.16.2.2, 2006-09-01 14:34:32+02:00, georg@lmy002.wdf.sap.corp +1 -0
    added missing empty define for DBUG_LEAVE to prevent precompiler errors when
    compiling in non_debug mode

  mysql-test/mysql-test-run.pl@1.30.1.82, 2006-09-01 14:34:32+02:00, georg@lmy002.wdf.sap.corp +26 -9
    Added support for new cmake release and debug paths.

  mysql-test/t/system_mysql_db_fix.test@1.17.1.2, 2006-09-01 14:34:32+02:00, georg@lmy002.wdf.sap.corp +3 -0
    This test requires unix shell script mysql_fix_previleges_tables -> skip under windows

  mysys/my_seek.c@1.11.1.1, 2006-09-01 14:34:32+02:00, georg@lmy002.wdf.sap.corp +2 -1
    Fix for windows debug crash. However this solution is bad: we should never
    call lseek with an invalid file pointer.

  sql/ha_archive.cc@1.60.4.1, 2006-09-01 14:34:32+02:00, georg@lmy002.wdf.sap.corp +1 -1
    Fixed windows crash: We need dup in gzdopen to keep the filehandle open,
    otherwise subsequent calls to mysql_close will fail/crash.

ChangeSet@1.1810.2073.6, 2006-09-01 20:32:45+08:00, gni@dev3-127.(none) +1 -0
  restore

  mysql-test/r/ctype_utf8.result@1.85.1.11, 2006-09-01 20:32:43+08:00, gni@dev3-127.(none) +16 -0
    restore 

ChangeSet@1.2255.25.16, 2006-09-01 14:25:29+02:00, andrey@example.com +4 -0
  remove unused artifacts

  sql/event_db_repository.cc@1.17, 2006-09-01 14:25:24+02:00, andrey@example.com +0 -4
    remove unused variables - reported by MS compiler

  sql/event_queue.cc@1.14, 2006-09-01 14:25:24+02:00, andrey@example.com +1 -5
    remove unused variables - reported by MS compiler

  sql/event_scheduler.cc@1.26, 2006-09-01 14:25:24+02:00, andrey@example.com +0 -1
    remove unused label

  sql/events.cc@1.64, 2006-09-01 14:25:25+02:00, andrey@example.com +0 -2
    remove unused variable and a label - reported by MS compiler

ChangeSet@1.2255.25.15, 2006-09-01 14:15:47+02:00, andrey@example.com +1 -0
  fix build failure on SLES9

  sql/event_scheduler.cc@1.25, 2006-09-01 14:15:41+02:00, andrey@example.com +1 -1
    fix build failure on SLES9

ChangeSet@1.2255.25.14, 2006-09-01 14:08:50+02:00, andrey@example.com +2 -0
  post-merge fix

  sql/event_scheduler.cc@1.24, 2006-09-01 14:08:41+02:00, andrey@example.com +1 -1
    fix typo

  sql/events.cc@1.63, 2006-09-01 14:08:41+02:00, andrey@example.com +1 -3
    This check is not needed since UNINITIALIZED state was introduced
    in the Event_scheduler

ChangeSet@1.1616.2749.1, 2006-09-01 15:07:04+03:00, timour@lamia.home +3 -0
  Fix for BUG#21787: COUNT(*) + ORDER BY + LIMIT returns wrong result
    
  The problem was due to a prior fix for BUG 9676, which limited
  the rows stored in a temporary table to the LIMIT clause. This
  optimization is not applicable to non-group queries with aggregate
  functions. The fix disables the optimization in this case.

  mysql-test/r/limit.result@1.7.1.2, 2006-09-01 15:07:02+03:00, timour@lamia.home +14 -0
    Test case for BUG#21787

  mysql-test/t/limit.test@1.7.1.3, 2006-09-01 15:07:02+03:00, timour@lamia.home +10 -0
    Test case for BUG#21787

  sql/sql_select.cc@1.216.134.1, 2006-09-01 15:07:02+03:00, timour@lamia.home +14 -5
    If there is an aggregate function in a non-group query,
    materialize all rows in the temporary table no matter if
    there is a LIMIT clause. This is necessary, since the
    aggregate functions must be computed over all result rows,
    not just the first LIMIT rows.

ChangeSet@1.1810.2042.27, 2006-09-01 13:53:43+02:00, msvensson@neptunus.(none) +1 -0
  Fix problem with windows where stderr is not flushed until end of program.

  client/mysqldump.c@1.214.1.27, 2006-09-01 13:53:41+02:00, msvensson@neptunus.(none) +1 -0
    fflush stderr after writing to it.

ChangeSet@1.1810.2088.1, 2006-09-01 04:23:04-07:00, igor@rurik.mysql.com +5 -0
  Fixed bug #16081: row equalities were not taken into
  account by the optimizer.
  Now all row equalities are converted into conjunctions of
  equalities between row elements. They are taken into account
  by the optimizer together with the original regular equality
  predicates.

  mysql-test/r/join_outer.result@1.44.1.8, 2006-09-01 04:22:57-07:00, igor@rurik.mysql.com +1 -1
    Adjusted results after fix for bug #16081.

  mysql-test/r/row.result@1.23.1.1, 2006-09-01 04:22:57-07:00, igor@rurik.mysql.com +125 -0
    Added a test cases for bug #16081.

  mysql-test/t/row.test@1.21, 2006-09-01 04:22:57-07:00, igor@rurik.mysql.com +47 -0
    Added a test cases for bug #16081.

  sql/sql_list.h@1.39.1.1, 2006-09-01 04:22:57-07:00, igor@rurik.mysql.com +3 -3
    Corrected the copy constructor for the class base_list.
    The previous implementation resulted in creation of an
    inconsistent base_list if the source list was empty.

  sql/sql_select.cc@1.312.89.1, 2006-09-01 04:22:57-07:00, igor@rurik.mysql.com +304 -152
    Fixed bug #16081: row equalities were not taken into
    account by the optimizer.
    Now all row equalities are converted into conjunctions of
    equalities between row elements. They are taken into account
    by the optimizer together with the original regular equality
    predicates.

ChangeSet@1.2255.76.1, 2006-09-01 13:08:44+02:00, andrey@example.com +19 -0
  WL#3337 (Event scheduler new architecture)
  This is a post-review patch.
  
  Fixes the typelib implementation, available only in 5.1.11.
  
  --event-scheduler cmdline : DISABLED | ON | OFF | 0 | 1
  DISABLED - makes the scheduler unavailable during the server run
  (ON|1)-  When the server is started the scheduler will be started. It can
           be stopped and restarted by setting appropriate values to
           GLOBAL event_scheduler
  (OFF|0)- When the server is started, the scheduler won't be started. It
           can be started and again stopped by setting appropriate values to
           GLOBAL event_scheduler. _DEFAULT_ value
  
  The GLOBAL variable event_scheduler can have the following values:
  OFF | ON | 0 | 1
  DISABLED is not possible and every attempt will end with an error that
  it's not a valid value for the variable.
  OFF | 0 - This is the pre-5.1.11 behavior - The scheduler stops, if not
            already stopped, and can be started again  by setting
            the value of the variable to ON|1.
  ON | 1  - This is the pre-5.1.11 behavior - The scheduler starts, if not
            already started, and can be stopped again by setting the value
            of the variable to OFF|0.

  mysql-test/r/events.result@1.42, 2006-09-01 13:08:36+02:00, andrey@example.com +10 -8
    update result

  mysql-test/r/events_bugs.result@1.19, 2006-09-01 13:08:36+02:00, andrey@example.com +7 -7
    update result

  mysql-test/r/events_logs_tests.result@1.14, 2006-09-01 13:08:36+02:00, andrey@example.com +4 -4
    update result

  mysql-test/r/events_restart_phase1.result@1.2, 2006-09-01 13:08:36+02:00, andrey@example.com +3 -1
    update result

  mysql-test/r/events_restart_phase3.result@1.2, 2006-09-01 13:08:37+02:00, andrey@example.com +3 -0
    update result

  mysql-test/r/events_scheduling.result@1.7, 2006-09-01 13:08:37+02:00, andrey@example.com +37 -1
    update result

  mysql-test/r/events_stress.result@1.6, 2006-09-01 13:08:37+02:00, andrey@example.com +5 -5
    update result

  mysql-test/t/events.test@1.39, 2006-09-01 13:08:37+02:00, andrey@example.com +11 -9
    update test:
    2 -> off
    1 -> on

  mysql-test/t/events_bugs.test@1.15, 2006-09-01 13:08:37+02:00, andrey@example.com +7 -7
    update test:
    2 -> off
    1 -> on

  mysql-test/t/events_logs_tests.test@1.14, 2006-09-01 13:08:37+02:00, andrey@example.com +3 -3
    update test:
    2 -> off
    1 -> on

  mysql-test/t/events_restart_phase1.test@1.2, 2006-09-01 13:08:37+02:00, andrey@example.com +3 -1
    update test:
    2 -> off
    1 -> on

  mysql-test/t/events_restart_phase2-master.opt@1.2, 2006-09-01 13:08:37+02:00, andrey@example.com +1 -1
    update master file : 1 => on

  mysql-test/t/events_scheduling.test@1.9, 2006-09-01 13:08:37+02:00, andrey@example.com +23 -1
    update test:
    2 -> off
    1 -> on
    
    add tests for event_scheduler global variable representation from
    SHOW VARIABLES.

  mysql-test/t/events_stress.test@1.9, 2006-09-01 13:08:37+02:00, andrey@example.com +5 -5
    update test:
    2 -> off
    1 -> on

  sql/events.cc@1.60.1.1, 2006-09-01 13:08:37+02:00, andrey@example.com +38 -13
    Implement two different TYPELIBs for --event-scheduler cmd line
    option and for GLOBAL variable event_scheduler
    
    --event-scheduler cmdline : DISABLED | ON | OFF | 0 | 1
    DISABLED - makes the scheduler unavailable during the server run
    (ON|1)-  When the server is started the scheduler will be started. It can
             be stopped and restarted by setting appropriate values to
             GLOBAL event_scheduler
    (OFF|0)- When the server is started, the scheduler won't be started. It
             can be started and again stopped by setting appropriate values to
             GLOBAL event_scheduler. _DEFAULT_ value
    
    The GLOBAL variable event_scheduler can have the following values:
    OFF | ON | 0 | 1
    DISABLED is not possible and every attempt will end with an error that
    it's not a valid value for the variable.
    OFF | 0 - This is the pre-5.1.11 behavior - The scheduler stops, if not
              already stopped, and can be started again  by setting
              the value of the variable to ON|1.
    ON | 1  - This is the pre-5.1.11 behavior - The scheduler starts, if not
              already started, and can be stopped again by setting the value
              of the variable to OFF|0.

  sql/events.h@1.46, 2006-09-01 13:08:37+02:00, andrey@example.com +10 -1
    additional TYPELIB for GLOBAL event_scheduler

  sql/mysqld.cc@1.570, 2006-09-01 13:08:37+02:00, andrey@example.com +24 -11
    --event-scheduler should be checked against a TYPELIB and
    therefore should be GET_STR, as well as we make the parameter optional.
    When not provided OFF|0 is used.

  sql/set_var.cc@1.185, 2006-09-01 13:08:37+02:00, andrey@example.com +24 -18
    Implement typelib for event_scheduler variable.
    If allows both INT_RESULT -> 0 | 1 
    and STRING_RESULT -> OFF | ON
    The variable is shown as DISABLED | ON | OFF

  sql/set_var.h@1.93, 2006-09-01 13:08:37+02:00, andrey@example.com +6 -0
    Implement typelib, which expects both STRING and INT,
    for event_scheduler.

ChangeSet@1.2255.73.4, 2006-09-01 12:27:28+02:00, msvensson@neptunus.(none) +1 -0
  Turn off reorder as default

  mysql-test/mysql-test-run.pl@1.162.1.1, 2006-09-01 12:27:23+02:00, msvensson@neptunus.(none) +1 -1
    Turn off reorder as default

ChangeSet@1.1810.2087.1, 2006-09-01 13:23:43+04:00, sergefp@mysql.com +4 -0
  BUG#21477 "memory overruns for certain kinds of subqueries":
  make st_select_lex::setup_ref_array() take into account that 
  Item_sum-descendant objects located within descendant SELECTs
  may be added into ref_pointer_array.

  sql/item_sum.cc@1.170.1.10, 2006-09-01 13:23:38+04:00, sergefp@mysql.com +3 -1
    BUG#21477 "memory overruns for certain kinds of subqueries":
    Make SELECT_LEX::n_sum_items contain # of Item_sum-derived objects
    that exist within this SELECT.

  sql/sql_lex.cc@1.142.22.1, 2006-09-01 13:23:38+04:00, sergefp@mysql.com +4 -4
    BUG#21477 "memory overruns for certain kinds of subqueries":
    make st_select_lex::setup_ref_array() take into account that 
    Item_sum-descendant objects located within descendant SELECTs
    may be added into ref_pointer_array.

  sql/sql_lex.h@1.175.21.1, 2006-09-01 13:23:38+04:00, sergefp@mysql.com +7 -1
    BUG#21477 "memory overruns for certain kinds of subqueries":
    Add SELECT_LEX::n_sum_items and SELECT_LEXT::n_child_sum_items.

  sql/sql_yacc.yy@1.371.79.1, 2006-09-01 13:23:38+04:00, sergefp@mysql.com +2 -0
    BUG#21477 "memory overruns for certain kinds of subqueries":
    Make SELECT_LEX::n_sum_items contain # of Item_sum-derived objects
    that exist within this SELECT.

ChangeSet@1.1616.2735.18, 2006-09-01 11:21:12+02:00, msvensson@neptunus.(none) +2 -0
  Backport from 5.0
   - Dont test "encrypt" in ctype_ucs

  mysql-test/r/ctype_ucs.result@1.11.1.22, 2006-09-01 11:21:09+02:00, msvensson@neptunus.(none) +0 -4
    Don't test "encrypt" function in ctype_ucs.test

  mysql-test/t/ctype_ucs.test@1.15.1.18, 2006-09-01 11:21:10+02:00, msvensson@neptunus.(none) +0 -6
    Don't test "encrypt" function in ctype_ucs.test

ChangeSet@1.1810.2085.2, 2006-09-01 10:32:12+02:00, georg@lmy002.wdf.sap.corp +23 -0
  make dist changes for Cmake build

  bdb/Makefile.in@1.6.1.1, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

  sql/message.mc@1.1, 2006-09-01 10:30:31+02:00, georg@lmy002.wdf.sap.corp +8 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/sql/message.mc

  sql/message.mc@1.0, 2006-09-01 10:30:31+02:00, georg@lmy002.wdf.sap.corp +0 -0

  Makefile.am@1.68.1.16, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +2 -2
    make dist changes for Cmake build

  client/Makefile.am@1.52.1.5, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +2 -0
    make dist changes for Cmake build

  dbug/Makefile.am@1.14.1.1, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +2 -1
    make dist changes for Cmake build

  extra/Makefile.am@1.30.1.3, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -0
    make dist changes for Cmake build

  extra/yassl/Makefile.am@1.2.1.2, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

  extra/yassl/taocrypt/Makefile.am@1.1.1.3, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

  libmysql/Makefile.am@1.47.1.4, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

  libmysql/mytest.c@1.3, 2006-09-01 10:20:41+02:00, georg@lmy002.wdf.sap.corp +0 -0
    Rename: BitKeeper/deleted/.del-mytest.c -> libmysql/mytest.c

  BitKeeper/deleted/.del-mytest.c@1.2, 2006-09-01 10:18:44+02:00, georg@lmy002.wdf.sap.corp +0 -0
    Delete: libmysql/mytest.c

  libmysql/mytest.c@1.1, 2006-09-01 10:17:39+02:00, georg@lmy002.wdf.sap.corp +175 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/libmysql/mytest.c

  libmysql/mytest.c@1.0, 2006-09-01 10:17:39+02:00, georg@lmy002.wdf.sap.corp +0 -0

  mysys/Makefile.am@1.62.1.9, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +2 -1
    make dist changes for Cmake build

  regex/Makefile.am@1.14.1.1, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

  server-tools/Makefile.am@1.1.1.1, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -0
    make dist changes for Cmake build

  server-tools/instance-manager/Makefile.am@1.29.1.4, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +2 -1
    make dist changes for Cmake build

  sql/Makefile.am@1.103.1.19, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +2 -1
    make dist changes for Cmake build

  heap/Makefile.am@1.9.2.1, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

  innobase/Makefile.am@1.6.1.1, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -0
    make dist changes for Cmake build

  myisam/Makefile.am@1.29.3.1, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

  myisammrg/Makefile.am@1.13.2.1, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

  strings/Makefile.am@1.49.1.2, 2006-09-01 10:32:06+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

  tests/Makefile.am@1.23.1.4, 2006-09-01 10:32:07+02:00, georg@lmy002.wdf.sap.corp +2 -1
    make dist changes for Cmake build

  vio/Makefile.am@1.17.1.2, 2006-09-01 10:32:07+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

  zlib/Makefile.am@1.6.2.1, 2006-09-01 10:32:07+02:00, georg@lmy002.wdf.sap.corp +1 -1
    make dist changes for Cmake build

ChangeSet@1.1616.2748.1, 2006-09-01 10:21:08+02:00, msvensson@shellback.(none) +2 -0
  Add target to make "mtr", shortcut for running test suite

  BitKeeper/etc/ignore@1.153.1.83, 2006-09-01 10:21:06+02:00, msvensson@shellback.(none) +1 -0
    Added mysql-test/mtr to the ignore list

  mysql-test/Makefile.am@1.39.1.16, 2006-09-01 10:21:06+02:00, msvensson@shellback.(none) +6 -1
    Add target to make "mtr", shortcut for running test suite

ChangeSet@1.2255.73.2, 2006-09-01 10:01:47+02:00, msvensson@shellback.(none) +2 -0
  Use "--skip-innodb" if running with testcases that does not need innodb
  Decreases test time when running a selected number of tests

  mysql-test/lib/mtr_cases.pl@1.32, 2006-09-01 10:01:43+02:00, msvensson@shellback.(none) +0 -8
    Remove fixme, it's fiexd now

  mysql-test/mysql-test-run.pl@1.162, 2006-09-01 10:01:43+02:00, msvensson@shellback.(none) +5 -5
    Use "--skip-innodb" if running with testcases that does not need innodb

ChangeSet@1.1616.2747.1, 2006-09-01 15:32:40+08:00, dli@dev3-76.dev.cn.tlan +3 -0
  Fix for BUG#21345, Error in cluster logfile rotation.
  Fixed the cluster logfile rotation code, let the cluster logfile be renamed correctly when the main logfile exceeds the configured maximum size.

  ndb/include/util/File.hpp@1.4.4.1, 2006-09-01 15:32:38+08:00, dli@dev3-76.dev.cn.tlan +8 -0
    Fix for BUG#21345, Error in cluster logfile rotation.

  ndb/src/common/logger/FileLogHandler.cpp@1.9.3.1, 2006-09-01 15:32:38+08:00, dli@dev3-76.dev.cn.tlan +10 -1
    Fix for BUG#21345, Error in cluster logfile rotation.

  ndb/src/common/util/File.cpp@1.8.5.1, 2006-09-01 15:32:38+08:00, dli@dev3-76.dev.cn.tlan +12 -0
    Fix for BUG#21345, Error in cluster logfile rotation.

ChangeSet@1.2273.9.2, 2006-09-01 02:12:30-04:00, mikael@dator5.(none) +3 -0
  Removed Windows from tests since bug#19107 is known to hang test

  mysql-test/t/disabled.def@1.194, 2006-09-01 02:12:28-04:00, mikael@dator5.(none) +0 -1
    Removed disabled test since it only affects Windows

  mysql-test/t/partition.test@1.51, 2006-09-01 02:12:28-04:00, mikael@dator5.(none) +4 -0
    Removed Windows from test since bug#19107 is known to hang test

  mysql-test/t/partition_mgm_err2.test@1.4, 2006-09-01 02:12:28-04:00, mikael@dator5.(none) +5 -0
    Removed Windows from test since bug#19107 is known to hang test

ChangeSet@1.2255.51.19, 2006-08-31 21:21:23-07:00, jimw@rama.(none) +1 -0
  Fix results of mysqldump test after messy merge

  mysql-test/r/mysqldump.result@1.125, 2006-08-31 21:21:21-07:00, jimw@rama.(none) +170 -138
    Fix results

ChangeSet@1.1810.2083.3, 2006-08-31 20:53:34-07:00, jimw@rama.(none) +3 -0
  Restore bug fix lost in merge of client/mysqldump.c, and clean up mysqldump.test
  so that 4.1 and 5.0 tests are all in the right place and no tests are duplicated.

  client/mysqldump.c@1.214.1.26, 2006-08-31 20:53:30-07:00, jimw@rama.(none) +1 -0
    Restore fix for bug 21215 accidently removed during merge

  mysql-test/r/mysqldump.result@1.83.1.30, 2006-08-31 20:53:30-07:00, jimw@rama.(none) +158 -416
    Update results

  mysql-test/t/mysqldump.test@1.76.1.27, 2006-08-31 20:53:30-07:00, jimw@rama.(none) +90 -129
    Fix order of tests so that all the tests new to the 5.0 tree come after
    "End of 4.1 tests", and so that each leaves things in the state it found
    them (particularly by returning to the 'test' database. Also remove some
    tests that were duplicated.

ChangeSet@1.1810.2042.23, 2006-09-01 05:00:32+02:00, tsmith@maint2.mysql.com +1 -0
  post-merge fix

  mysql-test/r/heap_btree.result@1.18.1.6, 2006-09-01 05:00:09+02:00, tsmith@maint2.mysql.com +1 -0
    post-merge fix

ChangeSet@1.2255.73.1, 2006-08-31 20:58:00+02:00, msvensson@shellback.(none) +2 -0
  Only install the first masters db and copy it for the other
  Gives slightly faster startup

  mysql-test/lib/mtr_misc.pl@1.15, 2006-08-31 20:57:56+02:00, msvensson@shellback.(none) +2 -0
    Add verbose message 

  mysql-test/mysql-test-run.pl@1.161, 2006-08-31 20:57:56+02:00, msvensson@shellback.(none) +15 -2
    Only install the first masters db and copy it for the other
    Gives slightly faster startup

ChangeSet@1.1810.2085.1, 2006-08-31 19:52:42+02:00, georg@lmy002.wdf.sap.corp +28 -0
  Additional files for cmake support

  CMakeLists.txt@1.1, 2006-08-31 19:52:36+02:00, georg@lmy002.wdf.sap.corp +132 -0
    New BitKeeper file ``CMakeLists.txt''

  CMakeLists.txt@1.0, 2006-08-31 19:52:36+02:00, georg@lmy002.wdf.sap.corp +0 -0

  extra/CMakeLists.txt@1.1, 2006-08-31 19:52:36+02:00, georg@lmy002.wdf.sap.corp +32 -0
    New BitKeeper file ``extra/CMakeLists.txt''

  extra/CMakeLists.txt@1.0, 2006-08-31 19:52:36+02:00, georg@lmy002.wdf.sap.corp +0 -0

  extra/yassl/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +6 -0
    New BitKeeper file ``extra/yassl/CMakeLists.txt''

  extra/yassl/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  extra/yassl/taocrypt/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +10 -0
    New BitKeeper file ``extra/yassl/taocrypt/CMakeLists.txt''

  extra/yassl/taocrypt/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  libmysql/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +54 -0
    New BitKeeper file ``libmysql/CMakeLists.txt''

  libmysql/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  mysys/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +29 -0
    New BitKeeper file ``mysys/CMakeLists.txt''

  mysys/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  regex/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +5 -0
    New BitKeeper file ``regex/CMakeLists.txt''

  regex/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  server-tools/instance-manager/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +17 -0
    New BitKeeper file ``server-tools/instance-manager/CMakeLists.txt''

  server-tools/instance-manager/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  innobase/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +35 -0
    New BitKeeper file ``innobase/CMakeLists.txt''

  innobase/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  sql/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +114 -0
    New BitKeeper file ``sql/CMakeLists.txt''

  sql/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  strings/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +12 -0
    New BitKeeper file ``strings/CMakeLists.txt''

  strings/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  heap/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +8 -0
    New BitKeeper file ``heap/CMakeLists.txt''

  heap/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  tests/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +9 -0
    New BitKeeper file ``tests/CMakeLists.txt''

  tests/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  vio/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +6 -0
    New BitKeeper file ``vio/CMakeLists.txt''

  vio/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  client/CMakeLists.txt@1.1, 2006-08-31 19:52:36+02:00, georg@lmy002.wdf.sap.corp +79 -0
    New BitKeeper file ``client/CMakeLists.txt''

  client/CMakeLists.txt@1.0, 2006-08-31 19:52:36+02:00, georg@lmy002.wdf.sap.corp +0 -0

  zlib/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +8 -0
    New BitKeeper file ``zlib/CMakeLists.txt''

  zlib/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  myisammrg/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +9 -0
    New BitKeeper file ``myisammrg/CMakeLists.txt''

  myisammrg/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  dbug/CMakeLists.txt@1.1, 2006-08-31 19:52:36+02:00, georg@lmy002.wdf.sap.corp +5 -0
    New BitKeeper file ``dbug/CMakeLists.txt''

  dbug/CMakeLists.txt@1.0, 2006-08-31 19:52:36+02:00, georg@lmy002.wdf.sap.corp +0 -0

  myisam/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +26 -0
    New BitKeeper file ``myisam/CMakeLists.txt''

  myisam/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  bdb/CMakeLists.txt@1.1, 2006-08-31 19:52:36+02:00, georg@lmy002.wdf.sap.corp +44 -0
    New BitKeeper file ``bdb/CMakeLists.txt''

  bdb/CMakeLists.txt@1.0, 2006-08-31 19:52:36+02:00, georg@lmy002.wdf.sap.corp +0 -0

  win/Makefile.am@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +21 -0
    New BitKeeper file ``win/Makefile.am''

  win/Makefile.am@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  win/README@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +82 -0
    New BitKeeper file ``win/README''

  win/README@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  win/build-vs71.bat@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +7 -0
    New BitKeeper file ``win/build-vs71.bat''

  win/build-vs71.bat@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  win/build-vs8.bat@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +6 -0
    New BitKeeper file ``win/build-vs8.bat''

  win/build-vs8.bat@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  win/configure.js@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +166 -0
    New BitKeeper file ``win/configure.js''

  win/configure.js@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  server-tools/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +18 -0
    New BitKeeper file ``server-tools/CMakeLists.txt''

  server-tools/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  sql/examples/CMakeLists.txt@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +11 -0
    New BitKeeper file ``sql/examples/CMakeLists.txt''

  sql/examples/CMakeLists.txt@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

  win/build-vs8_x64.bat@1.1, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +6 -0
    New BitKeeper file ``win/build-vs8_x64.bat''

  win/build-vs8_x64.bat@1.0, 2006-08-31 19:52:37+02:00, georg@lmy002.wdf.sap.corp +0 -0

ChangeSet@1.2255.71.1, 2006-08-31 17:18:39+02:00, andrey@fifo.vaih.whnetz +5 -0
  WL#3337 (Event scheduler new architecture)
  
  This patch makes the relationship between Event_scheduler and Event_queue
  unidirectional from the former to the latter.
  
  
  
  
  The change is that the conditional on which the scheduler sleeped has been
  moved to the Event_queue and the latter does not call anymore
  Event_scheduler::queue_changed(), which in turn has be removed.

  sql/event_queue.cc@1.13, 2006-08-31 17:18:33+02:00, andrey@fifo.vaih.whnetz +124 -49
    Remove dependency of Event_queue on Event_scheduler but not vice versa.
    Event_scheduler polls whether there is time to execute an event.
    
    Removed notify_observers() as the way of calling has changed.
    Added Event_queue::cond_wait() similar to Event_scheduler::cond_wait().

  sql/event_queue.h@1.11, 2006-08-31 17:18:33+02:00, andrey@fifo.vaih.whnetz +10 -6
    init_queue() does not need anymore Event_scheduler object because
    the relationship is now one-way. Event_scheduler knows about Event_queue
    but not vice versa.
    
    get_top_execution_if_time() does by itself the waiting instead of
    returning abstime. This simplifies the code in Event_scheduler::run()
    get_top_execution_if_time() returns only if job_data != NULL or if
    the scheduler thread was killed.
    
    notify_observers() is no more used and therefore removed.
    
    Added Event_queue::cond_wait() because now there is waiting on a
    conditional variable in Event_queue too (like in Event_scheduler for
    ::stop()).

  sql/event_scheduler.cc@1.23, 2006-08-31 17:18:34+02:00, andrey@fifo.vaih.whnetz +79 -109
    Change the relationship between Event_scheduler & Event_queue.
    Event_queue does not know anymore about Event_scheduler. When
    the scheduler calls get_top_element_if_time() it may fall asleep
    on a conditional of Event_queue, if either the queue is empty or
    it's still not time for activation. When the method returns it
    will return a non-null address, namely an object to be executed.
    If the return value is NULL, the thread was killed by a call to
    Event_scheduler::stop() (we assert this).

  sql/event_scheduler.h@1.17, 2006-08-31 17:18:34+02:00, andrey@fifo.vaih.whnetz +12 -21
    Remove queue_changed() as it is obsoleted by making the relationship
    between Event_scheduler and Event_queue one-way, from the former to the
    latter. Event_queue now does not know about Event_scheduler.
    
    get_state() is changed to is_running(). The state enum should be private,
    as it is not needed to be seen from outside anymore.

  sql/events.cc@1.59.1.1, 2006-08-31 17:18:34+02:00, andrey@fifo.vaih.whnetz +2 -2
    Event_queue does not need anymore a pointer to Event_scheduler.

ChangeSet@1.1616.2746.1, 2006-08-31 11:14:04-04:00, cmiller@zippy.cornsilk.net +1 -0
  Bitkeeper's Tk interface uses UTF8 by default, so mixing charsets in a 
  single file is a bad practice.  

  tests/mysql_client_test.c@1.51.32.1, 2006-08-31 11:14:03-04:00, cmiller@zippy.cornsilk.net +3 -2
    Replace literal characters which don't make sense in UTF8 with ubiquitously-
    understood numbers.

ChangeSet@1.1810.2082.1, 2006-08-31 18:00:25+03:00, gkodinov@macbook.gmz +3 -0
  Bug#14654 : Cannot select from the same table twice within a UNION statement     
   Made the parser to support parenthesis around UNION branches.
   This is done by amending the rules of the parser so it generates the correct
   structure.
   Currently it supports arbitrary subquery/join/parenthesis operations in the 
   EXISTS clause. 
   In the IN/scalar subquery case it will allow adding nested parenthesis only 
   if there is an UNION clause after the parenthesis. Otherwise it will just  
   treat the multiple nested parenthesis as a scalar expression.
   It adds extra lex level for ((SELECT ...) UNION ...) to accommodate for the
   UNION clause.

  mysql-test/r/subselect.result@1.134.6.1, 2006-08-31 18:00:18+03:00, gkodinov@macbook.gmz +25 -0
    Bug#14654 : Cannot select from the same table twice within a UNION statement
     - test cases

  mysql-test/t/subselect.test@1.124.1.1, 2006-08-31 18:00:19+03:00, gkodinov@macbook.gmz +26 -0
    Bug#14654 : Cannot select from the same table twice within a UNION statement
     - test cases

  sql/sql_yacc.yy@1.371.78.1, 2006-08-31 18:00:20+03:00, gkodinov@macbook.gmz +72 -70
    Bug#14654 : Cannot select from the same table twice within a UNION statement
     - shuffle around the rules for the parenthesis in subselect

ChangeSet@1.2255.61.6, 2006-08-31 18:48:50+04:00, anozdrin@alik. +5 -0
  Fix im_instance_conf.imtest failure on AIX and HPUX.
  
  The problem was in dummy grep on AIX and HPUX.
  
  The fix is to use more portable patterns.
  
  The patch is only for test suite
  (i.e. does not touch server codebase).

  mysql-test/r/im_instance_conf.result@1.5, 2006-08-31 18:48:48+04:00, anozdrin@alik. +4 -0
    Updated result file.

  mysql-test/t/disabled.def@1.184.8.1, 2006-08-31 18:48:48+04:00, anozdrin@alik. +1 -2
    Fix typo.

  mysql-test/t/im_instance_conf.imtest@1.6, 2006-08-31 18:48:48+04:00, anozdrin@alik. +35 -27
    Make grep-pattern aix/hpux-compatible.

  mysql-test/t/im_options-im.opt@1.1, 2006-08-31 18:48:48+04:00, anozdrin@alik. +1 -0
    Speedup IM-tests.

  mysql-test/t/im_options-im.opt@1.0, 2006-08-31 18:48:48+04:00, anozdrin@alik. +0 -0

  mysql-test/t/im_options.imtest@1.4, 2006-08-31 18:48:48+04:00, anozdrin@alik. +24 -24
    Make grep-pattern aix/hpux-compatible.

ChangeSet@1.1810.2066.4, 2006-08-31 07:27:34-07:00, igor@rurik.mysql.com +4 -0
  Fixed bug #16249: different results for a range with an without index 
  when a range condition use an invalid DATETIME constant.
  Now we do not use invalid DATETIME constants to form end keys for
  range intervals: range analysis just ignores predicates with such
  constants.  

  mysql-test/r/query_cache.result@1.65.1.8, 2006-08-31 07:27:29-07:00, igor@rurik.mysql.com +6 -0
    Adjusted result warnings when adding a fix for bug #16249.

  mysql-test/r/range.result@1.44.1.5, 2006-08-31 07:27:29-07:00, igor@rurik.mysql.com +45 -0
    Added a test case for bug #16249.

  mysql-test/t/range.test@1.37.1.5, 2006-08-31 07:27:29-07:00, igor@rurik.mysql.com +29 -0
    Added a test case for bug #16249.

  sql/opt_range.cc@1.159.1.64, 2006-08-31 07:27:29-07:00, igor@rurik.mysql.com +8 -1
    Fixed bug #16249: different results for a range with an without index 
    when a range condition use an invalid DATETIME constant.
    Now we do not use invalid DATETIME constants to form end keys for
    range intervals: range analysis just ignores predicates with such
    constants.  

ChangeSet@1.1810.2042.19, 2006-08-31 15:17:35+02:00, msvensson@shellback.(none) +1 -0
  Update the generate_prefix_files.pl

  extra/yassl/include/openssl/generate_prefix_files.pl@1.2, 2006-08-31 15:17:32+02:00, msvensson@shellback.(none) +1 -1
    Allow a '*' to be together with the function name.
    As in this example: "BIGNUM *BN_bin2bn"

ChangeSet@1.1810.2042.18, 2006-08-31 15:16:44+02:00, msvensson@shellback.(none) +1 -0
  Bug#21930 libmysqlclient defines BN_bin2bn which belongs to OpenSSL! Breaks other apps!
   - Don't add the signatures for CRYPTO_* when compiling yaSSL for MySQL

  extra/yassl/taocrypt/src/misc.cpp@1.15, 2006-08-31 15:16:41+02:00, msvensson@shellback.(none) +2 -1
    No need to include the CRYPTO_* when compiling yaSSL for MySQL

ChangeSet@1.2255.1.30, 2006-08-31 09:05:06-04:00, mikael@dator5.(none) +1 -0
  BUG#21960: Reverted bad patch

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.74.1.3, 2006-08-31 09:05:04-04:00, mikael@dator5.(none) +0 -5
    BUG#21960: Reverted bad patch

ChangeSet@1.1810.2042.17, 2006-08-31 14:26:12+02:00, msvensson@shellback.(none) +1 -0
  Bug #21930 libmysqlclient defines BN_bin2bn which belongs to OpenSSL! Breaks other apps!
   - Correct bug in perl script that faild to add rename macros for some functions.

  extra/yassl/include/openssl/prefix_ssl.h@1.3, 2006-08-31 14:26:08+02:00, msvensson@shellback.(none) +9 -1
    Add prefixes for a bunch of new functions found with the new version of generate_prefix_files.pl

ChangeSet@1.2274.1.5, 2006-08-31 18:29:23+08:00, gni@dev3-127.(none) +1 -0
  BUG#21033  The error log of mysqld shows useless information, and hides the real error. 

  storage/ndb/src/ndbapi/Ndb.cpp@1.77.1.1, 2006-08-31 18:29:21+08:00, gni@dev3-127.(none) +5 -0
    Ndb.closeTransaction() modifies the value of Ndb.theError.code, 
    but the error code shouldn't be changed here. 
    Mysqld will use the returning error code to log the correct information.

ChangeSet@1.1810.2042.15, 2006-08-31 11:53:08+02:00, msvensson@shellback.(none) +2 -0
  Disable testing of "encrypt" in ctype_ucs.test

  mysql-test/r/ctype_ucs.result@1.39.1.8, 2006-08-31 11:53:05+02:00, msvensson@shellback.(none) +0 -4
    Update result file

  mysql-test/t/ctype_ucs.test@1.36.1.9, 2006-08-31 11:53:05+02:00, msvensson@shellback.(none) +5 -0
    Disable testing of "encrypt" function in this file. That test has to be guarded by "have_crypt.inc"

ChangeSet@1.2273.8.1, 2006-08-31 10:54:34+02:00, pekka@orca.ndb.mysql.com +1 -0
  ndb - bug#21690 workaround-fix, cleanup in separate patch

  storage/ndb/src/ndbapi/NdbBlob.cpp@1.48, 2006-08-31 10:52:50+02:00, pekka@orca.ndb.mysql.com +6 -0
    currently distr keys must be set at end due to bug

ChangeSet@1.2255.52.8, 2006-08-31 13:43:26+05:00, gluh@mysql.com +3 -0
  Bug#21862 Misleading error message 1490: "A PRIMARY KEY need to include all fields..."
  fixed error message

  mysql-test/r/ndb_partition_key.result@1.4, 2006-08-31 13:43:20+05:00, gluh@mysql.com +1 -1
    Bug#21862 Misleading error message 1490: "A PRIMARY KEY need to include all fields..."
    result fix

  mysql-test/r/partition.result@1.49.5.1, 2006-08-31 13:43:21+05:00, gluh@mysql.com +1 -1
    Bug#21862 Misleading error message 1490: "A PRIMARY KEY need to include all fields..."
    result fix

  sql/share/errmsg.txt@1.110.5.1, 2006-08-31 13:43:21+05:00, gluh@mysql.com +1 -3
    Bug#21862 Misleading error message 1490: "A PRIMARY KEY need to include all fields..."
    fixed error message

ChangeSet@1.2255.21.23, 2006-08-31 10:28:48+02:00, msvensson@shellback.(none) +1 -0
  Bug#21721 Test suite does not start with NDB, hangs forever; problem around "ndb_mgmd"
   - Wait for ndb_mgmd with timeout

  mysql-test/mysql-test-run.pl@1.159, 2006-08-31 10:28:45+02:00, msvensson@shellback.(none) +20 -4
    Add new function 'ndb_mgmd_wait_started' that will wait with timeout until ndb_mgmd has been started
    Don't bother to save the return value from 'ndb_mgmd_start' in local var as it's not used.

ChangeSet@1.2255.21.22, 2006-08-31 10:18:55+02:00, msvensson@shellback.(none) +1 -0
  Add check in 'spawn_impl' that we are not trying to span when the path to the executable is empty or undefined

  mysql-test/lib/mtr_process.pl@1.47, 2006-08-31 10:18:51+02:00, msvensson@shellback.(none) +2 -0
    Add check in 'spawn_impl' that we are not trying to span when the path to the executable is empty or undefined

ChangeSet@1.2255.1.25, 2006-08-31 04:16:22-04:00, mikael@dator5.(none) +2 -0
  BUG#21658: Crash partition test in prepared statement protocol
  Review fixes

  sql/sql_partition.cc@1.88, 2006-08-31 04:16:20-04:00, mikael@dator5.(none) +3 -10
    Removed unused variables
    Used thd->free_items() method

  sql/table.cc@1.239.1.4, 2006-08-31 04:16:20-04:00, mikael@dator5.(none) +2 -2
    Changed order of calls

ChangeSet@1.1616.2675.11, 2006-08-31 02:00:40+03:00, aelkin@dsl-hkigw8-feaaf900-177.dhcp.inet.fi +1 -0
  BUG#18822 LOAD DATA FROM MASTER corrupts data
  
  there is a bunch of dups. It has been decided to declare this feature as
  deprecated.
    

  sql/sql_yacc.yy@1.203.127.1, 2006-08-31 02:00:29+03:00, aelkin@dsl-hkigw8-feaaf900-177.dhcp.inet.fi +3 -1
    deprecation macro

ChangeSet@1.1346.881.1, 2006-08-30 17:28:34-04:00, cmiller@zippy.cornsilk.net +1 -0
  Bug#4053: too many of "error 1236: 'binlog truncated in the middle of \
  	event' from master"
  
  Since there is no repeatable test case, and this is obviously wrong, this is
  the most conservative change that might possibly work.  
  
  The syscall  read()  wasn't checked for a negative return value for an
  interrupted read.  The kernel  sys_read()  returns -EINTR, and the "library" 
  layer maps that to return value of -1 and sets  errno  to EINTR.  It's 
  impossible (on Linux) for  read()  to set errno EINTR without the return 
  value being -1 .
  
  So, if we're checking for EINTR behavior, we should not require that the
  return value be zero.

  mysys/my_read.c@1.6.1.2, 2006-08-30 17:28:34-04:00, cmiller@zippy.cornsilk.net +4 -1
    The read() syscall should check for negative one, since that (usually) signals
    errors (like being interrupted) and zero (usually) signals end-of-file .

  mysys/my_read.c@1.6.1.1, 2006-08-29 12:21:59-04:00, cmiller@zippy.cornsilk.net +21 -21
    Made styling conform to guidelines.

ChangeSet@1.2255.66.3, 2006-08-30 14:27:29-07:00, acurtis@xiphis.org +14 -0
  add 2 placeholder values for config and system variables.

  include/mysql/plugin.h@1.17, 2006-08-30 14:27:17-07:00, acurtis@xiphis.org +3 -1
    add 2 placeholder values for config and system variables.

  plugin/fulltext/plugin_example.c@1.12, 2006-08-30 14:27:17-07:00, acurtis@xiphis.org +3 -1
    add 2 placeholder values for config and system variables.

  sql/ha_ndbcluster.cc@1.346.2.7, 2006-08-30 14:27:17-07:00, acurtis@xiphis.org +3 -1
    add 2 placeholder values for config and system variables.

  sql/ha_partition.cc@1.65.5.2, 2006-08-30 14:27:17-07:00, acurtis@xiphis.org +3 -1
    add 2 placeholder values for config and system variables.

  sql/log.cc@1.224, 2006-08-30 14:27:18-07:00, acurtis@xiphis.org +3 -1
    add 2 placeholder values for config and system variables.

  storage/archive/ha_archive.cc@1.100, 2006-08-30 14:27:18-07:00, acurtis@xiphis.org +3 -1
    add 2 placeholder values for config and system variables.

  storage/blackhole/ha_blackhole.cc@1.39, 2006-08-30 14:27:18-07:00, acurtis@xiphis.org +3 -1
    add 2 placeholder values for config and system variables.

  storage/csv/ha_tina.cc@1.57.1.2, 2006-08-30 14:27:18-07:00, acurtis@xiphis.org +3 -1
    add 2 placeholder values for config and system variables.

  storage/example/ha_example.cc@1.42, 2006-08-30 14:27:18-07:00, acurtis@xiphis.org +3 -1
    add 2 placeholder values for config and system variables.

  storage/federated/ha_federated.cc@1.77, 2006-08-30 14:27:18-07:00, acurtis@xiphis.org +3 -1
    add 2 placeholder values for config and system variables.

  storage/heap/ha_heap.cc@1.96, 2006-08-30 14:27:18-07:00, acurtis@xiphis.org +3 -1
    add 2 placeholder values for config and system variables.

  sql/ha_innodb.cc@1.284.5.1, 2006-08-30 14:27:17-07:00, acurtis@xiphis.org +3 -1
    add 2 placeholder values for config and system variables.

  storage/myisam/ha_myisam.cc@1.191, 2006-08-30 14:27:18-07:00, acurtis@xiphis.org +3 -1
    add 2 placeholder values for config and system variables.

  storage/myisammrg/ha_myisammrg.cc@1.97, 2006-08-30 14:27:18-07:00, acurtis@xiphis.org +3 -1
    add 2 placeholder values for config and system variables.

ChangeSet@1.1616.2744.3, 2006-08-30 22:39:23+02:00, tsmith@maint2.mysql.com +2 -0
  Remove ^Z from ctype_ucs.test data, to avoid problems testing on Windows

  mysql-test/r/ctype_ucs.result@1.11.1.21, 2006-08-30 22:39:04+02:00, tsmith@maint2.mysql.com +7 -7
    Remove ^Z from ctype_ucs.test data, to avoid problems testing on Windows

  mysql-test/t/ctype_ucs.test@1.15.1.17, 2006-08-30 22:39:04+02:00, tsmith@maint2.mysql.com +1 -1
    Remove ^Z from ctype_ucs.test data, to avoid problems testing on Windows

ChangeSet@1.1810.2060.2, 2006-08-30 13:20:39-07:00, acurtis@xiphis.org +21 -0
  Bug#20573
    "strict mode: inserts autogenerated auto_increment value bigger than max"
    Strict mode should fail if autoincrement value is out of range

  sql/ha_berkeley.cc@1.151.1.11, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +4 -1
    handle error in update_auto_increment()

  mysql-test/t/strict_autoinc_4bdb.test@1.1, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +10 -0
    New BitKeeper file ``mysql-test/t/strict_autoinc_4bdb.test''

  mysql-test/t/strict_autoinc_4bdb.test@1.0, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +0 -0

  include/my_base.h@1.70.1.10, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +3 -1
    Add new handler error codes

  mysql-test/include/strict_autoinc.inc@1.1, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +28 -0
    New BitKeeper file ``mysql-test/include/strict_autoinc.inc''

  mysql-test/include/strict_autoinc.inc@1.0, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +0 -0

  mysql-test/r/strict_autoinc_1myisam.result@1.1, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +27 -0
    New BitKeeper file ``mysql-test/r/strict_autoinc_1myisam.result''

  mysql-test/r/strict_autoinc_1myisam.result@1.0, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +0 -0

  mysql-test/r/strict_autoinc_2innodb.result@1.1, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +27 -0
    New BitKeeper file ``mysql-test/r/strict_autoinc_2innodb.result''

  mysql-test/r/strict_autoinc_2innodb.result@1.0, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +0 -0

  mysql-test/r/strict_autoinc_3heap.result@1.1, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +27 -0
    New BitKeeper file ``mysql-test/r/strict_autoinc_3heap.result''

  mysql-test/r/strict_autoinc_3heap.result@1.0, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +0 -0

  mysql-test/r/strict_autoinc_4bdb.result@1.1, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +27 -0
    New BitKeeper file ``mysql-test/r/strict_autoinc_4bdb.result''

  mysql-test/r/strict_autoinc_4bdb.result@1.0, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +0 -0

  mysql-test/r/strict_autoinc_5ndb.result@1.1, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +27 -0
    New BitKeeper file ``mysql-test/r/strict_autoinc_5ndb.result''

  mysql-test/r/strict_autoinc_5ndb.result@1.0, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +0 -0

  mysql-test/t/strict_autoinc_1myisam.test@1.1, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +8 -0
    New BitKeeper file ``mysql-test/t/strict_autoinc_1myisam.test''

  mysql-test/t/strict_autoinc_1myisam.test@1.0, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +0 -0

  mysql-test/t/strict_autoinc_2innodb.test@1.1, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +10 -0
    New BitKeeper file ``mysql-test/t/strict_autoinc_2innodb.test''

  mysql-test/t/strict_autoinc_2innodb.test@1.0, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +0 -0

  mysql-test/t/strict_autoinc_3heap.test@1.1, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +8 -0
    New BitKeeper file ``mysql-test/t/strict_autoinc_3heap.test''

  mysql-test/t/strict_autoinc_3heap.test@1.0, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +0 -0

  mysql-test/t/strict_autoinc_5ndb.test@1.1, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +10 -0
    New BitKeeper file ``mysql-test/t/strict_autoinc_5ndb.test''

  mysql-test/t/strict_autoinc_5ndb.test@1.0, 2006-08-30 13:20:38-07:00, acurtis@xiphis.org +0 -0

  sql/ha_ndbcluster.cc@1.175.52.1, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +3 -1
    handle error in update_auto_increment()

  sql/handler.cc@1.167.1.51, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +18 -5
    return error from handler::update_auto_increment()

  sql/handler.h@1.138.2.40, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +1 -1
    change return type of handler::update_auto_increment() to int

  sql/share/errmsg.txt@1.42.19.1, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +2 -0
    new error message for auto-increment

  sql/ha_heap.cc@1.71.1.7, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +4 -1
    handle error in update_auto_increment()

  sql/ha_innodb.cc@1.202.1.97, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +2 -1
    handle error in update_auto_increment()

  sql/ha_myisam.cc@1.147.1.20, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +5 -1
    handle error in update_auto_increment()

  sql/ha_myisammrg.cc@1.59.1.21, 2006-08-30 13:20:37-07:00, acurtis@xiphis.org +5 -1
    handle error in update_auto_increment()

ChangeSet@1.2255.66.2, 2006-08-30 12:28:25-07:00, brian@zim.(none) +3 -0
  This pulls two function calls which should have been handlerton calls out of handler.cc. 

  sql/ha_ndbcluster.cc@1.346.2.6, 2006-08-30 12:28:22-07:00, brian@zim.(none) +2 -0
    Adding in new handlerton calls. 

  sql/handler.cc@1.264, 2006-08-30 12:28:22-07:00, brian@zim.(none) +51 -13
    Calls directly made to NDB have been removed. 

  sql/handler.h@1.232.1.2, 2006-08-30 12:28:22-07:00, brian@zim.(none) +5 -1
    Two additional handlerton structure functions. 

ChangeSet@1.1616.2744.2, 2006-08-30 21:24:09+02:00, tsmith@maint2.mysql.com +1 -0
  portability fix in BUILD/* for solaris

  BUILD/check-cpu@1.12.1.1, 2006-08-30 21:23:59+02:00, tsmith@maint2.mysql.com +176 -173
    portability fix in BUILD/* for solaris

ChangeSet@1.2255.61.4, 2006-08-30 23:09:47+04:00, kostja@bodhi.local +13 -0
  Post-merge fixes.

  mysql-test/lib/mtr_process.pl@1.45.1.2, 2006-08-30 23:09:38+04:00, kostja@bodhi.local +769 -34
    Apply manually the merge from 5.0

  mysql-test/mysql-test-run.pl@1.150.3.5, 2006-08-30 23:09:38+04:00, kostja@bodhi.local +12 -251
    Apply manually the merge from 5.0

  mysql-test/r/grant.result@1.56.1.4, 2006-08-30 23:09:38+04:00, kostja@bodhi.local +26 -1
    A post-merge fix.

  mysql-test/r/im_cmd_line.result@1.2, 2006-08-30 23:09:38+04:00, kostja@bodhi.local +7 -0
    A post-merge fix.

  mysql-test/r/im_instance_conf.result@1.4, 2006-08-30 23:09:38+04:00, kostja@bodhi.local +7 -11
    A post-merge fix.

  mysql-test/r/sp.result@1.221, 2006-08-30 23:09:38+04:00, kostja@bodhi.local +135 -12
    A post-merge fix.

  mysql-test/t/grant.test@1.43.1.3, 2006-08-30 23:09:38+04:00, kostja@bodhi.local +2 -1
    A post-merge fix.

  mysql-test/t/im_cmd_line.imtest@1.3, 2006-08-30 23:09:38+04:00, kostja@bodhi.local +1 -1
    A post-merge fix.

  mysql-test/t/im_instance_conf.imtest@1.5, 2006-08-30 23:09:38+04:00, kostja@bodhi.local +1 -24
    A post-merge fix.

  sql/field.cc@1.339, 2006-08-30 23:09:38+04:00, kostja@bodhi.local +2 -2
    A post-merge fix.

  sql/item_cmpfunc.cc@1.213.1.2, 2006-08-30 23:09:39+04:00, kostja@bodhi.local +2 -2
    A post-merge fix.

  sql/sp_head.cc@1.232.1.3, 2006-08-30 23:09:39+04:00, kostja@bodhi.local +0 -1
    A post-merge fix.

  sql/sp_head.h@1.92, 2006-08-30 23:09:39+04:00, kostja@bodhi.local +1 -1
    A post-merge fix.

ChangeSet@1.1810.2078.2, 2006-08-30 20:45:43+02:00, hartmut@mysql.com +1 -0
  make DNS based hostname queries work (bug #17582)

  ndb/tools/ndb_config.cpp@1.4.7.1, 2006-08-30 20:45:40+02:00, hartmut@mysql.com +2 -2
    make DNS based hostname queries work (bug #17582)

ChangeSet@1.2245.8.1, 2006-08-30 21:43:05+03:00, aelkin@dsl-hkigw8-feaaf900-177.dhcp.inet.fi +2 -0
  WL#3368 mixed format as default
  
  Two minor fixes:
   1. to make make test executes with mixed;
   2. proper isolation of binlog_statement_insert_delayed 
      from others through reset master cleaning up binlog
      todo: adapt this technique to other restarting for binlog tests

  Makefile.am@1.94.1.1, 2006-08-30 21:42:59+03:00, aelkin@dsl-hkigw8-feaaf900-177.dhcp.inet.fi +5 -1
    Binlog format switches to MIXED. A new Makefile target
    test-binlog-statement 
    is introduced for checking tests requiring exclusive STATEMENT format.

  mysql-test/t/binlog_statement_insert_delayed.test@1.2, 2006-08-30 21:43:00+03:00, aelkin@dsl-hkigw8-feaaf900-177.dhcp.inet.fi +3 -0
    cheapest method to clean up binlog after previous tests

ChangeSet@1.2255.62.3, 2006-08-30 22:11:23+04:00, evgen@moonbone.local +3 -0
  sql_base.cc, ndb_condition_pushdown.result, opt_range.cc:
    After merge changes

  mysql-test/r/ndb_condition_pushdown.result@1.26, 2006-08-30 22:10:41+04:00, evgen@moonbone.local +3 -3
    After merge changes

  sql/opt_range.cc@1.231, 2006-08-30 22:10:58+04:00, evgen@moonbone.local +3 -2
    After merge changes

  sql/sql_base.cc@1.348, 2006-08-30 22:10:55+04:00, evgen@moonbone.local +1 -1
    After merge changes

ChangeSet@1.2255.52.6, 2006-08-30 11:16:53-05:00, Reggie@blackhole. +1 -0
  disabled some tests to get passing tests

  mysql-test/t/disabled.def@1.184.7.1, 2006-08-30 11:16:49-05:00, Reggie@blackhole. +5 -1
    disabled some tests to get some tests passing.

ChangeSet@1.1810.2064.2, 2006-08-30 17:11:00+02:00, msvensson@neptunus.(none) +2 -0
  Bug#21813 An attacker has the opportunity to bypass query logging, part2
   - Use the "%.*b" format when printing prepared and exeuted prepared statements to the log.
   - Add test case to check that also prepared statements end up in the query log
  Bug#14346 Prepared statements corrupting general log/server memory
   - Use "stmt->query" when logging the newly prepared query instead of "packet"

  sql/sql_prepare.cc@1.142.1.40, 2006-08-30 17:10:57+02:00, msvensson@neptunus.(none) +4 -2
    mysql_stmt_prepare
     - Use "%.*b" format when printing to log
     - Print the query from stmt instead of "packet", packet points at the net in/out buffer and has most likely been overwritten
       when  result for prepare was written to client.
    mysql_stmt_execute 
     - Use "%.*b" format when printing to log
     - Print the query from thd as the expanded query has been specifially set to be valid also after restore from backup statement  

  tests/mysql_client_test.c@1.167.19.1, 2006-08-30 17:10:57+02:00, msvensson@neptunus.(none) +66 -23
    Add tests for bug#21813 to already existing test for bug#17667. Add functionality for also executing prepared statements and making sure they end up in the log as well. 

ChangeSet@1.2273.1.28, 2006-08-30 15:28:51+02:00, jmiller@mysql.com +13 -0
  Had issues with older clone where I could not pull latest patches. So I pulled a fresh clone. Moved updated test cases over and restested. Therefore I have to do a new commit for these files.

  BitKeeper/deleted/.del-ndb_dd_advance.result@1.1.1.1, 2006-08-30 15:04:04+02:00, jmiller@mysql.com +0 -0
    Delete: mysql-test/r/ndb_dd_advance.result

  BitKeeper/deleted/.del-ndb_dd_advance.test@1.4, 2006-08-30 15:03:42+02:00, jmiller@mysql.com +0 -0
    Delete: mysql-test/t/ndb_dd_advance.test

  BitKeeper/deleted/.del-ndb_dd_advance2.result@1.3.1.1, 2006-08-30 15:04:10+02:00, jmiller@mysql.com +0 -0
    Delete: mysql-test/r/ndb_dd_advance2.result

  BitKeeper/deleted/.del-ndb_dd_advance2.test@1.4, 2006-08-30 15:03:53+02:00, jmiller@mysql.com +0 -0
    Delete: mysql-test/t/ndb_dd_advance2.test

  mysql-test/r/ndb_dd_alter.result@1.1, 2006-08-30 15:12:28+02:00, jmiller@mysql.com +441 -0
    Moved from problem clone to new clone

  mysql-test/r/ndb_dd_alter.result@1.0, 2006-08-30 15:12:28+02:00, jmiller@mysql.com +0 -0

  mysql-test/r/ndb_dd_basic.result@1.10.1.1, 2006-08-30 15:13:22+02:00, jmiller@mysql.com +21 -0
    Moved from problem clone to new clone

  mysql-test/r/ndb_dd_disk2memory.result@1.6.1.1, 2006-08-30 15:16:17+02:00, jmiller@mysql.com +194 -7
    Moved from problem clone to new clone

  mysql-test/r/ndb_dd_sql_features.result@1.1, 2006-08-30 15:12:52+02:00, jmiller@mysql.com +599 -0
    Moved from problem clone to new clone

  mysql-test/r/ndb_dd_sql_features.result@1.0, 2006-08-30 15:12:52+02:00, jmiller@mysql.com +0 -0

  mysql-test/t/ndb_dd_alter.test@1.1, 2006-08-30 15:12:17+02:00, jmiller@mysql.com +246 -0
    Moved from problem clone to new clone

  mysql-test/t/ndb_dd_alter.test@1.0, 2006-08-30 15:12:17+02:00, jmiller@mysql.com +0 -0

  mysql-test/t/ndb_dd_basic.test@1.7, 2006-08-30 15:14:34+02:00, jmiller@mysql.com +15 -0
    Moved from problem clone to new clone

  mysql-test/t/ndb_dd_disk2memory.test@1.2, 2006-08-30 15:16:02+02:00, jmiller@mysql.com +106 -0
    Moved from problem clone to new clone

  mysql-test/t/ndb_dd_dump.test@1.5, 2006-08-30 15:14:23+02:00, jmiller@mysql.com +42 -0
    Moved from problem clone to new clone

  mysql-test/t/ndb_dd_sql_features.test@1.1, 2006-08-30 15:12:40+02:00, jmiller@mysql.com +550 -0
    Moved from problem clone to new clone

  mysql-test/t/ndb_dd_sql_features.test@1.0, 2006-08-30 15:12:40+02:00, jmiller@mysql.com +0 -0

ChangeSet@1.2245.7.1, 2006-08-30 14:10:53+02:00, mats@romeo.(none) +1 -0
  Changes to make unit tests work on OS X and AIX

  unittest/unit.pl@1.4.1.1, 2006-08-30 13:54:46+02:00, mats@romeo.(none) +1 -25
    Removing reliance on Straps, since it's to unstable.

ChangeSet@1.1616.2743.1, 2006-08-30 15:56:17+05:00, gluh@mysql.com +7 -0
  Bug#20393 User name truncation in mysql client
  Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte

  include/mysql_com.h@1.67.1.41, 2006-08-30 15:56:14+05:00, gluh@mysql.com +3 -0
    Bug#20393 User name truncation in mysql client
    Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
    added new constants NAME_BYTE_LEN, USERNAME_BYTE_LENGTH, SYSTEM_CHARSET_MBMAXLEN

  mysql-test/r/ctype_utf8.result@1.45.1.27, 2006-08-30 15:56:14+05:00, gluh@mysql.com +12 -0
    Bug#20393 User name truncation in mysql client
    Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
    test case

  mysql-test/t/ctype_utf8.test@1.57.1.17, 2006-08-30 15:56:14+05:00, gluh@mysql.com +16 -0
    Bug#20393 User name truncation in mysql client
    Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
    test case

  sql-common/client.c@1.46.1.46, 2006-08-30 15:56:14+05:00, gluh@mysql.com +3 -3
    Bug#20393 User name truncation in mysql client
    Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
    increased buffers for user name & db

  sql/sql_acl.cc@1.74.1.105, 2006-08-30 15:56:14+05:00, gluh@mysql.com +5 -1
    Bug#20393 User name truncation in mysql client
    Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
    check that user name is not longer than USERNAME_LENGTH symbols
    

  sql/sql_parse.cc@1.271.1.215, 2006-08-30 15:56:14+05:00, gluh@mysql.com +2 -2
    Bug#20393 User name truncation in mysql client
    Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
    increased buffers for user name & db

  sql/table.cc@1.111.4.6, 2006-08-30 15:56:14+05:00, gluh@mysql.com +4 -2
    Bug#20393 User name truncation in mysql client
    Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
    check that db name is not longer than NAME_LEN symbols

ChangeSet@1.2255.68.1, 2006-08-30 12:17:35+02:00, georg@lmy002.wdf.sap.corp +1 -0
  Fix for bug #20907
  
  CMake versions > 2.4 allow linking to STATIC or SHARED libraries only.
  

  libmysql/CMakeLists.txt@1.11, 2006-08-30 12:17:28+02:00, georg@lmy002.wdf.sap.corp +1 -1
    Fix for Cmake BC problems (as suggested by Elliot)

ChangeSet@1.2255.67.1, 2006-08-30 11:41:21+02:00, mskold@mysql.com +17 -0
  NDBAPI cleanup

  sql/ha_ndbcluster.cc@1.346.4.1, 2006-08-30 11:40:32+02:00, mskold@mysql.com +16 -0
    NDBAPI cleanup

  sql/ha_ndbcluster_binlog.cc@1.77.2.1, 2006-08-30 11:40:33+02:00, mskold@mysql.com +18 -13
    NDBAPI cleanup

  storage/ndb/include/ndbapi/Ndb.hpp@1.59, 2006-08-30 11:40:34+02:00, mskold@mysql.com +9 -0
    NDBAPI cleanup

  storage/ndb/include/ndbapi/NdbTransaction.hpp@1.46.1.3, 2006-08-30 11:40:34+02:00, mskold@mysql.com +2 -1
    NDBAPI cleanup

  storage/ndb/include/ndbapi/ndb_cluster_connection.hpp@1.16.1.1, 2006-08-30 11:40:35+02:00, mskold@mysql.com +2 -0
    NDBAPI cleanup

  storage/ndb/include/transporter/TransporterRegistry.hpp@1.23, 2006-08-30 11:40:35+02:00, mskold@mysql.com +1 -0
    NDBAPI cleanup

  storage/ndb/src/common/transporter/Packer.cpp@1.8, 2006-08-30 11:40:36+02:00, mskold@mysql.com +2 -2
    NDBAPI cleanup

  storage/ndb/src/common/transporter/TransporterRegistry.cpp@1.65, 2006-08-30 11:40:36+02:00, mskold@mysql.com +7 -7
    NDBAPI cleanup

  storage/ndb/src/common/util/ndb_init.c@1.4, 2006-08-30 11:40:37+02:00, mskold@mysql.com +19 -0
    NDBAPI cleanup

  storage/ndb/src/mgmapi/mgmapi.cpp@1.67.1.1, 2006-08-30 11:40:37+02:00, mskold@mysql.com +1 -1
    NDBAPI cleanup

  storage/ndb/src/ndbapi/Ndb.cpp@1.78, 2006-08-30 11:40:38+02:00, mskold@mysql.com +6 -0
    NDBAPI cleanup

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.147.1.1, 2006-08-30 11:40:38+02:00, mskold@mysql.com +0 -55
    NDBAPI cleanup

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.66.1.1, 2006-08-30 11:40:39+02:00, mskold@mysql.com +6 -21
    NDBAPI cleanup

  storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp@1.27.1.1, 2006-08-30 11:40:40+02:00, mskold@mysql.com +3 -2
    NDBAPI cleanup

  storage/ndb/src/ndbapi/NdbTransaction.cpp@1.58, 2006-08-30 11:40:40+02:00, mskold@mysql.com +6 -5
    NDBAPI cleanup

  storage/ndb/src/ndbapi/ndb_cluster_connection.cpp@1.41.1.1, 2006-08-30 11:40:41+02:00, mskold@mysql.com +76 -11
    NDBAPI cleanup

  storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp@1.8, 2006-08-30 11:40:41+02:00, mskold@mysql.com +10 -0
    NDBAPI cleanup

ChangeSet@1.2255.52.5, 2006-08-30 13:42:31+05:00, gluh@mysql.com +1 -0
  bug#21676 select * from information_schema.files crashes server
  skip engine handling if engine is disabled

  sql/sql_show.cc@1.354.11.1, 2006-08-30 13:42:25+05:00, gluh@mysql.com +1 -1
    bug#21676 select * from information_schema.files crashes server
    skip engine handling if engine is disabled

ChangeSet@1.2245.6.1, 2006-08-30 10:22:43+03:00, aelkin@andrepl.dsl.inet.fi +48 -0
     Changes made according to HLD/LLD.
     The following is an excerption from the WL.
        
     1. Change so that MIXED is default format
        1.1 to change the default for command line --binlog-format
        1.2 to alter global_system_variables.binlog_format calculation
            basing on command line --binlog-format parameter and 
            its default.
     2. Change test suite so that more testing is done by MIXED format.
        2.1 to check if there are test cases requiring --binlog-foramt=statement via
            `source include/have_binlog_format_statement.inc' and affected by 
            altering the latter to be "mixed".
        2.2 to check the content of such vulnerable cases to find if
            extending to the mixed does not modify results. In that case simply
            substitute source arguments as explained.
        2.3 if a test in mixed mode deals with features triggering
            row-binlogging then if necessary we can switch explicitly
            to statement mode or create another test to run with 
            non-recommended STATEMENT mode
     
            Particullarily, extracting INSERT DELAYED 
            binlogging subtest for statement mode is performed, and 
            the snippet is moved into a separate test file.
            Note that since now all three modes verify this use case
            through 3 different tests.
     
     No changes in item 3 of HLD appeared to be needed.

  mysql-test/t/rpl_heap.test@1.10.1.1, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/extra/binlog_tests/binlog.test@1.11.1.1, 2006-08-30 10:22:40+03:00, aelkin@andrepl.dsl.inet.fi +1 -21
    Moving INSERT DELAYED verification section into separate file. The latter is sourced
    from two different files: the current one and a newly created for STATEMENT
    mode check.

  mysql-test/extra/binlog_tests/binlog_insert_delayed.test@1.1, 2006-08-30 10:22:42+03:00, aelkin@andrepl.dsl.inet.fi +22 -0
    Snippend sourced from two tests to verify INSERT DELAYED in all three binlog formats.
    

  mysql-test/extra/binlog_tests/binlog_insert_delayed.test@1.0, 2006-08-30 10:22:42+03:00, aelkin@andrepl.dsl.inet.fi +0 -0

  mysql-test/extra/rpl_tests/rpl_loaddata.test@1.5, 2006-08-30 10:22:40+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/extra/rpl_tests/rpl_stm_000001.test@1.47, 2006-08-30 10:22:40+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/extra/rpl_tests/rpl_stm_charset.test@1.20, 2006-08-30 10:22:40+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/include/have_binlog_format_mixed.inc@1.1, 2006-08-30 10:22:42+03:00, aelkin@andrepl.dsl.inet.fi +4 -0
    Part of exclusive MIXED format requirement

  mysql-test/include/have_binlog_format_mixed.inc@1.0, 2006-08-30 10:22:42+03:00, aelkin@andrepl.dsl.inet.fi +0 -0

  mysql-test/include/have_binlog_format_mixed_or_statement.inc@1.1, 2006-08-30 10:22:42+03:00, aelkin@andrepl.dsl.inet.fi +5 -0
    requirement to have mixed or statement. Most of the tests with STATEMENT format indeed
    are tolerant to MIXED format to yield the same result files. There are few exception
    because of features triggering RBR events when MIXED format. 

  mysql-test/include/have_binlog_format_mixed_or_statement.inc@1.0, 2006-08-30 10:22:42+03:00, aelkin@andrepl.dsl.inet.fi +0 -0

  mysql-test/r/binlog_statement_insert_delayed.result@1.1, 2006-08-30 10:22:42+03:00, aelkin@andrepl.dsl.inet.fi +18 -0
    BitKeeper file /home/elkin/MySQL/TEAM/FIXES/5.1/wl3368_mixed_default/mysql-test/r/binlog_statement_insert_delayed.result

  mysql-test/r/binlog_statement_insert_delayed.result@1.0, 2006-08-30 10:22:42+03:00, aelkin@andrepl.dsl.inet.fi +0 -0

  mysql-test/r/binlog_stm_binlog.result@1.11.1.1, 2006-08-30 10:22:40+03:00, aelkin@andrepl.dsl.inet.fi +6 -4
    new result to correspond to MIXED mode.

  mysql-test/r/have_binlog_format_mixed.require@1.1, 2006-08-30 10:22:42+03:00, aelkin@andrepl.dsl.inet.fi +2 -0
    Exclusive MIXED format

  mysql-test/r/have_binlog_format_mixed.require@1.0, 2006-08-30 10:22:42+03:00, aelkin@andrepl.dsl.inet.fi +0 -0

  mysql-test/r/rpl_rbr_to_sbr.result@1.3, 2006-08-30 10:22:40+03:00, aelkin@andrepl.dsl.inet.fi +0 -3
    result changed

  mysql-test/t/archive.test@1.24, 2006-08-30 10:22:40+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/binlog_statement_insert_delayed.test@1.1, 2006-08-30 10:22:42+03:00, aelkin@andrepl.dsl.inet.fi +6 -0
    BitKeeper file /home/elkin/MySQL/TEAM/FIXES/5.1/wl3368_mixed_default/mysql-test/t/binlog_statement_insert_delayed.test

  mysql-test/t/binlog_statement_insert_delayed.test@1.0, 2006-08-30 10:22:42+03:00, aelkin@andrepl.dsl.inet.fi +0 -0

  mysql-test/t/binlog_stm_binlog.test@1.6, 2006-08-30 10:22:40+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require exclusive mixed format because of INSERT DELAYED.

  mysql-test/t/binlog_stm_blackhole.test@1.3, 2006-08-30 10:22:40+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/binlog_stm_ctype_cp932.test@1.3, 2006-08-30 10:22:40+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/binlog_stm_ctype_ucs.test@1.2, 2006-08-30 10:22:40+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/binlog_stm_drop_tmp_tbl.test@1.2, 2006-08-30 10:22:40+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/binlog_stm_innodb_stat.test@1.2, 2006-08-30 10:22:40+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/binlog_stm_insert_select.test@1.2, 2006-08-30 10:22:40+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/binlog_stm_mix_innodb_myisam.test@1.4, 2006-08-30 10:22:40+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/create_select_tmp.test@1.14, 2006-08-30 10:22:40+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/ctype_cp932_binlog_stm.test@1.3, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/date_formats.test@1.21.1.1, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +3 -3
    MIXED case appended to the replace instruction

  mysql-test/t/mysqlbinlog.test@1.26.1.1, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/mysqlbinlog2.test@1.10, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/ndb_multi.test@1.13, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/rpl000013.test@1.19, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/rpl_loaddata_s.test@1.16, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/rpl_mixed_ddl_dml.test@1.23, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/rpl_rbr_to_sbr.test@1.4, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -2
    Rather meaningless line is discarded.
    The test does not loose anything without it and without considering the WL.

  mysql-test/t/rpl_rewrt_db.test@1.10, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/rpl_rotate_logs.test@1.67, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/rpl_stm_EE_err2.test@1.2, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/rpl_stm_flsh_tbls.test@1.2, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/rpl_stm_log.test@1.3, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/rpl_stm_max_relay_size.test@1.2, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/rpl_stm_multi_query.test@1.2, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/rpl_stm_mystery22.test@1.10, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/rpl_stm_no_op.test@1.3, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/rpl_stm_reset_slave.test@1.2, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/rpl_stm_until.test@1.25, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/rpl_temp_table.test@1.21, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/rpl_trigger.test@1.8.1.1, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/rpl_trunc_temp.test@1.4, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  mysql-test/t/user_var-binlog.test@1.7, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +1 -1
    require mixed_or_statement

  sql/mysqld.cc@1.564.13.1, 2006-08-30 10:22:41+03:00, aelkin@andrepl.dsl.inet.fi +11 -1
    Implementation of making BINLOG_FORMAT_MIXED to be the default of
    global_system_variables.binlog_format. Not in the case of embedded.

ChangeSet@1.1810.2076.3, 2006-08-30 03:22:59+04:00, kostja@bodhi.local +3 -0
  Post-merge fixes.

  mysql-test/r/view.result@1.138.1.35, 2006-08-30 03:22:56+04:00, kostja@bodhi.local +11 -11
    A post-merge fix.

  mysql-test/t/grant.test@1.41.1.7, 2006-08-30 03:22:56+04:00, kostja@bodhi.local +1 -1
    A post-merge fix.

  mysql-test/t/view.test@1.126.1.34, 2006-08-30 03:22:56+04:00, kostja@bodhi.local +43 -40
    A post-merge fix.

ChangeSet@1.1810.2076.2, 2006-08-30 01:48:15+04:00, kostja@bodhi.local +3 -0
  Remove the fix for Bug#10668 "CREATE USER does not enforce username 
  length limit", it's superseded by the fix for Bug#16899 "Possible buffer
  overflow in handling of DEFINER-clause". Update test results.

  mysql-test/r/grant.result@1.37.1.22, 2006-08-30 01:48:11+04:00, kostja@bodhi.local +2 -1
    A post-merge fix.

  mysql-test/t/grant.test@1.41.1.6, 2006-08-30 01:48:11+04:00, kostja@bodhi.local +3 -2
    A new error is returned, use the default database after drop database.

  sql/sql_acl.cc@1.128.36.2, 2006-08-30 01:48:11+04:00, kostja@bodhi.local +0 -8
    Remove an unneeded check.

ChangeSet@1.1810.2027.15, 2006-08-30 00:38:58+04:00, kostja@bodhi.local +4 -0
  A fix for Bug#14897 "ResultSet.getString("table.column") sometimes 
  doesn't find the column"
  
  When a user was using 4.1 tables with VARCHAR column and 5.0 server
  and a query that used a temporary table to resolve itself, the
  table metadata for the varchar column sent to client was incorrect:
  MYSQL_FIELD::table member was empty.
  
  The bug was caused by implicit "upgrade" from old VARCHAR to new
  VARCHAR hard-coded in Field::new_field, which did not preserve
  the information about the original table. Thus, the field metadata
  of the "upgraded" field pointed to an auxiliary temporary table
  created for query execution.
  
  The fix is to copy the pointer to the original table to the new field.

  mysql-test/r/type_varchar.result@1.8.1.1, 2006-08-30 00:38:53+04:00, kostja@bodhi.local +31 -0
    Update test results (Bug#14897)

  mysql-test/std_data/14897.frm@1.1, 2006-08-30 00:38:54+04:00, kostja@bodhi.local +193 -0
    New BitKeeper file ``mysql-test/std_data/14897.frm''

  mysql-test/std_data/14897.frm@1.0, 2006-08-30 00:38:54+04:00, kostja@bodhi.local +0 -0

  mysql-test/t/type_varchar.test@1.8.1.1, 2006-08-30 00:38:54+04:00, kostja@bodhi.local +41 -0
    Add a test case for Bug#14897 "ResultSet.getString("table.column") 
    sometimes doesn't find the column"

  sql/field.cc@1.256.28.2, 2006-08-30 00:38:54+04:00, kostja@bodhi.local +19 -8
    Preserve the original table name when converting fields from 
    old VARCHAR to new VARCHAR.     

ChangeSet@1.2245.5.4, 2006-08-29 22:23:56+02:00, mkindahl@dl145h.mysql.com +2 -0
  Various fixes to make MyTAP build on all platforms.

  unittest/Makefile.am@1.11, 2006-08-29 22:23:51+02:00, mkindahl@dl145h.mysql.com +2 -4
    Not installing unit.pl any more.
    Adding test-verbose target to see the TAP output (for debugging).

  unittest/mytap/tap.h@1.7, 2006-08-29 22:23:51+02:00, mkindahl@dl145h.mysql.com +25 -3
    Including portability file.
    Whitespace changes.
    Code sample for BAIL_OUT() function.

ChangeSet@1.2255.66.1, 2006-08-29 11:58:12-07:00, brian@zim.(none) +4 -0
  Re'ordering of startup. Fixed Execution path issues. Added function for de'initing everything. This includes Antony's suggestions (bk collapse uber alles!)

  sql/handler.cc@1.263, 2006-08-29 11:58:09-07:00, brian@zim.(none) +0 -6
    Removed temp work needed for making status variables work with plugins.

  sql/mysqld.cc@1.564.10.5, 2006-08-29 11:58:09-07:00, brian@zim.(none) +3 -4
    Removed call to plugin_load()  (not needed any longer).

  sql/sql_plugin.cc@1.28, 2006-08-29 11:58:09-07:00, brian@zim.(none) +105 -87
    Status vars are now located in only one location (while this fixed execution path problems, we will need to now fix "the name" issues). Monty and I have a solution to this :)
    Added function for deiniting engines (before the logic was scattered about).
    Added step by step processing for startup of plugins. MyISAM is now loaded first (we will address this long term in a different manner).

  sql/sql_plugin.h@1.11, 2006-08-29 11:58:09-07:00, brian@zim.(none) +2 -5
    Removed calls that did not need to be extern.

ChangeSet@1.1346.880.1, 2006-08-29 20:45:04+02:00, istruewing@chilla.local +3 -0
  Bug#14400 - Query joins wrong rows from table which is
              subject of "concurrent insert"
  Better fix by Monty: "The previous bug fix didn't work
  when using partial keys."

  mysql-test/r/myisam.result@1.10.3.1, 2006-08-29 20:45:03+02:00, istruewing@chilla.local +15 -0
    Bug#14400 - Query joins wrong rows from table which is
                subject of "concurrent insert"
    Added test result

  mysql-test/t/myisam.test@1.7.3.1, 2006-08-29 20:45:03+02:00, istruewing@chilla.local +17 -0
    Bug#14400 - Query joins wrong rows from table which is
                subject of "concurrent insert"
    Added test case

  myisam/mi_rkey.c@1.11.2.1, 2006-08-29 20:45:03+02:00, istruewing@chilla.local +31 -12
    Bug#14400 - Query joins wrong rows from table which is
                subject of "concurrent insert"
    Better fix by Monty: "The previous bug fix didn't work
    when using partial keys."

ChangeSet@1.2255.64.1, 2006-08-29 17:37:48+02:00, guilhem@gbichot3.local +2 -0
  Fix for BUG#20866 "show table status on innodb raises assertion"
  and its duplicate BUG#19057 "Test 'rpl_row_func003' fails on SuSE SLES9 x86".
  It was an assertion failure, only in debug builds, not present
  in released versions (nothing to document).
  It happened when doing SHOW TABLE STATUS on an InnoDB table
  having an auto_increment column, right after creating the table.
  The test which would have caught this problem was disabled in 
  mid-April for another reason (how much I like tests disabled for
  months...).

  mysql-test/t/disabled.def@1.184.1.6, 2006-08-29 17:37:45+02:00, guilhem@gbichot3.local +0 -1
    test now passes (and serves as the test for this bugfix)

  sql/ha_innodb.cc@1.288, 2006-08-29 17:37:46+02:00, guilhem@gbichot3.local +7 -1
    Before a val_() calls on a Field object, if that field was not marked
    for read, we need to mark it. This is explained here:
    ChangeSet 1.2119.601.1 2006/06/04 18:52:22 monty@mysql.com
    quoting the changeset's comment:
    
      - If a handler needs to call Field->val() or Field->store() on columns
        that are not used in the query, one should install a temporary
        all-columns-used map while doing so. For this, we provide the following
        functions:
      
        my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
        field->val();
        dbug_tmp_restore_column_map(table->read_set, old_map);
      
        and similar for the write map:
      
        my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
        field->val();
        dbug_tmp_restore_column_map(table->write_set, old_map);
      
        If this is not done, you will sooner or later hit a DBUG_ASSERT
        in the field store() / val() functions.
        (For not DBUG binaries, the dbug_tmp_restore_column_map() and
        dbug_tmp_restore_column_map() are inline dummy functions and should
        be optimized away be the compiler).
    
    Note that I verified that the bug didn't exist in non-debug builds.

ChangeSet@1.2255.51.9, 2006-08-29 09:30:58-04:00, cmiller@zippy.cornsilk.net +1 -0
  Correcting bad merge.

  mysql-test/r/partition_mgm.result@1.5.1.2, 2006-08-29 09:30:56-04:00, cmiller@zippy.cornsilk.net +4 -4
    Correcting bad merge.

ChangeSet@1.1616.2741.1, 2006-08-29 16:59:20+04:00, kroki@moonlight.intranet +3 -0
  BUG#21096: locking issue ; temporary table conflicts.
  
  The problem was that during DROP TEMPORARY TABLE we tried to acquire
  the name lock, though temporary tables belongs to one connection, and
  no race is possible.
  
  The solution is to not use table name locking while executing
  DROP TEMPORARY TABLE.

  mysql-test/r/temp_table.result@1.9.1.3, 2006-08-29 16:59:18+04:00, kroki@moonlight.intranet +17 -0
    Add result for bug#21096: locking issue ; temporary table conflicts.

  mysql-test/t/temp_table.test@1.9.1.2, 2006-08-29 16:59:18+04:00, kroki@moonlight.intranet +47 -1
    Add test case for bug#21096: locking issue ; temporary table conflicts.

  sql/sql_table.cc@1.157.61.1, 2006-08-29 16:59:18+04:00, kroki@moonlight.intranet +3 -2
    Do not use table name locking while executing DROP TEMPORARY TABLE.

ChangeSet@1.1810.2075.1, 2006-08-29 15:46:40+04:00, anozdrin@alik. +16 -0
  Preliminary patch for the following bugs:
    - BUG#15934: Instance manager fails to work;
    - BUG#18020: IM connect problem;
    - BUG#18027: IM: Server_ID differs;
    - BUG#18033: IM: Server_ID not reported;
    - BUG#21331: Instance Manager: Connect problems in tests;
  
  The only test suite has been changed
  (server codebase has not been modified).

  BitKeeper/deleted/.del-im_check_os.inc@1.1.1.1, 2006-08-29 15:38:17+04:00, anozdrin@alik. +0 -0
    Rename: mysql-test/include/im_check_os.inc -> BitKeeper/deleted/.del-im_check_os.inc

  mysql-test/t/im_options_set.imtest@1.2.2.1, 2006-08-29 15:46:39+04:00, anozdrin@alik. +0 -1
    Updated IM-test.

  mysql-test/r/im_options_set.result@1.4.2.1, 2006-08-29 15:46:39+04:00, anozdrin@alik. +0 -1
    Updated result file.

  mysql-test/t/im_options_unset.imtest@1.2.2.1, 2006-08-29 15:46:39+04:00, anozdrin@alik. +0 -1
    Updated IM-test.

  mysql-test/r/im_options_unset.result@1.4.2.1, 2006-08-29 15:46:39+04:00, anozdrin@alik. +0 -1
    Updated result file.

  BitKeeper/etc/collapsed@1.4, 2006-08-29 15:38:17+04:00, anozdrin@alik. +1 -0

  mysql-test/include/im_check_env.inc@1.2, 2006-08-29 15:46:39+04:00, anozdrin@alik. +2 -4
    Include only this file from all IM-tests.

  mysql-test/lib/mtr_io.pl@1.3.1.1, 2006-08-29 15:46:39+04:00, anozdrin@alik. +32 -6
    Update mtr_get_pid_from_file() to workaround race,
    described in BUG#21884.

  mysql-test/lib/mtr_process.pl@1.25.2.7, 2006-08-29 15:46:39+04:00, anozdrin@alik. +782 -54
    Refactor im_start()/im_stop() so that they will be more
    reliable. There are the following user-visible changes:
      - if one of these functions fails, the test suite
        is aborted;
      - mtr_im_stop() now determines whether the component is
        alive or not not only by checking PID, but also by trying
        to connect to the component;
      - after starting IM, the test suite waits for it to start
        accepting client connections and to start all its guarded
        mysqld instances;
      - a lot of debug-logs have been added in order to simplify
        investigation of future failures.

  mysql-test/mysql-test-run.pl@1.30.38.3, 2006-08-29 15:46:39+04:00, anozdrin@alik. +13 -246
    1. Get rid of kill_and_cleanup();
    2. Move im_start()/im_stop() to mtr_process.pl;
    3. Change default IM port to 9311 so that it does not interfere
       with default slave port;

  mysql-test/r/im_daemon_life_cycle.result@1.2.1.3, 2006-08-29 15:46:39+04:00, anozdrin@alik. +0 -1
    Updated result file.

  mysql-test/r/im_life_cycle.result@1.3.2.2, 2006-08-29 15:46:39+04:00, anozdrin@alik. +0 -1
    Updated result file.

  mysql-test/r/im_utils.result@1.1.1.4, 2006-08-29 15:46:39+04:00, anozdrin@alik. +0 -1
    Updated result file.

  mysql-test/t/im_daemon_life_cycle.imtest@1.1.1.3, 2006-08-29 15:46:39+04:00, anozdrin@alik. +0 -1
    Updated IM-test.

  mysql-test/t/im_life_cycle.imtest@1.3.2.2, 2006-08-29 15:46:39+04:00, anozdrin@alik. +0 -1
    Updated IM-test.

  mysql-test/t/im_utils.imtest@1.1.1.3, 2006-08-29 15:46:39+04:00, anozdrin@alik. +0 -1
    Updated IM-test.

ChangeSet@1.1810.2074.1, 2006-08-29 14:32:59+04:00, kroki@moonlight.intranet +3 -0
  BUG#17591: Updatable view not possible with trigger or stored function
  
  When a view was used inside a trigger or a function, lock type for
  tables used in a view was always set to READ (thus making the view
  non-updatable), even if we were trying to update the view.
  
  The solution is to set lock type properly.

  mysql-test/r/view.result@1.138.16.1, 2006-08-29 14:32:57+04:00, kroki@moonlight.intranet +27 -1
    Add result for bug#17591: Updatable view not possible with trigger
    or stored function.

  mysql-test/t/view.test@1.126.14.1, 2006-08-29 14:32:57+04:00, kroki@moonlight.intranet +48 -1
    Add test case for bug#17591: Updatable view not possible with trigger
    or stored function.

  sql/sql_view.cc@1.78.10.1, 2006-08-29 14:32:57+04:00, kroki@moonlight.intranet +30 -22
    Move the code that sets requested lock type before the point where
    we exit from mysql_make_view() when we process a placeholder for
    prelocked table.

ChangeSet@1.1616.2740.1, 2006-08-29 14:38:02+05:00, ramil@mysql.com +1 -0
  Fix for bug #21142: Malformed insert causes a segmentation fault.
    - possible stack overflow fixed.

  client/mysql.cc@1.121.17.2, 2006-08-29 14:38:00+05:00, ramil@mysql.com +2 -2
    Fix for bug #21142: Malformed insert causes a segmentation fault.
      - as 'line' may be longer than 'buff' we must take into account its length.

ChangeSet@1.2270.2.20, 2006-08-29 10:47:28+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb -
    Add order by in rpl_(ndb)_multi_update3 to make result deterministic

  mysql-test/extra/rpl_tests/rpl_multi_update3.test@1.3, 2006-08-29 10:47:27+02:00, jonas@perch.ndb.mysql.com +1 -1
    Add order by in rpl_(ndb)_multi_update3 to make result deterministic

  mysql-test/r/rpl_multi_update3.result@1.10, 2006-08-29 10:47:27+02:00, jonas@perch.ndb.mysql.com +1 -1
    Add order by in rpl_(ndb)_multi_update3 to make result deterministic

  mysql-test/r/rpl_ndb_multi_update3.result@1.4, 2006-08-29 10:47:27+02:00, jonas@perch.ndb.mysql.com +1 -1
    Add order by in rpl_(ndb)_multi_update3 to make result deterministic

ChangeSet@1.2270.2.19, 2006-08-29 09:19:41+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - 
    fix backup/lcp race

  storage/ndb/src/kernel/blocks/backup/Backup.cpp@1.50.1.3, 2006-08-29 09:19:39+02:00, jonas@perch.ndb.mysql.com +1 -1
    fix backup/lcp race

ChangeSet@1.1810.2073.3, 2006-08-29 13:31:29+08:00, gni@dev3-127.(none) +1 -0
  merge from ndb-5.0-ndb and ndb-5.0-ndb-bj

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.22.3, 2006-08-29 13:31:27+08:00, gni@dev3-127.(none) +2 -2
    connect() function adds a parameter in CommandInterpreter.cpp.

ChangeSet@1.1616.2739.1, 2006-08-29 09:55:07+08:00, dli@dev3-76.dev.cn.tlan +3 -0
  Fix for bug #21345: Error in cluster logfile rotation.
  Fixed the cluster logfile rotation code, let the cluster log file be renamed correctly when the main log file exceeds the configured maximum size.

  ndb/include/util/File.hpp@1.4.2.1, 2006-08-29 09:55:05+08:00, dli@dev3-76.dev.cn.tlan +8 -0
    Fix for bug #21345: Error in cluster logfile rotation.

  ndb/src/common/logger/FileLogHandler.cpp@1.9.2.1, 2006-08-29 09:55:05+08:00, dli@dev3-76.dev.cn.tlan +10 -1
    Fix for bug #21345: Error in cluster logfile rotation.

  ndb/src/common/util/File.cpp@1.8.3.1, 2006-08-29 09:55:05+08:00, dli@dev3-76.dev.cn.tlan +12 -0
    Fix for bug #21345: Error in cluster logfile rotation.

ChangeSet@1.2255.51.8, 2006-08-28 21:13:55-04:00, iggy@rolltop.ignatz42.dyndns.org +2 -0
  Post merge changes.

  mysql-test/r/mysqldump.result@1.123, 2006-08-28 21:13:52-04:00, iggy@rolltop.ignatz42.dyndns.org +5 -5
    post-merge fix.

  mysql-test/t/mysqldump.test@1.117, 2006-08-28 21:13:52-04:00, iggy@rolltop.ignatz42.dyndns.org +1 -1
    post-merge fix.

ChangeSet@1.1346.875.2, 2006-08-29 01:13:06+02:00, tsmith@maint1.mysql.com +1 -0
  minor portability fix in SETUP.sh

  BUILD/SETUP.sh@1.17.1.8, 2006-08-29 01:12:45+02:00, tsmith@maint1.mysql.com +3 -9

ChangeSet@1.1810.2042.10, 2006-08-28 17:48:06-04:00, iggy@rolltop.ignatz42.dyndns.org +3 -0
  Bug #21527 mysqldump incorrectly tries to LOCK TABLES on the information_schema database.
      
  init_dumping now accepts a function pointer to the table or view specific init_dumping function.  This allows both tables and views to use the init_dumping function.

  client/mysqldump.c@1.214.1.24, 2006-08-28 17:48:04-04:00, iggy@rolltop.ignatz42.dyndns.org +80 -54
    Added functions for table and view specific dumping initalization.

  mysql-test/r/mysqldump.result@1.83.1.28, 2006-08-28 17:48:04-04:00, iggy@rolltop.ignatz42.dyndns.org +14 -0
    Added Result.

  mysql-test/t/mysqldump.test@1.76.1.25, 2006-08-28 17:48:04-04:00, iggy@rolltop.ignatz42.dyndns.org +30 -0
    Added test case.

ChangeSet@1.2270.2.18, 2006-08-28 15:55:30+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - 
    Snapup testBackup XXXerror

  storage/ndb/src/kernel/blocks/backup/Backup.cpp@1.50.1.2, 2006-08-28 15:55:27+02:00, jonas@perch.ndb.mysql.com +81 -66
    Snapup testBackup XXXerror

  storage/ndb/src/kernel/blocks/backup/Backup.hpp@1.24, 2006-08-28 15:55:27+02:00, jonas@perch.ndb.mysql.com +1 -0
    Snapup testBackup XXXerror

ChangeSet@1.2255.25.11, 2006-08-28 10:27:42+02:00, andrey@example.com +6 -0
  WL#3337 (Event scheduler new architecture)
  
  Don't send affected rows after CREATE/ALTER/DROP EVENT as this is
  inconsistent with the rest of the server in terms of CREATE/ALTER/DROP
  DDLs

  sql/event_data_objects.cc@1.76, 2006-08-28 10:27:37+02:00, andrey@example.com +1 -2
    Events::drop_event() does not expect anymore a parameter named affected_rows

  sql/event_db_repository.cc@1.16, 2006-08-28 10:27:37+02:00, andrey@example.com +2 -6
    Remove rows_affected as the behavior exposed by Events is not
    coherent with the behavior of many other DDL, like CREATE PROCEDURE, etc.

  sql/event_db_repository.h@1.11, 2006-08-28 10:27:37+02:00, andrey@example.com +2 -4
    Remove rows_affected as the behavior exposed by Events is not
    coherent with the behavior of many other DDL, like CREATE PROCEDURE, etc.

  sql/events.cc@1.60, 2006-08-28 10:27:37+02:00, andrey@example.com +5 -12
    Remove rows_affected as the behavior exposed by Events is not
    coherent with the behavior of many other DDL, like CREATE PROCEDURE, etc.

  sql/events.h@1.45, 2006-08-28 10:27:37+02:00, andrey@example.com +3 -5
    Remove rows_affected as the behavior exposed by Events is not
    coherent with the behavior of many other DDL, like CREATE PROCEDURE, etc.

  sql/sql_parse.cc@1.572, 2006-08-28 10:27:37+02:00, andrey@example.com +8 -10
    Don't send affected rows, because this behavior is not consistent
    with the rest of the server for CREATE/ALTER/DROP DDLs

ChangeSet@1.1810.1972.26, 2006-08-28 10:26:21+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21615
    Improve error message when detecting corrupted REDO log

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.66.28.1, 2006-08-28 10:26:19+02:00, jonas@perch.ndb.mysql.com +48 -30
    Improve error message when detecting corrupted REDO log

ChangeSet@1.2270.2.16, 2006-08-28 08:32:14+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - autotest
    adopt to new error code 755 (invalid tablespace)

  storage/ndb/test/src/NDBT_Tables.cpp@1.18.1.1, 2006-08-28 08:32:12+02:00, jonas@perch.ndb.mysql.com +1 -1
    Fxi new error code

ChangeSet@1.1616.2735.10, 2006-08-26 18:38:42+02:00, msvensson@neptunus.(none) +1 -0
  Dont' ever use cluster for slave in 4.1

  mysql-test/mysql-test-run.pl@1.8.9.11, 2006-08-26 18:38:40+02:00, msvensson@neptunus.(none) +1 -1
    Dont' ever use cluster for slave in 4.1

ChangeSet@1.2255.1.24, 2006-08-26 10:40:58-04:00, mikael@dator5.(none) +1 -0
  Enabled partition test again

  mysql-test/t/disabled.def@1.184.6.1, 2006-08-26 10:40:56-04:00, mikael@dator5.(none) +0 -1
    Enabled partition test again

ChangeSet@1.1810.2069.2, 2006-08-26 10:21:26+04:00, kaa@polly.local +1 -0
  Post-review fix (bug #21250)

  sql/stacktrace.c@1.18, 2006-08-26 10:21:23+04:00, kaa@polly.local +4 -0
    Post-review fix (bug #21250)

ChangeSet@1.2255.60.1, 2006-08-25 13:31:15-07:00, brian@zim.(none) +7 -0
  Cleanup of unused variables.
  Fixed "discover" in the handler API.
  
  Fixed problem where handlerton was not zero'ed. I need to look around, I suspect this problem is more widespread. 

  sql/ha_ndbcluster.cc@1.346.2.5, 2006-08-25 13:31:11-07:00, brian@zim.(none) +1 -0
    Added "discover" to handlerton.

  sql/handler.cc@1.259.1.1, 2006-08-25 13:31:11-07:00, brian@zim.(none) +27 -4
    Added plugin loop and correctly now use handler API.

  sql/handler.h@1.232.1.1, 2006-08-25 13:31:11-07:00, brian@zim.(none) +2 -1
    Removed unused variable. Added discover to handler API

  sql/mysqld.cc@1.564.10.3, 2006-08-25 13:31:11-07:00, brian@zim.(none) +1 -8
    Removed unused variables. 

  sql/sql_plugin.cc@1.25.1.1, 2006-08-25 13:31:11-07:00, brian@zim.(none) +1 -1
    Fixed DBUG Enter comment (obvious cut paste mistake)

  storage/csv/ha_tina.cc@1.55.2.1, 2006-08-25 13:31:11-07:00, brian@zim.(none) +1 -0
    Found that if we don't bzero handlerton, that things can go boom!
    
    This probably needs to be fixed for all handlers

  sql/ha_innodb.h@1.125, 2006-08-25 13:31:11-07:00, brian@zim.(none) +0 -6
    Unused variable

ChangeSet@1.1810.2070.1, 2006-08-25 11:54:33-04:00, cmiller@zippy.cornsilk.net +3 -0
  Bug#21543: 5.0.24 breaks ABI compatibility for python bindings: \
  	InterfaceError on connect
  
  Removed the bool flag from the st_mysql_options struct, since it adds 
  another word in size to the memory size and shifts member memory locations
  down, both of which break binary-interface compatibility.
  
  Instead, use a flag, 2**30, in the client_options bit-field to represent
  that the client should check the SSL certificate of the server.

  include/mysql.h@1.154.4.1, 2006-08-25 11:54:31-04:00, cmiller@zippy.cornsilk.net +0 -1
    Do not change the struct size.

  include/mysql_com.h@1.100.3.1, 2006-08-25 11:54:31-04:00, cmiller@zippy.cornsilk.net +4 -2
    Add a new bit-flag for client verifying server SSL certificate.
    
    Emphasize that we're not stepping on anyone else's bit/toes.

  sql-common/client.c@1.83.7.1, 2006-08-25 11:54:31-04:00, cmiller@zippy.cornsilk.net +5 -3
    Set and read the bit-field for client-side SSL-cert checking of the server.

ChangeSet@1.1616.2735.9, 2006-08-25 17:01:04+02:00, msvensson@neptunus.(none) +1 -0
  Ignore --skip-im if specified on command line 
  Null merge to 5.0

  mysql-test/mysql-test-run.pl@1.8.9.10, 2006-08-25 17:01:02+02:00, msvensson@neptunus.(none) +2 -0
    Ignore --skip-im if specified on command line 

ChangeSet@1.2245.5.3, 2006-08-25 16:50:01+02:00, mkindahl@dl145h.mysql.com +1 -0
  BUG#21833 (Prepare_commit_mutex not locked and unlocked under same condition):
  Adding condition to ensure that mutex are locked and unlocked
  under same condition.

  sql/ha_innodb.cc@1.283.1.1, 2006-08-25 16:49:50+02:00, mkindahl@dl145h.mysql.com +3 -1
    Adding condition to release and aquire mutex under same conditions.

ChangeSet@1.2270.2.15, 2006-08-25 16:47:31+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - fix some bug in testSRBank

  storage/ndb/test/ndbapi/testSRBank.cpp@1.6, 2006-08-25 16:47:29+02:00, jonas@perch.ndb.mysql.com +37 -11
    ndb - fix some bug in testSRBank

ChangeSet@1.2245.5.2, 2006-08-25 16:11:22+02:00, mkindahl@dl145h.mysql.com +1 -0
  Adding missing file

  unittest/examples/core-t.c@1.1, 2006-08-25 15:53:35+02:00, mkindahl@dl145h.mysql.com +19 -0
    BitKeeper file /users/mkindahl/mysql-5.1-clone/unittest/examples/core-t.c

  unittest/examples/core-t.c@1.0, 2006-08-25 15:53:35+02:00, mkindahl@dl145h.mysql.com +0 -0

ChangeSet@1.1810.2069.1, 2006-08-25 17:59:47+04:00, kaa@polly.local +2 -0
  Added stacktrace dumps for x86_64 (bug #21250)
  Fixed stacktrace dumps for i386/NPTL

  sql/stacktrace.c@1.17, 2006-08-25 17:59:45+04:00, kaa@polly.local +36 -15
    Added stacktrace dumps for x86_64 (bug #21250)
    Fixed stacktrace dumps for i386/NPTL

  sql/stacktrace.h@1.4, 2006-08-25 17:59:46+04:00, kaa@polly.local +6 -2
    Added stacktrace dumps for x86_64 (bug #21250)
    Fixed stacktrace dumps for i386/NPTL

ChangeSet@1.1810.2068.1, 2006-08-25 15:51:29+02:00, andrey@example.com +8 -0
  Fix for bug#21795: SP: sp_head::is_not_allowed_in_function() contains
  erroneous check
  
  Problem: Actually there were two problems in the server code. The check
  for SQLCOM_FLUSH in SF/Triggers were not according to the existing
  architecture which uses sp_get_flags_for_command() from sp_head.cc .
  This function was also missing a check for SQLCOM_FLUSH which has a
  problem combined with prelocking. This changeset fixes both of these
  deficiencies as well as the erroneous check in
  sp_head::is_not_allowed_in_function() which was a copy&paste error.

  mysql-test/r/sp-error.result@1.102.1.6, 2006-08-25 15:51:23+02:00, andrey@example.com +39 -0
    update result

  mysql-test/r/trigger.result@1.29.1.16, 2006-08-25 15:51:23+02:00, andrey@example.com +72 -1
    update result

  mysql-test/t/sp-error.test@1.100.1.8, 2006-08-25 15:51:23+02:00, andrey@example.com +39 -0
    FLUSH can create a problem with prelocking, hence it's disabled.
    There is a better way to check this than a check in the parser.
    Now we use sp_get_flags_for_command() and the error returned is
    different.

  mysql-test/t/trigger.test@1.34.1.17, 2006-08-25 15:51:23+02:00, andrey@example.com +89 -1
    FLUSH can create a problem with prelocking, hence it's disabled.
    There is a better way to check this than a check in the parser.
    Now we use sp_get_flags_for_command() and the error returned is
    different.

  sql/sp_head.cc@1.200.1.22, 2006-08-25 15:51:23+02:00, andrey@example.com +6 -0
    FLUSH and RESET are not allowed inside a SF/Trigger.
    Because they don't imply a COMMIT sp_head::HAS_COMMIT_OR_ROLLBACK
    cannot be used. Two new flags were introduced for that reason.

  sql/sp_head.h@1.79.1.9, 2006-08-25 15:51:23+02:00, andrey@example.com +11 -7
    Don't check m_type as this check is erroneous. This is probably
    a copy and paste error when moving code from somewhere else. Another
    fact which supports this was prefixing the enum value with the name
    of class sp_head.
    
    Adding two new flags HAS_SQLCOM_RESET and HAS_SQLCOM_FLUSH. The values
    are 2048 and 4096 because in the 5.1 branch there are already new flags
    which are with values up-to 1024.

  sql/sql_parse.cc@1.426.1.141, 2006-08-25 15:51:23+02:00, andrey@example.com +1 -5
    FLUSH can cause a problem with prelocking in SF/Trigger and
    therefore is already disabled. RESET is also disabled because
    is handled by the same code as FLUSH. We won't allow RESET inside
    SF/Trigger at that stage without thorough analysis. The check for
    them is already done in the parser by calling
    is_not_allowed_in_function()

  sql/sql_yacc.yy@1.371.71.6, 2006-08-25 15:51:23+02:00, andrey@example.com +2 -11
    By listing SQLCOM_FLUSH as command which implies COMMIT
    in sp_get_flags_for_command() the check in sql_yacc.yy is
    obsolete.

ChangeSet@1.1616.2735.8, 2006-08-25 15:23:42+02:00, msvensson@neptunus.(none) +1 -0
  Add mysqld-max-nt to list of mysqld executales to look for on windows

  mysql-test/mysql-test-run.pl@1.8.9.9, 2006-08-25 15:23:40+02:00, msvensson@neptunus.(none) +2 -1
    Add mysqld-max-nt to list of mysqld executales to look for on windows

ChangeSet@1.1616.2735.7, 2006-08-25 15:17:03+02:00, msvensson@neptunus.(none) +3 -0
  Backport from 5.0 a fix that will start ndb only for tests that needs it

  mysql-test/lib/mtr_cases.pl@1.6.2.3, 2006-08-25 15:16:58+02:00, msvensson@neptunus.(none) +22 -0
    Detect which tests that need ndb

  mysql-test/lib/mtr_match.pl@1.1.2.1, 2006-08-25 15:16:58+02:00, msvensson@neptunus.(none) +17 -0
    Add function mtr_match_substring

  mysql-test/mysql-test-run.pl@1.8.9.8, 2006-08-25 15:16:58+02:00, msvensson@neptunus.(none) +26 -2
    Only start cluster for test cases that need it

ChangeSet@1.2245.4.1, 2006-08-25 13:53:16+02:00, mkindahl@production.mysql.com +5 -0
  mytap-changes.patch

  unittest/Makefile.am@1.10, 2006-08-25 13:04:07+02:00, mkindahl@production.mysql.com +3 -4
    Import patch mytap-changes.patch

  unittest/README.txt@1.3.1.1, 2006-08-25 13:04:07+02:00, mkindahl@production.mysql.com +6 -1
    Import patch mytap-changes.patch

  unittest/examples/Makefile.am@1.7, 2006-08-25 13:04:07+02:00, mkindahl@production.mysql.com +1 -1
    Import patch mytap-changes.patch

  unittest/mytap/tap.c@1.6, 2006-08-25 13:04:07+02:00, mkindahl@production.mysql.com +48 -2
    Import patch mytap-changes.patch

  unittest/mytap/tap.h@1.6, 2006-08-25 13:04:07+02:00, mkindahl@production.mysql.com +23 -4
    Import patch mytap-changes.patch

ChangeSet@1.1810.2067.1, 2006-08-25 02:17:41-07:00, igor@rurik.mysql.com +3 -0
  Fixed bug #21390: wrong estimate of rows after elimination of
  const tables. This resulted in choosing extremely inefficient
  execution plans in same cases when distribution of data in
  joined were skewed (see the customer test case for the bug).
  

  mysql-test/r/select.result@1.121.1.17, 2006-08-25 02:17:34-07:00, igor@rurik.mysql.com +40 -2
    Added a test case for bug #21390: wrong estimate of rows
    after elimination of const tables.
    Includded a test case that checks the code added by the patch
    that handles outer joins with no matches after substitution of
    a const table in an efficient way.

  mysql-test/t/select.test@1.102.1.10, 2006-08-25 02:17:34-07:00, igor@rurik.mysql.com +41 -0
    Added a test case for bug #21390: wrong estimate of rows
    after elimination of const tables.
    Included a test case that checks the code added by the patch
    that handles outer joins with no matches after substitution of
    a const table in an efficient way.
     

  sql/sql_select.cc@1.312.1.135, 2006-08-25 02:17:34-07:00, igor@rurik.mysql.com +54 -24
    Fixed bug #21390: wrong estimate of rows after elimination of
    const tables. This resulted in choosing extremely inefficient
    execution plans in same cases when distribution of data in
    joined were skewed (see the customer test case for the bug).
    Also added the code to handle outer joins with no matches after
    substitution of a const table in an efficient way. 
    Corrected calculation of the null rejecting key conditions.

ChangeSet@1.1616.2735.6, 2006-08-25 10:46:14+02:00, msvensson@neptunus.(none) +2 -0
  Fix running tests suite with non standard tmp dir.
  Default is "var/tmp" 

  mysql-test/r/myisam.result@1.45.1.18, 2006-08-25 10:46:12+02:00, msvensson@neptunus.(none) +2 -2
    Update result file

  mysql-test/t/myisam.test@1.33.1.16, 2006-08-25 10:46:12+02:00, msvensson@neptunus.(none) +8 -2
    If running test suite with a non standard tmp dir, the "show create table" will print "DATA DIRECTORY="
    Use replace_result to mask it out
    Set tmpdir to var/log to get the printout of DATA DIRECTORY also when running with standard tmpdir

ChangeSet@1.1616.2736.1, 2006-08-25 10:11:15+02:00, msvensson@neptunus.(none) +1 -0
  Backport fix for finding executables from 5.0

  mysql-test/lib/mtr_misc.pl@1.5.1.2, 2006-08-25 10:11:14+02:00, msvensson@neptunus.(none) +16 -2
    On windows the exe does not need to be executable for it to be found

ChangeSet@1.2255.44.12, 2006-08-25 00:37:01-07:00, acurtis@xiphis.org +1 -0
  no longer need ifdef as plugin is conditionally compiled

  storage/federated/ha_federated.cc@1.76, 2006-08-25 00:36:58-07:00, acurtis@xiphis.org +0 -2
    no longer need ifdef as plugin is conditionally compiled

ChangeSet@1.1810.2065.2, 2006-08-25 11:34:13+04:00, kroki@moonlight.intranet +1 -0
  Comment cleanup after push of bug#21166.

  sql/item.cc@1.113.49.4, 2006-08-25 11:34:09+04:00, kroki@moonlight.intranet +7 -7
    Comment cleanup after push of bug#21166.

ChangeSet@1.2270.2.14, 2006-08-25 08:57:38+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21806
    disable ndb_autodiscover3 (cluster restart (--initial))

  mysql-test/t/disabled.def@1.185.2.4, 2006-08-25 08:57:36+02:00, jonas@perch.ndb.mysql.com +1 -0
    ndb - bug#21806

ChangeSet@1.2255.44.11, 2006-08-24 22:10:55-07:00, acurtis@xiphis.org +6 -0
  fix for windows build

  CMakeLists.txt@1.21.1.1, 2006-08-24 22:10:51-07:00, acurtis@xiphis.org +3 -0
    add for federated

  libmysqld/CMakeLists.txt@1.10, 2006-08-24 22:10:51-07:00, acurtis@xiphis.org +4 -2
    ha_heap.cc and ha_myisam.cc are removed
    add for federated

  sql/CMakeLists.txt@1.23.1.8, 2006-08-24 22:10:51-07:00, acurtis@xiphis.org +3 -0
    add for federated

  sql/handler.cc@1.260, 2006-08-24 22:10:52-07:00, acurtis@xiphis.org +1 -1
    fix for fussy compilers

  storage/heap/CMakeLists.txt@1.6, 2006-08-24 22:10:52-07:00, acurtis@xiphis.org +1 -0
    add ha_heap.cc

  storage/myisammrg/CMakeLists.txt@1.7, 2006-08-24 22:10:52-07:00, acurtis@xiphis.org +1 -0
    add ha_myisammrg.cc

ChangeSet@1.1810.2066.2, 2006-08-25 00:23:42+04:00, evgen@sunlight.local +1 -0
  opt_range.cc:
    Corrected fix for bug#18165

  sql/opt_range.cc@1.159.1.63, 2006-08-25 00:23:03+04:00, evgen@sunlight.local +4 -2
    Corrected fix for bug#18165

ChangeSet@1.1810.2066.1, 2006-08-24 23:16:54+04:00, evgen@moonbone.local +1 -0
  opt_range.cc:
    Corrected fix for bug#18165

  sql/opt_range.cc@1.159.1.62, 2006-08-24 23:16:01+04:00, evgen@moonbone.local +3 -4
    Corrected fix for bug#18165

ChangeSet@1.2270.2.13, 2006-08-24 20:31:12+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb -
    disable ndb_binlog_discover as it's broken
    remove debug printout

  mysql-test/t/disabled.def@1.185.2.3, 2006-08-24 20:31:10+02:00, jonas@perch.ndb.mysql.com +1 -0
    disable ndb_binlog_discover as it's broken

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.68, 2006-08-24 20:31:10+02:00, jonas@perch.ndb.mysql.com +0 -1
    remove debug printout

ChangeSet@1.1810.2065.1, 2006-08-24 19:36:26+02:00, andrey@example.com +3 -0
  Fix for bug#21416 SP: Recursion level higher than zero needed for non-recursive call
  
  The following procedure was not possible if max_sp_recursion_depth is 0
  create procedure show_proc() show create procedure show_proc;
    
  Actually there is no recursive call but the limit is checked.
    
  Solved by temporarily increasing the thread's limit just before the fetch from cache
  and decreasing after that.

  mysql-test/r/sp.result@1.170.1.40, 2006-08-24 19:36:21+02:00, andrey@example.com +7 -0
    update result

  mysql-test/t/sp.test@1.174.1.24, 2006-08-24 19:36:22+02:00, andrey@example.com +10 -0
    Test for bug #21416 SP: Recursion level higher than zero needed for non-recursive call

  sql/sp.cc@1.82.1.34, 2006-08-24 19:36:22+02:00, andrey@example.com +15 -6
    Increase the max_sp_recursion_depth temporarily for SHOW CREATE PROCEDURE call.
    This call is in fact not recursive but is counted as such. Outcome, it will work
    always but if max_sp_recursion_depth is reached we are going to cache one more
    sp_head instance.

ChangeSet@1.1616.2730.3, 2006-08-24 19:16:27+04:00, sergefp@mysql.com +2 -0
  BUG#16255: Post-review fixes: adjust the testcase.

  mysql-test/r/subselect.result@1.67.65.2, 2006-08-24 19:16:25+04:00, sergefp@mysql.com +22 -11
    BUG#16255: A proper testcase

  mysql-test/t/subselect.test@1.58.46.2, 2006-08-24 19:16:25+04:00, sergefp@mysql.com +17 -5
    BUG#16255: A proper testcase

ChangeSet@1.1810.2050.13, 2006-08-24 11:15:08-04:00, iggy@rolltop.ignatz42.dyndns.org +3 -0
  Bug #11972: client uses wrong character set after reconnect.
  
  The mysql client uses the default character set on reconnect.  The default character set is now controled by the client charset command while the client is running.  The charset command now also issues a SET NAMES command to the server to make sure that the client's charset settings are in sync with the server's.

  client/mysql.cc@1.199.1.17, 2006-08-24 11:15:05-04:00, iggy@rolltop.ignatz42.dyndns.org +3 -0
    Client charset command now changes the default character set and issues a SET NAMES command to the server.

  mysql-test/r/mysql.result@1.15, 2006-08-24 11:15:05-04:00, iggy@rolltop.ignatz42.dyndns.org +7 -7
    Corrected results for new behaviour.

  mysql-test/t/mysql.test@1.4.1.11, 2006-08-24 11:15:05-04:00, iggy@rolltop.ignatz42.dyndns.org +2 -2
    Removed redundant commands from test.

ChangeSet@1.1616.2730.2, 2006-08-24 19:14:36+04:00, sergefp@mysql.com +3 -0
  Bug #16255: Subquery in WHERE (the cset by Georgi Kodinov)
   Must not use Item_direct_ref in HAVING because it points to
   the new value (witch is not yet calculated for the first row).

  mysql-test/r/subselect.result@1.67.65.1, 2006-08-24 19:14:34+04:00, sergefp@mysql.com +11 -0
    Bug #16255: Subquery in where
     - test case

  mysql-test/t/subselect.test@1.58.46.1, 2006-08-24 19:14:34+04:00, sergefp@mysql.com +12 -0
    Bug #16255: Subquery in where
     - test case

  sql/item_subselect.cc@1.60.28.1, 2006-08-24 19:14:34+04:00, sergefp@mysql.com +5 -5
    Bug #16255: Subquery in where
     Must not use Item_direct_ref in HAVING because it points to
     the new value (witch is not yet calculated for the first row).

ChangeSet@1.1810.2027.10, 2006-08-24 18:48:26+04:00, anozdrin@alik. +2 -0
  Polishing (was the part of original patch for BUG#16899):
  Changed trigger-handling code so that there will be the one
  place for generate statement string for replication log
  and for trigger file.

  sql/sql_trigger.cc@1.35.1.20, 2006-08-24 18:48:25+04:00, anozdrin@alik. +58 -61
    Changed trigger-handling code so that there will be the one
    place for generate statement string for replication log
    and for trigger file.

  sql/sql_trigger.h@1.19.1.2, 2006-08-24 18:48:25+04:00, anozdrin@alik. +2 -4
    Changed trigger-handling code so that there will be the one
    place for generate statement string for replication log
    and for trigger file.

ChangeSet@1.2270.2.12, 2006-08-24 15:22:07+02:00, jonas@perch.ndb.mysql.com +8 -0
  ndb - fix monster bug in NdbEventOperation->stop where Suma sent uninitialized data
        affects basically all replication tests

  storage/ndb/include/kernel/signaldata/SumaImpl.hpp@1.9, 2006-08-24 15:22:05+02:00, jonas@perch.ndb.mysql.com +23 -4
    Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing

  storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp@1.6, 2006-08-24 15:22:05+02:00, jonas@perch.ndb.mysql.com +2 -2
    Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@1.48, 2006-08-24 15:22:05+02:00, jonas@perch.ndb.mysql.com +36 -18
    1) Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
    2) make sure to set NdbdNodeId on _TE_STOP

  storage/ndb/src/ndbapi/NdbBlob.cpp@1.47, 2006-08-24 15:22:05+02:00, jonas@perch.ndb.mysql.com +2 -1
    Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing

  storage/ndb/src/ndbapi/NdbEventOperation.cpp@1.13, 2006-08-24 15:22:05+02:00, jonas@perch.ndb.mysql.com +2 -2
    Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.67, 2006-08-24 15:22:05+02:00, jonas@perch.ndb.mysql.com +47 -32
    Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing

  storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp@1.28, 2006-08-24 15:22:05+02:00, jonas@perch.ndb.mysql.com +2 -1
    Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing

  storage/ndb/src/ndbapi/Ndbif.cpp@1.45, 2006-08-24 15:22:05+02:00, jonas@perch.ndb.mysql.com +5 -3
    Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing

ChangeSet@1.1810.1868.30, 2006-08-24 16:29:24+04:00, anozdrin@alik. +13 -0
  Fix for BUG#16899: Possible buffer overflow in handling of DEFINER-clause
      
  User name (host name) has limit on length. The server code relies on these
  limits when storing the names. The problem was that sometimes these limits
  were not checked properly, so that could lead to buffer overflow.
    
  The fix is to check length of user/host name in parser and if string is too
  long, throw an error.

  mysql-test/r/grant.result@1.37.11.1, 2006-08-24 16:29:21+04:00, anozdrin@alik. +24 -0
    Updated result file.

  mysql-test/r/sp.result@1.170.19.2, 2006-08-24 16:29:21+04:00, anozdrin@alik. +13 -0
    Updated result file.

  mysql-test/r/trigger.result@1.29.7.1, 2006-08-24 16:29:21+04:00, anozdrin@alik. +13 -0
    Updated result file.

  mysql-test/r/view.result@1.138.15.1, 2006-08-24 16:29:21+04:00, anozdrin@alik. +11 -0
    Updated result file.

  mysql-test/t/grant.test@1.41.7.1, 2006-08-24 16:29:21+04:00, anozdrin@alik. +49 -0
    Added test for BUG#16899.

  mysql-test/t/sp.test@1.174.15.1, 2006-08-24 16:29:21+04:00, anozdrin@alik. +26 -0
    Added test for BUG#16899.

  mysql-test/t/trigger.test@1.34.7.1, 2006-08-24 16:29:21+04:00, anozdrin@alik. +30 -0
    Added test for BUG#16899.

  mysql-test/t/view.test@1.126.13.1, 2006-08-24 16:29:21+04:00, anozdrin@alik. +27 -0
    Added test for BUG#16899.

  sql/mysql_priv.h@1.290.54.2, 2006-08-24 16:29:21+04:00, anozdrin@alik. +1 -0
    Added prototype for new function.

  sql/share/errmsg.txt@1.42.17.1, 2006-08-24 16:29:22+04:00, anozdrin@alik. +6 -0
    Added new resources.

  sql/sql_acl.cc@1.128.35.1, 2006-08-24 16:29:21+04:00, anozdrin@alik. +2 -33
    Remove outdated checks.

  sql/sql_parse.cc@1.426.101.2, 2006-08-24 16:29:21+04:00, anozdrin@alik. +26 -0
    Add a new function for checking string length.

  sql/sql_yacc.yy@1.371.76.1, 2006-08-24 16:29:22+04:00, anozdrin@alik. +10 -8
    Check length of user/host name.

ChangeSet@1.2229.1.1, 2006-08-24 14:27:57+02:00, msvensson@neptunus.(none) +6 -0
  Bug#20841 mysqldump fails to store right info with --compatible=mysql40 option
   - Add "not in version before" commensta around new syntax "WITH PARSER" and "TABLESPACE xxx STORAGE DISK"
   

  mysql-test/r/ndb_dd_advance.result@1.2, 2006-08-24 14:27:45+02:00, msvensson@neptunus.(none) +7 -7
    Update result file

  mysql-test/r/ndb_dd_advance2.result@1.4, 2006-08-24 14:27:45+02:00, msvensson@neptunus.(none) +4 -4
    Update result file

  mysql-test/r/ndb_dd_backuprestore.result@1.8.1.1, 2006-08-24 14:27:46+02:00, msvensson@neptunus.(none) +6 -6
    Update result file

  mysql-test/r/ndb_dd_basic.result@1.11, 2006-08-24 14:27:46+02:00, msvensson@neptunus.(none) +1 -1
    Update result file

  mysql-test/r/ndb_dd_disk2memory.result@1.7, 2006-08-24 14:27:46+02:00, msvensson@neptunus.(none) +2 -2
    Update result file

  sql/sql_show.cc@1.354.9.1, 2006-08-24 14:27:46+02:00, msvensson@neptunus.(none) +5 -4
    Add "not in version before"  comments around "WITH PARSER xxx" and "TABLESPACE xxx STORAGE DISK"
    Use STRING_WITH_LEN when adding fixed string AUTO_INCREMENT= to output from SHOW TABLE 

ChangeSet@1.2255.53.3, 2006-08-24 16:17:42+04:00, petr@mysql.com +2 -0
  after merge fix

  mysql-test/t/csv.test@1.14, 2006-08-24 16:17:39+04:00, petr@mysql.com +1 -1
    after merge fix

  storage/csv/ha_tina.cc@1.57, 2006-08-24 16:17:39+04:00, petr@mysql.com +5 -4
    after merge fix

ChangeSet@1.1810.2027.9, 2006-08-24 15:49:12+04:00, kroki@moonlight.intranet +9 -0
  BUG#21166: Prepared statement causes signal 11 on second execution
  
  Changes in an item tree done by optimizer weren't properly
  registered and went unnoticed, which resulted in preliminary freeing
  of used memory.

  mysql-test/r/ps.result@1.56.1.16, 2006-08-24 15:49:06+04:00, kroki@moonlight.intranet +15 -0
    Add result for bug#21166: Prepared statement causes signal 11
    on second execution.

  mysql-test/t/ps.test@1.56.1.13, 2006-08-24 15:49:06+04:00, kroki@moonlight.intranet +30 -1
    Add test case for bug#21166: Prepared statement causes signal 11
    on second execution.

  sql/item.cc@1.113.49.3, 2006-08-24 15:49:06+04:00, kroki@moonlight.intranet +70 -2
    Move Item::transform() and Item_default_value::transform() from
    item.h here and use THD::change_item_tree() instead of plain
    assignment.
    Change Item_field::set_no_const_sub() to be used with Item::walk()
    instead of Item::transform().

  sql/item.h@1.183.9.1, 2006-08-24 15:49:07+04:00, kroki@moonlight.intranet +4 -18
    Move definition of Item::transform() and Item_default_value::transform()
    to item.cc.
    Change Item::set_no_const_sub() to be used with Item::walk()
    instead of Item::transform().

  sql/item_cmpfunc.cc@1.187.5.1, 2006-08-24 15:49:08+04:00, kroki@moonlight.intranet +22 -4
    Use Item::walk() to execute Item::set_no_const_sub().
    Use THD::change_item_tree() instead of plain assignment.

  sql/item_func.cc@1.270.18.1, 2006-08-24 15:49:08+04:00, kroki@moonlight.intranet +9 -0
    Add assert and comment to Item_func::traverse_cond().

  sql/item_row.cc@1.32.1.1, 2006-08-24 15:49:08+04:00, kroki@moonlight.intranet +11 -1
    Use THD::change_item_tree() instead of plain assignment.

  sql/item_strfunc.cc@1.261.13.1, 2006-08-24 15:49:08+04:00, kroki@moonlight.intranet +20 -0
    Move Item_func_make_set::transform() from item_strfunc.h here and use
    THD::change_item_tree() instead of plain assignment.

  sql/item_strfunc.h@1.101.10.1, 2006-08-24 15:49:08+04:00, kroki@moonlight.intranet +1 -8
    Move definition of Item_func_make_set::transform() to item_strfunc.cc.

ChangeSet@1.1810.2064.1, 2006-08-24 11:39:52+02:00, msvensson@neptunus.(none) +2 -0
  Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060612110740|13873

  configure.in@1.245.58.3, 2006-08-24 11:39:51+02:00, msvensson@neptunus.(none) +0 -0
    Exclude

  dbug/dbug.c@1.21.2.3, 2006-08-24 11:39:51+02:00, msvensson@neptunus.(none) +0 -0
    Exclude

ChangeSet@1.2270.2.11, 2006-08-24 07:25:54+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - 
    bug#21800 - 5.0 -> 5.1 merge

  storage/ndb/src/ndbapi/NdbScanOperation.cpp@1.93, 2006-08-24 07:25:52+02:00, jonas@perch.ndb.mysql.com +7 -7
    bug#21800 - 5.0 -> 5.1 merge

ChangeSet@1.1616.2712.12, 2006-08-24 07:14:46+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21800
    read TransactionDeadlockTimeout (for scans) to cater for insane settings

  ndb/src/ndbapi/NdbScanOperation.cpp@1.41.5.2, 2006-08-24 07:14:45+02:00, jonas@perch.ndb.mysql.com +9 -4
    read TransactionDeadlockTimeout to cater for insane settings

ChangeSet@1.1616.2724.3, 2006-08-23 18:02:31-06:00, tsmith@siva.hindu.god +4 -0
  Bug #21531: EXPORT_SET() doesn't accept args with coercible character sets
  
  - Fix typo in Item_func_export_set::fix_length_and_dec() which caused character set aggregation to fail
  - Remove default argument from last arg of agg_arg_charsets() function, to reduce potential errors

  mysql-test/r/func_misc.result@1.16.1.4, 2006-08-23 18:02:28-06:00, tsmith@siva.hindu.god +4 -0
    Test EXPORT_SET() with charset coersion (bug #21531)

  mysql-test/t/func_misc.test@1.11.1.5, 2006-08-23 18:02:28-06:00, tsmith@siva.hindu.god +6 -1
    Test EXPORT_SET() with charset coersion (bug #21531)

  sql/item_func.h@1.68.21.1, 2006-08-23 18:02:28-06:00, tsmith@siva.hindu.god +1 -2
    Remove default argument from last arg of agg_arg_charsets() function, to reduce potential errors.

  sql/item_strfunc.cc@1.196.11.2, 2006-08-23 18:02:28-06:00, tsmith@siva.hindu.god +2 -2
    Fix typo in Item_func_export_set::fix_length_and_dec() which caused character set aggregation to fail.

ChangeSet@1.1810.2009.26, 2006-08-24 03:05:13+04:00, evgen@sunlight.local +3 -0
  view.result, view.test:
    Corrected test case for the bug#21261
  sql_parse.cc:
    Corrected fix for bug#21261

  mysql-test/r/view.result@1.138.12.4, 2006-08-24 02:50:19+04:00, evgen@sunlight.local +1 -0
    Corrected test case for the bug#21261

  mysql-test/t/view.test@1.126.1.32, 2006-08-24 02:50:02+04:00, evgen@sunlight.local +1 -0
    Corrected test case for the bug#21261

  sql/sql_parse.cc@1.426.103.1, 2006-08-24 02:51:47+04:00, evgen@sunlight.local +13 -2
    Corrected fix for bug#21261

ChangeSet@1.1810.2062.2, 2006-08-23 18:29:05-04:00, cmiller@zippy.cornsilk.net +2 -0
  String broken up to avoid silly MICROS~1 string-size limit.

  BitKeeper/etc/ignore@1.210.3.1, 2006-08-23 18:29:04-04:00, cmiller@zippy.cornsilk.net +1 -0
    Added sql/f.c to the ignore list

  sql/gen_lex_hash.cc@1.66.1.2, 2006-08-23 18:29:04-04:00, cmiller@zippy.cornsilk.net +8 -3
    String broken up to avoid silly MICROS~1 string-size limit.

ChangeSet@1.2255.44.10, 2006-08-23 15:12:42-07:00, brian@zim.(none) +7 -0
  This is a cleanup of warnings that windows is complaining about. 

  client/mysql.cc@1.222.2.1, 2006-08-23 15:12:39-07:00, brian@zim.(none) +0 -1
    Windows warnings clean up

  server-tools/instance-manager/parse.cc@1.15, 2006-08-23 15:12:39-07:00, brian@zim.(none) +1 -1
    Cleanedup warning

  sql/field.cc@1.337, 2006-08-23 15:12:39-07:00, brian@zim.(none) +2 -3
    Removed unused variables

  sql/filesort.cc@1.110, 2006-08-23 15:12:39-07:00, brian@zim.(none) +0 -1
    Removed unused variables

  sql/ha_partition.cc@1.65.5.1, 2006-08-23 15:12:39-07:00, brian@zim.(none) +1 -1
    Fixing warning

  sql/partition_element.h@1.10, 2006-08-23 15:12:39-07:00, brian@zim.(none) +2 -2
    Fixing declaration for warnings

  sql/ha_innodb.cc@1.284.1.2, 2006-08-23 15:12:39-07:00, brian@zim.(none) +0 -1
    Removed unused variables

ChangeSet@1.1616.2724.2, 2006-08-23 15:37:54-06:00, tsmith@siva.hindu.god +2 -0
  Bug #20402: DROP USER failure logged as ERROR rather than WARNING
  
  Remove some sql_print_error() calls which were triggered by user error (i.e., not server-level events at all).
  
  Also, convert an sql_print_error -> sql_print_information for a non-error server event.

  sql/slave.cc@1.188.18.1, 2006-08-23 15:37:52-06:00, tsmith@siva.hindu.god +1 -1
    Change sql_print_error to sql_print_information for non-error status message.

  sql/sql_acl.cc@1.74.33.1, 2006-08-23 15:37:52-06:00, tsmith@siva.hindu.god +0 -15
    Remove sql_print_error calls for events which are not server errors

ChangeSet@1.2255.44.9, 2006-08-23 13:59:16-07:00, brian@zim.(none) +7 -0
  This patch removes need for a innodb to have its own configure. 

  BUILD/FINISH.sh@1.33, 2006-08-23 13:59:13-07:00, brian@zim.(none) +1 -1
    Removed work for Innodb's configure

  BUILD/autorun.sh@1.11, 2006-08-23 13:59:13-07:00, brian@zim.(none) +0 -4
    Removed pieces for Innodb's build

  BitKeeper/deleted/.del-configure.in@1.36, 2006-08-22 16:57:32-07:00, brian@zim.(none) +0 -0
    Delete: storage/innobase/configure.in

  storage/innobase/Makefile.am@1.16.1.1, 2006-08-23 13:59:13-07:00, brian@zim.(none) +11 -1
    Removed ib_config.h needs

  storage/innobase/include/Makefile.i@1.11, 2006-08-23 13:59:13-07:00, brian@zim.(none) +5 -1
    Expanded includes.

  storage/innobase/include/Makefile.i@1.10, 2006-08-23 12:36:15-07:00, brian@zim.(none) +0 -0
    Rename: BitKeeper/deleted/.del-Makefile.i -> storage/innobase/include/Makefile.i

  BitKeeper/deleted/.del-Makefile.i@1.9, 2006-08-23 11:49:40-07:00, brian@zim.(none) +0 -0
    Delete: storage/innobase/include/Makefile.i

  storage/innobase/include/univ.i@1.54, 2006-08-23 13:59:13-07:00, brian@zim.(none) +1 -1
    Removed ib_config need

  storage/innobase/plug.in@1.2, 2006-08-23 13:59:13-07:00, brian@zim.(none) +62 -1
    Added support taken from configure.in for building Innodb

ChangeSet@1.1810.2027.8, 2006-08-23 21:31:00+04:00, anozdrin@alik. +14 -0
  Fix for BUG#16899: Possible buffer overflow in handling of DEFINER-clause
    
  User name (host name) has limit on length. The server code relies on these
  limits when storing the names. The problem was that sometimes these limits
  were not checked properly, so that could lead to buffer overflow.
  
  The fix is to check length of user/host name in parser and if string is too
  long, throw an error.

  BitKeeper/etc/collapsed@1.2, 2006-08-23 21:29:51+04:00, anozdrin@alik. +1 -0

  mysql-test/r/grant.result@1.37.10.1, 2006-08-23 21:30:58+04:00, anozdrin@alik. +24 -0
    Updated result file.

  mysql-test/r/sp.result@1.170.1.39, 2006-08-23 21:30:58+04:00, anozdrin@alik. +13 -0
    Updated result file.

  mysql-test/r/trigger.result@1.29.1.15, 2006-08-23 21:30:58+04:00, anozdrin@alik. +13 -0
    Updated result file.

  mysql-test/r/view.result@1.138.14.1, 2006-08-23 21:30:58+04:00, anozdrin@alik. +11 -0
    Updated result file.

  mysql-test/t/grant.test@1.41.6.1, 2006-08-23 21:30:58+04:00, anozdrin@alik. +49 -0
    Added test for BUG#16899.

  mysql-test/t/sp.test@1.174.1.23, 2006-08-23 21:30:58+04:00, anozdrin@alik. +26 -0
    Added test for BUG#16899.

  mysql-test/t/trigger.test@1.34.1.16, 2006-08-23 21:30:58+04:00, anozdrin@alik. +30 -0
    Added test for BUG#16899.

  mysql-test/t/view.test@1.126.12.1, 2006-08-23 21:30:58+04:00, anozdrin@alik. +27 -0
    Added test for BUG#16899.

  sql/mysql_priv.h@1.290.59.2, 2006-08-23 21:30:58+04:00, anozdrin@alik. +1 -0
    Added prototype for new function.

  sql/share/errmsg.txt@1.42.16.1, 2006-08-23 21:30:58+04:00, anozdrin@alik. +6 -0
    Added new resources.

  sql/sql_acl.cc@1.128.33.1, 2006-08-23 21:30:58+04:00, anozdrin@alik. +0 -33
    Remove outdated checks.

  sql/sql_parse.cc@1.426.1.140, 2006-08-23 21:30:58+04:00, anozdrin@alik. +28 -10
    Add a new function for checking string length.

  sql/sql_yacc.yy@1.371.71.5, 2006-08-23 21:30:58+04:00, anozdrin@alik. +10 -8
    Check length of user/host name.

ChangeSet@1.1810.2062.1, 2006-08-23 19:14:58+02:00, cmiller@maint1.mysql.com +4 -0
  Bug #20908: Crash if select @@""
  
  Zero-length variables caused failures when using the length to look
  up the name in a hash.  Instead, signal that no zero-length name can
  ever be found and that to encounter one is a syntax error.

  mysql-test/r/variables.result@1.76.7.1, 2006-08-23 19:14:53+02:00, cmiller@maint1.mysql.com +6 -0
    Results for test.

  mysql-test/t/variables.test@1.51.6.1, 2006-08-23 19:14:54+02:00, cmiller@maint1.mysql.com +11 -0
    Insert tests to prove that zero-length variable names do not cause
    faults.

  sql/gen_lex_hash.cc@1.66.1.1, 2006-08-23 19:14:54+02:00, cmiller@maint1.mysql.com +9 -2
    If the length is zero, then there is nothing to look-up in the 
    hash.

  sql/sql_lex.cc@1.142.21.1, 2006-08-23 19:14:54+02:00, cmiller@maint1.mysql.com +2 -0
    Names of variables must not be empty.  Signal an error of that 
    happens.

ChangeSet@1.1810.1868.29, 2006-08-23 17:40:05+02:00, joerg@trift2. +1 -0
  configure.in  :    Set the version for 5.0.24a.

  configure.in@1.245.56.2, 2006-08-23 17:40:02+02:00, joerg@trift2. +1 -1
    Set the version for 5.0.24a.

ChangeSet@1.2255.55.1, 2006-08-23 16:53:04+02:00, andrey@example.com +3 -0
  Cleanup patch for handling of subselects in commands which cannot
  handle them.
  
  Problem:
  CREATE|ALTER EVENT, HANDLER READ, KILL, Partitioning uses `expr` from the
  parser. This rule comes with all the rings and bells including subqueries.
  However, these commands are not subquery safe. For this reason there are two
  fuse checks in the parser. They were checking by command id. CREATE EVENT
  should forbid subquery is the fix for
  bug#16394 Events: Crash if schedule contains SELECT
  The fix has been incorporated as part of the patch for WL#3337 (Event scheduler
  new architecture).
  
  Solution:
  A new flag was added to LEX command_forbids_subselect. The fuse checks were
  changed. The commands are responsible to set the value to true whenever
  they can't handle subselects.

  sql/sql_lex.cc@1.194, 2006-08-23 16:53:00+02:00, andrey@example.com +1 -0
    initialize the variable

  sql/sql_lex.h@1.240, 2006-08-23 16:53:00+02:00, andrey@example.com +8 -0
    Add a new flag whether the parser should allow a subselect when
    parsing. This is temporarily turned off by commands like CREATE|ALTER EVENT,
    HA_READ, KILL. Could be used by other parts which reuse `expr` rule of the
    grammar and should not allow subqueries as part of it.

  sql/sql_yacc.yy@1.494, 2006-08-23 16:53:00+02:00, andrey@example.com +20 -12
    Forbid subselects in some commands in a better way.
    CREATE|ALTER EVENT, HANDLER READ, KILL, are not subselect
    safe for parameters and therefore they should be forbidden already in
    the parser.
    This patch makes it easier for the developer to add new commands in that
    sense similar to the mentioned above.

ChangeSet@1.2255.54.1, 2006-08-23 15:50:06+02:00, andrey@example.com +9 -0
  Fix for bug #20665 All commands supported in Stored Procedures
  should work in Prepared Statements. Post-review changeset.
  
  Problem: There are some commands which are avaiable to be executed in SP
           but cannot be prepared. This patch fixes this and makes it possible
           prepare these statements.
  
  Changes: The commands later are made available in PS. RESET has been forbidden
           in SF/Trigger.
  
  Solution: All current server commands where checked and those missing (see later)
            we added. Tests for all of the commands with repeated executions were
            added - testing with SP, SF and PS.
  
  SHOW BINLOG EVENTS
  SHOW (MASTER | SLAVE) STATUS
  SHOW (MASTER | BINARY) LOGS
  SHOW (PROCEDURE | FUNCTION) CODE (parsable only in debug builds)
  SHOW CREATE (PROCEDURE | FUNCTION | EVENT | TABLE | VIEW)
  SHOW (AUTHORS | CONTRIBUTORS | WARNINGS | ERRORS)
  CHANGE MASTER
  RESET (MASTER | SLAVE | QUERY CACHE)
  SLAVE (START | STOP)
  CHECKSUM (TABLE | TABLES)
  INSTALL PLUGIN
  UNINSTALL PLUGIN
  CACHE INDEX
  LOAD INDEX INTO CACHE
  GRANT
  REVOKE
  KILL
  (CREATE | RENAME | DROP) DATABASE
  (CREATE | RENAME | DROP) USER
  FLUSH (TABLE | TABLES | TABLES WITH READ LOCK | HOSTS | PRIVILEGES |
         LOGS | STATUS | MASTER | SLAVE | DES_KEY_FILE | USER_RESOURCES)

  mysql-test/r/ps.result@1.72, 2006-08-23 15:50:00+02:00, andrey@example.com +882 -0
    update result

  mysql-test/r/ps_1general.result@1.59.1.2, 2006-08-23 15:50:00+02:00, andrey@example.com +0 -12
    update result

  mysql-test/r/ps_grant.result@1.11, 2006-08-23 15:50:00+02:00, andrey@example.com +0 -3
    update result

  mysql-test/r/sp-dynamic.result@1.6, 2006-08-23 15:50:00+02:00, andrey@example.com +2 -2
    update result

  mysql-test/t/ps.test@1.70, 2006-08-23 15:50:00+02:00, andrey@example.com +871 -0
    Add more statements, probably all currently missing which are possible in
    a SP but not preparable.
    Every statement is tested in a SP, in a SF and attempted to prepare.

  mysql-test/t/ps_1general.test@1.35, 2006-08-23 15:50:00+02:00, andrey@example.com +6 -18
    - Enable some of the statements, which are already possible in SP.
    - 1295 -> ER_UNSUPPORTED_PS

  mysql-test/t/ps_grant.test@1.7, 2006-08-23 15:50:00+02:00, andrey@example.com +0 -3
    Enable statements already possible in SP.

  sql/sp_head.cc@1.232.1.1, 2006-08-23 15:50:00+02:00, andrey@example.com +10 -5
    - Reorder to keep some alphabet order.
    - Add missing SHOW_SCHEDULER_STATUS.

  sql/sql_prepare.cc@1.176, 2006-08-23 15:50:00+02:00, andrey@example.com +33 -0
    Add possibility to prepare statements, which are already allowed in SP.

ChangeSet@1.1616.2734.1, 2006-08-23 16:46:57+03:00, timour@lamia.home +3 -0
  Bug #21456: SELECT DISTINCT(x) produces incorrect results when using order by
  
  GROUP BY/DISTINCT pruning optimization must be done before ORDER BY 
  optimization because ORDER BY may be removed when GROUP BY/DISTINCT
  sorts as a side effect, e.g. in 
    SELECT DISTINCT <non-key-col>,<pk> FROM t1
    ORDER BY <non-key-col> DISTINCT
  must be removed before ORDER BY as if done the other way around
  it will remove both.

  mysql-test/r/distinct.result@1.27.1.7, 2006-08-23 16:46:55+03:00, timour@lamia.home +11 -0
    Test for BUG#21456.

  mysql-test/t/distinct.test@1.14.1.5, 2006-08-23 16:46:55+03:00, timour@lamia.home +11 -0
    Test for BUG#21456.

  sql/sql_select.cc@1.216.133.1, 2006-08-23 16:46:55+03:00, timour@lamia.home +30 -30
    Bug #21456: SELECT DISTINCT(x) produces incorrect results when using order by
    
    GROUP BY/DISTINCT pruning optimization must be done before ORDER BY 
    optimization because ORDER BY may be removed when GROUP BY/DISTINCT
    sorts as a side effect.

ChangeSet@1.2255.21.21, 2006-08-23 15:41:52+02:00, msvensson@shellback.(none) +1 -0
  Fix VC 2005 compile problem

  sql/handler.cc@1.255.2.1, 2006-08-23 15:41:48+02:00, msvensson@shellback.(none) +2 -2
    Cast to "byte*" on both sides of equal sign
    Fix spelling error

ChangeSet@1.2255.21.20, 2006-08-23 15:35:24+02:00, msvensson@shellback.(none) +1 -0
  Break out functions do_before_run_mysqltest and do_after_run_mysqltest

  mysql-test/mysql-test-run.pl@1.158, 2006-08-23 15:35:16+02:00, msvensson@shellback.(none) +48 -46
    Break out functions do_before_run_mysqltest and do_after_run_mysqltest

ChangeSet@1.2255.52.1, 2006-08-23 16:58:36+05:00, gluh@mysql.com +3 -0
  Bug#20548 Events: crash if InnoDB, multiple events, busy procedures, partitions
  setup 'share' struct for all partiton file elements. It's neccessary because we use
  m_file[0]->update_create_info(create_info) during ha_partition::update_create_info
  and 'share' for m_file[0] should be valid

  sql/ha_partition.cc@1.65.4.1, 2006-08-23 16:58:28+05:00, gluh@mysql.com +11 -0
    Bug#20548 Events: crash if InnoDB, multiple events, busy procedures, partitions
    setup 'share' struct for all partiton file elements. It's neccessary because we use
    m_file[0]->update_create_info(create_info) during ha_partition::update_create_info
    and 'share' for m_file[0] should be valid

  sql/ha_partition.h@1.25.1.1, 2006-08-23 16:58:28+05:00, gluh@mysql.com +1 -0
    Bug#20548 Events: crash if InnoDB, multiple events, busy procedures, partitions

  sql/handler.h@1.233, 2006-08-23 16:58:28+05:00, gluh@mysql.com +1 -1
    Bug#20548 Events: crash if InnoDB, multiple events, busy procedures, partitions

ChangeSet@1.1810.1868.28, 2006-08-23 12:08:08+02:00, joerg@trift2. +1 -0
  Fix for bug#21537, "Error at startup"
  
  These variables must be defined for Netware, or it fails
  to recognize hard paths starting from the device.
  
  (Packport of:  2006/08/16 19:30:46+03:00 jani@ua141d10.elisa.omakaista.fi  )

  include/config-netware.h@1.14.3.1, 2006-08-23 12:08:06+02:00, joerg@trift2. +4 -0
    Fix for bug#21537, "Error at startup"
    
    These variables must be defined for Netware.
    
    (Backport of:  2006/08/16 19:30:44+03:00 jani@ua141d10.elisa.omakaista.fi +4 -0  )

ChangeSet@1.2270.2.9, 2006-08-23 11:22:48+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - sr - 
    Fix so that expand_check2 is only run per fragment,
    as restore now works 1 fragment at a time (again)

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.122, 2006-08-23 11:22:46+02:00, jonas@perch.ndb.mysql.com +8 -18
    Fix so that expand_check2 is only run per fragment,
      as restore now works 1 fragment at a time (again)

ChangeSet@1.1810.2027.7, 2006-08-22 18:58:14-07:00, malff@weblab.(none) +3 -0
  Bug#8153 (Stored procedure with subquery and continue handler, wrong result)
  
  Implemented code review comments
  Test cleanup

  mysql-test/r/sp.result@1.170.1.38, 2006-08-22 18:57:45-07:00, malff@weblab.(none) +71 -11
    Bug#8153 (Stored procedure with subquery and continue handler, wrong result)
    
    Implemented code review comments
    Test cleanup

  mysql-test/t/sp.test@1.174.1.22, 2006-08-22 18:57:45-07:00, malff@weblab.(none) +50 -14
    Bug#8153 (Stored procedure with subquery and continue handler, wrong result)
    
    Implemented code review comments
    Test cleanup

  sql/protocol.cc@1.111.1.5, 2006-08-22 18:57:45-07:00, malff@weblab.(none) +24 -13
    Bug#8153 (Stored procedure with subquery and continue handler, wrong result)
    
    Implemented code review comments

ChangeSet@1.2255.44.8, 2006-08-22 16:24:12-07:00, brian@zim.(none) +7 -0
  This changest:
  Plugins now when compiled or not compiled work correctly with status variables. 
  Status variables from plugins now set their own names (removed bit where plugin name was pre-appended this broke Innodb and Cluster)
  A few Makefile cleanups. 

  sql/ha_ndbcluster.cc@1.346.2.4, 2006-08-22 16:24:08-07:00, brian@zim.(none) +6 -1
    Engine interface now has variables for status

  sql/handler.cc@1.259, 2006-08-22 16:24:08-07:00, brian@zim.(none) +6 -4
    handler now makes sure to init status variables

  sql/mysqld.cc@1.564.10.2, 2006-08-22 16:24:08-07:00, brian@zim.(none) +0 -18
    Removed status variable hacks

  sql/sql_delete.cc@1.192, 2006-08-22 16:24:08-07:00, brian@zim.(none) +0 -3
    Removed include file that was not required

  sql/ha_innodb.cc@1.284.1.1, 2006-08-22 16:24:08-07:00, brian@zim.(none) +16 -6
    Cleanup to make status variables directly in engine

  storage/myisam/Makefile.am@1.36, 2006-08-22 16:24:08-07:00, brian@zim.(none) +3 -1
    Cleaned up line lengths and addded additional include to not install. 

  storage/myisam/ha_myisam.cc@1.190, 2006-08-22 16:24:08-07:00, brian@zim.(none) +0 -2
    Removed double plugin include

ChangeSet@1.1810.2059.1, 2006-08-23 01:03:28+04:00, evgen@moonbone.local +4 -0
  item_cmpfunc.cc, item.cc:
    Additional fix for bug #21475
  item_func.h, item_func.cc:
    Additional fix for bug#16861

  sql/item.cc@1.113.1.119, 2006-08-23 01:03:08+04:00, evgen@moonbone.local +5 -2
    Additional fix for bug #21475

  sql/item_cmpfunc.cc@1.187.1.29, 2006-08-23 01:02:43+04:00, evgen@moonbone.local +1 -0
    Additional fix for bug #21475

  sql/item_func.cc@1.270.1.29, 2006-08-23 01:02:25+04:00, evgen@moonbone.local +13 -0
    Additional fix for bug#16861

  sql/item_func.h@1.136.2.11, 2006-08-23 01:01:39+04:00, evgen@moonbone.local +1 -0
    Additional fix for bug#16861

ChangeSet@1.2255.1.22, 2006-08-22 16:52:25-04:00, mikael@dator5.(none) +5 -0
  BUG#21658: Crash when creating table with item in prepared statement that allocates memory in fix_fields
  We need to use an arena to indicate we are preparing a statement when loading partition function and
  parsing it as part of an open table.

  mysql-test/r/partition.result@1.54, 2006-08-22 16:52:22-04:00, mikael@dator5.(none) +5 -5
    Moved test case

  mysql-test/t/partition.test@1.50, 2006-08-22 16:52:22-04:00, mikael@dator5.(none) +9 -9
    Moved test case

  sql/item.cc@1.204.1.1, 2006-08-22 16:52:22-04:00, mikael@dator5.(none) +1 -1
    Shouldn't call change_item_tree in prepare statement phase even if arena was already activated

  sql/sql_partition.cc@1.86, 2006-08-22 16:52:22-04:00, mikael@dator5.(none) +24 -7
    We need to use an arena to indicate we are preparing a statement when loading partition function and
    parsing it as part of an open table.

  sql/table.cc@1.239.1.2, 2006-08-22 16:52:22-04:00, mikael@dator5.(none) +20 -5
    We need to use an arena to indicate we are preparing a statement when loading partition function and
    parsing it as part of an open table.

ChangeSet@1.2273.1.18, 2006-08-22 22:52:03+02:00, jonas@perch.ndb.mysql.com +1 -0
  correct merge

  sql/ha_ndbcluster.cc@1.348.4.5, 2006-08-22 22:51:43+02:00, jonas@perch.ndb.mysql.com +1 -0
    correct merge

ChangeSet@1.1810.2058.1, 2006-08-22 17:51:00+02:00, cmiller@maint1.mysql.com +3 -0
  Bug#15583: BIN()/OCT()/CONV() do not work with BIT values
  
  Converting BIT to a string (an intermediate step in conversion) does 
  not yield an ASCII numeric string, so we skip that step for BIT and
  get the integer value directly from the item.
  
  This site in sql/item_strfunc.cc may be ripe for refactoring for
  other types as well, where converting to a string is a waste of time.

  mysql-test/r/type_bit.result@1.14.1.3, 2006-08-22 17:50:56+02:00, cmiller@maint1.mysql.com +30 -0
    Test that conversion functions on BIT types work properly, including 
    NULL.

  mysql-test/t/type_bit.test@1.16, 2006-08-22 17:50:56+02:00, cmiller@maint1.mysql.com +15 -0
    Test that conversion functions on BIT types work properly.

  sql/item_strfunc.cc@1.261.8.5, 2006-08-22 17:50:57+02:00, cmiller@maint1.mysql.com +24 -8
    BIT is unlike the other numeric types, in that when we convert it
    to a String, it becomes a one-byte string with ordinal numeric value
    of the BIT field, not a several-byte string with the ASCII decimal
    representation.  As a special case for conversion functions, we take
    the integer directly from the bit type instead of representing it
    as a string in an intermediate step.

ChangeSet@1.1810.2056.1, 2006-08-22 17:37:41+04:00, evgen@sunlight.local +7 -0
  Fixed bug#16861: User defined variable can have a wrong value if a tmp table was
  used.
  
  Sorting by RAND() uses a temporary table in order to get a correct results.
  User defined variable was set during filling the temporary table and later
  on it is substituted for its value from the temporary table. Due to this
  it contains the last value stored in the temporary table.
  
  Now if the result_field is set for the Item_func_set_user_var object it 
  updates variable from the result_field value when being sent to a client.
  
  The Item_func_set_user_var::check() now accepts a use_result_field
  parameter. Depending on its value the result_field or the args[0] is used
  to get current value.

  mysql-test/r/user_var.result@1.37.1.3, 2006-08-22 17:37:39+04:00, evgen@sunlight.local +9 -0
    Added a test case for bug#16861: User defined variable can have a wrong value if a tmp table was used.

  mysql-test/t/user_var.test@1.35, 2006-08-22 17:37:39+04:00, evgen@sunlight.local +10 -0
    Added a test case for bug#16861: User defined variable can have a wrong value if a tmp table was used.

  sql/item_func.cc@1.270.1.28, 2006-08-22 17:37:39+04:00, evgen@sunlight.local +30 -12
    Fixed bug#16861: User defined variable can have a wrong value if a tmp table was used.
    Now if the result_field is set for the Item_func_set_user_var object it 
    updates variable from the result_field value when being sent to a client.
    
    The Item_func_set_user_var::check() now accepts a use_result_field
    parameter. Depending on its value the result_field or the args[0] is used
    to get current value.

  sql/item_func.h@1.136.2.10, 2006-08-22 17:37:39+04:00, evgen@sunlight.local +4 -2
    Fixed bug#16861: User defined variable can have a wrong value if a tmp table was used.
    Added a new SUSERVAR_FUNC function type.
    Updated the Item_func_set_user_var::check() function declaration.
    Added the Item_func_set_user_var::send() member function.

  sql/set_var.cc@1.125.5.20, 2006-08-22 17:37:39+04:00, evgen@sunlight.local +1 -1
    Fixed bug#16861: User defined variable can have a wrong value if a tmp table was used.
    Modified to use updated Item_func_set_user_var::check() function.

  sql/sql_class.cc@1.223.9.1, 2006-08-22 17:37:39+04:00, evgen@sunlight.local +1 -1
    Fixed bug#16861: User defined variable can have a wrong value if a tmp table was used.
    Modified to use updated Item_func_set_user_var::check() function.

  sql/sql_select.cc@1.312.87.1, 2006-08-22 17:37:39+04:00, evgen@sunlight.local +3 -1
    Fixed bug#16861: User defined variable can have a wrong value if a tmp table was used.
    Now an Item_func_set_user_var object isn't substituted for an Item_field object after filling a temporary table.

ChangeSet@1.1810.2054.1, 2006-08-22 14:29:48+02:00, tnurnberg@salvation.intern.azundris.com +3 -0
  Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both
  
  when X.509 subject was required for a connect, we tested whether it was the right
  one, but did not refuse the connexion if not. fixed.
  
  (corrected CS now --replace_results socket-path)

  mysql-test/r/openssl_1.result@1.15, 2006-08-22 14:29:44+02:00, tnurnberg@salvation.intern.azundris.com +6 -3
    Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both
    
    test not only whether we can connect with a correct X.509 subject when one is
    required, but also assure that we can't without one.

  mysql-test/t/openssl_1.test@1.16, 2006-08-22 14:29:44+02:00, tnurnberg@salvation.intern.azundris.com +7 -3
    Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both
    
    test not only whether we can connect with a correct X.509 subject when one is
    required, but also assure that we can't without one.

  sql/sql_acl.cc@1.128.32.1, 2006-08-22 14:29:44+02:00, tnurnberg@salvation.intern.azundris.com +6 -3
    Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both
    
    actually refuse connexion if X.509 is required, but does not match. kudos to Al Smith.

ChangeSet@1.1810.2052.2, 2006-08-22 14:26:56+02:00, pekka@orca.ndb.mysql.com +1 -0
  ndb - post-merge fix 5.0 to 5.0-ndb: number of frags if --without-big-tables

  sql/ha_ndbcluster.cc@1.175.1.101, 2006-08-22 14:24:01+02:00, pekka@orca.ndb.mysql.com +7 -2
    calculate frags with (ulonglong)max_rows in case --without-big-tables

ChangeSet@1.2255.51.1, 2006-08-22 14:16:39+02:00, msvensson@neptunus.(none) +1 -0
  Update result file for "grant" to 5.1 version

  mysql-test/r/grant.result@1.56.1.2, 2006-08-22 14:16:36+02:00, msvensson@neptunus.(none) +2 -2
    Update result file format to 5.1 version

ChangeSet@1.1810.2053.1, 2006-08-22 04:14:39-07:00, igor@rurik.mysql.com +1 -0
  Fixed bug 16201: a memory corruption causing crashes due to a too small 
  buffer for a MY_BITMAP temporary buffer allocated on stack in the
  function get_best_covering_ror_intersect().
  Now the buffer of a proper size is allocated by a request from this
  function in mem_root.
  
  We succeeded to demonstrate the bug only on Windows with a very large
  database. That's why no test case is provided for in the patch.

  sql/opt_range.cc@1.159.1.61, 2006-08-22 04:14:36-07:00, igor@rurik.mysql.com +12 -7
    Fixed bug 16201: a memory corruption causing crashes due to a too small 
    buffer for a MY_BITMAP temporary buffer allocated on stack in the
    function get_best_covering_ror_intersect().
    Now the buffer of a proper size is allocated by a request from this
    function in mem_root.
    

ChangeSet@1.1810.2047.3, 2006-08-22 15:03:13+04:00, sergefp@mysql.com +1 -0
  Fix compile errors in VC++ 7.0: fix typo made in previous cset

  sql/mysql_priv.h@1.290.1.116, 2006-08-22 15:03:10+04:00, sergefp@mysql.com +1 -1
    Fix compile errors in VC++ 7.0: fix typo made in previous cset

ChangeSet@1.2270.2.8, 2006-08-22 12:41:24+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - reenable "random" failing test

  mysql-test/t/disabled.def@1.185.2.2, 2006-08-22 12:41:14+02:00, jonas@perch.ndb.mysql.com +1 -1
    reenable "random" failing

ChangeSet@1.2270.2.7, 2006-08-22 11:55:25+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    add another possible ok error in testcase

  mysql-test/t/ndb_binlog_discover.test@1.3, 2006-08-22 11:55:22+02:00, jonas@perch.ndb.mysql.com +1 -1
    add another possible ok error in testcase

ChangeSet@1.1810.2008.3, 2006-08-22 11:55:08+02:00, kent@mysql.com +1 -0
  mysql.spec.sh:
    Added ndb_error_reporter to the RPM install (bug#20426)

  support-files/mysql.spec.sh@1.99.11.2, 2006-08-22 11:54:52+02:00, kent@mysql.com +1 -0
    Added ndb_error_reporter to the RPM install (bug#20426)

ChangeSet@1.1616.2732.1, 2006-08-22 11:48:58+02:00, kent@mysql.com +1 -0
  mysql.spec.sh:
    Added ndb_size.{pl,tmpl} to the RPM install (bug#20426)

  support-files/mysql.spec.sh@1.83.7.1, 2006-08-22 11:47:58+02:00, kent@mysql.com +2 -0
    Added ndb_size.{pl,tmpl} to the RPM install (bug#20426)

ChangeSet@1.2245.1.7, 2006-08-22 10:36:11+02:00, mats@romeo.(none) +4 -0
  WL#3259 (RBR with more columns on slave than on master):
  Post-merge fixes.

  mysql-test/r/rpl_row_tabledefs_3innodb.result@1.2, 2006-08-22 10:36:04+02:00, mats@romeo.(none) +4 -4
    Result change

  mysql-test/t/disabled.def@1.182.1.2, 2006-08-22 10:36:04+02:00, mats@romeo.(none) +1 -0
    Disabling test that appear to be fixed in other clones

  sql/field.cc@1.327.1.2, 2006-08-22 10:36:04+02:00, mats@romeo.(none) +1 -0
    Post-merge fix

  sql/log_event.cc@1.239, 2006-08-22 10:36:04+02:00, mats@romeo.(none) +54 -53
    Changes to unpack_row():
    - Documentation
    - New parameter, the write/read set
    - R/W set now 0-indexed instead of 1-indexed
    - Removed column value printing
    Changes to replace_record():
    - Documentation
    - Removed column value printing
    Removed unused function print_column_values()

ChangeSet@1.2270.2.6, 2006-08-22 09:48:15+02:00, jonas@perch.ndb.mysql.com +5 -0
  ndb -
    reenable some test after adding sync_with_master to end of test
      to make sure that binlog has been applied to slave before end of test

  mysql-test/t/disabled.def@1.185.2.1, 2006-08-22 09:48:12+02:00, jonas@perch.ndb.mysql.com +3 -3
    reenable test after adding extra sync_with_master

  mysql-test/t/rpl_ndb_func003.test@1.2, 2006-08-22 09:48:12+02:00, jonas@perch.ndb.mysql.com +1 -0
    add sync slave with master, to make sure that binlog has been applied to slave before end of test

  mysql-test/t/rpl_ndb_idempotent.test@1.4, 2006-08-22 09:48:12+02:00, jonas@perch.ndb.mysql.com +1 -0
    add sync slave with master, to make sure that binlog has been applied to slave before end of test

  mysql-test/t/rpl_row_basic_7ndb.test@1.2, 2006-08-22 09:48:12+02:00, jonas@perch.ndb.mysql.com +1 -0
    add sync slave with master, to make sure that binlog has been applied to slave before end of test

  mysql-test/t/rpl_truncate_7ndb.test@1.6, 2006-08-22 09:48:13+02:00, jonas@perch.ndb.mysql.com +1 -0
    add sync slave with master, to make sure that binlog has been applied to slave before end of test

ChangeSet@1.1810.2051.1, 2006-08-22 11:47:52+04:00, kroki@moonlight.intranet +5 -0
  BUG#21051: RESET QUERY CACHE very slow when query_cache_type=0
  
  There were two problems: RESET QUERY CACHE took a long time to complete
  and other threads were blocked during this time.
  
  The patch does three things:
    1 fixes a bug with improper use of test-lock-test_again technique.
        AKA Double-Checked Locking is applicable here only in few places.
    2 Somewhat improves performance of RESET QUERY CACHE.
        Do my_hash_reset() instead of deleting elements one by one.  Note
        however that the slowdown also happens when inserting into sorted
        list of free blocks, should be rewritten using balanced tree.
    3 Makes RESET QUERY CACHE non-blocking.
        The patch adjusts the locking protocol of the query cache in the
        following way: it introduces a flag flush_in_progress, which is
        set when Query_cache::flush_cache() is in progress.  This call
        sets the flag on enter, and then releases the lock.  Every other
        call is able to acquire the lock, but does nothing if
        flush_in_progress is set (as if the query cache is disabled).
        The only exception is the concurrent calls to
        Query_cache::flush_cache(), that are blocked until the flush is
        over.  When leaving Query_cache::flush_cache(), the lock is
        acquired and the flag is reset, and one thread waiting on
        Query_cache::flush_cache() (if any) is notified that it may
        proceed.

  include/mysql_com.h@1.100.2.1, 2006-08-22 11:47:47+04:00, kroki@moonlight.intranet +6 -0
    Add comment for NET::query_cache_query.

  sql/net_serv.cc@1.88.1.2, 2006-08-22 11:47:47+04:00, kroki@moonlight.intranet +11 -6
    Use query_cache_init_query() for initialization of
    NET::query_cache_query if query cache is used.
    Do not access net->query_cache_query without a lock.

  sql/sql_cache.cc@1.76.1.17, 2006-08-22 11:47:47+04:00, kroki@moonlight.intranet +354 -228
    Fix bug with accessing query_cache_size, Query_cache_query::wri and
    thd->net.query_cache_query before acquiring the lock---leave
    double-check locking only in safe places.
    Wherever we check that cache is usable (query_cache_size > 0) we now
    also check that flush_in_progress is false, i.e. we are not in the
    middle of cache flush.
    Add Query_cache::not_in_flush_or_wait() method and use it in
    Query_cache::flush_cache(), so that threads doing cache flush will
    wait it to finish, while other threads will bypass the cache as if
    it is disabled.
    Extract Query_cache::free_query_internal() from Query_cache::free_query(),
    which does not removes elements from the hash, and use it together with
    my_hash_reset() in Query_cache::flush_cache().

  sql/sql_cache.h@1.30.1.3, 2006-08-22 11:47:47+04:00, kroki@moonlight.intranet +16 -1
    Add declarations for new members and methods.
    Make is_cacheable() a static method.
    Add query_cache_init_query() function.

  sql/sql_class.cc@1.223.8.1, 2006-08-22 11:47:47+04:00, kroki@moonlight.intranet +1 -1
    Use query_cache_init_query() for initialization of
    NET::query_cache_query.

ChangeSet@1.2270.2.5, 2006-08-22 09:45:35+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
     fix incorrect assertion in dbacc

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@1.75, 2006-08-22 09:45:33+02:00, jonas@perch.ndb.mysql.com +1 -1
    Fix incorrect assertion

ChangeSet@1.1810.2042.4, 2006-08-22 08:30:33+02:00, msvensson@neptunus.(none) +1 -0
  Remove debug printout from mysql_client_test

  tests/mysql_client_test.c@1.167.18.1, 2006-08-22 08:30:30+02:00, msvensson@neptunus.(none) +0 -2
    Remove debug printout

ChangeSet@1.1810.2050.1, 2006-08-21 20:29:11-04:00, iggy@rolltop.ignatz42.dyndns.org +1 -0
  Bug#21757: mysql_client_test fails in testcase when reading master.log file

  tests/mysql_client_test.c@1.167.1.37, 2006-08-21 20:29:05-04:00, iggy@rolltop.ignatz42.dyndns.org +2 -2
    Replace fopen with my_fopen and specify O_BINARY. Replace fclose with my_fclose.

ChangeSet@1.2255.25.8, 2006-08-21 17:16:46+02:00, andrey@example.com +2 -0
  Minor change - fixed function documentation and added
  const for two parameters.

  sql/event_db_repository.cc@1.15, 2006-08-21 17:16:42+02:00, andrey@example.com +5 -2
    add a missing documentation of a parameter
    add const to two parameters

  sql/event_db_repository.h@1.10, 2006-08-21 17:16:42+02:00, andrey@example.com +2 -2
    Added const to two parameters

ChangeSet@1.2255.32.4, 2006-08-21 19:02:11+04:00, dlenev@mockturtle.local +5 -0
  Fix for bug#19403/12212 "Crash that happens during removing of database name
  from cache" and #21216 "Simultaneous DROP TABLE and SHOW OPEN TABLES causes
  server to crash".
  
  Crash happened when one ran DROP DATABASE or SHOW OPEN TABLES statements
  while concurrently doing DROP TABLE (or RENAME TABLE, CREATE TABLE LIKE
  or any other command that takes name-lock) in other connection.
  
  This problem was caused by the fact that table placeholders which were
  added to table cache in order to obtain name-lock on table had
  TABLE_SHARE::db and table_name set to 0. Therefore they broke assumption
  that these members are non-0 for all tables in table cache on which some
  of our code relies.
  
  The fix sets these members for such placeholders to appropriate value making
  this assumption true again. As attempt to avoid such problems in future
  we introduce auxiliary TABLE_SHARE::set_table_cache_key() methods which
  should be used when one wants to set TABLE_SHARE::table_cache_key and which
  ensure that TABLE_SHARE::table_name/db are set properly.
  
  Test cases for these bugs were added to 5.0 test-suite (with 5.0-specific
  fix for bug #21216).

  sql/lock.cc@1.97, 2006-08-21 19:02:07+04:00, dlenev@mockturtle.local +12 -9
    Our code assumes that TABLE_SHARE::table_name/db for objects in table cache
    is set properly (and is non-NULL). For example look in list_open_tables()
    and remove_db_from_cache(). This was not true for table placeholders that
    were added to table cache for name-locking. Changed lock_table_name() to
    preserve this assumption (now it uses TABLE_SHARE::set_table_cache_key()
    to set all three table_cache_key/db/table_name members at once).
    Also now we use my_multi_malloc() to allocate memory for TABLE and
    TABLE_SHARE objects instead of using my_malloc() + summing sizes as
    it automatically provides proper alignment for memory allocated.

  sql/sql_base.cc@1.342.5.1, 2006-08-21 19:02:08+04:00, dlenev@mockturtle.local +11 -30
    Now we use TABLE_SHARE::set_table_cache_key() auxiliary methods to set
    TABLE_SHARE::table_cache_key/db/table_name members at once.
    We also use multi_alloc_root() instead of alloc_root() for allocating
    memory for several objects as it is less error prone.
    Finally, we also got rid of unused code in reopen_name_locked_table().

  sql/sql_select.cc@1.431, 2006-08-21 19:02:08+04:00, dlenev@mockturtle.local +0 -2
    Got rid of redundant code. TABLE_SHARE::db/table_cache_key are both set to
    empty string by the call to init_tmp_table_share() routine.

  sql/table.cc@1.239.3.1, 2006-08-21 19:02:08+04:00, dlenev@mockturtle.local +8 -12
    Now alloc_table_share() uses auxiliary TABLE_SHARE::set_table_cache_key()
    method to properly set TABLE_SHARE::table_cache_key/db/table_name members.
    Also now we use multi_alloc_root() instead of alloc_root() for allocating
    memory for several objects as it is more clear/less error-prone.

  sql/table.h@1.148.2.1, 2006-08-21 19:02:08+04:00, dlenev@mockturtle.local +64 -1
    Added comment about importance of apropriate setting of
    TABLE_SHARE::table_name/db/table_cache_key for tables in table cache.
    Introduced two auxiliary TABLE_SHARE::set_table_cache_key() methods which
    allow to set these three members at once.

ChangeSet@1.1810.2048.4, 2006-08-21 16:36:03+02:00, rburnett@production.mysql.com +1 -0
  mysqld.cc:
    var was already defined so had to remove extra one

  sql/mysqld.cc@1.439.1.130, 2006-08-21 16:35:56+02:00, rburnett@production.mysql.com +0 -1
    var was already defined so had to remove extra one

ChangeSet@1.2255.47.3, 2006-08-21 16:19:29+02:00, joerg@trift2. +1 -0
  mysql-test/mysql-test-run.pl  :  Use fixed path names for all NDB binaries,
  because searching for them makes the script abort with all non-NDB builds.

  mysql-test/mysql-test-run.pl@1.150.3.2, 2006-08-21 16:19:26+02:00, joerg@trift2. +2 -4
    Checking with "mtr_exe_exists()" for the location of a binary will yield an error
    if the binary is found nowhere at all, and this happens with NDB binaries in all
    builds that do not contain NDB;  so the correct way is fixed path names only.
    Still part of the fix for the #21721 bug.

ChangeSet@1.2255.47.2, 2006-08-21 15:34:29+02:00, kent@mysql.com +15 -0
  Many files:
    Deleted config/ac-macros/ha_berkeley.m4
    Removed more referenses to bdb

  BUILD/FINISH.sh@1.31.1.1, 2006-08-21 15:32:42+02:00, kent@mysql.com +1 -1
    Removed more referenses to bdb

  BUILD/compile-alpha-cxx@1.10.1.1, 2006-08-21 15:32:42+02:00, kent@mysql.com +1 -1
    Removed more referenses to bdb

  BUILD/compile-alpha-debug@1.8.1.1, 2006-08-21 15:32:42+02:00, kent@mysql.com +1 -1
    Removed more referenses to bdb

  BUILD/compile-dist@1.14.1.1, 2006-08-21 15:32:42+02:00, kent@mysql.com +0 -1
    Removed more referenses to bdb

  BUILD/compile-ia64-debug-max@1.5.1.1, 2006-08-21 15:32:43+02:00, kent@mysql.com +1 -1
    Removed more referenses to bdb

  BitKeeper/deleted/.del-ha_berkeley.m4@1.7, 2006-08-21 15:17:58+02:00, kent@mysql.com +0 -0
    Delete: config/ac-macros/ha_berkeley.m4

  CMakeLists.txt@1.22, 2006-08-21 15:32:43+02:00, kent@mysql.com +0 -4
    Removed more referenses to bdb

  Makefile.am@1.95, 2006-08-21 15:32:43+02:00, kent@mysql.com +1 -5
    Removed more referenses to bdb

  libmysqld/lib_sql.cc@1.120, 2006-08-21 15:32:43+02:00, kent@mysql.com +1 -5
    Removed more referenses to bdb

  sql/mysql_priv.h@1.429.1.1, 2006-08-21 15:32:44+02:00, kent@mysql.com +0 -2
    Removed more referenses to bdb

  storage/ndb/config/win-prg.am@1.3, 2006-08-21 15:32:44+02:00, kent@mysql.com +1 -1
    Removed more referenses to bdb

  storage/ndb/test/run-test/ndb-autotest.sh@1.12, 2006-08-21 15:32:44+02:00, kent@mysql.com +0 -2
    Removed more referenses to bdb

  support-files/my-huge.cnf.sh@1.25, 2006-08-21 15:32:44+02:00, kent@mysql.com +0 -4
    Removed more referenses to bdb

  support-files/my-large.cnf.sh@1.25, 2006-08-21 15:32:45+02:00, kent@mysql.com +0 -4
    Removed more referenses to bdb

  support-files/my-medium.cnf.sh@1.24, 2006-08-21 15:32:45+02:00, kent@mysql.com +0 -4
    Removed more referenses to bdb

ChangeSet@1.2255.48.1, 2006-08-21 17:03:07+04:00, sergefp@mysql.com +3 -0
  BUG#21277: Wrong results in index_merge queries:
  Remove the code that cleared "read fields set" for merged scans. That code
  was based on assumption that "We're going to just read rowids", while 
  actually QUICK_RANGE_SELECT code would also need key part values to check 
  that retrieved record(s) fall within the scanned intervals.

  mysql-test/r/index_merge_innodb.result@1.18.1.1, 2006-08-21 17:03:04+04:00, sergefp@mysql.com +40 -0
    BUG#21277: Testcase

  mysql-test/t/index_merge_innodb.test@1.12.1.1, 2006-08-21 17:03:04+04:00, sergefp@mysql.com +27 -0
    BUG#21277: Testcase

  sql/opt_range.cc@1.229, 2006-08-21 17:03:04+04:00, sergefp@mysql.com +0 -7
    BUG#21277: Wrong results in index_merge queries:
    Remove the code that cleared "read fields set" for merged scans. That code
    was based on assumption that "We're going to just read rowids", while 
    actually QUICK_RANGE_SELECT code would also need key part values to check 
    that retrieved record(s) fall within the scanned intervals.

ChangeSet@1.1810.2049.1, 2006-08-21 14:51:59+02:00, msvensson@neptunus.(none) +1 -0
  Bug#19810  	Bundled YASSL in libmysqlclient conflicts with OpenSSL
   - Rename yaSSL version of 'SSL_peek' to 'yaSSL_peek' by using a macro

  extra/yassl/include/openssl/prefix_ssl.h@1.2, 2006-08-21 14:51:57+02:00, msvensson@neptunus.(none) +1 -0
    Rename yaSSL version of SSL_peek to yaSSL_peek

ChangeSet@1.1810.2047.2, 2006-08-21 16:21:48+04:00, sergefp@mysql.com +2 -0
  Fix compile errors in VC++ 7.0

  sql/mysql_priv.h@1.290.1.115, 2006-08-21 16:21:46+04:00, sergefp@mysql.com +9 -0
    Fix compile errors in VC++ 7.0

  sql/sql_locale.cc@1.7, 2006-08-21 16:21:46+04:00, sergefp@mysql.com +109 -218
    Fix compile errors in VC++ 7.0

ChangeSet@1.2270.2.4, 2006-08-21 14:09:50+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#16310
    better error message for creating table with non-existing tablespace

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.148, 2006-08-21 14:09:48+02:00, jonas@perch.ndb.mysql.com +3 -0
    better error reporting

  storage/ndb/src/ndbapi/ndberror.c@1.69.2.1, 2006-08-21 14:09:48+02:00, jonas@perch.ndb.mysql.com +1 -1
    better error reporting

ChangeSet@1.1810.2038.6, 2006-08-21 14:06:59+02:00, msvensson@shellback.(none) +1 -0
  Print lines from log file to see what's in them

  tests/mysql_client_test.c@1.167.17.7, 2006-08-21 14:06:56+02:00, msvensson@shellback.(none) +2 -0
    Print lines from log file to see what's in them

ChangeSet@1.1810.2047.1, 2006-08-21 14:20:03+04:00, sergefp@mysql.com +4 -0
  Fix by Georgi Kodinov:
  Bug #18744 Test 'join_outer' fails if "classic" configuration in 5.0
   - moved an InnoDB dependent test to the appropriate file

  mysql-test/t/innodb_mysql.test@1.3.4.3, 2006-08-21 14:20:00+04:00, sergefp@mysql.com +20 -0
    Bug #18744 Test 'join_outer' fails if "classic" configuration in 5.0
     - moved an InnoDB dependent test to the appropriate file

  mysql-test/r/innodb_mysql.result@1.3.4.3, 2006-08-21 14:20:00+04:00, sergefp@mysql.com +19 -0
    Bug #18744 Test 'join_outer' fails if "classic" configuration in 5.0
     - moved an InnoDB dependent test to the appropriate file

  mysql-test/r/join_outer.result@1.44.1.7, 2006-08-21 14:20:00+04:00, sergefp@mysql.com +0 -19
    Bug #18744 Test 'join_outer' fails if "classic" configuration in 5.0
     - moved an InnoDB dependent test to the appropriate file

  mysql-test/t/join_outer.test@1.37.1.1, 2006-08-21 14:20:00+04:00, sergefp@mysql.com +0 -21
    Bug #18744 Test 'join_outer' fails if "classic" configuration in 5.0
     - moved an InnoDB dependent test to the appropriate file

ChangeSet@1.1810.1868.27, 2006-08-21 11:44:30+02:00, aelkin@dl145j.mysql.com +1 -0
  BUG#21582 mysql server crashes in close_temporary_tables
  
  the problem is described and resolved by 20919 which fix happened not to have got to
  the release tree. Applying the patch of the parent bug.

  sql/sql_base.cc@1.235.68.1, 2006-08-21 11:40:13+02:00, aelkin@dl145j.mysql.com +3 -1
    BUG#21582 mysql server crashes in close_temporary_tables
    appeared to be a dup of 20919. Applying the patch of the latter to fix this but
    in specific mysql-5.0-release tree.

ChangeSet@1.1810.2045.1, 2006-08-21 12:18:59+04:00, dlenev@mockturtle.local +3 -0
  Fix for bug#21216 "Simultaneous DROP TABLE and SHOW OPEN TABLES causes
  server to crash".
  
  Crash caused by assertion failure happened when one ran SHOW OPEN TABLES
  while concurrently doing DROP TABLE (or RENAME TABLE, CREATE TABLE LIKE
  or any other command that takes name-lock) in other connection.
  For non-debug version of server problem exposed itself as wrong output
  of SHOW OPEN TABLES statement (it was missing name-locked tables).
  Finally in 5.1 both debug and non-debug versions simply crashed in
  this situation due to NULL-pointer dereference.
  
  This problem was caused by the fact that table placeholders which were
  added to table cache in order to obtain name-lock had TABLE_SHARE::table_name
  set to 0. Therefore they broke assumption that this member is non-0 for
  all tables in table cache which was checked by assert in list_open_tables()
  (in 5.1 this function simply relies on it).
  The fix simply sets this member for such placeholders to appropriate value
  making this assumption true again.
  
  This patch also includes test for similar bug 12212 "Crash that happens
  during removing of database name from cache" reappeared in 5.1 as bug 19403.

  mysql-test/r/drop.result@1.28.1.1, 2006-08-21 12:18:56+04:00, dlenev@mockturtle.local +13 -0
    Added test for bug#21216 "Simultaneous DROP TABLE and SHOW OPEN TABLES
    causes server to crash" and bug#12212/19403 "Crash that happens during
    removing of database name from cache".

  mysql-test/t/drop.test@1.23, 2006-08-21 12:18:56+04:00, dlenev@mockturtle.local +41 -0
    Added test for bug#21216 "Simultaneous DROP TABLE and SHOW OPEN TABLES
    causes server to crash" and bug#12212/19403 "Crash that happens during
    removing of database name from cache".

  sql/lock.cc@1.64.1.26, 2006-08-21 12:18:56+04:00, dlenev@mockturtle.local +5 -2
    lock_table_name():
      Our code assumes that TABLE_SHARE::table_name for objects in table cache
      is non-NULL (for example look at assertion in list_open_tables()). This
      was not true for table placeholders that were added to table cache for
      name-locking. So let us set this member for such placeholders.

ChangeSet@1.2255.21.18, 2006-08-21 09:53:49+02:00, msvensson@shellback.(none) +1 -0
  Turn on reorder by default

  mysql-test/mysql-test-run.pl@1.157, 2006-08-21 09:53:46+02:00, msvensson@shellback.(none) +1 -1
    Turn on reorder by default

ChangeSet@1.2255.21.17, 2006-08-21 09:53:04+02:00, msvensson@shellback.(none) +1 -0
  Break out and create new function 'run_testcase_check_skip_test' 

  mysql-test/mysql-test-run.pl@1.156, 2006-08-21 09:52:59+02:00, msvensson@shellback.(none) +40 -29
    Break out and create new function 'run_testcase_check_skip_test' 

ChangeSet@1.2270.2.3, 2006-08-21 09:26:52+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21710
    fix bug in drop_file during pageout (LCP)

  storage/ndb/src/kernel/blocks/pgman.cpp@1.17, 2006-08-21 09:26:50+02:00, jonas@perch.ndb.mysql.com +19 -6
    1) Allow Page_entry::REQUEST, when dropping page (in drop_file path)
    2) Do all IO JBA
    3) Handle PAGEOUT during drop_file (caused by LCP)

ChangeSet@1.2273.1.10, 2006-08-21 07:53:27+02:00, jonas@perch.ndb.mysql.com +4 -0
  ndb - revert timeout changes, as a test depends on it, it mysterious ways
        (mysql-test-run only)

  mysql-test/ndb/ndb_config_1_node.ini@1.4, 2006-08-21 07:53:25+02:00, jonas@perch.ndb.mysql.com +1 -1
    revert timeout changes, as a test depends on it, it mysterious ways

  mysql-test/ndb/ndb_config_2_node.ini@1.20, 2006-08-21 07:53:25+02:00, jonas@perch.ndb.mysql.com +1 -1
    revert timeout changes, as a test depends on it, it mysterious ways

  mysql-test/ndb/ndb_config_4_node.ini@1.4, 2006-08-21 07:53:25+02:00, jonas@perch.ndb.mysql.com +1 -1
    revert timeout changes, as a test depends on it, it mysterious ways

  mysql-test/t/rpl_ndb_basic.test@1.8, 2006-08-21 07:53:25+02:00, jonas@perch.ndb.mysql.com +2 -2
    revert timeout changes, as a test depends on it, it mysterious ways

ChangeSet@1.2255.47.1, 2006-08-20 17:24:48-04:00, jpipes@shakedown.(none) +1 -0
  Fix for bug #21642: "configure" with no arguments does not build

  sql/set_var.cc@1.178.1.10, 2006-08-20 17:20:52-04:00, jpipes@shakedown.(none) +4 -2
    Fix for bug #21642: "configure" with no arguments does not build
    Added #ifdefs around innodb server variables

ChangeSet@1.1810.2009.21, 2006-08-21 00:23:57+04:00, evgen@moonbone.local +6 -0
  Fixed bug#21475: Wrongly applied constant propagation leads to a false comparison.
  
  A date can be represented as an int (like 20060101) and as a string (like
  "2006.01.01"). When a DATE/TIME field is compared in one SELECT against both
  representations the constant propagation mechanism leads to comparison
  of DATE as a string and DATE as an int. In this example it compares 2006 and
  20060101 integers. Obviously it fails comparison although they represents the
  same date.
  
  
  Now the Item_bool_func2::fix_length_and_dec() function sets the comparison
  context for items being compared. I.e. if items compared as strings the
  comparison context is STRING.
  The constant propagation mechanism now doesn't mix items used in different
  comparison contexts. The context check is done in the
  Item_field::equal_fields_propagator() and in the change_cond_ref_to_const() 
  functions.
  
  Also the better fix for bug 21159 is introduced.

  mysql-test/r/type_datetime.result@1.30.1.2, 2006-08-21 00:12:37+04:00, evgen@moonbone.local +11 -0
    Added a test case for bug#21475: Wrongly applied constant propagation leads to a false comparison.

  mysql-test/t/type_datetime.test@1.18.1.1, 2006-08-21 00:12:09+04:00, evgen@moonbone.local +11 -0
    Added a test case for bug#21475: Wrongly applied constant propagation leads to a false comparison.

  sql/item.cc@1.113.1.118, 2006-08-21 00:20:43+04:00, evgen@moonbone.local +12 -1
    Fixed bug#21475: Wrongly applied constant propagation leads to a false comparison.
    The constant propagation mechanism now doesn't mix items used in different
    comparison contexts. The context check is done in the
    Item_field::equal_fields_propagator() function.

  sql/item.h@1.183.1.23, 2006-08-21 00:18:57+04:00, evgen@moonbone.local +1 -1
    Fixed bug#21475: Wrongly applied constant propagation leads to a false comparison.
    To the Item class a new field called cmp_context is added.
    It represents the comparison context of an item.

  sql/item_cmpfunc.cc@1.187.1.28, 2006-08-21 00:18:20+04:00, evgen@moonbone.local +4 -1
    Fixed bug#21475: Wrongly applied constant propagation leads to a false comparison.
    Now the Item_bool_func2::fix_length_and_dec() function sets the comparison
    context for items being compared.

  sql/sql_select.cc@1.312.1.133, 2006-08-21 00:16:44+04:00, evgen@moonbone.local +4 -16
    Fixed bug#21475: Wrongly applied constant propagation leads to a false comparison.
    The constant propagation mechanism now doesn't mix items used in different
    comparison contexts. The check is done in the change_cond_ref_to_const() function.

ChangeSet@1.2255.21.16, 2006-08-20 20:46:50+02:00, msvensson@neptunus.(none) +1 -0
  Move the initialisation of "NDB_STATUS_OK" env variable to after cluster has been intalled

  mysql-test/mysql-test-run.pl@1.155, 2006-08-20 20:46:45+02:00, msvensson@neptunus.(none) +3 -2
    Move the initialisation of "NDB_STATUS_OK" env variable to after cluster has been intalled

ChangeSet@1.2255.44.7, 2006-08-19 17:38:42-07:00, brian@zim.(none) +16 -0
  This changeset moves the ha_myisam files to their storage directories.  It also includes updates for all engines include patch for windows builds. 

  libmysqld/Makefile.am@1.94.1.6, 2006-08-19 17:38:39-07:00, brian@zim.(none) +0 -1
    Removing myisam

  sql/CMakeLists.txt@1.23.1.7, 2006-08-19 17:38:39-07:00, brian@zim.(none) +1 -1
    removing myisam reference

  sql/Makefile.am@1.145.1.8, 2006-08-19 17:38:39-07:00, brian@zim.(none) +1 -2
    Removing myisam reference. 

  sql/handler.cc@1.258, 2006-08-19 17:38:39-07:00, brian@zim.(none) +0 -1
    Removing unneeded include reference

  sql/mysqld.cc@1.564.10.1, 2006-08-19 17:38:39-07:00, brian@zim.(none) +1 -1
    updating include reference

  storage/archive/CMakeLists.txt@1.6, 2006-08-19 17:38:39-07:00, brian@zim.(none) +1 -0
    Update windows include

  storage/blackhole/CMakeLists.txt@1.5, 2006-08-19 17:38:39-07:00, brian@zim.(none) +1 -0
    Update windows include

  storage/csv/CMakeLists.txt@1.5, 2006-08-19 17:38:39-07:00, brian@zim.(none) +1 -0
    Update Windows include

  storage/example/CMakeLists.txt@1.4, 2006-08-19 17:38:39-07:00, brian@zim.(none) +1 -0
    Update windows include

  storage/federated/CMakeLists.txt@1.2, 2006-08-19 17:38:39-07:00, brian@zim.(none) +1 -0
    Update windows include

  storage/heap/CMakeLists.txt@1.5, 2006-08-19 17:38:39-07:00, brian@zim.(none) +4 -1
    
    Update windows include

  storage/myisam/CMakeLists.txt@1.7, 2006-08-19 17:38:39-07:00, brian@zim.(none) +5 -1
    Adding ha_myisam reference

  storage/myisam/Makefile.am@1.35, 2006-08-19 17:38:39-07:00, brian@zim.(none) +51 -6
    Updatinng Makefile.am

  storage/myisam/ha_myisam.cc@1.189, 2006-08-19 17:38:39-07:00, brian@zim.(none) +4 -6
    Updating include reference

  storage/myisam/ha_myisam.cc@1.188, 2006-08-19 15:27:25-07:00, brian@zim.(none) +0 -0
    Rename: sql/ha_myisam.cc -> storage/myisam/ha_myisam.cc

  storage/myisam/ha_myisam.h@1.75, 2006-08-19 15:27:31-07:00, brian@zim.(none) +0 -0
    Rename: sql/ha_myisam.h -> storage/myisam/ha_myisam.h

  storage/myisammrg/CMakeLists.txt@1.6, 2006-08-19 17:38:39-07:00, brian@zim.(none) +4 -1
    Update windows include

ChangeSet@1.2255.44.6, 2006-08-19 10:23:22-07:00, brian@zim.(none) +10 -0
  Update to push all of merge into the merge storage directory.

  libmysqld/Makefile.am@1.94.1.5, 2006-08-19 10:23:19-07:00, brian@zim.(none) +1 -1
    Removed mrg

  sql/CMakeLists.txt@1.23.1.6, 2006-08-19 10:23:19-07:00, brian@zim.(none) +2 -2
    Removed mrg

  sql/Makefile.am@1.145.1.7, 2006-08-19 10:23:19-07:00, brian@zim.(none) +2 -2
    Removed mrg

  sql/handler.cc@1.257, 2006-08-19 10:23:19-07:00, brian@zim.(none) +0 -1
    Removed mrg include (no longer needed)

  sql/sql_cache.cc@1.95, 2006-08-19 10:23:19-07:00, brian@zim.(none) +1 -5
    Updated include files

  storage/federated/CMakeLists.txt@1.1, 2006-08-19 08:54:53-07:00, brian@zim.(none) +6 -0
    BitKeeper file /home/brian/mysql/arch-5.1/storage/federated/CMakeLists.txt

  storage/federated/CMakeLists.txt@1.0, 2006-08-19 08:54:53-07:00, brian@zim.(none) +0 -0

  storage/heap/Makefile.am@1.17, 2006-08-19 10:23:19-07:00, brian@zim.(none) +2 -0
    
    Formatting

  storage/myisammrg/Makefile.am@1.18, 2006-08-19 10:23:19-07:00, brian@zim.(none) +18 -2
    Updated makefile for mrg

  storage/myisammrg/ha_myisammrg.cc@1.96, 2006-08-19 10:23:19-07:00, brian@zim.(none) +3 -6
    Updated Makefile

  storage/myisammrg/ha_myisammrg.cc@1.95, 2006-08-19 08:10:57-07:00, brian@zim.(none) +0 -0
    Rename: sql/ha_myisammrg.cc -> storage/myisammrg/ha_myisammrg.cc

  storage/myisammrg/ha_myisammrg.h@1.45, 2006-08-19 08:11:02-07:00, brian@zim.(none) +0 -0
    Rename: sql/ha_myisammrg.h -> storage/myisammrg/ha_myisammrg.h

ChangeSet@1.2255.44.5, 2006-08-19 08:02:52-07:00, brian@zim.(none) +7 -0
  Moved heap into its own directory.

  libmysqld/Makefile.am@1.94.1.4, 2006-08-19 08:02:49-07:00, brian@zim.(none) +2 -2
    Heap changes

  sql/CMakeLists.txt@1.23.1.5, 2006-08-19 08:02:49-07:00, brian@zim.(none) +1 -1
    Removed ha_heap

  sql/Makefile.am@1.145.1.6, 2006-08-19 08:02:49-07:00, brian@zim.(none) +2 -2
    Removed heap

  sql/handler.cc@1.256, 2006-08-19 08:02:49-07:00, brian@zim.(none) +0 -1
    Removed unneeded include call

  storage/heap/Makefile.am@1.16, 2006-08-19 08:02:49-07:00, brian@zim.(none) +24 -6
    Adjusted heap Makefile.am to include ha_heap.cc

  storage/heap/ha_heap.cc@1.95, 2006-08-19 08:02:49-07:00, brian@zim.(none) +2 -1
    Added plugin header

  storage/heap/ha_heap.cc@1.94, 2006-08-19 00:02:06-07:00, brian@zim.(none) +0 -0
    Rename: sql/ha_heap.cc -> storage/heap/ha_heap.cc

  storage/heap/ha_heap.h@1.46, 2006-08-19 00:02:13-07:00, brian@zim.(none) +0 -0
    Rename: sql/ha_heap.h -> storage/heap/ha_heap.h

ChangeSet@1.1810.2044.1, 2006-08-19 15:15:36+05:00, holyfoot@mysql.com +1 -0
  bug #16513 (no mysql_set_server_option in libmysqld.dll export)

  libmysqld/libmysqld.def@1.14.1.2, 2006-08-19 15:15:34+05:00, holyfoot@mysql.com +1 -0
    mysql_set_server_option added to libmysqld.dll export

ChangeSet@1.2255.44.4, 2006-08-18 21:19:19-07:00, brian@zim.(none) +22 -0
  Major changes are plug.in files created for almost all storage engines. A few stray BDB references removed. 

  BUILD/FINISH.sh@1.32, 2006-08-18 21:19:16-07:00, brian@zim.(none) +1 -1
    Stray BDB reference

  BUILD/autorun.sh@1.10, 2006-08-18 21:19:16-07:00, brian@zim.(none) +0 -1
    Stray bdb reference

  BUILD/compile-alpha-cxx@1.11, 2006-08-18 21:19:16-07:00, brian@zim.(none) +1 -1
    Stray bdb reference

  BUILD/compile-alpha-debug@1.9, 2006-08-18 21:19:16-07:00, brian@zim.(none) +1 -1
    Stray bdb reference

  BUILD/compile-dist@1.15, 2006-08-18 21:19:16-07:00, brian@zim.(none) +0 -1
    Stray BDB Reference

  BUILD/compile-ia64-debug-max@1.6, 2006-08-18 21:19:16-07:00, brian@zim.(none) +1 -1
    Stray BDB reference

  configure.in@1.378, 2006-08-18 21:19:16-07:00, brian@zim.(none) +0 -50
    All plugin code is now in plug.in files. Few tricky exceptions left. 

  sql/CMakeLists.txt@1.23.1.4, 2006-08-18 21:19:16-07:00, brian@zim.(none) +1 -1
    Removed federated references

  sql/Makefile.am@1.145.1.5, 2006-08-18 21:19:16-07:00, brian@zim.(none) +1 -2
    Removed federated references

  sql/mysql_priv.h@1.430, 2006-08-18 21:19:16-07:00, brian@zim.(none) +0 -2
    stray bdb reference

  storage/blackhole/plug.in@1.1, 2006-08-18 17:31:11-07:00, brian@zim.(none) +6 -0
    BitKeeper file /home/brian/mysql/arch-5.1/storage/blackhole/plug.in

  storage/blackhole/plug.in@1.0, 2006-08-18 17:31:11-07:00, brian@zim.(none) +0 -0

  storage/csv/plug.in@1.1, 2006-08-18 21:19:16-07:00, brian@zim.(none) +5 -0
    New BitKeeper file ``storage/csv/plug.in''

  storage/csv/plug.in@1.0, 2006-08-18 21:19:16-07:00, brian@zim.(none) +0 -0

  storage/example/ha_example.cc@1.41, 2006-08-18 21:19:16-07:00, brian@zim.(none) +1 -0
    Enabled all of mysql include

  storage/federated/Makefile.am@1.1, 2006-08-18 21:19:16-07:00, brian@zim.(none) +52 -0
    New BitKeeper file ``storage/federated/Makefile.am''

  storage/federated/Makefile.am@1.0, 2006-08-18 21:19:16-07:00, brian@zim.(none) +0 -0

  storage/federated/ha_federated.cc@1.75, 2006-08-18 21:19:16-07:00, brian@zim.(none) +3 -0
    Added plugin defs

  storage/federated/ha_federated.cc@1.74, 2006-08-18 20:02:54-07:00, brian@zim.(none) +0 -0
    Rename: sql/ha_federated.cc -> storage/federated/ha_federated.cc

  storage/federated/ha_federated.h@1.37, 2006-08-18 20:02:58-07:00, brian@zim.(none) +0 -0
    Rename: sql/ha_federated.h -> storage/federated/ha_federated.h

  storage/federated/plug.in@1.1, 2006-08-18 21:19:16-07:00, brian@zim.(none) +4 -0
    New BitKeeper file ``storage/federated/plug.in''

  storage/federated/plug.in@1.0, 2006-08-18 21:19:16-07:00, brian@zim.(none) +0 -0

  storage/heap/plug.in@1.1, 2006-08-18 17:31:11-07:00, brian@zim.(none) +6 -0
    BitKeeper file /home/brian/mysql/arch-5.1/storage/heap/plug.in

  storage/heap/plug.in@1.0, 2006-08-18 17:31:11-07:00, brian@zim.(none) +0 -0

  storage/innobase/plug.in@1.1, 2006-08-18 21:19:16-07:00, brian@zim.(none) +9 -0
    New BitKeeper file ``storage/innobase/plug.in''

  storage/innobase/plug.in@1.0, 2006-08-18 21:19:16-07:00, brian@zim.(none) +0 -0

  storage/myisam/plug.in@1.1, 2006-08-18 17:31:11-07:00, brian@zim.(none) +6 -0
    BitKeeper file /home/brian/mysql/arch-5.1/storage/myisam/plug.in

  storage/myisam/plug.in@1.0, 2006-08-18 17:31:11-07:00, brian@zim.(none) +0 -0

  storage/myisammrg/plug.in@1.1, 2006-08-18 17:31:11-07:00, brian@zim.(none) +5 -0
    BitKeeper file /home/brian/mysql/arch-5.1/storage/myisammrg/plug.in

  storage/myisammrg/plug.in@1.0, 2006-08-18 17:31:11-07:00, brian@zim.(none) +0 -0

  storage/ndb/plug.in@1.1, 2006-08-18 21:19:16-07:00, brian@zim.(none) +6 -0
    New BitKeeper file ``storage/ndb/plug.in''

  storage/ndb/plug.in@1.0, 2006-08-18 21:19:16-07:00, brian@zim.(none) +0 -0

ChangeSet@1.1810.2027.3, 2006-08-18 19:16:07-07:00, malff@weblab.(none) +5 -0
  WL#3432 (Compile the Parser with a --debug --verbose option)
  
  Corrected build issues : the build can not be conditional.
  to keep a unique source .tar.gz distribution.

  configure.in@1.245.51.16, 2006-08-18 18:45:36-07:00, malff@weblab.(none) +0 -1
    Rolling back previous change

  sql/Makefile.am@1.103.1.18, 2006-08-18 18:45:36-07:00, malff@weblab.(none) +1 -5
    Partially rolling back previous change.
    The build has to be unconditional, for the source .tar.gz distribution

  sql/mysql_priv.h@1.290.59.1, 2006-08-18 18:45:36-07:00, malff@weblab.(none) +3 -0
    WL#3432 (Compile the Parser with a --debug --verbose option)

  sql/sql_parse.cc@1.426.1.139, 2006-08-18 18:45:36-07:00, malff@weblab.(none) +0 -21
    WL#3432 (Compile the Parser with a --debug --verbose option)
    
    Moved turn_parser_debug_on to sql_yacc.yy

  sql/sql_yacc.yy@1.371.71.4, 2006-08-18 18:45:36-07:00, malff@weblab.(none) +28 -0
    WL#3432 (Compile the Parser with a --debug --verbose option)
    
    Moved turn_parser_debug_on to sql_yacc.yy

ChangeSet@1.2255.21.15, 2006-08-18 19:29:54+02:00, tnurnberg@salvation.intern.azundris.com +1 -0
  17926 duplicates Bug#1989 in bug db
  
  on up-merging 17926 from 5.0 tree it collides with near-identical fix 1989
  in 5.1 tree. backing 17926 out of 5.1 tree.

  client/mysql.cc@1.224, 2006-08-18 19:29:49+02:00, tnurnberg@salvation.intern.azundris.com +1 -32
    Bug#17926 duplicates Bug#1989 in bug db
    
    back 17926 out of 5.1 tree

ChangeSet@1.2255.42.4, 2006-08-18 22:29:35+05:00, holyfoot@mysql.com +2 -0
  Fix for the failing gis.test

  mysql-test/r/gis.result@1.37, 2006-08-18 22:29:31+05:00, holyfoot@mysql.com +1 -1
    result fixed

  sql/item_geofunc.cc@1.29, 2006-08-18 22:29:31+05:00, holyfoot@mysql.com +5 -2
    new_field->init() call added

ChangeSet@1.2255.44.3, 2006-08-18 18:24:38+02:00, joerg@trift2. +1 -0
  mysql-test-run.pl  :  Fix the search path for "ndb_mgmd" and "ndbd".  bug#21721

  mysql-test/mysql-test-run.pl@1.150.3.1, 2006-08-18 18:24:35+02:00, joerg@trift2. +4 -2
    In 5.1 packages, the binaries "ndbd" and "ndb_mgmd" are in subdirectory "bin", not in "libexec".
    Use the search function "mtr_exe_exists()", in case there might be exceptions.

ChangeSet@1.1810.2042.1, 2006-08-18 14:16:11+02:00, tnurnberg@salvation.intern.azundris.com +15 -0
  innodb r702
  innodb r719

  innobase/btr/btr0btr.c@1.38.3.1, 2006-08-18 14:16:04+02:00, tnurnberg@salvation.intern.azundris.com +1 -1
    innodb r702

  innobase/buf/buf0buf.c@1.45.6.1, 2006-08-18 14:16:04+02:00, tnurnberg@salvation.intern.azundris.com +3 -2
    innodb r702

  innobase/dict/dict0dict.c@1.65.11.1, 2006-08-18 14:16:04+02:00, tnurnberg@salvation.intern.azundris.com +5 -6
    innodb r702

  innobase/fil/fil0fil.c@1.54.11.1, 2006-08-18 14:16:04+02:00, tnurnberg@salvation.intern.azundris.com +3 -6
    innodb r702

  innobase/fsp/fsp0fsp.c@1.25.2.1, 2006-08-18 14:16:04+02:00, tnurnberg@salvation.intern.azundris.com +1 -1
    innodb r702

  sql/ha_innodb.cc@1.202.1.96, 2006-08-18 14:16:05+02:00, tnurnberg@salvation.intern.azundris.com +12 -19
    innodb r702

  innobase/include/btr0cur.ic@1.2.2.1, 2006-08-18 14:16:04+02:00, tnurnberg@salvation.intern.azundris.com +1 -3
    innodb r719

  innobase/include/buf0buf.ic@1.17.2.1, 2006-08-18 14:16:04+02:00, tnurnberg@salvation.intern.azundris.com +4 -4
    innodb r702

  innobase/log/log0log.c@1.41.4.1, 2006-08-18 14:16:04+02:00, tnurnberg@salvation.intern.azundris.com +1 -1
    innodb r702

  innobase/log/log0recv.c@1.46.5.1, 2006-08-18 14:16:05+02:00, tnurnberg@salvation.intern.azundris.com +2 -2
    innodb r702

  innobase/os/os0file.c@1.103.10.1, 2006-08-18 14:16:05+02:00, tnurnberg@salvation.intern.azundris.com +6 -6
    innodb r702

  innobase/row/row0mysql.c@1.103.15.1, 2006-08-18 14:16:05+02:00, tnurnberg@salvation.intern.azundris.com +13 -14
    innodb r702

  innobase/row/row0sel.c@1.92.8.1, 2006-08-18 14:16:05+02:00, tnurnberg@salvation.intern.azundris.com +1 -1
    innodb r702

  innobase/srv/srv0start.c@1.80.10.1, 2006-08-18 14:16:05+02:00, tnurnberg@salvation.intern.azundris.com +1 -1
    innodb r702

  innobase/ut/ut0dbg.c@1.7.2.1, 2006-08-18 14:16:05+02:00, tnurnberg@salvation.intern.azundris.com +1 -1
    innodb r702

ChangeSet@1.1810.1698.122, 2006-08-18 09:56:52+02:00, pekka@orca.ndb.mysql.com +8 -0
  ndb - bug#18781 bug#21017 bug#21050 : block index ops during NR + fix asserts

  ndb/include/kernel/signaldata/CreateIndx.hpp@1.6.1.1, 2006-08-18 09:44:34+02:00, pekka@orca.ndb.mysql.com +1 -0
    add 711

  ndb/include/kernel/signaldata/DropIndx.hpp@1.3.1.1, 2006-08-18 09:44:34+02:00, pekka@orca.ndb.mysql.com +1 -0
    add 711

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.40.32.1, 2006-08-18 09:47:24+02:00, pekka@orca.ndb.mysql.com +36 -8
    block index create/drop during NR.
    fix 2 ndbrequires by checking exact schema op types

  ndb/src/kernel/blocks/dbdict/Dbdict.hpp@1.9.19.1, 2006-08-18 09:47:25+02:00, pekka@orca.ndb.mysql.com +3 -0
    block index create/drop during NR.
    fix 2 ndbrequires by checking exact schema op types

  ndb/src/kernel/vm/DLHashTable2.hpp@1.3.1.1, 2006-08-18 09:36:14+02:00, pekka@orca.ndb.mysql.com +2 -0
    add isEmpty for use in DICT

  ndb/test/include/NDBT_Tables.hpp@1.3.1.1, 2006-08-18 09:39:06+02:00, pekka@orca.ndb.mysql.com +2 -0
    getIndexes - return index cols of standard test table

  ndb/test/ndbapi/testDict.cpp@1.20.7.1, 2006-08-18 09:43:58+02:00, pekka@orca.ndb.mysql.com +75 -3
    bug#21017: index create/drop during NR

  ndb/test/src/NDBT_Tables.cpp@1.14.1.1, 2006-08-18 09:39:06+02:00, pekka@orca.ndb.mysql.com +11 -0
    getIndexes - return index cols of standard test table

ChangeSet@1.1810.2027.2, 2006-08-17 16:08:51-07:00, malff@weblab.(none) +3 -0
  WL#3432 (Compile the Parser with a --debug --verbose option)
  
  Changed the automake build process :
  - ./configure.in
  - ./sql/Makefile.am
  to compile an instrumented parser for debug=yes or debug=full builds
  
  Changed the (primary) runtime invocation of the parser :
  - sql/sql_parse.cc
  to generate bison traces in stderr when the DBUG "parser_debug" flag is set.

  configure.in@1.245.51.15, 2006-08-17 15:39:43-07:00, malff@weblab.(none) +1 -0
    WL#3432 (Compile the Parser with a --debug --verbose option)
    
    New Automake condition : MYSQL_CONF_DEBUG

  sql/Makefile.am@1.103.1.17, 2006-08-17 15:39:44-07:00, malff@weblab.(none) +6 -1
    WL#3432 (Compile the Parser with a --debug --verbose option)
    
    In Debug mode, compile sql_yacc.yy with --debug --verbose

  sql/sql_parse.cc@1.426.1.138, 2006-08-17 15:39:44-07:00, malff@weblab.(none) +23 -0
    WL#3432 (Compile the Parser with a --debug --verbose option)
    
    Conditionally turn the bison parser debug on at runtime.

ChangeSet@1.1616.2718.3, 2006-08-17 14:09:24-07:00, jimw@rama.(none) +3 -0
  Bug #21288: mysqldump segmentation fault when using --where
  
    The problem was that the error handling was using a too-small buffer to
    print the error message generated. We fix this by not using a buffer at
    all, but by using fprintf() directly. There were also some problems with
    the error handling in table dumping that was exposed by this fix that were
    also corrected.

  client/mysqldump.c@1.143.13.6, 2006-08-17 14:09:23-07:00, jimw@rama.(none) +11 -5
    Use fprintf() instead of my_printf_error() to avoid buffer overflow issues.
    Since ME_BELL wasn't specified, calling my_printf_error() offered no advantage
    except for adding my_progname, which we just go ahead and do manually. Also,
    fix the error handling in dumpTable() when queries to get data fail and --force
    was specified.

  mysql-test/r/mysqldump.result@1.9.1.46, 2006-08-17 14:09:23-07:00, jimw@rama.(none) +27 -0
    Add new results

  mysql-test/t/mysqldump.test@1.19.1.27, 2006-08-17 14:09:23-07:00, jimw@rama.(none) +8 -0
    Add new regression test

ChangeSet@1.2255.44.2, 2006-08-17 22:24:35+02:00, rburnett@production.mysql.com +2 -0
  A couple of adjustments to the merge to fix the broken build
  
  instance.cc:
    Removed wrongly placed closing brace
  item_geofunc.cc:
    needed to pass in a TABLE_SHARE* instead of a TABLE*

  server-tools/instance-manager/instance.cc@1.36, 2006-08-17 22:23:34+02:00, rburnett@production.mysql.com +0 -1
    Removed wrongly placed closing brace

  sql/item_geofunc.cc@1.28, 2006-08-17 22:24:03+02:00, rburnett@production.mysql.com +1 -1
    needed to pass in a TABLE_SHARE* instead of a TABLE*

ChangeSet@1.1616.2717.3, 2006-08-17 12:25:40-07:00, jimw@rama.(none) +14 -0
  Bug #2717: include/my_global.h mis-defines __attribute__
  
    Fix when __attribute__() is stubbed out, add ATTRIBUTE_FORMAT() for specifying
    __attribute__((format(...))) safely, make more use of the format attribute,
    and fix some of the warnings that this turns up (plus a bonus unrelated one).

  include/m_ctype.h@1.102.1.6, 2006-08-17 12:25:38-07:00, jimw@rama.(none) +3 -2
    Add ATTRIBUTE_FORMAT to printf-like functions.

  include/m_string.h@1.33.1.3, 2006-08-17 12:25:38-07:00, jimw@rama.(none) +2 -1
    Add ATTRIBUTE_FORMAT to my_snprintf() declaration.

  include/my_global.h@1.47.1.58, 2006-08-17 12:25:38-07:00, jimw@rama.(none) +21 -1
    Fix neutering of __attribute__() on old versions of GCC and non-GCC compilers.
    Add ATTRIBUTE_FORMAT() macro for setting __attribute_((format(...)), since it
    is available from different versions of gcc and g++.

  include/my_sys.h@1.116.1.29, 2006-08-17 12:25:38-07:00, jimw@rama.(none) +2 -2
    Add ATTRIBUTE_FORMAT() to my_printf_error declaration

  sql/item_subselect.cc@1.60.1.83, 2006-08-17 12:25:38-07:00, jimw@rama.(none) +1 -1
    Silence warning about members being initialized out-of-order

  sql/item_timefunc.cc@1.51.7.1, 2006-08-17 12:25:38-07:00, jimw@rama.(none) +2 -2
    Fix format specifier in snprintf() calls with milliseconds

  sql/mysql_priv.h@1.186.91.54, 2006-08-17 12:25:38-07:00, jimw@rama.(none) +6 -5
    Add ATTRIBUTE_FORMAT to printf-like functions.

  sql/mysqld.cc@1.356.107.1, 2006-08-17 12:25:38-07:00, jimw@rama.(none) +11 -10
    Fix various format specifiers
    Make sure that method_conv is always set by myisam_stats_method

  sql/opt_range.cc@1.98.11.1, 2006-08-17 12:25:38-07:00, jimw@rama.(none) +4 -3
    Cast pointers to correct type for %lx

  sql/set_var.cc@1.34.67.1, 2006-08-17 12:25:38-07:00, jimw@rama.(none) +6 -6
    Fix __attribute__((unused)) (missing inner set of parens)

  sql/slave.cc@1.188.17.1, 2006-08-17 12:25:39-07:00, jimw@rama.(none) +1 -1
    Fix format specifier

  sql/slave.h@1.71.1.18, 2006-08-17 12:25:39-07:00, jimw@rama.(none) +2 -1
    Add ATTRIBUTE_FORMAT to slave_print_error() declaration.

  sql/sql_acl.cc@1.74.32.1, 2006-08-17 12:25:39-07:00, jimw@rama.(none) +2 -2
    Fix number of  arguments passed for formatting, and fix acl_host_or_ip being
    passed instead of just the hostname.

  sql/sql_class.h@1.146.52.16, 2006-08-17 12:25:39-07:00, jimw@rama.(none) +1 -1
    Add ATTRIBUTE_FORMAT to MYSQL_LOG::write().

ChangeSet@1.2273.1.9, 2006-08-17 20:59:42+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - rpl_ndb_basic
  fix for change of deadlock timeout in config.ini

  mysql-test/t/rpl_ndb_basic.test@1.7, 2006-08-17 20:59:40+02:00, jonas@perch.ndb.mysql.com +2 -2
    fix for change of deadlock timeout in config.ini

ChangeSet@1.2273.1.8, 2006-08-17 20:51:44+02:00, jonas@perch.ndb.mysql.com +2 -0
  merge

  sql/ha_ndbcluster.cc@1.348.4.2, 2006-08-17 20:51:41+02:00, jonas@perch.ndb.mysql.com +0 -18
    merge

  sql/ha_ndbcluster.h@1.147, 2006-08-17 20:51:41+02:00, jonas@perch.ndb.mysql.com +0 -1
    merge

ChangeSet@1.2255.44.1, 2006-08-17 18:50:58+02:00, rburnett@bk-internal.mysql.com +1 -0
  rename to avoid case sensitive collision

  BitKeeper/deleted/.del-readme-renamed@1.3, 2006-08-17 18:50:29+02:00, rburnett@bk-internal.mysql.com +0 -0
    Rename: BitKeeper/deleted/.del-readme -> BitKeeper/deleted/.del-readme-renamed

ChangeSet@1.1616.2731.1, 2006-08-17 21:23:00+05:00, svoj@may.pils.ru +1 -0
  BUG#19702 - Using myisampack/myisamchk on a FULLTEXT indexed
              table results in table corrupt
  
  Fulltext key has always two keysegs, thus we need to update
  FT_SEGS (last) element from seg array in case of compressed table.
  Also we must update ft2_keyinfo.

  myisam/mi_packrec.c@1.25.1.4, 2006-08-17 21:22:57+05:00, svoj@may.pils.ru +14 -6
    Fulltext key has always two keysegs, thus we need to update
    FT_SEGS (last) element from seg array in case of compressed table.
    Also we must update ft2_keyinfo.

ChangeSet@1.2255.13.7, 2006-08-17 18:13:45+02:00, andrey@example.com +14 -0
  Cleanup patch.
  
  There is an existing macros for initializing LEX_STRINGs
  with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
  (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN

  sql/handler.cc@1.254.1.1, 2006-08-17 18:13:38+02:00, andrey@example.com +5 -5
    There is an existing macros for initializing LEX_STRINGs
    with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
    (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN

  sql/item.cc@1.203.1.1, 2006-08-17 18:13:38+02:00, andrey@example.com +1 -1
    There is an existing macros for initializing LEX_STRINGs
    with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
    (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN

  sql/mysql_priv.h@1.425.3.1, 2006-08-17 18:13:39+02:00, andrey@example.com +1 -1
    There is an existing macros for initializing LEX_STRINGs
    with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
    (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN

  sql/sql_acl.cc@1.202.1.1, 2006-08-17 18:13:39+02:00, andrey@example.com +63 -63
    There is an existing macros for initializing LEX_STRINGs
    with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
    (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN

  sql/sql_error.cc@1.39, 2006-08-17 18:13:39+02:00, andrey@example.com +5 -5
    There is an existing macros for initializing LEX_STRINGs
    with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
    (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN

  sql/sql_error.h@1.3, 2006-08-17 18:13:39+02:00, andrey@example.com +1 -1
    There is an existing macros for initializing LEX_STRINGs
    with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
    (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN

  sql/sql_lex.h@1.234.3.1, 2006-08-17 18:13:39+02:00, andrey@example.com +5 -5
    There is an existing macros for initializing LEX_STRINGs
    with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
    (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN

  sql/sql_parse.cc@1.567.2.1, 2006-08-17 18:13:39+02:00, andrey@example.com +35 -35
    There is an existing macros for initializing LEX_STRINGs
    with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
    (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN

  sql/sql_partition.cc@1.82.3.1, 2006-08-17 18:13:39+02:00, andrey@example.com +6 -6
    There is an existing macros for initializing LEX_STRINGs
    with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
    (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN

  sql/sql_plugin.cc@1.26, 2006-08-17 18:13:40+02:00, andrey@example.com +3 -3
    There is an existing macros for initializing LEX_STRINGs
    with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
    (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN

  sql/sql_show.cc@1.354.7.1, 2006-08-17 18:13:40+02:00, andrey@example.com +5 -5
    There is an existing macros for initializing LEX_STRINGs
    with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
    (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN

  sql/sql_trigger.cc@1.63.2.1, 2006-08-17 18:13:40+02:00, andrey@example.com +12 -12
    There is an existing macros for initializing LEX_STRINGs
    with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
    (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN

  sql/sql_view.cc@1.98.1.1, 2006-08-17 18:13:40+02:00, andrey@example.com +13 -13
    There is an existing macros for initializing LEX_STRINGs
    with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
    (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN

  sql/tztime.cc@1.39, 2006-08-17 18:13:40+02:00, andrey@example.com +5 -5
    There is an existing macros for initializing LEX_STRINGs
    with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
    (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN

ChangeSet@1.2255.25.6, 2006-08-17 17:44:16+02:00, andrey@example.com +2 -0
  WL#3337 (Event scheduler new architecture)
  
  Shift from direct usage of (char *) with STRING_WITH_LEN
  to C_STRING_WITH_LEN

  sql/event_db_repository.cc@1.14, 2006-08-17 17:44:08+02:00, andrey@example.com +39 -39
    don't use direct casting but existing C_STRING_WITH_LEN macro
    to shut up the compiler.

  sql/event_scheduler.cc@1.22, 2006-08-17 17:44:08+02:00, andrey@example.com +4 -4
    don't use direct casting but existing C_STRING_WITH_LEN macro
    to shut up the compiler.

ChangeSet@1.1810.2009.20, 2006-08-17 18:50:53+04:00, evgen@moonbone.local +3 -0
  ndb_condition_pushdown.result:
    Corrected test case result after fix for bug#18165
  view.result, view.test:
    Corrected test case for bug#21261

  mysql-test/r/ndb_condition_pushdown.result@1.15.1.6, 2006-08-17 18:49:48+04:00, evgen@moonbone.local +2 -2
    Corrected test case result after fix for bug#18165

  mysql-test/r/view.result@1.138.12.3, 2006-08-17 18:49:30+04:00, evgen@moonbone.local +2 -0
    Corrected test case for bug#21261

  mysql-test/t/view.test@1.126.1.31, 2006-08-17 18:49:02+04:00, evgen@moonbone.local +2 -0
    Corrected test case for bug#21261

ChangeSet@1.2255.40.3, 2006-08-17 16:01:33+02:00, tnurnberg@salvation.intern.azundris.com +1 -0
  temporarily disabled partition test, fails w/ PS protocol, filed as Bug#21658

  mysql-test/t/disabled.def@1.184.4.1, 2006-08-17 16:01:29+02:00, tnurnberg@salvation.intern.azundris.com +1 -0
    temporarily disabled partition test, fails w/ PS protocol, filed as Bug#21658

ChangeSet@1.2270.2.2, 2006-08-17 15:18:06+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - pb random failures
    Fix bug in lcp during drop table
    Make sure that file thread is not started until meta data has completed

  storage/ndb/src/kernel/blocks/backup/Backup.cpp@1.50.1.1, 2006-08-17 15:18:04+02:00, jonas@perch.ndb.mysql.com +203 -145
    Fix bug in lcp during drop table
    Make sure that file thread is not started until meta data has completed

  storage/ndb/src/kernel/blocks/backup/Backup.hpp@1.23, 2006-08-17 15:18:04+02:00, jonas@perch.ndb.mysql.com +18 -12
    Fix bug in lcp during drop table
    Make sure that file thread is not started until meta data has completed

  storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp@1.7, 2006-08-17 15:18:04+02:00, jonas@perch.ndb.mysql.com +0 -2
    Fix bug in lcp during drop table
    Make sure that file thread is not started until meta data has completed

ChangeSet@1.2255.1.19, 2006-08-17 09:08:53-04:00, mikael@dator5.(none) +1 -0
  merge fix

  mysql-test/t/partition.test@1.48, 2006-08-17 09:08:51-04:00, mikael@dator5.(none) +1 -1
    merge fix

ChangeSet@1.2255.7.2, 2006-08-17 09:05:15-04:00, mikael@dator5.(none) +1 -0
  BUG#21350: Fix correct error handling when using DATA DIRECTORY and INDEX DIRECTORY
  Review fixes

  sql/ha_partition.cc@1.67, 2006-08-17 09:05:13-04:00, mikael@dator5.(none) +5 -4
    BUG#21350: Fix correct error handling when using DATA DIRECTORY and INDEX DIRECTORY
    Review fixes

ChangeSet@1.2255.25.5, 2006-08-17 14:22:59+02:00, andrey@example.com +17 -0
  WL#3337 (Event scheduler new architecture)
  
  Post-review fixes. Mostly whitespace, int-to-bool return value, fixed comments

  sql/Makefile.am@1.152, 2006-08-17 14:22:51+02:00, andrey@example.com +2 -2
    compile all submodules of Events before compiling the facade

  sql/event_data_objects.cc@1.75, 2006-08-17 14:22:52+02:00, andrey@example.com +36 -30
    - Use initialization list
    - Clean whitespaces
    - Shorten comments
    - Fix comments

  sql/event_data_objects.h@1.13, 2006-08-17 14:22:52+02:00, andrey@example.com +4 -4
    - Fix whitespace

  sql/event_db_repository.cc@1.13, 2006-08-17 14:22:52+02:00, andrey@example.com +66 -86
    - Change return type from int to bool where only one error code is
      returned.
    - Don't use macros but get the maximal number of characters in a column
      from the column
    - Fix  comments
    - Make functions which has return value but it's not used - void.

  sql/event_db_repository.h@1.9, 2006-08-17 14:22:52+02:00, andrey@example.com +5 -9
    - Methods with only one error code int -> bool return value
    - Remove declaration of fill_schema_events, a function that does not exist

  sql/event_queue.cc@1.12, 2006-08-17 14:22:52+02:00, andrey@example.com +49 -185
    - Use initialization lists
    - Let find_n_remove_event delete the object thus making the code more robust.
      The caller could forget to destruct the object. In addition, find_n_remove_element()
      does not return a value.
    - Move check_system_tables() to class Events
    - Fix comments

  sql/event_queue.h@1.10, 2006-08-17 14:22:52+02:00, andrey@example.com +5 -8
    - Whitespace changes
    - init_queue() should allow passing of THD
    - check_system_tables moved to class Events
    - find_n_remove_event() is now void

  sql/event_scheduler.cc@1.21, 2006-08-17 14:22:52+02:00, andrey@example.com +4 -4
    - Initialize res before use
    - Remove end stop from message

  sql/event_scheduler.h@1.16, 2006-08-17 14:22:52+02:00, andrey@example.com +8 -7
    Add uninitialized state. The scheduler is in it before init_scheduler()
    is called. The rationale is that otherwise state has no value before
    the call. If the system tables were damaged the scheduler won't be initialized
    but in Events::deinit() Event_scheduler::stop() will be called and this will
    touch state, generating valgrind warning at minimum.

  sql/events.cc@1.59, 2006-08-17 14:22:52+02:00, andrey@example.com +220 -60
    - Whitespace changes
    - Fix comments
    - Make methods which have only one error code be bool instead of int
    - Create temporarily a THD to be used for the initialization of Event_queue
    - Event_queue::check_system_tables() moved to Events::check_system_tables
    - is_started() is renamed to is_execution_of_events_started()

  sql/events.h@1.44, 2006-08-17 14:22:52+02:00, andrey@example.com +21 -16
    - Whitespace changes
    - When a method returns only one error code it should be bool, not int
    - is_started() renamed to is_execution_of_events_started()

  sql/set_var.cc@1.184, 2006-08-17 14:22:52+02:00, andrey@example.com +1 -1
    is_started() is renamed to is_execution_of_events_started()

  sql/share/errmsg.txt@1.119, 2006-08-17 14:22:53+02:00, andrey@example.com +2 -0
    New error message

  sql/sql_db.cc@1.141, 2006-08-17 14:22:52+02:00, andrey@example.com +1 -1
    The return code is not used, thus don't return anything and drop_schema_events()
    is now void.

  sql/sql_yacc.yy@1.493, 2006-08-17 14:22:52+02:00, andrey@example.com +20 -19
    - Fix comments
    - Remove unneeded initialization which is performed in lex_init()

  sql/table.cc@1.239.2.1, 2006-08-17 14:22:53+02:00, andrey@example.com +22 -22
    - Fix comments
    - make table_check_intact() accespt const *table_def

  sql/table.h@1.149, 2006-08-17 14:22:53+02:00, andrey@example.com +3 -3
    Make table_check_intact() accespt const *table_def

ChangeSet@1.2255.41.1, 2006-08-17 03:52:42-04:00, mikael@dator5.(none) +1 -0
  BUG#21960: Unbalanced data in MySQL Cluster 5.1 for number of node groups > 1
  Fixed bad initialisation of default_node_group, failed to take into
  account fact that first node group is set to zero

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.74.2.1, 2006-08-17 03:52:39-04:00, mikael@dator5.(none) +5 -0
    Fixed bad initialisation of default_node_group, failed to take into
    account fact that first node group is set to zero

ChangeSet@1.2245.1.5, 2006-08-17 09:31:46+02:00, mats@romeo.(none) +2 -0
  BUG#20863 (if binlog format is changed between update and unlock of table, wrong binlog):
  Post-merge fixes.

  mysql-test/r/rpl_switch_stm_row_mixed.result@1.12.1.2, 2006-08-17 09:31:42+02:00, mats@romeo.(none) +334 -20
    Result change

  mysql-test/t/rpl_switch_stm_row_mixed.test@1.11, 2006-08-17 09:31:42+02:00, mats@romeo.(none) +4 -0
    Fixing test

ChangeSet@1.2255.21.8, 2006-08-16 20:39:33-07:00, pgalbraith@govinda.patg.net +1 -0
  merge warning test results (!)

  mysql-test/r/warnings.result@1.49, 2006-08-16 20:39:30-07:00, pgalbraith@govinda.patg.net +1 -1
    merge warning test results (!)

ChangeSet@1.2255.21.7, 2006-08-16 17:16:36-07:00, pgalbraith@govinda.patg.net +2 -0
  test result changes (non-functional) for 5.1-5.0 merge

  mysql-test/r/federated_transactions.result@1.4, 2006-08-16 17:16:33-07:00, pgalbraith@govinda.patg.net +1 -1
    merge fixes to result file (case sensitivity)

  mysql-test/r/warnings.result@1.48, 2006-08-16 17:16:33-07:00, pgalbraith@govinda.patg.net +1 -1
    wrong warning message result

ChangeSet@1.1810.2041.2, 2006-08-16 19:19:49-04:00, iggy@rolltop.ignatz42.dyndns.org +1 -0
  manual merge

  sql/sql_acl.cc@1.128.1.74, 2006-08-16 19:19:46-04:00, iggy@rolltop.ignatz42.dyndns.org +21 -4
    manual merge

ChangeSet@1.2255.40.2, 2006-08-16 23:45:01+02:00, tnurnberg@salvation.intern.azundris.com +2 -0
  manual merge

  mysql-test/r/partition.result@1.49.4.1, 2006-08-16 23:43:35+02:00, tnurnberg@salvation.intern.azundris.com +4 -4
    manual merge

  mysql-test/r/partition_mgm.result@1.5.1.1, 2006-08-16 23:43:38+02:00, tnurnberg@salvation.intern.azundris.com +4 -4
    manual merge

ChangeSet@1.1810.2038.5, 2006-08-16 20:38:33+02:00, msvensson@shellback.(none) +1 -0
  Remove duplicate free of "ds_res"

  client/mysqltest.c@1.155.9.50, 2006-08-16 20:38:29+02:00, msvensson@shellback.(none) +0 -3
    Remove duplicate free of "ds_res"

ChangeSet@1.1616.2721.2, 2006-08-16 13:55:16-04:00, iggy@rolltop.ignatz42.dyndns.org +2 -0
  Bug#20328 - Correction to test/result for broken Windows build.

  mysql-test/r/mysql_client.result@1.2.1.1, 2006-08-16 13:55:15-04:00, iggy@rolltop.ignatz42.dyndns.org +0 -44
    Removed OS dependant output.

  mysql-test/t/mysql_client.test@1.2.1.1, 2006-08-16 13:55:15-04:00, iggy@rolltop.ignatz42.dyndns.org +3 -3
    Re-directed output to a temporary file because the actual output isn't important and was causing a Windows test failure.

ChangeSet@1.2255.21.6, 2006-08-16 10:47:53-07:00, pgalbraith@govinda.patg.net +1 -0
  merge 5.0 -> 5.1, re-enabling federated, disabled partition

  mysql-test/t/disabled.def@1.184.1.3, 2006-08-16 10:47:50-07:00, pgalbraith@govinda.patg.net +1 -1
    merge 5.0 -> 5.1, re-enabling federated, disabled partition

ChangeSet@1.2255.37.2, 2006-08-16 19:29:49+02:00, mleich@three.local.lan +15 -0
  This changeset belongs to
          WL#3397 Refactoring storage engine test cases (for falcon)
        It contains fixes according to second code review.
  - Remove any occurence of hardcoded assignments of storage engines
  - Use variable names exact telling what it is used for
  - Updated comments
  - remove trailing spaces

  mysql-test/include/handler.inc@1.33, 2006-08-16 19:29:44+02:00, mleich@three.local.lan +13 -7
    - Replace hardcoded MyISAM with assignments via variable

  mysql-test/include/mix1.inc@1.10, 2006-08-16 19:29:44+02:00, mleich@three.local.lan +30 -29
    - Replace hardcoded MyISAM with assignments via variable
    - Remove hardcoded InnoDB assignments (They were introduced by late push)
    - Remove trailing spaces

  mysql-test/include/mix2.inc@1.3, 2006-08-16 19:29:44+02:00, mleich@three.local.lan +45 -35
    - Replace hardcode MyISAM assignments
    - Remove trailing spaces
    - Engine assignments via variable refers to the use of the storage engine
      $other_non_trans_engine_type, $other_live_chcks_engine_type ...

  mysql-test/include/read_many_rows.inc@1.4, 2006-08-16 19:29:44+02:00, mleich@three.local.lan +11 -4
    Replace hardcoded MyISAM assignment

  mysql-test/include/rowid_order.inc@1.7, 2006-08-16 19:29:44+02:00, mleich@three.local.lan +7 -7
    remove trailing spaces

  mysql-test/r/handler_innodb.result@1.16, 2006-08-16 19:29:44+02:00, mleich@three.local.lan +2 -2
    Updated result

  mysql-test/r/handler_myisam.result@1.28, 2006-08-16 19:29:44+02:00, mleich@three.local.lan +1 -1
    Updated result

  mysql-test/r/innodb_mysql.result@1.9, 2006-08-16 19:29:44+02:00, mleich@three.local.lan +16 -16
    Updated result

  mysql-test/r/mix2_myisam.result@1.3, 2006-08-16 19:29:44+02:00, mleich@three.local.lan +6 -6
    Updated result

  mysql-test/r/read_many_rows_innodb.result@1.4, 2006-08-16 19:29:44+02:00, mleich@three.local.lan +10 -9
    Updated result

  mysql-test/r/rowid_order_innodb.result@1.11, 2006-08-16 19:29:44+02:00, mleich@three.local.lan +4 -4
    Updated result

  mysql-test/t/handler_innodb.test@1.15, 2006-08-16 19:29:44+02:00, mleich@three.local.lan +2 -0
    Introduce $variables

  mysql-test/t/handler_myisam.test@1.3, 2006-08-16 19:29:44+02:00, mleich@three.local.lan +4 -0
    Introduce $variables

  mysql-test/t/mix2_myisam.test@1.3, 2006-08-16 19:29:44+02:00, mleich@three.local.lan +7 -0
    Introduce $variables

  mysql-test/t/read_many_rows_innodb.test@1.3, 2006-08-16 19:29:44+02:00, mleich@three.local.lan +1 -0
    Introduce $variables

ChangeSet@1.1810.2040.1, 2006-08-16 09:37:19-07:00, igor@rurik.mysql.com +4 -0
  Fixed bug #18165.
  Made [NOT]BETWEEN predicates SARGable in respect to the second and 
  the third arguments.

  mysql-test/r/range.result@1.44.1.4, 2006-08-16 09:37:11-07:00, igor@rurik.mysql.com +36 -0
    Added a test case to bug #18165.

  mysql-test/t/range.test@1.37.1.4, 2006-08-16 09:37:11-07:00, igor@rurik.mysql.com +30 -0
    Added a test case to bug #18165.

  sql/opt_range.cc@1.159.1.60, 2006-08-16 09:37:12-07:00, igor@rurik.mysql.com +171 -59
    Fixed bug #18165.
    Made [NOT]BETWEEN predicates SARGable in respect to the second and 
    the third arguments.
    Put in a separate function called get_full_func_mm_tree the functionality
    that builds a conjunction of all SEL_TREEs for a simple predicate of the
    form (f op c), where f was a field and c was a constant, applying different
    equalities f=f' with f' being another field.

  sql/sql_select.cc@1.312.86.1, 2006-08-16 09:37:12-07:00, igor@rurik.mysql.com +18 -1
    Fixed bug #18165.
    Made [NOT]BETWEEN predicates SARGable in respect to the second and 
    the third arguments.

ChangeSet@1.1810.2014.9, 2006-08-16 19:30:46+03:00, jani@ua141d10.elisa.omakaista.fi +1 -0
  Fix for bug#21537, "Error at startup"
  
  These variables must be defined for Netware, or it fails
  to recognize hard paths starting from the device.
  

  include/config-netware.h@1.14.2.1, 2006-08-16 19:30:44+03:00, jani@ua141d10.elisa.omakaista.fi +4 -0
    Fix for bug#21537, "Error at startup"
    
    These variables must be defined for Netware.

ChangeSet@1.1810.2014.8, 2006-08-16 10:19:48-05:00, reggie@big_geek. +1 -0
  small fix to enable the test suite to find executables and scripts on Windows

  mysql-test/lib/mtr_misc.pl@1.12.1.1, 2006-08-16 10:19:45-05:00, reggie@big_geek. +16 -2
    if running on win32, check for the existence of the file rather than it being executable

ChangeSet@1.2255.39.1, 2006-08-16 20:07:12+05:00, gluh@mysql.com +1 -0
  Bug#20871 Partitions: crash if --skip-innodb
  return error if engine is disabled

  sql/table.cc@1.239.1.1, 2006-08-16 20:07:08+05:00, gluh@mysql.com +4 -2
    Bug#20871 Partitions: crash if --skip-innodb
    return error if engine is disabled

ChangeSet@1.1810.2039.1, 2006-08-16 17:03:41+02:00, msvensson@shellback.(none) +4 -0
  Bug#20328 mysql client: dumb about trailing spaces on 'help' command
   Fix testcase to also work on windows

  BitKeeper/deleted/.del-mysql_client.result@1.5, 2006-08-16 17:01:23+02:00, msvensson@shellback.(none) +0 -0
    Delete: mysql-test/r/mysql_client.result

  BitKeeper/deleted/.del-mysql_client.test@1.4, 2006-08-16 17:01:16+02:00, msvensson@shellback.(none) +0 -0
    Delete: mysql-test/t/mysql_client.test

  mysql-test/r/mysql.result@1.14, 2006-08-16 17:03:38+02:00, msvensson@shellback.(none) +8 -0
    Update test result

  mysql-test/t/mysql.test@1.4.1.10, 2006-08-16 17:03:38+02:00, msvensson@shellback.(none) +45 -1
    Move tests from mysql_client to mysql
    Fix test case for bug#20328 to work on windows by comparing the output from "help" and "help " 

ChangeSet@1.1810.2024.3, 2006-08-16 15:25:30+02:00, msvensson@shellback.(none) +1 -0
  Bug#20219  make bin-dist produces unportable for testing tarball
   - Setup LD_LIBRARY_PATH to favor local libs

  mysql-test/mysql-test-run.pl@1.30.1.80, 2006-08-16 15:25:27+02:00, msvensson@shellback.(none) +17 -12
    Setup LD_LIBRARY_PATH so the libraries from this distro/clone are
    used in favor of the system installed ones

ChangeSet@1.2255.37.1, 2006-08-16 14:58:49+02:00, mleich@three.local.lan +47 -0
      This changeset belongs to
        WL#3397 Refactoring storage engine test cases (for falcon)
      It contains also fixes according to code review.
      Contents: Testcases which were in history dedicated to InnoDB or MyISAM only.
      Modifications:
      1. Shift the main testing code into include/<testing field>.inc
         Introduce $variables which can be used to omit tests for features which are not supported by
         certain storage engines.
      2. The storage engine to be tested is assigned within the toplevel script (t/<whatever>_<engine>.test)
         via variable $engine_type and the the main testing code is sourced from 
         include/<testing field>.inc
      3. Some toplevel testscripts have to be renamed to
         - avoid immediate or future namespace clashes
         - show via filename which storage engine is tested
      4. Minor code cleanup like remove trailing spaces, some additional comments ....

  BitKeeper/deleted/.del-index_merge.result@1.21, 2006-08-16 13:20:33+02:00, mleich@three.local.lan +0 -0
    Delete: mysql-test/r/index_merge.result

  BitKeeper/deleted/.del-index_merge_innodb.result@1.19, 2006-08-16 13:20:33+02:00, mleich@three.local.lan +0 -0
    Delete: mysql-test/r/index_merge_innodb.result

  BitKeeper/deleted/.del-index_merge_innodb2.result@1.6, 2006-08-16 13:20:33+02:00, mleich@three.local.lan +0 -0
    Delete: mysql-test/r/index_merge_innodb2.result

  BitKeeper/deleted/.del-index_merge_ror.result@1.10, 2006-08-16 13:20:33+02:00, mleich@three.local.lan +0 -0
    Delete: mysql-test/r/index_merge_ror.result

  BitKeeper/deleted/.del-index_merge_ror_cpk.result@1.11, 2006-08-16 13:20:33+02:00, mleich@three.local.lan +0 -0
    Delete: mysql-test/r/index_merge_ror_cpk.result

  mysql-test/include/concurrent.inc@1.4, 2006-08-16 14:53:47+02:00, mleich@three.local.lan +23 -12
    1. This file contains now the main testing code of the former t/innodb_concurrent.test.
    2. It is now sourced by t/concurrent_innodb.test.

  mysql-test/include/concurrent.inc@1.3, 2006-08-16 11:53:02+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/t/innodb_concurrent.test -> mysql-test/include/concurrent.inc

  mysql-test/include/deadlock.inc@1.13, 2006-08-16 14:53:47+02:00, mleich@three.local.lan +41 -11
    1. This file contains now the main testing code of the former t/innodb-deadlock.test
    2. It is now sourced by t/deadlock_innodb.test.

  mysql-test/include/deadlock.inc@1.12, 2006-08-16 12:13:52+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/t/innodb-deadlock.test -> mysql-test/include/deadlock.inc

  mysql-test/include/handler.inc@1.32, 2006-08-16 14:53:47+02:00, mleich@three.local.lan +34 -2
    1. This file contains now the main testing code of the former t/innodb_handler.test + t/handler.test.
    2. It is now sourced by t/handler_myisam.test and t/handler_innodb.test.

  mysql-test/include/handler.inc@1.31, 2006-08-16 12:35:14+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/t/handler.test -> mysql-test/include/handler.inc

  mysql-test/include/index_merge1.inc@1.16, 2006-08-16 14:53:47+02:00, mleich@three.local.lan +78 -54
    1. This file contains now the main testing code of the former t/index_merge.test.
    2. It is now sourced by t/index_merge_myisam.test.

  mysql-test/include/index_merge1.inc@1.15, 2006-08-16 13:14:48+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/t/index_merge.test -> mysql-test/include/index_merge1.inc

  mysql-test/include/index_merge2.inc@1.14, 2006-08-16 14:53:47+02:00, mleich@three.local.lan +56 -40
    1. This file contains now the main code of t/index_merge_innodb.test.
    2. It is sourced by t/index_merge_myisam.test and t/index_merge_innodb.test.

  mysql-test/include/index_merge2.inc@1.13, 2006-08-16 13:16:33+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/t/index_merge_innodb.test -> mysql-test/include/index_merge2.inc

  mysql-test/include/index_merge_2sweeps.inc@1.7, 2006-08-16 14:53:47+02:00, mleich@three.local.lan +24 -11
    1. This file contains now the main code of the former t/index_merge_innodb2.test.
    2. It is sourced by t/index_merge_myisam.test and t/index_merge_innodb.test.

  mysql-test/include/index_merge_2sweeps.inc@1.6, 2006-08-16 13:17:18+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/t/index_merge_innodb2.test -> mysql-test/include/index_merge_2sweeps.inc

  mysql-test/include/index_merge_ror.inc@1.11, 2006-08-16 14:53:47+02:00, mleich@three.local.lan +43 -20
    1. This file contains now the main code of the former t/index_merge_ror.test.
    2. It is sourced by t/index_merge_myisam.test.

  mysql-test/include/index_merge_ror.inc@1.10, 2006-08-16 13:15:44+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/t/index_merge_ror.test -> mysql-test/include/index_merge_ror.inc

  mysql-test/include/index_merge_ror_cpk.inc@1.10, 2006-08-16 14:53:47+02:00, mleich@three.local.lan +47 -30
    1. This file contains now the main testing code of the former t/index_merge_ror_cpk.test.
    2. It is now sourced by t/index_merge_myisam.test and t/index_merge_innodb.test.

  mysql-test/include/index_merge_ror_cpk.inc@1.9, 2006-08-16 13:18:12+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/t/index_merge_ror_cpk.test -> mysql-test/include/index_merge_ror_cpk.inc

  mysql-test/include/mix1.inc@1.9, 2006-08-16 14:53:47+02:00, mleich@three.local.lan +43 -42
    1. This file contains now the main testing code of the t/innodb_mysql.test
    2. The name mix1.inc was used because the test contains subtests for different fields.
    3. It is sourced by t/innodb_mysql.test.
    4. Fixes:
        - Assign $other_engine_type instead of hardcoded MyISAM.
        - improve comment
        - remove redundant subtest
        - analyze table t4 instead of wrong table t1
        - remove not needed "eval set storage_engine = $engine_type;" 

  mysql-test/include/mix1.inc@1.8, 2006-08-16 12:25:36+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/t/innodb_mysql.test -> mysql-test/include/mix1.inc

  mysql-test/include/mix2.inc@1.2, 2006-08-16 14:53:47+02:00, mleich@three.local.lan +486 -322
    1. This file is a copy of the main testing code of the t/innodb.test
       A copy has to be used, because t/innodb.test is to be maintained by INNOBASE only.
    2. The name mix2.inc was used because the test contains subtests for different fields.
    3. It is sourced by t/mix2_myisam.test.
    4. Fixes:
        - improved comment
        - additional "eval SET SESSION STORAGE_ENGINE = $other_engine_type;" at beginning of tests
        - assign $other_engine_type instead of hardcoded MyISAM or HEAP
        - assign $other_engine_type where it is needed to preserve test logics
        - correct logical bugs
        - improve(extend) "checksum table" test 

  mysql-test/include/mix2.inc@1.1, 2006-08-16 12:51:26+02:00, mleich@three.local.lan +2525 -0
    BitKeeper file /home/matthias/Arbeit/mysql-5.1-engines/src-1/mysql-test/include/mix2.inc

  mysql-test/include/mix2.inc@1.0, 2006-08-16 12:51:26+02:00, mleich@three.local.lan +0 -0

  mysql-test/include/query_cache.inc@1.14, 2006-08-16 14:53:47+02:00, mleich@three.local.lan +27 -11
    1. This file contains now the main testing code of the former t/innodb_cache.test.
    2. It is now sourced by t/cache_innodb.test

  mysql-test/include/query_cache.inc@1.13, 2006-08-16 11:33:57+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/t/innodb_cache.test -> mysql-test/include/query_cache.inc

  mysql-test/include/read_many_rows.inc@1.3, 2006-08-16 14:53:47+02:00, mleich@three.local.lan +22 -14
    1. This file contains now the main testing code of the former t/innodb_big.test.
    2. It is now sourced by t/read_many_rows_innodb.test.

  mysql-test/include/read_many_rows.inc@1.2, 2006-08-16 11:19:15+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/t/innodb-big.test -> mysql-test/include/read_many_rows.inc

  mysql-test/include/rowid_order.inc@1.6, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +21 -8
    1. This file contains now the main testing code of t/rowid_order_innodb.test.
    2. It is now sourced by t/rowid_order_innodb.test.

  mysql-test/include/rowid_order.inc@1.5, 2006-08-16 13:50:08+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/t/rowid_order.inc -> mysql-test/include/rowid_order.inc

  mysql-test/t/rowid_order.inc@1.4, 2006-08-16 13:48:49+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/t/rowid_order_innodb.test -> mysql-test/t/rowid_order.inc

  mysql-test/include/unsafe_binlog.inc@1.4, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +42 -25
    1. This file contains now the main testing code of the former t/innodb_unsafe_binlog.test.
    2. It is now sourced by t/unsafe_binlog_innodb.test.

  mysql-test/include/unsafe_binlog.inc@1.3, 2006-08-16 10:42:16+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/t/innodb_unsafe_binlog.test -> mysql-test/include/unsafe_binlog.inc

  mysql-test/r/cache_innodb.result@1.15, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +10 -9
    Updated result

  mysql-test/r/cache_innodb.result@1.14, 2006-08-16 11:36:32+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/r/innodb_cache.result -> mysql-test/r/cache_innodb.result

  mysql-test/r/concurrent_innodb.result@1.4, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +10 -24
    Updated result

  mysql-test/r/concurrent_innodb.result@1.3, 2006-08-16 11:57:58+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/r/innodb_concurrent.result -> mysql-test/r/concurrent_innodb.result

  mysql-test/r/deadlock_innodb.result@1.7, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +23 -5
    Updated result

  mysql-test/r/deadlock_innodb.result@1.6, 2006-08-16 12:16:10+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/r/innodb-deadlock.result -> mysql-test/r/deadlock_innodb.result

  mysql-test/r/handler_innodb.result@1.15, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +354 -4
    Updated result

  mysql-test/r/handler_innodb.result@1.14, 2006-08-16 12:41:00+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/r/innodb_handler.result -> mysql-test/r/handler_innodb.result

  mysql-test/r/handler_myisam.result@1.27, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +33 -0
    Updated result

  mysql-test/r/handler_myisam.result@1.26, 2006-08-16 12:37:42+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/r/handler.result -> mysql-test/r/handler_myisam.result

  mysql-test/r/index_merge_innodb.result@1.1, 2006-08-16 13:43:52+02:00, mleich@three.local.lan +543 -0
    BitKeeper file /home/matthias/Arbeit/mysql-5.1-engines/src-1/mysql-test/r/index_merge_innodb.result

  mysql-test/r/index_merge_innodb.result@1.0, 2006-08-16 13:43:52+02:00, mleich@three.local.lan +0 -0

  mysql-test/r/index_merge_myisam.result@1.2, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +16 -16
    Updated result

  mysql-test/r/index_merge_myisam.result@1.1, 2006-08-16 13:43:53+02:00, mleich@three.local.lan +1210 -0
    BitKeeper file /home/matthias/Arbeit/mysql-5.1-engines/src-1/mysql-test/r/index_merge_myisam.result

  mysql-test/r/index_merge_myisam.result@1.0, 2006-08-16 13:43:53+02:00, mleich@three.local.lan +0 -0

  mysql-test/r/innodb_mysql.result@1.8, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +15 -69
    Updated result

  mysql-test/r/mix2_myisam.result@1.2, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +251 -1242
    Updated result

  mysql-test/r/mix2_myisam.result@1.1, 2006-08-16 12:55:45+02:00, mleich@three.local.lan +3466 -0
    BitKeeper file /home/matthias/Arbeit/mysql-5.1-engines/src-1/mysql-test/r/mix2_myisam.result

  mysql-test/r/mix2_myisam.result@1.0, 2006-08-16 12:55:45+02:00, mleich@three.local.lan +0 -0

  mysql-test/r/read_many_rows_innodb.result@1.3, 2006-08-16 11:22:42+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/r/innodb-big.result -> mysql-test/r/read_many_rows_innodb.result

  mysql-test/r/rowid_order_innodb.result@1.10, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +6 -5
    Updated result

  mysql-test/r/unsafe_binlog_innodb.result@1.4, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +20 -17
    Updated result

  mysql-test/r/unsafe_binlog_innodb.result@1.3, 2006-08-16 10:46:56+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/r/innodb_unsafe_binlog.result -> mysql-test/r/unsafe_binlog_innodb.result

  mysql-test/t/cache_innodb-master.opt@1.4, 2006-08-16 11:37:58+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/t/innodb_cache-master.opt -> mysql-test/t/cache_innodb-master.opt

  mysql-test/t/cache_innodb.test@1.2, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +11 -82
    1. Renaming of t/innodb_cache.test to t/cache_innodb.test
    2. Main code is now sourced from include/query_cache.inc.

  mysql-test/t/cache_innodb.test@1.1, 2006-08-16 11:35:29+02:00, mleich@three.local.lan +87 -0
    BitKeeper file /home/matthias/Arbeit/mysql-5.1-engines/src-1/mysql-test/t/cache_innodb.test

  mysql-test/t/cache_innodb.test@1.0, 2006-08-16 11:35:29+02:00, mleich@three.local.lan +0 -0

  mysql-test/t/concurrent_innodb-master.opt@1.2, 2006-08-16 11:56:44+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/t/innodb_concurrent-master.opt -> mysql-test/t/concurrent_innodb-master.opt

  mysql-test/t/concurrent_innodb.test@1.2, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +9 -335
    1. Renaming of t/innodb_concurrent.test to t/concurrent_innodb.test
    2. Main code is now sourced from include/concurrent.inc.
       Attention: This test fails even in the old version. (BUG#21579).
                  --> added to t/disabled.def

  mysql-test/t/concurrent_innodb.test@1.1, 2006-08-16 11:55:16+02:00, mleich@three.local.lan +346 -0
    BitKeeper file /home/matthias/Arbeit/mysql-5.1-engines/src-1/mysql-test/t/concurrent_innodb.test

  mysql-test/t/concurrent_innodb.test@1.0, 2006-08-16 11:55:16+02:00, mleich@three.local.lan +0 -0

  mysql-test/t/deadlock_innodb.test@1.2, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +10 -111
    1. Renaming of t/innodb_deadlock.test to t/deadlock_innodb.test
    2. Main code is now sourced from include/deadlock.inc.

  mysql-test/t/deadlock_innodb.test@1.1, 2006-08-16 12:14:43+02:00, mleich@three.local.lan +117 -0
    BitKeeper file /home/matthias/Arbeit/mysql-5.1-engines/src-1/mysql-test/t/deadlock_innodb.test

  mysql-test/t/deadlock_innodb.test@1.0, 2006-08-16 12:14:43+02:00, mleich@three.local.lan +0 -0

  mysql-test/t/disabled.def@1.184.3.1, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +1 -0
    Add the test concurrent_innodb because of 
    BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences

  mysql-test/t/handler_innodb.test@1.14, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +12 -90
    1. Renaming of t/innodb_handler.test to t/handler_innodb.test
    2. Main code is now sourced from include/handler.inc.
       include/handler.inc = united code of former t/handler.test and t/innodb_handler.test

  mysql-test/t/handler_innodb.test@1.13, 2006-08-16 12:39:42+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/t/innodb_handler.test -> mysql-test/t/handler_innodb.test

  mysql-test/t/handler_myisam.test@1.2, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +10 -421
    1. Renaming of t/handler.test to t/handler_myisam.test
    2. Main code is now sourced from include/handler.inc.
       include/handler.inc = united code of former t/handler.test and t/handler_innodb.test.

  mysql-test/t/handler_myisam.test@1.1, 2006-08-16 12:36:41+02:00, mleich@three.local.lan +428 -0
    BitKeeper file /home/matthias/Arbeit/mysql-5.1-engines/src-1/mysql-test/t/handler_myisam.test

  mysql-test/t/handler_myisam.test@1.0, 2006-08-16 12:36:41+02:00, mleich@three.local.lan +0 -0

  mysql-test/t/index_merge_innodb.test@1.1, 2006-08-16 13:43:53+02:00, mleich@three.local.lan +24 -0
    BitKeeper file /home/matthias/Arbeit/mysql-5.1-engines/src-1/mysql-test/t/index_merge_innodb.test

  mysql-test/t/index_merge_innodb.test@1.0, 2006-08-16 13:43:53+02:00, mleich@three.local.lan +0 -0

  mysql-test/t/index_merge_myisam.test@1.1, 2006-08-16 13:43:53+02:00, mleich@three.local.lan +21 -0
    BitKeeper file /home/matthias/Arbeit/mysql-5.1-engines/src-1/mysql-test/t/index_merge_myisam.test

  mysql-test/t/index_merge_myisam.test@1.0, 2006-08-16 13:43:53+02:00, mleich@three.local.lan +0 -0

  mysql-test/t/innodb_mysql.test@1.2, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +8 -318
    1. Main code is now sourced from include/mix1.inc.
    2. Test was not renamed because t/innodb.test refers to it.

  mysql-test/t/innodb_mysql.test@1.1, 2006-08-16 12:26:24+02:00, mleich@three.local.lan +322 -0
    BitKeeper file /home/matthias/Arbeit/mysql-5.1-engines/src-1/mysql-test/t/innodb_mysql.test

  mysql-test/t/innodb_mysql.test@1.0, 2006-08-16 12:26:24+02:00, mleich@three.local.lan +0 -0

  mysql-test/t/mix2_myisam.test@1.2, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +15 -2521
    New test: MyISAM variant of mix2 ( = t/innodb.test)

  mysql-test/t/mix2_myisam.test@1.1, 2006-08-16 12:53:40+02:00, mleich@three.local.lan +2525 -0
    BitKeeper file /home/matthias/Arbeit/mysql-5.1-engines/src-1/mysql-test/t/mix2_myisam.test

  mysql-test/t/mix2_myisam.test@1.0, 2006-08-16 12:53:40+02:00, mleich@three.local.lan +0 -0

  mysql-test/t/read_many_rows_innodb.test@1.2, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +11 -41
    1. Renaming of t/innodb_big.test to t/read_many_rows_innodb.test
    2. Main code is now sourced from include/read_many_rows.inc.

  mysql-test/t/read_many_rows_innodb.test@1.1, 2006-08-16 11:21:26+02:00, mleich@three.local.lan +46 -0
    BitKeeper file /home/matthias/Arbeit/mysql-5.1-engines/src-1/mysql-test/t/read_many_rows_innodb.test

  mysql-test/t/read_many_rows_innodb.test@1.0, 2006-08-16 11:21:26+02:00, mleich@three.local.lan +0 -0

  mysql-test/t/rowid_order_innodb.test@1.2, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +6 -113
    Main code is now sourced from t/rowid_order.inc.

  mysql-test/t/rowid_order_innodb.test@1.1, 2006-08-16 14:03:45+02:00, mleich@three.local.lan +121 -0
    BitKeeper file /home/matthias/Arbeit/mysql-5.1-engines/src-1/mysql-test/t/rowid_order_innodb.test

  mysql-test/t/rowid_order_innodb.test@1.0, 2006-08-16 14:03:45+02:00, mleich@three.local.lan +0 -0

  mysql-test/t/unsafe_binlog_innodb-master.opt@1.3, 2006-08-16 10:45:50+02:00, mleich@three.local.lan +0 -0
    Rename: mysql-test/t/innodb_unsafe_binlog-master.opt -> mysql-test/t/unsafe_binlog_innodb-master.opt

  mysql-test/t/unsafe_binlog_innodb.test@1.2, 2006-08-16 14:53:48+02:00, mleich@three.local.lan +9 -241
    1. Renaming of t/innodb_unsafe_binlog.test to t/unsafe_binlog_innodb.test
    2. Main code is now sourced from include/unsafe_binlog.inc.

  mysql-test/t/unsafe_binlog_innodb.test@1.1, 2006-08-16 10:44:19+02:00, mleich@three.local.lan +248 -0
    BitKeeper file /home/matthias/Arbeit/mysql-5.1-engines/src-1/mysql-test/t/unsafe_binlog_innodb.test

  mysql-test/t/unsafe_binlog_innodb.test@1.0, 2006-08-16 10:44:19+02:00, mleich@three.local.lan +0 -0

ChangeSet@1.2181.183.1, 2006-08-16 14:55:57+02:00, mats@romeo.(none) +4 -0
  BUG#20863 (if binlog format is changed between update and unlock table, wrong binlogging):
  Fix to allow the binlog format to be changed between the LOCK and
  UNLOCK tables, as well as under MIXED mode.

  mysql-test/r/rpl_switch_stm_row_mixed.result@1.5.2.1, 2006-08-16 14:55:52+02:00, mats@romeo.(none) +29 -6
    Result change

  mysql-test/t/rpl_switch_stm_row_mixed.test@1.4.2.1, 2006-08-16 14:55:52+02:00, mats@romeo.(none) +32 -1
    Adding test to see that binlog format can be changed when using
    LOCK/UNLOCK TABLES both under ROW format and MIXED format.

  sql/log.cc@1.218.2.1, 2006-08-16 14:55:52+02:00, mats@romeo.(none) +1 -1
    Removing pre-condition assertion since binlog can now be
    statement based.

  sql/sql_class.cc@1.272.1.1, 2006-08-16 14:55:53+02:00, mats@romeo.(none) +21 -19
    Adding code to always flush pending event regardless of the binlog
    format used. The only exception is if we are inside a stored routine,
    where the pending event is never flushed. 

ChangeSet@1.2255.36.2, 2006-08-16 13:47:01+02:00, msvensson@shellback.(none) +1 -0
  Fix indentation

  mysql-test/mysql-test-run.pl@1.152, 2006-08-16 13:46:56+02:00, msvensson@shellback.(none) +2 -1
    Fix indentation

ChangeSet@1.1810.2002.11, 2006-08-16 12:03:59+08:00, gni@dev3-127.(none) +1 -0
  BUG#19620 ndb_mgm help needs help 

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.19.2, 2006-08-16 12:03:57+08:00, gni@dev3-127.(none) +4 -4
    help information more canonical

ChangeSet@1.1810.2036.1, 2006-08-16 14:34:08+05:00, ramil@mysql.com +1 -0
  fix for bug #18267: pthreads library in single-threaded libraries causes dlopen() to fail on HP/UX
    - zlib doesn't need a thread lib.

  zlib/Makefile.am@1.6.1.4, 2006-08-16 14:34:03+05:00, ramil@mysql.com +2 -0
    fix for bug #18267: pthreads library in single-threaded libraries causes dlopen() to fail on HP/UX
      - zlib doesn't require a thread lib.

ChangeSet@1.2270.2.1, 2006-08-16 11:05:02+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb -
    Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell)
    This will hopefully remove some volatile testfailures in pushbuild
      (i've seen a couple by looking at logs)

  mysql-test/ndb/ndb_config_1_node.ini@1.3, 2006-08-16 11:05:00+02:00, jonas@perch.ndb.mysql.com +6 -0
    Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell)

  mysql-test/ndb/ndb_config_2_node.ini@1.19, 2006-08-16 11:05:00+02:00, jonas@perch.ndb.mysql.com +6 -0
    Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell)

  mysql-test/ndb/ndb_config_4_node.ini@1.3, 2006-08-16 11:05:00+02:00, jonas@perch.ndb.mysql.com +6 -0
    Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell)

ChangeSet@1.2255.5.2, 2006-08-16 10:30:22+02:00, msvensson@shellback.(none) +2 -0
  Move initializations of environment variables that are constant during the whole testrun to 'environment_setup'
  Split out functions that detects if we need master or slave restarts

  mysql-test/lib/mtr_process.pl@1.46, 2006-08-16 10:30:19+02:00, msvensson@shellback.(none) +4 -1
    Fix spelling error 

  mysql-test/mysql-test-run.pl@1.147.2.1, 2006-08-16 10:30:19+02:00, msvensson@shellback.(none) +307 -224
    Move initializations of environment variables that are constant during the whole testrun to 'environment_setup'
    Split out functions 'run_testcase_need_master_restart' and 'run_testcase_need_slave_restart'

ChangeSet@1.1810.2035.1, 2006-08-16 16:02:13+08:00, gni@dev3-127.(none) +1 -0
  BUG#19873 Running any command in ndb_mgm can automatically reconnect the server after restarting the ndb_mgmd.
            connect command in the ndb_mgm can connect or reconnect the management server successfully

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.17.1, 2006-08-16 16:02:12+08:00, gni@dev3-127.(none) +12 -1
    1.After restarting the ndb_mgmd, running any command in ndb_mgm will automatically reconnect the server firstly.
    2.The connect command in the ndb_mgm can connect or reconnect the management server successfully.

ChangeSet@1.1810.2034.2, 2006-08-16 14:39:27+08:00, stewart@willster.(none) +1 -0
  BUG#21671 memory leak for mgmapi event listeners
  
  fixes the following valgrind warning (when running ndb_mgm under valgrind,
  or, indeed any other mgmapi program listening to events):
  
  ==23291== 190 (20 direct, 170 indirect) bytes in 1 blocks are definitely lost in loss record 13 of 22
  ==23291==    at 0x401C895: operator new(unsigned) (vg_replace_malloc.c:163)
  ==23291==    by 0x8075300: ParserImpl::run(Parser<ParserImpl::Dummy>::Context*, Properties const**, bool volatile*) const (Parser.cpp:178)
  ==23291==    by 0x806D09B: Parser<ParserDummy>::parse(Parser<ParserDummy>::Context&, ParserDummy&) (Parser.hpp:219)
  ==23291==    by 0x80671C4: ndb_mgm_call(ndb_mgm_handle*, ParserRow<ParserDummy> const*, char const*, Properties const*) (mgmapi.cpp:355)
  ==23291==    by 0x806AB79: ndb_mgm_listen_event_internal(ndb_mgm_handle*, int const*, int) (mgmapi.cpp:1419)
  ==23291==    by 0x806AC1F: ndb_mgm_listen_event (mgmapi.cpp:1434)
  ==23291==    by 0x805EB5D: event_thread_run(void*) (CommandInterpreter.cpp:467)
  ==23291==    by 0x806F70A: ndb_thread_wrapper (NdbThread.c:68)
  ==23291==    by 0x4042340: start_thread (in /lib/tls/i686/cmov/libpthread-2.3.6.so)
  ==23291==    by 0x429D4ED: clone (in /lib/tls/i686/cmov/libc-2.3.6.so)

  ndb/src/mgmapi/mgmapi.cpp@1.44.23.1, 2006-08-16 14:39:24+08:00, stewart@willster.(none) +6 -5
    fix memory leak for mgmapi event listeners (1 per connect)
    
    (missing delete of reply Properties object returned by ndb_mgm_call)

ChangeSet@1.1810.2034.1, 2006-08-16 14:33:31+08:00, stewart@willster.(none) +1 -0
  BUG#21670 memory leak in ndb_mgm -e show
  
  fix the following valgrind warning when running ndb_mgm -e show (leak only in client)
  
  ==20398== 14,596 (11,936 direct, 2,660 indirect) bytes in 4 blocks are definitely lost in loss record 24 of 25
  ==20398==    at 0x401C4A1: malloc (vg_replace_malloc.c:149)
  ==20398==    by 0x80797A3: ConfigValuesFactory::create(unsigned, unsigned) (ConfigValues.cpp:309)
  ==20398==    by 0x8079F03: ConfigValuesFactory::expand(unsigned, unsigned) (ConfigValues.cpp:325)
  ==20398==    by 0x8079967: ConfigValuesFactory::put(ConfigValues::Entry const&) (ConfigValues.cpp:414)
  ==20398==    by 0x807A7B6: ConfigValuesFactory::unpack(void const*, unsigned) (ConfigValues.cpp:701)
  ==20398==    by 0x806CB9D: ConfigValuesFactory::unpack(UtilBuffer const&) (ConfigValues.hpp:252)
  ==20398==    by 0x8069160: ndb_mgm_get_configuration (mgmapi.cpp:1941)
  ==20398==    by 0x8060661: CommandInterpreter::executeShow(char*) (CommandInterpreter.cpp:1242)
  ==20398==    by 0x8063966: CommandInterpreter::execute_impl(char const*) (CommandInterpreter.cpp:715)
  ==20398==    by 0x8064040: CommandInterpreter::execute(char const*, int, int*) (CommandInterpreter.cpp:625)
  ==20398==    by 0x8064189: Ndb_mgmclient::execute(char const*, int, int*) (CommandInterpreter.cpp:203)
  ==20398==    by 0x805E56C: read_and_execute(int) (main.cpp:124)
  ==20398==    by 0x805E754: main (main.cpp:162)
  ==20398==

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.16.1, 2006-08-16 14:33:26+08:00, stewart@willster.(none) +2 -0
    correctly free (destroy) the configuration fetched for show

ChangeSet@1.2255.35.2, 2006-08-15 21:49:26-07:00, brian@zim.(none) +461 -0
  Cheery  picked Antony's patch to allow for Window's builds in 5.1

  BitKeeper/deleted/.del-.IGNORE_ME@1.2, 2006-08-15 19:07:50-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_unix/.IGNORE_ME

  BitKeeper/deleted/.del-.empty@1.2, 2006-08-15 19:07:59-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc_auto/.empty

  BitKeeper/deleted/.del-BerkeleyDB.wpj@1.4, 2006-08-15 19:08:03-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_2.0/BerkeleyDB.wpj

  BitKeeper/deleted/.del-BerkeleyDB.wpj~320150f7956cd770@1.2, 2006-08-15 19:08:03-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_2.2/BerkeleyDB.wpj

  BitKeeper/deleted/.del-BerkeleyDBsmall.wpj@1.2, 2006-08-15 19:08:03-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_2.0/BerkeleyDBsmall.wpj

  BitKeeper/deleted/.del-BerkeleyDBsmall.wpj~4c4d7f40dbf1664d@1.2, 2006-08-15 19:08:03-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_2.2/BerkeleyDBsmall.wpj

  BitKeeper/deleted/.del-Berkeley_DB.dsw@1.8, 2006-08-15 19:07:50-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win32/Berkeley_DB.dsw

  BitKeeper/deleted/.del-CONFIG.in@1.4, 2006-08-15 19:08:04-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_setup/CONFIG.in

  BitKeeper/deleted/.del-Design@1.6, 2006-08-15 19:08:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/lock/Design

  BitKeeper/deleted/.del-LICENSE.TXT@1.5, 2006-08-15 19:08:04-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_setup/LICENSE.TXT

  BitKeeper/deleted/.del-MESSAGES.TCL@1.3, 2006-08-15 19:08:04-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_setup/MESSAGES.TCL

  BitKeeper/deleted/.del-Makefile.custom@1.3, 2006-08-15 19:08:03-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_3.1/Makefile.custom

  BitKeeper/deleted/.del-Makefile.in~c0ea38ee72675ab4@1.8, 2006-08-15 19:07:59-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/Makefile.in

  BitKeeper/deleted/.del-README@1.7, 2006-08-15 19:07:56-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_printlog/README

  BitKeeper/deleted/.del-README.in@1.3, 2006-08-15 19:08:04-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_setup/README.in

  BitKeeper/deleted/.del-README~cce8f408842aa70c@1.5, 2006-08-15 19:08:08-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mutex/README

  BitKeeper/deleted/.del-RELEASE@1.11, 2006-08-15 19:07:59-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/RELEASE

  BitKeeper/deleted/.del-SETUP.BMP@1.3, 2006-08-15 19:08:04-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_setup/SETUP.BMP

  BitKeeper/deleted/.del-ac_check_class.ac@1.4, 2006-08-15 19:08:02-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal_java/ac_check_class.ac

  BitKeeper/deleted/.del-ac_check_classpath.ac@1.4, 2006-08-15 19:08:02-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal_java/ac_check_classpath.ac

  BitKeeper/deleted/.del-ac_check_junit.ac@1.4, 2006-08-15 19:08:02-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal_java/ac_check_junit.ac

  BitKeeper/deleted/.del-ac_check_rqrd_class.ac@1.4, 2006-08-15 19:08:02-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal_java/ac_check_rqrd_class.ac

  BitKeeper/deleted/.del-ac_java_options.ac@1.4, 2006-08-15 19:08:02-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal_java/ac_java_options.ac

  BitKeeper/deleted/.del-ac_jni_include_dirs.ac@1.5, 2006-08-15 19:08:02-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal_java/ac_jni_include_dirs.ac

  BitKeeper/deleted/.del-ac_prog_jar.ac@1.4, 2006-08-15 19:08:02-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal_java/ac_prog_jar.ac

  BitKeeper/deleted/.del-ac_prog_java.ac@1.5, 2006-08-15 19:08:02-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal_java/ac_prog_java.ac

  BitKeeper/deleted/.del-ac_prog_java_works.ac@1.4, 2006-08-15 19:08:02-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal_java/ac_prog_java_works.ac

  BitKeeper/deleted/.del-ac_prog_javac.ac@1.4, 2006-08-15 19:08:02-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal_java/ac_prog_javac.ac

  BitKeeper/deleted/.del-ac_prog_javac_works.ac@1.4, 2006-08-15 19:08:02-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal_java/ac_prog_javac_works.ac

  BitKeeper/deleted/.del-ac_prog_javadoc.ac@1.4, 2006-08-15 19:08:02-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal_java/ac_prog_javadoc.ac

  BitKeeper/deleted/.del-ac_prog_javah.ac@1.4, 2006-08-15 19:08:02-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal_java/ac_prog_javah.ac

  BitKeeper/deleted/.del-ac_try_compile_java.ac@1.4, 2006-08-15 19:08:03-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal_java/ac_try_compile_java.ac

  BitKeeper/deleted/.del-ac_try_run_javac.ac@1.4, 2006-08-15 19:08:03-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal_java/ac_try_run_javac.ac

  BitKeeper/deleted/.del-aes_method.c@1.3, 2006-08-15 19:07:52-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/crypto/aes_method.c

  BitKeeper/deleted/.del-app_dsp.src@1.7, 2006-08-15 19:07:50-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win32/app_dsp.src

  BitKeeper/deleted/.del-app_dsp.src~dcf703e0c9c72e4a@1.2, 2006-08-15 19:07:50-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win64/app_dsp.src

  BitKeeper/deleted/.del-bt_compact.c@1.2, 2006-08-15 19:07:49-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/btree/bt_compact.c

  BitKeeper/deleted/.del-bt_compare.c@1.7, 2006-08-15 19:07:49-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/btree/bt_compare.c

  BitKeeper/deleted/.del-bt_conv.c@1.7, 2006-08-15 19:07:49-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/btree/bt_conv.c

  BitKeeper/deleted/.del-bt_curadj.c@1.7, 2006-08-15 19:07:49-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/btree/bt_curadj.c

  BitKeeper/deleted/.del-bt_cursor.c@1.7, 2006-08-15 19:07:49-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/btree/bt_cursor.c

  BitKeeper/deleted/.del-bt_delete.c@1.7, 2006-08-15 19:07:49-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/btree/bt_delete.c

  BitKeeper/deleted/.del-bt_method.c@1.7, 2006-08-15 19:07:49-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/btree/bt_method.c

  BitKeeper/deleted/.del-bt_open.c@1.8, 2006-08-15 19:07:49-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/btree/bt_open.c

  BitKeeper/deleted/.del-bt_put.c@1.7, 2006-08-15 19:07:49-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/btree/bt_put.c

  BitKeeper/deleted/.del-bt_rec.c@1.7, 2006-08-15 19:07:49-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/btree/bt_rec.c

  BitKeeper/deleted/.del-bt_reclaim.c@1.7, 2006-08-15 19:07:49-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/btree/bt_reclaim.c

  BitKeeper/deleted/.del-bt_recno.c@1.7, 2006-08-15 19:07:49-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/btree/bt_recno.c

  BitKeeper/deleted/.del-bt_rsearch.c@1.7, 2006-08-15 19:07:49-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/btree/bt_rsearch.c

  BitKeeper/deleted/.del-bt_search.c@1.7, 2006-08-15 19:07:49-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/btree/bt_search.c

  BitKeeper/deleted/.del-bt_split.c@1.7, 2006-08-15 19:07:49-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/btree/bt_split.c

  BitKeeper/deleted/.del-bt_stat.c@1.7, 2006-08-15 19:07:49-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/btree/bt_stat.c

  BitKeeper/deleted/.del-bt_upgrade.c@1.7, 2006-08-15 19:07:50-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/btree/bt_upgrade.c

  BitKeeper/deleted/.del-bt_verify.c@1.7, 2006-08-15 19:07:50-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/btree/bt_verify.c

  BitKeeper/deleted/.del-btree.h@1.5, 2006-08-15 19:07:56-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/btree.h

  BitKeeper/deleted/.del-btree.src@1.7, 2006-08-15 19:07:50-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/btree/btree.src

  BitKeeper/deleted/.del-buildrel@1.5, 2006-08-15 19:07:59-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/buildrel

  BitKeeper/deleted/.del-caticon.ibd@1.2, 2006-08-15 19:08:05-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/winmsi/images/caticon.ibd

  BitKeeper/deleted/.del-cdf.1@1.3, 2006-08-15 19:08:03-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_3.1/cdf.1

  BitKeeper/deleted/.del-cdf.2@1.3, 2006-08-15 19:08:03-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_3.1/cdf.2

  BitKeeper/deleted/.del-cdf.3@1.3, 2006-08-15 19:08:03-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_3.1/cdf.3

  BitKeeper/deleted/.del-commit.awk@1.5, 2006-08-15 19:07:56-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_printlog/commit.awk

  BitKeeper/deleted/.del-component.cdf@1.3, 2006-08-15 19:08:03-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_3.1/component.cdf

  BitKeeper/deleted/.del-component.wpj@1.3, 2006-08-15 19:08:03-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_3.1/component.wpj

  BitKeeper/deleted/.del-config.ac@1.4, 2006-08-15 19:08:01-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal/config.ac

  BitKeeper/deleted/.del-config.guess@1.5, 2006-08-15 19:07:59-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/config.guess

  BitKeeper/deleted/.del-config.sub@1.5, 2006-08-15 19:07:59-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/config.sub

  BitKeeper/deleted/.del-configure.ac@1.9, 2006-08-15 19:07:59-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/configure.ac

  BitKeeper/deleted/.del-count.awk@1.5, 2006-08-15 19:07:56-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_printlog/count.awk

  BitKeeper/deleted/.del-crdel.src@1.7, 2006-08-15 19:07:53-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/crdel.src

  BitKeeper/deleted/.del-crdel_rec.c@1.7, 2006-08-15 19:07:53-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/crdel_rec.c

  BitKeeper/deleted/.del-crypto.c@1.3, 2006-08-15 19:07:52-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/crypto/crypto.c

  BitKeeper/deleted/.del-crypto.h@1.5, 2006-08-15 19:07:57-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/crypto.h

  BitKeeper/deleted/.del-crypto.html@1.3, 2006-08-15 19:07:52-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/crypto/crypto.html

  BitKeeper/deleted/.del-crypto_stub.c@1.3, 2006-08-15 19:07:52-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/common/crypto_stub.c

  BitKeeper/deleted/.del-cxx.ac@1.3, 2006-08-15 19:08:01-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal/cxx.ac

  BitKeeper/deleted/.del-cxx_common.h@1.3, 2006-08-15 19:07:57-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/cxx_common.h

  BitKeeper/deleted/.del-cxx_db.cpp@1.5, 2006-08-15 19:07:53-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/cxx/cxx_db.cpp

  BitKeeper/deleted/.del-cxx_dbc.cpp@1.5, 2006-08-15 19:07:53-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/cxx/cxx_dbc.cpp

  BitKeeper/deleted/.del-cxx_dbt.cpp@1.5, 2006-08-15 19:07:53-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/cxx/cxx_dbt.cpp

  BitKeeper/deleted/.del-cxx_env.cpp@1.5, 2006-08-15 19:07:53-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/cxx/cxx_env.cpp

  BitKeeper/deleted/.del-cxx_except.cpp@1.7, 2006-08-15 19:07:53-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/cxx/cxx_except.cpp

  BitKeeper/deleted/.del-cxx_except.h@1.3, 2006-08-15 19:07:57-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/cxx_except.h

  BitKeeper/deleted/.del-cxx_int.h@1.5, 2006-08-15 19:07:57-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/cxx_int.h

  BitKeeper/deleted/.del-cxx_lock.cpp@1.7, 2006-08-15 19:07:53-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/cxx/cxx_lock.cpp

  BitKeeper/deleted/.del-cxx_logc.cpp@1.5, 2006-08-15 19:07:53-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/cxx/cxx_logc.cpp

  BitKeeper/deleted/.del-cxx_mpool.cpp@1.7, 2006-08-15 19:07:53-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/cxx/cxx_mpool.cpp

  BitKeeper/deleted/.del-cxx_multi.cpp@1.3, 2006-08-15 19:07:53-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/cxx/cxx_multi.cpp

  BitKeeper/deleted/.del-cxx_seq.cpp@1.3, 2006-08-15 19:07:53-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/cxx/cxx_seq.cpp

  BitKeeper/deleted/.del-cxx_txn.cpp@1.7, 2006-08-15 19:07:53-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/cxx/cxx_txn.cpp

  BitKeeper/deleted/.del-db.c@1.7, 2006-08-15 19:07:53-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db.c

  BitKeeper/deleted/.del-db.ecd.in@1.3, 2006-08-15 19:07:59-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/db.ecd.in

  BitKeeper/deleted/.del-db.in@1.8, 2006-08-15 19:07:57-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/db.in

  BitKeeper/deleted/.del-db.spec.in@1.3, 2006-08-15 19:07:59-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/db.spec.in

  BitKeeper/deleted/.del-db.src@1.7, 2006-08-15 19:07:54-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db.src

  BitKeeper/deleted/.del-db185.c@1.7, 2006-08-15 19:07:55-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db185/db185.c

  BitKeeper/deleted/.del-db185_int.in@1.5, 2006-08-15 19:07:55-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db185/db185_int.in

  BitKeeper/deleted/.del-db_185.in@1.5, 2006-08-15 19:07:57-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/db_185.in

  BitKeeper/deleted/.del-db_am.c@1.7, 2006-08-15 19:07:54-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_am.c

  BitKeeper/deleted/.del-db_am.h@1.5, 2006-08-15 19:07:57-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/db_am.h

  BitKeeper/deleted/.del-db_archive.c@1.7, 2006-08-15 19:07:55-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_archive/db_archive.c

  BitKeeper/deleted/.del-db_byteorder.c@1.7, 2006-08-15 19:07:52-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/common/db_byteorder.c

  BitKeeper/deleted/.del-db_cam.c@1.7, 2006-08-15 19:07:54-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_cam.c

  BitKeeper/deleted/.del-db_checkpoint.c@1.7, 2006-08-15 19:07:55-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_checkpoint/db_checkpoint.c

  BitKeeper/deleted/.del-db_clock.c@1.2, 2006-08-15 19:07:52-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/common/db_clock.c

  BitKeeper/deleted/.del-db_conv.c@1.7, 2006-08-15 19:07:54-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_conv.c

  BitKeeper/deleted/.del-db_cxx.in@1.5, 2006-08-15 19:07:57-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/db_cxx.in

  BitKeeper/deleted/.del-db_deadlock.c@1.7, 2006-08-15 19:07:55-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_deadlock/db_deadlock.c

  BitKeeper/deleted/.del-db_dispatch.c@1.7, 2006-08-15 19:07:54-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_dispatch.c

  BitKeeper/deleted/.del-db_dispatch.h@1.5, 2006-08-15 19:07:57-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/db_dispatch.h

  BitKeeper/deleted/.del-db_dump.c@1.7, 2006-08-15 19:07:55-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_dump/db_dump.c

  BitKeeper/deleted/.del-db_dump185.c@1.7, 2006-08-15 19:07:55-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_dump185/db_dump185.c

  BitKeeper/deleted/.del-db_dup.c@1.7, 2006-08-15 19:07:54-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_dup.c

  BitKeeper/deleted/.del-db_err.c@1.7, 2006-08-15 19:07:52-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/common/db_err.c

  BitKeeper/deleted/.del-db_getlong.c@1.7, 2006-08-15 19:07:52-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/common/db_getlong.c

  BitKeeper/deleted/.del-db_hotbackup.c@1.2, 2006-08-15 19:07:55-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_hotbackup/db_hotbackup.c

  BitKeeper/deleted/.del-db_idspace.c@1.5, 2006-08-15 19:07:52-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/common/db_idspace.c

  BitKeeper/deleted/.del-db_iface.c@1.7, 2006-08-15 19:07:54-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_iface.c

  BitKeeper/deleted/.del-db_int.in@1.5, 2006-08-15 19:07:57-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/db_int.in

  BitKeeper/deleted/.del-db_java_xaj.mak@1.3, 2006-08-15 19:07:50-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win32/db_java_xaj.mak

  BitKeeper/deleted/.del-db_join.c@1.7, 2006-08-15 19:07:54-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_join.c

  BitKeeper/deleted/.del-db_join.h@1.5, 2006-08-15 19:07:57-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/db_join.h

  BitKeeper/deleted/.del-db_load.c@1.7, 2006-08-15 19:07:55-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_load/db_load.c

  BitKeeper/deleted/.del-db_log2.c@1.7, 2006-08-15 19:07:52-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/common/db_log2.c

  BitKeeper/deleted/.del-db_meta.c@1.7, 2006-08-15 19:07:54-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_meta.c

  BitKeeper/deleted/.del-db_method.c@1.7, 2006-08-15 19:07:54-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_method.c

  BitKeeper/deleted/.del-db_open.c@1.6, 2006-08-15 19:07:54-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_open.c

  BitKeeper/deleted/.del-db_overflow.c@1.7, 2006-08-15 19:07:54-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_overflow.c

  BitKeeper/deleted/.del-db_ovfl_vrfy.c@1.3, 2006-08-15 19:07:54-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_ovfl_vrfy.c

  BitKeeper/deleted/.del-db_page.h@1.5, 2006-08-15 19:07:57-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/db_page.h

  BitKeeper/deleted/.del-db_pr.c@1.7, 2006-08-15 19:07:54-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_pr.c

  BitKeeper/deleted/.del-db_printlog.c@1.7, 2006-08-15 19:07:56-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_printlog/db_printlog.c

  BitKeeper/deleted/.del-db_rec.c@1.7, 2006-08-15 19:07:54-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_rec.c

  BitKeeper/deleted/.del-db_reclaim.c@1.7, 2006-08-15 19:07:54-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_reclaim.c

  BitKeeper/deleted/.del-db_recover.c@1.7, 2006-08-15 19:07:56-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_recover/db_recover.c

  BitKeeper/deleted/.del-db_remove.c@1.5, 2006-08-15 19:07:54-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_remove.c

  BitKeeper/deleted/.del-db_rename.c@1.5, 2006-08-15 19:07:54-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_rename.c

  BitKeeper/deleted/.del-db_ret.c@1.7, 2006-08-15 19:07:54-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_ret.c

  BitKeeper/deleted/.del-db_salloc.c@1.7, 2006-08-15 19:08:05-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/env/db_salloc.c

  BitKeeper/deleted/.del-db_server_int.h@1.5, 2006-08-15 19:07:57-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/db_server_int.h

  BitKeeper/deleted/.del-db_setid.c@1.3, 2006-08-15 19:07:55-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_setid.c

  BitKeeper/deleted/.del-db_setlsn.c@1.3, 2006-08-15 19:07:55-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_setlsn.c

  BitKeeper/deleted/.del-db_shash.c@1.7, 2006-08-15 19:08:05-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/env/db_shash.c

  BitKeeper/deleted/.del-db_shash.h@1.5, 2006-08-15 19:07:57-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/db_shash.h

  BitKeeper/deleted/.del-db_stat.c@1.7, 2006-08-15 19:07:56-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_stat/db_stat.c

  BitKeeper/deleted/.del-db_stati.c@1.3, 2006-08-15 19:07:55-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_stati.c

  BitKeeper/deleted/.del-db_swap.h@1.5, 2006-08-15 19:07:57-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/db_swap.h

  BitKeeper/deleted/.del-db_test.src@1.4, 2006-08-15 19:07:50-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win32/db_test.src

  BitKeeper/deleted/.del-db_test.src~2521827764f86c53@1.2, 2006-08-15 19:07:51-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win64/db_test.src

  BitKeeper/deleted/.del-db_truncate.c@1.5, 2006-08-15 19:07:55-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_truncate.c

  BitKeeper/deleted/.del-db_upg.c@1.7, 2006-08-15 19:07:55-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_upg.c

  BitKeeper/deleted/.del-db_upg_opd.c@1.7, 2006-08-15 19:07:55-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_upg_opd.c

  BitKeeper/deleted/.del-db_upgrade.c@1.7, 2006-08-15 19:07:56-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_upgrade/db_upgrade.c

  BitKeeper/deleted/.del-db_upgrade.h@1.5, 2006-08-15 19:07:57-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/db_upgrade.h

  BitKeeper/deleted/.del-db_verify.c@1.7, 2006-08-15 19:07:56-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_verify/db_verify.c

  BitKeeper/deleted/.del-db_verify.h@1.5, 2006-08-15 19:07:57-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/db_verify.h

  BitKeeper/deleted/.del-db_vrfy.c@1.7, 2006-08-15 19:07:55-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_vrfy.c

  BitKeeper/deleted/.del-db_vrfy_stub.c@1.3, 2006-08-15 19:07:55-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_vrfy_stub.c

  BitKeeper/deleted/.del-db_vrfyutil.c@1.7, 2006-08-15 19:07:55-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db/db_vrfyutil.c

  BitKeeper/deleted/.del-dbcorewix.in@1.2, 2006-08-15 19:08:04-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/winmsi/dbcorewix.in

  BitKeeper/deleted/.del-dbkill.cpp@1.7, 2006-08-15 19:07:50-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win32/dbkill.cpp

  BitKeeper/deleted/.del-dbm.c@1.7, 2006-08-15 19:07:59-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbm/dbm.c

  BitKeeper/deleted/.del-dbname.awk@1.7, 2006-08-15 19:07:56-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_printlog/dbname.awk

  BitKeeper/deleted/.del-dbreg.c@1.5, 2006-08-15 19:07:59-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbreg/dbreg.c

  BitKeeper/deleted/.del-dbreg.src@1.5, 2006-08-15 19:07:59-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbreg/dbreg.src

  BitKeeper/deleted/.del-dbreg_rec.c@1.5, 2006-08-15 19:07:59-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbreg/dbreg_rec.c

  BitKeeper/deleted/.del-dbreg_stat.c@1.3, 2006-08-15 19:07:59-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbreg/dbreg_stat.c

  BitKeeper/deleted/.del-dbreg_util.c@1.5, 2006-08-15 19:07:59-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbreg/dbreg_util.c

  BitKeeper/deleted/.del-dbvarsbat.in@1.2, 2006-08-15 19:08:04-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/winmsi/dbvarsbat.in

  BitKeeper/deleted/.del-dbwix.m4@1.2, 2006-08-15 19:08:04-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/winmsi/dbwix.m4

  BitKeeper/deleted/.del-dd.sh@1.3, 2006-08-15 19:07:56-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_stat/dd.sh

  BitKeeper/deleted/.del-debug.h@1.5, 2006-08-15 19:07:57-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/debug.h

  BitKeeper/deleted/.del-dllmain.c@1.4, 2006-08-15 19:07:50-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win32/dllmain.c

  BitKeeper/deleted/.del-dynamic_dsp.src@1.7, 2006-08-15 19:07:50-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win32/dynamic_dsp.src

  BitKeeper/deleted/.del-dynamic_dsp.src~95360632a65b4e62@1.2, 2006-08-15 19:07:51-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win64/dynamic_dsp.src

  BitKeeper/deleted/.del-env_failchk.c@1.2, 2006-08-15 19:08:05-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/env/env_failchk.c

  BitKeeper/deleted/.del-env_file.c@1.5, 2006-08-15 19:08:05-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/env/env_file.c

  BitKeeper/deleted/.del-env_method.c@1.10, 2006-08-15 19:08:05-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/env/env_method.c

  BitKeeper/deleted/.del-env_method.c.b@1.3, 2006-08-15 19:08:05-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/env/env_method.c.b

  BitKeeper/deleted/.del-env_open.c@1.7, 2006-08-15 19:08:05-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/env/env_open.c

  BitKeeper/deleted/.del-env_recover.c@1.7, 2006-08-15 19:08:05-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/env/env_recover.c

  BitKeeper/deleted/.del-env_region.c@1.7, 2006-08-15 19:08:05-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/env/env_region.c

  BitKeeper/deleted/.del-env_register.c@1.2, 2006-08-15 19:08:05-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/env/env_register.c

  BitKeeper/deleted/.del-env_stat.c@1.3, 2006-08-15 19:08:05-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/env/env_stat.c

  BitKeeper/deleted/.del-environment.in@1.2, 2006-08-15 19:08:04-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/winmsi/environment.in

  BitKeeper/deleted/.del-ex_repquote.src@1.2, 2006-08-15 19:07:51-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win64/ex_repquote.src

  BitKeeper/deleted/.del-features.in@1.2, 2006-08-15 19:08:04-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/winmsi/features.in

  BitKeeper/deleted/.del-fileid.awk@1.5, 2006-08-15 19:07:56-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_printlog/fileid.awk

  BitKeeper/deleted/.del-fileops.src@1.5, 2006-08-15 19:08:05-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/fileops/fileops.src

  BitKeeper/deleted/.del-files.in@1.3, 2006-08-15 19:08:04-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/winmsi/files.in

  BitKeeper/deleted/.del-foldernew.ibd@1.2, 2006-08-15 19:08:05-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/winmsi/images/foldernew.ibd

  BitKeeper/deleted/.del-folderup.ibd@1.2, 2006-08-15 19:08:05-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/winmsi/images/folderup.ibd

  BitKeeper/deleted/.del-fop.h@1.5, 2006-08-15 19:07:57-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/fop.h

  BitKeeper/deleted/.del-fop_basic.c@1.5, 2006-08-15 19:08:06-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/fileops/fop_basic.c

  BitKeeper/deleted/.del-fop_rec.c@1.5, 2006-08-15 19:08:06-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/fileops/fop_rec.c

  BitKeeper/deleted/.del-fop_util.c@1.5, 2006-08-15 19:08:06-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/fileops/fop_util.c

  BitKeeper/deleted/.del-gcc.ac@1.3, 2006-08-15 19:08:01-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal/gcc.ac

  BitKeeper/deleted/.del-gen_inc.awk@1.5, 2006-08-15 19:07:59-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/gen_inc.awk

  BitKeeper/deleted/.del-gen_rec.awk@1.8, 2006-08-15 19:07:59-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/gen_rec.awk

  BitKeeper/deleted/.del-gen_rpc.awk@1.7, 2006-08-15 19:07:59-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/gen_rpc.awk

  BitKeeper/deleted/.del-getcwd.c@1.7, 2006-08-15 19:07:51-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/clib/getcwd.c

  BitKeeper/deleted/.del-getopt.c@1.7, 2006-08-15 19:07:51-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/clib/getopt.c

  BitKeeper/deleted/.del-globals.h@1.5, 2006-08-15 19:07:58-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/globals.h

  BitKeeper/deleted/.del-hash.c@1.7, 2006-08-15 19:08:06-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/hash/hash.c

  BitKeeper/deleted/.del-hash.h@1.5, 2006-08-15 19:07:58-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/hash.h

  BitKeeper/deleted/.del-hash.src@1.7, 2006-08-15 19:08:06-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/hash/hash.src

  BitKeeper/deleted/.del-hash_conv.c@1.7, 2006-08-15 19:08:06-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/hash/hash_conv.c

  BitKeeper/deleted/.del-hash_dup.c@1.7, 2006-08-15 19:08:06-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/hash/hash_dup.c

  BitKeeper/deleted/.del-hash_func.c@1.7, 2006-08-15 19:08:06-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/hash/hash_func.c

  BitKeeper/deleted/.del-hash_meta.c@1.7, 2006-08-15 19:08:06-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/hash/hash_meta.c

  BitKeeper/deleted/.del-hash_method.c@1.7, 2006-08-15 19:08:06-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/hash/hash_method.c

  BitKeeper/deleted/.del-hash_open.c@1.6, 2006-08-15 19:08:06-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/hash/hash_open.c

  BitKeeper/deleted/.del-hash_page.c@1.7, 2006-08-15 19:08:06-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/hash/hash_page.c

  BitKeeper/deleted/.del-hash_rec.c@1.7, 2006-08-15 19:08:06-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/hash/hash_rec.c

  BitKeeper/deleted/.del-hash_reclaim.c@1.7, 2006-08-15 19:08:06-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/hash/hash_reclaim.c

  BitKeeper/deleted/.del-hash_stat.c@1.7, 2006-08-15 19:08:06-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/hash/hash_stat.c

  BitKeeper/deleted/.del-hash_stub.c@1.3, 2006-08-15 19:08:06-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/hash/hash_stub.c

  BitKeeper/deleted/.del-hash_upgrade.c@1.7, 2006-08-15 19:08:06-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/hash/hash_upgrade.c

  BitKeeper/deleted/.del-hash_verify.c@1.7, 2006-08-15 19:08:06-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/hash/hash_verify.c

  BitKeeper/deleted/.del-hmac.c@1.5, 2006-08-15 19:08:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/hmac/hmac.c

  BitKeeper/deleted/.del-hmac.h@1.5, 2006-08-15 19:07:58-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/hmac.h

  BitKeeper/deleted/.del-hsearch.c@1.7, 2006-08-15 19:08:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/hsearch/hsearch.c

  BitKeeper/deleted/.del-install-sh@1.3, 2006-08-15 19:07:59-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/install-sh

  BitKeeper/deleted/.del-java_dsp.src@1.6, 2006-08-15 19:07:50-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win32/java_dsp.src

  BitKeeper/deleted/.del-java_dsp.src~e42f32427327f5b5@1.2, 2006-08-15 19:07:51-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win64/java_dsp.src

  BitKeeper/deleted/.del-libdb_tcl.def@1.7, 2006-08-15 19:07:50-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win32/libdb_tcl.def

  BitKeeper/deleted/.del-libdbrc.src@1.7, 2006-08-15 19:07:50-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win32/libdbrc.src

  BitKeeper/deleted/.del-libdbrc.src~d22fea70774c5e98@1.2, 2006-08-15 19:07:51-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win64/libdbrc.src

  BitKeeper/deleted/.del-libtool.ac@1.5, 2006-08-15 19:08:01-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal/libtool.ac

  BitKeeper/deleted/.del-links.in@1.3, 2006-08-15 19:08:04-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/winmsi/links.in

  BitKeeper/deleted/.del-lock.c@1.7, 2006-08-15 19:08:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/lock/lock.c

  BitKeeper/deleted/.del-lock.h@1.5, 2006-08-15 19:07:58-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/lock.h

  BitKeeper/deleted/.del-lock_deadlock.c@1.7, 2006-08-15 19:08:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/lock/lock_deadlock.c

  BitKeeper/deleted/.del-lock_failchk.c@1.2, 2006-08-15 19:08:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/lock/lock_failchk.c

  BitKeeper/deleted/.del-lock_id.c@1.3, 2006-08-15 19:08:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/lock/lock_id.c

  BitKeeper/deleted/.del-lock_list.c@1.3, 2006-08-15 19:08:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/lock/lock_list.c

  BitKeeper/deleted/.del-lock_method.c@1.7, 2006-08-15 19:08:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/lock/lock_method.c

  BitKeeper/deleted/.del-lock_region.c@1.8, 2006-08-15 19:08:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/lock/lock_region.c

  BitKeeper/deleted/.del-lock_stat.c@1.7, 2006-08-15 19:08:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/lock/lock_stat.c

  BitKeeper/deleted/.del-lock_timer.c@1.3, 2006-08-15 19:08:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/lock/lock_timer.c

  BitKeeper/deleted/.del-lock_util.c@1.7, 2006-08-15 19:08:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/lock/lock_util.c

  BitKeeper/deleted/.del-log.c@1.8, 2006-08-15 19:08:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/log/log.c

  BitKeeper/deleted/.del-log.h@1.5, 2006-08-15 19:07:58-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/log.h

  BitKeeper/deleted/.del-log_archive.c@1.7, 2006-08-15 19:08:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/log/log_archive.c

  BitKeeper/deleted/.del-log_compare.c@1.7, 2006-08-15 19:08:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/log/log_compare.c

  BitKeeper/deleted/.del-log_debug.c@1.2, 2006-08-15 19:08:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/log/log_debug.c

  BitKeeper/deleted/.del-log_get.c@1.7, 2006-08-15 19:08:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/log/log_get.c

  BitKeeper/deleted/.del-log_method.c@1.7, 2006-08-15 19:08:08-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/log/log_method.c

  BitKeeper/deleted/.del-log_put.c@1.11, 2006-08-15 19:08:08-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/log/log_put.c

  BitKeeper/deleted/.del-log_stat.c@1.3, 2006-08-15 19:08:08-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/log/log_stat.c

  BitKeeper/deleted/.del-logstat.awk@1.4, 2006-08-15 19:07:56-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_printlog/logstat.awk

  BitKeeper/deleted/.del-ltmain.sh@1.7, 2006-08-15 19:08:00-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/ltmain.sh

  BitKeeper/deleted/.del-memcmp.c@1.7, 2006-08-15 19:07:51-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/clib/memcmp.c

  BitKeeper/deleted/.del-memmove.c@1.7, 2006-08-15 19:07:51-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/clib/memmove.c

  BitKeeper/deleted/.del-mp.h@1.5, 2006-08-15 19:07:58-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/mp.h

  BitKeeper/deleted/.del-mp_alloc.c@1.7, 2006-08-15 19:08:08-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mp/mp_alloc.c

  BitKeeper/deleted/.del-mp_bh.c@1.7, 2006-08-15 19:08:08-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mp/mp_bh.c

  BitKeeper/deleted/.del-mp_fget.c@1.7, 2006-08-15 19:08:08-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mp/mp_fget.c

  BitKeeper/deleted/.del-mp_fmethod.c@1.3, 2006-08-15 19:08:08-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mp/mp_fmethod.c

  BitKeeper/deleted/.del-mp_fopen.c@1.8, 2006-08-15 19:08:08-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mp/mp_fopen.c

  BitKeeper/deleted/.del-mp_fput.c@1.7, 2006-08-15 19:08:08-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mp/mp_fput.c

  BitKeeper/deleted/.del-mp_fset.c@1.7, 2006-08-15 19:08:08-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mp/mp_fset.c

  BitKeeper/deleted/.del-mp_method.c@1.7, 2006-08-15 19:08:08-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mp/mp_method.c

  BitKeeper/deleted/.del-mp_region.c@1.7, 2006-08-15 19:08:08-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mp/mp_region.c

  BitKeeper/deleted/.del-mp_register.c@1.7, 2006-08-15 19:08:08-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mp/mp_register.c

  BitKeeper/deleted/.del-mp_stat.c@1.7, 2006-08-15 19:08:08-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mp/mp_stat.c

  BitKeeper/deleted/.del-mp_sync.c@1.7, 2006-08-15 19:08:08-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mp/mp_sync.c

  BitKeeper/deleted/.del-mp_trickle.c@1.7, 2006-08-15 19:08:08-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mp/mp_trickle.c

  BitKeeper/deleted/.del-mt19937db.c@1.3, 2006-08-15 19:07:52-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/crypto/mersenne/mt19937db.c

  BitKeeper/deleted/.del-mut_alloc.c@1.2, 2006-08-15 19:08:09-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mutex/mut_alloc.c

  BitKeeper/deleted/.del-mut_fcntl.c@1.7, 2006-08-15 19:08:09-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mutex/mut_fcntl.c

  BitKeeper/deleted/.del-mut_method.c@1.2, 2006-08-15 19:08:09-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mutex/mut_method.c

  BitKeeper/deleted/.del-mut_pthread.c@1.7, 2006-08-15 19:08:09-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mutex/mut_pthread.c

  BitKeeper/deleted/.del-mut_region.c@1.2, 2006-08-15 19:08:09-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mutex/mut_region.c

  BitKeeper/deleted/.del-mut_stat.c@1.2, 2006-08-15 19:08:09-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mutex/mut_stat.c

  BitKeeper/deleted/.del-mut_tas.c@1.7, 2006-08-15 19:08:09-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mutex/mut_tas.c

  BitKeeper/deleted/.del-mut_win32.c@1.5, 2006-08-15 19:08:09-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mutex/mut_win32.c

  BitKeeper/deleted/.del-mutex.ac@1.5, 2006-08-15 19:08:01-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal/mutex.ac

  BitKeeper/deleted/.del-mutex.h@1.5, 2006-08-15 19:07:58-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/mutex.h

  BitKeeper/deleted/.del-mutex_int.h@1.2, 2006-08-15 19:07:58-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/mutex_int.h

  BitKeeper/deleted/.del-options.ac@1.5, 2006-08-15 19:08:01-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal/options.ac

  BitKeeper/deleted/.del-os.h@1.5, 2006-08-15 19:07:58-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/os.h

  BitKeeper/deleted/.del-os_abs.c@1.7, 2006-08-15 19:08:09-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_abs.c

  BitKeeper/deleted/.del-os_abs.c~ad5b599d8bf6549f@1.7, 2006-08-15 19:08:11-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os_win32/os_abs.c

  BitKeeper/deleted/.del-os_alloc.c@1.7, 2006-08-15 19:08:09-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_alloc.c

  BitKeeper/deleted/.del-os_clock.c@1.5, 2006-08-15 19:08:09-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_clock.c

  BitKeeper/deleted/.del-os_clock.c~2add52eff231a274@1.5, 2006-08-15 19:08:11-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os_win32/os_clock.c

  BitKeeper/deleted/.del-os_config.c@1.5, 2006-08-15 19:08:09-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_config.c

  BitKeeper/deleted/.del-os_config.c~53e193a5e5e97cfd@1.5, 2006-08-15 19:08:11-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os_win32/os_config.c

  BitKeeper/deleted/.del-os_dir.c@1.7, 2006-08-15 19:08:09-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_dir.c

  BitKeeper/deleted/.del-os_dir.c~99fbc266717a871a@1.7, 2006-08-15 19:08:11-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os_win32/os_dir.c

  BitKeeper/deleted/.del-os_errno.c@1.7, 2006-08-15 19:08:09-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_errno.c

  BitKeeper/deleted/.del-os_errno.c~44204df07323cffb@1.7, 2006-08-15 19:08:11-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os_win32/os_errno.c

  BitKeeper/deleted/.del-os_fid.c@1.7, 2006-08-15 19:08:09-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_fid.c

  BitKeeper/deleted/.del-os_fid.c~8f922f06a0fa5a0@1.7, 2006-08-15 19:08:11-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os_win32/os_fid.c

  BitKeeper/deleted/.del-os_flock.c@1.2, 2006-08-15 19:08:09-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_flock.c

  BitKeeper/deleted/.del-os_flock.c~cc35099adbda7408@1.2, 2006-08-15 19:08:11-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os_win32/os_flock.c

  BitKeeper/deleted/.del-os_fsync.c@1.7, 2006-08-15 19:08:10-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_fsync.c

  BitKeeper/deleted/.del-os_fsync.c~eebb7e558dacef1c@1.5, 2006-08-15 19:08:11-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os_win32/os_fsync.c

  BitKeeper/deleted/.del-os_handle.c@1.8, 2006-08-15 19:08:10-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_handle.c

  BitKeeper/deleted/.del-os_handle.c~281e6b79ac5147f1@1.5, 2006-08-15 19:08:11-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os_win32/os_handle.c

  BitKeeper/deleted/.del-os_id.c@1.5, 2006-08-15 19:08:10-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_id.c

  BitKeeper/deleted/.del-os_map.c@1.7, 2006-08-15 19:08:10-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_map.c

  BitKeeper/deleted/.del-os_map.c~e8726a67b9abaa30@1.7, 2006-08-15 19:08:11-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os_win32/os_map.c

  BitKeeper/deleted/.del-os_method.c@1.7, 2006-08-15 19:08:10-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_method.c

  BitKeeper/deleted/.del-os_mkdir.c@1.2, 2006-08-15 19:08:10-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_mkdir.c

  BitKeeper/deleted/.del-os_oflags.c@1.7, 2006-08-15 19:08:10-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_oflags.c

  BitKeeper/deleted/.del-os_open.c@1.7, 2006-08-15 19:08:10-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_open.c

  BitKeeper/deleted/.del-os_open.c~996e9987793f8dbc@1.7, 2006-08-15 19:08:11-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os_win32/os_open.c

  BitKeeper/deleted/.del-os_region.c@1.7, 2006-08-15 19:08:10-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_region.c

  BitKeeper/deleted/.del-os_rename.c@1.7, 2006-08-15 19:08:10-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_rename.c

  BitKeeper/deleted/.del-os_rename.c~1c318d0b60c977bd@1.10, 2006-08-15 19:08:11-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os_win32/os_rename.c

  BitKeeper/deleted/.del-os_root.c@1.7, 2006-08-15 19:08:10-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_root.c

  BitKeeper/deleted/.del-os_rpath.c@1.7, 2006-08-15 19:08:10-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_rpath.c

  BitKeeper/deleted/.del-os_rw.c@1.7, 2006-08-15 19:08:10-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_rw.c

  BitKeeper/deleted/.del-os_rw.c~7ec61bd993fe999f@1.5, 2006-08-15 19:08:11-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os_win32/os_rw.c

  BitKeeper/deleted/.del-os_seek.c@1.7, 2006-08-15 19:08:10-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_seek.c

  BitKeeper/deleted/.del-os_seek.c~2b5bef3cccfa60c@1.7, 2006-08-15 19:08:11-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os_win32/os_seek.c

  BitKeeper/deleted/.del-os_sleep.c@1.7, 2006-08-15 19:08:10-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_sleep.c

  BitKeeper/deleted/.del-os_sleep.c~d0512f5626e7c40b@1.7, 2006-08-15 19:08:11-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os_win32/os_sleep.c

  BitKeeper/deleted/.del-os_spin.c@1.7, 2006-08-15 19:08:10-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_spin.c

  BitKeeper/deleted/.del-os_spin.c~e2abf23edb5bac39@1.7, 2006-08-15 19:08:11-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os_win32/os_spin.c

  BitKeeper/deleted/.del-os_stat.c@1.7, 2006-08-15 19:08:10-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_stat.c

  BitKeeper/deleted/.del-os_stat.c~b7aea1c8fe0bc4c4@1.5, 2006-08-15 19:08:11-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os_win32/os_stat.c

  BitKeeper/deleted/.del-os_tmpdir.c@1.7, 2006-08-15 19:08:10-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_tmpdir.c

  BitKeeper/deleted/.del-os_truncate.c@1.3, 2006-08-15 19:08:10-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_truncate.c

  BitKeeper/deleted/.del-os_truncate.c~9761b239f54b2d96@1.3, 2006-08-15 19:08:11-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os_win32/os_truncate.c

  BitKeeper/deleted/.del-os_type.c@1.5, 2006-08-15 19:08:12-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os_win32/os_type.c

  BitKeeper/deleted/.del-os_unlink.c@1.7, 2006-08-15 19:08:11-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os/os_unlink.c

  BitKeeper/deleted/.del-os_unlink.c~6dee667279d01609@1.3, 2006-08-15 19:08:12-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/os_win32/os_unlink.c

  BitKeeper/deleted/.del-pgno.awk@1.5, 2006-08-15 19:07:56-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_printlog/pgno.awk

  BitKeeper/deleted/.del-programs.ac@1.5, 2006-08-15 19:08:01-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal/programs.ac

  BitKeeper/deleted/.del-pubdef.in@1.5, 2006-08-15 19:08:00-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/pubdef.in

  BitKeeper/deleted/.del-qam.c@1.7, 2006-08-15 19:08:12-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/qam/qam.c

  BitKeeper/deleted/.del-qam.h@1.5, 2006-08-15 19:07:58-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/qam.h

  BitKeeper/deleted/.del-qam.src@1.7, 2006-08-15 19:08:12-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/qam/qam.src

  BitKeeper/deleted/.del-qam_conv.c@1.7, 2006-08-15 19:08:12-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/qam/qam_conv.c

  BitKeeper/deleted/.del-qam_files.c@1.7, 2006-08-15 19:08:12-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/qam/qam_files.c

  BitKeeper/deleted/.del-qam_method.c@1.7, 2006-08-15 19:08:12-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/qam/qam_method.c

  BitKeeper/deleted/.del-qam_open.c@1.7, 2006-08-15 19:08:12-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/qam/qam_open.c

  BitKeeper/deleted/.del-qam_rec.c@1.7, 2006-08-15 19:08:12-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/qam/qam_rec.c

  BitKeeper/deleted/.del-qam_stat.c@1.7, 2006-08-15 19:08:12-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/qam/qam_stat.c

  BitKeeper/deleted/.del-qam_stub.c@1.3, 2006-08-15 19:08:12-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/qam/qam_stub.c

  BitKeeper/deleted/.del-qam_upgrade.c@1.7, 2006-08-15 19:08:12-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/qam/qam_upgrade.c

  BitKeeper/deleted/.del-qam_verify.c@1.7, 2006-08-15 19:08:12-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/qam/qam_verify.c

  BitKeeper/deleted/.del-queue.h@1.5, 2006-08-15 19:07:58-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/queue.h

  BitKeeper/deleted/.del-raise.c@1.7, 2006-08-15 19:07:51-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/clib/raise.c

  BitKeeper/deleted/.del-range.awk@1.5, 2006-08-15 19:07:56-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_printlog/range.awk

  BitKeeper/deleted/.del-rec_ctemp@1.3, 2006-08-15 19:08:03-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/template/rec_ctemp

  BitKeeper/deleted/.del-rec_rep@1.2, 2006-08-15 19:08:03-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/template/rec_rep

  BitKeeper/deleted/.del-rectype.awk@1.6, 2006-08-15 19:07:56-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_printlog/rectype.awk

  BitKeeper/deleted/.del-region.h@1.5, 2006-08-15 19:07:58-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/region.h

  BitKeeper/deleted/.del-rep.h@1.5, 2006-08-15 19:07:58-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/rep.h

  BitKeeper/deleted/.del-rep.src@1.3, 2006-08-15 19:08:12-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/rep/rep.src

  BitKeeper/deleted/.del-rep_backup.c@1.3, 2006-08-15 19:08:12-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/rep/rep_backup.c

  BitKeeper/deleted/.del-rep_elect.c@1.2, 2006-08-15 19:08:12-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/rep/rep_elect.c

  BitKeeper/deleted/.del-rep_log.c@1.2, 2006-08-15 19:08:12-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/rep/rep_log.c

  BitKeeper/deleted/.del-rep_method.c@1.5, 2006-08-15 19:08:12-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/rep/rep_method.c

  BitKeeper/deleted/.del-rep_record.c@1.6, 2006-08-15 19:08:13-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/rep/rep_record.c

  BitKeeper/deleted/.del-rep_region.c@1.5, 2006-08-15 19:08:13-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/rep/rep_region.c

  BitKeeper/deleted/.del-rep_stat.c@1.3, 2006-08-15 19:08:13-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/rep/rep_stat.c

  BitKeeper/deleted/.del-rep_stub.c@1.3, 2006-08-15 19:08:13-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/rep/rep_stub.c

  BitKeeper/deleted/.del-rep_util.c@1.5, 2006-08-15 19:08:13-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/rep/rep_util.c

  BitKeeper/deleted/.del-rep_verify.c@1.2, 2006-08-15 19:08:13-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/rep/rep_verify.c

  BitKeeper/deleted/.del-rijndael-alg-fst.c@1.2, 2006-08-15 19:07:52-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/crypto/rijndael/rijndael-alg-fst.c

  BitKeeper/deleted/.del-rijndael-alg-fst.h@1.3, 2006-08-15 19:07:52-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/crypto/rijndael/rijndael-alg-fst.h

  BitKeeper/deleted/.del-rijndael-api-fst.c@1.2, 2006-08-15 19:07:53-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/crypto/rijndael/rijndael-api-fst.c

  BitKeeper/deleted/.del-rijndael-api-fst.h@1.3, 2006-08-15 19:07:53-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/crypto/rijndael/rijndael-api-fst.h

  BitKeeper/deleted/.del-rpc.ac@1.3, 2006-08-15 19:08:02-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal/rpc.ac

  BitKeeper/deleted/.del-s_all@1.14, 2006-08-15 19:08:00-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_all

  BitKeeper/deleted/.del-s_config@1.8, 2006-08-15 19:08:00-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_config

  BitKeeper/deleted/.del-s_crypto@1.7, 2006-08-15 19:08:00-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_crypto

  BitKeeper/deleted/.del-s_dir@1.6, 2006-08-15 19:08:00-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_dir

  BitKeeper/deleted/.del-s_include@1.10, 2006-08-15 19:08:00-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_include

  BitKeeper/deleted/.del-s_java@1.10, 2006-08-15 19:08:00-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_java

  BitKeeper/deleted/.del-s_java_const@1.4, 2006-08-15 19:08:00-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_java_const

  BitKeeper/deleted/.del-s_java_stat@1.4, 2006-08-15 19:08:00-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_java_stat

  BitKeeper/deleted/.del-s_java_swig@1.4, 2006-08-15 19:08:00-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_java_swig

  BitKeeper/deleted/.del-s_javah@1.5, 2006-08-15 19:08:00-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_javah

  BitKeeper/deleted/.del-s_je2db@1.4, 2006-08-15 19:08:00-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_je2db

  BitKeeper/deleted/.del-s_perm@1.10, 2006-08-15 19:08:00-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_perm

  BitKeeper/deleted/.del-s_readme@1.9, 2006-08-15 19:08:00-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_readme

  BitKeeper/deleted/.del-s_recover@1.12, 2006-08-15 19:08:00-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_recover

  BitKeeper/deleted/.del-s_rpc@1.11, 2006-08-15 19:08:00-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_rpc

  BitKeeper/deleted/.del-s_symlink@1.14, 2006-08-15 19:08:00-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_symlink

  BitKeeper/deleted/.del-s_tags@1.10, 2006-08-15 19:08:01-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_tags

  BitKeeper/deleted/.del-s_test@1.7, 2006-08-15 19:08:01-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_test

  BitKeeper/deleted/.del-s_vxworks@1.9, 2006-08-15 19:08:01-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_vxworks

  BitKeeper/deleted/.del-s_win32@1.9, 2006-08-15 19:08:01-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_win32

  BitKeeper/deleted/.del-s_win32_dsp@1.9, 2006-08-15 19:08:01-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_win32_dsp

  BitKeeper/deleted/.del-s_winmsi@1.4, 2006-08-15 19:08:01-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/s_winmsi

  BitKeeper/deleted/.del-s_winmsi.fcn@1.3, 2006-08-15 19:08:04-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/winmsi/s_winmsi.fcn

  BitKeeper/deleted/.del-seq_stat.c@1.3, 2006-08-15 19:08:13-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/sequence/seq_stat.c

  BitKeeper/deleted/.del-sequence.ac@1.3, 2006-08-15 19:08:02-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal/sequence.ac

  BitKeeper/deleted/.del-sequence.c@1.3, 2006-08-15 19:08:13-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/sequence/sequence.c

  BitKeeper/deleted/.del-sha1.c@1.5, 2006-08-15 19:08:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/hmac/sha1.c

  BitKeeper/deleted/.del-shqueue.h@1.5, 2006-08-15 19:07:58-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/shqueue.h

  BitKeeper/deleted/.del-sleepycat.jpg@1.2, 2006-08-15 19:08:05-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/winmsi/images/sleepycat.jpg

  BitKeeper/deleted/.del-small_dsp.src@1.2, 2006-08-15 19:07:50-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win32/small_dsp.src

  BitKeeper/deleted/.del-small_dsp.src~96bb604dd8041058@1.2, 2006-08-15 19:07:51-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win64/small_dsp.src

  BitKeeper/deleted/.del-snprintf.c@1.7, 2006-08-15 19:07:51-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/clib/snprintf.c

  BitKeeper/deleted/.del-sosuffix.ac@1.5, 2006-08-15 19:08:02-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal/sosuffix.ac

  BitKeeper/deleted/.del-srcfile_dsp.src@1.4, 2006-08-15 19:07:50-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win32/srcfile_dsp.src

  BitKeeper/deleted/.del-srcfile_dsp.src~45382c1414b89bb1@1.2, 2006-08-15 19:07:51-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win64/srcfile_dsp.src

  BitKeeper/deleted/.del-srcfiles.in@1.7, 2006-08-15 19:08:01-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/srcfiles.in

  BitKeeper/deleted/.del-static_dsp.src@1.7, 2006-08-15 19:07:50-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win32/static_dsp.src

  BitKeeper/deleted/.del-static_dsp.src~3f1945d094870d53@1.2, 2006-08-15 19:07:51-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win64/static_dsp.src

  BitKeeper/deleted/.del-status.awk@1.7, 2006-08-15 19:07:56-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_printlog/status.awk

  BitKeeper/deleted/.del-strcasecmp.c@1.7, 2006-08-15 19:07:51-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/clib/strcasecmp.c

  BitKeeper/deleted/.del-strdup.c@1.5, 2006-08-15 19:07:51-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/clib/strdup.c

  BitKeeper/deleted/.del-strerror.c@1.7, 2006-08-15 19:07:51-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/clib/strerror.c

  BitKeeper/deleted/.del-strtol.c@1.3, 2006-08-15 19:07:51-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/clib/strtol.c

  BitKeeper/deleted/.del-strtoul.c@1.3, 2006-08-15 19:07:52-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/clib/strtoul.c

  BitKeeper/deleted/.del-tcl.ac@1.5, 2006-08-15 19:08:02-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal/tcl.ac

  BitKeeper/deleted/.del-tcl_db.h@1.5, 2006-08-15 19:07:58-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/tcl_db.h

  BitKeeper/deleted/.del-tcl_dsp.src@1.6, 2006-08-15 19:07:50-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win32/tcl_dsp.src

  BitKeeper/deleted/.del-tcl_dsp.src~7fd8c5914db07070@1.2, 2006-08-15 19:07:51-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/build_win64/tcl_dsp.src

  BitKeeper/deleted/.del-tm.c@1.5, 2006-08-15 19:08:09-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mutex/tm.c

  BitKeeper/deleted/.del-topstripe.ibd@1.2, 2006-08-15 19:08:05-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/winmsi/images/topstripe.ibd

  BitKeeper/deleted/.del-txn.awk@1.5, 2006-08-15 19:07:56-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/db_printlog/txn.awk

  BitKeeper/deleted/.del-txn.c@1.8, 2006-08-15 19:08:13-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/txn/txn.c

  BitKeeper/deleted/.del-txn.h@1.5, 2006-08-15 19:07:58-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/txn.h

  BitKeeper/deleted/.del-txn.src@1.7, 2006-08-15 19:08:13-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/txn/txn.src

  BitKeeper/deleted/.del-txn_chkpt.c@1.2, 2006-08-15 19:08:13-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/txn/txn_chkpt.c

  BitKeeper/deleted/.del-txn_failchk.c@1.2, 2006-08-15 19:08:13-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/txn/txn_failchk.c

  BitKeeper/deleted/.del-txn_method.c@1.5, 2006-08-15 19:08:13-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/txn/txn_method.c

  BitKeeper/deleted/.del-txn_rec.c@1.7, 2006-08-15 19:08:13-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/txn/txn_rec.c

  BitKeeper/deleted/.del-txn_recover.c@1.5, 2006-08-15 19:08:13-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/txn/txn_recover.c

  BitKeeper/deleted/.del-txn_region.c@1.7, 2006-08-15 19:08:13-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/txn/txn_region.c

  BitKeeper/deleted/.del-txn_stat.c@1.5, 2006-08-15 19:08:14-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/txn/txn_stat.c

  BitKeeper/deleted/.del-txn_util.c@1.5, 2006-08-15 19:08:14-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/txn/txn_util.c

  BitKeeper/deleted/.del-types.ac@1.5, 2006-08-15 19:08:02-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/aclocal/types.ac

  BitKeeper/deleted/.del-util_arg.c@1.5, 2006-08-15 19:07:52-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/common/util_arg.c

  BitKeeper/deleted/.del-util_cache.c@1.5, 2006-08-15 19:07:52-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/common/util_cache.c

  BitKeeper/deleted/.del-util_log.c@1.7, 2006-08-15 19:07:52-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/common/util_log.c

  BitKeeper/deleted/.del-util_sig.c@1.7, 2006-08-15 19:07:52-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/common/util_sig.c

  BitKeeper/deleted/.del-uts4_cc.s@1.7, 2006-08-15 19:08:09-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/mutex/uts4_cc.s

  BitKeeper/deleted/.del-vsnprintf.c@1.5, 2006-08-15 19:07:52-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/clib/vsnprintf.c

  BitKeeper/deleted/.del-vx_allfile.in@1.4, 2006-08-15 19:08:04-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_setup/vx_allfile.in

  BitKeeper/deleted/.del-vx_buildcd@1.4, 2006-08-15 19:08:01-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_buildcd

  BitKeeper/deleted/.del-vx_config.in@1.5, 2006-08-15 19:08:01-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_config.in

  BitKeeper/deleted/.del-vx_demofile.in@1.4, 2006-08-15 19:08:04-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_setup/vx_demofile.in

  BitKeeper/deleted/.del-vx_setup.in@1.3, 2006-08-15 19:08:04-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_setup/vx_setup.in

  BitKeeper/deleted/.del-webicon.ico@1.2, 2006-08-15 19:08:05-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/winmsi/images/webicon.ico

  BitKeeper/deleted/.del-win_config.in@1.5, 2006-08-15 19:08:01-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/win_config.in

  BitKeeper/deleted/.del-win_db.in@1.3, 2006-08-15 19:08:01-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/win_db.in

  BitKeeper/deleted/.del-win_exports.in@1.5, 2006-08-15 19:08:01-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/win_exports.in

  BitKeeper/deleted/.del-winbuild.bat@1.3, 2006-08-15 19:08:05-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/winmsi/winbuild.bat

  BitKeeper/deleted/.del-wpj.1@1.3, 2006-08-15 19:08:03-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_3.1/wpj.1

  BitKeeper/deleted/.del-wpj.2@1.3, 2006-08-15 19:08:03-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_3.1/wpj.2

  BitKeeper/deleted/.del-wpj.3@1.3, 2006-08-15 19:08:04-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_3.1/wpj.3

  BitKeeper/deleted/.del-wpj.4@1.3, 2006-08-15 19:08:04-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_3.1/wpj.4

  BitKeeper/deleted/.del-wpj.5@1.3, 2006-08-15 19:08:04-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_3.1/wpj.5

  BitKeeper/deleted/.del-wpj.in@1.4, 2006-08-15 19:08:03-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_2.0/wpj.in

  BitKeeper/deleted/.del-wpj.in~cd8fd754cedb37b2@1.2, 2006-08-15 19:08:03-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dist/vx_2.2/wpj.in

  BitKeeper/deleted/.del-xa.c@1.7, 2006-08-15 19:08:14-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/xa/xa.c

  BitKeeper/deleted/.del-xa.h@1.5, 2006-08-15 19:07:58-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/dbinc/xa.h

  BitKeeper/deleted/.del-xa_db.c@1.7, 2006-08-15 19:08:14-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/xa/xa_db.c

  BitKeeper/deleted/.del-xa_map.c@1.7, 2006-08-15 19:08:14-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/xa/xa_map.c

  sql/field.cc@1.335, 2006-08-15 21:49:19-07:00, brian@zim.(none) +1 -1
    Antony's patch

  sql/field.h@1.183.1.17, 2006-08-15 21:49:19-07:00, brian@zim.(none) +1 -1
    Antony's patch

ChangeSet@1.2255.34.1, 2006-08-15 20:38:51+02:00, joerg@trift2. +1 -0
  Remove building, packing, and installing the "max" server from the RPM "spec" file.

  support-files/mysql.spec.sh@1.161, 2006-08-15 20:38:47+02:00, joerg@trift2. +7 -37
    Remove building, packing, and installing the "max" server.

ChangeSet@1.1810.2033.2, 2006-08-15 18:32:50+00:00, lzhou@dev3-138.dev.cn.tlan +3 -0
  BUG#21052 Modify error message when backup is aborted

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.15.1, 2006-08-15 18:32:48+00:00, lzhou@dev3-138.dev.cn.tlan +1 -1
    Modify error message from "Start of backup failed" to "Backup failed" when backup is aborted

  ndb/src/mgmsrv/Services.cpp@1.45.28.1, 2006-08-15 18:32:48+00:00, lzhou@dev3-138.dev.cn.tlan +7 -0
    Append error message when error event occour

  ndb/src/ndbapi/ndberror.c@1.30.27.1, 2006-08-15 18:32:48+00:00, lzhou@dev3-138.dev.cn.tlan +1 -1
    Mofidy error message from "Backup aborted by applicaton" to "Backup aborted by user request"

ChangeSet@1.1810.2032.1, 2006-08-15 21:45:24+04:00, evgen@sunlight.local +9 -0
  Fixed bug#21261: Wrong access rights was required for an insert into a view
  
  SELECT right instead of INSERT right was required for an insert into to a view.
  This wrong behaviour appeared after the fix for bug #20989. Its intention was
  to ask only SELECT right for all tables except the very first for a complex
  INSERT query. But that patch has done it in a wrong way and lead to asking 
  a wrong access right for an insert into a view.
  
  The setup_tables_and_check_access() function now accepts two want_access
  parameters. One will be used for the first table and the second for other
  tables.

  mysql-test/r/view.result@1.138.13.1, 2006-08-15 21:42:29+04:00, evgen@sunlight.local +19 -0
    Added a test case for bug#21261: Wrong access rights was required for an insert into a view

  mysql-test/t/view.test@1.126.11.1, 2006-08-15 21:42:25+04:00, evgen@sunlight.local +30 -0
    Added a test case for bug#21261: Wrong access rights was required for an insert into a view

  sql/mysql_priv.h@1.290.1.114, 2006-08-15 21:44:09+04:00, evgen@sunlight.local +1 -0
    Fixed bug#21261: Wrong access rights was required for an insert into a view
    The setup_tables_and_check_access() function now accepts two want_access
    parameters.

  sql/sql_base.cc@1.235.67.1, 2006-08-15 21:44:01+04:00, evgen@sunlight.local +7 -2
    Fixed bug#21261: Wrong access rights was required for an insert into a view
    The setup_tables_and_check_access() function now accepts two want_access
    parameters. One will be used for the first table and the second for other
    tables.

  sql/sql_delete.cc@1.144.1.34, 2006-08-15 21:43:57+04:00, evgen@sunlight.local +2 -2
    Fixed bug#21261: Wrong access rights was required for an insert into a view
    Modified to use updated setup_tables_and_check_access() function.

  sql/sql_insert.cc@1.146.33.1, 2006-08-15 21:43:56+04:00, evgen@sunlight.local +1 -1
    Fixed bug#21261: Wrong access rights was required for an insert into a view
    Modified to use updated setup_tables_and_check_access() function.

  sql/sql_load.cc@1.78.1.19, 2006-08-15 21:43:52+04:00, evgen@sunlight.local +1 -0
    Fixed bug#21261: Wrong access rights was required for an insert into a view
    Modified to use updated setup_tables_and_check_access() function.

  sql/sql_select.cc@1.312.85.1, 2006-08-15 21:43:23+04:00, evgen@sunlight.local +1 -1
    Fixed bug#21261: Wrong access rights was required for an insert into a view
    Modified to use updated setup_tables_and_check_access() function.

  sql/sql_update.cc@1.154.18.1, 2006-08-15 21:42:33+04:00, evgen@sunlight.local +2 -2
    Fixed bug#21261: Wrong access rights was required for an insert into a view
    Modified to use updated setup_tables_and_check_access() function.

ChangeSet@1.1810.2009.15, 2006-08-15 21:08:22+04:00, sergefp@mysql.com +3 -0
  BUG#21282: Incorrect query results for "t.key NOT IN (<big const list>) 
  In fix for BUG#15872, a condition of type "t.key NOT IN (c1, .... cN)"
  where N>1000, was incorrectly converted to
    (-inf < X < c_min) OR (c_max < X)
  Now this conversion is removed, we dont produce any range lists for such
  conditions.

  mysql-test/r/range.result@1.44.1.3, 2006-08-15 21:08:20+04:00, sergefp@mysql.com +22 -0
    BUG#21282: Testcase

  mysql-test/t/range.test@1.37.1.3, 2006-08-15 21:08:20+04:00, sergefp@mysql.com +25 -0
    BUG#21282: Testcase

  sql/opt_range.cc@1.159.1.59, 2006-08-15 21:08:20+04:00, sergefp@mysql.com +46 -61
    BUG#21282: Incorrect query results for "t.key NOT IN (<big const list>) 
    In fix for BUG#15872, a condition of type "t.key NOT IN (c1, .... cN)"
    where N>1000, was incorrectly converted to 
      (-inf < X < c_min) OR (c_max < X)
    Now this conversion is removed, we dont produce any range lists for such
    conditions.

ChangeSet@1.1810.2029.1, 2006-08-15 21:02:55+04:00, evgen@moonbone.local +3 -0
  Fixed bug#15950: NOW() optimized away in VIEWs
  
  This bug is a side-effect of bug fix #16377. NOW() is optimized in
  BETWEEN to integer constants to speed up query execution. When view is being
  created it saves already modified query and thus becomes wrong.
  
  The agg_cmp_type() function now substitutes constant result DATE/TIME functions 
  for their results only if the current query isn't CREATE VIEW or SHOW CREATE
  VIEW.

  mysql-test/r/view.result@1.138.12.1, 2006-08-15 21:02:05+04:00, evgen@moonbone.local +7 -0
    Added a test case for bug#15950: NOW() optimized away in VIEWs

  mysql-test/t/view.test@1.126.1.29, 2006-08-15 21:02:03+04:00, evgen@moonbone.local +9 -0
    Added a test case for bug#15950: NOW() optimized away in VIEWs

  sql/item_cmpfunc.cc@1.187.1.27, 2006-08-15 21:02:06+04:00, evgen@moonbone.local +28 -20
    Fixed bug#15950: NOW() optimized away in VIEWs
    The agg_cmp_type() function now substitutes constant result DATE/TIME functions 
    for their results only if the current query isn't CREATE VIEW or SHOW CREATE
    VIEW.

ChangeSet@1.1810.2028.1, 2006-08-15 18:41:21+02:00, cmiller@maint1.mysql.com +4 -0
  Bug #20908: Crash if select @@""
  
  Zero-length variables caused failures when using the length to look
  up the name in a hash.  Instead, signal that no zero-length name can
  ever be found and that to encounter one is a syntax error.

  mysql-test/r/variables.result@1.76.1.12, 2006-08-15 18:41:15+02:00, cmiller@maint1.mysql.com +6 -0
    Results for test.

  mysql-test/t/variables.test@1.51.1.12, 2006-08-15 18:41:16+02:00, cmiller@maint1.mysql.com +11 -0
    Insert tests to prove that zero-length variable names do not cause
    faults.

  sql/gen_lex_hash.cc@1.67, 2006-08-15 18:41:17+02:00, cmiller@maint1.mysql.com +11 -2
    If the length is zero, then there is nothing to look-up in the 
    hash.

  sql/sql_lex.cc@1.142.19.1, 2006-08-15 18:41:17+02:00, cmiller@maint1.mysql.com +2 -0
    Names of variables must not be empty.  Signal an error of that 
    happens.

ChangeSet@1.1616.2730.1, 2006-08-15 20:33:14+04:00, sergefp@mysql.com +3 -0
  BUG#21077: Possible crash caused by invalid sequence of handler::* calls:                                                
  The crash was caused by invalid sequence of handler::** calls:                                                           
    ha_smth->index_init();                                                                                                 
    ha_smth->index_next_same(); (2)                                                                                        
  (2) is an invalid call as it was not preceeded by any 'scan setup' call
  like index_first() or index_read(). The cause was that QUICK_SELECT::reset()
  didn't "fully reset" the quick select- current QUICK_RANGE wasn't forgotten,
  and quick select might attempt to continue reading the range, which would
  result in the above mentioned invalid sequence of handler calls.
  
  5.x versions are not affected by the bug - they already have the missing
  "range=NULL" clause.                                                    
                                                         

  mysql-test/t/innodb_mysql.test@1.3.3.2, 2006-08-15 20:33:12+04:00, sergefp@mysql.com +27 -0
    Testcase for BUG#21077

  mysql-test/r/innodb_mysql.result@1.3.3.2, 2006-08-15 20:33:12+04:00, sergefp@mysql.com +21 -0
    Testcase for BUG#21077

  sql/opt_range.h@1.28.3.1, 2006-08-15 20:33:12+04:00, sergefp@mysql.com +1 -1
    BUG#21077: Possible crash caused by invalid sequence of handler::* calls:                                              
     - Make QUICK_SELECT::reset() really reset the quick select                                                            

ChangeSet@1.2255.31.3, 2006-08-15 15:49:31+02:00, mskold@mysql.com +1 -0
  bug #18184  SELECT ... FOR UPDATE does not work..: Updated test result file

  mysql-test/r/ndb_lock.result@1.12.1.3, 2006-08-15 15:49:23+02:00, mskold@mysql.com +12 -3
    bug #18184  SELECT ... FOR UPDATE does not work..: Updated test result file

ChangeSet@1.1810.2002.9, 2006-08-15 21:01:50+08:00, gni@dev3-127.(none) +1 -0
  BUG#19620 ndb_mgm help needs help

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.14.1, 2006-08-15 21:01:48+08:00, gni@dev3-127.(none) +339 -19
    Help command has added for each command inside the ndb_mgm.

ChangeSet@1.2255.32.1, 2006-08-15 16:57:46+04:00, anozdrin@alik. +2 -0
  Fix for BUG#21247: im_instance_conf.imtest fails on trees with test-1
  in their name.
  
  The problem was that IM-tests contained grep-statements with too wide
  patterns. The fix is to make these patterns more restrictive. Only IM-tests
  have been fixed, no code has been touched. 

  mysql-test/t/im_instance_conf.imtest@1.4, 2006-08-15 16:57:44+04:00, anozdrin@alik. +27 -27
    Use more restrictive pattern.

  mysql-test/t/im_options.imtest@1.3, 2006-08-15 16:57:44+04:00, anozdrin@alik. +24 -24
    Use more restrictive pattern.

ChangeSet@1.1810.2009.14, 2006-08-15 15:48:49+03:00, gkodinov@macbook.gmz +2 -0
  Bug #21302: Result not properly sorted when using an ORDER BY on a second table in a join
   - undeterminstic tests fixed

  mysql-test/r/order_by.result@1.55, 2006-08-15 15:48:41+03:00, gkodinov@macbook.gmz +5 -5
    Bug #21302: Result not properly sorted when using an ORDER BY on a second table in a join
     - more undeterminstic tests fixed

  mysql-test/t/order_by.test@1.39, 2006-08-15 15:48:41+03:00, gkodinov@macbook.gmz +1 -1
    Bug #21302: Result not properly sorted when using an ORDER BY on a second table in a join
     - more undeterminstic tests fixed

ChangeSet@1.1810.2024.2, 2006-08-15 14:31:21+02:00, mskold@mysql.com +2 -0
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: do not release operation records for on-going read_multi_range

  sql/ha_ndbcluster.cc@1.175.49.2, 2006-08-15 14:30:35+02:00, mskold@mysql.com +41 -21
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: do not release operation records for on-going read_multi_range

  sql/ha_ndbcluster.h@1.82.4.2, 2006-08-15 14:30:35+02:00, mskold@mysql.com +9 -3
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: do not release operation records for on-going read_multi_range

ChangeSet@1.1810.2020.4, 2006-08-15 20:26:47+08:00, dli@dev3-76.dev.cn.tlan +3 -0
  Bug#19047, not start the event thread when ndb_mgm is running in executing (-e) thread.

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.13.1, 2006-08-15 20:26:45+08:00, dli@dev3-76.dev.cn.tlan +76 -72
    Not start event thread when ndb_mgm client is running in executing (-e) mode.

  ndb/src/mgmclient/main.cpp@1.20.3.1, 2006-08-15 20:26:45+08:00, dli@dev3-76.dev.cn.tlan +2 -2
    Not start event thread when ndb_mgm is runing in executing (-e) mode.

  ndb/src/mgmclient/ndb_mgmclient.hpp@1.13.1.1, 2006-08-15 20:26:45+08:00, dli@dev3-76.dev.cn.tlan +2 -2
    Not start event thread when ndb_mgm is running in executing (-e) mode.

ChangeSet@1.1810.1972.24, 2006-08-15 14:22:47+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#20708
    init ndb_cache_check_time and honor value in my.cnf

  sql/ha_ndbcluster.cc@1.175.50.1, 2006-08-15 14:22:46+02:00, jonas@perch.ndb.mysql.com +2 -0
    init ndb_cache_check_time and honor value in my.cnf

ChangeSet@1.2273.1.3, 2006-08-15 19:53:16+08:00, stewart@willster.(none) +4 -0
  BUG#21647 events tests fails with --with-ndbcluster
  
  ignore the ndb injector thread when selecting from INFORMATION_SCHEMA.PROCESSLIST

  mysql-test/r/events.result@1.36.1.1, 2006-08-15 19:53:13+08:00, stewart@willster.(none) +4 -4
    don't select Daemon processes from I_S.PROCESSLIST (i.e. NDB Injector Thread)

  mysql-test/r/events_bugs.result@1.11.1.2, 2006-08-15 19:53:13+08:00, stewart@willster.(none) +5 -5
    don't select Daemon processes from I_S.PROCESSLIST (i.e. NDB Injector Thread)

  mysql-test/t/events.test@1.32.1.1, 2006-08-15 19:53:13+08:00, stewart@willster.(none) +4 -4
    don't select Daemon processes from I_S.PROCESSLIST (i.e. NDB Injector Thread)

  mysql-test/t/events_bugs.test@1.9.1.1, 2006-08-15 19:53:13+08:00, stewart@willster.(none) +5 -5
    don't select Daemon processes from I_S.PROCESSLIST (i.e. NDB Injector Thread)

ChangeSet@1.2273.1.2, 2006-08-15 19:18:57+08:00, stewart@willster.(none) +1 -0
  BUG#21652 I_S.PROCESSLIST truncates STATE field compared to SHOW FULL PROCESSLIST
  
  increase maximum length to 64 (max length that ndb injector creates is currently 62)

  sql/sql_show.cc@1.354.1.8, 2006-08-15 19:18:54+08:00, stewart@willster.(none) +1 -1
    Increase max length of I_S.PROCESSLIST.STATE to accomodate NDB injector strings. 

ChangeSet@1.1616.2729.1, 2006-08-15 13:12:27+02:00, mskold@mysql.com +5 -0
  ndb_lock.test, ndb_lock.result:
    bug #18184  SELECT ... FOR UPDATE does not work..: New test case
  ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

  mysql-test/r/ndb_lock.result@1.5.6.1, 2006-08-15 13:09:09+02:00, mskold@mysql.com +12 -3
    bug #18184  SELECT ... FOR UPDATE does not work..: New test case

  mysql-test/t/ndb_lock.test@1.7.6.1, 2006-08-15 13:09:09+02:00, mskold@mysql.com +13 -2
    bug #18184  SELECT ... FOR UPDATE does not work..: New test case

  sql/ha_ndbcluster.cc@1.114.22.1, 2006-08-15 13:09:39+02:00, mskold@mysql.com +34 -0
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

  sql/ha_ndbcluster.h@1.40.8.1, 2006-08-15 13:09:39+02:00, mskold@mysql.com +2 -0
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

  ndb/include/ndbapi/NdbConnection.hpp@1.19.10.1, 2006-08-15 13:09:39+02:00, mskold@mysql.com +3 -1
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

ChangeSet@1.2273.1.1, 2006-08-15 19:10:10+08:00, stewart@willster.(none) +2 -0
  BUG#21650 not_embedded_server fails --with-ndbcluster
  
  make test ignore NDB injector thread

  mysql-test/r/not_embedded_server.result@1.5.1.1, 2006-08-15 19:10:07+08:00, stewart@willster.(none) +3 -3
    Use INFORMATION_SCHEMA for getting PROCESSLIST so we can exclude the
    NDB Binlog Injector thread as it may/may not be running depending on
    if --with-ndbcluster is specified to mysql-test-run

  mysql-test/t/not_embedded_server.test@1.3, 2006-08-15 19:10:07+08:00, stewart@willster.(none) +7 -2
    Use INFORMATION_SCHEMA for getting PROCESSLIST so we can exclude the
    NDB Binlog Injector thread as it may/may not be running depending on
    if --with-ndbcluster is specified to mysql-test-run

ChangeSet@1.1616.2728.1, 2006-08-15 15:24:07+05:00, ramil@mysql.com +6 -0
  Fix for bug #20695: Charset introducer overrides charset definition for column.
    - if there are two character set definitions in the column declaration,
      we replace the first one with the second one as we store both in the LEX->charset
      slot. Add a separate slot to the LEX structure to store underscore charset.
    - convert default values to the column charset of STRING, VARSTRING fields 
      if necessary as well.

  mysql-test/r/ctype_recoding.result@1.20.1.6, 2006-08-15 15:24:03+05:00, ramil@mysql.com +11 -0
    Fix for bug #20695: Charset introducer overrides charset definition for column.
      - test result.

  mysql-test/t/ctype_recoding.test@1.21.1.1, 2006-08-15 15:24:03+05:00, ramil@mysql.com +12 -0
    Fix for bug #20695: Charset introducer overrides charset definition for column.
      - test case.

  sql/sql_lex.cc@1.97.21.4, 2006-08-15 15:24:03+05:00, ramil@mysql.com +3 -2
    Fix for bug #20695: Charset introducer overrides charset definition for column.
      - LEX->underscore_charset introduced to store UNDERSCORE_CHARSET

  sql/sql_lex.h@1.102.41.3, 2006-08-15 15:24:03+05:00, ramil@mysql.com +1 -1
    Fix for bug #20695: Charset introducer overrides charset definition for column.
      - LEX->underscore_charset introduced to store UNDERSCORE_CHARSET

  sql/sql_table.cc@1.157.2.151, 2006-08-15 15:24:03+05:00, ramil@mysql.com +34 -29
    Fix for bug #20695: Charset introducer overrides charset definition for column.
      - convert default values to the column charset of VARSTRING, STRING, ENUM, 
        SET fields if necessary.

  sql/sql_yacc.yy@1.203.1.196, 2006-08-15 15:24:03+05:00, ramil@mysql.com +2 -2
    Fix for bug #20695: Charset introducer overrides charset definition for column.
      - LEX->underscore_charset introduced to store UNDERSCORE_CHARSET

ChangeSet@1.1810.2009.13, 2006-08-15 13:01:04+03:00, gkodinov@rakia.(none) +2 -0
  Bug #21302: Result not properly sorted when using an ORDER BY 
              on a second table in a join
  - undeterministic output of the test case removed.

  mysql-test/r/order_by.result@1.54, 2006-08-15 13:01:02+03:00, gkodinov@rakia.(none) +7 -7
    Bug #21302: Result not properly sorted when using an ORDER BY 
                on a second table in a join
    - undeterministic output of the test case removed.

  mysql-test/t/order_by.test@1.38, 2006-08-15 13:01:02+03:00, gkodinov@rakia.(none) +1 -1
    Bug #21302: Result not properly sorted when using an ORDER BY 
                on a second table in a join
    - undeterministic output of the test case removed.

ChangeSet@1.1810.2023.1, 2006-08-15 01:54:14-07:00, acurtis@xiphis.org +2 -0
  fix windows build

  sql/field.cc@1.256.1.66, 2006-08-15 01:54:10-07:00, acurtis@xiphis.org +1 -1
    fix windows build

  sql/field.h@1.153.12.3, 2006-08-15 01:54:10-07:00, acurtis@xiphis.org +1 -1
    fix windows build

ChangeSet@1.2255.26.6, 2006-08-15 01:20:34-07:00, brian@zim.(none) +1 -0
  Period removal for warning message. 

  mysql-test/r/backup.result@1.21, 2006-08-15 01:20:31-07:00, brian@zim.(none) +2 -2
    With or without a period?

ChangeSet@1.1616.2726.1, 2006-08-15 09:38:21+02:00, mskold@mysql.com +5 -0
  ndb_lock.test, ndb_lock.result:
    bug #18184  SELECT ... FOR UPDATE does not work..: New test case
  ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

  mysql-test/r/ndb_lock.result@1.5.4.1, 2006-08-15 09:37:59+02:00, mskold@mysql.com +12 -3
    bug #18184  SELECT ... FOR UPDATE does not work..: New test case

  mysql-test/t/ndb_lock.test@1.7.4.1, 2006-08-15 09:37:59+02:00, mskold@mysql.com +13 -2
    bug #18184  SELECT ... FOR UPDATE does not work..: New test case

  sql/ha_ndbcluster.cc@1.114.3.75, 2006-08-15 09:37:08+02:00, mskold@mysql.com +27 -0
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

  sql/ha_ndbcluster.h@1.40.7.1, 2006-08-15 09:37:07+02:00, mskold@mysql.com +2 -0
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

  ndb/include/ndbapi/NdbConnection.hpp@1.19.9.1, 2006-08-15 09:37:07+02:00, mskold@mysql.com +2 -1
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

ChangeSet@1.2268.1.3, 2006-08-15 15:16:21+08:00, stewart@willster.(none) +2 -0
  BUG#21648 information_schema test fails --with-ndbcluster
  
  make test work both with and without ndbcluster

  mysql-test/r/information_schema.result@1.133, 2006-08-15 15:16:18+08:00, stewart@willster.(none) +4 -5
    fix test so that it passes --with-ndbcluster
    
    add conditions to ignore the table_schema='cluster' on some queries as different
    tables are in the cluster database if ndb is running or not.

  mysql-test/t/information_schema.test@1.86, 2006-08-15 15:16:18+08:00, stewart@willster.(none) +4 -4
    ignore the 'cluster' database as results differ if --with-ndbcluster or without
    
    explictly use schema 'test' for bug7476 check.

ChangeSet@1.1810.2021.1, 2006-08-15 10:13:17+03:00, gkodinov@macbook.gmz +3 -0
  Bug #21159: Optimizer: wrong result after AND with different data types
  Disable const propagation for Item_hex_string.
  This must be done because Item_hex_string->val_int() is not
  the same as (Item_hex_string->val_str() in BINARY column)->val_int().
  We cannot simply disable the replacement in a particular context (
  e.g. <bin_col> = <int_col> AND <bin_col> = <hex_string>) since
  Items don't know the context they are in and there are functions like 
  IF (<hex_string>, 'yes', 'no').
  Note that this will disable some valid cases as well 
  (e.g. : <bin_col> = <hex_string> AND <bin_col2> = <bin_col>) but 
  there's no way to distinguish the valid cases without having the
  Item's parent say something like : Item->set_context(Item::STRING_RESULT)
  and have all the Items that contain other Items do that consistently.

  mysql-test/r/compare.result@1.11, 2006-08-15 10:13:11+03:00, gkodinov@macbook.gmz +7 -0
    Bug #21159: Optimizer: wrong result after AND with different data types
     - test case

  mysql-test/t/compare.test@1.10, 2006-08-15 10:13:11+03:00, gkodinov@macbook.gmz +9 -0
    Bug #21159: Optimizer: wrong result after AND with different data types
     - test case

  sql/sql_select.cc@1.312.83.1, 2006-08-15 10:13:12+03:00, gkodinov@macbook.gmz +16 -1
    Bug #21159: Optimizer: wrong result after AND with different data types
     - disable const propagation for Item_hex_string.

ChangeSet@1.2270.1.1, 2006-08-15 08:47:49+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    Fix ndb_condition_pushdown (5.0->5.1 merge error)

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.44, 2006-08-15 08:47:47+02:00, jonas@perch.ndb.mysql.com +3 -1
    Fix ndb_condition_pushdown

ChangeSet@1.2270, 2006-08-15 07:52:27+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#21172
    Fix build failure if O_DIRECT is not defined
    Fix stack overflow by making odirect_readbuf global
    Remove soem old debug variables

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp@1.35, 2006-08-15 07:52:25+02:00, jonas@perch.ndb.mysql.com +5 -6
    Fix build failure if O_DIRECT is not defined
    Fix stack overflow by making odirect_readbuf global
    Remove soem old debug variables

  storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp@1.29, 2006-08-15 07:52:25+02:00, jonas@perch.ndb.mysql.com +0 -17
    Fix build failure if O_DIRECT is not defined
    Fix stack overflow by making odirect_readbuf global
    Remove soem old debug variables

ChangeSet@1.1810.2020.1, 2006-08-15 11:09:38+08:00, stewart@willster.(none) +1 -0
  BUG#20823 testBackup FailMaster failing
    
  few cases not handled properly (NF occurs).

  ndb/src/kernel/blocks/backup/Backup.cpp@1.15.23.1, 2006-08-15 11:09:35+08:00, stewart@willster.(none) +41 -23
    Don't write fragment info if we haven't retreived any fragment info yet
    (FailMaster test 2)
        
    Go directly onto closing files if the tabPtr is RNIL (as we're in recovery)

ChangeSet@1.2255.26.4, 2006-08-14 16:50:52-07:00, brian@zim.(none) +3 -0
  Merge fixes

  mysql-test/r/mysqldump.result@1.121, 2006-08-14 16:50:50-07:00, brian@zim.(none) +0 -7
    Merge result fix

  mysql-test/r/repair.result@1.21, 2006-08-14 16:50:50-07:00, brian@zim.(none) +6 -0
    Merge Result Fix

  mysql-test/t/mysqldump.test@1.115, 2006-08-14 16:50:50-07:00, brian@zim.(none) +0 -1
    Fix of test

ChangeSet@1.2255.30.1, 2006-08-15 01:42:57+02:00, tsmith@production.mysql.com +21 -0
  Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
  All but ss677 are against the mysql-5.1 tree only.
  
  Fixes the following bugs:
  - Bug #19834: Using cursors when running in READ-COMMITTED can cause InnoDB to crash
  - Bug #20213: DBT2 testing cause mysqld to core using Innodb
  - Bug #20493: on partition tables, select and show command casue server crash
  - Bug #21113: Duplicate printout in SHOW INNODB STATUS
  - Bug #21313: rsql_..._recover_innodb_tmp_table is redundant and broken
  - Bug #21467: Manual URL wrong in InnoDB "page corrupted" error report

  mysql-test/r/innodb.result@1.182, 2006-08-14 23:58:55+02:00, tsmith@production.mysql.com +4 -12
    Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
    All but ss677 are against the mysql-5.1 tree only.
    
    innodb.result: Adjust Innodb_rows_inserted and Innodb_rows_updated
    to reflect the deleted statements in r420, which somehow reappeared
    in the MySQL tree.

  mysql-test/t/innodb.test@1.149, 2006-08-14 23:58:56+02:00, tsmith@production.mysql.com +0 -8
    Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
    All but ss677 are against the mysql-5.1 tree only.

  storage/innobase/Makefile.am@1.17, 2006-08-15 00:27:37+02:00, tsmith@production.mysql.com +1 -2
    Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
    All but ss677 are against the mysql-5.1 tree only.

  storage/innobase/btr/btr0btr.c@1.45, 2006-08-14 23:58:56+02:00, tsmith@production.mysql.com +1 -1
    Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
    All but ss677 are against the mysql-5.1 tree only.
    
    Correct all URLs pointing to the MySQL manual. (Bug #21467)

  storage/innobase/buf/buf0buf.c@1.54, 2006-08-14 23:58:56+02:00, tsmith@production.mysql.com +3 -2
    Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
    All but ss677 are against the mysql-5.1 tree only.
    
    Correct all URLs pointing to the MySQL manual. (Bug #21467)

  storage/innobase/dict/dict0dict.c@1.84, 2006-08-14 23:58:56+02:00, tsmith@production.mysql.com +5 -6
    Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
    All but ss677 are against the mysql-5.1 tree only.
    
    Correct all URLs pointing to the MySQL manual. (Bug #21467)

  storage/innobase/fil/fil0fil.c@1.66, 2006-08-14 23:58:56+02:00, tsmith@production.mysql.com +13 -13
    Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
    All but ss677 are against the mysql-5.1 tree only.
    
    Make the tablespace cache hash size 100 or 1000 times bigger. Fixes bug
    #21112.
    
    After ut_print_timestamp(), always display "  InnoDB:" (note two spaces).
    
    Correct all URLs pointing to the MySQL manual. (Bug #21467)

  storage/innobase/fsp/fsp0fsp.c@1.29, 2006-08-14 23:58:56+02:00, tsmith@production.mysql.com +1 -1
    Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
    All but ss677 are against the mysql-5.1 tree only.
    
    Correct all URLs pointing to the MySQL manual. (Bug #21467)

  sql/ha_innodb.cc@1.285, 2006-08-14 23:58:56+02:00, tsmith@production.mysql.com +69 -60
    Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
    All but ss677 are against the mysql-5.1 tree only.
    
    ha_innobase::start_stmt(): patch from Heikki:
    Do not call read_view_close_for_mysql().  (Bug #19834)
    
    Fix Bug#20213 and its duplicates: stress test crashes of InnoDB-5.1
    
    Fix Bug #20493 : we must prepare prebuilt->trx to point to the trx of this thd before using it
    
    Add update_thd() to several places in ha_innodb.cc to make sure prebuilt->trx points to the right trx object; in other functions add assertions that prebuilt->trx is for this thd; when 5.1 stabilizes, we can change these assertions to ut_ad() debug version assertions
    
    Remove redundant check_trx_exists() and ut_a() from r701,
    as suggested by Marko
    
    Correct all URLs pointing to the MySQL manual. (Bug #21467)

  storage/innobase/ibuf/ibuf0ibuf.c@1.47, 2006-08-14 23:58:57+02:00, tsmith@production.mysql.com +2 -15
    Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
    All but ss677 are against the mysql-5.1 tree only.
    
    ibuf_print(): Don't print redundant information. Fixes bug #21113.
    
    Remove non-varying variable ibuf->meter and related constant IBUF_THRESHOLD.

  storage/innobase/include/btr0cur.ic@1.7, 2006-08-14 23:58:57+02:00, tsmith@production.mysql.com +1 -4
    Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
    All but ss677 are against the mysql-5.1 tree only.
    
    btr_cur_get_page(): Remove buggy assertion.

  storage/innobase/include/buf0buf.ic@1.21, 2006-08-14 23:58:57+02:00, tsmith@production.mysql.com +4 -4
    Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
    All but ss677 are against the mysql-5.1 tree only.
    
    Correct all URLs pointing to the MySQL manual. (Bug #21467)

  storage/innobase/include/ibuf0ibuf.ic@1.6, 2006-08-14 23:58:57+02:00, tsmith@production.mysql.com +1 -10
    Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
    All but ss677 are against the mysql-5.1 tree only.
    
    Remove non-varying variable ibuf->meter and related constant IBUF_THRESHOLD.

  storage/innobase/log/log0log.c@1.48, 2006-08-14 23:58:57+02:00, tsmith@production.mysql.com +1 -1
    Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
    All but ss677 are against the mysql-5.1 tree only.
    
    Correct all URLs pointing to the MySQL manual. (Bug #21467)

  storage/innobase/log/log0recv.c@1.56, 2006-08-14 23:58:58+02:00, tsmith@production.mysql.com +2 -2
    Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
    All but ss677 are against the mysql-5.1 tree only.
    
    Correct all URLs pointing to the MySQL manual. (Bug #21467)

  storage/innobase/os/os0file.c@1.117, 2006-08-14 23:58:58+02:00, tsmith@production.mysql.com +6 -6
    Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
    All but ss677 are against the mysql-5.1 tree only.
    
    Correct all URLs pointing to the MySQL manual. (Bug #21467)

  storage/innobase/row/row0mysql.c@1.129, 2006-08-14 23:58:58+02:00, tsmith@production.mysql.com +19 -114
    Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
    All but ss677 are against the mysql-5.1 tree only.
    
    Remove the special treatment of tables
    rsql_IDENTIFIER_recover_innodb_tmp_table, which is redundant and
    was broken with the introduction of the "safe" file name encoding of
    identifiers.  (Bug #21313)
    
    ChangeSet@1.2181.173.1  2006-08-02 17:57:06+02:00  ingo@local
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Changed back the encoded temp file prefix to #sql.
    
    After ut_print_timestamp(), always display "  InnoDB:" (note two spaces).
    
    Correct all URLs pointing to the MySQL manual. (Bug #21467)

  storage/innobase/row/row0sel.c@1.107, 2006-08-14 23:58:58+02:00, tsmith@production.mysql.com +1 -1
    Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
    All but ss677 are against the mysql-5.1 tree only.
    
    Correct all URLs pointing to the MySQL manual. (Bug #21467)

  storage/innobase/row/row0vers.c@1.20, 2006-08-14 23:58:58+02:00, tsmith@production.mysql.com +1 -1
    Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
    All but ss677 are against the mysql-5.1 tree only.
    
    row_vers_build_for_semi_consistent_read(): rec_trx_id was uninitialized
    in a comparison.  Initialize it.

  storage/innobase/srv/srv0start.c@1.94, 2006-08-14 23:58:59+02:00, tsmith@production.mysql.com +1 -1
    Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
    All but ss677 are against the mysql-5.1 tree only.
    
    Correct all URLs pointing to the MySQL manual. (Bug #21467)

  storage/innobase/ut/ut0dbg.c@1.12, 2006-08-14 23:58:59+02:00, tsmith@production.mysql.com +2 -2
    Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
    All but ss677 are against the mysql-5.1 tree only.
    
    ut_dbg_assertion_failed(): Print space between timestamp and start of error
    message.
    
    After ut_print_timestamp(), always display "  InnoDB:" (note two spaces).
    
    Correct all URLs pointing to the MySQL manual. (Bug #21467)

ChangeSet@1.2255.25.4, 2006-08-15 00:50:26+02:00, andrey@example.com +5 -0
  post-merge and testing fixes

  mysql-test/r/events_bugs.result@1.18, 2006-08-15 00:50:00+02:00, andrey@example.com +8 -8
    update results after merge

  mysql-test/t/events.test@1.38, 2006-08-15 00:50:00+02:00, andrey@example.com +2 -2
    num to name

  mysql-test/t/events_bugs.test@1.14, 2006-08-15 00:50:01+02:00, andrey@example.com +1 -1
    num to name

  sql/share/errmsg.txt@1.118, 2006-08-15 00:50:05+02:00, andrey@example.com +2 -0
    add the message back

  sql/sql_yacc.yy@1.492, 2006-08-15 00:50:04+02:00, andrey@example.com +13 -2
    post-merge fixes regarding init_sp_name
    put back code which I unintentionally removed during merg

ChangeSet@1.2255.28.1, 2006-08-14 14:45:48-07:00, brian@zim.(none) +11 -0
  Removed warnings for Windows build issues. Edited Windows README to remove reference to BDB. 

  libmysqld/CMakeLists.txt@1.9, 2006-08-14 14:45:01-07:00, brian@zim.(none) +0 -4
    Fix for build for BDB

  mysys/base64.c@1.13, 2006-08-14 14:45:01-07:00, brian@zim.(none) +1 -1
    Removed warning

  mysys/my_pread.c@1.14, 2006-08-14 14:45:01-07:00, brian@zim.(none) +2 -2
    Removed warning

  sql-common/my_time.c@1.20.1.1, 2006-08-14 14:45:02-07:00, brian@zim.(none) +1 -1
    Removed Warning

  sql/CMakeLists.txt@1.23.1.3, 2006-08-14 14:45:02-07:00, brian@zim.(none) +1 -5
    Editing for BDB

  storage/csv/ha_tina.cc@1.53.1.1, 2006-08-14 14:45:02-07:00, brian@zim.(none) +1 -1
    Removed warning

  storage/myisam/ft_parser.c@1.56, 2006-08-14 14:45:02-07:00, brian@zim.(none) +1 -1
    Removed warning

  storage/myisam/mi_delete_all.c@1.19, 2006-08-14 14:45:02-07:00, brian@zim.(none) +0 -1
    Removed unused variable

  storage/myisam/mi_packrec.c@1.37, 2006-08-14 14:45:02-07:00, brian@zim.(none) +0 -1
    Removed unused variable

  win/README@1.6, 2006-08-14 14:45:02-07:00, brian@zim.(none) +0 -1
    Fixed docs on Windows BDB

  win/configure.js@1.5, 2006-08-14 14:45:02-07:00, brian@zim.(none) +0 -32
    Removed function call to add support for building BDB

ChangeSet@1.1810.2010.5, 2006-08-14 20:48:37+02:00, rburnett@production.mysql.com +1 -0
  My previous change of replacing the call to sprintf with some memcpy type routines was not correct.  This patch reverts that.
  
  mysql_client_test.c:
    reverting my previous change

  tests/mysql_client_test.c@1.167.1.32, 2006-08-14 20:46:28+02:00, rburnett@production.mysql.com +2 -3
    reverting my previous change

ChangeSet@1.1810.2017.1, 2006-08-14 20:16:47+02:00, msvensson@neptunus.(none) +1 -0
  Bug#21327 OpenSSL-checking in configure
   - Change $d to $libs as suggested.
   - Thanks to Michael Prohm for the patch!

  config/ac-macros/openssl.m4@1.7.1.1, 2006-08-14 20:16:45+02:00, msvensson@neptunus.(none) +2 -2
    Replace $d with $libs as suggested in bug report.

ChangeSet@1.2255.27.1, 2006-08-14 19:56:41+02:00, joerg@trift2. +1 -0
  scripts/make_binary_distribution.sh  :    Drop the "max" server from 5.1 packages.

  scripts/make_binary_distribution.sh@1.127, 2006-08-14 19:56:37+02:00, joerg@trift2. +1 -1
    Drop the "max" server from 5.1 packages.

ChangeSet@1.1616.2725.1, 2006-08-14 20:01:19+04:00, kroki@moonlight.intranet +2 -0
  BUG#9678: Client library hangs after network communication failure
  
  Socket timeouts in client library were used only on Windows.
  
  The solution is to use socket timeouts in client library on all
  systems were they are supported.
  
  No test case is provided because it is impossible to simulate network
  failure in current test suit.

  sql/net_serv.cc@1.63.1.13, 2006-08-14 20:01:17+04:00, kroki@moonlight.intranet +1 -1
    Retry indefinitely only if got EINTR.

  vio/viosocket.c@1.25.1.11, 2006-08-14 20:01:18+04:00, kroki@moonlight.intranet +22 -8
    Set socket timeouts on POSIX systems as well as on Windows.

ChangeSet@1.2255.21.2, 2006-08-14 08:43:37-07:00, patg@govinda.patg.net +1 -0
  Post 5.0engines to 5.1 engines merge fix that didn't make it into that push.

  sql/ha_federated.h@1.36, 2006-08-14 08:43:34-07:00, patg@govinda.patg.net +1 -1
    Post 5.0engines to 5.1 engines merge fix that didn't make it into that push.

ChangeSet@1.1810.1936.22, 2006-08-14 18:19:29+03:00, gkodinov@macbook.gmz +3 -0
  Bug #21174: Index degrades sort performance and 
               optimizer does not honor IGNORE INDEX
   - Allow an index to be used for sorting the table 
     instead of filesort only if it is not disabled by
     IGNORE INDEX.

  mysql-test/r/group_by.result@1.69.1.1, 2006-08-14 18:19:22+03:00, gkodinov@macbook.gmz +9 -0
    Bug #21174: Index degrades sort performance and 
                 optimizer does not honor IGNORE INDEX
     - test case

  mysql-test/t/group_by.test@1.58, 2006-08-14 18:19:23+03:00, gkodinov@macbook.gmz +12 -0
    Bug #21174: Index degrades sort performance and 
                 optimizer does not honor IGNORE INDEX
     - test case

  sql/sql_select.cc@1.312.76.9, 2006-08-14 18:19:24+03:00, gkodinov@macbook.gmz +2 -0
    Bug #21174: Index degrades sort performance and 
                 optimizer does not honor IGNORE INDEX
     - Allow an index to be used for sorting the table 
       instead of filesort only if it is not disabled by
       IGNORE INDEX.

ChangeSet@1.1810.2016.2, 2006-08-14 19:18:33+04:00, kostja@bodhi.local +2 -0
  Fix a test case (proper clean up).

  mysql-test/r/mysqldump.result@1.83.1.27, 2006-08-14 19:18:30+04:00, kostja@bodhi.local +2 -2
    Update results.

  mysql-test/t/mysqldump.test@1.76.1.24, 2006-08-14 19:18:30+04:00, kostja@bodhi.local +2 -2
    Fix a bug in the test case that left user mysqltest_1@localhost 
    around (this broke furhter tests).

ChangeSet@1.2255.26.1, 2006-08-14 19:05:35+04:00, kostja@bodhi.local +2 -0
  Fix a test suite failure.

  mysql-test/r/partition_grant.result@1.2, 2006-08-14 19:05:32+04:00, kostja@bodhi.local +2 -0
    Update results (cleanup pon top of partition_grant.test)

  mysql-test/t/partition_grant.test@1.2, 2006-08-14 19:05:32+04:00, kostja@bodhi.local +8 -0
    Fix a test suite failure.

ChangeSet@1.2269, 2006-08-14 15:54:21+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21213
    5.1-fix adopt to changes in node recovery

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.121, 2006-08-14 15:54:19+02:00, jonas@perch.ndb.mysql.com +3 -2
    ix totSendLenAi also in "new" node recovery

ChangeSet@1.2268, 2006-08-14 14:52:45+02:00, jonas@perch.ndb.mysql.com +1 -0
  merge

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.43, 2006-08-14 14:52:43+02:00, jonas@perch.ndb.mysql.com +5 -3
    merge

ChangeSet@1.1810.2015.1, 2006-08-14 15:45:48+03:00, gkodinov@macbook.gmz +4 -0
  Bug #21302: Result not properly sorted when using an ORDER BY on a second 
               table in a join
   The optimizer removes redundant columns in ORDER BY. It is considering 
  redundant every reference to const table column, e.g b in :
  create table t1 (a int, b int, primary key(a)); 
  select 1 from t1 order by b where a = 1
  
  But it must not remove references to const table columns if the 
  const table is an outer table because there still can be 2 values :
  the const value and NULL. e.g.:
  create table t1 (a int, b int, primary key(a));
  select t2.b c from t1 left join t1 t2 on (t1.a = t2.a and t2.a = 5) 
    order by c;

  mysql-test/r/join_outer.result@1.44.2.1, 2006-08-14 15:45:40+03:00, gkodinov@macbook.gmz +1 -1
    Bug #21302: Result not properly sorted when using an ORDER BY on a second 
                table in a join
     - don't remove columns of const tables in ORDER BY if the const table 
       is an outer table.

  mysql-test/r/order_by.result@1.51.1.1, 2006-08-14 15:45:41+03:00, gkodinov@macbook.gmz +37 -0
    Bug #21302: Result not properly sorted when using an ORDER BY on a second 
                table in a join
     - test case

  mysql-test/t/order_by.test@1.37, 2006-08-14 15:45:42+03:00, gkodinov@macbook.gmz +32 -0
    Bug #21302: Result not properly sorted when using an ORDER BY on a second 
                table in a join
     - test case

  sql/sql_select.cc@1.312.1.128, 2006-08-14 15:45:43+03:00, gkodinov@macbook.gmz +2 -1
    Bug #21302: Result not properly sorted when using an ORDER BY on a second 
                table in a join
     - don't remove columns of const tables in ORDER BY if the const table 
       is an outer table.

ChangeSet@1.2255.22.3, 2006-08-14 16:15:08+04:00, kostja@bodhi.local +1 -0
  Windows build fix: declare _db_set_ before it's used.

  dbug/dbug.c@1.30, 2006-08-14 16:15:06+04:00, kostja@bodhi.local +50 -51
    Windows build fix: declare _db_set_ before it's used.

ChangeSet@1.1616.2720.2, 2006-08-14 17:05:02+05:00, svoj@may.pils.ru +3 -0
  BUG#18874 - Setting myisam_repair_threads > 1, index cardinality always 1
  Fixed by moving update_key_parts() down to be after write_index().

  mysql-test/r/repair.result@1.14.1.3, 2006-08-14 17:04:59+05:00, svoj@may.pils.ru +11 -0
    Test case for bug#18874.

  mysql-test/t/repair.test@1.12.1.3, 2006-08-14 17:04:59+05:00, svoj@may.pils.ru +11 -0
    Test case for bug#18874.

  myisam/sort.c@1.35.1.11, 2006-08-14 17:04:59+05:00, svoj@may.pils.ru +5 -7
    write_index() collects index statistic which is further used in
    update_key_parts(). Thus update_key_parts() must be called after
    write_index().

ChangeSet@1.2255.24.1, 2006-08-14 13:52:05+02:00, mats@romeo.(none) +2 -0
  Fixing unit test execution script to work with AIX 5.2 and OS X machines.
  These are using old version of the Test::Harness modules, so I resort
  to a safer way of running executable files.

  unittest/README.txt@1.4, 2006-08-14 13:52:00+02:00, mats@romeo.(none) +7 -0
    Adding reference to Doxygen-generated documentation on the intranet.

  unittest/unit.pl@1.5, 2006-08-14 13:52:00+02:00, mats@romeo.(none) +1 -25
    Using environment HARNESS_PERL_SWITCHES instead of a replacement
    straps

ChangeSet@1.1810.2013.2, 2006-08-14 18:33:41+08:00, Justin.He@qa3-104.qa.cn.tlan +2 -0
  BUG#19045, No meaningfull error message when defining too many nodes

  ndb/src/mgmsrv/ConfigInfo.cpp@1.60.18.1, 2006-08-14 18:33:35+08:00, Justin.He@qa3-104.qa.cn.tlan +9 -2
    add maximum node number judging in transformNode

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.73.31.1, 2006-08-14 18:33:36+08:00, Justin.He@qa3-104.qa.cn.tlan +4 -1
    if configure filename isnot null, display it

ChangeSet@1.1810.2014.1, 2006-08-14 03:29:17-07:00, brian@zim.(none) +3 -0
  Fix for bug#20648 We introduce a new field method for knowing "real size", and we now in archive null unused bits of a row to null before writing. 

  sql/field.cc@1.256.1.65, 2006-08-14 03:29:13-07:00, brian@zim.(none) +5 -0
    data_length for field needs to be calculated directly.

  sql/field.h@1.153.12.2, 2006-08-14 03:29:13-07:00, brian@zim.(none) +6 -0
    The new method data_length() returns the "real" length of the field.

  sql/ha_archive.cc@1.60.3.1, 2006-08-14 03:29:13-07:00, brian@zim.(none) +22 -0
    Before a write_row() archive nulls space beyond the size of the row in varchars to make sure that compression only sees NULL. 

ChangeSet@1.2255.17.5, 2006-08-14 03:26:53-07:00, brian@zim.(none) +4 -0
  Updated row result, and fix for Windows build.

  CMakeLists.txt@1.21, 2006-08-14 03:26:50-07:00, brian@zim.(none) +0 -3
    Fix for Windows build

  mysql-test/r/binlog_row_binlog.result@1.5, 2006-08-14 03:26:50-07:00, brian@zim.(none) +3 -3
    Updated row result

  mysql-test/r/multi_update.result@1.46, 2006-08-14 03:26:50-07:00, brian@zim.(none) +1 -1
    Updated row result

  mysql-test/t/multi_update.test@1.52, 2006-08-14 03:26:50-07:00, brian@zim.(none) +1 -1
    Updated row result

ChangeSet@1.2255.22.2, 2006-08-14 13:27:11+04:00, kostja@bodhi.local +30 -0
  Manual merge 5.0->5.1. Post-merge fixes.

  client/mysqldump.c@1.245, 2006-08-14 13:27:03+04:00, kostja@bodhi.local +9 -9
    A post-merge fix - 'sock' was renamed to 'mysql'

  mysql-test/r/events_bugs.result@1.11.1.1, 2006-08-14 13:27:03+04:00, kostja@bodhi.local +5 -5
    A post merge fix: now we strip rear comments from the query before
    it gets into the log.

  mysql-test/r/func_group.result@1.51, 2006-08-14 13:27:03+04:00, kostja@bodhi.local +2 -2
    A post merge fix: default clause is now printed uppercase.

  mysql-test/r/im_life_cycle.result@1.12, 2006-08-14 13:27:03+04:00, kostja@bodhi.local +3 -8
    Fix my mistake in manual resolve.

  mysql-test/r/mysqlcheck.result@1.10, 2006-08-14 13:27:03+04:00, kostja@bodhi.local +1 -0
    use test; - after we drop client_test_db there is no current database.
    This cleanup is present in 5.1 only, but the test that was added in 
    5.0 assumes there is a current database, test.

  mysql-test/r/mysqldump.result@1.119, 2006-08-14 13:27:03+04:00, kostja@bodhi.local +0 -5
    Ignore results of execution of mysqldump: we can't rely on 
    MASTER_LOG_POS in test results, it's different for statement
    and row level logging.

  mysql-test/r/mysqlshow.result@1.5, 2006-08-14 13:27:03+04:00, kostja@bodhi.local +14 -0
    A post-merge fix: information schema contains a few more tables
    in 5.1

  mysql-test/r/mysqltest.result@1.41, 2006-08-14 13:27:03+04:00, kostja@bodhi.local +1 -0
    A post merge fix: add 5.1 test end separator.

  mysql-test/r/ndb_basic.result@1.45, 2006-08-14 13:27:03+04:00, kostja@bodhi.local +2 -1
    A post-merge fix: add test end separators.

  mysql-test/r/rpl_switch_stm_row_mixed.result@1.13, 2006-08-14 13:27:04+04:00, kostja@bodhi.local +1 -1
    A post merge fix: length of varbinary column is now 3 times less.
    Assuming a side effect of some other change. Length of any
    field is not relevant in this test.

  mysql-test/r/rpl_view.result@1.10, 2006-08-14 13:27:04+04:00, kostja@bodhi.local +1 -0
    Add an end of test marker.

  mysql-test/r/show_check.result@1.101, 2006-08-14 13:27:04+04:00, kostja@bodhi.local +4 -17
    Remove duplicate results. Add results from a merged test case.

  mysql-test/r/sp-error.result@1.114, 2006-08-14 13:27:04+04:00, kostja@bodhi.local +2 -0
    Add test end separators.

  mysql-test/r/sp-security.result@1.36, 2006-08-14 13:27:04+04:00, kostja@bodhi.local +1 -0
    Post-merge fix: use test after the current database is dropped.

  mysql-test/r/sp.result@1.219, 2006-08-14 13:27:04+04:00, kostja@bodhi.local +1 -34
    Remove a duplicate result (bad merge that left a copy of
    the test case for Bug#19862 in the test suite).

  mysql-test/r/strict.result@1.32.1.2, 2006-08-14 13:27:04+04:00, kostja@bodhi.local +6 -6
    An after-merge fix for a new test case: in 5.1 we issue a more accurate
    error message: "Incorrect value" instead of "Truncated value". I reason
    it so that in case of an error nothing is truncated, really.
    Also found similar changes in other test cases.

  mysql-test/r/type_datetime.result@1.34, 2006-08-14 13:27:04+04:00, kostja@bodhi.local +1 -1
    Fix the text of an error.

  mysql-test/r/union.result@1.89, 2006-08-14 13:27:04+04:00, kostja@bodhi.local +1 -1
    A post-merge fix: CHARACTER SET is now uppercase.

  mysql-test/t/mysqlcheck.test@1.6, 2006-08-14 13:27:04+04:00, kostja@bodhi.local +1 -0
    A post-merge fix: use test, after current database is dropped, there
    is no current database.

  mysql-test/t/mysqldump.test@1.113, 2006-08-14 13:27:04+04:00, kostja@bodhi.local +2 -0
    Disable result log: it's dependent on binlog position.

  mysql-test/t/sp-security.test@1.37, 2006-08-14 13:27:04+04:00, kostja@bodhi.local +1 -2
    use test

  sql/item_sum.cc@1.188, 2006-08-14 13:27:04+04:00, kostja@bodhi.local +1 -1
    Adjust the call to the constructor after the merge.

  sql/sp_head.cc@1.232, 2006-08-14 13:27:04+04:00, kostja@bodhi.local +4 -26
    Add a missing DBUG_VOID_RETURN, move security checks out of
    execute_trigger to Table_triggers_list: in 5.1 we check for
    TRIGGER privilege, not SUPER privilege to execute triggers, so these
    checks lack table context inside execute_trigger and have to be
    performed when we have table object on hand.

  sql/sql_db.cc@1.138.3.2, 2006-08-14 13:27:05+04:00, kostja@bodhi.local +8 -6
    A post-merge fix: adjust load_db_opt_by_name and check_db_dir_existence
    (new functions added in 5.0) to be tablename-to-filename encoding 
    friendly.

  sql/sql_lex.cc@1.190.1.6, 2006-08-14 13:27:05+04:00, kostja@bodhi.local +1 -1
    A post-merge fix: make skip_rear_comments operate on const uchar *s.

  sql/sql_lex.h@1.234.1.9, 2006-08-14 13:27:05+04:00, kostja@bodhi.local +1 -1
    A post-merge fix.

  sql/sql_show.cc@1.354.5.2, 2006-08-14 13:27:05+04:00, kostja@bodhi.local +1 -17
    A post-merge fix: fix a bad merge, rename orig_sql_command -> sql_command.

  sql/sql_trigger.cc@1.63.1.2, 2006-08-14 13:27:05+04:00, kostja@bodhi.local +36 -1
    A post-merge fix: move security checks to process_triggers
    from execute_trigger.

  sql/sql_view.cc@1.99.1.2, 2006-08-14 13:27:05+04:00, kostja@bodhi.local +4 -4
    Adjust to the new signature of skip_rear_comments.

  sql/sql_yacc.yy@1.484.7.3, 2006-08-14 13:27:05+04:00, kostja@bodhi.local +1 -1
    Adjust to the new signature of init_strings.

ChangeSet@1.1616.2144.184, 2006-08-14 12:59:54+05:00, ramil@mysql.com +2 -0
  Make the heap_btree test repeatable.

  mysql-test/r/heap_btree.result@1.13.2.2, 2006-08-14 12:59:51+05:00, ramil@mysql.com +7 -7
    Make the heap_btree test repeatable.
      - 'order by' added where we don't use the 'a' index.

  mysql-test/t/heap_btree.test@1.12.1.3, 2006-08-14 12:59:51+05:00, ramil@mysql.com +3 -3
    Make the heap_btree test repeatable.
      - 'order by' added where we don't use the 'a' index.

ChangeSet@1.1616.2144.183, 2006-08-14 10:54:24+05:00, ramil@mysql.com +1 -0
  Restore alphabetical order of the system variables.
  

  sql/set_var.cc@1.34.52.41, 2006-08-14 10:54:20+05:00, ramil@mysql.com +1 -1
    Restore alphabetical order of the system variables.
      - moved the have_merge_engine variable.

ChangeSet@1.2255.17.4, 2006-08-13 22:28:41-07:00, brian@zim.(none) +16 -0
  Fixed warning message breakage.
  Fixed install breakage (my own fault)
  Edited exampled cnf to remove bdb references. 

  mysql-test/r/backup.result@1.17.1.1, 2006-08-13 22:28:36-07:00, brian@zim.(none) +11 -11
    fix warnings

  mysql-test/r/im_options.result@1.4, 2006-08-13 22:28:36-07:00, brian@zim.(none) +0 -2
    Remove missed bdb skip

  mysql-test/r/im_utils.result@1.7.1.1, 2006-08-13 22:28:36-07:00, brian@zim.(none) +0 -2
    Remove missed bdb-skip

  mysql-test/r/log_tables.result@1.8, 2006-08-13 22:28:36-07:00, brian@zim.(none) +8 -8
    Fix warnings

  mysql-test/r/show_check.result@1.99.1.1, 2006-08-13 22:28:37-07:00, brian@zim.(none) +1 -1
    Fix warnings

  mysql-test/r/sp_trans.result@1.13, 2006-08-13 22:28:37-07:00, brian@zim.(none) +1 -1
    Fix warning

  mysql-test/r/type_timestamp.result@1.34, 2006-08-13 22:28:37-07:00, brian@zim.(none) +7 -7
    Fix warning

  mysql-test/r/warnings.result@1.44.1.1, 2006-08-13 22:28:37-07:00, brian@zim.(none) +1 -1
    Fix warning

  mysql-test/t/disabled.def@1.184.2.1, 2006-08-13 22:28:37-07:00, brian@zim.(none) +1 -0
    Disabled Federation test

  mysql-test/t/federated_transactions.test@1.4.1.1, 2006-08-13 22:28:37-07:00, brian@zim.(none) +1 -2
    Fixed comments in federation test

  netware/mysql_install_db.c@1.6, 2006-08-13 22:28:37-07:00, brian@zim.(none) +0 -1
    Fix install breakage. 

  netware/mysql_test_run.c@1.21, 2006-08-13 22:28:37-07:00, brian@zim.(none) +0 -1
    Fix install breakage. 

  scripts/mysql_install_db.sh@1.66, 2006-08-13 22:28:37-07:00, brian@zim.(none) +1 -1
    Fix install breakage

  storage/myisam/ftbench/ft-test-run.sh@1.5, 2006-08-13 22:28:37-07:00, brian@zim.(none) +1 -1
    Fixed test which is never run

  support-files/my-innodb-heavy-4G.cnf.sh@1.10, 2006-08-13 22:28:37-07:00, brian@zim.(none) +0 -8
    Modified examples

  support-files/my-small.cnf.sh@1.21, 2006-08-13 22:28:37-07:00, brian@zim.(none) +0 -3
    Modified examples

ChangeSet@1.1616.2724.1, 2006-08-11 17:09:19-06:00, tsmith@siva.hindu.god +4 -0
  Bug #20536: md5() with GROUP BY and UCS2 return different results on myisam/innodb
  
  Make the encryption functions MD5(), SHA1() and ENCRYPT() return binary results.
      
  Make MAKE_SET() and EXPORT_SET() use the correct character set for their default separator strings.

  mysql-test/r/ctype_ucs.result@1.11.1.20, 2006-08-11 17:09:17-06:00, tsmith@siva.hindu.god +43 -0
    Add tests for bug #20536.

  mysql-test/t/ctype_ucs.test@1.15.1.16, 2006-08-11 17:09:17-06:00, tsmith@siva.hindu.god +40 -1
    Add tests for bug #20536.
    
    Tests showing correct behavior for MD5(), SHA1(), MAKE_SET() and EXPORT_SET().
    
    Also, tests showing incorrect behavior, which will remain "Won't fix", for
    PASSWORD(), OLD_PASSWORD(), ENCRYPT() and QUOTE().

  sql/item_strfunc.cc@1.196.11.1, 2006-08-11 17:09:17-06:00, tsmith@siva.hindu.god +10 -4
    Make the encryption functions MD5(), SHA1() and ENCRYPT() return binary results.
    
    Make MAKE_SET() and EXPORT_SET() use the correct character set for their default separator strings.

  sql/item_strfunc.h@1.73.4.1, 2006-08-11 17:09:17-06:00, tsmith@siva.hindu.god +22 -4
    Make the encryption functions MD5(), SHA1() and ENCRYPT() return binary results.

ChangeSet@1.1810.2012.1, 2006-08-11 15:31:06-04:00, cmiller@zippy.cornsilk.net +1 -0
  Bug#21224: mysql_upgrade uses possibly insecure temporary files
  
  We open for writing a known location, which is exploitable with a symlink
  attack.  Now, use the EXCLusive flag, so that the presence of anything at 
  that location causes a failure.  Try once to open safely, and if failure 
  then remove that location and try again to open safely.  If both fail, then
  raise an error.

  client/mysql_upgrade.c@1.3.2.1, 2006-08-11 15:31:04-04:00, cmiller@zippy.cornsilk.net +14 -2
    Open the file with the O_EXCL flag, so that a symlink attack would not work.
    
    If opening it fails, try removing something at that location, and try again.
    If the second time fails, then abort as previous.

ChangeSet@1.2181.139.18, 2006-08-11 16:51:50+02:00, andrey@example.com +1 -0
  Fix a crash of SHOW PROCESSLIST

  sql/event_scheduler.cc@1.20, 2006-08-11 16:51:44+02:00, andrey@example.com +6 -3
    Fix a crash when calling show processlist and an event thread is starting.
    Don't add the thread to threads before it is fully initialized.

ChangeSet@1.2255.19.2, 2006-08-11 09:49:01-04:00, cmiller@zippy.cornsilk.net +1 -0
  Bug#18875: Default value of tmp_table_size is meaningless
  
  It makes no sense to have a default tmp_table_size larger than the 
  max_heap_table_size .  In usage, the tmp is ever limited to the max value, 
  so I lowered the default tmp to the default max value.
  
  A great idea would be to emit a warning when the tmp_table_size is set to 
  greater than max_heap_table_size .

  sql/mysqld.cc@1.564.7.1, 2006-08-11 09:48:59-04:00, cmiller@zippy.cornsilk.net +1 -1
    Lowered tmp_table_size default to be the same as max_heap_table_size default.

ChangeSet@1.2255.19.1, 2006-08-11 09:27:44-04:00, cmiller@zippy.cornsilk.net +1 -0
  German translations.

  sql/share/errmsg.txt@1.110.3.2, 2006-08-11 09:27:42-04:00, cmiller@zippy.cornsilk.net +5204 -5099
    Merged by hand German translations as sent by Stefan.
    
    Normalized indentation by expanding tabs to spaces.

ChangeSet@1.2255.12.11, 2006-08-11 18:01:46+08:00, justin.he@qa3-104.qa.cn.tlan +1 -0
  BUG#20848

  sql/ha_ndbcluster.cc@1.346.1.3, 2006-08-11 18:01:39+08:00, justin.he@qa3-104.qa.cn.tlan +5 -4
    post merge fix

ChangeSet@1.1810.2009.8, 2006-08-11 14:41:07+05:00, svoj@may.pils.ru +2 -0
  Extended a test case for bug#7391.

  mysql-test/r/grant.result@1.37.7.2, 2006-08-11 14:41:04+05:00, svoj@may.pils.ru +1 -0
    Extended a test case for bug#7391.

  mysql-test/t/grant.test@1.41.3.2, 2006-08-11 14:41:04+05:00, svoj@may.pils.ru +2 -0
    Extended a test case for bug#7391.

ChangeSet@1.1616.2723.1, 2006-08-11 13:19:44+05:00, bar@mysql.com +4 -0
  mysqld --collation-server=xxx --character-set-server=yyy
  didn't work as expected: collation_server was set not to xxx,
  but to the default collation of character set "yyy".
      
  With different argument order it worked as expected:
  mysqld --character-set-server=yyy --collation-server=yyy 
      
  Fix:
  initializate default_collation_name to 0
  when processing --character-set-server
  only if --collation-server has not been specified
  in command line.

  mysql-test/r/ctype_ucs2_def.result@1.1.1.1, 2006-08-11 13:19:40+05:00, bar@mysql.com +3 -0
    Adding test cast

  mysql-test/t/ctype_ucs2_def-master.opt@1.1.1.1, 2006-08-11 13:19:40+05:00, bar@mysql.com +1 -1
    Adding test case

  mysql-test/t/ctype_ucs2_def.test@1.1.1.1, 2006-08-11 13:19:40+05:00, bar@mysql.com +5 -0
    Adding test case

  sql/mysqld.cc@1.356.98.28, 2006-08-11 13:19:40+05:00, bar@mysql.com +4 -2
    Don't clear default_collation_name when processing 
    --character-set-server if collation has already
    been specified using --collation-server
    

ChangeSet@1.1616.2144.181, 2006-08-11 13:14:26+05:00, bar@mysql.com +1 -0
  Bug#7192 Specify --with-collation doesn't work for connections?
  --with-collation worked only on the server side.
  Client side ignored this argument, so collation_connection
  was not properly set (remained latin1_swedish_ci).
  

  sql-common/client.c@1.46.1.45, 2006-08-11 13:14:24+05:00, bar@mysql.com +31 -2
    - Take into account MYSQL_DEFAULT_COLLATION_NAME if
    character set is not set using mysql_option(), to
    honor --with-collation argument to configure.
    - Use default collation for the character set when it's
    not set using mysql_option().
    

ChangeSet@1.1810.2011.1, 2006-08-11 15:10:08+08:00, justin.he@qa3-104.qa.cn.tlan +1 -0
  BUG#20848 SHOW STATUS LIKE 'NDB%' should be data nodes not storage nodes
  
  use correct termninology

  sql/ha_ndbcluster.cc@1.175.47.1, 2006-08-11 15:10:03+08:00, justin.he@qa3-104.qa.cn.tlan +3 -3
    just replace 'number_of_storage_nodes' with 'number_of_data_nodes'

ChangeSet@1.2255.17.2, 2006-08-10 18:29:25-07:00, baker@zim.(none) +34 -0
  Removed bdb test cases. 

  BitKeeper/deleted/.del-bdb-alter-table-1.result@1.4, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/r/bdb-alter-table-1.result -> BitKeeper/deleted/.del-bdb-alter-table-1.result

  BitKeeper/deleted/.del-bdb-alter-table-1.test@1.6, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/t/bdb-alter-table-1.test -> BitKeeper/deleted/.del-bdb-alter-table-1.test

  BitKeeper/deleted/.del-bdb-alter-table-2-master.opt@1.4, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/t/bdb-alter-table-2-master.opt -> BitKeeper/deleted/.del-bdb-alter-table-2-master.opt

  BitKeeper/deleted/.del-bdb-alter-table-2.result@1.3, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/r/bdb-alter-table-2.result -> BitKeeper/deleted/.del-bdb-alter-table-2.result

  BitKeeper/deleted/.del-bdb-alter-table-2.test@1.4, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/t/bdb-alter-table-2.test -> BitKeeper/deleted/.del-bdb-alter-table-2.test

  BitKeeper/deleted/.del-bdb-crash.result@1.11, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/r/bdb-crash.result -> BitKeeper/deleted/.del-bdb-crash.result

  BitKeeper/deleted/.del-bdb-crash.test@1.13, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/t/bdb-crash.test -> BitKeeper/deleted/.del-bdb-crash.test

  BitKeeper/deleted/.del-bdb-deadlock.result@1.9, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/r/bdb-deadlock.result -> BitKeeper/deleted/.del-bdb-deadlock.result

  BitKeeper/deleted/.del-bdb-deadlock.test@1.10, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/t/bdb-deadlock.test -> BitKeeper/deleted/.del-bdb-deadlock.test

  BitKeeper/deleted/.del-bdb-deadlock.tminus@1.3, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/t/bdb-deadlock.tminus -> BitKeeper/deleted/.del-bdb-deadlock.tminus

  BitKeeper/deleted/.del-bdb.result@1.58, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/r/bdb.result -> BitKeeper/deleted/.del-bdb.result

  BitKeeper/deleted/.del-bdb.test@1.57, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/t/bdb.test -> BitKeeper/deleted/.del-bdb.test

  BitKeeper/deleted/.del-bdb_cache-master.opt~e54093fff2e73631@1.4, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/t/bdb_cache-master.opt -> BitKeeper/deleted/.del-bdb_cache-master.opt~e54093fff2e73631

  BitKeeper/deleted/.del-bdb_cache.result~5767ff4f4b228a66@1.6, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/r/bdb_cache.result -> BitKeeper/deleted/.del-bdb_cache.result~5767ff4f4b228a66

  BitKeeper/deleted/.del-bdb_cache.test~818df448403a5598@1.9, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/t/bdb_cache.test -> BitKeeper/deleted/.del-bdb_cache.test~818df448403a5598

  BitKeeper/deleted/.del-bdb_gis.result@1.9, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/r/bdb_gis.result -> BitKeeper/deleted/.del-bdb_gis.result

  BitKeeper/deleted/.del-bdb_gis.test@1.3, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/t/bdb_gis.test -> BitKeeper/deleted/.del-bdb_gis.test

  BitKeeper/deleted/.del-have_bdb.inc@1.3, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/include/have_bdb.inc -> BitKeeper/deleted/.del-have_bdb.inc

  BitKeeper/deleted/.del-have_bdb.require@1.3, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/r/have_bdb.require -> BitKeeper/deleted/.del-have_bdb.require

  BitKeeper/deleted/.del-index_merge_bdb.result@1.6, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/r/index_merge_bdb.result -> BitKeeper/deleted/.del-index_merge_bdb.result

  BitKeeper/deleted/.del-index_merge_bdb.test@1.6, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/t/index_merge_bdb.test -> BitKeeper/deleted/.del-index_merge_bdb.test

  BitKeeper/deleted/.del-ps_6bdb.result@1.47, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/r/ps_6bdb.result -> BitKeeper/deleted/.del-ps_6bdb.result

  BitKeeper/deleted/.del-ps_6bdb.test@1.5, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/t/ps_6bdb.test -> BitKeeper/deleted/.del-ps_6bdb.test

  BitKeeper/deleted/.del-rowid_order_bdb.result@1.5, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/r/rowid_order_bdb.result -> BitKeeper/deleted/.del-rowid_order_bdb.result

  BitKeeper/deleted/.del-rowid_order_bdb.test@1.4, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: mysql-test/t/rowid_order_bdb.test -> BitKeeper/deleted/.del-rowid_order_bdb.test

  BitKeeper/deleted/.del-sql_manager.h@1.3, 2006-08-10 18:27:55-07:00, baker@zim.(none) +0 -0
    Rename: sql/sql_manager.h -> BitKeeper/deleted/.del-sql_manager.h

  libmysqld/Makefile.am@1.94.1.3, 2006-08-10 18:29:23-07:00, baker@zim.(none) +1 -5
    Removed bdb from the engine

  mysql-test/extra/binlog_tests/binlog.test@1.12, 2006-08-10 18:29:23-07:00, baker@zim.(none) +1 -2
    Removed bdb support

  mysql-test/r/binlog_stm_binlog.result@1.12, 2006-08-10 18:29:23-07:00, baker@zim.(none) +3 -3
    Updated results

  mysql-test/r/ctype_utf8.result@1.96, 2006-08-10 18:29:23-07:00, baker@zim.(none) +4 -4
    Removed bdb support

  mysql-test/t/ctype_utf8.test@1.87, 2006-08-10 18:29:23-07:00, baker@zim.(none) +4 -4
    Removed bdb support

  sql/CMakeLists.txt@1.23.1.2, 2006-08-10 18:29:23-07:00, baker@zim.(none) +1 -1
    Removed file for Windows build

  sql/Makefile.am@1.145.1.4, 2006-08-10 18:29:23-07:00, baker@zim.(none) +1 -1
    Removed unneeded include file. 

  sql/sql_manager.cc@1.8, 2006-08-10 18:29:23-07:00, baker@zim.(none) +0 -1
    Removed include file.

ChangeSet@1.1810.2010.3, 2006-08-10 17:39:01-05:00, Reggie@xgeek. +1 -0
  Some small cleanups that will help get mysql_client_test passing on Windows

  tests/mysql_client_test.c@1.167.1.31, 2006-08-10 17:38:26-05:00, Reggie@xgeek. +7 -2
    set sql_mode to '' in a few places
    explicitly select myisam table type for fulltext
    use memcpy instead of strcpy since our src buffer is not zero terminated.

ChangeSet@1.1346.1.847, 2006-08-10 22:41:19+03:00, monty@mysql.com +8 -0
  Better bug fix for #14400 "Query joins wrong rows from table which is subject of "concurrent insert""
  The previous bug fix didn't work when using partial keys.
  Don't use GNUC min/max operations are they are depricated.
  Fixed valgrind warning

  BitKeeper/etc/ignore@1.107.1.61, 2006-08-10 22:41:12+03:00, monty@mysql.com +1 -2
    Added */.libs/*

  BitKeeper/etc/ignore@1.107.1.60, 2006-08-10 22:37:01+03:00, monty@mysql.com +1 -0
    added *.Plo

  BitKeeper/etc/ignore@1.107.1.59, 2006-08-10 22:35:50+03:00, monty@mysql.com +1 -0
    added *.Po

  BitKeeper/etc/ignore@1.107.1.58, 2006-08-10 22:35:42+03:00, monty@mysql.com +1 -0
    added .deps

  BitKeeper/etc/ignore@1.107.1.57, 2006-08-10 22:33:59+03:00, monty@mysql.com +1 -0
    added */.deps

  BitKeeper/etc/ignore@1.107.1.56, 2006-08-10 22:32:00+03:00, monty@mysql.com +1 -0
    added .deps

  include/my_global.h@1.34.1.41, 2006-08-10 22:41:14+03:00, monty@mysql.com +1 -4
    Don't use GNUC min/max operations are they are depricated

  mysql-test/r/myisam.result@1.10.1.22, 2006-08-10 22:41:16+03:00, monty@mysql.com +15 -0
    Added test case for #14400

  mysql-test/t/myisam.test@1.7.1.21, 2006-08-10 22:41:17+03:00, monty@mysql.com +17 -0
    Added test case for #14400

  sql/sql_select.cc@1.152.1.144, 2006-08-10 22:41:18+03:00, monty@mysql.com +12 -2
    Fixed valgrind warning (in field_string::val_int())

  myisam/mi_rkey.c@1.11.1.5, 2006-08-10 22:41:15+03:00, monty@mysql.com +30 -23
    Better bug fix for #14400 "Query joins wrong rows from table which is subject of "concurrent insert""
    The previous bug fix didn't work when using partial keys.

  myisam/mi_test_all.res@1.3.1.1, 2006-08-10 22:41:15+03:00, monty@mysql.com +42 -42
    Updated results to match mi_test_all.sh

  myisam/mi_test_all.sh@1.7.1.1, 2006-08-10 22:41:15+03:00, monty@mysql.com +2 -1
    Removed confusing warning

ChangeSet@1.1810.2009.6, 2006-08-10 12:39:18-04:00, cmiller@zippy.cornsilk.net +6 -0
  Merge updates.

  BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3@1.2.1.1, 2006-08-10 12:38:10-04:00, cmiller@zippy.cornsilk.net +0 -0
    Delete: mysql-test/r/bug20328.result

  BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5@1.2.1.1, 2006-08-10 12:27:38-04:00, cmiller@zippy.cornsilk.net +0 -0
    Delete: mysql-test/t/bug20328.test

  mysql-test/r/mysql_client.result@1.4, 2006-08-10 10:48:30-04:00, cmiller@zippy.cornsilk.net +8 -4
    Merge update: Help options changed between versions.

  mysql-test/r/grant2.result@1.25.2.6, 2006-08-10 10:48:30-04:00, cmiller@zippy.cornsilk.net +2 -2
    Merge update:  Change between versions, it appears.

  mysql-test/r/heap_btree.result@1.18.1.4, 2006-08-10 10:48:30-04:00, cmiller@zippy.cornsilk.net +10 -10
    Merge update:  Add deterministic ordering of data, as the order is different 
    between versions.

  mysql-test/t/heap_btree.test@1.19, 2006-08-10 10:48:30-04:00, cmiller@zippy.cornsilk.net +6 -6
    Merge update:  Add deterministic ordering of data, as the order is different 
    between versions.

ChangeSet@1.1810.1993.5, 2006-08-10 17:35:21+03:00, gkodinov@macbook.gmz +1 -0
  Fix for check_cpu to work correctly on MacOSX/Intel.

  BUILD/check-cpu@1.13.1.1, 2006-08-10 17:35:16+03:00, gkodinov@macbook.gmz +5 -1
    Fix for check_cpu to work correctly on MacOSX/Intel.

ChangeSet@1.2265, 2006-08-10 16:12:54+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21172
    Handle also open && !OM_INIT wrt non function O_DIRECT

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp@1.34, 2006-08-10 16:12:52+02:00, jonas@perch.ndb.mysql.com +50 -14
    Fix open wrt O_DIRECT

ChangeSet@1.1616.2722.1, 2006-08-10 16:45:02+03:00, gkodinov@macbook.gmz +6 -0
  Bug #16792 query with subselect, join, and group not returning proper values
   Treat queries with no FROM and aggregate functions as normal queries,
  so the aggregate function get correctly calculated as if there is 1 row. 
  This means that they will be considered to have one row, so COUNT(*) will return
  1 instead of 0. Other aggregates will behave in compatible manner.

  mysql-test/r/func_gconcat.result@1.27.1.20, 2006-08-10 16:44:52+03:00, gkodinov@macbook.gmz +2 -2
    Bug #16792 query with subselect, join, and group not returning proper values
     - test case. Note how it improves the support for DUAL.

  mysql-test/r/func_group.result@1.22.7.2, 2006-08-10 16:44:53+03:00, gkodinov@macbook.gmz +20 -4
    Bug #16792 query with subselect, join, and group not returning proper values
     - test case. Note how it improves the support for DUAL.

  mysql-test/r/subselect.result@1.67.64.1, 2006-08-10 16:44:53+03:00, gkodinov@macbook.gmz +2 -2
    Bug #16792 query with subselect, join, and group not returning proper values
     - consequence of (SELECT MAX(<const>)) now returning <const> instead of 0

  mysql-test/t/func_group.test@1.24.3.1, 2006-08-10 16:44:54+03:00, gkodinov@macbook.gmz +14 -0
    Bug #16792 query with subselect, join, and group not returning proper values
     - test case.

  sql/opt_sum.cc@1.33.6.2, 2006-08-10 16:44:55+03:00, gkodinov@macbook.gmz +2 -2
    Bug #16792 query with subselect, join, and group not returning proper values
     - cannot do the optimization if the index is already opened by (say) UPDATE
       as it invloves opening reading and closing the index.

  sql/sql_select.cc@1.216.126.14, 2006-08-10 16:44:55+03:00, gkodinov@macbook.gmz +15 -5
    Bug #16792 query with subselect, join, and group not returning proper values
     - Treat queries with no FROM and aggregate functions as normal queries,
    so the aggregate function get correctly calculated as if there is 1 row. 

ChangeSet@1.1616.2721.1, 2006-08-10 15:37:24+02:00, tnurnberg@salvation.intern.azundris.com +3 -0
  Bug#19844: time_format in Union truncates values
  
  time_format() claimed %H and %k would return at most two digits
  (hours 0-23), but this coincided neither with actual behaviour
  nor with docs.  this is not visible in simple queries; forcing
  a temp-table is probably the easiest way to see this.  adjusted
  the return-length appropriately; the alternative would be to
  adjust the docs to say that behaviour for > 99 hours is undefined.
  ---
  Bug#19844: time_format in Union truncates values
  
  time_format() claimed %H and %k would return at most two digits
  (hours 0-23), but this coincided neither with actual behaviour
  nor with docs.  this is not visible in simple queries; forcing
  a temp-table is probably the easiest way to see this.  adjusted
  the return-length appropriately; the alternative would be to
  adjust the docs to say that behaviour for > 99 hours is undefined.

  mysql-test/r/func_time.result@1.23.6.1, 2006-08-10 15:37:22+02:00, tnurnberg@salvation.intern.azundris.com +21 -0
    Bug#19844: time_format in Union truncates values
    
    show time_format() handles %H and %k correctly four > 99 hours

  mysql-test/t/func_time.test@1.21.5.1, 2006-08-10 15:37:22+02:00, tnurnberg@salvation.intern.azundris.com +19 -1
    Bug#19844: time_format in Union truncates values
    
    show time_format() handles %H and %k correctly four > 99 hours

  sql/item_timefunc.cc@1.51.6.1, 2006-08-10 15:37:22+02:00, tnurnberg@salvation.intern.azundris.com +4 -2
    Bug#19844: time_format in Union truncates values
    
    unbreak promises we make about field-length of %H and %k in
    time_format() so they coincide with the actual range rather
    than just 0..23. the docs say we must operate outside that
    range, so we'd better do it right.
    ---
    Bug#19844: time_format in Union truncates values
    
    unbreak promises we make about field-length of %H and %k in
    time_format() so they coincide with the actual range rather
    than just 0..23. the docs say we must operate outside that
    range, so we'd better do it right.
    One digit values are padded to two digits with %H, "longer"
    values are handled correctly up to seven digits including
    any sign.
    (clarified comments as per jimw's suggestion.)

ChangeSet@1.2255.16.2, 2006-08-10 13:49:37+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21283 - merge disabled.def

  mysql-test/t/disabled.def@1.185, 2006-08-10 13:49:35+02:00, jonas@perch.ndb.mysql.com +0 -1
    merge

ChangeSet@1.2181.182.1, 2006-08-10 13:33:49+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21283
    this test in its current form depend on binlog format row

  mysql-test/t/ndb_autodiscover3.test@1.4.1.3, 2006-08-10 13:33:48+02:00, jonas@perch.ndb.mysql.com +3 -0
    ndb - bug#21283
      this test in its current form depend on binlog format row

ChangeSet@1.2255.13.6, 2006-08-10 12:26:43+02:00, andrey@example.com +1 -0
  revert part of the code
  how did it get in?!? (it's only in local csets so no other tree is affected)

  sql/sp.cc@1.118, 2006-08-10 12:26:40+02:00, andrey@example.com +0 -11
    revert this patch.
    how did it get in?!? (it's only in local csets so no other tree is affected)

ChangeSet@1.1616.2144.180, 2006-08-10 15:06:22+05:00, ramil@mysql.com +3 -0
  Fix for bug #20709: Collation not used in group by on 4.1.    
  
  myisam/mi_uniue.c:mi_check_unique() should skip trailing spaces comparing 
  TEXT and VARTTEXT key segments.

  mysql-test/r/ctype_utf8.result@1.45.6.5, 2006-08-10 15:06:20+05:00, ramil@mysql.com +16 -0
    Fix for bug #20709: Collation not used in group by on 4.1.    
      - test results.

  mysql-test/t/ctype_utf8.test@1.57.6.5, 2006-08-10 15:06:20+05:00, ramil@mysql.com +14 -0
    Fix for bug #20709: Collation not used in group by on 4.1.    
      - test case.

  myisam/mi_unique.c@1.20.1.2, 2006-08-10 15:06:20+05:00, ramil@mysql.com +1 -1
    Fix for bug #20709: Collation not used in group by on 4.1.    
    
    myisam/mi_uniue.c:mi_check_unique() should skip trailing spaces comparing 
    TEXT and VARTTEXT key segments.
      
    Example: assume, we have a 'char(200) collate utf8_unicode_ci' field,
    there are two records with _utf8"0x65" and _utf8"0xC3A9" characters;
    these values are equal according
    to the utf8_unicode_ci collation, but two 600 byte length corresponding keys:  
    "0x65<0x20 repeats 599 times>" and "0xC3A9<0x20 repeats 598 times>" are not    
    equal if we count trailing spaces and it may cause inconsequent behavior.
    
    So, let's pass 1 as the skip_end_space parameter value to the mi_compare_text()
    function for proper TEXT and VARTTEXT key segments comparison.

ChangeSet@1.2255.13.5, 2006-08-10 11:52:34+02:00, andrey@example.com +3 -0
  after merge update

  mysql-test/r/mysqldump.result@1.117, 2006-08-10 11:52:30+02:00, andrey@example.com +1 -1
    update result

  mysql-test/r/sp.result@1.216, 2006-08-10 11:52:30+02:00, andrey@example.com +7 -0
    after merge update

  mysql-test/t/mysqldump.test@1.111, 2006-08-10 11:52:31+02:00, andrey@example.com +1 -1
    update test

ChangeSet@1.1810.1698.111, 2006-08-10 14:50:54+05:00, holyfoot@mysql.com +2 -0
  bug #20910 (NOT NULL column reported as NULL in SHOW FIELDS)
  
  two test results changed after the patch

  mysql-test/r/grant.result@1.37.6.1, 2006-08-10 14:50:50+05:00, holyfoot@mysql.com +1 -1
    result fixed

  mysql-test/r/type_ranges.result@1.38.1.5, 2006-08-10 14:50:50+05:00, holyfoot@mysql.com +3 -3
    result fixed

ChangeSet@1.2255.14.2, 2006-08-10 01:50:37-07:00, brian@zim.(none) +12 -0
  This is the second patch for bdb removeal. This takes care of all options and variables that rely on bdb. 

  BitKeeper/deleted/.del-ha_berkeley.cc@1.182, 2006-08-09 18:08:39-07:00, brian@zim.(none) +0 -0
    Delete: sql/ha_berkeley.cc

  BitKeeper/deleted/.del-ha_berkeley.h@1.84, 2006-08-09 18:08:39-07:00, brian@zim.(none) +0 -0
    Delete: sql/ha_berkeley.h

  mysql-test/install_test_db.sh@1.37, 2006-08-10 01:50:34-07:00, brian@zim.(none) +1 -1
    Removed skip option

  mysql-test/mysql-test-run.sh@1.330, 2006-08-10 01:50:34-07:00, brian@zim.(none) +2 -2
    Remove bdb option

  mysql-test/mysql-test-run.pl@1.147.1.1, 2006-08-10 01:50:34-07:00, brian@zim.(none) +0 -3
    Remove bdb option

  sql/Makefile.am@1.145.2.2, 2006-08-10 01:50:34-07:00, brian@zim.(none) +2 -5
    Remove bdb option

  sql/handler.cc@1.252.1.1, 2006-08-10 01:50:34-07:00, brian@zim.(none) +1 -2
    Remove references to bdb

  sql/lex.h@1.163, 2006-08-10 01:50:34-07:00, brian@zim.(none) +0 -2
    Removed lex for bdb

  sql/mysql_priv.h@1.424.1.1, 2006-08-10 01:50:34-07:00, brian@zim.(none) +0 -6
    Removed bdb privs

  sql/mysqld.cc@1.564.6.1, 2006-08-10 01:50:34-07:00, brian@zim.(none) +2 -155
    Removed all options for bdb

  sql/set_var.cc@1.178.6.1, 2006-08-10 01:50:34-07:00, brian@zim.(none) +0 -18
    Removed variables for bdb

  sql/sql_yacc.yy@1.484.8.1, 2006-08-10 01:50:34-07:00, brian@zim.(none) +0 -26
    Removed yacc for bdb

ChangeSet@1.1810.2009.5, 2006-08-10 01:02:31-04:00, cmiller@zippy.cornsilk.net +2 -0
  Removed Iggy's accidentally-added files.

  BitKeeper/deleted/.del-bug20328.result@1.1, 2006-08-10 01:02:29-04:00, cmiller@zippy.cornsilk.net +44 -0
    Removed Iggy's accidentally-added files.

  BitKeeper/deleted/.del-bug20328.result@1.0, 2006-08-10 01:02:29-04:00, cmiller@zippy.cornsilk.net +0 -0

  BitKeeper/deleted/.del-bug20328.test@1.1, 2006-08-10 01:02:30-04:00, cmiller@zippy.cornsilk.net +9 -0
    Removed Iggy's accidentally-added files.

  BitKeeper/deleted/.del-bug20328.test@1.0, 2006-08-10 01:02:30-04:00, cmiller@zippy.cornsilk.net +0 -0

ChangeSet@1.1810.2000.9, 2006-08-10 03:46:46+02:00, tnurnberg@salvation.intern.azundris.com +1 -0
  Bug#17926: mysql.exe crashes when ctrl-c is pressed in windows
  
  SIGINT is handled in funny ways on windows, which could lead to problems when
  Control-C was pressed in the client during a long-running query.  Now Control-C
  during a query aborts that query (by sending KILL to the server on a second
  connexion), while Control-C outside of a running query terminates the client.

  client/mysql.cc@1.199.10.5, 2006-08-10 03:46:24+02:00, tnurnberg@salvation.intern.azundris.com +40 -2
    Bug#17926: mysql.exe crashes when ctrl-c is pressed in windows
    
    Rather than tear down the client right away, open a second connexion to server
    on SIGINT and send a KILL for the first connexion.  Only if we receive another
    SIGINT before the KILL goes through (or if no query was running in the first
    place) do we terminate the client.

ChangeSet@1.1810.1922.10, 2006-08-09 17:41:35-07:00, pgalbraith@govinda.patg.net +1 -0
  autopush test - sorry for the commit messages, ignore

  sql/ha_federated.cc@1.24.12.1, 2006-08-09 17:41:33-07:00, pgalbraith@govinda.patg.net +1 -0
    autopush test - sorry for the commit messages, ignore

ChangeSet@1.2255.14.1, 2006-08-09 17:33:08-07:00, brian@zim.(none) +10 -0
  First stage removeal of BDB.

  BUILD/Makefile.am@1.11, 2006-08-09 17:33:04-07:00, brian@zim.(none) +0 -1
    Remove dropped file

  BUILD/compile-dist@1.14, 2006-08-09 17:33:05-07:00, brian@zim.(none) +0 -1
    Remove option to build bdb

  BUILD/compile-solaris-sparc-purify@1.17, 2006-08-09 17:33:05-07:00, brian@zim.(none) +1 -1
    Remove option for bdb build

  BitKeeper/deleted/.del-CMakeLists.txt@1.6, 2006-08-09 13:24:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/CMakeLists.txt

  BitKeeper/deleted/.del-LICENSE@1.7, 2006-08-09 13:24:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/LICENSE

  BitKeeper/deleted/.del-Makefile.in@1.12, 2006-08-09 13:24:07-07:00, brian@zim.(none) +0 -0
    Delete: storage/bdb/Makefile.in

  BitKeeper/deleted/.del-compile-pentium-debug-no-bdb@1.5, 2006-08-09 13:25:33-07:00, brian@zim.(none) +0 -0
    Delete: BUILD/compile-pentium-debug-no-bdb

  configure.in@1.373.1.1, 2006-08-09 17:33:04-07:00, brian@zim.(none) +0 -7
    Remove berkely from configure. 

  libmysqld/Makefile.am@1.94.1.2, 2006-08-09 17:33:05-07:00, brian@zim.(none) +1 -1
    Remove option for bdb build

  sql/Makefile.am@1.145.2.1, 2006-08-09 17:33:05-07:00, brian@zim.(none) +1 -1
    Remove bdb build

ChangeSet@1.2255.12.4, 2006-08-10 00:37:08+04:00, evgen@moonbone.local +2 -0
  sql_base.cc, table.cc:
    After merge fix

  sql/sql_base.cc@1.339, 2006-08-10 00:36:43+04:00, evgen@moonbone.local +4 -3
    After merge fix

  sql/table.cc@1.237, 2006-08-10 00:36:38+04:00, evgen@moonbone.local +0 -3
    After merge fix

ChangeSet@1.1616.2144.179, 2006-08-09 13:41:08-04:00, cmiller@zippy.cornsilk.net +2 -0
  Removed iggy's accidentally checked-in test files.

  BitKeeper/deleted/.del-bug20328.result@1.3, 2006-08-09 13:38:35-04:00, cmiller@zippy.cornsilk.net +0 -0
    Delete: mysql-test/r/bug20328.result

  BitKeeper/deleted/.del-bug20328.test@1.3, 2006-08-09 13:38:28-04:00, cmiller@zippy.cornsilk.net +0 -0
    Delete: mysql-test/t/bug20328.test

ChangeSet@1.2243.2.2, 2006-08-09 17:07:59+02:00, andrey@lmy004. +5 -0
  Fix for bug#20701 BINARY keyword should be forbidden in stored routines
      
  create function func() returns char(10) binary ...
  is no more possible. This will be reenabled when 
  bug 2676 "DECLARE can't have COLLATE clause in stored procedure"
  is fixed.
  
  Fix after 2nd review

  mysql-test/r/sp-error.result@1.112, 2006-08-09 17:07:55+02:00, andrey@lmy004. +5 -0
    update result

  mysql-test/r/sp.result@1.212.1.2, 2006-08-09 17:07:55+02:00, andrey@lmy004. +10 -4
    update result

  mysql-test/t/sp-error.test@1.110, 2006-08-09 17:07:55+02:00, andrey@lmy004. +18 -0
    add a test case for bug#20701 BINARY keyword should be forbidden in stored procedures

  mysql-test/t/sp.test@1.195.1.2, 2006-08-09 17:07:55+02:00, andrey@lmy004. +15 -4
    Fix test case which uses binary for the return value of a function.
    It's no more possible after fix for bug#20701 
    BINARY keyword should be forbidden in SP
    
    Fix few glitches where ; is used instead of | . The delimiter is |

  sql/sql_yacc.yy@1.484.6.1, 2006-08-09 17:07:56+02:00, andrey@lmy004. +11 -0
    Fix for bug#20701 BINARY keyword should be forbidden in stored routines
    
    create function func() returns char(10) binary ...
    is no more possible. This will be reenabled when 
    bug 2676 "DECLARE can't have COLLATE clause in stored procedure"
    is fixed

ChangeSet@1.1616.2712.11, 2006-08-09 16:24:14+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - bug#21536
    Make sure updateNodeInfo is run on master also for temporary tables

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.14.5.1, 2006-08-09 16:24:13+02:00, jonas@perch.ndb.mysql.com +1 -0
    Run update nodeinfo also here to handle
      temprorary tables in some situations

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@1.10.1.8, 2006-08-09 16:24:13+02:00, jonas@perch.ndb.mysql.com +6 -1
    new error insert

  ndb/test/ndbapi/testSystemRestart.cpp@1.8.2.1, 2006-08-09 16:24:13+02:00, jonas@perch.ndb.mysql.com +47 -0
    test case

ChangeSet@1.2181.181.4, 2006-08-09 16:12:24+02:00, mskold@mysql.com +1 -0
  bug #18184  SELECT ... FOR UPDATE does not work..: Updated result file

  mysql-test/r/ndb_lock.result@1.14, 2006-08-09 16:12:06+02:00, mskold@mysql.com +12 -3
    bug #18184  SELECT ... FOR UPDATE does not work..: Updated result file

ChangeSet@1.2255.13.2, 2006-08-09 16:37:26+04:00, kroki@moonlight.intranet +1 -0
  Post-merge fix.

  sql/sql_parse.cc@1.567.1.10, 2006-08-09 16:37:21+04:00, kroki@moonlight.intranet +3 -6
    Post-merge fix.  No need to check DB name twice.

ChangeSet@1.1810.2005.5, 2006-08-09 14:32:56+02:00, mskold@mysql.com +2 -0
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: added more tests

  mysql-test/r/ndb_read_multi_range.result@1.3.1.3, 2006-08-09 14:32:14+02:00, mskold@mysql.com +64 -3
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: added more tests

  mysql-test/t/ndb_read_multi_range.test@1.4.1.3, 2006-08-09 14:32:14+02:00, mskold@mysql.com +22 -3
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: added more tests

ChangeSet@1.1616.2720.1, 2006-08-09 14:28:39+05:00, svoj@may.pils.ru +1 -0
  BUG#20060 - mysqld option "--flush " doesn't work for update statement
  
  Problem described in this bug report affects MyISAM tables only.
  
  Running mysqld --flush instructs mysqld to sync all changes to disk
  after each SQL statement. It worked well for INSERT and DELETE
  statements, but it did sync for UPDATE only in case if there was
  index change (change of colum that has an index). If no updated column
  has an index, data wasn't synced to disk.
  
  This fix makes UPDATE statement to sync data to disk even if there is
  no index change (that is only data change) and mysqld is run with
  --flush option.

  myisam/mi_update.c@1.15.1.2, 2006-08-09 14:28:36+05:00, svoj@may.pils.ru +11 -1
    Every myisam function that updates myisam table must end with
    call to _mi_writeinfo(). If operation (second param of
    _mi_writeinfo()) is not 0 it sets share->changed to 1, that is
    flags that data has changed. If operation is 0, this function
    equals to no-op in this case.
    
    mi_update() must always pass !0 value as operation, since even if
    there is no index change there could be data change.

ChangeSet@1.2181.181.2, 2006-08-09 10:41:22+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21363
    add file that got missing from last changset

  storage/ndb/src/ndbapi/TransporterFacade.hpp@1.33, 2006-08-09 10:41:20+02:00, jonas@perch.ndb.mysql.com +2 -0
    ndb - bug#21363
      add file that got missing from last changset

ChangeSet@1.2181.181.1, 2006-08-09 10:22:09+02:00, jonas@perch.ndb.mysql.com +5 -0
  ndb - bug#21363
    Add extra sleeps (conditionally) if user-ndb-object still exists during shutdown
    Note: This is not in anyway optimal, but i dont't really know in which order should be shutdown
          but it fixes problem...

  sql/ha_ndbcluster_binlog.cc@1.76.1.1, 2006-08-09 10:22:07+02:00, jonas@perch.ndb.mysql.com +26 -1
    Add extra wait loop to make user "user" ndb-object go away...
      otherwise user thread can have ongoing SUB_DATA

  storage/ndb/include/ndbapi/ndb_cluster_connection.hpp@1.17, 2006-08-09 10:22:07+02:00, jonas@perch.ndb.mysql.com +1 -0
    Add interface for getting active ndb-object count

  storage/ndb/src/ndbapi/Ndbif.cpp@1.44, 2006-08-09 10:22:07+02:00, jonas@perch.ndb.mysql.com +4 -1
    Add return in case of incorrect magic

  storage/ndb/src/ndbapi/TransporterFacade.cpp@1.52, 2006-08-09 10:22:07+02:00, jonas@perch.ndb.mysql.com +10 -0
    Add interface for getting active ndb-object count

  storage/ndb/src/ndbapi/ndb_cluster_connection.cpp@1.42, 2006-08-09 10:22:07+02:00, jonas@perch.ndb.mysql.com +5 -0
    Add interface for getting active ndb-object count

ChangeSet@1.1810.2002.5, 2006-08-09 15:39:32+08:00, stewart@willster.(none) +1 -0
  remove undeeded printing of newline.

  ndb/src/ndbapi/ClusterMgr.cpp@1.17.7.6, 2006-08-09 15:39:30+08:00, stewart@willster.(none) +0 -1
    remove extra 'ndbout << endl'

ChangeSet@1.1810.2002.4, 2006-08-09 15:03:55+08:00, stewart@willster.(none) +6 -0
  BUG#13985
  
  fixups after review by jonas

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.12.2, 2006-08-09 15:03:52+08:00, stewart@willster.(none) +1 -0
    Guard the print mutex when running SHOW

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.73.30.2, 2006-08-09 15:03:52+08:00, stewart@willster.(none) +4 -24
    replace global_flag_send_heartbeat_now with forceHB()/updateStatus()
    
    don't use bitmask as parameter to forceHB to reflect reality of what the
    function does.
    
    remove get_connected_ndb_nodes() as it is no longer used

  ndb/src/mgmsrv/MgmtSrvr.hpp@1.30.17.2, 2006-08-09 15:03:52+08:00, stewart@willster.(none) +1 -2
    remove unused get_connected_ndb_nodes()
    
    update updateStatus prototype

  ndb/src/mgmsrv/Services.cpp@1.45.27.2, 2006-08-09 15:03:52+08:00, stewart@willster.(none) +1 -3
    use new prototype for updateStatus() - doesn't accept NodeBitmask

  ndb/src/ndbapi/ClusterMgr.cpp@1.17.7.5, 2006-08-09 15:03:52+08:00, stewart@willster.(none) +19 -10
    remove global_flag_send_heartbeat_now, replace with forceHB.
    
    compute bitmask of nodes to send HB to in forceHB

  ndb/src/ndbapi/ClusterMgr.hpp@1.4.5.4, 2006-08-09 15:03:52+08:00, stewart@willster.(none) +1 -1
    update prototype for forceHB, don't give the illusion that NodeBitmask means much.

ChangeSet@1.1810.2009.2, 2006-08-09 06:46:06+04:00, evgen@sunlight.local +1 -0
  sql_view.cc:
    After merge fix

  sql/sql_view.cc@1.78.3.6, 2006-08-09 06:45:49+04:00, evgen@sunlight.local +1 -13
    After merge fix

ChangeSet@1.2255.12.2, 2006-08-08 14:32:39-07:00, patg@govinda.patg.net +1 -0
  BUG #21524 "'ps' test fails in --ps-protocol test AMD64 bit"
  
  (this is not a fix to the bug, but simply to disable the test in 
  order to push a 5.0 to 5.1 merge)
  
  This merge contains:
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge

  mysql-test/t/disabled.def@1.184, 2006-08-08 14:32:37-07:00, patg@govinda.patg.net +1 -0
    BUG #21524 "'ps' test fails in --ps-protocol test AMD64 bit"
    
    (this is not a fix to the bug, but simply to disable the test in 
    order to push a 5.0 to 5.1 merge)

ChangeSet@1.1810.2008.1, 2006-08-09 00:05:42+04:00, evgen@sunlight.local +6 -0
  sql_base.cc, unireg.h, sql_lex.h, table.cc, sql_view.h, sql_view.cc:
    Correct memory leak fix

  sql/sql_base.cc@1.235.63.1, 2006-08-09 00:05:03+04:00, evgen@sunlight.local +31 -13
    Correct memory leak fix

  sql/sql_lex.h@1.175.18.2, 2006-08-09 00:04:28+04:00, evgen@sunlight.local +1 -1
    Correct memory leak fix

  sql/sql_view.cc@1.78.8.1, 2006-08-09 00:04:04+04:00, evgen@sunlight.local +8 -3
    Correct memory leak fix

  sql/sql_view.h@1.11.1.1, 2006-08-09 00:00:08+04:00, evgen@sunlight.local +2 -1
    Correct memory leak fix

  sql/table.cc@1.160.32.3, 2006-08-08 23:59:47+04:00, evgen@sunlight.local +2 -0
    Correct memory leak fix

  sql/unireg.h@1.39.1.6, 2006-08-08 23:59:26+04:00, evgen@sunlight.local +2 -1
    Correct memory leak fix

ChangeSet@1.2255.10.2, 2006-08-08 09:58:55-04:00, mikael@dator5.(none) +3 -0
  BUG#21173: SHOW TABLE STATUS crashes mysqld
  Review fixes

  mysql-test/r/partition.result@1.49.3.2, 2006-08-08 09:58:53-04:00, mikael@dator5.(none) +19 -1
    New test cases

  mysql-test/t/partition.test@1.44.3.2, 2006-08-08 09:58:53-04:00, mikael@dator5.(none) +11 -1
    New test cases

  sql/ha_partition.cc@1.65.2.2, 2006-08-08 09:58:53-04:00, mikael@dator5.(none) +6 -2
    Added comments after review
    + removed erroneus setting

ChangeSet@1.2255.11.1, 2006-08-08 08:52:51-04:00, mikael@dator5.(none) +4 -0
  BUG#21143: mysqld hangs when using wrong number of subpartitions
  Rewrote if-statement a bit shorter
  Added check for subpartitions in REORGANIZE partitions to be of same number as
  in base table.

  mysql-test/r/partition_mgm.result@1.6, 2006-08-08 08:52:48-04:00, mikael@dator5.(none) +10 -0
    New test case

  mysql-test/t/partition_mgm.test@1.6, 2006-08-08 08:52:48-04:00, mikael@dator5.(none) +17 -0
    New test case

  sql/ha_partition.cc@1.65.3.1, 2006-08-08 08:52:48-04:00, mikael@dator5.(none) +2 -4
    Fixed stuff I should done long ago (monty comments)

  sql/sql_partition.cc@1.82.1.1, 2006-08-08 08:52:48-04:00, mikael@dator5.(none) +9 -7
    Rewrote if-statement a bit shorter
    Added check for subpartitions in REORGANIZE partitions to be of same number as
    in base table.

ChangeSet@1.2255.10.1, 2006-08-08 08:47:58-04:00, mikael@dator5.(none) +3 -0
  BUG#21173: SHOW TABLE STATUS crashes on InnoDB tables
  Don't use get_auto_increment on tables without auto_increment fields

  mysql-test/r/partition.result@1.49.3.1, 2006-08-08 08:47:55-04:00, mikael@dator5.(none) +8 -0
    new test case

  mysql-test/t/partition.test@1.44.3.1, 2006-08-08 08:47:55-04:00, mikael@dator5.(none) +10 -0
    new test case

  sql/ha_partition.cc@1.65.2.1, 2006-08-08 08:47:55-04:00, mikael@dator5.(none) +9 -4
    Don't use get_auto_increment on tables without auto_increment fields

ChangeSet@1.2255.1.11, 2006-08-08 16:03:42+05:00, gluh@mysql.com +9 -0
  Bug#16172 DECIMAL data type processed incorrectly
  issue an 'overflow warning' if result value is bigger than max possible value

  include/decimal.h@1.16, 2006-08-08 16:03:35+05:00, gluh@mysql.com +1 -0
    Bug#16172 DECIMAL data type processed incorrectly
    new function decimal_intg()

  mysql-test/r/cast.result@1.45, 2006-08-08 16:03:35+05:00, gluh@mysql.com +5 -3
    Bug#16172 DECIMAL data type processed incorrectly
    result fix

  mysql-test/r/type_newdecimal.result@1.48, 2006-08-08 16:03:35+05:00, gluh@mysql.com +27 -0
    Bug#16172 DECIMAL data type processed incorrectly
    test result

  mysql-test/r/view.result@1.171, 2006-08-08 16:03:35+05:00, gluh@mysql.com +1 -1
    Bug#16172 DECIMAL data type processed incorrectly
    result fix

  mysql-test/t/type_newdecimal.test@1.41, 2006-08-08 16:03:35+05:00, gluh@mysql.com +11 -0
    Bug#16172 DECIMAL data type processed incorrectly
    test case

  sql/item_create.cc@1.65, 2006-08-08 16:03:35+05:00, gluh@mysql.com +1 -1
    Bug#16172 DECIMAL data type processed incorrectly
    do not increase decimal part on 2(according to manual)

  sql/item_func.cc@1.307, 2006-08-08 16:03:35+05:00, gluh@mysql.com +23 -0
    Bug#16172 DECIMAL data type processed incorrectly
    issue an 'overflow warning' if result value is bigger than max possible value

  sql/my_decimal.h@1.11, 2006-08-08 16:03:35+05:00, gluh@mysql.com +8 -0
    Bug#16172 DECIMAL data type processed incorrectly
    new function my_decimal_intg()

  strings/decimal.c@1.73, 2006-08-08 16:03:35+05:00, gluh@mysql.com +8 -0
    Bug#16172 DECIMAL data type processed incorrectly
    new function decimal_intg()

ChangeSet@1.1616.2719.2, 2006-08-08 12:22:23+02:00, mskold@mysql.com +3 -0
  bug #18184  SELECT ... FOR UPDATE does not work..: Added lockTuple call in close_scan

  mysql-test/r/ndb_lock.result@1.5.2.2, 2006-08-08 12:21:47+02:00, mskold@mysql.com +12 -3
    bug #18184  SELECT ... FOR UPDATE does not work..: Added lockTuple call in closeScan

  mysql-test/t/ndb_lock.test@1.7.2.2, 2006-08-08 12:21:47+02:00, mskold@mysql.com +13 -2
    bug #18184  SELECT ... FOR UPDATE does not work..: Added lockTuple call in closeScan

  sql/ha_ndbcluster.cc@1.114.21.2, 2006-08-08 12:21:45+02:00, mskold@mysql.com +19 -0
    bug #18184  SELECT ... FOR UPDATE does not work..: Added lockTuple call in closeScan

ChangeSet@1.1810.1698.109, 2006-08-08 14:40:07+05:00, gluh@mysql.com +4 -0
  Bug#16172 DECIMAL data type processed incorrectly
  issue an error in case of DECIMAL(M,N) if N > M

  mysql-test/r/type_newdecimal.result@1.36.1.5, 2006-08-08 14:40:03+05:00, gluh@mysql.com +5 -1
    Bug#16172 DECIMAL data type processed incorrectly
    result fix & test case
    

  mysql-test/t/type_newdecimal.test@1.33.1.5, 2006-08-08 14:40:04+05:00, gluh@mysql.com +6 -2
    Bug#16172 DECIMAL data type processed incorrectly
    test fix

  sql/item_create.cc@1.58.1.3, 2006-08-08 14:40:04+05:00, gluh@mysql.com +8 -1
    Bug#16172 DECIMAL data type processed incorrectly
    issue an error in case of DECIMAL(M,N) if N > M

  sql/sql_yacc.yy@1.371.1.109, 2006-08-08 14:40:04+05:00, gluh@mysql.com +4 -0
    Bug#16172 DECIMAL data type processed incorrectly
    issue an error in case of DECIMAL(M,N) if N > M

ChangeSet@1.1810.2007.1, 2006-08-08 13:34:27+05:00, holyfoot@mysql.com +3 -0
  bug #20910 (NOT NULL reported as NULL for TIMESTAMP)
  
  we intentionally reported that for TIMESTAMPS, which isn't right

  mysql-test/r/type_timestamp.result@1.28.2.2, 2006-08-08 13:34:23+05:00, holyfoot@mysql.com +24 -9
    result fixed

  mysql-test/t/type_timestamp.test@1.26.1.2, 2006-08-08 13:34:23+05:00, holyfoot@mysql.com +11 -0
    testcase added

  sql/sql_show.cc@1.253.1.75, 2006-08-08 13:34:23+05:00, holyfoot@mysql.com +1 -3
    remove the check for TIMESTAMP type -
    all types will report 'NO' if they're defined as NOT NULL

ChangeSet@1.2243.1.4, 2006-08-08 12:03:24+04:00, petr@mysql.com +1 -0
  Fix windows pushbuild failure: the bug occured because
  we didn't check for NULL value of the
  lex_create_info->db_type pointer.
  The pointer is NULL in the case, when the engine name is
  unknown to the server. This happens with NDB on Windows.

  sql/sql_table.cc@1.364, 2006-08-08 12:03:20+04:00, petr@mysql.com +2 -1
    don't check pointer in the case, it is NULL

ChangeSet@1.1810.1698.108, 2006-08-08 12:50:05+05:00, gluh@mysql.com +1 -0
  result fix

  mysql-test/r/information_schema_db.result@1.1.1.8, 2006-08-08 12:50:00+05:00, gluh@mysql.com +1 -0
    result fix

ChangeSet@1.1616.2712.10, 2006-08-08 07:59:52+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21213
    Make sure totSendlenAi is set in case of ACC_ABORTCONF and activeCreate == true
    (only needed when >2 replica)

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.39.1.26, 2006-08-08 07:59:51+02:00, jonas@perch.ndb.mysql.com +1 -0
    Make sure totSendlenAi is set in case of ACC_ABORTCONF and activeCreate == true

ChangeSet@1.2255.9.1, 2006-08-07 18:33:12-04:00, mikael@dator5.(none) +1 -0
  BUG#21357: Valgrind error in partition test
  memcpy was too long m_reorged_parts was already temp_partitions * no_subparts so multiplying
  by no_subparts again was not a good idea.

  sql/ha_partition.cc@1.65.1.1, 2006-08-07 18:33:09-04:00, mikael@dator5.(none) +2 -2
    memcpy was too long m_reorged_parts was already temp_partitions * no_subparts so multiplying
    by no_subparts again was not a good idea.

ChangeSet@1.1810.2000.8, 2006-08-07 19:21:43+02:00, msvensson@neptunus.(none) +1 -0
  Remove extra whitespace

  tests/mysql_client_test.c@1.167.17.6, 2006-08-07 19:21:41+02:00, msvensson@neptunus.(none) +3 -3
    Remove extra whitespace

ChangeSet@1.2255.8.1, 2006-08-07 12:02:28-04:00, mikael@dator5.(none) +4 -0
  Made sure that strange numbers are not allowed syntax-wise.

  mysql-test/r/partition.result@1.49.2.1, 2006-08-07 12:02:25-04:00, mikael@dator5.(none) +16 -0
    Added some test cases

  mysql-test/t/partition.test@1.44.2.1, 2006-08-07 12:02:25-04:00, mikael@dator5.(none) +19 -0
    Added some test cases

  sql/share/errmsg.txt@1.110.1.5, 2006-08-07 12:02:25-04:00, mikael@dator5.(none) +2 -0
    Added new error message

  sql/sql_yacc.yy@1.484.5.4, 2006-08-07 12:02:25-04:00, mikael@dator5.(none) +37 -12
    Made sure that strange numbers are not allowed syntax-wise.

ChangeSet@1.1810.2000.7, 2006-08-07 17:26:02+02:00, msvensson@neptunus.(none) +1 -0
  Add some more code to analyze why the fgets fails.

  tests/mysql_client_test.c@1.167.17.5, 2006-08-07 17:26:00+02:00, msvensson@neptunus.(none) +12 -3
    Add some more code to analyze why the fgets fails.

ChangeSet@1.1810.1922.9, 2006-08-07 19:35:02+05:00, svoj@may.pils.ru +1 -0
  After merge fix.

  mysql-test/r/ps_7ndb.result@1.26.5.1, 2006-08-07 19:34:57+05:00, svoj@may.pils.ru +1 -1
    After merge fix.

ChangeSet@1.1810.2005.3, 2006-08-07 15:58:43+02:00, mskold@mysql.com +1 -0
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: missing friend declaration in change set

  ndb/include/ndbapi/NdbTransaction.hpp@1.41.2.2, 2006-08-07 15:58:29+02:00, mskold@mysql.com +1 -0
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: missing friend declaration in change set

ChangeSet@1.1810.2005.2, 2006-08-07 14:48:54+02:00, mskold@mysql.com +2 -0
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

  sql/ha_ndbcluster.cc@1.175.46.2, 2006-08-07 14:48:18+02:00, mskold@mysql.com +44 -17
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

  sql/ha_ndbcluster.h@1.82.1.18, 2006-08-07 14:48:18+02:00, mskold@mysql.com +11 -2
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

ChangeSet@1.2264, 2006-08-07 14:32:43+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21478
    make fragment logpart in DIH "global"

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.77, 2006-08-07 14:32:41+02:00, jonas@perch.ndb.mysql.com +7 -4
    Store logpart id in FRAGMENTATION as it goes very bad if 
      they differ on different nodes, as they are copied from master
      on node/system -restart

ChangeSet@1.2263, 2006-08-07 14:28:58+02:00, jonas@perch.ndb.mysql.com +10 -0
  ndb - bug#21271
    make each fragment use own LCP file, so that (s/n)r can use different LCP-no for different fragments

  storage/ndb/include/kernel/signaldata/FsOpenReq.hpp@1.7, 2006-08-07 14:28:56+02:00, jonas@perch.ndb.mysql.com +13 -1
    Add fragment id to LCP filename

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.25, 2006-08-07 14:28:56+02:00, jonas@perch.ndb.mysql.com +1 -1
    Add new error code

  storage/ndb/src/kernel/blocks/backup/Backup.cpp@1.50, 2006-08-07 14:28:56+02:00, jonas@perch.ndb.mysql.com +55 -92
    put each fragment in own LCP file

  storage/ndb/src/kernel/blocks/backup/Backup.hpp@1.22, 2006-08-07 14:28:56+02:00, jonas@perch.ndb.mysql.com +0 -1
    put each fragment in own LCP file

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.54, 2006-08-07 14:28:56+02:00, jonas@perch.ndb.mysql.com +4 -4
    Use fifo lists

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.119, 2006-08-07 14:28:56+02:00, jonas@perch.ndb.mysql.com +30 -6
    1) use fifo lists
    2) restore each fragment separatly
    3) add error codes

  storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp@1.11, 2006-08-07 14:28:57+02:00, jonas@perch.ndb.mysql.com +2 -1
    Add fragment id to LCP filename

  storage/ndb/src/kernel/blocks/restore.cpp@1.7, 2006-08-07 14:28:56+02:00, jonas@perch.ndb.mysql.com +7 -1
    Add fragment id to LCP filename

  storage/ndb/test/ndbapi/testNodeRestart.cpp@1.32, 2006-08-07 14:28:57+02:00, jonas@perch.ndb.mysql.com +42 -0
    Add testcase

  storage/ndb/test/run-test/daily-basic-tests.txt@1.52, 2006-08-07 14:28:57+02:00, jonas@perch.ndb.mysql.com +4 -0
    add testcase

ChangeSet@1.1810.2000.6, 2006-08-07 14:02:57+02:00, msvensson@neptunus.(none) +1 -0
  Add printouts in test case for bug17667

  tests/mysql_client_test.c@1.167.17.4, 2006-08-07 14:02:55+02:00, msvensson@neptunus.(none) +4 -0
    Add printout describing what master.log is to be opened.
    Add printout about statements that are found in the log.

ChangeSet@1.1616.2719.1, 2006-08-07 13:51:20+02:00, mskold@mysql.com +3 -0
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

  sql/ha_ndbcluster.cc@1.114.21.1, 2006-08-07 13:51:09+02:00, mskold@mysql.com +8 -0
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

  sql/ha_ndbcluster.h@1.40.6.16, 2006-08-07 13:51:09+02:00, mskold@mysql.com +2 -0
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

  ndb/include/ndbapi/NdbConnection.hpp@1.19.8.1, 2006-08-07 13:51:09+02:00, mskold@mysql.com +2 -1
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

ChangeSet@1.2255.7.1, 2006-08-07 06:22:08-04:00, mikael@dator5.(none) +4 -0
  BUG#21350: No errors on using erroneus DATA DIRECTORY clause
  set_up_table_before_create can fail due to erroneus path to
  data directory or index directory
  Added abort handling to ensure created partitions are dropped
  if a failure occurs in the middle of the create process.

  mysql-test/r/partition.result@1.49.1.1, 2006-08-07 06:22:05-04:00, mikael@dator5.(none) +9 -0
    New test cases

  mysql-test/t/partition.test@1.44.1.1, 2006-08-07 06:22:05-04:00, mikael@dator5.(none) +16 -0
    New test cases

  sql/ha_partition.cc@1.66, 2006-08-07 06:22:05-04:00, mikael@dator5.(none) +42 -19
    set_up_table_before_create can fail due to erroneus path to
    data directory or index directory
    Added abort handling to ensure created partitions are dropped
    if a failure occurs in the middle of the create process.

  sql/ha_partition.h@1.26, 2006-08-07 06:22:05-04:00, mikael@dator5.(none) +5 -5
    set_up_table_before_create can fail due to erroneus path to
    data directory or index directory
    Added abort handling to ensure created partitions are dropped
    if a failure occurs in the middle of the create process.

ChangeSet@1.2262, 2006-08-07 12:12:55+02:00, jonas@perch.ndb.mysql.com +4 -0
  ndb - some hugo updates
    make dump state args list const
    make node lists const

  storage/ndb/include/mgmapi/mgmapi_debug.h@1.9, 2006-08-07 12:12:53+02:00, jonas@perch.ndb.mysql.com +1 -1
    make dump state args list const

  storage/ndb/src/mgmapi/mgmapi.cpp@1.68, 2006-08-07 12:12:53+02:00, jonas@perch.ndb.mysql.com +1 -1
    make dump state args list const

  storage/ndb/test/include/NdbRestarter.hpp@1.9, 2006-08-07 12:12:53+02:00, jonas@perch.ndb.mysql.com +7 -7
    make node lists const

  storage/ndb/test/src/NdbRestarter.cpp@1.15, 2006-08-07 12:12:53+02:00, jonas@perch.ndb.mysql.com +8 -8
    make node lists const

ChangeSet@1.1810.2004.2, 2006-08-07 11:29:41+02:00, msvensson@neptunus.(none) +1 -0
  Change the 'sleep' into an explicit FLUSH LOGS command

  tests/mysql_client_test.c@1.167.17.3, 2006-08-07 11:29:39+02:00, msvensson@neptunus.(none) +3 -1
    Change the 'sleep' into an explicit FLUSH LOGS command

ChangeSet@1.1810.2004.1, 2006-08-07 10:16:37+02:00, msvensson@neptunus.(none) +1 -0
  fflush(NULL) before abort so that all pending writes are performed

  tests/mysql_client_test.c@1.167.17.2, 2006-08-07 10:16:36+02:00, msvensson@neptunus.(none) +1 -1
    fflush(NULL) before abort so that all pending writes are performed

ChangeSet@1.1616.2712.9, 2006-08-07 09:41:39+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#18475
    Fix error message on copyfragref

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@1.10.1.7, 2006-08-07 09:41:38+02:00, jonas@perch.ndb.mysql.com +4 -5
    Fix error message

ChangeSet@1.1810.2003.1, 2006-08-07 11:56:22+05:00, holyfoot@mysql.com +1 -0
  information_schema_db.test fixed

  mysql-test/t/information_schema_db.test@1.6, 2006-08-07 11:55:26+05:00, holyfoot@mysql.com +1 -0
    user dropped

ChangeSet@1.1616.2705.10, 2006-08-07 07:35:28+02:00, tnurnberg@salvation.intern.azundris.com +3 -0
  Bug #20987: str_to_date doesn't accept user variable for specification
  
  str_to_date() would sometimes render NULL if %D was used as rule other than last.
  since this was due to two pointers getting mixed up in the server, this behaviour
  seemed somewhat non-deterministic at SQL level.

  mysql-test/r/func_time.result@1.23.1.18, 2006-08-07 07:35:19+02:00, tnurnberg@salvation.intern.azundris.com +34 -0
    Bug #20987: str_to_date doesn't accept user variable for specification
    
    show we can do the usual str_to_date() conversions without triggering the bug.

  mysql-test/t/func_time.test@1.21.1.15, 2006-08-07 07:35:19+02:00, tnurnberg@salvation.intern.azundris.com +31 -1
    Bug #20987: str_to_date doesn't accept user variable for specification
    
    show we can do the usual str_to_date() conversions without triggering the bug.

  sql/item_timefunc.cc@1.51.1.55, 2006-08-07 07:35:19+02:00, tnurnberg@salvation.intern.azundris.com +1 -1
    Bug #20987: str_to_date doesn't accept user variable for specification
    
    str_to_date() used a wrong pointer in %D conversions which could lead to the
    input being cut off after the token matching %D; if the rule required further
    tokens, the conversion would fail and render NULL.

ChangeSet@1.1810.2002.2, 2006-08-07 07:41:49+04:00, evgen@sunlight.local +1 -0
  sql_view.cc:
    Memory leak fix

  sql/sql_view.cc@1.78.7.2, 2006-08-07 07:41:17+04:00, evgen@sunlight.local +3 -0
    Memory leak fix

ChangeSet@1.1810.2000.4, 2006-08-07 04:13:05+02:00, tnurnberg@mysql.com +1 -0
  grant.result:
    manual merge

  mysql-test/r/grant.result@1.37.1.18, 2006-08-07 02:09:27+02:00, tnurnberg@mysql.com +2 -2
    manual merge

ChangeSet@1.1810.2000.2, 2006-08-06 23:56:51+02:00, msvensson@neptunus.(none) +1 -0
  Flush stderr before calling abort()

  tests/mysql_client_test.c@1.167.17.1, 2006-08-06 23:56:49+02:00, msvensson@neptunus.(none) +1 -0
    Flush stderr before calling abort()

ChangeSet@1.1810.1980.2, 2006-08-07 00:06:03+04:00, evgen@sunlight.local +1 -0
  sql_view.cc:
    Memory leak fix

  sql/sql_view.cc@1.78.6.1, 2006-08-07 00:05:42+04:00, evgen@sunlight.local +13 -3
    Memory leak fix

ChangeSet@1.1810.1999.1, 2006-08-06 20:58:30+02:00, msvensson@neptunus.(none) +1 -0
  Send output from mysql_client_test to var/log/mysql_client_test.log

  mysql-test/t/mysql_client_test.test@1.15.1.4, 2006-08-06 20:58:28+02:00, msvensson@neptunus.(none) +2 -2
    Send output from mysql_client_test to var/log/mysql_client_test.log

ChangeSet@1.1810.1698.106, 2006-08-05 18:58:38-05:00, Reggie@xgeek. +1 -0
  please don't call methods that should always execute inside assert()

  tests/mysql_client_test.c@1.167.1.30, 2006-08-05 18:58:07-05:00, Reggie@xgeek. +12 -6
    fixed lines that are executing methods that should always execute inside assert()

ChangeSet@1.1810.1698.105, 2006-08-05 23:15:23+02:00, rburnett@production.mysql.com +1 -0
  mysql_client_test.c:
    Moving call that processes select results out of the assert

  tests/mysql_client_test.c@1.167.1.29, 2006-08-05 23:15:07+02:00, rburnett@production.mysql.com +3 -1
    Moving call that processes select results out of the assert

ChangeSet@1.2255.6.1, 2006-08-05 16:12:24-04:00, mikael@dator5.(none) +5 -0
  BUG#21339: Crash at EXPLAIN PARTITIONS
  Caused by missing check for end of partitions in prune range check

  mysql-test/r/partition.result@1.50, 2006-08-05 16:12:22-04:00, mikael@dator5.(none) +28 -0
    Added test case for duplicate bug#21388

  mysql-test/r/partition_range.result@1.16, 2006-08-05 16:12:22-04:00, mikael@dator5.(none) +10 -0
    Added new test case for bug#21339

  mysql-test/t/partition.test@1.45, 2006-08-05 16:12:22-04:00, mikael@dator5.(none) +18 -0
    Added test case for duplicate bug#21388

  mysql-test/t/partition_range.test@1.12, 2006-08-05 16:12:22-04:00, mikael@dator5.(none) +13 -0
    Added new test case for bug#21339

  sql/sql_partition.cc@1.83, 2006-08-05 16:12:22-04:00, mikael@dator5.(none) +7 -4
    Check so that we don't set outer range to be larger than max_partition

ChangeSet@1.1810.1987.16, 2006-08-05 13:41:22+02:00, hartmut@mysql.com +1 -0
    relying on loop counter variables being local to the loop body if 
    declared in the 'for' statement is not portable, some compilers
    still don't implement this ANSI C++ specification (Bug #14995)

  server-tools/instance-manager/listener.cc@1.24.1.1, 2006-08-05 13:41:07+02:00, hartmut@mysql.com +4 -4
      relying on loop counter variables being local to the loop body if 
      declared in the 'for' statement is not portable, some compilers
      still don't implement this ANSI C++ specification (Bug #14995)

ChangeSet@1.1810.1998.1, 2006-08-04 21:18:58+02:00, rburnett@production.mysql.com +1 -0
  lowercase_fs_off fails on windows because lower_case_file_system is not being
  set properly.  This patch should fix that.
  
  mysqld.cc:
    Call test_if_case_insensitive in all cases so lower_case_file_system always gets set

  sql/mysqld.cc@1.439.67.1, 2006-08-04 21:17:15+02:00, rburnett@production.mysql.com +2 -3
    Call test_if_case_insensitive in all cases so lower_case_file_system always gets set

ChangeSet@1.2243.2.1, 2006-08-04 12:50:49+02:00, andrey@lmy004. +3 -0
  Fix for bug#21416 SP: Recursion level higher than zero needed for non-recursive call
  
  The following procedure was not possible if max_sp_recursion_depth is 0
  create procedure show_proc() show create procedure show_proc;
  
  Actually there is no recursive call but the limit is checked.
  
  Solved by temporarily increasing the thread's limit just before the fetch from cache
  and decreasing after that.

  mysql-test/r/sp.result@1.212.1.1, 2006-08-04 12:50:43+02:00, andrey@lmy004. +7 -0
    update result

  mysql-test/t/sp.test@1.195.1.1, 2006-08-04 12:50:43+02:00, andrey@lmy004. +10 -0
    Test for bug #21416 SP: Recursion level higher than zero needed for non-recursive call

  sql/sp.cc@1.116, 2006-08-04 12:50:44+02:00, andrey@lmy004. +15 -6
    Increase the max_sp_recursion_depth temporarily for SHOW CREATE PROCEDURE call.
    This call is in fact not recursive but is counted as such. Outcome, it will work
    always but if max_sp_recursion_depth is reached we are going to cache one more
    sp_head instance.

ChangeSet@1.2260, 2006-08-04 10:42:04+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#21044
    report only once on "all dump 1000"

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@1.74, 2006-08-04 10:42:02+02:00, jonas@perch.ndb.mysql.com +3 -2
    report DM only once

  storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp@1.13, 2006-08-04 10:42:02+02:00, jonas@perch.ndb.mysql.com +1 -1
    report DM only once

ChangeSet@1.1810.1972.20, 2006-08-04 10:30:57+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21129
    add missing function to mgmapi

  ndb/src/mgmapi/ndb_logevent.cpp@1.3.5.1, 2006-08-04 10:30:55+02:00, jonas@perch.ndb.mysql.com +7 -0
    add missing function

ChangeSet@1.1616.2712.8, 2006-08-04 09:43:23+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21400
    Fix docs for NdbOpertation::sub_reg

  ndb/include/ndbapi/NdbOperation.hpp@1.18.1.2, 2006-08-04 09:43:22+02:00, jonas@perch.ndb.mysql.com +1 -1
    Fix docs for sub_reg

ChangeSet@1.1616.2712.7, 2006-08-04 08:41:32+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#20296 (recommit in 4.1)
     Make sure that tupkeyErrorLab is run if interpretedUpdate(fail), so that entry is not inserted into index.
       Yeilding crash on following dml on tupel
  

  ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.11.1.2, 2006-08-04 08:41:31+02:00, jonas@perch.ndb.mysql.com +6 -4
    Make sure that tupkeyErrorLab is run if interpretedUpdate(fail), so that entry is not inserted into index.
          Yeilding crash on following dml on tupe
    

ChangeSet@1.1810.1997.2, 2006-08-04 01:41:21+04:00, kostja@bodhi.local +1 -0
  Add my_memmem.c to mysys.dsp (needed by mysql_client_test)

  VC++Files/mysys/mysys.dsp@1.30.1.1, 2006-08-04 01:41:18+04:00, kostja@bodhi.local +4 -0
    Add my_memmem.c to mysys.dsp (needed by mysql_client_test)

ChangeSet@1.1810.1997.1, 2006-08-04 00:00:48+04:00, kostja@bodhi.local +2 -0
  Fix a bug in the .dsp file. Ignore a symlink.

  VC++Files/sql/mysqld.dsp@1.36.1.9, 2006-08-04 00:00:43+04:00, kostja@bodhi.local +1 -1
    Fix a bug in the .dsp file.

  BitKeeper/etc/ignore@1.210.1.18, 2006-08-04 00:00:43+04:00, kostja@bodhi.local +1 -0
    Added ndb/src/common/util/testBitmask.cpp to the ignore list

ChangeSet@1.1810.1987.15, 2006-08-03 16:00:15-04:00, iggy@rolltop.ignatz42.dyndns.org +1 -0
  Bug #20968: incorrect DBUG_ENTER string in mysqld.cc network_init(void) function

  sql/mysqld.cc@1.439.1.126, 2006-08-03 16:00:12-04:00, iggy@rolltop.ignatz42.dyndns.org +1 -1
    Corrected debug message.

ChangeSet@1.2255.1.8, 2006-08-03 19:43:52+02:00, tsmith@maint1.mysql.com +1 -0
  Manual merge resolve, part 6 of 6+

  mysql-test/r/warnings.result@1.43, 2006-08-03 19:43:40+02:00, tsmith@maint1.mysql.com +0 -7
    Manual merge resolve, part 6 of 6+

ChangeSet@1.2255.3.3, 2006-08-03 19:35:00+02:00, msvensson@neptunus.(none) +1 -0
  Use "--source" command instead of "source", makes mysql-test-run.pl dtecte this as test case that need binlog format row.

  mysql-test/t/rpl_row_stop_middle.test@1.2, 2006-08-03 19:34:58+02:00, msvensson@neptunus.(none) +2 -2
    Use "--source" command instead of "source", makes mysql-test-run.pl dtecte this as test case that need binlog format row.

ChangeSet@1.2181.180.1, 2006-08-03 21:28:15+04:00, petr@mysql.com +14 -0
  Fix Bug #18559 "log tables cannot change engine, and
                  gets deadlocked when dropping w/ log on"
  
  Log tables rely on concurrent insert machinery to add data.
  This means that log tables are always opened and locked by
  special (artificial) logger threads. Because of this, the thread
  which tries to drop a log table starts to wait for the table
  to be unlocked. Which will happen only if the log table is disabled.
  Alike situation happens if one tries to alter a log table.
  However in addition to the problem above, alter table calls
  check_if_locking_is_allowed() routine for the engine. The
  routine does not allow alter for the log tables. So, alter
  doesn't start waiting forever for logs to be disabled, but 
  returns with an error.
  Another problem is that not all engines could be used for
  the log tables. That's because they need concurrent insert.
  
  In this patch we:
  (1) Explicitly disallow to drop/alter a log table if it
      is currently used by the logger.
  (2) Update MyISAM to support log tables
  (3) Allow to drop log tables/alter log tables if log is
      disabled
  At the same time we (4) Disallow to alter log tables to
  unsupported engine (after this patch CSV and MyISAM are 
  alowed)
  Recommit with review fixes.

  mysql-test/r/log_tables.result@1.5.1.1, 2006-08-03 21:28:09+04:00, petr@mysql.com +141 -0
    Update result file.
    Note: there are warnings in result file. This is because of CSV
    bug (Bug #21328). They should go away after it is fixed.

  mysql-test/t/log_tables.test@1.10.1.1, 2006-08-03 21:28:09+04:00, petr@mysql.com +133 -0
    Add a test for the bug

  sql/handler.cc@1.250.1.1, 2006-08-03 21:28:09+04:00, petr@mysql.com +28 -0
    Add a function to check if a table we're going to lock
    is a log table and if the lock mode we want allowed

  sql/handler.h@1.224.1.1, 2006-08-03 21:28:10+04:00, petr@mysql.com +2 -0
    Add a new function to check compatibility of the locking

  sql/log.cc@1.223, 2006-08-03 21:28:10+04:00, petr@mysql.com +4 -3
    we shouldn't close the log table if and only
    if this particular table is already closed

  sql/log.h@1.13, 2006-08-03 21:28:10+04:00, petr@mysql.com +8 -0
    add new functions to check if a log is enabled

  sql/share/errmsg.txt@1.110.2.1, 2006-08-03 21:28:10+04:00, petr@mysql.com +6 -0
    add new error messages

  sql/sql_table.cc@1.358.2.1, 2006-08-03 21:28:10+04:00, petr@mysql.com +48 -0
    DROP and ALTER TABLE should not work on log
    tables if the log tables are enabled

  storage/csv/ha_tina.cc@1.53, 2006-08-03 21:28:10+04:00, petr@mysql.com +3 -21
    move function to check if the locking for the log
    tables allowed to handler class, so that we can
    reuse it in other engines.

  sql/ha_myisam.cc@1.184.2.1, 2006-08-03 21:28:09+04:00, petr@mysql.com +9 -0
    Add log table handling to myisam: as log tables
    use concurrent insert, they are typically
    locked with TL_CONCURRERENT_INSERT lock. So,
    disallow other threads to attempt locking of
    the log tables in incompatible modes. Because
    otherwise the threads will wait for the tables
    to be unlocked forever.

  storage/myisam/mi_extra.c@1.50, 2006-08-03 21:28:10+04:00, petr@mysql.com +5 -0
    add new ::extra() flag processing to myisam

  storage/myisam/mi_open.c@1.103, 2006-08-03 21:28:10+04:00, petr@mysql.com +1 -0
    init log table flag

  storage/myisam/mi_write.c@1.59, 2006-08-03 21:28:10+04:00, petr@mysql.com +12 -0
    update status after each write if it's a log table

  storage/myisam/myisamdef.h@1.90, 2006-08-03 21:28:10+04:00, petr@mysql.com +3 -0
    Add new log table flag to myisam share.
    We need it to distinguish between usual
    and log tables, as for the log tables we
    should provide concurrent insert in a
    different way than for usual tables: we
    want new rows to be immediately visible
    to other threads.

ChangeSet@1.2255.4.1, 2006-08-03 19:27:00+02:00, tsmith@maint1.mysql.com +2 -0
  5.0 -> 5.1 manual merge, part 5 of 5 (or more?)

  mysql-test/r/mysqldump.result@1.116, 2006-08-03 19:26:35+02:00, tsmith@maint1.mysql.com +41 -31
    5.0 -> 5.1 manual merge, part 5 of 5 (or more?)

  mysql-test/t/mysqldump.test@1.110, 2006-08-03 19:26:35+02:00, tsmith@maint1.mysql.com +4 -8
    5.0 -> 5.1 manual merge, part 5 of 5 (or more?)

ChangeSet@1.2255.3.2, 2006-08-03 19:15:55+02:00, msvensson@neptunus.(none) +1 -0
  Replace FEDERATED_EQ with STRING_WITH_LEN("=")

  sql/ha_federated.cc@1.70, 2006-08-03 19:15:53+02:00, msvensson@neptunus.(none) +1 -1
    After merge fix

ChangeSet@1.1616.2714.2, 2006-08-03 19:20:30+03:00, gkodinov@macbook.gmz +4 -0
  Bug #21180: Subselect with index for both WHERE and ORDER BY produces empty result
   Reseting subqueries with "quick" access methods was incomplete.
   Partially backported the correct reseting of QUICK_SELECTs from 5.x.

  mysql-test/r/subselect.result@1.67.1.114, 2006-08-03 19:20:21+03:00, gkodinov@macbook.gmz +29 -0
    Bug #21180: Subselect with index for both WHERE and ORDER BY produces empty result
     - test case

  mysql-test/t/subselect.test@1.58.1.100, 2006-08-03 19:20:22+03:00, gkodinov@macbook.gmz +26 -0
    Bug #21180: Subselect with index for both WHERE and ORDER BY produces empty result
     - test case

  sql/opt_range.cc@1.98.2.50, 2006-08-03 19:20:23+03:00, gkodinov@macbook.gmz +13 -1
    Bug #21180: Subselect with index for both WHERE and ORDER BY produces empty result
     - partially backported the correct reseting of QUICK_SELECTs from 5.x.

  sql/opt_range.h@1.28.1.13, 2006-08-03 19:20:23+03:00, gkodinov@macbook.gmz +2 -2
    Bug #21180: Subselect with index for both WHERE and ORDER BY produces empty result
     - partially backported the correct reseting of QUICK_SELECTs from 5.x.

ChangeSet@1.1810.1995.1, 2006-08-03 17:29:35+02:00, msvensson@neptunus.(none) +1 -0
  Bug#20190 Unixware 7.13 port and make test errors
     - Thanks to cerber for the patch!

  server-tools/instance-manager/portability.h@1.8.1.1, 2006-08-03 17:29:30+02:00, msvensson@neptunus.(none) +5 -1
    Define SHUT_RDWR also on Unixware 7

ChangeSet@1.1810.1987.12, 2006-08-03 16:47:24+02:00, msvensson@neptunus.(none) +2 -0
  Make test case for bug#21215repeateble by calling "reset master"

  mysql-test/r/mysqldump.result@1.83.1.26, 2006-08-03 16:47:21+02:00, msvensson@neptunus.(none) +2 -1
    Make test case for bug#21215repeateble by calling "reset master"

  mysql-test/t/mysqldump.test@1.76.1.23, 2006-08-03 16:47:21+02:00, msvensson@neptunus.(none) +3 -0
    Make test case for bug#21215repeateble by calling "reset master"

ChangeSet@1.1810.1987.11, 2006-08-03 15:48:28+02:00, msvensson@neptunus.(none) +1 -0
  Update result after merge, since the function Item::tmp_table_field_from_field_type() 
  now takes mbmaxlen into account when calculating max_length of new field. 

  mysql-test/r/union.result@1.80.1.5, 2006-08-03 15:48:26+02:00, msvensson@neptunus.(none) +1 -1
    Update result after merge, since the function Item::tmp_table_field_from_field_type() 
    now takes mbmaxlen into account when calculating max_length of new field. 

ChangeSet@1.1810.1972.17, 2006-08-03 15:38:04+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#21384
    merge 4.1->5.0 (variable rename)

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.73.27.2, 2006-08-03 15:38:02+02:00, jonas@perch.ndb.mysql.com +1 -1
    merge #21384 4.1->5.0
      variable rename

ChangeSet@1.2243.1.2, 2006-08-03 17:23:37+04:00, petr@mysql.com +3 -0
  Fix Bug #20139 Infinite loop after "FLUSH" and "LOCK tabX, general_log"
  Due to incorrect handling of FLUSH TABLES, log tables were marked for flush,
  but not reopened. Later we started to wait for the log table to be closed
  (disabled) after the flush. And as nobody disabled logs in concurrent treads,
  the command lasted forever.
  After internal consultations it was decided to skip logs during FLUSH TABLES.
  The reasoning is that logging is done in the "log device", whatever it is
  which is always active and controlled by FLUSH LOGS. So, to flush logs
  one should use FLUSH LOGS, and not FLUSH TABLES.

  mysql-test/r/log_tables.result@1.6, 2006-08-03 17:23:22+04:00, petr@mysql.com +5 -0
    update result file

  mysql-test/t/log_tables.test@1.11, 2006-08-03 17:23:22+04:00, petr@mysql.com +10 -0
    add a test for the bug

  sql/sql_base.cc@1.336.1.1, 2006-08-03 17:23:22+04:00, petr@mysql.com +11 -7
    Skip log tables during FLUSH TABLES

ChangeSet@1.1810.1994.1, 2006-08-03 14:58:13+02:00, tnurnberg@mysql.com +2 -0
  Bug#20214: Incorrect error when user calls SHOW CREATE VIEW on non privileged view
  
  "A SELECT privilege on a view is required for SHOW CREATE VIEW and it will stay
  that way because of compatibility reasons." (see #20136)
  
  a test case to illustrate how the ACLs work in this case (and ensure they will continue
  to do so in the future)

  mysql-test/r/grant.result@1.37.5.1, 2006-08-03 14:57:59+02:00, tnurnberg@mysql.com +75 -0
    Bug#20214: Incorrect error when user calls SHOW CREATE VIEW on non privileged view
    
    a test case to illustrate how the ACLs work in this case (and ensure they will continue
    to do so in the future)

  mysql-test/t/grant.test@1.41.2.1, 2006-08-03 14:57:59+02:00, tnurnberg@mysql.com +123 -0
    Bug#20214: Incorrect error when user calls SHOW CREATE VIEW on non privileged view
    
    a test case to illustrate how the ACLs work in this case (and ensure they will continue
    to do so in the future)

ChangeSet@1.1810.1972.16, 2006-08-03 14:46:11+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#20892
    Correction of bug#19852 (that also revealed another bug)
    Do grow noOfPagesToGrow with more than was actually allocated

  ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp@1.1.2.1, 2006-08-03 14:46:09+02:00, jonas@perch.ndb.mysql.com +2 -2
    Dont grow "noOfPagesToGrow" with more than was actually allocated
      (as it will then grow indefinitly)

ChangeSet@1.1616.2712.6, 2006-08-03 14:01:37+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#20892
    Fix bug in tup buddy allocator, which made it make invalid access to cfreepagelist[16] (which is not defined)

  ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp@1.5.1.1, 2006-08-03 14:01:35+02:00, jonas@perch.ndb.mysql.com +17 -13
    loop from firstListToCheck -1 (as firstListToCheck has already been checked), when looking for less than requested pages
    add if-statement for firtListToCheck == 0

ChangeSet@1.1616.2718.2, 2006-08-03 12:16:24+02:00, msvensson@neptunus.(none) +1 -0
  Bug#21419 test case lowercase_fs_off fails on Windows
   - Backport patch from 5.0

  sql/mysqld.cc@1.356.98.27, 2006-08-03 12:16:20+02:00, msvensson@neptunus.(none) +5 -0
    Add else case to set "lower_case_file_system" also when lower_case_table_names are 1

ChangeSet@1.1810.1989.9, 2006-08-03 12:09:22+02:00, msvensson@neptunus.(none) +2 -0
  Remove double error printout in mysqldump

  client/mysqldump.c@1.214.13.2, 2006-08-03 12:09:20+02:00, msvensson@neptunus.(none) +0 -2
    Remove double error printout, mysql_query_with_error_report will do that. And set the exit code for us.

  mysql-test/r/mysqldump.result@1.83.1.25, 2006-08-03 12:09:20+02:00, msvensson@neptunus.(none) +1 -1
    Update test result after merge

ChangeSet@1.1616.2716.1, 2006-08-03 14:03:08+05:00, svoj@may.pils.ru +3 -0
  BUG#7391 - Cross-database multi-table UPDATE uses active database
             privileges
  
  This problem is 4.1 specific. It doesn't affect 4.0 and was fixed
  in 5.x before.
  
  Having any mysql user who is allowed to issue multi table update
  statement and any column/table grants, allows this user to update
  any table on a server (mysql grant tables are not exception).
  
  check_grant() accepts number of tables (in table list) to be checked
  in 5-th param. While checking grants for multi table update, number
  of tables must be 1. It must never be 0 (actually we have
  DBUG_ASSERT(number > 0) in 5.x in grant_check() function).

  mysql-test/r/grant.result@1.21.1.21, 2006-08-03 14:03:05+05:00, svoj@may.pils.ru +5 -4
    Addition to test case for bug#7391:
    - Added grant statement to trigger this problem in 4.1.
    - Fixed error messages.

  mysql-test/t/grant.test@1.17.1.18, 2006-08-03 14:03:05+05:00, svoj@may.pils.ru +6 -4
    Addition to test case for bug#7391:
    - Added grant statement to trigger this problem in 4.1.
    - Fixed error messages.

  sql/sql_update.cc@1.83.2.73, 2006-08-03 14:03:05+05:00, svoj@may.pils.ru +1 -1
    check_grant() accepts number of tables (in table list) to be checked
    in 5-th param. For this particular check number of tables must be 1.
    It must never be 0 (actually we have DBUG_ASSERT(number > 0) in 5.x
    in grant_check() function).

ChangeSet@1.2255.1.6, 2006-08-03 10:48:01+02:00, tsmith@maint1.mysql.com +1 -0
  5.0 -> 5.1 manual merge, part 4 of 4 (or more?)

  sql/ha_myisammrg.cc@1.92.1.1, 2006-08-03 10:47:15+02:00, tsmith@maint1.mysql.com +1 -1
    5.0 -> 5.1 manual merge, part 4 of 4 (or more?)

ChangeSet@1.1810.1987.8, 2006-08-03 09:48:42+02:00, msvensson@neptunus.(none) +1 -0
  Removing disabling of lowercase_fs_off

  mysql-test/t/disabled.def@1.2.4.13, 2006-08-03 09:48:40+02:00, msvensson@neptunus.(none) +0 -1
    Removing disabling of lowercase_fs_off

ChangeSet@1.2181.159.36, 2006-08-03 08:12:56+02:00, ingo@chilla.local +4 -0
  Bug#18775 - Temporary table from alter table visible to other threads
  New test cases. Names with umlauts don't compare well on Windows.

  mysql-test/r/alter_table.result@1.66, 2006-08-03 08:12:53+02:00, ingo@chilla.local +30 -25
    Bug#18775 - Temporary table from alter table visible to other threads
    New test results

  mysql-test/r/backup.result@1.19, 2006-08-03 08:12:53+02:00, ingo@chilla.local +10 -10
    Bug#18775 - Temporary table from alter table visible to other threads
    New test results

  mysql-test/t/alter_table.test@1.51, 2006-08-03 08:12:53+02:00, ingo@chilla.local +15 -24
    Bug#18775 - Temporary table from alter table visible to other threads
    New test case. Names with umlauts don't compare well on Windows.

  mysql-test/t/backup.test@1.22, 2006-08-03 08:12:53+02:00, ingo@chilla.local +8 -8
    Bug#18775 - Temporary table from alter table visible to other threads
    New test case. Names with umlauts don't compare well on Windows.

ChangeSet@1.1810.1906.28, 2006-08-02 22:18:49-07:00, malff@weblab.(none) +7 -0
  Bug#8153 (Stored procedure with subquery and continue handler, wrong result)
  
  Before this fix,
  - a runtime error in a statement in a stored procedure with no error handlers
  was properly detected (as expected)
  - a runtime error in a statement with an error handler inherited from a non
  local runtime context (i.e., proc a with a handler, calling proc b) was
  properly detected (as expected)
  - a runtime error in a statement with a *local* error handler was executed
  as follows :
  a) the statement would succeed, regardless of the error condition, (bug)
  b) the error handler would be called (as expected).
  
  The root cause is that functions like my_messqge_sql would "forget" to set
  the thread flag thd->net.report_error to 1, because of the check involving
  sp_rcontext::found_handler_here().
  Failure to set this flag would cause, later in the call stack,
  in Item_func::fix_fields() at line 190, the code to return FALSE and consider
  that executing the statement was successful.
  
  With this fix :
  - error handling code, that was duplicated in different places in the code,
  is now implemented in sp_rcontext::handle_error(),
  - handle_error() correctly sets thd->net.report_error when a handler is
  present, regardless of the handler location (local, or in the call stack).
  
  A test case, bug8153_subselect, has been written to demonstrate the change
  of behavior before and after the fix.
  
  Another test case, bug8153_function_a, as also been writen.
  This test has the same behavior before and after the fix.
  This test has been written to demonstrate that the previous expected
  result of procedure bug18787, was incorrect, since select no_such_function()
  should fail and therefore not produce a result.
  
  The incorrect result for bug18787 has the same root cause as Bug#8153,
  and the expected result has been adjusted.

  mysql-test/r/sp.result@1.170.18.3, 2006-08-02 21:45:42-07:00, malff@weblab.(none) +60 -2
    Bug#8153, added test cases, fixed expected result of bug18787.

  mysql-test/t/sp.test@1.174.14.1, 2006-08-02 21:44:48-07:00, malff@weblab.(none) +62 -0
    Bug#8153, added test cases.

  sql/mysqld.cc@1.439.66.1, 2006-08-02 21:36:06-07:00, malff@weblab.(none) +1 -3
    Bug#8153, use sp_rcontext::handle_error() to handle errors.

  sql/protocol.cc@1.111.1.4, 2006-08-02 21:39:59-07:00, malff@weblab.(none) +7 -8
    Bug#8153, use sp_rcontext::handle_error() to handle errors.

  sql/sp_rcontext.cc@1.43, 2006-08-02 21:43:00-07:00, malff@weblab.(none) +59 -0
    Bug#8153, created helper sp_rcontext::handle_error() to handle errors.

  sql/sp_rcontext.h@1.33, 2006-08-02 21:41:51-07:00, malff@weblab.(none) +6 -0
    Bug#8153, created helper sp_rcontext::handle_error() to handle errors.

  sql/sql_error.cc@1.36.1.2, 2006-08-02 21:38:45-07:00, malff@weblab.(none) +1 -7
    Bug#8153, use sp_rcontext::handle_error() to handle errors.

ChangeSet@1.1810.1989.7, 2006-08-02 22:21:12+04:00, kostja@bodhi.local +1 -0
  Disable a failing test case (filed a p1 bug)

  mysql-test/t/disabled.def@1.2.4.12, 2006-08-02 22:21:08+04:00, kostja@bodhi.local +1 -0
    Disable a failing test case (filed a p1 bug)

ChangeSet@1.1616.2710.3, 2006-08-02 13:06:59-04:00, cmiller@zippy.cornsilk.net +3 -0
  Bug#9719: DELETE with WHERE on HEAP table just deletes first row of matched
  set.
  
  (Ramil's patch, recreated.)

  mysql-test/r/heap_btree.result@1.13.2.1, 2006-08-02 13:06:58-04:00, cmiller@zippy.cornsilk.net +35 -0
    Test for bug #9719: DELETE with WHERE on HEAP table just deletes first 
    row of matched set.

  mysql-test/t/heap_btree.test@1.12.1.2, 2006-08-02 13:06:58-04:00, cmiller@zippy.cornsilk.net +19 -1
    Test for bug #9719: DELETE with WHERE on HEAP table just deletes first 
    row of matched set.

  heap/hp_delete.c@1.12.1.2, 2006-08-02 13:06:58-04:00, cmiller@zippy.cornsilk.net +3 -0
    Reset info->lastkey_len for further heap_rnext/heap_rprev calls.

ChangeSet@1.2181.159.35, 2006-08-02 18:39:21+02:00, ingo@chilla.local +1 -0
  Bug#18775 - Temporary table from alter table visible to other threads
  Reverting part of the patch. NDB has unencoded names in their
  data dictionary.

  sql/sql_table.cc@1.360.1.2, 2006-08-02 18:39:18+02:00, ingo@chilla.local +1 -5
    Bug#18775 - Temporary table from alter table visible to other threads
    Reverting part of the patch. NDB has unencoded names in their
    data dictionary.

ChangeSet@1.2181.179.1, 2006-08-02 17:57:06+02:00, ingo@chilla.local +25 -0
  Bug#18775 - Temporary table from alter table visible to other threads
  Continued implementation of WL#1324 (table name to filename encoding)
  
  The intermediate (not temporary) files of the new table
  during ALTER TABLE was visible for SHOW TABLES. These
  intermediate files are copies of the original table with
  the changes done by ALTER TABLE. After all the data is
  copied over from the original table, these files are renamed 
  to the original tables file names. So they are not temporary 
  files. They persist after ALTER TABLE, but just with another 
  name.
  
  In 5.0 the intermediate files are invisible for SHOW TABLES
  because all file names beginning with "#sql" were suppressed.
  
  This failed since 5.1.6 because even temporary table names were
  converted when making file names from them. The prefix became
  converted to "@0023sql". Converting the prefix during SHOW TABLES
  would suppress the listing of user tables that start with "#sql".
  
  The solution of the problem is to continue the implementation of
  the table name to file name conversion feature. One requirement
  is to suppress the conversion for temporary table names.
  
  This change is straightforward for real temporary tables as there
  is a function that creates temporary file names.
  
  But the generated path names are located in TMPDIR and have no
  relation to the internal table name. This cannot be used for
  ALTER TABLE. Its intermediate files need to be in the same
  directory as the old table files. And it is necessary to be
  able to deduce the same path from the same table name repeatedly.
  
  Consequently the intermediate table files must be handled like normal
  tables. Their internal names shall start with tmp_file_prefix
  (#sql) and they shall not be converted like normal table names.
  
  I added a flags parameter to all relevant functions that are
  called from ALTER TABLE. It is used to suppress the conversion
  for the intermediate table files.
  
  The outcome is that the suppression of #sql in SHOW TABLES
  works again. It does not suppress user tables as these are
  converted to @0023sql on file level.
  
  This patch does also fix ALTER TABLE ... RENAME, which could not 
  rename a table with non-ASCII characters in its name.
  
  It does also fix the problem that a user could create a table like
  `#sql-xxxx-yyyy`, where xxxx is mysqld's pid and yyyy is the thread
  ID of some other thread, which prevented this thread from running 
  ALTER TABLE.
  
  Some of the above problems are mentioned in Bug 1405, which can
  be closed with this patch.
  
  This patch does also contain some minor fixes for other forgotten
  conversions. Still known problems are reported as bugs 21370,
  21373, and 21387.

  mysql-test/r/alter_table.result@1.65, 2006-08-02 17:57:02+02:00, ingo@chilla.local +60 -0
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Added test results.

  mysql-test/r/backup.result@1.18, 2006-08-02 17:57:02+02:00, ingo@chilla.local +20 -0
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Added test results.

  mysql-test/r/repair.result@1.19, 2006-08-02 17:57:02+02:00, ingo@chilla.local +6 -0
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Added test results.

  mysql-test/t/alter_table.test@1.50, 2006-08-02 17:57:02+02:00, ingo@chilla.local +63 -0
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Added test cases.

  mysql-test/t/backup.test@1.21, 2006-08-02 17:57:02+02:00, ingo@chilla.local +19 -0
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Added test cases.

  mysql-test/t/repair.test@1.16, 2006-08-02 17:57:02+02:00, ingo@chilla.local +13 -0
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Added a test case.

  sql/ha_ndbcluster.cc@1.336.6.1, 2006-08-02 17:57:02+02:00, ingo@chilla.local +7 -7
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Added an zero argument for the new 'flags' parameter.

  sql/ha_ndbcluster_binlog.cc@1.77, 2006-08-02 17:57:02+02:00, ingo@chilla.local +7 -6
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Added an zero argument for the new 'flags' parameter.

  sql/ha_ndbcluster_binlog.h@1.15, 2006-08-02 17:57:02+02:00, ingo@chilla.local +1 -1
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Removed unnecessary check for wrong temp file prefix.

  sql/mysql_priv.h@1.416.3.1, 2006-08-02 17:57:02+02:00, ingo@chilla.local +10 -7
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Extended quick_rm_table(), mysql_rename_table(), and
    build_table_filename() by an flags argument, which can indicate
    temporary table names that should not be converted.
    Added symbolic flag values.

  sql/sql_acl.cc@1.199.1.1, 2006-08-02 17:57:02+02:00, ingo@chilla.local +1 -1
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Added an zero argument for the new 'flags' parameter.

  sql/sql_base.cc@1.333.1.1, 2006-08-02 17:57:02+02:00, ingo@chilla.local +9 -4
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Fixed a comment.
    Added DBUG calls.

  sql/sql_db.cc@1.138.2.1, 2006-08-02 17:57:02+02:00, ingo@chilla.local +12 -10
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Added an zero argument for the new 'flags' parameter.

  sql/sql_delete.cc@1.186.2.1, 2006-08-02 17:57:02+02:00, ingo@chilla.local +1 -1
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Added an zero argument for the new 'flags' parameter.

  sql/sql_insert.cc@1.210.1.1, 2006-08-02 17:57:03+02:00, ingo@chilla.local +5 -3
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Added an zero argument for the new 'flags' parameter.

  sql/sql_partition.cc@1.80.2.1, 2006-08-02 17:57:03+02:00, ingo@chilla.local +13 -13
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Added an zero argument for the new 'flags' parameter.

  sql/sql_rename.cc@1.37, 2006-08-02 17:57:03+02:00, ingo@chilla.local +4 -4
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Added an zero argument for the new 'flags' parameter.

  sql/sql_show.cc@1.354.3.1, 2006-08-02 17:57:03+02:00, ingo@chilla.local +4 -7
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Reverted the former fix for this bug. tmp_file_prefix is now used
    verbatim in the comparison of file names.

  sql/sql_table.cc@1.356.2.1, 2006-08-02 17:57:03+02:00, ingo@chilla.local +216 -76
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Added a check for a tmp_file_prefix file name to
    filename_to_tablename(). These names are now accepted without
    conversion.
    Extended quick_rm_table(), mysql_rename_table(), and
    build_table_filename() by an flags argument, which can indicate
    temporary table names that should not be converted.
    Removed the table to file name conversion from
    build_tmptable_filename().
    Disabled REPAIR TABLE ... USE_FRM for temporary tables.
    Added the forgotten conversion to mysql_alter_table() for the case
    of ALTER TABLE ... RENAME.
    Added comments and DBUG calls.

  sql/sql_trigger.cc@1.56.1.3, 2006-08-02 17:57:03+02:00, ingo@chilla.local +9 -8
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Added an zero argument for the new 'flags' parameter.

  sql/sql_view.cc@1.95.1.1, 2006-08-02 17:57:03+02:00, ingo@chilla.local +3 -3
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Added an zero argument for the new 'flags' parameter.

  sql/table.cc@1.230.1.1, 2006-08-02 17:57:03+02:00, ingo@chilla.local +9 -4
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Replaced a literal ".frm" by reg_ext.
    Added DBUG calls.

  storage/innobase/row/row0mysql.c@1.126.1.1, 2006-08-02 17:57:03+02:00, ingo@chilla.local +2 -2
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Changed back the encoded temp file prefix to #sql.

  sql/ha_myisam.cc@1.184.1.1, 2006-08-02 17:57:02+02:00, ingo@chilla.local +8 -2
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Added missing table name mapping calls to backup() and restore().

  sql/ha_myisammrg.cc@1.90.1.1, 2006-08-02 17:57:02+02:00, ingo@chilla.local +1 -1
    Bug#18775 - Temporary table from alter table visible to other threads
    Continued implementation of WL#1324 (table name to filename encoding)
    Added an zero argument for the new 'flags' parameter.

ChangeSet@1.1810.1989.5, 2006-08-02 19:39:47+04:00, kostja@bodhi.local +1 -0
  A post-merge fix.

  mysql-test/r/ps.result@1.56.1.15, 2006-08-02 19:39:43+04:00, kostja@bodhi.local +14 -71
    A post-merge fix.

ChangeSet@1.2242.1.4, 2006-08-02 15:41:59+02:00, msvensson@neptunus.(none) +1 -0
  Disable crash_commit_before waiting for a "crash()" function that won't generate a core.

  mysql-test/t/disabled.def@1.181.1.1, 2006-08-02 15:41:56+02:00, msvensson@neptunus.(none) +1 -1
    Disable crash_commit_before waiting for a "crash()" function that won't generate a core.

ChangeSet@1.2259, 2006-08-02 14:45:29+02:00, jonas@perch.ndb.mysql.com +4 -0
  ndb -
    make Dblqh use OM_AUTO_SYNC

  storage/ndb/include/kernel/signaldata/FsOpenReq.hpp@1.6, 2006-08-02 14:45:27+02:00, jonas@perch.ndb.mysql.com +1 -0
    make Dblqh us OM_AUTO_SYNC

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.53, 2006-08-02 14:45:27+02:00, jonas@perch.ndb.mysql.com +1 -5
    make Dblqh us OM_AUTO_SYNC

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.118, 2006-08-02 14:45:27+02:00, jonas@perch.ndb.mysql.com +12 -14
    make Dblqh us OM_AUTO_SYNC

  storage/ndb/src/kernel/vm/pc.hpp@1.14, 2006-08-02 14:45:27+02:00, jonas@perch.ndb.mysql.com +0 -7
    remove unused #defines

ChangeSet@1.2258, 2006-08-02 14:27:05+02:00, jonas@perch.ndb.mysql.com +7 -0
  ndb - Add possibility to limit disk write speed in backup(lcp)
        3 new paramters:
        DiskSyncSize - Outstanding disk writes before sync (default 4M)
        DiskCheckpointSpeed - Write speed of LCP in bytes/sec (default 10M)
        DiskCheckpointSpeedInRestart - As above but during LCP (default 100M)
  
        Depricated old NoOfDiskPagesToDisk*
  
      - Change NoOfFragmentLogFiles default to 16 (1Gb)

  storage/ndb/include/kernel/signaldata/BackupContinueB.hpp@1.4, 2006-08-02 14:27:03+02:00, jonas@perch.ndb.mysql.com +2 -1
    Add possibility to limitat of disk write speed in backup

  storage/ndb/include/mgmapi/mgmapi_config_parameters.h@1.28, 2006-08-02 14:27:03+02:00, jonas@perch.ndb.mysql.com +4 -0
    Add possibility to limitat of disk write speed in backup

  storage/ndb/src/kernel/blocks/backup/Backup.cpp@1.49, 2006-08-02 14:27:03+02:00, jonas@perch.ndb.mysql.com +140 -35
    Add possibility to limitat of disk write speed in backup

  storage/ndb/src/kernel/blocks/backup/Backup.hpp@1.21, 2006-08-02 14:27:03+02:00, jonas@perch.ndb.mysql.com +18 -1
    Add possibility to limitat of disk write speed in backup

  storage/ndb/src/kernel/blocks/backup/BackupInit.cpp@1.25, 2006-08-02 14:27:03+02:00, jonas@perch.ndb.mysql.com +21 -1
    Add possibility to limitat of disk write speed in backup

  storage/ndb/src/mgmsrv/ConfigInfo.cpp@1.84, 2006-08-02 14:27:03+02:00, jonas@perch.ndb.mysql.com +45 -9
    Add possibility to limitat of disk write speed in backup
    Change NoOfFragmentLogFiles default to 16 (1Gb)
    DiskSyncSize
    DiskCheckpointSpeed
    DiskCheckpointSpeedInRestart

  storage/ndb/src/mgmsrv/InitConfigFileParser.cpp@1.24, 2006-08-02 14:27:03+02:00, jonas@perch.ndb.mysql.com +12 -0
    Handle deprication warning also in my.cnf format

ChangeSet@1.1810.1992.1, 2006-08-02 17:15:50+05:00, svoj@may.pils.ru +16 -0
  BUG#14770 - LOAD DATA INFILE doesn't respect default values for
              columns
  Fixed confusing warning.
  
  Quoting INSERT section of the manual:
  ----
  Inserting NULL into a column that has been declared NOT NULL. For
  multiple-row INSERT statements or INSERT INTO ... SELECT statements, the
  column is set to the implicit default value for the column data type. This
  is 0 for numeric types, the empty string ('') for string types, and the
  "zero" value for date and time types. INSERT INTO ... SELECT statements are
  handled the same way as multiple-row inserts because the server does not
  examine the result set from the SELECT to see whether it returns a single
  row. (For a single-row INSERT, no warning occurs when NULL is inserted into
  a NOT NULL column. Instead, the statement fails with an error.)
  ----
  This is also true for LOAD DATA INFILE. For INSERT user can specify
  DEFAULT keyword as a value to set column default. There is no similiar
  feature available for LOAD DATA INFILE.

  mysql-test/r/ps_6bdb.result@1.27.6.1, 2006-08-02 17:15:47+05:00, svoj@may.pils.ru +1 -1
    Fixed confusing warning.

  mysql-test/r/auto_increment.result@1.34.1.5, 2006-08-02 17:15:46+05:00, svoj@may.pils.ru +2 -2
    Fixed confusing warning.

  mysql-test/r/create.result@1.107.5.1, 2006-08-02 17:15:46+05:00, svoj@may.pils.ru +1 -1
    Fixed confusing warning.

  mysql-test/r/insert.result@1.22.1.3, 2006-08-02 17:15:46+05:00, svoj@may.pils.ru +1 -1
    Fixed confusing warning.

  mysql-test/r/insert_select.result@1.35.4.1, 2006-08-02 17:15:46+05:00, svoj@may.pils.ru +2 -2
    Fixed confusing warning.

  mysql-test/r/key.result@1.28.1.7, 2006-08-02 17:15:46+05:00, svoj@may.pils.ru +2 -2
    Fixed confusing warning.

  mysql-test/r/null.result@1.33.1.2, 2006-08-02 17:15:46+05:00, svoj@may.pils.ru +9 -9
    Fixed confusing warning.

  mysql-test/r/null_key.result@1.35.1.1, 2006-08-02 17:15:47+05:00, svoj@may.pils.ru +1 -1
    Fixed confusing warning.

  mysql-test/r/ps_2myisam.result@1.39.3.1, 2006-08-02 17:15:47+05:00, svoj@may.pils.ru +1 -1
    Fixed confusing warning.

  mysql-test/r/ps_3innodb.result@1.42.3.1, 2006-08-02 17:15:47+05:00, svoj@may.pils.ru +1 -1
    Fixed confusing warning.

  mysql-test/r/ps_4heap.result@1.38.3.1, 2006-08-02 17:15:47+05:00, svoj@may.pils.ru +1 -1
    Fixed confusing warning.

  mysql-test/r/ps_5merge.result@1.39.3.1, 2006-08-02 17:15:47+05:00, svoj@may.pils.ru +2 -2
    Fixed confusing warning.

  mysql-test/r/strict.result@1.25.3.1, 2006-08-02 17:15:47+05:00, svoj@may.pils.ru +9 -9
    Fixed confusing warning.

  mysql-test/r/view.result@1.138.11.1, 2006-08-02 17:15:47+05:00, svoj@may.pils.ru +1 -1
    Fixed confusing warning.

  mysql-test/r/warnings.result@1.34.4.1, 2006-08-02 17:15:47+05:00, svoj@may.pils.ru +4 -4
    Fixed confusing warning.

  sql/share/errmsg.txt@1.42.15.1, 2006-08-02 17:15:47+05:00, svoj@may.pils.ru +2 -2
    Fixed confusing warning.

ChangeSet@1.2257, 2006-08-02 14:03:55+02:00, jonas@perch.ndb.mysql.com +5 -0
  ndb - add OM_AUTO_SYNC ta make sure os-kernel does not buffer too much
        add sync-flag to FsAppendReq

  storage/ndb/include/kernel/signaldata/FsAppendReq.hpp@1.3, 2006-08-02 14:03:53+02:00, jonas@perch.ndb.mysql.com +2 -1
    Add sync flag to FsAppend

  storage/ndb/include/kernel/signaldata/FsOpenReq.hpp@1.5, 2006-08-02 14:03:53+02:00, jonas@perch.ndb.mysql.com +6 -5
    Add auto sync flag to FSOPEN

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp@1.33, 2006-08-02 14:03:53+02:00, jonas@perch.ndb.mysql.com +18 -11
    Add append_synch and auto sync

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp@1.8, 2006-08-02 14:03:53+02:00, jonas@perch.ndb.mysql.com +4 -3
    Add variables for auto sync

  storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp@1.28, 2006-08-02 14:03:53+02:00, jonas@perch.ndb.mysql.com +13 -4
    Add append_sync and auto sync

ChangeSet@1.2224.1.1, 2006-08-02 12:36:01+02:00, msvensson@neptunus.(none) +2 -0
  Bug#20942 ha_federated uses String::append(const char *s), strlen() on every call
   - Remove the defines for strings and uses STRING_WITH_LEN directly when calling 'append'

  sql/ha_federated.cc@1.66.1.1, 2006-08-02 12:35:58+02:00, msvensson@neptunus.(none) +85 -95
    Remove the defines for strings and their lengths and use STRING_WITH_LEN directly when calling append().

  sql/ha_federated.h@1.34, 2006-08-02 12:35:58+02:00, msvensson@neptunus.(none) +0 -79
    Remove the defines for strings and their lengths and use STRING_WITH_LEN directly when calling append().

ChangeSet@1.1810.1991.1, 2006-08-02 13:25:13+04:00, kostja@bodhi.local +1 -0
  Fix a compilation failiure on QNX

  sql/udf_example.c@1.29, 2006-08-02 13:25:11+04:00, kostja@bodhi.local +1 -1
    Declare tmp_error at the beginning of the block (this is C now)

ChangeSet@1.1810.1989.2, 2006-08-02 10:00:28+02:00, georg@lmy002.wdf.sap.corp +2 -0
  Bug #21396: Wrong error number generated for a missing table

  BitKeeper/etc/collapsed@1.1, 2006-08-02 08:59:47+02:00, georg@lmy002.wdf.sap.corp +1 -0
    BitKeeper file /home/georg/work/mysql/prod/mysql-5.0/BitKeeper/etc/collapsed

  BitKeeper/etc/collapsed@1.0, 2006-08-02 08:59:46+02:00, georg@lmy002.wdf.sap.corp +0 -0

  mysys/my_open.c@1.25.3.1, 2006-08-02 10:00:23+02:00, georg@lmy002.wdf.sap.corp +2 -2
    Win64 bit fix: Replacing 32-bit value (0xFFFFFFFF) by a generic error constant.

ChangeSet@1.1616.2712.5, 2006-08-02 09:08:21+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    Make possible to build both debug/release from compile-ndb-autotest

  BUILD/compile-ndb-autotest@1.2, 2006-08-02 09:08:20+02:00, jonas@perch.ndb.mysql.com +12 -2
    Make possible to build both debug/release from compile-ndb-autotest

ChangeSet@1.1810.1987.3, 2006-08-02 08:46:58+02:00, msvensson@neptunus.(none) +2 -0
  Disable test case for for bug 21042

  mysql-test/r/mysql.result@1.11.1.2, 2006-08-02 08:46:56+02:00, msvensson@neptunus.(none) +0 -1
    Disable test case for for bug 21042

  mysql-test/t/mysql.test@1.4.3.2, 2006-08-02 08:46:56+02:00, msvensson@neptunus.(none) +2 -0
    Disable test case for for bug 21042

ChangeSet@1.1810.1933.6, 2006-08-02 11:26:08+09:30, grog@eucla.lemis.com +3 -0
  BUG#13926: --order-by-primary fails if PKEY contains quote character.
  Quote PKEY.

  client/mysqldump.c@1.214.12.2, 2006-08-02 11:12:42+09:30, grog@eucla.lemis.com +12 -4
    Fix for BUG#13926: --order-by-primary fails if PKEY contains quote character.
    Quote PKEY.

  mysql-test/r/mysqldump.result@1.83.13.1, 2006-08-02 11:12:07+09:30, grog@eucla.lemis.com +71 -0
    Test results for BUG#13926: --order-by-primary fails if PKEY contains quote character

  mysql-test/t/mysqldump.test@1.76.13.1, 2006-08-02 11:11:25+09:30, grog@eucla.lemis.com +20 -0
    Test for BUG#13926: --order-by-primary fails if PKEY contains quote character

ChangeSet@1.1810.1933.5, 2006-08-02 10:48:47+09:30, grog@eucla.lemis.com +1 -0
  mysqldump.c:
    Tidy up style: no space before = or +=.

  client/mysqldump.c@1.214.12.1, 2006-08-02 10:47:59+09:30, grog@eucla.lemis.com +47 -47
    Tidy up style: no space before = or +=.

ChangeSet@1.1810.1989.1, 2006-08-02 02:21:36+02:00, tsmith@maint1.mysql.com +1 -0
  .del-sp.test.orig:
    Delete: mysql-test/t/sp.test.orig

  BitKeeper/deleted/.del-sp.test.orig@1.2, 2006-08-01 22:41:11+02:00, tsmith@maint1.mysql.com +0 -0
    Delete: mysql-test/t/sp.test.orig

ChangeSet@1.1810.1988.2, 2006-08-02 00:04:58+02:00, kent@mysql.com +1 -0
  mysql.sln:
    Use separate ID for mysqlimport and mysql_upgrade

  VC++Files/mysql.sln@1.5.3.1, 2006-08-02 00:04:10+02:00, kent@mysql.com +28 -1
    Use separate ID for mysqlimport and mysql_upgrade

ChangeSet@1.2254, 2006-08-02 00:38:38+04:00, evgen@sunlight.local +1 -0
  sql_view.cc:
    After merge fix

  sql/sql_view.cc@1.98, 2006-08-02 00:38:17+04:00, evgen@sunlight.local +2 -2
    After merge fix

ChangeSet@1.1810.1988.1, 2006-08-01 21:59:58+02:00, tsmith@maint1.mysql.com +3 -0
  Applied innodb-5.0-ss677 snapshot.
  
  Fixes:
  - bug #19834: Using cursors when running in READ-COMMITTED can cause InnoDB to crash
  - bug #21112: InnoDB slow with > 100,000 .ibd files
  - bug #21113: Duplicate printout in SHOW INNODB STATUS

  innobase/fil/fil0fil.c@1.54.10.1, 2006-08-01 21:37:59+02:00, tsmith@maint1.mysql.com +9 -6
    Applied innodb-5.0-ss677 snapshot.
      Make the tablespace cache hash size 100 or 1000 times bigger. Fixes bug #21112.

  sql/ha_innodb.cc@1.202.1.95, 2006-08-01 21:39:38+02:00, tsmith@maint1.mysql.com +9 -17
    Applied innodb-5.0-ss677 snapshot.
      ha_innobase::start_stmt(): patch from Heikki:
      Do not call read_view_close_for_mysql().  (Bug #19834)

  innobase/ibuf/ibuf0ibuf.c@1.36.5.1, 2006-08-01 21:39:14+02:00, tsmith@maint1.mysql.com +2 -14
    Applied innodb-5.0-ss677 snapshot.
      ibuf_print(): Don't print redundant information. Fixes bug #21113.

ChangeSet@1.1810.1975.11, 2006-08-01 20:20:46+02:00, msvensson@shellback.(none) +6 -0
  Import latest version of yaSSL

  extra/yassl/COPYING@1.1, 2006-03-29 01:56:33+02:00, msvensson@shellback.(none) +340 -0
    Import patch yassl.diff

  extra/yassl/COPYING@1.0, 2006-03-29 01:56:33+02:00, msvensson@shellback.(none) +0 -0

  extra/yassl/include/yassl_imp.hpp@1.5, 2006-07-20 01:32:17+02:00, msvensson@shellback.(none) +1 -0
    Import patch yassl.diff

  extra/yassl/src/yassl_imp.cpp@1.8.1.2, 2006-07-20 01:32:17+02:00, msvensson@shellback.(none) +5 -1
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp@1.19.1.2, 2006-07-20 01:32:17+02:00, msvensson@shellback.(none) +3 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/asn.hpp@1.7.1.1, 2006-08-01 20:17:26+02:00, msvensson@shellback.(none) +4 -4
    Import patch yassl.diff

  extra/yassl/taocrypt/src/asn.cpp@1.8.1.1, 2006-08-01 20:17:26+02:00, msvensson@shellback.(none) +1 -1
    Import patch yassl.diff

ChangeSet@1.1810.1922.7, 2006-08-01 09:36:34-07:00, acurtis@xiphis.org +1 -0
  Bug#15669
    "Test case 'csv' produces incorrect result on OpenBSD"
    mmapped pages were not being invalidated when writes occurred to the
    file vi a fd i/o operation. 
    Force explicit invalidation and not rely on implicit invalidation.

  sql/examples/ha_tina.cc@1.10.3.1, 2006-08-01 09:36:30-07:00, acurtis@xiphis.org +56 -8
    Bug#15669
      Make sure to invalidate in memory pages when the file has been 
      altered by fd i/o.
      This is important to some operating systems, such as OpenBSD.

ChangeSet@1.2250.1.2, 2006-08-01 19:56:22+04:00, evgen@sunlight.local +1 -0
  Makefile.am:
    After merge fix

  storage/ndb/test/ndbapi/Makefile.am@1.32, 2006-08-01 19:56:06+04:00, evgen@sunlight.local +1 -0
    After merge fix

ChangeSet@1.2181.106.5, 2006-08-01 17:10:17+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - add abort flag to hugoLoad

  storage/ndb/test/include/HugoTransactions.hpp@1.11.1.1, 2006-08-01 17:10:15+02:00, jonas@perch.ndb.mysql.com +2 -1
    Add abort flag to hugoLoad

  storage/ndb/test/src/HugoTransactions.cpp@1.28.1.1, 2006-08-01 17:10:15+02:00, jonas@perch.ndb.mysql.com +18 -5
    Add abort flag to hugoLoad

  storage/ndb/test/tools/hugoLoad.cpp@1.10, 2006-08-01 17:10:15+02:00, jonas@perch.ndb.mysql.com +9 -2
    Add abort flag to hugoLoad

ChangeSet@1.1810.1710.12, 2006-08-01 17:03:17+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - fix error message

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.24.45.1, 2006-08-01 17:03:16+02:00, jonas@perch.ndb.mysql.com +2 -1
    Fix printout

ChangeSet@1.2250.1.1, 2006-08-01 18:55:44+04:00, evgen@sunlight.local +1 -0
  func_str.result:
    After merge fix

  mysql-test/r/func_str.result@1.122, 2006-08-01 18:55:15+04:00, evgen@sunlight.local +10 -10
    After merge fix

ChangeSet@1.1616.2550.14, 2006-08-01 16:55:41+02:00, jonas@perch.ndb.mysql.com +5 -0
  ndb - bug#21384
    handle error in TCKEYREQ during TCINDXREQ better

  ndb/src/kernel/blocks/ERROR_codes.txt@1.8.3.1, 2006-08-01 16:55:40+02:00, jonas@perch.ndb.mysql.com +2 -1
    new error code

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp@1.18.1.7, 2006-08-01 16:55:40+02:00, jonas@perch.ndb.mysql.com +2 -2
    Add 3 values to isIndexOp

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.42.6.2, 2006-08-01 16:55:40+02:00, jonas@perch.ndb.mysql.com +131 -28
    handle error in TCKEYREQ during TCINDXREQ

  ndb/test/ndbapi/testIndex.cpp@1.12.1.2, 2006-08-01 16:55:40+02:00, jonas@perch.ndb.mysql.com +52 -0
    Add testcase

  ndb/test/run-test/daily-basic-tests.txt@1.13.4.1, 2006-08-01 16:55:40+02:00, jonas@perch.ndb.mysql.com +4 -0
    Add testcase

ChangeSet@1.1810.1986.1, 2006-08-01 15:21:09+02:00, msvensson@neptunus.(none) +1 -0
  Add missing $

  mysql-test/mysql-test-run.pl@1.30.1.77, 2006-08-01 15:21:08+02:00, msvensson@neptunus.(none) +1 -1
    Add missing $

ChangeSet@1.2181.128.2, 2006-08-01 14:02:19+02:00, serg@janus.mylan +3 -0
  compile-time definition of intptr type

  config/ac-macros/misc.m4@1.15, 2006-08-01 13:59:48+02:00, serg@janus.mylan +0 -30
    remove unnecessary macro

  configure.in@1.366.1.1, 2006-08-01 13:59:48+02:00, serg@janus.mylan +1 -1
    use AC_CHECK_SIZEOF when appropriate

  include/my_atomic.h@1.4, 2006-08-01 13:59:48+02:00, serg@janus.mylan +7 -1
    compile-time definition of intptr type

ChangeSet@1.2245.1.3, 2006-08-01 12:23:02+02:00, guilhem@gbichot3.local +1 -0
  I had forgotten to delete an already disabled line of C++ code.

  sql/sql_insert.cc@1.214.1.1, 2006-08-01 12:22:59+02:00, guilhem@gbichot3.local +0 -2
    I had forgotten to delete this line (it was already disabled using //;
    this line was not needed because we do the empty() every time
    we write to the binlog (in MYSQL_LOG::write());
    t/binlog_stm_binlog.test already tests that the empty() indeed happens
    for INSERT DELAYED.

ChangeSet@1.1616.2711.2, 2006-08-01 15:18:21+05:00, holyfoot@mysql.com +1 -0
  bug #13717 embedded library dumps warnings on STDERR directly
  
  Here i just disabled STDERR warnings in embedded server
  Later we should get more defined about logs in the embedded server

  sql/log.cc@1.108.1.57, 2006-08-01 15:18:18+05:00, holyfoot@mysql.com +7 -0
    Log messages muted in embedded server

ChangeSet@1.1810.1975.8, 2006-08-01 11:35:37+02:00, msvensson@neptunus.(none) +1 -0
  Bug#21367 IM tests do not recognize "win2003-amd64" as Windows
   - Disable Instance manager on Windows

  mysql-test/mysql-test-run.pl@1.30.1.76, 2006-08-01 11:35:35+02:00, msvensson@neptunus.(none) +7 -0
    Disable Instance manager on Windows.

ChangeSet@1.1810.1975.7, 2006-08-01 11:29:10+02:00, msvensson@neptunus.(none) +2 -0
  Change error code to test for "unknown error" with to 10000

  mysql-test/r/perror.result@1.4, 2006-08-01 11:29:08+02:00, msvensson@neptunus.(none) +1 -1
    Change error code to test for "unknown error" with to 10000

  mysql-test/t/perror.test@1.5, 2006-08-01 11:29:08+02:00, msvensson@neptunus.(none) +3 -2
    Change error code to test for "unknown error" with to 10000

ChangeSet@1.1810.1985.1, 2006-08-01 11:05:54+03:00, gkodinov@macbook.gmz +3 -0
  Bug #20103: Escaping with backslash does not work
   - make the client to respect the server-side 
     no_backslash_escapes option and disable the 
     special meaning of backslash also at client side.

  mysql-test/r/mysql_client.result@1.1.1.1, 2006-08-01 11:05:48+03:00, gkodinov@macbook.gmz +4 -0
    Bug #20103: Escaping with backslash does not work
     - test case

  mysql-test/t/mysql_client.test@1.1.1.1, 2006-08-01 11:05:48+03:00, gkodinov@macbook.gmz +11 -0
    Bug #20103: Escaping with backslash does not work
     - test case

  client/mysql.cc@1.199.9.2, 2006-08-01 11:05:47+03:00, gkodinov@macbook.gmz +2 -1
    Bug #20103: Escaping with backslash does not work
     - make the client to respect the server-side 
       no_backslash_escapes option and disable the 
       special meaning of backslash also at client side.

ChangeSet@1.2242.1.3, 2006-08-01 09:36:27+02:00, msvensson@neptunus.(none) +1 -0
  Bug#20439 mysqltest: remove unused options
   -Remove leftovers of server_stop and server_start commands 

  client/mysqltest.c@1.219, 2006-08-01 09:36:24+02:00, msvensson@neptunus.(none) +0 -3
    Remove leftovers  of "server_start" and "server_stop" commands

ChangeSet@1.2249, 2006-08-01 08:49:43+04:00, evgen@sunlight.local +13 -0
  After merge fix

  mysql-test/extra/rpl_tests/rpl_insert_id.test@1.10, 2006-08-01 08:49:38+04:00, evgen@sunlight.local +21 -1
    After merge fix

  mysql-test/r/information_schema.result@1.132, 2006-08-01 08:09:31+04:00, evgen@sunlight.local +14 -0
    After merge fix

  mysql-test/r/rpl_insert_id.result@1.20, 2006-08-01 08:09:30+04:00, evgen@sunlight.local +1 -0
    After merge fix

  mysql-test/r/select.result@1.132.1.3, 2006-08-01 08:09:28+04:00, evgen@sunlight.local +1 -1
    After merge fix

  mysql-test/r/union.result@1.85.1.2, 2006-08-01 08:09:25+04:00, evgen@sunlight.local +7 -7
    After merge fix

  mysql-test/t/rpl_insert_id.test@1.21, 2006-08-01 08:09:18+04:00, evgen@sunlight.local +0 -21
    After merge fix

  mysql-test/t/select.test@1.108, 2006-08-01 08:09:10+04:00, evgen@sunlight.local +20 -19
    After merge fix

  sql/field.cc@1.329, 2006-08-01 08:09:40+04:00, evgen@sunlight.local +2 -9
    After merge fix

  sql/field.h@1.183.1.12, 2006-08-01 08:09:38+04:00, evgen@sunlight.local +3 -4
    After merge fix

  sql/item.cc@1.203, 2006-08-01 08:09:36+04:00, evgen@sunlight.local +5 -4
    After merge fix

  sql/sql_class.cc@1.280, 2006-08-01 08:09:35+04:00, evgen@sunlight.local +1 -0
    After merge fix

  sql/sql_insert.cc@1.216, 2006-08-01 08:48:41+04:00, evgen@sunlight.local +5 -5
    After merge fix

  sql/sql_select.cc@1.427, 2006-08-01 08:09:33+04:00, evgen@sunlight.local +4 -3
    After merge fix

ChangeSet@1.1810.1936.18, 2006-07-31 23:05:54+04:00, evgen@moonbone.local +3 -0
  select.result, func_group.result, sql_select.cc:
    After merge fix

  mysql-test/r/func_group.result@1.46.2.7, 2006-07-31 22:09:00+04:00, evgen@moonbone.local +0 -138
    After merge fix

  mysql-test/r/select.result@1.121.1.16, 2006-07-31 22:08:32+04:00, evgen@moonbone.local +49 -49
    After merge fix

  sql/sql_select.cc@1.312.76.8, 2006-07-31 22:09:25+04:00, evgen@moonbone.local +2 -1
    After merge fix

ChangeSet@1.1810.1983.1, 2006-07-31 12:01:43-07:00, malff@weblab.(none) +3 -0
  Bug#21269 (DEFINER-clause is allowed for UDF-functions)
  
  The problem was that the grammar allows to create a function with an optional
  definer clause, and define it as a UDF with the SONAME keyword.
  Such combination should be reported as an error.
  
  The solution is to not change the grammar itself, and to introduce a
  specific check in the yacc actions in 'create_function_tail' for UDF,
  that now reports ER_WRONG_USAGE when using both DEFINER and SONAME.

  mysql-test/r/udf.result@1.3.2.1, 2006-07-31 12:01:42-07:00, malff@weblab.(none) +6 -0
    Added tests for Bug#21269 (DEFINER-clause is allowed for UDF-functions)

  mysql-test/t/udf.test@1.5.2.1, 2006-07-31 12:01:42-07:00, malff@weblab.(none) +12 -0
    Added tests for Bug#21269 (DEFINER-clause is allowed for UDF-functions)

  sql/sql_yacc.yy@1.371.72.3, 2006-07-31 12:01:42-07:00, malff@weblab.(none) +11 -0
    Creating a UDF function with a DEFINER clause is now a syntax error.

ChangeSet@1.2181.116.6, 2006-07-31 22:22:01+04:00, sergefp@mysql.com +1 -0
  BUG#14940: Post-merge fixes: update test results

  mysql-test/r/binlog_row_blackhole.result@1.6.1.1, 2006-07-31 22:21:57+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Post-merge fixes: update test results

ChangeSet@1.1810.1982.1, 2006-07-31 20:56:06+03:00, gkodinov@macbook.gmz +3 -0
  Bug #11551: Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE
   
  made DROP VIEW to continue on error and report an aggregated error 
   at its end. This makes it similar to DROP TABLE.

  mysql-test/r/view.result@1.138.10.1, 2006-07-31 20:56:00+03:00, gkodinov@macbook.gmz +20 -1
    Bug #11551: Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE
     - test case
     - changed error message

  mysql-test/t/view.test@1.126.10.1, 2006-07-31 20:56:01+03:00, gkodinov@macbook.gmz +21 -0
    Bug #11551: Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE
     - test case

  sql/sql_view.cc@1.78.5.1, 2006-07-31 20:56:01+03:00, gkodinov@macbook.gmz +38 -13
    Bug #11551: Asymmetric + undocumented behaviour of DROP VIEW and DROP TABLE
     - made DROP VIEW to continue on error and report an aggregated error

ChangeSet@1.1810.1980.1, 2006-07-31 17:33:37+03:00, gkodinov@macbook.gmz +6 -0
  Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
    When executing ALTER TABLE all the attributes of the view were overwritten.
    This is contrary to the user's expectations.
    So some of the view attributes are preserved now : namely security and 
    algorithm. This means that if they are not specified in ALTER VIEW
    their values are preserved from CREATE VIEW instead of being defaulted.

  mysql-test/r/view.result@1.138.9.1, 2006-07-31 17:33:29+03:00, gkodinov@macbook.gmz +11 -0
    Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
     - test suite

  mysql-test/t/view.test@1.126.9.1, 2006-07-31 17:33:30+03:00, gkodinov@macbook.gmz +13 -0
    Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
     - test suite

  sql/sql_lex.h@1.175.18.1, 2006-07-31 17:33:30+03:00, gkodinov@macbook.gmz +1 -1
    Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
     - must make create_view_suid a tristate : on/off/unspecified

  sql/sql_view.cc@1.78.4.1, 2006-07-31 17:33:31+03:00, gkodinov@macbook.gmz +56 -0
    Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
     - open the view to get it's attributes and put then as defaults 
       for ALTER VIEW

  sql/sql_yacc.yy@1.371.71.2, 2006-07-31 17:33:31+03:00, gkodinov@macbook.gmz +3 -3
    Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
     - must make create_view_suid a tristate : on/off/unspecified

  sql/table.h@1.102.13.1, 2006-07-31 17:33:32+03:00, gkodinov@macbook.gmz +4 -0
    Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM
     - must make create_view_suid a tristate : on/off/unspecified

ChangeSet@1.1810.1975.5, 2006-07-31 14:22:32+02:00, msvensson@neptunus.(none) +3 -0
  Bug#21042 mysql client segfaults on importing a mysqldump export
   - Use strmake, that will both protect the buffer and make sure it's terminated by a zero
   - Add test case

  client/mysql.cc@1.199.8.3, 2006-07-31 14:22:30+02:00, msvensson@neptunus.(none) +1 -1
    Use strmake instead of strxnmov as that function will make sure the string is terminated by 0

  mysql-test/r/mysql.result@1.10.1.2, 2006-07-31 14:22:30+02:00, msvensson@neptunus.(none) +1 -0
    Update test result

  mysql-test/t/mysql.test@1.4.2.2, 2006-07-31 14:22:30+02:00, msvensson@neptunus.(none) +6 -0
    Add test case

ChangeSet@1.1810.1975.3, 2006-07-31 13:11:21+02:00, msvensson@neptunus.(none) +4 -0
  perror returns 2 if it does not understand the option --ndb
  Move that perror test to ndb_basic so it's only run when there is support for --ndb

  mysql-test/r/ndb_basic.result@1.28.1.7, 2006-07-31 13:11:19+02:00, msvensson@neptunus.(none) +1 -0
    Move test of "perror --ndb" to this file

  mysql-test/r/perror.result@1.3, 2006-07-31 13:11:19+02:00, msvensson@neptunus.(none) +0 -1
    Move test of "perror --ndb" to ndb_basic

  mysql-test/t/ndb_basic.test@1.32.1.4, 2006-07-31 13:11:19+02:00, msvensson@neptunus.(none) +10 -0
    Move test of "perror --ndb" to this file

  mysql-test/t/perror.test@1.4, 2006-07-31 13:11:19+02:00, msvensson@neptunus.(none) +0 -5
    Move test of "perror --ndb" to ndb_basic

ChangeSet@1.1810.1975.2, 2006-07-31 12:47:56+02:00, msvensson@neptunus.(none) +1 -0
  Fix lowercase_fs_off problem on windows. This test should not be run if lower_case_filesystem=OFF. 
  By default lowercase_table_names are 1 on windows, and that makes the initialization of lower_case_filesystem variable to be skipped.
  Add an else bracnh that does the initialization.

  sql/mysqld.cc@1.439.65.1, 2006-07-31 12:47:53+02:00, msvensson@neptunus.(none) +5 -0
    Intialize the "lowercase_filesystem" variable also when "lowercase_table_names" is 1

ChangeSet@1.1810.1698.98, 2006-07-31 12:47:01+05:00, bar@mysql.com +3 -0
  N'xxx' and _utf8'xxx' are not equivalent
  Problem: Unescaping of '\' characters didn't work when processing N'xxx'.
  Fix: using get_text() instead of get_token() when scanning nationa strings.

  mysql-test/r/ctype_utf8.result@1.85.1.8, 2006-07-31 12:46:56+05:00, bar@mysql.com +12 -0
    Adding test case

  mysql-test/t/ctype_utf8.test@1.84.1.2, 2006-07-31 12:46:56+05:00, bar@mysql.com +11 -0
    Adding test case

  sql/sql_lex.cc@1.142.18.3, 2006-07-31 12:46:56+05:00, bar@mysql.com +9 -12
    Fixing to process national strings using get_tex(),
    i.e. the same way with usual strings, to make
    unescaping work.

ChangeSet@1.1616.2708.1, 2006-07-30 19:30:20+02:00, msvensson@shellback.(none) +1 -0
  BUG#21217 "mysqltest" client is inconsistent when to log a line number
   - Init start_lineno to 0

  client/mysqltest.c@1.92.21.1, 2006-07-30 19:30:17+02:00, msvensson@shellback.(none) +4 -2
    Init start_lineno to 0 and set it back to zero before comparing result file.

ChangeSet@1.2181.116.5, 2006-07-30 18:25:57+04:00, sergefp@mysql.com +4 -0
  BUG#14940: Post-merge fixes

  mysql-test/r/func_encrypt.result@1.10, 2006-07-30 18:25:48+04:00, sergefp@mysql.com +8 -8
    BUG#14940: Post-merge fixes

  mysql-test/r/ndb_gis.result@1.13, 2006-07-30 18:25:48+04:00, sergefp@mysql.com +30 -30
    BUG#14940: Post-merge fixes

  mysql-test/r/ssl.result@1.7, 2006-07-30 18:25:48+04:00, sergefp@mysql.com +5 -5
    BUG#14940: Post-merge fixes

  mysql-test/r/ssl_compress.result@1.7, 2006-07-30 18:25:48+04:00, sergefp@mysql.com +5 -5
    BUG#14940: Post-merge fixes

ChangeSet@1.1810.1857.10, 2006-07-30 06:19:30+02:00, ingo@chilla.local +1 -0
  Bug#20719 - Reading dynamic records with write buffer could fail
  After merge fix

  myisam/mi_dynrec.c@1.37.6.2, 2006-07-30 06:19:27+02:00, ingo@chilla.local +0 -3
    Bug#20719 - Reading dynamic records with write buffer could fail
    After merge fix

ChangeSet@1.2181.172.7, 2006-07-30 05:16:08+04:00, aivanov@mysql.com +1 -0
  Make innodb_thread_concurrency 0 by default.
   Fixing test result.

  mysql-test/r/innodb.result@1.179.1.1, 2006-07-30 05:16:05+04:00, aivanov@mysql.com +1 -1
    Make innodb_thread_concurrency 0 by default.
     Fixing test result.

ChangeSet@1.2181.175.2, 2006-07-30 00:02:09+04:00, sergefp@mysql.com +1 -0
  BUG#14940: post-review fixes

  sql/opt_range.cc@1.223.1.2, 2006-07-30 00:02:06+04:00, sergefp@mysql.com +8 -6
    BUG#14940: post-review fixes:
     - fix comments
     - use set_if_smaller

ChangeSet@1.1616.2677.4, 2006-07-29 21:58:50+02:00, ingo@chilla.local +1 -0
  Bug#20719 - Reading dynamic records with write buffer could fail
  After merge fix

  myisam/mi_dynrec.c@1.36.2.2, 2006-07-29 21:58:48+02:00, ingo@chilla.local +3 -0
    Bug#20719 - Reading dynamic records with write buffer could fail
    After merge fix

ChangeSet@1.1346.1.846, 2006-07-29 17:24:48+02:00, kent@mysql.com +1 -0
  configure.in:
    Corrected typo

  configure.in@1.191.1.147, 2006-07-29 17:23:58+02:00, kent@mysql.com +1 -1
    Corrected typo

ChangeSet@1.1810.1972.7, 2006-07-29 13:50:08+04:00, kroki@moonlight.intranet +2 -0
  Fix after manual merge.

  mysys/my_bitmap.c@1.25.1.9, 2006-07-29 13:50:05+04:00, kroki@moonlight.intranet +1 -1
    Fix after manual merge.

  tests/mysql_client_test.c@1.167.1.27, 2006-07-29 13:50:05+04:00, kroki@moonlight.intranet +44 -0
    Fix after manual merge: add test for bug#21206.

ChangeSet@1.1810.1976.2, 2006-07-28 20:51:17-07:00, igreenhoe@anubis.greendragongames.com +3 -0
  Fix for bug #16226 (timestamp_diff truncation issue when requesting
  difference between timestamp in values of months and quarters.)
  
  Problem:  when requesting timestamp diff in months or quarters, it
  would only examine the date (and not the time) for the comparison.
  
  Solution:  increased precision of comparison.

  mysql-test/r/func_time.result@1.47.8.1, 2006-07-28 20:51:14-07:00, igreenhoe@anubis.greendragongames.com +72 -0
    Additional test results

  mysql-test/t/func_time.test@1.41.7.1, 2006-07-28 20:51:14-07:00, igreenhoe@anubis.greendragongames.com +31 -0
    Additional tests

  sql/item_timefunc.cc@1.100.8.1, 2006-07-28 20:51:14-07:00, igreenhoe@anubis.greendragongames.com +15 -0
    Fix for timestamp diff issue.  Added microsecond precision when
    comparing months or quarters; previously only examined date for
    these comparisons.

ChangeSet@1.2181.172.6, 2006-07-29 07:17:33+04:00, aivanov@mysql.com +6 -0
  Make innodb_flush_log_at_trx_commit a settable global variable.

  sql/mysqld.cc@1.564.5.2, 2006-07-29 07:17:29+04:00, aivanov@mysql.com +3 -2
    Bypass the innobase_flush_log_at_trx_commit variable.

  sql/set_var.cc@1.178.5.1, 2006-07-29 07:17:30+04:00, aivanov@mysql.com +5 -1
    Make innodb_flush_log_at_trx_commit a settable global variable.

  sql/ha_innodb.cc@1.283, 2006-07-29 07:17:29+04:00, aivanov@mysql.com +1 -3
    Remove innobase_flush_log_at_trx_commit
    (set srv_flush_log_at_trx_commit directly).

  sql/ha_innodb.h@1.124, 2006-07-29 07:17:29+04:00, aivanov@mysql.com +1 -1
    Remove innobase_flush_log_at_trx_commit.
    Declare srv_flush_log_at_trx_commit.

  storage/innobase/include/srv0srv.h@1.63, 2006-07-29 07:17:30+04:00, aivanov@mysql.com +1 -1
    Change the type of srv_flush_log_at_trx_commit.

  storage/innobase/srv/srv0srv.c@1.101, 2006-07-29 07:17:30+04:00, aivanov@mysql.com +1 -1
    Change the type of srv_flush_log_at_trx_commit.

ChangeSet@1.1810.1972.5, 2006-07-29 04:41:50+02:00, kent@mysql.com +3 -0
  udf_example.c, udf.test, Makefile.am:
    Converted "udf_example.cc" to C, avoids C++ runtime lib dependency (bug#21336)

  mysql-test/t/udf.test@1.5.1.1, 2006-07-29 03:43:46+02:00, kent@mysql.com +1 -1
    "udf_example.cc" converted to C, avoids C++ runtime lib dependency (bug#21336)

  sql/Makefile.am@1.103.1.16, 2006-07-29 03:43:45+02:00, kent@mysql.com +2 -2
    "udf_example.cc" converted to C, avoids C++ runtime lib dependency (bug#21336)

  sql/udf_example.c@1.28, 2006-07-29 04:37:31+02:00, kent@mysql.com +70 -50
    Changes to be strict ansi, except long long

  sql/udf_example.c@1.27, 2006-07-29 03:51:22+02:00, kent@mysql.com +5 -1
    Added error handling to new malloc() call

  sql/udf_example.c@1.26, 2006-07-29 03:45:25+02:00, kent@mysql.com +16 -17
    "udf_example.cc" converted to C, avoids C++ runtime lib dependency (bug#21336)

  sql/udf_example.c@1.25, 2006-07-29 03:44:02+02:00, kent@mysql.com +0 -0
    Rename: sql/udf_example.cc -> sql/udf_example.c

ChangeSet@1.2245, 2006-07-28 19:39:34-07:00, jimw@rama.(none) +4 -0
  Fix tests after merge and disable rpl_ndb_dd_advance due to bug 18679.

  mysql-test/r/date_formats.result@1.27, 2006-07-28 19:39:32-07:00, jimw@rama.(none) +1 -1
    Fix results after merge

  mysql-test/r/mysqldump.result@1.114, 2006-07-28 19:39:32-07:00, jimw@rama.(none) +14 -120
    Fix results after merge

  mysql-test/t/disabled.def@1.182, 2006-07-28 19:39:32-07:00, jimw@rama.(none) +1 -0
    Add randomly-failing test with open bug

  mysql-test/t/mysqldump.test@1.108, 2006-07-28 19:39:32-07:00, jimw@rama.(none) +8 -2
    Clean up test after merge and fix 'End of test' markers

ChangeSet@1.2181.172.5, 2006-07-29 03:56:23+04:00, aivanov@mysql.com +1 -0
  Make innodb_thread_concurrency 0 by default, and extend
   the usable range to 0..1000 (0 disables the thread throttling).

  sql/mysqld.cc@1.564.5.1, 2006-07-29 03:56:20+04:00, aivanov@mysql.com +4 -2
    innodb_thread_concurrency is 0..1000 now, and
     0 (the default) disables the thread throttling.

ChangeSet@1.1346.1.845, 2006-07-28 23:12:40+02:00, kent@mysql.com +2 -0
  Makefile.am, configure.in:
    Man page for mysqld command move to section 8 (bug#21220)

  configure.in@1.191.1.146, 2006-07-28 23:10:45+02:00, kent@mysql.com +4 -0
    Man page for mysqld command move to section 8 (bug#21220)

  man/Makefile.am@1.9.1.2, 2006-07-28 23:10:45+02:00, kent@mysql.com +2 -1
    Man page for mysqld command move to section 8 (bug#21220)

ChangeSet@1.1346.1.844, 2006-07-28 23:06:49+02:00, kent@mysql.com +1 -0
  make_binary_distribution.sh:
    Man page for "mysqld" command move to section 8 (bug#21220)

  scripts/make_binary_distribution.sh@1.49.1.15, 2006-07-28 23:05:44+02:00, kent@mysql.com +2 -2
    Man page for "mysqld" command move to section 8 (bug#21220)

ChangeSet@1.1346.1.843, 2006-07-28 22:57:57+02:00, kent@mysql.com +1 -0
  mysql.spec.sh:
    Man page for "mysqld" command move to section 8 (bug#21220)

  support-files/mysql.spec.sh@1.61.1.37, 2006-07-28 22:57:10+02:00, kent@mysql.com +1 -1
    Man page for "mysqld" command move to section 8 (bug#21220)

ChangeSet@1.1810.1978.1, 2006-07-28 21:26:46+02:00, kent@mysql.com +3 -0
  sql_select.cc:
    Renamed variable, to avoid name clash with macro "rem_size"
    on AIX 5.3 and "/usr/include/sys/xmem.h" (bug#17648)
  asn.cpp, asn.hpp:
    Avoid name clash with NAME_MAX

  extra/yassl/taocrypt/include/asn.hpp@1.8, 2006-07-27 14:22:26+02:00, kent@mysql.com +4 -4
    Avoid name clash with NAME_MAX

  extra/yassl/taocrypt/src/asn.cpp@1.9, 2006-07-27 14:22:25+02:00, kent@mysql.com +1 -1
    Avoid name clash with NAME_MAX

  sql/sql_select.cc@1.312.1.123, 2006-07-19 18:45:23+02:00, kent@mysql.com +4 -4
    Renamed variable, to avoid name clash with macro "rem_size"
    on AIX 5.3 and "/usr/include/sys/xmem.h" (bug#17648)

ChangeSet@1.2181.175.1, 2006-07-28 21:27:01+04:00, sergefp@mysql.com +75 -0
  BUG#14940 "MySQL choose wrong index", v.2
  - Make the range-et-al optimizer produce E(#table records after table 
                                             condition is applied),
  - Make the join optimizer use this value,
  - Add "filtered" column to EXPLAIN EXTENDED to show 
    fraction of records left after table condition is applied
  - Adjust test results, add comments

  mysql-test/r/bdb_gis.result@1.8, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +15 -15
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/index_merge.result@1.20, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/index_merge_innodb.result@1.18, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/index_merge_ror.result@1.9, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +14 -14
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/t/index_merge_ror.test@1.9, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +0 -1
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/t/index_merge_ror_cpk.test@1.8, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +1 -1
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/archive_gis.result@1.7, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +15 -15
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/auto_increment.result@1.42.1.1, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/bench_count_distinct.result@1.8, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/binlog_stm_blackhole.result@1.13.1.1, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/case.result@1.30, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +6 -6
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/cast.result@1.44, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/compress.result@1.7, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/ctype_collate.result@1.33, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/ctype_cp1250_ch.result@1.4.1.1, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +1 -0
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/date_formats.result@1.24.1.1, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/distinct.result@1.47, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/fulltext.result@1.90, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +4 -4
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/func_compress.result@1.16.1.1, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +4 -4
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/func_crypt.result@1.19, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/func_default.result@1.6, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/func_encrypt.result@1.9, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +8 -8
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/func_gconcat.result@1.58, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +6 -6
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/func_group.result@1.46.3.3, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/func_if.result@1.22, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +4 -4
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/func_in.result@1.29, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/func_like.result@1.18, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +10 -6
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/func_math.result@1.36.1.1, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +26 -26
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/func_op.result@1.12, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +4 -4
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/func_regexp.result@1.11, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/func_set.result@1.16, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/func_str.result@1.120, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/func_system.result@1.24.1.1, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/func_test.result@1.30, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +12 -12
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/func_time.result@1.59.1.1, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +4 -4
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/gis.result@1.30.2.1, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +23 -23
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/group_by.result@1.68.1.1, 2006-07-28 21:26:55+04:00, sergefp@mysql.com +4 -4
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/group_min_max.result@1.23.2.1, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +50 -30
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/having.result@1.27, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/heap.result@1.51, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +1 -1
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/heap_hash.result@1.20, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +1 -1
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/innodb_gis.result@1.7, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +15 -15
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/insert_update.result@1.21, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +4 -4
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/join.result@1.40, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +12 -0
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/join_nested.result@1.24, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +93 -93
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/key_diff.result@1.11, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +1 -1
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/myisam.result@1.83.1.1, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +3 -3
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/ndb_gis.result@1.12, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +30 -30
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/negation_elimination.result@1.7, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/null.result@1.37, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +6 -6
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/olap.result@1.32.1.1, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/partition_pruning.result@1.17.2.1, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +40 -0
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/query_cache.result@1.75.1.1, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/row.result@1.24, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/rpl_get_lock.result@1.13.1.1, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/rpl_master_pos_wait.result@1.6.1.1, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/select.result@1.133, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +5 -5
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/ssl.result@1.6, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +5 -5
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/ssl_compress.result@1.6, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +5 -5
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/subselect.result@1.147.1.1, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +191 -191
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/type_blob.result@1.52.1.1, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/union.result@1.86, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +9 -9
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/varbinary.result@1.17, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/variables.result@1.85.1.1, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +6 -6
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/r/view.result@1.166.1.1, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +27 -27
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/t/ctype_cp1250_ch.test@1.4.1.1, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +3 -0
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/t/func_like.test@1.17, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +2 -2
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/t/group_min_max.test@1.21.2.1, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +10 -10
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/t/join.test@1.34, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +19 -0
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  mysql-test/t/partition_pruning.test@1.14.2.1, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +16 -0
    BUG#14940: Adjust the test results: EXPLAIN EXTENDED now has extra "filtered" column

  sql/opt_range.cc@1.223.1.1, 2006-07-28 21:26:56+04:00, sergefp@mysql.com +76 -24
    BUG#14940: Make range/index_merge/group-min-max optimizer produce TABLE::quick_condition_rows -
      estimate of #records that will match the table condition.

  sql/sql_class.cc@1.271.4.1, 2006-07-28 21:26:57+04:00, sergefp@mysql.com +5 -0
    BUG#14940: Add "filtered" column to output of EXPLAIN EXTENDED

  sql/sql_select.cc@1.417.3.1, 2006-07-28 21:26:57+04:00, sergefp@mysql.com +55 -7
    BUG#14940: 
    - Make the join optimizer to use TABLE::quick_condition_rows=
      = E(#table records after filtering with table condition) 
    - Add "filtered" column to output of EXPLAIN EXTENDED

  sql/sql_select.h@1.110, 2006-07-28 21:26:57+04:00, sergefp@mysql.com +26 -3
    BUG#14940: Added comments

  sql/table.h@1.142.1.1, 2006-07-28 21:26:57+04:00, sergefp@mysql.com +17 -0
    BUG#14940: Added comments

ChangeSet@1.2181.173.4, 2006-07-28 16:37:16+04:00, kostja@bodhi.local +2 -0
  Add sql_locale.cc to cmake scripts.

  libmysqld/CMakeLists.txt@1.8, 2006-07-28 16:37:13+04:00, kostja@bodhi.local +3 -2
    Add sql_locale.cc to cmake scripts.

  sql/CMakeLists.txt@1.23.1.1, 2006-07-28 16:37:13+04:00, kostja@bodhi.local +1 -1
    Add sql_locale.cc to cmake scripts.

ChangeSet@1.1810.1977.1, 2006-07-28 15:06:23+04:00, kroki@moonlight.intranet +4 -0
  Bug#16581: deadlock: server and client both read from connection in
             'conc_sys' test
  
  Concurrent execution of SELECT involing at least two INFORMATION_SCHEMA
  tables, DROP DATABASE statement and DROP TABLE statement could have
  resulted in stalled connection for this SELECT statement.
  
  The problem was that for the first query of a join there was a race
  between select from I_S.TABLES and DROP DATABASE, and the error (no
  such database) was prepared to be send to the client, but the join
  processing was continued.  On second query to I_S.COLUMNS there was a
  race with DROP TABLE, but this error (no such table) was downgraded to
  warning, and thd->net.report_error was reset.  And so neither result
  nor error was sent to the client.
  
  The solution is to stop join processing once it is clear we are going
  to report a error, and also to downgrade to warnings file system errors
  like 'no such database' (unless we are in the 'SHOW' command), because
  I_S is designed not to use locks and the query to I_S should not abort
  if something is dropped in the middle.
  
  No test case is provided since this bug is a result of a race, and is
  timing dependant.  But we test that plain SHOW TABLES and SHOW COLUMNS
  give a error if there is no such database or a table respectively.

  mysql-test/r/show_check.result@1.75.1.3, 2006-07-28 15:06:20+04:00, kroki@moonlight.intranet +4 -0
    Add result for the test that SHOW TABLES and SHOW COLUMNS give a error
    if there is no such database or a table respectively.

  mysql-test/t/show_check.test@1.54.1.4, 2006-07-28 15:06:20+04:00, kroki@moonlight.intranet +11 -0
    Add test case that SHOW TABLES and SHOW COLUMNS give a error
    if there is no such database or a table respectively.

  sql/mysql_priv.h@1.290.57.1, 2006-07-28 15:06:21+04:00, kroki@moonlight.intranet +0 -2
    Remove prototype of mysql_find_files(), which is made static under
    find_files() name.

  sql/sql_show.cc@1.253.37.1, 2006-07-28 15:06:21+04:00, kroki@moonlight.intranet +66 -15
    Rename mysql_find_files() to find_files() and make it static.
    Return FIND_FILES_OK for success, FIND_FILES_OOM for out of memory,
    and FIND_FILES_DIR for directory reading error.
    Downgrade error to warning in get_all_tables() if it is a
    FIND_FILES_DIR error, and we are not in the 'SHOW' command.
    Once 'result' is set to 1 in get_schema_tables_result(), there's no
    need in continuing iterations, as we are about to return a error.

ChangeSet@1.2181.172.4, 2006-07-28 09:05:08+04:00, aivanov@mysql.com +2 -0
  Removing temporary changes.

  extra/yassl/src/ssl.cpp@1.19, 2006-07-28 09:05:05+04:00, aivanov@mysql.com +1 -1
    Removing temporary changes.

  mysql-test/t/rpl_openssl.test@1.19, 2006-07-28 09:05:05+04:00, aivanov@mysql.com +1 -1
    Removing temporary changes.

ChangeSet@1.1810.1966.4, 2006-07-28 05:34:59+04:00, aivanov@mysql.com +2 -0
  Removing temporary changes.

  extra/yassl/src/ssl.cpp@1.16.2.2, 2006-07-28 05:34:56+04:00, aivanov@mysql.com +1 -1
    Removing temporary changes.

  mysql-test/t/rpl_openssl.test@1.11.1.6, 2006-07-28 05:34:56+04:00, aivanov@mysql.com +1 -1
    Removing temporary changes.

ChangeSet@1.2181.172.3, 2006-07-28 05:26:26+04:00, aivanov@mysql.com +2 -0
  Temporary changes just to check one point (will be restored)

  extra/yassl/src/ssl.cpp@1.18, 2006-07-28 05:26:24+04:00, aivanov@mysql.com +1 -1
    Temporary changes just to check one point (will be restored)

  mysql-test/t/rpl_openssl.test@1.18, 2006-07-28 05:26:24+04:00, aivanov@mysql.com +1 -1
    Temporary changes just to check one point (will be restored)

ChangeSet@1.1810.1966.3, 2006-07-28 03:32:39+04:00, aivanov@mysql.com +2 -0
  Temporary changes just to check some points (will be restored).

  extra/yassl/src/ssl.cpp@1.16.2.1, 2006-07-28 03:32:36+04:00, aivanov@mysql.com +1 -1
    Temporary changes just to check some points (will be restored).

  mysql-test/t/rpl_openssl.test@1.11.1.5, 2006-07-28 03:32:36+04:00, aivanov@mysql.com +1 -1
    Temporary changes just to check some points (will be restored).

ChangeSet@1.1810.1906.25, 2006-07-28 02:49:18+04:00, anozdrin@booka. +12 -0
  Fix for BUG#20438: CREATE statements for views, stored routines and triggers
  can be not replicable.
  
  Now CREATE statements for writing in the binlog are created as follows:
    - the beginning of the statement is re-created;
    - the rest of the statement is copied from the original query.
  
  The problem appears when there is a version-specific comment (produced by
  mysqldump), started in the re-created part of the statement and closed in the
  copied part -- there is closing comment-parenthesis, but there is no opening
  one.
  
  The proper fix could be to re-create original statement, but we can not
  implement it in 5.0. So, for 5.0 the fix is just to cut closing
  comment-parenthesis. This technique is also used for SHOW CREATE PROCEDURE
  statement (so we are able to reuse existing code).

  mysql-test/r/rpl_sp.result@1.13.2.4, 2006-07-28 02:49:11+04:00, anozdrin@booka. +44 -0
    Updated result file.

  mysql-test/r/rpl_trigger.result@1.4.1.5, 2006-07-28 02:49:11+04:00, anozdrin@booka. +47 -0
    Updated result file.

  mysql-test/r/rpl_view.result@1.3.1.2, 2006-07-28 02:49:11+04:00, anozdrin@booka. +37 -0
    Updated result file.

  mysql-test/t/rpl_sp.test@1.9.2.3, 2006-07-28 02:49:11+04:00, anozdrin@booka. +80 -0
    Added test case for BUG#20438.

  mysql-test/t/rpl_trigger.test@1.4.1.4, 2006-07-28 02:49:11+04:00, anozdrin@booka. +92 -0
    Added test case for BUG#20438.

  mysql-test/t/rpl_view.test@1.3.1.1, 2006-07-28 02:49:11+04:00, anozdrin@booka. +84 -0
    Added test case for BUG#20438.

  sql/sp.cc@1.82.17.2, 2006-07-28 02:49:11+04:00, anozdrin@booka. +4 -1
    Trim comments at the end.

  sql/sp_head.cc@1.200.1.21, 2006-07-28 02:49:11+04:00, anozdrin@booka. +1 -4
    Moved this code to the separate function to be re-used.

  sql/sql_lex.cc@1.142.1.51, 2006-07-28 02:49:12+04:00, anozdrin@booka. +24 -0
    Added a new function.

  sql/sql_lex.h@1.175.1.48, 2006-07-28 02:49:12+04:00, anozdrin@booka. +1 -1
    Added a new function.

  sql/sql_trigger.cc@1.35.1.19, 2006-07-28 02:49:12+04:00, anozdrin@booka. +4 -1
    Trim comments at the end.

  sql/sql_view.cc@1.78.3.1, 2006-07-28 02:49:12+04:00, anozdrin@booka. +4 -2
    Trim comments at the end.

ChangeSet@1.2181.159.31, 2006-07-27 14:20:25-04:00, pgalbraith@buffy.netfrastructure.com +1 -0
   BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
  
  recommented the uncommented have_innodb.inc line
  
  federated_transactions.test:
     BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
    slight ommission fixed

  mysql-test/t/federated_transactions.test@1.6, 2006-07-27 14:19:06-04:00, pgalbraith@buffy.netfrastructure.com +1 -1
     BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
    slight ommission fixed

ChangeSet@1.2181.159.30, 2006-07-27 14:02:58-04:00, pgalbraith@buffy.netfrastructure.com +3 -0
  BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
  
  Changed federated_transactions.test to use InnoDB instead of BDB
  
  federated_transactions-slave.opt:
    BitKeeper file /home/patg/mysql-build/mysql-5.1-engines-bug21118/mysql-test/t/federated_transactions-slave.opt
  federated_transactions.result:
    BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
    New test results for InnoDB being remote transactional table
  federated_transactions.test:
    BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
    Changed remote transactional table from BDB to InnoDB

  mysql-test/r/federated_transactions.result@1.3, 2006-07-27 14:01:07-04:00, pgalbraith@buffy.netfrastructure.com +1 -1
    BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
    New test results for InnoDB being remote transactional table

  mysql-test/t/federated_transactions-slave.opt@1.1, 2006-07-27 14:01:54-04:00, pgalbraith@buffy.netfrastructure.com +1 -0
    BitKeeper file /home/patg/mysql-build/mysql-5.1-engines-bug21118/mysql-test/t/federated_transactions-slave.opt

  mysql-test/t/federated_transactions-slave.opt@1.0, 2006-07-27 14:01:54-04:00, pgalbraith@buffy.netfrastructure.com +0 -0

  mysql-test/t/federated_transactions.test@1.5, 2006-07-27 13:59:47-04:00, pgalbraith@buffy.netfrastructure.com +2 -2
    BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
    Changed remote transactional table from BDB to InnoDB

ChangeSet@1.1810.1906.24, 2006-07-27 17:57:43+04:00, anozdrin@booka. +11 -0
  Fix for BUG#16211: Stored function return type for strings is ignored.
  Fix for BUG#16676: Database CHARSET not used for stored procedures
  
  The problem in BUG#16211 is that CHARSET-clause of the return type for
  stored functions is just ignored.
  
  The problem in BUG#16676 is that if character set is not explicitly
  specified for sp-variable, the server character set is used instead
  of the database one.
  
  The fix has two parts:
  
    - always store CHARSET-clause of the return type along with the
      type definition in mysql.proc.returns column. "Always" means that
      CHARSET-clause is appended even if it has not been explicitly
      specified in CREATE FUNCTION statement (this affects BUG#16211 only).
  
      Storing CHARSET-clause if it is not specified is essential to avoid
      changing character set if the database character set is altered in
      the future.
  
      NOTE: this change is not backward compatible with the previous releases.
  
    - use database default character set if CHARSET-clause is not explicitly
      specified (this affects both BUG#16211 and BUG#16676).
  
      NOTE: this also breaks backward compatibility.

  mysql-test/r/mysqldump.result@1.83.12.1, 2006-07-27 17:57:38+04:00, anozdrin@booka. +1 -1
    Updated result file.

  mysql-test/r/sp.result@1.170.18.2, 2006-07-27 17:57:39+04:00, anozdrin@booka. +153 -0
    Updated result file.

  mysql-test/t/sp.test@1.174.1.18, 2006-07-27 17:57:39+04:00, anozdrin@booka. +158 -0
    Provided test cases for BUG#16211, BUG#16676.

  sql/mysql_priv.h@1.290.56.1, 2006-07-27 17:57:39+04:00, anozdrin@booka. +3 -0
    Added two convenient functions for work with databases.

  sql/sp.cc@1.82.17.1, 2006-07-27 17:57:39+04:00, anozdrin@booka. +12 -0
    1. Add CHARSET-clause to CREATE-statement if it has been explicitly specified.
    2. Polishing -- provided some comments.

  sql/sp_head.cc@1.200.1.20, 2006-07-27 17:57:39+04:00, anozdrin@booka. +35 -18
    Use database charset as default charset of sp-variable.

  sql/sp_head.h@1.79.1.8, 2006-07-27 17:57:39+04:00, anozdrin@booka. +5 -1
    Move init_sp_name() out of init_strings().

  sql/sql_db.cc@1.120.1.11, 2006-07-27 17:57:39+04:00, anozdrin@booka. +84 -10
    Two new functions created:
      - load_db_opt_by_name();
      - check_db_dir_existence();

  sql/sql_show.cc@1.253.36.1, 2006-07-27 17:57:39+04:00, anozdrin@booka. +10 -30
    Eliminate duplicated code by using
    check_db_dir_existence() and load_db_opt_by_name()

  sql/sql_table.cc@1.239.1.81, 2006-07-27 17:57:39+04:00, anozdrin@booka. +3 -4
    Eliminate duplicated code by using
    check_db_dir_existence() and load_db_opt_by_name()

  sql/sql_yacc.yy@1.371.72.2, 2006-07-27 17:57:39+04:00, anozdrin@booka. +8 -5
    Call sp_head::init_sp_name() to initialize stored routine name.

ChangeSet@1.1810.1906.23, 2006-07-27 15:19:13+04:00, anozdrin@booka. +1 -0
  Don't complain in the error log about IM shutdown unless
  BUG#20761 is fixed.

  mysql-test/mysql-test-run.pl@1.30.36.2, 2006-07-27 15:19:11+04:00, anozdrin@booka. +15 -8
    Don't complain in the error log about IM shutdown unless
    BUG#20761 is fixed.

ChangeSet@1.1810.1973.3, 2006-07-27 14:43:28+04:00, kroki@moonlight.intranet +1 -0
  Revert the change after null-merge.

  mysys/my_bitmap.c@1.25.1.7, 2006-07-27 14:43:25+04:00, kroki@moonlight.intranet +2 -2
    Revert the change forced during null-merge.

ChangeSet@1.1810.1974.1, 2006-07-27 12:28:49+02:00, msvensson@neptunus.(none) +1 -0
  Bug#21042 mysql client segfaults on importing a mysqldump export
   - Use strxnmov to protect the "buff" variable from overrun

  client/mysql.cc@1.199.8.2, 2006-07-27 12:28:45+02:00, msvensson@neptunus.(none) +1 -1
    Use strxnmov to protect the "buff" variable from overrun

ChangeSet@1.2181.173.3, 2006-07-27 14:12:41+04:00, kostja@bodhi.local +3 -0
  Post-merge fixes.

  mysql-test/r/federated.result@1.39, 2006-07-27 14:12:37+04:00, kostja@bodhi.local +17 -16
    Post-merge fixes.

  mysql-test/r/myisam.result@1.87, 2006-07-27 14:12:37+04:00, kostja@bodhi.local +9 -6
    Post-merge fixes.

  storage/myisam/mi_create.c@1.61, 2006-07-27 14:12:37+04:00, kostja@bodhi.local +2 -4
    Post-merge fixes (Thanks Ingo).

ChangeSet@1.1810.1868.26, 2006-07-27 13:59:15+04:00, kroki@moonlight.intranet +3 -0
  BUG#21206: memory corruption when too many cursors are opened at once
  
  Too many cursors (more than 1024) could lead to memory corruption.
  This affects both, stored routines and C API cursors, and the
  threshold is per-server, not per-connection.  Similarly, the
  corruption could happen when the server was under heavy load
  (executing more than 1024 simultaneous complex queries), and this is
  the reason why this bug is fixed in 4.1, which doesn't support
  cursors.
  
  The corruption was caused by a bug in the temporary tables code, when
  an attempt to create a table could lead to a write beyond allocated
  space.  Note, that only internal tables were affected (the tables
  created internally by the server to resolve the query), not tables
  created with CREATE TEMPORARY TABLE.  Another pre-condition for the
  bug is TRUE value of --temp-pool startup option, which, however, is a
  default.
  
  The cause of a bug was that random memory was overwritten in
  bitmap_set_next() due to out-of-bound memory access.
  TAG: mysql-5.0.24

  mysys/my_bitmap.c@1.25.1.6, 2006-07-27 13:59:12+04:00, kroki@moonlight.intranet +2 -2
    Local 'bitmap_size' is measured in bytes, no need to multiply it by 8.

  sql/sql_select.cc@1.312.74.2, 2006-07-27 13:59:12+04:00, kroki@moonlight.intranet +8 -4
    Clear the temp_pool_slot bit only if we have set it previously.

  tests/mysql_client_test.c@1.167.16.1, 2006-07-27 13:59:13+04:00, kroki@moonlight.intranet +48 -1
    Add test case for bug#21206: memory corruption when too many cursors
    are opened at once.

ChangeSet@1.2242, 2006-07-27 10:54:04+02:00, msvensson@neptunus.(none) +2 -0
  Bug#21297  rpl_insert fails randomly
   - Add loop in mysqlslap that tries to connect up to 10 times if connect
     in thread fails.

  client/mysqlslap.c@1.36, 2006-07-27 10:54:01+02:00, msvensson@neptunus.(none) +18 -3
    Add loop to retry connect 10 times with a small sleep in between.

  mysql-test/t/disabled.def@1.181, 2006-07-27 10:54:01+02:00, msvensson@neptunus.(none) +0 -1
    Remove disabling of testcase

ChangeSet@1.2241, 2006-07-27 09:15:05+02:00, msvensson@neptunus.(none) +1 -0
  Increase time to sleep to allow mysqlds to exit from readonly mode

  mysql-test/t/ndb_autodiscover3.test@1.8, 2006-07-27 09:15:02+02:00, msvensson@neptunus.(none) +3 -1
    Increase time to sleep and add explanation why

ChangeSet@1.2240, 2006-07-27 09:02:44+02:00, msvensson@neptunus.(none) +1 -0
  Bug#21298 ndbcluster_log_schema_op locks already freed mutex
   - Disable 3 test cases that crashes slave

  mysql-test/t/disabled.def@1.180, 2006-07-27 09:02:41+02:00, msvensson@neptunus.(none) +5 -1
    Disable test cases where slave crashes due to bug#21298

ChangeSet@1.1616.2698.4, 2006-07-26 16:33:26-06:00, tsmith@siva.hindu.god +2 -0
  Bug #20402: DROP USER failure logged as ERROR rather than WARNING
  
  slave.cc, sql_acl.cc:
  - remove sql_print_error() for events that are not server errors

  sql/slave.cc@1.188.1.92, 2006-07-26 16:30:09-06:00, tsmith@siva.hindu.god +1 -1
    Bug #20402: DROP USER failure logged as ERROR rather than WARNING
    remove sql_print_error() for events that are not server errors

  sql/sql_acl.cc@1.74.1.103, 2006-07-26 16:30:09-06:00, tsmith@siva.hindu.god +0 -15
    Bug #20402: DROP USER failure logged as ERROR rather than WARNING
    remove sql_print_error() for events that are not server errors

ChangeSet@1.2181.166.2, 2006-07-26 20:03:41+02:00, pekka@orca.ndb.mysql.com +3 -0
  ndb - bug#14935 - post-review

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.49, 2006-07-26 20:03:02+02:00, pekka@orca.ndb.mysql.com +2 -2
    bug#14935 - post-review

  storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp@1.11, 2006-07-26 20:03:02+02:00, pekka@orca.ndb.mysql.com +3 -3
    bug#14935 - post-review

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.41, 2006-07-26 20:03:02+02:00, pekka@orca.ndb.mysql.com +13 -5
    bug#14935 - post-review

ChangeSet@1.1810.1970.1, 2006-07-26 21:36:03+04:00, evgen@moonbone.local +4 -0
  item_func.h, item_func.cc, sql_select.cc, item.h:
    Post review changes for bug#19862.

  sql/item.h@1.183.1.22, 2006-07-26 21:35:46+04:00, evgen@moonbone.local +1 -1
    Post review changes for bug#19862.

  sql/item_func.cc@1.270.16.2, 2006-07-26 21:35:45+04:00, evgen@moonbone.local +2 -2
    Post review changes for bug#19862.

  sql/item_func.h@1.136.9.2, 2006-07-26 21:35:42+04:00, evgen@moonbone.local +4 -1
    Post review changes for bug#19862.

  sql/sql_select.cc@1.312.81.1, 2006-07-26 21:32:33+04:00, evgen@moonbone.local +1 -4
    Post review changes for bug#19862.

ChangeSet@1.1346.879.1, 2006-07-26 12:36:10-04:00, iggy@rolltop.ignatz42.dyndns.org +1 -0
  Bug #18777: Mysqlhotcopy does not copy all the direcories.

  scripts/mysqlhotcopy.sh@1.43.1.4, 2006-07-26 12:36:09-04:00, iggy@rolltop.ignatz42.dyndns.org +4 -3
    Defined new raid directory regular expression variable that allows a mix of two alphanumeric characters.  Replaced hardcode raid directory regular expressions with new variable.

ChangeSet@1.1616.2706.1, 2006-07-26 19:19:30+03:00, gkodinov@macbook.gmz +3 -0
  * Bug #20792: Incorrect results from aggregate subquery
  When processing aggregate functions all tables values are reset
  to NULLs at the end of each group. 
  When doing that if there are no rows found for a group
  the const tables must not be reset as they are not recalculated 
  by do_select()/sub_select() for each group.

  mysql-test/r/subselect2.result@1.5.1.4, 2006-07-26 19:19:23+03:00, gkodinov@macbook.gmz +12 -0
    * Bug #20792: Incorrect results from aggregate subquery
     - test suite for the bug. This is dependent on InnoDB despite
       the fact that the bug and the fix are not InnoDB specific.
       This is because of the table flag HA_NOT_EXACT_COUNT.
       When this flag is off (as in MyISAM) both t2 and t3 become of
       join type 'system' as they are estimated to have 1 record and
       and this statistics can be trusted (according to the absence of
       HA_NOT_EXACT_COUNT).

  mysql-test/t/subselect2.test@1.7, 2006-07-26 19:19:23+03:00, gkodinov@macbook.gmz +18 -0
    * Bug #20792: Incorrect results from aggregate subquery
     - test suite for the bug

  sql/sql_select.cc@1.216.131.1, 2006-07-26 19:19:24+03:00, gkodinov@macbook.gmz +8 -2
    * Bug #20792: Incorrect results from aggregate subquery
     - when clearing results if there are not rows found for group
       the const tables must not be reset as they are not recalculated
       for each group.

ChangeSet@1.1810.1936.15, 2006-07-26 18:18:34+03:00, gkodinov@macbook.gmz +1 -0
  Bug #21019: First result of SELECT COUNT(*) different than consecutive runs
    Correct merge

  mysql-test/r/select.result@1.121.1.14, 2006-07-26 18:18:28+03:00, gkodinov@macbook.gmz +26 -26
    Bug #21019: First result of SELECT COUNT(*) different than consecutive runs
      Correct merge

ChangeSet@1.1810.1849.44, 2006-07-26 16:00:11+02:00, msvensson@neptunus.(none) +1 -0
  Bug#16576 Patch to compile on GNU/Hurd (ps check in configure)
   - Thanks to Christian Hammers for the patch

  configure.in@1.245.1.150, 2006-07-26 16:00:09+02:00, msvensson@neptunus.(none) +1 -1
    The configure check on how to run ps to get mysqld's $PID does not
    work on the Hurd, as the PPID is prepended with a - for login shells,
    thus making grep look for -bash, which it complains as an invalid
    argument.  Filtering out '-' from the ps output makes this work fine. 

ChangeSet@1.1810.1968.1, 2006-07-26 15:43:03+02:00, msvensson@neptunus.(none) +1 -0
  Bug#21222 Patch to support GNU/kFreeBSD build
   - Thanks to Christian Hammers for the patch!

  include/my_global.h@1.96.1.26, 2006-07-26 15:43:00+02:00, msvensson@neptunus.(none) +1 -1
    Define __GNU_SOURCE to 1 also when __GLIBC__ is defined

ChangeSet@1.1810.1967.1, 2006-07-26 15:27:53+02:00, msvensson@neptunus.(none) +1 -0
  Bug#16574 Patch to compile on GNU/Hurd (PATH_MAX limit not existing)
   - Define MAX_PATH if not already defined by system header files.
   - Thanks to Christian for the report and patch!

  ndb/include/ndb_global.h.in@1.9.1.1, 2006-07-26 15:27:51+02:00, msvensson@neptunus.(none) +0 -4
    PATH_MAX is defined in ndb_global.h for "sco", remove the conditional define for sco
    so it thakes effect as soon as MAX_PATH is not available

ChangeSet@1.2238, 2006-07-26 14:44:59+02:00, msvensson@neptunus.(none) +1 -0
  Add support for valgrind with callgrind

  mysql-test/mysql-test-run.pl@1.143.1.5, 2006-07-26 14:44:57+02:00, msvensson@neptunus.(none) +28 -6
    Add support for valgrind with callgrind

ChangeSet@1.2236, 2006-07-26 14:27:52+02:00, msvensson@neptunus.(none) +2 -0
  Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060721184912|58688

  mysql-test/r/sp.result@1.212, 2006-07-26 14:27:51+02:00, msvensson@neptunus.(none) +0 -0
    Exclude

  mysql-test/t/sp.test@1.195, 2006-07-26 14:27:51+02:00, msvensson@neptunus.(none) +0 -0
    Exclude

ChangeSet@1.2235, 2006-07-26 14:27:05+02:00, msvensson@neptunus.(none) +1 -0
  Disable rpl_insert due to bug#21297

  mysql-test/t/disabled.def@1.175.1.1, 2006-07-26 14:27:02+02:00, msvensson@neptunus.(none) +1 -0
    Disable rpl_insert due to bug#21297

ChangeSet@1.1616.2705.1, 2006-07-26 16:23:07+04:00, kroki@moonlight.intranet +2 -0
  BUG#21206: memory corruption when too many cursors are opened at once
  
  Too many cursors (more than 1024) could lead to memory corruption.
  This affects both, stored routines and C API cursors, and the
  threshold is per-server, not per-connection.  Similarly, the
  corruption could happen when the server was under heavy load
  (executing more than 1024 simultaneous complex queries), and this is
  the reason why this bug is fixed in 4.1, which doesn't support
  cursors.
  
  The corruption was caused by a bug in the temporary tables code, when
  an attempt to create a table could lead to a write beyond allocated
  space.  Note, that only internal tables were affected (the tables
  created internally by the server to resolve the query), not tables
  created with CREATE TEMPORARY TABLE.  Another pre-condition for the
  bug is TRUE value of --temp-pool startup option, which, however, is a
  default.
  
  The cause of a bug was that random memory was overwritten in
  bitmap_set_next() due to out-of-bound memory access.

  mysys/my_bitmap.c@1.17.1.5, 2006-07-26 16:23:05+04:00, kroki@moonlight.intranet +1 -1
    Local 'bitmap_size' is measured in bytes, no need to multiply it by 8.

  sql/sql_select.cc@1.216.130.1, 2006-07-26 16:23:05+04:00, kroki@moonlight.intranet +8 -4
    Clear the temp_pool_slot bit only if we have set it previously.

ChangeSet@1.1810.1959.3, 2006-07-26 14:21:40+02:00, msvensson@neptunus.(none) +2 -0
  Update test result for perror

  mysql-test/r/perror.result@1.2, 2006-07-26 14:21:38+02:00, msvensson@neptunus.(none) +2 -3
    Add error result for 1186
    Remove the result for the others

  mysql-test/t/perror.test@1.3, 2006-07-26 14:21:38+02:00, msvensson@neptunus.(none) +5 -4
    As it's only just interesting to see that perror doesn't crash(and as result varies across platforms), send result to /dev/null

ChangeSet@1.1810.1959.2, 2006-07-26 14:09:20+02:00, msvensson@neptunus.(none) +3 -0
  Bug#16561 Unknown ERROR msg "ERROR 1186 (HY000): Binlog closed" by perror
   - Since error 1186 is not found among NDB error codes, the message retuned should indicate that.

  extra/perror.c@1.39.1.6, 2006-07-26 14:09:18+02:00, msvensson@neptunus.(none) +15 -12
    Move the !found out one level

  mysql-test/t/perror.test@1.2, 2006-07-26 14:09:18+02:00, msvensson@neptunus.(none) +11 -0
    Add test case for bug#16561

  ndb/src/kernel/error/ndbd_exit_codes.c@1.1.5.1, 2006-07-26 14:09:18+02:00, msvensson@neptunus.(none) +1 -1
    Check not only for zero size string but also classification "unknown error" when looking for an error mesage for an error code 

ChangeSet@1.1810.1849.42, 2006-07-26 14:02:24+02:00, msvensson@neptunus.(none) +3 -0
  Bug#19890 mysqltest: "query" command is broken
   - Allow "query" to be used as a prefix for focing a command to be sent to server
   - Add testcases

  client/mysqltest.c@1.155.9.47, 2006-07-26 14:02:21+02:00, msvensson@neptunus.(none) +8 -0
    To force something being sent as a query to the mysqld one can
    use the prefix "query". Remove "query" from string before executing.

  mysql-test/r/mysqltest.result@1.24.1.11, 2006-07-26 14:02:21+02:00, msvensson@neptunus.(none) +6 -0
    Add test case for "query" command

  mysql-test/t/mysqltest.test@1.24.1.20, 2006-07-26 14:02:21+02:00, msvensson@neptunus.(none) +15 -0
    Add test case for "query" command

ChangeSet@1.2230.1.1, 2006-07-26 12:40:26+02:00, msvensson@shellback.(none) +7 -0
  Bug#21039 Transaction cache not flushed after SELECT CREATE
   - Add prelocking for stored procedures that uses sp or sf
   - Update test result for sp_error(reported as bug#21294)
   - Make note about new error message from sp-error(bug#17244)

  mysql-test/r/sp-error.result@1.111, 2006-07-26 12:40:19+02:00, msvensson@shellback.(none) +1 -1
    Update test result(reported as bug#21294)

  mysql-test/r/sp_notembedded.result@1.4.1.2, 2006-07-26 12:40:19+02:00, msvensson@shellback.(none) +0 -11
    Update test result after disabling test case 

  mysql-test/t/sp-error.test@1.109, 2006-07-26 12:40:19+02:00, msvensson@shellback.(none) +4 -0
    Add note about the faulty error message

  mysql-test/t/sp_notembedded.test@1.6, 2006-07-26 12:40:19+02:00, msvensson@shellback.(none) +3 -1
    Disable test case until bug#17244 has been fixed

  sql/sp.cc@1.115, 2006-07-26 12:40:19+02:00, msvensson@shellback.(none) +9 -18
    Add prelocking for all stored procedures that uses another sp or sf

  sql/sp.h@1.36, 2006-07-26 12:40:20+02:00, msvensson@shellback.(none) +1 -2
    Add prelocking for all stored procedures that uses another sp or sf

  sql/sql_base.cc@1.335, 2006-07-26 12:40:20+02:00, msvensson@shellback.(none) +4 -16
    Add prelocking for all stored procedures that uses another sp or sf

ChangeSet@1.1616.2704.1, 2006-07-26 13:32:28+03:00, gkodinov@macbook.gmz +3 -0
  Bug #21019: First result of SELECT COUNT(*) different than consecutive runs
   When optimizing conditions like 'a = <some_val> OR a IS NULL' so that they're
   united into a single condition on the key and checked together the server must 
   check which value is the NULL value in a correct way : not only using ->is_null 
   but also check if the expression doesn't depend on any tables referenced in the 
   current statement. 
   This additional check must be performed because that optimization takes place 
   before the actual execution of the statement, so if the field was initialized 
   to NULL from a previous statement the optimization would be applied incorrectly.

  mysql-test/r/select.result@1.34.10.1, 2006-07-26 13:32:20+03:00, gkodinov@macbook.gmz +26 -0
    Bug #21019: First result of SELECT COUNT(*) different than consecutive runs
     - test case

  mysql-test/t/select.test@1.28.8.1, 2006-07-26 13:32:21+03:00, gkodinov@macbook.gmz +15 -0
    Bug #21019: First result of SELECT COUNT(*) different than consecutive runs
     - test case. 
       Note that ALTER TABLE is important here : it happens to
       leave the Field instance for t1.b set to NULL, witch is vital for
       demonstrating the problem fixed by this changeset.

  sql/sql_select.cc@1.216.129.1, 2006-07-26 13:32:22+03:00, gkodinov@macbook.gmz +5 -2
    Bug #21019: First result of SELECT COUNT(*) different than consecutive runs
     - check whether a value is null taking into account its table dependency.

ChangeSet@1.2234, 2006-07-26 12:21:34+02:00, msvensson@neptunus.(none) +1 -0
  Change mtr_error to mtr_warning allowing processing to continue when mysqld fails to start

  mysql-test/mysql-test-run.pl@1.143.1.4, 2006-07-26 12:21:31+02:00, msvensson@neptunus.(none) +1 -1
    Report warining when failure to start mysqld was detected, this will allow the testcase to continue executing.
    The failure to start mysqld will be caugt when executing mysqltest

ChangeSet@1.2181.159.28, 2006-07-26 11:50:13+02:00, ingo@chilla.local +1 -0
  Disabled ndb_restore_compat for BUG#21283.

  mysql-test/t/disabled.def@1.178, 2006-07-26 11:50:07+02:00, ingo@chilla.local +1 -0
    Disabled ndb_restore_compat for BUG#21283.

ChangeSet@1.2181.172.2, 2006-07-26 13:28:51+04:00, aivanov@mysql.com +29 -0
  Applied innodb-5.1-ss660 snapshot.
   Changes in SQL parser:
   * Change default mode of SELECT from "lock in share mode"
     to "consistent read".
   * Remove support from SELECT for specifying "consistent read".
   * Add support in SELECT for specifying "lock in share mode".
   * Change all uses of SQL parser to specify "lock in share mode".
   * Modify syntax so that the only valid top-level statement is
     a procedure definition, since it's the only one that actually
     works.
   * Add support for lock waits.

  storage/innobase/configure.in@1.35, 2006-07-26 13:28:42+04:00, aivanov@mysql.com +1 -1
    Applied innodb-5.1-ss660 snapshot.
     Add -Wpointer-arith to CFLAGS when using GCC.

  storage/innobase/btr/btr0cur.c@1.54, 2006-07-26 13:28:42+04:00, aivanov@mysql.com +2 -1
    Applied innodb-5.1-ss660 snapshot.
     btr_cur_search_to_nth_level(): Reacquire btr_search_latch after
     inserting to the insert buffer. This was noticed while analysing
     Bug#19801, but this should not fix this bug since, according to
     Heikki, btr_search_latch is not reserved during an insert.

  storage/innobase/data/data0type.c@1.27, 2006-07-26 13:28:42+04:00, aivanov@mysql.com +1 -0
    Applied innodb-5.1-ss660 snapshot.

  storage/innobase/dict/dict0crea.c@1.38, 2006-07-26 13:28:42+04:00, aivanov@mysql.com +2 -2
    Applied innodb-5.1-ss660 snapshot.

  storage/innobase/dict/dict0dict.c@1.83, 2006-07-26 13:28:42+04:00, aivanov@mysql.com +1 -1
    Applied innodb-5.1-ss660 snapshot.
     Make dict_remove_db_name() non-static.

  sql/ha_innodb.cc@1.282, 2006-07-26 13:28:42+04:00, aivanov@mysql.com +2 -1
    Applied innodb-5.1-ss660 snapshot.
     Document better the "bool table_id" flag.

  storage/innobase/ibuf/ibuf0ibuf.c@1.45, 2006-07-26 13:28:42+04:00, aivanov@mysql.com +6 -9
    Applied innodb-5.1-ss660 snapshot.
     ibuf_fixed_addr_page(): Add parameter space. As the insert buffer
     B-tree is only located in the system tablespace (space 0),
     IBUF_TREE_ROOT_PAGE_NO is only special in space 0.

  storage/innobase/include/data0type.h@1.27, 2006-07-26 13:28:42+04:00, aivanov@mysql.com +1 -0
    Applied innodb-5.1-ss660 snapshot.

  storage/innobase/include/dict0dict.h@1.46, 2006-07-26 13:28:42+04:00, aivanov@mysql.com +9 -0
    Applied innodb-5.1-ss660 snapshot.
     Make dict_remove_db_name() non-static.

  storage/innobase/include/pars0grm.h@1.6, 2006-07-26 13:28:42+04:00, aivanov@mysql.com +106 -102
    Applied innodb-5.1-ss660 snapshot.

  storage/innobase/include/pars0pars.h@1.12, 2006-07-26 13:28:43+04:00, aivanov@mysql.com +1 -1
    Applied innodb-5.1-ss660 snapshot.

  storage/innobase/include/que0que.h@1.16, 2006-07-26 13:28:43+04:00, aivanov@mysql.com +9 -19
    Applied innodb-5.1-ss660 snapshot.

  storage/innobase/include/sync0rw.ic@1.14, 2006-07-26 13:28:43+04:00, aivanov@mysql.com +1 -1
    Applied innodb-5.1-ss660 snapshot.
     rw_lock_s_unlock_func(): Change a debug assertion to a
     production assertion in order to track down Bug#19081.

  storage/innobase/include/trx0trx.h@1.54, 2006-07-26 13:28:43+04:00, aivanov@mysql.com +1 -3
    Applied innodb-5.1-ss660 snapshot.
     trx_sig_send() always succeeds or asserts.

  storage/innobase/include/ut0ut.h@1.21, 2006-07-26 13:28:43+04:00, aivanov@mysql.com +7 -4
    Applied innodb-5.1-ss660 snapshot.
     Document better the "bool table_id" flags.

  storage/innobase/mem/mem0mem.c@1.17, 2006-07-26 13:28:43+04:00, aivanov@mysql.com +1 -1
    Applied innodb-5.1-ss660 snapshot.

  storage/innobase/pars/lexyy.c@1.22, 2006-07-26 13:28:43+04:00, aivanov@mysql.com +347 -333
    Applied innodb-5.1-ss660 snapshot.

  storage/innobase/pars/pars0grm.c@1.13, 2006-07-26 13:28:43+04:00, aivanov@mysql.com +666 -658
    Applied innodb-5.1-ss660 snapshot.

  storage/innobase/pars/pars0grm.h@1.6, 2006-07-26 13:28:43+04:00, aivanov@mysql.com +106 -102
    Applied innodb-5.1-ss660 snapshot.

  storage/innobase/pars/pars0grm.y@1.11, 2006-07-26 13:28:43+04:00, aivanov@mysql.com +11 -7
    Applied innodb-5.1-ss660 snapshot.

  storage/innobase/pars/pars0lex.l@1.14, 2006-07-26 13:28:43+04:00, aivanov@mysql.com +12 -4
    Applied innodb-5.1-ss660 snapshot.

  storage/innobase/pars/pars0pars.c@1.19, 2006-07-26 13:28:43+04:00, aivanov@mysql.com +16 -11
    Applied innodb-5.1-ss660 snapshot.

  storage/innobase/que/que0que.c@1.26, 2006-07-26 13:28:43+04:00, aivanov@mysql.com +102 -38
    Applied innodb-5.1-ss660 snapshot.

  storage/innobase/row/row0mysql.c@1.127, 2006-07-26 13:28:43+04:00, aivanov@mysql.com +18 -12
    Applied innodb-5.1-ss660 snapshot.

  storage/innobase/row/row0sel.c@1.106, 2006-07-26 13:28:43+04:00, aivanov@mysql.com +26 -17
    Applied innodb-5.1-ss660 snapshot.
     * Disable prefetch and adaptive hash index for tables
       with rows over 1024 bytes in InnoDB's SQL parser.
     * row_sel_try_search_shortcut(): Do not return SEL_FOUND
       when the record was not found. This bug was introduced
       in MySQL/InnoDB 5.0.3, but luckily it should never
       manifest itself, given that existing InnoDB SQL code
       never makes use of consistent reads.
     * Don't take unnecesary locks on supremum records when the
       srv_locks_unsafe_for_binlog option is enabled. Fixes an
       assertion failure in the innodb_unsafe_binlog testcase
       when compiled with UNIV_DEBUG.
    

  storage/innobase/row/row0upd.c@1.44, 2006-07-26 13:28:43+04:00, aivanov@mysql.com +1 -6
    Applied innodb-5.1-ss660 snapshot.

  storage/innobase/trx/trx0roll.c@1.32, 2006-07-26 13:28:43+04:00, aivanov@mysql.com +2 -9
    Applied innodb-5.1-ss660 snapshot.
     trx_sig_send() always succeeds or asserts.

  storage/innobase/trx/trx0trx.c@1.66, 2006-07-26 13:28:43+04:00, aivanov@mysql.com +4 -21
    Applied innodb-5.1-ss660 snapshot.
     trx_sig_send() always succeeds or asserts.

  storage/innobase/ut/ut0ut.c@1.36, 2006-07-26 13:28:43+04:00, aivanov@mysql.com +6 -3
    Applied innodb-5.1-ss660 snapshot.
     Document better the "bool table_id" flags.

ChangeSet@1.1616.2703.1, 2006-07-26 11:08:15+02:00, msvensson@neptunus.(none) +1 -0
  Bug#21218 Test "mysqlbinlog" fails to execute another program on Windows
   - Modify test case to workaround the test tool problem
   - (Null merge into 5.0)

  mysql-test/t/mysqlbinlog.test@1.8.2.1, 2006-07-26 11:08:13+02:00, msvensson@neptunus.(none) +4 -2
    Send the ouput from "mysqlbinlog" to a file and then read execute it with "mysql"
    This is a workaround for a windows bug in the test tools in mysql-4.1, which makes
    it impossible to use "|" to send the output from one program directly to the other.
    This has been fixed in mysql-5.0. 

ChangeSet@1.2233, 2006-07-26 10:56:29+02:00, msvensson@neptunus.(none) +1 -0
  Add printout of where error occured when printing to error log in 'im_stop'

  mysql-test/mysql-test-run.pl@1.143.1.3, 2006-07-26 10:56:27+02:00, msvensson@neptunus.(none) +6 -5
    Add printout of where error occured when printing to error log in 'im_stop'

ChangeSet@1.2232, 2006-07-26 10:35:08+02:00, msvensson@neptunus.(none) +1 -0
  Fix problem with detecting wheter im processes has shutdown cleanly

  mysql-test/mysql-test-run.pl@1.143.1.2, 2006-07-26 10:35:06+02:00, msvensson@neptunus.(none) +17 -24
    Fix problem with checking that all im processes has shutdown cleanly
    When it was detected that one of "im mysqlds" didn't shutdown, last was called to break the loop, but it only broke the inner loop.
    Remove the while(0) loop and make this easier by setting $clean_shutdown to 0 if any such problem is detected.

ChangeSet@1.2231, 2006-07-26 09:53:48+02:00, msvensson@neptunus.(none) +1 -0
  Add the instance manager to the list of processes to shutdown and ping in mtr_kill_leftovers

  mysql-test/lib/mtr_process.pl@1.43.1.1, 2006-07-26 09:53:46+02:00, msvensson@neptunus.(none) +3 -1
    Add the instance manager to the list of processes to shutdown and ping in mtr_kill_leftovers

ChangeSet@1.1810.1966.2, 2006-07-26 08:26:07+04:00, aivanov@mysql.com +3 -0
  Applied innodb-5.0-ss660 snapshot.

  innobase/btr/btr0cur.c@1.44.5.1, 2006-07-26 08:25:57+04:00, aivanov@mysql.com +2 -1
    Applied innodb-5.0-ss660 snapshot.
     btr_cur_search_to_nth_level(): Reacquire btr_search_latch after
     inserting to the insert buffer. This was noticed while analyzing
     Bug#19081 but this shold not fix this bug since according to
     Heikki, btr_search_latch is not reserved during an insert.

  innobase/ibuf/ibuf0ibuf.c@1.36.4.2, 2006-07-26 08:25:57+04:00, aivanov@mysql.com +6 -9
    Applied innodb-5.0-ss660 snapshot.
     ibuf_fixed_addr_page(): Add parameter space. As the insert buffer
     B-tree is only located in the system tablespace (space 0),
     IBUF_TREE_ROOT_PAGE_NO is only special in space 0.

  innobase/include/sync0rw.ic@1.9.2.1, 2006-07-26 08:25:57+04:00, aivanov@mysql.com +1 -1
    Applied innodb-5.0-ss660 snapshot.
     rw_lock_s_unlock_func(): Change a debug assertion to a
     production assertion in order to track down Bug#19081.

ChangeSet@1.1616.2685.2, 2006-07-26 07:47:29+04:00, aivanov@mysql.com +1 -0
  Applied innodb-4.1-ss32 snapshot.

  innobase/ibuf/ibuf0ibuf.c@1.32.1.1, 2006-07-26 07:47:09+04:00, aivanov@mysql.com +6 -9
    Applied innodb-4.1-ss32 snapshot.
     ibuf_fixed_addr_page(): Add parameter space. As the insert
     buffer B-tree is only located in the system tablespace
     (space 0), IBUF_TREE_ROOT_PAGE_NO is only special in space 0.

ChangeSet@1.1810.1963.2, 2006-07-25 16:12:48-07:00, jimw@rama.(none) +2 -0
  Bug #21284: Add Field::needs_quote() method and use it in Federated
  
    The fix for bug 17608 removed the behavior of only adding quotes to values
    that needed it when constructing the queries sent by the federated storage
    engine. This restores that behavior, but using a new virtual Field method.
    (The old one had a hardcoded list of field types.)
  
    No test included. The behavior can be verified by inspecting the query log
    on the slave in the federated test.

  sql/field.h@1.153.1.33, 2006-07-25 16:12:44-07:00, jimw@rama.(none) +7 -0
    Add str_needs_quotes() method to indicate whether the results of val_str()
    requires quoting when used in constructing an SQL query.

  sql/ha_federated.cc@1.24.1.44, 2006-07-25 16:12:44-07:00, jimw@rama.(none) +21 -9
    Restore behavior of only quoting values that need it, using the new
    Field::str_needs_quotes() method.

ChangeSet@1.1810.1922.5, 2006-07-25 18:38:09-04:00, pgalbraith@buffy.netfrastructure.com +3 -0
  BUG #15133 "unique index with nullable value not accepted in federated table"
  
  Added HA_NULL_IN_KEY to table flags to allow for nullable unique indexes
  and added test to verify
  
  ha_federated.h:
    BUG #15133 "unique index with nullable value not accepted in federated table"
    added HA_NULL_IN_KEY to table flags to allow for nullable unique indexes
  federated.test:
    BUG #15133 "unique index with nullable value not accepted in federated table"
    New test to show that nullable unique indexes work
  federated.result:
    BUG #15133 "unique index with nullable value not accepted in federated table"
    New results for new test

  mysql-test/r/federated.result@1.25.1.12, 2006-07-25 18:03:46-04:00, pgalbraith@buffy.netfrastructure.com +27 -0
    BUG #15133 "unique index with nullable value not accepted in federated table"
    New results for new test

  mysql-test/t/federated.test@1.19.1.14, 2006-07-25 18:03:24-04:00, pgalbraith@buffy.netfrastructure.com +45 -0
    BUG #15133 "unique index with nullable value not accepted in federated table"
    New test to show that nullable unique indexes work

  sql/ha_federated.h@1.18.1.9, 2006-07-25 16:40:18-04:00, pgalbraith@buffy.netfrastructure.com +3 -1
    BUG #15133 "unique index with nullable value not accepted in federated table"
    added HA_NULL_IN_KEY to table flags to allow for nullable unique indexes

ChangeSet@1.1616.2702.1, 2006-07-26 01:11:19+03:00, timour@lamia.home +5 -0
  Fix for BUG#20954: avg(keyval) retuns 0.38 but max(keyval) returns an empty set
  
  The problem was in that opt_sum_query() replaced MIN/MAX functions
  with the corresponding constant found in a key, but due to imprecise
  representation of float numbers, when evaluating the where clause,
  this comparison failed.
  
  When MIN/MAX optimization detects that all tables can be removed,
  also remove all conjuncts in a where clause that refer to these
  tables. As a result of this fix, these conditions are not evaluated
  twice, and in the case of float number comparisons we do not discard
  result rows due to imprecise float representation.
  
  As a side-effect this fix also corrects an unnoticed problem in
  bug 12882.

  mysql-test/r/func_group.result@1.22.7.1, 2006-07-26 01:11:17+03:00, timour@lamia.home +2 -0
    BUG#20954 - test result adjustment.
    Adjusted the test result of bug 12882 which was not preperly fixed.
    The current patch corrects the problem that was fully corrected by the
    patch for 12882.
    
    The problem was that opt_sum_query() indicated that the optimizer may
    remove all tables because all MIN/MAX/COUNT functions are constants,
    but this lead to an empty result instead of NULL because the WHERE
    clause was still evaluated.
    
    The current fix removes all conjuncts in the where clause that
    reference the removed tables, and thus corrects the problem.

  mysql-test/r/select.result@1.34.3.39, 2006-07-26 01:11:17+03:00, timour@lamia.home +49 -0
    BUG#20954 - added test

  mysql-test/r/subselect.result@1.67.63.1, 2006-07-26 01:11:17+03:00, timour@lamia.home +1 -1
    BUG#20954 - test result adjustment.
    
    The fix removes those conditions in a where clause that refer to
    tables optimized away by MIN/MAX optimization (opt_sum_query()).

  mysql-test/t/select.test@1.28.4.14, 2006-07-26 01:11:17+03:00, timour@lamia.home +30 -0
    BUG#20954 - added test

  sql/sql_select.cc@1.216.126.10, 2006-07-26 01:11:18+03:00, timour@lamia.home +18 -0
    Fix for BUG#20954: avg(keyval) retuns 0.38 but max(keyval) returns an empty set
    
    When MIN/MAX optimization detects that all tables can be removed,
    also remove all conjuncts in a where clause that refer to these
    tables. As a result of this fix, these conditions are not evaluated
    twice, and in the case of float number comparisons we do not discard
    result rows due to imprecise float representation.
    
    As a side-effect this fix also corrects an unnoticed problem in
    bug 12882.

ChangeSet@1.1810.1965.1, 2006-07-26 00:31:29+04:00, evgen@moonbone.local +8 -0
  Fixed bug#19862: Sort with filesort by function evaluates function twice
  
  When there is no index defined filesort is used to sort the result of a
  query. If there is a function in the select list and the result set should be
  ordered by it's value then this function will be evaluated twice. First time to
  get the value of the sort key and second time to send its value to a user.
  This happens because filesort when sorts a table remembers only values of its
  fields but not values of functions.
  All functions are affected. But taking into account that SP and UDF functions
  can be both expensive and non-deterministic a temporary table should be used 
  to store their results and then sort it to avoid twice SP evaluation and to 
  get a correct result.
  
  If an expression referenced in an ORDER clause contains a SP or UDF 
  function, force the use of a temporary table.
  
  A new Item_processor function called func_type_checker_processor is added
  to check whether the expression contains a function of a particular type.

  mysql-test/r/sp.result@1.170.1.34, 2006-07-26 00:31:10+04:00, evgen@moonbone.local +19 -0
    Added test case for bug#19862: Sort with filesort by function evaluates function twice

  mysql-test/r/udf.result@1.3.1.3, 2006-07-26 00:31:10+04:00, evgen@moonbone.local +6 -0
    Added test case for bug#19862: Sort with filesort by function evaluates function twice

  mysql-test/t/sp.test@1.174.13.1, 2006-07-26 00:31:09+04:00, evgen@moonbone.local +18 -0
    Added test case for bug#19862: Sort with filesort by function evaluates function twice

  mysql-test/t/udf.test@1.6, 2006-07-26 00:31:07+04:00, evgen@moonbone.local +7 -0
    Added test case for bug#19862: Sort with filesort by function evaluates function twice

  sql/item.h@1.183.1.21, 2006-07-26 00:31:13+04:00, evgen@moonbone.local +1 -0
    Fixed bug#19862: Sort with filesort by function evaluates function twice
    A new Item_processor function called func_type_checker_processor is added
    to check whether the expression contains a function of a particular type.

  sql/item_func.cc@1.270.16.1, 2006-07-26 00:31:13+04:00, evgen@moonbone.local +7 -0
    Fixed bug#19862: Sort with filesort by function evaluates function twice
    A new Item_processor function called func_type_checker_processor is added
    to check whether the expression contains a function of a particular type.

  sql/item_func.h@1.136.8.1, 2006-07-26 00:31:12+04:00, evgen@moonbone.local +3 -1
    Fixed bug#19862: Sort with filesort by function evaluates function twice
    A new Item_processor function called func_type_checker_processor is added
    to check whether the expression contains a function of a particular type.

  sql/sql_select.cc@1.312.79.1, 2006-07-26 00:31:11+04:00, evgen@moonbone.local +20 -0
    Fixed bug#19862: Sort with filesort by function evaluates function twice
    If an expression referenced in an ORDER clause contains a SP or UDF
    function, force the use of a temporary table.

ChangeSet@1.2181.159.27, 2006-07-25 18:37:35+02:00, ingo@chilla.local +1 -0
  Disabled ndb_binlog_ignore_db for BUG 21279.

  mysql-test/t/disabled.def@1.177, 2006-07-25 18:37:32+02:00, ingo@chilla.local +1 -0
    Disabled ndb_binlog_ignore_db for BUG 21279.

ChangeSet@1.1810.1964.2, 2006-07-25 18:42:49+03:00, gkodinov@macbook.gmz +4 -0
  Bug #21086: server crashes when VIEW defined with a SELECT with COLLATE clause is called
    When executing INSERT over a view with calculated columns it was assuming all
    elements of the fields collection are actually Item_field instances.
    This may not be true when inserting into a view and that view has columns that are 
    such expressions that allow updating (like setting a collation for example).
    Corrected to access field information through the filed_for_view_update() function and 
    retrieve correctly the field info even for "update-friendly" non-Item_field items.

  mysql-test/r/view.result@1.138.1.29, 2006-07-25 18:42:40+03:00, gkodinov@macbook.gmz +13 -0
    Bug #21086: server crashes when VIEW defined with a SELECT with COLLATE clause is called
     - test suite

  mysql-test/t/view.test@1.126.1.26, 2006-07-25 18:42:41+03:00, gkodinov@macbook.gmz +19 -0
    Bug #21086: server crashes when VIEW defined with a SELECT with COLLATE clause is called
     - test suite

  sql/item_strfunc.h@1.101.1.11, 2006-07-25 18:42:42+03:00, gkodinov@macbook.gmz +1 -1
    Bug #21086: server crashes when VIEW defined with a SELECT with COLLATE clause is called
     - obvious typo fixed

  sql/sql_base.cc@1.235.1.111, 2006-07-25 18:42:42+03:00, gkodinov@macbook.gmz +7 -2
    Bug #21086: server crashes when VIEW defined with a SELECT with COLLATE clause is called
     - must access field information through the filed_for_view_update() function to retrieve
       correctly the field info even for "update-friendly" non-Item_field items.

ChangeSet@1.2181.171.1, 2006-07-25 18:46:43+05:00, bar@mysql.com +5 -0
  Bug#20795: extractvalue() won't accept names containing a dot (.)
  Dot character was not considered as a valid identifier body character.

  mysql-test/r/xml.result@1.17, 2006-07-25 18:46:35+05:00, bar@mysql.com +6 -0
    Adding test case

  mysql-test/t/xml.test@1.16, 2006-07-25 18:46:36+05:00, bar@mysql.com +6 -0
    Adding test case

  sql/item_xmlfunc.cc@1.19, 2006-07-25 18:46:36+05:00, bar@mysql.com +2 -1
    Treat dot character as a valid identifier body part.

  strings/ctype.c@1.64, 2006-07-25 18:46:36+05:00, bar@mysql.com +28 -28
    Fixing to use '/' instead of '.' as a delimiter in charset file parser.

  strings/xml.c@1.12, 2006-07-25 18:46:36+05:00, bar@mysql.com +4 -4
    Fixing to use '/' instead of '.' as a delimiter.

ChangeSet@1.1616.2701.1, 2006-07-25 18:02:42+05:00, holyfoot@mysql.com +1 -0
  Bug #15440 (handler.test hangs in embedded mode)
  
  the old problem - mysqltest can't handle multiple connections in the
  embedded server properly. So i disabled the test for the embedded mode
  until mysqltest is fixed

  mysql-test/t/handler.test@1.21.1.5, 2006-07-25 18:02:39+05:00, holyfoot@mysql.com +1 -0
    test temporarily disabled in embedded server

ChangeSet@1.2181.165.2, 2006-07-25 14:52:24+02:00, andrey@lmy004. +3 -0
  Fix for bug#16532 mysql server assert in debug if table definition is removed
  
  Emit an error instead of doing ASSERT

  mysql-test/r/create_not_windows.result@1.2.1.1, 2006-07-25 14:52:20+02:00, andrey@lmy004. +17 -0
    update result

  mysql-test/t/create_not_windows.test@1.2, 2006-07-25 14:52:20+02:00, andrey@lmy004. +21 -0
    Add test case for bug #16532: mysql server assert in debug if table definition is removed

  sql/sql_table.cc@1.358.1.1, 2006-07-25 14:52:20+02:00, andrey@lmy004. +13 -1
    it could happen that an user deletes the frm file on OS level.
    In addition if the table was already opened, the file system level
    check for existance of table.frm will pass but get_cached_table_share()
    will return non-NULL value. In this case we will emit the standard
    error that the table exist. The error case is quite obscure but error
    message is better than a sigabort.

ChangeSet@1.1616.2144.176, 2006-07-25 17:27:53+05:00, bar@mysql.com +3 -0
  Bug#19741 segfault with cp1250 charset + like + primary key + 64bit os
  LIKE craashed with a pattern having letters in the range 128..255
  (e.g. A WITH ACUTE or C WITH CARON) because of wrong cast from
  signed char to unsigned int.

  mysql-test/r/ctype_cp1250_ch.result@1.5, 2006-07-25 17:27:49+05:00, bar@mysql.com +8 -0
    Adding test case

  mysql-test/t/ctype_cp1250_ch.test@1.5, 2006-07-25 17:27:49+05:00, bar@mysql.com +10 -0
    Adding test case

  strings/ctype-win1250ch.c@1.42.1.6, 2006-07-25 17:27:49+05:00, bar@mysql.com +2 -2
    Fixing wrong cast from "signed char" -> "uint" to
    "signed char" -> "unsigned char" -> uint, to properly
    handle bytes 128..255.

ChangeSet@1.1810.1698.95, 2006-07-25 17:23:25+05:00, gluh@mysql.com +6 -0
  Bug#20543 select on information_schema strange warnings, view, different schemas/users
  The fix is: if user has privileges to view fields and user has any
  (insert,select,delete,update) privileges on underlying view 
  then 'show fields' and select from I_S.COLUMNS table are sucsessful.

  mysql-test/r/information_schema_db.result@1.1.1.7, 2006-07-25 17:23:20+05:00, gluh@mysql.com +46 -0
    Bug#20543 select on information_schema strange warnings, view, different schemas/users
    test result

  mysql-test/t/information_schema_db.test@1.5, 2006-07-25 17:23:20+05:00, gluh@mysql.com +56 -0
    Bug#20543 select on information_schema strange warnings, view, different schemas/users
    test case

  sql/sql_acl.cc@1.128.30.1, 2006-07-25 17:23:20+05:00, gluh@mysql.com +15 -0
    Bug#20543 select on information_schema strange warnings, view, different schemas/users
    checked that user has privileges on underlying view and if it's true
    set allowed_show to true for top view.

  sql/sql_show.cc@1.253.35.1, 2006-07-25 17:23:21+05:00, gluh@mysql.com +7 -20
    Bug#20543 select on information_schema strange warnings, view, different schemas/users
    removed unnecessary rights check.'tables->allowed_show' check is used instead

  sql/sql_view.cc@1.78.1.12, 2006-07-25 17:23:21+05:00, gluh@mysql.com +2 -1
    Bug#20543 select on information_schema strange warnings, view, different schemas/users
    skip the check of SHOW_VIEW_ACL privilege on underlying view. It is done later during
    execution of find_field_in_table_ref function.

  sql/table.h@1.102.12.2, 2006-07-25 17:23:21+05:00, gluh@mysql.com +1 -0
    Bug#20543 select on information_schema strange warnings, view, different schemas/users
    'allowed_show' is set during rights check for view. If true then user has privileges 
    for 'show create view', etc
    

ChangeSet@1.1810.1868.25, 2006-07-25 12:56:23+02:00, joerg@trift2. +1 -0
  "mysql-test-run.pl" must write a "Logging:" line for the evaluation of RPM build tests.
      (Re-apply a patch from the general tree to the clone.)

  mysql-test/mysql-test-run.pl@1.30.37.1, 2006-07-25 12:56:20+02:00, joerg@trift2. +5 -0
    "mysql-test-run.pl" must write a "Logging:" line for the evaluation of RPM build tests.
    (Re-apply a patch from the general tree to the clone.)

ChangeSet@1.1810.1868.24, 2006-07-25 20:00:18+09:30, grog@eucla.lemis.com +1 -0
  slave.cc:
        BUG#20850: Assert during slave shutdown in many rpl_* tests
        This patch has already been applied to 5.1.

  sql/slave.cc@1.241.8.1, 2006-07-25 18:59:58+09:30, grog@eucla.lemis.com +4 -4
        BUG#20850: Assert during slave shutdown in many rpl_* tests
        This patch has already been applied to 5.1.

ChangeSet@1.1810.1962.1, 2006-07-25 11:45:10+03:00, gkodinov@macbook.gmz +4 -0
  Bug#16712: group_concat returns odd srting insead of intended result
    when calculating GROUP_CONCAT all blob fields are transformed
    to varchar when making the temp table.
    However a varchar has at max 2 bytes for length. 
    This fix makes the conversion only for blobs whose max length 
    is below that limit. 
    Otherwise blob field is created by make_string_field() call.

  mysql-test/r/func_gconcat.result@1.52.1.7, 2006-07-25 11:44:58+03:00, gkodinov@macbook.gmz +13 -0
    Bug#16712: group_concat returns odd srting insead of intended result
      * testsuite for the bug

  mysql-test/t/func_gconcat.test@1.44.1.1, 2006-07-25 11:44:59+03:00, gkodinov@macbook.gmz +14 -0
    Bug#16712: group_concat returns odd srting insead of intended result
      * testsuite for the bug

  sql/item_sum.cc@1.170.3.1, 2006-07-25 11:45:00+03:00, gkodinov@macbook.gmz +7 -1
    Bug#16712: group_concat returns odd srting insead of intended result
      * force blob->varchar conversion for small enough blobs only

  sql/sql_select.cc@1.312.78.1, 2006-07-25 11:45:01+03:00, gkodinov@macbook.gmz +12 -2
    Bug#16712: group_concat returns odd srting insead of intended result
      * force blob->varchar conversion for small enough blobs only

ChangeSet@1.1810.1936.10, 2006-07-24 19:05:46-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #21231: wrong results for a simple query with a
  a non-correlated single-row subquery over information schema.
  
  The function get_all_tables filling all information schema
  tables reset lex->sql_command to SQLCOM_SHOW_FIELDS. After
  this the function could evaluate partial conditions related to
  some columns. If these conditions contained a subquery over
  information schema it led to a wrong evaluation and a wrong 
  result set.
  This bug was already fixed in 5.1.
  This patch follows the way how it was done in 5.1 where
  the value of lex->sql_command is set to SQLCOM_SHOW_FIELDS
  in get_all_tables only for the calls of the function 
  open_normal_and_derived_tables and is restored after these
  calls.

  mysql-test/r/information_schema.result@1.87.1.26, 2006-07-24 19:05:43-07:00, igor@olga.mysql.com +8 -0
    Added a test case for bug #21231.

  mysql-test/t/information_schema.test@1.65.1.20, 2006-07-24 19:05:44-07:00, igor@olga.mysql.com +10 -0
    Added a test case for bug #21231.

  sql/sql_show.cc@1.253.1.72, 2006-07-24 19:05:44-07:00, igor@olga.mysql.com +10 -6
    Fixed bug #21231: wrong results for a simple query with a
    a non-correlated single-row subquery over information schema.
    
    The function get_all_tables filling all information schema
    tables reset lex->sql_command to SQLCOM_SHOW_FIELDS. After
    this the function could evaluate partial conditions related to
    some columns. If these conditions contained a subquery over
    information schema it led to a wrong evaluation and a wrong 
    result set.
    This bug was already fixed in 5.1.
    This patch follows the way how it was done in 5.1 where
    the value of lex->sql_command is set to SQLCOM_SHOW_FIELDS
    in get_all_tables only for the calls of the function 
    open_normal_and_derived_tables and is restored after these
    calls.

ChangeSet@1.1810.1961.1, 2006-07-24 16:45:26-07:00, jimw@rama.(none) +3 -0
  Bug #10668: CREATE USER does not enforce username length limit
  
    This appears to have just been an oversight -- CREATE USER was not enforcing
    the existing username limitations.

  mysql-test/r/grant.result@1.37.1.16, 2006-07-24 16:45:23-07:00, jimw@rama.(none) +3 -0
    Add new results

  mysql-test/t/grant.test@1.41.1.1, 2006-07-24 16:45:23-07:00, jimw@rama.(none) +6 -0
    Add new regression test

  sql/sql_acl.cc@1.128.1.72, 2006-07-24 16:45:23-07:00, jimw@rama.(none) +10 -1
    Enforce the user and host name limits in mysql_create_user().

ChangeSet@1.1810.1960.1, 2006-07-24 13:31:20-07:00, jimw@rama.(none) +3 -0
  Bug #16502: mysqlcheck gets confused with views
  
    Make mysqlcheck skip over views when processing all of the tables in a
    database.

  client/mysqlcheck.c@1.55.1.2, 2006-07-24 13:31:18-07:00, jimw@rama.(none) +12 -4
    Use SHOW TABLE STATUS to get table list, and skip over things that don't
    have an engine (like a VIEW).

  mysql-test/r/mysqlcheck.result@1.1.1.1, 2006-07-24 13:31:18-07:00, jimw@rama.(none) +7 -0
    Add new results

  mysql-test/t/mysqlcheck.test@1.1.1.1, 2006-07-24 13:31:18-07:00, jimw@rama.(none) +14 -0
    Add new regression test

ChangeSet@1.2181.116.3, 2006-07-24 21:58:11+04:00, sergefp@mysql.com +3 -0
  BUG#20257: Fix partition pruning for BIGINT UNSIGNED:
   - Fix problems in the "Interval walking" partition interval analyzer.

  mysql-test/r/partition_pruning.result@1.19, 2006-07-24 21:58:08+04:00, sergefp@mysql.com +79 -0
    BUG#20257: Add more testcases for partition pruning

  mysql-test/t/partition_pruning.test@1.16, 2006-07-24 21:58:08+04:00, sergefp@mysql.com +66 -0
    BUG#20257: Add more testcases for partition pruning

  sql/sql_partition.cc@1.80.1.1, 2006-07-24 21:58:09+04:00, sergefp@mysql.com +12 -4
    BUG#20257: Fix partition pruning for BIGINT UNSIGNED, interval walking:
     - provide special handling for an edge case of interval of size 4G-1.
     - Store interval size in ulonglong, not uint (it was possible to miss partitions this way)
     - In get_next_partition_via_walking(), interpret the value of walked-over field as having the 
       same "signedness" as field (this is so because this value was obtained by calling field->val_int())
     - Remove out of date todo comment.

ChangeSet@1.1810.1849.41, 2006-07-24 19:01:54+02:00, msvensson@neptunus.(none) +2 -0
  Bug #19265  	describe command does not work from mysql prompt
   - Add test case

  mysql-test/r/mysql.result@1.10.1.1, 2006-07-24 19:01:52+02:00, msvensson@neptunus.(none) +10 -0
    Update test result

  mysql-test/t/mysql.test@1.4.2.1, 2006-07-24 19:01:52+02:00, msvensson@neptunus.(none) +9 -0
    Add test for mysql using DESC command

ChangeSet@1.1616.2144.174, 2006-07-24 18:12:57+02:00, msvensson@neptunus.(none) +1 -0
  Bug#21218 Test "mysqlbinlog" fails to execute another program on Windows
   - Send confusing output to /dev/null

  mysql-test/t/mysqlbinlog.test@1.8.1.14, 2006-07-24 18:12:55+02:00, msvensson@neptunus.(none) +6 -5
    Send confusing error messages to /dev/null so they don't appear in erro log if test case fails

ChangeSet@1.1810.1959.1, 2006-07-24 18:05:00+02:00, msvensson@neptunus.(none) +5 -0
  Bug#20145 perror segfault when call it with error nr
    - Add test case(execute perror)
    - Check if strerror has returned NULL and set msg to "Unknown Error" in that case
    - Thanks to Steven Xie for pointing out how to fix. 

  extra/perror.c@1.39.1.5, 2006-07-24 18:04:58+02:00, msvensson@neptunus.(none) +4 -1
    strerror might return NULL on Solaris 2.8

  mysql-test/mysql-test-run.pl@1.30.1.75, 2006-07-24 18:04:58+02:00, msvensson@neptunus.(none) +8 -0
    Add possibility to execute perror from test case 

  mysql-test/r/have_perror.require@1.1, 2006-07-24 18:04:58+02:00, msvensson@neptunus.(none) +2 -0
    New BitKeeper file ``mysql-test/r/have_perror.require''

  mysql-test/r/have_perror.require@1.0, 2006-07-24 18:04:58+02:00, msvensson@neptunus.(none) +0 -0

  mysql-test/r/perror.result@1.1, 2006-07-24 18:04:58+02:00, msvensson@neptunus.(none) +3 -0
    New BitKeeper file ``mysql-test/r/perror.result''

  mysql-test/r/perror.result@1.0, 2006-07-24 18:04:58+02:00, msvensson@neptunus.(none) +0 -0

  mysql-test/t/perror.test@1.1, 2006-07-24 18:04:58+02:00, msvensson@neptunus.(none) +11 -0
    New BitKeeper file ``mysql-test/t/perror.test''

  mysql-test/t/perror.test@1.0, 2006-07-24 18:04:58+02:00, msvensson@neptunus.(none) +0 -0

ChangeSet@1.1616.2699.1, 2006-07-24 14:31:37+02:00, msvensson@neptunus.(none) +2 -0
  Bug#21125 mysqldump: Problem with non-standard table names
   - The mysql-test/std_data/bug15328.cnf file was not copied to install or dist dir.

  scripts/make_win_src_distribution.sh@1.27.2.12, 2006-07-24 14:31:36+02:00, msvensson@neptunus.(none) +1 -1
    Copy *.cnf files as well.

  mysql-test/Makefile.am@1.39.1.15, 2006-07-24 14:31:36+02:00, msvensson@neptunus.(none) +2 -0
    Add std_data/*.cnf files to dist_hook and install-data-local

ChangeSet@1.2181.159.26, 2006-07-24 13:34:30+02:00, ingo@chilla.local +3 -0
  After merge fix

  mysql-test/extra/binlog_tests/blackhole.test@1.13, 2006-07-24 13:34:26+02:00, ingo@chilla.local +1 -0
    After merge fix

  mysql-test/r/binlog_row_blackhole.result@1.8, 2006-07-24 13:34:26+02:00, ingo@chilla.local +0 -5
    After merge fix

  mysql-test/r/binlog_stm_blackhole.result@1.16, 2006-07-24 13:34:26+02:00, ingo@chilla.local +0 -5
    After merge fix

ChangeSet@1.1810.1957.1, 2006-07-24 15:10:50+04:00, kroki@moonlight.intranet +2 -0
  BUG#14702: misleading error message when syntax error in
             CREATE PROCEDURE
  
  The bug was fixed already.  This changeset adds a test case.

  mysql-test/r/sp-error.result@1.102.1.5, 2006-07-24 15:10:47+04:00, kroki@moonlight.intranet +13 -0
    Add result for bug#14702: misleading error message when syntax error
    in CREATE PROCEDURE.

  mysql-test/t/sp-error.test@1.100.1.7, 2006-07-24 15:10:47+04:00, kroki@moonlight.intranet +22 -0
    Add test case for bug#14702: misleading error message when syntax error
    in CREATE PROCEDURE.

ChangeSet@1.1810.1956.6, 2006-07-24 13:10:24+02:00, msvensson@neptunus.(none) +3 -0
  Bug#21215  mysqldump creating incomplete backups without warning
   - Add call to 'safe_exit' function when db query fails.

  client/mysqldump.c@1.214.11.6, 2006-07-24 13:10:22+02:00, msvensson@neptunus.(none) +1 -0
    Add a call to 'safe_exit' to remember the error code and exit unless --force was give.n

  mysql-test/r/mysqldump.result@1.83.11.1, 2006-07-24 13:10:22+02:00, msvensson@neptunus.(none) +16 -0
    Add test result

  mysql-test/t/mysqldump.test@1.76.12.1, 2006-07-24 13:10:22+02:00, msvensson@neptunus.(none) +40 -0
    Add test case

ChangeSet@1.1810.1906.21, 2006-07-24 14:56:53+04:00, kostja@bodhi.local +9 -0
  A fix and a test case for Bug#15752 "Lost connection to MySQL server 
  when calling a SP from C API"
  
  The bug was caused by lack of checks for misuse in mysql_real_query. 
  A stored procedure always returns at least one result, which is the 
  status of execution of the procedure itself.
  This result, or so-called OK packet, is similar to a result
  returned by INSERT/UPDATE/CREATE operations: it contains the overall
  status of execution, the number of affected rows and the number of
  warnings. The client test program attached to the bug did not read this 
  result and ivnoked the next query. In turn, libmysql had no check for 
  such scenario and mysql_real_query was simply trying to send that query 
  without reading the pending response, thus messing up the communication
  protocol.
  
  The fix is to return an error from mysql_real_query when it's called
  prior to retrieval of all pending results.

  client/mysqlbinlog.cc@1.123.1.5, 2006-07-24 14:56:50+04:00, kostja@bodhi.local +2 -1
    net_safe_read -> cli_safe_read

  include/mysql.h@1.154.3.1, 2006-07-24 14:56:50+04:00, kostja@bodhi.local +0 -1
    Remove a private function from the public header.

  include/mysql_com.h@1.100.1.4, 2006-07-24 14:56:50+04:00, kostja@bodhi.local +0 -1
    Remove a define that is never used.

  include/sql_common.h@1.14.1.2, 2006-07-24 14:56:50+04:00, kostja@bodhi.local +1 -1
    Add a declaration for cli_safe_read - a function that reads one packet
    from the server.

  libmysql/libmysql.c@1.233.5.1, 2006-07-24 14:56:50+04:00, kostja@bodhi.local +9 -7
    net_safe_read -> cli_safe_read
    Return CR_COMMANDS_OUT_OF_SYNC on attempt to execute a statement
    using a connection which has pending result sets.

  sql-common/client.c@1.83.6.1, 2006-07-24 14:56:50+04:00, kostja@bodhi.local +40 -29
    Actual fix for Bug#15752: if the server has pending result sets for
    the client, return CR_COMMANDS_OUT_OF_SYNC on attempt to execute
    another query. Similarly to the behaviour of mysql_use_result(),
    multiple result sets block the connection and must be fetched
    before it can be used for another query.
    This uncovered an error in the protocol: the server doesn't drop
    SERVER_MORE_RESULTS_EXISTS status flag upon an error, so in case of
    a multi-query like SELECT 1; SELECT syntax_error; SELECT 2; 
    the client has no way to know that the server won't ever come to 
    execution of the third query and won't return any result sets for it.
    For now, fix it in cli_safe_read, as a proper fix requires extension
    of the client-server protocol.

  sql/protocol.cc@1.111.1.3, 2006-07-24 14:56:50+04:00, kostja@bodhi.local +1 -1
    Remove a name that is never used.

  sql/slave.cc@1.241.1.33, 2006-07-24 14:56:50+04:00, kostja@bodhi.local +1 -1
    net_safe_read -> cli_safe_read

  tests/mysql_client_test.c@1.167.15.1, 2006-07-24 14:56:50+04:00, kostja@bodhi.local +96 -2
    Make 'query' a local variable to avoid name clash.
    Add a test case for Bug#15752 "Lost connection to MySQL server when
    calling an SP from C API"

ChangeSet@1.1810.1956.5, 2006-07-24 12:48:02+02:00, msvensson@neptunus.(none) +1 -0
  Don't close connection to mysql before 'safe_exit', that is done in 'safe_exit' if it decides to exit.

  client/mysqldump.c@1.214.11.5, 2006-07-24 12:48:01+02:00, msvensson@neptunus.(none) +0 -2
    Don't close connection to mysql before 'safe_exit', that is done in 'safe_exit' if it decides to exit.

ChangeSet@1.1810.1956.4, 2006-07-24 12:43:35+02:00, msvensson@neptunus.(none) +1 -0
  Remove double printout of mysqldump in error message

  client/mysqldump.c@1.214.11.4, 2006-07-24 12:43:33+02:00, msvensson@neptunus.(none) +2 -3
    Remove double printout of mysqldump in error message

ChangeSet@1.1810.1956.3, 2006-07-24 12:00:44+02:00, msvensson@neptunus.(none) +1 -0
  Replace sock -> mysql

  client/mysqldump.c@1.214.11.3, 2006-07-24 12:00:42+02:00, msvensson@neptunus.(none) +92 -91
    Replace sock -> mysql

ChangeSet@1.1810.1956.2, 2006-07-24 11:56:01+02:00, msvensson@neptunus.(none) +1 -0
  Change tFlag and dFlag into human readable format
   tFlag => opt_no_create_info
   dFlag => opt_no_data

  client/mysqldump.c@1.214.11.2, 2006-07-24 11:55:59+02:00, msvensson@neptunus.(none) +14 -12
    Change tFlag and dFlag into human readable format
     tFlag => opt_no_create_info
     dFlag => opt_no_data

ChangeSet@1.1810.1956.1, 2006-07-24 11:51:52+02:00, msvensson@neptunus.(none) +1 -0
  Add function verbose_msg

  client/mysqldump.c@1.214.11.1, 2006-07-24 11:51:44+02:00, msvensson@neptunus.(none) +48 -46
    Add function verbose_msg and use it from all places where messages are printed if --verbose are turned on

ChangeSet@1.2181.159.25, 2006-07-24 11:02:13+02:00, ingo@chilla.local +1 -0
  After merge fix

  mysql-test/extra/binlog_tests/blackhole.test@1.12, 2006-07-24 11:02:07+02:00, ingo@chilla.local +0 -10
    After merge fix

ChangeSet@1.1810.1849.38, 2006-07-24 10:56:33+02:00, msvensson@neptunus.(none) +2 -0
  Bug#10877 mysqldump should use consistent last line
   - Add printout in write_footer to tell that mysqldump has completed.
     Ex: -- Dump completed 2006-07-24  8:55:05

  client/Makefile.am@1.52.1.4, 2006-07-24 10:56:31+02:00, msvensson@neptunus.(none) +3 -1
    Build mysqldump with mf_getdate.c

  client/mysqldump.c@1.214.10.1, 2006-07-24 10:56:31+02:00, msvensson@neptunus.(none) +7 -0
    Add printout in write_footer that will print info that mysqldump has completed

ChangeSet@1.1346.1.842, 2006-07-24 10:55:26+02:00, kent@mysql.com +3 -0
  mwasmnlm, mwccnlm, mwldnlm:
    Filter out strange control characters, messes up logs

  netware/BUILD/mwasmnlm@1.3.1.1, 2006-07-24 10:55:09+02:00, kent@mysql.com +4 -1
    Filter out strange control characters, messes up logs

  netware/BUILD/mwccnlm@1.3.1.1, 2006-07-24 10:55:09+02:00, kent@mysql.com +4 -1
    Filter out strange control characters, messes up logs

  netware/BUILD/mwldnlm@1.3.1.1, 2006-07-24 10:55:09+02:00, kent@mysql.com +4 -1
    Filter out strange control characters, messes up logs

ChangeSet@1.2181.159.24, 2006-07-24 10:53:26+02:00, ingo@chilla.local +2 -0
  After merge fix

  storage/blackhole/ha_blackhole.cc@1.38, 2006-07-24 10:53:21+02:00, ingo@chilla.local +1 -1
    After merge fix

  sql/ha_myisammrg.cc@1.92, 2006-07-24 10:53:21+02:00, ingo@chilla.local +1 -1
    After merge fix

ChangeSet@1.2181.159.22, 2006-07-24 09:38:42+10:00, stewart@willster.(none) +1 -0
  BUG#20294 Instance manager test im_instance_conf fails randomly
  
  (well, im_options in this case, but using existing bug report)

  mysql-test/t/disabled.def@1.176, 2006-07-24 09:38:38+10:00, stewart@willster.(none) +1 -1
    disable im_options test as it's non-deterministic. reopen bug

ChangeSet@1.1810.1953.1, 2006-07-23 15:25:30+05:00, ramil@mysql.com +3 -0
  Fix for bug #8143: A date with value 0 is treated as a NULL value

  mysql-test/r/delete.result@1.24, 2006-07-23 15:25:12+05:00, ramil@mysql.com +10 -0
    Fix for bug #8143: A date with value 0 is treated as a NULL value
      - test result

  mysql-test/t/delete.test@1.22, 2006-07-23 15:25:12+05:00, ramil@mysql.com +11 -0
    Fix for bug #8143: A date with value 0 is treated as a NULL value
      - test case

  sql/sql_delete.cc@1.144.1.33, 2006-07-23 15:25:12+05:00, ramil@mysql.com +8 -0
    Fix for bug #8143: A date with value 0 is treated as a NULL value
      - during SELECT queries processing we convert 'date[time]_field is null' 
        conditions into 'date[time]_field = 0000-00-00[ 00:00:00]' for not null 
        DATE and DATETIME fields. To be consistent, we have to do the same for DELETE
        queries. So we should call remove_eq_conds() in the mysql_delete() as well.
        Also it may simplify and speed up DELETE queries execution.

ChangeSet@1.1810.1950.1, 2006-07-22 12:44:54-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #18925: wrong results for queries with
  subqueries on information schema that use MIN/MAX aggregation.
  
  Execution of some correlated subqueries may set the value
  of null_row to 1 for tables used in the subquery.
  If the the subquery is on information schema it causes
  rejection of any row for the following executions of
  the subquery in the case when an optimization filtering
  by some condition is applied.
  
  The fix restores the value of the null_row flag for 
  each execution of a subquery on information schema.

  mysql-test/r/information_schema.result@1.87.1.25, 2006-07-22 12:44:51-07:00, igor@olga.mysql.com +62 -0
    Added a test case for bug #18925.

  mysql-test/t/information_schema.test@1.65.1.19, 2006-07-22 12:44:51-07:00, igor@olga.mysql.com +33 -0
    Added a test case for bug #18925.

  sql/sql_show.cc@1.253.1.71, 2006-07-22 12:44:51-07:00, igor@olga.mysql.com +1 -0
    Fixed bug #18925.
    Execution of some correlated subqueries may set the value
    of null_row to 1 for tables used in the subquery.
    If the the subquery is on information schema it causes
    rejection of any row for the following execitions of
    the subquery in the case when an optimization filtering
    by some condition is applied.
    
    The fix restores the value of the null_row flag for 
    each execution of a subquery on information schema.

ChangeSet@1.2181.159.20, 2006-07-22 13:37:14-04:00, mikael@dator5.(none) +2 -0
  BUG#20340: NODEGROUP wrong field type in partitions information schema table
  Fixes for change that makes default appear in NODEGROUP as it should be instead of 0 which is an error

  mysql-test/r/ndb_dd_backuprestore.result@1.9, 2006-07-22 13:37:12-04:00, mikael@dator5.(none) +30 -30
    Fixes for change that makes default appear in NODEGROUP as it should be instead of 0 which is an error

  mysql-test/r/ndb_partition_range.result@1.3, 2006-07-22 13:37:12-04:00, mikael@dator5.(none) +3 -3
    Fixes for change that makes default appear in NODEGROUP as it should be instead of 0 which is an error

ChangeSet@1.2181.159.19, 2006-07-22 11:27:45-04:00, mikael@dator5.(none) +1 -0
  BUG#20340: NODEGROUP wrong field type in information schema
  Test case fix

  mysql-test/r/information_schema_part.result@1.5, 2006-07-22 11:27:42-04:00, mikael@dator5.(none) +24 -24
    Test case fix

ChangeSet@1.1810.1945.4, 2006-07-22 16:18:28+04:00, sergefp@mysql.com +2 -0
  Post-merge fixes

  sql/item_subselect.cc@1.113.1.16, 2006-07-22 16:18:26+04:00, sergefp@mysql.com +1 -1
    Post-merge fixes

  sql/mysql_priv.h@1.290.55.2, 2006-07-22 16:18:26+04:00, sergefp@mysql.com +2 -0
    Post-merge fixes

ChangeSet@1.1810.1949.1, 2006-07-21 20:29:25-07:00, jimw@rama.(none) +3 -0
  Bug #19147: mysqlshow INFORMATION_SCHEMA does not work
  
    When a wildcard database name is given the mysqlshow, but that wildcard
    matches one database *exactly* (it contains the wildcard character), we
    list the contents of that database instead of just listing the database
    name as matching the wildcard. Probably the most common instance of users
    encountering this behavior would be with "mysqlshow information_schema".

  client/mysqlshow.c@1.49, 2006-07-21 20:29:23-07:00, jimw@rama.(none) +25 -2
    Add special handling for listing a single database that has a name that
    looked like it contained wildcards. In this case, we just go ahead and list
    the contents of the database, since there is a very high probability that is
    what the user really wanted to do. (For example, 'mysqlshow INFORMATION_SCHEMA'
    will show the I_S tables instead of just the I_S database.)

  mysql-test/r/mysqlshow.result@1.4, 2006-07-21 20:29:23-07:00, jimw@rama.(none) +49 -0
    Add new results

  mysql-test/t/mysqlshow.test@1.5, 2006-07-21 20:29:23-07:00, jimw@rama.(none) +9 -0
    Add new regression test

ChangeSet@1.1810.1948.2, 2006-07-22 05:52:37+04:00, evgen@moonbone.local +1 -0
  field.h:
    Fixed typo.

  sql/field.h@1.153.11.2, 2006-07-22 05:52:17+04:00, evgen@moonbone.local +1 -1
    Fixed typo.

ChangeSet@1.1810.1868.23, 2006-07-22 02:00:33+02:00, kent@mysql.com +3 -0
  mysqlmanager.vcproj:
    Place mysqlmanager 'pdb' file in 'client_debug' directory
  mysys.vcproj:
    Removed define of __NT__ from 'Debug' target
  mysqld.vcproj:
    Always generate 'pdb' and 'map' files

  VC++Files/sql/mysqld.vcproj@1.3.4.1, 2006-07-22 01:59:48+02:00, kent@mysql.com +33 -9
    Always generate 'pdb' and 'map' files

  VC++Files/mysys/mysys.vcproj@1.2.2.1, 2006-07-22 01:35:13+02:00, kent@mysql.com +1 -1
    Removed define of __NT__ from 'Debug' target

  server-tools/instance-manager/mysqlmanager.vcproj@1.7, 2006-07-22 01:31:45+02:00, kent@mysql.com +1 -1
    Place mysqlmanager 'pdb' file in 'client_debug' directory

ChangeSet@1.1616.2688.8, 2006-07-22 02:36:17+04:00, sergefp@mysql.com +2 -0
  Add missing "DROP TABLE" clause

  mysql-test/r/subselect.result@1.67.1.112, 2006-07-22 02:36:15+04:00, sergefp@mysql.com +1 -0
    Add missing "DROP TABLE" clause

  mysql-test/t/subselect.test@1.58.1.99, 2006-07-22 02:36:15+04:00, sergefp@mysql.com +1 -0
    Add missing "DROP TABLE" clause

ChangeSet@1.1810.1947.1, 2006-07-22 02:08:00+04:00, evgen@moonbone.local +8 -0
  Fixed bug#12185: Data type aggregation may produce wrong result
  
  The Item::tmp_table_field_from_field_type() function creates Field_datetime
  object instead of Field_timestamp object for timestamp field thus always
  changing data type is a tmp table is used.
  
  The Field_blob object constructor which is used in the 
  Item::tmp_table_field_from_field_type() is always setting packlength field of
  newly created blob to 4. This leads to changing fields data type for example
  from the blob to the longblob if a temporary table is used.
  
  The Item::make_string_field() function always converts Field_string objects 
  to Field_varstring objects. This leads to changing data type from the 
  char/binary to varchar/varbinary.
  
  Added appropriate Field_timestamp object constructor for using in the 
  Item::tmp_table_field_from_field_type() function.
  
  Added Field_blob object constructor which sets pack length according to
  max_length argument.
  
  The Item::tmp_table_field_from_field_type() function now creates
  Field_timestamp object for a timestamp field.
  
  The Item_type_holder::display_length() now returns correct NULL length NULL
  length. 
  
  The Item::make_string_field() function now doesn't change Field_string to
  Field_varstring in the case of Item_type_holder. 
  
  The Item::tmp_table_field_from_field_type() function now uses the Field_blob
  constructor which sets packlength according to max_length.

  mysql-test/r/create.result@1.107.4.1, 2006-07-21 23:28:55+04:00, evgen@moonbone.local +1 -1
    Corrected the test case after fixing bug#12185

  mysql-test/r/innodb.result@1.145.1.17, 2006-07-21 23:28:22+04:00, evgen@moonbone.local +2 -2
    Corrected test case after fix for bug#12185

  mysql-test/r/union.result@1.80.2.1, 2006-07-21 23:28:11+04:00, evgen@moonbone.local +23 -8
    Added test case for bug#12185: Data type aggregation may produce wrong result
     Corrected test case after fix for bug#12185

  mysql-test/t/innodb.test@1.118.5.1, 2006-07-21 23:28:00+04:00, evgen@moonbone.local +1 -1
    Corrected test case after fix for bug#12185

  mysql-test/t/union.test@1.94.1.1, 2006-07-21 23:27:50+04:00, evgen@moonbone.local +10 -2
    Added test case for bug#12185: Data type aggregation may produce wrong result
    Corrected test case after fix for bug#12185

  sql/field.cc@1.256.26.1, 2006-07-21 23:28:58+04:00, evgen@moonbone.local +18 -0
    Fixed bug#12185: Data type aggregation may produce wrong result
    Added appropriate Field_timestamp object constructor for using in the 
    Item::tmp_table_field_from_field_type() function.

  sql/field.h@1.153.10.1, 2006-07-21 23:28:57+04:00, evgen@moonbone.local +17 -0
    Fixed bug#12185: Data type aggregation may produce wrong result
    Added Field_blob object constructor which sets packlength according to
    max_length argument.

  sql/item.cc@1.113.48.1, 2006-07-21 23:28:57+04:00, evgen@moonbone.local +10 -3
    Fixed bug#12185: Data type aggregation may produce wrong result
    The Item::make_string_field() function now doesn't change Field_string to
    Field_varstring in the case of Item_type_holder.
    The Item::tmp_table_field_from_field_type() function now creates
    Field_timestamp object for a timestamp field.
    The Item::tmp_table_field_from_field_type() function now uses the Field_blob
    constructor which sets packlength according to max_length.
    The Item_type_holder::display_length() now returns correct NULL length NULL
    length.

ChangeSet@1.2181.170.1, 2006-07-21 13:59:59-07:00, jimw@rama.(none) +1 -0
  Bug #17122: myisam_ftdump requires write access to files although only reads from them
  
    Instead of opening the table for read and write, myisam_ftdump is fixed to only
    open it for read.

  storage/myisam/myisam_ftdump.c@1.41, 2006-07-21 13:59:57-07:00, jimw@rama.(none) +2 -1
    Fix call to mi_open() to just open the table read-only.

ChangeSet@1.1810.1946.1, 2006-07-21 13:28:42-07:00, jimw@rama.(none) +3 -0
  Bug #16881: password() and union select
  
    This was only demonstrated by the use of PASSWORD(), it was not related to
    that function at all. The calculation of the size of a field in the results
    of a UNION did not take into account the possible growth of a string field
    when being converted to the aggregated character set.

  mysql-test/r/union.result@1.80.1.3, 2006-07-21 13:28:38-07:00, jimw@rama.(none) +5 -0
    Add new results

  mysql-test/t/union.test@1.96, 2006-07-21 13:28:38-07:00, jimw@rama.(none) +7 -0
    Add new regression test

  sql/item.cc@1.113.1.116, 2006-07-21 13:28:38-07:00, jimw@rama.(none) +12 -4
    Fix calculation of max_length when figuring out the type of a column in
    a UNION. It needs to take into account any expansion of field size due to
    charset conversions.

ChangeSet@1.1810.1944.1, 2006-07-21 20:44:35+03:00, gkodinov@macbook.mshome.net +3 -0
  Bug #20466: a view is mixing data when there's a trigger on the table
    When making a place to store field values at the start of each group
    the real item (not the reference) must be used when deciding which column
    to copy.

  mysql-test/r/group_by.result@1.69, 2006-07-21 20:44:27+03:00, gkodinov@macbook.mshome.net +25 -0
    Bug #20466: a view is mixing data when there's a trigger on the table
     - test suite for the bug

  mysql-test/t/group_by.test@1.57, 2006-07-21 20:44:28+03:00, gkodinov@macbook.mshome.net +23 -0
    Bug #20466: a view is mixing data when there's a trigger on the table
     - test suite for the bug

  sql/sql_select.cc@1.312.77.1, 2006-07-21 20:44:29+03:00, gkodinov@macbook.mshome.net +9 -7
    Bug #20466: a view is mixing data when there's a trigger on the table
     - deal correctly with references

ChangeSet@1.1810.1943.1, 2006-07-21 17:59:52+03:00, gkodinov@macbook.gmz +3 -0
  Bug #20868: Client connection is broken on SQL query error
   An aggregate function reference was resolved incorrectly and
  caused a crash in count_field_types.
   Must use real_item() to get to the real Item instance through
  the reference

  mysql-test/r/func_group.result@1.46.2.5, 2006-07-21 17:59:45+03:00, gkodinov@macbook.gmz +11 -0
    Bug #20868: Client connection is broken on SQL query error
     * test case for the bug

  mysql-test/t/func_group.test@1.45.2.4, 2006-07-21 17:59:45+03:00, gkodinov@macbook.gmz +15 -0
    Bug #20868: Client connection is broken on SQL query error
     * test case for the bug

  sql/sql_select.cc@1.312.76.1, 2006-07-21 17:59:46+03:00, gkodinov@macbook.gmz +1 -1
    Bug #20868: Client connection is broken on SQL query error
     * correctly resolve aggregate function references.

ChangeSet@1.2228, 2006-07-21 16:53:08+02:00, msvensson@neptunus.(none) +1 -0
  Bug#21188  	mysqlimport returns random exit code
   - Only handle return codes from 'pclose' greater than zero as errors.
   - It appears pclose can return -1 with errno set to ECHILD although the executin
  process completed successfully. 

  client/mysqltest.c@1.214.1.1, 2006-07-21 16:53:05+02:00, msvensson@neptunus.(none) +1 -1
    Only handle return codes from 'pclose' greater than zero as errors.

ChangeSet@1.1810.1942.1, 2006-07-21 17:02:04+05:00, holyfoot@mysql.com +1 -0
  bug #20950 (mysql_upgrade looks for 'mysqlcheck' not for 'mysqlcheck.exe'
  on Windows.
  
  Code added to look for different names on Windows

  client/mysql_upgrade.c@1.3.1.1, 2006-07-21 17:02:01+05:00, holyfoot@mysql.com +11 -2
    added conditionally-compiled part to look for different names of tools
    on Windows

ChangeSet@1.2227, 2006-07-21 12:39:06+02:00, msvensson@neptunus.(none) +1 -0
  Loop wait with timeout until 5000 records are in table after mysqlslap with INSERT DELAYED

  mysql-test/t/rpl_insert.test@1.5, 2006-07-21 12:39:03+02:00, msvensson@neptunus.(none) +13 -1
    Wait after mysqlslap execution until all INSERT DELAYED operations has completed(i.e there are 5000 records in the table)

ChangeSet@1.1346.878.1, 2006-07-21 12:22:41+02:00, ingo@chilla.local +1 -0
  Bug#20719 - Reading dynamic records with write buffer could fail
  
  Fixed a possible problem with reading of dynamic records
  when a write cache is active. The cache must be flushed
  whenever a part of the file in the write cache is to be 
  read.
  
  Added a read optimization to _mi_read_dynamic_record().
  
  No test case. This was a hypothetical but existing problem.

  myisam/mi_dynrec.c@1.33.1.2, 2006-07-21 12:22:39+02:00, ingo@chilla.local +129 -28
    Bug#20719 - Reading dynamic records with write buffer could fail
    
    Fixed a possible problem with reading of dynamic records
    when a write cache is active. The cache must be flushed
    whenever a part of the file in the write cache is to be 
    read. This must be done before the read of the header
    and before the read of the rest block.
    
    Renamed the 'flag' and 'skipp_deleted_blocks' variables.
    
    Added a read optimization to _mi_read_dynamic_record()
    that was present in _mi_read_rnd_dynamic_record() already.
    After _mi_get_block_info() we have some bytes of the record
    in the header buffer already. No need to read them again.

ChangeSet@1.1810.1941.1, 2006-07-21 11:59:46+03:00, timour@lamia.home +3 -0
  Fix for BUG#21007.
  
  The problem was that store_top_level_join_columns() incorrectly assumed
  that the left/right neighbor of a nested join table reference can be only
  at the same level in the join tree.
  
  The fix checks if the current nested join table reference has no immediate
  left/right neighbor, and if so chooses the left/right neighbors of the
  nearest upper level, where these references are != NULL.

  mysql-test/r/group_min_max.result@1.23.1.2, 2006-07-21 11:59:45+03:00, timour@lamia.home +43 -0
    Test for BUG#21007.

  mysql-test/t/group_min_max.test@1.21.1.2, 2006-07-21 11:59:45+03:00, timour@lamia.home +48 -0
    Test for BUG#21007.

  sql/sql_base.cc@1.235.1.110, 2006-07-21 11:59:45+03:00, timour@lamia.home +25 -13
    After computing and materializing the columns of all NATURAL joins in a FROM clause,
    the procedure store_top_level_join_columns() has to change the current natural join
    into a leaf table reference for name resolution. For this it needs to make the left
    neighbor point to the natural join table reference, and the natural join itself point
    to its left neighbor.
    
    This fix correctly determines the left/right neighbors of a table reference, even if
    the neghbors are at higher levels in the nested join tree. The rule is that if a table
    reference has no immediate left/right neighbors, we recursively pick the left/right
    neighbor of the level(s) above.

ChangeSet@1.2181.168.3, 2006-07-21 10:43:10+02:00, ingo@chilla.local +3 -0
  After merge fixes.

  mysql-test/r/federated.result@1.37, 2006-07-21 10:43:07+02:00, ingo@chilla.local +16 -16
    After merge fixes.

  mysql-test/t/federated.test@1.32, 2006-07-21 10:43:07+02:00, ingo@chilla.local +1 -0
    After merge fixes.

  sql/ha_federated.cc@1.68, 2006-07-21 10:43:07+02:00, ingo@chilla.local +10 -11
    After merge fixes.

ChangeSet@1.1810.1868.22, 2006-07-21 09:53:12+02:00, tsmith@maint1.mysql.com +7 -0
  Merge patch for bug #15195 from 5.0 -> 5.0-release (for 5.0.24)

  mysql-test/r/warnings.result@1.34.3.1, 2006-07-21 09:51:57+02:00, tsmith@maint1.mysql.com +7 -0

  mysql-test/t/warnings-master.opt@1.2.1.1, 2006-07-21 09:51:57+02:00, tsmith@maint1.mysql.com +1 -1

  mysql-test/t/warnings.test@1.22.2.1, 2006-07-21 09:51:57+02:00, tsmith@maint1.mysql.com +4 -0

  sql/handler.cc@1.167.19.1, 2006-07-21 09:51:57+02:00, tsmith@maint1.mysql.com +3 -1

  sql/mysql_priv.h@1.290.54.1, 2006-07-21 09:51:57+02:00, tsmith@maint1.mysql.com +4 -0

  sql/mysqld.cc@1.439.64.1, 2006-07-21 09:51:57+02:00, tsmith@maint1.mysql.com +11 -2

  sql/set_var.cc@1.125.12.1, 2006-07-21 09:51:57+02:00, tsmith@maint1.mysql.com +1 -0

ChangeSet@1.1616.2688.7, 2006-07-21 03:04:04+04:00, sergefp@mysql.com +8 -0
  BUG#20975: Incorrect query result for NOT (subquery):
    Add implementations of Item_func_{nop,not}_all::neg_transformer

  mysql-test/r/subselect.result@1.67.1.111, 2006-07-21 03:04:02+04:00, sergefp@mysql.com +26 -0
    BUG#20975: testcase

  mysql-test/t/subselect.test@1.58.1.98, 2006-07-21 03:04:02+04:00, sergefp@mysql.com +16 -0
    BUG#20975: testcase

  sql/item_cmpfunc.cc@1.111.23.10, 2006-07-21 03:04:02+04:00, sergefp@mysql.com +22 -0
    BUG#20975: Incorrect query result for NOT (subquery):
      Add implementations of Item_func_{nop,not}_all::neg_transformer

  sql/item_cmpfunc.h@1.73.1.44, 2006-07-21 03:04:02+04:00, sergefp@mysql.com +2 -0
    BUG#20975: Incorrect query result for NOT (subquery):
      Add implementations of Item_func_{nop,not}_all::neg_transformer

  sql/item_subselect.cc@1.60.1.82, 2006-07-21 03:04:02+04:00, sergefp@mysql.com +3 -3
    BUG#20975: Incorrect query result for NOT (subquery):
      Add implementations of Item_func_{nop,not}_all::neg_transformer

  sql/item_subselect.h@1.52.1.11, 2006-07-21 03:04:02+04:00, sergefp@mysql.com +4 -5
    BUG#20975: Incorrect query result for NOT (subquery):
      Add implementations of Item_func_{nop,not}_all::neg_transformer

  sql/mysql_priv.h@1.186.105.1, 2006-07-21 03:04:02+04:00, sergefp@mysql.com +2 -1
    Make chooser_compare_func_creator visible in item.h

  sql/sql_parse.cc@1.271.126.1, 2006-07-21 03:04:02+04:00, sergefp@mysql.com +1 -1
    BUG#20975: Incorrect query result for NOT (subquery):
      Add implementations of Item_func_{nop,not}_all::neg_transformer

ChangeSet@1.2181.169.1, 2006-07-20 12:54:01-07:00, acurtis@xiphis.org +3 -0
  Bug#19939
    AUTHORS and CONTRIBUTORS are not reserved keywords.

  mysql-test/r/keywords.result@1.8, 2006-07-20 12:53:59-07:00, acurtis@xiphis.org +16 -0
    Bug#19939
      Test for bug

  mysql-test/t/keywords.test@1.8, 2006-07-20 12:53:59-07:00, acurtis@xiphis.org +24 -0
    Bug#19939
      Test for bug

  sql/sql_yacc.yy@1.484.4.1, 2006-07-20 12:53:59-07:00, acurtis@xiphis.org +2 -1
    Bug#19939
      AUTHORS and CONTRIBUTORS are not reserved keywords.

ChangeSet@1.1810.1698.88, 2006-07-20 13:41:00-06:00, tsmith@siva.hindu.god +3 -0
  Finish the merge of the patch for bug #15195 from 4.1 -> 5.0
  - Adapt it to work with the handlerton class

  sql/handler.cc@1.167.18.2, 2006-07-20 13:40:57-06:00, tsmith@siva.hindu.god +3 -1
    Only create new MERGE handler if merge engine is enabled

  sql/mysql_priv.h@1.290.1.110, 2006-07-20 13:40:57-06:00, tsmith@siva.hindu.god +4 -1
    Use the myisammrg_hton.state field for the have_merge_db option

  sql/mysqld.cc@1.439.1.123, 2006-07-20 13:40:57-06:00, tsmith@siva.hindu.god +5 -0
    Handle the OPT_MERGE (--skip-merge) option case

ChangeSet@1.2226, 2006-07-20 20:14:13+02:00, msvensson@neptunus.(none) +2 -0
  After ndbd nodes has been restarted the mysqld's will enter "read only" mode until they are fully connected again. Wait in a loop until 
  mysqld's has exited from that.

  mysql-test/r/ndb_binlog_discover.result@1.2, 2006-07-20 20:14:10+02:00, msvensson@neptunus.(none) +0 -1
    After ndbd nodes has been restarted the mysqld's will enter "read only" mode until they are fully connected again. Wait in a loop until 
    mysqld's has exited from that.

  mysql-test/t/ndb_binlog_discover.test@1.2, 2006-07-20 20:14:10+02:00, msvensson@neptunus.(none) +15 -1
    After ndbd nodes has been restarted the mysqld's will enter "read only" mode until they are fully connected again. Wait in a loop until 
    mysqld's has exited from that.

ChangeSet@1.1810.1938.1, 2006-07-20 17:30:44+02:00, msvensson@neptunus.(none) +1 -0
  Bug#15690 mysqlimport tries to set options the server doesn't understand
   - "set @@character_set_database" should be ignored by servers prior to 4.1.1

  client/mysqlimport.c@1.58.1.2, 2006-07-20 17:30:42+02:00, msvensson@neptunus.(none) +1 -1
    Enclose "set @@character_set_databse=x" with comments that makes it be ignored by servers prior to 4.1.1

ChangeSet@1.2181.164.4, 2006-07-20 17:18:13+04:00, petr@mysql.com +1 -0
  Bug#17599 The server doesn't give a warning
  when --log is specified but log table is used
  (recommit after docs reviewed the text of warnings)

  sql/mysqld.cc@1.564.1.7, 2006-07-20 17:18:10+04:00, petr@mysql.com +13 -0
    add warnings if the filename was specified for --log
    or --log-slow-queries options, while the log tables are used

ChangeSet@1.2225, 2006-07-20 14:51:04+02:00, msvensson@neptunus.(none) +1 -0
  Bug#20365 mysqlslap fails with error message about result sets
   - Using CLIENT_MULTI_RESULTS is needed to execute stored procedures

  client/mysqlslap.c@1.35, 2006-07-20 14:51:01+02:00, msvensson@neptunus.(none) +4 -4
    Use CLIENT_MULTI_RESULTS as connect_flags for all connections to the MySQL server.

ChangeSet@1.2222.1.3, 2006-07-20 13:23:45+02:00, msvensson@neptunus.(none) +6 -0
  Bug#19535 mysql-test-run cannot handle crashing test cases
   - Make mysql-test-run.pl restart a crashed/stopped process if it was expected it should crash.
   - Added testcase for "crash_commit_before", which tests behaviour when server crashes just before commit.
    * The testcase first write a small var/tmp/master0.expect file indicating expected crash
    * Then sets "DEBUG" variable to for example "d,crash_commit_before" and then executes a commit.
    * The server will crash and be brought back up by mysql-test-run.pl
    * Test case will then wait for the process to come back online before continuing.

  client/mysqltest.c@1.217, 2006-07-20 13:23:41+02:00, msvensson@neptunus.(none) +7 -8
    Add "die" command used to abort a failing test case
    Remove unused "exit" command

  mysql-test/include/wait_until_connected_again.inc@1.1, 2006-07-20 13:23:42+02:00, msvensson@neptunus.(none) +20 -0
    New BitKeeper file ``mysql-test/include/wait_until_connected_again.inc''

  mysql-test/include/wait_until_connected_again.inc@1.0, 2006-07-20 13:23:42+02:00, msvensson@neptunus.(none) +0 -0

  mysql-test/lib/mtr_process.pl@1.44, 2006-07-20 13:23:41+02:00, msvensson@neptunus.(none) +78 -3
    When a process crash during execution of mysqltest, check if it was expected and restart the process in that case.

  mysql-test/mysql-test-run.pl@1.145, 2006-07-20 13:23:41+02:00, msvensson@neptunus.(none) +5 -0
    Remmeber options used when ndbd's and mysqld's was started, to be used by restart code 

  mysql-test/r/crash_commit_before.result@1.1, 2006-07-20 13:23:41+02:00, msvensson@neptunus.(none) +13 -0
    New BitKeeper file ``mysql-test/r/crash_commit_before.result''

  mysql-test/r/crash_commit_before.result@1.0, 2006-07-20 13:23:41+02:00, msvensson@neptunus.(none) +0 -0

  mysql-test/t/crash_commit_before.test@1.1, 2006-07-20 13:23:42+02:00, msvensson@neptunus.(none) +22 -0
    New BitKeeper file ``mysql-test/t/crash_commit_before.test''

  mysql-test/t/crash_commit_before.test@1.0, 2006-07-20 13:23:42+02:00, msvensson@neptunus.(none) +0 -0

ChangeSet@1.2181.167.1, 2006-07-20 05:28:16-04:00, mikael@dator5.(none) +10 -0
  BUG20733: Bug in partition pruning with zerofill field
  Problem was with handling NULL values in ranges

  mysql-test/r/partition_hash.result@1.5, 2006-07-20 05:28:13-04:00, mikael@dator5.(none) +84 -0
    New partition pruning test cases

  mysql-test/r/partition_list.result@1.6, 2006-07-20 05:28:13-04:00, mikael@dator5.(none) +94 -0
    New partition pruning test cases

  mysql-test/r/partition_pruning.result@1.17.1.1, 2006-07-20 05:28:13-04:00, mikael@dator5.(none) +78 -0
    New partition pruning test cases

  mysql-test/r/partition_range.result@1.15, 2006-07-20 05:28:13-04:00, mikael@dator5.(none) +78 -0
    New partition pruning test cases

  mysql-test/t/partition_hash.test@1.5, 2006-07-20 05:28:13-04:00, mikael@dator5.(none) +30 -0
    New partition pruning test cases

  mysql-test/t/partition_list.test@1.6, 2006-07-20 05:28:13-04:00, mikael@dator5.(none) +44 -0
    New partition pruning test cases

  mysql-test/t/partition_pruning.test@1.14.1.1, 2006-07-20 05:28:14-04:00, mikael@dator5.(none) +52 -0
    New partition pruning test cases

  mysql-test/t/partition_range.test@1.11, 2006-07-20 05:28:14-04:00, mikael@dator5.(none) +44 -0
    New partition pruning test cases

  sql/opt_range.cc@1.225, 2006-07-20 05:28:14-04:00, mikael@dator5.(none) +6 -1
    Added comment

  sql/sql_partition.cc@1.81, 2006-07-20 05:28:14-04:00, mikael@dator5.(none) +11 -0
    Partition pruning didn't handle ranges with NULL values in a proper manner

ChangeSet@1.1810.1906.19, 2006-07-20 13:24:12+04:00, anozdrin@booka.site +12 -0
  Fix for BUG#20716: SHOW INSTANCES statement causes races in IM tests.
    
  Fix for the bug in mysql-test-run.pl which prevents other tests succeed
  after IM-test failure.
    
  The idea of the fix of BUG#20716 is to:
    1. Check each SHOW INSTANCES statement, add necessary "sleep" instruction before;
    2. Move all environment checkings into the one file and include it everywhere.

  mysql-test/t/im_options_set.imtest@1.2.1.1, 2006-07-20 13:24:11+04:00, anozdrin@booka.site +1 -26
    Include im_check_env.inc for the checking of environment.

  mysql-test/r/im_options_set.result@1.4.1.1, 2006-07-20 13:24:11+04:00, anozdrin@booka.site +5 -2
    Updated result file.

  mysql-test/t/im_options_unset.imtest@1.2.1.1, 2006-07-20 13:24:11+04:00, anozdrin@booka.site +1 -26
    Include im_check_env.inc for the checking of environment.

  mysql-test/r/im_options_unset.result@1.4.1.1, 2006-07-20 13:24:11+04:00, anozdrin@booka.site +5 -2
    Updated result file.

  mysql-test/include/im_check_env.inc@1.1, 2006-07-20 13:24:11+04:00, anozdrin@booka.site +27 -0
    A new file to be included in each IM-test.
    The statements in the file ensure that starting
    conditions (environment) are as expected.

  mysql-test/include/im_check_env.inc@1.0, 2006-07-20 13:24:11+04:00, anozdrin@booka.site +0 -0

  mysql-test/mysql-test-run.pl@1.30.36.1, 2006-07-20 13:24:10+04:00, anozdrin@booka.site +22 -0
    Fix bug in mysql-test-run.pl -- kill leftovers if some
    guarded mysqld-instance is still alive after IM shutdown.

  mysql-test/r/im_daemon_life_cycle.result@1.2.1.2, 2006-07-20 13:24:10+04:00, anozdrin@booka.site +3 -0
    Updated result file.

  mysql-test/r/im_life_cycle.result@1.3.2.1, 2006-07-20 13:24:10+04:00, anozdrin@booka.site +3 -8
    Updated result file.

  mysql-test/r/im_utils.result@1.1.1.3, 2006-07-20 13:24:11+04:00, anozdrin@booka.site +3 -0
    Updated result file.

  mysql-test/t/im_daemon_life_cycle.imtest@1.1.1.2, 2006-07-20 13:24:11+04:00, anozdrin@booka.site +1 -15
    Include im_check_env.inc for the checking of environment.

  mysql-test/t/im_life_cycle.imtest@1.3.2.1, 2006-07-20 13:24:11+04:00, anozdrin@booka.site +21 -45
    Include im_check_env.inc for the checking of environment.

  mysql-test/t/im_utils.imtest@1.1.1.2, 2006-07-20 13:24:11+04:00, anozdrin@booka.site +6 -25
    Include im_check_env.inc for the checking of environment.

ChangeSet@1.2224, 2006-07-20 10:59:55+02:00, msvensson@neptunus.(none) +1 -0
  Add small sleep after cluster restart to allow mysqld's to exit from readonly state

  mysql-test/t/ndb_autodiscover3.test@1.7, 2006-07-20 10:59:52+02:00, msvensson@neptunus.(none) +2 -2
    Add small sleep after cluster restart to allow mysqld's to exit from readonly state

ChangeSet@1.1810.1931.3, 2006-07-20 13:41:12+05:00, bar@mysql.com +31 -0
  Bug#6147: Traditional: Assigning a string to a numeric column has unexpected results
  The problem was that when converting a string to an exact number,
  rounding didn't work, because conversion didn't understand
  approximate numbers notation.
  Fix: a new function for string-to-number conversion was implemented,
  which is aware of approxinate number notation (with decimal point
  and exponent, e.g. -19.55e-1)

  mysql-test/r/ps_6bdb.result@1.27.5.1, 2006-07-20 13:41:05+05:00, bar@mysql.com +24 -24
    Fixing results

  include/m_ctype.h@1.114.1.6, 2006-07-20 13:41:05+05:00, bar@mysql.com +10 -0
    Adding new function into MY_CHARSET_HANDLER
    Adding prototypes for 8bit and ucs2 functions.

  mysql-test/r/loaddata.result@1.20.1.4, 2006-07-20 13:41:05+05:00, bar@mysql.com +4 -3
    Fixing results

  mysql-test/r/ps_2myisam.result@1.39.2.1, 2006-07-20 13:41:05+05:00, bar@mysql.com +24 -24
    Fixing results

  mysql-test/r/ps_3innodb.result@1.42.2.1, 2006-07-20 13:41:05+05:00, bar@mysql.com +24 -24
    Fixing results

  mysql-test/r/ps_4heap.result@1.38.2.1, 2006-07-20 13:41:05+05:00, bar@mysql.com +24 -24
    Fixing results

  mysql-test/r/ps_5merge.result@1.39.2.1, 2006-07-20 13:41:05+05:00, bar@mysql.com +48 -48
    Fixing results

  mysql-test/r/round.result@1.1, 2006-07-20 13:41:07+05:00, bar@mysql.com +272 -0
    New BitKeeper file ``mysql-test/r/round.result''

  mysql-test/r/round.result@1.0, 2006-07-20 13:41:07+05:00, bar@mysql.com +0 -0

  mysql-test/r/rpl_rewrite_db.result@1.4.2.1, 2006-07-20 13:41:05+05:00, bar@mysql.com +4 -3
    Fixing results

  mysql-test/r/select.result@1.121.3.1, 2006-07-20 13:41:05+05:00, bar@mysql.com +1 -1
    Fixing results

  mysql-test/r/sp-vars.result@1.1.1.3, 2006-07-20 13:41:05+05:00, bar@mysql.com +1 -1
    Fixing results

  mysql-test/r/strict.result@1.25.2.1, 2006-07-20 13:41:06+05:00, bar@mysql.com +4 -4
    Fixing results

  mysql-test/r/view.result@1.138.8.1, 2006-07-20 13:41:06+05:00, bar@mysql.com +2 -2
    Fixing results

  mysql-test/r/warnings.result@1.34.2.1, 2006-07-20 13:41:06+05:00, bar@mysql.com +30 -30
    Fixing results

  mysql-test/t/round.test@1.1, 2006-07-20 13:41:07+05:00, bar@mysql.com +145 -0
    New BitKeeper file ``mysql-test/t/round.test''

  mysql-test/t/round.test@1.0, 2006-07-20 13:41:07+05:00, bar@mysql.com +0 -0

  mysql-test/t/strict.test@1.19.2.1, 2006-07-20 13:41:06+05:00, bar@mysql.com +4 -4
    Fixing results

  sql/field.cc@1.256.25.1, 2006-07-20 13:41:06+05:00, bar@mysql.com +83 -110
    Using new function

  strings/ctype-big5.c@1.80.1.10, 2006-07-20 13:41:06+05:00, bar@mysql.com +1 -0
    Adding new function into the MY_CHARSET_HANDLER structure

  strings/ctype-bin.c@1.66.1.4, 2006-07-20 13:41:06+05:00, bar@mysql.com +1 -0
    Adding new function into the MY_CHARSET_HANDLER structure

  strings/ctype-cp932.c@1.11.1.2, 2006-07-20 13:41:06+05:00, bar@mysql.com +1 -0
    Adding new function into the MY_CHARSET_HANDLER structure

  strings/ctype-euc_kr.c@1.65.1.3, 2006-07-20 13:41:06+05:00, bar@mysql.com +1 -0
    Adding new function into the MY_CHARSET_HANDLER structure

  strings/ctype-eucjpms.c@1.12.1.2, 2006-07-20 13:41:06+05:00, bar@mysql.com +1 -0
    Adding new function into the MY_CHARSET_HANDLER structure

  strings/ctype-gb2312.c@1.62.1.3, 2006-07-20 13:41:06+05:00, bar@mysql.com +1 -0
    Adding new function into the MY_CHARSET_HANDLER structure

  strings/ctype-gbk.c@1.78.1.2, 2006-07-20 13:41:06+05:00, bar@mysql.com +1 -0
    Adding new function into the MY_CHARSET_HANDLER structure

  strings/ctype-latin1.c@1.48.1.2, 2006-07-20 13:41:07+05:00, bar@mysql.com +1 -0
    Adding new function into the MY_CHARSET_HANDLER structure

  strings/ctype-simple.c@1.75.1.2, 2006-07-20 13:41:07+05:00, bar@mysql.com +337 -0
    Implementing my_strntoull10_8bit
    Adding new function into MY_CHARSET_HANDLER

  strings/ctype-sjis.c@1.88.1.2, 2006-07-20 13:41:07+05:00, bar@mysql.com +1 -0
    Adding new function into the MY_CHARSET_HANDLER structure

  strings/ctype-tis620.c@1.91.1.2, 2006-07-20 13:41:07+05:00, bar@mysql.com +1 -0
    Adding new function into the MY_CHARSET_HANDLER structure

  strings/ctype-ucs2.c@1.50.1.12, 2006-07-20 13:41:07+05:00, bar@mysql.com +30 -0
    Implementing UCS2 wrapper for 8bit version
    Adding new function into the MY_CHARSET_HANDLER structure

  strings/ctype-ujis.c@1.69.1.2, 2006-07-20 13:41:07+05:00, bar@mysql.com +1 -0
    Adding new function into the MY_CHARSET_HANDLER structure

  strings/ctype-utf8.c@1.97.1.2, 2006-07-20 13:41:07+05:00, bar@mysql.com +1 -0
    Adding new function into the MY_CHARSET_HANDLER structure

ChangeSet@1.1810.1936.2, 2006-07-19 16:42:19-07:00, igor@olga.mysql.com +4 -0
  Added a test case with views for bug #17526.

  mysql-test/r/func_str.result@1.110.3.2, 2006-07-19 16:42:17-07:00, igor@olga.mysql.com +5 -5
    Adjusted results for the test case of bug 17526.

  mysql-test/r/view.result@1.138.1.28, 2006-07-19 16:42:17-07:00, igor@olga.mysql.com +33 -0
    Added a test case with views for bug #17526.

  mysql-test/t/view.test@1.126.1.25, 2006-07-19 16:42:17-07:00, igor@olga.mysql.com +24 -0
    Added a test case with views for bug #17526.

  sql/item_strfunc.cc@1.261.7.3, 2006-07-19 16:42:17-07:00, igor@olga.mysql.com +1 -1
    Post-merge modification

ChangeSet@1.1616.2698.3, 2006-07-19 17:39:53-04:00, iggy@rolltop.ignatz42.dyndns.org +2 -0
  Manual merge required.

  mysql-test/r/mysql_client.result@1.2, 2006-07-19 17:39:51-04:00, iggy@rolltop.ignatz42.dyndns.org +44 -0
    manual merge

  mysql-test/t/mysql_client.test@1.2, 2006-07-19 17:39:51-04:00, iggy@rolltop.ignatz42.dyndns.org +6 -0
    manual merge

ChangeSet@1.1616.2688.6, 2006-07-19 12:36:55-07:00, igor@olga.mysql.com +4 -0
  Fixed bug #17526: incorrect print method
  for class Item_func_trim. 
  For 4.1 it caused wrong output for EXPLAIN EXTENDED commands
  if expressions with the TRIM function of two arguments were used.
  For 5.0 it caused an error message when trying to select
  from a view with the TRIM function of two arguments.
  This unexpected error message was due to the fact that the
  print method for the class Item_func_trim was inherited from
  the class Item_func. Yet the TRIM function does not take a list
  of its arguments. Rather it takes the arguments in the form:
    [{BOTH | LEADING | TRAILING} [remstr] FROM] str) |
    [remstr FROM] str

  mysql-test/r/func_str.result@1.70.1.33, 2006-07-19 12:36:54-07:00, igor@olga.mysql.com +28 -0
    Added a test case for bug #17526: uncorrect print method
    for class Item_func_trim.

  mysql-test/t/func_str.test@1.64.1.21, 2006-07-19 12:36:54-07:00, igor@olga.mysql.com +15 -0
    Added a test case for bug #17526: incorrect print method
    for class Item_func_trim.

  sql/item_strfunc.cc@1.196.10.1, 2006-07-19 12:36:54-07:00, igor@olga.mysql.com +17 -0
    Fixed bug #17526: incorrect print method
    for class Item_func_trim.
        
    Added an implementation for the virtual function print
    in the class Item_func_trim.
    The implementation takes into account the fact the TRIM
    function takes the arguments in the following forms:
      [{BOTH | LEADING | TRAILING} [remstr] FROM] str) |
      [remstr FROM] str

  sql/item_strfunc.h@1.73.2.18, 2006-07-19 12:36:54-07:00, igor@olga.mysql.com +4 -0
    Fixed bug #17526: incorrect print method
    for class Item_func_trim.
        
    Added an implementation for the virtual function print
    in the class Item_func_trim.
    Declared a virtual method to return the mode of the TRIM 
    function: LEADING, TRAILING or BOTH.
    Added implementations of this method for Item_func_trim and
    its descendants Item_func_ltrim and Item_func_rtrim.

ChangeSet@1.1810.1849.34, 2006-07-19 14:33:56-04:00, cmiller@zippy.cornsilk.net +1 -0
  Bug #14448: delimiter in 'prompt'
  
  "I want to have the current delimiter in the prompt so that I can know at 
  a glance which is set."
  
  Add a 'l' format specifier that represents the current statement delimiter.

  client/mysql.cc@1.199.8.1, 2006-07-19 14:33:54-04:00, cmiller@zippy.cornsilk.net +3 -0
    Add a 'l' prompt format specifier, which becomes the current delimiter
    string in the prompt.

ChangeSet@1.1810.1868.21, 2006-07-19 22:33:19+04:00, kostja@bodhi.local +9 -0
  A fix and a test case for Bug#21002 "Derived table not selecting from a 
  "real" table fails in JOINs".
  
  This is a regression caused by the fix for Bug 18444. 
  This fix removed the assignment of empty_c_string to table->db performed 
  in add_table_to_list, as neither me nor anyone else knew what it was 
  there for. Now we know it and it's covered with tests: the only case 
  when a table database name can be empty is when the table is a derived 
  table. The fix puts the assignment back but makes it a bit more explicit.
  
  Additionally, finally drop sp.result.orig which was checked in by mistake. 

  BitKeeper/deleted/.del-sp.result.orig@1.2, 2006-07-15 02:33:17+04:00, kostja@bodhi.local +0 -0
    Delete: mysql-test/r/sp.result.orig

  mysql-test/r/derived.result@1.57, 2006-07-19 22:33:15+04:00, kostja@bodhi.local +1 -1
    Updated result file.

  mysql-test/r/sp.result@1.170.19.1, 2006-07-19 22:33:15+04:00, kostja@bodhi.local +15 -0
    Test results fixed (Bug#21002)

  mysql-test/t/derived.test@1.52, 2006-07-19 22:33:15+04:00, kostja@bodhi.local +1 -1
    New error return for the case when MULTI-DELETE tries to delete from
    a derived table: now derived tables belong to their own db (""), and
    MUTLI-DELETE can't find the correspondent table for it in the 
    DELETE list, as it can't resolve tables in different dbs by alias
    (See Bug#21148 for details)

  mysql-test/t/sp.test@1.174.12.1, 2006-07-19 22:33:15+04:00, kostja@bodhi.local +25 -0
    Add a test case for Bug#21002 "Derived table not selecting from a "real"
     table fails in JOINs"

  sql/sp.cc@1.82.1.32, 2006-07-19 22:33:15+04:00, kostja@bodhi.local +0 -1
    Make empty_c_string globally accessible.

  sql/sql_class.cc@1.223.6.1, 2006-07-19 22:33:16+04:00, kostja@bodhi.local +1 -0
    Add empty_c_string definition.

  sql/sql_class.h@1.230.30.1, 2006-07-19 22:33:16+04:00, kostja@bodhi.local +12 -1
    Add a comment for the constructor of Table_ident which is
    used for derived tables. Make sure this constructor also initializes
    the database name, not only the table name.

  sql/sql_parse.cc@1.426.101.1, 2006-07-19 22:33:16+04:00, kostja@bodhi.local +6 -2
    Don't call check_db_name for empty database. 
    Currently the only case when a table database name can be empty
    is when the table is a derived table.
    Report the right error if the database name is wrong (ER_WRONG_DB_NAME,
    not ER_WRONG_TABLE_NAME). 

ChangeSet@1.1810.1698.85, 2006-07-19 16:50:55+02:00, tnurnberg@salvation.intern.azundris.com +1 -0
  manual merge, part 2/2

  mysql-test/r/mysqldump.result@1.83.1.22, 2006-07-19 16:50:52+02:00, tnurnberg@salvation.intern.azundris.com +0 -1
    manual mergies, part 2/2

ChangeSet@1.1616.2697.3, 2006-07-19 15:55:04+02:00, msvensson@neptunus.(none) +2 -0
  Bug #21135 Crash in test "func_time"
   - backport patch from 5.0
   - "table" can be NULL in temporary fields used for type conversion
  TAG: mysql-4.1.21

  sql/field.cc@1.197.13.2, 2006-07-19 15:55:03+02:00, msvensson@neptunus.(none) +23 -23
    table can be NULL in temporary fields used for type conversion.
    Store value in field as if db_low_byte_first was set.

  sql/field.h@1.120.1.12, 2006-07-19 15:55:03+02:00, msvensson@neptunus.(none) +1 -1
    table can be NULL in temporary fields used for type conversion.
    Store value in field as if db_low_byte_first was set.

ChangeSet@1.2181.166.1, 2006-07-19 14:49:58+02:00, pekka@orca.ndb.mysql.com +5 -0
  ndb - bug#14935 fix

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.23, 2006-07-19 14:48:48+02:00, pekka@orca.ndb.mysql.com +4 -1
    if TUX update fails, need to abort op on tuple (5.1 specific)

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.48, 2006-07-19 14:48:48+02:00, pekka@orca.ndb.mysql.com +3 -0
    if TUX update fails, need to abort op on tuple (5.1 specific)

  storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp@1.10, 2006-07-19 14:48:48+02:00, pekka@orca.ndb.mysql.com +9 -2
    if TUX update fails, need to abort op on tuple (5.1 specific)

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.40, 2006-07-19 14:48:48+02:00, pekka@orca.ndb.mysql.com +11 -0
    if TUX update fails, need to abort op on tuple (5.1 specific)

  storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp@1.25, 2006-07-19 14:48:48+02:00, pekka@orca.ndb.mysql.com +14 -0
    if TUX update fails, need to abort op on tuple (5.1 specific)

ChangeSet@1.2222.1.2, 2006-07-19 14:25:52+02:00, msvensson@neptunus.(none) +9 -0
  Update 'abort_not_supported_test' to print a reason why the test was aborted
  and use it in mysql-test-run.pl
  Use standard defines as last argument to 'fn_format'

  client/mysqltest.c@1.216, 2006-07-19 14:25:49+02:00, msvensson@neptunus.(none) +60 -22
    Use proper defines for last argument to fn_format(they are defined in my_sys.h)
    Make abort_not_supported_test print info about in what file the test was 
    aborted and a reason for it. The reason is a best guess, using the filename of
    the .require file to format it.

  mysql-test/include/not_ndb_default.inc@1.2, 2006-07-19 14:25:49+02:00, msvensson@neptunus.(none) +1 -1
    Use a more descriptive name of the .require file

  mysql-test/include/not_windows.inc@1.2, 2006-07-19 14:25:49+02:00, msvensson@neptunus.(none) +1 -1
    Use a more descriptive name of the .require file

  mysql-test/include/windows.inc@1.2, 2006-07-19 14:25:49+02:00, msvensson@neptunus.(none) +1 -1
    Use a more descriptive name of the .require file

  mysql-test/lib/mtr_io.pl@1.4, 2006-07-19 14:25:49+02:00, msvensson@neptunus.(none) +15 -1
    Add new function 'mtr_lastlinefromfile' that will return only the last line of a file.

  mysql-test/mysql-test-run.pl@1.144, 2006-07-19 14:25:49+02:00, msvensson@neptunus.(none) +5 -2
    Get reason why mysqltest decided to abort testcase from mysqltest.log

  mysql-test/r/not_ndb_default.require@1.3, 2006-07-19 14:18:28+02:00, msvensson@neptunus.(none) +0 -0
    Rename: mysql-test/r/true.require -> mysql-test/r/not_ndb_default.require

  mysql-test/r/not_windows.require@1.1, 2006-07-19 14:25:49+02:00, msvensson@neptunus.(none) +2 -0
    New BitKeeper file ``mysql-test/r/not_windows.require''

  mysql-test/r/not_windows.require@1.0, 2006-07-19 14:25:49+02:00, msvensson@neptunus.(none) +0 -0

  mysql-test/r/windows.require@1.1, 2006-07-19 14:25:49+02:00, msvensson@neptunus.(none) +2 -0
    New BitKeeper file ``mysql-test/r/windows.require''

  mysql-test/r/windows.require@1.0, 2006-07-19 14:25:49+02:00, msvensson@neptunus.(none) +0 -0

ChangeSet@1.1810.1868.20, 2006-07-19 11:49:07+02:00, tnurnberg@salvation.intern.azundris.com +3 -0
  Bug#20989: View '(null).(null)' references invalid table(s)... on SQL SECURITY INVOKER
  
  REPLACE ... SELECT would require INSERT privileges on certain tables
  when SELECT really suffices. Require INSERT only on target table.

  mysql-test/r/insert_select.result@1.35.1.4, 2006-07-19 11:49:01+02:00, tnurnberg@salvation.intern.azundris.com +100 -0
    Bug#20989: View '(null).(null)' references invalid table(s)... on SQL SECURITY INVOKER
    
    Show that REPLACE ... SELECT requires INSERT privileges only on target table.
    (revised test with more view-fu)

  mysql-test/t/insert_select.test@1.32, 2006-07-19 11:49:01+02:00, tnurnberg@salvation.intern.azundris.com +138 -0
    Bug#20989: View '(null).(null)' references invalid table(s)... on SQL SECURITY INVOKER
    
    Show that REPLACE ... SELECT requires INSERT privileges only on target table.
    (revised test with more view-fu)

  sql/sql_insert.cc@1.146.32.1, 2006-07-19 11:49:01+02:00, tnurnberg@salvation.intern.azundris.com +8 -1
    Bug#20989: View '(null).(null)' references invalid table(s)... on SQL SECURITY INVOKER
    
    require SELECT rather than INSERT privs on tables that constitute the views we'll read

ChangeSet@1.2222.1.1, 2006-07-19 10:38:43+02:00, msvensson@neptunus.(none) +9 -0
  Remove code in mysqltest that requires the no longer existing "manager"
  Remove the four test cases that require manager

  BitKeeper/deleted/.del-rpl000018.result@1.9, 2006-07-19 10:27:21+02:00, msvensson@neptunus.(none) +0 -0
    Delete: mysql-test/r/rpl000018.result

  BitKeeper/deleted/.del-rpl000018.test@1.13, 2006-07-19 10:27:13+02:00, msvensson@neptunus.(none) +0 -0
    Delete: mysql-test/t/rpl000018.test

  BitKeeper/deleted/.del-rpl_chain_temp_table.result@1.3, 2006-07-19 10:27:42+02:00, msvensson@neptunus.(none) +0 -0
    Delete: mysql-test/r/rpl_chain_temp_table.result

  BitKeeper/deleted/.del-rpl_chain_temp_table.test@1.6, 2006-07-19 10:27:32+02:00, msvensson@neptunus.(none) +0 -0
    Delete: mysql-test/t/rpl_chain_temp_table.test

  BitKeeper/deleted/.del-rpl_failsafe.result@1.9, 2006-07-19 10:29:29+02:00, msvensson@neptunus.(none) +0 -0
    Delete: mysql-test/r/rpl_failsafe.result

  BitKeeper/deleted/.del-rpl_failsafe.test@1.10, 2006-07-19 10:29:21+02:00, msvensson@neptunus.(none) +0 -0
    Delete: mysql-test/t/rpl_failsafe.test

  BitKeeper/deleted/.del-rpl_heap.result@1.6, 2006-07-19 10:28:04+02:00, msvensson@neptunus.(none) +0 -0
    Delete: mysql-test/r/rpl_heap.result

  BitKeeper/deleted/.del-rpl_heap.test@1.11, 2006-07-19 10:27:56+02:00, msvensson@neptunus.(none) +0 -0
    Delete: mysql-test/t/rpl_heap.test

  client/mysqltest.c@1.215, 2006-07-19 10:38:37+02:00, msvensson@neptunus.(none) +6 -111
    Remove obsolete code for running with manager

ChangeSet@1.1810.1922.4, 2006-07-18 18:41:36-07:00, patg@govinda.patg.net +3 -0
  "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
  
  Post merge changes.

  mysql-test/r/federated.result@1.25.1.11, 2006-07-18 18:41:34-07:00, patg@govinda.patg.net +0 -1
    "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
    
    Post merge changes.

  mysql-test/t/federated.test@1.19.1.13, 2006-07-18 18:41:34-07:00, patg@govinda.patg.net +0 -1
    "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
    
    Post merge changes.

  sql/ha_federated.cc@1.24.1.43, 2006-07-18 18:41:34-07:00, patg@govinda.patg.net +5 -2
    "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
    
    Post merge changes.

ChangeSet@1.1616.2144.170, 2006-07-19 02:46:48+02:00, kent@mysql.com +1 -0
  mysql.spec.sh:
    Added new "mysql_explain_log" man page
    Added missing install of "myisam_ftdump" man page
    Added missing install of "mysqlman" man page

  support-files/mysql.spec.sh@1.83.1.39, 2006-07-19 02:23:53+02:00, kent@mysql.com +3 -0
    Added new "mysql_explain_log" man page
    Added missing install of "myisam_ftdump" man page
    Added missing install of "mysqlman" man page

ChangeSet@1.1810.1935.1, 2006-07-18 16:04:18-07:00, jimw@rama.(none) +11 -0
  Bug #19498: Inconsistent support for DEFAULT in TEXT columns
  
    When a default of '' was specified for TEXT/BLOB columns, the specification
    was silently ignored. This is presumably to be nice to applications (or
    people) who generate their column definitions in a not-very-clever fashion.
  
    For clarity, doing this now results in a warning, or an error in strict
    mode.

  mysql-test/r/federated.result@1.25.7.1, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +4 -0
    Update results

  mysql-test/r/fulltext_distinct.result@1.6, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +2 -0
    Update results

  mysql-test/r/fulltext_update.result@1.5, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +2 -0
    Update results

  mysql-test/r/gis-rtree.result@1.14.1.4, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +6 -0
    Update results

  mysql-test/r/gis.result@1.32.1.2, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +2 -0
    Update results

  mysql-test/r/join_outer.result@1.44.1.5, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +2 -0
    Update results

  mysql-test/r/order_by.result@1.52, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +2 -0
    Update results

  mysql-test/r/type_blob.result@1.49.2.2, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +20 -0
    Add new results

  mysql-test/r/type_ranges.result@1.38.2.1, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +3 -0
    Update results

  mysql-test/t/type_blob.test@1.32, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +15 -0
    Add new test

  sql/field.cc@1.256.24.1, 2006-07-18 16:04:15-07:00, jimw@rama.(none) +19 -2
    Issue a warning when setting '' as the default on a BLOB/TEXT column,
    and make it an error in strict mode. Also, clarify comments about when
    NO_DEFAULT_VALUE_FLAG is set.

ChangeSet@1.2181.165.1, 2006-07-18 23:08:13+02:00, andrey@lmy004. +1 -0
  Fix windows build of libmysqld. Curious why pushbuild did not
  catch that.
  Stale CMakeLists.txt

  libmysqld/CMakeLists.txt@1.7, 2006-07-18 23:08:10+02:00, andrey@lmy004. +1 -1
    event_executor.cc is no more since a lot of time. it has
    been superseeded by event_scheduler.cc

ChangeSet@1.2181.164.2, 2006-07-18 20:13:13+05:00, gluh@mysql.com +2 -0
  after merge fix

  mysql-test/r/strict.result@1.32, 2006-07-18 20:13:09+05:00, gluh@mysql.com +1 -1
    after merge fix

  sql/handler.h@1.226, 2006-07-18 20:13:09+05:00, gluh@mysql.com +0 -1
    after merge fix

ChangeSet@1.2181.159.17, 2006-07-18 09:33:40-04:00, mikael@dator5.(none) +3 -0
  BUG#20340: NODEGROUP in information_schema.partitions integer => 
  error in error log when "default is put into it
  NODEGROUP string to cater for "default" in it

  mysql-test/r/ndb_partition_key.result@1.3, 2006-07-18 09:33:37-04:00, mikael@dator5.(none) +7 -1
    New test case

  mysql-test/t/ndb_partition_key.test@1.2, 2006-07-18 09:33:37-04:00, mikael@dator5.(none) +4 -1
    New test case

  sql/sql_show.cc@1.354.2.1, 2006-07-18 09:33:37-04:00, mikael@dator5.(none) +1 -1
    NODEGROUP string to cater for "default" in it

ChangeSet@1.2222, 2006-07-18 15:15:43+02:00, msvensson@neptunus.(none) +1 -0
  Fix erroneous join function use

  mysql-test/mysql-test-run.pl@1.143, 2006-07-18 15:15:41+02:00, msvensson@neptunus.(none) +1 -2
    Fix erroneous join function use

ChangeSet@1.2221, 2006-07-18 14:53:50+02:00, msvensson@neptunus.(none) +1 -0
  Add verbose printouts for im_start and im_stop

  mysql-test/mysql-test-run.pl@1.142, 2006-07-18 14:53:45+02:00, msvensson@neptunus.(none) +16 -17
    Add verbose printouts for im_start and im_stop

ChangeSet@1.1810.1934.2, 2006-07-18 16:43:39+05:00, holyfoot@mysql.com +5 -0
  merging

  libmysql/libmysql.c@1.233.1.13, 2006-07-18 16:43:35+05:00, holyfoot@mysql.com +3 -2
    merging

  libmysqld/lib_sql.cc@1.107.1.6, 2006-07-18 16:43:35+05:00, holyfoot@mysql.com +0 -14
    merging

  libmysqld/libmysqld.c@1.66.1.5, 2006-07-18 16:43:35+05:00, holyfoot@mysql.com +1 -2
    merging

  sql/sql_parse.cc@1.426.100.2, 2006-07-18 16:43:35+05:00, holyfoot@mysql.com +1 -0
    merging

  tests/mysql_client_test.c@1.167.1.24, 2006-07-18 16:43:35+05:00, holyfoot@mysql.com +1 -1
    merging

ChangeSet@1.1616.2144.168, 2006-07-18 15:53:12+05:00, bar@mysql.com +2 -0
  Backporting Kostja's changes made for 5.0 into 4.1.
  Please use "ul" when merging this changeset to 5.0.

  sql/item_timefunc.cc@1.51.1.54, 2006-07-18 15:53:06+05:00, bar@mysql.com +3 -2
    Fix a valgrind warning in type_date test.

  sql/sql_locale.cc@1.1.2.1, 2006-07-18 15:53:07+05:00, bar@mysql.com +109 -109
    Fix a Windows build failure:  "false" -> FALSE

ChangeSet@1.1810.1849.32, 2006-07-18 12:41:41+02:00, msvensson@neptunus.(none) +2 -0
  Bug#18539 uncompress(d) is null: impossible?
   - Add a check that length of field to uncompress is longer than 4 bytes.
     This can be dones as the length of uncompressed data is written as 
     first four bytes of field and thus it can't be valid compressed data.

  mysql-test/r/func_compress.result@1.19, 2006-07-18 12:41:38+02:00, msvensson@neptunus.(none) +5 -5
    Update test results

  sql/item_strfunc.cc@1.261.1.15, 2006-07-18 12:41:38+02:00, msvensson@neptunus.(none) +10 -0
    Is size of field is less than or equal to 4 bytes, indicate data is uncompressable/corrupt.

ChangeSet@1.1810.1932.1, 2006-07-17 16:45:04-07:00, patg@govinda.patg.net +3 -0
  "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
  
  Removed logic in ha_federated::write_row, which checks field query ids in the
  loop which builds the query to run on the remote server.

  mysql-test/r/federated.result@1.25.6.1, 2006-07-17 16:45:00-07:00, patg@govinda.patg.net +38 -0
    "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
    
    
    New test results for test that verifies that one can insert to rows using 
    "insert into... select * from..", delete 
    them by id, then immediately insert them in the same way they were originally 
    inserted.

  mysql-test/t/federated.test@1.19.6.1, 2006-07-17 16:45:00-07:00, patg@govinda.patg.net +57 -0
    "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
    
    
    New test that verifies that one can insert to rows using 
    "insert into... select * from..", delete 
    them by id, then immediately insert them in the same way they were originally 
    inserted.

  sql/ha_federated.cc@1.24.9.3, 2006-07-17 16:45:00-07:00, patg@govinda.patg.net +24 -67
    "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
    
    Removed the logic in ha_federated::write_row which checked the query id of 
    each field and compared it to the thread query id.
    
    Each field has a query id, and the problem used to be that if I did an insert
    no fields specified, the field value would contain the last inserted value 
    for that field. The way to work around this was to see if the query id for 
    that field was the same as the current query id or of the rest of the field 
    query ids. If it wasn't, that told me the query didn't have the field value 
    specified.
    
    Somewhere from when I wrote that code to now the problem went away, and there
    was no longer the need for this logic. 
    
    Also removed the bool "has_fields", which needs not exist and using 
    table->s->fields is sufficient.
    

ChangeSet@1.1810.1698.80, 2006-07-17 15:28:24-07:00, igor@rurik.mysql.com +1 -0
  Post-merge fix.

  mysql-test/r/subselect.result@1.134.1.16, 2006-07-17 15:28:16-07:00, igor@rurik.mysql.com +1 -0
    Post-merge fix.

ChangeSet@1.1810.1868.19, 2006-07-17 18:07:08-04:00, iggy@rolltop.ignatz42.dyndns.org +3 -0
  Bug# 20221- Dumping of multiple databases containing view(s) yields maleformed dumps.

  client/mysqldump.c@1.214.9.2, 2006-07-17 18:07:05-04:00, iggy@rolltop.ignatz42.dyndns.org +14 -3
    When dumping more than one database, make sure that the proper database is selected before restoring that database's views.
    Replaced hard-coded database name length with appropiate token.

  mysql-test/r/mysqldump.result@1.83.10.2, 2006-07-17 18:07:05-04:00, iggy@rolltop.ignatz42.dyndns.org +39 -0
    Added new result and corrected results for existing test cases.

  mysql-test/t/mysqldump.test@1.76.11.2, 2006-07-17 18:07:05-04:00, iggy@rolltop.ignatz42.dyndns.org +38 -0
    Added new case for dumping and restoring multiple databases each containing a view.

ChangeSet@1.1616.2697.2, 2006-07-17 20:40:41+02:00, joerg@trift2. +12 -0
  Changes to make "sql/sql_locale.cc" compile + link on Windows:
  1) When initializing a boolean variable, do not use string representations '"false"' and '"true"' 
      but rather the boolean values 'false' and 'true'.
  2) Add the module to the various Windows description files.

  VC++Files/libmysqld/libmysqld.dsp@1.12.1.12, 2006-07-17 20:40:39+02:00, joerg@trift2. +4 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  VC++Files/libmysqld/libmysqld.vcproj@1.1.1.2, 2006-07-17 20:40:39+02:00, joerg@trift2. +36 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  VC++Files/libmysqld/libmysqld_ia64.dsp@1.2.1.1, 2006-07-17 20:40:39+02:00, joerg@trift2. +4 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  VC++Files/sql/mysqld.dsp@1.17.1.19, 2006-07-17 20:40:39+02:00, joerg@trift2. +4 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  VC++Files/sql/mysqld.vcproj@1.1.1.2, 2006-07-17 20:40:39+02:00, joerg@trift2. +76 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  VC++Files/sql/mysqld_ia64.dsp@1.2.2.1, 2006-07-17 20:40:39+02:00, joerg@trift2. +4 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  VC++Files/mysqldemb/mysqldemb.dsp@1.11.1.1, 2006-07-17 20:40:39+02:00, joerg@trift2. +4 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  VC++Files/mysqldemb/mysqldemb.vcproj@1.1.1.2, 2006-07-17 20:40:39+02:00, joerg@trift2. +36 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  VC++Files/mysqldemb/mysqldemb_ia64.dsp@1.1.1.1, 2006-07-17 20:40:39+02:00, joerg@trift2. +4 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  VC++Files/sql/mysqldmax.dsp@1.5.1.1, 2006-07-17 20:40:39+02:00, joerg@trift2. +16 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  VC++Files/sql/mysqldmax_ia64.dsp@1.2.1.1, 2006-07-17 20:40:39+02:00, joerg@trift2. +25 -0
    Add "sql/sql_locale.cpp" with similar settings as the other files.

  sql/sql_locale.cc@1.1.1.1, 2006-07-17 20:40:39+02:00, joerg@trift2. +109 -109
    When initializing a boolean variable, do not use stringrepresentations '"false"' and '"true"' 
    but rather the boolean values 'false' and 'true'.

ChangeSet@1.1616.2697.1, 2006-07-17 19:38:46+02:00, joerg@trift2. +1 -0
  strings/strtod.c  :  Ensure the definition of "EOVERFLOW" is available.
  In 5.0, this is already solved, so that is a null-merge ("ul").

  strings/strtod.c@1.15.1.3, 2006-07-17 19:38:44+02:00, joerg@trift2. +1 -1
    This file needs the definition of "EOVERFLOW",
    which is on some platforms (Windows, OpenBSD) provided only by "my_base.h".
    As this in turn includes "my_global.h", the include file name can be changed.

ChangeSet@1.2181.139.17, 2006-07-17 16:52:45+02:00, andrey@lmy004. +16 -0
  WL#3337 (Events new architecture)
  Small updates before patch submit.

  client/mysqltest.c@1.210.1.4, 2006-07-17 16:52:40+02:00, andrey@lmy004. +6 -0
    allow --valgrind option to mysqltest so one can be able to detect
    whether the test is running under valgrind by having $VALGRIND_TEST,
    similar to BIG_TEST, in the test file.

  mysql-test/include/not_valgrind.inc@1.1, 2006-07-17 16:52:41+02:00, andrey@lmy004. +4 -0
    New BitKeeper file ``mysql-test/include/not_valgrind.inc''

  mysql-test/include/not_valgrind.inc@1.0, 2006-07-17 16:52:41+02:00, andrey@lmy004. +0 -0

  mysql-test/mysql-test-run.pl@1.122.5.1, 2006-07-17 16:52:40+02:00, andrey@lmy004. +5 -0
    If the test suite is running under valgrind start mysqltest with --valgrind
    to inform that we run valgrind. mysqltest will provide $VALGRIND_TEST for the
    test cases.

  mysql-test/r/events_bugs.result@1.16, 2006-07-17 16:52:40+02:00, andrey@lmy004. +21 -21
    update result

  mysql-test/r/events_scheduling.result@1.6, 2006-07-17 16:52:40+02:00, andrey@lmy004. +0 -6
    update result

  mysql-test/r/not_valgrind.require@1.1, 2006-07-17 16:52:41+02:00, andrey@lmy004. +2 -0
    New BitKeeper file ``mysql-test/r/not_valgrind.require''

  mysql-test/r/not_valgrind.require@1.0, 2006-07-17 16:52:41+02:00, andrey@lmy004. +0 -0

  mysql-test/t/events.test@1.37, 2006-07-17 16:52:40+02:00, andrey@lmy004. +14 -14
    Increase times or the test will fail under valgrind

  mysql-test/t/events_bugs.test@1.13, 2006-07-17 16:52:40+02:00, andrey@lmy004. +10 -10
    Increase times or the test will fail under valgrind

  mysql-test/t/events_scheduling.test@1.8, 2006-07-17 16:52:41+02:00, andrey@lmy004. +1 -3
    Remove faulty test
    Disable the test case for valgrind

  sql/event_data_objects.cc@1.74, 2006-07-17 16:52:41+02:00, andrey@lmy004. +3 -1
    count the number of executions

  sql/event_data_objects.h@1.12, 2006-07-17 16:52:41+02:00, andrey@lmy004. +5 -3
    flags is not used at all
    add execution_count to count the number of executions

  sql/event_db_repository.cc@1.12, 2006-07-17 16:52:41+02:00, andrey@lmy004. +25 -4
    Initialize wherever needed.
    Add a comment regarding valgrind warning.

  sql/event_queue.cc@1.11, 2006-07-17 16:52:41+02:00, andrey@lmy004. +25 -9
    more debug info in the trace log

  sql/event_scheduler.cc@1.19, 2006-07-17 16:52:41+02:00, andrey@lmy004. +37 -30
    Use macro COND_STATE_WAIT() in all cases we need waiting
    on condition. Hence, we can trace locking, attemption to lock
    and more with SHOW SCHEDULER STATUS

  sql/event_scheduler.h@1.15, 2006-07-17 16:52:41+02:00, andrey@lmy004. +2 -1
    Change the declaration of cond_wait to accept THD

  sql/events.cc@1.58, 2006-07-17 16:52:41+02:00, andrey@lmy004. +2 -1
    fix memory leak. Destroy event_queue

ChangeSet@1.1810.1929.4, 2006-07-17 16:12:42+04:00, evgen@moonbone.local +2 -0
  select.result, select.test:
    Test case for bug#10977 altered to make it work in both plain and ps-protocol modes.

  mysql-test/r/select.result@1.121.1.12, 2006-07-17 16:11:50+04:00, evgen@moonbone.local +4 -3
    Test case for bug#10977 altered to make it work in both plain and ps-protocol modes.

  mysql-test/t/select.test@1.102.1.7, 2006-07-17 16:11:22+04:00, evgen@moonbone.local +2 -1
    Test case for bug#10977 altered to make it work in both plain and ps-protocol modes.

ChangeSet@1.2181.159.16, 2006-07-17 06:53:46-04:00, mikael@dator5.(none) +1 -0
  Fixed test case

  mysql-test/r/partition.result@1.48, 2006-07-17 06:53:44-04:00, mikael@dator5.(none) +28 -34
    Fixed test case

ChangeSet@1.1810.1930.1, 2006-07-17 14:48:40+04:00, kroki@moonlight.intranet +3 -0
  Bug#21013: Performance Degrades when importing data that uses Trigger
             and Stored Procedure
  
  The essence of the bug was that for every re-execution of stored
  routine or prepared statement new items for character set conversions
  were created, thus increasing the number of items and the time of their
  processing, and creating memory leak.
  
  No test case is provided since current test suite can't cover such type
  of bugs.

  mysql-test/r/sp.result@1.170.18.1, 2006-07-17 14:48:38+04:00, kroki@moonlight.intranet +12 -0
    Add result for bug#21013: Performance Degrades when importing data
    that uses Trigger and Stored Procedure.

  mysql-test/t/sp.test@1.174.1.17, 2006-07-17 14:48:38+04:00, kroki@moonlight.intranet +27 -0
    Add test case for bug#21013: Performance Degrades when importing data
    that uses Trigger and Stored Procedure.

  sql/item.cc@1.113.47.1, 2006-07-17 14:48:38+04:00, kroki@moonlight.intranet +3 -2
    Switch arena only when in statement prepare mode.  Subsequent executions
    will use cached item tree.

ChangeSet@1.2181.159.15, 2006-07-17 06:41:12-04:00, mikael@dator5.(none) +1 -0
  Fixes for strange appearance of db.opt file

  mysql-test/t/partition.test@1.40.1.16, 2006-07-17 06:41:09-04:00, mikael@dator5.(none) +6 -7
    Fixes for strange appearance of db.opt file

ChangeSet@1.1810.1929.3, 2006-07-17 14:22:21+04:00, evgen@moonbone.local +2 -0
  mysql.test, mysql.result:
    Corrected the test case after fixing bug#10977

  mysql-test/r/mysql.result@1.11, 2006-07-17 14:21:46+04:00, evgen@moonbone.local +4 -4
    Corrected the test case after fixing bug#10977

  mysql-test/t/mysql.test@1.4.1.7, 2006-07-17 14:21:29+04:00, evgen@moonbone.local +4 -4
    Corrected the test case after fixing bug#10977

ChangeSet@1.1810.1766.2, 2006-07-17 10:50:20+02:00, msvensson@shellback.(none) +93 -0
  Import yaSSL version 1.3.7
   - Fix for "bug#16755 Please find a SSL library that is FLOSS-Exception / LGPL copyrighted"

  extra/yassl/mySTL/algorithm.hpp@1.2, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/mySTL/helpers.hpp@1.12, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/mySTL/list.hpp@1.8, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/mySTL/memory.hpp@1.4, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/mySTL/pair.hpp@1.2, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/mySTL/stdexcept.hpp@1.6, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/mySTL/vector.hpp@1.7, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/FLOSS-EXCEPTIONS@1.1, 2006-07-12 21:15:01+02:00, msvensson@shellback.(none) +120 -0
    Import patch yassl.diff

  extra/yassl/FLOSS-EXCEPTIONS@1.0, 2006-07-12 21:15:01+02:00, msvensson@shellback.(none) +0 -0

  extra/yassl/README@1.5, 2006-06-28 03:36:47+02:00, msvensson@shellback.(none) +11 -1
    Import patch yassl.diff

  extra/yassl/include/buffer.hpp@1.5, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/include/cert_wrapper.hpp@1.3, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/include/crypto_wrapper.hpp@1.4, 2006-07-12 22:54:55+02:00, msvensson@shellback.(none) +7 -1
    Import patch yassl.diff

  extra/yassl/include/factory.hpp@1.4, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/include/handshake.hpp@1.2, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +5 -1
    Import patch yassl.diff

  extra/yassl/include/lock.hpp@1.3, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/include/log.hpp@1.3, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/ssl.h@1.14.1.1, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +12 -0
    Import patch yassl.diff

  extra/yassl/include/socket_wrapper.hpp@1.7, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/include/timer.hpp@1.2, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/include/yassl_error.hpp@1.5, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/include/yassl_imp.hpp@1.4, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +6 -2
    Import patch yassl.diff

  extra/yassl/include/yassl_int.hpp@1.11.1.1, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +8 -2
    Import patch yassl.diff

  extra/yassl/include/yassl_types.hpp@1.13, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/src/buffer.cpp@1.7, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/src/cert_wrapper.cpp@1.8, 2006-07-12 22:54:55+02:00, msvensson@shellback.(none) +6 -1
    Import patch yassl.diff

  extra/yassl/src/crypto_wrapper.cpp@1.8, 2006-07-12 22:54:55+02:00, msvensson@shellback.(none) +7 -12
    Import patch yassl.diff

  extra/yassl/src/handshake.cpp@1.10.1.1, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +14 -6
    Import patch yassl.diff

  extra/yassl/src/lock.cpp@1.5, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/src/log.cpp@1.6, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/src/socket_wrapper.cpp@1.10.1.1, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +15 -2
    Import patch yassl.diff

  extra/yassl/src/ssl.cpp@1.16.1.1, 2006-07-12 22:54:55+02:00, msvensson@shellback.(none) +40 -10
    Import patch yassl.diff

  extra/yassl/src/template_instnt.cpp@1.10.1.1, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/src/timer.cpp@1.8, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/src/yassl.cpp@1.2, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/src/yassl_error.cpp@1.7, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/src/yassl_imp.cpp@1.8.1.1, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +17 -5
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp@1.19.1.1, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +39 -4
    Import patch yassl.diff

  extra/yassl/taocrypt/include/aes.hpp@1.4, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/algebra.hpp@1.4, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/arc4.hpp@1.3, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/asn.hpp@1.7, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/block.hpp@1.8, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/blowfish.hpp@1.2, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/coding.hpp@1.2, 2006-07-12 21:15:02+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/des.hpp@1.4, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/dh.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/dsa.hpp@1.2, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/error.hpp@1.4, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/file.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/hash.hpp@1.6, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/hmac.hpp@1.5, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/integer.hpp@1.10, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/kernelc.hpp@1.2, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/md2.hpp@1.2, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/md4.hpp@1.2, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/md5.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/misc.hpp@1.13, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/modarith.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/modes.hpp@1.7, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/pwdbased.hpp@1.2, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/random.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/ripemd.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/rsa.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/runtime.hpp@1.14.1.1, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +7 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/sha.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/twofish.hpp@1.2, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/type_traits.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/types.hpp@1.10, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/aes.cpp@1.4, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/aestables.cpp@1.5, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/algebra.cpp@1.10, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/arc4.cpp@1.5, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/asn.cpp@1.8, 2006-07-12 22:54:55+02:00, msvensson@shellback.(none) +5 -10
    Import patch yassl.diff

  extra/yassl/taocrypt/src/bftables.cpp@1.2, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/blowfish.cpp@1.2, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/coding.cpp@1.5, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/des.cpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/dh.cpp@1.7, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/dsa.cpp@1.6, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/file.cpp@1.4, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/hash.cpp@1.4, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/integer.cpp@1.24, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/md2.cpp@1.2, 2006-07-12 21:15:03+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/md4.cpp@1.2, 2006-07-12 21:15:04+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/md5.cpp@1.4, 2006-07-12 21:15:04+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/misc.cpp@1.14, 2006-07-12 21:15:04+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/random.cpp@1.9, 2006-07-12 21:15:04+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/ripemd.cpp@1.4, 2006-07-12 21:15:04+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/rsa.cpp@1.8, 2006-07-12 21:15:04+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/sha.cpp@1.4, 2006-07-12 21:15:04+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/template_instnt.cpp@1.11, 2006-07-12 21:15:04+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/tftables.cpp@1.2, 2006-07-12 21:15:04+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/twofish.cpp@1.2, 2006-07-12 21:15:04+02:00, msvensson@shellback.(none) +4 -0
    Import patch yassl.diff

ChangeSet@1.1810.1929.2, 2006-07-16 01:18:08+04:00, evgen@moonbone.local +1 -0
  errmsg.txt:
    Fixed bug#10977: No warning issued if a column name is truncated
    New warning message is added.

  sql/share/errmsg.txt@1.42.14.2, 2006-07-16 01:17:57+04:00, evgen@moonbone.local +2 -0
    Fixed bug#10977: No warning issued if a column name is truncated
    New warning message is added.

ChangeSet@1.2181.159.14, 2006-07-15 17:05:47-04:00, mikael@dator5.(none) +1 -0
  Minor fix

  mysql-test/t/partition.test@1.40.1.15, 2006-07-15 17:05:45-04:00, mikael@dator5.(none) +1 -1
    Minor fix

ChangeSet@1.1810.1929.1, 2006-07-16 00:45:38+04:00, evgen@moonbone.local +4 -0
  Fixed bug#10977: No warning issued if a column name is truncated
  
  When an alias is set to a column leading spaces are removed from the alias.
  But when this is done on aliases set by user this can lead to confusion.
  
  Now Item::set_name() method issues the warning if leading spaces were removed
  from an alias set by user.
  
  New warning message is added.

  mysql-test/r/select.result@1.121.1.11, 2006-07-16 00:44:24+04:00, evgen@moonbone.local +5 -0
    Added test case for bug#10977:No warning issued if a column name is truncated.

  mysql-test/t/select.test@1.102.1.6, 2006-07-16 00:44:22+04:00, evgen@moonbone.local +5 -0
    Added test case for bug#10977:No warning issued if a column name is truncated.

  sql/item.cc@1.113.1.115, 2006-07-16 00:45:02+04:00, evgen@moonbone.local +6 -0
    Fixed bug#10977: No warning issued if a column name is truncated
    Now Item::set_name() method issues the warning if leading spaces were removed
    from an alias set by user.

  sql/sql_yacc.yy@1.371.71.1, 2006-07-16 00:44:43+04:00, evgen@moonbone.local +2 -2
    Fixed bug#10977: No warning issued if a column name is truncated
    The is_autogenerated_name flag is set before set_name() method call.

ChangeSet@1.2181.163.2, 2006-07-15 12:01:46-04:00, mikael@dator5.(none) +4 -0
  Remove files that tests leave behind

  mysql-test/t/ndb_alter_table.test@1.35, 2006-07-15 12:01:44-04:00, mikael@dator5.(none) +1 -0
    Remove file that the test leaves behind

  mysql-test/t/partition.test@1.40.1.14, 2006-07-15 12:01:44-04:00, mikael@dator5.(none) +1 -0
    Remove file that the other tests leaves behind

  mysql-test/t/rpl_ndb_bank.test@1.7, 2006-07-15 12:01:44-04:00, mikael@dator5.(none) +1 -0
    Remove file that the test leaves behind

  mysql-test/t/rpl_ndb_dd_advance.test@1.7, 2006-07-15 12:01:44-04:00, mikael@dator5.(none) +1 -1
    Remove file that the test leaves behind

ChangeSet@1.2181.159.11, 2006-07-15 17:53:57+02:00, pekka@orca.ndb.mysql.com +1 -0
  ndb - ndb_restore: print some dd errors at right verbosity

  storage/ndb/tools/restore/consumer_restore.cpp@1.35, 2006-07-15 17:52:53+02:00, pekka@orca.ndb.mysql.com +10 -4
    print disk data tablespace and file error on 'err' level

ChangeSet@1.2181.162.2, 2006-07-15 07:28:31-04:00, mikael@dator5.(none) +2 -0
  Fixes to make tests work in conjunction with other tests

  mysql-test/r/partition.result@1.47, 2006-07-15 07:28:28-04:00, mikael@dator5.(none) +6 -0
    Fixes to make tests work in conjunction with other tests

  mysql-test/t/partition.test@1.40.1.13, 2006-07-15 07:28:28-04:00, mikael@dator5.(none) +8 -6
    Fixes to make tests work in conjunction with other tests

ChangeSet@1.2181.161.1, 2006-07-15 03:38:34-04:00, mikael@dator5.(none) +5 -0
  BUG#20389: Crash when using index scan in reverse order

  mysql-test/r/partition_order.result@1.2, 2006-07-15 03:38:32-04:00, mikael@dator5.(none) +54 -2
    Changed a test case to handle ordered index scan reverse order as well

  mysql-test/t/partition_order.test@1.2, 2006-07-15 03:38:32-04:00, mikael@dator5.(none) +17 -1
    Changed a test case to handle ordered index scan reverse order as well

  sql/ha_partition.cc@1.60.5.1, 2006-07-15 03:38:32-04:00, mikael@dator5.(none) +22 -8
    Introduced partition_index_read_last to ensure we use index_read_last in those
    cases towards underlying handler.
    Ensured that index_read with HA_READ_PREFIX_LAST, HA_READ_PREFIX_LAST_OR_PREV and
    HA_READ_BEFORE_KEY uses ordered index scan in reverse order.

  sql/ha_partition.h@1.22.3.1, 2006-07-15 03:38:32-04:00, mikael@dator5.(none) +3 -2
    Introduced partition_index_read_last to ensure we use index_read_last in those
    cases towards underlying handler.
    Ensured that index_read with HA_READ_PREFIX_LAST, HA_READ_PREFIX_LAST_OR_PREV and
    HA_READ_BEFORE_KEY uses ordered index scan in reverse order.

  sql/ha_myisam.cc@1.185, 2006-07-15 03:38:32-04:00, mikael@dator5.(none) +2 -1
    More debug info

ChangeSet@1.1810.1698.77, 2006-07-15 00:28:21-07:00, igor@rurik.mysql.com +3 -0
  Fixed bug #20869.
  The bug caused a crash of the server if a subquery with
  ORDER BY DESC used the range access method.
  The bug happened because the method QUICK_SELECT_DESC::reset
  was not reworked after MRR interface had been introduced.

  mysql-test/r/subselect.result@1.134.5.1, 2006-07-15 00:28:13-07:00, igor@rurik.mysql.com +36 -0
    Added a test case for bug #20869.

  mysql-test/t/subselect.test@1.120.1.1, 2006-07-15 00:28:13-07:00, igor@rurik.mysql.com +38 -0
    Added a test case for bug #20869.

  sql/opt_range.h@1.57.1.2, 2006-07-15 00:28:13-07:00, igor@rurik.mysql.com +1 -1
    Fixed bug #20869.
    The bug caused a crash of the server if a subquery with
    ORDER BY DESC used the range access method.
    The bug happened because the method QUICK_SELECT_DESC::reset
    was not reworked after MRR interface had been introduced.
    

ChangeSet@1.1810.1925.7, 2006-07-14 19:28:58-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #20519.
  The bug was due to a loss happened during a refactoring made
  on May 30 2005 that modified the function JOIN::reinit.
  As a result of it for any subquery the value of offset_limit_cnt
  was not restored for the following executions. Yet the first 
  execution of the subquery made it equal to 0.
  The fix restores this value in the function JOIN::reinit.  

  mysql-test/r/subselect.result@1.134.1.14, 2006-07-14 19:28:56-07:00, igor@olga.mysql.com +45 -0
    Added a test case fir bug #20519.

  mysql-test/t/subselect.test@1.121, 2006-07-14 19:28:56-07:00, igor@olga.mysql.com +40 -0
    Added a test case fir bug #20519.

  sql/sql_select.cc@1.312.1.122, 2006-07-14 19:28:56-07:00, igor@olga.mysql.com +5 -0
    Fixed bug #20519.
    The bug was due to a loss happened during a refactoring made
    on May 30 2005 that modified the function JOIN::reinit.
    As a result of it for any subquery the value of offset_limit_cnt
    was not restored for the following executions. Yet the first 
    execution of the subquery made it equal to 0.
    The fix restores this value in the function JOIN::reinit.  

ChangeSet@1.2181.159.10, 2006-07-15 03:08:56+04:00, kostja@bodhi.local +1 -0
  Fix information_schema.result after a manual merge.

  mysql-test/r/information_schema.result@1.130, 2006-07-15 03:08:51+04:00, kostja@bodhi.local +46 -8
    Post-merge fixes.

ChangeSet@1.1616.2144.166, 2006-07-15 00:24:35+02:00, kent@mysql.com +1 -0
  mysql.spec.sh:
    Command "ndb_mgm" is an optional tool, and should only be in "ndb-tools" package (bug#21058)

  support-files/mysql.spec.sh@1.83.1.38, 2006-07-15 00:24:14+02:00, kent@mysql.com +0 -1
    Command "ndb_mgm" is an optional tool, and should only be in "ndb-tools" package (bug#21058)

ChangeSet@1.1810.1849.29, 2006-07-14 13:30:23-07:00, igreenhoe@anubis.greendragongames.com +1 -0
  4.1 -> 5.0 merge

  mysql-test/r/mysqldump.result@1.83.1.20, 2006-07-14 13:30:19-07:00, igreenhoe@anubis.greendragongames.com +2 -3
    4.1 -> 5.0 merge

ChangeSet@1.1616.2696.1, 2006-07-14 15:22:16-04:00, iggy@rolltop.ignatz42.dyndns.org +2 -0
  Bug #20721: mysql_install_db first line is blank.
  
  Minor script changes for uniformity.

  scripts/fill_func_tables.sh@1.2.2.1, 2006-07-14 15:22:14-04:00, iggy@rolltop.ignatz42.dyndns.org +8 -3
    Switched to standard !@PERL@ usage.  Added Copyright and more specific original author information.

  scripts/mysql_install_db.sh@1.37.1.37, 2006-07-14 15:22:14-04:00, iggy@rolltop.ignatz42.dyndns.org +0 -1
    Removed leading empty line.

ChangeSet@1.1616.2144.165, 2006-07-14 17:55:34+02:00, joerg@trift2. +1 -0
  Increment the version number to 4.1.22, as 4.1.21 is cloned.

  configure.in@1.201.64.10, 2006-07-14 17:55:31+02:00, joerg@trift2. +2 -2
    Increment the version number to 4.1.22, as 4.1.21 is cloned.

ChangeSet@1.1810.1928.2, 2006-07-14 05:56:30-07:00, igreenhoe@anubis.greendragongames.com +5 -0
  4.1 -> 5.0 merge fixes

  mysql-test/r/mysqldump-max.result@1.2.1.2, 2006-07-14 05:56:26-07:00, igreenhoe@anubis.greendragongames.com +0 -12
    4.1 -> 5.0 merge fixes

  mysql-test/r/mysqldump.result@1.83.9.2, 2006-07-14 05:56:26-07:00, igreenhoe@anubis.greendragongames.com +0 -1
    4.1 -> 5.0 merge fixes

  mysql-test/r/ps.result@1.56.2.2, 2006-07-14 05:56:26-07:00, igreenhoe@anubis.greendragongames.com +14 -14
    4.1 -> 5.0 merge fixes

  sql/sql_lex.cc@1.142.18.2, 2006-07-14 05:56:26-07:00, igreenhoe@anubis.greendragongames.com +0 -1
    4.1 -> 5.0 merge fixes

  sql/table.cc@1.160.32.2, 2006-07-14 05:56:26-07:00, igreenhoe@anubis.greendragongames.com +0 -1
    4.1 -> 5.0 merge fixes

ChangeSet@1.1616.2695.1, 2006-07-14 16:26:58+05:00, ramil@mysql.com +7 -0
  --{skip-}merge option added which allows the user to disable merge engine and
  to avoid the potential security problem.
  (see bug #15195: Security Breach with MERGE table)

  mysql-test/r/warnings.result@1.27.1.5, 2006-07-14 16:26:50+05:00, ramil@mysql.com +7 -0
    --{skip-}merge option added which allows the user to disable merge engine and
    to avoid the potential security problem.
    (see bug #15195: Security Breach with MERGE table)

  mysql-test/t/warnings-master.opt@1.3, 2006-07-14 16:26:51+05:00, ramil@mysql.com +1 -1
    --{skip-}merge option added which allows the user to disable merge engine and
    to avoid the potential security problem.
    (see bug #15195: Security Breach with MERGE table)

  mysql-test/t/warnings.test@1.17.1.5, 2006-07-14 16:26:51+05:00, ramil@mysql.com +4 -0
    --{skip-}merge option added which allows the user to disable merge engine and
    to avoid the potential security problem.
    (see bug #15195: Security Breach with MERGE table)

  sql/handler.cc@1.103.19.16, 2006-07-14 16:26:51+05:00, ramil@mysql.com +2 -2
    --{skip-}merge option added which allows the user to disable merge engine and
    to avoid the potential security problem.
    (see bug #15195: Security Breach with MERGE table)

  sql/mysql_priv.h@1.186.91.52, 2006-07-14 16:26:51+05:00, ramil@mysql.com +1 -1
    --{skip-}merge option added which allows the user to disable merge engine and
    to avoid the potential security problem.
    (see bug #15195: Security Breach with MERGE table)

  sql/mysqld.cc@1.356.98.26, 2006-07-14 16:26:51+05:00, ramil@mysql.com +10 -2
    --{skip-}merge option added which allows the user to disable merge engine and
    to avoid the potential security problem.
    (see bug #15195: Security Breach with MERGE table)

  sql/set_var.cc@1.34.66.2, 2006-07-14 16:26:52+05:00, ramil@mysql.com +1 -0
    --{skip-}merge option added which allows the user to disable merge engine and
    to avoid the potential security problem.
    (see bug #15195: Security Breach with MERGE table)

ChangeSet@1.1810.1868.18, 2006-07-14 12:50:00+02:00, tnurnberg@mysql.com +3 -0
  Bug#21014: Segmentation fault of mysqldump on view
  
  mysqldump did not select the correct database before trying to dump
  views from it. this resulted in an empty result set, which in turn
  startled mysql-dump into a core-dump.  this only happened for views,
  not for tables, and was only visible with multiple databases that
  weren't by sheer luck in the order mysqldump required, anyway. this
  fixes by selecting the correct database before dumping views; it also
  catches the empty set-condition if it should occur for other reasons.

  client/mysqldump.c@1.214.9.1, 2006-07-14 12:49:56+02:00, tnurnberg@mysql.com +9 -2
    Bug#21014: Segmentation fault of mysqldump on view
    
    failsafe: if "select ... from information_schema.views" returns an
    empty set, don't deref NULL; throw an error instead.
    
    fix: select the correct database not only before dumping tables, but
    before dumping views, as well.

  mysql-test/r/mysqldump.result@1.83.10.1, 2006-07-14 12:49:57+02:00, tnurnberg@mysql.com +30 -0
    Bug#21014: Segmentation fault of mysqldump on view
    
    show that mysqldump selects the correct database before trying to dump
    views from it.

  mysql-test/t/mysqldump.test@1.76.11.1, 2006-07-14 12:49:57+02:00, tnurnberg@mysql.com +19 -0
    Bug#21014: Segmentation fault of mysqldump on view
    
    show that mysqldump selects the correct database before trying to dump
    views from it.

ChangeSet@1.1810.1925.6, 2006-07-14 12:09:36+03:00, gkodinov@macbook.gmz +1 -0
  fix for a compatibility build problem on MacOSX intel. 
  Discussed with Kent.

  ndb/test/ndbapi/Makefile.am@1.19.10.1, 2006-07-14 12:09:30+03:00, gkodinov@macbook.gmz +4 -0
    Fix for a compatibility build problem on MacOSX Intel.

ChangeSet@1.1810.1925.4, 2006-07-13 22:00:20-07:00, igor@olga.mysql.com +1 -0
  Correction for test tesults after pushing the fix for bug 19714.

  mysql-test/r/ps_7ndb.result@1.26.1.18, 2006-07-13 22:00:19-07:00, igor@olga.mysql.com +2 -2
    Correction for test results after pushing the fix for bug 19714.

ChangeSet@1.1810.1925.3, 2006-07-13 20:48:26-07:00, igor@olga.mysql.com +16 -0
  Fixed bug #19714.
  DESCRIBE returned the type BIGINT for a column of a view if the column
  was specified by an expression over values of the type INT.
      
  E.g. for the view defined as follows:
    CREATE VIEW v1 SELECT COALESCE(f1,f2) FROM t1
  DESCRIBE returned type BIGINT for the only column of the view if f1,f2 are
  columns of the INT type.
  At the same time DESCRIBE returned type INT for the only column of the table
  defined by the statement:
    CREATE TABLE t2 SELECT COALESCE(f1,f2) FROM t1.
      
  This inconsistency was removed by the patch.
  
  Now the code chooses between INT/BIGINT depending on the
  precision of the aggregated column type.
   
  Thus both DESCRIBE commands above returns type INT for v1 and t2.
   

  mysql-test/r/ps_6bdb.result@1.27.1.16, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +2 -2
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/analyse.result@1.25.1.1, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +12 -12
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/bigint.result@1.31.1.2, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +1 -1
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/create.result@1.107.1.12, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +2 -2
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/olap.result@1.33, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +2 -2
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/ps_2myisam.result@1.39.1.2, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +2 -2
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/ps_3innodb.result@1.42.1.2, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +2 -2
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/ps_4heap.result@1.38.1.2, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +2 -2
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/ps_5merge.result@1.39.1.2, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +4 -4
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/ps_7ndb.result@1.26.1.17, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +2 -2
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/sp.result@1.170.1.33, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +1 -1
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/subselect.result@1.134.1.13, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +6 -6
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/type_ranges.result@1.38.1.2, 2006-07-13 20:48:23-07:00, igor@olga.mysql.com +2 -2
    Adjusted the results after having fixed bug #19714.

  mysql-test/r/view.result@1.138.1.27, 2006-07-13 20:48:24-07:00, igor@olga.mysql.com +11 -0
    Added a test case for bug #19714.

  mysql-test/t/view.test@1.126.1.24, 2006-07-13 20:48:24-07:00, igor@olga.mysql.com +13 -0
    Added a test case for bug #19714.

  sql/sql_select.cc@1.312.1.120, 2006-07-13 20:48:24-07:00, igor@olga.mysql.com +7 -2
    Fixed bug #19714.
    DESCRIBE returned the type BIGINT for a column of a view if the column
    was specified by an expression over values of the type INT.
        
    E.g. for the view defined as follows:
      CREATE VIEW v1 SELECT COALESCE(f1,f2) FROM t1
    DESCRIBE returned type BIGINT for the only column of the view if f1,f2 are
    columns of the INT type.
    At the same time DESCRIBE returned type INT for the only column of the table
    defined by the statement:
      CREATE TABLE t2 SELECT COALESCE(f1,f2) FROM t1.
        
    This inconsistency was removed by the patch.
    
    Now the code chooses between INT/BIGINT depending on the
    precision of the aggregated column type.
     
    Thus both DESCRIBE commands above returns type INT for v1 and t2.
     

ChangeSet@1.1810.1927.1, 2006-07-14 01:25:13+02:00, tnurnberg@mysql.com +3 -0
  Bug#21014: Segmentation fault of mysqldump on view
  
  mysqldump did not select the correct database before trying to dump
  views from it. this resulted in an empty result set, which in turn
  startled mysql-dump into a core-dump.  this only happened for views,
  not for tables, and was only visible with multiple databases that
  weren't by sheer luck in the order mysqldump required, anyway. this
  fixes by selecting the correct database before dumping views; it also
  catches the empty set-condition if it should occur for other reasons.

  client/mysqldump.c@1.214.1.19, 2006-07-14 01:25:06+02:00, tnurnberg@mysql.com +9 -2
    Bug#21014: Segmentation fault of mysqldump on view
    
    failsafe: if "select ... from information_schema.views" returns an
    empty set, don't deref NULL; throw an error instead.
    
    fix: select the correct database not only before dumping tables, but
    before dumping views, as well.

  mysql-test/r/mysqldump.result@1.83.1.18, 2006-07-14 01:25:06+02:00, tnurnberg@mysql.com +61 -0
    Bug#21014: Segmentation fault of mysqldump on view
    
    show that mysqldump selects the correct database before trying to dump
    views from it.

  mysql-test/t/mysqldump.test@1.76.1.20, 2006-07-14 01:25:06+02:00, tnurnberg@mysql.com +18 -0
    Bug#21014: Segmentation fault of mysqldump on view
    
    show that mysqldump selects the correct database before trying to dump
    views from it.

ChangeSet@1.2181.159.7, 2006-07-14 02:07:37+04:00, kostja@bodhi.local +4 -0
  Post-merge fixes.

  mysql-test/mysql-test-run.sh@1.329, 2006-07-14 02:07:31+04:00, kostja@bodhi.local +1 -6
    A post-merge fix (apply a change lost during the merge).

  sql/ha_ndbcluster.cc@1.343, 2006-07-14 02:07:32+04:00, kostja@bodhi.local +2 -4
    A post-merge fix: resolve a merge error.

  sql/item.cc@1.199, 2006-07-14 02:07:32+04:00, kostja@bodhi.local +0 -1
    Fix a merge error.

  sql/item_xmlfunc.cc@1.18, 2006-07-14 02:07:32+04:00, kostja@bodhi.local +1 -1
    Use the new signature of agg_arg_charsets.

ChangeSet@1.1810.1912.3, 2006-07-13 10:48:34-04:00, iggy@rolltop.ignatz42.dyndns.org +1 -0
  Bug #19779: mysql_explain_log documentation is outdated.

  scripts/mysql_explain_log.sh@1.3.1.1, 2006-07-13 10:48:31-04:00, iggy@rolltop.ignatz42.dyndns.org +13 -11
    Changed explain_log.pl to mysql_explain_log.  Added usage information for printerror. Minor cleanup.

ChangeSet@1.2181.139.16, 2006-07-13 16:24:55+02:00, andrey@lmy004. +7 -0
  update to ease the patch process

  BitKeeper/etc/ignore@1.249, 2006-07-13 16:24:38+02:00, andrey@lmy004. +1103 -0
    Added sql/.deps/client.Po sql/.deps/derror.Po sql/.deps/des_key_file.Po sql/.deps/discover.Po sql/.deps/event_data_objects.Po sql/.deps/event_db_repository.Po sql/.deps/event_queue.Po sql/.deps/event_scheduler.Po sql/.deps/events.Po sql/.deps/field.Po sql/.deps/field_conv.Po sql/.deps/filesort.Po sql/.deps/gen_lex_hash.Po sql/.deps/gstream.Po sql/.deps/ha_berkeley.Po sql/.deps/ha_federated.Po sql/.deps/ha_heap.Po sql/.deps/ha_innodb.Po sql/.deps/ha_myisam.Po sql/.deps/ha_myisammrg.Po sql/.deps/ha_ndbcluster.Po sql/.deps/ha_ndbcluster_binlog.Po sql/.deps/ha_partition.Po sql/.deps/handler.Po sql/.deps/hash_filo.Po sql/.deps/hostname.Po sql/.deps/init.Po sql/.deps/item.Po sql/.deps/item_buff.Po sql/.deps/item_cmpfunc.Po sql/.deps/item_create.Po sql/.deps/item_func.Po sql/.deps/item_geofunc.Po sql/.deps/item_row.Po sql/.deps/item_strfunc.Po sql/.deps/item_subselect.Po sql/.deps/item_sum.Po sql/.deps/item_timefunc.Po sql/.deps/item_uniq.Po sql/.deps/item_xmlfunc.Po sql/.deps/key.Po sql/.deps/lock.Po sql/.deps/
    log.Po sql/.deps/log_event.Po sql/.deps/mf_iocache.Po sql/.deps/mini_client_errors.Po sql/.deps/my_decimal.Po sql/.deps/my_lock.Po sql/.deps/my_time.Po sql/.deps/my_user.Po sql/.deps/mysql_tzinfo_to_sql.Po sql/.deps/mysqld.Po sql/.deps/net_serv.Po sql/.deps/opt_range.Po sql/.deps/opt_sum.Po sql/.deps/pack.Po sql/.deps/parse_file.Po sql/.deps/partition_info.Po sql/.deps/password.Po sql/.deps/procedure.Po sql/.deps/protocol.Po sql/.deps/records.Po sql/.deps/repl_failsafe.Po sql/.deps/rpl_filter.Po sql/.deps/rpl_injector.Po sql/.deps/rpl_tblmap.Po sql/.deps/set_var.Po sql/.deps/slave.Po sql/.deps/sp.Po sql/.deps/sp_cache.Po sql/.deps/sp_head.Po sql/.deps/sp_pcontext.Po sql/.deps/sp_rcontext.Po sql/.deps/spatial.Po sql/.deps/sql_acl.Po sql/.deps/sql_analyse.Po sql/.deps/sql_base.Po sql/.deps/sql_binlog.Po sql/.deps/sql_builtin.Po sql/.deps/sql_cache.Po sql/.deps/sql_class.Po sql/.deps/sql_client.Po sql/.deps/sql_crypt.Po sql/.deps/sql_cursor.Po sql/.deps/sql_db.Po sql/.deps/sql_delete.Po sql/.deps/sql_derived
    .Po sql/.deps/sql_do.Po sql/.deps/sql_error.Po sql/.deps/sql_handler.Po sql/.deps/sql_help.Po sql/.deps/sql_insert.Po sql/.deps/sql_lex.Po sql/.deps/sql_list.Po sql/.deps/sql_load.Po sql/.deps/sql_manager.Po sql/.deps/sql_map.Po sql/.deps/sql_olap.Po sql/.deps/sql_parse.Po sql/.deps/sql_partition.Po sql/.deps/sql_plugin.Po sql/.deps/sql_prepare.Po sql/.deps/sql_rename.Po sql/.deps/sql_repl.Po sql/.deps/sql_select.Po sql/.deps/sql_show.Po sql/.deps/sql_state.Po sql/.deps/sql_string.Po sql/.deps/sql_table.Po sql/.deps/sql_tablespace.Po sql/.deps/sql_test.Po sql/.deps/sql_trigger.Po sql/.deps/sql_udf.Po sql/.deps/sql_union.Po sql/.deps/sql_update.Po sql/.deps/sql_view.Po sql/.deps/sql_yacc.Po sql/.deps/stacktrace.Po sql/.deps/strfunc.Po sql/.deps/table.Po sql/.deps/thr_malloc.Po sql/.deps/time.Po sql/.deps/tztime.Po sql/.deps/udf_example.Plo sql/.deps/uniques.Po sql/.deps/unireg.Po sql/.libs/udf_example.lai sql/.libs/udf_example.so.0 sql/.libs/udf_example.so.0.0.0 storage/archive/.deps/archive_test-archive_t
    est.Po storage/archive/.deps/archive_test-azio.Po storage/archive/.deps/ha_archive_la-azio.Plo storage/archive/.deps/ha_archive_la-ha_archive.Plo storage/archive/.deps/libarchive_a-azio.Po storage/archive/.deps/libarchive_a-ha_archive.Po storage/blackhole/.deps/ha_blackhole_la-ha_blackhole.Plo storage/blackhole/.deps/libblackhole_a-ha_blackhole.Po storage/csv/.deps/ha_csv_la-ha_tina.Plo storage/csv/.deps/libcsv_a-ha_tina.Po storage/example/.deps/ha_example_la-ha_example.Plo storage/example/.deps/libexample_a-ha_example.Po storage/heap/.deps/_check.Po storage/heap/.deps/_rectest.Po storage/heap/.deps/hp_block.Po storage/heap/.deps/hp_clear.Po storage/heap/.deps/hp_close.Po storage/heap/.deps/hp_create.Po storage/heap/.deps/hp_delete.Po storage/heap/.deps/hp_extra.Po storage/heap/.deps/hp_hash.Po storage/heap/.deps/hp_info.Po storage/heap/.deps/hp_open.Po storage/heap/.deps/hp_panic.Po storage/heap/.deps/hp_rename.Po storage/heap/.deps/hp_rfirst.Po storage/heap/.deps/hp_rkey.Po storage/heap/.deps/hp_rlast.P
    o storage/heap/.deps/hp_rnext.Po storage/heap/.deps/hp_rprev.Po storage/heap/.deps/hp_rrnd.Po storage/heap/.deps/hp_rsame.Po storage/heap/.deps/hp_scan.Po storage/heap/.deps/hp_static.Po storage/heap/.deps/hp_test1.Po storage/heap/.deps/hp_test2.Po storage/heap/.deps/hp_update.Po storage/heap/.deps/hp_write.Po storage/innobase/btr/.deps/btr0btr.Po storage/innobase/btr/.deps/btr0cur.Po storage/innobase/btr/.deps/btr0pcur.Po storage/innobase/btr/.deps/btr0sea.Po storage/innobase/buf/.deps/buf0buf.Po storage/innobase/buf/.deps/buf0flu.Po storage/innobase/buf/.deps/buf0lru.Po storage/innobase/buf/.deps/buf0rea.Po storage/innobase/data/.deps/data0data.Po storage/innobase/data/.deps/data0type.Po storage/innobase/dict/.deps/dict0boot.Po storage/innobase/dict/.deps/dict0crea.Po storage/innobase/dict/.deps/dict0dict.Po storage/innobase/dict/.deps/dict0load.Po storage/innobase/dict/.deps/dict0mem.Po storage/innobase/dyn/.deps/dyn0dyn.Po storage/innobase/eval/.deps/eval0eval.Po storage/innobase/eval/.deps/eval0proc.
    Po storage/innobase/fil/.deps/fil0fil.Po storage/innobase/fsp/.deps/fsp0fsp.Po storage/innobase/fut/.deps/fut0fut.Po storage/innobase/fut/.deps/fut0lst.Po storage/innobase/ha/.deps/ha0ha.Po storage/innobase/ha/.deps/hash0hash.Po storage/innobase/ibuf/.deps/ibuf0ibuf.Po storage/innobase/lock/.deps/lock0lock.Po storage/innobase/log/.deps/log0log.Po storage/innobase/log/.deps/log0recv.Po storage/innobase/mach/.deps/mach0data.Po storage/innobase/mem/.deps/mem0mem.Po storage/innobase/mem/.deps/mem0pool.Po storage/innobase/mtr/.deps/mtr0log.Po storage/innobase/mtr/.deps/mtr0mtr.Po storage/innobase/os/.deps/os0file.Po storage/innobase/os/.deps/os0proc.Po storage/innobase/os/.deps/os0sync.Po storage/innobase/os/.deps/os0thread.Po storage/innobase/page/.deps/page0cur.Po storage/innobase/page/.deps/page0page.Po storage/innobase/pars/.deps/lexyy.Po storage/innobase/pars/.deps/pars0grm.Po storage/innobase/pars/.deps/pars0opt.Po storage/innobase/pars/.deps/pars0pars.Po storage/innobase/pars/.deps/pars0sym.Po storage/i
    nnobase/que/.deps/que0que.Po storage/innobase/read/.deps/read0read.Po storage/innobase/rem/.deps/rem0cmp.Po storage/innobase/rem/.deps/rem0rec.Po storage/innobase/row/.deps/row0ins.Po storage/innobase/row/.deps/row0mysql.Po storage/innobase/row/.deps/row0purge.Po storage/innobase/row/.deps/row0row.Po storage/innobase/row/.deps/row0sel.Po storage/innobase/row/.deps/row0uins.Po storage/innobase/row/.deps/row0umod.Po storage/innobase/row/.deps/row0undo.Po storage/innobase/row/.deps/row0upd.Po storage/innobase/row/.deps/row0vers.Po storage/innobase/srv/.deps/srv0que.Po storage/innobase/srv/.deps/srv0srv.Po storage/innobase/srv/.deps/srv0start.Po storage/innobase/sync/.deps/sync0arr.Po storage/innobase/sync/.deps/sync0rw.Po storage/innobase/sync/.deps/sync0sync.Po storage/innobase/thr/.deps/thr0loc.Po storage/innobase/trx/.deps/trx0purge.Po storage/innobase/trx/.deps/trx0rec.Po storage/innobase/trx/.deps/trx0roll.Po storage/innobase/trx/.deps/trx0rseg.Po storage/innobase/trx/.deps/trx0sys.Po storage/innobase/t
    rx/.deps/trx0trx.Po storage/innobase/trx/.deps/trx0undo.Po storage/innobase/usr/.deps/usr0sess.Po storage/innobase/ut/.deps/ut0byte.Po storage/innobase/ut/.deps/ut0dbg.Po storage/innobase/ut/.deps/ut0list.Po storage/innobase/ut/.deps/ut0mem.Po storage/innobase/ut/.deps/ut0rnd.Po storage/innobase/ut/.deps/ut0ut.Po storage/innobase/ut/.deps/ut0vec.Po storage/innobase/ut/.deps/ut0wqueue.Po storage/myisam/.deps/ft_boolean_search.Po storage/myisam/.deps/ft_nlq_search.Po storage/myisam/.deps/ft_parser.Po storage/myisam/.deps/ft_static.Po storage/myisam/.deps/ft_stopwords.Po storage/myisam/.deps/ft_update.Po storage/myisam/.deps/mi_cache.Po storage/myisam/.deps/mi_changed.Po storage/myisam/.deps/mi_check.Po storage/myisam/.deps/mi_checksum.Po storage/myisam/.deps/mi_close.Po storage/myisam/.deps/mi_create.Po storage/myisam/.deps/mi_dbug.Po storage/myisam/.deps/mi_delete.Po storage/myisam/.deps/mi_delete_all.Po storage/myisam/.deps/mi_delete_table.Po storage/myisam/.deps/mi_dynrec.Po storage/myisam/.deps/mi_extra
    .Po storage/myisam/.deps/mi_info.Po storage/myisam/.deps/mi_key.Po storage/myisam/.deps/mi_keycache.Po storage/myisam/.deps/mi_locking.Po storage/myisam/.deps/mi_log.Po storage/myisam/.deps/mi_open.Po storage/myisam/.deps/mi_packrec.Po storage/myisam/.deps/mi_page.Po storage/myisam/.deps/mi_panic.Po storage/myisam/.deps/mi_preload.Po storage/myisam/.deps/mi_range.Po storage/myisam/.deps/mi_rename.Po storage/myisam/.deps/mi_rfirst.Po storage/myisam/.deps/mi_rkey.Po storage/myisam/.deps/mi_rlast.Po storage/myisam/.deps/mi_rnext.Po storage/myisam/.deps/mi_rnext_same.Po storage/myisam/.deps/mi_rprev.Po storage/myisam/.deps/mi_rrnd.Po storage/myisam/.deps/mi_rsame.Po storage/myisam/.deps/mi_rsamepos.Po storage/myisam/.deps/mi_scan.Po storage/myisam/.deps/mi_search.Po storage/myisam/.deps/mi_static.Po storage/myisam/.deps/mi_statrec.Po storage/myisam/.deps/mi_test1.Po storage/myisam/.deps/mi_test2.Po storage/myisam/.deps/mi_test3.Po storage/myisam/.deps/mi_unique.Po storage/myisam/.deps/mi_update.Po storage/myi
    sam/.deps/mi_write.Po storage/myisam/.deps/myisam_ftdump.Po storage/myisam/.deps/myisamchk.Po storage/myisam/.deps/myisamlog.Po storage/myisam/.deps/myisampack.Po storage/myisam/.deps/rt_index.Po storage/myisam/.deps/rt_key.Po storage/myisam/.deps/rt_mbr.Po storage/myisam/.deps/rt_split.Po storage/myisam/.deps/rt_test.Po storage/myisam/.deps/sort.Po storage/myisam/.deps/sp_key.Po storage/myisam/.deps/sp_test.Po storage/myisammrg/.deps/myrg_close.Po storage/myisammrg/.deps/myrg_create.Po storage/myisammrg/.deps/myrg_delete.Po storage/myisammrg/.deps/myrg_extra.Po storage/myisammrg/.deps/myrg_info.Po storage/myisammrg/.deps/myrg_locking.Po storage/myisammrg/.deps/myrg_open.Po storage/myisammrg/.deps/myrg_panic.Po storage/myisammrg/.deps/myrg_queue.Po storage/myisammrg/.deps/myrg_range.Po storage/myisammrg/.deps/myrg_rfirst.Po storage/myisammrg/.deps/myrg_rkey.Po storage/myisammrg/.deps/myrg_rlast.Po storage/myisammrg/.deps/myrg_rnext.Po storage/myisammrg/.deps/myrg_rnext_same.Po storage/myisammrg/.deps/myrg
    _rprev.Po storage/myisammrg/.deps/myrg_rrnd.Po storage/myisammrg/.deps/myrg_rsame.Po storage/myisammrg/.deps/myrg_static.Po storage/myisammrg/.deps/myrg_update.Po storage/myisammrg/.deps/myrg_write.Po strings/.deps/bchange.Po strings/.deps/bcmp.Po strings/.deps/bfill.Po strings/.deps/bmove.Po strings/.deps/bmove512.Po strings/.deps/bmove_upp.Po strings/.deps/conf_to_src.Po strings/.deps/ctype-big5.Po strings/.deps/ctype-bin.Po strings/.deps/ctype-cp932.Po strings/.deps/ctype-czech.Po strings/.deps/ctype-euc_kr.Po strings/.deps/ctype-eucjpms.Po strings/.deps/ctype-extra.Po strings/.deps/ctype-gb2312.Po strings/.deps/ctype-gbk.Po strings/.deps/ctype-latin1.Po strings/.deps/ctype-mb.Po strings/.deps/ctype-simple.Po strings/.deps/ctype-sjis.Po strings/.deps/ctype-tis620.Po strings/.deps/ctype-uca.Po strings/.deps/ctype-ucs2.Po strings/.deps/ctype-ujis.Po strings/.deps/ctype-utf8.Po strings/.deps/ctype-win1250ch.Po strings/.deps/ctype.Po strings/.deps/decimal.Po strings/.deps/int2str.Po strings/.deps/is_prefix
    .Po strings/.deps/llstr.Po strings/.deps/longlong2str.Po strings/.deps/longlong2str_asm.Po strings/.deps/my_strchr.Po strings/.deps/my_strtoll10.Po strings/.deps/my_vsnprintf.Po strings/.deps/r_strinstr.Po strings/.deps/str2int.Po strings/.deps/str_alloc.Po strings/.deps/strappend.Po strings/.deps/strcend.Po strings/.deps/strcont.Po strings/.deps/strend.Po strings/.deps/strfill.Po strings/.deps/strinstr.Po strings/.deps/strmake.Po strings/.deps/strmov.Po strings/.deps/strnlen.Po strings/.deps/strnmov.Po strings/.deps/strstr.Po strings/.deps/strtod.Po strings/.deps/strtol.Po strings/.deps/strtoll.Po strings/.deps/strtoul.Po strings/.deps/strtoull.Po strings/.deps/strxmov.Po strings/.deps/strxnmov.Po strings/.deps/xml.Po tests/.deps/dummy.Po tests/.deps/insert_test.Po tests/.deps/mysql_client_test.Po tests/.deps/select_test.Po tests/.deps/thread_test.Po tests/.libs/lt-mysql_client_test tests/.libs/mysql_client_test unittest/examples/.deps/no_plan-t.Po unittest/examples/.deps/simple-t.Po unittest/examples/.d
    eps/skip-t.Po unittest/examples/.deps/skip_all-t.Po unittest/examples/.deps/todo-t.Po unittest/mysys/.deps/base64-t.Po unittest/mysys/.deps/bitmap-t.Po unittest/mysys/.deps/my_atomic-t.Po unittest/mytap/t/.deps/basic-t.Po unittest/mytap/.deps/tap.Po vio/.deps/dummy.Po vio/.deps/test-ssl.Po vio/.deps/test-sslclient.Po vio/.deps/test-sslserver.Po vio/.deps/vio.Po vio/.deps/viosocket.Po vio/.deps/viossl.Po vio/.deps/viosslfactories.Po client/.deps/base64.Po client/.deps/completion_hash.Po client/.deps/dummy.Po client/.deps/mf_tempdir.Po client/.deps/my_bit.Po client/.deps/my_bitmap.Po client/.deps/my_getsystime.Po client/.deps/my_new.Po client/.deps/my_user.Po client/.deps/my_vle.Po client/.deps/mysql.Po client/.deps/mysql_upgrade.Po client/.deps/mysqladmin.Po client/.deps/mysqlbinlog.Po client/.deps/mysqlcheck.Po client/.deps/mysqldump.Po client/.deps/mysqlimport.Po client/.deps/mysqlshow.Po client/.deps/mysqlslap.Po client/.deps/mysqltest.Po client/.deps/readline.Po client/.deps/sql_string.Po client/.libs/
    lt-mysql client/.libs/lt-mysqladmin client/.libs/lt-mysqlbinlog client/.libs/lt-mysqlcheck client/.libs/lt-mysqldump client/.libs/lt-mysqlimport client/.libs/lt-mysqlshow client/.libs/lt-mysqlslap client/.libs/lt-mysqltest client/.libs/mysql client/.libs/mysql_upgrade client/.libs/mysqladmin client/.libs/mysqlbinlog client/.libs/mysqlcheck client/.libs/mysqldump client/.libs/mysqlimport client/.libs/mysqlshow client/.libs/mysqlslap client/.libs/mysqltest cmd-line-utils/libedit/.deps/chared.Po cmd-line-utils/libedit/.deps/common.Po cmd-line-utils/libedit/.deps/el.Po cmd-line-utils/libedit/.deps/emacs.Po cmd-line-utils/libedit/.deps/fcns.Po cmd-line-utils/libedit/.deps/fgetln.Po cmd-line-utils/libedit/.deps/help.Po cmd-line-utils/libedit/.deps/hist.Po cmd-line-utils/libedit/.deps/history.Po cmd-line-utils/libedit/.deps/key.Po cmd-line-utils/libedit/.deps/map.Po cmd-line-utils/libedit/.deps/parse.Po cmd-line-utils/libedit/.deps/prompt.Po cmd-line-utils/libedit/.deps/read.Po cmd-line-utils/libedit/.deps/readl
    ine.Po cmd-line-utils/libedit/.deps/refresh.Po cmd-line-utils/libedit/.deps/search.Po cmd-line-utils/libedit/.deps/sig.Po cmd-line-utils/libedit/.deps/strlcat.Po cmd-line-utils/libedit/.deps/strlcpy.Po cmd-line-utils/libedit/.deps/term.Po cmd-line-utils/libedit/.deps/tokenizer.Po cmd-line-utils/libedit/.deps/tty.Po cmd-line-utils/libedit/.deps/unvis.Po cmd-line-utils/libedit/.deps/vi.Po cmd-line-utils/libedit/.deps/vis.Po cmd-line-utils/readline/.deps/bind.Po cmd-line-utils/readline/.deps/callback.Po cmd-line-utils/readline/.deps/compat.Po cmd-line-utils/readline/.deps/complete.Po cmd-line-utils/readline/.deps/display.Po cmd-line-utils/readline/.deps/funmap.Po cmd-line-utils/readline/.deps/histexpand.Po cmd-line-utils/readline/.deps/histfile.Po cmd-line-utils/readline/.deps/history.Po cmd-line-utils/readline/.deps/histsearch.Po cmd-line-utils/readline/.deps/input.Po cmd-line-utils/readline/.deps/isearch.Po cmd-line-utils/readline/.deps/keymaps.Po cmd-line-utils/readline/.deps/kill.Po cmd-line-utils/readli
    ne/.deps/macro.Po cmd-line-utils/readline/.deps/mbutil.Po cmd-line-utils/readline/.deps/misc.Po cmd-line-utils/readline/.deps/nls.Po cmd-line-utils/readline/.deps/parens.Po cmd-line-utils/readline/.deps/readline.Po cmd-line-utils/readline/.deps/rltty.Po cmd-line-utils/readline/.deps/savestring.Po cmd-line-utils/readline/.deps/search.Po cmd-line-utils/readline/.deps/shell.Po cmd-line-utils/readline/.deps/signals.Po cmd-line-utils/readline/.deps/terminal.Po cmd-line-utils/readline/.deps/text.Po cmd-line-utils/readline/.deps/tilde.Po cmd-line-utils/readline/.deps/undo.Po cmd-line-utils/readline/.deps/util.Po cmd-line-utils/readline/.deps/vi_mode.Po cmd-line-utils/readline/.deps/xmalloc.Po dbug/.deps/dbug.Po dbug/.deps/dbug_analyze.Po dbug/.deps/factorial.Po dbug/.deps/my_main.Po dbug/.deps/sanity.Po extra/yassl/src/.deps/buffer.Plo extra/yassl/src/.deps/cert_wrapper.Plo extra/yassl/src/.deps/crypto_wrapper.Plo extra/yassl/src/.deps/handshake.Plo extra/yassl/src/.deps/lock.Plo extra/yassl/src/.deps/log.Plo ex
    tra/yassl/src/.deps/socket_wrapper.Plo extra/yassl/src/.deps/ssl.Plo extra/yassl/src/.deps/template_instnt.Plo extra/yassl/src/.deps/timer.Plo extra/yassl/src/.deps/yassl_error.Plo extra/yassl/src/.deps/yassl_imp.Plo extra/yassl/src/.deps/yassl_int.Plo extra/yassl/taocrypt/benchmark/.deps/benchmark-benchmark.Po extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aes.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aestables.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-algebra.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-arc4.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-asn.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-bftables.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-blowfish.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-coding.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-des.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dh.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dsa.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-file.Plo extra/yassl/taocrypt/src/.deps/libt
    aocrypt_la-hash.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-integer.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md2.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md4.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md5.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-misc.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-random.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-ripemd.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-rsa.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-sha.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-template_instnt.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-tftables.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-twofish.Plo extra/yassl/taocrypt/test/.deps/test-test.Po extra/yassl/testsuite/.deps/testsuite-client.Po extra/yassl/testsuite/.deps/testsuite-echoclient.Po extra/yassl/testsuite/.deps/testsuite-echoserver.Po extra/yassl/testsuite/.deps/testsuite-server.Po extra/yassl/testsuite/.deps/testsuite-test.Po extra/yassl/testsuite/.deps/t
    estsuite-testsuite.Po extra/.deps/charset2html.Po extra/.deps/comp_err.Po extra/.deps/innochecksum.Po extra/.deps/my_print_defaults.Po extra/.deps/mysql_waitpid.Po extra/.deps/perror.Po extra/.deps/replace.Po extra/.deps/resolve_stack_dump.Po extra/.deps/resolveip.Po libmysql/.deps/array.Plo libmysql/.deps/bchange.Plo libmysql/.deps/bcmp.Plo libmysql/.deps/bmove.Plo libmysql/.deps/bmove_upp.Plo libmysql/.deps/charset-def.Plo libmysql/.deps/charset.Plo libmysql/.deps/client.Plo libmysql/.deps/conf_to_src.Po libmysql/.deps/ctype-big5.Plo libmysql/.deps/ctype-bin.Plo libmysql/.deps/ctype-cp932.Plo libmysql/.deps/ctype-czech.Plo libmysql/.deps/ctype-euc_kr.Plo libmysql/.deps/ctype-eucjpms.Plo libmysql/.deps/ctype-extra.Plo libmysql/.deps/ctype-gb2312.Plo libmysql/.deps/ctype-gbk.Plo libmysql/.deps/ctype-latin1.Plo libmysql/.deps/ctype-mb.Plo libmysql/.deps/ctype-simple.Plo libmysql/.deps/ctype-sjis.Plo libmysql/.deps/ctype-tis620.Plo libmysql/.deps/ctype-uca.Plo libmysql/.deps/ctype-ucs2.Plo libmysql/.deps/ct
    ype-ujis.Plo libmysql/.deps/ctype-utf8.Plo libmysql/.deps/ctype-win1250ch.Plo libmysql/.deps/ctype.Plo libmysql/.deps/dbug.Plo libmysql/.deps/default.Plo libmysql/.deps/default_modify.Plo libmysql/.deps/errmsg.Plo libmysql/.deps/errors.Plo libmysql/.deps/get_password.Plo libmysql/.deps/hash.Plo libmysql/.deps/int2str.Plo libmysql/.deps/is_prefix.Plo libmysql/.deps/libmysql.Plo libmysql/.deps/list.Plo libmysql/.deps/llstr.Plo libmysql/.deps/longlong2str.Plo libmysql/.deps/manager.Plo libmysql/.deps/md5.Plo libmysql/.deps/mf_cache.Plo libmysql/.deps/mf_dirname.Plo libmysql/.deps/mf_fn_ext.Plo libmysql/.deps/mf_format.Plo libmysql/.deps/mf_iocache.Plo libmysql/.deps/mf_iocache2.Plo libmysql/.deps/mf_loadpath.Plo libmysql/.deps/mf_pack.Plo libmysql/.deps/mf_path.Plo libmysql/.deps/mf_tempfile.Plo libmysql/.deps/mf_unixpath.Plo libmysql/.deps/mf_wcomp.Plo libmysql/.deps/mulalloc.Plo libmysql/.deps/my_alloc.Plo libmysql/.deps/my_chsize.Plo libmysql/.deps/my_compress.Plo libmysql/.deps/my_create.Plo libmysql/.de
    ps/my_delete.Plo libmysql/.deps/my_div.Plo libmysql/.deps/my_error.Plo libmysql/.deps/my_file.Plo libmysql/.deps/my_fopen.Plo libmysql/.deps/my_fstream.Plo libmysql/.deps/my_gethostbyname.Plo libmysql/.deps/my_getopt.Plo libmysql/.deps/my_getwd.Plo libmysql/.deps/my_init.Plo libmysql/.deps/my_lib.Plo libmysql/.deps/my_malloc.Plo libmysql/.deps/my_messnc.Plo libmysql/.deps/my_net.Plo libmysql/.deps/my_once.Plo libmysql/.deps/my_open.Plo libmysql/.deps/my_port.Plo libmysql/.deps/my_pread.Plo libmysql/.deps/my_pthread.Plo libmysql/.deps/my_read.Plo libmysql/.deps/my_realloc.Plo libmysql/.deps/my_rename.Plo libmysql/.deps/my_seek.Plo libmysql/.deps/my_sleep.Plo libmysql/.deps/my_static.Plo libmysql/.deps/my_strtoll10.Plo libmysql/.deps/my_symlink.Plo libmysql/.deps/my_thr_init.Plo libmysql/.deps/my_time.Plo libmysql/.deps/my_vsnprintf.Plo libmysql/.deps/my_write.Plo libmysql/.deps/net.Plo libmysql/.deps/pack.Plo libmysql/.deps/password.Plo libmysql/.deps/safemalloc.Plo libmysql/.deps/sha1.Plo libmysql/.deps/s
    tr2int.Plo libmysql/.deps/str_alloc.Plo libmysql/.deps/strcend.Plo libmysql/.deps/strcont.Plo libmysql/.deps/strend.Plo libmysql/.deps/strfill.Plo libmysql/.deps/string.Plo libmysql/.deps/strinstr.Plo libmysql/.deps/strmake.Plo libmysql/.deps/strmov.Plo libmysql/.deps/strnlen.Plo libmysql/.deps/strnmov.Plo libmysql/.deps/strtod.Plo libmysql/.deps/strtoll.Plo libmysql/.deps/strtoull.Plo libmysql/.deps/strxmov.Plo libmysql/.deps/strxnmov.Plo libmysql/.deps/thr_mutex.Plo libmysql/.deps/typelib.Plo libmysql/.deps/vio.Plo libmysql/.deps/viosocket.Plo libmysql/.deps/viossl.Plo libmysql/.deps/viosslfactories.Plo libmysql/.deps/xml.Plo libmysql/.libs/libmysqlclient.lai libmysql/.libs/libmysqlclient.so.15 libmysql/.libs/libmysqlclient.so.15.0.0 libmysql_r/.deps/array.Plo libmysql_r/.deps/bchange.Plo libmysql_r/.deps/bcmp.Plo libmysql_r/.deps/bmove.Plo libmysql_r/.deps/bmove_upp.Plo libmysql_r/.deps/charset-def.Plo libmysql_r/.deps/charset.Plo libmysql_r/.deps/client.Plo libmysql_r/.deps/conf_to_src.Po libmysql_r/.
    deps/ctype-big5.Plo libmysql_r/.deps/ctype-bin.Plo libmysql_r/.deps/ctype-cp932.Plo libmysql_r/.deps/ctype-czech.Plo libmysql_r/.deps/ctype-euc_kr.Plo libmysql_r/.deps/ctype-eucjpms.Plo libmysql_r/.deps/ctype-extra.Plo libmysql_r/.deps/ctype-gb2312.Plo libmysql_r/.deps/ctype-gbk.Plo libmysql_r/.deps/ctype-latin1.Plo libmysql_r/.deps/ctype-mb.Plo libmysql_r/.deps/ctype-simple.Plo libmysql_r/.deps/ctype-sjis.Plo libmysql_r/.deps/ctype-tis620.Plo libmysql_r/.deps/ctype-uca.Plo libmysql_r/.deps/ctype-ucs2.Plo libmysql_r/.deps/ctype-ujis.Plo libmysql_r/.deps/ctype-utf8.Plo libmysql_r/.deps/ctype-win1250ch.Plo libmysql_r/.deps/ctype.Plo libmysql_r/.deps/dbug.Plo libmysql_r/.deps/default.Plo libmysql_r/.deps/default_modify.Plo libmysql_r/.deps/errmsg.Plo libmysql_r/.deps/errors.Plo libmysql_r/.deps/get_password.Plo libmysql_r/.deps/hash.Plo libmysql_r/.deps/int2str.Plo libmysql_r/.deps/is_prefix.Plo libmysql_r/.deps/libmysql.Plo libmysql_r/.deps/list.Plo libmysql_r/.deps/llstr.Plo libmysql_r/.deps/longlong2str.P
    lo libmysql_r/.deps/manager.Plo libmysql_r/.deps/md5.Plo libmysql_r/.deps/mf_cache.Plo libmysql_r/.deps/mf_dirname.Plo libmysql_r/.deps/mf_fn_ext.Plo libmysql_r/.deps/mf_format.Plo libmysql_r/.deps/mf_iocache.Plo libmysql_r/.deps/mf_iocache2.Plo libmysql_r/.deps/mf_loadpath.Plo libmysql_r/.deps/mf_pack.Plo libmysql_r/.deps/mf_path.Plo libmysql_r/.deps/mf_tempfile.Plo libmysql_r/.deps/mf_unixpath.Plo libmysql_r/.deps/mf_wcomp.Plo libmysql_r/.deps/mulalloc.Plo libmysql_r/.deps/my_alloc.Plo libmysql_r/.deps/my_chsize.Plo libmysql_r/.deps/my_compress.Plo libmysql_r/.deps/my_create.Plo libmysql_r/.deps/my_delete.Plo libmysql_r/.deps/my_div.Plo libmysql_r/.deps/my_error.Plo libmysql_r/.deps/my_file.Plo libmysql_r/.deps/my_fopen.Plo libmysql_r/.deps/my_fstream.Plo libmysql_r/.deps/my_gethostbyname.Plo libmysql_r/.deps/my_getopt.Plo libmysql_r/.deps/my_getwd.Plo libmysql_r/.deps/my_init.Plo libmysql_r/.deps/my_lib.Plo libmysql_r/.deps/my_malloc.Plo libmysql_r/.deps/my_messnc.Plo libmysql_r/.deps/my_net.Plo libmys
    ql_r/.deps/my_once.Plo libmysql_r/.deps/my_open.Plo libmysql_r/.deps/my_port.Plo libmysql_r/.deps/my_pread.Plo libmysql_r/.deps/my_pthread.Plo libmysql_r/.deps/my_read.Plo libmysql_r/.deps/my_realloc.Plo libmysql_r/.deps/my_rename.Plo libmysql_r/.deps/my_seek.Plo libmysql_r/.deps/my_sleep.Plo libmysql_r/.deps/my_static.Plo libmysql_r/.deps/my_strtoll10.Plo libmysql_r/.deps/my_symlink.Plo libmysql_r/.deps/my_thr_init.Plo libmysql_r/.deps/my_time.Plo libmysql_r/.deps/my_vsnprintf.Plo libmysql_r/.deps/my_write.Plo libmysql_r/.deps/net.Plo libmysql_r/.deps/pack.Plo libmysql_r/.deps/password.Plo libmysql_r/.deps/safemalloc.Plo libmysql_r/.deps/sha1.Plo libmysql_r/.deps/str2int.Plo libmysql_r/.deps/str_alloc.Plo libmysql_r/.deps/strcend.Plo libmysql_r/.deps/strcont.Plo libmysql_r/.deps/strend.Plo libmysql_r/.deps/strfill.Plo libmysql_r/.deps/string.Plo libmysql_r/.deps/strinstr.Plo libmysql_r/.deps/strmake.Plo libmysql_r/.deps/strmov.Plo libmysql_r/.deps/strnlen.Plo libmysql_r/.deps/strnmov.Plo libmysql_r/.deps
    /strtod.Plo libmysql_r/.deps/strtoll.Plo libmysql_r/.deps/strtoull.Plo libmysql_r/.deps/strxmov.Plo libmysql_r/.deps/strxnmov.Plo libmysql_r/.deps/thr_mutex.Plo libmysql_r/.deps/typelib.Plo libmysql_r/.deps/vio.Plo libmysql_r/.deps/viosocket.Plo libmysql_r/.deps/viossl.Plo libmysql_r/.deps/viosslfactories.Plo libmysql_r/.deps/xml.Plo libmysql_r/.libs/libmysqlclient_r.lai libmysql_r/.libs/libmysqlclient_r.so.15 libmysql_r/.libs/libmysqlclient_r.so.15.0.0 libmysqld/examples/.deps/completion_hash.Po libmysqld/examples/.deps/mysql.Po libmysqld/examples/.deps/mysql_client_test.Po libmysqld/examples/.deps/mysqltest.Po libmysqld/examples/.deps/readline.Po libmysqld/.deps/client.Po libmysqld/.deps/derror.Po libmysqld/.deps/discover.Po libmysqld/.deps/emb_qcache.Po libmysqld/.deps/errmsg.Po libmysqld/.deps/event_data_objects.Po libmysqld/.deps/event_db_repository.Po libmysqld/.deps/event_queue.Po libmysqld/.deps/event_scheduler.Po libmysqld/.deps/events.Po libmysqld/.deps/field.Po libmysqld/.deps/field_conv.Po lib
    mysqld/.deps/filesort.Po libmysqld/.deps/get_password.Po libmysqld/.deps/gstream.Po libmysqld/.deps/ha_berkeley.Po libmysqld/.deps/ha_federated.Po libmysqld/.deps/ha_heap.Po libmysqld/.deps/ha_innodb.Po libmysqld/.deps/ha_myisam.Po libmysqld/.deps/ha_myisammrg.Po libmysqld/.deps/ha_ndbcluster.Po libmysqld/.deps/ha_ndbcluster_binlog.Po libmysqld/.deps/ha_partition.Po libmysqld/.deps/handler.Po libmysqld/.deps/hash_filo.Po libmysqld/.deps/hostname.Po libmysqld/.deps/init.Po libmysqld/.deps/item.Po libmysqld/.deps/item_buff.Po libmysqld/.deps/item_cmpfunc.Po libmysqld/.deps/item_create.Po libmysqld/.deps/item_func.Po libmysqld/.deps/item_geofunc.Po libmysqld/.deps/item_row.Po libmysqld/.deps/item_strfunc.Po libmysqld/.deps/item_subselect.Po libmysqld/.deps/item_sum.Po libmysqld/.deps/item_timefunc.Po libmysqld/.deps/item_uniq.Po libmysqld/.deps/item_xmlfunc.Po libmysqld/.deps/key.Po libmysqld/.deps/lib_sql.Po libmysqld/.deps/libmysql.Po libmysqld/.deps/libmysqld.Po libmysqld/.deps/lock.Po libmysqld/.deps/log
    .Po libmysqld/.deps/log_event.Po libmysqld/.deps/my_decimal.Po libmysqld/.deps/my_time.Po libmysqld/.deps/my_user.Po libmysqld/.deps/net_serv.Po libmysqld/.deps/opt_range.Po libmysqld/.deps/opt_sum.Po libmysqld/.deps/pack.Po libmysqld/.deps/parse_file.Po libmysqld/.deps/partition_info.Po libmysqld/.deps/password.Po libmysqld/.deps/procedure.Po libmysqld/.deps/protocol.Po libmysqld/.deps/records.Po libmysqld/.deps/rpl_filter.Po libmysqld/.deps/rpl_injector.Po libmysqld/.deps/set_var.Po libmysqld/.deps/sp.Po libmysqld/.deps/sp_cache.Po libmysqld/.deps/sp_head.Po libmysqld/.deps/sp_pcontext.Po libmysqld/.deps/sp_rcontext.Po libmysqld/.deps/spatial.Po libmysqld/.deps/sql_acl.Po libmysqld/.deps/sql_analyse.Po libmysqld/.deps/sql_base.Po libmysqld/.deps/sql_builtin.Po libmysqld/.deps/sql_cache.Po libmysqld/.deps/sql_class.Po libmysqld/.deps/sql_crypt.Po libmysqld/.deps/sql_cursor.Po libmysqld/.deps/sql_db.Po libmysqld/.deps/sql_delete.Po libmysqld/.deps/sql_derived.Po libmysqld/.deps/sql_do.Po libmysqld/.deps/s
    ql_error.Po libmysqld/.deps/sql_handler.Po libmysqld/.deps/sql_help.Po libmysqld/.deps/sql_insert.Po libmysqld/.deps/sql_lex.Po libmysqld/.deps/sql_list.Po libmysqld/.deps/sql_load.Po libmysqld/.deps/sql_manager.Po libmysqld/.deps/sql_map.Po libmysqld/.deps/sql_parse.Po libmysqld/.deps/sql_partition.Po libmysqld/.deps/sql_plugin.Po libmysqld/.deps/sql_prepare.Po libmysqld/.deps/sql_rename.Po libmysqld/.deps/sql_select.Po libmysqld/.deps/sql_show.Po libmysqld/.deps/sql_state.Po libmysqld/.deps/sql_string.Po libmysqld/.deps/sql_table.Po libmysqld/.deps/sql_tablespace.Po libmysqld/.deps/sql_test.Po libmysqld/.deps/sql_trigger.Po libmysqld/.deps/sql_udf.Po libmysqld/.deps/sql_union.Po libmysqld/.deps/sql_update.Po libmysqld/.deps/sql_view.Po libmysqld/.deps/sql_yacc.Po libmysqld/.deps/stacktrace.Po libmysqld/.deps/strfunc.Po libmysqld/.deps/table.Po libmysqld/.deps/thr_malloc.Po libmysqld/.deps/time.Po libmysqld/.deps/tztime.Po libmysqld/.deps/uniques.Po libmysqld/.deps/unireg.Po mysys/.deps/array.Po mysys/.d
    eps/base64.Po mysys/.deps/charset-def.Po mysys/.deps/charset.Po mysys/.deps/checksum.Po mysys/.deps/default.Po mysys/.deps/default_modify.Po mysys/.deps/errors.Po mysys/.deps/hash.Po mysys/.deps/list.Po mysys/.deps/md5.Po mysys/.deps/mf_brkhant.Po mysys/.deps/mf_cache.Po mysys/.deps/mf_dirname.Po mysys/.deps/mf_fn_ext.Po mysys/.deps/mf_format.Po mysys/.deps/mf_getdate.Po mysys/.deps/mf_iocache.Po mysys/.deps/mf_iocache2.Po mysys/.deps/mf_keycache.Po mysys/.deps/mf_keycaches.Po mysys/.deps/mf_loadpath.Po mysys/.deps/mf_pack.Po mysys/.deps/mf_path.Po mysys/.deps/mf_qsort.Po mysys/.deps/mf_qsort2.Po mysys/.deps/mf_radix.Po mysys/.deps/mf_same.Po mysys/.deps/mf_sort.Po mysys/.deps/mf_strip.Po mysys/.deps/mf_tempdir.Po mysys/.deps/mf_tempfile.Po mysys/.deps/mf_unixpath.Po mysys/.deps/mf_wcomp.Po mysys/.deps/mf_wfile.Po mysys/.deps/mulalloc.Po mysys/.deps/my_access.Po mysys/.deps/my_aes.Po mysys/.deps/my_alarm.Po mysys/.deps/my_alloc.Po mysys/.deps/my_append.Po mysys/.deps/my_atomic.Po mysys/.deps/my_bit.Po mys
    ys/.deps/my_bitmap.Po mysys/.deps/my_chsize.Po mysys/.deps/my_clock.Po mysys/.deps/my_compress.Po mysys/.deps/my_copy.Po mysys/.deps/my_crc32.Po mysys/.deps/my_create.Po mysys/.deps/my_delete.Po mysys/.deps/my_div.Po mysys/.deps/my_dup.Po mysys/.deps/my_error.Po mysys/.deps/my_file.Po mysys/.deps/my_fopen.Po mysys/.deps/my_fstream.Po mysys/.deps/my_gethostbyname.Po mysys/.deps/my_gethwaddr.Po mysys/.deps/my_getncpus.Po mysys/.deps/my_getopt.Po mysys/.deps/my_getsystime.Po mysys/.deps/my_getwd.Po mysys/.deps/my_handler.Po mysys/.deps/my_init.Po mysys/.deps/my_largepage.Po mysys/.deps/my_lib.Po mysys/.deps/my_libwrap.Po mysys/.deps/my_lock.Po mysys/.deps/my_lockmem.Po mysys/.deps/my_lread.Po mysys/.deps/my_lwrite.Po mysys/.deps/my_malloc.Po mysys/.deps/my_memmem.Po mysys/.deps/my_messnc.Po mysys/.deps/my_mkdir.Po mysys/.deps/my_mmap.Po mysys/.deps/my_net.Po mysys/.deps/my_netware.Po mysys/.deps/my_new.Po mysys/.deps/my_once.Po mysys/.deps/my_open.Po mysys/.deps/my_port.Po mysys/.deps/my_pread.Po mysys/.deps
    /my_pthread.Po mysys/.deps/my_quick.Po mysys/.deps/my_read.Po mysys/.deps/my_realloc.Po mysys/.deps/my_redel.Po mysys/.deps/my_rename.Po mysys/.deps/my_seek.Po mysys/.deps/my_semaphore.Po mysys/.deps/my_sleep.Po mysys/.deps/my_static.Po mysys/.deps/my_symlink.Po mysys/.deps/my_symlink2.Po mysys/.deps/my_sync.Po mysys/.deps/my_thr_init.Po mysys/.deps/my_vle.Po mysys/.deps/my_windac.Po mysys/.deps/my_write.Po mysys/.deps/ptr_cmp.Po mysys/.deps/queues.Po mysys/.deps/rijndael.Po mysys/.deps/safemalloc.Po mysys/.deps/sha1.Po mysys/.deps/string.Po mysys/.deps/thr_alarm.Po mysys/.deps/thr_lock.Po mysys/.deps/thr_mutex.Po mysys/.deps/thr_rwlock.Po mysys/.deps/tree.Po mysys/.deps/trie.Po mysys/.deps/typelib.Po netware/.deps/libmysqlmain.Po netware/.deps/my_manage.Po netware/.deps/mysql_install_db.Po netware/.deps/mysql_test_run.Po netware/.deps/mysqld_safe.Po plugin/fulltext/.deps/mypluglib_la-plugin_example.Plo plugin/fulltext/.libs/mypluglib.lai plugin/fulltext/.libs/mypluglib.so.0 plugin/fulltext/.libs/myplugli
    b.so.0.0.0 pstack/.deps/bucomm.Po pstack/.deps/debug.Po pstack/.deps/filemode.Po pstack/.deps/ieee.Po pstack/.deps/linuxthreads.Po pstack/.deps/pstack.Po pstack/.deps/rddbg.Po pstack/.deps/stabs.Po regex/.deps/debug.Po regex/.deps/main.Po regex/.deps/regcomp.Po regex/.deps/regerror.Po regex/.deps/regexec.Po regex/.deps/regfree.Po regex/.deps/reginit.Po regex/.deps/split.Po server-tools/instance-manager/.deps/buffer.Po server-tools/instance-manager/.deps/command.Po server-tools/instance-manager/.deps/commands.Po server-tools/instance-manager/.deps/guardian.Po server-tools/instance-manager/.deps/instance.Po server-tools/instance-manager/.deps/instance_map.Po server-tools/instance-manager/.deps/instance_options.Po server-tools/instance-manager/.deps/liboptions_la-options.Plo server-tools/instance-manager/.deps/liboptions_la-priv.Plo server-tools/instance-manager/.deps/listener.Po server-tools/instance-manager/.deps/log.Po server-tools/instance-manager/.deps/manager.Po server-tools/instance-manager/.deps/mess
    ages.Po server-tools/instance-manager/.deps/mysql_connection.Po server-tools/instance-manager/.deps/mysqlmanager.Po server-tools/instance-manager/.deps/net_serv.Po server-tools/instance-manager/.deps/parse.Po server-tools/instance-manager/.deps/parse_output.Po server-tools/instance-manager/.deps/protocol.Po server-tools/instance-manager/.deps/thread_registry.Po server-tools/instance-manager/.deps/user_management_commands.Po server-tools/instance-manager/.deps/user_map.Po to the ignore list

  sql/Makefile.am@1.150, 2006-07-13 16:24:37+02:00, andrey@lmy004. +3 -3
    update to ease the patch process

  sql/event_data_objects.cc@1.73, 2006-07-13 16:24:37+02:00, andrey@lmy004. +165 -159
    update to ease the patch process

  sql/event_queue.cc@1.10, 2006-07-13 16:24:37+02:00, andrey@lmy004. +20 -20
    integrate Event_queue::check_system_tables() into the boot procedure

  sql/event_queue.h@1.9, 2006-07-13 16:24:37+02:00, andrey@lmy004. +1 -3
    make Event_queue::check_system_tables() void, instead of bool

  sql/event_scheduler.cc@1.18, 2006-07-13 16:24:38+02:00, andrey@lmy004. +230 -232
    Whitespaces and moving around to ease the job of diff

  sql/event_scheduler.h@1.14, 2006-07-13 16:24:38+02:00, andrey@lmy004. +1 -1
    init_scheduler() actually does not return anything but 0, then make it void

ChangeSet@1.2181.159.3, 2006-07-13 17:34:49+04:00, kostja@bodhi.local +5 -0
  Post-merge fixes.

  mysql-test/r/federated.result@1.34, 2006-07-13 17:34:44+04:00, kostja@bodhi.local +0 -1
    A post-merge fix.

  mysql-test/r/show_check.result@1.99, 2006-07-13 17:34:44+04:00, kostja@bodhi.local +62 -0
    A post-merge fix.

  sql/log_event.cc@1.237, 2006-07-13 17:34:44+04:00, kostja@bodhi.local +0 -16
    Remove rewrite_db (it's refactored in 5.1 to rpl_filter)

  sql/share/errmsg.txt@1.110.1.3, 2006-07-13 17:34:45+04:00, kostja@bodhi.local +2 -2
    Move ER_NO_TRIGGERS_ON_SYSTEM_SCHEMA to the end of the list.
    This breaks compatibility of errmsg.sys with 5.0 but preserves 
    compatibility with 5.1.11.

  sql/sql_class.h@1.304.1.8, 2006-07-13 17:34:45+04:00, kostja@bodhi.local +2 -9
    A post-merge fix.

ChangeSet@1.1810.1923.1, 2006-07-13 17:12:31+04:00, kroki@moonlight.intranet +8 -0
  Bug#18630: Arguments of suid routine calculated in wrong security
             context.
  
  Routine arguments were evaluated in the security context of the routine
  itself, not in the caller's context.
  
  The bug is fixed the following way:
  
    - Item_func_sp::find_and_check_access() has been split into two
      functions: Item_func_sp::find_and_check_access() itself only
      finds the function and check that the caller have EXECUTE privilege
      on it.  New function set_routine_security_ctx() changes security
      context for SUID routines and checks that definer have EXECUTE
      privilege too.
  
    - new function sp_head::execute_trigger() is called from
      Table_triggers_list::process_triggers() instead of
      sp_head::execute_function(), and is effectively just as the
      sp_head::execute_function() is, with all non-trigger related code
      removed, and added trigger-specific security context switch.
  
    - call to Item_func_sp::find_and_check_access() stays outside
      of sp_head::execute_function(), and there is a code in
      sql_parse.cc before the call to sp_head::execute_procedure() that
      checks that the caller have EXECUTE privilege, but both
      sp_head::execute_function() and sp_head::execute_procedure() call
      set_routine_security_ctx() after evaluating their parameters,
      and restore the context after the body is executed.

  mysql-test/r/sp-security.result@1.25.1.6, 2006-07-13 17:12:27+04:00, kroki@moonlight.intranet +52 -0
    Add test case for bug#18630: Arguments of suid routine calculated
    in wrong security context.

  mysql-test/t/sp-security.test@1.28.1.6, 2006-07-13 17:12:27+04:00, kroki@moonlight.intranet +77 -1
    Add result for bug#18630: Arguments of suid routine calculated
    in wrong security context.

  sql/item_func.cc@1.270.14.1, 2006-07-13 17:12:27+04:00, kroki@moonlight.intranet +28 -56
    Do not change security context before executing the function, as it
    will be changed after argument evaluation.
    Do not change security context in Item_func_sp::find_and_check_access().

  sql/item_func.h@1.136.6.1, 2006-07-13 17:12:28+04:00, kroki@moonlight.intranet +1 -2
    Change prototype for Item_func_sp::find_and_check_access().

  sql/sp_head.cc@1.200.1.19, 2006-07-13 17:12:28+04:00, kroki@moonlight.intranet +186 -4
    Add set_routine_security_ctx() function.
    Add sp_head::execute_trigger() method.
    Change security context in sp_head::execute_trigger(), and in
    sp_head::execute_function() and sp_head::execute_procedure()
    after argument evaluation.
    Move pop_all_cursors() call to sp_head::execute().

  sql/sp_head.h@1.79.1.7, 2006-07-13 17:12:28+04:00, kroki@moonlight.intranet +8 -0
    Add declaration for sp_head::execute_trigger() and
    set_routine_security_ctx().

  sql/sql_parse.cc@1.426.99.1, 2006-07-13 17:12:28+04:00, kroki@moonlight.intranet +1 -17
    Do not change security context before executing the procedure, as it
    will be changed after argument evaluation.

  sql/sql_trigger.cc@1.35.10.1, 2006-07-13 17:12:28+04:00, kroki@moonlight.intranet +3 -32
    Call new sp_head::execute_trigger() instead of
    sp_head::execute_function(), which is responsible to switch
    security context.

ChangeSet@1.2181.139.15, 2006-07-13 12:19:01+02:00, andrey@lmy004. +3 -0
  WL #3337 (Event scheduler new architecture)
  move back THD::change_security_context to event_change_security_context

  sql/event_data_objects.cc@1.72, 2006-07-13 12:18:51+02:00, andrey@lmy004. +65 -4
    move THD::change_security_context to event_change_security_context

  sql/sql_class.cc@1.271.3.3, 2006-07-13 12:18:51+02:00, andrey@lmy004. +0 -58
    move THD::change_security_context to event_change_security_context

  sql/sql_class.h@1.308, 2006-07-13 12:18:51+02:00, andrey@lmy004. +0 -7
    move THD::change_security_context to event_change_security_context

ChangeSet@1.2181.139.14, 2006-07-13 10:59:58+02:00, andrey@lmy004. +22 -0
  WL #3337 (Events new architecture)
  Final stroke, events should be loaded from disk on server startup.
  Also check the validity of their bodies if possible during loading.

  mysql-test/r/events_restart_phase1.result@1.1, 2006-07-13 10:59:44+02:00, andrey@lmy004. +10 -0

  mysql-test/r/events_restart_phase1.result@1.0, 2006-07-13 10:59:44+02:00, andrey@lmy004. +0 -0
    BitKeeper file /work/mysql-5.1-runtime-wl3337/mysql-test/r/events_restart_phase1.result

  mysql-test/r/events_restart_phase2.result@1.1, 2006-07-13 10:59:44+02:00, andrey@lmy004. +6 -0

  mysql-test/r/events_restart_phase2.result@1.0, 2006-07-13 10:59:44+02:00, andrey@lmy004. +0 -0
    BitKeeper file /work/mysql-5.1-runtime-wl3337/mysql-test/r/events_restart_phase2.result

  mysql-test/r/events_restart_phase3.result@1.1, 2006-07-13 10:59:45+02:00, andrey@lmy004. +9 -0

  mysql-test/r/events_restart_phase3.result@1.0, 2006-07-13 10:59:45+02:00, andrey@lmy004. +0 -0
    BitKeeper file /work/mysql-5.1-runtime-wl3337/mysql-test/r/events_restart_phase3.result

  mysql-test/t/events_restart_phase1.test@1.1, 2006-07-13 10:59:45+02:00, andrey@lmy004. +17 -0

  mysql-test/t/events_restart_phase1.test@1.0, 2006-07-13 10:59:45+02:00, andrey@lmy004. +0 -0
    BitKeeper file /work/mysql-5.1-runtime-wl3337/mysql-test/t/events_restart_phase1.test

  mysql-test/t/events_restart_phase2-master.opt@1.1, 2006-07-13 10:59:46+02:00, andrey@lmy004. +1 -0

  mysql-test/t/events_restart_phase2-master.opt@1.0, 2006-07-13 10:59:46+02:00, andrey@lmy004. +0 -0
    BitKeeper file /work/mysql-5.1-runtime-wl3337/mysql-test/t/events_restart_phase2-master.opt

  mysql-test/t/events_restart_phase2.test@1.1, 2006-07-13 10:59:46+02:00, andrey@lmy004. +9 -0

  mysql-test/t/events_restart_phase2.test@1.0, 2006-07-13 10:59:46+02:00, andrey@lmy004. +0 -0
    BitKeeper file /work/mysql-5.1-runtime-wl3337/mysql-test/t/events_restart_phase2.test

  mysql-test/t/events_restart_phase3-master.opt@1.1, 2006-07-13 10:59:47+02:00, andrey@lmy004. +1 -0

  mysql-test/t/events_restart_phase3-master.opt@1.0, 2006-07-13 10:59:47+02:00, andrey@lmy004. +0 -0
    BitKeeper file /work/mysql-5.1-runtime-wl3337/mysql-test/t/events_restart_phase3-master.opt

  mysql-test/t/events_restart_phase3.test@1.1, 2006-07-13 10:59:47+02:00, andrey@lmy004. +14 -0

  mysql-test/t/events_restart_phase3.test@1.0, 2006-07-13 10:59:47+02:00, andrey@lmy004. +0 -0
    BitKeeper file /work/mysql-5.1-runtime-wl3337/mysql-test/t/events_restart_phase3.test

  sql/event_data_objects.cc@1.71, 2006-07-13 10:59:43+02:00, andrey@lmy004. +18 -37
    Remove Event_job_data::free_sp(), move the code to the destructor
    Change the way we change the security context
    Steal some code from sql_parse.cc

  sql/event_data_objects.h@1.11, 2006-07-13 10:59:43+02:00, andrey@lmy004. +3 -6
    Remove free_sp()
    Make compile() public, to be used when booting for verifying the integrity of mysql.event

  sql/event_queue.cc@1.9, 2006-07-13 10:59:43+02:00, andrey@lmy004. +110 -34
    Make the queue load events from disk on server boot.
    Compile and thus check for integrity the events.

  sql/event_queue.h@1.8, 2006-07-13 10:59:43+02:00, andrey@lmy004. +17 -14
    shift methods around. add queue_loaded boolean.

  sql/event_scheduler.cc@1.17, 2006-07-13 10:59:43+02:00, andrey@lmy004. +59 -55
    Rename init_event_thread() to pre_init_event_thread()
    and make it more generic.
    Add post_init_event_thread()
    Export these two as well as deinit_event_thread().
    Now it is quite easy to write code to spawn a new event thread
    whenever needed.

  sql/event_scheduler.h@1.13, 2006-07-13 10:59:43+02:00, andrey@lmy004. +9 -0
    export pre_init_event_thread(), post_init_event_thread() and deinit_event_thread()
    to simplify writing of thread functions.

  sql/events.cc@1.57, 2006-07-13 10:59:43+02:00, andrey@lmy004. +8 -3
    Events::init() returns only one error code, then make it bool

  sql/events.h@1.43, 2006-07-13 10:59:43+02:00, andrey@lmy004. +1 -1
    Events::init() returns only one error code, then make it bool

  sql/mysqld.cc@1.568, 2006-07-13 10:59:43+02:00, andrey@lmy004. +2 -1
    Check the return code of Events::init()

  sql/sp_head.cc@1.228.1.1, 2006-07-13 10:59:43+02:00, andrey@lmy004. +2 -0
    Add trace info

  sql/sql_class.cc@1.271.3.2, 2006-07-13 10:59:43+02:00, andrey@lmy004. +10 -8
    Reorganize thd::change_security_context() to load main_security_ctx

  sql/sql_class.h@1.307, 2006-07-13 10:59:44+02:00, andrey@lmy004. +1 -2
    Reorganize thd::change_security_context() to load main_security_ctx

  sql/sql_lex.cc@1.192, 2006-07-13 10:59:44+02:00, andrey@lmy004. +1 -0
    Initialize lex->spname

  sql/sql_yacc.yy@1.490, 2006-07-13 10:59:44+02:00, andrey@lmy004. +7 -0
    Add a comment

ChangeSet@1.1616.2694.1, 2006-07-13 00:31:47-07:00, igreenhoe@anubis.greendragongames.com +1 -0
  Fix for Bug #19364 "mysql --help gives old informations".
  
  Old option ordering in the help was confusing to some users.  Changed
  ordering of deprecated options to be consistent, and added mention to
  entry for options with a "--no-option" variant mentioning the
  "--disable-option" variant.

  client/mysql.cc@1.121.18.1, 2006-07-13 00:31:43-07:00, igreenhoe@anubis.greendragongames.com +10 -12
    Rearranged options for clarity.  Deprecated "--no-X" options now
    follow the "--X" option, and all of the "--X" options that have a
    "--no-X" variant now mention the "--disable-X" variant.

ChangeSet@1.1616.2689.2, 2006-07-13 09:04:06+02:00, tnurnberg@mysql.com +3 -0
  Bug#20432: mysql client interprets commands in comments
  
  do not look for client-specific commands while inside a multi-line comment.
  we will allow multi-comments pretty much anywhere within SQL-statements,
  but client-specific commands (help, use, print, ...) must be the first token
  in the input.

  mysql-test/r/mysql_client.result@1.1, 2006-07-13 09:04:04+02:00, tnurnberg@mysql.com +4 -0
    Bug#20432: mysql client interprets commands in comments
    test client-side parsing of comments and client-specific commands

  mysql-test/r/mysql_client.result@1.0, 2006-07-13 09:04:04+02:00, tnurnberg@mysql.com +0 -0

  mysql-test/t/mysql_client.test@1.1, 2006-07-13 09:04:04+02:00, tnurnberg@mysql.com +29 -0
    Bug#20432: mysql client interprets commands in comments
    test client-side parsing of comments and client-specific commands

  mysql-test/t/mysql_client.test@1.0, 2006-07-13 09:04:04+02:00, tnurnberg@mysql.com +0 -0

  client/mysql.cc@1.121.17.1, 2006-07-13 09:04:04+02:00, tnurnberg@mysql.com +1 -1
    Bug#20432: mysql client interprets commands in comments

ChangeSet@1.2181.160.1, 2006-07-12 20:38:17-04:00, mikael@dator5.(none) +3 -0
  BUG#20852: Using update with full table scan causes mysqld to enter an eternal loop

  mysql-test/r/partition_innodb.result@1.2.2.1, 2006-07-12 20:38:14-04:00, mikael@dator5.(none) +11 -0
    New test case

  mysql-test/t/partition_innodb.test@1.2.3.1, 2006-07-12 20:38:14-04:00, mikael@dator5.(none) +13 -0
    New test case

  sql/ha_partition.cc@1.60.4.1, 2006-07-12 20:38:14-04:00, mikael@dator5.(none) +2 -1
    Two more handler interface variables not taken care of

ChangeSet@1.1810.1922.1, 2006-07-12 16:33:29-07:00, jimw@rama.(none) +5 -0
  Bug #17608: String literals lost during INSERT query on FEDERATED table
  
    The Federated storage engine used Field methods that had arbitrary limits on
    the amount of data they could process, which caused problems with data
    over that limit (4K). By removing those Field methods and just using
    features of the String class, we can avoid this problem.

  mysql-test/r/federated.result@1.25.1.9, 2006-07-12 16:33:26-07:00, jimw@rama.(none) +13 -0
    Add new results

  mysql-test/t/federated.test@1.19.1.11, 2006-07-12 16:33:26-07:00, jimw@rama.(none) +18 -0
    Add new regression test

  sql/field.cc@1.256.1.59, 2006-07-12 16:33:26-07:00, jimw@rama.(none) +0 -98
    Remove unnecessary methods

  sql/field.h@1.153.1.31, 2006-07-12 16:33:26-07:00, jimw@rama.(none) +0 -2
    Remove unnecessary methods

  sql/ha_federated.cc@1.24.1.41, 2006-07-12 16:33:26-07:00, jimw@rama.(none) +21 -33
    Remove use of quote_data, use String::print() to get escaping of strings,
    and don't bother with needs_quotes, just always quote values.

ChangeSet@1.1810.1920.3, 2006-07-12 13:22:38-07:00, jimw@rama.(none) +3 -0
  Bug #17903: cast to char results in binary
  
    The character set was not being properly initialized in CAST() with
    a type like "CHAR(2) BINARY", which resulted in incorrect results or
    even a crash.

  mysql-test/r/cast.result@1.39.1.7, 2006-07-12 13:22:35-07:00, jimw@rama.(none) +11 -0
    Add new results

  mysql-test/t/cast.test@1.31.1.1, 2006-07-12 13:22:36-07:00, jimw@rama.(none) +13 -1
    Add new regression test

  sql/sql_yacc.yy@1.371.1.104, 2006-07-12 13:22:36-07:00, jimw@rama.(none) +1 -1
    Make sure Lex->charset is set to NULL when nothing follows BINARY
    in type declaration.

ChangeSet@1.1810.1921.1, 2006-07-12 12:30:22-07:00, jimw@rama.(none) +4 -0
  Bug #12673: Instance Manager: allows to stop the instance many times
  
    The instance manager was not actually checking whether an instance
    was actually running before trying to stop it. Now it checks first.

  mysql-test/r/im_life_cycle.result@1.3.1.4, 2006-07-12 12:30:19-07:00, jimw@rama.(none) +3 -0
    Add new results

  mysql-test/t/im_life_cycle.imtest@1.3.1.3, 2006-07-12 12:30:19-07:00, jimw@rama.(none) +8 -0
    Add new regression test

  server-tools/instance-manager/instance.cc@1.32.1.1, 2006-07-12 12:30:20-07:00, jimw@rama.(none) +23 -22
    Fix Instance::stop() to report ER_INSTANCE_IS_NOT_STARTED when that is
    the case. Also removed unnecessary goto.

  server-tools/instance-manager/messages.cc@1.5.1.1, 2006-07-12 12:30:20-07:00, jimw@rama.(none) +3 -3
    Fix messages with missing spaces

ChangeSet@1.1810.1920.2, 2006-07-12 19:19:43+04:00, kostja@bodhi.local +1 -0
  Fix a valgrind warning in type_date test.

  sql/item_timefunc.cc@1.100.1.19, 2006-07-12 19:19:41+04:00, kostja@bodhi.local +3 -2
    Fix a valgrind warning in type_date test.	

ChangeSet@1.1616.2693.1, 2006-07-12 10:26:19-04:00, cmiller@calliope.local +1 -0
  Bug#18470: Compile Failure: strings.s fails make with unknown pseudo-ops
  
  The bug is thqt we use some nonstandard assembly codes in our strings
  source, and some assemblers don't know what to do with them:  Specifically,
  Sun's Solaris assembler and Apple's Darwin assembler balk at them.
  
  This patch, rather than trying to test for properties of the assembler, 
  which Autoconf doesn't have any decent facilites for, instead tries to
  compile the code in question and disables assembly if it fails.
  
  There's still the problem of unportable assembly, but I'll leave that 
  to someone who feels like rewriting and debugging it.

  configure.in@1.201.68.1, 2006-07-12 10:26:11-04:00, cmiller@calliope.local +1 -1
    Actually try to compile the code in question, since a test for the CPU
    type is insufficient to determine whether our code will compile.

ChangeSet@1.2181.139.13, 2006-07-12 10:37:30+02:00, andrey@lmy004. +10 -0
  WL#3337 (Event scheduler new architecture)
  event_scheduler_ng.cc/h is no more

  BitKeeper/deleted/.del-event_scheduler_ng.cc~8896b89040dbc4f6@1.6, 2006-07-11 19:02:18+02:00, andrey@lmy004. +0 -881
    Delete: sql/event_scheduler_ng.cc

  BitKeeper/deleted/.del-event_scheduler_ng.h~1431af5b185376f@1.4, 2006-07-11 19:02:21+02:00, andrey@lmy004. +0 -123
    Delete: sql/event_scheduler_ng.h

  mysql-test/r/not_embedded_server.result@1.6, 2006-07-12 10:37:16+02:00, andrey@lmy004. +0 -1
    fix test

  sql/Makefile.am@1.149, 2006-07-12 10:37:16+02:00, andrey@lmy004. +2 -2
    event_scheduler_ng.cc/h is no more

  sql/event_queue.cc@1.8, 2006-07-12 10:37:16+02:00, andrey@lmy004. +2 -2
    event_scheduler_ng.cc/h is no more

  sql/event_queue.h@1.7, 2006-07-12 10:37:16+02:00, andrey@lmy004. +3 -3
    event_scheduler_ng.cc/h is no more

  sql/event_scheduler.cc@1.16, 2006-07-12 10:37:16+02:00, andrey@lmy004. +865 -0
    event_scheduler_ng.cc/h is no more

  sql/event_scheduler.h@1.12, 2006-07-12 10:37:16+02:00, andrey@lmy004. +104 -0
    event_scheduler_ng.cc/h is no more

  sql/events.cc@1.56, 2006-07-12 10:37:17+02:00, andrey@lmy004. +14 -14
    event_scheduler_ng.cc/h is no more

  sql/events.h@1.42, 2006-07-12 10:37:17+02:00, andrey@lmy004. +2 -2
    event_scheduler_ng.cc/h is no more

ChangeSet@1.1616.2692.2, 2006-07-12 10:57:38+03:00, gkodinov@macbook.gmz +3 -0
  Bug #17212 results not sorted correctly by ORDER BY when using index
    * don't use join cache when the incoming data set is already ordered
      for ORDER BY
      This choice must be made because join cache will effectively
      reverse the join order and the results will be sorted by the index
      of the table that uses join cache.

  mysql-test/t/innodb_mysql.test@1.3.3.1, 2006-07-12 10:57:31+03:00, gkodinov@macbook.gmz +33 -0
    Bug #17212 results not sorted correctly by ORDER BY when using index
      * Test suite for the bug

  mysql-test/r/innodb_mysql.result@1.3.3.1, 2006-07-12 10:57:30+03:00, gkodinov@macbook.gmz +29 -0
    Bug #17212 results not sorted correctly by ORDER BY when using index
      * Test suite for the bug

  sql/sql_select.cc@1.216.126.9, 2006-07-12 10:57:32+03:00, gkodinov@macbook.gmz +19 -1
    Bug #17212 results not sorted correctly by ORDER BY when using index
      * don't use join cache when the incoming data set is already sorted

ChangeSet@1.2181.156.6, 2006-07-12 08:52:47+02:00, mkindahl@dl145k.mysql.com +2 -0
  Post-merge fixes for mysql-5.1-new-rpl

  mysql-test/r/rpl_switch_stm_row_mixed.result@1.12, 2006-07-12 08:52:42+02:00, mkindahl@dl145k.mysql.com +0 -3
    Result change

  sql/sql_class.h@1.304.1.6, 2006-07-12 08:52:42+02:00, mkindahl@dl145k.mysql.com +2 -0
    Post-merge fixes.

ChangeSet@1.1810.1919.1, 2006-07-12 11:38:11+05:00, ramil@mysql.com +5 -0
  Fix for bug #19370: DateTime datatype in MySQL has two bugs in it

  mysql-test/r/date_formats.result@1.18.3.1, 2006-07-12 11:38:06+05:00, ramil@mysql.com +3 -1
    Fix for bug #19370: DateTime datatype in MySQL has two bugs in it
      - results adjusted

  mysql-test/r/strict.result@1.25.1.3, 2006-07-12 11:38:06+05:00, ramil@mysql.com +14 -6
    Fix for bug #19370: DateTime datatype in MySQL has two bugs in it
      - results adjusted

  mysql-test/r/type_datetime.result@1.30.1.1, 2006-07-12 11:38:06+05:00, ramil@mysql.com +3 -1
    Fix for bug #19370: DateTime datatype in MySQL has two bugs in it
      - results adjusted

  mysql-test/t/strict.test@1.19.1.3, 2006-07-12 11:38:06+05:00, ramil@mysql.com +16 -2
    Fix for bug #19370: DateTime datatype in MySQL has two bugs in it
      - tests adjusted

  sql-common/my_time.c@1.19.1.1, 2006-07-12 11:38:06+05:00, ramil@mysql.com +3 -1
    Fix for bug #19370: DateTime datatype in MySQL has two bugs in it
      - Regardless of the title of the bug the only real bug is that it
        doesn't make sense to have only some invalid parts in a date.
        E.g. a valid day among invalid years or months is totally ambiguous 
        and we should refuse to guess what it means.
    
        To fix it, we add a check that both the year is zero and either day
        or month are zero (year and (day or month)), and if they are then  we
        reject such dates. Doing so should adequately fix the reported problem.

ChangeSet@1.1810.1918.1, 2006-07-11 17:28:50-07:00, jimw@rama.(none) +5 -0
  Bug #17766: The server accepts to create MERGE tables which cannot work
  
   Changed the error reporting (and a crash) when inserting data into a
   MERGE table that has no underlying tables or no INSERT_METHOD specified
   by reporting that it is read-only.

  include/my_base.h@1.70.3.1, 2006-07-11 17:28:48-07:00, jimw@rama.(none) +2 -1
    Add new handler error

  mysql-test/r/merge.result@1.43.2.1, 2006-07-11 17:28:48-07:00, jimw@rama.(none) +12 -0
    Update results

  mysql-test/t/merge.test@1.37.2.1, 2006-07-11 17:28:48-07:00, jimw@rama.(none) +16 -1
    Add new regression test

  sql/handler.cc@1.167.17.1, 2006-07-11 17:28:48-07:00, jimw@rama.(none) +4 -0
    Handle new error message

  sql/ha_myisammrg.cc@1.59.4.1, 2006-07-11 17:28:48-07:00, jimw@rama.(none) +4 -0
    When trying to insert into a MERGE table with no underlying tables
    or no INSERT_METHOD, report that it is read-only.

ChangeSet@1.1616.2691.1, 2006-07-12 01:52:18+04:00, evgen@moonbone.local +3 -0
  Fixed bug#18503: Queries with a quantified subquery returning empty set
  may return a wrong result.
  
  An Item_sum_hybrid object has the was_values flag which indicates whether any
  values were added to the sum function. By default it is set to true and reset
  to false on any no_rows_in_result() call. This method is called only in
  return_zero_rows() function. An ALL/ANY subquery can be optimized by MIN/MAX
  optimization. The was_values flag is used to indicate whether the subquery
  has returned at least one row. This bug occurs because return_zero_rows() is
  called only when we know that the select will return zero rows before
  starting any scans but often such information is not known.
  In the reported case the return_zero_rows() function is not called and
  the was_values flag is not reset to false and yet the subquery return no rows
  Item_func_not_all and Item_func_nop_all functions return a wrong
  comparison result.
  
  The end_send_group() function now calls no_rows_in_result() for each item
  in the fields_list if there is no rows were found for the (sub)query.

  mysql-test/r/subselect.result@1.67.62.1, 2006-07-12 01:41:19+04:00, evgen@moonbone.local +15 -0
    Added test case for bug#18503: Queries with a quantified subquery returning empty set may return a wrong result.
    

  mysql-test/t/subselect.test@1.58.45.1, 2006-07-12 01:41:01+04:00, evgen@moonbone.local +14 -0
    Added test case for bug#18503: Queries with a quantified subquery returning empty set may return a wrong result.

  sql/sql_select.cc@1.216.128.1, 2006-07-12 01:41:22+04:00, evgen@moonbone.local +5 -0
    Fixed bug#18503: Queries with a quantified subquery returning empty set may return a wrong result.
    
    The end_send_group() function now calls no_rows_in_result() for each item
    in the fields_list if there is no matching rows were found.

ChangeSet@1.1810.1917.1, 2006-07-11 12:42:03-07:00, jimw@rama.(none) +1 -0
  Bug #17485: mysql client crashes when connecting to the Instance Manager
  
    Using \U or \u in a prompt with the mysql command-line client could
    crash when connecting to the instance manager, since it does not return
    information about the user when asked by the client. This is fixed by
    having the client use what it knowns about the user (or giving up and
    saying "(unknown)").

  client/mysql.cc@1.199.5.2, 2006-07-11 12:42:01-07:00, jimw@rama.(none) +4 -2
    init_username() may not retrieve a username (such as from the instance
    manager), in which case we fall back to what was specified on the command
    line (or .cnf file) or finally (unknown).

ChangeSet@1.1810.1906.15, 2006-07-11 23:39:51+04:00, kostja@bodhi.local +6 -0
  Post-merge fixes for Bug#19399 "Stored Procedures 'Lost Connection' 
  when dropping/creating tables"

  mysql-test/r/ps.result@1.56.1.13, 2006-07-11 23:39:48+04:00, kostja@bodhi.local +141 -126
    A post-merge fix.

  mysql-test/t/ps.test@1.56.1.11, 2006-07-11 23:39:48+04:00, kostja@bodhi.local +13 -15
    A post-merge fix: all 5.0 tests should go after 4.1 tests.

  sql/sql_lex.cc@1.142.1.50, 2006-07-11 23:39:48+04:00, kostja@bodhi.local +1 -1
    auxilliary -> auxiliary

  sql/sql_prepare.cc@1.142.1.38, 2006-07-11 23:39:48+04:00, kostja@bodhi.local +2 -2
    auxilliary -> auxiliary

  sql/table.cc@1.160.1.69, 2006-07-11 23:39:48+04:00, kostja@bodhi.local +15 -2
    Update st_table_list::reinit_before_use in 5.0 to include 5.0-specific
    cleanups.

  sql/table.h@1.102.1.29, 2006-07-11 23:39:48+04:00, kostja@bodhi.local +1 -1
    st_table_list::reinit_before_use is public.

ChangeSet@1.1616.2689.1, 2006-07-11 13:06:29-04:00, cmiller@zippy.(none) +3 -0
  Bug#20729: Bad date_format() call makes mysql server crash
      
  The problem is that the author used the wrong function to send a warning to the 
  user about truncation of data.  push_warning() takes a constant string and 
  push_warning_printf() takes a format and variable arguments to fill it.
  
  Since the string we were complaining about contains percent characters, the 
  printf() code interprets the "%Y" et c. that the user sends.  That's wrong, and
  often causes a crash, especially if the date mentions seconds, "%s".
  
  A alternate fix would be to use  push_warning_printf(..., "%s", warn_buff) .

  mysql-test/r/date_formats.result@1.15.2.1, 2006-07-11 13:06:28-04:00, cmiller@zippy.(none) +6 -0
    Test that an invalid date doesn't crash the server.  We should get a warning back 
    instead of a dead socket.

  mysql-test/t/date_formats.test@1.11.2.1, 2006-07-11 13:06:28-04:00, cmiller@zippy.(none) +7 -1
    Test that an invalid date doesn't crash the server.  We should get a warning back 
    instead of a dead socket.

  sql/time.cc@1.49.1.4, 2006-07-11 13:06:28-04:00, cmiller@zippy.(none) +1 -1
    Don't try to use warn_buf as the start of a varible arguement list to send 
    to a warning-formatted my_vsnprintf() .

ChangeSet@1.2181.139.12, 2006-07-11 18:28:15+02:00, andrey@lmy004. +15 -0
  WL#3337 (Event scheduler new architecture)
  More small fixes to the API : use LEX_STRING instead of LEX_STRING* and if error
  then return bool(true) instead of error code.
  Merged functions. Reduced usage of sp_name.
  Fixed a lot of function documentation errors.
  Added function documentation wherever needed.
  Removed some unused defines and error codes.
  
  Next to come is batch rename of Event_scheduler_ng to Event_scheduler.

  sql/event_scheduler_ng.cc@1.5, 2006-07-11 18:28:07+02:00, andrey@lmy004. +9 -3
    Always execute on thd->mem_root
    Fix according to changed API of Event_queue::get_top_for_execution_if_time()

  mysql-test/r/events.result@1.41, 2006-07-11 18:28:06+02:00, andrey@lmy004. +8 -0
    update result

  mysql-test/r/events_logs_tests.result@1.13, 2006-07-11 18:28:06+02:00, andrey@lmy004. +14 -11
    update result

  mysql-test/t/events.test@1.36, 2006-07-11 18:28:07+02:00, andrey@lmy004. +11 -0
    more test coverage

  mysql-test/t/events_logs_tests.test@1.13, 2006-07-11 18:28:07+02:00, andrey@lmy004. +9 -11
    fix test

  sql/event_data_objects.cc@1.70, 2006-07-11 18:28:07+02:00, andrey@lmy004. +107 -132
    Cosmetics.
    Fix function documentation whenever needed.
    Move Event_job_data::compile() next to Event_job_data::execute()

  sql/event_data_objects.h@1.10, 2006-07-11 18:28:07+02:00, andrey@lmy004. +16 -36
    Remove unneeded error codes and defines
    Move function declarations at the end of the header

  sql/event_db_repository.cc@1.11, 2006-07-11 18:28:07+02:00, andrey@lmy004. +63 -123
    Fix function documentation.
    Event_db_repository::update_event() now uses LEX_STRING *-s instead of
    sp_name . Lower coupling.

  sql/event_db_repository.h@1.8, 2006-07-11 18:28:07+02:00, andrey@lmy004. +9 -8
    Event_db_repository::update_event() now uses LEX_STRING *-s instead of
    sp_name . Lower coupling.
    find_event -> find_named_event
    find_event_by_name is not used externally, merge with load_named_event()

  sql/event_queue.cc@1.7, 2006-07-11 18:28:07+02:00, andrey@lmy004. +209 -162
    LEX_STRING* to LEX_STRING
    Fix comments.
    Fix and add function documentation.
    Remove Event_queue::events_count() as it is unused
    Change get_top_for_execution_if_time() to return status code as return value
    and the object is in out parameter.

  sql/event_queue.h@1.6, 2006-07-11 18:28:07+02:00, andrey@lmy004. +8 -9
    LEX_STRING* to LEX_STRING
    Fix comments.
    Fix and add function documentation.
    Remove Event_queue::events_count() as it is unused
    Change get_top_for_execution_if_time() to return status code as return value
    and the object is in out parameter.
    Try to detect also lock attemptions for deadlocks.

  sql/events.cc@1.55, 2006-07-11 18:28:07+02:00, andrey@lmy004. +61 -68
    Fix function documentation.
    Fix code after API changes of internal Event module classes.

  sql/events.h@1.41, 2006-07-11 18:28:07+02:00, andrey@lmy004. +2 -2
    sp_name -> LEX_STRINGs

  sql/sql_parse.cc@1.569, 2006-07-11 18:28:07+02:00, andrey@lmy004. +2 -1
    Fix according to changed API of Events::show_create_event()

  sql/sql_yacc.yy@1.489, 2006-07-11 18:28:07+02:00, andrey@lmy004. +2 -1
    Don't pass NULL as third parameter to sp_head::init_strings()

ChangeSet@1.1616.2566.8, 2006-07-11 17:07:23+02:00, pekka@orca.ndb.mysql.com +1 -0
  ndb - (4.1) trivial fix to error.log (wday=0 was printed as "x")

  ndb/src/kernel/error/TimeModule.cpp@1.2.1.1, 2006-07-11 17:06:09+02:00, pekka@orca.ndb.mysql.com +1 -1
    0=Sunday

ChangeSet@1.1810.1916.1, 2006-07-11 15:54:52+04:00, petr@mysql.com +3 -0
  Fix Bug#15205 "Select from CSV table without the datafile causes crash"

  mysql-test/r/csv.result@1.4.1.1, 2006-07-11 15:54:22+04:00, petr@mysql.com +10 -0
    update result file

  mysql-test/t/csv.test@1.5.1.1, 2006-07-11 15:54:22+04:00, petr@mysql.com +24 -0
    add a test for the bug

  sql/examples/ha_tina.cc@1.10.1.13, 2006-07-11 15:54:22+04:00, petr@mysql.com +8 -5
    move open() call before my_hash_insert, so that we don't insert invalid
    share to the hash. To avoid other possible problems also add
    hash_delete(), so that the share is removed from hash before it is freed.

ChangeSet@1.1810.1915.2, 2006-07-11 12:34:43+02:00, joerg@trift2. +1 -0
  Raise the version number.

  configure.in@1.245.51.9, 2006-07-11 12:34:40+02:00, joerg@trift2. +2 -2
    Raise the version number.

ChangeSet@1.1810.1907.7, 2006-07-10 19:50:40-07:00, jimw@rama.(none) +3 -0
  Bug #18539: uncompress(d) is null: impossible?
  
    The UNCOMPRESS() function was not marked as maybe_null, even though
    it returns NULL on invalid data. This confused the optimizer.

  mysql-test/r/func_compress.result@1.18, 2006-07-10 19:50:39-07:00, jimw@rama.(none) +28 -0
    Add new results

  mysql-test/t/func_compress.test@1.14, 2006-07-10 19:50:39-07:00, jimw@rama.(none) +14 -0
    Add new regression test

  sql/item_strfunc.h@1.101.4.1, 2006-07-10 19:50:39-07:00, jimw@rama.(none) +1 -1
    Set maybe_null within Item_func_uncompress::fix_length_and_dec()

ChangeSet@1.2181.139.11, 2006-07-10 23:54:46+02:00, andrey@lmy004. +5 -0
  Remove trailing whitespace.
  After merge fixes.

  sql/event_scheduler_ng.cc@1.4, 2006-07-10 23:54:35+02:00, andrey@lmy004. +3 -3
    Remove trailing whitespace.
    Tabs to spaces.

  sql/event_data_objects.cc@1.69, 2006-07-10 23:54:35+02:00, andrey@lmy004. +10 -52
    after merge fix. use thd->strmake instead of strmake_root
    Remove commented out code.
    Remove trailing whitespace.

  sql/event_db_repository.cc@1.10, 2006-07-10 23:54:35+02:00, andrey@lmy004. +12 -9
    After merge fix.
    Before closing thread tables check whether table is actuall non-NULL.
    And always initialize it to NULL.

  sql/event_queue.cc@1.6, 2006-07-10 23:54:35+02:00, andrey@lmy004. +5 -5
    Remove trailing whitespace.

  sql/events.cc@1.54, 2006-07-10 23:54:35+02:00, andrey@lmy004. +1 -1
    Remove trailing whitespace.

ChangeSet@1.1810.1906.11, 2006-07-11 01:46:44+04:00, kostja@bodhi.local +1 -0
  Fix yet another Windows build failure: "true" -> TRUE

  sql/sql_locale.cc@1.3, 2006-07-11 01:46:42+04:00, kostja@bodhi.local +14 -14
    "true" -> TRUE

ChangeSet@1.2181.158.1, 2006-07-10 17:08:42-04:00, mikael@dator5.(none) +4 -0
  BUG#20893: Valgrind error

  mysql-test/r/partition_mgm.result@1.5, 2006-07-10 17:08:21-04:00, mikael@dator5.(none) +12 -0
    Added new test case

  mysql-test/t/partition_mgm.test@1.5, 2006-07-10 17:08:21-04:00, mikael@dator5.(none) +15 -1
    Added new test case

  sql/ha_partition.cc@1.60.3.1, 2006-07-10 17:08:21-04:00, mikael@dator5.(none) +11 -4
    Fixed memory overwrite, added new variable for memory check
    Problem was when reorganising partitions, the file handles
    got in the wrong place.

  sql/ha_partition.h@1.22.2.1, 2006-07-10 17:08:21-04:00, mikael@dator5.(none) +1 -0
    Added new variable for debugging mostly

ChangeSet@1.1810.1868.17, 2006-07-10 22:49:44+02:00, joerg@trift2. +1 -0
  support-files/mysql.spec.sh  :    Fix a typing error.

  support-files/mysql.spec.sh@1.99.10.1, 2006-07-10 22:49:41+02:00, joerg@trift2. +6 -2
    Fix a typing error in the "make" target for the Perl script to run the tests.

ChangeSet@1.1810.1913.1, 2006-07-10 22:38:13+02:00, joerg@trift2. +1 -0
  Raise the version number.
  TAG: clone-5.0.24-build

  configure.in@1.245.56.1, 2006-07-10 22:37:32+02:00, joerg@trift2. +2 -2
    Raise the version number.

ChangeSet@1.1810.1912.1, 2006-07-10 16:38:03-04:00, cmiller@zippy.(none) +2 -0
  A patch to Bug#17667 didn't take into consideration that the vardir, which contains
  the server's binlog file, might be set to a different directory.  This adds a new
  "vardir" parameter, which takes the name of the directory as a value, so that the 
  test_bug17667() test can find the binlog.  

  mysql-test/mysql-test-run.pl@1.30.35.1, 2006-07-10 16:38:01-04:00, cmiller@zippy.(none) +1 -0
    Add the "vardir" to the options passed to "mysql_test_client", so we know 
    where to find the binlog file.

  tests/mysql_client_test.c@1.167.14.1, 2006-07-10 16:38:01-04:00, cmiller@zippy.(none) +13 -3
    Receive a new option, "vardir".
    
    Use the vardir option to find the binlog file in test_bug17667() .

ChangeSet@1.1616.2687.1, 2006-07-11 00:34:37+04:00, evgen@moonbone.local +3 -0
  Fixed bug#16302: Quantified subquery without any tables gives wrong results
  
  The ALL/ANY subqueries are the subject of MIN/MAX optimization. The matter
  of this optimization is to embed MIN() or MAX() function into the subquery
  in order to get only one row by which we can tell whether the expression
  with ALL/ANY subquery is true or false.
  But when it is applied to a subquery like 'select a_constant' the reported bug
  occurs. As no tables are specified in the subquery the do_select() function 
  isn't called for the optimized subquery and thus no values have been added 
  to a MIN()/MAX() function and it returns NULL instead of a_constant.
  This leads to a wrong query result.
  
  For the subquery like 'select a_constant' there is no reason to apply
  MIN/MAX optimization because the subquery anyway will return at most one row.
  Thus the Item_maxmin_subselect class is more appropriate for handling such
  subqueries.
  
  The Item_in_subselect::single_value_transformer() function now checks
  whether tables are specified for the subquery. If no then this subselect is
  handled like a UNION using an Item_maxmin_subselect object.

  mysql-test/r/subselect.result@1.67.1.109, 2006-07-11 00:21:47+04:00, evgen@moonbone.local +18 -0
    Added test case for bug#16302: Quantified subquery without any tables gives wrong results

  mysql-test/t/subselect.test@1.58.1.96, 2006-07-11 00:21:29+04:00, evgen@moonbone.local +10 -0
    Added test case for bug#16302: Quantified subquery without any tables gives wrong results

  sql/item_subselect.cc@1.60.1.81, 2006-07-11 00:22:03+04:00, evgen@moonbone.local +2 -1
    Fixed bug#16302: Quantified subquery without any tables gives wrong results
     
    The Item_in_subselect::single_value_transformer() function now checks
    whether tables are specified for the subquery. If no then this subselect is
    handled like a UNION using an Item_maxmin_subselect object.

ChangeSet@1.1810.1906.10, 2006-07-10 23:58:36+04:00, kostja@bodhi.local +1 -0
  Fix a Windows build failure. 

  sql/sql_locale.cc@1.2, 2006-07-10 23:58:34+04:00, kostja@bodhi.local +95 -95
    Fix Windows compilation failure "cannot convert from 'const char [6]' 
    to 'const BOOL'" and an apparent bug (use of "FALSE" instead of FALSE
    for initialization of is_ascii member of MY_LOCALE)

ChangeSet@1.2181.147.7, 2006-07-10 11:57:29-07:00, patg@govinda.patg.net +1 -0
  Small fix to mysql-5.1-engines, from merge from BUG #19773

  sql/ha_federated.h@1.32, 2006-07-10 11:57:13-07:00, patg@govinda.patg.net +1 -1
    Small fix to mysql-5.1-engines, from merge from BUG #19773

ChangeSet@1.1810.1868.15, 2006-07-10 20:46:05+02:00, ingo@chilla.local +8 -0
  Revoking patch for Bug#10952 on behalf of Brian.

  mysql-test/t/blackhole.test@1.4.4.1, 2006-07-10 20:46:03+02:00, ingo@chilla.local +0 -12
    Revoking patch for Bug#10952 on behalf of Brian.

  mysql-test/r/blackhole.result@1.5.4.1, 2006-07-10 20:46:02+02:00, ingo@chilla.local +0 -8
    Revoking patch for Bug#10952 on behalf of Brian.

  mysql-test/r/merge.result@1.43.1.6, 2006-07-10 20:46:03+02:00, ingo@chilla.local +0 -8
    Revoking patch for Bug#10952 on behalf of Brian.

  mysql-test/t/merge.test@1.37.1.5, 2006-07-10 20:46:03+02:00, ingo@chilla.local +0 -10
    Revoking patch for Bug#10952 on behalf of Brian.

  sql/handler.h@1.138.11.2, 2006-07-10 20:46:03+02:00, ingo@chilla.local +0 -1
    Revoking patch for Bug#10952 on behalf of Brian.

  sql/sql_table.cc@1.239.32.1, 2006-07-10 20:46:03+02:00, ingo@chilla.local +1 -3
    Revoking patch for Bug#10952 on behalf of Brian.

  sql/ha_blackhole.cc@1.21.2.1, 2006-07-10 20:46:03+02:00, ingo@chilla.local +1 -1
    Revoking patch for Bug#10952 on behalf of Brian.

  sql/ha_myisammrg.cc@1.59.1.19, 2006-07-10 20:46:03+02:00, ingo@chilla.local +1 -1
    Revoking patch for Bug#10952 on behalf of Brian.

ChangeSet@1.2181.120.15, 2006-07-10 18:41:03+02:00, guilhem@gbichot3.local +18 -0
  fixes after merge. Updates to test's results.
  We now reset the THD members related to auto_increment+binlog in
  MYSQL_LOG::write(). This is better than in THD::cleanup_after_query(),
  which was not able to distinguish between SELECT myfunc1(),myfunc2()
  and INSERT INTO t SELECT myfunc1(),myfunc2() from a binlogging point
  of view.
  Rows_log_event::exec_event() now calls lex_start() instead of
  mysql_init_query() because the latter now does too much (it resets
  the binlog format).

  mysql-test/extra/rpl_tests/rpl_insert_id.test@1.9, 2006-07-10 18:40:58+02:00, guilhem@gbichot3.local +1 -1
    fix after merge

  mysql-test/mysql-test-run.pl@1.122.3.4, 2006-07-10 18:40:58+02:00, guilhem@gbichot3.local +1 -1
    -v does not bring useful information when running valgrind; I remove it;
    if you think it's useful add it back.

  mysql-test/r/binlog_stm_mix_innodb_myisam.result@1.32, 2006-07-10 18:40:58+02:00, guilhem@gbichot3.local +95 -95
    Position columns of SHOW BINLOG EVENTS are replaced by # (more robust
    if the size of an event changes).

  mysql-test/r/rpl_insert_id.result@1.18, 2006-07-10 18:40:58+02:00, guilhem@gbichot3.local +36 -36
    fix after merge

  mysql-test/r/rpl_loaddata.result@1.31.1.2, 2006-07-10 18:40:58+02:00, guilhem@gbichot3.local +3 -3
    The binlog positions change, because one event disappeared; indeed there
    was this in the binlog (in the current 5.1!):
    SET INSERT_ID=2;
    SET INSERT_ID=1;
    SET TIMESTAMP=1152540671;
    load data LOCAL INFILE '/tmp/SQL_LOAD_MB-1-2' INTO table t1;
    Two INSERT_ID events, useless and a bug. Goes away afer cleaning up
    auto_increment handling.

  mysql-test/r/rpl_switch_stm_row_mixed.result@1.11, 2006-07-10 18:40:58+02:00, guilhem@gbichot3.local +19 -13
    INSERT_ID=5 appears, it's a consequence of having merged the fix
    for BUG#20341
    "stored function inserting into one auto_increment puts bad data in slave".
    In mixed mode, if one substatement of a stored procedure requires row-based,
    the entire procedure uses row-based (was already true for stored functions);
    this is a consequence of not doing the resetting of binlog format inside
    lock_tables() (which didn't work with how the slave thread executes
    row-based binlog events).

  mysql-test/t/rpl_switch_stm_row_mixed.test@1.9, 2006-07-10 18:40:58+02:00, guilhem@gbichot3.local +4 -8
    removing the multi-row delayed insert because in RBR the number of events
    which it generates, is not repeatable (probably depends on how the delayed
    thread groups rows, i.e. dependent on timing).

  sql/ha_partition.cc@1.60.2.1, 2006-07-10 18:40:58+02:00, guilhem@gbichot3.local +1 -1
    update to new prototype

  sql/ha_partition.h@1.22.1.1, 2006-07-10 18:40:58+02:00, guilhem@gbichot3.local +1 -1
    update to new prototype of the handler:: method.

  sql/handler.cc@1.250, 2006-07-10 18:40:58+02:00, guilhem@gbichot3.local +58 -4
    after-merge fixes (manually merging part which was hard to merge in fmtool)

  sql/log.cc@1.218.1.2, 2006-07-10 18:40:58+02:00, guilhem@gbichot3.local +3 -0
    When we write to the binary log, THD's parameters which influenced this
    write are reset: stmt_depends_on_first_successful_insert_id_in_prev_stmt
    and auto_inc_intervals_in_cur_stmt_for_binlog. This is so that future
    writes are not influenced by those and can write their own values.
    As a consequence, when we don't write to the binlog we do not reset.
    This is to abide by the rule that in a complex statement (using triggers etc),
    the first top- or substatement to generate auto_increment ids
    wins their writing to the binlog (that writing may be done by the statement
    itself or by the caller); so for example for
    INSERT INTO t SELECT myfunc() where myfunc() inserts into auto_increment
    and INSERT INTO t does not, myfunc() will fill
    auto_inc_intervals_in_cur_stmt_for_binlog, which will not be reset when
    myfunc() ends, then INSERT INTO t will write to the binlog and thus
    write the preserved auto_inc_intervals_in_cur_stmt_for_binlog.

  sql/log_event.cc@1.230.2.3, 2006-07-10 18:40:59+02:00, guilhem@gbichot3.local +9 -9
    mysql_init_query() does too much now to be called in Rows_log_event::exec_event
    (it call mysql_reset_thd_for_next_command() which may switch
    the binlog format now).
    It's ok to call it in Table_map_log_event::exec_event() but its call must
    be before setting the binlog format to "row".

  sql/sql_base.cc@1.332.1.4, 2006-07-10 18:40:59+02:00, guilhem@gbichot3.local +0 -4
    Resetting the binlog format in lock_tables() was a bad idea of mine;
    it causes problems in execution of row-based binlog events, where
    the thread sets the binlog format by itself and does not want a next
    lock_tables() to reset the binlog format.
    It is also misleading, for a function named lock_tables(), to reset
    the binlog format.
    As a consequence of this change, in mixed binlogging mode, a routine
    is logged either entirely statement-based or entirely row-based, we
    don't switch in the middle (this was already true for prelocked routines,
    now it's also true for stored procedures).

  sql/sql_class.cc@1.274, 2006-07-10 18:40:59+02:00, guilhem@gbichot3.local +0 -12
    resetting of auto_increment variables used for binlogging is now done
    when writing to the binary log, no need to do the resetting at the end
    of the statement. It is also more correct this way; consider
    SELECT myfunc1(),myfunc2();
    where both functions insert into the same auto_increment column.
    Binlogging is done in 2 events: "SELECT myfunc1()" and "SELECT myfunc2()".
    So each of those needs to have, in binlog, the INSERT_ID which
    it inserted. But as the 2 function calls are executed under prelocked mode,
    the old code didn't reset auto_inc_intervals_in_cur_stmt_for_binlog
    after the first SELECT was binlogged, and so the INSERT_ID of the first
    SELECT was binlogged for the first SELECT and (wrong) also for the 2nd
    SELECT event.
    stmt_depends_on_first_... has the same logic.

  sql/sql_class.h@1.304.1.4, 2006-07-10 18:40:59+02:00, guilhem@gbichot3.local +3 -2
    clearer comment

  sql/sql_delete.cc@1.186.1.1, 2006-07-10 18:40:59+02:00, guilhem@gbichot3.local +2 -2
    unneeded #ifdef. As we temporarily change the binlog format to "statement"
    before calling mysql_delete(), we must restore it afterwards.

  sql/sql_insert.cc@1.207.1.7, 2006-07-10 18:40:59+02:00, guilhem@gbichot3.local +5 -4
    after-merge fixes.
    No need to reset auto_inc_intervals_in_cur_stmt_for_binlog for every
    row in the delayed insert system thread, because we already reset it
    when writing to the binlog.

  sql/sql_parse.cc@1.565.3.3, 2006-07-10 18:40:59+02:00, guilhem@gbichot3.local +4 -3
    unneeded #ifdef

ChangeSet@1.1810.1885.7, 2006-07-10 17:45:09+03:00, gkodinov@macbook.gmz +2 -0
  more 4.1->5.0 merge fixes for bug#14553

  mysql-test/r/rpl_insert_id.result@1.12.4.2, 2006-07-10 17:45:00+03:00, gkodinov@macbook.gmz +1 -1
    more merge fixes for bug#14553

  mysql-test/t/rpl_insert_id.test@1.13.2.2, 2006-07-10 17:45:01+03:00, gkodinov@macbook.gmz +0 -1
    more merge fixes for bug#14553

ChangeSet@1.2181.156.3, 2006-07-10 15:43:47+02:00, pekka@orca.ndb.mysql.com +1 -0
  ndb - debug stuff in LQH

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.115.1.1, 2006-07-10 15:43:09+02:00, pekka@orca.ndb.mysql.com +9 -2
    dont mess up signal log, also changed w+ to a

ChangeSet@1.1616.2686.1, 2006-07-10 16:27:03+03:00, gkodinov@mysql.com +7 -0
  BUG#14553: NULL in WHERE resets LAST_INSERT_ID
  
  To make MySQL compatible with some ODBC applications, you can find
  the AUTO_INCREMENT value for the last inserted row with the following query:
   SELECT * FROM tbl_name WHERE auto_col IS NULL.
  This is done with a special code that replaces 'auto_col IS NULL' with
  'auto_col = LAST_INSERT_ID'.
  However this also resets the LAST_INSERT_ID to 0 as it uses it for a flag
  so as to ensure that only the first SELECT ... WHERE auto_col IS NULL
  after an INSERT has this special behaviour.
  In order to avoid resetting the LAST_INSERT_ID a special flag is introduced
  in the THD class. This flag is used to restrict the second and subsequent
  SELECTs instead of LAST_INSERT_ID.

  mysql-test/r/odbc.result@1.8.1.1, 2006-07-10 16:27:01+03:00, gkodinov@mysql.com +11 -0
    test suite for the bug

  mysql-test/r/rpl_insert_id.result@1.10.1.2, 2006-07-10 16:27:01+03:00, gkodinov@mysql.com +14 -0
    test for the fix in replication

  mysql-test/t/odbc.test@1.7, 2006-07-10 16:27:01+03:00, gkodinov@mysql.com +10 -0
    test suite for the bug

  mysql-test/t/rpl_insert_id.test@1.9.1.3, 2006-07-10 16:27:01+03:00, gkodinov@mysql.com +19 -1
    test for the fix in replication

  sql/sql_class.cc@1.105.37.2, 2006-07-10 16:27:01+03:00, gkodinov@mysql.com +1 -0
    initialize the flag

  sql/sql_class.h@1.146.56.1, 2006-07-10 16:27:01+03:00, gkodinov@mysql.com +3 -0
    flag's declaration and set code when setting the last_insert_id

  sql/sql_select.cc@1.216.127.1, 2006-07-10 16:27:01+03:00, gkodinov@mysql.com +2 -2
    the special flag is used instead of last_insert_id

ChangeSet@1.1810.1906.9, 2006-07-10 16:22:42+04:00, kostja@bodhi.local +2 -0
  Fix test results to be vardir-independent.

  mysql-test/r/myisam.result@1.71.1.8, 2006-07-10 16:22:39+04:00, kostja@bodhi.local +0 -8
    Fix test results.

  mysql-test/t/myisam.test@1.55.1.6, 2006-07-10 16:22:39+04:00, kostja@bodhi.local +4 -0
    In 5.0 show create table also outputs data directory.
    For the test for Bug#8706 it's MYSQLTEST_VARDIR, and there is no way
    to replace it with anything else in test output.

ChangeSet@1.1810.1775.4, 2006-07-10 13:59:13+02:00, pekka@orca.ndb.mysql.com +6 -0
  ndb - bug#18781: close a tiny window (re-commit, try to by-pass merge jam)

  ndb/src/kernel/blocks/dbdict/DictLock.txt@1.2.1.1, 2006-07-10 13:57:54+02:00, pekka@orca.ndb.mysql.com +8 -4
    wait until SL_STARTED before sending DICT_UNLOCK_ORD

  ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.8.5.1, 2006-07-10 13:57:54+02:00, pekka@orca.ndb.mysql.com +3 -0
    wait until SL_STARTED before sending DICT_UNLOCK_ORD

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.24.38.1, 2006-07-10 13:57:55+02:00, pekka@orca.ndb.mysql.com +22 -18
    wait until SL_STARTED before sending DICT_UNLOCK_ORD

  ndb/src/kernel/vm/SimulatedBlock.cpp@1.17.8.1, 2006-07-10 13:57:55+02:00, pekka@orca.ndb.mysql.com +9 -0
    wait until SL_STARTED before sending DICT_UNLOCK_ORD

  ndb/src/kernel/vm/SimulatedBlock.hpp@1.11.7.1, 2006-07-10 13:57:55+02:00, pekka@orca.ndb.mysql.com +1 -0
    wait until SL_STARTED before sending DICT_UNLOCK_ORD

  ndb/test/run-test/daily-basic-tests.txt@1.27.14.1, 2006-07-10 13:57:55+02:00, pekka@orca.ndb.mysql.com +4 -0
    wait until SL_STARTED before sending DICT_UNLOCK_ORD

ChangeSet@1.2181.98.8, 2006-07-10 13:44:43+02:00, andrey@lmy004. +21 -0
  WL#3337 (Event scheduler new architecture)
  This patch introduces specialized Event data objects
  Event_basic as parent.
  Event_queue_element used for queue storage
  Event_timed used for SHOW EVENTS/ I_S.EVENTS / SHOW CREATE EVENT
  Event_job_data using during execution.
  Methods were moved out of Event_timed to other classes.
  
  This patch also introduces Events::LOCK_event_metadata.
  This patch gives new implementation of Events::dump_internal_status().
  Now both the Event_scheduler and Event_queue return information during
  their ::dump_internal_status().
  
  Shortened a bit the runtime for executing events test cases.

  sql/event_scheduler_ng.cc@1.3, 2006-07-10 13:44:33+02:00, andrey@lmy004. +365 -90
    Add back Event_scheduler::cond_wait()
    Add back Event_scheduler::dump_internal_status()
    Using Event_job_data for execution. Make the scheduler thread unkillable (thd->command= COM_DAEMON).
    Add a lot of documentation.

  sql/event_scheduler_ng.h@1.3, 2006-07-10 13:44:33+02:00, andrey@lmy004. +10 -4
    Add back Event_scheduler::cond_wait()
    Add back Event_scheduler::dump_internal_status()
    Using Event_job_data for execution.

  mysql-test/r/events.result@1.40, 2006-07-10 13:44:32+02:00, andrey@lmy004. +6 -3
    update results

  mysql-test/r/events_bugs.result@1.15, 2006-07-10 13:44:32+02:00, andrey@lmy004. +32 -16
    update results

  mysql-test/r/events_logs_tests.result@1.10.1.1, 2006-07-10 13:44:32+02:00, andrey@lmy004. +5 -5
    update results

  mysql-test/r/events_scheduling.result@1.5, 2006-07-10 13:44:32+02:00, andrey@lmy004. +1 -1
    update results

  mysql-test/t/events.test@1.35, 2006-07-10 13:44:32+02:00, andrey@lmy004. +10 -6
    update test
    make --sleep more appropriate . saving some time could mean failure on loaded boxes though :(
    add tests for previously uncovered branches.

  mysql-test/t/events_bugs.test@1.12, 2006-07-10 13:44:33+02:00, andrey@lmy004. +34 -13
    update test
    make --sleep more appropriate . saving some time could mean failure on loaded boxes though :(
    add tests for previously uncovered branches.

  mysql-test/t/events_logs_tests.test@1.10.1.1, 2006-07-10 13:44:33+02:00, andrey@lmy004. +7 -8
    make the test shorter by time

  mysql-test/t/events_scheduling.test@1.7, 2006-07-10 13:44:33+02:00, andrey@lmy004. +1 -1
    when selecting always use ORDER BY

  mysql-test/t/events_stress.test@1.6.1.2, 2006-07-10 13:44:33+02:00, andrey@lmy004. +2 -2
    sleep 2.5secs for shorter stress test

  sql/event_data_objects.cc@1.67, 2006-07-10 13:44:33+02:00, andrey@lmy004. +535 -231
    Event_timed is no more used during execution.
    Event_timed is no more used during in the memory queue.
    Event_timed is only used for SHOW CREATE EVENT/ I_S.EVENTS/ SHOW EVENTS
    Event_basic is the parent of almost all Event data objects.
    Event_basic -> Event_queue_element (used for the memory queue) -> Event_timed
    Event_basic -> Event_job_data (the object used for execution)
    Sql_alloc -> Event_parse_data (used during parsing)

  sql/event_data_objects.h@1.9, 2006-07-10 13:44:33+02:00, andrey@lmy004. +117 -85
    Event_timed is no more used during execution.
    Event_timed is no more used during in the memory queue.
    Event_timed is only used for SHOW CREATE EVENT/ I_S.EVENTS/ SHOW EVENTS
    Event_basic is the parent of almost all Event data objects.
    Event_basic -> Event_queue_element (used for the memory queue) -> Event_timed
    Event_basic -> Event_job_data (the object used for execution)
    Sql_alloc -> Event_parse_data (used during parsing)

  sql/event_db_repository.cc@1.9, 2006-07-10 13:44:33+02:00, andrey@lmy004. +171 -354
    Cosmetics.
    load_named_event now uses Event_basic, for polymorphism
    find_event uses Event_basic, to be polymorphic.
    use Field **fields= table->field and then index fields[...]
    Add documentation.
    Fix documentation.

  sql/event_db_repository.h@1.7, 2006-07-10 13:44:33+02:00, andrey@lmy004. +3 -26
    Event_db_repository depends only on Event_basic's interface

  sql/event_queue.cc@1.5, 2006-07-10 13:44:33+02:00, andrey@lmy004. +365 -288
    Cosmetics.
    Don't use Event_timed for the queue and giving back object for execution.
    Event_queue_element is for the queue, Event_job_data is for execution.
    Add Event_queue::dump_internal_status() for SHOW SCHEDULER STATUS command

  sql/event_queue.h@1.5, 2006-07-10 13:44:33+02:00, andrey@lmy004. +18 -31
    Cosmetics.
    Don't use Event_timed for the queue and giving back object for execution.
    Event_queue_element is for the queue, Event_job_data is for execution.
    Add Event_queue::dump_internal_status() for SHOW SCHEDULER STATUS command

  sql/events.cc@1.52, 2006-07-10 13:44:33+02:00, andrey@lmy004. +152 -76
    Documentation
    Add LOCK_event_metadata

  sql/events.h@1.40, 2006-07-10 13:44:33+02:00, andrey@lmy004. +11 -6
    Change the signature of Events::drop_event() not to use sp_name but LEX_STRING

  sql/share/errmsg.txt@1.115, 2006-07-10 13:44:33+02:00, andrey@lmy004. +1 -1
    Fix error message

  sql/sql_parse.cc@1.563.1.6, 2006-07-10 13:44:33+02:00, andrey@lmy004. +6 -2
    Events::drop_event() has new signature

ChangeSet@1.1810.1775.3, 2006-07-10 13:44:15+02:00, pekka@orca.ndb.mysql.com +5 -0
  ndb - bug#18781 : 5.0 : add NODE_START_REP from 5.1 (re-commit, try to by-pass merge jam)

  ndb/include/kernel/GlobalSignalNumbers.h@1.7.8.1, 2006-07-10 13:42:38+02:00, pekka@orca.ndb.mysql.com +1 -0
    5.0 : add NODE_START_REP from 5.1

  ndb/src/common/debugger/signaldata/SignalNames.cpp@1.6.4.1, 2006-07-10 13:42:38+02:00, pekka@orca.ndb.mysql.com +2 -0
    5.0 : add NODE_START_REP from 5.1

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@1.14.12.1, 2006-07-10 13:42:38+02:00, pekka@orca.ndb.mysql.com +7 -0
    5.0 : add NODE_START_REP from 5.1

  ndb/src/kernel/vm/SimulatedBlock.cpp@1.17.7.1, 2006-07-10 13:42:38+02:00, pekka@orca.ndb.mysql.com +6 -0
    5.0 : add NODE_START_REP from 5.1

  ndb/src/kernel/vm/SimulatedBlock.hpp@1.11.6.1, 2006-07-10 13:42:38+02:00, pekka@orca.ndb.mysql.com +1 -0
    5.0 : add NODE_START_REP from 5.1

ChangeSet@1.1810.1906.8, 2006-07-10 14:53:49+04:00, kostja@bodhi.local +1 -0
  A post-merge fix (Bug#8706 "temporary table with data directory option 
  fails"

  mysql-test/t/myisam.test@1.55.1.5, 2006-07-10 14:53:47+04:00, kostja@bodhi.local +2 -2
    Fix myisam.test to work with non-default mysqltest var directory.

ChangeSet@1.1810.1906.7, 2006-07-10 14:30:17+04:00, kostja@bodhi.local +4 -0
  Add sql_locale.cpp to our windows build scripts.

  VC++Files/libmysqld/libmysqld.dsp@1.27.1.4, 2006-07-10 14:30:14+04:00, kostja@bodhi.local +4 -0
    Add sql_locale.cpp

  VC++Files/libmysqld/libmysqld.vcproj@1.2.2.3, 2006-07-10 14:30:14+04:00, kostja@bodhi.local +36 -0
    Add sql_locale.cpp

  VC++Files/sql/mysqld.dsp@1.36.2.1, 2006-07-10 14:30:14+04:00, kostja@bodhi.local +4 -0
    Add sql_locale.cpp

  VC++Files/sql/mysqld.vcproj@1.3.2.2, 2006-07-10 14:30:14+04:00, kostja@bodhi.local +75 -0
    Add sql_locale.cpp

ChangeSet@1.1810.1911.1, 2006-07-10 12:13:45+02:00, pekka@orca.ndb.mysql.com +1 -0
  ndb - bug#20847: non-debug compile fix (repeat since cannot merge 4.1->5.0)

  ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.12.3.2, 2006-07-10 12:12:42+02:00, pekka@orca.ndb.mysql.com +4 -0
    non-debug compile fix

ChangeSet@1.2181.155.1, 2006-07-10 12:06:30+02:00, mats@romeo.(none) +1 -0
  Fixing problem where the command line for MYSQL_DUMP_SLAVE was not
  set properly.

  mysql-test/mysql-test-run.pl@1.122.4.1, 2006-07-10 12:06:26+02:00, mats@romeo.(none) +13 -8
    Fixing problem where the command line for MYSQL_DUMP_SLAVE was not
    set properly.

ChangeSet@1.1616.2675.5, 2006-07-10 12:05:51+02:00, pekka@orca.ndb.mysql.com +1 -0
  ndb - bug#20847: non-debug compile fix

  ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.7.1.3, 2006-07-10 12:04:48+02:00, pekka@orca.ndb.mysql.com +4 -0
    non-debug compile fix

ChangeSet@1.1810.1909.2, 2006-07-10 12:03:44+02:00, joerg@trift2. +1 -0
  support-files/mysql.spec.sh  :    Fix a typing error.

  support-files/mysql.spec.sh@1.99.1.49, 2006-07-10 12:03:41+02:00, joerg@trift2. +6 -2
    Fix a typing error in the "make" target for the Perl script to run the tests.

ChangeSet@1.1810.1908.1, 2006-07-10 11:09:32+02:00, pekka@orca.ndb.mysql.com +1 -0
  mysql-test/Makefile.am: fix cp of mode 444 files (re-commit)

  mysql-test/Makefile.am@1.66.2.1, 2006-07-10 11:07:38+02:00, pekka@orca.ndb.mysql.com +5 -5
    fix cp of mode 444 files

ChangeSet@1.1616.2685.1, 2006-07-10 00:26:26+03:00, aelkin@dsl-hkigw8-feb1fb00-100.dhcp.inet.fi +1 -0
  BUG#20919 temp tables closing fails when binlog is off
  closing temp tables through end_thread
  had a flaw in binlog-off branch of close_temporary_tables where
  next table to close was reset via table->next
   for (table= thd->temporary_tables; table; table= table->next)
  which was wrong since the current table instance got destoyed at
  	close_temporary(table, 1);
  
  The fix adapts binlog-on branch method to engage the loop's internal 'next' variable which holds table->next prior table's destoying.
  

  sql/sql_base.cc@1.145.1.127, 2006-07-10 00:26:24+03:00, aelkin@dsl-hkigw8-feb1fb00-100.dhcp.inet.fi +5 -3
    no-binlog branch is fixed: scanning across temporary_tables must be careful to save next table since the current is being destroyed inside of close_temporary. 
    binlog-is-open case is ok.

ChangeSet@1.2181.154.7, 2006-07-09 21:39:21+02:00, guilhem@gbichot3.local +2 -0
  post-merge test/result fixes.

  mysql-test/r/rpl_switch_stm_row_mixed.result@1.10, 2006-07-09 21:39:17+02:00, guilhem@gbichot3.local +23 -36
    post-merge fix

  mysql-test/t/rpl_switch_stm_row_mixed.test@1.8, 2006-07-09 21:39:17+02:00, guilhem@gbichot3.local +3 -4
    post-merge fix (and no need to use a table t12 in some place).

ChangeSet@1.2181.154.5, 2006-07-09 21:11:52+02:00, guilhem@gbichot3.local +2 -0
  fixes in test results (using # for positions in SHOW BINLOG EVENTS).

  mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test@1.31, 2006-07-09 21:11:49+02:00, guilhem@gbichot3.local +14 -13
    As in other tests, we should replace both position columns of SHOW BINLOG
    EVENTS; otherwise a small change (like here, the fact that CREATE TEMPORARY
    TABLE is not binlogged in RBR as a consequence of the bugfix for BUG#20522)
    causes a large diff in the result file.

  mysql-test/r/binlog_row_mix_innodb_myisam.result@1.12, 2006-07-09 21:11:49+02:00, guilhem@gbichot3.local +138 -166
    result update: positions in SHOW BINLOG EVENTS become #, and
    the CREATE TEMPORARY TABLE disappear from binlog (consequence of fix for
    BUG#20522 "RBR: CREATE TEMPORARY TABLE SELECT writes to binlog though
    unneeded").

ChangeSet@1.2181.154.4, 2006-07-09 19:47:54+02:00, guilhem@gbichot3.local +2 -0
  post-merge fixes

  mysql-test/r/rpl_switch_stm_row_mixed.result@1.8, 2006-07-09 19:47:50+02:00, guilhem@gbichot3.local +2 -0
    result update.
    I noticed the appearance of an additional table_map+rows in the binlog
    when INSERT DELAYED, since I pulled the latest fixes to RBR of 
    INSERT DELAYED. This is ok, I put the reason why into sql_insert.cc.

  sql/sql_insert.cc@1.207.1.5, 2006-07-09 19:47:50+02:00, guilhem@gbichot3.local +13 -18
    A comment about the new row-based binlogging of INSERT DELAYED.
    Removing duplicate MY_HOOKS (from a wrong merge of the past??).

ChangeSet@1.2181.154.2, 2006-07-09 18:45:16+02:00, guilhem@gbichot3.local +3 -0
  Manual merge of test from 5.0 (needs to be manual because the test files
  were copied/split between 5.0 and 5.1).

  mysql-test/extra/rpl_tests/rpl_auto_increment.test@1.5, 2006-07-09 18:45:12+02:00, guilhem@gbichot3.local +39 -1
    manual merge of test from 5.0

  mysql-test/extra/rpl_tests/rpl_insert_id.test@1.6.1.1, 2006-07-09 18:45:12+02:00, guilhem@gbichot3.local +63 -0
    manuel merge of test from 5.0

  mysql-test/r/rpl_auto_increment.result@1.7, 2006-07-09 18:45:12+02:00, guilhem@gbichot3.local +3 -3
    error messages changed compared to 5.0

ChangeSet@1.2181.153.1, 2006-07-09 17:52:19+02:00, guilhem@gbichot3.local +30 -0
  WL#3146 "less locking in auto_increment":
  this is a cleanup patch for our current auto_increment handling:
  new names for auto_increment variables in THD, new methods to manipulate them
  (see sql_class.h), some move into handler::, causing less backup/restore
  work when executing substatements. 
  This makes the logic hopefully clearer, less work is is needed in
  mysql_insert().
  By cleaning up, using different variables for different purposes (instead
  of one for 3 things...), we fix those bugs, which someone may want to fix
  in 5.0 too:
  BUG#20339 "stored procedure using LAST_INSERT_ID() does not replicate
  statement-based"
  BUG#20341 "stored function inserting into one auto_increment puts bad
  data in slave"
  BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE"
  (now if a row is updated, LAST_INSERT_ID() will return its id)
  and re-fixes:
  BUG#6880 "LAST_INSERT_ID() value changes during multi-row INSERT"
  (already fixed differently by Ramil in 4.1)
  Test of documented behaviour of mysql_insert_id() (there was no test).
  The behaviour changes introduced are:
  - LAST_INSERT_ID() now returns "the first autogenerated auto_increment value
  successfully inserted", instead of "the first autogenerated auto_increment
  value if any row was successfully inserted", see auto_increment.test.
  Same for mysql_insert_id(), see mysql_client_test.c.
  - LAST_INSERT_ID() returns the id of the updated row if ON DUPLICATE KEY
  UPDATE, see auto_increment.test. Same for mysql_insert_id(), see
  mysql_client_test.c.
  - LAST_INSERT_ID() does not change if no autogenerated value was successfully 
  inserted (it used to then be 0), see auto_increment.test.
  - if in INSERT SELECT no autogenerated value was successfully inserted,
  mysql_insert_id() now returns the id of the last inserted row (it already
  did this for INSERT VALUES), see mysql_client_test.c.
  - if INSERT SELECT uses LAST_INSERT_ID(X), mysql_insert_id() now returns X
  (it already did this for INSERT VALUES), see mysql_client_test.c.
  - NDB now behaves like other engines wrt SET INSERT_ID: with INSERT IGNORE,
  the id passed in SET INSERT_ID is re-used until a row succeeds; SET INSERT_ID
  influences not only the first row now.
  
  Additionally, when unlocking a table we check that the thread is not keeping
  a next_insert_id (as the table is unlocked that id is potentially out-of-date);
  forgetting about this next_insert_id is done in a new
  handler::ha_release_auto_increment().
  
  Finally we prepare for engines capable of reserving finite-length intervals
  of auto_increment values: we store such intervals in THD. The next step
  (to be done by the replication team in 5.1) is to read those intervals from
  THD and actually store them in the statement-based binary log. NDB
  will be a good engine to test that.

  mysql-test/extra/binlog_tests/binlog.test@1.11, 2006-07-09 17:52:14+02:00, guilhem@gbichot3.local +32 -0
    Testing that if INSERT_ID is set to a value too big for the
    column's type, the binlogged INSERT_ID is the truncated value
    (important if slave has a column of a "wider" numeric type).
    Testing binlogging of INSERT_ID with INSERT DELAYED, to be sure that 
    we binlog an INSERT_ID event only for the delayed rows which use one.

  mysql-test/extra/rpl_tests/rpl_insert_id.test@1.7, 2006-07-09 17:52:14+02:00, guilhem@gbichot3.local +54 -1
    Testcase for BUG#20339 "stored procedure using
    LAST_INSERT_ID() does not replicate statement-based".
    Testcase for BUG#20341 "stored function inserting into one
    auto_increment puts bad data in slave".

  mysql-test/extra/rpl_tests/rpl_loaddata.test@1.2.1.1, 2006-07-09 17:52:14+02:00, guilhem@gbichot3.local +3 -0
    Test that LOAD DATA INFILE sets a value for a future LAST_INSERT_ID().

  mysql-test/r/auto_increment.result@1.43, 2006-07-09 17:52:14+02:00, guilhem@gbichot3.local +56 -2
    behaviour change: when INSERT totally fails (not even succeeds
    partially and then rolls back), don't change last_insert_id().
    Behaviour change: LAST_INSERT_ID() is now the first successfully inserted,
    autogenerated, id.
    Behaviour change: if INSERT ON DUPLICATE KEY UPDATE, if the table has auto_increment
    and a row is updated, then LAST_INSERT_ID() returns the id of this row.

  mysql-test/r/binlog_row_binlog.result@1.4, 2006-07-09 17:52:14+02:00, guilhem@gbichot3.local +34 -0
    result update

  mysql-test/r/binlog_stm_binlog.result@1.11, 2006-07-09 17:52:14+02:00, guilhem@gbichot3.local +32 -0
    result update

  mysql-test/r/insert.result@1.28, 2006-07-09 17:52:14+02:00, guilhem@gbichot3.local +15 -0
    result update

  mysql-test/r/rpl_insert_id.result@1.16, 2006-07-09 17:52:14+02:00, guilhem@gbichot3.local +59 -0
    result update

  mysql-test/r/rpl_loaddata.result@1.31.1.1, 2006-07-09 17:52:14+02:00, guilhem@gbichot3.local +6 -0
    result update

  mysql-test/r/rpl_ndb_auto_inc.result@1.3, 2006-07-09 17:52:14+02:00, guilhem@gbichot3.local +2 -6
    ndb's behaviour is now like other engines wrt SET INSERT_ID
    in a multi-row INSERT:
    - with INSERT IGNORE: the id passed in SET INSERT_ID is re-used until
    a row succeeds.
    - generally, SET INSERT_ID sets the first value and other values are
    simply computed from this first value, instead of previously where
    the 2nd and subsequent values where not influenced by SET INSERT_ID;
    this good change is due to the removal of "thd->next_insert_id=0"
    from ha_ndbcluster.

  mysql-test/t/auto_increment.test@1.28, 2006-07-09 17:52:14+02:00, guilhem@gbichot3.local +47 -0
    A testcase of BUG#19243: if ON DUPLICATE KEY UPDATE updates a row,
    LAST_INSERT_ID() now returns the id of the row.
    Test of new behaviour of last_insert_id() when no autogenerated value was
    inserted, or when only some autogenerated value (not the first of them) was
    inserted.

  mysql-test/t/insert.test@1.26, 2006-07-09 17:52:14+02:00, guilhem@gbichot3.local +7 -0
    testing INSERT IGNORE re-using generated values

  sql/ha_ndbcluster.cc@1.336.3.1, 2006-07-09 17:52:14+02:00, guilhem@gbichot3.local +1 -3
    handler::auto_increment_column_changed not needed, equivalent to
    (insert_id_for_cur_row > 0).
    thd->next_insert_id=0 not needed anymore; it was used to force
    handler::update_auto_increment() to call ha_ndbcluster::get_auto_increment()
    for each row of a multi-row INSERT, now this happens naturally
    because NDB says "I have reserved you *one* value" in get_auto_increment(),
    so handler::update_auto_increment() calls again for next row.

  sql/handler.cc@1.248, 2006-07-09 17:52:14+02:00, guilhem@gbichot3.local +179 -134
    More comments, use of new methods and variables. Hopes to be clearer
    than current code.
    thd->prev_insert_id not in THD anymore: it is managed locally by inserters
    (like mysql_insert()).
    THD::clear_next_insert_id is now equivalent to
    handler::next_insert_id > 0.
    get_auto_increment() reserves an interval of values from the engine,
    uses this interval for next rows of the statement, until interval
    is exhausted then it asks for another interval (of a bigger size
    than the first one; size doubles until reaching 65535 then it stays constant).
    If doing statement-based binlogging, intervals are remembered in a list
    for storage in the binlog.
    For "forced" insert_id values (SET INSERT_ID or replication slave),
    forced_auto_inc_intervals is non-empty and the handler takes its intervals
    from there, without calling get_auto_increment().
    ha_release_auto_increment() resets the handler's auto_increment variables;
    it calls release_auto_increment() which is handler-dependent and
    serves to return to the engine any unused tail of the last used
    interval.
    If ending a statement, next_insert_id>0 means that autoinc values have been
    generated or taken from the master's binlog (in a replication slave) so
    we clear those values read from binlog, so that next top- or sub-
    statement does not use them.

  sql/handler.h@1.217.1.5, 2006-07-09 17:52:14+02:00, guilhem@gbichot3.local +46 -4
    handler::auto_increment_changed can be replaced by
    (handler::insert_id_for_cur_row > 0).
    THD::next_insert_id moves into handler (more natural, and prepares
    for the day when we'll support a single statement inserting into
    two tables - "multi-table INSERT" like we have UPDATE - will this
    happen?).
    This move makes the backup/restore of THD::next_insert_id when entering
    a substatement unneeded, as each substatement has its own handler
    objects.

  sql/item_func.cc@1.303, 2006-07-09 17:52:14+02:00, guilhem@gbichot3.local +11 -3
    new names for variables.
    For the setting of what mysql_insert_id() will return to the client,
    LAST_INSERT_ID(X) used to simply pretend that the generated autoinc
    value for the current row was X, but this led to having no reliable
    way to know the really generated value, so we now have a bool:
    thd->arg_of_last_insert_id_function which enables us to know that
    LAST_INSERT_ID(X) was called (and then X can be found in
    thd->first_successful_insert_id_in_prev_stmt).

  sql/log.cc@1.218.1.1, 2006-07-09 17:52:14+02:00, guilhem@gbichot3.local +27 -21
    new variable names for insert_ids. Removing some unused variables in the slow
    log.

  sql/log_event.cc@1.230.3.1, 2006-07-09 17:52:14+02:00, guilhem@gbichot3.local +13 -3
    new variable names, comments. Preparing for when master's won't binlog
    LAST_INSERT_ID if it was 0.

  sql/set_var.cc@1.178.4.1, 2006-07-09 17:52:14+02:00, guilhem@gbichot3.local +13 -5
    new variable names.
    The last change repeats how Bar fixed BUG#20392
    "INSERT_ID session variable has weird value" in 5.0.

  sql/sql_class.cc@1.271.2.1, 2006-07-09 17:52:14+02:00, guilhem@gbichot3.local +54 -19
    new variables for insert_id. In THD::cleanup_after_query() we fix
    BUG#20339 "stored procedure using LAST_INSERT_ID() does not replicate
    statement-based" (will one want to fix it in 5.0?). Many comments
    about what stored functions do to auto_increment.
    In reset|restore_sub_statement_state(), we need to backup less
    auto_inc variables as some of them have moved to the handler;
    we backup/restore those which are about the current top- or sub-
    statement, *not* those about the statement-based binlog
    (which evolve as the top- and sub-statement execute).
    Because we split THD::last_insert_id into 
    THD::first_successful_insert_id_in_prev_stmt and
    THD::auto_inc_intervals_for_binlog (among others), we fix
    BUG#20341 "stored function inserting into one auto_increment
    puts bad data in slave": indeed we can afford to not backup/restore
    THD::auto_inc_intervals_for_binlog (which fixes the bug) while still
    backing up / restoring THD::first_successful_insert_id_in_prev_stmt
    (ensuring that the top-level LAST_INSERT_ID() is not affected by INSERTs
    done by sub-statements, as is desirable and tested in rpl_insert_id.test).

  sql/sql_class.h@1.304.4.1, 2006-07-09 17:52:15+02:00, guilhem@gbichot3.local +133 -33
    new variables and methods for auto_increment.
    Some THD members move into handler (those which are really about
    the table being inserted), some stay in THD (those which are
    about what a future LAST_INSERT_ID() should return, or about
    what should be stored into the statement-based binlog).
    THD::next_insert_id moves to handler::.
    THD::clear_next_insert_id removed (had become equivalent
    to next_insert_id > 0).
    THD::last_insert_id becomes four:
    THD::first_successful_insert_id_in_cur_stmt,
    THD::auto_inc_intervals_for_binlog,
    handler::insert_id_for_cur_row,
    THD::first_successful_insert_id_in_prev_stmt.
    THD::current_insert_id becomes:
    THD::first_successful_insert_id_in_prev_stmt_for_binlog
    THD::prev_insert_id is removed, handler can just use
    handler::insert_id_for_cur_row instead (which is more accurate:
    for the first row, prev_insert_id was set before get_auto_increment
    was called, so was 0, causing a call to
    get_auto_increment() for the 2nd row if the 1st row fails;
    here we don't need the call as insert_id_for_cur_row has
    the value of the first row).
    THD::last_insert_id_used becomes: stmt_depends_on_first_row_in_prev_stmt
    THD::insert_id_used is removed (equivalent to
    auto_inc_intervals_for_binlog non empty).
    The interval returned by get_auto_increment() and currently being
    consumed is handler::auto_inc_interval_for_cur_row.
    Comments to explain each of them.
    select_insert::last_insert_id becomes autoinc_value_of_last_inserted_row.

  sql/sql_insert.cc@1.206.3.1, 2006-07-09 17:52:15+02:00, guilhem@gbichot3.local +82 -67
    the "id" variable is not changed for each row now; it used to compensate for
    this contradiction:
    - thd->last_insert_id supposed job was to keep the id of the first row
    - but it was updated for every row
    - so mysql_insert() made sure to catch its first value and restore it at the end of stmt.
    Now THD keeps the first value in first_successful_insert_id_in_cur_stmt,
    and value of the row in insert_id_for_cur_row. So "id" only serves to fill
    mysql_insert_id(), as depending on some conditions, "id" must be different
    values.
    Prev_insert_id moves from THD to write_record().
    We now set LAST_INSERT_ID() in ON DUPLICATE KEY UPDATE too (BUG#19243).
    In an INSERT DELAYED, we still "reset auto-increment caching" but differently
    (by calling ha_release_auto_increment()).

  sql/sql_load.cc@1.100.1.1, 2006-07-09 17:52:15+02:00, guilhem@gbichot3.local +1 -22
    no need to fiddle with "id", THD maintains
    THD::first_successful_insert_id_in_cur_stmt by itself and correctly now.
    ha_release_auto_increment() is now (logically) called before we unlock
    the table.

  sql/sql_parse.cc@1.565.4.1, 2006-07-09 17:52:15+02:00, guilhem@gbichot3.local +9 -4
    update to new variable names.
    Assertion that reset_thd_for_next_command() is not called for every
    substatement of a routine (I'm not against it, but if we do this change,
    statement-based binlogging needs some adjustments).

  sql/sql_select.cc@1.417.1.1, 2006-07-09 17:52:15+02:00, guilhem@gbichot3.local +7 -3
    update for new variable names

  sql/sql_table.cc@1.350.2.1, 2006-07-09 17:52:15+02:00, guilhem@gbichot3.local +4 -4
    next_insert_id not needed in mysql_alter_table(), THD manages.

  sql/sql_update.cc@1.192.2.1, 2006-07-09 17:52:15+02:00, guilhem@gbichot3.local +11 -6
    update for new variable names.
    Even though this is UPDATE, an insert id can be generated (by
    LAST_INSERT_ID(X)) and should be recorded because mysql_insert_id() wants
    to know about it.

  sql/structs.h@1.63, 2006-07-09 17:52:15+02:00, guilhem@gbichot3.local +96 -0
    A class for "discrete" intervals (intervals of integer numbers with a certain
    increment between them): Discrete_interval, and a class for a list of such
    intervals: Discrete_intervals_list

  sql/ha_federated.cc@1.62.3.1, 2006-07-09 17:52:14+02:00, guilhem@gbichot3.local +3 -2
    update for new variables.

  tests/mysql_client_test.c@1.197, 2006-07-09 17:52:15+02:00, guilhem@gbichot3.local +188 -1
    tests of behaviour of mysql_insert_id(): there were no such tests, while in
    our manual we document its behaviour. In comments you'll notice the behaviour
    changes introduced (there are 5).

ChangeSet@1.2181.152.1, 2006-07-09 17:00:47+02:00, guilhem@gbichot3.local +15 -0
  * Mixed replication mode * :
  1) Fix for BUG#19630 "stored function inserting into two auto_increment breaks
  statement-based binlog":
  a stored function inserting into two such tables may fail to replicate
  (inserting wrong data in the slave's copy of the second table) if the slave's
  second table had an internal auto_increment counter different from master's.
  Because the auto_increment value autogenerated by master for the 2nd table
  does not go into binlog, only the first does, so the slave lacks information.
  To fix this, if running in mixed binlogging mode, if the stored function or
  trigger plans to update two different tables both having auto_increment
  columns, we switch to row-based for the whole function.
  We don't have a simple solution for statement-based binlogging mode, there
  the bug remains and will be documented as a known problem.
  Re-enabling rpl_switch_stm_row_mixed.
  2) Fix for BUG#20630 "Mixed binlogging mode does not work with stored
  functions, triggers, views", which was a documented limitation (in mixed
  mode, we didn't detect that a stored function's execution needed row-based
  binlogging (due to some UUID() call for example); same for
  triggers, same for views (a view created from a SELECT UUID(), and doing
  INSERT INTO sometable SELECT theview; would not replicate row-based).
  This is implemented by, after parsing a routine's body, remembering in sp_head
  that this routine needs row-based binlogging. Then when this routine is used,
  the caller is marked to require row-based binlogging too.
  Same for views: when we parse a view and detect that its SELECT needs
  row-based binary logging, we mark the calling LEX as such.
  3) Fix for BUG#20499 "mixed mode with temporary table breaks binlog":
  a temporary table containing e.g. UUID has its changes not binlogged,
  so any query updating a permanent table with data from the temporary table
  will run wrongly on slave. Solution: in mixed mode we don't switch back
  from row-based to statement-based when there exists temporary tables.
  4) Attempt to test mysqlbinlog on a binlog generated by mysqlbinlog;
  impossible due to BUG#11312 and BUG#20329, but test is in place for when
  they are fixed.

  mysql-test/r/rpl_switch_stm_row_mixed.result@1.5.1.1, 2006-07-09 17:00:38+02:00, guilhem@gbichot3.local +440 -70
    testing BUG#19630 "stored function inserting into two auto_increment breaks
    statement-based binlog",
    testing BUG#20930 "Mixed binlogging mode does not work with stored functions,
    triggers, views.
    testing BUG#20499 "mixed mode with temporary table breaks binlog".
    I have carefully checked this big result file, it is correct.

  mysql-test/t/disabled.def@1.170.2.1, 2006-07-09 17:00:38+02:00, guilhem@gbichot3.local +0 -1
    re-enabling test

  mysql-test/t/rpl_switch_stm_row_mixed.test@1.4.1.1, 2006-07-09 17:00:38+02:00, guilhem@gbichot3.local +329 -50
    Test for BUG#19630 "stored function inserting into two auto_increment breaks
    statement-based binlog":
    we test that it goes row-based, but only when needed;
    without the bugfix, master and slave's data differed.
    Test for BUG#20499 "mixed mode with temporary table breaks binlog":
    without the bugfix, slave had 2 rows, not 3.
    Test for BUG#20930 "Mixed binlogging mode does not work with stored
    functions, triggers, views".
    Making strings used more different, for easier tracking of "by which routine
    was this binlog line generated".
    Towards the end, an attempt to test mysqlbinlog on a binlog generated by
    the mixed mode; attempt failed because of BUG#11312 and BUG#20929.

  sql/item_create.cc@1.63, 2006-07-09 17:00:38+02:00, guilhem@gbichot3.local +3 -1
    fix for build without row-based replication

  sql/set_var.cc@1.178.3.1, 2006-07-09 17:00:38+02:00, guilhem@gbichot3.local +2 -2
    cosmetic: in_sub_stmt is exactly meant to say if we are in stored
    function/trigger, so better use it.

  sql/sp.cc@1.112.1.1, 2006-07-09 17:00:38+02:00, guilhem@gbichot3.local +8 -5
    When a routine adds its tables to the top statement's tables, if this routine
    needs row-based binlogging, mark the entire top statement as well.
    Same for triggers.
    Needed for making the mixed replication mode work with stored functions
    and triggers.

  sql/sp_head.cc@1.225.1.1, 2006-07-09 17:00:38+02:00, guilhem@gbichot3.local +10 -0
    new enum value for sp_head::m_flags, remembers if, when parsing the 
    routine, we found at least one element (UUID(), UDF) requiring row-based
    binlogging.

  sql/sp_head.h@1.87.1.1, 2006-07-09 17:00:38+02:00, guilhem@gbichot3.local +21 -1
    new enum value for sp_head::m_flags (see sp_head.cc).
    An utility method, intended for attributes of a routine which need
    to propagate upwards to the caller; so far only used for binlogging
    information, but open to any other attribute.

  sql/sql_base.cc@1.332.2.1, 2006-07-09 17:00:38+02:00, guilhem@gbichot3.local +70 -0
    For BUG#19630 "stored function inserting into two auto_increment
    breaks statement-based binlog":
    When we come to locking tables, we have collected all tables used by
    functions, views and triggers, we detect if we're going to update two tables
    having auto_increment columns. If yes, statement-based binlogging won't work
    (Intvar_log_event records only one insert_id) so, if in mixed binlogging
    mode, switch to row-based.
    For making mixed mode work with stored functions using UUID/UDF:
    when we come to locking tables, we have parsed the whole body so know if
    some elements need row-based. Generation of row-based binlog events
    depends on locked tables, so this is the good place to decide of the binlog
    format.

  sql/sql_class.h@1.304.3.1, 2006-07-09 17:00:38+02:00, guilhem@gbichot3.local +31 -3
    Fix for BUG#20499 "mixed mode with temporary table breaks binlog".
    Making mixed mode work with stored functions/triggers: don't reset
    back to statement-based if in executing a stored function/trigger.

  sql/sql_lex.cc@1.190.1.1, 2006-07-09 17:00:38+02:00, guilhem@gbichot3.local +3 -1
    fix for build without row-based replication.
    binlog_row_based_if_mixed moves from st_lex to Query_tables_list, because
    that boolean should not be affected when a SELECT reads the INFORMATION_SCHEMA
    and thus implicitely parses a view or routine's body: this body may
    contain needing-row-based components like UUID() but the SELECT on
    INFORMATION_SCHEMA should not be affected by that and should not use
    row-based; as Query_tables_list is backed-up/reset/restored when parsing
    the view/routine's body, so does binlog_row_based_if_mixed and the
    top SELECT is not affected.

  sql/sql_lex.h@1.234.2.1, 2006-07-09 17:00:38+02:00, guilhem@gbichot3.local +11 -5
    fix for build without row-based replication.
    binlog_row_based_if_mixed moves from st_lex to Query_tables_list
    (see sql_lex.cc)

  sql/sql_parse.cc@1.565.3.1, 2006-07-09 17:00:38+02:00, guilhem@gbichot3.local +5 -8
    For the mixed mode to work with stored functions using UUID and UDF, we need
    to move the switch-back-from-row-to-statement out of
    mysql_execute_command() (which is executed for each statement, causing
    the binlogging mode to change in the middle of the function, which would
    not work)
    The switch to row-based is now done in lock_tables(), no need to keep it
    in mysql_execute_command(); in lock_tables() we also switch back from 
    row-based to statement-based (so in a stored procedure, all statements
    have their binlogging mode). We must however keep a resetting in
    mysql_reset_thd_for_next_command() as e.g. CREATE PROCEDURE does not call
    lock_tables().

  sql/sql_view.cc@1.94.1.1, 2006-07-09 17:00:38+02:00, guilhem@gbichot3.local +9 -0
    When a view's body needs row-based binlogging (e.g. the view is created
    from SELECT UUID()), propagate this fact to the top st_lex.

  sql/sql_yacc.yy@1.484.3.1, 2006-07-09 17:00:38+02:00, guilhem@gbichot3.local +1 -1
    use TRUE instead of 1, for binlog_row_based_if_mixed.

ChangeSet@1.1810.1906.6, 2006-07-09 13:03:51+04:00, kostja@bodhi.local +3 -0
  Fix compiler warnings in sql_udf.h: ISO C++ forbids casting
  between pointer to function and pointer to object.

  sql/item_func.cc@1.270.1.23, 2006-07-09 13:03:45+04:00, kostja@bodhi.local +2 -5
    Use typedef names instead of hard-coded types for udf init/deinit
    functions.

  sql/sql_udf.cc@1.45.4.2, 2006-07-09 13:03:45+04:00, kostja@bodhi.local +5 -5
    Use typedef names for udf function types.

  sql/sql_udf.h@1.15, 2006-07-09 13:03:46+04:00, kostja@bodhi.local +18 -13
    Fix compiler warnings in sql_udf.h: ISO C++ forbids casting
    between pointer to function and pointer to object.

ChangeSet@1.2181.120.12, 2006-07-09 00:29:33+03:00, aelkin@dsl-hkigw8-feb1fb00-100.dhcp.inet.fi +3 -0
  BUG#19188 incorrect temporary table name of DROP query in replication
  
  manual merge of 5.0 patch and fixing an issue with closing temp tables when no binlog or RBR.
  Note, that despite temporary_tables is indeed double-linked list in 5.1 (patch for bug #19881) it is still enough to use only 'next' reference, as it was done for 5.0, when the list is sorted and 
  destoyed after.

  mysql-test/r/rpl_temporary.result@1.31, 2006-07-09 00:29:30+03:00, aelkin@dsl-hkigw8-feb1fb00-100.dhcp.inet.fi +6 -8
    results changed

  mysql-test/t/rpl_temporary.test@1.28, 2006-07-09 00:29:30+03:00, aelkin@dsl-hkigw8-feb1fb00-100.dhcp.inet.fi +15 -6
    fixing kill stmt for a thread with temp tables. Restoring check of temp table with accent char.

  sql/sql_base.cc@1.332.1.2, 2006-07-09 00:29:30+03:00, aelkin@dsl-hkigw8-feb1fb00-100.dhcp.inet.fi +220 -100
    manual merge part 2. Leaving only extensively refactored close_temporary_tables from local rep.

ChangeSet@1.2181.120.10, 2006-07-08 06:15:24+02:00, mats@romeo.(none) +3 -0
  BUG#20821 (INSERT DELAYED failes to write some rows to binlog):
  Fixing typo and potential memory problem.
  Reducing number of concurrent mysqlslap threads since tests fail
  in pushbuild due to too many threads.

  mysql-test/r/rpl_insert.result@1.2, 2006-07-08 06:15:21+02:00, mats@romeo.(none) +2 -2
    Result change.

  mysql-test/t/rpl_insert.test@1.4, 2006-07-08 06:15:21+02:00, mats@romeo.(none) +1 -1
    Reducing number of threads since it doesn't pass pushbuild.

  sql/sql_insert.cc@1.207.1.2, 2006-07-08 06:15:21+02:00, mats@romeo.(none) +5 -1
    Fixing typo and potential memory problem.

ChangeSet@1.2181.147.4, 2006-07-08 03:26:13+02:00, tomas@poseidon.ndb.mysql.com +6 -0
  Bug #20843 tests fails randomly with assertion in completeClusterFailed
  Bug #20902 Alter table invalid schema version with statement-based binlogging
  (latter caused by the above)

  mysql-test/t/ndb_dd_advance.test@1.3, 2006-07-08 03:25:55+02:00, tomas@poseidon.ndb.mysql.com +0 -3
    Bug #20843 tests fails randomly with assertion in completeClusterFailed
    Bug #20902 Alter table invalid schema version with statement-based binlogging
    (latter caused by the above)

  mysql-test/t/ndb_alter_table3.test@1.10, 2006-07-08 03:25:55+02:00, tomas@poseidon.ndb.mysql.com +0 -3
    Bug #20843 tests fails randomly with assertion in completeClusterFailed
    Bug #20902 Alter table invalid schema version with statement-based binlogging
    (latter caused by the above)

  mysql-test/t/ndb_autodiscover3.test@1.4.1.2, 2006-07-08 03:25:55+02:00, tomas@poseidon.ndb.mysql.com +0 -4
    Bug #20843 tests fails randomly with assertion in completeClusterFailed
    Bug #20902 Alter table invalid schema version with statement-based binlogging
    (latter caused by the above)

  mysql-test/t/ndb_multi.test@1.12, 2006-07-08 03:25:55+02:00, tomas@poseidon.ndb.mysql.com +0 -4
    Bug #20843 tests fails randomly with assertion in completeClusterFailed
    Bug #20902 Alter table invalid schema version with statement-based binlogging
    (latter caused by the above)

  sql/ha_ndbcluster.cc@1.336.1.4, 2006-07-08 03:25:55+02:00, tomas@poseidon.ndb.mysql.com +2 -2
    Bug #20843 tests fails randomly with assertion in completeClusterFailed
    Bug #20902 Alter table invalid schema version with statement-based binlogging
    (latter caused by the above)

  sql/ha_ndbcluster_binlog.cc@1.76, 2006-07-08 03:25:55+02:00, tomas@poseidon.ndb.mysql.com +20 -13
    Bug #20843 tests fails randomly with assertion in completeClusterFailed
    Bug #20902 Alter table invalid schema version with statement-based binlogging
    (latter caused by the above)

ChangeSet@1.1810.1906.4, 2006-07-08 04:07:43+04:00, kostja@bodhi.local +1 -0
  A post-merge fix.

  sql/set_var.h@1.68.2.7, 2006-07-08 04:07:39+04:00, kostja@bodhi.local +1 -1
    A post-merge fix.

ChangeSet@1.2218, 2006-07-07 16:56:49-04:00, cmiller@zippy.(none) +3 -0
  Tweaks for duplicate and missing lines in tests from a huge merge.

  mysql-test/r/type_newdecimal.result@1.47, 2006-07-07 16:56:46-04:00, cmiller@zippy.(none) +1 -0
    Make test clean up after itself.

  mysql-test/t/ps_1general.test@1.33, 2006-07-07 16:56:46-04:00, cmiller@zippy.(none) +0 -3
    Remove improperly merged lines.

  mysql-test/t/type_newdecimal.test@1.40, 2006-07-07 16:56:46-04:00, cmiller@zippy.(none) +1 -0
    Make test clean up after itself.

ChangeSet@1.1346.1.839, 2006-07-07 16:47:57-04:00, cmiller@zippy.(none) +1 -0
  Add a more reliable "getconf" test for Linuxthreads.  The later trees should already
  have a better test (and so this should be null-merged there).
  
  ALSO!  Make it so that it accepts NPTL as a valid _equivalent_ implementation.

  configure.in@1.191.1.145, 2006-07-07 16:47:56-04:00, cmiller@zippy.(none) +15 -6
    Add a more reliable "getconf" test for Linuxthreads.  The later trees should already
    have a better test (and so this should be null-merged there).
    
    ALSO!  Make it so that it accepts NPTL as a valid _equivalent_ implementation.

ChangeSet@1.2181.120.9, 2006-07-07 22:38:57+02:00, mats@romeo.(none) +2 -0
  Fixing the prototype for my_strndup() to compile on Windows.

  mysys/my_malloc.c@1.10.1.1, 2006-07-07 22:38:53+02:00, mats@romeo.(none) +1 -1
    Changing prototype for my_strndup().

  server-tools/instance-manager/parse.h@1.7.1.1, 2006-07-07 22:38:53+02:00, mats@romeo.(none) +1 -1
    Changing prototype for my_strndup().

ChangeSet@1.2181.151.1, 2006-07-08 00:26:18+04:00, kostja@bodhi.local +2 -0
  Add a test case for Bug#18884 "lock table + global read lock = crash"
  (the bug itself is not repeatable any more).

  mysql-test/r/lock.result@1.18, 2006-07-08 00:26:15+04:00, kostja@bodhi.local +7 -0
    Update test results (Bug#18884)

  mysql-test/t/lock.test@1.16, 2006-07-08 00:26:15+04:00, kostja@bodhi.local +15 -0
    Add a test case for Bug#18884 "lock table + global read lock = crash"

ChangeSet@1.1810.1906.2, 2006-07-08 00:03:43+04:00, kostja@bodhi.local +2 -0
  Cleanups: ignore more files.

  BitKeeper/etc/ignore@1.210.1.16, 2006-07-08 00:03:41+04:00, kostja@bodhi.local +7 -0
    Modify ignore list to work with BitKeeper 4

  mysql-test/t/mysqldump.test@1.76.1.19, 2006-07-08 00:03:41+04:00, kostja@bodhi.local +3 -4
    Fix the test for Bug#18462 to use MYSQLTEST_VARDIR instead of mysql-test/
    directory for temporary files. 

ChangeSet@1.2181.120.8, 2006-07-07 21:03:19+02:00, mats@romeo.(none) +4 -0
  Fixing usage of my_strndup() to new prototype.

  sql/log_event.cc@1.230.2.1, 2006-07-07 21:03:15+02:00, mats@romeo.(none) +2 -5
    Fixing usage of my_strndup() to new prototype.

  sql/set_var.cc@1.178.2.1, 2006-07-07 21:03:16+02:00, mats@romeo.(none) +2 -2
    Fixing usage of my_strndup() to new prototype.

  sql/set_var.h@1.89.1.1, 2006-07-07 21:03:16+02:00, mats@romeo.(none) +1 -1
    Fixing usage of my_strndup() to new prototype.

  sql/ha_federated.cc@1.62.2.1, 2006-07-07 21:03:15+02:00, mats@romeo.(none) +3 -4
    Fixing usage of my_strndup() to new prototype.

ChangeSet@1.2181.136.7, 2006-07-07 11:17:50-07:00, patg@govinda.patg.net +3 -0
  BUG #19773
  
  Small post-patch fixes

  mysql-test/r/federated.result@1.30.1.2, 2006-07-07 11:17:42-07:00, patg@govinda.patg.net +4 -4
    BUG #19773
    
    Test result fixes

  mysql-test/t/federated.test@1.26.1.2, 2006-07-07 11:17:42-07:00, patg@govinda.patg.net +0 -1
    BUG #19774
    
    Removed failing line to test.

  sql/ha_federated.cc@1.62.1.2, 2006-07-07 11:17:42-07:00, patg@govinda.patg.net +5 -6
    BUG #19773
    
    method declartion and definition not the same.

ChangeSet@1.1810.1905.1, 2006-07-07 21:24:54+04:00, kroki@mysql.com +3 -0
  Bug#19207: Final parenthesis omitted for CREATE INDEX in Stored Procedure
  
  Wrong criteria was used to distinguish the case when there was no
  lookahead performed in the parser.  Bug affected only statements
  ending in one-character token without any optional tail, like CREATE
  INDEX and CALL.

  mysql-test/r/sp-code.result@1.5.1.2, 2006-07-07 21:24:52+04:00, kroki@mysql.com +9 -2
    Add result for bug#19207: Final parenthesis omitted for CREATE INDEX
    in Stored Procedure

  mysql-test/t/sp-code.test@1.5, 2006-07-07 21:24:52+04:00, kroki@mysql.com +22 -0
    Add test case for bug#19207: Final parenthesis omitted for CREATE INDEX
    in Stored Procedure

  sql/sql_yacc.yy@1.371.70.1, 2006-07-07 21:24:52+04:00, kroki@mysql.com +12 -4
    Use (yychar == YYEMPTY) as the criteria of whether lookahead was not
    performed.

ChangeSet@1.2181.120.7, 2006-07-07 18:31:00+02:00, mats@romeo.(none) +1 -0
  Bug#20850 (Assert during slave shutdown in many rpl_* tests):
  Previous patch didn't work: moving variable settings inside critical region.

  sql/slave.cc@1.275.1.3, 2006-07-07 18:30:57+02:00, mats@romeo.(none) +3 -3
    Moving variable setting inside critical region (again) when
    terminating slave I/O thread. 

ChangeSet@1.2181.141.3, 2006-07-07 17:50:45+02:00, tomas@poseidon.ndb.mysql.com +3 -0
  Bug #20897 race condition between drop table and suma drop trigger
  - keep accounting for aoutstanding drop trigger requests
  - also lock table object in suma while doing that (should be impossible right now though since dict serializes all requests)

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@1.47, 2006-07-07 17:50:23+02:00, tomas@poseidon.ndb.mysql.com +37 -16
    Bug #20897 race condition between drop table and suma drop trigger
    - keep accounting for aoutstanding drop trigger requests
    - also lock table object in suma while doing that (should be impossible right now though since dict serializes all requests)

  storage/ndb/src/kernel/blocks/suma/Suma.hpp@1.17, 2006-07-07 17:50:25+02:00, tomas@poseidon.ndb.mysql.com +2 -1
    Bug #20897 race condition between drop table and suma drop trigger
    - keep accounting for aoutstanding drop trigger requests
    - also lock table object in suma while doing that (should be impossible right now though since dict serializes all requests)

  storage/ndb/src/ndbapi/ndberror.c@1.67, 2006-07-07 17:50:25+02:00, tomas@poseidon.ndb.mysql.com +2 -0
    Bug #20897 race condition between drop table and suma drop trigger
    - keep accounting for aoutstanding drop trigger requests
    - also lock table object in suma while doing that (should be impossible right now though since dict serializes all requests)

ChangeSet@1.2181.143.3, 2006-07-07 17:20:49+02:00, knielsen@ymer.(none) +4 -0
  BUG#20902: Test failure in ndb_alter_table3 with statement-based binlogging
  
  Disable test cases ndb_alter_table3, ndb_autodiscover3, ndb_dd_advance,
  and ndb_multi in statement-based binlogging mode until bug can be fixed.

  mysql-test/t/ndb_dd_advance.test@1.2, 2006-07-07 17:20:47+02:00, knielsen@ymer.(none) +3 -0
    Disable test in statement-based binlogging mode.

  mysql-test/t/ndb_alter_table3.test@1.9, 2006-07-07 17:20:47+02:00, knielsen@ymer.(none) +3 -0
    Disable test in statement-based binlogging mode.

  mysql-test/t/ndb_autodiscover3.test@1.4.1.1, 2006-07-07 17:20:47+02:00, knielsen@ymer.(none) +3 -0
    Disable test in statement-based binlogging mode.

  mysql-test/t/ndb_multi.test@1.11, 2006-07-07 17:20:47+02:00, knielsen@ymer.(none) +3 -0
    Disable test in statement-based binlogging mode.

ChangeSet@1.2217, 2006-07-07 10:47:51-04:00, cmiller@zippy.(none) +2 -0
  Merge cleanup, with a change of verbose test status to Off.

  mysql-test/lib/mtr_process.pl@1.43, 2006-07-07 10:47:48-04:00, cmiller@zippy.(none) +1 -1
    Resolved a previous bad merge of two different attempts at fixing the same problem.

  mysql-test/mysql-test-run.pl@1.139, 2006-07-07 10:47:48-04:00, cmiller@zippy.(none) +1 -1
    Default for verbose should be Off.

ChangeSet@1.1810.1885.5, 2006-07-07 17:27:11+03:00, gkodinov@mysql.com +1 -0
  Bug #20569 Garbage in DECIMAL results from some mathematical functions
   * portability fix: moved the macro call after the C declaration

  strings/decimal.c@1.65.1.5, 2006-07-07 17:27:03+03:00, gkodinov@mysql.com +1 -1
    Bug #20569 Garbage in DECIMAL results from some mathematical functions
     * moved the macro call after the C declaration

ChangeSet@1.1616.2550.13, 2006-07-07 16:01:35+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#20904
    Reset logpartstate if file_change_problem after writeing of zero page is done

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.39.1.25, 2006-07-07 16:01:30+02:00, jonas@perch.ndb.mysql.com +14 -0
    ndb - bug#20904
      Reset logpartstate if file_change_problem after writeing of zero page is done

ChangeSet@1.2181.148.1, 2006-07-07 15:59:17+02:00, mats@romeo.(none) +2 -0
  Correcting signature for my_strndup to be able to build on Windows
  in pushbuild on Replication/Backup team tree.

  include/my_sys.h@1.201.1.1, 2006-07-07 15:59:13+02:00, mats@romeo.(none) +2 -2
    Using "char" instead of "byte" for my_strndup().

  mysys/safemalloc.c@1.25.1.1, 2006-07-07 15:59:13+02:00, mats@romeo.(none) +1 -1
    Using "char" instead of "byte" for my_strndup().

ChangeSet@1.2181.147.1, 2006-07-07 16:14:07+04:00, konstantin@bodhi.local +4 -0
  Fixes for Windows compilation failures.

  server-tools/instance-manager/parse.h@1.8, 2006-07-07 16:14:03+04:00, konstantin@bodhi.local +1 -1
    Post-merge fixes: fix Windows build.

  sql/log_event.cc@1.232.1.1, 2006-07-07 16:14:04+04:00, konstantin@bodhi.local +1 -1
    uint32 -> uint

  sql/rpl_filter.cc@1.6, 2006-07-07 16:14:04+04:00, konstantin@bodhi.local +1 -1
    uint32 -> uint

  sql/rpl_filter.h@1.8, 2006-07-07 16:14:04+04:00, konstantin@bodhi.local +1 -1
    uint32 -> uint

ChangeSet@1.1810.1902.2, 2006-07-07 17:06:30+05:00, bar@myoffice.izhnet.ru +3 -0
  func_str.result, func_str.test:
    Adding test case.
  item_strfunc.cc:
    bug#11728 string function LEFT, strange undocumented behaviour
    Fixing LEFT and RIGHT return NULL if the second
    argument is NULL.

  mysql-test/r/func_str.result@1.110.2.1, 2006-07-07 17:05:34+05:00, bar@myoffice.izhnet.ru +3 -0
    Adding test case.

  mysql-test/t/func_str.test@1.89.1.1, 2006-07-07 17:05:30+05:00, bar@myoffice.izhnet.ru +5 -0
    Adding test case.

  sql/item_strfunc.cc@1.261.5.1, 2006-07-07 17:04:31+05:00, bar@myoffice.izhnet.ru +2 -2
    bug#11728 string function LEFT, strange undocumented behaviour
    Fixing LEFT and RIGHT return NULL if the second
    argument is NULL.

ChangeSet@1.1810.1722.5, 2006-07-07 20:10:15+10:00, stewart@willster.(none) +5 -0
  BUG#13985: Cluster: ndb_mgm "status" command can return incorrect data node status
  
  - only force HB to data nodes
  - flag for if we broadcast condition on receipt of HB

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.73.29.2, 2006-07-07 20:10:12+10:00, stewart@willster.(none) +19 -0
    Add get_connected_ndb_nodes to check status for connected data nodes only

  ndb/src/mgmsrv/MgmtSrvr.hpp@1.30.16.2, 2006-07-07 20:10:12+10:00, stewart@willster.(none) +1 -0
    add prototype for get_connected_ndb_nodes

  ndb/src/mgmsrv/Services.cpp@1.45.26.2, 2006-07-07 20:10:12+10:00, stewart@willster.(none) +1 -1
    only force HB to NDBD nodes

  ndb/src/ndbapi/ClusterMgr.cpp@1.17.7.4, 2006-07-07 20:10:12+10:00, stewart@willster.(none) +14 -5
    flag to control if we send the condition

  ndb/src/ndbapi/ClusterMgr.hpp@1.4.5.3, 2006-07-07 20:10:12+10:00, stewart@willster.(none) +1 -0
    flag for if we broadcast condition on receipt of hb

ChangeSet@1.2181.139.5, 2006-07-07 13:49:43+04:00, konstantin@bodhi.netgear +1 -0
  Another post-merge fix.

  sql/events.cc@1.45.1.2, 2006-07-07 13:49:40+04:00, konstantin@bodhi.netgear +1 -1
    Fix a bug I introduced with the merge: dbchanged is read
    even if it's not passed to sp_use_new_db.

ChangeSet@1.1616.2675.3, 2006-07-07 10:57:22+02:00, pekka@mysql.com +6 -0
  ndb - bug#20847 : DbtupTabDesMan: add merge with left buddies

  ndb/src/kernel/blocks/ERROR_codes.txt@1.8.2.1, 2006-07-07 10:55:55+02:00, pekka@mysql.com +3 -1
    DbtupTabDesMan: add merge with left buddies

  ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.16.1.5, 2006-07-07 10:55:56+02:00, pekka@mysql.com +6 -3
    DbtupTabDesMan: add merge with left buddies

  ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.7.1.2, 2006-07-07 10:55:57+02:00, pekka@mysql.com +7 -0
    DbtupTabDesMan: add merge with left buddies

  ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp@1.2.1.2, 2006-07-07 10:55:57+02:00, pekka@mysql.com +136 -30
    DbtupTabDesMan: add merge with left buddies

  ndb/test/ndbapi/testDict.cpp@1.18.1.1, 2006-07-07 10:55:58+02:00, pekka@mysql.com +101 -0
    DbtupTabDesMan: add merge with left buddies

  ndb/test/run-test/daily-basic-tests.txt@1.13.3.1, 2006-07-07 10:55:58+02:00, pekka@mysql.com +4 -0
    DbtupTabDesMan: add merge with left buddies

ChangeSet@1.1810.1722.4, 2006-07-07 18:39:38+10:00, stewart@willster.(none) +2 -0
  BUG#13985 Cluster: ndb_mgm "status" command can return incorrect data node status
  
  use existing transporter mutex

  ndb/src/ndbapi/ClusterMgr.cpp@1.17.7.3, 2006-07-07 18:39:36+10:00, stewart@willster.(none) +11 -14
    just use the transporter facade mutex.
    
    parallel 'show' will get woken up at the same time

  ndb/src/ndbapi/ClusterMgr.hpp@1.4.5.2, 2006-07-07 18:39:36+10:00, stewart@willster.(none) +0 -1
    remove wait for heartbeat mutex

ChangeSet@1.2181.106.3, 2006-07-07 10:00:47+02:00, jonas@perch.ndb.mysql.com +4 -0
  ndb -
    Add DynArr256 which is a ndb-ish judy array
    Like the one used in ACC

  storage/ndb/src/kernel/vm/DynArr256.cpp@1.1, 2006-07-07 10:00:45+02:00, jonas@perch.ndb.mysql.com +1015 -0
    New BitKeeper file ``storage/ndb/src/kernel/vm/DynArr256.cpp''

  storage/ndb/src/kernel/vm/DynArr256.cpp@1.0, 2006-07-07 10:00:45+02:00, jonas@perch.ndb.mysql.com +0 -0

  storage/ndb/src/kernel/vm/DynArr256.hpp@1.1, 2006-07-07 10:00:45+02:00, jonas@perch.ndb.mysql.com +79 -0
    New BitKeeper file ``storage/ndb/src/kernel/vm/DynArr256.hpp''

  storage/ndb/src/kernel/vm/DynArr256.hpp@1.0, 2006-07-07 10:00:45+02:00, jonas@perch.ndb.mysql.com +0 -0

  storage/ndb/src/kernel/vm/Makefile.am@1.19, 2006-07-07 10:00:45+02:00, jonas@perch.ndb.mysql.com +14 -3
    Add DynArr256

  storage/ndb/src/kernel/vm/bench_pool.cpp@1.4, 2006-07-07 10:00:45+02:00, jonas@perch.ndb.mysql.com +3 -1
    update benchpool program

ChangeSet@1.2181.145.2, 2006-07-07 17:18:52+09:30, grog@eucla.lemis.com +1 -0
  slave.cc:
    BUG#20850: Assert during slave shutdown in many rpl_* tests.
    This was caused by a race condition at the end of handle_slave_io
    which under some circumstances allowed the cleanup to proceed before
    the thread had completed.

  sql/slave.cc@1.275.1.2, 2006-07-07 17:18:20+09:30, grog@eucla.lemis.com +3 -3
    BUG#20850: Assert during slave shutdown in many rpl_* tests.
    This was caused by a race condition at the end of handle_slave_io
    which under some circumstances allowed the cleanup to proceed before
    the thread had completed.

ChangeSet@1.1810.1722.3, 2006-07-07 17:39:11+10:00, stewart@willster.(none) +1 -0
  BUG#13985 ndb_mgm "status" command can return incorrect data node status
  
  better support parallel show commands, hold mutex when touching waitForHBFromNodes

  ndb/src/ndbapi/ClusterMgr.cpp@1.17.7.2, 2006-07-07 17:39:04+10:00, stewart@willster.(none) +6 -5
    correctly serialize ::forceHB calls and hold mutex for whole time updating
    waitForHBFromNodes

ChangeSet@1.2181.145.1, 2006-07-07 16:57:55+09:30, grog@eucla.lemis.com +1 -0
  slave.cc:
    Tidy up white space.

  sql/slave.cc@1.275.1.1, 2006-07-07 16:57:05+09:30, grog@eucla.lemis.com +534 -535
    Tidy up white space.

ChangeSet@1.2181.120.4, 2006-07-07 09:25:12+02:00, mats@romeo.(none) +1 -0
  Adding sleep to allow mysqlslap to finish it's job on systems under high load.

  mysql-test/t/rpl_insert.test@1.3, 2006-07-07 09:25:05+02:00, mats@romeo.(none) +2 -0
    Adding sleep to allow mysqlslap to finish.

ChangeSet@1.2181.139.4, 2006-07-07 03:07:45+04:00, konstantin@bodhi.netgear +4 -0
  After merge fixes.

  sql/event_timed.cc@1.56.1.1, 2006-07-07 03:07:41+04:00, konstantin@bodhi.netgear +6 -17
    After merge fixes: dbname can never be NULL.

  sql/events.cc@1.45.1.1, 2006-07-07 03:07:41+04:00, konstantin@bodhi.netgear +6 -6
    After merge fixes: use a new signature of sp_use_new_db

  sql/sp_head.cc@1.228, 2006-07-07 03:07:41+04:00, konstantin@bodhi.netgear +24 -12
    After merge fixes: replace assert with an if for events code to work.

  sql/sql_parse.cc@1.565.2.2, 2006-07-07 03:07:41+04:00, konstantin@bodhi.netgear +30 -59
    After merge fixes: put back free_items, it's used in partitioning.
    Whether it is not a bug is to be investigated.
    Remove check_db_used, as planned.

ChangeSet@1.2181.141.2, 2006-07-07 00:18:01+02:00, tomas@poseidon.ndb.mysql.com +2 -0
  removed alter table partition error test since it cannot be made predictable... name will change of created file

  mysql-test/r/ndb_restore.result@1.19, 2006-07-07 00:17:51+02:00, tomas@poseidon.ndb.mysql.com +0 -19
    removed alter table partition error test since it cannot be made predictable... name will change of created file

  mysql-test/t/ndb_restore.test@1.23, 2006-07-07 00:17:51+02:00, tomas@poseidon.ndb.mysql.com +0 -24
    removed alter table partition error test since it cannot be made predictable... name will change of created file

ChangeSet@1.1810.1900.1, 2006-07-06 23:49:09+02:00, knielsen@ymer.(none) +2 -0
  BUG#19951: Race conditions in test wait_timeout.
  
  Fix random failures in test 'wait_timeout' that depend on exact timing.
  
  1. Force a reconnect initially if necessary, as otherwise slow startup
  might have caused a connection timeout before the test can even start.
  
  2. Explicitly disconnect the first connection to remove confusion about
  which connection aborts from timeout, causing test failure.

  mysql-test/r/wait_timeout.result@1.3, 2006-07-06 23:49:05+02:00, knielsen@ymer.(none) +4 -0
    Fix two races in test.

  mysql-test/t/wait_timeout.test@1.1.1.6, 2006-07-06 23:49:05+02:00, knielsen@ymer.(none) +9 -3
    Fix two races in test.

ChangeSet@1.1810.1885.4, 2006-07-06 14:41:01-07:00, igor@olga.mysql.com +2 -0
  Added a test case with views for bug 18243 (see also func_str.test).

  mysql-test/r/view.result@1.138.1.26, 2006-07-06 14:40:58-07:00, igor@olga.mysql.com +13 -0
    Added a test case with views for bug 18243 (see also func_str.test).

  mysql-test/t/view.test@1.126.1.23, 2006-07-06 14:40:58-07:00, igor@olga.mysql.com +16 -0
    Added a test case with views for bug 18243 (see also func_str.test).

ChangeSet@1.2181.138.4, 2006-07-06 22:03:35+02:00, guilhem@gbichot3.local +3 -0
  Testcase for BUG#20633 "INSERT DELAYED RAND() or @user_var does not replicate
  statement-based" (bugfix was committed today):
  we verify that now it works in mixed mode. And a comment.

  mysql-test/r/rpl_switch_stm_row_mixed.result@1.7, 2006-07-06 22:03:26+02:00, guilhem@gbichot3.local +12 -0
    result update

  mysql-test/t/rpl_switch_stm_row_mixed.test@1.6, 2006-07-06 22:03:26+02:00, guilhem@gbichot3.local +12 -2
    testcase for BUG#20633

  sql/sql_insert.cc@1.207.2.3, 2006-07-06 22:03:26+02:00, guilhem@gbichot3.local +4 -2
    the #ifdef was not necessary; a comment.

ChangeSet@1.1616.2684.1, 2006-07-06 23:59:04+04:00, konstantin@bodhi.netgear +6 -0
  A fix and a test case for Bug#19399 "res 'Lost Connection' when 
  dropping/creating tables".
  
  The bug could lead to a crash when multi-delete statements were
  prepared and used with temporary tables.
  
  The bug was caused by lack of clean-up of multi-delete tables before
  re-execution of a prepared statement. In a statement like
  DELETE t1 FROM t1, t2 WHERE ... the first table list (t1) is
  moved to lex->auxilliary_table_list and excluded from lex->query_tables
  or select_lex->tables. Thus it was unaccessible to reinit_stmt_before_use
  and not cleaned up before re-execution of a prepared statement. 

  mysql-test/r/ps.result@1.31.3.1, 2006-07-06 23:59:01+04:00, konstantin@bodhi.netgear +14 -0
    Updated test results (Bug#19399)

  mysql-test/t/ps.test@1.27.1.24, 2006-07-06 23:59:01+04:00, konstantin@bodhi.netgear +25 -0
    A test case for Bug#19399 "Stored Procedures 'Lost Connection' when 
    dropping/creating tables": test that multi-delete
    tables are cleaned up properly before re-execution.

  sql/sql_lex.cc@1.97.21.3, 2006-07-06 23:59:01+04:00, konstantin@bodhi.netgear +1 -0
    Always initialize auxilliary_table_list when we initialize the lex:
    this way we don't have to check that lex->sql_command equals to
    SQLCOM_DELETE_MULTI whenever we need to access auxilliary_table_list.
    In particular, in reinit_stmt_before_use we can simply check that
    auxilliary_table_list is not NULL and clean it up if the check returns
    a true value.

  sql/sql_prepare.cc@1.34.36.3, 2006-07-06 23:59:01+04:00, konstantin@bodhi.netgear +13 -7
    Move the one table clean-up functionality to a method of st_table_list.
    Clean up auxiliary_table_list if it's not empty.

  sql/table.cc@1.111.5.1, 2006-07-06 23:59:01+04:00, konstantin@bodhi.netgear +17 -0
    Implement st_table_list::reinit_before_use().

  sql/table.h@1.55.6.8, 2006-07-06 23:59:01+04:00, konstantin@bodhi.netgear +5 -0
    Declare st_table_list::reinit_before_use().

ChangeSet@1.2181.136.5, 2006-07-06 20:12:33+02:00, ingo@chilla.local +1 -0
  After merge fix.

  sql/table.cc@1.230, 2006-07-06 20:12:21+02:00, ingo@chilla.local +1 -1
    After merge fix.

ChangeSet@1.1616.2681.1, 2006-07-06 11:11:49-07:00, igor@olga.mysql.com +4 -0
  Fixed bug #18243.
  The implementation of the method Item_func_reverse::val_str
  for the REVERSE function modified the argument of the function.
  This led to wrong results for expressions that contained
  REVERSE(ref) if ref occurred somewhere else in the expressions.

  mysql-test/r/func_str.result@1.70.1.32, 2006-07-06 11:11:46-07:00, igor@olga.mysql.com +15 -0
    Added a test case for bug #18243.

  mysql-test/t/func_str.test@1.64.1.20, 2006-07-06 11:11:46-07:00, igor@olga.mysql.com +17 -0
    Added a test case for bug #18243.

  sql/item_strfunc.cc@1.196.6.13, 2006-07-06 11:11:46-07:00, igor@olga.mysql.com +21 -18
    Fixed bug #18243.
    The implementation of the method Item_func_reverse::val_str
    for the REVERSE function modified the argument of the function.
    This led to wrong results for expressions that contained
    REVERSE(ref) if ref occurred somewhere else in the expressions.
    
    The implementation of Item_func_reverse::val_str has been changed
    to make the argument intact.

  sql/item_strfunc.h@1.73.2.17, 2006-07-06 11:11:46-07:00, igor@olga.mysql.com +1 -0
    Fixed bug #18243.
    Added tmp_value to the Item_func_reverse class to store
    the result of the function. It erroneously replaced the 
    argument before this fix.

ChangeSet@1.2181.140.2, 2006-07-06 20:04:48+02:00, tomas@poseidon.ndb.mysql.com +5 -0
  Bug #20820 auto inc table not handled correctly when restored from cluster backup

  mysql-test/r/ndb_restore.result@1.18, 2006-07-06 20:04:35+02:00, tomas@poseidon.ndb.mysql.com +14 -10
    Bug #20820 auto inc table not handled correctly when restored from cluster backup

  mysql-test/t/ndb_dd_backuprestore.test@1.8, 2006-07-06 20:04:35+02:00, tomas@poseidon.ndb.mysql.com +2 -0
    make sure only run in default cluster

  mysql-test/t/ndb_restore.test@1.22, 2006-07-06 20:04:35+02:00, tomas@poseidon.ndb.mysql.com +8 -3
    Bug #20820 auto inc table not handled correctly when restored from cluster backup

  mysql-test/t/rpl_ndb_dd_advance.test@1.6, 2006-07-06 20:04:35+02:00, tomas@poseidon.ndb.mysql.com +2 -0
    make sure only run in default cluster

  mysql-test/t/rpl_ndb_sync.test@1.9, 2006-07-06 20:04:35+02:00, tomas@poseidon.ndb.mysql.com +2 -0
    make sure only run in default cluster

ChangeSet@1.1810.1892.4, 2006-07-06 18:50:44+02:00, tomas@poseidon.ndb.mysql.com +5 -0
  Bug #20820 auto inc table not handled correctly when restored from cluster backup

  mysql-test/include/ndb_default_cluster.inc@1.2, 2006-07-06 18:50:32+02:00, tomas@poseidon.ndb.mysql.com +1 -1
    Bug #20820 auto inc table not handled correctly when restored from cluster backup

  mysql-test/r/ndb_default_cluster.require@1.2, 2006-07-06 18:50:32+02:00, tomas@poseidon.ndb.mysql.com +1 -1
    Bug #20820 auto inc table not handled correctly when restored from cluster backup

  mysql-test/r/ndb_restore.result@1.4.1.1, 2006-07-06 18:50:32+02:00, tomas@poseidon.ndb.mysql.com +17 -7
    Bug #20820 auto inc table not handled correctly when restored from cluster backup

  mysql-test/t/ndb_restore.test@1.9.1.1, 2006-07-06 18:50:32+02:00, tomas@poseidon.ndb.mysql.com +17 -6
    Bug #20820 auto inc table not handled correctly when restored from cluster backup

  ndb/tools/restore/consumer_restore.cpp@1.14.12.1, 2006-07-06 18:50:32+02:00, tomas@poseidon.ndb.mysql.com +29 -11
    Bug #20820 auto inc table not handled correctly when restored from cluster backup

ChangeSet@1.2181.138.3, 2006-07-06 18:01:32+02:00, guilhem@gbichot3.local +1 -0
  Fix for BUG#20349 "mysql-test-run.pl needs to add --debug to 
  mysql_client_test like mysql-test-run". Nothing to document.

  mysql-test/mysql-test-run.pl@1.122.3.2, 2006-07-06 18:01:23+02:00, guilhem@gbichot3.local +6 -0
    if --debug, add debugging of mysql_client_test (useful at least to know what
    insert_id values it receives in the ok packets of INSERT).

ChangeSet@1.2181.138.1, 2006-07-06 17:54:04+02:00, guilhem@gbichot3.local +4 -0
  Fix for BUG#20649 "mixed replication mode does not work with INSERT DELAYED".
  The bug was that if the server was running in mixed binlogging mode,
  and an INSERT DELAYED used some needing-row-based components like UUID(),
  the server didn't binlog this row-based but statement-based, which
  thus failed to insert correct data on the slave.
  This changeset implements that when a delayed_insert thread is created,
  if the server's global binlog mode is "mixed", that thread will use row-based.
  This also fixes BUG#20633 "INSERT DELAYED RAND() or @user_var does not
  replicate statement-based": we don't fix it in statement-based mode (would
  require bookeeping of rand seeds and user variables used by each row),
  but at least it will now work in mixed mode (as row-based will be used).
  We re-enable rpl_switch_stm_row_mixed.test (so BUG#18590
  which was about re-enabling this test, will be closed) to test the fixes.
  Between when it was disabled and now, some good changes to row-based
  binlogging (no generation of table map events for non-changed tables)
  induce changes in the test's result file.

  mysql-test/r/rpl_switch_stm_row_mixed.result@1.6, 2006-07-06 17:53:53+02:00, guilhem@gbichot3.local +17 -7
    result update.
    Note that some pieces of binlog are gone, not due to my test but to changes
    to the row-based binlogging code (non-changed tables don't generate
    table map binlog events now) done while the test was disabled.

  mysql-test/t/disabled.def@1.170.1.1, 2006-07-06 17:53:53+02:00, guilhem@gbichot3.local +0 -1
    this test works now

  mysql-test/t/rpl_switch_stm_row_mixed.test@1.5, 2006-07-06 17:53:53+02:00, guilhem@gbichot3.local +7 -0
    testing fix to make INSERT DELAYED work in mixed mode

  sql/sql_insert.cc@1.207.2.1, 2006-07-06 17:53:53+02:00, guilhem@gbichot3.local +3 -0
    In mixed binlogging mode, the delayed_insert system thread now always
    uses row-based binlogging.
    This makes replication of INSERT DELAYED VALUES(RAND()) or VALUES(@a)
    work in mixed mode (it does not in statement-based).

ChangeSet@1.2181.43.5, 2006-07-06 17:40:36+02:00, guilhem@gbichot3.local +3 -0
  Behaviour change of mysql-test-run.pl:
  by default we never run disabled tests (even if they're
  explicitely listed on the command-line). We add an option --enable-disabled
  which will run tests even though they are disabled, and will print, for each
  such test, the comment explaining why it was disabled.
  The reason for the change is when you want to run "all tests which are about
  NDB" for example: mysql-test-run.pl t/*ndb*.test used to run some disabled
  NDB tests, causing failures, causing investigations.
  Code amended and approved by Kent.

  mysql-test/lib/mtr_cases.pl@1.19.1.1, 2006-07-06 17:40:26+02:00, guilhem@gbichot3.local +38 -23
    always detect if a test is listed as disabled, and read the comment why is is.
    If it is listed, don't run the test, except if
    --enable-disabled was given, then mark the test as to-run-even-
    though-it-is-listed-as-disabled.

  mysql-test/lib/mtr_report.pl@1.25.1.1, 2006-07-06 17:40:26+02:00, guilhem@gbichot3.local +18 -0
    Report tests which will run though they are listed as disabled
    (does something only if --enable-disabled).

  mysql-test/mysql-test-run.pl@1.122.2.1, 2006-07-06 17:40:26+02:00, guilhem@gbichot3.local +4 -2
    New behaviour: by default we never run disabled tests (even if they're
    explicitely listed on the command-line). We add an option --enable-disabled
    which will run tests even though they are disabled, and will print, for each
    such test, the comment explaining why it was disabled.

ChangeSet@1.1810.1710.10, 2006-07-06 15:51:35+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#20860
    Better error message when failing to read either of 2 DIH schema files

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.24.37.1, 2006-07-06 15:51:32+02:00, jonas@perch.ndb.mysql.com +14 -5
    Better error message when failing to read either of 2 DIH schema files

ChangeSet@1.2181.119.19, 2006-07-06 15:51:13+02:00, tomas@poseidon.ndb.mysql.com +2 -0
  corrected result file
  - missing order by

  mysql-test/r/ndb_dd_advance2.result@1.3, 2006-07-06 15:51:01+02:00, tomas@poseidon.ndb.mysql.com +1 -1
    corrected result file
    - missing order by

  mysql-test/t/ndb_dd_advance2.test@1.3, 2006-07-06 15:51:01+02:00, tomas@poseidon.ndb.mysql.com +1 -1
    corrected result file
    - missing order by

ChangeSet@1.2181.136.3, 2006-07-06 15:38:47+02:00, ingo@chilla.local +2 -0
  After merge fixes.

  mysql-test/r/archive.result@1.23, 2006-07-06 15:38:41+02:00, ingo@chilla.local +2 -0
    After merge fix. It might come from the fix for
    bug 1662 (ALTER TABLE LIKE ignores DATA/INDEX DIRECTPORY)

  sql/time.cc@1.63, 2006-07-06 15:38:41+02:00, ingo@chilla.local +3 -2
    After merge fix. Auto resolve failed because this piece
    of code was moved from another file to here.

ChangeSet@1.1616.2664.3, 2006-07-06 15:18:00+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  backport of ndb DictCache fix
  - don't invalidate tables that are in state RETRIEVING

  ndb/src/ndbapi/DictCache.cpp@1.11.1.4, 2006-07-06 15:17:53+02:00, tomas@poseidon.ndb.mysql.com +8 -5
    backport of ndb DictCache fix
    - don't invalidate tables that are in state RETRIEVING

ChangeSet@1.1810.1895.1, 2006-07-06 14:37:09+02:00, guilhem@mysql.com +3 -0
  Fix for BUG#20524 "auto_increment_* not observed when inserting
  a too large value": the bug was that if MySQL generated a value for an
  auto_increment column, based on auto_increment_* variables, and this value
  was bigger than the column's max possible value, then that max possible
  value was inserted (after issuing a warning). But this didn't honour
  auto_increment_* variables (and so could cause conflicts in a master-master
  replication where one master is supposed to generated only even numbers,
  and the other only odd numbers), so now we "round down" this max possible
  value to honour auto_increment_* variables, before inserting it.

  mysql-test/r/rpl_auto_increment.result@1.4.1.1, 2006-07-06 14:37:00+02:00, guilhem@mysql.com +44 -0
    result update. Before the fix, the result was that master inserted 127 in t1
    (which didn't honour auto_increment_* variables!),
    instead of failing with "duplicate key 125" like now.

  mysql-test/t/rpl_auto_increment.test@1.2.1.1, 2006-07-06 14:37:00+02:00, guilhem@mysql.com +39 -1
    Test for BUG#20524 "auto_increment_* not observed when inserting
    a too large value".
    We also check the pathological case (table t2) where it's impossible to
    "round down".
    The fixer of BUG#20573 will be able to use table t2 for testing his fix.

  sql/handler.cc@1.167.16.1, 2006-07-06 14:37:00+02:00, guilhem@mysql.com +51 -2
    If handler::update_auto_increment() generates a value larger than the field's
    max possible value, we used to simply insert this max possible value
    (after pushing a warning). Now we "round down" this max possible value to
    honour auto_increment_* variables (if at all possible), before trying the
    insertion.

ChangeSet@1.1810.1894.1, 2006-07-06 13:18:05+03:00, gkodinov@mysql.com +3 -0
  Bug #20569 Garbage in DECIMAL results from some mathematical functions
    Adding decimal "digits" in multiplication resulted in signed overflow and
  producing wrong results.
  
    Fixed by using large enough buffers and intermediary result types :
  dec2 (currently longlong) to hold result of adding decimal "digits" 
  (currently int32). 

  mysql-test/r/select.result@1.121.1.10, 2006-07-06 13:17:50+03:00, gkodinov@mysql.com +3 -0
    BugÂ #20569 Garbage in DECIMAL results from some mathematical functions
      * test suite for the bug

  mysql-test/t/select.test@1.102.1.5, 2006-07-06 13:17:51+03:00, gkodinov@mysql.com +5 -0
    BugÂ #20569 Garbage in DECIMAL results from some mathematical functions
      * test suite for the bug

  strings/decimal.c@1.65.1.4, 2006-07-06 13:17:51+03:00, gkodinov@mysql.com +10 -3
    BugÂ #20569 Garbage in DECIMAL results from some mathematical functions
      * fixed the overflow in adding decimal "digits"

ChangeSet@1.2181.113.6, 2006-07-06 13:33:23+04:00, dlenev@mysql.com +11 -0
  After merge fixes for patch solving bug#18437 "Wrong values inserted with a
  before update trigger on NDB table".
  
  Two main changes:
  - We use TABLE::read_set/write_set bitmaps for marking fields used by
    statement instead of Field::query_id in 5.1.
  - Now when we mark columns used by statement we take into account columns 
    used by table's triggers instead of marking all columns as used if table
    has triggers.

  mysql-test/r/federated.result@1.32, 2006-07-06 13:33:16+04:00, dlenev@mysql.com +3 -3
    Changed test in order to make it work with RBR.
    RBR changes the way in which we execute "DELETE FROM t1" statement - we don't
    use handler::delete_all_rows() method if RBR is enabled (see bug#19066).
    As result federated engine produces different sequences of statements for
    remote server in non-RBR and in RBR cases. And this changes order of the
    rows inserted by following INSERT statements.

  mysql-test/t/federated.test@1.28, 2006-07-06 13:33:16+04:00, dlenev@mysql.com +3 -3
    Changed test in order to make it work with RBR.
    RBR changes the way in which we execute "DELETE FROM t1" statement - we don't
    use handler::delete_all_rows() method if RBR is enabled (see bug#19066).
    As result federated engine produces different sequences of statements for
    remote server in non-RBR and in RBR cases. And this changes order of the
    rows inserted by following INSERT statements.

  sql/ha_partition.cc@1.59.1.1, 2006-07-06 13:33:16+04:00, dlenev@mysql.com +21 -0
    Added handling of HA_EXTRA_WRITE_CAN_REPLACE/HA_EXTRA_WRITE_CANNOT_REPLACE
    to ha_partition::extra().

  sql/item.cc@1.197, 2006-07-06 13:33:16+04:00, dlenev@mysql.com +5 -5
    Adjusted comment after merge. In 5.1 we use TABLE::read_set/write_set
    bitmaps instead of Field::query_id for marking columns used.

  sql/log_event.cc@1.230.1.1, 2006-07-06 13:33:16+04:00, dlenev@mysql.com +1 -0
    Write_rows_log_event::do_before_row_operations():
      Now we explicitly inform handler that we want to replace rows so it can
      promote operation done by write_row() to replace.

  sql/mysql_priv.h@1.418, 2006-07-06 13:33:16+04:00, dlenev@mysql.com +0 -2
    Removed declaration of mark_fields_used_by_triggers_for_insert_stmt() which
    is no longer used (we have TABLE::mark_columns_needed_for_insert() instead).

  sql/sql_insert.cc@1.206.1.2, 2006-07-06 13:33:17+04:00, dlenev@mysql.com +16 -58
    Adjusted code after merge. Get rid of mark_fields_used_by_triggers_for_insert_stmt()
    as now we use TABLE::mark_columns_needed_for_insert() for the same purprose.
    Aligned places where we call this method with places where we call
    mark_fields_used_by_triggers_for_insert() in 5.0.
    Finally we no longer need to call handler::extra(HA_EXTRA_WRITE_CAN_REPLACE)
    in case of REPLACE statement since in 5.1 write_record() marks all columns
    as used before doing actual row replacement.

  sql/sql_load.cc@1.102, 2006-07-06 13:33:17+04:00, dlenev@mysql.com +4 -10
    Adjusted code after merge. In 5.1 we use TABLE::mark_columns_needed_for_insert() instead of
    mark_fields_used_by_triggers_for_insert_stmt() routine. We also no longer
    need to call handler::extra(HA_EXTRA_RETRIEVE_ALL_COLS) if we execute LOAD
    DATA REPLACE since in 5.1 write_record() will mark all columns as used before
    doing actual row replacement.

  sql/sql_trigger.cc@1.58, 2006-07-06 13:33:17+04:00, dlenev@mysql.com +8 -3
    Table_triggers_list::mark_fields_used():
      We use TABLE::read_set/write_set bitmaps for marking fields used instead
      of Field::query_id in 5.1.

  sql/sql_trigger.h@1.22, 2006-07-06 13:33:17+04:00, dlenev@mysql.com +1 -5
    TABLE::mark_columns_needed_for_* methods no longer need to be friends of
    Table_triggers_list class as intead of dirrectly accessing its private
    members they can use public Table_triggers_list::mark_fields_used() method.
    Also Table_triggers)list::mark_fields_used() no longer needs THD argument.

  sql/table.cc@1.226.1.1, 2006-07-06 13:33:17+04:00, dlenev@mysql.com +10 -26
    TABLE::mark_columns_needed_for_*():
      Now we mark columns which are really used by table's triggers instead of
      marking all columns as used if table has triggers.

ChangeSet@1.2181.134.4, 2006-07-06 10:20:49+02:00, tomas@poseidon.ndb.mysql.com +2 -0
  corrected results

  mysql-test/r/ndb_dd_advance2.result@1.2, 2006-07-06 10:20:25+02:00, tomas@poseidon.ndb.mysql.com +3 -2
    corrected results

  mysql-test/t/ndb_dd_advance2.test@1.2, 2006-07-06 10:20:25+02:00, tomas@poseidon.ndb.mysql.com +3 -2
    corrected results

ChangeSet@1.1810.1710.9, 2006-07-06 09:38:18+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - revert bug fix for bug#20442

  ndb/src/ndbapi/NdbScanOperation.cpp@1.66.8.1, 2006-07-06 09:38:15+02:00, jonas@perch.ndb.mysql.com +0 -60
    ndb - revert bug fix for bug#20442

ChangeSet@1.2181.135.1, 2006-07-06 04:37:03+02:00, ngrishakin@mysql.com +4 -0
  ndb_dd_advance test cases

  mysql-test/r/ndb_dd_advance.result@1.1, 2006-07-06 04:36:11+02:00, ngrishakin@mysql.com +1088 -0
    ndb_dd_advance.result

  mysql-test/r/ndb_dd_advance.result@1.0, 2006-07-06 04:36:11+02:00, ngrishakin@mysql.com +0 -0
    BitKeeper file /home/ndbdev/ngrishakin/mysql-5.1-new-ndb/mysql-test/r/ndb_dd_advance.result

  mysql-test/t/ndb_dd_advance.test@1.1, 2006-07-06 04:35:22+02:00, ngrishakin@mysql.com +630 -0
    ndb_dd_advance.test

  mysql-test/t/ndb_dd_advance.test@1.0, 2006-07-06 04:35:22+02:00, ngrishakin@mysql.com +0 -0
    BitKeeper file /home/ndbdev/ngrishakin/mysql-5.1-new-ndb/mysql-test/t/ndb_dd_advance.test

  mysql-test/r/ndb_dd_advance2.result@1.1, 2006-07-06 04:36:28+02:00, ngrishakin@mysql.com +745 -0
    ndb_dd_advance2.result

  mysql-test/r/ndb_dd_advance2.result@1.0, 2006-07-06 04:36:28+02:00, ngrishakin@mysql.com +0 -0
    BitKeeper file /home/ndbdev/ngrishakin/mysql-5.1-new-ndb/mysql-test/r/ndb_dd_advance2.result

  mysql-test/t/ndb_dd_advance2.test@1.1, 2006-07-06 04:35:39+02:00, ngrishakin@mysql.com +723 -0
    ndb_dd_advance2.test

  mysql-test/t/ndb_dd_advance2.test@1.0, 2006-07-06 04:35:39+02:00, ngrishakin@mysql.com +0 -0
    BitKeeper file /home/ndbdev/ngrishakin/mysql-5.1-new-ndb/mysql-test/t/ndb_dd_advance2.test

ChangeSet@1.1616.2676.3, 2006-07-05 17:18:59-07:00, acurtis@xiphis.org +3 -0
  Bug#8706
    "temporary table with data directory option fails"
    myisam should not use user-specified table name when creating
    temporary tables and use generated connection specific real name.
    Test included.

  mysql-test/r/myisam.result@1.45.1.17, 2006-07-05 17:18:56-07:00, acurtis@xiphis.org +21 -0
    Bug#8706
      Test for bug

  mysql-test/t/myisam.test@1.33.1.15, 2006-07-05 17:18:56-07:00, acurtis@xiphis.org +31 -0
    Bug#8706
      Test for bug

  myisam/mi_create.c@1.37.5.1, 2006-07-05 17:18:56-07:00, acurtis@xiphis.org +29 -7
    Bug#8706
      When creating a temporary table with directory override, ensure that
      the real filename is using the hidden temporary name otherwise
      multiple clients cannot have same named temporary tables without
      conflict.

ChangeSet@1.2181.134.2, 2006-07-06 01:33:53+02:00, tomas@poseidon.ndb.mysql.com +2 -0
  Bug #20843 tests fails randomly with assertion in completeClusterFailed
  - flush gci needs to be reset on disconnect as cluster may reconnect after --initial with a smaller gci

  mysql-test/t/disabled.def@1.174, 2006-07-06 01:33:37+02:00, tomas@poseidon.ndb.mysql.com +0 -1
    Bug #20843 tests fails randomly with assertion in completeClusterFailed
    - flush gci needs to be reset on disconnect as cluster may reconnect after --initial with a smaller gci

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.66, 2006-07-06 01:33:38+02:00, tomas@poseidon.ndb.mysql.com +4 -0
    Bug #20843 tests fails randomly with assertion in completeClusterFailed
    reenabled test

ChangeSet@1.2181.119.15, 2006-07-05 23:50:29+02:00, ngrishakin@mysql.com +4 -0
  .del-ndb_dd_advance.result~165b282a93715547:
    Delete: mysql-test/r/ndb_dd_advance.result
  .del-ndb_dd_advance2.result~89be9fe55c2fda5a:
    Delete: mysql-test/r/ndb_dd_advance2.result
  .del-ndb_dd_advance2.test~e9e56bc3e8e8f740:
    Delete: mysql-test/t/ndb_dd_advance2.test
  .del-ndb_dd_advance.test~58e757b6c1d33996:
    Delete: mysql-test/t/ndb_dd_advance.test

  BitKeeper/deleted/.del-ndb_dd_advance.result~165b282a93715547@1.5, 2006-07-05 23:49:35+02:00, ngrishakin@mysql.com +0 -0
    Delete: mysql-test/r/ndb_dd_advance.result

  BitKeeper/deleted/.del-ndb_dd_advance.test~58e757b6c1d33996@1.5, 2006-07-05 23:49:08+02:00, ngrishakin@mysql.com +0 -0
    Delete: mysql-test/t/ndb_dd_advance.test

  BitKeeper/deleted/.del-ndb_dd_advance2.result~89be9fe55c2fda5a@1.5, 2006-07-05 23:49:29+02:00, ngrishakin@mysql.com +0 -0
    Delete: mysql-test/r/ndb_dd_advance2.result

  BitKeeper/deleted/.del-ndb_dd_advance2.test~e9e56bc3e8e8f740@1.5, 2006-07-05 23:49:16+02:00, ngrishakin@mysql.com +0 -0
    Delete: mysql-test/t/ndb_dd_advance2.test

ChangeSet@1.2181.134.1, 2006-07-05 23:12:48+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  disabled ndb_autodiscover3 again

  mysql-test/t/disabled.def@1.173, 2006-07-05 23:12:40+02:00, tomas@poseidon.ndb.mysql.com +1 -0
    disabled ndb_autodiscover3 again

ChangeSet@1.2181.117.4, 2006-07-05 16:06:51-04:00, mikael@dator5.(none) +3 -0
  BUG#20770: Added some more test cases

  mysql-test/r/partition_range.result@1.14, 2006-07-05 16:05:39-04:00, mikael@dator5.(none) +112 -0
    New test case

  mysql-test/t/partition_range.test@1.10, 2006-07-05 16:05:39-04:00, mikael@dator5.(none) +87 -0
    New test case

  sql/partition_info.cc@1.21, 2006-07-05 16:05:39-04:00, mikael@dator5.(none) +0 -0
    No changes

ChangeSet@1.2181.131.6, 2006-07-05 21:44:11+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  Bug #20843 tests fails randomly with assertion in completeClusterFailed
  - reenabled test as this now seems fixed

  mysql-test/t/disabled.def@1.172, 2006-07-05 21:44:01+02:00, tomas@poseidon.ndb.mysql.com +0 -4
    Bug #20843 tests fails randomly with assertion in completeClusterFailed
    - reenabled test as this now seems fixed

ChangeSet@1.2181.120.3, 2006-07-05 21:17:00+02:00, mats@mysql.com +1 -0
  Switching to use INSERT DELAYED, which it should be, for rpl_insert.

  mysql-test/t/rpl_insert.test@1.2, 2006-07-05 21:16:47+02:00, mats@mysql.com +1 -1
    Fixing to use INSERT DELAYED.

ChangeSet@1.1810.1892.2, 2006-07-05 20:24:12+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  ndbd: added missing jamEntry();

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@1.13.20.1, 2006-07-05 20:24:00+02:00, tomas@poseidon.ndb.mysql.com +2 -0
    ndbd: added missing jamEntry();

ChangeSet@1.1810.1892.1, 2006-07-05 20:20:39+02:00, tomas@poseidon.ndb.mysql.com +3 -0
  Bug #20419 ndbd --nowait-nodes=<id_of_running_node> fails
  - updated error message to more correctly reflect the issue

  ndb/include/mgmapi/ndbd_exit_codes.h@1.2.3.1, 2006-07-05 20:20:31+02:00, tomas@poseidon.ndb.mysql.com +1 -0
    Bug #20419 ndbd --nowait-nodes=<id_of_running_node> fails
    - updated error message to more correctly reflect the issue

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@1.13.19.1, 2006-07-05 20:20:31+02:00, tomas@poseidon.ndb.mysql.com +7 -9
    Bug #20419 ndbd --nowait-nodes=<id_of_running_node> fails
    - updated error message to more correctly reflect the issue

  ndb/src/kernel/error/ndbd_exit_codes.c@1.1.4.1, 2006-07-05 20:20:31+02:00, tomas@poseidon.ndb.mysql.com +2 -0
    Bug #20419 ndbd --nowait-nodes=<id_of_running_node> fails
    - updated error message to more correctly reflect the issue

ChangeSet@1.1810.1865.7, 2006-07-05 20:17:04+02:00, joerg@mysql.com +1 -0
  Extend the Perl script running the test suite to produce a "Logging:" line (like the shell script does).

  mysql-test/mysql-test-run.pl@1.30.34.1, 2006-07-05 20:16:58+02:00, joerg@mysql.com +5 -0
    Now that the RPM spec files use the Perl script to run the tests, we also need the "Logging:"
    line in its output, because otherwise we lack the information how the test suite was run.
    Add the line.

ChangeSet@1.2181.117.3, 2006-07-05 12:57:23-04:00, mikael@dator5.(none) +5 -0
  BUG#20770: DATA DIRECTORY and INDEX DIRECTORY error when ALTER TABLE ADD/DROP/REORGANIZE partition
             Also some error in handling options for subpartitions.

  mysql-test/r/partition.result@1.46, 2006-07-05 12:57:16-04:00, mikael@dator5.(none) +39 -0
    New test cases

  mysql-test/t/partition.test@1.40.1.12, 2006-07-05 12:57:16-04:00, mikael@dator5.(none) +43 -0
    New test cases

  sql/ha_partition.cc@1.61, 2006-07-05 12:57:16-04:00, mikael@dator5.(none) +15 -8
    Added partition_element to prepare_new_partition so that we can properly set-up table
    before creating partitions.

  sql/ha_partition.h@1.23, 2006-07-05 12:57:16-04:00, mikael@dator5.(none) +4 -2
    Added partition_element to prepare_new_partition so that we can properly set-up table
    before creating partitions.

  sql/sql_yacc.yy@1.484.1.1, 2006-07-05 12:57:16-04:00, mikael@dator5.(none) +5 -4
    Ensure that subpartitions always inherit options from the partition they belong to.
    They can change it afterwards but will use the options as set on partition level
    if set at that level.

ChangeSet@1.2181.132.1, 2006-07-05 18:36:18+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  added warning on cluster reconnect and binlog usage, that data may be missing

  sql/ha_ndbcluster_binlog.cc@1.75, 2006-07-05 18:36:10+02:00, tomas@poseidon.ndb.mysql.com +6 -0
    added warning on cluster reconnect and binlog usage, that data may be missing

ChangeSet@1.2181.131.2, 2006-07-05 16:48:22+02:00, pekka@clam.ndb.mysql.com +1 -0
  ndb - ndb api : try to catch autoincr 'error 0'

  storage/ndb/src/ndbapi/Ndb.cpp@1.77, 2006-07-05 16:47:33+02:00, pekka@clam.ndb.mysql.com +27 -15
    try to catch autoincr 'error 0'

ChangeSet@1.2181.131.1, 2006-07-05 17:36:18+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  Bug #20843 tests fails randomly with assertion in completeClusterFailed

  sql/ha_ndbcluster_binlog.cc@1.74, 2006-07-05 17:36:10+02:00, tomas@poseidon.ndb.mysql.com +10 -3
    Bug #20843 tests fails randomly with assertion in completeClusterFailed

ChangeSet@1.2181.98.7, 2006-07-05 17:12:50+02:00, andrey@lmy004. +14 -0
  WL#3337 (Event scheduler new architecture)
  Cleaned up the code a bit. Fixed few leaks.
  This code still does not load events on server startup
  from disk. The problem is that there is a need for a THD instance, which
  does not exist during server boot. This will be solved soon.
  Still Event_timed is used both for the memory queue and for exectution.
  This will be changed according to WL#3337 probably in the next commit.

  sql/event_scheduler_ng.cc@1.2, 2006-07-05 17:12:41+02:00, andrey@lmy004. +9 -95
    add back DBUG_RETURN(0) in thread handlers.
    We don't stop running events when stopping the scheduler. Therefore
    remove this method now. If it is needed later it can be added back.

  sql/event_scheduler_ng.h@1.2, 2006-07-05 17:12:41+02:00, andrey@lmy004. +2 -6
    Remove stop_all_running_threads()
    init -> init_scheduler
    deinit -> deinit_scheduler
    easier for ctags

  sql/event_data_objects.cc@1.66, 2006-07-05 17:12:41+02:00, andrey@lmy004. +5 -190
    Strip unneeded stuff from class Event_timed
    Event_timed is still used for the queue and execution.
    That will be changed in the next commit.

  sql/event_data_objects.h@1.8, 2006-07-05 17:12:41+02:00, andrey@lmy004. +0 -25
    Strip unneeded stuff from class Event_timed
    Event_timed is still used for the queue and execution.
    That will be changed in the next commit.

  sql/event_db_repository.cc@1.8, 2006-07-05 17:12:41+02:00, andrey@lmy004. +67 -17
    Cosmetics.
    Add a new method load_named_event_job, to be made complete in the 
    next commit. It will load from disk an instance of Event_job_data to
    be used during execution.

  sql/event_db_repository.h@1.6, 2006-07-05 17:12:41+02:00, andrey@lmy004. +8 -4
    find_event does not need MEM_ROOT anymore
    because the memory is allocated on Event's own root.

  sql/event_queue.cc@1.4, 2006-07-05 17:12:41+02:00, andrey@lmy004. +83 -164
    Remove dead code.
    Move dumping of the queue to separate method.
    Make critical sections in create_event & update_event
    as small as possible - load the new event outside of the section
    and free the object also outside of it.

  sql/event_queue.h@1.4, 2006-07-05 17:12:41+02:00, andrey@lmy004. +14 -14
    init -> init_queue -> easier for ctags
    deinit -> deinit_queue -> easier for ctags

  sql/event_scheduler.cc@1.15, 2006-07-05 17:12:41+02:00, andrey@lmy004. +0 -1537
    empty this file

  sql/event_scheduler.h@1.11, 2006-07-05 17:12:41+02:00, andrey@lmy004. +0 -187
    empty this file

  sql/events.cc@1.51, 2006-07-05 17:12:41+02:00, andrey@lmy004. +35 -23
    Cosmetics

  sql/events.h@1.39, 2006-07-05 17:12:41+02:00, andrey@lmy004. +4 -4
    Cosmetics

  sql/set_var.cc@1.181, 2006-07-05 17:12:41+02:00, andrey@lmy004. +0 -4
    Remove references to dead code

  sql/sql_parse.cc@1.563.1.5, 2006-07-05 17:12:41+02:00, andrey@lmy004. +15 -16
    Reorganize a bit.

ChangeSet@1.2181.112.2, 2006-07-05 16:58:56+02:00, mats@mysql.com +5 -0
  BUG#20821 (INSERT DELAYED fails to write some rows to binlog):
  Reverting to old behaviour of writing the query before all rows
  have been written.

  mysql-test/r/rpl_insert.result@1.1, 2006-07-05 16:58:22+02:00, mats@mysql.com +16 -0
    New BitKeeper file ``mysql-test/r/rpl_insert.result''

  mysql-test/r/rpl_insert.result@1.0, 2006-07-05 16:58:22+02:00, mats@mysql.com +0 -0
    BitKeeper file /home/bk/b20821-mysql-5.1-new-rpl/mysql-test/r/rpl_insert.result

  mysql-test/r/rpl_row_delayed_ins.result@1.4, 2006-07-05 16:58:21+02:00, mats@mysql.com +4 -2
    Result change

  mysql-test/t/rpl_insert.test@1.1, 2006-07-05 16:58:22+02:00, mats@mysql.com +27 -0
    New BitKeeper file ``mysql-test/t/rpl_insert.test''

  mysql-test/t/rpl_insert.test@1.0, 2006-07-05 16:58:22+02:00, mats@mysql.com +0 -0
    BitKeeper file /home/bk/b20821-mysql-5.1-new-rpl/mysql-test/t/rpl_insert.test

  sql/sql_class.cc@1.269.3.1, 2006-07-05 16:58:22+02:00, mats@mysql.com +1 -0
    Adding debug message to binlog_query()

  sql/sql_insert.cc@1.206.2.1, 2006-07-05 16:58:22+02:00, mats@mysql.com +58 -40
    - Changing write_delayed() to use a LEX_STRING for the query.
    - Adding query string to class delayed_row.
    - Removing query string from class delayed_insert.
    - Adding code to copy query string and delete it when the row
      is executed.
    - Logging query at first row instead of after all rows are 
      inserted (reverting to old behaviour).
    - Flushing the pending row event after all rows have been inserted.
      This is necessary since binlog_query() is called before all rows
      instead of after.

ChangeSet@1.1810.1865.6, 2006-07-05 16:26:08+02:00, tomas@poseidon.ndb.mysql.com +26 -0
  Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
  - remove some event code to get rid of some bugs

  ndb/include/Makefile.am@1.16.2.1, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -1
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/include/kernel/GlobalSignalNumbers.h@1.7.7.1, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +6 -2
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/include/ndbapi/Ndb.hpp@1.39.9.1, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -47
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/include/ndbapi/NdbApi.hpp@1.8.1.1, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -1
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/include/ndbapi/NdbDictionary.hpp@1.48.8.1, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -186
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/common/debugger/signaldata/SignalDataPrint.cpp@1.10.2.1, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -6
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/common/debugger/signaldata/SignalNames.cpp@1.6.2.1, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -19
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.40.26.1, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -2211
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/kernel/blocks/dbdict/Dbdict.hpp@1.9.12.1, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -261
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.24.35.1, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -9
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@1.14.11.1, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -3
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@1.13.17.1, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -1
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/kernel/blocks/suma/Suma.cpp@1.19.3.1, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +1 -2244
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/kernel/blocks/suma/Suma.hpp@1.3.3.1, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -186
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/kernel/blocks/suma/SumaInit.cpp@1.6.2.1, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -52
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/ndbapi/Makefile.am@1.12.3.1, 2006-07-05 16:26:00+02:00, tomas@poseidon.ndb.mysql.com +0 -2
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/ndbapi/Ndb.cpp@1.49.12.1, 2006-07-05 16:26:01+02:00, tomas@poseidon.ndb.mysql.com +0 -46
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/ndbapi/NdbDictionary.cpp@1.34.5.1, 2006-07-05 16:26:01+02:00, tomas@poseidon.ndb.mysql.com +0 -148
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.74.26.1, 2006-07-05 16:26:01+02:00, tomas@poseidon.ndb.mysql.com +0 -735
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/ndbapi/NdbDictionaryImpl.hpp@1.30.10.1, 2006-07-05 16:26:01+02:00, tomas@poseidon.ndb.mysql.com +0 -92
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/ndbapi/Ndberr.cpp@1.11.1.1, 2006-07-05 16:26:01+02:00, tomas@poseidon.ndb.mysql.com +0 -8
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/ndbapi/Ndbif.cpp@1.27.6.1, 2006-07-05 16:26:01+02:00, tomas@poseidon.ndb.mysql.com +0 -18
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/src/ndbapi/Ndbinit.cpp@1.29.5.1, 2006-07-05 16:26:01+02:00, tomas@poseidon.ndb.mysql.com +0 -16
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/test/include/HugoTransactions.hpp@1.7.1.1, 2006-07-05 16:26:01+02:00, tomas@poseidon.ndb.mysql.com +0 -3
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/test/ndbapi/Makefile.am@1.19.9.1, 2006-07-05 16:26:01+02:00, tomas@poseidon.ndb.mysql.com +2 -4
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

  ndb/test/src/HugoTransactions.cpp@1.24.1.1, 2006-07-05 16:26:01+02:00, tomas@poseidon.ndb.mysql.com +0 -279
    Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
    - remove some event code to get rid of some bugs

ChangeSet@1.1810.1889.5, 2006-07-05 16:23:18+02:00, ingo@mysql.com +3 -0
  After merge fix

  mysql-test/r/gis.result@1.30.1.2, 2006-07-05 16:23:12+02:00, ingo@mysql.com +10 -9
    After merge fix

  mysql-test/r/key.result@1.28.3.2, 2006-07-05 16:23:13+02:00, ingo@mysql.com +2 -2
    After merge fix

  mysql-test/t/gis.test@1.25.1.2, 2006-07-05 16:23:13+02:00, ingo@mysql.com +7 -5
    After merge fix

ChangeSet@1.2181.130.2, 2006-07-05 15:32:17+02:00, mskold@mysql.com +1 -0
  Bug #19645  Data Node hangs in phase 100: post review fix, removed test printout

  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@1.36, 2006-07-05 15:31:17+02:00, mskold@mysql.com +0 -2
    Bug #19645  Data Node hangs in phase 100: post review fix, removed test printout

ChangeSet@1.2181.130.1, 2006-07-05 15:04:47+02:00, mskold@mysql.com +3 -0
  Bug #19645  Data Node hangs in phase 100: distribute API_FAIL_REQ so all nodes have the same view of what API's are connected

  storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp@1.14, 2006-07-05 15:03:25+02:00, mskold@mysql.com +1 -0
    Bug #19645  Data Node hangs in phase 100: distribute API_FAIL_REQ so all nodes have the same view of what API's are connected

  storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp@1.11, 2006-07-05 15:03:26+02:00, mskold@mysql.com +1 -0
    Bug #19645  Data Node hangs in phase 100: distribute API_FAIL_REQ so all nodes have the same view of what API's are connected

  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@1.35, 2006-07-05 15:03:26+02:00, mskold@mysql.com +25 -0
    Bug #19645  Data Node hangs in phase 100: distribute API_FAIL_REQ so all nodes have the same view of what API's are connected

ChangeSet@1.1810.1890.1, 2006-07-05 14:41:35+02:00, guilhem@mysql.com +5 -0
  Fix for BUG#20188 "REPLACE or ON DUPLICATE KEY UPDATE in
  auto_increment breaks binlog":
  if slave's table had a higher auto_increment counter than master's (even
  though all rows of the two tables were identical), then in some cases,
  REPLACE and INSERT ON DUPLICATE KEY UPDATE failed to replicate
  statement-based (it inserted different values on slave from on master).
  write_record() contained a "thd->next_insert_id=0" to force an adjustment
  of thd->next_insert_id after the update or replacement. But it is this
  assigment introduced indeterminism of the statement on the slave, thus
  the bug. For ON DUPLICATE, we replace that assignment by a call to
  handler::adjust_next_insert_id_after_explicit_value() which is deterministic
  (does not depend on slave table's autoinc counter). For REPLACE, this
  assignment can simply be removed (as REPLACE can't insert a number larger
  than thd->next_insert_id).
  We also move a too early restore_auto_increment() down to when we really know
  that we can restore the value.

  mysql-test/r/rpl_insert_id.result@1.12.3.2, 2006-07-05 14:40:58+02:00, guilhem@mysql.com +65 -0
    result update, without the bugfix, slave's "3 350" were "4 350".

  mysql-test/t/rpl_insert_id.test@1.13.1.4, 2006-07-05 14:40:58+02:00, guilhem@mysql.com +63 -0
    test for BUG#20188 "REPLACE or ON DUPLICATE KEY UPDATE in
    auto_increment breaks binlog".
    There is, in this order:
    - a test of the bug for the case of REPLACE
    - a test of basic ON DUPLICATE KEY UPDATE functionality which was not
    tested before
    - a test of the bug for the case of ON DUPLICATE KEY UPDATE

  sql/handler.cc@1.167.1.46, 2006-07-05 14:40:58+02:00, guilhem@mysql.com +21 -11
    the adjustment of next_insert_id if inserting a big explicit value, is
    moved to a separate method to be used elsewhere.

  sql/handler.h@1.138.13.1, 2006-07-05 14:40:58+02:00, guilhem@mysql.com +1 -0
    see handler.cc

  sql/sql_insert.cc@1.146.28.1, 2006-07-05 14:40:58+02:00, guilhem@mysql.com +7 -13
    restore_auto_increment() means "I know I won't use this autogenerated
    autoincrement value, you are free to reuse it for next row". But we were
    calling restore_auto_increment() in the case of REPLACE: if write_row() fails
    inserting the row, we don't know that we won't use the value, as we are going to
    try again by doing internally an UPDATE of the existing row, or a DELETE
    of the existing row and then an INSERT. So I move restore_auto_increment()
    further down, when we know for sure we failed all possibilities for the row.
    Additionally, in case of REPLACE, we don't need to reset THD::next_insert_id:
    the value of thd->next_insert_id will be suitable for the next row.
    In case of ON DUPLICATE KEY UPDATE, resetting thd->next_insert_id is also
    wrong (breaks statement-based binlog), but cannot simply be removed, as
    thd->next_insert_id must be adjusted if the explicit value exceeds it.
    We now do the adjustment by calling
    handler::adjust_next_insert_id_after_explicit_value() (which, contrary to
    thd->next_insert_id=0, does not depend on the slave table's autoinc counter,
    and so is deterministic).

ChangeSet@1.2181.129.1, 2006-07-05 14:20:14+02:00, tomas@poseidon.ndb.mysql.com +4 -0
      extra logging and asserts to try to track down the spurious completeCluster failure assetion
      corrected error in invalidation of dict cache which may be causing the valgrind warning at times

  sql/ha_ndbcluster_binlog.cc@1.73, 2006-07-05 14:20:01+02:00, tomas@poseidon.ndb.mysql.com +5 -0
    extra logging and asserts to try to track down the spurious completeCluster failure assetion

  storage/ndb/src/ndbapi/DictCache.cpp@1.28, 2006-07-05 14:20:01+02:00, tomas@poseidon.ndb.mysql.com +8 -5
    corrected error in invalidation of dict cache which may be causing the valgrind warning at times

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.65, 2006-07-05 14:20:01+02:00, tomas@poseidon.ndb.mysql.com +48 -5
    extra logging and asserts to try to track down the spurious completeCluster failure assetion

  storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp@1.27, 2006-07-05 14:20:01+02:00, tomas@poseidon.ndb.mysql.com +1 -0
    extra logging and asserts to try to track down the spurious completeCluster failure assetion

ChangeSet@1.2181.123.8, 2006-07-05 01:52:38+02:00, tomas@poseidon.ndb.mysql.com +1 -0
   Bug #20077 Cluster to only support partition by key, needs to error on others

  sql/ha_ndbcluster.cc@1.336.2.3, 2006-07-05 01:52:29+02:00, tomas@poseidon.ndb.mysql.com +1 -1
     Bug #20077 Cluster to only support partition by key, needs to error on others

ChangeSet@1.2181.123.7, 2006-07-05 01:50:16+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  Bug #20077 Cluster to only support partition by key, needs to error on others

  mysql-test/t/ndb_dd_backuprestore.test@1.7, 2006-07-05 01:50:06+02:00, tomas@poseidon.ndb.mysql.com +4 -0
    Bug #20077 Cluster to only support partition by key, needs to error on others

ChangeSet@1.2181.125.1, 2006-07-04 22:37:32+02:00, knielsen@rt.int.sifira.dk +2 -0
  Fix hardcoded /tmp path (which causes problems when running multiple
  tests on a single machine) to use $MYSQLTEST_VARDIR/tmp instead.

  mysql-test/r/log_state.result@1.3, 2006-07-04 22:37:28+02:00, knielsen@rt.int.sifira.dk +1 -1
    Fix hardcoded /tmp/ path.

  mysql-test/t/log_state.test@1.3, 2006-07-04 22:37:28+02:00, knielsen@rt.int.sifira.dk +2 -1
    Fix hardcoded /tmp/ path.

ChangeSet@1.1810.1882.3, 2006-07-04 23:46:15+04:00, konstantin@mysql.com +8 -0
  A fix and a test case for Bug#17843 "Certain stored procedures fail to 
  run at startup"
  
  The server returned an error when trying to execute init-file with a 
  stored procedure that could return multiple result sets to the client. 
  A stored procedure can return multiple result sets if it contains 
  PREPARE, SELECT, SHOW and similar statements.
     
  The fix is to set client_capabilites|=CLIENT_MULTI_RESULTS in
  sql_parse.cc:handle_bootstrap(). There is no "client" really, so 
  nothing is ever sent. This makes init-file feature behave consistently: 
  the prepared statements that can be called directly in the init-file 
  can be used in a stored procedure too.
  
  Re-committed the patch originally submitted by Per-Erik after review.

  mysql-test/Makefile.am@1.66.1.4, 2006-07-04 23:46:10+04:00, konstantin@mysql.com +5 -5
    Fix re-make without make clean.

  mysql-test/r/init_connect.result@1.5, 2006-07-04 23:46:10+04:00, konstantin@mysql.com +114 -0
    Updated results (a test case for Bug#17843)

  mysql-test/r/init_file.result@1.2, 2006-07-04 23:46:10+04:00, konstantin@mysql.com +15 -0
    Updated results (a test case for Bug#17843)

  mysql-test/std_data/init_file.dat@1.6, 2006-07-04 23:46:10+04:00, konstantin@mysql.com +28 -0
    Add test coverage for new features added in 5.0. Note, that what can 
    be done in init_file is very limited as it does not support any other
    delimiter except ';' -- only "one liners" and no multiple statement 
    procedures. Also, this is executed with a dummy user "boot@", which 
    calls for the use of DEFINER clause.

  mysql-test/t/init_connect.test@1.5.1.2, 2006-07-04 23:46:11+04:00, konstantin@mysql.com +202 -1
    Add test coverage for new features added in 5.0.

  mysql-test/t/init_file.test@1.8, 2006-07-04 23:46:11+04:00, konstantin@mysql.com +12 -2
    Add test coverage for new features added in 5.0 --
    stored routines, views, triggers. The actual tests are in 
    std_data/init_file.dat, here we just check the results and clean up.

  sql/sql_class.cc@1.223.1.14, 2006-07-04 23:46:11+04:00, konstantin@mysql.com +1 -0
    Initialize Security_context::priv_host to an empty string:
    when executing an init-file, sql_parse.cc:get_default_definer()
    will use this for the value of the definer if it's not set in the query.

  sql/sql_parse.cc@1.426.94.5, 2006-07-04 23:46:11+04:00, konstantin@mysql.com +6 -0
    Set CLIENT_MULTI_RESULTS in handle_bootstrap(), to make prepared
    statements work in stored procedures called from init-file.

ChangeSet@1.2181.98.6, 2006-07-04 18:44:35+02:00, andrey@lmy004. +24 -0
  WL #3337 (Event scheduler new architecture)
  Cut Nr. 8.
  
  All tests pass.
  
  Separated Event_scheduler into Event_queue and Event_scheduler.
  Added new Event_scheduler_ng which is the new scheduler and is used
  system-wide. Will be moved to the event_scheduler.cc in the future.
  Using Event_timed in Event_queue as well as cloned during execution.
  Next step is to have Event_worker_data which will be used during execution
  and will take ::compile()/::execute() out of Event_timed.

  sql/event_scheduler_ng.cc@1.1, 2006-07-04 18:44:18+02:00, andrey@lmy004. +686 -0

  sql/event_scheduler_ng.cc@1.0, 2006-07-04 18:44:18+02:00, andrey@lmy004. +0 -0
    BitKeeper file /work/mysql-5.1-runtime-wl3337/sql/event_scheduler_ng.cc

  sql/event_scheduler_ng.h@1.1, 2006-07-04 18:44:21+02:00, andrey@lmy004. +121 -0

  sql/event_scheduler_ng.h@1.0, 2006-07-04 18:44:21+02:00, andrey@lmy004. +0 -0
    BitKeeper file /work/mysql-5.1-runtime-wl3337/sql/event_scheduler_ng.h

  mysql-test/r/events.result@1.39, 2006-07-04 18:44:07+02:00, andrey@lmy004. +2 -4
    update result

  mysql-test/r/events_bugs.result@1.14, 2006-07-04 18:44:07+02:00, andrey@lmy004. +5 -5
    update result

  mysql-test/r/ps_1general.result@1.60, 2006-07-04 18:44:09+02:00, andrey@lmy004. +1 -1
    update result

  mysql-test/r/skip_name_resolve.result@1.7, 2006-07-04 18:44:09+02:00, andrey@lmy004. +0 -1
    update result

  mysql-test/r/sp-threads.result@1.8, 2006-07-04 18:44:09+02:00, andrey@lmy004. +0 -1
    update result

  mysql-test/r/sp_notembedded.result@1.5, 2006-07-04 18:44:10+02:00, andrey@lmy004. +0 -2
    update result

  mysql-test/r/status.result@1.13, 2006-07-04 18:44:10+02:00, andrey@lmy004. +5 -5
    update result

  mysql-test/t/events_stress.test@1.6.1.1, 2006-07-04 18:44:11+02:00, andrey@lmy004. +2 -2
    Make event_stress a bit longer

  sql/Makefile.am@1.148, 2006-07-04 18:44:11+02:00, andrey@lmy004. +3 -3
    Add new event_scheduler_ng.h/cc . These are only to be in the experimental
    clone. Later their content will be moved to event_scheduler.h/cc

  sql/event_data_objects.cc@1.65, 2006-07-04 18:44:13+02:00, andrey@lmy004. +22 -25
    Allocate strings memory on own memory root, instead
    on the schedulers. Thus don't "leak" memory. This should
    fix bug#18683 memory leak in event scheduler

  sql/event_data_objects.h@1.7, 2006-07-04 18:44:13+02:00, andrey@lmy004. +30 -3
    add mem_root
    add THD - this is only temporal, will be moved to class Event_job_data
    once Event_job_data is responsible for the execution.

  sql/event_db_repository.cc@1.7, 2006-07-04 18:44:14+02:00, andrey@lmy004. +9 -136
    Remove unused code.
    Cosmetic changes

  sql/event_queue.cc@1.3, 2006-07-04 18:44:14+02:00, andrey@lmy004. +129 -40
    Now use the Event_scheduler_ng (NextGen)

  sql/event_queue.h@1.3, 2006-07-04 18:44:15+02:00, andrey@lmy004. +20 -10
    Now use the Event_scheduler_ng (NextGen)

  sql/event_scheduler.cc@1.14, 2006-07-04 18:44:15+02:00, andrey@lmy004. +60 -242
    This file is no more used, but will be soon.

  sql/event_scheduler.h@1.10, 2006-07-04 18:44:16+02:00, andrey@lmy004. +22 -9
    This file is no more used but will be soon

  sql/events.cc@1.50, 2006-07-04 18:44:16+02:00, andrey@lmy004. +50 -28
    Now use the Event_scheduler_ng (NextGen)

  sql/events.h@1.38, 2006-07-04 18:44:16+02:00, andrey@lmy004. +13 -0
    Now use the Event_scheduler_ng (NextGen)

  sql/mysqld.cc@1.566, 2006-07-04 18:44:17+02:00, andrey@lmy004. +1 -1
    Make it again possible to kill the scheduler thread

  sql/set_var.cc@1.180, 2006-07-04 18:44:17+02:00, andrey@lmy004. +15 -11
    Now use the Event_scheduler_ng (NextGen)

  sql/share/errmsg.txt@1.114, 2006-07-04 18:44:17+02:00, andrey@lmy004. +1 -1
    Shorten the message.

  sql/sql_show.cc@1.356, 2006-07-04 18:44:18+02:00, andrey@lmy004. +1 -1
    Loading is on a own root, then don't use thd->mem_root

ChangeSet@1.2181.123.6, 2006-07-04 18:29:21+02:00, tomas@poseidon.ndb.mysql.com +5 -0
  Bug #20077 Cluster to only support partition by key, needs to error on others

  mysql-test/t/ndb_blob_partition.test@1.2, 2006-07-04 18:29:12+02:00, tomas@poseidon.ndb.mysql.com +4 -0
    Bug #20077 Cluster to only support partition by key, needs to error on others

  mysql-test/t/ndb_partition_error.test@1.2, 2006-07-04 18:29:12+02:00, tomas@poseidon.ndb.mysql.com +3 -0
    Bug #20077 Cluster to only support partition by key, needs to error on others

  mysql-test/t/ndb_partition_list.test@1.2, 2006-07-04 18:29:12+02:00, tomas@poseidon.ndb.mysql.com +4 -0
    Bug #20077 Cluster to only support partition by key, needs to error on others

  mysql-test/t/ndb_partition_range.test@1.2, 2006-07-04 18:29:12+02:00, tomas@poseidon.ndb.mysql.com +4 -0
    Bug #20077 Cluster to only support partition by key, needs to error on others

  sql/ha_ndbcluster.cc@1.336.2.2, 2006-07-04 18:29:12+02:00, tomas@poseidon.ndb.mysql.com +0 -2
    Bug #20077 Cluster to only support partition by key, needs to error on others

ChangeSet@1.2181.123.5, 2006-07-04 17:58:20+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  Bug #20742 Assertion in drop of ndb binlog events after node restart

  storage/ndb/include/ndbapi/Ndb.hpp@1.57, 2006-07-04 17:58:11+02:00, tomas@poseidon.ndb.mysql.com +1 -0
    Bug #20742 Assertion in drop of ndb binlog events after node restart

ChangeSet@1.2181.123.4, 2006-07-04 17:37:44+02:00, tomas@poseidon.ndb.mysql.com +6 -0
  Bug #20742 Assertion in drop of ndb binlog events after node restart
  - make sure TE_ACTIVE event comes when node restarts so that ref counting is correct for drop of event

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@1.45, 2006-07-04 17:37:33+02:00, tomas@poseidon.ndb.mysql.com +2 -1
    Bug #20742 Assertion in drop of ndb binlog events after node restart
    - make sure TE_ACTIVE event comes when node restarts so that ref counting is correct for drop of event

  storage/ndb/src/ndbapi/ClusterMgr.cpp@1.28, 2006-07-04 17:37:33+02:00, tomas@poseidon.ndb.mysql.com +3 -0
    Bug #20742 Assertion in drop of ndb binlog events after node restart
    - make sure TE_ACTIVE event comes when node restarts so that ref counting is correct for drop of event

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.64, 2006-07-04 17:37:33+02:00, tomas@poseidon.ndb.mysql.com +40 -0
    Bug #20742 Assertion in drop of ndb binlog events after node restart
    - make sure TE_ACTIVE event comes when node restarts so that ref counting is correct for drop of event

  storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp@1.26, 2006-07-04 17:37:33+02:00, tomas@poseidon.ndb.mysql.com +1 -0
    Bug #20742 Assertion in drop of ndb binlog events after node restart
    - make sure TE_ACTIVE event comes when node restarts so that ref counting is correct for drop of event

  storage/ndb/src/ndbapi/Ndbif.cpp@1.42, 2006-07-04 17:37:33+02:00, tomas@poseidon.ndb.mysql.com +15 -0
    Bug #20742 Assertion in drop of ndb binlog events after node restart
    - make sure TE_ACTIVE event comes when node restarts so that ref counting is correct for drop of event

  storage/ndb/src/ndbapi/TransporterFacade.cpp@1.51, 2006-07-04 17:37:33+02:00, tomas@poseidon.ndb.mysql.com +3 -0
    Bug #20742 Assertion in drop of ndb binlog events after node restart
    - make sure TE_ACTIVE event comes when node restarts so that ref counting is correct for drop of event

ChangeSet@1.2181.109.4, 2006-07-04 17:30:39+02:00, andrey@lmy004. +3 -0
  fix test. this should remove the problem of 
  fix for bug#20624  events_logs_tests.test fails randomly

  BitKeeper/etc/ignore@1.246.2.1, 2006-07-04 17:30:31+02:00, andrey@lmy004. +1 -0
    Added server-tools/instance-manager/net_serv.cc to the ignore list

  mysql-test/r/events_logs_tests.result@1.11, 2006-07-04 17:30:31+02:00, andrey@lmy004. +1 -1
    update result

  mysql-test/t/events_logs_tests.test@1.11, 2006-07-04 17:30:31+02:00, andrey@lmy004. +1 -1
    fix test. this should remove the problem of 
    Bug #20624  events_logs_tests.test fails randomly

ChangeSet@1.1810.1887.1, 2006-07-04 16:54:07+02:00, jonas@mc01.ndb.mysql.com +1 -0
  ndb - ps_7ndb as discovered by pb
    fix race in scan close

  ndb/src/ndbapi/NdbScanOperation.cpp@1.66.6.3, 2006-07-04 16:51:26+02:00, jonas@mc01.ndb.mysql.com +4 -1
    Fix race in scan close

ChangeSet@1.1616.2675.2, 2006-07-04 15:11:11+02:00, pekka@clam.ndb.mysql.com +1 -0
  ndb - bug#20847 fix (4.1)

  ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp@1.2.1.1, 2006-07-04 15:09:39+02:00, pekka@clam.ndb.mysql.com +3 -2
    DROP did not do merge with right buddies

ChangeSet@1.1616.2676.1, 2006-07-04 17:40:40+05:00, bar@mysql.com +13 -0
  WL#2928 Date Translation NRE
  
  (implemented by by Josh Chamas)

  BitKeeper/etc/ignore@1.153.1.82, 2006-07-04 17:40:16+05:00, bar@mysql.com +1 -0
    Added libmysqld/sql_locale.cc to the ignore list

  libmysqld/Makefile.am@1.29.1.33, 2006-07-04 17:40:15+05:00, bar@mysql.com +1 -1
    Adding new source file

  mysql-test/r/date_formats.result@1.15.1.6, 2006-07-04 17:40:15+05:00, bar@mysql.com +16 -0
    Adding test case

  mysql-test/t/date_formats.test@1.11.1.7, 2006-07-04 17:40:15+05:00, bar@mysql.com +14 -0
    Adding test case

  sql/Makefile.am@1.77.1.39, 2006-07-04 17:40:15+05:00, bar@mysql.com +1 -1
    Adding new source file

  sql/item_timefunc.cc@1.51.1.53, 2006-07-04 17:40:16+05:00, bar@mysql.com +38 -28
    Using current locale data, instead of hard coded English names.

  sql/mysql_priv.h@1.186.91.51, 2006-07-04 17:40:16+05:00, bar@mysql.com +18 -0
    Adding new type MY_LOCALE, and declaring new global variables.

  sql/set_var.cc@1.34.66.1, 2006-07-04 17:40:16+05:00, bar@mysql.com +43 -0
    Adding "lc_time_names" system variable.

  sql/set_var.h@1.54.1.7, 2006-07-04 17:40:16+05:00, bar@mysql.com +21 -0
    Adding "lc_time_names" system variable.

  sql/sql_cache.cc@1.46.12.12, 2006-07-04 17:40:16+05:00, bar@mysql.com +2 -0
    Adding lc_time_names as a query cache flag.

  sql/sql_class.cc@1.105.1.102, 2006-07-04 17:40:16+05:00, bar@mysql.com +1 -0
    Setting default locale to en_US

  sql/sql_class.h@1.146.52.14, 2006-07-04 17:40:16+05:00, bar@mysql.com +3 -0
    Adding locale variable into system_variables.

  sql/sql_locale.cc@1.1, 2006-07-04 17:40:16+05:00, bar@mysql.com +1607 -0
    Adding new file with locale data for various languages

  sql/sql_locale.cc@1.0, 2006-07-04 17:40:16+05:00, bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.lc/sql/sql_locale.cc

ChangeSet@1.1616.2675.1, 2006-07-04 13:51:35+02:00, pekka@clam.ndb.mysql.com +1 -0
  pekka - checkout:get (4.1)

  BitKeeper/etc/config@1.10.1.8, 2006-07-04 13:50:36+02:00, pekka@clam.ndb.mysql.com +1 -0
    checkout:get

ChangeSet@1.2181.123.3, 2006-07-04 12:57:23+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  disabled ndb_autodiscover3

  mysql-test/t/disabled.def@1.171, 2006-07-04 12:57:15+02:00, tomas@poseidon.ndb.mysql.com +1 -0
    disabled ndb_autodiscover3

ChangeSet@1.2181.122.2, 2006-07-04 12:34:23+02:00, ingo@mysql.com +2 -0
  After merge fix

  mysql-test/r/lock_multi.result@1.24, 2006-07-04 12:34:15+02:00, ingo@mysql.com +0 -16
    After merge fix

  mysql-test/t/lock_multi.test@1.21, 2006-07-04 12:34:15+02:00, ingo@mysql.com +34 -64
    After merge fix

ChangeSet@1.1810.1868.14, 2006-07-04 12:30:08+02:00, joerg@mysql.com +1 -0
  When building RPMs, use the Perl script to run the tests, to automatically check SSL.
  TAG: clone-5.0.24-build
  TAG: mysql-5.0.23

  support-files/mysql.spec.sh@1.99.1.47, 2006-07-04 12:30:02+02:00, joerg@mysql.com +7 -2
    Use the Perl script to run the tests, because it will automatically check
    whether the server is configured with SSL.
    (The shell script needs an explicit flag, and we cannot pass that though "make".)

ChangeSet@1.1810.1865.5, 2006-07-04 11:43:06+02:00, tomas@poseidon.ndb.mysql.com +3 -0
  Bug #20784 Uninitialized memory in update on table with PK not on first column
  - partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update

  sql/ha_ndbcluster.cc@1.175.40.4, 2006-07-04 11:42:52+02:00, tomas@poseidon.ndb.mysql.com +2 -1
    Bug #20784 Uninitialized memory in update on table with PK not on first column
    - partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update

  sql/handler.h@1.138.11.1, 2006-07-04 11:42:52+02:00, tomas@poseidon.ndb.mysql.com +1 -0
    Bug #20784 Uninitialized memory in update on table with PK not on first column
    - partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update

  sql/sql_update.cc@1.154.15.1, 2006-07-04 11:42:52+02:00, tomas@poseidon.ndb.mysql.com +22 -3
    Bug #20784 Uninitialized memory in update on table with PK not on first column
    - partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update

ChangeSet@1.1616.2674.1, 2006-07-04 13:28:30+04:00, sergefp@mysql.com +1 -0
  Better comments for void Item::top_level_item()

  sql/item.h@1.56.1.139, 2006-07-04 13:28:25+04:00, sergefp@mysql.com +9 -2
    Better comments for void Item::top_level_item()

ChangeSet@1.1810.1884.1, 2006-07-04 12:10:12+03:00, gkodinov@mysql.com +3 -0
  Bug #16110: insert permitted into view col w/o default value
  
  When compiling INSERT statements the check whether columns are provided values
  depends on the flag whether a field is used in that query (Field::query_id).
  However the check for updatability of VIEW columns (check_view_insertability())
  was calling fix_fields() and thus setting the Field::query_id even for the 
  view fields that are not referenced in the current INSERT statement.
  So the correct check for columns without default values 
  ( check_that_all_fields_are_given_values() ) is assuming that all the VIEW
  columns were mentioned in the INSERT field list and was issuing no 
  warnings or errors.
  Fixed check_view_insertability() to turn off the flag whether or not to set
  Field::query_id (THREAD::set_query_id) before calling fix fields and restore
  it when it's done.

  mysql-test/r/view.result@1.138.7.1, 2006-07-04 12:09:56+03:00, gkodinov@mysql.com +15 -1
    Bug #16110: insert permitted into view col w/o default value
      * test case

  mysql-test/t/view.test@1.126.1.22, 2006-07-04 12:09:56+03:00, gkodinov@mysql.com +19 -1
    Bug #16110: insert permitted into view col w/o default value
      * test case

  sql/sql_insert.cc@1.146.27.1, 2006-07-04 12:09:56+03:00, gkodinov@mysql.com +14 -1
    Bug #16110: insert permitted into view col w/o default value
      * avoid setting the "field used" flag for fields when checking view columns 
        for updatability.
      * a missing DBUG_RETURN added.

ChangeSet@1.1810.1883.1, 2006-07-04 12:56:53+05:00, holyfoot@deer.(none) +4 -0
  bug #14807 (GeomFromText() should return MYSQL_TYPE_GEOMETRY)
  
  we didn't have code creating GEOMETRY-type fields from Items (expression results)
  So i added this code

  mysql-test/r/gis.result@1.33, 2006-07-04 12:53:38+05:00, holyfoot@mysql.com +7 -2
    test result fixed

  mysql-test/t/gis.test@1.28, 2006-07-04 12:53:46+05:00, holyfoot@mysql.com +7 -1
    testcase added

  sql/item_geofunc.cc@1.27, 2006-07-04 12:53:50+05:00, holyfoot@mysql.com +28 -0
    Item_geometry_func::tmp_table_field implemented

  sql/item_geofunc.h@1.12, 2006-07-04 12:53:54+05:00, holyfoot@mysql.com +5 -0
    tmp_table_field() and get_geometry_type() declared

ChangeSet@1.2181.119.7, 2006-07-03 23:17:53-04:00, cmiller@zippy.(none) +2 -0
  Renumber events to make tests pass.  This must be a result of removing extraneous
  COMMITs -- the numbers collapse to fill the gaps.

  mysql-test/r/rpl_row_create_table.result@1.6, 2006-07-03 23:17:47-04:00, cmiller@zippy.(none) +10 -10
    Renumber event position.  This must be a result of extraneous COMMITs; see Bug#16206.
    I don't fully understand this, but I can't see any harm to it.

  mysql-test/t/rpl_row_create_table.test@1.6, 2006-07-03 23:17:47-04:00, cmiller@zippy.(none) +3 -3
    Renumber event position.  This must be a result of extraneous COMMITs; see Bug#16206.
    I don't fully understand this, but I can't see any harm to it.

ChangeSet@1.2181.119.6, 2006-07-03 19:03:47-04:00, cmiller@zippy.(none) +1 -0
  Removed extraneous COMMITs, from Bug#16206.  

  mysql-test/r/binlog_stm_blackhole.result@1.14, 2006-07-03 19:03:41-04:00, cmiller@zippy.(none) +0 -9
    Removed extraneous COMMITs, from Bug#16206.  

ChangeSet@1.2181.119.5, 2006-07-03 18:29:01-04:00, cmiller@zippy.(none) +4 -0
  Removed bdb test where the binlog format is indeterminate and updated a test
  where it isn't.  Removed a test where the merge was incorrect (and a test 
  duplicated.)

  mysql-test/r/bdb.result@1.56, 2006-07-03 18:28:54-04:00, cmiller@zippy.(none) +0 -36
    Removed binlog-format-specific test.
    
    Elliot says bdb is going away real soon now anyway.

  mysql-test/t/bdb.test@1.55, 2006-07-03 18:28:54-04:00, cmiller@zippy.(none) +0 -34
    Removed binlog-format-specific test.
    
    Elliot says bdb is going away real soon now anyway.

  mysql-test/r/binlog_row_blackhole.result@1.7, 2006-07-03 18:28:54-04:00, cmiller@zippy.(none) +0 -4
    Removed superfluous commits.  Bug#16206.

  mysql-test/r/mysqldump.result@1.112, 2006-07-03 18:28:54-04:00, cmiller@zippy.(none) +0 -28
    Merged incorrectly.

ChangeSet@1.1810.1882.2, 2006-07-04 02:07:41+04:00, konstantin@mysql.com +2 -0
  auxilliary -> auxiliary

  sql/sql_delete.cc@1.144.14.1, 2006-07-04 02:07:38+04:00, konstantin@mysql.com +1 -1
    auxilliary -> auxiliary

  sql/sql_lex.h@1.175.1.47, 2006-07-04 02:07:38+04:00, konstantin@mysql.com +1 -1
    auxilliary -> auxiliary

ChangeSet@1.1810.1882.1, 2006-07-04 01:13:04+04:00, konstantin@mysql.com +1 -0
  auxilliary -> auxiliary

  sql/sql_parse.cc@1.426.94.4, 2006-07-04 01:13:00+04:00, konstantin@mysql.com +4 -4
    auxilliary -> auxiliary

ChangeSet@1.1810.1881.2, 2006-07-04 01:07:49+04:00, aivanov@mysql.com +1 -0
  BUG#19209 "Test 'rpl_openssl' hangs on Windows"
   Disabling 'rpl_openssl'.

  mysql-test/t/rpl_openssl.test@1.11.1.4, 2006-07-04 01:07:38+04:00, aivanov@mysql.com +1 -1
    Disabling 'rpl_openssl'.

ChangeSet@1.1810.1868.12, 2006-07-03 21:41:15+02:00, tnurnberg@mysql.com +1 -0
  Bug#20783: Valgrind uninitialised warning in test case ctype_uca
    
  Two functions have different ideas of what a string should look like;
  one of them reads memory it assumes the other one may have written.
  And "if you assume ..."
    
  We now use a more defensive variety of the assuming function, this fixes
  a warning thrown by the valgrind tool.

  sql/item_cmpfunc.cc@1.187.1.25, 2006-07-03 21:41:09+02:00, tnurnberg@mysql.com +1 -1
    c_ptr() makes incorrect assumptions about the string we get from
    out of args[0]->val_str(&tmp); c_str_safe() is more defensive.

ChangeSet@1.1810.1881.1, 2006-07-03 23:28:19+04:00, aivanov@mysql.com +1 -0
  BUG#19209 "Test 'rpl_openssl' hangs on Windows"
   Enabling rpl_openssl.test for Windows to check that
   currently it still hangs (because I can't reproduce
   this on my machine).

  mysql-test/t/rpl_openssl.test@1.11.1.3, 2006-07-03 23:28:01+04:00, aivanov@mysql.com +1 -1
    Enabling rpl_openssl.test for Windows

ChangeSet@1.1810.1868.11, 2006-07-03 20:08:38+02:00, kent@mysql.com +1 -0
  client.c:
    Define 'mysql_get_ssl_cipher' even if no SSL built in, it is referenced in libmysql.def

  sql-common/client.c@1.83.1.9, 2006-07-03 19:30:21+02:00, kent@mysql.com +7 -0
    Define 'mysql_get_ssl_cipher' even if no SSL built in, it is referenced in libmysql.def

ChangeSet@1.2181.119.4, 2006-07-03 13:49:25-04:00, cmiller@zippy.(none) +1 -0
  Additional patch from Bug#16206.  BEGIN/COMMIT behavior changed 5.0 -> 5.1 .

  mysql-test/r/bdb.result@1.55, 2006-07-03 13:49:17-04:00, cmiller@zippy.(none) +2 -0
    Additional patch from Bug#16206.  BEGIN/COMMIT behavior changed 5.0 -> 5.1 .

ChangeSet@1.2181.121.1, 2006-07-03 17:09:32+02:00, mskold@mysql.com +9 -0
  Fix for Bug #18413  Data usage for varsize columns are not correctly reported to mysqld

  sql/ha_ndbcluster.cc@1.334.1.14, 2006-07-03 17:08:49+02:00, mskold@mysql.com +6 -3
    Fix for Bug #18413  Data usage for varsize columns are not correctly reported to mysqld

  storage/ndb/include/kernel/AttributeHeader.hpp@1.14, 2006-07-03 17:08:49+02:00, mskold@mysql.com +2 -1
    Fix for Bug #18413  Data usage for varsize columns are not correctly reported to mysqld

  storage/ndb/include/ndbapi/NdbDictionary.hpp@1.81, 2006-07-03 17:08:49+02:00, mskold@mysql.com +2 -1
    Fix for Bug #18413  Data usage for varsize columns are not correctly reported to mysqld

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.47, 2006-07-03 17:08:49+02:00, mskold@mysql.com +1 -0
    Fix for Bug #18413  Data usage for varsize columns are not correctly reported to mysqld

  storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp@1.8, 2006-07-03 17:08:49+02:00, mskold@mysql.com +1 -0
    Fix for Bug #18413  Data usage for varsize columns are not correctly reported to mysqld

  storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp@1.28, 2006-07-03 17:08:49+02:00, mskold@mysql.com +14 -7
    Fix for Bug #18413  Data usage for varsize columns are not correctly reported to mysqld

  storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp@1.4, 2006-07-03 17:08:49+02:00, mskold@mysql.com +1 -0
    Fix for Bug #18413  Data usage for varsize columns are not correctly reported to mysqld

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.146, 2006-07-03 17:08:50+02:00, mskold@mysql.com +17 -7
    Fix for Bug #18413  Data usage for varsize columns are not correctly reported to mysqld

  storage/ndb/tools/desc.cpp@1.25, 2006-07-03 17:08:50+02:00, mskold@mysql.com +2 -1
    Fix for Bug #18413  Data usage for varsize columns are not correctly reported to mysqld

ChangeSet@1.1810.1880.2, 2006-07-03 16:44:17+02:00, kent@suse9-x86.mysql.com +3 -0
  mwldnlm, mwccnlm, mwasmnlm:
    Use Perl for filtering, do more filtering

  netware/BUILD/mwasmnlm@1.6, 2006-07-03 16:44:03+02:00, kent@suse9-x86.mysql.com +4 -1
    Use Perl for filtering, do more filtering

  netware/BUILD/mwccnlm@1.6, 2006-07-03 16:44:03+02:00, kent@suse9-x86.mysql.com +4 -1
    Use Perl for filtering, do more filtering

  netware/BUILD/mwldnlm@1.6, 2006-07-03 16:44:03+02:00, kent@suse9-x86.mysql.com +4 -1
    Use Perl for filtering, do more filtering

ChangeSet@1.2181.119.2, 2006-07-03 12:13:57+02:00, pekka@clam.ndb.mysql.com +2 -0
  ndb - bug#20751 : report also composite op in merge

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.63, 2006-07-03 12:11:53+02:00, pekka@clam.ndb.mysql.com +10 -3
    report even composite op in merge
    test case: test_event_merge --no-blobs --ops ic:dcic

  storage/ndb/test/ndbapi/test_event_merge.cpp@1.13, 2006-07-03 12:10:28+02:00, pekka@clam.ndb.mysql.com +10 -2
    cannot skip tables if ops specified

ChangeSet@1.1616.2673.5, 2006-07-03 14:54:09+05:00, holyfoot@deer.(none) +2 -0
  bug 20317 (test fails in embedded for different number of threads is
  running)
  
  I decided to make ps_1general test independent from actual number of
  threads running

  mysql-test/r/ps_1general.result@1.1.1.23, 2006-07-03 14:49:46+05:00, holyfoot@mysql.com +1 -1
    result fixed

  mysql-test/t/ps_1general.test@1.3.1.13, 2006-07-03 14:49:46+05:00, holyfoot@mysql.com +1 -0
    as i think we don't really care about the number of threads running
    i just replace the number with '#'

ChangeSet@1.1810.1864.4, 2006-07-03 14:22:39+05:00, holyfoot@deer.(none) +1 -0
  bug #19452 (mysql_upgrade reads [client] section but doesn't handle [host] option

  client/mysql_upgrade.c@1.4, 2006-07-03 14:15:14+05:00, holyfoot@mysql.com +1 -1
    "client" group removed from the 'readlist'

ChangeSet@1.2181.98.5, 2006-07-03 11:20:08+02:00, andrey@lmy004. +8 -0
  WL#3337 (Event scheduler new architecture)
  This is the first cut of separating Event_scheduler in two
  classes which are more specialized.
  Inheritance was used to separate methods and member variables.
  Still Event_scheduler is a child of Event_queue. This dependency
  will be removed soon.

  sql/event_data_objects.cc@1.64, 2006-07-03 11:19:55+02:00, andrey@lmy004. +20 -0
    add comments

  sql/event_db_repository.cc@1.6, 2006-07-03 11:19:55+02:00, andrey@lmy004. +1 -0
    coding style

  sql/event_db_repository.h@1.5, 2006-07-03 11:19:55+02:00, andrey@lmy004. +3 -0
    add a call, will be implemented later

  sql/event_queue.cc@1.2, 2006-07-03 11:19:55+02:00, andrey@lmy004. +841 -0
    Event_queue, still as super-class of Event_scheduler

  sql/event_queue.h@1.2, 2006-07-03 11:19:55+02:00, andrey@lmy004. +103 -1
    Event_queue as super-class of Event_scheduler. Trying to
    separate the two classes

  sql/event_scheduler.cc@1.13, 2006-07-03 11:19:55+02:00, andrey@lmy004. +164 -842
    Event_scheduler as child class of Event_queue.
    Trying to separate both classes.

  sql/event_scheduler.h@1.9, 2006-07-03 11:19:55+02:00, andrey@lmy004. +49 -105
    Event_scheduler as child class of Event_queue.
    Trying to separate both classes.

  sql/events.cc@1.49, 2006-07-03 11:19:55+02:00, andrey@lmy004. +1 -0
    Don't allocate on the stack the scheduler but on the heap.
    The exact way it is done will be changed, that's ok for now.

ChangeSet@1.1810.1880.1, 2006-07-03 10:56:19+02:00, kent@suse9-x86.mysql.com +4 -0
  Makefile.am:
    Avoid duplicate symbol errors on Netware
  mwldnlm, mwccnlm, mwasmnlm:
    Filter garbage characters from output

  netware/BUILD/mwasmnlm@1.5, 2006-07-03 10:51:00+02:00, kent@suse9-x86.mysql.com +1 -1
    Filter garbage characters from output

  netware/BUILD/mwccnlm@1.5, 2006-07-03 10:51:00+02:00, kent@suse9-x86.mysql.com +1 -1
    Filter garbage characters from output

  netware/BUILD/mwldnlm@1.5, 2006-07-03 10:51:00+02:00, kent@suse9-x86.mysql.com +1 -1
    Filter garbage characters from output

  tests/Makefile.am@1.23.1.3, 2006-07-03 10:55:58+02:00, kent@suse9-x86.mysql.com +6 -0
    Avoid duplicate symbol errors on Netware

ChangeSet@1.1810.1722.2, 2006-07-03 15:37:57+10:00, stewart@mysql.com +5 -0
  BUG#13985 ndb_mgm "status" command can return incorrect data node status
  
  Second half of the fix for this bug.
  
  This patch forces a heartbeat to be sent and will wait (a little while)
  for replies. This way we can get
  
  > all status
  X starting
  Y started
  X started
  >
  
  which is okay as the new status comes after the old status, always.
  There is the slimmest of opportunities to get output like above where only half
  the cluster appears started.
  
  This is about the best we can do with a command line interactive program.

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.73.29.1, 2006-07-03 15:37:51+10:00, stewart@mysql.com +6 -0
    Add updateStatus method to MgmtSrvr.
    
    Used to force an update of node status for the nodes.

  ndb/src/mgmsrv/MgmtSrvr.hpp@1.30.16.1, 2006-07-03 15:37:51+10:00, stewart@mysql.com +2 -0
    add prototype for updateStatus(NodeBitmask) method

  ndb/src/mgmsrv/Services.cpp@1.45.26.1, 2006-07-03 15:37:51+10:00, stewart@mysql.com +3 -0
    When status is queried, force an update of the status in the mgm server. (i.e. send heartbeats)

  ndb/src/ndbapi/ClusterMgr.cpp@1.17.7.1, 2006-07-03 15:37:51+10:00, stewart@mysql.com +67 -4
    new DEBUG_REG define for debugging registration and HB code.
    
    Add ClusterMgr::forceHB(NodeBitmask) which sends a HB signal to each node in
    the bitmask and then waits for a REGCONF from them.
    Will only wait for a total of 1 second, not blocking an end client for too long.
    
    On receipt of HB, clear the nodeId in the waiting for bitmask and signal any
    waiting threads.

  ndb/src/ndbapi/ClusterMgr.hpp@1.4.5.1, 2006-07-03 15:37:51+10:00, stewart@mysql.com +8 -2
    Add ::forceHB(NodeBitmask) and associated variables

ChangeSet@1.1810.1879.1, 2006-07-02 14:35:45+04:00, kroki@mysql.com +7 -0
  Bug#20570: CURRENT_USER() in a VIEW with SQL SECURITY DEFINER returns
             invoker name
  
  The bug was fixed similar to how context switch is handled in
  Item_func_sp::execute_impl(): we store pointer to current
  Name_resolution_context in Item_func_current_user class, and use
  its Security_context in Item_func_current_user::fix_fields().

  mysql-test/r/view_grant.result@1.8.5.1, 2006-07-02 14:35:38+04:00, kroki@mysql.com +53 -0
    Add result for bug#20570.

  mysql-test/t/view_grant.test@1.8.4.1, 2006-07-02 14:35:38+04:00, kroki@mysql.com +62 -0
    Add test case for bug#20570.

  sql/item_create.cc@1.58.1.2, 2006-07-02 14:35:39+04:00, kroki@mysql.com +0 -6
    Remove create_func_current_user(), as it is not used for automatic
    function creation.

  sql/item_create.h@1.43.1.1, 2006-07-02 14:35:39+04:00, kroki@mysql.com +0 -1
    Remove prototype for create_func_current_user().

  sql/item_strfunc.cc@1.261.3.1, 2006-07-02 14:35:39+04:00, kroki@mysql.com +37 -28
    Add implementations for Item_func_user::init(),
    Item_func_user::fix_fields() and
    Item_func_current_user::fix_fields() methods.  The latter uses
    Security_context from current Name_resolution_context, if one is
    defined.

  sql/item_strfunc.h@1.101.2.1, 2006-07-02 14:35:39+04:00, kroki@mysql.com +27 -8
    Move implementation of CURRENT_USER() out of Item_func_user to
    to new Item_func_current_user class.  For both classes calculate
    user name in fix_fields() method.
    For Item_func_current_user add context field to store
    Name_resolution_context in effect.

  sql/sql_yacc.yy@1.371.68.1, 2006-07-02 14:35:39+04:00, kroki@mysql.com +5 -2
    Pass current Name_resolution_context to Item_func_current_user.

ChangeSet@1.1810.1868.9, 2006-07-01 23:52:19+02:00, kent@mysql.com +1 -0
  mysqld.vcproj:
    Don't define __NT__ for 'Max' target

  VC++Files/sql/mysqld.vcproj@1.3.2.1, 2006-07-01 23:51:35+02:00, kent@mysql.com +2 -2
    Don't define __NT__ for 'Max' target

ChangeSet@1.1810.1878.1, 2006-07-02 01:51:10+04:00, dlenev@mysql.com +18 -0
  Fix for bug#18437 "Wrong values inserted with a before update trigger on
  NDB table".
  
  SQL-layer was not marking fields which were used in triggers as such. As
  result these fields were not always properly retrieved/stored by handler
  layer. So one might got wrong values or lost changes in triggers for NDB,
  Federated and possibly InnoDB tables.
  This fix solves the problem by marking fields used in triggers
  appropriately.
  
  Also this patch contains the following cleanup of ha_ndbcluster code:
  
  We no longer rely on reading LEX::sql_command value in handler in order
  to determine if we can enable optimization which allows us to handle REPLACE
  statement in more efficient way by doing replaces directly in write_row()
  method without reporting error to SQL-layer.
  Instead we rely on SQL-layer informing us whether this optimization
  applicable by calling handler::extra() method with
  HA_EXTRA_WRITE_CAN_REPLACE flag.
  As result we no longer apply this optimzation in cases when it should not
  be used (e.g. if we have on delete triggers on table) and use in some
  additional cases when it is applicable (e.g. for LOAD DATA REPLACE).
  
  Finally this patch includes fix for bug#20728 "REPLACE does not work
  correctly for NDB table with PK and unique index".
    
  This was yet another problem which was caused by improper field mark-up.
  During row replacement fields which weren't explicity used in REPLACE
  statement were not marked as fields to be saved (updated) so they have
  retained values from old row version. The fix is to mark all table
  fields as set for REPLACE statement. Note that in 5.1 we already solve
  this problem by notifying handler that it should save values from all
  fields only in case when real replacement happens.

  include/my_base.h@1.70.1.8, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +10 -1
    Added HA_EXTRA_WRITE_CAN_REPLACE, HA_EXTRA_WRITE_CANNOT_REPLACE - new
    parameters for ha_extra() method. We use them to inform handler that
    write_row() which tries to insert new row into the table and encounters
    some already existing row with same primary/unique key can replace old
    row with new row instead of reporting error.

  mysql-test/r/federated.result@1.25.5.1, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +28 -0
    Additional test for bug#18437 "Wrong values inserted with a before update
    trigger on NDB table".

  mysql-test/r/ndb_replace.result@1.3.1.3, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +46 -1
    Added test for bug #20728 "REPLACE does not work correctly for NDB table
    with PK and unique index". Updated wrong results from older test.

  mysql-test/r/ndb_trigger.result@1.1, 2006-07-02 01:51:02+04:00, dlenev@mysql.com +119 -0
    Added test for bug#18437 "Wrong values inserted with a before update trigger
    on NDB table".

  mysql-test/r/ndb_trigger.result@1.0, 2006-07-02 01:51:02+04:00, dlenev@mysql.com +0 -0
    BitKeeper file /home/dlenev/mysql-5.0-bg18437-3/mysql-test/r/ndb_trigger.result

  mysql-test/t/federated.test@1.19.5.1, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +42 -0
    Additional test for bug#18437 "Wrong values inserted with a before update
    trigger on NDB table".

  mysql-test/t/ndb_replace.test@1.7, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +37 -0
    Added test for bug #20728 "REPLACE does not work correctly for NDB table
    with PK and unique index".

  mysql-test/t/ndb_trigger.test@1.1, 2006-07-02 01:51:02+04:00, dlenev@mysql.com +92 -0
    Added test for bug#18437 "Wrong values inserted with a before update trigger
    on NDB table".

  mysql-test/t/ndb_trigger.test@1.0, 2006-07-02 01:51:02+04:00, dlenev@mysql.com +0 -0
    BitKeeper file /home/dlenev/mysql-5.0-bg18437-3/mysql-test/t/ndb_trigger.test

  sql/ha_ndbcluster.cc@1.175.43.1, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +15 -12
    We no longer rely on reading LEX::sql_command value in handler in order
    to determine if we can enable optimization which allows us to handle REPLACE
    statement in more efficient way by doing replaces directly in write_row()
    method without reporting error to SQL-layer.
    Instead we rely on SQL-layer informing us whether this optimization
    applicable by calling handler::extra() method with
    HA_EXTRA_WRITE_CAN_REPLACE flag.
    As result we no longer apply this optimization in cases when it should not
    be used (e.g. if we have on delete triggers on table) and use in some
    additional cases when it is applicable (e.g. for LOAD DATA REPLACE).

  sql/item.cc@1.113.46.1, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +7 -2
    Item_trigger_field::setup_field():
      Added comment explaining why we don't set Field::query_id in this method.

  sql/mysql_priv.h@1.290.52.1, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +3 -3
    mysql_alter_table() function no longer takes handle_duplicates argument.
    Added declaration of mark_fields_used_by_triggers_for_insert_stmt() function.

  sql/sql_delete.cc@1.144.1.31, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +6 -0
    Mark fields which are used by ON DELETE triggers so handler will retrieve
    values for these fields.

  sql/sql_insert.cc@1.146.26.1, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +76 -1
    Explicitly inform handler that we are doing REPLACE (using ha_extra() method)
    in cases when it can promote insert operation done by write_row() to replace.
    Also when we do REPLACE we want to store values for all columns so we should
    inform handler about it.
    Finally we should mark fields used by ON UPDATE/ON DELETE triggers as such
    so handler can properly retrieve/restore values in these fields during
    execution of REPLACE and INSERT ... ON DUPLICATE KEY UPDATE statements.

  sql/sql_load.cc@1.78.1.18, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +10 -0
    Explicitly inform handler that we are doing LOAD DATA REPLACE (using
    ha_extra() method) in cases when it can promote insert operation done by
    write_row() to replace.
    Also when we do replace we want to save (replace) values for all columns
    so we should inform handler about it.
    Finally to properly execute LOAD DATA for table with triggers we should
    mark fields used by ON INSERT triggers as such so handler can properly
    store values for these fields.

  sql/sql_parse.cc@1.426.97.1, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +3 -4
    mysql_alter_table() function no longer takes handle_duplicates argument.

  sql/sql_table.cc@1.239.30.1, 2006-07-02 01:51:01+04:00, dlenev@mysql.com +6 -13
    Got rid of handle_duplicates argument in mysql_alter_table() and
    copy_data_between_tables() functions. These functions were always
    called with handle_duplicates == DUP_ERROR and thus contained dead
    (and probably incorrect) code.

  sql/sql_trigger.cc@1.35.9.1, 2006-07-02 01:51:02+04:00, dlenev@mysql.com +42 -2
    Added Table_triggers_list::mark_fields_used() method which is used to mark
    fields read/set by triggers as such so handlers will be able properly
    retrieve/store values in these fields.

  sql/sql_trigger.h@1.19.1.1, 2006-07-02 01:51:02+04:00, dlenev@mysql.com +8 -0
    Table_triggers_list:
      Added mark_fields_used() method which is used to mark fields read/set by
      triggers as such so handlers will be able properly retrieve/store values
      in these fields. To implement this method added 'trigger_fields' member
      which is array of lists linking items for all fields used in triggers
      grouped by event and action time.

  sql/sql_update.cc@1.154.14.1, 2006-07-02 01:51:02+04:00, dlenev@mysql.com +6 -0
    Mark fields which are used by ON UPDATE triggers so handler will retrieve
    and save values for these fields.

ChangeSet@1.1346.1.838, 2006-07-01 14:31:52-04:00, cmiller@zippy.(none) +4 -0
  Bug#19006: 4.0 valgrind problems (in test func_str)
  
  On exactly-sized Strings, the String::c_ptr() function peeked beyond the
  end of the buffer, possibly into unititialized space to see whether the 
  buffer was NUL-terminated.
  
  In a place that did peek improperly, we now use a c_ptr_safe() function, 
  which doesn't peek where it shouldn't.

  client/sql_string.h@1.6.1.1, 2006-07-01 14:31:45-04:00, cmiller@zippy.(none) +8 -0
    Back-port String::c_ptr_safe().

  sql/item_func.h@1.39.1.28, 2006-07-01 14:31:45-04:00, cmiller@zippy.(none) +4 -1
    Describe side-effect behavior.

  sql/item_strfunc.cc@1.36.1.52, 2006-07-01 14:31:45-04:00, cmiller@zippy.(none) +2 -2
    Use the "_safe" version of c_ptr to avoid looking for a terminating 
    NUL character outside the initialized memory area.  Valgrind hates it 
    when one does that, and it theoretically could lead to a SEGV.

  sql/sql_string.h@1.13.1.1, 2006-07-01 14:31:45-04:00, cmiller@zippy.(none) +8 -0
    Back-port String::c_ptr_safe().

ChangeSet@1.1810.1868.8, 2006-07-01 15:11:59+02:00, kent@mysql.com +1 -0
  my_sys.h:
    Added missing parameter type change for _my_strdup_with_length()

  include/my_sys.h@1.178.6.1, 2006-07-01 15:10:52+02:00, kent@mysql.com +1 -1
    Added missing parameter type change for _my_strdup_with_length()

ChangeSet@1.1810.1876.4, 2006-07-01 09:28:41+04:00, sergefp@mysql.com +2 -0
  Post-merge fix

  mysql-test/r/range.result@1.44.1.2, 2006-07-01 09:28:34+04:00, sergefp@mysql.com +0 -1
    Post-merge fix

  mysql-test/t/range.test@1.37.1.2, 2006-07-01 09:28:34+04:00, sergefp@mysql.com +0 -1
    Post-merge fix

ChangeSet@1.2181.73.2, 2006-07-01 00:01:37-04:00, mikael@dator5.(none) +11 -0
  BUG#17138: Crashes in stored procedure
  Last round of review fixes

  BUILD/compile-pentium-gcov@1.14.1.1, 2006-07-01 00:01:29-04:00, mikael@dator5.(none) +0 -0
    No change

  sql/ha_ndbcluster.h@1.143, 2006-07-01 00:01:29-04:00, mikael@dator5.(none) +2 -3
    Last round of review changes

  sql/ha_partition.h@1.22, 2006-07-01 00:01:29-04:00, mikael@dator5.(none) +2 -3
    Last round of review changes

  sql/handler.h@1.221, 2006-07-01 00:01:29-04:00, mikael@dator5.(none) +8 -6
    Last round of review changes

  sql/item_sum.cc@1.183, 2006-07-01 00:01:29-04:00, mikael@dator5.(none) +1 -1
    Last round of review changes

  sql/sql_acl.cc@1.199, 2006-07-01 00:01:29-04:00, mikael@dator5.(none) +4 -4
    Last round of review changes

  sql/sql_insert.cc@1.205.1.2, 2006-07-01 00:01:29-04:00, mikael@dator5.(none) +11 -7
    Last round of review changes

  sql/sql_select.cc@1.413.1.3, 2006-07-01 00:01:29-04:00, mikael@dator5.(none) +2 -2
    Last round of review changes

  sql/sql_table.cc@1.352, 2006-07-01 00:01:29-04:00, mikael@dator5.(none) +3 -4
    Last round of review changes

  sql/sql_union.cc@1.136, 2006-07-01 00:01:30-04:00, mikael@dator5.(none) +1 -1
    Last round of review changes

  sql/sql_update.cc@1.196, 2006-07-01 00:01:30-04:00, mikael@dator5.(none) +6 -6
    Last round of review changes

ChangeSet@1.2181.116.1, 2006-07-01 01:37:20+04:00, evgen@moonbone.local +3 -0
  Reverted wrong bug fix (Bug#11228)

  mysql-test/r/key.result@1.36, 2006-07-01 01:34:16+04:00, evgen@moonbone.local +9 -1
    Fixed result after removing wrong bug fix

  mysql-test/t/key.test@1.28, 2006-07-01 01:33:39+04:00, evgen@moonbone.local +1 -0
    Added SHOW CREATE TABLE, which is the proper way to check for table definitions

  sql/table.cc@1.226, 2006-07-01 01:36:04+04:00, evgen@moonbone.local +21 -0
    Reverted wrong bug fix.
    The intention with the original code was to show that MySQL treats the first
    given unique key as a primary key. Clients can use the marked primary key as a
    real primary key to validate row changes in case of conflicting updates.  The
    ODBC driver (and other drivers) may also use this fact to optimize/check
    updates and handle conflicts.  The marked key also shows what some engines, like InnoDB or NDB,
    will use as it's internal primary key.
    For checking if someone has declared a true PRIMARY KEY, one should use 'SHOW CREATE TABLE'

ChangeSet@1.1810.1869.5, 2006-07-01 00:33:47+04:00, konstantin@mysql.com +1 -0
  Remove an unused variable.

  sql/item.h@1.183.7.1, 2006-07-01 00:33:44+04:00, konstantin@mysql.com +0 -7
    Remove an unused variable.

ChangeSet@1.1810.1869.4, 2006-07-01 00:14:28+04:00, konstantin@mysql.com +3 -0
  Remove a couple of unused/barely used names.

  sql/sql_lex.cc@1.142.1.48, 2006-07-01 00:14:24+04:00, konstantin@mysql.com +0 -4
    Remove an unused thread key.

  sql/sql_lex.h@1.175.1.46, 2006-07-01 00:14:24+04:00, konstantin@mysql.com +0 -3
    Remove an unused thread key, current_lex.

  sql/sql_parse.cc@1.426.96.1, 2006-07-01 00:14:24+04:00, konstantin@mysql.com +3 -3
    Remove an unused thread key, current_lex macro.

ChangeSet@1.1810.1868.7, 2006-06-30 19:37:11+02:00, joerg@mysql.com +3 -0
  Manual transfer of the following changeset into the 5.0.23 release clone:
     1.2525 06/06/30 18:29:27 monty@mysql.com +3 -0
     Reverted wrong bug fix (Bug#11228)

  mysql-test/r/key.result@1.28.2.1, 2006-06-30 19:37:05+02:00, joerg@mysql.com +9 -1
    Manual transfer of the following fix into the 5.0.23 release clone:
       1.27 06/06/30 18:29:25 monty@mysql.com +9 -1
       Fixed result after removing wrong bug fix

  mysql-test/t/key.test@1.24.2.1, 2006-06-30 19:37:05+02:00, joerg@mysql.com +1 -0
    Manual transfer of the following fix into the 5.0.23 release clone:
       1.24 06/06/30 18:29:25 monty@mysql.com +1 -0
       Added SHOW CREATE TABLE, which is the proper way to check for table definitions

  sql/table.cc@1.160.28.1, 2006-06-30 19:37:05+02:00, joerg@mysql.com +21 -0
    Manual transfer of the following fix into the 5.0.23 release clone:
       1.135 06/06/30 18:29:25 monty@mysql.com +21 -0
       Reverted wrong bug fix.   ...

ChangeSet@1.1810.1876.2, 2006-06-30 20:07:33+03:00, monty@mysql.com +4 -0
  After merge fixes

  BitKeeper/etc/ignore@1.210.1.15, 2006-06-30 20:03:48+03:00, monty@mysql.com +1 -0
    added scripts/mysql_upgrade_shell

  BitKeeper/etc/ignore@1.210.1.14, 2006-06-30 20:02:07+03:00, monty@mysql.com +1 -0
    added mysql-test/r/*.log

  include/my_handler.h@1.11, 2006-06-30 20:07:22+03:00, monty@mysql.com +0 -1
    my_handler.h should not include my_global.h

  mysql-test/r/key.result@1.28.1.4, 2006-06-30 20:07:22+03:00, monty@mysql.com +2 -2
    Update results after merge

  sql/ha_ndbcluster.cc@1.175.42.2, 2006-06-30 20:07:22+03:00, monty@mysql.com +1 -1
    After merge fixes

ChangeSet@1.1616.2666.3, 2006-06-30 18:29:27+03:00, monty@mysql.com +3 -0
  Reverted wrong bug fix (Bug#11228)

  mysql-test/r/key.result@1.18.1.9, 2006-06-30 18:29:25+03:00, monty@mysql.com +9 -1
    Fixed result after removing wrong bug fix

  mysql-test/t/key.test@1.14.1.10, 2006-06-30 18:29:25+03:00, monty@mysql.com +1 -0
    Added SHOW CREATE TABLE, which is the proper way to check for table definitions

  sql/table.cc@1.111.4.4, 2006-06-30 18:29:25+03:00, monty@mysql.com +21 -0
    Reverted wrong bug fix.
    The intention with the original code was to show that MySQL treats the first
    given unique key as a primary key. Clients can use the marked primary key as a
    real primary key to validate row changes in case of conflicting updates.  The
    ODBC driver (and other drivers) may also use this fact to optimize/check
    updates and handle conflicts.  The marked key also shows what some engines, like InnoDB or NDB,
    will use as it's internal primary key.
    
    For checking if someone has declared a true PRIMARY KEY, one should use 'SHOW CREATE TABLE'
    
    
    

ChangeSet@1.1616.2664.2, 2006-06-30 16:25:07+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  adopted ndb handler code for tables without primary key and with unique index
  - added missing retrieval of hidden primary key

  sql/ha_ndbcluster.cc@1.114.20.1, 2006-06-30 16:25:03+02:00, tomas@poseidon.ndb.mysql.com +6 -0
    adopted ndb handler code for tables without primary key and with unique index
    - added missing retrieval of hidden primary key

ChangeSet@1.1810.1869.3, 2006-06-30 18:14:22+04:00, kroki@mysql.com +3 -0
  Bug#17226: Variable set in cursor on first iteration is assigned
             second iterations value
  
  During assignment to the BLOB variable in routine body the value
  wasn't copied.

  mysql-test/r/sp-vars.result@1.1.1.2, 2006-06-30 18:14:16+04:00, kroki@mysql.com +15 -0
    Add result for bug#17226.

  mysql-test/t/sp-vars.test@1.3, 2006-06-30 18:14:16+04:00, kroki@mysql.com +36 -0
    Add test case for bug#17226.

  sql/field_conv.cc@1.52.1.4, 2006-06-30 18:14:16+04:00, kroki@mysql.com +8 -3
    Honor copy_blobs flag.

ChangeSet@1.2181.114.1, 2006-06-30 15:15:20+02:00, knielsen@mysql.com +2 -0
  Add a script scripts/make_win_bin_dist, used to generate a Windows
  binary disctribution for Falcon.

  scripts/Makefile.am@1.54.1.1, 2006-06-30 15:15:15+02:00, knielsen@mysql.com +2 -1
    Add the make_win_bin_dist script.

  scripts/make_win_bin_dist@1.1, 2006-06-30 15:15:15+02:00, knielsen@mysql.com +116 -0
    New BitKeeper file ``scripts/make_win_bin_dist''

  scripts/make_win_bin_dist@1.0, 2006-06-30 15:15:15+02:00, knielsen@mysql.com +0 -0
    BitKeeper file /usr/local/mysql/mysql-5.1-bindist/scripts/make_win_bin_dist

ChangeSet@1.1616.2650.14, 2006-06-30 16:48:18+05:00, bar@mysql.com +1 -0
  Bug#7192 Specify --with-collation doesn't work for connections?
  --with-collation worked only on the server side.
  Client side ignored this argument, so collation_connection
  was not properly set (remained latin1_swedish_ci).

  sql-common/client.c@1.46.7.2, 2006-06-30 16:48:13+05:00, bar@mysql.com +31 -2
    - Take into account MYSQL_DEFAULT_COLLATION_NAME if
    character set is not set using mysql_option(), to
    honor --with-collation argument to configure.
    - Use default collation for the character set when it's
    not set using mysql_option().

ChangeSet@1.2181.112.1, 2006-06-30 11:31:43+02:00, lars@mysql.com +1 -0
  Changed the number of test iterations since this makes test time
  go from 623 seconds to 11 seconds on AMD64.
  This is because we have no native atomic implementation on AMD64, 
  so the rwlock-based implementation is used, which is  a bit slow.  
  It will be probably be optimized for AMD64 quite soon, but for now 
  this test case will do fewer iterations.

  unittest/mysys/my_atomic-t.c@1.5, 2006-06-30 11:31:31+02:00, lars@mysql.com +3 -3
    10k iterations instead of 1M no of iterations

ChangeSet@1.1810.1849.9, 2006-06-30 11:10:38+02:00, knielsen@mysql.com +1 -0
  Fix Windows build problem following previous push.

  strings/strtod.c@1.20, 2006-06-30 11:10:34+02:00, knielsen@mysql.com +2 -1
    Fix Windows build problem, EOVERFLOW is defined in my_base.h on Windows.

ChangeSet@1.1616.2668.1, 2006-06-30 12:52:05+04:00, kroki@mysql.com +2 -0
  bug #20152: mysql_stmt_execute() overwrites parameter buffers
  
  When using a parameter bind MYSQL_TYPE_DATE in a prepared statement,
  the time part of the MYSQL_TIME buffer was written to zero in
  mysql_stmt_execute(). The param_store_date() function in libmysql.c
  worked directly on the provided buffer.
  Changed to use a copy of the buffer.

  libmysql/libmysql.c@1.156.25.1, 2006-06-30 12:51:59+04:00, kroki@mysql.com +3 -4
    fix for bug #20152

  tests/mysql_client_test.c@1.51.1.117, 2006-06-30 12:52:00+04:00, kroki@mysql.com +53 -0
    added test for bug#20152

ChangeSet@1.1616.2550.12, 2006-06-30 09:41:41+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#20774
    crash if system restart with more than 4096 fragments
    solution: continueb enable expand check loop

  ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.21.1.10, 2006-06-30 09:41:39+02:00, jonas@perch.ndb.mysql.com +1 -0
    continueb enable expand check loop

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.39.1.24, 2006-06-30 09:41:40+02:00, jonas@perch.ndb.mysql.com +41 -13
    continueb enable expand check loop

ChangeSet@1.1810.1874.1, 2006-06-30 09:26:36+02:00, knielsen@mysql.com +7 -0
  BUG#20769: Dangling pointer in ctype_recoding test case.
  
  In some functions dealing with strings and character sets, the wrong
  pointers were saved for restoration in THD::rollback_item_tree_changes().
  This could potentially cause random corruption or crashes.
  
  Fixed by passing the original Item ** locations, not local stack copies.
  
  Also remove unnecessary use of default arguments.

  sql/item.cc@1.113.45.1, 2006-06-30 09:26:32+02:00, knielsen@mysql.com +29 -17
    Function agg_item_charsets() now handles non-consequtive Item *'s.

  sql/item.h@1.183.6.1, 2006-06-30 09:26:32+02:00, knielsen@mysql.com +3 -4
    Remove use of default argument.

  sql/item_cmpfunc.cc@1.187.1.24, 2006-06-30 09:26:32+02:00, knielsen@mysql.com +10 -10
    Remove use of default argument.

  sql/item_func.cc@1.270.1.22, 2006-06-30 09:26:32+02:00, knielsen@mysql.com +6 -5
    Remove use of default argument.

  sql/item_func.h@1.136.2.4, 2006-06-30 09:26:32+02:00, knielsen@mysql.com +5 -5
    Function agg_item_charsets() now handles non-consequtive Item *'s.

  sql/item_strfunc.cc@1.261.1.11, 2006-06-30 09:26:32+02:00, knielsen@mysql.com +17 -33
    Pass original Item **'s to agg_arg_charsets(), not local copies, to ensure
    proper restoration in THD::rollback_item_tree_changes().

  sql/item_sum.cc@1.170.2.1, 2006-06-30 09:26:32+02:00, knielsen@mysql.com +1 -1
    Remove use of default argument.

ChangeSet@1.2181.110.1, 2006-06-30 09:34:06+04:00, sergefp@mysql.com +3 -0
  BUG#20484: "Partitions: crash with EXPLAIN and UNION"
   - Don't forget to produce "partitions" column for "UNION RESULT" row of EXPLAIN output

  mysql-test/r/partition_pruning.result@1.18, 2006-06-30 09:34:00+04:00, sergefp@mysql.com +7 -0
    BUG#20484: Testcase

  mysql-test/t/partition_pruning.test@1.15, 2006-06-30 09:34:00+04:00, sergefp@mysql.com +7 -0
    BUG#20484: Testcase

  sql/sql_select.cc@1.414.1.3, 2006-06-30 09:34:00+04:00, sergefp@mysql.com +3 -0
    BUG#20484: "Partitions: crash with EXPLAIN and UNION"
     - Don't forget to produce "partitions" column for "UNION RESULT" row of EXPLAIN output

ChangeSet@1.1616.2667.1, 2006-06-30 09:05:12+04:00, sergefp@mysql.com +3 -0
  BUG#16168: Wrong results from range optimizer, "Use_count: Wrong count for key ..." warnings:
   - Added comments.
   - Make SEL_ARG::clone() set SEL_ARG::elements in the created copy.

  mysql-test/r/range.result@1.19.3.7, 2006-06-30 09:05:08+04:00, sergefp@mysql.com +22 -0
    BUG#16168: Testcase

  mysql-test/t/range.test@1.12.2.10, 2006-06-30 09:05:08+04:00, sergefp@mysql.com +26 -0
    BUG#16168: Testcase

  sql/opt_range.cc@1.98.10.1, 2006-06-30 09:05:09+04:00, sergefp@mysql.com +179 -4
    BUG#16168: Wrong results from range optimizer, "Use_count: Wrong count for key ..." warnings:
     - Added comments.
     - Make SEL_ARG::clone() set SEL_ARG::elements in the created copy.

ChangeSet@1.2181.109.3, 2006-06-30 08:11:51+04:00, petr@mysql.com +1 -0
  cleanup

  mysys/my_pread.c@1.13, 2006-06-30 08:11:42+04:00, petr@mysql.com +2 -1
    don't set errno without a real error

ChangeSet@1.1810.1849.7, 2006-06-30 00:10:41-04:00, elliot@mysql.com +1 -0
  Fixing windows build.

  strings/strtod.c@1.19, 2006-06-30 00:10:38-04:00, elliot@mysql.com +2 -2
    Reverting previous change to include files (angle brackets instead of
    quotes) that broke windows build

ChangeSet@1.1616.2666.2, 2006-06-30 04:10:27+03:00, monty@mysql.com +4 -0
  Don't read ~/.my.cnf in mysqldump.test

  mysql-test/mysql-test-run.sh@1.208.1.60, 2006-06-30 04:10:24+03:00, monty@mysql.com +7 -13
    Fixed problem with running with --gdb and two masters
    Don't disable ndb becasue we run gdb

  mysql-test/t/mysqldump.test@1.19.1.26, 2006-06-30 04:10:24+03:00, monty@mysql.com +1 -1
    Don't read ~/.my.cnf

  sql/ha_ndbcluster.cc@1.114.3.73, 2006-06-30 04:10:24+03:00, monty@mysql.com +4 -2
    Portability fix

  heap/hp_test1.c@1.14.1.2, 2006-06-30 04:10:24+03:00, monty@mysql.com +1 -1
    Changed type from last commit

ChangeSet@1.1810.1868.5, 2006-06-30 02:49:28+02:00, kent@mysql.com +3 -0
  mysql.spec.sh:
    Disable old RPM strip
  my_global.h:
    Fixed wrong cast, which caused problems with gcc 4.0 and
    floats in prepared statements (Bug #19694)
  mysqlmanager.vcproj:
    Place output files in common release/debug directory

  include/my_global.h@1.96.1.24, 2006-06-30 01:25:05+02:00, kent@mysql.com +2 -2
    Fixed wrong cast, which caused problems with gcc 4.0 and
    floats in prepared statements (Bug #19694)

  server-tools/instance-manager/mysqlmanager.vcproj@1.6, 2006-06-29 20:20:56+02:00, kent@mysql.com +2 -2
    Place output files in common release/debug directory

  support-files/mysql.spec.sh@1.99.1.46, 2006-06-30 02:49:09+02:00, kent@mysql.com +17 -0
    Disable old RPM strip

ChangeSet@1.2181.109.2, 2006-06-30 03:28:58+04:00, petr@mysql.com +1 -0
  fix test failures

  mysys/my_pread.c@1.12, 2006-06-30 03:28:35+04:00, petr@mysql.com +3 -2
    don't set errno without a real error

ChangeSet@1.1616.2666.1, 2006-06-30 02:25:35+03:00, monty@mysql.com +5 -0
  Fixed include file usage
  hp_test2 now works again
  Fixed wrong cast, which caused problems with gcc 4.0 and floats in prepared statements (Bug #19694)

  include/my_global.h@1.47.1.57, 2006-06-30 02:25:33+03:00, monty@mysql.com +2 -2
    Fixed wrong cast, which caused problems with gcc 4.0 (Bug #19694)

  mysys/my_handler.c@1.16.1.6, 2006-06-30 02:25:33+03:00, monty@mysql.com +1 -0
    Added missing include file

  heap/hp_test1.c@1.14.1.1, 2006-06-30 02:25:33+03:00, monty@mysql.com +2 -1
    Portability fix

  heap/hp_test2.c@1.21.1.1, 2006-06-30 02:25:33+03:00, monty@mysql.com +1 -0
    Added max_table_size (fixes that hp_test2 works again)

  strings/strtod.c@1.15.1.2, 2006-06-30 02:25:33+03:00, monty@mysql.com +2 -2
    Fixed include files

ChangeSet@1.1616.2663.2, 2006-06-29 17:06:28-04:00, iggy@mysql.com +3 -0
  Bug#20328 mysql client: dumb about trailing spaces on help command.

  mysql-test/r/mysql_client.result@1.1, 2006-06-29 17:06:25-04:00, iggy@mysql.com +44 -0
    Test trailing spaces on the help command.

  mysql-test/r/mysql_client.result@1.0, 2006-06-29 17:06:25-04:00, iggy@mysql.com +0 -0
    BitKeeper file /mnt/storeage/mysql-4.1_bug20328/mysql-test/r/mysql_client.result

  mysql-test/t/mysql_client.test@1.1, 2006-06-29 17:06:25-04:00, iggy@mysql.com +9 -0
    Result trailing spaces on the help command.

  mysql-test/t/mysql_client.test@1.0, 2006-06-29 17:06:25-04:00, iggy@mysql.com +0 -0
    BitKeeper file /mnt/storeage/mysql-4.1_bug20328/mysql-test/t/mysql_client.test

  client/mysql.cc@1.121.16.1, 2006-06-29 17:06:25-04:00, iggy@mysql.com +14 -3
    Remove trailing spaces from help arguments in com_server_help. 
    Disregard trailing spaces from command in com_help.

ChangeSet@1.2181.100.5, 2006-06-29 23:22:55+03:00, monty@mysql.com +1 -0
  Replaced assert with argument checking, as rpl_ndb_UUID caused slave to fail on x86 64 bit
  (It failed even if test was marked as skipped)
  

  sql/ha_ndbcluster.cc@1.334.5.1, 2006-06-29 23:22:52+03:00, monty@mysql.com +9 -1
    Replaced assert with argument checking, as rpl_ndb_UUID failed on x64

ChangeSet@1.1810.1872.1, 2006-06-30 00:21:55+04:00, kroki@mysql.com +4 -0
  Bug#20230: routine_definition is not null
  
  SHOW CREATE PROCEDURE and SHOW CREATE FUNCTION are fixed as well as
  INFORMATION_SCHEMA.ROUTINES.ROUTINE_NAME.

  mysql-test/r/information_schema.result@1.87.1.24, 2006-06-30 00:21:48+04:00, kroki@mysql.com +44 -8
    Add result for bug#20230.

  mysql-test/t/information_schema.test@1.65.1.18, 2006-06-30 00:21:48+04:00, kroki@mysql.com +36 -0
    Add test case for bug#20230.

  sql/sp_head.cc@1.200.1.18, 2006-06-30 00:21:49+04:00, kroki@mysql.com +14 -4
    Return NULL for routine definition if the user doesn't have enough
    privilege to see it.

  sql/sql_show.cc@1.253.34.1, 2006-06-30 00:21:49+04:00, kroki@mysql.com +2 -1
    Make INFORMATION_SCHEMA.ROUTINES.ROUTINE_NAME NULL-able.  Return
    NULL if the user doesn't have enough privilege to see routine
    definition.

ChangeSet@1.1810.1865.3, 2006-06-29 22:11:29+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  corrected merge error

  sql/ha_ndbcluster.cc@1.175.40.2, 2006-06-29 22:11:22+02:00, tomas@poseidon.ndb.mysql.com +3 -0
    corrected merge error

ChangeSet@1.1616.2664.1, 2006-06-29 20:55:21+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error

  sql/ha_ndbcluster.cc@1.114.3.72, 2006-06-29 20:55:14+02:00, tomas@poseidon.ndb.mysql.com +59 -24
    Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error

ChangeSet@1.2181.108.1, 2006-06-29 21:43:52+04:00, petr@mysql.com +1 -0
  Fix Bug#20692 rpl_* tests failure on hpux

  mysys/my_pread.c@1.11, 2006-06-29 21:43:34+04:00, petr@mysql.com +55 -11
    Fix our implementation of pread/pwrite: we did change the file pointer in our
    implementation, while the normal preads/pwrites don't. The new code is based
    on glibc version of pread/pwrite.

ChangeSet@1.1810.1868.4, 2006-06-29 17:00:48+02:00, joerg@mysql.com +2 -0
  Test "federated" failed because the log contains fixed port numbers.
  Re-apply a patch by Knielsen in the 5.0.23 build clone: Replace port number by "SLAVE_PORT".

  mysql-test/r/federated.result@1.25.4.1, 2006-06-29 17:00:42+02:00, joerg@mysql.com +2 -2
    Re-apply a patch by Knielsen in the 5.0.23 build clone: Replace port number by "SLAVE_PORT".

  mysql-test/t/federated.test@1.19.4.1, 2006-06-29 17:00:42+02:00, joerg@mysql.com +2 -0
    Re-apply a patch by Knielsen in the 5.0.23 build clone: Replace port number by "SLAVE_PORT".

ChangeSet@1.1810.1870.1, 2006-06-29 16:38:14+02:00, joerg@mysql.com +1 -0
  Increment the version number.

  configure.in@1.245.55.1, 2006-06-29 16:38:08+02:00, joerg@mysql.com +2 -2
    Increment the version number.

ChangeSet@1.1616.2550.11, 2006-06-29 16:20:18+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - autotest
    Fix testNodeRestart -n DuringLCP and others (add stopTest() at end of test :-))

  ndb/test/ndbapi/testNodeRestart.cpp@1.8.2.1, 2006-06-29 16:20:16+02:00, jonas@perch.ndb.mysql.com +1 -0
    Fix testNodeRestart -n DuringLCP and others

ChangeSet@1.2181.105.1, 2006-06-29 15:39:53+02:00, serg@serg.mylan +5 -0
  support for xadd emulation, workaround for Darwin

  include/atomic/nolock.h@1.3, 2006-06-29 15:39:32+02:00, serg@serg.mylan +4 -2
    support for xadd emulation

  include/atomic/x86-gcc.h@1.4, 2006-06-29 15:39:32+02:00, serg@serg.mylan +12 -6
    support for xadd emulation, workaround for Darwin

  include/atomic/x86-msvc.h@1.3, 2006-06-29 15:39:32+02:00, serg@serg.mylan +1 -1
    syntax error

  include/my_atomic.h@1.3, 2006-06-29 15:39:32+02:00, serg@serg.mylan +20 -6
    support for xadd emulation, cleanup

  mysys/my_atomic.c@1.2, 2006-06-29 15:39:32+02:00, serg@serg.mylan +1 -0
    assert

ChangeSet@1.1810.1864.3, 2006-06-29 18:39:34+05:00, gluh@eagle.intranet.mysql.r18.ru +9 -0
  Fix for bug#13934 Silent truncation of table comments
  Table comment: issue a warning(error in traditional mode) if length of comment > 60 symbols
  Column comment: issue a warning(error in traditional mode) if length of comment > 255 symbols
  Table 'comment' is changed from char* to LEX_STRING

  mysql-test/r/strict.result@1.25.1.2, 2006-06-29 18:39:27+05:00, gluh@mysql.com +46 -0
    test case

  mysql-test/t/strict.test@1.19.1.2, 2006-06-29 18:39:27+05:00, gluh@mysql.com +39 -0
    test case

  sql/handler.h@1.138.2.34, 2006-06-29 18:39:27+05:00, gluh@mysql.com +2 -1
    Table 'comment' is changed from char* to LEX_STRING

  sql/sql_show.cc@1.253.1.69, 2006-06-29 18:39:28+05:00, gluh@mysql.com +8 -5
    Table 'comment' is changed from char* to LEX_STRING

  sql/sql_table.cc@1.239.1.78, 2006-06-29 18:39:28+05:00, gluh@mysql.com +5 -2
    Table 'comment' is changed from char* to LEX_STRING

  sql/sql_yacc.yy@1.371.67.2, 2006-06-29 18:39:28+05:00, gluh@mysql.com +1 -1
    Table 'comment' is changed from char* to LEX_STRING

  sql/table.cc@1.160.1.64, 2006-06-29 18:39:28+05:00, gluh@mysql.com +3 -1
    Table 'comment' is changed from char* to LEX_STRING

  sql/table.h@1.102.1.27, 2006-06-29 18:39:28+05:00, gluh@mysql.com +1 -1
    Table 'comment' is changed from char* to LEX_STRING

  sql/unireg.cc@1.53.1.22, 2006-06-29 18:39:28+05:00, gluh@mysql.com +45 -4
    Fix for bug#13934 Silent truncation of table comments
    Table comment: issue a warning(error in traditional mode) if length of comment > 60 symbols
    Column comment: issue a warning(error in traditional mode) if length of comment > 255 symbols

ChangeSet@1.1810.1868.2, 2006-06-29 16:31:08+04:00, konstantin@mysql.com +1 -0
  A post-merge fix.

  mysql-test/r/information_schema.result@1.87.1.23, 2006-06-29 16:31:05+04:00, konstantin@mysql.com +9 -9
    A post-merge fix.

ChangeSet@1.1810.1855.11, 2006-06-29 14:03:53+02:00, ingo@mysql.com +2 -0
  Fixed yet another forgotten port number replacement.

  mysql-test/r/federated.result@1.25.1.6, 2006-06-29 14:03:37+02:00, ingo@mysql.com +1 -1
    Fixed yet another forgotten port number replacement.

  mysql-test/t/federated.test@1.19.1.8, 2006-06-29 14:03:37+02:00, ingo@mysql.com +1 -0
    Fixed yet another forgotten port number replacement.

ChangeSet@1.1810.1864.2, 2006-06-29 16:52:46+05:00, gluh@eagle.intranet.mysql.r18.ru +4 -0
  Bug#19671 mysql_list_fields returns incorrect table name for VIEWs
  After view onening real view db name and table name are placed
  into table_list->view_db & table_list->view_name.
  Item_field class does not handle these names properly during 
  intialization of Send_field.
  The fix is to use new class 'Item_ident_for_show' 
  which sets correct view db name and table name for Send_field.

  sql/item.cc@1.113.1.112, 2006-06-29 16:52:40+05:00, gluh@mysql.com +12 -1
    Bug#19671 mysql_list_fields returns incorrect table name for VIEWs
    new Item_ident_for_show class which correctly sets view db and table names
    for Send_field.

  sql/item.h@1.183.1.18, 2006-06-29 16:52:40+05:00, gluh@mysql.com +22 -0
    Bug#19671 mysql_list_fields returns incorrect table name for VIEWs
    new Item_ident_for_show class which correctly sets view db and table names
    for Send_field.

  sql/sql_show.cc@1.253.1.68, 2006-06-29 16:52:40+05:00, gluh@mysql.com +8 -1
    Bug#19671 mysql_list_fields returns incorrect table name for VIEWs
    new Item_ident_for_show is used for views

  tests/mysql_client_test.c@1.167.1.21, 2006-06-29 16:52:40+05:00, gluh@mysql.com +34 -0
    Bug#19671 mysql_list_fields returns incorrect table name for VIEWs
    test case

ChangeSet@1.1810.1865.1, 2006-06-29 13:01:54+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  fixed too small requestInfo in signal
  + adopted signal to be as close as possible to 5.1...

  ndb/include/kernel/signaldata/LqhFrag.hpp@1.2.2.1, 2006-06-29 13:01:46+02:00, tomas@poseidon.ndb.mysql.com +22 -22
    fixed too small requestInfo in signal
    + adopted signal to be as close as possible to 5.1...

ChangeSet@1.1810.1864.1, 2006-06-29 15:50:44+05:00, gluh@eagle.intranet.mysql.r18.ru +6 -0
  Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context 
  user name is calculated on function execution stage instead of parse stage

  mysql-test/r/sp_notembedded.result@1.3.1.1, 2006-06-29 15:49:10+05:00, gluh@mysql.com +14 -0
    Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
    test case

  mysql-test/t/sp_notembedded.test@1.5, 2006-06-29 15:49:10+05:00, gluh@mysql.com +20 -0
    Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
    test case

  sql/mysql_priv.h@1.290.1.106, 2006-06-29 15:49:10+05:00, gluh@mysql.com +1 -0
    Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
    new get_current_user(THD *thd, LEX_USER *user) function

  sql/sql_acl.cc@1.128.29.1, 2006-06-29 15:49:10+05:00, gluh@mysql.com +57 -16
    Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
    user name is calculated using get_current_user() function

  sql/sql_parse.cc@1.426.93.1, 2006-06-29 15:49:10+05:00, gluh@mysql.com +48 -6
    Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
    new get_current_user() function
    user name is calculated using get_current_user() function

  sql/sql_yacc.yy@1.371.67.1, 2006-06-29 15:49:11+05:00, gluh@mysql.com +9 -31
    Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
    empty LEX_USER struct for CURRENT USER, 
    user name is calculated on function execution stage

ChangeSet@1.2181.98.4, 2006-06-29 11:53:51+02:00, andrey@lmy004. +3 -0
  fix for bug#16394 "Events: Crash if schedule contains SELECT"
  
  Parsing of CREATE/ALTER EVENT statement was crashing because of early
  initialization done during parsing, instead in the after parsing phase.
  Moreover, we don't want SUBqueries in CREATE/ALTER EVENT therefore we
  disable them, though it is possible to make them work. It can be emulated
  inside SP with a cursor and SP variable (CREATE/ALTER EVENT can still
  accept variables as values).

  mysql-test/r/events_bugs.result@1.13, 2006-06-29 11:53:42+02:00, andrey@lmy004. +8 -0
    update result

  mysql-test/t/events_bugs.test@1.11, 2006-06-29 11:53:42+02:00, andrey@lmy004. +15 -0
    tests for bug#16384

  sql/sql_yacc.yy@1.487, 2006-06-29 11:53:42+02:00, andrey@lmy004. +18 -8
    disallow subqueries when SQLCOM_CREATE_EVENT | SQLCOM_ALTER_EVENT
    The fix is not big, though lex->forbid_subqueries could have been introduced.
    Easier is just to set the sql_command and check in both rules where
    subqueries enter.

ChangeSet@1.1810.1830.19, 2006-06-29 13:45:43+04:00, kroki@mysql.com +1 -0
  Replace all numeric error code with symbolic names in trigger.test.

  mysql-test/t/trigger.test@1.34.1.15, 2006-06-29 13:45:37+04:00, kroki@mysql.com +42 -42
    Replace all numeric error code with symbolic names.
    Left are --error 1 for system error, and --error 1100.  The
    symbolic constant for the latter is ER_TABLE_NOT_LOCKED, but using
    it triggers a bug in test driver due to name prefix collision with
    1099 ER_TABLE_NOT_LOCKED_FOR_WRITE.  This bug is fixed in 5.1.

ChangeSet@1.1810.1863.1, 2006-06-29 11:39:07+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - build
    Fix compile error for forte

  ndb/src/kernel/blocks/dbdict/Dbdict.hpp@1.9.11.2, 2006-06-29 11:39:04+02:00, jonas@perch.ndb.mysql.com +5 -0
    Fix compile error for forte

ChangeSet@1.1810.1862.1, 2006-06-29 10:35:16+02:00, knielsen@mysql.com +2 -0
  Fix test files to work with non-standard ports (MTR_BUILD_THREAD).

  mysql-test/r/federated.result@1.25.2.3, 2006-06-29 10:35:06+02:00, knielsen@mysql.com +2 -2
    Use --replace_result to make test work on non-standard ports.

  mysql-test/t/federated.test@1.19.2.3, 2006-06-29 10:35:02+02:00, knielsen@mysql.com +2 -0
    Use --replace_result to make test work on non-standard ports.

ChangeSet@1.1810.1861.1, 2006-06-29 10:03:26+02:00, knielsen@mysql.com +2 -0
  Fix test files to work with non-standard ports (MTR_BUILD_THREAD).

  mysql-test/r/federated.result@1.25.3.1, 2006-06-29 10:02:49+02:00, knielsen@mysql.com +4 -4
    Use --replace_result to make test work on non-standard ports.

  mysql-test/t/federated.test@1.19.3.1, 2006-06-29 10:02:43+02:00, knielsen@mysql.com +4 -0
    Use --replace_result to make test work on non-standard ports.

ChangeSet@1.2181.100.4, 2006-06-29 03:24:33+03:00, monty@mysql.com +3 -0
  Fixed failing test rpl_ndb_auto_inc.test
  Mark events_stress.test as 'big' as it's very slow on some machines

  BitKeeper/etc/ignore@1.246.1.2, 2006-06-29 03:22:05+03:00, monty@mysql.com +1 -0
    added server-tools/instance-manager/net_serv.cc

  mysql-test/t/events_stress.test@1.7, 2006-06-29 03:24:30+03:00, monty@mysql.com +2 -1
    Slow test: only run when using --big

  mysql-test/t/rpl_ndb_auto_inc.test@1.3, 2006-06-29 03:24:30+03:00, monty@mysql.com +2 -1
    Fix failing test

ChangeSet@1.2181.98.3, 2006-06-29 00:42:25+02:00, andrey@lmy004. +14 -0
  WL#3337 (Events new architecture)
  This cut No 7 should finish the part of fixing the parsing of the events :
  - Event_timed is no more used during parsing. Less problems because it has
    a mutex. Event_parse_data class is used during parsing. It is suited only
    for this purpose. It's pretty lightweight
  - Late checking of data from parsing is being performed. This should solve
    the problems of nested events in SP or other events (for the situation 
    of no nested bodies). Before if an ALTER EVENT was in a SP, then when the
    SP was compiled, and not executed, the actual init_xxx methods of Event_timed
    were called, which is wrong.
  - It could be a side effect of using a specialized class, but test events_stress is
    now 25% quicker.
  
  Cut No8 will start splitting Event_scheduler into 2 parts, the QUEUE will be moved
  to Event_queue.

  mysql-test/r/events.result@1.38, 2006-06-29 00:42:13+02:00, andrey@lmy004. +2 -2
    update result

  mysql-test/t/events.test@1.34, 2006-06-29 00:42:13+02:00, andrey@lmy004. +2 -2
    disabled is actually wrong, should be disable, but because of the early
    checking it was never parsed.

  sql/event_data_objects.cc@1.63, 2006-06-29 00:42:13+02:00, andrey@lmy004. +166 -385
    move add init_xxx methods from Event_timed to Event_parse_data
    Event_parse data does not need definer_user and definer_host
    in Event_timed::compile() do not use lex.et, well there is no more lex.et :)

  sql/event_data_objects.h@1.6, 2006-06-29 00:42:13+02:00, andrey@lmy004. +2 -61
    move parsing responsibilities from Event_timed to Event_parse_data

  sql/event_db_repository.cc@1.5, 2006-06-29 00:42:13+02:00, andrey@lmy004. +321 -60
    No more Event_timed comes from parsing but Event_parse_data
    The initialization of Item*-s from parsing is done late, and not
    during the actual parsing. This is the right way to go because
    if an ALTER EVENT is inside a SP or CREATE EVENT it should not be
    executed (initialized) during parsing, as it was done.

  sql/event_db_repository.h@1.4, 2006-06-29 00:42:13+02:00, andrey@lmy004. +8 -7
    No more Event_timed comes from parsing but Event_parse_data
    The initialization of Item*-s from parsing is done late, and not
    during the actual parsing. This is the right way to go because
    if an ALTER EVENT is inside a SP or CREATE EVENT it should not be
    executed (initialized) during parsing, as it was done.

  sql/event_scheduler.cc@1.12, 2006-06-29 00:42:13+02:00, andrey@lmy004. +19 -59
    No more Event_timed comes from parsing but Event_parse_data
    The initialization of Item*-s from parsing is done late, and not
    during the actual parsing. This is the right way to go because
    if an ALTER EVENT is inside a SP or CREATE EVENT it should not be
    executed (initialized) during parsing, as it was done.

  sql/event_scheduler.h@1.8, 2006-06-29 00:42:13+02:00, andrey@lmy004. +4 -7
    No more Event_timed comes from parsing but Event_parse_data
    The initialization of Item*-s from parsing is done late, and not
    during the actual parsing. This is the right way to go because
    if an ALTER EVENT is inside a SP or CREATE EVENT it should not be
    executed (initialized) during parsing, as it was done.

  sql/events.cc@1.48, 2006-06-29 00:42:14+02:00, andrey@lmy004. +13 -19
    No more Event_timed comes from parsing but Event_parse_data
    The initialization of Item*-s from parsing is done late, and not
    during the actual parsing. This is the right way to go because
    if an ALTER EVENT is inside a SP or CREATE EVENT it should not be
    executed (initialized) during parsing, as it was done.

  sql/events.h@1.37, 2006-06-29 00:42:14+02:00, andrey@lmy004. +4 -6
    No more Event_timed comes from parsing but Event_parse_data
    The initialization of Item*-s from parsing is done late, and not
    during the actual parsing. This is the right way to go because
    if an ALTER EVENT is inside a SP or CREATE EVENT it should not be
    executed (initialized) during parsing, as it was done.

  sql/sql_lex.cc@1.191, 2006-06-29 00:42:14+02:00, andrey@lmy004. +2 -2
    lex->et_compile_phase and lex->et are no more.
    Use lex->event_parse_data

  sql/sql_lex.h@1.236, 2006-06-29 00:42:14+02:00, andrey@lmy004. +0 -3
    lex->et_compile_phase and lex->et are no more.
    Use lex->event_parse_data

  sql/sql_parse.cc@1.563.1.4, 2006-06-29 00:42:14+02:00, andrey@lmy004. +21 -67
    lex->et_compile_phase and lex->et are no more.
    Use lex->event_parse_data
    ACL checks were moved inside the Events subsystem.
    Also ending of the transaction is performed only just
    before doing disk operation. Therefore only when needed.

  sql/sql_yacc.yy@1.486, 2006-06-29 00:42:14+02:00, andrey@lmy004. +5 -146
    lex->et and lex->et_parse_phase are no more
    Use the specialized for parsing Event_parse_data

ChangeSet@1.1810.1860.1, 2006-06-28 23:50:50+04:00, kroki@mysql.com +3 -0
  Bug#10946: Confusing error messeges in the case of duplicate trigger definition
  
  It was hard to distinguish case, when one was unable to create trigger
  on the table because trigger with same action time and event already
  existed for this table, from the case, when one tried to create trigger
  with name which was already occupied by some other trigger, since in
  both these cases we emitted ER_TRG_ALREADY_EXISTS error and message.
  Now we emit ER_NOT_SUPPORTED_YET error with appropriate additional
  message in the first case. There is no sense in introducing separate
  error for this situation since we plan to get rid of this limitation
  eventually.

  mysql-test/r/trigger.result@1.29.6.1, 2006-06-28 23:50:41+04:00, kroki@mysql.com +1 -1
    Update result for new error message.

  mysql-test/t/trigger.test@1.34.6.1, 2006-06-28 23:50:41+04:00, kroki@mysql.com +1 -1
    Update test for new error code.

  sql/sql_trigger.cc@1.35.8.1, 2006-06-28 23:50:41+04:00, kroki@mysql.com +3 -1
    If there is already a trigger with the same activation time, report an
    "Unsupported yet" error.

ChangeSet@1.1810.1830.17, 2006-06-28 23:47:45+04:00, konstantin@mysql.com +5 -0
  A fix for Bug#19022 "Memory bug when switching db during trigger execution". 
  No test case as the bug is in an existing test case (rpl_trigger.test
  when it is run under valgrind).
  The warning was caused by memory corruption in replication slave: thd->db
  was pointing at a stack address that was previously used by 
  sp_head::execute()::old_db. This happened because mysql_change_db
  behaved differently in replication slave and did not make a copy of the 
  argument to assign to thd->db. 
  The solution is to always free the old value of thd->db and allocate a new
  copy, regardless whether we're running in a replication slave or not.

  sql/log_event.cc@1.174.1.34, 2006-06-28 23:47:38+04:00, konstantin@mysql.com +25 -7
    Move rewrite_db to log_event.cc, the only place where it is used.

  sql/slave.cc@1.241.1.32, 2006-06-28 23:47:38+04:00, konstantin@mysql.com +0 -18
    Move rewrite_db to log_event.cc

  sql/slave.h@1.85.1.10, 2006-06-28 23:47:38+04:00, konstantin@mysql.com +0 -1
    Remove an unneeded declaration.

  sql/sql_class.h@1.230.27.4, 2006-06-28 23:47:38+04:00, konstantin@mysql.com +13 -11
    Fix set_db to always free the old db, even if the argument is NULL.
    Add a comment.

  sql/sql_db.cc@1.120.1.10, 2006-06-28 23:47:38+04:00, konstantin@mysql.com +74 -85
    Always make a deep copy of the argument in mysql_change_db, even 
    if running in a replication slave. This is necessary because 
    sp_use_new_db (stored procedures) assumes that mysql_change_db always makes
    a deep copy of the argument, and thus passes a pointer to stack into it.
    This assumption was true for all cases except the replication slave thread.

ChangeSet@1.1810.1855.5, 2006-06-28 12:18:21-07:00, patg@govinda.patg.net +3 -0
  BUG #19773
  
  Pushbuild fixes to result file, test, and header file for federated.

  mysql-test/r/federated.result@1.25.2.2, 2006-06-28 12:18:14-07:00, patg@govinda.patg.net +2 -2
    BUG #19773
    
    Pushbuild fixes - result file had hard-coded port

  mysql-test/t/federated.test@1.19.2.2, 2006-06-28 12:18:14-07:00, patg@govinda.patg.net +2 -0
    BUG #19773
    
    Pushbuild fixes Test was missing --replace_result

  sql/ha_federated.h@1.18.1.8, 2006-06-28 12:18:14-07:00, patg@govinda.patg.net +2 -2
    BUG #19773
    
    HPUX and Windows failed with variable named row and *row in method declaration

ChangeSet@1.1810.1847.2, 2006-06-28 12:11:52-07:00, jimw@mysql.com +1 -0
  Optimize stack usage of ha_federated::update_row().

  sql/ha_federated.cc@1.24.1.38, 2006-06-28 12:11:48-07:00, jimw@mysql.com +13 -20
    We only need one string buffer for fields in ::update_row()

ChangeSet@1.1346.876.1, 2006-06-28 18:55:30+02:00, ingo@mysql.com +2 -0
  Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert"
  
  It was possible that fetching a record by an exact key value 
  (including the record pointer) could return a record with a 
  different key value. This happened only if a concurrent insert 
  added a record with the searched key value after the fetching 
  statement locked the table for read.
  
  The search succeded on the key value, but the record was
  rejected as it was past the file length that was remembered
  at start of the fetching statement. With other words it was 
  rejected as being a concurrently inserted record.
  
  The action to recover from this problem was to fetch the 
  record that is pointed at by the next key of the index. 
  This was repeated until a record below the file length was 
  found.
  
  I do now avoid this loop if an exact match was searched. 
  If this match is beyond the file length, it is now treated 
  as "key not found". There cannot be another key with the 
  same record pointer.

  sql/sql_class.cc@1.71.1.43, 2006-06-28 18:55:18+02:00, ingo@mysql.com +3 -3
    Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert"
    Fixed some DBUG_ENTER strings.

  myisam/mi_rkey.c@1.11.1.4, 2006-06-28 18:55:18+02:00, ingo@mysql.com +14 -2
    Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert"
    Added a check for exact key match before searching for
    the next key that was not concurrently inserted. If an
    exact key match finds a concurrently inserted row, this
    must be treated as "key not found".

ChangeSet@1.2181.80.8, 2006-06-28 17:23:54+03:00, monty@mysql.com +2 -0
  Added -DHAVE_MUTEX_THREAD_ONLY to fix that bdb doesn't crash with "unable to initialize mutex"

  BUILD/compile-pentium-gcov@1.15, 2006-06-28 17:23:51+03:00, monty@mysql.com +1 -1
    Added -DHAVE_MUTEX_THREAD_ONLY to fix that bdb doesn't crash with "unable to initialize mutex"

  BitKeeper/etc/ignore@1.245.1.2, 2006-06-28 17:22:00+03:00, monty@mysql.com +1 -0
    added *.gcno

  BitKeeper/etc/ignore@1.245.1.1, 2006-06-28 17:21:53+03:00, monty@mysql.com +1 -0
    added *.gcda

ChangeSet@1.1616.2662.1, 2006-06-28 16:07:39+02:00, ingo@mysql.com +1 -0
  Bug#19835 - Binary copy of corrupted tables crash the server when issuing a query
  
  A corrupt table with dynamic record format can crash the 
  server when trying to select from it.
          
  I fixed the crash that resulted from the particular type 
  of corruption that has been reported for this bug.
  
  No test case. To test it, one needs a table with a very special
  corruption. The bug report contains a file with such a table.

  myisam/mi_dynrec.c@1.36.1.2, 2006-06-28 16:06:59+02:00, ingo@mysql.com +3 -0
    Bug#19835 - Binary copy of corrupted tables crash the server when issuing a query
    Added a protection against corrupted records. A dynamic 
    record header with invalid 'next' pointer could trigger 
    the assert in _mi_get_block_info(). Now I avoid this by 
    reporting a corruption error.

ChangeSet@1.2181.98.2, 2006-06-28 16:02:20+02:00, andrey@lmy004. +1 -0
  after merge fix

  sql/events.cc@1.47, 2006-06-28 16:02:12+02:00, andrey@lmy004. +1 -1
    after merge fix

ChangeSet@1.1616.2661.1, 2006-06-28 16:28:29+03:00, gkodinov@mysql.com +5 -0
  gcc 4.1 linux warning fixes backported from 5.0.

  sql/item_cmpfunc.h@1.73.1.43, 2006-06-28 16:28:25+03:00, gkodinov@mysql.com +14 -0
    gcc 4.1 linux warning fixes backported from 5.0

  sql/opt_range.cc@1.98.2.48, 2006-06-28 16:28:25+03:00, gkodinov@mysql.com +2 -2
    gcc 4.1 linux warning fixes.

  sql/spatial.h@1.12.1.4, 2006-06-28 16:28:25+03:00, gkodinov@mysql.com +4 -0
    gcc 4.1 linux warning fixes backported from 5.0

  sql/sql_select.h@1.60.1.21, 2006-06-28 16:28:25+03:00, gkodinov@mysql.com +1 -1
    gcc 4.1 linux warning fixes.

  sql/sql_update.cc@1.83.2.72, 2006-06-28 16:28:25+03:00, gkodinov@mysql.com +1 -1
    gcc 4.1 linux warning fixes.

ChangeSet@1.1810.1837.8, 2006-06-28 15:15:49+02:00, knielsen@mysql.com +1 -0
  BUG#20739.
  In the Windows build files, the "Max nt" configuration for some reason
  had the mysql_client_test project disabled. Enable it.

  VC++Files/mysql.sln@1.5.1.6, 2006-06-28 15:15:44+02:00, knielsen@mysql.com +1 -0
    The "Max nt" configuration for some reason had the mysql_client_test
    project disabled. Enable it.

ChangeSet@1.2181.77.12, 2006-06-28 15:14:05+02:00, andrey@lmy004. +5 -0
  WL#3337 (Events new architecture)
  Cut 7 (refactoring)
  
  db_repository is no more embedded in the Events
  singleton. Therefore a change to Events_db_repository
  won't mean recompile of all files in the server which include events.h

  sql/event_data_objects.cc@1.62, 2006-06-28 15:13:55+02:00, andrey@lmy004. +1 -1
    db_repository is no more embedded in the Events
    singleton. Therefore a change to Events_db_repository
    won't mean recompile of all files in the server which include events.h

  sql/event_db_repository.cc@1.4, 2006-06-28 15:13:55+02:00, andrey@lmy004. +1 -1
    db_repository is no more embedded in the Events
    singleton. Therefore a change to Events_db_repository
    won't mean recompile of all files in the server which include events.h

  sql/events.cc@1.42.1.8, 2006-06-28 15:13:55+02:00, andrey@lmy004. +44 -40
    db_repository is no more embedded in the Events
    singleton. Therefore a change to Events_db_repository
    won't mean recompile of all files in the server which include events.h

  sql/events.h@1.36, 2006-06-28 15:13:55+02:00, andrey@lmy004. +9 -11
    db_repository is no more embedded in the Events
    singleton. Therefore a change to Events_db_repository
    won't mean recompile of all files in the server which include events.h

  sql/mysqld.cc@1.563.1.2, 2006-06-28 15:13:56+02:00, andrey@lmy004. +4 -4
    db_repository is no more embedded in the Events
    singleton. Therefore a change to Events_db_repository
    won't mean recompile of all files in the server which include events.h

ChangeSet@1.1810.1837.7, 2006-06-28 15:07:41+02:00, lars@mysql.com +1 -0
  Disabled test case for Windows (BUG#20753)

  mysql-test/t/rpl_openssl.test@1.11.1.2, 2006-06-28 15:07:28+02:00, lars@mysql.com +4 -0
    Disabled test case for Windows (BUG#20753)

ChangeSet@1.1810.1849.2, 2006-06-28 15:53:54+03:00, gkodinov@mysql.com +2 -0
  4.1->5.0 merge for bug #16458

  mysql-test/r/distinct.result@1.46, 2006-06-28 15:53:48+03:00, gkodinov@mysql.com +1 -1
    4.1->5.0 merge for bug #16458
     * 5.0 is better in detecting duplicate columns 

  sql/sql_select.cc@1.312.1.115, 2006-06-28 15:53:48+03:00, gkodinov@mysql.com +7 -3
    4.1->5.0 merge for bug #16458
     * Should not do the optimization if using index for group by
     * chnaged structures in 5.0

ChangeSet@1.1616.2660.1, 2006-06-28 14:27:37+02:00, ingo@mysql.com +6 -0
  Bug#17877 - Corrupted spatial index
  
  CHECK TABLE could complain about a fully intact spatial index.
  A wrong comparison operator was used for table checking. 
  The result was that it checked for non-matching spatial keys. 
  This succeeded if at least two different keys were present, 
  but failed if only the matching key was present.
  
  I fixed the key comparison.

  mysql-test/r/gis-rtree.result@1.8.1.5, 2006-06-28 14:27:33+02:00, ingo@mysql.com +40 -0
    Bug#17877 - Corrupted spatial index
    The test result.

  mysql-test/t/gis-rtree.test@1.9.1.4, 2006-06-28 14:27:33+02:00, ingo@mysql.com +44 -0
    Bug#17877 - Corrupted spatial index
    The test case.

  myisam/mi_check.c@1.105.1.53, 2006-06-28 14:27:33+02:00, ingo@mysql.com +3 -2
    Bug#17877 - Corrupted spatial index
    Fixed the comparison operator for checking a spatial index.
    Using MBR_EQUAL | MBR_DATA to compare for equality and
    include the data pointer in the comparison. The latter
    finds the index entry that points to the current record.
    This is necessary for non-unique indexes.
    
    The old operator, SEARCH_SAME, is unknown to the rtree
    search functions and handled like MBR_DISJOINT.

  myisam/mi_key.c@1.32.1.6, 2006-06-28 14:27:33+02:00, ingo@mysql.com +1 -1
    Bug#17877 - Corrupted spatial index
    Added a missing DBUG_RETURN.

  myisam/rt_index.c@1.16.1.1, 2006-06-28 14:27:33+02:00, ingo@mysql.com +5 -3
    Bug#17877 - Corrupted spatial index
    Included the data pointer in the copy of the search key.
    This is necessary for searching the index entry that points
    to a specific record if the search_flag contains MBR_DATA.

  myisam/rt_mbr.c@1.9.1.1, 2006-06-28 14:27:33+02:00, ingo@mysql.com +5 -1
    Bug#17877 - Corrupted spatial index
    Extended the RT_CMP() macro with an assert for an 
    unexpected comparison operator.

ChangeSet@1.1810.1837.6, 2006-06-28 14:25:17+02:00, knielsen@mysql.com +2 -0
  BUG#20739
  Improved definition of mysys configuration for -nt builds.

  VC++Files/mysql.sln@1.5.1.5, 2006-06-28 14:25:13+02:00, knielsen@mysql.com +8 -8
    Use the name 'nt' instead of 'Release' for configuration.

  VC++Files/mysys/mysys.vcproj@1.2.1.5, 2006-06-28 14:25:13+02:00, knielsen@mysql.com +15 -15
    Use the name 'nt' instead of 'Release' for configuration.
    Use separate output files for NT and non-NT configurations.

ChangeSet@1.2181.77.11, 2006-06-28 14:22:14+02:00, andrey@lmy004. +7 -0
  WL#3337 (Events new architecture)
  Cut number 6. Move code from sql_show.cc to event_db_repository.cc
  that more belongs to the latter.

  sql/event_db_repository.cc@1.3, 2006-06-28 14:22:06+02:00, andrey@lmy004. +169 -4
    move code that works with mysql.event from sql_show.cc to 
    event_db_repository.cc . Route through Event_db_repository's interface
    which is proxied by class Events. The code relies on a function from
    sql_show.cc which does the actual storage in the schema table. I think
    it's better to leave the function there because the structure of 
    I_S.EVENTS is defined in sql_show.cc

  sql/event_db_repository.h@1.3, 2006-06-28 14:22:06+02:00, andrey@lmy004. +24 -4
    I_S / SHOW EVENTS handling hooks

  sql/event_scheduler.cc@1.11, 2006-06-28 14:22:06+02:00, andrey@lmy004. +1 -1
    use the pointer to db_repository which Event_scheduler already has

  sql/events.cc@1.42.1.7, 2006-06-28 14:22:06+02:00, andrey@lmy004. +46 -1
    Put a comment to get_instance

  sql/events.h@1.35, 2006-06-28 14:22:06+02:00, andrey@lmy004. +3 -0
    callback for I_S (sql_show.cc)

  sql/sql_show.cc@1.352.1.5, 2006-06-28 14:22:06+02:00, andrey@lmy004. +2 -179
    move code that belongs more to Event_db_repository than to here.
    Use a callback of class Events. Only 1 function is left here, because
    it copies data into the actual rows of I_S.EVENTS and belongs to this file.

  sql/sql_show.h@1.2, 2006-06-28 14:22:07+02:00, andrey@lmy004. +2 -0
    export this function will be called from event_db_repository.cc

ChangeSet@1.1616.2638.3, 2006-06-28 21:52:24+10:00, stewart@mysql.com +1 -0
  BUG#19894 Data nodes fail during loading data if NoOfFragmentLogFiles=1
  
  change default minimum to 3
  
  bug is *very* timing dependent, unable to reproduce here, but theoretically possible.

  ndb/src/mgmsrv/ConfigInfo.cpp@1.50.5.1, 2006-06-28 21:52:20+10:00, stewart@mysql.com +1 -1
    change minimum NoOfFragmentLogFiles to 3

ChangeSet@1.2181.80.7, 2006-06-28 14:03:08+03:00, monty@mysql.com +8 -0
  Added purecov comment for new, not executed code for my recent changeset
  (Found by dgcov)

  mysql-test/r/show_check.result@1.97, 2006-06-28 14:03:04+03:00, monty@mysql.com +6 -0
    Test SHOW PLUGIN.
    (Was not covered by test suite before)

  mysql-test/t/show_check.test@1.65, 2006-06-28 14:03:04+03:00, monty@mysql.com +13 -0
    Test SHOW PLUGIN.
    (Was not covered by test suite before)

  mysys/my_handler.c@1.26, 2006-06-28 14:03:04+03:00, monty@mysql.com +2 -1
    Added purecov comment for new, not executed code

  sql/filesort.cc@1.109, 2006-06-28 14:03:04+03:00, monty@mysql.com +9 -1
    Added purecov comment for new, not executed code
    Removed 'purecov: inspected' from code covered by current testsuite 

  sql/ha_ndbcluster_binlog.cc@1.69.1.1, 2006-06-28 14:03:04+03:00, monty@mysql.com +2 -0
    Added purecov comment for new, not executed code

  sql/log_event.cc@1.226.1.3, 2006-06-28 14:03:04+03:00, monty@mysql.com +2 -0
    Added purecov comment for new, not executed code

  sql/mysqld.cc@1.562.4.1, 2006-06-28 14:03:04+03:00, monty@mysql.com +2 -0
    Added purecov comment for new, not executed code

  sql/sql_parse.cc@1.561.1.3, 2006-06-28 14:03:04+03:00, monty@mysql.com +2 -2
    Added purecov comment for new, not executed code

ChangeSet@1.1810.1842.2, 2006-06-28 12:40:17+02:00, tnurnberg@mysql.com +3 -0
  Bug#19857: When a user with CREATE ROUTINE priv creates a routine it results in NULL p/w
    
  sp_grant_privileges(), the function that GRANTs EXECUTE + ALTER privs on a SP,
  did so creating a user-entry with not password; mysql_routine_grant() would then
  write that "change" to the user-table.

  mysql-test/r/sp-security.result@1.25.1.5, 2006-06-28 12:40:07+02:00, tnurnberg@mysql.com +31 -0
    prove that creating a stored procedure will not destroy the creator's password

  mysql-test/t/sp-security.test@1.28.1.5, 2006-06-28 12:40:07+02:00, tnurnberg@mysql.com +46 -0
    prove that creating a stored procedure will not destroy the creator's password

  sql/sql_acl.cc@1.128.1.69, 2006-06-28 12:40:07+02:00, tnurnberg@mysql.com +44 -15
    get password from ACLs, convert to correct format, and use it when
    forcing GRANTS for SPs

ChangeSet@1.1810.1837.5, 2006-06-28 10:35:47+02:00, knielsen@mysql.com +3 -0
  BUG#20739: __NT__ not probably defined for mysys project.
  
  Make sure for the mysys project that __NT__ is defined in *nt solution
  configurations (but not in other configurations).

  VC++Files/mysql.sln@1.5.1.4, 2006-06-28 10:35:43+02:00, knielsen@mysql.com +10 -10
    Define __NT__ in mysys for *nt configurations.

  VC++Files/mysys/mysys.vcproj@1.2.1.4, 2006-06-28 10:35:43+02:00, knielsen@mysql.com +102 -2
    Add configurations with __NT__ defined.

  mysql-test/mysql-test-run.pl@1.30.1.72, 2006-06-28 10:35:43+02:00, knielsen@mysql.com +2 -1
    Also allow testing a "Max nt" build.

ChangeSet@1.1810.1837.4, 2006-06-28 14:30:13+04:00, aivanov@mysql.com +1 -0
  Adding __NT__ to Max Win32 configuration.

  VC++Files/sql/mysqld.vcproj@1.3.1.3, 2006-06-28 14:30:09+04:00, aivanov@mysql.com +1 -1
    Adding __NT__ to Max Win32 configuration.

ChangeSet@1.2181.95.5, 2006-06-28 12:16:10+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - 
    50->51 merge of bug#20442, force close scan (with locks)

  storage/ndb/src/ndbapi/NdbScanOperation.cpp@1.86, 2006-06-28 12:16:07+02:00, jonas@perch.ndb.mysql.com +3 -8
    merge

ChangeSet@1.2181.95.4, 2006-06-28 11:38:22+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    ndbapi test of bug#20252

  storage/ndb/test/ndbapi/testScan.cpp@1.22, 2006-06-28 11:38:19+02:00, jonas@perch.ndb.mysql.com +54 -48
    ndbapi test of bug#20252

ChangeSet@1.1810.1710.6, 2006-06-28 11:27:37+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#20442
    force close of scan (of outstanding scan_frag)

  ndb/src/ndbapi/NdbScanOperation.cpp@1.66.7.1, 2006-06-28 11:27:35+02:00, jonas@perch.ndb.mysql.com +60 -0
    Force close of scan in when not doing committed read scan

ChangeSet@1.1810.1752.5, 2006-06-27 23:49:48-07:00, patg@govinda.patg.net +4 -0
  BUG #19773
    
  Final-review fixes per Monty, pre-push. OK'd for 
  push. Please see each file's comments.
  

  mysql-test/r/federated.result@1.25.2.1, 2006-06-27 23:49:43-07:00, patg@govinda.patg.net +88 -0
    BUG #19773
        
    Results for multi-table deletes, updates

  mysql-test/t/federated.test@1.19.2.1, 2006-06-27 23:49:43-07:00, patg@govinda.patg.net +51 -0
    BUG #19773
        
    Test multi table update and delete. Added drop table to end of previous test.

  sql/ha_federated.cc@1.24.10.1, 2006-06-27 23:49:43-07:00, patg@govinda.patg.net +225 -190
    BUG #19773 
        
    Post-review changes, per Monty. 3rd patch, OK'd for push.
    - Added index_read_idx_with_result_set, which uses the result set passed to it
    - Hash by entire connection scheme
    - Protected store_result result set for table scan by adding a method result set
      to index_read_idx and index_read which is passed to index_read_with_result, which
      in turn iterates over the single record via read_next.
      This is a change from having two result sets in the first two patches. 
      This keeps the code clean and avoids the need for yet another result set.
    - Rewrote ::position and ::rnd_pos to store position - if primary key use 
      primary key, if not, use record buffer.
    - Rewrote get_share to store hash with connect string vs. table name
    - delete_row added subtration of "records" by affected->rows
    - Added read_next to handle what rnd_next used to do (converting raw record
       to query and vice versa)
    - Removed many DBUG_PRINT lines
    - Removed memset initialisation since subsequent loop accomplishes
    - Removed un-necessary mysql_free_result lines
    

  sql/ha_federated.h@1.18.1.7, 2006-06-27 23:49:43-07:00, patg@govinda.patg.net +12 -4
     BUG #19773
        
        Fixed "SET " to " SET " to make sure built statements are built with 
        "UPDATE `t1` SET .." instead of "UPDATE `t1`SET"
        

ChangeSet@1.1810.1825.2, 2006-06-28 10:21:01+04:00, aivanov@mysql.com +4 -0
  Fixing BUG#17719 "Delete of binlog files fails on Windows"
   and BUG#19208 "Test 'rpl000017' hangs on Windows".
   Both bugs are caused by attempting to delete an opened
   file and to create immediatedly a new one with the same
   name. On Windows it can be supported only on NT-platforms
   (by using FILE_SHARE_DELETE mode and with renaming the
   file before deletion). Because deleting not-closed files
   is not supported on all platforms (e.g. Win 98|ME) this
   is to be considered harmful and should be eliminated by
   a "code redesign".

  VC++Files/mysys/mysys.vcproj@1.2.1.3, 2006-06-28 10:20:56+04:00, aivanov@mysql.com +5 -5
    To be sure that __NT__ is defined for Win configurations.
     Temporary, to be changed in more appropriate way.

  include/my_sys.h@1.178.4.1, 2006-06-28 10:20:56+04:00, aivanov@mysql.com +8 -0
    Adding my_delete_allow_opened to be invoked to delete
     a (possibly) not closed file on Windows NT-platforms.

  mysys/my_delete.c@1.6, 2006-06-28 10:20:56+04:00, aivanov@mysql.com +51 -0
    Adding nt_share_delete() function implementing
     a (possibly) not closed file deletion on Windows NT.

  sql/log.cc@1.158.9.1, 2006-06-28 10:20:56+04:00, aivanov@mysql.com +2 -2
    MYSQL_LOG::reset_logs(): Deleting usually not
     closed binlog files.

ChangeSet@1.2181.95.1, 2006-06-28 02:35:13+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  Bug #20705 table truncation from one mysqld causes ERROR 1412 on other mysqld servers
  - make sure to invalidate even if table is not binlogged

  sql/ha_ndbcluster_binlog.cc@1.71, 2006-06-28 02:35:04+02:00, tomas@poseidon.ndb.mysql.com +24 -1
    Bug #20705 table truncation from one mysqld causes ERROR 1412 on other mysqld servers
    - make sure to invalidate even if table is not binlogged

ChangeSet@1.1810.1854.1, 2006-06-27 17:16:02-07:00, jimw@mysql.com +4 -0
  Bug #18005: Creating a trigger on mysql.event leads to server crash on scheduler startup
  Bug #18361: Triggers on mysql.user table cause server crash
  
   Because they do not work, we do not allow creating triggers on tables
   within the 'mysql' schema.
  
   (They may be made to work and re-enabled at some later date, but not
   in 5.0 or 5.1.)

  mysql-test/r/trigger.result@1.29.1.13, 2006-06-27 17:15:59-07:00, jimw@mysql.com +12 -0
    Add new results

  mysql-test/t/trigger.test@1.34.1.13, 2006-06-27 17:15:59-07:00, jimw@mysql.com +23 -1
    Add new regression test for creating triggers on system schema

  sql/share/errmsg.txt@1.42.14.1, 2006-06-27 17:15:59-07:00, jimw@mysql.com +2 -0
    Add new error message

  sql/sql_trigger.cc@1.35.7.1, 2006-06-27 17:15:59-07:00, jimw@mysql.com +9 -0
    Disallow creating triggers on tables in the 'mysql' schema

ChangeSet@1.1616.2653.8, 2006-06-27 20:10:49-04:00, iggy@mysql.com +3 -0
  Bug#16180 Setting SQL_LOG_OFF without SUPER privilege is silently ignored

  mysql-test/r/grant2.result@1.8.8.2, 2006-06-27 20:10:46-04:00, iggy@mysql.com +10 -0
    Added results for bug#16180

  mysql-test/t/grant2.test@1.7.1.10, 2006-06-27 20:10:46-04:00, iggy@mysql.com +17 -0
    Added test for bug# 16180

  sql/set_var.cc@1.34.52.38, 2006-06-27 20:10:46-04:00, iggy@mysql.com +2 -1
    Verify user has appropiate rights before setting the sql_log_off system variable.

ChangeSet@1.2181.77.10, 2006-06-28 01:28:03+02:00, andrey@lmy004. +17 -0
  WL#3337 (Events new architecture)
  5th cut, moved DB related code to Event_db_repository and
  updated accordingly the remanining code.
  Moved change/restore_security_context() to class THD
  Removed events_priv.h
  Next step is to reorganize create/update_event() and parsing for them.
  But probably some other refactoring could be done in the meanwhile.
  The changes so far pass the test suite.

  BitKeeper/deleted/.del-events_priv.h~2e8bce2cf35997df@1.26, 2006-06-28 00:09:26+02:00, andrey@lmy004. +0 -0
    Delete: sql/events_priv.h

  sql/Makefile.am@1.147, 2006-06-28 01:27:52+02:00, andrey@lmy004. +1 -1
    events_priv.h is no more

  sql/event_data_objects.cc@1.61, 2006-06-28 01:27:52+02:00, andrey@lmy004. +38 -50
    reorganize events code

  sql/event_data_objects.h@1.5, 2006-06-28 01:27:52+02:00, andrey@lmy004. +32 -0
    reorganize events code

  sql/event_db_repository.cc@1.2, 2006-06-28 01:27:52+02:00, andrey@lmy004. +854 -0
    reorganize events code

  sql/event_db_repository.h@1.2, 2006-06-28 01:27:52+02:00, andrey@lmy004. +82 -0
    reorganize events code

  sql/event_scheduler.cc@1.10, 2006-06-28 01:27:52+02:00, andrey@lmy004. +19 -72
    reorganize events code

  sql/event_scheduler.h@1.7, 2006-06-28 01:27:52+02:00, andrey@lmy004. +15 -22
    reorganize events code

  sql/events.cc@1.42.1.6, 2006-06-28 01:27:52+02:00, andrey@lmy004. +32 -780
    reorganize events code

  sql/events.h@1.34, 2006-06-28 01:27:52+02:00, andrey@lmy004. +56 -39
    reorganize events code

  sql/mysqld.cc@1.563.1.1, 2006-06-28 01:27:52+02:00, andrey@lmy004. +1 -1
    reorganize events code

  sql/set_var.cc@1.177.1.1, 2006-06-28 01:27:52+02:00, andrey@lmy004. +1 -1
    reorganize events code

  sql/sql_class.cc@1.267.2.1, 2006-06-28 01:27:52+02:00, andrey@lmy004. +57 -0
    add ::change_security_context() and restore_security_context()

  sql/sql_class.h@1.300.2.2, 2006-06-28 01:27:52+02:00, andrey@lmy004. +8 -0
    add ::change_security_context() and restore_security_context()

  sql/sql_db.cc@1.133.1.5, 2006-06-28 01:27:52+02:00, andrey@lmy004. +1 -1
    reorganize Events code

  sql/sql_parse.cc@1.561.2.6, 2006-06-28 01:27:53+02:00, andrey@lmy004. +11 -9
    reorganize Events code

  sql/sql_show.cc@1.352.1.4, 2006-06-28 01:27:53+02:00, andrey@lmy004. +2 -2
    reorganize Events code

ChangeSet@1.2181.89.13, 2006-06-28 01:03:10+02:00, tomas@poseidon.ndb.mysql.com +3 -0
  corrected partition test case results that were put back

  mysql-test/r/ndb_dd_backuprestore.result@1.8, 2006-06-28 01:03:02+02:00, tomas@poseidon.ndb.mysql.com +12 -12
    corrected partition test case results that were put back

  mysql-test/r/ndb_partition_key.result@1.2, 2006-06-28 01:03:02+02:00, tomas@poseidon.ndb.mysql.com +7 -7
    corrected partition test case results that were put back

  mysql-test/r/ndb_partition_range.result@1.2, 2006-06-28 01:03:02+02:00, tomas@poseidon.ndb.mysql.com +1 -1
    corrected partition test case results that were put back

ChangeSet@1.1616.2654.2, 2006-06-27 18:07:23-04:00, iggy@mysql.com +2 -0
  Bug#19298 mysqld_safe still uses obsolete --skip-locking parameter

  scripts/mysqld_safe-watch.sh@1.5.1.1, 2006-06-27 18:07:20-04:00, iggy@mysql.com +2 -2
    Replaced skip-locking with newer skip-external-locking option.

  configure.in@1.201.64.8, 2006-06-27 18:07:19-04:00, iggy@mysql.com +4 -4
    Replaced skip-locking with newer skip-external-locking option.  Removed extra quotes.

ChangeSet@1.2181.89.11, 2006-06-27 22:19:27+02:00, tomas@poseidon.ndb.mysql.com +8 -0
  partition functions to pass create_info, not only max_rows

  sql/ha_ndbcluster.cc@1.334.1.6, 2006-06-27 22:19:17+02:00, tomas@poseidon.ndb.mysql.com +18 -10
    partition functions to pass create_info, not only max_rows

  sql/ha_ndbcluster.h@1.139.1.6, 2006-06-27 22:19:17+02:00, tomas@poseidon.ndb.mysql.com +1 -1
    partition functions to pass create_info, not only max_rows

  sql/handler.h@1.217.1.4, 2006-06-27 22:19:17+02:00, tomas@poseidon.ndb.mysql.com +1 -1
    partition functions to pass create_info, not only max_rows

  sql/partition_info.cc@1.20, 2006-06-27 22:19:18+02:00, tomas@poseidon.ndb.mysql.com +14 -13
    partition functions to pass create_info, not only max_rows

  sql/partition_info.h@1.14, 2006-06-27 22:19:18+02:00, tomas@poseidon.ndb.mysql.com +4 -4
    partition functions to pass create_info, not only max_rows

  sql/sql_partition.cc@1.78.1.1, 2006-06-27 22:19:18+02:00, tomas@poseidon.ndb.mysql.com +1 -2
    partition functions to pass create_info, not only max_rows

  sql/sql_partition.h@1.10, 2006-06-27 22:19:18+02:00, tomas@poseidon.ndb.mysql.com +1 -1
    partition functions to pass create_info, not only max_rows

  sql/sql_table.cc@1.350.1.1, 2006-06-27 22:19:18+02:00, tomas@poseidon.ndb.mysql.com +5 -5
    partition functions to pass create_info, not only max_rows

ChangeSet@1.1810.1851.2, 2006-06-27 20:18:03+02:00, joerg@mysql.com +1 -0
  Revert all previous attempts to call "mysql_upgrade" during RPM upgrade.
  This finishes bug#18516, as far as "generic RPMs" are concerned.

  support-files/mysql.spec.sh@1.99.1.44, 2006-06-27 20:17:58+02:00, joerg@mysql.com +7 -19
    Revert all previous attempts to call "mysql_upgrade" during RPM upgrade,
    there are some more aspects which need to be solved before this is possible.
    For now, just ensure the binary "mysql_upgrade" is delivered and installed.
    This finishes bug#18516, as far as "generic RPMs" are concerned.

ChangeSet@1.1810.1850.1, 2006-06-27 21:28:32+04:00, kroki@mysql.com +19 -0
  Bug#17203: "sql_no_cache sql_cache" in views created from prepared statement
  
  The problem was that we restored SQL_CACHE, SQL_NO_CACHE flags in SELECT
  statement from internal structures based on value set later at runtime, not
  the original value set by the user.
  
  The solution is to remember that original value.

  mysql-test/r/auto_increment.result@1.34.1.4, 2006-06-27 21:28:24+04:00, kroki@mysql.com +1 -1
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/func_compress.result@1.17, 2006-06-27 21:28:24+04:00, kroki@mysql.com +2 -2
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/func_math.result@1.33.1.2, 2006-06-27 21:28:24+04:00, kroki@mysql.com +1 -1
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/func_system.result@1.22.2.1, 2006-06-27 21:28:24+04:00, kroki@mysql.com +1 -1
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/func_time.result@1.47.1.10, 2006-06-27 21:28:24+04:00, kroki@mysql.com +1 -1
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/information_schema.result@1.87.2.1, 2006-06-27 21:28:24+04:00, kroki@mysql.com +6 -6
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/query_cache.result@1.65.1.7, 2006-06-27 21:28:24+04:00, kroki@mysql.com +1 -1
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/rpl_get_lock.result@1.14, 2006-06-27 21:28:24+04:00, kroki@mysql.com +1 -1
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/rpl_master_pos_wait.result@1.7, 2006-06-27 21:28:24+04:00, kroki@mysql.com +1 -1
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/show_check.result@1.75.1.2, 2006-06-27 21:28:24+04:00, kroki@mysql.com +60 -0
    Add result for bug#17203.

  mysql-test/r/subselect.result@1.134.1.11, 2006-06-27 21:28:24+04:00, kroki@mysql.com +4 -4
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/type_blob.result@1.49.2.1, 2006-06-27 21:28:25+04:00, kroki@mysql.com +1 -1
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/variables.result@1.76.6.1, 2006-06-27 21:28:25+04:00, kroki@mysql.com +3 -3
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/r/view.result@1.138.1.24, 2006-06-27 21:28:25+04:00, kroki@mysql.com +7 -7
    Update result to not report SQL_NO_CACHE if it wasn't there at first place.

  mysql-test/t/show_check.test@1.54.1.3, 2006-06-27 21:28:25+04:00, kroki@mysql.com +72 -0
    Add test case for bug#17203.

  sql/sql_lex.cc@1.142.1.47, 2006-06-27 21:28:25+04:00, kroki@mysql.com +3 -0
    Reset SELECT_LEX::sql_cache together with SELECT_LEX::options.

  sql/sql_lex.h@1.175.1.45, 2006-06-27 21:28:25+04:00, kroki@mysql.com +8 -0
    Add SELECT_LEX::sql_cache field to store original user setting.

  sql/sql_select.cc@1.312.74.1, 2006-06-27 21:28:25+04:00, kroki@mysql.com +13 -4
    Output SQL_CACHE and SQL_NO_CACHE depending on stored original user setting.

  sql/sql_yacc.yy@1.371.1.101, 2006-06-27 21:28:25+04:00, kroki@mysql.com +14 -2
    Make effect of SQL_CACHE and SQL_NO_CACHE mutually exclusive.  Ignore
    SQL_CACHE if SQL_NO_CACHE was used.  Remember what was set by the user.
    Reset SELECT_LEX::sql_cache together with SELECT_LEX::options.

ChangeSet@1.1616.2653.7, 2006-06-27 22:22:43+05:00, svoj@may.pils.ru +2 -0
  BUG#1662 - ALTER TABLE LIKE ignores DATA/INDEX DIRECTPORY
  Produce a warning if DATA/INDEX DIRECTORY is specified in
  ALTER TABLE statement.
  
  Ignoring of these options is documented in the symbolic links
  section of the manual.

  mysql-test/r/symlink.result@1.11.1.10, 2006-06-27 22:22:34+05:00, svoj@may.pils.ru +6 -0
    Modified test result according to fix for BUG#1662.

  sql/sql_parse.cc@1.271.1.212, 2006-06-27 22:22:34+05:00, svoj@may.pils.ru +6 -0
    Produce a warning if DATA/INDEX DIRECTORY is specified in
    ALTER TABLE statement.

ChangeSet@1.2181.90.6, 2006-06-27 18:44:25+02:00, jmiller@mysql.com +2 -0
  rpl_ndb_dd_partitions.test, rpl_ndb_dd_partitions.result:
    Adding back ndb partition tests from mysql-test-extra per tomas and clavin
    new file

  mysql-test/r/rpl_ndb_dd_partitions.result@1.1, 2006-06-27 18:43:57+02:00, jmiller@mysql.com +726 -0
    Adding back ndb partition tests from mysql-test-extra per tomas and clavin

  mysql-test/r/rpl_ndb_dd_partitions.result@1.0, 2006-06-27 18:43:57+02:00, jmiller@mysql.com +0 -0
    BitKeeper file /data0/mysql-5.1/mysql-test/r/rpl_ndb_dd_partitions.result

  mysql-test/t/rpl_ndb_dd_partitions.test@1.1, 2006-06-27 18:44:10+02:00, jmiller@mysql.com +310 -0
    Adding back ndb partition tests from mysql-test-extra per tomas and clavin

  mysql-test/t/rpl_ndb_dd_partitions.test@1.0, 2006-06-27 18:44:10+02:00, jmiller@mysql.com +0 -0
    BitKeeper file /data0/mysql-5.1/mysql-test/t/rpl_ndb_dd_partitions.test

ChangeSet@1.2181.94.1, 2006-06-27 18:35:10+02:00, jmiller@mysql.com +12 -0
  Many files:
    Adding back ndb partition tests from mysql-test-extra per tomas and clavin
    new file

  mysql-test/r/ndb_blob_partition.result@1.1, 2006-06-27 18:34:30+02:00, jmiller@mysql.com +104 -0
    Adding back ndb partition tests from mysql-test-extra per tomas and clavin

  mysql-test/r/ndb_blob_partition.result@1.0, 2006-06-27 18:34:30+02:00, jmiller@mysql.com +0 -0
    BitKeeper file /data0/mysql-5.1/mysql-test/r/ndb_blob_partition.result

  mysql-test/r/ndb_dd_backuprestore.result@1.7, 2006-06-27 18:34:47+02:00, jmiller@mysql.com +323 -0
    Adding back ndb partition tests from mysql-test-extra per tomas and clavin

  mysql-test/r/ndb_partition_error.result@1.1, 2006-06-27 18:34:10+02:00, jmiller@mysql.com +47 -0
    Adding back ndb partition tests from mysql-test-extra per tomas and clavin

  mysql-test/r/ndb_partition_error.result@1.0, 2006-06-27 18:34:10+02:00, jmiller@mysql.com +0 -0
    BitKeeper file /data0/mysql-5.1/mysql-test/r/ndb_partition_error.result

  mysql-test/r/ndb_partition_key.result@1.1, 2006-06-27 18:34:11+02:00, jmiller@mysql.com +199 -0
    Adding back ndb partition tests from mysql-test-extra per tomas and clavin

  mysql-test/r/ndb_partition_key.result@1.0, 2006-06-27 18:34:11+02:00, jmiller@mysql.com +0 -0
    BitKeeper file /data0/mysql-5.1/mysql-test/r/ndb_partition_key.result

  mysql-test/r/ndb_partition_list.result@1.1, 2006-06-27 18:34:11+02:00, jmiller@mysql.com +51 -0
    Adding back ndb partition tests from mysql-test-extra per tomas and clavin

  mysql-test/r/ndb_partition_list.result@1.0, 2006-06-27 18:34:11+02:00, jmiller@mysql.com +0 -0
    BitKeeper file /data0/mysql-5.1/mysql-test/r/ndb_partition_list.result

  mysql-test/r/ndb_partition_range.result@1.1, 2006-06-27 18:34:11+02:00, jmiller@mysql.com +263 -0
    Adding back ndb partition tests from mysql-test-extra per tomas and clavin

  mysql-test/r/ndb_partition_range.result@1.0, 2006-06-27 18:34:11+02:00, jmiller@mysql.com +0 -0
    BitKeeper file /data0/mysql-5.1/mysql-test/r/ndb_partition_range.result

  mysql-test/t/ndb_blob_partition.test@1.1, 2006-06-27 18:33:09+02:00, jmiller@mysql.com +93 -0
    Adding back ndb partition tests from mysql-test-extra per tomas and clavin

  mysql-test/t/ndb_blob_partition.test@1.0, 2006-06-27 18:33:09+02:00, jmiller@mysql.com +0 -0
    BitKeeper file /data0/mysql-5.1/mysql-test/t/ndb_blob_partition.test

  mysql-test/t/ndb_dd_backuprestore.test@1.6, 2006-06-27 18:33:45+02:00, jmiller@mysql.com +170 -0
    Adding back ndb partition tests from mysql-test-extra per tomas and clavin

  mysql-test/t/ndb_partition_error.test@1.1, 2006-06-27 18:32:55+02:00, jmiller@mysql.com +71 -0
    Adding back ndb partition tests from mysql-test-extra per tomas and clavin

  mysql-test/t/ndb_partition_error.test@1.0, 2006-06-27 18:32:55+02:00, jmiller@mysql.com +0 -0
    BitKeeper file /data0/mysql-5.1/mysql-test/t/ndb_partition_error.test

  mysql-test/t/ndb_partition_key.test@1.1, 2006-06-27 18:32:56+02:00, jmiller@mysql.com +198 -0
    Adding back ndb partition tests from mysql-test-extra per tomas and clavin

  mysql-test/t/ndb_partition_key.test@1.0, 2006-06-27 18:32:56+02:00, jmiller@mysql.com +0 -0
    BitKeeper file /data0/mysql-5.1/mysql-test/t/ndb_partition_key.test

  mysql-test/t/ndb_partition_list.test@1.1, 2006-06-27 18:32:56+02:00, jmiller@mysql.com +64 -0
    Adding back ndb partition tests from mysql-test-extra per tomas and clavin

  mysql-test/t/ndb_partition_list.test@1.0, 2006-06-27 18:32:56+02:00, jmiller@mysql.com +0 -0
    BitKeeper file /data0/mysql-5.1/mysql-test/t/ndb_partition_list.test

  mysql-test/t/ndb_partition_range.test@1.1, 2006-06-27 18:32:56+02:00, jmiller@mysql.com +260 -0
    Adding back ndb partition tests from mysql-test-extra per tomas and clavin

  mysql-test/t/ndb_partition_range.test@1.0, 2006-06-27 18:32:56+02:00, jmiller@mysql.com +0 -0
    BitKeeper file /data0/mysql-5.1/mysql-test/t/ndb_partition_range.test

ChangeSet@1.1346.875.1, 2006-06-27 18:17:53+02:00, joerg@mysql.com +1 -0
  Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216).

  support-files/mysql.spec.sh@1.61.1.36, 2006-06-27 18:17:51+02:00, joerg@mysql.com +5 -1
    Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216).

ChangeSet@1.1616.2653.6, 2006-06-27 19:33:59+04:00, kroki@mysql.com +5 -0
  Dec. 31st, 9999 is still a valid date, only starting with Jan 1st 10000 things become invalid (Bug #12356)

  mysql-test/r/func_sapdb.result@1.2.1.8, 2006-06-27 19:33:53+04:00, kroki@mysql.com +6 -0
    test cases for date range edge cases added

  mysql-test/r/func_time.result@1.23.4.4, 2006-06-27 19:33:53+04:00, kroki@mysql.com +6 -0
    test cases for date range edge cases added

  mysql-test/t/func_sapdb.test@1.2.1.7, 2006-06-27 19:33:53+04:00, kroki@mysql.com +2 -0
    test cases for date range edge cases added

  mysql-test/t/func_time.test@1.21.3.4, 2006-06-27 19:33:53+04:00, kroki@mysql.com +6 -0
    test cases for date range edge cases added

  sql/item_timefunc.cc@1.51.1.52, 2006-06-27 19:33:53+04:00, kroki@mysql.com +6 -5
    Dec. 31st, 9999 is still a valid date, only starting with Jan 1st 10000 things become invalid (Bug #12356)

ChangeSet@1.2181.93.2, 2006-06-28 01:28:07+10:00, stewart@mysql.com +1 -0
  BUG#20725 MySQLD cluster use "fast count" is broken
  
  fix based on review by tomas.
  
  conform to bug we haven't fixed yet.

  sql/ha_ndbcluster.cc@1.334.2.2, 2006-06-28 01:27:48+10:00, stewart@mysql.com +7 -0
    return -1 on error in ::records().
    
    produces a compiler warning, a bug and is evil.
    
    however, until we go and really fix the bug properly, it's best to conform

ChangeSet@1.2181.93.1, 2006-06-28 01:07:44+10:00, stewart@mysql.com +2 -0
  BUG#20725 MySQLD cluster use "fast count" is broken
  
  Post recent handler changes, fast count(*) for cluster was broken.
  
  Seeing as we maintain an exact count for ndb, we can easily use this for an optimisation.
  
  With this patch, and use_exact_count DISABLED, we will use the fast way
  of getting count(*) but not use the exact count for the optimiser.
  
  With this patch and use_exact_count ENABLED, we will use the fast way of
  getting count(*) and use the exact count for the optimiser.

  sql/ha_ndbcluster.cc@1.334.2.1, 2006-06-28 01:07:17+10:00, stewart@mysql.com +26 -1
    Implement handler::records() and set appropriate handler flag.

  sql/ha_ndbcluster.h@1.139.2.1, 2006-06-28 01:07:17+10:00, stewart@mysql.com +1 -0
    we implment handler::records() for fast count(*)

ChangeSet@1.1616.2656.1, 2006-06-27 17:40:19+03:00, gkodinov@mysql.com +3 -0
  Bug #16458: Simple SELECT FOR UPDATE causes "Result Set not updatable" error
  'SELECT DISTINCT a,b FROM t1' should not use temp table if there is unique 
  index (or primary key) on a.
  There are a number of other similar cases that can be calculated without the
  use of a temp table : multi-part unique indexes, primary keys or using GROUP BY 
  instead of DISTINCT.
  When a GROUP BY/DISTINCT clause contains all key parts of a unique
  index, then it is guaranteed that the fields of the clause will be
  unique, therefore we can optimize away GROUP BY/DISTINCT altogether.
  This optimization has two effects:
  * there is no need to create a temporary table to compute the
     GROUP/DISTINCT operation (or the temporary table will be smaller if only GROUP 
     is removed and DISTINCT stays or if DISTINCT is removed and GROUP BY stays)
  * this causes the statement in effect to become updatable in Connector/Java
  because the result set columns will be direct reference to the primary key of 
  the table (instead to the temporary table that it currently references). 
  
  Implemented a check that will optimize away GROUP BY/DISTINCT for queries like 
  the above.
  Currently it will work only for single non-constant table in the FROM clause.

  mysql-test/r/distinct.result@1.27.1.6, 2006-06-27 17:40:15+03:00, gkodinov@mysql.com +51 -0
    Bug #16458: Simple SELECT FOR UPDATE causes "Result Set not updatable" error
      - test case

  mysql-test/t/distinct.test@1.14.1.4, 2006-06-27 17:40:15+03:00, gkodinov@mysql.com +28 -0
    Bug #16458: Simple SELECT FOR UPDATE causes "Result Set not updatable" error
      - test case

  sql/sql_select.cc@1.216.126.6, 2006-06-27 17:40:15+03:00, gkodinov@mysql.com +168 -0
    Bug #16458: Simple SELECT FOR UPDATE causes "Result Set not updatable" error
      - disable GROUP BY if contains the fields of a unique index.

ChangeSet@1.1810.1830.14, 2006-06-27 17:34:14+04:00, konstantin@mysql.com +2 -0
  Fix yet another place that used uint32 instead of uint.

  sql/slave.cc@1.241.1.31, 2006-06-27 17:34:08+04:00, konstantin@mysql.com +1 -1
    Fix yet another place that used uint32 instead of uint.

  sql/slave.h@1.85.1.9, 2006-06-27 17:34:08+04:00, konstantin@mysql.com +1 -1
    Fix yet another place that used uint32 instead of uint.

ChangeSet@1.2181.89.10, 2006-06-27 14:31:34+02:00, tomas@poseidon.ndb.mysql.com +3 -0
  changed signature of get_default_no_partitions

  sql/ha_ndbcluster.cc@1.334.1.5, 2006-06-27 14:31:26+02:00, tomas@poseidon.ndb.mysql.com +7 -3
    changed signature of get_default_no_partitions

  sql/ha_ndbcluster.h@1.139.1.5, 2006-06-27 14:31:26+02:00, tomas@poseidon.ndb.mysql.com +1 -1
    changed signature of get_default_no_partitions

  sql/handler.h@1.217.1.3, 2006-06-27 14:31:26+02:00, tomas@poseidon.ndb.mysql.com +1 -1
    changed signature of get_default_no_partitions

ChangeSet@1.1810.1839.4, 2006-06-27 17:00:24+05:00, holyfoot@deer.(none) +2 -0
  merging fix

  mysql-test/r/gis.result@1.32, 2006-06-27 16:58:55+05:00, holyfoot@mysql.com +1 -0
    merging fix

  mysql-test/t/gis.test@1.27, 2006-06-27 16:58:55+05:00, holyfoot@mysql.com +2 -0
    merging fix

ChangeSet@1.2181.89.9, 2006-06-27 13:40:33+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  Bug #19852 Restoring backup made from cluster with full data memory fails
  - post merge fixes for 5.1

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.29, 2006-06-27 13:40:27+02:00, tomas@poseidon.ndb.mysql.com +5 -3
    Bug #19852 Restoring backup made from cluster with full data memory fails
    - post merge fixes for 5.1

ChangeSet@1.1810.1830.13, 2006-06-27 15:39:43+04:00, konstantin@mysql.com +1 -0
  Fix yet another place with an obsolete explicit cast to byte *.

  sql/set_var.h@1.68.2.5, 2006-06-27 15:39:39+04:00, konstantin@mysql.com +1 -1
    Fix yet another place with an obsolete explicit cast to byte *

ChangeSet@1.2181.77.9, 2006-06-27 13:15:40+02:00, andrey@lmy004. +6 -0
  WL#3337 (Event scheduler new architecture) Fourth cut of refactoring
  the parsing. Next step will be to refactor of usage of Event_timed 
  during Events::create_event() and Events::update_event().
  
  Disallow:
  - CREATE EVENT ... DO CREATE EVENT ...;
  - ALTER  EVENT ... DO CREATE EVENT ...;
  - CREATE EVENT ... DO ALTER EVENT DO ....;
  - CREATE PROCEDURE ... BEGIN CREATE EVENT ... END|
  
  Allowed:
  - CREATE EVENT ... DO DROP EVENT yyy;
  - CREATE EVENT ... DO ALTER EVENT yyy;
    (the nested ALTER EVENT can have anything but DO clause)
  - ALTER  EVENT ... DO ALTER EVENT yyy;
    (the nested ALTER EVENT can have anything but DO clause)
  - ALTER  EVENT ... DO DROP EVENT yyy;
  - CREATE PROCEDURE ... BEGIN ALTER EVENT ... END|
    (the nested ALTER EVENT can have anything but DO clause)
  - CREATE PROCEDURE ... BEGIN DROP EVENT ... END|

  mysql-test/r/events.result@1.37, 2006-06-27 13:15:31+02:00, andrey@lmy004. +14 -2
    update results

  mysql-test/r/events_bugs.result@1.12, 2006-06-27 13:15:31+02:00, andrey@lmy004. +1 -12
    update results

  mysql-test/t/events.test@1.33, 2006-06-27 13:15:31+02:00, andrey@lmy004. +13 -4
    use number as error, mysql-test-run does not like the name.
    will come back to this later, now it's enough to pass the test.
    disable nested events / events in SP, when the nested event has
    a body. If no body is provided, namely DROP EVENT or ALTER that
    changes the characteristics, then these are allowed.

  mysql-test/t/events_bugs.test@1.10, 2006-06-27 13:15:31+02:00, andrey@lmy004. +1 -12
    use number as error, mysql-test-run does not like the name.
    will come back to this later, now it's enough to pass the test.
    disable nested events / events in SP, when the nested event has
    a body. If no body is provided, namely DROP EVENT or ALTER that
    changes the characteristics, then these are allowed.

  sql/share/errmsg.txt@1.113, 2006-06-27 13:15:31+02:00, andrey@lmy004. +3 -0
    new message

  sql/sql_yacc.yy@1.482.1.5, 2006-06-27 13:15:32+02:00, andrey@lmy004. +82 -74
    refactor CREATE EVENT parsing to fit into the structure
    CREATE DEFINER=xxx EVENT
    The actual definer part is not used, but parsed, for now.
    Disable nested CREATE EVENTS, CREATE EVENT inside CREATE PROCEDURE.
    And an event DDL with body inside an ALTER.
    This stops the following :
    - CREATE EVENT ... DO CREATE EVENT ...;
    - ALTER  EVENT ... DO CREATE EVENT ...;
    - CREATE EVENT ... DO ALTER EVENT DO ....;
    - CREATE PROCEDURE ... BEGIN CREATE EVENT ... END|
    This allows:
    - CREATE EVENT ... DO DROP EVENT yyy;
    - CREATE EVENT ... DO ALTER EVENT yyy;
      (the nested ALTER EVENT can have anything but DO clause)
    - ALTER  EVENT ... DO ALTER EVENT yyy;
      (the nested ALTER EVENT can have anything but DO clause)
    - ALTER  EVENT ... DO DROP EVENT yyy;
    - CREATE PROCEDURE ... BEGIN ALTER EVENT ... END|
      (the nested ALTER EVENT can have anything but DO clause)
    - CREATE PROCEDURE ... BEGIN DROP EVENT ... END|

ChangeSet@1.2181.89.8, 2006-06-27 13:12:34+02:00, tomas@poseidon.ndb.mysql.com +10 -0
  Bug #19852 Restoring backup made from cluster with full data memory fails
  - post merge fixes for 5.1

  storage/ndb/include/kernel/signaldata/DictTabInfo.hpp@1.31, 2006-06-27 13:12:23+02:00, tomas@poseidon.ndb.mysql.com +0 -2
    Bug #19852 Restoring backup made from cluster with full data memory fails
    - post merge fixes for 5.1

  storage/ndb/include/kernel/signaldata/LqhFrag.hpp@1.9, 2006-06-27 13:12:23+02:00, tomas@poseidon.ndb.mysql.com +2 -2
    Bug #19852 Restoring backup made from cluster with full data memory fails
    - post merge fixes for 5.1

  storage/ndb/include/kernel/signaldata/TupFrag.hpp@1.12, 2006-06-27 13:12:23+02:00, tomas@poseidon.ndb.mysql.com +2 -4
    Bug #19852 Restoring backup made from cluster with full data memory fails
    - post merge fixes for 5.1

  storage/ndb/include/ndbapi/NdbDictionary.hpp@1.78.1.2, 2006-06-27 13:12:23+02:00, tomas@poseidon.ndb.mysql.com +0 -7
    Bug #19852 Restoring backup made from cluster with full data memory fails
    - post merge fixes for 5.1

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.92, 2006-06-27 13:12:24+02:00, tomas@poseidon.ndb.mysql.com +2 -3
    Bug #19852 Restoring backup made from cluster with full data memory fails
    - post merge fixes for 5.1

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.50, 2006-06-27 13:12:24+02:00, tomas@poseidon.ndb.mysql.com +0 -2
    Bug #19852 Restoring backup made from cluster with full data memory fails
    - post merge fixes for 5.1

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.113, 2006-06-27 13:12:24+02:00, tomas@poseidon.ndb.mysql.com +1 -7
    Bug #19852 Restoring backup made from cluster with full data memory fails
    - post merge fixes for 5.1

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.28, 2006-06-27 13:12:24+02:00, tomas@poseidon.ndb.mysql.com +23 -27
    Bug #19852 Restoring backup made from cluster with full data memory fails
    - post merge fixes for 5.1

  storage/ndb/src/ndbapi/NdbDictionary.cpp@1.59.1.2, 2006-06-27 13:12:25+02:00, tomas@poseidon.ndb.mysql.com +1 -0
    Bug #19852 Restoring backup made from cluster with full data memory fails
    - post merge fixes for 5.1

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.145, 2006-06-27 13:12:25+02:00, tomas@poseidon.ndb.mysql.com +8 -8
    Bug #19852 Restoring backup made from cluster with full data memory fails
    - post merge fixes for 5.1

ChangeSet@1.1810.1830.12, 2006-06-27 14:56:24+04:00, konstantin@mysql.com +10 -0
  Fix compilation failures on Windows caused by the patch for Bug#17199.
  Fix a minor issue with Bug#16206 (bdb.test failed if the tree is compiled 
  without blackhole).

  mysql-test/r/bdb.result@1.48.1.3, 2006-06-27 14:56:13+04:00, konstantin@mysql.com +2 -2
    Remove dependency on an optional engine (updated test results).

  mysql-test/t/bdb.test@1.50.1.3, 2006-06-27 14:56:13+04:00, konstantin@mysql.com +1 -1
    Remove dependency on an optional engine.

  include/my_sys.h@1.178.2.3, 2006-06-27 14:56:13+04:00, konstantin@mysql.com +1 -1
    Change declaration of my_strdup_with_length to accept const char *,
    not const byte *: in 5 places out of 6 where this function is used,
    it's being passed char *, not byte *

  mysys/my_malloc.c@1.9.1.1, 2006-06-27 14:56:13+04:00, konstantin@mysql.com +1 -1
    my_strdup_with_length: const byte * -> const char *

  mysys/safemalloc.c@1.24.1.1, 2006-06-27 14:56:13+04:00, konstantin@mysql.com +1 -1
    my_strdup_with_length: const byte * -> const char *

  sql/log_event.cc@1.174.1.33, 2006-06-27 14:56:13+04:00, konstantin@mysql.com +2 -2
    my_strdup_with_length: const byte * -> const char *

  sql/set_var.cc@1.125.11.1, 2006-06-27 14:56:13+04:00, konstantin@mysql.com +1 -1
    my_strdup_with_length: const byte * -> const char *

  sql/sql_class.h@1.230.27.3, 2006-06-27 14:56:13+04:00, konstantin@mysql.com +1 -1
    Change db_length type to uint from uint32 (see also table.h)

  sql/table.h@1.102.1.26, 2006-06-27 14:56:13+04:00, konstantin@mysql.com +2 -1
    Change the type of db_length to uint from uint32: LEX_STRING uses uint for 
    length, we need a small and consistent set of types to store length to 
    minimize cast and compile failures.

  sql/ha_federated.cc@1.24.9.1, 2006-06-27 14:56:13+04:00, konstantin@mysql.com +1 -2
    my_strdup_with_length: const byte * -> const char *

ChangeSet@1.2181.77.8, 2006-06-27 11:51:11+02:00, andrey@lmy004. +8 -0
  WL#3337 (Event scheduler new architecture)
  Third cut to simplify parsing phase. Now DROP EVENT works.
  
  Overloaded few functions to be able to use either sp_name or pass two LEX_STRINGs
  instead of a Event_timed pointer. This is transitional and eventually the old
  functions will be removed. For now DROP EVENT also works, does not need anymore
  a parsing object (Event_timed) and definer initialization because everyone who
  has EVENT_ACL can drop events, and this is checked on execution time in sql_parse.cc
  from the security context, as it should be.

  sql/events_priv.h@1.25, 2006-06-27 11:51:01+02:00, andrey@lmy004. +16 -1
    Change db_drop_event() not to use Event_timed, either coming from parsing
    or from Event_timed::drop, but use LEX_STRINGs. sp_name is not convinient
    because in Event_timed::drop a temporary object has to be created. Hence, 
    dereference the sp_name in Events::drop_event() and pass the LEX_STRINGs.

  sql/event_data_objects.cc@1.60, 2006-06-27 11:51:00+02:00, andrey@lmy004. +57 -3
    overload few functions

  sql/event_scheduler.cc@1.9, 2006-06-27 11:51:00+02:00, andrey@lmy004. +46 -3
    Event_scheduler::drop_event() actually does not need Event_timed object
    but just an identifier, hence pass only sp_name.
    
    Overloaded Event_scheduler::find_event() to work with sp_name object. Eventually
    the old version will be removed. This is being done as transitional step to
    be able to test frequently code.

  sql/event_scheduler.h@1.6, 2006-06-27 11:51:00+02:00, andrey@lmy004. +5 -1
    Event_scheduler::drop_event() actually does not need Event_timed object
    but just an identifier, hence pass only sp_name.
    
    Overloaded Event_scheduler::find_event() to work with sp_name object. Eventually
    the old version will be removed. This is being done as transitional step to
    be able to test frequently code.

  sql/events.cc@1.42.1.5, 2006-06-27 11:51:01+02:00, andrey@lmy004. +12 -15
    Change db_drop_event() not to use Event_timed, either coming from parsing
    or from Event_timed::drop, but use LEX_STRINGs. sp_name is not convinient
    because in Event_timed::drop a temporary object has to be created. Hence, 
    dereference the sp_name in Events::drop_event() and pass the LEX_STRINGs.

  sql/events.h@1.33, 2006-06-27 11:51:01+02:00, andrey@lmy004. +2 -3
    Change db_drop_event() not to use Event_timed, either coming from parsing
    or from Event_timed::drop, but use LEX_STRINGs. sp_name is not convinient
    because in Event_timed::drop a temporary object has to be created. Hence, 
    dereference the sp_name in Events::drop_event() and pass the LEX_STRINGs.

  sql/sql_parse.cc@1.561.2.5, 2006-06-27 11:51:01+02:00, andrey@lmy004. +17 -5
    SQLCOM_DROP_EVENT does not need lex->event_parse_data object and 
    is more like SQLCOM_SHOW_CREATE_EVENT. Therefore, move it to the block that
    handles the latter.

  sql/sql_yacc.yy@1.482.1.4, 2006-06-27 11:51:01+02:00, andrey@lmy004. +3 -27
    DROP EVENT does not need a parsing object, just a name.
    Store it as lex->spname. Pretty similar handling to the one of
    SHOW CREATE EVENT.

ChangeSet@1.1810.1710.5, 2006-06-27 11:41:00+02:00, jonas@perch.ndb.mysql.com +5 -0
  ndb - bug#20252
    allow user to specify scan batch size in readTuples

  ndb/include/ndbapi/NdbIndexScanOperation.hpp@1.17.3.1, 2006-06-27 11:40:57+02:00, jonas@perch.ndb.mysql.com +4 -2
    Allow user to specify batch size

  ndb/include/ndbapi/NdbScanOperation.hpp@1.32.4.1, 2006-06-27 11:40:57+02:00, jonas@perch.ndb.mysql.com +3 -1
    Allow user to specify batch size

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.66.23.1, 2006-06-27 11:40:57+02:00, jonas@perch.ndb.mysql.com +4 -4
    Fix so that last row works even if batch is complete

  ndb/src/ndbapi/NdbReceiver.cpp@1.15.1.1, 2006-06-27 11:40:57+02:00, jonas@perch.ndb.mysql.com +9 -1
    Allow user yo specify batch size

  ndb/src/ndbapi/NdbScanOperation.cpp@1.66.5.1, 2006-06-27 11:40:57+02:00, jonas@perch.ndb.mysql.com +15 -8
    Allow user to specify batchsize

ChangeSet@1.1616.2655.1, 2006-06-27 11:26:41+02:00, ingo@mysql.com +2 -0
  Bug#11824 - internal /tmp/*.{MYD,MYI} files remain, causing subsequent queries to fail
  
  Very complex select statements can create temporary tables
  that are too big to be represented as a MyISAM table.
  
  This was not checked at table creation time, but only at
  open time. The result was an attempt to delete the 
  "impossible" table.
  
  But if the server is built --with-raid, MyISAM tries to 
  open the table before deleting the files. It needs to find 
  out if the table uses the raid support and how many raid 
  chunks there are. This is done with an open "for repair",
  which will almost always succeed.
  
  But in this case we have an "impossible" table. The open
  failed. Hence the files were not deleted. Also the error
  message was a bit unspecific.
  
  I turned an open error in this situation into the assumption 
  of having no raid support on the table. Thus the normal data 
  file is tried to be deleted. This may however leave existing 
  raid chunks behind.
  
  I also added a check in mi_create() to prevent the creation
  of an "impossible" table. A more decriptive error message is
  given in this case.
  
  No test case. The required select statement is way too
  large for the test suite. I added a test script to the
  bug report.

  myisam/mi_create.c@1.37.1.11, 2006-06-27 11:26:29+02:00, ingo@mysql.com +17 -0
    Bug#11824 - internal /tmp/*.{MYD,MYI} files remain, causing subsequent queries to fail
    Added a check to mi_create() that the table description
    header of the index file does not exceed 64KB. The header
    has only 16 bits to encode its length.

  myisam/mi_delete_table.c@1.9.1.1, 2006-06-27 11:26:29+02:00, ingo@mysql.com +18 -6
    Bug#11824 - internal /tmp/*.{MYD,MYI} files remain, causing subsequent queries to fail
    Interpret error in table open as not having a raid
    configuration on the tbale. Thus try to delete the
    normal data file, but leave behind raid chunks if 
    they exist.

ChangeSet@1.1810.1826.3, 2006-06-27 11:26:00+02:00, tomas@poseidon.ndb.mysql.com +3 -0
  Bug #19852 Restoring backup made from cluster with full data memory fails
  - correction of previous patch

  sql/ha_ndbcluster.cc@1.175.38.2, 2006-06-27 11:25:54+02:00, tomas@poseidon.ndb.mysql.com +0 -1
    Bug #19852 Restoring backup made from cluster with full data memory fails
    - correction of previous patch

  ndb/include/kernel/GlobalSignalNumbers.h@1.7.5.1, 2006-06-27 11:25:54+02:00, tomas@poseidon.ndb.mysql.com +2 -2
    Bug #19852 Restoring backup made from cluster with full data memory fails
    - correction of previous patch

  ndb/include/kernel/signaldata/DictTabInfo.hpp@1.17.4.1, 2006-06-27 11:25:54+02:00, tomas@poseidon.ndb.mysql.com +1 -1
    Bug #19852 Restoring backup made from cluster with full data memory fails
    - correction of previous patch

ChangeSet@1.2181.77.7, 2006-06-27 10:53:26+02:00, andrey@lmy004. +9 -0
  WL#3337 (Events new infrasctructure)
  Second cut of separating parsing phase from execution phase
  Separate Event_timed from parsing phase and introducing Event_parse_data.

  BitKeeper/etc/ignore@1.247, 2006-06-27 10:53:16+02:00, andrey@lmy004. +5 -0
    Added libmysql/viosocket.o.6WmSJk libmysqld/event_data_objects.cc libmysqld/event_db_repository.cc libmysqld/event_queue.cc server-tools/instance-manager/net_serv.cc to the ignore list

  sql/event_data_objects.cc@1.59, 2006-06-27 10:53:15+02:00, andrey@lmy004. +89 -0
    second cut,
    copy Event_timed::init_body() to Event_parse_data::init_body()
    Init the body during parsing, everything else keep as a pointer to
    Item or some other pointer to use for later initialization.

  sql/event_data_objects.h@1.4, 2006-06-27 10:53:15+02:00, andrey@lmy004. +3 -6
    get the identifier as sp_name*, later will initialize our structures

  sql/events.cc@1.42.1.4, 2006-06-27 10:53:15+02:00, andrey@lmy004. +7 -7
    for easy transition add temporarily parse_data, later Event_timed *et will be removed.
    Do slow transition because Event_timed is so tightly integrated that a front-attack
    by removing things from this class was unsuccessful. Do things step by step by eliminating
    dependencies. Hence, the code could be checked with the current test suite too
    (early testing)

  sql/events.h@1.32, 2006-06-27 10:53:15+02:00, andrey@lmy004. +7 -6
    for easy transition add temporarily parse_data, later Event_timed *et will be removed.
    Do slow transition because Event_timed is so tightly integrated that a front-attack
    by removing things from this class was unsuccessful. Do things step by step by eliminating
    dependencies. Hence, the code could be checked with the current test suite too
    (early testing)

  sql/share/errmsg.txt@1.112, 2006-06-27 10:53:16+02:00, andrey@lmy004. +0 -3
    remove this message, not used and needed for now

  sql/sql_lex.h@1.233.1.1, 2006-06-27 10:53:16+02:00, andrey@lmy004. +2 -0
    for easy transition add temporarily parse_data, later Event_timed *et will be removed.
    Do slow transition because Event_timed is so tightly integrated that a front-attack
    by removing things from this class was unsuccessful. Do things step by step by eliminating
    dependencies. Hence, the code could be checked with the current test suite too
    (early testing)

  sql/sql_parse.cc@1.561.2.4, 2006-06-27 10:53:16+02:00, andrey@lmy004. +5 -6
    for easy transition add temporarily parse_data, later Event_timed *et will be removed.
    Do slow transition because Event_timed is so tightly integrated that a front-attack
    by removing things from this class was unsuccessful. Do things step by step by eliminating
    dependencies. Hence, the code could be checked with the current test suite too
    (early testing)

  sql/sql_yacc.yy@1.482.1.3, 2006-06-27 10:53:16+02:00, andrey@lmy004. +33 -8
    for easy transition add temporarily parse_data, later Event_timed *et will be removed.
    Do slow transition because Event_timed is so tightly integrated that a front-attack
    by removing things from this class was unsuccessful. Do things step by step by eliminating
    dependencies. Hence, the code could be checked with the current test suite too
    (early testing)

ChangeSet@1.1810.1826.2, 2006-06-27 10:02:58+02:00, tomas@poseidon.ndb.mysql.com +32 -0
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - make sure to allocate just enough pages in the fragments by using the actual
    row count from the backup, to avoid over allocation of pages to fragments, and
    thus avoid the bug

  sql/ha_ndbcluster.cc@1.175.38.1, 2006-06-27 10:02:33+02:00, tomas@poseidon.ndb.mysql.com +8 -2
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - set min and max rows according to sql definition

  ndb/include/kernel/GlobalSignalNumbers.h@1.7.4.1, 2006-06-27 10:02:24+02:00, tomas@poseidon.ndb.mysql.com +2 -2
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - distribute fragment complete to all participants to update row count

  ndb/include/kernel/signaldata/BackupContinueB.hpp@1.1.1.1, 2006-06-27 10:02:24+02:00, tomas@poseidon.ndb.mysql.com +2 -1
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - time slica writing of fragment info to ctl file

  ndb/include/kernel/signaldata/BackupImpl.hpp@1.2.3.1, 2006-06-27 10:02:24+02:00, tomas@poseidon.ndb.mysql.com +19 -3
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - 32 -> 64 bit on bytes and records
    - new signal fragment complete to all participants

  ndb/include/kernel/signaldata/BackupSignalData.hpp@1.2.3.1, 2006-06-27 10:02:24+02:00, tomas@poseidon.ndb.mysql.com +5 -3
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - 32 -> 64 bit on bytes and records

  ndb/include/kernel/signaldata/DictTabInfo.hpp@1.17.3.1, 2006-06-27 10:02:24+02:00, tomas@poseidon.ndb.mysql.com +11 -0
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - add min and max rows to dict tab info

  ndb/include/kernel/signaldata/LqhFrag.hpp@1.2.1.1, 2006-06-27 10:02:25+02:00, tomas@poseidon.ndb.mysql.com +15 -10
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added min and max rows to add frag req

  ndb/include/kernel/signaldata/TupFrag.hpp@1.7.2.1, 2006-06-27 10:02:25+02:00, tomas@poseidon.ndb.mysql.com +13 -2
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added min and max rows to add frag req

  ndb/include/ndbapi/NdbDictionary.hpp@1.48.7.1, 2006-06-27 10:02:26+02:00, tomas@poseidon.ndb.mysql.com +14 -0
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added get/set of min max rows

  ndb/src/common/debugger/signaldata/BackupImpl.cpp@1.2.2.1, 2006-06-27 10:02:26+02:00, tomas@poseidon.ndb.mysql.com +4 -2
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - 32 -> 64 bit on bytes and records

  ndb/src/common/debugger/signaldata/BackupSignalData.cpp@1.1.1.1, 2006-06-27 10:02:27+02:00, tomas@poseidon.ndb.mysql.com +3 -3
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - 32 -> 64 bit on bytes and records

  ndb/src/common/debugger/signaldata/DictTabInfo.cpp@1.6.1.1, 2006-06-27 10:02:27+02:00, tomas@poseidon.ndb.mysql.com +8 -0
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added min and max rows to dict tab info

  ndb/src/common/debugger/signaldata/LqhFrag.cpp@1.1.1.1, 2006-06-27 10:02:27+02:00, tomas@poseidon.ndb.mysql.com +4 -2
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added min and max rows to frag req

  ndb/src/kernel/blocks/backup/Backup.cpp@1.15.22.1, 2006-06-27 10:02:27+02:00, tomas@poseidon.ndb.mysql.com +138 -25
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - new section in backup with per fragment info in ctl file
    - 32 -> 64 bit on bytes and records

  ndb/src/kernel/blocks/backup/Backup.hpp@1.7.6.1, 2006-06-27 10:02:28+02:00, tomas@poseidon.ndb.mysql.com +10 -5
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - new section in backup with per fragment info in ctl file
    - 32 -> 64 bit on bytes and records

  ndb/src/kernel/blocks/backup/BackupFormat.hpp@1.1.1.1, 2006-06-27 10:02:28+02:00, tomas@poseidon.ndb.mysql.com +16 -1
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - new section in backup with per fragment info in ctl file
    - 32 -> 64 bit on bytes and records

  ndb/src/kernel/blocks/backup/BackupInit.cpp@1.10.6.1, 2006-06-27 10:02:28+02:00, tomas@poseidon.ndb.mysql.com +3 -0
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - new signal fragment complete to all participants

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.40.24.1, 2006-06-27 10:02:28+02:00, tomas@poseidon.ndb.mysql.com +29 -3
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added max and min rows to dict table object

  ndb/src/kernel/blocks/dbdict/Dbdict.hpp@1.9.10.1, 2006-06-27 10:02:28+02:00, tomas@poseidon.ndb.mysql.com +4 -0
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added max and min rows to dict table object

  ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.32.7.1, 2006-06-27 10:02:28+02:00, tomas@poseidon.ndb.mysql.com +7 -3
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added min and max rows to frag req

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.66.22.1, 2006-06-27 10:02:29+02:00, tomas@poseidon.ndb.mysql.com +59 -35
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added min and max rows to frag req

  ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.22.3.1, 2006-06-27 10:02:30+02:00, tomas@poseidon.ndb.mysql.com +4 -1
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added min and max rows to frag req

  ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.12.2.1, 2006-06-27 10:02:30+02:00, tomas@poseidon.ndb.mysql.com +51 -32
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - added min and max rows to frag req
    - move memory allocation to fragment to after adding of attributes to get correct headsize
    - allocate pages to fragments according to min rows setting

  ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp@1.1.1.1, 2006-06-27 10:02:30+02:00, tomas@poseidon.ndb.mysql.com +4 -2
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - grow page allocation starting from 2 irrespective of first page allocation

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.73.28.1, 2006-06-27 10:02:30+02:00, tomas@poseidon.ndb.mysql.com +8 -2
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - 32 -> 64 bits on bytes and records

  ndb/src/mgmsrv/MgmtSrvr.hpp@1.30.15.1, 2006-06-27 10:02:31+02:00, tomas@poseidon.ndb.mysql.com +2 -2
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - 32 -> 64 bits on bytes and records

  ndb/src/ndbapi/NdbDictionary.cpp@1.34.4.1, 2006-06-27 10:02:32+02:00, tomas@poseidon.ndb.mysql.com +24 -0
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - min and max rows in dict

  ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.74.25.1, 2006-06-27 10:02:32+02:00, tomas@poseidon.ndb.mysql.com +21 -1
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - min and max rows in dict

  ndb/src/ndbapi/NdbDictionaryImpl.hpp@1.30.9.1, 2006-06-27 10:02:32+02:00, tomas@poseidon.ndb.mysql.com +3 -0
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - min and max rows in dict

  ndb/tools/restore/Restore.cpp@1.22.7.1, 2006-06-27 10:02:32+02:00, tomas@poseidon.ndb.mysql.com +57 -1
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - add retrieval of fragment info

  ndb/tools/restore/Restore.hpp@1.18.3.1, 2006-06-27 10:02:32+02:00, tomas@poseidon.ndb.mysql.com +15 -0
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - add retrieval of fragment info

  ndb/tools/restore/consumer_restore.cpp@1.14.11.1, 2006-06-27 10:02:32+02:00, tomas@poseidon.ndb.mysql.com +10 -0
    Bug #19852  	Restoring backup made from cluster with full data memory fails
    - set min in restore to the actual row count (this is the actual bug fix)

ChangeSet@1.2215, 2006-06-27 13:02:02+05:00, ramil@mysql.com +4 -0
  Fix for bug #18014: data loss caused by altering decimal fields.

  mysql-test/r/type_newdecimal.result@1.44.1.1, 2006-06-27 13:01:46+05:00, ramil@mysql.com +10 -0
    Fix for bug #18014: data loss caused by altering decimal fields.
      - test result

  mysql-test/t/type_newdecimal.test@1.37.1.1, 2006-06-27 13:01:47+05:00, ramil@mysql.com +11 -0
    Fix for bug #18014: data loss caused by altering decimal fields.
      - test case

  sql/field.cc@1.314.2.1, 2006-06-27 13:01:47+05:00, ramil@mysql.com +12 -0
    Fix for bug #18014: data loss caused by altering decimal fields.
      - Field_new_decimal::is_equal() introduced for proper comparisons of the decimal field definitions.

  sql/field.h@1.183.6.1, 2006-06-27 13:01:47+05:00, ramil@mysql.com +1 -0
    Fix for bug #18014: data loss caused by altering decimal fields.
      - Field_new_decimal::is_equal() introduced for proper comparisons of the decimal field definitions.

ChangeSet@1.2181.77.6, 2006-06-27 08:48:50+02:00, andrey@lmy004. +15 -0
  first cut of WL#3337 (New event scheduler locking infrastructure).
  Infrastructure built. Added the  foreseen files and change Makefile.am/CMakeLists.txt
  accordingly.

  libmysqld/Makefile.am@1.95, 2006-06-27 08:48:37+02:00, andrey@lmy004. +2 -1
    add new files. this is first cut of WL3337u

  sql/CMakeLists.txt@1.22.1.1, 2006-06-27 08:48:37+02:00, andrey@lmy004. +2 -1
    add more files to build

  sql/Makefile.am@1.146, 2006-06-27 08:48:37+02:00, andrey@lmy004. +4 -2
    add new files. this is first cut of WL3337

  sql/event_data_objects.cc@1.58, 2006-06-27 08:48:38+02:00, andrey@lmy004. +1 -1
    event_timed.h -> event_data_objects.h (WL#3337)

  sql/event_data_objects.cc@1.57, 2006-06-26 16:01:40+02:00, andrey@lmy004. +0 -0
    Rename: sql/event_timed.cc -> sql/event_data_objects.cc

  sql/event_data_objects.h@1.3, 2006-06-27 08:48:38+02:00, andrey@lmy004. +89 -4
    event_timed.h -> event_data_objects.h (WL#3337)

  sql/event_data_objects.h@1.2, 2006-06-26 16:01:27+02:00, andrey@lmy004. +0 -0
    Rename: sql/event_timed.h -> sql/event_data_objects.h

  sql/event_db_repository.cc@1.1, 2006-06-27 08:48:38+02:00, andrey@lmy004. +19 -0

  sql/event_db_repository.cc@1.0, 2006-06-27 08:48:38+02:00, andrey@lmy004. +0 -0
    BitKeeper file /work/mysql-5.1-runtime-wl3337/sql/event_db_repository.cc

  sql/event_db_repository.h@1.1, 2006-06-27 08:48:39+02:00, andrey@lmy004. +20 -0

  sql/event_db_repository.h@1.0, 2006-06-27 08:48:39+02:00, andrey@lmy004. +0 -0
    BitKeeper file /work/mysql-5.1-runtime-wl3337/sql/event_db_repository.h

  sql/event_queue.cc@1.1, 2006-06-27 08:48:39+02:00, andrey@lmy004. +19 -0

  sql/event_queue.cc@1.0, 2006-06-27 08:48:39+02:00, andrey@lmy004. +0 -0
    BitKeeper file /work/mysql-5.1-runtime-wl3337/sql/event_queue.cc

  sql/event_queue.h@1.1, 2006-06-27 08:48:39+02:00, andrey@lmy004. +20 -0

  sql/event_queue.h@1.0, 2006-06-27 08:48:39+02:00, andrey@lmy004. +0 -0
    BitKeeper file /work/mysql-5.1-runtime-wl3337/sql/event_queue.h

  sql/event_scheduler.cc@1.8, 2006-06-27 08:48:37+02:00, andrey@lmy004. +1 -1
    event_timed.h -> event_data_objects.h (WL#3337)

  sql/events.cc@1.42.1.3, 2006-06-27 08:48:37+02:00, andrey@lmy004. +1 -1
    event_timed.h -> event_data_objects.h (WL#3337)

  sql/share/errmsg.txt@1.111, 2006-06-27 08:48:37+02:00, andrey@lmy004. +3 -0
    new error message

  sql/sql_parse.cc@1.561.2.3, 2006-06-27 08:48:38+02:00, andrey@lmy004. +1 -1
    event_timed.h -> event_data_objects.h (WL#3337)

  sql/sql_show.cc@1.352.1.3, 2006-06-27 08:48:38+02:00, andrey@lmy004. +1 -1
    event_timed.h -> event_data_objects.h (WL#3337)

  sql/sql_yacc.yy@1.482.1.2, 2006-06-27 08:48:38+02:00, andrey@lmy004. +1 -1
    event_timed.h -> event_data_objects.h (WL#3337)

ChangeSet@1.1810.1847.1, 2006-06-26 16:59:52-07:00, jimw@mysql.com +3 -0
  Bug #16494: Updates that set a column to NULL fail sometimes
  
   When building the UPDATE query to send to the remote server, the
   federated storage engine built the query incorrectly if it was updating
   a field to be NULL.
  
   Thanks to Bjšrn Steinbrink for an initial patch for the problem.

  mysql-test/r/federated.result@1.25.1.2, 2006-06-26 16:59:49-07:00, jimw@mysql.com +16 -0
    Add new results

  mysql-test/t/federated.test@1.19.1.4, 2006-06-26 16:59:49-07:00, jimw@mysql.com +17 -0
    Add new regression test

  sql/ha_federated.cc@1.24.1.37, 2006-06-26 16:59:49-07:00, jimw@mysql.com +7 -10
    Fix logic of how fields are added to SET and WHERE clauses of an
    UPDATE statement. Fields that were NULL were being handled incorrectly.
    Also reorganizes the code a little bit so the update of the two
    clauses is consistent.

ChangeSet@1.1346.1.837, 2006-06-26 23:44:17+02:00, kent@mysql.com +2 -0
  make_sharedlib_distribution.sh:
    For compatibility, don't use {..,..} in pattern matching
  make_binary_distribution.sh:
    Added .dylib and .sl as shared library extensions

  scripts/make_binary_distribution.sh@1.49.1.14, 2006-06-26 23:42:36+02:00, kent@mysql.com +14 -4
    Added .dylib and .sl as shared library extensions

  scripts/make_sharedlib_distribution.sh@1.2.1.1, 2006-06-26 23:43:50+02:00, kent@mysql.com +4 -2
    For compatibility, don't use {..,..} in pattern matching

ChangeSet@1.1810.1845.1, 2006-06-27 00:47:52+04:00, konstantin@mysql.com +25 -0
   A fix and a test case for
   Bug#19022 "Memory bug when switching db during trigger execution"
   Bug#17199 "Problem when view calls function from another database."
   Bug#18444 "Fully qualified stored function names don't work correctly in
              SELECT statements"
  
   Documentation note: this patch introduces a change in behaviour of prepared
   statements.
  
   This patch adds a few new invariants with regard to how THD::db should
   be used. These invariants should be preserved in future:
  
    - one should never refer to THD::db by pointer and always make a deep copy
      (strmake, strdup)
    - one should never compare two databases by pointer, but use strncmp or
      my_strncasecmp
    - TABLE_LIST object table->db should be always initialized in the parser or
      by creator of the object.
  
      For prepared statements it means that if the current database is changed
      after a statement is prepared, the database that was current at prepare
      remains active. This also means that you can not prepare a statement that
      implicitly refers to the current database if the latter is not set.
      This is not documented, and therefore needs documentation. This is NOT a
      change in behavior for almost all SQL statements except:
       - ALTER TABLE t1 RENAME t2 
       - OPTIMIZE TABLE t1
       - ANALYZE TABLE t1
       - TRUNCATE TABLE t1 --
       until this patch t1 or t2 could be evaluated at the first execution of
       prepared statement. 
  
       CURRENT_DATABASE() still works OK and is evaluated at every execution
       of prepared statement.
  
       Note, that in stored routines this is not an issue as the default
       database is the database of the stored procedure and "use" statement
       is prohibited in stored routines.
  
    This patch makes obsolete the use of check_db_used (it was never used in the
    old code too) and all other places that check for table->db and assign it
    from THD::db if it's NULL, except the parser.
  
   How this patch was created: THD::{db,db_length} were replaced with a
   LEX_STRING, THD::db. All the places that refer to THD::{db,db_length} were
   manually checked and:
    - if the place uses thd->db by pointer, it was fixed to make a deep copy
    - if a place compared two db pointers, it was fixed to compare them by value
      (via strcmp/my_strcasecmp, whatever was approproate)
   Then this intermediate patch was used to write a smaller patch that does the
   same thing but without a rename.
  
   TODO in 5.1:
     - remove check_db_used
     - deploy THD::set_db in mysql_change_db
  
   See also comments to individual files.

  mysql-test/r/create.result@1.107.3.1, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +1 -1
    Modify the result file: a database can never be NULL.

  mysql-test/r/ps.result@1.56.1.11, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +105 -0
    Update test results (Bug#17199 et al)

  mysql-test/r/sp.result@1.170.17.1, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +46 -0
    Update test results (Bug#17199 et al)

  mysql-test/t/create.test@1.71.3.1, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +1 -1
    Update the id of the returned error.

  mysql-test/t/ps.test@1.56.1.9, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +118 -0
    Add test coverage for prepared statements and current database. In scope of
    work on Bug#17199 "Problem when view calls function from another database."

  mysql-test/t/sp.test@1.174.11.1, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +46 -0
    Add a test case for Bug#17199 "Problem when view calls function from another
    database." and Bug#18444 "Fully qualified stored function names don't work
    correctly in SELECT statements". Test a complementary problem.

  sql/item_strfunc.cc@1.261.2.1, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +2 -2
    Touch the code that reads thd->db (cleanup).

  sql/log_event.cc@1.174.10.1, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +11 -9
    While we are at it, replace direct access to thd->db with a method.
    Should simplify future conversion of THD::db to LEX_STRING.

  sql/slave.cc@1.241.7.1, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +9 -7
    While we are at it, replace direct access to thd->db with a method.
    Should simplify future conversion of THD::db to LEX_STRING.

  sql/slave.h@1.85.1.8, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +0 -4
    Remove a declaration for a method that is used only in one module.

  sql/sp.cc@1.82.1.31, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +67 -42
    Rewrite sp_use_new_db: this is a cleanup that I needed in order to understand
    this function and ensure that it has no bugs.

  sql/sp.h@1.32.1.2, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +7 -7
    Add a new declaration for sp_use_new_db (uses LEX_STRINGs) and a comment.

  sql/sp_head.cc@1.200.6.1, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +18 -48
    - drop sp_name_current_db_new - a creator of sp_name class that was used
    when sp_name was created for an identifier without an explicitly initialized
    database. Now we pass thd->db to constructor of sp_name right in the 
    parser.
    - rewrite sp_head::init_strings: name->m_db is always set now
    - use the new variant of sp_use_new_db
    - we don't need to update thd->db with SP MEM_ROOT pointer anymore when
    parsing a stored procedure, as noone will refer to it (yes!)

  sql/sp_head.h@1.79.1.6, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +0 -10
    - remove unneded methods and members

  sql/sql_class.h@1.230.28.1, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +42 -1
    - introduce 3 THD  methods to work with THD::db:
      .set_db to assign the current database
      .reset_db to reset the current database (temporarily) or set it to NULL
      .opt_copy_db_to - to deep-copy thd->db to a pointer if it's not NULL

  sql/sql_db.cc@1.120.5.1, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +3 -8
    While we are at it, replace direct access to thd->db with a method.
    Should simplify future conversion of THD::db to LEX_STRING.

  sql/sql_insert.cc@1.146.24.1, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +7 -8
    - replace checks with asserts: table_list->db must be always set in the parser.

  sql/sql_lex.h@1.175.17.1, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +5 -0
    - add a comment

  sql/sql_parse.cc@1.426.87.2, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +90 -120
    - implement the invariant described in the changeset comment.
    - remove juggling with lex->sphead in SQLCOM_CREATE_PROCEDURE:
      now db_load_routine uses its own LEX object and doesn't damage the main
      LEX.
    - add DBUG_ASSERT(0) to unused "check_db_used"

  sql/sql_table.cc@1.239.28.1, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +2 -1
    - replace a check with an assert (table_ident->db)

  sql/sql_trigger.cc@1.35.6.1, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +3 -6
    While we are at it, replace direct access to thd->db with a method.
    Should simplify future conversion of THD::db to LEX_STRING.

  sql/sql_udf.cc@1.45.4.1, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +3 -3
    - use thd->set_db instead of direct modification of to thd->db

  sql/sql_view.cc@1.78.1.11, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +4 -5
    - replace a check with an assert (view->db)

  sql/sql_yacc.yy@1.371.66.1, 2006-06-27 00:47:47+04:00, konstantin@mysql.com +42 -5
    - make sure that we always copy table->db or name->db or ident->db or
      select_lex->db from thd->db if the former is not set. If thd->db
      is not set but is accessed, return an error.

  sql/tztime.cc@1.24.1.8, 2006-06-27 00:47:48+04:00, konstantin@mysql.com +3 -3
    - be nice, never copy thd->db by pointer.

ChangeSet@1.2181.92.2, 2006-06-26 22:33:46+02:00, ngrishakin@mysql.com +2 -0
  updated test case ndb_dd_advance

  mysql-test/r/ndb_dd_advance.result@1.4, 2006-06-26 22:33:19+02:00, ngrishakin@mysql.com +2 -2
    ndb_dd_advance.result

  mysql-test/t/ndb_dd_advance.test@1.4, 2006-06-26 22:33:08+02:00, ngrishakin@mysql.com +1 -1
    ndb_dd_advance.test

ChangeSet@1.1810.1844.1, 2006-06-26 20:57:18+02:00, ingo@mysql.com +6 -0
  Bug#16218 - Crash on insert delayed
  Bug#17294 - INSERT DELAYED puting an \n before data
  Bug#16611 - INSERT DELAYED corrupts data
  Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
  Combined as Bug#16218.
  
  INSERT DELAYED crashed in 5.0 on a table with a varchar that 
  could be NULL and was created pre-5.0 (Bugs 16218 and 13707).
  INSERT DELAYED corrupted data in 5.0 on a table with varchar 
  fields that was created pre-5.0 (Bugs 17294 and 16611).
  
  In case of INSERT DELAYED the open table is copied from the
  delayed insert thread to be able to create a record for the 
  queue. When copying the fields, a method was used that did 
  convert old varchar to new varchar fields and did not set up 
  some pointers into the record buffer of the table.
  
  The field conversion was guilty for the misinterpretation of 
  the record contents by the delayed insert thread. The wrong
  pointer setup was guilty for the crashes.
  
  For Bug 13707 (Server crash with INSERT DELAYED on MyISAM table)
  I fixed the above mentioned method to set up one of the pointers.
  For Bug 16218 I set up the other pointers too.
  
  But when looking at the corruptions I got aware that converting
  the field type was totally wrong for INSERT DELAYED. The copied
  table is used to create a record that is to be sent to the
  delayed insert thread. Of course it can interpret the record
  correctly only if all field types are the same in both table
  objects.
  
  So I revoked the fix for Bug 13707 and changed the new_field() 
  method so that it can suppress conversions.
  
  No test case as this is a migration problem. One needs to
  create a table with 4.x and use it with 5.x. I added two
  test scripts to the bug report.

  sql/field.cc@1.256.21.1, 2006-06-26 20:57:12+02:00, ingo@mysql.com +13 -18
    Bug#16218 - Crash on insert delayed
    Bug#17294 - INSERT DELAYED puting an \n before data
    Bug#16611 - INSERT DELAYED corrupts data
    Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
    Combined as Bug#16218.
    
    Added parameter 'keep_type' to Field::new_field().
    
    Undid the change from Bug 13707 (Server crash with INSERT 
    DELAYED on MyISAM table).
    I solved all four bugs in sql/sql_insert.cc by making exact
    duplicates of the fields. The new_field() method converts
    certain field types, which is wrong for INSERT DELAYED.

  sql/field.h@1.153.9.1, 2006-06-26 20:57:12+02:00, ingo@mysql.com +4 -3
    Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
    Combined as Bug#16218.
    
    Added parameter 'keep_type' to Field::new_field().

  sql/sql_insert.cc@1.146.23.1, 2006-06-26 20:57:12+02:00, ingo@mysql.com +67 -12
    Bug#16218 - Crash on insert delayed
    Bug#17294 - INSERT DELAYED puting an \n before data
    Bug#16611 - INSERT DELAYED corrupts data
    Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
    Combined as Bug#16218.
    
    Added comments. Made small style fixes.
    Used the new parameter 'keep_type' of Field::new_field()
    to avoid field type conversion. The table copy must have
    exactly the same types of fields as the original table.
    Otherwise the record contents created by the foreground 
    thread could be misinterpreted by the delayed insert thread.

  sql/sql_select.cc@1.312.73.1, 2006-06-26 20:57:12+02:00, ingo@mysql.com +3 -2
    Bug#16218 - Crash on insert delayed
    Bug#17294 - INSERT DELAYED puting an \n before data
    Bug#16611 - INSERT DELAYED corrupts data
    Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
    Combined as Bug#16218.
    
    Added parameter 'keep_type' to Field::new_field().
    
    Undid the change from Bug 13707 (Server crash with INSERT 
    DELAYED on MyISAM table).
    I solved all four bugs in sql/sql_insert.cc by making exact
    duplicates of the fields. The new_field() method converts
    certain field types, which is wrong for INSERT DELAYED.

  sql/sql_trigger.cc@1.35.1.15, 2006-06-26 20:57:13+02:00, ingo@mysql.com +2 -1
    Bug#16218 - Crash on insert delayed
    Bug#17294 - INSERT DELAYED puting an \n before data
    Bug#16611 - INSERT DELAYED corrupts data
    Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
    Combined as Bug#16218.
    
    Added parameter 'keep_type' to Field::new_field().
    
    Undid the change from Bug 13707 (Server crash with INSERT 
    DELAYED on MyISAM table).
    I solved all four bugs in sql/sql_insert.cc by making exact
    duplicates of the fields. The new_field() method converts
    certain field types, which is wrong for INSERT DELAYED.

  sql/table.cc@1.160.26.1, 2006-06-26 20:57:13+02:00, ingo@mysql.com +2 -1
    Bug#16218 - Crash on insert delayed
    Bug#17294 - INSERT DELAYED puting an \n before data
    Bug#16611 - INSERT DELAYED corrupts data
    Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
    Combined as Bug#16218.
    
    Added parameter 'keep_type' to Field::new_field().
    
    Undid the change from Bug 13707 (Server crash with INSERT 
    DELAYED on MyISAM table).
    I solved all four bugs in sql/sql_insert.cc by making exact
    duplicates of the fields. The new_field() method converts
    certain field types, which is wrong for INSERT DELAYED.

ChangeSet@1.1810.1840.1, 2006-06-26 19:14:35+02:00, ingo@mysql.com +10 -0
  Bug#16986 - Deadlock condition with MyISAM tables
  
  Addendum fixes after changing the condition variable
  for the global read lock.
  
  The stress test suite revealed some deadlocks. Some were
  related to the new condition variable (COND_global_read_lock)
  and some were general problems with the global read lock.
  
  It is now necessary to signal COND_global_read_lock whenever 
  COND_refresh is signalled.
  
  We need to wait for the release of a global read lock if one 
  is set before every operation that requires a write lock.
  But we must not wait if we have locked tables by LOCK TABLES.
  After setting a global read lock a thread waits until all
  write locks are released.

  mysql-test/r/lock_multi.result@1.15.1.4, 2006-06-26 19:14:29+02:00, ingo@mysql.com +15 -0
    Bug#16986 - Deadlock condition with MyISAM tables
    Addendum fixes after changing the condition variable
    for the global read lock.
    Added test results.

  mysql-test/t/lock_multi.test@1.13.1.4, 2006-06-26 19:14:29+02:00, ingo@mysql.com +50 -0
    Bug#16986 - Deadlock condition with MyISAM tables
    Addendum fixes after changing the condition variable
    for the global read lock.
    Added tests for possible deadlocks that did not occur
    with the stress test suite.

  mysys/thr_lock.c@1.49.1.1, 2006-06-26 19:14:29+02:00, ingo@mysql.com +2 -0
    Bug#16986 - Deadlock condition with MyISAM tables
    Addendum fixes after changing the condition variable
    for the global read lock.
    Added a protection against an infinite loop that occurs
    with the test case for Bug #20662.

  sql/lock.cc@1.64.1.25, 2006-06-26 19:14:29+02:00, ingo@mysql.com +39 -5
    Bug#16986 - Deadlock condition with MyISAM tables
    Addendum fixes after changing the condition variable
    for the global read lock.
    Signal COND_global_read_lock whenever COND_refresh
    is signalled by using the new function broadcast_refresh().
    Added the definition of a new function that signals 
    COND_global_read_lock whenever COND_refresh is signalled.

  sql/mysql_priv.h@1.290.51.1, 2006-06-26 19:14:29+02:00, ingo@mysql.com +1 -0
    Bug#16986 - Deadlock condition with MyISAM tables
    Addendum fixes after changing the condition variable
    for the global read lock.
    Added a declaration for a new function that signals 
    COND_global_read_lock whenever COND_refresh is signalled.

  sql/sql_base.cc@1.235.59.1, 2006-06-26 19:14:29+02:00, ingo@mysql.com +7 -7
    Bug#16986 - Deadlock condition with MyISAM tables
    Addendum fixes after changing the condition variable
    for the global read lock.
    Signal COND_global_read_lock whenever COND_refresh
    is signalled by using the new function broadcast_refresh().

  sql/sql_handler.cc@1.72.1.11, 2006-06-26 19:14:29+02:00, ingo@mysql.com +6 -5
    Bug#16986 - Deadlock condition with MyISAM tables
    Addendum fixes after changing the condition variable
    for the global read lock.
    Signal COND_global_read_lock whenever COND_refresh
    is signalled by using the new function broadcast_refresh().

  sql/sql_insert.cc@1.146.1.47, 2006-06-26 19:14:29+02:00, ingo@mysql.com +2 -24
    Bug#16986 - Deadlock condition with MyISAM tables
    Addendum fixes after changing the condition variable
    for the global read lock.
    Removed global read lock handling from inside of 
    INSERT DELAYED. It is handled on a higher level now.

  sql/sql_parse.cc@1.426.90.1, 2006-06-26 19:14:29+02:00, ingo@mysql.com +83 -19
    Bug#16986 - Deadlock condition with MyISAM tables
    Addendum fixes after changing the condition variable
    for the global read lock.
    Wait for the release of a global read lock if one is set
    before every operation that requires a write lock.
    But don't wait if locked tables exist already.

  sql/sql_table.cc@1.239.27.1, 2006-06-26 19:14:29+02:00, ingo@mysql.com +3 -6
    Bug#16986 - Deadlock condition with MyISAM tables
    Addendum fixes after changing the condition variable
    for the global read lock.
    Removed global read lock handling from inside of 
    CREATE TABLE. It is handled on a higher level now.
    Signal COND_global_read_lock whenever COND_refresh
    is signalled by using the new function broadcast_refresh().

ChangeSet@1.2181.88.2, 2006-06-26 15:49:58+02:00, knielsen@mysql.com +2 -0
  BUG#20676: debug warnings about too many lock waiters cause test failure.
  
  The 250 simultaneous events all accessing the same table caused the
  events_stress test to fail due to debug warnings about too many table
  waiters. Fixed by using three different tables.

  mysql-test/r/events_stress.result@1.5, 2006-06-26 15:49:53+02:00, knielsen@mysql.com +6 -2
    Use three different MyISAM tables to avoid debug warnings about too many
    locks.

  mysql-test/t/events_stress.test@1.4.1.1, 2006-06-26 15:49:54+02:00, knielsen@mysql.com +14 -8
    Use three different MyISAM tables to avoid debug warnings about too many
    locks.

ChangeSet@1.1810.1838.1, 2006-06-26 23:31:10+10:00, stewart@mysql.com +1 -0
  BUG#11459 ndb status variables not updated
  
  change names of some undocumented ndb status variables to better reflect what
  their values mean

  sql/ha_ndbcluster.cc@1.175.37.1, 2006-06-26 23:31:02+10:00, stewart@mysql.com +2 -2
    rename some status variables to better reflect what they show.

ChangeSet@1.2181.58.11, 2006-06-26 15:08:09+02:00, jonas@perch.ndb.mysql.com +7 -0
  ndb - bug#20053
    make sure we can only drop files from correct file group

  mysql-test/r/ndb_dd_ddl.result@1.12, 2006-06-26 15:08:05+02:00, jonas@perch.ndb.mysql.com +18 -0
    add testcase

  mysql-test/t/ndb_dd_ddl.test@1.11, 2006-06-26 15:08:05+02:00, jonas@perch.ndb.mysql.com +26 -0
    add testcase

  sql/ha_ndbcluster.cc@1.319.3.2, 2006-06-26 15:08:05+02:00, jonas@perch.ndb.mysql.com +10 -5
    Make sure correct tablespace for dropping datafile

  storage/ndb/include/ndbapi/NdbDictionary.hpp@1.79, 2006-06-26 15:08:06+02:00, jonas@perch.ndb.mysql.com +4 -4
    Cleanup {data/undo}file get{tablespace/logfilegroup}

  storage/ndb/src/ndbapi/NdbDictionary.cpp@1.60, 2006-06-26 15:08:06+02:00, jonas@perch.ndb.mysql.com +22 -10
    Cleanup {data/undo}file get{tablespace/logfilegroup}

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp@1.60.1.2, 2006-06-26 15:08:06+02:00, jonas@perch.ndb.mysql.com +10 -2
    Cleanup {data/undo}file get{tablespace/logfilegroup}

  storage/ndb/tools/restore/consumer_restore.cpp@1.32, 2006-06-26 15:08:06+02:00, jonas@perch.ndb.mysql.com +8 -5
    Cleanup {data/undo}file get{tablespace/logfilegroup}

ChangeSet@1.2181.58.10, 2006-06-26 12:31:09+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - bug#20683
    part 2 - handle safecounter.init() failing in all parts of event code

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.87.2.4, 2006-06-26 12:31:06+02:00, jonas@perch.ndb.mysql.com +40 -10
    Handle out safecounter.init() failing

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@1.42.1.1, 2006-06-26 12:31:06+02:00, jonas@perch.ndb.mysql.com +2 -1
    Dont try to get table RNIL

  storage/ndb/test/ndbapi/test_event.cpp@1.22, 2006-06-26 12:31:06+02:00, jonas@perch.ndb.mysql.com +57 -0
    Add testcase for subscribe/unscubscribe

ChangeSet@1.1616.2550.10, 2006-06-26 12:16:39+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#20683
    part 1 - make sure return code is propagated from request tracker

  ndb/src/kernel/vm/RequestTracker.hpp@1.1.1.1, 2006-06-26 12:16:37+02:00, jonas@perch.ndb.mysql.com +2 -2
    propagate return value

  ndb/src/kernel/vm/SafeCounter.hpp@1.1.2.1, 2006-06-26 12:16:37+02:00, jonas@perch.ndb.mysql.com +14 -8
    make sure object is not initialized in case of seize() failure, to make sure destructor doesnt assert

ChangeSet@1.2181.89.3, 2006-06-25 16:04:11-04:00, elliot@mysql.com +2 -0
  Post merge fix

  mysql-test/r/func_time.result@1.56.1.2, 2006-06-25 16:04:08-04:00, elliot@mysql.com +10 -3
    post-merge fix

  mysql-test/r/select.result@1.130.1.2, 2006-06-25 16:04:08-04:00, elliot@mysql.com +6 -0
    post-merge fix

ChangeSet@1.2181.87.4, 2006-06-25 22:56:10+04:00, evgen@sunlight.local +2 -0
  table.cc, func_time.result:
    After merge fix

  mysql-test/r/func_time.result@1.58, 2006-06-25 18:57:02+04:00, evgen@sunlight.local +4 -4
    After merge fix

  sql/table.cc@1.224, 2006-06-25 18:57:26+04:00, evgen@sunlight.local +0 -22
    After merge fix

ChangeSet@1.2181.89.1, 2006-06-25 10:25:00+02:00, kent@mysql.com +2 -0
  .del-make_win_src_distribution.sh~f80d8fca44e4e5f1:
    Delete: scripts/make_win_src_distribution.sh
  Makefile.am:
    Unix and Windows now shares source package

  BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1@1.57, 2006-06-25 10:23:30+02:00, kent@mysql.com +0 -0
    Delete: scripts/make_win_src_distribution.sh

  scripts/Makefile.am@1.55, 2006-06-25 10:22:48+02:00, kent@mysql.com +1 -4
    Unix and Windows now shares source package

ChangeSet@1.2181.88.1, 2006-06-25 08:59:44+02:00, knielsen@mysql.com +2 -0
  BUG#20677: Sporadic failure of test case 'ndb_binlog_multi'.
  
  Start test case with a dummy table create and drop. This ensures that
  NDB event subscription is properly set up before the real test starts,
  which otherwise could sometimes cause INSERT events to be lost.

  mysql-test/r/ndb_binlog_multi.result@1.5, 2006-06-25 08:59:40+02:00, knielsen@mysql.com +4 -2
    Start test with dummy table create/drop to avoid a race.

  mysql-test/t/ndb_binlog_multi.test@1.5, 2006-06-25 08:59:40+02:00, knielsen@mysql.com +9 -2
    Start test with dummy table create/drop to avoid a race.

ChangeSet@1.1810.1837.1, 2006-06-24 13:11:09+02:00, knielsen@mysql.com +1 -0
  Fix race condition in test case wait_timeout.
  
  Sometimes the helper connection (that is watching for the main connection
  to time out) would itself time out first, causing the test to fail.

  mysql-test/t/wait_timeout.test@1.1.1.5, 2006-06-24 13:11:06+02:00, knielsen@mysql.com +1 -0
    Increase connection timeout in connection wait_con so we will not loose
    the connection that is watching for the real wait_timeout to trigger.

ChangeSet@1.2181.86.1, 2006-06-24 07:45:23+02:00, knielsen@mysql.com +2 -0
  Build fixes for Windows, Solaris, HPUX, AIX.

  include/mysql/plugin.h@1.16, 2006-06-24 07:45:18+02:00, knielsen@mysql.com +4 -0
    Fix compilation on non-GCC compilers.

  sql/CMakeLists.txt@1.21.1.1, 2006-06-24 07:45:18+02:00, knielsen@mysql.com +1 -1
    Add missing file.

ChangeSet@1.1810.1698.74, 2006-06-23 18:21:34-07:00, igor@rurik.mysql.com +6 -0
  Fixed some dsp files.
  Fixed make_win_src_distribution.sh to return back dsp files
  for yassl.

  scripts/make_win_src_distribution.sh@1.37.1.11, 2006-06-23 18:21:26-07:00, igor@rurik.mysql.com +1 -1
    Returned back dsp files from yassl.

  VC++Files/sql/mysqld.dsp@1.36.1.6, 2006-06-23 18:21:26-07:00, igor@rurik.mysql.com +4 -0
    my_user.c was missing.

  VC++Files/sql/mysqld_ia64.dsp@1.2.1.1, 2006-06-23 18:21:26-07:00, igor@rurik.mysql.com +4 -0
    my_user.c was missing.

  VC++Files/client/mysqldump.dsp@1.14.1.1, 2006-06-23 18:21:26-07:00, igor@rurik.mysql.com +4 -0
    my_user.c was missing.

  VC++Files/client/mysqldump_ia64.dsp@1.3.1.1, 2006-06-23 18:21:26-07:00, igor@rurik.mysql.com +4 -0
    my_user.c was missing.

  extra/yassl/yassl.dsp@1.3, 2006-06-23 18:21:26-07:00, igor@rurik.mysql.com +4 -4
    Added the YASSL_PREFIX flag.

ChangeSet@1.2181.84.2, 2006-06-24 01:21:08+02:00, ngrishakin@mysql.com +2 -0
  updated test case ndb_dd_advance

  mysql-test/r/ndb_dd_advance.result@1.3, 2006-06-24 01:20:35+02:00, ngrishakin@mysql.com +36 -36
    ndb_dd_advance.result

  mysql-test/t/ndb_dd_advance.test@1.3, 2006-06-24 01:20:07+02:00, ngrishakin@mysql.com +7 -7
    ndb_dd_advance.test

ChangeSet@1.2181.85.2, 2006-06-23 17:59:24-04:00, elliot@mysql.com +1 -0
  Post merge fix.

  mysql-test/r/lock_multi.result@1.22, 2006-06-23 17:59:20-04:00, elliot@mysql.com +16 -0
    Post merge fix.

ChangeSet@1.1810.1836.1, 2006-06-23 12:15:39-04:00, iggy@mysql.com +2 -0
  Bug#20616: drop_temp_table test fails on Windows platform

  sql/sql_table.cc@1.239.1.75, 2006-06-23 12:15:34-04:00, iggy@mysql.com +16 -1
    Check for FN_DEVCHAR in the table name just before file creation. This allows for temporary tables to contain FN_DEVCHAR in the name.

  sql/table.cc@1.160.25.1, 2006-06-23 12:15:34-04:00, iggy@mysql.com +0 -8
    Removed the check for FN_DEVCHAR is done at this level because it prevents Windows from creating any table with FN_DEVCHAR in the name.

ChangeSet@1.1810.1830.4, 2006-06-23 19:36:54+04:00, evgen@moonbone.local +1 -0
  key.result:
    After merge fix

  mysql-test/r/key.result@1.28.1.2, 2006-06-23 19:36:08+04:00, evgen@moonbone.local +2 -2
    After merge fix

ChangeSet@1.2181.28.5, 2006-06-23 17:29:01+02:00, andrey@lmy004. +3 -0
  Fix for bug #18897 "Events: unauthorized action possible with
  alter event rename".
  
  ALTER EVENT ... RENAME statement hasn't checked privileges
  for the target database. It also caused server crashes when
  target database was not specified explicitly and there was
  no current database.
  
  This fix adds missing privilege check and check for the case
  when target database is not specified explicitly or implicitly.

  mysql-test/r/events_bugs.result@1.11, 2006-06-23 17:28:43+02:00, andrey@lmy004. +23 -0
    update result

  mysql-test/t/events_bugs.test@1.7.1.1, 2006-06-23 17:28:43+02:00, andrey@lmy004. +34 -0
    add test case for bug 18897 Events: unauthorized action possible with alter event
    rename:
    - test rename to db the user does not have access to
    - test rename when there is no selected db

  sql/sql_parse.cc@1.559.4.1, 2006-06-23 17:28:44+02:00, andrey@lmy004. +7 -2
    Additional check for the situation when no db is selected.
    CREATE EVENT abc and ALTER EVENT db.abc RENAME TO xyz,
    and DROP EVENT abc
    won't work if there is no selected DB.

ChangeSet@1.1810.1835.1, 2006-06-23 11:21:57-04:00, elliot@mysql.com +1 -0
  BUG#20528 Added missing parenthesis to DBUG_PRINT statement

  mysys/my_lib.c@1.23.3.1, 2006-06-23 11:21:54-04:00, elliot@mysql.com +1 -1
    BUG#20528 Added missing parenthesis to DBUG_PRINT statement

ChangeSet@1.2181.83.1, 2006-06-23 18:19:14+04:00, petr@mysql.com +4 -0
  remove links from bk to get rid of warnings on windows

  BitKeeper/deleted/.del-net_serv.cc~120fb81d7e670308@1.2, 2006-06-23 18:13:56+04:00, petr@mysql.com +0 -0
    Delete: server-tools/instance-manager/net_serv.cc

  BitKeeper/deleted/.del-pack.c~4754cd15e3058c75@1.2, 2006-06-23 18:13:39+04:00, petr@mysql.com +0 -0
    Delete: server-tools/instance-manager/pack.c

  BitKeeper/deleted/.del-password.c~9d4b6a4c57887ac7@1.2, 2006-06-23 18:13:22+04:00, petr@mysql.com +0 -0
    Delete: server-tools/instance-manager/password.c

  BitKeeper/deleted/.del-sql_state.c~3b39d30b649690f3@1.2, 2006-06-23 18:12:17+04:00, petr@mysql.com +0 -0
    Delete: server-tools/instance-manager/sql_state.c

ChangeSet@1.1810.1803.9, 2006-06-23 18:00:49+05:00, bar@mysql.com +4 -0
  Bug#15276: MySQL ignores collation-server
      Problem:
      mysqld --collation-server=xxx --character-set-server=yyy
      didn't work as expected: collation_server was set not to xxx,
      but to the default collation of character set "yyy".
      
      With different argument order it worked as expected:
      mysqld --character-set-server=yyy --collation-server=yyy 
      
      Fix:
      initializate default_collation_name to 0
      when processing --character-set-server
      only if --collation-server has not been specified
      in command line.
  

  mysql-test/r/ctype_ucs2_def.result@1.2, 2006-06-23 18:00:38+05:00, bar@mysql.com +3 -0
    Adding test case

  mysql-test/t/ctype_ucs2_def-master.opt@1.2, 2006-06-23 18:00:38+05:00, bar@mysql.com +1 -1
    Specifying variables in reverse order, to cover the bug.

  mysql-test/t/ctype_ucs2_def.test@1.2, 2006-06-23 18:00:38+05:00, bar@mysql.com +5 -0
    Adding test case

  sql/mysqld.cc@1.439.62.1, 2006-06-23 18:00:39+05:00, bar@mysql.com +4 -2
    Don't clear default_collation_name when processing 
        --character-set-server if collation has already
        been specified using --collation-server
    

ChangeSet@1.1810.1834.1, 2006-06-23 14:50:02+02:00, knielsen@mysql.com +2 -0
  BUG#20622: Fix one-byte buffer overrun in IM directory string handling.
  
  The problem was a call to convert_dirname() with a destination buffer
  that did not have room for the trailing slash added by that function.
  This could cause the instance manager to crash in some cases.

  mysys/mf_dirname.c@1.11.1.2, 2006-06-23 14:49:58+02:00, knielsen@mysql.com +3 -1
    Clarify in comments that convert_dirname destination must be larger than
    source to accomodate a trailing slash.

  server-tools/instance-manager/instance_options.cc@1.29.1.2, 2006-06-23 14:49:58+02:00, knielsen@mysql.com +7 -2
    Fix buffer overrun.

ChangeSet@1.1810.1808.6, 2006-06-23 12:17:11+02:00, joerg@mysql.com +1 -0
  The binary "mysql_upgrade" must be included in the distribution. (bug#18516 + 19353)

  scripts/make_binary_distribution.sh@1.101.1.8, 2006-06-23 12:17:05+02:00, joerg@mysql.com +1 -1
    The binary "mysql_upgrade" must be included in the distribution.

ChangeSet@1.1616.2653.2, 2006-06-23 13:19:30+05:00, bar@mysql.com +3 -0
  Bug#11228: DESC shows arbitrary column as "PRI"
    An UNIQUE KEY consisting of NOT NULL columns
    was displayed as PRIMARY KEY in "DESC t1".
    According to the code, that was intentional
    behaviour for some reasons unknown to me.
    This code was written before bitkeeper time,
    so I cannot check who and why made this.
    After discussing on dev-public, a decision
    was made to remove this code

  mysql-test/r/key.result@1.18.1.8, 2006-06-23 13:19:24+05:00, bar@mysql.com +10 -0
    Adding test case.

  mysql-test/t/key.test@1.14.1.9, 2006-06-23 13:19:24+05:00, bar@mysql.com +11 -0
    Adding test case.

  sql/table.cc@1.111.4.3, 2006-06-23 13:19:24+05:00, bar@mysql.com +0 -21
    Removing old wrong code

ChangeSet@1.2181.80.6, 2006-06-23 10:46:16+03:00, monty@mysql.com +1 -0
  Suppress memory leak from 'kill_server'
  (Happens if main thread exists before kill_server thread, which is ok)

  mysql-test/valgrind.supp@1.12, 2006-06-23 10:46:13+03:00, monty@mysql.com +10 -0
    Suppress memory leak from 'kill_server'
    (Happens if main thread exists before kill_server thread, which is ok)

ChangeSet@1.2181.81.1, 2006-06-23 09:40:06+02:00, andrey@lmy004. +7 -0
  disable events tests in embedded
  (fix for bug#20290 Event mechanism incompatible with embedded server, but tests tried)

  mysql-test/t/events.test@1.30.1.1, 2006-06-23 09:39:57+02:00, andrey@lmy004. +3 -0
    disable test in embedded

  mysql-test/t/events_bugs.test@1.8, 2006-06-23 09:39:58+02:00, andrey@lmy004. +3 -0
    disable test in embedded

  mysql-test/t/events_grant.test@1.1.1.1, 2006-06-23 09:39:58+02:00, andrey@lmy004. +3 -0
    disable test in embedded

  mysql-test/t/events_logs_tests.test@1.10, 2006-06-23 09:39:58+02:00, andrey@lmy004. +3 -0
    disable test in embedded

  mysql-test/t/events_microsec.test@1.3.1.1, 2006-06-23 09:39:58+02:00, andrey@lmy004. +3 -0
    disable test in embedded

  mysql-test/t/events_scheduling.test@1.6, 2006-06-23 09:39:58+02:00, andrey@lmy004. +3 -0
    disable test in embedded

  mysql-test/t/events_stress.test@1.5, 2006-06-23 09:39:58+02:00, andrey@lmy004. +3 -0
    disable test in embedded

ChangeSet@1.2181.80.5, 2006-06-23 10:35:45+03:00, monty@mysql.com +2 -0
  Fixed memory leak (found by rpl_row_inexist_tbl)

  sql/handler.cc@1.243.1.2, 2006-06-23 10:35:41+03:00, monty@mysql.com +5 -4
    Made code more portable

  sql/log_event.cc@1.226.1.2, 2006-06-23 10:35:41+03:00, monty@mysql.com +10 -8
    Fixed memory leak (found by rpl_row_inexist_tbl)

ChangeSet@1.1616.2650.7, 2006-06-22 20:39:46-07:00, igor@rurik.mysql.com +2 -0
  Added a test case for bug #18359.
  This was another manifestation of the problems fixed in the
  patch for bug 16674.
  Wrong calculation of length of the search prefix in the pattern
  string led here to a wrong result set for a query in 4.1. 
  The bug could be demonstrated for any multi-byte character set. 

  mysql-test/r/ctype_utf8.result@1.45.6.4, 2006-06-22 20:39:40-07:00, igor@rurik.mysql.com +56 -0
    Added a test case for bug #18359.

  mysql-test/t/ctype_utf8.test@1.57.6.4, 2006-06-22 20:39:40-07:00, igor@rurik.mysql.com +31 -0
    Added a test case for bug #18359.

ChangeSet@1.2181.80.4, 2006-06-23 03:21:12+03:00, monty@mysql.com +2 -0
  Fixed problem when compiling libmysqld (without replication)
  This change allows us to use the stmt_binlog function in the code without ifdefs
  (We should avoid having ifdefs in the .cc and .c files)

  sql/handler.h@1.217.1.2, 2006-06-23 03:21:08+03:00, monty@mysql.com +6 -6
    Removed compiler warnings

  sql/sql_class.h@1.300.1.3, 2006-06-23 03:21:08+03:00, monty@mysql.com +6 -2
    Fixed problem when compiling libmysqld (without replication)
    This change allows us to use the stmt_binlog function in the code without ifdefs
    (We should avoid having ifdefs in the .cc and .c files)

ChangeSet@1.2181.80.2, 2006-06-23 02:49:19+03:00, monty@mysql.com +13 -0
  Remove compiler warnings
  Fixed wrong table flags type in ndbcluster that caused previous commit to fail

  client/mysqltest.c@1.210.1.3, 2006-06-23 02:49:14+03:00, monty@mysql.com +2 -2
    Portability fix

  mysys/my_bitmap.c@1.41, 2006-06-23 02:49:15+03:00, monty@mysql.com +1 -1
    Remove compiler warning

  mysys/my_handler.c@1.25, 2006-06-23 02:49:15+03:00, monty@mysql.com +6 -0
    Remove compiler warning

  mysys/thr_lock.c@1.52, 2006-06-23 02:49:15+03:00, monty@mysql.com +5 -2
    Remove compiler warning

  plugin/fulltext/plugin_example.c@1.11, 2006-06-23 02:49:15+03:00, monty@mysql.com +4 -2
    Remove compiler warning

  sql/ha_ndbcluster.h@1.139.1.4, 2006-06-23 02:49:15+03:00, monty@mysql.com +1 -1
    Fixed wrong of handler flags (caused previous commit to fail)

  sql/ha_ndbcluster_binlog.cc@1.69, 2006-06-23 02:49:15+03:00, monty@mysql.com +11 -10
    Remove compiler warning

  sql/handler.cc@1.242.1.2, 2006-06-23 02:49:15+03:00, monty@mysql.com +5 -3
    Indentation cleanups

  sql/mysql_priv.h@1.414, 2006-06-23 02:49:15+03:00, monty@mysql.com +1 -1
    Changed log_output_options to ulong to remove compiler warning (and wrong test on 64 bit machines)

  sql/mysqld.cc@1.562.2.1, 2006-06-23 02:49:15+03:00, monty@mysql.com +4 -3
    Changed log_output_options to ulong to remove compiler warning (and wrong test on 64 bit machines)
    Split initialization of variables of different types to remove compiler warning

  sql/set_var.cc@1.178, 2006-06-23 02:49:15+03:00, monty@mysql.com +2 -1
    Fixed indentation

  sql/set_var.h@1.89, 2006-06-23 02:49:15+03:00, monty@mysql.com +2 -2
    sys_var_log_output now takes a pointer to ulong

  storage/archive/archive_test.c@1.4, 2006-06-23 02:49:15+03:00, monty@mysql.com +1 -1
    Remove compiler warning

ChangeSet@1.1616.2650.6, 2006-06-22 15:50:15-07:00, igor@rurik.mysql.com +3 -0
  Fixed bug #20076.
  Server crashed in some cases when a query required a MIN/MAX
  agrregation for a 'ucs2' field. 
  In these cases  the aggregation caused calls of the function
  update_tmptable_sum_func that indirectly invoked 
  the method Item_sum_hybrid::min_max_update_str_field() 
  containing a call to strip_sp for a ucs2 character set.
  The latter led directly to the crash as it used my_isspace
  undefined for the ucs2 character set.
  Actually the call of strip_sp is not needed at all in this
  situation and has been removed by the fix.

  mysql-test/r/ctype_ucs.result@1.11.1.19, 2006-06-22 15:50:11-07:00, igor@rurik.mysql.com +7 -0
    Added a test case for bug #20076.

  mysql-test/t/ctype_ucs.test@1.15.1.15, 2006-06-22 15:50:11-07:00, igor@rurik.mysql.com +12 -0
    Added a test case for bug #20076.

  sql/item_sum.cc@1.89.1.59, 2006-06-22 15:50:11-07:00, igor@rurik.mysql.com +0 -1
    Fixed bug #20076.
    Server crashed in some cases when a query required a MIN/MAX
    agrregation for a 'ucs2' field. 
    In these cases  the aggregation caused calls of the function
    update_tmptable_sum_func that indirectly invoked 
    the method Item_sum_hybrid::min_max_update_str_field() 
    containing a call to strip_sp for a ucs2 character set.
    The latter led directly to the crash as it used my_isspace
    undefined for the ucs2 character set.
    Actually the call of strip_sp is not needed at all in this
    situation and has been removed by the fix.

ChangeSet@1.1616.2653.1, 2006-06-23 00:37:31+02:00, kent@mysql.com +1 -0
  mysql.spec.sh:
    Disable the simplistic auto dependency scan for test/bench (bug#20078)

  support-files/mysql.spec.sh@1.83.1.36, 2006-06-19 21:36:57+02:00, kent@mysql.com +1 -0
    Disable the simplistic auto dependency scan for test/bench (bug#20078)

ChangeSet@1.1810.1819.11, 2006-06-23 00:32:43+02:00, tnurnberg@mysql.com +1 -0
  Bug#20588: mysqldump.test may fail, depending on system-wide configuration
  
  mysqldump.test calls my_print_defaults in a way that includes the systemwide
  my.cnf, so the results will be beyond our control and depend on whatever the
  user has in their my.cnf, namely the [mysqldump] section.
  
  call my_print_defaults with --config-file rather than --defaults-extra-file
  to prevent inclusion of system-wide defaults and use our config-file only.

  mysql-test/t/mysqldump.test@1.76.1.16, 2006-06-23 00:32:36+02:00, tnurnberg@mysql.com +1 -1
    call my_print_defaults with our setup only, do not include the systemwide
    my.cnf as that would make the results unpredictable.

ChangeSet@1.2181.78.3, 2006-06-22 23:42:11+02:00, jmiller@mysql.com +1 -0
  disabled.def:
    Enabled rpl_ndb_auto_inc per Tomas and Lars

  mysql-test/t/disabled.def@1.168.1.1, 2006-06-22 23:40:44+02:00, jmiller@mysql.com +0 -1
    Enabled rpl_ndb_auto_inc per Tomas and Lars

ChangeSet@1.2181.80.1, 2006-06-22 22:44:21+03:00, monty@mysql.com +10 -0
  Fixed failure with rpl_truncate_7ndb.test when using statement based replication.
  is_injective -> table_flag() HA_HAS_OWN_BINLOGGING
  (Faster and easier to understand)
  Allow cluster_binlogging also in mixed replication mode.

  mysql-test/include/have_binlog_format_mixed_or_row.inc@1.1, 2006-06-22 22:44:17+03:00, monty@mysql.com +5 -0
    New BitKeeper file ``mysql-test/include/have_binlog_format_mixed_or_row.inc''

  mysql-test/include/have_binlog_format_mixed_or_row.inc@1.0, 2006-06-22 22:44:17+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.1/mysql-test/include/have_binlog_format_mixed_or_row.inc

  mysql-test/r/rpl_truncate_7ndb_2.result@1.1, 2006-06-22 22:44:17+03:00, monty@mysql.com +91 -0
    New BitKeeper file ``mysql-test/r/rpl_truncate_7ndb_2.result''

  mysql-test/r/rpl_truncate_7ndb_2.result@1.0, 2006-06-22 22:44:17+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.1/mysql-test/r/rpl_truncate_7ndb_2.result

  mysql-test/t/rpl_truncate_7ndb.test@1.5, 2006-06-22 22:44:17+03:00, monty@mysql.com +1 -0
    Ensure that test is only run with mixed or row based replication

  mysql-test/t/rpl_truncate_7ndb_2-master.opt@1.1, 2006-06-22 22:44:17+03:00, monty@mysql.com +1 -0
    New BitKeeper file ``mysql-test/t/rpl_truncate_7ndb_2-master.opt''

  mysql-test/t/rpl_truncate_7ndb_2-master.opt@1.0, 2006-06-22 22:44:17+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.1/mysql-test/t/rpl_truncate_7ndb_2-master.opt

  mysql-test/t/rpl_truncate_7ndb_2.test@1.1, 2006-06-22 22:44:18+03:00, monty@mysql.com +6 -0
    New BitKeeper file ``mysql-test/t/rpl_truncate_7ndb_2.test''

  mysql-test/t/rpl_truncate_7ndb_2.test@1.0, 2006-06-22 22:44:18+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.1/mysql-test/t/rpl_truncate_7ndb_2.test

  sql/ha_ndbcluster.cc@1.330.1.2, 2006-06-22 22:44:17+03:00, monty@mysql.com +6 -2
    Enforce row based replication if a cluster table is used

  sql/ha_ndbcluster.h@1.139.1.3, 2006-06-22 22:44:17+03:00, monty@mysql.com +0 -2
    Remove is_injective() (Is now a table flag)

  sql/ha_ndbcluster_binlog.cc@1.68, 2006-06-22 22:44:17+03:00, monty@mysql.com +3 -1
    Use cluster binlogging also in mixed binary logging
    (Using a cluster table will enforce row based replication in mixed mode, so this should be ok)

  sql/handler.cc@1.242.1.1, 2006-06-22 22:44:17+03:00, monty@mysql.com +1 -1
    is_injective -> HA_HAS_OWN_BINLOGGING

  sql/handler.h@1.217.1.1, 2006-06-22 22:44:17+03:00, monty@mysql.com +2 -6
    is_injective -> HA_HAS_OWN_BINLOGGING

ChangeSet@1.1810.1832.1, 2006-06-22 20:50:38+02:00, tnurnberg@mysql.com +4 -0
  #19409: Test 'func_timestamp' fails on Windows x64
  - The setting of "ENV{'TZ'}" doesn't affect the timezone
    used by MySQL Server on Windows.
  - Explicitly set timezone in test cases before doing UTC/localtime
    conversions so tests produce deterministic results

  mysql-test/r/func_timestamp.result@1.4, 2006-06-22 20:50:25+02:00, tnurnberg@mysql.com +2 -0
    Update test results

  mysql-test/r/type_timestamp.result@1.28.2.1, 2006-06-22 20:50:25+02:00, tnurnberg@mysql.com +2 -0
    Update test results

  mysql-test/t/func_timestamp.test@1.6, 2006-06-22 20:50:25+02:00, tnurnberg@mysql.com +6 -0
    Specifically set timezone to make tests that do localtime/UTC conversions deterministic

  mysql-test/t/type_timestamp.test@1.26.1.1, 2006-06-22 20:50:25+02:00, tnurnberg@mysql.com +6 -0
    Specifically set timezone to make tests that do localtime/UTC conversions deterministic

ChangeSet@1.1810.1819.9, 2006-06-22 20:23:22+02:00, tnurnberg@mysql.com +2 -0
  Bug#19408 Test 'func_time' fails on Windows x64
  - The setting of "ENV{'TZ'}" doesn't affect the timezone
    used by MySQL Server on Windows.
  - Explicitly set timezone to "+03:00" in test case before
    doing the calculatiosn to check that there is three hours
    difference between utc and local time.
  (Magnus' fix)

  mysql-test/r/func_time.result@1.47.1.9, 2006-06-22 20:23:16+02:00, tnurnberg@mysql.com +2 -0
    Update test results

  mysql-test/t/func_time.test@1.41.1.5, 2006-06-22 20:23:16+02:00, tnurnberg@mysql.com +7 -0
    Set timezone to GMT-3, to make it possible to use "interval 3 hour"

ChangeSet@1.2181.30.2, 2006-06-22 19:26:15+02:00, pekka@clam.ndb.mysql.com +7 -0
  ndb - bug#18781 post-merge 5.0->5.1 fixes (one more to come)
        have to push this to be able to push 5.0

  storage/ndb/include/kernel/signaldata/DictLock.hpp@1.4, 2006-06-15 15:30:31+02:00, pekka@clam.ndb.mysql.com +0 -0
    Rename: ndb/include/kernel/signaldata/DictLock.hpp -> storage/ndb/include/kernel/signaldata/DictLock.hpp

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp@1.33, 2006-06-22 19:21:59+02:00, pekka@clam.ndb.mysql.com +1 -0
    debug

  storage/ndb/src/kernel/blocks/dbdict/DictLock.txt@1.3, 2006-06-15 15:31:14+02:00, pekka@clam.ndb.mysql.com +0 -0
    Rename: ndb/src/kernel/blocks/dbdict/DictLock.txt -> storage/ndb/src/kernel/blocks/dbdict/DictLock.txt

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.65, 2006-06-22 19:24:16+02:00, pekka@clam.ndb.mysql.com +11 -7
    bug#18781 post-merge 5.0->5.1 fixes (one more to come)

  storage/ndb/src/ndbapi/ndberror.c@1.63, 2006-06-22 19:24:17+02:00, pekka@clam.ndb.mysql.com +1 -0
    bug#18781 post-merge 5.0->5.1 fixes (one more to come)

  storage/ndb/test/ndbapi/testDict.cpp@1.29, 2006-06-22 19:24:17+02:00, pekka@clam.ndb.mysql.com +6 -3
    bug#18781 post-merge 5.0->5.1 fixes (one more to come)

  storage/ndb/test/src/NdbRestarter.cpp@1.14, 2006-06-22 19:24:17+02:00, pekka@clam.ndb.mysql.com +4 -1
    bug#18781 post-merge 5.0->5.1 fixes (one more to come)

ChangeSet@1.1616.2652.1, 2006-06-22 22:11:27+05:00, holyfoot@deer.(none) +3 -0
  bug #10166 (Signed byte values cause data to be padded)
  
  The AsBinary function returns VARCHAR data type with binary collation.
  It can cause problem for clients that treat that kind of data as
  different from BLOB type.
  So now AsBinary returns BLOB.

  mysql-test/r/gis.result@1.15.1.7, 2006-06-22 22:10:40+05:00, holyfoot@mysql.com +10 -0
    result fixed

  mysql-test/t/gis.test@1.17.1.3, 2006-06-22 22:10:40+05:00, holyfoot@mysql.com +7 -0
    test case added

  sql/item_geofunc.h@1.8.1.2, 2006-06-22 22:10:40+05:00, holyfoot@mysql.com +2 -0
    Now we return MYSQL_TYPE_BLOB for asBinary function

ChangeSet@1.1810.1817.2, 2006-06-22 19:29:48+04:00, konstantin@mysql.com +3 -0
  A fix and a test case for Bug#15217 "Using a SP cursor on a table created
   with PREPARE fails with weird error".
  More generally, re-executing a stored procedure with a complex SP cursor query
  could lead to a crash.
  
  The cause of the problem was that SP cursor queries were not optimized 
  properly at first execution: their parse tree belongs to sp_instr_cpush,
  not sp_instr_copen, and thus the tree was tagged "EXECUTED" when the
  cursor was declared, not when it was opened. This led to loss of optimization
  transformations performed at first execution, as sp_instr_copen saw that the
  query is already "EXECUTED" and therefore either not ran first-execution 
  related blocks or wrongly rolled back the transformations caused by 
  first-execution code.
  The fix is to update the state of the parsed tree only when the tree is
  executed, as opposed to when the instruction containing the tree is executed.
  Assignment if i->state is moved to reset_lex_and_exec_core.

  mysql-test/r/sp.result@1.170.1.31, 2006-06-22 19:29:44+04:00, konstantin@mysql.com +21 -0
    Test results fixed (Bug#15217)

  mysql-test/t/sp.test@1.174.1.15, 2006-06-22 19:29:45+04:00, konstantin@mysql.com +27 -0
    Add a test case for Bug#15217

  sql/sp_head.cc@1.200.5.1, 2006-06-22 19:29:45+04:00, konstantin@mysql.com +3 -1
    Move assignment of stmt_arena->state to reset_lex_and_exec_core

ChangeSet@1.1810.1831.1, 2006-06-22 19:15:03+04:00, kroki@mysql.com +1 -0
  Bug#15811: extremely long time for mysql client to execute long INSERT
  
  The problem was in redundant calls to strlen() in string functions,
  where we may then return after checking only the small number of characters.
  
  No test case is provided since it's a performance fix.

  strings/ctype-mb.c@1.47.2.1, 2006-06-22 19:14:57+04:00, kroki@mysql.com +12 -8
    Do not use strlen() where arbitrary horizon of at least
    CHARSET_INFO::mbmaxlen character is sufficient.

ChangeSet@1.2181.76.1, 2006-06-22 18:56:22+04:00, anozdrin@mysql.com +3 -0
  Additional fix for BUG#20294: Instance manager test
  im_instance_conf fails randomly.

  mysql-test/r/im_options.result@1.3, 2006-06-22 18:56:19+04:00, anozdrin@mysql.com +6 -1
    Updated result file.

  mysql-test/t/im_instance_conf.imtest@1.3, 2006-06-22 18:56:19+04:00, anozdrin@mysql.com +3 -0
    Added a note about specific of CREATE INSTANCE usage in IM-tests.

  mysql-test/t/im_options.imtest@1.2, 2006-06-22 18:56:19+04:00, anozdrin@mysql.com +8 -2
    1. Specify socket-file-name for new instance so that the test
       does not depend on another running test-suite on the same box.
    2. Added a note about specific of CREATE INSTANCE usage in IM-tests.

ChangeSet@1.2181.75.1, 2006-06-22 10:46:02-04:00, mikael@dator5.(none) +3 -0
  BUG#20583: index_last causes crash when performed on single partition

  mysql-test/r/partition.result@1.38.7.1, 2006-06-22 10:45:58-04:00, mikael@dator5.(none) +8 -0
    New test case

  mysql-test/t/partition.test@1.40.7.1, 2006-06-22 10:45:58-04:00, mikael@dator5.(none) +9 -0
    New test case

  sql/ha_partition.cc@1.58.1.1, 2006-06-22 10:45:58-04:00, mikael@dator5.(none) +2 -1
    Ensure index_last always uses ordered index scan

ChangeSet@1.2181.74.1, 2006-06-22 16:42:50+02:00, knielsen@mysql.com +2 -0
  BUG#20549: Fix missing memory initialization.
  
  Some values were not initialized, causing Valgrind errors (and potential
  random bugs):
  
   - NDB binlog thread thd->variables.pseudo_thread_id.
   - Table null bits.
   - Field bytes for columns with NULL values.

  sql/ha_ndbcluster_binlog.cc@1.65.1.1, 2006-06-22 16:42:43+02:00, knielsen@mysql.com +18 -3
    Fix initialization of thd->variables.pseudo_thread_id.
    Change double alloc_root() call to multi_alloc_root().
    Fix missing initialization of null bits.

  sql/sql_class.cc@1.265.2.1, 2006-06-22 16:42:44+02:00, knielsen@mysql.com +6 -2
    Do not read from the supplied record for NULL values, use the default
    value record instead.
    Otherwise we will get Valgrind errors about uninitialised values written
    to binlog, as NDB does not initialize the memory in records for NULL
    fields.

ChangeSet@1.1810.1829.2, 2006-06-22 19:40:59+05:00, bar@mysql.com +2 -0
  Additional test for Bugs#20392: INSERT_ID session variable has weird value
  sys_var_insert_id returned LAST_INSERT_ID instead of INSERT_ID,
  as Guilhem suggested.

  mysql-test/r/variables.result@1.76.1.10, 2006-06-22 19:40:49+05:00, bar@mysql.com +10 -0
    Additional test

  mysql-test/t/variables.test@1.51.1.11, 2006-06-22 19:40:50+05:00, bar@mysql.com +6 -0
    Additional test

ChangeSet@1.2181.72.1, 2006-06-22 19:20:29+05:00, gluh@eagle.intranet.mysql.r18.ru +2 -0
  test fix(to satisfy Win)

  mysql-test/r/log_state.result@1.2, 2006-06-22 19:20:22+05:00, gluh@mysql.com +11 -11
    result fix(to satisfy Win)

  mysql-test/t/log_state.test@1.2, 2006-06-22 19:20:22+05:00, gluh@mysql.com +8 -8
    test fix(to satisfy Win)

ChangeSet@1.2181.71.1, 2006-06-22 16:13:18+02:00, andrey@lmy004. +2 -0
  fix for bug#20624: events_logs_tests.test fails randomly
  (this is a change to a faulty test file)

  mysql-test/r/events_logs_tests.result@1.10, 2006-06-22 16:13:09+02:00, andrey@lmy004. +10 -3
    update result

  mysql-test/t/events_logs_tests.test@1.9, 2006-06-22 16:13:10+02:00, andrey@lmy004. +10 -3
    fix the test file, so TRUNCATE should not land into the slow_log
    This happens on loaded machines, for example when running few suites
    in parallel.
    fix for bug #20624: events_logs_tests.test fails randomly

ChangeSet@1.1810.1829.1, 2006-06-22 19:10:11+05:00, bar@mysql.com +3 -0
  Bugs#20392: INSERT_ID session variable has weird value
  sys_var_insert_id returned LAST_INSERT_ID instead of INSERT_ID.

  mysql-test/r/variables.result@1.76.1.9, 2006-06-22 19:10:00+05:00, bar@mysql.com +12 -0
    Adding test case

  mysql-test/t/variables.test@1.51.1.10, 2006-06-22 19:10:00+05:00, bar@mysql.com +10 -0
    Adding test case

  sql/set_var.cc@1.125.5.14, 2006-06-22 19:10:00+05:00, bar@mysql.com +1 -1
    Fixed that sys_var_insert_id returned last_indert_id instead of insert_id.

ChangeSet@1.2181.66.2, 2006-06-22 10:01:30-04:00, mikael@dator5.(none) +3 -0
  BUG#17138: Stored procedure error
  Review fixes

  mysql-test/r/partition.result@1.38.2.9, 2006-06-22 10:01:25-04:00, mikael@dator5.(none) +4 -2
    Review fixes

  mysql-test/t/partition.test@1.40.1.9, 2006-06-22 10:01:25-04:00, mikael@dator5.(none) +3 -1
    Review fixes

  sql/sql_insert.cc@1.204.1.2, 2006-06-22 10:01:25-04:00, mikael@dator5.(none) +7 -2
    Fixed a bug

ChangeSet@1.2181.58.8, 2006-06-22 15:16:33+02:00, jonas@perch.ndb.mysql.com +5 -0
  ndb - bug#18782
    crash correct node in case of START_FRAGREF

  storage/ndb/include/kernel/signaldata/SystemError.hpp@1.5, 2006-06-22 15:16:30+02:00, jonas@perch.ndb.mysql.com +2 -1
    Add error code

  storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.17.1.1, 2006-06-22 15:16:30+02:00, jonas@perch.ndb.mysql.com +1 -0
    Add error code

  storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp@1.13.1.1, 2006-06-22 15:16:30+02:00, jonas@perch.ndb.mysql.com +3 -0
    Add error code

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.63.2.2, 2006-06-22 15:16:30+02:00, jonas@perch.ndb.mysql.com +20 -0
    Add error code

  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@1.35, 2006-06-22 15:16:30+02:00, jonas@perch.ndb.mysql.com +7 -0
    Add error code

ChangeSet@1.2181.58.7, 2006-06-22 14:57:43+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - bug#20008
    no DD when diskless

  storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp@1.3, 2006-06-22 14:57:40+02:00, jonas@perch.ndb.mysql.com +2 -1
    New error code for create file when diskless

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.87.2.3, 2006-06-22 14:57:40+02:00, jonas@perch.ndb.mysql.com +11 -0
    New error code for create file when diskless

  storage/ndb/src/ndbapi/ndberror.c@1.61.3.1, 2006-06-22 14:57:40+02:00, jonas@perch.ndb.mysql.com +1 -0
    New error code for create file when diskless

ChangeSet@1.1810.1808.5, 2006-06-22 14:28:05+02:00, joerg@mysql.com +3 -0
  Improved fix for bug#18516 (also 19353):
  1) Rename the old shell tool "mysql_upgrade", to avoid a name collision.
  2) Improve the spec file, to explicitly use a temporary socket.

  scripts/mysql_upgrade_shell.sh@1.3.1.1, 2006-06-22 14:13:00+02:00, joerg@mysql.com +0 -0
    Rename: scripts/mysql_upgrade.sh -> scripts/mysql_upgrade_shell.sh

  scripts/Makefile.am@1.43.1.8, 2006-06-22 14:27:53+02:00, joerg@mysql.com +3 -3
    The old shell script "mysql_upgrade" must be renamed, 
    so that its name does not collide with the new binary.

  support-files/mysql.spec.sh@1.99.1.42, 2006-06-22 14:27:53+02:00, joerg@mysql.com +18 -4
    The previous version was incomplete, as it did not cover the case
    where the DBA had configured a non-default socket file.
    Solve that by creating and explicitly providing a temporary directory
    for the socket just for the duration of "mysql_upgrade", which also
    can be better protected than the default socket.

ChangeSet@1.2181.58.6, 2006-06-22 13:53:02+02:00, jonas@perch.ndb.mysql.com +2 -0
  fix result file for ndb_dd_ddl

  mysql-test/r/ndb_dd_ddl.result@1.11, 2006-06-22 13:52:58+02:00, jonas@perch.ndb.mysql.com +2 -2
    fix so that result file is not dependant on local filesystem

  mysql-test/t/ndb_dd_ddl.test@1.10, 2006-06-22 13:52:58+02:00, jonas@perch.ndb.mysql.com +2 -0
    fix so that result file is not dependant on local filesystem

ChangeSet@1.2181.68.1, 2006-06-22 13:28:04+02:00, mats@mysql.com +3 -0
  Patch to handle some bad situations resulting from the fix for BUG#19995.

  sql/handler.cc@1.243, 2006-06-22 13:27:42+02:00, mats@mysql.com +28 -26
    Generating table maps from all locks that can be available: THD::extra_lock,
    THD::lock, and THD::locked_tables.

  sql/sql_class.h@1.300.2.1, 2006-06-22 13:27:43+02:00, mats@mysql.com +9 -4
    Adding member Open_tables:state::extra_lock to hold the extra lock used by select_create.
    Removing select_insert::lock.

  sql/sql_insert.cc@1.204.2.1, 2006-06-22 13:27:43+02:00, mats@mysql.com +9 -35
    Adding member Open_tables:state::extra_lock to hold the extra lock used by select_create.
    Removing select_insert::lock.

ChangeSet@1.2181.40.18, 2006-06-22 13:01:08+02:00, andrey@lmy004. +6 -0
  fix for bug#16992 (Events: Information_schema troubles)
  Introduced EVENTS.EVENT_DEFINITION, like ROUTINES.ROUTINE_DEFINITION
  Hence, the contents of the current EVENTS.EVENT_BODY become the contents
  of EVENT_DEFINITION. EVENT_BODY will contain always, for now, "SQL" (wo
  quotes).

  mysql-test/r/events.result@1.36, 2006-06-22 13:00:59+02:00, andrey@lmy004. +6 -6
    update result
    event_body -> event_definition
    event_body -> SQL

  mysql-test/r/events_grant.result@1.2, 2006-06-22 13:00:59+02:00, andrey@lmy004. +39 -39
    update result
    event_body -> event_definition
    event_body -> SQL

  mysql-test/r/information_schema.result@1.124.1.1, 2006-06-22 13:00:59+02:00, andrey@lmy004. +1 -1
    update result
    event_body -> event_definition

  mysql-test/t/events.test@1.31, 2006-06-22 13:01:00+02:00, andrey@lmy004. +3 -3
    update result
    event_body -> event_definition
    event_body -> SQL

  mysql-test/t/events_grant.test@1.2, 2006-06-22 13:01:00+02:00, andrey@lmy004. +9 -9
    update result
    event_body -> event_definition
    event_body -> SQL

  sql/sql_show.cc@1.347.1.7, 2006-06-22 13:01:00+02:00, andrey@lmy004. +74 -31
    Introduce enum_i_s_events_fields, because I hate recounting
    all the time a field is changed.
    Rename EVENT_BODY to EVENT_DEFINITION
    Introduce EVENT_BODY after that to be "SQL"
    (final fix for bug#16992 Events: Information schema troubles ) ?

ChangeSet@1.1616.2550.9, 2006-06-22 12:03:28+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#19164
    set max value on ports

  ndb/src/mgmsrv/ConfigInfo.cpp@1.50.2.13, 2006-06-22 12:03:26+02:00, jonas@perch.ndb.mysql.com +7 -6
    set max vlue on ports

ChangeSet@1.2181.58.5, 2006-06-22 10:24:44+02:00, jonas@perch.ndb.mysql.com +9 -0
  ndb - bug#16341
    create tablespace/logfile group should "back out changes"

  mysql-test/r/ndb_dd_ddl.result@1.10, 2006-06-22 10:24:40+02:00, jonas@perch.ndb.mysql.com +37 -21
    add testcase for bug#16341

  mysql-test/t/ndb_dd_ddl.test@1.9, 2006-06-22 10:24:40+02:00, jonas@perch.ndb.mysql.com +47 -22
    add testcase for bug#16341

  sql/ha_ndbcluster.cc@1.319.3.1, 2006-06-22 10:24:40+02:00, jonas@perch.ndb.mysql.com +27 -6
    If create data/undo file fails, check if filegroup is same version, and if it is drop it (wo/ checking error)

  storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp@1.2, 2006-06-22 10:24:40+02:00, jonas@perch.ndb.mysql.com +1 -0
    add version to createfileconf

  storage/ndb/include/ndbapi/NdbDictionary.hpp@1.78, 2006-06-22 10:24:40+02:00, jonas@perch.ndb.mysql.com +29 -4
    Add NdbDictionary::ObjectId, that can be used to get [ id, version ] during create (only for DD object so far)

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.87.2.2, 2006-06-22 10:24:40+02:00, jonas@perch.ndb.mysql.com +2 -1
    add version to createfileconf

  storage/ndb/src/ndbapi/NdbDictionary.cpp@1.59, 2006-06-22 10:24:40+02:00, jonas@perch.ndb.mysql.com +68 -17
    Add NdbDictionary::ObjectId, that can be used to get [ id, version ] during create (only for DD object so far)

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.140.1.1, 2006-06-22 10:24:40+02:00, jonas@perch.ndb.mysql.com +80 -29
    Add NdbDictionary::ObjectId, that can be used to get [ id, version ] during create (only for DD object so far)

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp@1.60.1.1, 2006-06-22 10:24:40+02:00, jonas@perch.ndb.mysql.com +10 -7
    Add NdbDictionary::ObjectId, that can be used to get [ id, version ] during create (only for DD object so far)

ChangeSet@1.1810.1698.71, 2006-06-22 00:08:32-07:00, igor@rurik.mysql.com +1 -0
  Post-merge fix.

  strings/ctype-mb.c@1.47.1.2, 2006-06-22 00:08:26-07:00, igor@rurik.mysql.com +1 -6
    Post-merge fix.

ChangeSet@1.1616.2650.5, 2006-06-21 22:39:48-07:00, igor@rurik.mysql.com +2 -0
  Modified the test case for bug 16674 to have the same
  execution plans in 4.1 and 5.0.

  mysql-test/r/ctype_utf8.result@1.45.6.3, 2006-06-21 22:39:43-07:00, igor@rurik.mysql.com +10 -4
    Modified the test case for bug 16674 to have the same
    execution plans in 4.1 and 5.0. 

  mysql-test/t/ctype_utf8.test@1.57.6.3, 2006-06-21 22:39:43-07:00, igor@rurik.mysql.com +2 -0
    Modified the test case for bug 16674 to have the same
    execution plans in 4.1 and 5.0.

ChangeSet@1.1810.1752.4, 2006-06-21 20:27:52-07:00, acurtis@xiphis.org +1 -0
  traditional grep does not have -q option

  config/ac-macros/compiler_flag.m4@1.4, 2006-06-21 20:27:48-07:00, acurtis@xiphis.org +1 -1
    traditional grep does not have -q option

ChangeSet@1.2181.57.2, 2006-06-21 20:55:33-04:00, mikael@dator5.(none) +11 -0
  BUG#17138: Error in stored procedure
  Review comments

  mysql-test/t/partition.test@1.40.1.8, 2006-06-21 20:55:27-04:00, mikael@dator5.(none) +6 -2
    Changed procedure names ensured procedures were dropped

  sql/ha_ndbcluster.h@1.141, 2006-06-21 20:55:27-04:00, mikael@dator5.(none) +2 -2
    Improved name of method

  sql/ha_partition.h@1.21, 2006-06-21 20:55:27-04:00, mikael@dator5.(none) +2 -2
    Improved name of method

  sql/handler.h@1.220, 2006-06-21 20:55:27-04:00, mikael@dator5.(none) +1 -6
    Improved name of method
    Removed deprecated constants

  sql/item_sum.cc@1.182, 2006-06-21 20:55:27-04:00, mikael@dator5.(none) +1 -1
    Improved name of method

  sql/sql_acl.cc@1.198, 2006-06-21 20:55:27-04:00, mikael@dator5.(none) +4 -4
    Improved name of method

  sql/sql_insert.cc@1.198.1.8, 2006-06-21 20:55:27-04:00, mikael@dator5.(none) +7 -6
    Removed use of HA_WRITE_SKIP and introduced is_fatal_error instead

  sql/sql_select.cc@1.413.1.2, 2006-06-21 20:55:27-04:00, mikael@dator5.(none) +2 -2
    Improved name of method

  sql/sql_table.cc@1.348.1.2, 2006-06-21 20:55:28-04:00, mikael@dator5.(none) +3 -2
    Improved name of method
    Reintroduced dead code for future possible use

  sql/sql_union.cc@1.135, 2006-06-21 20:55:28-04:00, mikael@dator5.(none) +1 -1
    Improved name of method

  sql/sql_update.cc@1.195, 2006-06-21 20:55:28-04:00, mikael@dator5.(none) +6 -6
    Improved name of method

ChangeSet@1.2181.65.2, 2006-06-21 19:08:30-04:00, mikael@dator5.(none) +1 -0
  mmanual merge

  mysql-test/r/partition.result@1.38.6.2, 2006-06-21 19:08:25-04:00, mikael@dator5.(none) +7 -0
    mmanual merge

ChangeSet@1.1616.2651.2, 2006-06-22 00:29:04+04:00, evgen@moonbone.local +3 -0
  Fixed bug #14896.
  This bug in Field_string::cmp resulted in a wrong comparison 
  with keys in partial indexes over multi-byte character fields.
  Given field a is declared as a varchar(16) collate utf8_unicode_ci
  INDEX(a(4)) gives us an example of such an index.
    
  Wrong key comparisons could lead to wrong result sets if 
  the selected query execution plan used a range scan by 
  a partial index over a utf8 character field.
  This also caused wrong results in many other cases.

  mysql-test/r/ctype_utf8.result@1.45.7.1, 2006-06-22 00:12:27+04:00, evgen@moonbone.local +40 -0
    Added test cases for bug #14896.

  mysql-test/t/ctype_utf8.test@1.57.7.1, 2006-06-22 00:11:55+04:00, evgen@moonbone.local +26 -0
    Added test cases for bug #14896.

  sql/field.cc@1.197.13.1, 2006-06-22 00:12:40+04:00, evgen@moonbone.local +7 -13
    Fixed bug #14896.
    This bug in Field_string::cmp resulted in a wrong comparison 
    with keys in partial indexes over multi-byte character fields.
    Given field a is declared as a varchar(16) collate utf8_unicode_ci
    INDEX(a(4)) gives us an example of such an index.
         
    Wrong key comparisons could lead to wrong result sets if 
    the selected query execution plan used a range scan by 
    a partial index over a utf8 character field.
    This also caused wrong results in many other cases.  

ChangeSet@1.1810.1818.2, 2006-06-21 18:35:19+03:00, jani@ua141d10.elisa.omakaista.fi +3 -0
  Cleanup to patch for Bug#18246, "compilation error with tcp_wrapper"

  include/my_libwrap.h@1.2, 2006-06-21 18:35:14+03:00, jani@ua141d10.elisa.omakaista.fi +9 -0
    Changed includes to the header file.

  mysys/my_libwrap.c@1.2, 2006-06-21 18:35:14+03:00, jani@ua141d10.elisa.omakaista.fi +9 -6
    Added comment and .c file now takes needed includes from
    the corresponding .h file.

  sql/mysqld.cc@1.439.1.118, 2006-06-21 18:35:14+03:00, jani@ua141d10.elisa.omakaista.fi +3 -10
    Include this block from my_libwra.h now.
    Moved two variables out of the otherwise
    same block.

ChangeSet@1.2181.38.5, 2006-06-21 18:27:45+03:00, monty@mysql.com +4 -0
  Change table_id's to # to make tests portable

  mysql-test/extra/rpl_tests/rpl_log.test@1.37.2.1, 2006-06-21 18:27:41+03:00, monty@mysql.com +1 -0
    Change table_id's to # to make test portable

  mysql-test/r/rpl_ndb_log.result@1.11.1.1, 2006-06-21 18:27:41+03:00, monty@mysql.com +2 -2
    Update test result to use table_id: #

  mysql-test/r/rpl_row_log.result@1.9.1.1, 2006-06-21 18:27:41+03:00, monty@mysql.com +2 -2
    Update test result to use table_id: #

  mysql-test/r/rpl_row_log_innodb.result@1.9.1.1, 2006-06-21 18:27:41+03:00, monty@mysql.com +2 -2
    Update test result to use table_id: #

ChangeSet@1.2181.64.2, 2006-06-21 17:17:12+02:00, pekka@clam.ndb.mysql.com +1 -0
  ndb - add test_event_merge to daily-devel-tests.txt

  storage/ndb/test/run-test/daily-devel-tests.txt@1.29, 2006-06-21 17:16:15+02:00, pekka@clam.ndb.mysql.com +10 -0
    test_event_merge

ChangeSet@1.2181.54.4, 2006-06-21 10:57:30-04:00, mikael@dator5.(none) +4 -0
  BUG#19309: Problem with calling proecdures twice
  Need to flag when a copy is needed to not overwrite a create_info
  object connected to the lex structure

  sql/mysql_priv.h@1.410.3.1, 2006-06-21 10:57:25-04:00, mikael@dator5.(none) +2 -1
    Need to flag when a copy is needed to not overwrite a create_info
    object connected to the lex structure

  sql/sql_insert.cc@1.198.8.1, 2006-06-21 10:57:25-04:00, mikael@dator5.(none) +1 -1
    Need to flag when a copy is needed to not overwrite a create_info
    object connected to the lex structure

  sql/sql_parse.cc@1.559.3.1, 2006-06-21 10:57:26-04:00, mikael@dator5.(none) +1 -1
    Need to flag when a copy is needed to not overwrite a create_info
    object connected to the lex structure

  sql/sql_table.cc@1.348.2.2, 2006-06-21 10:57:26-04:00, mikael@dator5.(none) +27 -8
    Need to flag when a copy is needed to not overwrite a create_info
    object connected to the lex structure

ChangeSet@1.1616.2651.1, 2006-06-21 16:41:07+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  added missing MYSQLTEST_VARDIR declaration

  mysql-test/mysql-test-run.sh@1.208.1.59, 2006-06-21 16:41:03+02:00, tomas@poseidon.ndb.mysql.com +2 -1
    added missing MYSQLTEST_VARDIR declaration

ChangeSet@1.2181.64.1, 2006-06-21 16:15:04+02:00, pekka@clam.ndb.mysql.com +3 -0
  ndb - bug#18102: fixes on NDB API level

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.62, 2006-06-21 16:13:20+02:00, pekka@clam.ndb.mysql.com +21 -23
    fix getGCIEventOperations when merge events is on

  storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp@1.25, 2006-06-21 16:13:21+02:00, pekka@clam.ndb.mysql.com +1 -3
    fix getGCIEventOperations when merge events is on

  storage/ndb/test/ndbapi/test_event_merge.cpp@1.12, 2006-06-21 16:11:52+02:00, pekka@clam.ndb.mysql.com +754 -327
    test multiple tables and getGCIEventOperations

ChangeSet@1.2181.58.4, 2006-06-21 16:01:23+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#19275
    make sure tablename is release in case of alter table

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.87.2.1, 2006-06-21 16:01:20+02:00, jonas@perch.ndb.mysql.com +27 -8
    make sure tablename is release in case of alter table

ChangeSet@1.2181.39.5, 2006-06-21 15:30:26+02:00, lars@mysql.com +1 -0
  After merge fix

  mysql-test/r/mysqldump.result@1.110, 2006-06-21 15:30:14+02:00, lars@mysql.com +1 -1
    After merge fix

ChangeSet@1.2181.63.1, 2006-06-21 18:16:07+05:00, ramil@mysql.com +4 -0
  Fix for bug #20601: rpl_ndb_log.test failure

  mysql-test/extra/rpl_tests/rpl_log.test@1.37.1.3, 2006-06-21 18:15:59+05:00, ramil@mysql.com +1 -0
    Fix for bug #20601: rpl_ndb_log.test failure
      - replace insignificant columns to make tests repeatable

  mysql-test/r/rpl_ndb_log.result@1.12, 2006-06-21 18:15:59+05:00, ramil@mysql.com +2 -2
    Fix for bug #20601: rpl_ndb_log.test failure
      - result adjusted

  mysql-test/r/rpl_row_log.result@1.10, 2006-06-21 18:15:59+05:00, ramil@mysql.com +2 -2
    Fix for bug #20601: rpl_ndb_log.test failure
      - result adjusted

  mysql-test/r/rpl_row_log_innodb.result@1.10, 2006-06-21 18:15:59+05:00, ramil@mysql.com +2 -2
    Fix for bug #20601: rpl_ndb_log.test failure
      - result adjusted

ChangeSet@1.1616.2649.1, 2006-06-21 17:30:59+05:00, svoj@may.pils.ru +3 -0
  BUG#20357 - Got error 124 from storage engine using MIN and MAX
              functions in queries
  
  Using MAX()/MIN() on table with disabled indexes (by ALTER TABLE)
  results in error 124 (wrong index) from storage engine.
  
  The problem was that optimizer use disabled index to optimize
  MAX()/MIN(). Normally it must skip disabled index and perform
  table scan.
  
  This patch skips disabled indexes for min/max optimization.

  mysql-test/r/myisam.result@1.45.2.1, 2006-06-21 17:30:54+05:00, svoj@may.pils.ru +13 -0
    Test case for BUG#20357.

  mysql-test/t/myisam.test@1.33.4.1, 2006-06-21 17:30:55+05:00, svoj@may.pils.ru +12 -0
    Test case for BUG#20357.

  sql/opt_sum.cc@1.33.5.1, 2006-06-21 17:30:55+05:00, svoj@may.pils.ru +6 -0
    Skip disabled/ignored indexes for min/max optimization.

ChangeSet@1.2181.51.3, 2006-06-21 16:02:51+04:00, anozdrin@mysql.com +3 -0
  Fix for BUG#20294: Instance manager test im_instance_conf
  fails randomly.
  
  The problem is that the test was affected by other running
  test-suites on the same box. The fix affects the test only,
  no code touched.

  mysql-test/r/im_instance_conf.result@1.3, 2006-06-21 16:02:48+04:00, anozdrin@mysql.com +56 -27
    Updated result file.

  mysql-test/t/disabled.def@1.165.2.1, 2006-06-21 16:02:48+04:00, anozdrin@mysql.com +3 -3
    Enable IM tests.

  mysql-test/t/im_instance_conf.imtest@1.2, 2006-06-21 16:02:48+04:00, anozdrin@mysql.com +37 -9
    Modify the test so that it does not depend on running
    test-suites on the same box.

ChangeSet@1.1616.2550.8, 2006-06-21 14:00:26+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#20197
    also close scan which are in "delivered" state, as it's impossible to release locks afterwards
  
    backport from 5.1

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.42.6.1, 2006-06-21 14:00:24+02:00, jonas@perch.ndb.mysql.com +12 -0
    ndb - bug#20197
      also close scan which are in "delivered" state, as it's impossible to release locks afterwards

ChangeSet@1.2181.58.2, 2006-06-21 13:39:04+02:00, jonas@perch.ndb.mysql.com +6 -0
  ndb - bug#20007
    varpages did not get freed on drop table

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.45, 2006-06-21 13:39:01+02:00, jonas@perch.ndb.mysql.com +3 -0
    Add continueb for freeing varpages

  storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp@1.29, 2006-06-21 13:39:01+02:00, jonas@perch.ndb.mysql.com +6 -0
    Add continueb for freeing varpages

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.26, 2006-06-21 13:39:01+02:00, jonas@perch.ndb.mysql.com +40 -1
    add dropping of varpages

  storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp@1.6, 2006-06-21 13:39:01+02:00, jonas@perch.ndb.mysql.com +5 -0
    Add continueb for freeing varpages

  storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp@1.3, 2006-06-21 13:39:01+02:00, jonas@perch.ndb.mysql.com +7 -0
    Add list of varpage chunks

  storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp@1.3, 2006-06-21 13:39:01+02:00, jonas@perch.ndb.mysql.com +8 -2
    Add list of varpage chunks

ChangeSet@1.1810.1824.1, 2006-06-21 12:52:59+02:00, knielsen@mysql.com +1 -0
  BUG#20578
  Backport Valgrind suppression from mysql-5.1:
  
  D 1.4 05/11/23 22:44:54+02:00 monty@mysql.com 5 4 12/0/154
  P mysql-test/valgrind.supp
  C Remove warning that may happens becasue threads dies in different order

  mysql-test/valgrind.supp@1.3.1.3, 2006-06-21 12:52:50+02:00, knielsen@mysql.com +12 -0
    Add suppression for Valgrind warning.

ChangeSet@1.2181.35.3, 2006-06-21 12:27:24+02:00, knielsen@mysql.com +1 -0
  BUG#20598
  Fix race between cleanup and thread kill at server shutdown that would
  sometimes prevent proper cleanup, leading to Valgrind warnings.

  sql/mysqld.cc@1.558.1.2, 2006-06-21 12:25:51+02:00, knielsen@mysql.com +1 -1
    Move logger cleanup to avoid races with thread kill.

ChangeSet@1.2181.38.3, 2006-06-21 13:24:06+03:00, monty@mysql.com +1 -0
  Fixed typo that was forgot in last changeset.

  sql/sql_parse.cc@1.559.1.4, 2006-06-21 13:24:02+03:00, monty@mysql.com +1 -1
    Fixed typo that was forgot in last changeset.

ChangeSet@1.1810.1698.66, 2006-06-21 13:01:00+03:00, gkodinov@mysql.com +2 -0
  manual merge

  mysql-test/r/view_grant.result@1.8.1.9, 2006-06-21 13:00:56+03:00, gkodinov@mysql.com +12 -12
    merged
    MERGE: 1.8.4.1

  mysql-test/t/view_grant.test@1.8.1.7, 2006-06-21 13:00:56+03:00, gkodinov@mysql.com +20 -21
    merged
    MERGE: 1.8.3.1

ChangeSet@1.2181.1.19, 2006-06-21 14:53:40+05:00, gluh@eagle.intranet.mysql.r18.ru +4 -0
  after merge fixes

  mysql-test/r/partition_error.result@1.8.1.1, 2006-06-21 14:51:18+05:00, gluh@mysql.com +2 -2
    result fix

  sql/log.cc@1.215.1.2, 2006-06-21 14:51:18+05:00, gluh@mysql.com +1 -1
    use open_slow_log() instead of open_query_log() for slow query log

  sql/log.h@1.12, 2006-06-21 14:51:18+05:00, gluh@mysql.com +4 -4
    after merge fix

  sql/set_var.cc@1.173.1.9, 2006-06-21 14:51:18+05:00, gluh@mysql.com +13 -2
    after merge fix
    use open_slow_log() instead of open_query_log() for slow query log

ChangeSet@1.1810.1744.21, 2006-06-21 12:12:46+03:00, gkodinov@mysql.com +5 -0
  Bug #20482: failure on Create join view with sources views/tables in different 
              schemas
  The function check_one_table_access() called to check access to tables in 
  SELECT/INSERT/UPDATE was doing additional checks/modifications that don't hold
  in the context of setup_tables_and_check_access().
  That's why the check_one_table() was split into two : the functionality needed by
  setup_tables_and_check_access() into check_single_table_access() and the rest of 
  the functionality stays in check_one_table_access() that is made to call the new
  check_single_table_access() function.

  mysql-test/r/view_grant.result@1.8.4.1, 2006-06-21 12:12:40+03:00, gkodinov@mysql.com +12 -0
    Bug #20482: failure on Create join view with sources views/tables in different 
                schemas
    - test suite for the bug

  mysql-test/t/view_grant.test@1.8.3.1, 2006-06-21 12:12:40+03:00, gkodinov@mysql.com +21 -0
    Bug #20482: failure on Create join view with sources views/tables in different 
                schemas
    - test suite for the bug

  sql/mysql_priv.h@1.290.1.104, 2006-06-21 12:12:40+03:00, gkodinov@mysql.com +2 -0
    Bug #20482: failure on Create join view with sources views/tables in different 
                schemas
    - check_one_table_access split into 2

  sql/sql_base.cc@1.235.58.2, 2006-06-21 12:12:40+03:00, gkodinov@mysql.com +1 -1
    Bug #20482: failure on Create join view with sources views/tables in different 
                schemas
    - the new sub-function called

  sql/sql_parse.cc@1.426.86.2, 2006-06-21 12:12:40+03:00, gkodinov@mysql.com +31 -9
    Bug #20482: failure on Create join view with sources views/tables in different 
                schemas
    - check_one_table_access() split into two : check_single_table_access() to 
      actually check access to the table(ro) and check_one_table_access() that calls
      check_single_table_access() and checks also the tables belonging to sub selects
      or implicitly opened tables.
      

ChangeSet@1.2181.61.1, 2006-06-21 13:00:19+05:00, bar@mysql.com +7 -0
  Bug#20086: Can't get data from key partitioned tables with VARCHAR key
  The problem appeared because the same values produced different hash
  during INSERT and SELECT for VARCHAR data type.
  Fix:
  VARCHAR required special treatment to avoid hashing of length bytes
  (leftmost one or two bytes) as well as trailing bytes beyond real length,
  which could contain garbage. Fix is done by introducing hash() - new method
  in the Field class.

  mysql-test/r/partition_innodb.result@1.2.1.1, 2006-06-21 13:00:07+05:00, bar@mysql.com +15 -0
    Adding test case

  mysql-test/t/partition_innodb.test@1.2.2.1, 2006-06-21 13:00:07+05:00, bar@mysql.com +12 -0
    Adding test case

  mysql-test/r/partition_pruning.result@1.17, 2006-06-21 13:00:07+05:00, bar@mysql.com +1 -1
    Fixing test results (results differ due to changes in hash function)

  sql/field.cc@1.315.1.1, 2006-06-21 13:00:07+05:00, bar@mysql.com +30 -0
    Adding generic hash() method, and a special
    method for VARCHAR.

  sql/field.h@1.183.3.1, 2006-06-21 13:00:07+05:00, bar@mysql.com +3 -0
    Adding prototypes for new methods

  sql/key.cc@1.43, 2006-06-21 13:00:07+05:00, bar@mysql.com +4 -0
    Mark columns for write before executinf of set_key_image().
    Thanks for Mikael for suggesting this fix.

  sql/sql_partition.cc@1.79, 2006-06-21 13:00:07+05:00, bar@mysql.com +3 -14
    Removing old hash code.
    Using new methid field->hash() instead.

ChangeSet@1.2181.59.2, 2006-06-21 09:51:08+02:00, mskold@mysql.com +1 -0
  Fixed failed automerge

  sql/ha_ndbcluster.h@1.139.1.2, 2006-06-21 09:50:35+02:00, mskold@mysql.com +0 -1
    Fixed failed automerge

ChangeSet@1.2181.60.1, 2006-06-21 11:44:54+04:00, anozdrin@mysql.com +1 -0
  Disable IM tests.

  mysql-test/t/disabled.def@1.165.1.2, 2006-06-21 11:44:49+04:00, anozdrin@mysql.com +3 -3
    Disable IM tests.

ChangeSet@1.1810.1821.1, 2006-06-21 09:36:50+02:00, mskold@mysql.com +4 -0
  Fix for Bug #19906  REPLACE doesn't update TEXT fields correctly

  mysql-test/r/ndb_replace.result@1.3.1.2, 2006-06-21 09:36:01+02:00, mskold@mysql.com +22 -1
    Fix for Bug #19906  REPLACE doesn't update TEXT fields correctly

  mysql-test/t/ndb_replace.test@1.6, 2006-06-21 09:36:01+02:00, mskold@mysql.com +28 -2
    Fix for Bug #19906  REPLACE doesn't update TEXT fields correctly

  sql/ha_ndbcluster.cc@1.175.35.1, 2006-06-21 09:36:00+02:00, mskold@mysql.com +8 -2
    Fix for Bug #19906  REPLACE doesn't update TEXT fields correctly

  sql/ha_ndbcluster.h@1.82.1.16, 2006-06-21 09:36:00+02:00, mskold@mysql.com +2 -1
    Fix for Bug #19906  REPLACE doesn't update TEXT fields correctly

ChangeSet@1.1616.2595.4, 2006-06-21 09:20:55+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb autotest -
    add BUILD/compile-ndb-autotest to simplify building autotest on different mysql versions

  BUILD/compile-ndb-autotest@1.1, 2006-06-21 09:20:52+02:00, jonas@perch.ndb.mysql.com +9 -0
    New BitKeeper file ``BUILD/compile-ndb-autotest''

  BUILD/compile-ndb-autotest@1.0, 2006-06-21 09:20:52+02:00, jonas@perch.ndb.mysql.com +0 -0
    BitKeeper file /home/jonas/src/41-jonas/BUILD/compile-ndb-autotest

ChangeSet@1.1616.2144.159, 2006-06-21 00:12:23-07:00, igreenhoe@mysql.com +2 -0
  Fix for bug #15977 (switch ordering of DISABLE KEYS/LOCK TABLE in mysqldump)

  client/mysqldump.c@1.143.13.5, 2006-06-21 00:12:17-07:00, igreenhoe@mysql.com +13 -10
    Fix for bug #15977 (switch ordering of DISABLE KEYS/LOCK TABLE in mysqldump)

  mysql-test/r/mysqldump.result@1.9.1.45, 2006-06-21 00:12:18-07:00, igreenhoe@mysql.com +34 -52
    Fix for bug #15977 (switch ordering of DISABLE KEYS/LOCK TABLE in mysqldump)

ChangeSet@1.2181.51.2, 2006-06-21 08:58:56+02:00, andrey@lmy004. +1 -0
  add event_timed.h also to the distribution

  sql/Makefile.am@1.145, 2006-06-21 08:58:46+02:00, andrey@lmy004. +1 -1
    add event_timed.h also to the distribution

ChangeSet@1.1616.2648.1, 2006-06-20 19:57:21-07:00, igor@rurik.mysql.com +3 -0
  Fixed bug #16674.
  The length of the prefix of the pattern string in the LIKE predicate that 
  determined the index range to be scanned was calculated incorrectly for
  multi-byte character sets. 
  As a result of this in 4. 1 the the scanned range was wider then necessary
  if the prefix contained not only one-byte characters.  
  In 5.0 additionally it caused missing some rows from the result set.

  mysql-test/r/ctype_utf8.result@1.45.6.1, 2006-06-20 19:57:17-07:00, igor@rurik.mysql.com +67 -0
    Added test cases for bug #16674.

  mysql-test/t/ctype_utf8.test@1.57.6.1, 2006-06-20 19:57:17-07:00, igor@rurik.mysql.com +55 -0
    Added test cases for bug #16674.

  strings/ctype-mb.c@1.34.1.8, 2006-06-20 19:57:17-07:00, igor@rurik.mysql.com +16 -9
    Fixed bug #16674.
    The length of the prefix of the pattern string in the LIKE predicate that 
    determined the index range to be scanned was calculated incorrectly for
    multi-byte character sets. 
    As a result of this in 4. 1 the the scanned range was wider then necessary
    if the prefix contained not only one-byte characters.  
    In 5.0 additionally it caused missing some rows from the result set.
        
    The function my_like_range_mb was fixed to calculate the length of
    the prefix in a pattern string correctly in all cases.

ChangeSet@1.1810.1818.1, 2006-06-21 02:23:18+03:00, jani@ua141d10.elisa.omakaista.fi +5 -0
  Fix for Bug#18246 "compilation error with tcp_wrapper"

  include/Makefile.am@1.52.2.3, 2006-06-21 02:23:09+03:00, jani@ua141d10.elisa.omakaista.fi +1 -1
    Fix for Bug#18246 "compilation error with tcp_wrapper"

  include/my_libwrap.h@1.1, 2006-06-21 02:21:26+03:00, jani@ua141d10.elisa.omakaista.fi +19 -0

  include/my_libwrap.h@1.0, 2006-06-21 02:21:26+03:00, jani@ua141d10.elisa.omakaista.fi +0 -0
    BitKeeper file /home/my/bk/mysql-5.0/include/my_libwrap.h

  mysys/Makefile.am@1.62.1.8, 2006-06-21 02:23:10+03:00, jani@ua141d10.elisa.omakaista.fi +1 -1
    Fix for Bug#18246 "compilation error with tcp_wrapper"

  mysys/my_libwrap.c@1.1, 2006-06-21 02:21:20+03:00, jani@ua141d10.elisa.omakaista.fi +39 -0

  mysys/my_libwrap.c@1.0, 2006-06-21 02:21:20+03:00, jani@ua141d10.elisa.omakaista.fi +0 -0
    BitKeeper file /home/my/bk/mysql-5.0/mysys/my_libwrap.c

  sql/mysqld.cc@1.439.1.117, 2006-06-21 02:23:10+03:00, jani@ua141d10.elisa.omakaista.fi +3 -3
    Fix for Bug#18246 "compilation error with tcp_wrapper"
    
    Added wrapper functions.

ChangeSet@1.1810.1698.63, 2006-06-21 02:21:10+04:00, sergefp@mysql.com +1 -0
  Remove deadcode in select_dumpvar::send_data()

  sql/sql_class.cc@1.223.1.13, 2006-06-21 02:21:07+04:00, sergefp@mysql.com +2 -7
    Remove deadcode in select_dumpvar::send_data()

ChangeSet@1.2181.40.13, 2006-06-21 02:17:39+04:00, anozdrin@mysql.com +1 -0
  Re-enable IM tests.

  mysql-test/t/disabled.def@1.165.1.1, 2006-06-21 02:17:35+04:00, anozdrin@mysql.com +3 -3
    Re-enable IM tests.

ChangeSet@1.2181.40.12, 2006-06-21 02:16:38+04:00, anozdrin@mysql.com +1 -0
  Fix merge 5.0 -> 5.1.

  mysql-test/r/im_life_cycle.result@1.10, 2006-06-21 02:16:34+04:00, anozdrin@mysql.com +0 -4
    Fix manual merge.

ChangeSet@1.1810.1817.1, 2006-06-21 01:50:20+04:00, dlenev@mysql.com +3 -0
  Fix for bug#19634 "Re-execution of multi-delete which involve trigger/stored
  function crashes server".
  
  Attempts to execute prepared multi-delete statement which involved trigger or
  stored function caused server crashes (the same happened for such statements
  included in stored procedures in cases when one tried to execute them more
  than once).
  
  The problem was caused by yet another incorrect usage of check_table_access()
  routine (the latter assumes that table list which it gets as argument
  corresponds to value LEX::query_tables_own_last). We solve this problem by
  juggling with LEX::query_tables_own_last value when we call
  check_table_access() for LEX::auxilliary_table_list (better solution is too
  intrusive and should be done in 5.1).

  mysql-test/r/sp-prelocking.result@1.2.1.3, 2006-06-21 01:50:15+04:00, dlenev@mysql.com +18 -0
    Added test for bug#19634 "Re-execution of multi-delete which involve trigger/
    stored function crashes server".

  mysql-test/t/sp-prelocking.test@1.2.1.3, 2006-06-21 01:50:16+04:00, dlenev@mysql.com +31 -0
    Added test for bug#19634 "Re-execution of multi-delete which involve trigger/
    stored function crashes server".

  sql/sql_parse.cc@1.426.88.1, 2006-06-21 01:50:16+04:00, dlenev@mysql.com +36 -4
    To call safely check_table_access() for LEX::auxilliary_table_list we have
    to juggle with LEX::query_tables_own_last value.

ChangeSet@1.1810.1807.8, 2006-06-21 01:14:53+04:00, evgen@moonbone.local +5 -0
  field.cc, field.h:
    Additional fix for #16377 for bigendian platforms
  sql_select.cc, select.result, select.test:
    After merge fix

  mysql-test/r/select.result@1.121.1.9, 2006-06-21 01:04:31+04:00, evgen@moonbone.local +6 -6
    After merge fix

  mysql-test/t/select.test@1.102.1.4, 2006-06-21 01:04:14+04:00, evgen@moonbone.local +1 -1
    After merge fix

  sql/field.cc@1.256.1.55, 2006-06-21 01:06:52+04:00, evgen@moonbone.local +22 -22
    Additional fix for #16377 for bigendian platforms

  sql/field.h@1.153.1.29, 2006-06-21 01:05:31+04:00, evgen@moonbone.local +1 -1
    Additional fix for #16377 for bigendian platforms

  sql/sql_select.cc@1.312.72.2, 2006-06-21 01:04:55+04:00, evgen@moonbone.local +1 -1
    After merge fix

ChangeSet@1.2181.49.2, 2006-06-20 16:52:40-04:00, mikael@dator5.(none) +3 -0
  BUG#17138: Crash in stored procedure after fatal error that wasn't a real fatal error

  sql/handler.h@1.219, 2006-06-20 16:52:34-04:00, mikael@dator5.(none) +5 -3
    Handle HA_ERR_FOUND_DUPP_KEY and HA_ERR_FOUND_DUPP_UNIQUE similarly

  sql/item_sum.cc@1.181, 2006-06-20 16:52:34-04:00, mikael@dator5.(none) +1 -2
    fix

  sql/sql_select.cc@1.413.1.1, 2006-06-20 16:52:34-04:00, mikael@dator5.(none) +4 -5
    fix

ChangeSet@1.2181.52.2, 2006-06-21 00:45:01+04:00, evgen@moonbone.local +1 -0
  rpl_ndb_log.result:
    Corrected test case result

  mysql-test/r/rpl_ndb_log.result@1.11, 2006-06-21 00:44:09+04:00, evgen@moonbone.local +2 -2
    Corrected test case result

ChangeSet@1.1810.1808.4, 2006-06-20 22:40:46+02:00, joerg@mysql.com +2 -0
  Fix for bug#18516 (also #19353, reported for 5.1):
  In addition to include "mysql_upgrade" in a RPM, it should also be called
  when the RPM is upgraded.

  support-files/mysql.server.sh@1.49.1.2, 2006-06-20 22:40:40+02:00, joerg@mysql.com +14 -4
    Support getting additional arguments, which need to be passed on to the server.
    This works only if the server is started through "mysqld_safe", as the IM will not pass such arguments.
    So if the IM would be used, additional arguments cause the start to fail (voluntarily).
    
    This feature is needed so that tools like RPM can start the server in an "isolated" way,
    see the patch to the RPM spec file (also in this changeset) to call "mysql_upgrade".

  support-files/mysql.spec.sh@1.99.1.41, 2006-06-20 22:40:40+02:00, joerg@mysql.com +15 -1
    Call "mysql_upgrade" during an RPM upgrade.
    
    "mysql_upgrade" needs a server to run, as it issues SQL commands.
    (This had been neglected previously.)
    It also needs to connect as "root", but in an RPM upgrade the password is unknown.
    To allow this, the server is started "--skip-grant-tables".
    Normally, this would open big security holes, so it is also started "--skip-networking",
    and access to the socket is limited to "mysql" + "root" by temporarily setting mode 700.

ChangeSet@1.2181.56.2, 2006-06-20 16:38:42-04:00, mikael@dator5.(none) +4 -0
  BUG#16000: .par file left behind plus unnecessary messages to error.log
  New test cases

  mysql-test/r/partition_error.result@1.9, 2006-06-20 16:38:38-04:00, mikael@dator5.(none) +39 -0
    New test cases

  mysql-test/r/partition_mgm.result@1.2.1.1, 2006-06-20 16:38:38-04:00, mikael@dator5.(none) +10 -0
    New test cases

  mysql-test/t/partition_error.test@1.11, 2006-06-20 16:38:38-04:00, mikael@dator5.(none) +14 -0
    New test cases

  mysql-test/t/partition_mgm.test@1.2.1.1, 2006-06-20 16:38:38-04:00, mikael@dator5.(none) +4 -2
    New test cases

ChangeSet@1.1616.2642.4, 2006-06-20 23:05:55+04:00, evgen@moonbone.local +3 -0
  select.result:
    Added test case for bug#18759 Incorrect string to numeric conversion.  
  select.test:
    Added test case for bug#18759 Incorrect string to numeric conversion.
  item_cmpfunc.cc:
    Cleanup after fix for bug#18360 removal

  mysql-test/r/select.result@1.34.3.38, 2006-06-20 23:05:00+04:00, evgen@moonbone.local +6 -0
    Added test case for bug#18759 Incorrect string to numeric conversion.  

  mysql-test/t/select.test@1.28.4.13, 2006-06-20 23:03:49+04:00, evgen@moonbone.local +19 -0
    Added test case for bug#18759 Incorrect string to numeric conversion.

  sql/item_cmpfunc.cc@1.111.23.9, 2006-06-20 23:03:16+04:00, evgen@moonbone.local +2 -1
    Cleanup after fix for bug#18360 removal

ChangeSet@1.1810.1815.1, 2006-06-20 20:46:45+02:00, mats@mysql.com +1 -0
  Bug#19437 (Connection refused by server: "2002 Can't connect... /master.sock"):
  Clearing active VIO before calling mysql_close() in the slave I/O
  thread. 

  sql/slave.cc@1.241.1.29, 2006-06-20 20:46:39+02:00, mats@mysql.com +20 -0
    Clearing active VIO before calling mysql_close() in the slave I/O thread.

ChangeSet@1.1810.1813.1, 2006-06-20 13:43:13-04:00, elliot@mysql.com +3 -0
  Applying patch from SergeyV
  Fixes bug#17264, for alter table on win32 for successfull operation completion
  it is used TL_WRITE(=10) lock instead of TL_WRITE_ALLOW_READ(=6), however here
  in innodb handler TL_WRTIE is lifted to TL_WRITE_ALLOW_WRITE, which causes
  race condition when several clients do alter table simultaneously.

  mysql-test/r/lock_multi.result@1.15.1.3, 2006-06-20 13:43:10-04:00, elliot@mysql.com +6 -0
    Test case for bug#17264.

  mysql-test/t/lock_multi.test@1.13.1.3, 2006-06-20 13:43:10-04:00, elliot@mysql.com +26 -0
    Test case for bug#17264

  sql/ha_innodb.cc@1.202.1.94, 2006-06-20 13:43:10-04:00, elliot@mysql.com +11 -0
    Applying patch from SergeyV
    Fixes bug#17264, for alter table on win32 for successfull operation completion
    it is used TL_WRITE(=10) lock instead of TL_WRITE_ALLOW_READ(=6), however here
    in innodb handler TL_WRTIE is lifted to TL_WRITE_ALLOW_WRITE, which causes
    race condition when several clients do alter table simultaneously.

ChangeSet@1.2181.53.1, 2006-06-20 13:24:30-04:00, mikael@dator5.(none) +2 -0
  BUG#16000: .par file not removed plus errors to error log for normal errors

  sql/table.cc@1.222, 2006-06-20 13:24:25-04:00, mikael@dator5.(none) +11 -0
    Remove error printouts when error occurs during open frm as part of
    CREATE/ALTER TABLE

  sql/unireg.cc@1.81.1.1, 2006-06-20 13:24:25-04:00, mikael@dator5.(none) +1 -0
    Ensure .par file is removed after error

ChangeSet@1.2181.5.7, 2006-06-20 19:18:34+02:00, ngrishakin@mysql.com +2 -0
  ndb_dd_advance2 test

  mysql-test/r/ndb_dd_advance2.result@1.4, 2006-06-20 19:18:02+02:00, ngrishakin@mysql.com +100 -100
    ndb_dd_advance2 test

  mysql-test/t/ndb_dd_advance2.test@1.4, 2006-06-20 19:17:41+02:00, ngrishakin@mysql.com +1 -1
    ndb_dd_advance2 test

ChangeSet@1.2181.24.3, 2006-06-20 19:17:07+02:00, tomas@poseidon.ndb.mysql.com +4 -0
  Bug #17297 Fix error messages

  storage/ndb/include/mgmapi/ndbd_exit_codes.h@1.10, 2006-06-20 19:16:53+02:00, tomas@poseidon.ndb.mysql.com +4 -0
    Bug #17297 Fix error messages

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.87.1.1, 2006-06-20 19:16:53+02:00, tomas@poseidon.ndb.mysql.com +3 -2
    Bug #17297 Fix error messages

  storage/ndb/src/kernel/error/ndbd_exit_codes.c@1.9, 2006-06-20 19:16:54+02:00, tomas@poseidon.ndb.mysql.com +1 -0
    Bug #17297 Fix error messages

  storage/ndb/src/ndbapi/ndberror.c@1.61.2.1, 2006-06-20 19:16:54+02:00, tomas@poseidon.ndb.mysql.com +1 -0
    Bug #17297 Fix error messages

ChangeSet@1.1810.1811.1, 2006-06-20 19:13:46+02:00, tomas@poseidon.ndb.mysql.com +5 -0
  Bug #17297 Fix error messages

  ndb/src/common/transporter/TransporterRegistry.cpp@1.52.12.1, 2006-06-20 19:13:39+02:00, tomas@poseidon.ndb.mysql.com +1 -1
    Bug #17297 Fix error messages

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.24.31.1, 2006-06-20 19:13:39+02:00, tomas@poseidon.ndb.mysql.com +1 -1
    Bug #17297 Fix error messages

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.66.21.1, 2006-06-20 19:13:39+02:00, tomas@poseidon.ndb.mysql.com +2 -1
    Bug #17297 Fix error messages

  ndb/src/kernel/error/ndbd_exit_codes.c@1.1.3.1, 2006-06-20 19:13:39+02:00, tomas@poseidon.ndb.mysql.com +4 -3
    Bug #17297 Fix error messages

  ndb/src/ndbapi/ndberror.c@1.30.18.1, 2006-06-20 19:13:39+02:00, tomas@poseidon.ndb.mysql.com +1 -0
    Bug #17297 Fix error messages

ChangeSet@1.2181.45.2, 2006-06-20 20:11:08+04:00, evgen@moonbone.local +1 -0
  rpl_ndb_log.result:
    Fixed failing test case

  mysql-test/r/rpl_ndb_log.result@1.10, 2006-06-20 20:10:43+04:00, evgen@moonbone.local +16 -0
    Fixed failing test case

ChangeSet@1.2169.3.10, 2006-06-20 17:05:41+02:00, andrey@lmy004. +2 -0
  forgot to event_timed.h
  STRING_WITH_LEN -> C_STRING_WITH_LEN

  sql/event_timed.h@1.1, 2006-06-20 17:05:33+02:00, andrey@lmy004. +217 -0

  sql/event_timed.h@1.0, 2006-06-20 17:05:33+02:00, andrey@lmy004. +0 -0
    BitKeeper file /work/mysql-5.1-runtime/sql/event_timed.h

  sql/time.cc@1.60.1.2, 2006-06-20 17:05:33+02:00, andrey@lmy004. +21 -21
    use C_STRING_WITH_LEN

ChangeSet@1.2181.50.2, 2006-06-20 10:16:08-04:00, mikael@dator5.(none) +2 -0
  Fixed test case

  mysql-test/t/partition_innodb.test@1.2.1.1, 2006-06-20 10:16:03-04:00, mikael@dator5.(none) +1 -1
    Fixed test case

  mysql-test/t/partition_mgm.test@1.3, 2006-06-20 10:16:03-04:00, mikael@dator5.(none) +1 -0
    Fixed test case

ChangeSet@1.2181.24.2, 2006-06-20 15:45:17+02:00, tomas@poseidon.ndb.mysql.com +2 -0
  Bug #19543 Out REDO log on subscription creation during startup, missing error message
  - add error message

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@1.43, 2006-06-20 15:45:06+02:00, tomas@poseidon.ndb.mysql.com +15 -0
    Bug #19543 Out REDO log on subscription creation during startup, missing error message
    - add error message

  storage/ndb/src/kernel/error/ndbd_exit_codes.c@1.8, 2006-06-20 15:45:07+02:00, tomas@poseidon.ndb.mysql.com +4 -0
    Bug #19543 Out REDO log on subscription creation during startup, missing error message
    - add error message

ChangeSet@1.1810.1810.1, 2006-06-20 17:06:35+05:00, holyfoot@deer.(none) +1 -0
  bug #19672 (paths in embedded server are trucated in error messages)
  
  It fact, filenames are truncated in normal server as well, just we
  get bigger filenames in embedded server tests, but that can potentially
  get some problems in both cases.
  I modified file-related error messages to allow longer filenames

  sql/share/errmsg.txt@1.42.1.23, 2006-06-20 17:01:59+05:00, holyfoot@mysql.com +13 -13
    error messages fixed to keep longer filenames uncut

ChangeSet@1.1810.1807.3, 2006-06-20 15:40:10+04:00, evgen@moonbone.local +1 -0
  item_cmpfunc.cc:
    After merge fix

  sql/item_cmpfunc.cc@1.187.1.22, 2006-06-20 15:39:40+04:00, evgen@moonbone.local +4 -0
    After merge fix

ChangeSet@1.1810.1807.2, 2006-06-20 15:35:54+04:00, evgen@moonbone.local +1 -0
  func_time.result:
    After merge fix

  mysql-test/r/func_time.result@1.47.1.7, 2006-06-20 15:35:27+04:00, evgen@moonbone.local +2 -2
    After merge fix

ChangeSet@1.2181.40.8, 2006-06-20 12:24:12+02:00, kent@mysql.com +2 -0
  make_win_src_distribution.sh:
    Removed reference to missing "tools" directory
  mysql.spec.sh:
    Changed flag --with-yassl => --with-ssl
    Reverted accidental removal of the "make" call :-)
    Configure --with-embedded-server
    Corrected path to "libtool" command
    Corrected path to "libmysqld.a"
    Removed references to "safe_mysqld"

  scripts/make_win_src_distribution.sh@1.56, 2006-06-20 12:23:39+02:00, kent@mysql.com +1 -1
    Removed reference to missing "tools" directory

  support-files/mysql.spec.sh@1.146, 2006-06-13 22:09:31+02:00, kent@mysql.com +7 -11
    Changed flag --with-yassl => --with-ssl
    Reverted accidental removal of the "make" call :-)
    Configure --with-embedded-server
    Corrected path to "libtool" command
    Corrected path to "libmysqld.a"
    Removed references to "safe_mysqld"

ChangeSet@1.2181.38.2, 2006-06-20 13:20:32+03:00, monty@mysql.com +21 -0
  SHOW STATUS does not anymore change local status variables (except com_show_status). Global status variables are still updated.
  SHOW STATUS are not anymore put in slow query log because of no index usage.
  
  Implemntation done by removing orig_sql_command and moving logic of SHOW STATUS to mysql_excute_command()
  This simplifies code and allows us to remove some if statements all over the code.
  
  Upgraded uc_update_queries[] to sql_command_flags and added more bitmaps to better categorize commands.
  This allowed some overall simplifaction when testing sql_command.
  
  Fixes bugs:
  Bug#10210: running SHOW STATUS increments counters it shouldn't
  Bug#19764: SHOW commands end up in the slow log as table scans

  mysql-test/r/grant_cache.result@1.17, 2006-06-20 13:20:27+03:00, monty@mysql.com +8 -8
    Fixed results after SHOW STATUS doesn't anymore affect status variables

  mysql-test/r/information_schema.result@1.125, 2006-06-20 13:20:27+03:00, monty@mysql.com +2 -0
    Added extra test to cover more code

  mysql-test/r/query_cache.result@1.75, 2006-06-20 13:20:27+03:00, monty@mysql.com +1 -0
    Remove resuts from previous tests

  mysql-test/r/status.result@1.12, 2006-06-20 13:20:27+03:00, monty@mysql.com +50 -0
    Added more tests for testing of last_query_cost and how SHOW STATUS affects status variables.
    (Bug#10210)

  mysql-test/r/temp_table.result@1.24, 2006-06-20 13:20:28+03:00, monty@mysql.com +1 -1
    Fixed results after SHOW STATUS doesn't anymore affect status variables

  mysql-test/r/union.result@1.85, 2006-06-20 13:20:28+03:00, monty@mysql.com +4 -4
    Fixed results after SHOW STATUS is not logged to slow query log
    (Bug#19764)

  mysql-test/t/events_microsec.test@1.4, 2006-06-20 13:20:28+03:00, monty@mysql.com +3 -0
    Disable warnings at init

  mysql-test/t/information_schema.test@1.83, 2006-06-20 13:20:28+03:00, monty@mysql.com +2 -0
    Added extra test to cover more code

  mysql-test/t/query_cache.test@1.61, 2006-06-20 13:20:28+03:00, monty@mysql.com +3 -0
    Remove resuts from previous tests

  mysql-test/t/status.test@1.16, 2006-06-20 13:20:28+03:00, monty@mysql.com +34 -0
    Added more tests for testing of last_query_cost and how SHOW STATUS affects status variables.
    (Bug #10210)

  sql/mysql_priv.h@1.410.1.1, 2006-06-20 13:20:28+03:00, monty@mysql.com +1 -0
    Added 'sql_command_flags'

  sql/sql_class.cc@1.265.1.2, 2006-06-20 13:20:28+03:00, monty@mysql.com +25 -0
    New function add_diff_to_status(), used to update global status variables when using SHOW STATUS

  sql/sql_class.h@1.297.2.1, 2006-06-20 13:20:28+03:00, monty@mysql.com +14 -2
    New function 'fill_information_schema_tables()'
    (One could not anymore use fill_derived_tables() for this as only_view_structures() is not relevant for information schema tables)
    Added defines for bit flags in sql_command_flags[]

  sql/sql_lex.cc@1.185.2.1, 2006-06-20 13:20:28+03:00, monty@mysql.com +1 -1
    Remove orig_sql_command

  sql/sql_lex.h@1.234, 2006-06-20 13:20:28+03:00, monty@mysql.com +1 -1
    Remove orig_sql_command

  sql/sql_parse.cc@1.559.1.3, 2006-06-20 13:20:28+03:00, monty@mysql.com +174 -110
    Rename uc_update_queries -> sql_command_flags.
    Enhanced 'sql_command_flags' to better classify SQL commands
    uc_update_queries[] != 0 is changed to (sql_command_flags[] & CF_CHANGES_DATA)
    lex->orig_sql_command == SQLCOM_END is changed to (sql_command_flags[lex->sql_command] & CF_STATUS_COMMAND) == 0)
    
    Simplify incrementing of thd->status_var.com_stat[] as we don't have to do special handling for SHOW commands.
    
    Split SQLCOM_SELECT handling in mysql_execute_command() to a separate function.
    Added special handling of SHOW STATUS commands in mysql_execute_command() and call common SQLCOM_SELECT handling.
    These changes allows us to easily fix that we save and restore status variables during execution of a SHOW STATUS command.
    Don't log SHOW STATUS commands to slow query log.
    
    This fixes Bug#10210 and Bug#19764 without adding additional 'if' code.
    (The new code is faster than the original as we now have fewer if's than before)
    

  sql/sql_prepare.cc@1.173, 2006-06-20 13:20:28+03:00, monty@mysql.com +15 -12
    Clean up prepare-check handling of SQLCOM commands by using sql_command_flags[]
    This simplifes code and ensures that code works even if someone forgets to put a new status commands into the switch statement.
    

  sql/sql_select.cc@1.414, 2006-06-20 13:20:28+03:00, monty@mysql.com +1 -6
    Remove special handling of SHOW STATUS.
    (This is now done in SQLCOM_SHOW_STATUS part in mysql_execute_command())

  sql/sql_show.cc@1.347.4.1, 2006-06-20 13:20:28+03:00, monty@mysql.com +39 -33
    Remove orig_sql_command
    Only change sql_command during 'open_normal_and_derived_tables()' (for views) and not for the full duration of generating data.
    Changed 'show status' to use thd->initial_status_var to ensure that the current statement is not affecting the to-be-used values.
    Use thd->fill_information_schema_tables() instead of 'thd->fill_derived_tables()' as the later wrongly checks the value of sql_command.

  sql/sql_yacc.yy@1.483, 2006-06-20 13:20:28+03:00, monty@mysql.com +25 -40
    Remove usage of orig_sql_command.
    One side effect of this is that we need to test for cursors if the current command is a SELECT or a SHOW command.

  sql/structs.h@1.62, 2006-06-20 13:20:28+03:00, monty@mysql.com +1 -1
    Updated comment

ChangeSet@1.2181.43.4, 2006-06-20 10:40:36+02:00, guilhem@mysql.com +4 -0
  Fix for BUG#20522 "RBR: CREATE TEMPORARY TABLE SELECT writes to binlog
  though unneeded". It's indeed unneeded, as slave is only interested in
  permanent tables, and permanent tables don't depend on temporary tables
  when in row-based binlogging mode. And other CREATE TEMPORARY TABLE
  (referring no table or with LIKE) already don't write the CREATE to
  binlog in row-based mode. 

  mysql-test/r/rpl_row_create_table.result@1.4.1.1, 2006-06-20 10:40:31+02:00, guilhem@mysql.com +1 -0
    result update (note that no lines appear in SHOW BINLOG EVENTS further below, which is how we
    see the bug is fixed)

  mysql-test/t/rpl_row_create_table.test@1.4.1.1, 2006-06-20 10:40:31+02:00, guilhem@mysql.com +1 -0
    testing if a CREATE TEMPORARY TABLE SELECT goes to binlog (it should not)
    when in row-based binlogging mode. A few lines after, there is a SHOW
    BINLOG EVENTS; before the bugfix it showed the CREATE TEMPORARY TABLE.

  sql/sql_class.h@1.297.1.2, 2006-06-20 10:40:31+02:00, guilhem@mysql.com +2 -1
    a method to access select_create::create_info from outside of select_create
    ("read-only" access). Making get_thd() "read-only" too.

  sql/sql_insert.cc@1.198.6.1, 2006-06-20 10:40:31+02:00, guilhem@mysql.com +2 -1
    The function (hook) which writes CREATE TABLE to binlog when in row-based
    binlogging mode, for CREATE TABLE SELECT, now does nothing if the table
    is temporary (as in row-based mode, temp tables are not replicated).
    This is consistent with CREATE TEMPORARY TABLE LIKE and
    CREATE TEMPORARY TABLE, which don't write any CREATE to binlog in row-based
    mode.

ChangeSet@1.1810.1698.62, 2006-06-20 11:28:59+03:00, gkodinov@mysql.com +1 -0
  wrong merge of bug9676 from 4.1 to 5.0 corrected

  sql/sql_select.cc@1.312.1.112, 2006-06-20 11:28:54+03:00, gkodinov@mysql.com +1 -1
    wrong merge of bug9676 from 4.1 to 5.0 corrected

ChangeSet@1.1810.1606.5, 2006-06-20 17:29:02+10:00, stewart@mysql.com +1 -0
  BUG#20333 valgrind: mgmd event reporting dep on uninit value

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.73.26.1, 2006-06-20 17:28:58+10:00, stewart@mysql.com +1 -1
    user correct pointer

ChangeSet@1.2181.40.5, 2006-06-20 14:24:52+10:00, stewart@mysql.com +1 -0
  fix test result after BUG#20073 fix

  mysql-test/r/ndb_dd_dump.result@1.4, 2006-06-20 14:24:41+10:00, stewart@mysql.com +1 -1
    fix test result

ChangeSet@1.2181.48.2, 2006-06-19 23:13:42-04:00, mikael@dator5.(none) +1 -0
  New test case

  mysql-test/r/partition.result@1.38.2.8, 2006-06-19 23:13:38-04:00, mikael@dator5.(none) +15 -0
    New test case

ChangeSet@1.2181.47.2, 2006-06-19 22:49:00-04:00, mikael@dator5.(none) +1 -0
  Fixes

  sql/handler.h@1.216.1.2, 2006-06-19 22:48:56-04:00, mikael@dator5.(none) +1 -1
    Fixes

ChangeSet@1.1810.1809.1, 2006-06-19 22:19:05-04:00, iggy@mysql.com +1 -0
  Bug#19407 Test 'func_regexp' fails on Windows x64

  regex/regexec.c@1.8, 2006-06-19 22:19:00-04:00, iggy@mysql.com +1 -1
    The Win64 pre-processor evaluates state1 at the end of the chain at replace-time not at definition-time.  This causes states1 to be defined as char *.

ChangeSet@1.2181.47.1, 2006-06-19 20:56:50-04:00, mikael@dator5.(none) +9 -0
  BUG#17138: Error in stored procedure due to fatal error when not really
  a fatal error. New handling of ignore error in place.

  mysql-test/t/partition.test@1.40.5.1, 2006-06-19 20:56:45-04:00, mikael@dator5.(none) +23 -0
    New test case

  sql/ha_ndbcluster.h@1.140, 2006-06-19 20:56:45-04:00, mikael@dator5.(none) +8 -0
    New handler method to check if error can be ignored

  sql/ha_partition.h@1.20, 2006-06-19 20:56:46-04:00, mikael@dator5.(none) +8 -0
    New handler method to check if error can be ignored

  sql/handler.h@1.216.1.1, 2006-06-19 20:56:46-04:00, mikael@dator5.(none) +23 -2
    New handler method to check if error can be ignored

  sql/sql_acl.cc@1.192.1.6, 2006-06-19 20:56:46-04:00, mikael@dator5.(none) +4 -5
    Use new handler method

  sql/sql_insert.cc@1.198.5.1, 2006-06-19 20:56:46-04:00, mikael@dator5.(none) +6 -2
    Use new handler method

  sql/sql_table.cc@1.344.5.1, 2006-06-19 20:56:46-04:00, mikael@dator5.(none) +2 -4
    Use new handler method

  sql/sql_union.cc@1.134, 2006-06-19 20:56:46-04:00, mikael@dator5.(none) +1 -1
    Use new handler method

  sql/sql_update.cc@1.193, 2006-06-19 20:56:46-04:00, mikael@dator5.(none) +11 -9
    Use new handler method

ChangeSet@1.1616.2646.1, 2006-06-20 00:50:09+04:00, evgen@moonbone.local +3 -0
  item_cmpfunc.cc, func_in.result, func_in.test:
    Reverted fix for bug#18360

  mysql-test/r/func_in.result@1.12.1.6, 2006-06-20 00:34:36+04:00, evgen@moonbone.local +0 -21
    Reverted fix for bug#18360

  mysql-test/t/func_in.test@1.14.1.4, 2006-06-20 00:33:17+04:00, evgen@moonbone.local +0 -12
    Reverted fix for bug#18360

  sql/item_cmpfunc.cc@1.111.23.8, 2006-06-20 00:36:48+04:00, evgen@moonbone.local +8 -20
    Reverted fix for bug#18360

ChangeSet@1.2154.51.1, 2006-06-19 20:14:14+03:00, aelkin@mysql.com +1 -0
  Bug#19881: slave cores at close_temporary_tables under shutdown
  
     The bug was found in rpl_stm_000001 testing. In essence the following happens
  
     SLAVE thread receives          what happens
     start
                             init THD and its temp_table (tt0)
     stop
                             storing tt0 pointer to rli->save...
     start
                             restoring temp_tables - new pointer tt1
                             executing regular binlog event DROP temp_table
                             at the end of which tt1-refered list
                             must be empty (slave_open_temp_tables == 0)
                             but the pointer refers to tt0 location!
     shutdown
                             end_slave calls cleaning of temp_tables and crashes.
  
     The reason of the crash is that tt1 values is not zero upon DROPing the single temp table.
     This is due to alg of removing links from temp_tables list which "adapted" 5.0 code
     but w/o accounting that thd->temporary_tables in slave thread in prone to freeing.
     Upon freeing there is no more original '0' value available to denote empty list.
  
     temporary_tables must not refer to any "external" location, one of which thd->temporary_tables represents (since belong to THD instance).
     The fix done in sql_base.cc for two functions, look at there for details.

  sql/sql_base.cc@1.320.3.1, 2006-06-19 20:14:09+03:00, aelkin@mysql.com +29 -7
       refining prepend and remove link operation to thd->temporary_tables.
       The list turns to be "flat" double-linked, i.e "prev" accessor refers to an item instead of pointer to one as it was previously with "open_prev".
       On removal an invariant involving slave_open_temp_tables counter is checked.
       When it is zero thd->temporary_tables is set to zero explicitly. This can not be done, for what previous code hoped, because thd object changes when slave stop/start while
       slave's temporary_tables are maintained all the time, until reset/shutdow

ChangeSet@1.1616.2645.1, 2006-06-19 22:11:01+05:00, holyfoot@deer.(none) +5 -0
  bug #20318 (ctype_ucs2_def test fails with embedded)
  there was two problems about charsets in embedded server
  1. mysys/charset.c - defined there default_charset_info variable is
  modified by both server and client code (particularly when
  --default-charset option is handled)
  In embedded server we get two codelines modifying one variable.
  I created separate default_client_charset_info for client code
  
  2. mysql->charset and mysql->options.charset initialization isn't
  properly done for embedded server - necessary calls added

  include/sql_common.h@1.14.1.1, 2006-06-19 22:10:15+05:00, holyfoot@mysql.com +1 -0
    client charset info default declared

  libmysqld/lib_sql.cc@1.75.9.1, 2006-06-19 22:10:15+05:00, holyfoot@mysql.com +7 -0
    thd_init_client_charset calls added

  libmysqld/libmysqld.c@1.64.2.1, 2006-06-19 22:10:15+05:00, holyfoot@mysql.com +3 -45
    check_embedded_connection moved to client.c to avoid code duplication

  sql-common/client.c@1.46.7.1, 2006-06-19 22:10:15+05:00, holyfoot@mysql.com +48 -36
    charset initialization moved to mysql_init_character_set to
    be used in embedded server

  sql/sql_parse.cc@1.271.125.1, 2006-06-19 22:10:15+05:00, holyfoot@mysql.com +32 -27
    thread client charset initialization moved to thd_init_client_charset
    to avoid code duplication

ChangeSet@1.2181.45.1, 2006-06-19 20:21:00+04:00, evgen@moonbone.local +2 -0
  rpl_row_log.result, rpl_row_log_innodb.result:
    Fixed failing test case

  mysql-test/r/rpl_row_log.result@1.9, 2006-06-19 20:17:11+04:00, evgen@moonbone.local +16 -0
    Fixed failing test case

  mysql-test/r/rpl_row_log_innodb.result@1.9, 2006-06-19 20:16:33+04:00, evgen@moonbone.local +16 -0
    Fixed failing test case

ChangeSet@1.1810.1806.1, 2006-06-19 17:34:12+03:00, gkodinov@mysql.com +3 -0
  Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list error
  
  There was an incomplete reset of the name resolution context, that caused 
  INSERT ... SELECT ... JOIN statements to resolve not by joint row type calculated
  for the join.
  Removed the redundant re-initialization of the context, because 
  mysql_insert_select_prepare() now correctly saves/restores the context.

  mysql-test/r/insert_select.result@1.35.2.1, 2006-06-19 17:34:06+03:00, gkodinov@mysql.com +5 -0
    Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list error
    
    - testsuite for the bug

  mysql-test/t/insert_select.test@1.28.1.1, 2006-06-19 17:34:06+03:00, gkodinov@mysql.com +9 -0
    Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list error
    
    - testsuite for the bug

  sql/sql_parse.cc@1.426.1.125, 2006-06-19 17:34:06+03:00, gkodinov@mysql.com +0 -9
    Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list error
    
    - remove an incomplete reset of the context because the mentioned function
    correctly saves/restores the context.

ChangeSet@1.2181.43.1, 2006-06-20 00:30:19+10:00, stewart@mysql.com +1 -0
  BUG#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS,

  sql/ha_ndbcluster.cc@1.328.1.1, 2006-06-20 00:30:10+10:00, stewart@mysql.com +3 -3
    fix total extents display for FILES table.
    fix extra field to also contain UNDO_BUFFER_SIZE

ChangeSet@1.2181.41.1, 2006-06-19 18:30:55+05:00, gluh@eagle.intranet.mysql.r18.ru +12 -0
  WL#3015: Logging Improvements - No Restarts(ver N4)
  Added slow_query_log & general_log global upadatable variables.
  Added slow-query-log & general-log startup options.
  Added log_output, general_log_file, slow_query_log_file global updatable variables.

  mysql-test/r/log_state.result@1.1, 2006-06-19 18:30:46+05:00, gluh@mysql.com +155 -0

  mysql-test/r/log_state.result@1.0, 2006-06-19 18:30:46+05:00, gluh@mysql.com +0 -0
    BitKeeper file /home/gluh/MySQL/Merge/5.1-kt/mysql-test/r/log_state.result

  mysql-test/r/show_check.result@1.94.1.1, 2006-06-19 18:30:45+05:00, gluh@mysql.com +7 -13
    WL#3015: Logging Improvements - No Restarts
    result fix

  mysql-test/t/log_state-master.opt@1.1, 2006-06-19 18:30:46+05:00, gluh@mysql.com +1 -0

  mysql-test/t/log_state-master.opt@1.0, 2006-06-19 18:30:46+05:00, gluh@mysql.com +0 -0
    BitKeeper file /home/gluh/MySQL/Merge/5.1-kt/mysql-test/t/log_state-master.opt

  mysql-test/t/log_state.test@1.1, 2006-06-19 18:30:47+05:00, gluh@mysql.com +122 -0

  mysql-test/t/log_state.test@1.0, 2006-06-19 18:30:47+05:00, gluh@mysql.com +0 -0
    BitKeeper file /home/gluh/MySQL/Merge/5.1-kt/mysql-test/t/log_state.test

  sql/log.cc@1.213.3.1, 2006-06-19 18:30:45+05:00, gluh@mysql.com +157 -36
    WL#3015: Logging Improvements - No Restarts
    added methods to LOGGER class
    void deactivate_log_handlers(THD* thd, uint log_type);
    bool activate_log_handlers(THD* thd, uint log_type);
    added methods to Log_to_file_event_handler:
    TABLE_LIST *get_mysql_slow_log()
    TABLE_LIST *get_mysql_log()

  sql/log.h@1.8.1.1, 2006-06-19 18:30:45+05:00, gluh@mysql.com +17 -2
    WL#3015: Logging Improvements - No Restarts
    added methods to LOGGER class
    void deactivate_log_handlers(THD* thd, uint log_type);
    bool activate_log_handlers(THD* thd, uint log_type);
    added methods to Log_to_file_event_handler:
    TABLE_LIST *get_mysql_slow_log()
    TABLE_LIST *get_mysql_log()

  sql/mysql_priv.h@1.409.1.1, 2006-06-19 18:30:45+05:00, gluh@mysql.com +7 -1
    WL#3015: Logging Improvements - No Restarts

  sql/mysqld.cc@1.553.2.1, 2006-06-19 18:30:45+05:00, gluh@mysql.com +31 -7
    WL#3015: Logging Improvements - No Restarts
    added 'slow-query-log' & 'general-log' options

  sql/set_var.cc@1.173.3.1, 2006-06-19 18:30:45+05:00, gluh@mysql.com +216 -0
    WL#3015: Logging Improvements - No Restarts
    added 'slow_query_log' & 'general_log' updatable variables
    added 'log_output', 'general_log_file', 'slow_query_log_file' updatable variables

  sql/set_var.h@1.85.1.3, 2006-06-19 18:30:45+05:00, gluh@mysql.com +35 -1
    WL#3015: Logging Improvements - No Restarts
    new class sys_var_log_state
    new class sys_var_log_output
    

  sql/share/errmsg.txt@1.106.1.1, 2006-06-19 18:30:45+05:00, gluh@mysql.com +2 -0
    WL#3015: Logging Improvements - No Restarts
    added error message

  sql/sql_delete.cc@1.184.1.1, 2006-06-19 18:30:45+05:00, gluh@mysql.com +6 -4
    WL#3015: Logging Improvements - No Restarts
    'truncate table slow_log|general', keep status of logs

ChangeSet@1.1810.1803.3, 2006-06-19 17:50:52+05:00, svoj@may.pils.ru +1 -0
  Addition to fix for
  BUG#18036 - update of table joined to self reports table as crashed
  
  Set exclude_from_table_unique_test value back to FALSE. It is needed for
  further check in multi_update::prepare whether to use record cache.

  sql/sql_update.cc@1.154.2.36, 2006-06-19 17:50:46+05:00, svoj@may.pils.ru +6 -1
    Set exclude_from_table_unique_test value back to FALSE. It is needed for
    further check in multi_update::prepare whether to use record cache.

ChangeSet@1.2181.35.2, 2006-06-19 14:31:22+02:00, knielsen@mysql.com +3 -0
  Fix a Valgrind leak error report for not freed binlog injector singleton.

  sql/mysqld.cc@1.558.1.1, 2006-06-19 14:31:17+02:00, knielsen@mysql.com +7 -0
    Free the binlog injector singleton during shutdown.

  sql/rpl_injector.cc@1.3.1.1, 2006-06-19 14:31:17+02:00, knielsen@mysql.com +10 -0
    Add free_instance() method.

  sql/rpl_injector.h@1.3.1.1, 2006-06-19 14:31:17+02:00, knielsen@mysql.com +5 -0
    Add free_instance() method.

ChangeSet@1.1810.1793.3, 2006-06-19 13:23:13+02:00, lars@mysql.com +2 -0
  BUG#17201 Changed to other database (BUG#20531 hinders usage of 'test' database)

  mysql-test/r/mysqldump.result@1.83.8.1, 2006-06-19 13:23:02+02:00, lars@mysql.com +7 -6
    Changed to other database (BUG#20531 hinders usage of 'test' database)

  mysql-test/t/mysqldump.test@1.76.9.1, 2006-06-19 13:23:02+02:00, lars@mysql.com +5 -4
    Changed to other database (BUG#20531 hinders usage of 'test' database)

ChangeSet@1.2181.34.9, 2006-06-19 15:17:15+04:00, anozdrin@mysql.com +5 -0
  Polishing: C_STRING_WITH_SIZE() was renamed to C_STRING_WITH_LEN().

  include/m_string.h@1.44, 2006-06-19 15:17:09+04:00, anozdrin@mysql.com +1 -1
    Polishing: C_STRING_WITH_SIZE() was renamed to C_STRING_WITH_LEN().

  server-tools/instance-manager/commands.cc@1.36, 2006-06-19 15:17:09+04:00, anozdrin@mysql.com +3 -3
    Polishing: C_STRING_WITH_SIZE() was renamed to C_STRING_WITH_LEN().

  server-tools/instance-manager/instance.cc@1.34, 2006-06-19 15:17:09+04:00, anozdrin@mysql.com +1 -1
    Polishing: C_STRING_WITH_SIZE() was renamed to C_STRING_WITH_LEN().

  server-tools/instance-manager/instance_options.cc@1.35, 2006-06-19 15:17:09+04:00, anozdrin@mysql.com +3 -3
    Polishing: C_STRING_WITH_SIZE() was renamed to C_STRING_WITH_LEN().

  server-tools/instance-manager/priv.cc@1.12, 2006-06-19 15:17:10+04:00, anozdrin@mysql.com +1 -1
    Polishing: C_STRING_WITH_SIZE() was renamed to C_STRING_WITH_LEN().

ChangeSet@1.2181.34.8, 2006-06-19 14:41:29+04:00, anozdrin@mysql.com +4 -0
  WL#3298: IM: make command-line option names consistent
  
  1. Removed '-P' command line option;
  2. Renamed '--passwd' command line option to '--print-password-line'.

  mysql-test/t/im_cmd_line.imtest@1.2, 2006-06-19 14:41:24+04:00, anozdrin@mysql.com +2 -2
    Renamed "--passwd" to "--print-password-line".

  server-tools/instance-manager/options.cc@1.36, 2006-06-19 14:41:24+04:00, anozdrin@mysql.com +6 -6
    1. Removed '-P' option;
    2. Renamed '--passwd' to '--print-password-line'.

  server-tools/instance-manager/user_management_commands.cc@1.3, 2006-06-19 14:41:24+04:00, anozdrin@mysql.com +2 -2
    Renamed class Passwd_cmd to Print_password_line_cmd.

  server-tools/instance-manager/user_management_commands.h@1.2, 2006-06-19 14:41:25+04:00, anozdrin@mysql.com +4 -3
    Renamed class Passwd_cmd to Print_password_line_cmd. 

ChangeSet@1.1616.2644.1, 2006-06-19 13:22:42+03:00, gkodinov@mysql.com +3 -0
  * Bug #9676: INSERT INTO x SELECT .. FROM x LIMIT 1; slows down with big
                tables
  Currently in INSERT ... SELECT ... LIMIT ... the compiler uses a 
  temporary table to store the results of SELECT ... LIMIT .. and then
  uses that table as a source for INSERT. The problem is that in some cases
  it actually skips the LIMIT clause in doing that and materializes the 
  whole SELECT result set regardless of the LIMIT.
  This fix is limiting the process of filling up the temp table with only 
  that much rows that will be actually used by propagating the LIMIT value.

  mysql-test/r/insert_select.result@1.16.1.14, 2006-06-19 13:22:38+03:00, gkodinov@mysql.com +4 -0
    * Bug #9676: INSERT INTO x SELECT .. FROM x LIMIT 1; slows down with big
                  tables
    - a test demonstrating the code path

  mysql-test/t/insert_select.test@1.14.1.10, 2006-06-19 13:22:38+03:00, gkodinov@mysql.com +13 -0
    * Bug #9676: INSERT INTO x SELECT .. FROM x LIMIT 1; slows down with big
                  tables
    - a test demonstrating the code path

  sql/sql_select.cc@1.216.126.5, 2006-06-19 13:22:38+03:00, gkodinov@mysql.com +8 -4
    * Bug #9676: INSERT INTO x SELECT .. FROM x LIMIT 1; slows down with big
                  tables
    - pass through the real LIMIT number if the temp table is created for
      buffering results.
    - set the counter for all the cases when the temp table is not used for
      grouping

ChangeSet@1.1810.1799.4, 2006-06-19 14:16:10+04:00, anozdrin@mysql.com +3 -0
  The second fix for BUG#19391: IM fails to start after two executions.

  server-tools/instance-manager/guardian.cc@1.20.1.2, 2006-06-19 14:16:05+04:00, anozdrin@mysql.com +0 -3
    Removed erroneous unlock() in Guardian_thread::init():
    instance_map is unlocked in the caller.

  server-tools/instance-manager/instance_map.cc@1.26.1.1, 2006-06-19 14:16:06+04:00, anozdrin@mysql.com +1 -1
    Added TODO comment.

  server-tools/instance-manager/manager.cc@1.32.1.2, 2006-06-19 14:16:06+04:00, anozdrin@mysql.com +31 -12
    Make initialization of alarm infrustructure before starting Guardian
    thread, because Guardian uses thr_alarm().

ChangeSet@1.1810.1799.3, 2006-06-19 14:15:26+04:00, anozdrin@mysql.com +2 -0
  Small fix for test suite:
    - fix for IM stopping routine;
    - polishing.

  mysql-test/lib/mtr_process.pl@1.25.2.6, 2006-06-19 14:15:22+04:00, anozdrin@mysql.com +13 -4
    Polishing: make mtr_kill_process() more verbose in debug mode.

  mysql-test/mysql-test-run.pl@1.30.33.1, 2006-06-19 14:15:22+04:00, anozdrin@mysql.com +48 -6
    1. Fix stopping of IM running as a daemon -- after death of the main IM
    process, we should wait for the IM angel to die.
    2. Polishing -- be more verbose in debug mode.

ChangeSet@1.1810.1799.2, 2006-06-19 14:13:34+04:00, anozdrin@mysql.com +11 -0
  Fix of test suite in scope of fixing BUG#18023: IM: instance
  can be started several times; monitor interval must be > 2sec

  mysql-test/t/im_life_cycle-im.opt@1.1, 2006-06-19 14:13:29+04:00, anozdrin@mysql.com +1 -0
    Set monitoring interval to 1 second in order to:
      - be consistent with 5.1;
      - speed up tests;

  mysql-test/t/im_life_cycle-im.opt@1.0, 2006-06-19 14:13:29+04:00, anozdrin@mysql.com +0 -0
    BitKeeper file /home/alik/MySQL/devel/5.0-rt-bug18023/mysql-test/t/im_life_cycle-im.opt

  mysql-test/t/im_utils-im.opt@1.1, 2006-06-19 14:13:30+04:00, anozdrin@mysql.com +1 -0
    Set monitoring interval to 1 second in order to:
      - be consistent with 5.1;
      - speed up tests;

  mysql-test/t/im_utils-im.opt@1.0, 2006-06-19 14:13:30+04:00, anozdrin@mysql.com +0 -0
    BitKeeper file /home/alik/MySQL/devel/5.0-rt-bug18023/mysql-test/t/im_utils-im.opt

  mysql-test/r/im_daemon_life_cycle.result@1.2.1.1, 2006-06-19 14:13:28+04:00, anozdrin@mysql.com +1 -0
    Updated result file.

  mysql-test/r/im_life_cycle.result@1.3.1.3, 2006-06-19 14:13:28+04:00, anozdrin@mysql.com +41 -35
    Updated result file.

  mysql-test/r/im_utils.result@1.1.1.2, 2006-06-19 14:13:28+04:00, anozdrin@mysql.com +3 -0
    Updated result file.

  mysql-test/t/im_daemon_life_cycle-im.opt@1.2.1.1, 2006-06-19 14:13:29+04:00, anozdrin@mysql.com +1 -0
    Set monitoring interval to 1 second in order to:
      - be consistent with 5.1;
      - speed up tests;

  mysql-test/t/im_daemon_life_cycle.imtest@1.1.1.1, 2006-06-19 14:13:29+04:00, anozdrin@mysql.com +17 -1
    1. Use wait_for_start.sh script to minimize chance of race condition.
    2. Polishing.

  mysql-test/t/im_life_cycle.imtest@1.3.1.2, 2006-06-19 14:13:29+04:00, anozdrin@mysql.com +98 -44
    1. Use wait_for_start.sh and wait_for_stop.sh scripts to
       minimize chance of race condition;
    2. Remove some statements, because there is no way now to
       stabilize their output.
    3. Polishing;

  mysql-test/t/im_utils.imtest@1.1.1.1, 2006-06-19 14:13:29+04:00, anozdrin@mysql.com +13 -3
    1. Use wait_for_start.sh script to minimize chance of race condition.
    2. Polishing.

  mysql-test/t/kill_n_check.sh@1.3, 2006-06-19 14:13:29+04:00, anozdrin@mysql.com +79 -30
    1. Make timeout configurable by command-line argument;
    2. Change algorithm of waiting for process to restart to be
       more robust.

  mysql-test/t/wait_for_process.sh@1.1, 2006-06-19 14:13:30+04:00, anozdrin@mysql.com +66 -0
    A new helper script, intended to be used instead of dummy "sleep"
    when waiting for some process to start or stop.

  mysql-test/t/wait_for_process.sh@1.0, 2006-06-19 14:13:30+04:00, anozdrin@mysql.com +0 -0
    BitKeeper file /home/alik/MySQL/devel/5.0-rt-bug18023/mysql-test/t/wait_for_process.sh

ChangeSet@1.2176.8.1, 2006-06-19 12:45:34+03:00, monty@mysql.com +19 -0
  unsigned char -> uchar
  Added missing copyright
  Indentation and prototype fixes
  Fixed compiler warning

  include/my_sys.h@1.198.1.1, 2006-06-19 12:45:29+03:00, monty@mysql.com +5 -4
    Fix prototype for my_print_open_files.
    Indentation fixes

  mysys/mf_keycache.c@1.60, 2006-06-19 12:45:29+03:00, monty@mysql.com +20 -3
    Fix that key cache can be compiled without #define THREAD

  mysys/my_error.c@1.22, 2006-06-19 12:45:29+03:00, monty@mysql.com +3 -1
    Indentation cleanups

  mysys/my_memmem.c@1.3, 2006-06-19 12:45:29+03:00, monty@mysql.com +18 -1
    Added missing copyright.
    Fix include files

  sql/event.cc@1.43, 2006-06-19 12:45:29+03:00, monty@mysql.com +2 -2
    unsigned char -> uchar

  sql/field.cc@1.314.1.1, 2006-06-19 12:45:29+03:00, monty@mysql.com +5 -5
    unsigned char -> uchar

  sql/filesort.cc@1.108, 2006-06-19 12:45:29+03:00, monty@mysql.com +51 -51
    Indentation fix

  sql/ha_ndbcluster.cc@1.316.1.1, 2006-06-19 12:45:29+03:00, monty@mysql.com +2 -2
    unsigned char -> uchar

  sql/ha_ndbcluster_binlog.cc@1.63.1.1, 2006-06-19 12:45:29+03:00, monty@mysql.com +5 -5
    unsigned char -> uchar

  sql/item_strfunc.cc@1.271.1.1, 2006-06-19 12:45:29+03:00, monty@mysql.com +3 -3
    unsigned char -> uchar

  sql/log_event.cc@1.225.1.1, 2006-06-19 12:45:29+03:00, monty@mysql.com +3 -3
    unsigned char -> uchar

  sql/opt_range.cc@1.217.2.2, 2006-06-19 12:45:30+03:00, monty@mysql.com +6 -6
    Indentation fixes

  sql/sql_crypt.cc@1.11, 2006-06-19 12:45:30+03:00, monty@mysql.com +2 -2
    unsigned char -> uchar

  sql/sql_string.cc@1.92.1.1, 2006-06-19 12:45:30+03:00, monty@mysql.com +3 -3
    unsigned char -> uchar

  sql/tztime.cc@1.37, 2006-06-19 12:45:30+03:00, monty@mysql.com +7 -7
    unsigned char -> uchar

  storage/heap/hp_extra.c@1.9, 2006-06-19 12:45:30+03:00, monty@mysql.com +1 -1
    Clear also next_block (See heap_scan_init)

  storage/heap/hp_test2.c@1.25, 2006-06-19 12:45:30+03:00, monty@mysql.com +1 -0
    Set required struct memeber max_table_size
    (Fixes that hp_test2 works again)

  storage/myisam/mi_rsamepos.c@1.7, 2006-06-19 12:45:30+03:00, monty@mysql.com +2 -1
    Fixed bug in mi_rsame_with_pos

  strings/decimal.c@1.71, 2006-06-19 12:45:30+03:00, monty@mysql.com +1 -1
    Fixed compiler warning

ChangeSet@1.2181.1.13, 2006-06-19 14:17:04+05:00, bar@mysql.com +1 -0
  Additional fix for 18201 XML: ExtractValue works even if the xml fragment is not well-formed xml
  Changing error number

  mysql-test/r/xml.result@1.16, 2006-06-19 14:16:54+05:00, bar@mysql.com +6 -6
    Additional fix for 18201 XML: ExtractValue works even if the xml fragment is not well-formed xml
    Changing error number

ChangeSet@1.1616.2641.1, 2006-06-19 14:05:14+05:00, svoj@may.pils.ru +3 -0
  BUG#18036 - update of table joined to self reports table as crashed
  Certain updates of table joined to self results in unexpected
  behavior.
  
  The problem was that record cache was mistakenly enabled for
  self-joined table updates. Normally record cache must be disabled
  for such updates.
  
  Fixed wrong condition in code that determines whether to use
  record cache for self-joined table updates.
  
  Only MyISAM tables were affected.

  mysql-test/r/myisam.result@1.45.1.15, 2006-06-19 14:05:09+05:00, svoj@may.pils.ru +8 -0
    Test case for BUG#18036.

  mysql-test/t/myisam.test@1.33.1.13, 2006-06-19 14:05:10+05:00, svoj@may.pils.ru +9 -0
    Test case for BUG#18036.

  sql/sql_update.cc@1.83.2.71, 2006-06-19 14:05:10+05:00, svoj@may.pils.ru +1 -1
    Fixed wrong condition in code that determines whether to use
    record cache for self-joined table updates.

ChangeSet@1.2181.14.30, 2006-06-19 10:50:23+02:00, pekka@clam.ndb.mysql.com +1 -0
  ndb - bug#14935 : Correct error to TUX on node alloc fail.  There is more bugs with db full.

  storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp@1.20, 2006-06-19 10:47:22+02:00, pekka@clam.ndb.mysql.com +1 -1
    set ZMEM_NOMEM_ERROR correctly when TUX fails to alloc node from TUP

ChangeSet@1.1616.2144.155, 2006-06-19 13:03:29+05:00, ramil@mysql.com +2 -0
  Fix for bug #20496: func_time.test failure                                      

  mysql-test/r/func_time.result@1.23.4.3, 2006-06-19 13:03:24+05:00, ramil@mysql.com +10 -3
    Fix for bug #20496: func_time.test failure                                      
      - floating point calculations removed.                                                  

  mysql-test/t/func_time.test@1.21.3.3, 2006-06-19 13:03:24+05:00, ramil@mysql.com +4 -2
    Fix for bug #20496: func_time.test failure                                      
      - floating point calculations removed.                                                  

ChangeSet@1.2181.33.6, 2006-06-19 09:25:49+02:00, mats@mysql.com +2 -0
  Replication/Backup Team Tree test fixing.

  mysql-test/extra/rpl_tests/rpl_truncate.test@1.2, 2006-06-19 09:25:43+02:00, mats@mysql.com +6 -6
    File included from test changed name.

  mysql-test/extra/rpl_tests/rpl_truncate_helper.test@1.4, 2006-06-19 09:18:36+02:00, mats@mysql.com +0 -0
    Rename: mysql-test/extra/rpl_tests/rpl_truncate_helper.inc -> mysql-test/extra/rpl_tests/rpl_truncate_helper.test

ChangeSet@1.2181.14.29, 2006-06-19 04:26:27+04:00, evgen@moonbone.local +5 -0
  rpl_log.test, rpl_stm_log.result:
    Fixed failing test case
  field.cc, item_cmpfunc.cc, select.result:
    After merge fix

  mysql-test/extra/rpl_tests/rpl_log.test@1.37.1.2, 2006-06-19 04:00:03+04:00, evgen@moonbone.local +7 -4
    Fixed failing test case

  mysql-test/r/rpl_stm_log.result@1.70, 2006-06-19 03:55:31+04:00, evgen@moonbone.local +7 -7
    Fixed failing test case

  mysql-test/r/select.result@1.130, 2006-06-19 03:54:59+04:00, evgen@moonbone.local +1 -65
    After merge fix

  sql/field.cc@1.319, 2006-06-19 03:57:05+04:00, evgen@moonbone.local +2 -2
    After merge fix

  sql/item_cmpfunc.cc@1.207, 2006-06-19 03:56:42+04:00, evgen@moonbone.local +19 -4
    After merge fix

ChangeSet@1.2181.37.1, 2006-06-17 16:20:39+02:00, serg@serg.mylan +10 -0
  atomic ops:
      my_atomic_XX_t -> intXX, no implicit locking anymore
      simplified framework, support for requested cleanups

  dbug/dbug.c@1.28, 2006-06-17 16:19:50+02:00, serg@serg.mylan +1 -1
    compiler warning

  include/atomic/nolock.h@1.2, 2006-06-17 16:19:50+02:00, serg@serg.mylan +2 -130
    my_atomic_XX_t -> intXX

  include/atomic/rwlock.h@1.2, 2006-06-17 16:19:50+02:00, serg@serg.mylan +7 -119
    my_atomic_XX_t -> intXX, no implicit locking anymore

  include/atomic/x86-gcc.h@1.3, 2006-06-17 16:19:51+02:00, serg@serg.mylan +18 -24
    my_atomic_XX_t -> intXX, no implicit locking anymore

  include/atomic/x86-msvc.h@1.2, 2006-06-17 16:19:51+02:00, serg@serg.mylan +57 -45
    my_atomic_XX_t -> intXX
    simplified defines
    support for cleanups

  include/my_atomic.h@1.2, 2006-06-17 16:19:51+02:00, serg@serg.mylan +99 -14
    my_atomic_XX_t -> intXX, no implicit locking anymore
    simplified framework, support for requested cleanups

  unittest/examples/no_plan-t.c@1.4, 2006-06-17 16:19:51+02:00, serg@serg.mylan +3 -3
    compiler warning

  unittest/mysys/Makefile.am@1.6, 2006-06-17 16:19:51+02:00, serg@serg.mylan +4 -4
    fix for dependencies

  unittest/mysys/my_atomic-t.c@1.4, 2006-06-17 16:19:51+02:00, serg@serg.mylan +50 -20
    my_atomic_XX_t -> intXX, no implicit locking anymore

  unittest/mytap/tap.c@1.5, 2006-06-17 16:19:52+02:00, serg@serg.mylan +2 -2
    cosmetic fix

ChangeSet@1.1616.2144.153, 2006-06-17 15:37:23+02:00, kent@mysql.com +2 -0
  Makefile.am:
    Avoid error message trying 'windoze-dsp' in obsolete directory
  compile-dist:
    Avoid error message for target 'distclean' and no Makefile

  BUILD/compile-dist@1.3.1.3, 2006-06-17 15:21:57+02:00, kent@mysql.com +1 -1
    Avoid error message for target 'distclean' and no Makefile

  ndb/Makefile.am@1.12.1.1, 2006-06-17 15:33:11+02:00, kent@mysql.com +2 -1
    Avoid error message trying 'windoze-dsp' in obsolete directory

ChangeSet@1.2181.14.26, 2006-06-17 13:12:38+02:00, pekka@clam.ndb.mysql.com +1 -0
  ndb - bug#19285 post merge 5.0->5.1 fix (error codes)

  storage/ndb/src/ndbapi/ndberror.c@1.61.1.3, 2006-06-17 13:11:00+02:00, pekka@clam.ndb.mysql.com +3 -2
    postmerge fix

ChangeSet@1.1810.1789.2, 2006-06-17 13:00:17+02:00, pekka@clam.ndb.mysql.com +2 -0
  ndb - bug#19285 minor fixes

  ndb/src/ndbapi/NdbBlob.cpp@1.22.7.1, 2006-06-17 12:59:23+02:00, pekka@clam.ndb.mysql.com +1 -1
    bug#19285 minor fixes

  ndb/src/ndbapi/ndberror.c@1.30.17.1, 2006-06-17 12:59:23+02:00, pekka@clam.ndb.mysql.com +1 -1
    bug#19285 minor fixes

ChangeSet@1.1616.2144.152, 2006-06-17 11:33:34+02:00, kent@mysql.com +1 -0
  make_win_src_distribution.sh:
    Make output less verbose
    Make temporary directory name unique
    Remove temporary directory on interrupt

  scripts/make_win_src_distribution.sh@1.27.2.11, 2006-06-17 11:32:20+02:00, kent@mysql.com +6 -11
    Make output less verbose
    Make temporary directory name unique
    Remove temporary directory on interrupt

ChangeSet@1.1810.1698.55, 2006-06-17 10:44:52+02:00, kent@mysql.com +1 -0
  make_win_src_distribution.sh:
    Don't try copy non existing extra/{sql_state,mysqld_error}.h

  scripts/make_win_src_distribution.sh@1.37.1.9, 2006-06-17 10:42:48+02:00, kent@mysql.com +0 -2
    Don't try copy non existing extra/{sql_state,mysqld_error}.h

ChangeSet@1.1616.2144.151, 2006-06-17 03:04:43+02:00, kent@mysql.com +1 -0
  make_win_src_distribution.sh:
    Include "sql_yacc.yy" for completeness (bug#20387)

  scripts/make_win_src_distribution.sh@1.27.2.10, 2006-06-17 03:00:42+02:00, kent@mysql.com +33 -16
    Include "sql_yacc.yy" for completeness (bug#20387)
    Improved error handling
    Don't list all files packed with tar/zip unless debugging

ChangeSet@1.1810.1800.3, 2006-06-17 02:52:14+04:00, evgen@moonbone.local +1 -0
  select.result:
    After merge fix

  mysql-test/r/select.result@1.121.1.6, 2006-06-17 01:58:57+04:00, evgen@moonbone.local +10 -0
    After merge fix

ChangeSet@1.1810.1698.52, 2006-06-17 00:30:02+02:00, kent@mysql.com +3 -0
  configure.in, net_serv.cc, compile-netware-END:
    Changes for Netware

  configure.in@1.245.51.2, 2006-06-17 00:23:25+02:00, kent@mysql.com +3 -3
    Call of "comp_err" has moved, changed code for Netware that
    edits make files to reflect this

  netware/BUILD/compile-netware-END@1.7.2.1, 2006-06-17 00:24:35+02:00, kent@mysql.com +0 -5
    After correcting "configure.in" to edit make files correctly,
    removed obsolete "sed" of "extra/Makefile.am" for Netware

  sql/net_serv.cc@1.88.1.1, 2006-06-17 00:20:03+02:00, kent@mysql.com +4 -0
    Netware needs <sys/select.h>

ChangeSet@1.1616.2144.150, 2006-06-16 22:29:52+02:00, kent@mysql.com +2 -0
  .del-mysql_install.def~8da659e7c0f7e571:
    Delete: netware/mysql_install.def
  Makefile.am:
    Removed obsolete "mysql_install.def"

  BitKeeper/deleted/.del-mysql_install.def~8da659e7c0f7e571@1.3.1.1, 2006-06-16 22:27:15+02:00, kent@mysql.com +0 -0
    Delete: netware/mysql_install.def

  netware/Makefile.am@1.7.1.8, 2006-06-16 22:26:13+02:00, kent@mysql.com +2 -2
    Removed obsolete "mysql_install.def"

ChangeSet@1.1616.2621.4, 2006-06-16 23:46:37+04:00, evgen@moonbone.local +2 -0
  item_strfunc.cc:
    Fix for bug#16716 for --ps-protocol mode.
  item_cmpfunc.cc:
    Fix for a memory allocation/freeing problem in agg_cmp_type() after fix
  for bug#16377. Few language corrections.

  sql/item_cmpfunc.cc@1.111.23.7, 2006-06-16 23:41:19+04:00, evgen@moonbone.local +11 -21
    Fix for a memory allocation/freeing problem in agg_cmp_type(). Few language corrections.

  sql/item_strfunc.cc@1.196.6.11, 2006-06-16 23:42:46+04:00, evgen@moonbone.local +2 -1
    Fix for bug#16716 for --ps-protocol mode.

ChangeSet@1.2181.36.1, 2006-06-16 15:04:35-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  Fix for broken compile if not compiling with partitioning

  sql/sql_table.cc@1.348, 2006-06-16 15:04:30-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
    Fix for broken compile if not compiling with partitioning

ChangeSet@1.1810.1799.1, 2006-06-16 20:21:25+04:00, dlenev@mysql.com +5 -0
  Fix for bug#13479 "REPLACE activates UPDATE trigger, not the DELETE and
  INSERT triggers".
  
  In cases when REPLACE was internally executed via update and table had
  on update (on delete) triggers defined we exposed the fact that such
  optimization used by callng on update (not calling on delete) triggers.
  Such behavior contradicts our documentation which describes REPLACE as
  INSERT with optional DELETE.
  
  This fix just disables this optimization for tables with on delete triggers.
  The optimization is still applied for tables which have on update but have
  no on delete triggers, we just don't invoke on update triggers in this case
  and thus don't expose information about optimization to user.
  
  Also added test coverage for values returned by ROW_COUNT() function (and
  thus for values returned by mysql_affected_rows()) for various forms of
  INSERT.

  mysql-test/r/insert.result@1.22.1.2, 2006-06-16 20:21:21+04:00, dlenev@mysql.com +26 -0
    Added test for values returned by ROW_COUNT() function (and thus for values
    returned by mysql_affected_rows()) for various forms of INSERT. We didn't
    have coverage for this before and since this fix touches related code it is
    better to add it now.

  mysql-test/r/trigger.result@1.29.1.12, 2006-06-16 20:21:21+04:00, dlenev@mysql.com +10 -22
    Adjusted test after fixing bug#13479 "REPLACE activates UPDATE trigger, not
    the DELETE and INSERT triggers".

  mysql-test/t/insert.test@1.22.1.1, 2006-06-16 20:21:21+04:00, dlenev@mysql.com +23 -0
    Added test for values returned by ROW_COUNT() function (and thus for values
    returned by mysql_affected_rows()) for various forms of INSERT. We didn't
    have coverage for this before and since this fix touches related code it is
    better to add it now.

  mysql-test/t/trigger.test@1.34.1.12, 2006-06-16 20:21:21+04:00, dlenev@mysql.com +17 -23
    Adjusted test after fixing bug#13479 "REPLACE activates UPDATE trigger, not
    the DELETE and INSERT triggers".

  sql/sql_insert.cc@1.146.22.1, 2006-06-16 20:21:21+04:00, dlenev@mysql.com +20 -23
    write_record():
      We should not expose that internally we sometimes execute REPLACE
      via UPDATE instead of documented INSERT + DELETE pair. So we should not
      use this optimization for tables with on delete triggers. OTOH it is ok
      to use it for tables which have on update but have no on delete triggers,
      we just should not invoke on update triggers in this case.

ChangeSet@1.2181.14.21, 2006-06-16 16:26:30+02:00, serg@serg.mylan +1 -0
  remove wrong assert

  sql/field.cc@1.317, 2006-06-16 16:26:11+02:00, serg@serg.mylan +1 -2
    remove wrong assert

ChangeSet@1.1810.1798.1, 2006-06-16 15:56:08+02:00, msvensson@neptunus.(none) +1 -0
  Set default valgrind options to "-v --show-reachable=yes" and make it possible to override that with --valgrind-options 

  mysql-test/mysql-test-run.pl@1.30.30.1, 2006-06-16 15:56:03+02:00, msvensson@neptunus.(none) +26 -24
    Make --valgrind-all a synonym for --valgrind.
    Set "-v --show-reachable=yes" as our default valgrind options. 
    Make --valgrind-options override the default options
    Update usage.
    Turn on valgrinding also when user specified --valgrind-path or --valgrind-options without --valgrind

ChangeSet@1.2181.35.1, 2006-06-16 12:29:04+02:00, knielsen@mysql.com +1 -0
  BUG#20498: Wrong usage of hash_first() in get_open_table().
  
  The get_open_table() function was using the wrong key for hash lookups.
  This could potentially lead to unpredictable behaviour.

  sql/ha_ndbcluster.cc@1.325.1.1, 2006-06-16 12:29:00+02:00, knielsen@mysql.com +3 -3
    BUG#20498: Wrong usage of hash_first() in get_open_table().

ChangeSet@1.2181.14.20, 2006-06-16 12:17:20+02:00, serg@serg.mylan +16 -0
  String::set(double) and set(longlong) -> set_real() and set_int()
  fix Field::store(double) being used instead of store(longlong)
  
  NB: overloading functions is evil

  sql/field.cc@1.316, 2006-06-16 12:16:57+02:00, serg@serg.mylan +5 -5
    String::set(double) and set(longlong) -> set_real() and set_int()
    fix Field::store(double) being used instead of store(longlong)
    
    NB: overloading functions is evil

  sql/item.cc@1.195, 2006-06-16 12:16:58+02:00, serg@serg.mylan +8 -8
    String::set(double) and set(longlong) -> set_real() and set_int()
    fix Field::store(double) being used instead of store(longlong)
    
    NB: overloading functions is evil

  sql/item_func.cc@1.298, 2006-06-16 12:16:58+02:00, serg@serg.mylan +9 -9
    String::set(double) and set(longlong) -> set_real() and set_int()
    fix Field::store(double) being used instead of store(longlong)
    
    NB: overloading functions is evil

  sql/item_strfunc.cc@1.272, 2006-06-16 12:16:58+02:00, serg@serg.mylan +1 -1
    String::set(double) and set(longlong) -> set_real() and set_int()
    fix Field::store(double) being used instead of store(longlong)
    
    NB: overloading functions is evil

  sql/item_sum.cc@1.180, 2006-06-16 12:16:58+02:00, serg@serg.mylan +2 -2
    String::set(double) and set(longlong) -> set_real() and set_int()
    fix Field::store(double) being used instead of store(longlong)
    
    NB: overloading functions is evil

  sql/item_timefunc.cc@1.121, 2006-06-16 12:16:59+02:00, serg@serg.mylan +1 -1
    String::set(double) and set(longlong) -> set_real() and set_int()
    fix Field::store(double) being used instead of store(longlong)
    
    NB: overloading functions is evil

  sql/log.cc@1.213.2.1, 2006-06-16 12:16:59+02:00, serg@serg.mylan +9 -9
    String::set(double) and set(longlong) -> set_real() and set_int()
    fix Field::store(double) being used instead of store(longlong)
    
    NB: overloading functions is evil

  sql/procedure.h@1.22, 2006-06-16 12:16:59+02:00, serg@serg.mylan +5 -5
    String::set(double) and set(longlong) -> set_real() and set_int()
    fix Field::store(double) being used instead of store(longlong)
    
    NB: overloading functions is evil

  sql/protocol.cc@1.116, 2006-06-16 12:16:59+02:00, serg@serg.mylan +2 -2
    String::set(double) and set(longlong) -> set_real() and set_int()
    fix Field::store(double) being used instead of store(longlong)
    
    NB: overloading functions is evil

  sql/sp.cc@1.112, 2006-06-16 12:16:59+02:00, serg@serg.mylan +7 -7
    String::set(double) and set(longlong) -> set_real() and set_int()
    fix Field::store(double) being used instead of store(longlong)
    
    NB: overloading functions is evil

  sql/sql_acl.cc@1.196, 2006-06-16 12:17:00+02:00, serg@serg.mylan +1 -1
    String::set(double) and set(longlong) -> set_real() and set_int()
    fix Field::store(double) being used instead of store(longlong)
    
    NB: overloading functions is evil

  sql/sql_analyse.cc@1.69, 2006-06-16 12:17:00+02:00, serg@serg.mylan +4 -4
    String::set(double) and set(longlong) -> set_real() and set_int()
    fix Field::store(double) being used instead of store(longlong)
    
    NB: overloading functions is evil

  sql/sql_analyse.h@1.21, 2006-06-16 12:17:00+02:00, serg@serg.mylan +23 -23
    String::set(double) and set(longlong) -> set_real() and set_int()
    fix Field::store(double) being used instead of store(longlong)
    
    NB: overloading functions is evil

  sql/sql_show.cc@1.347.1.4, 2006-06-16 12:17:00+02:00, serg@serg.mylan +1 -1
    String::set(double) and set(longlong) -> set_real() and set_int()
    fix Field::store(double) being used instead of store(longlong)
    
    NB: overloading functions is evil

  sql/sql_string.cc@1.94, 2006-06-16 12:17:00+02:00, serg@serg.mylan +2 -2
    String::set(double) and set(longlong) -> set_real() and set_int()
    fix Field::store(double) being used instead of store(longlong)
    
    NB: overloading functions is evil

  sql/sql_string.h@1.63, 2006-06-16 12:17:00+02:00, serg@serg.mylan +4 -4
    String::set(double) and set(longlong) -> set_real() and set_int()
    fix Field::store(double) being used instead of store(longlong)
    
    NB: overloading functions is evil

ChangeSet@1.2181.33.5, 2006-06-16 11:10:37+02:00, mats@mysql.com +3 -0
  Fixes in tests for Replication/Backup Team Tree.

  mysql-test/extra/rpl_tests/rpl_truncate_helper.inc@1.3, 2006-06-16 11:10:30+02:00, mats@mysql.com +1 -1
    Removing xid from test output

  mysql-test/r/rpl_truncate_7ndb.result@1.3, 2006-06-16 11:10:30+02:00, mats@mysql.com +18 -32
    Result change.

  mysql-test/t/rpl_truncate_7ndb.test@1.4, 2006-06-16 11:10:30+02:00, mats@mysql.com +1 -1
    Removing xid from test output

ChangeSet@1.1810.1784.9, 2006-06-16 14:05:58+05:00, ramil@mysql.com +5 -0
  after-merge fixes.

  mysql-test/r/rpl_log.result@1.62.2.2, 2006-06-16 14:05:44+05:00, ramil@mysql.com +5 -5
    after-merge fix.

  sql/item_func.cc@1.270.1.19, 2006-06-16 14:05:44+05:00, ramil@mysql.com +1 -1
    after-merge fix.

  sql/sql_class.cc@1.223.1.12, 2006-06-16 14:05:44+05:00, ramil@mysql.com +4 -0
    after-merge fix.

  sql/sql_class.h@1.230.27.1, 2006-06-16 14:05:45+05:00, ramil@mysql.com +2 -1
    after-merge fix.

  sql/ha_archive.cc@1.60.1.9, 2006-06-16 14:05:44+05:00, ramil@mysql.com +1 -1
    after-merge fix.

ChangeSet@1.1810.1728.2, 2006-06-16 09:49:18+02:00, serg@serg.mylan +3 -0
  Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index
  Don't rely on table->null_row when no index is used - it may be a multi-table search

  mysql-test/r/fulltext_left_join.result@1.12.1.1, 2006-06-16 09:48:54+02:00, serg@serg.mylan +17 -0
    Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index
    Don't rely on table->null_row when no index is used - it may be a multi-table search

  mysql-test/t/fulltext_left_join.test@1.12.1.1, 2006-06-16 09:48:54+02:00, serg@serg.mylan +14 -1
    Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index
    Don't rely on table->null_row when no index is used - it may be a multi-table search

  sql/item_func.cc@1.270.10.1, 2006-06-16 09:48:54+02:00, serg@serg.mylan +1 -1
    Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index
    Don't rely on table->null_row when no index is used - it may be a multi-table search

ChangeSet@1.2176.7.5, 2006-06-16 09:02:03+02:00, ingo@mysql.com +1 -0
  Bug#18775 - Temporary table from alter table visible to other threads
  
  The intermediate (not temporary) files of the new table
  during ALTER TABLE was visible for SHOW TABLES. These
  intermediate files are copies of the original table with
  the changes done by ALTER TABLE. After all the data is
  copied over from the original table, these files are renamed 
  to the original tables file names. So they are not temporary 
  files. They persist after ALTER TABLE, but just with another 
  name.
  
  Normal GRANT checking takes place for the intermediate table.
  Everyone who can see the original table (and hence the final
  table) can also see the intermediate table. But noone else.
  
  In 5.0 the intermediate files are invisible for SHOW TABLES
  because all file names beginning with "#sql" were suppressed.
  In 5.1 temporary files are created in TMPDIR, so that they
  don't appear in the database directories. Also in 5.1 a
  translation between table names and file names is done. The
  tmp_file_prefix on file level is now "@0023sql".
  
  The suppression of files starting with tmp_file_prefix is
  still in place, but still only files beginning with "#sql"
  were suppressed.
  
  I do now translate tmp_file_prefix from table name to file
  name before comparing it with the files in a directory.
  This suppresses the intermediate files again.
  
  No test case. The test case looks so that a reasonable big
  table is altered while a second thread runs SHOW TABLES.
  This in itself would be possible to do, but on slow machines
  it would add too much time to the test suite, while on fast
  machines the ALTER TABLE might have finished before SHOW
  TABLES looks at the directory. Even if there might be a good
  balance for todays machines, one day the test would become
  void as the intermediate table would not be seen even with
  the bug in place. I added a test script to the bug report.
  It can easily be changed so that it uses a table size that
  is appropriate for the test machine.

  sql/sql_show.cc@1.347.3.1, 2006-06-16 09:01:57+02:00, ingo@mysql.com +4 -1
    Bug#18775 - Temporary table from alter table visible to other threads
    Translating tmp_file_prefix to filename before comparison.

ChangeSet@1.2214, 2006-06-15 21:52:00-07:00, brian@zim.(none) +1 -0
  Fix for merged error (result set needed to be updated)

  mysql-test/r/create_not_windows.result@1.1.1.1, 2006-06-15 21:51:54-07:00, brian@zim.(none) +3 -3
    Change in test.

ChangeSet@1.1810.1744.20, 2006-06-15 20:29:05-07:00, igor@rurik.mysql.com +1 -0
  Post_merges fixes.

  mysql-test/r/func_group.result@1.46.2.4, 2006-06-15 20:28:59-07:00, igor@rurik.mysql.com +0 -2
    Post_merges fixes.

ChangeSet@1.2176.1.11, 2006-06-15 22:46:52-04:00, elliot@mysql.com +2 -0
  Fixing false alarm errors on windows build from a clean clone.

  win/build-vs71.bat@1.5, 2006-06-15 22:46:40-04:00, elliot@mysql.com +1 -1
    Don't trigger 'could not find the file specified' errors when 
    running from a clean clone.

  win/build-vs8.bat@1.5, 2006-06-15 22:46:41-04:00, elliot@mysql.com +1 -1
    Don't trigger 'could not find the file specified' errors when 
    running from a clean clone.

ChangeSet@1.2181.33.3, 2006-06-16 02:52:17+02:00, lars@mysql.com +3 -0
  After merge fixes

  sql/handler.cc@1.242, 2006-06-16 02:52:04+02:00, lars@mysql.com +2 -0
    After merge fixes

  sql/sql_class.h@1.299, 2006-06-16 02:52:05+02:00, lars@mysql.com +1 -4
    After merge fixes

  sql/sql_insert.cc@1.202, 2006-06-16 02:52:05+02:00, lars@mysql.com +1 -1
    After merge fixes

ChangeSet@1.2169.29.1, 2006-06-15 18:24:33-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
  BUG#19281: Auto-increment disappeared after create index

  mysql-test/r/partition_list.result@1.5, 2006-06-15 18:24:28-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +10 -0
    New test case

  mysql-test/t/partition_list.test@1.5, 2006-06-15 18:24:28-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +12 -0
    New test case

  sql/ha_partition.cc@1.50.2.1, 2006-06-15 18:24:28-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    Implement a proper update_create_info

ChangeSet@1.2212, 2006-06-15 23:47:32+02:00, msvensson@shellback.(none) +1 -0
  Verbose printouts added

  mysql-test/lib/mtr_process.pl@1.41, 2006-06-15 23:47:26+02:00, msvensson@shellback.(none) +23 -9
    Printouts in mtr_ping_port, telling what port was pinged nad if it was free or not

ChangeSet@1.2211, 2006-06-15 22:22:59+02:00, msvensson@shellback.(none) +1 -0
  Add small sleep after we have detected the server has connected

  mysql-test/t/wait_timeout.test@1.7, 2006-06-15 22:22:53+02:00, msvensson@shellback.(none) +6 -0
    Add small sleep after we have detected the server has connected

ChangeSet@1.2210, 2006-06-15 22:12:05+02:00, msvensson@shellback.(none) +1 -0
  Add extra parameter to 'ndbcluster_wait_started' so it can be used to wait until ndb_mgmd has started

  mysql-test/mysql-test-run.pl@1.137, 2006-06-15 22:11:58+02:00, msvensson@shellback.(none) +27 -21
    Add extra parameter to 'ndbcluster_wait_started' so it can be used to wait until ndb_mgmd has started

ChangeSet@1.1810.1797.1, 2006-06-15 22:02:26+02:00, knielsen@mysql.com +1 -0
  BUG#19940: Add Valgrind suppression for false alarm report.

  mysql-test/valgrind.supp@1.3.1.2, 2006-06-15 22:02:16+02:00, knielsen@mysql.com +15 -0
    BUG#19940: Add Valgrind suppression for false alarm report.

ChangeSet@1.2181.16.2, 2006-06-15 15:56:47-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  BUG#20397: Crash when alter table t1 engine = x;
  Review fixes

  sql/sql_table.cc@1.346, 2006-06-15 15:56:42-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +8 -5
    Review fixes

ChangeSet@1.2181.14.17, 2006-06-15 21:43:29+02:00, serg@serg.mylan +2 -0
  don't call plugins' configure scripts manually, use AC_CONFIG_SUBDIRS
  don't add CFLAGS/CXXFLAGS to ./configure command line in config.status
  but _do_ add them before calling plugins' configure scripts

  config/ac-macros/plugins.m4@1.16, 2006-06-15 21:42:57+02:00, serg@serg.mylan +1 -1
    don't call plugins' configure scripts manually, use AC_CONFIG_SUBDIRS

  configure.in@1.362, 2006-06-15 21:42:57+02:00, serg@serg.mylan +7 -22
    don't call plugins' configure scripts manually, use AC_CONFIG_SUBDIRS
    don't add CFLAGS/CXXFLAGS to ./configure command line in config.status
    but _do_ add them before calling plugins' configure scripts

ChangeSet@1.1810.1796.1, 2006-06-15 22:09:58+04:00, evgen@moonbone.local +3 -0
  Fixed bug#18175: The nest_level counter wasn't decremented for union parts which
  resulted in a wrong error message.
  
  The nest_level counter indicates the depth of nesting for a subselect. It is
  needed to properly resolve aggregate functions in nested subselects. Obviously 
  it shouldn't be incremented for UNION parts because they have the same level of
  nesting. This counter was incremented by 1 in the mysql_new_select() function
  for any new select and wasn't decremented for UNION parts. This resulted in
  wrongly reported error messages.
  
  Now the nest_level counter is decremented by 1 for any union part.

  mysql-test/r/union.result@1.80.1.2, 2006-06-15 22:08:55+04:00, evgen@moonbone.local +45 -0
    Added test case for the bug#18175: The nest_level counter wasn't decremented for union parts which
    resulted in a wrong error message.
    

  mysql-test/t/union.test@1.95, 2006-06-15 22:08:40+04:00, evgen@moonbone.local +48 -0
    Added test case for the bug#18175: The nest_level counter wasn't decremented for union parts which
    resulted in a wrong error message.
    

  sql/sql_yacc.yy@1.371.1.99, 2006-06-15 22:09:05+04:00, evgen@moonbone.local +2 -0
    Fixed bug#18175: The nest_level counter wasn't decremented for union parts which
    resulted in a wrong error message.
    Now the nest_level counter is decremented by 1 for any union part.

ChangeSet@1.2181.31.1, 2006-06-15 14:03:17-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
  BUG#19309: Crash if double procedural alter

  mysql-test/r/partition.result@1.38.5.1, 2006-06-15 14:03:12-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +8 -0
    New test case

  mysql-test/t/partition.test@1.40.4.1, 2006-06-15 14:03:12-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +14 -0
    New test case

  sql/sql_table.cc@1.344.4.1, 2006-06-15 14:03:12-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +37 -2
    Added new routine to make copy of create_info struct. This struct is
    manipulated during alter table and create table but needs to remain
    the same for repeated execution in stored procedures or prepared
    statements.

ChangeSet@1.2209, 2006-06-15 18:40:18+02:00, msvensson@shellback.(none) +2 -0
  Improved handling of marking processes as dead
  Run ndb_mgmd as deamon
  Make extra attempt to check if processes are still alive

  mysql-test/lib/mtr_process.pl@1.40, 2006-06-15 18:40:12+02:00, msvensson@shellback.(none) +59 -68
    Add common function to mark processes as dead
    When all attempts to kil processes has failed make an extra attempt with ping to check if they really are still alive

  mysql-test/mysql-test-run.pl@1.136, 2006-06-15 18:40:12+02:00, msvensson@shellback.(none) +17 -14
    Run ndb_mgmd with --nodaemon

ChangeSet@1.2181.1.10, 2006-06-15 17:40:23+02:00, rburnett@production.mysql.com +202 -0
  Removing VC++Files directory for 5.1 since we are now using CMake.  This has been cleared with Kent.
  
  .del-zlibvc.dsw~e0a83be4be21be4d:
    Delete: VC++Files/zlib/contrib/asm386/zlibvc.dsw
  .del-zlibvc.dsp~27398cfaac865081:
    Delete: VC++Files/zlib/contrib/asm386/zlibvc.dsp
  .del-zlib_ia64.dsp~76d309d598061eea:
    Delete: VC++Files/zlib/zlib_ia64.dsp
  .del-zlib.vcproj~9b1a681d56dae190:
    Delete: VC++Files/zlib/zlib.vcproj
  .del-zlib.dsp~503559fb84963a0d:
    Delete: VC++Files/zlib/zlib.dsp
  .del-vio_ia64.dsp~cdfbb900c43e7f10:
    Delete: VC++Files/vio/vio_ia64.dsp
  .del-vio.vcproj~b7c21b4e2d6a9b85:
    Delete: VC++Files/vio/vio.vcproj
  .del-vio.dsp~52ab62f9d499195a:
    Delete: VC++Files/vio/vio.dsp
  .del-thr_test_ia64.dsp~2ff226f5ce3197b4:
    Delete: VC++Files/thr_test/thr_test_ia64.dsp
  .del-thr_test.vcproj~fc0e15c1e6880160:
    Delete: VC++Files/thr_test/thr_test.vcproj
  .del-thr_test.dsp~af5f73d3335a6303:
    Delete: VC++Files/thr_test/thr_test.dsp
  .del-thr_test.c~70fc0971c72f2a95:
    Delete: VC++Files/thr_test/thr_test.c
  .del-thr_insert_test.dsp~e21944f040fb55a9:
    Delete: VC++Files/thr_insert_test/thr_insert_test.dsp
  .del-test1_ia64.dsp~42406d943e5f20f9:
    Delete: VC++Files/test1/test1_ia64.dsp
  .del-mysql_client_test_ia64.dsp~6a2b9edf3a66a00b:
    Delete: VC++Files/tests/mysql_client_test_ia64.dsp
  .del-mysql_client_test.vcproj~22188dcd372bc9de:
    Delete: VC++Files/tests/mysql_client_test.vcproj
  .del-mysql_client_test.dsp~d7b5fed623acb964:
    Delete: VC++Files/tests/mysql_client_test.dsp
  .del-test1.vcproj~c474b4614c67e2d2:
    Delete: VC++Files/test1/test1.vcproj
  .del-test1.dsp~83f105f472a193:
    Delete: VC++Files/test1/test1.dsp
  .del-strings.dsw~74e53a6013b0da99:
    Delete: VC++Files/strings/noMASM/strings.dsw
  .del-strings.dsp~7b4d145dfc64e39:
    Delete: VC++Files/strings/noMASM/strings.dsp
  .del-mysql_thr.c~20772782813d1274:
    Delete: VC++Files/test1/mysql_thr.c
  .del-strings_ia64.dsp~4cbf5c6548d3b4a4:
    Delete: VC++Files/strings/strings_ia64.dsp
  .del-strings.vcproj~6d1126ae59e4bf82:
    Delete: VC++Files/strings/strings.vcproj
  .del-strings.dsw~fc04f19f9c41f6ea:
    Delete: VC++Files/strings/strings.dsw
  .del-strings.dsw~44d2027eeeea00d6:
    Delete: VC++Files/strings/backup/strings.dsw
  .del-strings.dsp~de6c79f1cc99a48:
    Delete: VC++Files/strings/strings.dsp
  .del-strings.dsp~d1f09e84a9861d86:
    Delete: VC++Files/strings/backup/strings.dsp
  .del-strings.dsw~72e5896282b294d5:
    Delete: VC++Files/strings/MASM6x/strings.dsw
  .del-strings.dsp~ba34297c3be0c3aa:
    Delete: VC++Files/strings/MASM6x/strings.dsp
  .del-myisammrg_ia64.dsp~ffe1ccdf77392d5a:
    Delete: VC++Files/storage/myisammrg/myisammrg_ia64.dsp
  .del-myisammrg.vcproj~624417d12268d061:
    Delete: VC++Files/storage/myisammrg/myisammrg.vcproj
  .del-myisammrg.dsp~983cc2678e60e979:
    Delete: VC++Files/storage/myisammrg/myisammrg.dsp
  .del-myisam_ia64.dsp~ed98417b58974118:
    Delete: VC++Files/storage/myisam/myisam_ia64.dsp
  .del-myisam.vcproj~c8ad2ba4e8fb2b21:
    Delete: VC++Files/storage/myisam/myisam.vcproj
  .del-myisam.dsp~db522ff879e7720f:
    Delete: VC++Files/storage/myisam/myisam.dsp
  .del-innobase_ia64.dsp~dc7a9c2937f8fe75:
    Delete: VC++Files/storage/innobase/innobase_ia64.dsp
  .del-innobase.vcproj~4a6cd1221518a77f:
    Delete: VC++Files/storage/innobase/innobase.vcproj
  .del-innobase.dsp~8a85302e27197083:
    Delete: VC++Files/storage/innobase/innobase.dsp
  .del-libdb_tcl.def~bf5926f22f130545:
    Delete: VC++Files/storage/bdb/build_win32/libdb_tcl.def
  .del-heap_ia64.dsp~496a0b7e1268ef8e:
    Delete: VC++Files/storage/heap/heap_ia64.dsp
  .del-heap.vcproj~4382203ba03f4038:
    Delete: VC++Files/storage/heap/heap.vcproj
  .del-heap.dsp~ad83359791cc780:
    Delete: VC++Files/storage/heap/heap.dsp
  .del-example.vcproj~ae647078a46efb6e:
    Delete: VC++Files/storage/example/example.vcproj
  .del-libdb.def~898715818fce00a:
    Delete: VC++Files/storage/bdb/build_win32/libdb.def
  .del-excxx_tpcb.dsp~c2d09192efb7c6f1:
    Delete: VC++Files/storage/bdb/build_win32/excxx_tpcb.dsp
  .del-excxx_mpool.dsp~b98b16a8b35b2724:
    Delete: VC++Files/storage/bdb/build_win32/excxx_mpool.dsp
  .del-excxx_lock.dsp~c11419f4c472fd93:
    Delete: VC++Files/storage/bdb/build_win32/excxx_lock.dsp
  .del-excxx_env.dsp~a76359c56b592402:
    Delete: VC++Files/storage/bdb/build_win32/excxx_env.dsp
  .del-excxx_btrec.dsp~ef7959c1c777234f:
    Delete: VC++Files/storage/bdb/build_win32/excxx_btrec.dsp
  .del-excxx_access.dsp~63d67774c47ee39:
    Delete: VC++Files/storage/bdb/build_win32/excxx_access.dsp
  .del-ex_tpcb.dsp~303f15835d3608c:
    Delete: VC++Files/storage/bdb/build_win32/ex_tpcb.dsp
  .del-ex_mpool.dsp~7fdaf9e8399340e:
    Delete: VC++Files/storage/bdb/build_win32/ex_mpool.dsp
  .del-ex_lock.dsp~dd9b8ad7ca7fb617:
    Delete: VC++Files/storage/bdb/build_win32/ex_lock.dsp
  .del-ex_env.dsp~2ef0d5f066cb2ae7:
    Delete: VC++Files/storage/bdb/build_win32/ex_env.dsp
  .del-ex_btrec.dsp~5e8268bdd6eb02da:
    Delete: VC++Files/storage/bdb/build_win32/ex_btrec.dsp
  .del-ex_access.dsp~dedbebade1266682:
    Delete: VC++Files/storage/bdb/build_win32/ex_access.dsp
  .del-db_verify.dsp~8d56f94abea8d89b:
    Delete: VC++Files/storage/bdb/build_win32/db_verify.dsp
  .del-db_upgrade.dsp~c0eeab4121e3b43b:
    Delete: VC++Files/storage/bdb/build_win32/db_upgrade.dsp
  .del-db_test.dsp~c5df2b5cdf7d240f:
    Delete: VC++Files/storage/bdb/build_win32/db_test.dsp
  .del-db_tcl.dsp~fe347860ef24d36b:
    Delete: VC++Files/storage/bdb/build_win32/db_tcl.dsp
  .del-db_static1.dsp~93cdd4a79c56117f:
    Delete: VC++Files/storage/bdb/build_win32/db_static1.dsp
  .del-db_static.dsp~e7e19a638e56c8d5:
    Delete: VC++Files/storage/bdb/build_win32/db_static.dsp
  .del-db_stat.dsp~f4322f2f6f5241e5:
    Delete: VC++Files/storage/bdb/build_win32/db_stat.dsp
  .del-db_recover.dsp~516a4a0a93e5ecc2:
    Delete: VC++Files/storage/bdb/build_win32/db_recover.dsp
  .del-db_printlog.dsp~817cc167432446b8:
    Delete: VC++Files/storage/bdb/build_win32/db_printlog.dsp
  .del-db_load.dsp~7c0d709abbea81ee:
    Delete: VC++Files/storage/bdb/build_win32/db_load.dsp
  .del-db_java.dsp~f5f6285f1e205f2:
    Delete: VC++Files/storage/bdb/build_win32/db_java.dsp
  .del-db_dump.dsp~7f9cfc4363e1317c:
    Delete: VC++Files/storage/bdb/build_win32/db_dump.dsp
  .del-db_dll.dsp~7d5f832f50291933:
    Delete: VC++Files/storage/bdb/build_win32/db_dll.dsp
  .del-db_deadlock.dsp~12a22e0ca1a33b83:
    Delete: VC++Files/storage/bdb/build_win32/db_deadlock.dsp
  .del-db_checkpoint.dsp~f14eb8d118472abf:
    Delete: VC++Files/storage/bdb/build_win32/db_checkpoint.dsp
  .del-db_buildall.dsp~5d5b8082549e422f:
    Delete: VC++Files/storage/bdb/build_win32/db_buildall.dsp
  .del-db_archive.dsp~dea482eaf6dc3861:
    Delete: VC++Files/storage/bdb/build_win32/db_archive.dsp
  .del-bdb.vcproj~a912c68f1c2094:
    Delete: VC++Files/storage/bdb/bdb.vcproj
  .del-bdb.dsp~acd664862f396dd9:
    Delete: VC++Files/storage/bdb/bdb.dsp
  .del-archive.vcproj~1a017e10fae26f17:
    Delete: VC++Files/storage/archive/archive.vcproj
  .del-Berkeley_DB.dsw~8c801b3e52e89bbe:
    Delete: VC++Files/storage/bdb/build_win32/Berkeley_DB.dsw
  .del-mysqldmax_ia64.dsp~25006b7cc0725ad1:
    Delete: VC++Files/sql/mysqldmax_ia64.dsp
  .del-mysqldmax.dsp~5d213fe1c204142e:
    Delete: VC++Files/sql/mysqldmax.dsp
  .del-mysqld_ia64.dsp~7f8cf84d81ee04e2:
    Delete: VC++Files/sql/mysqld_ia64.dsp
  .del-mysqld.vcproj~6aa7b3f9c3e28fcb:
    Delete: VC++Files/sql/mysqld.vcproj
  .del-mysqld.dsw~fc5629c0fc1bc3af:
    Delete: VC++Files/sql/old/mysqld.dsw
  .del-mysqld.dsw~2fa9d2fa9a5902ef:
    Delete: VC++Files/sql/mysqld.dsw
  .del-replace_ia64.dsp~666e3b313837d42e:
    Delete: VC++Files/replace/replace_ia64.dsp
  .del-mysqld.dsp~ffdbf2d234e23e56:
    Delete: VC++Files/sql/mysqld.dsp
  .del-message.mc~6ff9e8e3e7294840:
    Delete: VC++Files/sql/message.mc
  .del-gen_lex_hash.vcproj~544be6b6:
    Delete: VC++Files/sql/gen_lex_hash.vcproj
  .del-gen_lex_hash.dsp~540feedd:
    Delete: VC++Files/sql/gen_lex_hash.dsp
  .del-replace.vcproj~9620b1ced86e527a:
    Delete: VC++Files/replace/replace.vcproj
  .del-replace.dsp~a97f6dda5abfb438:
    Delete: VC++Files/replace/replace.dsp
  .del-regex_ia64.dsp~dcd4172d1a454aa3:
    Delete: VC++Files/regex/regex_ia64.dsp
  .del-regex.vcproj~9dea9caafa801b26:
    Delete: VC++Files/regex/regex.vcproj
  .del-regex.dsw~59ac4f03e7ef16e:
    Delete: VC++Files/regex/regex.dsw
  .del-regex.dsp~99de200e71b64359:
    Delete: VC++Files/regex/regex.dsp
  .del-perror_ia64.dsp~be2ccb6d1c91c625:
    Delete: VC++Files/perror/perror_ia64.dsp
  .del-fulltext.vcproj~27ad6672:
    Delete: VC++Files/plugin/fulltext/fulltext.vcproj
  .del-fulltext.def~27754c94:
    Delete: VC++Files/plugin/fulltext/fulltext.def
  .del-perror.vcproj~86ad9dc660a048ad:
    Delete: VC++Files/perror/perror.vcproj
  .del-perror.dsp~d314b288f6337f54:
    Delete: VC++Files/perror/perror.dsp
  .del-mysys_ia64.dsp~7a98bd8cd01d3043:
    Delete: VC++Files/mysys/mysys_ia64.dsp
  .del-mysys.vcproj~40a49d09c4184822:
    Delete: VC++Files/mysys/mysys.vcproj
  .del-mysys.dsw~f9dacc88b2a51ba5:
    Delete: VC++Files/mysys/mysys.dsw
  .del-mysys.dsp~32695fee91189326:
    Delete: VC++Files/mysys/mysys.dsp
  .del-mysqlserver_ia64.dsp~9cd3f0532874bfbe:
    Delete: VC++Files/mysqlserver/mysqlserver_ia64.dsp
  .del-mysqlserver.vcproj~327cf9fb1c5ec95d:
    Delete: VC++Files/mysqlserver/mysqlserver.vcproj
  .del-mysqlserver.dsp~d99cfb2d291e3785:
    Delete: VC++Files/mysqlserver/mysqlserver.dsp
  .del-dummy.cpp~38c1c081e0b4c236:
    Delete: VC++Files/mysqlserver/dummy.cpp
  .del-mysqldemb_ia64.dsp~c7f7d75d542393cd:
    Delete: VC++Files/mysqldemb/mysqldemb_ia64.dsp
  .del-mysqldemb.vcproj~54c64d55ccc51a7c:
    Delete: VC++Files/mysqldemb/mysqldemb.vcproj
  .del-mysqldemb.dsp~1baf8c0e59ee9f7e:
    Delete: VC++Files/mysqldemb/mysqldemb.dsp
  .del-mysqlcheck_ia64.dsp~7123d1228c39b249:
    Delete: VC++Files/mysqlcheck/mysqlcheck_ia64.dsp
  .del-mysqlcheck.vcproj~7022581c8b8a7ea2:
    Delete: VC++Files/mysqlcheck/mysqlcheck.vcproj
  .del-mysqlcheck.dsp~b6295bc9b0c70650:
    Delete: VC++Files/mysqlcheck/mysqlcheck.dsp
  .del-mysqlbinlog_ia64.dsp~ac0f4f9efb251f5:
    Delete: VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp
  .del-mysqlbinlog.vcproj~b2a5b1868f5d6596:
    Delete: VC++Files/mysqlbinlog/mysqlbinlog.vcproj
  .del-mysqlbinlog.dsp~e24094996da02d02:
    Delete: VC++Files/mysqlbinlog/mysqlbinlog.dsp
  .del-myisampack_ia64.dsp~628bd80a496099d5:
    Delete: VC++Files/myisampack/myisampack_ia64.dsp
  .del-myisampack.vcproj~3f7d4ec0cb56a9a0:
    Delete: VC++Files/myisampack/myisampack.vcproj
  .del-myisampack.dsp~be5b602ddfb1a75a:
    Delete: VC++Files/myisampack/myisampack.dsp
  .del-myisamlog_ia64.dsp~a362c2702ab87e07:
    Delete: VC++Files/myisamlog/myisamlog_ia64.dsp
  .del-myisamlog.vcproj~daa6596ea386e5a7:
    Delete: VC++Files/myisamlog/myisamlog.vcproj
  .del-myisamlog.dsp~9f89a0e49b84a45:
    Delete: VC++Files/myisamlog/myisamlog.dsp
  .del-myisamchk_ia64.dsp~a8344727d14479e:
    Delete: VC++Files/myisamchk/myisamchk_ia64.dsp
  .del-myisamchk.vcproj~982ebe5673e58fb6:
    Delete: VC++Files/myisamchk/myisamchk.vcproj
  .del-myisamchk.dsp~b8627861f0e8dd3e:
    Delete: VC++Files/myisamchk/myisamchk.dsp
  .del-myisam_ftdump_ia64.dsp~62d0f5a56a03242:
    Delete: VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp
  .del-myisam_ftdump.vcproj~409c19b0274b7f8e:
    Delete: VC++Files/myisam_ftdump/myisam_ftdump.vcproj
  .del-myisam_ftdump.dsp~8501cb3943c50bb0:
    Delete: VC++Files/myisam_ftdump/myisam_ftdump.dsp
  .del-my_print_defaults_ia64.dsp~11f0e6ae16691bce:
    Delete: VC++Files/my_print_defaults/my_print_defaults_ia64.dsp
  .del-mytest.dsw~2324698861155335:
    Delete: VC++Files/libmysqltest/mytest.dsw
  .del-my_print_defaults.vcproj~c8aa2bd86e13c3f9:
    Delete: VC++Files/my_print_defaults/my_print_defaults.vcproj
  .del-my_print_defaults.dsp~6393cfdfd0e1b2ee:
    Delete: VC++Files/my_print_defaults/my_print_defaults.dsp
  .del-merge_ia64.dsp~d4848c4ba119776c:
    Delete: VC++Files/merge/merge_ia64.dsp
  .del-merge.dsw~559bbc65cf36612b:
    Delete: VC++Files/merge/merge.dsw
  .del-merge.dsp~ba1dc5704d438e10:
    Delete: VC++Files/merge/merge.dsp
  .del-mytest.c~9a99338689e5de8:
    Delete: VC++Files/libmysqltest/mytest.c
  .del-myTest_ia64.dsp~b17572b217d092e6:
    Delete: VC++Files/libmysqltest/myTest_ia64.dsp
  .del-myTest.vcproj~dba5adc4fad3c06:
    Delete: VC++Files/libmysqltest/myTest.vcproj
  .del-myTest.dsp~4a8c480769193952:
    Delete: VC++Files/libmysqltest/myTest.dsp
  .del-myTest-package_ia64.dsp~e423b69f2c624850:
    Delete: VC++Files/libmysqltest/myTest-package_ia64.dsp
  .del-myTest-package.dsp~ec9faf3287cbe2b9:
    Delete: VC++Files/libmysqltest/myTest-package.dsp
  .del-test_libmysqld_ia64.dsp~d79f095fa7072b25:
    Delete: VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp
  .del-test_libmysqld.vcproj~fb301d42d5c4e6f4:
    Delete: VC++Files/libmysqld/examples/test_libmysqld.vcproj
  .del-test_libmysqld.dsp~681dc3c6e97a48f2:
    Delete: VC++Files/libmysqld/examples/test_libmysqld.dsp
  .del-libmysqld_ia64.dsp~578ab58d5f281d2a:
    Delete: VC++Files/libmysqld/libmysqld_ia64.dsp
  .del-libmysqld.vcproj~a75d5b9a5967dea0:
    Delete: VC++Files/libmysqld/libmysqld.vcproj
  .del-libmysqld.dsp~78dc6a589e5a4149:
    Delete: VC++Files/libmysqld/libmysqld.dsp
  .del-udf_example.dsw~91692a3d:
    Delete: VC++Files/examples/udf_example/udf_example.dsw
  .del-libmysql_ia64.dsp~ddad907847ceed3:
    Delete: VC++Files/libmysql/libmysql_ia64.dsp
  .del-libmysql.vcproj~e21508a4cbf96b49:
    Delete: VC++Files/libmysql/libmysql.vcproj
  .del-libmysql.dsw~e7bc53b7d2c2e081:
    Delete: VC++Files/libmysql/libmysql.dsw
  .del-libmysql.dsp~eebbe823fb1ed32:
    Delete: VC++Files/libmysql/libmysql.dsp
  .del-udf_example.dsp~91456aca:
    Delete: VC++Files/examples/udf_example/udf_example.dsp
  .del-udf_example.def~9111ef87:
    Delete: VC++Files/examples/udf_example/udf_example.def
  .del-dbug_ia64.dsp~76dbb7ecf79ee3e5:
    Delete: VC++Files/dbug/dbug_ia64.dsp
  .del-dbug.vcproj~1fc073f0c76a14b5:
    Delete: VC++Files/dbug/dbug.vcproj
  .del-dbug.dsw~6182dd731bef15f9:
    Delete: VC++Files/dbug/dbug.dsw
  .del-dbug.dsp~848b9cda893ec0cd:
    Delete: VC++Files/dbug/dbug.dsp
  .del-zlibvc.dsw~c6fcbe08f7876788:
    Delete: VC++Files/contrib/minizip/zlibvc.dsw
  .del-zlibvc.dsw~be3fc0a598daa999:
    Delete: VC++Files/contrib/asm386/zlibvc.dsw
  .del-zlibvc.dsp~d8e6e287a364132f:
    Delete: VC++Files/contrib/asm386/zlibvc.dsp
  .del-zlibvc.dsp~4661a0a47229e354:
    Delete: VC++Files/contrib/minizip/zlibvc.dsp
  .del-comp_err_ia64.dsp~4b56e5e25d9e54de:
    Delete: VC++Files/comp_err/comp_err_ia64.dsp
  .del-comp_err.vcproj~45c167ae5ddd5a96:
    Delete: VC++Files/comp_err/comp_err.vcproj
  .del-mysqltest_ia64.dsp~fc3a4cd59af92ac8:
    Delete: VC++Files/client/mysqltest_ia64.dsp
  .del-mysqltest.vcproj~21878840704179ef:
    Delete: VC++Files/client/mysqltest.vcproj
  .del-mysqltest.dsp~bb948912e890ae3:
    Delete: VC++Files/client/mysqltest.dsp
  .del-mysqlslap.vcproj~6f30db25e7c09b6e:
    Delete: VC++Files/client/mysqlslap.vcproj
  .del-mysqlshow_ia64.dsp~5b77172f8e4fe84a:
    Delete: VC++Files/client/mysqlshow_ia64.dsp
  .del-comp_err.dsp~cdd2b4a543da5d4c:
    Delete: VC++Files/comp_err/comp_err.dsp
  .del-mysqlshow.vcproj~797d4fa322faa148:
    Delete: VC++Files/client/mysqlshow.vcproj
  .del-mysqlshow.dsp~7166315b18f991d7:
    Delete: VC++Files/client/mysqlshow.dsp
  .del-mysqlimport_ia64.dsp~c905eeae53373c68:
    Delete: VC++Files/client/mysqlimport_ia64.dsp
  .del-mysqlimport.vcproj~5a30228ef641c081:
    Delete: VC++Files/client/mysqlimport.vcproj
  .del-mysqlimport.dsp~d508ae2a3483f1ab:
    Delete: VC++Files/client/mysqlimport.dsp
  .del-mysqldump_ia64.dsp~a2aabe898be35b31:
    Delete: VC++Files/client/mysqldump_ia64.dsp
  .del-mysqldump.vcproj~22f26554166c8e38:
    Delete: VC++Files/client/mysqldump.vcproj
  .del-mysqldump.dsp~a8bd23547d3fc27e:
    Delete: VC++Files/client/mysqldump.dsp
  .del-mysqlclient_ia64.dsp~ecab72d5220875b:
    Delete: VC++Files/client/mysqlclient_ia64.dsp
  .del-mysqlclient.vcproj~e78a73e31368a44a:
    Delete: VC++Files/client/mysqlclient.vcproj
  .del-mysqlclient.dsw~1c2fa53ceaed0042:
    Delete: VC++Files/client/mysqlclient.dsw
  .del-mysqlclient.dsp~c9f1abb3247adfa0:
    Delete: VC++Files/client/mysqlclient.dsp
  .del-mysqlcheck_ia64.dsp~5726883250a7526a:
    Delete: VC++Files/client/mysqlcheck_ia64.dsp
  .del-mysqlcheck.dsp~da7dcab87501f05b:
    Delete: VC++Files/client/mysqlcheck.dsp
  .del-mysqladmin_ia64.dsp~6d8d1da649203881:
    Delete: VC++Files/client/mysqladmin_ia64.dsp
  .del-mysqladmin.vcproj~178fa55cba442d50:
    Delete: VC++Files/client/mysqladmin.vcproj
  .del-mysqladmin.dsp~1f8468bd768bcbcd:
    Delete: VC++Files/client/mysqladmin.dsp
  .del-mysql_upgrade_ia64.dsp~c9007a313d39d7e8:
    Delete: VC++Files/client/mysql_upgrade_ia64.dsp
  .del-mysql_upgrade.vcproj~54815b7265120589:
    Delete: VC++Files/client/mysql_upgrade.vcproj
  .del-mysql_upgrade.dsp~e44498c4a2714360:
    Delete: VC++Files/client/mysql_upgrade.dsp
  .del-mysql_ia64.dsp~e651942397edd7e5:
    Delete: VC++Files/client/mysql_ia64.dsp
  .del-mysql.vcproj~f7bfe13a8836eea0:
    Delete: VC++Files/client/mysql.vcproj
  .del-mysql.dsp~1ea3b71c5b73913b:
    Delete: VC++Files/client/mysql.dsp
  .del-prepare~773a10a535120a7e:
    Delete: VC++Files/prepare
  .del-mysql_ia64.dsw~5030d1d1d4c87330:
    Delete: VC++Files/mysql_ia64.dsw
  .del-mysql.sln~76a9ff1e793b3547:
    Delete: VC++Files/mysql.sln
  .del-mysql.dsw~7ea9e16395f139f4:
    Delete: VC++Files/mysql.dsw
  .del-mysql.dsp~9d6eee4fc1d54ca5:
    Delete: VC++Files/mysql.dsp
  .del-fix-project-files~892fb27fa831ee36:
    Delete: VC++Files/fix-project-files
  .del-copy_mysql_files.bat~f6878eeb80173de9:
    Delete: VC++Files/copy_mysql_files.bat
  .del-README.build-files~8aa38ef3fb2ffc61:
    Delete: VC++Files/README.build-files

  BitKeeper/deleted/.del-Berkeley_DB.dsw~8c801b3e52e89bbe@1.5, 2006-06-15 17:39:05+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/Berkeley_DB.dsw

  BitKeeper/deleted/.del-README.build-files~8aa38ef3fb2ffc61@1.2, 2006-06-15 17:38:42+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/README.build-files

  BitKeeper/deleted/.del-archive.vcproj~1a017e10fae26f17@1.2, 2006-06-15 17:39:05+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/archive/archive.vcproj

  BitKeeper/deleted/.del-bdb.dsp~acd664862f396dd9@1.11, 2006-06-15 17:39:05+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/bdb.dsp

  BitKeeper/deleted/.del-bdb.vcproj~a912c68f1c2094@1.7, 2006-06-15 17:39:05+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/bdb.vcproj

  BitKeeper/deleted/.del-comp_err.dsp~cdd2b4a543da5d4c@1.10, 2006-06-15 17:38:48+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/comp_err/comp_err.dsp

  BitKeeper/deleted/.del-comp_err.vcproj~45c167ae5ddd5a96@1.2, 2006-06-15 17:38:49+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/comp_err/comp_err.vcproj

  BitKeeper/deleted/.del-comp_err_ia64.dsp~4b56e5e25d9e54de@1.3, 2006-06-15 17:38:49+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/comp_err/comp_err_ia64.dsp

  BitKeeper/deleted/.del-copy_mysql_files.bat~f6878eeb80173de9@1.5, 2006-06-15 17:38:42+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/copy_mysql_files.bat

  BitKeeper/deleted/.del-db_archive.dsp~dea482eaf6dc3861@1.5, 2006-06-15 17:39:06+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/db_archive.dsp

  BitKeeper/deleted/.del-db_buildall.dsp~5d5b8082549e422f@1.5, 2006-06-15 17:39:06+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/db_buildall.dsp

  BitKeeper/deleted/.del-db_checkpoint.dsp~f14eb8d118472abf@1.5, 2006-06-15 17:39:06+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/db_checkpoint.dsp

  BitKeeper/deleted/.del-db_deadlock.dsp~12a22e0ca1a33b83@1.5, 2006-06-15 17:39:06+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/db_deadlock.dsp

  BitKeeper/deleted/.del-db_dll.dsp~7d5f832f50291933@1.5, 2006-06-15 17:39:06+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/db_dll.dsp

  BitKeeper/deleted/.del-db_dump.dsp~7f9cfc4363e1317c@1.5, 2006-06-15 17:39:07+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/db_dump.dsp

  BitKeeper/deleted/.del-db_java.dsp~f5f6285f1e205f2@1.5, 2006-06-15 17:39:07+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/db_java.dsp

  BitKeeper/deleted/.del-db_load.dsp~7c0d709abbea81ee@1.5, 2006-06-15 17:39:07+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/db_load.dsp

  BitKeeper/deleted/.del-db_printlog.dsp~817cc167432446b8@1.5, 2006-06-15 17:39:07+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/db_printlog.dsp

  BitKeeper/deleted/.del-db_recover.dsp~516a4a0a93e5ecc2@1.5, 2006-06-15 17:39:07+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/db_recover.dsp

  BitKeeper/deleted/.del-db_stat.dsp~f4322f2f6f5241e5@1.5, 2006-06-15 17:39:08+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/db_stat.dsp

  BitKeeper/deleted/.del-db_static.dsp~e7e19a638e56c8d5@1.5, 2006-06-15 17:39:08+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/db_static.dsp

  BitKeeper/deleted/.del-db_static1.dsp~93cdd4a79c56117f@1.5, 2006-06-15 17:39:08+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/db_static1.dsp

  BitKeeper/deleted/.del-db_tcl.dsp~fe347860ef24d36b@1.5, 2006-06-15 17:39:08+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/db_tcl.dsp

  BitKeeper/deleted/.del-db_test.dsp~c5df2b5cdf7d240f@1.5, 2006-06-15 17:39:08+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/db_test.dsp

  BitKeeper/deleted/.del-db_upgrade.dsp~c0eeab4121e3b43b@1.5, 2006-06-15 17:39:08+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/db_upgrade.dsp

  BitKeeper/deleted/.del-db_verify.dsp~8d56f94abea8d89b@1.5, 2006-06-15 17:39:09+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/db_verify.dsp

  BitKeeper/deleted/.del-dbug.dsp~848b9cda893ec0cd@1.7, 2006-06-15 17:38:50+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/dbug/dbug.dsp

  BitKeeper/deleted/.del-dbug.dsw~6182dd731bef15f9@1.5, 2006-06-15 17:38:50+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/dbug/dbug.dsw

  BitKeeper/deleted/.del-dbug.vcproj~1fc073f0c76a14b5@1.4, 2006-06-15 17:38:50+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/dbug/dbug.vcproj

  BitKeeper/deleted/.del-dbug_ia64.dsp~76dbb7ecf79ee3e5@1.2, 2006-06-15 17:38:50+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/dbug/dbug_ia64.dsp

  BitKeeper/deleted/.del-dummy.cpp~38c1c081e0b4c236@1.2, 2006-06-15 17:38:59+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/mysqlserver/dummy.cpp

  BitKeeper/deleted/.del-ex_access.dsp~dedbebade1266682@1.5, 2006-06-15 17:39:09+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/ex_access.dsp

  BitKeeper/deleted/.del-ex_btrec.dsp~5e8268bdd6eb02da@1.5, 2006-06-15 17:39:09+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/ex_btrec.dsp

  BitKeeper/deleted/.del-ex_env.dsp~2ef0d5f066cb2ae7@1.5, 2006-06-15 17:39:09+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/ex_env.dsp

  BitKeeper/deleted/.del-ex_lock.dsp~dd9b8ad7ca7fb617@1.5, 2006-06-15 17:39:09+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/ex_lock.dsp

  BitKeeper/deleted/.del-ex_mpool.dsp~7fdaf9e8399340e@1.5, 2006-06-15 17:39:10+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/ex_mpool.dsp

  BitKeeper/deleted/.del-ex_tpcb.dsp~303f15835d3608c@1.5, 2006-06-15 17:39:10+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/ex_tpcb.dsp

  BitKeeper/deleted/.del-example.vcproj~ae647078a46efb6e@1.4, 2006-06-15 17:39:12+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/example/example.vcproj

  BitKeeper/deleted/.del-excxx_access.dsp~63d67774c47ee39@1.5, 2006-06-15 17:39:10+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/excxx_access.dsp

  BitKeeper/deleted/.del-excxx_btrec.dsp~ef7959c1c777234f@1.5, 2006-06-15 17:39:10+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/excxx_btrec.dsp

  BitKeeper/deleted/.del-excxx_env.dsp~a76359c56b592402@1.5, 2006-06-15 17:39:10+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/excxx_env.dsp

  BitKeeper/deleted/.del-excxx_lock.dsp~c11419f4c472fd93@1.5, 2006-06-15 17:39:11+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/excxx_lock.dsp

  BitKeeper/deleted/.del-excxx_mpool.dsp~b98b16a8b35b2724@1.5, 2006-06-15 17:39:11+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/excxx_mpool.dsp

  BitKeeper/deleted/.del-excxx_tpcb.dsp~c2d09192efb7c6f1@1.5, 2006-06-15 17:39:11+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/excxx_tpcb.dsp

  BitKeeper/deleted/.del-fix-project-files~892fb27fa831ee36@1.2, 2006-06-15 17:38:43+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/fix-project-files

  BitKeeper/deleted/.del-fulltext.def~27754c94@1.2, 2006-06-15 17:39:01+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/plugin/fulltext/fulltext.def

  BitKeeper/deleted/.del-fulltext.vcproj~27ad6672@1.2, 2006-06-15 17:39:01+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/plugin/fulltext/fulltext.vcproj

  BitKeeper/deleted/.del-gen_lex_hash.dsp~540feedd@1.2, 2006-06-15 17:39:03+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/sql/gen_lex_hash.dsp

  BitKeeper/deleted/.del-gen_lex_hash.vcproj~544be6b6@1.2, 2006-06-15 17:39:03+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/sql/gen_lex_hash.vcproj

  BitKeeper/deleted/.del-heap.dsp~ad83359791cc780@1.9, 2006-06-15 17:39:12+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/heap/heap.dsp

  BitKeeper/deleted/.del-heap.vcproj~4382203ba03f4038@1.4, 2006-06-15 17:39:12+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/heap/heap.vcproj

  BitKeeper/deleted/.del-heap_ia64.dsp~496a0b7e1268ef8e@1.4, 2006-06-15 17:39:12+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/heap/heap_ia64.dsp

  BitKeeper/deleted/.del-innobase.dsp~8a85302e27197083@1.23, 2006-06-15 17:39:13+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/innobase/innobase.dsp

  BitKeeper/deleted/.del-innobase.vcproj~4a6cd1221518a77f@1.5, 2006-06-15 17:39:13+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/innobase/innobase.vcproj

  BitKeeper/deleted/.del-innobase_ia64.dsp~dc7a9c2937f8fe75@1.4, 2006-06-15 17:39:13+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/innobase/innobase_ia64.dsp

  BitKeeper/deleted/.del-libdb.def~898715818fce00a@1.3, 2006-06-15 17:39:11+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/libdb.def

  BitKeeper/deleted/.del-libdb_tcl.def~bf5926f22f130545@1.3, 2006-06-15 17:39:12+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/bdb/build_win32/libdb_tcl.def

  BitKeeper/deleted/.del-libmysql.dsp~eebbe823fb1ed32@1.38, 2006-06-15 17:38:51+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/libmysql/libmysql.dsp

  BitKeeper/deleted/.del-libmysql.dsw~e7bc53b7d2c2e081@1.5, 2006-06-15 17:38:51+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/libmysql/libmysql.dsw

  BitKeeper/deleted/.del-libmysql.vcproj~e21508a4cbf96b49@1.4, 2006-06-15 17:38:51+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/libmysql/libmysql.vcproj

  BitKeeper/deleted/.del-libmysql_ia64.dsp~ddad907847ceed3@1.7, 2006-06-15 17:38:51+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/libmysql/libmysql_ia64.dsp

  BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149@1.33, 2006-06-15 17:38:52+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/libmysqld/libmysqld.dsp

  BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0@1.12, 2006-06-15 17:38:52+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/libmysqld/libmysqld.vcproj

  BitKeeper/deleted/.del-libmysqld_ia64.dsp~578ab58d5f281d2a@1.5, 2006-06-15 17:38:52+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/libmysqld/libmysqld_ia64.dsp

  BitKeeper/deleted/.del-merge.dsp~ba1dc5704d438e10@1.7, 2006-06-15 17:38:54+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/merge/merge.dsp

  BitKeeper/deleted/.del-merge.dsw~559bbc65cf36612b@1.5, 2006-06-15 17:38:54+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/merge/merge.dsw

  BitKeeper/deleted/.del-merge_ia64.dsp~d4848c4ba119776c@1.2, 2006-06-15 17:38:54+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/merge/merge_ia64.dsp

  BitKeeper/deleted/.del-message.mc~6ff9e8e3e7294840@1.2, 2006-06-15 17:39:03+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/sql/message.mc

  BitKeeper/deleted/.del-myTest-package.dsp~ec9faf3287cbe2b9@1.2, 2006-06-15 17:38:53+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/libmysqltest/myTest-package.dsp

  BitKeeper/deleted/.del-myTest-package_ia64.dsp~e423b69f2c624850@1.2, 2006-06-15 17:38:53+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/libmysqltest/myTest-package_ia64.dsp

  BitKeeper/deleted/.del-myTest.dsp~4a8c480769193952@1.9, 2006-06-15 17:38:53+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/libmysqltest/myTest.dsp

  BitKeeper/deleted/.del-myTest.vcproj~dba5adc4fad3c06@1.2, 2006-06-15 17:38:53+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/libmysqltest/myTest.vcproj

  BitKeeper/deleted/.del-myTest_ia64.dsp~b17572b217d092e6@1.3, 2006-06-15 17:38:53+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/libmysqltest/myTest_ia64.dsp

  BitKeeper/deleted/.del-my_print_defaults.dsp~6393cfdfd0e1b2ee@1.9, 2006-06-15 17:38:54+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/my_print_defaults/my_print_defaults.dsp

  BitKeeper/deleted/.del-my_print_defaults.vcproj~c8aa2bd86e13c3f9@1.2, 2006-06-15 17:38:54+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/my_print_defaults/my_print_defaults.vcproj

  BitKeeper/deleted/.del-my_print_defaults_ia64.dsp~11f0e6ae16691bce@1.3, 2006-06-15 17:38:55+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/my_print_defaults/my_print_defaults_ia64.dsp

  BitKeeper/deleted/.del-myisam.dsp~db522ff879e7720f@1.13, 2006-06-15 17:39:13+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/myisam/myisam.dsp

  BitKeeper/deleted/.del-myisam.vcproj~c8ad2ba4e8fb2b21@1.5, 2006-06-15 17:39:13+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/myisam/myisam.vcproj

  BitKeeper/deleted/.del-myisam_ftdump.dsp~8501cb3943c50bb0@1.6, 2006-06-15 17:38:55+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/myisam_ftdump/myisam_ftdump.dsp

  BitKeeper/deleted/.del-myisam_ftdump.vcproj~409c19b0274b7f8e@1.4, 2006-06-15 17:38:55+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/myisam_ftdump/myisam_ftdump.vcproj

  BitKeeper/deleted/.del-myisam_ftdump_ia64.dsp~62d0f5a56a03242@1.4, 2006-06-15 17:38:55+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp

  BitKeeper/deleted/.del-myisam_ia64.dsp~ed98417b58974118@1.4, 2006-06-15 17:39:14+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/myisam/myisam_ia64.dsp

  BitKeeper/deleted/.del-myisamchk.dsp~b8627861f0e8dd3e@1.11, 2006-06-15 17:38:55+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/myisamchk/myisamchk.dsp

  BitKeeper/deleted/.del-myisamchk.vcproj~982ebe5673e58fb6@1.4, 2006-06-15 17:38:56+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/myisamchk/myisamchk.vcproj

  BitKeeper/deleted/.del-myisamchk_ia64.dsp~a8344727d14479e@1.4, 2006-06-15 17:38:56+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/myisamchk/myisamchk_ia64.dsp

  BitKeeper/deleted/.del-myisamlog.dsp~9f89a0e49b84a45@1.12, 2006-06-15 17:38:56+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/myisamlog/myisamlog.dsp

  BitKeeper/deleted/.del-myisamlog.vcproj~daa6596ea386e5a7@1.4, 2006-06-15 17:38:56+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/myisamlog/myisamlog.vcproj

  BitKeeper/deleted/.del-myisamlog_ia64.dsp~a362c2702ab87e07@1.4, 2006-06-15 17:38:56+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/myisamlog/myisamlog_ia64.dsp

  BitKeeper/deleted/.del-myisammrg.dsp~983cc2678e60e979@1.11, 2006-06-15 17:39:14+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/myisammrg/myisammrg.dsp

  BitKeeper/deleted/.del-myisammrg.vcproj~624417d12268d061@1.5, 2006-06-15 17:39:14+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/myisammrg/myisammrg.vcproj

  BitKeeper/deleted/.del-myisammrg_ia64.dsp~ffe1ccdf77392d5a@1.4, 2006-06-15 17:39:14+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/storage/myisammrg/myisammrg_ia64.dsp

  BitKeeper/deleted/.del-myisampack.dsp~be5b602ddfb1a75a@1.13, 2006-06-15 17:38:56+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/myisampack/myisampack.dsp

  BitKeeper/deleted/.del-myisampack.vcproj~3f7d4ec0cb56a9a0@1.4, 2006-06-15 17:38:57+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/myisampack/myisampack.vcproj

  BitKeeper/deleted/.del-myisampack_ia64.dsp~628bd80a496099d5@1.4, 2006-06-15 17:38:57+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/myisampack/myisampack_ia64.dsp

  BitKeeper/deleted/.del-mysql.dsp~1ea3b71c5b73913b@1.18, 2006-06-15 17:38:44+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysql.dsp

  BitKeeper/deleted/.del-mysql.dsp~9d6eee4fc1d54ca5@1.5, 2006-06-15 17:38:43+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/mysql.dsp

  BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4@1.31, 2006-06-15 17:38:43+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/mysql.dsw

  BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547@1.21, 2006-06-15 17:38:43+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/mysql.sln

  BitKeeper/deleted/.del-mysql.vcproj~f7bfe13a8836eea0@1.2, 2006-06-15 17:38:44+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysql.vcproj

  BitKeeper/deleted/.del-mysql_client_test.dsp~d7b5fed623acb964@1.11, 2006-06-15 17:39:17+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/tests/mysql_client_test.dsp

  BitKeeper/deleted/.del-mysql_client_test.vcproj~22188dcd372bc9de@1.2, 2006-06-15 17:39:17+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/tests/mysql_client_test.vcproj

  BitKeeper/deleted/.del-mysql_client_test_ia64.dsp~6a2b9edf3a66a00b@1.4, 2006-06-15 17:39:17+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/tests/mysql_client_test_ia64.dsp

  BitKeeper/deleted/.del-mysql_ia64.dsp~e651942397edd7e5@1.4, 2006-06-15 17:38:44+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysql_ia64.dsp

  BitKeeper/deleted/.del-mysql_ia64.dsw~5030d1d1d4c87330@1.8, 2006-06-15 17:38:43+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/mysql_ia64.dsw

  BitKeeper/deleted/.del-mysql_thr.c~20772782813d1274@1.5, 2006-06-15 17:39:16+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/test1/mysql_thr.c

  BitKeeper/deleted/.del-mysql_upgrade.dsp~e44498c4a2714360@1.2, 2006-06-15 17:38:44+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysql_upgrade.dsp

  BitKeeper/deleted/.del-mysql_upgrade.vcproj~54815b7265120589@1.2, 2006-06-15 17:38:44+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysql_upgrade.vcproj

  BitKeeper/deleted/.del-mysql_upgrade_ia64.dsp~c9007a313d39d7e8@1.2, 2006-06-15 17:38:44+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysql_upgrade_ia64.dsp

  BitKeeper/deleted/.del-mysqladmin.dsp~1f8468bd768bcbcd@1.16, 2006-06-15 17:38:45+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqladmin.dsp

  BitKeeper/deleted/.del-mysqladmin.vcproj~178fa55cba442d50@1.2, 2006-06-15 17:38:45+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqladmin.vcproj

  BitKeeper/deleted/.del-mysqladmin_ia64.dsp~6d8d1da649203881@1.4, 2006-06-15 17:38:45+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqladmin_ia64.dsp

  BitKeeper/deleted/.del-mysqlbinlog.dsp~e24094996da02d02@1.18, 2006-06-15 17:38:57+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/mysqlbinlog/mysqlbinlog.dsp

  BitKeeper/deleted/.del-mysqlbinlog.vcproj~b2a5b1868f5d6596@1.4, 2006-06-15 17:38:57+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/mysqlbinlog/mysqlbinlog.vcproj

  BitKeeper/deleted/.del-mysqlbinlog_ia64.dsp~ac0f4f9efb251f5@1.4, 2006-06-15 17:38:57+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp

  BitKeeper/deleted/.del-mysqlcheck.dsp~b6295bc9b0c70650@1.14, 2006-06-15 17:38:58+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/mysqlcheck/mysqlcheck.dsp

  BitKeeper/deleted/.del-mysqlcheck.dsp~da7dcab87501f05b@1.6, 2006-06-15 17:38:45+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqlcheck.dsp

  BitKeeper/deleted/.del-mysqlcheck.vcproj~7022581c8b8a7ea2@1.2, 2006-06-15 17:38:58+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/mysqlcheck/mysqlcheck.vcproj

  BitKeeper/deleted/.del-mysqlcheck_ia64.dsp~5726883250a7526a@1.3, 2006-06-15 17:38:45+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqlcheck_ia64.dsp

  BitKeeper/deleted/.del-mysqlcheck_ia64.dsp~7123d1228c39b249@1.4, 2006-06-15 17:38:58+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/mysqlcheck/mysqlcheck_ia64.dsp

  BitKeeper/deleted/.del-mysqlclient.dsp~c9f1abb3247adfa0@1.38, 2006-06-15 17:38:45+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqlclient.dsp

  BitKeeper/deleted/.del-mysqlclient.dsw~1c2fa53ceaed0042@1.5, 2006-06-15 17:38:46+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqlclient.dsw

  BitKeeper/deleted/.del-mysqlclient.vcproj~e78a73e31368a44a@1.4, 2006-06-15 17:38:46+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqlclient.vcproj

  BitKeeper/deleted/.del-mysqlclient_ia64.dsp~ecab72d5220875b@1.6, 2006-06-15 17:38:46+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqlclient_ia64.dsp

  BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56@1.44, 2006-06-15 17:39:03+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/sql/mysqld.dsp

  BitKeeper/deleted/.del-mysqld.dsw~2fa9d2fa9a5902ef@1.4, 2006-06-15 17:39:04+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/sql/mysqld.dsw

  BitKeeper/deleted/.del-mysqld.dsw~fc5629c0fc1bc3af@1.4, 2006-06-15 17:39:04+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/sql/old/mysqld.dsw

  BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb@1.14, 2006-06-15 17:39:04+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/sql/mysqld.vcproj

  BitKeeper/deleted/.del-mysqld_ia64.dsp~7f8cf84d81ee04e2@1.4, 2006-06-15 17:39:04+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/sql/mysqld_ia64.dsp

  BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e@1.13, 2006-06-15 17:38:58+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/mysqldemb/mysqldemb.dsp

  BitKeeper/deleted/.del-mysqldemb.vcproj~54c64d55ccc51a7c@1.6, 2006-06-15 17:38:58+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/mysqldemb/mysqldemb.vcproj

  BitKeeper/deleted/.del-mysqldemb_ia64.dsp~c7f7d75d542393cd@1.2, 2006-06-15 17:38:58+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/mysqldemb/mysqldemb_ia64.dsp

  BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e@1.7, 2006-06-15 17:39:04+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/sql/mysqldmax.dsp

  BitKeeper/deleted/.del-mysqldmax_ia64.dsp~25006b7cc0725ad1@1.3, 2006-06-15 17:39:04+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/sql/mysqldmax_ia64.dsp

  BitKeeper/deleted/.del-mysqldump.dsp~a8bd23547d3fc27e@1.15, 2006-06-15 17:38:46+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqldump.dsp

  BitKeeper/deleted/.del-mysqldump.vcproj~22f26554166c8e38@1.4, 2006-06-15 17:38:46+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqldump.vcproj

  BitKeeper/deleted/.del-mysqldump_ia64.dsp~a2aabe898be35b31@1.4, 2006-06-15 17:38:47+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqldump_ia64.dsp

  BitKeeper/deleted/.del-mysqlimport.dsp~d508ae2a3483f1ab@1.15, 2006-06-15 17:38:47+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqlimport.dsp

  BitKeeper/deleted/.del-mysqlimport.vcproj~5a30228ef641c081@1.2, 2006-06-15 17:38:47+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqlimport.vcproj

  BitKeeper/deleted/.del-mysqlimport_ia64.dsp~c905eeae53373c68@1.4, 2006-06-15 17:38:47+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqlimport_ia64.dsp

  BitKeeper/deleted/.del-mysqlserver.dsp~d99cfb2d291e3785@1.9, 2006-06-15 17:38:59+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/mysqlserver/mysqlserver.dsp

  BitKeeper/deleted/.del-mysqlserver.vcproj~327cf9fb1c5ec95d@1.5, 2006-06-15 17:38:59+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/mysqlserver/mysqlserver.vcproj

  BitKeeper/deleted/.del-mysqlserver_ia64.dsp~9cd3f0532874bfbe@1.2, 2006-06-15 17:38:59+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/mysqlserver/mysqlserver_ia64.dsp

  BitKeeper/deleted/.del-mysqlshow.dsp~7166315b18f991d7@1.15, 2006-06-15 17:38:47+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqlshow.dsp

  BitKeeper/deleted/.del-mysqlshow.vcproj~797d4fa322faa148@1.2, 2006-06-15 17:38:47+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqlshow.vcproj

  BitKeeper/deleted/.del-mysqlshow_ia64.dsp~5b77172f8e4fe84a@1.4, 2006-06-15 17:38:48+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqlshow_ia64.dsp

  BitKeeper/deleted/.del-mysqlslap.vcproj~6f30db25e7c09b6e@1.5, 2006-06-15 17:38:48+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqlslap.vcproj

  BitKeeper/deleted/.del-mysqltest.dsp~bb948912e890ae3@1.11, 2006-06-15 17:38:48+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqltest.dsp

  BitKeeper/deleted/.del-mysqltest.vcproj~21878840704179ef@1.2, 2006-06-15 17:38:48+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqltest.vcproj

  BitKeeper/deleted/.del-mysqltest_ia64.dsp~fc3a4cd59af92ac8@1.4, 2006-06-15 17:38:48+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/client/mysqltest_ia64.dsp

  BitKeeper/deleted/.del-mysys.dsp~32695fee91189326@1.31, 2006-06-15 17:38:59+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/mysys/mysys.dsp

  BitKeeper/deleted/.del-mysys.dsw~f9dacc88b2a51ba5@1.5, 2006-06-15 17:38:59+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/mysys/mysys.dsw

  BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822@1.8, 2006-06-15 17:39:00+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/mysys/mysys.vcproj

  BitKeeper/deleted/.del-mysys_ia64.dsp~7a98bd8cd01d3043@1.5, 2006-06-15 17:39:00+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/mysys/mysys_ia64.dsp

  BitKeeper/deleted/.del-mytest.c~9a99338689e5de8@1.5, 2006-06-15 17:38:53+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/libmysqltest/mytest.c

  BitKeeper/deleted/.del-mytest.dsw~2324698861155335@1.5, 2006-06-15 17:38:54+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/libmysqltest/mytest.dsw

  BitKeeper/deleted/.del-perror.dsp~d314b288f6337f54@1.12, 2006-06-15 17:39:00+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/perror/perror.dsp

  BitKeeper/deleted/.del-perror.vcproj~86ad9dc660a048ad@1.2, 2006-06-15 17:39:00+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/perror/perror.vcproj

  BitKeeper/deleted/.del-perror_ia64.dsp~be2ccb6d1c91c625@1.3, 2006-06-15 17:39:01+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/perror/perror_ia64.dsp

  BitKeeper/deleted/.del-prepare~773a10a535120a7e@1.3, 2006-06-15 17:38:43+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/prepare

  BitKeeper/deleted/.del-regex.dsp~99de200e71b64359@1.6, 2006-06-15 17:39:01+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/regex/regex.dsp

  BitKeeper/deleted/.del-regex.dsw~59ac4f03e7ef16e@1.5, 2006-06-15 17:39:01+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/regex/regex.dsw

  BitKeeper/deleted/.del-regex.vcproj~9dea9caafa801b26@1.2, 2006-06-15 17:39:02+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/regex/regex.vcproj

  BitKeeper/deleted/.del-regex_ia64.dsp~dcd4172d1a454aa3@1.2, 2006-06-15 17:39:02+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/regex/regex_ia64.dsp

  BitKeeper/deleted/.del-replace.dsp~a97f6dda5abfb438@1.11, 2006-06-15 17:39:02+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/replace/replace.dsp

  BitKeeper/deleted/.del-replace.vcproj~9620b1ced86e527a@1.2, 2006-06-15 17:39:02+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/replace/replace.vcproj

  BitKeeper/deleted/.del-replace_ia64.dsp~666e3b313837d42e@1.3, 2006-06-15 17:39:03+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/replace/replace_ia64.dsp

  BitKeeper/deleted/.del-strings.dsp~7b4d145dfc64e39@1.7, 2006-06-15 17:39:16+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/strings/noMASM/strings.dsp

  BitKeeper/deleted/.del-strings.dsp~ba34297c3be0c3aa@1.6, 2006-06-15 17:39:14+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/strings/MASM6x/strings.dsp

  BitKeeper/deleted/.del-strings.dsp~d1f09e84a9861d86@1.5, 2006-06-15 17:39:15+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/strings/backup/strings.dsp

  BitKeeper/deleted/.del-strings.dsp~de6c79f1cc99a48@1.20, 2006-06-15 17:39:15+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/strings/strings.dsp

  BitKeeper/deleted/.del-strings.dsw~44d2027eeeea00d6@1.4, 2006-06-15 17:39:15+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/strings/backup/strings.dsw

  BitKeeper/deleted/.del-strings.dsw~72e5896282b294d5@1.4, 2006-06-15 17:39:14+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/strings/MASM6x/strings.dsw

  BitKeeper/deleted/.del-strings.dsw~74e53a6013b0da99@1.4, 2006-06-15 17:39:16+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/strings/noMASM/strings.dsw

  BitKeeper/deleted/.del-strings.dsw~fc04f19f9c41f6ea@1.4, 2006-06-15 17:39:15+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/strings/strings.dsw

  BitKeeper/deleted/.del-strings.vcproj~6d1126ae59e4bf82@1.4, 2006-06-15 17:39:15+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/strings/strings.vcproj

  BitKeeper/deleted/.del-strings_ia64.dsp~4cbf5c6548d3b4a4@1.6, 2006-06-15 17:39:15+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/strings/strings_ia64.dsp

  BitKeeper/deleted/.del-test1.dsp~83f105f472a193@1.9, 2006-06-15 17:39:16+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/test1/test1.dsp

  BitKeeper/deleted/.del-test1.vcproj~c474b4614c67e2d2@1.2, 2006-06-15 17:39:16+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/test1/test1.vcproj

  BitKeeper/deleted/.del-test1_ia64.dsp~42406d943e5f20f9@1.3, 2006-06-15 17:39:17+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/test1/test1_ia64.dsp

  BitKeeper/deleted/.del-test_libmysqld.dsp~681dc3c6e97a48f2@1.10, 2006-06-15 17:38:52+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/libmysqld/examples/test_libmysqld.dsp

  BitKeeper/deleted/.del-test_libmysqld.vcproj~fb301d42d5c4e6f4@1.2, 2006-06-15 17:38:52+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/libmysqld/examples/test_libmysqld.vcproj

  BitKeeper/deleted/.del-test_libmysqld_ia64.dsp~d79f095fa7072b25@1.3, 2006-06-15 17:38:52+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp

  BitKeeper/deleted/.del-thr_insert_test.dsp~e21944f040fb55a9@1.7, 2006-06-15 17:39:17+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/thr_insert_test/thr_insert_test.dsp

  BitKeeper/deleted/.del-thr_test.c~70fc0971c72f2a95@1.4, 2006-06-15 17:39:17+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/thr_test/thr_test.c

  BitKeeper/deleted/.del-thr_test.dsp~af5f73d3335a6303@1.9, 2006-06-15 17:39:18+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/thr_test/thr_test.dsp

  BitKeeper/deleted/.del-thr_test.vcproj~fc0e15c1e6880160@1.2, 2006-06-15 17:39:18+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/thr_test/thr_test.vcproj

  BitKeeper/deleted/.del-thr_test_ia64.dsp~2ff226f5ce3197b4@1.3, 2006-06-15 17:39:18+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/thr_test/thr_test_ia64.dsp

  BitKeeper/deleted/.del-udf_example.def~9111ef87@1.3, 2006-06-15 17:38:50+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/examples/udf_example/udf_example.def

  BitKeeper/deleted/.del-udf_example.dsp~91456aca@1.2, 2006-06-15 17:38:50+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/examples/udf_example/udf_example.dsp

  BitKeeper/deleted/.del-udf_example.dsw~91692a3d@1.2, 2006-06-15 17:38:51+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/examples/udf_example/udf_example.dsw

  BitKeeper/deleted/.del-vio.dsp~52ab62f9d499195a@1.10, 2006-06-15 17:39:18+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/vio/vio.dsp

  BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85@1.2, 2006-06-15 17:39:18+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/vio/vio.vcproj

  BitKeeper/deleted/.del-vio_ia64.dsp~cdfbb900c43e7f10@1.2, 2006-06-15 17:39:18+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/vio/vio_ia64.dsp

  BitKeeper/deleted/.del-zlib.dsp~503559fb84963a0d@1.10, 2006-06-15 17:39:19+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/zlib/zlib.dsp

  BitKeeper/deleted/.del-zlib.vcproj~9b1a681d56dae190@1.2, 2006-06-15 17:39:19+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/zlib/zlib.vcproj

  BitKeeper/deleted/.del-zlib_ia64.dsp~76d309d598061eea@1.2, 2006-06-15 17:39:19+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/zlib/zlib_ia64.dsp

  BitKeeper/deleted/.del-zlibvc.dsp~27398cfaac865081@1.3, 2006-06-15 17:39:20+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/zlib/contrib/asm386/zlibvc.dsp

  BitKeeper/deleted/.del-zlibvc.dsp~4661a0a47229e354@1.4, 2006-06-15 17:38:49+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/contrib/minizip/zlibvc.dsp

  BitKeeper/deleted/.del-zlibvc.dsp~d8e6e287a364132f@1.4, 2006-06-15 17:38:49+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/contrib/asm386/zlibvc.dsp

  BitKeeper/deleted/.del-zlibvc.dsw~be3fc0a598daa999@1.4, 2006-06-15 17:38:49+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/contrib/asm386/zlibvc.dsw

  BitKeeper/deleted/.del-zlibvc.dsw~c6fcbe08f7876788@1.4, 2006-06-15 17:38:49+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/contrib/minizip/zlibvc.dsw

  BitKeeper/deleted/.del-zlibvc.dsw~e0a83be4be21be4d@1.2, 2006-06-15 17:39:20+02:00, rburnett@production.mysql.com +0 -0
    Delete: VC++Files/zlib/contrib/asm386/zlibvc.dsw

ChangeSet@1.2154.43.13, 2006-06-15 16:53:12+02:00, mats@mysql.com +4 -0
  Various fixes to allow tests to pass.

  mysql-test/r/rpl_row_basic_11bugs.result@1.9, 2006-06-15 16:53:04+02:00, mats@mysql.com +1 -1
    Result change

  mysql-test/t/disabled.def@1.156.1.3, 2006-06-15 16:53:04+02:00, mats@mysql.com +1 -0
    Disabling test due to already reported bug.

  mysql-test/t/rpl_row_basic_11bugs.test@1.8, 2006-06-15 16:53:04+02:00, mats@mysql.com +3 -0
    Adding code to replace server version

  mysql-test/t/rpl_truncate_7ndb.test@1.3, 2006-06-15 16:53:04+02:00, mats@mysql.com +2 -0
    Adding sleep to allow NDB to write events to the binary log.

ChangeSet@1.2181.1.9, 2006-06-15 16:51:24+02:00, rburnett@production.mysql.com +4 -0
  Many files:
    Small corrections after a bad merge

  mysql-test/r/partition.result@1.42, 2006-06-15 16:50:45+02:00, rburnett@production.mysql.com +15 -15
    Small corrections after a bad merge

  mysql-test/r/partition_02myisam.result@1.8, 2006-06-15 16:50:45+02:00, rburnett@production.mysql.com +22 -22
    Small corrections after a bad merge

  mysql-test/r/partition_mgm.result@1.3, 2006-06-15 16:50:45+02:00, rburnett@production.mysql.com +2 -2
    Small corrections after a bad merge

  mysql-test/r/partition_range.result@1.13, 2006-06-15 16:50:45+02:00, rburnett@production.mysql.com +4 -4
    Small corrections after a bad merge

ChangeSet@1.2208, 2006-06-15 14:55:01+02:00, msvensson@shellback.(none) +1 -0
  Cset exclude: msvensson@shellback.|ChangeSet|20060411181854|53834

  include/config-win.h@1.89, 2006-06-15 14:54:59+02:00, msvensson@shellback.(none) +0 -0
    Exclude

ChangeSet@1.2207, 2006-06-15 14:52:13+02:00, msvensson@shellback.(none) +1 -0
  Add a tiny sleep after cluster restart to let it come out of "read only" mode

  mysql-test/t/ndb_autodiscover3.test@1.5, 2006-06-15 14:52:07+02:00, msvensson@shellback.(none) +1 -1
    Add a tiny sleep after cluster restart to let it come out of "read only" mode

ChangeSet@1.1616.2618.6, 2006-06-15 16:39:18+04:00, evgen@moonbone.local +2 -0
  item_cmpfunc.h, cast.result:
    Post fix for bug#16377

  mysql-test/r/cast.result@1.20.1.7, 2006-06-15 16:38:27+04:00, evgen@moonbone.local +1 -1
    Post fix for bug#16377

  sql/item_cmpfunc.h@1.73.1.42, 2006-06-15 16:38:50+04:00, evgen@moonbone.local +5 -10
    Post fix for bug#16377

ChangeSet@1.1810.1784.7, 2006-06-15 16:24:02+05:00, gluh@eagle.intranet.mysql.r18.ru +3 -0
  Fix for bug#19667 group by a decimal expression yields wrong result

  mysql-test/r/type_newdecimal.result@1.36.1.4, 2006-06-15 16:23:56+05:00, gluh@mysql.com +11 -0
    Fix for bug#19667 group by a decimal expression yields wrong result
     test case

  mysql-test/t/type_newdecimal.test@1.33.1.4, 2006-06-15 16:23:56+05:00, gluh@mysql.com +9 -0
    Fix for bug#19667 group by a decimal expression yields wrong result
     test case

  sql/item_buff.cc@1.19, 2006-06-15 16:23:56+05:00, gluh@mysql.com +1 -1
    Fix for bug#19667 group by a decimal expression yields wrong result

ChangeSet@1.2181.28.2, 2006-06-15 11:59:21+02:00, mskold@mysql.com +1 -0
  Fixed typo in variable name

  sql/mysqld.cc@1.558, 2006-06-15 11:58:23+02:00, mskold@mysql.com +1 -1
    Fixed typo in variable name

ChangeSet@1.1810.1709.8, 2006-06-15 11:55:53+02:00, lars@mysql.com +2 -0
  BUG#17201: Removed version number from test case output

  mysql-test/r/mysqldump.result@1.83.1.13, 2006-06-15 11:55:42+02:00, lars@mysql.com +0 -28
    Remove comments in mysqldump output

  mysql-test/t/mysqldump.test@1.76.1.12, 2006-06-15 11:55:43+02:00, lars@mysql.com +1 -1
    Remove comments in mysqldump output

ChangeSet@1.2181.28.1, 2006-06-15 11:40:53+02:00, mskold@mysql.com +1 -0
  Removed stray bracket

  configure.in@1.361, 2006-06-15 11:40:26+02:00, mskold@mysql.com +1 -1
    Removed stray bracket

ChangeSet@1.2154.50.1, 2006-06-15 11:20:34+02:00, msvensson@shellback.(none) +1 -0
  Add mark-progress option
  Update 'mark_progress' tpo save the log to a dynamic string and dump 
  it using the already available functions at end of test run 

  client/mysqltest.c@1.211.1.1, 2006-06-15 11:20:24+02:00, msvensson@shellback.(none) +54 -24
    Add new option --mark-progress which will dump a .progress file with linenumber and elapsed time so far 

ChangeSet@1.1810.1707.6, 2006-06-15 13:38:32+05:00, svoj@may.pils.ru +1 -0
  Fixed windows compilation failure introduced by fix for BUG#12982.

  include/my_global.h@1.96.6.2, 2006-06-15 13:38:26+05:00, svoj@may.pils.ru +1 -1
    Remove cast to ssize_t, since there is no ssize_t type on Windows.

ChangeSet@1.2154.49.1, 2006-06-15 10:11:50+02:00, mats@mysql.com +1 -0
  Fixing code to avoid compile problem on Solaris (aCC).

  sql/handler.cc@1.231.2.3, 2006-06-15 10:11:14+02:00, mats@mysql.com +85 -77
    Moving write_locked_table_maps() and binlog_log_row() into an anonymous
    namespace.

ChangeSet@1.2154.43.11, 2006-06-15 07:24:23+04:00, aivanov@mysql.com +1 -0
  Post innodb-5.1-ss594 modifications.
   Avoiding compilation error ("void * - unknown size").

  storage/innobase/mem/mem0mem.c@1.16, 2006-06-15 07:24:18+04:00, aivanov@mysql.com +1 -1
    Post innodb-5.1-ss594 modifications.
     Avoiding compilation error ("void * - unknown size").

ChangeSet@1.2181.27.2, 2006-06-14 22:37:20-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
  merge fixes

  mysql-test/r/partition.result@1.38.2.7, 2006-06-14 22:37:14-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    merge fixes

  mysql-test/r/partition_range.result@1.10.1.2, 2006-06-14 22:37:15-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    merge fixes

  mysql-test/t/partition_range.test@1.9, 2006-06-14 22:37:15-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    merge fixes

ChangeSet@1.2154.48.3, 2006-06-15 05:43:19+04:00, aivanov@mysql.com +1 -0
  Post innodb-5.1-ss594 modifications.
   Avoiding build error caused by adding new files.

  storage/innobase/Makefile.am@1.16, 2006-06-15 05:43:14+04:00, aivanov@mysql.com +2 -0
    Post innodb-5.1-ss594 modifications.
     Including newly added functions to EXTA_DIST.

ChangeSet@1.2181.21.3, 2006-06-14 19:40:06-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -0
  merge update

  mysql-test/t/partition.test@1.40.1.6, 2006-06-14 19:40:00-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    merge error

  sql/ha_ndbcluster.cc@1.319.2.2, 2006-06-14 19:40:00-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -8
    merge update

  sql/ha_partition.cc@1.58, 2006-06-14 19:40:00-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -8
    merge update

  sql/partition_info.cc@1.19, 2006-06-14 19:40:00-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +24 -0
    merge update

  sql/partition_info.h@1.13, 2006-06-14 19:40:01-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -1
    merge update

ChangeSet@1.1810.1787.5, 2006-06-15 01:48:41+04:00, evgen@moonbone.local +6 -0
  Many files:
    After merge fix

  mysql-test/r/cast.result@1.39.1.5, 2006-06-15 01:46:41+04:00, evgen@moonbone.local +1 -1
    After merge fix

  mysql-test/r/func_concat.result@1.11, 2006-06-15 01:46:27+04:00, evgen@moonbone.local +7 -7
    After merge fix

  mysql-test/r/func_time.result@1.47.2.2, 2006-06-15 01:46:09+04:00, evgen@moonbone.local +3 -1
    After merge fix

  sql/field.cc@1.256.20.2, 2006-06-15 01:48:01+04:00, evgen@moonbone.local +32 -50
    After merge fix

  sql/item_cmpfunc.cc@1.187.1.19, 2006-06-15 01:47:16+04:00, evgen@moonbone.local +4 -4
    After merge fix

  sql/item_cmpfunc.h@1.122.2.2, 2006-06-15 01:46:59+04:00, evgen@moonbone.local +5 -10
    After merge fix

ChangeSet@1.2181.14.12, 2006-06-14 23:09:03+02:00, serg@serg.mylan +6 -0
  cleanup String::set(integer)

  sql/field.cc@1.315, 2006-06-14 23:08:26+02:00, serg@serg.mylan +1 -4
    cleanup String::set(integer)

  sql/item.cc@1.194, 2006-06-14 23:08:26+02:00, serg@serg.mylan +1 -4
    cleanup String::set(integer)

  sql/item_func.cc@1.297, 2006-06-14 23:08:27+02:00, serg@serg.mylan +4 -16
    cleanup String::set(integer)

  sql/item_sum.cc@1.179, 2006-06-14 23:08:27+02:00, serg@serg.mylan +1 -4
    cleanup String::set(integer)

  sql/sql_string.cc@1.93, 2006-06-14 23:08:27+02:00, serg@serg.mylan +3 -13
    cleanup String::set(integer)

  sql/sql_string.h@1.62, 2006-06-14 23:08:27+02:00, serg@serg.mylan +5 -2
    cleanup String::set(integer)

ChangeSet@1.2205, 2006-06-14 22:15:21+02:00, msvensson@neptunus.(none) +1 -0
  Update function 'mtr_options_from_file' after review (and some help)

  mysql-test/lib/mtr_cases.pl@1.29, 2006-06-14 22:15:14+02:00, msvensson@neptunus.(none) +7 -9
    Update function 'mtr_options_from_file' after review (and some help)

ChangeSet@1.2204, 2006-06-14 21:46:41+02:00, msvensson@neptunus.(none) +1 -0
  Remove opt_old_master, using a 4.0 mysqld with mysql-test-run.pl from 5.1 is not supported

  mysql-test/mysql-test-run.pl@1.135, 2006-06-14 21:46:36+02:00, msvensson@neptunus.(none) +0 -14
    Remove opt_old_master, using a 4.0 mysqld with mysql-test-run.pl from 5.1 is not supported

ChangeSet@1.2203, 2006-06-14 21:45:15+02:00, msvensson@neptunus.(none) +2 -0
  Cleanup ndb options

  mysql-test/lib/mtr_cases.pl@1.28, 2006-06-14 21:45:10+02:00, msvensson@neptunus.(none) +4 -3
    Cleanup ndb options

  mysql-test/mysql-test-run.pl@1.134, 2006-06-14 21:45:10+02:00, msvensson@neptunus.(none) +43 -40
    Cleanup ndb options

ChangeSet@1.1810.1784.5, 2006-06-14 21:30:49+02:00, msvensson@neptunus.(none) +2 -0
  Bug#19191 Repeated crashes on OpenBSD for ssl test cases
   - Import patch from yaSSL

  extra/yassl/src/handshake.cpp@1.11, 2006-06-14 19:19:37+02:00, msvensson@neptunus.(none) +4 -4
    Import patch yassl.diff

  extra/yassl/src/socket_wrapper.cpp@1.11, 2006-06-14 19:19:37+02:00, msvensson@neptunus.(none) +11 -2
    Import patch yassl.diff

ChangeSet@1.2202, 2006-06-14 20:36:23+02:00, msvensson@neptunus.(none) +2 -0
  Remove opt_local, noone knows what it should do

  mysql-test/lib/mtr_stress.pl@1.7, 2006-06-14 20:36:17+02:00, msvensson@neptunus.(none) +1 -1
    Remove remnant of opt_local_master

  mysql-test/mysql-test-run.pl@1.133, 2006-06-14 20:36:17+02:00, msvensson@neptunus.(none) +0 -9
    Remove opt_local, noone knows what it should do

ChangeSet@1.1616.2638.2, 2006-06-14 20:22:03+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL
  - correction of backport error

  sql/ha_ndbcluster.cc@1.114.18.4, 2006-06-14 20:21:59+02:00, tomas@poseidon.ndb.mysql.com +1 -1
    Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL
    - correction of backport error

ChangeSet@1.1810.1792.1, 2006-06-14 14:18:42-04:00, cmiller@zippy.(none) +1 -0
  Bug#19262: internal function create_typelib() uses DBUG_ENTER() but not DBUG_RETURN
  
  Trivial replacement of return with DBUG_RETURN.

  sql/sp_head.cc@1.200.1.15, 2006-06-14 14:18:36-04:00, cmiller@zippy.(none) +2 -2
    Trivial replacement of return with DBUG_RETURN

ChangeSet@1.1616.2638.1, 2006-06-14 20:16:32+02:00, tomas@poseidon.ndb.mysql.com +3 -0
  Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL
  - make sure to disable bulk insert when check for duplicate key is needed

  mysql-test/r/ndb_loaddatalocal.result@1.1, 2006-06-14 20:16:27+02:00, tomas@poseidon.ndb.mysql.com +46 -0
    New BitKeeper file ``mysql-test/r/ndb_loaddatalocal.result''

  mysql-test/r/ndb_loaddatalocal.result@1.0, 2006-06-14 20:16:27+02:00, tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-4.1/mysql-test/r/ndb_loaddatalocal.result

  mysql-test/t/ndb_loaddatalocal.test@1.1, 2006-06-14 20:16:28+02:00, tomas@poseidon.ndb.mysql.com +70 -0
    New BitKeeper file ``mysql-test/t/ndb_loaddatalocal.test''

  mysql-test/t/ndb_loaddatalocal.test@1.0, 2006-06-14 20:16:28+02:00, tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-4.1/mysql-test/t/ndb_loaddatalocal.test

  sql/ha_ndbcluster.cc@1.114.18.3, 2006-06-14 20:16:27+02:00, tomas@poseidon.ndb.mysql.com +18 -0
    Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL
    - make sure to disable bulk insert when check for duplicate key is needed

ChangeSet@1.1616.2637.1, 2006-06-14 21:06:02+04:00, sergefp@mysql.com +1 -0
  Better comments in KEY_PART_INFO struct

  sql/structs.h@1.36.1.7, 2006-06-14 21:05:59+04:00, sergefp@mysql.com +7 -1
    Better comments in KEY_PART_INFO struct

ChangeSet@1.1616.2603.9, 2006-06-14 16:54:54+02:00, joerg@mysql.com +1 -0
  support-files/mysql.server.sh  :  Fix the startup sequence.  bug#18810 + bug#20118

  support-files/mysql.server.sh@1.34.2.6, 2006-06-14 16:54:50+02:00, joerg@mysql.com +1 -0
    Ensure that some necessary / useful system services have been started already,
    when the MySQL server is started. 
    This fixes bug#18810 and bug#20118

ChangeSet@1.2201, 2006-06-14 16:03:27+02:00, msvensson@neptunus.(none) +1 -0
  Update explanation why test was skipped

  mysql-test/lib/mtr_cases.pl@1.27, 2006-06-14 16:03:22+02:00, msvensson@neptunus.(none) +1 -1
    Update explanation why test was skipped

ChangeSet@1.1810.1790.1, 2006-06-14 15:57:23+03:00, gkodinov@mysql.com +3 -0
  Bug #18895: BIT values cause joins to fail
  
  The Field::eq() considered instances of Field_bit that differ only in 
  bit_ptr/bit_ofs equal. This caused equality conditions optimization 
  (build_equal_items_for_cond()) to make bad field substitutions that result
  in wrong predicates. 
  Field_bit requires an overloaded eq() function that checks the bit_ptr/bit_ofs
  in addition to Field::eq().

  mysql-test/r/select.result@1.121.2.4, 2006-06-14 15:57:17+03:00, gkodinov@mysql.com +20 -0
    Bug #18895: BIT values cause joins to fail
    
    - test case

  mysql-test/t/select.test@1.101.1.3, 2006-06-14 15:57:17+03:00, gkodinov@mysql.com +26 -0
    Bug #18895: BIT values cause joins to fail
    
    - test case

  sql/field.h@1.153.1.28, 2006-06-14 15:57:17+03:00, gkodinov@mysql.com +8 -1
    Bug #18895: BIT values cause joins to fail
    
    - eq() method overloaded for Field_bit

ChangeSet@1.2169.8.2, 2006-06-14 08:35:19-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  BUG#19801: Problems with single partition with only NULL allowed in LIST partitioning
  After review fix

  sql/partition_info.cc@1.8.1.7, 2006-06-14 08:35:14-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -4
    After review fix

ChangeSet@1.2119.473.5, 2006-06-14 08:31:38-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  BUG#16002: Unsigned partition function support
  After review fix

  sql/sql_partition.cc@1.55.8.5, 2006-06-14 08:31:33-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -4
    After review fix

ChangeSet@1.2181.14.9, 2006-06-14 14:13:45+02:00, mskold@mysql.com +1 -0
  Fixed variable description

  sql/mysqld.cc@1.556, 2006-06-14 14:13:05+02:00, mskold@mysql.com +1 -1
    Fixed variable description

ChangeSet@1.1810.1789.1, 2006-06-14 13:58:51+02:00, pekka@clam.ndb.mysql.com +6 -0
  ndb - bug#19285 : document and check what blob ops are allowed

  ndb/include/ndbapi/NdbBlob.hpp@1.15.3.1, 2006-06-14 13:37:54+02:00, pekka@clam.ndb.mysql.com +38 -12
    upgrade LM_CommittedRead to LM_Read
    check if write allowed (new error 4275)
    dont invalidate blob state on error (just general principle)

  ndb/include/ndbapi/NdbScanOperation.hpp@1.32.3.1, 2006-06-14 13:33:56+02:00, pekka@clam.ndb.mysql.com +1 -1
    fix comment

  ndb/src/ndbapi/NdbBlob.cpp@1.22.6.1, 2006-06-14 13:37:54+02:00, pekka@clam.ndb.mysql.com +44 -12
    upgrade LM_CommittedRead to LM_Read
    check if write allowed (new error 4275)
    dont invalidate blob state on error (just general principle)

  ndb/src/ndbapi/NdbBlobImpl.hpp@1.1.1.1, 2006-06-14 13:32:13+02:00, pekka@clam.ndb.mysql.com +4 -2
    distinguish blob method errors: 4265-wrong state 4275-wrong op type/lockmode
    fix 4269 -> 4270

  ndb/src/ndbapi/ndberror.c@1.30.16.1, 2006-06-14 13:30:33+02:00, pekka@clam.ndb.mysql.com +3 -2
    distinguish blob method errors: 4265-wrong state 4275-wrong op type/lockmode

  ndb/test/ndbapi/testBlobs.cpp@1.20.13.1, 2006-06-14 13:33:24+02:00, pekka@clam.ndb.mysql.com +90 -41
    test lock upgrade, test 4275 errors

ChangeSet@1.2181.20.3, 2006-06-14 16:09:00+05:00, svoj@may.pils.ru +1 -0
  After merge fix.

  sql/sql_table.cc@1.344.2.2, 2006-06-14 16:08:53+05:00, svoj@may.pils.ru +9 -0
    After merge fix.

ChangeSet@1.2181.14.5, 2006-06-14 13:32:29+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  corrected merge error

  sql/ha_ndbcluster.cc@1.319.1.4, 2006-06-14 13:32:20+02:00, tomas@poseidon.ndb.mysql.com +1 -0
    corrected merge error

ChangeSet@1.1616.2603.8, 2006-06-14 12:54:28+02:00, tomas@poseidon.ndb.mysql.com +1 -0
   Bug #18595 repeated create, insert, drop can cause MySQL table definition cache to
  corrupt
    - add infinite retry on drop table temporary error

  sql/ha_ndbcluster.cc@1.114.18.2, 2006-06-14 12:54:22+02:00, tomas@poseidon.ndb.mysql.com +27 -7
     Bug #18595 repeated create, insert, drop can cause MySQL table definition cache to
    corrupt
      - add infinite retry on drop table temporary error

ChangeSet@1.2181.14.2, 2006-06-14 12:21:18+02:00, tomas@poseidon.ndb.mysql.com +4 -0
  Bug #18595 repeated create, insert, drop can cause MySQL table definition cache to corrupt
  - add infinite retry on drop table temporary error

  mysql-test/r/ndb_restore_partition.result@1.1, 2006-06-14 12:21:07+02:00, tomas@poseidon.ndb.mysql.com +469 -0
    New BitKeeper file ``mysql-test/r/ndb_restore_partition.result''

  mysql-test/r/ndb_restore_partition.result@1.0, 2006-06-14 12:21:07+02:00, tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new-ndb/mysql-test/r/ndb_restore_partition.result

  mysql-test/t/ndb_restore_partition-master.opt@1.1, 2006-06-14 12:21:08+02:00, tomas@poseidon.ndb.mysql.com +1 -0
    New BitKeeper file ``mysql-test/t/ndb_restore_partition-master.opt''

  mysql-test/t/ndb_restore_partition-master.opt@1.0, 2006-06-14 12:21:08+02:00, tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new-ndb/mysql-test/t/ndb_restore_partition-master.opt

  mysql-test/t/ndb_restore_partition.test@1.1, 2006-06-14 12:21:08+02:00, tomas@poseidon.ndb.mysql.com +375 -0
    New BitKeeper file ``mysql-test/t/ndb_restore_partition.test''

  mysql-test/t/ndb_restore_partition.test@1.0, 2006-06-14 12:21:08+02:00, tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new-ndb/mysql-test/t/ndb_restore_partition.test

  sql/ha_ndbcluster.cc@1.319.1.2, 2006-06-14 12:21:07+02:00, tomas@poseidon.ndb.mysql.com +61 -17
    Bug #18595 repeated create, insert, drop can cause MySQL table definition cache to corrupt
    - add infinite retry on drop table temporary error

ChangeSet@1.2181.9.4, 2006-06-14 12:01:06+02:00, mskold@mysql.com +1 -0
  Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster): psot review comment: cleared flag before checking

  sql/sql_table.cc@1.343.1.2, 2006-06-14 11:59:51+02:00, mskold@mysql.com +2 -0
    Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster): psot review comment: cleared flag before checking

ChangeSet@1.2200, 2006-06-14 11:59:04+02:00, msvensson@neptunus.(none) +1 -0
  Print error if using --debug and binaries does not support it

  mysql-test/mysql-test-run.pl@1.132, 2006-06-14 11:58:59+02:00, msvensson@neptunus.(none) +5 -0
    Print error if using --debug and binaries does not support it

ChangeSet@1.2181.9.3, 2006-06-14 11:38:55+02:00, mskold@mysql.com +2 -0
  Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster): added test case

  mysql-test/r/ndb_alter_table.result@1.39, 2006-06-14 11:38:12+02:00, mskold@mysql.com +6 -1
    Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster): added test case

  mysql-test/t/ndb_alter_table.test@1.34, 2006-06-14 11:38:12+02:00, mskold@mysql.com +12 -1
    Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster): added test case

ChangeSet@1.2181.9.2, 2006-06-14 11:08:36+02:00, mskold@mysql.com +3 -0
  Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster)

  include/mysql_com.h@1.108, 2006-06-14 11:07:41+02:00, mskold@mysql.com +1 -0
    Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster)

  sql/ha_ndbcluster.cc@1.321, 2006-06-14 11:07:41+02:00, mskold@mysql.com +2 -2
    Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster)

  sql/sql_table.cc@1.343.1.1, 2006-06-14 11:07:41+02:00, mskold@mysql.com +5 -0
    Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster)

ChangeSet@1.2181.17.2, 2006-06-14 13:52:16+05:00, gluh@eagle.intranet.mysql.r18.ru +1 -0
  after merege fix

  mysql-test/r/information_schema.result@1.124, 2006-06-14 13:50:14+05:00, gluh@mysql.com +8 -8
    after merege fix

ChangeSet@1.1616.2635.1, 2006-06-14 13:40:21+05:00, bar@mysql.com +5 -0
  Bug#8663 cant use bgint unsigned as input to cast
  
  Problem: cast to unsigned limited result to 
  max signed bigint 9223372036854775808,
  instead of max unsigned bigint 18446744073709551615.
  
  Fix: don't use args[0]->val_int() when casting from
  a floating point number, use val() instead, with range checkings,
  special to unsigned data type.
  
  item_func.cc:
    Special handling of cast from REAL_RESULT
    to unsigned int: we cannot execute args[0]->val_int()
    because it cuts max allowed value to LONGLONG_INT,
    instead of ULONGLONG_INT required.
  count_distinct3.test:
    Getting rid of "Data truncated; out of range ..." warnings.
  cast.test, cast.result:
    Adding test case.
  ps.result:
    Fixing that cast from 6570515219.6535 
    to unsigned didn't round to 6570515220,
    and returned 6570515219 instead.

  mysql-test/r/cast.result@1.20.3.1, 2006-06-14 13:29:30+05:00, bar@mysql.com +3 -0
    Adding test case.

  mysql-test/r/ps.result@1.31.1.19, 2006-06-14 13:29:51+05:00, bar@mysql.com +7 -7
    Fixing that cast from 6570515219.6535 
    to unsigned didn't round to 6570515220,
    and returned 6570515219 instead.

  mysql-test/t/cast.test@1.15.1.7, 2006-06-14 13:31:00+05:00, bar@mysql.com +6 -0
    Adding test case.

  mysql-test/t/count_distinct3.test@1.4.1.1, 2006-06-14 13:31:30+05:00, bar@mysql.com +2 -0
    Get rid of "wring unsigned value"
    warnings.

  sql/item_func.cc@1.124.47.1, 2006-06-14 13:32:02+05:00, bar@mysql.com +20 -0
    Special handling of cast from REAL)RESULT
    to unsigned int: we cannot execute args[0]->val_int()
    because it cuts max allowed value to LONGLONG_INT,
    instead of ULONGLONG_INT required.

ChangeSet@1.2181.19.1, 2006-06-14 10:23:08+02:00, msvensson@neptunus.(none) +1 -0
  Update test result to 5.1 format

  mysql-test/r/create_not_windows.result@1.2, 2006-06-14 10:23:03+02:00, msvensson@neptunus.(none) +3 -3
    Update test result to use uppercase for keywords

ChangeSet@1.2181.18.3, 2006-06-14 10:04:30+02:00, serg@serg.mylan +1 -0
  move --disable_warnings where it belongs

  mysql-test/t/ps_1general.test@1.30.1.1, 2006-06-14 10:04:14+02:00, serg@serg.mylan +2 -2
    move --disable_warnings where it belongs

ChangeSet@1.2181.18.2, 2006-06-14 09:19:02+02:00, serg@serg.mylan +3 -0
  Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index
  Don't rely on table->null_row when no index is used - it may be a multi-table

  mysql-test/r/fulltext_left_join.result@1.13, 2006-06-14 09:18:45+02:00, serg@serg.mylan +17 -0
    Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index
    Don't rely on table->null_row when no index is used - it may be a multi-table

  mysql-test/t/fulltext_left_join.test@1.13, 2006-06-14 09:18:45+02:00, serg@serg.mylan +14 -1
    Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index
    Don't rely on table->null_row when no index is used - it may be a multi-table

  sql/item_func.cc@1.296, 2006-06-14 09:18:46+02:00, serg@serg.mylan +1 -1
    Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index
    Don't rely on table->null_row when no index is used - it may be a multi-table

ChangeSet@1.2181.18.1, 2006-06-14 09:12:37+02:00, serg@serg.mylan +1 -0
  change test targets to be more modular. include unit tests into make test

  Makefile.am@1.94, 2006-06-14 09:12:16+02:00, serg@serg.mylan +24 -19
    change test targets to be more modular. include unit tests into make test

ChangeSet@1.1616.2622.8, 2006-06-13 22:38:00-07:00, igor@rurik.mysql.com +3 -0
  Post-review corrections of the fix for bug #18206.

  mysql-test/r/func_group.result@1.22.5.12, 2006-06-13 22:37:56-07:00, igor@rurik.mysql.com +13 -0
    Added another test case for bug #18206.

  mysql-test/t/func_group.test@1.24.1.10, 2006-06-13 22:37:56-07:00, igor@rurik.mysql.com +9 -0
    Added another test case for bug #18206.

  sql/opt_sum.cc@1.33.2.10, 2006-06-13 22:37:56-07:00, igor@rurik.mysql.com +4 -2
    Post-review corrections of the fix for bug #18206.

ChangeSet@1.1616.2634.1, 2006-06-13 19:57:50-07:00, igor@rurik.mysql.com +3 -0
  Fixed bug #14896.
  This bug in Field_string::cmp resulted in a wrong comparison 
  with keys in partial indexes over multi-byte character fields.
  Given field a is declared as 
    a varchar(16) collate utf8_unicode_ci
  INDEX(a(4)) gives us an example of such an index.
  
  Wrong key comparisons could lead to wrong result sets if 
  the selected query execution plan used a range scan by 
  a partial index over a utf8 character field.
  This also caused wrong results in many other cases.

  mysql-test/r/ctype_utf8.result@1.45.5.1, 2006-06-13 19:57:46-07:00, igor@rurik.mysql.com +40 -0
    Added test cases for bug #14896.

  mysql-test/t/ctype_utf8.test@1.57.5.1, 2006-06-13 19:57:46-07:00, igor@rurik.mysql.com +26 -0
    Added test cases for bug #14896.

  sql/field.cc@1.197.12.1, 2006-06-13 19:57:46-07:00, igor@rurik.mysql.com +7 -13
    Fixed bug #14896.
    This bug in Field_string::cmp resulted in a wrong comparison 
    with keys in partial indexes over multi-byte character fields.
    Given field a is declared as 
      a varchar(16) collate utf8_unicode_ci
    INDEX(a(4)) gives us an example of such an index.
    
    Wrong key comparisons could lead to wrong result sets if 
    the selected query execution plan used a range scan by 
    a partial index over a utf8 character field.
    This also caused wrong results in many other cases.  
     

ChangeSet@1.2181.15.1, 2006-06-13 22:46:38-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
  BUG#20397: Crash at ALTER TABLE t1 engine = x; for partitioned table

  mysql-test/r/partition_error.result@1.4.1.2, 2006-06-13 22:46:33-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +24 -0
    New test cases

  mysql-test/t/partition_error.test@1.6.1.2, 2006-06-13 22:46:33-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +20 -0
    New test cases

  sql/sql_table.cc@1.345, 2006-06-13 22:46:33-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +12 -0
    ALTER TABLE t1 engine = x;
    will behave exactly like
    ALTER TABLE t1;
    See no reason why one should change handler to something not specified in query when
    there is already something one is attached to.

ChangeSet@1.2181.13.2, 2006-06-13 22:40:05-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  BUG#19307:
  Removed non-static test case

  mysql-test/r/partition_mgm.result@1.2, 2006-06-13 22:40:00-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +0 -10
    Removed non-static test case

  mysql-test/t/partition_mgm.test@1.2, 2006-06-13 22:40:00-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -2
    Removed non-static test case

ChangeSet@1.2181.12.1, 2006-06-13 17:59:04-07:00, brian@zim.(none) +1 -0
  Cleanup of thread code (I didn't use conditionals earlier and I really should have, though there is technically no reason why the prior method would not work). This is just cleaner.
  And this took under 10 minutes to change, so there is no wl or bug associated with it :)

  client/mysqlimport.c@1.75, 2006-06-13 17:58:59-07:00, brian@zim.(none) +25 -20
    Rewrite of some earlier code (and one style cleanup).

ChangeSet@1.2181.11.2, 2006-06-14 01:20:39+02:00, tomas@poseidon.ndb.mysql.com +2 -0
  ndb: add missing LOCK_open

  sql/ha_ndbcluster.cc@1.319.1.1, 2006-06-14 01:20:29+02:00, tomas@poseidon.ndb.mysql.com +2 -0
    ndb: add missing LOCK_open

  sql/ha_ndbcluster_binlog.cc@1.65, 2006-06-14 01:20:29+02:00, tomas@poseidon.ndb.mysql.com +1 -0
    ndb: add missing LOCK_open

ChangeSet@1.2181.11.1, 2006-06-14 01:19:13+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  correct initialization of event operation to enable early delete

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.61, 2006-06-14 01:19:06+02:00, tomas@poseidon.ndb.mysql.com +12 -4
    correct initialization of event operation to enable early delete

ChangeSet@1.1810.1784.2, 2006-06-14 00:38:34+02:00, pekka@clam.ndb.mysql.com +2 -0
  ndb - bug#20406 multi-platform testing - not FIX

  mysql-test/r/ndb_condition_pushdown.result@1.15.1.5, 2006-06-14 00:35:40+02:00, pekka@clam.ndb.mysql.com +24 -0
    ndb - bug#20406 multi-platform testing - not FIX

  mysql-test/t/ndb_condition_pushdown.test@1.16.1.2, 2006-06-14 00:35:40+02:00, pekka@clam.ndb.mysql.com +22 -0
    ndb - bug#20406 multi-platform testing - not FIX

ChangeSet@1.2154.43.9, 2006-06-13 20:59:44+02:00, mats@mysql.com +8 -0
  Bug#19066 (DELETE FROM replication inconsistency for NDB):
  Fixing result files for tests.

  mysql-test/extra/rpl_tests/rpl_truncate_helper.inc@1.2, 2006-06-13 20:59:38+02:00, mats@mysql.com +1 -0
    Fixing SERVER_VERSION

  mysql-test/r/binlog_row_mix_innodb_myisam.result@1.10, 2006-06-13 20:59:38+02:00, mats@mysql.com +13 -18
    Result change

  mysql-test/r/rpl_ddl.result@1.15.1.1, 2006-06-13 20:59:39+02:00, mats@mysql.com +0 -2
    Result change

  mysql-test/r/rpl_row_basic_11bugs.result@1.8, 2006-06-13 20:59:39+02:00, mats@mysql.com +2 -3
    Result change

  mysql-test/r/rpl_truncate_2myisam.result@1.2, 2006-06-13 20:59:39+02:00, mats@mysql.com +6 -6
    Result change

  mysql-test/r/rpl_truncate_3innodb.result@1.2, 2006-06-13 20:59:39+02:00, mats@mysql.com +6 -6
    Result change

  mysql-test/r/rpl_truncate_7ndb.result@1.2, 2006-06-13 20:59:39+02:00, mats@mysql.com +2 -2
    Result change

  mysql-test/t/rpl_truncate_7ndb.test@1.2, 2006-06-13 20:59:39+02:00, mats@mysql.com +2 -0
    Fixing SERVER_VERSION

ChangeSet@1.2154.43.8, 2006-06-13 17:45:51+02:00, mats@mysql.com +2 -0
  Bug#19066 (DELETE FROM replication inconsistency for NDB):
  Post-merge fixes.

  sql/sql_class.h@1.292.1.6, 2006-06-13 17:45:45+02:00, mats@mysql.com +0 -1
    Post-merge fixes

  sql/sql_delete.cc@1.181.1.2, 2006-06-13 17:45:45+02:00, mats@mysql.com +2 -0
    Conditional inclusion of row-based code.

ChangeSet@1.2176.7.3, 2006-06-13 13:00:06-07:00, acurtis@xiphis.org +1 -0
  Bug#20168
    "--default-storage-engine=XXX" doesn't work
    typo in the code and forgotten changes

  sql/mysqld.cc@1.552.1.1, 2006-06-13 13:00:01-07:00, acurtis@xiphis.org +3 -2
    Bug#20168
      typo and forgotten changes

ChangeSet@1.2181.5.4, 2006-06-13 21:18:28+02:00, ngrishakin@mysql.com +4 -0
  Many files:
    ndb_dd_advance test cases

  mysql-test/r/ndb_dd_advance.result@1.2, 2006-06-13 21:17:53+02:00, ngrishakin@mysql.com +0 -7
    ndb_dd_advance test cases

  mysql-test/t/ndb_dd_advance.test@1.2, 2006-06-13 21:17:02+02:00, ngrishakin@mysql.com +5 -5
    ndb_dd_advance test cases

  mysql-test/r/ndb_dd_advance2.result@1.3, 2006-06-13 21:18:03+02:00, ngrishakin@mysql.com +0 -15
    ndb_dd_advance test cases

  mysql-test/t/ndb_dd_advance2.test@1.3, 2006-06-13 21:17:14+02:00, ngrishakin@mysql.com +2 -5
    ndb_dd_advance test cases

ChangeSet@1.2169.28.1, 2006-06-13 14:36:23-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -0
  BUG#19307: CSV engine can cause crashes in partitioned tables (due to its conversion of NULLs to 0)

  mysql-test/r/partition.result@1.36.13.1, 2006-06-13 14:36:13-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -0
    New test case

  mysql-test/t/partition.test@1.37.13.1, 2006-06-13 14:36:13-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +12 -0
    New test case

  sql/partition_info.cc@1.8.7.1, 2006-06-13 14:36:14-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -2
    Disable CSV engine for partitioned tables

  sql/share/errmsg.txt@1.103.1.1, 2006-06-13 14:36:14-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -2
    Update error message for more flexibility

  sql/sql_partition.cc@1.70.5.1, 2006-06-13 14:36:14-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -3
    Editing fixes

ChangeSet@1.2181.2.6, 2006-06-13 11:32:07-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  fixed test case

  mysql-test/r/partition.result@1.38.2.3, 2006-06-13 11:32:02-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -5
    fixed test case

ChangeSet@1.1810.1774.2, 2006-06-13 18:18:32+03:00, gkodinov@mysql.com +3 -0
  Bug #20195: INSERT DELAYED with auto_increment is assigned wrong values
  
  The INSERT DELAYED should not maintain its own private auto-increment
  counter, because this is assuming that other threads cannot insert
  into the table while the INSERT DELAYED thread is inserting, which is
  a wrong assumption.
  
  So the start of processing of a batch of INSERT rows in the 
  INSERT DELAYED thread must be treated as a start of a new statement
  and cached next_insert_id must be cleared.

  mysql-test/r/delayed.result@1.11, 2006-06-13 18:18:27+03:00, gkodinov@mysql.com +30 -0
    test suite for the bug

  mysql-test/t/delayed.test@1.11.1.2, 2006-06-13 18:18:27+03:00, gkodinov@mysql.com +49 -0
    test suite for the bug

  sql/sql_insert.cc@1.146.1.45, 2006-06-13 18:18:28+03:00, gkodinov@mysql.com +8 -0
    Reset auto-increment cacheing before processing
    the next batch of inserts in the handler thread

ChangeSet@1.1616.2633.1, 2006-06-13 19:09:24+04:00, evgen@moonbone.local +9 -0
  Fixed bug#16377: result of DATE/TIME functions were compared as strings which
  can lead to a wrong result.
  
  All date/time functions has the STRING result type thus their results are
  compared as strings. The string date representation allows a user to skip 
  some of leading zeros. This can lead to wrong comparison result if a date/time 
  function result is compared to such a string constant.
  
  The idea behind this bug fix is to compare results of date/time functions
  and data/time constants as ints, because that date/time representation is 
  more exact. To achieve this the agg_cmp_type() is changed to take in the
  account that a date/time field or an date/time item should be compared 
  as ints.
  
  This bug fix is partially back ported from 5.0.
  
  The agg_cmp_type() function now accepts THD as one of parameters. 
  In addition, it now checks if a date/time field/function is present in the
  list. If so, it tries to coerce all constants to INT to make date/time
  comparison return correct result. The field for the constant coercion is
  taken from the Item_field or constructed from the Item_func. In latter case
  the constructed field will be freed after conversion of all constant items.
  Otherwise the result is same as before - aggregated with help of the
  item_cmp_type() function.
  
  From the Item_func_between::fix_length_and_dec() function removed the part
  which was converting date/time constants to int if possible. Now this is 
  done by the agg_cmp_type() function.
  
  The new function result_as_longlong() is added to the Item class. 
  It indicates that the item is a date/time item and result of it can be
  compared as int. Such items are date/time fields/functions.
  
  Correct val_int() methods are implemented for classes Item_date_typecast, 
  Item_func_makedate, Item_time_typecast, Item_datetime_typecast. All these
  classes are derived from Item_str_func and Item_str_func::val_int() converts
  its string value to int without regard to the date/time type of these items.
  
  Arg_comparator::set_compare_func() and Arg_comparator::set_cmp_func()
  functions are changed to substitute result type of an item with the INT_RESULT
  if the item is a date/time item and another item is a constant. This is done
  to get a correct result of comparisons like date_time_function() = string_constant.

  mysql-test/r/cast.result@1.20.1.6, 2006-06-13 18:23:26+04:00, evgen@moonbone.local +1 -1
    Fixed wrong test case result after bug fix#16377.

  mysql-test/r/func_time.result@1.23.5.1, 2006-06-13 19:08:21+04:00, evgen@moonbone.local +41 -0
    Added test case fot bug#16377: result of DATE/TIME functions were compared as strings which
    can lead to a wrong result.

  mysql-test/t/func_time.test@1.21.4.1, 2006-06-13 19:08:10+04:00, evgen@moonbone.local +20 -0
    Added test case fot bug#16377: result of DATE/TIME functions were compared as strings which
    can lead to a wrong result.

  sql/field.cc@1.197.11.1, 2006-06-13 18:26:08+04:00, evgen@moonbone.local +11 -5
    Fixed bug#16377: result of DATE/TIME functions were compared as strings which
    can lead to a wrong result.
    Field::set_warning(), Field::set_datetime_warning() now use current_thd to get thd if table isn't set.

  sql/item.h@1.56.1.138, 2006-06-13 19:07:53+04:00, evgen@moonbone.local +16 -0
    The new function result_as_longlong() is added to the Item class. 
    It indicates that the item is a date/time item and result of it can be
    compared as int. Such items are date/time fields/functions.

  sql/item_cmpfunc.cc@1.111.23.6, 2006-06-13 19:04:46+04:00, evgen@moonbone.local +122 -32
    Fixed bug#16377: result of DATE/TIME functions were compared as strings which
    can lead to a wrong result.
    The agg_cmp_type() function now accepts THD as one of parameters. 
    In addition, it now checks if a date/time field/function is present in the
    list. If so, it tries to coerce all constants to INT to make date/time
    comparison return correct result. The field for the constant coercion is
    taken from the Item_field or constructed from the Item_func. In latter case
    the constructed field will be freed after conversion of all constant items.
    Otherwise the result is same as before - aggregated with help of the
    item_cmp_type() function.

  sql/item_cmpfunc.h@1.73.1.41, 2006-06-13 18:24:34+04:00, evgen@moonbone.local +10 -4
    Fixed bug#16377: result of DATE/TIME functions were compared as strings which
    can lead to a wrong result.
    Arg_comparator::set_compare_func() and Arg_comparator::set_cmp_func()
    functions are changed to substitute result type of an item with the INT_RESULT
    if the item is a date/time item and another item is a constant.

  sql/item_timefunc.cc@1.51.5.1, 2006-06-13 18:24:14+04:00, evgen@moonbone.local +60 -0
    Fixed bug#16377: result of DATE/TIME functions were compared as strings which
    can lead to a wrong result.Correct val_int() methods are implemented for classes Item_date_typecast, 
    Item_func_makedate, Item_time_typecast, Item_datetime_typecast.

  sql/item_timefunc.h@1.42.2.1, 2006-06-13 18:23:53+04:00, evgen@moonbone.local +12 -0
    Fixed bug#16377: result of DATE/TIME functions were compared as strings which
    can lead to a wrong result.
    The result_as_longlong() function is set to return TRUE for these classes:
    Item_date, Item_date_func, Item_func_curtime, Item_func_sec_to_time,
    Item_date_typecast, Item_time_typecast, Item_datetime_typecast,
    Item_func_makedate.

ChangeSet@1.2181.9.1, 2006-06-13 16:44:30+02:00, mskold@mysql.com +4 -0
  Fixed incorrect handling of renamed fields, forcing copy of table if needed and added optional system variable ndb_use_copying_alter_table

  sql/ha_ndbcluster.cc@1.320, 2006-06-13 16:44:01+02:00, mskold@mysql.com +11 -0
    Fixed incorrect handling of renamed fields, forcing copy of table if needed and added optional system variable ndb_use_copying_alter_table

  sql/mysqld.cc@1.554, 2006-06-13 16:44:01+02:00, mskold@mysql.com +7 -0
    Fixed incorrect handling of renamed fields, forcing copy of table if needed and added optional system variable ndb_use_copying_alter_table

  sql/set_var.cc@1.173.1.7, 2006-06-13 16:44:02+02:00, mskold@mysql.com +4 -0
    Fixed incorrect handling of renamed fields, forcing copy of table if needed and added optional system variable ndb_use_copying_alter_table

  sql/sql_class.h@1.297, 2006-06-13 16:44:02+02:00, mskold@mysql.com +1 -0
    Fixed incorrect handling of renamed fields, forcing copy of table if needed and added optional system variable ndb_use_copying_alter_table

ChangeSet@1.2181.8.1, 2006-06-14 00:21:46+10:00, stewart@mysql.com +2 -0
  BUG#17928 testBackup fails in error handling testcases
  
  Reproduced failure of NFMaster on my laptop, this is the fix with some added
  debug information to help people in the future when they trigger asserts in
  AsyncFile (ndbfs helper threads).

  storage/ndb/src/kernel/blocks/backup/Backup.cpp@1.47, 2006-06-14 00:21:39+10:00, stewart@mysql.com +34 -17
    In Backup::checkFile(Signal*, BackupFilePtr), only send FSCLOSEREQ if file
    is not already being closed.
    
    Add debug printouts if DEBUG_ABORT is defined to help in finding the problem.
    
    Only set filePtr.p->fileClosing when we are actually closing the file, not when
    we're anticipating a close.
    
    In Backup::closeFiles(Signal*,BackupRecordPtr), when we're closing a file,
    make sure we've queued everything to be written out before sending FSCLOSEREQ.
    
    This solves two problems:
    - in testBackup (NFMaster) on my machine (but not in autotest since the end of
    March for whatever reason), we were hitting an assert in the buffer for files
    saying we hadn't written everything out of the buffer before closing. (for the
    interested, it was 10 bytes of data)
    - once I'd fixed the above (by the checkFile before close) I'd then get really
    nonsensical trace dumps in NFMaster for ERROR_INSERT 10003. It turns out that
    any asserts in AsyncFile (the thread that NDBFS runs to do its bidding) don't
    cause anything to be written out anywhere and you're left scratching your head
    as to what on earth happenned (apart from getting "caught signal 6, aborted").
    What really was happenning was we were then calling FSCLOSEREQ one too many times,
    hitting the assert on trying to close an fd of -1 in AsyncFile.

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp@1.32, 2006-06-14 00:21:39+10:00, stewart@mysql.com +7 -1
    It turns out that any asserts in AsyncFile (the thread that NDBFS runs to do 
    its bidding) don't cause anything to be written out anywhere and you're left 
    scratching your head as to what on earth happenned (apart from getting 
    "caught signal 6, aborted"). What really was happenning was we were then 
    calling FSCLOSEREQ one too many times, hitting the assert on trying to close
    an fd of -1 in AsyncFile.
    
    Added DEBUG printouts for every assert in AsyncFile

ChangeSet@1.2181.1.6, 2006-06-13 18:53:12+05:00, gluh@eagle.intranet.mysql.r18.ru +2 -0
  Bug#19720 "Information Schema" output does not list privileges when running "embedded"
  replace PRVILEGES column result with # for compatibility with embedded

  mysql-test/r/join.result@1.37.1.1, 2006-06-13 18:51:09+05:00, gluh@mysql.com +2 -2
    Bug#19720 "Information Schema" output does not list privileges when running "embedded"
    replace PRVILEGES column result with # for compatibility with embedded

  mysql-test/t/join.test@1.31.1.1, 2006-06-13 18:51:10+05:00, gluh@mysql.com +1 -0
    Bug#19720 "Information Schema" output does not list privileges when running "embedded"
    replace PRVILEGES column result with # for compatibility with embedded

ChangeSet@1.1810.1776.7, 2006-06-13 17:23:43+05:00, holyfoot@deer.(none) +2 -0
  bug #16832 (ALGORITHM missed in VIEW's information schema)

  mysql-test/r/information_schema.result@1.87.1.21, 2006-06-13 17:22:23+05:00, holyfoot@mysql.com +9 -9
    test result fixed

  sql/sql_show.cc@1.253.1.67, 2006-06-13 17:22:23+05:00, holyfoot@mysql.com +34 -6
    /*ALGORITHM=XXX*/ added to the 'query' column in view's information schema

ChangeSet@1.1346.1.836, 2006-06-13 16:01:54+05:00, ramil@mysql.com +4 -0
  Fix for bug #12728: Very strange behaviour of ELT

  mysql-test/r/func_str.result@1.16.2.19, 2006-06-13 16:01:50+05:00, ramil@mysql.com +7 -0
    Fix for bug #12728: Very strange behaviour of ELT
      - test case

  mysql-test/t/func_str.test@1.15.2.20, 2006-06-13 16:01:50+05:00, ramil@mysql.com +8 -0
    Fix for bug #12728: Very strange behaviour of ELT
      - test result

  sql/item_strfunc.cc@1.36.1.51, 2006-06-13 16:01:50+05:00, ramil@mysql.com +11 -0
    Fix for bug #12728: Very strange behaviour of ELT
      - Item_func_elt::eq() introduced: check 'item' member as well
        (to distinguish for instance elt(1, 'a', 'b') and elt(2, 'a', 'b')

  sql/item_strfunc.h@1.15.1.12, 2006-06-13 16:01:50+05:00, ramil@mysql.com +1 -0
    Fix for bug #12728: Very strange behaviour of ELT
      - Item_func_elt::eq() introduced: check 'item' member as well
        (to distinguish for instance elt(1, 'a', 'b') and elt(2, 'a', 'b')

ChangeSet@1.2181.5.2, 2006-06-13 06:21:16+02:00, ngrishakin@mysql.com +2 -0
  ndb_dd_advance2.result:
    ndb_dd_advance2 test cases
  ndb_dd_advance2.test:
    ndb_dd_advance test cases

  mysql-test/r/ndb_dd_advance2.result@1.2, 2006-06-13 06:20:54+02:00, ngrishakin@mysql.com +106 -106
    ndb_dd_advance2 test cases

  mysql-test/t/ndb_dd_advance2.test@1.2, 2006-06-13 06:20:36+02:00, ngrishakin@mysql.com +5 -5
    ndb_dd_advance test cases

ChangeSet@1.2169.1.7, 2006-06-12 17:37:32-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  BUG#19122: Need to close handlers before drop/rename phase
  Fixed comments

  sql/sql_partition.cc@1.73, 2006-06-12 17:37:28-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +18 -8
    Fixed comments

ChangeSet@1.2169.1.6, 2006-06-12 17:30:32-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -0
  BUG#19122: Need to close all handlers before rename/drop phase in ALTER TABLE ADD/DROP/REORGANIZE partitions
  After review fix

  mysql-test/r/partition.result@1.36.8.5, 2006-06-12 17:30:26-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -4
    Fixes for test

  mysql-test/t/partition.test@1.37.9.5, 2006-06-12 17:30:26-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
    Fixes for test

  sql/lock.cc@1.93, 2006-06-12 17:30:27-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -10
    After review fix

  sql/mysql_priv.h@1.407, 2006-06-12 17:30:27-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    After review fix

  sql/sql_partition.cc@1.72, 2006-06-12 17:30:27-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +25 -24
    After review fix

ChangeSet@1.2181.5.1, 2006-06-12 21:09:28+02:00, ngrishakin@mysql.com +4 -0
  ndb_dd_advance test cases

  mysql-test/r/ndb_dd_advance.result@1.1, 2006-06-12 21:08:49+02:00, ngrishakin@mysql.com +1095 -0
    ndb_dd_advance test cases

  mysql-test/r/ndb_dd_advance.result@1.0, 2006-06-12 21:08:49+02:00, ngrishakin@mysql.com +0 -0
    BitKeeper file /home/ndbdev/ngrishakin/mysql-5.1/mysql-test/r/ndb_dd_advance.result

  mysql-test/t/ndb_dd_advance.test@1.1, 2006-06-12 21:07:17+02:00, ngrishakin@mysql.com +630 -0
    ndb_dd_advance test cases

  mysql-test/t/ndb_dd_advance.test@1.0, 2006-06-12 21:07:17+02:00, ngrishakin@mysql.com +0 -0
    BitKeeper file /home/ndbdev/ngrishakin/mysql-5.1/mysql-test/t/ndb_dd_advance.test

  mysql-test/r/ndb_dd_advance2.result@1.1, 2006-06-12 21:08:28+02:00, ngrishakin@mysql.com +760 -0
    ndb_dd_advance2 test cases

  mysql-test/r/ndb_dd_advance2.result@1.0, 2006-06-12 21:08:28+02:00, ngrishakin@mysql.com +0 -0
    BitKeeper file /home/ndbdev/ngrishakin/mysql-5.1/mysql-test/r/ndb_dd_advance2.result

  mysql-test/t/ndb_dd_advance2.test@1.1, 2006-06-12 21:07:32+02:00, ngrishakin@mysql.com +726 -0
    ndb_dd_advance2 test cases

  mysql-test/t/ndb_dd_advance2.test@1.0, 2006-06-12 21:07:32+02:00, ngrishakin@mysql.com +0 -0
    BitKeeper file /home/ndbdev/ngrishakin/mysql-5.1/mysql-test/t/ndb_dd_advance2.test

ChangeSet@1.2181.3.1, 2006-06-12 18:00:06+02:00, pekka@clam.ndb.mysql.com +3 -0
  ndb - bug#19872 fix (sufficient for replication)

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.60, 2006-06-12 17:57:27+02:00, pekka@clam.ndb.mysql.com +32 -3
    allow idempotency INSoINS or DELoDEL
    does NOT check data section 2 (before data)

  storage/ndb/test/ndbapi/test_event.cpp@1.21, 2006-06-12 17:54:16+02:00, pekka@clam.ndb.mysql.com +40 -3
    test applier under merge events
    also fix run in 5.1 (check for data event)

  storage/ndb/test/run-test/daily-devel-tests.txt@1.28, 2006-06-12 17:55:39+02:00, pekka@clam.ndb.mysql.com +5 -0
    add: test_event -n MergeEventOperationApplier_NR

ChangeSet@1.1810.1783.1, 2006-06-12 18:15:08+03:00, gkodinov@mysql.com +3 -0
  Bug #20363: Create view on just created view is now denied
  
  There was a wrong determination of the DB name (witch is 
  not always the one in TABLE_LIST because derived tables
  may be calculated using temp tables that have their db name
  set to "").
  The fix determines the database name according to the type 
  of table reference, and calls the function check_access() 
  with the correct db name so the correct set of grants is found.

  mysql-test/r/view_grant.result@1.8.1.8, 2006-06-12 18:15:03+03:00, gkodinov@mysql.com +29 -0
    testsuite for the bug

  mysql-test/t/view_grant.test@1.8.1.6, 2006-06-12 18:15:03+03:00, gkodinov@mysql.com +39 -0
    testsuite for the bug

  sql/sql_parse.cc@1.426.1.123, 2006-06-12 18:15:03+03:00, gkodinov@mysql.com +8 -1
    correct determination of the db name.

ChangeSet@1.2176.7.1, 2006-06-12 06:50:11-07:00, acurtis@xiphis.org +5 -0
  Bug#20168
    "Change in behavior --default-storage-engine=ndb or ndbcluster"
    Reduce use of legacy_db_type, some code cleanup
    (serg read my mind and implemented desired mysqld.cc changes)

  sql/handler.cc@1.240, 2006-06-12 06:50:07-07:00, acurtis@xiphis.org +59 -25
    Bug#20168
      remove some use of legacy_db_type
      cleanup code, new func for default type

  sql/handler.h@1.215.1.1, 2006-06-12 06:50:07-07:00, acurtis@xiphis.org +2 -5
    Bug#20168
      remove some use of legacy_db_type
      cleanup code, new func for default type

  sql/sql_plugin.cc@1.25, 2006-06-12 06:50:07-07:00, acurtis@xiphis.org +11 -11
    compiler hints, consts

  sql/sql_plugin.h@1.10, 2006-06-12 06:50:07-07:00, acurtis@xiphis.org +5 -5
    compiler hints, consts

  sql/sql_tablespace.cc@1.7, 2006-06-12 06:50:07-07:00, acurtis@xiphis.org +1 -1
    use ha_default_handlerton instead of resolving DB_TYPE_DEFAULT

ChangeSet@1.1810.1776.5, 2006-06-12 15:05:42+02:00, mskold@mysql.com +2 -0
  Added order by

  mysql-test/r/ndb_lock.result@1.5.1.4, 2006-06-12 15:05:07+02:00, mskold@mysql.com +4 -4
    Added order by

  mysql-test/t/ndb_lock.test@1.7.1.4, 2006-06-12 15:05:07+02:00, mskold@mysql.com +2 -2
    Added order by

ChangeSet@1.1616.2144.145, 2006-06-12 14:53:15+02:00, mskold@mysql.com +2 -0
  Added order by

  mysql-test/r/ndb_lock.result@1.5.2.1, 2006-06-12 14:52:40+02:00, mskold@mysql.com +4 -4
    Added order by

  mysql-test/t/ndb_lock.test@1.7.2.1, 2006-06-12 14:52:40+02:00, mskold@mysql.com +2 -2
    Added order by

ChangeSet@1.2181.1.4, 2006-06-12 15:28:36+02:00, mskold@mysql.com +2 -0
  Added order by

  mysql-test/r/ndb_lock.result@1.10, 2006-06-12 15:28:13+02:00, mskold@mysql.com +4 -4
    Added order by

  mysql-test/t/ndb_lock.test@1.10, 2006-06-12 15:28:12+02:00, mskold@mysql.com +2 -2
    Added order by

ChangeSet@1.1810.1782.1, 2006-06-12 08:54:45-04:00, cmiller@zippy.(none) +5 -0
  Bug #16206: Superfluous COMMIT event in binlog when updating BDB in autocommit 
  	mode
  
  This is a modification of serg's and guilhem's suggestion in the bug report,
  in that it also causes the transaction log to be written to disc.

  mysql-test/r/bdb.result@1.48.1.2, 2006-06-12 08:54:40-04:00, cmiller@zippy.(none) +34 -0
    Add result.

  mysql-test/t/bdb.test@1.50.1.2, 2006-06-12 08:54:40-04:00, cmiller@zippy.(none) +35 -0
    Add test

  sql/log.cc@1.158.1.31, 2006-06-12 08:54:40-04:00, cmiller@zippy.(none) +17 -5
    Create a log-committing event that itself won't be written to the log when 
    we're in autocommit mode.

  sql/log_event.cc@1.174.1.31, 2006-06-12 08:54:40-04:00, cmiller@zippy.(none) +27 -0
    Add a new subclass of Query_log_event that doesn't write itself to the log, for
    cases where we only want to flush out the transaction and not also write about
    this event.

  sql/log_event.h@1.122.1.2, 2006-06-12 08:54:40-04:00, cmiller@zippy.(none) +21 -0
    Add a new subclass of Query_log_event that doesn't write itself to the log, for
    cases where we only want to flush out the transaction and not also write about
    this event.

ChangeSet@1.2181.1.2, 2006-06-12 14:23:21+02:00, mskold@mysql.com +8 -0
  sql_delete.cc:
    Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: locked lock_OPEN mutex to support TRUNCATE with re-create and cluster binlog
  Many files:
    Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
  ndb_lock.result, ha_ndbcluster.cc:
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Adaption to 5.1 code
  NdbDictionaryImpl.hpp:
    Fix of bad merge

  mysql-test/r/ndb_lock.result@1.9, 2006-06-12 14:13:02+02:00, mskold@mysql.com +80 -0
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Adaption to 5.1 code

  mysql-test/r/rpl_ndb_basic.result@1.4, 2006-06-12 14:15:56+02:00, mskold@mysql.com +15 -0
    Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication

  mysql-test/t/rpl_ndb_basic.test@1.6, 2006-06-12 14:15:56+02:00, mskold@mysql.com +8 -1
    Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication

  sql/ha_ndbcluster.cc@1.319, 2006-06-12 14:13:01+02:00, mskold@mysql.com +80 -8
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Adaption to 5.1 code

  sql/ha_ndbcluster_binlog.cc@1.64, 2006-06-12 14:15:55+02:00, mskold@mysql.com +4 -0
    Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication

  sql/ha_ndbcluster_binlog.h@1.14, 2006-06-12 14:15:56+02:00, mskold@mysql.com +2 -1
    Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication

  sql/sql_delete.cc@1.184, 2006-06-12 14:21:16+02:00, mskold@mysql.com +2 -0
    Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: locked lock_OPEN mutex to support TRUNCATE with re-create and cluster binlog

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp@1.57.1.7, 2006-06-12 14:09:36+02:00, mskold@mysql.com +1 -1
    Fix of bad merge

ChangeSet@1.1616.2603.7, 2006-06-12 13:06:56+02:00, tomas@poseidon.ndb.mysql.com +2 -0
  Bug #20336 CLUSTERLOG commands have no effect
  - always calculate max log level on node start
  - send event subscribe uncond

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.51.1.25, 2006-06-12 13:06:52+02:00, tomas@poseidon.ndb.mysql.com +34 -25
    Bug #20336 CLUSTERLOG commands have no effect
    - always calculate max log level on node start
    - send event subscribe uncond

  ndb/src/mgmsrv/Services.cpp@1.31.1.11, 2006-06-12 13:06:52+02:00, tomas@poseidon.ndb.mysql.com +6 -7
    Bug #20336 CLUSTERLOG commands have no effect
    - always send log level update
    

ChangeSet@1.2154.44.2, 2006-06-12 13:52:29+04:00, aivanov@mysql.com +2 -0
  Making dtype_get_max_size() non-inline to avoid build error
   in non-debug mode.

  storage/innobase/data/data0type.c@1.26, 2006-06-12 13:52:24+04:00, aivanov@mysql.com +0 -1
    Making dtype_get_max_size() non-inline to avoid build error
     in non-debug mode.

  storage/innobase/include/data0type.h@1.26, 2006-06-12 13:52:24+04:00, aivanov@mysql.com +0 -1
    Making dtype_get_max_size() non-inline to avoid build error
     in non-debug mode.

ChangeSet@1.1810.1762.10, 2006-06-12 10:40:56+02:00, mskold@mysql.com +2 -0
   Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Skipped lock check for full table scan due to bug #20390 SELECT FOR UPDATE does not release locks of untouched rows in full table scans

  mysql-test/r/ndb_lock.result@1.5.1.3, 2006-06-12 10:40:32+02:00, mskold@mysql.com +0 -6
     Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Skipped lock check for full table scan due to bug #20390 SELECT FOR UPDATE does not release locks of untouched rows in full table scans

  mysql-test/t/ndb_lock.test@1.7.1.3, 2006-06-12 10:40:31+02:00, mskold@mysql.com +4 -2
     Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Skipped lock check for full table scan due to bug #20390 SELECT FOR UPDATE does not release locks of untouched rows in full table scans

ChangeSet@1.1810.1762.9, 2006-06-12 10:22:32+02:00, mskold@mysql.com +1 -0
   Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Added missing parameter for readTuples in index scan

  sql/ha_ndbcluster.cc@1.175.1.80, 2006-06-12 10:22:06+02:00, mskold@mysql.com +1 -1
     Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Added missing parameter for readTuples in index scan

ChangeSet@1.1810.1762.7, 2006-06-12 09:37:19+02:00, mskold@mysql.com +4 -0
  Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Adapted to 5.0 code changes

  sql/ha_ndbcluster.cc@1.175.1.78, 2006-06-12 09:37:05+02:00, mskold@mysql.com +81 -10
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Adapted to 5.0 code changes

  ndb/include/ndbapi/NdbIndexScanOperation.hpp@1.17.2.2, 2006-06-12 09:37:05+02:00, mskold@mysql.com +5 -2
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Adapted to 5.0 code changes

  ndb/include/ndbapi/NdbScanOperation.hpp@1.32.2.2, 2006-06-12 09:37:05+02:00, mskold@mysql.com +30 -2
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Adapted to 5.0 code changes

  ndb/src/ndbapi/NdbScanOperation.cpp@1.66.4.2, 2006-06-12 09:37:05+02:00, mskold@mysql.com +1 -1
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Adapted to 5.0 code changes

ChangeSet@1.1616.2627.4, 2006-06-12 09:28:27+02:00, mskold@mysql.com +2 -0
  Added lock test on index scan

  mysql-test/r/ndb_lock.result@1.5.1.2, 2006-06-12 09:28:13+02:00, mskold@mysql.com +51 -24
    Added lock test on index scan

  mysql-test/t/ndb_lock.test@1.7.1.2, 2006-06-12 09:28:13+02:00, mskold@mysql.com +39 -4
    Added lock test on index scan

ChangeSet@1.1616.2627.3, 2006-06-12 09:27:04+02:00, mskold@mysql.com +1 -0
  Moved back comment to  correct method

  sql/ha_ndbcluster.cc@1.114.3.68, 2006-06-12 09:26:16+02:00, mskold@mysql.com +12 -5
    Moved back comment to  correct method

ChangeSet@1.2198, 2006-06-12 09:08:41+02:00, msvensson@neptunus.(none) +1 -0
  Fix test that depend on bdb

  mysql-test/t/ps_1general.test@1.31, 2006-06-12 09:08:36+02:00, msvensson@neptunus.(none) +1 -1
    Move disable_warnings  and it's comment to before when the statement is executed

ChangeSet@1.2197, 2006-06-12 09:05:24+02:00, msvensson@neptunus.(none) +1 -0
  Add have_partition to test that needs partition

  mysql-test/t/partition_innodb.test@1.2, 2006-06-12 09:05:19+02:00, msvensson@neptunus.(none) +1 -0
    Add have_partition to test that needs partition

ChangeSet@1.2196, 2006-06-12 09:00:33+02:00, msvensson@neptunus.(none) +1 -0
  Skip tests that need debug binaries only if binaries are _not_ debug compiled

  mysql-test/lib/mtr_cases.pl@1.26, 2006-06-12 09:00:28+02:00, msvensson@neptunus.(none) +1 -1
    Skip tests that need debug binaries only if binaries are _not_ debug compiled

ChangeSet@1.2195, 2006-06-12 00:05:02+02:00, msvensson@neptunus.(none) +1 -0
  Only process lines that start with --

  mysql-test/lib/mtr_cases.pl@1.25, 2006-06-12 00:04:58+02:00, msvensson@neptunus.(none) +3 -0
    Only process lines that start with --

ChangeSet@1.2194, 2006-06-12 00:02:50+02:00, msvensson@neptunus.(none) +2 -0
  Avoid using "-- source " command in plain text

  mysql-test/r/mysqltest.result@1.39, 2006-06-12 00:02:45+02:00, msvensson@neptunus.(none) +4 -4
    Avoid using "-- source " command in plain text

  mysql-test/t/mysqltest.test@1.51, 2006-06-12 00:02:45+02:00, msvensson@neptunus.(none) +4 -4
    Avoid using "-- source " command in plain text

ChangeSet@1.2193, 2006-06-11 23:13:32+02:00, msvensson@neptunus.(none) +4 -0
  Fix warnings
  Make list of tags/name/values to simplify adding more tags
  Check if debug compiled binaries

  mysql-test/lib/mtr_cases.pl@1.24, 2006-06-11 23:13:27+02:00, msvensson@neptunus.(none) +38 -43
    Fix warnings
    Use local file handle for recursive "include file" loop
    Make list of tags/name/value to search for in .test files
    Add fileter for "require debug compiled binary"

  mysql-test/lib/mtr_process.pl@1.39, 2006-06-11 23:13:27+02:00, msvensson@neptunus.(none) +4 -3
    Fix warnings

  mysql-test/lib/mtr_report.pl@1.32, 2006-06-11 23:13:27+02:00, msvensson@neptunus.(none) +7 -2
    Fix warning, only print total time if "--timer"

  mysql-test/mysql-test-run.pl@1.131, 2006-06-11 23:13:27+02:00, msvensson@neptunus.(none) +23 -0
    Fix warnings
    Add check of debug compiled binaries

ChangeSet@1.1810.1775.2, 2006-06-11 20:46:47+02:00, pekka@clam.ndb.mysql.com +8 -0
  ndb - bug#18781 (5.0) handle rolling upgrade, minor fixes, logging, docs

  ndb/include/kernel/signaldata/DictLock.hpp@1.3, 2006-06-11 20:37:39+02:00, pekka@clam.ndb.mysql.com +3 -1
    2 more REFs

  ndb/include/ndb_version.h.in@1.1.5.1, 2006-06-11 20:39:13+02:00, pekka@clam.ndb.mysql.com +2 -0
    DICT LOCK appeared in 5.0.23

  ndb/src/kernel/blocks/ERROR_codes.txt@1.9.9.2, 2006-06-11 20:44:12+02:00, pekka@clam.ndb.mysql.com +4 -2
    more DICT LOCK related testing

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.40.23.2, 2006-06-11 20:36:37+02:00, pekka@clam.ndb.mysql.com +85 -16
    call removeStaleDictLocks at right place, comment why it works
    more checks, better logging

  ndb/src/kernel/blocks/dbdict/Dbdict.hpp@1.9.9.2, 2006-06-11 20:36:37+02:00, pekka@clam.ndb.mysql.com +3 -2
    call removeStaleDictLocks at right place, comment why it works
    more checks, better logging

  ndb/src/kernel/blocks/dbdict/DictLock.txt@1.2, 2006-06-11 20:33:58+02:00, pekka@clam.ndb.mysql.com +94 -0
    NR signals

  ndb/src/kernel/blocks/dbdict/DictLock.txt@1.1, 2006-06-11 17:43:03+02:00, pekka@clam.ndb.mysql.com +0 -0

  ndb/src/kernel/blocks/dbdict/DictLock.txt@1.0, 2006-06-11 17:43:03+02:00, pekka@clam.ndb.mysql.com +0 -0
    BitKeeper file /space/pekka/ndb/version/my50-bug18781/ndb/src/kernel/blocks/dbdict/DictLock.txt

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.24.30.2, 2006-06-11 20:43:23+02:00, pekka@clam.ndb.mysql.com +45 -1
    DICT LOCK rolling upgrade from version < 5.0.23

  ndb/test/ndbapi/testDict.cpp@1.20.5.2, 2006-06-11 20:44:12+02:00, pekka@clam.ndb.mysql.com +42 -25
    more DICT LOCK related testing

ChangeSet@1.2192, 2006-06-11 19:03:33+02:00, msvensson@neptunus.(none) +1 -0
  Print total time spent exectuing test cases

  mysql-test/lib/mtr_report.pl@1.31, 2006-06-11 19:03:28+02:00, msvensson@neptunus.(none) +3 -2
    Print total time spent exectuing test cases

ChangeSet@1.2191, 2006-06-11 15:49:34+02:00, msvensson@neptunus.(none) +2 -0
  Add more checks to determine if test can be skipped becuase the feature it uses are not supported.
  Check for big-test, ndb-extra, require_manager and binlog format row/stmt 

  mysql-test/lib/mtr_cases.pl@1.23, 2006-06-11 15:49:28+02:00, msvensson@neptunus.(none) +56 -0
    Add more checks to determine if test can be skipped becuase the feature it uses are not supported.
    Check for big-test, ndb-extra, require_manager and binlog format row/stmt 

  mysql-test/mysql-test-run.pl@1.130, 2006-06-11 15:49:28+02:00, msvensson@neptunus.(none) +17 -0
    Add more checks to determine if test can be skipped becuase the feature it uses are not supported.
    Check for big-test, ndb-extra, require_manager and binlog format row/stmt 

ChangeSet@1.2190, 2006-06-11 11:28:11+02:00, msvensson@neptunus.(none) +2 -0
  Change 'mtr_kill_process' to only take three arguments. The last indicating max number of seconds to wait for process to be killed.
  Leave it to the implementation of 'mtr_kill_process' how long to wait between each attempt to kill/detect if process has been killed.

  mysql-test/lib/mtr_process.pl@1.38, 2006-06-11 11:28:06+02:00, msvensson@neptunus.(none) +5 -6
    Change 'mtr_kill_process' to only take three arguments. The last indicating max number of seconds to wait for process to be killed.

  mysql-test/mysql-test-run.pl@1.129, 2006-06-11 11:28:06+02:00, msvensson@neptunus.(none) +3 -3
    Change 'mtr_kill_process' to only take three arguments. The last indicating max number of seconds to wait for process to be killed.

ChangeSet@1.2189, 2006-06-11 10:12:31+02:00, msvensson@neptunus.(none) +1 -0
  Add printout of commment why test was skipped

  mysql-test/lib/mtr_report.pl@1.30, 2006-06-11 10:12:14+02:00, msvensson@neptunus.(none) +1 -1
    Add printout of commment why test was skipped

ChangeSet@1.2188, 2006-06-11 10:10:55+02:00, msvensson@neptunus.(none) +3 -0
  Prepare for selective restart of slaves
  Add comment why test is skipped

  mysql-test/lib/mtr_cases.pl@1.22, 2006-06-11 10:10:50+02:00, msvensson@neptunus.(none) +16 -22
    Add comments why tets is skipped
    Disable the use of --skip-innodb if test does not need it

  mysql-test/lib/mtr_report.pl@1.29, 2006-06-11 10:10:50+02:00, msvensson@neptunus.(none) +1 -1
    Print commment why test was skipped

  mysql-test/mysql-test-run.pl@1.128, 2006-06-11 10:10:50+02:00, msvensson@neptunus.(none) +127 -52
    Prepare for selective restart of slaves
    Add comment why test is skipped

ChangeSet@1.2187, 2006-06-11 09:04:23+02:00, msvensson@neptunus.(none) +2 -0
  Update test results
  Fix merge problem

  mysql-test/r/join_outer_innodb.result@1.2, 2006-06-11 09:04:17+02:00, msvensson@neptunus.(none) +2 -2
    Update test result

  mysql-test/t/group_min_max.test@1.25, 2006-06-11 09:04:17+02:00, msvensson@neptunus.(none) +2 -0
    Add missing drop table (lost during merge)

ChangeSet@1.2186, 2006-06-10 22:10:57+02:00, msvensson@neptunus.(none) +1 -0
  Add comment about when ndbcluster tables are removed from mysqld datadir

  mysql-test/mysql-test-run.pl@1.127, 2006-06-10 22:10:52+02:00, msvensson@neptunus.(none) +1 -0
    Add comment about when ndbcluster tables are removed from mysqld datadir

ChangeSet@1.2185, 2006-06-10 21:47:25+02:00, msvensson@neptunus.(none) +1 -0
  Cacluate nodeid and ndb_fs path when initializing ndbds, to be used when defining log files and when removing the ndb_fs after failed test case

  mysql-test/mysql-test-run.pl@1.126, 2006-06-10 21:47:20+02:00, msvensson@neptunus.(none) +9 -4
    Cacluate nodeid and ndb_fs path when initializing ndbds, to be used when defining log files and when removing the ndb_fs after failed test case

ChangeSet@1.2184, 2006-06-10 21:20:14+02:00, msvensson@neptunus.(none) +1 -0
  Use foreach loop to remove fs for ndbd nodes when restoring snapshot

  mysql-test/mysql-test-run.pl@1.125, 2006-06-10 21:20:09+02:00, msvensson@neptunus.(none) +6 -8
    Use foreach loop to remove fs for ndbd nodes when restoring snapshot

ChangeSet@1.2183, 2006-06-10 20:59:14+02:00, msvensson@neptunus.(none) +1 -0
  Use function 'stop_all_servers' to stop the running servers before restoring snapshot and resuming tests

  mysql-test/mysql-test-run.pl@1.124, 2006-06-10 20:59:08+02:00, msvensson@neptunus.(none) +5 -4
    Use function 'stop_all_servers' to stop the running servers before restoring snapshot and resuming tests

ChangeSet@1.2154.8.19, 2006-06-10 19:35:18+02:00, msvensson@neptunus.(none) +1 -0
  Update result

  mysql-test/r/rpl_loaddata.result@1.32, 2006-06-10 19:35:13+02:00, msvensson@neptunus.(none) +1 -0
    Add missing drop table t1 to result

ChangeSet@1.2154.8.18, 2006-06-10 19:33:37+02:00, msvensson@neptunus.(none) +1 -0
  Run check testcase for all masters and slaves

  mysql-test/mysql-test-run.pl@1.114.2.9, 2006-06-10 19:33:31+02:00, msvensson@neptunus.(none) +23 -8
    Run check testcase for all masters and slaves

ChangeSet@1.1810.1779.4, 2006-06-09 19:29:39-07:00, igor@rurik.mysql.com +1 -0
  Post-merge fixes

  mysql-test/r/sysdate_is_now.result@1.2, 2006-06-09 19:29:32-07:00, igor@rurik.mysql.com +1 -1
    Post-merge fixes

ChangeSet@1.2176.6.1, 2006-06-10 00:35:44+04:00, konstantin@mysql.com +1 -0
  Disable im_life_cycle test

  mysql-test/t/disabled.def@1.165, 2006-06-10 00:35:40+04:00, konstantin@mysql.com +1 -0
    Disable im_life_cycle test

ChangeSet@1.2176.3.13, 2006-06-09 12:27:28-07:00, igor@rurik.mysql.com +7 -0
  Post-merge fixes

  mysql-test/r/compress.result@1.6, 2006-06-09 12:27:18-07:00, igor@rurik.mysql.com +2 -2
    Post-merge fixes

  mysql-test/r/explain.result@1.19, 2006-06-09 12:27:19-07:00, igor@rurik.mysql.com +2 -2
    Post-merge fixes

  mysql-test/r/select.result@1.128, 2006-06-09 12:27:19-07:00, igor@rurik.mysql.com +4 -4
    Post-merge fixes

  mysql-test/r/ssl.result@1.5, 2006-06-09 12:27:19-07:00, igor@rurik.mysql.com +2 -2
    Post-merge fixes

  mysql-test/r/ssl_compress.result@1.5, 2006-06-09 12:27:19-07:00, igor@rurik.mysql.com +2 -2
    Post-merge fixes

  mysql-test/r/view.result@1.165, 2006-06-09 12:27:19-07:00, igor@rurik.mysql.com +1 -1
    Post-merge fixes

  sql/sql_parse.cc@1.558, 2006-06-09 12:27:19-07:00, igor@rurik.mysql.com +2 -1
    Post-merge fixes

ChangeSet@1.1810.1780.1, 2006-06-09 19:35:54+02:00, msvensson@neptunus.(none) +6 -0
  Bug #7498 User variable SET saves SIGNED BIGINT as UNSIGNED BIGINT
  - Add unsigned flag to user_var_entry, used when 'type' is INT_RESULT
  - Propagate unsigned flag from the query executed by Item_single_row_subselect

  mysql-test/r/user_var.result@1.37.1.2, 2006-06-09 19:35:50+02:00, msvensson@neptunus.(none) +36 -0
    Update test results

  mysql-test/t/user_var.test@1.34, 2006-06-09 19:35:50+02:00, msvensson@neptunus.(none) +31 -0
    Add test case

  sql/item_func.cc@1.270.9.1, 2006-06-09 19:35:50+02:00, msvensson@neptunus.(none) +17 -7
    Add unsigned_flag to user_var_entry. Used when 'type' is INT_RESULT
    Pass unsigned_flag to 'update_hash' if type is INT_RESULT

  sql/item_func.h@1.136.5.1, 2006-06-09 19:35:50+02:00, msvensson@neptunus.(none) +2 -4
    Removed unused variable save_buff
    Add parameter unsigned_arg to 'update_hash'

  sql/item_subselect.cc@1.113.4.1, 2006-06-09 19:35:50+02:00, msvensson@neptunus.(none) +1 -0
    Propagate unsigned_flag to Item_singlerow_subselect from the items in the select to the cached items.

  sql/sql_class.h@1.230.1.59, 2006-06-09 19:35:50+02:00, msvensson@neptunus.(none) +1 -0
    Add unsigned_flag to user_var_entry. Used when 'type' is INT_RESULT

ChangeSet@1.2176.5.1, 2006-06-09 16:20:23+02:00, rburnett@bk-internal.mysql.com +7 -0
  Many files:
    Merging changesets from crashed 5.1-kt

  mysql-test/r/information_schema_part.result@1.4, 2006-06-09 16:16:32+02:00, rburnett@bk-internal.mysql.com +2 -2
    Merging changesets from crashed 5.1-kt

  mysql-test/r/partition.result@1.39, 2006-06-09 16:16:47+02:00, rburnett@bk-internal.mysql.com +25 -25
    Merging changesets from crashed 5.1-kt

  mysql-test/r/partition_02myisam.result@1.6, 2006-06-09 16:16:56+02:00, rburnett@bk-internal.mysql.com +29 -29
    Merging changesets from crashed 5.1-kt

  mysql-test/r/partition_mgm_err.result@1.15, 2006-06-09 16:17:27+02:00, rburnett@bk-internal.mysql.com +1 -1
    Merging changesets from crashed 5.1-kt

  mysql-test/r/partition_range.result@1.8.2.1, 2006-06-09 16:17:40+02:00, rburnett@bk-internal.mysql.com +4 -4
    Merging changesets from crashed 5.1-kt

  mysql-test/r/rpl_row_basic_8partition.result@1.3, 2006-06-09 16:17:55+02:00, rburnett@bk-internal.mysql.com +18 -18
    Merging changesets from crashed 5.1-kt

  sql/sql_show.cc@1.348, 2006-06-09 16:18:06+02:00, rburnett@bk-internal.mysql.com +2 -0
    Merging changesets from crashed 5.1-kt

ChangeSet@1.2169.26.1, 2006-06-09 12:30:04+02:00, tomas@poseidon.ndb.mysql.com +5 -0
  Bug #13266 Online adding of MySQLD causes cluster to crash
  - check node type, if configuration has not bee updated, type will be undefined, and conenction will be refused

  storage/ndb/include/kernel/signaldata/AllocNodeId.hpp@1.2, 2006-06-09 12:29:56+02:00, tomas@poseidon.ndb.mysql.com +4 -2
    Bug #13266 Online adding of MySQLD causes cluster to crash
    - propagate node type on allocation

  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@1.33, 2006-06-09 12:29:56+02:00, tomas@poseidon.ndb.mysql.com +4 -1
    Bug #13266 Online adding of MySQLD causes cluster to crash
    - check node type, if configuration has not bee updated, type will be undefined, and conenction will be refused

  storage/ndb/src/mgmsrv/MgmtSrvr.cpp@1.95, 2006-06-09 12:29:56+02:00, tomas@poseidon.ndb.mysql.com +3 -2
    Bug #13266 Online adding of MySQLD causes cluster to crash
    - propagate node type on allocation

  storage/ndb/src/mgmsrv/MgmtSrvr.hpp@1.44, 2006-06-09 12:29:56+02:00, tomas@poseidon.ndb.mysql.com +1 -1
    Bug #13266 Online adding of MySQLD causes cluster to crash
    - propagate node type on allocation

  storage/ndb/src/ndbapi/ndberror.c@1.60, 2006-06-09 12:29:56+02:00, tomas@poseidon.ndb.mysql.com +1 -0
    Bug #13266 Online adding of MySQLD causes cluster to crash
    - propagate node type on allocation

ChangeSet@1.2169.24.1, 2006-06-09 11:39:27+02:00, jonas@mc01.ndb.mysql.com +1 -0
  ndb - fix 5.1 scan error handling problem
    Make sure that error gets set corretly also
      when error code directly after taking mutex

  storage/ndb/src/ndbapi/NdbScanOperation.cpp@1.82, 2006-06-09 11:39:20+02:00, jonas@mc01.ndb.mysql.com +11 -3
    Make sure that error gets set corretly also
      when error code directly after taking mutex

ChangeSet@1.2169.23.4, 2006-06-09 09:06:43+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    restore --with-ndb-ccflags functionality

  config/ac-macros/ha_ndbcluster.m4@1.19, 2006-06-09 09:06:40+02:00, jonas@perch.ndb.mysql.com +1 -1
    restore --with-ndb-ccflags functionality

ChangeSet@1.2176.3.10, 2006-06-09 08:40:21+02:00, knielsen@mysql.com +2 -0
  Loosen up crashed repo check a bit to allow merging 5.0 -> 5.1.

  BitKeeper/triggers/pre-outgoing.crash-protect.pl@1.2, 2006-06-09 08:39:58+02:00, knielsen@mysql.com +1 -33
    Loosen up crashed repo check a bit to allow merging 5.0 -> 5.1.

  BitKeeper/triggers/pre-resolve.crash-protect.pl@1.2, 2006-06-09 08:39:58+02:00, knielsen@mysql.com +1 -33
    Loosen up crashed repo check a bit to allow merging 5.0 -> 5.1.

ChangeSet@1.2169.23.3, 2006-06-09 08:22:50+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - testframework
    impl. ugly flag to skip dict cache invalidation as it break all testSystemRestart testcases

  storage/ndb/src/ndbapi/ClusterMgr.cpp@1.27, 2006-06-09 08:22:46+02:00, jonas@perch.ndb.mysql.com +9 -5
    impl. ugly flag to skip dict cache invalidation as it break all testSystemRestart testcases

  storage/ndb/test/src/NDBT_Test.cpp@1.31, 2006-06-09 08:22:46+02:00, jonas@perch.ndb.mysql.com +4 -0
    impl. ugly flag to skip dict cache invalidation as it break all testSystemRestart testcases

ChangeSet@1.2169.3.9, 2006-06-08 23:07:11+02:00, andrey@lmy004. +20 -0
  Reorganize, physically the events code
  Unify method naming -> create/update/drop_event
  Move class Event_timed to event_timed.h
  class Events is in events.h (renamed from event.h)
  The implementation is in events.cc (renamed from event.h)

  BitKeeper/deleted/.del-event_executor.cc~f4a4645b973838ab@1.45, 2006-06-08 18:04:10+02:00, andrey@lmy004. +0 -0
    Delete: sql/event_executor.cc

  sql/events_priv.h@1.24, 2006-06-08 23:06:42+02:00, andrey@lmy004. +1 -8
    my_time_compare moved to mysql_priv.h
    event_timed_compare_q is static in event_scheduler.cc

  sql/events_priv.h@1.23, 2006-06-08 19:13:55+02:00, andrey@lmy004. +0 -0
    Rename: sql/event_priv.h -> sql/events_priv.h

  BitKeeper/etc/ignore@1.241.1.1, 2006-06-08 23:06:43+02:00, andrey@lmy004. +1 -0
    Added libmysqld/events.cc to the ignore list

  include/my_time.h@1.14, 2006-06-08 23:06:34+02:00, andrey@lmy004. +1 -1
    add a boundary

  libmysqld/CMakeLists.txt@1.6, 2006-06-08 23:06:35+02:00, andrey@lmy004. +1 -1
    event.cc -> events.cc

  libmysqld/Makefile.am@1.91.1.1, 2006-06-08 23:06:35+02:00, andrey@lmy004. +1 -1
    event.cc -> event.cc

  sql/CMakeLists.txt@1.22, 2006-06-08 23:06:35+02:00, andrey@lmy004. +1 -1
    event.cc -> events.cc

  sql/Makefile.am@1.140.1.1, 2006-06-08 23:06:35+02:00, andrey@lmy004. +2 -2
    event.cc -> events.cc
    event_priv.h -> events_priv.h

  sql/event_timed.cc@1.56, 2006-06-08 23:06:36+02:00, andrey@lmy004. +8 -3
    moved extern interval_type_to_name to mysql_priv.h

  sql/event_scheduler.cc@1.5.1.1, 2006-06-08 23:06:35+02:00, andrey@lmy004. +42 -11
    event.h -> events.h
    add_event -> create_event
    replace_event -> update_event()
    event_timed_compare_q is only used in event_scheduler.cc , so moving it
    from event.cc and making it static

  sql/event_scheduler.h@1.5, 2006-06-08 23:06:36+02:00, andrey@lmy004. +6 -5
    add_event -> create_event
    replace_event -> update_event

  sql/events.cc@1.41.1.2, 2006-06-08 23:06:42+02:00, andrey@lmy004. +8 -91
    add_event -> create_event
    replace_event -> update_event
    event_timed_compare_q moved to event_scheduler.cc

  sql/events.cc@1.41.1.1, 2006-06-08 19:13:22+02:00, andrey@lmy004. +0 -0
    Rename: sql/event.cc -> sql/events.cc

  sql/events.h@1.31, 2006-06-08 23:06:42+02:00, andrey@lmy004. +0 -199
    class Event_timed moved to event_timed.h

  sql/events.h@1.30, 2006-06-08 19:13:10+02:00, andrey@lmy004. +0 -0
    Rename: sql/event.h -> sql/events.h

  sql/mysql_priv.h@1.405.3.2, 2006-06-08 23:06:37+02:00, andrey@lmy004. +4 -0
    moved my_time_compare to time.cc

  sql/mysqld.cc@1.544.10.2, 2006-06-08 23:06:37+02:00, andrey@lmy004. +1 -1
    event.h -> events.h

  sql/sql_db.cc@1.133.3.1, 2006-06-08 23:06:37+02:00, andrey@lmy004. +1 -1
    event.h -> events.h

  sql/sql_parse.cc@1.551.2.1, 2006-06-08 23:06:38+02:00, andrey@lmy004. +2 -1
    event.h -> events.h
    class Event_timed moved to event_timed.h

  sql/sql_show.cc@1.337.4.1, 2006-06-08 23:06:39+02:00, andrey@lmy004. +2 -1
    event.h -> events.h
    class Event_timed moved to event_timed.h

  sql/sql_yacc.yy@1.474.5.1, 2006-06-08 23:06:41+02:00, andrey@lmy004. +1 -1
    event.h -> events.h
    class Event_timed moved to event_timed.h

  sql/time.cc@1.60.1.1, 2006-06-08 23:06:42+02:00, andrey@lmy004. +56 -0
    moved interval_type_to_name from event.cc to here.

ChangeSet@1.1616.2631.2, 2006-06-08 19:55:22+02:00, joerg@mysql.com +1 -0
  mysql-test/mysql-test-run.pl  :  Output the usage error if one is given. (Found when fixing bug#20303)

  mysql-test/mysql-test-run.pl@1.8.11.2, 2006-06-08 19:55:18+02:00, joerg@mysql.com +7 -0
    Found when fixing bug#20303: The "usage()" function ignored the message it was given,
    so we got no real indication about the problem. Print it if one is given.

ChangeSet@1.1810.1777.1, 2006-06-08 13:25:28-04:00, cmiller@zippy.(none) +3 -0
  Bug#19904: UDF: not initialized *is_null per row
  
  The is_null value was initialized once and thereafter only set to indicate
  NULL, and never unset to indicate not-NULL.
  
  Now set is_null to false, in addition to only setting it to true when the value 
  in question is null.

  mysql-test/r/udf.result@1.3.1.2, 2006-06-08 13:25:22-04:00, cmiller@zippy.(none) +18 -0
    Add result.

  mysql-test/t/udf.test@1.5, 2006-06-08 13:25:23-04:00, cmiller@zippy.(none) +12 -0
    Add test.

  sql/sql_udf.h@1.14, 2006-06-08 13:25:23-04:00, cmiller@zippy.(none) +2 -0
    Initialize is_null to false before trying to use it, so that historical NULLs
    don't affect our operation.

ChangeSet@1.2176.3.9, 2006-06-08 17:37:43+02:00, knielsen@mysql.com +2 -0
  Add trigger to protect against changesets from crashed tree

  BitKeeper/triggers/pre-outgoing.crash-protect.pl@1.1, 2006-06-08 17:37:31+02:00, knielsen@mysql.com +117 -0

  BitKeeper/triggers/pre-outgoing.crash-protect.pl@1.0, 2006-06-08 17:37:31+02:00, knielsen@mysql.com +0 -0
    BitKeeper file /data0/bk/mysql-5.1/BitKeeper/triggers/pre-outgoing.crash-protect.pl

  BitKeeper/triggers/pre-resolve.crash-protect.pl@1.1, 2006-06-08 17:37:31+02:00, knielsen@mysql.com +117 -0

  BitKeeper/triggers/pre-resolve.crash-protect.pl@1.0, 2006-06-08 17:37:31+02:00, knielsen@mysql.com +0 -0
    BitKeeper file /data0/bk/mysql-5.1/BitKeeper/triggers/pre-resolve.crash-protect.pl

ChangeSet@1.1616.2603.6, 2006-06-08 17:26:56+02:00, tomas@poseidon.ndb.mysql.com +4 -0
  Bug #20336 CLUSTERLOG commands have no effect

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@1.15.1.6, 2006-06-08 17:26:51+02:00, tomas@poseidon.ndb.mysql.com +3 -2
    Bug #20336 CLUSTERLOG commands have no effect
    - with signal sender the clock issuing the command and the revceiver of the events are not the same

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.51.1.24, 2006-06-08 17:26:51+02:00, tomas@poseidon.ndb.mysql.com +28 -27
    Bug #20336 CLUSTERLOG commands have no effect
    - make sure to actually send the update to ndb nodes, and wait for the reply

  ndb/src/mgmsrv/MgmtSrvr.hpp@1.22.1.12, 2006-06-08 17:26:51+02:00, tomas@poseidon.ndb.mysql.com +0 -2
    Bug #20336 CLUSTERLOG commands have no effect

  ndb/src/mgmsrv/Services.cpp@1.31.1.10, 2006-06-08 17:26:51+02:00, tomas@poseidon.ndb.mysql.com +7 -5
    Bug #20336 CLUSTERLOG commands have no effect
    - make sure to compute max every time for log level

ChangeSet@1.1810.1775.1, 2006-06-08 16:16:07+02:00, pekka@clam.ndb.mysql.com +19 -0
  ndb - bug#18781 lock DICT during node restart

  ndb/include/kernel/GlobalSignalNumbers.h@1.7.3.1, 2006-06-08 16:13:08+02:00, pekka@clam.ndb.mysql.com +6 -4
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/include/kernel/signaldata/AlterTable.hpp@1.1.4.1, 2006-06-08 16:13:08+02:00, pekka@clam.ndb.mysql.com +1 -0
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/include/kernel/signaldata/CreateTable.hpp@1.3.1.1, 2006-06-08 16:13:08+02:00, pekka@clam.ndb.mysql.com +1 -0
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/include/kernel/signaldata/DictLock.hpp@1.2, 2006-06-08 16:13:08+02:00, pekka@clam.ndb.mysql.com +76 -0
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/include/kernel/signaldata/DictLock.hpp@1.1, 2006-06-08 15:21:00+02:00, pekka@clam.ndb.mysql.com +0 -0

  ndb/include/kernel/signaldata/DictLock.hpp@1.0, 2006-06-08 15:21:00+02:00, pekka@clam.ndb.mysql.com +0 -0
    BitKeeper file /space/pekka/ndb/version/my50-bug18781/ndb/include/kernel/signaldata/DictLock.hpp

  ndb/include/kernel/signaldata/DropTable.hpp@1.1.3.1, 2006-06-08 16:13:08+02:00, pekka@clam.ndb.mysql.com +1 -0
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/src/common/debugger/SignalLoggerManager.cpp@1.6.3.1, 2006-06-08 16:11:10+02:00, pekka@clam.ndb.mysql.com +1 -1
    block no fix

  ndb/src/common/debugger/signaldata/SignalNames.cpp@1.6.1.1, 2006-06-08 16:13:08+02:00, pekka@clam.ndb.mysql.com +6 -0
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/src/kernel/blocks/ERROR_codes.txt@1.9.9.1, 2006-06-08 16:13:08+02:00, pekka@clam.ndb.mysql.com +3 -1
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.40.23.1, 2006-06-08 16:13:08+02:00, pekka@clam.ndb.mysql.com +244 -1
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/src/kernel/blocks/dbdict/Dbdict.hpp@1.9.9.1, 2006-06-08 16:13:08+02:00, pekka@clam.ndb.mysql.com +96 -1
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.8.4.1, 2006-06-08 16:13:08+02:00, pekka@clam.ndb.mysql.com +28 -0
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/src/kernel/blocks/dbdih/DbdihInit.cpp@1.6.5.1, 2006-06-08 16:13:08+02:00, pekka@clam.ndb.mysql.com +6 -0
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.24.30.1, 2006-06-08 16:13:09+02:00, pekka@clam.ndb.mysql.com +128 -5
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@1.13.16.1, 2006-06-08 16:12:47+02:00, pekka@clam.ndb.mysql.com +2 -2
    spelling

  ndb/src/kernel/main.cpp@1.48.11.1, 2006-06-08 16:06:44+02:00, pekka@clam.ndb.mysql.com +4 -0
    signal log from start (#if 0-ed)

  ndb/src/kernel/vm/DLFifoList.hpp@1.3.1.1, 2006-06-08 16:07:46+02:00, pekka@clam.ndb.mysql.com +14 -0
    add hasPrev

  ndb/src/kernel/vm/pc.hpp@1.8.2.1, 2006-06-08 16:08:33+02:00, pekka@clam.ndb.mysql.com +2 -0
    ERROR_INSERTED_CLEAR(x) test and clear if set

  ndb/src/ndbapi/ndberror.c@1.30.14.1, 2006-06-08 16:13:09+02:00, pekka@clam.ndb.mysql.com +1 -0
    locking of master DICT against schema ops, used by slave DIH under NR

  ndb/test/ndbapi/testDict.cpp@1.20.5.1, 2006-06-08 16:07:16+02:00, pekka@clam.ndb.mysql.com +304 -0
    test NF/NR + dict ops

ChangeSet@1.1616.2627.2, 2006-06-08 16:12:38+02:00, mskold@mysql.com +10 -0
  Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

  ndb/src/ndbapi/NdbResultSet.cpp@1.7.2.1, 2006-06-08 16:12:08+02:00, mskold@mysql.com +11 -0
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

  ndb/include/ndbapi/NdbResultSet.hpp@1.5.1.1, 2006-06-08 16:12:08+02:00, mskold@mysql.com +21 -0
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

  mysql-test/r/ndb_lock.result@1.5.1.1, 2006-06-08 16:12:07+02:00, mskold@mysql.com +59 -0
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

  mysql-test/t/ndb_lock.test@1.7.1.1, 2006-06-08 16:12:08+02:00, mskold@mysql.com +76 -0
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

  sql/ha_ndbcluster.cc@1.114.3.67, 2006-06-08 16:12:08+02:00, mskold@mysql.com +70 -11
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

  sql/ha_ndbcluster.h@1.40.6.15, 2006-06-08 16:12:09+02:00, mskold@mysql.com +2 -0
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

  ndb/include/ndbapi/NdbIndexScanOperation.hpp@1.7.1.2, 2006-06-08 16:12:08+02:00, mskold@mysql.com +4 -3
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

  ndb/include/ndbapi/NdbScanOperation.hpp@1.17.1.4, 2006-06-08 16:12:08+02:00, mskold@mysql.com +4 -2
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

  ndb/src/ndbapi/NdbScanOperation.cpp@1.41.5.1, 2006-06-08 16:12:08+02:00, mskold@mysql.com +21 -9
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

  ndb/src/ndbapi/ndberror.c@1.20.2.9, 2006-06-08 16:12:08+02:00, mskold@mysql.com +1 -1
    Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

ChangeSet@1.2119.345.102, 2006-06-08 15:43:41+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - hugo
    Print (and optionally specify) random seed

  storage/ndb/test/src/NDBT_Test.cpp@1.30, 2006-06-08 15:43:38+02:00, jonas@perch.ndb.mysql.com +12 -0
    Print (and optionally specify) random seed

ChangeSet@1.1616.2631.1, 2006-06-08 14:52:33+02:00, joerg@mysql.com +1 -0
  mysql-test/mysql-test-run.pl  :    A fix for bug#20303 "mysql-test-run.pl: Does not recognize -- argument"

  mysql-test/mysql-test-run.pl@1.8.11.1, 2006-06-08 14:52:29+02:00, joerg@mysql.com +6 -0
    A fix for bug#20303 "mysql-test-run.pl: Does not recognize -- argument":
    Due to the use of 'pass_through' in option processing this lone '--' will remain
    as an argument, it must be ignored explicitly.

ChangeSet@1.2119.345.101, 2006-06-08 12:41:06+02:00, jonas@mc01.ndb.mysql.com +6 -0
  ndb - bug#20334
    fix bug in tup scan wrt LCP

  storage/ndb/include/kernel/signaldata/AccScan.hpp@1.8, 2006-06-08 12:40:29+02:00, jonas@mc01.ndb.mysql.com +18 -0
    Add LCP flag to AccScan and ScanFrag

  storage/ndb/include/kernel/signaldata/ScanFrag.hpp@1.13, 2006-06-08 12:40:29+02:00, jonas@mc01.ndb.mysql.com +19 -2
    Add LCP flag to AccScan and ScanFrag

  storage/ndb/src/kernel/blocks/backup/Backup.cpp@1.46, 2006-06-08 12:40:29+02:00, jonas@mc01.ndb.mysql.com +17 -13
    Backup sets LCP scan when lcp

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.48, 2006-06-08 12:40:29+02:00, jonas@mc01.ndb.mysql.com +1 -0
    Add LCP scan flag

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.110, 2006-06-08 12:40:30+02:00, jonas@mc01.ndb.mysql.com +3 -0
    Add LCP scan flag

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@1.15, 2006-06-08 12:40:30+02:00, jonas@mc01.ndb.mysql.com +13 -8
    Fix assignment of scan record wrt LCP and disk

ChangeSet@1.1810.1773.1, 2006-06-08 13:34:03+03:00, gkodinov@mysql.com +3 -0
  Bug #15355: Common natural join column not resolved in prepared statement nested 
    query
  Problem:
  There was a wrong context assigned to the columns that were added in insert_fields()
  when expanding a '*'. When this is done in a prepared statement it causes 
  fix_fields() to fail to find the table that these columns reference.
  Actually the right context is set in setup_natural_join_row_types() called at the 
  end of setup_tables(). However when executed in a context of a prepared statement
  setup_tables() resets the context, but setup_natural_join_row_types() was not
  setting it to the correct value assuming it has already done so.
  
  Solution:
  The top-most, left-most NATURAL/USING join must be set as a 
  first_name_resolution_table in context even when operating on prepared statements.

  mysql-test/r/join.result@1.38, 2006-06-08 13:33:57+03:00, gkodinov@mysql.com +20 -0
    testsuite for the bug

  mysql-test/t/join.test@1.32, 2006-06-08 13:33:57+03:00, gkodinov@mysql.com +25 -0
    testsuite for the bug

  sql/sql_base.cc@1.235.58.1, 2006-06-08 13:33:58+03:00, gkodinov@mysql.com +11 -11
    The context must be set even when executed as prepared statement.

ChangeSet@1.1810.1606.4, 2006-06-08 02:31:58+10:00, stewart@mysql.com +1 -0
  BUG#19318 valgrind: memory leak in ndb_mgmd
  
  fix based on review

  ndb/src/mgmsrv/ConfigInfo.cpp@1.60.9.3, 2006-06-08 02:31:53+10:00, stewart@mysql.com +1 -1
    move delete to more appropriate places inside loop.

ChangeSet@1.1810.1707.5, 2006-06-07 19:44:43+05:00, svoj@may.pils.ru +2 -0
  BUG#12982 - LOAD DATA fails without any error for big files with big
              read buffer
  Setting read buffer to values greater than SSIZE_MAX results in
  unexpected behavior.
  
  According to read(2) manual:
  If count is greater than SSIZE_MAX, the result is unspecified.
  
  Set upper limit for read_buffer_size and read_rnd_buffer_size to
  SSIZE_MAX.

  include/my_global.h@1.96.6.1, 2006-06-07 19:44:37+05:00, svoj@may.pils.ru +3 -0
    Define SSIZE_MAX if not defined.

  sql/mysqld.cc@1.439.60.1, 2006-06-07 19:44:38+05:00, svoj@may.pils.ru +4 -3
    Set upper limit for read_buffer_size and read_rnd_buffer_size to
    SSIZE_MAX.

ChangeSet@1.2119.345.100, 2006-06-07 16:02:37+02:00, jonas@mc01.ndb.mysql.com +1 -0
  ndb -
    fix release compile error

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.109, 2006-06-07 15:59:42+02:00, jonas@mc01.ndb.mysql.com +1 -1
    fix release compile

ChangeSet@1.1810.1772.1, 2006-06-07 14:46:10+02:00, msvensson@neptunus.(none) +1 -0
  Import from yaSSL to fix bild problems on AIX(already fixed but was lost during last import)

  extra/yassl/taocrypt/include/runtime.hpp@1.15, 2006-06-07 14:39:30+02:00, msvensson@neptunus.(none) +3 -0
    Import patch yassl.diff

ChangeSet@1.1810.1771.1, 2006-06-07 16:17:56+04:00, evgen@moonbone.local +3 -0
  Fixed bug#19789: REPLACE was allowed for a VIEW with CHECK OPTION enabled.
  
  The st_lex::which_check_option_applicable() function controls for which 
  statements WITH CHECK OPTION clause should be taken into account. REPLACE and
  REPLACE_SELECT wasn't in the list which results in allowing REPLACE to insert
  wrong rows in a such view.
  
  The st_lex::which_check_option_applicable() now includes REPLACE and 
  REPLACE_SELECT in the list of statements for which WITH CHECK OPTION clause is
  applicable.

  mysql-test/r/replace.result@1.9.1.1, 2006-06-07 16:16:55+04:00, evgen@moonbone.local +6 -0
    Added test case for bug#19789: REPLACE was allowed for a VIEW with CHECK OPTION enabled.

  mysql-test/t/replace.test@1.13, 2006-06-07 16:16:29+04:00, evgen@moonbone.local +10 -0
    Added test case for bug#19789: REPLACE was allowed for a VIEW with CHECK OPTION enabled.

  sql/sql_lex.h@1.175.16.1, 2006-06-07 16:17:16+04:00, evgen@moonbone.local +2 -0
    Fixed bug#19789: REPLACE was allowed for a VIEW with CHECK OPTION enabled.
    The st_lex::which_check_option_applicable() now includes REPLACE and 
    REPLACE_SELECT in the list of statements for which WITH CHECK OPTION clause is
    applicable.

ChangeSet@1.1810.1770.1, 2006-06-07 14:07:11+02:00, msvensson@neptunus.(none) +1 -0
  Bug#20159 Inconsistant generation of generic error messages
   - Use hardcoded error message instead of ER_GET_ERRNO 

  sql/sql_udf.cc@1.45.1.12, 2006-06-07 14:07:06+02:00, msvensson@neptunus.(none) +1 -1
    Use hardcoded error message "Got unknown error: %d" instead of system error message "Got error %d from storage engine" as the "storage engine" has nothing to do with this.

ChangeSet@1.1616.2630.1, 2006-06-07 14:01:10+05:00, ramil@mysql.com +5 -0
  Fix for bug #6880: LAST_INSERT_ID() within a statement

  mysql-test/t/rpl_log.test@1.20.1.5, 2006-06-07 14:01:05+05:00, ramil@mysql.com +14 -0
    Fix for bug #6880: LAST_INSERT_ID() within a statement
      - test case

  mysql-test/r/auto_increment.result@1.29.1.4, 2006-06-07 14:01:05+05:00, ramil@mysql.com +22 -0
    Fix for bug #6880: LAST_INSERT_ID() within a statement
      - test result

  mysql-test/r/rpl_log.result@1.50.1.5, 2006-06-07 14:01:05+05:00, ramil@mysql.com +17 -0
    Fix for bug #6880: LAST_INSERT_ID() within a statement
      - test result

  mysql-test/t/auto_increment.test@1.22.1.3, 2006-06-07 14:01:05+05:00, ramil@mysql.com +17 -0
    Fix for bug #6880: LAST_INSERT_ID() within a statement
      - test case

  sql/item_func.cc@1.124.42.10, 2006-06-07 14:01:05+05:00, ramil@mysql.com +4 -3
    Fix for bug #6880: LAST_INSERT_ID() within a statement
      - return the first thd->last_insert_id set (within a query)

ChangeSet@1.1810.1522.7, 2006-06-07 16:20:57+10:00, stewart@mysql.com +3 -0
  BUG#18966 CHange in stop/shutdown behaviour
  
  Fixes based on review by Tomas

  ndb/src/mgmapi/mgmapi.cpp@1.44.21.2, 2006-06-07 16:20:46+10:00, stewart@mysql.com +21 -9
    Return immediately if ndb_mgm_get_version fails.
    correctly use new protocol for versions > 5.1

  ndb/src/mgmsrv/Services.cpp@1.45.16.3, 2006-06-07 16:20:46+10:00, stewart@mysql.com +14 -22
    Only have 1 version of 'stop all' with reply being dependent on if the optional
    stop parameter is supplied.

  ndb/src/mgmsrv/Services.hpp@1.13.4.3, 2006-06-07 16:20:46+10:00, stewart@mysql.com +1 -3
    Only 1 version of stopAll

ChangeSet@1.1810.1769.1, 2006-06-07 01:10:23+04:00, evgen@moonbone.local +3 -0
  Fixed bug#15962: CONCAT() in UNION may lead to a data trucation.
  
  To calculate its max_length the CONCAT() function is simply sums max_lengths
  of its arguments but when the collation of an argument differs from the 
  collation of the CONCAT() max_length will be wrong. This may lead to a data
  truncation when a tmp table is used, in UNIONS for example.
  
  The Item_func_concat::fix_length_and_dec() function now recalculates the 
  max_length of an argument when the mbmaxlen of the argument differs from the
  mbmaxlen of the CONCAT().

  mysql-test/r/func_concat.result@1.9, 2006-06-07 01:06:30+04:00, evgen@moonbone.local +7 -0
    Added test case for bug#15962:CONCAT() in UNION may lead to a data trucation.

  mysql-test/t/func_concat.test@1.11, 2006-06-07 01:05:49+04:00, evgen@moonbone.local +8 -0
    Added test case for bug#15962:CONCAT() in UNION may lead to a data trucation.

  sql/item_strfunc.cc@1.261.1.6, 2006-06-07 01:07:31+04:00, evgen@moonbone.local +8 -1
    Fixed bug#15962: CONCAT() in UNION may lead to a data trucation.
    The Item_func_concat::fix_length_and_dec() function now recalculates the 
    max_length of an argument when the mbmaxlen of the argument differs from the
    mbmaxlen of the CONCAT().

ChangeSet@1.1810.1677.5, 2006-06-06 23:37:42+04:00, aivanov@mysql.com +3 -0
  Applied innodb-5.0-ss609 snapshot.
   Fixed BUG#19727 "InnoDB crashed server and crashed tables
   are not recoverable".

  mysql-test/t/innodb.test@1.118.2.6, 2006-06-06 23:37:38+04:00, aivanov@mysql.com +13 -0
    Applied innodb-5.0-ss609 snapshot.
     Add the big fat warning notice also to the bottom of
     innodb.test so that it will require more talent to
     ignore the change of policy.

  innobase/row/row0mysql.c@1.103.14.2, 2006-06-06 23:37:38+04:00, aivanov@mysql.com +10 -10
    Applied innodb-5.0-ss609 snapshot.
     Move trx_commit_for_mysql(trx) calls before calls to
     row_mysql_unlock_data_dictionary(trx).

  innobase/row/row0sel.c@1.92.7.1, 2006-06-06 23:37:38+04:00, aivanov@mysql.com +2 -1
    Applied innodb-5.0-ss609 snapshot.
     row_sel_try_search_shortcut(): Do not return SEL_FOUND when
     the record was not found. This bug was introduced in
     InnoDB 5.0.3, but luckily it should nerver manifest itself,
     given that existing InnoDB SQL code never makes use of
     consistent reads.

ChangeSet@1.1616.2602.2, 2006-06-06 23:05:10+04:00, aivanov@mysql.com +1 -0
  Applied innodb-4.1-ss31 snapshot.
   Fixed BUG#19727 "InnoDB crashed server and crashed tables
   are not recoverable".

  innobase/row/row0mysql.c@1.79.1.16, 2006-06-06 23:05:07+04:00, aivanov@mysql.com +10 -10
    Applied innodb-4.1-ss31 snapshot.
     Move trx_commit_for_mysql(trx) calls before calls to
     row_mysql_unlock_data_dictionary(trx).

ChangeSet@1.2176.3.8, 2006-06-06 20:21:36+03:00, monty@mysql.com +18 -0
  Added --pipe option for faster compile
  Changed error to be more descriptive when you are refering to a not existing key
  Fixed core dump in view test and changed to better error message

  BUILD/compile-pentium64@1.1, 2006-06-06 20:21:32+03:00, monty@mysql.com +13 -0
    New BitKeeper file ``BUILD/compile-pentium64''

  BUILD/compile-pentium64@1.0, 2006-06-06 20:21:32+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.1/BUILD/compile-pentium64

  BUILD/compile-pentium64-debug@1.4, 2006-06-06 20:21:31+03:00, monty@mysql.com +1 -1
    Added --pipe option for faster compile
    (This changset was missing in the tree I used to rebuild a new 5.1 tree)

  BUILD/compile-pentium64-debug-max@1.4, 2006-06-06 20:21:31+03:00, monty@mysql.com +1 -1
    Added --pipe option for faster compile
    (This changset was missing in the tree I used to rebuild a new 5.1 tree)

  mysql-test/include/common-tests.inc@1.1.1.1, 2006-06-06 20:21:31+03:00, monty@mysql.com +2 -2
    Changed error to be more descriptive

  mysql-test/r/compress.result@1.3.1.1, 2006-06-06 20:21:31+03:00, monty@mysql.com +2 -2
    Changed error to be more descriptive

  mysql-test/r/explain.result@1.16.1.1, 2006-06-06 20:21:31+03:00, monty@mysql.com +2 -2
    Changed error to be more descriptive

  mysql-test/r/key_cache.result@1.17.1.1, 2006-06-06 20:21:31+03:00, monty@mysql.com +2 -2
    Changed error to be more descriptive

  mysql-test/r/preload.result@1.9.1.1, 2006-06-06 20:21:31+03:00, monty@mysql.com +2 -2
    Changed error to be more descriptive

  mysql-test/r/select.result@1.126, 2006-06-06 20:21:31+03:00, monty@mysql.com +2 -2
    Changed error to be more descriptive

  mysql-test/r/ssl.result@1.2.1.1, 2006-06-06 20:21:31+03:00, monty@mysql.com +2 -2
    Changed error to be more descriptive

  mysql-test/r/ssl_compress.result@1.2.1.1, 2006-06-06 20:21:31+03:00, monty@mysql.com +2 -2
    Changed error to be more descriptive

  mysql-test/r/view.result@1.163, 2006-06-06 20:21:31+03:00, monty@mysql.com +1 -1
    Changed error to be more descriptive

  mysql-test/t/disabled.def@1.164, 2006-06-06 20:21:31+03:00, monty@mysql.com +5 -3
    Disable im_instance_conf and im_options  until Bug#20294 (Instance manager test im_instance_conf fails randomly) is fixed

  mysql-test/t/explain.test@1.9.1.1, 2006-06-06 20:21:31+03:00, monty@mysql.com +2 -2
    Changed error to be more descriptive

  mysql-test/t/select.test@1.101.2.1, 2006-06-06 20:21:31+03:00, monty@mysql.com +2 -2
    Changed error to be more descriptive

  mysql-test/t/view.test@1.149, 2006-06-06 20:21:31+03:00, monty@mysql.com +1 -1
    Changed error to be more descriptive

  sql/share/errmsg.txt@1.106, 2006-06-06 20:21:32+03:00, monty@mysql.com +1 -1
    Fix that ER_KEY_DOES_NOT_EXISTS has same SQLSTATE as ER_KEY_COLUMN_DOES_NOT_EXISTS

  sql/sql_base.cc@1.325.1.5, 2006-06-06 20:21:32+03:00, monty@mysql.com +2 -2
    Fixed core dump in view test
    Changed to correct error message that also shows the name of the faulty table

ChangeSet@1.2119.473.4, 2006-06-06 13:19:46-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  BUG#16002: After review fixes
  Fixes for NDB

  sql/ha_ndbcluster.cc@1.288.15.1, 2006-06-06 13:19:41-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +6 -0
    Fixes for NDB

  sql/sql_partition.cc@1.55.8.4, 2006-06-06 13:19:41-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -3
    Fixes for NDB

ChangeSet@1.2154.47.1, 2006-06-06 22:13:30+05:00, bar@mysql.com +3 -0
  Bug#18396 Identifiers: Byte with value 255 not allowed
  Old FRM files didn't allow byte 255 as a column name part.
  Since now we store column names in UTF8, this restriction
  is not required anymore: 255 is not a valid byte in UTF8.
  Fix: removing checking against 255.

  mysql-test/r/ctype_latin1.result@1.9, 2006-06-06 22:13:21+05:00, bar@mysql.com +14 -0
    Adding test case

  mysql-test/t/ctype_latin1.test@1.10, 2006-06-06 22:13:21+05:00, bar@mysql.com +11 -0
    Adding test case

  sql/sql_lex.cc@1.180.1.1, 2006-06-06 22:13:21+05:00, bar@mysql.com +0 -2
    Removing old code, unnecessary anymore.

ChangeSet@1.1616.2144.139, 2006-06-06 09:59:45-07:00, igor@rurik.mysql.com +3 -0
  Fixed some problems for Windows build

  VC++Files/client/mysql.dsp@1.13.1.2, 2006-06-06 09:59:41-07:00, igor@rurik.mysql.com +4 -0
    Fixed omission of mysys\my_conio.c.

  VC++Files/client/mysql_ia64.dsp@1.3, 2006-06-06 09:59:41-07:00, igor@rurik.mysql.com +4 -0
    Fixed omission of mysys\my_conio.c.

  client/mysqldump.c@1.143.13.4, 2006-06-06 09:59:41-07:00, igor@rurik.mysql.com +2 -1
    VS compiler does not accept variable declarations within blocks.
    Such a behaviour complies with the Standard C.

ChangeSet@1.2119.473.3, 2006-06-06 11:54:21-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -0
  BUG#16002: More review fixes

  mysql-test/r/partition_range.result@1.7.1.2, 2006-06-06 11:54:16-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +16 -1
    Changed test cases

  mysql-test/t/partition_range.test@1.5.1.2, 2006-06-06 11:54:16-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +9 -1
    Changed test cases

  sql/partition_info.cc@1.8.6.3, 2006-06-06 11:54:16-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +31 -45
    Changes to resue signed integer code for unsigned integer partition functions
    Basic idea is to store value - 0x8000000000000000 in list_array and range_int_array
    and also perform this subtraction before applying get_partition_id_range and so
    forth.

  sql/sql_partition.cc@1.55.8.3, 2006-06-06 11:54:16-04:00, mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se +77 -192
    Changes to resue signed integer code for unsigned integer partition functions
    Basic idea is to store value - 0x8000000000000000 in list_array and range_int_array
    and also perform this subtraction before applying get_partition_id_range and so
    forth.

ChangeSet@1.2176.3.7, 2006-06-06 14:48:15+03:00, msvensson@mysql.com +3 -0
  Re-apply missing changesets in 5.1
  
  BUG#19544 mysqldump does not backup TS and LG information correctly.
    
  Problem was the type of the column was varchar(8) not an integer type. So mysqld
  was outputting a string representation of the number in scientific notation,
  which wasn't exact. Now we do it as a bigint and output the number in bytes.
  
  Fix assertion when loading plugins due to handler changes
  

  sql/sql_base.cc@1.325.1.4, 2006-06-06 14:48:09+03:00, msvensson@mysql.com +1 -1
    manual merge (comment by igor)

  sql/sql_plugin.cc@1.24, 2006-06-06 14:48:09+03:00, msvensson@mysql.com +1 -0
    Fix assertion when loading plugins due to handler changes (By jimw)

  sql/sql_show.cc@1.347, 2006-06-06 14:48:09+03:00, msvensson@mysql.com +3 -3
    Correct type of I_S.FILES table columns: INITIAL_SIZE, MAXIMUM_SIZE and AUTOEXTEND_SIZE
    so that they really are bigint and not varchar. (By stewart)
    

ChangeSet@1.2176.3.6, 2006-06-06 14:34:42+03:00, msvensson@mysql.com +9 -0
  Re-apply missing changeset, orignally pushed by jmiller
  RPL Test cleanup of options that are not needed when using ndbcluster with binlog. The binlog is forced to row just by connecting to a cluster

  mysql-test/r/rpl_ndb_2myisam.result@1.3, 2006-06-06 14:34:39+03:00, msvensson@mysql.com +2 -2
    Update results. Test now passing. Have commented it out in disable.def file

  mysql-test/t/disabled.def@1.163, 2006-06-06 14:34:39+03:00, msvensson@mysql.com +1 -1
    updated to comment out test that is working

  mysql-test/t/rpl_ndb_2innodb-master.opt@1.2, 2006-06-06 14:34:39+03:00, msvensson@mysql.com +1 -1
    Removed the --binlog-format=row and they are not needed

  mysql-test/t/rpl_ndb_2innodb-slave.opt@1.2, 2006-06-06 14:34:39+03:00, msvensson@mysql.com +1 -1
    Removed the --binlog-format=row and they are not needed

  mysql-test/t/rpl_ndb_2myisam-master.opt@1.2, 2006-06-06 14:34:39+03:00, msvensson@mysql.com +1 -1
    Removed the --binlog-format=row and they are not needed

  mysql-test/t/rpl_ndb_2myisam-slave.opt@1.2, 2006-06-06 14:34:39+03:00, msvensson@mysql.com +1 -1
    Removed the --binlog-format=row and they are not needed

  mysql-test/t/rpl_ndb_innodb2ndb-master.opt@1.2, 2006-06-06 14:34:39+03:00, msvensson@mysql.com +1 -1
    Removed the --binlog-format=row and they are not needed

  mysql-test/t/rpl_ndb_innodb2ndb-slave.opt@1.3, 2006-06-06 14:34:39+03:00, msvensson@mysql.com +1 -1
    Removed the --binlog-format=row and they are not needed

  mysql-test/t/rpl_ndb_myisam2ndb-slave.opt@1.3, 2006-06-06 14:34:39+03:00, msvensson@mysql.com +1 -1
    Removed the --binlog-format=row and they are not needed

ChangeSet@1.2176.3.5, 2006-06-06 14:21:07+03:00, monty@mysql.com +31 -0
  Re-apply missing changeset, orignally pushed by elliot
  
  Add define YASSL_PREFIX when compiling yassl
  
  Import patch from yaSSL
  - avoid allocating memory for each call to 'EVP_md5' and 
    'EVP_des_ede3_cbc' which were not released until server was stopped
  - Those functions are used from the SQL function 'des_encrypt' and
    'des_decrypt'.
  
  Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of prefix_*.h files
  
  Bug#20022 mysql-test-run can't be run with secure connections turned on for all testcases
  - Part 1, fixes rpl- and federated-tests where connection is made to 127.0.0.1
  
  - Include prefix files that renames all public functions in yaSSLs
    OpenSSL API to ya<function_name>. They will otherwise conflict
    with OpenSSL functions if loaded by an application that uses OpenSSL
    as well as libmysqlclient with yaSSL support.
  
  Bug#18235: assertion/crash when windows mysqld is ended with ctrl-c
    
  Two threads both try a shutdown sequence which creates a race to the
  de-init/free of certain resources.
    
  This exists in similar form in the client as 17926: "mysql.exe crashes
  when ctrl-c is pressed in windows."
  
  Update after merge to 5.0
  
  BUG#18669: Session COM_STATISTICS breaks mysqladmin status.
  Changed COM_STATISTICS to display the global status, instead of thead status, for slow queries and table opens.
  
  - In function 'handle_grant_struct' when searching the memory structures for an 
    entry to modify, convert all entries here host.hostname is NULL to "" and compare that 
    with the host passed in argument "user_from".
  - A user created with hostname "" is stored in "mysql.user" table as host="" but when loaded into 
    memory it'll be stored as host.hostname NULL. Specifiying "" as hostname means
    that "any host" can connect. Thus is's correct to turn on allow_all_hosts
    when such a user is found. 
  - Review and fix other places where host.hostname may be NULL.
  
  BUG#19394 OPT_INNODB_THREAD_CONCURRENCY duplicated
  Removed duplication (not a user-visible change)

  extra/yassl/include/openssl/generate_prefix_files.pl@1.1, 2006-06-06 14:21:02+03:00, monty@mysql.com +45 -0
    New BitKeeper file ``extra/yassl/include/openssl/generate_prefix_files.pl''

  extra/yassl/include/openssl/generate_prefix_files.pl@1.0, 2006-06-06 14:21:02+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.1-ok/extra/yassl/include/openssl/generate_prefix_files.pl

  extra/yassl/include/openssl/prefix_crypto.h@1.1, 2006-06-06 14:21:03+03:00, monty@mysql.com +1 -0
    New BitKeeper file ``extra/yassl/include/openssl/prefix_crypto.h''

  extra/yassl/include/openssl/prefix_crypto.h@1.0, 2006-06-06 14:21:03+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.1-ok/extra/yassl/include/openssl/prefix_crypto.h

  extra/yassl/include/openssl/prefix_ssl.h@1.1, 2006-06-06 14:21:03+03:00, monty@mysql.com +152 -0
    New BitKeeper file ``extra/yassl/include/openssl/prefix_ssl.h''

  extra/yassl/include/openssl/prefix_ssl.h@1.0, 2006-06-06 14:21:03+03:00, monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.1-ok/extra/yassl/include/openssl/prefix_ssl.h

  client/Makefile.am@1.72, 2006-06-06 14:21:01+03:00, monty@mysql.com +1 -1
    Remove $yassl_includes

  client/mysqltest.c@1.210.1.1, 2006-06-06 14:21:01+03:00, monty@mysql.com +3 -0
    Turn on ssl_verify_server_cert only if host is "localhost"

  extra/yassl/include/openssl/crypto.h@1.1.1.1, 2006-06-06 14:21:01+03:00, monty@mysql.com +4 -0
    Add prefix file for ssl.h

  extra/yassl/include/openssl/ssl.h@1.11.1.1, 2006-06-06 14:21:01+03:00, monty@mysql.com +6 -4
    Add include file "prefix_crypto.h" to rename SSL_* functions to yaSSL_*

  extra/yassl/include/yassl_int.hpp@1.10.1.1, 2006-06-06 14:21:01+03:00, monty@mysql.com +0 -19
    Import patch yassl.diff

  extra/yassl/src/Makefile.am@1.9.1.1, 2006-06-06 14:21:01+03:00, monty@mysql.com +1 -1
    Add defined YASSL_PREFIX when building yassl/testsuite

  extra/yassl/src/ssl.cpp@1.15.1.1, 2006-06-06 14:21:01+03:00, monty@mysql.com +21 -12
    Import patch yassl.diff

  extra/yassl/src/template_instnt.cpp@1.9.1.1, 2006-06-06 14:21:01+03:00, monty@mysql.com +0 -1
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp@1.18.1.1, 2006-06-06 14:21:01+03:00, monty@mysql.com +0 -34
    Import patch yassl.diff

  extra/yassl/testsuite/Makefile.am@1.2.1.1, 2006-06-06 14:21:02+03:00, monty@mysql.com +1 -1
    Add defined YASSL_PREFIX when building yassl/testsuite

  extra/yassl/yassl.vcproj@1.1.1.1, 2006-06-06 14:21:02+03:00, monty@mysql.com +2 -2
    Add define YASSL_PREFIX when compiling yassl

  include/violite.h@1.50, 2006-06-06 14:21:02+03:00, monty@mysql.com +1 -0
    Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of prefix_*.h files

  libmysql/Makefile.am@1.52, 2006-06-06 14:21:02+03:00, monty@mysql.com +1 -1
    Remove yassl_includes

  libmysql_r/Makefile.am@1.28, 2006-06-06 14:21:02+03:00, monty@mysql.com +1 -1
    Remove yassl_includes

  libmysqld/Makefile.am@1.92, 2006-06-06 14:21:02+03:00, monty@mysql.com +1 -1
    Remove yassl_includes

  libmysqld/examples/Makefile.am@1.34, 2006-06-06 14:21:02+03:00, monty@mysql.com +1 -1
    Remove yassl_includes

  mysql-test/r/analyze.result@1.6.1.1, 2006-06-06 14:21:02+03:00, monty@mysql.com +1 -0
    Add missing drop table

  mysql-test/r/grant.result@1.53, 2006-06-06 14:21:02+03:00, monty@mysql.com +212 -1
    Reorder test result
    Add test cases for users with hostname ""

  mysql-test/r/ps.result@1.66.1.1, 2006-06-06 14:21:02+03:00, monty@mysql.com +1 -0
    Add missing drop table

  mysql-test/t/analyze.test@1.9.1.1, 2006-06-06 14:21:02+03:00, monty@mysql.com +1 -0
    Add missing drop table

  mysql-test/t/grant.test@1.40.1.1, 2006-06-06 14:21:02+03:00, monty@mysql.com +143 -1
    Add "use test"
    Add test cases for users with hostname ""
    - Test create, grant and drop as well as connecting as the user with hostname "".

  mysql-test/t/ps.test@1.64.1.1, 2006-06-06 14:21:02+03:00, monty@mysql.com +1 -1
    Add missing drop table

  server-tools/instance-manager/Makefile.am@1.37, 2006-06-06 14:21:02+03:00, monty@mysql.com +1 -1
    Remove yassl_includes

  sql/Makefile.am@1.142, 2006-06-06 14:21:02+03:00, monty@mysql.com +1 -1
    Remove yassl_includes

  sql/mysqld.cc@1.552, 2006-06-06 14:21:02+03:00, monty@mysql.com +7 -2
    We have three potential ways of hitting the iceberg:
    - unireg_end()   has basic de-init
    - unireg_abort() has extended de-init
    - main() has a de-init sequence similar to unireg_abort()
    
    In the Windows version of the server, Control-C is handled
    in a different thread from the one main() is in.  The main
    loop is told to end, then unireg_abort() is called.  Its
    de-init and that of main() will then race each other for
    mutex- and cond-var-destroys, free(), and finally exit().
    
    This patch introduces a special case for Windows that will eliminate
    the race by ending the signal-handler via unireg_end() instead if
    SIGINT is signalled.  This seems the least intrusive fix that still
    fixes user-visible behaviour.
    
    Two of the startup options for mysqld, innodb_commit_concurrency
    and innodb_thread_concurrency, were using the same enumeration
    value. Changed to give innodb_commit_concurrency it's own value.

  sql/sql_acl.cc@1.192.1.4, 2006-06-06 14:21:02+03:00, monty@mysql.com +63 -55
    Add check if host is NULL
    Add check if grant_name->host.hostname is null
    Convert places where host.hostname is NULL to "" before using it.

  sql/sql_parse.cc@1.556, 2006-06-06 14:21:02+03:00, monty@mysql.com +6 -3
    Calculate and display the global statistics.

  vio/Makefile.am@1.20, 2006-06-06 14:21:02+03:00, monty@mysql.com +1 -1
    Remove yassl_includes

ChangeSet@1.2176.3.4, 2006-06-06 13:40:15+03:00, monty@mysql.com +3 -0
  Manually reapplied msvenssons changes to new BK tree:
  Add definition of YASSL_PREFIX to Cmake file
  Change "and" to "&&"
  Remove the "static" directive SunCC can't use the function

  extra/yassl/CMakeLists.txt@1.5, 2006-06-06 13:33:59+03:00, monty@mysql.com +1 -1
    Add definition of YASSL_PREFIX to Cmake file

  sql/filesort.cc@1.107, 2006-06-06 13:34:19+03:00, monty@mysql.com +1 -1
    Change "and" to "&&"

  sql/handler.cc@1.239, 2006-06-06 13:34:35+03:00, monty@mysql.com +1 -1
     Remove the "static" directive SunCC can't use the function

ChangeSet@1.1810.1763.6, 2006-06-06 12:57:50+05:00, gluh@eagle.intranet.mysql.r18.ru +2 -0
  Bug#18035 Information Schema: Output is not Sorted
  added 'order by' to avoid result order difference

  mysql-test/r/information_schema.result@1.87.1.20, 2006-06-06 12:57:44+05:00, gluh@mysql.com +20 -16
    Bug#18035 Information Schema: Output is not Sorted
    added 'order by' to avoid result order difference

  mysql-test/t/information_schema.test@1.65.1.17, 2006-06-06 12:57:44+05:00, gluh@mysql.com +20 -16
    Bug#18035 Information Schema: Output is not Sorted
    added 'order by' to avoid result order difference

ChangeSet@1.1810.1763.5, 2006-06-06 12:51:04+05:00, gluh@eagle.intranet.mysql.r18.ru +3 -0
  Bug#19599 duplication of information_schema column value in a CONCAT expr with user var
  mark result string using String::mark_as_const()
  which prevents CONCAT from reusing it as a buffer
  for concatenation result.

  mysql-test/r/information_schema.result@1.87.1.19, 2006-06-06 12:50:58+05:00, gluh@mysql.com +9 -0
    Bug#19599 duplication of information_schema column value in a CONCAT expr with user var
    test case

  mysql-test/t/information_schema.test@1.65.1.16, 2006-06-06 12:50:58+05:00, gluh@mysql.com +10 -0
    Bug#19599 duplication of information_schema column value in a CONCAT expr with user var
    test case

  sql/item_strfunc.h@1.101.1.6, 2006-06-06 12:50:58+05:00, gluh@mysql.com +1 -0
    Bug#19599 duplication of information_schema column value in a CONCAT expr with user var
    mark result string using String::mark_as_const()
    which prevents CONCAT from reusing it as a buffer
    for concatenation result.

ChangeSet@1.1810.1763.4, 2006-06-06 11:25:31+05:00, gluh@eagle.intranet.mysql.r18.ru +3 -0
  Bug#17661 information_schema.SCHEMATA returns uppercase with lower_case_table_names = 1
  fix: return db name for I_S.TABLES(and others) in original letter case.
  if mysql starts with lower_case_table_names=1 | 2 then original db name is converted
  to lower case(for I_S tables). It happens when we perform add_table_to_list. 
  to avoid this we make a copy of original db name and use the copy hereafter.

  mysql-test/r/lowercase_table2.result@1.17.1.1, 2006-06-06 11:25:25+05:00, gluh@mysql.com +9 -0
    Bug#17661 information_schema.SCHEMATA returns uppercase with lower_case_table_names = 1
    test case

  mysql-test/t/lowercase_table2.test@1.14, 2006-06-06 11:25:25+05:00, gluh@mysql.com +11 -0
    Bug#17661 information_schema.SCHEMATA returns uppercase with lower_case_table_names = 1
    test case

  sql/sql_show.cc@1.253.1.66, 2006-06-06 11:25:25+05:00, gluh@mysql.com +5 -3
    Bug#17661 information_schema.SCHEMATA returns uppercase with lower_case_table_names = 1
    fix: return db name for I_S.TABLES(and others) in original letter case.
    if mysql starts with lower_case_table_names=1 | 2 then original db name is converted
    to lower case(for I_S tables). It happens when we perform add_table_to_list. 
    to avoid this we make a copy of original db name and use the copy hereafter.

ChangeSet@1.2176.3.3, 2006-06-06 02:47:30+03:00, monty@mysql.com +9 -0
  Fixed some issues found by valgrind
  (one testcase, one memory leak and some accesses to not initialized memory)

  sql/ha_berkeley.cc@1.181, 2006-06-06 02:47:26+03:00, monty@mysql.com +5 -0
    Fix problem with not freed memory

  mysql-test/r/events_scheduling.result@1.4, 2006-06-06 02:47:25+03:00, monty@mysql.com +1 -1
    Changed event timer to two seconds to not get problems with slow system or when running with valgrind

  mysql-test/t/events_scheduling.test@1.5, 2006-06-06 02:47:25+03:00, monty@mysql.com +3 -1
    Changed event timer to two seconds to not get problems with slow system or when running with valgrind

  mysql-test/valgrind.supp@1.10, 2006-06-06 02:47:26+03:00, monty@mysql.com +13 -0
    Avoid purify warnings from DBUG library (safe to do)
    

  sql/sql_class.cc@1.265, 2006-06-06 02:47:26+03:00, monty@mysql.com +1 -1
    Ensure that row_count is initalized (as we otherwise may access it uninitialized)

  sql/sql_show.cc@1.346, 2006-06-06 02:47:26+03:00, monty@mysql.com +1 -1
    c_ptr -> ptr to avoid accessing not initialized memory

  sql/sql_yacc.yy@1.480, 2006-06-06 02:47:26+03:00, monty@mysql.com +3 -3
    Fix to not access not initialized memory

  sql/table.cc@1.219, 2006-06-06 02:47:26+03:00, monty@mysql.com +8 -6
    Fix to not access not initialized memory

  sql/time.cc@1.61, 2006-06-06 02:47:26+03:00, monty@mysql.com +1 -0
    Fix to not access not initialized memory

ChangeSet@1.2119.473.2, 2006-06-05 14:55:22-04:00, mikael@c-7308e253.1238-1-64736c10.cust.bredbandsbolaget.se +10 -0
  BUG#16002: Handle unsigned integer partition functions

  mysql-test/r/partition.result@1.36.1.2, 2006-06-05 14:55:14-04:00, mikael@c-7308e253.1238-1-64736c10.cust.bredbandsbolaget.se +21 -2
    Added new test cases

  mysql-test/r/partition_error.result@1.6, 2006-06-05 14:55:14-04:00, mikael@c-7308e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Fixed test case

  mysql-test/t/partition.test@1.37.1.2, 2006-06-05 14:55:14-04:00, mikael@c-7308e253.1238-1-64736c10.cust.bredbandsbolaget.se +26 -2
    Added new test cases

  mysql-test/t/partition_error.test@1.8, 2006-06-05 14:55:15-04:00, mikael@c-7308e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Fixed test case

  sql/ha_partition.cc@1.39.6.2, 2006-06-05 14:55:15-04:00, mikael@c-7308e253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -7
    Review fixes

  sql/partition_element.h@1.4.1.2, 2006-06-05 14:55:15-04:00, mikael@c-7308e253.1238-1-64736c10.cust.bredbandsbolaget.se +9 -2
    Review fixes

  sql/partition_info.cc@1.8.6.2, 2006-06-05 14:55:15-04:00, mikael@c-7308e253.1238-1-64736c10.cust.bredbandsbolaget.se +6 -8
    Review fixes

  sql/share/errmsg.txt@1.90.2.5, 2006-06-05 14:55:15-04:00, mikael@c-7308e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -3
    Review fixes

  sql/sql_partition.cc@1.55.8.2, 2006-06-05 14:55:16-04:00, mikael@c-7308e253.1238-1-64736c10.cust.bredbandsbolaget.se +11 -22
    Review fixes

  sql/sql_yacc.yy@1.464.15.3, 2006-06-05 14:55:16-04:00, mikael@c-7308e253.1238-1-64736c10.cust.bredbandsbolaget.se +6 -1
    Enabled possibility to use (MAXVALUE) as well as MAXVALUE.

ChangeSet@1.1810.1767.1, 2006-06-05 13:37:06-05:00, reggie@big_geek. +1 -0
  Bug #18275  	invalid file descriptor causes crash on windows
  

  mysys/my_init.c@1.44.1.2, 2006-06-05 13:37:00-05:00, reggie@big_geek. +23 -1
    Added invalid parameter handler so that routines such as lseek would return -1 instead of ASSERT.

ChangeSet@1.1810.1766.1, 2006-06-05 15:41:29+02:00, msvensson@shellback.(none) +4 -0
  Import patch for yassl 1.35
   - Better check of required buffer size when processing incoming record headers

  extra/yassl/README@1.4, 2006-06-02 00:36:01+02:00, msvensson@shellback.(none) +13 -3
    Import patch yassl.diff

  extra/yassl/include/openssl/engine.h@1.1, 2006-06-01 01:37:16+02:00, msvensson@shellback.(none) +5 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/engine.h@1.0, 2006-06-01 01:37:16+02:00, msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/include/openssl/engine.h

  extra/yassl/include/openssl/pkcs12.h@1.1, 2006-06-01 01:15:39+02:00, msvensson@shellback.(none) +5 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/pkcs12.h@1.0, 2006-06-01 01:15:39+02:00, msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/include/openssl/pkcs12.h

  extra/yassl/src/handshake.cpp@1.10, 2006-06-01 22:57:37+02:00, msvensson@shellback.(none) +24 -6
    Import patch yassl.diff

ChangeSet@1.2119.345.99, 2006-06-05 15:32:18+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - dbacc -
    fix gcc4 compile error

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@1.73, 2006-06-05 15:32:15+02:00, jonas@perch.ndb.mysql.com +21 -19
    add block to remove gcc compiler error

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.108, 2006-06-05 15:32:15+02:00, jonas@perch.ndb.mysql.com +6 -0
    add jamEntry

ChangeSet@1.2176.1.7, 2006-06-05 15:15:28+04:00, sergefp@mysql.com +3 -0
  BUG#19684: Garbage in 'partitions' column in EXPLAIN output:
  In select_describe(), make the String object that holds the value of 
  "partitions" column to "own" the value buffer, so the buffer isn't
  prematurely freed.
  [this is the second attempt with review fixes]

  mysql-test/r/partition_pruning.result@1.16, 2006-06-05 15:15:22+04:00, sergefp@mysql.com +19 -0
    BUG#19684: Testcase

  mysql-test/t/partition_pruning.test@1.14, 2006-06-05 15:15:22+04:00, sergefp@mysql.com +16 -0
    BUG#19684: Testcase

  sql/sql_select.cc@1.409.1.1, 2006-06-05 15:15:22+04:00, sergefp@mysql.com +7 -5
    BUG#19684: Garbage in 'partitions' column in EXPLAIN output:
    - Added comment
    - Make the String object that holds the value of "partitions" column
      to "own" the value buffer, so the buffer isn't prematurely freed.

ChangeSet@1.2176.3.2, 2006-06-05 06:16:08+03:00, monty@mysql.com +15 -0
  After merge fixes
  Remove compiler warnings

  mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test@1.30, 2006-06-05 06:16:03+03:00, monty@mysql.com +1 -1
    Fixed regex to get rid of xid= in output

  mysql-test/r/mysqlcheck.result@1.8, 2006-06-05 06:16:03+03:00, monty@mysql.com +1 -0
    Drop client_test_db if mysql_client_test fails

  mysql-test/t/mysqlcheck.test@1.4, 2006-06-05 06:16:03+03:00, monty@mysql.com +4 -0
    Drop client_test_db if mysql_client_test fails

  mysql-test/t/mysqldump.test@1.101, 2006-06-05 06:16:03+03:00, monty@mysql.com +1 -1
    Use --defaults-file instead of --defaults-extra-file to avoid reading my.cnf files

  sql/event_scheduler.cc@1.6, 2006-06-05 06:16:03+03:00, monty@mysql.com +7 -1
    Remove compiler warnings

  sql/ha_partition.cc@1.55, 2006-06-05 06:16:03+03:00, monty@mysql.com +7 -5
    Don't divide with 0 when checking current auto_increment value

  sql/handler.cc@1.238, 2006-06-05 06:16:03+03:00, monty@mysql.com +1 -0
    After merge fix

  sql/mysqld.cc@1.551, 2006-06-05 06:16:03+03:00, monty@mysql.com +1 -1
    Remove comiler warning

  sql/partition_info.cc@1.15, 2006-06-05 06:16:03+03:00, monty@mysql.com +5 -5
    After merge fix
    Fixed memory reference overrun for some wrong partition definitions

  sql/sql_base.cc@1.325.1.3, 2006-06-05 06:16:03+03:00, monty@mysql.com +7 -7
    After merge fix
    Always set *leaves in setup_tables_and_check_access() (assume argument is always given).
    

  sql/sql_select.cc@1.411, 2006-06-05 06:16:04+03:00, monty@mysql.com +4 -1
    Simple optimization

  sql/sql_show.cc@1.345, 2006-06-05 06:16:04+03:00, monty@mysql.com +4 -3
    Remove compiler warning

  sql/sql_table.cc@1.343, 2006-06-05 06:16:04+03:00, monty@mysql.com +3 -2
    After merge fix

  storage/csv/ha_tina.cc@1.51, 2006-06-05 06:16:04+03:00, monty@mysql.com +9 -3
    Ensure table maps are restored properly

  storage/ndb/include/ndbapi/Ndb.hpp@1.56, 2006-06-05 06:16:04+03:00, monty@mysql.com +1 -0
    Remove compiler warning

ChangeSet@1.2154.43.5, 2006-06-05 05:58:59+04:00, aivanov@mysql.com +1 -0
  Fix BUG#18948. Adding a file missed in the previous commit.

  mysql-test/t/rpl_row_inexist_tbl-slave.opt@1.1, 2006-06-05 05:58:54+04:00, aivanov@mysql.com +1 -0
    New BitKeeper file ``mysql-test/t/rpl_row_inexist_tbl-slave.opt''

  mysql-test/t/rpl_row_inexist_tbl-slave.opt@1.0, 2006-06-05 05:58:54+04:00, aivanov@mysql.com +0 -0
    BitKeeper file /home/alexi/bugs/mysql-5.1-18948/mysql-test/t/rpl_row_inexist_tbl-slave.opt

ChangeSet@1.2154.43.4, 2006-06-05 05:49:06+04:00, aivanov@mysql.com +4 -0
  Fixed BUG#18948 "Disabled test case rpl_row_inexist_tbl".
   The bug was caused by ignoring failure when opening a
   a table in Table_map_log_event::exec_event().

  mysql-test/r/rpl_row_inexist_tbl.result@1.2, 2006-06-05 05:48:50+04:00, aivanov@mysql.com +13 -4
    Fixed test case result.

  mysql-test/t/disabled.def@1.156.1.1, 2006-06-05 05:48:50+04:00, aivanov@mysql.com +0 -1
    Enabled rpl_row_inexist_table test.

  mysql-test/t/rpl_row_inexist_tbl.test@1.2, 2006-06-05 05:48:50+04:00, aivanov@mysql.com +11 -3
    Extended test case with "replicate-ignore-table" t2.

  sql/log_event.cc@1.222.1.2, 2006-06-05 05:48:50+04:00, aivanov@mysql.com +7 -29
    Table_map_log_event::exec_event(): Remove code which ignores
     opening table failure. Previously, this code was needed
     because of extraneous table maps in the binary log. Currently,
     for any table that should be replicated to slave, a filter is
     needed (bug#18948).

ChangeSet@1.2119.537.2, 2006-06-05 05:34:34+04:00, petr@mysql.com +2 -0
  WL #3153 "Split logs" post-review fixes (after andrei's review)

  sql/log.cc@1.204.2.2, 2006-06-05 05:34:31+04:00, petr@mysql.com +64 -76
    post-review fixes:
    * split log_type to log_state and log_type
    * rename log_type to log_table_type where appropriate (to avoid confusion)
    * merge MYSQL_SLOW_LOG and MYSQL_GENERAL_LOG to MYSQL_QUERY_LOG

  sql/log.h@1.10, 2006-06-05 05:34:31+04:00, petr@mysql.com +19 -23
    post-review fixes:
    * move last_time and reopen_file() to MYSQL_QUERY_LOG from the base class

ChangeSet@1.2169.3.7, 2006-06-05 03:50:32+04:00, petr@mysql.com +1 -0
  fix test failure in the team tree

  storage/csv/ha_tina.cc@1.47.1.4, 2006-06-05 03:50:29+04:00, petr@mysql.com +12 -15
    fix windows csv test failure

ChangeSet@1.1810.1760.2, 2006-06-04 21:27:41+03:00, anjuta@arthur.local +4 -0
  BUG#19479: mysqldump creates invalid dump
  Moved the test case to separate non-windows specific file.

  mysql-test/r/create.result@1.107.1.10, 2006-06-04 21:27:36+03:00, anjuta@arthur.local +0 -14
    Moved non-windows specific test case to create_not_windows.test.

  mysql-test/r/create_not_windows.result@1.1, 2006-06-04 21:27:37+03:00, anjuta@arthur.local +14 -0
    #19479: mysqldump creates invalid dump
    Moved the non-windows specific test case from create.test.

  mysql-test/r/create_not_windows.result@1.0, 2006-06-04 21:27:37+03:00, anjuta@arthur.local +0 -0
    BitKeeper file /home/my/mysql-5.0-clean/mysql-test/r/create_not_windows.result

  mysql-test/t/create.test@1.71.1.8, 2006-06-04 21:27:36+03:00, anjuta@arthur.local +0 -15
    Moved non-windows specific test case to create_not_windows.test.

  mysql-test/t/create_not_windows.test@1.1, 2006-06-04 21:27:37+03:00, anjuta@arthur.local +20 -0
    #19479: mysqldump creates invalid dump
    Moved the non-windows specific test case from create.test.

  mysql-test/t/create_not_windows.test@1.0, 2006-06-04 21:27:37+03:00, anjuta@arthur.local +0 -0
    BitKeeper file /home/my/mysql-5.0-clean/mysql-test/t/create_not_windows.test

ChangeSet@1.2119.603.1, 2006-06-04 18:52:22+03:00, monty@mysql.com +136 -0
  This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
  
  Changes that requires code changes in other code of other storage engines.
  (Note that all changes are very straightforward and one should find all issues
  by compiling a --debug build and fixing all compiler errors and all
  asserts in field.cc while running the test suite),
  
  - New optional handler function introduced: reset()
    This is called after every DML statement to make it easy for a handler to
    statement specific cleanups.
    (The only case it's not called is if force the file to be closed)
  
  - handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
    should be moved to handler::reset()
  
  - table->read_set contains a bitmap over all columns that are needed
    in the query.  read_row() and similar functions only needs to read these
    columns
  - table->write_set contains a bitmap over all columns that will be updated
    in the query. write_row() and update_row() only needs to update these
    columns.
    The above bitmaps should now be up to date in all context
    (including ALTER TABLE, filesort()).
  
    The handler is informed of any changes to the bitmap after
    fix_fields() by calling the virtual function
    handler::column_bitmaps_signal(). If the handler does caching of
    these bitmaps (instead of using table->read_set, table->write_set),
    it should redo the caching in this code. as the signal() may be sent
    several times, it's probably best to set a variable in the signal
    and redo the caching on read_row() / write_row() if the variable was
    set.
  
  - Removed the read_set and write_set bitmap objects from the handler class
  
  - Removed all column bit handling functions from the handler class.
    (Now one instead uses the normal bitmap functions in my_bitmap.c instead
    of handler dedicated bitmap functions)
  
  - field->query_id is removed. One should instead instead check
    table->read_set and table->write_set if a field is used in the query.
  
  - handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
    handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
    instead use table->read_set to check for which columns to retrieve.
  
  - If a handler needs to call Field->val() or Field->store() on columns
    that are not used in the query, one should install a temporary
    all-columns-used map while doing so. For this, we provide the following
    functions:
  
    my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
    field->val();
    dbug_tmp_restore_column_map(table->read_set, old_map);
  
    and similar for the write map:
  
    my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
    field->val();
    dbug_tmp_restore_column_map(table->write_set, old_map);
  
    If this is not done, you will sooner or later hit a DBUG_ASSERT
    in the field store() / val() functions.
    (For not DBUG binaries, the dbug_tmp_restore_column_map() and
    dbug_tmp_restore_column_map() are inline dummy functions and should
    be optimized away be the compiler).
  
  - If one needs to temporary set the column map for all binaries (and not
    just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
    methods) one should use the functions tmp_use_all_columns() and
    tmp_restore_column_map() instead of the above dbug_ variants.
  
  - All 'status' fields in the handler base class (like records,
    data_file_length etc) are now stored in a 'stats' struct. This makes
    it easier to know what status variables are provided by the base
    handler.  This requires some trivial variable names in the extra()
    function.
  
  - New virtual function handler::records().  This is called to optimize
    COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
    (stats.records is not supposed to be an exact value. It's only has to
    be 'reasonable enough' for the optimizer to be able to choose a good
    optimization path).
  
  - Non virtual handler::init() function added for caching of virtual
    constants from engine.
  
  - Removed has_transactions() virtual method. Now one should instead return
    HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
    transactions.
  
  - The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
    that is to be used with 'new handler_name()' to allocate the handler
    in the right area.  The xxxx_create_handler() function is also
    responsible for any initialization of the object before returning.
  
    For example, one should change:
  
    static handler *myisam_create_handler(TABLE_SHARE *table)
    {
      return new ha_myisam(table);
    }
  
    ->
  
    static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
    {
      return new (mem_root) ha_myisam(table);
    }
  
  - New optional virtual function: use_hidden_primary_key().
    This is called in case of an update/delete when
    (table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
    but we don't have a primary key. This allows the handler to take precisions
    in remembering any hidden primary key to able to update/delete any
    found row. The default handler marks all columns to be read.
  
  - handler::table_flags() now returns a ulonglong (to allow for more flags).
  
  - New/changed table_flags()
    - HA_HAS_RECORDS	    Set if ::records() is supported
    - HA_NO_TRANSACTIONS	    Set if engine doesn't support transactions
    - HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
                              Set if we should mark all primary key columns for
  			    read when reading rows as part of a DELETE
  			    statement. If there is no primary key,
  			    all columns are marked for read.
    - HA_PARTIAL_COLUMN_READ  Set if engine will not read all columns in some
  			    cases (based on table->read_set)
   - HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
     			    Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
   - HA_DUPP_POS              Renamed to HA_DUPLICATE_POS
   - HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
  			    Set this if we should mark ALL key columns for
  			    read when when reading rows as part of a DELETE
  			    statement. In case of an update we will mark
  			    all keys for read for which key part changed
  			    value.
    - HA_STATS_RECORDS_IS_EXACT
  			     Set this if stats.records is exact.
  			     (This saves us some extra records() calls
  			     when optimizing COUNT(*))
  			    
  
  - Removed table_flags()
    - HA_NOT_EXACT_COUNT     Now one should instead use HA_HAS_RECORDS if
  			   handler::records() gives an exact count() and
  			   HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
    - HA_READ_RND_SAME	   Removed (no one supported this one)
  
  - Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()
  
  - Renamed handler::dupp_pos to handler::dup_pos
  
  - Removed not used variable handler::sortkey
  
  
  Upper level handler changes:
  
  - ha_reset() now does some overall checks and calls ::reset()
  - ha_table_flags() added. This is a cached version of table_flags(). The
    cache is updated on engine creation time and updated on open.
  
  
  MySQL level changes (not obvious from the above):
  
  - DBUG_ASSERT() added to check that column usage matches what is set
    in the column usage bit maps. (This found a LOT of bugs in current
    column marking code).
  
  - In 5.1 before, all used columns was marked in read_set and only updated
    columns was marked in write_set. Now we only mark columns for which we
    need a value in read_set.
  
  - Column bitmaps are created in open_binary_frm() and open_table_from_share().
    (Before this was in table.cc)
  
  - handler::table_flags() calls are replaced with handler::ha_table_flags()
  
  - For calling field->val() you must have the corresponding bit set in
    table->read_set. For calling field->store() you must have the
    corresponding bit set in table->write_set. (There are asserts in
    all store()/val() functions to catch wrong usage)
  
  - thd->set_query_id is renamed to thd->mark_used_columns and instead
    of setting this to an integer value, this has now the values:
    MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
    Changed also all variables named 'set_query_id' to mark_used_columns.
  
  - In filesort() we now inform the handler of exactly which columns are needed
    doing the sort and choosing the rows.
  
  - The TABLE_SHARE object has a 'all_set' column bitmap one can use
    when one needs a column bitmap with all columns set.
    (This is used for table->use_all_columns() and other places)
  
  - The TABLE object has 3 column bitmaps:
    - def_read_set     Default bitmap for columns to be read
    - def_write_set    Default bitmap for columns to be written
    - tmp_set          Can be used as a temporary bitmap when needed.
    The table object has also two pointer to bitmaps read_set and write_set
    that the handler should use to find out which columns are used in which way.
  
  - count() optimization now calls handler::records() instead of using
    handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).
  
  - Added extra argument to Item::walk() to indicate if we should also
    traverse sub queries.
  
  - Added TABLE parameter to cp_buffer_from_ref()
  
  - Don't close tables created with CREATE ... SELECT but keep them in
    the table cache. (Faster usage of newly created tables).
  
  
  New interfaces:
  
  - table->clear_column_bitmaps() to initialize the bitmaps for tables
    at start of new statements.
  
  - table->column_bitmaps_set() to set up new column bitmaps and signal
    the handler about this.
  
  - table->column_bitmaps_set_no_signal() for some few cases where we need
    to setup new column bitmaps but don't signal the handler (as the handler
    has already been signaled about these before). Used for the momement
    only in opt_range.cc when doing ROR scans.
  
  - table->use_all_columns() to install a bitmap where all columns are marked
    as use in the read and the write set.
  
  - table->default_column_bitmaps() to install the normal read and write
    column bitmaps, but not signaling the handler about this.
    This is mainly used when creating TABLE instances.
  
  - table->mark_columns_needed_for_delete(),
    table->mark_columns_needed_for_delete() and
    table->mark_columns_needed_for_insert() to allow us to put additional
    columns in column usage maps if handler so requires.
    (The handler indicates what it neads in handler->table_flags())
  
  - table->prepare_for_position() to allow us to tell handler that it
    needs to read primary key parts to be able to store them in
    future table->position() calls.
    (This replaces the table->file->ha_retrieve_all_pk function)
  
  - table->mark_auto_increment_column() to tell handler are going to update
    columns part of any auto_increment key.
  
  - table->mark_columns_used_by_index() to mark all columns that is part of
    an index.  It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
    it to quickly know that it only needs to read colums that are part
    of the key.  (The handler can also use the column map for detecting this,
    but simpler/faster handler can just monitor the extra() call).
  
  - table->mark_columns_used_by_index_no_reset() to in addition to other columns,
    also mark all columns that is used by the given key.
  
  - table->restore_column_maps_after_mark_index() to restore to default
    column maps after a call to table->mark_columns_used_by_index().
  
  - New item function register_field_in_read_map(), for marking used columns
    in table->read_map. Used by filesort() to mark all used columns
  
  - Maintain in TABLE->merge_keys set of all keys that are used in query.
    (Simplices some optimization loops)
  
  - Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
    but the field in the clustered key is not assumed to be part of all index.
    (used in opt_range.cc for faster loops)
  
  -  dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
     tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
     mark all columns as usable.  The 'dbug_' version is primarily intended
     inside a handler when it wants to just call Field:store() & Field::val()
     functions, but don't need the column maps set for any other usage.
     (ie:: bitmap_is_set() is never called)
  
  - We can't use compare_records() to skip updates for handlers that returns
    a partial column set and the read_set doesn't cover all columns in the
    write set. The reason for this is that if we have a column marked only for
    write we can't in the MySQL level know if the value changed or not.
    The reason this worked before was that MySQL marked all to be written
    columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
    bug'.
  
  - open_table_from_share() does not anymore setup temporary MEM_ROOT
    object as a thread specific variable for the handler. Instead we
    send the to-be-used MEMROOT to get_new_handler().
    (Simpler, faster code)
  
  
  
  Bugs fixed:
  
  - Column marking was not done correctly in a lot of cases.
    (ALTER TABLE, when using triggers, auto_increment fields etc)
    (Could potentially result in wrong values inserted in table handlers
    relying on that the old column maps or field->set_query_id was correct)
    Especially when it comes to triggers, there may be cases where the
    old code would cause lost/wrong values for NDB and/or InnoDB tables.
  
  - Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
    OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
    This allowed me to remove some wrong warnings about:
    "Some non-transactional changed tables couldn't be rolled back"
  
  - Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
    (thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
    some warnings about
    "Some non-transactional changed tables couldn't be rolled back")
  
  - Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
    which could cause delete_table to report random failures.
  
  - Fixed core dumps for some tests when running with --debug
  
  - Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
    (This has probably caused us to not properly remove temporary files after
    crash)
  
  - slow_logs was not properly initialized, which could maybe cause
    extra/lost entries in slow log.
  
  - If we get an duplicate row on insert, change column map to read and
    write all columns while retrying the operation. This is required by
    the definition of REPLACE and also ensures that fields that are only
    part of UPDATE are properly handled.  This fixed a bug in NDB and
    REPLACE where REPLACE wrongly copied some column values from the replaced
    row.
  
  - For table handler that doesn't support NULL in keys, we would give an error
    when creating a primary key with NULL fields, even after the fields has been
    automaticly converted to NOT NULL.
  
  - Creating a primary key on a SPATIAL key, would fail if field was not
    declared as NOT NULL.
  
  
  Cleanups:
  
  - Removed not used condition argument to setup_tables
  
  - Removed not needed item function reset_query_id_processor().
  
  - Field->add_index is removed. Now this is instead maintained in
    (field->flags & FIELD_IN_ADD_INDEX)
  
  - Field->fieldnr is removed (use field->field_index instead)
  
  - New argument to filesort() to indicate that it should return a set of
    row pointers (not used columns). This allowed me to remove some references
    to sql_command in filesort and should also enable us to return column
    results in some cases where we couldn't before.
  
  - Changed column bitmap handling in opt_range.cc to be aligned with TABLE
    bitmap, which allowed me to use bitmap functions instead of looping over
    all fields to create some needed bitmaps. (Faster and smaller code)
  
  - Broke up found too long lines
  
  - Moved some variable declaration at start of function for better code
    readability.
  
  - Removed some not used arguments from functions.
    (setup_fields(), mysql_prepare_insert_check_table())
  
  - setup_fields() now takes an enum instead of an int for marking columns
     usage.
  
  - For internal temporary tables, use handler::write_row(),
    handler::delete_row() and handler::update_row() instead of
    handler::ha_xxxx() for faster execution.
  
  - Changed some constants to enum's and define's.
  
  - Using separate column read and write sets allows for easier checking
    of timestamp field was set by statement.
  
  - Remove calls to free_io_cache() as this is now done automaticly in ha_reset()
  
  - Don't build table->normalized_path as this is now identical to table->path
    (after bar's fixes to convert filenames)
  
  - Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
    do comparision with the 'convert-dbug-for-diff' tool.
  
  
  Things left to do in 5.1:
  
  - We wrongly log failed CREATE TABLE ... SELECT in some cases when using
    row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
    Mats has promised to look into this.
  
  - Test that my fix for CREATE TABLE ... SELECT is indeed correct.
    (I added several test cases for this, but in this case it's better that
    someone else also tests this throughly).
    Lars has promosed to do this.

  sql/ha_berkeley.cc@1.176.3.1, 2006-06-04 18:52:08+03:00, monty@mysql.com +33 -26
    Update to 'newer' table handler interface

  sql/ha_berkeley.h@1.80.2.1, 2006-06-04 18:52:08+03:00, monty@mysql.com +1 -2
    Update to 'newer' table handler interface

  BitKeeper/etc/ignore@1.240.1.1, 2006-06-01 18:29:29+03:00, monty@mysql.com +1 -0
    added mysys/test_bitmap

  include/base64.h@1.8, 2006-06-04 18:51:54+03:00, monty@mysql.com +0 -2
    Removed my_global.h, as this must be included first in any program

  include/heap.h@1.26.1.1, 2006-06-04 18:51:55+03:00, monty@mysql.com +1 -0
    Added heap_reset() (Required by new handler interface)

  include/my_base.h@1.86.4.1, 2006-06-04 18:51:55+03:00, monty@mysql.com +1 -10
    Removed HA_EXTRA_RESET. MySQL will now call ::reset() instead of ::extra(HA_EXTRA_RESET).
    HA_EXTRA_RETRIVE_ALL_COLS and HA_EXTRA_RETRIVE_PRIMARY key are deleted as the column bitmaps makes these unnecessary

  include/my_bitmap.h@1.23, 2006-06-04 18:51:55+03:00, monty@mysql.com +31 -22
    Remove my_pthread.h (should be included at upper level)
    Introduced my_bitmap_map typedef to make it the bitmap handling more like a black box
    Added bitmap_is_overlapping(), bitmap_test_and_clear(), bitmap_copy() and bitmap_cmp()
    Made bitmap_set_bit(), bitmap_flip_bit(), bitmap_clear_bit() return void
    
    

  include/myisam.h@1.78, 2006-06-04 18:51:55+03:00, monty@mysql.com +1 -0
    Added mi_reset() (Required by new handler interface)

  include/myisammrg.h@1.16, 2006-06-04 18:51:55+03:00, monty@mysql.com +1 -0
    Added myrg_reset() (Required by new handler interface)

  include/mysql_com.h@1.105.1.1, 2006-06-04 18:51:55+03:00, monty@mysql.com +1 -0
    Added flag FIELD_IN_ADD_INDEX to be able to remove Field->add_index
     

  mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test@1.27.1.1, 2006-06-04 18:51:55+03:00, monty@mysql.com +65 -2
    Added testing of CREATE ... SELECT in a mixed environment
    (This found some bugs that Mats is going to fix shortly)

  mysql-test/t/innodb_mysql.test@1.2.2.1, 2006-06-04 18:52:05+03:00, monty@mysql.com +50 -1
    Added tests for CREATE ... SELECT

  mysql-test/install_test_db.sh@1.36, 2006-06-04 18:51:56+03:00, monty@mysql.com +2 -5
    Simplify ldata usage
    Added --tmpdir=. option to mysqld bootstrap (Removed some warnings when TMPDIR was wrongly set)
    

  mysql-test/mysql-test-run.sh@1.319.2.1, 2006-06-04 18:51:58+03:00, monty@mysql.com +8 -2
    Use copy instead of INSTALL_DB for master and slave databases.
    (Speeds up startup time a lot!)
    Remove snapshot directories at startup (removes some strange warnings)

  mysql-test/mysql-test-run.pl@1.109.4.1, 2006-06-04 18:51:57+03:00, monty@mysql.com +1 -0
    Added --tmpdir=. to bootstrap

  mysql-test/r/binlog_row_mix_innodb_myisam.result@1.7.2.1, 2006-06-04 18:51:59+03:00, monty@mysql.com +156 -2
    Added testing of CREATE ... SELECT in a mixed environment
    (This found some bugs that Mats is going to fix shortly)

  mysql-test/r/binlog_stm_mix_innodb_myisam.result@1.29.1.1, 2006-06-04 18:51:59+03:00, monty@mysql.com +101 -2
    Added testing of CREATE ... SELECT in a mixed environment

  mysql-test/r/create.result@1.118.2.1, 2006-06-04 18:51:59+03:00, monty@mysql.com +46 -0
    Some extra tests of warnings and number of tables opened by CREATE ... SELECT

  mysql-test/r/federated.result@1.28.1.1, 2006-06-04 18:51:59+03:00, monty@mysql.com +1 -0
    Drop some left over tables
    Added testing of multiple table update and multiple table delete (with and without keys)
    

  mysql-test/r/func_gconcat.result@1.57, 2006-06-04 18:51:59+03:00, monty@mysql.com +6 -0
    Enable some disabled tests (converted them slightly to be predictable)

  mysql-test/r/func_time.result@1.50.1.1, 2006-06-04 18:52:00+03:00, monty@mysql.com +1 -0
    Added drop of test function

  mysql-test/r/innodb_mysql.result@1.2.2.1, 2006-06-04 18:52:00+03:00, monty@mysql.com +59 -1
    Added tests for CREATE ... SELECT

  mysql-test/r/insert.result@1.26, 2006-06-04 18:52:00+03:00, monty@mysql.com +24 -2
    More tests
    Added testing of duplicate columns in insert

  mysql-test/r/loaddata.result@1.26, 2006-06-04 18:52:00+03:00, monty@mysql.com +9 -0
    Added testing LOAD DATA ... SET ...

  mysql-test/r/multi_update.result@1.42.1.1, 2006-06-04 18:52:00+03:00, monty@mysql.com +80 -0
    Test multi updates and deletes using primary key and without

  mysql-test/r/ndb_index_unique.result@1.23.1.1, 2006-06-04 18:52:01+03:00, monty@mysql.com +1 -1
    Better error message

  mysql-test/r/ndb_replace.result@1.6, 2006-06-04 18:52:04+03:00, monty@mysql.com +1 -1
    New correct result after fixing REPLACE handling with NDB

  mysql-test/r/rpl_ddl.result@1.16, 2006-06-04 18:52:04+03:00, monty@mysql.com +0 -4
    Now we don't get these (wrong) warnings anymore

  mysql-test/r/view_grant.result@1.16.1.1, 2006-06-04 18:52:04+03:00, monty@mysql.com +1 -1
    Drop used views

  mysql-test/t/create.test@1.79.2.1, 2006-06-04 18:52:05+03:00, monty@mysql.com +37 -0
    Some extra tests of warnings and number of tables opened by CREATE ... SELECT

  mysql-test/t/federated.test@1.24.1.1, 2006-06-04 18:52:05+03:00, monty@mysql.com +54 -3
    Drop some left over tables
    Added testing of multiple table update and multiple table delete (with and without keys)
    

  mysql-test/t/func_gconcat.test@1.45, 2006-06-04 18:52:05+03:00, monty@mysql.com +2 -2
    Enable some disabled tests (converted them slightly to be predictable)

  mysql-test/t/func_time.test@1.40.1.1, 2006-06-04 18:52:05+03:00, monty@mysql.com +1 -0
    Added drop of test function

  mysql-test/t/insert.test@1.24, 2006-06-04 18:52:05+03:00, monty@mysql.com +27 -2
    More tests
    Added testing of duplicate columns in insert

  mysql-test/t/loaddata.test@1.21, 2006-06-04 18:52:06+03:00, monty@mysql.com +4 -0
    Added testing LOAD DATA ... SET ...

  mysql-test/t/multi_update.test@1.50, 2006-06-04 18:52:06+03:00, monty@mysql.com +30 -0
    Test multi updates and deletes using primary key and without

  mysql-test/t/view_grant.test@1.15.1.1, 2006-06-04 18:52:06+03:00, monty@mysql.com +1 -1
    Drop used views

  mysql-test/valgrind.supp@1.5.2.1, 2006-06-04 18:52:06+03:00, monty@mysql.com +14 -0
    Added supression of not needed warnings when printing stack trace

  mysys/base64.c@1.12, 2006-06-04 18:52:07+03:00, monty@mysql.com +2 -1
    Include my_global.h first

  mysys/my_bitmap.c@1.40, 2006-06-04 18:52:07+03:00, monty@mysql.com +127 -83
    Added bitmap_is_overlapping(), bitmap_test_and_clear() and bitmap_copy()
    Changed logic of bitmap handling to be a bit more efficent (Did this together with Mikael Ronström)
    Now the 'extra, not used bits' in the bitmap are assumed to have a 'random value' and the bitmap functions are free to change them whenever needed.
    Changed how mutex is allocated to make 'bitmap_free()' function simpler.
    
    
     

  mysys/thr_lock.c@1.51, 2006-06-04 18:52:07+03:00, monty@mysql.com +7 -7
    Added 0x before thread pointers (for easier comparison of DBUG traces)
    

  sql/event.cc@1.39.1.1, 2006-06-04 18:52:07+03:00, monty@mysql.com +19 -14
    Ensure 'use_all_columns()' is used for event tables
    Don't print warning that event table is damaged if it doesn't exists.

  sql/field.cc@1.310.1.1, 2006-06-04 18:52:07+03:00, monty@mysql.com +164 -39
    Added ASSERT_COLUMN_MARKED_FOR_WRITE in all store() methods and ASSERT_COLUMN_MARKED_FOR_READ in all val() methods to catch wrong setting if table->read_set and table->write_set
    (Rest of changes are only indentation cleanups)

  sql/field.h@1.183.2.1, 2006-06-04 18:52:08+03:00, monty@mysql.com +3 -8
    Removed Field->query_id (replaced by table->read_set and table->write_set)
    Removed Field->fieldnr (use Field->field_index instead)
    Removed Field->add_index (Use Field->flags instead)
    Add Field->part_of_key_not_clustered (for usage in opt_range.cc)
    

  sql/filesort.cc@1.106, 2006-06-04 18:52:08+03:00, monty@mysql.com +84 -22
    Added paramater sort_postion to filesort() to force sorting by position instead of storing all fields in the result set.
    This allowed me to remove checking of sql_command.
    Create a temporary column bitmap for fields that are used by the sorting process.
    Use column bitmaps instead of query_id

  sql/ha_ndbcluster.cc@1.302.1.1, 2006-06-04 18:52:09+03:00, monty@mysql.com +112 -97
    Update to 'newer' table handler interface
    Fixed use_blob_value() to be accurate
    In ::complemented_read() we have to check both the read and write bitmap as the old code did mark all changed columns also in the read map
    Correct dumping of field data with DBUG_DUMP
    Prefix addresses in DBUG_PRINT with 0x
    Fixed usage of not initialized memory
    Update to use field->flags & FIELD_IN_ADD_INDEX instead of field->add_index.

  sql/ha_ndbcluster.h@1.133.3.1, 2006-06-04 18:52:09+03:00, monty@mysql.com +9 -4
    Update to 'newer' table handler interface

  sql/ha_ndbcluster_binlog.cc@1.50.1.1, 2006-06-04 18:52:10+03:00, monty@mysql.com +39 -32
    Mark usage of all columns in ndbcluster binlog tables
    false -> FALSE, true -> TRUE
    Use table->s->all_set instead of creating a temporary bitmap.

  sql/ha_partition.cc@1.48.3.1, 2006-06-04 18:52:10+03:00, monty@mysql.com +96 -95
    Update to 'newer' table handler interface
    Added memroot to initialise_partitions() and related functions to get faster memory allocation.
    partition_create_handler() is now responsible for initialisation of the partition object
    Some trivial optimizations and indentation fixes
    Ensure that table_flags() are up to date
    Removed documentation for removed HA_EXTRA flags
    Fixed 'strange' usage of m_file[i] in new_handlers_from_part_info()that worked in current code 'by chance'
    
    

  sql/ha_partition.h@1.16.1.1, 2006-06-04 18:52:10+03:00, monty@mysql.com +11 -21
    Update to 'newer' table handler interface

  sql/handler.cc@1.231.4.1, 2006-06-04 18:52:10+03:00, monty@mysql.com +136 -176
    create_xxx handler now takes MEMROOT as an argument to simplify memory allocation.
    Much simpler get_new_handler()
    (Initialization of the object is now handled by the create method for the engine)
    Moved all allocation of bitmap handling to the TABLE object (in table.cc)
    Added column_bitmaps_signal() to signal column usage changes.
    Changed binlog_log_row() to use the exiusting all_set bitmap in the table object.
    Added ha_reset() function to test that the file object is ok at end of statement and call handler::reset()
    Added use_hidden_primary_key() to signal handler that we we are going to read and update + delete the row and the handler should thus remember the position for the row
    
    
    

  sql/handler.h@1.206.4.1, 2006-06-04 18:52:10+03:00, monty@mysql.com +122 -189
    Added HA_NO_TRANSACTIONS, HA_PARTIAL_COLUMN_READ, HA_REQUIRES_KEY_COLUMNS_FOR_DELETE,HA_PRIMARY_KEY_REQUIRED_FOR_DELETE and HA_HAS_RECORDS
    Removed HA_NOT_EXACT_COUNT, HA_READ_RND_SAME
    HA_DUPP_POS -> HA_DUPLICATE_POS
    HA_NOT_EXACT_COUNT replaced by HA_STATS_RECORDS_IS_EXACT, HA_HAS_RECORDS and records()
    HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION
    Added future row type 'ROW_TYPE_PAGES'
    Added MEM_ROOT to handlerton 'create' function
    Added ha_statistics, a structure for all status variable in the base handler class.
    Moved all status variables in the handler class into a stats structs to improve readability.
    ha_table_flags() is now a cached (not virtual) version of table_flags()
    reset() doesn't anymore call extra(HA_EXTRA_RESET) but is a function of it's own.
    Renamed dupp_ref to dup_ref
    Renamed not used handler::sortkey
    Moved read_set and write_set to TABLE structure
    handler::init() function added for cacheing of virtual constants from engine.
    
    
    
    

  sql/item.cc@1.188.1.1, 2006-06-04 18:52:10+03:00, monty@mysql.com +60 -19
    Added register_field_in_read_map() for marking used columns in expression.
    This is used by filesort() for creating an optimal column bitmap while retrieving columns for sorting.
    Initalize value.cs_info.character_set_client to fix core dump bug with --debug
    set_query_id -> mark_used_columns
    Mark used columns in read_set OR write_set.

  sql/item.h@1.195.4.1, 2006-06-04 18:52:10+03:00, monty@mysql.com +9 -15
    Removed reset_query_id_processor() as it's not needed anymore.
    Added register_field_in_read_map()
    Added extra argument to Item::walk() to indicate if we should also
    traverse sub queries.

  sql/item_cmpfunc.cc@1.203.1.1, 2006-06-04 18:52:10+03:00, monty@mysql.com +24 -14
    Temporary mark used columns to be read/writable
    Update Item::walk to new interface

  sql/item_cmpfunc.h@1.122.1.3, 2006-06-04 18:52:10+03:00, monty@mysql.com +2 -2
    Added extra argument to Item::walk() to indicate if we should also traverse sub queries.

  sql/item_func.cc@1.288.2.1, 2006-06-04 18:52:10+03:00, monty@mysql.com +5 -3
    Update Item::walk() to new interface
    table_flags() -> ha_table_flags()

  sql/item_func.h@1.136.4.1, 2006-06-04 18:52:11+03:00, monty@mysql.com +1 -1
    Update Item::walk() to new interface

  sql/item_row.cc@1.33, 2006-06-04 18:52:11+03:00, monty@mysql.com +4 -2
    Update Item::walk() to new interface

  sql/item_row.h@1.22, 2006-06-04 18:52:11+03:00, monty@mysql.com +1 -1
    Update Item::walk() to new interface

  sql/item_strfunc.h@1.106.2.1, 2006-06-04 18:52:11+03:00, monty@mysql.com +3 -3
    Update Item::walk() to new interface

  sql/item_subselect.cc@1.122.1.1, 2006-06-04 18:52:11+03:00, monty@mysql.com +41 -1
    Added Item_subselect::walk()
    (It was a bug it was missing before. Not sure what kind of bugs this could have caused)

  sql/item_subselect.h@1.76.1.1, 2006-06-04 18:52:11+03:00, monty@mysql.com +1 -0
    Update Item::walk() to new interface

  sql/item_sum.cc@1.178, 2006-06-04 18:52:11+03:00, monty@mysql.com +5 -4
    Update Item::walk() to new interface
    Updates for new handler interace

  sql/item_sum.h@1.103, 2006-06-04 18:52:11+03:00, monty@mysql.com +1 -1
    Update Item::walk() to new interface

  sql/key.cc@1.42, 2006-06-04 18:52:11+03:00, monty@mysql.com +16 -3
    Updates for new handler interace

  sql/log.cc@1.204.7.1, 2006-06-04 18:52:11+03:00, monty@mysql.com +14 -7
    Mark all columns used for log tables
    Split options flag
    Ensured that second argument to trans_register_ha is a bool

  sql/log_event.cc@1.220.3.1, 2006-06-04 18:52:12+03:00, monty@mysql.com +44 -38
    Fixed comments to be withing 79 characters
    Use OPTION_KEEP_LOG instead of OPTION_STATUS_NO_TRANS_UPDATE to remove wrong warnings
    Updates for new handler interface
    Use 0x%lx instead of %p (portability problem)

  sql/mysql_priv.h@1.399.7.1, 2006-06-04 18:52:12+03:00, monty@mysql.com +11 -9
    Added OPTION_KEEP_LOG to indicate that we should replicate the binlog even on rollback
    Removed not used 'conds' argument to setup_tables

  sql/mysqld.cc@1.534.22.1, 2006-06-04 18:52:12+03:00, monty@mysql.com +6 -5
    Indentation fixes and removed old comment

  sql/opt_range.cc@1.215.1.1, 2006-06-04 18:52:12+03:00, monty@mysql.com +210 -143
    Update to new handler and bitmap interface.
    Fixed calls to cp_buffer_from_ref() and walk() (new argument).
    Create new temporary bitmaps for ror scans.
    (Needed because of handler changes and to get more accurate column bitmaps than before)
    Remove not needed file->ha_reset() call before file->close().
    Some trivial optimization and indentation fixes.
    Use Field->part_of_key_not_clustered() to check if field is part of a key, instead of looping over all key parts.
    
    Added flag 'in_ror_merged_scan' to allow ::get_next() to know that we need a special column bitmap to only fetch pointer to record.
    This is needed because ror scan uses the same TABLE object but different file objects, which creates problem for the column bitmap handling.
    (This is a temporary solution. A better one would be to allocate an own TABLE object for ROR scans)
    
    Optimized bitmap handling in ror scans:
    - Start bitmap at position 0, not 1
    - Use same bitmap size as in TABLE
    - Use table->read_set and table->write_set to create column bitmaps instead of looping over all fields in table
    
    

  sql/opt_range.h@1.61, 2006-06-04 18:52:12+03:00, monty@mysql.com +5 -4
    Added 'in_ror_merged_scan' to indicate if we are doing a ROR scan
    Added temporary column bitmaps used in ROR scans

  sql/opt_sum.cc@1.51, 2006-06-04 18:52:12+03:00, monty@mysql.com +52 -9
    Added get_ext_record_count() which is used in COUNT() optimization if handler has HA_HAS_RECORDS
    Note that we don't call this if handler has HA_STATS_RECORDS_IS_EXACT set.

  sql/protocol.cc@1.115, 2006-06-04 18:52:13+03:00, monty@mysql.com +11 -0
    We need to mark columns as readable in ::store() as we sometimes return default value for fields to the user

  sql/records.cc@1.45, 2006-06-04 18:52:13+03:00, monty@mysql.com +4 -7
    Updates for new handler interface

  sql/set_var.cc@1.164.10.1, 2006-06-04 18:52:13+03:00, monty@mysql.com +3 -2
    Handle splitting OPTION_STATUS_NO_TRANS_UPDATE to two flags

  sql/share/errmsg.txt@1.96.6.1, 2006-06-04 18:52:13+03:00, monty@mysql.com +2 -24
    Fixed wrong 

  sql/sp.cc@1.109.1.1, 2006-06-04 18:52:13+03:00, monty@mysql.com +5 -1
    Mark that we are using all columns for the proc table
    Update call to setup_tables() to use new prototype

  sql/sp_head.cc@1.217.2.1, 2006-06-04 18:52:13+03:00, monty@mysql.com +1 -1
    Removed QQ comment

  sql/spatial.cc@1.27.1.1, 2006-06-04 18:52:13+03:00, monty@mysql.com +0 -2
    Removed wrong QQ comment

  sql/sql_acl.cc@1.188.3.1, 2006-06-04 18:52:14+03:00, monty@mysql.com +45 -27
    Mark that we need all columns for acl tables
    Supply memroot to some 'new' calls.
    Indentation fixes

  sql/sql_base.cc@1.318.3.1, 2006-06-04 18:52:14+03:00, monty@mysql.com +97 -77
    set_query_id removed
    Ensure we call ha_reset() at end of each statement
    Mark read columns in read_set and changed columns in write_set (Before all columns was marked in read set)
    Fixed marking of some columns that was not proplerly marked before
    Maintain in TABLE->merge_keys set of all keys that are used in some way
    Removed not used 'conds' argument from setup_tables()
    Remove not used setting of 'dupp_field' in insert_fields()
    Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
    (This has probably caused us to not properly remove temporary files after crash)
    
    

  sql/sql_bitmap.h@1.14.1.1, 2006-06-04 18:52:14+03:00, monty@mysql.com +2 -0
    Added is_overlapping()

  sql/sql_class.cc@1.256.3.1, 2006-06-04 18:52:14+03:00, monty@mysql.com +27 -27
    Slow_logs was not properly initialized, which could maybe cause extra/lost entries in slow log.
    set_query_id -> mark_used_columns
    Simpler variable usage in pack_row()  (cleanup)
    Moved some variable declartion at start of function for better code readability

  sql/sql_class.h@1.291.3.1, 2006-06-04 18:52:14+03:00, monty@mysql.com +23 -18
    Added enum_mark_columns
    Updated comments
    Renamed dupp_field -> dup_field
    Added virtual function 'can_rollback_data()' to select_insert() to be used in CREATE ... SELECT to optimize use of OPTION_STATUS_NO_TRANS_UPDATE.
    (This fixes a bug in CREATE ... SELECT where we did give wrong warnings when using non transacational tables)

  sql/sql_delete.cc@1.181.2.1, 2006-06-04 18:52:14+03:00, monty@mysql.com +10 -8
    Updates to new handler interface
    Call table->mark_columns_needed_for_delete() to allow us to put additional columns in column usage maps if handler so requires.
    Call table->prepare_for_position() to tell handler that we are going to call ha_position().
    Removed call to free_io_cache(). (io_cache is now removed in ha_reset()).
    Fixed calls to setup_tables()

  sql/sql_do.cc@1.12, 2006-06-04 18:52:14+03:00, monty@mysql.com +1 -1
    Update call to setup_fields()

  sql/sql_handler.cc@1.82.1.1, 2006-06-04 18:52:14+03:00, monty@mysql.com +10 -3
    Tell handler tables to always read all columns.
    Use temporary column map when storing value in field for later index usage

  sql/sql_help.cc@1.53, 2006-06-04 18:52:14+03:00, monty@mysql.com +19 -9
    Makr all used fields to be read
    Update call to setup_fields()

  sql/sql_insert.cc@1.198.4.1, 2006-06-04 18:52:15+03:00, monty@mysql.com +142 -137
    Tell handler we are going to update the auto_increment column
    dupp_field -> dup_field
    Set column usage bits for timestamp field.
    Call table->mark_columns_needed_for_insert() and table->mark_auto_increment_column()
    Removed not used argument from mysql_prepare_insert_check_table().
    
    If we get an duplicate row on insert, change column map to read and write all columns while retrying the operatation.
    This is required by the definition of REPLACE and also ensures that fields that are only part of UPDATE are properly handled.
    This fixed a bug in NDB and REPLACE where REPLACE wrongly copied some column values from the replaced row.
    
    Setup new bitmaps for delayed insert rows
    Remove reseting of next_number_fields as it will be reset on next call to handler_insert()
    
    Fixed usage of thd->options and OPTION_STATUS_NO_TRANS_UPDATE.
    The issue was that one should not to reset this flag as it may be set by a previous statement.
    The way it was now used caused us to loose some warnings and get other wrong warnings when using non transactional tables mixed with transactional.
    I fixed it by introducing 'select_insert::can_rollback_data' to inform send_error() that the given statement can be rolled back (which in case of CREATE TABLE can always be done)
    Don't close tables created with CREATE ... SELECT but keep them in the table cache.
    
    Moved out MY_HOOKS from inside function (better readability)
    
    

  sql/sql_load.cc@1.97.2.1, 2006-06-04 18:52:15+03:00, monty@mysql.com +22 -26
    Update to use new handler and column marking interface
    Update using setup_tables()

  sql/sql_olap.cc@1.23, 2006-06-04 18:52:15+03:00, monty@mysql.com +5 -3
    Update calls to setup_tables
    Use enums instead of constants to setup_fields()

  sql/sql_parse.cc@1.540.9.1, 2006-06-04 18:52:15+03:00, monty@mysql.com +29 -18
    Handle OPTION_KEEP_LOG:
    - Set it on CREATE TEMPORARY TABLE / DROP TABLE
    - Reset it when OPTION_STATUS_NO_TRANS_UPDATE is reset
    - Don't set it for CREATE ... SELECT (this is handled in select_create class)
    Remove reseting of OPTION_STATUS_NO_TRANS_UPDATE in begin_trans() as this should already be reset.
    If in autocommit mode, reset OPTION_KEEP_LOG and OPTION_STATUS_NO_TRANS_UPDATE to not give warnings in future commands

  sql/sql_partition.cc@1.68.4.1, 2006-06-04 18:52:15+03:00, monty@mysql.com +13 -14
    Update walk() usage
    Trivial indentation fixes

  sql/sql_plugin.cc@1.20.2.1, 2006-06-04 18:52:15+03:00, monty@mysql.com +2 -1
    Mark all columns as used for plugins

  sql/sql_prepare.cc@1.169.2.1, 2006-06-04 18:52:15+03:00, monty@mysql.com +6 -5
    Added assert to find out hidden bugs in character_set_client (got an error in debug binary when this not set correctly)
    Updates for new handler interface
    Update calls to setup_fields()
    

  sql/sql_repl.cc@1.154, 2006-06-04 18:52:15+03:00, monty@mysql.com +9 -8
    Indentation fixes

  sql/sql_select.cc@1.399.2.1, 2006-06-04 18:52:15+03:00, monty@mysql.com +144 -112
    Update call to setup_tables() and setup_fields()
    Remove some old disabled code
    Update to new hadler interface
    Indentation cleanups
    Added column bitmaps for temporary tables.
    Remove updating of the removed slots in the Field class
    Added TABLE argument to cp_buffer_from_ref() (To be able to install temporary column maps)
    For internal temporary tables, use handler::write_row(), handler::delete_row() and handler::update_row() instead of handler::ha_xxxx() for faster execution.

  sql/sql_select.h@1.107, 2006-06-04 18:52:15+03:00, monty@mysql.com +16 -7
    Indentaition fixes.
    Install temporary column usage maps when needed
    Added TABLE element to cp_buffer_from_ref()

  sql/sql_show.cc@1.330.2.1, 2006-06-04 18:52:15+03:00, monty@mysql.com +43 -27
    Update to new handler interface
    Mark all columns used for internal tables.
    Style fixes.
    Added support for 'future' ROW_TYPE_PAGES.
    Don't allocate TMP_TABLE_PARAM with calloc. The 'init()' function will initialize the structure properly.

  sql/sql_table.cc@1.331.8.1, 2006-06-04 18:52:15+03:00, monty@mysql.com +51 -50
    Update to new handler interface
    Simple my_snprintf -> strmake()
    Changed some constants to defines
    Don't test for NULL in primary key (as we a couple of line above force the PRIMARY KEY to be NOT NULL)
    Change field->add_index to use field->flags & FIELD_IN_ADD_INDEX
    Mark all columns as used for ALTER TABLE
    Style fixes
    Update call to filesort()

  sql/sql_trigger.h@1.20, 2006-06-04 18:52:16+03:00, monty@mysql.com +5 -1
    Added friend functions to be able to test if triggers exists for table we are going to insert/update or delete in.

  sql/sql_udf.cc@1.65, 2006-06-04 18:52:16+03:00, monty@mysql.com +4 -3
    Mark all columns as used for udf system table.

  sql/sql_union.cc@1.133, 2006-06-04 18:52:16+03:00, monty@mysql.com +5 -5
    Update call to walk()
    Update to new handler interface

  sql/sql_update.cc@1.190.1.1, 2006-06-04 18:52:16+03:00, monty@mysql.com +69 -62
    Remove query_id argument from compare_record()
    Use column bitmaps instead of query_id.
    We can't use compare_records() to skip updates for handlers that returns a partial column set and the read_set doesn't cover all columns in the write set, because compare_record() can't in this case know if a not read column changed value.
    Update call to setup_fields()
    Using separate column read and write sets allows for easier checking of timestamp field was set by statement.
    Removed call to free_io_cache() as this is now done in ha_reset()
    Call table->mark_columns_needed_for_update() and table->prepare_for_position()
    Style fixes

  sql/sql_view.cc@1.92.1.1, 2006-06-04 18:52:16+03:00, monty@mysql.com +8 -9
    Style fixes

  sql/table.cc@1.213.2.1, 2006-06-04 18:52:16+03:00, monty@mysql.com +328 -40
    Remove implicitely include 'errno.h'
    Remove code for building normalized path, as this is now identical to 'path'
    Remove field->fieldnr
    Added update of field->part_of_key_not_clustered()
    Create column bitmaps in TABLE and TABLE_SHARE
    Don't setup a temporary MEM_ROOT object as a thread specific variable for the handler. Instead we send the to-be-used MEMROOT to get_new_handler()
    Update to new handler interface
    Update call to walk()
    Added new functions:
    - st_table::clear_column_bitmaps()
    - st_table::prepare_for_position()
    - st_table::mark_columns_used_by_index()
    - st_table::restore_column_maps_after_mark_index()
    - st_table::mark_columns_used_by_index_no_reset()
    - st_table::mark_auto_increment_column()
    - st_table::mark_columns_needed_for_delete()
    - st_table::mark_columns_needed_for_update()
    - st_table::mark_columns_needed_for_insert()

  sql/table.h@1.139.1.1, 2006-06-04 18:52:16+03:00, monty@mysql.com +74 -3
    Moved column usage bitmaps from handler to TABLE
    Added to TABLE_SHARE all_set and column_bitmap_size
    Added to TABLE merge_keys, bitmap_init_values, def_read_set, def_write_set, tmp_set, read_set and write_set.
    Declared all new table column bitmap functions
    Added TABLE functions column_bitmaps_set(), column_bitmaps_set_no_signal(), use_all_columns() and default_column_bitmaps()
    Added functions: tmp_use_all_columns() and tmp_restore_column_map() to temporarly switch column bitmaps
    Added functions: dbug_tmp_use_all_columns() and dbug_tmp_restore_column_map() to temporarly switch column bitmaps to avoid asserts in Field::store() and Field::val().
    

  sql/tztime.cc@1.36, 2006-06-04 18:52:16+03:00, monty@mysql.com +8 -3
    Mark all columns as used for timezone tables

  storage/archive/ha_archive.cc@1.90.3.1, 2006-06-04 18:52:16+03:00, monty@mysql.com +29 -25
    Update to new handler interface

  storage/archive/ha_archive.h@1.46.2.1, 2006-06-04 18:52:16+03:00, monty@mysql.com +2 -2
    Update to new handler interface

  storage/blackhole/ha_blackhole.cc@1.32.1.1, 2006-06-04 18:52:16+03:00, monty@mysql.com +8 -12
    Update to new handler interface

  storage/blackhole/ha_blackhole.h@1.9, 2006-06-04 18:52:16+03:00, monty@mysql.com +3 -5
    Update to new handler interface
    removed not needed flag HA_DUPP_POS

  storage/csv/ha_tina.cc@1.44.3.1, 2006-06-04 18:52:16+03:00, monty@mysql.com +26 -13
    Update to new handler interface

  storage/csv/ha_tina.h@1.17.1.1, 2006-06-04 18:52:16+03:00, monty@mysql.com +7 -5
    Update to new handler interface

  storage/example/ha_example.cc@1.37.2.1, 2006-06-04 18:52:16+03:00, monty@mysql.com +4 -3
    Update to new handler interface

  storage/example/ha_example.h@1.14, 2006-06-04 18:52:16+03:00, monty@mysql.com +2 -2
    Update to new handler interface

  sql/ha_federated.cc@1.58.2.1, 2006-06-04 18:52:08+03:00, monty@mysql.com +152 -123
    Update to 'newer' table handler interface
    Only read columns that are needed from remote server.
    In case of eq ranges, don't generate two conditions in the WHERE clause
    (this can still be optimized, but would require a bigger code change)
    Use 'simpler to use' XXXX_LEN' macros
    A bit simpler logic in ::write_row() when creating statements.
    In update, only include test of fields actually read.
    (This greatly simplifies the queries sent by the federated engine)
    Similar changes done for delete_row()
    
    
    

  sql/ha_federated.h@1.28.1.1, 2006-06-04 18:52:08+03:00, monty@mysql.com +47 -48
    Update to 'newer' table handler interface
    Changed XXX_LEN macros to use sizeof(...)-1, to simplify usage in ha_federated.cc
    Added HA_PRIMARY_KEY_REQUIRED_FOR_DELETE to tell MySQL to read all primary key columns in case of DELETE

  sql/ha_heap.cc@1.89.3.1, 2006-06-04 18:52:08+03:00, monty@mysql.com +24 -16
    Update to 'newer' table handler interface

  sql/ha_heap.h@1.43.1.1, 2006-06-04 18:52:08+03:00, monty@mysql.com +6 -4
    Update to 'newer' table handler interface

  storage/heap/hp_extra.c@1.8, 2006-06-04 18:52:16+03:00, monty@mysql.com +11 -6
    Added heap_reset() (Required by new handler interface)

  storage/heap/hp_test2.c@1.24, 2006-06-04 18:52:16+03:00, monty@mysql.com +1 -1
    Use heap_reset()

  sql/ha_innodb.cc@1.273.1.1, 2006-06-04 18:52:09+03:00, monty@mysql.com +37 -44
    Update to 'newer' table handler interface
    - Update innobase_create_handler() to new interface
    - Removed HA_NOT_EXACT_COUNT (not needed)
    - Renamed HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
    - Prefixed base status variables with 'stats'
    - Use table column bitmaps instead of ha_get_bit_in_read_set()
    - Added ::reset(), with code from ::extra(HA_EXTRA_RESET)
    - Removed HA_EXTRA_RETRIVE_ALL_COLS and HA_EXTRA_RETRIEVE_PRIMARY_KEY as
      the table->read_set and table->write_set bitmaps now are accurate
    

  sql/ha_innodb.h@1.120.2.1, 2006-06-04 18:52:09+03:00, monty@mysql.com +6 -13
    Update to 'newer' table handler interface
    - table_flags are now ulonglong
    - Added reset() method
    - Removed not needed ha_retrieve_all_cols() and ha_retrieve_all_pk() columns.
    - Made build_template() a class function to be able to easier access class variables

  storage/myisam/ft_boolean_search.c@1.100.1.1, 2006-06-04 18:52:16+03:00, monty@mysql.com +3 -2
    Fixed compiler warning

  sql/ha_myisam.cc@1.177.3.1, 2006-06-04 18:52:09+03:00, monty@mysql.com +30 -26
    Update to 'newer' table handler interface

  sql/ha_myisam.h@1.72.1.1, 2006-06-04 18:52:09+03:00, monty@mysql.com +2 -1
    Update to 'newer' table handler interface

  storage/myisam/mi_extra.c@1.49, 2006-06-04 18:52:16+03:00, monty@mysql.com +33 -23
    Added mi_reset() (Required by new handler interface)

  storage/myisam/mi_search.c@1.62, 2006-06-04 18:52:16+03:00, monty@mysql.com +21 -17
    Fixed DBUG_PRINT messages to use 0x%lx instead of %lx

  storage/myisam/mi_test2.c@1.32, 2006-06-04 18:52:16+03:00, monty@mysql.com +2 -2
    Use mi_reset()

  storage/myisam/myisampack.c@1.54, 2006-06-04 18:52:16+03:00, monty@mysql.com +2 -2
    Use mi_reset()

  sql/ha_myisammrg.cc@1.86.1.1, 2006-06-04 18:52:09+03:00, monty@mysql.com +22 -13
    Update to 'newer' table handler interface

  sql/ha_myisammrg.h@1.43, 2006-06-04 18:52:09+03:00, monty@mysql.com +4 -3
    Update to 'newer' table handler interface

  storage/myisammrg/myrg_extra.c@1.14, 2006-06-04 18:52:16+03:00, monty@mysql.com +23 -3
    Added myrg_reset() (Required by new handler interface)

  unittest/mysys/base64.t.c@1.2.1.1, 2006-06-04 18:52:16+03:00, monty@mysql.com +1 -1
    Include my_global.h
    Don't include implictely include file 'stdlib.h'

ChangeSet@1.2176.1.6, 2006-06-04 17:17:37+04:00, sergefp@mysql.com +3 -0
  BUG#19055: There may exist a SEL_TREE objects with type==KEY and keys[i]==NULL for any i.
  (for example, such objects can be returned from get_mm_parts() for "string_field = int_val).
  Make find_used_partitions_imerge() to handle such SEL_TREE objects.

  mysql-test/r/partition_pruning.result@1.15, 2006-06-04 17:17:31+04:00, sergefp@mysql.com +8 -0
    BUG#19055: testcase

  mysql-test/t/partition_pruning.test@1.13, 2006-06-04 17:17:32+04:00, sergefp@mysql.com +9 -1
    BUG#19055: testcase

  sql/opt_range.cc@1.217.1.2, 2006-06-04 17:17:32+04:00, sergefp@mysql.com +9 -2
    BUG#19055: There may exist a SEL_TREE objects with type==KEY and keys[i]==NULL for any i.
    (for example, such objects can be returned from get_mm_parts() for "string_field = int_val).
    Make find_used_partitions_imerge() to handle such SEL_TREE objects.

ChangeSet@1.2176.1.5, 2006-06-03 18:37:31-04:00, mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
  BUG#19067: Crash for default subpartitioning when altering the table

  mysql-test/r/information_schema_part.result@1.3, 2006-06-03 18:37:26-04:00, mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Bug fix

  sql/partition_element.h@1.8, 2006-06-03 18:37:26-04:00, mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se +11 -15
    Review fixes

  sql/sql_partition.cc@1.70.1.6, 2006-06-03 18:37:27-04:00, mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -2
    Review fixes

ChangeSet@1.1616.2622.5, 2006-06-02 19:15:32-07:00, igor@rurik.mysql.com +1 -0
  Cleanup for the fix of bug 18206.

  sql/opt_sum.cc@1.33.2.9, 2006-06-02 19:15:28-07:00, igor@rurik.mysql.com +0 -4
    Cleanup 

ChangeSet@1.2176.2.2, 2006-06-03 04:03:26+04:00, sergefp@mysql.com +1 -0
  get_[part_]partition_id(): Fix function comments. 

  sql/sql_partition.cc@1.70.1.4, 2006-06-03 04:03:11+04:00, sergefp@mysql.com +10 -6
    get_[part_]partition_id(): Fix function comments. 

ChangeSet@1.1616.2628.1, 2006-06-02 14:14:57-07:00, igor@rurik.mysql.com +5 -0
  Fixed bug #18206.
  The bug report revealed two problems related to min/max optimization:
  1. If the length of a constant key used in a SARGable condition for
  for the MIN/MAX fields is greater than the length of the field an 
  unwanted warning on key truncation is issued;
  2. If MIN/MAX optimization is applied to a partial index, like INDEX(b(4))
  than can lead to returning a wrong result set.

  mysql-test/r/func_group.result@1.22.5.11, 2006-06-02 14:14:52-07:00, igor@rurik.mysql.com +24 -0
    Added test cases for bug #18206.

  mysql-test/t/func_group.test@1.24.1.9, 2006-06-02 14:14:52-07:00, igor@rurik.mysql.com +19 -0
    Added test cases for bug #18206.

  sql/opt_sum.cc@1.33.2.8, 2006-06-02 14:14:52-07:00, igor@rurik.mysql.com +14 -3
    Fixed bug #18206.
    Suppressed the warning about data truncation when store_val_in_field
    was used to store keys for the field used in MIN/MAX optimization.
    Blocked MIN/MAX optimization for partial keys, such as in INDEX(b(4)).

  sql/sql_select.cc@1.216.126.4, 2006-06-02 14:14:52-07:00, igor@rurik.mysql.com +3 -3
    Fixed bug #18206.
    Added a parameter for the function store_val_in_field allowing to
    control setting warnings about data truncation in the function.

  sql/sql_select.h@1.60.1.20, 2006-06-02 14:14:52-07:00, igor@rurik.mysql.com +1 -1
    Fixed bug #18206.
    Added a parameter for the function store_val_in_field allowing to
    control setting warnings about data truncation in the function.

ChangeSet@1.2169.22.1, 2006-06-02 22:21:32+02:00, guilhem@mysql.com +22 -0
  First push for WL#3146 "less locking in auto_increment". It is a 0-real-change patch.
  New prototype for get_auto_increment() (but new arguments not yet used), to be able
  to reserve a finite interval of auto_increment values from cooperating engines.
  A hint on how many values to reserve is found in handler::estimation_rows_to_insert,
  filled by ha_start_bulk_insert(), new wrapper around start_bulk_insert().
  NOTE: this patch changes nothing, for all engines. But it makes the API ready for those
  engines which will want to do reservation.
  More csets will come to complete WL#3146.

  sql/ha_berkeley.cc@1.176.2.1, 2006-06-02 22:21:25+02:00, guilhem@mysql.com +15 -2
    update to new prototype of get_auto_increment

  sql/ha_berkeley.h@1.80.1.1, 2006-06-02 22:21:25+02:00, guilhem@mysql.com +4 -1
    update to new prototype of get_auto_increment

  sql/ha_ndbcluster.cc@1.309.3.1, 2006-06-02 22:21:26+02:00, guilhem@mysql.com +10 -3
    update to new prototype of get_auto_increment

  sql/ha_ndbcluster.h@1.135.1.1, 2006-06-02 22:21:26+02:00, guilhem@mysql.com +5 -2
    update to new prototype of get_auto_increment

  sql/ha_partition.cc@1.50.1.1, 2006-06-02 22:21:26+02:00, guilhem@mysql.com +47 -8
    update to new prototype of get_auto_increment

  sql/ha_partition.h@1.18, 2006-06-02 22:21:26+02:00, guilhem@mysql.com +5 -1
    update to new prototype of get_auto_increment

  sql/handler.cc@1.232.1.1, 2006-06-02 22:21:26+02:00, guilhem@mysql.com +109 -10
    new prototype of get_auto_increment, comments, preparation for when the MySQL layer is capable
    of getting finite auto_increment intervals from cooperating engines.

  sql/handler.h@1.210.1.1, 2006-06-02 22:21:26+02:00, guilhem@mysql.com +19 -4
    a wrapper around start_bulk_insert(): ha_bulk_insert(), which stores the argument (number
    of rows expected for insertion) into a member of handler: estimation_rows_to_insert.
    This member will soon be used to decide how much auto_increment values we want to reserve
    from cooperating engines.
    New prototype for get_auto_increment, preparing for cooperating engines to reserve finite auto_increment
    intervals.
    release_auto_increment() will be used by the MySQL layer to inform the engine that it has
    not used all of the interval (engine can reclaim it).

  sql/log.cc@1.208.1.1, 2006-06-02 22:21:26+02:00, guilhem@mysql.com +5 -0
    note for the future

  sql/log_event.cc@1.222.2.1, 2006-06-02 22:21:26+02:00, guilhem@mysql.com +2 -2
    name of wrapper

  sql/sql_insert.cc@1.198.3.1, 2006-06-02 22:21:26+02:00, guilhem@mysql.com +13 -8
    name of wrapper. When done with inserting, return unused auto_inc values to engine.

  sql/sql_load.cc@1.97.1.1, 2006-06-02 22:21:26+02:00, guilhem@mysql.com +5 -3
    name of wrapper. When done with inserting, return unused auto_inc values to engine.

  sql/sql_select.cc@1.407.1.1, 2006-06-02 22:21:26+02:00, guilhem@mysql.com +1 -1
    name of wrapper

  sql/sql_table.cc@1.335.2.1, 2006-06-02 22:21:26+02:00, guilhem@mysql.com +2 -2
    name of wrapper

  storage/archive/ha_archive.cc@1.91.2.1, 2006-06-02 22:21:26+02:00, guilhem@mysql.com +6 -2
    update to new prototype of get_auto_increment.
    Archive reserves only one value (Archive's god - Brian - told me that's the truth).

  storage/archive/ha_archive.h@1.46.1.1, 2006-06-02 22:21:26+02:00, guilhem@mysql.com +4 -1
    update to new prototype of get_auto_increment()

  sql/ha_heap.cc@1.89.2.1, 2006-06-02 22:21:25+02:00, guilhem@mysql.com +7 -2
    update to new prototype of get_auto_increment

  sql/ha_heap.h@1.44, 2006-06-02 22:21:25+02:00, guilhem@mysql.com +4 -1
    update to new prototype of get_auto_increment

  sql/ha_innodb.cc@1.274.3.1, 2006-06-02 22:21:25+02:00, guilhem@mysql.com +16 -9
    update to new prototype of get_auto_increment

  sql/ha_innodb.h@1.120.1.1, 2006-06-02 22:21:25+02:00, guilhem@mysql.com +4 -1
    update to new prototype of get_auto_increment

  sql/ha_myisam.cc@1.180.1.1, 2006-06-02 22:21:26+02:00, guilhem@mysql.com +16 -3
    update to new prototype of get_auto_increment

  sql/ha_myisam.h@1.73, 2006-06-02 22:21:26+02:00, guilhem@mysql.com +4 -1
    update to new prototype of get_auto_increment

ChangeSet@1.1810.1763.1, 2006-06-02 22:03:39+03:00, anjuta@arthur.local +2 -0
  BUG#19363: mysql --no_pager makes core dump.
  The problem was missing break; operator.

  BitKeeper/etc/ignore@1.210.2.1, 2006-06-02 22:03:35+03:00, anjuta@arthur.local +1 -0
    Added client/#mysql.cc# to the ignore list

  client/mysql.cc@1.199.5.1, 2006-06-02 22:03:35+03:00, anjuta@arthur.local +1 -0
    Fixed bug #19363: mysql --no_pager makes core dump. 
    There was break; missing in the case statement.

ChangeSet@1.2169.21.2, 2006-06-02 20:03:39+02:00, serg@serg.mylan +1 -0
  don't assume bdb is enabled in the ps_1general.test

  mysql-test/t/ps_1general.test@1.30, 2006-06-02 20:02:26+02:00, serg@serg.mylan +4 -2
    don't assume bdb is enabled in the ps_1general.test

ChangeSet@1.1616.2611.2, 2006-06-02 22:33:22+05:00, holyfoot@deer.(none) +2 -0
  bug #19983 (mysql_client_test_embedded fails)

  libmysqld/lib_sql.cc@1.75.8.1, 2006-06-02 22:32:37+05:00, holyfoot@mysql.com +6 -2
    field length counting fixed

  tests/mysql_client_test.c@1.51.31.1, 2006-06-02 22:32:37+05:00, holyfoot@mysql.com +2 -0
    this test is not for embedded server as it tests kill command

ChangeSet@1.1810.1744.14, 2006-06-02 18:02:22+03:00, gkodinov@mysql.com +2 -0
  Removed duplicate tests from select.test

  mysql-test/r/select.result@1.121.2.3, 2006-06-02 18:02:17+03:00, gkodinov@mysql.com +0 -101
    Removed duplicate tests from select.test

  mysql-test/t/select.test@1.101.1.2, 2006-06-02 18:02:17+03:00, gkodinov@mysql.com +0 -94
    Removed duplicate tests from select.test

ChangeSet@1.1810.1744.13, 2006-06-02 17:22:21+03:00, gkodinov@mysql.com +1 -0
  bad merge fixed for b4981.

  mysql-test/r/select.result@1.121.2.2, 2006-06-02 17:22:15+03:00, gkodinov@mysql.com +14 -14
    bad merge fixed for b4981.

ChangeSet@1.2119.345.98, 2006-06-02 15:54:09+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#20185
    update test prg + fix typo

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.117, 2006-06-02 15:54:06+02:00, jonas@perch.ndb.mysql.com +1 -1
    compile error

  storage/ndb/test/ndbapi/testNodeRestart.cpp@1.28, 2006-06-02 15:54:06+02:00, jonas@perch.ndb.mysql.com +11 -2
    upgrade test prg not to kill master node
      as master take over wont work with all these dealyed GCP_PREPARE

ChangeSet@1.2154.43.2, 2006-06-02 15:47:06+02:00, mats@mysql.com +1 -0
  Bug#19995 (Extreneous table maps generated for statements that does not generate rows):
  Comment change.

  sql/handler.cc@1.231.2.2, 2006-06-02 15:46:59+02:00, mats@mysql.com +17 -6
    Comment change

ChangeSet@1.2119.345.97, 2006-06-02 15:22:49+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#20185
    second try - handle CS_PREPARE_TO_COMMIT explicitly

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.116, 2006-06-02 15:22:46+02:00, jonas@perch.ndb.mysql.com +11 -6
    handle CS_PREPARE_TO_COMMIT explictly

ChangeSet@1.1616.2622.3, 2006-06-02 12:04:03+03:00, gkodinov@mysql.com +3 -0
  Bug #4981: 4.x and 5.x produce non-optimal execution path, 
          3.23 regression test failure
  
  The member SEL_ARG::min_flag was not initialized, 
  due to which the condition for no GEOM_FLAG in function 
  key_or did not choose "Range checked for each record" as 
  the correct access method.

  mysql-test/r/select.result@1.34.9.1, 2006-06-02 12:03:59+03:00, gkodinov@mysql.com +14 -0
    testcase for 'Range checked' access method

  mysql-test/t/select.test@1.28.7.1, 2006-06-02 12:03:59+03:00, gkodinov@mysql.com +14 -0
    testcase for 'Range checked' access method

  sql/opt_range.cc@1.98.2.47, 2006-06-02 12:03:59+03:00, gkodinov@mysql.com +1 -1
    All of the class members initialized

ChangeSet@1.1810.1762.5, 2006-06-02 09:40:34+02:00, mskold@mysql.com +1 -0
  Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table

  sql/ha_ndbcluster.cc@1.175.1.76, 2006-06-02 09:40:05+02:00, mskold@mysql.com +1 -1
    Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table

ChangeSet@1.1616.2627.1, 2006-06-02 07:26:45+02:00, mskold@mysql.com +4 -0
  Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table

  mysql-test/r/ndb_truncate.result@1.2, 2006-06-02 07:25:57+02:00, mskold@mysql.com +16 -7
    Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table

  mysql-test/t/ndb_truncate.test@1.4, 2006-06-02 07:25:57+02:00, mskold@mysql.com +14 -9
    Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table

  sql/ha_ndbcluster.cc@1.114.3.66, 2006-06-02 07:25:57+02:00, mskold@mysql.com +6 -0
    Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table

  sql/handler.h@1.89.19.12, 2006-06-02 07:25:57+02:00, mskold@mysql.com +1 -2
    Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table

ChangeSet@1.1810.1762.3, 2006-06-01 16:51:19-07:00, igor@rurik.mysql.com +2 -0
  Post-merge fixes

  mysql-test/r/ssl.result@1.3, 2006-06-01 16:51:06-07:00, igor@rurik.mysql.com +2 -2
    Post-merge fixes

  mysql-test/r/ssl_compress.result@1.3, 2006-06-01 16:51:06-07:00, igor@rurik.mysql.com +2 -2
    Post-merge fixes

ChangeSet@1.2169.19.2, 2006-06-01 23:59:34+02:00, serg@serg.mylan +2 -0
  second patch for make distcheck

  sql/ha_innodb.cc@1.275.1.1, 2006-06-01 23:59:09+02:00, serg@serg.mylan +4 -0
    second patch for make distcheck

  unittest/Makefile.am@1.9, 2006-06-01 23:59:09+02:00, serg@serg.mylan +2 -1
    second patch for make distcheck

ChangeSet@1.2154.46.1, 2006-06-01 21:47:15+03:00, bell@sanja.is.com.ua +15 -0
  interface for transaction log management added to handlerton
  iterators creation interface added to handlerton

  sql/ha_berkeley.cc@1.176.1.1, 2006-06-01 21:47:08+03:00, bell@sanja.is.com.ua +3 -1
    added new methods

  sql/ha_ndbcluster.cc@1.307.3.1, 2006-06-01 21:47:08+03:00, bell@sanja.is.com.ua +3 -1
    added new methods

  sql/ha_partition.cc@1.49.2.1, 2006-06-01 21:47:08+03:00, bell@sanja.is.com.ua +3 -1
    added new methods

  sql/handler.cc@1.231.3.1, 2006-06-01 21:47:08+03:00, bell@sanja.is.com.ua +185 -4
    added new methods
    spelling fixed
    examples of functions for new interface added

  sql/handler.h@1.206.3.1, 2006-06-01 21:47:09+03:00, bell@sanja.is.com.ua +83 -0
    transaction logs management interface added
    general iterator creatioin interface added

  sql/log.cc@1.204.6.1, 2006-06-01 21:47:09+03:00, bell@sanja.is.com.ua +3 -1
    added new methods

  storage/archive/ha_archive.cc@1.90.2.1, 2006-06-01 21:47:09+03:00, bell@sanja.is.com.ua +3 -2
    added new methods

  storage/blackhole/ha_blackhole.cc@1.33.1.1, 2006-06-01 21:47:09+03:00, bell@sanja.is.com.ua +3 -1
    added new methods

  storage/csv/ha_tina.cc@1.45.1.1, 2006-06-01 21:47:09+03:00, bell@sanja.is.com.ua +5 -2
    added new methods

  storage/example/ha_example.cc@1.37.1.1, 2006-06-01 21:47:09+03:00, bell@sanja.is.com.ua +5 -3
    added new methods

  sql/ha_federated.cc@1.58.1.1, 2006-06-01 21:47:08+03:00, bell@sanja.is.com.ua +3 -1
    added new methods

  sql/ha_heap.cc@1.89.1.1, 2006-06-01 21:47:08+03:00, bell@sanja.is.com.ua +3 -1
    added new methods

  sql/ha_innodb.cc@1.274.2.1, 2006-06-01 21:47:08+03:00, bell@sanja.is.com.ua +3 -1
    added new methods

  sql/ha_myisam.cc@1.177.1.5, 2006-06-01 21:47:08+03:00, bell@sanja.is.com.ua +3 -1
    added new methods

  sql/ha_myisammrg.cc@1.87.1.1, 2006-06-01 21:47:08+03:00, bell@sanja.is.com.ua +3 -1
    added new methods

ChangeSet@1.2169.19.1, 2006-06-01 18:58:54+02:00, serg@serg.mylan +1 -0
  fixing make distcheck again. fix 1.

  unittest/Makefile.am@1.8, 2006-06-01 18:58:39+02:00, serg@serg.mylan +1 -1
    fixing make distcheck again. fix 1.

ChangeSet@1.2169.7.8, 2006-06-01 16:26:16+03:00, jani@ua141d10.elisa.omakaista.fi +1 -0
  In prepare_view_securety_context() the sql_command came in wrong.
  If the first part was SHOW and second part SELECT, it would have
  thought that the command was SELECT, although the first part of
  it was SHOW. It would then fail later.
  
  Thus we need to set thd->lex to old_lex (first part) here before going
  in to prepare_security().

  sql/sql_view.cc@1.93, 2006-06-01 16:26:09+03:00, jani@ua141d10.elisa.omakaista.fi +3 -1
    In prepare_view_securety_context() the sql_command came in wrong.
    If the first part was SHOW and second part SELECT, it would have
    thought that the command was SELECT, although the first part of
    it was SHOW. It would then fail later.
    
    Thus we need to set thd->lex to old_lex (first part) here before going
    in to prepare_security().

ChangeSet@1.1810.1698.42, 2006-06-01 18:08:57+05:00, svoj@may.pils.ru +1 -0
  BUG#19192 - CHECK TABLE EXTENDED / REPAIR TABLE show no errors.
              ALTER TABLE crashes
  Executing fast alter table (one that doesn't need to copy data)
  on tables created by mysql versions prior to 4.0.25 could result
  in posterior server crash when accessing these tables.
  
  There was a bug prior to mysql-4.0.25. Number of null fields was
  calculated incorrectly. As a result frm and data files gets out of
  sync after fast alter table. There is no way to determine by which
  mysql version (in 4.0 and 4.1 branches) table was created, thus we
  disable fast alter table for all tables created by mysql versions
  prior to 5.0 branch.
  See BUG#6236.

  sql/sql_table.cc@1.239.1.74, 2006-06-01 18:08:51+05:00, svoj@may.pils.ru +9 -0
    There was a bug prior to mysql-4.0.25. Number of null fields was
    calculated incorrectly. As a result frm and data files gets out of
    sync after fast alter table. There is no way to determine by which
    mysql version (in 4.0 and 4.1 branches) table was created, thus we
    disable fast alter table for all tables created by mysql versions
    prior to 5.0 branch.
    See BUG#6236.

ChangeSet@1.2169.17.1, 2006-06-01 14:51:58+02:00, tomas@poseidon.ndb.mysql.com +3 -0
  Bug #18483 Cannot create table with FK constraint
  - remove error set for auto partitioned tables

  mysql-test/r/ndb_basic.result@1.43, 2006-06-01 14:51:48+02:00, tomas@poseidon.ndb.mysql.com +8 -0
    Bug #18483 Cannot create table with FK constraint
    - remove error set for auto partitioned tables

  mysql-test/t/ndb_basic.test@1.43, 2006-06-01 14:51:48+02:00, tomas@poseidon.ndb.mysql.com +14 -0
    Bug #18483 Cannot create table with FK constraint
    - remove error set for auto partitioned tables

  sql/sql_table.cc@1.338, 2006-06-01 14:51:48+02:00, tomas@poseidon.ndb.mysql.com +2 -1
    Bug #18483 Cannot create table with FK constraint
    - remove error set for auto partitioned tables

ChangeSet@1.2119.345.96, 2006-06-01 14:36:53+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - acc -
    add assertion

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@1.72, 2006-06-01 14:36:49+02:00, jonas@perch.ndb.mysql.com +1 -0
    Add assertion that we dont try to read key from lqh on scan (as it does not have key...)

ChangeSet@1.2119.345.95, 2006-06-01 14:34:46+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#20197
    also close scan which are in "delivered" state, as it's impossible to release locks afterwards

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.115, 2006-06-01 14:34:43+02:00, jonas@perch.ndb.mysql.com +12 -0
    also close scan which are in "delivered" state, as it's impossible to release locks afterwards

ChangeSet@1.1616.2626.1, 2006-06-01 17:06:42+05:00, holyfoot@deer.(none) +8 -0
  bug #16017 (memory leaks in embedded server)
  
  There actually was 3 different problems -
  hash_user_connections wasn't cleaned
  one strdupped database name wasn't freed
  and stmt->mem_root wasn't cleaned as it was
  replased with mysql->field_alloc for result
  For the last one - i made the library using stmt's
  fields to store result if it's the case.

  include/mysql.h@1.135.1.8, 2006-06-01 17:05:55+05:00, holyfoot@mysql.com +14 -3
    statement pointer added to the advanced_command to be checked in
    embedded server

  include/sql_common.h@1.15, 2006-06-01 17:05:55+05:00, holyfoot@mysql.com +2 -1
    stmt added to the cli_advanced_command interface

  libmysql/libmysql.c@1.156.1.147, 2006-06-01 17:05:55+05:00, holyfoot@mysql.com +7 -6
    stmt pointer now sent to advanced_command

  libmysqld/embedded_priv.h@1.12.2.1, 2006-06-01 17:05:55+05:00, holyfoot@mysql.com +3 -3
    it's enough to send database name to check_embedded_connection

  libmysqld/lib_sql.cc@1.75.1.51, 2006-06-01 17:05:55+05:00, holyfoot@mysql.com +31 -22
    Now we store result directly in the MYSQL_STMT structure to
    avoid extra copying

  libmysqld/libmysqld.c@1.64.1.2, 2006-06-01 17:05:55+05:00, holyfoot@mysql.com +3 -6
    it's enough to only send database pointer to check_embedded_connection

  sql-common/client.c@1.46.1.43, 2006-06-01 17:05:55+05:00, holyfoot@mysql.com +2 -1
    stmt fake attribute added to cli_advanced_command

  sql/sql_parse.cc@1.271.124.1, 2006-06-01 17:05:55+05:00, holyfoot@mysql.com +12 -6
    hash_user_connections isn't used if no access checks compiled

ChangeSet@1.2154.8.16, 2006-06-01 13:20:34+02:00, msvensson@shellback.(none) +1 -0
  Correct path for ndbd log file

  mysql-test/mysql-test-run.pl@1.114.2.8, 2006-06-01 13:20:27+02:00, msvensson@shellback.(none) +1 -1
    Correct path for ndbd log file

ChangeSet@1.2154.8.15, 2006-06-01 13:14:09+02:00, msvensson@shellback.(none) +2 -0
  Don't send port for ndb_mgmd to mtr_check_stop_servers. As it's not being shutdown by "ndb_mgm shutdown" it's no idea to wait for it to stop listening to port. Just make sure it's being killed.

  mysql-test/lib/mtr_process.pl@1.37, 2006-06-01 13:14:01+02:00, msvensson@shellback.(none) +1 -2
    Don't send port for ndb_mgmd to mtr_check_stop_servers.

  mysql-test/mysql-test-run.pl@1.114.2.7, 2006-06-01 13:14:01+02:00, msvensson@shellback.(none) +3 -6
    Don't send port for ndb_mgmd to mtr_check_stop_servers.

ChangeSet@1.2169.2.12, 2006-06-01 12:59:39+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  this should not occur now after some other fixes w.r.t LOCK_open handeling in ndb and binlog

  mysql-test/t/disabled.def@1.162, 2006-06-01 12:59:31+02:00, tomas@poseidon.ndb.mysql.com +1 -1
    this should not occur now after some other fixes w.r.t LOCK_open handeling in ndb and binlog

ChangeSet@1.2154.8.14, 2006-06-01 12:41:57+02:00, msvensson@shellback.(none) +2 -0
  Update result

  mysql-test/r/rpl_insert_id_pk.result@1.1.1.1, 2006-06-01 12:41:49+02:00, msvensson@shellback.(none) +1 -0
    Update result

  mysql-test/r/rpl_row_sp006_InnoDB.result@1.2, 2006-06-01 12:41:49+02:00, msvensson@shellback.(none) +1 -0
    Update result

ChangeSet@1.1810.1761.1, 2006-06-01 12:32:35+02:00, msvensson@shellback.(none) +1 -0
  Add define YASSL_PREFIX when compiling yassl

  extra/yassl/yassl.vcproj@1.2, 2006-06-01 12:32:30+02:00, msvensson@shellback.(none) +2 -2
    Add define YASSL_PREFIX when compiling yassl

ChangeSet@1.2169.15.1, 2006-06-01 12:25:47+02:00, serg@serg.mylan +22 -0
  unittest:
    rename *.t* to *-t* to be automake-friendly
    simplify Makefiles
  test_atomic.c:
    move to unittest, add GPL comment, fix warnings, convert to tap framework.
  configure:
    remove custom tests for available types, use AC_CHECK_TYPE instead
  x86-gcc.h:
    fix gcc -ansi errors while maintaining readability
  ignore:
    added *-t

  BitKeeper/etc/ignore@1.243, 2006-06-01 12:21:24+02:00, serg@serg.mylan +1 -0
    added *-t

  config/ac-macros/misc.m4@1.14, 2006-06-01 12:23:09+02:00, serg@serg.mylan +0 -97
    remove custom AC_TRY_RUN tests for available types, use AC_CHECK_TYPE instead

  configure.in@1.356.1.2, 2006-06-01 12:23:09+02:00, serg@serg.mylan +13 -41
    remove custom tests for available types, use AC_CHECK_TYPE instead

  include/atomic/x86-gcc.h@1.2, 2006-06-01 12:23:09+02:00, serg@serg.mylan +3 -0
    fix gcc -ansi errors while maintaining readability

  include/my_global.h@1.134, 2006-06-01 12:23:09+02:00, serg@serg.mylan +26 -12
    remove custom tests for available types, use AC_CHECK_TYPE instead

  include/my_sys.h@1.198, 2006-06-01 12:23:10+02:00, serg@serg.mylan +3 -2
    add missing declaration

  mysys/Makefile.am@1.80, 2006-06-01 12:23:10+02:00, serg@serg.mylan +0 -1
    move test_atomic to unittest

  unittest/Makefile.am@1.7, 2006-06-01 12:23:10+02:00, serg@serg.mylan +6 -19
    simplifications, correct permissions in chmod

  unittest/README.txt@1.3, 2006-06-01 12:23:10+02:00, serg@serg.mylan +13 -10
    rename *.t* to *-t* to be automake-friendly

  unittest/examples/Makefile.am@1.6, 2006-06-01 12:23:10+02:00, serg@serg.mylan +1 -10
    rename *.t* to *-t* to be automake-friendly
    simplify Makefile

  unittest/examples/no_plan-t.c@1.3, 2006-06-01 10:14:54+02:00, serg@serg.mylan +0 -0
    Rename: unittest/examples/no_plan.t.c -> unittest/examples/no_plan-t.c

  unittest/examples/simple-t.c@1.2, 2006-06-01 10:15:04+02:00, serg@serg.mylan +0 -0
    Rename: unittest/examples/simple.t.c -> unittest/examples/simple-t.c

  unittest/examples/skip-t.c@1.3, 2006-06-01 10:15:10+02:00, serg@serg.mylan +0 -0
    Rename: unittest/examples/skip.t.c -> unittest/examples/skip-t.c

  unittest/examples/skip_all-t.c@1.4, 2006-06-01 10:15:19+02:00, serg@serg.mylan +0 -0
    Rename: unittest/examples/skip_all.t.c -> unittest/examples/skip_all-t.c

  unittest/examples/todo-t.c@1.3, 2006-06-01 10:15:25+02:00, serg@serg.mylan +0 -0
    Rename: unittest/examples/todo.t.c -> unittest/examples/todo-t.c

  unittest/mysys/Makefile.am@1.5, 2006-06-01 12:23:10+02:00, serg@serg.mylan +1 -5
    rename *.t* to *-t* to be automake-friendly
    simplify Makefile

  unittest/mysys/base64-t.c@1.3, 2006-06-01 10:14:14+02:00, serg@serg.mylan +0 -0
    Rename: unittest/mysys/base64.t.c -> unittest/mysys/base64-t.c

  unittest/mysys/bitmap-t.c@1.4, 2006-06-01 10:14:22+02:00, serg@serg.mylan +0 -0
    Rename: unittest/mysys/bitmap.t.c -> unittest/mysys/bitmap-t.c

  unittest/mysys/my_atomic-t.c@1.3, 2006-06-01 12:23:10+02:00, serg@serg.mylan +29 -13
    move mysys/test_atomic.c to unittest, add GPL comment, fix warnings,
    convert to tap framework.

  unittest/mysys/my_atomic-t.c@1.2, 2006-06-01 10:07:29+02:00, serg@serg.mylan +0 -0
    Rename: mysys/test_atomic.c -> unittest/mysys/my_atomic-t.c

  unittest/mytap/t/Makefile.am@1.7, 2006-06-01 12:23:10+02:00, serg@serg.mylan +1 -4
    rename *.t* to *-t* to be automake-friendly
    simplify Makefile

  unittest/mytap/t/basic-t.c@1.5, 2006-06-01 10:14:38+02:00, serg@serg.mylan +0 -0
    Rename: unittest/mytap/t/basic.t.c -> unittest/mytap/t/basic-t.c

  unittest/unit.pl@1.4, 2006-06-01 12:23:10+02:00, serg@serg.mylan +1 -1
    rename *.t* to *-t* to be automake-friendly

ChangeSet@1.2119.602.1, 2006-06-01 11:53:27+02:00, mats@mysql.com +38 -0
  Bug#19066 (DELETE FROM inconsistency for NDB):
  Under row-based replication, DELETE FROM will now always be
  replicated as individual row deletions, while TRUNCATE TABLE will
  always be replicated as a statement.

  mysql-test/extra/rpl_tests/rpl_ddl.test@1.9.1.1, 2006-06-01 11:53:08+02:00, mats@mysql.com +3 -7
    Using --echo instead of SELECT to print message.

  mysql-test/extra/rpl_tests/rpl_truncate.test@1.1, 2006-06-01 11:53:11+02:00, mats@mysql.com +36 -0
    New BitKeeper file ``mysql-test/extra/rpl_tests/rpl_truncate.test''

  mysql-test/extra/rpl_tests/rpl_truncate.test@1.0, 2006-06-01 11:53:11+02:00, mats@mysql.com +0 -0
    BitKeeper file /home/bk/b19066-mysql-5.1-new/mysql-test/extra/rpl_tests/rpl_truncate.test

  mysql-test/extra/rpl_tests/rpl_truncate_helper.inc@1.1, 2006-06-01 11:53:11+02:00, mats@mysql.com +40 -0
    New BitKeeper file ``mysql-test/extra/rpl_tests/rpl_truncate_helper.inc''

  mysql-test/extra/rpl_tests/rpl_truncate_helper.inc@1.0, 2006-06-01 11:53:11+02:00, mats@mysql.com +0 -0
    BitKeeper file /home/bk/b19066-mysql-5.1-new/mysql-test/extra/rpl_tests/rpl_truncate_helper.inc

  mysql-test/r/binlog_row_mix_innodb_myisam.result@1.7.1.1, 2006-06-01 11:53:08+02:00, mats@mysql.com +20 -20
    Result change.

  mysql-test/r/federated.result@1.29, 2006-06-01 11:53:08+02:00, mats@mysql.com +3 -3
    Result change.

  mysql-test/r/range.result@1.45, 2006-06-01 11:53:08+02:00, mats@mysql.com +1 -1
    Result change.

  mysql-test/r/rpl_sp_effects.result@1.5, 2006-06-01 11:53:08+02:00, mats@mysql.com +3 -3
    Result change.

  mysql-test/r/rpl_truncate_2myisam.result@1.1, 2006-06-01 11:53:13+02:00, mats@mysql.com +202 -0
    New BitKeeper file ``mysql-test/r/rpl_truncate_2myisam.result''

  mysql-test/r/rpl_truncate_2myisam.result@1.0, 2006-06-01 11:53:13+02:00, mats@mysql.com +0 -0
    BitKeeper file /home/bk/b19066-mysql-5.1-new/mysql-test/r/rpl_truncate_2myisam.result

  mysql-test/r/rpl_truncate_3innodb.result@1.1, 2006-06-01 11:53:13+02:00, mats@mysql.com +214 -0
    New BitKeeper file ``mysql-test/r/rpl_truncate_3innodb.result''

  mysql-test/r/rpl_truncate_3innodb.result@1.0, 2006-06-01 11:53:13+02:00, mats@mysql.com +0 -0
    BitKeeper file /home/bk/b19066-mysql-5.1-new/mysql-test/r/rpl_truncate_3innodb.result

  mysql-test/r/rpl_truncate_7ndb.result@1.1, 2006-06-01 11:53:14+02:00, mats@mysql.com +105 -0
    New BitKeeper file ``mysql-test/r/rpl_truncate_7ndb.result''

  mysql-test/r/rpl_truncate_7ndb.result@1.0, 2006-06-01 11:53:14+02:00, mats@mysql.com +0 -0
    BitKeeper file /home/bk/b19066-mysql-5.1-new/mysql-test/r/rpl_truncate_7ndb.result

  mysql-test/r/show_check.result@1.93.1.1, 2006-06-01 11:53:08+02:00, mats@mysql.com +3 -3
    Result change.

  mysql-test/r/sp-error.result@1.108.1.1, 2006-06-01 11:53:08+02:00, mats@mysql.com +3 -3
    Result change.

  mysql-test/r/sp.result@1.204.2.1, 2006-06-01 11:53:08+02:00, mats@mysql.com +54 -54
    Result change.

  mysql-test/r/timezone2.result@1.16, 2006-06-01 11:53:08+02:00, mats@mysql.com +5 -5
    Result change.

  mysql-test/r/trigger-grant.result@1.6.1.1, 2006-06-01 11:53:09+02:00, mats@mysql.com +2 -2
    Result change.

  mysql-test/r/type_datetime.result@1.32, 2006-06-01 11:53:09+02:00, mats@mysql.com +1 -1
    Result change.

  mysql-test/r/type_ranges.result@1.39.1.1, 2006-06-01 11:53:09+02:00, mats@mysql.com +1 -1
    Result change.

  mysql-test/r/type_timestamp.result@1.32, 2006-06-01 11:53:09+02:00, mats@mysql.com +4 -4
    Result change.

  mysql-test/r/view.result@1.158.1.1, 2006-06-01 11:53:09+02:00, mats@mysql.com +5 -5
    Result change.

  mysql-test/t/archive.test@1.20.1.1, 2006-06-01 11:53:09+02:00, mats@mysql.com +1 -0
    Test contain statements that only works for statement-based logging.

  mysql-test/t/disabled.def@1.152.4.1, 2006-06-01 11:53:09+02:00, mats@mysql.com +1 -0
    Disabling test due to reported bug.

  mysql-test/t/federated.test@1.25, 2006-06-01 11:53:09+02:00, mats@mysql.com +3 -3
    Adding ORDER BY clause to SELECT statements

  mysql-test/t/range.test@1.38, 2006-06-01 11:53:09+02:00, mats@mysql.com +1 -1
    Adding ORDER BY clause to SELECT (sub-)statement

  mysql-test/t/rpl_sp_effects.test@1.7, 2006-06-01 11:53:10+02:00, mats@mysql.com +2 -2
    Adding ORDER BY clause to SELECT statement.

  mysql-test/t/rpl_truncate_2myisam.test@1.1, 2006-06-01 11:53:14+02:00, mats@mysql.com +4 -0
    New BitKeeper file ``mysql-test/t/rpl_truncate_2myisam.test''

  mysql-test/t/rpl_truncate_2myisam.test@1.0, 2006-06-01 11:53:14+02:00, mats@mysql.com +0 -0
    BitKeeper file /home/bk/b19066-mysql-5.1-new/mysql-test/t/rpl_truncate_2myisam.test

  mysql-test/t/rpl_truncate_3innodb.test@1.1, 2006-06-01 11:53:14+02:00, mats@mysql.com +5 -0
    New BitKeeper file ``mysql-test/t/rpl_truncate_3innodb.test''

  mysql-test/t/rpl_truncate_3innodb.test@1.0, 2006-06-01 11:53:14+02:00, mats@mysql.com +0 -0
    BitKeeper file /home/bk/b19066-mysql-5.1-new/mysql-test/t/rpl_truncate_3innodb.test

  mysql-test/t/rpl_truncate_7ndb.test@1.1, 2006-06-01 11:53:15+02:00, mats@mysql.com +64 -0
    New BitKeeper file ``mysql-test/t/rpl_truncate_7ndb.test''

  mysql-test/t/rpl_truncate_7ndb.test@1.0, 2006-06-01 11:53:15+02:00, mats@mysql.com +0 -0
    BitKeeper file /home/bk/b19066-mysql-5.1-new/mysql-test/t/rpl_truncate_7ndb.test

  mysql-test/t/show_check.test@1.64, 2006-06-01 11:53:10+02:00, mats@mysql.com +3 -3
    Replacing DELETE FROM without WHERE with TRUNCATE TABLE.

  mysql-test/t/sp-error.test@1.108, 2006-06-01 11:53:10+02:00, mats@mysql.com +3 -3
    Replacing DELETE FROM without WHERE with TRUNCATE TABLE.

  mysql-test/t/sp.test@1.188.2.1, 2006-06-01 11:53:10+02:00, mats@mysql.com +43 -44
    Adding ORDER BY clause to SELECT statement.

  mysql-test/t/timezone2.test@1.11, 2006-06-01 11:53:10+02:00, mats@mysql.com +5 -5
    Replacing DELETE FROM without WHERE with TRUNCATE TABLE.

  mysql-test/t/trigger-grant.test@1.9.1.1, 2006-06-01 11:53:10+02:00, mats@mysql.com +2 -2
    Replacing DELETE FROM without WHERE with TRUNCATE TABLE.

  mysql-test/t/type_datetime.test@1.19, 2006-06-01 11:53:10+02:00, mats@mysql.com +1 -1
    Adding ORDER BY clause to SELECT statement.

  mysql-test/t/type_ranges.test@1.16, 2006-06-01 11:53:10+02:00, mats@mysql.com +1 -1
    Replacing DELETE FROM without WHERE with TRUNCATE TABLE.

  mysql-test/t/type_timestamp.test@1.27, 2006-06-01 11:53:10+02:00, mats@mysql.com +4 -4
    Replacing DELETE FROM without WHERE with TRUNCATE TABLE.

  mysql-test/t/view.test@1.145.1.1, 2006-06-01 11:53:10+02:00, mats@mysql.com +5 -5
    Adding ORDER BY clause to SELECT statement.

  sql/sql_class.h@1.291.2.1, 2006-06-01 11:53:10+02:00, mats@mysql.com +4 -0
    Adding member function to set replication to statement-based.

  sql/sql_delete.cc@1.181.1.1, 2006-06-01 11:53:11+02:00, mats@mysql.com +8 -28
    When row-based replication is used, DELETE FROM will always delete the
    contents of the table row-by-row and not use delete_all_rows().

ChangeSet@1.1810.1760.1, 2006-06-01 12:34:44+03:00, anjuta@arthur.local +7 -0
  Fixed Bug#19479:mysqldump creates invalid dump.
  Only check for FN_DEVCHAR in filenames if FN_DEVCHAR is defined.
  This allows to use table names with ":" on non windows platforms.
  On Windows platform get an error if you use table name that contains FN_DEVCHAR

  BitKeeper/etc/ignore@1.210.1.11, 2006-06-01 12:34:38+03:00, anjuta@arthur.local +2 -0
    Added sql/share/iso639-2.txt sql/share/fixerrmsg.pl to the ignore list

  include/config-win.h@1.71.1.10, 2006-06-01 12:34:37+03:00, anjuta@arthur.local +1 -0
    Moved FN_DEVCHAR to config-win.h

  include/my_global.h@1.96.1.22, 2006-06-01 12:34:37+03:00, anjuta@arthur.local +0 -1
    Moved FN_DEVCHAR to config-win.h

  mysql-test/r/create.result@1.107.1.9, 2006-06-01 12:34:37+03:00, anjuta@arthur.local +14 -0
    Added testcase for Bug#19479:mysqldump creates invalid dump

  mysql-test/t/create.test@1.71.1.7, 2006-06-01 12:34:38+03:00, anjuta@arthur.local +15 -0
    Added testcase for Bug#19479:mysqldump creates invalid dump

  mysys/mf_fn_ext.c@1.8, 2006-06-01 12:34:38+03:00, anjuta@arthur.local +3 -3
    Added checking of BASKSLASH_MBTAIL as dirname_part depends on it.
    Fixed cast and indentation.

  sql/table.cc@1.160.24.1, 2006-06-01 12:34:38+03:00, anjuta@arthur.local +8 -0
    Only check for FN_DEVCHAR in filenames if FN_DEVCHAR is defined.
    This allows to use table names with ":" on non windows platforms.
    On Windows platform get an error if you use table name that contains FN_DEVCHAR

ChangeSet@1.2154.45.1, 2006-06-01 11:20:49+02:00, mats@mysql.com +1 -0
  Bug#16837 (Missing #ifdef cause compile problem --without-row-based-replication):
  Post-merge fixes.

  sql/log.cc@1.204.1.6, 2006-06-01 11:20:43+02:00, mats@mysql.com +0 -2
    Need to set up binlog_trx_data regardless of whether row-based is
    enabled or not.

ChangeSet@1.2119.345.94, 2006-06-01 09:42:49+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - dbacc
    store new op when converting WRITE to UPDATE so that ACCKEYCONF gets correct

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@1.71, 2006-06-01 09:42:46+02:00, jonas@perch.ndb.mysql.com +1 -0
    store new op when converting WRITE to UPDATE so that ACCKEYCONF gets correct

ChangeSet@1.2154.44.1, 2006-06-01 10:34:04+04:00, aivanov@mysql.com +78 -0
  Applied innodb-5.1-ss594 snapshot.
   Fixed BUG#19542 "InnoDB doesn't increase the Handler_read_prev couter".
   Fixed BUG#19609 "Case sensitivity of innodb_data_file_path gives stupid error".
   Fixed BUG#19727 "InnoDB crashed server and crashed tables are ot recoverable".
   Also:
   * Remove remnants of the obsolete concept of memoryfixing tables and indexes.
   * Remove unused dict_table_LRU_trim().
   * Remove unused 'trx' parameter from dict_table_get_on_id_low(),
     dict_table_get(), dict_table_get_and_increment_handle_count().
   * Add a normal linked list implementation.
   * Add a work queue implementation.
   * Add 'level' parameter to mutex_create() and rw_lock_create().
     Remove mutex_set_level() and rw_lock_set_level().
   * Rename SYNC_LEVEL_NONE to SYNC_LEVEL_VARYING.
   * Add support for bound ids in InnoDB's parser.
   * Define UNIV_BTR_DEBUG for enabling consistency checks of
     FIL_PAGE_NEXT and FIL_PAGE_PREV when accessing sibling
     pages of B-tree indexes.
     btr_validate_level(): Check the validity of the doubly linked
     list formed by FIL_PAGE_NEXT and FIL_PAGE_PREV.
   * Adapt InnoDB to the new tablename to filename encoding in MySQL 5.1.
     ut_print_name(), ut_print_name1(): Add parameter 'table_id' for
     distinguishing names of tables from other identifiers.
     New: innobase_convert_from_table_id(), innobase_convert_from_id(),
          innobase_convert_from_filename(), innobase_get_charset.
     dict_accept(), dict_scan_id(), dict_scan_col(), dict_scan_table_name(),
     dict_skip_word(), dict_create_foreign_constraints_low(): Add
     parameter 'cs' so that isspace() can be replaced with my_isspace(),
     whose operation depends on the connection character set.
     dict_scan_id(): Convert identifier to UTF-8.
     dict_str_starts_with_keyword(): New extern function, to replace
     dict_accept() in row_search_for_mysql().
     mysql_get_identifier_quote_char(): Replaced with innobase_print_identifier().
     ha_innobase::create(): Remove the thd->convert_strin() call. Pass the
     statement to InnoDB in the connection character set and let InnoDB
     convert the identifier to UTF-8.
   * Add max_row_size to dict_table_t.
   * btr0cur.c
     btr_copy_externally_stored_field(): Only set the 'offset' variable
     when needed.
   * buf0buf.c
     buf_page_io_complete(): Write to the error log if the page number or
     the space id o the disk do not match those in memory. Also write to
     the error log if a page was read from the doublewrite buffer. The
     doublewrite buffer should be only read by the lower-level function
     fil_io() at database startup.
   * dict0dict.c
     dict_scan_table_name(): Remove fallback to differently encoded name
     when the table is not found. The encoding is handled at a higher level.
   * ha_innodb.cc
     Increment statistic counter in ha_innobase::index_prev() (bug 19542).
     Add innobase_convert_string wrapper function and a new file
     ha_prototypes.h.
     innobase_print_identifier(): Remove TODO comment before calling
     get_quote_char_for_identifier(). That function apparently assumes
     the identifier to be encoded in UTF-8.
   * ibuf0ibuf.c|h
     ibuf_count_get(), ibuf_counts[], ibuf_count_inited(): Define these
     only #ifdef UNIV_IBUF_DEBUG. Previously, when compiled without
     UNIV_IBUF_DEBUG, invoking ibuf_count_get() would crash InnoDB.
     The function is only being called #ifdef UNIV_IBUF_DEBUG.
   * innodb.result
     Adjust the results for changes in the foreign key error messages.
   * mem0mem.c|h
     New: mem_heap_dup(), mem_heap_printf(), mem_heap_cat().
   * os0file.c
     Check the page trailers also after writing to disk. This improves
     chances of diagnosing bug 18886.
     os_file_check_page_trailers(): New function for checking that the
     two copies of the LSN stamped on the page match.
     os_aio_simulated_handle(): Call os_file_check_page_trailers()
     before and after os_file_write().
   * row0mysql.c
     Move trx_commit_for_mysql(trx) calls before calls to
     row_mysql_unlock_data_dictionary(trx) (bug 19727).
   * row0sel.c
     row_fetch_print(): Handle SQL NULL values without crashing.
     row_sel_store_mysql_rec(): Remove useless call to rec_get_nth_field
     when handling an externally stored column.
     Fetch externally stored fields when using InnoDB's internal SQL
     parser.
     Optimize BLOB selects by using prebuilt->blob_heap directly instead
     of first reading BLOB data to a temporary heap and then copying it
     to prebuilt->blob_heap.
   * srv0srv.c
     srv_master_thread(): Remove unreachable code.
   * srv0start.c
     srv_parse_data_file_paths_and_sizes(): Accept lower-case 'm' and
     'g' as abbreviations of megabyte and gigabyte (bug 19609).
     srv_parse_megabytes(): New fuction.
   * ut0dbg.c|h
     Implement InnoDB assertions (ut_a and ut_error) with abort() when
     the code is compiled with GCC 3 or later on other platforms than
     Windows or Netware. Also disable the variable ut_dbg_stop_threads
     and the function ut_dbg_stop_thread() i this case, unless
     UNIV_SYC_DEBUG is defined. This should allow the compiler to
     generate more compact code for assertions.
   * ut0list.c|h
     Add ib_list_create_heap().

  mysql-test/r/innodb.result@1.175.2.1, 2006-06-01 10:33:53+04:00, aivanov@mysql.com +21 -21
    Applied innodb-5.1-ss594 snapshot.

  mysql-test/t/innodb.test@1.143.1.3, 2006-06-01 10:33:53+04:00, aivanov@mysql.com +13 -0
    Copy the comment from the beginning of the file
     to the end because MySQL developers continue
     adding test cases to this file.

  storage/innobase/CMakeLists.txt@1.7, 2006-06-01 10:33:53+04:00, aivanov@mysql.com +1 -1
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/Makefile.am@1.15, 2006-06-01 10:33:53+04:00, aivanov@mysql.com +1 -1
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/btr/btr0btr.c@1.44, 2006-06-01 10:33:53+04:00, aivanov@mysql.com +72 -19
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/btr/btr0cur.c@1.52, 2006-06-01 10:33:53+04:00, aivanov@mysql.com +25 -5
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/btr/btr0pcur.c@1.21, 2006-06-01 10:33:53+04:00, aivanov@mysql.com +3 -0
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/btr/btr0sea.c@1.45, 2006-06-01 10:33:53+04:00, aivanov@mysql.com +1 -2
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/buf/buf0buf.c@1.53, 2006-06-01 10:33:53+04:00, aivanov@mysql.com +32 -16
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/buf/buf0flu.c@1.33, 2006-06-01 10:33:53+04:00, aivanov@mysql.com +1 -1
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/data/data0type.c@1.25, 2006-06-01 10:33:53+04:00, aivanov@mysql.com +33 -0
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/dict/dict0crea.c@1.37, 2006-06-01 10:33:53+04:00, aivanov@mysql.com +3 -3
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/dict/dict0dict.c@1.82, 2006-06-01 10:33:53+04:00, aivanov@mysql.com +237 -191
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/dict/dict0load.c@1.50, 2006-06-01 10:33:53+04:00, aivanov@mysql.com +1 -1
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/dict/dict0mem.c@1.22, 2006-06-01 10:33:53+04:00, aivanov@mysql.com +3 -3
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/fil/fil0fil.c@1.64, 2006-06-01 10:33:53+04:00, aivanov@mysql.com +2 -5
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/ha/hash0hash.c@1.7, 2006-06-01 10:33:53+04:00, aivanov@mysql.com +1 -3
    Applied innodb-5.1-ss594 snapshot.

  sql/ha_innodb.cc@1.274.1.1, 2006-06-01 10:33:53+04:00, aivanov@mysql.com +172 -27
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/ibuf/ibuf0ibuf.c@1.43, 2006-06-01 10:33:53+04:00, aivanov@mysql.com +17 -12
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/include/data0type.h@1.25, 2006-06-01 10:33:54+04:00, aivanov@mysql.com +10 -0
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/include/dict0dict.h@1.45, 2006-06-01 10:33:54+04:00, aivanov@mysql.com +19 -30
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/include/dict0dict.ic@1.17, 2006-06-01 10:33:54+04:00, aivanov@mysql.com +2 -25
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/include/dict0mem.h@1.30, 2006-06-01 10:33:54+04:00, aivanov@mysql.com +6 -7
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/include/fil0fil.h@1.22, 2006-06-01 10:33:54+04:00, aivanov@mysql.com +14 -2
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/include/fsp0fsp.h@1.13, 2006-06-01 10:33:54+04:00, aivanov@mysql.com +15 -11
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/include/ha_prototypes.h@1.1, 2006-06-01 10:33:56+04:00, aivanov@mysql.com +22 -0
    Applied innodb-5.1-ss594 snapshot.
    

  storage/innobase/include/ha_prototypes.h@1.0, 2006-06-01 10:33:56+04:00, aivanov@mysql.com +0 -0
    BitKeeper file /home/alexi/innodb/mysql-5.1-ss594/storage/innobase/include/ha_prototypes.h

  storage/innobase/include/ibuf0ibuf.h@1.10, 2006-06-01 10:33:54+04:00, aivanov@mysql.com +2 -0
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/include/mem0mem.h@1.17, 2006-06-01 10:33:54+04:00, aivanov@mysql.com +40 -2
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/include/pars0pars.h@1.11, 2006-06-01 10:33:54+04:00, aivanov@mysql.com +29 -0
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/include/pars0sym.h@1.8, 2006-06-01 10:33:54+04:00, aivanov@mysql.com +10 -0
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/include/pars0types.h@1.6, 2006-06-01 10:33:54+04:00, aivanov@mysql.com +1 -0
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/include/rem0rec.h@1.18, 2006-06-01 10:33:54+04:00, aivanov@mysql.com +4 -2
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/include/row0purge.h@1.4, 2006-06-01 10:33:54+04:00, aivanov@mysql.com +1 -3
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/include/row0undo.h@1.5, 2006-06-01 10:33:54+04:00, aivanov@mysql.com +1 -3
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/include/srv0srv.h@1.62, 2006-06-01 10:33:54+04:00, aivanov@mysql.com +3 -0
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/include/sync0rw.h@1.14, 2006-06-01 10:33:54+04:00, aivanov@mysql.com +6 -13
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/include/sync0sync.h@1.26, 2006-06-01 10:33:54+04:00, aivanov@mysql.com +12 -14
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/include/univ.i@1.53, 2006-06-01 10:33:54+04:00, aivanov@mysql.com +5 -3
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/include/ut0dbg.h@1.19, 2006-06-01 10:33:55+04:00, aivanov@mysql.com +22 -5
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/include/ut0list.h@1.1, 2006-06-01 10:33:57+04:00, aivanov@mysql.com +148 -0
    Applied innodb-5.1-ss594 snapshot.
    

  storage/innobase/include/ut0list.h@1.0, 2006-06-01 10:33:57+04:00, aivanov@mysql.com +0 -0
    BitKeeper file /home/alexi/innodb/mysql-5.1-ss594/storage/innobase/include/ut0list.h

  storage/innobase/include/ut0list.ic@1.1, 2006-06-01 10:33:57+04:00, aivanov@mysql.com +23 -0
    Applied innodb-5.1-ss594 snapshot.
    

  storage/innobase/include/ut0list.ic@1.0, 2006-06-01 10:33:57+04:00, aivanov@mysql.com +0 -0
    BitKeeper file /home/alexi/innodb/mysql-5.1-ss594/storage/innobase/include/ut0list.ic

  storage/innobase/include/ut0ut.h@1.20, 2006-06-01 10:33:55+04:00, aivanov@mysql.com +2 -0
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/include/ut0wqueue.h@1.1, 2006-06-01 10:33:57+04:00, aivanov@mysql.com +60 -0
    Applied innodb-5.1-ss594 snapshot.
    

  storage/innobase/include/ut0wqueue.h@1.0, 2006-06-01 10:33:57+04:00, aivanov@mysql.com +0 -0
    BitKeeper file /home/alexi/innodb/mysql-5.1-ss594/storage/innobase/include/ut0wqueue.h

  storage/innobase/lock/lock0lock.c@1.68, 2006-06-01 10:33:55+04:00, aivanov@mysql.com +5 -4
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/log/log0log.c@1.47, 2006-06-01 10:33:55+04:00, aivanov@mysql.com +3 -6
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/log/log0recv.c@1.55, 2006-06-01 10:33:55+04:00, aivanov@mysql.com +1 -3
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/mem/mem0dbg.c@1.21, 2006-06-01 10:33:55+04:00, aivanov@mysql.com +1 -2
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/mem/mem0mem.c@1.15, 2006-06-01 10:33:55+04:00, aivanov@mysql.com +183 -4
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/mem/mem0pool.c@1.23, 2006-06-01 10:33:55+04:00, aivanov@mysql.com +1 -2
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/os/os0file.c@1.116, 2006-06-01 10:33:55+04:00, aivanov@mysql.com +36 -23
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/os/os0thread.c@1.35, 2006-06-01 10:33:55+04:00, aivanov@mysql.com +1 -1
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/pars/lexyy.c@1.21, 2006-06-01 10:33:55+04:00, aivanov@mysql.com +496 -486
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/pars/pars0lex.l@1.13, 2006-06-01 10:33:55+04:00, aivanov@mysql.com +8 -0
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/pars/pars0pars.c@1.18, 2006-06-01 10:33:55+04:00, aivanov@mysql.com +58 -0
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/pars/pars0sym.c@1.8, 2006-06-01 10:33:55+04:00, aivanov@mysql.com +46 -0
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/row/row0ins.c@1.80, 2006-06-01 10:33:55+04:00, aivanov@mysql.com +16 -14
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/row/row0mysql.c@1.125, 2006-06-01 10:33:55+04:00, aivanov@mysql.com +57 -55
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/row/row0purge.c@1.25, 2006-06-01 10:33:55+04:00, aivanov@mysql.com +1 -1
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/row/row0row.c@1.22, 2006-06-01 10:33:55+04:00, aivanov@mysql.com +3 -3
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/row/row0sel.c@1.104, 2006-06-01 10:33:55+04:00, aivanov@mysql.com +60 -58
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/row/row0upd.c@1.43, 2006-06-01 10:33:55+04:00, aivanov@mysql.com +1 -2
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/srv/srv0srv.c@1.100, 2006-06-01 10:33:55+04:00, aivanov@mysql.com +7 -15
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/srv/srv0start.c@1.93, 2006-06-01 10:33:56+04:00, aivanov@mysql.com +47 -61
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/sync/sync0arr.c@1.24, 2006-06-01 10:33:56+04:00, aivanov@mysql.com +1 -2
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/sync/sync0rw.c@1.23, 2006-06-01 10:33:56+04:00, aivanov@mysql.com +10 -21
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/sync/sync0sync.c@1.40, 2006-06-01 10:33:56+04:00, aivanov@mysql.com +12 -25
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/thr/thr0loc.c@1.10, 2006-06-01 10:33:56+04:00, aivanov@mysql.com +1 -2
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/trx/trx0purge.c@1.22, 2006-06-01 10:33:56+04:00, aivanov@mysql.com +2 -4
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/trx/trx0rec.c@1.25, 2006-06-01 10:33:56+04:00, aivanov@mysql.com +1 -1
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/trx/trx0roll.c@1.31, 2006-06-01 10:33:56+04:00, aivanov@mysql.com +3 -3
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/trx/trx0rseg.c@1.8, 2006-06-01 10:33:56+04:00, aivanov@mysql.com +1 -2
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/trx/trx0sys.c@1.38, 2006-06-01 10:33:56+04:00, aivanov@mysql.com +1 -2
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/trx/trx0trx.c@1.65, 2006-06-01 10:33:56+04:00, aivanov@mysql.com +1 -2
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/ut/Makefile.am@1.5, 2006-06-01 10:33:56+04:00, aivanov@mysql.com +1 -1
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/ut/ut0dbg.c@1.11, 2006-06-01 10:33:56+04:00, aivanov@mysql.com +8 -2
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/ut/ut0list.c@1.1, 2006-06-01 10:33:57+04:00, aivanov@mysql.com +169 -0
    Applied innodb-5.1-ss594 snapshot.
    

  storage/innobase/ut/ut0list.c@1.0, 2006-06-01 10:33:57+04:00, aivanov@mysql.com +0 -0
    BitKeeper file /home/alexi/innodb/mysql-5.1-ss594/storage/innobase/ut/ut0list.c

  storage/innobase/ut/ut0ut.c@1.35, 2006-06-01 10:33:56+04:00, aivanov@mysql.com +25 -24
    Applied innodb-5.1-ss594 snapshot.

  storage/innobase/ut/ut0wqueue.c@1.1, 2006-06-01 10:33:58+04:00, aivanov@mysql.com +92 -0
    Applied innodb-5.1-ss594 snapshot.
    

  storage/innobase/ut/ut0wqueue.c@1.0, 2006-06-01 10:33:58+04:00, aivanov@mysql.com +0 -0
    BitKeeper file /home/alexi/innodb/mysql-5.1-ss594/storage/innobase/ut/ut0wqueue.c

ChangeSet@1.1616.2550.7, 2006-06-01 08:24:05+02:00, jonas@perch.ndb.mysql.com +5 -0
  ndb - bug#20185
    Dont be too aggressive in Dbtc::nodeFailCheckTransaction
    let it timeout by 1, so that it does not assert that it has waited too long
    old impl. set timeotu value to 0, making timeout = (ctcTimer - 0) which could be quite big.

  ndb/src/kernel/blocks/ERROR_codes.txt@1.8.1.9, 2006-06-01 08:24:02+02:00, jonas@perch.ndb.mysql.com +3 -0
    error codes

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.14.1.23, 2006-06-01 08:24:02+02:00, jonas@perch.ndb.mysql.com +24 -0
    2 new error inserts
    7030 - delay in GCP_PREPARE until checkLocalNodefailComplete is true
    7031 - delay in GCP_PREPARE and die

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.42.1.24, 2006-06-01 08:24:02+02:00, jonas@perch.ndb.mysql.com +5 -3
    Dont set api con timer to 0, as this might trigger asserion in timeoutfound lab if state == PREPARE_TO_COMMIT

  ndb/test/ndbapi/testNodeRestart.cpp@1.8.1.14, 2006-06-01 08:24:03+02:00, jonas@perch.ndb.mysql.com +56 -0
    testcase

  ndb/test/run-test/daily-basic-tests.txt@1.13.2.12, 2006-06-01 08:24:03+02:00, jonas@perch.ndb.mysql.com +4 -0
    autotest

ChangeSet@1.1810.1757.4, 2006-05-31 22:55:45-07:00, igor@rurik.mysql.com +8 -0
  Post-merge fixes

  mysql-test/include/common-tests.inc@1.2, 2006-05-31 22:55:39-07:00, igor@rurik.mysql.com +2 -2
    Post-merge fixes

  mysql-test/r/compress.result@1.4, 2006-05-31 22:55:39-07:00, igor@rurik.mysql.com +2 -2
    Post-merge fixes

  mysql-test/r/key_cache.result@1.19, 2006-05-31 22:55:39-07:00, igor@rurik.mysql.com +1 -1
    Post-merge fixes

  mysql-test/r/preload.result@1.11, 2006-05-31 22:55:39-07:00, igor@rurik.mysql.com +1 -1
    Post-merge fixes

  mysql-test/r/select.result@1.121.1.4, 2006-05-31 22:55:39-07:00, igor@rurik.mysql.com +12 -2
    Post-merge fixes

  mysql-test/r/view.result@1.138.1.23, 2006-05-31 22:55:39-07:00, igor@rurik.mysql.com +1 -1
    Post-merge fixes

  mysql-test/t/view.test@1.126.1.21, 2006-05-31 22:55:39-07:00, igor@rurik.mysql.com +1 -1
    Post-merge fixes

  sql/sql_base.cc@1.235.1.105, 2006-05-31 22:55:39-07:00, igor@rurik.mysql.com +2 -1
    Post-merge fixes

ChangeSet@1.1810.1757.3, 2006-05-31 18:12:13-07:00, igor@rurik.mysql.com +1 -0
  Manual merge

  mysql-test/r/select.result@1.121.1.3, 2006-05-31 18:12:08-07:00, igor@rurik.mysql.com +2 -12
    Manual merge
    MERGE: 1.34.3.36

ChangeSet@1.2169.2.9, 2006-06-01 00:03:05+02:00, serg@serg.mylan +1 -0
  mention new files in Makefile

  include/Makefile.am@1.65, 2006-06-01 00:02:50+02:00, serg@serg.mylan +2 -1
    mention new files in Makefile

ChangeSet@1.1810.1698.37, 2006-05-31 23:36:50+02:00, msvensson@shellback.(none) +5 -0
  Import patch from yaSSL
   - avoid allocating memory for each call to 'EVP_md5' and 
     'EVP_des_ede3_cbc' which were not released until server was stopped
   - Those functions are used from the SQL function 'des_encrypt' and
     'des_decrypt'.

  extra/yassl/include/openssl/ssl.h@1.14, 2006-05-31 22:30:10+02:00, msvensson@shellback.(none) +2 -4
    Import patch yassl.diff

  extra/yassl/include/yassl_int.hpp@1.11, 2006-05-31 22:30:09+02:00, msvensson@shellback.(none) +0 -19
    Import patch yassl.diff

  extra/yassl/src/ssl.cpp@1.16, 2006-05-31 22:30:10+02:00, msvensson@shellback.(none) +21 -12
    Import patch yassl.diff

  extra/yassl/src/template_instnt.cpp@1.10, 2006-05-31 22:30:10+02:00, msvensson@shellback.(none) +0 -1
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp@1.19, 2006-05-31 22:30:10+02:00, msvensson@shellback.(none) +0 -34
    Import patch yassl.diff

ChangeSet@1.2154.8.13, 2006-05-31 23:34:28+02:00, msvensson@shellback.(none) +19 -0
  Cleanup testcases
   - Add  missing drop(s)
   - Reset changed variables
  
  NOTE! These kind of problems are easily found with --check-testcases options to mysql-test-run.pl 

  mysql-test/extra/rpl_tests/rpl_insert_id_pk.test@1.2, 2006-05-31 23:33:24+02:00, msvensson@shellback.(none) +2 -1
    Add missing drop table

  mysql-test/extra/rpl_tests/rpl_loaddata.test@1.3, 2006-05-31 23:33:24+02:00, msvensson@shellback.(none) +1 -1
    Add missing drop table

  mysql-test/extra/rpl_tests/rpl_log.test@1.38, 2006-05-31 23:33:24+02:00, msvensson@shellback.(none) +1 -1
    Tables where only dropped on slave, switch to master connection before dropping them

  mysql-test/extra/rpl_tests/rpl_multi_update3.test@1.2, 2006-05-31 23:33:24+02:00, msvensson@shellback.(none) +2 -0
    Add missing drop table

  mysql-test/extra/rpl_tests/rpl_row_sp006.test@1.3, 2006-05-31 23:33:24+02:00, msvensson@shellback.(none) +1 -0
    Add missing drop database

  mysql-test/include/check-testcase.test@1.2, 2006-05-31 23:33:25+02:00, msvensson@shellback.(none) +2 -2
    Add option "--skip-lock-tables" when dumping tables, as noone else is using the tables anyway

  mysql-test/r/ndb_cache_multi.result@1.2, 2006-05-31 23:33:25+02:00, msvensson@shellback.(none) +2 -0
    Reset query_cache_size after test on both master and "second" master mysqld

  mysql-test/r/partition.result@1.36.2.8, 2006-05-31 23:33:25+02:00, msvensson@shellback.(none) +1 -0
    Add missing drop procedure

  mysql-test/r/rpl_drop_db.result@1.8, 2006-05-31 23:34:21+02:00, msvensson@shellback.(none) +2 -0
    Add missing drop table

  mysql-test/r/rpl_multi_update3.result@1.9, 2006-05-31 23:34:21+02:00, msvensson@shellback.(none) +1 -0
    Add missing drop table

  mysql-test/r/rpl_ndb_multi_update3.result@1.1.1.1, 2006-05-31 23:34:21+02:00, msvensson@shellback.(none) +1 -0
    Add missing drop table

  mysql-test/r/rpl_ndb_sp006.result@1.1.1.1, 2006-05-31 23:34:21+02:00, msvensson@shellback.(none) +1 -0
    Add missing drop database

  mysql-test/r/rpl_stm_no_op.result@1.2, 2006-05-31 23:34:21+02:00, msvensson@shellback.(none) +1 -1
    Add missing drop table 

  mysql-test/r/rpl_variables.result@1.4, 2006-05-31 23:34:21+02:00, msvensson@shellback.(none) +1 -0
    Reset slave_net_timeout to it's default value after test

  mysql-test/t/ndb_cache_multi.test@1.4, 2006-05-31 23:34:21+02:00, msvensson@shellback.(none) +7 -0
    Reset query_cahche_size after test

  mysql-test/t/partition.test@1.37.2.6, 2006-05-31 23:34:21+02:00, msvensson@shellback.(none) +1 -0
    Add missing drop procedure

  mysql-test/t/rpl_drop_db.test@1.10, 2006-05-31 23:34:21+02:00, msvensson@shellback.(none) +4 -0
    Add missing drop table

  mysql-test/t/rpl_stm_no_op.test@1.2, 2006-05-31 23:34:21+02:00, msvensson@shellback.(none) +1 -1
    Add missing drop table

  mysql-test/t/rpl_variables.test@1.5, 2006-05-31 23:34:21+02:00, msvensson@shellback.(none) +3 -0
    Reset slave_net_timeout to it's default value after test

ChangeSet@1.2169.9.6, 2006-05-31 23:24:25+02:00, tomas@poseidon.ndb.mysql.com +1 -0
  Bug #18947  	CRBR: order in binlog of create table and insert (on different table) not determ
  - move clear of slock until after completion of data events on the binlog

  sql/ha_ndbcluster_binlog.cc@1.60.1.3, 2006-05-31 23:24:16+02:00, tomas@poseidon.ndb.mysql.com +31 -22
    Bug #18947  	CRBR: order in binlog of create table and insert (on different table) not determ
    - move clear of slock until after completion of data events on the binlog

ChangeSet@1.1810.1698.36, 2006-05-31 23:06:56+02:00, msvensson@shellback.(none) +2 -0
  Add define YASLSL_PREFIX

  extra/yassl/src/Makefile.am@1.10, 2006-05-31 23:06:51+02:00, msvensson@shellback.(none) +1 -1
    Add defined YASSL_PREFIX when building yassl/src

  extra/yassl/testsuite/Makefile.am@1.3, 2006-05-31 23:06:51+02:00, msvensson@shellback.(none) +1 -1
    Add defined YASSL_PREFIX when building yassl/testsuite

ChangeSet@1.1810.1698.35, 2006-05-31 22:21:40+02:00, msvensson@shellback.(none) +1 -0
  Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of prefix_*.h files

  include/violite.h@1.46.2.1, 2006-05-31 22:21:35+02:00, msvensson@shellback.(none) +1 -0
    Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of prefix_*.h files

ChangeSet@1.1810.1698.34, 2006-05-31 22:19:17+02:00, msvensson@shellback.(none) +2 -0
  Import from yaSSL

  extra/yassl/include/openssl/crypto.h@1.3, 2006-05-31 22:14:47+02:00, msvensson@shellback.(none) +2 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/ssl.h@1.13, 2006-05-31 22:14:47+02:00, msvensson@shellback.(none) +3 -0
    Import patch yassl.diff

ChangeSet@1.1810.1757.1, 2006-05-31 19:49:38+02:00, aelkin@dl145k.mysql.com +1 -0
  Bug#14157: utf8 encoding in binlog without set character_set_client
  
  adapting to pushbuild's custom to switch from default pathes. The name for
  var directory must be set with MYSQLTEST_VARDIR.

  mysql-test/t/mysqlbinlog.test@1.21.1.9, 2006-05-31 19:49:32+02:00, aelkin@dl145k.mysql.com +1 -1
    correction of log path since pushbuild uses non-default options.

ChangeSet@1.2119.1.173, 2006-05-31 13:32:14-04:00, mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se +8 -0
  BUG#18198: Many strange partition functions were allowed, now only strictly allowed functions are ok

  mysql-test/r/partition_error.result@1.4.1.1, 2006-05-31 13:32:07-04:00, mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se +23 -0
    New test cases

  mysql-test/t/partition_error.test@1.6.1.1, 2006-05-31 13:32:07-04:00, mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se +28 -0
    New test cases

  sql/item.h@1.198, 2006-05-31 13:32:07-04:00, mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se +19 -12
    Added method check_partition_func_processor for check if item tree is valid

  sql/item_cmpfunc.h@1.124, 2006-05-31 13:32:07-04:00, mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se +14 -14
    Added method check_partition_func_processor for check if item tree is valid

  sql/item_func.h@1.138, 2006-05-31 13:32:08-04:00, mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se +31 -31
    Added method check_partition_func_processor for check if item tree is valid

  sql/item_strfunc.h@1.108, 2006-05-31 13:32:08-04:00, mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se +24 -24
    Added method check_partition_func_processor for check if item tree is valid

  sql/item_timefunc.h@1.69, 2006-05-31 13:32:08-04:00, mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se +30 -30
    Added method check_partition_func_processor for check if item tree is valid

  sql/item_xmlfunc.h@1.3, 2006-05-31 13:32:08-04:00, mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Added method check_partition_func_processor for check if item tree is valid

ChangeSet@1.2154.43.1, 2006-05-31 19:21:52+02:00, mats@mysql.com +16 -0
  Bug#19995 (Extreneous table maps generated for statements that do not generate rows):
  Switched to writing out table maps for tables that are locked when
  the first row in a statement is seen.

  mysql-test/include/master-slave-reset.inc@1.1, 2006-05-31 19:21:42+02:00, mats@mysql.com +22 -0
    New BitKeeper file ``mysql-test/include/master-slave-reset.inc''

  mysql-test/include/master-slave-reset.inc@1.0, 2006-05-31 19:21:42+02:00, mats@mysql.com +0 -0
    BitKeeper file /home/bk/b19995-mysql-5.1-new-rpl/mysql-test/include/master-slave-reset.inc

  mysql-test/include/master-slave.inc@1.13, 2006-05-31 19:21:40+02:00, mats@mysql.com +2 -22
    Moved code to reset master and slave into separate file.

  mysql-test/r/binlog_row_blackhole.result@1.6, 2006-05-31 19:21:40+02:00, mats@mysql.com +0 -12
    Result change

  mysql-test/r/binlog_row_mix_innodb_myisam.result@1.8, 2006-05-31 19:21:40+02:00, mats@mysql.com +17 -21
    Result change

  mysql-test/r/ndb_binlog_ignore_db.result@1.4, 2006-05-31 19:21:40+02:00, mats@mysql.com +0 -2
    Result change

  mysql-test/r/rpl_ndb_charset.result@1.3.1.1, 2006-05-31 19:21:40+02:00, mats@mysql.com +0 -10
    Result change

  mysql-test/r/rpl_row_basic_11bugs.result@1.7, 2006-05-31 19:21:40+02:00, mats@mysql.com +17 -0
    Result change

  mysql-test/r/rpl_row_charset.result@1.5, 2006-05-31 19:21:40+02:00, mats@mysql.com +0 -10
    Result change

  mysql-test/r/rpl_row_create_table.result@1.5, 2006-05-31 19:21:40+02:00, mats@mysql.com +11 -11
    Result change

  mysql-test/t/rpl_row_basic_11bugs.test@1.7, 2006-05-31 19:21:41+02:00, mats@mysql.com +15 -0
    Added test to check that no events are generated when no rows are changed.

  mysql-test/t/rpl_row_create_table.test@1.5, 2006-05-31 19:21:41+02:00, mats@mysql.com +4 -4
    Master log position changed

  sql/handler.cc@1.231.2.1, 2006-05-31 19:21:41+02:00, mats@mysql.com +67 -41
    Adding function write_locked_table_maps() that will write table maps for all
    tables locked for write.
    Using "table->in_use" instead of "current_thd" since tables are now locked
    when the function is called.
    Removing old code to write table map.

  sql/log_event.cc@1.222.1.1, 2006-05-31 19:21:41+02:00, mats@mysql.com +1 -0
    Added assertion

  sql/sql_class.cc@1.257.1.4, 2006-05-31 19:21:41+02:00, mats@mysql.com +0 -25
    Removing code to write "dummy termination event".

  sql/sql_class.h@1.292.1.4, 2006-05-31 19:21:42+02:00, mats@mysql.com +10 -7
    Adding getter for binlog_table_maps.

  sql/sql_insert.cc@1.200, 2006-05-31 19:21:42+02:00, mats@mysql.com +31 -1
    Setting thd->lock before calling write_record for the execution of
    CREATE-SELECT and INSERT-SELECT since they keep multiple locks in the
    air at the same time.

ChangeSet@1.2169.2.8, 2006-05-31 19:12:17+02:00, serg@serg.mylan +2 -0
  correct type for federated_db_init()

  sql/ha_federated.cc@1.60, 2006-05-31 19:11:48+02:00, serg@serg.mylan +1 -1
    correct type for federated_db_init()

  sql/ha_federated.h@1.29, 2006-05-31 19:11:48+02:00, serg@serg.mylan +1 -1
    correct type for federated_db_init()

ChangeSet@1.2169.10.4, 2006-05-31 18:44:09+02:00, serg@serg.mylan +12 -0
  WL#2595 - atomic operations

  BitKeeper/etc/ignore@1.242, 2006-05-31 18:43:48+02:00, serg@serg.mylan +1 -0
    Added mysys/test_atomic to the ignore list

  configure.in@1.356.1.1, 2006-05-31 18:43:36+02:00, serg@serg.mylan +14 -42
    WL#2595 - atomic operations

  include/atomic/nolock.h@1.1, 2006-05-31 18:43:37+02:00, serg@serg.mylan +169 -0

  include/atomic/nolock.h@1.0, 2006-05-31 18:43:37+02:00, serg@serg.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-5.1/include/atomic/nolock.h

  include/atomic/rwlock.h@1.1, 2006-05-31 18:43:38+02:00, serg@serg.mylan +161 -0

  include/atomic/rwlock.h@1.0, 2006-05-31 18:43:38+02:00, serg@serg.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-5.1/include/atomic/rwlock.h

  include/atomic/x86-gcc.h@1.1, 2006-05-31 18:43:39+02:00, serg@serg.mylan +56 -0

  include/atomic/x86-gcc.h@1.0, 2006-05-31 18:43:39+02:00, serg@serg.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-5.1/include/atomic/x86-gcc.h

  include/atomic/x86-msvc.h@1.1, 2006-05-31 18:43:40+02:00, serg@serg.mylan +85 -0

  include/atomic/x86-msvc.h@1.0, 2006-05-31 18:43:40+02:00, serg@serg.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-5.1/include/atomic/x86-msvc.h

  include/my_atomic.h@1.1, 2006-05-31 18:43:41+02:00, serg@serg.mylan +46 -0

  include/my_atomic.h@1.0, 2006-05-31 18:43:41+02:00, serg@serg.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-5.1/include/my_atomic.h

  include/my_global.h@1.133, 2006-05-31 18:43:36+02:00, serg@serg.mylan +13 -0
    WL#2595 - atomic operations

  mysys/Makefile.am@1.79, 2006-05-31 18:43:37+02:00, serg@serg.mylan +4 -5
    WL#2595 - atomic operations

  mysys/my_atomic.c@1.1, 2006-05-31 18:43:42+02:00, serg@serg.mylan +46 -0

  mysys/my_atomic.c@1.0, 2006-05-31 18:43:42+02:00, serg@serg.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-5.1/mysys/my_atomic.c

  mysys/my_getncpus.c@1.1, 2006-05-31 18:43:44+02:00, serg@serg.mylan +40 -0

  mysys/my_getncpus.c@1.0, 2006-05-31 18:43:44+02:00, serg@serg.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-5.1/mysys/my_getncpus.c

  mysys/test_atomic.c@1.1, 2006-05-31 18:43:46+02:00, serg@serg.mylan +133 -0

  mysys/test_atomic.c@1.0, 2006-05-31 18:43:46+02:00, serg@serg.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-5.1/mysys/test_atomic.c

ChangeSet@1.2169.10.3, 2006-05-31 18:37:16+02:00, serg@serg.mylan +2 -0
  classes that are compiled conditionally in log_event.cc must be defined conditionally in log_event.h

  BitKeeper/deleted/.del-client_priv.h.rej~915a5a16fe10ef0@1.2, 2006-05-31 16:13:57+02:00, serg@serg.mylan +0 -0
    Delete: client/client_priv.h.rej

  sql/log_event.h@1.133.3.1, 2006-05-31 18:36:57+02:00, serg@serg.mylan +4 -1
    classes that are compiled conditionally in log_event.cc must be defined conditionally in log_event.h

ChangeSet@1.2169.2.6, 2006-05-31 18:07:32+02:00, serg@sergbook.mysql.com +9 -0
  after review fixes

  mysql-test/t/disabled.def@1.159.1.1, 2006-05-31 18:07:27+02:00, serg@sergbook.mysql.com +0 -1
    enable test

  sql/handler.cc@1.234, 2006-05-31 18:07:27+02:00, serg@sergbook.mysql.com +38 -39
    after review fixes

  sql/handler.h@1.212, 2006-05-31 18:07:27+02:00, serg@sergbook.mysql.com +2 -2
    after review fixes

  sql/set_var.cc@1.173.1.5, 2006-05-31 18:07:27+02:00, serg@sergbook.mysql.com +1 -1
    after review fixes

  sql/sql_partition.cc@1.70.1.2, 2006-05-31 18:07:27+02:00, serg@sergbook.mysql.com +5 -5
    after review fixes

  sql/sql_plugin.h@1.9, 2006-05-31 18:07:27+02:00, serg@sergbook.mysql.com +2 -1
    after review fixes

  sql/sql_show.cc@1.340, 2006-05-31 18:07:27+02:00, serg@sergbook.mysql.com +7 -7
    after review fixes

  sql/sql_table.cc@1.337, 2006-05-31 18:07:27+02:00, serg@sergbook.mysql.com +1 -1
    after review fixes

  sql/sql_tablespace.cc@1.6, 2006-05-31 18:07:27+02:00, serg@sergbook.mysql.com +2 -2
    after review fixes

ChangeSet@1.1810.1698.32, 2006-05-31 16:28:03+02:00, msvensson@shellback.(none) +1 -0
  Bug#20022 mysql-test-run can't be run with secure connections turned on for all testcases
   - Part 1, fixes rpl- and federated-tests where connection is made to 127.0.0.1

  client/mysqltest.c@1.155.9.46, 2006-05-31 16:27:57+02:00, msvensson@shellback.(none) +3 -0
    Turn on ssl_verify_server_cert only if host is "localhost"

ChangeSet@1.1810.1756.1, 2006-05-31 16:19:06+02:00, msvensson@shellback.(none) +15 -0
  Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_init
   - Include prefix files that renames all public functions in yaSSLs
     OpenSSL API to ya<function_name>. They will otherwise conflict
     with OpenSSL functions if loaded by an application that uses OpenSSL
     as well as libmysqlclient with yaSSL support.

  tools/Makefile.am@1.22.1.1, 2006-05-31 16:19:00+02:00, msvensson@shellback.(none) +1 -1
    Add link with yaSSL libs

  config/ac-macros/yassl.m4@1.10.1.5, 2006-05-31 16:19:00+02:00, msvensson@shellback.(none) +0 -2
    Remove yassl_includes as they are the same as "normal" include

  client/Makefile.am@1.52.1.3, 2006-05-31 16:19:00+02:00, msvensson@shellback.(none) +2 -2
    Remove $yassl_includes
    ...and one "suspicious line"

  extra/yassl/include/openssl/crypto.h@1.2, 2006-05-31 16:19:00+02:00, msvensson@shellback.(none) +2 -0
    Add include file "prefix_crypto.h" to rename SSL_* functions to yaSSL_*

  extra/yassl/include/openssl/generate_prefix_files.pl@1.1, 2006-05-31 16:19:00+02:00, msvensson@shellback.(none) +45 -0
    Add utility script to parse the header files to generate the prefix_* files that renames yaSSL SSL_* functions

  extra/yassl/include/openssl/generate_prefix_files.pl@1.0, 2006-05-31 16:19:00+02:00, msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug19575/my50-bug19575/extra/yassl/include/openssl/generate_prefix_files.pl

  extra/yassl/include/openssl/prefix_crypto.h@1.1, 2006-05-31 16:19:01+02:00, msvensson@shellback.(none) +1 -0
    Add prefix file for crypto.h

  extra/yassl/include/openssl/prefix_crypto.h@1.0, 2006-05-31 16:19:01+02:00, msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug19575/my50-bug19575/extra/yassl/include/openssl/prefix_crypto.h

  extra/yassl/include/openssl/prefix_ssl.h@1.1, 2006-05-31 16:19:01+02:00, msvensson@shellback.(none) +152 -0
    Add prefix file for ssl.h

  extra/yassl/include/openssl/prefix_ssl.h@1.0, 2006-05-31 16:19:01+02:00, msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug19575/my50-bug19575/extra/yassl/include/openssl/prefix_ssl.h

  extra/yassl/include/openssl/ssl.h@1.10.1.1, 2006-05-31 16:19:00+02:00, msvensson@shellback.(none) +1 -0
    Add include file "prefix_crypto.h" to rename SSL_* functions to yaSSL_*

  libmysql/Makefile.am@1.47.1.3, 2006-05-31 16:19:00+02:00, msvensson@shellback.(none) +1 -1
    Remove yassl_includes

  libmysql_r/Makefile.am@1.22.1.4, 2006-05-31 16:19:00+02:00, msvensson@shellback.(none) +1 -1
    Remove yassl_includes

  libmysqld/Makefile.am@1.55.1.13, 2006-05-31 16:19:00+02:00, msvensson@shellback.(none) +2 -2
    Remove yassl_includes
    And one suspicious line

  libmysqld/examples/Makefile.am@1.31.1.2, 2006-05-31 16:19:00+02:00, msvensson@shellback.(none) +1 -1
    Remove yassl_includes

  server-tools/instance-manager/Makefile.am@1.29.1.3, 2006-05-31 16:19:00+02:00, msvensson@shellback.(none) +1 -1
    Remove yassl_includes

  sql/Makefile.am@1.103.1.14, 2006-05-31 16:19:00+02:00, msvensson@shellback.(none) +1 -1
    Remove yassl_includes

  vio/Makefile.am@1.17.1.1, 2006-05-31 16:19:00+02:00, msvensson@shellback.(none) +1 -1
    Remove yassl_includes

ChangeSet@1.2154.23.4, 2006-05-31 16:16:03+02:00, tomas@poseidon.ndb.mysql.com +4 -0
  Bug #18947  	CRBR: order in binlog of create table and insert (on different table) not determ
  - wait for schema event also if mysqld is a single one in cluster to ensure serialization with data events
  + some current_thd removals
  + enabling kill of sql thread during shema sync wait

  mysql-test/r/rpl_ndb_log.result@1.9, 2006-05-31 16:15:55+02:00, tomas@poseidon.ndb.mysql.com +4 -0
    Bug #18947  	CRBR: order in binlog of create table and insert (on different table) not determ

  mysql-test/t/disabled.def@1.157.1.1, 2006-05-31 16:15:55+02:00, tomas@poseidon.ndb.mysql.com +1 -1
    Bug #18947  	CRBR: order in binlog of create table and insert (on different table) not determ

  sql/ha_ndbcluster.cc@1.307.1.2, 2006-05-31 16:15:55+02:00, tomas@poseidon.ndb.mysql.com +9 -6
    Bug #18947  	CRBR: order in binlog of create table and insert (on different table) not determ
    - wait for schema event also if mysqld is a single one in cluster to ensure serialization with data events
    + some current_thd removals
    + enabling kill of sql thread during shema sync wait

  sql/ha_ndbcluster_binlog.cc@1.60.1.2, 2006-05-31 16:15:56+02:00, tomas@poseidon.ndb.mysql.com +215 -191
    Bug #18947  	CRBR: order in binlog of create table and insert (on different table) not determ
    - wait for schema event also if mysqld is a single one in cluster to ensure serialization with data events
    + some current_thd removals
    + enabling kill of sql thread during shema sync wait

ChangeSet@1.2169.12.1, 2006-05-31 09:33:10-04:00, mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -0
  BUG#20161: LINEAR keyword on subpartitions not displayed in information schema for partitions
  and in SHOW CREATE TABLE

  mysql-test/r/information_schema_part.result@1.2, 2006-05-31 09:33:04-04:00, mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se +29 -0
    Added new test cases

  mysql-test/t/information_schema_part.test@1.2, 2006-05-31 09:33:05-04:00, mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se +22 -0
    Added new test cases

  sql/sql_partition.cc@1.70.3.1, 2006-05-31 09:33:05-04:00, mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
    Added missing check for LINEAR keyword on subpartitions

  sql/sql_show.cc@1.337.2.1, 2006-05-31 09:33:05-04:00, mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se +12 -9
    Added missing check for LINEAR keyword on subpartitions
    Small remove of duplicate code

ChangeSet@1.1616.2144.136, 2006-05-31 15:07:11+02:00, mskold@mysql.com +2 -0
  Removed dead code that had been commented out

  ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.38.1.18, 2006-05-31 15:06:54+02:00, mskold@mysql.com +1 -1
    Removed dead code that had been commented out

  ndb/src/ndbapi/NdbDictionaryImpl.hpp@1.18.1.5, 2006-05-31 15:06:54+02:00, mskold@mysql.com +0 -1
    Removed dead code that had been commented out

ChangeSet@1.1810.1746.6, 2006-05-31 14:27:31+02:00, tnurnberg@mysql.com +1 -0
  Bug#18235: assertion/crash when windows mysqld is ended with ctrl-c
  
  Two threads both try a shutdown sequence which creates a race to the
  de-init/free of certain resources.
  
  This exists in similar form in the client as 17926: "mysql.exe crashes
  when ctrl-c is pressed in windows."

  sql/mysqld.cc@1.439.1.115, 2006-05-31 14:27:23+02:00, tnurnberg@mysql.com +5 -1
    We have three potential ways of hitting the iceberg:
    - unireg_end()   has basic de-init
    - unireg_abort() has extended de-init
    - main() has a de-init sequence similar to unireg_abort()
    
    In the Windows version of the server, Control-C is handled
    in a different thread from the one main() is in.  The main
    loop is told to end, then unireg_abort() is called.  Its
    de-init and that of main() will then race each other for
    mutex- and cond-var-destroys, free(), and finally exit().
    
    This patch introduces a special case for Windows that will eliminate
    the race by ending the signal-handler via unireg_end() instead if
    SIGINT is signalled.  This seems the least intrusive fix that still
    fixes user-visible behaviour.

ChangeSet@1.2169.7.7, 2006-05-31 14:55:28+03:00, jani@ua141d10.elisa.omakaista.fi +3 -0
  Merge from 5.0 to 5.1. Third part with fixes.

  mysql-test/r/mysqldump.result@1.108, 2006-05-31 14:55:21+03:00, jani@ua141d10.elisa.omakaista.fi +3 -3
    Change in output from low letter to capital letter.
    Fixed test.

  scripts/mysql_create_system_tables.sh@1.40, 2006-05-31 14:55:21+03:00, jani@ua141d10.elisa.omakaista.fi +1 -1
    definer was removed from part of the key.

  vio/viosocket.c@1.39, 2006-05-31 14:55:21+03:00, jani@ua141d10.elisa.omakaista.fi +15 -8
    Fixed output from DBUG_PRINT() to match the style
    in other parts of the code.

ChangeSet@1.1810.1755.1, 2006-05-31 13:36:28+02:00, tnurnberg@mysql.com +3 -0
  Bug#18462: mysqldump does not dump view structures correctly
  
  (The above problem only occurs with -T -- create a separate file for
  each table / view.) This ChangeSet results in correct output of view-
  information while omitting the information for the view's stand-in
  table. The rationale is that with -T, the user is likely interested
  in transferring part of a database, not the db in its entirety (that
  would be difficult as replay order is obscure, the files being named
  for the table/view they contain rather than getting a sequence number).

  client/mysqldump.c@1.214.5.1, 2006-05-31 13:36:19+02:00, tnurnberg@mysql.com +3 -0
    Added missing fclose(). Before, a view's stand-in table would get
    dumped in get_table_structure(), and the file would remain open.
    get_view_structure() would re-open the same file and write to it,
    resulting in garbage.  The way we handle it now, the table-struct
    gets closed, then the opening of the view-struct (same name)
    overwrites it. (The SQL for the view drop-if-exists the table,
    anyway.) If this were not desired and we wanted SQL for the views
    that contains the create for the stand-in table, we'd hand a mode
    to open_sql_file_for_table(), which would feature O_APPEND in
    get_view_structure(), but not in get_table_structure().

  mysql-test/r/mysqldump.result@1.83.6.1, 2006-05-31 13:36:20+02:00, tnurnberg@mysql.com +19 -0
    prove mysqldump -T (each item gets its own file) dumps views correctly

  mysql-test/t/mysqldump.test@1.76.7.1, 2006-05-31 13:36:20+02:00, tnurnberg@mysql.com +21 -0
    prove mysqldump -T (each item gets its own file) dumps views correctly

ChangeSet@1.1810.1754.2, 2006-05-31 12:51:21+02:00, aelkin@dl145k.mysql.com +2 -0
  BUG#14157: utf8 encoding in binlog without set character_set_client
  
  missed table to drop after merge from 4.1 

  mysql-test/r/mysqlbinlog.result@1.24, 2006-05-31 12:51:15+02:00, aelkin@dl145k.mysql.com +5 -1
    result changed

  mysql-test/t/mysqlbinlog.test@1.21.1.8, 2006-05-31 12:51:15+02:00, aelkin@dl145k.mysql.com +1 -1
    manual merge post-fix

ChangeSet@1.2119.345.92, 2006-05-31 11:57:35+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    print some in case of error

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.107, 2006-05-31 11:57:32+02:00, jonas@perch.ndb.mysql.com +1 -0
    print scan state in case of error

ChangeSet@1.2169.2.4, 2006-05-31 10:30:48+02:00, serg@sergbook.mysql.com +2 -0
  proper cleanup after the test

  mysql-test/r/ndb_dd_backuprestore.result@1.6, 2006-05-31 10:30:38+02:00, serg@sergbook.mysql.com +7 -0
    proper cleanup after the test

  mysql-test/t/ndb_dd_backuprestore.test@1.5, 2006-05-31 10:30:38+02:00, serg@sergbook.mysql.com +10 -0
    proper cleanup after the test

ChangeSet@1.2154.42.1, 2006-05-31 10:28:42+02:00, mskold@mysql.com +11 -0
  Bug #16997 Table rename that changes database does not rename indexes: Moved index tables to system database

  mysql-test/r/ndb_rename.result@1.1, 2006-05-31 10:25:07+02:00, mskold@mysql.com +24 -0

  mysql-test/r/ndb_rename.result@1.0, 2006-05-31 10:25:07+02:00, mskold@mysql.com +0 -0
    BitKeeper file /home/marty/MySQL/mysql-5.1-new/mysql-test/r/ndb_rename.result

  mysql-test/t/ndb_rename.test@1.1, 2006-05-31 10:25:06+02:00, mskold@mysql.com +36 -0

  mysql-test/t/ndb_rename.test@1.0, 2006-05-31 10:25:06+02:00, mskold@mysql.com +0 -0
    BitKeeper file /home/marty/MySQL/mysql-5.1-new/mysql-test/t/ndb_rename.test

  sql/ha_ndbcluster.cc@1.307.2.1, 2006-05-31 10:27:44+02:00, mskold@mysql.com +35 -0
    Bug #16997 Table rename that changes database does not rename indexes: Moved index tables to system database

  storage/ndb/include/ndbapi/Ndb.hpp@1.49.1.2, 2006-05-31 10:27:45+02:00, mskold@mysql.com +5 -0
    Bug #16997 Table rename that changes database does not rename indexes: Moved index tables to system database

  storage/ndb/include/ndbapi/NdbDictionary.hpp@1.76, 2006-05-31 10:27:45+02:00, mskold@mysql.com +10 -0
    Bug #16997 Table rename that changes database does not rename indexes: Moved index tables to system database

  storage/ndb/src/ndbapi/Ndb.cpp@1.68.1.3, 2006-05-31 10:27:45+02:00, mskold@mysql.com +31 -2
    Bug #16997 Table rename that changes database does not rename indexes: Moved index tables to system database

  storage/ndb/src/ndbapi/NdbDictionary.cpp@1.57, 2006-05-31 10:27:45+02:00, mskold@mysql.com +8 -0
    Bug #16997 Table rename that changes database does not rename indexes: Moved index tables to system database

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.133.2.1, 2006-05-31 10:27:48+02:00, mskold@mysql.com +13 -1
    Bug #16997 Table rename that changes database does not rename indexes: Moved index tables to system database

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp@1.57.3.1, 2006-05-31 10:27:48+02:00, mskold@mysql.com +53 -2
    Bug #16997 Table rename that changes database does not rename indexes: Moved index tables to system database

  storage/ndb/src/ndbapi/NdbImpl.hpp@1.20, 2006-05-31 10:27:48+02:00, mskold@mysql.com +2 -0
    Bug #16997 Table rename that changes database does not rename indexes: Moved index tables to system database

  storage/ndb/src/ndbapi/Ndbinit.cpp@1.37.1.1, 2006-05-31 10:27:48+02:00, mskold@mysql.com +3 -0
    Bug #16997 Table rename that changes database does not rename indexes: Moved index tables to system database

ChangeSet@1.1810.1753.1, 2006-05-31 10:22:44+02:00, ingo@mysql.com +5 -0
  Bug#19604 - CHECK TABLE with concurrent INSERT can reset auto_increment
  
  CHECK TABLE did temporarily clear the auto_increment value.
  It runs with a read lock, allowing other readers and
  conurrent INSERTs. The latter could grab the wrong value
  in this moment.
  
  CHECK TABLE does no longer modify the auto_increment value.
  Not even for a short moment.

  myisam/mi_check.c@1.129.13.1, 2006-05-31 10:22:39+02:00, ingo@mysql.com +16 -18
    Bug#19604 - CHECK TABLE with concurrent INSERT can reset auto_increment
    In chk_key() and update_auto_increment_key() in the repair_only
    case, do not touch info->s->state.auto_increment. Especially
    chk_key() can be called from CHECK TABLE with a read lock.
    Concurrent inserts could grab a temporarily changed value.
    Added minor style fixes.

  myisam/mi_key.c@1.38.11.1, 2006-05-31 10:22:39+02:00, ingo@mysql.com +6 -8
    Bug#19604 - CHECK TABLE with concurrent INSERT can reset auto_increment
    Changed update_auto_increment() to retrieve_auto_increment()
    to reflect that it does not change the auto_increment by
    itself any more. This must now be done externally if needed.

  myisam/mi_update.c@1.17.4.1, 2006-05-31 10:22:39+02:00, ingo@mysql.com +2 -1
    Bug#19604 - CHECK TABLE with concurrent INSERT can reset auto_increment
    Added explicit update of info->s->state.auto_increment
    after the change from update_auto_increment() to
    retrieve_auto_increment().

  myisam/mi_write.c@1.50.7.1, 2006-05-31 10:22:39+02:00, ingo@mysql.com +2 -1
    Bug#19604 - CHECK TABLE with concurrent INSERT can reset auto_increment
    Added explicit update of info->s->state.auto_increment
    after the change from update_auto_increment() to
    retrieve_auto_increment().

  myisam/myisamdef.h@1.74.9.1, 2006-05-31 10:22:39+02:00, ingo@mysql.com +1 -1
    Bug#19604 - CHECK TABLE with concurrent INSERT can reset auto_increment
    Changed update_auto_increment() to retrieve_auto_increment()
    to reflect that it does not change the auto_increment by
    itself any more. This must now be done externally if needed.

ChangeSet@1.2169.7.5, 2006-05-31 11:18:58+03:00, jani@a193-229-222-105.elisa-laajakaista.fi +2 -0
  Merge from 5.0

  mysql-test/extra/rpl_tests/rpl_insert_id.test@1.6, 2006-05-31 11:18:51+03:00, jani@a193-229-222-105.elisa-laajakaista.fi +2 -0
    Manual merge from 5.0. In 5.0 this was in another file.

  sql/field.cc@1.313, 2006-05-31 11:18:51+03:00, jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Removed unused variable.

ChangeSet@1.1810.1752.2, 2006-05-31 00:07:58-07:00, acurtis@xiphis.org +3 -0
  Bug#12096
    "Add line for non-executable stack in .s files"
    Fix so that configure will use "--noexecstack" for assembler if gcc supports
    option and compiled C doesn't need executable stack.

  config/ac-macros/compiler_flag.m4@1.3, 2006-05-31 00:07:54-07:00, acurtis@xiphis.org +22 -0
    Bug#12096
      Add macro to check if "--noexecstack" should be used when compiling assembler

  configure.in@1.245.49.1, 2006-05-31 00:07:54-07:00, acurtis@xiphis.org +4 -0
    Bug#12096
      Add macro to check if "--noexecstack" should be used when compiling assembler

  strings/Makefile.am@1.49.1.1, 2006-05-31 00:07:54-07:00, acurtis@xiphis.org +0 -6
    Bug#12096
      Automake knows how to handle assembler

ChangeSet@1.2169.3.6, 2006-05-31 10:50:35+04:00, petr@mysql.com +1 -0
  fix csv test failure on aix

  storage/csv/ha_tina.cc@1.47.1.3, 2006-05-31 10:50:31+04:00, petr@mysql.com +5 -4
    one cannot sync file, opened for reading

ChangeSet@1.2119.345.91, 2006-05-31 08:22:54+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - 
    fix return value of "testBasic -n InsertError2 T1"

  storage/ndb/test/ndbapi/testBasic.cpp@1.14, 2006-05-31 08:22:51+02:00, jonas@perch.ndb.mysql.com +2 -1
    fix return value

ChangeSet@1.2119.345.90, 2006-05-31 08:18:27+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    fix testNodeRestart -n Bug18612 when running with only 1 node group

  storage/ndb/test/ndbapi/testNodeRestart.cpp@1.26, 2006-05-31 08:18:24+02:00, jonas@perch.ndb.mysql.com +4 -1
    This test needs 2 node groups.

ChangeSet@1.1810.1707.3, 2006-05-30 17:10:53-07:00, acurtis@xiphis.org +3 -0
  Bug#19648
    "Merge table does not work with bit types"
     MERGE should have HA_CAN_BIT_FIELD feature bit set or else table row is
     formatted incorrectly.

  mysql-test/r/merge.result@1.43.1.5, 2006-05-30 17:10:50-07:00, acurtis@xiphis.org +6 -0
    Bug#19648
      Test for fix

  mysql-test/t/merge.test@1.37.1.4, 2006-05-30 17:10:50-07:00, acurtis@xiphis.org +9 -0
    Bug#19648
      Test for fix

  sql/ha_myisammrg.h@1.40.1.1, 2006-05-30 17:10:50-07:00, acurtis@xiphis.org +2 -1
    Bug#19648
      Must have HA_CAN_BIT_FIELD for BIT type support

ChangeSet@1.2154.23.3, 2006-05-31 01:52:14+02:00, tomas@poseidon.ndb.mysql.com +3 -0
  ndb: release LOCK_open during mysqld schema sync and mysqld sync with binlog (create/drop/rename table)
  + increase timeout for sync... which now should never occur

  sql/ha_ndbcluster.cc@1.307.1.1, 2006-05-31 01:52:07+02:00, tomas@poseidon.ndb.mysql.com +6 -6
    ndb: release LOCK_open during mysqld schema sync and mysqld sync with binlog (create/drop/rename table)
    + increase timeout for sync... which now should never occur

  sql/ha_ndbcluster_binlog.cc@1.60.1.1, 2006-05-31 01:52:08+02:00, tomas@poseidon.ndb.mysql.com +32 -4
    ndb: release LOCK_open during mysqld schema sync and mysqld sync with binlog (create/drop/rename table)
    + increase timeout for sync... which now should never occur

  sql/ha_ndbcluster_binlog.h@1.13, 2006-05-31 01:52:08+02:00, tomas@poseidon.ndb.mysql.com +3 -2
    ndb: release LOCK_open during mysqld schema sync and mysqld sync with binlog (create/drop/rename table)
    + increase timeout for sync... which now should never occur

ChangeSet@1.2169.11.1, 2006-05-30 23:21:44+02:00, ngrishakin@mysql.com +1 -0
  disabled.def with ndb_dd_backuprestore test disabled

  mysql-test/t/disabled.def@1.159, 2006-05-30 23:21:04+02:00, ngrishakin@mysql.com +1 -0
    disabled.def with ndb_dd_backuprestore test disabled

ChangeSet@1.1810.1744.11, 2006-05-30 23:05:34+04:00, evgen@moonbone.local +3 -0
  item_cmpfunc.cc, func_in.result, multi_update.result:
    After merge fix

  mysql-test/r/func_in.result@1.27, 2006-05-30 23:04:46+04:00, evgen@moonbone.local +8 -0
    After merge fix

  mysql-test/r/multi_update.result@1.44, 2006-05-30 23:04:34+04:00, evgen@moonbone.local +1 -0
    After merge fix

  sql/item_cmpfunc.cc@1.187.1.17, 2006-05-30 23:05:05+04:00, evgen@moonbone.local +23 -0
    After merge fix

ChangeSet@1.2154.35.5, 2006-05-30 20:06:29+02:00, serg@serg.mylan +1 -0
  don't try to "estimate" a number of words that a plugin parser can produce

  storage/myisam/mi_check.c@1.146, 2006-05-30 20:06:14+02:00, serg@serg.mylan +27 -3
    don't try to "estimate" a number of words that a plugin parser can produce

ChangeSet@1.2169.2.2, 2006-05-30 18:21:03+02:00, serg@sergbook.mysql.com +4 -0
  sql/Makefile.am:    better mysqld dependencies
  sql/discover.cc:    close(-1) bug
  sql/slave.cc:       DBUG_ENTER/RETURN tags
  ha_archive.cc:      double-close bug

  sql/Makefile.am@1.141, 2006-05-30 18:20:58+02:00, serg@sergbook.mysql.com +1 -1
    better mysqld dependencies

  sql/discover.cc@1.5, 2006-05-30 18:20:58+02:00, serg@sergbook.mysql.com +1 -1
    close(-1) bug

  sql/slave.cc@1.270.2.1, 2006-05-30 18:20:58+02:00, serg@sergbook.mysql.com +171 -72
    DBUG_ENTER/RETURN tags

  storage/archive/ha_archive.cc@1.93, 2006-05-30 18:20:59+02:00, serg@sergbook.mysql.com +5 -12
    double-close bug

ChangeSet@1.2154.35.4, 2006-05-30 18:18:13+02:00, serg@serg.mylan +1 -0
  reduce error log spamming by old privilege tables. If they're old,
  report it once, don't whine about every missing column.

  sql/table.cc@1.215.1.1, 2006-05-30 18:17:59+02:00, serg@serg.mylan +11 -0
    reduce error log spamming by old privilege tables. If they're old,
    report it once, don't whine about every missing column.

ChangeSet@1.2154.35.3, 2006-05-30 18:15:18+02:00, serg@serg.mylan +9 -0
  Now ftparser does not need to bother about memory management -
  it can tell MySQL to make a copy of everything (bug#17123)

  include/mysql/plugin.h@1.13.1.2, 2006-05-30 18:14:53+02:00, serg@serg.mylan +15 -1
    Now ftparser does not need to bother about memory management -
    it can tell MySQL to make a copy of everything (bug#17123)
    MYSQL_FTFLAGS_NEED_COPY flag

  storage/myisam/ft_boolean_search.c@1.102, 2006-05-30 18:14:53+02:00, serg@serg.mylan +3 -0
    param->flags

  storage/myisam/ft_nlq_search.c@1.44, 2006-05-30 18:14:53+02:00, serg@serg.mylan +6 -2
    param->flags. ft_parse takes a mem_root as an argument

  storage/myisam/ft_parser.c@1.54, 2006-05-30 18:14:53+02:00, serg@serg.mylan +12 -13
    ftparser takes a memroot as an argument. words are copied there, if necessary.
    memroot is reset for every parsing and free'd at the end of the statement.

  storage/myisam/ft_update.c@1.42.1.1, 2006-05-30 18:14:53+02:00, serg@serg.mylan +26 -28
    ftparser takes a memroot as an argument. words are copied there, if necessary.
    memroot is reset for every parsing and free'd at the end of the statement.

  storage/myisam/ftdefs.h@1.36.1.1, 2006-05-30 18:14:53+02:00, serg@serg.mylan +8 -6
    ftparser takes a memroot as an argument. words are copied there, if necessary.
    memroot is reset for every parsing and free'd at the end of the statement.

  storage/myisam/mi_check.c@1.145, 2006-05-30 18:14:53+02:00, serg@serg.mylan +7 -3
    ftparser takes a memroot as an argument. words are copied there, if necessary

  storage/myisam/myisamdef.h@1.87, 2006-05-30 18:14:53+02:00, serg@serg.mylan +9 -7
    memroot for ftparser in MI_INFO and MI_SORT_PARAM

  storage/myisam/sort.c@1.52, 2006-05-30 18:14:54+02:00, serg@serg.mylan +1 -0
    free ftparser memroot

ChangeSet@1.2169.3.5, 2006-05-30 18:44:26+04:00, petr@mysql.com +1 -0
  one more portability fix

  storage/csv/ha_tina.h@1.20, 2006-05-30 18:44:22+04:00, petr@mysql.com +1 -1
    portability fix

ChangeSet@1.1810.1732.2, 2006-05-30 14:49:05+02:00, tnurnberg@mysql.com +3 -0
  Bug#17371: Unable to dump a schema with invalid views
  
  'show create' works even on views that are short of a base-table (this
  throw a warning though, like you would expect). Unfortunately, this is
  not what mysqldump uses; it creates stand-in tables and hence requests
  'show fields' on the view which fails with missing base-tables.  The
  --force option prevents the dump from stopping at this point; furthermore
  this patch dumps a comment showing create for the offending view for
  better diagnostics. This solution was confirmed by submitter as solving
  their/clients' problem. Problem might become non-issue once mysqldump no
  longer creates stand-in tables.

  client/mysqldump.c@1.214.4.1, 2006-05-30 14:48:59+02:00, tnurnberg@mysql.com +20 -1
    Dump a comment showing create for a view if we can't show fields for it for
    better diagnostics.

  mysql-test/r/mysqldump.result@1.83.5.1, 2006-05-30 14:48:59+02:00, tnurnberg@mysql.com +9 -0
    add test for #17371 - be defensive. if we can't do a full dump on a view
    (incl. 'show fields' for a stand-in table), at least create a comment with
    the 'show create' info when --force is given.

  mysql-test/t/mysqldump.test@1.76.6.1, 2006-05-30 14:48:59+02:00, tnurnberg@mysql.com +13 -0
    add test for #17371 - be defensive. if we can't do a full dump on a view
    (incl. 'show fields' for a stand-in table), at least create a comment with
    the 'show create' info when --force is given.

ChangeSet@1.2154.23.2, 2006-05-30 13:55:25+02:00, tomas@poseidon.ndb.mysql.com +3 -0
  Bug #20142 show engine ndb status may falsely return latest epoch == 0

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.133.1.1, 2006-05-30 13:55:17+02:00, tomas@poseidon.ndb.mysql.com +0 -2
    Bug #20142 show engine ndb status may falsely return latest epoch == 0

  storage/ndb/src/ndbapi/NdbTransaction.cpp@1.57, 2006-05-30 13:55:17+02:00, tomas@poseidon.ndb.mysql.com +9 -0
    Bug #20142 show engine ndb status may falsely return latest epoch == 0

  storage/ndb/src/ndbapi/Ndbif.cpp@1.41, 2006-05-30 13:55:17+02:00, tomas@poseidon.ndb.mysql.com +0 -4
    Bug #20142 show engine ndb status may falsely return latest epoch == 0

ChangeSet@1.2169.7.3, 2006-05-30 10:22:31+02:00, andrey@lmy004. +1 -0
  update show authors

  sql/authors.h@1.14, 2006-05-30 10:22:21+02:00, andrey@lmy004. +1 -0
    update show authors

ChangeSet@1.1616.2619.3, 2006-05-30 00:08:58-07:00, igor@rurik.mysql.com +33 -0
  Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
  refers to a column name.

  sql/share/french/errmsg.txt@1.63.23.2, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/estonian/errmsg.txt@1.64.22.2, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/norwegian/errmsg.txt@1.63.23.2, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/japanese-sjis/errmsg.txt@1.1.3.2, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.\

  sql/share/danish/errmsg.txt@1.62.23.2, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/italian/errmsg.txt@1.70.23.2, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/portuguese/errmsg.txt@1.64.24.2, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/slovak/errmsg.txt@1.64.23.2, 2006-05-30 00:08:51-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/polish/errmsg.txt@1.63.22.2, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/greek/errmsg.txt@1.64.22.2, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.\

  sql/share/ukrainian/errmsg.txt@1.27.22.2, 2006-05-30 00:08:51-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/german/errmsg.txt@1.64.23.2, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/korean/errmsg.txt@1.63.22.2, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/swedish/errmsg.txt@1.64.23.2, 2006-05-30 00:08:51-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/norwegian-ny/errmsg.txt@1.63.23.2, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/czech/errmsg.txt@1.64.23.2, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/romanian/errmsg.txt@1.62.24.2, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/japanese/errmsg.txt@1.63.22.2, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/hungarian/errmsg.txt@1.65.22.2, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/dutch/errmsg.txt@1.66.23.2, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/russian/errmsg.txt@1.61.22.2, 2006-05-30 00:08:51-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/spanish/errmsg.txt@1.64.25.2, 2006-05-30 00:08:51-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/english/errmsg.txt@1.70.32.2, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  sql/share/serbian/errmsg.txt@1.18.19.2, 2006-05-30 00:08:51-07:00, igor@rurik.mysql.com +0 -1
    Removed error message ER_INDEX_DOES_NOT_EXIST,
    used ER_KEY_DOES_NOT_EXITS instead.

  include/mysqld_error.h@1.61.1.48, 2006-05-30 00:08:49-07:00, igor@rurik.mysql.com +1 -1
    Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
    refers to a column name.

  include/sql_state.h@1.8.1.6, 2006-05-30 00:08:49-07:00, igor@rurik.mysql.com +0 -1
    Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
    refers to a column name.

  mysql-test/r/explain.result@1.15.1.2, 2006-05-30 00:08:49-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
    refers to a column name.

  mysql-test/r/key_cache.result@1.13.1.4, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +1 -1
    Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
    refers to a column name.

  mysql-test/r/preload.result@1.7.1.2, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +1 -1
    Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
    refers to a column name.

  mysql-test/r/select.result@1.34.3.36, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +4 -4
    Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
    refers to a column name.
    Added a new test case.

  mysql-test/t/explain.test@1.8.1.2, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
    refers to a column name.

  mysql-test/t/select.test@1.28.4.11, 2006-05-30 00:08:50-07:00, igor@rurik.mysql.com +4 -4
    Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
    refers to a column name.
    Added a new test case.

  sql/sql_base.cc@1.145.1.126, 2006-05-30 00:08:51-07:00, igor@rurik.mysql.com +1 -1
    Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
    refers to a column name.

ChangeSet@1.2169.3.4, 2006-05-30 10:48:32+04:00, petr@mysql.com +1 -0
  fix windows build of CSV

  storage/csv/ha_tina.cc@1.47.1.2, 2006-05-30 10:48:28+04:00, petr@mysql.com +4 -3
    portability fix

ChangeSet@1.1810.1750.2, 2006-05-30 10:45:23+05:00, gluh@eagle.intranet.mysql.r18.ru +6 -0
  Bug#17204 "second CALL to procedure crashes Server"
  Bug#18282 "INFORMATION_SCHEMA.TABLES provides inconsistent info about invalid views"
  This bug caused crashes or resulted in wrong data being returned
  when one tried to obtain information from I_S tables about views
  using stored functions.
  
  It was caused by the fact that we were using LEX representing
  statement which were doing select from I_S tables as active LEX
  when contents of I_S table were built. So state of this LEX both
  affected and was affected by open_tables() calls which happened
  during this process. This resulted in wrong behavior and in
  violations of some of invariants which caused crashes.
  
  This fix tries to solve this problem by properly saving/resetting
  and restoring part of LEX which affects and is affected by the
  process of opening tables and views in get_all_tables() routine.
  To simplify things we separated this part of LEX in a new class
  and made LEX its descendant.

  mysql-test/r/information_schema_db.result@1.1.1.6, 2006-05-30 10:45:16+05:00, gluh@mysql.com +56 -1
    test case

  mysql-test/t/information_schema_db.test@1.4, 2006-05-30 10:45:16+05:00, gluh@mysql.com +59 -1
    test case

  sql/sql_lex.cc@1.142.14.1, 2006-05-30 10:45:16+05:00, gluh@mysql.com +90 -18
    To simplify saving/resetting and restoring part of LEX which
    affects and is affected by the process of opening tables and
    views we moved it to new class Query_tables_list and made LEX
    descendant of this class. Also introduced two LEX methods 
    which can be used to save and reset or to restore this state.

  sql/sql_lex.h@1.175.1.42, 2006-05-30 10:45:16+05:00, gluh@mysql.com +92 -59
    To simplify saving/resetting and restoring part of LEX which
    affects and is affected by the process of opening tables and
    views we moved it to new class Query_tables_list and made LEX
    descendant of this class. Also introduced two LEX methods 
    which can be used to save and reset or to restore this state.

  sql/sql_show.cc@1.253.1.65, 2006-05-30 10:45:16+05:00, gluh@mysql.com +9 -8
    Now in get_all_tables() routine we properly save/reset and
    restore part of LEX (statement table list and information
    about routines used) which affects and is affected by the
    process of opening tables and views.

  sql/sql_table.cc@1.239.1.73, 2006-05-30 10:45:17+05:00, gluh@mysql.com +2 -0
    Now we clean-up LEX after opening table (view) in two stages.
    In the first stage we call LEX::cleanup_after_one_table_open()
    to clean-up selects lists and derived tables state. In the
    second stage which happens after close_thread_tables() is
    invoked we call Query_tables_list::reset_query_tables_list(FALSE)
    to rollback changes in Query_tables_list.

ChangeSet@1.2169.8.1, 2006-05-30 00:08:48-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -0
  BUG#19801: Valgrind error in check_list_constants
  Needed some special handling of the case when no_list_values == 0

  mysql-test/r/partition.result@1.36.12.1, 2006-05-30 00:08:42-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +12 -0
    Added a couple of new test cases

  mysql-test/t/partition.test@1.37.12.1, 2006-05-30 00:08:42-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +6 -0
    Added a couple of new test cases

  sql/partition_info.cc@1.8.1.6, 2006-05-30 00:08:43-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +23 -18
    Rearranged some code to handle case where no_list_values == 0 which
    happens when one partition with only one value == NULL.

  sql/sql_partition.cc@1.70.2.1, 2006-05-30 00:08:43-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +17 -4
    Rearranged code to remove compiler warning and also since we
    now have handled the case where no_list_values == 0 in a special
    case before coming here
    Added code for handling the special case where no_list_values == 0

ChangeSet@1.2169.4.3, 2006-05-30 01:36:35+02:00, ngrishakin@mysql.com +2 -0
  removed partitions from ndb_dd_backuprestore test

  mysql-test/r/ndb_dd_backuprestore.result@1.5, 2006-05-30 01:36:06+02:00, ngrishakin@mysql.com +0 -330
    removed partitions from ndb_dd_backuprestore test

  mysql-test/t/ndb_dd_backuprestore.test@1.4, 2006-05-30 01:35:46+02:00, ngrishakin@mysql.com +0 -180
    removed partitions from ndb_dd_backuprestore test

ChangeSet@1.2169.7.1, 2006-05-30 03:26:58+04:00, petr@mysql.com +1 -0
  update show authors

  sql/authors.h@1.13, 2006-05-30 03:26:54+04:00, petr@mysql.com +2 -1
    update show authors

ChangeSet@1.1616.2623.1, 2006-05-30 00:36:48+04:00, evgen@moonbone.local +3 -0
  Fixed bug#18360: Incorrect type coercion in IN() results in false comparison
  
  The IN() function uses agg_cmp_type() to aggregate all types of its arguments
  to find out some common type for comparisons. In this particular case the 
  char() and the int was aggregated to double because char() can contain values
  like '1.5'. But all strings which do not start from a digit are converted to
  0. thus 'a' and 'z' become equal. 
  This behaviour is reasonable when all function arguments are constants. But 
  when there is a field or an expression this can lead to false comparisons. In
  this case it makes more sense to coerce constants to the type of the field
  argument.
  
  The agg_cmp_type() function now aggregates types of constant and non-constant
  items separately. If some non-constant items will be found then their
  aggregated type will be returned. Thus after the aggregation constants will be
  coerced to the aggregated type. 

  mysql-test/r/func_in.result@1.12.1.5, 2006-05-30 00:34:50+04:00, evgen@moonbone.local +21 -0
    Added test case for bug#18360: Incorrect type coercion in IN() results in false comparison.

  mysql-test/t/func_in.test@1.14.1.3, 2006-05-30 00:34:42+04:00, evgen@moonbone.local +12 -0
    Added test case for bug#18360: Incorrect type coercion in IN() results in false comparison.

  sql/item_cmpfunc.cc@1.111.23.5, 2006-05-30 00:35:04+04:00, evgen@moonbone.local +35 -2
    Fixed bug#18360: Incorrect type coercion in IN() results in false comparison.
    The agg_cmp_type() function now aggregates types of constant and non-constant
    items separately. If some non-constant items will be found then their
    aggregated type will be returned. Thus after the aggregation constants will
    be coerced to the aggregated type.

ChangeSet@1.2169.5.1, 2006-05-29 14:51:46-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
  BUG#17310: Archive error for drop database

  mysql-test/r/partition.result@1.36.11.1, 2006-05-29 14:51:40-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +12 -0
    Added new test case

  mysql-test/t/partition.test@1.37.11.1, 2006-05-29 14:51:40-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +17 -0
    Added new test case

  storage/archive/ha_archive.cc@1.91.1.1, 2006-05-29 14:51:41-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +9 -8
    Moved some code to avoid that ha_archive::create leaves files after error in create
    There are still cases where this occurs but now only on file creation errors.

ChangeSet@1.1616.2144.133, 2006-05-29 20:09:22+02:00, kent@mysql.com +1 -0
  make_win_src_distribution.sh:
    Convert to DOS EOL if dsp/dsw is in package

  scripts/make_win_src_distribution.sh@1.27.2.9, 2006-05-29 20:08:36+02:00, kent@mysql.com +1 -0
    Convert to DOS EOL if dsp/dsw is in package

ChangeSet@1.2154.3.3, 2006-05-29 18:01:58+03:00, aelkin@mysql.com +4 -0
  Bug#19188: incorrect temporary table name of DROP query in replication
  
  merge with 5.0.
  
  specific test case in inside of #17263 section (grave quoted name).

  mysql-test/r/rpl_temporary.result@1.27.1.1, 2006-05-29 18:01:52+03:00, aelkin@mysql.com +9 -3
    results changed

  mysql-test/t/rpl_temporary.test@1.22.1.1, 2006-05-29 18:01:52+03:00, aelkin@mysql.com +12 -16
    merge with 5.0 also to eliminate a typo with '@'.

  sql/mysql_priv.h@1.399.6.1, 2006-05-29 18:01:52+03:00, aelkin@mysql.com +10 -0
    merged manually with 5.0 using 5.1 specific table's name "access path".

  sql/sql_base.cc@1.320.1.3, 2006-05-29 18:01:52+03:00, aelkin@mysql.com +83 -90
    manual merge with 5.0. The 5.0 code was taken verbatim and changed according to
    a. rbr, b. db,tabl_name are LEX_STRIGs, c. close_temporary needs 3 args.

ChangeSet@1.1810.1700.3, 2006-05-29 16:27:45+02:00, msvensson@shellback.(none) +4 -0
  Add missing drop table

  mysql-test/r/analyze.result@1.7, 2006-05-29 16:27:03+02:00, msvensson@shellback.(none) +1 -0
    Add missing drop table

  mysql-test/r/ps.result@1.56.1.10, 2006-05-29 16:27:39+02:00, msvensson@shellback.(none) +1 -0
    Add missing drop table

  mysql-test/t/analyze.test@1.10, 2006-05-29 16:27:39+02:00, msvensson@shellback.(none) +1 -0
    Add missing drop table

  mysql-test/t/ps.test@1.56.1.8, 2006-05-29 16:27:39+02:00, msvensson@shellback.(none) +1 -1
    Add missing drop table

ChangeSet@1.1810.1747.3, 2006-05-29 17:30:30+04:00, anozdrin@mysql.com +1 -0
  Fix for BUG#18023: IM: instance can be started several times;
  monitor interval must be > 2sec.

  server-tools/instance-manager/guardian.cc@1.20.1.1, 2006-05-29 17:30:27+04:00, anozdrin@mysql.com +14 -8
    Start instance only if it is really crashed.

ChangeSet@1.1810.1747.2, 2006-05-29 17:26:52+04:00, anozdrin@mysql.com +1 -0
  Fix for BUG#19391: IM fails to start after two executions

  server-tools/instance-manager/manager.cc@1.32.1.1, 2006-05-29 17:26:50+04:00, anozdrin@mysql.com +24 -22
    Start Listener-thread after all initialization.

ChangeSet@1.1810.1707.2, 2006-05-29 15:26:23+02:00, ingo@mysql.com +3 -0
  Bug#19815 - CREATE/RENAME/DROP DATABASE can deadlock on a global read lock
  
  The order of acquiring LOCK_mysql_create_db
  and wait_if_global_read_lock() was wrong. It could happen
  that a thread held LOCK_mysql_create_db while waiting for
  the global read lock to be released. The thread with the
  global read lock could try to administrate a database too.
  It would first try to lock LOCK_mysql_create_db and hang...
  
  The check if the current thread has the global read lock
  is done in wait_if_global_read_lock(), which could not be
  reached because of the hang in LOCK_mysql_create_db.
  
  Now I exchanged the order of acquiring LOCK_mysql_create_db
  and wait_if_global_read_lock(). This makes 
  wait_if_global_read_lock() fail with an error message for
  the thread with the global read lock. No deadlock happens.

  mysql-test/r/lock_multi.result@1.15.2.1, 2006-05-29 15:26:18+02:00, ingo@mysql.com +8 -0
    Bug#19815 - CREATE/RENAME/DROP DATABASE can deadlock on a global read lock
    The test result

  mysql-test/t/lock_multi.test@1.13.2.1, 2006-05-29 15:26:18+02:00, ingo@mysql.com +35 -0
    Bug#19815 - CREATE/RENAME/DROP DATABASE can deadlock on a global read lock
    The test case

  sql/sql_db.cc@1.120.1.8, 2006-05-29 15:26:18+02:00, ingo@mysql.com +46 -14
    Bug#19815 - CREATE/RENAME/DROP DATABASE can deadlock on a global read lock
    Exchanged the order of acquiring LOCK_mysql_create_db
    and wait_if_global_read_lock().

ChangeSet@1.1810.1748.3, 2006-05-29 15:05:31+02:00, msvensson@neptunus.(none) +3 -0
  Update after merge to 5.0

  mysql-test/r/grant.result@1.37.4.2, 2006-05-29 15:05:25+02:00, msvensson@neptunus.(none) +19 -18
    Reorder test result

  mysql-test/t/grant.test@1.39.1.2, 2006-05-29 15:05:25+02:00, msvensson@neptunus.(none) +1 -1
    Add "use test"

  sql/sql_acl.cc@1.128.28.2, 2006-05-29 15:05:25+02:00, msvensson@neptunus.(none) +5 -1
    Add check if host is NULL
    Add check if grant_name->host.hostname is null

ChangeSet@1.1810.1718.3, 2006-05-29 15:01:04+02:00, msvensson@shellback.(none) +1 -0
  Add new file md4.cpp to VC++ project file

  extra/yassl/taocrypt/taocrypt.vcproj@1.2, 2006-05-29 15:00:59+02:00, msvensson@shellback.(none) +24 -0
    Add new file md4.cpp to VC++ project file

ChangeSet@1.1810.1718.2, 2006-05-29 14:49:51+02:00, msvensson@shellback.(none) +6 -0
  Import from yaSSL 

  extra/yassl/mySTL/stdexcept.hpp@1.5, 2006-03-29 01:56:39+02:00, msvensson@shellback.(none) +0 -2
    Import patch yassl.diff

  extra/yassl/include/yassl_error.hpp@1.4, 2006-05-22 20:12:03+02:00, msvensson@shellback.(none) +2 -2
    Import patch yassl.diff

  extra/yassl/src/yassl_error.cpp@1.6, 2006-05-22 20:12:03+02:00, msvensson@shellback.(none) +3 -0
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp@1.18, 2006-05-22 20:04:52+02:00, msvensson@shellback.(none) +8 -3
    Import patch yassl.diff

  extra/yassl/taocrypt/src/integer.cpp@1.23, 2006-05-22 20:04:53+02:00, msvensson@shellback.(none) +4 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/src/misc.cpp@1.13, 2006-05-29 13:42:21+02:00, msvensson@shellback.(none) +13 -0
    Import patch yassl.diff

ChangeSet@1.2154.41.1, 2006-05-29 16:46:46+05:00, svoj@may.pils.ru +5 -0
  BUG#19580 - FULLTEXT search produces wrong results on UTF-8 columns
  
  The problem was that MySQL hadn't true ctype implementation. As a
  result many multibyte punctuation/whitespace characters were
  treated as word characters.
  
  This fix uses recently added CTYPE table for unicode character sets
  (WL1386) to detect unicode punctuation/whitespace characters
  correctly.
  
  Note: this is incompatible change since it changes parser behavior.
  One will have to use REPAIR TABLE statement to rebuild fulltext
  indexes.

  mysql-test/r/fulltext2.result@1.14, 2006-05-29 16:45:08+05:00, svoj@may.pils.ru +8 -0
    Testcase for BUG#19580.

  mysql-test/t/fulltext2.test@1.15, 2006-05-29 16:45:08+05:00, svoj@may.pils.ru +10 -0
    Testcase for BUG#19580.

  storage/myisam/ft_parser.c@1.52.1.1, 2006-05-29 16:45:08+05:00, svoj@may.pils.ru +22 -10
    Use WL1386 "CTYPE table for unicode character sets" functionality.

  storage/myisam/ft_update.c@1.43, 2006-05-29 16:45:08+05:00, svoj@may.pils.ru +0 -5
    Use WL1386 "CTYPE table for unicode character sets" functionality.
    
    Reverse fix for BUG#16489 "utf8 + fulltext leads to corrupt index
    file.". It is not needed anymore, since we have true ctype
    implementation.

  storage/myisam/ftdefs.h@1.37, 2006-05-29 16:45:09+05:00, svoj@may.pils.ru +3 -2
    Use WL1386 "CTYPE table for unicode character sets" functionality.
    
    Rework true_word_char macro so it accepts ctype instead of charset
    as first param. It doesn't use my_isalnum anymore, but instead
    directly checks ctype.
    Obsolete word_char macro removed.

ChangeSet@1.2154.40.3, 2006-05-29 13:16:29+02:00, andrey@lmy004. +2 -0
  add missing events_grant test

  mysql-test/r/events_grant.result@1.1, 2006-05-29 13:16:19+02:00, andrey@lmy004. +121 -0

  mysql-test/r/events_grant.result@1.0, 2006-05-29 13:16:19+02:00, andrey@lmy004. +0 -0
    BitKeeper file /work/mysql-5.1-runtime/mysql-test/r/events_grant.result

  mysql-test/t/events_grant.test@1.1, 2006-05-29 13:16:19+02:00, andrey@lmy004. +105 -0

  mysql-test/t/events_grant.test@1.0, 2006-05-29 13:16:19+02:00, andrey@lmy004. +0 -0
    BitKeeper file /work/mysql-5.1-runtime/mysql-test/t/events_grant.test

ChangeSet@1.2154.40.2, 2006-05-29 13:12:34+02:00, andrey@lmy004. +1 -0
  local variable interval to interval_tmp because it hides
  Event_timed::interval

  sql/event_timed.cc@1.55, 2006-05-29 13:12:26+02:00, andrey@lmy004. +23 -20
    local variable interval to interval_tmp because it hides
    Event_timed::interval

ChangeSet@1.1810.1747.1, 2006-05-29 14:45:20+04:00, kroki@mysql.com +1 -0
  Avoid race between master and slave.

  mysql-test/t/rpl_insert_id.test@1.13.1.3, 2006-05-29 14:45:15+04:00, kroki@mysql.com +2 -0
    Avoid race between master and slave.

ChangeSet@1.2154.40.1, 2006-05-29 10:39:45+02:00, andrey@lmy004. +12 -0
  Fix for bug #17394 - Events namespace is wrong

  sql/event_priv.h@1.22, 2006-05-29 10:39:35+02:00, andrey@lmy004. +2 -3
    make events non-user specific (namespace change)

  mysql-test/lib/init_db.sql@1.27, 2006-05-29 10:39:35+02:00, andrey@lmy004. +1 -1
    remove definer from PK

  mysql-test/r/events.result@1.35, 2006-05-29 10:39:35+02:00, andrey@lmy004. +1 -82
    update results

  mysql-test/r/system_mysql_db.result@1.42, 2006-05-29 10:39:35+02:00, andrey@lmy004. +1 -1
    update results

  mysql-test/t/events.test@1.30, 2006-05-29 10:39:35+02:00, andrey@lmy004. +3 -80
    remove I_S.EVENTS test and move it to events_grant.test

  scripts/mysql_fix_privilege_tables.sql@1.45, 2006-05-29 10:39:35+02:00, andrey@lmy004. +2 -2
    change table definition

  sql/event_timed.cc@1.54, 2006-05-29 10:39:35+02:00, andrey@lmy004. +5 -4
    make events non-user specific (namespace change)

  sql/event_scheduler.cc@1.2.1.1, 2006-05-29 10:39:35+02:00, andrey@lmy004. +13 -5
    make events non-user specific (namespace change)

  sql/event.cc@1.41, 2006-05-29 10:39:35+02:00, andrey@lmy004. +39 -48
    make events non-user specific (namespace change)

  sql/event.h@1.29, 2006-05-29 10:39:35+02:00, andrey@lmy004. +1 -1
    make events non-user specific (namespace change)

  sql/sql_parse.cc@1.544.9.1, 2006-05-29 10:39:35+02:00, andrey@lmy004. +5 -5
    make events non-user specific (namespace change)

  sql/sql_show.cc@1.331.1.7, 2006-05-29 10:39:35+02:00, andrey@lmy004. +184 -78
    SHOW EVENTS is available to everyone who has EVENT on specific schema.
    No additional privileges are needed to see others' events.
    - user A has events in db1 and db2
    - user B has events in db1 and db3
    A will see all his events from db1 and db2 as well as B's events
    from db1 but not from db3.
    B will see her events from db1 and db3. In addition B will see
    only A's events from db1 but not db2.

ChangeSet@1.1810.1745.1, 2006-05-29 12:32:08+05:00, ramil@mysql.com +1 -0
  after merge fix.
  

  client/mysqldump.c@1.214.3.3, 2006-05-29 12:31:59+05:00, ramil@mysql.com +2 -1
    after merge fix.
      - 'lengths' declaration moved to the beginning of the block.

ChangeSet@1.2154.8.11, 2006-05-29 09:31:47+02:00, msvensson@shellback.(none) +1 -0
  Write ndb logs to $cluster->{'data_dir'}

  mysql-test/mysql-test-run.pl@1.114.2.6, 2006-05-29 09:31:38+02:00, msvensson@shellback.(none) +3 -4
    Write ndb logs to $cluster->{'data_dir'}

ChangeSet@1.1810.1744.5, 2006-05-29 09:26:31+02:00, msvensson@neptunus.(none) +1 -0
  Update result file after merge

  mysql-test/r/mysqldump.result@1.83.4.4, 2006-05-29 09:26:27+02:00, msvensson@neptunus.(none) +1 -1
    Update result file after merge

ChangeSet@1.1810.1744.3, 2006-05-29 11:17:38+05:00, ramil@mysql.com +3 -0
  manual merge

  client/mysqldump.c@1.214.3.2, 2006-05-29 11:17:28+05:00, ramil@mysql.com +24 -40
    manual merge

  mysql-test/r/mysqldump.result@1.83.4.2, 2006-05-29 11:17:28+05:00, ramil@mysql.com +39 -1
    manual merge

  mysql-test/t/mysqldump.test@1.76.5.2, 2006-05-29 11:17:29+05:00, ramil@mysql.com +13 -2
    manual merge

ChangeSet@1.1616.2622.1, 2006-05-29 00:32:59+04:00, evgen@moonbone.local +3 -0
  Fixed bug#19225: unchecked error results in server crash
  
  In multi-table delete a table for delete can't be used for selecting in
  subselects. Appropriate error was raised but wasn't checked which leads to a
  crash at the execution phase.
  
  The mysql_execute_command() now checks for errors before executing select
  for multi-delete.

  mysql-test/r/multi_update.result@1.25.1.19, 2006-05-29 00:30:55+04:00, evgen@moonbone.local +5 -0
    Added test case for bug#19225: unchecked error results in server crash

  mysql-test/t/multi_update.test@1.26.1.22, 2006-05-29 00:30:42+04:00, evgen@moonbone.local +8 -0
    Added test case for bug#19225: unchecked error results in server crash

  sql/sql_parse.cc@1.271.1.210, 2006-05-29 00:31:11+04:00, evgen@moonbone.local +2 -2
    Fixed bug#19225: unchecked error results in server crash
    The mysql_execute_command() now checks for errors before executing select for multi-delete.

ChangeSet@1.1616.2621.1, 2006-05-28 22:01:38+04:00, evgen@moonbone.local +3 -0
  Fixed bug#15351: Wrong collation used for comparison of md5() and sha()
  argument can lead to a wrong result.
  
  md5() and sha() functions treat their arguments as case sensitive strings.
  But when they are compared their arguments were compared as a case
  insensitive strings which leads to two functions with different arguments
  and thus different results to being identical. This can lead to a wrong
  decision made in the range optimizer and thus lead to a wrong result set.
  
  Item_func_md5::fix_length_and_dec() and Item_func_sha::fix_length_and_dec()
  functions now set binary collation on their arguments.

  mysql-test/r/func_str.result@1.70.1.30, 2006-05-28 21:58:49+04:00, evgen@moonbone.local +15 -0
     Added test case for the bug#15351: Wrong collation used for comparison of md5() and sha()
    argument can lead to a wrong result.

  mysql-test/t/func_str.test@1.64.1.18, 2006-05-28 21:59:00+04:00, evgen@moonbone.local +12 -0
    Added test case for the bug#15351: Wrong collation used for comparison of md5() and sha()
    argument can lead to a wrong result.

  sql/item_strfunc.cc@1.196.8.1, 2006-05-28 21:56:57+04:00, evgen@moonbone.local +18 -2
    Fixed bug#15351: Wrong collation used for comparison of md5() and sha()
    argument can lead to a wrong result.
    Item_func_md5::fix_length_and_dec() and Item_func_sha::fix_length_and_dec()
    functions now set binary collation on their arguments.

ChangeSet@1.1616.2620.1, 2006-05-28 19:47:01+03:00, aelkin@mysql.com +1 -0
  BUG#14157: utf8 encoding in binlog without set character_set_client
  
  refining the test case to exclude problems with koi8r on some platforms.

  mysql-test/t/mysqlbinlog.test@1.8.1.13, 2006-05-28 19:46:57+03:00, aelkin@mysql.com +2 -2
    replacing unavailble on some platforms koi8r with latin1 still to preserve the essence of the testcase:
    to generate utf8 names in binlog, despite client charset was different, and
    to digest this binlog.

ChangeSet@1.2154.35.2, 2006-05-28 17:02:50+02:00, serg@serg.mylan +7 -0
  Incompatible ftparser plugin API change.
  mysql_parse() and mysql_add_word() now take a MYSQL_FTPARSER_PARAM*,
  not a mysql_ftparam.

  client/Makefile.am@1.71, 2006-05-28 17:02:35+02:00, serg@serg.mylan +7 -7
    don't fail when rm cannot delete from read-only dir

  include/mysql/plugin.h@1.13.1.1, 2006-05-28 17:02:35+02:00, serg@serg.mylan +17 -14
    Incompatible ftparser plugin API change.
    mysql_parse() and mysql_add_word() now take a MYSQL_FTPARSER_PARAM*,
    not a mysql_ftparam.

  plugin/fulltext/plugin_example.c@1.10, 2006-05-28 17:02:35+02:00, serg@serg.mylan +1 -4
    Incompatible ftparser plugin API change.
    mysql_parse() and mysql_add_word() now take a MYSQL_FTPARSER_PARAM*,
    not a mysql_ftparam.

  sql/sql_plugin.cc@1.20.1.1, 2006-05-28 17:02:35+02:00, serg@serg.mylan +3 -2
    fix min_plugin_info_interface_version to be less error-prone

  storage/myisam/ft_boolean_search.c@1.101, 2006-05-28 17:02:35+02:00, serg@serg.mylan +21 -21
    Incompatible ftparser plugin API change.
    mysql_parse() and mysql_add_word() now take a MYSQL_FTPARSER_PARAM*,
    not a mysql_ftparam.

  storage/myisam/ft_parser.c@1.53, 2006-05-28 17:02:36+02:00, serg@serg.mylan +9 -8
    Incompatible ftparser plugin API change.
    mysql_parse() and mysql_add_word() now take a MYSQL_FTPARSER_PARAM*,
    not a mysql_ftparam.

  storage/myisam/ft_static.c@1.34, 2006-05-28 17:02:36+02:00, serg@serg.mylan +1 -1
    Incompatible ftparser plugin API change.
    mysql_parse() and mysql_add_word() now take a MYSQL_FTPARSER_PARAM*,
    not a mysql_ftparam.

ChangeSet@1.2119.600.1, 2006-05-28 14:51:01+02:00, serg@sergbook.mysql.com +35 -0
  handlerton cleanup:
  duplicate fields removed, st_mysql_storage_engine added to support
  run-time handlerton initialization (no compiler warnings), handler API
  is now tied to MySQL version, handlerton->plugin mapping added
  (slot-based), dummy default_hton removed, plugin-type-specific
  initialization generalized, built-in plugins are now initialized too,
  --default-storage-engine no longer needs a list of storage engines
  in handle_options().
  
  mysql-test-run.pl bugfixes

  sql/ha_berkeley.cc@1.177, 2006-05-28 14:50:53+02:00, serg@sergbook.mysql.com +30 -51
    handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
    initialize handlerton run-time to avoid compiler warnings

  sql/ha_berkeley.h@1.81, 2006-05-28 14:50:53+02:00, serg@sergbook.mysql.com +1 -1
    handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
    initialize handlerton run-time to avoid compiler warnings

  include/mysql/plugin.h@1.14, 2006-05-28 14:50:52+02:00, serg@sergbook.mysql.com +22 -2
    added st_mysql_storage_engine
    made handlerton tied to MySQL version

  mysql-test/mysql-test-run.pl@1.112.3.1, 2006-05-28 14:50:53+02:00, serg@sergbook.mysql.com +3 -1
    bugfixes (umask, --no-defaults)

  mysql-test/r/ndb_dd_basic.result@1.10, 2006-05-28 14:50:53+02:00, serg@sergbook.mysql.com +1 -1
    update error message

  mysql-test/t/partition_mgm_err2.test@1.3, 2006-05-28 14:50:53+02:00, serg@sergbook.mysql.com +1 -1
    fix typo

  sql/ha_ndbcluster.cc@1.303.2.1, 2006-05-28 14:50:53+02:00, serg@sergbook.mysql.com +23 -31
    handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
    initialize handlerton run-time to avoid compiler warnings

  sql/ha_ndbcluster.h@1.133.2.1, 2006-05-28 14:50:53+02:00, serg@sergbook.mysql.com +4 -0
    handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
    initialize handlerton run-time to avoid compiler warnings

  sql/ha_ndbcluster_binlog.cc@1.51.1.1, 2006-05-28 14:50:53+02:00, serg@sergbook.mysql.com +3 -3
    no 'name' in the handlerton anymore

  sql/ha_partition.cc@1.49.1.1, 2006-05-28 14:50:53+02:00, serg@sergbook.mysql.com +17 -43
    handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
    initialize handlerton run-time to avoid compiler warnings

  sql/handler.cc@1.231.1.1, 2006-05-28 14:50:54+02:00, serg@sergbook.mysql.com +55 -95
    handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
    handlerton->plugin mapping

  sql/handler.h@1.206.2.2, 2006-05-28 14:50:54+02:00, serg@sergbook.mysql.com +4 -27
    handlerton cleanup: remove duplicate fields

  sql/log.cc@1.204.5.1, 2006-05-28 14:50:54+02:00, serg@sergbook.mysql.com +21 -50
    handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
    initialize handlerton run-time to avoid compiler warnings

  sql/mysql_priv.h@1.399.5.1, 2006-05-28 14:50:54+02:00, serg@sergbook.mysql.com +1 -1
    handler.h needs plugin.h

  sql/mysqld.cc@1.534.21.1, 2006-05-28 14:50:54+02:00, serg@sergbook.mysql.com +27 -25
    Convert --default-storage-engine to a handlerton* when
    all storage engines are initialized and not in getopt

  sql/set_var.cc@1.164.6.7, 2006-05-28 14:50:54+02:00, serg@sergbook.mysql.com +1 -1
    no name in the handlerton anymore

  sql/sql_parse.cc@1.544.8.1, 2006-05-28 14:50:54+02:00, serg@sergbook.mysql.com +2 -2
    no default_hton anymore

  sql/sql_partition.cc@1.70.1.1, 2006-05-28 14:50:54+02:00, serg@sergbook.mysql.com +3 -13
    no name in the handlerton anymore

  sql/sql_plugin.cc@1.21, 2006-05-28 14:50:54+02:00, serg@sergbook.mysql.com +22 -22
    generalize plugin type-specific initialization.
    initialize built-in plugins too

  sql/sql_plugin.h@1.8, 2006-05-28 14:50:54+02:00, serg@sergbook.mysql.com +2 -0
    generalize plugin type-specific initialization.

  sql/sql_show.cc@1.331.2.4, 2006-05-28 14:50:54+02:00, serg@sergbook.mysql.com +28 -23
    st_mysql_storage_engine structure
    no name in the handlerton anymore

  sql/sql_table.cc@1.331.7.1, 2006-05-28 14:50:55+02:00, serg@sergbook.mysql.com +5 -4
    no name in the handlerton anymore
    no default_hton anymore

  sql/sql_tablespace.cc@1.5, 2006-05-28 14:50:55+02:00, serg@sergbook.mysql.com +5 -5
    no name in the handlerton anymore
    no default_hton anymore

  sql/sql_yacc.yy@1.474.4.1, 2006-05-28 14:50:55+02:00, serg@sergbook.mysql.com +11 -5
    no default_hton anymore
    issue "unknown storage engine" warning where it is discovered

  storage/archive/ha_archive.cc@1.90.1.1, 2006-05-28 14:50:55+02:00, serg@sergbook.mysql.com +16 -48
    handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
    initialize handlerton run-time to avoid compiler warnings

  storage/archive/ha_archive.h@1.47, 2006-05-28 14:50:55+02:00, serg@sergbook.mysql.com +1 -1
    handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
    initialize handlerton run-time to avoid compiler warnings

  storage/blackhole/ha_blackhole.cc@1.34, 2006-05-28 14:50:55+02:00, serg@sergbook.mysql.com +17 -53
    handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
    initialize handlerton run-time to avoid compiler warnings

  storage/csv/ha_tina.cc@1.44.2.1, 2006-05-28 14:50:55+02:00, serg@sergbook.mysql.com +11 -42
    handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
    initialize handlerton run-time to avoid compiler warnings

  storage/example/ha_example.cc@1.38, 2006-05-28 14:50:55+02:00, serg@sergbook.mysql.com +13 -55
    handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
    initialize handlerton run-time to avoid compiler warnings

  sql/ha_federated.cc@1.59, 2006-05-28 14:50:53+02:00, serg@sergbook.mysql.com +17 -46
    handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
    initialize handlerton run-time to avoid compiler warnings

  sql/ha_heap.cc@1.90, 2006-05-28 14:50:53+02:00, serg@sergbook.mysql.com +18 -45
    handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
    initialize handlerton run-time to avoid compiler warnings

  sql/ha_innodb.cc@1.275, 2006-05-28 14:50:53+02:00, serg@sergbook.mysql.com +37 -52
    handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
    initialize handlerton run-time to avoid compiler warnings

  sql/ha_innodb.h@1.121, 2006-05-28 14:50:53+02:00, serg@sergbook.mysql.com +1 -1
    handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
    initialize handlerton run-time to avoid compiler warnings

  sql/ha_myisam.cc@1.177.2.1, 2006-05-28 14:50:53+02:00, serg@sergbook.mysql.com +19 -56
    handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
    initialize handlerton run-time to avoid compiler warnings

  sql/ha_myisammrg.cc@1.88, 2006-05-28 14:50:53+02:00, serg@sergbook.mysql.com +18 -45
    handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
    initialize handlerton run-time to avoid compiler warnings

ChangeSet@1.1616.2619.1, 2006-05-27 23:57:33-07:00, igor@rurik.mysql.com +33 -0
  Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
  refers to a column name.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/french/errmsg.txt@1.63.23.1, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/estonian/errmsg.txt@1.64.22.1, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/norwegian/errmsg.txt@1.63.23.1, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/japanese-sjis/errmsg.txt@1.1.3.1, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/danish/errmsg.txt@1.62.23.1, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/italian/errmsg.txt@1.70.23.1, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/portuguese/errmsg.txt@1.64.24.1, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/slovak/errmsg.txt@1.64.23.1, 2006-05-27 23:57:28-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/polish/errmsg.txt@1.63.22.1, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/greek/errmsg.txt@1.64.22.1, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/ukrainian/errmsg.txt@1.27.22.1, 2006-05-27 23:57:28-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/german/errmsg.txt@1.64.23.1, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/korean/errmsg.txt@1.63.22.1, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/swedish/errmsg.txt@1.64.23.1, 2006-05-27 23:57:28-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/norwegian-ny/errmsg.txt@1.63.23.1, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/czech/errmsg.txt@1.64.23.1, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/romanian/errmsg.txt@1.62.24.1, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/japanese/errmsg.txt@1.63.22.1, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/hungarian/errmsg.txt@1.65.22.1, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/dutch/errmsg.txt@1.66.23.1, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/russian/errmsg.txt@1.61.22.1, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/spanish/errmsg.txt@1.64.25.1, 2006-05-27 23:57:28-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/english/errmsg.txt@1.70.32.1, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  sql/share/serbian/errmsg.txt@1.18.19.1, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  include/mysqld_error.h@1.61.1.47, 2006-05-27 23:57:26-07:00, igor@rurik.mysql.com +1 -0
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  include/sql_state.h@1.8.1.5, 2006-05-27 23:57:26-07:00, igor@rurik.mysql.com +1 -0
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  mysql-test/r/explain.result@1.15.1.1, 2006-05-27 23:57:26-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  mysql-test/r/key_cache.result@1.13.1.3, 2006-05-27 23:57:26-07:00, igor@rurik.mysql.com +1 -1
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  mysql-test/r/preload.result@1.7.1.1, 2006-05-27 23:57:26-07:00, igor@rurik.mysql.com +1 -1
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  mysql-test/r/select.result@1.34.3.35, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +12 -2
    Added a test case for bug #17873.

  mysql-test/t/explain.test@1.8.1.1, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +2 -2
    Fixed bug #17873.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

  mysql-test/t/select.test@1.28.4.10, 2006-05-27 23:57:27-07:00, igor@rurik.mysql.com +17 -2
    Added a test case for bug #17873.

  sql/sql_base.cc@1.145.1.125, 2006-05-27 23:57:28-07:00, igor@rurik.mysql.com +1 -1
    Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
    refers to a column name.
    Added a new error message ER_INDEX_DOES_NOT_EXIST.

ChangeSet@1.2169.1.5, 2006-05-27 20:30:53-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  BUG#19310: Add partition using InnoDB crashes MySQL Server
  Added new test case

  mysql-test/r/partition_innodb.result@1.2, 2006-05-27 20:30:48-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +8 -0
    Added new test case

  mysql-test/t/partition_innodb.test@1.2, 2006-05-27 20:30:48-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +10 -0
    Added new test case

ChangeSet@1.2169.1.4, 2006-05-27 20:23:22-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  BUG#19903: Add partition crashes
  Added new test cases

  mysql-test/r/partition_innodb.result@1.1, 2006-05-27 20:22:27-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +86 -0

  mysql-test/r/partition_innodb.result@1.0, 2006-05-27 20:22:27-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +0 -0
    BitKeeper file /home/pappa/bug19122/mysql-test/r/partition_innodb.result

  mysql-test/t/partition_innodb.test@1.1, 2006-05-27 20:22:17-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +58 -0

  mysql-test/t/partition_innodb.test@1.0, 2006-05-27 20:22:17-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +0 -0
    BitKeeper file /home/pappa/bug19122/mysql-test/t/partition_innodb.test

ChangeSet@1.2169.1.3, 2006-05-27 20:16:17-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  BUG#19830: ALTER TABLE REORGANIZE partition crashes
  New test cases added

  mysql-test/r/partition_range.result@1.8.1.1, 2006-05-27 20:16:11-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +105 -0
    New test case

  mysql-test/t/partition_range.test@1.7, 2006-05-27 20:16:12-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +114 -0
    New test case

ChangeSet@1.2119.599.1, 2006-05-27 17:36:45-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +9 -0
  BUG#19695: Showed partition options when table options were not shown

  mysql-test/r/ndb_partition_key.result@1.16.4.1, 2006-05-27 17:36:37-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +6 -6
    Manicural changes removed a space from a double-space

  mysql-test/r/partition.result@1.36.10.1, 2006-05-27 17:36:37-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +24 -13
    Manicural changes removed a space from a double-space
    Added new test case

  mysql-test/r/partition_02myisam.result@1.4.1.1, 2006-05-27 17:36:37-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +24 -24
    Manicural changes removed a space from a double-space

  mysql-test/r/partition_range.result@1.9, 2006-05-27 17:36:38-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -2
    Manicural changes removed a space from a double-space

  mysql-test/t/partition.test@1.37.10.1, 2006-05-27 17:36:38-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +12 -0
    New test case

  sql/sql_partition.cc@1.68.3.1, 2006-05-27 17:36:38-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +10 -8
    Removed unnecessary extra spaces
    Added show_partition_options set in the same way as when to show table options in SHOW CREATE TABLE

  sql/sql_partition.h@1.7.2.1, 2006-05-27 17:36:38-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Removed unnecessary extra spaces
    Added show_partition_options set in the same way as when to show table options in SHOW CREATE TABLE

  sql/sql_show.cc@1.331.3.1, 2006-05-27 17:36:39-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -1
    Removed unnecessary extra spaces
    Added show_partition_options set in the same way as when to show table options in SHOW CREATE TABLE

  sql/sql_table.cc@1.331.6.1, 2006-05-27 17:36:39-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -2
    Removed unnecessary extra spaces
    Added show_partition_options set in the same way as when to show table options in SHOW CREATE TABLE

ChangeSet@1.2119.598.1, 2006-05-27 16:34:13-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -0
  BUG#19305: COALESCE partition left partition files undropped

  mysql-test/r/partition_mgm.result@1.1, 2006-05-27 16:30:56-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +26 -0

  mysql-test/r/partition_mgm.result@1.0, 2006-05-27 16:30:56-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +0 -0
    BitKeeper file /home/pappa/bug19305/mysql-test/r/partition_mgm.result

  mysql-test/t/partition_mgm.test@1.1, 2006-05-23 07:56:19-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +15 -0

  mysql-test/t/partition_mgm.test@1.0, 2006-05-23 07:56:19-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +0 -0
    BitKeeper file /home/pappa/bug19305/mysql-test/t/partition_mgm.test

  sql/ha_partition.cc@1.48.2.1, 2006-05-27 16:34:05-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +6 -0
    Added deactivate entry also when deleting partitions

  sql/mysql_priv.h@1.399.4.1, 2006-05-27 16:34:05-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    Added alter_info to parameter list

  sql/sql_partition.cc@1.68.2.1, 2006-05-27 16:34:06-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +6 -5
    Set log_entry on partition_element for deleting partitions

ChangeSet@1.2154.39.1, 2006-05-27 08:05:39+03:00, vtkachenko@vadima.volia.com +2 -0
  sql_class.cc, mysql_priv.h:
    Added accessor to handler data.

  sql/mysql_priv.h@1.405, 2006-05-27 08:05:13+03:00, vtkachenko@vadima.volia.com +1 -0
    Added accessor to handler data.

  sql/sql_class.cc@1.257.3.2, 2006-05-27 08:05:26+03:00, vtkachenko@vadima.volia.com +5 -0
    Added accessor to handler data.

ChangeSet@1.2119.595.2, 2006-05-26 18:44:52-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -0
  BUG#19122: MySQL Server crashes when ALTER TABLE t1 REBUILD PARTITION on InnoDB table

  mysql-test/r/partition.result@1.36.9.1, 2006-05-26 18:44:48-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +11 -0
    New test case

  sql/lock.cc@1.92, 2006-05-26 18:44:48-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +29 -16
    Added new flag to lock_table_name to ensure we get proper name lock even when we already have lock on table.

  sql/mysql_priv.h@1.399.2.2, 2006-05-26 18:44:48-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -3
    Added new flag to lock_table_name to ensure we get proper name lock even when we already have lock on table.
    Added table_list to ALTER_PARTITION_PARAM_TYPE and changed some const char * to char*
    

  sql/sql_base.cc@1.318.2.1, 2006-05-26 18:44:48-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Added new flag to lock_table_name to ensure we get proper name lock even when we already have lock on table.
    Added table_list to ALTER_PARTITION_PARAM_TYPE and changed some const char * to char*
    

  sql/sql_partition.cc@1.68.1.1, 2006-05-26 18:44:48-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +125 -34
    New methods to
    1) Get a name lock even when we already have one
    2) New method that unlocks table and closes the handlers.
    3) Release name lock
    Integrated those new methods to ensure that handlers are unlocked and closed when drop or
    rename is called on them. There is still some work to update the comments to reflect the
    last changes.

ChangeSet@1.2154.38.1, 2006-05-26 16:09:39-04:00, elliot@mysql.com +1 -0
  Set the Windows README file to EOLN_NATIVE so that it doesn't look
  horrible when checked out on Windows.

  win/README@1.5, 2006-05-26 16:07:53-04:00, elliot@mysql.com +0 -0
    Turn on EOLN_NATIVE flag

ChangeSet@1.1810.1740.1, 2006-05-26 11:49:39+03:00, gkodinov@mysql.com +4 -0
  Bug #14875: Bad view DEFINER makes SHOW CREATE VIEW fail
  
  When reading a view definition from a .frm file it was
  throwing a SQL error if the DEFINER user is not defined.
  Changed it to a warning to match the (documented) case
  when a view with undefined DEFINER user is created.

  mysql-test/r/view_grant.result@1.8.3.1, 2006-05-26 11:49:34+03:00, gkodinov@mysql.com +15 -0
    test case for the bug

  mysql-test/t/view_grant.test@1.8.2.1, 2006-05-26 11:49:34+03:00, gkodinov@mysql.com +14 -0
    test case for the bug

  sql/sql_acl.cc@1.128.1.66, 2006-05-26 11:49:34+03:00, gkodinov@mysql.com +2 -0
    Initialized the members to no privileges so even if
    the subsequent checks fail it will still initialize
    the security context.

  sql/table.cc@1.160.23.1, 2006-05-26 11:49:34+03:00, gkodinov@mysql.com +12 -2
    Turned the error of undefined DEFINER user in reading 
    a view definition to a warning. 

ChangeSet@1.1810.1739.1, 2006-05-26 11:47:53+03:00, gkodinov@mysql.com +14 -0
  BUG#18681: View privileges are broken
  
  The check for view security was lacking several points :
  1. Check with the right set of permissions : for each table ref that
  participates in a view there were the right credentials to use in it's
  security_ctx member, but these weren't used for checking the credentials.
  This makes hard enforcing the SQL SECURITY DEFINER|INVOKER property
  consistently.
  2. Because of the above the security checking for views was just ruled out
  in explicit ways in several places.
  3. The security was checked only for the columns of the tables that are
  brought into the query from a view. So if there is no column reference
  outside of the view definition it was not detecting the lack of access to
  the tables in the view in SQL SECURITY INVOKER mode.
  
  The fix below tries to fix the above 3 points.

  mysql-test/r/grant.result@1.37.1.14, 2006-05-26 11:47:46+03:00, gkodinov@mysql.com +24 -10
    removed nondeterminism (unspecified order) in some test output

  mysql-test/r/view_grant.result@1.8.1.6, 2006-05-26 11:47:46+03:00, gkodinov@mysql.com +70 -0
    Somewhat extended test case for the bug and similar queries.

  mysql-test/t/grant.test@1.40, 2006-05-26 11:47:46+03:00, gkodinov@mysql.com +13 -2
    removed nondeterminism (unspecified order) in some test output

  mysql-test/t/view_grant.test@1.8.1.4, 2006-05-26 11:47:46+03:00, gkodinov@mysql.com +81 -0
    Somewhat extended test case for the bug and similar queries.

  sql/mysql_priv.h@1.290.50.1, 2006-05-26 11:47:46+03:00, gkodinov@mysql.com +7 -0
    A wrapper for setup_tables that also checks access to the tables

  sql/sql_acl.cc@1.128.26.1, 2006-05-26 11:47:46+03:00, gkodinov@mysql.com +10 -5
    removed artificial security check stop and used the table ref's credentials.

  sql/sql_base.cc@1.235.57.1, 2006-05-26 11:47:46+03:00, gkodinov@mysql.com +52 -0
    a wrapper for setup_tables to check access to the tables

  sql/sql_delete.cc@1.144.1.30, 2006-05-26 11:47:46+03:00, gkodinov@mysql.com +10 -8
    wrapper called.

  sql/sql_insert.cc@1.146.21.1, 2006-05-26 11:47:46+03:00, gkodinov@mysql.com +5 -4
    wrapper called

  sql/sql_load.cc@1.78.1.17, 2006-05-26 11:47:46+03:00, gkodinov@mysql.com +5 -4
    wrapper called

  sql/sql_parse.cc@1.426.1.120, 2006-05-26 11:47:46+03:00, gkodinov@mysql.com +31 -8
    wrapper called and artificial check stop removed

  sql/sql_select.cc@1.312.71.1, 2006-05-26 11:47:47+03:00, gkodinov@mysql.com +4 -3
    wrapper called

  sql/sql_update.cc@1.154.2.34, 2006-05-26 11:47:47+03:00, gkodinov@mysql.com +10 -7
    wrapper called

  sql/table.cc@1.160.1.59, 2006-05-26 11:47:47+03:00, gkodinov@mysql.com +2 -1
    Mask table access to the view error as well.

ChangeSet@1.1810.1709.6, 2006-05-26 11:00:35+09:30, grog@mysql.com +2 -0
  mysqldump.result:
    Get output from modified test (dropping t1).
  mysqldump.test:
    Drop t1 at end so that the next test doesn't trip over it.

  mysql-test/r/mysqldump.result@1.83.1.12, 2006-05-26 10:35:53+09:30, grog@mysql.com +1 -0
    Get output from modified test (dropping t1).

  mysql-test/t/mysqldump.test@1.76.1.11, 2006-05-26 10:35:28+09:30, grog@mysql.com +1 -0
    Drop t1 at end so that the next test doesn't trip over it.

ChangeSet@1.1616.2618.1, 2006-05-26 01:24:14+04:00, evgen@moonbone.local +3 -0
  Fixed bug#16716: subselect in concat() may lead to a wrong result.
  
  The Item_func_concat::val_str() function tries to make as less re-allocations
  as possible. This results in appending strings returned by 2nd and next
  arguments to the string returned by 1st argument if the buffer for the first
  argument has enough free space. A constant subselect is evaluated only once 
  and its result is stored in an Item_cache_str. In the case when the first
  argument of the concat() function is such a subselect Item_cache_str returns
  the stored value and Item_func_concat::val_str() append values of other
  arguments to it. But for the next row the value in the Item_cache_str isn't
  restored because the subselect is a constant one and it isn't evaluated second
  time. This results in appending string values of 2nd and next arguments to the 
  result of the previous Item_func_concat::val_str() call.
  
  The Item_func_concat::val_str() function now checks whether the first argument 
  is a constant one and if so it doesn't append values of 2nd and next arguments
  to the string value returned by it.

  mysql-test/r/func_concat.result@1.7.1.1, 2006-05-26 01:22:52+04:00, evgen@moonbone.local +7 -0
    Added test case for bug#16716: subselect in concat() may lead to a wrong result.

  mysql-test/t/func_concat.test@1.6.1.3, 2006-05-26 01:22:03+04:00, evgen@moonbone.local +7 -0
    Added test case for bug#16716: subselect in concat() may lead to a wrong result.

  sql/item_strfunc.cc@1.196.6.9, 2006-05-26 01:23:02+04:00, evgen@moonbone.local +4 -1
    Fixed bug#16716: subselect in concat() may lead to a wrong result.
    The Item_func_concat::val_str() function now checks whether the first argument 
    is a constant one and if so it doesn't append values of 2nd and next arguments
    to the string value returned by it.

ChangeSet@1.2154.37.1, 2006-05-25 22:36:03+02:00, jmiller@mysql.com +2 -0
  Removing ./r/rpl_ndb_dd_partitions.result & ./t/rpl_ndb_dd_partitions.test since NDB only will support key partitions and moving them to the test-extra tree for safe keeping

  BitKeeper/deleted/.del-rpl_ndb_dd_partitions.result~9b09a8594e474be5@1.3, 2006-05-25 22:34:26+02:00, jmiller@mysql.com +0 -0
    Delete: mysql-test/r/rpl_ndb_dd_partitions.result

  BitKeeper/deleted/.del-rpl_ndb_dd_partitions.test~9a3f50999ab31151@1.3, 2006-05-25 22:34:38+02:00, jmiller@mysql.com +0 -0
    Delete: mysql-test/t/rpl_ndb_dd_partitions.test

ChangeSet@1.1810.1698.27, 2006-05-25 21:27:56+02:00, pekka@mysql.com +1 -0
  ndb - minor fix to unhandled error, already in 5.1  [ auto-incr ]

  sql/ha_ndbcluster.cc@1.175.30.3, 2006-05-25 21:27:10+02:00, pekka@mysql.com +2 -1
    minor fix to unhandled error, already in 5.1

ChangeSet@1.1616.2613.6, 2006-05-25 11:36:29-07:00, acurtis@xiphis.org +3 -0
  updated libtool/autoconf files

  config.guess@1.10.1.1, 2006-05-25 11:36:25-07:00, acurtis@xiphis.org +386 -307
    updated libtool/autoconf files

  config.sub@1.11.1.1, 2006-05-25 11:36:25-07:00, acurtis@xiphis.org +177 -51
    updated libtool/autoconf files

  ltmain.sh@1.15.1.1, 2006-05-25 11:36:25-07:00, acurtis@xiphis.org +1372 -698
    updated libtool/autoconf files

ChangeSet@1.2154.28.15, 2006-05-25 20:00:36+02:00, pekka@mysql.com +1 -0
  ndb - compile fix for Solaris 10 AMD64 -max GCC [ ulonglong != Uint64 ] v5.1

  sql/ha_ndbcluster.cc@1.309, 2006-05-25 19:57:52+02:00, pekka@mysql.com +4 -1
    compile fix for Solaris 10 AMD64 -max GCC [ ulonglong != Uint64 ]

ChangeSet@1.1810.1698.26, 2006-05-25 18:00:55+02:00, pekka@mysql.com +1 -0
  ndb - compile fix for Solaris 10 AMD64 -max GCC [ ulonglong != Uint64 ]

  sql/ha_ndbcluster.cc@1.175.30.2, 2006-05-25 17:59:48+02:00, pekka@mysql.com +3 -1
    compile fix for Solaris 10 AMD64 -max GCC

ChangeSet@1.2154.28.13, 2006-05-25 17:58:52+05:00, gluh@eagle.intranet.mysql.r18.ru +2 -0
  test fix

  mysql-test/r/partition.result@1.36.8.3, 2006-05-25 17:58:45+05:00, gluh@mysql.com +4 -4
    test fix

  mysql-test/t/partition.test@1.37.9.3, 2006-05-25 17:58:45+05:00, gluh@mysql.com +0 -1
    test fix

ChangeSet@1.2154.35.1, 2006-05-25 12:48:31+02:00, serg@serg.mylan +1 -0
  fix for BSD make

  unittest/Makefile.am@1.6, 2006-05-25 12:48:16+02:00, serg@serg.mylan +1 -1
    fix for BSD make

ChangeSet@1.2119.590.6, 2006-05-25 12:13:47+02:00, pekka@mysql.com +4 -0
  ndb - bug#14509 v5.1 part 2/2 : handler level

  mysql-test/r/ndb_basic.result@1.40.1.1, 2006-05-25 12:12:07+02:00, pekka@mysql.com +24 -24
    put auto-incr range under NDB_SHARE until otherwise decided..
    makes auto-incr process-global per table.  each use requires mutex

  mysql-test/t/ndb_alter_table.test@1.33, 2006-05-25 12:12:07+02:00, pekka@mysql.com +15 -15
    put auto-incr range under NDB_SHARE until otherwise decided..
    makes auto-incr process-global per table.  each use requires mutex

  sql/ha_ndbcluster.cc@1.303.1.3, 2006-05-25 12:12:07+02:00, pekka@mysql.com +9 -5
    put auto-incr range under NDB_SHARE until otherwise decided..
    makes auto-incr process-global per table.  each use requires mutex

  sql/ha_ndbcluster.h@1.133.1.1, 2006-05-25 12:12:07+02:00, pekka@mysql.com +14 -1
    put auto-incr range under NDB_SHARE until otherwise decided..
    makes auto-incr process-global per table.  each use requires mutex

ChangeSet@1.2119.590.5, 2006-05-25 12:03:02+02:00, pekka@mysql.com +7 -0
  ndb - bug#14509 v5.1 part 1/2 : ndb api level [requires part 2/2]

  storage/ndb/include/ndbapi/Ndb.hpp@1.53, 2006-05-25 12:00:34+02:00, pekka@mysql.com +29 -8
    add auto-incr methods which take explicit Ndb::TupleIdRange & argument
    for NDB API programs the range is under local dict cache (as in 5.0)
    the handler level uses its own Ndb objects and ranges

  storage/ndb/src/ndbapi/DictCache.cpp@1.22.1.2, 2006-05-25 12:00:34+02:00, pekka@mysql.com +1 -2
    add auto-incr methods which take explicit Ndb::TupleIdRange & argument
    for NDB API programs the range is under local dict cache (as in 5.0)
    the handler level uses its own Ndb objects and ranges

  storage/ndb/src/ndbapi/DictCache.hpp@1.14, 2006-05-25 12:00:34+02:00, pekka@mysql.com +1 -2
    add auto-incr methods which take explicit Ndb::TupleIdRange & argument
    for NDB API programs the range is under local dict cache (as in 5.0)
    the handler level uses its own Ndb objects and ranges

  storage/ndb/src/ndbapi/Ndb.cpp@1.73, 2006-05-25 12:00:34+02:00, pekka@mysql.com +97 -39
    add auto-incr methods which take explicit Ndb::TupleIdRange & argument
    for NDB API programs the range is under local dict cache (as in 5.0)
    the handler level uses its own Ndb objects and ranges

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.129.1.4, 2006-05-25 12:00:34+02:00, pekka@mysql.com +5 -8
    add auto-incr methods which take explicit Ndb::TupleIdRange & argument
    for NDB API programs the range is under local dict cache (as in 5.0)
    the handler level uses its own Ndb objects and ranges

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp@1.57.2.1, 2006-05-25 12:00:34+02:00, pekka@mysql.com +0 -2
    add auto-incr methods which take explicit Ndb::TupleIdRange & argument
    for NDB API programs the range is under local dict cache (as in 5.0)
    the handler level uses its own Ndb objects and ranges

  storage/ndb/src/ndbapi/ndberror.c@1.59, 2006-05-25 11:55:50+02:00, pekka@mysql.com +0 -1
    delete non-sense error 4336

ChangeSet@1.1810.1709.5, 2006-05-25 17:30:28+09:30, grog@mysql.com +3 -0
  BUG#17201: Improve handling of views.

  client/mysqldump.c@1.214.1.15, 2006-05-25 17:30:23+09:30, grog@mysql.com +29 -13
     Better view handling:
    
      Distinguish better between tables and views in the output.
      
      Add many comments about the distinctions between tables and views, and
      the tradeoffs that we make, notably that, since we don't maintain
      dependencies.
      
      get_table_structure: Clarify in the output that a view is first
      		       created as a workaround for the lack of
      		       dependencies.
      
      dump_table:  Return if we're trying to dump a view.
      
      dump_all_views_in_db: Don't call init_dumping.  It's already been done
                            in dump_all_tables_in_db.  This is the problem
                            reported in BUG#17201.
      
      Change the variable was_views to seen_views, and clarify the comment.
      The previous name was not overly "intuitive".

  client/mysqldump.c@1.214.1.14, 2006-05-25 16:53:04+09:30, grog@mysql.com +396 -396
    Remove tabs.

  client/mysqldump.c@1.214.1.13, 2006-05-25 16:52:41+09:30, grog@mysql.com +32 -32
    Remove trailing white space.

  mysql-test/r/mysqldump.result@1.83.1.11, 2006-05-25 17:30:23+09:30, grog@mysql.com +85 -13
    We no longer have spurious text in the results.
    Add results for the final test (BUG#17201)

  mysql-test/t/mysqldump.test@1.76.1.10, 2006-05-25 17:30:23+09:30, grog@mysql.com +15 -0
    Add a new test (BUG#17201)

ChangeSet@1.1810.1735.1, 2006-05-25 10:39:18+03:00, gkodinov@mysql.com +4 -0
  Bug #19700: subselect returning BIGINT always returned it as SIGNED
    
  The unsigned flag in Item was not propagated through the single value subqueries.
  This caused the result to be treated as signed.

  mysql-test/r/subselect.result@1.134.1.10, 2006-05-25 10:39:13+03:00, gkodinov@mysql.com +21 -0
    Added testcases for bug #19700

  mysql-test/t/subselect.test@1.119, 2006-05-25 10:39:13+03:00, gkodinov@mysql.com +22 -0
    Added testcases for bug #19700

  sql/item.h@1.183.5.1, 2006-05-25 10:39:13+03:00, gkodinov@mysql.com +1 -0
    Preserved the unsigned flag in Item_subselect

  sql/item_subselect.cc@1.113.1.13, 2006-05-25 10:39:13+03:00, gkodinov@mysql.com +1 -0
    Preserved the unsigned flag in Item_subselect

ChangeSet@1.2166, 2006-05-24 15:41:12-05:00, reggie@big_geek. +1 -0
  The previous patch fixed the csv engine to support dos, linux, and mac line endings.  The patch, however, had
  a problem when the table only has a single record in it.  This patch corrects that.
  
  ha_tina.cc:
    Fix problem with previous patch when there is only one record in the table

  storage/csv/ha_tina.cc@1.47, 2006-05-24 15:37:24-05:00, reggie@big_geek. +7 -0
    Fix problem with previous patch when there is only one record in the table

ChangeSet@1.2154.28.10, 2006-05-25 00:03:35+04:00, evgen@moonbone.local +1 -0
  sql_select.cc:
    After merge fix

  sql/sql_select.cc@1.406, 2006-05-25 00:03:16+04:00, evgen@moonbone.local +2 -2
    After merge fix

ChangeSet@1.2154.34.4, 2006-05-24 15:01:03-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  review fix

  sql/partition_info.cc@1.8.1.5, 2006-05-24 15:00:58-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    review fix

ChangeSet@1.2154.34.3, 2006-05-24 13:57:21-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  manual merge

  mysql-test/t/partition.test@1.37.9.2, 2006-05-24 13:57:16-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +14 -13
    manual merge
    MERGE: 1.37.8.1

ChangeSet@1.2163.1.2, 2006-05-24 12:43:03-05:00, reggie@big_geek. +3 -0
  some small fixups

  include/config-win.h@1.85.1.5, 2006-05-24 12:42:56-05:00, reggie@big_geek. +1 -0
    force time_t to be 32 bit on Visual C++ 2005 or later

  sql/net_serv.cc@1.91, 2006-05-24 12:42:56-05:00, reggie@big_geek. +3 -4
    include winsock after my_global so the time_t #define can take effect

  storage/csv/ha_tina.cc@1.46, 2006-05-24 12:42:56-05:00, reggie@big_geek. +14 -6
    fix the csv engine so that it supports DOS, Unix, and Mac line endings

ChangeSet@1.2119.596.2, 2006-05-24 13:35:52-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  BUG#19304: Merge handler not part of partitioned tables
  Review fix

  sql/partition_info.cc@1.8.5.4, 2006-05-24 13:35:47-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Review fix

ChangeSet@1.1810.1729.2, 2006-05-24 17:21:35+03:00, monty@mysql.com +8 -0
  More DBUG statements
  Replaced COND_refresh with COND_global_read_lock becasue of a bug in NTPL threads when using different mutexes as arguments to pthread_cond_wait()
  The original code caused a hang in FLUSH TABLES WITH READ LOCK in some circumstances because pthread_cond_broadcast() was not delivered to other threads.
  This fixes:
  Bug#16986: Deadlock condition with MyISAM tables
  Bug#20048: FLUSH TABLES WITH READ LOCK causes a deadlock

  mysql-test/r/flush.result@1.14, 2006-05-24 17:21:32+03:00, monty@mysql.com +7 -0
    Added test case for deadlock with FLUSH TABLES WITH READ LOCK

  mysql-test/r/lock_multi.result@1.15.1.1, 2006-05-24 17:21:32+03:00, monty@mysql.com +16 -0
    Test for bug in LOCK TABLE + optimize table

  mysql-test/t/flush.test@1.20, 2006-05-24 17:21:32+03:00, monty@mysql.com +40 -0
    Added test case for deadlock with FLUSH TABLES WITH READ LOCK

  mysql-test/t/lock_multi.test@1.13.1.1, 2006-05-24 17:21:32+03:00, monty@mysql.com +32 -0
    Test for bug in LOCK TABLE + optimize table

  sql/lock.cc@1.64.1.24, 2006-05-24 17:21:32+03:00, monty@mysql.com +25 -9
    Replaced COND_refresh with COND_global_read_lock becasue of a bug in NTPL threads when using different mutexes as arguments to pthread_cond_wait()
    The original code caused a hang in FLUSH TABLES WITH READ LOCK in some circumstances because pthread_cond_broadcast() was not delivered to other threads

  sql/mysql_priv.h@1.290.1.102, 2006-05-24 17:21:32+03:00, monty@mysql.com +1 -0
    Added COND_global_read_lock

  sql/mysqld.cc@1.439.58.1, 2006-05-24 17:21:32+03:00, monty@mysql.com +4 -4
    Added COND_global_read_lock

  sql/sql_base.cc@1.235.1.102, 2006-05-24 17:21:32+03:00, monty@mysql.com +17 -1
    More DBUG statements
    Added a broadcast in remove_table_from_cache() to release any threads waiting in open

ChangeSet@1.1810.1733.1, 2006-05-24 09:34:36-04:00, iggy@mysql.com +1 -0
  BUG#18669: Session COM_STATISTICS breaks mysqladmin status.
  
  Changed COM_STATISTICS to display the global status, instead of thead status, for slow queries and table opens.

  sql/sql_parse.cc@1.426.84.2, 2006-05-24 09:34:32-04:00, iggy@mysql.com +6 -2
    Calculate and display the global statistics.

ChangeSet@1.2163.1.1, 2006-05-24 08:32:08-05:00, reggie@big_geek. +1 -0
  mtr_misc.pl:
    Fix mtr_exe_exists to work on win32

  mysql-test/lib/mtr_misc.pl@1.13, 2006-05-24 08:30:29-05:00, reggie@big_geek. +8 -1
    Fix mtr_exe_exists to work on win32

ChangeSet@1.1810.1727.4, 2006-05-24 16:10:25+05:00, bar@mysql.com +1 -0
  bug#10979 USE does not refresh db privilege changes if the same db is used in command.
  The problem happened because "mysql" didn't send mysql_select_db() if 
  the current active database was specified in USE.
  Now it always send mysql_select_db().
  Rebuilding of completion hash is skipped in the same db is used
  (for performance purposes).

  client/mysql.cc@1.199.1.7, 2006-05-24 16:10:16+05:00, bar@mysql.com +38 -19
    bug#10979 USE does not refresh db privilege changes if the same db is used in command.
    The problem happened because "mysql" didn't send mysql_select_db() if 
    the current active database was specified in USE.
    Now it always send mysql_select_db().
    Rebuilding of completion hash is skipped in the same db is used
    (for performance purposes).

ChangeSet@1.1616.2616.3, 2006-05-24 12:30:34+02:00, kent@mysql.com +1 -0
  configure.in:
    Update NDB version as well

  configure.in@1.201.64.6, 2006-05-24 12:30:20+02:00, kent@mysql.com +1 -1
    Update NDB version as well

ChangeSet@1.1810.1698.20, 2006-05-24 12:28:34+02:00, kent@mysql.com +1 -0
  configure.in:
    Stepped up to 5.0.23

  configure.in@1.245.1.145, 2006-05-24 12:28:04+02:00, kent@mysql.com +2 -2
    Stepped up to 5.0.23

ChangeSet@1.1616.2616.2, 2006-05-24 12:20:17+02:00, kent@mysql.com +1 -0
  configure.in:
    Stepped up to 4.1.22

  configure.in@1.201.64.5, 2006-05-24 12:20:08+02:00, kent@mysql.com +1 -1
    Stepped up to 4.1.22

ChangeSet@1.1810.1717.2, 2006-05-24 10:58:12+02:00, mskold@mysql.com +3 -0
  Bug #16997 Table rename that changes database does not rename indexes: merge

  ndb/include/ndbapi/NdbDictionary.hpp@1.48.6.2, 2006-05-24 10:57:27+02:00, mskold@mysql.com +15 -14
    Bug #16997 Table rename that changes database does not rename indexes: merge

  ndb/src/ndbapi/NdbDictionary.cpp@1.34.3.2, 2006-05-24 10:57:27+02:00, mskold@mysql.com +1 -1
    Bug #16997 Table rename that changes database does not rename indexes: merge

  ndb/src/ndbapi/NdbDictionaryImpl.hpp@1.30.5.2, 2006-05-24 10:57:27+02:00, mskold@mysql.com +2 -1
    Bug #16997 Table rename that changes database does not rename indexes: merge

ChangeSet@1.1810.1729.1, 2006-05-24 11:56:59+03:00, monty@mysql.com +7 -0
  Remove dflt_field from field structure as this was only needed when createing temporary table and I found another soultion that doesn't increase the size of the field structure for all table instances. (Better fix for bug #19089)
  Fixed compiler warnings
  Fixed valgrind warning in Item_date_add_intervall::eq. (Recoding of bugfix #19490)

  sql/field.cc@1.256.1.51, 2006-05-24 11:56:55+03:00, monty@mysql.com +7 -8
    remove dflt_field from field structure (not needed)
    Simple cleanup of code that been copied elsewhere

  sql/field.h@1.153.1.27, 2006-05-24 11:56:55+03:00, monty@mysql.com +0 -6
    remove dflt_field from field structure (not needed)

  sql/item.h@1.183.1.15, 2006-05-24 11:56:55+03:00, monty@mysql.com +2 -0
    Removed compiler warnings

  sql/item_timefunc.cc@1.100.1.11, 2006-05-24 11:56:55+03:00, monty@mysql.com +4 -32
    Fixed Item_date_add_intervall::eq
    The problem was that when we call 'eq' 'this' is not fixed, which means we can't call const_item() or a value function.
    I fixed this so that we check eq for all arguments and that the sign and type are identical.
    (The original code gave a 'accessing uninitialized data' in valgrind.

  sql/mysql_priv.h@1.290.1.101, 2006-05-24 11:56:55+03:00, monty@mysql.com +1 -0
    Added default fields to create_tmp_field

  sql/sql_insert.cc@1.146.1.43, 2006-05-24 11:56:55+03:00, monty@mysql.com +5 -4
    New default_field parameter to create_tmp_field()

  sql/sql_select.cc@1.312.1.108, 2006-05-24 11:56:55+03:00, monty@mysql.com +32 -22
    New default_field parameter to create_tmp_field()
    Use this in create_tmp_table() to set right default value for a field

ChangeSet@1.2154.28.7, 2006-05-24 09:28:37+02:00, knielsen@mysql.com +1 -0
  Fix missing source file.

  sql/Makefile.am@1.140, 2006-05-24 09:28:25+02:00, knielsen@mysql.com +2 -1
    Fix missing source file.

ChangeSet@1.2154.28.4, 2006-05-23 17:51:17-07:00, jimw@mysql.com +2 -0
  Fix events_logs_tests so it won't fail on Windows due to appearance
  of hostname in query results.

  mysql-test/r/events_logs_tests.result@1.9, 2006-05-23 17:51:14-07:00, jimw@mysql.com +3 -3
    Update results

  mysql-test/t/events_logs_tests.test@1.8, 2006-05-23 17:51:14-07:00, jimw@mysql.com +5 -2
    Replace user_host in results, since it is system dependent.

ChangeSet@1.2154.30.2, 2006-05-23 17:26:56-07:00, brian@zim.(none) +4 -0
  Removing mysql_explain_log from 5.1

  BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57@1.4, 2006-05-23 16:18:12-07:00, brian@zim.(none) +0 -0
    Delete: scripts/mysql_explain_log.sh

  scripts/Makefile.am@1.54, 2006-05-23 17:26:49-07:00, brian@zim.(none) +0 -3
    Removing mysql_explain_log

  scripts/make_binary_distribution.sh@1.120, 2006-05-23 17:26:49-07:00, brian@zim.(none) +1 -1
    Removing mysql_explain_log

  support-files/mysql.spec.sh@1.145, 2006-05-23 17:26:49-07:00, brian@zim.(none) +0 -1
    Remove reference to mysql_explain_log

ChangeSet@1.1810.1727.2, 2006-05-23 20:16:57+02:00, msvensson@neptunus.(none) +1 -0
  Bug#19938 Valgrind error (race) in handle_slave_sql()

  sql/slave.cc@1.241.1.28, 2006-05-23 20:16:52+02:00, msvensson@neptunus.(none) +2 -0
    Read the value of rli->events_till_abort only in debug compile

ChangeSet@1.1616.2614.1, 2006-05-23 19:36:06+02:00, serg@serg.mylan +4 -0
  don't let bugfix for bug#8303 break the bugfix for bug#8378
  revert the fix for bug#8303
  correct the test for bug#8378

  mysql-test/r/ctype_sjis.result@1.8.1.1, 2006-05-23 19:35:56+02:00, serg@serg.mylan +2 -2
    updated

  mysql-test/t/ctype_sjis.test@1.10, 2006-05-23 19:35:57+02:00, serg@serg.mylan +1 -1
    updated

  sql/sql_lex.cc@1.97.22.1, 2006-05-23 19:35:57+02:00, serg@serg.mylan +5 -25
    revert the fix for bug#8303

  tests/mysql_client_test.c@1.51.29.1, 2006-05-23 19:35:57+02:00, serg@serg.mylan +14 -7
    correct the test for bug#8378

ChangeSet@1.2154.28.1, 2006-05-23 18:27:54+03:00, jani@ua141d10.elisa.omakaista.fi +3 -0
  Removed wrong ascii codes from source code.
  Fixed core dump in --help

  include/heap.h@1.27, 2006-05-23 18:27:47+03:00, jani@ua141d10.elisa.omakaista.fi +1 -1
    Removed a wrong character (ascii 0xa0), which looked like a space.
    This will cause some debuggers display the source code in a wrong
    way. May cut the rest of the file off and looks like a debugger
    problem, which it isn't.
    

  mysys/my_getopt.c@1.56, 2006-05-23 18:27:48+03:00, jani@ua141d10.elisa.omakaista.fi +1 -1
    Removed a wrong character (ascii 0xa0), which looked like a space.
    This will cause some debuggers display the source code in a wrong
    way. May cut the rest of the file off and looks like a debugger
    problem, which it isn't.
    

  sql/mysqld.cc@1.544.6.1, 2006-05-23 18:27:48+03:00, jani@ua141d10.elisa.omakaista.fi +1 -1
    Wrong type.

ChangeSet@1.1810.1726.1, 2006-05-23 10:29:58-04:00, cmiller@zippy.(none) +1 -0
  Guilhelm suggested that the "load data infile" command should be flagged as
  not transaction-safe for stored procedures.  Related to Bug#11151.

  sql/sp_head.cc@1.200.4.1, 2006-05-23 10:29:54-04:00, cmiller@zippy.(none) +1 -0
    Guilhelm suggested that the "load data infile" command should be flagged as
    not transaction-safe for stored procedures.

ChangeSet@1.1810.1723.6, 2006-05-23 16:20:03+02:00, msvensson@neptunus.(none) +1 -0
  Bug #19938  	Valgrind error (race) in handle_slave_sql()

  sql/slave.cc@1.241.1.27, 2006-05-23 16:19:59+02:00, msvensson@neptunus.(none) +8 -1
    Read rli->events_till_abort to a temporary variable before unlocking the mutex

ChangeSet@1.1810.1723.5, 2006-05-23 16:14:48+02:00, msvensson@neptunus.(none) +1 -0
  Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060523082057|49143

  sql/slave.cc@1.241.1.26, 2006-05-23 16:14:44+02:00, msvensson@neptunus.(none) +0 -0
    Exclude

ChangeSet@1.2154.8.9, 2006-05-23 15:59:52+02:00, msvensson@shellback.(none) +3 -0
  Updated after review

  mysql-test/lib/mtr_process.pl@1.36, 2006-05-23 15:59:47+02:00, msvensson@shellback.(none) +7 -7
    Fix spelling errors

  mysql-test/lib/mtr_report.pl@1.28, 2006-05-23 15:59:47+02:00, msvensson@shellback.(none) +1 -1
    Fix spelling errors

  mysql-test/mysql-test-run.pl@1.114.2.5, 2006-05-23 15:59:47+02:00, msvensson@shellback.(none) +12 -14
    Remove debug code
    Fix spelling errors
    Check if slave cluster installed ok if test needs it

ChangeSet@1.1810.1723.4, 2006-05-23 15:45:16+02:00, msvensson@neptunus.(none) +1 -0
  Make wait_timeout test not timing dependent

  mysql-test/t/wait_timeout.test@1.1.1.4, 2006-05-23 15:45:12+02:00, msvensson@neptunus.(none) +64 -4
    Remove sleeps from wait_timeout in order to make it timing independent.
    Instead get the status variable "aborted_clients" in a seconds connection.

ChangeSet@1.1810.1725.1, 2006-05-23 16:43:01+03:00, gkodinov@mysql.com +4 -0
  Bug #18742: Test 'group_min_max' fails if "classic" configuration in 5.0
  
  Moved the InnoDB related tests to innodb_mysql

  mysql-test/t/innodb_mysql.test@1.3.2.2, 2006-05-23 16:42:56+03:00, gkodinov@mysql.com +94 -0
    Moved innodb related tests out of group_min_max

  mysql-test/r/group_min_max.result@1.23.1.1, 2006-05-23 16:42:56+03:00, gkodinov@mysql.com +1 -40
    Moved innodb related tests out of group_min_max

  mysql-test/r/innodb_mysql.result@1.3.2.2, 2006-05-23 16:42:56+03:00, gkodinov@mysql.com +76 -0
    Moved innodb related tests out of group_min_max

  mysql-test/t/group_min_max.test@1.21.1.1, 2006-05-23 16:42:56+03:00, gkodinov@mysql.com +1 -53
    Moved innodb related tests out of group_min_max

ChangeSet@1.2154.8.8, 2006-05-23 15:27:56+02:00, msvensson@shellback.(none) +1 -0
  Add loop to wait for servers to start before continuing with test
  Remove workarounds for "hang in select"

  mysql-test/mysql-test-run.pl@1.114.2.4, 2006-05-23 15:27:50+02:00, msvensson@shellback.(none) +29 -27
    Add loop to wait for servers to start before continuing with test
    Remove workarounds for "hang in select"

ChangeSet@1.2154.8.7, 2006-05-23 15:25:17+02:00, msvensson@shellback.(none) +1 -0
  Use mtr_kill_process from mtr_kill_processes
  Change to use 0.1 second sleep between kill attempt

  mysql-test/lib/mtr_process.pl@1.35, 2006-05-23 15:25:11+02:00, msvensson@shellback.(none) +11 -8
    Use mtr_kill_process from mtr_kill_processes
    Change to use 0.1 second sleep between kill attempt

ChangeSet@1.2119.597.1, 2006-05-23 07:39:35-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
  BUG#17455: Wrong results from Repair/Optimize .. table for partitioned tables

  mysql-test/r/partition.result@1.36.7.1, 2006-05-23 07:39:29-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +10 -0
    New test case

  mysql-test/t/partition.test@1.37.8.1, 2006-05-23 07:39:29-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +13 -0
    New test case

  sql/ha_partition.cc@1.48.1.1, 2006-05-23 07:39:30-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -4
    Fixed error handling

ChangeSet@1.2119.596.1, 2006-05-23 07:37:03-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -0
  BUG#19304: Merge handler allowed in partitioned tables

  mysql-test/r/partition.result@1.36.6.1, 2006-05-23 07:36:57-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -0
    New test case

  mysql-test/t/partition.test@1.37.7.1, 2006-05-23 07:36:58-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +8 -0
    New test case

  sql/partition_info.cc@1.8.5.3, 2006-05-23 07:36:58-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +8 -7
    Check for not merge handler in partitioned table

  sql/share/errmsg.txt@1.96.5.1, 2006-05-23 07:36:58-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
    New error message

ChangeSet@1.1810.1724.1, 2006-05-23 11:35:14+02:00, msvensson@neptunus.(none) +4 -0
  Bug#16297 In memory grant tables not flushed when users's hostname is ""
   - In function 'handle_grant_struct' when searching the memory structures for an 
     entry to modify, convert all entries here host.hostname is NULL to "" and compare that 
     with the host passed in argument "user_from".
   - A user created with hostname "" is stored in "mysql.user" table as host="" but when loaded into 
     memory it'll be stored as host.hostname NULL. Specifiying "" as hostname means
     that "any host" can connect. Thus is's correct to turn on allow_all_hosts
     when such a user is found. 
   - Review and fix other places where host.hostname may be NULL.

  mysql-test/init_db.sql@1.4, 2006-01-31 14:15:31+01:00, msvensson@neptunus.(none) +0 -0
    Rename: BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7 -> mysql-test/init_db.sql

  BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7@1.3, 2006-01-30 11:20:24+01:00, msvensson@neptunus.(none) +0 -0
    Delete: mysql-test/init_db.sql

  mysql-test/r/grant.result@1.37.3.1, 2006-05-23 11:35:09+02:00, msvensson@neptunus.(none) +211 -1
    Add test cases for users with hostname ""

  mysql-test/t/grant.test@1.38.1.1, 2006-05-23 11:35:09+02:00, msvensson@neptunus.(none) +143 -1
    Add test cases for users with hostname ""
     - Test create, grant and drop as well as connecting as the user with hostname "".

  sql/sql_acl.cc@1.128.25.1, 2006-05-23 11:35:09+02:00, msvensson@neptunus.(none) +58 -54
    Convert places where host.hostname is NULL to "" before using it.

ChangeSet@1.1810.1723.3, 2006-05-23 10:52:53+02:00, msvensson@neptunus.(none) +2 -0
  Move the requirement for "not running as root" to information_schema_chmod

  mysql-test/t/information_schema.test@1.65.2.1, 2006-05-23 10:52:46+02:00, msvensson@neptunus.(none) +0 -3
    Move the requirement for "not running as root" to information_schema_chmod

  mysql-test/t/information_schema_chmod.test@1.2, 2006-05-23 10:52:46+02:00, msvensson@neptunus.(none) +3 -0
    Move the requirement for "not running as root" to information_schema_chmod

ChangeSet@1.1616.2607.2, 2006-05-23 10:33:53+02:00, msvensson@neptunus.(none) +1 -0
  Add comment for 'kill_server' function

  sql/mysqld.cc@1.356.98.25, 2006-05-23 10:33:50+02:00, msvensson@neptunus.(none) +14 -1
    Add comment for 'kill_server' function

ChangeSet@1.1810.1698.15, 2006-05-23 13:27:45+05:00, gluh@eagle.intranet.mysql.r18.ru +4 -0
  Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode
  transfer NO_DEFAULT_VALUE_FLAG flag to new field

  mysql-test/r/strict.result@1.25.1.1, 2006-05-23 13:27:39+05:00, gluh@mysql.com +10 -0
    Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode
    test case

  mysql-test/r/type_ranges.result@1.38.1.1, 2006-05-23 13:27:39+05:00, gluh@mysql.com +2 -2
    Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode
    result fix

  mysql-test/t/strict.test@1.19.1.1, 2006-05-23 13:27:39+05:00, gluh@mysql.com +10 -0
    Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode
    test case

  sql/sql_select.cc@1.312.1.107, 2006-05-23 13:27:39+05:00, gluh@mysql.com +1 -0
    Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode
    transfer NO_DEFAULT_VALUE_FLAG flag to new field

ChangeSet@1.1810.1722.1, 2006-05-23 18:16:26+10:00, stewart@mysql.com +1 -0
  BUG#13985 Cluster: ndb_mgm "status" command can return incorrect data node status
  
  partial fix for this bug. more info on what the other half of the fix involves
  is in the bug report.

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.11.1, 2006-05-23 18:16:20+10:00, stewart@mysql.com +24 -4
    partial fix for bug13985
    
    hold a mutex around printing out events
    hold the mutex also around printing out put of 'status' commands.
    
    this means we don't get
    1 started
    2 started
    2 starting
    
    output.
    
    we'll instead get the event before/after the entire status output.
    Due to the nature of the event arriving before status being updated,
    we'll pretty much always see started AFTER starting.

ChangeSet@1.1810.1698.14, 2006-05-23 12:45:25+05:00, gluh@eagle.intranet.mysql.r18.ru +3 -0
  Bug#16681 information_schema shows forbidden VIEW details
  show view definition to users that have the needed privilleges

  mysql-test/r/information_schema.result@1.87.1.18, 2006-05-23 12:45:19+05:00, gluh@mysql.com +13 -0
    Bug#16681 information_schema shows forbidden VIEW details
    test case

  mysql-test/t/information_schema.test@1.65.1.14, 2006-05-23 12:45:19+05:00, gluh@mysql.com +19 -0
    Bug#16681 information_schema shows forbidden VIEW details
    test case

  sql/sql_show.cc@1.253.1.64, 2006-05-23 12:45:19+05:00, gluh@mysql.com +25 -3
    Bug#16681 information_schema shows forbidden VIEW details
    show view definition to users that have the needed privilleges

ChangeSet@1.1810.1522.6, 2006-05-23 16:24:26+10:00, stewart@mysql.com +7 -0
  BUG#18966 Change in stop/shutdown behaviour
  
  Improvements that were discussed with Tomas.
  
  Maintain protocol backwards/forwards compatibilty for client and server and support
  the commands from ndb_mgm 'as expected'

  ndb/include/mgmapi/mgmapi.h@1.42.8.1, 2006-05-23 16:24:18+10:00, stewart@mysql.com +57 -0
    Add ndb_mgm_stop3 mgmapi function.
     - This supports stopping all DB nodes, or all DB and MGM nodes.
     - It also returns to mgmapi program if it needs to disconnect to apply changes.
    
    Add ndb_mgm_restart3 mgmapi function.
     - Tells mgmapi program if it needs to disconnect to apply changes
    
    Add (internal) ndb_mgm_get_version
     - designed to be used to find out what protocol version we need to speak to the server.

  ndb/src/mgmapi/mgmapi.cpp@1.44.21.1, 2006-05-23 16:24:19+10:00, stewart@mysql.com +174 -22
    Add cache of mgmd version to ndb_mgm_handle. Only filled out in functions that
    need to know the version of the mgmd we're talking to.
    Initialize these members in create handle.
    added ndb_mgm_get_version which asks the mgm server what version it is. This call
    has been supported since the dawn of time, no compatibility issues here.
    
    Add implementation of ndb_mgm_stop3
    Check what version of the protocol the server speaks, and speak it.
    Add compatibility for ndb_mgm_stop2
    
    Same for ndb_mgm_restart3.

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.9.3, 2006-05-23 16:24:19+10:00, stewart@mysql.com +19 -56
    Simplify stop and restart code.
    
    Use the new ndb_mgm_(stop|restart)3 calls to find out if we need to disconnect.

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.73.20.2, 2006-05-23 16:24:19+10:00, stewart@mysql.com +21 -0
    Add nice call for shutting down MGM servers (like shutdownDB)

  ndb/src/mgmsrv/MgmtSrvr.hpp@1.30.11.2, 2006-05-23 16:24:19+10:00, stewart@mysql.com +2 -0
    add prototype for shutdownMGM

  ndb/src/mgmsrv/Services.cpp@1.45.16.2, 2006-05-23 16:24:19+10:00, stewart@mysql.com +70 -11
    Add restart node v2, stop v2, stop all v2 while maintaining protocol backwards
    compatibility.
    
    Unfortunately we can't add result lines due to protocol errors in clients :(
    Neither can we add extra things to the 'result: Ok' line due to the use of
    strcmp instead of strncmp.

  ndb/src/mgmsrv/Services.hpp@1.13.4.2, 2006-05-23 16:24:19+10:00, stewart@mysql.com +9 -3
    Add prototypes for restart, stop and stopall v1 and v2

ChangeSet@1.1810.1721.1, 2006-05-23 14:51:04+10:00, stewart@mysql.com +1 -0
  BUG#19932 mgmapi crash if disconnect in ndb_mgm_get_status
  
  correctly detect and report errors in talking to mgm server and memory allocation

  ndb/src/mgmapi/mgmapi.cpp@1.44.20.1, 2006-05-23 14:50:59+10:00, stewart@mysql.com +24 -3
    correctly detect and return errors in ndb_mgm_get_status

ChangeSet@1.1810.1716.2, 2006-05-23 14:45:56+10:00, stewart@mysql.com +1 -0
  BUG#20016 error in mgm protocol parser error message incorrect
  
  fix display of mgm protocol parser error in mgmapi

  ndb/src/mgmapi/mgmapi.cpp@1.44.19.1, 2006-05-23 14:45:51+10:00, stewart@mysql.com +3 -2
    fix display of mgm protocol parser error.

ChangeSet@1.2154.24.7, 2006-05-23 14:35:18+10:00, stewart@mysql.com +4 -0
  BUG#20015 mgmsrv and mgmapi: get statport is dead code
  
  Remove unused and obsolete mgmapi functionality (that did nothing anyway).

  storage/ndb/include/mgmapi/mgmapi.h@1.52, 2006-05-23 14:35:12+10:00, stewart@mysql.com +0 -10
    remove dead internal ndb_mgm_get_stat_port function.

  storage/ndb/src/mgmapi/mgmapi.cpp@1.64, 2006-05-23 14:35:12+10:00, stewart@mysql.com +0 -27
    remove ndb_mgm_get_stat_port
    
    was only marked for internal use.
    dead (in 5.0 as well, only removed in 5.1 for safety)

  storage/ndb/src/mgmsrv/Services.cpp@1.66, 2006-05-23 14:35:12+10:00, stewart@mysql.com +0 -11
    remove dead 'get statport'

  storage/ndb/src/mgmsrv/Services.hpp@1.20, 2006-05-23 14:35:12+10:00, stewart@mysql.com +0 -1
    remove dead getStatPort

ChangeSet@1.1616.2144.130, 2006-05-23 00:50:39+02:00, kent@mysql.com +1 -0
  make_sharedlib_distribution.sh:
    Solaris sh don't like {..} in file matching

  scripts/make_sharedlib_distribution.sh@1.3, 2006-05-23 00:49:20+02:00, kent@mysql.com +4 -2
    Solaris sh don't like {..} in file matching

ChangeSet@1.2154.24.4, 2006-05-22 22:58:01+02:00, joerg@trift-lap.fambruehe +1 -0
  Bump up the version number, 5.1.11 has been cloned.

  configure.in@1.355, 2006-05-22 22:57:56+02:00, joerg@trift-lap.fambruehe +1 -1
    Bump up the version number, 5.1.11 has been cloned.

ChangeSet@1.2119.345.89, 2006-05-22 20:39:53+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - dbacc
    remove too strong assertion

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@1.70, 2006-05-22 20:39:50+02:00, jonas@perch.ndb.mysql.com +0 -35
    remove too strong assertion

ChangeSet@1.2154.17.3, 2006-05-22 11:34:41-07:00, jimw@mysql.com +2 -0
  Bug #20004: log_tables fails on Windows due to output differences
  
    This test included hostname information in the output, which varies
    between platforms.

  mysql-test/r/log_tables.result@1.4, 2006-05-22 11:34:37-07:00, jimw@mysql.com +13 -13
    Update results

  mysql-test/t/log_tables.test@1.9, 2006-05-22 11:34:37-07:00, jimw@mysql.com +6 -5
    Replace user_host selected from logs to avoid platform differences.
    Also, fix use of replace_column in test for bug 17600.

ChangeSet@1.1810.1712.3, 2006-05-22 17:15:49+02:00, knielsen@mysql.com +1 -0
  Fix BUILD/compile-pentium-gcov

  BUILD/compile-pentium-gcov@1.14, 2006-05-22 17:15:45+02:00, knielsen@mysql.com +13 -2
    Add -max options for gcov, fix yassl and BDB builds, disable ccache which
    is incompatible with gcc profiling output.

ChangeSet@1.2119.345.88, 2006-05-22 17:11:05+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - dbacc rewamp
    fix so that getElement read localkey from lockowner instead of from page
    plus some cleanups

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@1.69, 2006-05-22 17:11:02+02:00, jonas@perch.ndb.mysql.com +48 -10
    1) Use OP_INITIAL instead of ~0
    2) Use JBB instead of JBA (once that I temporary changed...)
    3) Add more validation to validate_lock_queue (insert/delete)
    4) make getElement read localkey from lockowner instead of from page

ChangeSet@1.1810.1698.12, 2006-05-22 07:57:46-07:00, igor@rurik.mysql.com +4 -0
  Post-review fixes for bug #19089

  mysql-test/r/view.result@1.138.1.22, 2006-05-22 07:57:40-07:00, igor@rurik.mysql.com +1 -1
    Post-review fixes.

  sql/field.cc@1.256.1.50, 2006-05-22 07:57:40-07:00, igor@rurik.mysql.com +1 -2
    Post-review fixes.

  sql/field.h@1.153.1.26, 2006-05-22 07:57:40-07:00, igor@rurik.mysql.com +5 -0
    Post-review fixes.

  sql/sql_select.cc@1.312.1.106, 2006-05-22 07:57:40-07:00, igor@rurik.mysql.com +3 -0
    Post-review fixes.

ChangeSet@1.2154.19.3, 2006-05-22 14:10:02+02:00, msvensson@neptunus.(none) +4 -0
  Move innodb dependent tests to group_min_max_innodb

  mysql-test/r/group_min_max.result@1.24, 2006-05-22 14:09:56+02:00, msvensson@neptunus.(none) +1 -40
    Move innodb dependent tests to group_min_max_innodb

  mysql-test/r/group_min_max_innodb.result@1.1, 2006-05-22 14:09:56+02:00, msvensson@neptunus.(none) +72 -0
    Move innodb dependent tests to group_min_max_innodb

  mysql-test/r/group_min_max_innodb.result@1.0, 2006-05-22 14:09:56+02:00, msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-5.1-new-maint/mysql-test/r/group_min_max_innodb.result

  mysql-test/t/group_min_max.test@1.23, 2006-05-22 14:09:56+02:00, msvensson@neptunus.(none) +6 -34
    Move innodb dependent tests to group_min_max_innodb

  mysql-test/t/group_min_max_innodb.test@1.1, 2006-05-22 14:09:57+02:00, msvensson@neptunus.(none) +95 -0
    Move innodb dependent tests to group_min_max_innodb

  mysql-test/t/group_min_max_innodb.test@1.0, 2006-05-22 14:09:57+02:00, msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-5.1-new-maint/mysql-test/t/group_min_max_innodb.test

ChangeSet@1.2154.19.2, 2006-05-22 13:57:32+02:00, msvensson@neptunus.(none) +4 -0
  Move innodb dependent test to join_outer_innodb

  mysql-test/r/join_outer.result@1.48.1.1, 2006-05-22 13:57:26+02:00, msvensson@neptunus.(none) +0 -19
    Move innodb dependent test to join_outer_innodb

  mysql-test/r/join_outer_innodb.result@1.1, 2006-05-22 13:57:26+02:00, msvensson@neptunus.(none) +19 -0
    New BitKeeper file ``mysql-test/r/join_outer_innodb.result''

  mysql-test/r/join_outer_innodb.result@1.0, 2006-05-22 13:57:26+02:00, msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-5.1-new-maint/mysql-test/r/join_outer_innodb.result

  mysql-test/t/join_outer.test@1.36.1.2, 2006-05-22 13:57:26+02:00, msvensson@neptunus.(none) +2 -18
    Move innodb dependent test to join_outer_innodb

  mysql-test/t/join_outer_innodb.test@1.1, 2006-05-22 13:57:27+02:00, msvensson@neptunus.(none) +26 -0
    New BitKeeper file ``mysql-test/t/join_outer_innodb.test''

  mysql-test/t/join_outer_innodb.test@1.0, 2006-05-22 13:57:27+02:00, msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-5.1-new-maint/mysql-test/t/join_outer_innodb.test

ChangeSet@1.2154.19.1, 2006-05-22 13:27:58+02:00, msvensson@neptunus.(none) +4 -0
  Move innodb dependent tests to func_group_innodb

  mysql-test/r/func_group.result@1.46.1.3, 2006-05-22 13:27:52+02:00, msvensson@neptunus.(none) +0 -147
    Move innodb dependent tests to func_group_innodb

  mysql-test/r/func_group_innodb.result@1.1, 2006-05-22 13:27:52+02:00, msvensson@neptunus.(none) +147 -0
    New BitKeeper file ``mysql-test/r/func_group_innodb.result''

  mysql-test/r/func_group_innodb.result@1.0, 2006-05-22 13:27:52+02:00, msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-5.1-new-maint/mysql-test/r/func_group_innodb.result

  mysql-test/t/func_group.test@1.45.1.2, 2006-05-22 13:27:52+02:00, msvensson@neptunus.(none) +11 -76
    Move innodb dependent tests to func_group_innodb

  mysql-test/t/func_group_innodb.test@1.1, 2006-05-22 13:27:52+02:00, msvensson@neptunus.(none) +85 -0
    New BitKeeper file ``mysql-test/t/func_group_innodb.test''

  mysql-test/t/func_group_innodb.test@1.0, 2006-05-22 13:27:52+02:00, msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-5.1-new-maint/mysql-test/t/func_group_innodb.test

ChangeSet@1.2154.1.17, 2006-05-22 15:20:40+04:00, anozdrin@mysql.com +6 -0
  Merged.

  mysql-test/r/im_instance_conf.result@1.2, 2006-05-22 15:20:37+04:00, anozdrin@mysql.com +4 -4
    Merged.

  mysql-test/r/im_options.result@1.2, 2006-05-22 15:20:37+04:00, anozdrin@mysql.com +7 -7
    Merged.

  server-tools/instance-manager/CMakeLists.txt@1.8, 2006-05-22 15:20:37+04:00, anozdrin@mysql.com +1 -0
    Merged.

  server-tools/instance-manager/instance_options.cc@1.34, 2006-05-22 15:20:37+04:00, anozdrin@mysql.com +9 -5
    Merged.

  server-tools/instance-manager/mysqlmanager.cc@1.19, 2006-05-22 15:20:37+04:00, anozdrin@mysql.com +2 -2
    Merged.

  server-tools/instance-manager/options.cc@1.35, 2006-05-22 15:20:37+04:00, anozdrin@mysql.com +5 -5
    Merged.

ChangeSet@1.2119.345.87, 2006-05-22 08:46:19+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    increase max time of MassiveRollback

  storage/ndb/test/run-test/daily-basic-tests.txt@1.45, 2006-05-22 08:46:16+02:00, jonas@perch.ndb.mysql.com +1 -1
    increase max time

ChangeSet@1.1810.1709.4, 2006-05-22 12:18:18+09:30, grog@mysql.com +2 -0
  rpl_auto_increment_11932.test, rpl_auto_increment_11932.result:
    Drop test1 table in master as well.

  mysql-test/r/rpl_auto_increment_11932.result@1.3, 2006-05-22 12:17:36+09:30, grog@mysql.com +1 -0
    Drop test1 table in master as well.

  mysql-test/t/rpl_auto_increment_11932.test@1.3, 2006-05-22 12:17:51+09:30, grog@mysql.com +2 -0
    Drop test1 table in master as well.

ChangeSet@1.1810.1640.2, 2006-05-22 10:08:13+09:30, grog@mysql.com +2 -0
  rpl_auto_increment_11932.result, rpl_auto_increment_11932.test:
    Update with correct table and database names.

  mysql-test/r/rpl_auto_increment_11932.result@1.2, 2006-05-22 09:20:47+09:30, grog@mysql.com +16 -16
    Update with correct table and database names.

  mysql-test/t/rpl_auto_increment_11932.test@1.2, 2006-05-22 09:20:33+09:30, grog@mysql.com +19 -17
    Update with correct table and database names.

ChangeSet@1.1810.1714.1, 2006-05-20 18:54:43-07:00, igor@rurik.mysql.com +5 -0
  Fixed bug #19089.
  When a CREATE TABLE command created a table from a materialized
  view id does not inherit default values from the underlying table.
  Moreover the temporary table used for the view materialization
  does not inherit those default values.
  In the case when the underlying table contained ENUM fields it caused
  misleading error messages. In other cases the created table contained
  wrong default values.
  The code was modified to ensure inheritance of default values for
  materialized views.

  mysql-test/r/view.result@1.138.6.1, 2006-05-20 18:54:36-07:00, igor@rurik.mysql.com +42 -0
    Added a test case for bug #19089.

  mysql-test/t/view.test@1.126.8.1, 2006-05-20 18:54:36-07:00, igor@rurik.mysql.com +31 -0
    Added a test case for bug #19089.

  sql/field.cc@1.256.1.49, 2006-05-20 18:54:36-07:00, igor@rurik.mysql.com +1 -0
    Fixed bug ##19089.
    Added field dflt_field to the class Field.
    This field is set for temp table fields that inherits
    default values of items from which they are created.

  sql/field.h@1.153.1.25, 2006-05-20 18:54:36-07:00, igor@rurik.mysql.com +1 -0
    Fixed bug ##19089.
    Added field dflt_field to the class Field.
    This field is set for temp table fields that inherits
    default values of items from which they are created.

  sql/sql_select.cc@1.312.70.1, 2006-05-20 18:54:37-07:00, igor@rurik.mysql.com +32 -6
    Fixed bug #19089.
    When a CREATE TABLE command created a table from a materialized
    view id does not inherit default values from the underlying table.
    Moreover the temporary table used for the view materialization
    does not inherit those default values.
    The code was modified to ensure inheritance of default values for
    materialized views.

ChangeSet@1.2119.345.86, 2006-05-20 16:54:29+02:00, ndbdev@ndbmaster.mysql.com +1 -0
  gcc4 compile fix

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.47, 2006-05-20 16:54:16+02:00, ndbdev@ndbmaster.mysql.com +4 -1
    gcc4 compile fix

ChangeSet@1.1616.2609.2, 2006-05-20 12:34:56+03:00, aelkin@mysql.com +1 -0
  #14157: utf8 encoding in binlog without set character_set_client
  
  fixing an issue with the test portability.

  mysql-test/t/mysqlbinlog.test@1.8.1.12, 2006-05-20 12:34:52+03:00, aelkin@mysql.com +5 -3
    BUG#14157: utf8 encoding in binlog without set character_set_client
    
    fixing koi8r specific case to run on all platforms. client does not announce in cmd line any specific
    encoding but rather set it via `set names'.

ChangeSet@1.2143.3.3, 2006-05-20 02:41:30+04:00, petr@mysql.com +2 -0
  WL#3244 "CSV engine: convert mmap to read/write calls"
  post-review fixes

  storage/csv/ha_tina.cc@1.44.1.2, 2006-05-20 02:41:26+04:00, petr@mysql.com +8 -4
    post-review fixes

  storage/csv/ha_tina.h@1.19, 2006-05-20 02:41:26+04:00, petr@mysql.com +2 -8
    post-review fixes

ChangeSet@1.2119.594.1, 2006-05-19 16:08:06-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  New test case

  mysql-test/t/partition.test@1.37.6.1, 2006-05-19 16:07:56-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +17 -0
    New test case

ChangeSet@1.1810.1713.1, 2006-05-19 13:17:07-04:00, iggy@mysql.com +1 -0
  BUG#19322 Added help defintion for --skip-external locking to mysqld --help --verbose

  sql/mysqld.cc@1.439.56.1, 2006-05-19 13:17:03-04:00, iggy@mysql.com +2 -1
    Added --skip-external-locking to the --external-locking help.

ChangeSet@1.2119.345.85, 2006-05-19 16:29:48+02:00, jonas@perch.ndb.mysql.com +10 -0
  ndb -
    fix scan bugs introduced by acc modifications
    add more error testcases

  storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp@1.32, 2006-05-19 16:29:44+02:00, jonas@perch.ndb.mysql.com +0 -1
    remove unused state

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@1.68, 2006-05-19 16:29:44+02:00, jonas@perch.ndb.mysql.com +48 -14
    1) remove unused state
    2) Fix abort of running lock owner
    3) Fix abort of running op in parallell queue (especially scans)

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.106, 2006-05-19 16:29:44+02:00, jonas@perch.ndb.mysql.com +7 -9
    remove some printouts
    add some jams
    fix so that close tupscan, can not acciently start acc scan in queue
      (NOTE limits #tupscans to 12 which is not really necessary...but the fix was easy)

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@1.14, 2006-05-19 16:29:44+02:00, jonas@perch.ndb.mysql.com +5 -5
    Use abort of locks when closing/blocked
      as Dbacc gets annoyed when committing an op with state running

  storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp@1.30, 2006-05-19 16:29:44+02:00, jonas@perch.ndb.mysql.com +7 -5
    Use abort of locks when closing/blocked
      as Dbacc gets annoyed when committing an op with state running

  storage/ndb/test/include/HugoOperations.hpp@1.18, 2006-05-19 16:29:44+02:00, jonas@perch.ndb.mysql.com +2 -0
    new method

  storage/ndb/test/ndbapi/testBasic.cpp@1.13, 2006-05-19 16:29:44+02:00, jonas@perch.ndb.mysql.com +67 -11
    add more test cases

  storage/ndb/test/ndbapi/testScan.cpp@1.21, 2006-05-19 16:29:44+02:00, jonas@perch.ndb.mysql.com +23 -1
    add more testcases

  storage/ndb/test/run-test/daily-basic-tests.txt@1.44, 2006-05-19 16:29:44+02:00, jonas@perch.ndb.mysql.com +12 -0
    add more testcases

  storage/ndb/test/src/HugoOperations.cpp@1.28, 2006-05-19 16:29:44+02:00, jonas@perch.ndb.mysql.com +23 -6
    add more testcases

ChangeSet@1.2143.5.6, 2006-05-19 16:28:08+02:00, msvensson@shellback.(none) +2 -0
  Wait until first mysqld in slave cluster has created cluster/apply_status.ndb, put workaround in function workaround_hang_in_select
  Add verbose printouts

  mysql-test/lib/mtr_process.pl@1.32.1.3, 2006-05-19 16:27:57+02:00, msvensson@shellback.(none) +2 -1
    Add verbose printouts

  mysql-test/mysql-test-run.pl@1.114.4.4, 2006-05-19 16:27:57+02:00, msvensson@shellback.(none) +29 -15
    Wait until first mysqld in slave cluster has created cluster/apply_status.ndb, put workaround in function workaround_hang_in_select

ChangeSet@1.2119.579.4, 2006-05-19 17:46:34+05:00, svoj@april.(none) +1 -0
  BUG#19907 - simple_parser plugin cannot be installed
  
  The problem was that simple_parser was compiled as static plugin, which
  is intended to be linked into server, but not plugged.
  
  This patch makes simple_parser to be compiled as dynamic plugin by adding
  -DMYSQL_DYNAMIC_PLUGIN into CFLAGS.

  plugin/fulltext/Makefile.am@1.7, 2006-05-19 17:46:29+05:00, svoj@april.(none) +1 -1
    Compile mypluglib as dynamic mysql plugin.

ChangeSet@1.2119.593.5, 2006-05-19 16:01:04+04:00, anozdrin@mysql.com +2 -0
  1. Fix compilation on Windows;
  2. Fix trigger.test.

  server-tools/instance-manager/log.cc@1.10, 2006-05-19 16:01:01+04:00, anozdrin@mysql.com +2 -0
    Fix compilation in Windows.

  sql/sql_trigger.cc@1.56, 2006-05-19 16:01:01+04:00, anozdrin@mysql.com +2 -2
    Use strlen() instead of sizeof() for C-strings.

ChangeSet@1.1616.2610.1, 2006-05-19 16:21:32+05:00, ramil@mysql.com +3 -0
  Fix for bug #18536: mysqldump does not maintain table orders as per --tables option

  client/mysqldump.c@1.143.13.3, 2006-05-19 16:21:27+05:00, ramil@mysql.com +21 -33
    Fix for bug #18536: mysqldump does not maintain table orders as per --tables option
      - use list to store table names instead of hash.

  mysql-test/r/mysqldump.result@1.9.1.43, 2006-05-19 16:21:27+05:00, ramil@mysql.com +35 -1
    Fix for bug #18536: mysqldump does not maintain table orders as per --tables option
      - test result.

  mysql-test/t/mysqldump.test@1.19.1.24, 2006-05-19 16:21:27+05:00, ramil@mysql.com +12 -1
    Fix for bug #18536: mysqldump does not maintain table orders as per --tables option
      - test case.

ChangeSet@1.2143.5.5, 2006-05-19 11:42:53+02:00, msvensson@shellback.(none) +3 -0
  Add mtr_verbose to print more verbose output when --verbose flag is used

  mysql-test/lib/mtr_process.pl@1.32.1.2, 2006-05-19 11:42:44+02:00, msvensson@shellback.(none) +4 -5
    Add mtr_verbose to print more verbose output when --verbose flag is used

  mysql-test/lib/mtr_report.pl@1.27, 2006-05-19 11:42:44+02:00, msvensson@shellback.(none) +7 -0
    Add mtr_verbose to print more verbose output when --verbose flag is used

  mysql-test/mysql-test-run.pl@1.114.4.3, 2006-05-19 11:42:44+02:00, msvensson@shellback.(none) +8 -5
    Add mtr_verbose to print more verbose output when --verbose flag is used

ChangeSet@1.2119.345.84, 2006-05-19 09:38:59+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    bug#19928 and bug#19929
    fix to critical bugs in tup scan
    that affected lcp,backup and opt. nr

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@1.13, 2006-05-19 09:38:56+02:00, jonas@perch.ndb.mysql.com +24 -16
    1) dont let dirty read scan find uncommitted inserts
    2) force opt. nr scan to wait for locked rows
    3) when finding LCP keep record, use accOpPtr -1, so that it will not be committed towards ACC

ChangeSet@1.2143.5.4, 2006-05-19 09:13:25+02:00, msvensson@shellback.(none) +1 -0
  Remove printout when restart is skipped

  mysql-test/mysql-test-run.pl@1.114.4.2, 2006-05-19 09:13:16+02:00, msvensson@shellback.(none) +0 -4
    Remove printout when restart is skipped

ChangeSet@1.2119.593.4, 2006-05-19 04:51:23+04:00, anozdrin@mysql.com +11 -0
  Fix compilation problems on Windows and SUN Solaris.

  include/m_string.h@1.41.1.2, 2006-05-19 04:51:19+04:00, anozdrin@mysql.com +9 -3
    Fix declaration of C-structure for Visual Studio and Sun C-compiler.

  server-tools/instance-manager/IMService.cpp@1.9, 2006-05-19 04:51:19+04:00, anozdrin@mysql.com +3 -4
    Fixed.

  server-tools/instance-manager/Makefile.am@1.34.1.2, 2006-05-19 04:51:19+04:00, anozdrin@mysql.com +0 -3
    Removed gcc-specific flags.

  server-tools/instance-manager/commands.cc@1.35, 2006-05-19 04:51:19+04:00, anozdrin@mysql.com +0 -1
    Moved m_string.h to the header.

  server-tools/instance-manager/commands.h@1.11, 2006-05-19 04:51:19+04:00, anozdrin@mysql.com +1 -1
    Replaced forward declaration of LEX_STRING because
    it is not understood by all compilers.

  server-tools/instance-manager/instance_map.cc@1.28, 2006-05-19 04:51:19+04:00, anozdrin@mysql.com +1 -2
    1. Moved m_string.h to the header.
    2. Use (const char *) to point to const C-string.

  server-tools/instance-manager/instance_map.h@1.20, 2006-05-19 04:51:19+04:00, anozdrin@mysql.com +1 -2
    Replaced forward declaration of LEX_STRING because
    it is not understood by all compilers.

  server-tools/instance-manager/instance_options.h@1.18.1.2, 2006-05-19 04:51:19+04:00, anozdrin@mysql.com +1 -0
    Fixed headers.

  server-tools/instance-manager/mysqlmanager.cc@1.16.1.2, 2006-05-19 04:51:19+04:00, anozdrin@mysql.com +2 -1
    Fixed headers.

  server-tools/instance-manager/user_management_commands.cc@1.2, 2006-05-19 04:51:19+04:00, anozdrin@mysql.com +0 -2
    Removed unused variables.

  server-tools/instance-manager/user_map.cc@1.17, 2006-05-19 04:51:19+04:00, anozdrin@mysql.com +1 -0
    Fixed headers.

ChangeSet@1.2143.5.3, 2006-05-18 23:41:07+02:00, msvensson@shellback.(none) +1 -0
  Make ndb_waiter poll the ndb_mgmd  for status more often 

  storage/ndb/tools/waiter.cpp@1.24.1.1, 2006-05-18 23:40:59+02:00, msvensson@shellback.(none) +2 -2
    Make ndb_waiter poll the ndb_mgmd  for status more often 

ChangeSet@1.2143.5.2, 2006-05-18 23:36:55+02:00, msvensson@shellback.(none) +1 -0
  Make safe_connect retry faster after connect failure

  client/mysqltest.c@1.211, 2006-05-18 23:36:46+02:00, msvensson@shellback.(none) +3 -3
    Make safe_connect retry faster after connect failure

ChangeSet@1.2143.5.1, 2006-05-18 23:35:17+02:00, msvensson@shellback.(none) +4 -0
  Start servers in parallel
  Add list of clusters and nodes

  mysql-test/lib/mtr_process.pl@1.32.1.1, 2006-05-18 23:34:57+02:00, msvensson@shellback.(none) +208 -145
    Start servers in parallell

  mysql-test/lib/mtr_report.pl@1.26, 2006-05-18 23:34:57+02:00, msvensson@shellback.(none) +8 -1
    Report about number of restarts

  mysql-test/lib/mtr_stress.pl@1.6, 2006-05-18 23:34:57+02:00, msvensson@shellback.(none) +1 -2
    Update args to pass to mysqld_start

  mysql-test/mysql-test-run.pl@1.114.4.1, 2006-05-18 23:34:57+02:00, msvensson@shellback.(none) +765 -565
    Start servers in  parallell
    Add lists for clusters and it's nodes to keep track of things

ChangeSet@1.2154.8.5, 2006-05-18 23:31:49+02:00, msvensson@shellback.(none) +2 -0
  Use --with-ssl

  BUILD/compile-dist@1.11, 2006-05-18 23:31:36+02:00, msvensson@shellback.(none) +1 -1
    Use --with-ssl instead of --with-yassl

  config/ac-macros/ssl.m4@1.2, 2006-05-18 23:31:37+02:00, msvensson@shellback.(none) +2 -2
    Change variable name to with_bundled_yassl

ChangeSet@1.2143.3.2, 2006-05-19 01:26:19+04:00, petr@mysql.com +3 -0
  WL#3244 "CSV engine: convert mmap to read/write calls"

  mysql-test/r/csv.result@1.10, 2006-05-19 01:26:15+04:00, petr@mysql.com +2 -2
    Correct result file

  storage/csv/ha_tina.cc@1.44.1.1, 2006-05-19 01:26:15+04:00, petr@mysql.com +291 -172
     Get rid of mmap in tina. Use usual reads/writes
     to access the file.

  storage/csv/ha_tina.h@1.18, 2006-05-19 01:26:15+04:00, petr@mysql.com +64 -5
      Add Transparent_file class, which hides details of access
      to the file. Perform a cleanup & add new functions.

ChangeSet@1.2119.593.3, 2006-05-18 23:34:35+04:00, anozdrin@mysql.com +1 -0
  Fix compilation on FC4.

  server-tools/instance-manager/instance_options.cc@1.31.1.2, 2006-05-18 23:34:31+04:00, anozdrin@mysql.com +2 -1
    Fix compilation on FC4.

ChangeSet@1.2119.593.2, 2006-05-18 22:31:28+04:00, anozdrin@mysql.com +1 -0
  Fix compilation error on FC4.

  server-tools/instance-manager/manager.cc@1.31.1.2, 2006-05-18 22:31:25+04:00, anozdrin@mysql.com +15 -15
    Fix compilation error on FC4.

ChangeSet@1.2154.10.5, 2006-05-18 20:07:35+02:00, msvensson@shellback.(none) +3 -0
  Tests uses innodb, add test to check if innodb is available

  mysql-test/t/func_group.test@1.45.1.1, 2006-05-18 20:07:27+02:00, msvensson@shellback.(none) +2 -0
    Test uses innodb, add test to check if innodb is available

  mysql-test/t/group_min_max.test@1.22, 2006-05-18 20:07:27+02:00, msvensson@shellback.(none) +2 -0
    Test uses innodb, add test to check if innodb is available

  mysql-test/t/join_outer.test@1.36.1.1, 2006-05-18 20:07:27+02:00, msvensson@shellback.(none) +2 -0
    Test uses innodb, add test to check if innodb is available

ChangeSet@1.2154.10.4, 2006-05-18 19:52:43+02:00, msvensson@shellback.(none) +2 -0
  Save "master_opt" in master so it can be checked later to see if it's the same as the test that are about to run uses the same.

  mysql-test/lib/mtr_cases.pl@1.21, 2006-05-18 19:52:33+02:00, msvensson@shellback.(none) +6 -7
    Move setting of --skip-innodb out of recursive loop

  mysql-test/mysql-test-run.pl@1.114.3.1, 2006-05-18 19:52:33+02:00, msvensson@shellback.(none) +11 -0
    Save "master_opt" in master so it can be checked later to see if it's the same as the test that are about to run uses the same.

ChangeSet@1.2154.10.3, 2006-05-18 19:26:53+02:00, msvensson@shellback.(none) +6 -0
  Move test that requires innodb to sp_trans

  mysql-test/r/sp-security.result@1.33, 2006-05-18 19:26:44+02:00, msvensson@shellback.(none) +0 -10
    Move test that requires innodb to sp_trans

  mysql-test/r/sp.result@1.204.1.1, 2006-05-18 19:26:44+02:00, msvensson@shellback.(none) +0 -16
    Move test that requires innodb to sp_trans

  mysql-test/r/sp_trans.result@1.12, 2006-05-18 19:26:44+02:00, msvensson@shellback.(none) +26 -0
    Move test that requires innodb to sp_trans

  mysql-test/t/sp-security.test@1.34, 2006-05-18 19:26:44+02:00, msvensson@shellback.(none) +0 -23
    Move test that requires innodb to sp_trans

  mysql-test/t/sp.test@1.188.1.1, 2006-05-18 19:26:45+02:00, msvensson@shellback.(none) +0 -17
    Move test that requires innodb to sp_trans

  mysql-test/t/sp_trans.test@1.10, 2006-05-18 19:26:45+02:00, msvensson@shellback.(none) +39 -0
    Move test that requires innodb to sp_trans

ChangeSet@1.2154.10.2, 2006-05-18 19:16:51+02:00, msvensson@shellback.(none) +4 -0
  Moving test that requires innodb to partition_innodb

  mysql-test/r/partition.result@1.36.2.7, 2006-05-18 19:16:42+02:00, msvensson@shellback.(none) +0 -5
    Moving test that requires innodb to partition_innodb

  mysql-test/r/partition_innodb.result@1.1, 2006-05-18 19:16:42+02:00, msvensson@shellback.(none) +5 -0
    New BitKeeper file ``mysql-test/r/partition_innodb.result''

  mysql-test/r/partition_innodb.result@1.0, 2006-05-18 19:16:42+02:00, msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-5.1-new-maint/mysql-test/r/partition_innodb.result

  mysql-test/t/partition.test@1.37.2.5, 2006-05-18 19:16:42+02:00, msvensson@shellback.(none) +0 -7
    Moving test that requires innodb to partition_innodb

  mysql-test/t/partition_innodb.test@1.1, 2006-05-18 19:16:42+02:00, msvensson@shellback.(none) +9 -0
    New BitKeeper file ``mysql-test/t/partition_innodb.test''

  mysql-test/t/partition_innodb.test@1.0, 2006-05-18 19:16:42+02:00, msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-5.1-new-maint/mysql-test/t/partition_innodb.test

ChangeSet@1.2119.593.1, 2006-05-18 18:57:50+04:00, anozdrin@mysql.com +78 -0
  This is an implementation of two WL items:
    - WL#3158: IM: Instance configuration extensions;
    - WL#3159: IM: --bootstrap and --start-default-instance modes
  
  The following new statements have been added:
    - CREATE INSTANCE;
    - DROP INSTANCE;
  
  The behaviour of the following statements have been changed:
    - SET;
    - UNSET;
    - FLUSH INSTANCES;
    - SHOW INSTANCES;
    - SHOW INSTANCE OPTIONS;

  BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833@1.3, 2006-05-18 17:33:25+04:00, anozdrin@mysql.com +0 -0
    Delete: mysql-test/t/im_options_set.imtest

  BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921@1.1.2.1, 2006-05-18 17:33:25+04:00, anozdrin@mysql.com +0 -0
    Delete: mysql-test/r/im_options_set.result

  BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048@1.3, 2006-05-18 17:33:25+04:00, anozdrin@mysql.com +0 -0
    Delete: mysql-test/t/im_options_unset.imtest

  BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f@1.1.2.1, 2006-05-18 17:33:25+04:00, anozdrin@mysql.com +0 -0
    Delete: mysql-test/r/im_options_unset.result

  client/get_password.c@1.11, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +2 -2
    Change prototype to avoid casting when using C-strings (char *).

  include/m_string.h@1.41.1.1, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +12 -0
    Moved LEX_STRING to global header from sql/ to be accessible
    from all components (IM for one).

  include/my_sys.h@1.187.1.4, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +4 -0
    Added constants for modify_defaults_file().

  include/mysql_com.h@1.106, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +1 -7
    Removed duplicated declarations. my_sys.h should be used instead.

  libmysql/get_password.c@1.16, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +2 -2
    Change prototype to avoid casting when using C-strings (char *).

  mysql-test/mysql-test-run.pl@1.103.2.1, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +3 -0
    Added environment variables to be used from tests.

  mysql-test/r/im_cmd_line.result@1.1, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +40 -0
    Added result file.
    

  mysql-test/r/im_cmd_line.result@1.0, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +0 -0
    BitKeeper file /mnt/raid/MySQL/devel/5.1-rt-wl3158/mysql-test/r/im_cmd_line.result

  mysql-test/r/im_daemon_life_cycle.result@1.1.1.1, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +1 -1
    Column name has been changed in SHOW INSTANCES.

  mysql-test/r/im_instance_conf.result@1.1, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +196 -0
    Added result file.

  mysql-test/r/im_instance_conf.result@1.0, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +0 -0
    BitKeeper file /mnt/raid/MySQL/devel/5.1-rt-wl3158/mysql-test/r/im_instance_conf.result

  mysql-test/r/im_life_cycle.result@1.5.1.1, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +48 -24
    1. Column name has been changed in SHOW INSTANCES.
    2. Removed redundant SHOW INSTANCE STATUS statements.

  mysql-test/r/im_options.result@1.1, 2006-05-18 18:57:45+04:00, anozdrin@mysql.com +150 -0
    Added result file.

  mysql-test/r/im_options.result@1.0, 2006-05-18 18:57:45+04:00, anozdrin@mysql.com +0 -0
    BitKeeper file /mnt/raid/MySQL/devel/5.1-rt-wl3158/mysql-test/r/im_options.result

  mysql-test/r/im_utils.result@1.3.1.1, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +2 -4
    Updated the result file.

  mysql-test/t/im_cmd_line.imtest@1.1, 2006-05-18 18:57:45+04:00, anozdrin@mysql.com +68 -0
    IM command-line options test.

  mysql-test/t/im_cmd_line.imtest@1.0, 2006-05-18 18:57:45+04:00, anozdrin@mysql.com +0 -0
    BitKeeper file /mnt/raid/MySQL/devel/5.1-rt-wl3158/mysql-test/t/im_cmd_line.imtest

  mysql-test/t/im_daemon_life_cycle-im.opt@1.3, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +1 -0
    Set minimal monitoring interval for Instance Manager to speed up testing.

  mysql-test/t/im_daemon_life_cycle.imtest@1.2, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +3 -0
    Get Instance Manager and managed mysqld-instances enough time to start.

  mysql-test/t/im_instance_conf-im.opt@1.1, 2006-05-18 18:57:45+04:00, anozdrin@mysql.com +1 -0
    Set minimal monitoring interval for Instance Manager to speed up testing.

  mysql-test/t/im_instance_conf-im.opt@1.0, 2006-05-18 18:57:45+04:00, anozdrin@mysql.com +0 -0
    BitKeeper file /mnt/raid/MySQL/devel/5.1-rt-wl3158/mysql-test/t/im_instance_conf-im.opt

  mysql-test/t/im_instance_conf.imtest@1.1, 2006-05-18 18:57:45+04:00, anozdrin@mysql.com +228 -0
    Added a new test case for checking instance-management.

  mysql-test/t/im_instance_conf.imtest@1.0, 2006-05-18 18:57:45+04:00, anozdrin@mysql.com +0 -0
    BitKeeper file /mnt/raid/MySQL/devel/5.1-rt-wl3158/mysql-test/t/im_instance_conf.imtest

  mysql-test/t/im_life_cycle-im.opt@1.1, 2006-05-18 18:57:46+04:00, anozdrin@mysql.com +1 -0
    Set minimal monitoring interval for Instance Manager to speed up testing.

  mysql-test/t/im_life_cycle-im.opt@1.0, 2006-05-18 18:57:46+04:00, anozdrin@mysql.com +0 -0
    BitKeeper file /mnt/raid/MySQL/devel/5.1-rt-wl3158/mysql-test/t/im_life_cycle-im.opt

  mysql-test/t/im_life_cycle.imtest@1.6, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +67 -28
    1. Polishing;
    2. Fixed a test error in 1.1.2.

  mysql-test/t/im_options.imtest@1.1, 2006-05-18 18:57:46+04:00, anozdrin@mysql.com +268 -0
    Join im_options_set and im_options_unset and add new tests.

  mysql-test/t/im_options.imtest@1.0, 2006-05-18 18:57:46+04:00, anozdrin@mysql.com +0 -0
    BitKeeper file /mnt/raid/MySQL/devel/5.1-rt-wl3158/mysql-test/t/im_options.imtest

  mysql-test/t/im_utils-im.opt@1.1, 2006-05-18 18:57:46+04:00, anozdrin@mysql.com +1 -0
    Set minimal monitoring interval for Instance Manager to speed up testing.

  mysql-test/t/im_utils-im.opt@1.0, 2006-05-18 18:57:46+04:00, anozdrin@mysql.com +0 -0
    BitKeeper file /mnt/raid/MySQL/devel/5.1-rt-wl3158/mysql-test/t/im_utils-im.opt

  mysql-test/t/im_utils.imtest@1.2, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +6 -2
    Get Instance Manager and managed mysqld-instances enough time to start.

  mysys/default.c@1.81, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +9 -1
    Pass the name of the section to the handler function as well.

  mysys/default_modify.c@1.12, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +43 -15
    Added REMOVE_SECTION functionality.

  server-tools/instance-manager/IMService.cpp@1.8, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +19 -6
    Polishing: be more verbose.

  server-tools/instance-manager/IMService.h@1.4, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +20 -0
    Polishing: added copyright.

  server-tools/instance-manager/Makefile.am@1.34.1.1, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +7 -1
    Added new files.

  server-tools/instance-manager/WindowsService.cpp@1.6, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +18 -15
    Polishing: according to The Coding Style, TRUE/FALSE must be
    used instead of true/false.

  server-tools/instance-manager/WindowsService.h@1.6, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +18 -0
    Polishing: added copyright.

  server-tools/instance-manager/command.h@1.6, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +15 -3
    Polishing: provide a comment for the main operation of "Command" class.

  server-tools/instance-manager/commands.cc@1.34, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +1366 -483
    1. Added support for CREATE INSTANCE, DROP INSTANCE statements;
    2. Added "deprecated" column in output of SHOW INSTANCE OPTIONS;
    3. Modified the behaviour of SET/UNSET, FLUSH INSTANCES statements;

  server-tools/instance-manager/commands.h@1.10, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +231 -72
    1. Added support for CREATE INSTANCE, DROP INSTANCE statements;
    2. Added "deprecated" column in output of SHOW INSTANCE OPTIONS;
    3. Modified the behaviour of SET/UNSET, FLUSH INSTANCES statements;

  server-tools/instance-manager/exit_codes.h@1.1, 2006-05-18 18:57:46+04:00, anozdrin@mysql.com +41 -0
    New file for defining exit codes for user-management mode.

  server-tools/instance-manager/exit_codes.h@1.0, 2006-05-18 18:57:46+04:00, anozdrin@mysql.com +0 -0
    BitKeeper file /mnt/raid/MySQL/devel/5.1-rt-wl3158/server-tools/instance-manager/exit_codes.h

  server-tools/instance-manager/guardian.cc@1.22, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +101 -32
    Added operations to retrieve state of managed instances.

  server-tools/instance-manager/guardian.h@1.13, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +30 -4
    Added operations to retrieve state of managed instances.

  server-tools/instance-manager/instance.cc@1.33, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +87 -35
    1. Provided an operation to check validity of instance name.
    2. Added an attribute to distiguish mysqld-instances,
       whose configuration should be kept backward-compatible.

  server-tools/instance-manager/instance.h@1.16, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +114 -4
    1. Provided an operation to check validity of instance name.
    2. Added an attribute to distiguish mysqld-instances,
       whose configuration should be kept backward-compatible.

  server-tools/instance-manager/instance_map.cc@1.27, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +358 -77
    1. Used the operation to check validity of instance name;
    2. Added operations to manage instances.

  server-tools/instance-manager/instance_map.h@1.19, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +54 -8
    Added operations to manage instances.

  server-tools/instance-manager/instance_options.cc@1.31.1.1, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +184 -127
    Changed Instance_options so that it will be possible to manage
    options on the fly.

  server-tools/instance-manager/instance_options.h@1.18.1.1, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +35 -21
    Changed Instance_options so that it will be possible to manage
    options on the fly.

  server-tools/instance-manager/listener.cc@1.26, 2006-05-18 18:57:43+04:00, anozdrin@mysql.com +14 -11
    1. Remove reference to the instance of Options;
    2. Use new Options naming scheme.

  server-tools/instance-manager/listener.h@1.7, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +0 -4
    Remove reference to the instance of Options;

  server-tools/instance-manager/log.cc@1.9, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +5 -5
    Polishing: use TRUE/FALSE instead of true/false.

  server-tools/instance-manager/manager.cc@1.31.1.1, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +93 -36
    Added a common for IM operation to work with configuration file.

  server-tools/instance-manager/manager.h@1.4.1.1, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +1 -3
    Added a common for IM operation to work with configuration file.

  server-tools/instance-manager/messages.cc@1.6, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +20 -4
    Added messages for new errors.

  server-tools/instance-manager/mysql_connection.cc@1.16, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +24 -22
    1. Move a constant to common place.
    2. Polishing.

  server-tools/instance-manager/mysql_manager_error.h@1.4, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +8 -0
    Added new errors.

  server-tools/instance-manager/mysqlmanager.cc@1.16.1.1, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +50 -27
    1. Use error code from Options::load();
    2. Eliminate type-casting warning on Windows.

  server-tools/instance-manager/options.cc@1.32.1.1, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +273 -125
    Added support for user-management command-line options.

  server-tools/instance-manager/options.h@1.15.1.1, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +65 -28
    Added support for user-management command-line options.

  server-tools/instance-manager/parse.cc@1.14, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +265 -86
    1. Added support of new statements:
       - CREATE INSTANCE;
       - DROP INSTANCE.
    2. Modified SET/UNSET.

  server-tools/instance-manager/parse.h@1.7, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +154 -5
    1. Added support of new statements:
       - CREATE INSTANCE;
       - DROP INSTANCE.
    2. Modified SET/UNSET.

  server-tools/instance-manager/parse_output.cc@1.20, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +5 -3
    Sorted out header files.

  server-tools/instance-manager/parse_output.h@1.6, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +2 -0
    Sorted out header files.

  server-tools/instance-manager/portability.h@1.9, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +14 -0
    1. Added constants for Windows.
    2. Moved system-dependent defines from instance_options.cc.

  server-tools/instance-manager/priv.cc@1.11, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +3 -5
    Updated version.

  server-tools/instance-manager/priv.h@1.11, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +24 -6
    Added some global constants.

  server-tools/instance-manager/protocol.cc@1.14, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +4 -4
    Replaced NAME_WITH_LENGTH by LEX_STRING.

  server-tools/instance-manager/protocol.h@1.7, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +0 -5
    Replaced NAME_WITH_LENGTH by LEX_STRING.

  server-tools/instance-manager/thread_registry.cc@1.11, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +6 -5
    Polishing: use TRUE/FALSE instead of true/false.

  server-tools/instance-manager/user_management_commands.cc@1.1, 2006-05-18 18:57:46+04:00, anozdrin@mysql.com +408 -0
    User-management commands implementation.

  server-tools/instance-manager/user_management_commands.cc@1.0, 2006-05-18 18:57:46+04:00, anozdrin@mysql.com +0 -0
    BitKeeper file /mnt/raid/MySQL/devel/5.1-rt-wl3158/server-tools/instance-manager/user_management_commands.cc

  server-tools/instance-manager/user_management_commands.h@1.1, 2006-05-18 18:57:47+04:00, anozdrin@mysql.com +167 -0
    User-management command declarations.

  server-tools/instance-manager/user_management_commands.h@1.0, 2006-05-18 18:57:47+04:00, anozdrin@mysql.com +0 -0
    BitKeeper file /mnt/raid/MySQL/devel/5.1-rt-wl3158/server-tools/instance-manager/user_management_commands.h

  server-tools/instance-manager/user_map.cc@1.16, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +268 -56
    Added support for managing password database.

  server-tools/instance-manager/user_map.h@1.6, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +60 -3
    Added support for managing password database.

  sql/sp.cc@1.107.1.1, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +4 -6
    Replaced LEX_STRING_WITH_INIT by LEX_STRING + struct initialization.

  sql/sp_head.cc@1.215.1.1, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +2 -2
    Replaced LEX_STRING_WITH_INIT by LEX_STRING + struct initialization.

  sql/spatial.cc@1.28, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +4 -1
    Removed LEX_STRING_WITH_INIT.

  sql/spatial.h@1.20, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +1 -1
    Removed LEX_STRING_WITH_INIT.

  sql/sql_string.h@1.61, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +0 -2
    Moved STRING_WITH_LEN() macro out from sql (to m_string.h).

  sql/sql_trigger.cc@1.55, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +2 -2
    Moved STRING_WITH_LEN() macro out from sql (to m_string.h).

  sql/structs.h@1.58.1.1, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +0 -16
    Removed LEX_STRING_WITH_INIT.

  support-files/mysql.server.sh@1.50, 2006-05-18 18:57:44+04:00, anozdrin@mysql.com +4 -1
    Instruct Instance Manager to work in mysqld-safe compatible mode
    for backward compatibility.

ChangeSet@1.1616.2601.9, 2006-05-18 17:10:58+05:00, ramil@mysql.com +3 -0
  Fix for bug #15558: truncate doesn't clear table on archive storage engine tables.

  mysql-test/r/archive.result@1.2.1.3, 2006-05-18 17:10:52+05:00, ramil@mysql.com +2 -0
    Fix for bug #15558: truncate doesn't clear table on archive storage engine tables.
      - adjusted result

  mysql-test/t/archive.test@1.2.1.5, 2006-05-18 17:10:53+05:00, ramil@mysql.com +2 -0
    Fix for bug #15558: truncate doesn't clear table on archive storage engine tables.
      - adjusted test

  sql/examples/ha_archive.cc@1.13.1.17, 2006-05-18 17:10:53+05:00, ramil@mysql.com +1 -1
    Fix for bug #15558: truncate doesn't clear table on archive storage engine tables.
      - return an error as we don't suport delete_all_rows.

ChangeSet@1.1810.1522.5, 2006-05-18 21:32:24+10:00, stewart@mysql.com +1 -0
  BUG#18966 Change in stop/shutdown behaviour
  
  Now need this fix to prevent crash of ndb_mgm on invalid mgm protocol.

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.9.2, 2006-05-18 21:31:57+10:00, stewart@mysql.com +4 -4
    fix crash on invalid mgm protocol

ChangeSet@1.2119.592.2, 2006-05-18 12:55:34+02:00, msvensson@shellback.(none) +4 -0
  Move innodb dependent test from create to mysql_innodb

  mysql-test/t/innodb_mysql.test@1.3.1.1, 2006-05-18 12:55:25+02:00, msvensson@shellback.(none) +9 -0
    Move innodb dependent test from create to mysql_innodb

  mysql-test/r/create.result@1.118.1.1, 2006-05-18 12:53:40+02:00, msvensson@shellback.(none) +0 -6
    Move innodb dependent test from create to mysql_innodb

  mysql-test/r/innodb_mysql.result@1.3.1.1, 2006-05-18 12:55:25+02:00, msvensson@shellback.(none) +6 -0
    Move innodb dependent test from create to mysql_innodb

  mysql-test/t/create.test@1.79.1.1, 2006-05-18 12:55:25+02:00, msvensson@shellback.(none) +0 -7
    Move innodb dependent test from create to mysql_innodb

ChangeSet@1.1810.1706.1, 2006-05-18 14:44:15+04:00, anozdrin@mysql.com +2 -0
  Test case for BUG#18037: Server crash when returning system
  variable in stored procedures.

  mysql-test/r/sp.result@1.170.1.30, 2006-05-18 14:44:12+04:00, anozdrin@mysql.com +30 -0
    Test case for BUG#18037: Server crash when returning system
    variable in stored procedures.

  mysql-test/t/sp.test@1.174.1.14, 2006-05-18 14:44:12+04:00, anozdrin@mysql.com +46 -0
    Test case for BUG#18037: Server crash when returning system
    variable in stored procedures.

ChangeSet@1.2119.345.83, 2006-05-18 10:17:53+02:00, jonas@perch.ndb.mysql.com +9 -0
  ndb - bug#19293 and family
    introduce acc per row logical mutex to fix difficult error handling cases
    

  storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp@1.31, 2006-05-18 10:17:49+02:00, jonas@perch.ndb.mysql.com +88 -45
    1) Fix per row mutex so that only 1 op at a time is running on a row
    2) Change TUP_ALLOC/DEALLOC semantic, so that a new record will be allocated if LQ = { T1(DEL) - T2(INS) }
    3) Rewrite lock queus to be O(1) in all cases but a few abort cases where we scan parallell queue
    4) Impl. a validate_lock_queue/dump_lock_queue test framework

  storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp@1.21, 2006-05-18 10:17:49+02:00, jonas@perch.ndb.mysql.com +0 -4
    1) Fix per row mutex so that only 1 op at a time is running on a row
    2) Change TUP_ALLOC/DEALLOC semantic, so that a new record will be allocated if LQ = { T1(DEL) - T2(INS) }
    3) Rewrite lock queus to be O(1) in all cases but a few abort cases where we scan parallell queue
    4) Impl. a validate_lock_queue/dump_lock_queue test framework

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@1.67, 2006-05-18 10:17:50+02:00, jonas@perch.ndb.mysql.com +2009 -1097
    1) Fix per row mutex so that only 1 op at a time is running on a row
    2) Change TUP_ALLOC/DEALLOC semantic, so that a new record will be allocated if LQ = { T1(DEL) - T2(INS) }
    3) Rewrite lock queus to be O(1) in all cases but a few abort cases where we scan parallell queue
    4) Impl. a validate_lock_queue/dump_lock_queue test framework

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.46, 2006-05-18 10:17:50+02:00, jonas@perch.ndb.mysql.com +26 -3
    1) impl. a new read key from operation record needed by acc
    2) expand TRACE_OP toolkit
    3) impl. ACCKEY_ORD as needed by ACC changes

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.105, 2006-05-18 10:17:50+02:00, jonas@perch.ndb.mysql.com +259 -158
    1) impl. a new read key from operation record needed by acc
    2) expand TRACE_OP toolkit
    3) impl. ACCKEY_ORD as needed by ACC changes

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.44, 2006-05-18 10:17:50+02:00, jonas@perch.ndb.mysql.com +0 -3
    remove unused states/methods

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.37, 2006-05-18 10:17:50+02:00, jonas@perch.ndb.mysql.com +16 -104
    remove extremly tricky code that handles disk_insert_but_no_mem_insert
      that is no long needed with current acc changes

  storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp@1.28, 2006-05-18 10:17:50+02:00, jonas@perch.ndb.mysql.com +0 -1
    remove unused states/methods

  storage/ndb/test/ndbapi/testOperations.cpp@1.13, 2006-05-18 10:17:50+02:00, jonas@perch.ndb.mysql.com +2 -2
    renable last 3 lock upgrade testcases since they now pass

ChangeSet@1.2157, 2006-05-18 12:42:38+05:00, holyfoot@deer.(none) +1 -0
  test result fixed

  mysql-test/r/auto_increment.result@1.41, 2006-05-18 12:42:31+05:00, holyfoot@mysql.com +1 -1
    result fixed

ChangeSet@1.2154.6.3, 2006-05-18 12:28:39+05:00, bar@mysql.com +1 -0
  sql_db.cc:
    Bug#19392: Rename Database: Crash if case change
    Additional minor fix, to avoid compiler warnings.

  sql/sql_db.cc@1.135, 2006-05-18 12:26:11+05:00, bar@mysql.com +2 -2
    Bug#19392: Rename Database: Crash if case change
    Additional minor fix, to avoid compiler warnings.

ChangeSet@1.2154.6.2, 2006-05-18 12:21:13+05:00, bar@mysql.com +3 -0
  Bug#19392 Rename Database: Crash if case change
  Problem:
  Renaming a database to itself crashed server.
  It hapenned because of wrong DBUG_ASSERT.
  Fix: removing wrong DBUG_ASSERT. Now it reports
  a correct error message "database alreadt exists".

  mysql-test/r/renamedb.result@1.2, 2006-05-18 12:20:37+05:00, bar@mysql.com +4 -0
    Adding test case

  mysql-test/t/renamedb.test@1.2, 2006-05-18 12:20:37+05:00, bar@mysql.com +8 -0
    Adding test case

  sql/sql_db.cc@1.134, 2006-05-18 12:20:37+05:00, bar@mysql.com +3 -3
    DBUG_ASSERT crashed server when renaming a database to itself.

ChangeSet@1.2119.345.82, 2006-05-18 08:50:49+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    fix crashing dump numbers

  storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp@1.11, 2006-05-18 08:50:46+02:00, jonas@perch.ndb.mysql.com +1 -1
    fix crashing dump numbers

ChangeSet@1.2119.592.1, 2006-05-17 23:54:48+02:00, msvensson@shellback.(none) +1 -0
  Parse test files to find out if it needs innodb or not, mark test as 'innodb_test' if it does and add "--skip-innodb" to master_opts if it does not.

  mysql-test/lib/mtr_cases.pl@1.20, 2006-05-17 23:54:41+02:00, msvensson@shellback.(none) +43 -0
    Parse test files to find out if it needs innodb or not

ChangeSet@1.2119.496.35, 2006-05-17 22:16:51+02:00, guilhem@mysql.com +7 -0
  Removing the binlog-show-xid option as it was only a temporary solution until we have replace-regex which we have now.
  That option was used to suppress the XID from the output of SHOW BINLOG EVENTS (to create a repeatable testsuite),
  was available only in debug builds, and was explicitely marked as "may be removed in future versions" in mysqld --help.
  Idea of the removal approved by the replication team.

  mysql-test/extra/binlog_tests/binlog.test@1.7.1.1, 2006-05-17 22:16:35+02:00, guilhem@mysql.com +3 -3
    use replace-regex to remove xid

  mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test@1.28, 2006-05-17 22:16:35+02:00, guilhem@mysql.com +13 -13
    use replace-regex to remove xid

  mysql-test/mysql-test-run.sh@1.319.1.5, 2006-05-17 22:16:35+02:00, guilhem@mysql.com +0 -3
    option removed

  mysql-test/mysql-test-run.pl@1.112.2.2, 2006-05-17 22:16:35+02:00, guilhem@mysql.com +0 -2
    option removed

  sql/log_event.cc@1.220.2.1, 2006-05-17 22:16:36+02:00, guilhem@mysql.com +1 -13
    no more need to hide XID in tests output as we have replace-regex

  sql/log_event.h@1.133.2.1, 2006-05-17 22:16:36+02:00, guilhem@mysql.com +0 -3
    no more need to hide XID in tests output as we have replace-regex

  sql/mysqld.cc@1.534.20.1, 2006-05-17 22:16:36+02:00, guilhem@mysql.com +0 -8
    no more need to hide XID in tests output as we have replace-regex

ChangeSet@1.2119.345.81, 2006-05-17 16:59:44+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - 
    Add mutex surronding sessions, as ndb_mgmd now actively tries to go and "purge stale sessions"

  storage/ndb/include/util/SocketServer.hpp@1.12, 2006-05-17 16:59:41+02:00, jonas@perch.ndb.mysql.com +5 -3
    Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"

  storage/ndb/src/common/util/SocketServer.cpp@1.21, 2006-05-17 16:59:41+02:00, jonas@perch.ndb.mysql.com +35 -9
    Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"

  storage/ndb/src/mgmsrv/Services.cpp@1.63.1.1, 2006-05-17 16:59:41+02:00, jonas@perch.ndb.mysql.com +2 -0
    Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"

ChangeSet@1.2154.3.2, 2006-05-17 15:57:45+02:00, lars@mysql.com +3 -0
  After merge fixes

  sql/log.cc@1.204.1.5, 2006-05-17 15:57:30+02:00, lars@mysql.com +0 -2
    After merge fixes

  sql/set_var.cc@1.175, 2006-05-17 15:57:30+02:00, lars@mysql.com +4 -5
    After merge fixes

  sql/sql_class.h@1.292.1.3, 2006-05-17 15:57:32+02:00, lars@mysql.com +2 -1
    After merge fixes

ChangeSet@1.1616.2606.1, 2006-05-17 17:00:30+05:00, ramil@mysql.com +3 -0
  Fix for #16327: invalid TIMESTAMP values retrieved

  mysql-test/r/func_time.result@1.23.1.16, 2006-05-17 17:00:25+05:00, ramil@mysql.com +7 -0
    Fix for #16327: invalid TIMESTAMP values retrieved
      - test result

  mysql-test/t/func_time.test@1.21.1.13, 2006-05-17 17:00:25+05:00, ramil@mysql.com +10 -0
    Fix for #16327: invalid TIMESTAMP values retrieved
      - test case

  sql/field.cc@1.197.1.33, 2006-05-17 17:00:25+05:00, ramil@mysql.com +1 -1
    Fix for #16327: invalid TIMESTAMP values retrieved
      - let 1969 as well

ChangeSet@1.2119.345.80, 2006-05-17 13:13:07+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb -
    Fix recursive mutex lock in drop index (ndbapi programs only)

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.129.2.1, 2006-05-17 13:13:04+02:00, jonas@perch.ndb.mysql.com +3 -57
    Fix recursive mutex lock in drop index (ndbapi programs only)

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp@1.58, 2006-05-17 13:13:04+02:00, jonas@perch.ndb.mysql.com +72 -73
    Fix recursive mutex lock in drop index (ndbapi programs only)

ChangeSet@1.1810.1662.5, 2006-05-17 12:40:10+02:00, pekka@mysql.com +6 -0
  ndb -  bug#14509 [related] re-do auto-incr error handling

  sql/ha_ndbcluster.cc@1.175.29.2, 2006-05-17 12:30:57+02:00, pekka@mysql.com +21 -15
    make auto-incr methods return int 0/-1

  ndb/include/ndbapi/Ndb.hpp@1.39.8.1, 2006-05-17 12:30:57+02:00, pekka@mysql.com +20 -15
    make auto-incr methods return int 0/-1

  ndb/src/ndbapi/Ndb.cpp@1.49.11.1, 2006-05-17 12:30:57+02:00, pekka@mysql.com +90 -68
    make auto-incr methods return int 0/-1

  ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.74.19.1, 2006-05-17 12:30:57+02:00, pekka@mysql.com +1 -1
    make auto-incr methods return int 0/-1

  ndb/test/ndbapi/testDict.cpp@1.20.4.1, 2006-05-17 12:30:57+02:00, pekka@mysql.com +7 -3
    make auto-incr methods return int 0/-1

  ndb/tools/restore/consumer_restore.cpp@1.14.10.1, 2006-05-17 12:30:57+02:00, pekka@mysql.com +6 -3
    make auto-incr methods return int 0/-1

ChangeSet@1.1810.1662.4, 2006-05-16 16:17:30+02:00, pekka@mysql.com +1 -0
  ndb - bug#14509 [related] fix a return value

  ndb/src/ndbapi/Ndb.cpp@1.49.10.1, 2006-05-16 16:14:36+02:00, pekka@mysql.com +2 -2
    fix a return value

ChangeSet@1.2119.581.4, 2006-05-16 08:55:08-05:00, reggie@big_geek. +1 -0
  Bug #18480  	Windows file rename problems in archive storage engine
  
  The problem was that the optimize code was not closing both the reader and writer streams before attempting
  to rename the file.  This will not work on Windows where all file handles have to be closed before the
  file can be renamed, moved, or deleted.  The fix was to move the close calls before the rename.
  We return the error code from my_rename in case of failure but we attempt to reopen the writers and readers
  even in the case of failure so that the table can still be usable.

  storage/archive/ha_archive.cc@1.91, 2006-05-16 08:54:59-05:00, reggie@big_geek. +14 -7
    close the writer and reader before the rename so that the rename will work on Windows.

ChangeSet@1.1810.1699.1, 2006-05-16 18:37:23+05:00, svoj@april.(none) +1 -0
  BUG#17001 - Table and server crash on ALTER TABLE
  
  frm and data files for tables created by earlier MySQL
  versions becomes out of sync after certain ALTER TABLE statements:
  - One that changes column default value;
  - One that changes table comment;
  - One that changes table password.
  
  As a result one can expirience either server crash or data corruption/loss.
  
  This fix ensures that running ALTER TABLE on tables created by earlier
  MySQL versions recreates data files.

  sql/sql_table.cc@1.239.26.1, 2006-05-16 18:37:19+05:00, svoj@april.(none) +10 -2
    Ensure that running ALTER TABLE on tables created by earlier
    MySQL versions recreates data files.

ChangeSet@1.1810.1662.3, 2006-05-16 12:58:41+02:00, pekka@mysql.com +5 -0
  ndb - bug#14509 [related] setAutoIncrement: add error handling

  sql/ha_ndbcluster.cc@1.175.29.1, 2006-05-16 12:44:11+02:00, pekka@mysql.com +5 -5
    setAutoIncrement: add error handling

  ndb/include/ndbapi/Ndb.hpp@1.39.7.1, 2006-05-16 12:44:11+02:00, pekka@mysql.com +6 -6
    setAutoIncrement: add error handling

  ndb/src/ndbapi/Ndb.cpp@1.49.9.1, 2006-05-16 12:44:11+02:00, pekka@mysql.com +19 -20
    setAutoIncrement: add error handling

  ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.74.18.1, 2006-05-16 12:44:11+02:00, pekka@mysql.com +5 -8
    setAutoIncrement: add error handling

  ndb/tools/restore/consumer_restore.cpp@1.14.9.1, 2006-05-16 12:44:11+02:00, pekka@mysql.com +1 -1
    setAutoIncrement: add error handling

ChangeSet@1.2119.550.10, 2006-05-16 11:16:23+02:00, mats@mysql.com +16 -0
  Bug#16837 (Missing #ifdef cause compile problem --without-row-based-replication):
  Added #ifdef's to make code work even when the system is built without
  row-based replication.

  mysql-test/t/innodb_mysql.test@1.2.1.1, 2006-05-16 11:16:14+02:00, mats@mysql.com +9 -0
    Moving InnoDB-specific test from create.test

  mysql-test/r/create.result@1.119, 2006-05-16 11:16:14+02:00, mats@mysql.com +0 -6
    Result change

  mysql-test/r/innodb_mysql.result@1.2.1.1, 2006-05-16 11:16:14+02:00, mats@mysql.com +6 -0
    Result change

  mysql-test/t/create.test@1.80, 2006-05-16 11:16:14+02:00, mats@mysql.com +0 -8
    Moving InnoDB specific test to innodb_mysql.test

  mysql-test/t/rpl_rbr_to_sbr.test@1.3, 2006-05-16 11:16:15+02:00, mats@mysql.com +1 -0
    Test only sensible if we have row-based replication compiled in.

  mysql-test/t/rpl_row_basic_8partition.test@1.4, 2006-05-16 11:16:15+02:00, mats@mysql.com +1 -0
    Test only sensible if we have row-based replication compiled in.

  sql/log.cc@1.204.3.1, 2006-05-16 11:16:15+02:00, mats@mysql.com +14 -1
    Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
    row-based replication.

  sql/set_var.cc@1.164.8.1, 2006-05-16 11:16:15+02:00, mats@mysql.com +10 -0
    Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
    row-based replication.

  sql/set_var.h@1.86, 2006-05-16 11:16:15+02:00, mats@mysql.com +7 -2
    Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
    row-based replication.

  sql/share/errmsg.txt@1.96.2.1, 2006-05-16 11:16:15+02:00, mats@mysql.com +2 -0
    Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
    row-based replication.

  sql/sql_base.cc@1.318.1.4, 2006-05-16 11:16:15+02:00, mats@mysql.com +2 -0
    Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
    row-based replication.

  sql/sql_class.cc@1.256.2.1, 2006-05-16 11:16:15+02:00, mats@mysql.com +12 -1
    Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
    row-based replication.

  sql/sql_class.h@1.291.1.3, 2006-05-16 11:16:15+02:00, mats@mysql.com +17 -6
    Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
    row-based replication.

  sql/sql_insert.cc@1.199, 2006-05-16 11:16:15+02:00, mats@mysql.com +8 -2
    Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
    row-based replication.

  sql/sql_parse.cc@1.540.8.1, 2006-05-16 11:16:15+02:00, mats@mysql.com +2 -0
    Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
    row-based replication.

  sql/sql_table.cc@1.331.4.1, 2006-05-16 11:16:16+02:00, mats@mysql.com +2 -1
    Not running hooks 

ChangeSet@1.2119.567.7, 2006-05-15 12:31:14-05:00, reggie@big_geek. +3 -0
  patch to get archive test working on Windows.

  libmysqld/CMakeLists.txt@1.5, 2006-05-15 12:31:02-05:00, reggie@big_geek. +1 -1
    removed handlerton-win from the files needed for embedded server.

  mysql-test/r/archive.result@1.21, 2006-05-15 12:31:03-05:00, reggie@big_geek. +1 -1
    dropping table t3

  mysql-test/t/archive.test@1.21, 2006-05-15 12:31:04-05:00, reggie@big_geek. +1 -1
    dropping t3 table since it is created later in the file

ChangeSet@1.2119.578.2, 2006-05-14 20:53:39+05:00, holyfoot@deer.(none) +1 -0
  Error message fixed

  sql/share/errmsg.txt@1.96.1.4, 2006-05-14 20:53:32+05:00, holyfoot@mysql.com +1 -1
    error message fixed

ChangeSet@1.2119.578.1, 2006-05-12 18:02:42+05:00, holyfoot@deer.(none) +6 -0
  bug #14573 (Error on adding auto_increment on to a column with '0' values)

  mysql-test/r/auto_increment.result@1.37.1.3, 2006-05-12 18:00:46+05:00, holyfoot@mysql.com +6 -0
    test result

  mysql-test/t/auto_increment.test@1.26, 2006-05-12 18:00:46+05:00, holyfoot@mysql.com +11 -0
    test case

  sql/handler.cc@1.232, 2006-05-12 18:00:46+05:00, holyfoot@mysql.com +19 -12
    print_keydupp_error implemented

  sql/handler.h@1.206.1.3, 2006-05-12 18:00:46+05:00, holyfoot@mysql.com +1 -0
    handler::print_keydupp_error declared

  sql/share/errmsg.txt@1.96.1.3, 2006-05-12 18:00:46+05:00, holyfoot@mysql.com +3 -0
    error message added

  sql/sql_table.cc@1.331.1.1, 2006-05-12 18:00:46+05:00, holyfoot@mysql.com +14 -0
    now we return different error message for auto_increment case

ChangeSet@1.1810.1661.4, 2006-05-11 21:15:37+05:00, svoj@april.(none) +3 -0
  BUG#12873 - BTREE index on MEMORY table with multiple NULL values
              doesn't work properly
  
  Unique BTREE index on MEMORY table refuse multiple NULL values.
  
  Fixed search_flag to allow multiple null values inside unique key.

  mysql-test/r/heap_btree.result@1.18.1.2, 2006-05-11 21:15:33+05:00, svoj@april.(none) +3 -0
    Testcase for BUG#12873.

  mysql-test/t/heap_btree.test@1.17, 2006-05-11 21:15:33+05:00, svoj@april.(none) +8 -0
    Testcase for BUG#12873.

  heap/hp_write.c@1.22.1.1, 2006-05-11 21:15:33+05:00, svoj@april.(none) +1 -1
    Fixed search_flag to allow multiple null values inside unique key.

ChangeSet@1.1616.2569.2, 2006-05-11 14:13:14+02:00, msvensson@neptunus.(none) +6 -0
  Bug#15328 Segmentation fault occured if my.cnf is invalid for escape sequence
   - Check that length of value is longer than 1 before decrementing length by 2.
   - Backport from 5.0, make it possible to use my_print_defaults in tests

  mysql-test/mysql-test-run.sh@1.208.16.1, 2006-05-11 14:13:10+02:00, msvensson@neptunus.(none) +3 -1
    Backport from 5.0, make it possible to use my_print_defaults from tests

  mysql-test/mysql-test-run.pl@1.8.10.3, 2006-05-11 14:13:10+02:00, msvensson@neptunus.(none) +8 -0
    Backport from 5.0, make it possible to use my_print_defaults from tests

  mysql-test/r/mysqldump.result@1.9.8.1, 2006-05-11 14:13:10+02:00, msvensson@neptunus.(none) +1 -0
    Update result

  mysql-test/std_data/bug15328.cnf@1.1, 2006-05-11 14:13:11+02:00, msvensson@neptunus.(none) +2 -0
    New BitKeeper file ``mysql-test/std_data/bug15328.cnf''

  mysql-test/std_data/bug15328.cnf@1.0, 2006-05-11 14:13:11+02:00, msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug15328/my41-bug15328/mysql-test/std_data/bug15328.cnf

  mysql-test/t/mysqldump.test@1.19.6.1, 2006-05-11 14:13:10+02:00, msvensson@neptunus.(none) +8 -0
    Test that my_print default don't segfault when encountering an option without closing "

  mysys/default.c@1.43.1.7, 2006-05-11 14:13:10+02:00, msvensson@neptunus.(none) +3 -1
    Check that length of value is longer than 1 before deciding to decrement its length by 2.

ChangeSet@1.1810.1662.2, 2006-05-11 12:58:45+02:00, pekka@mysql.com +2 -0
  ndb - bug#14509 (5.0) part 2: create SYSTAB_0 row on first use

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@1.14.10.1, 2006-05-11 12:46:41+02:00, pekka@mysql.com +4 -6
    do not pre-create tupleid values (the values were obsolete too).
    they are created on first use.
    this is easy way to handle rolling upgrade when number of tables is increased

  ndb/src/ndbapi/Ndb.cpp@1.49.8.2, 2006-05-11 12:48:53+02:00, pekka@mysql.com +26 -7
    create SYSTAB_0 row on first use (use writeTuple).
    fix check of interpreted program return code

ChangeSet@1.2119.563.2, 2006-05-11 15:06:12+05:00, holyfoot@deer.(none) +1 -0
  merging

  sql/share/errmsg.txt@1.99, 2006-05-11 15:00:19+05:00, holyfoot@mysql.com +0 -2
    merging

ChangeSet@1.1810.1678.1, 2006-05-10 21:50:04+05:00, svoj@april.(none) +3 -0
  BUG#18233 - Memory tables INDEX USING HASH (a,b) returns 1 row on
              SELECT WHERE a= AND b=
  
  Selecting data from memory table with varchar column and hash index over it
  returns only first row matched.
  
  Problem was that key length calculation for varchar columns didn't include
  number of bytes to store length.
  
  Fixed key length for varchar fields to include number of bytes to store length.

  mysql-test/r/heap.result@1.42.1.7, 2006-05-10 21:50:00+05:00, svoj@april.(none) +13 -0
    Testcase for BUG#18233.

  mysql-test/t/heap.test@1.35, 2006-05-10 21:50:00+05:00, svoj@april.(none) +12 -0
    Testcase for BUG#18233.

  heap/hp_create.c@1.20.3.1, 2006-05-10 21:50:00+05:00, svoj@april.(none) +2 -0
    Fixed key length for varchar fields to include number of bytes to store length.

ChangeSet@1.2119.546.1, 2006-05-08 14:50:13-05:00, reggie@big_geek. +22 -0
  removing MSDOS defines and code

  include/config-win.h@1.85.2.1, 2006-05-08 14:49:25-05:00, reggie@big_geek. +1 -1
    removed reference to MSDOS

  include/m_string.h@1.40.1.1, 2006-05-08 14:49:28-05:00, reggie@big_geek. +0 -6
    removing MSDOS defines and code

  include/my_base.h@1.86.2.1, 2006-05-08 14:49:29-05:00, reggie@big_geek. +0 -3
    removing MSDOS defines and code

  include/my_net.h@1.17, 2006-05-08 14:49:31-05:00, reggie@big_geek. +2 -2
    removing MSDOS defines and code

  include/my_nosys.h@1.5, 2006-05-08 14:49:32-05:00, reggie@big_geek. +0 -3
    removing MSDOS defines and code

  include/my_sys.h@1.187.3.1, 2006-05-08 14:49:34-05:00, reggie@big_geek. +0 -16
    removing MSDOS defines and code

  include/my_tree.h@1.17.1.1, 2006-05-08 14:49:36-05:00, reggie@big_geek. +0 -8
    removing MSDOS defines and code

  mysys/mf_keycache.c@1.56.1.1, 2006-05-08 14:49:37-05:00, reggie@big_geek. +0 -8
    removing MSDOS defines and code

  mysys/mf_path.c@1.11, 2006-05-08 14:49:39-05:00, reggie@big_geek. +1 -1
    removing MSDOS defines and code

  mysys/mf_tempfile.c@1.26, 2006-05-08 14:49:41-05:00, reggie@big_geek. +1 -1
    removing MSDOS defines and code

  mysys/my_access.c@1.7.1.2, 2006-05-08 14:49:47-05:00, reggie@big_geek. +1 -1
    removing MSDOS defines and code

  mysys/my_clock.c@1.8.1.2, 2006-05-08 14:49:50-05:00, reggie@big_geek. +1 -1
    removing MSDOS defines and code

  mysys/my_copy.c@1.14.1.2, 2006-05-08 14:49:51-05:00, reggie@big_geek. +1 -1
    removing MSDOS defines and code

  mysys/my_create.c@1.13.1.2, 2006-05-08 14:49:52-05:00, reggie@big_geek. +1 -8
    removing MSDOS defines and code

  mysys/my_dup.c@1.4.1.2, 2006-05-08 14:49:53-05:00, reggie@big_geek. +1 -1
    removing MSDOS defines and code

  mysys/my_gethostbyname.c@1.8, 2006-05-08 14:49:54-05:00, reggie@big_geek. +1 -1
    removing MSDOS defines and code

  mysys/my_getwd.c@1.19, 2006-05-08 14:49:55-05:00, reggie@big_geek. +2 -34
    removing MSDOS defines and code

  mysys/my_init.c@1.47.1.1, 2006-05-08 14:49:56-05:00, reggie@big_geek. +1 -1
    removing MSDOS defines and code

  mysys/my_lib.c@1.23.1.3, 2006-05-08 14:49:58-05:00, reggie@big_geek. +6 -108
    removing MSDOS defines and code

  mysys/my_net.c@1.8, 2006-05-08 14:49:59-05:00, reggie@big_geek. +2 -2
    removing MSDOS defines and code

  mysys/my_open.c@1.25.2.1, 2006-05-08 14:50:00-05:00, reggie@big_geek. +2 -2
    removing MSDOS defines and code

  mysys/my_redel.c@1.10.1.2, 2006-05-08 14:50:01-05:00, reggie@big_geek. +2 -2
    removing MSDOS defines and code

ChangeSet@1.2119.523.3, 2006-05-08 20:05:25+02:00, mats@mysql.com +9 -0
  WL#3259 (RBR with more columns on slave than on master):
  Added support for UPDATE.
  Some minor fixes.

  mysql-test/extra/rpl_tests/rpl_row_tabledefs.test@1.3, 2006-05-08 20:04:56+02:00, mats@mysql.com +42 -22
    Extending test to ensure that there is one more null byte on slave than
    it is on the master.
    Some cleanup.

  mysql-test/r/rpl_row_tabledefs_2myisam.result@1.4, 2006-05-08 20:05:00+02:00, mats@mysql.com +50 -18
    Result change

  mysql-test/r/rpl_row_tabledefs_2myisam.result@1.3, 2006-05-04 08:27:29+02:00, mats@mysql.com +0 -0
    Rename: mysql-test/r/rpl_row_tabledefs.result -> mysql-test/r/rpl_row_tabledefs_2myisam.result

  mysql-test/r/rpl_row_tabledefs_3innodb.result@1.1, 2006-05-08 20:05:02+02:00, mats@mysql.com +286 -0
    New BitKeeper file ``mysql-test/r/rpl_row_tabledefs_3innodb.result''

  mysql-test/r/rpl_row_tabledefs_3innodb.result@1.0, 2006-05-08 20:05:02+02:00, mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3259-mysql-5.1-wl3228/mysql-test/r/rpl_row_tabledefs_3innodb.result

  mysql-test/r/rpl_row_tabledefs_7ndb.result@1.1, 2006-05-08 20:05:07+02:00, mats@mysql.com +286 -0
    New BitKeeper file ``mysql-test/r/rpl_row_tabledefs_7ndb.result''

  mysql-test/r/rpl_row_tabledefs_7ndb.result@1.0, 2006-05-08 20:05:07+02:00, mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3259-mysql-5.1-wl3228/mysql-test/r/rpl_row_tabledefs_7ndb.result

  mysql-test/t/rpl_row_tabledefs_2myisam.test@1.2, 2006-05-04 08:25:02+02:00, mats@mysql.com +0 -0
    Rename: mysql-test/t/rpl_row_tabledefs.test -> mysql-test/t/rpl_row_tabledefs_2myisam.test

  mysql-test/t/rpl_row_tabledefs_3innodb.test@1.1, 2006-05-08 20:05:08+02:00, mats@mysql.com +9 -0
    New BitKeeper file ``mysql-test/t/rpl_row_tabledefs_3innodb.test''

  mysql-test/t/rpl_row_tabledefs_3innodb.test@1.0, 2006-05-08 20:05:08+02:00, mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3259-mysql-5.1-wl3228/mysql-test/t/rpl_row_tabledefs_3innodb.test

  sql/field.cc@1.308.1.4, 2006-05-08 20:04:58+02:00, mats@mysql.com +32 -0
    Added support to find the last null byte for a field.

  sql/field.h@1.185, 2006-05-08 20:04:58+02:00, mats@mysql.com +19 -0
    Added support to find the last null byte for a field.

  sql/log_event.cc@1.219.1.3, 2006-05-08 20:04:58+02:00, mats@mysql.com +104 -65
    unpack_row() will now deduce the number of null bytes on the slave
    and use that when copying the null bytes from the row.
    Factored out code to copy "extra" record fields into separate function.
    Used that function to copy the "extra" fields when updating a row as well.

ChangeSet@1.1810.1662.1, 2006-05-08 15:19:17+02:00, pekka@mysql.com +8 -0
  ndb - bug#14509, part 1: move autoincr pre-fetch from Ndb to local dict cache

  mysql-test/r/ndb_alter_table.result@1.29.1.4, 2006-05-08 15:16:52+02:00, pekka@mysql.com +22 -1
    bug#14509, part 1
    move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
    remove private methods get/read/setTupleId by table name or table id

  mysql-test/t/ndb_alter_table.test@1.26.1.5, 2006-05-08 15:16:52+02:00, pekka@mysql.com +16 -1
    bug#14509, part 1
    move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
    remove private methods get/read/setTupleId by table name or table id

  ndb/include/ndbapi/Ndb.hpp@1.39.6.1, 2006-05-08 15:16:52+02:00, pekka@mysql.com +7 -14
    bug#14509, part 1
    move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
    remove private methods get/read/setTupleId by table name or table id

  ndb/src/ndbapi/DictCache.cpp@1.12.5.1, 2006-05-08 15:16:52+02:00, pekka@mysql.com +2 -0
    bug#14509, part 1
    move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
    remove private methods get/read/setTupleId by table name or table id

  ndb/src/ndbapi/DictCache.hpp@1.6.6.1, 2006-05-08 15:16:52+02:00, pekka@mysql.com +5 -0
    bug#14509, part 1
    move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
    remove private methods get/read/setTupleId by table name or table id

  ndb/src/ndbapi/Ndb.cpp@1.49.8.1, 2006-05-08 15:16:52+02:00, pekka@mysql.com +84 -67
    bug#14509, part 1
    move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
    remove private methods get/read/setTupleId by table name or table id

  ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.74.17.1, 2006-05-08 15:16:52+02:00, pekka@mysql.com +0 -4
    bug#14509, part 1
    move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
    remove private methods get/read/setTupleId by table name or table id

  ndb/src/ndbapi/Ndbinit.cpp@1.29.4.1, 2006-05-08 15:16:52+02:00, pekka@mysql.com +0 -4
    bug#14509, part 1
    move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
    remove private methods get/read/setTupleId by table name or table id

ChangeSet@1.2119.542.2, 2006-05-07 09:42:15+02:00, jonas@eel.(none) +2 -0
  ndb - dbacc - unused variables

  storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp@1.30, 2006-05-07 09:41:37+02:00, jonas@eel.(none) +0 -4
    more unused variables

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@1.66, 2006-05-07 09:41:38+02:00, jonas@eel.(none) +8 -35
    more unused variables

ChangeSet@1.2119.542.1, 2006-05-07 08:12:00+02:00, jonas@eel.(none) +2 -0
  ndb - dbacc - remove some unused variables

  storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp@1.29, 2006-05-07 08:11:38+02:00, jonas@eel.(none) +0 -4
    remove unused variables

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@1.65, 2006-05-07 08:11:38+02:00, jonas@eel.(none) +2 -4
    remove unused variables

ChangeSet@1.1616.2589.1, 2006-05-05 17:18:47+02:00, mskold@mysql.com +7 -0
  Bug#16997  Table rename that changes database does not rename indexes, recreate indexes in new database

  mysql-test/r/ndb_rename.result@1.1, 2006-05-05 17:15:34+02:00, mskold@mysql.com +14 -0

  mysql-test/r/ndb_rename.result@1.0, 2006-05-05 17:15:34+02:00, mskold@mysql.com +0 -0
    BitKeeper file /home/marty/MySQL/mysql-4.1/mysql-test/r/ndb_rename.result

  mysql-test/t/ndb_rename.test@1.1, 2006-05-05 17:15:34+02:00, mskold@mysql.com +32 -0

  mysql-test/t/ndb_rename.test@1.0, 2006-05-05 17:15:34+02:00, mskold@mysql.com +0 -0
    BitKeeper file /home/marty/MySQL/mysql-4.1/mysql-test/t/ndb_rename.test

  sql/ha_ndbcluster.cc@1.114.3.64, 2006-05-05 17:18:37+02:00, mskold@mysql.com +40 -1
    Bug#16997  Table rename that changes database does not rename indexes, recreate indexes in new database

  ndb/include/ndbapi/NdbDictionary.hpp@1.11.1.12, 2006-05-05 17:18:37+02:00, mskold@mysql.com +20 -3
    Bug#16997  Table rename that changes database does not rename indexes, recreate indexes in new database

  ndb/src/ndbapi/NdbDictionary.cpp@1.14.1.9, 2006-05-05 17:18:37+02:00, mskold@mysql.com +16 -0
    Bug#16997  Table rename that changes database does not rename indexes, recreate indexes in new database

  ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.38.1.17, 2006-05-05 17:18:37+02:00, mskold@mysql.com +5 -22
    Bug#16997  Table rename that changes database does not rename indexes, recreate indexes in new database

  ndb/src/ndbapi/NdbDictionaryImpl.hpp@1.18.1.4, 2006-05-05 17:18:37+02:00, mskold@mysql.com +16 -6
    Bug#16997  Table rename that changes database does not rename indexes, recreate indexes in new database

ChangeSet@1.2119.537.1, 2006-05-05 10:45:58+04:00, petr@mysql.com +11 -0
  WL#3153 "Split logs". Recommit with post-review fixes

  sql/ha_ndbcluster_binlog.cc@1.48.1.1, 2006-05-05 10:45:53+04:00, petr@mysql.com +2 -2
    use MYSQL_BIN_LOG instead of MYSQL_LOG

  sql/log.cc@1.204.2.1, 2006-05-05 10:45:53+04:00, petr@mysql.com +590 -414
     Split MYSQL_LOG into base MYSQL_LOG and
     MYSQL_GENERAL_LOG, MYSQL_SLOW_LOG, MYSQL_BIN_LOG

  sql/log.h@1.9, 2006-05-05 10:45:53+04:00, petr@mysql.com +84 -51
    Split MYSQL_LOG into base MYSQL_LOG and
    MYSQL_GENERAL_LOG, MYSQL_SLOW_LOG, MYSQL_BIN_LOG

  sql/log_event.h@1.133.1.1, 2006-05-05 10:45:53+04:00, petr@mysql.com +1 -1
    use MYSQL_BIN_LOG instead of MYSQL_LOG

  sql/mysql_priv.h@1.396.1.1, 2006-05-05 10:45:53+04:00, petr@mysql.com +1 -1
    use MYSQL_BIN_LOG instead of MYSQL_LOG

  sql/mysqld.cc@1.534.17.1, 2006-05-05 10:45:53+04:00, petr@mysql.com +3 -3
    fix appropriate comments: use MYSQL_BIN_LOG instead of MYSQL_LOG

  sql/rpl_injector.cc@1.4, 2006-05-05 10:45:53+04:00, petr@mysql.com +1 -1
    use MYSQL_BIN_LOG instead of MYSQL_LOG

  sql/rpl_injector.h@1.4, 2006-05-05 10:45:53+04:00, petr@mysql.com +2 -2
    use MYSQL_BIN_LOG instead of MYSQL_LOG

  sql/rpl_rli.h@1.3, 2006-05-05 10:45:53+04:00, petr@mysql.com +1 -1
    use MYSQL_BIN_LOG instead of MYSQL_LOG

  sql/slave.cc@1.271, 2006-05-05 10:45:53+04:00, petr@mysql.com +4 -3
    Fix appropriate comments: use MYSQL_BIN_LOG instead of MYSQL_LOG.
    Fix usage of new_file(): now we don't need to pass locking-related
    info to the function.

  sql/slave.h@1.95, 2006-05-05 10:45:53+04:00, petr@mysql.com +2 -2
    Use MYSQL_BIN_LOG instead of MYSQL_LOG in appropriate comments

ChangeSet@1.1616.2585.1, 2006-05-04 15:34:20+05:00, ramil@mysql.com +1 -0
  Fix for bug #18351: mysqlbinlog does not set default charset?
  

  client/mysqlbinlog.cc@1.84.4.2, 2006-05-04 15:34:13+05:00, ramil@mysql.com +17 -0
    Fix for bug #18351: mysqlbinlog does not set default charset?
      - --set-charset option added to allow one deal with old binlog files.
        It adds 'SET NAMES charset' to the output.

ChangeSet@1.2119.523.2, 2006-05-04 11:15:14+02:00, tomas@poseidon.ndb.mysql.com +2 -0
  bug (colcnt) + compile fix

  mysql-test/t/disabled.def@1.133.2.1, 2006-05-04 11:15:07+02:00, tomas@poseidon.ndb.mysql.com +1 -0
    disabled hanging test

  sql/log_event.cc@1.219.1.2, 2006-05-04 11:15:07+02:00, tomas@poseidon.ndb.mysql.com +3 -2
    bug (colcnt) + compile fix

ChangeSet@1.1616.2584.1, 2006-05-04 11:55:09+05:00, bar@mysql.com +5 -0
  Bugs#17647: Trouble with "create database"
  
  Problem:
  if a user was granted privileges on database "d1",
  it also was able to act on "D1" (i.e. in upper case),
  even on Unix with case sensitive file system.
  
  Fix:
  Initialize grant hash to use binary comparison
  if lower_case_file_system is not set (on most unixes),
  and case insensitive comparison otherwise (Windows, MacOSX).

  mysql-test/include/have_case_sensitive_file_system.inc@1.1, 2006-05-04 11:55:03+05:00, bar@mysql.com +4 -0
    New BitKeeper file ``mysql-test/include/have_case_sensitive_file_system.inc''
    Backporting from 5.1
    

  mysql-test/include/have_case_sensitive_file_system.inc@1.0, 2006-05-04 11:55:03+05:00, bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b17647/mysql-test/include/have_case_sensitive_file_system.inc

  mysql-test/r/case_sensitive_file_system.require@1.1, 2006-05-04 11:55:03+05:00, bar@mysql.com +2 -0
    New BitKeeper file ``mysql-test/r/case_sensitive_file_system.require''
    Backporting from 5.1
    

  mysql-test/r/case_sensitive_file_system.require@1.0, 2006-05-04 11:55:03+05:00, bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b17647/mysql-test/r/case_sensitive_file_system.require

  mysql-test/r/lowercase_fs_off.result@1.1, 2006-05-04 11:55:03+05:00, bar@mysql.com +11 -0
    Adding test case
    

  mysql-test/r/lowercase_fs_off.result@1.0, 2006-05-04 11:55:03+05:00, bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b17647/mysql-test/r/lowercase_fs_off.result

  mysql-test/t/lowercase_fs_off.test@1.1, 2006-05-04 11:55:04+05:00, bar@mysql.com +27 -0
    Adding test case
    

  mysql-test/t/lowercase_fs_off.test@1.0, 2006-05-04 11:55:04+05:00, bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b17647/mysql-test/t/lowercase_fs_off.test

  sql/sql_acl.cc@1.74.31.1, 2006-05-04 11:55:03+05:00, bar@mysql.com +3 -1
    Initialize hash to use binary comparison with case sensitive FS.

ChangeSet@1.2119.523.1, 2006-05-03 15:00:38+02:00, mats@mysql.com +11 -0
  WL#3259 (RBR with more columns on slave than on master):
  Extended replication to allow extra columns added last on slave
  as compared with table on master.

  mysql-test/extra/rpl_tests/rpl_row_tabledefs.test@1.2, 2006-05-03 15:00:28+02:00, mats@mysql.com +49 -28
    Testing that replication can handle extra extra columns on slave. 

  mysql-test/r/rpl_row_tabledefs.result@1.2, 2006-05-03 15:00:28+02:00, mats@mysql.com +74 -68
    Result file change

  mysql-test/t/rpl_row_tabledefs.test@1.1, 2006-05-03 15:00:29+02:00, mats@mysql.com +8 -0
    New BitKeeper file ``mysql-test/t/rpl_row_tabledefs.test''

  mysql-test/t/rpl_row_tabledefs.test@1.0, 2006-05-03 15:00:29+02:00, mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3259-mysql-5.1-wl3228/mysql-test/t/rpl_row_tabledefs.test

  sql/Makefile.am@1.135.1.1, 2006-05-03 15:00:28+02:00, mats@mysql.com +2 -2
    Adding new files.

  sql/field.cc@1.308.1.3, 2006-05-03 15:00:28+02:00, mats@mysql.com +8 -0
    Implementing missing Field_bit::set_default() 

  sql/field.h@1.184, 2006-05-03 15:00:28+02:00, mats@mysql.com +2 -0
    Implementing missing Field_bit::set_default() 

  sql/log_event.cc@1.219.1.1, 2006-05-03 15:00:28+02:00, mats@mysql.com +203 -120
    Extending unpack_row() and replace_record() to handle the case when there are more columns
    on the slave than on the master. Especially handle BIT columns correctly.
    Using newly introduced table_def class to perform comparison.

  sql/log_event.h@1.134, 2006-05-03 15:00:28+02:00, mats@mysql.com +21 -14
    Adding field to table_map_log_event. Changing prototype for do_prepare_row().

  sql/mysql_priv.h@1.391.2.1, 2006-05-03 15:00:29+02:00, mats@mysql.com +5 -0
    Adding include guards

  sql/rpl_utility.cc@1.1, 2006-05-03 15:00:29+02:00, mats@mysql.com +156 -0
    New BitKeeper file ``sql/rpl_utility.cc''

  sql/rpl_utility.cc@1.0, 2006-05-03 15:00:29+02:00, mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3259-mysql-5.1-wl3228/sql/rpl_utility.cc

  sql/rpl_utility.h@1.1, 2006-05-03 15:00:29+02:00, mats@mysql.com +60 -0
    New BitKeeper file ``sql/rpl_utility.h''

  sql/rpl_utility.h@1.0, 2006-05-03 15:00:29+02:00, mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3259-mysql-5.1-wl3228/sql/rpl_utility.h

ChangeSet@1.1810.1640.1, 2006-05-03 16:28:11+09:30, grog@mysql.com +2 -0
  rpl_auto_increment_11932.result, rpl_auto_increment_11932.test:
    Test case for BUG#11932

  mysql-test/r/rpl_auto_increment_11932.result@1.1, 2006-05-03 16:26:40+09:30, grog@mysql.com +46 -0

  mysql-test/r/rpl_auto_increment_11932.result@1.0, 2006-05-03 16:26:40+09:30, grog@mysql.com +0 -0
    BitKeeper file /home/MySQL/5.0-Bug-11932/mysql-test/r/rpl_auto_increment_11932.result

  mysql-test/t/rpl_auto_increment_11932.test@1.1, 2006-05-03 16:26:39+09:30, grog@mysql.com +59 -0

  mysql-test/t/rpl_auto_increment_11932.test@1.0, 2006-05-03 16:26:39+09:30, grog@mysql.com +0 -0
    BitKeeper file /home/MySQL/5.0-Bug-11932/mysql-test/t/rpl_auto_increment_11932.test

ChangeSet@1.2119.518.1, 2006-05-02 17:53:26-07:00, brian@zim.(none) +10 -0
  Added new show contributors command. 

  mysql-test/r/contributors.result@1.1, 2006-05-02 17:53:19-07:00, brian@zim.(none) +5 -0
    New BitKeeper file ``mysql-test/r/contributors.result''

  mysql-test/r/contributors.result@1.0, 2006-05-02 17:53:19-07:00, brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/dep-5.1/mysql-test/r/contributors.result

  mysql-test/t/contributors.test@1.1, 2006-05-02 17:53:19-07:00, brian@zim.(none) +1 -0
    New BitKeeper file ``mysql-test/t/contributors.test''

  mysql-test/t/contributors.test@1.0, 2006-05-02 17:53:19-07:00, brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/dep-5.1/mysql-test/t/contributors.test

  sql/contributors.h@1.1, 2006-05-02 17:53:20-07:00, brian@zim.(none) +40 -0
    New BitKeeper file ``sql/contributors.h''

  sql/contributors.h@1.0, 2006-05-02 17:53:20-07:00, brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/dep-5.1/sql/contributors.h

  sql/lex.h@1.160, 2006-05-02 17:53:18-07:00, brian@zim.(none) +1 -0
    Additions for show contributors

  sql/mysql_priv.h@1.394.1.1, 2006-05-02 17:53:18-07:00, brian@zim.(none) +1 -0
    Show contributors addition

  sql/sp_head.cc@1.218, 2006-05-02 17:53:18-07:00, brian@zim.(none) +1 -0
    Added for show contributors

  sql/sql_lex.h@1.227, 2006-05-02 17:53:18-07:00, brian@zim.(none) +1 -0
    Adding contributors addition

  sql/sql_parse.cc@1.540.3.1, 2006-05-02 17:53:19-07:00, brian@zim.(none) +3 -0
    Execute for add contributors

  sql/sql_show.cc@1.326.5.1, 2006-05-02 17:53:19-07:00, brian@zim.(none) +36 -0
    Adding show contributors

  sql/sql_yacc.yy@1.473.1.1, 2006-05-02 17:53:19-07:00, brian@zim.(none) +6 -0
    Show contributors additio

ChangeSet@1.1616.2580.1, 2006-05-02 18:00:44+05:00, ramil@mysql.com +4 -0
  Fix for bug #16546: DATETIME+0 not always coerced the same way

  mysql-test/r/func_time.result@1.23.3.1, 2006-05-02 18:00:32+05:00, ramil@mysql.com +8 -4
    Fix for bug #16546: DATETIME+0 not always coerced the same way
      - test case

  mysql-test/t/func_time.test@1.21.2.1, 2006-05-02 18:00:32+05:00, ramil@mysql.com +8 -0
    Fix for bug #16546: DATETIME+0 not always coerced the same way
      - test case

  sql/item_timefunc.cc@1.51.3.1, 2006-05-02 18:00:32+05:00, ramil@mysql.com +3 -3
    Fix for bug #16546: DATETIME+0 not always coerced the same way
      - set decimals to DATETIME_DEC

  sql/item_timefunc.h@1.42.1.15, 2006-05-02 18:00:32+05:00, ramil@mysql.com +1 -0
    Fix for bug #16546: DATETIME+0 not always coerced the same way
      - set decimals to DATETIME_DEC

ChangeSet@1.1810.1632.1, 2006-04-28 16:13:19-04:00, elliot@mysql.com +1 -0
  BUG#19394 OPT_INNODB_THREAD_CONCURRENCY duplicated
  Removed duplication (not a user-visible change)

  sql/mysqld.cc@1.439.52.1, 2006-04-28 16:13:16-04:00, elliot@mysql.com +2 -1
    Two of the startup options for mysqld, innodb_commit_concurrency
    and innodb_thread_concurrency, were using the same enumeration
    value. Changed to give innodb_commit_concurrency it's own value.

ChangeSet@1.1810.1622.1, 2006-04-27 21:59:04+09:30, grog@mysql.com +2 -0
  sql_mode.test:
    BUG#14765: Modified test file.
  sql_mode.result:
    BUG#14765: Modified result file.

  mysql-test/r/sql_mode.result@1.32.1.3, 2006-04-27 21:57:46+09:30, grog@mysql.com +4 -0
    BUG#14765: Modified result file.

  mysql-test/t/sql_mode.test@1.16.1.2, 2006-04-27 21:58:12+09:30, grog@mysql.com +3 -0
    BUG#14765: Modified test file.

ChangeSet@1.1810.1606.3, 2006-04-24 16:38:28-07:00, stewart@mysql.com +1 -0
  BUG#19318 valgrind: memory leak in ndb_mgmd
  
  now deal with memory correctly during ConfigInfo construction (due to previous changes)

  ndb/src/mgmsrv/ConfigInfo.cpp@1.60.9.2, 2006-04-24 16:38:18-07:00, stewart@mysql.com +4 -4
    Correctly deal with memory during ConfigInfo construction

ChangeSet@1.1810.1606.2, 2006-04-24 15:59:34-07:00, stewart@mysql.com +2 -0
  BUG#19318 valgrind: memory leak in ndb_mgmd
  
  2nd part of the patch
  
  fix functions called by ndbd to deal with memory allocation properly. 

  ndb/src/mgmapi/mgmapi.cpp@1.44.16.1, 2006-04-24 15:59:30-07:00, stewart@mysql.com +1 -1
    in get_configuration() - get a copy to return instead of just passing one back and loosing some memory

  ndb/src/mgmsrv/ConfigInfo.cpp@1.60.9.1, 2006-04-24 15:59:30-07:00, stewart@mysql.com +1 -0
    clean up after ourselves in constructor

ChangeSet@1.1810.1606.1, 2006-04-24 15:20:45-07:00, stewart@mysql.com +2 -0
  BUG#19318 valgrind: memory leak in ndb_mgmd
  
  clean up after ConfigValuesFactory

  ndb/include/util/ConfigValues.hpp@1.3.1.1, 2006-04-24 15:20:41-07:00, stewart@mysql.com +1 -0
    We now have a destructor

  ndb/src/common/util/ConfigValues.cpp@1.8.1.1, 2006-04-24 15:20:41-07:00, stewart@mysql.com +7 -1
    Free m_cfg on destruct (if we've set it).
    
    Also getConfigValues() instead of m_cfg

ChangeSet@1.2119.461.4, 2006-04-21 08:43:07-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +9 -0
  BUG#19067: Crash when ALTER TABLE for default subpartitioned table

  mysql-test/r/partition.result@1.37, 2006-04-21 08:42:59-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +18 -1
    New test cases

  mysql-test/r/partition_02myisam.result@1.5, 2006-04-21 08:43:00-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -2
    ENGINE always specified per partition in show table

  mysql-test/t/partition.test@1.39, 2006-04-21 08:43:00-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +13 -10
    New test cases

  sql/partition_element.h@1.4.2.1, 2006-04-21 08:43:00-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +16 -0
    New copy constructor for partition_element

  sql/partition_info.cc@1.8.4.3, 2006-04-21 08:43:00-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -3
    Use new copy constructor to ensure default subpartitions inherit partition options from parent
    Ensure engine is always set on both partitions and subpartitions

  sql/sql_partition.cc@1.55.1.12, 2006-04-21 08:43:01-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +14 -6
    Removed unneeded bool to generate_partition_syntax
    Write partition options also for subpartitioned tables when subpartitioning is by default
    Set up defaults for new partitions also in REORGANIZE PARTITION

  sql/sql_partition.h@1.7.1.1, 2006-04-21 08:43:01-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -2
    Removed unneeded parameter to generate_partition_syntax call

  sql/sql_show.cc@1.326.1.1, 2006-04-21 08:43:01-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Removed unneeded parameter to generate_partition_syntax call

  sql/sql_table.cc@1.308.11.3, 2006-04-21 08:43:01-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -2
    Removed unneeded parameter to generate_partition_syntax call

ChangeSet@1.2119.462.1, 2006-04-20 14:11:54-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
  BUG#19067: Alter table add partition for subpartitioned table crashes
  Changed variable name for improved clarity and debugging possibilities
  Fixed bug in not assigning subpart_type

  mysql-test/t/partition.test@1.38, 2006-04-20 14:11:48-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +11 -0
    Added new test case

  sql/partition_info.cc@1.8.4.1, 2006-04-20 14:11:49-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +7 -7
    Changed variable name for improved clarity and debugging possibilities
    Fixed bug in not assigning subpart_type

  sql/sql_partition.cc@1.55.1.11, 2006-04-20 14:11:49-04:00, mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -1
    Changed variable name for improved clarity and debugging possibilities
    Fixed bug in not assigning subpart_type

ChangeSet@1.1616.2556.1, 2006-04-20 15:09:01+05:00, bar@mysql.com +3 -0
  Bug#9509: Optimizer: wrong result after AND with latin1_german2_ci comparisons
  
  Fixing part2 of this problem: AND didn't work well 
  with utf8_czech_ci and utf8_lithianian_ci in some cases.
  
  The problem was because when during condition optimization
  field was replaced with a constant, the constant's collation
  and collation derivation was used later for comparison instead
  of the field collation and derivation, which led to non-equal
  new condition in some cases.
  
  This patch copies collation and derivation from the field being removed
  to the new constant, which makes comparison work using the same collation
  with the one which would be used if no condition optimization were done.
  
  In other words:
  
    where s1 < 'K' and s1 = 'Y';
  
  was rewritten to:
  
    where 'Y' < 'K' and s1 = 'Y';
  
  Now it's rewritten to:
  
    where 'Y' collate collation_of_s1 < 'K' and s1 = 'Y'
  
    (using derivation of s1)
  
  
  Note, the first problem of this bug (with latin1_german2_ci) was fixed
  earlier in 5.0 tree, in a separate changeset.

  mysql-test/r/ctype_utf8.result@1.45.1.25, 2006-04-20 15:08:56+05:00, bar@mysql.com +31 -0
    Adding test case

  mysql-test/t/ctype_utf8.test@1.57.1.15, 2006-04-20 15:08:56+05:00, bar@mysql.com +18 -0
    Adding test case

  sql/sql_select.cc@1.216.125.3, 2006-04-20 15:08:56+05:00, bar@mysql.com +4 -0
    Set proper collation of the new item

ChangeSet@1.1810.1577.1, 2006-04-20 01:00:17+10:00, stewart@mysql.com +1 -0
  BUG#19198 mysqld failure during DBT2
  
  crash of mysqld due to null tOp in
  NdbTransaction::getNdbIndexScanOperation(NdbIndexImpl*,NdbTableImpl*)

  ndb/src/ndbapi/NdbTransaction.cpp@1.43.9.1, 2006-04-20 01:00:11+10:00, stewart@mysql.com +2 -2
    tOp could be null, don't fiddle with it if it is.

ChangeSet@1.1810.1458.80, 2006-04-17 19:57:50-07:00, igreenhoe@mysql.com +1 -0
  Fix for bug #17353.

  scripts/mysqld_safe.sh@1.80.1.2, 2006-04-17 19:57:45-07:00, igreenhoe@mysql.com +7 -4
    Moved core file changing command outside of root-user only conditional

ChangeSet@1.2119.442.1, 2006-04-17 22:51:34-04:00, mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se +17 -0
  BUG#16002: Make partition functions that are unsigned work properly

  mysql-test/r/partition.result@1.31.3.1, 2006-04-17 22:51:25-04:00, mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se +20 -0
    A number of new test cases for unsigned partition functions

  mysql-test/r/partition_error.result@1.5, 2006-04-17 22:51:25-04:00, mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -0
    A number of new test cases for unsigned partition functions

  mysql-test/r/partition_range.result@1.7.1.1, 2006-04-17 22:51:25-04:00, mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se +12 -0
    A number of new test cases for unsigned partition functions

  mysql-test/t/partition.test@1.33.3.1, 2006-04-17 22:51:26-04:00, mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se +23 -0
    A number of new test cases for unsigned partition functions

  mysql-test/t/partition_error.test@1.7, 2006-04-17 22:51:26-04:00, mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -0
    A number of new test cases for unsigned partition functions

  mysql-test/t/partition_range.test@1.5.1.1, 2006-04-17 22:51:26-04:00, mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se +17 -0
    A number of new test cases for unsigned partition functions

  sql/ha_partition.cc@1.39.5.1, 2006-04-17 22:51:26-04:00, mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se +14 -3
    Error message for no partition found needs to take signed/unsigned into account when printing erroneus value

  sql/partition_element.h@1.4.1.1, 2006-04-17 22:51:26-04:00, mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se +16 -6
    Introduced signed_flag and max_value flag on partition elements
    Also list is now a list of a struct rather than simply longlong values
    Small rearranges of order

  sql/partition_info.cc@1.8.3.1, 2006-04-17 22:51:27-04:00, mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se +80 -35
    Introduced signed_flag and max_value flag on partition elements
    Also list is now a list of a struct rather than simply longlong values
    Small rearranges of order
    Lots of new code to handle checks of proper definition of table when
    partition function is unsigned

  sql/partition_info.h@1.5.2.1, 2006-04-17 22:51:27-04:00, mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se +9 -14
    Mostly rearrangement of code and some addition of a THD object in check_partition_info call
    plus a new method for comparing unsigned values

  sql/share/errmsg.txt@1.90.4.1, 2006-04-17 22:51:27-04:00, mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
    Negative values not ok for unsigned partition functions

  sql/sql_partition.cc@1.55.7.1, 2006-04-17 22:51:27-04:00, mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se +330 -127
    Fixed a multi-thread bug (when defining several partitioned tables in parallel)
    New code to generate partition syntax that takes into account sign of constants.
    Made function fix_fields_part_func more reusable.
    Fixed a number of get_partition_id functions for range and list and similar functions
    for partition pruning code.
    Unfortunately fairly much duplication of code with just small changes.

  sql/sql_partition.h@1.8, 2006-04-17 22:51:28-04:00, mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -3
    New function headers

  sql/sql_show.cc@1.325.1.1, 2006-04-17 22:51:28-04:00, mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se +6 -3
    Changed list of values for LIST partitioned tables
    Also fixed printing of unsigned values in INFORMATION SCHEMA for partitioned table

  sql/sql_table.cc@1.308.12.1, 2006-04-17 22:51:28-04:00, mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -2
    Fixed for new interface

  sql/sql_yacc.yy@1.464.16.1, 2006-04-17 22:51:28-04:00, mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se +14 -9
    Moved definition of struct to partition_element.h
    Added code to keep track of sign of constants in
    RANGE and LIST partitions

  sql/table.cc@1.204.1.16, 2006-04-17 22:51:29-04:00, mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -2
    Fixed for new interface

ChangeSet@1.1810.1567.1, 2006-04-17 19:43:19-07:00, igreenhoe@mysql.com +1 -0
  Fix for bug #18979, bad RE in mysql-test-run.pl

  mysql-test/lib/mtr_cases.pl@1.12.1.6, 2006-04-17 19:43:02-07:00, igreenhoe@mysql.com +1 -1
    Fixed the RE so that backtracking will not occur.

ChangeSet@1.2119.437.1, 2006-04-17 14:40:25+05:00, bar@mysql.com +4 -0
  Bug#18201: XML: ExtractValue works even if the xml
  fragment is not well-formed xml
  
  Problem:
  - ExtractValue silently returned NULL if a wrong XML value is passed.
  - In some cases "unexpected END-OF-INPUT" error was not detected, and
    a non-NULL result could be returned for a bad XML value.
  
  Fix:
  - Adding warning messages, to make user aware why NULL was returned.
  - Missing "unexpected END-OF-INPUT" error is reported now.

  mysql-test/r/xml.result@1.12.2.1, 2006-04-17 14:40:08+05:00, bar@mysql.com +31 -1
    - Fixing XML systax error in old test
    - Adding test cases.

  mysql-test/t/xml.test@1.12.2.1, 2006-04-17 14:40:08+05:00, bar@mysql.com +12 -1
    - Fixing XML systax error in old test
    - Adding test cases.

  sql/item_xmlfunc.cc@1.12.2.1, 2006-04-17 14:40:08+05:00, bar@mysql.com +11 -1
    Produce warning in case of XML systax error,
    instead of silentrly returning NULL.

  strings/xml.c@1.11, 2006-04-17 14:40:08+05:00, bar@mysql.com +19 -8
    - Making error messages better looking and clearer:
    It is important because now they're seen in SHOW WARNINGS
    (previously they were used only for debugging purposes).
    - Adding "unexpected END-OF-INPUT" error if after scanning
      closing tag for the root element some input is left
      (previously this error was ignored in a mistake).

ChangeSet@1.1616.2549.1, 2006-04-17 12:33:45+05:00, bar@mysql.com +1 -0
  Bug#17939: Wrong table format when using UTF8 strings
  
  Lines with column names consisting of national letters
  were wrongly formatted in "mysql --table" results:
  
  mysql> SELECT 'xxx xxx xxx' as 'xxx xxx xxx';
  +-------------------+
  | xxx xxx xxx |
  +-------------------+
  | xxx xxx xxx       |
  +-------------------+
  1 row in set (0.00 sec)
  
  It happened because in UTF-8 (and other multibyte charsets)
  the number of display cells is not always equal to the number
  of bytes of the string.
  
  Data lines (unlike column name lines) were formatted correctly,
  because data lines were displayed taking in account number of
  display cells. This patch takes in account number of cells when
  displaying column names, the same way like displaying data lines does.
  
  Note: The patch is going to be applied to 4.1.
  Test case will be added after merge to 5.0,
  into "mysql.test", which appeared in 5.0.
  
  mysql.cc:
    Adding column name allignment using numcells(),
    the same to data alignment, which was implemented earlier.
  

  client/mysql.cc@1.121.1.98, 2006-04-17 12:14:15+05:00, bar@mysql.com +7 -2
    Adding column name allignment, the same to
    data alignment, which was implemented earlier.

ChangeSet@1.2119.406.1, 2006-04-11 20:12:57+02:00, msvensson@shellback. +12 -0
  Remove unused defined USES_TYPES

  include/my_base.h@1.87, 2006-04-11 20:12:46+02:00, msvensson@shellback. +0 -1
    Remove unused defined USES_TYPES

  mysys/my_append.c@1.7, 2006-04-11 20:12:47+02:00, msvensson@shellback. +0 -1
    Remove unused defined USES_TYPES

  mysys/my_clock.c@1.9, 2006-04-11 20:12:47+02:00, msvensson@shellback. +0 -1
    Remove unused defined USES_TYPES

  mysys/my_copy.c@1.15, 2006-04-11 20:12:48+02:00, msvensson@shellback. +0 -1
    Remove unused defined USES_TYPES

  mysys/my_create.c@1.14, 2006-04-11 20:12:48+02:00, msvensson@shellback. +0 -1
    Remove unused defined USES_TYPES

  mysys/my_dup.c@1.5, 2006-04-11 20:12:48+02:00, msvensson@shellback. +0 -1
    Remove unused defined USES_TYPES

  mysys/my_lib.c@1.24, 2006-04-11 20:12:48+02:00, msvensson@shellback. +0 -1
    Remove unused defined USES_TYPES

  mysys/my_open.c@1.26, 2006-04-11 20:12:49+02:00, msvensson@shellback. +0 -1
    Remove unused defined USES_TYPES

  mysys/my_redel.c@1.11, 2006-04-11 20:12:49+02:00, msvensson@shellback. +0 -1
    Remove unused defined USES_TYPES

  mysys/my_rename.c@1.8, 2006-04-11 20:12:49+02:00, msvensson@shellback. +0 -1
    Remove unused defined USES_TYPES

  mysys/test_dir.c@1.5, 2006-04-11 20:12:50+02:00, msvensson@shellback. +0 -1
    Remove unused defined USES_TYPES

  sql/unireg.cc@1.74.2.1, 2006-04-11 20:12:50+02:00, msvensson@shellback. +0 -1
    Remove unused defined USES_TYPES

ChangeSet@1.1810.1522.4, 2006-04-11 02:10:08+10:00, stewart@mysql.com +5 -0
  BUG#18966 Change in stop/shutdown behaviour
  
  fix behaviour of ALL STOP and SHUTDOWN in relation to MGM nodes

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.9.1, 2006-04-11 02:10:02+10:00, stewart@mysql.com +139 -111
    Shutdown management servers properly (one we're connected to last).
    
    Fix potential problems if disconnect from one mgmd and connect to another (that's a different cluster)
    

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.73.20.1, 2006-04-11 02:10:02+10:00, stewart@mysql.com +43 -30
    fix regression in how nodes are stopped
    ALL STOP - db nodes only
    SHUTDOWN - db and mgm nodes
    
    fix race where mgmd could stop itself before it sends the response to stop.
    In ~MgmApiSession() we now do the disconnect.
    
    We have (in various places) a return stopSelf which tells the caller if they
    need to stop or restart this daemon.

  ndb/src/mgmsrv/MgmtSrvr.hpp@1.30.11.1, 2006-04-11 02:10:02+10:00, stewart@mysql.com +11 -9
    add stopSelf return parameter to stopNodes and restartNodes.
    
    Rename stop to shutdownDB as this name better reflects what it does
    
    Rename restart to restartDB as this name better reflects what it does

  ndb/src/mgmsrv/Services.cpp@1.45.16.1, 2006-04-11 02:10:02+10:00, stewart@mysql.com +11 -4
    Stop or restart server only on mgm session disconnect (of session that asked us to)

  ndb/src/mgmsrv/Services.hpp@1.13.4.1, 2006-04-11 02:10:02+10:00, stewart@mysql.com +1 -0
    add m_stopSelf member for tracking what we should do

ChangeSet@1.2119.1.170, 2006-04-08 18:10:20-04:00, mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +8 -0
  BUG#18198: Errors due to too much allowed in partition functions
  Added functions to enable/disable allowed/disallowed partition functions

  sql/item.h@1.197, 2006-04-08 18:10:13-04:00, mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +34 -4
    Added functions to enable/disable allowed/disallowed partition functions

  sql/item_cmpfunc.h@1.123, 2006-04-08 18:10:13-04:00, mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +15 -0
    Added functions to enable/disable allowed/disallowed partition functions

  sql/item_func.h@1.137, 2006-04-08 18:10:13-04:00, mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +31 -1
    Added functions to enable/disable allowed/disallowed partition functions

  sql/item_strfunc.h@1.107, 2006-04-08 18:10:14-04:00, mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +24 -0
    Added functions to enable/disable allowed/disallowed partition functions

  sql/item_timefunc.h@1.67, 2006-04-08 18:10:14-04:00, mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +30 -0
    Added functions to enable/disable allowed/disallowed partition functions

  sql/item_xmlfunc.h@1.2, 2006-04-08 18:10:14-04:00, mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    Added functions to enable/disable allowed/disallowed partition functions

  sql/partition_info.cc@1.11, 2006-04-08 18:10:14-04:00, mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -5
    Added functions to enable/disable allowed/disallowed partition functions

  sql/share/errmsg.txt@1.90.1.2, 2006-04-08 18:10:15-04:00, mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Added new error message

ChangeSet@1.2119.342.2, 2006-04-05 12:49:38+02:00, mikron@mikael-ronstr-ms-dator.local +1 -0
  BUG#18198: Too much expressiveness in partition function allowed
  Fixed the error check

  sql/partition_info.cc@1.10, 2006-04-05 12:49:17+02:00, mikron@mikael-ronstr-ms-dator.local +7 -2
    Fixed the error check

ChangeSet@1.2119.342.1, 2006-04-05 12:39:06+02:00, mikron@mikael-ronstr-ms-dator.local +3 -0
  BUG#18198: Too much expressiveness in partition functions allowed
  First step

  sql/item.h@1.196, 2006-04-05 12:38:53+02:00, mikron@mikael-ronstr-ms-dator.local +6 -0
    Add function to check for partition function whether allowed or not.
    In this first step allow only a field on its own.
    Further steps will add a lot more possibilities.

  sql/partition_info.cc@1.9, 2006-04-05 12:38:54+02:00, mikron@mikael-ronstr-ms-dator.local +7 -0
    Add a check whether the partition function is allowed by walking the
    partition function expression.

  sql/share/errmsg.txt@1.90.1.1, 2006-04-05 12:38:54+02:00, mikron@mikael-ronstr-ms-dator.local +3 -0
    Add a new error code for partition function not allowed

ChangeSet@1.2119.14.28, 2006-02-21 22:53:47+11:00, stewart@mysql.com +1 -0
  Add missing signal name fro DICT_COMMIT_REQ

  storage/ndb/src/common/debugger/signaldata/SignalNames.cpp@1.12, 2006-02-21 22:53:43+11:00, stewart@mysql.com +2 -0
    Add missing signal name for GSN_DICT_COMMIT_REQ

ChangeSet@1.1616.2497.1, 2006-02-02 10:27:48+04:00, ramil@mysql.com +1 -0
  Fix for bug #16900: Crash during query "reap" on OS X.

  sql/sql_class.cc@1.105.1.100, 2006-02-02 10:27:34+04:00, ramil@mysql.com +3 -2
    Fix for bug #16900: Crash during query "reap" on OS X.
    -  call close_active_vio() only if we don't kill the thread.

ChangeSet@1.1945.38.1, 2005-11-29 08:08:02+01:00, stewart@mysql.com +1 -0
  Sysfile.hpp:
    correct comment for 5.1 sysfile file format

  storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp@1.5, 2005-11-29 08:07:11+01:00, stewart@mysql.com +2 -2
    correct comment for >= 1 sysfile file format

ChangeSet@1.1810.1105.1, 2005-11-22 18:29:46+04:00, ramil@mysql.com +4 -0
  Fix for bug #10966: Variance functions return wrong data type.

  mysql-test/r/func_group.result@1.47, 2005-11-22 18:29:36+04:00, ramil@mysql.com +14 -0
    Fix for bug #10966: Variance functions return wrong data type.

  mysql-test/t/func_group.test@1.46, 2005-11-22 18:29:36+04:00, ramil@mysql.com +11 -0
    Fix for bug #10966: Variance functions return wrong data type.

  sql/item_sum.cc@1.166.2.1, 2005-11-22 18:29:36+04:00, ramil@mysql.com +0 -3
    Fix for bug #10966: Variance functions return wrong data type.
    Always return Field_double if no grouping.

  sql/item_sum.h@1.94.1.1, 2005-11-22 18:29:36+04:00, ramil@mysql.com +1 -1
    Fix for bug #10966: Variance functions return wrong data type.

