ChangeSet
  1.1563.2.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.2.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.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

ChangeSet
  1.1554 03/09/05 11:42:21 serg@serg.mylan +1 -0
  bug#926 fix undone - it caused suboptimal execution plan for "range ON, no WHERE" query
  Another fix applied

  sql/sql_select.cc
    1.254 03/09/05 11:42:19 serg@serg.mylan +19 -2
    bug#926 fix undone - it caused suboptimal execution plan for "range ON, no WHERE" query
    Another fix applied

ChangeSet
  1.1549.3.3 03/09/05 08:16:13 monty@mashka.mysql.fi +1 -0
  after merge fixes

  client/mysqldump.c
    1.95 03/09/05 08:16:11 monty@mashka.mysql.fi +1 -1
    after merge fixes

ChangeSet
  1.1549.3.2 03/09/05 06:56:28 monty@mashka.mysql.fi +2 -0
  Merge with 3.23

  sql/sql_acl.cc
    1.116 03/09/05 06:56:26 monty@mashka.mysql.fi +2 -2
    Merge with 3.23

  client/mysqldump.c
    1.94 03/09/05 06:56:26 monty@mashka.mysql.fi +6 -13
    Merge with 3.23

ChangeSet
  1.1549.3.1 03/09/05 06:42:55 monty@mashka.mysql.fi +5 -0
  Fixed rare bug in MYISAM introduced in 4.0.3 where the index file header was not updated directly after an UPDATE of split dynamic rows.

  mysql-test/t/myisam.test
    1.19 03/09/05 06:42:53 monty@mashka.mysql.fi +34 -0
    Added test case for MyISAM UPDATE bug

  mysql-test/r/myisam.result
    1.23 03/09/05 06:42:53 monty@mashka.mysql.fi +22 -0
    Added test case for MyISAM UPDATE bug

  myisam/mi_update.c
    1.13 03/09/05 06:42:53 monty@mashka.mysql.fi +25 -7
    More comments
    Fixed rare bug in MYISAM introduced in 4.0.3 where the index file header
    was not updated directly after an UPDATE of split dynamic rows.

  myisam/mi_open.c
    1.65 03/09/05 06:42:53 monty@mashka.mysql.fi +5 -4
    Added DBUG info

  myisam/mi_locking.c
    1.28 03/09/05 06:42:52 monty@mashka.mysql.fi +4 -2
    Added DBUG info

ChangeSet
  1.1549.1.5 03/09/04 16:00:05 greg@mysql.com +1 -0
  Windows fix to avoid VC++ 6.0 compiler bug, which prevents compilation when function calls are present inside an expanded inline function

  innobase/fsp/fsp0fsp.c
    1.15 03/09/04 16:00:03 greg@mysql.com +31 -2
    Added seperate error message to avoid VC++ 6.0 compiler bug

