ChangeSet
  1.1894 05/04/16 23:57:15 petr@mysql.com +2 -0
  mysql.server script fixed to use mysqld_safe by default + lots of minor additions

  support-files/mysql.server.sh
    1.42 05/04/16 23:57:12 petr@mysql.com +96 -20
    mysql.server init.d script fixed back to use mysqld_safe by default, as mysqlmanager does not handle all
    installation scenarious yet. + libexecdir template was added for mysqlmanager to deal nicely  with the
    source distribution

  scripts/make_binary_distribution.sh
    1.79 05/04/16 23:57:12 petr@mysql.com +1 -1
    add libexec expansion handling to make_binary_distribution

ChangeSet
  1.1893 05/04/13 13:17:39 mskold@mysql.com +1 -0
  Fixed failed merge

  sql/ha_ndbcluster.cc
    1.173 05/04/13 13:17:03 mskold@mysql.com +1 -1
    Fixed failed merge

ChangeSet
  1.1892 05/04/13 12:49:10 mskold@mysql.com +3 -0
  Merge

  sql/ha_ndbcluster.cc
    1.172 05/04/13 12:48:55 mskold@mysql.com +1 -11
    Merge

  ndb/src/ndbapi/Ndb.cpp
    1.47 05/04/13 12:48:55 mskold@mysql.com +1 -2
    Merge

  sql/mysqld.cc
    1.452 05/04/13 12:45:26 mskold@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.1.553 05/04/13 12:42:23 mskold@mysql.com +3 -0
  Fix for bug#9813: Test 'ndb_basic': Autoincrement fails in 64 bit

  sql/mysqld.cc
    1.356.73.45 05/04/13 12:42:07 mskold@mysql.com +1 -1
    Fix for bug#9813: Test 'ndb_basic': Autoincrement fails in 64 bit

  sql/ha_ndbcluster.cc
    1.114.3.21 05/04/13 12:42:07 mskold@mysql.com +22 -12
    Fix for bug#9813: Test 'ndb_basic': Autoincrement fails in 64 bit

  ndb/src/ndbapi/Ndb.cpp
    1.39.1.1 05/04/13 12:42:07 mskold@mysql.com +25 -17
    Fix for bug#9813: Test 'ndb_basic': Autoincrement fails in 64 bit

ChangeSet
  1.1867.1.3 05/04/11 17:19:12 petr@mysql.com +1 -0
  make server logs less frightening, when using IM

  server-tools/instance-manager/instance.cc
    1.16 05/04/11 17:19:08 petr@mysql.com +2 -2
    fix username used for monitoring purposes to make logging more verbose

ChangeSet
  1.1867.1.2 05/04/11 17:14:40 petr@mysql.com +1 -0
  Fix for bug #9808

  server-tools/instance-manager/commands.cc
    1.16 05/04/11 17:14:36 petr@mysql.com +12 -6
    check pointer for null before using it

ChangeSet
  1.1867.1.1 05/04/11 17:08:34 petr@mysql.com +1 -0
  Fix for Bug #9589

  server-tools/instance-manager/options.cc
    1.13 05/04/11 17:08:30 petr@mysql.com +1 -1
    remove [mysql] group from the list of the groups read by the mysqlmanager (resulted from wrong merge long ago)

ChangeSet
  1.1890 05/04/09 03:05:47 jimw@mysql.com +2 -0
  Fix warning and error when compiling on Windows.

  sql/field.cc
    1.253 05/04/09 03:00:55 jimw@mysql.com +1 -1
    Add missing parameter for logging warning

  sql/item_sum.cc
    1.138 05/04/09 03:00:34 jimw@mysql.com +1 -1
    Cast byte* to char* for creating String

ChangeSet
  1.1889 05/04/08 16:49:14 mskold@mysql.com +4 -0
  Merge from fix of Bug #9675  Auto-increment not working with INSERT..SELECT and NDB storage

  sql/ha_ndbcluster.cc
    1.171 05/04/08 16:48:57 mskold@mysql.com +13 -1
    Merge from fix of Bug #9675  Auto-increment not working with INSERT..SELECT and NDB storage

  mysql-test/t/ndb_basic.test
    1.25 05/04/08 16:48:57 mskold@mysql.com +27 -0
    Merge from fix of Bug #9675  Auto-increment not working with INSERT..SELECT and NDB storage

  mysql-test/r/ndb_basic.result
    1.24 05/04/08 16:48:57 mskold@mysql.com +60 -0
    Merge from fix of Bug #9675  Auto-increment not working with INSERT..SELECT and NDB storage

  mysql-test/r/ndb_alter_table.result
    1.26 05/04/08 16:48:57 mskold@mysql.com +1 -1
    Merge from fix of Bug #9675  Auto-increment not working with INSERT..SELECT and NDB storage

ChangeSet
  1.1888 05/04/07 09:51:56 jimw@mysql.com +7 -0
  Add cp932 and eucjpms character sets to Windows build. (Bug #9479)

  include/config-win.h
    1.58 05/04/07 09:51:53 jimw@mysql.com +2 -0
    Add new character sets

  VC++Files/strings/strings_ia64.dsp
    1.3 05/04/07 09:51:53 jimw@mysql.com +8 -0
    Add new character sets

  VC++Files/strings/strings.dsp
    1.17 05/04/07 09:51:53 jimw@mysql.com +8 -0
    Add new character sets

  VC++Files/libmysql/libmysql_ia64.dsp
    1.3 05/04/07 09:51:53 jimw@mysql.com +8 -0
    Add new character sets

  VC++Files/libmysql/libmysql.dsp
    1.28 05/04/07 09:51:53 jimw@mysql.com +8 -0
    Add new character sets

  VC++Files/client/mysqlclient_ia64.dsp
    1.2 05/04/07 09:51:52 jimw@mysql.com +8 -0
    Add new character sets

  VC++Files/client/mysqlclient.dsp
    1.30 05/04/07 09:51:52 jimw@mysql.com +8 -0
    Add new character sets

ChangeSet
  1.1887 05/04/07 14:39:30 magnus@msdesk.mysql.com +1 -0
  Fix linking problem on bsd53
   - See article http://archive.netbsd.se/?ml=freebsd-current&a=2004-07&m=257561
    or http://www.geocrawler.com/archives/3/254/2003/3/450/10409564/

  configure.in
    1.282 05/04/07 14:36:55 magnus@msdesk.mysql.com +9 -0
    The libsupc++ library on freebsd with gcc 3.4.2 is dependent on libstdc++, disable it  since other solution works fine

ChangeSet
  1.1882.1.3 05/04/06 23:12:10 serg@serg.mylan +5 -0
  after merge fix

  strings/ctype-eucjpms.c
    1.5 05/04/06 23:12:02 serg@serg.mylan +7 -4
    after merge fix

  strings/ctype-cp932.c
    1.5 05/04/06 23:12:01 serg@serg.mylan +3 -1
    after merge fix

  ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
    1.16 05/04/06 23:12:01 serg@serg.mylan +2 -1
    after merge fix

  mysql-test/t/user_var.test
    1.27 05/04/06 23:12:01 serg@serg.mylan +1 -2
    after merge fixes - old (erroneous) results restored.
    Should be corrected when the fix is applied

  mysql-test/r/user_var.result
    1.32 05/04/06 23:12:01 serg@serg.mylan +1 -2
    after merge fixes - old (erroneous) results restored.
    Should be corrected when the fix is applied

ChangeSet
  1.1882.1.2 05/04/06 21:19:20 serg@serg.mylan +27 -0
  manually merged
  Gluh's SESSION/GLOBAL for @variables fix in sql_yacc.yy and
  Bar's well_formed_len() changes in ndb code
  did not make it and should be re-applied manually

  sql/sql_yacc.yy
    1.358 05/04/06 21:19:11 serg@serg.mylan +85 -39
    merged

  sql/field.cc
    1.252 05/04/06 21:19:11 serg@serg.mylan +3 -2
    manually merged, because bk messed it up

  ndb/src/ndbapi/NdbScanOperation.cpp
    1.64 05/04/06 21:19:11 serg@serg.mylan +6 -14
    ul

  ndb/src/ndbapi/NdbOperationSearch.cpp
    1.24 05/04/06 21:19:11 serg@serg.mylan +0 -3
    ul

  ndb/src/ndbapi/NdbOperationDefine.cpp
    1.19 05/04/06 21:19:11 serg@serg.mylan +0 -3
    ul

  ndb/src/ndbapi/NdbIndexOperation.cpp
    1.21 05/04/06 21:19:11 serg@serg.mylan +0 -3
    ul

  ndb/include/ndbapi/NdbScanOperation.hpp
    1.30 05/04/06 21:19:11 serg@serg.mylan +0 -1
    ul

  BitKeeper/deleted/.del-NdbResultSet.cpp~84d192cf3f42600d
    1.9 05/04/06 21:19:11 serg@serg.mylan +0 -1
    ul

ChangeSet
  1.1882.2.1 05/04/06 21:55:34 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
  Added missing file to Makefile.am

  mysql-test/Makefile.am
    1.47 05/04/06 21:54:29 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
    Added missing file to Makefile.am

  strings/ctype-ujis.c
    1.63 05/04/06 20:29:13 serg@serg.mylan +0 -0
    Auto merged

  strings/ctype-ucs2.c
    1.44 05/04/06 20:29:13 serg@serg.mylan +0 -0
    Auto merged

  strings/ctype-sjis.c
    1.79 05/04/06 20:29:13 serg@serg.mylan +0 -0
    Auto merged

  strings/ctype-simple.c
    1.67 05/04/06 20:29:13 serg@serg.mylan +0 -0
    Auto merged

  strings/ctype-mb.c
    1.42 05/04/06 20:29:13 serg@serg.mylan +0 -0
    Auto merged

  strings/ctype-big5.c
    1.75 05/04/06 20:29:12 serg@serg.mylan +0 -0
    Auto merged

  ndb/tools/desc.cpp
    1.18 05/04/06 20:29:12 serg@serg.mylan +0 -1
    Auto merged

  ndb/src/ndbapi/NdbTransaction.cpp
    1.41 05/04/06 20:29:11 serg@serg.mylan +0 -0
    Auto merged

  ndb/include/ndbapi/NdbTransaction.hpp
    1.39 05/04/06 20:29:11 serg@serg.mylan +0 -0
    Auto merged

  mysql-test/t/user_var.test
    1.26 05/04/06 20:29:11 serg@serg.mylan +0 -0
    Auto merged

  mysql-test/r/user_var.result
    1.31 05/04/06 20:29:11 serg@serg.mylan +0 -0
    Auto merged

  innobase/srv/srv0start.c
    1.79 05/04/06 20:29:11 serg@serg.mylan +0 -0
    Auto merged

  innobase/row/row0sel.c
    1.83 05/04/06 20:29:11 serg@serg.mylan +0 -0
    Auto merged

  ndb/src/ndbapi/NdbTransaction.cpp
    1.30.2.3 05/04/06 20:29:10 serg@serg.mylan +0 -0
    Merge rename: ndb/src/ndbapi/NdbConnection.cpp -> ndb/src/ndbapi/NdbTransaction.cpp

  ndb/include/ndbapi/NdbTransaction.hpp
    1.19.6.2 05/04/06 20:29:10 serg@serg.mylan +0 -0
    Merge rename: ndb/include/ndbapi/NdbConnection.hpp -> ndb/include/ndbapi/NdbTransaction.hpp

  innobase/os/os0file.c
    1.103 05/04/06 20:29:10 serg@serg.mylan +0 -0
    Auto merged

  innobase/include/os0file.h
    1.34 05/04/06 20:29:10 serg@serg.mylan +0 -0
    Auto merged

  innobase/include/btr0pcur.h
    1.7 05/04/06 20:29:10 serg@serg.mylan +0 -0
    Auto merged

  innobase/btr/btr0pcur.c
    1.13 05/04/06 20:29:10 serg@serg.mylan +0 -0
    Auto merged

  include/m_ctype.h
    1.109 05/04/06 20:29:10 serg@serg.mylan +0 -0
    Auto merged

  BitKeeper/deleted/.del-NdbResultSet.cpp~84d192cf3f42600d
    1.7.1.2 05/04/06 20:29:10 serg@serg.mylan +0 -0
    Merge rename: ndb/src/ndbapi/NdbResultSet.cpp -> BitKeeper/deleted/.del-NdbResultSet.cpp~84d192cf3f42600d

  BitKeeper/etc/logging_ok
    1.304 05/04/06 20:28:55 serg@serg.mylan +0 -1
    auto-union

ChangeSet
  1.1882.1.1 05/04/06 20:20:37 serg@serg.mylan +1 -0
  merged

  sql/handler.cc
    1.158 05/04/06 20:20:30 serg@serg.mylan +1 -2
    merged

ChangeSet
  1.1884 05/04/06 22:09:43 konstantin@mysql.com +1 -0
  Minor fix in cursors execution.

  sql/sql_select.cc
    1.310 05/04/06 22:09:38 konstantin@mysql.com +1 -0
    Fix a discrepancy spotted after the setup_end_select_func patch has been 
    pushed: last join sweep assumes that join->tmp_table is zero.

ChangeSet
  1.1881.1.1 05/04/06 21:48:16 konstantin@mysql.com +1 -0
  Refactor parts of do_select() (JOIN execution).

  sql/sql_select.cc
    1.309 05/04/06 21:48:11 konstantin@mysql.com +57 -36
    Bits of refactoring of do_select as one step forward to merge cursor and
    non-cursor execution.
    Moving send_fields (metadata handling) out of do_select to one level up
    and moving end_select setting to a separate function.
    This function is used in the Cursor::open() too.

ChangeSet
  1.1881 05/04/06 19:43:35 monty@mysql.com +8 -0
  Fixed errors found during review

  sql/sql_show.cc
    1.235 05/04/06 19:43:28 monty@mysql.com +1 -1
    Cleanup

  sql/sql_class.cc
    1.175 05/04/06 19:43:28 monty@mysql.com +3 -2
    Don't put code in comments

  sql/share/errmsg.txt
    1.22 05/04/06 19:43:27 monty@mysql.com +24 -24
    Made error message smaller to not get into trouble with clients with smaller error buffers

  sql/records.cc
    1.39 05/04/06 19:43:27 monty@mysql.com +1 -1
    Fixed possible compiler warning

  mysys/my_sync.c
    1.4 05/04/06 19:43:27 monty@mysql.com +1 -1
    Fixed possible compiler warning

  mysql-test/t/kill.test
    1.12 05/04/06 19:43:27 monty@mysql.com +1 -1
    Portablity fix

  mysql-test/r/kill.result
    1.7 05/04/06 19:43:27 monty@mysql.com +1 -1
    Portablity fix

  mysql-test/r/drop.result
    1.27 05/04/06 19:43:27 monty@mysql.com +2 -2
    Made error message smaller to not get into trouble with clients with smaller error buffers
    The proper way to fix this is to generate a separate warning for each not found table if there was more than one table in the DROP
    but

ChangeSet
  1.1879.1.1 05/04/06 18:19:05 kent@mysql.com +3 -0
  Merge

  mysql-test/Makefile.am
    1.46 05/04/06 18:18:59 kent@mysql.com +2 -2

  mysql-test/r/rpl_rewrite_db.result
    1.4 05/04/06 18:15:28 kent@mysql.com +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.19 05/04/06 18:15:28 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1880 05/04/06 17:23:34 monty@mysql.com +4 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/my/mysql-5.0

  sql/sql_parse.cc
    1.438 05/04/06 17:23:33 monty@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.451 05/04/06 17:23:33 monty@mysql.com +0 -0
    Auto merged

  scripts/make_binary_distribution.sh
    1.78 05/04/06 17:23:32 monty@mysql.com +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.263 05/04/06 17:23:32 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1861.1.5 05/04/06 17:22:21 monty@mysql.com +11 -0
  Fixed errors descovered by valgrind 2.4
  Added suppression file for some valgrind warnings that are not real errors

  mysql-test/valgrind.supp
    1.1 05/04/06 17:22:16 monty@mysql.com +94 -0

  strings/decimal.c
    1.44 05/04/06 17:22:16 monty@mysql.com +1 -1
    Fixed wrong tests

  sql/sql_parse.cc
    1.434.1.1 05/04/06 17:22:16 monty@mysql.com +2 -1
    Indentation fix

  sql/mysqld.cc
    1.447.2.1 05/04/06 17:22:16 monty@mysql.com +2 -1
    Ensure that create_time is initialized for cached threads

  sql/ha_heap.cc
    1.62 05/04/06 17:22:16 monty@mysql.com +1 -0
    Ensure that with_auto_increment is initialized properly

  sql/ha_federated.cc
    1.23 05/04/06 17:22:16 monty@mysql.com +3 -3
    Ensure that 'socket' is initialized properly

  scripts/make_binary_distribution.sh
    1.75.1.1 05/04/06 17:22:16 monty@mysql.com +1 -0
    Added valgrind suppress file

  mysys/default.c
    1.59 05/04/06 17:22:16 monty@mysql.com +2 -2
    Removed duplicate fn_format()

  mysql-test/valgrind.supp
    1.0 05/04/06 17:22:16 monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.0/mysql-test/valgrind.supp

  mysql-test/t/heap.test
    1.24 05/04/06 17:22:16 monty@mysql.com +9 -18
    Cleanup old tests and added new tests

  mysql-test/r/heap.result
    1.34 05/04/06 17:22:16 monty@mysql.com +5 -16
    Cleanup old tests and added new tests

  mysql-test/mysql-test-run.sh
    1.260.2.1 05/04/06 17:22:16 monty@mysql.com +1 -1
    Added suppression of some valgrind warnings that are not real errors

ChangeSet
  1.1879 05/04/06 14:15:45 joerg@mysql.com +14 -0
  Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0

  support-files/mysql.spec.sh
    1.96 05/04/06 14:15:41 joerg@mysql.com +0 -0
    Auto merged

  sql/table.cc
    1.159 05/04/06 14:15:41 joerg@mysql.com +0 -0
    Auto merged

  sql/sql_udf.cc
    1.44 05/04/06 14:15:40 joerg@mysql.com +4 -6
    Auto merged

  sql/mysqld.cc
    1.450 05/04/06 14:15:40 joerg@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.287 05/04/06 14:15:39 joerg@mysql.com +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.147 05/04/06 14:15:38 joerg@mysql.com +0 -0
    Auto merged

  scripts/mysql_create_system_tables.sh
    1.27 05/04/06 14:15:38 joerg@mysql.com +0 -1
    Auto merged

  myisam/mi_create.c
    1.45 05/04/06 14:15:37 joerg@mysql.com +0 -0
    Auto merged

  innobase/dict/dict0dict.c
    1.62 05/04/06 14:15:37 joerg@mysql.com +0 -0
    Auto merged

  include/my_global.h
    1.75 05/04/06 14:15:36 joerg@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-mrg_create.c~b747c8ec2b801f6
    1.9 05/04/06 14:15:36 joerg@mysql.com +0 -0
    Auto merged

  configure.in
    1.281 05/04/06 14:15:35 joerg@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e
    1.136 05/04/06 14:15:35 joerg@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-create.c~96cecc433c0c2242
    1.13 05/04/06 14:15:35 joerg@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-mrg_create.c~b747c8ec2b801f6
    1.6.3.2 05/04/06 14:15:34 joerg@mysql.com +0 -0
    Merge rename: merge/mrg_create.c -> BitKeeper/deleted/.del-mrg_create.c~b747c8ec2b801f6

  BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e
    1.70.27.3 05/04/06 14:15:34 joerg@mysql.com +0 -0
    Merge rename: sql/share/english/errmsg.txt -> BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e

  BitKeeper/deleted/.del-create.c~96cecc433c0c2242
    1.10.3.2 05/04/06 14:15:34 joerg@mysql.com +0 -0
    Merge rename: isam/create.c -> BitKeeper/deleted/.del-create.c~96cecc433c0c2242

ChangeSet
  1.1616.1.552 05/04/06 15:09:15 marko@hundin.mysql.fi +3 -0
  InnoDB: Avoid test suite failures caused by a locking conflict
  between two server instances at server shutdown/startup.
  This conflict on advisory locks appears to be the result of a bug
  in the operating system; these locks should be released when the
  files are closed, but somehow that does not always happen
  immediately in Linux.  (Bug #9381)

  innobase/srv/srv0start.c
    1.72.1.6 05/04/06 15:09:09 marko@hundin.mysql.fi +5 -0
    open_or_create_data_files(): Open the first data file with
    OS_FILE_OPEN_RETRY, to resolve a conflict with a shutting-down
    instance of the MySQL server.

  innobase/os/os0file.c
    1.87.1.13 05/04/06 15:09:09 marko@hundin.mysql.fi +23 -4
    os_file_lock(): Do not close the file on failure, but let the
    callers do that.
    os_file_create(): If create_mode==OS_FILE_OPEN_RETRY and
    os_file_lock() fails, keep retrying for 100 seconds.

  innobase/include/os0file.h
    1.32.1.1 05/04/06 15:09:08 marko@hundin.mysql.fi +2 -0
    Add OS_FILE_OPEN_RETRY for os_file_create()ing ibdata1

ChangeSet
  1.1878 05/04/06 12:27:43 msvensson@neptunus.(none) +1 -0
  BUG#9626 Several serious errors reported by Valgrind in latest 5.0 bk tree
   - Fixing obvious ones

  sql/ha_ndbcluster.cc
    1.170 05/04/06 12:27:39 msvensson@neptunus.(none) +2 -0
    Delete ndb object before exiting thread

ChangeSet
  1.1616.1799.1 05/04/06 12:20:55 kent@mysql.com +4 -0
  Makefile.am:
    Include the Perl version of mysql-test-run
  rpl_rewrite_db.test, rpl_rewrite_db.result:
    Added missing database cleanup
  mysql-test-run.pl:
    Embedded result files no longer needed

  mysql-test/Makefile.am
    1.39.1.3 05/04/06 12:20:20 kent@mysql.com +10 -5
    Include the Perl version of mysql-test-run

  mysql-test/t/rpl_rewrite_db.test
    1.3 05/04/06 12:13:59 kent@mysql.com +3 -0
    Added missing database cleanup

  mysql-test/r/rpl_rewrite_db.result
    1.2.1.1 05/04/06 12:13:58 kent@mysql.com +1 -0
    Added missing database cleanup

ChangeSet
  1.1616.1798.1 05/04/06 15:12:44 bar@mysql.com +2 -0
  Minor clean-ups for the previous commit.

  strings/ctype-mb.c
    1.34.1.5 05/04/06 15:12:35 bar@mysql.com +1 -1
    Don't return an error if we reached end of line.

  sql/field.cc
    1.197.1.18 05/04/06 15:12:35 bar@mysql.com +4 -4
    Use a separate variable. Otherwise "error" value gets lost
    after well_formed_length call.

ChangeSet
  1.1616.1.549 05/04/06 14:14:13 gluh@mysql.com +1 -0
  Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286

  sql/sql_yacc.yy
    1.203.1.178 05/04/06 14:14:09 gluh@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.1797.1 05/04/06 14:13:06 gluh@eagle.intranet.mysql.r18.ru +4 -0
  Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables

  BitKeeper/etc/logging_ok
    1.233.47.22 05/04/06 14:13:05 gluh@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_yacc.yy
    1.203.122.1 05/04/06 14:11:08 gluh@mysql.com +39 -27
    Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables

  mysql-test/t/user_var.test
    1.13.1.7 05/04/06 14:11:08 gluh@mysql.com +8 -0
    Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables

  mysql-test/r/user_var.result
    1.14.2.10 05/04/06 14:11:08 gluh@mysql.com +4 -0
    Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables

ChangeSet
  1.1616.1.548 05/04/06 10:27:40 heikki@hundin.mysql.fi +4 -0
  row0sel.c, btr0pcur.c, btr0pcur.ic, btr0pcur.h:
    Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context

  innobase/row/row0sel.c
    1.51.1.16 05/04/06 10:27:08 heikki@hundin.mysql.fi +4 -0
    Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context

  innobase/btr/btr0pcur.c
    1.9.1.1 05/04/06 10:26:29 heikki@hundin.mysql.fi +9 -1
    Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context

  innobase/include/btr0pcur.ic
    1.6 05/04/06 10:26:13 heikki@hundin.mysql.fi +10 -0
    Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context

  innobase/include/btr0pcur.h
    1.5.1.1 05/04/06 10:26:02 heikki@hundin.mysql.fi +4 -0
    Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context

ChangeSet
  1.1616.1.547 05/04/06 11:53:15 bar@mysql.com +12 -0
  Adding a new parameter for well_formed_length to 
  return error. We'll use it for better warnign reporting.

  strings/ctype-ujis.c
    1.61.1.1 05/04/06 11:53:09 bar@mysql.com +11 -2
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  strings/ctype-ucs2.c
    1.33.1.5 05/04/06 11:53:09 bar@mysql.com +3 -3
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  strings/ctype-sjis.c
    1.72.1.4 05/04/06 11:53:09 bar@mysql.com +4 -1
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  strings/ctype-simple.c
    1.57.1.6 05/04/06 11:53:08 bar@mysql.com +3 -3
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  strings/ctype-mb.c
    1.34.1.4 05/04/06 11:53:08 bar@mysql.com +6 -3
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  strings/ctype-big5.c
    1.67.1.5 05/04/06 11:53:08 bar@mysql.com +5 -1
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  sql/sql_yacc.yy
    1.203.1.177 05/04/06 11:53:08 bar@mysql.com +2 -1
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  sql/field.cc
    1.197.1.17 05/04/06 11:53:08 bar@mysql.com +8 -7
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  ndb/src/ndbapi/NdbOperationSearch.cpp
    1.7.1.2 05/04/06 11:53:08 bar@mysql.com +3 -1
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  ndb/src/ndbapi/NdbOperationDefine.cpp
    1.13.1.2 05/04/06 11:53:08 bar@mysql.com +3 -1
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  ndb/src/ndbapi/NdbIndexOperation.cpp
    1.12.1.2 05/04/06 11:53:08 bar@mysql.com +3 -1
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  include/m_ctype.h
    1.102.1.1 05/04/06 11:53:08 bar@mysql.com +6 -3
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

ChangeSet
  1.1877 05/04/05 20:55:06 jimw@mysql.com +5 -0
  Update tests after merge of bug fix.

  mysql-test/t/show_check.test
    1.48 05/04/05 20:55:04 jimw@mysql.com +1 -1
    Fix default for bool column.

  mysql-test/t/null.test
    1.18 05/04/05 20:55:04 jimw@mysql.com +1 -1
    Fix default for smallint column.

  mysql-test/r/strict.result
    1.16 05/04/05 20:55:04 jimw@mysql.com +41 -41
    Update results

  mysql-test/r/show_check.result
    1.66 05/04/05 20:55:04 jimw@mysql.com +8 -8
    Update results

  mysql-test/r/null.result
    1.31 05/04/05 20:55:03 jimw@mysql.com +1 -1
    Update results

ChangeSet
  1.1876 05/04/05 19:45:34 jimw@mysql.com +23 -0
  Merge

  mysql-test/t/strict.test
    1.11 05/04/05 19:45:34 jimw@mysql.com +0 -0
    SCCS merged

  sql/sql_insert.cc
    1.139 05/04/05 19:45:08 jimw@mysql.com +0 -0
    Auto merged

  sql/item.h
    1.113 05/04/05 19:45:08 jimw@mysql.com +0 -0
    Auto merged

  sql/item.cc
    1.106 05/04/05 19:45:08 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/type_ranges.test
    1.12 05/04/05 19:45:08 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/type_blob.test
    1.27 05/04/05 19:45:08 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/sp.test
    1.99 05/04/05 19:45:08 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/show_check.test
    1.47 05/04/05 19:45:08 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/order_by.test
    1.32 05/04/05 19:45:08 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/limit.test
    1.9 05/04/05 19:45:08 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/ctype_latin1_de.test
    1.21 05/04/05 19:45:08 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/warnings.result
    1.31 05/04/05 19:45:08 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/type_ranges.result
    1.32 05/04/05 19:45:08 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/type_blob.result
    1.45 05/04/05 19:45:08 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/strict.result
    1.15 05/04/05 19:45:08 jimw@mysql.com +41 -41
    Auto merged

  mysql-test/r/sp.result
    1.104 05/04/05 19:45:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/rpl000001.result
    1.29 05/04/05 19:45:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/order_by.result
    1.48 05/04/05 19:45:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/limit.result
    1.9 05/04/05 19:45:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/grant2.result
    1.18 05/04/05 19:45:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/grant.result
    1.39 05/04/05 19:45:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/ctype_latin1_de.result
    1.23 05/04/05 19:45:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/create.result
    1.84 05/04/05 19:45:07 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1868.1.13 05/04/05 23:14:56 jani@ua141d10.elisa.omakaista.fi +1 -0
  Some of the argument place holders were not quite correct compared to
  the argument type. Fixed also some float() casts to double() as query_id
  is now actually longlong type. Related to Bug#9646.
  

  sql/sql_parse.cc
    1.437 05/04/05 23:14:49 jani@ua141d10.elisa.omakaista.fi +3 -2
    Some of the argument place holders were not quite correct compared to
    the argument type. Fixed also some float() casts to double() as query_id
    is now actually longlong type.

ChangeSet
  1.1874 05/04/05 13:01:42 jimw@mysql.com +2 -0
  Remove references to result.es files

  scripts/make_binary_distribution.sh
    1.77 05/04/05 13:01:24 jimw@mysql.com +1 -1
    Remove result.es refernece

  mysql-test/Makefile.am
    1.45 05/04/05 13:00:55 jimw@mysql.com +1 -2
    Remove result.es references

ChangeSet
  1.1868.7.2 05/04/05 19:52:22 serg@serg.mylan +1 -0
  Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
  into serg.mylan:/usr/home/serg/Abk/mysql-5.0

  BitKeeper/triggers/post-commit
    1.37 05/04/05 19:52:01 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1616.1796.1 05/04/05 19:44:39 serg@serg.mylan +1 -0
  merged

  BitKeeper/triggers/post-commit
    1.22.1.11 05/04/05 19:44:33 serg@serg.mylan +1 -1
    merged

ChangeSet
  1.1868.7.1 05/04/05 18:42:34 serg@serg.mylan +1 -0
  Per Heikki's request make trans_register_ha tolerant to multiple registrations

  sql/handler.cc
    1.156.1.1 05/04/05 18:42:22 serg@serg.mylan +11 -8
    Per Heikki's request make trans_register_ha tolerant to multiple registrations

ChangeSet
  1.1871 05/04/05 07:59:11 jimw@mysql.com +1 -0
  Merge bk-internal:/home/bk/mysql-5.0
  into mysql.com:/home/jimw/my/mysql-5.0-clean

  sql/mysqld.cc
    1.449 05/04/05 07:59:10 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1868.1.12 05/04/05 17:56:40 heikki@hundin.mysql.fi +2 -0
  handler.cc, ha_innodb.cc:
    Fix Bug #8650 : InnoDB does not rollback SQL statement at an error

  sql/handler.cc
    1.157 05/04/05 17:55:15 heikki@hundin.mysql.fi +3 -3
    Fix Bug #8650 : InnoDB does not rollback SQL statement at an error

  sql/ha_innodb.cc
    1.186 05/04/05 17:55:14 heikki@hundin.mysql.fi +40 -16
    Fix Bug #8650 : InnoDB does not rollback SQL statement at an error

ChangeSet
  1.1868.6.1 05/04/05 16:39:40 serg@serg.mylan +2 -0
  removed a reference to non-existing file

  configure.in
    1.280 05/04/05 16:39:31 serg@serg.mylan +0 -1
    removed a reference to non-existing file

  BitKeeper/etc/ignore
    1.198 05/04/05 16:23:55 serg@serg.mylan +1 -0
    added client/mysqltestmanagerc

  BitKeeper/etc/ignore
    1.197 05/04/05 16:23:50 serg@serg.mylan +1 -0
    added client/mysqltestmanager-pwgen

ChangeSet
  1.1868.4.2 05/04/05 15:56:43 mskold@mysql.com +1 -0
  Fix Bug #9517  Condition pushdown to storage engine does not work for update/delete, post review fix, removed quick constraint

  sql/records.cc
    1.38 05/04/05 15:56:18 mskold@mysql.com +1 -1
    Fix Bug #9517  Condition pushdown to storage engine does not work for update/delete, post review fix, removed quick constraint

ChangeSet
  1.1868.5.1 05/04/05 15:49:10 pem@mysql.comhem.se +3 -0
  Additional fix for BUG#5907: Traditional mode: invalid value can be inserted via a stored procedure
  ... make the handler catch too.

  sql/sp_head.cc
    1.125 05/04/05 15:49:05 pem@mysql.com +5 -1
    Make handlers catch certain bad data exceptions in strict mode too.

  mysql-test/t/strict.test
    1.9.1.14 05/04/05 15:49:05 pem@mysql.com +0 -1
    Corrected test for BUG#5907.

  mysql-test/r/strict.result
    1.12.1.13 05/04/05 15:49:05 pem@mysql.com +2 -1
    Updated corrected result for BUG#5907.

ChangeSet
  1.1868.1.7 05/04/05 15:36:52 serg@serg.mylan +1 -0
  fix broken mix_innodb_myisam_binlog.test

  mysql-test/t/mix_innodb_myisam_binlog.test
    1.15 05/04/05 15:36:44 serg@serg.mylan +9 -9
    fix broken mix_innodb_myisam_binlog.test

ChangeSet
  1.1346.823.2 05/04/05 15:16:15 serg@serg.mylan +1 -0
  add changeset key to the bk commit mail

  BitKeeper/triggers/post-commit
    1.19.1.15 05/04/05 15:16:12 serg@serg.mylan +3 -0
    add changeset key to the bk commit mail

ChangeSet
  1.1868.1.6 05/04/05 14:46:18 serg@serg.mylan +2 -0
  sql/item.cc
      after merge fix
  sql/mysqld.cc
      too early for sync-binlog=1 by default :)

  sql/mysqld.cc
    1.447.1.2 05/04/05 14:46:04 serg@serg.mylan +1 -1
    too early for sync-binlog=1 by default :)

  sql/item.cc
    1.104.1.29 05/04/05 14:46:04 serg@serg.mylan +1 -1
    after merge fix

