ChangeSet
  1.1581 03/10/17 02:32:09 lenz@mysql.com +1 -0
   - Updated rpl_trunc_binlog test result after last change

  mysql-test/r/rpl_trunc_binlog.result
    1.3 03/10/17 02:32:07 lenz@mysql.com +0 -1
     - Updated rpl_trunc_binlog test result after last change

ChangeSet
  1.1580 03/10/17 00:00:25 guilhem@mysql.com +2 -0
  A fix for a random test failure rpl_trunc_binlog: don't RESET MASTER
  while the slave is connected.

  sql/slave.cc
    1.256 03/10/17 00:00:20 guilhem@mysql.com +1 -1
    typo

  mysql-test/t/rpl_trunc_binlog.test
    1.3 03/10/17 00:00:19 guilhem@mysql.com +0 -2
    don't RESET MASTER while the slave is connected; this could confuse the master or slave.
    (In replication you don't RESET MASTER while a slave is connected!)

ChangeSet
  1.1576.1.1 03/10/16 22:15:36 lenz@mysql.com +1 -0
   - fixed small typo to resolve "test: argument expected" error on Solaris
     and Tru64 when running "mysql_install_db"

  scripts/mysql_install_db.sh
    1.43 03/10/16 22:15:34 lenz@mysql.com +1 -1
     - fixed small typo to resolve "test: argument expected" error on Solaris
       and Tru64 when running "mysql_install_db"

ChangeSet
  1.1577 03/10/16 20:55:15 monty@mashka.mysql.fi +6 -0
  Safety fix to detect multiple calls to my_thread_end()
  Portability fix (For Mac OS X)

  sql/sql_test.cc
    1.15 03/10/16 20:55:10 monty@mashka.mysql.fi +4 -0
    Portability fix (For Mac OS X)

  mysys/my_thr_init.c
    1.22 03/10/16 20:55:10 monty@mashka.mysql.fi +7 -2
    Safety fix to detect multiple calls to my_thread_end()

  mysys/charset.c
    1.35 03/10/16 20:55:10 monty@mashka.mysql.fi +43 -23
    Cleanup indentation
    Remove some short variable names

  libmysqld/lib_sql.cc
    1.43 03/10/16 20:55:10 monty@mashka.mysql.fi +0 -5
    Remove duplicate call to my_thread_end()

  include/my_pthread.h
    1.63 03/10/16 20:55:10 monty@mashka.mysql.fi +1 -0
    Safety fix to detect multiple calls to my_thread_end()

  configure.in
    1.288 03/10/16 20:55:10 monty@mashka.mysql.fi +1 -1
    Added detection of malloc / sys/malloc

ChangeSet
  1.1574.1.1 03/10/16 07:44:18 monty@mashka.mysql.fi +1 -0
  Changing max_insert_delayed_threads now also changes the size of thread alarm buffer.

  sql/set_var.cc
    1.41 03/10/16 07:44:14 monty@mashka.mysql.fi +7 -5
    Changing max_insert_delayed_threads now also changes the size of thread alarm buffer.

ChangeSet
  1.1575 03/10/15 19:50:47 greg@mysql.com +2 -0
  Created small scripts to manage in-tree diffs for 
  NetWare platform, so changes are visible in the tree 
  but cannot affect other platforms.

  netware/BUILD/save-patch
    1.1 03/10/15 19:50:29 greg@mysql.com +56 -0

  netware/BUILD/apply-patch
    1.1 03/10/15 19:50:29 greg@mysql.com +41 -0

  netware/BUILD/save-patch
    1.0 03/10/15 19:50:29 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/4.0/netware/BUILD/save-patch

  netware/BUILD/apply-patch
    1.0 03/10/15 19:50:29 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/4.0/netware/BUILD/apply-patch

ChangeSet
  1.1572.1.1 03/10/15 21:41:13 monty@mashka.mysql.fi +10 -0
  Better fix for CREATE TABLE IF NOT EXISTS ... SELECT
  Fixed chsize() problem on windows
  Extend default timeout on windows clients to 1 year (to avoid timeout problems)

  sql/sql_table.cc
    1.168 03/10/15 21:41:10 monty@mashka.mysql.fi +7 -0
    Better fix for CREATE TABLE IF NOT EXISTS ... SELECT

  sql/sql_insert.cc
    1.105 03/10/15 21:41:10 monty@mashka.mysql.fi +1 -2
    Better fix for CREATE TABLE IF NOT EXISTS ... SELECT

  sql/sql_class.h
    1.165 03/10/15 21:41:10 monty@mashka.mysql.fi +2 -2
    Remove not used 'do_not_drop' field

  sql/slave.cc
    1.255 03/10/15 21:41:10 monty@mashka.mysql.fi +2 -0
    Cleanup temporary tables when slave ends

  sql/handler.h
    1.88 03/10/15 21:41:10 monty@mashka.mysql.fi +9 -9
    Remove not used field 'if_not_exists'
    Ordered fields to be more optimized for new CPU's
    Added field 'table_existed'

  mysys/my_chsize.c
    1.14 03/10/15 21:41:10 monty@mashka.mysql.fi +7 -6
    Fix for windows

  mysql-test/t/create.test
    1.19 03/10/15 21:41:10 monty@mashka.mysql.fi +37 -12
    More tests for CREATE TABLE IF NOT EXISTS ... SELECT

  mysql-test/r/create.result
    1.22 03/10/15 21:41:10 monty@mashka.mysql.fi +16 -0
    More tests for CREATE TABLE IF NOT EXISTS ... SELECT

  libmysql/libmysql.c
    1.131 03/10/15 21:41:10 monty@mashka.mysql.fi +2 -2
    Added client timeouts (for TCP/IP)

  include/mysql.h
    1.51 03/10/15 21:41:09 monty@mashka.mysql.fi +3 -0
    Added client timeouts (for TCP/IP)

ChangeSet
  1.1573 03/10/15 17:10:47 serg@serg.mylan +1 -0
  dummy resize_thr_alarm for Netware

  include/thr_alarm.h
    1.15 03/10/15 17:10:40 serg@serg.mylan +2 -1
    dummy resize_thr_alarm for Netware

ChangeSet
  1.1572 03/10/15 16:55:24 monty@mashka.mysql.fi +2 -0
  Updated comments

  mysys/thr_alarm.c
    1.39 03/10/15 16:55:21 monty@mashka.mysql.fi +6 -2
    Updated comment

  mysys/queues.c
    1.15 03/10/15 16:55:21 monty@mashka.mysql.fi +23 -3
    Comments for new functions (no code change)

ChangeSet
  1.1571 03/10/15 16:23:01 monty@mashka.mysql.fi +4 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.0
  into mashka.mysql.fi:/home/my/mysql-4.0

  sql/sql_parse.cc
    1.343 03/10/15 16:22:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_class.h
    1.164 03/10/15 16:22:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/set_var.cc
    1.40 03/10/15 16:22:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.457 03/10/15 16:22:57 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1570 03/10/15 15:21:50 monty@mashka.mysql.fi +1 -0
  Add more information about memory usage to debug log

  sql/sql_test.cc
    1.14 03/10/15 15:21:48 monty@mashka.mysql.fi +7 -3
    Add more information about memory usage

ChangeSet
  1.1563.25.13 03/10/14 10:45:03 paul@teton.kitebird.com +1 -0
  Identical mysql.ico and MYSQL.ICO
  existed, causing problems on non-case-sensitive OSes.
  Deleted conflicting file.

  BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1
    1.2 03/10/14 10:42:40 paul@teton.kitebird.com +0 -0
    Delete: VC++Files/mysqlshutdown/MYSQL.ICO

ChangeSet
  1.1569 03/10/14 16:30:42 monty@mashka.mysql.fi +4 -0
  Fixed bug in SET enum_system_variable=NULL

  sql/set_var.cc
    1.38.1.2 03/10/14 16:30:39 monty@mashka.mysql.fi +6 -5
    Fixed bug in SET enum_system_variable=NULL
    Moved some array elements to get result sorted

  mysql-test/t/variables.test
    1.17 03/10/14 16:30:39 monty@mashka.mysql.fi +2 -0
    Add test for enum_system_variable=NULL

  mysql-test/r/variables.result
    1.21 03/10/14 16:30:39 monty@mashka.mysql.fi +2 -0
    Add test for enum_system_variable=NULL

ChangeSet
  1.1563.25.12 03/10/14 13:10:41 serg@serg.mylan +1 -0
  make LOCK TABLES to work when Lock_tables_priv is granted on the DB level and Select_priv is granted on the table level.

  sql/sql_parse.cc
    1.342 03/10/14 13:10:39 serg@serg.mylan +1 -1
    make LOCK TABLES to work when Lock_tables_priv is granted on the DB level and Select_priv is granted on the table level.

ChangeSet
  1.1563.25.11 03/10/14 00:27:04 serg@serg.mylan +1 -0
  Merge bk-internal:/home/bk/mysql-4.0/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.0

  sql/slave.cc
    1.254 03/10/14 00:27:01 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1568 03/10/11 22:00:24 monty@mashka.mysql.fi +21 -0
  Add new user variables for tuning memory usage:
  query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size
  Add more checks for "out of memory" detection in range optimization

  sql/table.cc
    1.66 03/10/11 22:00:21 monty@mashka.mysql.fi +1 -1
    Add new user variables for tuning memory usage

  sql/sql_update.cc
    1.92 03/10/11 22:00:21 monty@mashka.mysql.fi +1 -1
    Add new user variables for tuning memory usage

  sql/sql_udf.cc
    1.26 03/10/11 22:00:21 monty@mashka.mysql.fi +1 -1
    Add new user variables for tuning memory usage

  sql/sql_test.cc
    1.13 03/10/11 22:00:20 monty@mashka.mysql.fi +27 -0
    Add information about memory useage if system supports mallinfo()

  sql/sql_select.cc
    1.260 03/10/11 22:00:20 monty@mashka.mysql.fi +11 -8
    Add new user variables for tuning memory usage

  sql/sql_parse.cc
    1.339.1.2 03/10/11 22:00:20 monty@mashka.mysql.fi +9 -9
    Add new user variables for tuning memory usage

  sql/sql_delete.cc
    1.99 03/10/11 22:00:20 monty@mashka.mysql.fi +2 -1
    Add new user variables for tuning memory usage

  sql/sql_class.h
    1.162.1.1 03/10/11 22:00:20 monty@mashka.mysql.fi +5 -0
    Add new user variables for tuning memory usage

  sql/sql_acl.cc
    1.118 03/10/11 22:00:20 monty@mashka.mysql.fi +2 -2
    Add new user variables for tuning memory usage

  sql/set_var.cc
    1.38.1.1 03/10/11 22:00:20 monty@mashka.mysql.fi +25 -0
    Add new user variables for tuning memory usage

  sql/opt_range.h
    1.23 03/10/11 22:00:20 monty@mashka.mysql.fi +8 -6
    Add new user variables for tuning memory usage

  sql/opt_range.cc
    1.85 03/10/11 22:00:20 monty@mashka.mysql.fi +70 -40
    Add new user variables for tuning memory usage
    Add more checks for out of memory conditions

  sql/opt_ft.h
    1.5 03/10/11 22:00:20 monty@mashka.mysql.fi +4 -3
    Add new user variables for tuning memory usage

  sql/opt_ft.cc
    1.3 03/10/11 22:00:20 monty@mashka.mysql.fi +4 -4
    Add new user variables for tuning memory usage

  sql/mysqld.cc
    1.454.1.2 03/10/11 22:00:20 monty@mashka.mysql.fi +29 -1
    Add new user variables for tuning memory usage

  sql/mysql_priv.h
    1.208 03/10/11 22:00:20 monty@mashka.mysql.fi +10 -0
    Add new user variables for tuning memory usage

  sql/log_event.cc
    1.136 03/10/11 22:00:20 monty@mashka.mysql.fi +2 -2
    Add new user variables for tuning memory usage

  sql/ha_berkeley.cc
    1.111 03/10/11 22:00:20 monty@mashka.mysql.fi +1 -1
    Use init_sql_alloc instead of init_alloc_root for better OOM detection

  mysql-test/t/variables.test
    1.16 03/10/11 22:00:20 monty@mashka.mysql.fi +12 -0
    Test of new variables

  mysql-test/r/variables.result
    1.20 03/10/11 22:00:20 monty@mashka.mysql.fi +32 -0
    Test of new variables

  configure.in
    1.287 03/10/11 22:00:20 monty@mashka.mysql.fi +1 -1
    Added detection of mallinfo

  BitKeeper/etc/ignore
    1.151 03/10/11 21:53:01 monty@mashka.mysql.fi +1 -0
    added scripts/make_sharedlib_distribution

ChangeSet
  1.1563.36.1 03/10/09 17:40:38 guilhem@mysql.com +1 -0
  Make the slave die if master is 5.0. Indeed, 5.0 masters send
  a Format_description_log_event (or maybe it will be named
  Description_log_event) which is not recognized by 4.0, so
  a 4.0 can't be a slave of 5.0. We detect it early to produce
  a helpful message instead of "corrupted relay log" later.

  sql/slave.cc
    1.251.1.2 03/10/09 17:40:33 guilhem@mysql.com +3 -2
    Make the slave die if master is 5.0.

ChangeSet
  1.1563.32.12 03/10/08 17:15:59 vva@eagle.mysql.r18.ru +1 -0
  fixed temp directory for mysqlbinlog (was wrong on solaris)

  mysql-test/t/mysqlbinlog.test
    1.5 03/10/08 17:15:52 vva@eagle.mysql.r18.ru +8 -8
    fixed temp directory for mysqlbinlog (was wrong on solaris)

ChangeSet
  1.1563.32.11 03/10/08 12:49:42 lenz@mysql.com +1 -0
  Merge

  scripts/Makefile.am
    1.30 03/10/08 12:49:40 lenz@mysql.com +0 -0
    SCCS merged

ChangeSet
  1.1563.35.1 03/10/08 12:35:24 lenz@mysql.com +2 -0
   - added make_sharedlib_distribution.sh to the source distribution

  scripts/make_sharedlib_distribution.sh
    1.1 03/10/08 12:35:22 lenz@mysql.com +117 -0

  scripts/make_sharedlib_distribution.sh
    1.0 03/10/08 12:35:22 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.0-build/scripts/make_sharedlib_distribution.sh

  scripts/Makefile.am
    1.27.1.1 03/10/08 12:35:22 lenz@mysql.com +3 -1
     - added make_sharedlib_distribution.sh to the source distribution

ChangeSet
  1.1563.32.10 03/10/08 10:23:54 monty@narttu.mysql.fi +2 -0
  Fixed test case that my last patch to mysqlbinlog broke.
  Changed --remote to --read-from-remote-server (mysqlbinlog)

  mysql-test/t/mysqlbinlog.test
    1.4 03/10/08 10:23:53 monty@narttu.mysql.fi +4 -4
    Fixed test case that --remote broke

  client/mysqlbinlog.cc
    1.89 03/10/08 10:23:53 monty@narttu.mysql.fi +1 -1
    Changed --remote to --read-from-remote-server to make option more understandable

ChangeSet
  1.1563.34.1 03/10/08 01:30:10 monty@narttu.mysql.fi +1 -0
  Fix for option 'R' (connect to remote server) in mysqlbinlog

  client/mysqlbinlog.cc
    1.88 03/10/08 01:30:09 monty@narttu.mysql.fi +11 -17
    Fix for option 'R' (connect to remote server)

ChangeSet
  1.1563.25.10 03/10/07 18:58:36 serg@serg.mylan +4 -0
  merged

ChangeSet
  1.1563.32.8 03/10/07 18:45:22 guilhem@mysql.com +1 -0
  Fix for a test failure with the standard (no-BDB) binary:
  as the test is meaningful only if the slave supports transactions,
  we require this. As in 4.0 the slave runs with --skip-innodb, we
  test for BDB.

  extra/resolveip.c
    1.22 03/10/07 18:58:34 serg@serg.mylan +2 -0
    merged

  sql/sql_parse.cc
    1.341 03/10/07 18:57:39 serg@serg.mylan +0 -0
    Auto merged

  sql/slave.cc
    1.253 03/10/07 18:57:39 serg@serg.mylan +0 -0
    Auto merged

  mysql-test/r/create.result
    1.21 03/10/07 18:57:39 serg@serg.mylan +0 -0
    Auto merged

  mysql-test/t/rpl_trunc_binlog.test
    1.2 03/10/07 18:45:18 guilhem@mysql.com +4 -0
    Fix for a test failure with the standard (no-BDB) binary:
    as the test is meaningful only if the slave supports transactions,
    we require this. As in 4.0 the slave runs with --skip-innodb, we
    test for BDB.

ChangeSet
  1.1563.32.6 03/10/07 15:44:31 monty@narttu.mysql.fi +4 -0
  Simple cleanups

  scripts/mysql_install_db.sh
    1.42 03/10/07 15:44:29 monty@narttu.mysql.fi +1 -1
    Change -eq to =

  scripts/Makefile.am
    1.29 03/10/07 15:44:29 monty@narttu.mysql.fi +0 -1
    Remove duplicate

  mysql-test/mysql-test-run.sh
    1.182 03/10/07 15:44:29 monty@narttu.mysql.fi +8 -6
    Cleanup of mysqldump/mysqlbinlog argument handling

  client/mysqlbinlog.cc
    1.87 03/10/07 15:44:29 monty@narttu.mysql.fi +9 -1
    Add default handling to mysqlbinlog

ChangeSet
  1.1563.32.5 03/10/07 00:23:29 monty@narttu.mysql.fi +4 -0
  After merge fixes

  sql/log_event.cc
    1.135 03/10/07 00:23:28 monty@narttu.mysql.fi +5 -5
    Better (shorter) error message

  mysql-test/r/rpl_trunc_binlog.result
    1.2 03/10/07 00:23:28 monty@narttu.mysql.fi +1 -1
    Updated results

  mysql-test/mysql-test-run.sh
    1.181 03/10/07 00:23:28 monty@narttu.mysql.fi +1 -1
    Fixed comment

  extra/resolveip.c
    1.20.1.2 03/10/07 00:23:28 monty@narttu.mysql.fi +1 -0
    After merge fix

ChangeSet
  1.1563.32.4 03/10/06 21:21:04 monty@narttu.mysql.fi +38 -0
  Merge with 3.23.58

  sql/sql_parse.cc
    1.339.1.1 03/10/06 21:21:02 monty@narttu.mysql.fi +0 -12
    Merge with 3.23.58 (Keep old code)

  sql/slave.cc
    1.251.1.1 03/10/06 21:21:02 monty@narttu.mysql.fi +0 -2
    Merge with 3.23.58 (Keep old code)

  scripts/Makefile.am
    1.28 03/10/06 21:21:02 monty@narttu.mysql.fi +0 -2
    Merge with 3.23.58

  extra/resolveip.c
    1.20.1.1 03/10/06 21:21:02 monty@narttu.mysql.fi +0 -6
    Merge with 3.23.58

  configure.in
    1.286 03/10/06 21:21:02 monty@narttu.mysql.fi +0 -1
    Merge with 3.23.58 (Keep old code)

  BitKeeper/deleted/.del-Documentation.fgl~cf0ac866737a5c7d
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-value.shl~98c2851db96b919e
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-value.shl~718b5b291d5ff04d
    1.5 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-infolist.txt~ee370f4771c83a97
    1.5 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-infolist.txt~58b203247936d266
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-Setup.tsb~e74dbc7688d4019a
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-Setup.rul~14510a994d515f19
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-Setup.obs~2f09140119879bc6
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-Setup.ins~ab68efc133d8411e
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-Setup.ino~85f07a856a69a722
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-Setup.dbg~688e9d3ec362ec34
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-Servers.fgl~36147accb82f759
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-SETUP.BMP~77e20d86bceb4903
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-MySQL 3.23.com.ipr~eb817edea43c6e6e
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-Grant Tables.fgl~31e527d126c42d90
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-Documentation.fgl~cf0ac866737a5c7d
    1.3 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/File Groups/Documentation.fgl -> BitKeeper/deleted/.del-Documentation.fgl~cf0ac866737a5c7d

  BitKeeper/deleted/.del-Development.fgl~ca1458874a3fef81
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-Default.shl~e18d3f10bef97a28
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-Default.shl~a02a9093c2b6b0d9
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-Default.rge~2218627c2a901409
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-Default.fgl~a86ce70180b5aba4
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-Default.fgl~45b9e847fa4da131
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-Default.fdf~466762fdf65e1477
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-Default.cdf~1da6505528200d5e
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-Clients and Tools.fgl~826a8e3f651af365
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-Build.tsb~f3be7d512e6d5b74
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-.fgl~cac6624e1ac6ee1d
    1.4 03/10/06 21:16:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-Development.fgl~ca1458874a3fef81
    1.3 03/10/06 21:16:17 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/File Groups/Development.fgl -> BitKeeper/deleted/.del-Development.fgl~ca1458874a3fef81

  BitKeeper/deleted/.del-Default.fgl~a86ce70180b5aba4
    1.3 03/10/06 21:16:16 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/File Groups/Default.fgl -> BitKeeper/deleted/.del-Default.fgl~a86ce70180b5aba4

  BitKeeper/deleted/.del-Default.fdf~466762fdf65e1477
    1.3 03/10/06 21:16:15 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/File Groups/Default.fdf -> BitKeeper/deleted/.del-Default.fdf~466762fdf65e1477

  BitKeeper/deleted/.del-Clients and Tools.fgl~826a8e3f651af365
    1.3 03/10/06 21:16:14 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/File Groups/Clients and Tools.fgl -> BitKeeper/deleted/.del-Clients and Tools.fgl~826a8e3f651af365

  BitKeeper/deleted/.del-Default.fgl~45b9e847fa4da131
    1.3 03/10/06 21:16:11 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/Component Definitions/Default.fgl -> BitKeeper/deleted/.del-Default.fgl~45b9e847fa4da131

  BitKeeper/deleted/.del-make_win_src_distribution.sh
    1.2 03/10/06 21:16:03 monty@narttu.mysql.fi +0 -0
    Delete: scripts/make_win_src_distribution.sh

  BitKeeper/deleted/.del-thr_test.c
    1.2 03/10/06 21:14:58 monty@narttu.mysql.fi +0 -0
    Delete: VC++Files/thr_test/thr_test.c

  BitKeeper/deleted/.del-mysqlwatch.c
    1.2 03/10/06 21:14:33 monty@narttu.mysql.fi +0 -0
    Delete: VC++Files/mysqlwatch/mysqlwatch.c

  BitKeeper/deleted/.del-Default.cdf~1da6505528200d5e
    1.3 03/10/06 21:14:22 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/Component Definitions/Default.cdf -> BitKeeper/deleted/.del-Default.cdf~1da6505528200d5e

  BitKeeper/deleted/.del-mysqlshutdown.rc
    1.2 03/10/06 21:14:15 monty@narttu.mysql.fi +0 -0
    Delete: VC++Files/mysqlshutdown/mysqlshutdown.rc

  BitKeeper/deleted/.del-mysqlshutdown.c
    1.2 03/10/06 21:14:03 monty@narttu.mysql.fi +0 -0
    Delete: VC++Files/mysqlshutdown/mysqlshutdown.c

ChangeSet
  1.1563.25.9 03/10/06 20:11:39 serg@serg.mylan +1 -0
  results updated

  mysql-test/r/create.result
    1.19.1.1 03/10/06 20:11:37 serg@serg.mylan +22 -0
    results updated

  mytest-old.c
    1.2 03/10/06 21:11:03 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/libmysqltest/mytest.c -> mytest-old.c

  BitKeeper/deleted/.del-Setup.tsb~e74dbc7688d4019a
    1.3 03/10/06 21:09:40 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/Text Substitutions/Setup.tsb -> BitKeeper/deleted/.del-Setup.tsb~e74dbc7688d4019a

  BitKeeper/deleted/.del-value.shl~718b5b291d5ff04d
    1.4 03/10/06 21:09:39 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/String Tables/0009-English/value.shl -> BitKeeper/deleted/.del-value.shl~718b5b291d5ff04d

  BitKeeper/deleted/.del-Build.tsb~f3be7d512e6d5b74
    1.3 03/10/06 21:09:39 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/Text Substitutions/Build.tsb -> BitKeeper/deleted/.del-Build.tsb~f3be7d512e6d5b74

  BitKeeper/deleted/.del-Default.shl~e18d3f10bef97a28
    1.3 03/10/06 21:09:38 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/String Tables/Default.shl -> BitKeeper/deleted/.del-Default.shl~e18d3f10bef97a28

  BitKeeper/deleted/.del-Default.shl~a02a9093c2b6b0d9
    1.3 03/10/06 21:09:38 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/Shell Objects/Default.shl -> BitKeeper/deleted/.del-Default.shl~a02a9093c2b6b0d9

  BitKeeper/deleted/.del-.fgl~cac6624e1ac6ee1d
    1.3 03/10/06 21:09:36 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/Component Definitions/.fgl -> BitKeeper/deleted/.del-.fgl~cac6624e1ac6ee1d

  BitKeeper/deleted/.del-SETUP.BMP~77e20d86bceb4903
    1.3 03/10/06 21:09:34 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP -> BitKeeper/deleted/.del-SETUP.BMP~77e20d86bceb4903

  BitKeeper/deleted/.del-infolist.txt~ee370f4771c83a97
    1.4 03/10/06 21:09:33 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt -> BitKeeper/deleted/.del-infolist.txt~ee370f4771c83a97

  BitKeeper/deleted/.del-Setup.rul~14510a994d515f19
    1.3 03/10/06 21:09:33 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.rul -> BitKeeper/deleted/.del-Setup.rul~14510a994d515f19

  BitKeeper/deleted/.del-Setup.obs~2f09140119879bc6
    1.3 03/10/06 21:09:32 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.obs -> BitKeeper/deleted/.del-Setup.obs~2f09140119879bc6

  BitKeeper/deleted/.del-Setup.ins~ab68efc133d8411e
    1.3 03/10/06 21:09:32 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.ins -> BitKeeper/deleted/.del-Setup.ins~ab68efc133d8411e

  BitKeeper/deleted/.del-Setup.ino~85f07a856a69a722
    1.3 03/10/06 21:09:31 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.ino -> BitKeeper/deleted/.del-Setup.ino~85f07a856a69a722

  BitKeeper/deleted/.del-Setup.dbg~688e9d3ec362ec34
    1.3 03/10/06 21:09:30 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.dbg -> BitKeeper/deleted/.del-Setup.dbg~688e9d3ec362ec34

  BitKeeper/deleted/.del-Default.rge~2218627c2a901409
    1.3 03/10/06 21:09:30 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/Registry Entries/Default.rge -> BitKeeper/deleted/.del-Default.rge~2218627c2a901409

  BitKeeper/deleted/.del-Servers.fgl~36147accb82f759
    1.3 03/10/06 21:09:29 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/File Groups/Servers.fgl -> BitKeeper/deleted/.del-Servers.fgl~36147accb82f759

  BitKeeper/deleted/.del-Grant Tables.fgl~31e527d126c42d90
    1.3 03/10/06 21:09:28 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/File Groups/Grant Tables.fgl -> BitKeeper/deleted/.del-Grant Tables.fgl~31e527d126c42d90

  BitKeeper/deleted/.del-MySQL 3.23.com.ipr~eb817edea43c6e6e
    1.3 03/10/06 21:09:24 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-com/MySQL 3.23.com.ipr -> BitKeeper/deleted/.del-MySQL 3.23.com.ipr~eb817edea43c6e6e

  BitKeeper/deleted/.del-value.shl~98c2851db96b919e
    1.3 03/10/06 21:08:58 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-gpl/String Tables/0009-English/value.shl -> BitKeeper/deleted/.del-value.shl~98c2851db96b919e

  BitKeeper/deleted/.del-infolist.txt~58b203247936d266
    1.3 03/10/06 21:08:58 monty@narttu.mysql.fi +0 -0
    Merge rename: VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt -> BitKeeper/deleted/.del-infolist.txt~58b203247936d266

  BitKeeper/etc/logging_ok
    1.291 03/10/06 21:08:47 monty@narttu.mysql.fi +0 -1
    auto-union

ChangeSet
  1.1563.25.8 03/10/06 20:02:27 serg@serg.mylan +3 -0
  bug #1434 (and related issues)

  sql/sql_insert.cc
    1.104 03/10/06 20:02:24 serg@serg.mylan +12 -2
    bug #1434 (and related issues)

  sql/sql_class.h
    1.163 03/10/06 20:02:24 serg@serg.mylan +2 -2
    bug #1434 (and related issues)

  mysql-test/t/create.test
    1.18 03/10/06 20:02:24 serg@serg.mylan +21 -1
    bug #1434 (and related issues)

ChangeSet
  1.676.1.742 03/10/06 20:31:35 monty@narttu.mysql.fi +1 -0
  Portability fix

  extra/resolveip.c
    1.4.1.8 03/10/06 20:31:34 monty@narttu.mysql.fi +1 -1
    Portability fix

ChangeSet
  1.1563.25.7 03/10/06 14:11:16 serg@serg.mylan +5 -0
  fix_max_connections to resize alarm_queue (Bug #1435)

  sql/set_var.cc
    1.39 03/10/06 14:11:13 serg@serg.mylan +15 -6
    fix_max_connections to resize alarm_queue (Bug #1435)

  mysys/thr_alarm.c
    1.38 03/10/06 14:11:13 serg@serg.mylan +10 -0
    resize_thr_alarm() to resize alarm_queue

  mysys/queues.c
    1.14 03/10/06 14:11:13 serg@serg.mylan +17 -7
    resize_queue()

  include/thr_alarm.h
    1.14 03/10/06 14:11:13 serg@serg.mylan +1 -0
    resize_thr_alarm() to resize alarm_queue

  include/queues.h
    1.10 03/10/06 14:11:13 serg@serg.mylan +1 -0
    resize_queue()

ChangeSet
  1.1563.32.3 03/10/06 15:47:17 ram@gw.mysql.r18.ru +1 -0
  Fix for the bug #1336 mysql.cc assumes DATABASE() doesn't return NULL

  client/mysql.cc
    1.143 03/10/06 15:47:02 ram@gw.mysql.r18.ru +1 -1
    Fix for the bug #1336 mysql.cc assumes DATABASE() doesn't return NULL

ChangeSet
  1.1563.32.2 03/10/06 10:50:12 heikki@hundin.mysql.fi +1 -0
  row0mysql.c:
    Remove unintentional changes in previous push

  innobase/row/row0mysql.c
    1.50 03/10/06 10:50:04 heikki@hundin.mysql.fi +2 -6
    Remove unintentional changes in previous push

ChangeSet
  1.1563.32.1 03/10/06 10:46:22 heikki@hundin.mysql.fi +1 -0
  row0mysql.c:
    Fix bug: if one used the rename trick of ibman section 15.1 to recover a temp table, InnoDB asserted because it tried to lock the data dictionary twice

  innobase/row/row0mysql.c
    1.49 03/10/06 10:46:11 heikki@hundin.mysql.fi +27 -5
    Fix bug: if one used the rename trick of ibman section 15.1 to recover a temp table, InnoDB asserted because it tried to lock the data dictionary twice

ChangeSet
  1.1563.25.6 03/10/06 09:24:12 serg@serg.mylan +2 -0
  Merge bk-internal:/home/bk/mysql-4.0/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.0

  sql/mysqld.cc
    1.456 03/10/06 09:24:09 serg@serg.mylan +0 -0
    Auto merged

  scripts/mysql_config.sh
    1.9 03/10/06 09:24:09 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1563.31.1 03/10/04 17:41:17 paul@ice.snake.net +3 -0
  Ride hobby horse.

  support-files/my-small.cnf.sh
    1.16 03/10/04 17:41:10 paul@ice.snake.net +1 -1
    deamon -> daemon

  scripts/mysql_install_db.sh
    1.41 03/10/04 17:41:09 paul@ice.snake.net +1 -1
    deamon -> daemon

  mysql-test/mysql-test-run.sh
    1.180 03/10/04 17:41:09 paul@ice.snake.net +3 -3
    deamon -> daemon

ChangeSet
  1.1563.29.1 03/10/03 17:54:32 vva@eagle.mysql.r18.ru +2 -0
  Fixed bug #1323 (varchar fields becoming char fields adter create ... select)

  sql/sql_select.cc
    1.259 03/10/03 17:54:11 vva@eagle.mysql.r18.ru +2 -0
    Fixed bug #1323 (varchar fields becoming char fields adter create ... select)

  mysql-test/r/create.result
    1.20 03/10/03 17:54:11 vva@eagle.mysql.r18.ru +1 -1
    Fixed bug #1323 (varchar fields becoming char fields adter create ... select)

ChangeSet
  1.1563.28.1 03/10/03 22:13:01 guilhem@mysql.com +4 -0
  When the I/O thread was stopped while copying a long transaction, and restarted,
  Rotate_log_event::exec_event() believed that the relay log was corrupted. Fixed it
  by moving the test for corruption to Start_log_event::exec_event(). 
  Changed Rotate_log_event::exec_event() to not increment positions when the
  event is seen in the middle of a transaction.
  I did a separate commit in 4.1 (so this should not be merged to 4.0) because
  code is a bit different in 4.1.
  A test to see if the slave detects when the master died while writing a 
  transaction to the binlog (uses a forged truncated binlog I made).

  mysql-test/t/rpl_trunc_binlog.test
    1.1 03/10/03 22:12:51 guilhem@mysql.com +22 -0

  mysql-test/t/rpl_trunc_binlog.test
    1.0 03/10/03 22:12:51 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/rpl_trunc_binlog.test

  mysql-test/std_data/trunc_binlog.001
    1.1 03/10/03 22:12:50 guilhem@mysql.com +4 -0

  mysql-test/r/rpl_trunc_binlog.result
    1.1 03/10/03 22:12:50 guilhem@mysql.com +14 -0

  sql/log_event.cc
    1.134 03/10/03 22:12:50 guilhem@mysql.com +33 -33
    When the I/O thread was stopped while copying a long transaction, and restarted,
    Rotate_log_event::exec_event() believed that the relay log was corrupted. Fixed it
    by moving the test for corruption to Start_log_event::exec_event(). 
    Changed Rotate_log_event::exec_event() to not increment positions when the
    event is seen in the middle of a transaction.

  mysql-test/std_data/trunc_binlog.001
    1.0 03/10/03 22:12:50 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/std_data/trunc_binlog.001

  mysql-test/r/rpl_trunc_binlog.result
    1.0 03/10/03 22:12:50 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/r/rpl_trunc_binlog.result

ChangeSet
  1.1563.27.1 03/10/03 11:42:37 paul@ice.snake.net +3 -0
  Minor edits.

  BitKeeper/etc/logging_ok
    1.290 03/10/03 11:42:36 paul@ice.snake.net +1 -0
    Logging to logging@openlogging.org accepted

  man/mysqldump.1
    1.6 03/10/03 11:42:18 paul@ice.snake.net +1 -1
    Minor edits.

  man/mysqlaccess.1
    1.6 03/10/03 11:42:18 paul@ice.snake.net +4 -4
    Minor edits.

ChangeSet
  1.1563.26.1 03/10/03 00:40:27 monty@mishka.mysql.fi +8 -0
  Optimized code for setting user variables with := and fixed some bugs in old code (Bug #1194)
  Use forced close of socket to make mysqld shutdown faster when used under valgrind

  sql/sql_class.h
    1.162 03/10/03 00:40:21 monty@mishka.mysql.fi +5 -0
    Optimized code for setting user variables

  sql/mysqld.cc
    1.454.1.1 03/10/03 00:40:21 monty@mishka.mysql.fi +8 -4
    Use forced close of socket to make mysqld shutdown faster when used under valgrind

  sql/log.cc
    1.140 03/10/03 00:40:21 monty@mishka.mysql.fi +3 -3
    Fixed comments

  sql/item_func.h
    1.63 03/10/03 00:40:20 monty@mishka.mysql.fi +5 -35
    Optimized code for setting user variables

  sql/item_func.cc
    1.103 03/10/03 00:40:20 monty@mishka.mysql.fi +136 -98
    Optimized code for setting user variables with := and fixed some bugs in old code

  mysql-test/t/user_var.test
    1.8 03/10/03 00:40:20 monty@mishka.mysql.fi +15 -4
    Extended test for user variables

  mysql-test/r/user_var.result
    1.11 03/10/03 00:40:20 monty@mishka.mysql.fi +28 -5
    Extended test for user variables

  mysql-test/mysql-test-run.sh
    1.179 03/10/03 00:40:20 monty@mishka.mysql.fi +2 -2
    Added --skip-bdb for valgrind

ChangeSet
  1.1563.25.1 03/10/02 16:25:47 guilhem@mysql.com +1 -0
  Reverting changeset 1.1590

  sql/slave.h
    1.67 03/10/02 16:25:43 guilhem@mysql.com +2 -23
    Reverting changeset 1.1590.

ChangeSet
  1.1563.24.1 03/10/01 18:40:27 guilhem@mysql.com +1 -0
  Follow-up of an IRC discussion today. Declaring ignore_log_space_limit volatile,
  and a comment to explain why.

  sql/slave.h
    1.66 03/10/01 18:40:23 guilhem@mysql.com +24 -2
    Declaring ignore_log_space_limit volatile,
    and a comment to explain why.

ChangeSet
  1.1563.22.3 03/10/01 12:00:08 vva@eagle.mysql.r18.ru +2 -0
  turn Item_func_set_user_var 
   ::native_val, ::native_val_int and native_val_str into inline

  sql/item_func.h
    1.62 03/10/01 12:00:06 vva@eagle.mysql.r18.ru +31 -4
    turn Item_func_set_user_var 
     ::native_val, ::native_val_int and native_val_str into inline

  sql/item_func.cc
    1.102 03/10/01 12:00:06 vva@eagle.mysql.r18.ru +0 -32
    turn Item_func_set_user_var 
     ::native_val, ::native_val_int and native_val_str into inline

ChangeSet
  1.1563.1.27 03/09/30 23:14:07 greg@mysql.com +5 -0
  New build directory files - NetWare only, as used in 4.0.15

  netware/BUILD/openssl.imp
    1.1 03/09/30 23:13:49 greg@mysql.com +9 -0

  netware/BUILD/knetware.imp
    1.1 03/09/30 23:13:49 greg@mysql.com +2 -0

  netware/BUILD/compile-netware-src
    1.1 03/09/30 23:13:49 greg@mysql.com +36 -0

  netware/BUILD/compile-netware-max-debug
    1.1 03/09/30 23:13:49 greg@mysql.com +23 -0

  netware/BUILD/openssl.imp
    1.0 03/09/30 23:13:49 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/4.0/netware/BUILD/openssl.imp

  netware/BUILD/knetware.imp
    1.0 03/09/30 23:13:49 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/4.0/netware/BUILD/knetware.imp

  netware/BUILD/compile-netware-src
    1.0 03/09/30 23:13:49 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/4.0/netware/BUILD/compile-netware-src

  netware/BUILD/compile-netware-max
    1.1 03/09/30 23:13:48 greg@mysql.com +23 -0

  netware/BUILD/compile-netware-max-debug
    1.0 03/09/30 23:13:49 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/4.0/netware/BUILD/compile-netware-max-debug

  netware/BUILD/compile-netware-max
    1.0 03/09/30 23:13:48 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/4.0/netware/BUILD/compile-netware-max

ChangeSet
  1.1563.22.2 03/09/30 12:32:48 vva@eagle.mysql.r18.ru +2 -0
  rewrite Item_func_set_user_var ::val, ::val_str, ::val_int, ::update
  with less code duplication

  sql/item_func.h
    1.61 03/09/30 12:32:46 vva@eagle.mysql.r18.ru +5 -0
    rewrite Item_func_set_user_var ::val, ::val_str, ::val_int, ::update
    with less code duplication

  sql/item_func.cc
    1.101 03/09/30 12:32:46 vva@eagle.mysql.r18.ru +46 -89
    rewrite Item_func_set_user_var ::val, ::val_str, ::val_int, ::update
    with less code duplication

ChangeSet
  1.1563.1.26 03/09/30 00:08:12 guilhem@mysql.com +1 -0
  A note that Valgrind does not give a good stacktrace when the problem
  is involving an assembly function.
  Testcase was BUG#1194
  SELECT @a:=1; SELECT @a, @a:=1;

  BUILD/compile-pentium-valgrind-max
    1.3 03/09/30 00:08:03 guilhem@mysql.com +24 -0
    a warning note about Valgrind&assembly.

ChangeSet
  1.1563.1.25 03/09/29 22:56:31 guilhem@mysql.com +2 -0
  fix for a random test failure on hpux/ia64
  (a missing synchronization in the test)

  mysql-test/t/drop_temp_table.test
    1.2 03/09/29 22:56:18 guilhem@mysql.com +6 -0
    synchronize to be sure that the ending connection has finished binlogging.

  mysql-test/r/drop_temp_table.result
    1.3 03/09/29 22:56:18 guilhem@mysql.com +7 -0
    result update

ChangeSet
  1.1563.1.24 03/09/29 23:10:30 dlenev@mysql.com +2 -0
  Added resetting of replace_result patterns after --exec command in mysqltest (in order to be consistent with ordinary query execution).

  mysql-test/t/mysqlbinlog.test
    1.3 03/09/29 23:10:26 dlenev@mysql.com +6 -0
    Added additional replaces potentially needed after adding reset of replace conditions for exec

  client/mysqltest.c
    1.108 03/09/29 23:10:26 dlenev@mysql.com +4 -0
    Now resetting replace_result patterns after --exec command (in order to be consistent with ordinary query execution).

ChangeSet
  1.1563.1.23 03/09/29 12:01:10 lenz@mysql.com +1 -0
   - enable changing the number of table bits for JOINs to be increased
     from ulong to ulonglong by defining -DBIG_JOINS

  sql/mysql_priv.h
    1.207 03/09/29 12:01:08 lenz@mysql.com +5 -0
     - enable changing the number of table bits for JOINs to be increased
       from ulong to ulonglong by defining BIG_JOINS

ChangeSet
  1.1563.1.22 03/09/29 12:31:35 monty@narttu.mysql.fi +18 -0
  Removed random chars after filename for LOAD DATA INFILE (in mysqlbinlog)
  Add quoting for use `database` for mysqlbinlog
  Removed test ins0000001
  Add support for --replace for exec in mysqltest
  Don't refer to install dir in mysqlbinlog.result

  support-files/mysql.server.sh
    1.31 03/09/29 12:31:33 monty@narttu.mysql.fi +13 -10
    Move pid_file test after arguments have been parsed

  sql/log_event.cc
    1.133 03/09/29 12:31:33 monty@narttu.mysql.fi +2 -2
    Add quoting for use `database` for mysqlbinlog

  mysql-test/t/mysqlbinlog.test
    1.2 03/09/29 12:31:33 monty@narttu.mysql.fi +4 -2
    Don't refer to install dir in result

  mysql-test/t/insert.test
    1.10 03/09/29 12:31:33 monty@narttu.mysql.fi +19 -7
    Merge test with ins0000001.test

  mysql-test/t/fulltext_order_by.test
    1.12 03/09/29 12:31:33 monty@narttu.mysql.fi +0 -1
    Remove 'use'

  mysql-test/t/fulltext_multi.test
    1.7 03/09/29 12:31:33 monty@narttu.mysql.fi +1 -1
    Remove 'use'

  mysql-test/r/rpl_log.result
    1.36 03/09/29 12:31:33 monty@narttu.mysql.fi +28 -28
    Updated results after quoting change

  mysql-test/r/mysqlbinlog.result
    1.2 03/09/29 12:31:33 monty@narttu.mysql.fi +6 -7
    Updated results after quoting change

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.3 03/09/29 12:31:33 monty@narttu.mysql.fi +47 -47
    Updated results after quoting change

  mysql-test/r/insert_select.result
    1.13 03/09/29 12:31:33 monty@narttu.mysql.fi +1 -1
    Updated results after quoting change

  mysql-test/r/insert.result
    1.12 03/09/29 12:31:33 monty@narttu.mysql.fi +16 -6
    New tests

  mysql-test/r/fulltext_order_by.result
    1.11 03/09/29 12:31:33 monty@narttu.mysql.fi +0 -1
    Updated results after quoting change

  mysql-test/r/fulltext_multi.result
    1.9 03/09/29 12:31:33 monty@narttu.mysql.fi +0 -1
    Updated results after quoting change

  mysql-test/r/drop_temp_table.result
    1.2 03/09/29 12:31:33 monty@narttu.mysql.fi +3 -3
    Updated results after quoting change

  client/mysqltest.c
    1.107 03/09/29 12:31:33 monty@narttu.mysql.fi +15 -15
    Add support for --replace for 'exec'

  client/mysqlbinlog.cc
    1.86 03/09/29 12:31:33 monty@narttu.mysql.fi +6 -5
    Removed random chars after filename for LOAD DATA INFILE

ChangeSet
  1.1563.11.9 03/09/29 11:21:17 serg@serg.mylan +3 -0
  enum options renamed to avoid possible name conflicts

  sql/mysqld.cc
    1.455 03/09/29 11:21:15 serg@serg.mylan +1 -1
    enum options renamed to avoid possible name conflicts

  myisam/myisamchk.c
    1.109 03/09/29 11:21:15 serg@serg.mylan +1 -1
    enum options renamed to avoid possible name conflicts

  client/client_priv.h
    1.17 03/09/29 11:21:15 serg@serg.mylan +1 -1
    enum options renamed to avoid possible name conflicts

  BitKeeper/deleted/.del-ins000001.test~2428ee5c9b1bc483
    1.8 03/09/29 11:53:34 monty@narttu.mysql.fi +0 -1
    Delete: mysql-test/t/ins000001.test

  BitKeeper/deleted/.del-ins000001.result~f45c599efdf8352b
    1.9 03/09/29 11:53:34 monty@narttu.mysql.fi +0 -1
    Delete: mysql-test/r/ins000001.result

ChangeSet
  1.1563.11.8 03/09/28 21:35:47 serg@serg.mylan +1 -0
  typo fixed (bug #1390 - incorrect mysql_config output)

  scripts/mysql_config.sh
    1.7.1.1 03/09/28 21:35:45 serg@serg.mylan +1 -1
    typo fixed (bug #1390 - incorrect mysql_config output)

ChangeSet
  1.1563.1.21 03/09/28 18:31:49 guilhem@mysql.com +3 -0
  Fix for BUG#1345 "SQL Syntax Error in binarylog with DROP TABLES":
  it's just backquoting the db's and table's names
  when writing DROP TEMPORARY TABLE to the binlog when a connection ends.
  A testcase for this.

  mysql-test/t/drop_temp_table.test
    1.1 03/09/28 18:31:44 guilhem@mysql.com +13 -0

  mysql-test/r/drop_temp_table.result
    1.1 03/09/28 18:31:44 guilhem@mysql.com +11 -0

  mysql-test/t/drop_temp_table.test
    1.0 03/09/28 18:31:44 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/drop_temp_table.test

  mysql-test/r/drop_temp_table.result
    1.0 03/09/28 18:31:44 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/r/drop_temp_table.result

  sql/sql_base.cc
    1.165 03/09/28 18:31:43 guilhem@mysql.com +6 -8
    backquote db and table name when writing DROP TEMPORARY TABLE to the binlog
    when a connection ends.

ChangeSet
  1.1563.11.7 03/09/27 18:54:22 serg@serg.mylan +1 -0
  make mysqld to respect socket/port options of mysqld_safe command line
  and [mysqld_safe] section in my.cnf, even if they are also specified
  in [mysql] section.

  scripts/mysqld_safe.sh
    1.65 03/09/27 18:54:19 serg@serg.mylan +13 -9
    make mysqld to respect socket/port options of mysqld_safe command line
    and [mysqld_safe] section in my.cnf, even if they are also specified
    in [mysql] section.

ChangeSet
  1.1563.23.1 03/09/26 23:43:22 guilhem@mysql.com +1 -0
  Fix for 64-bit machines.
  I am almost sure this is the cause for
  BUG#1381 [Opn]: Bug in replication on HP-UX 64 bit binaries?
  BUG#1256 [CRp]: Replication slave fails to connect to master in 64-bit version (Solaris)
  The reason why I think it's wrong is that the normal client code has 
  uint32 ip_addr.
  (of course on 32-bit machines it does not matter, but on 64-bit it does).

  sql/mini_client.cc
    1.56 03/09/26 23:43:14 guilhem@mysql.com +1 -1
    Fix for 64-bit machines.
    I am almost sure this is the cause for
    BUG#1381 [Opn]: Bug in replication on HP-UX 64 bit binaries?
    BUG#1256 [CRp]: Replication slave fails to connect to master in 64-bit version (Solaris)
    The reason why I think it's wrong is that the normal client code has 
    uint32 ip_addr.
    (of course on 32-bit machines it does not matter, but on 64-bit it does).

ChangeSet
  1.1563.19.5 03/09/25 23:12:24 lenz@mysql.com +21 -0
   - Improved portability of the sql-bench Perl scripts by replacing
     the calls of external programs "uname" and "pwd" with Perl builtin
     functions "cwd()" and "POSIX::uname()"

  sql-bench/test-wisconsin.sh
    1.12 03/09/25 23:09:49 lenz@mysql.com +2 -1
     - portability fix: don't call external "pwd" command, use the "cwd()"
       builtin function instead.

  sql-bench/test-transactions.sh
    1.5 03/09/25 23:09:49 lenz@mysql.com +2 -1
     - portability fix: don't call external "pwd" command, use the "cwd()"
       builtin function instead.

  sql-bench/test-select.sh
    1.23 03/09/25 23:09:49 lenz@mysql.com +2 -1
     - portability fix: don't call external "pwd" command, use the "cwd()"
       builtin function instead.

  sql-bench/test-insert.sh
    1.40 03/09/25 23:09:48 lenz@mysql.com +2 -1
     - portability fix: don't call external "pwd" command, use the "cwd()"
       builtin function instead.

  sql-bench/test-create.sh
    1.11 03/09/25 23:09:48 lenz@mysql.com +2 -1
     - portability fix: don't call external "pwd" command, use the "cwd()"
       builtin function instead.

  sql-bench/test-connect.sh
    1.13 03/09/25 23:09:48 lenz@mysql.com +2 -1
     - portability fix: don't call external "pwd" command, use the "cwd()"
       builtin function instead.

  sql-bench/test-big-tables.sh
    1.8 03/09/25 23:09:48 lenz@mysql.com +2 -1
     - portability fix: don't call external "pwd" command, use the "cwd()"
       builtin function instead.

  sql-bench/test-alter-table.sh
    1.11 03/09/25 23:09:48 lenz@mysql.com +2 -1
     - portability fix: don't call external "pwd" command, use the "cwd()"
       builtin function instead.

  sql-bench/test-ATIS.sh
    1.12 03/09/25 23:09:48 lenz@mysql.com +2 -1
     - portability fix: don't call external "pwd" command, use the "cwd()"
       builtin function instead.

  sql-bench/run-all-tests.sh
    1.12 03/09/25 23:09:48 lenz@mysql.com +2 -1
     - portability fix: don't call external "pwd" command, use the "cwd()"
       builtin function instead.

  sql-bench/innotest2b.sh
    1.2 03/09/25 23:09:48 lenz@mysql.com +2 -1
     - portability fix: don't call external "pwd" command, use the "cwd()"
       builtin function instead.

  sql-bench/innotest2a.sh
    1.2 03/09/25 23:09:48 lenz@mysql.com +2 -1
     - portability fix: don't call external "pwd" command, use the "cwd()"
       builtin function instead.

  sql-bench/innotest2.sh
    1.2 03/09/25 23:09:48 lenz@mysql.com +2 -1
     - portability fix: don't call external "pwd" command, use the "cwd()"
       builtin function instead.

  sql-bench/innotest1b.sh
    1.2 03/09/25 23:09:48 lenz@mysql.com +2 -1
     - portability fix: don't call external "pwd" command, use the "cwd()"
       builtin function instead.

  sql-bench/innotest1a.sh
    1.2 03/09/25 23:09:48 lenz@mysql.com +2 -1
     - portability fix: don't call external "pwd" command, use the "cwd()"
       builtin function instead.

  sql-bench/innotest1.sh
    1.2 03/09/25 23:09:48 lenz@mysql.com +2 -1
     - portability fix: don't call external "pwd" command, use the "cwd()"
       builtin function instead.

  sql-bench/crash-me.sh
    1.51 03/09/25 23:09:48 lenz@mysql.com +5 -19
     - portability fix: don't call external "pwd" command, use the "cwd()"
       builtin function instead.
     - portability fix: don't call external "uname" in various combinations,
       use POSIX::uname() instead.

  sql-bench/copy-db.sh
    1.6 03/09/25 23:09:48 lenz@mysql.com +2 -1
     - portability fix: don't call external "pwd" command, use the "cwd()"
       builtin function instead.

  sql-bench/bench-init.pl.sh
    1.27 03/09/25 23:09:48 lenz@mysql.com +3 -18
     - portability fix: don't call external "pwd" command, use the "cwd()"
       builtin function instead.
     - portability fix: don't call external "uname" in various combinations,
       use POSIX::uname() instead.

  sql-bench/bench-count-distinct.sh
    1.2 03/09/25 23:09:48 lenz@mysql.com +2 -1
     - portability fix: don't call external "pwd" command, use the "cwd()"
       builtin function instead.

  sql-bench/as3ap.sh
    1.2 03/09/25 23:09:48 lenz@mysql.com +2 -1
     - portability fix: don't call external "pwd" command, use the "cwd()"
       builtin function instead.

ChangeSet
  1.1563.22.1 03/09/24 19:30:20 vva@eagle.mysql.r18.ru +3 -0
  fixed bug #1194 
  (changes in Item_func_set_user_var::update, ::val, ::val_str, ::val_int)

  sql/item_func.cc
    1.100 03/09/24 19:29:59 vva@eagle.mysql.r18.ru +102 -17
    fixed bug #1194 
    (changes in Item_func_set_user_var::update, ::val, ::val_str, ::val_int)

  mysql-test/t/user_var.test
    1.7 03/09/24 19:29:59 vva@eagle.mysql.r18.ru +19 -0
    added tests for bug #1194

  mysql-test/r/user_var.result
    1.10 03/09/24 19:29:59 vva@eagle.mysql.r18.ru +32 -0
    added tests for bug #1194

ChangeSet
  1.1563.19.4 03/09/25 00:24:06 guilhem@mysql.com +1 -0
  a small comment about why we call end_io_cache in mysql_load

  sql/sql_load.cc
    1.53 03/09/25 00:23:57 guilhem@mysql.com +5 -0
    small comment

ChangeSet
  1.1563.21.1 03/09/25 00:14:46 guilhem@mysql.com +4 -0
  Fix for BUG#1391:
  "If LOAD DATA INFILE 'small_file' fails on master, slave leaves temp files"
  (the bug is in the master)

  sql/sql_load.cc
    1.52 03/09/25 00:14:41 guilhem@mysql.com +24 -15
    fix for bug#1391:
    for a small file, we had in the binlog only the Create_file, not the Delete_file
    (the Create_file was written when the READ_INFO was destroyed).

  mysql-test/t/rpl_loaddata.test
    1.9 03/09/25 00:14:40 guilhem@mysql.com +15 -0
    testcase for bug#1391.

  mysql-test/std_data/rpl_loaddata2.dat
    1.3 03/09/25 00:14:40 guilhem@mysql.com +1 -1
    change to introduce a unique key violation

  mysql-test/r/rpl_loaddata.result
    1.10 03/09/25 00:14:40 guilhem@mysql.com +12 -1
    result update

ChangeSet
  1.1563.19.2 03/09/25 01:25:54 dlenev@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.0
  into mysql.com:/home/dlenev/src/mysql-4.0-bgrn

  sql/log_event.cc
    1.132 03/09/25 01:25:52 dlenev@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1563.20.1 03/09/25 01:25:19 dlenev@mysql.com +1 -0
  Fixed BUG#1357 MySQL too eagerly cleanups temporary files for LOAD DATA (SQL_LOAD-...) 

  sql/log_event.cc
    1.130.1.1 03/09/25 01:25:17 dlenev@mysql.com +19 -7
    Now cleaning up only our files during processing of Start_log_event

ChangeSet
  1.1563.14.7 03/09/24 22:55:04 guilhem@mysql.com +2 -0
  Fix for
  Bug #1392 "On Win, slave leaves one temp file after successf. replicating LOAD DATA INFILE"
  Windows-specific bug (we forgot to close a file before deleting it).
  Patch written by me, tested by Miguel (thanks!) and it works.

  sql/log_event.cc
    1.131 03/09/24 22:55:00 guilhem@mysql.com +10 -0
    When you finish replicating LOAD DATA INFILE, close the SQL_LOADxxx.data file
    before deleting it, or Windows will refuse to delete.
    No need to do the same thing for the SQL_LOADxxx.data file, it's not opened
    at this moment.

  sql/log.cc
    1.139 03/09/24 22:54:59 guilhem@mysql.com +1 -1
    changed the comment to mean the truth

ChangeSet
  1.1563.1.17 03/09/24 23:25:58 dlenev@mysql.com +4 -0
  Test for mysqlbinlog
  Particularly for BUG#1340 mysqlbinlog coredumps when reading Exec
  event without seeing Create_file event before

  mysql-test/t/mysqlbinlog.test
    1.1 03/09/24 23:25:55 dlenev@mysql.com +95 -0

  mysql-test/t/mysqlbinlog-master.opt
    1.1 03/09/24 23:25:55 dlenev@mysql.com +1 -0

  mysql-test/r/mysqlbinlog.result
    1.1 03/09/24 23:25:55 dlenev@mysql.com +84 -0

  mysql-test/t/mysqlbinlog.test
    1.0 03/09/24 23:25:55 dlenev@mysql.com +0 -0
    BitKeeper file /home/dlenev/src/mysql-4.0-binlog/mysql-test/t/mysqlbinlog.test

  mysql-test/t/mysqlbinlog-master.opt
    1.0 03/09/24 23:25:55 dlenev@mysql.com +0 -0
    BitKeeper file /home/dlenev/src/mysql-4.0-binlog/mysql-test/t/mysqlbinlog-master.opt

  mysql-test/r/mysqlbinlog.result
    1.0 03/09/24 23:25:55 dlenev@mysql.com +0 -0
    BitKeeper file /home/dlenev/src/mysql-4.0-binlog/mysql-test/r/mysqlbinlog.result

  mysql-test/mysql-test-run.sh
    1.178 03/09/24 23:25:55 dlenev@mysql.com +3 -3
    Now mysqlbinlog will use proper temporary directory

ChangeSet
  1.1563.1.15 03/09/24 16:46:19 ram@gw.mysql.r18.ru +1 -0
  Added MYSQL_BINLOG variable.

  mysql-test/mysql-test-run.sh
    1.177 03/09/24 16:46:17 ram@gw.mysql.r18.ru +7 -0
    Added MYSQL_BINLOG variable.

ChangeSet
  1.1563.17.1 03/09/24 14:33:23 monty@narttu.mysql.fi +2 -0
  Correct fix for buffer overruns for compressed blobs.
  (Bugs #770, #1304 and maybe #1295)

  myisam/myisamdef.h
    1.61 03/09/24 14:33:21 monty@narttu.mysql.fi +1 -1
    Correct fix for buffer overruns for compressed blobs.
    (Bugs #770, #1304 and maybe #1295)

  myisam/mi_packrec.c
    1.22 03/09/24 14:33:21 monty@narttu.mysql.fi +3 -1
    Correct fix for buffer overruns for compressed blobs.
    (Bugs #770, #1304 and maybe #1295)

ChangeSet
  1.1563.1.14 03/09/24 16:13:47 ram@gw.mysql.r18.ru +4 -0
  #1169: Add --exec command to mysqltest

  mysql-test/t/mysqldump.test
    1.1 03/09/24 16:13:44 ram@gw.mysql.r18.ru +10 -0

  mysql-test/r/mysqldump.result
    1.1 03/09/24 16:13:44 ram@gw.mysql.r18.ru +17 -0

  mysql-test/t/mysqldump.test
    1.0 03/09/24 16:13:44 ram@gw.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/ram/work/4.0/mysql-test/t/mysqldump.test

  mysql-test/r/mysqldump.result
    1.0 03/09/24 16:13:44 ram@gw.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/ram/work/4.0/mysql-test/r/mysqldump.result

  mysql-test/mysql-test-run.sh
    1.176 03/09/24 16:13:43 ram@gw.mysql.r18.ru +8 -0
    #1169: Add --exec command to mysqltest

  client/mysqltest.c
    1.106 03/09/24 16:13:43 ram@gw.mysql.r18.ru +65 -0
    #1169: Add --exec command to mysqltest

ChangeSet
  1.1563.1.13 03/09/24 15:41:09 ram@gw.mysql.r18.ru +2 -0
  A fix. Please never use 'ulong' here!

  BitKeeper/etc/logging_ok
    1.289 03/09/24 15:41:09 ram@gw.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  include/mysql.h
    1.50 03/09/24 15:40:55 ram@gw.mysql.r18.ru +1 -1
    A fix. Please never use 'ulong' here!

ChangeSet
  1.1563.1.12 03/09/24 09:08:33 monty@mishka.mysql.fi +2 -0
  Merge script with 4.1

  BitKeeper/etc/logging_ok
    1.288 03/09/24 09:08:33 monty@mishka.mysql.fi +1 -0
    Logging to logging@openlogging.org accepted

  scripts/mysql_fix_privilege_tables.sql
    1.2 03/09/24 09:08:22 monty@mishka.mysql.fi +51 -73
    Merge with 4.1

ChangeSet
  1.1563.1.11 03/09/23 17:06:44 monty@narttu.mysql.fi +3 -0
  Code cleanup of new patches

  mysys/mf_dirname.c
    1.9 03/09/23 17:06:39 monty@narttu.mysql.fi +22 -12
    Added comments

  mysys/default.c
    1.32 03/09/23 17:06:39 monty@narttu.mysql.fi +12 -2
    Code cleanup of new patches

  client/mysqlbinlog.cc
    1.85 03/09/23 17:06:39 monty@narttu.mysql.fi +58 -67
    Code cleanup of new patches

ChangeSet
  1.1563.1.10 03/09/23 13:36:25 monty@narttu.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.0
  into narttu.mysql.fi:/my/mysql-4.0

  extra/comp_err.c
    1.8 03/09/23 13:36:23 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1563.1.9 03/09/23 13:36:01 monty@narttu.mysql.fi +14 -0
  Block SIGPIPE also for not threaded client programs.
  Added --include and --libs_r options to mysql_config.
  Added mysql_get_client_version() to client library
  Fixed some minor benchmark issues
  

  tests/mail_to_db.pl
    1.13 03/09/23 13:35:59 monty@narttu.mysql.fi +2 -2
    Default db and table for easier usage

  sql-bench/test-select.sh
    1.22 03/09/23 13:35:59 monty@narttu.mysql.fi +3 -2
    Fix wrong test for count_distinct_2

  sql-bench/test-alter-table.sh
    1.10 03/09/23 13:35:59 monty@narttu.mysql.fi +1 -1
    Increase loops for more relevant test

  sql-bench/server-cfg.sh
    1.50 03/09/23 13:35:59 monty@narttu.mysql.fi +0 -1
    Remove duplicate line

  sql-bench/bench-init.pl.sh
    1.26 03/09/23 13:35:59 monty@narttu.mysql.fi +1 -1
    Updated version number

  scripts/mysql_install_db.sh
    1.40 03/09/23 13:35:59 monty@narttu.mysql.fi +4 -4
    Fixed tests with IN_RPM to not give warnings

  scripts/mysql_config.sh
    1.8 03/09/23 13:35:59 monty@narttu.mysql.fi +18 -4
    Added options --include and --libs_r
    Added C compiler options to 'cflags'

  scripts/Makefile.am
    1.27 03/09/23 13:35:59 monty@narttu.mysql.fi +1 -0
    Add openssl libraries to mysql_config

  libmysql/libmysql.def
    1.9 03/09/23 13:35:59 monty@narttu.mysql.fi +1 -0
    added mysql_get_client_version

  libmysql/libmysql.c
    1.130 03/09/23 13:35:59 monty@narttu.mysql.fi +7 -6
    Block SIGPIPE also for not threaded programs.
    This is now done once in mysql_server_init() and not for every call to mysql_init().
    Added mysql_get_client_version()

  include/mysql.h
    1.49 03/09/23 13:35:59 monty@narttu.mysql.fi +5 -4
    Indentation cleanup

  extra/comp_err.c
    1.6.1.1 03/09/23 13:35:59 monty@narttu.mysql.fi +1 -1
    Skip lines before first {

  configure.in
    1.285 03/09/23 13:35:59 monty@narttu.mysql.fi +1 -1
    Fixed error message

  acinclude.m4
    1.93 03/09/23 13:35:59 monty@narttu.mysql.fi +2 -1
    Fixed that 'no' is printed if openssl not used

ChangeSet
  1.1563.16.1 03/09/19 19:07:41 guilhem@mysql.com +2 -0
  removing my chmods so that the test can be run on non-Unix platforms
  (kind request from the Novell team).
  Note that old chmods in rpl_rotate_logs remain.

  mysql-test/t/rpl000009.test
    1.17 03/09/19 19:07:35 guilhem@mysql.com +10 -8
    removing my chmods so that the test can be run on non-Unix platforms.

  mysql-test/r/rpl000009.result
    1.12 03/09/19 19:07:35 guilhem@mysql.com +0 -12
    result update

ChangeSet
  1.1563.14.3 03/09/19 20:31:01 dlenev@mysql.com +1 -0
  Bugfix for bug #1340, style fix before push

ChangeSet
  1.1563.15.1 03/09/19 14:59:20 lenz@mysql.com +4 -0
   - fixed several typos ("uppdate"->"update" and "tryed"->"tried")

ChangeSet
  1.1563.14.2 03/09/19 16:57:44 dlenev@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.0
  into mysql.com:/home/dlenev/src/mysql-4.0-bg-1340

ChangeSet
  1.1563.14.1 03/09/19 12:34:56 vva@eagle.mysql.r18.ru +1 -0
  Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
  into eagle.mysql.r18.ru:/home/vva/work/BUG_1073/mysql-4.0

  client/mysqlbinlog.cc
    1.84 03/09/19 20:31:00 dlenev@mysql.com +2 -4
    Small fix to avoid double initialization

  client/mysqlbinlog.cc
    1.83 03/09/19 16:57:42 dlenev@mysql.com +0 -0
    Auto merged

  client/mysqlbinlog.cc
    1.81.1.1 03/09/19 12:34:54 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  myisam/mi_test2.c
    1.16 03/09/19 14:59:17 lenz@mysql.com +2 -2
     - fixed typo: "uppdate" -> "update"
     - fixed typo: "tryed" -> "tryed"

  isam/test2.c
    1.12 03/09/19 14:59:17 lenz@mysql.com +2 -2
     - fixed typo: "uppdate" -> "update"
     - fixed typo: "tryed" -> "tryed"

  heap/hp_test2.c
    1.13 03/09/19 14:59:17 lenz@mysql.com +2 -2
     - fixed typo: "uppdate" -> "update"
     - fixed typo: "tryed" -> "tryed"

  extra/comp_err.c
    1.7 03/09/19 14:59:17 lenz@mysql.com +1 -1
     - fixed typo: "uppdate" -> "update"

ChangeSet
  1.1563.13.1 03/09/19 16:43:56 dlenev@mysql.com +1 -0
  Fix for bug #1340 (More careful checks if we met proper Create_file_log_event before Append or Exec event we are processing now)

  client/mysqlbinlog.cc
    1.82 03/09/19 16:43:54 dlenev@mysql.com +10 -7
    More accurate checks if Create_file_log_event is absent for this Append or Exec event...

ChangeSet
  1.1563.11.5 03/09/17 22:41:01 lenz@mysql.com +1 -0
   - force the removal of /var/lock/subsys/mysql on MySQL shutdown

  support-files/mysql.server.sh
    1.30 03/09/17 22:40:59 lenz@mysql.com +1 -1
     - force the removal of /var/lock/subsys/mysql on MySQL shutdown

ChangeSet
  1.676.1.741 03/09/17 22:01:08 lenz@mysql.com +1 -0
   - added make_win_src_distribution.sh to EXTRA_SCRIPTS

  scripts/Makefile.am
    1.14.1.3 03/09/17 22:01:07 lenz@mysql.com +1 -0
     - added make_win_src_distribution.sh to EXTRA_SCRIPTS

ChangeSet
  1.1563.11.4 03/09/17 21:41:36 jani@rhols221.adsl.netsonic.fi +1 -0
  Fixed Bug#1291, client displays wrong prompt when in the middle of
  backticks.

  client/mysql.cc
    1.142 03/09/17 21:41:34 jani@rhols221.adsl.netsonic.fi +4 -2
    Fixed Bug#1291, client displays wrong prompt when in the middle of
    backticks.

ChangeSet
  1.1563.12.1 03/09/17 21:08:40 jani@rhols221.adsl.netsonic.fi +1 -0
  Fixed a bug in default.c, which caused quoted arguments not
  being read correctly from my.cnf.

  mysys/default.c
    1.31 03/09/17 21:08:38 jani@rhols221.adsl.netsonic.fi +8 -0
    Fixed a bug in default.c, which caused quoted arguments not
    being read correctly from my.cnf.

ChangeSet
  1.1563.11.2 03/09/17 21:52:05 kostja@oak.local +3 -0
  Applied Monty corrections to the FULL SCAN
  optimiser bug patch.

  sql/sql_select.cc
    1.258 03/09/17 21:52:04 kostja@oak.local +33 -22
    found_constrain renamed to found_constraint
    We don't perform full cartesian product in 
    case when JOIN BUFFER is used: it was taken
    into account.
    s->read_time may contain range index read time,
    so to get full table scan time is necessary to
    call s->table->file->scan_time().

  mysql-test/r/order_by.result
    1.20 03/09/17 21:52:03 kostja@oak.local +7 -7
    test results reverted

  mysql-test/r/distinct.result
    1.25 03/09/17 21:52:03 kostja@oak.local +3 -3
    test results reverted

ChangeSet
  1.1563.8.6 03/09/17 14:00:43 kostja@oak.local +1 -0
  fixed test result to be in sync with the optimiser

  mysql-test/r/distinct.result
    1.24 03/09/17 14:00:25 kostja@oak.local +2 -2
    fixed test result to be in sync with the optimiser

ChangeSet
  1.1563.8.4 03/09/16 21:20:16 kostja@oak.local +1 -0
  comment made more explanatory

  sql/sql_select.cc
    1.257 03/09/16 21:20:15 kostja@oak.local +7 -5
    comment made more explanatory

ChangeSet
  1.1563.10.1 03/09/16 20:28:29 kostja@oak.local +2 -0
  select.test cleanup

  mysql-test/t/select.test
    1.21 03/09/16 20:28:12 kostja@oak.local +6 -0
    unnecessary info don't get into result any more

  mysql-test/r/select.result
    1.29 03/09/16 20:28:12 kostja@oak.local +0 -1221
    unnecessary info removed from result

ChangeSet
  1.1563.9.2 03/09/16 14:45:42 monty@narttu.mysql.fi +2 -0
  More explicit error messages from myisamchk

  myisam/mi_dynrec.c
    1.31 03/09/16 14:45:40 monty@narttu.mysql.fi +14 -4
    More comments

  myisam/mi_check.c
    1.124 03/09/16 14:45:40 monty@narttu.mysql.fi +27 -8
    More explicit error messages

ChangeSet
  1.1563.8.3 03/09/16 04:04:54 kostja@oak.local +1 -0
  join buffer cache usage/not usage is taken
  into account to increase the cost of FULL SCAN

  sql/sql_select.cc
    1.256 03/09/16 04:04:52 kostja@oak.local +14 -4
    more accurate FULL SCAN cost estimation:
    join buffer cache usage/not usage is taken
    into account to increase the cost

ChangeSet
  1.1560.1.1 03/09/15 17:39:50 greg@mysql.com +57 -0
  Remove 3.23 InstallShield files, improve make_win_src_distribution, add extra myTest.dsp to be copied into distributions as a fix for BUG#999

  VC++Files/libmysqltest/myTest-package.dsp
    1.1 03/09/15 17:39:48 greg@mysql.com +92 -0

  scripts/make_win_src_distribution.sh
    1.9 03/09/15 17:39:48 greg@mysql.com +32 -31
    Improved unix to DOS conversion, add processing of version tags in InstallShield files

  VC++Files/libmysqltest/myTest-package.dsp
    1.0 03/09/15 17:39:48 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/4.0/VC++Files/libmysqltest/myTest-package.dsp

  VC++Files/InstallShield/4.0.XX-pro/String Tables/0009-English/value.shl
    1.2 03/09/15 17:39:48 greg@mysql.com +7 -7
    Add VERSION tags for automation

  VC++Files/InstallShield/4.0.XX-pro/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.2 03/09/15 17:39:48 greg@mysql.com +2 -2
    Add VERSION tags for automation

  VC++Files/InstallShield/4.0.XX-gpl/String Tables/0009-English/value.shl
    1.2 03/09/15 17:39:48 greg@mysql.com +7 -7
    Add VERSION tags for automation

  VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.2 03/09/15 17:39:48 greg@mysql.com +2 -2
    Add VERSION tags for automation

  VC++Files/InstallShield/4.0.XX-classic/String Tables/0009-English/value.shl
    1.2 03/09/15 17:39:48 greg@mysql.com +7 -7
    Add VERSION tags for automation

  VC++Files/InstallShield/4.0.XX-classic/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.2 03/09/15 17:39:48 greg@mysql.com +2 -2
    Add VERSION tags for automation

  BitKeeper/etc/ignore
    1.150 03/09/15 17:39:48 greg@mysql.com +1 -0
    Added hardcopy.0 to the ignore list

  BitKeeper/deleted/.del-value.shl~718b5b291d5ff04d
    1.1.1.1 03/09/15 17:30:46 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/String Tables/0009-English/value.shl

  BitKeeper/deleted/.del-Setup.tsb~e74dbc7688d4019a
    1.1.1.1 03/09/15 17:30:46 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Setup.tsb

  BitKeeper/deleted/.del-Default.shl~e18d3f10bef97a28
    1.1.1.1 03/09/15 17:30:46 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/String Tables/Default.shl

  BitKeeper/deleted/.del-Build.tsb~f3be7d512e6d5b74
    1.1.1.1 03/09/15 17:30:46 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Build.tsb

  BitKeeper/deleted/.del-infolist.txt~ee370f4771c83a97
    1.1.1.1 03/09/15 17:30:45 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt

  BitKeeper/deleted/.del-Setup.rul~14510a994d515f19
    1.1.1.1 03/09/15 17:30:45 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.rul

  BitKeeper/deleted/.del-Setup.obs~2f09140119879bc6
    1.1.1.1 03/09/15 17:30:45 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.obs

  BitKeeper/deleted/.del-Setup.ins~ab68efc133d8411e
    1.1.1.1 03/09/15 17:30:45 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ins

  BitKeeper/deleted/.del-SETUP.BMP~77e20d86bceb4903
    1.1.1.1 03/09/15 17:30:45 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP

  BitKeeper/deleted/.del-Default.shl~a02a9093c2b6b0d9
    1.1.1.1 03/09/15 17:30:45 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/Shell Objects/Default.shl

  BitKeeper/deleted/.del-Setup.ino~85f07a856a69a722
    1.1.1.1 03/09/15 17:30:44 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ino

  BitKeeper/deleted/.del-Setup.dbg~688e9d3ec362ec34
    1.1.1.1 03/09/15 17:30:44 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.dbg

  BitKeeper/deleted/.del-Servers.fgl~36147accb82f759
    1.1.1.1 03/09/15 17:30:44 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Servers.fgl

  BitKeeper/deleted/.del-MySQL 3.23.com.ipr~eb817edea43c6e6e
    1.1.1.1 03/09/15 17:30:44 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/MySQL 3.23.com.ipr

  BitKeeper/deleted/.del-Grant Tables.fgl~31e527d126c42d90
    1.1.1.1 03/09/15 17:30:44 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Grant Tables.fgl

  BitKeeper/deleted/.del-Documentation.fgl~cf0ac866737a5c7d
    1.1.1.1 03/09/15 17:30:44 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Documentation.fgl

  BitKeeper/deleted/.del-Default.rge~2218627c2a901409
    1.1.1.1 03/09/15 17:30:44 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/Registry Entries/Default.rge

  BitKeeper/deleted/.del-Development.fgl~ca1458874a3fef81
    1.1.1.1 03/09/15 17:30:43 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Development.fgl

  BitKeeper/deleted/.del-Default.fgl~a86ce70180b5aba4
    1.1.1.1 03/09/15 17:30:43 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fgl

  BitKeeper/deleted/.del-Default.fgl~45b9e847fa4da131
    1.1.1.1 03/09/15 17:30:43 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.fgl

  BitKeeper/deleted/.del-Default.fdf~466762fdf65e1477
    1.1.1.1 03/09/15 17:30:43 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fdf

  BitKeeper/deleted/.del-Default.cdf~1da6505528200d5e
    1.1.1.1 03/09/15 17:30:43 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.cdf

  BitKeeper/deleted/.del-Clients and Tools.fgl~826a8e3f651af365
    1.1.1.1 03/09/15 17:30:43 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Clients and Tools.fgl

  BitKeeper/deleted/.del-.fgl~cac6624e1ac6ee1d
    1.1.1.1 03/09/15 17:30:42 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XXcom/Component Definitions/.fgl

  BitKeeper/deleted/.del-value.shl~98c2851db96b919e
    1.1.1.1 03/09/15 17:30:34 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/String Tables/0009-English/value.shl

  BitKeeper/deleted/.del-infolist.txt~58b203247936d266
    1.1.1.1 03/09/15 17:30:34 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt

  BitKeeper/deleted/.del-Setup.tsb~5344bdc39c0e9884
    1.2 03/09/15 17:30:34 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Setup.tsb

  BitKeeper/deleted/.del-SETUP.BMP~1e85725234603bfe
    1.2 03/09/15 17:30:34 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP

  BitKeeper/deleted/.del-Default.shl~8b61f648197f5de3
    1.2 03/09/15 17:30:34 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/String Tables/Default.shl

  BitKeeper/deleted/.del-Default.shl~4bc5f71f8f0bd822
    1.2 03/09/15 17:30:34 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/Shell Objects/Default.shl

  BitKeeper/deleted/.del-Build.tsb~43a1c0d54abb5a44
    1.2 03/09/15 17:30:34 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Build.tsb

  BitKeeper/deleted/.del-Setup.rul~8cc4dee41dcb733f
    1.2 03/09/15 17:30:33 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.rul

  BitKeeper/deleted/.del-Setup.obs~33bf58c825ff3ac8
    1.2 03/09/15 17:30:33 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.obs

  BitKeeper/deleted/.del-Setup.ins~6946c5065a12572d
    1.2 03/09/15 17:30:33 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ins

  BitKeeper/deleted/.del-Setup.ino~cb1fefacb45841a
    1.2 03/09/15 17:30:33 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ino

  BitKeeper/deleted/.del-Setup.dbg~f8ba4a87c5dd90a9
    1.2 03/09/15 17:30:33 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.dbg

  BitKeeper/deleted/.del-Servers.fgl~c809b9515fd51041
    1.2 03/09/15 17:30:33 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Servers.fgl

  BitKeeper/deleted/.del-MySQL 3.23.XX-GPL.ipr~3116ab4aa52a6b44
    1.2 03/09/15 17:30:33 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/MySQL 3.23.XX-GPL.ipr

  BitKeeper/deleted/.del-Default.rge~d816fd8cef3f06d5
    1.2 03/09/15 17:30:33 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/Registry Entries/Default.rge

  BitKeeper/deleted/.del-Grant Tables.fgl~1c366d3557e024bf
    1.2 03/09/15 17:30:32 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Grant Tables.fgl

  BitKeeper/deleted/.del-Documentation.fgl~dbd86cfa42705734
    1.2 03/09/15 17:30:32 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Documentation.fgl

  BitKeeper/deleted/.del-Development.fgl~8207e98594fe0bee
    1.2 03/09/15 17:30:32 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Development.fgl

  BitKeeper/deleted/.del-Default.fgl~b9558db492415763
    1.2 03/09/15 17:30:32 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.fgl

  BitKeeper/deleted/.del-Default.fgl~46b97f4278325e8
    1.2 03/09/15 17:30:32 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fgl

  BitKeeper/deleted/.del-Default.fdf~89b2af9ae5059f62
    1.2 03/09/15 17:30:32 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fdf

  BitKeeper/deleted/.del-Default.cdf~aa4045acaf293d36
    1.2 03/09/15 17:30:32 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.cdf

  BitKeeper/deleted/.del-Clients and Tools.fgl~cfedc4432bdca9d
    1.2 03/09/15 17:30:32 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Clients and Tools.fgl

  BitKeeper/deleted/.del-.fgl~c7d07ad3164a2b48
    1.2 03/09/15 17:30:31 greg@mysql.com +0 -0
    Delete: VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/.fgl

ChangeSet
  1.1563.8.1 03/09/15 22:21:39 kostja@oak.local +4 -0
  Fixed bug in the optimiser for FULL TABLE SCAN case:
  to estimate correctly cost of full table scan we should take into
  account rows read and skipped on each iteration.

  sql/sql_select.cc
    1.255 03/09/15 22:21:27 kostja@oak.local +22 -24
    Fixed bug in the optimiser for FULL TABLE SCAN case:
    to estimate correctly cost of full table scan we should take into
    account rows read and skipped on each iteration.

  mysql-test/r/select_safe.result
    1.10 03/09/15 22:21:27 kostja@oak.local +1 -1
    Fixed test suite: now full scan is used
    less often

  mysql-test/r/join_outer.result
    1.17 03/09/15 22:21:27 kostja@oak.local +1 -1
    Fixed test suite: now full scan is used
    less often

  mysql-test/r/distinct.result
    1.23 03/09/15 22:21:27 kostja@oak.local +3 -3
    Fixed test suite: now full scan is used
    less often

ChangeSet
  1.676.1.740 03/09/15 14:44:53 lenz@mysql.com +1 -0
   - Bumped up version number from 3.23.58 to 3.23.59 in configure.in
   - Tagged ChangeSet 1.1413 as "mysql-3.23.58"

  configure.in
    1.124.1.87 03/09/15 14:44:52 lenz@mysql.com +1 -1
     - Bumped up version number from 3.23.58 to 3.23.59 in configure.in

ChangeSet
  1.1563.7.1 03/09/15 15:16:13 bell@sanja.is.com.ua +4 -0
  fixed server crash on moving query block with pointers to same table in it (BUG#988)
  removed server options

  sql/sql_cache.cc
    1.56 03/09/15 15:16:04 bell@sanja.is.com.ua +24 -2
    fixed moving query block with pointers to same table in it

  mysql-test/t/query_cache.test
    1.27 03/09/15 15:16:04 bell@sanja.is.com.ua +54 -1
    test for BUG#988
    removed server options

  mysql-test/r/query_cache.result
    1.26 03/09/15 15:16:04 bell@sanja.is.com.ua +42 -1
    test for BUG#988

  BitKeeper/deleted/.del-query_cache-master.opt~c4daeaa5e40881
    1.4 03/09/15 14:57:39 bell@sanja.is.com.ua +0 -0
    Delete: mysql-test/t/query_cache-master.opt

ChangeSet
  1.676.1.739 03/09/12 19:58:22 greg@mysql.com +36 -0
  New Windows source package automation for 3.23

  BitKeeper/etc/logging_ok
    1.153.1.97 03/09/12 19:58:22 greg@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  scripts/make_win_src_distribution.sh
    1.1 03/09/12 19:58:12 greg@mysql.com +487 -0

  VC++Files/thr_test/thr_test.c
    1.1 03/09/12 19:58:12 greg@mysql.com +250 -0

  VC++Files/mysqlwatch/mysqlwatch.c
    1.1 03/09/12 19:58:12 greg@mysql.com +745 -0

  VC++Files/mysqlshutdown/mysqlshutdown.rc
    1.1 03/09/12 19:58:12 greg@mysql.com +2 -0

  VC++Files/mysqlshutdown/mysqlshutdown.c
    1.1 03/09/12 19:58:12 greg@mysql.com +198 -0

  VC++Files/mysqlshutdown/mysql.ico
    1.1 03/09/12 19:58:12 greg@mysql.com +9 -0

  VC++Files/libmysqltest/mytest.c
    1.1 03/09/12 19:58:12 greg@mysql.com +169 -0

  VC++Files/libmysql/libmysql.def
    1.1 03/09/12 19:58:12 greg@mysql.com +94 -0

  scripts/make_win_src_distribution.sh
    1.0 03/09/12 19:58:12 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/3.23/scripts/make_win_src_distribution.sh

  scripts/Makefile.am
    1.14.1.2 03/09/12 19:58:12 greg@mysql.com +4 -2
    Build make_win_src_distribution script by default

  VC++Files/thr_test/thr_test.c
    1.0 03/09/12 19:58:12 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/3.23/VC++Files/thr_test/thr_test.c

  VC++Files/mysqlwatch/mysqlwatch.c
    1.0 03/09/12 19:58:12 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/3.23/VC++Files/mysqlwatch/mysqlwatch.c

  VC++Files/mysqlshutdown/mysqlshutdown.rc
    1.0 03/09/12 19:58:12 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/3.23/VC++Files/mysqlshutdown/mysqlshutdown.rc

  VC++Files/mysqlshutdown/mysqlshutdown.c
    1.0 03/09/12 19:58:12 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/3.23/VC++Files/mysqlshutdown/mysqlshutdown.c

  VC++Files/mysqlshutdown/mysql.ico
    1.0 03/09/12 19:58:12 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/3.23/VC++Files/mysqlshutdown/mysql.ico

  VC++Files/libmysqltest/mytest.c
    1.0 03/09/12 19:58:12 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/3.23/VC++Files/libmysqltest/mytest.c

  VC++Files/libmysql/libmysql.def
    1.0 03/09/12 19:58:12 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/3.23/VC++Files/libmysql/libmysql.def

  VC++Files/InstallShield/3.23.XX-gpl/String Tables/0009-English/value.shl
    1.2 03/09/12 19:58:12 greg@mysql.com +6 -6
    Add version placeholders for automation

  VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.2 03/09/12 19:58:12 greg@mysql.com +2 -2
    Add version placeholders for automation

  VC++Files/InstallShield/3.23.XX-com/String Tables/0009-English/value.shl
    1.3 03/09/12 19:58:12 greg@mysql.com +6 -6
    Add version placeholders for automation

  VC++Files/InstallShield/3.23.XX-com/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.3 03/09/12 19:58:12 greg@mysql.com +2 -2
    Add version placeholders for automation

  VC++Files/InstallShield/3.23.XX-com/Text Substitutions/Setup.tsb
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/Text Substitutions/Build.tsb
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/String Tables/Default.shl
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/String Tables/0009-English/value.shl
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/Shell Objects/Default.shl
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.rul
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.obs
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.ins
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.ino
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.dbg
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/Registry Entries/Default.rge
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/MySQL 3.23.com.ipr
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/File Groups/Servers.fgl
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/File Groups/Grant Tables.fgl
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/File Groups/Documentation.fgl
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/File Groups/Development.fgl
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/File Groups/Default.fgl
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/File Groups/Default.fdf
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/File Groups/Clients and Tools.fgl
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/Component Definitions/Default.fgl
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/Component Definitions/Default.cdf
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

  VC++Files/InstallShield/3.23.XX-com/Component Definitions/.fgl
    1.2 03/09/12 18:41:26 greg@mysql.com +0 -0
    mvdir

ChangeSet
  1.1563.6.2 03/09/12 22:33:43 dlenev@mysql.com +4 -0
  Replaced deprecated since OpenSSL 0.9.7 des_ calls and types with 
  their newer DES_ versions.
  Provided macros for backward compatibility.

  sql/mysql_priv.h
    1.206 03/09/12 22:33:24 dlenev@mysql.com +2 -2
    Replaced deprecated OpenSSL des_ types with newer

  sql/item_strfunc.cc
    1.69 03/09/12 22:33:24 dlenev@mysql.com +17 -17
    Replaced deprecated OpenSSL des_ calls and types with newer

  sql/des_key_file.cc
    1.6 03/09/12 22:33:24 dlenev@mysql.com +4 -4
    Replaced deprecated OpenSSL des_ calls and types with newer

  include/my_global.h
    1.55 03/09/12 22:33:24 dlenev@mysql.com +10 -0
    Added macros for DES_ OpenSSL functions for compatibility with pre 0.9.7

ChangeSet
  1.1563.5.4 03/09/12 19:53:52 serg@serg.mylan +2 -0
  merged (ul)

  sql/sql_parse.cc
    1.340 03/09/12 19:53:48 serg@serg.mylan +0 -12
    merged (ul)

  sql/slave.cc
    1.252 03/09/12 19:53:48 serg@serg.mylan +0 -2
    merged (ul)

ChangeSet
  1.1563.5.3 03/09/12 19:42:47 serg@serg.mylan +1 -0
  merged

  extra/resolveip.c
    1.21 03/09/12 19:42:44 serg@serg.mylan +0 -5
    merged

ChangeSet
  1.1563.6.1 03/09/12 20:41:12 dlenev@mysql.com +3 -0
  Regenerated expired CA certificate and signed dependant certificates

  SSL/server-cert.pem
    1.4 03/09/12 20:41:02 dlenev@mysql.com +20 -20
    Signed server certificate after regenerating CA certificate

  SSL/client-cert.pem
    1.4 03/09/12 20:41:02 dlenev@mysql.com +20 -20
    Signed client certificate after regenerating CA certificate

  SSL/cacert.pem
    1.4 03/09/12 20:41:02 dlenev@mysql.com +11 -11
    Regenerated expired CA certificate

ChangeSet
  1.676.1.738 03/09/12 17:26:48 guilhem@mysql.com +2 -0
  Quick backport of the following bugfix from MySQL 4.0.14.
  DO NOT COPY THIS CODE TO 4.0. The bugfix is better in 4.0,
  but here in 3.23 we don't want to add a new error code so
  we just use ER_EMPTY_QUERY. Bug was:
  "If a query was ignored on the slave (because of
  @code{replicate-ignore-table} and other similar rules), the slave
  still checked if the query got the same error code (0, no error) as on
  the master. So if the master had an error on the query (for example,
  ``Duplicate entry'' in a multiple-row insert), then the slave stopped
  and warned that the error codes didn't match. (Bug #797)"

  sql/sql_parse.cc
    1.120.2.39 03/09/12 17:26:44 guilhem@mysql.com +12 -0
    In a slave thread, mark an ignored query (because of replicate-*-table rules)
    as empty. The caller, exec_event(), will understand this error code as "ignorable
    query, don't compare the error codes on master and slave".

  sql/slave.cc
    1.100.1.40 03/09/12 17:26:43 guilhem@mysql.com +2 -1
    Ignore ER_EMPTY_QUERY as it is also a marker for "query was ignored because 
    of replicate-*-table rules".

ChangeSet
  1.1563.4.1 03/09/12 15:48:48 guilhem@mysql.com +1 -0
  Fix for BUG#1258 (Trying to use the mysqlbinlog with -h and -u option gives segmentation
  fault). Fix is just initializing "host" (and "user") with 0, not a string.

  client/mysqlbinlog.cc
    1.81 03/09/12 15:48:43 guilhem@mysql.com +2 -2
    command-line arguments should be initialized like in mysqldump.cc to not cause
    segfault.

ChangeSet
  1.1563.3.2 03/09/12 15:48:05 lenz@mysql.com +1 -0
   - fixed yet another C++-style comment in a .c file that made the IBM
     C compiler barf

  libmysqld/libmysqld.c
    1.21 03/09/12 15:48:03 lenz@mysql.com +1 -1
     - fixed yet another C++-style comment in a .c file that made the IBM
       C compiler barf

ChangeSet
  1.1563.3.1 03/09/12 12:42:34 lenz@mysql.com +2 -0
  Portability fixes:
  
   - removed "-traditional-cpp" from the darwin6 compile flags, as it broke
     compilation with gcc-3.3 on Mac OS X and does not seem to be required 
     in general.
   - make sure to link libmysqld/examples/mysqltest.c with a C++ compiler, 
     as the embedded server library (libmysqld.a) includes C++ code. This
     broke compilation with non-gcc compilers.

  libmysqld/examples/Makefile.am
    1.12 03/09/12 12:42:32 lenz@mysql.com +2 -0
     - make sure to link mysqltest.c with a C++ compiler, as the embedded server
       library (libmysqld.a) includes C++ code.

  configure.in
    1.284 03/09/12 12:42:32 lenz@mysql.com +1 -1
     - removed "-traditional-cpp" from the darwin6 compile flags, as it broke
       compilation with gcc-3.3 and does not seem to be required in general.

ChangeSet
  1.1563.2.2 03/09/12 01:35:32 heikki@hundin.mysql.fi +1 -0
  row0sel.c:
    Fix buglets in previous push

  innobase/row/row0sel.c
    1.41 03/09/12 01:35:21 heikki@hundin.mysql.fi +3 -2
    Fix buglets in previous push

ChangeSet
  1.1563.2.1 03/09/12 00:31:43 heikki@hundin.mysql.fi +1 -0
  row0sel.c:
    Fix bug: if a primary key contains more than one column, then MySQL seems to do fetch next even for a unique search condition: this in turn caused unnecessary locking which did not agree what the InnoDB manual promised

  innobase/row/row0sel.c
    1.40 03/09/12 00:31:14 heikki@hundin.mysql.fi +12 -16
    Fix bug: if a primary key contains more than one column, then MySQL seems to do fetch next even for a unique search condition: this in turn caused unnecessary locking which did not agree what the InnoDB manual promised

ChangeSet
  1.1561.2.1 03/09/11 23:17:28 guilhem@mysql.com +6 -0
  * Fix for BUG#1248: "LOAD DATA FROM MASTER drops the slave's db unexpectedly".
  Now LOAD DATA FROM MASTER does not drop the database, instead it only tries to
  create it, and drops/creates table-by-table.
  * replicate_wild_ignore_table='db1.%' is now considered as "ignore the 'db1'
  database as a whole", as it already works for CREATE DATABASE and DROP DATABASE.

  sql/sql_parse.cc
    1.339 03/09/11 23:17:22 guilhem@mysql.com +5 -2
    do not drop the table in LOAD TABLE FROM MASTER (this behaviour is already
    true; but changes in LOAD DATA FROM MASTER made the argument needed).

  sql/slave.h
    1.65 03/09/11 23:17:21 guilhem@mysql.com +2 -2
    new argument to drop the table in fetch_master_table

  sql/slave.cc
    1.251 03/09/11 23:17:21 guilhem@mysql.com +33 -12
    New argument to drop the table in create_table_from_dump() 
    (LOAD TABLE/DATA FROM MASTER are the only places where this function is used).
    This is needed because LOAD DATA FROM MASTER does not drop the database anymore.
    The behaviour when the table exists is unchanged: LOAD DATA silently replaces
    the table, LOAD TABLE gives error.

  sql/repl_failsafe.cc
    1.34 03/09/11 23:17:21 guilhem@mysql.com +9 -5
    * replicate_wild_ignore_table='db1.%' is now considered as "ignore the 'db1'
    database as a whole", as it already works for CREATE DATABASE and DROP DATABASE.
    * If a db matches replicate_*_db rules, we don't drop/recreate it because this
    could drop some tables in this db which could be slave-specific. Instead,
    we do a CREATE DATABASE IF EXISTS, and we will drop each table which has
    an equivalent on the master, table-by-table.

  mysql-test/t/rpl000009.test
    1.16 03/09/11 23:17:21 guilhem@mysql.com +53 -3
    test that LOAD DATA FROM MASTER does not drop databases,
    but rather table by table, thus preserving non-replicated tables.
    Test that LOAD DATA FROM MASTER reports the error when a table could not
    be dropped (system's "permission denied" for example).
    Test that LOAD TABLE FROM MASTER reports the error when the table already exists.

  mysql-test/r/rpl000009.result
    1.11 03/09/11 23:17:20 guilhem@mysql.com +48 -0
    result update

ChangeSet
  1.676.1.737 03/09/11 13:36:08 lenz@mysql.com +1 -0
   - backported compatibility fix for extra/resolveip.c from 4.0
     to be able to compile on HP-UX 10.20 (which does not have in_add_t).

  extra/resolveip.c
    1.4.1.7 03/09/11 13:36:07 lenz@mysql.com +4 -0
     - backport compatibility fix from 4.0 to be able to compile on HP-UX 10.20
       (which does not have in_add_t).

ChangeSet
  1.1561.1.1 03/09/11 06:09:34 monty@mashka.mysql.fi +1 -0
  Remove not used define (my_strxfrm)

  include/m_ctype.h
    1.20 03/09/11 06:09:31 monty@mashka.mysql.fi +0 -1
    Remove not used define

ChangeSet
  1.1563 03/09/10 17:48:43 lenz@mysql.com +1 -0
   - Added option "--skip-name-resolve" to mysql_install_db to be able to
     use the local machine's IP address instead of the host name when 
     building the initial grant tables if "skip-name-resolve" has been
     specified in my.cnf. This can be helpful on FreeBSD to avoid
     thread-safety problems with the FreeBSD resolver libraries.
     (Thanks to Jeremy Zawodny for the patch)

  scripts/mysql_install_db.sh
    1.39 03/09/10 17:48:41 lenz@mysql.com +7 -0
     - Added option "--skip-name-resolve" to use the local machine's IP address
       instead of the host name when building the initial grant tables if
       "skip-name-resolve" has been specified in my.cnf (Thanks to Jeremy 
       Zawodny for the patch)

ChangeSet
  1.1562 03/09/10 16:48:57 lenz@mysql.com +1 -0
   - Updated version number to 4.0.16 now that 4.0.15 has been released
   - tagged ChangeSet 1.1556 as mysql-4.0.15

  configure.in
    1.283 03/09/10 16:48:54 lenz@mysql.com +1 -1
     - Bumped up version number: 4.0.15 -> 4.0.16

ChangeSet
  1.1557.3.1 03/09/09 19:23:01 serg@serg.mylan +1 -0
  fixed: thread lock-up on a FLASH TABLE when another thread has an open handler
  Bug#1204

  sql/sql_handler.cc
    1.35 03/09/09 19:22:58 serg@serg.mylan +11 -4
    fixed: thread lock-up on a FLASH TABLE when another thread has an open handler
    Bug#1204

ChangeSet
  1.1561 03/09/09 20:06:50 monty@mashka.mysql.fi +8 -0
  Cleaned up last bug fixes
  Fix bug in SHOW GRANTS when there is a column privilege but no table privilege

  sql/sql_parse.cc
    1.338 03/09/09 20:06:48 monty@mashka.mysql.fi +6 -6
    Use HAVE_REPLICATION instead of EMBEDDED_LIBRARY

  sql/sql_acl.cc
    1.117 03/09/09 20:06:48 monty@mashka.mysql.fi +4 -2
    Fix bug in SHOW GRANTS when there is a column privilege but no table privilege

  mysql-test/t/mix_innodb_myisam_binlog.test
    1.2 03/09/09 20:06:47 monty@mashka.mysql.fi +70 -67
    Change to use tables t1 and t2

  mysql-test/t/grant.test
    1.10 03/09/09 20:06:47 monty@mashka.mysql.fi +16 -16
    Fixed up grant test to not user 'user1' or 'user2'
    Check for bug in SHOW GRANTS when there is a column privilege but no table privilege

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.2 03/09/09 20:06:47 monty@mashka.mysql.fi +81 -81
    Change to use tables t1 and t2

  mysql-test/r/grant.result
    1.10 03/09/09 20:06:47 monty@mashka.mysql.fi +27 -27
    Fixed up grant test to not user 'user1' or 'user2'
    Check for bug in SHOW GRANTS when there is a column privilege but no table privilege

  libmysqld/libmysqld.c
    1.20 03/09/09 20:06:47 monty@mashka.mysql.fi +0 -2
    Remove reference to (wrong) external variable

  include/mysql.h
    1.48 03/09/09 20:06:47 monty@mashka.mysql.fi +2 -0
    Make server_inited external

ChangeSet
  1.1557.1.1 03/09/08 12:15:17 vva@eagle.mysql.r18.ru +1 -0
  Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
  into eagle.mysql.r18.ru:/home/vva/work/BUG_1056/mysql-4.0

  client/mysqldump.c
    1.96 03/09/08 12:15:15 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1559 03/09/08 14:46:44 hf@deer.(none) +1 -0
  fix for #1211

  sql/sql_parse.cc
    1.337 03/09/08 14:46:43 hf@deer.(none) +10 -0
    Replication's commands were allowed, but didn't have proper implementations
    for embedded library

ChangeSet
  1.1558 03/09/08 13:02:19 hf@deer.(none) +2 -0
  Fix for #1210
  i fixed this in 4.1 in slightly different way

  libmysqld/libmysqld.c
    1.19 03/09/08 13:02:17 hf@deer.(none) +13 -0
    Check for mysql_server_init call added

  libmysqld/lib_sql.cc
    1.42 03/09/08 13:02:17 hf@deer.(none) +4 -3
    Initialization's flag was made global

ChangeSet
  1.1549.5.1 03/09/06 18:59:04 vva@eagle.mysql.r18.ru +1 -0
  fixed Bug #1184 (change type of opt_ignore_lines to longlong)

  client/mysqlimport.c
    1.31 03/09/06 18:58:38 vva@eagle.mysql.r18.ru +5 -4
    fixed Bug #1184 (change type of opt_ignore_lines to longlong)

ChangeSet
  1.1549.4.1 03/09/06 15:06:08 vva@eagle.mysql.r18.ru +1 -0
  added space after first '--' in the long '----....' comment line in mysqldump
  just to make it compatible with the manual
  (fixed bug #1056)

  client/mysqldump.c
    1.93.1.1 03/09/06 15:05:42 vva@eagle.mysql.r18.ru +1 -1
    added space after first '--' in the long '----....' comment line
    just to make it compatible with the manual
    (fixed bug #1056)

ChangeSet
  1.1556 03/09/05 14:44:21 carsten@tsort.bitbybit.dk +2 -0
  Add QUICK as mysql-recover option in mysqld --help

  BitKeeper/etc/logging_ok
    1.287 03/09/05 14:44:20 carsten@tsort.bitbybit.dk +1 -0
    Logging to logging@openlogging.org accepted

  sql/mysqld.cc
    1.454 03/09/05 14:44:09 carsten@tsort.bitbybit.dk +1 -1
    Add QUICK as mysql-recover option in mysqld --help