ChangeSet
  1.1549.1.4 03/09/04 12:56:02 greg@mysql.com +2 -0
  Provide mysql_fix_privilege_tables.sql for Windows users to update grant tables (BUG #948)
  Fix make_win_src_distribution

  scripts/mysql_fix_privilege_tables.sql
    1.1 03/09/04 12:55:45 greg@mysql.com +159 -0

  scripts/mysql_fix_privilege_tables.sql
    1.0 03/09/04 12:55:45 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/4.0/scripts/mysql_fix_privilege_tables.sql

  scripts/make_win_src_distribution.sh
    1.8 03/09/04 12:55:45 greg@mysql.com +36 -13
    Fix in case of default to .zip, use 'recode' if available

ChangeSet
  1.1553 03/09/03 22:27:04 serg@serg.mylan +3 -0
  bug #1172 - crash on force index() and SEL_ARG::MAYBE_KEY

  sql/opt_range.cc
    1.84 03/09/03 22:27:01 serg@serg.mylan +2 -2
    bug #1172 - crash on force index() and SEL_ARG::MAYBE_KEY

  mysql-test/t/range.test
    1.8 03/09/03 22:27:01 serg@serg.mylan +11 -0
    bug #1172 - crash on force index() and SEL_ARG::MAYBE_KEY

  mysql-test/r/range.result
    1.12 03/09/03 22:27:01 serg@serg.mylan +13 -0
    bug #1172 - crash on force index() and SEL_ARG::MAYBE_KEY

ChangeSet
  1.676.1.736 03/09/03 18:48:10 monty@narttu.mysql.fi +1 -0
  Better quoting patch for mysqldump

  client/mysqldump.c
    1.37.1.18 03/09/03 18:48:09 monty@narttu.mysql.fi +85 -70
    Better quoting patch

ChangeSet
  1.1549.2.1 03/09/03 08:07:58 gerberb@ou800.zenez.com +2 -0
  Change set for gcc patch on OpenUNIX and UnixWare SCO is the OS vendor.

  BitKeeper/etc/logging_ok
    1.286 03/09/03 08:07:57 gerberb@ou800.zenez.com +1 -0
    Logging to logging@openlogging.org accepted

  configure.in
    1.282 03/09/03 06:30:00 gerberb@ou800.zenez.com +12 -2
    Changes for UnixWare 7.1.X andOpenUNIX 8.0.0 to allow gcc.

ChangeSet
  1.676.1.735 03/09/02 18:30:34 serg@serg.mylan +1 -0
  proper obligatory quoting of identifiers in mysqldump<->server communication (unrelated from command-line options)

  client/mysqldump.c
    1.37.1.17 03/09/02 18:30:33 serg@serg.mylan +27 -25
    proper obligatory quoting of identifiers in mysqldump<->server communication (unrelated from command-line options)

ChangeSet
  1.1549.1.2 03/09/02 15:17:12 ram@mysql.r18.ru +3 -0
  Fix for the bug #971: ORDER BY DESC doesn't return correct num of rows with BDB and an indexed column.

ChangeSet
  1.1549.1.1 03/09/02 12:09:27 vva@eagle.mysql.r18.ru +1 -0
  fixed bug #1174

  libmysql/get_password.c
    1.12 03/09/02 12:09:21 vva@eagle.mysql.r18.ru +1 -1
    fixed bug #1174

ChangeSet
  1.1551 03/09/02 16:49:00 serg@serg.mylan +1 -0
  more sanity checks for compressed files, BUG#770

  myisam/mi_packrec.c
    1.21 03/09/02 16:48:57 serg@serg.mylan +6 -0
    more sanity checks for compressed files, BUG#770

  sql/ha_berkeley.cc
    1.110 03/09/02 15:17:10 ram@mysql.r18.ru +3 -0
    Fix for the bug #971: ORDER BY DESC doesn't return correct num of rows with BDB and an indexed column.

  mysql-test/t/bdb.test
    1.28 03/09/02 15:17:10 ram@mysql.r18.ru +13 -0
    Fix for the bug #971: ORDER BY DESC doesn't return correct num of rows with BDB and an indexed column.

  mysql-test/r/bdb.result
    1.27 03/09/02 15:17:10 ram@mysql.r18.ru +31 -0
    Fix for the bug #971: ORDER BY DESC doesn't return correct num of rows with BDB and an indexed column.

ChangeSet
  1.676.1.734 03/09/02 11:18:13 serg@serg.mylan +1 -0
  bug #928 - arbitrary table grant was used, sort-order wasn't honored

  sql/sql_acl.cc
    1.27.1.17 03/09/02 11:18:12 serg@serg.mylan +7 -3
    bug #928 - arbitrary table grant was used, sort-order wasn't honored

ChangeSet
  1.1550 03/09/02 08:37:27 serg@serg.mylan +1 -0
  s/\t/ / in command-line help text

  myisam/myisampack.c
    1.27 03/09/02 08:37:24 serg@serg.mylan +1 -1
    s/\t/ / in command-line help text

ChangeSet
  1.1541.2.1 03/09/01 14:18:27 serg@serg.mylan +3 -0
  workaround for IN's special treatment of first argument. Not for 4.1

  sql/sql_select.cc
    1.253 03/09/01 14:18:24 serg@serg.mylan +6 -0
    workaround for IN's special treatment of first argument. Not for 4.1

  mysql-test/t/range.test
    1.7 03/09/01 14:18:24 serg@serg.mylan +3 -0
    workaround for IN's special treatment of first argument. Not for 4.1

  mysql-test/r/range.result
    1.11 03/09/01 14:18:24 serg@serg.mylan +6 -0
    workaround for IN's special treatment of first argument. Not for 4.1

ChangeSet
  1.1548 03/09/01 12:25:39 lenz@mysql.com +1 -0
   - added a missing %define in the RPM spec file
     (thanks to Haakon Innerdal for spotting this one)

  support-files/mysql.spec.sh
    1.71 03/09/01 12:25:36 lenz@mysql.com +1 -1
     - added a missing %define
       (thanks to Haakon Innerdal for spotting this one)

ChangeSet
  1.1547 03/08/29 19:14:42 lenz@mysql.com +1 -0
   - Fixed BUG 1162 (removed macro names from the changelog)
   - Really fixed BUG 998 (disable the checking for installed but
     unpackaged files)

  support-files/mysql.spec.sh
    1.70 03/08/29 19:14:40 lenz@mysql.com +17 -5
     - Fixed BUG 1162 (removed macro names from the changelog)
     - Really fixed BUG 998 (disable the checking for installed but
       unpackaged files)

ChangeSet
  1.1546 03/08/29 14:38:39 kostja@oak.local +2 -0
  removed stale comment
  13:58 <monty> konstantin: the comment is missplaced (probably after merge).
            You can remove it

  BitKeeper/etc/logging_ok
    1.285 03/08/29 14:38:39 kostja@oak.local +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_parse.cc
    1.336 03/08/29 14:37:41 kostja@oak.local +0 -1
    removed stale comment

ChangeSet
  1.1543.1.1 03/08/29 04:17:30 monty@narttu.mysql.fi +7 -0
  Revert change of lower-case-table handling as this breaks how alias works.
  Changes like this should be done to 4.1, not to a stable release

  sql/sql_yacc.yy
    1.220 03/08/29 04:17:29 monty@narttu.mysql.fi +0 -4
    Revert change of lower-case-table handling 

  sql/sql_table.cc
    1.167 03/08/29 04:17:29 monty@narttu.mysql.fi +0 -2
    Revert change of lower-case-table handling 

  sql/sql_parse.cc
    1.335 03/08/29 04:17:29 monty@narttu.mysql.fi +1 -4
    Revert change of lower-case-table handling 

  sql/sql_class.h
    1.161 03/08/29 04:17:29 monty@narttu.mysql.fi +9 -2
    Revert change of lower-case-table handling 

  sql/sql_class.cc
    1.106 03/08/29 04:17:29 monty@narttu.mysql.fi +0 -23
    Revert change of lower-case-table handling 

  mysql-test/t/lowercase_table.test
    1.4 03/08/29 04:17:29 monty@narttu.mysql.fi +5 -0
    Revert change of lower-case-table handling 

  mysql-test/r/lowercase_table.result
    1.4 03/08/29 04:17:28 monty@narttu.mysql.fi +9 -2
    Revert change of lower-case-table handling 

ChangeSet
  1.1541.1.1 03/08/28 16:06:13 jcole@mugatu.spaceapes.com +1 -0
  opt_range.cc: Fixes for out of memory conditions.

  sql/opt_range.cc
    1.83 03/08/28 16:06:03 jcole@mugatu.spaceapes.com +41 -32
    Fixes for out of memory conditions.

ChangeSet
  1.1543 03/08/28 22:30:11 monty@narttu.mysql.fi +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.0
  into narttu.mysql.fi:/my/mysql-4.0

  mysql-test/r/isam.result
    1.11 03/08/28 22:30:09 monty@narttu.mysql.fi +0 -170
    Auto merged

  myisam/mi_dynrec.c
    1.30 03/08/28 22:30:09 monty@narttu.mysql.fi +0 -1
    Auto merged

ChangeSet
  1.1538.2.1 03/08/28 22:18:02 monty@narttu.mysql.fi +7 -0
  Portability fixes

  sql/sql_class.h
    1.160 03/08/28 22:18:00 monty@narttu.mysql.fi +3 -17
    Moved Table_ident functions to .cc file to allow them to use table_case_convert()

  sql/sql_class.cc
    1.105 03/08/28 22:18:00 monty@narttu.mysql.fi +23 -0
    Moved Table_ident functions to .cc file to allow them to use table_case_convert()

  sql/mysql_priv.h
    1.205 03/08/28 22:18:00 monty@narttu.mysql.fi +4 -0
    Cleanup

  sql/log_event.cc
    1.130 03/08/28 22:18:00 monty@narttu.mysql.fi +6 -5
    Cleanup

  mysql-test/r/isam.result
    1.9.1.1 03/08/28 22:18:00 monty@narttu.mysql.fi +170 -0
    Updated results after merge

  myisam/mi_dynrec.c
    1.28.1.1 03/08/28 22:18:00 monty@narttu.mysql.fi +1 -0
    Added assert to avoid compilation errors

  client/mysqltest.c
    1.105 03/08/28 22:18:00 monty@narttu.mysql.fi +0 -59
    Removed not used functions

ChangeSet
  1.1542 03/08/28 21:27:25 jani@rhols221.adsl.netsonic.fi +2 -0
  Removed restriction not to be able use non regular files.

  mysys/default.c
    1.30 03/08/28 21:27:23 jani@rhols221.adsl.netsonic.fi +0 -2
    Removed restriction not to be able use non regular files.

  extra/my_print_defaults.c
    1.13 03/08/28 21:27:23 jani@rhols221.adsl.netsonic.fi +1 -0
    Removed restriction not to be able use non regular files.

ChangeSet
  1.1538.1.3 03/08/28 13:14:54 serg@serg.mylan +2 -0
  post-merge fixes

  mysql-test/r/isam.result
    1.10 03/08/28 13:14:51 serg@serg.mylan +170 -0
    results updated

  myisam/mi_dynrec.c
    1.29 03/08/28 13:14:51 serg@serg.mylan +1 -0
    included assert.h

ChangeSet
  1.1532.1.1 03/08/28 12:37:50 serg@serg.mylan +1 -0
  oom protection

  sql/sql_select.cc
    1.252 03/08/28 12:37:48 serg@serg.mylan +3 -3
    oom protection

ChangeSet
  1.1538.1.1 03/08/28 12:35:36 monty@narttu.mysql.fi +5 -0
  merge with 3.23 to get for overrun in ISAM tables with man fields and a blob.

  mysql-test/t/isam.test
    1.6 03/08/28 12:35:35 monty@narttu.mysql.fi +45 -45
    merge

  mysql-test/r/isam.result
    1.9 03/08/28 12:35:35 monty@narttu.mysql.fi +0 -2
    merge

  myisam/mi_dynrec.c
    1.28 03/08/28 12:35:35 monty@narttu.mysql.fi +0 -1
    merge

  myisam/mi_open.c
    1.64 03/08/28 12:31:04 monty@narttu.mysql.fi +0 -2
    Auto merged

  isam/open.c
    1.13 03/08/28 12:31:04 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.676.309.2 03/08/28 12:28:51 monty@narttu.mysql.fi +2 -0
  Updated test for ISAM overflow bug

  mysql-test/t/isam.test
    1.1.2.1 03/08/28 12:28:50 monty@narttu.mysql.fi +173 -0
    Updated test for overflow bug

  mysql-test/r/isam.result
    1.1.2.1 03/08/28 12:28:50 monty@narttu.mysql.fi +2 -0
    Updated test for overflow bug

ChangeSet
  1.676.309.1 03/08/28 12:27:35 monty@narttu.mysql.fi +4 -0
  ixed overflow bug in MyISAM and ISAM when using packed tables with a lot of fields and blobs

  myisam/mi_open.c
    1.31.1.7 03/08/28 12:27:35 monty@narttu.mysql.fi +2 -0
    Fixed overflow bug when using packed tables and blobs

  myisam/mi_dynrec.c
    1.10.1.2 03/08/28 12:27:35 monty@narttu.mysql.fi +1 -1
    pack_bits not needed here as we do it on open

  isam/test_all.res
    1.4 03/08/28 12:27:35 monty@narttu.mysql.fi +17 -354
    updated test results

  isam/open.c
    1.11.1.1 03/08/28 12:27:35 monty@narttu.mysql.fi +3 -0
    Fixed overflow bug when using packed tables and blobs

ChangeSet
  1.1537 03/08/28 06:08:17 monty@narttu.mysql.fi +16 -0
  Add detection of in_addr_t
  Add pack_bits to pack_reclength for dynamic rows.  This solves buffer a possible buffer overflow on update.
  (This will probably solve bug #563)
  Fix test for available file descriptors in mysqltest
  Fixed core dump bug in replication tests when running without transactional table support

  sql/log.cc
    1.138 03/08/28 06:08:15 monty@narttu.mysql.fi +8 -9
    Code cleanup
    Fixed core dump bug in replication tests when running without transactional table support.

  mysys/my_pthread.c
    1.38 03/08/28 06:08:15 monty@narttu.mysql.fi +9 -5
    Remove C++ comments

  mysys/default.c
    1.29 03/08/28 06:08:15 monty@narttu.mysql.fi +93 -40
    Cleanup

  mysql-test/t/query_cache_merge.test
    1.2 03/08/28 06:08:15 monty@narttu.mysql.fi +2 -2
    Fix test for available file descriptors

  mysql-test/t/myisam.test
    1.18 03/08/28 06:08:15 monty@narttu.mysql.fi +4 -2
    More tests

  mysql-test/r/myisam.result
    1.22 03/08/28 06:08:15 monty@narttu.mysql.fi +6 -2
    More tests

  mysql-test/include/check_var_limit.inc
    1.2 03/08/28 06:08:15 monty@narttu.mysql.fi +1 -1
    Fix test for available file descriptors

  myisam/mi_test_all.sh
    1.7 03/08/28 06:08:15 monty@narttu.mysql.fi +2 -0
    Added valgrind option to make it easier to verify tests

  myisam/mi_open.c
    1.63 03/08/28 06:08:15 monty@narttu.mysql.fi +3 -1
    Add pack_bits to pack_reclength for dynamic rows.  This solves buffer a possible buffer overflow on update.

  myisam/mi_dynrec.c
    1.27 03/08/28 06:08:15 monty@narttu.mysql.fi +8 -5
    Add ASSERT if allocated record length is to small

  libmysql/dll.c
    1.9 03/08/28 06:08:15 monty@narttu.mysql.fi +7 -6
    Fixed C++ commments

  extra/resolveip.c
    1.20 03/08/28 06:08:15 monty@narttu.mysql.fi +4 -2
    Add detection of in_addr_t

  extra/my_print_defaults.c
    1.12 03/08/28 06:08:15 monty@narttu.mysql.fi +7 -7
    Cleanup

  configure.in
    1.281 03/08/28 06:08:15 monty@narttu.mysql.fi +3 -1
    Add detection of in_addr_t

  acinclude.m4
    1.92 03/08/28 06:08:15 monty@narttu.mysql.fi +22 -0
    Add detection of in_addr_t

  acconfig.h
    1.28 03/08/28 06:08:15 monty@narttu.mysql.fi +3 -0
    Add detection of in_addr_t

ChangeSet
  1.1533.3.1 03/08/28 01:35:58 lenz@mysql.com +1 -0
   - replaced C++-style comments in .c file (Please try to avoid this, as
     it breaks compilation on picky C compilers!)

  fs/database.c
    1.4 03/08/28 01:35:56 lenz@mysql.com +6 -6
     - replaced C++-style comments in .c file

ChangeSet
  1.1533.1.4 03/08/28 02:00:46 heikki@hundin.mysql.fi +2 -0
  btr0btr.c:
    Fix bug: if the user created a prefix column key on a fixed length char column, then InnoDB claimed in CHECK TABLE that the table is corrupt
  dict0dict.c:
    Fix bug 1151: if the user created a prefix column primary key on a fixed length char column, then InnoDB crashed in a simple SELECT

  innobase/btr/btr0btr.c
    1.21 03/08/28 02:00:35 heikki@hundin.mysql.fi +9 -2
    Fix bug: if the user created a prefix column key on a fixed length char column, then InnoDB claimed in CHECK TABLE that the table is corrupt

  innobase/dict/dict0dict.c
    1.32 03/08/28 01:59:26 heikki@hundin.mysql.fi +7 -0
    Fix bug 1151: if the user created a prefix column primary key on a fixed length char column, then InnoDB crashed in a simple SELECT

ChangeSet
  1.1535 03/08/27 20:00:18 monty@narttu.mysql.fi +3 -0
  Fixed unlikely stack bug when having a BIG expression of type 1+1-1+1-1... in certain combinations. Bug #871

  sql/item_func.cc
    1.99 03/08/27 20:00:16 monty@narttu.mysql.fi +2 -2
    Test for stack checking

  sql/item_cmpfunc.cc
    1.59 03/08/27 20:00:16 monty@narttu.mysql.fi +1 -1
    Test for stack checking

  sql-bench/limits/mysql.cfg
    1.21 03/08/27 20:00:16 monty@narttu.mysql.fi +77 -23
    Updated limits

ChangeSet
  1.1533.2.1 03/08/27 12:22:42 miguel@hegel.local +2 -0
  Updating translation for Spanish/Portuguese error messages files

  sql/share/spanish/errmsg.txt
    1.59 03/08/27 12:22:18 miguel@hegel.local +17 -17
    Updating Translation

  sql/share/portuguese/errmsg.txt
    1.59 03/08/27 12:22:18 miguel@hegel.local +20 -20
    Updating Translation

ChangeSet
  1.1533.1.2 03/08/27 19:22:14 jani@rhols221.adsl.netsonic.fi +5 -0
  Added a warning to my_print_defaults if --verbose is given
  and --defaults-file is a non-existing or non-regular file.
  Bug#755

  scripts/mysqld_safe.sh
    1.64 03/08/27 19:22:12 jani@rhols221.adsl.netsonic.fi +1 -1
    Added a warning to my_print_defaults if --verbose is given
    and --defaults-file is a non-existing or non-regular file.
    
    Bug#755

  mysys/default.c
    1.28 03/08/27 19:22:12 jani@rhols221.adsl.netsonic.fi +34 -25
    Added a warning to my_print_defaults if --verbose is given
    and --defaults-file is a non-existing or non-regular file.
    Bug#755

  include/mysql_com.h
    1.51 03/08/27 19:22:12 jani@rhols221.adsl.netsonic.fi +2 -2
    Added a warning to my_print_defaults if --verbose is given
    and --defaults-file is a non-existing or non-regular file.
    Bug#755

  include/my_sys.h
    1.101 03/08/27 19:22:12 jani@rhols221.adsl.netsonic.fi +2 -2
    Added a warning to my_print_defaults if --verbose is given
    and --defaults-file is a non-existing or non-regular file.
    Bug#755

  extra/my_print_defaults.c
    1.11 03/08/27 19:22:12 jani@rhols221.adsl.netsonic.fi +25 -4
    Added a warning to my_print_defaults if --verbose is given
    and --defaults-file is a non-existing or non-regular file.
    Bug#755

ChangeSet
  1.1533.1.1 03/08/27 12:26:21 lenz@mysql.com +1 -0
   - added missing file vio_priv.h to source distribution

  vio/Makefile.am
    1.12 03/08/27 12:26:19 lenz@mysql.com +1 -1
     - added missing file vio_priv.h to source distribution

ChangeSet
  1.1534 03/08/27 10:26:03 monty@narttu.mysql.fi +5 -0
  Add column names for metadata when running mysql with -T
  Change metadata info so that that MIN() and code MAX() reports that they can return NULL. Bug #324

  sql/sql_load.cc
    1.51 03/08/27 10:26:02 monty@narttu.mysql.fi +0 -1
    Removed not needed line

  sql/item_sum.cc
    1.34 03/08/27 10:26:02 monty@narttu.mysql.fi +6 -1
    Change metadata info so that that MIN() and code MAX() reports that they can return NULL. Bug #324

  mysql-test/t/show_check.test
    1.19 03/08/27 10:26:02 monty@narttu.mysql.fi +7 -0
    test case for bug fix

  mysql-test/r/show_check.result
    1.25 03/08/27 10:26:02 monty@narttu.mysql.fi +6 -0
    test case for bug fix

  client/mysql.cc
    1.141 03/08/27 10:26:02 monty@narttu.mysql.fi +3 -2
    Add column names for metadata when running with -T

ChangeSet
  1.1527.1.1 03/08/27 02:51:39 monty@narttu.mysql.fi +22 -0
  vio ssl structure renames (to get rid of ending _)
  Added TCP/IP read/write timeout for windows
  Check on windows if second server is started with same TCP/IP port

  vio/vio_priv.h
    1.1 03/08/27 02:51:37 monty@narttu.mysql.fi +54 -0

  vio/viosslfactories.c
    1.15 03/08/27 02:51:37 monty@narttu.mysql.fi +29 -36
    Added timeouts for windows
    Cleaned up structure element names

  vio/viossl.c
    1.21 03/08/27 02:51:37 monty@narttu.mysql.fi +41 -48
    Added timeouts for windows
    Cleaned up structure element names

  vio/viosocket.c
    1.19 03/08/27 02:51:37 monty@narttu.mysql.fi +12 -13
    Added timeouts for windows

  vio/vio_priv.h
    1.0 03/08/27 02:51:37 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/vio/vio_priv.h

  vio/vio.c
    1.15 03/08/27 02:51:37 monty@narttu.mysql.fi +3 -7
    Added timeouts for windows

  sql/sql_show.cc
    1.114 03/08/27 02:51:37 monty@narttu.mysql.fi +31 -30
    vio ssl structure renames 

  sql/sql_acl.cc
    1.115 03/08/27 02:51:37 monty@narttu.mysql.fi +10 -7
    vio ssl structure renames

  sql/net_serv.cc
    1.60 03/08/27 02:51:37 monty@narttu.mysql.fi +3 -0
    Add read/write timeouts for windows

  sql/mysqld.cc
    1.453 03/08/27 02:51:37 monty@narttu.mysql.fi +13 -0
    Check on windows if second server is started with same TCP/IP port

  sql/mini_client.cc
    1.55 03/08/27 02:51:37 monty@narttu.mysql.fi +1 -1
    vio ssl structure renames 

  sql/item_func.cc
    1.98 03/08/27 02:51:37 monty@narttu.mysql.fi +5 -0
    Remove compiler warnings

  sql/item_cmpfunc.cc
    1.58 03/08/27 02:51:37 monty@narttu.mysql.fi +3 -0
    Remove compiler warnings

  mysys/my_getopt.c
    1.36 03/08/27 02:51:37 monty@narttu.mysql.fi +1 -2
    Indentaion cleanup

  libmysqld/lib_vio.c
    1.16 03/08/27 02:51:37 monty@narttu.mysql.fi +5 -0
    Added timeout for windows

  libmysql/Makefile.shared
    1.34 03/08/27 02:51:37 monty@narttu.mysql.fi +2 -1
    Use vio_priv.h

  libmysql/Makefile.am
    1.32 03/08/27 02:51:37 monty@narttu.mysql.fi +1 -1
    Use vio_priv.h

  include/violite.h
    1.30 03/08/27 02:51:37 monty@narttu.mysql.fi +41 -103
    Cleanup violite.h interface (move things to vio_priv.h)

  client/mysql.cc
    1.140 03/08/27 02:51:37 monty@narttu.mysql.fi +4 -3
    vio ssl structure renames

  BitKeeper/etc/ignore
    1.149 03/08/27 02:49:58 monty@narttu.mysql.fi +2 -0
    added libmysql/vio_priv.h libmysql_r/vio_priv.h

ChangeSet
  1.1532 03/08/27 00:58:42 serg@serg.mylan +1 -0
  do not try to "analyze" or "sort index" in the table that has no indexes or no records if --check-only-changed option is used.
  It's because such a table is never marked as "analyzed" or "sorted", so --check-only-changed doesn't work

  myisam/myisamchk.c
    1.108 03/08/27 00:58:39 serg@serg.mylan +12 -9
    do not try to "analyze" or "sort index" in the table that has no indexes or no records if --check-only-changed option is used.
    It's because such a table is never marked as "analyzed" or "sorted", so --check-only-changed doesn't work

ChangeSet
  1.1531 03/08/26 23:57:14 serg@serg.mylan +1 -0
  Merge bk-internal:/home/bk/mysql-4.0/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.0

  myisam/mi_check.c
    1.123 03/08/26 23:57:11 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1511.46.1 03/08/26 23:52:15 serg@serg.mylan +1 -0
  fix ANALYZE TBALE to never generate rec_per_key_part < 1, as it prevent the table from being marked as analyzed (and the value is meaningless anyway)

  myisam/mi_check.c
    1.121.1.1 03/08/26 23:52:12 serg@serg.mylan +4 -1
    fix ANALYZE TBALE to never generate rec_per_key_part < 1, as it prevent the table from being marked as analyzed (and the value is meaningless anyway)

ChangeSet
  1.1530 03/08/26 22:02:58 Sinisa@sinisa.nasamreza.org +1 -0
  Fixed  a very rarge memory overrun bug in the myisamlog program.

  myisam/myisamlog.c
    1.19 03/08/26 22:02:54 Sinisa@sinisa.nasamreza.org +9 -1
    Fixed  a very rarge memory overrun bug in the myisamlog program.

  BitKeeper/deleted/.del-openssl_2.test~f2dfa927f19d14f8
    1.6 03/08/26 17:10:07 monty@narttu.mysql.fi +0 -0
    Delete: mysql-test/t/openssl_2.test

  BitKeeper/deleted/.del-have_openssl_2.require~53bbdfc136fb514
    1.3 03/08/26 17:10:07 monty@narttu.mysql.fi +0 -0
    Delete: mysql-test/r/have_openssl_2.require

  BitKeeper/deleted/.del-have_openssl_2.inc~8c9f1a45676b698f
    1.3 03/08/26 17:10:07 monty@narttu.mysql.fi +0 -0
    Delete: mysql-test/include/have_openssl_2.inc

ChangeSet
  1.1529 03/08/26 14:29:13 lenz@mysql.com +1 -0
   - Reverted a fix for bug#897, as it broke the installation on some
     other operating systems - some implementations of "hostname" simply set
     the host name to "-f" instead of giving an error about an unkown option

  scripts/mysql_install_db.sh
    1.38 03/08/26 14:29:11 lenz@mysql.com +2 -7
     - Reverted a fix for bug#897, as it broke the installation on some
       other operating systems - some implementations of "hostname" simply set
       the host name to "-f" instead of giving an error about an unkown option

ChangeSet
  1.1527 03/08/25 17:20:51 monty@narttu.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.0
  into narttu.mysql.fi:/my/mysql-4.0

  sql/log_event.cc
    1.129 03/08/25 17:20:49 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1523.1.5 03/08/25 16:20:21 guilhem@mysql.com +2 -0
  comments about mutexes in replication.
  Don't start the SQL slave thread with SQL_BIG_SELECTS;
  it's better to inhibate max_join_size instead.

  sql/slave.h
    1.64 03/08/25 16:20:11 guilhem@mysql.com +24 -0
    comments

  sql/slave.cc
    1.250 03/08/25 16:20:10 guilhem@mysql.com +6 -7
    OPTION_BIG_SELECTS does more than ignoring max_join_size (talks to the optimiser),
    just ignore max_join_size.

ChangeSet
  1.1526 03/08/25 17:19:44 monty@narttu.mysql.fi +6 -0
  Better fix for myisamchk --sort-index on windows
  Fixed deadlock bug when doing resize of key buffer while key buffer was in active use

  sql/sql_show.cc
    1.113 03/08/25 17:19:42 monty@narttu.mysql.fi +7 -4
    Fixed theoretical buffer overrun
    Reset variable properly before calling update_create_info()

  sql/ha_myisam.cc
    1.128 03/08/25 17:19:42 monty@narttu.mysql.fi +1 -1
    simple optimization

  mysys/mf_keycache.c
    1.22 03/08/25 17:19:42 monty@narttu.mysql.fi +13 -5
    Fixed deadlock bug when doing resize of key buffer while key buffer was in active use

  mysql-test/t/symlink.test
    1.5 03/08/25 17:19:42 monty@narttu.mysql.fi +2 -0
    Update results

  mysql-test/r/symlink.result
    1.6 03/08/25 17:19:42 monty@narttu.mysql.fi +2 -2
    Update results

  myisam/mi_locking.c
    1.27 03/08/25 17:19:42 monty@narttu.mysql.fi +17 -16
    Better fix for myisamchk --sort-index on windows

ChangeSet
  1.1523.2.1 03/08/25 14:13:58 guilhem@mysql.com +4 -0
  Clearer states in SHOW PROCESSLIST for replication threads.
  For example the Binlog_dump thread (on the master) sometimes showed "Slave:".
  And there were confusing messages where "binlog" was employed instead
  of "relay log".

  sql/sql_repl.cc
    1.110 03/08/25 14:13:52 guilhem@mysql.com +7 -7
    clearer thd->proc_info for binlog_dump thread

  sql/sql_class.h
    1.159 03/08/25 14:13:52 guilhem@mysql.com +1 -1
    prototype change

  sql/slave.cc
    1.249 03/08/25 14:13:52 guilhem@mysql.com +21 -12
    Clearer thd-proc_info for slave threads.

  sql/log.cc
    1.137 03/08/25 14:13:51 guilhem@mysql.com +9 -2
    MYSQL_LOG::wait_for_update() is used by the binlog_dump and I/Oslave threads,
    and it updates thd->proc_info, so we need a bool to not show the same
    proc_info for 2 different things (previously we showed "Slave: etc" and that's
    bad for a binlog_dump thread).

ChangeSet
  1.1525 03/08/25 14:27:32 monty@narttu.mysql.fi +36 -0
  Update of VC++ project files (to remove link warnings)
  Fix unlock error in myisamchk on windows when doing --sort-index
  Use SetFilePointer instead of SetFilePointerEx

  sql/log_event.cc
    1.127.1.1 03/08/25 14:27:30 monty@narttu.mysql.fi +0 -2
    Fix compiler warning

  sql/handler.cc
    1.107 03/08/25 14:27:30 monty@narttu.mysql.fi +2 -2
    Fix compiler warning

  mysys/my_chsize.c
    1.13 03/08/25 14:27:30 monty@narttu.mysql.fi +4 -3
    Use SetFilePointer instead of SetFilePointerEx, as the first is more portable

  myisam/myisamchk.c
    1.107 03/08/25 14:27:30 monty@narttu.mysql.fi +5 -0
    New comment

  myisam/mi_locking.c
    1.26 03/08/25 14:27:30 monty@narttu.mysql.fi +5 -1
    Fix unlock error in myisamchk on windows when doing --sort-index

  myisam/mi_check.c
    1.122 03/08/25 14:27:30 monty@narttu.mysql.fi +11 -6
    Fix unlock error in myisamchk on windows when doing --sort-index

  VC++Files/zlib/zlib.dsp
    1.5 03/08/25 14:27:30 monty@narttu.mysql.fi +4 -4
    Update of project files

  VC++Files/vio/vio.dsp
    1.6 03/08/25 14:27:30 monty@narttu.mysql.fi +6 -6
    Update of project files

  VC++Files/thr_test/thr_test.dsp
    1.6 03/08/25 14:27:30 monty@narttu.mysql.fi +4 -4
    Update of project files

  VC++Files/test1/test1.dsp
    1.6 03/08/25 14:27:30 monty@narttu.mysql.fi +4 -4
    Update of project files

  VC++Files/sql/mysqld.dsp
    1.9 03/08/25 14:27:30 monty@narttu.mysql.fi +7 -7
    Update of project files

  VC++Files/replace/replace.dsp
    1.6 03/08/25 14:27:30 monty@narttu.mysql.fi +4 -4
    Update of project files

  VC++Files/perror/perror.dsp
    1.7 03/08/25 14:27:30 monty@narttu.mysql.fi +6 -6
    Update of project files

  VC++Files/pack_isam/pack_isam.dsp
    1.7 03/08/25 14:27:30 monty@narttu.mysql.fi +4 -4
    Update of project files

  VC++Files/mysys/mysys.dsp
    1.8 03/08/25 14:27:30 monty@narttu.mysql.fi +7 -7
    Update of project files

  VC++Files/mysqlshutdown/mysqlshutdown.dsp
    1.4 03/08/25 14:27:30 monty@narttu.mysql.fi +5 -5
    Update of project files

  VC++Files/mysqlserver/mysqlserver.dsp
    1.5 03/08/25 14:27:30 monty@narttu.mysql.fi +6 -6
    Update of project files

  VC++Files/mysqlmanager/MySqlManager.dsp
    1.6 03/08/25 14:27:30 monty@narttu.mysql.fi +4 -4
    Update of project files

  VC++Files/mysqldemb/mysqldemb.dsp
    1.5 03/08/25 14:27:30 monty@narttu.mysql.fi +5 -5
    Update of project files

  VC++Files/mysqlcheck/mysqlcheck.dsp
    1.6 03/08/25 14:27:30 monty@narttu.mysql.fi +8 -8
    Update of project files

  VC++Files/mysqlbinlog/mysqlbinlog.dsp
    1.9 03/08/25 14:27:30 monty@narttu.mysql.fi +6 -6
    Update of project files

  VC++Files/mysql.dsw
    1.8 03/08/25 14:27:30 monty@narttu.mysql.fi +0 -3
    Update of project files

  VC++Files/myisamlog/myisamlog.dsp
    1.4 03/08/25 14:27:30 monty@narttu.mysql.fi +5 -5
    Update of project files

  VC++Files/my_print_defaults/my_print_defaults.dsp
    1.3 03/08/25 14:27:30 monty@narttu.mysql.fi +11 -11
    Update of project files

  VC++Files/libmysqltest/myTest.dsp
    1.6 03/08/25 14:27:30 monty@narttu.mysql.fi +4 -4
    Update of project files

  VC++Files/libmysqld/libmysqld.dsp
    1.4 03/08/25 14:27:30 monty@narttu.mysql.fi +7 -7
    Update of project files

  VC++Files/libmysql/libmysql.dsp
    1.10 03/08/25 14:27:30 monty@narttu.mysql.fi +1 -1
    Update of project files

  VC++Files/isamchk/isamchk.dsp
    1.4 03/08/25 14:27:30 monty@narttu.mysql.fi +4 -4
    Update of project files

  VC++Files/innobase/innobase.dsp
    1.9 03/08/25 14:27:30 monty@narttu.mysql.fi +9 -9
    Update of project files

  VC++Files/comp_err/comp_err.dsp
    1.3 03/08/25 14:27:30 monty@narttu.mysql.fi +4 -4
    Update of project files

  VC++Files/client/mysqlshow.dsp
    1.6 03/08/25 14:27:30 monty@narttu.mysql.fi +6 -6
    Update of project files

  VC++Files/client/mysqlimport.dsp
    1.6 03/08/25 14:27:30 monty@narttu.mysql.fi +5 -5
    Update of project files

  VC++Files/client/mysqldump.dsp
    1.6 03/08/25 14:27:30 monty@narttu.mysql.fi +6 -6
    Update of project files

  VC++Files/client/mysqlclient.dsp
    1.8 03/08/25 14:27:30 monty@narttu.mysql.fi +4 -4
    Update of project files

  VC++Files/client/mysqladmin.dsp
    1.6 03/08/25 14:27:30 monty@narttu.mysql.fi +4 -4
    Update of project files

  VC++Files/client/mysql.dsp
    1.6 03/08/25 14:27:30 monty@narttu.mysql.fi +4 -4
    Update of project files

ChangeSet
  1.1523.1.3 03/08/24 03:44:16 heikki@hundin.mysql.fi +1 -0
  os0file.c:
    strerror() does not work in Windows

  innobase/os/os0file.c
    1.59 03/08/24 03:43:58 heikki@hundin.mysql.fi +1 -6
    strerror() does not work in Windows

ChangeSet
  1.1523.1.2 03/08/23 17:41:43 guilhem@mysql.com +1 -0
  The slave threads MUST not care about max_join_size, we start them with
  OPTION_BIG_SELECTS.

  sql/slave.cc
    1.248 03/08/23 17:41:36 guilhem@mysql.com +8 -4
    The slave threads MUST not care about max_join_size.
    I can imagine the case of a slave where users can connect and do SELECTs, but
    DBA does not want them to issue crazy SELECTs, but he/she still wants replication
    to work.
    Before, this just printed a warning to the error log (not fatal) but that
    was still annoying.

ChangeSet
  1.1511.1.74 03/08/23 16:53:04 guilhem@mysql.com +2 -0
  * Fix for a potential bug:
  when the SQL thread stops, set rli->inside_transaction to 0. This is needed if the user
  later restarts replication from a completely different place where there are only autocommit
  statements.
  * Detect the case where the master died while flushing the binlog cache to the binlog
  and stop with error. Cannot add a testcase for this in 4.0 (I tested it manually)
  as the slave always runs with --skip-innodb.

  sql/slave.cc
    1.247 03/08/23 16:52:59 guilhem@mysql.com +7 -1
    * Use slave_print_error instead of sql_print_error, to put the info in SHOW SLAVE STATUS too.
    * Fix for a potential bug:
    when the SQL thread stops, set rli->inside_transaction to 0. This is not needed if
    replication later restarts from the same position; but this is needed if the user
    restarts replication from a completely different place where there are only autocommit
    statements (in that case, if we didn't set to 0, the position would never increment in SHOW
    SLAVE STATUS, even if queries are processed well).

  sql/log_event.cc
    1.128 03/08/23 16:52:59 guilhem@mysql.com +36 -7
    Detect the case where the master died while flushing the binlog cache to the binlog:
    in that case, we have a BEGIN with no COMMIT/ROLLBACK in the relay log; we detect
    this with rli->inside_transaction in Rotate_log_event::exec_event() (which is the
    only right place to detect this, see comments). When we see it, we stop with error.
    In 4.1, I had put code in Start_log_event::exec_event(); I'll remove it next time
    I push in the 4.1 tree.

ChangeSet
  1.1524 03/08/23 12:26:08 monty@narttu.mysql.fi +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.0
  into narttu.mysql.fi:/my/mysql-4.0

  sql/sql_table.cc
    1.166 03/08/23 12:26:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.204 03/08/23 12:26:06 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1511.45.1 03/08/23 12:25:39 monty@narttu.mysql.fi +4 -0
  show symlinked directories in SHOW CREATE TABLE

  sql/sql_table.cc
    1.163.1.2 03/08/23 12:25:38 monty@narttu.mysql.fi +3 -0
    show symlinked directories in SHOW CREATE TABLE

  sql/sql_show.cc
    1.112 03/08/23 12:25:38 monty@narttu.mysql.fi +55 -37
    show symlinked directories in SHOW CREATE TABLE

  sql/mysqld.cc
    1.452 03/08/23 12:25:38 monty@narttu.mysql.fi +6 -2
    show symlinked directories in SHOW CREATE TABLE

  sql/mysql_priv.h
    1.201.1.2 03/08/23 12:25:37 monty@narttu.mysql.fi +1 -0
    show symlinked directories in SHOW CREATE TABLE

ChangeSet
  1.1523 03/08/22 18:43:46 Sinisa@sinisa.nasamreza.org +15 -0
  After merge fixes

  sql/sql_union.cc
    1.47 03/08/22 18:43:43 Sinisa@sinisa.nasamreza.org +1 -35
    After merge fixes

  mysql-test/t/union.test
    1.30 03/08/22 18:43:43 Sinisa@sinisa.nasamreza.org +0 -16
    After merge fixes

  mysql-test/r/union.result
    1.26 03/08/22 18:43:43 Sinisa@sinisa.nasamreza.org +0 -55
    After merge fixes

  sql/sql_yacc.yy
    1.219 03/08/22 18:38:00 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_table.cc
    1.165 03/08/22 18:38:00 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_parse.cc
    1.334 03/08/22 18:38:00 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_class.h
    1.158 03/08/22 18:37:59 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_acl.cc
    1.114 03/08/22 18:37:59 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/mysql_priv.h
    1.203 03/08/22 18:37:59 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.57 03/08/22 18:37:59 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.185 03/08/22 18:37:58 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/t/grant.test
    1.9 03/08/22 18:37:58 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/t/func_test.test
    1.12 03/08/22 18:37:58 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/r/grant.result
    1.9 03/08/22 18:37:58 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/r/func_test.result
    1.14 03/08/22 18:37:58 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1522 03/08/22 18:32:11 Sinisa@sinisa.nasamreza.org +3 -0
  grant.result, grant.test, sql_acl.cc:
    Fix for a bug #878

  mysql-test/r/grant.result
    1.7.1.1 03/08/22 18:31:27 Sinisa@sinisa.nasamreza.org +20 -0
    Fix for a bug #878

  mysql-test/t/grant.test
    1.7.1.1 03/08/22 18:31:21 Sinisa@sinisa.nasamreza.org +10 -0
    Fix for a bug #878

  sql/sql_acl.cc
    1.107.2.1 03/08/22 18:31:12 Sinisa@sinisa.nasamreza.org +2 -0
    Fix for a bug #878

ChangeSet
  1.1511.44.1 03/08/22 15:39:24 guilhem@mysql.com +11 -0
  2 minor edits, plus
  fix for BUG#1113 "INSERT into non-trans table SELECT ; ROLLBACK" does not send warning"
  and
  fix for BUG#873 "In transaction, INSERT to non-trans table is written too early to binlog".
  Now we don't always write the non-trans update immediately to the binlog;
  if there is something in the binlog cache we write it to the binlog cache
  (because the non-trans update could depend on a trans table which was modified
  earlier in the transaction); then in case of ROLLBACK, we write the binlog
  cache to the binlog, wrapped with BEGIN/ROLLBACK.
  This guarantees that the slave does the same updates.
  For ROLLBACK TO SAVEPOINT: when we execute a SAVEPOINT command we write it
  to the binlog cache. At ROLLBACK TO SAVEPOINT, if some non-trans table was updated,
  we write ROLLBACK TO SAVEPOINT to the binlog cache; when the transaction
  terminates (COMMIT/ROLLBACK), the binlog cache will be flushed to the binlog
  (because of the non-trans update) so we'll have SAVEPOINT and ROLLBACK TO
  SAVEPOINT in the binlog.
  
  Apart from this rare case of updates of mixed table types in transaction, the
  usual way is still clear the binlog cache at ROLLBACK, or chop it at
  ROLLBACK TO SAVEPOINT (meaning the SAVEPOINT command is also chopped, which
  is fine).
  Note that BUG#873 encompasses subbugs 1) and 2) of BUG#333 "3 binlogging bugs when doing INSERT with mixed InnoDB/MyISAM".

  mysql-test/t/mix_innodb_myisam_binlog.test
    1.1 03/08/22 15:39:17 guilhem@mysql.com +175 -0

  mysql-test/t/mix_innodb_myisam_binlog.test
    1.0 03/08/22 15:39:17 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/mix_innodb_myisam_binlog.test

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.1 03/08/22 15:39:16 guilhem@mysql.com +180 -0

  sql/sql_parse.cc
    1.332.1.4 03/08/22 15:39:16 guilhem@mysql.com +11 -2
    Don't send ER_WARNING_NOT_COMPLETE_ROLLBACK if this is the SQL slave thread (see comments).

  sql/sql_insert.cc
    1.103 03/08/22 15:39:16 guilhem@mysql.com +4 -0
    Fix for BUG#1113:
    this was because the INSERT SELECT code did not set OPTION_STATUS_NO_TRANS_UPDATE.

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.0 03/08/22 15:39:16 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/r/mix_innodb_myisam_binlog.result

  sql/sql_class.h
    1.156.1.3 03/08/22 15:39:15 guilhem@mysql.com +1 -1
    prototype

  sql/log_event.cc
    1.127 03/08/22 15:39:15 guilhem@mysql.com +1 -1
    The slave thread can leave a transaction if COMMIT or if ROLLBACK.

  sql/log.cc
    1.136 03/08/22 15:39:15 guilhem@mysql.com +27 -4
    * Previously, if a query updated a non-transactional table we wrote it immediately
    to the real binlog. This causes a bug when the update is done inside a transaction
    and uses the content of an updated transactional table (because this makes
    a wrong order of queries in the binlog). So if the binlog cache is not empty,
    we write the query to the binlog cache; otherwise we can write it to the binlog.
    * Previously, when we flushed the binlog cache to the binlog, we wrapped it
    with BEGIN/COMMIT. Now it's also possible to wrap it with BEGIN/ROLLBACK, to handle
    transactions which update both transactional and non-transactional tables.

  sql/handler.cc
    1.106 03/08/22 15:39:14 guilhem@mysql.com +61 -8
    Fix for BUG#873. See comments in code, and the description of the changeset.

  mysql-test/t/rpl_loaddata.test
    1.8 03/08/22 15:39:14 guilhem@mysql.com +6 -8
    minor edit: simplifying the test.

  mysql-test/r/rpl_loaddata.result
    1.9 03/08/22 15:39:14 guilhem@mysql.com +3 -3
    result update

  client/mysqldump.c
    1.93 03/08/22 15:39:13 guilhem@mysql.com +2 -3
    Minor edit: one CHANGE MASTER with 2 arguments instead of 2 CHANGE MASTER with one argument each.

ChangeSet
  1.1511.1.72 03/08/22 04:08:16 monty@narttu.mysql.fi +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.0
  into narttu.mysql.fi:/my/mysql-4.0

  sql/sql_load.cc
    1.50 03/08/22 04:08:14 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysqltest.c
    1.104 03/08/22 04:08:14 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1511.43.1 03/08/22 04:07:40 monty@narttu.mysql.fi +18 -0
  Move test that uses many tables (in query_cache.test) to separate test so that we can get it 'skipped' instead of 'failed' on system where we can't open many files.

  mysql-test/t/query_cache_merge.test
    1.1 03/08/22 04:07:39 monty@narttu.mysql.fi +38 -0

  mysql-test/std_data/loaddata2.dat
    1.1 03/08/22 04:07:39 monty@narttu.mysql.fi +5 -0

  mysql-test/t/query_cache_merge.test
    1.0 03/08/22 04:07:39 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/t/query_cache_merge.test

  mysql-test/std_data/loaddata2.dat
    1.0 03/08/22 04:07:39 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/std_data/loaddata2.dat

  mysql-test/r/query_cache_merge.result
    1.1 03/08/22 04:07:38 monty@narttu.mysql.fi +20 -0

  mysql-test/r/check_var_limit.require
    1.1 03/08/22 04:07:38 monty@narttu.mysql.fi +2 -0

  mysql-test/include/check_var_limit.inc
    1.1 03/08/22 04:07:38 monty@narttu.mysql.fi +9 -0

  sql/sql_load.cc
    1.48.1.1 03/08/22 04:07:38 monty@narttu.mysql.fi +6 -2
    Safety fix

  sql/mysqld.cc
    1.451 03/08/22 04:07:38 monty@narttu.mysql.fi +16 -0
    Store in open_files_limit the true number of files we can open (if system supports it)
    

  sql/field.cc
    1.77 03/08/22 04:07:38 monty@narttu.mysql.fi +8 -1
    Portability fix for gcc 3.3

  mysql-test/t/select_safe.test
    1.7 03/08/22 04:07:38 monty@narttu.mysql.fi +2 -2
    Make test repeatable

  mysql-test/t/query_cache.test
    1.26 03/08/22 04:07:38 monty@narttu.mysql.fi +1 -23
    Move test with many tables to separate test

  mysql-test/t/loaddata.test
    1.3 03/08/22 04:07:38 monty@narttu.mysql.fi +4 -3
    Add test case for LOAD DATA bug report (was not a bug)

  mysql-test/r/select_safe.result
    1.9 03/08/22 04:07:38 monty@narttu.mysql.fi +2 -2
    Make test repeatable

  mysql-test/r/query_cache_merge.result
    1.0 03/08/22 04:07:38 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/r/query_cache_merge.result

  mysql-test/r/query_cache.result
    1.25 03/08/22 04:07:38 monty@narttu.mysql.fi +1 -19
    Move test with many tables to separate test

  mysql-test/r/loaddata.result
    1.3 03/08/22 04:07:38 monty@narttu.mysql.fi +10 -0
    Add test case for LOAD DATA bug report (was not a bug)

  mysql-test/r/check_var_limit.require
    1.0 03/08/22 04:07:38 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/r/check_var_limit.require

  mysql-test/mysql-test-run.sh
    1.175 03/08/22 04:07:38 monty@narttu.mysql.fi +7 -1
    Set open-files-limit to 1024

  mysql-test/include/check_var_limit.inc
    1.0 03/08/22 04:07:38 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/include/check_var_limit.inc

  libmysql/libmysql.c
    1.129 03/08/22 04:07:38 monty@narttu.mysql.fi +7 -0
    Reset some variables to make ensure that we can call mysql_server_init()/mysql_server_end() many times

  libmysql/errmsg.c
    1.16 03/08/22 04:07:38 monty@narttu.mysql.fi +18 -18
    Extend socket name to 100 characters in error messages

  client/mysqltest.c
    1.102.1.1 03/08/22 04:07:38 monty@narttu.mysql.fi +24 -5
    Fix that LET can be used with queries that return multiple columns

ChangeSet
  1.1511.1.71 03/08/21 21:39:22 serg@serg.mylan +4 -0
  merged

  sql/sql_show.cc
    1.111 03/08/21 21:39:20 serg@serg.mylan +1 -1
    merged

  sql/item.h
    1.40 03/08/21 21:39:20 serg@serg.mylan +0 -0
    merged

  sql/item.cc
    1.31 03/08/21 21:23:49 serg@serg.mylan +0 -0
    Auto merged

  extra/resolveip.c
    1.19 03/08/21 21:23:49 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.676.1.732 03/08/21 21:14:02 serg@serg.mylan +2 -0
  Bug #1064: SHOW CREATE TABLE: avoid allocations for simple tables, old client compatibility

  sql/sql_show.cc
    1.47.1.24 03/08/21 21:14:01 serg@serg.mylan +4 -2
    avoid allocations for simple tables
    old client compatibility

  sql/item.h
    1.11.1.6 03/08/21 21:14:01 serg@serg.mylan +1 -0
    fixups

ChangeSet
  1.676.308.1 03/08/21 20:21:07 serg@serg.mylan +2 -0
  fix for SHOW CREATE TABLE to report corerct second field's length

  sql/sql_show.cc
    1.47.1.23 03/08/21 20:21:06 serg@serg.mylan +34 -36
    fix for SHOW CREATE TABLE to report corerct second field's length

  sql/item.cc
    1.12.1.4 03/08/21 20:21:06 serg@serg.mylan +5 -0
    fix for SHOW CREATE TABLE to report corerct second field's length

ChangeSet
  1.1511.1.69 03/08/21 20:13:26 serg@serg.mylan +1 -0
  crash BUG#1116 fixed

  strings/ctype-tis620.c
    1.22 03/08/21 20:13:15 serg@serg.mylan +7 -7
    crash BUG#1116 fixed

ChangeSet
  1.1511.40.7 03/08/21 12:15:22 lenz@mysql.com +1 -0
   - added missing option "--without-embedded" to be able to compile without
     the embedded server (it was missing in the previous push)

  Build-tools/Do-compile
    1.78 03/08/21 12:15:20 lenz@mysql.com +1 -0
     - added missing option "--without-embedded" to be able to compile without
       the embedded server (it was missing in the previous push)

ChangeSet
  1.1511.1.67 03/08/21 10:44:17 serg@serg.mylan +1 -0
  sorted

  sql/set_var.cc
    1.38 03/08/21 10:44:14 serg@serg.mylan +4 -4
    sorted

ChangeSet
  1.1511.40.6 03/08/21 10:24:37 guilhem@mysql.com +1 -0
  Yesterday I removed process_io_create_file; I shouldn't have.
  Let's say the lack of comments did not help me ;)
  Copying it back again and adding comments; now 3.23->4.0
  replication of LOAD DATA INFILE works again.

  sql/slave.cc
    1.246 03/08/21 10:24:33 guilhem@mysql.com +121 -0
    Enabling again process_io_create_file

ChangeSet
  1.1511.40.5 03/08/21 00:23:39 guilhem@mysql.com +4 -0
  Result updates after Dmitri's and my changes to logging with --log-slave-updates.
  Since my changes, rpl_log.test, whose result file depends on file_id, became
  non-repeatable, i.e. file_id on slave in SHOW BINLOG EVENTS
  changed depending on the order of tests (sometimes 1, sometimes 5).
  Which is logical: as now the slave does not copy Create_file and Exec_load from
  the relay log (i.e from the master's binlog) to the slave's binlog, but
  instead lets mysql_load() do the logging, the file_id is now the one whic
  was used on the slave. Before it was the one which was used on the master,
  and by chance the master was always restarted for this test because there's
  a -master.opt file, so file_id on the master is always 1. But now file_id is
  from the slave so we need to restart the slave. That's why I add an (empty)
  -slave.opt file. I could have used 'server_stop/start slave', but this
  would have required the manager, so most of the time mysql-test-run silently
  skip the test which makes it useless. And I want this test to be run !

  mysql-test/t/rpl_log-slave.opt
    1.1 03/08/21 00:23:34 guilhem@mysql.com +1 -0

  mysql-test/t/rpl_log.test
    1.14 03/08/21 00:23:34 guilhem@mysql.com +10 -0
    A comment

  mysql-test/t/rpl_log-slave.opt
    1.0 03/08/21 00:23:34 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/rpl_log-slave.opt

  mysql-test/r/rpl_log.result
    1.35 03/08/21 00:23:33 guilhem@mysql.com +1 -1
    Orig_log_pos is like Pos now, because Exec_load events are not directly copied
    by the slave from the relay log to the slave's binary log (these events
    are written by mysql_load() now).

  mysql-test/r/rpl_loaddata.result
    1.8 03/08/21 00:23:33 guilhem@mysql.com +1 -1
    Orig_log_pos is like Pos since Dmitri's good change for BUG#1086

ChangeSet
  1.1511.40.4 03/08/20 23:25:58 guilhem@mysql.com +3 -0
  Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
  into mysql.com:/home/mysql_src/mysql-4.0

  sql/slave.cc
    1.245 03/08/20 23:25:52 guilhem@mysql.com +0 -0
    Auto merged

  sql/log_event.cc
    1.126 03/08/20 23:25:51 guilhem@mysql.com +0 -0
    Auto merged

  sql/log.cc
    1.135 03/08/20 23:25:50 guilhem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1511.42.1 03/08/20 23:24:45 guilhem@mysql.com +14 -0
  First commit for fixing BUG#1100
  "LOAD DATA INFILE is badly filtered by binlog-*-db rules".
  There will probably be a second final one to merge Dmitri's changes
  to rpl_log.result and mine.
  2 new tests:
  rpl_loaddata_rule_m : test of logging of LOAD DATA INFILE when the master has binlog-*-db rules,
  rpl_loaddata_rule_s : test of logging of LOAD DATA INFILE when the slave has binlog-*-db rules and --log-slave-updates.

  mysql-test/t/rpl_loaddata_rule_s.test
    1.1 03/08/20 23:24:38 guilhem@mysql.com +20 -0

  mysql-test/t/rpl_loaddata_rule_s.test
    1.0 03/08/20 23:24:38 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/rpl_loaddata_rule_s.test

  mysql-test/t/rpl_loaddata_rule_s-slave.opt
    1.1 03/08/20 23:24:37 guilhem@mysql.com +1 -0

  mysql-test/t/rpl_loaddata_rule_m.test
    1.1 03/08/20 23:24:37 guilhem@mysql.com +18 -0

  mysql-test/t/rpl_loaddata_rule_m-master.opt
    1.1 03/08/20 23:24:37 guilhem@mysql.com +1 -0

  mysql-test/t/rpl_loaddata_rule_s-slave.opt
    1.0 03/08/20 23:24:37 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/rpl_loaddata_rule_s-slave.opt

  mysql-test/t/rpl_loaddata_rule_m.test
    1.0 03/08/20 23:24:37 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/rpl_loaddata_rule_m.test

  mysql-test/t/rpl_loaddata_rule_m-master.opt
    1.0 03/08/20 23:24:37 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/rpl_loaddata_rule_m-master.opt

  mysql-test/r/rpl_loaddata_rule_s.result
    1.1 03/08/20 23:24:36 guilhem@mysql.com +14 -0

  mysql-test/r/rpl_loaddata_rule_m.result
    1.1 03/08/20 23:24:36 guilhem@mysql.com +14 -0

  sql/sql_repl.cc
    1.109 03/08/20 23:24:36 guilhem@mysql.com +1 -1
    Pass the db to events so that they can be well filtered.

  sql/sql_load.cc
    1.49 03/08/20 23:24:36 guilhem@mysql.com +2 -2
    Pass the db to events, so that they can be well filtered.

  mysql-test/r/rpl_loaddata_rule_s.result
    1.0 03/08/20 23:24:36 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/r/rpl_loaddata_rule_s.result

  mysql-test/r/rpl_loaddata_rule_m.result
    1.0 03/08/20 23:24:36 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/r/rpl_loaddata_rule_m.result

  sql/slave.cc
    1.243.1.1 03/08/20 23:24:35 guilhem@mysql.com +0 -109
    Removed useless code. Why was it useless:
    - CREATE_FILE_EVENT is not defined in 3.23. It appeared in 4.0.
    - in queue_old_event(), which is called only if the master is 3.23, we had a
    case CREATE_FILE_EVENT:
    so this case can be removed.
    - this case was the only caller of process_io_create_file() so this function
    can be removed.

  sql/log_event.h
    1.82 03/08/20 23:24:35 guilhem@mysql.com +21 -5
    New member 'db' for Append_block et al. events.

  sql/log_event.cc
    1.124.1.1 03/08/20 23:24:35 guilhem@mysql.com +34 -35
    * Append_block, Exec_load and Delete_file now have a member 'db' like Create_file.
    This member is filled by mysql_load(). It is used for filtering by binlog-*-db rules,
    that's all. It's not written to the binlog, and so can't be read from the binlog.
    In other words, that's temporary info which is stored in the event and lost when
    it is written and deleted.
    * Better error messages in Append_block et al. events.
    * The slave now logs (log-slave-updates) the Create_file et al. events in mysql_load()
    (they are not directly copied from the events in the relay log, because this
    prevented filtering by binlog-*-db rules). Before, mysql_load() in the slave
    did no logging, now it does the logging, as in any regular thread.

  sql/log.cc
    1.133.1.1 03/08/20 23:24:35 guilhem@mysql.com +1 -0
    debug info

  mysql-test/t/rpl_loaddata.test
    1.7 03/08/20 23:24:34 guilhem@mysql.com +17 -0
    Test that logging of LOAD DATA is done on the slave

  mysql-test/r/rpl_loaddata.result
    1.7 03/08/20 23:24:34 guilhem@mysql.com +4 -0
    Test that logging of LOAD DATA INFILE is done on the slave

ChangeSet
  1.1521 03/08/20 20:16:37 Sinisa@sinisa.nasamreza.org +1 -0
  sql_union.cc:
    Merge fix

  sql/sql_union.cc
    1.46 03/08/20 20:16:16 Sinisa@sinisa.nasamreza.org +35 -17
    Merge fix

ChangeSet
  1.1511.41.1 03/08/20 17:16:07 monty@narttu.mysql.fi +1 -0
  Fixed problem with undefined assert symbol

  include/m_string.h
    1.19 03/08/20 17:16:05 monty@narttu.mysql.fi +1 -3
    Fixed problem with undefined assert symbol

ChangeSet
  1.1511.40.1 03/08/20 16:25:44 monty@narttu.mysql.fi +20 -0
  Fixed some varnings from valgrind
  Set min value of max_allowed_packet to 1024
  Fixed problem with UNION's without braces and SQL_CALC_FOUND_ROWS, LIMIT #,#
  and ORDER BY...LIMIT

  sql/sql_union.cc
    1.44.1.1 03/08/20 16:25:42 monty@narttu.mysql.fi +52 -13
    Fixed problem with UNION's without braces and
    - SQL_CALC_FOUND_ROWS
    - LIMIT #,#
    - ORDER BY ... LIMIT

  sql/sql_select.cc
    1.251 03/08/20 16:25:42 monty@narttu.mysql.fi +1 -1
    Fixed prototype for update_field() (argument was alwys 0)

  sql/net_serv.cc
    1.59 03/08/20 16:25:42 monty@narttu.mysql.fi +16 -11
    Indentation changes + trivial optimization

  sql/mysqld.cc
    1.450 03/08/20 16:25:42 monty@narttu.mysql.fi +1 -1
    Set min value of max_allowed_packet to 1024 (to avoid it getting set to 0)

  sql/log.cc
    1.134 03/08/20 16:25:42 monty@narttu.mysql.fi +2 -1
    Indentation fix

  sql/item_uniq.h
    1.8 03/08/20 16:25:42 monty@narttu.mysql.fi +1 -1
    Fixed prototype for update_field() (argument was alwys 0)

  sql/item_sum.h
    1.22 03/08/20 16:25:42 monty@narttu.mysql.fi +16 -16
    Fixed prototype for update_field() (argument was alwys 0)

  sql/item_sum.cc
    1.33 03/08/20 16:25:42 monty@narttu.mysql.fi +27 -40
    Fixed prototype for update_field() (argument was alwys 0)

  sql/item_cmpfunc.cc
    1.54.1.3 03/08/20 16:25:42 monty@narttu.mysql.fi +10 -7
    Safety fix to handle EOM conditions in IN

  sql/ha_innodb.cc
    1.183.1.1 03/08/20 16:25:42 monty@narttu.mysql.fi +0 -1
    Remove wrong include file

  sql/field.cc
    1.76 03/08/20 16:25:42 monty@narttu.mysql.fi +5 -2
    Fix to remove waarning from valgrind

  mysql-test/t/union.test
    1.28.1.1 03/08/20 16:25:42 monty@narttu.mysql.fi +55 -1
    Added testing of UNION with SQL_CALC_FOUND_ROWS

  mysql-test/t/packet.test
    1.2 03/08/20 16:25:42 monty@narttu.mysql.fi +3 -3
    Update results after change to mysqld (min max_allowed_packet length is now 1024)

  mysql-test/r/union.result
    1.24.1.1 03/08/20 16:25:42 monty@narttu.mysql.fi +126 -1
    Added testing of UNION with SQL_CALC_FOUND_ROWS

  mysql-test/r/packet.result
    1.2 03/08/20 16:25:42 monty@narttu.mysql.fi +6 -6
    Update results after change to mysqld (min max_allowed_packet length is now 1024)

  mysql-test/mysql-test-run.sh
    1.174 03/08/20 16:25:42 monty@narttu.mysql.fi +0 -6
    Add options handled by general skip- option

  myisam/mi_write.c
    1.33 03/08/20 16:25:42 monty@narttu.mysql.fi +0 -1
    Indentation fix

  myisam/mi_search.c
    1.35 03/08/20 16:25:42 monty@narttu.mysql.fi +8 -2
    Fix warning from valgrind

  myisam/mi_create.c
    1.31 03/08/20 16:25:42 monty@narttu.mysql.fi +1 -1
    Fixed comment

  include/m_string.h
    1.18 03/08/20 16:25:42 monty@narttu.mysql.fi +12 -0
    Added memcpy_overlap() to avoid warnings when using valgrind on memcpy(A,A,...)

ChangeSet
  1.1520 03/08/20 16:14:01 Sinisa@sinisa.nasamreza.org +3 -0
  sql_union.cc:
    Fix for SQL_CALC_FOUND_ROWS in UNION's

  mysql-test/r/union.result
    1.25 03/08/20 16:13:43 Sinisa@sinisa.nasamreza.org +55 -1

  mysql-test/t/union.test
    1.29 03/08/20 16:13:42 Sinisa@sinisa.nasamreza.org +16 -0

  sql/sql_union.cc
    1.45 03/08/20 16:13:26 Sinisa@sinisa.nasamreza.org +14 -2
    Fix for SQL_CALC_FOUND_ROWS in UNION's

ChangeSet
  1.1519 03/08/20 15:52:43 Sinisa@sinisa.nasamreza.org +2 -0
  func_test.result, func_test.test:
    Test case for the LEAST() bug in LEFT JOIN

  mysql-test/r/func_test.result
    1.12.1.1 03/08/20 15:52:07 Sinisa@sinisa.nasamreza.org +9 -0
    Test case for the LEAST() bug in LEFT JOIN

  mysql-test/t/func_test.test
    1.10.1.1 03/08/20 15:51:36 Sinisa@sinisa.nasamreza.org +7 -0
    Test case for the LEAST() bug in LEFT JOIN

ChangeSet
  1.1518 03/08/20 15:33:21 Sinisa@sinisa.nasamreza.org +5 -0
  item_func.h:
    Fix for a bug with LEAST() in WHERE clause
  ha_innodb.cc:
    Fix for a configure bug
  multi_update.result, multi_update.test:
    Fix for the update with NULL's in the result set
  sql_update.cc:
    Fix for the update with NULL's in the result set
     Fix for the update with NULL's in the result set
     Fix for the update with NULL's in the result set

  sql/item_func.h
    1.60 03/08/20 15:19:40 Sinisa@sinisa.nasamreza.org +1 -0
    Fix for a bug with LEAST() in WHERE clause

  sql/ha_innodb.cc
    1.184 03/08/20 15:19:11 Sinisa@sinisa.nasamreza.org +0 -1
    Fix for a configure bug

  mysql-test/r/multi_update.result
    1.21 03/08/20 15:10:15 Sinisa@sinisa.nasamreza.org +9 -0
    Fix for the update with NULL's in the result set

  mysql-test/t/multi_update.test
    1.23 03/08/20 15:10:04 Sinisa@sinisa.nasamreza.org +7 -0
    Fix for the update with NULL's in the result set

  sql/sql_update.cc
    1.91 03/08/20 15:08:36 Sinisa@sinisa.nasamreza.org +5 -1
    Fix for the update with NULL's in the result set
     Fix for the update with NULL's in the result set
     Fix for the update with NULL's in the result set

ChangeSet
  1.1511.1.66 03/08/20 12:27:06 serg@serg.mylan +1 -0
  comment added

  client/mysqltest.c
    1.103 03/08/20 12:27:04 serg@serg.mylan +7 -0
    comment added

ChangeSet
  1.1511.39.1 03/08/20 03:38:31 dlenev@mysql.com +7 -0
  Fix for BUG#1086. Now we don't preserve event's log_pos through
  log-slave-updates since this causes unexpected values in 
  Exec_master_log_pos in A->B->C replication setup, synchronization
   problems in master_pos_wait()... 
  Still this brokes some functionality in sql/repl_failsafe.cc 
  (but this file is not used now)

  sql/sql_parse.cc
    1.332.1.3 03/08/20 03:38:11 dlenev@mysql.com +1 -0
    Added comment about broken SHOW NEW MASTER

  sql/sql_class.h
    1.156.1.2 03/08/20 03:38:11 dlenev@mysql.com +0 -1
    THD::log_pos is no longer needed

  sql/sql_class.cc
    1.104 03/08/20 03:38:11 dlenev@mysql.com +0 -1
    THD::log_pos is no longer needed

  sql/slave.cc
    1.244 03/08/20 03:38:11 dlenev@mysql.com +0 -1
    Do not propagate our master's log pos to our bin log 

  sql/repl_failsafe.cc
    1.33 03/08/20 03:38:11 dlenev@mysql.com +15 -0
    Added comment about broken SHOW NEW MASTER

  sql/log_event.cc
    1.125 03/08/20 03:38:11 dlenev@mysql.com +2 -3
    Do not propagate our master's log pos to our bin log 

  mysql-test/r/rpl_log.result
    1.34 03/08/20 03:38:11 dlenev@mysql.com +6 -6
    SHOW BINLOG EVENTS for binlog on slave should give the same 
    Orig_log_pos and Pos values 

ChangeSet
  1.1511.38.1 03/08/19 20:53:45 serg@serg.mylan +1 -0
  FT-NL bugfix - ignore words that appear more than in 2mio rows to avoid tree overflow.
  optimization: abort search for common (>50% rows) words earlier.

  myisam/ft_nlq_search.c
    1.19 03/08/19 20:53:42 serg@serg.mylan +8 -31
    FT-NL bugfix - ignore words that appear more than in 2mio rows to avoid tree overflow.
    optimization: abort search for common (>50% rows) words earlier.

ChangeSet
  1.1511.37.1 03/08/19 18:34:44 lenz@mysql.com +1 -0
   - Added a missing directory variable definition to the Bootstrap script.

  Build-tools/Bootstrap
    1.14 03/08/19 18:34:42 lenz@mysql.com +2 -1
     - defined $opt_directory to be the present working directory. No clue how
       this worked before...

ChangeSet
  1.1511.1.63 03/08/19 17:00:36 guilhem@mysql.com +4 -0
  Use my_b_append instead of my_b_write on a SEQ_READ_APPEND cache, when we write
  the first 4 bytes of the relay log. Indeed comments in mysys/mf_iocache.c 
  say we must always use my_b_append for such a cache.
  This *could* avoid a very rare assertion failure which is: 
  030524 19:32:38  Slave SQL thread initialized, starting replication in log 'FIRST' at position 0, relay log '/
  users/gbichot/4.1.1/mysql-test/var/log/slave-relay-bin.000001' position: 4
  030524 19:32:38  next log '/users/gbichot/4.1.1/mysql-test/var/log/slave-relay-bin.000002' is currently active
  mysqld: mf_iocache.c:701: _my_b_seq_read: Assertion `pos_in_file == info->end_of_file' failed.
  and which seemed to happen always when the SQL thread and/or the I/O thread
  were at position 4 in a relay log.

  sql/log_event.cc
    1.124 03/08/19 17:00:31 guilhem@mysql.com +1 -15
    moved to mysys/mf_iocache.c for wider use.
    A typo.

  sql/log.cc
    1.133 03/08/19 17:00:31 guilhem@mysql.com +1 -1
    my_b_write should not be used on a SEQ_READ_APPEND cache, one should use my_b_append
    (otherwise there could be some locking problems).

  mysys/mf_iocache.c
    1.37 03/08/19 17:00:30 guilhem@mysql.com +14 -0
    moving a function from log_event.cc so that it can be widely used

  include/my_sys.h
    1.100 03/08/19 17:00:30 guilhem@mysql.com +2 -0
    moving a function from log_event.cc so that it can be widely used

ChangeSet
  1.1511.1.62 03/08/19 15:46:47 guilhem@mysql.com +3 -0
  Fix for BUG#1096 which is:
  "mysqlbinlog does not comment the original LOAD DATA INFILE if it has a "use xx""

  sql/log_event.h
    1.81 03/08/19 15:46:43 guilhem@mysql.com +1 -0
    prototype

  sql/log_event.cc
    1.123 03/08/19 15:46:42 guilhem@mysql.com +16 -6
    in mysqlbinlog we want to have a leading '#' before LOAD DATA INFILE when we
    print a Create_file event.
    This was not done properly when the query had *2* lines: only the "use db" got
    commented.
    To fix this I had to add an argument to Load_log_event::print, it could not be
    handled in Create_file_log_event::print alone.

  client/mysqlbinlog.cc
    1.80 03/08/19 15:46:41 guilhem@mysql.com +7 -1
    a comment

ChangeSet
  1.1511.36.1 03/08/19 15:12:44 guilhem@mysql.com +1 -0
  Fixes for BUG#1091,1092,1093. Synopsis of these bugs:
  mysqlbinlog segfaults if --position is just before Exec_load event
  mysqlbinlog prints uncommented warnings if --database and compiled with debug
  mysqlbinlog --database does not filter LOAD DATA INFILE

  client/mysqlbinlog.cc
    1.79 03/08/19 15:12:39 guilhem@mysql.com +49 -31
    * Don't stop in Append_block when there is no Create_file. Just print a warning.
    * Test LOAD DATA (Create_file) against --database.
    * Don't print "no skip" when you don't skip an event when using --database (it
    causes syntax errors in 'mysql').
    * Print a warning in Exec_load if there is no Create_file.

ChangeSet
  1.1511.35.1 03/08/19 16:03:18 monty@mashka.mysql.fi +1 -0
  Fix test case

  mysql-test/t/lock_tables_lost_commit-master.opt
    1.2 03/08/19 16:03:15 monty@mashka.mysql.fi +1 -1
    Fix test case

ChangeSet
  1.1511.1.59 03/08/19 13:57:58 lenz@mysql.com +2 -0
   - Do-pkg can now create a separate package including a MySQL Startup Item
     for Mac OS X and add it to the installation Disk Image.

  support-files/MacOSX/StartupItem.Info.plist
    1.2 03/08/19 13:57:55 lenz@mysql.com +1 -5
     - removed IFPkgFlagOverwritePermissions and IFPkgFlagUseUserMask

  Build-tools/Do-pkg
    1.5 03/08/19 13:57:55 lenz@mysql.com +95 -32
     - added code to build the StartupItem PKG along with the MySQL PKG and
       add it to the resulting Disk Image (can be skipped with --skip-si)
     - lots of cleanups (use more builtin Perl functions instead of 
       subprocesses, enable a full dry run without errors)

ChangeSet
  1.1511.1.58 03/08/19 13:49:53 lenz@mysql.com +2 -0
   - Optimized and cleaned up the Do-rpm and Bootstrap Perl scripts
   - Enhanced Do-rpm to support building RPMs with different compilers
     and options

  Build-tools/Do-rpm
    1.25 03/08/19 13:49:51 lenz@mysql.com +99 -39
     - added options to handle different compilers and compile flags (e.g. when
       compiling on IA64 using the Intel ecc compiler)
     - code cleanups (use more builtin Perl functions instead of forking
       subrocesses)
     - don't try to probe various distribution-specific RPM options - query rpm
       directly instead
     - Pass the MySQL version as an argument, not an option (as it's not
       optional anyway)

  Build-tools/Bootstrap
    1.13 03/08/19 13:49:51 lenz@mysql.com +5 -6
     - small optimization (use builtin Perl cwd() function instead of running
       "pwd" twice)

ChangeSet
  1.676.307.1 03/08/18 20:01:38 guilhem@mysql.com +1 -0
  Fix for 64-bit CPUs (u_long is 64 bit there, but in_addr_t is always uint32).
  That's to make resolveip work on our FreeBSD-5.0/Sparc64 build host.

  extra/resolveip.c
    1.4.1.6 03/08/18 20:01:35 guilhem@mysql.com +1 -1
    Fix for 64-bit CPUs (u_long is 64 bit there, but in_addr_t is always uint32).

ChangeSet
  1.1511.33.5 03/08/17 14:37:26 monty@narttu.mysql.fi +1 -0
  fixed typo in last push

  sql/sql_show.cc
    1.110 03/08/17 14:37:25 monty@narttu.mysql.fi +2 -2
    fixed typo in last push

ChangeSet
  1.1511.33.4 03/08/17 14:10:45 monty@narttu.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.0
  into narttu.mysql.fi:/my/mysql-4.0

  sql/sql_parse.cc
    1.332.1.2 03/08/17 14:10:43 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1511.34.1 03/08/17 14:10:15 monty@narttu.mysql.fi +6 -0
  Fix mutex handling in SHOW_VARIABLES (key_buffer_size was not properly protected)
  Changed some non fatal myisamchk error messages to warnings

  sql/sql_show.cc
    1.109 03/08/17 14:10:13 monty@narttu.mysql.fi +5 -7
    Fix mutex handling in SHOW_VARIABLES

  sql/sql_parse.cc
    1.332.2.1 03/08/17 14:10:13 monty@narttu.mysql.fi +3 -2
    Fix mutex handling in SHOW_VARIABLES

  sql/set_var.cc
    1.37 03/08/17 14:10:13 monty@narttu.mysql.fi +20 -2
    Add mutex around longlong variable usage

  sql/mysql_priv.h
    1.201.1.1 03/08/17 14:10:13 monty@narttu.mysql.fi +2 -1
    Indentation update

  sql/handler.cc
    1.105 03/08/17 14:10:13 monty@narttu.mysql.fi +14 -3
    Add mutex around keybuff_size usage

  myisam/myisamchk.c
    1.106 03/08/17 14:10:13 monty@narttu.mysql.fi +5 -4
    Change error -> warning

ChangeSet
  1.1511.33.3 03/08/16 17:03:48 jani@rhols221.adsl.netsonic.fi +1 -0
  Fixed a limitation bug in mysqlimport. sql_statement was designed to
  contain max 1280 characters, but sometimes in rare cases when --columns
  was used, more than 1280 characters was needed. This is case when a lot
  of columns was specified using this option. Raised the max value to 8448,
  which should be enough.

  client/mysqlimport.c
    1.30 03/08/16 17:03:46 jani@rhols221.adsl.netsonic.fi +1 -1
    Fixed a limitation bug in mysqlimport. sql_statement was designed to
    contain max 1280 characters, but sometimes in rare cases when --columns
    was used, more than 1280 characters was needed. This is case when a lot
    of columns was specified using this option. Raised the max value to 8448,
    which should be enough.

ChangeSet
  1.1511.33.2 03/08/15 14:55:05 lenz@mysql.com +6 -0
   - Added some files to support-files/MacOSX to enable building the Mac OS X
     startup item: MySQL (the startup script), StartupItem.Description.plist,
     StartupItem.Info.plist (PKGMaker control files), StartupItem.postinstall
     (post-installation script for the Startup Item package)
   - modified support-files/MacOSX/Makefile.am to include the newly added files
     in the source distribution

  support-files/MacOSX/Makefile.am
    1.4 03/08/15 14:55:03 lenz@mysql.com +5 -1
    - added the Mac OS X StartupItem files to the source distribution

  BitKeeper/etc/ignore
    1.148 03/08/15 14:55:03 lenz@mysql.com +1 -0
    Added scripts/make_win_src_distribution to the ignore list

  support-files/MacOSX/StartupItem.postinstall
    1.1 03/08/15 14:15:16 lenz@mysql.com +36 -0

  support-files/MacOSX/StartupItem.Info.plist
    1.1 03/08/15 14:15:16 lenz@mysql.com +42 -0

  support-files/MacOSX/StartupItem.Description.plist
    1.1 03/08/15 14:15:16 lenz@mysql.com +15 -0

  support-files/MacOSX/StartupItem.postinstall
    1.0 03/08/15 14:15:16 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.0-build/support-files/MacOSX/StartupItem.postinstall

  support-files/MacOSX/StartupItem.Info.plist
    1.0 03/08/15 14:15:16 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.0-build/support-files/MacOSX/StartupItem.Info.plist

  support-files/MacOSX/StartupItem.Description.plist
    1.0 03/08/15 14:15:16 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.0-build/support-files/MacOSX/StartupItem.Description.plist

  support-files/MacOSX/MySQL
    1.1 03/08/15 14:15:00 lenz@mysql.com +46 -0

  support-files/MacOSX/MySQL
    1.0 03/08/15 14:15:00 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.0-build/support-files/MacOSX/MySQL

ChangeSet
  1.1511.32.3 03/08/15 09:54:19 monty@mashka.mysql.fi +7 -0
  Cleanups to recent patches
  Fix packet error when using wrong GRANT command

  sql/sql_select.cc
    1.250 03/08/15 09:54:16 monty@mashka.mysql.fi +8 -2
    Cleanups
    Added not critical out-of-memory check

  sql/sql_acl.cc
    1.113 03/08/15 09:54:16 monty@mashka.mysql.fi +1 -1
    Fix packet error when using wrong GRANT command

  sql/opt_range.cc
    1.82 03/08/15 09:54:16 monty@mashka.mysql.fi +2 -1
    Fix to recent BETWEEN patch

  mysys/my_chsize.c
    1.12 03/08/15 09:54:16 monty@mashka.mysql.fi +56 -71
    Cleanup

  mysql-test/t/grant.test
    1.8 03/08/15 09:54:16 monty@mashka.mysql.fi +5 -0
    Extra test to catch wrong packet bug

  mysql-test/r/grant.result
    1.8 03/08/15 09:54:16 monty@mashka.mysql.fi +3 -0
    Extra test to catch wrong packet bug

  include/config-win.h
    1.31 03/08/15 09:54:16 monty@mashka.mysql.fi +1 -0
    Changed back to test for HAVE_SETFILEPOINTER instead of operating system

ChangeSet
  1.1511.1.55 03/08/13 19:32:34 gweir@build.mysql.com +2 -0
  make_win_src_distribution.sh:
    Add --zip option for finer grain control over what package formats are created
  Bootstrap:
    Create both Windows source packages

  scripts/make_win_src_distribution.sh
    1.7 03/08/13 19:31:07 gweir@build.mysql.com +52 -27
    Add --zip option for finer grain control over what package formats are created

  Build-tools/Bootstrap
    1.12 03/08/13 19:30:43 gweir@build.mysql.com +1 -1
    Create both Windows source packages

ChangeSet
  1.1511.1.54 03/08/13 17:00:22 gweir@build.mysql.com +1 -0
  make_win_src_distribution.sh:
    'tools' contains intermediate files

  scripts/make_win_src_distribution.sh
    1.6 03/08/13 16:59:46 gweir@build.mysql.com +2 -2
    'tools' contains intermediate files

ChangeSet
  1.1511.1.53 03/08/13 16:45:28 gweir@build.mysql.com +1 -0
  make_win_src_distribution.sh:
    Adding *.txt here didn't work well-- infolist.txt is in a path containing spaces

  scripts/make_win_src_distribution.sh
    1.5 03/08/13 16:44:39 gweir@build.mysql.com +1 -1
    Adding *.txt here didn't work well-- infolist.txt is in a path containing spaces

ChangeSet
  1.1511.1.52 03/08/13 16:36:01 gweir@build.mysql.com +1 -0
  make_win_src_distribution.sh:
    Clean up script, add needed modifications to generate a complete 4.0 Windows source package

  scripts/make_win_src_distribution.sh
    1.4 03/08/13 16:32:55 gweir@build.mysql.com +46 -36
    Clean up script, add needed modifications to generate a complete 4.0 Windows source package

ChangeSet
  1.1511.32.2 03/08/13 13:26:52 monty@mashka.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.0
  into mashka.mysql.fi:/home/my/mysql-4.0

  sql/sql_select.cc
    1.249 03/08/13 13:26:47 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1511.32.1 03/08/13 07:24:35 lenz@mysql.com +1 -0
   - we are already in $target_dir, no need to prepend it to the build
     command.

  Build-tools/Bootstrap
    1.11 03/08/13 07:24:33 lenz@mysql.com +0 -1
     - we are already in $target_dir, no need to prepend it to the build
       command.

ChangeSet
  1.1511.31.6 03/08/13 07:12:08 lenz@mysql.com +1 -0
  Fixed typo in the Boostrap strip

  Build-tools/Bootstrap
    1.9.1.1 03/08/13 07:12:06 lenz@mysql.com +1 -1
     - fixed typo

ChangeSet
  1.1511.1.50 03/08/13 04:52:03 gweir@build.mysql.com +1 -0
  make_win_src_distribution.sh:
    Copy some previously missed files

  scripts/make_win_src_distribution.sh
    1.3 03/08/13 04:51:09 gweir@build.mysql.com +17 -2
    Copy some previously missed files

ChangeSet
  1.1511.1.49 03/08/13 02:13:45 gweir@build.mysql.com +2 -0
  Bootstrap:
    Corrections to Bootstrap for --win-dist
  

  BitKeeper/etc/logging_ok
    1.284 03/08/13 02:13:45 gweir@build.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  Build-tools/Bootstrap
    1.10 03/08/13 02:10:50 gweir@build.mysql.com +1 -1
    Corrections to for --win-dist

ChangeSet
  1.1511.1.47 03/08/13 03:22:34 wax@mysql.com +1 -0
  nothing interesting

  mysys/my_chsize.c
    1.11 03/08/13 03:22:31 wax@mysql.com +1 -1
    nothing interesting

ChangeSet
  1.1511.31.5 03/08/12 23:21:21 lenz@mysql.com +3 -0
   - enabled embedded server in the binary distributions by default
     (Do-compile)
   - added mysql.info to the binary distribution files (BUG#1019)
   - heavily reworked the Do-rpm script to be more in line with Do-pkg
   - create a "docs" subdirectory in the binary distribution and moved the
     manual, ChangeLog and mysql.info file into it to unclutter the top
     directory

  scripts/make_binary_distribution.sh
    1.53 03/08/12 23:21:19 lenz@mysql.com +15 -4
     - move some docs into a subdirectory "docs" to not clutter the top 
       directory with too many files.
     - added mysql.info info file to the docs dir (BUG#1019)
       

  Build-tools/Do-rpm
    1.24 03/08/12 23:21:19 lenz@mysql.com +155 -247
     - replaced the original Shell script with a Perl script, similar to Do-pkg.
       Some more work remains to be done (copying the resulting packages,
       enable using different compile flags and compilers).

  Build-tools/Do-compile
    1.77 03/08/12 23:21:19 lenz@mysql.com +5 -1
     - enable compiling with the embedded server by default (as requested by
       BrianA) - disable it with the "--disable-embedded" compile option.

ChangeSet
  1.1511.31.4 03/08/12 19:22:30 serg@serg.mylan +1 -0
  Merge serg.mylan:/usr/home/serg/Abk/mysql
  into serg.mylan:/usr/home/serg/Abk/mysql-4.0

  isam/_search.c
    1.9 03/08/12 19:22:27 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.676.1.729 03/08/12 19:21:38 serg@serg.mylan +1 -0
  isam SEARCH_LAST bug fixed

  isam/_search.c
    1.7.1.1 03/08/12 19:21:36 serg@serg.mylan +1 -1
    isam SEARCH_LAST bug fixed

ChangeSet
  1.1511.31.3 03/08/12 15:56:55 serg@serg.mylan +1 -0
  myisamchk - don't mark table as crashed if --sort-records=<key> failed because of unappropriate key or read-only table

  myisam/myisamchk.c
    1.105 03/08/12 15:56:53 serg@serg.mylan +3 -3
    myisamchk - don't mark table as crashed if --sort-records=<key> failed because of unappropriate key or read-only table

ChangeSet
  1.1511.27.5 03/08/12 15:30:20 serg@serg.mylan +1 -0
  MyISAM was erroneously using max_ref_length when estimating min_pack_length.

  myisam/mi_packrec.c
    1.20 03/08/12 15:30:18 serg@serg.mylan +3 -1
    MyISAM was erroneously using max_ref_length when estimating min_pack_length.

ChangeSet
  1.1511.27.4 03/08/12 15:28:36 serg@serg.mylan +2 -0
  snprintf compatibility fix

  sql/field.cc
    1.75 03/08/12 15:28:33 serg@serg.mylan +1 -1
    snprintf compatibility fix

  myisam/ft_dump.c
    1.17 03/08/12 15:28:33 serg@serg.mylan +4 -0
    snprintf compatibility fix

ChangeSet
  1.1511.31.1 03/08/12 13:49:11 lenz@mysql.com +1 -0
   - added option "--pull" to be able to update the BK repositories before
     starting the bootstrap

  Build-tools/Bootstrap
    1.9 03/08/12 13:49:09 lenz@mysql.com +21 -1
     - added option "--pull" to be able to update the BK repositories before
       starting the bootstrap

ChangeSet
  1.1511.29.1 03/08/10 05:14:16 monty@mashka.mysql.fi +6 -0
  Remove wrong bug fix when calling create_sort_index.
  Fix possible replication bug with LOAD DATA ... IGNORE LINES #

  sql/sql_yacc.yy
    1.217.1.1 03/08/10 05:14:13 monty@mashka.mysql.fi +1 -1
    Indentation cleanup

  sql/sql_select.cc
    1.247.1.1 03/08/10 05:14:13 monty@mashka.mysql.fi +1 -4
    Remove wrong bug fix (all tests passes)

  sql/sql_parse.cc
    1.332.1.1 03/08/10 05:14:13 monty@mashka.mysql.fi +2 -2
    Indentation fix

  sql/log_event.cc
    1.122 03/08/10 05:14:13 monty@mashka.mysql.fi +16 -8
    Fix replication bug with LOAD DATA ... IGNORE LINES #
    (Note that the code that is probably not executed in 4.0)

  mysql-test/t/rpl_log.test
    1.13 03/08/10 05:14:13 monty@mashka.mysql.fi +4 -3
    Test of load data ... ignore # lines

  mysql-test/r/rpl_log.result
    1.33 03/08/10 05:14:13 monty@mashka.mysql.fi +4 -1
    Test of load data ... ignore # lines

ChangeSet
  1.1511.1.45 03/08/10 05:40:16 wax@mysql.com +1 -0
  Merge mysql.com:/home/wax/mysql/mysql-4.0
  into mysql.com:/home/wax/mysql/mysql-4.0chsize

  BitKeeper/etc/logging_ok
    1.283 03/08/10 05:40:09 wax@mysql.com +0 -0
    auto-union

ChangeSet
  1.1511.1.44 03/08/10 05:38:08 wax@mysql.com +2 -0
  BUG
  replace HAVE_SETFILEPOINTER with __WIN__
  

  mysys/my_chsize.c
    1.10 03/08/10 05:36:14 wax@mysql.com +18 -18
    replace HAVE_SETFILEPOINTER with __WIN__
    move __WIN__ section to up

  include/config-win.h
    1.30 03/08/10 05:36:14 wax@mysql.com +0 -1
    remove HAVE_SETFILEPOINTER

ChangeSet
  1.1511.27.3 03/08/09 01:20:02 serg@serg.mylan +2 -0
  BETWEEN bug fix: non-const expressions on both ends

  sql/sql_select.cc
    1.248 03/08/09 01:20:00 serg@serg.mylan +41 -28
    BETWEEN bug fix: non-const expressions on both ends

  mysql-test/r/range.result
    1.10 03/08/09 01:20:00 serg@serg.mylan +1 -1
    BETWEEN bug fix: non-const expressions on both ends

ChangeSet
  1.1511.28.1 03/08/08 23:27:22 bell@sanja.is.com.ua +3 -0
  rewritten test using loop (BUG#930)
  removed unused field (now it is in variables)

  sql/sql_class.h
    1.156.1.1 03/08/08 23:27:20 bell@sanja.is.com.ua +0 -1
    removed unused field (now it is in variables)

  mysql-test/t/query_cache.test
    1.25 03/08/08 23:27:20 bell@sanja.is.com.ua +12 -518
    rewritten test using loop

  mysql-test/r/query_cache.result
    1.24 03/08/08 23:27:20 bell@sanja.is.com.ua +2 -517
    rewritten test using loop

ChangeSet
  1.1511.27.2 03/08/08 19:13:27 serg@serg.mylan +2 -0
  between range optimization bug (between with const on one end only)

  sql/opt_range.cc
    1.81 03/08/08 19:13:24 serg@serg.mylan +8 -5
    between range optimization bug (between with const on one end only)

  mysql-test/r/range.result
    1.9 03/08/08 19:13:24 serg@serg.mylan +1 -1
    between range optimization bug (between with const on one end only)

ChangeSet
  1.1511.27.1 03/08/08 18:49:22 serg@serg.mylan +2 -0
  between tests added
  bugfixes will follow

  mysql-test/t/range.test
    1.6 03/08/08 18:49:20 serg@serg.mylan +17 -0
    between tests added
    bugfixes will follow

  mysql-test/r/range.result
    1.8 03/08/08 18:49:20 serg@serg.mylan +28 -0
    between tests added
    bugfixes will follow

ChangeSet
  1.1511.18.16 03/08/07 20:18:51 monty@mashka.mysql.fi +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.0
  into mashka.mysql.fi:/home/my/mysql-4.0

  sql/sql_acl.cc
    1.112 03/08/07 20:18:42 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/slave.h
    1.63 03/08/07 20:18:42 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/slave.cc
    1.243 03/08/07 20:18:41 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1511.26.1 03/08/07 20:16:37 monty@mashka.mysql.fi +11 -0
  Review of changesets since last pull.
  (Mostly code cleanups)

  vio/viosslfactories.c
    1.14 03/08/07 20:16:29 monty@mashka.mysql.fi +1 -1
    Changed order of include files to remove compilation warning

  sql/sql_acl.cc
    1.110.1.1 03/08/07 20:16:29 monty@mashka.mysql.fi +4 -7
    Simple optimization

  sql/slave.h
    1.61.1.1 03/08/07 20:16:29 monty@mashka.mysql.fi +2 -2
    Changed protypes to use const char *

  sql/slave.cc
    1.241.1.1 03/08/07 20:16:28 monty@mashka.mysql.fi +20 -18
    Simple optimization and cleanup.
    Changed rewrite_db() and print_slave_db_safe() to use const char* to avoid casting of arguments when calling functions.
    Cleanup of some error messages.

  sql/mysqld.cc
    1.449 03/08/07 20:16:28 monty@mashka.mysql.fi +42 -22
    Add proper quoting of service arguments (don't use fn_format)

  sql/mini_client.cc
    1.54 03/08/07 20:16:28 monty@mashka.mysql.fi +1 -1
    Changed order of include files to remove compilation warning

  sql/log_event.cc
    1.121 03/08/07 20:16:27 monty@mashka.mysql.fi +40 -39
    Removed some unnecessary casts (by changing functions to use const char *)
    Cleaned up some error messages to make them shorter and (hopefully) more readable.
    Fixed wrong format strings
    Restored 'thd->options' on error.

  mysys/mf_format.c
    1.18 03/08/07 20:16:27 monty@mashka.mysql.fi +1 -9
    Remove QUOTE handling from fn_format()
    (fn_format() should not have anything to do with quoting things)

  mysql-test/t/rpl_insert_id.test
    1.5 03/08/07 20:16:27 monty@mashka.mysql.fi +1 -0
    Add test if server supports innodb

  myisam/mi_check.c
    1.121 03/08/07 20:16:27 monty@mashka.mysql.fi +2 -0
    Indentation change

  include/my_sys.h
    1.99 03/08/07 20:16:26 monty@mashka.mysql.fi +0 -1
    Removed not used define

ChangeSet
  1.1511.18.15 03/08/07 18:54:59 lenz@mysql.com +3 -0
   - some fixed for make_win_src_distribution to work properly

  scripts/make_win_src_distribution.sh
    1.2 03/08/07 18:54:57 lenz@mysql.com +17 -19
     - merge fixes (looks like CRLF problems)

  scripts/Makefile.am
    1.26 03/08/07 18:54:57 lenz@mysql.com +1 -0
     - added make_win_src_distribution to bin_SCRIPTS, so it's automatically
       built

  Build-tools/Bootstrap
    1.8 03/08/07 18:54:57 lenz@mysql.com +0 -4
     - no need to create the make_win_src_distribution script in here - do
       it in the Makefile instead.

ChangeSet
  1.1511.25.1 03/08/07 15:20:15 dlenev@build.mysql.com +10 -0
  openssl_1.result, openssl_1.test:
    Aligned test with regenerated SSL certs
  Many files:
    Regenerated expired certificates

  BitKeeper/etc/logging_ok
    1.281.1.1 03/08/07 15:20:08 dlenev@build.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  mysql-test/r/openssl_1.result
    1.6 03/08/07 15:14:51 dlenev@build.mysql.com +2 -2
    Aligned test with regenerated SSL certs

  mysql-test/t/openssl_1.test
    1.6 03/08/07 15:14:00 dlenev@build.mysql.com +2 -2
    Aligned test with regenerated SSL certs

  SSL/server-req.pem
    1.2 03/08/07 15:13:07 dlenev@build.mysql.com +10 -28
    Regenerated expired certificates

  SSL/server-key.pem
    1.3 03/08/07 15:13:05 dlenev@build.mysql.com +13 -13
    Regenerated expired certificates

  SSL/server-cert.pem
    1.3 03/08/07 15:13:00 dlenev@build.mysql.com +44 -42
    Regenerated expired certificates

  SSL/client-req.pem
    1.2 03/08/07 15:11:58 dlenev@build.mysql.com +10 -28
    Regenerated expired certificates

  SSL/client-key.pem
    1.3 03/08/07 15:11:53 dlenev@build.mysql.com +13 -13
    Regenerated expired certificates

  SSL/client-cert.pem
    1.3 03/08/07 15:11:47 dlenev@build.mysql.com +44 -43
    Regenerated expired certificates

  SSL/cacert.pem
    1.3 03/08/07 15:10:16 dlenev@build.mysql.com +19 -18
    Regenerated expired certificates

ChangeSet
  1.1511.24.2 03/08/07 14:39:34 serg@serg.mylan +5 -0
  merged

  sql/sql_select.cc
    1.247 03/08/07 14:39:32 serg@serg.mylan +0 -1
    merged

  sql/item_strfunc.cc
    1.68 03/08/07 14:39:32 serg@serg.mylan +0 -3
    merged

  sql/sql_acl.cc
    1.111 03/08/07 14:35:50 serg@serg.mylan +0 -0
    Auto merged

  acinclude.m4
    1.91 03/08/07 14:35:49 serg@serg.mylan +0 -1
    Auto merged

  Docs/Makefile.am
    1.40 03/08/07 14:35:49 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1511.23.1 03/08/07 13:39:53 serg@serg.mylan +1 -0
  PRIMARY KEY can erroneously have HA_NULL_PART_KEY flag that breaks correct key sorting

  sql/sql_table.cc
    1.163.1.1 03/08/07 13:39:50 serg@serg.mylan +2 -1
    PRIMARY KEY can erroneously have HA_NULL_PART_KEY flag that breaks correct key sorting

ChangeSet
  1.676.306.1 03/08/07 11:16:34 serg@serg.mylan +1 -0
  fixed password buffer overflow

  sql/sql_acl.cc
    1.27.1.16 03/08/07 11:16:33 serg@serg.mylan +2 -2
    fixed password buffer overflow

ChangeSet
  1.1511.18.12 03/08/07 01:14:45 greg@gcw.ath.cx +2 -0
  New option for Bootstrap: -w | --win-dist to create Windows source package

  scripts/Makefile.am
    1.25 03/08/07 01:14:42 greg@gcw.ath.cx +1 -0
    Add make_win_src_distribution to CLEANFILES

  Build-tools/Bootstrap
    1.7 03/08/07 01:14:42 greg@gcw.ath.cx +20 -3
    Add --win-dist option to create Windows source package

ChangeSet
  1.1511.18.11 03/08/06 22:57:14 greg@gcw.ath.cx +2 -0
  Copied Venu's make_win_src_distribution script from 4.1 tree

  scripts/make_win_src_distribution.sh
    1.1 03/08/06 22:56:53 greg@gcw.ath.cx +404 -0

  scripts/make_win_src_distribution.sh
    1.0 03/08/06 22:56:53 greg@gcw.ath.cx +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/scripts/make_win_src_distribution.sh

  scripts/Makefile.am
    1.24 03/08/06 22:56:53 greg@gcw.ath.cx +1 -0
    Add make_win_src_distribution to EXTRA_SCRIPTS

ChangeSet
  1.1511.22.1 03/08/06 15:37:22 serg@serg.mylan +3 -0
  Bug #792 combination of date-interval and between with mixed constant and non-constant

  sql/item_timefunc.cc
    1.23 03/08/06 15:37:19 serg@serg.mylan +4 -6
    Bug #792 combination of date-interval and between with mixed constant and non-constant

  mysql-test/t/type_date.test
    1.5 03/08/06 15:37:19 serg@serg.mylan +1 -0
    Bug #792 combination of date-interval and between with mixed constant and non-constant

  mysql-test/r/type_date.result
    1.7 03/08/06 15:37:19 serg@serg.mylan +2 -0
    Bug #792 combination of date-interval and between with mixed constant and non-constant

ChangeSet
  1.1511.21.2 03/08/06 12:13:08 lenz@mysql.com +1 -0
   - try harder to obtain the FQDN with "hostname -f", if possible (BUG#897)
     Unfortunately the returned value of "hostname" is inconsistent on
     various platforms - some return the host name only, others return the
     FQDN by default. On Linux, one can use option "-f" to enable the output
     of the FQDN. Use it, if available.

  scripts/mysql_install_db.sh
    1.37 03/08/06 12:13:05 lenz@mysql.com +7 -1
     - try harder to obtain the FQDN with "hostname -f", if possible (BUG#897)

ChangeSet
  1.1511.21.1 03/08/06 11:42:48 lenz@mysql.com +1 -0
  Some fixes for the RPM spec file:
  
   - Fixed BUG#959 (libmysqld not being compiled properly)
   - Fixed BUG#998 (RPM build errors): added missing files to the
     distribution (mysql_fix_extensions, mysql_tableinfo, mysqldumpslow,
     mysql_fix_privilege_tables.1), removed "-n" from %install section.

  support-files/mysql.spec.sh
    1.69 03/08/06 11:42:45 lenz@mysql.com +19 -4
     - Fixed BUG#959 (libmysqld not being compiled properly)
     - Fixed BUG#998 (RPM build errors): added missing files to the
       distribution (mysql_fix_extensions, mysql_tableinfo, mysqldumpslow,
       mysql_fix_privilege_tables.1), removed "-n" from %install section.

ChangeSet
  1.676.1.727 03/08/05 22:57:44 miguel@hegel.local +1 -0
  Fix an erronous cast for GCC introduced for to fix VC++ compiler error

  sql/sql_select.cc
    1.91.1.44 03/08/05 22:57:41 miguel@hegel.local +1 -1
    Fix the GCC compiler error introduced for the cast for VC++

ChangeSet
  1.1511.20.1 03/08/05 16:29:09 serg@serg.mylan +3 -0
  make it clear for optimizer that XOR's are not optimizable at the moment (BUG#992)

  sql/item_cmpfunc.h
    1.29 03/08/05 16:29:06 serg@serg.mylan +8 -2
    make it clear for optimizer that XOR's are not optimizable at the moment (BUG#992)

  mysql-test/t/func_test.test
    1.11 03/08/05 16:29:06 serg@serg.mylan +5 -0
    make it clear for optimizer that XOR's are not optimizable at the moment (BUG#992)

  mysql-test/r/func_test.result
    1.13 03/08/05 16:29:06 serg@serg.mylan +5 -0
    make it clear for optimizer that XOR's are not optimizable at the moment (BUG#992)

ChangeSet
  1.676.1.726 03/08/04 09:44:26 miguel@hegel.local +1 -0
  Fix VC++ compiler error

  sql/sql_select.cc
    1.91.1.43 03/08/04 09:43:26 miguel@hegel.local +1 -1
    Fix VC++ compiler error

ChangeSet
  1.1511.18.7 03/08/04 10:59:44 guilhem@mysql.com +7 -0
  2 bugfixes:
  - Bug #985: "Between RESET SLAVE and START SLAVE, SHOW SLAVE STATUS is wrong."
  Now RESET SLAVE puts correct info in mi->host etc. A new test rpl_reset_slave
  for that.
  - Bug #986: "CHANGE MASTER & START SLAVE do not reset error columns in SHOW
  SLAVE STATUS". Now these reset the errors.

  mysql-test/t/rpl_reset_slave.test
    1.1 03/08/04 10:59:38 guilhem@mysql.com +26 -0

  mysql-test/r/rpl_reset_slave.result
    1.1 03/08/04 10:59:38 guilhem@mysql.com +22 -0

  sql/sql_repl.cc
    1.108 03/08/04 10:59:38 guilhem@mysql.com +11 -6
    copy --master-host etc to mi in RESET SLAVE, so that SHOW SLAVE STATUS
    shows correct information.

  mysql-test/t/rpl_reset_slave.test
    1.0 03/08/04 10:59:38 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/rpl_reset_slave.test

  mysql-test/r/rpl_reset_slave.result
    1.0 03/08/04 10:59:38 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/r/rpl_reset_slave.result

  sql/slave.h
    1.62 03/08/04 10:59:37 guilhem@mysql.com +2 -0
    declarations for new functions.

  sql/slave.cc
    1.242 03/08/04 10:59:37 guilhem@mysql.com +29 -11
    As we need TWICE the code to copy command-line options (--master-host etc)
    to mi (we already had it in init_master_info, but we also need it in RESET
    SLAVE to fix bug#985), I make a function of this code.
    And a function to reset Last_slave_error and Last_slave_errno (we need
    it in CHANGE MASTER, RESET SLAVE, and at the start of the SQL thread).

  mysql-test/t/rpl_loaddata.test
    1.6 03/08/04 10:59:37 guilhem@mysql.com +53 -0
    Test that RESET SLAVE, START SLAVE and CHANGE MASTER all reset 
    Last_slave_error and Last_slave_errno (columns of SHOW SLAVE STATUS).
    We do it in this test because that's one of tests which have 
    an intentional query error on the slave.

  mysql-test/r/rpl_loaddata.result
    1.6 03/08/04 10:59:37 guilhem@mysql.com +26 -0
    result update.

ChangeSet
  1.676.1.725 03/08/03 16:33:04 monty@mashka.mysql.fi +1 -0
  Cleaned up code comment

  sql/item_strfunc.cc
    1.24.1.6 03/08/03 16:33:03 monty@mashka.mysql.fi +2 -1
    Cleaned up code comment

ChangeSet
  1.1511.18.6 03/08/02 23:46:26 guilhem@mysql.com +6 -0
  Fix so that SET PASSWORD is not replicated by the slave if running with
  replicate-*-table rules which exclude 'mysql' tables
  (e.g. replicate-wild-ignore-table=mysql.%).
  This was already the behaviour for GRANT/REVOKE, I'm extending it to
  SET PASSWORD because it seems very logical (the contrary seems illogical).
  2 new tests:
  - one to test if GRANT and SET PASSWORD are replicated
  - one to test if they are not replicated if replicate-wild-ignore-table=mysql.%
  The 2nd is also a testcase for BUG#980.

  mysql-test/t/rpl_ignore_grant.test
    1.1 03/08/02 23:46:19 guilhem@mysql.com +57 -0

  mysql-test/t/rpl_ignore_grant-slave.opt
    1.1 03/08/02 23:46:19 guilhem@mysql.com +1 -0

  mysql-test/t/rpl_do_grant.test
    1.1 03/08/02 23:46:19 guilhem@mysql.com +46 -0

  mysql-test/t/rpl_ignore_grant.test
    1.0 03/08/02 23:46:19 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/rpl_ignore_grant.test

  mysql-test/t/rpl_ignore_grant-slave.opt
    1.0 03/08/02 23:46:19 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/rpl_ignore_grant-slave.opt

  mysql-test/t/rpl_do_grant.test
    1.0 03/08/02 23:46:19 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/rpl_do_grant.test

  mysql-test/r/rpl_ignore_grant.result
    1.1 03/08/02 23:46:18 guilhem@mysql.com +37 -0

  mysql-test/r/rpl_do_grant.result
    1.1 03/08/02 23:46:18 guilhem@mysql.com +26 -0

  sql/sql_acl.cc
    1.110 03/08/02 23:46:18 guilhem@mysql.com +19 -0
    Fix so that SET PASSWORD is not replicated by the slave if running with
    replicate-*-table rules which exclude 'mysql' tables
    (e.g. replicate-wild-ignore-table=mysql.%).
    This was already the behaviour for GRANT/REVOKE, I'm extending it to
    SET PASSWORD because it seems very logical (the contrary seems illogical).

  mysql-test/r/rpl_ignore_grant.result
    1.0 03/08/02 23:46:18 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/r/rpl_ignore_grant.result

  mysql-test/r/rpl_do_grant.result
    1.0 03/08/02 23:46:18 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/r/rpl_do_grant.result

ChangeSet
  1.1511.18.5 03/08/02 16:11:39 guilhem@mysql.com +1 -0
  Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
  into mysql.com:/home/mysql_src/mysql-4.0

  sql/sql_acl.cc
    1.109 03/08/02 16:11:29 guilhem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1511.19.1 03/08/02 16:10:26 guilhem@mysql.com +1 -0
  Mark tables 'updating' in sql_acl.cc (mysql_grant(), mysql_table_grant()) so that
  tables_ok() does not ignore them. This fixes random bug #980.

  sql/sql_acl.cc
    1.107.1.1 03/08/02 16:10:20 guilhem@mysql.com +22 -4
    Mark tables 'updating' so that tables_ok() does not ignore them;
    this fixes random bug #980.

ChangeSet
  1.676.1.724 03/08/01 22:29:38 guilhem@mysql.com +1 -0
  Backporting the changeset below from 4.0, because a customer hits
  the bug with 3.23.
  ChangeSet@1.1416.113.1, 2003-03-22 15:22:59+01:00, guilhem@mysql.com
    Fix for #178  Replicating INSERT VALUES(USER()) crashes (SEGV) the slave
        Now it does not SEGV, but USER() is still badly replicated
        (it is replicated to ""), which is a lower priority bug.

  sql/item_strfunc.cc
    1.24.1.5 03/08/01 22:29:34 guilhem@mysql.com +2 -1
    Don't segfault in USER() if thd->user == 0 (system thread).

ChangeSet
  1.1511.14.4 03/08/01 14:58:03 serg@serg.mylan +7 -0
  replace mi_rrnd() in myrg_rkey family to more intelligent (HA_KEYREAD-aware) read function

  myisammrg/myrg_rprev.c
    1.13 03/08/01 14:58:00 serg@serg.mylan +1 -1
    replace mi_rrnd() in myrg_rkey family to more intelligent (HA_KEYREAD-aware) read function

  myisammrg/myrg_rnext.c
    1.14 03/08/01 14:58:00 serg@serg.mylan +1 -1
    replace mi_rrnd() in myrg_rkey family to more intelligent (HA_KEYREAD-aware) read function

  myisammrg/myrg_rlast.c
    1.8 03/08/01 14:58:00 serg@serg.mylan +1 -1
    replace mi_rrnd() in myrg_rkey family to more intelligent (HA_KEYREAD-aware) read function

  myisammrg/myrg_rkey.c
    1.15 03/08/01 14:58:00 serg@serg.mylan +2 -2
    replace mi_rrnd() in myrg_rkey family to more intelligent (HA_KEYREAD-aware) read function

  myisammrg/myrg_rfirst.c
    1.9 03/08/01 14:58:00 serg@serg.mylan +1 -1
    replace mi_rrnd() in myrg_rkey family to more intelligent (HA_KEYREAD-aware) read function

  myisammrg/myrg_queue.c
    1.9 03/08/01 14:58:00 serg@serg.mylan +10 -2
    replace mi_rrnd() in myrg_rkey family to more intelligent (HA_KEYREAD-aware) read function

  myisammrg/myrg_def.h
    1.11 03/08/01 14:58:00 serg@serg.mylan +2 -0
    replace mi_rrnd() in myrg_rkey family to more intelligent (HA_KEYREAD-aware) read function

ChangeSet
  1.1511.18.3 03/08/01 12:13:52 heikki@hundin.mysql.fi +1 -0
  log0log.c:
    Fix assertion failure reported by Alex Kiernan when we compile with the SUN Forte Developer 7 C 5.4 compiler

  innobase/log/log0log.c
    1.27 03/08/01 12:13:41 heikki@hundin.mysql.fi +1 -1
    Fix assertion failure reported by Alex Kiernan when we compile with the SUN Forte Developer 7 C 5.4 compiler

ChangeSet
  1.1511.18.2 03/08/01 10:21:41 lenz@mysql.com +1 -0
   - portability fixes: put string tests in double quotes (BUG#974). 
     Thanks to Alex Kiernan for the hint.

  acinclude.m4
    1.90 03/08/01 10:21:39 lenz@mysql.com +16 -16
     - portability fixes: put string tests in double quotes (BUG#974). 
       Thanks to Alex Kiernan for the hint.

ChangeSet
  1.1511.18.1 03/08/01 10:09:23 lenz@mysql.com +1 -0
   - fixed BUG#968 ("test: argument expected" error) - thanks to Alex Kiernan
     for the patch

  scripts/mysql_fix_privilege_tables.sh
    1.12 03/08/01 10:09:21 lenz@mysql.com +1 -1
     - fixed BUG#968 ("test: argument expected" error) - thanks to Alex Kiernan
       for the patch

ChangeSet
  1.1511.14.3 03/07/31 13:45:35 serg@serg.mylan +3 -0
  bug #942. docid == ftb->lastpos in join on looping over nested table

  mysql-test/t/fulltext.test
    1.38 03/07/31 13:45:33 serg@serg.mylan +15 -1
    bug #942. docid == ftb->lastpos in join on looping over nested table

  mysql-test/r/fulltext.result
    1.39 03/07/31 13:45:33 serg@serg.mylan +11 -0
    bug #942. docid == ftb->lastpos in join on looping over nested table

  myisam/ft_boolean_search.c
    1.56 03/07/31 13:45:33 serg@serg.mylan +2 -2
    bug #942. docid == ftb->lastpos in join on looping over nested table

ChangeSet
  1.1511.1.43 03/07/31 04:17:42 wax@mysql.com +1 -0
  Merge mysql.com:/home/wax/mysql/mysql-4.0
  into mysql.com:/home/wax/mysql/mysql-4.0chsize

  BitKeeper/etc/logging_ok
    1.282 03/07/31 04:17:35 wax@mysql.com +0 -0
    auto-union

ChangeSet
  1.1503.1.1 03/07/31 04:14:36 wax@mysql.com +3 -0
  BUG
  Add functions SetFilePointerEx and SetEndOfFile for huge 
  tables instead of chsize
  Move chsize to right place

  BitKeeper/etc/logging_ok
    1.278.1.1 03/07/31 04:13:37 wax@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  mysys/my_chsize.c
    1.9 03/07/31 04:13:17 wax@mysql.com +39 -16
    Add functions SetFilePointerEx and SetEndOfFile for huge tables
    Move chsize to right place

  include/config-win.h
    1.29 03/07/31 04:13:17 wax@mysql.com +1 -0
    add HAVE_SETFILEPOINTER

ChangeSet
  1.1511.14.2 03/07/30 16:15:10 serg@serg.mylan +2 -0
  Bug#937
  myisamchk.c:
    help text clarified
  mi_check.c:
    allow one to "analyze" empty table :)

  myisam/myisamchk.c
    1.104 03/07/30 16:14:30 serg@serg.mylan +7 -3
    help text clarified

  myisam/mi_check.c
    1.120 03/07/30 16:14:30 serg@serg.mylan +6 -5
    allow one to "analyze" empty table :)

ChangeSet
  1.1511.1.41 03/07/30 14:59:56 bell@sanja.is.com.ua +3 -0
  support of more then 255 tables dependence in query cache (fixed BUG#930)

  sql/sql_cache.h
    1.20 03/07/30 14:59:50 bell@sanja.is.com.ua +1 -1
    query with merged tables can depend of more then 255 tables

  mysql-test/t/query_cache.test
    1.24 03/07/30 14:59:50 bell@sanja.is.com.ua +529 -1
    test of many merged tales

  mysql-test/r/query_cache.result
    1.23 03/07/30 14:59:50 bell@sanja.is.com.ua +534 -1
    test of many merged tales

ChangeSet
  1.1511.16.1 03/07/30 03:33:48 dlenev@mysql.com +2 -0
  Fix security bug. mysqld server without ssl support was completly
  ignorant about ssl_type attribute

  BitKeeper/etc/logging_ok
    1.281 03/07/30 03:33:48 dlenev@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_acl.cc
    1.108 03/07/30 03:33:39 dlenev@mysql.com +9 -3
    Now acl_getroot() honors ssl_type attribute even if we compile without openssl

ChangeSet
  1.1511.1.40 03/07/30 01:12:33 heikki@hundin.mysql.fi +1 -0
  dict0dict.c:
    Fix bug introduced in 4.0.13 and reported by Emic: if a CREATE TABLE ended in a comment, a memory overrun could happen

  innobase/dict/dict0dict.c
    1.31 03/07/30 01:12:23 heikki@hundin.mysql.fi +6 -3
    Fix bug introduced in 4.0.13 and reported by Emic: if a CREATE TABLE ended in a comment, a memory overrun could happen

ChangeSet
  1.1511.1.39 03/07/29 00:04:56 heikki@hundin.mysql.fi +1 -0
  mysqld.cc:
    innodb_fast_shutdown CAN take an argument though it was not specified so in mysqld.cc

  sql/mysqld.cc
    1.448 03/07/29 00:04:47 heikki@hundin.mysql.fi +1 -1
    innodb_fast_shutdown CAN take an argument though it was not specified so in mysqld.cc

ChangeSet
  1.676.1.723 03/07/28 17:50:06 serg@serg.mylan +1 -0
  Followup to Jim's changes in mysqldoc tree. Unfortunately, it's too late for 4.0.14 :(

  Docs/Makefile.am
    1.26.1.3 03/07/28 17:50:04 serg@serg.mylan +2 -2
    Followup to Jim's changes in mysqldoc tree. Unfortunately, it's too late for 4.0.14 :(

ChangeSet
  1.1511.1.38 03/07/28 15:33:46 guilhem@mysql.com +1 -0
  Avoid segfault when LOAD DATA FROM MASTER is run on a master which does no
  binary logging.

  sql/repl_failsafe.cc
    1.32 03/07/28 15:33:41 guilhem@mysql.com +1 -1
    If the master is running without --log-bin, SHOW MASTER STATUS will return
    "empty set", i.e. row==0; we must test this before invoking row[0], or
    segfault.

ChangeSet
  1.1511.15.1 03/07/26 17:59:05 guilhem@mysql.com +2 -0
  Make rpl_insert_id.test use InnoDB, and added foreign keys to the table,
  so that it really tests replication of SET FOREIGN_KEY_CHECKS (previously
  it used MyISAM).

  mysql-test/t/rpl_insert_id.test
    1.4 03/07/26 17:59:00 guilhem@mysql.com +4 -2
    Make test use InnoDB, and added foreign keys to the table, so that it really tests 
    replication of FOREIGN_KEY_CHECKS.
    --disable_warnings because 4.1 prints a warning when the table type
    is not available.

  mysql-test/r/rpl_insert_id.result
    1.5 03/07/26 17:58:59 guilhem@mysql.com +2 -2
    result update

ChangeSet
  1.1511.1.36 03/07/25 22:26:39 heikki@hundin.mysql.fi +11 -0
  srv0srv.c, os0file.c, log0recv.h, log0log.h, fil0fil.h, fsp0fsp.c, fil0fil.c:
    Merge
  trx0trx.c:
    Print more info about a trx in SHOW INNODB status; try to find the bug reported by Plaxo
  buf0buf.c:
    Check that page log sequence numbers are not in the future
  log0recv.c, log0log.c:
    Fixed a bug: if you used big BLOBs, and your log files were relatively small, InnoDB could in a big BLOB operation temporarily write over the log produced AFTER the latest checkpoint. If InnoDB would crash at that moment, then the crash recovery would fail, because InnoDB would not be able to scan the log even up to the latest checkpoint. Starting from this version, InnoDB tries to ensure the latest checkpoint is young enough. If that is not possible, InnoDB prints a warning to the .err log

  innobase/srv/srv0srv.c
    1.56 03/07/25 22:24:20 heikki@hundin.mysql.fi +14 -1
    Merge

  innobase/os/os0file.c
    1.58 03/07/25 22:24:20 heikki@hundin.mysql.fi +1 -0
    Merge

  innobase/include/log0recv.h
    1.7 03/07/25 22:24:18 heikki@hundin.mysql.fi +2 -0
    Merge

  innobase/include/log0log.h
    1.10 03/07/25 22:24:18 heikki@hundin.mysql.fi +14 -0
    Merge

  innobase/include/fil0fil.h
    1.7 03/07/25 22:24:18 heikki@hundin.mysql.fi +8 -0
    Merge

  innobase/fsp/fsp0fsp.c
    1.14 03/07/25 22:24:18 heikki@hundin.mysql.fi +44 -2
    Merge

  innobase/fil/fil0fil.c
    1.13 03/07/25 22:24:18 heikki@hundin.mysql.fi +28 -0
    Merge

  innobase/trx/trx0trx.c
    1.30 03/07/25 22:23:33 heikki@hundin.mysql.fi +7 -0
    Print more info about a trx in SHOW INNODB status; try to find the bug reported by Plaxo

  innobase/buf/buf0buf.c
    1.25 03/07/25 22:22:05 heikki@hundin.mysql.fi +23 -0
    Check that page log sequence numbers are not in the future

  innobase/log/log0recv.c
    1.22 03/07/25 22:21:31 heikki@hundin.mysql.fi +46 -3
    Fixed a bug: if you used big BLOBs, and your log files were relatively small, InnoDB could in a big BLOB operation temporarily write over the log produced AFTER the latest checkpoint. If InnoDB would crash at that moment, then the crash recovery would fail, because InnoDB would not be able to scan the log even up to the latest checkpoint. Starting from this version, InnoDB tries to ensure the latest checkpoint is young enough. If that is not possible, InnoDB prints a warning to the .err log

  innobase/log/log0log.c
    1.26 03/07/25 22:21:31 heikki@hundin.mysql.fi +66 -9
    Fixed a bug: if you used big BLOBs, and your log files were relatively small, InnoDB could in a big BLOB operation temporarily write over the log produced AFTER the latest checkpoint. If InnoDB would crash at that moment, then the crash recovery would fail, because InnoDB would not be able to scan the log even up to the latest checkpoint. Starting from this version, InnoDB tries to ensure the latest checkpoint is young enough. If that is not possible, InnoDB prints a warning to the .err log

ChangeSet
  1.1511.14.1 03/07/25 14:32:03 serg@serg.mylan +3 -0
  outer join, impossible on condition, where, and usable key for range
  bug#926

  sql/sql_select.cc
    1.246 03/07/25 14:32:01 serg@serg.mylan +0 -4
    outer join, impossible on condition, where, and usable key for range
    bug#926

  mysql-test/t/select.test
    1.20 03/07/25 14:32:01 serg@serg.mylan +20 -0
    outer join, impossible on condition, where, and usable key for range
    bug#926

  mysql-test/r/select.result
    1.28 03/07/25 14:32:01 serg@serg.mylan +20 -0
    outer join, impossible on condition, where, and usable key for range
    bug#926

ChangeSet
  1.1511.13.1 03/07/25 09:25:50 gluh@gluh.mysql.r18.ru +1 -0
  Fix: remove compile warnings on RH(with openssl)

  acinclude.m4
    1.89 03/07/25 09:25:48 gluh@gluh.mysql.r18.ru +6 -1
    Fix: remove compile warnings on RH(with openssl)

ChangeSet
  1.1511.12.2 03/07/24 22:29:09 guilhem@mysql.com +1 -0
  Fix for BUG#858 "CHANGE MASTER forgets to update relay-log.info";
  just a flush_relay_log_info() at the end of CHANGE MASTER
  (there was already flush_master_info()).

  sql/sql_repl.cc
    1.107 03/07/24 22:29:04 guilhem@mysql.com +17 -3
    Comments.
    Flush relay-log.info after CHANGE MASTER, or the changes
    to the relay log parameters (relay log name and position, and
    the corresponding master's binlog name and position) will be
    lost if the slave mysqld is shutdown immediately after the 
    CHANGE MASTER (without the slave threads being started).

ChangeSet
  1.1511.12.1 03/07/24 22:25:36 guilhem@mysql.com +3 -0
  WL#1036 (print the db in slave error messages).
  I extended the task to cleaning error messages, making them look nicer,
  and making the output of SHOW SLAVE STATUS (column Last_error) be as complete
  as what's printed on the .err file;
  previously we would have, for a failure of a replicated LOAD DATA INFILE:
  - in the .err, 2 lines:
  "duplicate entry 2708 for key 1"
  "failed loading SQL_LOAD-5-2-2.info"
  - and in SHOW SLAVE STATUS, only:
  "failed loading SQL_LOAD-5-2-2.info".
  Now SHOW SLAVE STATUS will contain the concatenation of the 2 messages.

  sql/slave.h
    1.61 03/07/24 22:25:31 guilhem@mysql.com +2 -1
    declarations.

  sql/slave.cc
    1.241 03/07/24 22:25:31 guilhem@mysql.com +43 -12
    Removed a useless declaration (the rewrite_db() function is already declared in slave.h).
    Added missing ')' in error messages.
    Tried to make error messages look nicer (previously we had
    "do START SLAVE;, error_code=1062"
    now we'll have
    "do START SLAVE; . Error_code=1062".
    This form has been discussed, I agree it's no panacea, but it's still more readable
    like this. To be improved in the future :)

  sql/log_event.cc
    1.120 03/07/24 22:25:30 guilhem@mysql.com +72 -39
    Print the default database when replication stops because of an error. Previously, we had:
    "error "Duplicate entry 87987 for key 1", query 'insert into t values(87987)'", ie the db
    was not mentioned, making it hard for cases where the same table name is used in
    several databases.
    Lengthened some error messages (for failing replication of LOAD DATA: mention the table
    and the db).
    Changes so that SHOW SLAVE STATUS reports as complete errors as the .err file.

ChangeSet
  1.1511.1.33 03/07/23 21:57:44 miguel@hegel.local +3 -0
  Fix for service issue with paths having spaces (bug #687)

  sql/mysqld.cc
    1.447 03/07/23 21:57:39 miguel@hegel.local +5 -2
    Fix for service issue with paths having spaces (bug #687)

  mysys/mf_format.c
    1.17 03/07/23 21:57:39 miguel@hegel.local +8 -0
    Fix for service issue with paths having spaces (bug #687)

  include/my_sys.h
    1.98 03/07/23 21:57:39 miguel@hegel.local +1 -0
    Fix for service issue with paths having spaces (bug #687)

ChangeSet
  1.1516 03/07/23 17:36:56 Sinisa@sinisa.nasamreza.org +7 -0
  Fuller implementation of lower case table names.
  
  Bug record #828

  sql/sql_yacc.yy
    1.218 03/07/23 17:36:53 Sinisa@sinisa.nasamreza.org +4 -0
    Fuller implementation of lower case table names.
    
    Bug record #828

  sql/sql_table.cc
    1.164 03/07/23 17:36:53 Sinisa@sinisa.nasamreza.org +2 -0
    Fuller implementation of lower case table names.
    
    Bug record #828

  sql/sql_parse.cc
    1.333 03/07/23 17:36:53 Sinisa@sinisa.nasamreza.org +2 -0
    Fuller implementation of lower case table names.
    
    Bug record #828

  sql/sql_class.h
    1.157 03/07/23 17:36:52 Sinisa@sinisa.nasamreza.org +9 -3
    Fuller implementation of lower case table names.
    
    Bug record #828

  sql/mysql_priv.h
    1.202 03/07/23 17:36:52 Sinisa@sinisa.nasamreza.org +6 -0
    Fuller implementation of lower case table names.
    
    Bug record #828

  mysql-test/t/lowercase_table.test
    1.3 03/07/23 17:36:52 Sinisa@sinisa.nasamreza.org +0 -1
    Fuller implementation of lower case table names.
    
    Bug record #828

  mysql-test/r/lowercase_table.result
    1.3 03/07/23 17:36:52 Sinisa@sinisa.nasamreza.org +2 -1
    Fuller implementation of lower case table names.
    
    Bug record #828

ChangeSet
  1.1511.1.32 03/07/23 16:13:07 serg@serg.mylan +1 -0
  --with-openssl-includes/libraries

  acinclude.m4
    1.88 03/07/23 16:13:05 serg@serg.mylan +4 -4
    --with-openssl-includes/libraries

ChangeSet
  1.1511.11.2 03/07/22 19:56:52 gluh@gluh.mysql.r18.ru +1 -0
  Bug #554: Support for --with-openssl[=DIR]

  acinclude.m4
    1.87 03/07/22 19:56:50 gluh@gluh.mysql.r18.ru +1 -1
    Bug #554: Support for --with-openssl[=DIR]

ChangeSet
  1.1511.11.1 03/07/22 15:04:37 gluh@gluh.mysql.r18.ru +1 -0
  Bug #554: Support for --with-openssl[=DIR]
  
  Here is fix for bug 554.
  Added configure options 
  --with-openssl-includes[=DIR] and --with-openssl-libs[=DIR]

  acinclude.m4
    1.86 03/07/22 15:04:30 gluh@gluh.mysql.r18.ru +42 -13
    Bug #554: Support for --with-openssl[=DIR]

ChangeSet
  1.1511.1.30 03/07/22 09:45:53 lenz@mysql.com +1 -0
   - tagged ChangeSet 1.1527.1.3 as "mysql-4.0.14"
   - bumped up version number in configure.in to 4.0.15

  configure.in
    1.280 03/07/22 09:45:51 lenz@mysql.com +1 -1
     - tagged ChangeSet 1.1527.1.3 as "mysql-4.0.14"
     - bumped up version number in configure.in to 4.0.15

ChangeSet
  1.1511.1.29 03/07/22 10:14:43 heikki@hundin.mysql.fi +1 -0
  btr0cur.c:
    Fix bug: if there was a 'record too long' error in an insert, InnoDB forgot to free reserved file space extents; they were only freed in mysqld restart

  innobase/btr/btr0cur.c
    1.27 03/07/22 10:14:19 heikki@hundin.mysql.fi +4 -0
    Fix bug: if there was a 'record too long' error in an insert, InnoDB forgot to free reserved file space extents; they were only freed in mysqld restart

ChangeSet
  1.1511.1.28 03/07/22 03:23:02 heikki@hundin.mysql.fi +1 -0
  btr0cur.c:
    Fix an error in the previous push

  innobase/btr/btr0cur.c
    1.26 03/07/22 03:22:54 heikki@hundin.mysql.fi +14 -14
    Fix an error in the previous push

ChangeSet
  1.1511.1.27 03/07/22 02:44:55 heikki@hundin.mysql.fi +1 -0
  btr0cur.c:
    Fix bug reported by Dyego Souza do Carmo: if a row becomes too long, > 8000 bytes, in an update, then InnoDB simply removes the clustered index record and does not report of table handler error 139

  innobase/btr/btr0cur.c
    1.25 03/07/22 02:44:42 heikki@hundin.mysql.fi +22 -20
    Fix bug reported by Dyego Souza do Carmo: if a row becomes too long, > 8000 bytes, in an update, then InnoDB simply removes the clustered index record and does not report of table handler error 139

ChangeSet
  1.1511.1.26 03/07/21 22:21:07 serg@serg.mylan +1 -0
  myisamchk --sort-records crash on compressed tables fixed.

  myisam/myisamchk.c
    1.103 03/07/21 22:21:05 serg@serg.mylan +6 -0
    myisamchk --sort-records crash on compressed tables fixed.

ChangeSet
  1.1511.1.25 03/07/21 13:46:57 serg@serg.mylan +1 -0
  Bug #473 - GRANT ... TO ''@... was requiring FLUSH PRIVILEGES to work

  sql/sql_acl.cc
    1.107 03/07/21 13:46:55 serg@serg.mylan +1 -1
    Bug #473 - GRANT ... TO ''@... was requiring FLUSH PRIVILEGES to work

ChangeSet
  1.1511.1.24 03/07/19 18:17:29 hf@deer.(none) +4 -0
  Fix for #712 with Serg's suggestions

  sql/ha_myisam.cc
    1.127 03/07/19 18:17:27 hf@deer.(none) +2 -2
    We use F_WRLCK instead MI_TEMPORARY_TABLE

  myisam/myisamdef.h
    1.60 03/07/19 18:17:27 hf@deer.(none) +0 -1
    no need for MI_TEMPORARY_TABLE

  myisam/myisamchk.c
    1.102 03/07/19 18:17:27 hf@deer.(none) +2 -6
    lines of "locking - emulation" replaced with mi_lock_database call

  myisam/mi_locking.c
    1.25 03/07/19 18:17:27 hf@deer.(none) +1 -1
    Here we use F_EXTRA_LCK

ChangeSet
  1.676.1.722 03/07/19 10:34:41 serg@serg.mylan +1 -0
  typo fixed

  acinclude.m4
    1.35.1.14 03/07/19 10:34:39 serg@serg.mylan +1 -1
    typo fixed

ChangeSet
  1.1515 03/07/18 14:14:20 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
  into sinisa.nasamreza.org:/mnt/work/mysql-4.0

  sql/item_cmpfunc.cc
    1.56 03/07/18 14:14:16 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1511.8.3 03/07/18 12:35:29 monty@mashka.(none) +3 -0
  Portability fixes for Redhat 9

  BitKeeper/etc/logging_ok
    1.280 03/07/18 12:35:29 monty@mashka.(none) +1 -0
    Logging to logging@openlogging.org accepted

  vio/viosocket.c
    1.18 03/07/18 12:35:17 monty@mashka.(none) +1 -1
    Removed compiler warning

  acinclude.m4
    1.85 03/07/18 12:35:17 monty@mashka.(none) +12 -3
    Fixed problem with openssl on RedHat 9