ChangeSet
  1.1868.3.1 05/04/05 15:13:14 marko@hundin.mysql.fi +1 -0
  InnoDB: Disable an assertion that fails on old data due to Bug #9526

  innobase/row/row0sel.c
    1.82 05/04/05 15:13:06 marko@hundin.mysql.fi +3 -1
    Disable an assertion that fails for old UTF-8 ENUM columns (Bug #9526)

ChangeSet
  1.1868.1.5 05/04/05 13:23:11 serg@serg.mylan +9 -0
  Merge

  sql/handler.cc
    1.156 05/04/05 13:23:03 serg@serg.mylan +0 -0
    SCCS merged

  sql/sql_parse.cc
    1.436 05/04/05 13:22:05 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_lex.h
    1.174 05/04/05 13:22:05 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_class.h
    1.231 05/04/05 13:22:05 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_class.cc
    1.174 05/04/05 13:22:04 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_base.cc
    1.234 05/04/05 13:22:04 serg@serg.mylan +0 -0
    Auto merged

  sql/mysqld.cc
    1.447.1.1 05/04/05 13:22:04 serg@serg.mylan +0 -0
    Auto merged

  sql/mysql_priv.h
    1.286 05/04/05 13:22:03 serg@serg.mylan +0 -0
    Auto merged

  sql/field.cc
    1.251 05/04/05 13:22:03 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1850.2.3 05/04/05 13:17:49 serg@serg.mylan +17 -0
  remove the rest of isam/merge references
  fix a race condition in TC_LOG_BINLOG::unlog

  sql/sql_class.h
    1.227.2.1 05/04/05 13:17:40 serg@serg.mylan +5 -4
    cleanup

  sql/sql_base.cc
    1.230.1.1 05/04/05 13:17:40 serg@serg.mylan +0 -1
    remove the rest of isam/merge references

  sql/set_var.cc
    1.103 05/04/05 13:17:40 serg@serg.mylan +3 -9
    hide unused variables. simplify sync_binlog code

  sql/opt_range.cc
    1.150 05/04/05 13:17:40 serg@serg.mylan +1 -2
    remove the rest of isam/merge references

  sql/mysqld.cc
    1.446.1.1 05/04/05 13:17:39 serg@serg.mylan +14 -40
    remove the rest of isam/merge references

  sql/mysql_priv.h
    1.283.2.1 05/04/05 13:17:39 serg@serg.mylan +3 -6
    remove duplicates

  sql/log.cc
    1.159 05/04/05 13:17:39 serg@serg.mylan +29 -24
    fix a race condition in TC_LOG_BINLOG::unlog
    preparation for binlog group commit

  sql/handler.cc
    1.153.1.3 05/04/05 13:17:39 serg@serg.mylan +0 -4
    remove the rest of isam/merge references

  mysys/my_sync.c
    1.3 05/04/05 13:17:39 serg@serg.mylan +17 -5
    MY_IGNORE_BADFD flag

  mysql-test/t/xa.test
    1.2 05/04/05 13:17:39 serg@serg.mylan +1 -0
    comment

  mysql-test/t/replace.test
    1.11 05/04/05 13:17:39 serg@serg.mylan +2 -6
    remove the rest of isam/merge references

  mysql-test/r/replace.result
    1.9 05/04/05 13:17:39 serg@serg.mylan +1 -3
    remove the rest of isam/merge references

  include/mysql_embed.h
    1.13 05/04/05 13:17:39 serg@serg.mylan +0 -1
    remove the rest of isam/merge references

  include/my_sys.h
    1.148 05/04/05 13:17:39 serg@serg.mylan +5 -6
    MY_IGNORE_BADFD flag

  include/my_pthread.h
    1.81 05/04/05 13:17:39 serg@serg.mylan +0 -17
    unused and abused macro removed

  include/config-win.h
    1.57 05/04/05 13:17:39 serg@serg.mylan +0 -1
    unused and abused macro removed

  include/Makefile.am
    1.52 05/04/05 13:17:39 serg@serg.mylan +1 -1
    remove the rest of isam/merge references

ChangeSet
  1.1616.1.545 05/04/05 13:14:03 pekka@mysql.com +6 -0
  ndb - csc#4847 release scan op early to save memory

ChangeSet
  1.1868.1.4 05/04/05 16:09:56 gluh@eagle.intranet.mysql.r18.ru +4 -0
  Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement
     restore original 'lex->query_tables' table list after
     processing of information schema table
     remove unnecessary operations

  sql/sql_show.cc
    1.234 05/04/05 16:09:51 gluh@mysql.com +2 -3
    Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement

  sql/sql_lex.h
    1.173 05/04/05 16:09:51 gluh@mysql.com +3 -2
    Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement

  mysql-test/t/ps.test
    1.34 05/04/05 16:09:51 gluh@mysql.com +21 -0
    Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement

  mysql-test/r/ps.result
    1.35 05/04/05 16:09:51 gluh@mysql.com +18 -0
    Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement

  ndb/tools/desc.cpp
    1.10.1.3 05/04/05 13:00:35 pekka@mysql.com +1 -1
    release scan op of hupped trans at scan close to save memory

  ndb/src/ndbapi/NdbScanOperation.cpp
    1.41.1.9 05/04/05 13:00:34 pekka@mysql.com +14 -7
    release scan op of hupped trans at scan close to save memory

  ndb/src/ndbapi/NdbResultSet.cpp
    1.7.1.1 05/04/05 13:00:33 pekka@mysql.com +1 -1
    release scan op of hupped trans at scan close to save memory

  ndb/src/ndbapi/NdbConnection.cpp
    1.30.2.2 05/04/05 13:00:33 pekka@mysql.com +31 -0
    release scan op of hupped trans at scan close to save memory

  ndb/include/ndbapi/NdbScanOperation.hpp
    1.17.1.3 05/04/05 13:00:33 pekka@mysql.com +1 -1
    release scan op of hupped trans at scan close to save memory

  ndb/include/ndbapi/NdbConnection.hpp
    1.19.6.1 05/04/05 13:00:33 pekka@mysql.com +1 -0
    release scan op of hupped trans at scan close to save memory

ChangeSet
  1.1868.2.2 05/04/05 15:12:15 gluh@eagle.intranet.mysql.r18.ru +3 -0
  Fix for bug#7214: information_schema: unauthorized user can see metadata
      the fix for 'columns' table only
      Rights check for 'routines' table is already done
      (see WL2131 Access control for SHOW ... PROCEDURE|FUNCTION ...)
      rename 'testtets' database to 'mysqltest' to keep number of
        DBs which created by mysql-test as small as possible

  sql/sql_show.cc
    1.233 05/04/05 15:12:10 gluh@mysql.com +25 -20
    Fix for bug#7214: information_schema: unauthorized user can see metadata

  mysql-test/t/information_schema.test
    1.32 05/04/05 15:12:10 gluh@mysql.com +18 -11
    Fix for bug#7214: information_schema: unauthorized user can see metadata

  mysql-test/r/information_schema.result
    1.45 05/04/05 15:12:10 gluh@mysql.com +27 -18
    Fix for bug#7214: information_schema: unauthorized user can see metadata

ChangeSet
  1.1868.2.1 05/04/05 14:31:46 gluh@eagle.intranet.mysql.r18.ru +2 -0
  Code optimization(discussed with Monty)

  BitKeeper/etc/logging_ok
    1.303 05/04/05 14:31:46 gluh@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_show.cc
    1.232 05/04/05 14:30:36 gluh@mysql.com +4 -16
    Code optimization(discussed with Monty)

ChangeSet
  1.1868.1.1 05/04/05 13:40:34 ramil@mysql.com +3 -0
  Fix for bug #9571: Primary key creation causes server crash.

  sql/unireg.cc
    1.53 05/04/05 13:40:28 ramil@mysql.com +2 -3
    Fix for bug #9571: Primary key creation causes server crash.
    We should pass null_pos to the make_field() anyway,
    as we use it for bit fields.
    

  mysql-test/t/type_bit.test
    1.6 05/04/05 13:40:28 ramil@mysql.com +8 -0
    Fix for bug #9571: Primary key creation causes server crash.

  mysql-test/r/type_bit.result
    1.7 05/04/05 13:40:27 ramil@mysql.com +3 -0
    Fix for bug #9571: Primary key creation causes server crash.

ChangeSet
  1.1616.1792.9 05/04/05 11:35:03 heikki@hundin.mysql.fi +1 -0
  dict0dict.c:
    Add a note that ENUM in new tables cannot reference ENUM in old tables, in FOREIGN KEY constraints

  innobase/dict/dict0dict.c
    1.52.1.10 05/04/05 11:34:50 heikki@hundin.mysql.fi +3 -0
    Add a note that ENUM in new tables cannot reference ENUM in old tables, in FOREIGN KEY constraints

ChangeSet
  1.1616.1.543 05/04/05 09:06:57 joerg@mysql.com +1 -0
  Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/M41/mysql-4.1

  sql/mysqld.cc
    1.356.73.44 05/04/05 09:06:55 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1869 05/04/04 23:03:56 jimw@mysql.com +8 -0
  Merge

  sql/item_sum.cc
    1.137 05/04/04 23:03:53 jimw@mysql.com +1 -1
    Merge

  mysql-test/t/kill.test
    1.11 05/04/04 23:02:36 jimw@mysql.com +0 -3
    Merge

  mysql-test/r/kill.result
    1.6 05/04/04 23:02:16 jimw@mysql.com +0 -6
    Merge

  client/mysqltest.c
    1.137 05/04/04 23:01:48 jimw@mysql.com +2 -2
    Merge

  sql/mysqld.cc
    1.448 05/04/04 23:00:49 jimw@mysql.com +0 -0
    Auto merged

  sql-common/client.c
    1.70 05/04/04 23:00:49 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/join_outer.test
    1.26 05/04/04 23:00:48 jimw@mysql.com +10 -11
    Auto merged

  mysql-test/r/join_outer.result
    1.37 05/04/04 23:00:48 jimw@mysql.com +19 -19
    Auto merged

ChangeSet
  1.1868 05/04/05 06:12:41 petr@mysql.com +1 -0
  Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/cps/mysql/trees/mysql-5.0

  mysql-test/mysql-test-run.sh
    1.262 05/04/05 06:12:40 petr@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.1792.8 05/04/04 18:29:18 jimw@mysql.com +2 -0
  Merge new tests

  mysql-test/t/join_outer.test
    1.14.1.4 05/04/04 18:29:15 jimw@mysql.com +0 -2
    Merge

  mysql-test/r/join_outer.result
    1.24.1.10 05/04/04 18:29:15 jimw@mysql.com +0 -0
    Update results

ChangeSet
  1.1616.1792.6 05/04/04 18:26:39 jimw@mysql.com +2 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-8866
  into mysql.com:/home/jimw/my/mysql-4.1-clean

  sql-common/client.c
    1.46.1.38 05/04/04 18:26:38 jimw@mysql.com +0 -0
    Auto merged

  client/mysqltest.c
    1.92.1.67 05/04/04 18:26:38 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1867 05/04/04 17:08:12 jimw@mysql.com +1 -0
  Skip new test with embedded server

  mysql-test/t/view_grant.test
    1.2 05/04/04 17:08:08 jimw@mysql.com +2 -0
    Skip test with embedded server

ChangeSet
  1.1866 05/04/04 16:34:24 jimw@mysql.com +6 -0
  Fix merge of tests that were split out of other test files

  mysql-test/t/user_var-binlog.test
    1.2 05/04/04 16:34:21 jimw@mysql.com +1 -1
    Update binlog starting position

  mysql-test/t/timezone_grant.test
    1.2 05/04/04 16:34:21 jimw@mysql.com +2 -2
    Update error numbers

  mysql-test/t/ctype_ucs_binlog.test
    1.2 05/04/04 16:34:21 jimw@mysql.com +1 -1
    Update binlog starting position

  mysql-test/r/user_var-binlog.result
    1.2 05/04/04 16:34:21 jimw@mysql.com +14 -7
    Update results

  mysql-test/r/timezone_grant.result
    1.2 05/04/04 16:34:21 jimw@mysql.com +5 -3
    Update results

  mysql-test/r/ctype_ucs_binlog.result
    1.2 05/04/04 16:34:21 jimw@mysql.com +11 -4
    Update results

ChangeSet
  1.1861.1.4 05/04/05 01:19:48 monty@mysql.com +4 -0
  Don't generate message in send_kill_message() if wrong data. (Caused core dump for wrong data in ALTER TABLE on some system)

  sql/sql_table.cc
    1.233 05/04/05 01:19:44 monty@mysql.com +5 -3
    Fixed comment

  sql/sql_error.cc
    1.31 05/04/05 01:19:44 monty@mysql.com +1 -1
    Fixed comment

  sql/sql_class.h
    1.230 05/04/05 01:19:44 monty@mysql.com +2 -1
    Don't generate message in send_kill_message() if wrong data. (Caused core dump for wrong data in ALTER TABLE on some system)

  sql/item_timefunc.cc
    1.79 05/04/05 01:19:44 monty@mysql.com +1 -1
    Removed warning reported by valgrind

ChangeSet
  1.1861.3.1 05/04/05 00:32:48 monty@mysql.com +5 -0
  Now one gets an error if one tries to insert an invalid value via a stored procedure in STRICT mode. (Bug #5907)

  sql/sql_error.cc
    1.30 05/04/05 00:32:44 monty@mysql.com +16 -9
    Ensure that PS gives error for invalid values in 'strict' mode

  sql/sql_base.cc
    1.233 05/04/05 00:32:44 monty@mysql.com +2 -2
    More comments

  mysql-test/t/strict.test
    1.9.1.13 05/04/05 00:32:44 monty@mysql.com +15 -0
    Test for bug #5907 (Traditional mode: invalid value can be inserted via a stored procedure)

  mysql-test/r/strict.result
    1.12.1.12 05/04/05 00:32:44 monty@mysql.com +12 -0
    Test for bug #5907 (Traditional mode: invalid value can be inserted via a stored procedure)

  client/mysqldump.c
    1.176 05/04/05 00:32:44 monty@mysql.com +60 -55
    Changed some function and variable names to MySQL syntax
    Fixed indentation for last few pushes
    (No logic changes)

ChangeSet
  1.1863 05/04/04 12:43:58 jimw@mysql.com +20 -0
  Cleanup tests and results after merge from 4.1 of embedded
  server testing cleanups.

  mysql-test/t/view_grant.test
    1.1 05/04/04 12:43:55 jimw@mysql.com +401 -0

  mysql-test/r/view_grant.result
    1.1 05/04/04 12:43:55 jimw@mysql.com +304 -0

  mysql-test/t/view_grant.test
    1.0 05/04/04 12:43:55 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-5.0-clean/mysql-test/t/view_grant.test

  mysql-test/t/view.test
    1.65 05/04/04 12:43:55 jimw@mysql.com +0 -401
    Split grant-related tests to new test file view_grant

  mysql-test/t/user_limits.test
    1.6 05/04/04 12:43:55 jimw@mysql.com +3 -0
    Skip test with embedded server

  mysql-test/t/sp-security.test
    1.14 05/04/04 12:43:55 jimw@mysql.com +3 -0
    Skip test with embedded server

  mysql-test/t/ps_grant.test
    1.3 05/04/04 12:43:55 jimw@mysql.com +13 -0
    Add additional tests

  mysql-test/t/ps_1general.test
    1.22 05/04/04 12:43:55 jimw@mysql.com +1 -15
    Move grant-related tests to ps_grant, and fix cleanup of filename

  mysql-test/r/view_grant.result
    1.0 05/04/04 12:43:55 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-5.0-clean/mysql-test/r/view_grant.result

  mysql-test/t/mysqlshow.test
    1.2 05/04/04 12:43:54 jimw@mysql.com +3 -0
    Skip test with embedded server

  mysql-test/t/multi_update.test
    1.47 05/04/04 12:43:54 jimw@mysql.com +3 -0
    Skip test with embedded server

  mysql-test/t/innodb.test
    1.84 05/04/04 12:43:54 jimw@mysql.com +7 -1
    Fix up filenames

  mysql-test/t/information_schema.test
    1.31 05/04/04 12:43:54 jimw@mysql.com +2 -0
    Skip test with embedded server

  mysql-test/t/grant3.test
    1.4 05/04/04 12:43:54 jimw@mysql.com +3 -0
    Skip test with embedded server

  mysql-test/t/flush_read_lock_kill.test
    1.2 05/04/04 12:43:54 jimw@mysql.com +3 -0
    Skip test with embedded server

  mysql-test/t/client_xml.test
    1.3 05/04/04 12:43:54 jimw@mysql.com +3 -0
    Skip test with embedded server

  mysql-test/r/view.result
    1.75 05/04/04 12:43:54 jimw@mysql.com +0 -304
    Update results

  mysql-test/r/ps_grant.result
    1.3 05/04/04 12:43:54 jimw@mysql.com +15 -3
    Update results

  mysql-test/r/ps_1general.result
    1.38 05/04/04 12:43:54 jimw@mysql.com +1 -13
    Update results

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.22 05/04/04 12:43:54 jimw@mysql.com +10 -10
    Update results

  mysql-test/r/insert_select-binlog.result
    1.2 05/04/04 12:43:54 jimw@mysql.com +5 -5
    Update results

  mysql-test/r/innodb.result
    1.106 05/04/04 12:43:54 jimw@mysql.com +2 -2
    Update results

ChangeSet
  1.1861.2.1 05/04/04 21:38:05 mskold@mysql.com +3 -0
  Fix Bug #9517  Condition pushdown to storage engine does not work for update/delete

  sql/records.cc
    1.37 05/04/04 21:37:42 mskold@mysql.com +7 -0
    Fix Bug #9517  Condition pushdown to storage engine does not work for update/delete

  mysql-test/t/ndb_condition_pushdown.test
    1.10 05/04/04 21:37:42 mskold@mysql.com +59 -0
    Fix Bug #9517  Condition pushdown to storage engine does not work for update/delete

  mysql-test/r/ndb_condition_pushdown.result
    1.10 05/04/04 21:37:42 mskold@mysql.com +57 -1
    Fix Bug #9517  Condition pushdown to storage engine does not work for update/delete

ChangeSet
  1.1861.1.2 05/04/04 20:31:04 heikki@hundin.mysql.fi +2 -0
  ha_innodb.cc, row0sel.c:
    Fix Bug #9526 in 5.0: MySQL ENUM and SET columns are internally actually unsigned integer types; we must take care that old tables still treat ENUM and SET (incorrectly) as a character string, while new created tables treat it correctly as an unsigned integer

  sql/ha_innodb.cc
    1.185 05/04/04 20:29:30 heikki@hundin.mysql.fi +42 -20
    Fix Bug #9526 in 5.0: MySQL ENUM and SET columns are internally actually unsigned integer types; we must take care that old tables still treat ENUM and SET (incorrectly) as a character string, while new created tables treat it correctly as an unsigned integer

  innobase/row/row0sel.c
    1.81 05/04/04 20:29:11 heikki@hundin.mysql.fi +6 -2
    Fix Bug #9526 in 5.0: MySQL ENUM and SET columns are internally actually unsigned integer types; we must take care that old tables still treat ENUM and SET (incorrectly) as a character string, while new created tables treat it correctly as an unsigned integer

ChangeSet
  1.1616.1.542 05/04/04 19:00:40 joerg@mysql.com +1 -0
  Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/M41/mysql-4.1

  sql/share/english/errmsg.txt
    1.70.27.2 05/04/04 19:00:38 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1861.1.1 05/04/04 19:47:26 heikki@hundin.mysql.fi +1 -0
  Merge hundin.mysql.fi:/home/heikki/mysql-4.1
  into hundin.mysql.fi:/home/heikki/mysql-5.0

  sql/ha_innodb.cc
    1.184 05/04/04 19:47:15 heikki@hundin.mysql.fi +19 -38
    SCCS merged

ChangeSet
  1.1616.1795.5 05/04/04 19:41:52 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables

  sql/ha_innodb.cc
    1.90.16.16 05/04/04 19:41:36 heikki@hundin.mysql.fi +7 -6
    Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables

ChangeSet
  1.1616.1795.4 05/04/04 19:27:28 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string

  sql/ha_innodb.cc
    1.90.16.15 05/04/04 19:26:49 heikki@hundin.mysql.fi +35 -17
    Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string

ChangeSet
  1.1850.2.2 05/04/04 17:58:21 serg@sergbook.mylan +6 -0
  delete isam/merge files

ChangeSet
  1.1862 05/04/04 08:54:36 jimw@mysql.com +6 -0
  Merge

  mysql-test/r/type_ranges.result
    1.30.1.3 05/04/04 08:54:33 jimw@mysql.com +2 -4
    Update results

  sql/sql_select.cc
    1.308 05/04/04 08:52:49 jimw@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.435 05/04/04 08:52:49 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/type_ranges.test
    1.10.1.2 05/04/04 08:52:48 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/ps_1general.test
    1.21 05/04/04 08:52:48 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/ps_1general.result
    1.37 05/04/04 08:52:48 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.8.2.6 05/04/04 16:09:10 kent@mysql.com +0 -1
    Embedded result files no longer needed

  BitKeeper/deleted/.del-isam.test~834fb0ee8196c445
    1.12 05/04/04 15:52:54 serg@sergbook.mylan +0 -0
    Delete: mysql-test/t/isam.test

  BitKeeper/deleted/.del-have_isam.require~be6a18a8a25a617f
    1.3 05/04/04 15:52:43 serg@sergbook.mylan +0 -0
    Delete: mysql-test/r/have_isam.require

  BitKeeper/deleted/.del-have_isam.inc~8bbdabbdbe0697d3
    1.3 05/04/04 15:52:30 serg@sergbook.mylan +0 -0
    Delete: mysql-test/include/have_isam.inc

ChangeSet
  1.1861 05/04/04 16:45:23 monty@mysql.com +6 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/my/mysql-5.0

  sql/sql_table.cc
    1.232 05/04/04 16:45:20 monty@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.434 05/04/04 16:45:20 monty@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.229 05/04/04 16:45:19 monty@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.285 05/04/04 16:45:19 monty@mysql.com +0 -0
    Auto merged

  sql/field.h
    1.150 05/04/04 16:45:19 monty@mysql.com +0 -0
    Auto merged

  sql/field.cc
    1.250 05/04/04 16:45:19 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1853.1.3 05/04/04 16:43:25 monty@mysql.com +12 -0
  Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems when linking staticly
  Fix that mysql.proc works with new VARCHAR fields
  Give warnings for wrong zero dates

  tests/mysql_client_test.c
    1.111 05/04/04 16:43:20 monty@mysql.com +6 -1
    More startup information

  sql/time.cc
    1.56 05/04/04 16:43:20 monty@mysql.com +2 -1
    Give warnings for wrong zero dates

  sql/sp.cc
    1.72 05/04/04 16:43:20 monty@mysql.com +16 -17
    Fix that mysql.proc works with new VARCHAR fields

  sql/item.cc
    1.104.1.28 05/04/04 16:43:20 monty@mysql.com +7 -3
    Removed compiler warning
    Simple cleanup

  mysql-test/t/union.test
    1.84 05/04/04 16:43:20 monty@mysql.com +12 -0
    Test that UNION generates correct row format

  mysql-test/t/strict.test
    1.9.1.12 05/04/04 16:43:20 monty@mysql.com +19 -17
    enabled more tests
    Added more tests

  mysql-test/t/row.test
    1.18 05/04/04 16:43:20 monty@mysql.com +1 -1
    Moved test to get things to work with --ps-protocol

  mysql-test/r/union.result
    1.69 05/04/04 16:43:20 monty@mysql.com +17 -0
    Test that UNION generates correct row format

  mysql-test/r/strict.result
    1.12.1.11 05/04/04 16:43:20 monty@mysql.com +20 -0
    enabled more tests
    Added more tests

  mysql-test/r/row.result
    1.21 05/04/04 16:43:19 monty@mysql.com +3 -5
    Moved code around to get things to work with --ps-protocol
    Note that one on warning disappered, but it should appear again when bug #9600 is fixed

  mysql-test/r/func_time.result
    1.38 05/04/04 16:43:19 monty@mysql.com +14 -0
    New warnings

  configure.in
    1.279 05/04/04 16:43:19 monty@mysql.com +15 -5
    Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems when linking staticly

  BitKeeper/deleted/.del-merge.h~c3c34b8b88ec67ae
    1.6 05/04/04 15:36:45 serg@sergbook.mylan +0 -0
    Delete: include/merge.h

  BitKeeper/deleted/.del-nisam.h~5efa811281b55093
    1.6 05/04/04 15:35:58 serg@sergbook.mylan +0 -0
    Delete: include/nisam.h

  BitKeeper/deleted/.del-ha_isam.m4~7588b20d5625ce54
    1.3 05/04/04 15:26:14 serg@sergbook.mylan +0 -0
    Delete: config/ac-macros/ha_isam.m4

ChangeSet
  1.1860 05/04/04 18:04:29 bar@mysql.com +1 -0
  Merge mysql.com:/usr/home/bar/mysql-4.1
  into mysql.com:/usr/home/bar/mysql-5.0

  strings/ctype-uca.c
    1.33 05/04/04 18:04:27 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.1795.3 05/04/04 17:55:12 bar@mysql.com +2 -0
  ctype_uca.result:
    fixing test results accordingly.
  ctype-uca.c:
    It appeared that in traditional Spanish collation
    'RR' is not equal to 'R', as Unicode and Mimer state.
    We'll go Oracle and IBM way instead:
    No special rules to 'RR'.

  mysql-test/r/ctype_uca.result
    1.13 05/04/04 17:54:45 bar@mysql.com +2 -2
    fixing test results accordingly.

  strings/ctype-uca.c
    1.26.1.4 05/04/04 17:53:50 bar@mysql.com +1 -2
    It appeared that in traditional Spanish collation
    'RR' is not equal to 'R', as Unicode and Mimer state.
    We'll go Oracle and IBM way instead:
    No special rules to 'RR'.

ChangeSet
  1.1859 05/04/04 16:33:23 ramil@mysql.com +1 -0
  Fix for bit type:
  we have to handle bit fields as well.

  libmysql/libmysql.c
    1.206 05/04/04 16:33:17 ramil@mysql.com +2 -0
    Fix for bit type:
    we have to handle bit fields as well.

ChangeSet
  1.1858 05/04/04 12:12:50 gluh@eagle.intranet.mysql.r18.ru +2 -0
  Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
  into eagle.intranet.mysql.r18.ru:/home/gluh/MySQL/Bugs/mysql-5.0.9344

  sql/sql_show.cc
    1.231 05/04/04 12:12:44 gluh@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.302 05/04/04 12:12:32 gluh@eagle.intranet.mysql.r18.ru +0 -0
    auto-union

ChangeSet
  1.1853.4.1 05/04/04 03:49:10 petr@mysql.com +6 -0
  Enable IM in the binary distribution and fix Bug #9513 (mysql.server script from the binary distibution
  doesn't work out of the box)

  tools/Makefile.am
    1.18 05/04/04 03:49:06 petr@mysql.com +3 -3
    old mysqlmanager renamed into mysqltestmanager

  support-files/mysql.spec.sh
    1.95 05/04/04 03:49:06 petr@mysql.com +9 -4
    Fix mysql.spec template to reflect the name change

  server-tools/instance-manager/Makefile.am
    1.23 05/04/04 03:49:06 petr@mysql.com +1 -1
    change default socket name to follow mysqld style (and thus, fix the ptoblem with non-existant localstatedir
    in the binary distribution)

  scripts/make_binary_distribution.sh
    1.76 05/04/04 03:49:06 petr@mysql.com +6 -5
    Fix the script to include IM and process mysql.server correctly

  mysql-test/mysql-test-run.sh
    1.260.1.1 05/04/04 03:49:06 petr@mysql.com +6 -6
    Old mysqlmanager, mysqlmanagerc and mysqlmanager-pwgen renamed into
    mysqltestmanager, mysqltestmanagerc and mysqltestmanager-pwgen respectively

  client/Makefile.am
    1.46 05/04/04 03:49:06 petr@mysql.com +4 -2
    old mysqlmanager, mysqlmanagerc and mysqlmanager-pwgen renamed into mysqltestmanager, mysqltestmanagerc and
    mysqltestmanager-pwgen respectively

ChangeSet
  1.1850.2.1 05/04/04 00:50:05 serg@serg.mylan +12 -0
  XID SQL syntax
  minor cleanups
  XA tests

  mysql-test/t/xa.test
    1.1 05/04/04 00:49:54 serg@serg.mylan +57 -0

  mysql-test/t/xa.test
    1.0 05/04/04 00:49:54 serg@serg.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-5.0/mysql-test/t/xa.test

  mysql-test/r/xa.result
    1.1 05/04/04 00:49:53 serg@serg.mylan +45 -0

  mysql-test/r/xa.result
    1.0 05/04/04 00:49:53 serg@serg.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-5.0/mysql-test/r/xa.result

  sql/sql_yacc.yy
    1.357 05/04/04 00:49:52 serg@serg.mylan +82 -68
    XID SQL syntax
    cleanups

  sql/sql_parse.cc
    1.431.6.1 05/04/04 00:49:52 serg@serg.mylan +9 -9
    XID SQL syntax

  sql/sql_lex.h
    1.170.1.2 05/04/04 00:49:52 serg@serg.mylan +5 -4
    XID SQL syntax

  sql/sql_class.cc
    1.172.1.1 05/04/04 00:49:52 serg@serg.mylan +6 -4
    minor cleanup

  sql/lock.cc
    1.64 05/04/04 00:49:52 serg@serg.mylan +12 -5
    comments

  sql/item_sum.h
    1.82 05/04/04 00:49:52 serg@serg.mylan +1 -1
    minor cleanup

  sql/handler.h
    1.134 05/04/04 00:49:52 serg@serg.mylan +16 -7
    XID SQL syntax

  sql/handler.cc
    1.153.1.2 05/04/04 00:49:52 serg@serg.mylan +3 -6
    XID SQL syntax

  sql/field.cc
    1.248.2.1 05/04/04 00:49:52 serg@serg.mylan +2 -2
    minor cleanup

  include/m_ctype.h
    1.108 05/04/04 00:49:51 serg@serg.mylan +1 -1
    minor cleanup

ChangeSet
  1.1853.3.5 05/04/03 17:02:13 dlenev@brandersnatch.localdomain +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/dlenev/src/mysql-5.0-trg3

  sql/sql_table.cc
    1.231 05/04/03 17:02:08 dlenev@mysql.com +0 -0
    Auto merged

  sql/handler.cc
    1.155 05/04/03 17:02:08 dlenev@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1856 05/04/03 15:30:18 bell@sanja.is.com.ua +3 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
  into sanja.is.com.ua:/home/bell/mysql/bk/work-multi-5.0

  sql/sql_view.cc
    1.41 05/04/03 15:30:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/view.test
    1.64 05/04/03 15:30:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/view.result
    1.74 05/04/03 15:30:12 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1853.3.4 05/04/03 11:31:50 dlenev@brandersnatch.localdomain +1 -0
  Bug #3891 - "DROP TABLE many-unexistent-tables, was printing an error with
  %s instead of table names".
  
  Propagating changes from old language-specific errmsg.txt files to new
  global errmsg.txt.

  sql/share/errmsg.txt
    1.21 05/04/03 11:31:45 dlenev@mysql.com +24 -24
    Allow longer "table names" as DROP TABLE puts a list here.

ChangeSet
  1.1853.3.3 05/04/03 10:36:18 dlenev@mysql.com +10 -0
  Merge of patch for bug #3891 into 5.0 tree.

  sql/sql_table.cc
    1.229.2.1 05/04/03 10:36:14 dlenev@mysql.com +1 -2
    Manual merge.

  sql/field.h
    1.148.1.1 05/04/03 10:16:23 dlenev@mysql.com +0 -0
    Auto merged

  sql/field.cc
    1.248.1.1 05/04/03 10:16:22 dlenev@mysql.com +0 -0
    Auto merged

  mysql-test/t/type_timestamp.test
    1.24 05/04/03 10:16:22 dlenev@mysql.com +0 -0
    Auto merged

  mysql-test/t/drop.test
    1.19 05/04/03 10:16:22 dlenev@mysql.com +0 -0
    Auto merged

  mysql-test/r/type_timestamp.result
    1.26 05/04/03 10:16:21 dlenev@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-errmsg.txt~8ed1999cbd481dc4
    1.87 05/04/03 10:16:20 dlenev@mysql.com +0 -0
    Auto merged

  mysql-test/r/drop.result
    1.26 05/04/03 10:16:20 dlenev@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e
    1.135 05/04/03 10:16:20 dlenev@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-errmsg.txt~ef53c33ac0ff8a84
    1.122 05/04/03 10:16:20 dlenev@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-errmsg.txt~8ed1999cbd481dc4
    1.27.1.67 05/04/03 10:16:20 dlenev@mysql.com +0 -0
    Merge rename: sql/share/ukrainian/errmsg.txt -> BitKeeper/deleted/.del-errmsg.txt~8ed1999cbd481dc4

  BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e
    1.70.28.2 05/04/03 10:16:19 dlenev@mysql.com +0 -0
    Merge rename: sql/share/english/errmsg.txt -> BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e

  BitKeeper/deleted/.del-errmsg.txt~ef53c33ac0ff8a84
    1.61.1.67 05/04/03 10:16:19 dlenev@mysql.com +0 -0
    Merge rename: sql/share/russian/errmsg.txt -> BitKeeper/deleted/.del-errmsg.txt~ef53c33ac0ff8a84

ChangeSet
  1.1616.1795.2 05/04/03 10:05:01 dlenev@mysql.com +4 -0
  Manual merge of fix for bug #8894 "TIMESTAMP values scrambled/misaligned
  when using --new" into 4.1 tree.

  sql/field.h
    1.120.1.6 05/04/03 10:04:59 dlenev@mysql.com +0 -0
    Manual merge.

  sql/field.cc
    1.197.1.16 05/04/03 10:04:59 dlenev@mysql.com +0 -4
    Manual merge.

  mysql-test/t/type_timestamp.test
    1.22.1.1 05/04/03 10:04:59 dlenev@mysql.com +0 -13
    Manual merge.

  mysql-test/r/type_timestamp.result
    1.24.1.1 05/04/03 10:04:59 dlenev@mysql.com +0 -9
    Manual merge.

ChangeSet
  1.1855 05/04/03 01:23:45 bell@sanja.is.com.ua +4 -0
  - stackoverflow check added for view of view processing
  - fixed bug in join view processing
  - postreview fixes (BUG#9398 & BUG#8703)

  sql/table.h
    1.95 05/04/03 01:23:41 bell@sanja.is.com.ua +2 -1
    comment fixed
    new method for underlying base table finding

  sql/table.cc
    1.158 05/04/03 01:23:41 bell@sanja.is.com.ua +32 -1
    comment fixed
    stack overflow check added
    new method for underlying base table finding

  sql/sql_view.cc
    1.38.1.1 05/04/03 01:23:41 bell@sanja.is.com.ua +4 -4
    fixed bug of assigning select_lex for join view

  sql/sql_base.cc
    1.232 05/04/03 01:23:40 bell@sanja.is.com.ua +24 -21
    used original TABLE object to get correct name of table and db

ChangeSet
  1.1616.1794.2 05/04/02 21:36:50 serg@serg.mylan +1 -0
  results updated

  mysql-test/r/drop.result
    1.19.1.3 05/04/02 21:36:44 serg@serg.mylan +2 -2
    results updated

ChangeSet
  1.1616.1794.1 05/04/02 20:28:58 serg@serg.mylan +6 -0
  merged

  sql/sql_table.cc
    1.157.2.119 05/04/02 20:28:51 serg@serg.mylan +2 -3
    merged

  sql/share/ukrainian/errmsg.txt
    1.27.1.66 05/04/02 20:20:16 serg@serg.mylan +0 -0
    Auto merged

  sql/share/russian/errmsg.txt
    1.61.1.66 05/04/02 20:20:16 serg@serg.mylan +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.70.28.1 05/04/02 20:20:16 serg@serg.mylan +0 -0
    Auto merged

  mysql-test/t/drop.test
    1.16.1.2 05/04/02 20:20:16 serg@serg.mylan +0 -1
    Auto merged

  mysql-test/r/drop.result
    1.19.1.2 05/04/02 20:20:16 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1346.823.1 05/04/02 20:13:19 serg@serg.mylan +6 -0
  bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
  sql/sql_table.cc: print an error with a function that respects width modifiers (%.64s)

  sql/sql_table.cc
    1.112.16.1 05/04/02 20:13:16 serg@serg.mylan +2 -1
    print an error with a function that respects width modifiers (%.64s)

  sql/share/ukrainian/errmsg.txt
    1.11.1.15 05/04/02 20:13:16 serg@serg.mylan +1 -1
    allow longer "table names" as DROP TABLE puts a list here

  sql/share/russian/errmsg.txt
    1.45.1.16 05/04/02 20:13:15 serg@serg.mylan +1 -1
    allow longer "table names" as DROP TABLE puts a list here

  sql/share/english/errmsg.txt
    1.51.1.23 05/04/02 20:13:15 serg@serg.mylan +1 -1
    allow longer "table names" as DROP TABLE puts a list here

  mysql-test/t/drop.test
    1.10.1.2 05/04/02 20:13:15 serg@serg.mylan +23 -0
    bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names

  mysql-test/r/drop.result
    1.10.1.2 05/04/02 20:13:15 serg@serg.mylan +14 -0
    bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names

ChangeSet
  1.1853.3.2 05/04/02 18:45:44 bell@sanja.is.com.ua +1 -0
  postreview patch

  sql/sql_view.cc
    1.40 05/04/02 18:45:39 bell@sanja.is.com.ua +4 -4
    wording fixed

ChangeSet
  1.1853.3.1 05/04/02 18:05:00 bell@sanja.is.com.ua +3 -0
  fix of required privileges for altering view VIEW (DELETE->DROP) (BUG#9260)

  sql/sql_view.cc
    1.39 05/04/02 18:03:34 bell@sanja.is.com.ua +3 -3
    fix of required privileges for altering view VIEW (DELETE->DROP)

  mysql-test/t/view.test
    1.62.1.1 05/04/02 18:03:34 bell@sanja.is.com.ua +11 -1
    fix of required privileges for altering view VIEW (DELETE->DROP)
    new test of altering view

  mysql-test/r/view.result
    1.71.1.2 05/04/02 18:03:34 bell@sanja.is.com.ua +6 -2
    fix of required privileges for altering view VIEW (DELETE->DROP)
    new test of altering view

ChangeSet
  1.1853.2.5 05/04/01 19:17:15 jimw@mysql.com +41 -0
  Merge embedded server testing changes from 4.1.

  mysql-test/t/user_var.test
    1.25 05/04/01 19:17:13 jimw@mysql.com +0 -0
    Merge

  mysql-test/t/type_ranges.test
    1.10.2.1 05/04/01 19:17:13 jimw@mysql.com +1 -1
    Merge

  mysql-test/t/timezone2.test
    1.7 05/04/01 19:17:13 jimw@mysql.com +1 -1
    Merge

  mysql-test/t/insert_select.test
    1.19 05/04/01 19:17:13 jimw@mysql.com +0 -0
    Merge

  mysql-test/t/grant.test
    1.29 05/04/01 19:17:13 jimw@mysql.com +5 -6
    Merge

  mysql-test/t/ctype_ucs.test
    1.28 05/04/01 19:17:13 jimw@mysql.com +0 -2
    Merge

  mysql-test/r/user_var.result
    1.30 05/04/01 19:17:13 jimw@mysql.com +0 -0
    Update results

  mysql-test/r/type_ranges.result
    1.30.2.1 05/04/01 19:17:13 jimw@mysql.com +63 -81
    Update results

  mysql-test/r/type_blob.result
    1.43.1.5 05/04/01 19:17:13 jimw@mysql.com +4 -6
    Update results

  mysql-test/r/timezone2.result
    1.11 05/04/01 19:17:13 jimw@mysql.com +0 -0
    Update results

  mysql-test/r/select.result
    1.55 05/04/01 19:17:13 jimw@mysql.com +12 -24
    Update results

  mysql-test/r/ps_1general.result
    1.35.1.1 05/04/01 19:17:13 jimw@mysql.com +0 -0
    Update results

  mysql-test/r/insert_select.result
    1.27 05/04/01 19:17:13 jimw@mysql.com +0 -0
    Update results

  mysql-test/r/grant.result
    1.37.1.2 05/04/01 19:17:13 jimw@mysql.com +8 -8
    Update results

  mysql-test/r/ctype_ucs.result
    1.33 05/04/01 19:17:13 jimw@mysql.com +0 -9
    Update results

  mysql-test/r/alter_table.result
    1.47 05/04/01 19:17:13 jimw@mysql.com +3 -6
    Update results

  mysql-test/mysql-test-run.sh
    1.261 05/04/01 19:17:13 jimw@mysql.com +0 -6
    Merge

  sql/sql_select.cc
    1.305.1.4 05/04/01 19:02:07 jimw@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.431.5.1 05/04/01 19:02:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/variables.test
    1.38 05/04/01 19:02:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/type_float.test
    1.20 05/04/01 19:02:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/type_blob.test
    1.25.1.1 05/04/01 19:02:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/system_mysql_db_fix.test
    1.13 05/04/01 19:02:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/show_check.test
    1.46 05/04/01 19:02:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/select.test
    1.42 05/04/01 19:02:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/ps_1general.test
    1.19.1.1 05/04/01 19:02:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/mysqldump.test
    1.32 05/04/01 19:02:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/mysqlbinlog2.test
    1.6 05/04/01 19:02:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/mysqlbinlog.test
    1.17 05/04/01 19:02:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/mix_innodb_myisam_binlog.test
    1.14 05/04/01 19:02:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.83 05/04/01 19:02:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/grant_cache.test
    1.12 05/04/01 19:02:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/grant2.test
    1.24 05/04/01 19:02:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/connect.test
    1.12 05/04/01 19:02:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/alter_table.test
    1.35 05/04/01 19:02:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/variables.result
    1.60 05/04/01 19:02:07 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/type_float.result
    1.36 05/04/01 19:02:07 jimw@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-type_ranges.result.es~bb77517f4c9dc978
    1.5 05/04/01 19:02:06 jimw@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-type_float.result.es~a5533e4118eadc04
    1.10 05/04/01 19:02:06 jimw@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-select.result.es~240635f6a3f1a079
    1.5 05/04/01 19:02:06 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.105 05/04/01 19:02:06 jimw@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-type_ranges.result.es~bb77517f4c9dc978
    1.4 05/04/01 19:02:06 jimw@mysql.com +0 -0
    Merge rename: mysql-test/r/type_ranges.result.es -> BitKeeper/deleted/.del-type_ranges.result.es~bb77517f4c9dc978

  BitKeeper/deleted/.del-type_float.result.es~a5533e4118eadc04
    1.9 05/04/01 19:02:06 jimw@mysql.com +0 -0
    Merge rename: mysql-test/r/type_float.result.es -> BitKeeper/deleted/.del-type_float.result.es~a5533e4118eadc04

  BitKeeper/deleted/.del-select.result.es~240635f6a3f1a079
    1.4 05/04/01 19:02:06 jimw@mysql.com +0 -0
    Merge rename: mysql-test/r/select.result.es -> BitKeeper/deleted/.del-select.result.es~240635f6a3f1a079

ChangeSet
  1.1616.1792.3 05/04/01 19:00:14 jimw@mysql.com +3 -0
  Clean up merge of fix for Bug #9468.

  sql/sql_parse.cc
    1.271.1.161 05/04/01 19:00:11 jimw@mysql.com +3 -0
    Reset server status after a single statement in a multistatement
    query is handled in embedded server so it is not logged twice to
    the slow query log.

  mysql-test/t/skip_name_resolve.test
    1.2 05/04/01 19:00:11 jimw@mysql.com +3 -0
    Disable test with embedded server

  mysql-test/t/lowercase_table_grant.test
    1.2 05/04/01 19:00:11 jimw@mysql.com +3 -0
    Disable test with embedded server

ChangeSet
  1.1853.2.4 05/04/02 03:35:28 kent@mysql.com +1 -0
  mysqld.dsp:
    Corrected wrong exe naming from bad merge

  VC++Files/sql/mysqld.dsp
    1.30 05/04/02 03:34:18 kent@mysql.com +2 -2
    Corrected wrong exe naming from bad merge

ChangeSet
  1.1616.1792.2 05/04/01 16:43:35 jimw@mysql.com +18 -0
  Merge embedded-server testing changes.

  mysql-test/t/ps_1general.test
    1.3.1.11 05/04/01 16:43:33 jimw@mysql.com +1 -2
    Merge changes

  mysql-test/mysql-test-run.sh
    1.208.1.40 05/04/01 16:43:33 jimw@mysql.com +6 -0
    Merge changes

  sql/sql_select.cc
    1.216.1.177 05/04/01 16:41:50 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/variables.test
    1.18.1.28 05/04/01 16:41:50 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/user_var.test
    1.13.1.6 05/04/01 16:41:50 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/type_float.test
    1.15.1.3 05/04/01 16:41:50 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/show_check.test
    1.33.2.3 05/04/01 16:41:50 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/select.test
    1.28.1.7 05/04/01 16:41:50 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/mysqldump.test
    1.19.1.9 05/04/01 16:41:49 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/grant2.test
    1.7.1.4 05/04/01 16:41:49 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/ctype_ucs.test
    1.15.1.6 05/04/01 16:41:49 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/variables.result
    1.21.1.37 05/04/01 16:41:49 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/user_var.result
    1.14.2.9 05/04/01 16:41:49 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/type_float.result
    1.25.1.6 05/04/01 16:41:49 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/type_blob.result
    1.40.1.5 05/04/01 16:41:49 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/select.result
    1.34.3.14 05/04/01 16:41:49 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/ps_1general.result
    1.1.1.18 05/04/01 16:41:49 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/ctype_ucs.result
    1.11.1.12 05/04/01 16:41:49 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.1793.1 05/04/01 16:09:20 jimw@mysql.com +1 -0
  Fix handling of max_allowed_packet and net_buffer_length in
  embedded server when a size suffix (K, M, G) is added. (Bug #9472)

  sql/mysqld.cc
    1.356.91.1 05/04/01 16:09:18 jimw@mysql.com +3 -10
    Instead of (re)parsing max_allowed_packet and net_buffer_length
    for the embedded server, just set the global variables to what
    is set in global_system_variables within get_options().

ChangeSet
  1.1853.2.3 05/04/01 22:14:30 mskold@mysql.com +2 -0
  Added more types

  mysql-test/t/ndb_types.test
    1.3 05/04/01 22:14:04 mskold@mysql.com +12 -9
    Added more types

  mysql-test/r/ndb_types.result
    1.3 05/04/01 22:14:04 mskold@mysql.com +16 -13
    Added more types

ChangeSet
  1.1853.2.2 05/04/01 20:58:25 mskold@mysql.com +1 -0
  Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

  sql/ha_ndbcluster.cc
    1.169 05/04/01 20:58:23 mskold@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.1640.14 05/04/01 09:13:20 jimw@mysql.com +2 -0
  Fix the new ps_grant test to clean itself up properly.

  mysql-test/t/ps_grant.test
    1.2 05/04/01 09:13:17 jimw@mysql.com +0 -1
    Fix cleanup of test

  mysql-test/r/ps_grant.result
    1.2 05/04/01 09:13:17 jimw@mysql.com +0 -1
    Update results

ChangeSet
  1.1616.1791.1 05/04/01 18:56:45 joerg@mysql.com +15 -0
  Merge changesets constituting 4.1.10a back into main tree, including release label.

  sql/share/english/errmsg.txt
    1.70.27.1 05/04/01 18:56:42 joerg@mysql.com +0 -1
    No change to main source when integrating 4.1.10a.

  sql/mysqld.cc
    1.356.73.43 05/04/01 18:56:42 joerg@mysql.com +0 -9
    No change to main source when integrating 4.1.10a.

  sql/mysql_priv.h
    1.186.91.17 05/04/01 18:56:42 joerg@mysql.com +0 -1
    No change to main source when integrating 4.1.10a.

  scripts/mysql_create_system_tables.sh
    1.7.1.13 05/04/01 18:56:42 joerg@mysql.com +0 -1
    No change to main source when integrating 4.1.10a.

  myisam/mi_create.c
    1.37.1.7 05/04/01 18:56:42 joerg@mysql.com +0 -7
    No change to main source when integrating 4.1.10a.

  configure.in
    1.201.1.156 05/04/01 18:56:42 joerg@mysql.com +0 -1
    No change to main source when integrating 4.1.10a.

  support-files/mysql.spec.sh
    1.83.1.6 05/04/01 18:52:00 joerg@mysql.com +0 -8
    Auto merged

  sql/table.cc
    1.111.1.16 05/04/01 18:50:36 joerg@mysql.com +0 -5
    Auto merged

  sql/sql_udf.cc
    1.37.1.3 05/04/01 18:50:35 joerg@mysql.com +0 -45
    Auto merged

  sql/ha_myisam.cc
    1.115.1.40 05/04/01 18:48:27 joerg@mysql.com +0 -11
    Auto merged

  mysys/mf_tempfile.c
    1.24 05/04/01 18:46:34 joerg@mysql.com +0 -4
    Auto merged

  myisammrg/myrg_create.c
    1.10 05/04/01 18:46:34 joerg@mysql.com +0 -1
    Auto merged

  merge/mrg_create.c
    1.6.3.1 05/04/01 18:45:03 joerg@mysql.com +0 -1
    Auto merged

  isam/create.c
    1.10.3.1 05/04/01 18:45:03 joerg@mysql.com +0 -3
    Auto merged

  include/my_global.h
    1.47.1.34 05/04/01 18:45:03 joerg@mysql.com +0 -3
    Auto merged

ChangeSet
  1.1616.1660.7 05/04/01 18:38:19 joerg@mysql.com +5 -0
  Last minor things to finish MySQL 4.1.10a:
  - some wordings,
  - RPM packaging improvements.

  support-files/mysql.spec.sh
    1.83.2.1 05/04/01 18:38:16 joerg@mysql.com +8 -2
    Fix date formatting, add missing change descriptions.

  sql/sql_udf.cc
    1.37.2.3 05/04/01 18:38:16 joerg@mysql.com +6 -6
    Fix an erroneous takeover of 4.0 wording.

  sql/mysqld.cc
    1.356.90.3 05/04/01 18:38:15 joerg@mysql.com +2 -2
    Correct a message text; align variable order with other versions.

  scripts/mysql_create_system_tables.sh
    1.7.4.1 05/04/01 18:38:15 joerg@mysql.com +1 -3
    Security change: Reduce the risk caused by predefined anonymous logins.

  configure.in
    1.201.48.1 05/04/01 18:38:15 joerg@mysql.com +1 -1
    Set the version string.

ChangeSet
  1.1616.1790.1 05/04/01 17:59:46 mskold@mysql.com +3 -0
  Fix for bug#9435: TIMESTAMP columns don't update

  sql/ha_ndbcluster.cc
    1.114.3.20 05/04/01 17:59:28 mskold@mysql.com +4 -0
    Fix for bug#9435: TIMESTAMP columns don't update

  mysql-test/t/ndb_types.test
    1.2 05/04/01 17:59:28 mskold@mysql.com +36 -4
    Fix for bug#9435: TIMESTAMP columns don't update

  mysql-test/r/ndb_types.result
    1.2 05/04/01 17:59:28 mskold@mysql.com +39 -3
    Fix for bug#9435: TIMESTAMP columns don't update

ChangeSet
  1.1853.2.1 05/04/01 08:35:33 reggie@mdk10.(none) +1 -0
  Merge

  client/mysqldump.c
    1.175 05/04/01 08:33:35 reggie@mdk10.(none) +21 -27
    merged changes for bug #9175

ChangeSet
  1.1853.1.2 05/04/01 15:06:35 monty@mysql.com +7 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/my/mysql-5.0

  sql/sql_parse.cc
    1.431.1.6 05/04/01 15:06:32 monty@mysql.com +0 -0
    Auto merged

  sql/item.h
    1.112 05/04/01 15:06:32 monty@mysql.com +0 -0
    Auto merged

  sql/item.cc
    1.104.1.27 05/04/01 15:06:32 monty@mysql.com +0 -0
    Auto merged

  sql/field.h
    1.149 05/04/01 15:06:32 monty@mysql.com +0 -0
    Auto merged

  sql/field.cc
    1.249 05/04/01 15:06:31 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.95 05/04/01 15:06:31 monty@mysql.com +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.109 05/04/01 15:06:31 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1842.7.1 05/04/01 15:04:50 monty@mysql.com +42 -0
  Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902)
  CAST() now produces warnings when casting a wrong INTEGER or CHAR values. This also applies to implicite string to number casts. (Bug #5912)
  ALTER TABLE now fails in STRICT mode if it generates warnings.
  Inserting a zero date in a DATE, DATETIME or TIMESTAMP column during TRADITIONAL mode now produces an error. (Bug #5933)

  sql/sql_error.h
    1.1 05/04/01 15:04:45 monty@mysql.com +42 -0

  sql/unireg.cc
    1.52 05/04/01 15:04:45 monty@mysql.com +17 -5
    Removed one call to current_thd
    Give errors if one uses a wrong DEFAULT value

  sql/time.cc
    1.55 05/04/01 15:04:45 monty@mysql.com +3 -3
    Fixed possible wrong call

  sql/sql_table.cc
    1.229.1.1 05/04/01 15:04:45 monty@mysql.com +36 -26
    Made mysql_prepare_table() static
    Changed references to pointers to make code more readable
    ALTER TABLE now aborts if one gets warnings in STRICT mode

  sql/sql_error.h
    1.0 05/04/01 15:04:45 monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.0/sql/sql_error.h

  sql/sql_parse.cc
    1.431.4.1 05/04/01 15:04:44 monty@mysql.com +4 -3
    Fixed wrong printf()

  sql/sql_load.cc
    1.78 05/04/01 15:04:44 monty@mysql.com +1 -1
    Removed wrong cast

  sql/sql_class.h
    1.227.1.1 05/04/01 15:04:44 monty@mysql.com +0 -21
    Moved to sql_error.h

  sql/mysqld.cc
    1.447 05/04/01 15:04:44 monty@mysql.com +2 -2
    Simplify code

  sql/mysql_priv.h
    1.283.1.1 05/04/01 15:04:44 monty@mysql.com +1 -14
    Removed prototype for static function
    Moved defines for error handling to sql_error.h (to be able to use these in field.h)

  sql/my_decimal.cc
    1.8 05/04/01 15:04:44 monty@mysql.com +1 -1
    Fixed typo in comment

  sql/item_timefunc.cc
    1.78 05/04/01 15:04:44 monty@mysql.com +22 -14
    Give warnings for wrong CAST of number -> string

  sql/item_sum.cc
    1.136 05/04/01 15:04:44 monty@mysql.com +1 -2
    Better detection of null values (which doesn't produce warnings)

  sql/item_row.cc
    1.29 05/04/01 15:04:44 monty@mysql.com +2 -2
    Better detection of null values (which doesn't produce warnings)

  sql/item.h
    1.108.2.1 05/04/01 15:04:44 monty@mysql.com +2 -15
    Moved Item_string::val_real() and ::val_int() to item.cc

  sql/item.cc
    1.104.17.1 05/04/01 15:04:44 monty@mysql.com +57 -3
    Removed compiler warnings
    Give warnings for wrong CAST of strings -> number

  sql/field_conv.cc
    1.43 05/04/01 15:04:44 monty@mysql.com +14 -2
    Copy date and datetime fields through string in 'traditional' mode to detect zero dates

  sql/field.h
    1.146.1.1 05/04/01 15:04:44 monty@mysql.com +4 -4
    Changed type for 'level' in set_warning() to avoid casts

  sql/field.cc
    1.247.1.1 05/04/01 15:04:44 monty@mysql.com +100 -50
    Added warnings for zero dates for DATE, DATETIME and TIMESTAMP
    Moved Field_blob::max_length() to a more appropriate position
    Changed type for 'level' in set_warning() to avoid casts

  sql/Makefile.am
    1.105 05/04/01 15:04:44 monty@mysql.com +1 -1
    Added new include file

  mysql-test/t/type_ranges.test
    1.10.1.1 05/04/01 15:04:44 monty@mysql.com +1 -1
    Changed tests to produce less warnings

  mysql-test/t/subselect.test
    1.92.1.1 05/04/01 15:04:44 monty@mysql.com +2 -2
    Changed tests to produce less warnings

  mysql-test/t/strict.test
    1.9.1.11 05/04/01 15:04:44 monty@mysql.com +52 -0
    New tests for CAST() and zero date handling

  mysql-test/t/rpl_session_var.test
    1.3 05/04/01 15:04:44 monty@mysql.com +1 -1
    Changed tests to produce less warnings

  mysql-test/t/ps_1general.test
    1.20 05/04/01 15:04:44 monty@mysql.com +2 -2
    Changed tests to produce less warnings

  mysql-test/t/ndb_index_unique.test
    1.14 05/04/01 15:04:44 monty@mysql.com +4 -4
    Removed wrong default usage

  mysql-test/t/func_str.test
    1.71 05/04/01 15:04:44 monty@mysql.com +2 -3
    Added missing drop table
    Changed test to produce less warnings
    New warnings

  mysql-test/t/func_if.test
    1.11 05/04/01 15:04:44 monty@mysql.com +3 -2
    Changed tests to produce less warnings

  mysql-test/t/create.test
    1.51 05/04/01 15:04:43 monty@mysql.com +15 -4
    Added test for wrong default values (#5902)

  mysql-test/t/cast.test
    1.18 05/04/01 15:04:43 monty@mysql.com +13 -0
    Added testing of wrong CAST's of strings to numbers and numbers to strings

  mysql-test/r/type_ranges.result
    1.30.1.2 05/04/01 15:04:43 monty@mysql.com +3 -3
    Changed tests to produce less warnings

  mysql-test/r/subselect.result
    1.107.1.1 05/04/01 15:04:43 monty@mysql.com +7 -5
    Changed tests to produce less warnings

  mysql-test/r/strict.result
    1.12.1.10 05/04/01 15:04:43 monty@mysql.com +64 -0
    New tests for CAST() and zero date handling

  mysql-test/r/rpl_session_var.result
    1.3 05/04/01 15:04:43 monty@mysql.com +3 -3
    Changed tests to produce less warnings

  mysql-test/r/row.result
    1.20 05/04/01 15:04:43 monty@mysql.com +5 -0
    New warnings

  mysql-test/r/ps_1general.result
    1.36 05/04/01 15:04:43 monty@mysql.com +8 -8
    Changed tests to produce less warnings

  mysql-test/r/ndb_index_unique.result
    1.16 05/04/01 15:04:43 monty@mysql.com +4 -4
    Removed wrong default usage

  mysql-test/r/func_str.result
    1.97 05/04/01 15:04:43 monty@mysql.com +6 -4
    Added missing drop table
    Changed test to produce less warnings
    New warnings

  mysql-test/r/func_misc.result
    1.17 05/04/01 15:04:43 monty@mysql.com +2 -0
    New warning

  mysql-test/r/func_if.result
    1.17 05/04/01 15:04:43 monty@mysql.com +11 -6
    Changed tests to produce less warnings

  mysql-test/r/create.result
    1.83 05/04/01 15:04:43 monty@mysql.com +15 -3
    Added test for wrong default values (#5902)

  mysql-test/r/cast.result
    1.26 05/04/01 15:04:43 monty@mysql.com +68 -0
    Added testing of wrong CAST's of strings to numbers and numbers to strings

  mysql-test/r/bigint.result
    1.26 05/04/01 15:04:43 monty@mysql.com +2 -0
    New warning added

ChangeSet
  1.1853.1.1 05/04/01 12:40:54 msvensson@neptunus.(none) +2 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
  into neptunus.(none):/home/msvensson/mysql/mysql-5.0

  sql/ha_berkeley.cc
    1.144 05/04/01 12:40:52 msvensson@neptunus.(none) +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.301 05/04/01 12:40:42 msvensson@neptunus.(none) +0 -0
    auto-union

ChangeSet
  1.1616.1773.22 05/04/01 12:35:49 msvensson@neptunus.(none) +2 -0
  Manual merge

  sql/ha_berkeley.cc
    1.117.1.31 05/04/01 12:35:47 msvensson@neptunus.(none) +0 -3
    Manual merge, fix already applied to 4.1

  BitKeeper/etc/logging_ok
    1.233.47.21 05/04/01 12:34:09 msvensson@neptunus.(none) +0 -1
    auto-union

ChangeSet
  1.1346.821.5 05/04/01 12:32:47 msvensson@neptunus.(none) +2 -0
  BUG#6554 Problem Building MySql on Fedora Core 3
   - Remove the local static var

  BitKeeper/etc/logging_ok
    1.206.1.127 05/04/01 12:32:47 msvensson@neptunus.(none) +1 -0
    Logging to logging@openlogging.org accepted

  sql/ha_berkeley.cc
    1.105.1.13 05/04/01 12:32:42 msvensson@neptunus.(none) +3 -1
    Remove local static var, make it local in file instead.

ChangeSet
  1.1854 05/04/01 13:02:29 bell@sanja.is.com.ua +6 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
  into sanja.is.com.ua:/home/bell/mysql/bk/work-multi-5.0

  sql/sql_select.cc
    1.307 05/04/01 13:02:22 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.110 05/04/01 13:02:22 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.433 05/04/01 13:02:22 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.h
    1.172 05/04/01 13:02:22 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_derived.cc
    1.71 05/04/01 13:02:22 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/view.result
    1.73 05/04/01 13:02:22 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1853 05/04/01 11:21:55 pekka@mysql.com +1 -0
  merge

  ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
    1.45 05/04/01 11:21:29 pekka@mysql.com +0 -20
    merge

ChangeSet
  1.1850.1.1 05/04/01 11:15:11 msvensson@neptunus.(none) +7 -0
  Merge

  sql/ha_ndbcluster.cc
    1.168 05/04/01 11:15:09 msvensson@neptunus.(none) +0 -0
    SCCS merged

  sql/item_cmpfunc.h
    1.97 05/04/01 11:10:45 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/ha_berkeley.cc
    1.143 05/04/01 11:10:44 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/join_outer.test
    1.25 05/04/01 11:10:44 msvensson@neptunus.(none) +0 -1
    Auto merged

  mysql-test/r/join_outer.result
    1.36 05/04/01 11:10:44 msvensson@neptunus.(none) +0 -6
    Auto merged

  configure.in
    1.278 05/04/01 11:10:44 msvensson@neptunus.(none) +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.300 05/04/01 11:10:25 msvensson@neptunus.(none) +0 -0
    auto-union

ChangeSet
  1.1851 05/04/01 10:13:37 pekka@mysql.com +10 -0
  Merge

  support-files/mysql.server.sh
    1.41 05/04/01 10:13:28 pekka@mysql.com +1 -2
    merge

  sql/item_cmpfunc.cc
    1.143 05/04/01 10:07:51 pekka@mysql.com +2 -4
    merge

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.40 05/04/01 10:03:23 pekka@mysql.com +0 -2
    merge

  sql/sql_select.cc
    1.305.1.3 05/04/01 10:00:40 pekka@mysql.com +0 -0
    Auto merged

  sql/item_subselect.h
    1.67 05/04/01 10:00:35 pekka@mysql.com +0 -0
    Auto merged

  sql/item.h
    1.111 05/04/01 10:00:34 pekka@mysql.com +0 -0
    Auto merged

  sql/item.cc
    1.104.1.26 05/04/01 10:00:33 pekka@mysql.com +0 -0
    Auto merged

  scripts/make_win_src_distribution.sh
    1.34 05/04/01 10:00:32 pekka@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
    1.44 05/04/01 10:00:30 pekka@mysql.com +0 -0
    Auto merged

  mysql-test/r/group_by.result
    1.47 05/04/01 10:00:28 pekka@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.1773.21 05/04/01 11:05:17 sergefp@mysql.com +1 -0
  Better comment

  sql/sql_select.cc
    1.216.1.176 05/04/01 11:05:14 sergefp@mysql.com +3 -2
    Better comment

ChangeSet
  1.1850 05/04/01 02:15:40 bell@sanja.is.com.ua +5 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
  into sanja.is.com.ua:/home/bell/mysql/bk/work-union_merge-5.0

  sql/sql_parse.cc
    1.431.1.5 05/04/01 02:15:32 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.h
    1.66 05/04/01 02:15:31 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.110 05/04/01 02:15:31 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.104.1.25 05/04/01 02:15:31 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/field.cc
    1.248 05/04/01 02:15:30 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1842.3.2 05/04/01 02:14:30 bell@sanja.is.com.ua +14 -0
  postmerge 4.1->5.0 fixes

  sql/sql_view.cc
    1.38 05/04/01 02:13:23 bell@sanja.is.com.ua +1 -1
    added new parameter

  sql/sql_derived.cc
    1.69.1.2 05/04/01 02:13:23 bell@sanja.is.com.ua +1 -1
    fixed typo of manual merge

  sql/item_subselect.h
    1.64.1.2 05/04/01 02:13:23 bell@sanja.is.com.ua +3 -1
    fixed type

  sql/item_subselect.cc
    1.99 05/04/01 02:13:23 bell@sanja.is.com.ua +37 -7
    added forgoten methods

  sql/item_func.h
    1.104 05/04/01 02:13:23 bell@sanja.is.com.ua +1 -2
    item type name fixed

  sql/item_cmpfunc.cc
    1.142 05/04/01 02:13:23 bell@sanja.is.com.ua +1 -1
    fixed type

  sql/item.h
    1.108.1.2 05/04/01 02:13:23 bell@sanja.is.com.ua +1 -1
    fixed method definition

  sql/item.cc
    1.104.16.2 05/04/01 02:13:23 bell@sanja.is.com.ua +44 -9
    support of new types added to merge of union types routines

  sql/field.h
    1.148 05/04/01 02:13:23 bell@sanja.is.com.ua +1 -3
    removed non-existent methods
    added wrongly deleted during manual merge string

  sql/field.cc
    1.245.1.2 05/04/01 02:13:22 bell@sanja.is.com.ua +391 -248
    new 5.0 types support
    temporary table/db names detection in field fixed

  mysql-test/t/subselect.test
    1.94 05/04/01 02:13:22 bell@sanja.is.com.ua +1 -1
    fixed mistake of merge

  mysql-test/r/view.result
    1.71.1.1 05/04/01 02:13:22 bell@sanja.is.com.ua +1 -1
    result change

  mysql-test/r/union.result
    1.68 05/04/01 02:13:22 bell@sanja.is.com.ua +2 -2
    result change

  mysql-test/r/group_by.result
    1.46 05/04/01 02:13:22 bell@sanja.is.com.ua +1 -1
    result change

ChangeSet
  1.1616.1660.6 05/03/31 22:02:05 joerg@mysql.com +1 -0
  Fix for a build bug.
  Added a missing comma.
  
  Originally contained in 2005/03/04 09:30:22+01:00 ingo@mysql.com;
  contained in MySQL 4.1.10a;
  re-committed for archival purposes.

  myisam/mi_create.c
    1.37.4.2 05/03/31 22:02:02 joerg@mysql.com +1 -1
    Fix for a build bug.
    Added a missing comma.

ChangeSet
  1.1616.1660.5 05/03/31 21:57:46 joerg@mysql.com +1 -0
  after merge fixes
  
  Originally contained in 2005/03/03 23:57:48+01:00 serg@serg.mylan;
  contained in MySQL 4.1.10a;
  re-committed for archival purposes.

  sql/sql_udf.cc
    1.37.2.2 05/03/31 21:57:43 joerg@mysql.com +6 -6
    after merge fixes

ChangeSet
  1.1616.1660.4 05/03/31 21:47:18 joerg@mysql.com +1 -0
  typos fixed
  
  Originally contained in 2005/03/03 23:10:23+01:00 serg@serg.mylan;
  contained in MySQL 4.1.10a;
  re-committed for archival purposes.

  sql/mysqld.cc
    1.356.90.2 05/03/31 21:47:15 joerg@mysql.com +2 -2
    typos fixed

ChangeSet
  1.1616.1660.3 05/03/31 21:44:48 joerg@mysql.com +1 -0
  uninit variable fixed
  
  Originally contained in 2005/03/03 21:13:33+01:00 serg@serg.mylan;
  contained in MySQL 4.1.10a;
  re-committed for archival purposes.

  sql/ha_myisam.cc
    1.115.12.2 05/03/31 21:44:44 joerg@mysql.com +1 -1
    uninit variable fixed

ChangeSet
  1.1616.1660.2 05/03/31 21:41:07 joerg@mysql.com +12 -0
  Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)
  
  Originally contained in 2005/03/03 19:51:29+01:00 serg@serg.mylan;
  contained in MySQL 4.1.10a;
  re-committed for archival purposes.

  sql/table.cc
    1.111.3.1 05/03/31 21:41:03 joerg@mysql.com +5 -1
    create frm of temporary table with O_EXCL|O_NOFOLLOW

  sql/sql_udf.cc
    1.37.2.1 05/03/31 21:41:03 joerg@mysql.com +66 -33
    --allow_suspicious_udfs
    don't allow xxx() udf without any of xxx_init/deinit/add/reset
    check paths when loading from mysql.func

  sql/share/english/errmsg.txt
    1.70.26.1 05/03/31 21:41:03 joerg@mysql.com +1 -1
    typo

  sql/mysqld.cc
    1.356.90.1 05/03/31 21:41:03 joerg@mysql.com +9 -1
    --allow_suspicious_udfs

  sql/mysql_priv.h
    1.186.98.1 05/03/31 21:41:03 joerg@mysql.com +1 -1
    --allow_suspicious_udfs

  sql/ha_myisam.cc
    1.115.12.1 05/03/31 21:41:03 joerg@mysql.com +11 -7
    let mi_create know if the table is TEMPORARY

  mysys/mf_tempfile.c
    1.22.1.1 05/03/31 21:41:03 joerg@mysql.com +4 -4
    create temporary files with O_EXCL|O_NOFOLLOW

  myisammrg/myrg_create.c
    1.8.1.1 05/03/31 21:41:03 joerg@mysql.com +1 -1
    create table files with O_EXCL|O_NOFOLLOW

  myisam/mi_create.c
    1.37.4.1 05/03/31 21:41:03 joerg@mysql.com +7 -7
    create files of temporary tables with O_EXCL|O_NOFOLLOW

  merge/mrg_create.c
    1.6.2.1 05/03/31 21:41:03 joerg@mysql.com +1 -1
    create table files with O_EXCL|O_NOFOLLOW

  isam/create.c
    1.10.2.1 05/03/31 21:41:03 joerg@mysql.com +3 -2
    create table files with O_EXCL|O_NOFOLLOW

  include/my_global.h
    1.47.9.1 05/03/31 21:41:03 joerg@mysql.com +3 -0
    O_NOFOLLOW

ChangeSet
  1.1842.6.1 05/04/01 00:03:26 svoj@mysql.com +3 -0
  BUG#9521 fix:
  openssl_1 and rpl_openssl results difference

  mysql-test/t/openssl_1.test
    1.9 05/04/01 00:03:23 svoj@mysql.com +4 -4
    Fix expected error codes.

  mysql-test/r/rpl_openssl.result
    1.8 05/04/01 00:03:23 svoj@mysql.com +2 -2
    Fix show slave status output. This fix makes rpl_openssl work with openssl-0.9.7 and yassl.

  mysql-test/r/openssl_1.result
    1.11 05/04/01 00:03:23 svoj@mysql.com +4 -4
    Fix expected error messages.

ChangeSet
  1.1616.1789.1 05/03/31 20:27:29 serg@serg.mylan +1 -0
  include sql/examples in the window source distribution

  scripts/make_win_src_distribution.sh
    1.27.2.3 05/03/31 20:27:22 serg@serg.mylan +1 -1
    include sql/examples in the window source distribution

ChangeSet
  1.1616.1788.1 05/03/31 19:18:50 mskold@mysql.com +1 -0
  Fixed so no merge conflict with 5.0

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.26.2.4 05/03/31 19:17:09 mskold@mysql.com +2 -1
    Fixed so no merge conflict with

ChangeSet
  1.1616.1773.18 05/03/31 20:23:10 sergefp@mysql.com +2 -0
  Make the tests deterministic: change DELETE ... LIMIT to DELETE ... ORDER BY ... LIMIT 

  mysql-test/t/group_by.test
    1.34 05/03/31 20:23:08 sergefp@mysql.com +2 -1
    Make the tests deterministic: change DELETE ... LIMIT to DELETE ... ORDER BY ... LIMIT 

  mysql-test/r/group_by.result
    1.38.1.6 05/03/31 20:23:08 sergefp@mysql.com +1 -1
    Make the tests deterministic: change DELETE ... LIMIT to DELETE ... ORDER BY ... LIMIT 

ChangeSet
  1.1842.5.1 05/03/31 17:46:36 serg@serg.mylan +3 -0
  decimal_div bug#9501

  strings/decimal.c
    1.43 05/03/31 17:46:27 serg@serg.mylan +55 -68
    decimal_div bug#9501

  mysql-test/t/type_newdecimal.test
    1.4 05/03/31 17:46:27 serg@serg.mylan +6 -1
    decimal_div bug#9501

  mysql-test/r/type_newdecimal.result
    1.5 05/03/31 17:46:27 serg@serg.mylan +3 -0
    decimal_div bug#9501

ChangeSet
  1.1616.1.538 05/03/31 08:37:18 reggie@mdk10.(none) +1 -0
  Bug #9175 seg fault on 'mysqldump --single-transaction --tab mysql nonexistent' 
  
  mysqldump.c:
    Fixed get_actual_table_name so that it calls mysql_free_result in all cases that a non-NULl result is returned

  client/mysqldump.c
    1.143.1.42 05/03/31 08:34:07 reggie@mdk10.(none) +4 -3
    Fixed get_actual_table_name so that it calls mysql_free_result in all cases that a non-NULl result is returned

ChangeSet
  1.1847 05/03/31 16:22:46 pekka@mysql.com +2 -0
  ndb - fix small memory leak

  ndb/src/mgmapi/mgmapi.cpp
    1.44 05/03/31 16:12:09 pekka@mysql.com +10 -2
    fix small memory leak

  ndb/include/util/Vector.hpp
    1.4 05/03/31 16:12:09 pekka@mysql.com +8 -0
    fix small memory leak

ChangeSet
  1.1842.2.2 05/03/31 14:33:50 magnus@msdesk.mysql.com +2 -0
  BUG#8585 ndb_cache2
   - When deleting from a cursor the m_rows_changed variable was not properly incremented to indicate that m_share->commit_count should be cleared at end of trans.
    

  BitKeeper/etc/logging_ok
    1.298.6.1 05/03/31 14:32:49 magnus@msdesk.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/ha_ndbcluster.cc
    1.167 05/03/31 14:32:40 magnus@msdesk.mysql.com +1 -2
    Moved increment of m_rows_changed to higher up in the function.

ChangeSet
  1.1616.1778.2 05/03/31 14:31:06 mskold@mysql.com +1 -0
  Removed warnings

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.26.2.3 05/03/31 14:30:13 mskold@mysql.com +3 -2
    Removed warnings

ChangeSet
  1.1616.1787.2 05/03/31 14:25:03 petr@mysql.com +1 -0
  Bug #9507 /etc/init.d/mysql script does not stop mysqld correctly
  wait_for_pid function is fixed to wait for pid removal in "stop".
  recomitted with post-review fix  

  support-files/mysql.server.sh
    1.34.2.3 05/03/31 14:25:00 petr@mysql.com +14 -3
    wait_for_pid function corrected to work properly with start/stop

ChangeSet
  1.1844 05/03/31 10:54:15 pem@mysql.com +2 -0
  Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/usr/local/bk/mysql-5.0

  sql/sql_yacc.yy
    1.356 05/03/31 10:54:08 pem@mysql.com +0 -0
    Auto merged

  sql/share/errmsg.txt
    1.20 05/03/31 10:54:08 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.1773.15 05/03/31 10:47:32 msvensson@neptunus.(none) +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into neptunus.(none):/home/msvensson/mysql/mysql-4.1

  sql/item_subselect.h
    1.52.1.8 05/03/31 10:47:31 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/item.h
    1.56.1.120 05/03/31 10:47:30 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/item.cc
    1.58.1.139 05/03/31 10:47:30 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1842.4.1 05/03/31 13:44:42 gluh@eagle.intranet.mysql.r18.ru +4 -0
  Fix for bug #9344 INFORMATION_SCHEMA, wrong content, numeric columns
    The columns CHARACTER_MAXIMUM_LENGTH and CHARACTER_OCTET_LENGTH 
    of INFORMATION_SCHEMA.COLUMNS must be NULL for numeric columns

  BitKeeper/etc/logging_ok
    1.298.1.13 05/03/31 13:44:34 gluh@eagle.intranet.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_show.cc
    1.229.1.1 05/03/31 13:43:21 gluh@eagle.intranet.mysql.r18.ru +22 -8
    Fix for bug #9344 INFORMATION_SCHEMA, wrong content, numeric columns

  mysql-test/t/information_schema.test
    1.30 05/03/31 13:43:21 gluh@eagle.intranet.mysql.r18.ru +18 -0
    Fix for bug #9344 INFORMATION_SCHEMA, wrong content, numeric columns

  mysql-test/r/information_schema.result
    1.44 05/03/31 13:43:21 gluh@eagle.intranet.mysql.r18.ru +32 -10
    Fix for bug #9344 INFORMATION_SCHEMA, wrong content, numeric columns

ChangeSet
  1.1842.3.1 05/03/31 10:39:48 bell@sanja.is.com.ua +22 -0
  merge 4.1->5.0

  sql/table.h
    1.94 05/03/31 10:39:43 bell@sanja.is.com.ua +0 -3
    merge 4.1->5.0

  sql/sql_union.cc
    1.115 05/03/31 10:39:43 bell@sanja.is.com.ua +3 -5
    merge 4.1->5.0

  sql/sql_prepare.cc
    1.108.1.1 05/03/31 10:39:43 bell@sanja.is.com.ua +1 -2
    merge 4.1->5.0

  sql/sql_lex.h
    1.170.1.1 05/03/31 10:39:43 bell@sanja.is.com.ua +2 -3
    merge 4.1->5.0

  sql/sql_derived.cc
    1.69.1.1 05/03/31 10:39:43 bell@sanja.is.com.ua +1 -3
    merge 4.1->5.0

  sql/item_subselect.h
    1.64.1.1 05/03/31 10:39:43 bell@sanja.is.com.ua +0 -0
    merge 4.1->5.0

  sql/item_subselect.cc
    1.98 05/03/31 10:39:43 bell@sanja.is.com.ua +14 -11
    merge 4.1->5.0

  sql/item_func.h
    1.103 05/03/31 10:39:43 bell@sanja.is.com.ua +2 -3
    merge 4.1->5.0

  sql/item.cc
    1.104.16.1 05/03/31 10:39:43 bell@sanja.is.com.ua +10 -45
    merge 4.1->5.0

  sql/field.h
    1.147 05/03/31 10:39:42 bell@sanja.is.com.ua +1 -1
    merge 4.1->5.0

  sql/field.cc
    1.245.1.1 05/03/31 10:39:42 bell@sanja.is.com.ua +3 -16
    merge 4.1->5.0

  mysql-test/t/subselect.test
    1.93 05/03/31 10:39:42 bell@sanja.is.com.ua +2 -0
    merge 4.1->5.0

  mysql-test/r/subselect.result
    1.108 05/03/31 10:39:42 bell@sanja.is.com.ua +1 -0
    merge 4.1->5.0

  mysql-test/r/func_group.result
    1.43 05/03/31 10:39:42 bell@sanja.is.com.ua +0 -1
    merge 4.1->5.0

ChangeSet
  1.1616.1640.13 05/03/30 17:32:44 jimw@mysql.com +25 -0
  Remove result.es files and support for them, which requires splitting
  up a couple of tests and adjusting the output of others. Exposes two
  bugs (9472 and 9508).

  mysql-test/t/insert_select-binlog.test
    1.1 05/03/30 17:32:41 jimw@mysql.com +34 -0

  mysql-test/r/insert_select-binlog.result
    1.1 05/03/30 17:32:41 jimw@mysql.com +25 -0

  sql/sql_select.cc
    1.216.104.1 05/03/30 17:32:41 jimw@mysql.com +1 -1
    Fix conditional around query_cache_abort() call.

  mysql-test/t/type_ranges.test
    1.9.1.1 05/03/30 17:32:41 jimw@mysql.com +9 -0
    Replace grants column from 'show full columns'

  mysql-test/t/type_float.test
    1.15.2.1 05/03/30 17:32:41 jimw@mysql.com +4 -0
    Replace grants column from 'show full columns'

  mysql-test/t/type_blob.test
    1.23.1.1 05/03/30 17:32:41 jimw@mysql.com +20 -10
    Replace grants column from 'show full columns'

  mysql-test/t/select.test
    1.28.2.1 05/03/30 17:32:41 jimw@mysql.com +4 -0
    Replace grants column from 'show full columns'

  mysql-test/t/insert_select.test
    1.14.1.3 05/03/30 17:32:41 jimw@mysql.com +0 -31
    Move binlog test to new file

  mysql-test/t/insert_select-binlog.test
    1.0 05/03/30 17:32:41 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-no-es/mysql-test/t/insert_select-binlog.test

  mysql-test/t/drop_temp_table.test
    1.5 05/03/30 17:32:41 jimw@mysql.com +3 -0
    Skip this test with embedded server

  mysql-test/r/insert_select-binlog.result
    1.0 05/03/30 17:32:41 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-no-es/mysql-test/r/insert_select-binlog.result

  mysql-test/r/type_ranges.result
    1.25.1.1 05/03/30 17:32:40 jimw@mysql.com +80 -80
    Update results

  mysql-test/r/type_float.result
    1.25.2.1 05/03/30 17:32:40 jimw@mysql.com +14 -14
    Update results

  mysql-test/r/type_blob.result
    1.40.2.1 05/03/30 17:32:40 jimw@mysql.com +10 -10
    Update results

  mysql-test/r/select.result
    1.34.5.1 05/03/30 17:32:40 jimw@mysql.com +12 -12
    Update results

  mysql-test/r/insert_select.result
    1.16.1.8 05/03/30 17:32:40 jimw@mysql.com +0 -25
    Update results

  mysql-test/t/ps_1general.test
    1.3.3.2 05/03/30 17:31:15 jimw@mysql.com +2 -1
    Explain --replace_result

  mysql-test/mysql-test-run.sh
    1.208.1.39 05/03/30 17:20:39 jimw@mysql.com +2 -16
    Remove support for special result extension -- bad idea!

ChangeSet
  1.1616.1787.1 05/03/31 03:44:51 konstantin@mysql.com +1 -0
  A fix for Bug#9443 "mysql_client_test fails on linux and some solaris 
  platforms": yet another issue with floating pointer comparisons.
  The fix uses the workaround with volatiles.

  sql/item_cmpfunc.cc
    1.111.1.74 05/03/31 03:44:46 konstantin@mysql.com +8 -2
    A fix for the failing mysql_client_test on some Intel platforms
    when compiled with optimization.
    We don't use -ffloat-store compileation as it may slow all
    floating point operations.

ChangeSet
  1.1839.2.2 05/03/30 23:41:42 monty@mysql.com +4 -0
  Enabled more tests of STR_TO_DATE()
  Fixed that datetime gives warning for zero dates in traditional mode

  sql/log_event.h
    1.109 05/03/30 23:41:38 monty@mysql.com +1 -1
    Fix wrong ifdef from last push

  sql/field.cc
    1.247 05/03/30 23:41:38 monty@mysql.com +11 -7
    Fixed that datetime gives warning for zero dates in traditional mode

  mysql-test/t/strict.test
    1.9.1.10 05/03/30 23:41:38 monty@mysql.com +14 -37
    Enabled more tests of STR_TO_DATE()

  mysql-test/r/strict.result
    1.12.1.9 05/03/30 23:41:38 monty@mysql.com +14 -0
    Enabled more tests of STR_TO_DATE()

  support-files/mysql.server.sh
    1.40 05/03/30 23:31:13 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.305.1.2 05/03/30 23:31:13 bell@sanja.is.com.ua +0 -1
    Auto merged

  sql/sql_parse.cc
    1.431.3.1 05/03/30 23:31:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.108.1.1 05/03/30 23:31:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/union.test
    1.83 05/03/30 23:31:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/union.result
    1.67 05/03/30 23:31:11 bell@sanja.is.com.ua +0 -8
    Auto merged

  mysql-test/r/metadata.result
    1.10 05/03/30 23:31:11 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/group_by.result
    1.45 05/03/30 23:31:11 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1616.1773.13 05/03/30 22:17:11 pekka@mysql.com +1 -0
  ndb - CSC#4927: ordered index + long pk, second half

ChangeSet
  1.1616.1773.11 05/03/30 23:08:03 bell@sanja.is.com.ua +2 -0
  postmerge fixes

  sql/item.cc
    1.58.1.138 05/03/30 23:07:59 bell@sanja.is.com.ua +22 -16
    work around about varchar in 4.1

  mysql-test/r/metadata.result
    1.4.1.5 05/03/30 23:07:59 bell@sanja.is.com.ua +4 -4
    postmerge change

  ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
    1.21.1.5 05/03/30 21:54:18 pekka@mysql.com +20 -0
    ACC_LOCKREQ - element may have moved after lock request was made

ChangeSet
  1.1616.1773.10 05/03/30 22:11:08 bell@sanja.is.com.ua +2 -0
  merge

  sql/sql_select.cc
    1.216.1.175 05/03/30 22:11:05 bell@sanja.is.com.ua +0 -1
    merge

  sql/sql_parse.cc
    1.271.1.160 05/03/30 22:08:53 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1616.1786.3 05/03/30 20:39:37 joerg@mysql.com +1 -0
  Fix 'Bootstrap' to bypass a problem with "bk changes" by changing the directory before calling the command.

  Build-tools/Bootstrap
    1.26 05/03/30 20:39:34 joerg@mysql.com +25 -13
    Bypass a BK problem with "bk changes": It stopped delivering changeset comments when
    1) it encountered a single, unbroken line with about 1k characters  AND
    2) it was applied not to the current directory but to a named BK root directory.
    
    As 1) cannot be changed post-factum (and might happen again),
    the "bk changes" command is now preceded by a "cd $REPO".
    
    Do some renaming of variables used around the "bk changes" call to improve documentation.

ChangeSet
  1.1616.1786.2 05/03/30 18:38:54 joerg@mysql.com +1 -0
  Portability fix (avoid bash-ism).

  support-files/mysql.server.sh
    1.34.2.2 05/03/30 18:38:50 joerg@mysql.com +3 -1
    Replace a non-portable "for" loop (bash style, fails on BSD) by an equivalent "while" loop.
    Note that the "stop" method is still wrong, as it does not wait for file removal.

ChangeSet
  1.1616.1786.1 05/03/30 17:59:36 joerg@mysql.com +1 -0
  Ensure 'texi2html' is taken from the Docs tree, not to miss any corrections.

  Build-tools/Bootstrap
    1.25 05/03/30 17:59:32 joerg@mysql.com +3 -1
    Ensure 'texi2html' is taken from the Docs tree, not to miss any corrections.

ChangeSet
  1.1842.1.1 05/03/30 17:54:10 msvensson@neptunus.(none) +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into neptunus.(none):/home/msvensson/mysql/mysql-5.0

  mysql-test/r/ps_7ndb.result
    1.24 05/03/30 17:54:09 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1843 05/03/30 17:43:52 pem@mysql.comhem.se +8 -0
  Fixed BUG#6600: Stored procedure crash after repeated calls with check table.
    Sedond attempt: Simply disallow CHECK in SPs, since it can't work.

  sql/sql_yacc.yy
    1.354.1.1 05/03/30 17:43:44 pem@mysql.com +11 -5
    CHECK is not possible in stored procedures.
    (And updated error messages for LOCK/UNLOCK.)

  sql/sql_parse.cc
    1.431.1.4 05/03/30 17:43:44 pem@mysql.com +0 -2
    Undid attempt to fix CHECK in stored procedures, it didn't work.

  sql/sp_head.cc
    1.124 05/03/30 17:43:44 pem@mysql.com +0 -1
    CHECK is not possible in stored procedures.

  sql/share/errmsg.txt
    1.18.1.1 05/03/30 17:43:44 pem@mysql.com +1 -1
    Made the SP bad statement error message more general.

  mysql-test/t/sp.test
    1.97.1.19 05/03/30 17:43:44 pem@mysql.com +0 -22
    Removed old test case for BUG#6600

  mysql-test/t/sp-error.test
    1.61 05/03/30 17:43:44 pem@mysql.com +17 -0
    New test cast for BUG#6600

  mysql-test/r/sp.result
    1.102.1.21 05/03/30 17:43:44 pem@mysql.com +0 -19
    Removed old test case for BUG#6600

  mysql-test/r/sp-error.result
    1.59 05/03/30 17:43:44 pem@mysql.com +9 -0
    New test cast for BUG#6600

ChangeSet
  1.1842 05/03/30 18:57:56 ramil@mysql.com +2 -0
  after merge fix/

  sql/sql_select.h
    1.80 05/03/30 18:57:49 ramil@mysql.com +3 -4
    after merge fix/

  sql/item_sum.cc
    1.135 05/03/30 18:57:49 ramil@mysql.com +2 -2
    after merge fix/

ChangeSet
  1.1839.2.1 05/03/30 16:01:30 monty@mysql.com +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/my/mysql-5.0

  sql/share/errmsg.txt
    1.19 05/03/30 16:01:28 monty@mysql.com +0 -0
    Auto merged

  sql/log_event.cc
    1.174 05/03/30 16:01:28 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1832.11.2 05/03/30 16:00:31 monty@mysql.com +14 -0
  Give warnings if wrong date/time/datetime argument for STR_TO_DATE
  Small fixes while doing review of new pushed code
  More test cases for decimal

  sql/sql_show.cc
    1.230 05/03/30 16:00:27 monty@mysql.com +4 -3
    Ensure that we do a proper restore in case of error

  sql/share/errmsg.txt
    1.17.1.1 05/03/30 16:00:27 monty@mysql.com +2 -0
    New error message

  sql/log_event.h
    1.108 05/03/30 16:00:27 monty@mysql.com +2 -0
    #ifdef-ed not used code

  sql/log_event.cc
    1.172.1.1 05/03/30 16:00:27 monty@mysql.com +11 -9
    Indentation fixes

  sql/item_timefunc.cc
    1.77 05/03/30 16:00:27 monty@mysql.com +23 -9
    Give warnings if wrong date/time/datetime argument for STR_TO_DATE

  sql/handler.cc
    1.153.1.1 05/03/30 16:00:27 monty@mysql.com +2 -1
    Better description for BLACKHOLE

  sql/field.cc
    1.246 05/03/30 16:00:27 monty@mysql.com +3 -1
    Simple optimization

  mysql-test/t/type_decimal.test
    1.21 05/03/30 16:00:27 monty@mysql.com +41 -0
    Test to test ranges of DECIMAL

  mysql-test/t/strict.test
    1.9.1.9 05/03/30 16:00:27 monty@mysql.com +42 -0
    Added tests for STR_TO_DATE

  mysql-test/t/date_formats.test
    1.12 05/03/30 16:00:27 monty@mysql.com +1 -0
    More tests

  mysql-test/r/type_decimal.result
    1.29 05/03/30 16:00:27 monty@mysql.com +55 -0
    Test to test ranges of DECIMAL

  mysql-test/r/strict.result
    1.12.1.8 05/03/30 16:00:27 monty@mysql.com +46 -0
    Added tests for STR_TO_DATE

  mysql-test/r/ps_1general.result
    1.35 05/03/30 16:00:27 monty@mysql.com +1 -1
    Better description for BLACKHOLE

  mysql-test/r/date_formats.result
    1.16 05/03/30 16:00:27 monty@mysql.com +39 -0
    Warnings added for STR_TO_DATE()

ChangeSet
  1.1841 05/03/30 17:51:40 ramil@mysql.com +3 -0
  Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/usr/home/ram/work/mysql-5.0

  sql/sql_parse.cc
    1.431.1.3 05/03/30 17:51:38 ramil@mysql.com +0 -0
    Auto merged

  mysql-test/r/ps_7ndb.result
    1.22.1.1 05/03/30 17:51:38 ramil@mysql.com +0 -0
    Auto merged

  include/violite.h
    1.41 05/03/30 17:51:38 ramil@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1839.1.2 05/03/30 14:32:53 msvensson@neptunus.(none) +9 -0
  Merge

  sql/item.cc
    1.104.1.24 05/03/30 14:32:53 msvensson@neptunus.(none) +0 -0
    SCCS merged

  sql/item_subselect.h
    1.65 05/03/30 14:31:23 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/item.h
    1.109 05/03/30 14:31:23 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/ps_7ndb.result
    1.23 05/03/30 14:31:22 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/ps_6bdb.result
    1.25 05/03/30 14:31:22 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/ps_5merge.result
    1.24 05/03/30 14:31:22 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/ps_4heap.result
    1.23 05/03/30 14:31:22 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/ps_3innodb.result
    1.27 05/03/30 14:31:22 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/ps_2myisam.result
    1.24 05/03/30 14:31:22 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.1785.1 05/03/30 14:30:32 msvensson@neptunus.(none) +6 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug8807
  into neptunus.(none):/home/msvensson/mysql/mysql-4.1-synced

  mysql-test/r/ps_7ndb.result
    1.10.1.7 05/03/30 14:30:31 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/ps_6bdb.result
    1.2.1.21 05/03/30 14:30:31 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/ps_5merge.result
    1.2.1.20 05/03/30 14:30:31 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/ps_4heap.result
    1.1.1.21 05/03/30 14:30:31 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/ps_3innodb.result
    1.2.1.22 05/03/30 14:30:31 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/ps_2myisam.result
    1.2.1.21 05/03/30 14:30:31 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1839.1.1 05/03/30 14:14:52 serg@serg.mylan +2 -0
  Merge bk-internal:/home/bk/mysql-5.0
  into serg.mylan:/usr/home/serg/Abk/mysql-5.0

  Build-tools/Do-compile
    1.117 05/03/30 14:14:38 serg@serg.mylan +0 -1
    Auto merged

  BitKeeper/etc/logging_ok
    1.298.1.12 05/03/30 14:13:56 serg@serg.mylan +0 -0
    auto-union

ChangeSet
  1.1840 05/03/30 17:07:40 ramil@mysql.com +4 -0
  Merge

  sql/sql_select.cc
    1.305.1.1 05/03/30 17:07:36 ramil@mysql.com +3 -12
    Manual merge

  sql/sql_parse.cc
    1.431.2.1 05/03/30 16:59:47 ramil@mysql.com +0 -0
    Auto merged

  mysql-test/r/ps_7ndb.result
    1.21.1.1 05/03/30 16:59:46 ramil@mysql.com +0 -0
    Auto merged

  include/violite.h
    1.39.1.1 05/03/30 16:59:46 ramil@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.1781.4 05/03/30 15:57:42 sergefp@mysql.com +4 -0
  Fix for BUG#9213: GROUP BY returns wrong query results:
  Make test_if_skip_sort_order() rebuild tab->ref if it decides to use an index
  different from the index join optimizer has choosen.  

  sql/table.h
    1.55.6.2 05/03/30 15:57:38 sergefp@mysql.com +3 -1
    Added comments about TABLE::used_keys

  sql/sql_select.cc
    1.216.103.2 05/03/30 15:57:38 sergefp@mysql.com +13 -1
    Fix for BUG#9213: GROUP BY returns wrong query results:
    Make test_if_skip_sort_order() rebuild tab->ref if it decides to use an index
    different from the index join optimizer has choosen.  

  mysql-test/t/group_by.test
    1.33 05/03/30 15:57:38 sergefp@mysql.com +25 -0
    Testcase for BUG#9213

  mysql-test/r/group_by.result
    1.38.1.5 05/03/30 15:57:38 sergefp@mysql.com +25 -0
    Testcase for BUG#9213

ChangeSet
  1.1616.1784.1 05/03/30 12:14:37 msvensson@neptunus.(none) +10 -0
  BUG#8807 Select crash server
   - Add function Item_param::fix_fields which will update any subselect they are part of and indicate that the subsleect is not const during prepare phase, and thus should not be executed during prepare.

  sql/item_subselect.h
    1.52.3.1 05/03/30 12:14:34 msvensson@neptunus.(none) +1 -0
    Make Item_param::fix_field friend of Item_subselect

  sql/item.h
    1.56.37.1 05/03/30 12:14:34 msvensson@neptunus.(none) +1 -0
    Adde Item_param::fix_fields

  sql/item.cc
    1.58.65.1 05/03/30 12:14:34 msvensson@neptunus.(none) +28 -0
    Add function Item_param::fix_fields, which will mark any subselects they are part of as not being a constant expression unless the param value is specified, ie. it will be not be constant during prepare phase.

  mysql-test/r/ps_7ndb.result
    1.10.3.1 05/03/30 12:14:34 msvensson@neptunus.(none) +4 -0
    Update test result

  mysql-test/r/ps_6bdb.result
    1.2.2.1 05/03/30 12:14:34 msvensson@neptunus.(none) +4 -0
    Update test result

  mysql-test/r/ps_5merge.result
    1.2.2.1 05/03/30 12:14:34 msvensson@neptunus.(none) +8 -0
    Update test result

  mysql-test/r/ps_4heap.result
    1.1.2.1 05/03/30 12:14:34 msvensson@neptunus.(none) +4 -0
    Update test result

  mysql-test/r/ps_3innodb.result
    1.2.2.1 05/03/30 12:14:34 msvensson@neptunus.(none) +4 -0
    Update test result

  mysql-test/r/ps_2myisam.result
    1.2.2.1 05/03/30 12:14:33 msvensson@neptunus.(none) +4 -0
    Update test result

  mysql-test/include/ps_query.inc
    1.11 05/03/30 12:14:33 msvensson@neptunus.(none) +5 -0
    Adde new test case

ChangeSet
  1.1837.1.1 05/03/30 12:03:02 serg@serg.mylan +5 -0
  merged

  Build-tools/Do-compile
    1.114.1.1 05/03/30 12:02:54 serg@serg.mylan +1 -2
    merged

ChangeSet
  1.1616.1783.1 05/03/30 14:43:56 ramil@mysql.com +1 -0
  A fix (bug #9401: type_timestamp segfaults mysqld)

  sql/sql_select.cc
    1.216.103.1 05/03/30 14:43:51 ramil@mysql.com +17 -15
    A fix (bug #9401: type_timestamp segfaults mysqld).
    1. create_tmp_field_from_field() is modified to take 'Item_ref *item' and 'char *name'
    instead of 'bool modify_item' and 'Item *item'.
    2. For Item_sum_min/max we should never modify item, so NULL is 
    passed as item to the create_tmp_field_from_field().

  sql/sql_parse.cc
    1.431.1.2 05/03/30 11:37:43 serg@serg.mylan +0 -0
    Auto merged

  mysql-test/r/ps_7ndb.result
    1.22 05/03/30 11:37:42 serg@serg.mylan +0 -0
    Auto merged

  include/violite.h
    1.40 05/03/30 11:37:42 serg@serg.mylan +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.298.5.1 05/03/30 11:37:12 serg@serg.mylan +0 -0
    auto-union

ChangeSet
  1.1616.1782.1 05/03/30 14:10:27 bar@mysql.com +3 -0
  Remove .opt file for faster test running.

  mysql-test/t/ctype_cp1251.test
    1.5 05/03/30 14:10:21 bar@mysql.com +2 -2
    Remove .opt file for faster test running.

  mysql-test/r/ctype_cp1251.result
    1.6 05/03/30 14:10:21 bar@mysql.com +2 -2
    Remove .opt file for faster test running.

  BitKeeper/deleted/.del-ctype_cp1251-master.opt~68be9a59ec8ee106
    1.3 05/03/30 14:06:42 bar@mysql.com +0 -0
    Delete: mysql-test/t/ctype_cp1251-master.opt

ChangeSet
  1.1616.1779.4 05/03/30 10:52:28 serg@serg.mylan +1 -0
  merged

  sql/sql_parse.cc
    1.271.107.3 05/03/30 10:52:22 serg@serg.mylan +3 -6
    merged

ChangeSet
  1.1346.822.1 05/03/30 10:43:24 serg@serg.mylan +1 -0
  don't strcmp db if it's a pattern

  sql/sql_parse.cc
    1.218.44.3 05/03/30 10:43:16 serg@serg.mylan +5 -4
    don't strcmp db if it's a pattern

ChangeSet
  1.1616.1773.9 05/03/30 10:27:36 bell@sanja.is.com.ua +8 -0
  Merge

  mysql-test/t/union.test
    1.77.1.5 05/03/30 10:27:32 bell@sanja.is.com.ua +0 -0
    SCCS merged

  mysql-test/r/union.result
    1.46.1.42 05/03/30 10:27:32 bell@sanja.is.com.ua +0 -0
    SCCS merged

  sql/sql_union.cc
    1.74.1.67 05/03/30 10:13:21 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.1.174 05/03/30 10:13:21 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.1.159 05/03/30 10:13:21 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.h
    1.68.1.53 05/03/30 10:13:21 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.56.1.119 05/03/30 10:13:21 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/metadata.result
    1.4.1.4 05/03/30 10:13:21 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1616.1758.3 05/03/30 10:07:08 bell@sanja.is.com.ua +3 -0
  postreview changes
  fixed bug in IN/ALL/ANY subqeries with HAVING clause (BUG#9350)

  sql/item_subselect.cc
    1.60.1.71 05/03/30 10:07:04 bell@sanja.is.com.ua +20 -15
    fixed typo in comment
    removed unused code
    fixed bug with HAVING clause detectiuon (BUG#9350)
    postreview changes

  mysql-test/t/subselect.test
    1.58.1.85 05/03/30 10:07:04 bell@sanja.is.com.ua +176 -0
    added new subquery tests to make code covarage better

  mysql-test/r/subselect.result
    1.67.1.97 05/03/30 10:07:04 bell@sanja.is.com.ua +421 -0
    added new subquery tests to make code covarage better

  BitKeeper/deleted/.del-type_ranges.result.es~bb77517f4c9dc978
    1.1.1.1 05/03/29 17:18:37 jimw@mysql.com +0 -0
    Delete: mysql-test/r/type_ranges.result.es

  BitKeeper/deleted/.del-type_float.result.es~a5533e4118eadc04
    1.3.1.3 05/03/29 17:18:37 jimw@mysql.com +0 -0
    Delete: mysql-test/r/type_float.result.es

  BitKeeper/deleted/.del-type_blob.result.es~a4a0d4454b2d0218
    1.3 05/03/29 17:18:37 jimw@mysql.com +0 -0
    Delete: mysql-test/r/type_blob.result.es

  BitKeeper/deleted/.del-select.result.es~240635f6a3f1a079
    1.2.1.1 05/03/29 17:18:37 jimw@mysql.com +0 -0
    Delete: mysql-test/r/select.result.es

  BitKeeper/deleted/.del-query_cache.result.es~246ad731a517d9ab
    1.4 05/03/29 17:18:37 jimw@mysql.com +0 -0
    Delete: mysql-test/r/query_cache.result.es

  BitKeeper/deleted/.del-packet.result.es~6e71c3b634806185
    1.2 05/03/29 17:18:36 jimw@mysql.com +0 -0
    Delete: mysql-test/r/packet.result.es

  BitKeeper/deleted/.del-myisam-blob.result.es~d498dae7d9f1a6d4
    1.2 05/03/29 17:18:36 jimw@mysql.com +0 -0
    Delete: mysql-test/r/myisam-blob.result.es

  BitKeeper/deleted/.del-insert_select.result.es~ae7eb9891d6c07c4
    1.4 05/03/29 17:18:36 jimw@mysql.com +0 -0
    Delete: mysql-test/r/insert_select.result.es

  BitKeeper/deleted/.del-drop_temp_table.result.es~bc4cfb1ee1257458
    1.2 05/03/29 17:18:36 jimw@mysql.com +0 -0
    Delete: mysql-test/r/drop_temp_table.result.es

ChangeSet
  1.1616.1640.12 05/03/29 17:17:46 jimw@mysql.com +26 -0
  Eliminate most of the remaining hardcoded list of tests to skip
  by adding check for embedded server within tests and splitting some
  tests into multiple test files.

  mysql-test/t/user_var-binlog.test
    1.1 05/03/29 17:17:44 jimw@mysql.com +19 -0

  mysql-test/t/timezone_grant.test
    1.1 05/03/29 17:17:44 jimw@mysql.com +71 -0

  mysql-test/t/rpl_variables.test
    1.1 05/03/29 17:17:44 jimw@mysql.com +4 -0

  mysql-test/t/ps_grant.test
    1.1 05/03/29 17:17:44 jimw@mysql.com +120 -0

  mysql-test/r/user_var-binlog.result
    1.1 05/03/29 17:17:44 jimw@mysql.com +25 -0

  mysql-test/r/timezone_grant.result
    1.1 05/03/29 17:17:44 jimw@mysql.com +52 -0

  mysql-test/r/rpl_variables.result
    1.1 05/03/29 17:17:44 jimw@mysql.com +8 -0

  mysql-test/t/user_var-binlog.test
    1.0 05/03/29 17:17:44 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-no-es/mysql-test/t/user_var-binlog.test

  mysql-test/t/timezone_grant.test
    1.0 05/03/29 17:17:44 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-no-es/mysql-test/t/timezone_grant.test

  mysql-test/t/rpl_variables.test
    1.0 05/03/29 17:17:44 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-no-es/mysql-test/t/rpl_variables.test

  mysql-test/t/ps_grant.test
    1.0 05/03/29 17:17:44 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-no-es/mysql-test/t/ps_grant.test

  mysql-test/r/user_var-binlog.result
    1.0 05/03/29 17:17:44 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-no-es/mysql-test/r/user_var-binlog.result

  mysql-test/r/timezone_grant.result
    1.0 05/03/29 17:17:44 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-no-es/mysql-test/r/timezone_grant.result

  mysql-test/r/rpl_variables.result
    1.0 05/03/29 17:17:44 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-no-es/mysql-test/r/rpl_variables.result

  mysql-test/r/ps_grant.result
    1.1 05/03/29 17:17:43 jimw@mysql.com +82 -0

  mysql-test/t/variables.test
    1.18.5.1 05/03/29 17:17:43 jimw@mysql.com +0 -2
    Move part of test to rpl_variables

  mysql-test/t/user_var.test
    1.13.2.1 05/03/29 17:17:43 jimw@mysql.com +0 -18
    Move part of test to new user_var-binlog

  mysql-test/t/timezone2.test
    1.4.1.2 05/03/29 17:17:43 jimw@mysql.com +0 -68
    Move part of test to timezone_grant

  mysql-test/t/system_mysql_db_fix.test
    1.7.1.2 05/03/29 17:17:43 jimw@mysql.com +3 -0
    Disable test with embedded server

  mysql-test/t/show_check.test
    1.33.3.1 05/03/29 17:17:43 jimw@mysql.com +4 -0
    Disable test with embedded server

  mysql-test/t/rename.test
    1.10 05/03/29 17:17:43 jimw@mysql.com +4 -0
    Disable test with embedded server

  mysql-test/t/ps_1general.test
    1.3.3.1 05/03/29 17:17:43 jimw@mysql.com +1 -114
    Move parts of test to new ps_grant

  mysql-test/t/packet.test
    1.4 05/03/29 17:17:43 jimw@mysql.com +2 -0
    Disable test with embedded server

  mysql-test/t/mysqldump.test
    1.19.3.1 05/03/29 17:17:43 jimw@mysql.com +3 -0
    Disable test with embedded server

  mysql-test/t/mysqlbinlog2.test
    1.1.1.1 05/03/29 17:17:43 jimw@mysql.com +3 -0
    Disable test with embedded server

  mysql-test/t/mysqlbinlog.test
    1.8.1.5 05/03/29 17:17:43 jimw@mysql.com +3 -0
    Disable test with embedded server

  mysql-test/t/mysql_protocols.test
    1.3 05/03/29 17:17:43 jimw@mysql.com +2 -0
    Disable test with embedded server

  mysql-test/t/mix_innodb_myisam_binlog.test
    1.5.1.3 05/03/29 17:17:43 jimw@mysql.com +3 -0
    Disable test with embedded server

  mysql-test/r/variables.result
    1.21.3.1 05/03/29 17:17:43 jimw@mysql.com +0 -2
    Update results

  mysql-test/r/user_var.result
    1.14.3.1 05/03/29 17:17:43 jimw@mysql.com +0 -25
    Update results

  mysql-test/r/timezone2.result
    1.2.1.5 05/03/29 17:17:43 jimw@mysql.com +0 -52
    Update results

  mysql-test/r/ps_grant.result
    1.0 05/03/29 17:17:43 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-no-es/mysql-test/r/ps_grant.result

  mysql-test/r/ps_1general.result
    1.1.5.1 05/03/29 17:17:43 jimw@mysql.com +0 -82
    Update results

  mysql-test/mysql-test-run.sh
    1.208.1.38 05/03/29 17:17:43 jimw@mysql.com +2 -15
    Remove most of hardcoded list of tests to skip

ChangeSet
  1.1839 05/03/30 02:59:17 kent@mysql.com +2 -0
  Merge

  Build-tools/Do-compile
    1.116 05/03/30 02:59:03 kent@mysql.com +2 -3
    Merge from 4.0 and 4.1

  BitKeeper/etc/logging_ok
    1.298.1.11 05/03/30 02:54:48 kent@mysql.com +0 -0
    auto-union

ChangeSet
  1.1616.1773.8 05/03/30 02:49:21 kent@mysql.com +2 -0
  Merge

  Build-tools/Do-compile
    1.96.1.14 05/03/30 02:49:07 kent@mysql.com +2 -4
    Merge from 4.0

  BitKeeper/etc/logging_ok
    1.233.47.20 05/03/30 02:42:02 kent@mysql.com +0 -1
    auto-union

ChangeSet
  1.1346.821.3 05/03/30 02:41:08 kent@mysql.com +2 -0
  Do-compile:
    Added option --with-big-tables

  BitKeeper/etc/logging_ok
    1.206.1.126 05/03/30 02:41:08 kent@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  Build-tools/Do-compile
    1.74.1.16 05/03/30 02:39:36 kent@mysql.com +4 -2
    Added option --with-big-tables

ChangeSet
  1.1838 05/03/30 02:34:21 kent@mysql.com +1 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
  into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile

  Build-tools/Do-compile
    1.115 05/03/30 02:34:15 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.1780.1 05/03/30 02:28:41 kent@mysql.com +1 -0
  Do-compile:
    Added option --with-blackhole

  Build-tools/Do-compile
    1.96.1.13 05/03/30 02:26:29 kent@mysql.com +3 -1
    Added option --with-blackhole

ChangeSet
  1.1616.1640.11 05/03/29 16:10:43 jimw@mysql.com +8 -0
  Clean up InnoDB testing with embedded server.

  mysql-test/t/innodb.test
    1.62.1.3 05/03/29 16:10:40 jimw@mysql.com +1 -14
    Move test of replace delayed to new test file, add to --replace_result
    to clean up path

  mysql-test/t/innodb-lock.test
    1.6 05/03/29 16:10:40 jimw@mysql.com +2 -0
    Skip with embedded server

  mysql-test/t/innodb-deadlock.test
    1.6 05/03/29 16:10:40 jimw@mysql.com +2 -0
    Skip with embedded server

  mysql-test/r/innodb.result
    1.75.4.2 05/03/29 16:10:40 jimw@mysql.com +0 -12
    Update results

  mysql-test/mysql-test-run.sh
    1.208.1.37 05/03/29 16:10:40 jimw@mysql.com +0 -3
    Remove innodb tests from list of tests automatically skipped
    with embedded server

  mysql-test/t/innodb-replace.test
    1.1 05/03/29 16:07:28 jimw@mysql.com +17 -0

  mysql-test/r/innodb-replace.result
    1.1 05/03/29 16:07:28 jimw@mysql.com +12 -0

  mysql-test/t/innodb-replace.test
    1.0 05/03/29 16:07:28 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-no-es/mysql-test/t/innodb-replace.test

  mysql-test/r/innodb-replace.result
    1.0 05/03/29 16:07:28 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-no-es/mysql-test/r/innodb-replace.result

  BitKeeper/deleted/.del-innodb.result.es~ba2a97747fd41a3a
    1.2 05/03/29 15:50:42 jimw@mysql.com +0 -0
    Delete: mysql-test/r/innodb.result.es

ChangeSet
  1.1616.1640.10 05/03/29 15:50:16 jimw@mysql.com +7 -0
  Shift skipping of some tests with embedded server from within
  mysql-test-run to the tests themselves.

  mysql-test/t/grant_cache.test
    1.9.1.2 05/03/29 15:49:04 jimw@mysql.com +2 -0
    Skip test under embedded server

  mysql-test/t/grant2.test
    1.7.2.1 05/03/29 15:48:59 jimw@mysql.com +3 -0
    Skip test under embedded server

  mysql-test/t/grant.test
    1.17.1.9 05/03/29 15:48:55 jimw@mysql.com +3 -0
    Skip test under embedded server

  mysql-test/t/flush_block_commit.test
    1.5 05/03/29 15:48:50 jimw@mysql.com +4 -0
    Skip test under embedded server

  mysql-test/t/connect.test
    1.9.1.1 05/03/29 15:48:42 jimw@mysql.com +3 -0
    Skip test under embedded server

  mysql-test/mysql-test-run.sh
    1.208.1.36 05/03/29 15:48:27 jimw@mysql.com +0 -6
    Remove tests from being skipped with embedded server

  mysql-test/t/bdb-deadlock.test
    1.7 05/03/29 15:38:27 jimw@mysql.com +1 -1
    Don't run this test with embedded server

ChangeSet
  1.1836 05/03/30 00:24:58 serg@serg.mylan +2 -0
  after merge fix

  mysql-test/t/grant2.test
    1.23 05/03/30 00:24:48 serg@serg.mylan +6 -6
    after merge fix

  mysql-test/r/grant2.result
    1.16.1.9 05/03/30 00:24:48 serg@serg.mylan +1 -0
    after merge fix

ChangeSet
  1.1616.1779.3 05/03/29 23:31:56 serg@serg.mylan +3 -0
  Fedora now defines read(2)/write(2) as macros.
  Argh!

  vio/test-sslclient.c
    1.8 05/03/29 23:31:49 serg@serg.mylan +2 -2
    Fedora now defines read(2)/write(2) as macros.
    Argh!

  vio/test-ssl.c
    1.9 05/03/29 23:31:49 serg@serg.mylan +2 -2
    Fedora now defines read(2)/write(2) as macros.
    Argh!

  include/violite.h
    1.38.1.1 05/03/29 23:31:49 serg@serg.mylan +2 -2
    Fedora now defines read(2)/write(2) as macros.
    Argh!

ChangeSet
  1.1616.1779.2 05/03/29 23:03:36 serg@serg.mylan +1 -0
  typo fixed

  strings/my_strtoll10-x86.s
    1.3 05/03/29 23:03:29 serg@serg.mylan +1 -1
    typo fixed

ChangeSet
  1.1826.11.1 05/03/29 21:11:52 joerg@mysql.com +1 -0
  Implement the new '--with-big-tables' flag to "configure".
  Using it comes merged from 4.1.

  config/ac-macros/misc.m4
    1.4 05/03/29 21:11:48 joerg@mysql.com +28 -0
    Implement the new '--with-big-tables' flag to "configure".

ChangeSet
  1.1832.1.27 05/03/29 21:06:22 joerg@mysql.com +4 -0
  Propagate the new '--with-big-tables' flag from 4.1 to 5.0.
  Incomplete, as the macro body must ne in the new file 'config/ac-macros/misc.m4'
  which will follow in a separate changeset.

  mysql-test/r/ps_7ndb.result
    1.21 05/03/29 21:06:19 joerg@mysql.com +0 -0
    Merge from 4.1 (Martin).

  mysql-test/mysql-test-run.sh
    1.260 05/03/29 21:06:19 joerg@mysql.com +0 -3
    No change in 5.0, as 4.1 was a backport (Martin).

  configure.in
    1.277 05/03/29 21:06:19 joerg@mysql.com +0 -0
    Call the new macro to evaluate the '--with-big-tables' flag.

  BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003
    1.131 05/03/29 21:06:19 joerg@mysql.com +0 -0
    Merge the 4.0 and 4.1 change of the new '--with-big-tables' flag.

  BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003
    1.123.7.2 05/03/29 20:23:20 joerg@mysql.com +0 -0
    Merge rename: acinclude.m4 -> BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003

ChangeSet
  1.1616.1779.1 05/03/29 20:16:35 serg@serg.mylan +1 -0
  Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  mysql-test/r/ps_7ndb.result
    1.10.1.6 05/03/29 20:16:28 serg@serg.mylan +0 -11
    Auto merged

ChangeSet
  1.1616.1773.6 05/03/29 19:25:55 joerg@mysql.com +2 -0
  Merge

  acinclude.m4
    1.123.7.1 05/03/29 19:25:55 joerg@mysql.com +0 -0
    SCCS merged

  configure.in
    1.201.1.155 05/03/29 19:23:21 joerg@mysql.com +1 -1
    Auto merged

ChangeSet
  1.1832.1.26 05/03/29 19:04:19 kent@mysql.com +1 -0
  init_db.sql:
    Updates to be in sync with 'mysql_create_system_tables'

  mysql-test/lib/init_db.sql
    1.6 05/03/29 19:00:10 kent@mysql.com +9 -8
    Updates to be in sync with 'mysql_create_system_tables'

ChangeSet
  1.1346.821.2 05/03/29 18:55:47 joerg@mysql.com +1 -0
  Post-review fix: Drop the duplicate assignment.

  acinclude.m4
    1.77.1.24 05/03/29 18:55:46 joerg@mysql.com +0 -2
    Post-review fix: Drop the duplicate assignment.

ChangeSet
  1.1832.12.1 05/03/29 17:26:38 gbichot@production.mysql.com +1 -0
  making Q_CATALOG_CODE be understood by 5.0.4 slave, so that 5.0.3->5.0.4 repl can work (but 5.0.4->5.0.3 won't).

  sql/log_event.cc
    1.173 05/03/29 17:26:29 gbichot@production.mysql.com +24 -8
    making Q_CATALOG_CODE be understood by 5.0.4 slave, so that 5.0.3->5.0.4 repl can work (but 5.0.4->5.0.3 won't).

ChangeSet
  1.1346.821.1 05/03/29 16:34:33 joerg@mysql.com +2 -0
  Introduce "configure" support for a new '-with-big-tables' option that can replace
  the current way of passing '-DBIG_TABLES' to the compilers.
  
  This is needed even in 4.0, as 'Do-compile-all' must use this new approach for
  all "max" builds in 4.0, 4.1, and up.

  configure.in
    1.191.1.132 05/03/29 16:34:30 joerg@mysql.com +1 -0
    Call the new 'MYSQL_CHECK_BIG_TABLES' macro.

  acinclude.m4
    1.77.1.23 05/03/29 16:34:30 joerg@mysql.com +30 -0
    Provide a new macro 'MYSQL_CHECK_BIG_TABLES' to check a '-with-big-tables' option 
    and set the CPP symbol 'BIG_TABLES' accordingly.

ChangeSet
  1.1616.1777.2 05/03/29 15:36:02 mskold@mysql.com +1 -0
  New test result

  mysql-test/r/ps_7ndb.result
    1.10.2.1 05/03/29 15:35:53 mskold@mysql.com +11 -11
    New test result

ChangeSet
  1.1616.1777.1 05/03/29 15:15:28 mskold@mysql.com +1 -0
  Backport of ChangeSet 1.1700.256.8: Export the variable MASTER_MY_PORT1 from the place where the second master is started

  mysql-test/mysql-test-run.sh
    1.208.10.7 05/03/29 15:14:36 mskold@mysql.com +3 -2
    Backport of ChangeSet 1.1700.256.8: Export the variable MASTER_MY_PORT1 from the place where the second master is started

ChangeSet
  1.1832.1.24 05/03/29 17:41:17 bar@mysql.com +1 -0
  type_bit.result:
    after merge fix
    ,

  mysql-test/r/type_bit.result
    1.6 05/03/29 17:40:51 bar@mysql.com +1 -1
    after merge fix
    ,

ChangeSet
  1.1832.1.23 05/03/29 17:37:10 bar@mysql.com +2 -0
  after merge fix

  sql/share/errmsg.txt
    1.18 05/03/29 17:37:03 bar@mysql.com +2 -2
    after merge fix

  mysql-test/r/type_blob.result
    1.43.1.4 05/03/29 17:37:03 bar@mysql.com +3 -3
    after merge fix

ChangeSet
  1.1832.1.22 05/03/29 17:24:26 bar@mysql.com +7 -0
  merge

  mysql-test/r/type_blob.result
    1.43.1.3 05/03/29 17:24:22 bar@mysql.com +1 -1
    after merge fix

  strings/ctype-utf8.c
    1.87 05/03/29 17:22:35 bar@mysql.com +0 -0
    Auto merged

  strings/ctype-sjis.c
    1.78 05/03/29 17:22:35 bar@mysql.com +0 -0
    Auto merged

  strings/ctype-big5.c
    1.74 05/03/29 17:22:35 bar@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.446 05/03/29 17:22:35 bar@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e
    1.134 05/03/29 17:22:34 bar@mysql.com +0 -0
    Auto merged

  mysys/charset-def.c
    1.11 05/03/29 17:22:34 bar@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e
    1.70.25.2 05/03/29 17:22:34 bar@mysql.com +0 -0
    Merge rename: sql/share/english/errmsg.txt -> BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e

ChangeSet
  1.1832.10.2 05/03/29 16:15:22 petr@mysql.com +1 -0
  more merge fixes

  mysys/default.c
    1.58 05/03/29 16:15:16 petr@mysql.com +4 -8
    more merge fixes

ChangeSet
  1.1616.1776.1 05/03/29 13:57:15 serg@serg.mylan +1 -0
  update results

  mysql-test/r/ps_7ndb.result
    1.10.1.5 05/03/29 13:57:08 serg@serg.mylan +11 -11
    update results

ChangeSet
  1.1616.1774.6 05/03/29 16:23:44 bar@mysql.com +2 -0
  ctype-utf8.c, ctype-sjis.c:
    Safer and mode readable way.

  strings/ctype-utf8.c
    1.78.1.5 05/03/29 16:23:28 bar@mysql.com +2 -7
    Safer and mode readable way.

  strings/ctype-sjis.c
    1.72.1.3 05/03/29 16:23:17 bar@mysql.com +1 -6
    Safer and mode readable way.

ChangeSet
  1.1616.1774.5 05/03/29 16:19:31 bar@mysql.com +1 -0
  ctype-big5.c:
    More readable and safer way.

  strings/ctype-big5.c
    1.67.1.4 05/03/29 16:18:57 bar@mysql.com +1 -5
    More readable and safer way.

ChangeSet
  1.1616.1774.4 05/03/29 15:43:00 bar@mysql.com +2 -0
  Better error message.
  Bugs#9057: Incorrect errormsg for too-large char field in table definition

  sql/share/english/errmsg.txt
    1.70.25.1 05/03/29 15:42:55 bar@mysql.com +1 -1
    Better error message.
    Bugs#9057: Incorrect errormsg for too-large char field in table definition

  mysql-test/r/type_blob.result
    1.40.1.4 05/03/29 15:42:55 bar@mysql.com +1 -1
    Better error message.
    Bugs#9057: Incorrect errormsg for too-large char field in table definition

ChangeSet
  1.1616.1774.3 05/03/29 14:30:34 konstantin@mysql.com +1 -0
  Remove redundant my_security_attr_free() from 
  handle_connections_shared_memory (double free spotted by Monty).

  sql/mysqld.cc
    1.356.73.42 05/03/29 14:30:29 konstantin@mysql.com +0 -2
    Remove excessive my_security_attr_free()

ChangeSet
  1.1832.11.1 05/03/29 12:58:31 monty@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/my/mysql-5.0

  sql/sql_acl.cc
    1.147 05/03/29 12:58:30 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1832.10.1 05/03/29 13:55:11 petr@mysql.com +1 -0
  manual merge

  mysys/default.c
    1.57 05/03/29 13:55:05 petr@mysql.com +9 -16
    manual merge

ChangeSet
  1.1616.1775.1 05/03/29 14:48:47 bar@mysql.com +2 -0
  Adding Cybozu's patch.
  Not active by default.
  One need to pass -DHAVE_CYBOZU_COLLATION to 
  activate it.

  strings/ctype-utf8.c
    1.78.1.4 05/03/29 14:48:42 bar@mysql.com +166 -0
    Adding Cybozu's patch.
    Not active by default.

  mysys/charset-def.c
    1.7.1.2 05/03/29 14:48:42 bar@mysql.com +6 -0
    Adding Cybozu's patch.
    Not active by default.

ChangeSet
  1.1832.9.1 05/03/29 12:37:36 monty@mysql.com +3 -0
  Cleanups during review

  sql/sql_yacc.yy
    1.355 05/03/29 12:37:33 monty@mysql.com +1 -1
    Removed compiler warning

  sql/sql_acl.cc
    1.145.1.1 05/03/29 12:37:33 monty@mysql.com +6 -3
    Fix for bool parameter

  ndb/src/ndbapi/DictCache.cpp
    1.12 05/03/29 12:37:33 monty@mysql.com +1 -1
    Simpler bit handling code

ChangeSet
  1.1832.1.20 05/03/29 08:06:43 kent@mysql.com +1 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
  into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile

  mysql-test/mysql-test-run.pl
    1.18 05/03/29 08:06:27 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.1773.2 05/03/29 07:29:38 kent@mysql.com +2 -0
  mysql-test-run.pl:
    Corrected typo
  mtr_diff.pl:
    A simplified unified diff in Perl
    new file

  mysql-test/mysql-test-run.pl
    1.8.2.5 05/03/29 07:24:10 kent@mysql.com +3 -2
    Corrected typo

  mysql-test/lib/mtr_diff.pl
    1.1 05/03/29 07:23:36 kent@mysql.com +283 -0
    A simplified unified diff in Perl

  mysql-test/lib/mtr_diff.pl
    1.0 05/03/29 07:23:36 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-4.1-perl/mysql-test/lib/mtr_diff.pl

ChangeSet
  1.1832.1.19 05/03/28 23:06:19 pekka@mysql.com +18 -0
  Merge

  sql/sql_union.cc
    1.114 05/03/28 23:05:51 pekka@mysql.com +0 -1
    DBUG_ASSERT(TRUE) is useless so assume opposite

  ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
    1.43 05/03/28 23:04:11 pekka@mysql.com +0 -27
    SCCS merged

  ndb/src/kernel/blocks/dbacc/Dbacc.hpp
    1.18 05/03/28 23:04:06 pekka@mysql.com +0 -1
    SCCS merged

  sql/sql_parse.cc
    1.431.1.1 05/03/28 23:02:35 pekka@mysql.com +0 -0
    Auto merged

  sql/sql_acl.cc
    1.146 05/03/28 23:02:34 pekka@mysql.com +0 -0
    Auto merged

  mysql-test/t/grant2.test
    1.22 05/03/28 23:02:33 pekka@mysql.com +0 -0
    Auto merged

  mysql-test/r/type_enum.result
    1.26 05/03/28 23:02:33 pekka@mysql.com +0 -0
    Auto merged

  mysql-test/r/ps_6bdb.result
    1.24 05/03/28 23:02:33 pekka@mysql.com +0 -0
    Auto merged

  mysql-test/r/ps_5merge.result
    1.23 05/03/28 23:02:33 pekka@mysql.com +0 -0
    Auto merged

  mysql-test/r/ps_4heap.result
    1.22 05/03/28 23:02:32 pekka@mysql.com +0 -0
    Auto merged

  mysql-test/r/ps_3innodb.result
    1.26 05/03/28 23:02:32 pekka@mysql.com +0 -0
    Auto merged

  mysql-test/r/ps_2myisam.result
    1.23 05/03/28 23:02:32 pekka@mysql.com +0 -0
    Auto merged

  mysql-test/r/ps_1general.result
    1.34 05/03/28 23:02:32 pekka@mysql.com +0 -0
    Auto merged

  mysql-test/r/metadata.result
    1.9 05/03/28 23:02:32 pekka@mysql.com +0 -0
    Auto merged

  mysql-test/r/grant2.result
    1.16.1.8 05/03/28 23:02:31 pekka@mysql.com +0 -0
    Auto merged

  mysql-test/r/grant2.result
    1.8.3.2 05/03/28 23:02:31 pekka@mysql.com +0 -0
    Change mode to -rw-rw-r--

  myisam/mi_create.c
    1.44 05/03/28 23:00:35 pekka@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003
    1.130 05/03/28 23:00:34 pekka@mysql.com +0 -0
    Auto merged

  client/mysqltest.c
    1.136 05/03/28 23:00:34 pekka@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003
    1.123.6.2 05/03/28 23:00:34 pekka@mysql.com +0 -0
    Merge rename: acinclude.m4 -> BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003

ChangeSet
  1.1616.1772.1 05/03/28 22:55:32 pekka@mysql.com +2 -0
  ndb - set up long key page vars in ACC_LOCKREQ  (bug#????)

  ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
    1.21.1.4 05/03/28 22:54:34 pekka@mysql.com +27 -15
    set up long key page vars in ACC_LOCKREQ

  ndb/src/kernel/blocks/dbacc/Dbacc.hpp
    1.10.1.1 05/03/28 22:54:34 pekka@mysql.com +1 -1
    set up long key page vars in ACC_LOCKREQ

ChangeSet
  1.1346.1.731 05/03/28 23:36:25 dlenev@mysql.com +4 -0
  Fix for bug #8894 "TIMESTAMP values scrambled/misaligned when using --new".
  
  Fixed Field_timestamp::val_int() so now it works correctly in --new mode
  (or for TIMESTAMP(19) columns). 
  Also removed unused Field_timestamp::fill_and_store() method.

  sql/field.h
    1.33.1.27 05/03/28 23:36:22 dlenev@mysql.com +0 -1
    Removed unused Field_timestamp::fill_and_store() method.

  sql/field.cc
    1.51.1.45 05/03/28 23:36:22 dlenev@mysql.com +4 -31
    Field_timestamp::fill_and_store() 
      Removed unused method.
    Field_timestamp::val_int()
      Even in --new mode integer representation of TIMESTAMP value should
      not exceed 14 digits.

  mysql-test/t/type_timestamp.test
    1.6.1.7 05/03/28 23:36:22 dlenev@mysql.com +13 -0
    Added test for bug #8894 "TIMESTAMP values scrambled/misaligned when 
    using --new".

  mysql-test/r/type_timestamp.result
    1.7.1.8 05/03/28 23:36:22 dlenev@mysql.com +9 -0
    Added test for bug #8894 "TIMESTAMP values scrambled/misaligned when 
    using --new".

ChangeSet
  1.1616.1.537 05/03/28 13:06:43 reggie@mdk10.(none) +1 -0
  Bug #9175 seg fault on 'mysqldump --single-transaction --tab mysql nonexistent' 
  
  My code in get_actual_tablename was not checking to make sure SHOW TABLES LIKE % was returning rows.  Now I check that the resultset is not null and has at least 1 row before I process the table.
  
  mysqldump.c:
    Add code to get_actual_tablename() to guard against SHOW TABLES LIKE not returning any rows

  client/mysqldump.c
    1.143.1.41 05/03/28 13:05:09 reggie@mdk10.(none) +21 -10
    Add code to get_actual_tablename() to guard against SHOW TABLES LIKE not returning any rows

ChangeSet
  1.1616.1770.5 05/03/28 09:59:41 jimw@mysql.com +4 -0
  Fix reconnect when using prepared statements, and add
  --disable_reconnect and --enable_reconnect to mysqltest
  so that it can be tested properly. (Bug #8866)

  sql-common/client.c
    1.46.6.1 05/03/28 09:59:39 jimw@mysql.com +27 -0
    Clean up MYSQL->stmts on reconnect by invalidating statements
    not in the MYSQL_STMT_INIT_DONE state, and reconnecting others
    to the new MYSQL object.

  mysql-test/t/kill.test
    1.6.1.1 05/03/28 09:59:39 jimw@mysql.com +8 -5
    Fix test to actually verify that killing a connection is working,
    and that automatic reconnect is working as desired.

  mysql-test/r/kill.result
    1.3.1.1 05/03/28 09:59:39 jimw@mysql.com +8 -0
    Update results

  client/mysqltest.c
    1.92.14.1 05/03/28 09:59:39 jimw@mysql.com +9 -0
    Add support for --disable_reconnect and --enable_reconnect

ChangeSet
  1.1832.8.1 05/03/28 15:13:31 bell@sanja.is.com.ua +15 -0
  fixed mechanism of detection selection from table wich we update
  (BUG##9398, BUG#8703)
  fixed wrong join view detection in multi-delete which lead to server crash

  sql/sql_update.cc
    1.153 05/03/28 15:12:29 bell@sanja.is.com.ua +13 -10
    fixed detection of selection from table which update for multiupdate

  sql/sql_select.cc
    1.306 05/03/28 15:12:29 bell@sanja.is.com.ua +8 -1
    added detection os SELECTs processed inside derived tables

  sql/sql_prepare.cc
    1.109 05/03/28 15:12:29 bell@sanja.is.com.ua +3 -0
    added detection os SELECTs processed inside derived tables (reset it for reusing in PS/SP)

  sql/sql_parse.cc
    1.432 05/03/28 15:12:29 bell@sanja.is.com.ua +0 -10
    removed wrong test of join view (for multidelete in can be not only first table)

  sql/sql_lex.h
    1.171 05/03/28 15:12:29 bell@sanja.is.com.ua +2 -3
    added detection os SELECTs processed inside derived tables
    removed old mechanism of multidelete/multiupdate table duplication detection (which can't work with views)

  sql/sql_lex.cc
    1.141 05/03/28 15:12:29 bell@sanja.is.com.ua +1 -72
    added detection os SELECTs processed inside derived tables
    removed old mechanism of multidelete/multiupdate table duplication detection (which can't work with views)

  sql/sql_derived.cc
    1.70 05/03/28 15:12:29 bell@sanja.is.com.ua +6 -3
    added derived table procession detection

  sql/sql_delete.cc
    1.143 05/03/28 15:12:29 bell@sanja.is.com.ua +23 -16
    fixed detection of selection from table which update for multidelete

  sql/sql_class.h
    1.228 05/03/28 15:12:29 bell@sanja.is.com.ua +2 -0
    added derived table procession detection

  sql/sql_class.cc
    1.173 05/03/28 15:12:29 bell@sanja.is.com.ua +2 -1
    added derived table procession detection

  sql/sql_base.cc
    1.231 05/03/28 15:12:28 bell@sanja.is.com.ua +33 -31
    changed procedure of finding tables

  mysql-test/t/view.test
    1.63 05/03/28 15:12:28 bell@sanja.is.com.ua +135 -3
    added new tests of updation and selection from the same table
    added test of multidelete command over join view which lead to server crash
    test suite from bugs #9398 and #8703

  mysql-test/t/lowercase_view.test
    1.5 05/03/28 15:12:28 bell@sanja.is.com.ua +99 -8
    added new tests of updation and selection from the same table

  mysql-test/r/view.result
    1.72 05/03/28 15:12:28 bell@sanja.is.com.ua +135 -1
    added new tests of updation and selection from the same table
    added test of multidelete command over join view which lead to server crash
    test suite from bugs #9398 and #8703

  mysql-test/r/lowercase_view.result
    1.7 05/03/28 15:12:28 bell@sanja.is.com.ua +99 -6
    added new tests of updation and selection from the same table

ChangeSet
  1.1616.1771.4 05/03/28 11:51:31 pekka@mysql.com +2 -0
  ndb - make printSchemaFile available (compile manually)

  ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
    1.6 05/03/28 11:48:35 pekka@mysql.com +15 -0
    compile manually

ChangeSet
  1.1832.1.17 05/03/28 14:23:03 bar@eagle.intranet.mysql.r18.ru +2 -0
  Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1
  into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0

  mysql-test/t/union.test
    1.82 05/03/28 14:22:57 bar@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

  mysql-test/r/union.result
    1.66 05/03/28 14:22:57 bar@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1616.1771.3 05/03/28 14:17:47 bar@mysql.com +2 -0
  union.test:
    Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
    Prove that this problem was fixed with bug9425 fix too.

  mysql-test/r/union.result
    1.46.6.1 05/03/28 14:16:57 bar@mysql.com +5 -0

  mysql-test/t/union.test
    1.77.2.1 05/03/28 14:16:13 bar@mysql.com +6 -0
    Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
    Prove that this problem was fixed with bug9425 fix too.

ChangeSet
  1.1832.1.16 05/03/28 14:15:43 bar@eagle.intranet.mysql.r18.ru +1 -0
  item_func.cc:
    Post merge additional fix for DECIMAL type:
    Bugs: #9425: A user variable doesn't always have implicit coercibility

  sql/item_func.cc
    1.180 05/03/28 14:15:07 bar@eagle.intranet.mysql.r18.ru +2 -2
    Post merge additional fix for DECIMAL type:
    Bugs: #9425: A user variable doesn't always have implicit coercibility

ChangeSet
  1.1832.1.15 05/03/28 14:08:25 bar@eagle.intranet.mysql.r18.ru +3 -0
  Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1
  into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0

  sql/item_func.cc
    1.179 05/03/28 14:08:20 bar@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

  mysql-test/t/user_var.test
    1.24 05/03/28 14:08:20 bar@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

  mysql-test/r/user_var.result
    1.29 05/03/28 14:08:20 bar@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1616.1771.2 05/03/28 14:01:57 bar@mysql.com +3 -0
  Bug#9425 A user variable doesn't always have implicit coercibility
  Coercibility fixes for numeric types and not defined values were done.

  sql/item_func.cc
    1.124.1.114 05/03/28 14:01:53 bar@mysql.com +6 -3
    Bug#9425 A user variable doesn't always have implicit coercibility
    Coercibility fixes for numeric types and not defined values were done.

  mysql-test/t/user_var.test
    1.13.1.5 05/03/28 14:01:53 bar@mysql.com +7 -0
    Bug#9425 A user variable doesn't always have implicit coercibility
    Coercibility fixes for numeric types and not defined values were done.

  mysql-test/r/user_var.result
    1.14.2.8 05/03/28 14:01:53 bar@mysql.com +7 -0
    Bug#9425 A user variable doesn't always have implicit coercibility
    Coercibility fixes for numeric types and not defined values were done.

ChangeSet
  1.1832.1.14 05/03/28 12:34:00 bar@eagle.intranet.mysql.r18.ru +2 -0
  Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1
  into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0

  mysql-test/r/func_system.result
    1.21 05/03/28 12:33:54 bar@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

  mysql-test/r/ctype_utf8.result
    1.56 05/03/28 12:33:54 bar@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1616.1771.1 05/03/28 12:24:12 bar@mysql.com +4 -0
  func_system.test, ctype_utf8.test, func_system.result, ctype_utf8.result:
    Prove that the queries mentioned in
    Bugs#5980: NULL requires a characterset in a union
    works fine after recent changes related to itroducing
    more coercibility level: IRNORABLE and SYSCONST.

  mysql-test/t/func_system.test
    1.12 05/03/28 12:24:00 bar@mysql.com +2 -0
    Prove that the queries mentioned in
    Bugs#5980: NULL requires a characterset in a union
    works fine after recent changes related to itroducing
    more coercibility level: IRNORABLE and SYSCONST.

  mysql-test/t/ctype_utf8.test
    1.51 05/03/28 12:24:00 bar@mysql.com +11 -0
    Prove that the queries mentioned in
    Bugs#5980: NULL requires a characterset in a union
    works fine after recent changes related to itroducing
    more coercibility level: IRNORABLE and SYSCONST.

  mysql-test/r/func_system.result
    1.18.1.2 05/03/28 12:24:00 bar@mysql.com +4 -0
    Prove that the queries mentioned in
    Bugs#5980: NULL requires a characterset in a union
    works fine after recent changes related to itroducing
    more coercibility level: IRNORABLE and SYSCONST.

  mysql-test/r/ctype_utf8.result
    1.45.1.6 05/03/28 12:24:00 bar@mysql.com +14 -0
    Prove that the queries mentioned in
    Bugs#5980: NULL requires a characterset in a union
    works fine after recent changes related to itroducing
    more coercibility level: IRNORABLE and SYSCONST.

ChangeSet
  1.1616.1.534 05/03/27 15:46:06 serg@serg.mylan +2 -0
  more wild_compare tests

  mysql-test/t/grant2.test
    1.7.1.3 05/03/27 15:46:00 serg@serg.mylan +19 -1
    more wild_compare tests

  mysql-test/r/grant2.result
    1.8.3.1 05/03/27 15:46:00 serg@serg.mylan +20 -3
    more wild_compare tests

  BitKeeper/deleted/.del-Makefile~b03e75f2bff8d72
    1.2 05/03/27 14:47:12 pekka@mysql.com +0 -0
    Delete: ndb/src/kernel/blocks/dbdict/printSchemafile/Makefile

  ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
    1.5 05/03/27 14:46:56 pekka@mysql.com +0 -0
    Rename: ndb/src/kernel/blocks/dbdict/printSchemafile/printSchemafile.cpp -> ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp

ChangeSet
  1.1832.7.1 05/03/27 16:15:21 dlenev@brandersnatch.localdomain +6 -0
  Fix for bugs #5859 "DROP TABLE does not drop triggers" and 
  #6559 "DROP DATABASE forgets to drop triggers".
  
  If we drop table we should also drop all triggers associated with it.
  To do this we have to check for existence of .TRG file when we are 
  dropping table and delete it too.

  sql/sql_trigger.cc
    1.15 05/03/27 16:15:15 dlenev@mysql.com +2 -1
    Made constant holding extension for trigger files externally visible.

  sql/sql_table.cc
    1.230 05/03/27 16:15:15 dlenev@mysql.com +12 -0
    mysql_rm_table_part2():
      If we drop table we should also drop all triggers associated with it.
      To do this we have to check for existence of .TRG file and delete it
      (until the moment when we will store trigger definitions in the same
       .FRM file as table description).

  sql/mysql_priv.h
    1.284 05/03/27 16:15:15 dlenev@mysql.com +1 -0
    Added declaration of constant holding extension for trigger files.

  sql/handler.cc
    1.154 05/03/27 16:15:15 dlenev@mysql.com +1 -0
    Added .TRG to the list of known extensions of files associated with 
    tables.

  mysql-test/t/trigger.test
    1.9 05/03/27 16:15:15 dlenev@mysql.com +20 -0
    Added tests for bugs #5859 "DROP TABLE does not drop triggers"
    and #6559 "DROP DATABASE forgets to drop triggers".

  mysql-test/r/trigger.result
    1.5 05/03/27 16:15:15 dlenev@mysql.com +16 -0
    Added tests for bugs #5859 "DROP TABLE does not drop triggers"
    and #6559 "DROP DATABASE forgets to drop triggers".

ChangeSet
  1.1616.1.533 05/03/26 20:15:18 serg@serg.mylan +3 -0
  merged

  sql/sql_parse.cc
    1.271.107.2 05/03/26 20:15:10 serg@serg.mylan +0 -2
    merged with ul

  sql/sql_acl.cc
    1.74.1.88 05/03/26 20:05:07 serg@serg.mylan +0 -0
    Auto merged

  myisam/mi_create.c
    1.37.1.6 05/03/26 20:05:06 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1616.1.532 05/03/26 19:49:24 serg@serg.mylan +2 -0
  Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  mysql-test/r/ps_1general.result
    1.1.1.17 05/03/26 19:49:09 serg@serg.mylan +0 -0
    Auto merged

  acinclude.m4
    1.123.6.1 05/03/26 19:49:09 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1346.1.729 05/03/26 19:46:42 serg@serg.mylan +2 -0
  fixes for "backport wild_compare fix from 4.1 - bug#3924"

  sql/sql_parse.cc
    1.218.44.2 05/03/26 19:46:38 serg@serg.mylan +2 -2
    fixed backporting error in "backport wild_compare fix from 4.1 - bug#3924"

  sql/sql_acl.cc
    1.51.1.83 05/03/26 19:46:38 serg@serg.mylan +6 -2
    don't use acl_cache for GRANT

ChangeSet
  1.1832.1.12 05/03/26 01:44:54 konstantin@mysql.com +5 -0
  Manual merge

  sql/mysqld.cc
    1.445 05/03/26 01:44:49 konstantin@mysql.com +0 -0
    Manual merge

  sql-common/client.c
    1.69 05/03/26 01:44:49 konstantin@mysql.com +0 -0
    Manual merge

  mysys/Makefile.am
    1.60 05/03/26 01:44:49 konstantin@mysql.com +2 -2
    Manual merge

  include/my_sys.h
    1.147 05/03/26 01:44:49 konstantin@mysql.com +0 -0
    Manual merge

  VC++Files/mysys/mysys.dsp
    1.25 05/03/26 01:44:48 konstantin@mysql.com +0 -1
    Manual merge

ChangeSet
  1.1616.1.531 05/03/26 01:21:52 konstantin@mysql.com +6 -0
  A fix for Bug#8226 "Cannot connect via shared memory": 
  provide created shared memory objects with proper
  access rights to make them usable when client and server
  are running under different accounts. 
  Post review fixes.

  mysys/my_windac.c
    1.1 05/03/26 01:21:48 konstantin@mysql.com +224 -0

  mysys/my_windac.c
    1.0 05/03/26 01:21:48 konstantin@mysql.com +0 -0
    BitKeeper file /media/sda1/mysql/mysql-4.1-8226/mysys/my_windac.c

  sql/mysqld.cc
    1.356.73.41 05/03/26 01:21:47 konstantin@mysql.com +29 -15
    Set proper security attributes for the kernel objects to make them
    usable when mysqld is running as a Windows service.

  sql-common/client.c
    1.46.1.37 05/03/26 01:21:47 konstantin@mysql.com +8 -7
    Lower requested access rights for events as the server won't 
    provide clients with ALL access in order to prevent denial
    of service attack.

  mysys/Makefile.am
    1.54.1.1 05/03/26 01:21:47 konstantin@mysql.com +1 -1
    Add my_windac.c to the list of compiled files.

  include/my_sys.h
    1.116.1.17 05/03/26 01:21:47 konstantin@mysql.com +8 -0
    Declarations for SECURITY_ATTRIBUTES create/destroy functions.

  VC++Files/mysys/mysys.dsp
    1.23.1.1 05/03/26 01:21:47 konstantin@mysql.com +5 -0
    Add my_windac.c to mysys.lib

ChangeSet
  1.1832.1.11 05/03/25 14:12:46 brian@zim.(none) +1 -0
  fixed conflict making embedded server with libmysqld

  libmysqld/Makefile.am
    1.55 05/03/25 14:12:43 brian@zim.(none) +2 -3
    Fixed conflict

ChangeSet
  1.1616.1.530 05/03/25 14:09:19 brian@zim.(none) +2 -0
  Fixing blackhole support in libmysqld

  libmysqld/ha_blackhole.cc
    1.1 05/03/25 14:09:16 brian@zim.(none) +0 -0

  libmysqld/ha_blackhole.cc
    1.0 05/03/25 14:09:16 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-4.1/libmysqld/ha_blackhole.cc

  libmysqld/Makefile.am
    1.29.1.29 05/03/25 14:09:16 brian@zim.(none) +2 -1
    Adding ha_blackhole.cc

ChangeSet
  1.1832.1.10 05/03/25 13:43:42 brian@zim.(none) +3 -0
  Adding rules for building blackhole, also updating test case.

  config/ac-macros/ha_blackhole.m4
    1.1 05/03/25 13:43:39 brian@zim.(none) +29 -0

  mysql-test/r/blackhole.result
    1.3 05/03/25 13:43:39 brian@zim.(none) +1 -1
    Correction this, but I think I need to see why the warning is being generated in the first place. 

  configure.in
    1.276 05/03/25 13:43:39 brian@zim.(none) +1 -0
    Adding logic to run blackhole configure option.

  config/ac-macros/ha_blackhole.m4
    1.0 05/03/25 13:43:39 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-5.0/config/ac-macros/ha_blackhole.m4

ChangeSet
  1.1832.1.9 05/03/25 12:39:16 brian@zim.(none) +2 -0
  Resolving merge.

  mysql-test/r/ps_1general.result
    1.33 05/03/25 12:39:13 brian@zim.(none) +1 -1
    Resolving conflict in layout. 

  sql/handler.h
    1.133 05/03/25 12:38:03 brian@zim.(none) +0 -1
    Auto merged

ChangeSet
  1.1616.1.529 05/03/25 12:36:04 brian@zim.(none) +2 -0
  Fix upgrade/downgrade issue. 

  sql/handler.h
    1.89.19.3 05/03/25 12:36:02 brian@zim.(none) +1 -1
    Added federated to the list so that any beta users won't end up with a mismatch for table enum

  mysql-test/r/ps_1general.result
    1.1.4.1 05/03/25 12:36:02 brian@zim.(none) +1 -0
    Fix test case.

ChangeSet
  1.1832.1.7 05/03/25 10:51:08 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-clean
  into mysql.com:/home/jimw/my/mysql-5.0-clean

  client/mysql.cc
    1.161 05/03/25 10:51:07 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1832.6.1 05/03/25 10:36:58 brian@zim.(none) +8 -0
  Merging support for blackhole up to 5.0.

  sql/handler.h
    1.132 05/03/25 10:36:55 brian@zim.(none) +1 -2
    Edited for blackhole.

  sql/handler.cc
    1.153 05/03/25 10:36:55 brian@zim.(none) +2 -2
    Edited for adding blackhole.

  sql/Makefile.am
    1.104 05/03/25 10:36:55 brian@zim.(none) +2 -5
    Edited for adding blackhole. 

  sql/set_var.cc
    1.102 05/03/25 10:11:10 brian@zim.(none) +0 -0
    Auto merged

  sql/mysqld.cc
    1.444 05/03/25 10:11:10 brian@zim.(none) +0 -0
    Auto merged

  sql/mysql_priv.h
    1.283 05/03/25 10:11:10 brian@zim.(none) +0 -0
    Auto merged

  BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003
    1.129 05/03/25 10:11:09 brian@zim.(none) +0 -0
    Auto merged

  configure.in
    1.275 05/03/25 10:11:09 brian@zim.(none) +0 -0
    Auto merged

  BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003
    1.123.4.3 05/03/25 10:11:09 brian@zim.(none) +0 -0
    Merge rename: acinclude.m4 -> BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003

ChangeSet
  1.1832.5.1 05/03/25 14:51:17 gbichot@quadita2.mysql.com +20 -0
  WWe now store the catalog in Query_log_event in binlog WITHOUT its end zero.
  This saves one byte per Query_log_event on disk compared to 5.0.[0..3]. Compatibility problems with 5.0.x where x<4
  are explained in the comments in log_event.cc. Putting back s/my_open(O_TRUNC)/(my_delete+my_create) change which had
  been wiped away by somebody doing a wrong 4.1->5.0 merge (which happened just
  before 5.0.3 :( ). Applying it to new events for LOAD DATA INFILE.
  If slave fails in Execute_load_query_log_event::exec_event(),
  don't delete the file (so that it's re-usable at next START SLAVE).
  And (youpi!) fix for BUG#3247 "a partially completed LOAD DATA INFILE is not
  executed at all on the slave" (storing an Execute_load_query_log_event
  to binlog, with its error code, instead of Delete_file_log_event).

  sql/sql_load.cc
    1.77 05/03/25 14:51:05 gbichot@quadita2.mysql.com +30 -12
    Fix for BUG#3247: if LOAD DATA INFILE fails but has permanently updated a table
    (i.e. has deleted/added/modified some rows in a non-transactional table),
    we must write an Execute_load_query_log_event to binlog (with the error code,
    as this class beautifully inherits from Query_log_event, it can store
    the error code - thanks Dmitri) and not a Delete_file_log_event (we use
    to write a Delete_file_log_event: no update happened on slave, bug).

  sql/log_event.h
    1.107 05/03/25 14:51:05 gbichot@quadita2.mysql.com +14 -2
    We now store the catalog in Query_log_event in binlog WITHOUT its end zero.
    This saves one byte per Query_log_event on disk. This new storage for
    the catalog is denoted by Q_CATALOG_NZ_CODE (couldn't re-use Q_CATALOG_CODE
    as 5.0.3 slaves of this 5.0.4 master would segfault because it would
    expect a 0 when there is none.
    Renaming get_open_mode() to get_create_or_append() (see log_event.cc)

  sql/log_event.cc
    1.172 05/03/25 14:51:04 gbichot@quadita2.mysql.com +57 -31
    a) We now store the catalog in Query_log_event in binlog WITHOUT its end zero.
    This saves one byte per Query_log_event on disk. Compatibility problems with 5.0.x where x<4
    are explained in the comments in this file.
    b) putting back s/my_open(O_TRUNC)/(my_delete+my_create) change which had
    been wiped away by somebody doing a wrong 4.1->5.0 merge (which happened just
    before 5.0.3 :( ). Applying it to new events for LOAD DATA INFILE.
    c) if slave fails in Execute_load_query_log_event::exec_event(),
    don't delete the file (so that it's re-usable at next START SLAVE).

  mysql-test/t/rpl_until.test
    1.15 05/03/25 14:51:04 gbichot@quadita2.mysql.com +4 -4
    we now use one less byte when storing the catalog in binlog so positions change

  mysql-test/t/rpl_loaddata.test
    1.16 05/03/25 14:51:04 gbichot@quadita2.mysql.com +21 -4
    we now use one less byte when storing the catalog in binlog so positions change.
    Plus testing replication of LOAD DATA INFILE if duplicate key and non-transactional table.

  mysql-test/t/rpl_deadlock.test
    1.5 05/03/25 14:51:04 gbichot@quadita2.mysql.com +2 -2
    we now use one less byte when storing the catalog in binlog so positions change

  mysql-test/t/mysqlbinlog2.test
    1.5 05/03/25 14:51:03 gbichot@quadita2.mysql.com +6 -6
    we now use one less byte when storing the catalog in binlog so positions change

  mysql-test/t/mysqlbinlog.test
    1.16 05/03/25 14:51:03 gbichot@quadita2.mysql.com +2 -2
    we now use one less byte when storing the catalog in binlog so positions change

  mysql-test/r/rpl_until.result
    1.21 05/03/25 14:51:03 gbichot@quadita2.mysql.com +15 -15
    we now use one less byte when storing the catalog in binlog so positions change

  mysql-test/r/rpl_rotate_logs.result
    1.67 05/03/25 14:51:03 gbichot@quadita2.mysql.com +4 -4
    we now use one less byte when storing the catalog in binlog so positions change

  mysql-test/r/rpl_replicate_do.result
    1.29 05/03/25 14:51:03 gbichot@quadita2.mysql.com +1 -1
    we now use one less byte when storing the catalog in binlog so positions change

  mysql-test/r/rpl_relayrotate.result
    1.17 05/03/25 14:51:03 gbichot@quadita2.mysql.com +1 -1
    we now use one less byte when storing the catalog in binlog so positions change

  mysql-test/r/rpl_max_relay_size.result
    1.20 05/03/25 14:51:03 gbichot@quadita2.mysql.com +5 -5
    we now use one less byte when storing the catalog in binlog so positions change

  mysql-test/r/rpl_log.result
    1.57 05/03/25 14:51:03 gbichot@quadita2.mysql.com +41 -41
    we now use one less byte when storing the catalog in binlog so positions change

  mysql-test/r/rpl_loaddata.result
    1.28 05/03/25 14:51:02 gbichot@quadita2.mysql.com +20 -7
    we now use one less byte when storing the catalog in binlog so positions change.
    Plus testing replication of LOAD DATA INFILE if duplicate key and non-transactional table.

  mysql-test/r/rpl_flush_log_loop.result
    1.23 05/03/25 14:51:01 gbichot@quadita2.mysql.com +1 -1
    we now use one less byte when storing the catalog in binlog so positions change

  mysql-test/r/rpl_error_ignored_table.result
    1.20 05/03/25 14:51:01 gbichot@quadita2.mysql.com +1 -1
    we now use one less byte when storing the catalog in binlog so positions change

  mysql-test/r/rpl_deadlock.result
    1.6 05/03/25 14:51:01 gbichot@quadita2.mysql.com +5 -5
    we now use one less byte when storing the catalog in binlog so positions change

  mysql-test/r/rpl_change_master.result
    1.17 05/03/25 14:51:01 gbichot@quadita2.mysql.com +2 -2
    we now use one less byte when storing the catalog in binlog so positions change

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.21 05/03/25 14:51:00 gbichot@quadita2.mysql.com +39 -39
    we now use one less byte when storing the catalog in binlog so positions change

ChangeSet
  1.1832.2.15 05/03/25 17:35:37 bar@eagle.intranet.mysql.r18.ru +1 -0
  Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0

  tests/mysql_client_test.c
    1.110 05/03/25 17:35:31 bar@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1616.1770.2 05/03/25 17:30:51 bar@mysql.com +1 -0
  mysql_client_test.c:
    Don't run GBK test if not GBK support was compiled.

  tests/mysql_client_test.c
    1.51.1.99 05/03/25 17:30:12 bar@mysql.com +2 -0
    Don't run GBK test if not GBK support was compiled.

ChangeSet
  1.1832.2.14 05/03/25 17:17:17 bar@eagle.intranet.mysql.r18.ru +4 -0
  Many files:
    Moving UCS2 test into ctype_ucs
    Bug#9232 Test failure: mysql_client_test and type_newdecimal

  mysql-test/r/type_newdecimal.result
    1.4 05/03/25 17:16:57 bar@eagle.intranet.mysql.r18.ru +0 -8
    Moving UCS2 test into ctype_ucs
    Bug#9232 Test failure: mysql_client_test and type_newdecimal

  mysql-test/r/ctype_ucs.result
    1.32 05/03/25 17:16:47 bar@eagle.intranet.mysql.r18.ru +8 -0
    Moving UCS2 test into ctype_ucs
    Bug#9232 Test failure: mysql_client_test and type_newdecimal

  mysql-test/t/type_newdecimal.test
    1.3 05/03/25 17:16:36 bar@eagle.intranet.mysql.r18.ru +0 -9
    Moving UCS2 test into ctype_ucs
    Bug#9232 Test failure: mysql_client_test and type_newdecimal

  mysql-test/t/ctype_ucs.test
    1.27 05/03/25 17:04:19 bar@eagle.intranet.mysql.r18.ru +9 -0
    Moving UCS2 test into ctype_ucs
    Bug#9232 Test failure: mysql_client_test and type_newdecimal

ChangeSet
  1.1832.2.13 05/03/25 16:23:16 bar@eagle.intranet.mysql.r18.ru +1 -0
  Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1
  into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0

  strings/ctype-big5.c
    1.73 05/03/25 16:23:06 bar@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1832.2.12 05/03/25 15:09:22 gluh@gluh.mysql.r18.ru +2 -0
  Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
  into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-5.0.8941

  sql/sql_show.cc
    1.229 05/03/25 15:09:15 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  mysql-test/r/information_schema.result
    1.43 05/03/25 15:09:14 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1616.1770.1 05/03/25 16:08:54 bar@mysql.com +3 -0
  Allow inserting of extra HKSCS and cp950 characters into a Big5 column.

  strings/ctype-big5.c
    1.67.1.3 05/03/25 16:08:39 bar@mysql.com +38 -1
    Allow inserting of extra HKSCS and cp950 characters into a Big5 column.

  mysql-test/t/ctype_big5.test
    1.5 05/03/25 16:08:38 bar@mysql.com +9 -0
    Allow inserting of extra HKSCS and cp950 characters into a Big5 column.

  mysql-test/r/ctype_big5.result
    1.6 05/03/25 16:08:38 bar@mysql.com +7 -0
    Allow inserting of extra HKSCS and cp950 characters into a Big5 column.

ChangeSet
  1.1832.2.11 05/03/25 13:33:28 gluh@gluh.mysql.r18.ru +3 -0
  Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
  into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0

  sql/sql_show.cc
    1.227.1.1 05/03/25 13:33:18 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_select.cc
    1.305 05/03/25 13:33:18 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  mysql-test/r/information_schema.result
    1.41.1.1 05/03/25 13:33:17 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1826.10.2 05/03/25 13:31:29 gluh@gluh.mysql.r18.ru +1 -0
  Bug#9317: Wrong count for tables in INFORMATION_SCHEMA(fix after review)

  sql/sql_show.cc
    1.225.1.2 05/03/25 13:31:21 gluh@gluh.mysql.r18.ru +5 -13
    Bug#9317: Wrong count for tables in INFORMATION_SCHEMA(fix after review)

ChangeSet
  1.1832.4.1 05/03/25 12:19:11 gluh@gluh.mysql.r18.ru +2 -0
  Fix for bug #8941: garbage MAX_ROWS=# from SHOW CREATE TABLE INFORMATION_SCHEMA.*
    -skip the print of 'MAX_ROWS=#' for 'SHOW CRETAE TABLE' with information schema tables 

  sql/sql_show.cc
    1.228 05/03/25 12:17:51 gluh@gluh.mysql.r18.ru +1 -1
    Fix for bug #8941: garbage MAX_ROWS=# from SHOW CREATE TABLE INFORMATION_SCHEMA.*

  mysql-test/r/information_schema.result
    1.42 05/03/25 12:17:51 gluh@gluh.mysql.r18.ru +2 -2
    Fix for bug #8941: garbage MAX_ROWS=# from SHOW CREATE TABLE INFORMATION_SCHEMA.*

ChangeSet
  1.1832.2.10 05/03/25 11:47:25 bar@eagle.intranet.mysql.r18.ru +1 -0
  func_str.result:
    post-merge fix.
    ,

  mysql-test/r/func_str.result
    1.96 05/03/25 11:45:19 bar@eagle.intranet.mysql.r18.ru +20 -0
    post-merge fix.
    ,

ChangeSet
  1.1832.2.9 05/03/25 10:43:35 bar@eagle.intranet.mysql.r18.ru +6 -0
  Merge

  BitKeeper/etc/logging_ok
    1.298.1.10 05/03/25 10:43:25 bar@eagle.intranet.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  mysql-test/r/func_str.result
    1.95 05/03/25 10:43:11 bar@eagle.intranet.mysql.r18.ru +0 -20
    merging

  sql/item_strfunc.h
    1.86 05/03/25 10:39:02 bar@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

  sql/item_func.h
    1.102 05/03/25 10:39:02 bar@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

  mysql-test/t/func_str.test
    1.70 05/03/25 10:39:02 bar@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

  myisam/myisamchk.c
    1.112 05/03/25 10:39:02 bar@eagle.intranet.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1616.1769.1 05/03/25 04:13:30 petr@mysql.com +1 -0
  Post-review fixes for "!include" patch originating from Yahoo! (the whole patch is recommitted)

  mysys/default.c
    1.43.1.5 05/03/25 04:13:27 petr@mysql.com +121 -14
    Post-review fixes for "!include" patch originating from Yahoo!

ChangeSet
  1.1616.1.527 05/03/24 16:08:48 brian@zim.(none) +3 -0
  Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
  into zim.(none):/home/brian/mysql/mysql-4.1

  sql/set_var.cc
    1.34.52.18 05/03/24 16:08:47 brian@zim.(none) +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.73.40 05/03/24 16:08:46 brian@zim.(none) +0 -0
    Auto merged

  configure.in
    1.201.1.154 05/03/24 16:08:46 brian@zim.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.1764.2 05/03/24 16:07:56 brian@zim.(none) +5 -0
  Collection of changes per Bar and Serg.

  sql/ha_blackhole.h
    1.2 05/03/24 16:07:54 brian@zim.(none) +13 -4
    Indention fix, added methods for index...

  sql/ha_blackhole.cc
    1.2 05/03/24 16:07:54 brian@zim.(none) +60 -36
    Added indexes per Serg, correction of indention, added asserts per Serg.

  mysql-test/t/blackhole.test
    1.2 05/03/24 16:07:54 brian@zim.(none) +2 -1202
    Lowered the number of inserts.

  mysql-test/r/blackhole.result
    1.2 05/03/24 16:07:54 brian@zim.(none) +3 -0
    Lowered the number of inserts.

  acinclude.m4
    1.123.4.2 05/03/24 16:07:54 brian@zim.(none) +1 -1
    Change in message

ChangeSet
  1.1832.2.8 05/03/24 18:15:58 msvensson@neptunus.(none) +1 -0
  Removed faulty merge

  sql/sql_parse.cc
    1.431 05/03/24 18:15:54 msvensson@neptunus.(none) +0 -14
    The strange merge occured because this code shouldn't be there

ChangeSet
  1.1832.2.7 05/03/24 18:11:13 msvensson@neptunus.(none) +3 -0
  Manual merge

  sql/sql_parse.cc
    1.430 05/03/24 18:11:10 msvensson@neptunus.(none) +13 -0
    Strange merge conflict

  sql/mysqld.cc
    1.443 05/03/24 18:08:26 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/type_blob.result
    1.43.1.2 05/03/24 18:08:26 msvensson@neptunus.(none) +0 -1
    Auto merged

ChangeSet
  1.1832.2.6 05/03/24 16:43:50 gbichot@quadita2.mysql.com +3 -0
  testing repl of timezone with LOAD DATA INFILE (hourra!)

  mysql-test/std_data/rpl_timezone.dat
    1.1 05/03/24 16:43:41 gbichot@quadita2.mysql.com +2 -0

  mysql-test/t/rpl_timezone.test
    1.7 05/03/24 16:43:40 gbichot@quadita2.mysql.com +18 -0
    testing repl of timezone with LOAD DATA INFILE (hourra!)

  mysql-test/std_data/rpl_timezone.dat
    1.0 05/03/24 16:43:40 gbichot@quadita2.mysql.com +0 -0
    BitKeeper file /nfstmp1/guilhem/mysql-5.0-4ita/mysql-test/std_data/rpl_timezone.dat

  mysql-test/r/rpl_timezone.result
    1.10 05/03/24 16:43:40 gbichot@quadita2.mysql.com +16 -0
    result update

ChangeSet
  1.1832.2.5 05/03/24 16:11:58 gbichot@quadita2.mysql.com +1 -0
  rpl_deadlock.result:
    result update (default value changed from 4.1 to 5.0)

  mysql-test/r/rpl_deadlock.result
    1.5 05/03/24 16:11:24 gbichot@quadita2.mysql.com +1 -1
    result update (default value changed from 4.1 to 5.0)

ChangeSet
  1.1832.2.4 05/03/24 15:44:50 gbichot@quadita2.mysql.com +1 -0
  Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
  into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita

  sql/mysqld.cc
    1.442 05/03/24 15:44:46 gbichot@quadita2.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.1768.2 05/03/24 18:21:56 bar@mysql.com +1 -0
  myisamchk.c:
    Wrong help string fix.

  myisam/myisamchk.c
    1.92.1.32 05/03/24 18:21:21 bar@mysql.com +2 -2
    Wrong help string fix.

ChangeSet
  1.1616.1762.12 05/03/24 18:10:46 bar@mysql.com +4 -0
  Fixed that LEFT OUTER JOIN was replaced with a regulat join
  in some cases, because "charset(x) = 'string'" was considered
  as "x is not null" due to incorrect not_null_tables().

  sql/item_strfunc.h
    1.73.2.7 05/03/24 18:08:03 bar@mysql.com +4 -0
    Fixed that LEFT OUTER JOIN was replaced with a regulat join
    in some cases, because "charset(x) = 'string'" was considered
    as "x is not null" due to incorrect not_null_tables().

  sql/item_func.h
    1.68.17.1 05/03/24 18:08:03 bar@mysql.com +2 -1
    Fixed that LEFT OUTER JOIN was replaced with a regulat join
    in some cases, because "charset(x) = 'string'" was considered
    as "x is not null" due to incorrect not_null_tables().

  mysql-test/t/func_str.test
    1.64.1.7 05/03/24 18:08:03 bar@mysql.com +14 -0
    Fixed that LEFT OUTER JOIN was replaced with a regulat join
    in some cases, because "charset(x) = 'string'" was considered
    as "x is not null" due to incorrect not_null_tables().

  mysql-test/r/func_str.result
    1.70.1.20 05/03/24 18:08:03 bar@mysql.com +20 -0
    Fixed that LEFT OUTER JOIN was replaced with a regulat join
    in some cases, because "charset(x) = 'string'" was considered
    as "x is not null" due to incorrect not_null_tables().

ChangeSet
  1.1832.3.3 05/03/24 14:32:40 gbichot@quadita2.mysql.com +9 -0
  merge from 4.1

  sql/sql_show.cc
    1.227 05/03/24 14:32:31 gbichot@quadita2.mysql.com +13 -13
    merge

  sql/slave.h
    1.87 05/03/24 14:32:31 gbichot@quadita2.mysql.com +0 -0
    merge

  sql/slave.cc
    1.244 05/03/24 14:32:30 gbichot@quadita2.mysql.com +0 -1
    merge

ChangeSet
  1.1826.10.1 05/03/24 16:32:11 gluh@gluh.mysql.r18.ru +5 -0
  Bug #9317: Wrong count for tables in INFORMATION_SCHEMA
    there was no check of result of 
    table->file->write_row() function. When count of rows was
    more than table max_rows(HEAP table) the following recodrs
    were not inserted to the table
    -'schema_table_store_record' function is added. 
      The function checks result of write_row function
      and convert HEAP table to MyISAM if necessary
    - Result check after write_row is added into all 
      I_S function which store the records to I_S tables  

  sql/table.h
    1.93 05/03/24 16:32:04 gluh@gluh.mysql.r18.ru +2 -0
    Bug #9317: Wrong count for tables in INFORMATION_SCHEMA

  sql/sql_show.cc
    1.225.1.1 05/03/24 16:32:04 gluh@gluh.mysql.r18.ru +101 -32
    Bug #9317: Wrong count for tables in INFORMATION_SCHEMA

  sql/sql_select.cc
    1.303.1.1 05/03/24 16:32:04 gluh@gluh.mysql.r18.ru +3 -2
    Bug #9317: Wrong count for tables in INFORMATION_SCHEMA

  mysql-test/t/information_schema.test
    1.29 05/03/24 16:32:04 gluh@gluh.mysql.r18.ru +1 -0
    Bug #9317: Wrong count for tables in INFORMATION_SCHEMA

  mysql-test/r/information_schema.result
    1.40.1.1 05/03/24 16:32:04 gluh@gluh.mysql.r18.ru +2 -0
    Bug #9317: Wrong count for tables in INFORMATION_SCHEMA

ChangeSet
  1.1616.1767.1 05/03/24 13:48:38 msvensson@neptunus.(none) +2 -0
  BUG#9303 blob field with specified length < 256 does not create tinyblob

  sql/sql_parse.cc
    1.271.107.1 05/03/24 13:48:35 msvensson@neptunus.(none) +1 -1
    Added missing else so that FIELD_TINY_BLOB can be selected

  mysql-test/r/type_blob.result
    1.40.1.3 05/03/24 13:48:35 msvensson@neptunus.(none) +1 -1
    Test creates a blob(250 whcih is now displayed as tinyblob when SHOW COLUMNS is called.

ChangeSet
  1.1832.2.3 05/03/24 15:17:39 konstantin@mysql.com +4 -0
  Manual merge

  tests/mysql_client_test.c
    1.109 05/03/24 15:17:32 konstantin@mysql.com +42 -43
    Manual merge

  sql/sql_select.h
    1.79 05/03/24 15:17:32 konstantin@mysql.com +0 -0
    Manual merge

  sql/sql_prepare.cc
    1.108 05/03/24 15:17:32 konstantin@mysql.com +0 -0
    Manual merge

  libmysql/libmysql.c
    1.205 05/03/24 15:17:31 konstantin@mysql.com +0 -0
    Manual merge

ChangeSet
  1.1826.9.1 05/03/24 15:12:53 konstantin@mysql.com +4 -0
  Fixes and test cases for Bug#8880 "Commands out of sync error with cursors"
   and Bug#9159 "Server crash during mysql_stmt_close".
  The patch adds support for single-row result sets in cursors.

  tests/mysql_client_test.c
    1.107.1.1 05/03/24 15:12:46 konstantin@mysql.com +69 -0
    Test cases for Bug#8880 and Bug#9159

  sql/sql_select.h
    1.77.1.1 05/03/24 15:12:46 konstantin@mysql.com +1 -1
    Initialize Item_arena of Cursor object. A case when a cursor object
    is created but not used is possible with single-row result sets.

  sql/sql_prepare.cc
    1.106.1.1 05/03/24 15:12:46 konstantin@mysql.com +8 -6
    Properly free resources if there was a request to open a cursor which
    wasn't fullfilled.
    Give error on attempt to open a cursor for a statement not returning
    a result set.

  libmysql/libmysql.c
    1.201.2.1 05/03/24 15:12:46 konstantin@mysql.com +11 -0
    If we wanted a cursor, and the server wasn't able to create one,
    buffer all rows on client. Currently this is possible only for
    single row result sets and some SHOW commands.

ChangeSet
  1.1616.1.524 05/03/24 12:21:55 msvensson@neptunus.(none) +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into neptunus.(none):/home/msvensson/mysql/mysql-4.1

  sql/mysqld.cc
    1.356.73.39 05/03/24 12:21:54 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/structs.h
    1.45 05/03/24 11:28:27 gbichot@quadita2.mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.440.1.1 05/03/24 11:28:26 gbichot@quadita2.mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_deadlock.test
    1.4 05/03/24 11:28:25 gbichot@quadita2.mysql.com +0 -0
    Auto merged

  mysql-test/r/rpl_deadlock.result
    1.4 05/03/24 11:28:25 gbichot@quadita2.mysql.com +0 -0
    Auto merged

  libmysql/Makefile.shared
    1.60 05/03/24 11:28:25 gbichot@quadita2.mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.298.1.9 05/03/24 11:27:49 gbichot@quadita2.mysql.com +0 -1
    auto-union

ChangeSet
  1.1832.3.2 05/03/24 10:52:29 joerg@mysql.com +1 -0
  The separate NDB information must be upgraded, too.

  configure.in
    1.274 05/03/24 10:52:24 joerg@mysql.com +1 -1
    The separate NDB information must be upgraded, too.

ChangeSet
  1.1832.3.1 05/03/24 10:48:28 joerg@mysql.com +1 -0
  Update the version, as 5.0.3 was already cloned, and future changes will go into 5.0.4

  configure.in
    1.273 05/03/24 10:47:20 joerg@mysql.com +1 -1
    Update the version, as 5.0.3 was already cloned, and future changes will go into 5.0.4

ChangeSet
  1.1616.1766.2 05/03/24 10:28:02 serg@serg.mylan +1 -0
  mysql-test/r/ps_6bdb.result
      followup - results fixed

  mysql-test/r/ps_6bdb.result
    1.2.1.20 05/03/24 10:27:56 serg@serg.mylan +11 -11
    followup - results fixed

ChangeSet
  1.1832.1.4 05/03/23 17:27:52 jimw@mysql.com +1 -0
  Clarify comment to add which version of the C compiler for AIX needs to have
  some code in a specific order.

  sql/item_func.cc
    1.178 05/03/23 17:26:01 jimw@mysql.com +2 -2
    clarify which compiler (and version) needs code in a certain order

ChangeSet
  1.1832.1.3 05/03/24 00:48:16 konstantin@mysql.com +1 -0
  Add the test case for Bug#8722 "prepared statement with view crashes 
  server" to the test suite, the bug is no longer repeatable.

  tests/mysql_client_test.c
    1.108 05/03/24 00:48:11 konstantin@mysql.com +43 -0
    The test case for Bug#8722 "prepared statement with view crashes server"

ChangeSet
  1.1826.7.5 05/03/23 23:39:20 konstantin@mysql.com +1 -0
  Fix a valgrind warning spotted while trying to repeat Bug#7166
  "Server crashes when running out of connections"

  sql/sql_class.cc
    1.172 05/03/23 23:39:10 konstantin@mysql.com +1 -0
    thd->query_id is compared with thd->warn_id in push_warning, 
    THD::THD seems to be the best place to fix it.

ChangeSet
  1.1832.1.1 05/03/23 21:37:56 serg@serg.mylan +1 -0
  Merge bk-internal:/home/bk/mysql-5.0
  into serg.mylan:/usr/home/serg/Abk/mysql-5.0

  sql/ha_innodb.cc
    1.183 05/03/23 21:37:37 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1616.1761.3 05/03/23 21:08:13 serg@serg.mylan +18 -0
  upgrade zlib to 1.2.2

  zlib/zutil.h
    1.3 05/03/23 21:08:04 serg@serg.mylan +6 -1
    upgrade zlib to 1.2.2

  zlib/zlib.h
    1.3 05/03/23 21:08:04 serg@serg.mylan +15 -15
    upgrade zlib to 1.2.2

  zlib/zlib.3
    1.3 05/03/23 21:08:04 serg@serg.mylan +3 -3
    upgrade zlib to 1.2.2

  zlib/zconf.h
    1.3 05/03/23 21:08:04 serg@serg.mylan +44 -41
    upgrade zlib to 1.2.2

  zlib/trees.c
    1.3 05/03/23 21:08:04 serg@serg.mylan +2 -2
    upgrade zlib to 1.2.2

  zlib/inftrees.c
    1.3 05/03/23 21:08:04 serg@serg.mylan +12 -5
    upgrade zlib to 1.2.2

  zlib/inflate.c
    1.3 05/03/23 21:08:04 serg@serg.mylan +4 -0
    upgrade zlib to 1.2.2

  zlib/inffast.c
    1.3 05/03/23 21:08:04 serg@serg.mylan +2 -2
    upgrade zlib to 1.2.2

  zlib/infback.c
    1.2 05/03/23 21:08:04 serg@serg.mylan +3 -0
    upgrade zlib to 1.2.2

  zlib/gzio.c
    1.3 05/03/23 21:08:04 serg@serg.mylan +4 -0
    upgrade zlib to 1.2.2

  zlib/deflate.h
    1.3 05/03/23 21:08:03 serg@serg.mylan +0 -1
    upgrade zlib to 1.2.2

  zlib/deflate.c
    1.3 05/03/23 21:08:03 serg@serg.mylan +2 -2
    upgrade zlib to 1.2.2

  zlib/crc32.c
    1.3 05/03/23 21:08:03 serg@serg.mylan +49 -27
    upgrade zlib to 1.2.2

  zlib/README
    1.4 05/03/23 21:08:03 serg@serg.mylan +4 -4
    upgrade zlib to 1.2.2

  zlib/INDEX
    1.4 05/03/23 21:08:03 serg@serg.mylan +3 -0
    upgrade zlib to 1.2.2

  zlib/FAQ
    1.4 05/03/23 21:08:03 serg@serg.mylan +55 -33
    upgrade zlib to 1.2.2

  zlib/ChangeLog
    1.3 05/03/23 21:08:03 serg@serg.mylan +42 -0
    upgrade zlib to 1.2.2

  acinclude.m4
    1.123.5.1 05/03/23 21:08:03 serg@serg.mylan +3 -2
    clarify help text

ChangeSet
  1.1616.1761.2 05/03/23 20:38:42 serg@serg.mylan +9 -0
  client/mysqltest.c
      corrected number of fields for --enable_metadata
  sql/sql_union.cc
      fixed a apparent typo in assert

  sql/sql_union.cc
    1.74.24.1 05/03/23 20:38:36 serg@serg.mylan +1 -1
    fixed a apparent typo in assert

  mysql-test/r/type_enum.result
    1.24.1.1 05/03/23 20:38:36 serg@serg.mylan +1 -1
    corrected number of fields for --enable_metadata

  mysql-test/r/ps_5merge.result
    1.2.1.19 05/03/23 20:38:36 serg@serg.mylan +22 -22
    corrected number of fields for --enable_metadata

  mysql-test/r/ps_4heap.result
    1.1.1.20 05/03/23 20:38:36 serg@serg.mylan +11 -11
    corrected number of fields for --enable_metadata

  mysql-test/r/ps_3innodb.result
    1.2.1.21 05/03/23 20:38:36 serg@serg.mylan +11 -11
    corrected number of fields for --enable_metadata

  mysql-test/r/ps_2myisam.result
    1.2.1.20 05/03/23 20:38:36 serg@serg.mylan +11 -11
    corrected number of fields for --enable_metadata

  mysql-test/r/ps_1general.result
    1.1.1.16 05/03/23 20:38:35 serg@serg.mylan +2 -2
    corrected number of fields for --enable_metadata

  mysql-test/r/metadata.result
    1.4.2.1 05/03/23 20:38:35 serg@serg.mylan +6 -6
    corrected number of fields for --enable_metadata

  client/mysqltest.c
    1.92.1.66 05/03/23 20:38:35 serg@serg.mylan +1 -1
    corrected number of fields for --enable_metadata

ChangeSet
  1.1826.6.3 05/03/23 21:36:15 konstantin@mysql.com +2 -0
  A test case for Bug#6282 "Packet error with SELECT INTO"
  (the bug itself is no longer repeatable).

  mysql-test/t/variables.test
    1.37 05/03/23 21:36:08 konstantin@mysql.com +9 -0
    A test case for Bug#6282 "Packet error with SELECT INTO"

  mysql-test/r/variables.result
    1.59 05/03/23 21:36:08 konstantin@mysql.com +8 -0
    Results fixed (Bug#6282)

ChangeSet
  1.1833 05/03/23 19:31:29 serg@serg.mylan +1 -0
  removed unnecessary (and incorrect) space trimming/padding in generating ranges
  (where e.g. col='aaa  ' was converted to col>='aaa' AND col<='aaa       ')
  it was incorrect because ucs2 space is not ' ' (0x20)
  it was unnecessary because storage engine pads values with spaces for comparison anyway

  sql/opt_range.cc
    1.149 05/03/23 19:31:12 serg@serg.mylan +4 -30
    removed unnecessary (and incorrect) space trimming/padding in generating ranges
    (where e.g. col='aaa  ' was converted to col>='aaa' AND col<='aaa       ')
    it was incorrect because ucs2 space is not ' ' (0x20)
    it was unnecessary because storage engine pads values with spaces for comparison anyway

ChangeSet
  1.1616.1765.1 05/03/23 19:19:36 gbichot@quadita2.mysql.com +9 -0
  "After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication":
  s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
  no message on error log (deadlock is too common sometimes), a global counter
  instead (SHOW STATUS LIKE 'slave_retried_transactions').
  Plus a fix for libmysql/Makefile.shared

  BitKeeper/etc/logging_ok
    1.233.47.19 05/03/23 19:19:35 gbichot@quadita2.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/structs.h
    1.36.1.3 05/03/23 19:19:10 gbichot@quadita2.mysql.com +1 -1
    new SHOW_SLAVE_RETRIED_TRANS

  sql/sql_show.cc
    1.122.1.75 05/03/23 19:19:09 gbichot@quadita2.mysql.com +13 -0
    SHOW STATUS LIKE "slave_retried_transactions"; needs replication mutexes.
    Can't be a simple SHOW_LONG, because active_mi is unset (not alloced yet)
    when the static global status_vars is created (active_mi is set
    in init_slave()).

  sql/slave.h
    1.71.1.14 05/03/23 19:19:09 gbichot@quadita2.mysql.com +8 -1
    new global counter rli->retried_trans

  sql/slave.cc
    1.188.1.80 05/03/23 19:19:09 gbichot@quadita2.mysql.com +16 -17
    If slave retries automatically a transaction, no message on error log
    (too common situation); sleep 0 secs at first retry, then 1, 2, 3, 4,
    5, 5, 5... Sleeping 0 is to get the least possible late, as deadlocks
    are usually resolved at first try. New global counter rli->retried_trans
    (for SHOW STATUS: total number of times the slave had to retry
    any transaction). safe_sleep() is thread-safe, sleep() was not.
    I change the rli->trans_retries counter to go from 0 to max instead
    of the other way (better for new sleep()).

  sql/mysqld.cc
    1.356.89.1 05/03/23 19:19:09 gbichot@quadita2.mysql.com +13 -3
    if active_mi could not be alloced, die. New SHOW STATUS LIKE "slave_retried_transactions".

  mysql-test/t/rpl_deadlock.test
    1.1.1.1 05/03/23 19:19:08 gbichot@quadita2.mysql.com +4 -0
    small test addition

  mysql-test/r/rpl_deadlock.result
    1.1.1.1 05/03/23 19:19:08 gbichot@quadita2.mysql.com +6 -0
    result fix

  libmysql/Makefile.shared
    1.55.1.1 05/03/23 19:19:08 gbichot@quadita2.mysql.com +2 -1
    When we "make clean" in libmysql/ we remove the symlinks there, so we
    need to mark that they have to be recreated later: this is done by removing
    ../linked_libmysql_sources. If we don't do this, 'make' will fail after 'cd libmysql;make clean'.
    This Makefile.shared is used by libmysql_r too.
    No reason to remove linked_client_sources as we don't remove the links in client/.

ChangeSet
  1.1832 05/03/23 19:18:25 serg@serg.mylan +7 -0
  sql/sql_acl.cc
      report correct errror in MODE_NO_AUTO_CREATE_USER
      cleanup
  after merge fixes

  sql/sql_acl.cc
    1.145 05/03/23 19:18:16 serg@serg.mylan +16 -14
    report correct errror in MODE_NO_AUTO_CREATE_USER
    cleanup

  sql/share/errmsg.txt
    1.17 05/03/23 19:18:16 serg@serg.mylan +2 -2
    sqlstate fixed

  mysql-test/t/grant3.test
    1.3 05/03/23 19:18:16 serg@serg.mylan +2 -1
    updated after merge

  mysql-test/t/grant2.test
    1.21 05/03/23 19:18:16 serg@serg.mylan +6 -9
    updated after merge

  mysql-test/r/rpl_temporary.result
    1.18 05/03/23 19:18:16 serg@serg.mylan +2 -2
    sqlstate fixed

  mysql-test/r/grant3.result
    1.3 05/03/23 19:18:16 serg@serg.mylan +3 -2
    updated after merge

  mysql-test/r/grant2.result
    1.16.1.7 05/03/23 19:18:16 serg@serg.mylan +6 -8
    updated after merge

ChangeSet
  1.1616.1762.10 05/03/23 10:45:57 paul@kite-hub.kitebird.com +1 -0
  README:
    Fix typo.

  mysql-test/README
    1.8 05/03/23 10:45:41 paul@kite-hub.kitebird.com +1 -1
    Fix typo.

ChangeSet
  1.1826.7.2 05/03/23 18:00:22 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Fix bug #9314 in InnoDB true VARCHAR: InnoDB stored the 'position' of a row wrong in a column prefix primary key index; this could cause MySQL to complain 'ERROR 1032: Can't find record in ...' in an update of the primary key, and also some ORDER BY or DISTINCT queries

  sql/ha_innodb.cc
    1.179.1.2 05/03/23 17:59:04 heikki@hundin.mysql.fi +18 -0
    Fix bug #9314 in InnoDB true VARCHAR: InnoDB stored the 'position' of a row wrong in a column prefix primary key index; this could cause MySQL to complain 'ERROR 1032: Can't find record in ...' in an update of the primary key, and also some ORDER BY or DISTINCT queries

ChangeSet
  1.1826.7.1 05/03/23 17:39:20 ramil@mysql.com +1 -0
  A fix (bug #9309: Wrong order in INFORMATION_SCHEMA)
  

  strings/ctype-utf8.c
    1.86 05/03/23 17:39:15 ramil@mysql.com +1 -1
    A fix (bug #9309: Wrong order in INFORMATION_SCHEMA)
    We should clear the last byte, not the next one.

ChangeSet
  1.1826.1.21 05/03/23 13:25:31 msvensson@neptunus.(none) +3 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
  into neptunus.(none):/home/msvensson/mysql/mysql-5.0

  sql/mysqld.cc
    1.441 05/03/23 13:25:30 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/warnings.test
    1.20 05/03/23 13:25:29 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/warnings.result
    1.29.1.2 05/03/23 13:25:29 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.1826.1.20 05/03/23 11:49:11 mskold@mysql.com +1 -0
  Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

  mysql-test/mysql-test-run.sh
    1.259 05/03/23 11:49:09 mskold@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1826.6.2 05/03/23 10:18:43 georg@lmy002.wdf.sap.corp +1 -0
  added symbols mysql_server_init and mysql_server_end to allow windows
  applications with embedded server to connect to external servers too.
  (required for Connector/OO.org)

  libmysql/libmysql.def
    1.35 05/03/23 10:18:37 georg@lmy002.wdf.sap.corp +2 -0
    added symbols mysql_server_init and mysql_server_end to allow windows
    applications with embedded server to connect to external servers too.
    (required for Connector/OO.org)

ChangeSet
  1.1831 05/03/23 09:42:24 serg@serg.mylan +22 -0
  merged

  sql/sql_parse.cc
    1.429 05/03/23 09:42:16 serg@serg.mylan +0 -2
    merged

  sql/sql_acl.h
    1.42 05/03/23 09:42:16 serg@serg.mylan +0 -2
    merged

  mysql-test/t/grant2.test
    1.20 05/03/23 09:42:16 serg@serg.mylan +0 -32
    merged

  mysql-test/r/grant2.result
    1.16.1.6 05/03/23 09:42:16 serg@serg.mylan +0 -17
    merged

  sql/table.cc
    1.157 05/03/23 09:32:42 serg@serg.mylan +0 -10
    Auto merged

  sql/sql_table.cc
    1.229 05/03/23 09:32:42 serg@serg.mylan +0 -2
    Auto merged

  sql/sql_acl.cc
    1.144 05/03/23 09:32:41 serg@serg.mylan +0 -0
    Auto merged

  sql/item_sum.h
    1.81 05/03/23 09:32:41 serg@serg.mylan +0 -0
    Auto merged

  sql/item_sum.cc
    1.134 05/03/23 09:32:41 serg@serg.mylan +0 -0
    Auto merged

  sql/handler.cc
    1.152 05/03/23 09:32:41 serg@serg.mylan +0 -0
    Auto merged

  sql/field.cc
    1.245 05/03/23 09:32:40 serg@serg.mylan +0 -0
    Auto merged

  scripts/mysql_fix_privilege_tables.sql
    1.28 05/03/23 09:32:40 serg@serg.mylan +0 -37
    Auto merged

  scripts/mysql_fix_privilege_tables.sh
    1.34 05/03/23 09:32:40 serg@serg.mylan +0 -1
    Auto merged

  scripts/mysql_create_system_tables.sh
    1.26 05/03/23 09:32:40 serg@serg.mylan +0 -5
    Auto merged

  scripts/fill_func_tables.sh
    1.4 05/03/23 09:32:40 serg@serg.mylan +0 -4
    Auto merged

  mysql-test/r/view.result
    1.71 05/03/23 09:32:40 serg@serg.mylan +0 -2
    Auto merged

  mysql-test/r/sp.result
    1.102.1.20 05/03/23 09:32:40 serg@serg.mylan +0 -0
    Auto merged

  mysql-test/r/show_check.result
    1.65 05/03/23 09:32:40 serg@serg.mylan +0 -21
    Auto merged

  mysql-test/r/ps_1general.result
    1.32 05/03/23 09:32:40 serg@serg.mylan +0 -1
    Auto merged

  mysql-test/r/ndb_autodiscover.result
    1.21 05/03/23 09:32:40 serg@serg.mylan +0 -2
    Auto merged

  mysql-test/r/information_schema.result
    1.41 05/03/23 09:32:40 serg@serg.mylan +0 -2
    Auto merged

  BitKeeper/etc/logging_ok
    1.298.1.8 05/03/23 09:32:25 serg@serg.mylan +0 -0
    auto-union

ChangeSet
  1.1616.1758.2 05/03/23 08:36:48 bell@sanja.is.com.ua +17 -0
  fixed union types merging and table related metadata (BUG#8824)

  sql/sql_union.cc
    1.74.1.66 05/03/23 08:36:42 bell@sanja.is.com.ua +6 -6
    added table name parameter to prepare() to show right table alias for derived tables

  sql/sql_select.cc
    1.216.102.1 05/03/23 08:36:42 bell@sanja.is.com.ua +3 -11
    new temporary table field creation by Item_type_holder
    fixed table alias for temporary table

  sql/sql_prepare.cc
    1.34.1.111 05/03/23 08:36:42 bell@sanja.is.com.ua +2 -2
    added table name parameter to prepare() to show right table alias for derived tables

  sql/sql_parse.cc
    1.271.1.158 05/03/23 08:36:42 bell@sanja.is.com.ua +2 -4
    made function for enum/set pack length calculation

  sql/sql_lex.h
    1.102.1.82 05/03/23 08:36:42 bell@sanja.is.com.ua +2 -1
    added table name parameter to prepare() to show right table alias for derived tables

  sql/sql_derived.cc
    1.43.1.36 05/03/23 08:36:42 bell@sanja.is.com.ua +2 -2
    added table name parameter to prepare() to show right table alias for derived tables

  sql/item_subselect.cc
    1.60.1.70 05/03/23 08:36:42 bell@sanja.is.com.ua +1 -1
    added table name parameter to prepare() to show right table alias for derived tables

  sql/item_func.h
    1.68.1.52 05/03/23 08:36:42 bell@sanja.is.com.ua +2 -1
    new item type to make correct field type detection possible

  sql/item.h
    1.56.36.2 05/03/23 08:36:42 bell@sanja.is.com.ua +16 -16
    replaced mechanism of merging types of UNION

  sql/item.cc
    1.58.1.137 05/03/23 08:36:42 bell@sanja.is.com.ua +204 -140
    fixed bug in NEW_DATE type field creartion
    replaced mechanism of merging types of UNION

  sql/field.h
    1.120.1.5 05/03/23 08:36:42 bell@sanja.is.com.ua +13 -35
    removed unned field type reporting

  sql/field.cc
    1.197.1.15 05/03/23 08:36:42 bell@sanja.is.com.ua +805 -190
    Field type merging rules added
    Fixed table name/alias returting for field made from temporary tables

  mysql-test/t/union.test
    1.77.1.4 05/03/23 08:36:42 bell@sanja.is.com.ua +25 -0
    test of union of enum

  mysql-test/t/metadata.test
    1.3 05/03/23 08:36:41 bell@sanja.is.com.ua +13 -0
    test of metadata of variables, unions and derived tables

  mysql-test/r/union.result
    1.46.1.41 05/03/23 08:36:41 bell@sanja.is.com.ua +46 -11
    new results
    test of union of enum

  mysql-test/r/metadata.result
    1.4.1.3 05/03/23 08:36:41 bell@sanja.is.com.ua +26 -1
    new result
    test of metadata of variables, unions and derived tables

  mysql-test/r/func_group.result
    1.22.5.9 05/03/23 08:36:41 bell@sanja.is.com.ua +1 -1
    new result

ChangeSet
  1.1616.1764.1 05/03/22 16:10:39 brian@zim.(none) +14 -0
  Additional storage engine called "blackhole". Customer request, and for that matter a Zawodny request.  With this you can alter table to a type of table that would never store data. Its a /dev/null for a database.  

  sql/ha_blackhole.h
    1.1 05/03/22 16:10:37 brian@zim.(none) +79 -0

  sql/ha_blackhole.h
    1.0 05/03/22 16:10:37 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-4.1/sql/ha_blackhole.h

  sql/ha_blackhole.cc
    1.1 05/03/22 16:10:36 brian@zim.(none) +164 -0

  mysql-test/t/blackhole.test
    1.1 05/03/22 16:10:36 brian@zim.(none) +1299 -0

  mysql-test/r/have_blackhole.require
    1.1 05/03/22 16:10:36 brian@zim.(none) +2 -0

  mysql-test/r/blackhole.result
    1.1 05/03/22 16:10:36 brian@zim.(none) +83 -0

  mysql-test/include/have_blackhole.inc
    1.1 05/03/22 16:10:36 brian@zim.(none) +4 -0

  sql/set_var.cc
    1.34.60.4 05/03/22 16:10:36 brian@zim.(none) +1 -0
    Show variable for blackhole engine

  sql/mysqld.cc
    1.356.88.1 05/03/22 16:10:36 brian@zim.(none) +6 -0
    Updates for building backhole.

  sql/mysql_priv.h
    1.186.91.16 05/03/22 16:10:36 brian@zim.(none) +1 -0
    Added blackhole type.

  sql/handler.h
    1.89.19.2 05/03/22 16:10:36 brian@zim.(none) +1 -0
    Flag for storage engine type.

  sql/handler.cc
    1.103.19.4 05/03/22 16:10:36 brian@zim.(none) +9 -0
    Ifdef enable code for blackhole (and message for "what does this thing do").

  sql/ha_blackhole.cc
    1.0 05/03/22 16:10:36 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-4.1/sql/ha_blackhole.cc

  sql/Makefile.am
    1.77.1.35 05/03/22 16:10:36 brian@zim.(none) +2 -2
    Additions to Makefile for blackhole engine

  mysql-test/t/blackhole.test
    1.0 05/03/22 16:10:36 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-4.1/mysql-test/t/blackhole.test

  mysql-test/r/have_blackhole.require
    1.0 05/03/22 16:10:36 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-4.1/mysql-test/r/have_blackhole.require

  mysql-test/r/blackhole.result
    1.0 05/03/22 16:10:36 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-4.1/mysql-test/r/blackhole.result

  mysql-test/include/have_blackhole.inc
    1.0 05/03/22 16:10:36 brian@zim.(none) +0 -0
    BitKeeper file /home/brian/mysql/mysql-4.1/mysql-test/include/have_blackhole.inc

  configure.in
    1.201.47.1 05/03/22 16:10:35 brian@zim.(none) +1 -0
    Rule enabling blackhole engine

  acinclude.m4
    1.123.4.1 05/03/22 16:10:35 brian@zim.(none) +30 -0
    New macro rule for ha_blackhole.

ChangeSet
  1.1826.6.1 05/03/22 16:09:51 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-5.0-5036
  into mysql.com:/home/jimw/my/mysql-5.0-clean

  mysql-test/mysql-test-run.sh
    1.257.1.1 05/03/22 16:09:50 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.1763.1 05/03/22 16:00:02 jimw@mysql.com +3 -0
  Fix calls to memset() with arguments out of order. (Bug #9323)

  ndb/src/kernel/vm/VMSignal.cpp
    1.2 05/03/22 13:46:52 jimw@mysql.com +2 -2
    Fix order of arguments to memset()

  bdb/btree/bt_open.c
    1.4 05/03/22 13:41:06 jimw@mysql.com +1 -1
    Fix order of arguments to memset()

  bdb/hash/hash_open.c
    1.2 05/03/22 13:40:14 jimw@mysql.com +1 -1
    Fix order of arguments to memset()

ChangeSet
  1.1826.1.19 05/03/22 22:31:51 mskold@mysql.com +4 -0
  Merged

  sql/ha_ndbcluster.cc
    1.166 05/03/22 22:31:47 mskold@mysql.com +0 -2
    Merged

  sql/sql_select.cc
    1.304 05/03/22 22:29:56 mskold@mysql.com +0 -1
    Auto merged

  sql/ha_ndbcluster.h
    1.79 05/03/22 22:29:56 mskold@mysql.com +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.258 05/03/22 22:29:56 mskold@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.1762.9 05/03/22 22:12:24 mskold@mysql.com +1 -0
  Simplified rounding up to nearest 64-bit boundry

  ndb/src/ndbapi/DictCache.cpp
    1.11 05/03/22 22:12:07 mskold@mysql.com +1 -3
    Simplified rounding up to nearest 64-bit boundry

ChangeSet
  1.1816.9.18 05/03/22 21:57:03 jimw@mysql.com +0 -0
  Merge mysql.com:/data0/mysqldev/my/mysql-5.0-build
  into mysql.com:/data0/mysqldev/jimw/mysql-5.0-build

