ChangeSet
  1.1644 03/12/22 14:42:20 lenz@kallisto.local +1 -0
   - portability fix for IBM AIX and QNX

  sql/opt_range.cc
    1.110 03/12/22 14:42:16 lenz@mysql.com +1 -1
     - portability fix for IBM AIX and QNX

ChangeSet
  1.1643 03/12/21 19:43:23 monty@mysql.com +7 -0
  Merge mysql.com:/my/mysql-4.1 into mysql.com:/my/mysql-5.0

  sql/sql_prepare.cc
    1.55 03/12/21 19:43:22 monty@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.178 03/12/21 19:43:22 monty@mysql.com +0 -0
    Auto merged

  sql/log_event.cc
    1.129 03/12/21 19:43:22 monty@mysql.com +0 -0
    Auto merged

  sql/item_func.cc
    1.142 03/12/21 19:43:22 monty@mysql.com +0 -0
    Auto merged

  sql/item.h
    1.76 03/12/21 19:43:21 monty@mysql.com +0 -0
    Auto merged

  sql/filesort.cc
    1.83 03/12/21 19:43:21 monty@mysql.com +0 -0
    Auto merged

  client/mysqltest.c
    1.107 03/12/21 19:43:21 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1642 03/12/21 19:41:34 monty@mysql.com +4 -0
  Fixed bug in replacation for not x86 platforms
  Portability fixes

  sql/uniques.cc
    1.22 03/12/21 19:41:32 monty@mysql.com +12 -13
    Removed not used argument to get_merge_buffers_cost()
    Removed wrong cast which caused compiler failures
    Cast arguments to ceil() to double (portability problem)

  sql/log_event.cc
    1.128 03/12/21 19:41:32 monty@mysql.com +13 -13
    Removed ++ from uint4korr() becasue this caused side effects

  mysql-test/t/rpl_relayrotate.test
    1.9 03/12/21 19:41:31 monty@mysql.com +1 -0
    Portability fix.

  mysql-test/r/rpl_relayrotate.result
    1.6 03/12/21 19:41:31 monty@mysql.com +1 -1
    Portability fix

ChangeSet
  1.1616.60.1 03/12/21 19:39:32 monty@mysql.com +13 -0
  Portability fixes found during 5.0 test compilation
  Fixed bug in ORDER BY on a small column (Bug #2147)
  Fixed error from pthread_mutex_destroy() when one had wrong errmsg file
  

  sql/sql_prepare.cc
    1.34.1.31 03/12/21 19:39:30 monty@mysql.com +2 -2
    Portability fix. (Some compilers doesn't support jump over variables declared in for())

  sql/sql_class.h
    1.146.1.59 03/12/21 19:39:30 monty@mysql.com +5 -2
    Fixed compiler warning

  sql/log_event.cc
    1.113.1.28 03/12/21 19:39:30 monty@mysql.com +2 -2
    Portability fix

  sql/item_func.cc
    1.124.1.51 03/12/21 19:39:30 monty@mysql.com +11 -3
    Protect mutex destroy.
    (Fixed error from pthread_mutex_destroy() when one had wrong errmsg file)

  sql/item.h
    1.56.1.52 03/12/21 19:39:29 monty@mysql.com +1 -1
    Clear 'fixed' on cleanup (For prepared statements)

  sql/filesort.cc
    1.70.1.9 03/12/21 19:39:29 monty@mysql.com +1 -13
    Fixed bug in filesort (Bug #2147)

  mysql-test/t/order_by.test
    1.20 03/12/21 19:39:29 monty@mysql.com +8 -0
    Added test for bug #2147 (bug in filesort)

  mysql-test/t/init_connect.test
    1.2 03/12/21 19:39:29 monty@mysql.com +1 -1
    Portability fix

  mysql-test/t/init_connect-master.opt
    1.2 03/12/21 19:39:29 monty@mysql.com +1 -1
    Added proper quoting (for Solaris and OSF)

  mysql-test/r/order_by.result
    1.33 03/12/21 19:39:29 monty@mysql.com +6 -0
    Added test for bug filesort bug

  mysql-test/r/init_connect.result
    1.2 03/12/21 19:39:29 monty@mysql.com +1 -1
    Updated tests

  mysql-test/mysql-test-run.sh
    1.170 03/12/21 19:39:29 monty@mysql.com +8 -2
    Added tracing of mysqldump and mysqlbinlog

  client/mysqltest.c
    1.92.1.25 03/12/21 19:39:29 monty@mysql.com +12 -7
    Added handling of error on query send
    (Needed for init_connection.test)

ChangeSet
  1.1641 03/12/21 15:56:41 monty@mysql.com +1 -0
  Portability fix

  sql/item.h
    1.75 03/12/21 15:56:38 monty@mysql.com +1 -1
    Portability fix

ChangeSet
  1.1640 03/12/21 12:48:03 monty@mysql.com +3 -0
  Fixed memory leaks in SP
  Some code cleanup

  sql/sql_parse.cc
    1.323 03/12/21 12:48:01 monty@mysql.com +54 -52
    Simple cleanup
    Fixed memory leaks for mailformed SP definitions

  sql/sp.cc
    1.40 03/12/21 12:48:01 monty@mysql.com +86 -103
    Moved DBUG_ENTER after all variable declarations
    Eliminated some variables.
    Added more DBUG_ENTER commands.
    Added memory allocation checking in create_string()
    Fixed memory leak in sp_show_create_function()
    Removed usage of sprintf
    

  mysql-test/r/sp.result
    1.46 03/12/21 12:48:01 monty@mysql.com +4 -4
    Update results after adding quotes around function/procedure names

ChangeSet
  1.1639 03/12/21 02:08:44 monty@mysql.com +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/my/mysql-5.0

  sql/sql_delete.cc
    1.114 03/12/21 02:08:43 monty@mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.138 03/12/21 02:08:43 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1635.1.1 03/12/21 02:07:45 monty@mysql.com +18 -0
  Update for VC++
  (Fixed project files, compiler warnings etc..)

  sql/sql_update.cc
    1.102 03/12/21 02:07:21 monty@mysql.com +2 -0
    Fixed compiler warning

  sql/sql_insert.cc
    1.100 03/12/21 02:07:21 monty@mysql.com +4 -0
    Fixed compiler warning

  sql/sql_delete.cc
    1.112.1.1 03/12/21 02:07:21 monty@mysql.com +2 -0
    Fixed compiler warning

  sql/sql_class.cc
    1.135.1.1 03/12/21 02:07:21 monty@mysql.com +2 -2
    Portability fix

  sql/sp_rcontext.h
    1.7 03/12/21 02:07:21 monty@mysql.com +1 -1
    Fixed compiler warning

  sql/sp_rcontext.cc
    1.5 03/12/21 02:07:21 monty@mysql.com +0 -2
    Removed not used variable

  sql/sp_head.cc
    1.61 03/12/21 02:07:21 monty@mysql.com +0 -1
    Removed not used variable

  sql/sp_cache.cc
    1.5 03/12/21 02:07:21 monty@mysql.com +1 -1
    Fixed compiler warning

  sql/sp.cc
    1.39 03/12/21 02:07:21 monty@mysql.com +10 -10
    sql_mode to ulong
    Don't use strcpy
    Replaced sprintf() with strmov

  sql/log_event.h
    1.92 03/12/21 02:07:21 monty@mysql.com +3 -3
    Changed sql_mode to ulong to match THD.variables.sql_mode (If they are not the same we get a lot of compiler warnings)
    

  sql/log_event.cc
    1.127 03/12/21 02:07:21 monty@mysql.com +17 -10
    Fixed compiler warnings
    - One can't portable allocate an stack-array dynamicly
    - Changed sql_mode to ulong to match THD.variables.sql_mode (If they are not the same we get a lot of compiler warnings)
    

  sql/item_timefunc.cc
    1.56 03/12/21 02:07:21 monty@mysql.com +2 -3
    Fixed compiler warnings

  sql/filesort.cc
    1.82 03/12/21 02:07:21 monty@mysql.com +1 -1
    Remove not used variable

  sql-common/client.c
    1.47 03/12/21 02:07:21 monty@mysql.com +2 -2
    Fix for compilation with VC++

  client/mysqlbinlog.cc
    1.87 03/12/21 02:07:21 monty@mysql.com +0 -1
    Remove not used variable

  VC++Files/sql/mysqld.dsp
    1.18 03/12/21 02:07:21 monty@mysql.com +25 -7
    Update for VC++

  VC++Files/libmysqld/libmysqld.dsp
    1.13 03/12/21 02:07:21 monty@mysql.com +42 -6
    Update for VC++to 

  BitKeeper/etc/ignore
    1.164 03/12/21 02:05:53 monty@mysql.com +1 -0
    added mysql_priv.h

ChangeSet
  1.1637 03/12/20 15:43:24 pem@mysql.comhem.se +3 -0
  Post-merge fixes.

  tests/client_test.c
    1.52 03/12/20 15:43:21 pem@mysql.com +2 -2
    Post-merge fixes.

  sql/sql_prepare.cc
    1.54 03/12/20 15:43:21 pem@mysql.com +7 -0
    Post-merge fixes.

  sql/sql_class.cc
    1.137 03/12/20 15:43:21 pem@mysql.com +0 -64
    Post-merge fixes.

ChangeSet
  1.1636 03/12/20 13:10:29 pem@mysql.com +8 -0
  Merge 4.1 to 5.0 (the prep stmt fixes in particular).

  sql/sql_prepare.cc
    1.53 03/12/20 13:10:27 pem@mysql.com +1 -2
    Merge 4.1 to 5.0 (the prep stmt fixes in particular).

  sql/sql_parse.cc
    1.322 03/12/20 13:10:27 pem@mysql.com +0 -3
    Merge 4.1 to 5.0 (the prep stmt fixes in particular).

  sql/sql_class.h
    1.177 03/12/20 13:10:27 pem@mysql.com +0 -131
    Merge 4.1 to 5.0 (the prep stmt fixes in particular).

  sql/sql_class.cc
    1.136 03/12/20 13:10:27 pem@mysql.com +3 -15
    Merge 4.1 to 5.0 (the prep stmt fixes in particular).

  sql/sql_delete.cc
    1.113 03/12/20 12:53:37 pem@mysql.com +0 -0
    Auto merged

  sql/slave.cc
    1.207 03/12/20 12:53:37 pem@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.208 03/12/20 12:53:37 pem@mysql.com +0 -0
    Auto merged

  libmysqld/lib_sql.cc
    1.83 03/12/20 12:53:36 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.1.86 03/12/20 13:48:35 heikki@hundin.mysql.fi +2 -0
  univ.i, srv0srv.c:
    Define macro ULINTPF which can be used in printf statements as the print format of ulint both on Win64 and other platforms

  innobase/include/univ.i
    1.33 03/12/20 13:47:04 heikki@hundin.mysql.fi +13 -19
    Define macro ULINTPF which can be used in printf statements as the print format of ulint both on Win64 and other platforms

  innobase/srv/srv0srv.c
    1.50 03/12/20 13:46:40 heikki@hundin.mysql.fi +15 -12
    Define macro ULINTPF which can be used in printf statements as the print format of ulint both on Win64 and other platforms

ChangeSet
  1.1616.1.85 03/12/20 13:13:55 heikki@hundin.mysql.fi +3 -0
  srv0start.c, univ.i, configure.in:
    Check at compilation time on Unix that InnoDB ulint is the same size as void*, and also check it at runtime

  innobase/srv/srv0start.c
    1.53 03/12/20 13:06:05 heikki@hundin.mysql.fi +8 -1
    Check at compilation time on Unix that InnoDB ulint is the same size as void*, and also check it at runtime

  innobase/include/univ.i
    1.32 03/12/20 13:05:56 heikki@hundin.mysql.fi +6 -0
    Check at compilation time on Unix that InnoDB ulint is the same size as void*, and also check it at runtime

  innobase/configure.in
    1.23 03/12/20 13:05:45 heikki@hundin.mysql.fi +1 -0
    Check at compilation time on Unix that InnoDB ulint is the same size as void*, and also check it at runtime

ChangeSet
  1.1616.1.84 03/12/20 03:42:17 monty@mysql.com +1 -0
  Merge fix

  sql/sql_delete.cc
    1.99.2.20 03/12/20 03:42:15 monty@mysql.com +0 -1
    Merge fix

ChangeSet
  1.1616.59.1 03/12/20 03:41:04 monty@mysql.com +49 -0
  Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
  A after merge fix for last merge

  sql/sql_delete.cc
    1.99.8.1 03/12/20 03:41:01 monty@mysql.com +1 -0
    After merge fix

  innobase/ut/ut0ut.c
    1.20 03/12/20 03:41:01 monty@mysql.com +5 -5
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/ut/ut0mem.c
    1.13 03/12/20 03:41:01 monty@mysql.com +8 -6
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/usr/usr0sess.c
    1.2 03/12/20 03:41:01 monty@mysql.com +2 -2
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/trx/trx0undo.c
    1.10 03/12/20 03:41:01 monty@mysql.com +9 -6
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/trx/trx0trx.c
    1.26 03/12/20 03:41:01 monty@mysql.com +12 -12
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/trx/trx0sys.c
    1.20 03/12/20 03:41:01 monty@mysql.com +12 -12
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/trx/trx0roll.c
    1.11 03/12/20 03:41:01 monty@mysql.com +13 -13
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/trx/trx0rec.c
    1.8 03/12/20 03:41:01 monty@mysql.com +19 -17
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/trx/trx0purge.c
    1.10 03/12/20 03:41:01 monty@mysql.com +13 -12
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/sync/sync0sync.c
    1.18 03/12/20 03:41:01 monty@mysql.com +17 -13
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/sync/sync0rw.c
    1.9 03/12/20 03:41:01 monty@mysql.com +11 -10
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/sync/sync0arr.c
    1.12 03/12/20 03:41:01 monty@mysql.com +20 -15
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/srv/srv0start.c
    1.52 03/12/20 03:41:01 monty@mysql.com +28 -24
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/srv/srv0srv.c
    1.49 03/12/20 03:41:01 monty@mysql.com +31 -28
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/row/row0undo.c
    1.7 03/12/20 03:41:01 monty@mysql.com +2 -1
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/row/row0sel.c
    1.41 03/12/20 03:41:01 monty@mysql.com +17 -14
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/row/row0mysql.c
    1.49 03/12/20 03:41:01 monty@mysql.com +17 -12
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
    Heikki, please check the change of % to %%

  innobase/rem/rem0rec.c
    1.6 03/12/20 03:41:01 monty@mysql.com +12 -10
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/rem/rem0cmp.c
    1.14 03/12/20 03:41:01 monty@mysql.com +2 -1
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/read/read0read.c
    1.4 03/12/20 03:41:01 monty@mysql.com +8 -8
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/page/page0page.c
    1.14 03/12/20 03:41:01 monty@mysql.com +62 -56
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/page/page0cur.c
    1.13 03/12/20 03:41:01 monty@mysql.com +4 -2
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/os/os0sync.c
    1.22 03/12/20 03:41:01 monty@mysql.com +3 -3
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/os/os0file.c
    1.61 03/12/20 03:41:01 monty@mysql.com +26 -21
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/mtr/mtr0mtr.c
    1.4 03/12/20 03:41:01 monty@mysql.com +5 -5
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/mtr/mtr0log.c
    1.6 03/12/20 03:41:01 monty@mysql.com +4 -4
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/mem/mem0pool.c
    1.14 03/12/20 03:41:01 monty@mysql.com +9 -8
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/mem/mem0dbg.c
    1.7 03/12/20 03:41:00 monty@mysql.com +16 -14
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/log/log0recv.c
    1.25 03/12/20 03:41:00 monty@mysql.com +63 -55
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/log/log0log.c
    1.28 03/12/20 03:41:00 monty@mysql.com +47 -42
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/lock/lock0lock.c
    1.25 03/12/20 03:41:00 monty@mysql.com +30 -25
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/include/univ.i
    1.31 03/12/20 03:41:00 monty@mysql.com +2 -1
    Disabled ut_sprintf/ut_fprintf. Not needed as all number arguments to printf are now casted
    

  innobase/ibuf/ibuf0ibuf.c
    1.20 03/12/20 03:41:00 monty@mysql.com +19 -11
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/ha/ha0ha.c
    1.9 03/12/20 03:41:00 monty@mysql.com +4 -3
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/fut/fut0lst.c
    1.3 03/12/20 03:41:00 monty@mysql.com +3 -2
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/fsp/fsp0fsp.c
    1.18 03/12/20 03:41:00 monty@mysql.com +27 -21
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/fil/fil0fil.c
    1.22 03/12/20 03:41:00 monty@mysql.com +61 -45
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/dict/dict0dict.c
    1.33 03/12/20 03:41:00 monty@mysql.com +14 -13
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/dict/dict0crea.c
    1.15 03/12/20 03:41:00 monty@mysql.com +12 -11
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/data/data0type.c
    1.7 03/12/20 03:41:00 monty@mysql.com +3 -3
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/data/data0data.c
    1.11 03/12/20 03:41:00 monty@mysql.com +10 -8
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/com/com0shm.c
    1.4 03/12/20 03:41:00 monty@mysql.com +3 -2
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/buf/buf0rea.c
    1.9 03/12/20 03:41:00 monty@mysql.com +14 -10
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/buf/buf0lru.c
    1.14 03/12/20 03:41:00 monty@mysql.com +24 -20
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/buf/buf0flu.c
    1.20 03/12/20 03:41:00 monty@mysql.com +7 -5
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/buf/buf0buf.c
    1.28 03/12/20 03:41:00 monty@mysql.com +66 -59
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/btr/btr0sea.c
    1.17 03/12/20 03:41:00 monty@mysql.com +12 -10
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

  innobase/btr/btr0btr.c
    1.24 03/12/20 03:41:00 monty@mysql.com +7 -6
    Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe

ChangeSet
  1.1616.1.83 03/12/20 03:06:33 konstantin@oak.local +1 -0
  one line was removed during merge

  sql/sql_delete.cc
    1.99.2.19 03/12/20 03:06:31 konstantin@mysql.com +1 -0
    one line was removed during merge

ChangeSet
  1.1635 03/12/20 00:40:07 guilhem@mysql.com +4 -0
  Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/mysql_src/mysql-5.0-new-binlog-format

  sql/sql_class.h
    1.176 03/12/20 00:40:00 guilhem@mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.135 03/12/20 00:39:59 guilhem@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.207 03/12/20 00:39:58 guilhem@mysql.com +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.101 03/12/20 00:39:57 guilhem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1624.1.40 03/12/20 00:38:30 guilhem@gbichot2 +8 -0
  Now merge is done.
  For previous commit I had run only rpl* tests, here the other ones had a 
  few surprises. Latest status:
  - all tests pass
  - all replication tests pass with Valgrind
  This is the final-final commit & push.
  Doc remains.

  sql/log_event.cc
    1.126 03/12/20 00:38:22 guilhem@mysql.com +6 -0
    a comment (noticed the problem by watching the results of
    mix_innodb_myisam_binlog.test)

  mysql-test/t/mysqlbinlog.test
    1.9 03/12/20 00:38:22 guilhem@mysql.com +2 -2
    position update

  mysql-test/t/mix_innodb_myisam_binlog.test
    1.6 03/12/20 00:38:22 guilhem@mysql.com +13 -13
    position update

  mysql-test/r/mysqlbinlog.result
    1.4 03/12/20 00:38:21 guilhem@mysql.com +14 -0
    result update

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.7 03/12/20 00:38:21 guilhem@mysql.com +71 -71
    result update

  mysql-test/r/insert_select.result
    1.17 03/12/20 00:38:21 guilhem@mysql.com +3 -3
    result update

  mysql-test/r/drop_temp_table.result
    1.5 03/12/20 00:38:21 guilhem@mysql.com +6 -6
    result update

  client/mysqlbinlog.cc
    1.86 03/12/20 00:38:20 guilhem@mysql.com +69 -17
    Making remote mysqlbinlog work with the new format of 5.0.0, and still be 
    able to talk to older servers.
    This is a quickfix, but now mysqlbinlog.test passes (mysqlbinlog seems to
    work in Valgrind, too).

ChangeSet
  1.1616.1.82 03/12/20 02:27:32 konstantin@mysql.com +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/kostja/mysql/mysql-4.1-prep_st_hack

  sql/sql_parse.cc
    1.271.1.43 03/12/20 02:27:29 konstantin@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.60 03/12/20 02:27:28 konstantin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.58.1 03/12/20 02:16:10 konstantin@oak.local +8 -0
  Prepared_statement deployed instead of PREP_STMT. 

  tests/client_test.c
    1.51 03/12/20 02:16:00 konstantin@mysql.com +1 -1
    Later in the test we rely on order of rows, which normally is not defined.
    My patch changes the order.

  sql/sql_prepare.cc
    1.34.1.30 03/12/20 02:16:00 konstantin@mysql.com +335 -258
    PREP_STMT replaced with Prepared_statement
    minor code cleanups

  sql/sql_parse.cc
    1.271.48.1 03/12/20 02:16:00 konstantin@mysql.com +3 -5
    thd->init_for_queries() doesn't exist any more
    comment moved to proper place 

  sql/sql_class.h
    1.146.1.58 03/12/20 02:16:00 konstantin@mysql.com +167 -41
    added Statement and Statement_map classes.
    PREP_STMT replaced with Statement (Prepared_statement) and moved to
    sql_prepare.cc

  sql/sql_class.cc
    1.105.1.36 03/12/20 02:16:00 konstantin@mysql.com +106 -34
    added Statement and Statement_map classes.
    PREP_STMT replaced with Statement (Prepared_statement) and moved to
    sql_prepare.cc

  sql/slave.cc
    1.188.1.36 03/12/20 02:16:00 konstantin@mysql.com +0 -1
    no thd->init_for_queries() any more

  sql/mysql_priv.h
    1.186.51.1 03/12/20 02:16:00 konstantin@mysql.com +1 -3
    removed declarations for non-existing functions

  libmysqld/lib_sql.cc
    1.75.1.18 03/12/20 02:16:00 konstantin@mysql.com +0 -87
    Prepared_statement now resides entirely in sql_prepare.cc
    Embedded versions of setup_params_data moved to sql_prepare.cc

ChangeSet
  1.1624.1.39 03/12/19 23:05:07 guilhem@mysql.com +18 -0
  Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/mysql_src/mysql-5.0-new-binlog-format

  sql/sql_repl.cc
    1.115 03/12/19 23:04:58 guilhem@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.175 03/12/19 23:04:57 guilhem@mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.130.1.8 03/12/19 23:04:56 guilhem@mysql.com +0 -0
    Auto merged

  sql/slave.cc
    1.206 03/12/19 23:04:55 guilhem@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.377 03/12/19 23:04:54 guilhem@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.206 03/12/19 23:04:53 guilhem@mysql.com +0 -0
    Auto merged

  sql/log_event.h
    1.91 03/12/19 23:04:52 guilhem@mysql.com +0 -0
    Auto merged

  sql/log_event.cc
    1.125 03/12/19 23:04:51 guilhem@mysql.com +0 -0
    Auto merged

  sql/log.cc
    1.119 03/12/19 23:04:50 guilhem@mysql.com +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.97.1.2 03/12/19 23:04:49 guilhem@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_trunc_binlog.test
    1.8 03/12/19 23:04:48 guilhem@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_rotate_logs.test
    1.49 03/12/19 23:04:47 guilhem@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_max_relay_size.test
    1.9 03/12/19 23:04:46 guilhem@mysql.com +0 -0
    Auto merged

  mysql-test/t/rpl_log_pos.test
    1.29 03/12/19 23:04:45 guilhem@mysql.com +0 -0
    Auto merged

  mysql-test/r/rpl_trunc_binlog.result
    1.10 03/12/19 23:04:44 guilhem@mysql.com +0 -0
    Auto merged

  mysql-test/r/rpl_rotate_logs.result
    1.54 03/12/19 23:04:43 guilhem@mysql.com +0 -0
    Auto merged

  mysql-test/r/rpl_max_relay_size.result
    1.13 03/12/19 23:04:42 guilhem@mysql.com +0 -0
    Auto merged

  include/my_sys.h
    1.117 03/12/19 23:04:41 guilhem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1634 03/12/20 00:54:38 sergefp@mysql.com +16 -0
  Merge mysql.com:/home/psergey/mysql-5.0-latest-pull
  into mysql.com:/dbdata/psergey/mysql-5.0-imerge-unique

  sql/uniques.cc
    1.21 03/12/20 00:54:36 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_update.cc
    1.101 03/12/20 00:54:36 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_union.cc
    1.87 03/12/20 00:54:36 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_select.cc
    1.235 03/12/20 00:54:35 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.172.1.3 03/12/20 00:54:35 sergefp@mysql.com +3 -3
    Auto merged

  sql/sql_class.cc
    1.134 03/12/20 00:54:35 sergefp@mysql.com +0 -0
    Auto merged

  sql/records.cc
    1.29 03/12/20 00:54:34 sergefp@mysql.com +0 -0
    Auto merged

  sql/opt_range.cc
    1.109 03/12/20 00:54:34 sergefp@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.204.1.2 03/12/20 00:54:34 sergefp@mysql.com +0 -0
    Auto merged

  sql/item_func.cc
    1.141 03/12/20 00:54:34 sergefp@mysql.com +0 -0
    Auto merged

  sql/item_create.cc
    1.42 03/12/20 00:54:33 sergefp@mysql.com +0 -0
    Auto merged

  sql/handler.h
    1.95 03/12/20 00:54:33 sergefp@mysql.com +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.100 03/12/20 00:54:33 sergefp@mysql.com +0 -0
    Auto merged

  sql/filesort.cc
    1.81 03/12/20 00:54:33 sergefp@mysql.com +0 -0
    Auto merged

  include/my_global.h
    1.54 03/12/20 00:54:32 sergefp@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.255 03/12/20 00:54:22 sergefp@mysql.com +0 -0
    auto-union

ChangeSet
  1.1633 03/12/20 00:53:14 sergefp@mysql.com +7 -0
  Numerous small fixes to index_merge read time estimates code

  sql/uniques.cc
    1.20 03/12/20 00:53:12 sergefp@mysql.com +117 -67
    Numerous small fixes to index_merge read time estimates code

  sql/sql_class.h
    1.172.1.2 03/12/20 00:53:12 sergefp@mysql.com +9 -1
    Numerous small fixes to index_merge read time estimates code

  sql/opt_range.cc
    1.108 03/12/20 00:53:12 sergefp@mysql.com +52 -37
    Numerous small fixes to index_merge read time estimates code

  sql/item_func.cc
    1.138.1.1 03/12/20 00:53:11 sergefp@mysql.com +1 -1
    Numerous small fixes to index_merge read time estimates code

  sql/item_create.cc
    1.40.1.1 03/12/20 00:53:11 sergefp@mysql.com +0 -4
    Numerous small fixes to index_merge read time estimates code

  mysql-test/r/index_merge.result
    1.5 03/12/20 00:53:11 sergefp@mysql.com +1 -1
    Numerous small fixes to index_merge read time estimates code

  include/my_global.h
    1.52.1.1 03/12/20 00:53:11 sergefp@mysql.com +11 -0
    Numerous small fixes to index_merge read time estimates code

ChangeSet
  1.1624.1.38 03/12/19 22:40:23 guilhem@gbichot2 +48 -0
  This is the final commit for Worklog tasks:
     * A more dynamic binlog format which allows small changes (1064)
     * Log session variables in Query_log_event (1063)
  It contains a few bugfixes (which I made when running the testsuite).
  I carefully updated the results of the testsuite (i.e. I checked for every one,
  if the difference between .reject and .result could be explained).
  Apparently mysql-test-run --manager is broken in 4.1 and 5.0 currently,
  so I could neither run the few tests which require --manager, nor check
  that they pass nor modify their .result. But for builds, we don't run
  with --manager.
  Apart from --manager, the full testsuite passes, with Valgrind too (no errors).
  I'm going to push in the next minutes. Remains: update the manual.
  Note: by chance I saw that (in 4.1, in 5.0) rpl_get_lock fails when run alone;
  this is normal at it makes assumptions on thread ids. I will fix this one day
  in 4.1.

  sql/sql_repl.cc
    1.114 03/12/19 22:31:01 guilhem@mysql.com +12 -9
    A mistake: I had passed a char* instead of char**

  sql/sql_class.h
    1.174 03/12/19 22:30:53 guilhem@mysql.com +7 -0
    a warning comment

  sql/slave.cc
    1.205 03/12/19 22:30:44 guilhem@mysql.com +50 -19
    * Fixes for a few bugs when ignoring events in the slave SQL thread:
      - do not decrement rli->slave_skip_counter if the event is an event
      related to the binlog or relay log itself (FORMAT_DESCRIPTION,
      ROTATE, STOP) because these events should never be skipped (or the slave
      will be confused). Usually the user wants to skip a query, not a Rotate... 
      - when we (re)connect to the master, we must free description_event_for_queue
      (otherwise memory leak when we reconnect). 
    * Changed a bit the code where we change description_event_for_queue,
    to make it look "safer".
    * Moved 'created=0' to log.cc where it is safer.
    * When the slave SQL thread finds a Rotate/Format_desc/Stop in the middle of
    a transaction (then these were written by the slave itself to its relay log),
    it should not increment rli->group* variables, but only rli->event* ones.

  sql/log_event.cc
    1.124 03/12/19 22:30:36 guilhem@mysql.com +54 -10
    * When the slave SQL thread finds a Rotate/Format_desc/Stop in the middle of
    a transaction (then these were written by the slave itself to its relay log),
    it should not increment rli->group* variables, but only rli->event* ones.
    * When the slave SQL thread finds a Format_desc not to be ignored (not
    the same server id as the slave's), if it has log_pos==0 it must not trigger
    "unfinished transaction in master's binlog" (log_pos==0 is always a marker
    in the relay log to mean "this event was not at this place in the master's
    binlog": it's for fake Rotate events, and for Format_description events which the master had
    to send us for replication to start).
    * In the Query_log_event on disk, catalog is now terminated by '\0'.
    * thd->catalog must be set to 0 when some exec_event() terminate (otherwise
    double free).

  sql/log.cc
    1.118 03/12/19 22:30:27 guilhem@mysql.com +9 -0
    Ensure that the Format_desc propagated on next relay logs does not trigger
    undue actions (like incrementing some positions or clearing some files).

  mysql-test/t/rpl_user_variables.test
    1.5 03/12/19 22:29:59 guilhem@mysql.com +1 -1
    position update

  mysql-test/t/rpl_until.test
    1.9 03/12/19 22:29:51 guilhem@mysql.com +5 -5
    position update

  mysql-test/t/rpl_trunc_binlog.test
    1.6.1.1 03/12/19 22:29:43 guilhem@mysql.com +1 -1
    relay log information is not repeatable in general (if a reconnection
    happens because --sleep=10 for example), so we hide these columns.

  mysql-test/t/rpl_session_var.test
    1.2 03/12/19 22:29:34 guilhem@mysql.com +1 -1
    100 because password() is longer than 10 chars

  mysql-test/t/rpl_rotate_logs.test
    1.47.1.1 03/12/19 22:29:26 guilhem@mysql.com +3 -3
    relay log information is not repeatable in general (if a reconnection
    happens because --sleep=10 for example), so we hide these columns.

  mysql-test/t/rpl_reset_slave.test
    1.5 03/12/19 22:29:17 guilhem@mysql.com +4 -4
    relay log information is not repeatable in general (if a reconnection
    happens because --sleep=10 for example), so we hide these columns.

  mysql-test/t/rpl_replicate_do.test
    1.20 03/12/19 22:29:09 guilhem@mysql.com +1 -1
    relay log information is not repeatable in general (if a reconnection
    happens because --sleep=10 for example), so we hide these columns.

  mysql-test/t/rpl_relayrotate.test
    1.8 03/12/19 22:29:00 guilhem@mysql.com +3 -1
    using max() is better for debugging (it shows at which place the slave
    SQL thread resumed)

  mysql-test/t/rpl_relayrotate-slave.opt
    1.2 03/12/19 22:28:52 guilhem@mysql.com +1 -2
    better options for this test

  mysql-test/t/rpl_redirect.test
    1.10 03/12/19 22:28:44 guilhem@mysql.com +1 -1
    relay log information is not repeatable in general (if a reconnection
    happens because --sleep=10 for example), so we hide these columns.

  mysql-test/t/rpl_openssl.test
    1.4 03/12/19 22:28:21 guilhem@mysql.com +2 -2
    relay log information is not repeatable in general (if a reconnection
    happens because --sleep=10 for example), so we hide these columns.

  mysql-test/t/rpl_max_relay_size.test
    1.7.1.1 03/12/19 22:28:13 guilhem@mysql.com +6 -6
    relay log information is not repeatable in general (if a reconnection
    happens because --sleep=10 for example), so we hide these columns.

  mysql-test/t/rpl_log_pos.test
    1.27.1.1 03/12/19 22:27:50 guilhem@mysql.com +5 -5
    position update

  mysql-test/t/rpl_log.test
    1.21 03/12/19 22:27:42 guilhem@mysql.com +5 -4
    position update

  mysql-test/t/rpl_loaddata_rule_s.test
    1.2 03/12/19 22:27:34 guilhem@mysql.com +1 -1
    position update

  mysql-test/t/rpl_loaddata_rule_m.test
    1.4 03/12/19 22:27:25 guilhem@mysql.com +1 -1
    position update

  mysql-test/t/rpl_loaddata.test
    1.12 03/12/19 22:27:17 guilhem@mysql.com +4 -4
    position update

  mysql-test/t/rpl_flush_log_loop.test
    1.7 03/12/19 22:27:09 guilhem@mysql.com +1 -1
    relay log information is not repeatable in general (if a reconnection
    happens because --sleep=10 for example), so we hide these columns.

  mysql-test/t/rpl_error_ignored_table.test
    1.5 03/12/19 22:27:00 guilhem@mysql.com +1 -1
    relay log information is not repeatable in general (if a reconnection
    happens because --sleep=10 for example), so we hide these columns.

  mysql-test/t/rpl_empty_master_crash.test
    1.7 03/12/19 22:26:52 guilhem@mysql.com +1 -1
    relay log information is not repeatable in general (if a reconnection
    happens because --sleep=10 for example), so we hide these columns.

  mysql-test/t/rpl_change_master.test
    1.6 03/12/19 22:26:43 guilhem@mysql.com +2 -2
    relay log information is not repeatable in general (if a reconnection
    happens because --sleep=10 for example), so we hide these columns.

  mysql-test/t/rpl000015.test
    1.26 03/12/19 22:26:35 guilhem@mysql.com +4 -4
    relay log information is not repeatable in general (if a reconnection
    happens because --sleep=10 for example), so we hide these columns.

  mysql-test/t/rpl000010-slave.opt
    1.5 03/12/19 22:26:27 guilhem@mysql.com +1 -1
    need to wait 2 events, because now we receive a Format_desc on top of the Rotate,
    when replication starts.

  mysql-test/r/rpl_user_variables.result
    1.6 03/12/19 22:26:18 guilhem@mysql.com +29 -29
    result update

  mysql-test/r/rpl_until.result
    1.11 03/12/19 22:26:10 guilhem@mysql.com +17 -17
    result update

  mysql-test/r/rpl_trunc_binlog.result
    1.8.1.1 03/12/19 22:25:47 guilhem@mysql.com +1 -1
    result update

  mysql-test/r/rpl_temporary.result
    1.9 03/12/19 22:25:39 guilhem@mysql.com +13 -13
    result update

  mysql-test/r/rpl_session_var.result
    1.2 03/12/19 22:25:31 guilhem@mysql.com +1 -1
    result update

  mysql-test/r/rpl_rotate_logs.result
    1.51.1.1 03/12/19 22:25:22 guilhem@mysql.com +5 -4
    result update

  mysql-test/r/rpl_reset_slave.result
    1.9 03/12/19 22:25:14 guilhem@mysql.com +4 -4
    result update

  mysql-test/r/rpl_replicate_do.result
    1.22 03/12/19 22:25:02 guilhem@mysql.com +1 -1
    result update

  mysql-test/r/rpl_relayrotate.result
    1.5 03/12/19 22:24:34 guilhem@mysql.com +5 -2
    result update

  mysql-test/r/rpl_max_relay_size.result
    1.11.1.1 03/12/19 22:24:25 guilhem@mysql.com +7 -7
    result update

  mysql-test/r/rpl_log_pos.result
    1.39 03/12/19 22:24:01 guilhem@mysql.com +7 -7
    result update

  mysql-test/r/rpl_log.result
    1.51 03/12/19 22:23:38 guilhem@mysql.com +57 -55
    result update

  mysql-test/r/rpl_loaddata_rule_s.result
    1.3 03/12/19 22:23:28 guilhem@mysql.com +2 -2
    result update

  mysql-test/r/rpl_loaddata_rule_m.result
    1.5 03/12/19 22:23:00 guilhem@mysql.com +2 -2
    result update

  mysql-test/r/rpl_loaddata.result
    1.21 03/12/19 22:22:38 guilhem@mysql.com +5 -5
    result update

  mysql-test/r/rpl_flush_tables.result
    1.5 03/12/19 22:22:29 guilhem@mysql.com +19 -19
    result update

  mysql-test/r/rpl_flush_log_loop.result
    1.14 03/12/19 22:22:21 guilhem@mysql.com +1 -1
    result update

  mysql-test/r/rpl_error_ignored_table.result
    1.9 03/12/19 22:21:53 guilhem@mysql.com +1 -1
    result update

  mysql-test/r/rpl_change_master.result
    1.9 03/12/19 22:21:44 guilhem@mysql.com +2 -2
    result update

  mysql-test/r/rpl000015.result
    1.31 03/12/19 22:21:35 guilhem@mysql.com +4 -4
    result update

ChangeSet
  1.1624.9.7 03/12/19 20:41:22 pem@mysql.comhem.se +1 -0
  Post merge fix.

  sql/sql_class.cc
    1.130.3.2 03/12/19 20:41:20 pem@mysql.com +0 -1
    Post merge fix.

ChangeSet
  1.1624.9.6 03/12/19 20:13:48 pem@mysql.com +33 -0
  Merging lex-pointer change from 4.1 to 5.0.

  sql/sql_yacc.yy
    1.270 03/12/19 20:13:44 pem@mysql.com +0 -13
    Merging lex-pointer change from 4.1 to 5.0.

  sql/sql_table.cc
    1.175 03/12/19 20:13:44 pem@mysql.com +0 -2
    Merging lex-pointer change from 4.1 to 5.0.

  sql/sql_select.cc
    1.231.1.5 03/12/19 20:13:44 pem@mysql.com +0 -15
    Merging lex-pointer change from 4.1 to 5.0.

  sql/sql_repl.cc
    1.112.1.1 03/12/19 20:13:44 pem@mysql.com +0 -15
    Merging lex-pointer change from 4.1 to 5.0.

  sql/sql_prepare.cc
    1.52 03/12/19 20:13:44 pem@mysql.com +0 -18
    Merging lex-pointer change from 4.1 to 5.0.

  sql/sql_parse.cc
    1.321 03/12/19 20:13:44 pem@mysql.com +0 -15
    Merging lex-pointer change from 4.1 to 5.0.

  sql/sql_lex.cc
    1.99 03/12/19 20:13:44 pem@mysql.com +0 -2
    Merging lex-pointer change from 4.1 to 5.0.

  sql/sql_class.h
    1.172.2.3 03/12/19 20:13:44 pem@mysql.com +0 -2
    Merging lex-pointer change from 4.1 to 5.0.

  sql/sql_class.cc
    1.130.3.1 03/12/19 20:13:44 pem@mysql.com +1 -3
    Merging lex-pointer change from 4.1 to 5.0.

  sql/sql_base.cc
    1.156 03/12/19 20:13:44 pem@mysql.com +0 -3
    Merging lex-pointer change from 4.1 to 5.0.

  sql/sql_acl.cc
    1.86 03/12/19 20:13:44 pem@mysql.com +0 -21
    Merging lex-pointer change from 4.1 to 5.0.

  sql/repl_failsafe.cc
    1.39 03/12/19 20:13:44 pem@mysql.com +0 -1
    Merging lex-pointer change from 4.1 to 5.0.

  sql/mysqld.cc
    1.375.1.3 03/12/19 20:13:44 pem@mysql.com +0 -4
    Merging lex-pointer change from 4.1 to 5.0.

  sql/item_create.cc
    1.41 03/12/19 20:13:44 pem@mysql.com +0 -7
    Merging lex-pointer change from 4.1 to 5.0.

  sql/item_cmpfunc.cc
    1.116 03/12/19 20:13:44 pem@mysql.com +0 -1
    Merging lex-pointer change from 4.1 to 5.0.

  sql/item.cc
    1.79 03/12/19 20:13:44 pem@mysql.com +0 -14
    Merging lex-pointer change from 4.1 to 5.0.

  sql/ha_myisam.cc
    1.126 03/12/19 20:13:44 pem@mysql.com +0 -2
    Merging lex-pointer change from 4.1 to 5.0.

  sql/sql_update.cc
    1.97.1.4 03/12/19 19:51:05 pem@mysql.com +0 -10
    Auto merged

  sql/sql_union.cc
    1.83.1.3 03/12/19 19:51:05 pem@mysql.com +0 -13
    Auto merged

  sql/sql_lex.h
    1.129 03/12/19 19:51:05 pem@mysql.com +0 -1
    Auto merged

  sql/sql_insert.cc
    1.99 03/12/19 19:51:05 pem@mysql.com +0 -5
    Auto merged

  sql/sql_error.cc
    1.19 03/12/19 19:51:05 pem@mysql.com +0 -1
    Auto merged

  sql/sql_delete.cc
    1.112 03/12/19 19:51:05 pem@mysql.com +0 -12
    Auto merged

  sql/sql_cache.cc
    1.58 03/12/19 19:51:04 pem@mysql.com +0 -6
    Auto merged

  sql/slave.cc
    1.203.1.2 03/12/19 19:51:04 pem@mysql.com +0 -1
    Auto merged

  sql/protocol.cc
    1.70 03/12/19 19:51:04 pem@mysql.com +0 -1
    Auto merged

  sql/mysql_priv.h
    1.204.2.3 03/12/19 19:51:04 pem@mysql.com +0 -4
    Auto merged

  sql/item_sum.cc
    1.95 03/12/19 19:51:04 pem@mysql.com +0 -3
    Auto merged

  sql/item_subselect.cc
    1.72 03/12/19 19:51:04 pem@mysql.com +0 -23
    Auto merged

  sql/item_func.cc
    1.140 03/12/19 19:51:04 pem@mysql.com +0 -3
    Auto merged

  sql/ha_innodb.cc
    1.97.2.2 03/12/19 19:51:03 pem@mysql.com +0 -2
    Auto merged

  sql/filesort.cc
    1.77.1.2 03/12/19 19:51:03 pem@mysql.com +0 -1
    Auto merged

  libmysqld/lib_sql.cc
    1.82 03/12/19 19:51:03 pem@mysql.com +0 -2
    Auto merged

ChangeSet
  1.1624.9.5 03/12/19 19:47:22 pem@mysql.comhem.se +3 -0
  Post-merge fixes.

  sql/sql_parse.cc
    1.320 03/12/19 19:47:18 pem@mysql.com +1 -1
    Post-merge fixes.

  sql/item_timefunc.cc
    1.55 03/12/19 19:47:18 pem@mysql.com +1 -4
    Post-merge fixes.

  mysql-test/r/func_time.result
    1.28 03/12/19 19:47:18 pem@mysql.com +57 -57
    Post-merge fixes.

ChangeSet
  1.1616.57.1 03/12/19 20:39:19 heikki@hundin.mysql.fi +3 -0
  univ.i, ut0ut.h, ut0ut.c:
    On 64-bit Windows use InnoDB's own printf function where %lu is converted to %I64u; this eliminates Intel compiler warnings on IA64

  innobase/include/univ.i
    1.30 03/12/19 20:38:11 heikki@hundin.mysql.fi +8 -5
    On 64-bit Windows use InnoDB's own printf function where %lu is converted to %I64u; this eliminates Intel compiler warnings on IA64

  innobase/include/ut0ut.h
    1.12 03/12/19 20:38:07 heikki@hundin.mysql.fi +38 -5
    On 64-bit Windows use InnoDB's own printf function where %lu is converted to %I64u; this eliminates Intel compiler warnings on IA64

  innobase/ut/ut0ut.c
    1.19 03/12/19 20:36:58 heikki@hundin.mysql.fi +207 -9
    On 64-bit Windows use InnoDB's own printf function where %lu is converted to %I64u; this eliminates Intel compiler warnings on IA64

ChangeSet
  1.1616.1.80 03/12/19 20:18:18 monty@mysql.com +3 -0
  merge with lex pointer change patch

  sql/sql_delete.cc
    1.99.2.18 03/12/19 20:18:16 monty@mysql.com +1 -3
    merge with lex pointer change patch

  sql/sql_parse.cc
    1.271.1.42 03/12/19 20:17:07 monty@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.59 03/12/19 20:17:07 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.56.1 03/12/19 19:16:26 monty@mysql.com +3 -0
  Fixed memory overrun bug in DELETE ... ORDER BY

  sql/sql_parse.cc
    1.271.47.1 03/12/19 19:16:23 monty@mysql.com +1 -1
    Fixed memory overrun bug in DELETE ... ORDER BY

  sql/sql_delete.cc
    1.99.7.1 03/12/19 19:16:23 monty@mysql.com +6 -6
    Fixed memory overrun bug in DELETE ... ORDER BY

  sql/mysql_priv.h
    1.186.50.1 03/12/19 19:16:23 monty@mysql.com +1 -1
    Fixed memory overrun bug in DELETE ... ORDER BY

ChangeSet
  1.1616.1.79 03/12/19 20:52:13 konstantin@oak.local +33 -0
  THD::lex now points to THD::main_lex like in 5.0
  All tests pass (client_test included)

  sql/sql_yacc.yy
    1.203.1.85 03/12/19 20:52:10 konstantin@mysql.com +13 -13
    THD::lex now points to THD::main_lex like in 5.0

  sql/sql_update.cc
    1.83.2.25 03/12/19 20:52:10 konstantin@mysql.com +11 -11
    THD::lex now points to THD::main_lex like in 5.0

  sql/sql_union.cc
    1.74.1.22 03/12/19 20:52:10 konstantin@mysql.com +13 -13
    THD::lex now points to THD::main_lex like in 5.0

  sql/sql_table.cc
    1.157.2.29 03/12/19 20:52:10 konstantin@mysql.com +3 -3
    THD::lex now points to THD::main_lex like in 5.0

  sql/sql_select.cc
    1.216.1.73 03/12/19 20:52:10 konstantin@mysql.com +15 -15
    THD::lex now points to THD::main_lex like in 5.0

  sql/sql_repl.cc
    1.102.1.20 03/12/19 20:52:10 konstantin@mysql.com +16 -16
    THD::lex now points to THD::main_lex like in 5.0

  sql/sql_prepare.cc
    1.34.1.29 03/12/19 20:52:09 konstantin@mysql.com +18 -18
    THD::lex now points to THD::main_lex like in 5.0

  sql/sql_parse.cc
    1.271.1.41 03/12/19 20:52:09 konstantin@mysql.com +15 -15
    THD::lex now points to THD::main_lex like in 5.0

  sql/sql_lex.h
    1.102.1.42 03/12/19 20:52:09 konstantin@mysql.com +1 -1
    THD::lex now points to THD::main_lex like in 5.0

  sql/sql_lex.cc
    1.97.1.1 03/12/19 20:52:09 konstantin@mysql.com +2 -2
    THD::lex now points to THD::main_lex like in 5.0

  sql/sql_insert.cc
    1.86.2.26 03/12/19 20:52:09 konstantin@mysql.com +5 -5
    THD::lex now points to THD::main_lex like in 5.0

  sql/sql_error.cc
    1.16.1.2 03/12/19 20:52:09 konstantin@mysql.com +1 -1
    THD::lex now points to THD::main_lex like in 5.0

  sql/sql_delete.cc
    1.99.2.17 03/12/19 20:52:09 konstantin@mysql.com +13 -13
    THD::lex now points to THD::main_lex like in 5.0

  sql/sql_class.h
    1.146.1.57 03/12/19 20:52:09 konstantin@mysql.com +2 -1
    THD::lex now points to THD::main_lex like in 5.0

  sql/sql_class.cc
    1.105.1.35 03/12/19 20:52:09 konstantin@mysql.com +3 -2
    THD::lex now points to THD::main_lex like in 5.0

  sql/sql_cache.cc
    1.46.1.15 03/12/19 20:52:09 konstantin@mysql.com +7 -7
    THD::lex now points to THD::main_lex like in 5.0

  sql/sql_base.cc
    1.145.1.26 03/12/19 20:52:09 konstantin@mysql.com +3 -3
    THD::lex now points to THD::main_lex like in 5.0

  sql/sql_acl.cc
    1.74.1.27 03/12/19 20:52:09 konstantin@mysql.com +21 -21
    THD::lex now points to THD::main_lex like in 5.0

  sql/slave.cc
    1.188.1.35 03/12/19 20:52:09 konstantin@mysql.com +1 -1
    THD::lex now points to THD::main_lex like in 5.0

  sql/repl_failsafe.cc
    1.32.1.14 03/12/19 20:52:09 konstantin@mysql.com +1 -1
    THD::lex now points to THD::main_lex like in 5.0

  sql/protocol.cc
    1.56.1.23 03/12/19 20:52:09 konstantin@mysql.com +1 -1
    THD::lex now points to THD::main_lex like in 5.0

  sql/mysqld.cc
    1.356.1.79 03/12/19 20:52:08 konstantin@mysql.com +5 -5
    THD::lex now points to THD::main_lex like in 5.0

  sql/mysql_priv.h
    1.186.1.58 03/12/19 20:52:08 konstantin@mysql.com +4 -4
    THD::lex now points to THD::main_lex like in 5.0

  sql/item_sum.cc
    1.89.1.9 03/12/19 20:52:08 konstantin@mysql.com +3 -3
    THD::lex now points to THD::main_lex like in 5.0

  sql/item_subselect.cc
    1.60.1.32 03/12/19 20:52:08 konstantin@mysql.com +23 -23
    THD::lex now points to THD::main_lex like in 5.0

  sql/item_func.cc
    1.124.1.50 03/12/19 20:52:08 konstantin@mysql.com +3 -3
    THD::lex now points to THD::main_lex like in 5.0

  sql/item_create.cc
    1.33.1.25 03/12/19 20:52:08 konstantin@mysql.com +7 -7
    THD::lex now points to THD::main_lex like in 5.0

  sql/item_cmpfunc.cc
    1.111.1.7 03/12/19 20:52:08 konstantin@mysql.com +1 -1
    THD::lex now points to THD::main_lex like in 5.0

  sql/item.cc
    1.58.1.52 03/12/19 20:52:08 konstantin@mysql.com +15 -15
    THD::lex now points to THD::main_lex like in 5.0

  sql/ha_myisam.cc
    1.115.1.16 03/12/19 20:52:08 konstantin@mysql.com +2 -2
    THD::lex now points to THD::main_lex like in 5.0

  sql/ha_innodb.cc
    1.90.1.21 03/12/19 20:52:08 konstantin@mysql.com +2 -2
    THD::lex now points to THD::main_lex like in 5.0

  sql/filesort.cc
    1.70.1.8 03/12/19 20:52:08 konstantin@mysql.com +1 -1
    THD::lex now points to THD::main_lex like in 5.0

  libmysqld/lib_sql.cc
    1.75.1.17 03/12/19 20:52:08 konstantin@mysql.com +2 -2
    THD::lex now points to THD::main_lex like in 5.0

ChangeSet
  1.1624.9.4 03/12/19 18:03:27 pem@mysql.com +81 -0
  Merge 4.1 to 5.0.

  sql/uniques.cc
    1.17.1.2 03/12/19 18:03:22 pem@mysql.com +0 -10
    Merge 4.1 to 5.0.

  sql/sql_table.cc
    1.174 03/12/19 18:03:22 pem@mysql.com +2 -3
    Merge 4.1 to 5.0.

  sql/sql_parse.cc
    1.319 03/12/19 18:03:22 pem@mysql.com +4 -6
    Merge 4.1 to 5.0.

  sql/sql_acl.cc
    1.85 03/12/19 18:03:22 pem@mysql.com +0 -0
    Merge 4.1 to 5.0.

  sql/share/ukrainian/errmsg.txt
    1.56 03/12/19 18:03:22 pem@mysql.com +2 -4
    Merge 4.1 to 5.0.

  sql/share/swedish/errmsg.txt
    1.94 03/12/19 18:03:22 pem@mysql.com +2 -4
    Merge 4.1 to 5.0.

  sql/share/spanish/errmsg.txt
    1.93 03/12/19 18:03:22 pem@mysql.com +2 -4
    Merge 4.1 to 5.0.

  sql/share/slovak/errmsg.txt
    1.93 03/12/19 18:03:22 pem@mysql.com +2 -4
    Merge 4.1 to 5.0.

  sql/share/serbian/errmsg.txt
    1.47 03/12/19 18:03:22 pem@mysql.com +2 -4
    Merge 4.1 to 5.0.

  sql/share/russian/errmsg.txt
    1.91 03/12/19 18:03:22 pem@mysql.com +2 -4
    Merge 4.1 to 5.0.

  sql/share/polish/errmsg.txt
    1.93 03/12/19 18:03:22 pem@mysql.com +2 -4
    Merge 4.1 to 5.0.

  sql/share/norwegian/errmsg.txt
    1.92 03/12/19 18:03:22 pem@mysql.com +2 -4
    Merge 4.1 to 5.0.

  sql/share/norwegian-ny/errmsg.txt
    1.92 03/12/19 18:03:22 pem@mysql.com +2 -4
    Merge 4.1 to 5.0.

  sql/share/korean/errmsg.txt
    1.92 03/12/19 18:03:22 pem@mysql.com +2 -4
    Merge 4.1 to 5.0.

  sql/share/japanese/errmsg.txt
    1.92 03/12/19 18:03:22 pem@mysql.com +2 -4
    Merge 4.1 to 5.0.

  sql/share/italian/errmsg.txt
    1.99 03/12/19 18:03:22 pem@mysql.com +2 -4
    Merge 4.1 to 5.0.

  sql/share/hungarian/errmsg.txt
    1.94 03/12/19 18:03:22 pem@mysql.com +2 -4
    Merge 4.1 to 5.0.

  sql/share/greek/errmsg.txt
    1.93 03/12/19 18:03:22 pem@mysql.com +2 -4
    Merge 4.1 to 5.0.

  sql/share/french/errmsg.txt
    1.92 03/12/19 18:03:22 pem@mysql.com +2 -4
    Merge 4.1 to 5.0.

  sql/share/estonian/errmsg.txt
    1.93 03/12/19 18:03:22 pem@mysql.com +2 -4
    Merge 4.1 to 5.0.

  sql/share/english/errmsg.txt
    1.100 03/12/19 18:03:22 pem@mysql.com +2 -4
    Merge 4.1 to 5.0.

  sql/share/dutch/errmsg.txt
    1.95 03/12/19 18:03:22 pem@mysql.com +2 -4
    Merge 4.1 to 5.0.

  sql/share/danish/errmsg.txt
    1.91 03/12/19 18:03:22 pem@mysql.com +2 -4
    Merge 4.1 to 5.0.

  mysql-test/r/mysqldump.result
    1.12 03/12/19 18:03:22 pem@mysql.com +0 -0
    Merge 4.1 to 5.0.

  mysql-test/r/func_time.result
    1.27 03/12/19 18:03:22 pem@mysql.com +57 -0
    Merge 4.1 to 5.0.

  sql/share/romanian/errmsg.txt
    1.90 03/12/19 17:34:58 pem@mysql.com +0 -0
    Auto merged

  sql/share/czech/errmsg.txt
    1.92 03/12/19 17:34:57 pem@mysql.com +0 -0
    Auto merged

  sql/table.h
    1.57 03/12/19 17:34:56 pem@mysql.com +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.269 03/12/19 17:34:56 pem@mysql.com +0 -0
    Auto merged

  sql/sql_update.cc
    1.97.1.3 03/12/19 17:34:56 pem@mysql.com +0 -0
    Auto merged

  sql/sql_show.cc
    1.135 03/12/19 17:34:56 pem@mysql.com +0 -0
    Auto merged

  sql/sql_select.cc
    1.231.1.4 03/12/19 17:34:56 pem@mysql.com +0 -0
    Auto merged

  sql/sql_rename.cc
    1.19 03/12/19 17:34:56 pem@mysql.com +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.51 03/12/19 17:34:56 pem@mysql.com +0 -0
    Auto merged

  sql/sql_load.cc
    1.55 03/12/19 17:34:56 pem@mysql.com +0 -0
    Auto merged

  sql/sql_insert.cc
    1.98 03/12/19 17:34:55 pem@mysql.com +0 -0
    Auto merged

  sql/sql_delete.cc
    1.111 03/12/19 17:34:55 pem@mysql.com +0 -0
    Auto merged

  sql/sql_db.cc
    1.77 03/12/19 17:34:55 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.172.2.2 03/12/19 17:34:55 pem@mysql.com +0 -0
    Auto merged

  sql/sql_cache.cc
    1.57 03/12/19 17:34:55 pem@mysql.com +0 -0
    Auto merged

  sql/sql_base.cc
    1.155 03/12/19 17:34:55 pem@mysql.com +0 -0
    Auto merged

  sql/sql_acl.h
    1.28 03/12/19 17:34:55 pem@mysql.com +0 -0
    Auto merged

  sql/slave.cc
    1.203.1.1 03/12/19 17:34:55 pem@mysql.com +0 -0
    Auto merged

  sql/set_var.cc
    1.48 03/12/19 17:34:55 pem@mysql.com +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.38 03/12/19 17:34:55 pem@mysql.com +0 -0
    Auto merged

  sql/records.cc
    1.25.1.1 03/12/19 17:34:55 pem@mysql.com +0 -0
    Auto merged

  sql/opt_range.cc
    1.100.1.4 03/12/19 17:34:55 pem@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.375.1.2 03/12/19 17:34:55 pem@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.204.2.2 03/12/19 17:34:54 pem@mysql.com +0 -0
    Auto merged

  sql/log_event.cc
    1.122.1.1 03/12/19 17:34:54 pem@mysql.com +0 -0
    Auto merged

  sql/log.cc
    1.116.1.1 03/12/19 17:34:54 pem@mysql.com +0 -0
    Auto merged

  sql/lex.h
    1.114 03/12/19 17:34:54 pem@mysql.com +0 -0
    Auto merged

  sql/item_timefunc.cc
    1.54 03/12/19 17:34:54 pem@mysql.com +0 -0
    Auto merged

  sql/item_sum.h
    1.51 03/12/19 17:34:54 pem@mysql.com +0 -0
    Auto merged

  sql/item_sum.cc
    1.94 03/12/19 17:34:54 pem@mysql.com +0 -0
    Auto merged

  sql/item_subselect.cc
    1.71 03/12/19 17:34:54 pem@mysql.com +0 -0
    Auto merged

  sql/item_func.h
    1.80 03/12/19 17:34:54 pem@mysql.com +0 -0
    Auto merged

  sql/item_func.cc
    1.139 03/12/19 17:34:54 pem@mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.115 03/12/19 17:34:54 pem@mysql.com +0 -0
    Auto merged

  sql/item.h
    1.74 03/12/19 17:34:54 pem@mysql.com +0 -0
    Auto merged

  sql/item.cc
    1.78 03/12/19 17:34:53 pem@mysql.com +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.97.2.1 03/12/19 17:34:53 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/query_cache.test
    1.31 03/12/19 17:34:53 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/multi_update.test
    1.30 03/12/19 17:34:53 pem@mysql.com +0 -1
    Auto merged

  mysql-test/t/insert.test
    1.15 03/12/19 17:34:53 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/func_time.test
    1.25 03/12/19 17:34:53 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/symlink.result
    1.15 03/12/19 17:34:53 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/query_cache.result
    1.37 03/12/19 17:34:53 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/multi_update.result
    1.29 03/12/19 17:34:53 pem@mysql.com +0 -1
    Auto merged

  mysql-test/r/join_outer.result
    1.27 03/12/19 17:34:53 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/insert.result
    1.16 03/12/19 17:34:53 pem@mysql.com +0 -0
    Auto merged

  myisam/mi_check.c
    1.115 03/12/19 17:34:53 pem@mysql.com +0 -0
    Auto merged

  libmysqld/lib_sql.cc
    1.81 03/12/19 17:34:53 pem@mysql.com +0 -0
    Auto merged

  libmysql/libmysql.c
    1.165 03/12/19 17:34:53 pem@mysql.com +0 -0
    Auto merged

  include/mysql_com.h
    1.79 03/12/19 17:34:53 pem@mysql.com +0 -0
    Auto merged

  include/my_pthread.h
    1.71 03/12/19 17:34:53 pem@mysql.com +0 -0
    Auto merged

  include/my_global.h
    1.53 03/12/19 17:34:53 pem@mysql.com +0 -0
    Auto merged

  client/mysqltest.c
    1.106 03/12/19 17:34:53 pem@mysql.com +0 -0
    Auto merged

  configure.in
    1.220 03/12/19 17:34:52 pem@mysql.com +0 -0
    Auto merged

  client/mysql.cc
    1.135 03/12/19 17:34:52 pem@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.250.1.4 03/12/19 17:34:44 pem@mysql.com +0 -0
    auto-union

ChangeSet
  1.1624.9.3 03/12/19 19:04:03 konstantin@oak.local +9 -0
  Implementation of SUM(DISTINCT), tests cases

  mysql-test/t/sum_distinct.test
    1.1 03/12/19 19:04:00 konstantin@mysql.com +188 -0

  mysql-test/r/sum_distinct.result
    1.1 03/12/19 19:04:00 konstantin@mysql.com +203 -0

  sql/uniques.cc
    1.17.1.1 03/12/19 19:04:00 konstantin@mysql.com +233 -1
    Implementation for Unique::reset(), Unique::walk() as well as for merge_walk() 
    algorithm.

  sql/sql_yacc.yy
    1.268 03/12/19 19:04:00 konstantin@mysql.com +11 -0
    parser extended to handle MIN(DISTICNT), MAX(DISTINCT), SUM(DISTINCT)

  sql/sql_sort.h
    1.5 03/12/19 19:04:00 konstantin@mysql.com +1 -0
    declaration for reuse_freed_buff() to be able to use it in uniques.cc

  sql/sql_class.h
    1.172.2.1 03/12/19 19:04:00 konstantin@mysql.com +12 -4
    added walk() and reset() methods to Unique, used in Item_sum_sum_distinct.

  sql/item_sum.h
    1.50 03/12/19 19:04:00 konstantin@mysql.com +36 -3
    New sum Item added - Item_sum_sum_distinct - for SUM(DISTINCT) function

  sql/item_sum.cc
    1.93 03/12/19 19:04:00 konstantin@mysql.com +116 -5
    Implementation of Item_sum_sum_distinct - SUM(DISTINCT) item, 
    which uses Unique to resolve duplicates

  sql/filesort.cc
    1.77.1.1 03/12/19 19:04:00 konstantin@mysql.com +34 -22
    Snippet of filesort() code moved to function reuse_freed_buff() - 
    change buffpek pointers to use buff from freed BUFFPEK
    Used in filesort() and merge_walk().

  mysql-test/t/sum_distinct.test
    1.0 03/12/19 19:04:00 konstantin@mysql.com +0 -0
    BitKeeper file /home/kostja/mysql/mysql-5.0-sum_distinct_clean/mysql-test/t/sum_distinct.test

  mysql-test/r/sum_distinct.result
    1.0 03/12/19 19:04:00 konstantin@mysql.com +0 -0
    BitKeeper file /home/kostja/mysql/mysql-5.0-sum_distinct_clean/mysql-test/r/sum_distinct.result

ChangeSet
  1.1616.1.78 03/12/19 19:15:25 bar@bar.intranet.mysql.r18.ru +2 -0
  Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1

ChangeSet
  1.1616.1.77 03/12/19 17:15:54 monty@mysql.com +5 -0
  after merge fixes

  mysql-test/t/type_decimal.test
    1.16 03/12/19 17:15:51 monty@mysql.com +2 -1
    after merge fixes

  mysql-test/t/auto_increment.test
    1.17 03/12/19 17:15:51 monty@mysql.com +1 -1
    after merge fixes

  mysql-test/r/type_enum.result
    1.16 03/12/19 17:15:51 monty@mysql.com +1 -0
    after merge fixes

  mysql-test/r/type_decimal.result
    1.20 03/12/19 17:15:50 monty@mysql.com +123 -0
    after merge fixes

  mysql-test/r/auto_increment.result
    1.22 03/12/19 17:15:50 monty@mysql.com +2 -2
    after merge fixes

  sql/sql_db.cc
    1.68.1.24 03/12/19 19:15:17 bar@bar.intranet.mysql.r18.ru +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.233.1.38 03/12/19 19:14:41 bar@bar.intranet.mysql.r18.ru +0 -0
    auto-union

ChangeSet
  1.1616.55.1 03/12/19 19:12:11 bar@bar.intranet.mysql.r18.ru +5 -0
  Fix for Bug#2151:
  "USE db"  affected the character set of further CREATE DATABASEs,
  which should have not happened.

  BitKeeper/etc/logging_ok
    1.233.17.1 03/12/19 19:12:11 bar@bar.intranet.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  mysql-test/t/ctype_create.test
    1.1 03/12/19 19:11:45 bar@bar.intranet.mysql.r18.ru +39 -0

  mysql-test/t/ctype_create.test
    1.0 03/12/19 19:11:45 bar@bar.intranet.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/t/ctype_create.test

  mysql-test/r/ctype_create.result
    1.1 03/12/19 19:11:44 bar@bar.intranet.mysql.r18.ru +20 -0

  sql/sql_db.cc
    1.68.4.1 03/12/19 19:11:44 bar@bar.intranet.mysql.r18.ru +4 -4
    Fix for Bug#2151:
    "USE db"  affected the character set of further CREATE DATABASEs,
    which should have not happened.

  mysql-test/r/ctype_create.result
    1.0 03/12/19 19:11:44 bar@bar.intranet.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/r/ctype_create.result

ChangeSet
  1.1616.1.76 03/12/19 16:42:17 monty@mysql.com +27 -0
  merge with 4.0.18

  sql/sql_select.cc
    1.216.1.72 03/12/19 16:42:15 monty@mysql.com +0 -24
    merge with 4.0.18

  sql/sql_parse.cc
    1.271.1.40 03/12/19 16:42:15 monty@mysql.com +0 -1
    merge with 4.0.18

  sql/mysqld.cc
    1.356.1.78 03/12/19 16:42:15 monty@mysql.com +0 -1
    merge with 4.0.18

  sql/field.cc
    1.126 03/12/19 16:42:15 monty@mysql.com +0 -1
    merge with 4.0.18

  mysql-test/r/type_decimal.result
    1.19 03/12/19 16:42:15 monty@mysql.com +0 -2
    merge with 4.0.18

  mysql-test/r/rpl_rotate_logs.result
    1.53 03/12/19 16:42:15 monty@mysql.com +3 -6
    merge with 4.0.18

  configure.in
    1.201.1.49 03/12/19 16:42:15 monty@mysql.com +0 -1
    merge with 4.0.18

  sql/share/slovak/errmsg.txt
    1.64.1.40 03/12/19 16:36:12 monty@mysql.com +0 -0
    Auto merged

  sql/share/romanian/errmsg.txt
    1.62.1.40 03/12/19 16:36:12 monty@mysql.com +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.63.1.40 03/12/19 16:36:12 monty@mysql.com +0 -0
    Auto merged

  sql/share/norwegian/errmsg.txt
    1.63.1.41 03/12/19 16:36:12 monty@mysql.com +0 -0
    Auto merged

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.40 03/12/19 16:36:12 monty@mysql.com +0 -0
    Auto merged

  sql/share/korean/errmsg.txt
    1.63.1.40 03/12/19 16:36:12 monty@mysql.com +0 -0
    Auto merged

  sql/share/japanese/errmsg.txt
    1.63.1.39 03/12/19 16:36:12 monty@mysql.com +0 -0
    Auto merged

  sql/share/hungarian/errmsg.txt
    1.65.1.39 03/12/19 16:36:12 monty@mysql.com +0 -0
    Auto merged

  sql/share/greek/errmsg.txt
    1.64.1.39 03/12/19 16:36:12 monty@mysql.com +0 -0
    Auto merged

  sql/share/french/errmsg.txt
    1.63.1.40 03/12/19 16:36:12 monty@mysql.com +0 -0
    Auto merged

  sql/slave.cc
    1.188.1.34 03/12/19 16:36:11 monty@mysql.com +0 -0
    Auto merged

  sql/share/estonian/errmsg.txt
    1.64.1.39 03/12/19 16:36:11 monty@mysql.com +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.70.1.43 03/12/19 16:36:11 monty@mysql.com +0 -0
    Auto merged

  sql/share/czech/errmsg.txt
    1.64.1.40 03/12/19 16:36:11 monty@mysql.com +0 -0
    Auto merged

  sql/opt_range.cc
    1.98.1.3 03/12/19 16:36:11 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/type_decimal.test
    1.15 03/12/19 16:36:10 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/auto_increment.test
    1.16 03/12/19 16:36:10 monty@mysql.com +0 -0
    Auto merged

  mysql-test/r/auto_increment.result
    1.21 03/12/19 16:36:10 monty@mysql.com +1 -2
    Auto merged

  client/mysql.cc
    1.121.1.31 03/12/19 16:36:10 monty@mysql.com +0 -0
    Auto merged

  Build-tools/Bootstrap
    1.13 03/12/19 16:36:10 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.1.75 03/12/19 16:34:48 monty@mysql.com +21 -0
  merge

  sql/sql_client.cc
    1.6 03/12/19 16:34:46 monty@mysql.com +0 -3
    merge

  sql-common/client.c
    1.46 03/12/19 16:34:46 monty@mysql.com +0 -3
    merge

  mysql-test/r/type_enum.result
    1.15 03/12/19 16:34:46 monty@mysql.com +1 -2
    merge

  libmysql/libmysql.c
    1.156.1.45 03/12/19 16:34:46 monty@mysql.com +10 -12
    merge

  include/mysql.h
    1.105 03/12/19 16:34:46 monty@mysql.com +0 -0
    merge

  sql/table.cc
    1.93 03/12/19 16:26:23 monty@mysql.com +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.203.1.84 03/12/19 16:26:23 monty@mysql.com +0 -0
    Auto merged

  sql/sql_table.cc
    1.157.2.28 03/12/19 16:26:23 monty@mysql.com +0 -0
    Auto merged

  sql/sql_show.cc
    1.122.1.19 03/12/19 16:26:22 monty@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.1.39 03/12/19 16:26:22 monty@mysql.com +0 -0
    Auto merged

  sql/set_var.cc
    1.34.1.53 03/12/19 16:26:22 monty@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.77 03/12/19 16:26:22 monty@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.57 03/12/19 16:26:22 monty@mysql.com +0 -0
    Auto merged

  sql/lex.h
    1.82.1.51 03/12/19 16:26:22 monty@mysql.com +0 -0
    Auto merged

  sql/field.cc
    1.125 03/12/19 16:26:22 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/type_enum.test
    1.9 03/12/19 16:26:21 monty@mysql.com +1 -1
    Auto merged

  mysql-test/r/warnings.result
    1.18 03/12/19 16:26:21 monty@mysql.com +0 -0
    Auto merged

  libmysqld/lib_sql.cc
    1.75.1.16 03/12/19 16:26:21 monty@mysql.com +0 -0
    Auto merged

  include/my_global.h
    1.47.1.7 03/12/19 16:26:21 monty@mysql.com +0 -0
    Auto merged

  client/mysqltest.c
    1.92.1.24 03/12/19 16:26:21 monty@mysql.com +0 -0
    Auto merged

  client/mysqldump.c
    1.108 03/12/19 16:26:21 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.52.2 03/12/19 16:25:50 monty@mysql.com +79 -0
  Fixes after merge with 4.0
  Cleaned up embedded library access and query cache handling
  Changed min stack size to 128K (to allow longer MyISAM keys)
  Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)

  sql/table.cc
    1.91.1.2 03/12/19 16:25:47 monty@mysql.com +2 -1
    After merge fixes

  sql/sql_yacc.yy
    1.203.1.83 03/12/19 16:25:47 monty@mysql.com +1 -1
    Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)

  sql/sql_update.cc
    1.83.2.24 03/12/19 16:25:47 monty@mysql.com +2 -1
    After merge fixes

  sql/sql_select.cc
    1.216.1.71 03/12/19 16:25:47 monty@mysql.com +1 -5
    After merge fixes

  sql/sql_prepare.cc
    1.34.1.28 03/12/19 16:25:47 monty@mysql.com +2 -2
    Add missing arguments

  sql/sql_parse.cc
    1.271.1.38 03/12/19 16:25:47 monty@mysql.com +96 -179
    After merge fixes
    Changed access check code for embedded library (needed to make code shorter and ensure that check_table_access() is called)
    Recoded create-table handling for CREATE TABLE ... SELECT to make code shorter and faster

  sql/sql_client.cc
    1.4.1.1 03/12/19 16:25:47 monty@mysql.com +2 -1
    After merge fixes

  sql/sql_base.cc
    1.145.1.25 03/12/19 16:25:47 monty@mysql.com +1 -1
    After merge fixes

  sql/sql_acl.h
    1.26.1.1 03/12/19 16:25:47 monty@mysql.com +5 -7
    Cleaned up embedded library acccess checks

  sql/share/ukrainian/errmsg.txt
    1.27.1.36 03/12/19 16:25:47 monty@mysql.com +2 -2
    Better error message

  sql/share/swedish/errmsg.txt
    1.64.1.39 03/12/19 16:25:47 monty@mysql.com +2 -2
    Better error message

  sql/share/spanish/errmsg.txt
    1.64.1.40 03/12/19 16:25:47 monty@mysql.com +2 -2
    Better error message

  sql/share/slovak/errmsg.txt
    1.64.1.39 03/12/19 16:25:46 monty@mysql.com +2 -2
    Better error message

  sql/share/serbian/errmsg.txt
    1.18.1.37 03/12/19 16:25:46 monty@mysql.com +2 -2
    Better error message

  sql/share/russian/errmsg.txt
    1.61.1.37 03/12/19 16:25:46 monty@mysql.com +2 -2
    Better error message

  sql/share/romanian/errmsg.txt
    1.62.1.39 03/12/19 16:25:46 monty@mysql.com +2 -2
    Better error message

  sql/share/polish/errmsg.txt
    1.63.1.39 03/12/19 16:25:46 monty@mysql.com +2 -2
    Better error message

  sql/share/norwegian/errmsg.txt
    1.63.1.40 03/12/19 16:25:46 monty@mysql.com +2 -2
    Better error message

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.39 03/12/19 16:25:46 monty@mysql.com +2 -2
    Better error message

  sql/share/korean/errmsg.txt
    1.63.1.39 03/12/19 16:25:46 monty@mysql.com +2 -2
    Better error message

  sql/share/japanese/errmsg.txt
    1.63.1.38 03/12/19 16:25:46 monty@mysql.com +2 -2
    Better error message

  sql/share/italian/errmsg.txt
    1.70.1.40 03/12/19 16:25:46 monty@mysql.com +2 -2
    Better error message

  sql/share/hungarian/errmsg.txt
    1.65.1.38 03/12/19 16:25:46 monty@mysql.com +2 -2
    Better error message

  sql/share/greek/errmsg.txt
    1.64.1.38 03/12/19 16:25:46 monty@mysql.com +2 -2
    Better error message

  sql/share/french/errmsg.txt
    1.63.1.39 03/12/19 16:25:46 monty@mysql.com +2 -2
    Better error message

  sql/share/estonian/errmsg.txt
    1.64.1.38 03/12/19 16:25:46 monty@mysql.com +2 -2
    Better error message

  sql/share/english/errmsg.txt
    1.70.1.42 03/12/19 16:25:46 monty@mysql.com +2 -2
    Better error message

  sql/share/dutch/errmsg.txt
    1.66.1.39 03/12/19 16:25:46 monty@mysql.com +2 -2
    Better error message

  sql/share/danish/errmsg.txt
    1.62.1.39 03/12/19 16:25:46 monty@mysql.com +2 -2
    Better error message

  sql/share/czech/errmsg.txt
    1.64.1.39 03/12/19 16:25:46 monty@mysql.com +2 -2
    Better error message

  sql/set_var.cc
    1.34.29.1 03/12/19 16:25:46 monty@mysql.com +3 -3
    Fixed compiler warnings

  sql/mysqld.cc
    1.356.1.76 03/12/19 16:25:46 monty@mysql.com +1 -1
    Changed min stack size to 128K (to allow longer MyISAM keys)

  sql/mysql_priv.h
    1.186.1.56 03/12/19 16:25:46 monty@mysql.com +0 -6
    Cleanup embedded library access checks

  sql/item_sum.h
    1.48.1.2 03/12/19 16:25:45 monty@mysql.com +1 -1
    After merge fixes

  sql/item_sum.cc
    1.89.1.8 03/12/19 16:25:45 monty@mysql.com +6 -6
    Changed automatic int conversion to be of type binary

  sql/item_subselect.cc
    1.60.1.31 03/12/19 16:25:45 monty@mysql.com +8 -8
    Indentation fixes

  sql/item_strfunc.cc
    1.150 03/12/19 16:25:45 monty@mysql.com +7 -1
    Added comments

  sql/item_func.h
    1.68.1.29 03/12/19 16:25:45 monty@mysql.com +2 -1
    After merge fixes

  sql/item_func.cc
    1.124.1.49 03/12/19 16:25:45 monty@mysql.com +16 -15
    Changed automatic int conversion to be of type binary

  sql/item.h
    1.56.1.51 03/12/19 16:25:45 monty@mysql.com +1 -0
    After merge fixes

  sql/item.cc
    1.58.1.51 03/12/19 16:25:45 monty@mysql.com +2 -2
    Changed automatic int conversion to be of type binary

  sql/ha_innodb.cc
    1.90.1.20 03/12/19 16:25:45 monty@mysql.com +0 -2
    Remove duplicate include files

  sql/field.h
    1.89 03/12/19 16:25:45 monty@mysql.com +6 -5
    After merge fixes

  sql/field.cc
    1.123.1.2 03/12/19 16:25:45 monty@mysql.com +3 -4
    After merge fixes

  sql-common/client.c
    1.44.1.1 03/12/19 16:25:45 monty@mysql.com +5 -2
    Part of 4.0 merge

  mysys/my_handler.c
    1.10 03/12/19 16:25:45 monty@mysql.com +8 -0
    part of 4.0 merge

  mysys/charset.c
    1.107 03/12/19 16:25:45 monty@mysql.com +51 -25
    Check results from my_once_alloc()

  mysql-test/t/union.test
    1.52 03/12/19 16:25:45 monty@mysql.com +1 -2
    Cleanup

  mysql-test/t/rpl_multi_update.test
    1.2 03/12/19 16:25:45 monty@mysql.com +2 -3
    Fix test for 4.1

  mysql-test/t/rpl_EE_error.test
    1.2 03/12/19 16:25:45 monty@mysql.com +2 -2
    Fix test for 4.1

  mysql-test/t/mysqldump.test
    1.9 03/12/19 16:25:45 monty@mysql.com +4 -4
    Fix test for 4.1

  mysql-test/t/multi_update.test
    1.26.1.3 03/12/19 16:25:45 monty@mysql.com +1 -2
    Fix test for 4.1

  mysql-test/t/innodb.test
    1.52 03/12/19 16:25:45 monty@mysql.com +8 -4
    Fix test for 4.1

  mysql-test/t/bdb.test
    1.32 03/12/19 16:25:45 monty@mysql.com +2 -2
    Fix test for 4.1

  mysql-test/r/warnings.result
    1.16.1.1 03/12/19 16:25:45 monty@mysql.com +2 -2
    Update results

  mysql-test/r/union.result
    1.54 03/12/19 16:25:45 monty@mysql.com +2 -1
    Update results

  mysql-test/r/type_timestamp.result
    1.12 03/12/19 16:25:45 monty@mysql.com +19 -22
    Update results

  mysql-test/r/type_enum.result
    1.13.1.2 03/12/19 16:25:45 monty@mysql.com +4 -0
    Fixed bugs found after merge

  mysql-test/r/type_decimal.result
    1.18 03/12/19 16:25:45 monty@mysql.com +2 -0
    Update results

  mysql-test/r/type_datetime.result
    1.17 03/12/19 16:25:45 monty@mysql.com +6 -0
    Update results

  mysql-test/r/type_blob.result
    1.32 03/12/19 16:25:45 monty@mysql.com +1 -1
    Update results

  mysql-test/r/symlink.result
    1.11.1.4 03/12/19 16:25:45 monty@mysql.com +5 -3
    Update results

  mysql-test/r/rpl_multi_update.result
    1.2 03/12/19 16:25:45 monty@mysql.com +4 -5
    Fixed bugs found after merge

  mysql-test/r/rpl_EE_error.result
    1.2 03/12/19 16:25:45 monty@mysql.com +5 -5
    Fixed bugs found after merge

  mysql-test/r/mysqldump.result
    1.9.1.4 03/12/19 16:25:45 monty@mysql.com +25 -23
    Update results

  mysql-test/r/multi_update.result
    1.25.1.3 03/12/19 16:25:45 monty@mysql.com +1 -1
    Fixed bugs found after merge

  mysql-test/r/loaddata.result
    1.9 03/12/19 16:25:45 monty@mysql.com +9 -1
    Fixed bugs found after merge

  mysql-test/r/join_outer.result
    1.24.1.3 03/12/19 16:25:44 monty@mysql.com +4 -5
    Fixed bugs found after merge

  mysql-test/r/insert.result
    1.12.1.5 03/12/19 16:25:44 monty@mysql.com +0 -1
    Fixed bugs found after merge

  mysql-test/r/innodb.result
    1.78 03/12/19 16:25:44 monty@mysql.com +25 -23
    Fixed bugs found after merge

  mysql-test/r/group_by.result
    1.37 03/12/19 16:25:44 monty@mysql.com +6 -5
    Fixed bugs found after merge

  mysql-test/r/func_time.result
    1.23.1.3 03/12/19 16:25:44 monty@mysql.com +109 -0
    Fixed bugs found after merge

  mysql-test/r/func_str.result
    1.50 03/12/19 16:25:44 monty@mysql.com +337 -0
    Fixed bugs found after merge

  mysql-test/r/func_group.result
    1.25 03/12/19 16:25:44 monty@mysql.com +7 -8
    Fixed bugs found after merge

  mysql-test/r/bdb.result
    1.32 03/12/19 16:25:44 monty@mysql.com +2 -2
    Fixed bugs found after merge

  mysql-test/r/auto_increment.result
    1.20 03/12/19 16:25:44 monty@mysql.com +26 -26
    Fixed bugs found after merge

  myisam/mi_check.c
    1.105.1.18 03/12/19 16:25:44 monty@mysql.com +3 -2
    Removed not used variable

  include/mysql_embed.h
    1.9 03/12/19 16:25:44 monty@mysql.com +2 -0
    Disable query cache when using embedded version

  client/mysqldump.c
    1.107 03/12/19 16:25:44 monty@mysql.com +8 -17
    Fixed bugs found after merge

ChangeSet
  1.1616.54.1 03/12/19 12:47:10 lenz@kallisto.local +1 -0
   - removed empty file mysql-test/t/rpl_temporary-master.opt

  BitKeeper/deleted/.del-rpl_temporary-master.opt~545ad67e7e74bbe0
    1.2 03/12/19 12:45:06 lenz@mysql.com +0 -0
    Delete: mysql-test/t/rpl_temporary-master.opt

ChangeSet
  1.1616.1.73 03/12/19 14:12:29 ram@gw.mysql.r18.ru +2 -0
  MYSQL_UNIVERSAL_CLIENT_CHARSET definition has been added.

  include/my_global.h
    1.47.3.1 03/12/19 14:12:25 ram@gw.mysql.r18.ru +6 -0
    MYSQL_UNIVERSAL_CLIENT_CHARSET definition has been added.

  client/mysqldump.c
    1.105.1.1 03/12/19 14:12:25 ram@gw.mysql.r18.ru +1 -5
    MYSQL_UNIVERSAL_CLIENT_CHARSET definition has been added.

ChangeSet
  1.1632 03/12/18 21:07:19 sergefp@mysql.com +6 -0
  Post-merge fixes and code cleanup

  sql/uniques.cc
    1.19 03/12/18 21:07:17 sergefp@mysql.com +23 -11
    Post-merge fixes and code cleanup

  sql/opt_range.cc
    1.107 03/12/18 21:07:17 sergefp@mysql.com +38 -29
    Post-merge fixes and code cleanup

  mysql-test/t/index_merge_innodb2.test
    1.2 03/12/18 21:07:17 sergefp@mysql.com +1 -1
    Post-merge fixes and code cleanup

  mysql-test/t/index_merge_bdb.test
    1.2 03/12/18 21:07:17 sergefp@mysql.com +1 -1
    Post-merge fixes and code cleanup

  mysql-test/r/index_merge_innodb2.result
    1.2 03/12/18 21:07:17 sergefp@mysql.com +1 -1
    Post-merge fixes and code cleanup

  mysql-test/r/index_merge_bdb.result
    1.2 03/12/18 21:07:17 sergefp@mysql.com +1 -1
    Post-merge fixes and code cleanup

ChangeSet
  1.1624.9.2 03/12/18 18:50:07 pem@mysql.comhem.se +2 -0
  Post-merge fix.

  mysql-test/t/multi_update.test
    1.29 03/12/18 18:50:04 pem@mysql.com +4 -4
    Post-merge fix.

  mysql-test/r/multi_update.result
    1.28 03/12/18 18:50:04 pem@mysql.com +4 -4
    Post-merge fix.

ChangeSet
  1.1624.9.1 03/12/18 17:51:43 pem@mysql.com +20 -0
  Merge

  sql/sql_yacc.yy
    1.267 03/12/18 17:51:40 pem@mysql.com +0 -0
    SCCS merged

  include/sql_state.h
    1.13 03/12/18 17:51:40 pem@mysql.com +0 -0
    SCCS merged

  sql/udf_example.cc
    1.17 03/12/18 17:49:17 pem@mysql.com +0 -0
    Auto merged

  sql/sql_table.cc
    1.173 03/12/18 17:49:17 pem@mysql.com +0 -0
    Auto merged

  sql/sql_show.cc
    1.134 03/12/18 17:49:17 pem@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.318 03/12/18 17:49:16 pem@mysql.com +0 -0
    Auto merged

  sql/sql_lex.h
    1.128 03/12/18 17:49:16 pem@mysql.com +0 -0
    Auto merged

  sql/set_var.cc
    1.47 03/12/18 17:49:16 pem@mysql.com +0 -0
    Auto merged

  sql/net_serv.cc
    1.65 03/12/18 17:49:16 pem@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.375.1.1 03/12/18 17:49:16 pem@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.204.2.1 03/12/18 17:49:15 pem@mysql.com +0 -0
    Auto merged

  sql/lex.h
    1.113 03/12/18 17:49:15 pem@mysql.com +0 -0
    Auto merged

  sql/handler.h
    1.92.1.1 03/12/18 17:49:15 pem@mysql.com +0 -0
    Auto merged

  sql/handler.cc
    1.107 03/12/18 17:49:15 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/variables.test
    1.25 03/12/18 17:49:15 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/variables.result
    1.41 03/12/18 17:49:15 pem@mysql.com +0 -0
    Auto merged

  libmysqld/lib_sql.cc
    1.80 03/12/18 17:49:15 pem@mysql.com +0 -0
    Auto merged

  libmysql/libmysql.c
    1.164 03/12/18 17:49:15 pem@mysql.com +0 -0
    Auto merged

  include/mysqld_error.h
    1.90 03/12/18 17:49:15 pem@mysql.com +0 -0
    Auto merged

  client/mysqltest.c
    1.105 03/12/18 17:49:15 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.1.72 03/12/18 17:46:56 pem@mysql.comhem.se +1 -0
  Corrected faulty #if tests in udf_example.cc which made udf_test crash the server on some
  platforms.

  sql/udf_example.cc
    1.14.1.1 03/12/18 17:46:53 pem@mysql.com +4 -4
    Corrected faulty #if tests which made udf_test crash the server on some
    platforms.

ChangeSet
  1.1346.1.325 03/12/18 16:50:01 monty@mysql.com +1 -0
  Fixed that lower_case_table_names is set to 1 for case insensitive file systems.

  sql/mysqld.cc
    1.297.1.176 03/12/18 16:49:59 monty@mysql.com +2 -1
    Fixed that lower_case_table_names is set to 1 for case insensitive file systems.

ChangeSet
  1.1616.1.70 03/12/18 18:12:00 hf@deer.(none) +2 -0
  Fix for #2126
  additional changes (after discussion with Monty)

  sql/client_settings.h
    1.14 03/12/18 18:11:58 hf@deer.(none) +1 -1
    0 is more relevant here

  libmysql/libmysql.c
    1.156.9.2 03/12/18 18:11:58 hf@deer.(none) +1 -1
    it's good to check my_thread_init() result as well

ChangeSet
  1.1631 03/12/18 17:01:35 psergey@psergey-rh8.(none) +8 -0
  Merge psergey-rh8.(none):/home/psergey/mysql-5.0-latest-pull
  into psergey-rh8.(none):/home/psergey/mysql-5.0-imerge-unique

  BitKeeper/etc/logging_ok
    1.254 03/12/18 17:01:34 psergey@psergey-rh8.(none) +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_update.cc
    1.100 03/12/18 17:01:22 psergey@psergey-rh8.(none) +0 -0
    Auto merged

  sql/sql_select.cc
    1.234 03/12/18 17:01:22 psergey@psergey-rh8.(none) +0 -0
    Auto merged

  sql/sql_class.h
    1.172.1.1 03/12/18 17:01:22 psergey@psergey-rh8.(none) +0 -0
    Auto merged

  sql/sql_class.cc
    1.133 03/12/18 17:01:21 psergey@psergey-rh8.(none) +0 -0
    Auto merged

  sql/opt_range.cc
    1.106 03/12/18 17:01:21 psergey@psergey-rh8.(none) +1 -1
    Auto merged

  sql/mysql_priv.h
    1.204.1.1 03/12/18 17:01:21 psergey@psergey-rh8.(none) +0 -0
    Auto merged

  mysql-test/r/index_merge_innodb.result
    1.3 03/12/18 17:01:21 psergey@psergey-rh8.(none) +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.253 03/12/18 17:01:09 psergey@psergey-rh8.(none) +0 -0
    auto-union

ChangeSet
  1.1346.1.324 03/12/18 15:24:21 monty@mysql.com +2 -0
  Removed compiler warning
  Fixed not updated test from last changeset

  sql/mysqld.cc
    1.297.1.175 03/12/18 15:24:18 monty@mysql.com +4 -3
    Cleaned up pid file handling (to remove compiler warning)

  mysql-test/r/auto_increment.result
    1.8.1.2 03/12/18 15:24:18 monty@mysql.com +1 -1
    Updated results

ChangeSet
  1.1346.1.323 03/12/18 14:40:19 monty@mysql.com +3 -0
  Simple cleanups

  sql/sql_select.cc
    1.152.1.118 03/12/18 14:40:16 monty@mysql.com +24 -28
    Removed indentation level (This will also make merges into 4.1 easier)

  sql/opt_range.cc
    1.54.1.38 03/12/18 14:40:16 monty@mysql.com +0 -1
    Removed not used variable

  mysql-test/t/auto_increment.test
    1.5.1.3 03/12/18 14:40:16 monty@mysql.com +1 -1
    Fixed wrong comment

ChangeSet
  1.1616.53.1 03/12/18 13:56:13 jani@rhols221.arenanet.fi +1 -0
  Removed unneccessary sprintf call and a variable.

  client/mysqltest.c
    1.92.1.23 03/12/18 13:56:10 jani@rhols221.arenanet.fi +3 -3
    Removed unneccessary sprintf call and a variable.

ChangeSet
  1.1616.1.69 03/12/18 15:51:22 hf@deer.(none) +12 -0
  Fix for #2126 (mysql_server_init call shouldn't be needed)
  now mysql_server_init is called from mysql_init with fake parameters
  mysql_once_init code included to mysql_server_init.
  embedded-specific initialization is in init_embedded_server function

  sql/sql_client.cc
    1.5 03/12/18 15:50:58 hf@deer.(none) +0 -5
    not needed now

  sql/net_serv.cc
    1.63.1.1 03/12/18 15:50:58 hf@deer.(none) +6 -0
    we need MYSQL_CLIENT defined in embedded server

  sql/client_settings.h
    1.13 03/12/18 15:50:58 hf@deer.(none) +2 -0
    fake mysql_server_init for server code

  sql-common/client.c
    1.45 03/12/18 15:50:58 hf@deer.(none) +2 -1
    mysql_server_init now called from mysql_init

  libmysqld/libmysqld.c
    1.56 03/12/18 15:50:58 hf@deer.(none) +3 -11
    check for server_inited not needed now

  libmysqld/lib_sql.cc
    1.75.2.1 03/12/18 15:50:58 hf@deer.(none) +3 -19
    mysql_server_init -> init_embedded_server
    mysql_server_end  -> end_embedded_server

  libmysqld/embedded_priv.h
    1.10 03/12/18 15:50:58 hf@deer.(none) +0 -1
    declaration deleted

  libmysql/libmysql.c
    1.156.9.1 03/12/18 15:50:58 hf@deer.(none) +5 -12
    mysql_once_init -> mysql_server_init transformations

  libmysql/errmsg.c
    1.25 03/12/18 15:50:58 hf@deer.(none) +0 -3
    this error won't happen

  libmysql/client_settings.h
    1.16 03/12/18 15:50:58 hf@deer.(none) +11 -0
    declaration of init_embedded_server/end_embedded_server added

  include/mysql.h
    1.103.1.1 03/12/18 15:50:58 hf@deer.(none) +0 -3
    declarations removed

  include/errmsg.h
    1.19 03/12/18 15:50:58 hf@deer.(none) +1 -2
    this error won't happen

ChangeSet
  1.1630 03/12/18 06:08:00 sergefp@mysql.com +13 -0
  Precise read time estimates for index_merge/Unique

  sql/uniques.cc
    1.18 03/12/18 06:07:58 sergefp@mysql.com +182 -0
    Precise read time estimates for index_merge/Unique

  sql/sql_class.h
    1.171.1.1 03/12/18 06:07:58 sergefp@mysql.com +2 -1
    Precise read time estimates for index_merge/Unique

  sql/records.cc
    1.28 03/12/18 06:07:58 sergefp@mysql.com +0 -1
    Precise read time estimates for index_merge/Unique

  sql/opt_range.h
    1.34 03/12/18 06:07:58 sergefp@mysql.com +56 -50
    Precise read time estimates for index_merge/Unique

  sql/opt_range.cc
    1.105 03/12/18 06:07:58 sergefp@mysql.com +338 -153
    Precise read time estimates for index_merge/Unique

  sql/mysql_priv.h
    1.203.1.1 03/12/18 06:07:58 sergefp@mysql.com +20 -0
    Precise read time estimates for index_merge/Unique

  sql/handler.h
    1.94 03/12/18 06:07:58 sergefp@mysql.com +2 -2
    Precise read time estimates for index_merge/Unique

  sql/ha_innodb.h
    1.59 03/12/18 06:07:58 sergefp@mysql.com +1 -1
    Precise read time estimates for index_merge/Unique

  sql/ha_innodb.cc
    1.99 03/12/18 06:07:58 sergefp@mysql.com +2 -1
    Precise read time estimates for index_merge/Unique

  sql/ha_berkeley.h
    1.59 03/12/18 06:07:58 sergefp@mysql.com +1 -1
    Precise read time estimates for index_merge/Unique

  sql/filesort.cc
    1.80 03/12/18 06:07:58 sergefp@mysql.com +4 -4
    Precise read time estimates for index_merge/Unique

  mysql-test/t/index_merge.test
    1.3 03/12/18 06:07:58 sergefp@mysql.com +1 -1
    Precise read time estimates for index_merge/Unique

  mysql-test/r/index_merge.result
    1.4 03/12/18 06:07:58 sergefp@mysql.com +1 -1
    Precise read time estimates for index_merge/Unique

ChangeSet
  1.1624.8.1 03/12/18 01:09:05 guilhem@gbichot2 +17 -0
  This will be pushed only after I fix the testsuite.
  This is the main commit for Worklog tasks:
   * A more dynamic binlog format which allows small changes (1064)
   * Log session variables in Query_log_event (1063)
  Below 5.0 means 5.0.0.
  MySQL 5.0 is able to replicate FOREIGN_KEY_CHECKS, UNIQUE_KEY_CHECKS (for speed),
  SQL_AUTO_IS_NULL, SQL_MODE. Not charsets (WL#1062), not some vars (I can only think
  of SQL_SELECT_LIMIT, which deserves a special treatment). Note that this
  works for queries, except LOAD DATA INFILE (for this it would have to wait
  for Dmitri's push of WL#874, which in turns waits for the present push, so...
  the deadlock must be broken!). Note that when Dmitri pushes WL#874 in 5.0.1,
  5.0.0 won't be able to replicate a LOAD DATA INFILE from 5.0.1.
  Apart from that, the new binlog format is designed so that it can tolerate
  a little variation in the events (so that a 5.0.0 slave could replicate a
  5.0.1 master, except for LOAD DATA INFILE unfortunately); that is, when I
  later add replication of charsets it should break nothing. And when I later
  add a UID to every event, it should break nothing.
  The main change brought by this patch is a new type of event, Format_description_log_event,
  which describes some lengthes in other event types. This event is needed for
  the master/slave/mysqlbinlog to understand a 5.0 log. Thanks to this event,
  we can later add more bytes to the header of every event without breaking compatibility.
  Inside Query_log_event, we have some additional dynamic format, as every Query_log_event
  can have a different number of status variables, stored as pairs (code, value); that's
  how SQL_MODE and session variables and catalog are stored. Like this, we can later
  add count of affected rows, charsets... and we can have options --don't-log-count-affected-rows
  if we want.
  MySQL 5.0 is able to run on 4.x relay logs, 4.x binlogs.
  Upgrading a 4.x master to 5.0 is ok (no need to delete binlogs),
  upgrading a 4.x slave to 5.0 is ok (no need to delete relay logs);
  so both can be "hot" upgrades.
  Upgrading a 3.23 master to 5.0 requires as much as upgrading it to 4.0.
  3.23 and 4.x can't be slaves of 5.0.
  So downgrading from 5.0 to 4.x may be complicated.
  Log_event::log_pos is now the position of the end of the event, which is
  more useful than the position of the beginning. We take care about compatibility
  with <5.0 (in which log_pos is the beginning).
  I added a short test for replication of SQL_MODE and some other variables.
  TODO:
  - after committing this, merge the latest 5.0 into it
  - fix all tests
  - update the manual with upgrade notes.

  mysql-test/t/rpl_session_var.test
    1.1 03/12/18 01:08:05 guilhem@mysql.com +42 -0

  mysql-test/t/rpl_session_var.test
    1.0 03/12/18 01:08:05 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-5.0-new-binlog-format/mysql-test/t/rpl_session_var.test

  mysql-test/r/rpl_session_var.result
    1.1 03/12/18 01:08:04 guilhem@mysql.com +43 -0

  sql/sql_repl.cc
    1.113 03/12/18 01:08:04 guilhem@mysql.com +168 -42
    When the master starts sending binlog to slave, it must
    first read the first few events to detect the binlog's format.
    Same for SHOW BINLOG EVENTS.

  sql/sql_class.h
    1.173 03/12/18 01:08:04 guilhem@mysql.com +25 -3
    catalog, and new members in MYSQL_LOG

  sql/sql_class.cc
    1.130.1.7 03/12/18 01:08:04 guilhem@mysql.com +1 -0
    catalog in THD

  sql/slave.h
    1.72 03/12/18 01:08:04 guilhem@mysql.com +42 -18
    in the slave we avoid lengthes and rely on absolute positions instead;
    hence the introduction of future_group_master_log_pos and future_event_relay_log_pos
    (explained in code).

  sql/slave.cc
    1.204 03/12/18 01:08:04 guilhem@mysql.com +502 -110
    When the slave opens a relay log, it reads the first few events to know the format.
    When slave I/O thread receives a Rotate from the master, it rotates its relay log
    (to avoid mixed format in the relay log).

  sql/mysqld.cc
    1.376 03/12/18 01:08:04 guilhem@mysql.com +1 -1
    update for prototype change

  sql/mysql_priv.h
    1.205 03/12/18 01:08:04 guilhem@mysql.com +23 -1
    Definition of SELECT_DISTINCT and others must be visible in client/mysqlbinlog.cc,
    so adding #ifdefs.

  sql/log_event.h
    1.89.1.1 03/12/18 01:08:04 guilhem@mysql.com +377 -110
    Binlog version is changed to 4.
    New classes (details in sql/log_event.cc).
    Removing some useless #defines.

  mysql-test/r/rpl_session_var.result
    1.0 03/12/18 01:08:04 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-5.0-new-binlog-format/mysql-test/r/rpl_session_var.result

  sql/log_event.cc
    1.123 03/12/18 01:08:03 guilhem@mysql.com +982 -266
    New event type: Format_description_log_event, to describe the log's format.
    read_log_event() needs to be passed this event to be able to read 5.0 events.
    Query_log_event has new members flags2 and sql_mode for replication of session
    variables (except charsets which are WL#1062) and SQL_MODE.
    flags2 is in fact a kind of copy of thd->options (&'d with a mask).
    Now with this replication of FOREIGN_KEY_CHECKS, SQL_AUTO_IS_NULL, UNIQUE_CHECKS
    and SQL_MODE work; with mysqlbinlog too.

  sql/log.cc
    1.117 03/12/18 01:08:03 guilhem@mysql.com +64 -9
    Start events will have created==0 if generated by rotation (like in 3.23).
    In 5.0 we always write a Format_description_log_event at the beginning of
    every master's binary log and of every slave's relay log.
    We also add Rotate and Stop to relay logs (like there already was in
    master's binary logs).
    When we rotate a relay log, we write the previous relay log's Start event
    (the one which was sent from the master) to the beginning of the new log,
    so that we don't need the previous relay log to understand the new one;
    that's the purpose of MYSQL_LOG::description_event_for_queue.
    Removed logging of SET FOREIGN_KEY_CHECKS, because we handle it as flags
    in the Query event now.

  sql/ha_innodb.cc
    1.97.1.1 03/12/18 01:08:03 guilhem@mysql.com +12 -3
    we are getting rid of event lengthes here and there, which is good.

  mysys/mf_iocache2.c
    1.24 03/12/18 01:08:03 guilhem@mysql.com +7 -0
    a correct tell() for SEQ_READ_APPEND caches
    (my_b_tell() is not working for such caches).

  include/my_sys.h
    1.115.1.1 03/12/18 01:08:03 guilhem@mysql.com +1 -0
    a correct tell() for SEQ_READ_APPEND caches.

  client/mysqlbinlog.cc
    1.85 03/12/18 01:08:03 guilhem@mysql.com +133 -29
    Make mysqlbinlog able to read the new binlog format,
    by seeking to the start and reading the first few events, to
    detect the format of the binlog.

  client/Makefile.am
    1.33 03/12/18 01:08:03 guilhem@mysql.com +1 -1
    mysqlbinlog.cc depends slightly on sql/mysql_priv.h

ChangeSet
  1.1346.1.322 03/12/18 01:13:52 monty@mysql.com +2 -0
  Code cleanup

  sql/field.cc
    1.51.1.32 03/12/18 01:13:50 monty@mysql.com +1 -1
    code cleanup

  client/mysql.cc
    1.93.1.54 03/12/18 01:13:50 monty@mysql.com +5 -2
    Don't call mysql_close() on not initialized object

ChangeSet
  1.1616.1.68 03/12/17 22:52:03 antony@ltantony.rdg.cyberkinetica.homeunix.net +22 -0
  WorkLog #1323 (part 2)
  
  New Statement: SHOW [STORAGE] ENGINES
  New System Variable: storage_engine
  New mysqld Argument: --default-storage-engine=

  sql/sql_yacc.yy
    1.203.86.1 03/12/17 22:49:07 antony@ltantony.rdg.cyberkinetica.homeunix.net +22 -7
    New keywords: STORAGE and ENGINES
    Change table_types to storage_engines
    New statement: SHOW [STORAGE] ENGINES

ChangeSet
  1.1346.472.1 03/12/17 23:29:11 guilhem@mysql.com +1 -0
  Fix for BUG#2145 "mysqld becomes unreliable if unable to create a relay log when replic starts":
  release the mutex before exiting the function, or it will be kept forever
  (=> START SLAVE, STOP SLAVE, etc will hang).

  sql/slave.cc
    1.164.1.98 03/12/17 23:29:08 guilhem@mysql.com +1 -0
    release the mutex before exiting the function, or it will be kept forever
    (=> START SLAVE, STOP SLAVE, etc will hang).

  sql/sql_table.cc
    1.157.19.1 03/12/17 22:11:54 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change for consistancy

  sql/sql_show.cc
    1.122.1.18 03/12/17 22:11:53 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -3
    Change for consistancy

  sql/sql_parse.cc
    1.271.46.1 03/12/17 22:11:53 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change for consistancy

  sql/sql_lex.h
    1.102.1.41 03/12/17 22:11:53 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change for consistancy

  sql/set_var.h
    1.42 03/12/17 22:11:53 antony@ltantony.rdg.cyberkinetica.homeunix.net +12 -2
    New system variable for storage_engine

  sql/set_var.cc
    1.34.1.52 03/12/17 22:11:53 antony@ltantony.rdg.cyberkinetica.homeunix.net +30 -7
    New system variable for storage_engine

  sql/mysqld.cc
    1.356.41.1 03/12/17 22:11:53 antony@ltantony.rdg.cyberkinetica.homeunix.net +8 -5
    New command like argument for default-storage-engine

  sql/mysql_priv.h
    1.186.49.1 03/12/17 22:11:52 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    change name for consistency

  sql/lex.h
    1.82.20.1 03/12/17 22:11:52 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -0
    New keywords - ENGINES and STORAGE

  sql/handler.h
    1.89.1.6 03/12/17 22:11:52 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    change name for consistency

  sql/handler.cc
    1.103.1.10 03/12/17 22:11:52 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    change name for consistency

  mysql-test/t/warnings.test
    1.15 03/12/17 22:11:52 antony@ltantony.rdg.cyberkinetica.homeunix.net +5 -0
    Test for deprecated table_type system variable

  mysql-test/t/variables.test
    1.18.1.11 03/12/17 22:11:52 antony@ltantony.rdg.cyberkinetica.homeunix.net +8 -8
    table_type system variable becomes storage_engine

  mysql-test/t/key_cache.test
    1.7 03/12/17 22:11:52 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    table_type system variable becomes storage_engine

  mysql-test/t/create.test
    1.39 03/12/17 22:11:52 antony@ltantony.rdg.cyberkinetica.homeunix.net +10 -10
    table_type system variable becomes storage_engine

  mysql-test/r/warnings.result
    1.17 03/12/17 22:11:51 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -0
    Test for deprecated table_type system variable

  mysql-test/r/variables.result
    1.21.1.15 03/12/17 22:11:51 antony@ltantony.rdg.cyberkinetica.homeunix.net +12 -12
    table_type system variable becomes storage_engine

  mysql-test/r/key_cache.result
    1.7 03/12/17 22:11:51 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    table_type system variable becomes storage_engine

  mysql-test/r/create.result
    1.60 03/12/17 22:11:51 antony@ltantony.rdg.cyberkinetica.homeunix.net +14 -14
    table_type system variable becomes storage_engine

  include/sql_state.h
    1.8.1.3 03/12/17 22:11:51 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    We now call handlers STORAGE ENGINEs

  include/mysqld_error.h
    1.61.1.28 03/12/17 22:11:51 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    We now call handlers STORAGE ENGINEs

ChangeSet
  1.1624.1.36 03/12/17 19:18:01 jani@linux.local +4 -0
  Fixed some minor issues, revealed by compiler warnings when using
  BUILD/compile-pentium-debug-max

  BitKeeper/etc/logging_ok
    1.250.1.3 03/12/17 19:18:01 jani@linux.local +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_insert.cc
    1.97 03/12/17 19:17:36 jani@linux.local +8 -3
    Fixed some minor issues, revealed by compiler warnings when using
    BUILD/compile-pentium-debug-max

  sql/opt_range.cc
    1.100.1.3 03/12/17 19:17:36 jani@linux.local +1 -0
    Fixed some minor issues, revealed by compiler warnings when using
    BUILD/compile-pentium-debug-max

  sql/item_func.cc
    1.138 03/12/17 19:17:36 jani@linux.local +5 -0
    Fixed some minor issues, revealed by compiler warnings when using
    BUILD/compile-pentium-debug-max

ChangeSet
  1.1346.1.319 03/12/17 13:15:57 vva@eagle.mysql.r18.ru +1 -0
  Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
  into eagle.mysql.r18.ru:/home/vva/work/BUG_2023/mysql-4.0

  sql/field.cc
    1.51.1.31 03/12/17 13:15:55 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1346.471.1 03/12/17 13:15:01 vva@eagle.mysql.r18.ru +1 -0
  fixed small error in types in sql/field.cc 
  (char * -> const char*)

  sql/field.cc
    1.51.4.6 03/12/17 13:15:00 vva@eagle.mysql.r18.ru +1 -1
    fixed small error in types (char * -> const char*)

ChangeSet
  1.1346.470.1 03/12/17 18:12:59 monty@mysql.com +1 -0
  Fixed typo.  Affected INSERT DELAYED ... SELECT commands

  sql/sql_parse.cc
    1.218.1.138 03/12/17 18:12:55 monty@mysql.com +1 -1
    Fixed typo.  Affected INSERT DELAYED ... SELECT commands

ChangeSet
  1.1616.52.1 03/12/17 17:35:34 monty@mysql.com +142 -0
  Merge with 4.0.17

  support-files/mysql.spec.sh
    1.71 03/12/17 17:35:30 monty@mysql.com +0 -0
    Merge with 4.0

  support-files/mysql.server.sh
    1.33 03/12/17 17:35:30 monty@mysql.com +0 -0
    Merge with 4.0

  strings/strto.c
    1.15 03/12/17 17:35:30 monty@mysql.com +0 -0
    Merge with 4.0

  strings/ctype-tis620.c
    1.55 03/12/17 17:35:30 monty@mysql.com +0 -12
    Merge with 4.0

  sql/uniques.cc
    1.16.1.1 03/12/17 17:35:30 monty@mysql.com +2 -3
    Merge with 4.0

  sql/time.cc
    1.38 03/12/17 17:35:30 monty@mysql.com +0 -0
    Merge with 4.0

  sql/table.h
    1.55.1.1 03/12/17 17:35:30 monty@mysql.com +0 -0
    Merge with 4.0

  sql/table.cc
    1.91.1.1 03/12/17 17:35:30 monty@mysql.com +4 -4
    Merge with 4.0

  sql/sql_yacc.yy
    1.203.1.82 03/12/17 17:35:30 monty@mysql.com +0 -0
    Merge with 4.0

  sql/sql_update.cc
    1.83.2.23 03/12/17 17:35:30 monty@mysql.com +0 -0
    Merge with 4.0

  sql/sql_table.cc
    1.157.2.27 03/12/17 17:35:30 monty@mysql.com +0 -2
    Merge with 4.0

  sql/sql_show.cc
    1.122.10.1 03/12/17 17:35:30 monty@mysql.com +0 -0
    Merge with 4.0

  sql/sql_select.cc
    1.216.1.70 03/12/17 17:35:30 monty@mysql.com +24 -23
    Merge with 4.0

  sql/sql_rename.cc
    1.16.1.2 03/12/17 17:35:30 monty@mysql.com +0 -0
    Merge with 4.0

  sql/sql_parse.cc
    1.271.1.37 03/12/17 17:35:30 monty@mysql.com +22 -31
    Merge with 4.0

  sql/sql_load.cc
    1.46.3.16 03/12/17 17:35:30 monty@mysql.com +0 -0
    Merge with 4.0

  sql/sql_insert.cc
    1.86.2.25 03/12/17 17:35:30 monty@mysql.com +0 -10
    Merge with 4.0

  sql/sql_delete.cc
    1.99.2.16 03/12/17 17:35:29 monty@mysql.com +1 -3
    Merge with 4.0

  sql/sql_db.cc
    1.68.1.23 03/12/17 17:35:29 monty@mysql.com +2 -2
    Merge with 4.0

  sql/sql_class.h
    1.146.1.56 03/12/17 17:35:29 monty@mysql.com +1 -12
    Merge with 4.0

  sql/sql_cache.cc
    1.46.1.14 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  sql/sql_base.cc
    1.145.1.24 03/12/17 17:35:29 monty@mysql.com +0 -4
    Merge with 4.0

  sql/sql_analyse.cc
    1.41 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  sql/sql_acl.cc
    1.74.1.26 03/12/17 17:35:29 monty@mysql.com +6 -6
    Merge with 4.0

  sql/slave.cc
    1.188.1.33 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  sql/repl_failsafe.cc
    1.32.1.13 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  sql/records.cc
    1.19.1.5 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  sql/opt_range.cc
    1.98.1.2 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  sql/nt_servc.cc
    1.15 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  sql/mysqld.cc
    1.356.1.75 03/12/17 17:35:29 monty@mysql.com +4 -9
    Merge with 4.0

  sql/mysql_priv.h
    1.186.1.55 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  sql/log_event.h
    1.90 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  sql/log_event.cc
    1.113.1.27 03/12/17 17:35:29 monty@mysql.com +5 -6
    Merge with 4.0

  sql/log.cc
    1.108.1.19 03/12/17 17:35:29 monty@mysql.com +1 -2
    Merge with 4.0

  sql/lex.h
    1.82.1.50 03/12/17 17:35:29 monty@mysql.com +0 -1
    Merge with 4.0

  sql/item_timefunc.cc
    1.51.1.1 03/12/17 17:35:29 monty@mysql.com +16 -18
    Merge with 4.0

  sql/item_sum.h
    1.48.1.1 03/12/17 17:35:29 monty@mysql.com +1 -2
    Merge with 4.0

  sql/item_sum.cc
    1.89.1.7 03/12/17 17:35:29 monty@mysql.com +4 -7
    Merge with 4.0

  sql/item_strfunc.h
    1.74 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  sql/item_strfunc.cc
    1.149 03/12/17 17:35:29 monty@mysql.com +0 -1
    Merge with 4.0

  sql/item_func.h
    1.68.1.28 03/12/17 17:35:29 monty@mysql.com +2 -5
    Merge with 4.0

  sql/item_func.cc
    1.124.1.48 03/12/17 17:35:29 monty@mysql.com +5 -10
    Merge with 4.0

  sql/item_cmpfunc.cc
    1.111.1.6 03/12/17 17:35:29 monty@mysql.com +0 -2
    Merge with 4.0

  sql/item.h
    1.56.1.50 03/12/17 17:35:29 monty@mysql.com +0 -2
    Merge with 4.0

  sql/item.cc
    1.58.1.50 03/12/17 17:35:29 monty@mysql.com +8 -8
    Merge with 4.0

  sql/ha_innodb.cc
    1.90.1.19 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  sql/field.h
    1.88 03/12/17 17:35:29 monty@mysql.com +6 -7
    Merge with 4.0

  sql/field.cc
    1.123.1.1 03/12/17 17:35:29 monty@mysql.com +35 -33
    Change fix_datetime() to print errors

  regex/reginit.c
    1.7 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysys/my_thr_init.c
    1.25 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysys/my_symlink.c
    1.8 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysys/my_init.c
    1.32 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysys/charset.c
    1.106 03/12/17 17:35:29 monty@mysql.com +0 -38
    Merge with 4.0

  mysql-test/t/union.test
    1.51 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/t/type_timestamp.test
    1.10 03/12/17 17:35:29 monty@mysql.com +2 -3
    Merge with 4.0

  mysql-test/t/type_enum.test
    1.7.1.1 03/12/17 17:35:29 monty@mysql.com +11 -11
    Merge with 4.0

  mysql-test/t/type_decimal.test
    1.14 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/t/type_datetime.test
    1.12 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/t/type_blob.test
    1.16 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/t/truncate.test
    1.10 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/t/symlink.test
    1.10 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/t/select_found.test
    1.17 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/t/rpl_trunc_binlog.test
    1.7 03/12/17 17:35:29 monty@mysql.com +0 -1
    Merge with 4.0

  mysql-test/t/rpl_rotate_logs.test
    1.48 03/12/17 17:35:29 monty@mysql.com +0 -4
    Merge with 4.0

  mysql-test/t/rpl_max_relay_size.test
    1.8 03/12/17 17:35:29 monty@mysql.com +0 -1
    Merge with 4.0

  mysql-test/t/rpl_log_pos.test
    1.28 03/12/17 17:35:29 monty@mysql.com +0 -1
    Merge with 4.0

  mysql-test/t/query_cache.test
    1.24.1.8 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/t/mysqldump.test
    1.8 03/12/17 17:35:29 monty@mysql.com +0 -1
    Merge with 4.0

  mysql-test/t/multi_update.test
    1.26.1.2 03/12/17 17:35:29 monty@mysql.com +1 -1
    Merge with 4.0

  mysql-test/t/lowercase_table.test
    1.8 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/t/loaddata.test
    1.6 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/t/limit.test
    1.7 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/t/join_outer.test
    1.13 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/t/insert.test
    1.11.1.4 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/t/innodb.test
    1.51 03/12/17 17:35:29 monty@mysql.com +31 -31
    Merge with 4.0

  mysql-test/t/handler.test
    1.16 03/12/17 17:35:29 monty@mysql.com +0 -1
    Merge with 4.0

  mysql-test/t/group_by.test
    1.27 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/t/func_time.test
    1.21.1.2 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/t/func_str.test
    1.44 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/t/func_op.test
    1.5 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/t/func_group.test
    1.19 03/12/17 17:35:29 monty@mysql.com +8 -8
    Merge with 4.0

  mysql-test/t/bdb.test
    1.31 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/t/auto_increment.test
    1.15 03/12/17 17:35:29 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/r/union.result
    1.53 03/12/17 17:35:28 monty@mysql.com +1 -1
    Merge with 4.0

  mysql-test/r/type_timestamp.result
    1.11 03/12/17 17:35:28 monty@mysql.com +9 -0
    Merge with 4.0

  mysql-test/r/type_enum.result
    1.13.1.1 03/12/17 17:35:28 monty@mysql.com +10 -10
    Merge with 4.0

  mysql-test/r/type_decimal.result
    1.17 03/12/17 17:35:28 monty@mysql.com +1 -1
    Merge with 4.0

  mysql-test/r/type_datetime.result
    1.16 03/12/17 17:35:28 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/r/type_blob.result
    1.31 03/12/17 17:35:28 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/r/truncate.result
    1.10 03/12/17 17:35:28 monty@mysql.com +1 -1
    Merge with 4.0

  mysql-test/r/symlink.result
    1.11.1.3 03/12/17 17:35:28 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/r/select_found.result
    1.18 03/12/17 17:35:28 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/r/rpl_trunc_binlog.result
    1.9 03/12/17 17:35:28 monty@mysql.com +0 -1
    Merge with 4.0

  mysql-test/r/rpl_rotate_logs.result
    1.52 03/12/17 17:35:28 monty@mysql.com +0 -3
    Merge with 4.0

  mysql-test/r/rpl_max_relay_size.result
    1.12 03/12/17 17:35:28 monty@mysql.com +0 -1
    Merge with 4.0

  mysql-test/r/query_cache.result
    1.26.1.13 03/12/17 17:35:28 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/r/mysqldump.result
    1.9.1.3 03/12/17 17:35:28 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/r/multi_update.result
    1.25.1.2 03/12/17 17:35:28 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/r/lowercase_table.result
    1.6 03/12/17 17:35:28 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/r/loaddata.result
    1.8 03/12/17 17:35:28 monty@mysql.com +0 -0
    Merge with 4.0

  mysql-test/r/join_outer.result
    1.24.1.2 03/12/17 17:35:28 monty@mysql.com +1 -0
    Merge with 4.0

  mysql-test/r/insert.result
    1.12.1.4 03/12/17 17:35:28 monty@mysql.com +1 -0
    Merge with 4.0

  mysql-test/r/innodb.result
    1.77 03/12/17 17:35:28 monty@mysql.com +21 -20
    Merge with 4.0

  mysql-test/r/handler.result
    1.16 03/12/17 17:35:28 monty@mysql.com +0 -1
    Merge with 4.0

  mysql-test/r/group_by.result
    1.36 03/12/17 17:35:28 monty@mysql.com +0 -2
    Merge with 4.0

  mysql-test/r/func_time.result
    1.23.1.2 03/12/17 17:35:28 monty@mysql.com +0 -109
    Merge with 4.0

  mysql-test/r/func_str.result
    1.49 03/12/17 17:35:28 monty@mysql.com +3 -340
    Merge with 4.0

  mysql-test/r/func_group.result
    1.24 03/12/17 17:35:28 monty@mysql.com +13 -25
    Merge with 4.0

  mysql-test/r/binary.result
    1.11 03/12/17 17:35:28 monty@mysql.com +1 -1
    Merge with 4.0

  myisam/mi_search.c
    1.41 03/12/17 17:35:28 monty@mysql.com +0 -19
    Merge with 4.0

  myisam/mi_key.c
    1.20 03/12/17 17:35:28 monty@mysql.com +2 -2
    Merge with 4.0

  libmysqld/lib_sql.cc
    1.75.1.15 03/12/17 17:35:28 monty@mysql.com +0 -7
    Merge with 4.0

  libmysql/libmysql.c
    1.156.1.44 03/12/17 17:35:28 monty@mysql.com +25 -21
    Merge with 4.0

  innobase/btr/btr0cur.c
    1.27 03/12/17 17:35:28 monty@mysql.com +62 -1
    Merge with 4.0 (Heikki should check if we should remove btr_cur_update_sec_rec_in_place()

  client/mysqltest.c
    1.92.5.1 03/12/17 17:35:28 monty@mysql.com +18 -252
    Use local version

  client/mysqldump.c
    1.106 03/12/17 17:35:28 monty@mysql.com +18 -38
    Merge with 4.0

  client/mysql.cc
    1.121.1.30 03/12/17 17:35:28 monty@mysql.com +0 -1
    Merge with 4.0

  Build-tools/Bootstrap
    1.12 03/12/17 17:35:28 monty@mysql.com +0 -0
    Merge with 4.0

ChangeSet
  1.1346.1.318 03/12/16 21:53:18 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

  mysql-test/r/rpl_rotate_logs.result
    1.32.1.5 03/12/16 21:53:11 guilhem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.469.1 03/12/16 21:52:11 guilhem@mysql.com +14 -0
  Fix for BUG#2121 "Inadequate message "check permissions on master.info"":
  more general message when slave can't start because of incorrect
  replication information, the previous one was sometimes a misleading
  indication (i.e. sometimes the problem had nothing to do with
  system permissions).
  The perfect fix would be to report the exact error to the client
  (instead of pointing the client to the error log); this is a bit
  of work so it's more a development task:
  WL#1088 "Move all hardcoded messages of replication to share/errmsg.txt".
  I was not able to modify the errmsg.txt in these sql/ subdirectories:
  
  danish
  dutch
  german
  italian
  portuguese
  russian
  spanish
  swedish
  ukrainian

  sql/share/slovak/errmsg.txt
    1.46.1.11 03/12/16 21:52:02 guilhem@mysql.com +1 -1
    More general message when slave can't start because of incorrect
    replication information, the previous one was sometimes a misleading
    indication (i.e. sometimes the problem had nothing to do with
    system permissions).

  sql/share/romanian/errmsg.txt
    1.44.1.11 03/12/16 21:52:01 guilhem@mysql.com +1 -1
    More general message when slave can't start because of incorrect
    replication information, the previous one was sometimes a misleading
    indication (i.e. sometimes the problem had nothing to do with
    system permissions).

  sql/share/polish/errmsg.txt
    1.45.1.11 03/12/16 21:52:01 guilhem@mysql.com +1 -1
    More general message when slave can't start because of incorrect
    replication information, the previous one was sometimes a misleading
    indication (i.e. sometimes the problem had nothing to do with
    system permissions).

  sql/share/norwegian/errmsg.txt
    1.45.1.11 03/12/16 21:52:01 guilhem@mysql.com +1 -1
    More general message when slave can't start because of incorrect
    replication information, the previous one was sometimes a misleading
    indication (i.e. sometimes the problem had nothing to do with
    system permissions).

  sql/share/norwegian-ny/errmsg.txt
    1.45.1.11 03/12/16 21:52:01 guilhem@mysql.com +1 -1
    More general message when slave can't start because of incorrect
    replication information, the previous one was sometimes a misleading
    indication (i.e. sometimes the problem had nothing to do with
    system permissions).

  sql/share/korean/errmsg.txt
    1.45.1.11 03/12/16 21:52:00 guilhem@mysql.com +1 -1
    More general message when slave can't start because of incorrect
    replication information, the previous one was sometimes a misleading
    indication (i.e. sometimes the problem had nothing to do with
    system permissions).

  sql/share/japanese/errmsg.txt
    1.45.1.11 03/12/16 21:52:00 guilhem@mysql.com +1 -1
    More general message when slave can't start because of incorrect
    replication information, the previous one was sometimes a misleading
    indication (i.e. sometimes the problem had nothing to do with
    system permissions).

  sql/share/hungarian/errmsg.txt
    1.47.1.11 03/12/16 21:52:00 guilhem@mysql.com +1 -1
    More general message when slave can't start because of incorrect
    replication information, the previous one was sometimes a misleading
    indication (i.e. sometimes the problem had nothing to do with
    system permissions).

  sql/share/greek/errmsg.txt
    1.46.1.11 03/12/16 21:51:59 guilhem@mysql.com +1 -1
    More general message when slave can't start because of incorrect
    replication information, the previous one was sometimes a misleading
    indication (i.e. sometimes the problem had nothing to do with
    system permissions).

  sql/share/french/errmsg.txt
    1.46.1.11 03/12/16 21:51:59 guilhem@mysql.com +1 -1
    More general message when slave can't start because of incorrect
    replication information, the previous one was sometimes a misleading
    indication (i.e. sometimes the problem had nothing to do with
    system permissions).

  sql/share/estonian/errmsg.txt
    1.47.1.11 03/12/16 21:51:59 guilhem@mysql.com +1 -1
    More general message when slave can't start because of incorrect
    replication information, the previous one was sometimes a misleading
    indication (i.e. sometimes the problem had nothing to do with
    system permissions).

  sql/share/english/errmsg.txt
    1.51.1.17 03/12/16 21:51:58 guilhem@mysql.com +1 -1
    More general message when slave can't start because of incorrect
    replication information, the previous one was sometimes a misleading
    indication (i.e. sometimes the problem had nothing to do with
    system permissions).

  sql/share/czech/errmsg.txt
    1.46.1.11 03/12/16 21:51:58 guilhem@mysql.com +1 -1
    More general message when slave can't start because of incorrect
    replication information, the previous one was sometimes a misleading
    indication (i.e. sometimes the problem had nothing to do with
    system permissions).

  mysql-test/r/rpl_rotate_logs.result
    1.32.2.1 03/12/16 21:51:57 guilhem@mysql.com +3 -3
    result update

ChangeSet
  1.1624.1.35 03/12/16 19:14:10 pem@mysql.comhem.se +4 -0
  Renamed the "schema" column to "db" in mysql.proc to keep it in style with
  all the other mysql.* tables.

  sql/sp.cc
    1.38 03/12/16 19:14:07 pem@mysql.com +3 -3
    Renamed the "schema" column to "db" in mysql.proc to keep it in style with
    all the other mysql.* tables.

  scripts/mysql_fix_privilege_tables.sql
    1.9 03/12/16 19:14:07 pem@mysql.com +2 -2
    Renamed the "schema" column to "db" in mysql.proc to keep it in style with
    all the other mysql.* tables.

  scripts/mysql_create_system_tables.sh
    1.12 03/12/16 19:14:07 pem@mysql.com +2 -2
    Renamed the "schema" column to "db" in mysql.proc to keep it in style with
    all the other mysql.* tables.

  Docs/sp-imp-spec.txt
    1.11 03/12/16 19:14:07 pem@mysql.com +2 -2
    Renamed the "schema" column to "db" in mysql.proc to keep it in style with
    all the other mysql.* tables.

ChangeSet
  1.1624.1.34 03/12/16 18:09:22 pem@mysql.comhem.se +9 -0
  Post-merge fixes.
  Multiple result sets from stored procedures now works with the
  mysql and mysqltest clients.

  sql/lex.h
    1.112 03/12/16 18:09:20 pem@mysql.com +1 -2
    Post-merge fixes.

  mysql-test/t/sp.test
    1.44 03/12/16 18:09:20 pem@mysql.com +25 -2
    Post-merge fixes.
    Added test for mulple result sets.

  mysql-test/t/sp-error.test
    1.28 03/12/16 18:09:20 pem@mysql.com +42 -53
    Post-merge fixes.
    Removed now obsolete error test for multiple selects (without "into").

  mysql-test/t/index_merge_innodb.test
    1.2 03/12/16 18:09:20 pem@mysql.com +1 -1
    Post-merge fixes.

  mysql-test/r/variables.result
    1.40 03/12/16 18:09:20 pem@mysql.com +1 -1
    Post-merge fixes.

  mysql-test/r/sp.result
    1.45 03/12/16 18:09:20 pem@mysql.com +382 -355
    Post-merge fixes.
    Added test for mulple result sets.

  mysql-test/r/sp-error.result
    1.28 03/12/16 18:09:20 pem@mysql.com +88 -96
    Post-merge fixes.
    Removed now obsolete error test for multiple selects (without "into").

  mysql-test/r/index_merge_innodb.result
    1.1.1.1 03/12/16 18:09:20 pem@mysql.com +1 -1
    Post-merge fixes.

  client/mysqltest.c
    1.104 03/12/16 18:09:20 pem@mysql.com +0 -16
    Post-merge fixes.

ChangeSet
  1.1346.1.317 03/12/16 17:44:51 lenz@mysql.com +1 -0
   - bumped up version number to 4.0.18, now that 4.0.17 has been 
     tagged/released
   - tagged ChangeSet@1.1655.1.3 as mysql-4.0.17

  configure.in
    1.191.1.101 03/12/16 17:44:49 lenz@mysql.com +1 -1
     - bumped up version number to 4.0.18, now that 4.0.17 has been 
       tagged/released

ChangeSet
  1.1624.1.33 03/12/16 16:12:28 pem@mysql.com +48 -0
  Merge 4.1 to 5.0.

  sql/sql_yacc.yy
    1.266 03/12/16 16:12:24 pem@mysql.com +0 -1
    Merge 4.1 to 5.0.

  sql/share/ukrainian/errmsg.txt
    1.55 03/12/16 16:12:24 pem@mysql.com +1 -1
    Merge 4.1 to 5.0.

  sql/share/swedish/errmsg.txt
    1.93 03/12/16 16:12:24 pem@mysql.com +1 -1
    Merge 4.1 to 5.0.

  sql/share/spanish/errmsg.txt
    1.92 03/12/16 16:12:24 pem@mysql.com +1 -1
    Merge 4.1 to 5.0.

  sql/share/slovak/errmsg.txt
    1.92 03/12/16 16:12:24 pem@mysql.com +1 -1
    Merge 4.1 to 5.0.

  sql/share/serbian/errmsg.txt
    1.46 03/12/16 16:12:24 pem@mysql.com +1 -1
    Merge 4.1 to 5.0.

  sql/share/russian/errmsg.txt
    1.90 03/12/16 16:12:24 pem@mysql.com +1 -1
    Merge 4.1 to 5.0.

  sql/share/romanian/errmsg.txt
    1.89 03/12/16 16:12:24 pem@mysql.com +0 -0
    Merge 4.1 to 5.0.

  sql/share/portuguese/errmsg.txt
    1.92 03/12/16 16:12:24 pem@mysql.com +26 -51
    Merge 4.1 to 5.0.

  sql/share/polish/errmsg.txt
    1.92 03/12/16 16:12:24 pem@mysql.com +1 -1
    Merge 4.1 to 5.0.

  sql/share/norwegian/errmsg.txt
    1.91 03/12/16 16:12:24 pem@mysql.com +1 -1
    Merge 4.1 to 5.0.

  sql/share/norwegian-ny/errmsg.txt
    1.91 03/12/16 16:12:24 pem@mysql.com +1 -1
    Merge 4.1 to 5.0.

  sql/share/korean/errmsg.txt
    1.91 03/12/16 16:12:24 pem@mysql.com +1 -1
    Merge 4.1 to 5.0.

  sql/share/japanese/errmsg.txt
    1.91 03/12/16 16:12:24 pem@mysql.com +1 -1
    Merge 4.1 to 5.0.

  sql/share/italian/errmsg.txt
    1.98 03/12/16 16:12:24 pem@mysql.com +1 -1
    Merge 4.1 to 5.0.

  sql/share/hungarian/errmsg.txt
    1.93 03/12/16 16:12:24 pem@mysql.com +1 -1
    Merge 4.1 to 5.0.

  sql/share/greek/errmsg.txt
    1.92 03/12/16 16:12:24 pem@mysql.com +1 -1
    Merge 4.1 to 5.0.

  sql/share/german/errmsg.txt
    1.92 03/12/16 16:12:24 pem@mysql.com +1 -1
    Merge 4.1 to 5.0.

  sql/share/french/errmsg.txt
    1.91 03/12/16 16:12:24 pem@mysql.com +1 -1
    Merge 4.1 to 5.0.

  sql/share/estonian/errmsg.txt
    1.92 03/12/16 16:12:24 pem@mysql.com +1 -1
    Merge 4.1 to 5.0.

  sql/share/english/errmsg.txt
    1.99 03/12/16 16:12:24 pem@mysql.com +1 -1
    Merge 4.1 to 5.0.

  sql/share/dutch/errmsg.txt
    1.94 03/12/16 16:12:24 pem@mysql.com +1 -1
    Merge 4.1 to 5.0.

  sql/share/danish/errmsg.txt
    1.90 03/12/16 16:12:24 pem@mysql.com +1 -1
    Merge 4.1 to 5.0.

  sql/share/czech/errmsg.txt
    1.91 03/12/16 16:12:24 pem@mysql.com +0 -0
    Merge 4.1 to 5.0.

  sql/lex.h
    1.111 03/12/16 16:12:24 pem@mysql.com +7 -8
    Merge 4.1 to 5.0.

  include/mysqld_error.h
    1.89 03/12/16 16:12:24 pem@mysql.com +34 -35
    Merge 4.1 to 5.0.

  client/mysqltest.c
    1.103 03/12/16 16:12:24 pem@mysql.com +1 -6
    Merge 4.1 to 5.0.

  sql/sql_show.cc
    1.133 03/12/16 15:44:18 pem@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.375 03/12/16 15:44:18 pem@mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.114 03/12/16 15:44:18 pem@mysql.com +0 -0
    Auto merged

  sql/item.cc
    1.77 03/12/16 15:44:17 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.72 03/12/16 15:44:17 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/query_cache.test
    1.30 03/12/16 15:44:17 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/null.test
    1.12 03/12/16 15:44:17 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/multi_update.test
    1.28 03/12/16 15:44:17 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/func_time.test
    1.24 03/12/16 15:44:17 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/distinct.test
    1.16 03/12/16 15:44:17 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/symlink.result
    1.14 03/12/16 15:44:17 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.82 03/12/16 15:44:17 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/status.result
    1.6 03/12/16 15:44:17 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/show_check.result
    1.37 03/12/16 15:44:17 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/query_cache.result
    1.36 03/12/16 15:44:17 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/null.result
    1.20 03/12/16 15:44:17 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/mysqldump.result
    1.11 03/12/16 15:44:17 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/multi_update.result
    1.27 03/12/16 15:44:17 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/join_outer.result
    1.26 03/12/16 15:44:17 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/func_time.result
    1.26 03/12/16 15:44:17 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/distinct.result
    1.30 03/12/16 15:44:17 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.51.1 03/12/16 16:03:39 jani@rhols221.adsl.netsonic.fi +1 -0
  Fixed parenthesis needed by valgrind-max.

  client/mysqltest.c
    1.92.1.22 03/12/16 16:03:24 jani@rhols221.adsl.netsonic.fi +2 -1
    Fixed parenthesis needed by valgrind-max.

ChangeSet
  1.1346.1.316 03/12/16 14:43:34 lenz@mysql.com +3 -0
   - Bugfix for Do-rpm (moving of the resulting packages did not work due to
     a missing space)
   - Define the subject of the failure mail reports within the calling script
     instead of logger.pm

  Build-tools/logger.pm
    1.3 03/12/16 14:43:31 lenz@mysql.com +0 -1
     - Define the subject for the failure mail within the calling script instead
       of here

  Build-tools/Do-rpm
    1.27 03/12/16 14:43:31 lenz@mysql.com +3 -1
     - Define the subject of the failure email within the build script
     - Added missing space to make moving of the resulting packages working

  Build-tools/Bootstrap
    1.8.1.10 03/12/16 14:43:31 lenz@mysql.com +2 -0
     - Define the subject for the failure mail within the Build script

ChangeSet
  1.1616.1.66 03/12/16 17:39:33 ram@gw.mysql.r18.ru +5 -0
  proper fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly.
  
  note: bar asked me to use res.charset in ::sql_type() functions to be more consistent.

  sql/table.cc
    1.92 03/12/16 17:39:30 ram@gw.mysql.r18.ru +14 -2
    proper fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly

  sql/sql_show.cc
    1.122.1.17 03/12/16 17:39:30 ram@gw.mysql.r18.ru +9 -3
    proper fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly

  sql/field.cc
    1.124 03/12/16 17:39:30 ram@gw.mysql.r18.ru +16 -6
    proper fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly

  mysql-test/t/type_enum.test
    1.8 03/12/16 17:39:30 ram@gw.mysql.r18.ru +1 -1
    proper fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly

  mysql-test/r/type_enum.result
    1.14 03/12/16 17:39:30 ram@gw.mysql.r18.ru +2 -1
    proper fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly

ChangeSet
  1.1624.1.32 03/12/16 14:15:27 pem@mysql.comhem.se +6 -0
  Forgot to wrap things in #ifndef NO_EMBEDDED_ACCESS_CHECKS for the embedded server.
  Added missing cleanup in sp-security.test.

  sql/sql_parse.cc
    1.317 03/12/16 14:15:25 pem@mysql.com +6 -0
    Forgot to wrap things in #ifndef NO_EMBEDDED_ACCESS_CHECKS for the embedded server.

  sql/sp_head.h
    1.30 03/12/16 14:15:25 pem@mysql.com +2 -1
    Forgot to wrap things in #ifndef NO_EMBEDDED_ACCESS_CHECKS for the embedded server.

  sql/sp_head.cc
    1.60 03/12/16 14:15:25 pem@mysql.com +3 -1
    Forgot to wrap things in #ifndef NO_EMBEDDED_ACCESS_CHECKS for the embedded server.

  sql/item_func.cc
    1.137 03/12/16 14:15:25 pem@mysql.com +7 -1
    Forgot to wrap things in #ifndef NO_EMBEDDED_ACCESS_CHECKS for the embedded server.

  mysql-test/t/sp-security.test
    1.2 03/12/16 14:15:25 pem@mysql.com +1 -0
    Added clean-up.

  mysql-test/r/sp-security.result
    1.2 03/12/16 14:15:25 pem@mysql.com +1 -0
    Added clean-up.

  mysql-test/r/func_op.result
    1.7 03/12/16 15:02:32 monty@mysql.com +0 -0
    Auto merged

  mysql-test/r/bdb.result
    1.31 03/12/16 15:02:32 monty@mysql.com +0 -0
    Auto merged

  mysql-test/r/auto_increment.result
    1.19 03/12/16 15:02:32 monty@mysql.com +26 -26
    Auto merged

  myisam/mi_open.c
    1.74 03/12/16 15:02:32 monty@mysql.com +0 -0
    Auto merged

  myisam/mi_dbug.c
    1.11 03/12/16 15:02:32 monty@mysql.com +0 -0
    Auto merged

  myisam/mi_check.c
    1.105.1.17 03/12/16 15:02:32 monty@mysql.com +0 -0
    Auto merged

  myisam/ft_boolean_search.c
    1.70 03/12/16 15:02:32 monty@mysql.com +0 -0
    Auto merged

  innobase/row/row0upd.c
    1.20 03/12/16 15:02:31 monty@mysql.com +0 -0
    Auto merged

  innobase/row/row0umod.c
    1.13 03/12/16 15:02:31 monty@mysql.com +0 -0
    Auto merged

  innobase/row/row0sel.c
    1.40 03/12/16 15:02:31 monty@mysql.com +0 -0
    Auto merged

  innobase/row/row0ins.c
    1.28 03/12/16 15:02:31 monty@mysql.com +0 -0
    Auto merged

  innobase/lock/lock0lock.c
    1.24 03/12/16 15:02:31 monty@mysql.com +0 -0
    Auto merged

  include/mysql_com.h
    1.67.1.22 03/12/16 15:02:31 monty@mysql.com +0 -0
    Auto merged

  include/mysql.h
    1.104 03/12/16 15:02:31 monty@mysql.com +0 -0
    Auto merged

  include/my_sys.h
    1.116 03/12/16 15:02:31 monty@mysql.com +0 -0
    Auto merged

  include/my_pthread.h
    1.65.1.7 03/12/16 15:02:31 monty@mysql.com +0 -0
    Auto merged

  include/my_global.h
    1.47.1.6 03/12/16 15:02:31 monty@mysql.com +0 -0
    Auto merged

  include/my_base.h
    1.50 03/12/16 15:02:31 monty@mysql.com +0 -0
    Auto merged

  include/config-win.h
    1.39 03/12/16 15:02:31 monty@mysql.com +0 -0
    Auto merged

  dbug/dbug.c
    1.16 03/12/16 15:02:30 monty@mysql.com +0 -0
    Auto merged

  configure.in
    1.201.1.48 03/12/16 15:02:30 monty@mysql.com +0 -0
    Auto merged

  acinclude.m4
    1.90 03/12/16 15:02:30 monty@mysql.com +0 -0
    Auto merged

  Build-tools/Do-compile
    1.80 03/12/16 15:02:30 monty@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.233.1.37 03/12/16 15:02:19 monty@mysql.com +0 -2
    auto-union

ChangeSet
  1.1346.468.1 03/12/16 14:43:34 Sinisa@sinisa.nasamreza.org +2 -0
  A new better test case for bug #2128 involving overflow
  in decimal type with prepended zero's.

  mysql-test/t/type_decimal.test
    1.8.1.4 03/12/16 14:43:30 Sinisa@sinisa.nasamreza.org +13 -2
    A new better test case for bug #2128 involving overflow
    in decimal type with prepended zero's.

  mysql-test/r/type_decimal.result
    1.11.1.3 03/12/16 14:43:30 Sinisa@sinisa.nasamreza.org +192 -3
    A new better test case for bug #2128 involving overflow
    in decimal type with prepended zero's.

ChangeSet
  1.1346.1.314 03/12/16 14:40:57 monty@mysql.com +2 -0
  Fixes for last pull

  sql/field.cc
    1.51.1.30 03/12/16 14:40:55 monty@mysql.com +1 -1
    Safer timestamp year checking (as 1969 can be in timestamp)

  libmysqld/lib_sql.cc
    1.25.3.15 03/12/16 14:40:55 monty@mysql.com +6 -0
    Fixed compilation error in embedded library (from last pull)

ChangeSet
  1.1616.1.65 03/12/16 16:36:12 hf@deer.(none) +1 -0
  Missed header added

  heap/hp_hash.c
    1.28 03/12/16 16:35:47 hf@deer.(none) +1 -0
    header added

ChangeSet
  1.1346.466.4 03/12/16 13:20:17 monty@mysql.com +18 -0
  Portability fixes (mostly test suite)
  Make ENGINE= an alias for TYPE= (Compabiltiy with 4.1)
  Fix when using symlinked data files and realpath() is not working

  strings/strtoull.c
    1.7 03/12/16 13:20:16 monty@mysql.com +0 -1
    Remove not needed include file

  strings/strtoll.c
    1.7 03/12/16 13:20:16 monty@mysql.com +2 -1
    Fix for True64

  strings/strto.c
    1.8.1.3 03/12/16 13:20:16 monty@mysql.com +0 -2
    Fix for True64

  sql/mysqld.cc
    1.297.1.174 03/12/16 13:20:16 monty@mysql.com +2 -2
    Code cleanup

  sql/lex.h
    1.66.1.27 03/12/16 13:20:16 monty@mysql.com +1 -0
    Make ENGINE= an alias for TYPE=

  mysys/my_symlink.c
    1.4.1.2 03/12/16 13:20:16 monty@mysql.com +1 -0
    More debugging

  mysql-test/t/rpl_trunc_binlog.test
    1.2.1.4 03/12/16 13:20:16 monty@mysql.com +1 -0
    Use replace_columns to replace some 'not constant' columns

  mysql-test/t/rpl_rotate_logs.test
    1.34.1.5 03/12/16 13:20:15 monty@mysql.com +5 -4
    Use replace_columns to replace some 'not constant' columns

  mysql-test/t/rpl_max_relay_size.test
    1.3.1.1 03/12/16 13:20:15 monty@mysql.com +1 -0
    Use replace_columns to replace some 'not constant' columns

  mysql-test/t/rpl_log_pos.test
    1.20.1.2 03/12/16 13:20:15 monty@mysql.com +1 -1
    Use replace_columns to replace some 'not constant' columns

  mysql-test/t/handler.test
    1.7.1.6 03/12/16 13:20:15 monty@mysql.com +1 -1
    test engine=

  mysql-test/r/rpl_trunc_binlog.result
    1.2.1.3 03/12/16 13:20:15 monty@mysql.com +1 -1
    Use replace_columns to replace some 'not constant' columns

  mysql-test/r/rpl_rotate_logs.result
    1.32.1.4 03/12/16 13:20:15 monty@mysql.com +6 -5
    Use replace_columns to replace some 'not constant' columns

  mysql-test/r/rpl_max_relay_size.result
    1.3.1.1 03/12/16 13:20:15 monty@mysql.com +1 -1
    Use replace_columns to replace some 'not constant' columns

  mysql-test/r/handler.result
    1.7.1.6 03/12/16 13:20:15 monty@mysql.com +1 -1
    test engine=

  myisam/mi_check.c
    1.86.1.43 03/12/16 13:20:15 monty@mysql.com +4 -8
    Fix when using symlinked data files and realpath() is not working

  include/my_sys.h
    1.75.1.29 03/12/16 13:20:15 monty@mysql.com +1 -1
    Stop compiler warnings about alloca on freebsd

  client/mysqltest.c
    1.77.1.33 03/12/16 13:20:15 monty@mysql.com +255 -150
    Copied mysqltest from 4.1 and modified this to compile in 4.0
    This was needed to get replace_columns to work.

ChangeSet
  1.1346.1.312 03/12/16 11:12:40 guilhem@mysql.com +8 -0
  Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
  into mysql.com:/home/mysql_src/mysql-4.0

  sql/sql_update.cc
    1.54.1.43 03/12/16 11:12:32 guilhem@mysql.com +0 -0
    Auto merged

  sql/sql_table.cc
    1.112.1.58 03/12/16 11:12:31 guilhem@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.218.1.137 03/12/16 11:12:30 guilhem@mysql.com +0 -0
    Auto merged

  sql/sql_insert.cc
    1.63.1.45 03/12/16 11:12:29 guilhem@mysql.com +0 -0
    Auto merged

  sql/sql_delete.cc
    1.74.1.29 03/12/16 11:12:28 guilhem@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.111.1.60 03/12/16 11:12:27 guilhem@mysql.com +0 -0
    Auto merged

  sql/sql_base.cc
    1.117.1.53 03/12/16 11:12:26 guilhem@mysql.com +0 -0
    Auto merged

  sql/sql_acl.cc
    1.51.1.70 03/12/16 11:12:25 guilhem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.467.1 03/12/16 11:10:50 guilhem@mysql.com +13 -0
  Fix for BUG#2083
  "EE_ error codes (EE_DELETE, EE_WRITE) end up in the binlog, making slave stop".
  The problem was that during execution of the command on the master, an error
  can occur (for example, not space left on device, then mysqld waits and when
  there is space it completes successfully: so finally it worked but the error
  EE_WRITE remains in thd->net.last_errno and thd->net.last_error).
  To know if finally the command succeeded, we test the 'error' variable in
  every place, and if it shows no failure we reset thd->net.last_err* using
  the function THD::clear_error() which is backported from 4.1.
  A new test to see if now only real errors get to the binlog (note: the test
  uses "rm").
  
  Also a bit of memory free/alloc saving in log_event.cc (do not free the whole
  mem_root after every query in the slave SQL thread: we can keep the initial
  block of it; which will be freed when the thread terminates).

  mysql-test/t/rpl_EE_error.test
    1.1 03/12/16 11:10:37 guilhem@mysql.com +30 -0

  mysql-test/t/rpl_EE_error.test
    1.0 03/12/16 11:10:37 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/rpl_EE_error.test

  mysql-test/r/rpl_EE_error.result
    1.1 03/12/16 11:10:36 guilhem@mysql.com +16 -0

  sql/sql_update.cc
    1.54.8.1 03/12/16 11:10:36 guilhem@mysql.com +4 -0
    clear the error in thd->net.last_errno as there was no error

  sql/sql_table.cc
    1.112.11.1 03/12/16 11:10:36 guilhem@mysql.com +5 -0
    clear the error in thd->net.last_errno as there was no error

  mysql-test/r/rpl_EE_error.result
    1.0 03/12/16 11:10:36 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/r/rpl_EE_error.result

  sql/sql_rename.cc
    1.13.1.7 03/12/16 11:10:30 guilhem@mysql.com +1 -0
    clear the error in thd->net.last_errno as there was no error

  sql/sql_parse.cc
    1.218.34.1 03/12/16 11:10:30 guilhem@mysql.com +2 -0
    clear the error in thd->net.last_errno as there was no error

  sql/sql_insert.cc
    1.63.3.1 03/12/16 11:10:29 guilhem@mysql.com +5 -1
    clear the error in thd->net.last_errno as there was no error

  sql/sql_delete.cc
    1.74.5.1 03/12/16 11:10:29 guilhem@mysql.com +5 -0
    clear the error in thd->net.last_errno as there was no error

  sql/sql_db.cc
    1.39.1.24 03/12/16 11:10:29 guilhem@mysql.com +2 -0
    clear the error in thd->net.last_errno as there was no error

  sql/sql_class.h
    1.111.5.1 03/12/16 11:10:29 guilhem@mysql.com +9 -0
    Backport of THD::clear_error() from 4.1:
    clears the error in thd->net.last_errno

  sql/sql_base.cc
    1.117.8.1 03/12/16 11:10:28 guilhem@mysql.com +1 -1
    clear the error in thd->net.last_errno as there was no error

  sql/sql_acl.cc
    1.51.14.1 03/12/16 11:10:28 guilhem@mysql.com +1 -0
    clear the error in thd->net.last_errno as there was no error

  sql/log_event.cc
    1.77.1.64 03/12/16 11:10:28 guilhem@mysql.com +3 -3
    In the slave SQL thread, it's a waste to free the initial block of the mem_root
    after every query. We can instead keep it. It will be freed when the thread
    terminates (in THD::~THD()).

ChangeSet
  1.1616.1.64 03/12/16 11:44:22 jani@rhols221.adsl.netsonic.fi +1 -0
  Some minor code clean up.

  client/mysqltest.c
    1.92.1.21 03/12/16 11:44:12 jani@rhols221.adsl.netsonic.fi +3 -3
    Some minor code clean up.

ChangeSet
  1.1616.1.63 03/12/16 06:09:44 jani@rhols221.adsl.netsonic.fi +3 -0
  Added support for multi statement tests. Use mysqltest internal
  command delimiter to change the default delimiter (;) to something
  else, a string upto 16 characters is allowed. Separate the sub
  queries with ';' and end the whole statement with your own delimiter.

  client/mysqltest.c
    1.92.1.20 03/12/16 06:09:38 jani@rhols221.adsl.netsonic.fi +218 -186
    Added support for multi statement tests. Use mysqltest internal
    command delimiter to change the default delimiter (;) to something
    else, a string upto 16 characters is allowed. Separate the sub
    queries with ';' and end the whole statement with your own delimiter.

  mysql-test/r/multi_statement.result
    1.1 03/12/16 06:02:06 jani@rhols221.adsl.netsonic.fi +33 -0

  mysql-test/r/multi_statement.result
    1.0 03/12/16 06:02:06 jani@rhols221.adsl.netsonic.fi +0 -0
    BitKeeper file /home/my/bk/mysql-4.1/mysql-test/r/multi_statement.result

  mysql-test/t/multi_statement.test
    1.1 03/12/16 06:02:01 jani@rhols221.adsl.netsonic.fi +13 -0

  mysql-test/t/multi_statement.test
    1.0 03/12/16 06:02:01 jani@rhols221.adsl.netsonic.fi +0 -0
    BitKeeper file /home/my/bk/mysql-4.1/mysql-test/t/multi_statement.test

ChangeSet
  1.1616.1.62 03/12/16 02:23:40 monty@mysql.com +4 -0
  Cleanup

  mysql-test/t/rpl_log_pos.test
    1.27 03/12/16 02:23:38 monty@mysql.com +0 -1
    Cleanup

  mysql-test/t/func_set.test
    1.9 03/12/16 02:23:37 monty@mysql.com +4 -5
    Cleanup

  mysql-test/r/func_set.result
    1.9 03/12/16 02:23:37 monty@mysql.com +6 -6
    Cleanup

  client/mysqltest.c
    1.92.1.19 03/12/16 02:23:37 monty@mysql.com +0 -4
    Remove not needed include files

ChangeSet
  1.1616.1.60 03/12/15 18:10:46 monty@mysql.com +2 -0
  Updated results

  mysql-test/r/mysqldump.result
    1.9.1.2 03/12/15 18:10:43 monty@mysql.com +1 -1
    Updated results

  mysql-test/r/create.result
    1.59 03/12/15 18:10:43 monty@mysql.com +1 -1
    Updated results

ChangeSet
  1.1616.50.1 03/12/15 21:01:38 ram@gw.mysql.r18.ru +3 -0
  part one of the fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly

  sql/sql_show.cc
    1.122.1.16 03/12/15 21:01:13 ram@gw.mysql.r18.ru +4 -4
    part one of the fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly

  mysql-test/t/type_enum.test
    1.7 03/12/15 21:01:13 ram@gw.mysql.r18.ru +10 -0
    test for the bug #2077: accented characters in enum/defaul values are reported incorrectly

  mysql-test/r/type_enum.result
    1.13 03/12/15 21:01:13 ram@gw.mysql.r18.ru +10 -0
    test for the bug #2077: accented characters in enum/defaul values are reported incorrectly

ChangeSet
  1.1346.1.311 03/12/15 18:14:07 Sinisa@sinisa.nasamreza.org +1 -0
  Merge

  client/mysql.cc
    1.93.1.53 03/12/15 18:14:01 Sinisa@sinisa.nasamreza.org +0 -0
    SCCS merged

ChangeSet
  1.1616.1.59 03/12/15 18:02:29 monty@mysql.com +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/my/mysql-4.1

  mysql-test/t/create.test
    1.38 03/12/15 18:02:28 monty@mysql.com +0 -0
    Auto merged

  mysql-test/r/create.result
    1.58 03/12/15 18:02:28 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.49.1 03/12/15 17:58:15 monty@mysql.com +9 -0
  Added missing timeout function for named pipes and shared memory (fixes core dump on windows)
  Signed auto_increment keys for HASH tables (like for MyISAM tables in 4.0)
  nitialize system_charset_info() early. Fixes core dump when starting windows service

  vio/viosocket.c
    1.22 03/12/15 17:58:12 monty@mysql.com +7 -0
    Added missing timeout function for named pipes and shared memory (fixes core dump on windows)

  vio/vio_priv.h
    1.2 03/12/15 17:58:12 monty@mysql.com +2 -0
    Added missing timeout function for named pipes and shared memory (fixes core dump on windows)

  vio/vio.c
    1.17 03/12/15 17:58:12 monty@mysql.com +2 -0
    Added missing timeouts for named pipes and shared memory (fixes core dump on windows)

  sql/mysqld.cc
    1.356.1.74 03/12/15 17:58:12 monty@mysql.com +3 -0
    Initialize system_charset_info() early. Fixes core dump when starting windows service

  sql/item.cc
    1.58.1.49 03/12/15 17:58:12 monty@mysql.com +49 -38
    Use normal field create function instead of special functions just made for tmp_table_field_from_field_type

  sql/field.h
    1.87 03/12/15 17:58:12 monty@mysql.com +2 -20
    Remove not needed functions

  mysql-test/t/create.test
    1.35.1.1 03/12/15 17:58:12 monty@mysql.com +8 -2
    More test for type returned by if_null()

  mysql-test/r/create.result
    1.55.1.1 03/12/15 17:58:12 monty@mysql.com +22 -0
    More test for type returned by if_null()

  heap/hp_hash.c
    1.27 03/12/15 17:58:12 monty@mysql.com +50 -13
    Signed auto_increment keys for HASH tables (like for MyISAM tables in 4.0)

ChangeSet
  1.1624.1.31 03/12/15 13:24:16 pem@mysql.comhem.se +7 -0
  Fixed various memory leaks.

  sql/sql_yacc.yy
    1.265 03/12/15 13:24:12 pem@mysql.com +2 -2
    Fixed memory leaks. Make sure we use the right mem_root during parsing.

  sql/sql_parse.cc
    1.316 03/12/15 13:24:12 pem@mysql.com +6 -0
    Fixed memory leaks. Don't forget to free the temporary object created at definition.

  sql/sp_head.h
    1.29 03/12/15 13:24:12 pem@mysql.com +1 -1
    Fixed memory leaks. Make sure we use the right mem_root during parsing.

  sql/sp_head.cc
    1.59 03/12/15 13:24:12 pem@mysql.com +9 -6
    Fixed memory leaks. Make sure we use the right mem_root during parsing.

  sql/sp_cache.h
    1.5 03/12/15 13:24:12 pem@mysql.com +7 -4
    Fixed memory leaks. Use implicit delete of objects to make sure
    they're always freed.

  sql/sp_cache.cc
    1.4 03/12/15 13:24:12 pem@mysql.com +13 -5
    Fixed memory leaks. Use implicit delete of objects to make sure
    they're always freed.

  sql/sp.cc
    1.37 03/12/15 13:24:12 pem@mysql.com +4 -16
    Fixed memory leaks. Deletion of sps now in sp_cache.

ChangeSet
  1.1346.466.3 03/12/14 21:31:02 monty@mysql.com +5 -0
  Portablity fix

  mysql-test/t/timezone.test
    1.3 03/12/14 21:31:01 monty@mysql.com +12 -6
    Portability fix (For AIX 4.3 and other machines that doesn't support MET timezone)

  mysql-test/t/mysqldump.test
    1.1.1.4 03/12/14 21:31:01 monty@mysql.com +3 -0
    Portablity fix (Some machines like OSF doesn't read a big double as 'inf'

  mysql-test/r/timezone.result
    1.3 03/12/14 21:31:01 monty@mysql.com +9 -6
    Portability fix (For AIX 4.3 and other machines that doesn't support MET timezone)

  mysql-test/r/mysqldump.result
    1.1.1.4 03/12/14 21:31:01 monty@mysql.com +1 -1
    Portablity fix

  mysql-test/r/have_met_timezone.require
    1.5 03/12/14 21:31:01 monty@mysql.com +2 -2
    Portability fix (For AIX 4.3 and other machines that doesn't support MET timezone)

ChangeSet
  1.1346.466.2 03/12/14 08:12:07 monty@mysql.com +3 -0
  Fixed bug in last push found by valgrind

  sql/sql_update.cc
    1.54.1.42 03/12/14 08:12:05 monty@mysql.com +1 -1
    Initalize not initialized variable

  sql/opt_range.cc
    1.54.1.37 03/12/14 08:12:05 monty@mysql.com +7 -8
    Fixed bug in last push (did not fill max string properly with end space)

  myisam/mi_dbug.c
    1.9.1.1 03/12/14 08:12:05 monty@mysql.com +4 -0
    Added comment to warn about probabably unimportant valgrind warning

ChangeSet
  1.1346.466.1 03/12/14 06:39:52 monty@mysql.com +22 -0
  Extend max_allowed_packet to 2G in mysql and mysqldump (Bug #2105)
  Don't dump data for MRG_ISAM or MRG_MYISAM tables. (Bug #1846)
  Ensure that 'lower_case_table_names' is always set on case insensitive file systems. (Bug #1812)
  One can now configure MySQL as windows service as a normal user. (Bug #1802)
  Database names is now compared with lower case in ON clause when lower_case_table_names is set. (Bug #1736)
  IGNORE ... LINES option didn't work when used with fixed length rows. (Bug #1704)
  Change INSERT DELAYED ... SELECT... to INSERT .... SELECT (Bug #1983)
  Safety fix for service 'mysql start' (Bug #1815)

  mysql-test/std_data/loaddata4.dat
    1.1 03/12/14 06:39:50 monty@mysql.com +1 -0

  mysql-test/std_data/loaddata3.dat
    1.1 03/12/14 06:39:50 monty@mysql.com +6 -0

  support-files/mysql.server.sh
    1.29.1.4 03/12/14 06:39:50 monty@mysql.com +1 -1
    Safety fix (Bug #1815)

  strings/ctype-tis620.c
    1.16.1.7 03/12/14 06:39:50 monty@mysql.com +12 -6
    Ensure that memory is freed properly (Partly becasue of bug #1770)
    Bar should check the proposed patch in #1770 if we can use it

  sql/sql_parse.cc
    1.218.1.136 03/12/14 06:39:50 monty@mysql.com +8 -5
    Change INSERT DELAYED ... SELECT... to INSERT .... SELECT

  sql/sql_load.cc
    1.34.1.20 03/12/14 06:39:50 monty@mysql.com +49 -14
    IGNORE ... LINES option didn't work when used with fixed length rows. (Bug #1704)
    

  sql/sql_class.h
    1.111.1.59 03/12/14 06:39:50 monty@mysql.com +1 -1
    Fixed type

  sql/sql_base.cc
    1.117.1.52 03/12/14 06:39:50 monty@mysql.com +13 -0
    Database names is now compared with lower case in ON clause when lower_case_table_names is set. (Bug #1736)

  sql/nt_servc.cc
    1.11.1.3 03/12/14 06:39:50 monty@mysql.com +2 -2
    One can now configure MySQL as windows service as a normal user. (Bug #1802)

  sql/mysqld.cc
    1.297.1.173 03/12/14 06:39:50 monty@mysql.com +70 -22
    Merge pidfile create code
    Ensure that 'lower_case_table_names' is always set on case insensitive file systems. (Bug #1812)

  sql/item.h
    1.20.1.23 03/12/14 06:39:50 monty@mysql.com +1 -3
    Moved function to item.cc

  sql/item.cc
    1.19.1.16 03/12/14 06:39:50 monty@mysql.com +8 -0
    Made function not inline (to make it easier to modify it without recompilation of all files)
    

  mysql-test/t/lowercase_table.test
    1.1.1.4 03/12/14 06:39:50 monty@mysql.com +5 -2
    Test mixed lower/uppercase database names

  mysql-test/t/loaddata.test
    1.1.1.3 03/12/14 06:39:50 monty@mysql.com +11 -0
    Added test of LOAD DATA INFILE ... IGNORE # LINES for fixed size tables

  mysql-test/std_data/loaddata4.dat
    1.0 03/12/14 06:39:50 monty@mysql.com +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/std_data/loaddata4.dat

  mysql-test/std_data/loaddata3.dat
    1.0 03/12/14 06:39:50 monty@mysql.com +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/std_data/loaddata3.dat

  mysql-test/t/insert.test
    1.8.1.3 03/12/14 06:39:49 monty@mysql.com +1 -1
    Test INSERT ... DELAYED ... SELECT

  mysql-test/r/lowercase_table.result
    1.2.1.3 03/12/14 06:39:49 monty@mysql.com +8 -2
    Update test results

  mysql-test/r/loaddata.result
    1.1.1.3 03/12/14 06:39:49 monty@mysql.com +18 -0
    Update test results

  mysql-test/r/insert.result
    1.9.1.4 03/12/14 06:39:49 monty@mysql.com +1 -1
    Update test results

  include/my_global.h
    1.34.1.26 03/12/14 06:39:49 monty@mysql.com +3 -0
    Portability fix (Bug #1924)

  configure.in
    1.191.1.100 03/12/14 06:39:49 monty@mysql.com +1 -1
    Test for file linux/config.h

  client/mysqldump.c
    1.65.1.36 03/12/14 06:39:49 monty@mysql.com +96 -7
    Extend max_allowed_packet to 2G (Bug #2105)
    Don't dump data for MRG_ISAM or MRG_MYISAM tables. (Bug #1846)

  client/mysql.cc
    1.93.6.1 03/12/14 06:39:49 monty@mysql.com +2 -2
    Extend max_allowed_packet to 2G (Bug #2105)

ChangeSet
  1.1616.1.58 03/12/13 18:00:15 miguel@hegel.local +1 -0
  Translation update

  sql/share/portuguese/errmsg.txt
    1.64.1.38 03/12/13 17:59:36 miguel@hegel.local +26 -26
    Translation update

ChangeSet
  1.1616.1.56 03/12/13 18:49:10 serg@serg.mylan +3 -0
  insert table select * from table2 now converts charsets correctly

  sql/field_conv.cc
    1.23 03/12/13 18:49:05 serg@serg.mylan +4 -4
    insert table select * from table2 now converts charsets correctly

  mysql-test/t/ctype_recoding.test
    1.10 03/12/13 18:49:05 serg@serg.mylan +14 -2
    insert table select * from table2 now converts charsets correctly

  mysql-test/r/ctype_recoding.result
    1.15 03/12/13 18:49:05 serg@serg.mylan +22 -2
    insert table select * from table2 now converts charsets correctly

ChangeSet
  1.1624.1.30 03/12/13 16:40:52 pem@mysql.comhem.se +14 -0
  WL#1365: Implement definer's rights execution of stored procedures.
  (Also put the hostpart back in the definer column.)

  mysql-test/t/sp-security.test
    1.1 03/12/13 16:40:48 pem@mysql.com +99 -0

  mysql-test/r/sp-security.result
    1.1 03/12/13 16:40:48 pem@mysql.com +44 -0

  sql/sql_yacc.yy
    1.264 03/12/13 16:40:48 pem@mysql.com +1 -1
    Fixed typo.

  sql/sql_parse.cc
    1.315 03/12/13 16:40:48 pem@mysql.com +5 -0
    (Maybe) switch security context before invoking a stored procedure.

  sql/sql_acl.h
    1.27 03/12/13 16:40:48 pem@mysql.com +1 -0
    New function acl_getroot_no_password() for getting the privileges used when
    calling an SP with sql security definer.

  sql/sql_acl.cc
    1.84 03/12/13 16:40:48 pem@mysql.com +60 -0
    New function acl_getroot_no_password() for getting the privileges used when
    calling an SP with sql security definer.

  sql/sp_head.h
    1.28 03/12/13 16:40:48 pem@mysql.com +24 -11
    Moved set_info() definition here from sp_head.h.
    creator is now called definer, and is split into a user and host part.
    Added functions for (possible) change and restore of privileges, for sql security
    definer calls.

  sql/sp_head.cc
    1.58 03/12/13 16:40:48 pem@mysql.com +97 -5
    Some fixes in the way things are allocated, and moved set_info() definition
    here from sp_head.h. creator is now called definer, and is split into a
    user and host part.
    Added functions for (possible) change and restore of privileges, for sql security
    definer calls.

  sql/sp.cc
    1.36 03/12/13 16:40:48 pem@mysql.com +15 -13
    Renamed creator into definer, for more consistent terminology, and put the
    hostpart back.

  sql/item_func.cc
    1.136 03/12/13 16:40:48 pem@mysql.com +9 -1
    (Maybe) switch security context before invoking a stored function.

  mysql-test/t/sp.test
    1.43 03/12/13 16:40:48 pem@mysql.com +0 -20
    Moved error test to sp-error.test.
    Put hostpart back into definer column in mysql.proc.

  mysql-test/t/sp-security.test
    1.0 03/12/13 16:40:48 pem@mysql.com +0 -0
    BitKeeper file /home/pem/work/mysql-5.0/mysql-test/t/sp-security.test

  mysql-test/t/sp-error.test
    1.27 03/12/13 16:40:48 pem@mysql.com +21 -0
    Moved error test from sp.test

  mysql-test/r/sp.result
    1.44 03/12/13 16:40:48 pem@mysql.com +5 -16
    Moved error test to sp-error.test.
    Put hostpart back into definer column in mysql.proc.

  mysql-test/r/sp-security.result
    1.0 03/12/13 16:40:48 pem@mysql.com +0 -0
    BitKeeper file /home/pem/work/mysql-5.0/mysql-test/r/sp-security.result

  mysql-test/r/sp-error.result
    1.27 03/12/13 16:40:48 pem@mysql.com +11 -0
    Moved error test from sp.test

ChangeSet
  1.1616.48.2 03/12/13 17:20:35 Sinisa@sinisa.nasamreza.org +3 -0
  Already approved bug fix for #1561.
  
  Bug happens in INTERVAL function when number of compared arguments
  is 8 or more.

  sql/item_cmpfunc.cc
    1.111.1.5 03/12/13 17:20:29 Sinisa@sinisa.nasamreza.org +1 -1
    Already approved bug fix for #1561.
    
    Bug happens in INTERVAL function when number of compared arguments
    is 8 or more.

  mysql-test/t/func_set.test
    1.8 03/12/13 17:20:29 Sinisa@sinisa.nasamreza.org +5 -0
    Already approved bug fix for #1561.
    
    Bug happens in INTERVAL function when number of compared arguments
    is 8 or more.

  mysql-test/r/func_set.result
    1.8 03/12/13 17:20:29 Sinisa@sinisa.nasamreza.org +6 -0
    Already approved bug fix for #1561.
    
    Bug happens in INTERVAL function when number of compared arguments
    is 8 or more.

ChangeSet
  1.1346.1.310 03/12/13 15:41: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/field.cc
    1.51.1.29 03/12/13 15:41:15 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1346.462.4 03/12/13 14:51:05 Sinisa@sinisa.nasamreza.org +1 -0
  Changing a maxumum value for a variable at a request of one
  customer and Dean Ellis.

  client/mysql.cc
    1.93.1.52 03/12/13 14:51:01 Sinisa@sinisa.nasamreza.org +1 -1
    Changing a maxumum value for a variable at a request of one
    customer and Dean Ellis.

ChangeSet
  1.1346.465.4 03/12/13 04:33:36 lenz@mysql.com +1 -0
   - Output redirection does not work with run_command(), use system()
     instead.

  Build-tools/Bootstrap
    1.8.1.9 03/12/13 04:33:29 lenz@mysql.com +2 -3
     - Output redirection does not work with run_command(), use system()
       instead.

ChangeSet
  1.1346.465.3 03/12/13 04:23:07 lenz@mysql.com +1 -0
   - added missing space for previous commit

  Build-tools/Bootstrap
    1.8.1.8 03/12/13 04:22:58 lenz@mysql.com +1 -1
     - added missing space for previous commit

ChangeSet
  1.1346.465.2 03/12/13 03:52:19 lenz@mysql.com +1 -0
   - fixed file permissions for the server RPM docs directory (BUG 1672)

  support-files/mysql.spec.sh
    1.61.1.14 03/12/13 03:52:17 lenz@mysql.com +15 -6
     - fixed file permissions for the server docs directory (BUG 1672)

ChangeSet
  1.1346.465.1 03/12/13 03:49:50 lenz@mysql.com +1 -0
   - Some small Perl enhancements for Do-compile: use more Perl builtins.

  Build-tools/Do-compile
    1.74.1.5 03/12/13 03:49:27 lenz@mysql.com +5 -3
     - use more Perl builtins (e.g. hostname(), basename()) instead of forking
       subprocesses

ChangeSet
  1.1346.1.308 03/12/13 04:05:54 monty@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.0
  into mysql.com:/my/mysql-4.0

  sql/sql_update.cc
    1.54.1.41 03/12/13 04:05:54 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.464.1 03/12/12 23:21:56 monty@mysql.com +4 -0
  Merge

ChangeSet
  1.1346.463.2 03/12/12 22:02:50 vva@eagle.mysql.r18.ru +1 -0
  refixed last vva patch with monty's instructions

  sql/field.cc
    1.51.4.5 03/12/12 22:02:49 vva@eagle.mysql.r18.ru +2 -2
    refixed last vva patch with monty's instructions

ChangeSet
  1.1346.463.1 03/12/12 21:26:44 vva@eagle.mysql.r18.ru +3 -0
  added checking for old cuted value in Field_enum::store
  (bug #2023)

  sql/field.cc
    1.51.4.4 03/12/12 21:26:22 vva@eagle.mysql.r18.ru +1 -1
    added checking for old cuted value in Field_enum::store
    (bug #2023)

  mysql-test/t/type_enum.test
    1.5.1.1 03/12/12 21:26:22 vva@eagle.mysql.r18.ru +11 -0
    added tests for wrong enum values (bug #2023)

  mysql-test/r/type_enum.result
    1.7.1.1 03/12/12 21:26:22 vva@eagle.mysql.r18.ru +10 -0
    added tests for wrong enum values (bug #2023)

ChangeSet
  1.1346.462.2 03/12/12 19:00:16 heikki@hundin.mysql.fi +4 -0
  btr0cur.c, row0umod.c:
    Fix bug: if one updated a secondary index column so that its alphabetical value did not change (e.g., abc -> aBc) and rolled back the update, InnoDB failed to return the value in the secondary index to its original value
  row0upd.h:
    Correct typing error
  sync0sync.ic:
    Remove inadvertently pushed sync debug code

ChangeSet
  1.1346.455.2 03/12/12 23:06:26 lenz@mysql.com +2 -0
   - Reworked the Do-rpm build script to be more flexible
   - Reworked testing for gcc3 in the RPM spec file a bit

  support-files/mysql.spec.sh
    1.61.1.13 03/12/12 23:06:18 lenz@mysql.com +5 -1
     - made testing for gcc3 a bit more robust and not to stomp on user
       settings for CXX

  Build-tools/Do-rpm
    1.26 03/12/12 23:06:18 lenz@mysql.com +58 -27
    Big overhaul:
    
     - Give the spec file name as the option, not the version number (required
       to be able to build commercial RPMs, too)
     - Some more logging and debugging, more documentation

  mysql-test/t/multi_update.test
    1.17.1.11 03/12/12 23:21:55 monty@mysql.com +0 -0
    SCCS merged

  mysql-test/r/multi_update.result
    1.15.1.11 03/12/12 23:21:55 monty@mysql.com +0 -0
    SCCS merged

ChangeSet
  1.1346.461.1 03/12/12 17:18:48 vva@eagle.mysql.r18.ru +1 -0
  changed %ld on %lu for output of mysql_thread_id(&mysql)
  as is thread_id has type ulong
  (bug #1951 thread id is printed as "signed" instead of "unsigned" in 'mysql')

  client/mysql.cc
    1.93.1.51 03/12/12 17:18:22 vva@eagle.mysql.r18.ru +4 -4
    changed %ld on %lu for output of mysql_thread_id(&mysql)
    as is thread_id has type ulong
    (bug #1951 thread id is printed as "signed" instead of "unsigned" in 'mysql')

ChangeSet
  1.1346.460.1 03/12/12 13:14:59 igor@rurik.mysql.com +3 -0
  sql_delete.cc, sql_update.cc, sql_class.h:
    Simplification of the previous fix for multi-update/delete.

  sql/sql_delete.cc
    1.74.1.28 03/12/12 13:14:39 igor@rurik.mysql.com +5 -6
    Simplification of the previous fix for multi-update/delete.

  sql/sql_update.cc
    1.54.7.1 03/12/12 13:14:19 igor@rurik.mysql.com +2 -3
    Simplification of the previous fix for multi-update/delete.

  sql/sql_class.h
    1.111.1.58 03/12/12 13:13:06 igor@rurik.mysql.com +1 -3
    Simplification of the previous fix for multi-update/delete.

  sql/sql_update.cc
    1.54.1.40 03/12/12 22:27:18 monty@mysql.com +0 -0
    Auto merged

  sql/sql_select.cc
    1.152.1.117 03/12/12 22:27:18 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.459.1 03/12/12 22:26:58 monty@mysql.com +40 -0
  Fix autoincrement for signed columns (Bug #1366)
  Fixed problem with char > 128 in QUOTE() function. (Bug #1868)
  Disable creation of symlinks if my_disable_symlink is set
  Fixed searching of TEXT with end space. (Bug #1651)
  Fixed caching bug in multi-table-update where same table was used twice. (Bug #1711)
  Fixed problem with UNIX_TIMESTAMP() for timestamps close to 0. (Bug #1998)
  Fixed timestamp.test

  sql/time.cc
    1.19.1.8 03/12/12 22:26:56 monty@mysql.com +3 -1
    Fixed problem with UNIX_TIMESTAMP() for timestamps close to 0. (Bug #1998)

  sql/table.h
    1.31.1.14 03/12/12 22:26:56 monty@mysql.com +1 -1
    Fixed caching bug in multi-table-update where same table was used twice.
    (Bug #1711)

  sql/table.cc
    1.46.1.22 03/12/12 22:26:56 monty@mysql.com +15 -6
    Fixed searching of TEXT with end space. (Bug #1651)

  sql/sql_update.cc
    1.54.6.1 03/12/12 22:26:56 monty@mysql.com +21 -1
    Fixed caching bug in multi-table-update where same table was used twice.
    (Bug #1711)

  sql/sql_table.cc
    1.112.1.57 03/12/12 22:26:56 monty@mysql.com +4 -4
    Fixed searching of TEXT with end space. (Bug #1651)

  sql/sql_select.cc
    1.152.21.1 03/12/12 22:26:56 monty@mysql.com +7 -5
    Fixed searching of TEXT with end space. (Bug #1651)

  sql/sql_parse.cc
    1.218.1.135 03/12/12 22:26:56 monty@mysql.com +1 -2
    Make check_dup() global

  sql/sql_acl.cc
    1.51.1.69 03/12/12 22:26:56 monty@mysql.com +2 -2
    Reset ip and ip_mask if hostname is NULL

  sql/records.cc
    1.19.4.1 03/12/12 22:26:56 monty@mysql.com +6 -5
    Fixed caching bug in multi-table-update where same table was used twice.
    (Bug #1711)

  sql/opt_range.cc
    1.54.1.36 03/12/12 22:26:56 monty@mysql.com +37 -9
    Fixed searching of TEXT with end space. (Bug #1651)

  sql/mysql_priv.h
    1.150.1.60 03/12/12 22:26:56 monty@mysql.com +1 -0
    Make check_dup() external

  sql/item_strfunc.cc
    1.36.1.37 03/12/12 22:26:56 monty@mysql.com +1 -1
    Fixed problem with char > 128 in QUOTE() function. (Bug #1868)

  sql/ha_innodb.cc
    1.73.1.114 03/12/12 22:26:56 monty@mysql.com +2 -2
    HA_PART_KEY -> HA_PART_KEY_SEG

  sql/field.h
    1.33.1.19 03/12/12 22:26:56 monty@mysql.com +4 -3
    Indentation cleanup

  mysys/my_symlink2.c
    1.6 03/12/12 22:26:56 monty@mysql.com +11 -1
    Disable creation of symlinks if my_disable_symlink is set

  mysql-test/t/type_blob.test
    1.8.1.3 03/12/12 22:26:56 monty@mysql.com +49 -0
    Test of key search on TEXT/VARCHAR column with end space

  mysql-test/t/truncate.test
    1.8.1.1 03/12/12 22:26:56 monty@mysql.com +12 -0
    Test of truncate and auto_increment

  mysql-test/t/timezone.test
    1.2 03/12/12 22:26:56 monty@mysql.com +8 -2
    Test of from_unixtime()

  mysql-test/t/symlink.test
    1.3.1.3 03/12/12 22:26:56 monty@mysql.com +22 -0
    Test of ALTER TABLE and symlinks

  mysql-test/t/multi_update.test
    1.17.3.1 03/12/12 22:26:56 monty@mysql.com +10 -0
    Test of multi-update bug

  mysql-test/t/innodb.test
    1.28.1.22 03/12/12 22:26:56 monty@mysql.com +12 -0
    Add test for InnoDB behaviour with TRUNCATE

  mysql-test/t/func_time.test
    1.14.1.4 03/12/12 22:26:56 monty@mysql.com +7 -0
    Add test of unix_timestamp()

  mysql-test/t/func_str.test
    1.15.2.6 03/12/12 22:26:56 monty@mysql.com +1 -0
    Added test of QUOTE()

  mysql-test/t/auto_increment.test
    1.5.1.2 03/12/12 22:26:56 monty@mysql.com +19 -0
    Test auto_increment with signed numbers

  mysql-test/r/type_blob.result
    1.8.1.3 03/12/12 22:26:56 monty@mysql.com +146 -0
    Test of key search on TEXT/VARCHAR column with end space

  mysql-test/r/truncate.result
    1.8.1.1 03/12/12 22:26:56 monty@mysql.com +9 -0
    Test of truncate and auto_increment

  mysql-test/r/timezone.result
    1.2 03/12/12 22:26:56 monty@mysql.com +6 -0
    Test of from_unixtime()

  mysql-test/r/symlink.result
    1.4.1.3 03/12/12 22:26:56 monty@mysql.com +20 -0
    Test of ALTER TABLE and symlinks

  mysql-test/r/multi_update.result
    1.15.3.1 03/12/12 22:26:56 monty@mysql.com +10 -0
    Test of multi-update bug

  mysql-test/r/innodb.result
    1.40.1.33 03/12/12 22:26:56 monty@mysql.com +10 -0
    Add test for InnoDB behaviour with TRUNCATE

  mysql-test/r/have_met_timezone.require
    1.4 03/12/12 22:26:56 monty@mysql.com +1 -1
    Fixed test

  mysql-test/r/func_time.result
    1.17.1.4 03/12/12 22:26:56 monty@mysql.com +9 -0
    Add test of unix_timestamp()

  mysql-test/r/func_str.result
    1.16.2.7 03/12/12 22:26:56 monty@mysql.com +3 -0
    Added test of QUOTE()

  mysql-test/r/binary.result
    1.8.1.1 03/12/12 22:26:56 monty@mysql.com +1 -0
    Update results (old result was wrong)

  mysql-test/r/auto_increment.result
    1.8.1.1 03/12/12 22:26:56 monty@mysql.com +26 -0
    Test auto_increment with signed numbers

  myisam/mi_search.c
    1.30.1.6 03/12/12 22:26:56 monty@mysql.com +19 -6
    Ignore end space for VARCHAR/TEXT columns

  myisam/mi_open.c
    1.46.1.20 03/12/12 22:26:56 monty@mysql.com +2 -1
    Bug fix for future (doesn't affect current code)

  myisam/mi_key.c
    1.13.1.5 03/12/12 22:26:56 monty@mysql.com +44 -10
    Fix autoincrement for signed columns (Bug #1366). Patch by Holyfoot

  myisam/mi_check.c
    1.86.1.42 03/12/12 22:26:56 monty@mysql.com +1 -1
    Delete not used variable

  include/my_base.h
    1.30.1.11 03/12/12 22:26:56 monty@mysql.com +8 -2
    Add HA_END_SPACE_KEY to mark keys that has VARCHAR/TEXT fields.

ChangeSet
  1.1346.1.302 03/12/12 22:13:57 hf@deer.(none) +1 -0
  Fix #2093
  Update after discussion with Monty

  sql/sql_select.cc
    1.152.1.116 03/12/12 22:13:55 hf@deer.(none) +0 -7
    Wrong operation - deleted

ChangeSet
  1.1346.1.301 03/12/12 21:26:20 hf@deer.(none) +3 -0
  Proposed fix for #2093
  it happens because of the LEFT JOINT optimization in add_key_part()
  This optimization does exactly the same in JOIN and in WHERE conditions 
  Not right.
  I moved that optimization one level upper.

  sql/sql_select.cc
    1.152.1.115 03/12/12 21:26:19 hf@deer.(none) +22 -8
    optimizing of the left_join now only for WHERE conditions
    and for first table in list

  mysql-test/t/join_outer.test
    1.6.1.5 03/12/12 21:26:19 hf@deer.(none) +13 -0
    test case

  mysql-test/r/join_outer.result
    1.10.1.8 03/12/12 21:26:19 hf@deer.(none) +17 -0
    appropriate test result

  innobase/btr/btr0cur.c
    1.20.1.9 03/12/12 18:56:24 heikki@hundin.mysql.fi +2 -1
    Fix bug: if one updated a secondary index column so that its alphabetical value did not change (e.g., abc -> aBc) and rolled back the update, InnoDB failed to return the value in the secondary index to its original value

  innobase/row/row0umod.c
    1.11.1.1 03/12/12 18:56:15 heikki@hundin.mysql.fi +106 -18
    Fix bug: if one updated a secondary index column so that its alphabetical value did not change (e.g., abc -> aBc) and rolled back the update, InnoDB failed to return the value in the secondary index to its original value

  mysql-test/r/have_met_timezone.require
    1.3 03/12/12 17:40:04 monty@mysql.com +0 -0
    Rename: mysql-test/r/have_mst_timezone.require -> mysql-test/r/have_met_timezone.require

  mysql-test/r/have_mst_timezone.require
    1.2 03/12/12 17:39:24 monty@mysql.com +0 -0
    Rename: mysql-test/r/have_mest_timezone.require -> mysql-test/r/have_mst_timezone.require

  innobase/include/row0upd.h
    1.9 03/12/12 16:44:20 heikki@hundin.mysql.fi +1 -1
    Correct typing error

  innobase/include/sync0sync.ic
    1.11 03/12/12 16:41:31 heikki@hundin.mysql.fi +0 -2
    Remove inadvertently pushed sync debug code

ChangeSet
  1.1346.1.300 03/12/12 18:27:25 hf@deer.(none) +1 -0
  Edited fix for #1224.
  strcpy changed to strmake

  libmysqld/lib_sql.cc
    1.25.3.14 03/12/12 18:27:24 hf@deer.(none) +1 -1
    strcpy to strmake

ChangeSet
  1.1346.1.299 03/12/12 18:00:54 hf@deer.(none) +1 -0
  Fix for #1224 in 4.0
  we didn't specify thd->priv_host properly

  libmysqld/lib_sql.cc
    1.25.3.13 03/12/12 18:00:45 hf@deer.(none) +1 -0
    Specifying of thd->priv_host added

ChangeSet
  1.1624.1.29 03/12/12 14:12:38 pem@mysql.comhem.se +2 -0
  Don't want host in the definer's column.

  sql/sp.cc
    1.35 03/12/12 14:12:36 pem@mysql.com +1 -3
    Don't want host in the definer's column.

  mysql-test/r/sp.result
    1.43 03/12/12 14:12:36 pem@mysql.com +5 -5
    Don't want host in the definer's column.

ChangeSet
  1.1624.1.28 03/12/12 14:05:29 pem@mysql.comhem.se +10 -0
  In order to make ALTER PROCEDURE|FUNCTION work correctly, and in general to
  make characteristics (and SHOW) work right, we had to separate the old
  definition blob in the mysql.proc table into separate fields for parameters,
  return type, and body, and handle the characteristics (like SQL SECURITY)
  separately... and then reassemble the CREATE string for parsing, of course.
  This is rather ugly, mostly the parser bit. (Hopefully that will be better
  with the new parser.)

  sql/sql_yacc.yy
    1.263 03/12/12 14:05:24 pem@mysql.com +31 -8
    Separated the different parts of the definition strings: name, parameters,
    return type (for functions) and body.
    This is ugly and messy; hopefully there's a more elegant way to do this
    when the new parser is installed.

  sql/sp_head.h
    1.27 03/12/12 14:05:24 pem@mysql.com +21 -12
    Separated the different parts of the definition strings: name, parameters,
    return type (for functions) and body.

  sql/sp_head.cc
    1.57 03/12/12 14:05:24 pem@mysql.com +42 -15
    Rewrote much of the code related to the new mysql.proc schema with separate
    definition fields (have to assemble the definition string from its different
    parts now) and the way characteristics are now handled, in order to make ALTER
    actually work.

  sql/sp.h
    1.11 03/12/12 14:05:24 pem@mysql.com +2 -4
    Changed prototypes.

  sql/sp.cc
    1.34 03/12/12 14:05:24 pem@mysql.com +156 -67
    Separated the definitions string of the procedure into different columns.
    Rewrote much of the code related this (have a assemble the definition
    string from its different parts now) and the way characteristics are now
    handled, in order to make ALTER actually work.

  scripts/mysql_fix_privilege_tables.sql
    1.8 03/12/12 14:05:24 pem@mysql.com +4 -2
    Separated the definitions string of the procedure into different columns
    in the mysql.proc schema.

  scripts/mysql_create_system_tables.sh
    1.11 03/12/12 14:05:24 pem@mysql.com +4 -2
    Separated the definitions string of the procedure into different columns
    in the mysql.proc schema.

  mysql-test/t/sp.test
    1.42 03/12/12 14:05:24 pem@mysql.com +30 -0
    New characteristics tests.

  mysql-test/r/sp.result
    1.42 03/12/12 14:05:24 pem@mysql.com +43 -6
    New characteristics tests.

  Docs/sp-imp-spec.txt
    1.10 03/12/12 14:05:24 pem@mysql.com +7 -4
    Separated the definitions string of the procedure into different columns
    in the mysql.proc schema.

ChangeSet
  1.1346.1.298 03/12/12 08:09:25 heikki@hundin.mysql.fi +2 -0
  row0upd.h, row0upd.c:
    Remove wrong debug assertion and comment

  innobase/include/row0upd.h
    1.8 03/12/12 08:09:08 heikki@hundin.mysql.fi +2 -2
    Remove wrong debug assertion and comment

  innobase/row/row0upd.c
    1.18.1.2 03/12/12 08:08:26 heikki@hundin.mysql.fi +2 -4
    Remove wrong debug assertion and comment

ChangeSet
  1.1346.1.297 03/12/12 07:51:21 heikki@hundin.mysql.fi +9 -0
  Many files:
    Fix assertion failure on line 713 of row0upd.c if there is a column prefix index and the last characters in the prefix are spaces: do not assume that the length of alphabetically equal strings is the same; fix a buglet which could cause InnoDB to think that a secondary index record was not locked though it had been updated in a way which did not alpahabetically change its value, e.g., abc -> aBc

  innobase/lock/lock0lock.c
    1.20.1.5 03/12/12 07:49:25 heikki@hundin.mysql.fi +6 -0
    Fix assertion failure on line 713 of row0upd.c if there is a column prefix index and the last characters in the prefix are spaces: do not assume that the length of alphabetically equal strings is the same; fix a buglet which could cause InnoDB to think that a secondary index record was not locked though it had been updated in a way which did not alpahabetically change its value, e.g., abc -> aBc

  innobase/include/sync0sync.ic
    1.10 03/12/12 07:49:10 heikki@hundin.mysql.fi +2 -0
    Fix assertion failure on line 713 of row0upd.c if there is a column prefix index and the last characters in the prefix are spaces: do not assume that the length of alphabetically equal strings is the same; fix a buglet which could cause InnoDB to think that a secondary index record was not locked though it had been updated in a way which did not alpahabetically change its value, e.g., abc -> aBc

  innobase/include/row0upd.h
    1.7 03/12/12 07:49:07 heikki@hundin.mysql.fi +27 -4
    Fix assertion failure on line 713 of row0upd.c if there is a column prefix index and the last characters in the prefix are spaces: do not assume that the length of alphabetically equal strings is the same; fix a buglet which could cause InnoDB to think that a secondary index record was not locked though it had been updated in a way which did not alpahabetically change its value, e.g., abc -> aBc

  innobase/include/btr0cur.h
    1.11 03/12/12 07:49:06 heikki@hundin.mysql.fi +0 -16
    Fix assertion failure on line 713 of row0upd.c if there is a column prefix index and the last characters in the prefix are spaces: do not assume that the length of alphabetically equal strings is the same; fix a buglet which could cause InnoDB to think that a secondary index record was not locked though it had been updated in a way which did not alpahabetically change its value, e.g., abc -> aBc

  innobase/btr/btr0cur.c
    1.20.1.8 03/12/12 07:48:19 heikki@hundin.mysql.fi +25 -79
    Fix assertion failure on line 713 of row0upd.c if there is a column prefix index and the last characters in the prefix are spaces: do not assume that the length of alphabetically equal strings is the same; fix a buglet which could cause InnoDB to think that a secondary index record was not locked though it had been updated in a way which did not alpahabetically change its value, e.g., abc -> aBc

  innobase/row/row0vers.c
    1.11 03/12/12 07:48:11 heikki@hundin.mysql.fi +22 -5
    Fix assertion failure on line 713 of row0upd.c if there is a column prefix index and the last characters in the prefix are spaces: do not assume that the length of alphabetically equal strings is the same; fix a buglet which could cause InnoDB to think that a secondary index record was not locked though it had been updated in a way which did not alpahabetically change its value, e.g., abc -> aBc

  innobase/row/row0upd.c
    1.18.1.1 03/12/12 07:48:11 heikki@hundin.mysql.fi +76 -4
    Fix assertion failure on line 713 of row0upd.c if there is a column prefix index and the last characters in the prefix are spaces: do not assume that the length of alphabetically equal strings is the same; fix a buglet which could cause InnoDB to think that a secondary index record was not locked though it had been updated in a way which did not alpahabetically change its value, e.g., abc -> aBc

  innobase/row/row0sel.c
    1.28.1.15 03/12/12 07:48:11 heikki@hundin.mysql.fi +2 -6
    Fix assertion failure on line 713 of row0upd.c if there is a column prefix index and the last characters in the prefix are spaces: do not assume that the length of alphabetically equal strings is the same; fix a buglet which could cause InnoDB to think that a secondary index record was not locked though it had been updated in a way which did not alpahabetically change its value, e.g., abc -> aBc

  innobase/row/row0ins.c
    1.26.1.1 03/12/12 07:48:11 heikki@hundin.mysql.fi +21 -4
    Fix assertion failure on line 713 of row0upd.c if there is a column prefix index and the last characters in the prefix are spaces: do not assume that the length of alphabetically equal strings is the same; fix a buglet which could cause InnoDB to think that a secondary index record was not locked though it had been updated in a way which did not alpahabetically change its value, e.g., abc -> aBc

ChangeSet
  1.1346.458.1 03/12/12 03:39:29 dlenev@mysql.com +3 -0
  Fix for Bug #1952
  "SHOW TABLE STATUS very slow w/large number of tables"
  Replaced old algorithm which were used in my_dir() and stored
  all information about directory entries in one chunk of memory
  with new one which stores file names and MY_STAT structures in
  separate memroot, so now we don't need to copy this data during
  reallocation of dir_entry array.

  sql/sql_show.cc
    1.76.1.40 03/12/12 03:39:27 dlenev@mysql.com +1 -1
    Updated only place in code where mystat member
    of FILEINFO structure is used.

  mysys/my_lib.c
    1.15 03/12/12 03:39:27 dlenev@mysql.com +178 -161
    Replaced old algorithm in my_dir() which stored all information
    about directory entries in one chunk of memory with new one 
    which stores file names and MY_STAT structures in separate
    memroot. Now we don't copy this data during reallocation of 
    array with FILEINFO structures.
    Also tuned sizes of memory chunks during first-other
    reallocations (we suppose that we either have < 100 files 
    in the directory or > 1000 of them).

  include/my_dir.h
    1.7 03/12/12 03:39:27 dlenev@mysql.com +9 -2
    Changed mystat member of FILEINFO structure to pointer since 
    this prevents unneeded memory allocation and initialization.
    Added comment about new hidden members of MY_DIR structure.

ChangeSet
  1.1346.457.1 03/12/11 14:55:48 igor@rurik.mysql.com +6 -0
  Many files:
    Fixed a bug causing a crash for multi-update/multi-delete
    with impossible where (bug #1860).

  BitKeeper/etc/logging_ok
    1.206.1.91 03/12/11 14:55:48 igor@rurik.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  mysql-test/r/multi_update.result
    1.15.1.10 03/12/11 14:51:50 igor@rurik.mysql.com +23 -0
    Fixed a bug causing a crash for multi-update/multi-delete
    with impossible where (bug #1860).

  mysql-test/t/multi_update.test
    1.17.1.10 03/12/11 14:51:02 igor@rurik.mysql.com +26 -0
    Fixed a bug causing a crash for multi-update/multi-delete
    with impossible where (bug #1860).

  sql/sql_update.cc
    1.54.1.39 03/12/11 14:49:31 igor@rurik.mysql.com +6 -2
    Fixed a bug causing a crash for multi-update/multi-delete
    with impossible where (bug #1860).

  sql/sql_delete.cc
    1.74.1.27 03/12/11 14:47:41 igor@rurik.mysql.com +5 -1
    Fixed a bug causing a crash for multi-update/multi-delete
    with impossible where (bug #1860).

  sql/sql_class.h
    1.111.1.57 03/12/11 14:45:29 igor@rurik.mysql.com +3 -0
    Fixed a bug causing a crash for multi-update/multi-delete
    with impossible where (bug #1860).

ChangeSet
  1.1616.48.1 03/12/11 16:05:51 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
  Bug#2075 - fix reduce/reduce

  sql/sql_yacc.yy
    1.203.1.81 03/12/11 16:05:24 antony@ltantony.rdg.cyberkinetica.homeunix.net +11 -8
    Fix reduce/reduce introduced when fixing Bug#2075

ChangeSet
  1.1346.1.294 03/12/11 16:47:50 serg@serg.mylan +2 -0
  chk_del() should not check key delete-chain
  make a test for -inf more portable (-Inf)

  myisam/mi_check.c
    1.86.1.41 03/12/11 16:47:47 serg@serg.mylan +12 -7
    chk_del() should not check key delete-chain

  client/mysqldump.c
    1.65.1.35 03/12/11 16:47:47 serg@serg.mylan +3 -3
    make a test for -inf more portable (-Inf)

ChangeSet
  1.1346.456.1 03/12/11 16:01:37 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/field.cc
    1.51.1.28 03/12/11 15:42:18 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1346.1.293 03/12/11 17:37:45 ram@gw.mysql.r18.ru +3 -0
  Added --comments mysqldump option (default value is 1).
  Fixed mysqldump test.

  mysql-test/t/mysqldump.test
    1.1.1.3 03/12/11 17:37:43 ram@gw.mysql.r18.ru +10 -12
    fixed using --skip-comment option

  mysql-test/r/mysqldump.result
    1.1.1.3 03/12/11 17:37:43 ram@gw.mysql.r18.ru +20 -0
    fixed using --skip-comment option

  client/mysqldump.c
    1.65.1.34 03/12/11 17:37:43 ram@gw.mysql.r18.ru +14 -9
    Added --comments option (default value is 1).

ChangeSet
  1.1624.1.27 03/12/11 12:23:50 pem@mysql.comhem.se +3 -0
  WL#1364: Store some environmental values with SPs and use at invokation
  sql_mode is stored and used with SPs.
  sql_select_limit is always unlimited in SPs.

  sql/sp.cc
    1.33 03/12/11 12:23:46 pem@mysql.com +10 -0
    Store the sql_mode with the SP and reset it on retrieval.
    sql_select_limit is always maximum (default) in an SP,
    regardless of the setting at the time of create or call.

  mysql-test/t/sp.test
    1.41 03/12/11 12:23:46 pem@mysql.com +35 -0
    Test case for mode settings.

  mysql-test/r/sp.result
    1.41 03/12/11 12:23:46 pem@mysql.com +28 -0
    Test case for mode settings.

ChangeSet
  1.1616.1.54 03/12/11 12:02:26 serg@serg.mylan +1 -0
  mysqldump version updated

  client/mysqldump.c
    1.105 03/12/11 12:02:22 serg@serg.mylan +1 -1
    mysqldump version updated

ChangeSet
  1.1346.455.1 03/12/11 10:53:28 lenz@mysql.com +1 -0
   - Rather "bk cat" the files from the mysqldoc BK tree during Bootstrap
     than trying to copy them (they might have been "bk clean"ed and thus
     not available for copying)
   - Brushed up the Bootstrap online help a bit

  Build-tools/Bootstrap
    1.8.1.7 03/12/11 10:53:26 lenz@mysql.com +13 -8
     - Rather "bk cat" the files from the mysqldoc BK tree than trying to
       copy them (they might have been "bk clean"ed and thus not available
       for copying)
     - Brushed up the online help a bit

ChangeSet
  1.1346.1.292 03/12/11 13:50:47 ram@gw.mysql.r18.ru +2 -0
  Disable some tests until replace can handle regexp

  mysql-test/t/mysqldump.test
    1.1.1.2 03/12/11 13:50:45 ram@gw.mysql.r18.ru +11 -9
    Disable some tests until replace can handle regexp

  mysql-test/r/mysqldump.result
    1.1.1.2 03/12/11 13:50:45 ram@gw.mysql.r18.ru +0 -48
    Disable some tests until replace can handle regexp

ChangeSet
  1.1346.1.291 03/12/11 06:24:32 monty@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.0
  into mysql.com:/my/mysql-4.0

  mysys/my_thr_init.c
    1.21.1.3 03/12/11 06:24:31 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.454.1 03/12/11 06:24:08 monty@mysql.com +21 -0
  Fixed a possible memory leak on MacOSX when using the shared libmysql.so library (Bug #2061)
  mysql_server_init() now returns error code if something went wrong (Bug #2062)
  Don't use my_fopen() when reading symlink information as this may cause problems when a lot of files are opened.
  Free thread keys with pthread_key_delete() instead of relying on automatic free. (Bug #2062)
  Fixed bug in UNION statement with alias '*'. (Bug #1249)
  Fixed a bug in DELETE ... ORDER BY ... LIMIT where the rows where not deleted in the proper order. (Bug #1024).
  FOUND_ROWS() could return incorrect number of rows after a query with an impossible WHERE condition.
  HOW DATABASES doesn't anymore show .sym files (on windows) that doesn't point to a valid directory. (Bug #1385)

  sql/sql_yacc.yy
    1.145.1.76 03/12/11 06:24:05 monty@mysql.com +1 -0
    Allow syntax UNION DISTINCT

  sql/sql_show.cc
    1.76.1.39 03/12/11 06:24:05 monty@mysql.com +12 -0
    SHOW DATABASES doesn't anymore show .sym files (on windows) that doesn't point to a valid directory. (Bug #1385)

  sql/sql_select.cc
    1.152.1.114 03/12/11 06:24:05 monty@mysql.com +2 -0
    FOUND_ROWS() could return incorrect number of rows after a query with an impossible WHERE condition.

  sql/sql_delete.cc
    1.74.1.26 03/12/11 06:24:05 monty@mysql.com +9 -3
    Fixed a bug in DELETE ... ORDER BY ... LIMIT where the rows where not deleted in the proper order. (Bug #1024).

  sql/sql_base.cc
    1.117.1.51 03/12/11 06:24:05 monty@mysql.com +6 -1
    Fixed bug in UNION statement with alias '*'. (Bug #1249)

  mysys/my_thr_init.c
    1.21.2.1 03/12/11 06:24:05 monty@mysql.com +20 -6
    Free thread keys with pthread_key_delete() instead of relying on automatic free. (Bug #2062)

  mysys/my_lib.c
    1.14 03/12/11 06:24:05 monty@mysql.com +4 -2
    More debug information

  mysys/my_init.c
    1.21.1.7 03/12/11 06:24:05 monty@mysql.com +15 -5
    my_init() now returns error code if something went wrong

  mysys/mf_pack.c
    1.15 03/12/11 06:24:05 monty@mysql.com +14 -13
    Don't use my_fopen() when reading symlink information as this may cause problems when a lot of files are opened.

  mysql-test/t/union.test
    1.22.1.10 03/12/11 06:24:05 monty@mysql.com +8 -1
    Added test for problem with alias '*' (Bug #1249)

  mysql-test/t/select_found.test
    1.5.1.3 03/12/11 06:24:05 monty@mysql.com +14 -0
    Added test for problem with impossible WHERE (Bug #1468)

  mysql-test/t/limit.test
    1.5.1.1 03/12/11 06:24:05 monty@mysql.com +19 -3
    Added test for DELETE ... ORDER BY ... LIMIT (bug #1024)

  mysql-test/r/union.result
    1.17.1.11 03/12/11 06:24:05 monty@mysql.com +5 -1
    Update results

  mysql-test/r/select_found.result
    1.6.1.4 03/12/11 06:24:05 monty@mysql.com +19 -0
    Update results

  mysql-test/r/limit.result
    1.7 03/12/11 06:24:05 monty@mysql.com +20 -3
    Update results

  libmysql/libmysql.c
    1.95.1.43 03/12/11 06:24:05 monty@mysql.com +16 -6
    mysql_server_init() and mysql_once_init() now returns error code if something went wrong (Bug #2062)

  include/mysql_com.h
    1.43.1.11 03/12/11 06:24:05 monty@mysql.com +1 -1
    my_init() now returns error code if something went wrong

  include/mysql.h
    1.42.1.10 03/12/11 06:24:05 monty@mysql.com +1 -1
    mysql_once_init() now returns error code if something went wrong

  include/my_sys.h
    1.75.1.28 03/12/11 06:24:05 monty@mysql.com +1 -1
    my_init() now returns error code if something went wrong

  include/my_pthread.h
    1.57.1.7 03/12/11 06:24:05 monty@mysql.com +3 -0
    Fixed a possible memory leak on MacOSX when using the shared libmysql.so library (Bug #2061)

  include/config-win.h
    1.23.1.11 03/12/11 06:24:05 monty@mysql.com +4 -0
    Ensure that USE_SYMDIR is set for all windows versions
    (This is set in makefiles, so this is just an extra safety measure)

ChangeSet
  1.1616.1.53 03/12/11 00:28:25 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -0
  Fix for Bug #2075 - negative default values not accepted for integer columns
    Allow numeric literals have a sign

  mysql-test/t/create.test
    1.37 03/12/11 00:28:01 antony@ltantony.rdg.cyberkinetica.homeunix.net +10 -0
    New test for Bug #2075

  mysql-test/r/create.result
    1.57 03/12/11 00:28:00 antony@ltantony.rdg.cyberkinetica.homeunix.net +11 -0
    New test for Bug #2075

  sql/sql_yacc.yy
    1.203.1.80 03/12/10 23:58:16 antony@ltantony.rdg.cyberkinetica.homeunix.net +14 -5
    Bug#2075 - Numeric literals need to handle sign.

ChangeSet
  1.1346.453.1 03/12/10 22:26:31 konstantin@mysql.com +11 -0
  cleanup: if there is return from if-part, we don't need else statement

  sql/sql_parse.cc
    1.218.1.134 03/12/10 22:26:29 konstantin@mysql.com +1 -2
    cleanup: if there is return from if-part, we don't need else statement

  sql/sql_insert.cc
    1.63.1.44 03/12/10 22:26:29 konstantin@mysql.com +8 -11
    cleanup: if there is return from if-part, we don't need else statement

  sql/sql_analyse.cc
    1.12.1.8 03/12/10 22:26:29 konstantin@mysql.com +2 -6
    cleanup: if there is return from if-part, we don't need else statement

  sql/opt_range.cc
    1.54.1.35 03/12/10 22:26:29 konstantin@mysql.com +1 -1
    cleanup: if there is return from if-part, we don't need else statement

  sql/mysqld.cc
    1.297.1.172 03/12/10 22:26:29 konstantin@mysql.com +1 -1
    cleanup: if there is return from if-part, we don't need else statement

  sql/item_sum.cc
    1.25.1.13 03/12/10 22:26:29 konstantin@mysql.com +2 -4
    cleanup: if there is return from if-part, we don't need else statement

  sql/item_strfunc.cc
    1.36.1.36 03/12/10 22:26:29 konstantin@mysql.com +5 -8
    cleanup: if there is return from if-part, we don't need else statement

  sql/item_func.cc
    1.60.1.45 03/12/10 22:26:29 konstantin@mysql.com +10 -15
    cleanup: if there is return from if-part, we don't need else statement

  sql/item_cmpfunc.cc
    1.20.1.40 03/12/10 22:26:29 konstantin@mysql.com +2 -3
    cleanup: if there is return from if-part, we don't need else statement

  sql/item.cc
    1.19.1.15 03/12/10 22:26:29 konstantin@mysql.com +2 -3
    cleanup: if there is return from if-part, we don't need else statement

  sql/field.cc
    1.51.4.3 03/12/10 22:26:29 konstantin@mysql.com +2 -2
    cleanup: if there is return from if-part, we don't need else statement

ChangeSet
  1.1624.1.26 03/12/10 19:05:37 pem@mysql.comhem.se +13 -0
  WL#1363: Update the mysql.proc table and add new fields.
  Also made the parsing and handling of SP characteristics
  more general and extendable, and added a few ch:istics.

  sql/sql_yacc.yy
    1.262 03/12/10 19:05:33 pem@mysql.com +72 -35
    Made the characteristics handling slightly more extendable
    and made the parsing of characteristics more general, and
    added a few new dito. (LANGUAGE SQL, and [NOT] DETERMINISTIC
    for starters).

  sql/sql_parse.cc
    1.314 03/12/10 19:05:33 pem@mysql.com +2 -4
    Made the characteristics handling slightly more extendable.

  sql/sql_lex.h
    1.127 03/12/10 19:05:33 pem@mysql.com +8 -1
    Made the characteristics handling slightly more extendable.

  sql/sp_head.h
    1.26 03/12/10 19:05:33 pem@mysql.com +7 -22
    Made the characteristics handling slightly more extendable.

  sql/sp_head.cc
    1.56 03/12/10 19:05:33 pem@mysql.com +2 -4
    Made the characteristics handling slightly more extendable.

  sql/sp.h
    1.10 03/12/10 19:05:33 pem@mysql.com +4 -4
    Made the characteristics handling slightly more extendable.

  sql/sp.cc
    1.32 03/12/10 19:05:33 pem@mysql.com +60 -43
    New mysql.proc schema.
    Also made the characteristics handling slightly more extendable.

  sql/lex.h
    1.110 03/12/10 19:05:33 pem@mysql.com +2 -0
    New lex words for SP characteristics.

  scripts/mysql_fix_privilege_tables.sql
    1.7 03/12/10 19:05:33 pem@mysql.com +36 -10
    New mysql.proc schema.

  scripts/mysql_create_system_tables.sh
    1.10 03/12/10 19:05:33 pem@mysql.com +38 -12
    New mysql.proc schema.

  mysql-test/r/sp.result
    1.40 03/12/10 19:05:33 pem@mysql.com +11 -11
    Minor change in SHOW FUNCTION|PROCEDURE STATUS output.

  Docs/sp-implemented.txt
    1.9 03/12/10 19:05:33 pem@mysql.com +26 -29
    Added info about ALTER and SHOW.

  Docs/sp-imp-spec.txt
    1.9 03/12/10 19:05:33 pem@mysql.com +42 -0
    Updated spec with new schema.

ChangeSet
  1.1346.452.2 03/12/10 17:57:07 ram@gw.mysql.r18.ru +1 -0
  proper musqldump test result
  (in addition to CS 1.1623 03/12/09)

ChangeSet
  1.1346.451.2 03/12/10 17:55:00 gluh@gluh.mysql.r18.ru +1 -0
  Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
  into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.ssl

ChangeSet
  1.1346.1.288 03/12/10 17:30:37 konstantin@mysql.com +3 -0
  fix for bug #1993 'bit functions do not return unsigned values'
  introduced base class Item_func_bit for bit functions

  sql/item_func.h
    1.39.1.25 03/12/10 17:30:33 konstantin@mysql.com +21 -17
    fix for bug #1993 'bit functions do not return unsigned values'
    introduced base class Item_func_bit for bit functions

  mysql-test/t/func_op.test
    1.3.1.1 03/12/10 17:30:33 konstantin@mysql.com +9 -0
    added tests for bug #1993 'bit functions do not return unsigned values'

  mysql-test/r/func_op.result
    1.5.1.1 03/12/10 17:30:33 konstantin@mysql.com +18 -0
    test results for bug #1993 'bit functions do not return unsigned values'

  mysql-test/r/mysqldump.result
    1.1.1.1 03/12/10 17:57:05 ram@gw.mysql.r18.ru +48 -0
    proper musqldump test result
    (in addition to CS 1.1623 03/12/09)

  acinclude.m4
    1.77.1.18 03/12/10 17:54:57 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1346.342.2 03/12/10 17:53:55 gluh@gluh.mysql.r18.ru +1 -0
  Fix for bug# 1142 ./configure - error in file causes failure of compile (SSL option needed)

  acinclude.m4
    1.77.1.17 03/12/10 17:53:53 gluh@gluh.mysql.r18.ru +2 -2
    Fix for bug# 1142 ./configure - error in file causes failure of compile (SSL option needed)

ChangeSet
  1.1346.450.1 03/12/10 15:17:23 konstantin@mysql.com +3 -0
  followup to fix for bug #1790 BIT_AND() result in GROUP BY different when 
  SQL_BIG_RESULT used": now BIT_AND() always returns 18446744073709551615
  if no rows were found.
  This patch also fixes bug #1972: "BIT_AND() and BIT_OR() still return 
  a *signed* 64bit value"

  sql/item_sum.cc
    1.25.1.12 03/12/10 15:17:21 konstantin@mysql.com +5 -4
    followup to fix for bug #1790 BIT_AND() result in GROUP BY different when 
    SQL_BIG_RESULT used": now BIT_AND() always returns 18446744073709551615
    if no rows were found.
    This patch also fixes bug #1972: "BIT_AND() and BIT_OR() still return 
    a *signed* 64bit value"

  mysql-test/t/func_group.test
    1.4.1.4 03/12/10 15:17:21 konstantin@mysql.com +8 -0
    added tests for bug #1972 "BIT_AND() and BIT_OR() still return a 
    *signed* 64bit value"

  mysql-test/r/func_group.result
    1.6.1.6 03/12/10 15:17:21 konstantin@mysql.com +17 -6
    followup to fix for bug #1790 BIT_AND() result in GROUP BY different when 
    SQL_BIG_RESULT used": test results fixed
    bug #1972 "BIT_AND() and BIT_OR() still return a *signed* 64bit value":
    results of new tests

ChangeSet
  1.1616.1.52 03/12/10 15:27:33 ram@gw.mysql.r18.ru +2 -0
  changed usc2 -> koi8r to don't depend on extra-charset option.

  mysql-test/t/mysqldump.test
    1.7 03/12/10 15:27:31 ram@gw.mysql.r18.ru +2 -2
    changed usc2 -> koi8r to don't depend on extra-charset option.

  mysql-test/r/mysqldump.result
    1.9.1.1 03/12/10 15:27:31 ram@gw.mysql.r18.ru +4 -4
    changed usc2 -> koi8r to don't depend on extra-charset option.

ChangeSet
  1.1346.1.285 03/12/10 12:03:54 monty@mysql.com +1 -0
  Add cast to remove compiler warning

  sql/sql_cache.cc
    1.29.1.29 03/12/10 12:03:52 monty@mysql.com +1 -1
    Add cast to remove compiler warning

ChangeSet
  1.1616.1.51 03/12/10 04:31:42 antony@ltantony.rdg.cyberkinetica.homeunix.net +189 -0
  WorkLog#1323
  Deprecate the use of TYPE=... Preferred syntax is ENGINE=

  mysql-test/t/warnings.test
    1.14 03/12/10 04:30:41 antony@ltantony.rdg.cyberkinetica.homeunix.net +10 -2
    Change occurances of TYPE= to ENGINE=
    New test for deprecated syntax

  mysql-test/t/update.test
    1.11 03/12/10 04:30:41 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/union.test
    1.50 03/12/10 04:30:41 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -3
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/type_set.test
    1.5 03/12/10 04:30:41 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/type_datetime.test
    1.11 03/12/10 04:30:40 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/temp_table.test
    1.7 03/12/10 04:30:40 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -3
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/symlink.test
    1.9 03/12/10 04:30:40 antony@ltantony.rdg.cyberkinetica.homeunix.net +6 -6
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/subselect_innodb.test
    1.2 03/12/10 04:30:40 antony@ltantony.rdg.cyberkinetica.homeunix.net +7 -7
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/subselect2.test
    1.2 03/12/10 04:30:39 antony@ltantony.rdg.cyberkinetica.homeunix.net +4 -4
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/subselect.test
    1.58.1.36 03/12/10 04:30:39 antony@ltantony.rdg.cyberkinetica.homeunix.net +28 -28
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/status.test
    1.10 03/12/10 04:30:39 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/sql_mode.test
    1.4 03/12/10 04:30:39 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/show_check.test
    1.22 03/12/10 04:30:39 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/select_found.test
    1.16 03/12/10 04:30:39 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/select.test
    1.22 03/12/10 04:30:38 antony@ltantony.rdg.cyberkinetica.homeunix.net +6 -6
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/rpl_relayrotate.test
    1.7 03/12/10 04:30:38 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/rpl_insert_id.test
    1.5 03/12/10 04:30:38 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/rpl_flush_tables.test
    1.4 03/12/10 04:30:38 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/rpl000006.test
    1.14 03/12/10 04:30:38 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/rollback.test
    1.6 03/12/10 04:30:38 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/replace.test
    1.10 03/12/10 04:30:38 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -3
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/repair_part1.test
    1.5 03/12/10 04:30:37 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/range.test
    1.13 03/12/10 04:30:37 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/query_cache_merge.test
    1.3 03/12/10 04:30:37 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/query_cache.test
    1.24.1.7 03/12/10 04:30:37 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/outfile.test
    1.6 03/12/10 04:30:37 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/order_by.test
    1.19 03/12/10 04:30:37 antony@ltantony.rdg.cyberkinetica.homeunix.net +4 -4
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/null_key.test
    1.9 03/12/10 04:30:37 antony@ltantony.rdg.cyberkinetica.homeunix.net +5 -5
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/null.test
    1.10.1.1 03/12/10 04:30:36 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/myisam.test
    1.25 03/12/10 04:30:36 antony@ltantony.rdg.cyberkinetica.homeunix.net +4 -4
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/multi_update.test
    1.26.1.1 03/12/10 04:30:36 antony@ltantony.rdg.cyberkinetica.homeunix.net +9 -9
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/mix_innodb_myisam_binlog.test
    1.5 03/12/10 04:30:36 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -3
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/merge.test
    1.25 03/12/10 04:30:36 antony@ltantony.rdg.cyberkinetica.homeunix.net +24 -24
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/lock_tables_lost_commit.test
    1.4 03/12/10 04:30:36 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/lock.test
    1.9 03/12/10 04:30:35 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -3
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/key.test
    1.10 03/12/10 04:30:35 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/join_outer.test
    1.12 03/12/10 04:30:35 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/join_crash.test
    1.5 03/12/10 04:30:35 antony@ltantony.rdg.cyberkinetica.homeunix.net +4 -4
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/join.test
    1.22 03/12/10 04:30:35 antony@ltantony.rdg.cyberkinetica.homeunix.net +6 -6
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/isam.test
    1.10 03/12/10 04:30:35 antony@ltantony.rdg.cyberkinetica.homeunix.net +7 -7
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/insert_select.test
    1.11 03/12/10 04:30:34 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/innodb_handler.test
    1.6 03/12/10 04:30:34 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -3
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/innodb_cache.test
    1.6 03/12/10 04:30:34 antony@ltantony.rdg.cyberkinetica.homeunix.net +6 -6
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/innodb.test
    1.50 03/12/10 04:30:34 antony@ltantony.rdg.cyberkinetica.homeunix.net +74 -74
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/innodb-deadlock.test
    1.4 03/12/10 04:30:34 antony@ltantony.rdg.cyberkinetica.homeunix.net +5 -5
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/help.test
    1.3 03/12/10 04:30:34 antony@ltantony.rdg.cyberkinetica.homeunix.net +8 -8
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/heap_hash.test
    1.4 03/12/10 04:30:33 antony@ltantony.rdg.cyberkinetica.homeunix.net +16 -16
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/heap_btree.test
    1.9 03/12/10 04:30:33 antony@ltantony.rdg.cyberkinetica.homeunix.net +17 -17
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/heap_auto_increment.test
    1.3 03/12/10 04:30:33 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/heap.test
    1.13 03/12/10 04:30:33 antony@ltantony.rdg.cyberkinetica.homeunix.net +17 -17
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/handler.test
    1.15 03/12/10 04:30:33 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/group_by.test
    1.26 03/12/10 04:30:33 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/gis-rtree.test
    1.3 03/12/10 04:30:33 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/func_time.test
    1.21.1.1 03/12/10 04:30:32 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/func_test.test
    1.18 03/12/10 04:30:32 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/func_str.test
    1.43 03/12/10 04:30:32 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -3
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/func_if.test
    1.5 03/12/10 04:30:32 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/func_group.test
    1.18 03/12/10 04:30:32 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/func_date_add.test
    1.5 03/12/10 04:30:32 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/func_compress.test
    1.6 03/12/10 04:30:31 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/fulltext_left_join.test
    1.10 03/12/10 04:30:31 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/fulltext_distinct.test
    1.5 03/12/10 04:30:30 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/fulltext2.test
    1.8 03/12/10 04:30:30 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/fulltext.test
    1.54 03/12/10 04:30:29 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -3
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/distinct.test
    1.14.1.1 03/12/10 04:30:29 antony@ltantony.rdg.cyberkinetica.homeunix.net +5 -5
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/delete.test
    1.14 03/12/10 04:30:29 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/ctype_ucs.test
    1.4 03/12/10 04:30:29 antony@ltantony.rdg.cyberkinetica.homeunix.net +4 -4
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/create.test
    1.36 03/12/10 04:30:28 antony@ltantony.rdg.cyberkinetica.homeunix.net +4 -4
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/bdb_cache.test
    1.4 03/12/10 04:30:28 antony@ltantony.rdg.cyberkinetica.homeunix.net +5 -5
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/bdb.test
    1.30 03/12/10 04:30:28 antony@ltantony.rdg.cyberkinetica.homeunix.net +47 -47
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/bdb-deadlock.test
    1.5 03/12/10 04:30:28 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/bdb-crash.test
    1.9 03/12/10 04:30:28 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/bdb-alter-table-1.test
    1.4 03/12/10 04:30:28 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/auto_increment.test
    1.14 03/12/10 04:30:28 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/alter_table.test
    1.19 03/12/10 04:30:28 antony@ltantony.rdg.cyberkinetica.homeunix.net +5 -5
    Change occurances of TYPE= to ENGINE=

  mysql-test/t/alias.test
    1.5 03/12/10 04:30:27 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/warnings.result
    1.16 03/12/10 04:30:27 antony@ltantony.rdg.cyberkinetica.homeunix.net +9 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/update.result
    1.15 03/12/10 04:30:27 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/union.result
    1.52 03/12/10 04:30:27 antony@ltantony.rdg.cyberkinetica.homeunix.net +28 -28
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/type_set.result
    1.9 03/12/10 04:30:27 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -3
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/type_nchar.result
    1.4 03/12/10 04:30:27 antony@ltantony.rdg.cyberkinetica.homeunix.net +7 -7
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/type_enum.result
    1.12 03/12/10 04:30:26 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/type_datetime.result
    1.15 03/12/10 04:30:26 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/type_blob.result
    1.30 03/12/10 04:30:26 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/temp_table.result
    1.9 03/12/10 04:30:26 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -3
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/symlink.result
    1.11.1.2 03/12/10 04:30:26 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/subselect_innodb.result
    1.2 03/12/10 04:30:26 antony@ltantony.rdg.cyberkinetica.homeunix.net +7 -7
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/subselect2.result
    1.3 03/12/10 04:30:26 antony@ltantony.rdg.cyberkinetica.homeunix.net +4 -4
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/subselect.result
    1.67.1.39 03/12/10 04:30:25 antony@ltantony.rdg.cyberkinetica.homeunix.net +32 -32
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/status.result
    1.4.1.1 03/12/10 04:30:25 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/sql_mode.result
    1.6 03/12/10 04:30:25 antony@ltantony.rdg.cyberkinetica.homeunix.net +5 -5
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/show_check.result
    1.31.1.9 03/12/10 04:30:25 antony@ltantony.rdg.cyberkinetica.homeunix.net +11 -11
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/select_found.result
    1.17 03/12/10 04:30:25 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/select.result
    1.35 03/12/10 04:30:25 antony@ltantony.rdg.cyberkinetica.homeunix.net +6 -6
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/rpl_relayrotate.result
    1.4 03/12/10 04:30:24 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/rpl_insert_id.result
    1.7 03/12/10 04:30:24 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/rpl_flush_tables.result
    1.4 03/12/10 04:30:24 antony@ltantony.rdg.cyberkinetica.homeunix.net +10 -10
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/rpl000006.result
    1.13 03/12/10 04:30:24 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/rollback.result
    1.6 03/12/10 04:30:24 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/replace.result
    1.8 03/12/10 04:30:23 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -3
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/repair_part1.result
    1.8 03/12/10 04:30:23 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/range.result
    1.20 03/12/10 04:30:23 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/query_cache.result
    1.26.1.12 03/12/10 04:30:23 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/order_by.result
    1.32 03/12/10 04:30:22 antony@ltantony.rdg.cyberkinetica.homeunix.net +4 -4
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/null_key.result
    1.24 03/12/10 04:30:21 antony@ltantony.rdg.cyberkinetica.homeunix.net +5 -5
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/null.result
    1.18.1.1 03/12/10 04:30:21 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/myisam.result
    1.31 03/12/10 04:30:20 antony@ltantony.rdg.cyberkinetica.homeunix.net +4 -4
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/multi_update.result
    1.25.1.1 03/12/10 04:30:20 antony@ltantony.rdg.cyberkinetica.homeunix.net +9 -9
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.6 03/12/10 04:30:20 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -3
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/merge.result
    1.28 03/12/10 04:30:20 antony@ltantony.rdg.cyberkinetica.homeunix.net +34 -34
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/lock_tables_lost_commit.result
    1.2 03/12/10 04:30:19 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/lock.result
    1.11 03/12/10 04:30:19 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -3
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/key.result
    1.13 03/12/10 04:30:19 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/join_outer.result
    1.24.1.1 03/12/10 04:30:19 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/join_crash.result
    1.4 03/12/10 04:30:19 antony@ltantony.rdg.cyberkinetica.homeunix.net +4 -4
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/join.result
    1.24 03/12/10 04:30:19 antony@ltantony.rdg.cyberkinetica.homeunix.net +6 -6
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/isam.result
    1.19 03/12/10 04:30:18 antony@ltantony.rdg.cyberkinetica.homeunix.net +7 -7
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/insert_select.result
    1.16 03/12/10 04:30:18 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/innodb_handler.result
    1.7 03/12/10 04:30:18 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -3
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/innodb_cache.result
    1.8 03/12/10 04:30:18 antony@ltantony.rdg.cyberkinetica.homeunix.net +6 -6
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/innodb.result
    1.76 03/12/10 04:30:18 antony@ltantony.rdg.cyberkinetica.homeunix.net +75 -75
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/innodb-deadlock.result
    1.4 03/12/10 04:30:18 antony@ltantony.rdg.cyberkinetica.homeunix.net +5 -5
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/help.result
    1.3 03/12/10 04:30:18 antony@ltantony.rdg.cyberkinetica.homeunix.net +8 -8
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/heap_hash.result
    1.8 03/12/10 04:30:17 antony@ltantony.rdg.cyberkinetica.homeunix.net +16 -16
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/heap_btree.result
    1.14 03/12/10 04:30:17 antony@ltantony.rdg.cyberkinetica.homeunix.net +17 -17
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/heap_auto_increment.result
    1.2 03/12/10 04:30:17 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/heap.result
    1.20 03/12/10 04:30:17 antony@ltantony.rdg.cyberkinetica.homeunix.net +17 -17
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/handler.result
    1.15 03/12/10 04:30:17 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/group_by.result
    1.35 03/12/10 04:30:17 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/gis-rtree.result
    1.4 03/12/10 04:30:17 antony@ltantony.rdg.cyberkinetica.homeunix.net +4 -4
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/func_time.result
    1.23.1.1 03/12/10 04:30:16 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/func_test.result
    1.21 03/12/10 04:30:16 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/func_system.result
    1.15 03/12/10 04:30:16 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/func_str.result
    1.48 03/12/10 04:30:16 antony@ltantony.rdg.cyberkinetica.homeunix.net +4 -4
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/func_if.result
    1.7 03/12/10 04:30:16 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/func_group.result
    1.23 03/12/10 04:30:16 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/func_date_add.result
    1.6 03/12/10 04:30:15 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/func_compress.result
    1.7 03/12/10 04:30:15 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/fulltext_left_join.result
    1.11 03/12/10 04:30:15 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/fulltext_distinct.result
    1.5 03/12/10 04:30:15 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/fulltext2.result
    1.7 03/12/10 04:30:15 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/fulltext.result
    1.55 03/12/10 04:30:14 antony@ltantony.rdg.cyberkinetica.homeunix.net +4 -4
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/distinct.result
    1.27.1.3 03/12/10 04:30:14 antony@ltantony.rdg.cyberkinetica.homeunix.net +5 -5
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/delete.result
    1.14 03/12/10 04:30:14 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/ctype_ucs.result
    1.5 03/12/10 04:30:14 antony@ltantony.rdg.cyberkinetica.homeunix.net +5 -5
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/ctype_recoding.result
    1.14 03/12/10 04:30:14 antony@ltantony.rdg.cyberkinetica.homeunix.net +4 -4
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/ctype_mb.result
    1.5 03/12/10 04:30:14 antony@ltantony.rdg.cyberkinetica.homeunix.net +5 -5
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/ctype_many.result
    1.8 03/12/10 04:30:13 antony@ltantony.rdg.cyberkinetica.homeunix.net +898 -898
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/ctype_latin1_de.result
    1.15 03/12/10 04:30:13 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/ctype_collate.result
    1.22 03/12/10 04:30:13 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -3
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/create.result
    1.56 03/12/10 04:30:13 antony@ltantony.rdg.cyberkinetica.homeunix.net +14 -14
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/constraints.result
    1.3 03/12/10 04:30:13 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/cast.result
    1.12 03/12/10 04:30:13 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -3
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/case.result
    1.13 03/12/10 04:30:12 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/bdb_cache.result
    1.3 03/12/10 04:30:12 antony@ltantony.rdg.cyberkinetica.homeunix.net +5 -5
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/bdb.result
    1.30 03/12/10 04:30:12 antony@ltantony.rdg.cyberkinetica.homeunix.net +47 -47
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/bdb-deadlock.result
    1.6 03/12/10 04:30:12 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/bdb-crash.result
    1.6 03/12/10 04:30:12 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/bdb-alter-table-1.result
    1.3 03/12/10 04:30:12 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/auto_increment.result
    1.18 03/12/10 04:30:12 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/alter_table.result
    1.24 03/12/10 04:30:11 antony@ltantony.rdg.cyberkinetica.homeunix.net +9 -9
    Change occurances of TYPE= to ENGINE=

  mysql-test/r/alias.result
    1.6 03/12/10 04:30:11 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change occurances of TYPE= to ENGINE=

  sql/sql_yacc.yy
    1.203.1.79 03/12/10 03:36:38 antony@ltantony.rdg.cyberkinetica.homeunix.net +39 -4
    Introduce ENGINE keyword,
    Deprecate TYPE= syntax,
    Introduce SHOW ENGINE syntax,
    Deprecate SHOW INNODB/BDB syntax.

  sql/sql_show.cc
    1.122.1.15 03/12/10 03:36:38 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Change TYPE= with ENGINE=

  sql/share/ukrainian/errmsg.txt
    1.27.1.35 03/12/10 03:36:38 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/swedish/errmsg.txt
    1.64.1.38 03/12/10 03:36:38 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/spanish/errmsg.txt
    1.64.1.39 03/12/10 03:36:37 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/slovak/errmsg.txt
    1.64.1.38 03/12/10 03:36:37 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/serbian/errmsg.txt
    1.18.1.36 03/12/10 03:36:37 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/russian/errmsg.txt
    1.61.1.36 03/12/10 03:36:37 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/romanian/errmsg.txt
    1.62.1.38 03/12/10 03:36:37 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/portuguese/errmsg.txt
    1.64.1.37 03/12/10 03:36:36 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/polish/errmsg.txt
    1.63.1.38 03/12/10 03:36:36 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/norwegian/errmsg.txt
    1.63.1.39 03/12/10 03:36:36 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.38 03/12/10 03:36:36 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/korean/errmsg.txt
    1.63.1.38 03/12/10 03:36:36 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/japanese/errmsg.txt
    1.63.1.37 03/12/10 03:36:35 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/italian/errmsg.txt
    1.70.1.39 03/12/10 03:36:35 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/hungarian/errmsg.txt
    1.65.1.37 03/12/10 03:36:35 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/greek/errmsg.txt
    1.64.1.37 03/12/10 03:36:35 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/german/errmsg.txt
    1.64.1.37 03/12/10 03:36:35 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/french/errmsg.txt
    1.63.1.38 03/12/10 03:36:35 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/estonian/errmsg.txt
    1.64.1.37 03/12/10 03:36:35 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/english/errmsg.txt
    1.70.1.41 03/12/10 03:36:34 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/dutch/errmsg.txt
    1.66.1.38 03/12/10 03:36:34 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/danish/errmsg.txt
    1.62.1.38 03/12/10 03:36:34 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/share/czech/errmsg.txt
    1.64.1.38 03/12/10 03:36:34 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New warning for deprecated syntax

  sql/lex.h
    1.82.1.49 03/12/10 03:36:34 antony@ltantony.rdg.cyberkinetica.homeunix.net +62 -61
    Introduce ENGINE keyword
    Sort order of symbols

  include/mysqld_error.h
    1.61.1.27 03/12/10 03:36:33 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -1
    New warning for deprecated syntax

ChangeSet
  1.1346.446.2 03/12/10 01:08:10 konstantin@mysql.com +2 -0
  bug #1335 tests followup:
  --disable_query_log was not a good idea, Serg says

  mysql-test/t/group_by.test
    1.13.1.12 03/12/10 01:08:09 konstantin@mysql.com +0 -4
    bug #1335 tests followup:
    --disable_query_log was not a good idea, Serg says

  mysql-test/r/group_by.result
    1.16.1.19 03/12/10 01:08:09 konstantin@mysql.com +14 -0
    bug #1335 tests followup:
    --disable_query_log was not a good idea, Serg says
    tests results updated

ChangeSet
  1.1346.448.1 03/12/10 00:00:20 monty@mysql.com +5 -0
  Added checking of return value from my_once_alloc() in charset
  Added checking of return value from malloc() in reg_init()

  sql/item_strfunc.cc
    1.36.1.35 03/12/10 00:00:18 monty@mysql.com +4 -0
    Added comment

  regex/reginit.c
    1.4.1.1 03/12/10 00:00:18 monty@mysql.com +10 -0
    Abort if out of memory in reg_init() (unlikely)

  mysys/charset.c
    1.29.1.7 03/12/10 00:00:18 monty@mysql.com +38 -14
    Added checking of return value from my_once_alloc()

  dbug/dbug.c
    1.14.1.1 03/12/10 00:00:18 monty@mysql.com +1 -1
    Removed not needed test

  client/mysqltest.c
    1.77.1.32 03/12/10 00:00:18 monty@mysql.com +1 -0
    Added comment

ChangeSet
  1.1616.1.50 03/12/09 13:29:38 igor@rurik.mysql.com +3 -0
  key_cache.result, key_cache.test, mf_keycache.c:
    Fixed a wrong return code by the function init_key_cache.

  mysql-test/r/key_cache.result
    1.6 03/12/09 13:29:18 igor@rurik.mysql.com +3 -1
    Fixed a wrong return code by the function init_key_cache.

  mysql-test/t/key_cache.test
    1.6 03/12/09 13:28:32 igor@rurik.mysql.com +5 -1
    Fixed a wrong return code by the function init_key_cache.

  mysys/mf_keycache.c
    1.39 03/12/09 13:27:12 igor@rurik.mysql.com +1 -1
    Fixed a wrong return code by the function init_key_cache.

ChangeSet
  1.1629 03/12/10 00:26:23 sergefp@mysql.com +1 -0
  Post-merge fixes

  sql/sql_union.cc
    1.86 03/12/10 00:26:21 sergefp@mysql.com +1 -1
    Post-merge fixes

ChangeSet
  1.1346.447.1 03/12/09 21:56:11 serg@serg.mylan +1 -0
  followup

  sql/opt_range.cc
    1.54.1.34 03/12/09 21:56:08 serg@serg.mylan +2 -2
    followup

ChangeSet
  1.1346.446.1 03/12/09 23:52:58 konstantin@mysql.com +3 -0
  Fix for bug #1335: filesort is missing in EXPLAIN if ORDER BY NULL is used

  sql/sql_select.cc
    1.152.1.113 03/12/09 23:52:53 konstantin@mysql.com +12 -2
    Fix for bug #1335: filesort is missing in EXPLAIN if ORDER BY NULL is used

  mysql-test/t/group_by.test
    1.13.1.11 03/12/09 23:52:53 konstantin@mysql.com +28 -0
    added few explicit tests for bug #1335

  mysql-test/r/group_by.result
    1.16.1.18 03/12/09 23:52:53 konstantin@mysql.com +16 -1
    test results fixed

ChangeSet
  1.1628 03/12/09 23:41:25 sergefp@mysql.com +12 -0
  Merge mysql.com:/home/psergey/mysql-5.0-latest-pull
  into mysql.com:/home/psergey/mysql-5.0-imerge-unique

  sql/sql_update.cc
    1.99 03/12/09 23:41:24 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_union.cc
    1.85 03/12/09 23:41:23 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_test.cc
    1.32 03/12/09 23:41:23 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_select.h
    1.64 03/12/09 23:41:23 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_select.cc
    1.233 03/12/09 23:41:23 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_list.h
    1.24 03/12/09 23:41:22 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.132 03/12/09 23:41:22 sergefp@mysql.com +0 -0
    Auto merged

  sql/opt_range.cc
    1.104 03/12/09 23:41:22 sergefp@mysql.com +13 -23
    Auto merged

  sql/handler.h
    1.93 03/12/09 23:41:22 sergefp@mysql.com +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.98 03/12/09 23:41:21 sergefp@mysql.com +0 -0
    Auto merged

  mysql-test/r/index_merge.result
    1.3 03/12/09 23:41:21 sergefp@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.252 03/12/09 23:41:14 sergefp@mysql.com +0 -0
    auto-union

ChangeSet
  1.1627 03/12/09 23:40:02 sergefp@mysql.com +12 -0
  Two-sweeps read index_merge plus several small index_merge fixes and improvements

  mysql-test/t/index_merge_innodb2.test
    1.1 03/12/09 23:40:00 sergefp@mysql.com +52 -0

  mysql-test/t/index_merge_bdb.test
    1.1 03/12/09 23:40:00 sergefp@mysql.com +52 -0

  mysql-test/t/index_merge_innodb2.test
    1.0 03/12/09 23:40:00 sergefp@mysql.com +0 -0
    BitKeeper file /home/psergey/mysql-5.0-imerge-unique/mysql-test/t/index_merge_innodb2.test

  mysql-test/t/index_merge_bdb.test
    1.0 03/12/09 23:40:00 sergefp@mysql.com +0 -0
    BitKeeper file /home/psergey/mysql-5.0-imerge-unique/mysql-test/t/index_merge_bdb.test

  mysql-test/r/index_merge_innodb2.result
    1.1 03/12/09 23:39:59 sergefp@mysql.com +136 -0

  mysql-test/r/index_merge_bdb.result
    1.1 03/12/09 23:39:59 sergefp@mysql.com +136 -0

  sql/records.cc
    1.27 03/12/09 23:39:59 sergefp@mysql.com +2 -2
    Two-sweeps read index_merge plus several small index_merge fixes and improvements

  sql/opt_range.h
    1.33 03/12/09 23:39:59 sergefp@mysql.com +77 -8
    Two-sweeps read index_merge plus several small index_merge fixes and improvements

  sql/opt_range.cc
    1.103 03/12/09 23:39:59 sergefp@mysql.com +182 -41
    Two-sweeps read index_merge plus several small index_merge fixes and improvements

  sql/handler.h
    1.90.1.1 03/12/09 23:39:59 sergefp@mysql.com +7 -0
    Two-sweeps read index_merge plus several small index_merge fixes and improvements

  sql/ha_innodb.h
    1.58 03/12/09 23:39:59 sergefp@mysql.com +1 -0
    Two-sweeps read index_merge plus several small index_merge fixes and improvements

  sql/ha_innodb.cc
    1.96.1.1 03/12/09 23:39:59 sergefp@mysql.com +6 -4
    Two-sweeps read index_merge plus several small index_merge fixes and improvements

  sql/ha_berkeley.h
    1.58 03/12/09 23:39:59 sergefp@mysql.com +1 -0
    Two-sweeps read index_merge plus several small index_merge fixes and improvements

  sql/filesort.cc
    1.79 03/12/09 23:39:59 sergefp@mysql.com +14 -3
    Two-sweeps read index_merge plus several small index_merge fixes and improvements

  mysql-test/r/index_merge_innodb2.result
    1.0 03/12/09 23:39:59 sergefp@mysql.com +0 -0
    BitKeeper file /home/psergey/mysql-5.0-imerge-unique/mysql-test/r/index_merge_innodb2.result

  mysql-test/r/index_merge_bdb.result
    1.0 03/12/09 23:39:59 sergefp@mysql.com +0 -0
    BitKeeper file /home/psergey/mysql-5.0-imerge-unique/mysql-test/r/index_merge_bdb.result

ChangeSet
  1.1346.1.281 03/12/09 20:50:11 serg@serg.mylan +1 -0
  Merge bk-internal:/home/bk/mysql-4.0/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.0

  sql/mysqld.cc
    1.297.1.171 03/12/09 20:50:07 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1346.432.8 03/12/09 20:49:48 serg@serg.mylan +6 -0
  code cleanup after some reasoning

  sql/table.cc
    1.46.1.21 03/12/09 20:49:45 serg@serg.mylan +2 -3
    code cleanup after some reasoning

  sql/repl_failsafe.cc
    1.11.1.25 03/12/09 20:49:45 serg@serg.mylan +0 -1
    code cleanup after some reasoning

  sql/opt_range.cc
    1.54.1.33 03/12/09 20:49:45 serg@serg.mylan +1 -1
    code cleanup after some reasoning

  sql/mysqld.cc
    1.297.38.1 03/12/09 20:49:45 serg@serg.mylan +2 -2
    code cleanup

  myisam/ft_boolean_search.c
    1.47.1.12 03/12/09 20:49:45 serg@serg.mylan +9 -2
    code cleanup after some reasoning

  libmysql/libmysql.c
    1.95.1.42 03/12/09 20:49:45 serg@serg.mylan +2 -1
    code cleanup after some reasoning

ChangeSet
  1.1346.1.280 03/12/09 20:17:28 monty@mysql.com +1 -0
  Add newline after pid in pidfile

  sql/mysqld.cc
    1.297.1.170 03/12/09 20:17:26 monty@mysql.com +1 -1
    Add newline after pid in pidfile

ChangeSet
  1.1624.1.25 03/12/09 19:05:41 pem@mysql.comhem.se +2 -0
  Post-merge fixes.

  sql/sql_parse.cc
    1.313 03/12/09 19:05:20 pem@mysql.com +1 -1
    Post-merge fixes.

  mysql-test/r/mysqldump.result
    1.10 03/12/09 19:05:19 pem@mysql.com +1 -1
    Post-merge fixes.

ChangeSet
  1.1624.1.24 03/12/09 18:14:02 pem@mysql.com +41 -0
  Merged 4.1 -> 5.0

ChangeSet
  1.1616.47.1 03/12/09 13:34:57 vva@eagle.mysql.r18.ru +3 -0
  Merge

  sql/sql_select.cc
    1.231.1.3 03/12/09 18:00:20 pem@mysql.com +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.1.69 03/12/09 13:34:54 vva@eagle.mysql.r18.ru +0 -0
    SCCS merged

  mysql-test/r/create.result
    1.55 03/12/09 13:31:45 vva@eagle.mysql.r18.ru +0 -0
    SCCS merged

  mysql-test/t/create.test
    1.35 03/12/09 13:23:55 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_update.cc
    1.97.1.2 03/12/09 18:13:58 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0

  sql/sql_parse.cc
    1.312 03/12/09 18:13:58 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0

  sql/sql_delete.cc
    1.110 03/12/09 18:13:58 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0

  sql/share/ukrainian/errmsg.txt
    1.54 03/12/09 18:13:58 pem@mysql.com +4 -8
    Merged 4.1 -> 5.0

  sql/share/swedish/errmsg.txt
    1.92 03/12/09 18:13:58 pem@mysql.com +4 -8
    Merged 4.1 -> 5.0

  sql/share/spanish/errmsg.txt
    1.91 03/12/09 18:13:58 pem@mysql.com +4 -8
    Merged 4.1 -> 5.0

  sql/share/slovak/errmsg.txt
    1.91 03/12/09 18:13:58 pem@mysql.com +4 -8
    Merged 4.1 -> 5.0

  sql/share/serbian/errmsg.txt
    1.45 03/12/09 18:13:58 pem@mysql.com +4 -8
    Merged 4.1 -> 5.0

  sql/share/russian/errmsg.txt
    1.89 03/12/09 18:13:58 pem@mysql.com +4 -8
    Merged 4.1 -> 5.0

  sql/share/portuguese/errmsg.txt
    1.91 03/12/09 18:13:58 pem@mysql.com +4 -8
    Merged 4.1 -> 5.0

  sql/share/polish/errmsg.txt
    1.91 03/12/09 18:13:58 pem@mysql.com +4 -8
    Merged 4.1 -> 5.0

  sql/share/norwegian/errmsg.txt
    1.90 03/12/09 18:13:58 pem@mysql.com +4 -8
    Merged 4.1 -> 5.0

  sql/share/norwegian-ny/errmsg.txt
    1.90 03/12/09 18:13:58 pem@mysql.com +4 -8
    Merged 4.1 -> 5.0

  sql/share/korean/errmsg.txt
    1.90 03/12/09 18:13:58 pem@mysql.com +4 -8
    Merged 4.1 -> 5.0

  sql/share/japanese/errmsg.txt
    1.90 03/12/09 18:13:58 pem@mysql.com +4 -8
    Merged 4.1 -> 5.0

  sql/share/italian/errmsg.txt
    1.97 03/12/09 18:13:58 pem@mysql.com +4 -8
    Merged 4.1 -> 5.0

  sql/share/hungarian/errmsg.txt
    1.92 03/12/09 18:13:58 pem@mysql.com +4 -8
    Merged 4.1 -> 5.0

  sql/share/greek/errmsg.txt
    1.91 03/12/09 18:13:58 pem@mysql.com +4 -8
    Merged 4.1 -> 5.0

  sql/share/french/errmsg.txt
    1.90 03/12/09 18:13:58 pem@mysql.com +4 -8
    Merged 4.1 -> 5.0

  sql/share/estonian/errmsg.txt
    1.91 03/12/09 18:13:58 pem@mysql.com +4 -8
    Merged 4.1 -> 5.0

  sql/share/english/errmsg.txt
    1.98 03/12/09 18:13:58 pem@mysql.com +4 -8
    Merged 4.1 -> 5.0

  sql/share/dutch/errmsg.txt
    1.93 03/12/09 18:13:58 pem@mysql.com +4 -8
    Merged 4.1 -> 5.0

  sql/share/danish/errmsg.txt
    1.89 03/12/09 18:13:58 pem@mysql.com +4 -8
    Merged 4.1 -> 5.0

  sql/sql_table.cc
    1.172 03/12/09 18:00:21 pem@mysql.com +0 -0
    Auto merged

  sql/share/romanian/errmsg.txt
    1.88 03/12/09 18:00:21 pem@mysql.com +0 -0
    Auto merged

  sql/share/czech/errmsg.txt
    1.90 03/12/09 18:00:21 pem@mysql.com +0 -0
    Auto merged

  sql/sql_show.cc
    1.132 03/12/09 18:00:20 pem@mysql.com +0 -0
    Auto merged

  sql/sql_load.cc
    1.54 03/12/09 18:00:20 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.172 03/12/09 18:00:20 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.130.1.6 03/12/09 18:00:20 pem@mysql.com +0 -0
    Auto merged

  sql/sql_acl.cc
    1.83 03/12/09 18:00:20 pem@mysql.com +0 -0
    Auto merged

  sql/slave.cc
    1.203 03/12/09 18:00:20 pem@mysql.com +0 -0
    Auto merged

  sql/set_var.cc
    1.46 03/12/09 18:00:20 pem@mysql.com +0 -0
    Auto merged

  sql/protocol.cc
    1.69 03/12/09 18:00:20 pem@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.374 03/12/09 18:00:19 pem@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.204 03/12/09 18:00:19 pem@mysql.com +0 -0
    Auto merged

  scripts/mysql_install_db.sh
    1.50 03/12/09 18:00:19 pem@mysql.com +0 -0
    Auto merged

  myisam/mi_check.c
    1.114 03/12/09 18:00:19 pem@mysql.com +0 -0
    Auto merged

  libmysqld/lib_sql.cc
    1.79 03/12/09 18:00:19 pem@mysql.com +0 -0
    Auto merged

  include/mysql_com.h
    1.78 03/12/09 18:00:19 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.1.279 03/12/09 16:21:43 monty@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.0
  into mysql.com:/my/mysql-4.0

  sql/mysqld.cc
    1.297.1.169 03/12/09 16:21:42 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.445.1 03/12/09 16:21:23 monty@mysql.com +1 -0
  Don't limit number of tables in table cache

  sql/mysqld.cc
    1.297.37.1 03/12/09 16:21:20 monty@mysql.com +1 -1
    Don't limit number of tables in table cache

ChangeSet
  1.1346.444.1 03/12/09 17:33:29 ram@gw.mysql.r18.ru +2 -0
  Fix for the bugs:
  #2005 Long decimal comparion bug.                                               
  #2055 mysqldump should replace "-inf" numeric field values with "NULL"

  mysql-test/t/mysqldump.test
    1.1.1.1 03/12/09 17:33:13 ram@gw.mysql.r18.ru +19 -0
    Fix for the bugs:
    #2005 Long decimal comparion bug.                                               
    #2055 mysqldump should replace "-inf" numeric field values with "NULL"

  client/mysqldump.c
    1.65.1.33 03/12/09 17:33:13 ram@gw.mysql.r18.ru +29 -5
    Fix for the bugs:
    #2005 Long decimal comparion bug.                                               
    #2055 mysqldump should replace "-inf" numeric field values with "NULL"

ChangeSet
  1.1616.46.3 03/12/09 15:28:58 ram@gw.mysql.r18.ru +3 -0
  Fix for the bug #1994: mysqldump does not correctly dump UCS2 data.

  mysql-test/t/mysqldump.test
    1.6 03/12/09 15:28:33 ram@gw.mysql.r18.ru +9 -0
    Fix for the bug #1994: mysqldump does not correctly dump UCS2 data.

  mysql-test/r/mysqldump.result
    1.9 03/12/09 15:28:33 ram@gw.mysql.r18.ru +39 -0
    Fix for the bug #1994: mysqldump does not correctly dump UCS2 data.

  client/mysqldump.c
    1.104 03/12/09 15:28:33 ram@gw.mysql.r18.ru +6 -1
    Fix for the bug #1994: mysqldump does not correctly dump UCS2 data.

ChangeSet
  1.1346.1.278 03/12/09 12:59:00 ram@gw.mysql.r18.ru +2 -0
  test for the bug #1885: mysqldump does not dumps timestamp default.

  mysql-test/t/type_timestamp.test
    1.6.1.3 03/12/09 12:58:58 ram@gw.mysql.r18.ru +6 -0
    test for the bug #1885: mysqldump does not dumps timestamp default.

  mysql-test/r/type_timestamp.result
    1.7.1.4 03/12/09 12:58:58 ram@gw.mysql.r18.ru +2 -0
    test for the bug #1885: mysqldump does not dumps timestamp default.

ChangeSet
  1.1346.1.277 03/12/09 12:36:57 ram@gw.mysql.r18.ru +1 -0
  Fix for the bug #1885: mysqldump does not dumps timestamp default.

  sql/sql_parse.cc
    1.218.1.133 03/12/09 12:36:41 ram@gw.mysql.r18.ru +6 -1
    Fix for the bug #1885: mysqldump does not dumps timestamp default.

ChangeSet
  1.1346.1.276 03/12/08 20:53:46 guilhem@mysql.com +1 -0
  Create PID file with O_TRUNC, so that it is emptied before it is written to.
  Otherwise, if the previous run ended with a crash, and the PID was 1234,
  and you have rebooted the machine and the new PID is 99 then in the PID
  file you will have 9934.
  Note: users of mysqld_safe did not have the problem because this script
  deletes the PID file before starting mysqld.

  sql/mysqld.cc
    1.297.1.168 03/12/08 20:53:43 guilhem@mysql.com +4 -2
    Create PID file with O_TRUNC, so that it is emptied before it is written to.
    Otherwise, if the previous run ended with a crash, and the PID was 1234,
    and you have rebooted the machine and the new PID is 99 then in the PID
    file you will have 9934.
    Note: users of mysqld_safe did not have the problem because this script
    deletes the PID file before starting mysqld.

ChangeSet
  1.1346.433.11 03/12/08 16:18:25 guilhem@mysql.com +3 -0
  Fix for BUG#2045 "Sending SIGHUP to mysqld crashes it if running with --log-bin".
  The constructor of Rotate_log_event used when we are rotating our binlog or
  relay log, should not assume that there is a nonzero THD available.
  For example, when we are reacting to SIGHUP, the THD is 0.
  In fact we don't need to use the THD in this constructor;
  we can do like for Stop_log_event, and use the minimal Log_event
  constructor.
  If we were allowed to put Unix-specific commands in the testsuite,
  I'd add a test for this (<sigh>).

  sql/log_event.h
    1.71.1.14 03/12/08 16:17:01 guilhem@mysql.com +1 -1
    The constructor of Rotate_log_event used when we are rotating our binlog or
    relay log, should not assume that there is a nonzero THD available.
    For example, when we are reacting to SIGHUP, the THD is 0.
    In fact we don't need to use the THD in this constructor;
    we can do like for Stop_log_event, and use the minimal Log_event
    constructor.
    This fixes BUG#2045 
    "Sending SIGHUP to mysqld crashes it if running with --log-bin"

  sql/log_event.cc
    1.77.1.63 03/12/08 16:16:51 guilhem@mysql.com +6 -1
    A comment.

  sql/log.cc
    1.80.1.62 03/12/08 16:16:41 guilhem@mysql.com +2 -2
    A comment to warn that thd can be 0.
    The part about LOG_EVENT_FORCED_ROTATE_F is just to avoid segfault;
    this flag is already removed in 4.1 anyway.

ChangeSet
  1.1624.1.23 03/12/08 17:44:56 gluh@gluh.mysql.r18.ru +3 -0
  post-merge fixes

  sql/item_timefunc.cc
    1.53 03/12/08 17:44:53 gluh@gluh.mysql.r18.ru +7 -6
    post-merge fixes

  mysql-test/t/func_time.test
    1.23 03/12/08 17:44:53 gluh@gluh.mysql.r18.ru +3 -0
    post-merge fixes

  mysql-test/r/func_time.result
    1.25 03/12/08 17:44:53 gluh@gluh.mysql.r18.ru +6 -0
    post-merge fixes

ChangeSet
  1.1616.46.2 03/12/08 14:38:29 lenz@kallisto.local +2 -0
  Fixed two packaging bugs:
  
   - postinstall of the Mac OS X PKG failed as a parameter for 
     mysql_install_db was changed for MySQL 4.1
   - postinstall of the Server RPM failed as mysql_create_system_tables was
     missing from the file list

  support-files/mysql.spec.sh
    1.70 03/12/08 14:38:25 lenz@mysql.com +5 -0
     - Added missing file mysql_create_system_tables to the server subpackage

  support-files/MacOSX/postinstall.sh
    1.4 03/12/08 14:38:25 lenz@mysql.com +1 -1
     - Fix parameter for mysql_install_db (it was changed from -IN-RPM to --rpm
       in the 4.1 tree)

ChangeSet
  1.1624.1.22 03/12/08 15:18:29 gluh@gluh.mysql.r18.ru +8 -0
  post-merge fixes

  sql/sql_yacc.yy
    1.261 03/12/08 15:18:27 gluh@gluh.mysql.r18.ru +0 -0
    post-merge fixes

  sql/item_timefunc.h
    1.43 03/12/08 15:18:27 gluh@gluh.mysql.r18.ru +3 -8
    post-merge fixes

  sql/item_timefunc.cc
    1.52 03/12/08 15:18:27 gluh@gluh.mysql.r18.ru +103 -105
    post-merge fixes

  sql/lex.h
    1.109 03/12/08 14:47:26 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/item_create.h
    1.35 03/12/08 14:47:24 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/item_create.cc
    1.40 03/12/08 14:47:24 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  mysql-test/t/func_time.test
    1.22 03/12/08 14:47:24 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  mysql-test/r/func_time.result
    1.24 03/12/08 14:47:24 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1563.95.1 03/12/08 14:41:41 gluh@gluh.mysql.r18.ru +12 -0
  WL#530&531: TIMESTAMPADD, TIMESTAMPDIFF functions
  
  Syntax for TIMESTAMPADD:
  
  TIMESTAMPADD(interval, integer_expression, datetime_expression)
  
  interval:= FRAC_SECOND | SECOND | MINUTE | HOUR | DAY | WEEK | MONTH | 
  QUARTER | YEAR
  
  Supported SQL_TSI_  prefix  (like SQL_TSI_SECOND)
  
  Syntax for TIMESTAMPDIFF:
  
  TIMESTAMPDIFF(interval, datetime_expression1, datetime_expression2)
  
  interval:= FRAC_SECOND | SECOND | MINUTE | HOUR | DAY | WEEK | MONTH | 
  QUARTER | YEAR
  
  Supported SQL_TSI_  prefix  (like SQL_TSI_SECOND)

  sql/sql_yacc.yy
    1.239.2.1 03/12/08 14:40:57 gluh@gluh.mysql.r18.ru +28 -6
    WL#530&531: TIMESTAMPADD, TIMESTAMPDIFF functions

  sql/lex.h
    1.101.2.1 03/12/08 14:40:57 gluh@gluh.mysql.r18.ru +14 -2
    WL#530&531: TIMESTAMPADD, TIMESTAMPDIFF functions

  sql/item_timefunc.h
    1.37.2.1 03/12/08 14:40:57 gluh@gluh.mysql.r18.ru +23 -5
    WL#530&531: TIMESTAMPADD, TIMESTAMPDIFF functions

  sql/item_timefunc.cc
    1.42.3.1 03/12/08 14:40:57 gluh@gluh.mysql.r18.ru +262 -31
    WL#530&531: TIMESTAMPADD, TIMESTAMPDIFF functions

  sql/item_create.h
    1.32.1.1 03/12/08 14:40:57 gluh@gluh.mysql.r18.ru +0 -1
    WL#530&531: TIMESTAMPADD, TIMESTAMPDIFF functions

  sql/item_create.cc
    1.37.1.1 03/12/08 14:40:57 gluh@gluh.mysql.r18.ru +0 -5
    WL#530&531: TIMESTAMPADD, TIMESTAMPDIFF functions

  mysql-test/t/keywords.test
    1.6 03/12/08 14:40:57 gluh@gluh.mysql.r18.ru +5 -3
    Test for new keywords

  mysql-test/t/func_time.test
    1.19.1.1 03/12/08 14:40:57 gluh@gluh.mysql.r18.ru +24 -0
    Tests for timestampadd, timestampdiff functions

  mysql-test/t/func_sapdb.test
    1.3 03/12/08 14:40:57 gluh@gluh.mysql.r18.ru +2 -1
    Additional tests for timediff

  mysql-test/r/keywords.result
    1.7 03/12/08 14:40:57 gluh@gluh.mysql.r18.ru +9 -7
    Test for new keywords

  mysql-test/r/func_time.result
    1.21.1.1 03/12/08 14:40:57 gluh@gluh.mysql.r18.ru +57 -0
    Tests for timestampadd, timestampdiff functions

  mysql-test/r/func_sapdb.result
    1.3 03/12/08 14:40:57 gluh@gluh.mysql.r18.ru +10 -9
    Additional tests for timediff

ChangeSet
  1.1616.45.1 03/12/08 13:30:14 konstantin@oak.local +1 -0
  commented why valgrind barks at the bug #1500

  tests/client_test.c
    1.50 03/12/08 13:30:12 konstantin@mysql.com +5 -0
    commented why valgrind barks at the bug #1500

ChangeSet
  1.1616.1.46 03/12/08 12:26:10 monty@mysql.com +8 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/my/mysql-4.1

  strings/ctype-ujis.c
    1.45 03/12/08 12:26:09 monty@mysql.com +0 -0
    Auto merged

  strings/ctype-sjis.c
    1.51 03/12/08 12:26:09 monty@mysql.com +0 -0
    Auto merged

  strings/ctype-gbk.c
    1.46 03/12/08 12:26:09 monty@mysql.com +0 -0
    Auto merged

  strings/ctype-gb2312.c
    1.42 03/12/08 12:26:09 monty@mysql.com +0 -0
    Auto merged

  strings/ctype-euc_kr.c
    1.45 03/12/08 12:26:09 monty@mysql.com +0 -0
    Auto merged

  strings/ctype-big5.c
    1.46 03/12/08 12:26:08 monty@mysql.com +0 -0
    Auto merged

  sql/set_var.cc
    1.34.1.51 03/12/08 12:26:08 monty@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.73 03/12/08 12:26:08 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.44.1 03/12/08 12:25:37 monty@mysql.com +38 -0
  Portability fixes for Windows

  strings/ctype-ujis.c
    1.43.1.1 03/12/08 12:25:34 monty@mysql.com +7 -7
    Removed compiler warnings (VC++)

  strings/ctype-ucs2.c
    1.11 03/12/08 12:25:34 monty@mysql.com +3 -3
    Removed compiler warnings (VC++)

  strings/ctype-sjis.c
    1.49.1.1 03/12/08 12:25:34 monty@mysql.com +9 -7
    Removed compiler warnings (VC++)

  strings/ctype-gbk.c
    1.44.1.1 03/12/08 12:25:34 monty@mysql.com +2 -2
    Removed compiler warnings (VC++)

  strings/ctype-gb2312.c
    1.40.1.1 03/12/08 12:25:34 monty@mysql.com +8 -7
    Removed compiler warnings (VC++)

  strings/ctype-euc_kr.c
    1.43.1.1 03/12/08 12:25:34 monty@mysql.com +2 -2
    Removed compiler warnings (VC++)

  strings/ctype-big5.c
    1.44.1.1 03/12/08 12:25:34 monty@mysql.com +8 -7
    Removed compiler warnings (VC++)

  sql/sql_acl.cc
    1.74.1.25 03/12/08 12:25:34 monty@mysql.com +0 -1
    Removed compiler warnings

  sql/share/ukrainian/errmsg.txt
    1.27.1.34 03/12/08 12:25:34 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/share/swedish/errmsg.txt
    1.64.1.37 03/12/08 12:25:34 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/share/spanish/errmsg.txt
    1.64.1.38 03/12/08 12:25:34 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/share/slovak/errmsg.txt
    1.64.1.37 03/12/08 12:25:33 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/share/serbian/errmsg.txt
    1.18.1.35 03/12/08 12:25:33 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/share/russian/errmsg.txt
    1.61.1.35 03/12/08 12:25:33 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/share/romanian/errmsg.txt
    1.62.1.37 03/12/08 12:25:33 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/share/portuguese/errmsg.txt
    1.64.1.36 03/12/08 12:25:33 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/share/polish/errmsg.txt
    1.63.1.37 03/12/08 12:25:33 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/share/norwegian/errmsg.txt
    1.63.1.38 03/12/08 12:25:33 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.37 03/12/08 12:25:33 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/share/korean/errmsg.txt
    1.63.1.37 03/12/08 12:25:33 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/share/japanese/errmsg.txt
    1.63.1.36 03/12/08 12:25:33 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/share/italian/errmsg.txt
    1.70.1.38 03/12/08 12:25:33 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/share/hungarian/errmsg.txt
    1.65.1.36 03/12/08 12:25:33 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/share/greek/errmsg.txt
    1.64.1.36 03/12/08 12:25:33 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/share/french/errmsg.txt
    1.63.1.37 03/12/08 12:25:33 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/share/estonian/errmsg.txt
    1.64.1.36 03/12/08 12:25:33 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/share/english/errmsg.txt
    1.70.1.40 03/12/08 12:25:33 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/share/dutch/errmsg.txt
    1.66.1.37 03/12/08 12:25:33 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/share/danish/errmsg.txt
    1.62.1.37 03/12/08 12:25:33 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/share/czech/errmsg.txt
    1.64.1.37 03/12/08 12:25:33 monty@mysql.com +4 -4
    Fixed wrong delimiters

  sql/set_var.cc
    1.34.28.1 03/12/08 12:25:33 monty@mysql.com +7 -2
    Indentation cleanups

  sql/mysqld.cc
    1.356.40.1 03/12/08 12:25:33 monty@mysql.com +0 -1
    Remove not used variable

  scripts/mysql_install_db.sh
    1.37.1.18 03/12/08 12:25:33 monty@mysql.com +3 -1
    Update for windows

  scripts/make_win_src_distribution.sh
    1.13 03/12/08 12:25:33 monty@mysql.com +9 -10
    Update for windows

  libmysqld/lib_sql.cc
    1.75.1.14 03/12/08 12:25:33 monty@mysql.com +19 -11
    Update for windows

  VC++Files/strings/strings.dsp
    1.10 03/12/08 12:25:33 monty@mysql.com +4 -0
    Update for windows

  VC++Files/libmysql/libmysql.dsp
    1.19 03/12/08 12:25:33 monty@mysql.com +12 -0
    Update for windows

  VC++Files/client/mysqlclient.dsp
    1.19 03/12/08 12:25:33 monty@mysql.com +12 -0
    Update for windows

ChangeSet
  1.1616.1.45 03/12/08 12:10:30 gluh@gluh.mysql.r18.ru +3 -0
  Fixed test for 'init_slave' variable

  mysql-test/t/rpl_init_slave.test
    1.2 03/12/08 12:10:27 gluh@gluh.mysql.r18.ru +5 -5
    Fixed test for 'init_slave' variable

  mysql-test/t/rpl_init_slave-slave.opt
    1.2 03/12/08 12:10:27 gluh@gluh.mysql.r18.ru +1 -1
    Fixed test for 'init_slave' variable

  mysql-test/r/rpl_init_slave.result
    1.2 03/12/08 12:10:27 gluh@gluh.mysql.r18.ru +12 -11
    Fixed test for 'init_slave' variable

ChangeSet
  1.1616.1.44 03/12/08 09:44:04 gluh@gluh.mysql.r18.ru +11 -0
  post-merge fixes

  sql/sql_parse.cc
    1.271.1.36 03/12/08 09:44:01 gluh@gluh.mysql.r18.ru +1 -0
    post-merge fixes

  sql/mysqld.cc
    1.356.1.72 03/12/08 09:44:01 gluh@gluh.mysql.r18.ru +11 -11
    post-merge fixes

  sql/mysql_priv.h
    1.186.1.54 03/12/08 09:44:01 gluh@gluh.mysql.r18.ru +0 -1
    post-merge fixes

  mysql-test/mysql-test-run.sh
    1.169 03/12/08 09:44:01 gluh@gluh.mysql.r18.ru +0 -1
    post-merge fixes

  sql/sql_show.cc
    1.122.1.14 03/12/08 09:16:40 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_class.h
    1.146.1.55 03/12/08 09:16:40 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_class.cc
    1.105.1.34 03/12/08 09:16:40 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/slave.cc
    1.188.1.32 03/12/08 09:16:38 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/set_var.h
    1.41 03/12/08 09:16:38 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/set_var.cc
    1.34.1.50 03/12/08 09:16:38 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/protocol.cc
    1.56.1.22 03/12/08 09:16:37 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1546.43.2 03/12/08 09:13:14 gluh@gluh.mysql.r18.ru +9 -0
  Task ID	499:Add a new settable string variable(init_connect, init_slave)
  to mysqld that is executed for all new connections.
  (Similar to the client command: mysql_options(... MYSQL_INIT_COMMAND ...).

  sql/sql_show.cc
    1.122.1.13 03/12/08 09:13:12 gluh@gluh.mysql.r18.ru +4 -4
    Task ID	499:Add a new settable string variable(init_connect, init_slave)
    to mysqld that is executed for all new connections.
    

  sql/sql_parse.cc
    1.271.18.2 03/12/08 09:13:12 gluh@gluh.mysql.r18.ru +19 -27
    Task ID	499:Add a new settable string variable(init_connect, init_slave)
    to mysqld that is executed for all new connections.
    

  sql/sql_class.h
    1.146.14.2 03/12/08 09:13:12 gluh@gluh.mysql.r18.ru +0 -1
    Task ID	499:Add a new settable string variable(init_connect, init_slave)
    to mysqld that is executed for all new connections.
    

  sql/sql_class.cc
    1.105.2.2 03/12/08 09:13:12 gluh@gluh.mysql.r18.ru +0 -1
    Task ID	499:Add a new settable string variable(init_connect, init_slave)
    to mysqld that is executed for all new connections.
    

  sql/slave.cc
    1.188.4.2 03/12/08 09:13:12 gluh@gluh.mysql.r18.ru +1 -21
    Task ID	499:Add a new settable string variable(init_connect, init_slave)
    to mysqld that is executed for all new connections.
    

  sql/set_var.cc
    1.34.11.2 03/12/08 09:13:12 gluh@gluh.mysql.r18.ru +27 -44
    Task ID	499:Add a new settable string variable(init_connect, init_slave)
    to mysqld that is executed for all new connections.
    

  sql/protocol.cc
    1.56.5.5 03/12/08 09:13:12 gluh@gluh.mysql.r18.ru +0 -2
    Task ID	499:Add a new settable string variable(init_connect, init_slave)
    to mysqld that is executed for all new connections.
    

  sql/mysqld.cc
    1.356.19.2 03/12/08 09:13:12 gluh@gluh.mysql.r18.ru +2 -2
    Task ID	499:Add a new settable string variable(init_connect, init_slave)
    to mysqld that is executed for all new connections.
    

  sql/mysql_priv.h
    1.186.20.2 03/12/08 09:13:12 gluh@gluh.mysql.r18.ru +2 -0
    Task ID	499:Add a new settable string variable(init_connect, init_slave)
    to mysqld that is executed for all new connections.
    

ChangeSet
  1.1616.1.43 03/12/07 20:36:45 serg@serg.mylan +2 -0
  let chk_index() understand 2-level fulltext index format

  sql/sql_table.cc
    1.157.2.26 03/12/07 20:36:41 serg@serg.mylan +1 -1
    typo fixed

  myisam/mi_check.c
    1.105.1.16 03/12/07 20:36:41 serg@serg.mylan +49 -21
    let chk_index() understand 2-level fulltext index format

ChangeSet
  1.1346.1.274 03/12/07 15:11:08 gluh@gluh.mysql.r18.ru +1 -0
  Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
  into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.defweek

  sql/mysqld.cc
    1.297.1.167 03/12/07 15:11:06 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1346.443.1 03/12/07 15:10:21 gluh@gluh.mysql.r18.ru +6 -0
  WL#1175: more default_week_formats for iso compatibility
  
  New formats added for 'week()' function and 'default_week_format' option(4 - 7).
  Next formats is supported now:
  *Value* *Meaning*
    `0'     Week starts on Sunday; First Sunday of the year starts week 1.
    	  Week() returns 0-53.
    `1'     Week starts on Monday; Weeks numbered according to ISO 8601:1988.
  	  Week() returns 0-53.
    `2'     Week starts on Sunday; First Sunday of the year starts week 1.
    	  Week() returns 1-53.
    `3'     Week starts on Monday; Weeks numbered according to ISO 8601:1988.
  	  Week() returns 1-53.
    `4'     Week starts on Sunday; Weeks numbered according to ISO 8601:1988.
  	  Week() returns 0-53.
    `5'     Week starts on Monday;  First Monday of the year starts week 1.
    	  Week() returns 0-53.
    `6'     Week starts on Sunday; Weeks numbered according to ISO 8601:1988.
  	  Week() returns 1-53.
    `7'     Week starts on Monday;  First Monday of the year starts week 1.
    	  Week() returns 1-53.

  sql/time.cc
    1.19.1.7 03/12/07 15:10:05 gluh@gluh.mysql.r18.ru +49 -19
    WL#1175 more default_week_formats for iso compatibility

  sql/mysqld.cc
    1.297.36.1 03/12/07 15:10:05 gluh@gluh.mysql.r18.ru +1 -1
    WL#1175 more default_week_formats for iso compatibility

  sql/mysql_priv.h
    1.150.1.59 03/12/07 15:10:05 gluh@gluh.mysql.r18.ru +6 -2
    WL#1175 more default_week_formats for iso compatibility

  sql/item_timefunc.cc
    1.17.1.7 03/12/07 15:10:05 gluh@gluh.mysql.r18.ru +52 -16
    WL#1175 more default_week_formats for iso compatibility

  mysql-test/t/func_time.test
    1.14.1.3 03/12/07 15:10:05 gluh@gluh.mysql.r18.ru +12 -0
    Test for 'default_week_format' option and 'week' function

  mysql-test/r/func_time.result
    1.17.1.3 03/12/07 15:10:05 gluh@gluh.mysql.r18.ru +25 -2
    Test for 'default_week_format' option and 'week' function

ChangeSet
  1.1346.1.273 03/12/07 13:36:29 gluh@gluh.mysql.r18.ru +1 -0
  Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
  into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.pass

  sql/sql_parse.cc
    1.218.1.132 03/12/07 13:36:27 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1616.1.42 03/12/06 23:21:09 serg@serg.mylan +9 -0
  QUERY_NO_GOOD_INDEX_USED and QUERY_NO_INDEX_USED moved from thd->lex.select_lex->options to thd->server_status

  mysql-test/t/union-master.opt
    1.1 03/12/06 23:21:04 serg@serg.mylan +1 -0

  sql/sql_update.cc
    1.83.2.22 03/12/06 23:21:04 serg@serg.mylan +1 -1
    QUERY_NO_GOOD_INDEX_USED and QUERY_NO_INDEX_USED moved from thd->lex.select_lex->options to thd->server_status

  sql/sql_select.cc
    1.216.1.68 03/12/06 23:21:04 serg@serg.mylan +4 -4
    QUERY_NO_GOOD_INDEX_USED and QUERY_NO_INDEX_USED moved from thd->lex.select_lex->options to thd->server_status

  sql/sql_parse.cc
    1.271.1.35 03/12/06 23:21:04 serg@serg.mylan +5 -3
    QUERY_NO_GOOD_INDEX_USED and QUERY_NO_INDEX_USED moved from thd->lex.select_lex->options to thd->server_status

  sql/sql_delete.cc
    1.99.2.15 03/12/06 23:21:04 serg@serg.mylan +1 -1
    QUERY_NO_GOOD_INDEX_USED and QUERY_NO_INDEX_USED moved from thd->lex.select_lex->options to thd->server_status

  sql/mysql_priv.h
    1.186.1.53 03/12/06 23:21:04 serg@serg.mylan +32 -37
    QUERY_NO_GOOD_INDEX_USED and QUERY_NO_INDEX_USED moved from thd->lex.select_lex->options to thd->server_status

  mysql-test/t/union.test
    1.49 03/12/06 23:21:04 serg@serg.mylan +23 -3
    union and slow log tests

  mysql-test/t/union-master.opt
    1.0 03/12/06 23:21:04 serg@serg.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-4.1/mysql-test/t/union-master.opt

  mysql-test/r/union.result
    1.51 03/12/06 23:21:04 serg@serg.mylan +38 -0
    union and slow log tests

  include/mysql_com.h
    1.67.1.21 03/12/06 23:21:04 serg@serg.mylan +2 -0
    QUERY_NO_GOOD_INDEX_USED and QUERY_NO_INDEX_USED moved from thd->lex.select_lex->options to thd->server_status

ChangeSet
  1.1616.43.1 03/12/06 19:05:26 serg@serg.mylan +8 -0
  fix for my_mbcharlen(charset, c) to return 1 for single-byte characters
  (isn't it obvious ?)

  strings/ctype-ujis.c
    1.44 03/12/06 19:05:22 serg@serg.mylan +1 -1
    fix for my_mbcharlen(charset, c) to return 1 for single-byte characters
    (isn't it obvious ?)

  strings/ctype-sjis.c
    1.50 03/12/06 19:05:22 serg@serg.mylan +1 -1
    fix for my_mbcharlen(charset, c) to return 1 for single-byte characters
    (isn't it obvious ?)

  strings/ctype-gbk.c
    1.45 03/12/06 19:05:22 serg@serg.mylan +1 -1
    fix for my_mbcharlen(charset, c) to return 1 for single-byte characters
    (isn't it obvious ?)

  strings/ctype-gb2312.c
    1.41 03/12/06 19:05:22 serg@serg.mylan +1 -1
    fix for my_mbcharlen(charset, c) to return 1 for single-byte characters
    (isn't it obvious ?)

  strings/ctype-euc_kr.c
    1.44 03/12/06 19:05:22 serg@serg.mylan +1 -1
    fix for my_mbcharlen(charset, c) to return 1 for single-byte characters
    (isn't it obvious ?)

  strings/ctype-big5.c
    1.45 03/12/06 19:05:22 serg@serg.mylan +1 -1
    fix for my_mbcharlen(charset, c) to return 1 for single-byte characters
    (isn't it obvious ?)

  sql/sql_load.cc
    1.46.3.15 03/12/06 19:05:22 serg@serg.mylan +2 -3
    all charsets support my_mbcharlen - no need to protect it with use_mb()

  mysys/charset.c
    1.105 03/12/06 19:05:22 serg@serg.mylan +1 -1
    all charsets support my_mbcharlen - no need to protect it with use_mb()

ChangeSet
  1.1624.1.21 03/12/05 18:52:33 pem@mysql.comhem.se +2 -0
  New test cases for BUG#1653 (recalling a procedure after replacing a faulty
  table definition crashed), and recursive calls.

  mysql-test/t/sp.test
    1.40 03/12/05 18:52:31 pem@mysql.com +65 -2
    New test cases for BUG#1653 and recursive calls.

  mysql-test/r/sp.result
    1.39 03/12/05 18:52:31 pem@mysql.com +56 -0
    New test cases for BUG#1653 and recursive calls.

ChangeSet
  1.1346.442.1 03/12/05 21:45:19 hf@deer.(none) +1 -0
  Fix for #1890 and #1959
  This bug happens under Windows & Embedded server
  Reason is that pthread_self() always returns NULL in this case.
  This confuses thr_lock function and it doesn't stop
  thread inserting in the write-locked table.
  
  Global problem is that there's no way under Windows to get
  unique thread handle for working thread.
  Monty made a workaround for server - we store the thread's handle
  we get when we create thread in the thread-specific variable.
  This doesn't work with the embedded library for we don't control
  thread creation there.
  
  I added code that sets CurrentThreadId as the pthread_self
  for the embedded library.
  It seems to solve problem because it's unique and we don't use
  pthread_self as a parameter for thread functions in embedded library. 

  mysys/my_thr_init.c
    1.21.1.2 03/12/05 21:45:18 hf@deer.(none) +3 -0
    setting of tmp->thread_self added

ChangeSet
  1.1346.432.7 03/12/05 19:20:06 konstantin@mysql.com +1 -0
  typo fixed

  include/my_global.h
    1.34.1.25 03/12/05 19:20:05 konstantin@mysql.com +2 -2
    typo fixed

ChangeSet
  1.1624.1.20 03/12/05 14:45:48 pem@mysql.comhem.se +3 -0
  Post-merge fixes.

  mysql-test/t/sp-error.test
    1.26 03/12/05 14:45:46 pem@mysql.com +43 -43
    Post-merge fixes.

  mysql-test/r/variables.result
    1.39 03/12/05 14:45:46 pem@mysql.com +1 -1
    Post-merge fixes.

  mysql-test/r/sp-error.result
    1.26 03/12/05 14:45:46 pem@mysql.com +2 -2
    Post-merge fixes.

ChangeSet
  1.1624.1.19 03/12/05 13:11:50 pem@mysql.com +43 -0
  Merged 4.1 -> 5.0

  sql/sql_yacc.yy
    1.260 03/12/05 13:11:46 pem@mysql.com +0 -8
    Merged 4.1 -> 5.0

  sql/share/ukrainian/errmsg.txt
    1.53 03/12/05 13:11:46 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0

  sql/share/swedish/errmsg.txt
    1.91 03/12/05 13:11:46 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0

  sql/share/spanish/errmsg.txt
    1.90 03/12/05 13:11:46 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0

  sql/share/slovak/errmsg.txt
    1.90 03/12/05 13:11:46 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0

  sql/share/serbian/errmsg.txt
    1.44 03/12/05 13:11:46 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0

  sql/share/russian/errmsg.txt
    1.88 03/12/05 13:11:46 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0

  sql/share/romanian/errmsg.txt
    1.87 03/12/05 13:11:46 pem@mysql.com +0 -0
    Merged 4.1 -> 5.0

  sql/share/portuguese/errmsg.txt
    1.90 03/12/05 13:11:46 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0

  sql/share/polish/errmsg.txt
    1.90 03/12/05 13:11:46 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0

  sql/share/norwegian/errmsg.txt
    1.89 03/12/05 13:11:46 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0

  sql/share/norwegian-ny/errmsg.txt
    1.89 03/12/05 13:11:46 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0

  sql/share/korean/errmsg.txt
    1.89 03/12/05 13:11:46 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0

  sql/share/japanese/errmsg.txt
    1.89 03/12/05 13:11:46 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0

  sql/share/italian/errmsg.txt
    1.96 03/12/05 13:11:46 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0

  sql/share/hungarian/errmsg.txt
    1.91 03/12/05 13:11:46 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0

  sql/share/greek/errmsg.txt
    1.90 03/12/05 13:11:46 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0

  sql/share/german/errmsg.txt
    1.91 03/12/05 13:11:46 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0

  sql/share/french/errmsg.txt
    1.89 03/12/05 13:11:46 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0

  sql/share/estonian/errmsg.txt
    1.90 03/12/05 13:11:46 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0

  sql/share/english/errmsg.txt
    1.97 03/12/05 13:11:46 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0

  sql/share/dutch/errmsg.txt
    1.92 03/12/05 13:11:46 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0

  sql/share/danish/errmsg.txt
    1.88 03/12/05 13:11:46 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0

  sql/share/czech/errmsg.txt
    1.89 03/12/05 13:11:46 pem@mysql.com +0 -0
    Merged 4.1 -> 5.0

  sql/lex.h
    1.108 03/12/05 13:11:46 pem@mysql.com +0 -0
    Merged 4.1 -> 5.0

  sql/handler.h
    1.92 03/12/05 13:11:46 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0

  sql/handler.cc
    1.106 03/12/05 13:11:46 pem@mysql.com +0 -43
    Merged 4.1 -> 5.0

  include/sql_state.h
    1.12 03/12/05 13:11:46 pem@mysql.com +0 -0
    Merged 4.1 -> 5.0

  include/mysqld_error.h
    1.88 03/12/05 13:11:46 pem@mysql.com +34 -35
    Merged 4.1 -> 5.0

  configure.in
    1.219 03/12/05 13:11:46 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0

  sql/sql_table.cc
    1.171 03/12/05 12:41:18 pem@mysql.com +0 -0
    Auto merged

  sql/sql_show.cc
    1.131 03/12/05 12:41:17 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.171 03/12/05 12:41:17 pem@mysql.com +0 -0
    Auto merged

  sql/set_var.cc
    1.45 03/12/05 12:41:17 pem@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.373 03/12/05 12:41:17 pem@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.203 03/12/05 12:41:17 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/variables.test
    1.24 03/12/05 12:41:17 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/variables.result
    1.38 03/12/05 12:41:17 pem@mysql.com +0 -0
    Auto merged

  myisam/sort.c
    1.39 03/12/05 12:41:17 pem@mysql.com +0 -0
    Auto merged

  myisam/myisamchk.c
    1.101 03/12/05 12:41:17 pem@mysql.com +0 -0
    Auto merged

  myisam/mi_check.c
    1.113 03/12/05 12:41:17 pem@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.250.1.2 03/12/05 12:41:07 pem@mysql.com +0 -0
    auto-union

  BitKeeper/etc/ignore
    1.163 03/12/05 12:41:07 pem@mysql.com +1 -1
    auto-union

ChangeSet
  1.1346.432.6 03/12/05 12:52:07 konstantin@mysql.com +2 -0
  attempt to make ULONGLONG_MAX work on Windows.

  include/my_global.h
    1.34.1.24 03/12/05 12:52:06 konstantin@mysql.com +1 -0
    comment about config-win.h added

  include/config-win.h
    1.23.1.10 03/12/05 12:52:06 konstantin@mysql.com +1 -0
    ULONGLONG_MAX definition added

ChangeSet
  1.1616.1.40 03/12/05 02:00:54 konstantin@mysql.com +1 -0
  Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
  into mysql.com:/home/kostja/mysql/mysql-4.1-max_prep_stmt_count

  sql/mysqld.cc
    1.356.1.71 03/12/05 02:00:51 konstantin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.42.1 03/12/05 01:55:57 konstantin@oak.local +4 -0
  unused variable max_prep_stmt_count removed

  sql/unireg.h
    1.32 03/12/05 01:55:54 konstantin@mysql.com +0 -1
    unused variable max_prep_stmt_count removed

  sql/sql_class.h
    1.146.1.54 03/12/05 01:55:54 konstantin@mysql.com +0 -1
    unused variable max_prep_stmt_count removed

  sql/set_var.cc
    1.34.1.49 03/12/05 01:55:54 konstantin@mysql.com +0 -4
    unused variable max_prep_stmt_count removed

  sql/mysqld.cc
    1.356.39.1 03/12/05 01:55:54 konstantin@mysql.com +1 -6
    unused variable max_prep_stmt_count removed

ChangeSet
  1.1616.1.39 03/12/04 23:18:04 serg@serg.mylan +1 -0
  test result fixed

  mysql-test/r/fulltext_var.result
    1.10 03/12/04 23:18:01 serg@serg.mylan +1 -1
    test result fixed

ChangeSet
  1.1624.1.18 03/12/05 00:56:28 konstantin@oak.local +1 -0
  cleanup

  sql/sql_class.cc
    1.130.1.5 03/12/05 00:56:20 konstantin@mysql.com +0 -1
    cleanup

ChangeSet
  1.1346.441.1 03/12/04 22:42:18 guilhem@mysql.com +7 -0
  - Fix for BUG#1858 "SQL-Thread stops working when using optimize table":
  we change THD::system_thread from a 'bool' to a bitmap to be able to
  distinguish between delayed-insert threads and slave threads.
  - Fix for BUG#1701 "Update from multiple tables" (one line in sql_parse.cc,
  plus a new test rpl_multi_update.test). That's just adding an initialization.

  mysql-test/t/rpl_multi_update.test
    1.1 03/12/04 22:41:56 guilhem@mysql.com +25 -0

  mysql-test/t/rpl_multi_update.test
    1.0 03/12/04 22:41:56 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/rpl_multi_update.test

  mysql-test/r/rpl_multi_update.result
    1.1 03/12/04 22:41:55 guilhem@mysql.com +27 -0

  sql/sql_parse.cc
    1.218.33.1 03/12/04 22:41:55 guilhem@mysql.com +6 -0
    We need to initialize thd->lex.select_lex.options in mysql_init_query();
    it's already initialized in dispatch_command() but replication calls
    mysql_parse() directly, thus bypassing dispatch_command().
    Not initing it here leads to a query influencing the next query,
    in the slave SQL thread.
    The initialization in dispatch_command() must be kept as this
    command uses the variable in tests, even when the command was not a
    query (i.e. when mysql_init_query() was not called).

  mysql-test/r/rpl_multi_update.result
    1.0 03/12/04 22:41:55 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/r/rpl_multi_update.result

  sql/sql_insert.cc
    1.63.1.43 03/12/04 22:41:50 guilhem@mysql.com +1 -1
    thd.system_thread is now a bitmap

  sql/sql_class.h
    1.111.1.56 03/12/04 22:41:49 guilhem@mysql.com +7 -2
    'bool' for THD::system_thread is not accurate enough; sometimes we need
    to distinguish between delayed-insert threads and slave threads;
    so changing THD::system_thread to a bitmap (uint).

  sql/slave.cc
    1.164.1.97 03/12/04 22:41:49 guilhem@mysql.com +3 -1
    Now thd->system_thread is a bitmap, not a bool.

  sql/repl_failsafe.cc
    1.11.1.24 03/12/04 22:41:48 guilhem@mysql.com +7 -0
    comment to warn about this unused code

ChangeSet
  1.1616.41.1 03/12/04 21:58:28 serg@serg.mylan +9 -0
  make a clear distinction between max_word_length in *characters* and in *bytes*

  sql/mysqld.cc
    1.356.1.70 03/12/04 21:58:24 serg@serg.mylan +2 -2
    make a clear distinction between max_word_length in *characters* and in *bytes*

  myisam/sort.c
    1.35.1.3 03/12/04 21:58:24 serg@serg.mylan +2 -2
    make a clear distinction between max_word_length in *characters* and in *bytes*

  myisam/myisamchk.c
    1.92.1.16 03/12/04 21:58:24 serg@serg.mylan +3 -3
    make a clear distinction between max_word_length in *characters* and in *bytes*

  myisam/mi_create.c
    1.32 03/12/04 21:58:24 serg@serg.mylan +2 -2
    make a clear distinction between max_word_length in *characters* and in *bytes*

  myisam/mi_check.c
    1.105.1.15 03/12/04 21:58:24 serg@serg.mylan +3 -3
    make a clear distinction between max_word_length in *characters* and in *bytes*

  myisam/ft_update.c
    1.34 03/12/04 21:58:24 serg@serg.mylan +1 -1
    make a clear distinction between max_word_length in *characters* and in *bytes*

  myisam/ft_static.c
    1.25 03/12/04 21:58:24 serg@serg.mylan +2 -2
    make a clear distinction between max_word_length in *characters* and in *bytes*

  myisam/ft_dump.c
    1.24 03/12/04 21:58:24 serg@serg.mylan +1 -1
    make a clear distinction between max_word_length in *characters* and in *bytes*

  include/ft_global.h
    1.27 03/12/04 21:58:24 serg@serg.mylan +2 -2
    make a clear distinction between max_word_length in *characters* and in *bytes*

ChangeSet
  1.1624.1.17 03/12/04 22:08:26 konstantin@oak.local +2 -0
  after-review fixes

  sql/sql_class.h
    1.170 03/12/04 22:08:24 konstantin@mysql.com +19 -9
    after-review fixes

  sql/sql_class.cc
    1.130.1.4 03/12/04 22:08:24 konstantin@mysql.com +13 -17
    after-review fixes

ChangeSet
  1.1346.440.1 03/12/04 13:58:21 greg@mysql.com +3 -0
  Fix InstallShield 'String Tables could not be loaded' issue

  VC++Files/InstallShield/4.0.XX-pro/String Tables/0009-English/value.shl
    1.3 03/12/04 13:58:20 greg@mysql.com +1 -1
    This should not be the product version; it must match Default.shl

  VC++Files/InstallShield/4.0.XX-gpl/String Tables/0009-English/value.shl
    1.3 03/12/04 13:58:20 greg@mysql.com +1 -1
    This should not be the product version; it must match Default.shl

  VC++Files/InstallShield/4.0.XX-classic/String Tables/0009-English/value.shl
    1.3 03/12/04 13:58:20 greg@mysql.com +1 -1
    This should not be the product version; it must match Default.shl

ChangeSet
  1.1616.1.37 03/12/04 18:09:36 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -0
  Fixup error number - Broke during merge

  mysql-test/t/variables.test
    1.18.1.10 03/12/04 18:09:11 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixup error number

  mysql-test/t/create.test
    1.33.1.6 03/12/04 18:09:11 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Fixup error number

ChangeSet
  1.1346.439.1 03/12/04 19:48:10 monty@mysql.com +7 -0
  Allow space in service names
  move bdb/innodb tests to right places

  sql/mysqld.cc
    1.297.1.166 03/12/04 19:48:09 monty@mysql.com +1 -1
    Allow space in service names

  mysql-test/t/multi_update.test
    1.17.1.9 03/12/04 19:48:09 monty@mysql.com +0 -46
    move bdb/innodb tests to repective test

  mysql-test/t/innodb.test
    1.28.1.21 03/12/04 19:48:09 monty@mysql.com +19 -0
    Move innodb test here

  mysql-test/t/bdb.test
    1.27.1.2 03/12/04 19:48:09 monty@mysql.com +19 -0
    Move bdb tests here

  mysql-test/r/multi_update.result
    1.15.1.9 03/12/04 19:48:09 monty@mysql.com +0 -26
    Update results after test changes

  mysql-test/r/innodb.result
    1.40.1.32 03/12/04 19:48:08 monty@mysql.com +11 -0
    Update results after test changes

  mysql-test/r/bdb.result
    1.22.1.6 03/12/04 19:48:08 monty@mysql.com +11 -0
    Update results after test changes

ChangeSet
  1.1616.40.1 03/12/04 11:54:04 greg@mysql.com +1 -0
  Add charset #defines for Windows platform (as of 4.1.1)

  include/config-win.h
    1.38 03/12/04 11:53:44 greg@mysql.com +35 -0
    Add HAVE_CHARSET_* defines for Windows

ChangeSet
  1.1616.1.35 03/12/04 19:12:01 konstantin@oak.local +1 -0
  comment to user-level lock added

  sql/sql_class.h
    1.146.1.53 03/12/04 19:11:59 konstantin@mysql.com +5 -0
    comment to user-level lock added

ChangeSet
  1.1346.438.1 03/12/04 19:02:48 dlenev@mysql.com +1 -0
  Fix undeterministic behaviour of year check 
  if we failed to classify integer as datetime 
  in Field_datetime::store().
  Stylistic clean-ups.

  sql/field.cc
    1.51.4.2 03/12/04 19:02:44 dlenev@mysql.com +5 -9
    Fix undeterministic behaviour of year check 
    if we failed to classify integer as datetime
    Stylistic clean-ups.

ChangeSet
  1.1624.1.16 03/12/04 18:15:45 konstantin@mysql.com +5 -0
  manual merge

  sql/sql_class.cc
    1.130.1.3 03/12/04 18:15:43 konstantin@mysql.com +5 -6
    manual merge

  sql/sql_prepare.cc
    1.50 03/12/04 18:08:40 konstantin@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.311 03/12/04 18:08:40 konstantin@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.169 03/12/04 18:08:40 konstantin@mysql.com +0 -0
    Auto merged

  sql/slave.cc
    1.202 03/12/04 18:08:40 konstantin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1624.1.15 03/12/04 15:54:37 pem@mysql.comhem.se +1 -0
  Fixed another compiler error on HP-UX.

  sql/sp_head.cc
    1.55 03/12/04 15:54:34 pem@mysql.com +3 -2
    Fixed another compiler error on HP-UX.

ChangeSet
  1.1346.437.1 03/12/04 15:30:14 guilhem@mysql.com +1 -0
  Fix for BUG#2011 "rare race condition producing "binlog has bad magic number" error in slave".
  The problem was that when the slave SQL thread reads a hot relay log (hot = the one being written to by the
  slave I/O thread), it must have the LOCK_log. It already took it for read_log_event(), but needs
  it also for check_binlog_magic().
  This should fix all recently reported failures of the rpl_max_relay_size test in 4.1 and 5.0
  (though the bug exists since 4.0, it showed up first in 5.0).

  sql/slave.cc
    1.164.1.96 03/12/04 15:30:09 guilhem@mysql.com +26 -5
    Fix for BUG#2011 "rare race condition producing "binlog has bad magic number" error in slave".
    The problem was that when the slave SQL thread reads a hot relay log (hot = the one being written to by the
    slave I/O thread), it must have the LOCK_log. It already took it for read_log_event(), but needs
    it also for check_binlog_magic().

ChangeSet
  1.1616.1.34 03/12/04 15:20:44 lenz@kallisto.local +2 -0
   - Bumped up version number in configure.in 4.1.1-alpha -> 4.1.2-alpha
   - tagged ChangeSet 1.1641 as "mysql-4.1.1"

  configure.in
    1.201.1.47 03/12/04 15:20:41 lenz@mysql.com +1 -1
     - Bumped up version number: 4.1.1-alpha -> 4.1.2-alpha

  BitKeeper/etc/ignore
    1.153.1.18 03/12/04 15:20:41 lenz@mysql.com +1 -0
    Added INSTALL-WIN-SOURCE to the ignore list

ChangeSet
  1.1624.7.1 03/12/04 15:17:55 pem@mysql.comhem.se +31 -0
  Fixed BUG#336: Subselects with tables does not work as values for local SP variables
   and BUG#1654: Stored Procedure Crash if contains subquery and set function
  
  Disallowed subselects in RETURN (for FUNCTIONs) and SET of local variables.
  The latter should work, but turned out to be difficult to fix, so we just
  disallow it for the time being.

  sql/sql_yacc.yy
    1.259 03/12/04 15:17:51 pem@mysql.com +13 -3
    Disallowed subselects in RETURN (for FUNCTIONs) and SET of local variables.
    The latter should work, but turned out to be difficult to fix, so we just
    disallow it for the time being.

  sql/sp_head.cc
    1.54 03/12/04 15:17:51 pem@mysql.com +3 -2
    Fixed (bogus) compile error on HP-UX alpha.

  sql/share/ukrainian/errmsg.txt
    1.52 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/swedish/errmsg.txt
    1.90 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/spanish/errmsg.txt
    1.89 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/slovak/errmsg.txt
    1.89 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/serbian/errmsg.txt
    1.43 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/russian/errmsg.txt
    1.87 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/romanian/errmsg.txt
    1.86 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/portuguese/errmsg.txt
    1.89 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/polish/errmsg.txt
    1.89 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/norwegian/errmsg.txt
    1.88 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/norwegian-ny/errmsg.txt
    1.88 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/korean/errmsg.txt
    1.88 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/japanese/errmsg.txt
    1.88 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/italian/errmsg.txt
    1.95 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/hungarian/errmsg.txt
    1.90 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/greek/errmsg.txt
    1.89 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/german/errmsg.txt
    1.90 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/french/errmsg.txt
    1.88 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/estonian/errmsg.txt
    1.89 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/english/errmsg.txt
    1.96 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/dutch/errmsg.txt
    1.91 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/danish/errmsg.txt
    1.87 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/share/czech/errmsg.txt
    1.88 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  sql/item.h
    1.73 03/12/04 15:17:51 pem@mysql.com +1 -4
    Made Item_splocal::type() work at compile time, for error checking.

  sql/item.cc
    1.76 03/12/04 15:17:51 pem@mysql.com +11 -0
    Made Item_splocal::type() work at compile time, for error checking.

  mysql-test/t/sp-error.test
    1.25 03/12/04 15:17:51 pem@mysql.com +17 -0
    Test cases for BUG#336 and BUG#1654. (Unsupported use of subselect)

  mysql-test/r/sp-error.result
    1.25 03/12/04 15:17:51 pem@mysql.com +10 -0
    Test cases for BUG#336 and BUG#1654. (Unsupported use of subselect)

  include/sql_state.h
    1.11 03/12/04 15:17:51 pem@mysql.com +1 -0
    New error message for unsupported subselect as SP set values (for the time being).

  include/mysqld_error.h
    1.87 03/12/04 15:17:51 pem@mysql.com +2 -1
    New error message for unsupported subselect as SP set values (for the time being).

ChangeSet
  1.1624.1.13 03/12/04 12:02:18 lenz@kallisto.local +1 -0
   - Added missing backslash to sql/Makefile.am that prevented the sp_* header
     files from being included in the source distribution

  sql/Makefile.am
    1.88 03/12/04 12:01:24 lenz@mysql.com +1 -1
     - Added missing backslash that prevented the sp_* header files from being
       included in the source distribution

ChangeSet
  1.1346.424.3 03/12/04 14:12:01 gluh@gluh.mysql.r18.ru +4 -0
  Fix for  bug#1944 'Function RPad() sometimes produce unexpected result'

  sql/item_strfunc.h
    1.15.1.10 03/12/04 14:12:00 gluh@gluh.mysql.r18.ru +2 -2
    Fix for  bug#1944 'Function RPad() sometimes produce unexpected result'

  sql/item_strfunc.cc
    1.36.1.34 03/12/04 14:12:00 gluh@gluh.mysql.r18.ru +2 -2
    Fix for  bug#1944 'Function RPad() sometimes produce unexpected result'

  mysql-test/t/func_str.test
    1.15.2.5 03/12/04 14:12:00 gluh@gluh.mysql.r18.ru +4 -2
    Fix for  bug#1944 'Function RPad() sometimes produce unexpected result'

  mysql-test/r/func_str.result
    1.16.2.6 03/12/04 14:12:00 gluh@gluh.mysql.r18.ru +12 -6
    Fix for  bug#1944 'Function RPad() sometimes produce unexpected result'

ChangeSet
  1.1616.1.33 03/12/03 21:10:44 paul@ice.snake.net +1 -0
  README:
    minor edits

  sql-bench/README
    1.8 03/12/03 21:09:38 paul@ice.snake.net +4 -5
    minor edits

ChangeSet
  1.1616.38.5 03/12/03 11:48:34 paul@ice.snake.net +1 -0
  Delete obsolete references.

  sql-bench/README
    1.7 03/12/03 11:48:26 paul@ice.snake.net +1 -3
    The Overview-paper file has not been present since 3.20.x, either.

ChangeSet
  1.1346.435.3 03/12/03 19:49:31 sergefp@mysql.com +2 -0
  Fix for bug #1980 tests

  mysql-test/t/multi_update.test
    1.17.1.8 03/12/03 19:49:29 sergefp@mysql.com +2 -2
    Fix for bug #1980 tests

  mysql-test/r/multi_update.result
    1.15.1.8 03/12/03 19:49:29 sergefp@mysql.com +2 -2
    Fix for bug #1980 tests

  sql-bench/README
    1.6 03/12/03 09:19:36 paul@ice.local +1 -5
    The --skip-in option has not actually been present in
    run-all-tests.sh for a long time. (Last version I can
    find it present for is 3.20.32a.)

ChangeSet
  1.1346.433.3 03/12/03 13:56:33 lenz@mysql.com +1 -0
   - Bugfix for the Mac OS X startup script: Suppress the annoying 
     "$1: unbound variable" error when no option was given

  support-files/MacOSX/MySQL
    1.2 03/12/03 13:56:31 lenz@mysql.com +7 -0
     - Suppress the annoying "$1: unbound variable" error when no option
       was given

ChangeSet
  1.1616.38.4 03/12/02 18:14:56 paul@ice.snake.net +1 -0
  benchmarks README edits

  sql-bench/README
    1.5 03/12/02 18:14:46 paul@ice.snake.net +22 -19
    benchmarks README edits

ChangeSet
  1.1616.38.3 03/12/02 20:57:34 antony@ltantony.rdg.cyberkinetica.homeunix.net +31 -0
  Merge for update

  sql/share/ukrainian/errmsg.txt
    1.27.1.33 03/12/02 20:57:28 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/swedish/errmsg.txt
    1.64.1.36 03/12/02 20:57:28 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/spanish/errmsg.txt
    1.64.1.37 03/12/02 20:57:28 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/slovak/errmsg.txt
    1.64.1.36 03/12/02 20:57:27 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/serbian/errmsg.txt
    1.18.1.34 03/12/02 20:57:27 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/russian/errmsg.txt
    1.61.1.34 03/12/02 20:57:27 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/romanian/errmsg.txt
    1.62.1.36 03/12/02 20:57:27 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/portuguese/errmsg.txt
    1.64.1.35 03/12/02 20:57:27 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/polish/errmsg.txt
    1.63.1.36 03/12/02 20:57:27 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/norwegian/errmsg.txt
    1.63.1.37 03/12/02 20:57:27 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.36 03/12/02 20:57:26 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/korean/errmsg.txt
    1.63.1.36 03/12/02 20:57:26 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/japanese/errmsg.txt
    1.63.1.35 03/12/02 20:57:26 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/italian/errmsg.txt
    1.70.1.37 03/12/02 20:57:26 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/hungarian/errmsg.txt
    1.65.1.35 03/12/02 20:57:26 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/greek/errmsg.txt
    1.64.1.35 03/12/02 20:57:26 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/german/errmsg.txt
    1.64.1.36 03/12/02 20:57:26 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/french/errmsg.txt
    1.63.1.36 03/12/02 20:57:26 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/estonian/errmsg.txt
    1.64.1.35 03/12/02 20:57:25 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/english/errmsg.txt
    1.70.1.39 03/12/02 20:57:25 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/dutch/errmsg.txt
    1.66.1.36 03/12/02 20:57:25 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/danish/errmsg.txt
    1.62.1.36 03/12/02 20:57:25 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  sql/share/czech/errmsg.txt
    1.64.1.36 03/12/02 20:57:25 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Merge for updates

  mysql-test/r/rpl_change_master.result
    1.8 03/12/02 20:57:25 antony@ltantony.rdg.cyberkinetica.homeunix.net +0 -2
    Merge for updates

  include/mysqld_error.h
    1.61.1.26 03/12/02 20:57:25 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -3
    Merge for updates

  sql/sql_yacc.yy
    1.203.1.78 03/12/02 20:47:00 antony@ltantony.rdg.cyberkinetica.homeunix.net +0 -0
    Auto merged

  sql/set_var.cc
    1.34.1.48 03/12/02 20:47:00 antony@ltantony.rdg.cyberkinetica.homeunix.net +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.69 03/12/02 20:46:59 antony@ltantony.rdg.cyberkinetica.homeunix.net +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.52 03/12/02 20:46:59 antony@ltantony.rdg.cyberkinetica.homeunix.net +0 -0
    Auto merged

  mysql-test/t/create.test
    1.33.1.5 03/12/02 20:46:59 antony@ltantony.rdg.cyberkinetica.homeunix.net +0 -0
    Auto merged

  mysql-test/r/create.result
    1.53.1.4 03/12/02 20:46:58 antony@ltantony.rdg.cyberkinetica.homeunix.net +0 -0
    Auto merged

ChangeSet
  1.1616.39.1 03/12/02 20:23:13 antony@ltantony.rdg.cyberkinetica.homeunix.net +42 -0
  WorkLog#1280 - Remove fixed table handler from lex/yacc

  BitKeeper/etc/logging_ok
    1.233.1.36 03/12/02 20:23:13 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    Logging to logging@openlogging.org accepted

  sql/share/ukrainian/errmsg.txt
    1.27.14.2 03/12/02 20:05:23 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/swedish/errmsg.txt
    1.64.15.2 03/12/02 20:05:23 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/spanish/errmsg.txt
    1.64.18.2 03/12/02 20:05:23 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/slovak/errmsg.txt
    1.64.16.2 03/12/02 20:05:22 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/serbian/errmsg.txt
    1.18.14.2 03/12/02 20:05:22 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/russian/errmsg.txt
    1.61.14.2 03/12/02 20:05:22 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/romanian/errmsg.txt
    1.62.16.2 03/12/02 20:05:22 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/portuguese/errmsg.txt
    1.64.17.2 03/12/02 20:05:22 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/polish/errmsg.txt
    1.63.15.2 03/12/02 20:05:22 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/norwegian/errmsg.txt
    1.63.16.2 03/12/02 20:05:22 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/norwegian-ny/errmsg.txt
    1.63.16.2 03/12/02 20:05:22 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/korean/errmsg.txt
    1.63.15.2 03/12/02 20:05:21 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/japanese/errmsg.txt
    1.63.15.2 03/12/02 20:05:21 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/italian/errmsg.txt
    1.70.16.2 03/12/02 20:05:21 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/hungarian/errmsg.txt
    1.65.15.2 03/12/02 20:05:21 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/greek/errmsg.txt
    1.64.15.2 03/12/02 20:05:21 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/german/errmsg.txt
    1.64.16.2 03/12/02 20:05:21 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/french/errmsg.txt
    1.63.16.2 03/12/02 20:05:21 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/estonian/errmsg.txt
    1.64.15.2 03/12/02 20:05:21 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/english/errmsg.txt
    1.70.18.2 03/12/02 20:05:20 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/dutch/errmsg.txt
    1.66.16.2 03/12/02 20:05:20 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/danish/errmsg.txt
    1.62.16.2 03/12/02 20:05:20 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/share/czech/errmsg.txt
    1.64.16.2 03/12/02 20:05:20 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fixups during review

  sql/handler.cc
    1.103.1.9 03/12/02 19:48:55 antony@ltantony.rdg.cyberkinetica.homeunix.net +6 -9
    More tidyup

ChangeSet
  1.1624.6.1 03/12/02 21:20:51 sergefp@mysql.com +3 -0
  Fix for bug #1980

  sql/uniques.cc
    1.17 03/12/02 21:20:25 sergefp@mysql.com +10 -4
    Fix for bug #1980

  mysql-test/t/multi_update.test
    1.27 03/12/02 21:20:25 sergefp@mysql.com +47 -1
    Fix for bug #1980

  mysql-test/r/multi_update.result
    1.26 03/12/02 21:20:25 sergefp@mysql.com +27 -0
    Fix for bug #1980

ChangeSet
  1.1346.436.1 03/12/02 21:05:40 sergefp@mysql.com +4 -0
  Fix for bug #1980

  BitKeeper/etc/logging_ok
    1.206.1.90 03/12/02 21:05:39 sergefp@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/uniques.cc
    1.11.1.3 03/12/02 21:05:20 sergefp@mysql.com +10 -4
    Fix for bug #1980

  mysql-test/t/multi_update.test
    1.17.1.7 03/12/02 21:05:20 sergefp@mysql.com +46 -0
    Fix for bug #1980

  mysql-test/r/multi_update.result
    1.15.1.7 03/12/02 21:05:20 sergefp@mysql.com +26 -0
    Fix for bug #1980

ChangeSet
  1.1346.434.1 03/12/02 20:25:45 dlenev@mysql.com +5 -0
  Fix for Bug #1448 "Date parsing fails, and fails to complain 
  about it". Now numbers representing illegal timestamps are 
  converted to 0 value if they are stored as timestamp or 
  datetime. This behaviour is consistent with manual and with 
  behaviour of string -> timestamp conversion.

  sql/field.cc
    1.51.4.1 03/12/02 20:25:43 dlenev@mysql.com +49 -21
    Checks of month, day, hour, minute and second ranges were added
    to storing of integer into Field_datetime and Field_timestamp
    and so for integer -> datetime, timestamp conversion.

  mysql-test/t/type_timestamp.test
    1.6.1.2 03/12/02 20:25:43 dlenev@mysql.com +5 -2
    Added test if ranges are checked during 
    integer, string -> timestamp conversion 

  mysql-test/t/type_datetime.test
    1.6.1.4 03/12/02 20:25:43 dlenev@mysql.com +3 -2
    Added test if ranges are checked during 
    integer, string -> datetime conversion 

  mysql-test/r/type_timestamp.result
    1.7.1.3 03/12/02 20:25:43 dlenev@mysql.com +19 -1
    Added test if ranges are checked during 
    integer, string -> datetime conversion 

  mysql-test/r/type_datetime.result
    1.8.1.6 03/12/02 20:25:43 dlenev@mysql.com +13 -2
    Added test if ranges are checked during 
    integer, string -> timestamp conversion 

ChangeSet
  1.1346.432.3 03/12/02 19:39:51 konstantin@mysql.com +4 -0
  Post-review fixes for bug #1790 'BIT_AND() result in GROUP BY different when
   SQL_BIG_RESULT used':
  - BIT_AND now returns BIGINT UNSIGNED
  - in case there were no matching rows BIT_AND returns 18446744073709551615 
  (but not NULL), BIT_OR returns 0 (but not NULL). That's how Monty wants it
  and how is described in our docs.
  
  

  sql/item_sum.h
    1.15.1.9 03/12/02 19:39:50 konstantin@mysql.com +6 -8
    few style fixes.
    BIT_AND and BIT_OR now are both BIGINT UNSIGNED

  sql/item_sum.cc
    1.25.1.11 03/12/02 19:39:50 konstantin@mysql.com +2 -4
    small cleanup

  mysql-test/r/func_group.result
    1.6.1.5 03/12/02 19:39:50 konstantin@mysql.com +5 -5
    bug #1790, post-review work: test results fixed

  include/my_global.h
    1.34.1.23 03/12/02 19:39:50 konstantin@mysql.com +14 -0
    Added definition for ULONGLONG_MAX.
    This is also a check that ULL type specifier
    can be used on all supported platforms.

ChangeSet
  1.1624.1.11 03/12/02 17:08:24 pem@mysql.com +8 -0
  Merge mysql.com:/home/pem/work/mysql-4.1
  into mysql.com:/home/pem/work/mysql-5.0

  sql/sql_yacc.yy
    1.258 03/12/02 17:08:20 pem@mysql.com +0 -2
    Auto merged

  sql/sql_select.cc
    1.231.1.2 03/12/02 17:08:20 pem@mysql.com +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.48.1.2 03/12/02 17:08:20 pem@mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.74 03/12/02 17:08:20 pem@mysql.com +0 -1
    Auto merged

  sql/item.cc
    1.75 03/12/02 17:08:20 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/null.test
    1.11 03/12/02 17:08:20 pem@mysql.com +0 -11
    Auto merged

  mysql-test/r/null.result
    1.19 03/12/02 17:08:20 pem@mysql.com +0 -11
    Auto merged

  mysql-test/r/join_outer.result
    1.25 03/12/02 17:08:20 pem@mysql.com +0 -1
    Auto merged

ChangeSet
  1.1346.433.1 03/12/02 16:49:46 guilhem@mysql.com +1 -0
  There is no reason that Intvar_log_event's constructor calls Log_event::Log_event()
  instead of Log_event::Log_event(THD*, ...) when the event is built in the master
  to be written in the binlog.
  Rand_log_event already used the good constructor, so there really is no reason
  for Intvar_log_event to be an exception.
  This fixes a test failure of last night (which appeared after I removed a useless
  e.server_id=thd->server_id in log.cc; in fact this line was not useless because
  it hid the bad constructor).
  Replication tests pass, with Valgrind too.

  sql/log_event.h
    1.71.1.13 03/12/02 16:49:34 guilhem@mysql.com +1 -1
    There is no reason that Intvar_log_event's constructor calls Log_event::Log_event()
    instead of Log_event::Log_event(THD*, ...) when the event is built in the master
    to be written in the binlog.
    Rand_log_event already used the good constructor, so there really is no reason
    for Intvar_log_event to be an exception.
    This fixes a test failure of last night (which appeared after I removed a useless
    e.server_id=thd->server_id in log.cc; in fact this line was not useless because
    it hid the bad constructor).

ChangeSet
  1.1616.38.1 03/12/02 19:06:24 hf@deer.(none) +3 -0
  Fix for #1189 (Mess with names about CONSTRAINT)
  Second edition: error message was deleted as Segey suggested
  Now name of the constraint will be used as the name of the key
  if the last not specified

  sql/sql_yacc.yy
    1.203.85.3 03/12/02 19:06:04 hf@deer.(none) +18 -9
    language definitions changed so that we can obtaint constraint's name
    and send it as the name of the key if it's not specified

  mysql-test/t/constraints.test
    1.3 03/12/02 19:06:04 hf@deer.(none) +6 -0
    test case for 1189

  mysql-test/r/constraints.result
    1.2 03/12/02 19:06:04 hf@deer.(none) +13 -0
    appropriate test result

ChangeSet
  1.1616.1.30 03/12/02 15:56:18 lenz@kallisto.local +2 -0
   - removed INSTALL-WIN-SOURCE from the BK tree as its content has been
     added to manual.texi - extract it from there instead.

  Docs/Makefile.am
    1.45 03/12/02 15:56:15 lenz@mysql.com +4 -1
     - Create INSTALL-WIN-SOURCE from mysql.info

  BitKeeper/deleted/.del-INSTALL-WIN-SOURCE~8b030042cb95ca9
    1.7 03/12/02 15:44:44 lenz@mysql.com +0 -0
    Delete: INSTALL-WIN-SOURCE

ChangeSet
  1.1616.37.1 03/12/02 15:09:35 konstantin@oak.local +1 -0
  Item_param::save_in_field():
  thd->command can be anything except COM_EXECUTE in no cases
  except programming error.

  sql/item.cc
    1.58.1.48 03/12/02 15:09:33 konstantin@mysql.com +1 -2
    Item_param::save_in_field():
    thd->command can be anything except COM_EXECUTE in no cases
    except programming error.

ChangeSet
  1.1616.1.29 03/12/02 13:32:05 monty@mysql.com +1 -0
  Ensure that innodb is created for the first replication test as the slave-timeout is lower for future tests and this failed on some slower machines

  mysql-test/t/rpl000001-slave.opt
    1.1 03/12/02 13:32:03 monty@mysql.com +1 -0

  mysql-test/t/rpl000001-slave.opt
    1.0 03/12/02 13:32:03 monty@mysql.com +0 -0
    BitKeeper file /my/mysql-4.1/mysql-test/t/rpl000001-slave.opt

ChangeSet
  1.1624.1.10 03/12/01 16:20:46 igor@rurik.mysql.com +1 -0
  Merge rurik.mysql.com:/home/igor/mysql-5.0
  into rurik.mysql.com:/home/igor/dev/mysql-5.0-1

  sql/item_cmpfunc.h
    1.72.1.1 03/12/01 16:20:39 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1624.5.2 03/12/01 16:15:25 igor@rurik.mysql.com +1 -0
  index_merge.result:
    Fixed inconsistency of values of used_tables_cache
    and const_item_cache for Item_func_isnull objects (bug #1990).

  mysql-test/r/index_merge.result
    1.1.1.2 03/12/01 16:14:40 igor@rurik.mysql.com +2 -2
    Fixed inconsistency of values of used_tables_cache
    and const_item_cache for Item_func_isnull objects (bug #1990).

ChangeSet
  1.1624.5.1 03/12/01 16:12:05 igor@rurik.mysql.com +4 -0
  join_outer.result, null.result, null.test:
    Fixed inconsistency of values of used_tables_cache
    and const_item_cache for Item_func_isnull objects (bug #1990).
  item_cmpfunc.h:
    Fixed inconsistency of values of used_tables_cache
    and const_item_cache for Item_func_isnull objects (bug #1990).

  mysql-test/r/join_outer.result
    1.23.1.1 03/12/01 16:09:38 igor@rurik.mysql.com +1 -1
    Fixed inconsistency of values of used_tables_cache
    and const_item_cache for Item_func_isnull objects (bug #1990).

  mysql-test/r/null.result
    1.17.1.1 03/12/01 16:09:06 igor@rurik.mysql.com +11 -0
    Fixed inconsistency of values of used_tables_cache
    and const_item_cache for Item_func_isnull objects (bug #1990).

  mysql-test/t/null.test
    1.9.1.1 03/12/01 16:06:41 igor@rurik.mysql.com +11 -0
    Fixed inconsistency of values of used_tables_cache
    and const_item_cache for Item_func_isnull objects (bug #1990).

  sql/item_cmpfunc.h
    1.70.1.1 03/12/01 16:02:25 igor@rurik.mysql.com +1 -0
    Fixed inconsistency of values of used_tables_cache
    and const_item_cache for Item_func_isnull objects (big #1990).

ChangeSet
  1.1616.36.1 03/12/01 13:59:09 igor@rurik.mysql.com +4 -0
  join_outer.result, null.result, null.test, item_cmpfunc.h:
    Fixed inconsistency of values of used_tables_cache and
    const_item_cache for Item_func_isnull objects (bug #1990).

  mysql-test/r/join_outer.result
    1.24 03/12/01 13:58:34 igor@rurik.mysql.com +1 -1
    Fixed inconsistency of values of used_tables_cache and
    const_item_cache for Item_func_isnull objects (bug #1990).

  mysql-test/r/null.result
    1.18 03/12/01 13:57:34 igor@rurik.mysql.com +11 -0
    Fixed inconsistency of values of used_tables_cache and
    const_item_cache for Item_func_isnull objects (bug #1990).

  mysql-test/t/null.test
    1.10 03/12/01 13:56:59 igor@rurik.mysql.com +11 -0
    Fixed inconsistency of values of used_tables_cache and
    const_item_cache for Item_func_isnull objects (bug #1990).

  sql/item_cmpfunc.h
    1.73 03/12/01 13:53:16 igor@rurik.mysql.com +1 -0
    Fixed inconsistency of values of used_tables_cache and
    const_item_cache for Item_func_isnull objects (bug #1990).

ChangeSet
  1.1616.1.27 03/12/01 20:53:05 konstantin@oak.local +1 -0
  cleanup: unused variable removed
  followup of Bordeaux Optimizer session

  sql/sql_select.cc
    1.216.1.67 03/12/01 20:53:03 konstantin@mysql.com +0 -4
    cleanup: unused variable removed
    followup of Bordeaux Optimizer session

ChangeSet
  1.1624.1.9 03/12/01 18:24:09 pem@mysql.comhem.se +9 -0
  Post-merge fixes.

  sql/sql_yacc.yy
    1.257 03/12/01 18:24:06 pem@mysql.com +1 -1
    Post-merge fixes.

  sql/sql_union.cc
    1.83.1.2 03/12/01 18:24:06 pem@mysql.com +2 -2
    Post-merge fixes.

  sql/protocol_cursor.cc
    1.4 03/12/01 18:24:06 pem@mysql.com +3 -3
    Post-merge fixes.

  mysql-test/t/sp.test
    1.39 03/12/01 18:24:06 pem@mysql.com +3 -3
    Post-merge fixes.

  mysql-test/t/sp-error.test
    1.24 03/12/01 18:24:06 pem@mysql.com +41 -41
    Post-merge fixes.

  mysql-test/r/variables.result
    1.37 03/12/01 18:24:06 pem@mysql.com +1 -1
    Post-merge fixes.

  mysql-test/r/sp.result
    1.38 03/12/01 18:24:06 pem@mysql.com +3 -3
    Post-merge fixes.

  mysql-test/r/sp-error.result
    1.24 03/12/01 18:24:06 pem@mysql.com +2 -2
    Post-merge fixes.

  include/mysqld_error.h
    1.86 03/12/01 18:24:06 pem@mysql.com +1 -1
    Post-merge fixes.

ChangeSet
  1.1624.1.8 03/12/01 16:14:40 pem@mysql.com +84 -0
  Merge 4.1 to 5.0

  sql/sql_union.cc
    1.83.1.1 03/12/01 16:14:36 pem@mysql.com +5 -10
    Merge 4.1 to 5.0

  sql/sql_class.cc
    1.130.2.1 03/12/01 16:14:36 pem@mysql.com +5 -5
    Merge 4.1 to 5.0

  sql/slave.cc
    1.200.1.1 03/12/01 16:14:36 pem@mysql.com +0 -1
    Merge 4.1 to 5.0

  sql/share/ukrainian/errmsg.txt
    1.51 03/12/01 16:14:36 pem@mysql.com +1 -1
    Merge 4.1 to 5.0

  sql/share/swedish/errmsg.txt
    1.89 03/12/01 16:14:36 pem@mysql.com +1 -1
    Merge 4.1 to 5.0

  sql/share/spanish/errmsg.txt
    1.88 03/12/01 16:14:36 pem@mysql.com +1 -1
    Merge 4.1 to 5.0

  sql/share/slovak/errmsg.txt
    1.88 03/12/01 16:14:36 pem@mysql.com +1 -1
    Merge 4.1 to 5.0

  sql/share/serbian/errmsg.txt
    1.42 03/12/01 16:14:36 pem@mysql.com +1 -1
    Merge 4.1 to 5.0

  sql/share/russian/errmsg.txt
    1.86 03/12/01 16:14:36 pem@mysql.com +1 -1
    Merge 4.1 to 5.0

  sql/share/romanian/errmsg.txt
    1.85 03/12/01 16:14:36 pem@mysql.com +0 -0
    Merge 4.1 to 5.0

  sql/share/portuguese/errmsg.txt
    1.88 03/12/01 16:14:36 pem@mysql.com +1 -1
    Merge 4.1 to 5.0

  sql/share/polish/errmsg.txt
    1.88 03/12/01 16:14:36 pem@mysql.com +1 -1
    Merge 4.1 to 5.0

  sql/share/norwegian/errmsg.txt
    1.87 03/12/01 16:14:36 pem@mysql.com +1 -1
    Merge 4.1 to 5.0

  sql/share/norwegian-ny/errmsg.txt
    1.87 03/12/01 16:14:36 pem@mysql.com +1 -1
    Merge 4.1 to 5.0

  sql/share/korean/errmsg.txt
    1.87 03/12/01 16:14:36 pem@mysql.com +1 -1
    Merge 4.1 to 5.0

  sql/share/japanese/errmsg.txt
    1.87 03/12/01 16:14:36 pem@mysql.com +1 -1
    Merge 4.1 to 5.0

  sql/share/italian/errmsg.txt
    1.94 03/12/01 16:14:36 pem@mysql.com +1 -1
    Merge 4.1 to 5.0

  sql/share/hungarian/errmsg.txt
    1.89 03/12/01 16:14:36 pem@mysql.com +1 -1
    Merge 4.1 to 5.0

  sql/share/greek/errmsg.txt
    1.88 03/12/01 16:14:36 pem@mysql.com +1 -1
    Merge 4.1 to 5.0

  sql/share/german/errmsg.txt
    1.89 03/12/01 16:14:36 pem@mysql.com +1 -1
    Merge 4.1 to 5.0

  sql/share/french/errmsg.txt
    1.87 03/12/01 16:14:36 pem@mysql.com +1 -1
    Merge 4.1 to 5.0

  sql/share/estonian/errmsg.txt
    1.88 03/12/01 16:14:36 pem@mysql.com +1 -1
    Merge 4.1 to 5.0

  sql/share/english/errmsg.txt
    1.95 03/12/01 16:14:36 pem@mysql.com +1 -1
    Merge 4.1 to 5.0

  sql/share/dutch/errmsg.txt
    1.90 03/12/01 16:14:36 pem@mysql.com +1 -1
    Merge 4.1 to 5.0

  sql/share/danish/errmsg.txt
    1.86 03/12/01 16:14:36 pem@mysql.com +1 -1
    Merge 4.1 to 5.0

  sql/share/czech/errmsg.txt
    1.87 03/12/01 16:14:36 pem@mysql.com +0 -0
    Merge 4.1 to 5.0

  sql/item_sum.cc
    1.92 03/12/01 16:14:36 pem@mysql.com +0 -1
    Merge 4.1 to 5.0

  sql/item_subselect.cc
    1.70 03/12/01 16:14:36 pem@mysql.com +13 -24
    Merge 4.1 to 5.0

  scripts/make_binary_distribution.sh
    1.58 03/12/01 16:14:36 pem@mysql.com +1 -2
    Merge 4.1 to 5.0

  include/mysqld_error.h
    1.85 03/12/01 16:14:36 pem@mysql.com +32 -34
    Merge 4.1 to 5.0

ChangeSet
  1.1616.35.1 03/12/01 17:46:07 konstantin@oak.local +1 -0
  don't delete select_lex->having and select_lex->where as we delete
  all items in free_prep_stmt(free_items);
  
  indentation fix

  sql/sql_prepare.cc
    1.34.1.27 03/12/01 17:46:05 konstantin@mysql.com +4 -6
    don't delete select_lex->having and select_lex->where as we delete
    all items in free_prep_stmt(free_items);
    
    indentation fix

  sql/sql_yacc.yy
    1.256 03/12/01 15:10:22 pem@mysql.com +0 -0
    Auto merged

  sql/sql_update.cc
    1.97.1.1 03/12/01 15:10:21 pem@mysql.com +0 -0
    Auto merged

  sql/sql_test.cc
    1.31 03/12/01 15:10:21 pem@mysql.com +0 -0
    Auto merged

  sql/sql_table.cc
    1.170 03/12/01 15:10:21 pem@mysql.com +0 -0
    Auto merged

  sql/sql_show.cc
    1.130 03/12/01 15:10:21 pem@mysql.com +0 -0
    Auto merged

  sql/sql_select.h
    1.62.1.1 03/12/01 15:10:19 pem@mysql.com +0 -0
    Auto merged

  sql/sql_select.cc
    1.231.1.1 03/12/01 15:10:19 pem@mysql.com +0 -0
    Auto merged

  sql/sql_repl.cc
    1.112 03/12/01 15:10:19 pem@mysql.com +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.48.1.1 03/12/01 15:10:19 pem@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.309.1.1 03/12/01 15:10:19 pem@mysql.com +0 -0
    Auto merged

  sql/sql_list.h
    1.22.1.1 03/12/01 15:10:19 pem@mysql.com +0 -0
    Auto merged

  sql/sql_lex.h
    1.126 03/12/01 15:10:19 pem@mysql.com +0 -0
    Auto merged

  sql/sql_lex.cc
    1.98 03/12/01 15:10:19 pem@mysql.com +0 -0
    Auto merged

  sql/sql_insert.cc
    1.96 03/12/01 15:10:18 pem@mysql.com +0 -0
    Auto merged

  sql/sql_error.cc
    1.18 03/12/01 15:10:18 pem@mysql.com +0 -0
    Auto merged

  sql/sql_derived.cc
    1.50 03/12/01 15:10:18 pem@mysql.com +0 -0
    Auto merged

  sql/sql_db.cc
    1.76 03/12/01 15:10:18 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.167.1.1 03/12/01 15:10:18 pem@mysql.com +0 -0
    Auto merged

  sql/sql_base.cc
    1.154 03/12/01 15:10:18 pem@mysql.com +0 -0
    Auto merged

  sql/sql_acl.cc
    1.82 03/12/01 15:10:18 pem@mysql.com +0 -0
    Auto merged

  sql/set_var.cc
    1.44 03/12/01 15:10:18 pem@mysql.com +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.37 03/12/01 15:10:18 pem@mysql.com +0 -0
    Auto merged

  sql/protocol_cursor.cc
    1.3 03/12/01 15:10:18 pem@mysql.com +0 -0
    Auto merged

  sql/protocol.h
    1.17 03/12/01 15:10:18 pem@mysql.com +0 -0
    Auto merged

  sql/protocol.cc
    1.68 03/12/01 15:10:18 pem@mysql.com +0 -0
    Auto merged

  sql/opt_range.cc
    1.100.1.2 03/12/01 15:10:18 pem@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.372 03/12/01 15:10:18 pem@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.202 03/12/01 15:10:17 pem@mysql.com +0 -0
    Auto merged

  sql/log.cc
    1.116 03/12/01 15:10:17 pem@mysql.com +0 -0
    Auto merged

  sql/item_func.cc
    1.135 03/12/01 15:10:17 pem@mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.113 03/12/01 15:10:17 pem@mysql.com +0 -0
    Auto merged

  sql/item.h
    1.72 03/12/01 15:10:17 pem@mysql.com +0 -0
    Auto merged

  sql/item.cc
    1.74 03/12/01 15:10:17 pem@mysql.com +0 -0
    Auto merged

  sql/handler.h
    1.91 03/12/01 15:10:17 pem@mysql.com +0 -0
    Auto merged

  sql/handler.cc
    1.105 03/12/01 15:10:17 pem@mysql.com +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.125 03/12/01 15:10:17 pem@mysql.com +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.97 03/12/01 15:10:17 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.71 03/12/01 15:10:16 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/symlink.result
    1.13 03/12/01 15:10:16 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.81 03/12/01 15:10:16 pem@mysql.com +0 -0
    Auto merged

  mysql-test/install_test_db.sh
    1.31 03/12/01 15:10:16 pem@mysql.com +0 -0
    Auto merged

  myisam/sort.c
    1.38 03/12/01 15:10:16 pem@mysql.com +0 -0
    Auto merged

  myisam/myisamdef.h
    1.66 03/12/01 15:10:16 pem@mysql.com +0 -0
    Auto merged

  myisam/myisamchk.c
    1.100 03/12/01 15:10:16 pem@mysql.com +0 -0
    Auto merged

  myisam/mi_check.c
    1.112 03/12/01 15:10:16 pem@mysql.com +0 -0
    Auto merged

  libmysql/libmysql.c
    1.163 03/12/01 15:10:16 pem@mysql.com +0 -0
    Auto merged

  include/mysql_com.h
    1.77 03/12/01 15:10:16 pem@mysql.com +0 -0
    Auto merged

  include/my_pthread.h
    1.70 03/12/01 15:10:16 pem@mysql.com +0 -0
    Auto merged

  include/my_global.h
    1.52 03/12/01 15:10:16 pem@mysql.com +0 -0
    Auto merged

  client/mysqltest.c
    1.102 03/12/01 15:10:16 pem@mysql.com +0 -0
    Auto merged

  client/mysql.cc
    1.134 03/12/01 15:10:16 pem@mysql.com +0 -0
    Auto merged

  configure.in
    1.218 03/12/01 15:10:15 pem@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.250.1.1 03/12/01 15:10:06 pem@mysql.com +0 -0
    auto-union

  BitKeeper/etc/ignore
    1.162 03/12/01 15:10:06 pem@mysql.com +2 -2
    auto-union

ChangeSet
  1.1346.431.1 03/12/01 14:59:35 guilhem@mysql.com +1 -0
  Removing unneeded code: the Intvar_log_event constructor calls the Log_event constructor
  which does e.server_id=thd.server_id.

  sql/log.cc
    1.80.1.61 03/12/01 14:59:31 guilhem@mysql.com +0 -4
    unneeded: the Intvar_log_event constructor calls the Log_event constructor
    which does e.server_id=thd.server_id.

ChangeSet
  1.1616.1.25 03/12/01 13:13:16 monty@mysql.com +6 -0
  Portability fixes (for binary build)
  Added --protocol to mysqlbinlog

  vio/viosocket.c
    1.21 03/12/01 13:13:14 monty@mysql.com +2 -2
    Portability fix.

  sql/mysqld.cc
    1.356.1.68 03/12/01 13:13:14 monty@mysql.com +46 -29
    More debugging with set_maximum_open_files()

  mysql-test/t/rpl_until.test
    1.8 03/12/01 13:13:14 monty@mysql.com +3 -3
    If --sleep option was given then the salve could do many retries, which affected the size of the binary log. This is fixed by not comparing the binary log size/position

  mysql-test/r/rpl_until.result
    1.10 03/12/01 13:13:14 monty@mysql.com +3 -3
    Update results

  client/mysqlbinlog.cc
    1.84 03/12/01 13:13:14 monty@mysql.com +20 -2
    Added protocol option

  client/mysql.cc
    1.121.1.29 03/12/01 13:13:14 monty@mysql.com +1 -1
    Indentation cleanup

  sql/set_var.cc
    1.34.1.47 03/11/29 00:15:53 antony@ltantony.rdg.cyberkinetica.homeunix.net +15 -12
    Code clean up for sys_var_thd_table_type::check()

  sql/handler.h
    1.89.1.5 03/11/29 00:15:53 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    parameter is a const

  sql/handler.cc
    1.103.1.8 03/11/29 00:15:52 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    parameter is a const

  mysql-test/t/variables.test
    1.18.1.9 03/11/29 00:15:52 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fix for changes

  mysql-test/r/warnings.result
    1.15 03/11/29 00:15:51 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Fix for changes

  mysql-test/r/variables.result
    1.21.1.14 03/11/29 00:15:51 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    Fix for changes

  mysql-test/r/rpl_change_master.result
    1.2.1.1 03/11/29 00:15:51 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    It wouldn't pass the tests

  sql/handler.cc
    1.103.1.7 03/11/28 22:31:41 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -8
    Add MRG_ISAM engine to list,
    tidyup ha_get_table_type

  sql/set_var.cc
    1.34.1.46 03/11/28 22:27:27 antony@ltantony.rdg.cyberkinetica.homeunix.net +14 -17
    Tidy up

  sql/mysqld.cc
    1.356.38.2 03/11/28 22:27:26 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -3
    optimize

  include/sql_state.h
    1.8.1.2 03/11/28 22:27:26 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    Fix indent

ChangeSet
  1.1616.1.24 03/11/28 21:05:53 monty@mysql.com +2 -0
  Mark position as # to make test portable

  mysql-test/t/rpl_until.test
    1.7 03/11/28 21:05:51 monty@mysql.com +3 -3
    Mark position as # to make test portable

  mysql-test/r/rpl_until.result
    1.9 03/11/28 21:05:51 monty@mysql.com +3 -3
    Mark position as # to make test portable

ChangeSet
  1.1616.1.23 03/11/28 20:44:26 monty@mysql.com +1 -0
  Merge mysql.com:/my/mysql-4.0 into mysql.com:/my/mysql-4.1

  libmysql/libmysql.c
    1.156.1.43 03/11/28 20:44:24 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.421.15 03/11/28 20:41:33 monty@mysql.com +1 -0
  rpl_parse and rpl_probe don't have to be reset as they are already 0

  libmysql/libmysql.c
    1.95.1.41 03/11/28 20:41:32 monty@mysql.com +23 -19
    rpl_parse and rpl_probe don't have to be reset as they are already 0

ChangeSet
  1.1346.421.13 03/11/28 18:15:58 serg@serg.mylan +1 -0
  "optimization cleanup" reverted - problems on rpl_redirect test.
  It happens that mysql->client_next->client_next=mysql
  and mysql_close() goes into infinite loop.
  Results vary from simple sigsegv (FreeBSD), to hard system lockup (Linux)
  :)

  libmysql/libmysql.c
    1.95.1.40 03/11/28 18:15:55 serg@serg.mylan +2 -0
    "optimization cleanup" reverted - problems on rpl_redirect test.
    It happens that mysql->client_next->client_next=mysql
    and mysql_close() goes into infinite loop.
    Results vary from simple sigsegv (FreeBSD), to hard system lockup (Linux)
    :)

ChangeSet
  1.1616.34.1 03/11/28 16:15:21 guilhem@mysql.com +1 -0
  In the slave I/O thread (in master.info), it seems less worse to flush
  the relay log before flushing master.info.
  Doing 'before' leads to duplicate event, doing after leads to missing event.
  Both can be as destructive, but 'duplicate' enables us to later add detection
  code to catch it. Whereas 'missing' can't be caught (it can't, because
  the I/O thread can produce legal position jumps, for example if it has
  ignored an event coming from this slave (rememember that starting from 4.1.1,
  the I/O thread filters the server id). 

  sql/slave.cc
    1.188.1.31 03/11/28 16:15:15 guilhem@mysql.com +24 -14
    In the slave I/O thread (in master.info), it seems less worse to flush
    the relay log before flushing master.info.
    Doing 'before' leads to duplicate event, doing after leads to missing event.
    Both can be as destructive, but 'duplicate' enables us to later add detection
    code to catch it. Whereas 'missing' can't be caught (it can't, because
    the I/O thread can produce legal position jumps, for example if it has
    ignored an event coming from this slave (rememember that starting from 4.1.1,
    the I/O thread filters the server id). 

ChangeSet
  1.1616.33.1 03/11/28 17:28:48 konstantin@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/kostja/mysql/mysql-4.1-root

  sql-common/client.c
    1.44 03/11/28 17:28:45 konstantin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.32.1 03/11/28 17:28:04 konstantin@oak.local +1 -0
  cleanup: comment moved to proper place

  sql-common/client.c
    1.42.1.1 03/11/28 17:28:02 konstantin@mysql.com +1 -1
    cleanup: comment moved to proper place

ChangeSet
  1.1616.1.21 03/11/28 15:55:43 monty@mysql.com +4 -0
  merge with 4.0 to get fix for range bug

  mysql-test/t/range.test
    1.12 03/11/28 15:55:41 monty@mysql.com +11 -12
    merge with 4.0 to get fix for range bug

  mysql-test/r/range.result
    1.19 03/11/28 15:55:41 monty@mysql.com +0 -0
    merge with 4.0 to get fix for range bug

  sql/opt_range.cc
    1.98.1.1 03/11/28 15:48:52 monty@mysql.com +0 -0
    Auto merged

  libmysql/libmysql.c
    1.156.1.42 03/11/28 15:48:51 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.429.1 03/11/28 15:45:34 monty@mysql.com +3 -0
  Fixed range optimzier bug (Bug #1828)

  sql/opt_range.cc
    1.54.1.32 03/11/28 15:45:32 monty@mysql.com +1 -1
    Fixed range optimzier bug (Bug #1828)

  mysql-test/t/range.test
    1.4.1.7 03/11/28 15:45:32 monty@mysql.com +12 -1
    test for range optimzier bug

  mysql-test/r/range.result
    1.6.1.8 03/11/28 15:45:32 monty@mysql.com +10 -0
    test for range optimzier bug

ChangeSet
  1.1616.31.1 03/11/28 14:23:54 monty@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/my/mysql-4.1

  sql-common/client.c
    1.43 03/11/28 14:23:52 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.30.1 03/11/28 12:49:58 serg@serg.mylan +3 -0
  merged

  sql/sql_base.cc
    1.145.1.23 03/11/28 12:49:54 serg@serg.mylan +0 -1
    merged

  mysql-test/t/order_by.test
    1.18 03/11/28 12:49:54 serg@serg.mylan +8 -8
    merged

  mysql-test/r/order_by.result
    1.31 03/11/28 12:49:54 serg@serg.mylan +4 -4
    merged

ChangeSet
  1.1346.428.1 03/11/28 12:36:45 serg@serg.mylan +3 -0
  bug #1945. item(expression)->name=0, crash in find_item_in_list

  sql/sql_base.cc
    1.117.1.50 03/11/28 12:36:42 serg@serg.mylan +1 -1
    bug #1945. item(expression)->name=0, crash in find_item_in_list

  mysql-test/t/order_by.test
    1.9.2.5 03/11/28 12:36:42 serg@serg.mylan +8 -0
    bug #1945. item(expression)->name=0, crash in find_item_in_list

  mysql-test/r/order_by.result
    1.11.1.11 03/11/28 12:36:42 serg@serg.mylan +4 -0
    bug #1945. item(expression)->name=0, crash in find_item_in_list

ChangeSet
  1.1616.29.1 03/11/28 13:31:38 monty@mysql.com +4 -0
  Merge

  sql/sql_union.cc
    1.74.1.21 03/11/28 13:31:36 monty@mysql.com +0 -7
    keep local copy

  sql/sql_derived.cc
    1.43.1.17 03/11/28 13:31:36 monty@mysql.com +0 -4
    keep local copy

  sql-common/client.c
    1.40.1.1 03/11/28 13:20:48 monty@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.1.34 03/11/28 13:20:47 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.4.27 03/11/28 13:15:42 monty@mysql.com +1 -0
  Fix wrong last edit for last commit

  sql/sql_select.cc
    1.216.1.66 03/11/28 13:15:40 monty@mysql.com +2 -2
    Fix wrong last edit for last commit

ChangeSet
  1.1616.4.26 03/11/28 12:18:13 monty@mysql.com +54 -0
  Added missing SSL library (Should be in source distribution)
  Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
  Added a lot of 'version_xxx' strings to 'show variables'
  Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
  Fixed problem with printing sub selects to debug log

  SSL/Makefile.am
    1.1 03/11/28 12:18:10 monty@mysql.com +24 -0

  strings/conf_to_src.c
    1.13 03/11/28 12:18:10 monty@mysql.com +2 -8
    Fixed include file order

  sql/sql_yacc.yy
    1.203.85.2 03/11/28 12:18:10 monty@mysql.com +1 -1
    Remove warning

  sql/sql_update.cc
    1.83.2.21 03/11/28 12:18:10 monty@mysql.com +2 -1
    Indentation cleanup

  sql/sql_union.cc
    1.74.12.1 03/11/28 12:18:10 monty@mysql.com +27 -28
    Changed variable names to not cause hidden variables
    Don't use local copy of TMP_TABLE_PARAM (Caused core dump on Solaris)

  sql/sql_select.h
    1.60.1.3 03/11/28 12:18:10 monty@mysql.com +7 -7
    Changed variable names to not cause hidden variables

  sql/sql_select.cc
    1.216.1.65 03/11/28 12:18:10 monty@mysql.com +80 -77
    Changed variable names to not cause hidden variables
    Ensure that you don't send NULL to printf() for %s
    Fixed problem with printing sub selects to debug log

  sql/sql_parse.cc
    1.271.45.3 03/11/28 12:18:10 monty@mysql.com +8 -8
    Changed variable names to not cause hidden variables

  sql/sql_list.h
    1.21.2.1 03/11/28 12:18:10 monty@mysql.com +2 -2
    Changed variable names to not cause hidden variables

  sql/sql_lex.cc
    1.97 03/11/28 12:18:10 monty@mysql.com +17 -14
    Changed variable names to not cause hidden variables

  sql/sql_help.cc
    1.17 03/11/28 12:18:10 monty@mysql.com +1 -1
    Fixed compiler warning

  sql/sql_error.cc
    1.16.1.1 03/11/28 12:18:10 monty@mysql.com +2 -1
    More DBUG

  sql/sql_derived.cc
    1.43.9.1 03/11/28 12:18:10 monty@mysql.com +6 -7
    Avoid copying TMP_TABLE_PARAM (Use class version instead)

  SSL/Makefile.am
    1.0 03/11/28 12:18:10 monty@mysql.com +0 -0
    BitKeeper file /my/mysql-4.1/SSL/Makefile.am

  sql/sql_class.h
    1.146.1.52 03/11/28 12:18:09 monty@mysql.com +7 -1
    Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)

  sql/sql_class.cc
    1.105.1.33 03/11/28 12:18:09 monty@mysql.com +13 -2
    Changed variable names to not cause hidden variables
    Add TMP_TABLE_PARAM::init() to allow one to initialize structure several times

  sql/set_var.cc
    1.34.27.2 03/11/28 12:18:09 monty@mysql.com +5 -1
    Added a lot of 'version_xxx' strings
    Changed 'bdb_version' to 'version_bdb'

  sql/protocol_cursor.cc
    1.1.1.2 03/11/28 12:18:09 monty@mysql.com +5 -5
    Changed variable names to not cause hidden variables

  sql/protocol.h
    1.15.1.1 03/11/28 12:18:09 monty@mysql.com +5 -6
    Changed variable names to not cause hidden variables
    Remove function not declared in protocol.cc

  sql/protocol.cc
    1.56.1.21 03/11/28 12:18:09 monty@mysql.com +12 -6
    Changed variable names to not cause hidden variables

  sql/log.cc
    1.108.1.18 03/11/28 12:18:09 monty@mysql.com +2 -2
    Changed variable names to not cause hidden variables

  sql/item_timefunc.cc
    1.51 03/11/28 12:18:09 monty@mysql.com +3 -3
    Changed variable names to not cause hidden variables

  sql/item_sum.cc
    1.89.1.6 03/11/28 12:18:09 monty@mysql.com +3 -3
    Changed variable names to not cause hidden variables

  sql/item_subselect.h
    1.48 03/11/28 12:18:09 monty@mysql.com +3 -3
    Changed variable names to not cause hidden variables

  sql/item_subselect.cc
    1.60.1.30 03/11/28 12:18:09 monty@mysql.com +41 -40
    Changed variable names to not cause hidden variables

  sql/item_func.cc
    1.124.1.47 03/11/28 12:18:09 monty@mysql.com +4 -4
    Changed variable names to not cause hidden variables

  sql/item_cmpfunc.h
    1.72 03/11/28 12:18:09 monty@mysql.com +8 -8
    Changed variable names to not cause hidden variables

  sql/item.h
    1.56.1.49 03/11/28 12:18:09 monty@mysql.com +5 -5
    Changed variable names to not cause hidden variables

  sql/item.cc
    1.58.1.47 03/11/28 12:18:09 monty@mysql.com +6 -4
    Changed variable names to not cause hidden variables

  sql/ha_innodb.cc
    1.90.1.18 03/11/28 12:18:09 monty@mysql.com +4 -4
    Changed variable names to not cause hidden variables

  sql/ha_heap.cc
    1.32 03/11/28 12:18:09 monty@mysql.com +16 -13
    Changed variable names to not cause hidden variables

  sql-common/pack.c
    1.5 03/11/28 12:18:09 monty@mysql.com +20 -3
    Added casts becasue Fortre compiler apparently compares (ulonglong) < (longlong) as signed

  sql-common/client.c
    1.39.2.1 03/11/28 12:18:09 monty@mysql.com +7 -2
    More DBUG_PRINT

  mysys/my_redel.c
    1.10 03/11/28 12:18:09 monty@mysql.com +3 -3
    Fixed include file order to get this more portable

  mysys/my_copy.c
    1.12 03/11/28 12:18:09 monty@mysql.com +3 -3
    Fixed include file order to get this more portable

  mysys/my_append.c
    1.6 03/11/28 12:18:09 monty@mysql.com +3 -3
    Fixed include file order to get this more portable

  mysys/mf_wcomp.c
    1.6 03/11/28 12:18:09 monty@mysql.com +2 -2
    Removed not reached line

  mysys/hash.c
    1.31 03/11/28 12:18:09 monty@mysql.com +3 -2
    Added cast

  mysql-test/mysql-test-run.sh
    1.167.1.17 03/11/28 12:18:09 monty@mysql.com +2 -8
    Removed start-from as test '<' is not portable and this can easily be done from command line

  myisam/myisampack.c
    1.29 03/11/28 12:18:09 monty@mysql.com +7 -7
    changed 'byte' to 'current_byte' to avoid compiler warnings

  myisam/mi_write.c
    1.38 03/11/28 12:18:09 monty@mysql.com +1 -1
    Added cast

  myisam/mi_preload.c
    1.8 03/11/28 12:18:09 monty@mysql.com +2 -2
    Added cast

  myisam/mi_page.c
    1.19 03/11/28 12:18:09 monty@mysql.com +1 -1
    Added cast

  myisam/mi_delete.c
    1.25 03/11/28 12:18:09 monty@mysql.com +1 -1
    Added cast

  myisam/mi_check.c
    1.105.1.14 03/11/28 12:18:09 monty@mysql.com +18 -20
    Removed else part that caused compiler warning

  libmysql/conf_to_src.c
    1.6 03/11/28 12:18:09 monty@mysql.com +2 -2
    Include files in proper order

  isam/isamchk.c
    1.27 03/11/28 12:18:09 monty@mysql.com +2 -2
    Fixed compiler warning

  innobase/trx/trx0sys.c
    1.19 03/11/28 12:18:09 monty@mysql.com +1 -1
    Added cast to remove compiler warning

  innobase/srv/srv0start.c
    1.51 03/11/28 12:18:09 monty@mysql.com +1 -1
    Added comment for line that could be removed

  innobase/srv/srv0srv.c
    1.48 03/11/28 12:18:09 monty@mysql.com +2 -2
    Added comment for line that could be removed

  innobase/os/os0file.c
    1.60 03/11/28 12:18:09 monty@mysql.com +1 -1
    Added comment for line that could be removed

  include/sql_common.h
    1.10 03/11/28 12:18:09 monty@mysql.com +0 -3
    Move duplicated prototypes

  configure.in
    1.201.1.46 03/11/28 12:18:09 monty@mysql.com +1 -1
    Added missing SSL library

  Makefile.am
    1.54 03/11/28 12:18:09 monty@mysql.com +1 -2
    Added missing SSL library (Should be in source distribution)

  Docs/mysqld_error.txt
    1.8 03/11/28 12:18:09 monty@mysql.com +132 -36
    Updated error messages

ChangeSet
  1.1616.1.18 03/11/28 13:14:10 konstantin@oak.local +1 -0
  BK automerge tends to eat break; statements

  sql-common/client.c
    1.42 03/11/28 13:14:08 konstantin@mysql.com +1 -0
    BK automerge tends to eat break; statements

ChangeSet
  1.1616.1.17 03/11/28 13:12:16 konstantin@mysql.com +1 -0
  Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
  into mysql.com:/home/kostja/mysql/mysql-4.1-wl519

  sql-common/client.c
    1.41 03/11/28 13:12:13 konstantin@mysql.com +0 -1
    Auto merged

ChangeSet
  1.1616.28.1 03/11/28 13:11:44 konstantin@oak.local +6 -0
  Second part of WL #519:
  Client option secure-auth deployed on all possible layers:
  - mysql client command-line and config file option
  - mysql_options option MYSQL_SECURE_AUTH
  - mysql_real_connect will automatically take into account that option if
    mysql->options.my_cnf_file/my_cnf_group is set

  sql-common/client.c
    1.39.1.1 03/11/28 13:11:42 konstantin@mysql.com +21 -3
    added check for secure-auth in mysql_real_connect:
    if password is provided, and secure-auth is on, then client will
    refuse connecting to pre-4.1.1 server

  libmysql/errmsg.c
    1.24 03/11/28 13:11:42 konstantin@mysql.com +6 -3
    Error messages for option --secure-auth

  include/mysql.h
    1.103 03/11/28 13:11:42 konstantin@mysql.com +3 -1
    added MYSQL_SECURE_AUTH to enum of all mysql_options options.
    added secure_auth flag to MYSQL handle 

  include/errmsg.h
    1.18 03/11/28 13:11:42 konstantin@mysql.com +1 -0
    added return code for option --secure-auth

  client/mysql.cc
    1.121.1.28 03/11/28 13:11:42 konstantin@mysql.com +6 -1
    added support for mysql command-line option --secure-auth

  client/client_priv.h
    1.22 03/11/28 13:11:42 konstantin@mysql.com +1 -1
    added OPT_SECURE_AUTH to enum of all my_read_default_options options.

ChangeSet
  1.1616.1.16 03/11/28 02:50:58 konstantin@oak.local +1 -0
  fix:
  2 forgotten 'break;' statements added

  sql-common/client.c
    1.40 03/11/28 02:50:56 konstantin@mysql.com +2 -0
    fix:
    2 forgotten 'break;' statements added

ChangeSet
  1.1346.427.2 03/11/28 01:57:05 konstantin@mysql.com +1 -0
  no need to zero-initialize mysql->master->{rpl_pivot, options.rpl_parse, 
  options.rpl_probe} as they are zero-initialized in spawn_init()

  libmysql/libmysql.c
    1.95.1.39 03/11/28 01:57:03 konstantin@mysql.com +0 -3
    no need to zero-initialize mysql->master->{rpl_pivot, options.rpl_parse, 
    options.rpl_probe} as they are zero-initialized in spawn_init()

ChangeSet
  1.1346.427.1 03/11/28 01:54:34 konstantin@mysql.com +1 -0
  cleanup:
  no need to set rpl_parse, rpl_probe and rpl_pivot to zero as whole mysql
  structure is bzeroed in mysql_init(0) few lines before

  libmysql/libmysql.c
    1.95.1.38 03/11/28 01:54:32 konstantin@mysql.com +0 -2
    cleanup:
    no need to set rpl_parse, rpl_probe and rpl_pivot to zero as whole mysql
    structure is bzeroed in mysql_init(0) few lines before

ChangeSet
  1.1624.4.1 03/11/28 00:31:15 sergefp@mysql.com +3 -0
  Fix for bug 1974

  sql/opt_range.cc
    1.100.1.1 03/11/28 00:30:50 sergefp@mysql.com +13 -10
    Fix for bug 1974

  mysql-test/t/index_merge.test
    1.2 03/11/28 00:30:50 sergefp@mysql.com +4 -0
    Fix for bug 1974

  mysql-test/r/index_merge.result
    1.1.1.1 03/11/28 00:30:50 sergefp@mysql.com +5 -0
    Fix for bug 1974

ChangeSet
  1.1624.3.1 03/11/27 22:55:56 konstantin@mysql.com +2 -0
  Merge mysql.com:/home/kostja/mysql/mysql-5.0-root
  into mysql.com:/home/kostja/mysql/mysql-5.0-c

  sql/sql_prepare.cc
    1.49 03/11/27 22:55:53 konstantin@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.310 03/11/27 22:55:53 konstantin@mysql.com +0 -3
    Auto merged

ChangeSet
  1.1624.2.1 03/11/27 20:51:53 konstantin@oak.local +5 -0
  Second attempt: trying to add Statement context to sources.
  Added classes Statement, Statement_map
  Merge commit

  sql/sql_prepare.cc
    1.46.1.1 03/11/27 20:51:32 konstantin@mysql.com +1 -1
    current_stmt_id -> statement_id_counter

  sql/sql_parse.cc
    1.308.1.1 03/11/27 20:51:32 konstantin@mysql.com +3 -5
    no THD::init_for_queries()

  sql/sql_class.h
    1.168 03/11/27 20:51:32 konstantin@mysql.com +121 -13
    Statement added

  sql/sql_class.cc
    1.130.1.2 03/11/27 20:51:32 konstantin@mysql.com +81 -27
    added Statement

  sql/slave.cc
    1.201 03/11/27 20:51:32 konstantin@mysql.com +0 -1
    no THD::init_for_queries() as mem_root is statement-local

ChangeSet
  1.1616.27.1 03/11/27 19:45:28 bell@sanja.is.com.ua +4 -0
  code coverage for UNIONs

  mysql-test/t/union.test
    1.48 03/11/27 19:45:26 bell@sanja.is.com.ua +22 -3
    converting temporary table from HEAP to MyISAM

  mysql-test/t/subselect.test
    1.58.1.35 03/11/27 19:45:26 bell@sanja.is.com.ua +1 -1
    independent subquery with union

  mysql-test/r/union.result
    1.50 03/11/27 19:45:26 bell@sanja.is.com.ua +20 -0
    converting temporary table from HEAP to MyISAM

  mysql-test/r/subselect.result
    1.67.1.38 03/11/27 19:45:26 bell@sanja.is.com.ua +4 -4
    independent subquery with union

ChangeSet
  1.1616.1.14 03/11/27 19:14:16 konstantin@oak.local +1 -0
  memory leak (no delete for query= new String) fixed

  sql/sql_prepare.cc
    1.34.1.26 03/11/27 19:14:14 konstantin@mysql.com +6 -6
    memory leak (no delete for query= new String) fixed

ChangeSet
  1.1624.1.6 03/11/27 16:48:21 pem@mysql.comhem.se +8 -0
  Fixed BUG#1965: Opening a cursor hangs client when malformed select fails
    and BUG#1966: "select 1 into a" on top-level hangs client

  sql/sql_yacc.yy
    1.255 03/11/27 16:48:18 pem@mysql.com +3 -4
    Give error message if doing SELECT ... INTO localvar even if it's outside an SP.

  sql/sp_rcontext.h
    1.6 03/11/27 16:48:18 pem@mysql.com +1 -1
    Use net->no_send_eof flag to prevent eofs during cursor open (instead of
    the dirty vio=0 which didn't work).

  sql/sp_rcontext.cc
    1.4 03/11/27 16:48:18 pem@mysql.com +3 -3
    Use net->no_send_eof flag to prevent eofs during cursor open (instead of
    the dirty vio=0 which didn't work).

  sql/protocol.cc
    1.67 03/11/27 16:48:18 pem@mysql.com +1 -1
    Added no_send_eof flag to NET for SP cursors (the simple read-only version).

  sql/net_serv.cc
    1.64 03/11/27 16:48:18 pem@mysql.com +1 -0
    Added no_send_eof flag to NET for SP cursors (the simple read-only version).

  mysql-test/t/sp-error.test
    1.23 03/11/27 16:48:18 pem@mysql.com +21 -0
    Added tests for BUG#1965 and BUG#1966.

  mysql-test/r/sp-error.result
    1.23 03/11/27 16:48:18 pem@mysql.com +11 -0
    Added tests for BUG#1965 and BUG#1966.

  include/mysql_com.h
    1.76 03/11/27 16:48:18 pem@mysql.com +2 -1
    Added no_send_eof flag to NET for SP cursors (the simple read-only version).

ChangeSet
  1.1616.1.13 03/11/27 09:34:41 bell@sanja.is.com.ua +1 -0
  removed unused variable

  sql/sql_derived.cc
    1.43.1.16 03/11/27 09:34:39 bell@sanja.is.com.ua +1 -2
    removed unused variable

ChangeSet
  1.1624.1.5 03/11/27 00:16:34 konstantin@oak.local +1 -0
  typo in comment

  sql/sql_prepare.cc
    1.48 03/11/27 00:16:32 konstantin@mysql.com +1 -1
    typo in comment

ChangeSet
  1.1616.1.11 03/11/26 20:12:26 bell@sanja.is.com.ua +2 -0
  avoiding coping tmptable_param

  sql/sql_union.cc
    1.74.1.20 03/11/26 20:12:23 bell@sanja.is.com.ua +1 -1
    fixed layout

  sql/sql_derived.cc
    1.43.1.15 03/11/26 20:12:23 bell@sanja.is.com.ua +4 -5
    avoiding coping tmptable_param

ChangeSet
  1.1616.26.2 03/11/26 20:23:28 konstantin@oak.local +1 -0
  cleanup

  tests/client_test.c
    1.49 03/11/26 20:23:26 konstantin@mysql.com +3 -3
    cleanup

ChangeSet
  1.1616.26.1 03/11/26 20:18:55 konstantin@oak.local +1 -0
  cleanup

  tests/client_test.c
    1.48 03/11/26 20:18:53 konstantin@mysql.com +2 -2
    cleanup

ChangeSet
  1.1616.1.10 03/11/26 19:13:05 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1

  sql/sql_union.cc
    1.74.1.19 03/11/26 19:13:03 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1616.25.1 03/11/26 19:10:30 bell@sanja.is.com.ua +1 -0
  avoiding coping tmp_table_param

  sql/sql_union.cc
    1.74.11.1 03/11/26 19:10:27 bell@sanja.is.com.ua +7 -5
    avoiding coping tmp_table_param

ChangeSet
  1.1616.1.9 03/11/26 17:06:24 guilhem@mysql.com +3 -0
  Fix for BUG#1960 "date_format() returns spurious '-' for valid dates".
  It was a forgotten ltime->neg=0 (neg was the only forgotten variable).
  I scanned field.cc for other places where we would forget to set neg, found none.
  A test for the bug.

  sql/field.cc
    1.123 03/11/26 17:06:14 guilhem@mysql.com +1 -1
    When preparing ltime from the 3-byte date, don't forget to set ltime->neg to 0
    (otherwise it remains unitialized).
    Dates are not allowed to be negative (only times can be, when they mean a time interval),
    so it's ok to always set neg to 0.

  mysql-test/t/date_formats.test
    1.4 03/11/26 17:06:14 guilhem@mysql.com +9 -0
    a test for BUG#1960 "date_format() returns spurious '-' for valid dates"

  mysql-test/r/date_formats.result
    1.5 03/11/26 17:06:13 guilhem@mysql.com +7 -0
    result update

ChangeSet
  1.1616.1.8 03/11/26 15:22:30 lenz@kallisto.local +1 -0
   - fixed compile error in tests/client_test.c
     (declarations should be on top of a block)

  tests/client_test.c
    1.47 03/11/26 15:22:27 lenz@mysql.com +1 -1
     - fixed compile error (declarations should be on top of a block)

ChangeSet
  1.1616.1.7 03/11/26 13:39:18 hf@deer.(none) +2 -0
  Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into deer.(none):/home/hf/work/mysql-4.1-w1284

  sql/sql_parse.cc
    1.271.1.33 03/11/26 13:39:15 hf@deer.(none) +0 -0
    Auto merged

  sql/sql_acl.cc
    1.74.1.24 03/11/26 13:39:15 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.1.6 03/11/26 13:38:32 hf@deer.(none) +24 -0
  SCRUM
  WL#1284 (warnings about --skip-name-resolve)
  Messages corrected

  sql/sql_acl.cc
    1.74.1.23 03/11/26 13:38:29 hf@deer.(none) +8 -8
    Messages corrected

  sql/share/ukrainian/errmsg.txt
    1.27.1.32 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/swedish/errmsg.txt
    1.64.1.35 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/spanish/errmsg.txt
    1.64.1.36 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/slovak/errmsg.txt
    1.64.1.35 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/serbian/errmsg.txt
    1.18.1.33 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/russian/errmsg.txt
    1.61.1.33 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/romanian/errmsg.txt
    1.62.1.35 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/portuguese/errmsg.txt
    1.64.1.34 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/polish/errmsg.txt
    1.63.1.35 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/norwegian/errmsg.txt
    1.63.1.36 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.35 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/korean/errmsg.txt
    1.63.1.35 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/japanese/errmsg.txt
    1.63.1.34 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/italian/errmsg.txt
    1.70.1.36 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/hungarian/errmsg.txt
    1.65.1.34 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/greek/errmsg.txt
    1.64.1.34 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/german/errmsg.txt
    1.64.1.35 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/french/errmsg.txt
    1.63.1.35 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/estonian/errmsg.txt
    1.64.1.34 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/english/errmsg.txt
    1.70.1.38 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/dutch/errmsg.txt
    1.66.1.35 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/danish/errmsg.txt
    1.62.1.35 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

  sql/share/czech/errmsg.txt
    1.64.1.35 03/11/26 13:38:29 hf@deer.(none) +1 -1
    Message corrected

ChangeSet
  1.1616.23.5 03/11/25 22:20:31 igor@rurik.mysql.com +2 -0
  mi_keycache.c:
    Removed FLUSH_REMOVE flag (replaced it by FLUSH_RELEASE).
  my_sys.h:
    Removed FLUSH_REMOVE flag.

  myisam/mi_keycache.c
    1.7 03/11/25 22:20:00 igor@rurik.mysql.com +2 -2
    Removed FLUSH_REMOVE flag (replaced it by FLUSH_RELEASE).

  include/my_sys.h
    1.115 03/11/25 22:17:42 igor@rurik.mysql.com +1 -2
    Removed FLUSH_REMOVE flag.

ChangeSet
  1.1616.4.25 03/11/26 03:32:39 monty@mysql.com +3 -0
  Merge mysql.com:/my/mysql-4.0 into mysql.com:/my/mysql-4.1

  sql/set_var.cc
    1.34.27.1 03/11/26 03:32:37 monty@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.67 03/11/26 03:32:37 monty@mysql.com +0 -0
    Auto merged

  include/mysql_version.h.in
    1.16 03/11/26 03:32:36 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.426.1 03/11/26 03:30:00 monty@mysql.com +3 -0
  Added compilation comment to 'show variables'
  This makes it possible to check origin of binary from the output of 'show variables'

  sql/set_var.cc
    1.12.1.30 03/11/26 03:29:58 monty@mysql.com +1 -0
    Added compilation comment to 'show variables'

  sql/mysqld.cc
    1.297.1.165 03/11/26 03:29:58 monty@mysql.com +2 -2
    Added compilation comment to mysqld --version

  include/mysql_version.h.in
    1.13.1.2 03/11/26 03:29:58 monty@mysql.com +1 -0
    Added MYSQL_COMPILATION_COMMENT

ChangeSet
  1.1616.23.4 03/11/25 17:21:43 igor@rurik.mysql.com +1 -0
  mf_keycache.c:
    Fixed typo that caused blocking key cache usage after resize.
    Removed wrong re-initialization of resize queue in init_key_cache.

  mysys/mf_keycache.c
    1.38 03/11/25 17:19:31 igor@rurik.mysql.com +10 -11
    Fixed typo that caused blocking key cache usage after resize.
    Removed wrong re-initialization of resize queue in init_key_cache.

  sql/set_var.cc
    1.34.1.45 03/11/25 23:13:55 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -1
    fix typos

  sql/handler.cc
    1.103.1.6 03/11/25 23:13:55 antony@ltantony.rdg.cyberkinetica.homeunix.net +6 -4
    fix typos

ChangeSet
  1.1616.23.3 03/11/25 15:00:31 igor@rurik.mysql.com +1 -0
  sql_union.cc:
    Fixed a bug: missing semicolon.

  sql/sql_union.cc
    1.74.1.18 03/11/25 14:59:28 igor@rurik.mysql.com +1 -1
    Fixed a bug: missing semicolon.

ChangeSet
  1.1616.23.1 03/11/25 23:56:54 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1

  mysql-test/r/create.result
    1.53.1.3 03/11/25 23:56:52 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1616.22.1 03/11/25 23:52:10 bell@sanja.is.com.ua +9 -0
  added collation processing in UNION merging
  temporary table BLOB now is longblob

  sql/sql_union.cc
    1.74.1.17 03/11/25 23:52:07 bell@sanja.is.com.ua +2 -1
    joining of UNION fields may failed now, because of incompatibility of collations

  sql/item.h
    1.56.1.48 03/11/25 23:52:07 bell@sanja.is.com.ua +1 -1
    joining of UNION fields may failed now, because of incompatibility of collations

  sql/item.cc
    1.58.1.46 03/11/25 23:52:07 bell@sanja.is.com.ua +30 -4
    processing of collation added
    added comment

  sql/field.h
    1.86 03/11/25 23:52:07 bell@sanja.is.com.ua +1 -1
    blob size changed for safety

  mysql-test/t/union.test
    1.47 03/11/25 23:52:07 bell@sanja.is.com.ua +27 -2
    new tests of UNION types merging

  mysql-test/r/union.result
    1.49 03/11/25 23:52:07 bell@sanja.is.com.ua +61 -4
    blob size changed for safety
    new tests of UNION types merging

  mysql-test/r/type_ranges.result
    1.21 03/11/25 23:52:07 bell@sanja.is.com.ua +2 -2
    blob size changed for safety

  mysql-test/r/type_blob.result
    1.29 03/11/25 23:52:07 bell@sanja.is.com.ua +1 -1
    blob size changed for safety

  mysql-test/r/create.result
    1.53.3.1 03/11/25 23:52:07 bell@sanja.is.com.ua +1 -1
    blob size changed for safety

ChangeSet
  1.1616.4.22 03/11/25 23:15:15 monty@mysql.com +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/my/mysql-4.1

  mysql-test/t/rpl_change_master.test
    1.5 03/11/25 23:15:14 monty@mysql.com +0 -2
    Auto merged

  mysql-test/r/rpl_change_master.result
    1.7 03/11/25 23:15:13 monty@mysql.com +0 -1
    Auto merged

ChangeSet
  1.1616.21.1 03/11/25 23:14:49 monty@mysql.com +3 -0
  Change to use real_sleep to make test work in build environment

  mysql-test/t/rpl_change_master.test
    1.3.1.1 03/11/25 23:14:47 monty@mysql.com +2 -2
    Change to use real_sleep to make test work in build environment

  mysql-test/r/rpl_change_master.result
    1.4.1.1 03/11/25 23:14:47 monty@mysql.com +1 -1
    new results

  myisam/mi_extra.c
    1.39 03/11/25 23:14:47 monty@mysql.com +3 -7
    Fix comment

ChangeSet
  1.1616.18.8 03/11/25 13:06:46 igor@rurik.mysql.com +1 -0
  fork_big2.pl:
    Added resize key cache test.

  tests/fork_big2.pl
    1.2 03/11/25 13:06:01 igor@rurik.mysql.com +34 -2
    Added resize key cache test.

ChangeSet
  1.1616.4.21 03/11/25 21:52:22 heikki@hundin.mysql.fi +2 -0
  fil0fil.h, fil0fil.c:
    ibbackup --apply-log must be able to rename a table based only on the space id

  innobase/include/fil0fil.h
    1.11 03/11/25 21:49:03 heikki@hundin.mysql.fi +3 -1
    ibbackup --apply-log must be able to rename a table based only on the space id

  innobase/fil/fil0fil.c
    1.21 03/11/25 21:48:57 heikki@hundin.mysql.fi +27 -14
    ibbackup --apply-log must be able to rename a table based only on the space id

  sql/handler.cc
    1.103.1.5 03/11/25 19:18:20 antony@ltantony.rdg.cyberkinetica.homeunix.net +8 -0
    Make use of user defaults.

ChangeSet
  1.1616.18.6 03/11/25 20:06:41 serg@serg.mylan +2 -0
  post-merge fixes

  mysql-test/r/rpl_change_master.result
    1.6 03/11/25 20:06:35 serg@serg.mylan +1 -1
    test results updated

  Makefile.am
    1.53 03/11/25 20:06:35 serg@serg.mylan +1 -1
    spurious space (from a bad merge) deleted

  sql/sql_table.cc
    1.157.2.25 03/11/25 19:00:10 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -6
    Tidy up

  sql/sql_show.cc
    1.122.4.16 03/11/25 19:00:00 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -3
    Tidy up

  sql/set_var.cc
    1.34.1.44 03/11/25 18:59:53 antony@ltantony.rdg.cyberkinetica.homeunix.net +7 -6
    Tidy up & fix

  sql/handler.h
    1.89.1.4 03/11/25 18:59:47 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    new function: ha_get_table_type()

  sql/handler.cc
    1.103.1.4 03/11/25 18:59:33 antony@ltantony.rdg.cyberkinetica.homeunix.net +22 -4
    Alias descriptions
    new function: ha_get_table_type()

ChangeSet
  1.1616.20.1 03/11/25 10:40:14 igor@rurik.mysql.com +2 -0
  mf_keycache.c, keycache.h:
    Fix for the resize key cache operation.

ChangeSet
  1.1616.19.1 03/11/25 20:39:06 heikki@hundin.mysql.fi +2 -0
  os0file.h, os0file.c:
    Changes needed for ibbackup directory scanning fault tolerance

  mysys/mf_keycache.c
    1.37 03/11/25 10:39:03 igor@rurik.mysql.com +189 -33
    Fix for the resize key cache operation.

  innobase/include/os0file.h
    1.24 03/11/25 20:38:50 heikki@hundin.mysql.fi +26 -0
    Changes needed for ibbackup directory scanning fault tolerance

  innobase/os/os0file.c
    1.59 03/11/25 20:38:43 heikki@hundin.mysql.fi +215 -5
    Changes needed for ibbackup directory scanning fault tolerance

  include/keycache.h
    1.3 03/11/25 10:38:12 igor@rurik.mysql.com +4 -0
    Fix for the resize key cache operation.

ChangeSet
  1.1616.18.4 03/11/25 19:20:07 lenz@mysql.com +1 -0
  Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1

  Docs/Makefile.am
    1.44 03/11/25 19:20:03 lenz@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.421.9 03/11/25 19:19:20 lenz@mysql.com +1 -0
   - Fixed missing node name

  Docs/Makefile.am
    1.38.1.5 03/11/25 19:19:18 lenz@mysql.com +1 -1
     - Fixed missing node name

ChangeSet
  1.1616.18.3 03/11/25 19:12:54 lenz@mysql.com +1 -0
  Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1

  Docs/Makefile.am
    1.43 03/11/25 19:12:50 lenz@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.421.8 03/11/25 19:11:59 lenz@mysql.com +1 -0
   - Removed COPYING.LIB from txt_files target in Docs/Makefile.am

  Docs/Makefile.am
    1.38.1.4 03/11/25 19:11:56 lenz@mysql.com +1 -1
     - Removed COPYING.LIB from txt_files target

ChangeSet
  1.1616.18.2 03/11/25 18:26:53 serg@serg.mylan +8 -0
  merged

  mysql-test/r/rpl_change_master.result
    1.5 03/11/25 18:26:49 serg@serg.mylan +1 -3
    merged - ul

  Makefile.am
    1.52 03/11/25 18:26:49 serg@serg.mylan +2 -3
    merged

  support-files/mysql.spec.sh
    1.69 03/11/25 18:22:34 serg@serg.mylan +0 -0
    Auto merged

  scripts/make_win_src_distribution.sh
    1.12 03/11/25 18:22:34 serg@serg.mylan +0 -0
    Auto merged

  scripts/make_binary_distribution.sh
    1.55.1.2 03/11/25 18:22:34 serg@serg.mylan +0 -0
    Auto merged

  mysys/my_getopt.c
    1.42 03/11/25 18:22:34 serg@serg.mylan +0 -0
    Auto merged

  mysql-test/t/rpl_change_master.test
    1.4 03/11/25 18:22:34 serg@serg.mylan +0 -2
    Auto merged

  Docs/Makefile.am
    1.42 03/11/25 18:22:34 serg@serg.mylan +0 -0
    Auto merged

  sql/handler.h
    1.89.1.3 03/11/25 17:08:24 antony@ltantony.rdg.cyberkinetica.homeunix.net +0 -1
    sanja's suggestion - remove alias field from show_table_type_st

  sql/handler.cc
    1.103.1.3 03/11/25 17:08:23 antony@ltantony.rdg.cyberkinetica.homeunix.net +16 -11
    sanja's suggestion - remove alias field from show_table_type_st

ChangeSet
  1.1346.421.7 03/11/25 17:52:12 lenz@mysql.com +5 -0
   - Removed COPYING.LIB from all source and binary distributions
     after it was removed from manual.texi (where it was automatically
     generated from).

  support-files/mysql.spec.sh
    1.61.1.12 03/11/25 17:52:10 lenz@mysql.com +1 -1
     - Removed COPYING.LIB from the Server RPM

  scripts/make_win_src_distribution.sh
    1.7.1.3 03/11/25 17:52:10 lenz@mysql.com +1 -1
     - Removed COPYING.LIB from the windows source distribution

  scripts/make_binary_distribution.sh
    1.49.1.5 03/11/25 17:52:10 lenz@mysql.com +1 -1
     - Removed COPYING.LIB from the binary distribution

  Makefile.am
    1.40.1.8 03/11/25 17:52:10 lenz@mysql.com +1 -2
     - Removed COPYING.LIB from the source distribution

  Docs/Makefile.am
    1.38.1.3 03/11/25 17:52:10 lenz@mysql.com +0 -3
     - don't create COPYING.LIB anymore (was removed from manual.texi)

ChangeSet
  1.1616.17.2 03/11/25 16:08:55 serg@serg.mylan +1 -0
  a script that fixes anti-GRANT'ness of privilege tables.
  It can appear as a result of manual modifications with INSERT/UPDATE/DELETE
  
  This script converts privilege table to the state that could be created
  with GRANT commands only (with the exception of the short password)
  
  This is necessary for 5.0

  scripts/mysql_prepare_privilege_tables_for_5.sql
    1.1 03/11/25 16:08:50 serg@serg.mylan +53 -0

  scripts/mysql_prepare_privilege_tables_for_5.sql
    1.0 03/11/25 16:08:50 serg@serg.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-4.1/scripts/mysql_prepare_privilege_tables_for_5.sql

ChangeSet
  1.1616.4.19 03/11/25 17:41:12 konstantin@oak.local +5 -0
  fix for bug #1946:
  "You can always mysql_real_query a query with placeholders 
  after mysql_prepare()"

  tests/client_test.c
    1.46 03/11/25 17:41:10 konstantin@mysql.com +28 -0
    added test for bug #1946: "You can always
    mysql_real_query a query with placeholders after mysql_prepare()"

  sql/sql_yacc.yy
    1.203.85.1 03/11/25 17:41:10 konstantin@mysql.com +1 -1
    prepare_command removed

  sql/sql_prepare.cc
    1.34.1.25 03/11/25 17:41:10 konstantin@mysql.com +0 -1
    prepare_command removed

  sql/sql_class.h
    1.146.1.51 03/11/25 17:41:10 konstantin@mysql.com +0 -1
    prepare_command removed

  sql/sql_class.cc
    1.105.1.32 03/11/25 17:41:10 konstantin@mysql.com +2 -2
    prepare_command removed

ChangeSet
  1.1616.17.1 03/11/25 14:43:15 serg@serg.mylan +2 -0
  mysql-test-run fixes:
  libexec support in install_test_db
  --start-from in mysql-test-run

  mysql-test/mysql-test-run.sh
    1.167.1.16 03/11/25 14:43:11 serg@serg.mylan +6 -0
    --start-from in mysql-test-run

  mysql-test/install_test_db.sh
    1.24.1.3 03/11/25 14:43:11 serg@serg.mylan +9 -2
    libexec support in install_test_db

ChangeSet
  1.1616.4.18 03/11/25 15:11:01 heikki@hundin.mysql.fi +1 -0
  dict0boot.c:
    Marko's patch: check the position of some system table columns already at C compile time

  innobase/dict/dict0boot.c
    1.7 03/11/25 15:10:49 heikki@hundin.mysql.fi +6 -2
    Marko's patch: check the position of some system table columns already at C compile time

ChangeSet
  1.1624.1.4 03/11/25 15:39:35 konstantin@oak.local +1 -0
  typo fixed

  sql/sql_prepare.cc
    1.47 03/11/25 15:39:33 konstantin@mysql.com +1 -1
    typo fixed

ChangeSet
  1.1624.1.3 03/11/25 15:28:43 konstantin@oak.local +2 -0
  misplaced comment moved to relevant line

  sql/sql_parse.cc
    1.309 03/11/25 15:28:40 konstantin@mysql.com +3 -3
    misplaced comment moved to relevant line

  BitKeeper/etc/ignore
    1.161 03/11/25 15:28:40 konstantin@mysql.com +2 -0
    Added libmysqld/protocol_cursor.cc libmysqld/sp_rcontext.cc to the ignore list

  sql/sql_yacc.yy
    1.203.1.77 03/11/24 23:52:06 antony@ltantony.rdg.cyberkinetica.homeunix.net +8 -17
    Remove tokens and make table_types resolve at run time

  sql/sql_table.cc
    1.157.2.24 03/11/24 23:52:06 antony@ltantony.rdg.cyberkinetica.homeunix.net +6 -2
    Remove use of ha_table_typelib

  sql/sql_show.cc
    1.122.4.15 03/11/24 23:52:05 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -29
    Remove sys_table_types (moved to handler.cc)
    Remove use of ha_table_typelib

  sql/share/ukrainian/errmsg.txt
    1.27.14.1 03/11/24 23:52:05 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/swedish/errmsg.txt
    1.64.15.1 03/11/24 23:52:04 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/spanish/errmsg.txt
    1.64.18.1 03/11/24 23:52:04 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/slovak/errmsg.txt
    1.64.16.1 03/11/24 23:52:03 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/serbian/errmsg.txt
    1.18.14.1 03/11/24 23:52:02 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/russian/errmsg.txt
    1.61.14.1 03/11/24 23:52:02 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/romanian/errmsg.txt
    1.62.16.1 03/11/24 23:52:01 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/portuguese/errmsg.txt
    1.64.17.1 03/11/24 23:52:01 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/polish/errmsg.txt
    1.63.15.1 03/11/24 23:52:00 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/norwegian/errmsg.txt
    1.63.16.1 03/11/24 23:52:00 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/norwegian-ny/errmsg.txt
    1.63.16.1 03/11/24 23:51:59 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/korean/errmsg.txt
    1.63.15.1 03/11/24 23:51:59 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/japanese/errmsg.txt
    1.63.15.1 03/11/24 23:51:58 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/italian/errmsg.txt
    1.70.16.1 03/11/24 23:51:58 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/hungarian/errmsg.txt
    1.65.15.1 03/11/24 23:51:57 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/greek/errmsg.txt
    1.64.15.1 03/11/24 23:51:57 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/german/errmsg.txt
    1.64.16.1 03/11/24 23:51:56 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/french/errmsg.txt
    1.63.16.1 03/11/24 23:51:56 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/estonian/errmsg.txt
    1.64.15.1 03/11/24 23:51:55 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/english/errmsg.txt
    1.70.18.1 03/11/24 23:51:54 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/dutch/errmsg.txt
    1.66.16.1 03/11/24 23:51:54 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/danish/errmsg.txt
    1.62.16.1 03/11/24 23:51:53 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/share/czech/errmsg.txt
    1.64.16.1 03/11/24 23:51:53 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  sql/set_var.h
    1.40 03/11/24 23:51:52 antony@ltantony.rdg.cyberkinetica.homeunix.net +20 -0
    New system variable type: sys_var_thd_table_type

  sql/set_var.cc
    1.34.1.43 03/11/24 23:51:52 antony@ltantony.rdg.cyberkinetica.homeunix.net +56 -2
    New system variable type: sys_var_thd_table_type

  sql/mysqld.cc
    1.356.38.1 03/11/24 23:51:51 antony@ltantony.rdg.cyberkinetica.homeunix.net +3 -3
    Remove use of ha_table_typelib

  sql/mysql_priv.h
    1.186.48.1 03/11/24 23:51:51 antony@ltantony.rdg.cyberkinetica.homeunix.net +0 -1
    Remove unused symbol

  sql/lex.h
    1.82.1.48 03/11/24 23:51:50 antony@ltantony.rdg.cyberkinetica.homeunix.net +0 -6
    Remove some keywords: HEAP, ISAM, MERGE, MEMORY, MRG_MYISAM, MYISAM

  sql/handler.h
    1.89.1.2 03/11/24 23:51:50 antony@ltantony.rdg.cyberkinetica.homeunix.net +11 -1
    Remove ha_table_type and ha_table_typelib
    Move sys_table_types here
    New function: ha_resolve_by_name

  sql/handler.cc
    1.103.1.2 03/11/24 23:51:49 antony@ltantony.rdg.cyberkinetica.homeunix.net +39 -9
    Remove ha_table_type and ha_table_typelib
    Move sys_table_types here
    New function: ha_resolve_by_name

  mysql-test/t/create.test
    1.33.2.1 03/11/24 23:51:49 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -2
    New error message: unknown table engine

  mysql-test/r/create.result
    1.53.2.1 03/11/24 23:51:48 antony@ltantony.rdg.cyberkinetica.homeunix.net +6 -8
    New error message: unknown table engine

  include/sql_state.h
    1.8.1.1 03/11/24 23:51:47 antony@ltantony.rdg.cyberkinetica.homeunix.net +1 -0
    New error message: unknown table engine

  include/mysqld_error.h
    1.61.13.1 03/11/24 23:51:47 antony@ltantony.rdg.cyberkinetica.homeunix.net +2 -1
    New error message: unknown table engine

ChangeSet
  1.1626 03/11/24 20:54:57 sergefp@mysql.com +4 -0
  Post-merge fixes for index_merge/Unique/5.0

  sql/opt_range.h
    1.32 03/11/24 20:54:32 sergefp@mysql.com +2 -2
    Post-merge fixes

  sql/opt_range.cc
    1.102 03/11/24 20:54:32 sergefp@mysql.com +2 -3
    Post-merge fixes

  mysql-test/r/index_merge_innodb.result
    1.2 03/11/24 20:54:32 sergefp@mysql.com +8 -8
    Post-merge fixes

  mysql-test/r/index_merge.result
    1.2 03/11/24 20:54:32 sergefp@mysql.com +1 -1
    Post-merge fixes

ChangeSet
  1.1621.5.1 03/11/24 18:24:14 pem@mysql.comhem.se +27 -0
  Changed "query" into "statement", and corrected SQL state code (04000->0A000).

  sql/sql_yacc.yy
    1.254 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/ukrainian/errmsg.txt
    1.50 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/swedish/errmsg.txt
    1.88 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/spanish/errmsg.txt
    1.87 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/slovak/errmsg.txt
    1.87 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/serbian/errmsg.txt
    1.41 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/russian/errmsg.txt
    1.85 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/romanian/errmsg.txt
    1.84 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/portuguese/errmsg.txt
    1.87 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/polish/errmsg.txt
    1.87 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/norwegian/errmsg.txt
    1.86 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/norwegian-ny/errmsg.txt
    1.86 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/korean/errmsg.txt
    1.86 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/japanese/errmsg.txt
    1.86 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/italian/errmsg.txt
    1.93 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/hungarian/errmsg.txt
    1.88 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/greek/errmsg.txt
    1.87 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/german/errmsg.txt
    1.88 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/french/errmsg.txt
    1.86 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/estonian/errmsg.txt
    1.87 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/english/errmsg.txt
    1.94 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/dutch/errmsg.txt
    1.89 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/danish/errmsg.txt
    1.85 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  sql/share/czech/errmsg.txt
    1.86 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

  mysql-test/r/sp-error.result
    1.22 03/11/24 18:24:10 pem@mysql.com +2 -2
    Changed "query" into "statement", and corrected SQL state code.

  include/sql_state.h
    1.10 03/11/24 18:24:10 pem@mysql.com +2 -2
    Changed "query" into "statement", and corrected SQL state code.

  include/mysqld_error.h
    1.84 03/11/24 18:24:10 pem@mysql.com +1 -1
    Changed "query" into "statement".

ChangeSet
  1.1346.421.6 03/11/24 17:05:24 lenz@mysql.com +2 -0
   - Rephrased two option help texts to not start with "use the ..." as this 
     confuses RPM's Perl module dependency checking (it adds a bogus
     requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931)

  sql-bench/bench-init.pl.sh
    1.28 03/11/24 17:05:21 lenz@mysql.com +1 -1
     - Rephrased option help text so it does not start with "use" as this 
       confuses RPM's Perl module dependency checking (it adds a bogus
       requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931)

  scripts/mysqlaccess.sh
    1.8 03/11/24 17:05:21 lenz@mysql.com +1 -1
     - Rephrased option help text so it does not start with "use" as this 
       confuses RPM's Perl module dependency checking (it adds a bogus
       requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931)

ChangeSet
  1.1616.4.17 03/11/24 14:49:03 serg@serg.mylan +1 -0
  WL#1172 optimization reverted
  (see fulltext.test)

  myisam/ft_boolean_search.c
    1.69 03/11/24 14:48:58 serg@serg.mylan +0 -4
    WL#1172 optimization reverted
    (see fulltext.test)

ChangeSet
  1.1616.14.4 03/11/24 13:25:23 jani@rhols221.adsl.netsonic.fi +1 -0
  Fixed Bug#1907, option of type GET_BOOL with arg type OPT_ARG
  did not call get_one_option().

  mysys/my_getopt.c
    1.41 03/11/24 13:25:19 jani@rhols221.adsl.netsonic.fi +0 -2
    Fixed Bug#1907, option of type GET_BOOL with arg type OPT_ARG
    did not call get_one_option().

ChangeSet
  1.1346.425.1 03/11/24 13:25:08 jani@rhols221.adsl.netsonic.fi +1 -0
  Fixed Bug#1907, option of type GET_BOOL with arg type OPT_ARG
  did not call get_one_option().

  mysys/my_getopt.c
    1.35.1.2 03/11/24 13:25:05 jani@rhols221.adsl.netsonic.fi +0 -2
    Fixed Bug#1907, option of type GET_BOOL with arg type OPT_ARG
    did not call get_one_option().

ChangeSet
  1.1346.424.2 03/11/24 13:57:49 gluh@gluh.mysql.r18.ru +1 -0
  Fix for bug #1855: mysqld crashes with certain SSL connections

  sql/sql_acl.cc
    1.51.1.68 03/11/24 13:57:33 gluh@gluh.mysql.r18.ru +5 -0
    Fix for bug #1855: mysqld crashes with certain SSL connections

ChangeSet
  1.1616.14.2 03/11/23 21:26:43 bell@sanja.is.com.ua +7 -0
  after review fixes

  sql/sql_lex.h
    1.102.1.40 03/11/23 21:26:38 bell@sanja.is.com.ua +7 -1
    comment added

  sql/sql_derived.cc
    1.43.1.14 03/11/23 21:26:38 bell@sanja.is.com.ua +1 -1
    fixed typo

  sql/item.cc
    1.58.1.45 03/11/23 21:26:38 bell@sanja.is.com.ua +23 -31
    new way to make field types csting

  sql/field.h
    1.85 03/11/23 21:26:38 bell@sanja.is.com.ua +34 -48
    new way to make field types csting

  sql/field.cc
    1.122 03/11/23 21:26:38 bell@sanja.is.com.ua +122 -0
    new way to make field types csting

  mysql-test/t/union.test
    1.46 03/11/23 21:26:38 bell@sanja.is.com.ua +10 -2
    new tests, more correct results for old one

  mysql-test/r/union.result
    1.48 03/11/23 21:26:38 bell@sanja.is.com.ua +26 -4
    new tests, more correct results for old one

ChangeSet
  1.1346.424.1 03/11/23 21:03:10 monty@mysql.com +2 -0
  Fix test for binary builds

  mysql-test/t/rpl_change_master.test
    1.1.1.1 03/11/23 21:03:09 monty@mysql.com +4 -2
    Fix test for binary builds

  mysql-test/r/rpl_change_master.result
    1.1.1.1 03/11/23 21:03:09 monty@mysql.com +3 -3
    Updated results

ChangeSet
  1.1616.15.1 03/11/23 17:02:59 guilhem@gbichot2 +6 -0
  Replication:
  Now the I/O thread (in flush_master_info()) flushes the relay log to disk
  after reading every event. Slower but provides additionnal safety in case
  of brutal crash.
  I had to make the flush optional (i.e. add a if(some_bool_argument) in the function)
  because sometimes flush_master_info() is called when there is no usable
  relay log (the relay log's IO_CACHE is not initialized so can't be flushed).

  sql/sql_repl.cc
    1.102.1.19 03/11/23 17:02:56 guilhem@mysql.com +5 -2
    update call to flush_master_info() according to new prototype.

  sql/slave.h
    1.71 03/11/23 17:02:55 guilhem@mysql.com +1 -1
    new prototype

  sql/slave.cc
    1.188.1.30 03/11/23 17:02:55 guilhem@mysql.com +21 -30
    - Now the I/O thread (in flush_master_info()) flushes the relay log to disk
    after reading every event. Slower but provides additionnal safety in case
    of brutal crash.
    I had to make the flush optional (i.e. add a if(some_bool_argument) in the function)
    because sometimes flush_master_info() is called when there is no usable
    relay log (the relay log's IO_CACHE is not initialized so can't be flushed).
    - Update version in message.
    - Remove warning about bug as it's not true anymore (since this changeset).

  sql/repl_failsafe.cc
    1.32.1.12 03/11/23 17:02:55 guilhem@mysql.com +6 -1
    update call to flush_master_info() according to new prototype.

  mysql-test/t/rpl_loaddata_rule_m.test
    1.3 03/11/23 17:02:55 guilhem@mysql.com +1 -1
    result update

  mysql-test/r/rpl_loaddata_rule_m.result
    1.4 03/11/23 17:02:55 guilhem@mysql.com +1 -1
    avoid a harmless error in the .err file; we don't need a slave in this test
    (even though it's called 'rpl' because it's testing binlog-ignore-db).

ChangeSet
  1.1616.14.1 03/11/23 17:59:28 bell@sanja.is.com.ua +2 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1

  sql/item.h
    1.56.1.47 03/11/23 17:59:24 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.58.1.44 03/11/23 17:59:24 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1624.1.1 03/11/23 17:35:19 konstantin@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/kostja/mysql/mysql-5.0-root

  sql/sql_class.cc
    1.130.1.1 03/11/23 17:35:16 konstantin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1621.4.1 03/11/23 17:34:36 konstantin@oak.local +3 -0
  Cleanups:
  - unused variable THD::con_root removed
  - we don't need to bzero(&warn_root) just before init_alloc_root(&warn_root)
  - we don't need to bzero(&transaction.mem_root) because we 
    bzero(&transaction) later in THD::THD
  - we don't need to free thd->mem_root thd->transaction.mem_root
    in handle_one_connection because they are freed in THD::~THD
    which is called in end_thread later 
  

  sql/sql_parse.cc
    1.308 03/11/23 17:34:34 konstantin@mysql.com +0 -3
    we don't need to free thd->mem_root and thd->transaction.mem_root
    because they are freed in THD::~THD

  sql/sql_class.h
    1.167 03/11/23 17:34:34 konstantin@mysql.com +0 -1
    Unused variable THD::con_root removed

  sql/sql_class.cc
    1.127.1.6 03/11/23 17:34:34 konstantin@mysql.com +0 -4
    Cleanups:
    - unused variable THD::con_root removed
    - we don't need to bzero(&warn_root) just before init_alloc_root(&warn_root)
    - we don't need to bzero(&transaction.mem_root) because we 
      bzero(&transaction) later in THD::THD
    

ChangeSet
  1.1616.4.14 03/11/23 15:35:43 monty@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/my/mysql-4.1

  sql/item_func.cc
    1.124.1.46 03/11/23 15:35:41 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.11.3 03/11/23 14:52:02 monty@mysql.com +4 -0
  merge with 4.0

  myisam/ft_boolean_search.c
    1.68 03/11/23 14:52:00 monty@mysql.com +1 -2
    merge with 4.0

  mysql-test/t/fulltext_left_join.test
    1.9 03/11/23 14:37:05 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/fulltext.test
    1.53 03/11/23 14:37:05 monty@mysql.com +0 -0
    Auto merged

  mysql-test/r/fulltext.result
    1.54 03/11/23 14:37:05 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.11.2 03/11/23 14:36:41 monty@mysql.com +20 -0
  Fixed compiler warnings from Intel compiler in Win64
  Added option --max-record-length=# to myisamchk
  Don't try repair twice if doing myisamchk --repair --force
  Shared memory handler didn't clean up things on errors or shutdown

  strings/bmove512.c
    1.7 03/11/23 14:36:39 monty@mysql.com +1 -1
    Fixed compiler warnings from Intel compiler

  sql/mysqld.cc
    1.356.1.66 03/11/23 14:36:39 monty@mysql.com +107 -121
    Fixed compiler warnings from Intel compiler
    Cleaned up handle_connections_shared_memory
    Shared memory handler didn't clean up things on errors or shutdown
    

  sql/item_func.cc
    1.124.18.1 03/11/23 14:36:39 monty@mysql.com +1 -0
    Fixed compiler warnings from Intel compiler

  sql/ha_innodb.cc
    1.90.1.17 03/11/23 14:36:39 monty@mysql.com +4 -3
    Fixed compiler warnings from Intel compiler

  mysql-test/t/create.test
    1.33.1.4 03/11/23 14:36:39 monty@mysql.com +2 -4
    Better initialization

  mysql-test/r/create.result
    1.53.1.2 03/11/23 14:36:39 monty@mysql.com +1 -4
    Updated test results

  myisam/myisamchk.c
    1.92.1.15 03/11/23 14:36:39 monty@mysql.com +12 -3
    Added option --max-record-length=# to myisamchk
    Don't try repair twice if doing myisamchk --repair --force

  myisam/mi_check.c
    1.105.1.13 03/11/23 14:36:39 monty@mysql.com +56 -35
    Added option --max-record-length=# to myisamchk
    Better error messages

  innobase/que/que0que.c
    1.11 03/11/23 14:36:39 monty@mysql.com +8 -5
    Fixed compiler warnings from Intel compiler

  innobase/pars/pars0opt.c
    1.7 03/11/23 14:36:39 monty@mysql.com +3 -2
    Fixed compiler warnings from Intel compiler

  innobase/include/trx0rseg.ic
    1.3 03/11/23 14:36:39 monty@mysql.com +2 -2
    Fixed compiler warnings from Intel compiler

  innobase/include/row0upd.ic
    1.4 03/11/23 14:36:39 monty@mysql.com +2 -2
    Fixed compiler warnings from Intel compiler

  innobase/include/row0sel.ic
    1.2 03/11/23 14:36:39 monty@mysql.com +1 -1
    Fixed compiler warnings from Intel compiler

  innobase/include/buf0buf.ic
    1.11 03/11/23 14:36:39 monty@mysql.com +4 -4
    Fixed compiler warnings from Intel compiler

  innobase/include/btr0btr.ic
    1.4 03/11/23 14:36:39 monty@mysql.com +1 -1
    Fixed compiler warnings from Intel compiler

  innobase/btr/btr0cur.c
    1.26 03/11/23 14:36:38 monty@mysql.com +14 -13
    Fixed compiler warnings from Intel compiler

  innobase/btr/btr0btr.c
    1.23 03/11/23 14:36:38 monty@mysql.com +20 -14
    Fixed compiler warnings from Intel compiler

  include/mysql_com.h
    1.67.1.20 03/11/23 14:36:38 monty@mysql.com +1 -1
    Fixed compiler warnings from Intel compiler

  include/myisam.h
    1.56 03/11/23 14:36:38 monty@mysql.com +1 -0
    Added option --max-record-length=# to myisamchk

  VC++Files/libmysqltest/mytest.c
    1.3 03/11/23 14:36:38 monty@mysql.com +26 -22
    Fixed compiler warnings from Intel compiler

ChangeSet
  1.1625 03/11/23 15:17:46 sergefp@mysql.com +14 -0
  Merging index_merge/Unique into 5.0

  sql/sql_update.cc
    1.98 03/11/23 15:17:44 sergefp@mysql.com +0 -32
    Merging index_merge/Unique into 5.0

  sql/sql_union.cc
    1.84 03/11/23 15:17:44 sergefp@mysql.com +0 -3
    Merging index_merge/Unique into 5.0

  sql/sql_test.cc
    1.29.1.2 03/11/23 15:17:44 sergefp@mysql.com +0 -31
    Merging index_merge/Unique into 5.0

  sql/sql_select.h
    1.63 03/11/23 15:17:44 sergefp@mysql.com +0 -3
    Merging index_merge/Unique into 5.0

  sql/sql_select.cc
    1.232 03/11/23 15:17:44 sergefp@mysql.com +0 -86
    Merging index_merge/Unique into 5.0

  sql/sql_class.cc
    1.131 03/11/23 15:17:43 sergefp@mysql.com +0 -2
    Merging index_merge/Unique into 5.0

  sql/records.cc
    1.26 03/11/23 15:17:43 sergefp@mysql.com +0 -0
    Merging index_merge/Unique into 5.0

  sql/opt_range.h
    1.31 03/11/23 15:17:43 sergefp@mysql.com +0 -175
    Merging index_merge/Unique into 5.0

  sql/opt_range.cc
    1.101 03/11/23 15:17:43 sergefp@mysql.com +2 -722
    Merging index_merge/Unique into 5.0

  sql/opt_ft.h
    1.8 03/11/23 15:17:43 sergefp@mysql.com +0 -6
    Merging index_merge/Unique into 5.0

  sql/opt_ft.cc
    1.5 03/11/23 15:17:43 sergefp@mysql.com +0 -1
    Merging index_merge/Unique into 5.0

  sql/filesort.cc
    1.78 03/11/23 15:17:43 sergefp@mysql.com +0 -0
    Merging index_merge/Unique into 5.0

  sql/sql_list.h
    1.23 03/11/23 14:54:04 psergey@psergey-rh8.(none) +0 -7
    Auto merged

  BitKeeper/etc/logging_ok
    1.251 03/11/23 14:38:57 psergey@psergey-rh8.(none) +0 -1
    auto-union

ChangeSet
  1.1616.13.1 03/11/23 02:01:15 bell@sanja.is.com.ua +17 -0
  Fixed UNION fields type/length detecting

  sql/sql_update.cc
    1.83.2.20 03/11/23 02:00:58 bell@sanja.is.com.ua +1 -1
    we do not need pre-inited tables and fields

  sql/sql_union.cc
    1.74.1.16 03/11/23 02:00:58 bell@sanja.is.com.ua +78 -76
    we do not need pre-inited tables and fields
    check of columns number in union moved to prepare()
    prepering of SELECTS moved before temporary table creation, fixed union columns type/length detecting

  sql/sql_select.h
    1.60.1.2 03/11/23 02:00:58 bell@sanja.is.com.ua +1 -1
    we do not need pre-inited tables and fields

  sql/sql_select.cc
    1.216.1.64 03/11/23 02:00:58 bell@sanja.is.com.ua +148 -76
    we do not need pre-inited tables and fields
    support mysql_select call from derived tables after it preparing (in derived table routing)
    support of crreating temporary table fields from Item_type_holder

  sql/sql_prepare.cc
    1.34.1.24 03/11/23 02:00:57 bell@sanja.is.com.ua +1 -1
    we do not need pre-inited tables and fields

  sql/sql_parse.cc
    1.271.45.2 03/11/23 02:00:57 bell@sanja.is.com.ua +1 -1
    we do not need pre-inited tables and fields

  sql/sql_lex.h
    1.102.1.39 03/11/23 02:00:57 bell@sanja.is.com.ua +7 -4
    we do not need pre-inited tables and fields
    new lists to store fields types and fields of temporary table

  sql/sql_derived.cc
    1.43.1.13 03/11/23 02:00:57 bell@sanja.is.com.ua +66 -86
    preparing moved before temporary table creation

  sql/sql_class.h
    1.146.1.50 03/11/23 02:00:57 bell@sanja.is.com.ua +1 -0
    we do not need double fix_fielding

  sql/sql_base.cc
    1.145.1.22 03/11/23 02:00:57 bell@sanja.is.com.ua +0 -14
    we do not need double fix_fielding

  sql/mysql_priv.h
    1.186.1.51 03/11/23 02:00:57 bell@sanja.is.com.ua +2 -3
    we do not need pre-inited tables and fields

  sql/item_subselect.cc
    1.60.1.29 03/11/23 02:00:57 bell@sanja.is.com.ua +8 -41
    new subquery item length/dec detecting

  sql/item.h
    1.56.18.1 03/11/23 02:00:57 bell@sanja.is.com.ua +27 -5
    new item for storing field type

  sql/item.cc
    1.58.34.1 03/11/23 02:00:57 bell@sanja.is.com.ua +120 -1
    fixed printing field of internal temporary table of SELECT (reference from HAVING clause)
    layout fix
    new item for storing field type

  sql/field.h
    1.84 03/11/23 02:00:57 bell@sanja.is.com.ua +48 -0
    field converion support

  mysql-test/t/union.test
    1.45 03/11/23 02:00:57 bell@sanja.is.com.ua +82 -0
    type conversion tests

  mysql-test/r/union.result
    1.47 03/11/23 02:00:57 bell@sanja.is.com.ua +205 -4
    new results with max union field length detecting
    type conversion tests

ChangeSet
  1.1616.4.13 03/11/23 00:48:59 dlenev@mysql.com +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/dlenev/src/mysql-4.1-bg1500-2

  sql/item_func.cc
    1.124.1.45 03/11/23 00:48:56 dlenev@mysql.com +0 -0
    Auto merged

  sql/item.h
    1.56.1.46 03/11/23 00:48:56 dlenev@mysql.com +0 -0
    Auto merged

  sql/item.cc
    1.58.1.43 03/11/23 00:48:56 dlenev@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.12.1 03/11/23 00:48:18 dlenev@dlenev.mshome +4 -0
  Fix for bug #1500 "Server crash with mysql_prepare"
  We treat Item_param whose value is not set as non-const.
  This allows us to avoid use of Item_param's value (not yet existing) in 
  those fix_fields and fix_length_and_dec that do calculations if their 
  Items arguments are const. So we can call fix_fields for such items from
  mysql_prepare safely.

  tests/client_test.c
    1.45 03/11/23 00:48:16 dlenev@mysql.com +112 -0
    Added test for bug #1500 "Server crash with mysql_prepare"

  sql/item_func.cc
    1.124.17.1 03/11/23 00:48:16 dlenev@mysql.com +9 -4
    Fulltext search AGAINST clause now allows prepared statement parameter as its argument.
    Removed duplicate used_tables_cache update in Item_func_match::fix_fields()
    (it is set during Item_func::fix_fields).

  sql/item.h
    1.56.17.1 03/11/23 00:48:16 dlenev@mysql.com +19 -0
    Added Item::const_during_execution() method which indicates constants that will be known 
    during execution phase (but they may be not known during preparing phase for example parameters 
    of prep. statements.)
    Made Item_param non-constant until its is value set, so its value won't be requested during 
    prepare statement step. 

  sql/item.cc
    1.58.33.1 03/11/23 00:48:16 dlenev@mysql.com +6 -1
    Now Item_param is non-constant (const_item()==FALSE) until its value is set.

ChangeSet
  1.1616.4.12 03/11/21 23:02:06 paul@teton.kitebird.com +1 -0
  Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
  into teton.kitebird.com:/home/paul/mysql-4.1

  sql/slave.cc
    1.188.1.29 03/11/21 23:02:00 paul@teton.kitebird.com +0 -0
    Auto merged

ChangeSet
  1.1616.11.1 03/11/22 04:01:08 monty@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/my/mysql-4.1

  sql/ha_innodb.cc
    1.90.1.16 03/11/22 04:01:06 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.10.1 03/11/22 03:21:40 monty@mysql.com +18 -0
  Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file.
  Updated project files for windows
  Made rpl_change_master.test portable
  Ensure that mutex are not freed if not initilized

  sql/slave.cc
    1.188.11.1 03/11/22 03:21:37 monty@mysql.com +4 -5
    Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file.

  sql/hostname.cc
    1.24 03/11/22 03:21:37 monty@mysql.com +8 -4
    Ensure that mutex is not freed if not initilized

  sql/ha_innodb.cc
    1.90.2.1 03/11/22 03:21:37 monty@mysql.com +12 -10
    Ensure that mutex is not freed if not initilized

  sql-common/client.c
    1.39 03/11/22 03:21:37 monty@mysql.com +0 -6
    Removed not used include files (which caused problems on Win64)

  mysql-test/t/rpl_change_master.test
    1.3 03/11/22 03:21:37 monty@mysql.com +2 -0
    Made test portable

  mysql-test/r/rpl_change_master.result
    1.4 03/11/22 03:21:37 monty@mysql.com +2 -2
    Made test portable

  libmysql/libmysql.c
    1.156.1.41 03/11/22 03:21:37 monty@mysql.com +0 -4
    Removed not used include files (which caused problems on Win64)

  VC++Files/mysys/mysys.dsp
    1.17 03/11/22 03:21:37 monty@mysql.com +2 -2
    Updated project files for windows according to suggestions from Intel

  VC++Files/mysqlshutdown/mysqlshutdown.dsp
    1.6 03/11/22 03:21:37 monty@mysql.com +3 -3
    Updated project files for windows according to suggestions from Intel

  VC++Files/mysqlmanager/MySqlManager.dsp
    1.9 03/11/22 03:21:37 monty@mysql.com +2 -2
    Updated project files for windows according to suggestions from Intel

  VC++Files/myisampack/myisampack.dsp
    1.6 03/11/22 03:21:37 monty@mysql.com +5 -4
    Updated project files for windows according to suggestions from Intel

  VC++Files/myisamlog/myisamlog.dsp
    1.6 03/11/22 03:21:37 monty@mysql.com +2 -1
    Updated project files for windows according to suggestions from Intel

  VC++Files/myisamchk/myisamchk.dsp
    1.5 03/11/22 03:21:37 monty@mysql.com +5 -5
    Updated project files for windows according to suggestions from Intel

  VC++Files/libmysqld/libmysqld.dsp
    1.12 03/11/22 03:21:37 monty@mysql.com +3 -2
    Updated project files for windows according to suggestions from Intel

  VC++Files/libmysqld/examples/test_libmysqld.dsp
    1.5 03/11/22 03:21:37 monty@mysql.com +10 -9
    Updated project files for windows according to suggestions from Intel

  VC++Files/innobase/innobase.dsp
    1.11 03/11/22 03:21:37 monty@mysql.com +3 -3
    Updated project files for windows according to suggestions from Intel

  VC++Files/comp_err/comp_err.dsp
    1.5 03/11/22 03:21:37 monty@mysql.com +2 -1
    Updated project files for windows according to suggestions from Intel

  VC++Files/client/mysql.dsp
    1.9 03/11/22 03:21:37 monty@mysql.com +3 -3
    Updated project files for windows according to suggestions from Intel

ChangeSet
  1.1624 03/11/22 00:26:43 sergefp@mysql.com +1 -0
  Merge mysql.com:/home/psergey/mysql-5.0
  into mysql.com:/home/psergey/10-get-mysql5

  sql/sql_class.cc
    1.130 03/11/22 00:26:42 sergefp@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1623 03/11/22 00:20:48 sergefp@mysql.com +3 -0
  Post-merge fixes

  sql/sql_select.h
    1.62 03/11/22 00:20:45 sergefp@mysql.com +1 -1
    Post-merge fixes

  sql/opt_range.h
    1.30 03/11/22 00:20:45 sergefp@mysql.com +1 -1
    Post-merge fixes

  sql/opt_range.cc
    1.100 03/11/22 00:20:45 sergefp@mysql.com +26 -28
    Post-merge fixes

ChangeSet
  1.1618.1.1 03/11/21 20:52:18 bell@sanja.is.com.ua +1 -0
  warning number changed

  mysql-test/r/variables.result
    1.36 03/11/21 20:51:55 bell@sanja.is.com.ua +1 -1
    warning number changed

ChangeSet
  1.1616.4.11 03/11/21 12:35:33 paul@teton.kitebird.com +2 -0
  Change word order of a few PROCESSLIST messages to correspond
  to order used in START SLAVE syntax.

  sql/slave.cc
    1.188.1.28 03/11/21 12:35:27 paul@teton.kitebird.com +2 -2
    Change word order.

  sql/log.cc
    1.108.1.17 03/11/21 12:35:27 paul@teton.kitebird.com +1 -1
    Change word order.

ChangeSet
  1.1621.3.1 03/11/21 18:23:05 pem@mysql.comhem.se +5 -0
  Translated 5.0 error codes into sql states.

  sql/sql_yacc.yy
    1.253 03/11/21 18:23:03 pem@mysql.com +4 -4
    Referring to an unitialized variable is a warning, not an error.

  mysql-test/t/sp-error.test
    1.22 03/11/21 18:23:03 pem@mysql.com +1 -1
    Translated 5.0 error codes into sql states.

  mysql-test/r/sp-error.result
    1.21 03/11/21 18:23:03 pem@mysql.com +41 -39
    Translated 5.0 error codes into sql states.

  include/sql_state.h
    1.9 03/11/21 18:23:03 pem@mysql.com +33 -0
    Translated 5.0 error codes into sql states.

  include/mysqld_error.h
    1.83 03/11/21 18:23:02 pem@mysql.com +1 -0
    Marked where 5.0 error codes begin.

ChangeSet
  1.1616.9.1 03/11/21 19:16:19 konstantin@oak.local +2 -0
  added 'explicit' keyword to Bitmap constructor

  sql/sql_bitmap.h
    1.4 03/11/21 19:16:17 konstantin@mysql.com +2 -2
    added 'explicit' keyword to Bitmap constructor

  sql/ha_isammrg.cc
    1.13 03/11/21 19:16:17 konstantin@mysql.com +1 -1
    no Bitmap::operator=(ulonglong) present

ChangeSet
  1.1616.4.9 03/11/21 17:01:35 heikki@hundin.mysql.fi +2 -0
  os0file.c:
    Fix the OS error 2 reported by Miguel and Mark in Windows crash recovery: a * had been forgotten from the path in directory scanning
  ha_innodb.cc:
    Set default directory in fil0fil.c right if we are running the Embedded Server Library, where the default dir of the process is not necessarily the MySQL datadir

  innobase/os/os0file.c
    1.58 03/11/21 17:01:22 heikki@hundin.mysql.fi +1 -1
    Fix the OS error 2 reported by Miguel and Mark in Windows crash recovery: a * had been forgotten from the path in directory scanning

  sql/ha_innodb.cc
    1.90.1.15 03/11/21 17:00:17 heikki@hundin.mysql.fi +2 -0
    Set default directory in fil0fil.c right if we are running the Embedded Server Library, where the default dir of the process is not necessarily the MySQL datadir

ChangeSet
  1.1621.1.2 03/11/21 17:23:24 konstantin@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/kostja/mysql/mysql-5.0-root

  sql/sql_class.cc
    1.127.1.5 03/11/21 17:23:22 konstantin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1621.2.1 03/11/21 17:22:54 konstantin@oak.local +2 -0
  unused variable handler_items removed

  sql/sql_class.h
    1.166 03/11/21 17:22:29 konstantin@mysql.com +1 -1
    unused variable handler_items removed

  sql/sql_class.cc
    1.127.2.1 03/11/21 17:22:29 konstantin@mysql.com +0 -1
    unused variable handler_items removed

ChangeSet
  1.1621.1.1 03/11/21 14:00:40 pem@mysql.comhem.se +4 -0
  Made Item_splocal printable.

  sql/sql_yacc.yy
    1.252 03/11/21 14:00:38 pem@mysql.com +7 -2
    Made Item_splocal printable.

  sql/sql_class.cc
    1.127.1.4 03/11/21 14:00:38 pem@mysql.com +1 -1
    Made Item_splocal printable.

  sql/sp_head.cc
    1.53 03/11/21 14:00:38 pem@mysql.com +18 -3
    Fixed bug that showed up when using running with --debug.

  sql/item.h
    1.71 03/11/21 14:00:38 pem@mysql.com +8 -2
    Made Item_splocal printable.

ChangeSet
  1.1616.4.8 03/11/21 14:41:57 monty@mysql.com +6 -0
  Fixed memory leak with RAID tables
  Fixed tests for RAID tables
  Detect uninitialized mutexes on lock and destroy

  sql/sql_db.cc
    1.68.1.22 03/11/21 14:41:55 monty@mysql.com +9 -3
    Fixed memory leak with RAID tables

  mysys/thr_mutex.c
    1.24 03/11/21 14:41:55 monty@mysql.com +12 -2
    Detect uninitialized mutexes on lock and destroy

  mysys/mf_iocache.c
    1.38 03/11/21 14:41:55 monty@mysql.com +53 -9
    Comments
    Small safety fix

  mysql-test/t/raid.test
    1.7 03/11/21 14:41:55 monty@mysql.com +2 -1
    Clean up test

  mysql-test/r/rpl_change_master.result
    1.3 03/11/21 14:41:55 monty@mysql.com +2 -2
    Update results missing from last patch

  mysql-test/r/raid.result
    1.6 03/11/21 14:41:55 monty@mysql.com +4 -4
    Updated results

ChangeSet
  1.1346.421.4 03/11/21 13:22:49 lenz@mysql.com +1 -0
   - removed dependency on MySQL-client from the MySQL-devel RPM subpackage
     as it is not really required. (BUG 1610) Thanks to Scott Harrison for
     the suggestion.

  support-files/mysql.spec.sh
    1.61.1.11 03/11/21 13:22:46 lenz@mysql.com +5 -1
     - removed dependency on MySQL-client from the MySQL-devel subpackage
       as it is not really required. (BUG 1610)

ChangeSet
  1.1616.4.7 03/11/21 12:22:51 monty@mysql.com +2 -0
  Added missing file keycache.h

  include/Makefile.am
    1.43 03/11/21 12:22:49 monty@mysql.com +1 -1
    Added missing file keycache.h

  BUILD/compile-pentium-debug-max
    1.12 03/11/21 12:22:49 monty@mysql.com +1 -1
    s 

ChangeSet
  1.1616.4.6 03/11/21 11:58:28 hf@deer.(none) +3 -0
  Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into deer.(none):/home/hf/work/mysql-4.1.1727

  sql/sql_lex.cc
    1.96 03/11/21 11:58:25 hf@deer.(none) +0 -0
    Auto merged

  mysql-test/t/derived.test
    1.30 03/11/21 11:58:25 hf@deer.(none) +0 -0
    Auto merged

  mysql-test/r/derived.result
    1.32 03/11/21 11:58:25 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1616.4.5 03/11/20 21:16:45 paul@ice.snake.net +3 -0
  Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
  into ice.snake.net:/Users/paul/mysql-4.1

  sql/sql_repl.cc
    1.102.1.18 03/11/20 21:16:35 paul@ice.snake.net +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.32.1.11 03/11/20 21:16:34 paul@ice.snake.net +0 -0
    Auto merged

  mysql-test/r/rpl_loaddata.result
    1.20 03/11/20 21:16:34 paul@ice.snake.net +0 -0
    Auto merged

ChangeSet
  1.1616.8.4 03/11/21 01:53:01 monty@mysql.com +24 -0
  Update VC++ files
  Portability fixes
  After merge fixes

  strings/ctype-tis620.c
    1.54 03/11/21 01:52:57 monty@mysql.com +4 -4
    Remove not used variables

  sql/sql_table.cc
    1.157.2.23 03/11/21 01:52:57 monty@mysql.com +1 -2
    Remove not used define

  sql/sql_select.h
    1.60.1.1 03/11/21 01:52:57 monty@mysql.com +17 -5
    Added comments

  sql/sql_repl.cc
    1.102.6.3 03/11/21 01:52:57 monty@mysql.com +3 -2
    After merge fix

  sql/sql_prepare.cc
    1.34.1.23 03/11/21 01:52:57 monty@mysql.com +0 -1
    Remove not used variables

  sql/set_var.cc
    1.34.1.42 03/11/21 01:52:57 monty@mysql.com +1 -1
    Remove compiler warnings

  sql/item_timefunc.cc
    1.50 03/11/21 01:52:57 monty@mysql.com +15 -15
    Remove compiler warnings

  sql/item.cc
    1.58.1.42 03/11/21 01:52:57 monty@mysql.com +1 -1
    Fixed wrong patch from last changeset

  sql/ha_myisam.cc
    1.115.1.15 03/11/21 01:52:57 monty@mysql.com +4 -7
    Remove compiler warning

  mysys/my_getopt.c
    1.40 03/11/21 01:52:57 monty@mysql.com +1 -3
    Remove not used variable

  mysys/mf_keycache.c
    1.36 03/11/21 01:52:57 monty@mysql.com +3 -5
    Removed not used 'action' element

  mysys/default.c
    1.35 03/11/21 01:52:57 monty@mysql.com +1 -0
    Remove compiler warning

  mysql-test/t/rpl_change_master.test
    1.2 03/11/21 01:52:57 monty@mysql.com +2 -0
    Make test repeatable

  mysql-test/t/count_distinct3.test
    1.2 03/11/21 01:52:57 monty@mysql.com +3 -0
    Faster test

  mysql-test/r/rpl_change_master.result
    1.2 03/11/21 01:52:57 monty@mysql.com +6 -6
    updated results

  mysql-test/r/count_distinct3.result
    1.2 03/11/21 01:52:57 monty@mysql.com +1 -0
    Faster test

  myisam/mi_keycache.c
    1.6 03/11/21 01:52:57 monty@mysql.com +6 -0
    Added mutex for extra safety

  include/my_base.h
    1.49 03/11/21 01:52:57 monty@mysql.com +0 -1
    Removed not used define

  include/m_ctype.h
    1.81 03/11/21 01:52:57 monty@mysql.com +8 -0
    Portability fix

  include/keycache.h
    1.2 03/11/21 01:52:57 monty@mysql.com +0 -3
    Removed not used element

  client/mysqltest.c
    1.92.1.18 03/11/21 01:52:57 monty@mysql.com +4 -9
    Remove not used variables

  client/mysqlcheck.c
    1.33 03/11/21 01:52:57 monty@mysql.com +2 -0
    Added comment

  VC++Files/mysys/mysys.dsp
    1.16 03/11/21 01:52:57 monty@mysql.com +4 -0
    Add missing files

  VC++Files/mysql.dsw
    1.11 03/11/21 01:52:57 monty@mysql.com +9 -0
    Added dependencys

ChangeSet
  1.1616.8.3 03/11/21 00:17:46 monty@mysql.com +4 -0
  Merge with 4.0 to revert patch for BIGINT assignment to double

  sql/item.h
    1.56.1.45 03/11/21 00:17:44 monty@mysql.com +0 -0
    Merge with 4.0 to revert patch for BIGINT assignment to double

  sql/item.cc
    1.58.1.41 03/11/21 00:17:44 monty@mysql.com +8 -0
    Merge with 4.0 to revert patch for BIGINT assignment to double

ChangeSet
  1.1346.423.2 03/11/20 23:15:07 serg@serg.mylan +3 -0
  yet another trunc* bug

  mysql-test/t/fulltext.test
    1.34.2.7 03/11/20 23:15:05 serg@serg.mylan +1 -0
    yet another trunc* bug

  mysql-test/r/fulltext.result
    1.29.1.13 03/11/20 23:15:05 serg@serg.mylan +3 -0
    yet another trunc* bug

  myisam/ft_boolean_search.c
    1.47.1.11 03/11/20 23:15:05 serg@serg.mylan +33 -20
    yet another trunc* bug

  mysql-test/t/bigint.test
    1.19 03/11/21 00:14:38 monty@mysql.com +0 -0
    Auto merged

  mysql-test/r/bigint.result
    1.21 03/11/21 00:14:38 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.421.2 03/11/21 00:11:50 monty@mysql.com +4 -0
  Revert patch for bigint handling in double context as it broke normal bigint handling
  The right way to fix this is to change the Field::store(longlong) method to be
  Field::store(longlong, bool unsigned_flag), but this is better to do in 4.1 than in 4.0

  sql/item.h
    1.20.1.22 03/11/21 00:11:47 monty@mysql.com +0 -1
    Revert patch for bigint handling in double context as it broke normal bigint handling

  sql/item.cc
    1.19.1.14 03/11/21 00:11:47 monty@mysql.com +0 -12
    Revert patch for bigint handling in double context as it broke normal bigint handling

  mysql-test/t/bigint.test
    1.12.1.6 03/11/21 00:11:47 monty@mysql.com +3 -1
    New tests to show how the last bigint patch broke MySQL

  mysql-test/r/bigint.result
    1.14.1.5 03/11/21 00:11:47 monty@mysql.com +7 -1
    New tests to show how the last bigint patch broke MySQL

ChangeSet
  1.1346.423.1 03/11/20 23:07:31 serg@serg.mylan +2 -0
  Merge

  mysql-test/t/fulltext.test
    1.34.2.6 03/11/20 23:07:29 serg@serg.mylan +0 -0
    SCCS merged

  mysql-test/r/fulltext.result
    1.29.1.12 03/11/20 23:07:29 serg@serg.mylan +0 -0
    SCCS merged

ChangeSet
  1.1622 03/11/21 00:27:54 sergefp@mysql.com +9 -0
  Merged, most likely needs post-merge fix

  sql/sql_select.cc
    1.231 03/11/21 00:27:51 sergefp@mysql.com +2 -3
    Merged

  sql/opt_range.cc
    1.99 03/11/21 00:27:51 sergefp@mysql.com +7 -10
    Merged

ChangeSet
  1.1346.416.2 03/11/20 22:20:54 serg@sergbook.mylan +2 -0
  more left join tests

  mysql-test/t/fulltext_left_join.test
    1.6.1.2 03/11/20 22:20:51 serg@sergbook.mylan +2 -0
    more left join tests

  mysql-test/r/fulltext_left_join.result
    1.10 03/11/20 22:20:51 serg@sergbook.mylan +8 -0
    more left join tests

ChangeSet
  1.1346.422.1 03/11/21 00:03:04 konstantin@mysql.com +3 -0
  fix for bug #1790: 
  "BIT_AND() result in GROUP BY different when SQL_BIG_RESULT used"
  
  return value of BIT_AND changed to BIGINT SIGNED
  Also the patch fixes another bug: when temporary table is in use and one of
  values in group is NULL, BIT_AND always returns zero.
  Fixed it to always skip null values.

  sql/item_sum.h
    1.15.1.8 03/11/21 00:03:02 konstantin@mysql.com +17 -5
    fix for bug #1790:
    Item_sum::update_field() and Item_sum::reset_field() commented
    Item_sum_and changed to return BIGINT SIGNED
    Item_sum_and::update_field() and Item_sum_or::update_field)
    were replaced with generic Item_sum_bit::update_field()

  sql/item_sum.cc
    1.25.1.10 03/11/21 00:03:02 konstantin@mysql.com +12 -24
    fix for bug #1790:
    update_field() rewritten to use add() and thus was moved
    to Item_sum_bit::update_field()
    Item_sum_bit::reset_field() was rewritten to take into account
    reset_bits.

  mysql-test/r/func_group.result
    1.6.1.4 03/11/21 00:03:02 konstantin@mysql.com +7 -7
    bug #1790: test results fixed

  sql/sql_update.cc
    1.97 03/11/20 23:37:15 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_union.cc
    1.83 03/11/20 23:37:15 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_test.cc
    1.29.1.1 03/11/20 23:37:15 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_select.h
    1.61 03/11/20 23:37:15 sergefp@mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.129 03/11/20 23:37:14 sergefp@mysql.com +0 -0
    Auto merged

  sql/opt_range.h
    1.29 03/11/20 23:37:14 sergefp@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.250 03/11/20 23:36:59 sergefp@mysql.com +1 -2
    auto-union

ChangeSet
  1.1616.8.2 03/11/20 22:30:48 monty@mysql.com +13 -0
  Merge with 4.0 to get:
  Fix for storing negative values in decimal fields
  Fix for FLUSH TABLE with HANDLER

  sql/sql_select.cc
    1.216.1.63 03/11/20 22:30:46 monty@mysql.com +0 -15
    Used original file.
    (Comments moved to sql/sql_select.h)

  sql/sql_repl.cc
    1.102.6.2 03/11/20 22:30:46 monty@mysql.com +1 -2
    Merge with 4.0

  sql/sql_handler.cc
    1.44 03/11/20 22:30:46 monty@mysql.com +3 -3
    Merge with 4.0 to get fix for FLUSH TABLE with HANDLER

  sql/item.h
    1.56.1.44 03/11/20 22:30:46 monty@mysql.com +1 -2
    Merge with 4.0 to get fix for storing negative values in decimal fields

  sql/item.cc
    1.58.1.40 03/11/20 22:30:45 monty@mysql.com +7 -5
    Merge with 4.0 to get fix for storing negative values in decimal fields

  mysql-test/r/rpl_loaddata.result
    1.17.1.1 03/11/20 22:30:45 monty@mysql.com +1 -2
    Merge with 4.0

ChangeSet
  1.1578.31.2 03/11/20 23:27:11 sergefp@mysql.com +10 -0
  logging_ok:
    Logging to logging@openlogging.org accepted
  sql_union.cc, sql_select.cc, opt_range.h, opt_range.cc, opt_ft.h:
    Post-merge fixes
  Many files:
    new file

  BitKeeper/etc/logging_ok
    1.249 03/11/20 23:25:23 sergefp@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  mysql-test/t/index_merge_innodb.test
    1.1 03/11/20 23:24:49 sergefp@mysql.com +54 -0

  mysql-test/t/index_merge.test
    1.1 03/11/20 23:24:49 sergefp@mysql.com +267 -0

  mysql-test/r/index_merge_innodb.result
    1.1 03/11/20 23:24:49 sergefp@mysql.com +55 -0

  mysql-test/r/index_merge.result
    1.1 03/11/20 23:24:49 sergefp@mysql.com +312 -0

  sql/sql_union.cc
    1.82 03/11/20 23:24:49 sergefp@mysql.com +1 -2
    Post-merge fixes

  mysql-test/t/index_merge_innodb.test
    1.0 03/11/20 23:24:49 sergefp@mysql.com +0 -0
    BitKeeper file /home/psergey/10-get-mysql5/mysql-test/t/index_merge_innodb.test

  mysql-test/t/index_merge.test
    1.0 03/11/20 23:24:49 sergefp@mysql.com +0 -0
    BitKeeper file /home/psergey/10-get-mysql5/mysql-test/t/index_merge.test

  mysql-test/r/index_merge_innodb.result
    1.0 03/11/20 23:24:49 sergefp@mysql.com +0 -0
    BitKeeper file /home/psergey/10-get-mysql5/mysql-test/r/index_merge_innodb.result

  mysql-test/r/index_merge.result
    1.0 03/11/20 23:24:49 sergefp@mysql.com +0 -0
    BitKeeper file /home/psergey/10-get-mysql5/mysql-test/r/index_merge.result

  sql/sql_select.cc
    1.230 03/11/20 23:24:48 sergefp@mysql.com +1 -1
    Post-merge fixes

  sql/opt_range.h
    1.24.1.4 03/11/20 23:24:48 sergefp@mysql.com +3 -4
    Post-merge fixes

  sql/opt_range.cc
    1.90.5.2 03/11/20 23:24:48 sergefp@mysql.com +22 -15
    Post-merge fixes

  sql/opt_ft.h
    1.7 03/11/20 23:24:48 sergefp@mysql.com +2 -0
    Post-merge fixes

  mysql-test/t/user_var.test
    1.10 03/11/20 22:14:21 monty@mysql.com +0 -0
    Auto merged

  mysql-test/t/bigint.test
    1.18 03/11/20 22:14:21 monty@mysql.com +0 -0
    Auto merged

  mysql-test/r/user_var.result
    1.14 03/11/20 22:14:21 monty@mysql.com +0 -0
    Auto merged

  mysql-test/r/bigint.result
    1.20 03/11/20 22:14:21 monty@mysql.com +0 -0
    Auto merged

  myisam/mi_check.c
    1.105.1.12 03/11/20 22:14:21 monty@mysql.com +0 -0
    Auto merged

  libmysql_r/Makefile.am
    1.11 03/11/20 22:14:21 monty@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/ignore
    1.153.1.17 03/11/20 22:14:15 monty@mysql.com +0 -1
    auto-union

ChangeSet
  1.1616.8.1 03/11/20 22:07:02 monty@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/my/mysql-4.1

  sql/item_cmpfunc.cc
    1.111.1.4 03/11/20 22:07:00 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1616.7.1 03/11/20 22:06:25 monty@mysql.com +93 -0
  Merge key cache structures to one
  Fixed compiler warnings (IRIX C compiler and VC++)

  include/keycache.h
    1.1 03/11/20 22:06:20 monty@mysql.com +134 -0

  strings/my_strtoll10.c
    1.6 03/11/20 22:06:20 monty@mysql.com +1 -1
    Fixed compiler warnings

  sql/time.cc
    1.37 03/11/20 22:06:20 monty@mysql.com +0 -1
    Remove not used variables

  sql/strfunc.cc
    1.2 03/11/20 22:06:20 monty@mysql.com +1 -1
    Fixed that find_type() returns correct value for partly matched words.
    (This fixed the error found by date_formats.test)

  sql/sql_test.cc
    1.30 03/11/20 22:06:20 monty@mysql.com +7 -7
    Merge key cache structures to one

  sql/sql_table.cc
    1.157.2.22 03/11/20 22:06:20 monty@mysql.com +4 -6
    Merge key cache structures to one
    Removed not used variables

  sql/sql_show.cc
    1.122.4.14 03/11/20 22:06:20 monty@mysql.com +0 -2
    Remove not used variables

  sql/sql_select.cc
    1.216.1.62 03/11/20 22:06:20 monty@mysql.com +1 -3
    Remove not used variables

  sql/sql_repl.cc
    1.102.6.1 03/11/20 22:06:20 monty@mysql.com +0 -2
    Remove not used variables

  sql/sql_prepare.cc
    1.34.1.22 03/11/20 22:06:20 monty@mysql.com +1 -1
    Remove not used variables

  sql/sql_parse.cc
    1.271.45.1 03/11/20 22:06:20 monty@mysql.com +1 -2
    Remove not used variables

  include/keycache.h
    1.0 03/11/20 22:06:20 monty@mysql.com +0 -0
    BitKeeper file /my/mysql-4.1/include/keycache.h

  sql/sql_lex.cc
    1.94.3.1 03/11/20 22:06:19 monty@mysql.com +3 -3
    Remove not used variables

  sql/sql_insert.cc
    1.86.2.24 03/11/20 22:06:19 monty@mysql.com +12 -12
    More DBUG statements
    Simple code cleanup

  sql/sql_handler.cc
    1.43 03/11/20 22:06:19 monty@mysql.com +0 -1
    Remove not used variables

  sql/sql_db.cc
    1.68.1.21 03/11/20 22:06:19 monty@mysql.com +0 -1
    Remove not used variables

  sql/sql_base.cc
    1.145.1.21 03/11/20 22:06:19 monty@mysql.com +0 -1
    Remove not used function

  sql/sql_acl.cc
    1.74.8.1 03/11/20 22:06:19 monty@mysql.com +3 -3
    Remove not used variables

  sql/set_var.h
    1.39 03/11/20 22:06:19 monty@mysql.com +6 -6
    Merge key cache structures to one

  sql/set_var.cc
    1.34.1.41 03/11/20 22:06:19 monty@mysql.com +29 -30
    Merge key cache structures to one

  sql/repl_failsafe.cc
    1.32.7.1 03/11/20 22:06:19 monty@mysql.com +0 -1
    Remove not used variables

  sql/protocol_cursor.cc
    1.1.1.1 03/11/20 22:06:19 monty@mysql.com +3 -3
    Remove not used variable
    Simple optimization

  sql/protocol.cc
    1.56.1.20 03/11/20 22:06:19 monty@mysql.com +2 -0
    Don't send errors after ok has been sent

  sql/opt_sum.cc
    1.33 03/11/20 22:06:19 monty@mysql.com +0 -1
    Remove not used variables

  sql/mysqld.cc
    1.356.1.65 03/11/20 22:06:19 monty@mysql.com +21 -22
    Merge key cache structures to one
    init_thread_environment() is not called before mysql_init_variables(). This fixes a case where a mutex was not initialized before it was used

  sql/mysql_priv.h
    1.186.1.50 03/11/20 22:06:19 monty@mysql.com +3 -6
    Merge key cache structures to one

  sql/item_timefunc.cc
    1.49 03/11/20 22:06:19 monty@mysql.com +3 -4
    Removed not used variables

  sql/item_sum.cc
    1.89.1.5 03/11/20 22:06:19 monty@mysql.com +3 -3
    Removed not used variables
    Moved setting of item_thd to fix_fields()

  sql/item_strfunc.cc
    1.148 03/11/20 22:06:19 monty@mysql.com +1 -4
    Removed not used variables

  sql/item_func.cc
    1.124.1.44 03/11/20 22:06:19 monty@mysql.com +0 -3
    Remove not used variables

  sql/item_cmpfunc.cc
    1.111.2.1 03/11/20 22:06:19 monty@mysql.com +7 -6
    Remove not used variables

  sql/item.cc
    1.58.1.39 03/11/20 22:06:19 monty@mysql.com +1 -1
    Fixed compiler warning

  sql/handler.h
    1.89.1.1 03/11/20 22:06:19 monty@mysql.com +8 -8
    Merge key cache structures to one

  sql/handler.cc
    1.103.1.1 03/11/20 22:06:19 monty@mysql.com +30 -23
    Merge key cache structures to one

  sql/ha_myisammrg.cc
    1.47 03/11/20 22:06:19 monty@mysql.com +2 -3
    Removed not used variables

  sql/ha_myisam.cc
    1.115.1.14 03/11/20 22:06:18 monty@mysql.com +1 -2
    Merge key cache structures to one

  sql/ha_innodb.cc
    1.90.1.14 03/11/20 22:06:18 monty@mysql.com +1 -3
    Fixed compiler warnings (removed not used variables)

  sql/field.cc
    1.121 03/11/20 22:06:18 monty@mysql.com +1 -2
    Removed not used variables

  sql/derror.cc
    1.18 03/11/20 22:06:18 monty@mysql.com +1 -0
    Added comment

  sql-common/client.c
    1.38 03/11/20 22:06:18 monty@mysql.com +9 -8
    Remove STDCALL from internal functions

  mysys/thr_mutex.c
    1.23 03/11/20 22:06:18 monty@mysql.com +17 -6
    Added test if mutex is initalized

  mysys/mf_keycaches.c
    1.2 03/11/20 22:06:18 monty@mysql.com +8 -7
    Merge key cache structures to one

  mysys/mf_keycache.c
    1.35 03/11/20 22:06:18 monty@mysql.com +192 -260
    Merge key cache structures to one
    Fixed key_cache_read() and key_cache_write() to be resize-safe.

  mysys/hash.c
    1.30 03/11/20 22:06:18 monty@mysql.com +5 -0
    Made HASH_LINK struct local

  mysql-test/t/symlink.test
    1.8 03/11/20 22:06:18 monty@mysql.com +2 -2
    Updated error numbers

  mysql-test/t/case.test
    1.13 03/11/20 22:06:18 monty@mysql.com +2 -1
    New test

  mysql-test/r/symlink.result
    1.11.1.1 03/11/20 22:06:18 monty@mysql.com +2 -2
    Updated results after adding DEFAULT CHARSET
    

  mysql-test/r/date_formats.result
    1.4 03/11/20 22:06:18 monty@mysql.com +4 -4
    Updated results after fixing date handling

  mysql-test/r/case.result
    1.12 03/11/20 22:06:18 monty@mysql.com +11 -9
    Updated results after fix of correct NULL detection in WHEN 

  myisam/sp_test.c
    1.8 03/11/20 22:06:18 monty@mysql.com +4 -3
    Fixed compiler warnings

  myisam/sort.c
    1.35.1.2 03/11/20 22:06:18 monty@mysql.com +13 -9
    Fixed compiler warnings

  myisam/myisamlog.c
    1.25 03/11/20 22:06:18 monty@mysql.com +5 -8
    Merge key cache structures to one
    Removed not used option

  myisam/myisamdef.h
    1.59.1.12 03/11/20 22:06:18 monty@mysql.com +2 -2
    Merge key cache structures to one

  myisam/myisamchk.c
    1.92.1.14 03/11/20 22:06:18 monty@mysql.com +7 -7
    Merge key cache structures to one

  myisam/mi_test3.c
    1.14 03/11/20 22:06:18 monty@mysql.com +1 -1
    Merge key cache structures to one

  myisam/mi_test2.c
    1.25 03/11/20 22:06:18 monty@mysql.com +3 -3
    Merge key cache structures to one

  myisam/mi_test1.c
    1.20 03/11/20 22:06:18 monty@mysql.com +1 -1
    Merge key cache structures to one

  myisam/mi_preload.c
    1.7 03/11/20 22:06:18 monty@mysql.com +3 -3
    Merge key cache structures to one

  myisam/mi_panic.c
    1.10 03/11/20 22:06:18 monty@mysql.com +1 -1
    Merge key cache structures to one

  myisam/mi_page.c
    1.18 03/11/20 22:06:18 monty@mysql.com +4 -4
    Merge key cache structures to one

  myisam/mi_locking.c
    1.32 03/11/20 22:06:18 monty@mysql.com +2 -2
    Merge key cache structures to one

  myisam/mi_keycache.c
    1.5 03/11/20 22:06:18 monty@mysql.com +10 -10
    Merge key cache structures to one

  myisam/mi_extra.c
    1.38 03/11/20 22:06:18 monty@mysql.com +2 -2
    Merge key cache structures to one

  myisam/mi_delete_all.c
    1.15 03/11/20 22:06:18 monty@mysql.com +1 -1
    Merge key cache structures to one

  myisam/mi_close.c
    1.17 03/11/20 22:06:18 monty@mysql.com +1 -1
    Merge key cache structures to one

  myisam/mi_check.c
    1.105.1.11 03/11/20 22:06:18 monty@mysql.com +17 -16
    Merge key cache structures to one

  myisam/ft_update.c
    1.33 03/11/20 22:06:18 monty@mysql.com +3 -3
    Fixed compiler warnings

  myisam/ft_dump.c
    1.23 03/11/20 22:06:18 monty@mysql.com +5 -5
    Fixed compiler warnings (%qx is not portable)

  myisam/ft_boolean_search.c
    1.67 03/11/20 22:06:18 monty@mysql.com +2 -1
    Fixed compiler warning

  libmysql/libmysql.c
    1.156.1.40 03/11/20 22:06:18 monty@mysql.com +9 -8
    Remove STDCALL from internal functions

  libmysql/client_settings.h
    1.15 03/11/20 22:06:18 monty@mysql.com +9 -9
    Remove STDCALL from internal functions

  isam/test3.c
    1.12 03/11/20 22:06:18 monty@mysql.com +2 -1
    Merge key cache structures to one

  isam/test2.c
    1.15 03/11/20 22:06:17 monty@mysql.com +2 -2
    Merge key cache structures to one

  isam/panic.c
    1.7 03/11/20 22:06:17 monty@mysql.com +1 -1
    Merge key cache structures to one

  isam/isamlog.c
    1.14 03/11/20 22:06:17 monty@mysql.com +4 -4
    Merge key cache structures to one

  isam/isamdef.h
    1.14 03/11/20 22:06:17 monty@mysql.com +1 -0
    Merge key cache structures to one

  isam/isamchk.c
    1.26 03/11/20 22:06:17 monty@mysql.com +6 -8
    Merge key cache structures to one

  isam/extra.c
    1.12 03/11/20 22:06:17 monty@mysql.com +1 -1
    Merge key cache structures to one

  isam/close.c
    1.8 03/11/20 22:06:17 monty@mysql.com +1 -1
    Merge key cache structures to one

  isam/_page.c
    1.10 03/11/20 22:06:17 monty@mysql.com +4 -4
    Merge key cache structures to one

  isam/_locking.c
    1.9 03/11/20 22:06:17 monty@mysql.com +2 -2
    Merge key cache structures to one

  include/violite.h
    1.34 03/11/20 22:06:17 monty@mysql.com +1 -1
    Fixed compiler warning

  include/sql_common.h
    1.9 03/11/20 22:06:17 monty@mysql.com +1 -1
    Remove STDCALL from internal functions

  include/mysql.h
    1.102 03/11/20 22:06:17 monty@mysql.com +22 -22
    Remove STDCALL from internal functions

  include/myisam.h
    1.55 03/11/20 22:06:17 monty@mysql.com +6 -3
    Merge key cache structures to one

  include/my_sys.h
    1.114 03/11/20 22:06:17 monty@mysql.com +0 -65
    Moved key cache structs and functions to keycache.h

  include/my_pthread.h
    1.65.1.6 03/11/20 22:06:17 monty@mysql.com +2 -2
    Made some structs 'const char*' to avoid warnings

  include/hash.h
    1.13 03/11/20 22:06:17 monty@mysql.com +6 -5
    Move not used (internal) struct to hash.c

  heap/hp_test2.c
    1.21 03/11/20 22:06:17 monty@mysql.com +6 -5
    Fixed wrong call to heap_rkey()

  heap/hp_test1.c
    1.14 03/11/20 22:06:17 monty@mysql.com +2 -2
    Fixed wrong call to heap_rkey()

  VC++Files/mysys/mysys.dsp
    1.15 03/11/20 22:06:17 monty@mysql.com +4 -0
    Add missing file to project

  VC++Files/myisam/myisam.dsp
    1.8 03/11/20 22:06:17 monty@mysql.com +7 -3
    Add missing file to project

  VC++Files/libmysql/libmysql.dsp
    1.18 03/11/20 22:06:17 monty@mysql.com +4 -0
    Add missing file to project

  VC++Files/client/mysqlclient.dsp
    1.18 03/11/20 22:06:17 monty@mysql.com +4 -0
    Add missing file to project

ChangeSet
  1.1616.6.3 03/11/20 13:49:05 paul@ice.snake.net +7 -0
  Use same style for SHOW MASTER STATUS fields as
  for SHOW SLAVE STATUS.

  sql/sql_repl.cc
    1.102.1.17 03/11/20 13:48:58 paul@ice.snake.net +2 -2
    Use same style for SHOW MASTER STATUS fields as
    for SHOW SLAVE STATUS.

  sql/repl_failsafe.cc
    1.32.1.10 03/11/20 13:48:58 paul@ice.snake.net +1 -1
    Use same style for SHOW MASTER STATUS fields as
    for SHOW SLAVE STATUS.

  mysql-test/r/rpl_rotate_logs.result
    1.51 03/11/20 13:48:58 paul@ice.snake.net +1 -1
    Use same style for SHOW MASTER STATUS fields as
    for SHOW SLAVE STATUS.

  mysql-test/r/rpl_max_relay_size.result
    1.11 03/11/20 13:48:57 paul@ice.snake.net +1 -1
    Use same style for SHOW MASTER STATUS fields as
    for SHOW SLAVE STATUS.

  mysql-test/r/rpl_log_pos.result
    1.38 03/11/20 13:48:57 paul@ice.snake.net +2 -2
    Use same style for SHOW MASTER STATUS fields as
    for SHOW SLAVE STATUS.

  mysql-test/r/rpl_loaddata.result
    1.19 03/11/20 13:48:57 paul@ice.snake.net +2 -2
    Use same style for SHOW MASTER STATUS fields as
    for SHOW SLAVE STATUS.

  mysql-test/r/rpl000015.result
    1.30 03/11/20 13:48:57 paul@ice.snake.net +1 -1
    Use same style for SHOW MASTER STATUS fields as
    for SHOW SLAVE STATUS.

ChangeSet
  1.1616.6.2 03/11/20 13:07:25 paul@ice.snake.net +18 -0
  Write slave status field names using consistent style.
  (Initial caps for each word.) For example, instead of writing
  Until_condition, Until_Log_File, and Until_log_pos, write
  Until_Condition, Until_Log_File, and Until_Log_pos.

  sql/slave.cc
    1.188.1.27 03/11/20 13:07:18 paul@ice.snake.net +16 -16
    Write slave status field names using consistent style.

  mysql-test/t/rpl_max_relay_size.test
    1.7 03/11/20 13:07:18 paul@ice.snake.net +1 -1
    Write slave status field names using consistent style.

  mysql-test/t/mix_innodb_myisam_binlog.test
    1.4 03/11/20 13:07:18 paul@ice.snake.net +1 -1
    Write slave status field names using consistent style.

  mysql-test/r/rpl_until.result
    1.8 03/11/20 13:07:18 paul@ice.snake.net +4 -4
    Write slave status field names using consistent style.

  mysql-test/r/rpl_trunc_binlog.result
    1.8 03/11/20 13:07:18 paul@ice.snake.net +1 -1
    Write slave status field names using consistent style.

  mysql-test/r/rpl_rotate_logs.result
    1.50 03/11/20 13:07:18 paul@ice.snake.net +3 -3
    Write slave status field names using consistent style.

  mysql-test/r/rpl_reset_slave.result
    1.8 03/11/20 13:07:17 paul@ice.snake.net +4 -4
    Write slave status field names using consistent style.

  mysql-test/r/rpl_replicate_do.result
    1.21 03/11/20 13:07:17 paul@ice.snake.net +1 -1
    Write slave status field names using consistent style.

  mysql-test/r/rpl_redirect.result
    1.14 03/11/20 13:07:17 paul@ice.snake.net +1 -1
    Write slave status field names using consistent style.

  mysql-test/r/rpl_openssl.result
    1.6 03/11/20 13:07:17 paul@ice.snake.net +2 -2
    Write slave status field names using consistent style.

  mysql-test/r/rpl_max_relay_size.result
    1.10 03/11/20 13:07:17 paul@ice.snake.net +6 -6
    Write slave status field names using consistent style.

  mysql-test/r/rpl_log_pos.result
    1.37 03/11/20 13:07:17 paul@ice.snake.net +4 -4
    Write slave status field names using consistent style.

  mysql-test/r/rpl_log.result
    1.50 03/11/20 13:07:16 paul@ice.snake.net +1 -1
    Write slave status field names using consistent style.

  mysql-test/r/rpl_loaddata.result
    1.18 03/11/20 13:07:16 paul@ice.snake.net +3 -3
    Write slave status field names using consistent style.

  mysql-test/r/rpl_flush_log_loop.result
    1.13 03/11/20 13:07:16 paul@ice.snake.net +1 -1
    Write slave status field names using consistent style.

  mysql-test/r/rpl_error_ignored_table.result
    1.8 03/11/20 13:07:16 paul@ice.snake.net +1 -1
    Write slave status field names using consistent style.

  mysql-test/r/rpl_empty_master_crash.result
    1.13 03/11/20 13:07:16 paul@ice.snake.net +1 -1
    Write slave status field names using consistent style.

  mysql-test/r/rpl000015.result
    1.29 03/11/20 13:07:16 paul@ice.snake.net +4 -4
    Write slave status field names using consistent style.

ChangeSet
  1.1616.6.1 03/11/20 12:55:07 paul@ice.snake.net +1 -0
  Typo.

  mysql-test/mysql-test-run.sh
    1.167.1.15 03/11/20 12:55:01 paul@ice.snake.net +1 -1
    Typo.

ChangeSet
  1.1346.421.1 03/11/20 21:21:56 konstantin@mysql.com +1 -0
  added comments to simple_order, simple_group, no_order, skip_sort_order

  sql/sql_select.cc
    1.152.1.112 03/11/20 21:21:55 konstantin@mysql.com +15 -2
    added comments to simple_order, simple_group, no_order, skip_sort_order

ChangeSet
  1.1616.4.3 03/11/20 20:06:51 jani@ua167d18.elisa.omakaista.fi +2 -0
  Added error reporting if one of the multi queries failed.

  BitKeeper/etc/logging_ok
    1.233.1.35 03/11/20 20:06:51 jani@ua167d18.elisa.omakaista.fi +1 -0
    Logging to logging@openlogging.org accepted

  client/mysql.cc
    1.121.1.27 03/11/20 20:06:13 jani@ua167d18.elisa.omakaista.fi +5 -2
    Added error reporting if one of the multi queries failed.

ChangeSet
  1.1621 03/11/20 18:30:02 pem@mysql.comhem.se +3 -0
  Fixed BUG#1874: Don't call fix_fields() indiscriminately, it resets null_value
  for some items, which made aggregates like MIN(), MAX() and SUM() fail.

  sql/sp_head.cc
    1.52 03/11/20 18:30:00 pem@mysql.com +27 -10
    Fixed BUG#1874: Don't call fix_fields() indiscriminately, it resets null_value
    for some items, which made aggregates like MIN(), MAX() and SUM() fail.

  mysql-test/t/sp.test
    1.38 03/11/20 18:30:00 pem@mysql.com +28 -3
    Test case for aggregate functions in SELECT INTO. (BUG#1874)

  mysql-test/r/sp.result
    1.37 03/11/20 18:29:59 pem@mysql.com +27 -3
    Test case for aggregate functions in SELECT INTO. (BUG#1874)

ChangeSet
  1.1346.417.7 03/11/20 18:12:49 bell@sanja.is.com.ua +3 -0
  database invalidation invalidate queries only of given database (BUG#1898)

  sql/sql_cache.cc
    1.29.1.28 03/11/20 18:12:35 bell@sanja.is.com.ua +28 -6
    database invalidation invalidate queries only of given database
    every freed block header marked as FREE even if it will be merged to make moving & deleting tables block safe
    layout fixed (too long line)

  mysql-test/t/query_cache.test
    1.16.1.12 03/11/20 18:12:35 bell@sanja.is.com.ua +4 -0
    test of drop database

  mysql-test/r/query_cache.result
    1.15.1.12 03/11/20 18:12:35 bell@sanja.is.com.ua +9 -2
    test of drop database

ChangeSet
  1.1620 03/11/20 16:14:24 pem@mysql.comhem.se +3 -0
  Handle null values correctly in SP local variables.

  sql/item.h
    1.70 03/11/20 16:14:21 pem@mysql.com +20 -3
    Update null_value correctly in Item_splocal.

  mysql-test/t/sp.test
    1.37 03/11/20 16:14:21 pem@mysql.com +7 -0
    Test for handling of null values.

  mysql-test/r/sp.result
    1.36 03/11/20 16:14:21 pem@mysql.com +12 -0
    Test for handling of null values.

ChangeSet
  1.1619 03/11/20 15:07:22 pem@mysql.comhem.se +7 -0
  Bugfixes in SHOW CREATE PROCEDURE/FUNCTION and SHOW PROCEDURE/FUNCTION STATUS;
  - dropped routines should not show up in status
  - error handling for non-existing routines
  
  + some cleanup.

  sql/sql_parse.cc
    1.307 03/11/20 15:07:19 pem@mysql.com +9 -7
    Fixed error handling in SHOW CREATE PROCEDURE/FUNCTION.

  sql/sp.h
    1.9 03/11/20 15:07:19 pem@mysql.com +4 -3
    Fixed prefix for external functions (should be sp_, not db_).

  sql/sp.cc
    1.31 03/11/20 15:07:19 pem@mysql.com +55 -39
    Fixed bug in SHOW ... STATUS after a routine has been dropped,
    and fixed the error return codes (for correct error handling).
    Also some general cleanup.

  mysql-test/t/sp.test
    1.36 03/11/20 15:07:19 pem@mysql.com +4 -0
    Additional SHOW FUNCTION/PROCEDURE STATUS calls (make sure they don't show
    after being dropped).

  mysql-test/t/sp-error.test
    1.21 03/11/20 15:07:19 pem@mysql.com +2 -0
    Test SHOW CREATE PROCEDURE for non-existing procedure.

  mysql-test/r/sp.result
    1.35 03/11/20 15:07:19 pem@mysql.com +4 -0
    Additional SHOW FUNCTION/PROCEDURE STATUS calls (make sure they don't show
    after being dropped).

  mysql-test/r/sp-error.result
    1.20 03/11/20 15:07:19 pem@mysql.com +2 -0
    Test SHOW CREATE PROCEDURE for non-existing procedure.

ChangeSet
  1.1616.5.1 03/11/20 14:33:07 jani@rhols221.adsl.netsonic.fi +1 -0
  Added multi command support for mysql client.

  client/mysql.cc
    1.121.1.26 03/11/20 14:33:04 jani@rhols221.adsl.netsonic.fi +68 -64
    Added multi command support for mysql client.

ChangeSet
  1.1616.3.1 03/11/20 14:31:10 bell@sanja.is.com.ua +1 -0
  fixed memory allocation

  sql/item_cmpfunc.cc
    1.111.1.3 03/11/20 14:30:56 bell@sanja.is.com.ua +4 -4
    fixed memory allocation

ChangeSet
  1.1614.2.1 03/11/20 12:55:48 hf@deer.(none) +27 -0
  SCRUM
  WL#1284 (warnings about --skip-name-resolve)
  Now MySQL will issue warnings during startup about entries in
  grant tables with hostnames that require resolve, and after
  GRANT commands with that kind of hostnames.

  sql/sql_parse.cc
    1.271.1.32 03/11/20 12:55:29 hf@deer.(none) +13 -0
    Check added to the GRANT command to warn about 
    symbolic hostname & --skip-name-resolve

  sql/sql_acl.h
    1.26 03/11/20 12:55:29 hf@deer.(none) +1 -0
    interface added

  sql/sql_acl.cc
    1.74.1.22 03/11/20 12:55:29 hf@deer.(none) +64 -2
    Checks added to detect entries with symbolic hostnames in grant tables

  sql/share/ukrainian/errmsg.txt
    1.27.1.31 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/swedish/errmsg.txt
    1.64.1.34 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/spanish/errmsg.txt
    1.64.1.35 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/slovak/errmsg.txt
    1.64.1.34 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/serbian/errmsg.txt
    1.18.1.32 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/russian/errmsg.txt
    1.61.1.32 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/romanian/errmsg.txt
    1.62.1.34 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/portuguese/errmsg.txt
    1.64.1.33 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/polish/errmsg.txt
    1.63.1.34 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/norwegian/errmsg.txt
    1.63.1.35 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.34 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/korean/errmsg.txt
    1.63.1.34 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/japanese/errmsg.txt
    1.63.1.33 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/italian/errmsg.txt
    1.70.1.35 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/hungarian/errmsg.txt
    1.65.1.33 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/greek/errmsg.txt
    1.64.1.33 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/german/errmsg.txt
    1.64.1.34 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/french/errmsg.txt
    1.63.1.34 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/estonian/errmsg.txt
    1.64.1.33 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/english/errmsg.txt
    1.70.1.37 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/dutch/errmsg.txt
    1.66.1.34 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/danish/errmsg.txt
    1.62.1.34 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  sql/share/czech/errmsg.txt
    1.64.1.34 03/11/20 12:55:29 hf@deer.(none) +1 -0
    error message added

  include/mysqld_error.h
    1.61.1.25 03/11/20 12:55:29 hf@deer.(none) +2 -1
    errno added

ChangeSet
  1.1616.2.2 03/11/20 03:11:33 monty@mashka.mysql.fi +3 -0
  Portability fixes (AIX43)
  Add missing file to VC++ project

  sql/set_var.h
    1.38 03/11/20 03:11:22 monty@mashka.mysql.fi +3 -0
    Portability fix

  include/my_sys.h
    1.113 03/11/20 03:11:21 monty@mashka.mysql.fi +1 -2
    Remove old variables

  VC++Files/mysys/mysys.dsp
    1.14 03/11/20 03:11:21 monty@mashka.mysql.fi +4 -0
    Add new file to project

ChangeSet
  1.1616.2.1 03/11/20 02:48:09 monty@mashka.mysql.fi +7 -0
  Portability fixes for AIX43

  strings/my_strtoll10.c
    1.5 03/11/20 02:47:51 monty@mashka.mysql.fi +1 -0
    Portability fix (for AIX43)

  libmysql/libmysql.c
    1.156.1.39 03/11/20 02:47:51 monty@mashka.mysql.fi +2 -1
    Portability fix

  innobase/fil/fil0fil.c
    1.20 03/11/20 02:47:50 monty@mashka.mysql.fi +4 -4
    Fixed compiler warnings (xlc_r)

  include/mysql.h
    1.101 03/11/20 02:47:50 monty@mashka.mysql.fi +12 -12
    Portability fix

  include/my_sys.h
    1.112 03/11/20 02:47:50 monty@mashka.mysql.fi +1 -1
    Remove compiler warning on AIX43 with xlc_r compiler

  include/my_global.h
    1.47.1.5 03/11/20 02:47:50 monty@mashka.mysql.fi +2 -1
    Portability fix for AIX43
    (Having _Export gave a lot of errors/warnings and I think this is not needed anymore)

  include/my_base.h
    1.48 03/11/20 02:47:50 monty@mashka.mysql.fi +1 -1
    Portability fix

ChangeSet
  1.1599.3.1 03/11/19 23:39:08 guilhem@gbichot2 +1 -0
  Official builds are tested with mysql-test-run --sleep=10, and the slave
  has (in mysql-test-run) a slave-net-timeout=10. So the 'sleep 1' below
  was converted in 'sleep 10', so slave thought that connection was down,
  so reconnected, so got an additional (fake) Rotate event, which shifted
  the positions displayed by SHOW SLAVE STATUS.

  mysql-test/t/rpl_rotate_logs.test
    1.47 03/11/19 23:39:02 guilhem@mysql.com +2 -1
    Official builds are tested with mysql-test-run --sleep=10, and the slave
    has (in mysql-test-run) a slave-net-timeout=10. So the 'sleep 1' below
    was converted in 'sleep 10', so slave thought that connection was down,
    so reconnected, so got an additional (fake) Rotate event, which shifted
    the positions displayed by SHOW SLAVE STATUS.

ChangeSet
  1.1346.417.5 03/11/19 23:07:31 serg@serg.mylan +1 -0
  minor fixups: more verbose on "no memory" errors - report requested size, avoid flushing rec buffer to a file that is closed and deleted already (on got_error=1)

  myisam/mi_check.c
    1.86.1.40 03/11/19 23:07:28 serg@serg.mylan +3 -2
    minor fixups: more verbose on "no memory" errors - report requested size, avoid flushing rec buffer to a file that is closed and deleted already (on got_error=1)

ChangeSet
  1.1616.1.2 03/11/19 19:31:19 bell@sanja.is.com.ua +1 -0
  fixed memory allocation problem in IN with const rows

  sql/item_cmpfunc.cc
    1.111.1.2 03/11/19 19:31:02 bell@sanja.is.com.ua +5 -1
    fixed memory allocation problem in IN with const rows

ChangeSet
  1.1618 03/11/19 16:59:35 pem@mysql.comhem.se +13 -0
  Post-merge fixes.

  sql/sql_yacc.yy
    1.251 03/11/19 16:59:32 pem@mysql.com +1 -1
    Post-merge fixes.

  sql/sql_union.cc
    1.80.1.2 03/11/19 16:59:32 pem@mysql.com +1 -1
    Post-merge fixes.

  sql/sql_select.cc
    1.228.1.2 03/11/19 16:59:32 pem@mysql.com +5 -5
    Post-merge fixes.

  sql/sql_parse.cc
    1.306 03/11/19 16:59:32 pem@mysql.com +1 -1
    Post-merge fixes.

  sql/sql_delete.cc
    1.109 03/11/19 16:59:32 pem@mysql.com +2 -2
    Post-merge fixes.

  sql/sql_class.cc
    1.127.1.3 03/11/19 16:59:32 pem@mysql.com +1 -1
    Post-merge fixes.

  sql/sp_head.cc
    1.51 03/11/19 16:59:32 pem@mysql.com +1 -0
    Post-merge fixes.

  sql/protocol.cc
    1.66 03/11/19 16:59:32 pem@mysql.com +1 -1
    Post-merge fixes.

  mysql-test/t/sp.test
    1.35 03/11/19 16:59:32 pem@mysql.com +3 -3
    Post-merge fixes.

  mysql-test/t/sp-error.test
    1.20 03/11/19 16:59:32 pem@mysql.com +40 -40
    Post-merge fixes.

  mysql-test/r/sp.result
    1.34 03/11/19 16:59:32 pem@mysql.com +3 -3
    Post-merge fixes.

  mysql-test/r/sp-error.result
    1.19 03/11/19 16:59:32 pem@mysql.com +1 -1
    Post-merge fixes.

  mysql-test/r/query_cache.result
    1.35 03/11/19 16:59:32 pem@mysql.com +6 -7
    Post-merge fixes.

ChangeSet
  1.1346.420.2 03/11/19 16:38:01 lenz@mysql.com +1 -0
   - removed some undefined non-weak symbols in libmysqlclient_r by
     setting LIBS to include @openss_libs@ (BUG#1652)

  libmysql_r/Makefile.am
    1.9.1.1 03/11/19 16:37:53 lenz@mysql.com +1 -1
     - removed some undefined non-weak symbols in libmysqlclient_r by
       setting LIBS to include @openss_libs@ (BUG#1652)

ChangeSet
  1.1607.6.1 03/11/19 17:31:57 monty@mashka.mysql.fi +5 -0
  Changed mysql_next_result() to return int instead of bool
  Changed ~Item_func_in() to call cleanup() (to fix memory leak)
  Fixed test_multi_statements() test in client_test

  tests/client_test.c
    1.44 03/11/19 17:31:54 monty@mashka.mysql.fi +444 -395
    Fixed test_multi_statements() test.

  sql/item_cmpfunc.h
    1.71 03/11/19 17:31:54 monty@mashka.mysql.fi +6 -13
    Changed ~Item_func_in() to call cleanup()
    (Fixed memory leak in cmp_item_row())

  sql/item_cmpfunc.cc
    1.111.1.1 03/11/19 17:31:54 monty@mashka.mysql.fi +42 -20
    Indentation fixes

  libmysql/libmysql.c
    1.156.1.38 03/11/19 17:31:54 monty@mashka.mysql.fi +12 -3
    Changed mysql_next_result() to return int instead of bool
    Added check to mysql_next_result() to ensure that it's not called in wrong context.

  include/mysql.h
    1.100 03/11/19 17:31:54 monty@mashka.mysql.fi +1 -1
    Changed mysql_next_result() to return int instead of bool

ChangeSet
  1.1617 03/11/19 15:19:46 pem@mysql.com +89 -0
  Merging 4.1->5.0.

  sql/sql_yacc.yy
    1.250 03/11/19 15:19:41 pem@mysql.com +1 -4
    Merging 4.1->5.0.

  sql/sql_select.cc
    1.228.1.1 03/11/19 15:19:41 pem@mysql.com +0 -0
    Merging 4.1->5.0.

  sql/sql_parse.cc
    1.305 03/11/19 15:19:41 pem@mysql.com +0 -0
    Merging 4.1->5.0.

  sql/sql_lex.h
    1.125 03/11/19 15:19:41 pem@mysql.com +4 -5
    Merging 4.1->5.0.

  sql/sql_derived.cc
    1.49 03/11/19 15:19:41 pem@mysql.com +0 -0
    Merging 4.1->5.0.

  sql/sql_class.h
    1.165 03/11/19 15:19:41 pem@mysql.com +0 -0
    Merging 4.1->5.0.

  sql/sql_class.cc
    1.127.1.2 03/11/19 15:19:41 pem@mysql.com +3 -3
    Merging 4.1->5.0.

  sql/share/ukrainian/errmsg.txt
    1.49 03/11/19 15:19:41 pem@mysql.com +12 -21
    Merging 4.1->5.0.

  sql/share/swedish/errmsg.txt
    1.87 03/11/19 15:19:41 pem@mysql.com +12 -21
    Merging 4.1->5.0.

  sql/share/spanish/errmsg.txt
    1.86 03/11/19 15:19:41 pem@mysql.com +12 -21
    Merging 4.1->5.0.

  sql/share/slovak/errmsg.txt
    1.86 03/11/19 15:19:41 pem@mysql.com +12 -21
    Merging 4.1->5.0.

  sql/share/serbian/errmsg.txt
    1.40 03/11/19 15:19:41 pem@mysql.com +12 -21
    Merging 4.1->5.0.

  sql/share/russian/errmsg.txt
    1.84 03/11/19 15:19:41 pem@mysql.com +12 -21
    Merging 4.1->5.0.

  sql/share/romanian/errmsg.txt
    1.83 03/11/19 15:19:41 pem@mysql.com +0 -0
    Merging 4.1->5.0.

  sql/share/portuguese/errmsg.txt
    1.86 03/11/19 15:19:41 pem@mysql.com +14 -24
    Merging 4.1->5.0.

  sql/share/polish/errmsg.txt
    1.86 03/11/19 15:19:41 pem@mysql.com +12 -21
    Merging 4.1->5.0.

  sql/share/norwegian/errmsg.txt
    1.85 03/11/19 15:19:41 pem@mysql.com +12 -21
    Merging 4.1->5.0.

  sql/share/norwegian-ny/errmsg.txt
    1.85 03/11/19 15:19:41 pem@mysql.com +12 -21
    Merging 4.1->5.0.

  sql/share/korean/errmsg.txt
    1.85 03/11/19 15:19:41 pem@mysql.com +12 -21
    Merging 4.1->5.0.

  sql/share/japanese/errmsg.txt
    1.85 03/11/19 15:19:41 pem@mysql.com +12 -21
    Merging 4.1->5.0.

  sql/share/italian/errmsg.txt
    1.92 03/11/19 15:19:41 pem@mysql.com +12 -21
    Merging 4.1->5.0.

  sql/share/hungarian/errmsg.txt
    1.87 03/11/19 15:19:41 pem@mysql.com +12 -21
    Merging 4.1->5.0.

  sql/share/greek/errmsg.txt
    1.86 03/11/19 15:19:41 pem@mysql.com +12 -21
    Merging 4.1->5.0.

  sql/share/german/errmsg.txt
    1.87 03/11/19 15:19:41 pem@mysql.com +3 -3
    Merging 4.1->5.0.

  sql/share/french/errmsg.txt
    1.85 03/11/19 15:19:41 pem@mysql.com +12 -21
    Merging 4.1->5.0.

  sql/share/estonian/errmsg.txt
    1.86 03/11/19 15:19:41 pem@mysql.com +12 -21
    Merging 4.1->5.0.

  sql/share/english/errmsg.txt
    1.93 03/11/19 15:19:41 pem@mysql.com +22 -42
    Merging 4.1->5.0.

  sql/share/dutch/errmsg.txt
    1.88 03/11/19 15:19:41 pem@mysql.com +12 -21
    Merging 4.1->5.0.

  sql/share/danish/errmsg.txt
    1.84 03/11/19 15:19:41 pem@mysql.com +12 -21
    Merging 4.1->5.0.

  sql/share/czech/errmsg.txt
    1.85 03/11/19 15:19:40 pem@mysql.com +0 -0
    Merging 4.1->5.0.

  sql/set_var.cc
    1.43 03/11/19 15:19:40 pem@mysql.com +0 -1
    Merging 4.1->5.0.

  sql/protocol.cc
    1.65 03/11/19 15:19:40 pem@mysql.com +0 -1
    Merging 4.1->5.0.

  sql/log_event.cc
    1.122 03/11/19 15:19:40 pem@mysql.com +1 -1
    Merging 4.1->5.0.

  sql/lex.h
    1.107 03/11/19 15:19:40 pem@mysql.com +1 -1
    Merging 4.1->5.0.

  sql/item_func.h
    1.79 03/11/19 15:19:40 pem@mysql.com +1 -2
    Merging 4.1->5.0.

  sql/item_func.cc
    1.134 03/11/19 15:19:40 pem@mysql.com +2 -4
    Merging 4.1->5.0.

  sql/item_create.cc
    1.39 03/11/19 15:19:40 pem@mysql.com +5 -10
    Merging 4.1->5.0.

  sql/item_cmpfunc.cc
    1.112 03/11/19 15:19:40 pem@mysql.com +1 -2
    Merging 4.1->5.0.

  sql/item.h
    1.69 03/11/19 15:19:40 pem@mysql.com +0 -0
    Merging 4.1->5.0.

  sql/item.cc
    1.73 03/11/19 15:19:40 pem@mysql.com +3 -5
    Merging 4.1->5.0.

  mysql-test/t/query_cache.test
    1.29 03/11/19 15:19:40 pem@mysql.com +8 -5
    Merging 4.1->5.0.

  mysql-test/r/query_cache.result
    1.34 03/11/19 15:19:40 pem@mysql.com +2 -1
    Merging 4.1->5.0.

  include/mysqld_error.h
    1.82 03/11/19 15:19:40 pem@mysql.com +33 -34
    Merging 4.1->5.0.

  sql/table.h
    1.56 03/11/19 12:53:04 pem@mysql.com +0 -0
    Auto merged

  sql/sql_update.cc
    1.95.1.1 03/11/19 12:53:04 pem@mysql.com +0 -0
    Auto merged

  sql/sql_union.cc
    1.80.1.1 03/11/19 12:53:03 pem@mysql.com +0 -0
    Auto merged

  sql/sql_table.cc
    1.169 03/11/19 12:53:03 pem@mysql.com +0 -0
    Auto merged

  sql/sql_show.cc
    1.129 03/11/19 12:53:03 pem@mysql.com +0 -0
    Auto merged

  sql/sql_repl.cc
    1.111 03/11/19 12:53:03 pem@mysql.com +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.46 03/11/19 12:53:03 pem@mysql.com +0 -0
    Auto merged

  sql/sql_lex.cc
    1.94.1.3 03/11/19 12:53:03 pem@mysql.com +0 -0
    Auto merged

  sql/sql_delete.cc
    1.108 03/11/19 12:53:03 pem@mysql.com +0 -0
    Auto merged

  sql/sql_db.cc
    1.75 03/11/19 12:53:03 pem@mysql.com +0 -0
    Auto merged

  sql/sql_cache.cc
    1.56 03/11/19 12:53:02 pem@mysql.com +0 -0
    Auto merged

  sql/sql_base.cc
    1.153 03/11/19 12:53:02 pem@mysql.com +0 -0
    Auto merged

  sql/sql_acl.cc
    1.81 03/11/19 12:53:02 pem@mysql.com +0 -0
    Auto merged

  sql/slave.cc
    1.200 03/11/19 12:53:02 pem@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.371 03/11/19 12:53:02 pem@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.201 03/11/19 12:53:02 pem@mysql.com +0 -0
    Auto merged

  sql/item_sum.h
    1.49 03/11/19 12:53:01 pem@mysql.com +0 -0
    Auto merged

  sql/item_sum.cc
    1.91 03/11/19 12:53:01 pem@mysql.com +0 -0
    Auto merged

  sql/item_subselect.cc
    1.69 03/11/19 12:53:01 pem@mysql.com +0 -0
    Auto merged

  sql/handler.h
    1.90 03/11/19 12:53:00 pem@mysql.com +0 -0
    Auto merged

  sql/handler.cc
    1.104 03/11/19 12:53:00 pem@mysql.com +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.124 03/11/19 12:53:00 pem@mysql.com +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.96 03/11/19 12:53:00 pem@mysql.com +0 -0
    Auto merged

  sql/ha_berkeley.cc
    1.121 03/11/19 12:53:00 pem@mysql.com +0 -0
    Auto merged

  sql/Makefile.am
    1.87 03/11/19 12:53:00 pem@mysql.com +0 -0
    Auto merged

  scripts/mysql_install_db.sh
    1.49 03/11/19 12:53:00 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/variables.test
    1.23 03/11/19 12:53:00 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.70 03/11/19 12:53:00 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/variables.result
    1.35 03/11/19 12:53:00 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.80 03/11/19 12:53:00 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/show_check.result
    1.36 03/11/19 12:53:00 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/rpl_temporary.result
    1.8 03/11/19 12:53:00 pem@mysql.com +0 -0
    Auto merged

  myisam/myisamdef.h
    1.65 03/11/19 12:53:00 pem@mysql.com +0 -0
    Auto merged

  myisam/myisamchk.c
    1.99 03/11/19 12:53:00 pem@mysql.com +0 -0
    Auto merged

  myisam/mi_check.c
    1.111 03/11/19 12:52:59 pem@mysql.com +0 -0
    Auto merged

  libmysqld/lib_sql.cc
    1.78 03/11/19 12:52:59 pem@mysql.com +0 -0
    Auto merged

  libmysqld/Makefile.am
    1.38 03/11/19 12:52:59 pem@mysql.com +0 -0
    Auto merged

  libmysql/libmysql.c
    1.162 03/11/19 12:52:59 pem@mysql.com +0 -0
    Auto merged

  include/mysql_com.h
    1.75 03/11/19 12:52:59 pem@mysql.com +0 -0
    Auto merged

  include/my_pthread.h
    1.69 03/11/19 12:52:59 pem@mysql.com +0 -0
    Auto merged

  include/my_global.h
    1.51 03/11/19 12:52:59 pem@mysql.com +0 -0
    Auto merged

  configure.in
    1.217 03/11/19 12:52:59 pem@mysql.com +0 -0
    Auto merged

  client/mysql.cc
    1.133 03/11/19 12:52:59 pem@mysql.com +0 -0
    Auto merged

  BitKeeper/triggers/post-commit
    1.26 03/11/19 12:52:59 pem@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.247.1.1 03/11/19 12:52:49 pem@mysql.com +1 -1
    auto-union

  BitKeeper/etc/ignore
    1.160 03/11/19 12:52:49 pem@mysql.com +0 -0
    auto-union

  mysys/charset2html.c
    1.5 03/11/19 15:03:12 bar@bar.mysql.r18.ru +1 -1
    It's earier to operate hex values when editing charset configuration file

ChangeSet
  1.1614.1.1 03/11/19 14:59:12 bar@bar.mysql.r18.ru +1 -0
  cp850.xml:
    There were errors in cp850: in unicode, ctype and sort arrays

  sql/share/charsets/cp850.xml
    1.3 03/11/19 14:58:39 bar@bar.mysql.r18.ru +25 -25
    There were errors in cp850: in unicode, ctype and sort arrays

ChangeSet
  1.1578.22.13 03/11/19 11:26:18 pem@mysql.comhem.se +9 -0
  Fixed BUG#1862 (flush table in SPs didn't work).
  Fixed various bugs: setting local variables to NULL, SELECT INTO var now actually
  might work, SELECT INTO with not row now gives a "no data" warning (instead of
  the "empty query" error), etc.
  Updated test cases accordingly.

  sql/sql_yacc.yy
    1.249 03/11/19 11:26:16 pem@mysql.com +25 -19
    Corrected SECURITY INVOKER/DEFINER syntax ("SQL" missing), added some _SYM
    suffixes, and fixed valgrind complaints for SP COMMENTs.
    (Also removed some now irrelevant comments.)

  sql/sql_lex.h
    1.124 03/11/19 11:26:16 pem@mysql.com +1 -0
    Have to store the original table_list first pointer for some
    sub-statements in SPs.

  sql/sql_class.cc
    1.127.1.1 03/11/19 11:26:16 pem@mysql.com +4 -10
    Corrected error message when no rows return by a SELECT INTO var; should
    be a "no data" warning.

  sql/sp_head.cc
    1.50 03/11/19 11:26:16 pem@mysql.com +37 -12
    Fixed bug in the item_list copying for "with_wild" cases (list nodes ended
    up in the wrong memroot).
    Catch errors and warnings even if return values is 0 from sub-statements.
    Restore table_list which is zapped by SQLCOM_CREATE_TABLE and INSERT_SELECT.
    Set old table pointers to NULL after sub-statement call (since all tables are
    closed).

  sql/lex.h
    1.106 03/11/19 11:26:16 pem@mysql.com +4 -3
    Added SQL_SYM (and added a few _SYM suffixes for new symbols).

  mysql-test/t/sp.test
    1.34 03/11/19 11:26:16 pem@mysql.com +95 -3
    Corrected security syntax for alter/create procedure.
    New tests for setting local variables to null,
    bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
    and corrected "no data" warning for SELECT INTO with no rows.

  mysql-test/t/sp-error.test
    1.19 03/11/19 11:26:16 pem@mysql.com +1 -1
    Corrected security syntax for alter/create procedure.

  mysql-test/r/sp.result
    1.33 03/11/19 11:26:16 pem@mysql.com +78 -7
    Corrected security syntax for alter/create procedure.
    New tests for setting local variables to null,
    bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
    and corrected "no data" warning for SELECT INTO with no rows.

  mysql-test/r/sp-error.result
    1.18 03/11/19 11:26:15 pem@mysql.com +1 -1
    Corrected security syntax for alter/create procedure.

ChangeSet
  1.1615 03/11/19 09:45:49 pem@mysql.comhem.se +1 -0
  Fixed C syntax error in mysys/mf_keycache.c.

  mysys/mf_keycache.c
    1.34 03/11/19 09:45:46 pem@mysql.com +1 -1
    Fixed C syntax error.

ChangeSet
  1.1614 03/11/18 22:47:04 lenz@kallisto.local +1 -0
   - added a missing comma in sql_yacc.yy (maybe a merge error?)

  sql/sql_yacc.yy
    1.203.1.76 03/11/18 22:46:52 lenz@mysql.com +1 -0
     - added a missing comma (maybe a merge error?)

ChangeSet
  1.1563.94.1 03/11/19 00:37:17 sergefp@mysql.com +14 -0
  index_merge implementation using Unique class, to be merged into 5.0

  BitKeeper/etc/logging_ok
    1.233.16.1 03/11/19 00:37:17 sergefp@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_update.cc
    1.83.8.1 03/11/19 00:36:32 sergefp@mysql.com +32 -6
    index_merge implementation using Unique class

  sql/sql_union.cc
    1.74.10.1 03/11/19 00:36:32 sergefp@mysql.com +3 -2
    index_merge implementation using Unique class

  sql/sql_test.cc
    1.21.6.1 03/11/19 00:36:32 sergefp@mysql.com +31 -1
    index_merge implementation using Unique class

  sql/sql_select.h
    1.54.2.1 03/11/19 00:36:32 sergefp@mysql.com +6 -2
    index_merge implementation using Unique class

  sql/sql_select.cc
    1.216.43.1 03/11/19 00:36:32 sergefp@mysql.com +88 -20
    index_merge implementation using Unique class

  sql/sql_list.h
    1.21.1.1 03/11/19 00:36:32 sergefp@mysql.com +7 -0
    index_merge implementation using Unique class

  sql/sql_class.cc
    1.105.11.1 03/11/19 00:36:32 sergefp@mysql.com +2 -2
    index_merge implementation using Unique class

  sql/records.cc
    1.19.3.1 03/11/19 00:36:32 sergefp@mysql.com +2 -1
    index_merge implementation using Unique class

  sql/opt_range.h
    1.24.3.1 03/11/19 00:36:32 sergefp@mysql.com +112 -18
    index_merge implementation using Unique class

  sql/opt_range.cc
    1.90.6.1 03/11/19 00:36:32 sergefp@mysql.com +779 -106
    index_merge implementation using Unique class

  sql/opt_ft.h
    1.4.2.1 03/11/19 00:36:32 sergefp@mysql.com +6 -5
    index_merge implementation using Unique class

  sql/opt_ft.cc
    1.2.2.1 03/11/19 00:36:32 sergefp@mysql.com +1 -1
    index_merge implementation using Unique class

  sql/filesort.cc
    1.70.2.1 03/11/19 00:36:32 sergefp@mysql.com +40 -15
    index_merge implementation using Unique class

ChangeSet
  1.1346.417.4 03/11/18 22:06:47 serg@serg.mylan +3 -0
  Bug#1826, HANDLER+ALTER TABLE=crash (unfortunately, it cannot be tested in mysql-test suite)
  more user variable tests

  sql/sql_handler.cc
    1.19.1.18 03/11/18 22:06:44 serg@serg.mylan +13 -0
    Bug#1826, HANDLER+ALTER TABLE=crash
    (unfortunately, it cannot be tested in mysql-test suite)

  mysql-test/t/user_var.test
    1.5.1.4 03/11/18 22:06:44 serg@serg.mylan +11 -0
    more user variable tests (just to have this behaviour written down somewhere)

  mysql-test/r/user_var.result
    1.6.1.6 03/11/18 22:06:44 serg@serg.mylan +19 -0
    more user variable tests (just to have this behaviour written down somewhere)

ChangeSet
  1.1607.3.1 03/11/18 15:17:41 greg@mysql.com +1 -0
  Add Docs/internals.texi to Windows source packages.

  scripts/make_win_src_distribution.sh
    1.11 03/11/18 15:17:38 greg@mysql.com +1 -1
    Changed to copy Docs/internals.texi to target directory.

ChangeSet
  1.1607.2.3 03/11/18 21:04:36 lenz@kallisto.local +1 -0
   - fixed typo in mysql-test-run error message

ChangeSet
  1.1611 03/11/18 22:04:33 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-used_tables-4.1

  mysql-test/mysql-test-run.sh
    1.167.1.14 03/11/18 21:04:31 lenz@mysql.com +1 -1
     - fixed typo in error message

  sql/sql_yacc.yy
    1.203.1.75 03/11/18 22:04:31 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1610 03/11/18 22:04:01 bell@sanja.is.com.ua +5 -0
  changed name of bit on more descriptive (after rewie change)

  sql/sql_yacc.yy
    1.203.1.74 03/11/18 22:03:58 bell@sanja.is.com.ua +5 -5
    changed name of bit on more descriptive

  sql/sql_lex.h
    1.102.1.38 03/11/18 22:03:58 bell@sanja.is.com.ua +1 -1
    changed name of bit on more descriptive

  sql/mysql_priv.h
    1.186.1.49 03/11/18 22:03:58 bell@sanja.is.com.ua +1 -1
    changed name of bit on more descriptive

  sql/item_func.cc
    1.124.1.43 03/11/18 22:03:58 bell@sanja.is.com.ua +2 -2
    changed name of bit on more descriptive

  sql/item_create.cc
    1.33.1.24 03/11/18 22:03:58 bell@sanja.is.com.ua +5 -5
    changed name of bit on more descriptive

ChangeSet
  1.1607.2.1 03/11/18 18:54:27 monty@mashka.mysql.fi +11 -0
  Merge with 4.0 tree

  mysys/mf_keycache.c
    1.33 03/11/18 18:54:24 monty@mashka.mysql.fi +2 -3
    Fixed comments

  mysql-test/t/range.test
    1.11 03/11/18 18:54:24 monty@mashka.mysql.fi +1 -2
    Fixed comment

  myisam/mi_test2.c
    1.24 03/11/18 18:54:24 monty@mashka.mysql.fi +0 -2
    use original code

  BUILD/compile-pentium-gcov
    1.13 03/11/18 18:54:24 monty@mashka.mysql.fi +1 -2
    merge

ChangeSet
  1.1346.412.2 03/11/18 17:31:17 guilhem@mysql.com +4 -0
  Fix for BUG#1870
      "CHANGE MASTER makes SQL thread restart from coordinates of I/O thread".
      So, in CHANGE MASTER:
      when it seems reasonable that the user did not want to discontinue
      its replication (i.e. when he is not specifying host or port or master_log_file
      or master_log_pos; this will be documented), set the coordinates of the
      I/O thread to those of the SQL thread. This way, the SQL thread will see
      no discontinuity in the relay log (i.e. will skip no events), because
      the I/O thread will fill the brand new relay log with the events which
      are just after the position where the SQL thread had stopped
      (before CHANGE MASTER was issued).
      And a new test for this bug.

  mysql-test/t/rpl_change_master.test
    1.1 03/11/18 17:31:11 guilhem@mysql.com +26 -0

  mysql-test/r/rpl_change_master.result
    1.1 03/11/18 17:31:11 guilhem@mysql.com +32 -0

  mysql-test/t/rpl_change_master.test
    1.0 03/11/18 17:31:11 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/rpl_change_master.test

  mysql-test/r/rpl_change_master.result
    1.0 03/11/18 17:31:11 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/r/rpl_change_master.result

  sql/sql_repl.cc
    1.86.1.26 03/11/18 17:31:10 guilhem@mysql.com +45 -4
    Fix for BUG#1870
    "CHANGE MASTER makes SQL thread restart from coordinates of I/O thread".
    So, in CHANGE MASTER:
    when it seems reasonable that the user did not want to discontinue
    its replication (i.e. when he is not specifying host or port or master_log_file
    or master_log_pos; this will be documented), set the coordinates of the
    I/O thread to those of the SQL thread. This way, the SQL thread will see
    no discontinuity in the relay log (i.e. will skip no events), because
    the I/O thread will fill the brand new relay log with the events which
    are just after the position where the SQL thread had stopped
    (before CHANGE MASTER was issued).

  mysql-test/r/rpl_loaddata.result
    1.1.1.10 03/11/18 17:31:10 guilhem@mysql.com +1 -1
    Now, after CHANGE MASTER the coordinates of the I/O thread are the last ones of the SQL thread, so result update.

  BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql
    1.4 03/11/18 18:20:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183
    1.70 03/11/18 18:20:26 monty@mashka.mysql.fi +5 -5
    Auto merged

  sql/sql_handler.cc
    1.42 03/11/18 18:20:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.64 03/11/18 18:20:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  scripts/mysql_config.sh
    1.12 03/11/18 18:20:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  scripts/Makefile.am
    1.36 03/11/18 18:20:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql
    1.1.2.2 03/11/18 18:20:26 monty@mashka.mysql.fi +0 -0
    Merge rename: scripts/mysql_fix_privilege_tables.sql -> BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql

  BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183
    1.48.6.2 03/11/18 18:20:26 monty@mashka.mysql.fi +0 -0
    Merge rename: sql/mini_client.cc -> BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183

  BitKeeper/etc/logging_ok
    1.233.1.34 03/11/18 18:20:19 monty@mashka.mysql.fi +0 -0
    auto-union

ChangeSet
  1.1607.1.1 03/11/18 17:48:45 bell@sanja.is.com.ua +3 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-delete-4.1

  sql/sql_yacc.yy
    1.203.83.2 03/11/18 17:48:42 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_delete.cc
    1.99.2.14 03/11/18 17:48:42 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.1.37 03/11/18 17:48:42 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1608 03/11/18 17:48:06 bell@sanja.is.com.ua +5 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-used_tables-4.1

  sql/sql_yacc.yy
    1.203.1.73 03/11/18 17:48:03 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.1.37 03/11/18 17:48:03 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.94.1.2 03/11/18 17:48:03 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.48 03/11/18 17:48:03 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.124.1.42 03/11/18 17:48:03 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1604.2.1 03/11/18 16:48:02 lenz@kallisto.local +3 -0
   - internals.texi will now be part of the source distribution. However,
     as this is a document that belongs to the mysqldoc tree, it needs to
     be copied over manually (using the Bootstrap script), before doing an
     official release distribution. The file Docs/internals.texi in this tree
     is only a dummy file to keep "make dist" happy.

  Docs/Makefile.am
    1.41 03/11/18 16:47:35 lenz@mysql.com +1 -1
     - add internals.texi to the source distribution

  Build-tools/Bootstrap
    1.11 03/11/18 16:47:34 lenz@mysql.com +1 -1
     - overwrite the dummy internals.texi with the real one, when creating
       the release source distribution with Bootstrap

ChangeSet
  1.1606 03/11/18 17:28:00 monty@mashka.mysql.fi +35 -0
  Delete duplicate error message names

  tests/client_test.c
    1.43 03/11/18 17:27:56 monty@mashka.mysql.fi +1 -1
    CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS

  sql/sql_table.cc
    1.157.2.21 03/11/18 17:27:56 monty@mashka.mysql.fi +2 -2
    Fix after deleting duplicated error messages

  sql/sql_parse.cc
    1.271.1.31 03/11/18 17:27:56 monty@mashka.mysql.fi +13 -13
    Fix after deleting duplicated error messages

  sql/sql_db.cc
    1.68.1.20 03/11/18 17:27:56 monty@mashka.mysql.fi +2 -2
    Fix after deleting duplicated error messages

  sql/share/ukrainian/errmsg.txt
    1.27.1.30 03/11/18 17:27:56 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/swedish/errmsg.txt
    1.64.1.33 03/11/18 17:27:56 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/spanish/errmsg.txt
    1.64.1.34 03/11/18 17:27:55 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/slovak/errmsg.txt
    1.64.1.33 03/11/18 17:27:55 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/serbian/errmsg.txt
    1.18.1.31 03/11/18 17:27:55 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/russian/errmsg.txt
    1.61.1.31 03/11/18 17:27:55 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/romanian/errmsg.txt
    1.62.1.33 03/11/18 17:27:55 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/portuguese/errmsg.txt
    1.64.1.32 03/11/18 17:27:55 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/polish/errmsg.txt
    1.63.1.33 03/11/18 17:27:55 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/norwegian/errmsg.txt
    1.63.1.34 03/11/18 17:27:55 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.33 03/11/18 17:27:55 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/korean/errmsg.txt
    1.63.1.33 03/11/18 17:27:55 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/japanese/errmsg.txt
    1.63.1.32 03/11/18 17:27:55 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/italian/errmsg.txt
    1.70.1.34 03/11/18 17:27:55 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/hungarian/errmsg.txt
    1.65.1.32 03/11/18 17:27:55 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/greek/errmsg.txt
    1.64.1.32 03/11/18 17:27:55 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/german/errmsg.txt
    1.64.1.33 03/11/18 17:27:55 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/french/errmsg.txt
    1.63.1.33 03/11/18 17:27:55 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/estonian/errmsg.txt
    1.64.1.32 03/11/18 17:27:55 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/english/errmsg.txt
    1.70.1.36 03/11/18 17:27:55 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/dutch/errmsg.txt
    1.66.1.33 03/11/18 17:27:55 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/danish/errmsg.txt
    1.62.1.33 03/11/18 17:27:55 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  sql/share/czech/errmsg.txt
    1.64.1.33 03/11/18 17:27:55 monty@mashka.mysql.fi +0 -3
    Fix after deleting duplicated error messages

  mysql-test/t/key_cache.test
    1.5 03/11/18 17:27:55 monty@mashka.mysql.fi +1 -1
    Fix after deleting duplicated error messages

  mysql-test/t/fulltext.test
    1.52 03/11/18 17:27:55 monty@mashka.mysql.fi +2 -2
    Fix after deleting duplicated error messages

  mysql-test/t/create.test
    1.33.1.3 03/11/18 17:27:54 monty@mashka.mysql.fi +7 -7
    Fix after deleting duplicated error messages

  mysql-test/r/query_cache.result
    1.26.1.11 03/11/18 17:27:54 monty@mashka.mysql.fi +4 -4
    Fix after deleting duplicated error messages

  myisam/myisamchk.c
    1.92.1.13 03/11/18 17:27:54 monty@mashka.mysql.fi +0 -1
    Delete wrong patch

  myisam/ft_dump.c
    1.22 03/11/18 17:27:54 monty@mashka.mysql.fi +0 -1
    Delete wrong patch

  include/sql_state.h
    1.8 03/11/18 17:27:54 monty@mashka.mysql.fi +0 -3
    Delete duplicate error names

  include/mysqld_error.h
    1.61.1.24 03/11/18 17:27:54 monty@mashka.mysql.fi +6 -9
    Delete duplicate error names

  Docs/internals.texi
    1.1 03/11/18 16:25:07 lenz@mysql.com +101 -0

  Docs/internals.texi
    1.0 03/11/18 16:25:07 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.1-build/Docs/internals.texi

ChangeSet
  1.1604.1.1 03/11/18 17:04:52 sergefp@mysql.com +4 -0
  Fix for bug #1820

  BitKeeper/etc/logging_ok
    1.233.1.33 03/11/18 17:04:52 sergefp@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/uniques.cc
    1.16 03/11/18 17:04:47 sergefp@mysql.com +2 -1
    Fix for bug #1820

  mysql-test/t/multi_update.test
    1.26 03/11/18 17:04:47 sergefp@mysql.com +35 -0
    Test for bug #1820

  mysql-test/r/multi_update.result
    1.25 03/11/18 17:04:47 sergefp@mysql.com +22 -0
    Test for bug #1820

ChangeSet
  1.1346.418.4 03/11/18 15:58:27 Sinisa@sinisa.nasamreza.org +3 -0
  Fix for bug when zeros are to be prepended to decimal field

  sql/field.cc
    1.51.1.27 03/11/18 15:57:47 Sinisa@sinisa.nasamreza.org +2 -2
    Fix for bug when zeros are to be prepended to decimal field

  mysql-test/t/type_decimal.test
    1.8.1.3 03/11/18 15:57:47 Sinisa@sinisa.nasamreza.org +6 -0
    Fix for bug when zeros are to be prepended to decimal field

  mysql-test/r/type_decimal.result
    1.11.1.2 03/11/18 15:57:46 Sinisa@sinisa.nasamreza.org +6 -0
    Fix for bug when zeros are to be prepended to decimal field

ChangeSet
  1.1605 03/11/18 13:51:48 monty@mashka.mysql.fi +37 -0
  merge

  include/mysqld_error.h
    1.61.1.23 03/11/18 13:51:42 monty@mashka.mysql.fi +2 -3
    merge

  sql/share/ukrainian/errmsg.txt
    1.27.1.29 03/11/18 13:48:04 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/swedish/errmsg.txt
    1.64.1.32 03/11/18 13:48:04 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/spanish/errmsg.txt
    1.64.1.33 03/11/18 13:48:04 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/slovak/errmsg.txt
    1.64.1.32 03/11/18 13:48:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/serbian/errmsg.txt
    1.18.1.30 03/11/18 13:48:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/russian/errmsg.txt
    1.61.1.30 03/11/18 13:48:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/romanian/errmsg.txt
    1.62.1.32 03/11/18 13:48:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/portuguese/errmsg.txt
    1.64.1.31 03/11/18 13:48:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.63.1.32 03/11/18 13:48:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/norwegian/errmsg.txt
    1.63.1.33 03/11/18 13:48:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.32 03/11/18 13:48:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/korean/errmsg.txt
    1.63.1.32 03/11/18 13:48:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/japanese/errmsg.txt
    1.63.1.31 03/11/18 13:48:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/italian/errmsg.txt
    1.70.1.33 03/11/18 13:48:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/hungarian/errmsg.txt
    1.65.1.31 03/11/18 13:48:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/greek/errmsg.txt
    1.64.1.31 03/11/18 13:48:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/german/errmsg.txt
    1.64.1.32 03/11/18 13:48:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/french/errmsg.txt
    1.63.1.32 03/11/18 13:48:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/estonian/errmsg.txt
    1.64.1.31 03/11/18 13:48:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_table.cc
    1.157.2.20 03/11/18 13:48:02 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.1.30 03/11/18 13:48:02 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_db.cc
    1.68.1.19 03/11/18 13:48:02 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.70.1.35 03/11/18 13:48:02 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/dutch/errmsg.txt
    1.66.1.32 03/11/18 13:48:02 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/danish/errmsg.txt
    1.62.1.32 03/11/18 13:48:02 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/czech/errmsg.txt
    1.64.1.32 03/11/18 13:48:02 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/set_var.cc
    1.34.1.40 03/11/18 13:48:02 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.63 03/11/18 13:48:01 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.47.1 03/11/18 13:48:01 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_func.cc
    1.124.16.1 03/11/18 13:48:01 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.37.1 03/11/18 13:48:01 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.75 03/11/18 13:48:01 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/func_str.result
    1.47 03/11/18 13:48:01 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/fulltext.result
    1.53 03/11/18 13:48:01 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/myisamchk.c
    1.92.1.12 03/11/18 13:48:01 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/ft_nlq_search.c
    1.29 03/11/18 13:48:01 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1590.12.1 03/11/18 13:47:27 monty@mashka.mysql.fi +125 -0
  CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
  New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables.
  ALTER TABLE table_name ... CHARACTER SET  ... now changes all char/varchar/text columns to the given character set
  (One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set)
  Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib)
  New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones)
  Removed compiler warnings
  Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag.

  mysys/mf_keycaches.c
    1.1 03/11/18 13:47:21 monty@mashka.mysql.fi +359 -0

  sql/unireg.h
    1.31 03/11/18 13:47:21 monty@mashka.mysql.fi +9 -6
    A

  sql/table.h
    1.55 03/11/18 13:47:21 monty@mashka.mysql.fi +2 -28
    New key cache handling (this is now done in mysys/mf_keycaches.c)

  sql/table.cc
    1.91 03/11/18 13:47:21 monty@mashka.mysql.fi +4 -2
    table_charset -> default_table_charset

  sql/structs.h
    1.32 03/11/18 13:47:21 monty@mashka.mysql.fi +1 -1
    Added SHOW_KEY_CACHE_LONG (to get values from sql_key_cache)

  mysys/mf_keycaches.c
    1.0 03/11/18 13:47:21 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.1/mysys/mf_keycaches.c

  sql/sql_yacc.yy
    1.203.84.1 03/11/18 13:47:20 monty@mashka.mysql.fi +40 -31
    Changed syntax for CACHE INDEX ...
    Force user to use DEFAULT before database/table level character sets

  sql/sql_test.cc
    1.29 03/11/18 13:47:20 monty@mashka.mysql.fi +52 -31
    Write information from all key caches

  sql/sql_table.cc
    1.157.18.1 03/11/18 13:47:20 monty@mashka.mysql.fi +51 -74
    table_charset -> default_table_charset
    New multi-key-cache handling

  sql/sql_show.cc
    1.122.4.13 03/11/18 13:47:20 monty@mashka.mysql.fi +6 -1
    Add DEFAULT before CHARSET (for table character sets)
    Fetch key cache variables from 'sql_key_cache'

  sql/sql_parse.cc
    1.271.44.1 03/11/18 13:47:20 monty@mashka.mysql.fi +52 -6
    Support for mysql_set_server_option()
    Reset "default" keycache status variables in 'FLUSH STATUS' (Need to be improved later)
    

  sql/sql_lex.h
    1.102.26.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -1
    New option to store a name and length

  sql/sql_lex.cc
    1.94.2.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -1
    CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS

  sql/sql_delete.cc
    1.99.6.1 03/11/18 13:47:20 monty@mashka.mysql.fi +2 -3
    table_charset -> default_table_charset

  sql/sql_db.cc
    1.68.3.1 03/11/18 13:47:20 monty@mashka.mysql.fi +20 -16
    table_charset -> default_table_charset

  sql/sql_base.cc
    1.145.1.20 03/11/18 13:47:20 monty@mashka.mysql.fi +26 -134
    Removed all key_cache handling (this is now done on MyISAM level)
    Change table_charset -> default_table_charset

  sql/share/ukrainian/errmsg.txt
    1.27.13.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/swedish/errmsg.txt
    1.64.14.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/spanish/errmsg.txt
    1.64.17.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/slovak/errmsg.txt
    1.64.15.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/serbian/errmsg.txt
    1.18.13.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/russian/errmsg.txt
    1.61.13.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/romanian/errmsg.txt
    1.62.15.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/portuguese/errmsg.txt
    1.64.16.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/polish/errmsg.txt
    1.63.14.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/norwegian/errmsg.txt
    1.63.15.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/norwegian-ny/errmsg.txt
    1.63.15.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/korean/errmsg.txt
    1.63.14.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/japanese/errmsg.txt
    1.63.14.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/italian/errmsg.txt
    1.70.15.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/hungarian/errmsg.txt
    1.65.14.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/greek/errmsg.txt
    1.64.14.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/german/errmsg.txt
    1.64.15.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/french/errmsg.txt
    1.63.15.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/estonian/errmsg.txt
    1.64.14.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/english/errmsg.txt
    1.70.17.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/dutch/errmsg.txt
    1.66.15.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/danish/errmsg.txt
    1.62.15.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/czech/errmsg.txt
    1.64.15.1 03/11/18 13:47:20 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/set_var.h
    1.37 03/11/18 13:47:20 monty@mashka.mysql.fi +22 -56
    Support for new key cache variables

  sql/set_var.cc
    1.34.26.1 03/11/18 13:47:20 monty@mashka.mysql.fi +143 -116
    Support for new key cache variables

  sql/protocol.cc
    1.56.1.19 03/11/18 13:47:20 monty@mashka.mysql.fi +12 -1
    SELECT didn't work reliable in multi-statements

  sql/mysqld.cc
    1.356.37.1 03/11/18 13:47:20 monty@mashka.mysql.fi +32 -39
    New multi-key-cache handling
    Fixed that variable have_compress is set correctly

  sql/mysql_priv.h
    1.186.46.1 03/11/18 13:47:20 monty@mashka.mysql.fi +8 -7
    New multi-key-cache functions
    Removed LOCK_assign

  sql/item_func.cc
    1.124.15.1 03/11/18 13:47:19 monty@mashka.mysql.fi +4 -1
    Indentation cleanup

  sql/item_cmpfunc.h
    1.70 03/11/18 13:47:19 monty@mashka.mysql.fi +8 -1
    Added cleanup function

  sql/item.h
    1.56.1.43 03/11/18 13:47:19 monty@mashka.mysql.fi +2 -1
    Added function cleanup() (Needed for prepared statements / cursors)

  sql/handler.h
    1.89 03/11/18 13:47:19 monty@mashka.mysql.fi +8 -2
    New multi key cache handling
    Added support for default character set

  sql/handler.cc
    1.103 03/11/18 13:47:19 monty@mashka.mysql.fi +54 -33
    New multi key cache handling

  sql/ha_myisammrg.cc
    1.46 03/11/18 13:47:19 monty@mashka.mysql.fi +3 -6
    Fixed multiple key_cache handling
    (Now done on MyISAM level)

  sql/ha_myisam.cc
    1.115.1.13 03/11/18 13:47:19 monty@mashka.mysql.fi +14 -89
    Fixed multiple key_cache handling
    (Now done on MyISAM level)

  sql-common/client.c
    1.37 03/11/18 13:47:19 monty@mashka.mysql.fi +14 -2
    CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
    Fixed the multi_result flag is set also on SELECT;s

  mysys/typelib.c
    1.11 03/11/18 13:47:19 monty@mashka.mysql.fi +22 -9
    Fixed function comments

  mysys/my_thr_init.c
    1.24 03/11/18 13:47:19 monty@mashka.mysql.fi +1 -3
    Remove not used mutex THR_LOCK_keycache

  mysys/my_getopt.c
    1.39 03/11/18 13:47:19 monty@mashka.mysql.fi +63 -46
    Ensure that we initialize option->value, option->max_value and value from GET_ASK_ADDR

  mysys/my_bitmap.c
    1.17 03/11/18 13:47:19 monty@mashka.mysql.fi +37 -11
    More debugging
    Safe bitmap_free()
    Fixed indentation

  mysys/mf_keycache.c
    1.32 03/11/18 13:47:19 monty@mashka.mysql.fi +195 -154
    Removed compiler warnings
    Striped end space
    Fixed indentation and improved function comments
    TRUE -> 1
    Changed parameters to end_key_cache() to make it easer to use
    Fixed bug when using key blocks size > 1024 bytes (First part of index file could be overwritten with wrong data)
    Split function flush_key_blocks into two functions to not get mutex used twice when called from flush_all_key_blocks()

  mysys/hash.c
    1.29 03/11/18 13:47:19 monty@mashka.mysql.fi +1 -1
    TRUE -> 1

  mysys/Makefile.am
    1.50 03/11/18 13:47:19 monty@mashka.mysql.fi +1 -1
    Added mf_keycaches.c

  mysql-test/t/union.test
    1.44 03/11/18 13:47:19 monty@mashka.mysql.fi +1 -1
    Use STRAIGHT_JOIN to make join order predictable

  mysql-test/t/preload.test
    1.5 03/11/18 13:47:19 monty@mashka.mysql.fi +4 -4
    Update for new syntax

  mysql-test/t/key_cache.test
    1.4 03/11/18 13:47:19 monty@mashka.mysql.fi +26 -10
    Update test for new key cache syntax.
    Added more tests

  mysql-test/t/join.test
    1.21 03/11/18 13:47:19 monty@mashka.mysql.fi +1 -1
    Update test now when we only support 61 tables in join

  mysql-test/t/isam.test
    1.9 03/11/18 13:47:19 monty@mashka.mysql.fi +2 -0
    Use disable warnings for test loop

  mysql-test/t/derived.test
    1.28.1.1 03/11/18 13:47:19 monty@mashka.mysql.fi +4 -4
    Use STRAIGHT_JOIN to make join order predictable

  mysql-test/t/ctype_many.test
    1.17 03/11/18 13:47:19 monty@mashka.mysql.fi +1 -1
    Update result for DEFAULT CHARSET...

  mysql-test/t/alter_table.test
    1.18 03/11/18 13:47:19 monty@mashka.mysql.fi +11 -0
    Testing of ALTER TABLE ... [DEFAULT] CHARACTER SET

  mysql-test/r/union.result
    1.46 03/11/18 13:47:19 monty@mashka.mysql.fi +1 -1
    Use STRAIGHT_JOIN to make join order predictable

  mysql-test/r/type_set.result
    1.8 03/11/18 13:47:19 monty@mashka.mysql.fi +2 -2
    Update result for DEFAULT CHARSET...

  mysql-test/r/type_nchar.result
    1.3 03/11/18 13:47:19 monty@mashka.mysql.fi +7 -7
    Update result for DEFAULT CHARSET...

  mysql-test/r/type_enum.result
    1.11 03/11/18 13:47:19 monty@mashka.mysql.fi +2 -2
    Update result for DEFAULT CHARSET...

  mysql-test/r/type_blob.result
    1.28 03/11/18 13:47:19 monty@mashka.mysql.fi +1 -1
    Update result for DEFAULT CHARSET...

  mysql-test/r/subselect.result
    1.67.36.1 03/11/18 13:47:19 monty@mashka.mysql.fi +4 -4
    Update result for DEFAULT CHARSET...

  mysql-test/r/sql_mode.result
    1.5 03/11/18 13:47:19 monty@mashka.mysql.fi +3 -3
    Update result for DEFAULT CHARSET...

  mysql-test/r/show_check.result
    1.31.1.8 03/11/18 13:47:19 monty@mashka.mysql.fi +9 -9
    Update result for DEFAULT CHARSET...

  mysql-test/r/preload.result
    1.4 03/11/18 13:47:19 monty@mashka.mysql.fi +4 -4
    New syntax

  mysql-test/r/merge.result
    1.27 03/11/18 13:47:18 monty@mashka.mysql.fi +10 -10
    Update result for DEFAULT CHARSET...

  mysql-test/r/key_cache.result
    1.5 03/11/18 13:47:18 monty@mashka.mysql.fi +33 -8
    Update test for new key cache syntax.
    Added more tests

  mysql-test/r/innodb.result
    1.73.1.1 03/11/18 13:47:18 monty@mashka.mysql.fi +1 -1
    Update result for DEFAULT CHARSET...

  mysql-test/r/gis-rtree.result
    1.3 03/11/18 13:47:18 monty@mashka.mysql.fi +2 -2
    Update result for DEFAULT CHARSET...

  mysql-test/r/func_system.result
    1.14 03/11/18 13:47:18 monty@mashka.mysql.fi +1 -1
    Update result for DEFAULT CHARSET...

  mysql-test/r/func_str.result
    1.45.1.1 03/11/18 13:47:18 monty@mashka.mysql.fi +1 -1
    Update result for DEFAULT CHARSET...

  mysql-test/r/fulltext.result
    1.50.1.1 03/11/18 13:47:18 monty@mashka.mysql.fi +1 -1
    Update result for DEFAULT CHARSET...

  mysql-test/r/derived.result
    1.30.1.1 03/11/18 13:47:18 monty@mashka.mysql.fi +4 -4
    Use STRAIGHT_JOIN to make join order predictable

  mysql-test/r/ctype_ucs.result
    1.4 03/11/18 13:47:18 monty@mashka.mysql.fi +1 -1
    Update result for DEFAULT CHARSET...

  mysql-test/r/ctype_recoding.result
    1.13 03/11/18 13:47:18 monty@mashka.mysql.fi +4 -4
    Update result for DEFAULT CHARSET...

  mysql-test/r/ctype_mb.result
    1.4 03/11/18 13:47:18 monty@mashka.mysql.fi +5 -5
    Update result for DEFAULT CHARSET...

  mysql-test/r/ctype_many.result
    1.7 03/11/18 13:47:18 monty@mashka.mysql.fi +897 -896
    Update result for DEFAULT CHARSET...

  mysql-test/r/ctype_latin1_de.result
    1.14 03/11/18 13:47:17 monty@mashka.mysql.fi +2 -2
    Update result for DEFAULT CHARSET...

  mysql-test/r/ctype_collate.result
    1.21 03/11/18 13:47:17 monty@mashka.mysql.fi +4 -4
    Update result for DEFAULT CHARSET...

  mysql-test/r/create.result
    1.53.1.1 03/11/18 13:47:17 monty@mashka.mysql.fi +10 -10
    Update result for DEFAULT CHARSET...

  mysql-test/r/cast.result
    1.11 03/11/18 13:47:17 monty@mashka.mysql.fi +3 -3
    Update result for DEFAULT CHARSET...

  mysql-test/r/case.result
    1.11 03/11/18 13:47:17 monty@mashka.mysql.fi +2 -2
    Update result for DEFAULT CHARSET...

  mysql-test/r/alter_table.result
    1.23 03/11/18 13:47:17 monty@mashka.mysql.fi +23 -0
    Testing of ALTER TABLE ... [DEFAULT] CHARACTER SET

  mysql-test/mysql-test-run.sh
    1.167.1.13 03/11/18 13:47:17 monty@mashka.mysql.fi +2 -2
    Fixed web link
    Added name of failed test to abort row.

  myisam/myisamlog.c
    1.24 03/11/18 13:47:17 monty@mashka.mysql.fi +2 -2
    Change how end_key_cache() is called

  myisam/myisamdef.h
    1.59.1.11 03/11/18 13:47:17 monty@mashka.mysql.fi +3 -2
    Remove reg_keycache
    Add unique_name_length for storing length of unique_file_name

  myisam/myisamchk.c
    1.92.4.1 03/11/18 13:47:17 monty@mashka.mysql.fi +5 -3
    update for multiple key caches

  myisam/mi_test3.c
    1.13 03/11/18 13:47:17 monty@mashka.mysql.fi +1 -1
    Use KEY_CACHE_BLOCK_SIZE instead of 512

  myisam/mi_test2.c
    1.23 03/11/18 13:47:17 monty@mashka.mysql.fi +4 -4
    Always test resize_key_cache()

  myisam/mi_test1.c
    1.19 03/11/18 13:47:17 monty@mashka.mysql.fi +1 -1
    Use KEY_CACHE_BLOCK_SIZE

  myisam/mi_preload.c
    1.6 03/11/18 13:47:17 monty@mashka.mysql.fi +3 -3
    keycache -> key_cache

  myisam/mi_panic.c
    1.9 03/11/18 13:47:17 monty@mashka.mysql.fi +1 -1
    keycache -> key_cache

  myisam/mi_page.c
    1.17 03/11/18 13:47:17 monty@mashka.mysql.fi +5 -4
    keycache -> key_cache

  myisam/mi_open.c
    1.73 03/11/18 13:47:17 monty@mashka.mysql.fi +2 -0
    Fetch key cache to use from multi_key_cache_search()

  myisam/mi_locking.c
    1.31 03/11/18 13:47:17 monty@mashka.mysql.fi +3 -12
    Don't change key cache on unlock (must be done before)

  myisam/mi_keycache.c
    1.4 03/11/18 13:47:17 monty@mashka.mysql.fi +109 -61
    Changed logic so that it's MyISAM that is responsible for assign tables to different key caches instead of the upper level
    

  myisam/mi_extra.c
    1.37 03/11/18 13:47:17 monty@mashka.mysql.fi +1 -4
    keycache -> key_cache
    Removed HA_EXTRA_SET_KEY_CACHE

  myisam/mi_delete_all.c
    1.14 03/11/18 13:47:17 monty@mashka.mysql.fi +1 -1
    keycache -> key_cache

  myisam/mi_close.c
    1.16 03/11/18 13:47:17 monty@mashka.mysql.fi +1 -1
    keycache -> key_cache

  myisam/mi_checksum.c
    1.7 03/11/18 13:47:17 monty@mashka.mysql.fi +0 -1
    Removed not used variable

  myisam/mi_check.c
    1.105.1.10 03/11/18 13:47:17 monty@mashka.mysql.fi +18 -16
    Clean up multi-key-cache usage

  myisam/ft_static.c
    1.24 03/11/18 13:47:17 monty@mashka.mysql.fi +6 -2
    Removed compiler warning and fixed wrong return value

  myisam/ft_nlq_search.c
    1.26.1.1 03/11/18 13:47:17 monty@mashka.mysql.fi +2 -1
    Removed compiler warning

  libmysql/libmysql.def
    1.20 03/11/18 13:47:17 monty@mashka.mysql.fi +1 -0
    Added mysql_set_server_option()

  libmysql/libmysql.c
    1.156.1.37 03/11/18 13:47:17 monty@mashka.mysql.fi +12 -2
    Added mysql_set_server_option()

  innobase/srv/srv0start.c
    1.50 03/11/18 13:47:17 monty@mashka.mysql.fi +0 -3
    Removed warning that is confused for MySQL users

  include/mysqld_error.h
    1.61.12.1 03/11/18 13:47:17 monty@mashka.mysql.fi +2 -1
    Added error message for unknown key cache

  include/mysql_com.h
    1.67.1.19 03/11/18 13:47:17 monty@mashka.mysql.fi +10 -2
    CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
    Added enum_mysql_set_option

  include/mysql.h
    1.99 03/11/18 13:47:17 monty@mashka.mysql.fi +3 -0
    Added mysql_set_server_option

  include/myisam.h
    1.54 03/11/18 13:47:17 monty@mashka.mysql.fi +5 -5
    Added function to handle multi-key-caches

  include/my_sys.h
    1.111 03/11/18 13:47:17 monty@mashka.mysql.fi +20 -11
    Added function for multi-key-caches

  include/my_no_pthread.h
    1.6 03/11/18 13:47:17 monty@mashka.mysql.fi +5 -1
    Add defines to ignore rw-locks when running without threads

  include/my_base.h
    1.47 03/11/18 13:47:17 monty@mashka.mysql.fi +5 -5
    Remove HA_EXTRA_SET_KEY_CACHE

  client/mysql.cc
    1.121.1.25 03/11/18 13:47:17 monty@mashka.mysql.fi +1 -1
    CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS

  BUILD/compile-pentium-valgrind-max
    1.9 03/11/18 13:47:17 monty@mashka.mysql.fi +2 -1
    Add test of isam

ChangeSet
  1.1604 03/11/18 10:23:49 serg@serg.mylan +32 -0
  word substitution in error messages removed - can create problems for i18n

  sql/sql_table.cc
    1.157.2.19 03/11/18 10:23:44 serg@serg.mylan +3 -3
    word substitution in error messages removed - can create problems for i18n

  sql/sql_parse.cc
    1.271.1.29 03/11/18 10:23:44 serg@serg.mylan +13 -13
    word substitution in error messages removed - can create problems for i18n

  sql/sql_db.cc
    1.68.1.18 03/11/18 10:23:44 serg@serg.mylan +2 -2
    word substitution in error messages removed - can create problems for i18n

  sql/share/ukrainian/errmsg.txt
    1.27.1.28 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/swedish/errmsg.txt
    1.64.1.31 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/spanish/errmsg.txt
    1.64.1.32 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/slovak/errmsg.txt
    1.64.1.31 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/serbian/errmsg.txt
    1.18.1.29 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/russian/errmsg.txt
    1.61.1.29 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/romanian/errmsg.txt
    1.62.1.31 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/portuguese/errmsg.txt
    1.64.1.30 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/polish/errmsg.txt
    1.63.1.31 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/norwegian/errmsg.txt
    1.63.1.32 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.31 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/korean/errmsg.txt
    1.63.1.31 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/japanese/errmsg.txt
    1.63.1.30 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/italian/errmsg.txt
    1.70.1.32 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/hungarian/errmsg.txt
    1.65.1.30 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/greek/errmsg.txt
    1.64.1.30 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/german/errmsg.txt
    1.64.1.31 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/french/errmsg.txt
    1.63.1.31 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/estonian/errmsg.txt
    1.64.1.30 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/english/errmsg.txt
    1.70.1.34 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/dutch/errmsg.txt
    1.66.1.31 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/danish/errmsg.txt
    1.62.1.31 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  sql/share/czech/errmsg.txt
    1.64.1.31 03/11/18 10:23:44 serg@serg.mylan +5 -6
    word substitution in error messages removed - can create problems for i18n

  mysql-test/t/overflow.test
    1.7 03/11/18 10:23:44 serg@serg.mylan +1 -1
    word substitution in error messages removed - can create problems for i18n

  mysql-test/t/fulltext.test
    1.51 03/11/18 10:23:44 serg@serg.mylan +2 -2
    word substitution in error messages removed - can create problems for i18n

  mysql-test/t/create.test
    1.33.1.2 03/11/18 10:23:44 serg@serg.mylan +2 -2
    word substitution in error messages removed - can create problems for i18n

  mysql-test/r/query_cache.result
    1.26.1.10 03/11/18 10:23:44 serg@serg.mylan +4 -4
    word substitution in error messages removed - can create problems for i18n

  include/sql_state.h
    1.7 03/11/18 10:23:44 serg@serg.mylan +5 -1
    word substitution in error messages removed - can create problems for i18n

  include/mysqld_error.h
    1.61.1.22 03/11/18 10:23:44 serg@serg.mylan +8 -9
    word substitution in error messages removed - can create problems for i18n

ChangeSet
  1.1599.2.1 03/11/17 22:45:07 bell@sanja.is.com.ua +6 -0
  IGNORE option was added for DELETE statement (WL#1334)

  sql/sql_yacc.yy
    1.203.83.1 03/11/17 22:45:05 bell@sanja.is.com.ua +2 -1
    add IGNORE option for DELETE command

  sql/sql_delete.cc
    1.99.2.13 03/11/17 22:45:05 bell@sanja.is.com.ua +3 -0
    set errors ignoring for simple delete command

  mysql-test/t/subselect.test
    1.58.1.34 03/11/17 22:45:05 bell@sanja.is.com.ua +0 -18
    test moved to delete.test

  mysql-test/t/delete.test
    1.13 03/11/17 22:45:05 bell@sanja.is.com.ua +28 -1
    test of new IGNORE option for DELETE

  mysql-test/r/subselect.result
    1.67.1.36 03/11/17 22:45:05 bell@sanja.is.com.ua +0 -29
    test moved to delete.test

  mysql-test/r/delete.result
    1.13 03/11/17 22:45:05 bell@sanja.is.com.ua +63 -1
    test of new IGNORE option for DELETE

ChangeSet
  1.1599.1.3 03/11/17 20:53:40 bell@sanja.is.com.ua +10 -0
  fixed using 'uncachable' tag and RAND_TABLE_BIT setting

  sql/sql_yacc.yy
    1.203.1.72 03/11/17 20:53:24 bell@sanja.is.com.ua +11 -11
    specify cause of uncachability

  sql/sql_union.cc
    1.74.1.15 03/11/17 20:53:24 bell@sanja.is.com.ua +2 -2
    used one field for all uncachability causes

  sql/sql_select.cc
    1.216.1.61 03/11/17 20:53:24 bell@sanja.is.com.ua +4 -2
    used one field for all uncachability causes

  sql/sql_lex.h
    1.102.1.36 03/11/17 20:53:24 bell@sanja.is.com.ua +11 -4
    used one field for all uncachability causes

  sql/sql_lex.cc
    1.94.1.1 03/11/17 20:53:24 bell@sanja.is.com.ua +5 -4
    specify cause of uncachability

  sql/mysql_priv.h
    1.186.1.47 03/11/17 20:53:24 bell@sanja.is.com.ua +5 -0
    causes of uncachability

  sql/item_subselect.h
    1.47 03/11/17 20:53:24 bell@sanja.is.com.ua +4 -8
    used one field for all uncachability causes

  sql/item_subselect.cc
    1.60.1.28 03/11/17 20:53:24 bell@sanja.is.com.ua +13 -22
    fixed setting RAND_TABLE_BIT
    specify cause of uncachability

  sql/item_func.cc
    1.124.1.41 03/11/17 20:53:24 bell@sanja.is.com.ua +2 -2
    specify cause of uncachability

  sql/item_create.cc
    1.33.1.23 03/11/17 20:53:24 bell@sanja.is.com.ua +5 -5
    specify cause of uncachability

ChangeSet
  1.1578.22.12 03/11/17 21:24:03 gluh@gluh.mysql.r18.ru +1 -0
  Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
  into gluh.mysql.r18.ru:/home/gluh/mysql-5.0.sp

  sql/sp_head.cc
    1.49 03/11/17 21:24:01 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1578.32.1 03/11/17 21:21:36 gluh@gluh.mysql.r18.ru +36 -0
  WL#1241: SHOW PROCEDURE/FUNCTION
  WL#1263: Support for the attributes COMMENT and SUID
           in CREATE/ALTER PROCEDURE/FUNCTION

  sql/sql_yacc.yy
    1.248 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +63 -7
    WL#1241: SHOW PROCEDURE/FUNCTION
    WL#1263: Support for the attributes COMMENT and SUID
             in CREATE/ALTER PROCEDURE/FUNCTION

  sql/sql_parse.cc
    1.304 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +67 -10
    WL#1241: SHOW PROCEDURE/FUNCTION
    WL#1263: Support for the attributes COMMENT and SUID
             in CREATE/ALTER PROCEDURE/FUNCTION

  sql/sql_lex.h
    1.123 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +8 -0
    WL#1241: SHOW PROCEDURE/FUNCTION
    WL#1263: Support for the attributes COMMENT and SUID
             in CREATE/ALTER PROCEDURE/FUNCTION

  sql/sp_head.h
    1.25 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +21 -1
    WL#1241: SHOW PROCEDURE/FUNCTION
    WL#1263: Support for the attributes COMMENT and SUID
             in CREATE/ALTER PROCEDURE/FUNCTION

  sql/sp_head.cc
    1.47.1.1 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +50 -11
    WL#1241: SHOW PROCEDURE/FUNCTION
    WL#1263: Support for the attributes COMMENT and SUID
             in CREATE/ALTER PROCEDURE/FUNCTION

  sql/sp.h
    1.8 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +22 -0
    WL#1241: SHOW PROCEDURE/FUNCTION
    WL#1263: Support for the attributes COMMENT and SUID
             in CREATE/ALTER PROCEDURE/FUNCTION

  sql/sp.cc
    1.30 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +259 -2
    WL#1241: SHOW PROCEDURE/FUNCTION
    WL#1263: Support for the attributes COMMENT and SUID
             in CREATE/ALTER PROCEDURE/FUNCTION

  sql/share/ukrainian/errmsg.txt
    1.48 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/swedish/errmsg.txt
    1.86 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/spanish/errmsg.txt
    1.85 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/slovak/errmsg.txt
    1.85 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/serbian/errmsg.txt
    1.39 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/russian/errmsg.txt
    1.83 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/romanian/errmsg.txt
    1.82 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/portuguese/errmsg.txt
    1.85 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/polish/errmsg.txt
    1.85 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/norwegian/errmsg.txt
    1.84 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/norwegian-ny/errmsg.txt
    1.84 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/korean/errmsg.txt
    1.84 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/japanese/errmsg.txt
    1.84 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/italian/errmsg.txt
    1.91 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/hungarian/errmsg.txt
    1.86 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/greek/errmsg.txt
    1.85 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/german/errmsg.txt
    1.86 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/french/errmsg.txt
    1.84 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/estonian/errmsg.txt
    1.85 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/english/errmsg.txt
    1.92 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/dutch/errmsg.txt
    1.87 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/danish/errmsg.txt
    1.83 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/share/czech/errmsg.txt
    1.84 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +1 -0
    Error massage for 'alter procedure'

  sql/lex.h
    1.105 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +4 -0
    WL#1241: SHOW PROCEDURE/FUNCTION
    WL#1263: Support for the attributes COMMENT and SUID
             in CREATE/ALTER PROCEDURE/FUNCTION

  mysql-test/t/sp.test
    1.33 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +18 -0
    Test for WL#1241&WL#1263

  mysql-test/t/sp-error.test
    1.18 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +6 -0
    Test for WL#1241&WL#1263

  mysql-test/r/sp.result
    1.32 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +52 -0
    Test for WL#1241&WL#1263

  mysql-test/r/sp-error.result
    1.17 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +5 -0
    Test for WL#1241&WL#1263

  include/mysqld_error.h
    1.81 03/11/17 21:21:10 gluh@gluh.mysql.r18.ru +2 -1
    Error code for 'alter procedure'

ChangeSet
  1.1346.1.272 03/11/17 18:34:06 gluh@gluh.mysql.r18.ru +1 -0
  Fix for bug #1564: 'CREATE TABLE + UNION + same table name = crash'
  (related to previous changeset)

  sql/sql_parse.cc
    1.218.1.131 03/11/17 18:34:04 gluh@gluh.mysql.r18.ru +8 -7
    Fix for bug #1564: 'CREATE TABLE + UNION + same table name = crash'
    (related to previous changeset)

ChangeSet
  1.1346.418.3 03/11/17 16:16:56 monty@mashka.mysql.fi +3 -0
  Merge with 3.23 (only comment changes)

  sql/mini_client.cc
    1.48.6.1 03/11/17 16:16:53 monty@mashka.mysql.fi +2 -4
    Get comment from 3.23

  mysys/thr_alarm.c
    1.41 03/11/17 16:16:53 monty@mashka.mysql.fi +1 -1
    Get comment from 3.23

  BUILD/compile-pentium-gcov
    1.12 03/11/17 16:16:53 monty@mashka.mysql.fi +0 -1
    Use local file

ChangeSet
  1.1594.1.1 03/11/17 18:02:08 gluh@gluh.mysql.r18.ru +7 -0
  WL#1253: LAST_DAY

  sql/lex.h
    1.82.1.47 03/11/17 18:01:38 gluh@gluh.mysql.r18.ru +2 -1
    WL#1253: LAST_DAY

  sql/item_timefunc.h
    1.42 03/11/17 18:01:38 gluh@gluh.mysql.r18.ru +18 -0
    WL#1253: LAST_DAY

  sql/item_timefunc.cc
    1.48 03/11/17 18:01:38 gluh@gluh.mysql.r18.ru +16 -0
    WL#1253: LAST_DAY

  sql/item_create.h
    1.34 03/11/17 18:01:38 gluh@gluh.mysql.r18.ru +1 -0
    WL#1253: LAST_DAY

  sql/item_create.cc
    1.33.1.22 03/11/17 18:01:38 gluh@gluh.mysql.r18.ru +5 -0
    WL#1253: LAST_DAY

  mysql-test/t/func_time.test
    1.21 03/11/17 18:01:38 gluh@gluh.mysql.r18.ru +13 -0
    Test for WL#1253: LAST_DAY

  mysql-test/r/func_time.result
    1.23 03/11/17 18:01:38 gluh@gluh.mysql.r18.ru +17 -0
    Test for WL#1253: LAST_DAY

ChangeSet
  1.1578.22.11 03/11/17 13:33:47 pem@mysql.comhem.se +1 -0
  Bugfix, handling null values.

  sql/sp_head.cc
    1.48 03/11/17 13:33:44 pem@mysql.com +1 -1
    Bugfix, handling null values.

ChangeSet
  1.1346.418.2 03/11/17 13:10:07 monty@mashka.mysql.fi +1 -0
  Merge service name code

  sql/mysqld.cc
    1.297.1.164 03/11/17 13:10:05 monty@mashka.mysql.fi +0 -8
    Merge service name code

ChangeSet
  1.1346.419.1 03/11/17 13:06:32 monty@mashka.mysql.fi +3 -0
  Fix for service names on windows;  Now we always put the service name last when we create a service
  

  sql/mysqld.cc
    1.297.35.1 03/11/17 13:06:28 monty@mashka.mysql.fi +8 -6
    Fix for service names on windows;  Now we always put the service name last when we create a service

  mysys/mf_keycache.c
    1.21.1.2 03/11/17 13:06:28 monty@mashka.mysql.fi +1 -1
    Fixed comment

  myisam/mi_test2.c
    1.12.1.5 03/11/17 13:06:28 monty@mashka.mysql.fi +2 -2
    Moved test so that resize_key_cache() is always tested

ChangeSet
  1.676.313.1 03/11/17 12:59:07 monty@mashka.mysql.fi +2 -0
  Safety fix for alarms on windows.

  sql/mini_client.cc
    1.19.1.10 03/11/17 12:59:06 monty@mashka.mysql.fi +11 -6
    Added comments

  mysys/thr_alarm.c
    1.17.1.1 03/11/17 12:59:06 monty@mashka.mysql.fi +2 -1
    Safety fix for alarms on windows

ChangeSet
  1.1346.417.3 03/11/16 17:37:15 serg@serg.mylan +5 -0
  Item_uint::save_in_field() added to take into account bigint->decimal case

  sql/item.h
    1.20.1.21 03/11/16 17:37:12 serg@serg.mylan +2 -1
    Item_uint::save_in_field() added to take into account bigint->decimal case

  sql/item.cc
    1.19.1.13 03/11/16 17:37:12 serg@serg.mylan +13 -0
    Item_uint::save_in_field() added to take into account bigint->decimal case

  mysql-test/t/bigint.test
    1.12.1.5 03/11/16 17:37:12 serg@serg.mylan +12 -0
    Item_uint::save_in_field() added to take into account bigint->decimal case

  mysql-test/r/bigint.result
    1.14.1.4 03/11/16 17:37:12 serg@serg.mylan +8 -0
    Item_uint::save_in_field() added to take into account bigint->decimal case

  BitKeeper/etc/ignore
    1.107.1.45 03/11/16 17:37:12 serg@serg.mylan +1 -0
    Added sql/udf_example.so to the ignore list

ChangeSet
  1.1346.418.1 03/11/15 19:37:54 vva@eagle.mysql.r18.ru +2 -0
  fixed bug #1650 "mysql_config --libmysqd-libs misses libwrap"

  scripts/mysql_config.sh
    1.7.1.3 03/11/15 19:37:30 vva@eagle.mysql.r18.ru +1 -1
    added @WRAPLIBS@ to embedded_libs option line 

  scripts/Makefile.am
    1.21.1.10 03/11/15 19:37:30 vva@eagle.mysql.r18.ru +1 -0
    added processing of @WRAPLIBS@ in scripts

ChangeSet
  1.1599.1.1 03/11/15 21:52:21 bell@sanja.is.com.ua +3 -0
  fixed error handling inside su_select() for multidelete
  (BUG#1839)

  sql/sql_select.cc
    1.216.1.60 03/11/15 21:52:04 bell@sanja.is.com.ua +3 -2
    check of errors inside sub_select to prevent deleting rows in case of errors 

  mysql-test/t/subselect.test
    1.58.1.33 03/11/15 21:52:04 bell@sanja.is.com.ua +19 -1
    test case for BUG#1839

  mysql-test/r/subselect.result
    1.67.1.35 03/11/15 21:52:04 bell@sanja.is.com.ua +29 -0
    test case for BUG#1839

ChangeSet
  1.1602 03/11/15 12:30:32 serg@serg.mylan +2 -0
  cleanup

  mysql-test/t/innodb.test
    1.49 03/11/15 12:30:28 serg@serg.mylan +1 -1
    cleanup

  mysql-test/r/innodb.result
    1.74 03/11/15 12:30:28 serg@serg.mylan +1 -1
    cleanup

ChangeSet
  1.1346.417.2 03/11/14 22:08:45 serg@serg.mylan +1 -0
  obligatory update checksum on repair, if it is obligatory verified on check.

  myisam/mi_check.c
    1.86.1.39 03/11/14 22:08:42 serg@serg.mylan +9 -0
    obligatory update checksum on repair, if it is obligatory verified on check.

ChangeSet
  1.1601 03/11/14 13:50:19 serg@serg.mylan +2 -0
  do not log certain commans in the slow log

  sql/sql_parse.cc
    1.271.1.28 03/11/14 13:50:15 serg@serg.mylan +17 -9
    do not log certain commans in the slow log

  sql/sql_class.h
    1.146.1.49 03/11/14 13:50:15 serg@serg.mylan +7 -6
    do not log certain commans in the slow log

ChangeSet
  1.1578.22.10 03/11/14 13:46:50 pem@mysql.comhem.se +27 -0
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
  Also fixed memory leak when aborting parsing for a duplicate cursor.

  sql/sql_yacc.yy
    1.247 03/11/14 13:46:47 pem@mysql.com +7 -6
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)
    Also fixed memory leak when aborting parsing for a duplicate cursor.

  sql/share/ukrainian/errmsg.txt
    1.47 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/swedish/errmsg.txt
    1.85 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/spanish/errmsg.txt
    1.84 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/slovak/errmsg.txt
    1.84 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/serbian/errmsg.txt
    1.38 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/russian/errmsg.txt
    1.82 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/romanian/errmsg.txt
    1.81 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/portuguese/errmsg.txt
    1.84 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/polish/errmsg.txt
    1.84 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/norwegian/errmsg.txt
    1.83 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/norwegian-ny/errmsg.txt
    1.83 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/korean/errmsg.txt
    1.83 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/japanese/errmsg.txt
    1.83 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/italian/errmsg.txt
    1.90 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/hungarian/errmsg.txt
    1.85 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/greek/errmsg.txt
    1.84 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/german/errmsg.txt
    1.85 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/french/errmsg.txt
    1.83 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/estonian/errmsg.txt
    1.84 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/english/errmsg.txt
    1.91 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/dutch/errmsg.txt
    1.86 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/danish/errmsg.txt
    1.82 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  sql/share/czech/errmsg.txt
    1.83 03/11/14 13:46:47 pem@mysql.com +4 -1
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  mysql-test/t/sp-error.test
    1.17 03/11/14 13:46:47 pem@mysql.com +6 -3
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

  mysql-test/r/sp-error.result
    1.16 03/11/14 13:46:47 pem@mysql.com +1 -1
    Fixed error message for duplicate variable.

  include/mysqld_error.h
    1.80 03/11/14 13:46:47 pem@mysql.com +5 -2
    Changed single generic error code/message into different ones for duplicate things.
    (For multi-lingual support.)

ChangeSet
  1.1578.31.1 03/11/13 22:14:37 psergey@psergey.(none) +11 -0
  merging in index_merge (in progress, not yet working)

  sql/sql_update.cc
    1.96 03/11/13 22:14:34 psergey@psergey.(none) +0 -0
    merging in index_merge (in progress, not yet working)

  sql/sql_union.cc
    1.81 03/11/13 22:14:34 psergey@psergey.(none) +1 -2
    merging in index_merge (in progress, not yet working)

  sql/sql_test.cc
    1.21.5.1 03/11/13 22:14:34 psergey@psergey.(none) +0 -0
    merging in index_merge (in progress, not yet working)

  sql/sql_select.h
    1.55.4.1 03/11/13 22:14:34 psergey@psergey.(none) +1 -2
    merging in index_merge (in progress, not yet working)

  sql/sql_select.cc
    1.229 03/11/13 22:14:34 psergey@psergey.(none) +2 -3
    merging in index_merge (in progress, not yet working)

  sql/sql_class.cc
    1.128 03/11/13 22:14:34 psergey@psergey.(none) +0 -0
    merging in index_merge (in progress, not yet working)

  sql/opt_range.h
    1.24.1.3 03/11/13 22:14:34 psergey@psergey.(none) +2 -2
    merging in index_merge (in progress, not yet working)

  sql/opt_range.cc
    1.90.5.1 03/11/13 22:14:34 psergey@psergey.(none) +12 -26
    merging in index_merge (in progress, not yet working)

  sql/opt_ft.h
    1.6 03/11/13 22:14:34 psergey@psergey.(none) +3 -5
    merging in index_merge (in progress, not yet working)

  sql/opt_ft.cc
    1.4 03/11/13 22:14:34 psergey@psergey.(none) +1 -2
    merging in index_merge (in progress, not yet working)

ChangeSet
  1.1578.22.9 03/11/13 19:34:56 pem@mysql.comhem.se +32 -0
  Various bug fixes:
    - Duplicate parameters/variables, conditions and cursors (not allowed).
    - ITERATE in labelled BEGIN-END (not allowed).
    - Missing SQLSTATE [VALUE] keywords in CONDITION/HANDLER declaration (added).
    - Empty BEGIN-END (now allowed).
    - End label (now optional).

  sql/sql_yacc.yy
    1.246 03/11/13 19:34:53 pem@mysql.com +92 -27
    End-labels in SPs loop and begin-end blocks are now optional.
    SQLSTATE [VALUE] added to syntax for sqlstates.
    Check for duplicate variable, condition and cursor declarations, but
    only in the same scope.
    Empty BEGIN-END statements now allowed.
    Check if ITERATE is referring to a BEGIN label.

  sql/sp_pcontext.h
    1.10 03/11/13 19:34:53 pem@mysql.com +17 -3
    Keep track on scope limits for error checking of duplicate variables,
    conditions and cursors.
    Also need to flag BEGIN labels to check for illegal ITERATEs.

  sql/sp_pcontext.cc
    1.13 03/11/13 19:34:53 pem@mysql.com +60 -7
    Keep track on scope limits for error checking of duplicate variables,
    conditions and cursors.

  sql/share/ukrainian/errmsg.txt
    1.46 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/swedish/errmsg.txt
    1.84 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/spanish/errmsg.txt
    1.83 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/slovak/errmsg.txt
    1.83 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/serbian/errmsg.txt
    1.37 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/russian/errmsg.txt
    1.81 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/romanian/errmsg.txt
    1.80 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/portuguese/errmsg.txt
    1.83 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/polish/errmsg.txt
    1.83 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/norwegian/errmsg.txt
    1.82 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/norwegian-ny/errmsg.txt
    1.82 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/korean/errmsg.txt
    1.82 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/japanese/errmsg.txt
    1.82 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/italian/errmsg.txt
    1.89 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/hungarian/errmsg.txt
    1.84 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/greek/errmsg.txt
    1.83 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/german/errmsg.txt
    1.84 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/french/errmsg.txt
    1.82 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/estonian/errmsg.txt
    1.83 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/english/errmsg.txt
    1.90 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/dutch/errmsg.txt
    1.85 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/danish/errmsg.txt
    1.81 03/11/13 19:34:53 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/share/czech/errmsg.txt
    1.82 03/11/13 19:34:52 pem@mysql.com +1 -0
    New error message for duplicate things (vars et al) in SPs.

  sql/lex.h
    1.104 03/11/13 19:34:52 pem@mysql.com +1 -0
    New SQLSTATE keyword.

  mysql-test/t/sp.test
    1.32 03/11/13 19:34:52 pem@mysql.com +44 -3
    New tests for empty begin-end blocks, overriding local variables outside scope
    only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
    declarations.

  mysql-test/t/sp-error.test
    1.16 03/11/13 19:34:52 pem@mysql.com +32 -0
    New error tests for ITERATE in begin-end block and duplicate variables,
    conditions and cursors.

  mysql-test/r/sp.result
    1.31 03/11/13 19:34:52 pem@mysql.com +34 -3
    New tests for empty begin-end blocks, overriding local variables outside scope
    only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
    declarations.

  mysql-test/r/sp-error.result
    1.15 03/11/13 19:34:52 pem@mysql.com +31 -0
    New error tests for ITERATE in begin-end block and duplicate variables,
    conditions and cursors.

  include/mysqld_error.h
    1.79 03/11/13 19:34:52 pem@mysql.com +2 -1
    New error code for duplicate things (vars et al) in SPs.

ChangeSet
  1.1600 03/11/13 17:39:41 serg@serg.mylan +1 -0
  test a correct flag in Field::optimize_range

  sql/field.cc
    1.120 03/11/13 17:39:38 serg@serg.mylan +1 -1
    test a correct flag in Field::optimize_range

  BitKeeper/etc/logging_ok
    1.248 03/11/13 18:02:27 psergey@psergey.(none) +1 -1
    auto-union

ChangeSet
  1.1563.93.1 03/11/13 17:52:02 psergey@psergey.(none) +12 -0
  Added index_merge access method

  BitKeeper/etc/logging_ok
    1.233.15.1 03/11/13 17:31:33 psergey@psergey.(none) +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_update.cc
    1.83.7.1 03/11/13 17:30:24 psergey@psergey.(none) +32 -6
    Added index_merge access method

  sql/sql_union.cc
    1.74.9.1 03/11/13 17:30:24 psergey@psergey.(none) +3 -2
    Added index_merge access method

  sql/sql_test.cc
    1.21.4.1 03/11/13 17:30:24 psergey@psergey.(none) +31 -1
    Added index_merge access method

  sql/sql_select.h
    1.54.1.1 03/11/13 17:30:24 psergey@psergey.(none) +3 -2
    Added index_merge access method

  sql/sql_select.cc
    1.216.42.1 03/11/13 17:30:24 psergey@psergey.(none) +86 -18
    Added index_merge access method

  sql/sql_list.h
    1.22 03/11/13 17:30:24 psergey@psergey.(none) +7 -0
    Added index_merge access method

  sql/sql_class.cc
    1.105.10.1 03/11/13 17:30:24 psergey@psergey.(none) +2 -2
    Added index_merge access method

  sql/opt_range.h
    1.24.2.1 03/11/13 17:30:24 psergey@psergey.(none) +174 -17
    Added index_merge access method

  sql/opt_range.cc
    1.90.4.1 03/11/13 17:30:24 psergey@psergey.(none) +902 -105
    Added index_merge access method

  sql/opt_ft.h
    1.4.1.1 03/11/13 17:30:24 psergey@psergey.(none) +6 -5
    Added index_merge access method

  sql/opt_ft.cc
    1.2.1.1 03/11/13 17:30:24 psergey@psergey.(none) +1 -1
    Added index_merge access method

ChangeSet
  1.1599 03/11/13 14:31:29 serg@serg.mylan +3 -0
  multiple keycache fixes

  mysql-test/r/fulltext.result
    1.52 03/11/13 14:31:25 serg@serg.mylan +1 -1
    result updated

  myisam/myisamchk.c
    1.92.1.11 03/11/13 14:31:25 serg@serg.mylan +1 -0
    multiple keycache fixes

  myisam/ft_dump.c
    1.21 03/11/13 14:31:25 serg@serg.mylan +3 -0
    multiple keycache fixes

ChangeSet
  1.1598 03/11/13 12:54:53 serg@serg.mylan +1 -0
  followup to the ft+latin2 bugfix

  myisam/ft_nlq_search.c
    1.28 03/11/13 12:54:49 serg@serg.mylan +2 -2
    followup to the ft+latin2 bugfix

ChangeSet
  1.1346.417.1 03/11/12 22:33:28 serg@serg.mylan +1 -0
  make error message more detailed

  sql/sql_handler.cc
    1.19.1.17 03/11/12 22:33:25 serg@serg.mylan +2 -2
    make error message more detailed

ChangeSet
  1.1597 03/11/12 12:32:51 lenz@kallisto.local +1 -0
   - added sql_bitmap.h to the source distribution

  sql/Makefile.am
    1.77.1.13 03/11/12 12:32:45 lenz@mysql.com +1 -1
     - added sql_bitmap.h to the source distribution

ChangeSet
  1.1596 03/11/12 03:38:46 greg@mysql.com +4 -0
  Fixed minor compiler errors encountered during pre-final builds.

  strings/my_strtoll10.c
    1.4 03/11/12 03:38:44 greg@mysql.com +1 -1
    Changed constant macro to use LL()-- fixes compiler error under Windows.

  sql/mysqld.cc
    1.356.1.62 03/11/12 03:38:44 greg@mysql.com +2 -2
    my_strcasecmp now needs a charset info parameter.

  sql/mysql_priv.h
    1.186.1.46 03/11/12 03:38:44 greg@mysql.com +1 -1
    Some platforms will not find sql_bitmap.h when angle brackets are used.

  sql/item_func.cc
    1.124.1.40 03/11/12 03:38:44 greg@mysql.com +2 -2
    Goto statement potentially skips declaration of 'i'-- VC++ compiler
    generates an error.

ChangeSet
  1.1595 03/11/12 02:25:01 greg@mysql.com +1 -0
  Resolved build problem: undeclared macros

  strings/my_strtoll10.c
    1.3 03/11/12 02:24:59 greg@mysql.com +1 -0
    Include my_sys.h for MY_ERRNO_ERANGE and MY_ERRNO_EDOM macros.

ChangeSet
  1.1346.1.271 03/11/11 18:14:49 gluh@gluh.mysql.r18.ru +3 -0
  Fix for bug #1564: CREATE TABLE + UNION + same table name = crash

  sql/sql_parse.cc
    1.218.1.130 03/11/11 18:14:48 gluh@gluh.mysql.r18.ru +8 -2
    Fix for bug #1564: CREATE TABLE + UNION + same table name = crash

  mysql-test/t/union.test
    1.22.1.9 03/11/11 18:14:48 gluh@gluh.mysql.r18.ru +3 -0
    Fix for bug #1564: CREATE TABLE + UNION + same table name = crash

  mysql-test/r/union.result
    1.17.1.10 03/11/11 18:14:47 gluh@gluh.mysql.r18.ru +3 -0
    Fix for bug #1564: CREATE TABLE + UNION + same table name = crash

ChangeSet
  1.1594 03/11/08 16:00:00 serg@sergbook.mylan +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1

  mysql-test/t/fulltext.test
    1.50 03/11/08 15:59:53 serg@sergbook.mylan +0 -0
    Auto merged

  mysql-test/r/fulltext.result
    1.51 03/11/08 15:59:52 serg@sergbook.mylan +0 -0
    Auto merged

ChangeSet
  1.1593 03/11/08 15:41:24 serg@sergbook.mylan +3 -0
  fulltext.test, fulltext.result, ft_nlq_search.c:
    a bug in latin1_german2 FT fixed

ChangeSet
  1.1346.416.1 03/11/08 15:39:10 serg@sergbook.mylan +2 -0
  fulltext.test, fulltext.result:
    one simple trunc* test

ChangeSet
  1.1590.1.34 03/11/08 16:43:16 hf@deer.(none) +3 -0
  Fix for bug #1727 ( Crash in EXPLAIN & UNION & derived)
  another version of the fix.
  Here i removed a loop that seems to be superfluous

  sql/sql_lex.cc
    1.95 03/11/08 16:42:52 hf@deer.(none) +2 -29
    we don't need loop here

  mysql-test/t/derived.test
    1.29 03/11/08 16:42:52 hf@deer.(none) +6 -0
    test case for the bug 1727

  mysql-test/r/derived.result
    1.31 03/11/08 16:42:52 hf@deer.(none) +17 -0
    appropriate test result added

ChangeSet
  1.1590.1.33 03/11/07 13:02:52 bell@sanja.is.com.ua +1 -0
  fixed layout

  sql/sql_cache.cc
    1.46.1.13 03/11/07 13:02:48 bell@sanja.is.com.ua +8 -4
    fixed layout

ChangeSet
  1.1590.1.32 03/11/07 09:43:24 bell@sanja.is.com.ua +6 -0
  sunstring_index() code covarage
  print() method code covarage for some string function which I lost last time

  mysql-test/t/func_str.test
    1.42 03/11/07 09:43:22 bell@sanja.is.com.ua +3 -1
    sunstring_index() code covarage
    print() method code covarage

  mysql-test/t/func_encrypt.test
    1.5 03/11/07 09:43:22 bell@sanja.is.com.ua +2 -0
    print() method code covarage

  mysql-test/t/func_crypt.test
    1.14 03/11/07 09:43:22 bell@sanja.is.com.ua +2 -0
    print() method code covarage

  mysql-test/r/func_str.result
    1.46 03/11/07 09:43:22 bell@sanja.is.com.ua +5 -2
    sunstring_index() code covarage
    print() method code covarage

  mysql-test/r/func_encrypt.result
    1.4 03/11/07 09:43:22 bell@sanja.is.com.ua +12 -1
    print() method code covarage

  mysql-test/r/func_crypt.result
    1.16 03/11/07 09:43:22 bell@sanja.is.com.ua +5 -0
    print() method code covarage

ChangeSet
  1.1590.1.31 03/11/06 21:03:11 bell@sanja.is.com.ua +3 -0
  fixed printability of gis functions
  code covarage for srid, GeomFromText with 2 parameters
  code covarage foe print() method of gis functions

  sql/item_geofunc.h
    1.5 03/11/06 21:03:09 bell@sanja.is.com.ua +2 -1
    fixed printability of gis functions

  mysql-test/t/gis.test
    1.8 03/11/06 21:03:09 bell@sanja.is.com.ua +17 -0
    code covarage for srid, GeomFromText with 2 parameters
    code covarage foe print() method of gis functions
    + commented test for issimple() (bugreport sent)

  mysql-test/r/gis.result
    1.10 03/11/06 21:03:09 bell@sanja.is.com.ua +63 -0
    code covarage for srid, GeomFromText with 2 parameters
    code covarage foe print() method of gis functions

ChangeSet
  1.1590.1.30 03/11/05 17:44:46 heikki@hundin.mysql.fi +1 -0
  fil0fil.c:
    Do renames based on space id in log replay of ibbackup

  innobase/fil/fil0fil.c
    1.19 03/11/05 17:44:36 heikki@hundin.mysql.fi +6 -6
    Do renames based on space id in log replay of ibbackup

  mysql-test/t/fulltext.test
    1.46.1.1 03/11/05 16:08:20 serg@sergbook.mylan +9 -4
    a bug in latin1_german2 FT fixed

  mysql-test/r/fulltext.result
    1.48.1.1 03/11/05 16:08:20 serg@sergbook.mylan +21 -12
    a bug in latin1_german2 FT fixed

  myisam/ft_nlq_search.c
    1.27 03/11/05 16:08:20 serg@sergbook.mylan +3 -1
    a bug in latin1_german2 FT fixed

ChangeSet
  1.1590.1.29 03/11/05 15:55:20 konstantin@oak.local +1 -0
  cleanup - we reset select_lex.options in mysql_parse anyway,
  no need to sync'em here

  sql/set_var.cc
    1.34.1.39 03/11/05 15:55:18 konstantin@mysql.com +0 -1
    cleanup - we reset select_lex.options in mysql_parse anyway,
    no need to sync'em here

ChangeSet
  1.1346.1.270 03/11/05 14:35:08 salle@vafla.online.bg +2 -0
  Fix for Bug #1752 Wrong letter cases.
  
  Thanks to Daniel Convissor

  BitKeeper/etc/logging_ok
    1.206.1.89 03/11/05 14:35:08 salle@vafla.online.bg +1 -0
    Logging to logging@openlogging.org accepted

  scripts/mysql_fix_privilege_tables.sql
    1.1.2.1 03/11/05 14:33:41 salle@vafla.online.bg +2 -2
    Fix for Bug #1752 Wrong letter cases.
    
    Thanks to Daniel Convissor

ChangeSet
  1.1590.1.28 03/11/05 14:35:20 konstantin@mysql.com +3 -0
  Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/kostja/mysql/mysql-4.1-root

  sql/item_func.cc
    1.124.1.39 03/11/05 14:35:17 konstantin@mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.111 03/11/05 14:35:17 konstantin@mysql.com +0 -0
    Auto merged

  sql/item.cc
    1.58.1.38 03/11/05 14:35:17 konstantin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1590.1.27 03/11/05 12:06:03 ram@gw.mysql.r18.ru +2 -0
  Portability fix (for example NetWare doesn't support table name like t"1").

  mysql-test/t/mysqldump.test
    1.5 03/11/05 12:06:00 ram@gw.mysql.r18.ru +4 -4
    Portability fix (for example NetWare doesn't support table name like t"1").

  mysql-test/r/mysqldump.result
    1.8 03/11/05 12:06:00 ram@gw.mysql.r18.ru +5 -5
    Portability fix (for example NetWare doesn't support table name like t"1").

  mysql-test/t/fulltext.test
    1.34.3.1 03/11/04 23:54:05 serg@sergbook.mylan +10 -0
    one simple trunc* test

  mysql-test/r/fulltext.result
    1.29.2.1 03/11/04 23:54:05 serg@sergbook.mylan +14 -0
    one simple trunc* test

ChangeSet
  1.1590.11.1 03/11/05 02:25:48 walrus@kishkin.air.ku.ru +1 -0
  compile-pentium-gcov:
    Stop line wrapping for compiler warnings.
    It needs for warnings statistic in code coverage

  BUILD/compile-pentium-gcov
    1.10.1.1 03/11/05 02:24:57 walrus@mysql.com +1 -1
    Stop line wrapping for compiler warnings.
    It needs for warnings statistic in code coverage

ChangeSet
  1.1346.415.1 03/11/05 02:24:34 walrus@mysql.com +1 -0
  compile-pentium-gcov:
    Stop line wraping for compiler warnings.
    It needs for warnings statistic in code coverage

  BUILD/compile-pentium-gcov
    1.11 03/11/05 02:23:48 walrus@mysql.com +1 -1
    Stop line wraping for compiler warnings.
    It needs for warnings statistic in code coverage

ChangeSet
  1.676.1.747 03/11/05 02:23:13 walrus@mysql.com +1 -0
  compile-pentium-gcov:
    Stop the line wrapping for warnings.
    it needs for warnings statistic in code coverage

  BUILD/compile-pentium-gcov
    1.7.1.2 03/11/05 02:20:56 walrus@mysql.com +1 -1
    Stop the line wrapping for warnings.
    it needs for warnings statistic in code coverage

ChangeSet
  1.1590.1.25 03/11/04 23:04:07 bell@sanja.is.com.ua +1 -0
  fixed:
  ==2761== Thread 10:
  ==2761== Conditional jump or move depends on uninitialised value(s)
  ==2761==    at 0x8115FD2: Item_func_uncompressed_length::val_int() (sql_string.h:90)
  ==2761==    by 0x8105658: Arg_comparator::compare_int() (item_cmpfunc.cc:356)
  and
  ==2761== Thread 10:
  ==2761== Conditional jump or move depends on uninitialised value(s)
  ==2761==    at 0x8116101: Item_func_compress::val_str(String*) (sql_string.h:90)
  ==2761==    by 0x80E9193: Item::save_in_field(Field*, bool) (item.cc:1155)

  sql/item_strfunc.cc
    1.147 03/11/04 23:04:05 bell@sanja.is.com.ua +14 -4
    ptr() is used instead of c_ptr(), because it is safe enough, more efficient and do not confuse valgrind

ChangeSet
  1.1590.10.2 03/11/04 20:50:01 bell@sanja.is.com.ua +1 -0
  fixed:
  ==2761== Thread 10:
  ==2761== Conditional jump or move depends on uninitialised value(s)
  ==2761==    at 0x81913BB: find_best(JOIN*, unsigned long long, unsigned, double, double) (sql_select.cc:2689)
  ==2761==    by 0x8191030: find_best_combination(JOIN*, unsigned long long) (sql_select.cc:2599)

  sql/sql_select.cc
    1.216.1.59 03/11/04 20:49:59 bell@sanja.is.com.ua +1 -0
    keypart_map fiels should be initialized in case of fulltext index

ChangeSet
  1.1590.10.1 03/11/04 20:23:39 bell@sanja.is.com.ua +1 -0
  fixed:
  ==2761== Thread 10:
  ==2761== Conditional jump or move depends on uninitialised value(s)
  ==2761==    at 0x818F580: make_join_statistics(JOIN*, st_table_list*, Item*, st_dynamic_array*) (sql_select.cc:1850)
  ==2761==    by 0x818B705: JOIN::optimize() (sql_select.cc:578)

  sql/sql_select.cc
    1.216.1.58 03/11/04 20:23:17 bell@sanja.is.com.ua +1 -0
    optimize field should be initialized in case of fulltext index

ChangeSet
  1.1590.1.23 03/11/04 18:32:33 pem@mysql.comhem.se +3 -0
  Removed trailing blank lines in some errmsg.txt files, as it counts
  as an error message (which is harmless, but confusing when you
  compare the output from comp_err for different language files).

  sql/share/norwegian/errmsg.txt
    1.63.1.31 03/11/04 18:32:30 pem@mysql.com +0 -1
    Removed trailing blank line as it counts as an error message
    (which is harmless, but confusing when you compare the output
    from comp_err for different language files).

  sql/share/korean/errmsg.txt
    1.63.1.30 03/11/04 18:32:30 pem@mysql.com +0 -1
    Removed trailing blank line as it counts as an error message
    (which is harmless, but confusing when you compare the output
    from comp_err for different language files).

  sql/share/italian/errmsg.txt
    1.70.1.31 03/11/04 18:32:30 pem@mysql.com +0 -1
    Removed trailing blank line as it counts as an error message
    (which is harmless, but confusing when you compare the output
    from comp_err for different language files).

ChangeSet
  1.1590.1.22 03/11/04 16:32:58 heikki@hundin.mysql.fi +2 -0
  ut0dbg.h, ut0dbg.c:
    Marko's patch to ut_a() fputs

ChangeSet
  1.1590.1.21 03/11/04 18:59:49 hf@deer.(none) +1 -0
  Fix for memory overlap in rt_split.c (reported by valgrind)

  myisam/rt_split.c
    1.9 03/11/04 18:59:47 hf@deer.(none) +2 -1
    Prevent memcpy if source and destination are same

  innobase/include/ut0dbg.h
    1.12 03/11/04 16:32:21 heikki@hundin.mysql.fi +17 -33
    Marko's patch to ut_a() fputs

  innobase/ut/ut0dbg.c
    1.2 03/11/04 16:32:15 heikki@hundin.mysql.fi +7 -6
    Marko's patch to ut_a() fputs

ChangeSet
  1.1590.9.1 03/11/04 17:58:18 ram@deer.(none) +4 -0
  fix for r-tree code (memory overlap reported by valgrind)
  new comments.

  BitKeeper/etc/logging_ok
    1.233.1.32 03/11/04 17:55:40 ram@deer.(none) +1 -0
    Logging to logging@openlogging.org accepted

  myisam/rt_index.c
    1.11 03/11/04 17:55:12 ram@deer.(none) +80 -40
    fix for r-tree code (memory overlap reported by valgrind)

  myisam/myisamdef.h
    1.59.1.10 03/11/04 17:55:12 ram@deer.(none) +1 -0
    fix for r-tree code (memory overlap reported by valgrind)

  myisam/mi_open.c
    1.72 03/11/04 17:55:12 ram@deer.(none) +1 -0
    fix for r-tree code (memory overlap reported by valgrind)

ChangeSet
  1.1590.1.19 03/11/04 14:59:38 monty@mysql.com +3 -0
  Fixed access to uninitialized memory in protocol::store_time

  sql/time.cc
    1.36 03/11/04 14:59:36 monty@mysql.com +2 -1
    Fixed access to uninitialized memory in protocol::store_time

  mysql-test/mysql-test-run.sh
    1.167.1.12 03/11/04 14:59:36 monty@mysql.com +5 -4
    --valgrind-all now automaticly enables valgrind

  BUILD/compile-pentium-valgrind-max
    1.8 03/11/04 14:59:36 monty@mysql.com +1 -1
    New attempt to avoid multiple warning

ChangeSet
  1.1590.1.18 03/11/04 14:09:54 monty@narttu.mysql.fi +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into narttu.mysql.fi:/my/mysql-4.1

  sql/unireg.cc
    1.33 03/11/04 14:09:53 monty@narttu.mysql.fi +0 -1
    Auto merged

  sql/sql_select.cc
    1.216.1.57 03/11/04 14:09:53 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1590.1.17 03/11/04 14:09:03 monty@narttu.mysql.fi +21 -0
  Removed some warnings reported by valgrind
  After merge fixes.
  Now code compiles, but there is still some valgrind warnings that needs to be fixed

  sql/unireg.cc
    1.32 03/11/04 14:09:01 monty@narttu.mysql.fi +1 -0
    Removed warning reported by valgrind

  sql/time.cc
    1.35 03/11/04 14:09:01 monty@narttu.mysql.fi +13 -7
    Ensure that time object is cleared on error

  sql/sql_class.cc
    1.105.1.31 03/11/04 14:09:01 monty@narttu.mysql.fi +1 -1
    After merge fixes

  sql/spatial.cc
    1.13 03/11/04 14:09:01 monty@narttu.mysql.fi +1 -0
    Code cleanup

  sql/protocol.cc
    1.56.1.18 03/11/04 14:09:01 monty@narttu.mysql.fi +1 -1
    Change default catalog name to 'def'

  sql/log_event.cc
    1.113.1.26 03/11/04 14:09:01 monty@narttu.mysql.fi +2 -2
    After merge fixes

  sql/item_strfunc.cc
    1.146 03/11/04 14:09:00 monty@narttu.mysql.fi +19 -19
    Simple code cleanup
    Don't call ->c_ptr() when you don't need a 0 terminated string
    (Causes warnings from valgrind)

  sql-common/client.c
    1.36 03/11/04 14:09:00 monty@narttu.mysql.fi +1 -1
    Merge fix

  mysys/test_charset.c
    1.17 03/11/04 14:09:00 monty@narttu.mysql.fi +2 -0
    Removed acccess to non existing functions

  mysql-test/t/range.test
    1.10 03/11/04 14:09:00 monty@narttu.mysql.fi +24 -25
    Moved tests to be in sync with 4.0

  mysql-test/t/func_crypt.test
    1.13 03/11/04 14:09:00 monty@narttu.mysql.fi +1 -1
    Fixed test for 4.1

  mysql-test/t/fulltext.test
    1.49 03/11/04 14:09:00 monty@narttu.mysql.fi +2 -2
    Fix error numbers

  mysql-test/r/rpl_trunc_binlog.result
    1.7 03/11/04 14:09:00 monty@narttu.mysql.fi +1 -3
    Update results

  mysql-test/r/range.result
    1.18 03/11/04 14:09:00 monty@narttu.mysql.fi +2 -2
    Update results

  mysql-test/r/query_cache.result
    1.26.1.9 03/11/04 14:09:00 monty@narttu.mysql.fi +9 -9
    Update results

  mysql-test/r/order_by.result
    1.30 03/11/04 14:09:00 monty@narttu.mysql.fi +3 -3
    Update results

  mysql-test/r/null_key.result
    1.23 03/11/04 14:09:00 monty@narttu.mysql.fi +2 -2
    Update results

  mysql-test/r/func_group.result
    1.22 03/11/04 14:09:00 monty@narttu.mysql.fi +1 -1
    Update results

  mysql-test/r/func_crypt.result
    1.15 03/11/04 14:09:00 monty@narttu.mysql.fi +1 -1
    Update results

  myisam/rt_index.c
    1.10 03/11/04 14:09:00 monty@narttu.mysql.fi +54 -40
    Code cleanup

  myisam/mi_rnext_same.c
    1.12 03/11/04 14:09:00 monty@narttu.mysql.fi +9 -6
    handle case where rtree_find_next() returns an error
    (assume this means that there was no more keys)

ChangeSet
  1.1590.7.4 03/11/04 13:48:48 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-print_subselect-4.1

  sql/sql_select.cc
    1.216.40.2 03/11/04 13:48:45 bell@sanja.is.com.ua +0 -2
    Auto merged

ChangeSet
  1.1590.8.1 03/11/04 13:47:19 bell@sanja.is.com.ua +1 -0
  avoid problem when all tables are const

  sql/sql_select.cc
    1.216.41.1 03/11/04 13:47:16 bell@sanja.is.com.ua +2 -1
    avoid problem when all tables are const

ChangeSet
  1.1590.7.3 03/11/04 13:28:36 bell@sanja.is.com.ua +1 -0
  avoid problem when all tables are const

  sql/sql_select.cc
    1.216.40.1 03/11/04 13:28:34 bell@sanja.is.com.ua +2 -1
    avoid problem when all tables are const

ChangeSet
  1.1590.7.2 03/11/04 12:51:01 bell@sanja.is.com.ua +2 -0
  fixed problem with UNION flags

  sql/sql_union.cc
    1.74.1.14 03/11/04 12:50:58 bell@sanja.is.com.ua +2 -1
    correct flag used

  sql/sql_lex.h
    1.102.1.35 03/11/04 12:50:58 bell@sanja.is.com.ua +1 -1
    removed unused flag

ChangeSet
  1.1346.414.1 03/11/04 12:38:09 konstantin@mysql.com +1 -0
  Word Police law is abided

  mysql-test/t/range.test
    1.4.1.6 03/11/04 12:38:07 konstantin@mysql.com +1 -1
    Word Police memo is abided

ChangeSet
  1.1590.7.1 03/11/04 11:20:00 bell@sanja.is.com.ua +1 -0
  avoid writting junk

  sql/unireg.cc
    1.30.1.1 03/11/04 11:19:57 bell@sanja.is.com.ua +1 -0
    avoid writting junk

ChangeSet
  1.1590.1.16 03/11/04 09:40:36 monty@narttu.mysql.fi +71 -0
  Merge with 4.0

  support-files/mysql.server.sh
    1.32 03/11/04 09:40:33 monty@narttu.mysql.fi +1 -1
    merge fixes

  sql/unireg.cc
    1.31 03/11/04 09:40:33 monty@narttu.mysql.fi +1 -1
    merge fixes

  sql/sql_select.cc
    1.216.1.56 03/11/04 09:40:33 monty@narttu.mysql.fi +12 -12
    Fix for not doing sort with LIMIT when OPTION_FOUND_ROWS is used

  sql/sql_parse.cc
    1.271.1.27 03/11/04 09:40:33 monty@narttu.mysql.fi +59 -32
    Fixes for counting user connect resourses
    Added function comments for involved functions

  sql/sql_base.cc
    1.145.1.19 03/11/04 09:40:33 monty@narttu.mysql.fi +1 -2
    merge

  sql/slave.h
    1.70 03/11/04 09:40:33 monty@narttu.mysql.fi +0 -1
    merge

  sql/log_event.cc
    1.113.1.25 03/11/04 09:40:33 monty@narttu.mysql.fi +49 -48
    new slave_proxy_id handling

  sql/ha_innodb.cc
    1.90.1.13 03/11/04 09:40:33 monty@narttu.mysql.fi +10 -0
    use local file

  mysys/charset.c
    1.104 03/11/04 09:40:33 monty@narttu.mysql.fi +0 -43
    use local file (will merge patch separately)

  mysql-test/t/range.test
    1.9 03/11/04 09:40:33 monty@narttu.mysql.fi +2 -0
    merge tests

  mysql-test/t/query_cache.test
    1.24.1.6 03/11/04 09:40:33 monty@narttu.mysql.fi +48 -50
    merge tests

  mysql-test/t/func_crypt.test
    1.12 03/11/04 09:40:33 monty@narttu.mysql.fi +5 -2
    Added disable_warnings/enable warnings

  mysql-test/r/rpl_trunc_binlog.result
    1.6 03/11/04 09:40:33 monty@narttu.mysql.fi +2 -0
    update results

  mysql-test/r/rpl_reset_slave.result
    1.7 03/11/04 09:40:33 monty@narttu.mysql.fi +2 -2
    update results

  mysql-test/r/range.result
    1.17 03/11/04 09:40:33 monty@narttu.mysql.fi +0 -0
    update results

  mysql-test/r/query_cache.result
    1.26.1.8 03/11/04 09:40:33 monty@narttu.mysql.fi +40 -40
    update results

  mysql-test/r/order_by.result
    1.29 03/11/04 09:40:33 monty@narttu.mysql.fi +3 -6
    update results

  mysql-test/r/func_crypt.result
    1.14 03/11/04 09:40:33 monty@narttu.mysql.fi +1 -1
    update results

  myisam/myisamchk.c
    1.92.1.10 03/11/04 09:40:33 monty@narttu.mysql.fi +0 -1
    merge fixes

  libmysql/libmysql.c
    1.156.1.36 03/11/04 09:40:33 monty@narttu.mysql.fi +0 -1
    Use local file

  innobase/srv/srv0srv.c
    1.47 03/11/04 09:40:33 monty@narttu.mysql.fi +0 -11
    Use local file

  innobase/row/row0sel.c
    1.39 03/11/04 09:40:33 monty@narttu.mysql.fi +0 -7
    Use local file

  innobase/include/srv0srv.h
    1.28 03/11/04 09:40:33 monty@narttu.mysql.fi +0 -2
    Use local file

  include/my_pthread.h
    1.65.1.5 03/11/04 09:40:33 monty@narttu.mysql.fi +0 -0
    Use local file

  configure.in
    1.201.1.45 03/11/04 09:40:33 monty@narttu.mysql.fi +0 -1
    use local file

  client/mysqldump.c
    1.103 03/11/04 09:40:33 monty@narttu.mysql.fi +19 -17
    merge with 4.0 (quoted names)
    

  sql/unireg.h
    1.30 03/11/04 01:29:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_test.cc
    1.28 03/11/04 01:29:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_repl.cc
    1.102.1.16 03/11/04 01:29:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_class.h
    1.146.1.48 03/11/04 01:29:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_class.cc
    1.105.1.30 03/11/04 01:29:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_cache.cc
    1.46.1.12 03/11/04 01:29:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/slave.cc
    1.188.1.26 03/11/04 01:29:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.61 03/11/04 01:29:56 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/log_event.h
    1.89 03/11/04 01:29:56 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_func.cc
    1.124.1.38 03/11/04 01:29:56 monty@narttu.mysql.fi +1 -2
    Auto merged

  scripts/mysql_install_db.sh
    1.37.1.17 03/11/04 01:29:56 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysys/my_thr_init.c
    1.23 03/11/04 01:29:56 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysys/my_symlink.c
    1.7 03/11/04 01:29:56 monty@narttu.mysql.fi +0 -2
    Auto merged

  mysys/errors.c
    1.14 03/11/04 01:29:56 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysys/Makefile.am
    1.49 03/11/04 01:29:56 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/rpl_trunc_binlog.test
    1.6 03/11/04 01:29:55 monty@narttu.mysql.fi +1 -0
    Auto merged

  mysql-test/t/rpl_reset_slave.test
    1.4 03/11/04 01:29:55 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/myisam.test
    1.24 03/11/04 01:29:55 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/fulltext.test
    1.48 03/11/04 01:29:55 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/select.result
    1.34 03/11/04 01:29:55 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/myisam.result
    1.30 03/11/04 01:29:55 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/fulltext.result
    1.50 03/11/04 01:29:55 monty@narttu.mysql.fi +2 -2
    Auto merged

  mysql-test/mysql-test-run.sh
    1.167.1.11 03/11/04 01:29:54 monty@narttu.mysql.fi +0 -0
    Auto merged

  myisam/mi_locking.c
    1.30 03/11/04 01:29:54 monty@narttu.mysql.fi +0 -0
    Auto merged

  myisam/mi_extra.c
    1.36 03/11/04 01:29:54 monty@narttu.mysql.fi +0 -0
    Auto merged

  myisam/ft_boolean_search.c
    1.66 03/11/04 01:29:54 monty@narttu.mysql.fi +0 -0
    Auto merged

  libmysqld/lib_sql.cc
    1.75.1.13 03/11/04 01:29:54 monty@narttu.mysql.fi +0 -0
    Auto merged

  libmysqld/Makefile.am
    1.29.1.11 03/11/04 01:29:54 monty@narttu.mysql.fi +0 -0
    Auto merged

  libmysql/manager.c
    1.12 03/11/04 01:29:54 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/thr/thr0loc.c
    1.5 03/11/04 01:29:54 monty@narttu.mysql.fi +0 -1
    Auto merged

  innobase/srv/srv0start.c
    1.49 03/11/04 01:29:54 monty@narttu.mysql.fi +21 -21
    Auto merged

  innobase/os/os0file.c
    1.57 03/11/04 01:29:53 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/include/os0thread.h
    1.14 03/11/04 01:29:53 monty@narttu.mysql.fi +0 -3
    Auto merged

  include/mysql_com.h
    1.67.1.18 03/11/04 01:29:53 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/my_sys.h
    1.110 03/11/04 01:29:53 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/my_global.h
    1.47.1.4 03/11/04 01:29:53 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/config-win.h
    1.37 03/11/04 01:29:53 monty@narttu.mysql.fi +0 -0
    Auto merged

  extra/resolveip.c
    1.22 03/11/04 01:29:53 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysqlbinlog.cc
    1.83 03/11/04 01:29:53 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/mysys/mysys.dsp
    1.13 03/11/04 01:29:53 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/triggers/post-commit
    1.22.1.3 03/11/04 01:29:53 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183
    1.69 03/11/04 01:29:53 monty@narttu.mysql.fi +1 -2
    Auto merged

  BitKeeper/deleted/.del-save-patch
    1.2 03/11/04 01:29:52 monty@narttu.mysql.fi +0 -0
    Delete: netware/BUILD/save-patch

  BitKeeper/deleted/.del-apply-patch
    1.2 03/11/04 01:29:47 monty@narttu.mysql.fi +0 -0
    Delete: netware/BUILD/apply-patch

  BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183
    1.48.5.3 03/11/04 01:28:57 monty@narttu.mysql.fi +0 -0
    Merge rename: sql/mini_client.cc -> BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183

  BitKeeper/etc/logging_ok
    1.233.1.31 03/11/04 01:28:50 monty@narttu.mysql.fi +0 -2
    auto-union

ChangeSet
  1.1590.1.15 03/11/04 01:27:23 monty@narttu.mysql.fi +1 -0
  Fixed typo in last changeset

  sql/derror.cc
    1.17 03/11/04 01:27:21 monty@narttu.mysql.fi +1 -1
    Fixed typo in last changeset

ChangeSet
  1.1346.413.1 03/11/03 23:18:55 serg@serg.mylan +3 -0
  fixed a bug in boolean fts where a word queue was created based on min_word_len, while with trunc* operator one could get shorter words

  mysql-test/t/fulltext.test
    1.34.2.5 03/11/03 23:18:53 serg@serg.mylan +6 -0
    fixed a bug in boolean fts where a word queue was created based on min_word_len, while with trunc* operator one could get shorter words

  mysql-test/r/fulltext.result
    1.29.1.11 03/11/03 23:18:53 serg@serg.mylan +2 -0
    fixed a bug in boolean fts where a word queue was created based on min_word_len, while with trunc* operator one could get shorter words

  myisam/ft_boolean_search.c
    1.47.1.10 03/11/03 23:18:52 serg@serg.mylan +1 -1
    fixed a bug in boolean fts where a word queue was created based on min_word_len, while with trunc* operator one could get shorter words

ChangeSet
  1.1590.1.14 03/11/03 22:48:03 monty@narttu.mysql.fi +54 -0
  Merge

  sql/share/ukrainian/errmsg.txt
    1.27.1.27 03/11/03 22:48:00 monty@narttu.mysql.fi +9 -9
    Merge error messages

  sql/share/swedish/errmsg.txt
    1.64.1.30 03/11/03 22:48:00 monty@narttu.mysql.fi +16 -16
    Merge error messages

  sql/share/spanish/errmsg.txt
    1.64.1.31 03/11/03 22:48:00 monty@narttu.mysql.fi +10 -10
    Merge error messages

  sql/share/slovak/errmsg.txt
    1.64.1.30 03/11/03 22:48:00 monty@narttu.mysql.fi +9 -9
    Merge error messages

  sql/share/serbian/errmsg.txt
    1.18.1.28 03/11/03 22:48:00 monty@narttu.mysql.fi +9 -9
    Merge error messages

  sql/share/russian/errmsg.txt
    1.61.1.28 03/11/03 22:48:00 monty@narttu.mysql.fi +9 -9
    Merge error messages

  sql/share/romanian/errmsg.txt
    1.62.1.30 03/11/03 22:48:00 monty@narttu.mysql.fi +10 -10
    Merge error messages

  sql/share/portuguese/errmsg.txt
    1.64.1.29 03/11/03 22:48:00 monty@narttu.mysql.fi +10 -10
    Merge error messages

  sql/share/polish/errmsg.txt
    1.63.1.30 03/11/03 22:48:00 monty@narttu.mysql.fi +9 -9
    Merge error messages

  sql/share/norwegian/errmsg.txt
    1.63.1.30 03/11/03 22:48:00 monty@narttu.mysql.fi +10 -9
    Merge error messages

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.30 03/11/03 22:48:00 monty@narttu.mysql.fi +9 -9
    Merge error messages

  sql/share/korean/errmsg.txt
    1.63.1.29 03/11/03 22:48:00 monty@narttu.mysql.fi +10 -9
    Merge error messages

  sql/share/japanese/errmsg.txt
    1.63.1.29 03/11/03 22:48:00 monty@narttu.mysql.fi +9 -9
    Merge error messages

  sql/share/italian/errmsg.txt
    1.70.1.30 03/11/03 22:48:00 monty@narttu.mysql.fi +10 -9
    Merge error messages

  sql/share/hungarian/errmsg.txt
    1.65.1.29 03/11/03 22:48:00 monty@narttu.mysql.fi +9 -9
    Merge error messages

  sql/share/greek/errmsg.txt
    1.64.1.29 03/11/03 22:48:00 monty@narttu.mysql.fi +9 -9
    Merge error messages

  sql/share/german/errmsg.txt
    1.64.1.30 03/11/03 22:48:00 monty@narttu.mysql.fi +2 -2
    Merge error messages

  sql/share/french/errmsg.txt
    1.63.1.30 03/11/03 22:48:00 monty@narttu.mysql.fi +9 -9
    Merge error messages

  sql/share/estonian/errmsg.txt
    1.64.1.29 03/11/03 22:48:00 monty@narttu.mysql.fi +9 -9
    Merge error messages

  sql/share/english/errmsg.txt
    1.70.1.33 03/11/03 22:48:00 monty@narttu.mysql.fi +17 -17
    Merge error messages

  sql/share/dutch/errmsg.txt
    1.66.1.30 03/11/03 22:48:00 monty@narttu.mysql.fi +9 -9
    Merge error messages

  sql/share/danish/errmsg.txt
    1.62.1.30 03/11/03 22:48:00 monty@narttu.mysql.fi +9 -9
    Merge error messages

  sql/share/czech/errmsg.txt
    1.64.1.30 03/11/03 22:48:00 monty@narttu.mysql.fi +9 -9
    Merge error messages

  sql/mysqld.cc
    1.356.1.60 03/11/03 22:48:00 monty@narttu.mysql.fi +1 -0
    merge

  sql/item_timefunc.h
    1.41 03/11/03 22:48:00 monty@narttu.mysql.fi +0 -0
    merge

  sql/item_timefunc.cc
    1.47 03/11/03 22:48:00 monty@narttu.mysql.fi +0 -0
    merge

  sql/derror.cc
    1.16 03/11/03 22:48:00 monty@narttu.mysql.fi +2 -3
    Fixed wront return value

  mysql-test/r/date_formats.result
    1.3 03/11/03 22:48:00 monty@narttu.mysql.fi +0 -0
    merge

  include/mysqld_error.h
    1.61.1.21 03/11/03 22:48:00 monty@narttu.mysql.fi +3 -4
    Merge error messages

  strings/ctype-bin.c
    1.38 03/11/03 22:19:11 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.203.1.71 03/11/03 22:19:10 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_table.cc
    1.157.2.18 03/11/03 22:19:10 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.34.1.21 03/11/03 22:19:10 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.1.26 03/11/03 22:19:09 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_lex.cc
    1.94 03/11/03 22:19:09 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_class.h
    1.146.1.47 03/11/03 22:19:09 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_class.cc
    1.105.1.29 03/11/03 22:19:09 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_base.cc
    1.145.1.18 03/11/03 22:19:09 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/set_var.h
    1.36 03/11/03 22:19:09 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/set_var.cc
    1.34.1.38 03/11/03 22:19:09 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.45 03/11/03 22:19:09 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_strfunc.h
    1.73 03/11/03 22:19:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_func.h
    1.68.1.27 03/11/03 22:19:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_func.cc
    1.124.1.37 03/11/03 22:19:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_create.cc
    1.33.1.21 03/11/03 22:19:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item.h
    1.56.1.42 03/11/03 22:19:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item.cc
    1.58.1.37 03/11/03 22:19:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/field.h
    1.83 03/11/03 22:19:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/field.cc
    1.119 03/11/03 22:19:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/date_formats.test
    1.3 03/11/03 22:19:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/func_compress.result
    1.6 03/11/03 22:19:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.167.1.10 03/11/03 22:19:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/m_ctype.h
    1.80 03/11/03 22:19:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/ignore
    1.153.1.16 03/11/03 22:19:03 monty@narttu.mysql.fi +1 -1
    auto-union

ChangeSet
  1.1588.1.6 03/11/03 22:18:16 monty@narttu.mysql.fi +3 -0
  Some simple things missing for last changeset

  sql/unireg.h
    1.29 03/11/03 22:18:14 monty@narttu.mysql.fi +4 -0
    Add defines for allocation of DATE/TIME/DATETIME strings

  mysql-test/t/overflow.test
    1.6 03/11/03 22:18:14 monty@narttu.mysql.fi +1 -1
    Fix error messages

ChangeSet
  1.1590.1.13 03/11/03 20:43:21 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-print_subselect-4.1

  sql/sql_select.cc
    1.216.1.55 03/11/03 20:43:18 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1590.1.12 03/11/03 20:42:55 bell@sanja.is.com.ua +1 -0
  removed debug output

  sql/sql_select.cc
    1.216.1.54 03/11/03 20:42:52 bell@sanja.is.com.ua +0 -14
    removed debug output

ChangeSet
  1.1346.411.1 03/11/03 18:24:01 guilhem@mysql.com +3 -0
  When we delete the slave's temp tables from memory, we reset
  rli->save_temporary_tables and slave_open_temp_tables
  (in old 4.0 you could make "SHOW STATUS LIKE 'slave_open_temp_tables'" grow
  indefinitely by doing RESET SLAVE and replicating always the same CREATE
  TEMPORARY TABLE).
  It's critical to reset save_temporary_tables to 0 (otherwise you may later
  read memory which has been freed) so this changeset should go into 4.1.

  sql/slave.cc
    1.164.1.95 03/11/03 18:23:54 guilhem@mysql.com +2 -0
    when we delete the slave's temp tables (when slave server shuts down and when
    RESET SLAVE), we reset 2 variables: rli->save_temporary_tables & slave_open_temp_tables.

  mysql-test/t/rpl_reset_slave.test
    1.1.1.1 03/11/03 18:23:54 guilhem@mysql.com +18 -0
    test for RESET SLAVE and creating twice the same temp table in the slave.

  mysql-test/r/rpl_reset_slave.result
    1.1.1.1 03/11/03 18:23:54 guilhem@mysql.com +10 -0
    result update

ChangeSet
  1.1590.2.15 03/11/03 19:11:09 heikki@hundin.mysql.fi +26 -0
  Many files:
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/ut/ut0ut.c
    1.18 03/11/03 19:09:00 heikki@hundin.mysql.fi +45 -1
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/ut/ut0rnd.c
    1.2 03/11/03 19:08:59 heikki@hundin.mysql.fi +1 -2
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/srv/srv0start.c
    1.48 03/11/03 19:08:02 heikki@hundin.mysql.fi +13 -9
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/srv/srv0srv.c
    1.46 03/11/03 19:08:01 heikki@hundin.mysql.fi +4 -2
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/row/row0sel.c
    1.38 03/11/03 19:07:49 heikki@hundin.mysql.fi +7 -1
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/row/row0mysql.c
    1.48 03/11/03 19:07:49 heikki@hundin.mysql.fi +7 -2
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/pars/lexyy.c
    1.11 03/11/03 19:06:55 heikki@hundin.mysql.fi +1 -1
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/os/os0file.c
    1.56 03/11/03 19:06:36 heikki@hundin.mysql.fi +94 -9
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/mem/mem0pool.c
    1.13 03/11/03 19:06:19 heikki@hundin.mysql.fi +1 -1
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/log/log0recv.c
    1.24 03/11/03 19:05:58 heikki@hundin.mysql.fi +123 -84
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/log/log0log.c
    1.27 03/11/03 19:05:58 heikki@hundin.mysql.fi +62 -33
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/include/mtr0log.ic
    1.4 03/11/03 19:05:34 heikki@hundin.mysql.fi +28 -0
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/include/ha0ha.ic
    1.5 03/11/03 19:05:34 heikki@hundin.mysql.fi +0 -4
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/include/ut0ut.h
    1.11 03/11/03 19:05:30 heikki@hundin.mysql.fi +9 -1
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/include/ut0dbg.h
    1.11 03/11/03 19:05:30 heikki@hundin.mysql.fi +2 -33
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/include/os0file.h
    1.23 03/11/03 19:05:26 heikki@hundin.mysql.fi +25 -4
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/include/mtr0mtr.h
    1.4 03/11/03 19:05:26 heikki@hundin.mysql.fi +7 -1
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/include/mtr0log.h
    1.2 03/11/03 19:05:26 heikki@hundin.mysql.fi +13 -0
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/include/log0recv.h
    1.10 03/11/03 19:05:26 heikki@hundin.mysql.fi +4 -7
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/include/fsp0fsp.h
    1.6 03/11/03 19:05:25 heikki@hundin.mysql.fi +8 -0
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/include/fil0fil.h
    1.10 03/11/03 19:05:25 heikki@hundin.mysql.fi +62 -30
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/fsp/fsp0fsp.c
    1.17 03/11/03 19:04:40 heikki@hundin.mysql.fi +61 -29
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/fil/fil0fil.c
    1.18 03/11/03 19:04:29 heikki@hundin.mysql.fi +629 -164
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/dict/dict0dict.c
    1.32 03/11/03 19:03:49 heikki@hundin.mysql.fi +1 -1
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/dict/dict0crea.c
    1.14 03/11/03 19:03:49 heikki@hundin.mysql.fi +5 -2
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

  innobase/buf/buf0buf.c
    1.27 03/11/03 19:03:25 heikki@hundin.mysql.fi +2 -1
    Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

ChangeSet
  1.1346.1.265 03/11/03 19:56:01 konstantin@mysql.com +5 -0
  fix for bug #1724 'WHERE ... IN() optimizer behaviour 
  has changed since 4.0.14'
  We need to calculate cost of RANGE
  scan if it is present instead of cost of 
  FULL scan.

  sql/sql_select.cc
    1.152.1.111 03/11/03 19:55:58 konstantin@mysql.com +42 -23
    fix for bug #1724 'WHERE ... IN() optimizer behaviour 
    has changed since 4.0.14'
    We need to calculate cost of RANGE
    scan instead of cost of FULL scan
    if RANGE is present
    Few comments cleaned up.

  mysql-test/t/range.test
    1.4.1.5 03/11/03 19:55:58 konstantin@mysql.com +23 -0
    added test case for bug #1724
    'WHERE ... IN() optimizer behaviour has changed since 4.0.14'

  mysql-test/r/select.result
    1.8.1.22 03/11/03 19:55:58 konstantin@mysql.com +2 -2
    please ignore

  mysql-test/r/range.result
    1.6.1.7 03/11/03 19:55:58 konstantin@mysql.com +17 -0
    added test case for bug #1724
    'WHERE ... IN() optimizer behaviour has changed since 4.0.14'

  mysql-test/r/order_by.result
    1.11.1.10 03/11/03 19:55:58 konstantin@mysql.com +3 -3
    more accurate row estimation
    for RANGE scan

ChangeSet
  1.1590.2.13 03/11/03 13:55:25 serg@serg.mylan +1 -0
  compatibility fixes

  mysys/my_bitmap.c
    1.16 03/11/03 13:55:19 serg@serg.mylan +17 -17
    compatibility fixes

ChangeSet
  1.1590.6.1 03/11/03 16:49:39 ram@gw.mysql.r18.ru +3 -0
  WL  #1279: Add table description to xml dump
  changes after montys review

  mysql-test/t/mysqldump.test
    1.4 03/11/03 16:49:36 ram@gw.mysql.r18.ru +5 -0
    WL  #1279: Add table description to xml dump
    changes after montys review

  mysql-test/r/mysqldump.result
    1.7 03/11/03 16:49:36 ram@gw.mysql.r18.ru +27 -2
    WL  #1279: Add table description to xml dump
    changes after montys review

  client/mysqldump.c
    1.102 03/11/03 16:49:36 ram@gw.mysql.r18.ru +104 -56
    WL  #1279: Add table description to xml dump
    changes after montys review

ChangeSet
  1.1588.1.5 03/11/03 14:01:59 monty@narttu.mysql.fi +81 -0
  Simplified 'wrong xxx name' error messages by introducing 'general' ER_WRONG_NAME error
  Cleaned up (and disabled part of) date/time/datetime format patch. One can't anymore change default read/write date/time/formats.
  This is becasue the non standard datetime formats can't be compared as strings and MySQL does still a lot of datetime comparisons as strings
  Changed flag argument to str_to_TIME() and get_date() from bool to uint
  Removed THD from str_to_xxxx functions and Item class.
  Fixed core dump when doing --print-defaults
  Move some common string functions to strfunc.cc
  Dates as strings are now of type my_charset_bin instead of default_charset()
  Introduce IDENT_QUOTED to not have to create an extra copy of simple identifiers (all chars < 128)
  Removed xxx_FORMAT_TYPE enums and replaced them with the old TIMESTAMP_xxx enums
  Renamed some TIMESTAMP_xxx enums to more appropriate names
  Use defines instead of integers for date/time/datetime string lengths
  Added to build system and use the new my_strtoll10() function.
  

  sql/strfunc.cc
    1.1 03/11/03 14:01:56 monty@narttu.mysql.fi +147 -0

  sql/strfunc.cc
    1.0 03/11/03 14:01:56 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.1/sql/strfunc.cc

  mysql-test/t/rpl_temporary-master.opt
    1.1 03/11/03 14:01:55 monty@narttu.mysql.fi +0 -0

  strings/my_vsnprintf.c
    1.23 03/11/03 14:01:55 monty@narttu.mysql.fi +15 -9
    F

  strings/ctype-bin.c
    1.36.1.1 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -6
    Cleared upper part of binary state map to be able to easily identify simple identifiers

  strings/Makefile.am
    1.36 03/11/03 14:01:55 monty@narttu.mysql.fi +4 -3
    Added my_strtoll10()

  sql/time.cc
    1.34 03/11/03 14:01:55 monty@narttu.mysql.fi +612 -277
    Prepare str_to_TIME and str_to_time() for general date/time handling
    Removed THD from str_to... functions
    Renamed date/time/datetime functions to use 'date_time' instead of 'datetime'
    Added functions to make and copy DATE_TIME_FORMAT's
    Added trivial functions 'make_time()', 'make_date()' and 'make_datetime()'

  sql/structs.h
    1.31 03/11/03 14:01:55 monty@narttu.mysql.fi +33 -16
    Renamed DATETIME_FORMAT to DATE_TIME format to indicate that it's for date/time/datetime formats
    Renamed WRONT_TIMESTAMP_FULL to TIMESTAMP_DATETIME_ERROR and TIMESTAMP_FULL to TIMESTAMP_DATETIME
    Added KNOWN_DATE_TIME_FORMAT struct for Item_func_get_format

  sql/sql_yacc.yy
    1.203.82.1 03/11/03 14:01:55 monty@narttu.mysql.fi +20 -18
    Don't copy and convert simple identifiers to utf8.
    Replace __FORMAT_TYPE defines with TIMESTAMP... defines

  sql/sql_table.cc
    1.157.17.1 03/11/03 14:01:55 monty@narttu.mysql.fi +3 -3
    Use new ER_WRONG_NAME error

  sql/sql_prepare.cc
    1.34.4.1 03/11/03 14:01:55 monty@narttu.mysql.fi +1 -1
    Use new defines

  sql/sql_parse.cc
    1.271.43.1 03/11/03 14:01:55 monty@narttu.mysql.fi +16 -15
    Use new ER_WRONG_NAME error
    Use new find_type() function

  sql/sql_lex.cc
    1.87.3.3 03/11/03 14:01:55 monty@narttu.mysql.fi +48 -30
    Change lex to generate IDENT_QUOTED for quoted identifiers or identifers that are using characters > 128.
    This enabled us to not have to copy and convert the identifier to utf8 for simpe identifiers

  sql/sql_db.cc
    1.68.1.17 03/11/03 14:01:55 monty@narttu.mysql.fi +2 -2
    Use new ER_WRONG_NAME error

  sql/sql_class.h
    1.146.22.1 03/11/03 14:01:55 monty@narttu.mysql.fi +5 -1
    Define datetime_format variables

  sql/sql_class.cc
    1.105.9.1 03/11/03 14:01:55 monty@narttu.mysql.fi +9 -3
    Allocate/free date_time format variables

  sql/sql_base.cc
    1.145.16.1 03/11/03 14:01:55 monty@narttu.mysql.fi +2 -1
    Use new find_type()

  sql/share/ukrainian/errmsg.txt
    1.27.12.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/share/swedish/errmsg.txt
    1.64.13.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/share/spanish/errmsg.txt
    1.64.16.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/share/slovak/errmsg.txt
    1.64.14.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/share/serbian/errmsg.txt
    1.18.12.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/share/russian/errmsg.txt
    1.61.12.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/share/romanian/errmsg.txt
    1.62.14.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/share/portuguese/errmsg.txt
    1.64.15.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/share/polish/errmsg.txt
    1.63.13.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/share/norwegian/errmsg.txt
    1.63.14.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/share/norwegian-ny/errmsg.txt
    1.63.14.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/share/korean/errmsg.txt
    1.63.13.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/share/japanese/errmsg.txt
    1.63.13.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/share/italian/errmsg.txt
    1.70.14.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/share/hungarian/errmsg.txt
    1.65.13.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/share/greek/errmsg.txt
    1.64.13.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/share/german/errmsg.txt
    1.64.14.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/share/french/errmsg.txt
    1.63.14.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/share/estonian/errmsg.txt
    1.64.13.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/share/english/errmsg.txt
    1.70.16.2 03/11/03 14:01:55 monty@narttu.mysql.fi +12 -7
    simplified 'wrong xxx name' error messages

  sql/share/dutch/errmsg.txt
    1.66.14.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/share/danish/errmsg.txt
    1.62.14.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/share/czech/errmsg.txt
    1.64.14.2 03/11/03 14:01:55 monty@narttu.mysql.fi +6 -1
    simplified 'wrong xxx name' error messages

  sql/set_var.h
    1.33.1.4 03/11/03 14:01:55 monty@narttu.mysql.fi +11 -35
    Removed class sys_var_datetime_format() as this defined a variable (which doesn't work) instead of updating a variable

  sql/set_var.cc
    1.34.25.1 03/11/03 14:01:55 monty@narttu.mysql.fi +147 -91
    Added variables time_format, date_format and datetime_format
    This had to be recoded becasue checking was done in 'update' method and not in 'check' method.

  sql/protocol.cc
    1.56.1.17 03/11/03 14:01:55 monty@narttu.mysql.fi +21 -17
    Changed back protocol functions to always return dates in ISO format

  sql/mysqld.cc
    1.356.36.1 03/11/03 14:01:55 monty@narttu.mysql.fi +68 -59
    Removed opt_datetime_format_names
    Cleaned up handling of date_time format handling. (Fixed core dump when mysqld had error on startup)
    Removed some unnecessary double init of collation variables

  sql/mysql_priv.h
    1.186.45.1 03/11/03 14:01:55 monty@narttu.mysql.fi +25 -20
    Fixed/added new prototypes

  sql/item_timefunc.h
    1.37.1.2 03/11/03 14:01:55 monty@narttu.mysql.fi +63 -64
    Changed charset for date string from default_charset() to my_charset_bin
    Changed type of last argument to get_date() to be able to handle more options
    Use defines instead of integers for date/time/datetime string lengths

  sql/item_timefunc.cc
    1.42.2.2 03/11/03 14:01:55 monty@narttu.mysql.fi +520 -526
    Changed month_names[] to be easier to use
    Moved check_names[] to strfunc.cc
    Added back old make_datetime() function
    Optimized extract_date_time()
    Use my_strtoll10() insetad of my_strntoll()
    Optimized make_date_time()
    Replaced short variable names with long ones.
    Use new functions make_time(), make_date() and make_datetime()
    Dates as strings are now of type my_charset_bin instead of default_charset()
    Changed Item_func_str_to_date() to by default return a date.
    
    

  sql/item_strfunc.h
    1.70.1.1 03/11/03 14:01:55 monty@narttu.mysql.fi +2 -2
    space change

  sql/item_func.h
    1.68.13.1 03/11/03 14:01:55 monty@narttu.mysql.fi +2 -2
    Changed type of last argument to get_date() to be able to handle more options

  sql/item_func.cc
    1.124.14.1 03/11/03 14:01:55 monty@narttu.mysql.fi +8 -7
    Use new find_type()

  sql/item_create.cc
    1.33.7.1 03/11/03 14:01:55 monty@narttu.mysql.fi +2 -1
    Indentation cleanup

  sql/item.h
    1.56.16.1 03/11/03 14:01:55 monty@narttu.mysql.fi +14 -15
    Changed type of last argument to get_date() to be able to handle more options
    Removed THD* from Item

  sql/item.cc
    1.58.32.1 03/11/03 14:01:55 monty@narttu.mysql.fi +31 -32
    Changed type of last argument to get_date() to be able to handle more options
    Removed THD* element from item.
    Don't use make_date_time() to generate date/time/datetimes
    

  sql/init.cc
    1.13 03/11/03 14:01:55 monty@narttu.mysql.fi +0 -2
    Remove not used variable dayord

  sql/field.h
    1.79.1.1 03/11/03 14:01:55 monty@narttu.mysql.fi +4 -7
    Changed type of last argument to get_date() to be able to handle more options

  mysql-test/t/rpl_temporary-master.opt
    1.0 03/11/03 14:01:55 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.1/mysql-test/t/rpl_temporary-master.opt

  sql/field.cc
    1.115.1.2 03/11/03 14:01:54 monty@narttu.mysql.fi +50 -109
    Changed argument to str_to_TIME() from bool to uint
    Removed THD argument from str_to_TIME()
    Moved find_enum() and find_set() to strfunc.cc

  sql/derror.cc
    1.14.1.1 03/11/03 14:01:54 monty@narttu.mysql.fi +1 -0
    Fixed compiler warning

  sql/Makefile.am
    1.77.1.12 03/11/03 14:01:54 monty@narttu.mysql.fi +1 -1
    Added strfunc.cc

  mysys/default.c
    1.34 03/11/03 14:01:54 monty@narttu.mysql.fi +2 -1
    Fixed core dump when doing --print-defaults

  mysql-test/t/symlink.test
    1.7 03/11/03 14:01:54 monty@narttu.mysql.fi +2 -2
    Fixed error numbers

  mysql-test/t/rpl_temporary.test
    1.10 03/11/03 14:01:54 monty@narttu.mysql.fi +8 -0
    Added testing of open temporary table on slave shutdown

  mysql-test/t/date_formats.test
    1.1.1.1 03/11/03 14:01:54 monty@narttu.mysql.fi +185 -66
    Cleaned up tests
    Disabled some tests that can't yet be run

  mysql-test/t/date_formats-master.opt
    1.2 03/11/03 14:01:54 monty@narttu.mysql.fi +1 -1
    Removed datetime_format as we can't handle options with space in mysql-test-run

  mysql-test/t/ctype_recoding.test
    1.9 03/11/03 14:01:54 monty@narttu.mysql.fi +2 -2
    Extended tests

  mysql-test/t/ctype_latin1_de.test
    1.13 03/11/03 14:01:54 monty@narttu.mysql.fi +2 -0
    New tests

  mysql-test/t/create.test
    1.33.1.1 03/11/03 14:01:54 monty@narttu.mysql.fi +13 -9
    Changed error numbers

  mysql-test/r/rpl_temporary.result
    1.3.1.4 03/11/03 14:01:54 monty@narttu.mysql.fi +1 -0
    Added new test

  mysql-test/r/func_compress.result
    1.4.1.1 03/11/03 14:01:54 monty@narttu.mysql.fi +1 -1
    New error message

  mysql-test/r/date_formats.result
    1.1.1.1 03/11/03 14:01:54 monty@narttu.mysql.fi +303 -133
    Cleaned up tests
    Disabled some tests that can't yet be run

  mysql-test/r/ctype_recoding.result
    1.12 03/11/03 14:01:54 monty@narttu.mysql.fi +2 -2
    Extended tests

  mysql-test/r/ctype_latin1_de.result
    1.13 03/11/03 14:01:54 monty@narttu.mysql.fi +12 -0
    Added new tests

  mysql-test/mysql-test-run.sh
    1.167.3.1 03/11/03 14:01:54 monty@narttu.mysql.fi +3 -3
    Simplified some options
    changed $@ to "$@" in an attempt to handle options with space (Didn't succeed;  Problem will disappear when mysql-test-run is rewritten in C)

  libmysqld/Makefile.am
    1.29.1.10 03/11/03 14:01:54 monty@narttu.mysql.fi +1 -1
    Added strfunc.cc

  include/sql_state.h
    1.6 03/11/03 14:01:54 monty@narttu.mysql.fi +1 -1
    simplified 'wrong xxx name' error messages

  include/mysqld_error.h
    1.61.11.2 03/11/03 14:01:54 monty@narttu.mysql.fi +7 -2
    simplified 'wrong xxx name' error messages

  include/m_string.h
    1.22 03/11/03 14:01:54 monty@narttu.mysql.fi +1 -0
    Added my_strtoll10()

  include/m_ctype.h
    1.78.1.1 03/11/03 14:01:54 monty@narttu.mysql.fi +1 -1
    Removed MY_LEX_FOUND_IDENT (not used)

  VC++Files/strings/strings.dsp
    1.9 03/11/03 14:01:54 monty@narttu.mysql.fi +4 -0
    added my_strtoll10.c

  VC++Files/sql/mysqldmax.dsp
    1.5 03/11/03 14:01:54 monty@narttu.mysql.fi +16 -0
    Added strfunc.cc

  VC++Files/sql/mysqld.dsp
    1.17 03/11/03 14:01:54 monty@narttu.mysql.fi +20 -0
    Added strfunc.cc

  VC++Files/libmysqld/libmysqld.dsp
    1.11 03/11/03 14:01:54 monty@narttu.mysql.fi +4 -0
    Added strfunc.cc

  BUILD/compile-pentium-valgrind-max
    1.7 03/11/03 14:01:54 monty@narttu.mysql.fi +1 -0
    Remove double printing of warning

  BitKeeper/etc/ignore
    1.153.9.1 03/11/03 13:54:32 monty@narttu.mysql.fi +1 -0
    added libmysqld/strfunc.cc

ChangeSet
  1.1590.2.12 03/11/03 13:44:23 bell@sanja.is.com.ua +1 -0
  after review fix

  sql/sql_select.cc
    1.216.39.1 03/11/03 13:44:20 bell@sanja.is.com.ua +4 -4
    after review fix

ChangeSet
  1.1590.1.11 03/11/03 12:28:36 bell@sanja.is.com.ua +16 -0
  after review fix

  sql/sql_yacc.yy
    1.203.1.70 03/11/03 12:28:32 bell@sanja.is.com.ua +36 -15
    birect class creation where it is possible

  sql/sql_string.h
    1.38 03/11/03 12:28:32 bell@sanja.is.com.ua +1 -0
    string printing moved to String class

  sql/sql_string.cc
    1.65 03/11/03 12:28:32 bell@sanja.is.com.ua +32 -0
    string printing moved to String class

  sql/sql_parse.cc
    1.271.1.25 03/11/03 12:28:32 bell@sanja.is.com.ua +12 -12
    new comparation class builder to avoid long switch

  sql/mysqld.cc
    1.356.1.59 03/11/03 12:28:32 bell@sanja.is.com.ua +8 -0
    new comparation class builder to avoid long switch

  sql/mysql_priv.h
    1.186.1.44 03/11/03 12:28:32 bell@sanja.is.com.ua +13 -7
    new comparation class builder to avoid long switch

  sql/item_timefunc.cc
    1.46 03/11/03 12:28:32 bell@sanja.is.com.ua +3 -3
    charset changed

  sql/item_subselect.h
    1.46 03/11/03 12:28:32 bell@sanja.is.com.ua +3 -5
    new comparation class builder to avoid long switch

  sql/item_subselect.cc
    1.60.1.27 03/11/03 12:28:32 bell@sanja.is.com.ua +25 -71
    new comparation class builder to avoid long switch

  sql/item_strfunc.cc
    1.145 03/11/03 12:28:32 bell@sanja.is.com.ua +5 -5
    new print_agrs

  sql/item_func.h
    1.68.1.26 03/11/03 12:28:32 bell@sanja.is.com.ua +1 -1
    new print_agrs

  sql/item_func.cc
    1.124.1.36 03/11/03 12:28:32 bell@sanja.is.com.ua +11 -19
    new print_agrs

  sql/item_cmpfunc.h
    1.69 03/11/03 12:28:32 bell@sanja.is.com.ua +63 -7
    new comparation class builder to avoid long switch

  sql/item_cmpfunc.cc
    1.110 03/11/03 12:28:32 bell@sanja.is.com.ua +18 -12
    new comparation class builder to avoid long switch
    new print_agrs used

  sql/item.cc
    1.58.1.36 03/11/03 12:28:32 bell@sanja.is.com.ua +6 -39
    charset changed
    printing string moved to String

  mysql-test/r/func_str.result
    1.45 03/11/03 12:28:32 bell@sanja.is.com.ua +1 -1
    new results

ChangeSet
  1.1590.1.10 03/11/03 08:47:27 bell@sanja.is.com.ua +9 -0
  Merge

  sql/item_subselect.cc
    1.60.1.26 03/11/03 08:47:25 bell@sanja.is.com.ua +0 -0
    SCCS merged

  sql/sql_select.h
    1.60 03/11/03 08:46:26 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.1.53 03/11/03 08:46:25 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.93 03/11/03 08:46:25 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.43 03/11/03 08:46:25 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.h
    1.45 03/11/03 08:46:25 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.58.1.35 03/11/03 08:46:25 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.58.1.32 03/11/03 08:46:25 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.1.34 03/11/03 08:46:25 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1590.2.11 03/11/02 17:29:31 bell@sanja.is.com.ua +2 -0
  merge

  mysql-test/t/subselect.test
    1.58.25.6 03/11/02 17:29:29 bell@sanja.is.com.ua +10 -10
    merge

  mysql-test/r/subselect.result
    1.67.33.4 03/11/02 17:29:29 bell@sanja.is.com.ua +0 -0
    merge

ChangeSet
  1.1590.5.1 03/11/02 17:27:35 bell@sanja.is.com.ua +6 -0
    fixed BUG#1645
    all calls of fix_fields() are inspected
  (copy of cset which I lost in accidatly tree delete)

  sql/sql_select.cc
    1.216.1.52 03/11/02 17:27:18 bell@sanja.is.com.ua +1 -5
    fixed BUG#1645 (thd can be used in fix_fields of subqueries)

  sql/set_var.cc
    1.34.1.37 03/11/02 17:27:18 bell@sanja.is.com.ua +5 -1
    comments added

  sql/item_subselect.h
    1.42.1.3 03/11/02 17:27:18 bell@sanja.is.com.ua +1 -3
    removed passing left_expr through parameters, because it present in class fields

  sql/item_subselect.cc
    1.60.15.7 03/11/02 17:27:18 bell@sanja.is.com.ua +5 -7
    removed passing left_expr through parameters, because it present in class fields
    fixed fix_fields() call

  mysql-test/t/subselect.test
    1.58.27.1 03/11/02 17:27:18 bell@sanja.is.com.ua +10 -0
    test of BUG#1645

  mysql-test/r/subselect.result
    1.67.35.1 03/11/02 17:27:18 bell@sanja.is.com.ua +7 -0
    test of BUG#1645

ChangeSet
  1.1590.2.10 03/11/02 17:21:32 bell@sanja.is.com.ua +1 -0
  aftermerge fix

  mysql-test/t/subselect.test
    1.58.25.5 03/11/02 17:21:28 bell@sanja.is.com.ua +1 -1
    aftermerge fix

ChangeSet
  1.1590.2.9 03/11/02 16:56:39 bell@sanja.is.com.ua +2 -0
  after review fix

  sql/item.cc
    1.58.1.34 03/11/02 16:56:37 bell@sanja.is.com.ua +8 -1
    after review fix

  mysql-test/t/subselect.test
    1.58.25.4 03/11/02 16:56:37 bell@sanja.is.com.ua +0 -1
    ufter merge fix

ChangeSet
  1.1346.1.264 03/11/02 16:38:27 monty@narttu.mysql.fi +1 -0
  Portability fix

  sql/slave.h
    1.50.1.19 03/11/02 16:38:26 monty@narttu.mysql.fi +1 -1
    Portability fix

ChangeSet
  1.1590.2.8 03/11/02 16:35:38 bell@sanja.is.com.ua +2 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-errs-4.1

  mysql-test/t/subselect.test
    1.58.25.3 03/11/02 16:35:35 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.33.3 03/11/02 16:35:35 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1590.2.7 03/11/02 16:31:22 bell@sanja.is.com.ua +4 -0
  join_free now is method of JOIN and commented
  dependence should mean uncacheability

  sql/sql_select.h
    1.58.1.2 03/11/02 16:31:19 bell@sanja.is.com.ua +1 -0
    join_free now is method of JOIN

  sql/sql_select.cc
    1.216.1.51 03/11/02 16:31:19 bell@sanja.is.com.ua +33 -23
    join_free now is method of JOIN and commented

  sql/sql_lex.cc
    1.91.1.1 03/11/02 16:31:19 bell@sanja.is.com.ua +5 -5
    dependence should mean uncacheability

  sql/item_subselect.cc
    1.60.15.6 03/11/02 16:31:19 bell@sanja.is.com.ua +4 -5
    dependence should mean uncacheability

ChangeSet
  1.1346.410.1 03/11/02 15:55:02 monty@mysql.com +15 -0
  Call my_sync() after all data is written to .frm file
  Added my_sync() to mysys which will do fsync/fdatasync/_commit() on a file.

  BitKeeper/etc/logging_ok
    1.206.1.88 03/11/02 15:55:02 monty@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  mysys/my_sync.c
    1.1 03/11/02 15:54:56 monty@mysql.com +60 -0

  sql/unireg.cc
    1.13.1.4 03/11/02 15:54:56 monty@mysql.com +6 -3
    Call my_sync() after all data is written to .frm file

  mysys/thr_alarm.c
    1.40 03/11/02 15:54:56 monty@mysql.com +7 -0
    Fix for link error on windows

  mysys/my_sync.c
    1.0 03/11/02 15:54:56 monty@mysql.com +0 -0
    BitKeeper file /my/mysql-4.0/mysys/my_sync.c

  mysys/my_symlink.c
    1.4.1.1 03/11/02 15:54:56 monty@mysql.com +2 -1
    Removed compiler warning

  mysys/errors.c
    1.12.1.1 03/11/02 15:54:56 monty@mysql.com +5 -3
    Added my_sync()

  mysys/Makefile.am
    1.29.1.16 03/11/02 15:54:56 monty@mysql.com +1 -1
    Added my_sync.c

  mysql-test/mysql-test-run.sh
    1.146.1.39 03/11/02 15:54:56 monty@mysql.com +3 -0
    Added option --valgrind-all

  myisam/mi_locking.c
    1.23.1.6 03/11/02 15:54:55 monty@mysql.com +4 -16
    Added my_sync()

  myisam/mi_extra.c
    1.31.1.2 03/11/02 15:54:55 monty@mysql.com +4 -16
    Added my_sync()

  isam/extra.c
    1.11 03/11/02 15:54:55 monty@mysql.com +4 -6
    Added my_sync()

  include/mysys_err.h
    1.10 03/11/02 15:54:55 monty@mysql.com +2 -1
    Added my_sync()

  include/my_sys.h
    1.75.1.27 03/11/02 15:54:55 monty@mysql.com +1 -0
    Added my_sync()

  configure.in
    1.191.1.99 03/11/02 15:54:55 monty@mysql.com +1 -1
    Added testing of fsync and fdatasync

  VC++Files/mysys/mysys.dsp
    1.6.1.3 03/11/02 15:54:55 monty@mysql.com +4 -0
    Added my_sync.c

ChangeSet
  1.1590.4.2 03/11/02 15:52:40 bell@sanja.is.com.ua +3 -0
  merge

  sql/item.cc
    1.58.1.33 03/11/02 15:52:38 bell@sanja.is.com.ua +0 -0
    merge

  mysql-test/t/subselect.test
    1.58.26.1 03/11/02 15:52:38 bell@sanja.is.com.ua +14 -13
    merge

  mysql-test/r/subselect.result
    1.67.34.1 03/11/02 15:52:38 bell@sanja.is.com.ua +9 -9
    merge

ChangeSet
  1.1590.2.6 03/11/02 14:43:11 bell@sanja.is.com.ua +2 -0
  BUG#1708 & other subselects with innodb tests

  mysql-test/t/subselect_innodb.test
    1.1 03/11/02 14:43:09 bell@sanja.is.com.ua +70 -0

  mysql-test/t/subselect_innodb.test
    1.0 03/11/02 14:43:09 bell@sanja.is.com.ua +0 -0
    BitKeeper file /home/bell/mysql/bk/work-like-4.1/mysql-test/t/subselect_innodb.test

  mysql-test/r/subselect_innodb.result
    1.1 03/11/02 14:43:08 bell@sanja.is.com.ua +65 -0

  mysql-test/r/subselect_innodb.result
    1.0 03/11/02 14:43:08 bell@sanja.is.com.ua +0 -0
    BitKeeper file /home/bell/mysql/bk/work-like-4.1/mysql-test/r/subselect_innodb.result

ChangeSet
  1.1590.4.1 03/11/02 14:02:13 monty@mysql.com +1 -0
  Merge of key_map fix (used my fix as it was more general)

  sql/sql_test.cc
    1.27 03/11/02 14:02:11 monty@mysql.com +0 -3
    Merge of key_map fix (used my fix as it was more general)

ChangeSet
  1.1590.3.1 03/11/02 14:00:25 monty@mysql.com +9 -0
  Cleanups (comments and compiler warnings)
  dded init of variable to fix core dump on startup errors

  BitKeeper/etc/logging_ok
    1.233.1.30 03/11/02 14:00:24 monty@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_test.cc
    1.25.1.1 03/11/02 14:00:04 monty@mysql.com +3 -2
    Fixed compiler errors (from key_map code)

  sql/sql_class.cc
    1.105.1.28 03/11/02 14:00:04 monty@mysql.com +2 -0
    Added init of variable to fix core dump on startup errors

  sql/sql_bitmap.h
    1.3 03/11/02 14:00:04 monty@mysql.com +22 -10
    Added copyright notice
    Removed not needed header files

  sql/mysqld.cc
    1.356.1.58 03/11/02 14:00:04 monty@mysql.com +1 -1
    Fixed comment

  sql/mysql_priv.h
    1.186.44.1 03/11/02 14:00:04 monty@mysql.com +1 -1
    Moved assert up to be able to use asserts in other header files

  sql/derror.cc
    1.15 03/11/02 14:00:04 monty@mysql.com +1 -0
    Removed compiler warning

  mysql-test/mysql-test-run.sh
    1.167.1.9 03/11/02 14:00:04 monty@mysql.com +4 -2
    Added option --socket

  mysql-test/Makefile.am
    1.26 03/11/02 14:00:03 monty@mysql.com +1 -0
    Added transformation of socket address for mysql-test-run

ChangeSet
  1.1590.2.4 03/11/02 13:53:38 bell@sanja.is.com.ua +3 -0
  fixed locking problem with innodb & subqueries (BUG#1708)
  tests with innodb moved to separate file

  sql/sql_select.cc
    1.216.1.50 03/11/02 13:53:36 bell@sanja.is.com.ua +3 -2
    it is better to check simople variable (full) first
    fixed locking problem with innodb & subqueries (BUG#1708)

  mysql-test/t/subselect.test
    1.58.25.2 03/11/02 13:53:36 bell@sanja.is.com.ua +0 -44
    tests with innodb moved to separate file
    test for BUG#1708

  mysql-test/r/subselect.result
    1.67.33.2 03/11/02 13:53:36 bell@sanja.is.com.ua +0 -37
    tests with innodb moved to separate file

ChangeSet
  1.1590.2.3 03/11/01 21:05:17 bell@sanja.is.com.ua +1 -0
  key_map is class for now => can't be printed directly
  (found during BUG#1708 investigation)

  sql/sql_test.cc
    1.26 03/11/01 21:05:15 bell@sanja.is.com.ua +3 -2
    key_map is class for now => can't be printed directly

ChangeSet
  1.1590.2.2 03/11/01 19:02:43 bell@sanja.is.com.ua +1 -0
  fixed part of BUG#1708
  (test suite will be with next part)

  sql/item_subselect.cc
    1.60.15.5 03/11/01 19:02:41 bell@sanja.is.com.ua +1 -1
    fixed part of BUG#1708

ChangeSet
  1.1346.1.262 03/10/31 23:20:23 guilhem@mysql.com +10 -0
  4 small items in this:
  - when we don't have in_addr_t, use uint32.
  - a forgotten initialization of slave_proxy_id in sql/log_event.cc (was not really "forgot", was
  "we needn't init it there", but there was one case where we needed...).
  - made slave_proxy_id always meaningful in THD and Log_event, so we can
  rely more on it (no need to test if it's meaningful). THD::slave_proxy_id
  is equal to THD::thread_id except for the slave SQL thread.
  - clean up the slave's temporary table (i.e. free their memory) when slave
  server shuts down.

  sql/sql_class.cc
    1.71.1.36 03/10/31 23:20:16 guilhem@mysql.com +5 -0
    By default we set THD::slave_proxy_id to THD::thread_id,
    so THD::slave_proxy_id is always meaningful (not 0).
    It's always the same as the thread id except for the slave
    SQL thread.

  sql/slave.h
    1.50.1.18 03/10/31 23:20:16 guilhem@mysql.com +1 -0
    new method

  sql/slave.cc
    1.164.1.94 03/10/31 23:20:16 guilhem@mysql.com +21 -0
    A RELAY_LOG_INFO method to free the slave's temporary tables from memory
    at slave's server shutdown.
    It is called by end_slave(), which is called by close_connections(),
    which is called when the server terminates
    (close_connections() is just before clean_up(); putting the call in 
    clean_up() was buggy, as active_mi is already deleted by close_connections().

  sql/mini_client.cc
    1.48.5.2 03/10/31 23:20:15 guilhem@mysql.com +1 -1
    in_addr_t is more generic.

  sql/log_event.cc
    1.77.1.62 03/10/31 23:20:15 guilhem@mysql.com +4 -6
    * Had forgot to initialize slave_proxy_id in the event constructor (char* buf...).
    Initializing is in fact only needed for Create_file_log_event, because
    it uses slave_proxy_id even if it does not write an event to the binlog
    (it uses slave_proxy_id to write it to SQL-LOAD.info).
    * When we write events we now always write slave_proxy_id, which is now always
    meaningful (as thd->slave_proxy_id is now always meaningful, see change in
    sql_class.cc).

  mysql-test/t/rpl_chain_temp_table.test
    1.2 03/10/31 23:20:15 guilhem@mysql.com +10 -0
    comments

  libmysql/manager.c
    1.9.1.2 03/10/31 23:20:15 guilhem@mysql.com +1 -1
    using in_addr_t is more generic.

  libmysql/libmysql.c
    1.95.1.37 03/10/31 23:20:14 guilhem@mysql.com +1 -1
    using in_addr_t is more generic.

  include/my_net.h
    1.14 03/10/31 23:20:14 guilhem@mysql.com +9 -0
    When in_addr_t is not defined, use uint32.

  extra/resolveip.c
    1.13.1.10 03/10/31 23:20:14 guilhem@mysql.com +0 -4
    removed #define as it is simpler to put it in my_net.h
    (because we need the #define elsewhere)

ChangeSet
  1.1590.2.1 03/10/31 23:03:27 bell@sanja.is.com.ua +4 -0
  merge

  mysql-test/t/subselect.test
    1.58.25.1 03/10/31 23:03:25 bell@sanja.is.com.ua +10 -10
    merge

  mysql-test/r/subselect.result
    1.67.33.1 03/10/31 23:03:25 bell@sanja.is.com.ua +11 -11
    merge

  sql/sql_select.h
    1.58.1.1 03/10/31 22:59:36 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.1.49 03/10/31 22:59:35 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1588.7.1 03/10/31 16:24:55 vva@eagle.mysql.r18.ru +3 -0
  fixed bug #1688 "CREATE TABLE ... SELECT with default()"

  sql/sql_select.cc
    1.216.38.1 03/10/31 16:24:53 vva@eagle.mysql.r18.ru +1 -0
    fixed bug #1688 "CREATE TABLE ... SELECT with default()"

  mysql-test/t/create.test
    1.34 03/10/31 16:24:53 vva@eagle.mysql.r18.ru +7 -0
    fixed bug #1688 "CREATE TABLE ... SELECT with default()"

  mysql-test/r/create.result
    1.54 03/10/31 16:24:53 vva@eagle.mysql.r18.ru +16 -0
    fixed bug #1688 "CREATE TABLE ... SELECT with default()"

ChangeSet
  1.1590.1.9 03/10/31 22:14:49 bell@sanja.is.com.ua +18 -0
  merge

  sql/item_cmpfunc.h
    1.68 03/10/31 22:14:47 bell@sanja.is.com.ua +0 -1
    merge

  sql/sql_yacc.yy
    1.203.1.69 03/10/31 22:02:08 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_show.cc
    1.122.4.12 03/10/31 22:02:08 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.h
    1.59 03/10/31 22:02:08 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.32.8 03/10/31 22:02:08 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.1.24 03/10/31 22:02:08 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.1.34 03/10/31 22:02:08 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.92 03/10/31 22:02:08 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.42 03/10/31 22:02:08 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_timefunc.cc
    1.45 03/10/31 22:02:08 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.h
    1.68.1.25 03/10/31 22:02:08 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.124.1.35 03/10/31 22:02:07 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.109 03/10/31 22:02:07 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.56.1.41 03/10/31 22:02:07 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.58.25.7 03/10/31 22:02:07 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/fulltext.test
    1.47 03/10/31 22:02:07 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/func_group.result
    1.21 03/10/31 22:02:07 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/fulltext.result
    1.49 03/10/31 22:02:07 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1590.1.8 03/10/31 15:53:54 serg@serg.mylan +1 -0
  small fix for max_user_connections. everything else will be pulled from 4.0

  sql/sql_parse.cc
    1.271.1.23 03/10/31 15:53:50 serg@serg.mylan +2 -1
    small fix for max_user_connections. everything else will be pulled from 4.0

ChangeSet
  1.1588.4.9 03/10/31 17:52:00 konstantin@oak.local +3 -0
  follow-up to Sanja fix: 
  fix_fields() never accepts (THD *)(0)

  sql/item_func.cc
    1.124.13.2 03/10/31 17:51:52 konstantin@mysql.com +5 -9
    follow-up to Sanja fix: 
    fix_fields() never accepts (THD *)(0)

  sql/item_cmpfunc.cc
    1.104.2.3 03/10/31 17:51:52 konstantin@mysql.com +2 -3
    follow-up to Sanja fix: 
    fix_fields() never accepts (THD *)(0)

  sql/item.cc
    1.58.27.4 03/10/31 17:51:52 konstantin@mysql.com +1 -1
    follow-up to Sanja fix: 
    fix_fields() never accepts (THD *)(0)

ChangeSet
  1.1590.1.7 03/10/31 15:49:59 serg@serg.mylan +2 -0
  post-merge fixes

  sql/ha_myisam.cc
    1.115.1.12 03/10/31 15:49:55 serg@serg.mylan +14 -13
    post-merge fixes

  myisam/ft_update.c
    1.32 03/10/31 15:49:55 serg@serg.mylan +2 -2
    post-merge fixes

ChangeSet
  1.1346.1.261 03/10/31 17:13:42 konstantin@mysql.com +1 -0
  minor fix in rm

  libmysqld/Makefile.am
    1.19.1.5 03/10/31 17:13:40 konstantin@mysql.com +2 -2
    minor fix for rm

ChangeSet
  1.1346.1.260 03/10/31 17:03:08 konstantin@mysql.com +1 -0
  thd->query assignment moved out
  of lock scope

  sql/log_event.cc
    1.77.1.61 03/10/31 17:03:06 konstantin@mysql.com +1 -1
    thd->query assignment moved out
    of lock scope

ChangeSet
  1.1590.1.6 03/10/31 14:25:38 serg@serg.mylan +6 -0
  Merge bk-internal:/home/bk/mysql-4.1/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  sql/sql_select.h
    1.58 03/10/31 14:25:33 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.32.7 03/10/31 14:25:33 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.1.22 03/10/31 14:25:32 serg@serg.mylan +0 -0
    Auto merged

  sql/item_func.h
    1.68.10.5 03/10/31 14:25:32 serg@serg.mylan +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.64.1.3 03/10/31 14:25:32 serg@serg.mylan +0 -0
    Auto merged

  mysql-test/r/mysqldump.result
    1.6 03/10/31 14:25:32 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1588.4.7 03/10/31 16:37:36 ram@gw.mysql.r18.ru +5 -0
  Fixes for mysql tests.

  mysql-test/t/mysqldump.test
    1.3 03/10/31 16:37:34 ram@gw.mysql.r18.ru +5 -5
    fixes for mysql tests.

  mysql-test/t/mysqlbinlog.test
    1.8 03/10/31 16:37:34 ram@gw.mysql.r18.ru +1 -1
    fixes for mysql tests.

  mysql-test/r/negation_elimination.result
    1.2 03/10/31 16:37:33 ram@gw.mysql.r18.ru +1 -1
    fixes for mysql tests.

  mysql-test/r/mysqldump.result
    1.2.1.3 03/10/31 16:37:33 ram@gw.mysql.r18.ru +9 -8
    fixes for mysql tests.

  mysql-test/r/mysqlbinlog.result
    1.3 03/10/31 16:37:33 ram@gw.mysql.r18.ru +1 -1
    fixes for mysql tests.

ChangeSet
  1.1588.6.1 03/10/31 15:15:13 konstantin@oak.local +2 -0
  old_total_warn_count is not used
  and was removed from THD

  sql/sql_parse.cc
    1.271.42.1 03/10/31 15:15:11 konstantin@mysql.com +0 -5
    old_total_warn_count removed

  sql/sql_class.h
    1.146.1.46 03/10/31 15:15:11 konstantin@mysql.com +1 -1
    old_total_warn_count removed

ChangeSet
  1.1588.2.11 03/10/31 11:52:46 bell@sanja.is.com.ua +2 -0
  new test

  mysql-test/t/func_default.test
    1.1 03/10/31 11:52:44 bell@sanja.is.com.ua +19 -0

  mysql-test/r/func_default.result
    1.1 03/10/31 11:52:44 bell@sanja.is.com.ua +18 -0

  mysql-test/t/func_default.test
    1.0 03/10/31 11:52:44 bell@sanja.is.com.ua +0 -0
    BitKeeper file /home/bell/mysql/bk/work-print_subselect-4.1/mysql-test/t/func_default.test

  mysql-test/r/func_default.result
    1.0 03/10/31 11:52:44 bell@sanja.is.com.ua +0 -0
    BitKeeper file /home/bell/mysql/bk/work-print_subselect-4.1/mysql-test/r/func_default.result

ChangeSet
  1.1588.2.10 03/10/31 11:52:01 bell@sanja.is.com.ua +5 -0
  amall fix

  sql/item_create.cc
    1.33.1.20 03/10/31 11:51:59 bell@sanja.is.com.ua +1 -1
    small fix to amke all names uniform

  sql/item.cc
    1.58.25.6 03/10/31 11:51:59 bell@sanja.is.com.ua +2 -2
    fix

  mysql-test/r/func_math.result
    1.14 03/10/31 11:51:59 bell@sanja.is.com.ua +60 -0
    forgot to change

  mysql-test/r/func_in.result
    1.11 03/10/31 11:51:59 bell@sanja.is.com.ua +1 -1
    small fix to amke all names uniform

  mysql-test/r/derived.result
    1.30 03/10/31 11:51:59 bell@sanja.is.com.ua +0 -2
    fixed results after merge

ChangeSet
  1.1590.1.5 03/10/31 10:34:34 serg@serg.mylan +21 -0
  Merge bk-internal:/home/bk/mysql-4.1/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  sql/sql_yacc.yy
    1.203.1.68 03/10/31 10:34:29 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_test.cc
    1.25 03/10/31 10:34:29 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_table.cc
    1.157.2.17 03/10/31 10:34:29 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.1.21 03/10/31 10:34:29 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_base.cc
    1.145.1.17 03/10/31 10:34:28 serg@serg.mylan +0 -0
    Auto merged

  sql/set_var.cc
    1.34.1.36 03/10/31 10:34:28 serg@serg.mylan +0 -0
    Auto merged

  sql/opt_range.cc
    1.98 03/10/31 10:34:28 serg@serg.mylan +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.57 03/10/31 10:34:28 serg@serg.mylan +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.41 03/10/31 10:34:28 serg@serg.mylan +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.64.1.2 03/10/31 10:34:28 serg@serg.mylan +0 -0
    Auto merged

  sql/handler.h
    1.88 03/10/31 10:34:28 serg@serg.mylan +0 -0
    Auto merged

  sql/ha_myisammrg.cc
    1.45 03/10/31 10:34:28 serg@serg.mylan +0 -0
    Auto merged

  sql/ha_myisam.h
    1.50 03/10/31 10:34:27 serg@serg.mylan +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.115.1.11 03/10/31 10:34:27 serg@serg.mylan +0 -0
    Auto merged

  mysql-test/r/range.result
    1.16 03/10/31 10:34:27 serg@serg.mylan +0 -0
    Auto merged

  mysql-test/r/mysqldump.result
    1.5 03/10/31 10:34:27 serg@serg.mylan +0 -0
    Auto merged

  myisam/myisamdef.h
    1.59.1.9 03/10/31 10:34:27 serg@serg.mylan +0 -0
    Auto merged

  myisam/myisamchk.c
    1.92.1.9 03/10/31 10:34:27 serg@serg.mylan +0 -0
    Auto merged

  myisam/mi_write.c
    1.37 03/10/31 10:34:27 serg@serg.mylan +0 -0
    Auto merged

  myisam/mi_delete.c
    1.24 03/10/31 10:34:27 serg@serg.mylan +0 -0
    Auto merged

  myisam/mi_check.c
    1.105.1.9 03/10/31 10:34:27 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1588.4.6 03/10/31 13:03:12 ram@gw.mysql.r18.ru +5 -0
  Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into gw.mysql.r18.ru:/usr/home/ram/work/4.1.wl1056

  sql/sql_select.cc
    1.216.37.1 03/10/31 13:03:09 ram@gw.mysql.r18.ru +0 -0
    Auto merged

  sql/item_func.h
    1.68.11.2 03/10/31 13:03:09 ram@gw.mysql.r18.ru +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.64.2.2 03/10/31 13:03:09 ram@gw.mysql.r18.ru +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.104.2.2 03/10/31 13:03:09 ram@gw.mysql.r18.ru +0 -0
    Auto merged

  sql/item.h
    1.56.14.3 03/10/31 13:03:09 ram@gw.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1578.30.1 03/10/31 13:02:16 ram@gw.mysql.r18.ru +10 -0
  WL #1056: Eliminate NOT operators from where condition

  mysql-test/t/negation_elimination.test
    1.1 03/10/31 13:01:52 ram@gw.mysql.r18.ru +68 -0

  mysql-test/r/negation_elimination.result
    1.1 03/10/31 13:01:52 ram@gw.mysql.r18.ru +382 -0

  sql/sql_select.h
    1.55.3.1 03/10/31 13:01:52 ram@gw.mysql.r18.ru +1 -0
    WL #1056: Eliminate NOT operators from where condition

  sql/sql_select.cc
    1.216.36.1 03/10/31 13:01:52 ram@gw.mysql.r18.ru +58 -1
    WL #1056: Eliminate NOT operators from where condition

  sql/item_func.h
    1.68.12.1 03/10/31 13:01:52 ram@gw.mysql.r18.ru +2 -1
    WL #1056: Eliminate NOT operators from where condition

  sql/item_cmpfunc.h
    1.64.3.1 03/10/31 13:01:52 ram@gw.mysql.r18.ru +21 -2
    WL #1056: Eliminate NOT operators from where condition

  sql/item_cmpfunc.cc
    1.104.3.1 03/10/31 13:01:52 ram@gw.mysql.r18.ru +103 -0
    WL #1056: Eliminate NOT operators from where condition

  sql/item.h
    1.56.15.1 03/10/31 13:01:52 ram@gw.mysql.r18.ru +3 -0
    WL #1056: Eliminate NOT operators from where condition

  mysql-test/t/negation_elimination.test
    1.0 03/10/31 13:01:52 ram@gw.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/ram/work/4.1.wl1056/mysql-test/t/negation_elimination.test

  mysql-test/t/bool.test
    1.4 03/10/31 13:01:52 ram@gw.mysql.r18.ru +0 -1
    WL #1056: Eliminate NOT operators from where condition

  mysql-test/r/negation_elimination.result
    1.0 03/10/31 13:01:52 ram@gw.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/ram/work/4.1.wl1056/mysql-test/r/negation_elimination.result

  mysql-test/r/bool.result
    1.4 03/10/31 13:01:51 ram@gw.mysql.r18.ru +0 -3
    WL #1056: Eliminate NOT operators from where condition

ChangeSet
  1.1588.4.5 03/10/31 11:29:57 ram@gw.mysql.r18.ru +2 -0
  new mysqldump -X test (bug #1707)

  mysql-test/t/mysqldump.test
    1.2 03/10/31 11:29:55 ram@gw.mysql.r18.ru +10 -1
    new mysqldump -X test (bug #1707)

  mysql-test/r/mysqldump.result
    1.2.1.2 03/10/31 11:29:55 ram@gw.mysql.r18.ru +23 -2
    new mysqldump -X test (bug #1707)

ChangeSet
  1.1590.1.4 03/10/30 21:04:09 serg@serg.mylan +2 -0
  post-merge fixes

  mysys/my_bitmap.c
    1.15 03/10/30 21:04:06 serg@serg.mylan +12 -3
    post-merge fixes

  mysql-test/t/fulltext.test
    1.46 03/10/30 21:04:05 serg@serg.mylan +2 -2
    post-merge fixes

ChangeSet
  1.1588.4.3 03/10/30 10:45:28 igor@rurik.mysql.com +25 -0
  Merge

  sql/set_var.cc
    1.34.1.35 03/10/30 10:45:25 igor@rurik.mysql.com +0 -0
    SCCS merged

  sql/mysqld.cc
    1.356.35.2 03/10/30 10:45:25 igor@rurik.mysql.com +0 -0
    SCCS merged

ChangeSet
  1.1346.409.1 03/10/30 21:30:20 konstantin@mysql.com +1 -0
  comments about designation of thd->where and 
  thd->proc_info added

  sql/sql_class.h
    1.111.1.55 03/10/30 21:30:18 konstantin@mysql.com +10 -1
    comments about thd->where and thd->proc_info
    added

ChangeSet
  1.1590.1.3 03/10/30 19:26:57 serg@serg.mylan +26 -0
  merged

  sql/sql_parse.cc
    1.271.41.1 03/10/30 19:26:53 serg@serg.mylan +17 -70
    merged

  sql/share/ukrainian/errmsg.txt
    1.27.1.26 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/swedish/errmsg.txt
    1.64.1.29 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/spanish/errmsg.txt
    1.64.1.30 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/slovak/errmsg.txt
    1.64.1.29 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/serbian/errmsg.txt
    1.18.1.27 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/russian/errmsg.txt
    1.61.1.27 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/romanian/errmsg.txt
    1.62.1.29 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/portuguese/errmsg.txt
    1.64.1.28 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/polish/errmsg.txt
    1.63.1.29 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/norwegian/errmsg.txt
    1.63.1.29 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.29 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/korean/errmsg.txt
    1.63.1.28 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/japanese/errmsg.txt
    1.63.1.28 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/italian/errmsg.txt
    1.70.1.29 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/hungarian/errmsg.txt
    1.65.1.28 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/greek/errmsg.txt
    1.64.1.28 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/german/errmsg.txt
    1.64.1.29 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/french/errmsg.txt
    1.63.1.29 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/estonian/errmsg.txt
    1.64.1.28 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/english/errmsg.txt
    1.70.1.32 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/dutch/errmsg.txt
    1.66.1.29 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/danish/errmsg.txt
    1.62.1.29 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  sql/share/czech/errmsg.txt
    1.64.1.29 03/10/30 19:26:53 serg@serg.mylan +1 -1
    merged

  include/mysqld_error.h
    1.61.1.20 03/10/30 19:26:53 serg@serg.mylan +2 -1
    merged

  sql/set_var.cc
    1.34.17.7 03/10/30 19:20:25 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1590.1.2 03/10/30 19:17:57 serg@serg.mylan +10 -0
  Bitmap post-review fixes

  sql/unireg.cc
    1.30 03/10/30 19:17:53 serg@serg.mylan +4 -3
    Bitmap post-review fixes

  sql/table.cc
    1.90 03/10/30 19:17:53 serg@serg.mylan +3 -3
    Bitmap post-review fixes

  sql/sql_select.cc
    1.216.32.6 03/10/30 19:17:53 serg@serg.mylan +5 -6
    Bitmap post-review fixes

  sql/sql_bitmap.h
    1.2 03/10/30 19:17:53 serg@serg.mylan +2 -0
    Bitmap post-review fixes

  sql/opt_range.cc
    1.90.1.13 03/10/30 19:17:53 serg@serg.mylan +23 -13
    Bitmap post-review fixes

  sql/item_func.h
    1.68.10.4 03/10/30 19:17:53 serg@serg.mylan +2 -2
    Bitmap post-review fixes

  sql/ha_berkeley.h
    1.57 03/10/30 19:17:53 serg@serg.mylan +2 -2
    Bitmap post-review fixes

  sql/ha_berkeley.cc
    1.117.1.7 03/10/30 19:17:53 serg@serg.mylan +14 -14
    Bitmap post-review fixes

  mysys/my_bitmap.c
    1.14 03/10/30 19:17:53 serg@serg.mylan +24 -14
    Bitmap post-review fixes

  include/my_bitmap.h
    1.8 03/10/30 19:17:53 serg@serg.mylan +9 -9
    Bitmap post-review fixes

  sql/sql_yacc.yy
    1.203.1.67 03/10/30 09:55:42 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_test.cc
    1.24 03/10/30 09:55:42 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_table.cc
    1.157.2.16 03/10/30 09:55:42 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.1.20 03/10/30 09:55:42 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.1.33 03/10/30 09:55:42 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_lex.cc
    1.91 03/10/30 09:55:42 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_base.cc
    1.145.15.1 03/10/30 09:55:42 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/set_var.h
    1.35 03/10/30 09:55:42 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/opt_range.cc
    1.97 03/10/30 09:55:42 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.43.1 03/10/30 09:55:42 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.64.2.1 03/10/30 09:55:42 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/handler.h
    1.87 03/10/30 09:55:42 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/handler.cc
    1.102 03/10/30 09:55:42 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.115.1.10 03/10/30 09:55:42 igor@rurik.mysql.com +0 -0
    Auto merged

  mysql-test/r/func_group.result
    1.20 03/10/30 09:55:41 igor@rurik.mysql.com +0 -0
    Auto merged

  myisam/myisamdef.h
    1.59.1.8 03/10/30 09:55:41 igor@rurik.mysql.com +0 -0
    Auto merged

  myisam/myisamchk.c
    1.92.1.8 03/10/30 09:55:41 igor@rurik.mysql.com +0 -0
    Auto merged

  myisam/mi_test2.c
    1.22 03/10/30 09:55:41 igor@rurik.mysql.com +0 -0
    Auto merged

  myisam/mi_check.c
    1.105.1.8 03/10/30 09:55:41 igor@rurik.mysql.com +0 -0
    Auto merged

  isam/test2.c
    1.14 03/10/30 09:55:41 igor@rurik.mysql.com +0 -0
    Auto merged

  include/my_sys.h
    1.109 03/10/30 09:55:41 igor@rurik.mysql.com +0 -0
    Auto merged

  include/my_global.h
    1.47.1.3 03/10/30 09:55:41 igor@rurik.mysql.com +0 -0
    Auto merged

  include/my_base.h
    1.46 03/10/30 09:55:41 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1578.29.1 03/10/30 16:26:08 acurtis@pcgem.rdg.cyberkinetica.com +1 -0
  Revert behaviour change introduced in WL1280. Fixes tests.

  sql/handler.cc
    1.94.1.8 03/10/30 16:16:51 acurtis@pcgem.rdg.cyberkinetica.com +4 -0
    Revert behaviour to pass tests

ChangeSet
  1.1346.407.2 03/10/30 16:12:21 guilhem@mysql.com +1 -0
  Fix to be able to run
  mysql-test-run --manager --valgrind
  (without this fix, the manager fails to start mysqld and the tests hang).

  mysql-test/mysql-test-run.sh
    1.146.1.38 03/10/30 16:12:16 guilhem@mysql.com +7 -1
    When running with --manager: the MySQL manager wants the complete path of the
    executable (it uses execv(), not execvp(), so does not search in the $PATH,
    so telling him to start 'valgrind' is not enough, it wants '/usr/bin/valgrind'
    or so).
    So this is a fix to be able to
    mysql-test-run --manager --valgrind
    Plus a warning (previously, if valgrind was not installed, tests silently
    hanged when run with --valgrind).

ChangeSet
  1.1588.2.9 03/10/30 15:56:52 bell@sanja.is.com.ua +2 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-print_subselect-4.1

  sql/item_sum.cc
    1.89.1.4 03/10/30 15:56:46 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.108 03/10/30 15:56:46 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1588.5.1 03/10/30 14:58:30 ram@gw.mysql.r18.ru +1 -0
  WL  #1279: Add table description to xml dump (SCRUM)
  Bug #1707: mysqldump -X does't quote field and table names
  code cleanup

  client/mysqldump.c
    1.101 03/10/30 14:58:08 ram@gw.mysql.r18.ru +133 -47
    WL  #1279: Add table description to xml dump (SCRUM)
    Bug #1707: mysqldump -X does't quote field and table names
    code cleanup

ChangeSet
  1.1588.2.8 03/10/30 12:57:26 bell@sanja.is.com.ua +93 -0
  added code covarage for functions convert(), nullif(), crc32(), is_used_lock(), char_lengtrh(), bit_xor()
  added string length for more speed
  made code covarage for print() method of Item
  fixed printability of some items (SCRUM) (WL#1274)

  sql/sql_show.cc
    1.122.9.2 03/10/30 12:52:38 bell@sanja.is.com.ua +7 -7
    added string length for more speed

  sql/sql_select.cc
    1.216.35.2 03/10/30 12:52:38 bell@sanja.is.com.ua +22 -22
    added string length for more speed

  sql/sql_repl.cc
    1.102.1.15 03/10/30 12:52:37 bell@sanja.is.com.ua +1 -1
    string changed with character for more speed

  sql/sql_parse.cc
    1.271.24.27 03/10/30 12:52:35 bell@sanja.is.com.ua +1 -1
    after merge fix

  sql/sql_lex.cc
    1.87.2.5 03/10/30 12:52:35 bell@sanja.is.com.ua +12 -10
    added string length for more speed

  sql/key.cc
    1.21 03/10/30 12:52:35 bell@sanja.is.com.ua +2 -2
    added string length for more speed

  sql/item_uniq.h
    1.17 03/10/30 12:52:34 bell@sanja.is.com.ua +2 -2
    added string length for more speed

  sql/item_timefunc.h
    1.40 03/10/30 12:52:33 bell@sanja.is.com.ua +1 -1
    fixed printability

  sql/item_timefunc.cc
    1.42.1.3 03/10/30 12:52:32 bell@sanja.is.com.ua +18 -15
    added string length for more speed

  sql/item_sum.cc
    1.89.1.3 03/10/30 12:52:32 bell@sanja.is.com.ua +6 -5
    added string length for more speed

  sql/item_subselect.cc
    1.60.1.25 03/10/30 12:52:31 bell@sanja.is.com.ua +22 -22
    added string length for more speed

  sql/item_strfunc.h
    1.72 03/10/30 12:52:30 bell@sanja.is.com.ua +8 -3
    fixed printability

  sql/item_strfunc.cc
    1.144 03/10/30 12:52:29 bell@sanja.is.com.ua +47 -3
    fixed printability
    added string length for more speed

  sql/item_func.h
    1.68.1.24 03/10/30 12:52:28 bell@sanja.is.com.ua +4 -1
    fixed printability

  sql/item_func.cc
    1.124.12.3 03/10/30 12:52:28 bell@sanja.is.com.ua +48 -14
    fixed printability
    added string length for more speed

  sql/item_create.cc
    1.33.1.19 03/10/30 12:52:27 bell@sanja.is.com.ua +1 -1
    fixed printability

  sql/item_cmpfunc.h
    1.67 03/10/30 12:52:27 bell@sanja.is.com.ua +2 -1
    fixed printability

  sql/item_cmpfunc.cc
    1.107 03/10/30 12:52:27 bell@sanja.is.com.ua +11 -11
    added string length for more speed

  sql/item.h
    1.56.1.40 03/10/30 12:52:26 bell@sanja.is.com.ua +1 -1
    added string length for more speed

  sql/item.cc
    1.58.25.5 03/10/30 12:52:26 bell@sanja.is.com.ua +51 -10
    added string length for more speed
    layout fix
    fixed string printability

  mysql-test/t/variables.test
    1.18.1.8 03/10/30 12:52:26 bell@sanja.is.com.ua +3 -0
    print() code coverage

  mysql-test/t/varbinary.test
    1.8 03/10/30 12:52:25 bell@sanja.is.com.ua +1 -1
    print() code coverage

  mysql-test/t/type_blob.test
    1.15 03/10/30 12:52:25 bell@sanja.is.com.ua +4 -0
    print() code coverage

  mysql-test/t/select.test
    1.21 03/10/30 12:52:24 bell@sanja.is.com.ua +1 -0
    print() code coverage

  mysql-test/t/rpl_master_pos_wait.test
    1.3 03/10/30 12:52:24 bell@sanja.is.com.ua +1 -0
    print() code coverage

  mysql-test/t/rpl_get_lock.test
    1.9 03/10/30 12:52:24 bell@sanja.is.com.ua +3 -1
    print() code coverage

  mysql-test/t/rpl000001.test
    1.35 03/10/30 12:52:23 bell@sanja.is.com.ua +2 -0
    print() code coverage

  mysql-test/t/row.test
    1.14 03/10/30 12:52:23 bell@sanja.is.com.ua +1 -0
    print() code coverage

  mysql-test/t/query_cache.test
    1.24.1.5 03/10/30 12:52:22 bell@sanja.is.com.ua +1 -0
    print() code coverage

  mysql-test/t/olap.test
    1.8 03/10/30 12:52:22 bell@sanja.is.com.ua +1 -1
    print() code coverage

  mysql-test/t/null.test
    1.9 03/10/30 12:52:20 bell@sanja.is.com.ua +3 -0
    print() code coverage

  mysql-test/t/insert_update.test
    1.6 03/10/30 12:52:19 bell@sanja.is.com.ua +2 -0
    print() code coverage

  mysql-test/t/having.test
    1.8 03/10/30 12:52:19 bell@sanja.is.com.ua +1 -0
    print() code coverage

  mysql-test/t/group_by.test
    1.25 03/10/30 12:52:18 bell@sanja.is.com.ua +1 -1
    print() code coverage

  mysql-test/t/func_time.test
    1.20 03/10/30 12:52:18 bell@sanja.is.com.ua +3 -0
    print() code coverage

  mysql-test/t/func_test.test
    1.17 03/10/30 12:52:17 bell@sanja.is.com.ua +7 -0
    print() code coverage

  mysql-test/t/func_system.test
    1.9 03/10/30 12:52:17 bell@sanja.is.com.ua +1 -0
    print() code coverage

  mysql-test/t/func_str.test
    1.41 03/10/30 12:52:17 bell@sanja.is.com.ua +6 -1
    crc32() code covarage
    print() code coverage

  mysql-test/t/func_set.test
    1.7 03/10/30 12:52:16 bell@sanja.is.com.ua +1 -0
    print() code coverage

  mysql-test/t/func_regexp.test
    1.7 03/10/30 12:52:16 bell@sanja.is.com.ua +1 -0
    print() code coverage

  mysql-test/t/func_op.test
    1.4 03/10/30 12:52:15 bell@sanja.is.com.ua +2 -0
    print() code coverage

  mysql-test/t/func_math.test
    1.8 03/10/30 12:52:15 bell@sanja.is.com.ua +13 -0
    print() code coverage

  mysql-test/t/func_in.test
    1.10 03/10/30 12:52:15 bell@sanja.is.com.ua +1 -0
    print() code coverage

  mysql-test/t/func_if.test
    1.4 03/10/30 12:52:14 bell@sanja.is.com.ua +7 -0
    nullif() code coverage
    print() code coverage

  mysql-test/t/func_group.test
    1.17 03/10/30 12:52:14 bell@sanja.is.com.ua +2 -1
    bit_xor() code coverage
    print() code coverage

  mysql-test/t/func_gconcat.test
    1.10 03/10/30 12:52:14 bell@sanja.is.com.ua +3 -0
    print() code coverage

  mysql-test/t/func_compress.test
    1.5 03/10/30 12:52:13 bell@sanja.is.com.ua +2 -0
    print() code coverage

  mysql-test/t/fulltext.test
    1.40.1.1 03/10/30 12:52:13 bell@sanja.is.com.ua +2 -0
    print() code coverage

  mysql-test/t/date_formats.test
    1.2 03/10/30 12:52:12 bell@sanja.is.com.ua +1 -0
    print() code coverage

  mysql-test/t/ctype_utf8.test
    1.2 03/10/30 12:52:12 bell@sanja.is.com.ua +2 -0
    char_length code coverage

  mysql-test/t/ctype_many.test
    1.16 03/10/30 12:52:12 bell@sanja.is.com.ua +6 -0
    convert with 3 arguments code covarage
    print() code coverage

  mysql-test/t/ctype_collate.test
    1.14 03/10/30 12:52:11 bell@sanja.is.com.ua +1 -0
    print() code coverage

  mysql-test/t/cast.test
    1.7 03/10/30 12:52:11 bell@sanja.is.com.ua +1 -0
    print() code coverage

  mysql-test/t/case.test
    1.12 03/10/30 12:52:11 bell@sanja.is.com.ua +6 -0
    print() code coverage

  mysql-test/t/bench_count_distinct.test
    1.7 03/10/30 12:52:10 bell@sanja.is.com.ua +1 -0
    print() code coverage

  mysql-test/t/auto_increment.test
    1.13 03/10/30 12:52:10 bell@sanja.is.com.ua +1 -0
    print() code coverage

  mysql-test/r/variables.result
    1.21.1.13 03/10/30 12:52:09 bell@sanja.is.com.ua +15 -0
    print() code coverage

  mysql-test/r/varbinary.result
    1.12 03/10/30 12:52:09 bell@sanja.is.com.ua +3 -1
    print() code coverage

  mysql-test/r/type_blob.result
    1.27 03/10/30 12:52:09 bell@sanja.is.com.ua +8 -0
    print() code coverage

  mysql-test/r/subselect.result
    1.67.1.33 03/10/30 12:52:08 bell@sanja.is.com.ua +9 -5
    print() code coverage

  mysql-test/r/select.result
    1.33 03/10/30 12:52:08 bell@sanja.is.com.ua +5 -0
    print() code coverage

  mysql-test/r/rpl_master_pos_wait.result
    1.4 03/10/30 12:52:08 bell@sanja.is.com.ua +5 -0
    print() code coverage

  mysql-test/r/rpl_get_lock.result
    1.10 03/10/30 12:52:07 bell@sanja.is.com.ua +8 -3
    print() code coverage

  mysql-test/r/rpl000001.result
    1.25 03/10/30 12:52:07 bell@sanja.is.com.ua +10 -0
    print() code coverage

  mysql-test/r/row.result
    1.16 03/10/30 12:52:06 bell@sanja.is.com.ua +5 -0
    print() code coverage

  mysql-test/r/query_cache.result
    1.26.1.7 03/10/30 12:52:06 bell@sanja.is.com.ua +5 -0
    print() code coverage

  mysql-test/r/olap.result
    1.10 03/10/30 12:52:06 bell@sanja.is.com.ua +3 -1
    print() code coverage

  mysql-test/r/null.result
    1.17 03/10/30 12:52:05 bell@sanja.is.com.ua +15 -0
    print() code coverage

  mysql-test/r/insert_update.result
    1.6 03/10/30 12:52:05 bell@sanja.is.com.ua +10 -0
    print() code coverage

  mysql-test/r/having.result
    1.9 03/10/30 12:52:05 bell@sanja.is.com.ua +5 -0
    print() code coverage

  mysql-test/r/group_by.result
    1.34 03/10/30 12:52:04 bell@sanja.is.com.ua +3 -1
    print() code coverage

  mysql-test/r/func_time.result
    1.22 03/10/30 12:52:04 bell@sanja.is.com.ua +5 -0
    print() code coverage

  mysql-test/r/func_test.result
    1.20 03/10/30 12:52:03 bell@sanja.is.com.ua +33 -0
    print() code coverage

  mysql-test/r/func_system.result
    1.13 03/10/30 12:52:03 bell@sanja.is.com.ua +5 -0
    print() code coverage

  mysql-test/r/func_str.result
    1.44 03/10/30 12:52:03 bell@sanja.is.com.ua +17 -3
    crc32() code coverage
    print() code coverage

  mysql-test/r/func_set.result
    1.7 03/10/30 12:52:02 bell@sanja.is.com.ua +5 -0
    print() code coverage

  mysql-test/r/func_regexp.result
    1.7 03/10/30 12:52:02 bell@sanja.is.com.ua +5 -0
    print() code coverage

  mysql-test/r/func_op.result
    1.6 03/10/30 12:52:01 bell@sanja.is.com.ua +10 -0
    print() code coverage

  mysql-test/r/func_math.result
    1.13 03/10/30 12:52:01 bell@sanja.is.com.ua +5 -0
    print() code coverage

  mysql-test/r/func_in.result
    1.10 03/10/30 12:52:01 bell@sanja.is.com.ua +5 -0
    print() code coverage

  mysql-test/r/func_if.result
    1.6 03/10/30 12:52:00 bell@sanja.is.com.ua +19 -0
    nullif() code coverage
    print() code coverage

  mysql-test/r/func_group.result
    1.17.1.3 03/10/30 12:52:00 bell@sanja.is.com.ua +10 -5
    bit_xor() code coverage
    print() code coverage

  mysql-test/r/func_gconcat.result
    1.17 03/10/30 12:52:00 bell@sanja.is.com.ua +15 -0
    print() code coverage

  mysql-test/r/func_compress.result
    1.5 03/10/30 12:51:59 bell@sanja.is.com.ua +10 -0
    print() code coverage

  mysql-test/r/fulltext.result
    1.44.1.1 03/10/30 12:51:59 bell@sanja.is.com.ua +10 -0
    print() code coverage

  mysql-test/r/date_formats.result
    1.2 03/10/30 12:51:58 bell@sanja.is.com.ua +5 -0
    print() code coverage

  mysql-test/r/ctype_utf8.result
    1.2 03/10/30 12:51:58 bell@sanja.is.com.ua +3 -0
    char_length code coverage

  mysql-test/r/ctype_many.result
    1.6 03/10/30 12:51:58 bell@sanja.is.com.ua +618 -567
    convert with 3 arguments code covarage
    print() code coverage

  mysql-test/r/ctype_collate.result
    1.20 03/10/30 12:51:57 bell@sanja.is.com.ua +5 -0
    print() code coverage

  mysql-test/r/cast.result
    1.10 03/10/30 12:51:57 bell@sanja.is.com.ua +5 -0
    print() code coverage

  mysql-test/r/case.result
    1.10 03/10/30 12:51:56 bell@sanja.is.com.ua +18 -0
    print() code coverage

  mysql-test/r/bench_count_distinct.result
    1.5 03/10/30 12:51:56 bell@sanja.is.com.ua +5 -0
    print() code coverage

  mysql-test/r/auto_increment.result
    1.17 03/10/30 12:51:56 bell@sanja.is.com.ua +5 -0
    print() code coverage

ChangeSet
  1.1588.4.2 03/10/30 13:09:38 konstantin@oak.local +1 -0
  small fix in comment

  sql/item_sum.cc
    1.89.2.2 03/10/30 13:09:36 konstantin@mysql.com +1 -1
    small fix in comment

ChangeSet
  1.1588.4.1 03/10/30 12:44:25 konstantin@oak.local +1 -0
  added fixed= 1 to the end of Item_in_optimizer::fix_fields() 

  sql/item_cmpfunc.cc
    1.104.2.1 03/10/30 12:44:23 konstantin@mysql.com +1 -0
    added fixed= 1 to the end of Item_in_optimizer::fix_fields() 

ChangeSet
  1.1578.28.1 03/10/30 10:25:45 pem@mysql.comhem.se +1 -0
  Added more error handling for abnormal cases (like a broken mysql.proc table).

  sql/sp.cc
    1.29 03/10/30 10:25:43 pem@mysql.com +46 -14
    Added more error handling for abnormal cases (like a broken mysql.proc table),
    and made the field indexing clearer, using defines instead of explicit numbers.

ChangeSet
  1.1346.408.1 03/10/30 12:25:15 konstantin@mysql.com +2 -0
  fix for bug #1634 '"operator new" in my_new wastes memory'
  

  BitKeeper/etc/logging_ok
    1.206.1.87 03/10/30 12:25:15 konstantin@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  mysys/my_new.cc
    1.2 03/10/30 12:25:10 konstantin@mysql.com +2 -2
    fix for bug #1634 '"operator new" in my_new wastes memory'
    

ChangeSet
  1.1346.1.256 03/10/30 01:20:38 monty@narttu.mysql.fi +1 -0
  Safety fix for adding service name to search config groups

  sql/mysqld.cc
    1.297.1.163 03/10/30 01:20:37 monty@narttu.mysql.fi +2 -1
    Safety fix for adding service name to search config groups

ChangeSet
  1.1346.1.255 03/10/30 01:01:53 monty@narttu.mysql.fi +4 -0
  Change back service name to MySQL
  Don't add service name to read config file segments if it's "MySQL"
  Fixed possible memory leak when CHANGE USER failed.

  sql/sql_parse.cc
    1.218.1.129 03/10/30 01:01:51 monty@narttu.mysql.fi +8 -4
    Fixed possible memory leak when CHANGE USER failed.

  sql/mysqld.cc
    1.297.1.162 03/10/30 01:01:51 monty@narttu.mysql.fi +9 -3
    Don't add service name to read config file segments if it's "MySQL"

  myisam/myisamchk.c
    1.80.1.30 03/10/30 01:01:51 monty@narttu.mysql.fi +4 -2
    Improved --help

  include/mysql_com.h
    1.43.1.10 03/10/30 01:01:51 monty@narttu.mysql.fi +1 -1
    Change back service name to MySQL (With new, better spelling)

ChangeSet
  1.1346.407.1 03/10/29 14:23:35 guilhem@mysql.com +8 -0
  Fix for BUG#1686
  "If 2 master threads with same-name temp table, slave makes bad binlog"
  and (two birds with one stone) for
  BUG#1240 "slave of slave breaks when STOP SLAVE was issud on parent slave
  and temp tables".
  
  Here is the design change:
  in a slave running with --log-slave-updates, events are now logged with the
  thread id they had on the master. So no more id conflicts between master threads,
  but introduces id conflicts between one master thread and one normal 
  client thread connected to the slave. This is solved by storing the server id
  in the temp table's name.
  
  New test which requires mysql-test-run to be run with --manager,
  otherwise it will be skipped.
  
  Undoing a Monty's change (hum, a chill runs down my spine ;) which was
  "Cleanup temporary tables when slave ends" in ChangeSet 1.1572.1.1.

  mysql-test/t/rpl_chain_temp_table.test
    1.1 03/10/29 14:23:27 guilhem@mysql.com +89 -0

  mysql-test/r/rpl_chain_temp_table.result
    1.1 03/10/29 14:23:27 guilhem@mysql.com +30 -0

  mysql-test/t/rpl_chain_temp_table.test
    1.0 03/10/29 14:23:27 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/rpl_chain_temp_table.test

  mysql-test/r/rpl_chain_temp_table.result
    1.0 03/10/29 14:23:27 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/r/rpl_chain_temp_table.result

  sql/unireg.h
    1.16.1.4 03/10/29 14:23:26 guilhem@mysql.com +1 -1
    4 more bytes, to store the server id.

  sql/sql_base.cc
    1.117.1.49 03/10/29 14:23:26 guilhem@mysql.com +20 -5
    Put the server id in the table cache key name for temp tables
    (we already put the slave_proxy_id, but we also need the server id
    in case normal clients (not slave threads) are using temp tables
    on the slave).

  sql/slave.cc
    1.164.1.93 03/10/29 14:23:23 guilhem@mysql.com +0 -2
    Do not free temp tables in the slave SQL thread. Or they will be lost when
    one does STOP SLAVE / START SLAVE.
    We even save them in rli->save_temporary_tables and set thd->temporary_tables=0
    to prevent them to be freed.

  sql/log_event.h
    1.71.1.12 03/10/29 14:23:23 guilhem@mysql.com +8 -0
    Query and Load need to carry a slave_proxy_id, like they carried a thread_id
    (to replicate temp tables well).

  sql/log_event.cc
    1.77.1.60 03/10/29 14:23:22 guilhem@mysql.com +48 -8
    The event needs to carry a slave_proxy_id (which is set at event's creation
    and used at event's logging).
    This is used for events created by ::exec_event() in the slave SQL thread:
    now we want to log these events with the thread id they had on the master.
    This is so that several same-name temp tables simultaneously created on
    the master end up with not the same thread id in the slave's binlog.

  mysql-test/mysql-test-run.sh
    1.146.1.37 03/10/29 14:23:22 guilhem@mysql.com +1 -1
    One new test which needs more than one slave so must be hardcoded in mysql-test-run.sh.

ChangeSet
  1.1346.1.253 03/10/29 08:33:31 serg@serg.mylan +1 -0
  followup to max_user_connections fix, keep the count more accurate

  sql/sql_parse.cc
    1.218.1.128 03/10/29 08:33:29 serg@serg.mylan +4 -3
    followup to max_user_connections fix, keep the count more accurate

ChangeSet
  1.1578.22.6 03/10/28 23:24:57 acurtis@pcgem.rdg.cyberkinetica.com +5 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/wl1280-part1

  sql/sql_yacc.yy
    1.245 03/10/28 23:24:53 acurtis@pcgem.rdg.cyberkinetica.com +0 -0
    Auto merged

  sql/lex.h
    1.103 03/10/28 23:24:53 acurtis@pcgem.rdg.cyberkinetica.com +0 -0
    Auto merged

  sql/handler.h
    1.81.3.3 03/10/28 23:24:53 acurtis@pcgem.rdg.cyberkinetica.com +0 -0
    Auto merged

  sql/handler.cc
    1.94.1.7 03/10/28 23:24:53 acurtis@pcgem.rdg.cyberkinetica.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.247 03/10/28 23:24:23 acurtis@pcgem.rdg.cyberkinetica.com +0 -0
    auto-union

ChangeSet
  1.1563.92.1 03/10/28 21:39:55 acurtis@pcgem.rdg.cyberkinetica.com +5 -0
  Worklog #1280, (Stage 1 Implementation)
  This is a starting work to remove handler name dependencies 
  from the Lex/Parser.

  BitKeeper/etc/logging_ok
    1.245.1.1 03/10/28 21:39:54 acurtis@pcgem.rdg.cyberkinetica.com +1 -0
    Logging to logging@openlogging.org accepted

ChangeSet
  1.1346.406.1 03/10/28 18:36:41 monty@narttu.mysql.fi +2 -0
  Fix for problem of installing MySQL as a service with
  mysql --install mysql --defualts-file=path-to-file
  (Bug #1643)

  sql/mysqld.cc
    1.297.1.161 03/10/28 18:36:40 monty@narttu.mysql.fi +8 -6
    Fix for problem of installing MySQL as a service with
    mysql --install mysql --defualts-file=path-to-file

  include/mysql_com.h
    1.43.1.9 03/10/28 18:36:40 monty@narttu.mysql.fi +1 -1
    MySQL should install as default service "mysqld"

ChangeSet
  1.1578.22.5 03/10/28 15:43:49 pem@mysql.comhem.se +3 -0
  Fix BUG#1656: Have to initialize OUT parameters too, in case they're not
  later set by the procedure.

  sql/sp_head.cc
    1.47 03/10/28 15:43:46 pem@mysql.com +10 -8
    Fix BUG#1656: Have to initialize OUT parameters too, in case they're not
    later set by the procedure.

  mysql-test/t/sp.test
    1.31 03/10/28 15:43:46 pem@mysql.com +17 -0
    Test case for BUG#1656

  mysql-test/r/sp.result
    1.30 03/10/28 15:43:46 pem@mysql.com +11 -0
    Test case for BUG#1656

ChangeSet
  1.1346.405.1 03/10/28 15:55:18 heikki@hundin.mysql.fi +1 -0
  row0sel.c:
    If innodb_force_recovery >= 5, do not try to fetch an old version of a clustered index record: this reduces crashes when dumping tables from a corrupt database

  innobase/row/row0sel.c
    1.28.1.14 03/10/28 15:55:09 heikki@hundin.mysql.fi +8 -2
    If innodb_force_recovery >= 5, do not try to fetch an old version of a clustered index record: this reduces crashes when dumping tables from a corrupt database

ChangeSet
  1.1588.2.7 03/10/28 12:45:37 bell@sanja.is.com.ua +12 -0
  merge

  sql/sql_yacc.yy
    1.203.81.1 03/10/28 12:45:29 bell@sanja.is.com.ua +0 -3
    merge

  sql/item_subselect.h
    1.44 03/10/28 12:45:28 bell@sanja.is.com.ua +0 -0
    merge

  sql/item_subselect.cc
    1.60.1.24 03/10/28 12:45:28 bell@sanja.is.com.ua +3 -0
    merge

  mysql-test/t/subselect.test
    1.58.1.31 03/10/28 12:45:28 bell@sanja.is.com.ua +2 -0
    merge

  mysql-test/r/subselect.result
    1.67.1.32 03/10/28 12:45:27 bell@sanja.is.com.ua +0 -0
    merge

  sql/sql_parse.cc
    1.271.24.26 03/10/28 12:34:51 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.87.2.4 03/10/28 12:34:51 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.42.1 03/10/28 12:34:51 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_sum.cc
    1.89.1.2 03/10/28 12:34:50 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.h
    1.68.1.23 03/10/28 12:34:50 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.124.12.2 03/10/28 12:34:50 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.58.25.4 03/10/28 12:34:50 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.1.252 03/10/27 15:14:03 serg@serg.mylan +1 -0
  fixes for max_user_connections (connections are now counted even if
  max_user_connections is not set - that is no limit - so that when
  max_user_connections is set (with SET) old connections are also
  taken into account
  mutexes are added where appropriate

  sql/sql_parse.cc
    1.218.1.127 03/10/27 15:14:00 serg@serg.mylan +15 -10
    fixes for max_user_connections (connections are now counted even if
    max_user_connections is not set - that is no limit - so that when
    max_user_connections is set (with SET) old connections are also
    taken into account
    mutexes are added where appropriate

ChangeSet
  1.1346.1.251 03/10/27 11:18:44 serg@serg.mylan +2 -0
  correct casting in ulonglong2double

  include/my_global.h
    1.34.1.22 03/10/27 11:18:42 serg@serg.mylan +2 -2
    correct casting in ulonglong2double

  include/config-win.h
    1.23.1.9 03/10/27 11:18:42 serg@serg.mylan +2 -2
    correct casting in ulonglong2double

ChangeSet
  1.1588.2.6 03/10/27 10:50:18 pem@mysql.comhem.se +2 -0
  BUG#1644: Insertion of more than 3 NULL columns with parameter binding fails
  Fixed. Enabled test case in client_test.c.

  tests/client_test.c
    1.42 03/10/27 10:50:16 pem@mysql.com +1 -2
    BUG#1644: Insertion of more than 3 NULL columns with parameter binding fails
    Fixed. Enabled test case.

  sql/sql_prepare.cc
    1.34.1.20 03/10/27 10:50:16 pem@mysql.com +1 -1
    BUG#1644: Insertion of more than 3 NULL columns with parameter binding fails
    Added missing parentheses in IS_PARAM_NULL to get the right bit.

  sql/handler.cc
    1.94.3.3 03/10/27 07:56:34 acurtis@pcgem.rdg.cyberkinetica.com +11 -11
    Use latin1 for string comparison

ChangeSet
  1.1588.2.4 03/10/27 01:01:27 bell@sanja.is.com.ua +5 -0
  fixed ALL/ANY optimisation with union (BUG#1668)
  code cleanup

  sql/sql_union.cc
    1.74.1.13 03/10/27 01:01:19 bell@sanja.is.com.ua +6 -1
    fixed result object assignment

  sql/item_subselect.h
    1.42.1.2 03/10/27 01:01:18 bell@sanja.is.com.ua +5 -3
    removed unused class field
    fixed min_max subquery used_tables()/const()

  sql/item_subselect.cc
    1.60.15.4 03/10/27 01:01:18 bell@sanja.is.com.ua +21 -6
    removed unused class field
    fixed min_max subquery used_tables()/const()
    fixed ALL/ANY optimisation for unions

  mysql-test/t/subselect.test
    1.58.1.30 03/10/27 01:01:18 bell@sanja.is.com.ua +10 -0
    test for BUG#1668

  mysql-test/r/subselect.result
    1.67.1.31 03/10/27 01:01:17 bell@sanja.is.com.ua +14 -0
    test for BUG#1668

ChangeSet
  1.1588.2.2 03/10/26 22:01:00 bell@sanja.is.com.ua +1 -0
  after-merge fix

  mysql-test/r/query_cache.result
    1.26.1.6 03/10/26 22:00:52 bell@sanja.is.com.ua +4 -4
    after-merge fix

ChangeSet
  1.1588.3.1 03/10/26 20:56:52 heikki@hundin.mysql.fi +1 -0
  sql_parse.cc:
    Fix yet another race condition in sql_parse.cc: thd->user_connect object could get deleted too soon, before the call of check_for_max_user_connections

  sql/sql_parse.cc
    1.271.24.25 03/10/26 20:56:41 heikki@hundin.mysql.fi +35 -27
    Fix yet another race condition in sql_parse.cc: thd->user_connect object could get deleted too soon, before the call of check_for_max_user_connections

ChangeSet
  1.1588.2.1 03/10/26 19:38:41 bell@sanja.is.com.ua +25 -0
  merge

  sql/share/ukrainian/errmsg.txt
    1.27.1.25 03/10/26 19:38:35 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/swedish/errmsg.txt
    1.64.1.28 03/10/26 19:38:35 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/spanish/errmsg.txt
    1.64.1.29 03/10/26 19:38:35 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/slovak/errmsg.txt
    1.64.1.28 03/10/26 19:38:35 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/serbian/errmsg.txt
    1.18.1.26 03/10/26 19:38:35 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/russian/errmsg.txt
    1.61.1.26 03/10/26 19:38:34 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/romanian/errmsg.txt
    1.62.1.28 03/10/26 19:38:34 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/portuguese/errmsg.txt
    1.64.1.27 03/10/26 19:38:34 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/polish/errmsg.txt
    1.63.1.28 03/10/26 19:38:34 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/norwegian/errmsg.txt
    1.63.1.28 03/10/26 19:38:34 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.28 03/10/26 19:38:34 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/korean/errmsg.txt
    1.63.1.27 03/10/26 19:38:34 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/japanese/errmsg.txt
    1.63.1.27 03/10/26 19:38:34 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/italian/errmsg.txt
    1.70.1.28 03/10/26 19:38:34 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/hungarian/errmsg.txt
    1.65.1.27 03/10/26 19:38:34 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/greek/errmsg.txt
    1.64.1.27 03/10/26 19:38:34 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/german/errmsg.txt
    1.64.1.28 03/10/26 19:38:34 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/french/errmsg.txt
    1.63.1.28 03/10/26 19:38:34 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/estonian/errmsg.txt
    1.64.1.27 03/10/26 19:38:34 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/english/errmsg.txt
    1.70.1.31 03/10/26 19:38:34 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/dutch/errmsg.txt
    1.66.1.28 03/10/26 19:38:34 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/danish/errmsg.txt
    1.62.1.28 03/10/26 19:38:34 bell@sanja.is.com.ua +0 -0
    merge

  sql/share/czech/errmsg.txt
    1.64.1.28 03/10/26 19:38:34 bell@sanja.is.com.ua +0 -0
    merge

  include/mysqld_error.h
    1.61.1.19 03/10/26 19:38:34 bell@sanja.is.com.ua +2 -3
    merge

  sql/set_var.cc
    1.34.24.1 03/10/26 19:28:37 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.1.250 03/10/25 18:18:18 serg@serg.mylan +1 -0
  cleanup

ChangeSet
  1.1590.1.1 03/10/25 21:12:38 serg@serg.mylan +1 -0
  return proper value (otherwise mysld crashes here)

  sql/sql_parse.cc
    1.271.40.2 03/10/25 21:12:34 serg@serg.mylan +2 -2
    return proper value (otherwise mysld crashes here)

  BitKeeper/triggers/post-commit
    1.19.1.9 03/10/25 18:18:16 serg@serg.mylan +1 -2
    cleanup

ChangeSet
  1.1588.1.3 03/10/25 19:12:29 heikki@hundin.mysql.fi +1 -0
  sql_parse.cc:
    Add diagnostic printf to chack that number of connections for a user never drops below zero

  sql/sql_parse.cc
    1.271.24.24 03/10/25 19:12:16 heikki@hundin.mysql.fi +3 -0
    Add diagnostic printf to chack that number of connections for a user never drops below zero

ChangeSet
  1.1578.27.2 03/10/25 17:19:35 pem@mysql.comhem.se +1 -0
  A few more fixes.
  And added new test for BUG#1644. (Disabled for now, not fixed yet.)

  tests/client_test.c
    1.41 03/10/25 17:19:33 pem@mysql.com +111 -2
    A few more fixes:
    - Avoid buffer overruns in printf().
    - Corrected index for comment field in show table status output.
    
    And added new test for BUG#1644. (Disabled for now, not fixed yet.)

ChangeSet
  1.1578.27.1 03/10/25 15:53:41 pem@mysql.comhem.se +1 -0
  A major overhaul to adopt to recent changes. It now passes all tests.
  
  Note:
  - All test results haven't been inspected in detail to see if they are correct.
  - Some result set printing seems to have the wrong field width; most notably
    date/time fields and type fields (e.g. "int(4)").
  - There are still some valgrind complaints, but they seem to be in assert() or
    in libmysql.

  tests/client_test.c
    1.40 03/10/25 15:53:27 pem@mysql.com +130 -70
    A major overhaul to adopt to recent changes:
    
    - SHOW TABLE result has changed (more columns)
    - EXPLAIN result has VAR_STRING types now
    - Added missing mysql_bind_result() calls
    - Adopted to mysql_fetch_column() semantics: Don't use same pointers in MYSQL_BIND
      structs for fetch_column as for binding.
    - Removed a number of duplicated calls to tests
    - Added missing initialization of MYSQL_BIND structs fields (lenght fields),
      to shutup valgrind.

ChangeSet
  1.1588.1.2 03/10/25 16:35:14 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1

  sql/sql_parse.cc
    1.271.24.23 03/10/25 16:35:07 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1587.1.2 03/10/25 16:29:35 bell@sanja.is.com.ua +1 -0
  fixed unlinking SELECT methods

  sql/sql_lex.cc
    1.87.3.2 03/10/25 16:29:28 bell@sanja.is.com.ua +17 -0
    fixed unlinking SELECT methods

ChangeSet
  1.1590 03/10/25 12:00:53 serg@serg.mylan +1 -0
  and -> &&

  sql/sql_parse.cc
    1.271.40.1 03/10/25 12:00:48 serg@serg.mylan +3 -3
    and -> &&

ChangeSet
  1.1587.1.1 03/10/25 10:18:37 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1

  sql/sql_parse.cc
    1.271.39.1 03/10/25 10:18:29 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1588.1.1 03/10/25 01:38:42 heikki@hundin.mysql.fi +1 -0
  sql_parse.cc:
    URGENT: MONTY AND SERGEI should check this patch! The patch fixes the memory corruption reported by a user. It happened because the code did not keep correct a count of how many connections a user has, and the user object got freed too soon if the same user had more than 1 connection. Also fix a typo by Sanja: 'and' is not a C operator, I think it should be &&

  sql/sql_parse.cc
    1.271.24.22 03/10/25 01:38:22 heikki@hundin.mysql.fi +48 -8
    URGENT: MONTY AND SERGEI should check this patch! The patch fixes the memory corruption reported by a user. It happened because the code did not keep correct a count of how many connections a user has, and the user object got freed too soon if the same user had more than 1 connection. Also fix a typo by Sanja: 'and' is not a C operator, I think it should be &&

ChangeSet
  1.1589 03/10/25 00:03:44 serg@serg.mylan +7 -0
  Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  sql/sql_yacc.yy
    1.203.74.5 03/10/25 00:03:38 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_show.cc
    1.122.4.11 03/10/25 00:03:38 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_acl.cc
    1.74.1.21 03/10/25 00:03:38 serg@serg.mylan +0 -0
    Auto merged

  sql/set_var.cc
    1.34.17.6 03/10/25 00:03:38 serg@serg.mylan +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.40 03/10/25 00:03:38 serg@serg.mylan +0 -0
    Auto merged

  sql/item_func.h
    1.68.10.3 03/10/25 00:03:38 serg@serg.mylan +0 -0
    Auto merged

  sql/item_func.cc
    1.124.1.34 03/10/25 00:03:38 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1588 03/10/24 23:53:53 serg@serg.mylan +1 -0
  Merge bk-internal:/home/bk/mysql-4.1/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug

  sql/sql_parse.cc
    1.271.24.21 03/10/24 23:53:48 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1578.26.1 03/10/24 23:27:21 serg@serg.mylan +5 -0
  removed one more hack that - as usual - almost always worked
  (but broke permission handling for *some* IP's after we started to compare in utf8)
  Bug #1636

  sql/sql_show.cc
    1.122.9.1 03/10/24 23:26:33 serg@serg.mylan +1 -2
    removed one more hack that - as usual - almost always worked
    (but broke permission handling for *some* IP's after we started to compare in utf8)
    Bug #1636

  sql/sql_parse.cc
    1.271.38.1 03/10/24 23:26:33 serg@serg.mylan +2 -2
    removed one more hack that - as usual - almost always worked
    (but broke permission handling for *some* IP's after we started to compare in utf8)
    Bug #1636

  sql/sql_db.cc
    1.68.1.16 03/10/24 23:26:33 serg@serg.mylan +2 -4
    removed one more hack that - as usual - almost always worked
    (but broke permission handling for *some* IP's after we started to compare in utf8)
    Bug #1636

  sql/sql_acl.h
    1.25 03/10/24 23:26:33 serg@serg.mylan +1 -1
    removed one more hack that - as usual - almost always worked
    (but broke permission handling for *some* IP's after we started to compare in utf8)
    Bug #1636

  sql/sql_acl.cc
    1.74.7.1 03/10/24 23:26:33 serg@serg.mylan +5 -5
    removed one more hack that - as usual - almost always worked
    (but broke permission handling for *some* IP's after we started to compare in utf8)
    Bug #1636

ChangeSet
  1.1346.403.1 03/10/24 17:26:26 vva@eagle.mysql.r18.ru +1 -0
  added quotas for database names
  (fixed bug #1348)

  client/mysqldump.c
    1.65.1.32 03/10/24 17:26:06 vva@eagle.mysql.r18.ru +4 -1
    added quotas for database names

ChangeSet
  1.1578.9.37 03/10/24 22:44:48 serg@serg.mylan +15 -0
  fixes to Bitmap class

  sql/sql_bitmap.h
    1.1 03/10/24 22:44:44 serg@serg.mylan +108 -0

  sql/table.cc
    1.89 03/10/24 22:44:44 serg@serg.mylan +3 -3
    fixes to Bitmap class

  sql/sql_select.cc
    1.216.32.5 03/10/24 22:44:44 serg@serg.mylan +17 -17
    fixes to Bitmap class

  sql/sql_bitmap.h
    1.0 03/10/24 22:44:44 serg@serg.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-4.1/sql/sql_bitmap.h

  sql/opt_range.h
    1.28 03/10/24 22:44:44 serg@serg.mylan +1 -1
    fixes to Bitmap class

  sql/opt_range.cc
    1.90.1.12 03/10/24 22:44:44 serg@serg.mylan +11 -10
    fixes to Bitmap class

  sql/mysql_priv.h
    1.186.35.7 03/10/24 22:44:44 serg@serg.mylan +1 -101
    fixes to Bitmap class

  sql/handler.h
    1.81.1.8 03/10/24 22:44:44 serg@serg.mylan +1 -1
    fixes to Bitmap class

  sql/ha_myisam.cc
    1.115.4.7 03/10/24 22:44:44 serg@serg.mylan +2 -1
    fixes to Bitmap class

  sql/ha_innodb.h
    1.57 03/10/24 22:44:44 serg@serg.mylan +1 -1
    fixes to Bitmap class

  sql/ha_berkeley.h
    1.56 03/10/24 22:44:44 serg@serg.mylan +1 -1
    fixes to Bitmap class

  sql/field.h
    1.82 03/10/24 22:44:44 serg@serg.mylan +3 -3
    fixes to Bitmap class

  sql/field.cc
    1.118 03/10/24 22:44:44 serg@serg.mylan +2 -1
    fixes to Bitmap class

  mysys/my_bitmap.c
    1.13 03/10/24 22:44:44 serg@serg.mylan +78 -97
    fixes to Bitmap class

  mysql-test/r/range.result
    1.10.1.6 03/10/24 22:44:44 serg@serg.mylan +4 -4
    fixes to Bitmap class

  include/my_bitmap.h
    1.7 03/10/24 22:44:44 serg@serg.mylan +3 -4
    fixes to Bitmap class

ChangeSet
  1.1346.402.1 03/10/24 15:20:46 vva@eagle.mysql.r18.ru +1 -0
  added to mysql_secure_installation 
  changing root password on all hosts (bug 1228)

  scripts/mysql_secure_installation.sh
    1.2 03/10/24 15:20:25 vva@eagle.mysql.r18.ru +7 -3
    added changing root password on all hosts

ChangeSet
  1.1587 03/10/24 21:14:26 bell@sanja.is.com.ua +1 -0
  after merge fix

  sql/sql_class.cc
    1.105.1.27 03/10/24 21:14:19 bell@sanja.is.com.ua +3 -0
    after merge fix

ChangeSet
  1.1578.25.4 03/10/24 20:09:57 bell@sanja.is.com.ua +1 -0
  made 'TODO'

  sql/sql_parse.cc
    1.271.37.1 03/10/24 20:09:45 bell@sanja.is.com.ua +1 -1
    made 'TODO'

ChangeSet
  1.1586 03/10/24 19:42:39 bell@sanja.is.com.ua +2 -0
  Merge

  mysql-test/t/subselect.test
    1.58.1.29 03/10/24 19:42:35 bell@sanja.is.com.ua +0 -0
    SCCS merged

  mysql-test/r/subselect.result
    1.67.1.30 03/10/24 19:42:35 bell@sanja.is.com.ua +0 -0
    SCCS merged

ChangeSet
  1.1578.25.3 03/10/24 19:30:47 bell@sanja.is.com.ua +1 -0
  added comment

  sql/item_sum.cc
    1.89.2.1 03/10/24 19:29:44 bell@sanja.is.com.ua +1 -0
    added comment

ChangeSet
  1.1585 03/10/24 17:28:32 bell@sanja.is.com.ua +6 -0
  support 'parallel' updates and rallback of whole statement in case of error in evalueting value which should be assigned
  (BUG#1484)

  sql/set_var.h
    1.33.1.3 03/10/24 17:28:21 bell@sanja.is.com.ua +2 -1
    check() methods fetch & store value

  sql/set_var.cc
    1.34.17.5 03/10/24 17:28:21 bell@sanja.is.com.ua +24 -47
    check() methods fetch & store value

  sql/item_func.h
    1.68.11.1 03/10/24 17:28:21 bell@sanja.is.com.ua +9 -0
    new method of user variables to pre-fetch value

  sql/item_func.cc
    1.124.13.1 03/10/24 17:28:20 bell@sanja.is.com.ua +60 -11
    new method of user variables to pre-fetch value

  mysql-test/t/variables.test
    1.18.1.7 03/10/24 17:28:20 bell@sanja.is.com.ua +17 -0
    test of swaping variables

  mysql-test/r/variables.result
    1.21.1.12 03/10/24 17:28:20 bell@sanja.is.com.ua +24 -0
    test of swaping variables

ChangeSet
  1.1578.9.36 03/10/24 13:23:06 serg@serg.mylan +1 -0
  style fixes

  myisam/ft_parser.c
    1.37 03/10/24 13:23:02 serg@serg.mylan +5 -5
    style fixes

ChangeSet
  1.1346.1.247 03/10/24 14:22:54 monty@narttu.mysql.fi +1 -0
  Move the pid file testing after arguments are parsed (previous patch was not correct)

  support-files/mysql.server.sh
    1.29.1.3 03/10/24 14:22:52 monty@narttu.mysql.fi +13 -13
    Move the pid file testing after arguments are parsed (previous patch was not correct)

ChangeSet
  1.1578.9.35 03/10/23 23:33:06 serg@serg.mylan +5 -0
  ftbench fixes

  myisam/ftbench/Ecreate.pl
    1.1 03/10/23 23:33:02 serg@serg.mylan +44 -0

  myisam/ftbench/ft-test-run.sh
    1.3 03/10/23 23:33:02 serg@serg.mylan +39 -26
    various fixes

  myisam/ftbench/README
    1.2 03/10/23 23:33:02 serg@serg.mylan +11 -24
    updated

  myisam/ftbench/Ereport.pl
    1.3 03/10/23 23:33:02 serg@serg.mylan +2 -2
    bug fixed
    report at 0, 0.5, 1

  myisam/ftbench/Ecreate.pl
    1.0 03/10/23 23:33:02 serg@serg.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-4.1/myisam/ftbench/Ecreate.pl

  myisam/ftbench/Ecompare.pl
    1.2 03/10/23 23:33:02 serg@serg.mylan +2 -2
    bug in multi-column comparison fixed

ChangeSet
  1.1578.9.34 03/10/23 23:11:33 serg@serg.mylan +3 -0
  Merge bk-internal:/home/bk/mysql-4.1/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  sql/mysqld.cc
    1.356.1.56 03/10/23 23:11:28 serg@serg.mylan +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.35.6 03/10/23 23:11:28 serg@serg.mylan +0 -0
    Auto merged

  sql/item.cc
    1.58.26.3 03/10/23 23:11:28 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1578.25.2 03/10/23 23:54:21 bell@sanja.is.com.ua +3 -0
  added check of cardinality to IN/ALL/ANY  subquery transformer
  (BUG#1638)

  sql/item_subselect.cc
    1.60.15.3 03/10/23 23:54:07 bell@sanja.is.com.ua +12 -5
    always check cardinality first

  mysql-test/t/subselect.test
    1.58.23.3 03/10/23 23:54:07 bell@sanja.is.com.ua +11 -0
    test for BUG#1638

  mysql-test/r/subselect.result
    1.67.31.3 03/10/23 23:54:06 bell@sanja.is.com.ua +7 -0
    test for BUG#1638

ChangeSet
  1.1584 03/10/23 23:06:43 bell@sanja.is.com.ua +2 -0
  Merge

  mysql-test/t/subselect.test
    1.58.1.28 03/10/23 23:06:38 bell@sanja.is.com.ua +0 -0
    SCCS merged

  mysql-test/r/subselect.result
    1.67.1.29 03/10/23 23:06:38 bell@sanja.is.com.ua +0 -0
    SCCS merged

ChangeSet
  1.1583 03/10/23 21:26:06 bell@sanja.is.com.ua +6 -0
  Merge

  mysql-test/t/subselect.test
    1.58.1.27 03/10/23 21:25:41 bell@sanja.is.com.ua +0 -0
    SCCS merged

  mysql-test/r/subselect.result
    1.67.1.28 03/10/23 21:25:41 bell@sanja.is.com.ua +0 -0
    SCCS merged

  sql/sql_yacc.yy
    1.203.74.4 03/10/23 21:22:39 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.24.20 03/10/23 21:22:37 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/set_var.cc
    1.34.17.4 03/10/23 21:22:37 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.39 03/10/23 21:22:36 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1578.25.1 03/10/23 21:09:40 bell@sanja.is.com.ua +3 -0
  Merge

  mysql-test/t/subselect.test
    1.58.23.2 03/10/23 21:09:35 bell@sanja.is.com.ua +0 -0
    SCCS merged

  mysql-test/r/subselect.result
    1.67.31.2 03/10/23 21:09:35 bell@sanja.is.com.ua +0 -0
    SCCS merged

  sql/item.cc
    1.58.27.3 03/10/23 21:07:09 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1578.18.2 03/10/23 20:50:53 bell@sanja.is.com.ua +2 -0
  ufter review fix (BUG#1444)

  sql/item_subselect.cc
    1.60.15.2 03/10/23 20:50:39 bell@sanja.is.com.ua +8 -4
    uncachable tested on fix fields and correct bits set

  sql/item.cc
    1.58.27.2 03/10/23 20:50:38 bell@sanja.is.com.ua +15 -12
    used variable to avoid using prev_unit->item which should be more clean

ChangeSet
  1.1578.22.4 03/10/23 17:35:20 pem@mysql.com +1 -0
  Merge mysql.com:/usr/local/bk/mysql-5.0
  into mysql.com:/home/pem/work/mysql-5.0

  sql/item_sum.h
    1.46.1.2 03/10/23 17:35:17 pem@mysql.com +0 -1
    Auto merged

ChangeSet
  1.1563.62.16 03/10/23 17:34:11 pem@mysql.comhem.se +1 -0
  Undid previous fix (as it will be fixed by a merge).

  sql/item_sum.h
    1.44.4.2 03/10/23 17:34:08 pem@mysql.com +1 -1
    Undid previous fix (as it will be fixed by a merge).

ChangeSet
  1.1578.22.3 03/10/23 16:06:51 pem@mysql.comhem.se +10 -0
  Post-merge fixes.

  sql/sql_table.cc
    1.168 03/10/23 16:06:48 pem@mysql.com +0 -1
    Post-merge fixes. No update log in 5.0.

  sql/sql_parse.cc
    1.303 03/10/23 16:06:48 pem@mysql.com +4 -2
    Post-merge fixes. Changed access API calls, and fixed merge error.

  sql/slave.cc
    1.199 03/10/23 16:06:48 pem@mysql.com +2 -3
    Post-merge fixes. Undid imported patch that's not 5.0 compatible.

  sql/item_subselect.cc
    1.68 03/10/23 16:06:48 pem@mysql.com +4 -4
    Post-merge fixes. thd->lex is a pointer.

  mysql-test/t/sp.test
    1.30 03/10/23 16:06:48 pem@mysql.com +2 -2
    Post-merge fixes. Error codes renumbered.

  mysql-test/t/sp-error.test
    1.15 03/10/23 16:06:48 pem@mysql.com +33 -33
    Post-merge fixes. Error codes renumbered.

  mysql-test/r/variables.result
    1.34 03/10/23 16:06:48 pem@mysql.com +1 -1
    Post-merge fixes. Error codes renumbered.

  mysql-test/r/sp.result
    1.29 03/10/23 16:06:48 pem@mysql.com +2 -2
    Post-merge fixes. Error codes renumbered.

  mysql-test/r/sp-error.result
    1.14 03/10/23 16:06:48 pem@mysql.com +1 -1
    Post-merge fixes. Error codes renumbered.

  mysql-test/r/query_cache.result
    1.33 03/10/23 16:06:47 pem@mysql.com +2 -2
    Post-merge fixes.

ChangeSet
  1.1346.401.1 03/10/23 15:24:48 pem@mysql.com +1 -0
  Put username in the Subject line as well (with the changeset number).

  BitKeeper/triggers/post-commit
    1.19.1.8 03/10/23 15:24:46 pem@mysql.com +2 -1
    Put username in the Subject line as well (with the changeset number).

ChangeSet
  1.1578.9.33 03/10/23 15:21:06 serg@serg.mylan +16 -0
  query expansion for fulltext search

  sql/sql_yacc.yy
    1.203.77.8 03/10/23 15:21:02 serg@serg.mylan +1 -0
    EXPANSION added to keyword: rule

  sql/set_var.cc
    1.34.20.7 03/10/23 15:21:02 serg@serg.mylan +3 -3
    ft_max_word_len_for_sort removed
    ft_query_expansion_limit added

  sql/mysqld.cc
    1.356.1.55 03/10/23 15:21:01 serg@serg.mylan +5 -5
    ft_max_word_len_for_sort removed
    ft_query_expansion_limit added

  sql/ha_myisam.h
    1.47.1.3 03/10/23 15:21:01 serg@serg.mylan +1 -1
    ft api changes for query expansion

  mysql-test/t/fulltext.test
    1.45 03/10/23 15:21:01 serg@serg.mylan +4 -3
    query expansion tests

  mysql-test/r/fulltext_var.result
    1.9 03/10/23 15:21:01 serg@serg.mylan +1 -1
    ft_max_word_len_for_sort removed

  mysql-test/r/fulltext.result
    1.48 03/10/23 15:21:01 serg@serg.mylan +10 -1
    query expansion tests

  myisam/myisamchk.c
    1.92.3.4 03/10/23 15:21:01 serg@serg.mylan +0 -3
    ft_max_word_len_for_sort removed

  myisam/mi_check.c
    1.105.2.5 03/10/23 15:21:01 serg@serg.mylan +5 -6
    variable ft_max_word_len_for_sort -> define FT_MAX_WORD_LEN_FOR_SORT

  myisam/ftdefs.h
    1.25 03/10/23 15:21:01 serg@serg.mylan +10 -4
    variable ft_max_word_len_for_sort -> define FT_MAX_WORD_LEN_FOR_SORT
    api changes, ft_max_word_len_for_sort variable removed
    ft_parse() with alloc

  myisam/ft_update.c
    1.31 03/10/23 15:21:01 serg@serg.mylan +4 -3
    ft_parse() with alloc

  myisam/ft_static.c
    1.23 03/10/23 15:21:01 serg@serg.mylan +6 -7
    api changes, ft_max_word_len_for_sort variable removed

  myisam/ft_parser.c
    1.36 03/10/23 15:21:01 serg@serg.mylan +10 -1
    ft_parse() with alloc

  myisam/ft_nlq_search.c
    1.26 03/10/23 15:21:01 serg@serg.mylan +47 -15
    query expansion for fulltext search

  myisam/ft_boolean_search.c
    1.65 03/10/23 15:21:01 serg@serg.mylan +1 -4
    assert.h and queues.h moved to ftdefs.h

  include/ft_global.h
    1.26 03/10/23 15:21:01 serg@serg.mylan +4 -4
    query expansion for fulltext search

ChangeSet
  1.1563.62.15 03/10/23 16:11:51 kostja@oak.local +1 -0
  small merge bug fixed

  sql/item_sum.h
    1.44.4.1 03/10/23 16:11:21 kostja@oak.local +1 -1
    fixed merge bug

ChangeSet
  1.1346.1.245 03/10/23 14:04:06 monty@narttu.mysql.fi +1 -0
  Fix results after merge

  mysql-test/r/myisam.result
    1.10.1.14 03/10/23 14:04:05 monty@narttu.mysql.fi +0 -1
    Fix results after merge

ChangeSet
  1.1346.1.244 03/10/23 13:25:16 monty@narttu.mysql.fi +6 -0
  Merge with 3.23 to get 4.0 tree in sync (no relevant changes to 4.0 tree)

  sql/sql_repl.cc
    1.86.1.25 03/10/23 13:25:15 monty@narttu.mysql.fi +0 -8
    use local

  sql/sql_parse.cc
    1.218.1.126 03/10/23 13:25:15 monty@narttu.mysql.fi +0 -2
    Use local

  mysql-test/t/myisam.test
    1.7.1.13 03/10/23 13:25:15 monty@narttu.mysql.fi +0 -2
    Remove uncessesary drop table

  client/mysqlbinlog.cc
    1.70.1.21 03/10/23 13:25:15 monty@narttu.mysql.fi +0 -25
    use local file

  sql/mini_client.cc
    1.48.5.1 03/10/23 13:07:42 monty@narttu.mysql.fi +0 -1
    Auto merged

  mysql-test/t/myisam.test
    1.2.8.2 03/10/23 13:07:42 monty@narttu.mysql.fi +0 -0
    Turn off SCCS flag

  BitKeeper/etc/logging_ok
    1.206.1.86 03/10/23 13:07:35 monty@narttu.mysql.fi +0 -1
    auto-union

ChangeSet
  1.1578.24.1 03/10/23 13:07:13 monty@narttu.mysql.fi +1 -0
  Don't use atomic add for not critical statistics.

  include/my_pthread.h
    1.65.1.4 03/10/23 13:07:11 monty@narttu.mysql.fi +1 -3
    Don't use atomic add for not critical statistics.

  sql/handler.cc
    1.94.3.2 03/10/23 10:13:32 acurtis@pcgem.rdg.cyberkinetica.com +19 -21
    WL1280: Rearrange some code

ChangeSet
  1.1578.23.1 03/10/22 20:52:47 bell@sanja.is.com.ua +17 -0
  Merge

  mysql-test/r/subselect.result
    1.67.30.3 03/10/22 20:52:42 bell@sanja.is.com.ua +0 -0
    SCCS merged

  sql/sql_yacc.yy
    1.203.76.3 03/10/22 20:50:56 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.35.1 03/10/22 20:50:55 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.34.4 03/10/22 20:50:55 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.22.8 03/10/22 20:50:55 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.87.2.3 03/10/22 20:50:55 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_derived.cc
    1.43.1.12 03/10/22 20:50:55 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.41.2 03/10/22 20:50:54 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_timefunc.h
    1.39 03/10/22 20:50:54 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_timefunc.cc
    1.42.1.2 03/10/22 20:50:54 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_sum.h
    1.48 03/10/22 20:50:54 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_sum.cc
    1.89.1.1 03/10/22 20:50:54 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.143 03/10/22 20:50:54 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.124.12.1 03/10/22 20:50:54 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.56.1.39 03/10/22 20:50:54 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.58.25.3 03/10/22 20:50:54 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.58.22.2 03/10/22 20:50:53 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.1.243 03/10/22 19:24:19 jani@rhols221.adsl.netsonic.fi +1 -0
  Reverted a wrong patch from mysqlhotcopy. This is a real bug
  in MySQL server...

  scripts/mysqlhotcopy.sh
    1.40 03/10/22 19:24:17 jani@rhols221.adsl.netsonic.fi +3 -3
    Reverted a wrong patch from mysqlhotcopy. This is a real bug
    in MySQL server...

ChangeSet
  1.1578.9.32 03/10/22 17:57:09 serg@serg.mylan +13 -0
  MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax

  sql/sql_yacc.yy
    1.203.77.7 03/10/22 17:57:04 serg@serg.mylan +14 -10
    MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax

  sql/lex.h
    1.82.1.46 03/10/22 17:57:04 serg@serg.mylan +1 -0
    MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax

  sql/item_func.h
    1.68.10.2 03/10/22 17:57:04 serg@serg.mylan +3 -18
    MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax

  sql/item_func.cc
    1.124.1.33 03/10/22 17:57:04 serg@serg.mylan +7 -7
    MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax

  sql/handler.h
    1.81.1.7 03/10/22 17:57:04 serg@serg.mylan +1 -2
    MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax

  sql/ha_myisam.h
    1.47.1.2 03/10/22 17:57:04 serg@serg.mylan +2 -3
    MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax

  mysql-test/t/fulltext.test
    1.44 03/10/22 17:57:04 serg@serg.mylan +2 -2
    after merge fix

  myisam/mi_write.c
    1.34.1.3 03/10/22 17:57:04 serg@serg.mylan +1 -1
    cleanup

  myisam/ftdefs.h
    1.24 03/10/22 17:57:04 serg@serg.mylan +2 -2
    MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax

  myisam/ft_static.c
    1.22 03/10/22 17:57:04 serg@serg.mylan +5 -5
    MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax

  myisam/ft_nlq_search.c
    1.25 03/10/22 17:57:04 serg@serg.mylan +2 -2
    MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax

  myisam/ft_boolean_search.c
    1.64 03/10/22 17:57:04 serg@serg.mylan +1 -1
    MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax

  include/ft_global.h
    1.25 03/10/22 17:57:04 serg@serg.mylan +6 -3
    MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax

ChangeSet
  1.1346.1.242 03/10/22 18:40:37 jani@rhols221.adsl.netsonic.fi +1 -0
  Fixed a bug in mysqlhotcopy, which made special table names
  to cause program to abort. Such table name could have been
  one with a semicolon (:) in the middle.

  scripts/mysqlhotcopy.sh
    1.39 03/10/22 18:40:32 jani@rhols221.adsl.netsonic.fi +3 -3
    Fixed a bug in mysqlhotcopy, which made special table names
    to cause program to abort. Such table name could have been
    one with a semicolon (:) in the middle.

ChangeSet
  1.1346.1.241 03/10/22 18:19:59 jani@rhols221.adsl.netsonic.fi +1 -0
  Fixed bug #954  mysqlhotcopy permission problem. The database
  directory owner ship was not honored.

  scripts/mysqlhotcopy.sh
    1.38 03/10/22 18:19:57 jani@rhols221.adsl.netsonic.fi +2 -0
    Fixed bug #954  mysqlhotcopy permission problem. The database
    directory owner ship was not honored.

ChangeSet
  1.1578.22.2 03/10/22 16:10:22 pem@mysql.com +93 -0
  Merging 4.1->5.0

  sql/sql_prepare.cc
    1.45 03/10/22 16:10:18 pem@mysql.com +1 -2
    Merging 4.1->5.0

  sql/sql_parse.cc
    1.302 03/10/22 16:10:18 pem@mysql.com +1 -5
    Merging 4.1->5.0

  sql/sql_insert.cc
    1.95 03/10/22 16:10:18 pem@mysql.com +0 -2
    Merging 4.1->5.0

  sql/sql_class.cc
    1.127 03/10/22 16:10:18 pem@mysql.com +1 -2
    Merging 4.1->5.0

  sql/share/ukrainian/errmsg.txt
    1.45 03/10/22 16:10:18 pem@mysql.com +5 -9
    Merging 4.1->5.0

  sql/share/swedish/errmsg.txt
    1.83 03/10/22 16:10:18 pem@mysql.com +3 -5
    Merging 4.1->5.0

  sql/share/spanish/errmsg.txt
    1.82 03/10/22 16:10:18 pem@mysql.com +5 -9
    Merging 4.1->5.0

  sql/share/slovak/errmsg.txt
    1.82 03/10/22 16:10:18 pem@mysql.com +5 -9
    Merging 4.1->5.0

  sql/share/serbian/errmsg.txt
    1.36 03/10/22 16:10:17 pem@mysql.com +5 -9
    Merging 4.1->5.0

  sql/share/russian/errmsg.txt
    1.80 03/10/22 16:10:17 pem@mysql.com +5 -9
    Merging 4.1->5.0

  sql/share/romanian/errmsg.txt
    1.79 03/10/22 16:10:17 pem@mysql.com +0 -0
    Merging 4.1->5.0

  sql/share/portuguese/errmsg.txt
    1.82 03/10/22 16:10:17 pem@mysql.com +3 -6
    Merging 4.1->5.0

  sql/share/polish/errmsg.txt
    1.82 03/10/22 16:10:17 pem@mysql.com +5 -9
    Merging 4.1->5.0

  sql/share/norwegian/errmsg.txt
    1.81 03/10/22 16:10:17 pem@mysql.com +5 -9
    Merging 4.1->5.0

  sql/share/norwegian-ny/errmsg.txt
    1.81 03/10/22 16:10:17 pem@mysql.com +5 -9
    Merging 4.1->5.0

  sql/share/korean/errmsg.txt
    1.81 03/10/22 16:10:17 pem@mysql.com +5 -9
    Merging 4.1->5.0

  sql/share/japanese/errmsg.txt
    1.81 03/10/22 16:10:17 pem@mysql.com +5 -9
    Merging 4.1->5.0

  sql/share/italian/errmsg.txt
    1.88 03/10/22 16:10:17 pem@mysql.com +5 -9
    Merging 4.1->5.0

  sql/share/hungarian/errmsg.txt
    1.83 03/10/22 16:10:17 pem@mysql.com +5 -9
    Merging 4.1->5.0

  sql/share/greek/errmsg.txt
    1.82 03/10/22 16:10:17 pem@mysql.com +5 -9
    Merging 4.1->5.0

  sql/share/german/errmsg.txt
    1.83 03/10/22 16:10:17 pem@mysql.com +27 -8
    Merging 4.1->5.0

  sql/share/french/errmsg.txt
    1.81 03/10/22 16:10:17 pem@mysql.com +5 -9
    Merging 4.1->5.0

  sql/share/estonian/errmsg.txt
    1.82 03/10/22 16:10:17 pem@mysql.com +5 -9
    Merging 4.1->5.0

  sql/share/english/errmsg.txt
    1.89 03/10/22 16:10:17 pem@mysql.com +5 -9
    Merging 4.1->5.0

  sql/share/dutch/errmsg.txt
    1.84 03/10/22 16:10:17 pem@mysql.com +5 -9
    Merging 4.1->5.0

  sql/share/danish/errmsg.txt
    1.80 03/10/22 16:10:17 pem@mysql.com +5 -9
    Merging 4.1->5.0

  sql/share/czech/errmsg.txt
    1.81 03/10/22 16:10:17 pem@mysql.com +0 -0
    Merging 4.1->5.0

  sql/log.cc
    1.115 03/10/22 16:10:17 pem@mysql.com +0 -5
    Merging 4.1->5.0

  sql/lex.h
    1.101.1.1 03/10/22 16:10:17 pem@mysql.com +0 -0
    Merging 4.1->5.0

  sql/item_func.h
    1.78 03/10/22 16:10:17 pem@mysql.com +0 -0
    Merging 4.1->5.0

  sql/item_func.cc
    1.133 03/10/22 16:10:17 pem@mysql.com +1 -2
    Merging 4.1->5.0

  scripts/mysql_fix_privilege_tables.sql
    1.6 03/10/22 16:10:17 pem@mysql.com +0 -0
    Merging 4.1->5.0

  mysql-test/t/query_cache.test
    1.28 03/10/22 16:10:17 pem@mysql.com +0 -0
    Merging 4.1->5.0

  mysql-test/t/insert.test
    1.14 03/10/22 16:10:17 pem@mysql.com +0 -0
    Merging 4.1->5.0

  mysql-test/r/query_cache.result
    1.32 03/10/22 16:10:17 pem@mysql.com +0 -0
    Merging 4.1->5.0

  mysql-test/r/insert.result
    1.15 03/10/22 16:10:17 pem@mysql.com +0 -0
    Merging 4.1->5.0

  include/mysqld_error.h
    1.78 03/10/22 16:10:17 pem@mysql.com +28 -29
    Merging 4.1->5.0

  client/mysqltest.c
    1.101 03/10/22 16:10:17 pem@mysql.com +0 -0
    Merging 4.1->5.0

ChangeSet
  1.1346.1.240 03/10/22 16:02:27 jani@rhols221.adsl.netsonic.fi +1 -0
  Applied a patch from Travis Wheeler to mysqlhotcopy that allows
  using regexp with tablenames together with databasenames.

  scripts/mysqlhotcopy.sh
    1.37 03/10/22 16:02:23 jani@rhols221.adsl.netsonic.fi +15 -2
    Applied a patch from Travis Wheeler to mysqlhotcopy that allows
    using regexp with tablenames together with databasenames.

  sql/sql_yacc.yy
    1.243.1.1 03/10/22 12:18:51 pem@mysql.com +0 -0
    Auto merged

  sql/sql_update.cc
    1.95 03/10/22 12:18:50 pem@mysql.com +0 -0
    Auto merged

  sql/sql_union.cc
    1.80 03/10/22 12:18:50 pem@mysql.com +0 -0
    Auto merged

  sql/sql_table.cc
    1.167 03/10/22 12:18:50 pem@mysql.com +0 -0
    Auto merged

  sql/sql_show.cc
    1.128 03/10/22 12:18:50 pem@mysql.com +0 -0
    Auto merged

  sql/sql_select.cc
    1.228 03/10/22 12:18:50 pem@mysql.com +0 -0
    Auto merged

  sql/sql_repl.cc
    1.110 03/10/22 12:18:50 pem@mysql.com +0 -0
    Auto merged

  sql/sql_load.cc
    1.53 03/10/22 12:18:50 pem@mysql.com +0 -0
    Auto merged

  sql/sql_lex.h
    1.122 03/10/22 12:18:50 pem@mysql.com +0 -0
    Auto merged

  sql/sql_lex.cc
    1.87.1.3 03/10/22 12:18:49 pem@mysql.com +0 -0
    Auto merged

  sql/sql_derived.cc
    1.48 03/10/22 12:18:49 pem@mysql.com +0 -0
    Auto merged

  sql/sql_delete.cc
    1.107 03/10/22 12:18:49 pem@mysql.com +0 -0
    Auto merged

  sql/sql_db.cc
    1.74 03/10/22 12:18:49 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.164 03/10/22 12:18:49 pem@mysql.com +0 -0
    Auto merged

  sql/sql_cache.cc
    1.55 03/10/22 12:18:49 pem@mysql.com +0 -0
    Auto merged

  sql/sql_base.cc
    1.152 03/10/22 12:18:49 pem@mysql.com +0 -0
    Auto merged

  sql/sql_acl.cc
    1.80 03/10/22 12:18:49 pem@mysql.com +0 -0
    Auto merged

  sql/slave.cc
    1.198 03/10/22 12:18:49 pem@mysql.com +0 -0
    Auto merged

  sql/set_var.cc
    1.42 03/10/22 12:18:49 pem@mysql.com +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.36 03/10/22 12:18:49 pem@mysql.com +0 -0
    Auto merged

  sql/protocol.cc
    1.64 03/10/22 12:18:49 pem@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.370 03/10/22 12:18:49 pem@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.200 03/10/22 12:18:48 pem@mysql.com +0 -0
    Auto merged

  sql/log_event.cc
    1.121 03/10/22 12:18:48 pem@mysql.com +0 -0
    Auto merged

  sql/lock.cc
    1.46 03/10/22 12:18:48 pem@mysql.com +0 -0
    Auto merged

  sql/item_sum.cc
    1.90 03/10/22 12:18:48 pem@mysql.com +0 -0
    Auto merged

  sql/item_subselect.cc
    1.67 03/10/22 12:18:48 pem@mysql.com +0 -0
    Auto merged

  sql/item_create.cc
    1.38 03/10/22 12:18:48 pem@mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.104.1.1 03/10/22 12:18:48 pem@mysql.com +0 -0
    Auto merged

  sql/item.h
    1.68 03/10/22 12:18:48 pem@mysql.com +0 -0
    Auto merged

  sql/item.cc
    1.72 03/10/22 12:18:48 pem@mysql.com +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.123 03/10/22 12:18:47 pem@mysql.com +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.95 03/10/22 12:18:46 pem@mysql.com +0 -0
    Auto merged

  sql/ha_berkeley.cc
    1.120 03/10/22 12:18:46 pem@mysql.com +0 -0
    Auto merged

  scripts/mysql_install_db.sh
    1.48 03/10/22 12:18:46 pem@mysql.com +0 -0
    Auto merged

  scripts/mysql_create_system_tables.sh
    1.9 03/10/22 12:18:46 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/variables.test
    1.22 03/10/22 12:18:46 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.69 03/10/22 12:18:46 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/variables.result
    1.33 03/10/22 12:18:46 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.79 03/10/22 12:18:46 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/distinct.result
    1.29 03/10/22 12:18:46 pem@mysql.com +0 -0
    Auto merged

  myisam/myisamdef.h
    1.64 03/10/22 12:18:46 pem@mysql.com +0 -0
    Auto merged

  myisam/myisamchk.c
    1.98 03/10/22 12:18:46 pem@mysql.com +0 -0
    Auto merged

  myisam/mi_check.c
    1.110 03/10/22 12:18:46 pem@mysql.com +0 -0
    Auto merged

  libmysqld/lib_sql.cc
    1.77 03/10/22 12:18:46 pem@mysql.com +0 -0
    Auto merged

  libmysqld/Makefile.am
    1.37 03/10/22 12:18:46 pem@mysql.com +0 -0
    Auto merged

  libmysql/libmysql.c
    1.161 03/10/22 12:18:46 pem@mysql.com +0 -0
    Auto merged

  include/mysql_com.h
    1.74 03/10/22 12:18:45 pem@mysql.com +0 -0
    Auto merged

  include/my_global.h
    1.50 03/10/22 12:18:45 pem@mysql.com +0 -0
    Auto merged

  configure.in
    1.216 03/10/22 12:18:45 pem@mysql.com +0 -0
    Auto merged

  client/mysql.cc
    1.132 03/10/22 12:18:45 pem@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-knetware.imp~1
    1.2 03/10/22 12:18:45 pem@mysql.com +0 -0
    Delete: netware/BUILD/knetware.imp

  BitKeeper/deleted/.del-compile-netware-src~1
    1.2 03/10/22 12:18:10 pem@mysql.com +0 -0
    Delete: netware/BUILD/compile-netware-src

  BitKeeper/etc/logging_ok
    1.246 03/10/22 12:02:22 pem@mysql.com +0 -1
    auto-union

  BitKeeper/etc/ignore
    1.159 03/10/22 12:02:22 pem@mysql.com +0 -0
    auto-union

ChangeSet
  1.1578.9.31 03/10/21 23:44:26 serg@serg.mylan +3 -0
  ftbench fixes

  myisam/ftbench/README
    1.1 03/10/21 23:44:21 serg@serg.mylan +56 -0

  myisam/ftbench/ft-test-run.sh
    1.2 03/10/21 23:44:21 serg@serg.mylan +8 -4
    ftbench fixes

  myisam/ftbench/README
    1.0 03/10/21 23:44:21 serg@serg.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-4.1/myisam/ftbench/README

  myisam/ftbench/Ereport.pl
    1.2 03/10/21 23:44:21 serg@serg.mylan +1 -5
    ftbench fixes

  sql/sql_yacc.yy
    1.244 03/10/21 21:25:37 acurtis@pcgem.rdg.cyberkinetica.com +8 -17
    WorkLog #1280, Stage 1

  sql/lex.h
    1.102 03/10/21 21:25:37 acurtis@pcgem.rdg.cyberkinetica.com +0 -6
    WorkLog #1280, Stage 1

  sql/handler.h
    1.81.4.1 03/10/21 21:25:37 acurtis@pcgem.rdg.cyberkinetica.com +1 -0
    WorkLog #1280, Stage 1

  sql/handler.cc
    1.94.3.1 03/10/21 21:25:37 acurtis@pcgem.rdg.cyberkinetica.com +37 -0
    WorkLog #1280, Stage 1

ChangeSet
  1.1346.1.237 03/10/21 18:41:19 lenz@mysql.com +1 -0
   - bumped up version number in configure.in to to 4.0.17 now that
     4.0.16 has been tagged and released
   - tagged ChangeSet 1.1576.1.5 as "mysql-4.0.16"

  configure.in
    1.191.1.98 03/10/21 18:41:17 lenz@mysql.com +1 -1
     - bumped up version number to 4.0.17 now that 4.0.16 has been tagged
       and released

ChangeSet
  1.1563.62.14 03/10/21 18:13:14 pem@mysql.comhem.se +3 -0
  Bugfix of previous WL#1265 commit.
  
  Need a sp_cache_remove() function with implicit name lookup to make the WL task
  to work. It's a cleaner and more convenient interface anyway...

  sql/sp_cache.h
    1.4 03/10/21 18:13:12 pem@mysql.com +8 -4
    Modified sp_cache_remove() function. Get name and lookup/remove, return the
    removed entry, if any.

  sql/sp_cache.cc
    1.3 03/10/21 18:13:12 pem@mysql.com +5 -3
    Modified sp_cache_remove() function. Get name and lookup/remove, return the
    removed entry, if any.

  sql/sp.cc
    1.28 03/10/21 18:13:11 pem@mysql.com +2 -8
    Modified sp_cache_remove() function calls; just remove by name.

ChangeSet
  1.1346.400.1 03/10/21 17:34:40 serg@serg.mylan +1 -0
  Bug#1271 - RAND_TABLE_BIT in expression and only const_tables in join

  sql/sql_select.cc
    1.152.1.110 03/10/21 17:34:37 serg@serg.mylan +2 -0
    Bug#1271 - RAND_TABLE_BIT in expression and only const_tables in join

ChangeSet
  1.1578.22.1 03/10/21 16:06:26 hf@deer.(none) +2 -0
  Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into deer.(none):/home/hf/work/mysql-4.1.clean

  sql/mysqld.cc
    1.356.35.1 03/10/21 16:06:24 hf@deer.(none) +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.41.1 03/10/21 16:06:23 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1578.21.1 03/10/21 16:05:17 hf@deer.(none) +5 -0
  Fix for Windows bug reported throuhg Miguel

  sql/mysqld.cc
    1.356.34.1 03/10/21 16:05:15 hf@deer.(none) +10 -5
    these functions don't work in embedded server thus #ifdef-ed 

  sql/mysql_priv.h
    1.186.40.1 03/10/21 16:05:15 hf@deer.(none) +5 -1
    declaration of init_errmessage changed
    unireg_abort was replaced with DBUG_RETURN for embedded server

  sql/init.cc
    1.12 03/10/21 16:05:15 hf@deer.(none) +2 -0
    my_abort_hook left unchanged

  sql/derror.cc
    1.14 03/10/21 16:05:15 hf@deer.(none) +7 -6
    in embedded server these functions should return the sign of the error
    instead of halting the program

  libmysqld/lib_sql.cc
    1.75.1.12 03/10/21 16:05:15 hf@deer.(none) +0 -5
    This code seems to be superfluous

ChangeSet
  1.1346.1.236 03/10/21 12:24:32 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

  mysql-test/r/rpl_trunc_binlog.result
    1.2.1.2 03/10/21 12:24:26 guilhem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.398.3 03/10/21 12:22:24 guilhem@mysql.com +1 -0
  Fix for Bug #1595 "mysqlbinlog can't read a password from the console".
  ** I already fixed it in 3.23; I fix it in 4.0 separately because the
  code is a bit different (so the changeset 1.1422 of 3.23 should not be
  merged here) **
  Make mysqlbinlog prompt for the password if
  mysqlbinlog -p
  instead of printing the usage().
  This makes mysqlbinlog behave like other clients.
  This new code was almost copied from mysqldump.
  Note that before, one could use
    mysqlbinlog -p pass
  and now one must use
    mysqlbinlog -ppass
  (putting a space will ask for the password).

  client/mysqlbinlog.cc
    1.70.1.20 03/10/21 12:22:19 guilhem@mysql.com +24 -3
    Make mysqlbinlog prompt for the password if
    mysqlbinlog -p
    instead of printing the usage().
    This makes mysqlbinlog behave like other clients.
    This new code was almost copied from mysqldump.
    Note that before, one could use
      mysqlbinlog -p pass
    and now one must use
      mysqlbinlog -ppass
    (putting a space will ask for the password).

ChangeSet
  1.1346.399.1 03/10/21 15:14:06 gluh@gluh.mysql.r18.ru +3 -0
  Fix for bug #1271: Undefined variable in PASSWORD() function is not 
  handled correctly

  sql/item_func.cc
    1.60.1.44 03/10/21 15:13:48 gluh@gluh.mysql.r18.ru +1 -1
    Fix for bug #1271: Undefined variable in PASSWORD() function is not 
    handled correctly

  mysql-test/t/func_crypt.test
    1.6.1.3 03/10/21 15:13:48 gluh@gluh.mysql.r18.ru +9 -0
    Fix for bug #1271: Undefined variable in PASSWORD() function is not 
    handled correctly

  mysql-test/r/func_crypt.result
    1.8.1.2 03/10/21 15:13:48 gluh@gluh.mysql.r18.ru +10 -0
    Fix for bug #1271: Undefined variable in PASSWORD() function is not 
    handled correctly

ChangeSet
  1.1563.62.13 03/10/21 12:08:35 pem@mysql.comhem.se +6 -0
  WL#1265: Fix proper ALTER/DROP support in the SP cache.
  
  New sp_cache C API. When an SP is dropped, old caches (in other threads)
  become invalid and are cleared.
  Also, the caches in THD are only created on demand.

  sql/sql_class.cc
    1.126 03/10/21 12:08:33 pem@mysql.com +8 -8
    The new sp_cache API creates the caches on demand, to avoid allocating it
    when it's not needed.

  sql/sp_cache.h
    1.3 03/10/21 12:08:33 pem@mysql.com +32 -0
    New C API for sp_cache.
    The class sp_cache is still used, but not directly. The C functions makes takes
    care of updating caches when SPs are dropped.
    The API is also designed so that the sp_cache is created on demand.

  sql/sp_cache.cc
    1.2 03/10/21 12:08:33 pem@mysql.com +93 -0
    New C API for sp_cache.
    The class sp_cache is still used, but not directly. The C functions makes takes
    care of updating caches when SPs are dropped. (This is done in the simplest
    possible way, by simply detecting drops and then clear all old caches.)
    The API is also designed so that the sp_cache is created on demand.

  sql/sp.cc
    1.27 03/10/21 12:08:33 pem@mysql.com +10 -10
    New C API for SP cache.

  sql/mysqld.cc
    1.369 03/10/21 12:08:33 pem@mysql.com +2 -0
    Initialize SP cache.

  Docs/sp-imp-spec.txt
    1.8 03/10/21 12:08:33 pem@mysql.com +72 -26
    Brough the SP cache docs up-to-date.

ChangeSet
  1.1578.9.30 03/10/21 12:00:34 serg@serg.mylan +22 -0
  after-merge fix

  sql/share/ukrainian/errmsg.txt
    1.27.11.4 03/10/21 12:00:30 serg@serg.mylan +1 -0
    after-merge fix

  sql/share/swedish/errmsg.txt
    1.64.12.4 03/10/21 12:00:30 serg@serg.mylan +1 -0
    after-merge fix

  sql/share/spanish/errmsg.txt
    1.64.15.4 03/10/21 12:00:30 serg@serg.mylan +1 -0
    after-merge fix

  sql/share/slovak/errmsg.txt
    1.64.13.4 03/10/21 12:00:30 serg@serg.mylan +1 -0
    after-merge fix

  sql/share/serbian/errmsg.txt
    1.18.11.4 03/10/21 12:00:30 serg@serg.mylan +1 -0
    after-merge fix

  sql/share/russian/errmsg.txt
    1.61.11.4 03/10/21 12:00:30 serg@serg.mylan +1 -0
    after-merge fix

  sql/share/romanian/errmsg.txt
    1.62.13.4 03/10/21 12:00:30 serg@serg.mylan +1 -0
    after-merge fix

  sql/share/portuguese/errmsg.txt
    1.64.14.4 03/10/21 12:00:30 serg@serg.mylan +1 -0
    after-merge fix

  sql/share/polish/errmsg.txt
    1.63.12.4 03/10/21 12:00:30 serg@serg.mylan +1 -0
    after-merge fix

  sql/share/norwegian/errmsg.txt
    1.63.13.4 03/10/21 12:00:30 serg@serg.mylan +1 -0
    after-merge fix

  sql/share/norwegian-ny/errmsg.txt
    1.63.13.4 03/10/21 12:00:29 serg@serg.mylan +1 -0
    after-merge fix

  sql/share/korean/errmsg.txt
    1.63.12.4 03/10/21 12:00:29 serg@serg.mylan +1 -0
    after-merge fix

  sql/share/japanese/errmsg.txt
    1.63.12.4 03/10/21 12:00:29 serg@serg.mylan +1 -0
    after-merge fix

  sql/share/italian/errmsg.txt
    1.70.13.4 03/10/21 12:00:29 serg@serg.mylan +1 -0
    after-merge fix

  sql/share/hungarian/errmsg.txt
    1.65.12.4 03/10/21 12:00:29 serg@serg.mylan +1 -0
    after-merge fix

  sql/share/greek/errmsg.txt
    1.64.12.4 03/10/21 12:00:29 serg@serg.mylan +1 -0
    after-merge fix

  sql/share/german/errmsg.txt
    1.64.13.4 03/10/21 12:00:29 serg@serg.mylan +1 -0
    after-merge fix

  sql/share/french/errmsg.txt
    1.63.13.4 03/10/21 12:00:29 serg@serg.mylan +1 -0
    after-merge fix

  sql/share/estonian/errmsg.txt
    1.64.12.4 03/10/21 12:00:29 serg@serg.mylan +1 -0
    after-merge fix

  sql/share/dutch/errmsg.txt
    1.66.13.4 03/10/21 12:00:29 serg@serg.mylan +1 -0
    after-merge fix

  sql/share/danish/errmsg.txt
    1.62.13.4 03/10/21 12:00:29 serg@serg.mylan +1 -0
    after-merge fix

  sql/share/czech/errmsg.txt
    1.64.13.4 03/10/21 12:00:29 serg@serg.mylan +1 -0
    after-merge fix

ChangeSet
  1.1578.9.29 03/10/21 11:58:43 serg@serg.mylan +49 -0
  merged

  strings/ctype-bin.c
    1.37 03/10/21 11:58:39 serg@serg.mylan +3 -4
    merged

  sql/share/ukrainian/errmsg.txt
    1.27.11.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/swedish/errmsg.txt
    1.64.12.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/spanish/errmsg.txt
    1.64.15.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/slovak/errmsg.txt
    1.64.13.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/serbian/errmsg.txt
    1.18.11.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/russian/errmsg.txt
    1.61.11.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/romanian/errmsg.txt
    1.62.13.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/portuguese/errmsg.txt
    1.64.14.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/polish/errmsg.txt
    1.63.12.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/norwegian/errmsg.txt
    1.63.13.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/norwegian-ny/errmsg.txt
    1.63.13.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/korean/errmsg.txt
    1.63.12.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/japanese/errmsg.txt
    1.63.12.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/italian/errmsg.txt
    1.70.13.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/hungarian/errmsg.txt
    1.65.12.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/greek/errmsg.txt
    1.64.12.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/german/errmsg.txt
    1.64.13.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/french/errmsg.txt
    1.63.13.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/estonian/errmsg.txt
    1.64.12.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/english/errmsg.txt
    1.70.15.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/dutch/errmsg.txt
    1.66.13.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/danish/errmsg.txt
    1.62.13.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/share/czech/errmsg.txt
    1.64.13.3 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  sql/opt_range.h
    1.27 03/10/21 11:58:39 serg@serg.mylan +1 -2
    merged

  sql/mysqld.cc
    1.356.1.54 03/10/21 11:58:39 serg@serg.mylan +0 -0
    merged

  sql/item_timefunc.cc
    1.44 03/10/21 11:58:39 serg@serg.mylan +0 -1
    merged

  include/mysqld_error.h
    1.61.10.2 03/10/21 11:58:39 serg@serg.mylan +2 -3
    merged

  strings/ctype-simple.c
    1.39 03/10/21 11:24:20 serg@serg.mylan +0 -0
    Auto merged

  sql/table.cc
    1.88 03/10/21 11:24:19 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.203.77.6 03/10/21 11:24:19 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_update.cc
    1.83.2.19 03/10/21 11:24:19 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_test.cc
    1.21.1.4 03/10/21 11:24:18 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_table.cc
    1.157.9.19 03/10/21 11:24:18 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_show.cc
    1.122.4.10 03/10/21 11:24:18 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.32.4 03/10/21 11:24:18 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_delete.cc
    1.99.2.12 03/10/21 11:24:18 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_acl.cc
    1.74.1.20 03/10/21 11:24:18 serg@serg.mylan +0 -0
    Auto merged

  sql/slave.cc
    1.188.1.25 03/10/21 11:24:18 serg@serg.mylan +0 -0
    Auto merged

  sql/opt_range.cc
    1.90.1.11 03/10/21 11:24:17 serg@serg.mylan +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.35.5 03/10/21 11:24:17 serg@serg.mylan +0 -0
    Auto merged

  sql/item_func.cc
    1.124.1.32 03/10/21 11:24:17 serg@serg.mylan +0 -0
    Auto merged

  sql/item.cc
    1.58.26.2 03/10/21 11:24:17 serg@serg.mylan +0 -0
    Auto merged

  sql/handler.h
    1.81.1.6 03/10/21 11:24:17 serg@serg.mylan +0 -0
    Auto merged

  sql/ha_berkeley.cc
    1.117.1.6 03/10/21 11:24:17 serg@serg.mylan +0 -0
    Auto merged

  sql/field.cc
    1.117 03/10/21 11:24:16 serg@serg.mylan +0 -0
    Auto merged

  mysql-test/r/mysqldump.result
    1.4 03/10/21 11:24:16 serg@serg.mylan +0 -0
    Auto merged

  include/m_ctype.h
    1.79 03/10/21 11:24:16 serg@serg.mylan +0 -0
    Auto merged

  BitKeeper/etc/ignore
    1.153.1.15 03/10/21 11:24:02 serg@serg.mylan +0 -0
    auto-union

ChangeSet
  1.1578.16.9 03/10/21 00:13:17 serg@serg.mylan +2 -0
  >255 keys support in frm

  sql/unireg.cc
    1.29 03/10/21 00:13:11 serg@serg.mylan +16 -9
    >255 keys support in frm

  sql/table.cc
    1.86.1.2 03/10/21 00:13:11 serg@serg.mylan +14 -3
    >255 keys support in frm

ChangeSet
  1.1578.16.8 03/10/20 21:32:49 serg@serg.mylan +1 -0
  oops forgot to commit ft_parser.c :-[]

  myisam/ft_parser.c
    1.35 03/10/20 21:32:45 serg@serg.mylan +9 -9
    oops forgot to commit this file :-[]

ChangeSet
  1.1578.9.28 03/10/20 18:18:18 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-count-4.1

  sql/item.cc
    1.58.28.2 03/10/20 18:18:09 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1563.62.12 03/10/20 16:59:45 pem@mysql.comhem.se +4 -0
  Bugfix; added another method to Item_splocal, updated tests, and added previous
  fix to functions as well.

  sql/sp_head.cc
    1.46 03/10/20 16:59:43 pem@mysql.com +11 -3
    Completed previous initialization bug; now for FUNCTIONs. too.

  sql/item.h
    1.67 03/10/20 16:59:43 pem@mysql.com +4 -0
    Another bugfix; need to override yet another method in Item_splocal.

  mysql-test/t/sp.test
    1.29 03/10/20 16:59:43 pem@mysql.com +12 -6
    Modified test to trap yet another bug (now fixed).

  mysql-test/r/sp.result
    1.28 03/10/20 16:59:43 pem@mysql.com +8 -7
    Modified test to trap yet another bug (now fixed).

ChangeSet
  1.1578.9.27 03/10/20 19:13:45 bar@bar.mysql.r18.ru +2 -0
  Test for bug #1022
  Description: When a table contains a 'float' field, and one of the functions
  MAX, MIN, or AVG is used on that field, the system crashes.
  

  mysql-test/t/type_float.test
    1.7 03/10/20 19:13:41 bar@bar.mysql.r18.ru +9 -0
    Test for bug #1022
    Description: When a table contains a 'float' field, and one of the functions
    MAX, MIN, or AVG is used on that field, the system crashes.
    

  mysql-test/r/type_float.result
    1.16 03/10/20 19:13:41 bar@bar.mysql.r18.ru +6 -0
    Test for bug #1022
    Description: When a table contains a 'float' field, and one of the functions
    MAX, MIN, or AVG is used on that field, the system crashes.
    

ChangeSet
  1.1578.9.26 03/10/20 18:53:58 bar@bar.mysql.r18.ru +1 -0
  Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

  sql/item.cc
    1.58.30.2 03/10/20 18:53:55 bar@bar.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1578.16.7 03/10/20 15:53:48 serg@serg.mylan +13 -0
  FULLTEXT: correct charset support (UTF included, UCS2 - not)
  code cleanup

  strings/ctype-utf8.c
    1.52 03/10/20 15:53:44 serg@serg.mylan +4 -4
    hack: (to be fixed properly later) all multi-byte sequences are considered isalpha() now 

  strings/ctype-tis620.c
    1.53 03/10/20 15:53:43 serg@serg.mylan +1 -1
    my_mbcharlen_8bit() { return 1 }

  strings/ctype-simple.c
    1.37.1.1 03/10/20 15:53:43 serg@serg.mylan +1 -1
    my_mbcharlen_8bit() { return 1 }

  strings/ctype-latin1.c
    1.19 03/10/20 15:53:43 serg@serg.mylan +2 -2
    my_mbcharlen_8bit() { return 1 }

  strings/ctype-bin.c
    1.35.1.1 03/10/20 15:53:43 serg@serg.mylan +16 -10
    my_mbcharlen_8bit() { return 1 }

  sql/sql_yacc.yy
    1.203.80.1 03/10/20 15:53:43 serg@serg.mylan +10 -8
    FULLTEXT: code cleanup

  sql/sql_table.cc
    1.157.16.4 03/10/20 15:53:43 serg@serg.mylan +1 -0
    FULLTEXT: UCS2 is not allowed

  sql/item_func.h
    1.68.10.1 03/10/20 15:53:43 serg@serg.mylan +11 -19
    FULLTEXT: correct charset support (UTF included, UCS2 - not)
    code cleanup

  sql/item_func.cc
    1.124.11.2 03/10/20 15:53:43 serg@serg.mylan +35 -40
    FULLTEXT: correct charset support (UTF included, UCS2 - not)
    code cleanup

  sql/item_cmpfunc.h
    1.64.1.1 03/10/20 15:53:43 serg@serg.mylan +0 -1
    cleanup

  mysql-test/t/fulltext.test
    1.43 03/10/20 15:53:43 serg@serg.mylan +18 -0
    fulltext on UTF

  mysql-test/r/fulltext.result
    1.47 03/10/20 15:53:43 serg@serg.mylan +21 -0
    fulltext on UTF

  include/m_ctype.h
    1.77.1.1 03/10/20 15:53:43 serg@serg.mylan +1 -0
    my_mbcharlen_8bit() { return 1 }

ChangeSet
  1.1578.20.1 03/10/20 18:52:45 bar@bar.mysql.r18.ru +1 -0
  Fix for:
  http://bugs.mysql.com/bug.php?id=1022
  Description: When a table contains a 'float' field, and one of the functions
  MAX, MIN, or AVG is used on that field, the system crashes.

  sql/item.cc
    1.58.31.1 03/10/20 18:52:42 bar@bar.mysql.r18.ru +8 -0
    Fix for:
    http://bugs.mysql.com/bug.php?id=1022
    Description: When a table contains a 'float' field, and one of the functions
    MAX, MIN, or AVG is used on that field, the system crashes.

ChangeSet
  1.676.1.746 03/10/20 15:35:03 guilhem@mysql.com +1 -0
  Fix for Bug #1595 "mysqlbinlog can't read a password from the console".
  Make mysqlbinlog prompt for the password if
  mysqlbinlog -p
  instead of printing the usage().
  This makes mysqlbinlog behave like other clients, which is the reason
  why we fix this in 3.23.
  This new code was almost copied from mysqldump.
  Note that before, one could use
  mysqlbinlog -p pass
  and now one must use
  mysqlbinlog -ppass
  (putting a space will ask for the password).

  client/mysqlbinlog.cc
    1.44.1.8 03/10/20 15:34:53 guilhem@mysql.com +25 -4
    Make mysqlbinlog prompt for the password if
    mysqlbinlog -p
    instead of printing the usage().
    This makes mysqlbinlog behave like other clients, which is the reason
    why we fix this in 3.23.
    This new code was almost copied from mysqldump.
    Note that before, one could use
    mysqlbinlog -p pass
    and now one must use
    mysqlbinlog -ppass
    (putting a space will ask for the password).

ChangeSet
  1.1578.9.25 03/10/20 13:45:28 gluh@gluh.mysql.r18.ru +12 -0
  Merge commit

  sql/mysqld.cc
    1.356.1.53 03/10/20 13:45:26 gluh@gluh.mysql.r18.ru +2 -2
    Merge commit

  sql/mysql_priv.h
    1.186.35.4 03/10/20 13:45:26 gluh@gluh.mysql.r18.ru +7 -6
    Merge commit

  sql/sql_yacc.yy
    1.203.77.5 03/10/20 13:26:10 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_class.h
    1.146.1.45 03/10/20 13:26:10 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_class.cc
    1.105.1.26 03/10/20 13:26:10 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/set_var.h
    1.33.1.2 03/10/20 13:26:10 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/set_var.cc
    1.34.20.6 03/10/20 13:26:10 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/protocol.cc
    1.56.1.16 03/10/20 13:26:08 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/lex.h
    1.82.1.45 03/10/20 13:26:08 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/item.h
    1.56.14.2 03/10/20 13:26:07 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/item.cc
    1.58.30.1 03/10/20 13:26:07 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/field.cc
    1.115.1.1 03/10/20 13:26:07 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1563.91.1 03/10/20 13:24:18 gluh@gluh.mysql.r18.ru +21 -0
  Scrum task 835 - text-to-datetime conversion function

  mysql-test/t/date_formats.test
    1.1 03/10/20 13:23:56 gluh@gluh.mysql.r18.ru +82 -0

  mysql-test/t/date_formats-master.opt
    1.1 03/10/20 13:23:56 gluh@gluh.mysql.r18.ru +1 -0

  mysql-test/r/date_formats.result
    1.1 03/10/20 13:23:56 gluh@gluh.mysql.r18.ru +157 -0

  sql/time.cc
    1.33 03/10/20 13:23:56 gluh@gluh.mysql.r18.ru +285 -43
    Scrum task 835 - text-to-datetime conversion function

  sql/structs.h
    1.30 03/10/20 13:23:56 gluh@gluh.mysql.r18.ru +7 -2
    Scrum task 835 - text-to-datetime conversion function

  sql/sql_yacc.yy
    1.203.79.1 03/10/20 13:23:56 gluh@gluh.mysql.r18.ru +11 -0
    Scrum task 835 - text-to-datetime conversion function

  sql/sql_class.h
    1.146.21.1 03/10/20 13:23:56 gluh@gluh.mysql.r18.ru +1 -0
    Scrum task 835 - text-to-datetime conversion function

  mysql-test/t/date_formats.test
    1.0 03/10/20 13:23:56 gluh@gluh.mysql.r18.ru +0 -0
    BitKeeper file /home/gluh/mysql-4.1.to_time/mysql-test/t/date_formats.test

  mysql-test/t/date_formats-master.opt
    1.0 03/10/20 13:23:56 gluh@gluh.mysql.r18.ru +0 -0
    BitKeeper file /home/gluh/mysql-4.1.to_time/mysql-test/t/date_formats-master.opt

  mysql-test/r/date_formats.result
    1.0 03/10/20 13:23:56 gluh@gluh.mysql.r18.ru +0 -0
    BitKeeper file /home/gluh/mysql-4.1.to_time/mysql-test/r/date_formats.result

  sql/sql_class.cc
    1.105.8.1 03/10/20 13:23:55 gluh@gluh.mysql.r18.ru +3 -0
    Scrum task 835 - text-to-datetime conversion function

  sql/set_var.h
    1.32.1.1 03/10/20 13:23:55 gluh@gluh.mysql.r18.ru +50 -0
    Scrum task 835 - text-to-datetime conversion function

  sql/set_var.cc
    1.34.23.1 03/10/20 13:23:55 gluh@gluh.mysql.r18.ru +72 -0
    Scrum task 835 - text-to-datetime conversion function

  sql/protocol.cc
    1.56.8.1 03/10/20 13:23:55 gluh@gluh.mysql.r18.ru +19 -26
    Scrum task 835 - text-to-datetime conversion function

  sql/mysqld.cc
    1.356.33.1 03/10/20 13:23:55 gluh@gluh.mysql.r18.ru +67 -1
    Scrum task 835 - text-to-datetime conversion function

  sql/mysql_priv.h
    1.186.27.2 03/10/20 13:23:55 gluh@gluh.mysql.r18.ru +22 -5
    Scrum task 835 - text-to-datetime conversion function

  sql/lex.h
    1.82.19.1 03/10/20 13:23:55 gluh@gluh.mysql.r18.ru +2 -0
    Scrum task 835 - text-to-datetime conversion function

  sql/item_timefunc.h
    1.37.1.1 03/10/20 13:23:55 gluh@gluh.mysql.r18.ru +43 -0
    Scrum task 835 - text-to-datetime conversion function

  sql/item_timefunc.cc
    1.42.2.1 03/10/20 13:23:55 gluh@gluh.mysql.r18.ru +751 -370
    Scrum task 835 - text-to-datetime conversion function

  sql/item_create.h
    1.33 03/10/20 13:23:55 gluh@gluh.mysql.r18.ru +1 -0
    Scrum task 835 - text-to-datetime conversion function

  sql/item_create.cc
    1.33.1.18 03/10/20 13:23:55 gluh@gluh.mysql.r18.ru +5 -0
    Scrum task 835 - text-to-datetime conversion function

  sql/item.h
    1.56.13.3 03/10/20 13:23:55 gluh@gluh.mysql.r18.ru +9 -1
    Scrum task 835 - text-to-datetime conversion function

  sql/item.cc
    1.58.29.1 03/10/20 13:23:55 gluh@gluh.mysql.r18.ru +17 -17
    Scrum task 835 - text-to-datetime conversion function

  sql/field.cc
    1.112.1.2 03/10/20 13:23:55 gluh@gluh.mysql.r18.ru +43 -28
    Scrum task 835 - text-to-datetime conversion function

ChangeSet
  1.1578.9.24 03/10/19 16:57:17 vva@eagle.mysql.r18.ru +1 -0
  made more fine error message in scripts/fill_help_tables.sh

  scripts/fill_help_tables.sh
    1.9 03/10/19 16:57:06 vva@eagle.mysql.r18.ru +2 -1
    made more fine error message

ChangeSet
  1.1346.1.235 03/10/19 20:31:32 heikki@hundin.mysql.fi +1 -0
  os0file.c:
    Check that writes to data files always happen in to addresses divisible by 16 kB, and the chunk size is also divisible by 16 kB; a user reported 2 corrupt pages from Linux-2.4.20 where an index page seemed displaced

  innobase/os/os0file.c
    1.44.1.17 03/10/19 20:31:22 heikki@hundin.mysql.fi +4 -0
    Check that writes to data files always happen in to addresses divisible by 16 kB, and the chunk size is also divisible by 16 kB; a user reported 2 corrupt pages from Linux-2.4.20 where an index page seemed displaced

ChangeSet
  1.1346.1.234 03/10/19 20:28:03 heikki@hundin.mysql.fi +1 -0
  os0file.c:
    Check that writes to data files always happen in to addresses divisible by 16 kB, and the chunk size is also divisible by 16 kB; a user reported 2 corrupt pages from Linux-2.4.20 where an index page seemed displaced

  innobase/os/os0file.c
    1.44.1.16 03/10/19 20:27:51 heikki@hundin.mysql.fi +5 -1
    Check that writes to data files always happen in to addresses divisible by 16 kB, and the chunk size is also divisible by 16 kB; a user reported 2 corrupt pages from Linux-2.4.20 where an index page seemed displaced

ChangeSet
  1.1578.19.1 03/10/19 14:25:33 bell@sanja.is.com.ua +6 -0
  correct table name assigned to temporary table field:
   - correct table name shown in EXPLAIN Iindex reference)
   - pointer on freed memmory (reallocation of table name in reusing table entry) can't be used in EXPLAIN
  (BUG#1584)

  sql/sql_select.cc
    1.216.32.3 03/10/19 14:25:27 bell@sanja.is.com.ua +3 -0
    correct table name assigned to temporary table field

  sql/item.cc
    1.58.28.1 03/10/19 14:25:26 bell@sanja.is.com.ua +7 -5
    layout fix

  mysql-test/t/subselect.test
    1.58.24.2 03/10/19 14:25:26 bell@sanja.is.com.ua +0 -9
    test moved to derived table tests

  mysql-test/t/derived.test
    1.28 03/10/19 14:25:26 bell@sanja.is.com.ua +10 -0
    test moved to derived table tests
    added test of BUG#1584

  mysql-test/r/subselect.result
    1.67.32.2 03/10/19 14:25:26 bell@sanja.is.com.ua +0 -7
    test moved to derived table tests

  mysql-test/r/derived.result
    1.29 03/10/19 14:25:26 bell@sanja.is.com.ua +15 -0
    test moved to derived table tests
    added test of BUG#1584

ChangeSet
  1.1578.12.3 03/10/19 14:22:17 bell@sanja.is.com.ua +2 -0
  index name shown (SCRUM) (WL#1274)

  sql/item_subselect.cc
    1.60.1.23 03/10/19 14:22:09 bell@sanja.is.com.ua +6 -0
    index name shown

  mysql-test/r/subselect.result
    1.67.30.2 03/10/19 14:22:09 bell@sanja.is.com.ua +8 -8
    index name shown

ChangeSet
  1.1346.1.233 03/10/17 23:44:34 heikki@hundin.mysql.fi +6 -0
  thr0loc.c, srv0start.c, srv0srv.c, srv0srv.h, os0thread.h, ha_innodb.cc:
    Backport from 4.1: reduce InnoDB memory consumption if buf pool < 8 MB

  innobase/thr/thr0loc.c
    1.3.1.1 03/10/17 23:41:18 heikki@hundin.mysql.fi +1 -0
    Backport from 4.1: reduce InnoDB memory consumption if buf pool < 8 MB

  innobase/srv/srv0start.c
    1.37.1.12 03/10/17 23:41:06 heikki@hundin.mysql.fi +22 -0
    Backport from 4.1: reduce InnoDB memory consumption if buf pool < 8 MB

  innobase/srv/srv0srv.c
    1.35.1.22 03/10/17 23:41:06 heikki@hundin.mysql.fi +11 -3
    Backport from 4.1: reduce InnoDB memory consumption if buf pool < 8 MB

  innobase/include/srv0srv.h
    1.21.1.5 03/10/17 23:40:15 heikki@hundin.mysql.fi +2 -0
    Backport from 4.1: reduce InnoDB memory consumption if buf pool < 8 MB

  innobase/include/os0thread.h
    1.12.1.1 03/10/17 23:40:14 heikki@hundin.mysql.fi +3 -8
    Backport from 4.1: reduce InnoDB memory consumption if buf pool < 8 MB

  sql/ha_innodb.cc
    1.73.1.113 03/10/17 23:39:42 heikki@hundin.mysql.fi +0 -5
    Backport from 4.1: reduce InnoDB memory consumption if buf pool < 8 MB

ChangeSet
  1.1578.9.23 03/10/17 20:31:17 heikki@hundin.mysql.fi +5 -0
  thr0loc.c, srv0start.c, srv0srv.c, srv0srv.h, os0thread.h:
    Reduce InnoDB memory allocation if buffer pool < 8 MB

  innobase/thr/thr0loc.c
    1.4 03/10/17 20:29:41 heikki@hundin.mysql.fi +1 -0
    Reduce InnoDB memory allocation if buffer pool < 8 MB

  innobase/srv/srv0start.c
    1.47 03/10/17 20:29:30 heikki@hundin.mysql.fi +23 -1
    Reduce InnoDB memory allocation if buffer pool < 8 MB

  innobase/srv/srv0srv.c
    1.45 03/10/17 20:29:30 heikki@hundin.mysql.fi +11 -2
    Reduce InnoDB memory allocation if buffer pool < 8 MB

  innobase/include/srv0srv.h
    1.27 03/10/17 20:27:29 heikki@hundin.mysql.fi +2 -0
    Reduce InnoDB memory allocation if buffer pool < 8 MB

  innobase/include/os0thread.h
    1.13 03/10/17 20:27:29 heikki@hundin.mysql.fi +3 -8
    Reduce InnoDB memory allocation if buffer pool < 8 MB

ChangeSet
  1.1563.62.11 03/10/17 17:13:49 pem@mysql.comhem.se +4 -0
  Bugfix. Local variables are now initialized to null.

  sql/sp_head.cc
    1.45 03/10/17 17:13:46 pem@mysql.com +11 -5
    Local variables are initialized to null.

  sql/item.h
    1.66 03/10/17 17:13:46 pem@mysql.com +3 -1
    Local variables are initialized to null.

  mysql-test/t/sp.test
    1.28 03/10/17 17:13:46 pem@mysql.com +23 -0
    New test case for bugfix (when a variable is not set due to an exception).

  mysql-test/r/sp.result
    1.27 03/10/17 17:13:46 pem@mysql.com +16 -0
    New test case for bugfix (when a variable is not set due to an exception).

ChangeSet
  1.1578.9.22 03/10/17 15:18:57 bell@sanja.is.com.ua +5 -0
  fixed deleting derived table tree after using (BUG#1536)

  sql/sql_lex.h
    1.102.22.7 03/10/17 15:18:08 bell@sanja.is.com.ua +1 -0
    delete subtree method

  sql/sql_lex.cc
    1.87.3.1 03/10/17 15:18:08 bell@sanja.is.com.ua +34 -1
    delete subtree method

  sql/sql_derived.cc
    1.43.8.1 03/10/17 15:18:08 bell@sanja.is.com.ua +1 -1
    all tree of derived table should be deleted

  mysql-test/t/subselect.test
    1.58.24.1 03/10/17 15:18:08 bell@sanja.is.com.ua +10 -1
    fixed drop table statement
    test for BUG#1536

  mysql-test/r/subselect.result
    1.67.32.1 03/10/17 15:18:08 bell@sanja.is.com.ua +8 -1
    fixed drop table statement
    test for BUG#1536

ChangeSet
  1.1578.16.6 03/10/17 13:17:15 serg@serg.mylan +1 -0
  uninitialized variable on Windows fixed

  vio/viosocket.c
    1.20 03/10/17 13:17:12 serg@serg.mylan +8 -9
    uninitialized variable on Windows fixed

ChangeSet
  1.1346.398.2 03/10/17 09:26:38 guilhem@mysql.com +2 -0
  cancelling a previous change I made in rpl_trunc_binlog.test (which I did not push),
  to enable SHOW SLAVE STATUS again.

  mysql-test/t/rpl_trunc_binlog.test
    1.2.1.3 03/10/17 09:26:34 guilhem@mysql.com +2 -1
    enabling SHOW SLAVE STATUS again

  mysql-test/r/rpl_trunc_binlog.result
    1.2.2.2 03/10/17 09:26:33 guilhem@mysql.com +3 -0
    enabling SHOW SLAVE STATUS again.

ChangeSet
  1.1346.398.1 03/10/17 09:15:30 guilhem@mysql.com +2 -0
  test update: what we want to detect in this test is if the slave stopped.

  mysql-test/t/rpl_trunc_binlog.test
    1.2.1.2 03/10/17 09:15:25 guilhem@mysql.com +1 -2
    what we want to detect in this test is if the slave stopped.

  mysql-test/r/rpl_trunc_binlog.result
    1.2.2.1 03/10/17 09:15:25 guilhem@mysql.com +0 -4
    result update

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

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

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

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

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

ChangeSet
  1.1578.18.1 03/10/17 00:36:01 bell@sanja.is.com.ua +5 -0
  fixed support of used_tables() and const_item() in subqueries
  (BUG#1444)

  sql/item_subselect.h
    1.42.1.1 03/10/17 00:34:36 bell@sanja.is.com.ua +14 -1
    fixed support of used_tables() and const_item() in subqueries

  sql/item_subselect.cc
    1.60.15.1 03/10/17 00:34:36 bell@sanja.is.com.ua +45 -3
    fixed support of used_tables() and const_item() in subqueries

  sql/item.cc
    1.58.27.1 03/10/17 00:34:36 bell@sanja.is.com.ua +40 -4
    storing used tables in Item_subselect

  mysql-test/t/subselect.test
    1.58.23.1 03/10/17 00:34:35 bell@sanja.is.com.ua +16 -0
    BUG#1444 test

  mysql-test/r/subselect.result
    1.67.31.1 03/10/17 00:34:35 bell@sanja.is.com.ua +18 -0
    BUG#1444 test

ChangeSet
  1.1578.9.21 03/10/16 16:21:42 lenz@kallisto.local +1 -0
   - portability fix: fix compile bug on HP-UX (thanks to acurtis for the 
     patch)
    (BUG#1440: Redundant class name confusing hpux compiler)

ChangeSet
  1.1578.9.20 03/10/16 16:15:45 vva@eagle.mysql.r18.ru +3 -0
  fixed sqlstate for ER_WRONG_INDEX_NAME
  removed unnesessary code from create.test

  mysql-test/t/create.test
    1.33 03/10/16 16:15:43 vva@eagle.mysql.r18.ru +0 -1
    remove unnesessary drop table

  mysql-test/r/create.result
    1.53 03/10/16 16:15:43 vva@eagle.mysql.r18.ru +1 -4
    changed sqlstate for ER_WRONG_INDEX_NAME
    remove unnesesary warning

  include/sql_state.h
    1.5 03/10/16 16:15:43 vva@eagle.mysql.r18.ru +1 -0
    added sqlstate for ER_WRONG_INDEX_NAME

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

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

ChangeSet
  1.1578.16.5 03/10/16 21:21:48 serg@serg.mylan +3 -0
  fixes for new key_map code

  sql/mysql_priv.h
    1.186.38.2 03/10/16 21:21:44 serg@serg.mylan +1 -1
    fixes for new key_map code

  sql/ha_berkeley.h
    1.55 03/10/16 21:21:44 serg@serg.mylan +1 -1
    fixes for new key_map code

  sql/ha_berkeley.cc
    1.117.3.2 03/10/16 21:21:44 serg@serg.mylan +20 -16
    fixes for new key_map code

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

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

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

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

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

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

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

ChangeSet
  1.1578.9.19 03/10/16 11:33:44 vva@eagle.mysql.r18.ru +27 -0
  added checking for empty index name (fixed bug #1419)

  sql/sql_table.cc
    1.157.9.18 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +5 -0
    added checking for wrong index name

  sql/share/ukrainian/errmsg.txt
    1.27.12.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/swedish/errmsg.txt
    1.64.13.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/spanish/errmsg.txt
    1.64.16.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/slovak/errmsg.txt
    1.64.14.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/serbian/errmsg.txt
    1.18.12.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/russian/errmsg.txt
    1.61.12.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/romanian/errmsg.txt
    1.62.14.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/portuguese/errmsg.txt
    1.64.15.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/polish/errmsg.txt
    1.63.13.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/norwegian/errmsg.txt
    1.63.14.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/norwegian-ny/errmsg.txt
    1.63.14.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/korean/errmsg.txt
    1.63.13.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/japanese/errmsg.txt
    1.63.13.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/italian/errmsg.txt
    1.70.14.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/hungarian/errmsg.txt
    1.65.13.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/greek/errmsg.txt
    1.64.13.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/german/errmsg.txt
    1.64.14.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/french/errmsg.txt
    1.63.14.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/estonian/errmsg.txt
    1.64.13.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/english/errmsg.txt
    1.70.16.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/dutch/errmsg.txt
    1.66.14.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/danish/errmsg.txt
    1.62.14.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  sql/share/czech/errmsg.txt
    1.64.14.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +1 -0
    added error "Incorrect index name"

  mysql-test/t/create.test
    1.32 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +2 -0
    added test for empty index name

  mysql-test/r/create.result
    1.52 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +2 -0
    added test for empty index name

  include/mysqld_error.h
    1.61.11.1 03/10/16 11:33:31 vva@eagle.mysql.r18.ru +2 -1
    added error "Incorrect index name"

  sql/item.h
    1.56.14.1 03/10/16 16:21:40 lenz@mysql.com +1 -1
     - portability fix: fix compile bug on HP-UX (thanks to acurtis for the 
       patch)
      (BUG#1440: Redundant class name confusing hpux compiler)

ChangeSet
  1.1563.62.10 03/10/16 15:45:27 pem@mysql.telia.com +4 -0
  Handle user variables (@-vars) as OUT and INOUT parameters in SPs.

  sql/sp_head.cc
    1.44 03/10/16 15:45:24 pem@mysql.com +23 -17
    Handle user variables (@-vars) as OUT and INOUT parameters.
    But we still just ignore it, if it's anything else.

  sql/item_func.h
    1.77 03/10/16 15:45:24 pem@mysql.com +4 -1
    We need to be able to detect Item_func_get_user_vars when used as arguments to SPs.

  mysql-test/t/sp.test
    1.27 03/10/16 15:45:24 pem@mysql.com +18 -2
    Test cases for user variables (@-vars) as OUT and INOUT parameters.

  mysql-test/r/sp.result
    1.26 03/10/16 15:45:24 pem@mysql.com +15 -1
    Test cases for user variables (@-vars) as OUT and INOUT parameters.

ChangeSet
  1.1346.1.231 03/10/16 17:00:09 kostja@oak.local +1 -0
  fix for one of the bugs spotted by #1274

  sql/sql_select.cc
    1.152.1.109 03/10/16 17:00:07 kostja@oak.local +11 -1
    back to the bug #1274:
    the following query
    EXPLAIN SELECT SQL_CALC_FOUND_ROWS race_name 
    FROM races WHERE race_name LIKE '%Madison%' ORDER BY race_date DESC LIMIT 0,100
    
    +-------+------+---------------+------+---------+------+--------+-----------------------------+
    | table | type | possible_keys | key  | key_len | ref  | rows   | Extra                       |
    +-------+------+---------------+------+---------+------+--------+-----------------------------+
    | races | ALL  | NULL          | NULL |    NULL | NULL | 505821 | Using where; Using filesort |
    +-------+------+---------------+------+---------+------+--------+-----------------------------+
    
    The query returns no rows.
    
    There are two problems with it: 
    - wrong access plan is chosed  (sequential index scan in reverse order,
    which is VERY SLOW in case of MyISAM table + packed keys)
    It's wrong, because it doesn't take into account that SQL_CALC_FOUND_ROWS 
    is present, in other words, is based on assumtion that LIMIT
    clause decrease number of rows to access significantly, which is
    not true as all rows are accessed.
    - the access plan is not shown in the EXPLAIN (bug #1560). I'm not
    fixing it here

ChangeSet
  1.1578.12.2 03/10/16 15:54:47 bell@sanja.is.com.ua +18 -0
  subqueries made printable
  new EXPLAIN parameter to show real query as it was interpreted
  (SCRUM) (WL#1274)

  sql/sql_yacc.yy
    1.203.76.2 03/10/16 15:54:04 bell@sanja.is.com.ua +16 -10
    new EXPLAIN parameter support
    SELECT printability support

  sql/sql_select.h
    1.55.2.1 03/10/16 15:54:04 bell@sanja.is.com.ua +4 -3
    new EXPLAIN parameter support

  sql/sql_select.cc
    1.216.34.1 03/10/16 15:54:04 bell@sanja.is.com.ua +183 -1
    debug output
    new EXPLAIN parameter support

  sql/sql_parse.cc
    1.271.36.1 03/10/16 15:54:04 bell@sanja.is.com.ua +10 -0
    new EXPLAIN parameter

  sql/sql_lex.h
    1.102.25.1 03/10/16 15:54:04 bell@sanja.is.com.ua +12 -2
    subqueries made printable
    new EXPLAIN parameter support

  sql/sql_lex.cc
    1.87.2.2 03/10/16 15:54:03 bell@sanja.is.com.ua +66 -0
    subqueries made printable

  sql/sql_derived.cc
    1.43.1.11 03/10/16 15:54:03 bell@sanja.is.com.ua +0 -4
    now this link is used

  sql/mysql_priv.h
    1.186.39.1 03/10/16 15:54:03 bell@sanja.is.com.ua +3 -0
    union option made looks like options

  sql/item_subselect.h
    1.43 03/10/16 15:54:03 bell@sanja.is.com.ua +18 -9
    subqueries made printable

  sql/item_subselect.cc
    1.60.1.22 03/10/16 15:54:03 bell@sanja.is.com.ua +155 -6
    subqueries made printable

  sql/item_cmpfunc.h
    1.66 03/10/16 15:54:03 bell@sanja.is.com.ua +5 -1
    fixed print()

  sql/item_cmpfunc.cc
    1.106 03/10/16 15:54:03 bell@sanja.is.com.ua +8 -0
    fixed print()

  sql/item.h
    1.56.1.38 03/10/16 15:54:03 bell@sanja.is.com.ua +13 -33
    fixed printability of Items in SELECT list

  sql/item.cc
    1.58.25.2 03/10/16 15:54:03 bell@sanja.is.com.ua +78 -24
    fixed printability of Items in SELECT list

  mysql-test/t/union.test
    1.43 03/10/16 15:54:03 bell@sanja.is.com.ua +2 -2
    new explains

  mysql-test/t/subselect.test
    1.58.22.1 03/10/16 15:54:03 bell@sanja.is.com.ua +42 -42
    new explains

  mysql-test/r/union.result
    1.45 03/10/16 15:54:03 bell@sanja.is.com.ua +6 -2
    new explains

  mysql-test/r/subselect.result
    1.67.30.1 03/10/16 15:54:03 bell@sanja.is.com.ua +114 -42
    new explains

ChangeSet
  1.1578.9.18 03/10/16 08:34:17 monty@mashka.mysql.fi +2 -0
  Fix test after merge

  mysql-test/t/create.test
    1.31 03/10/16 08:34:00 monty@mashka.mysql.fi +3 -2
    Fix test after merge

  mysql-test/r/create.result
    1.51 03/10/16 08:34:00 monty@mashka.mysql.fi +4 -1
    update test results

ChangeSet
  1.1578.9.16 03/10/16 08:16:39 monty@mashka.mysql.fi +2 -0
  Update results after merge

  mysql-test/r/mysqldump.result
    1.2.1.1 03/10/16 08:16:33 monty@mashka.mysql.fi +0 -3
    Update results after merge

  mysql-test/r/create.result
    1.50 03/10/16 08:16:33 monty@mashka.mysql.fi +5 -5
    Update results after merge

ChangeSet
  1.1578.9.15 03/10/16 08:11:01 monty@mashka.mysql.fi +1 -0
  Merge

  sql/set_var.cc
    1.34.20.5 03/10/16 08:10:59 monty@mashka.mysql.fi +0 -0
    SCCS merged

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

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

ChangeSet
  1.1578.9.14 03/10/16 03:08:40 monty@mashka.mysql.fi +23 -0
  merge with 4.0

  sql/sql_table.cc
    1.157.9.17 03/10/16 03:08:36 monty@mashka.mysql.fi +2 -2
    merge with 4.0

  sql/set_var.cc
    1.34.20.4 03/10/16 03:08:36 monty@mashka.mysql.fi +0 -0
    merge with 4.0

  sql/mysqld.cc
    1.356.1.52 03/10/16 03:08:36 monty@mashka.mysql.fi +3 -4
    merge with 4.0

  sql/handler.h
    1.81.3.2 03/10/16 03:08:36 monty@mashka.mysql.fi +0 -9
    merge with 4.0

  mysys/queues.c
    1.15 03/10/16 03:08:36 monty@mashka.mysql.fi +4 -5
    merge with 4.0

  mysql-test/t/mysqlbinlog.test
    1.7 03/10/16 03:08:36 monty@mashka.mysql.fi +8 -16
    merge with 4.0

  mysql-test/t/create.test
    1.30 03/10/16 03:08:36 monty@mashka.mysql.fi +8 -15
    merge with 4.0

  mysql-test/r/create.result
    1.49 03/10/16 03:08:36 monty@mashka.mysql.fi +0 -0
    merge with 4.0

  libmysql/libmysql.c
    1.156.1.35 03/10/16 03:08:36 monty@mashka.mysql.fi +2 -4
    merge with 4.0

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

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

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

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

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

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

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

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

  netware/BUILD/save-patch
    1.0 03/10/15 19:46:51 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/4.1/netware/BUILD/save-patch

  netware/BUILD/apply-patch
    1.0 03/10/15 19:46:51 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/4.1/netware/BUILD/apply-patch

  sql/sql_test.cc
    1.21.1.3 03/10/16 02:29:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.34.3 03/10/16 02:29:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_insert.cc
    1.86.2.23 03/10/16 02:29:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_handler.cc
    1.41 03/10/16 02:29:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_class.h
    1.146.1.44 03/10/16 02:29:56 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/slave.cc
    1.188.10.1 03/10/16 02:29:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  scripts/mysqld_safe.sh
    1.63 03/10/16 02:29:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  scripts/mysql_config.sh
    1.11 03/10/16 02:29:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/myisamchk.c
    1.92.3.3 03/10/16 02:29:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/thr_alarm.h
    1.16 03/10/16 02:29:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/mysql.h
    1.98 03/10/16 02:29:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  extra/resolveip.c
    1.21 03/10/16 02:29:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  client/client_priv.h
    1.21 03/10/16 02:29:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1
    1.5 03/10/16 02:29:54 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1578.9.13 03/10/15 22:52:31 monty@mashka.mysql.fi +9 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mashka.mysql.fi:/home/my/mysql-4.1

  sql/sql_table.cc
    1.157.9.16 03/10/15 22:52:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.34.2 03/10/15 22:52:25 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_class.h
    1.146.1.43 03/10/15 22:52:25 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_class.cc
    1.105.1.25 03/10/15 22:52:25 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/set_var.cc
    1.34.20.3 03/10/15 22:52:25 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.51 03/10/15 22:52:25 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.35.3 03/10/15 22:52:25 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/log_event.cc
    1.113.1.24 03/10/15 22:52:24 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.142 03/10/15 22:52:24 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1578.10.4 03/10/15 22:40:36 monty@mashka.mysql.fi +16 -0
  Portability fixes for windows
  After merge fixes

  sql/sql_table.cc
    1.157.9.15 03/10/15 22:40:31 monty@mashka.mysql.fi +5 -4
    Portability fixes for windows

  sql/sql_prepare.cc
    1.34.1.19 03/10/15 22:40:31 monty@mashka.mysql.fi +12 -6
    After merge fixes

  sql/sql_help.cc
    1.16 03/10/15 22:40:31 monty@mashka.mysql.fi +3 -1
    after merge fixes
    More OOM error checking

  sql/sql_class.cc
    1.105.1.24 03/10/15 22:40:31 monty@mashka.mysql.fi +5 -3
    Defines instead of constants

  sql/set_var.h
    1.33.1.1 03/10/15 22:40:31 monty@mashka.mysql.fi +1 -1
    Portability fixes for windows

  sql/opt_range.h
    1.24.1.2 03/10/15 22:40:31 monty@mashka.mysql.fi +1 -2
    After merge fix

  sql/mysqld.cc
    1.356.31.2 03/10/15 22:40:31 monty@mashka.mysql.fi +0 -1
    After merge fix

  sql/mysql_priv.h
    1.186.36.2 03/10/15 22:40:31 monty@mashka.mysql.fi +3 -0
    Use defines instead of defines

  sql/item_strfunc.cc
    1.140.2.1 03/10/15 22:40:31 monty@mashka.mysql.fi +2 -0
    Portability fixes for windows

  sql/ha_berkeley.cc
    1.117.1.5 03/10/15 22:40:30 monty@mashka.mysql.fi +2 -1
    Use defines instead of constants

  sql-common/client.c
    1.35 03/10/15 22:40:30 monty@mashka.mysql.fi +2 -2
    Portability fixes for windows

  mysql-test/r/variables.result
    1.21.1.11 03/10/15 22:40:30 monty@mashka.mysql.fi +1 -1
    Fix result after merge

  libmysql/libmysql.def
    1.19 03/10/15 22:40:30 monty@mashka.mysql.fi +1 -1
    Portability fixes for windows

  libmysql/libmysql.c
    1.156.1.34 03/10/15 22:40:30 monty@mashka.mysql.fi +1 -1
    Portability fixes for windows

  libmysql/client_settings.h
    1.14 03/10/15 22:40:30 monty@mashka.mysql.fi +3 -3
    Portability fixes for windows

  include/my_base.h
    1.43.1.3 03/10/15 22:40:30 monty@mashka.mysql.fi +16 -12
    Fix comment syntax

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

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

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

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

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

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

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

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

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

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

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

ChangeSet
  1.1563.62.9 03/10/15 19:03:37 pem@mysql.telia.com +3 -0
  Fix for BUG#1547: "SELECT ... WHERE field = var" sometimes give the wrong result in SPs
  
  Two missing methods added to Item_splocal + test case.

  sql/item.h
    1.65 03/10/15 19:03:35 pem@mysql.com +10 -0
    Fix for BUG#1547: "SELECT ... WHERE field = var" sometimes give the wrong result in SPs
    
    Added missing methods to Item_splocal to get the correct compare function
    and make the optimizer do the right thing.

  mysql-test/t/sp.test
    1.26 03/10/15 19:03:35 pem@mysql.com +22 -0
    Test case for BUG#1547

  mysql-test/r/sp.result
    1.25 03/10/15 19:03:35 pem@mysql.com +21 -0
    Test case for BUG#1547

ChangeSet
  1.1578.16.4 03/10/15 19:01:47 serg@serg.mylan +4 -0
  get rid of default_charset_info for index fulltext searches

  myisam/ftdefs.h
    1.23 03/10/15 19:01:42 serg@serg.mylan +2 -2
    get rid of default_charset_info for index fulltext searches

  myisam/ft_stopwords.c
    1.19 03/10/15 19:01:42 serg@serg.mylan +1 -1
    get rid of default_charset_info for index fulltext searches

  myisam/ft_parser.c
    1.34 03/10/15 19:01:42 serg@serg.mylan +9 -11
    get rid of default_charset_info for index fulltext searches

  myisam/ft_boolean_search.c
    1.63 03/10/15 19:01:42 serg@serg.mylan +4 -4
    get rid of default_charset_info for index fulltext searches

ChangeSet
  1.1578.16.3 03/10/15 18:05:04 serg@serg.mylan +4 -0
  cleanup

  mysys/Makefile.am
    1.48 03/10/15 18:04:41 serg@serg.mylan +1 -1
    unused file removed from Makefile

  myisam/mi_check.c
    1.105.2.4 03/10/15 18:04:41 serg@serg.mylan +1 -2
    unused parameter removed

  myisam/ftdefs.h
    1.22 03/10/15 18:04:40 serg@serg.mylan +1 -1
    unused parameter removed

  myisam/ft_update.c
    1.30 03/10/15 18:04:40 serg@serg.mylan +5 -7
    unused parameter removed

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

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

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

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

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

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

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

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

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

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

ChangeSet
  1.1578.9.12 03/10/15 17:34:28 bar@bar.mysql.r18.ru +4 -0
  ctype-simple.c, ctype-mb.c:
    Win compilation problem fix
  ctype-bin.c:
    Win compilation problem fix
    ,
    ,
  m_ctype.h:
    Win compilation problem fix
    ,

  strings/ctype-simple.c
    1.38 03/10/15 17:33:58 bar@bar.mysql.r18.ru +7 -7
    Win compilation problem fix

  strings/ctype-mb.c
    1.16 03/10/15 17:33:45 bar@bar.mysql.r18.ru +11 -11
    Win compilation problem fix

  strings/ctype-bin.c
    1.36 03/10/15 17:33:34 bar@bar.mysql.r18.ru +7 -7
    Win compilation problem fix
    ,
    ,

  include/m_ctype.h
    1.78 03/10/15 17:33:10 bar@bar.mysql.r18.ru +6 -6
    Win compilation problem fix
    ,

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

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

ChangeSet
  1.1578.16.2 03/10/15 13:40:20 serg@serg.mylan +28 -0
  stricter checks on FULLTEXT index creating

  sql/sql_table.cc
    1.157.16.3 03/10/15 13:40:16 serg@serg.mylan +80 -56
    stricter checks on FULLTEXT index creating

  sql/share/ukrainian/errmsg.txt
    1.27.11.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  sql/share/swedish/errmsg.txt
    1.64.12.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  sql/share/spanish/errmsg.txt
    1.64.15.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  sql/share/slovak/errmsg.txt
    1.64.13.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  sql/share/serbian/errmsg.txt
    1.18.11.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  sql/share/russian/errmsg.txt
    1.61.11.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  sql/share/romanian/errmsg.txt
    1.62.13.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  sql/share/portuguese/errmsg.txt
    1.64.14.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  sql/share/polish/errmsg.txt
    1.63.12.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  sql/share/norwegian/errmsg.txt
    1.63.13.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  sql/share/norwegian-ny/errmsg.txt
    1.63.13.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  sql/share/korean/errmsg.txt
    1.63.12.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  sql/share/japanese/errmsg.txt
    1.63.12.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  sql/share/italian/errmsg.txt
    1.70.13.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  sql/share/hungarian/errmsg.txt
    1.65.12.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  sql/share/greek/errmsg.txt
    1.64.12.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  sql/share/german/errmsg.txt
    1.64.13.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  sql/share/french/errmsg.txt
    1.63.13.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  sql/share/estonian/errmsg.txt
    1.64.12.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  sql/share/english/errmsg.txt
    1.70.15.2 03/10/15 13:40:16 serg@serg.mylan +3 -1
    stricter checks on FULLTEXT index creating

  sql/share/dutch/errmsg.txt
    1.66.13.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  sql/share/danish/errmsg.txt
    1.62.13.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  sql/share/czech/errmsg.txt
    1.64.13.2 03/10/15 13:40:16 serg@serg.mylan +1 -0
    stricter checks on FULLTEXT index creating

  mysql-test/t/fulltext.test
    1.42 03/10/15 13:40:16 serg@serg.mylan +7 -0
    stricter checks on FULLTEXT index creating

  mysql-test/r/mysqldump.result
    1.3 03/10/15 13:40:16 serg@serg.mylan +0 -3
    stricter checks on FULLTEXT index creating

  mysql-test/r/fulltext.result
    1.46 03/10/15 13:40:16 serg@serg.mylan +6 -0
    stricter checks on FULLTEXT index creating

  include/mysqld_error.h
    1.61.10.1 03/10/15 13:40:16 serg@serg.mylan +3 -2
    stricter checks on FULLTEXT index creating

ChangeSet
  1.1578.16.1 03/10/15 12:25:44 serg@serg.mylan +19 -0
  merged

  sql/sql_update.cc
    1.83.6.1 03/10/15 12:25:40 serg@serg.mylan +0 -0
    merged

  sql/sql_select.cc
    1.216.33.1 03/10/15 12:25:40 serg@serg.mylan +1 -2
    merged

  sql/table.cc
    1.86.1.1 03/10/15 11:59:32 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_test.cc
    1.21.3.1 03/10/15 11:59:32 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_show.cc
    1.122.8.1 03/10/15 11:59:32 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_base.cc
    1.145.1.16 03/10/15 11:59:31 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_acl.cc
    1.74.6.1 03/10/15 11:59:31 serg@serg.mylan +0 -0
    Auto merged

  sql/slave.cc
    1.188.1.24 03/10/15 11:59:31 serg@serg.mylan +0 -0
    Auto merged

  sql/opt_range.cc
    1.90.3.1 03/10/15 11:59:31 serg@serg.mylan +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.32.1 03/10/15 11:59:31 serg@serg.mylan +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.38.1 03/10/15 11:59:30 serg@serg.mylan +0 -0
    Auto merged

  sql/item_func.cc
    1.124.11.1 03/10/15 11:59:30 serg@serg.mylan +0 -0
    Auto merged

  sql/item.cc
    1.58.26.1 03/10/15 11:59:30 serg@serg.mylan +0 -0
    Auto merged

  sql/handler.h
    1.81.1.5 03/10/15 11:59:30 serg@serg.mylan +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.115.4.6 03/10/15 11:59:30 serg@serg.mylan +0 -0
    Auto merged

  sql/ha_innodb.h
    1.56 03/10/15 11:59:30 serg@serg.mylan +0 -0
    Auto merged

  sql/ha_berkeley.cc
    1.117.3.1 03/10/15 11:59:30 serg@serg.mylan +0 -0
    Auto merged

  myisam/myisamdef.h
    1.59.3.3 03/10/15 11:59:30 serg@serg.mylan +0 -0
    Auto merged

  BitKeeper/etc/ignore
    1.153.8.1 03/10/15 11:59:22 serg@serg.mylan +1 -1
    auto-union

ChangeSet
  1.1578.9.11 03/10/15 14:51:56 gluh@gluh.mysql.r18.ru +4 -0
  Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.max

  sql/sql_yacc.yy
    1.203.77.4 03/10/15 14:51:52 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/set_var.cc
    1.34.22.1 03/10/15 14:51:51 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.50 03/10/15 14:51:51 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.35.2 03/10/15 14:51:51 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1578.15.1 03/10/15 14:50:36 gluh@gluh.mysql.r18.ru +7 -0
  WL#1106: Switch = --maxdb rather than --sapdb

  sql/sql_yacc.yy
    1.203.78.1 03/10/15 14:50:08 gluh@gluh.mysql.r18.ru +1 -1
    WL#1106: Switch = --maxdb rather than --sapdb

  sql/sql_show.cc
    1.122.4.9 03/10/15 14:50:08 gluh@gluh.mysql.r18.ru +1 -1
    WL#1106: Switch = --maxdb rather than --sapdb

  sql/set_var.cc
    1.34.21.1 03/10/15 14:50:08 gluh@gluh.mysql.r18.ru +1 -1
    WL#1106: Switch = --maxdb rather than --sapdb

  sql/mysqld.cc
    1.356.29.2 03/10/15 14:50:08 gluh@gluh.mysql.r18.ru +1 -1
    WL#1106: Switch = --maxdb rather than --sapdb

  sql/mysql_priv.h
    1.186.37.1 03/10/15 14:50:08 gluh@gluh.mysql.r18.ru +1 -1
    WL#1106: Switch = --maxdb rather than --sapdb

  mysql-test/t/sql_mode.test
    1.3 03/10/15 14:50:08 gluh@gluh.mysql.r18.ru +1 -1
    WL#1106: Switch = --maxdb rather than --sapdb

  mysql-test/r/sql_mode.result
    1.4 03/10/15 14:50:08 gluh@gluh.mysql.r18.ru +2 -2
    WL#1106: Switch = --maxdb rather than --sapdb

ChangeSet
  1.1578.14.1 03/10/15 09:55:26 heikki@hundin.mysql.fi +1 -0
  fil0fil.c:
    Visual C++ apparently does not know what -1LL (= -1 in longlong type) means

  innobase/fil/fil0fil.c
    1.17 03/10/15 09:53:02 heikki@hundin.mysql.fi +2 -1
    Visual C++ apparently does not know what -1LL (= -1 in longlong type) means

ChangeSet
  1.1578.9.9 03/10/15 02:11:03 harrison@bud.lordblink.com +5 -0
  Add in bit_xor function (approved by Sergei)

ChangeSet
  1.1578.9.8 03/10/14 23:33:09 heikki@hundin.mysql.fi +1 -0
  os0file.c:
    Fix Visual C++ compilation errors reported by Miguel

  innobase/os/os0file.c
    1.55 03/10/14 23:32:11 heikki@hundin.mysql.fi +42 -45
    Fix Visual C++ compilation errors reported by Miguel

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

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

ChangeSet
  1.1563.48.18 03/10/14 16:26:28 serg@serg.mylan +1 -0
  #ifdef removed
  comment clarified

  sql/sql_acl.cc
    1.74.5.2 03/10/14 16:26:24 serg@serg.mylan +6 -3
    #ifdef removed
    comment clarified

ChangeSet
  1.1563.48.17 03/10/14 16:19:13 serg@serg.mylan +5 -0
  "phrase search" should not match partial words (it should not match 'paraphrase searches')

  mysql-test/t/fulltext.test
    1.41 03/10/14 16:19:09 serg@serg.mylan +1 -0
    "phrase search" should not match partial words (it should not match 'paraphrase searches')

  mysql-test/r/fulltext.result
    1.45 03/10/14 16:19:09 serg@serg.mylan +2 -1
    "phrase search" should not match partial words (it should not match 'paraphrase searches')

  myisam/ftdefs.h
    1.21 03/10/14 16:19:09 serg@serg.mylan +3 -2
    word definition moved to ftdefs.h

  myisam/ft_parser.c
    1.33 03/10/14 16:19:09 serg@serg.mylan +0 -9
    word definition moved to ftdefs.h

  myisam/ft_boolean_search.c
    1.62 03/10/14 16:19:09 serg@serg.mylan +19 -10
    "phrase search" should not match partial words (it should not match 'paraphrase searches')

ChangeSet
  1.1578.10.3 03/10/14 16:34:09 monty@mashka.mysql.fi +4 -0
  merge with 4.0 to get fix for SET enum_system_variable=NULL

  sql/set_var.cc
    1.34.20.2 03/10/14 16:34:06 monty@mashka.mysql.fi +0 -0
    merge with 4.0 to get fix for SET enum_system_variable=NULL

  mysql-test/r/variables.result
    1.21.1.10 03/10/14 16:34:06 monty@mashka.mysql.fi +2 -2
    merge with 4.0 to get fix for SET enum_system_variable=NULL

  mysql-test/t/variables.test
    1.18.1.6 03/10/14 16:31:46 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/ignore
    1.153.1.14 03/10/14 16:31:32 monty@mashka.mysql.fi +1 -1
    auto-union

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

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

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

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

ChangeSet
  1.1578.9.7 03/10/14 14:53:16 heikki@hundin.mysql.fi +7 -0
  row0purge.c, row0mysql.c, os0file.c, os0file.h, fil0fil.h, fil0fil.c:
    IMPORT TABLESPACE must reset lsns if they are too high
  ha_innodb.cc:
    DISCARD/IMPORT TABLESPACE must have a TL_WRITE lock on the table

  innobase/row/row0purge.c
    1.13 03/10/14 14:51:37 heikki@hundin.mysql.fi +1 -1
    IMPORT TABLESPACE must reset lsns if they are too high

  innobase/row/row0mysql.c
    1.47 03/10/14 14:51:37 heikki@hundin.mysql.fi +45 -0
    IMPORT TABLESPACE must reset lsns if they are too high

  innobase/os/os0file.c
    1.54 03/10/14 14:50:45 heikki@hundin.mysql.fi +23 -0
    IMPORT TABLESPACE must reset lsns if they are too high

  innobase/include/os0file.h
    1.22 03/10/14 14:49:58 heikki@hundin.mysql.fi +8 -0
    IMPORT TABLESPACE must reset lsns if they are too high

  innobase/include/fil0fil.h
    1.9 03/10/14 14:49:58 heikki@hundin.mysql.fi +19 -0
    IMPORT TABLESPACE must reset lsns if they are too high

  innobase/fil/fil0fil.c
    1.16 03/10/14 14:48:20 heikki@hundin.mysql.fi +153 -8
    IMPORT TABLESPACE must reset lsns if they are too high

  sql/ha_innodb.cc
    1.90.1.12 03/10/14 14:40:04 heikki@hundin.mysql.fi +1 -2
    DISCARD/IMPORT TABLESPACE must have a TL_WRITE lock on the table

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

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

ChangeSet
  1.1563.62.8 03/10/14 12:59:28 pem@mysql.telia.com +10 -0
  Fix for BUG#1495: Evaluate items before setting a local variable with SELECT INTO.
  Also copy and restore order_list and group_list for selects in SPs.

  sql/table.h
    1.53.1.1 03/10/14 12:59:25 pem@mysql.com +1 -0
    Need a copy of the Item* pointer when executing sub-statements in SPs. (Since
    it's modified and must be restored afterwards.)

  sql/sql_yacc.yy
    1.243 03/10/14 12:59:25 pem@mysql.com +2 -2
    Type needed for setting local variables.

  sql/sql_parse.cc
    1.301 03/10/14 12:59:25 pem@mysql.com +2 -0
    order_list and group_list must be initialized in select_lex for all queries,
    to make SP sub statement execution work.

  sql/sql_class.h
    1.163 03/10/14 12:59:25 pem@mysql.com +4 -1
    Fix BUG#1495: Evaluate and set a local variable (for SELECT INTO); need type for this.

  sql/sql_class.cc
    1.125 03/10/14 12:59:25 pem@mysql.com +1 -1
    Fix BUG#1495: Evaluate and set a local variable (for SELECT INTO).

  sql/sp_rcontext.h
    1.5 03/10/14 12:59:25 pem@mysql.com +3 -0
    Fix BUG#1495: Evaluate and set a local variable (for SELECT INTO).

  sql/sp_rcontext.cc
    1.3 03/10/14 12:59:25 pem@mysql.com +8 -0
    Fix BUG#1495: Evaluate and set a local variable (for SELECT INTO).

  sql/sp_head.cc
    1.43 03/10/14 12:59:25 pem@mysql.com +35 -12
    Fix BUG#1495: renamed eval_func_item() into sp_eval_func_item() and made it
    non-static.
    Also need to copy and restore order_list and group_list pointers before and
    after execution of a substatement. (Which means these must always be properly
    initialized for all queries.)

  mysql-test/t/sp.test
    1.25 03/10/14 12:59:25 pem@mysql.com +62 -1
    Test for BUG#1495, and an additional cursor test.

  mysql-test/r/sp.result
    1.24 03/10/14 12:59:25 pem@mysql.com +58 -1
    Test for BUG#1495, and an additional cursor test.

ChangeSet
  1.1578.9.6 03/10/14 12:19:54 serg@serg.mylan +1 -0
  do not add DROP TABLE and LOCK TABLES to the dump in --xml mode

  client/mysqldump.c
    1.100 03/10/14 12:19:34 serg@serg.mylan +13 -15
    do not add DROP TABLE and LOCK TABLES to the dump in --xml mode

  BitKeeper/etc/logging_ok
    1.233.1.29 03/10/13 22:27:58 harrison@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_yacc.yy
    1.203.77.3 03/10/13 22:25:57 harrison@mysql.com +3 -0
    Add in bit_xor function

  sql/lex.h
    1.82.1.44 03/10/13 22:25:57 harrison@mysql.com +1 -0
    Add in bit_xor symbol.

  sql/item_sum.h
    1.46.1.1 03/10/13 22:25:57 harrison@mysql.com +12 -0
    Add bit_xor class.

  sql/item_sum.cc
    1.89 03/10/13 22:25:57 harrison@mysql.com +23 -0
    Add in bit_xor class functions.

ChangeSet
  1.1578.9.5 03/10/14 01:52:03 heikki@hundin.mysql.fi +2 -0
  sql_yacc.yy:
    Add DISCARD etc. in the keyword: rule of sql_yacc.yy
  sql_table.cc:
    Add comment that DISCARD/IMPORT TABLESPACE is always the only clause in an ALTER TABLE

  sql/sql_yacc.yy
    1.203.77.2 03/10/14 01:50:53 heikki@hundin.mysql.fi +3 -0
    Add DISCARD etc. in the keyword: rule of sql_yacc.yy

  sql/sql_table.cc
    1.157.16.2 03/10/14 01:50:16 heikki@hundin.mysql.fi +2 -2
    Add comment that DISCARD/IMPORT TABLESPACE is always the only clause in an ALTER TABLE

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

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

ChangeSet
  1.1578.10.2 03/10/13 15:50:30 monty@mashka.mysql.fi +20 -0
  merge with 4.0 for more memory allocation variables.

  sql/sql_parse.cc
    1.271.35.1 03/10/13 15:50:26 monty@mashka.mysql.fi +0 -9
    merge

  sql/sql_delete.cc
    1.99.5.1 03/10/13 15:50:26 monty@mashka.mysql.fi +1 -3
    merge

  sql/sql_class.h
    1.146.1.42 03/10/13 15:50:26 monty@mashka.mysql.fi +1 -1
    merge

  sql/set_var.cc
    1.34.20.1 03/10/13 15:50:26 monty@mashka.mysql.fi +4 -4
    merge

  sql/opt_range.cc
    1.90.1.10 03/10/13 15:50:26 monty@mashka.mysql.fi +5 -11
    merge

  sql/mysqld.cc
    1.356.31.1 03/10/13 15:50:26 monty@mashka.mysql.fi +7 -7
    merge

  sql/log_event.cc
    1.113.4.1 03/10/13 15:50:26 monty@mashka.mysql.fi +0 -2
    merge

  scripts/Makefile.am
    1.35 03/10/13 15:50:26 monty@mashka.mysql.fi +1 -2
    merge

  sql/table.cc
    1.87 03/10/13 15:29:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_update.cc
    1.83.2.18 03/10/13 15:29:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_udf.cc
    1.33 03/10/13 15:29:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_test.cc
    1.21.1.2 03/10/13 15:29:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.32.2 03/10/13 15:29:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_acl.cc
    1.74.1.19 03/10/13 15:29:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/opt_range.h
    1.24.1.1 03/10/13 15:29:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.36.1 03/10/13 15:29:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_berkeley.cc
    1.117.1.4 03/10/13 15:29:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/variables.test
    1.18.1.5 03/10/13 15:29:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/variables.result
    1.21.1.9 03/10/13 15:29:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  configure.in
    1.201.1.44 03/10/13 15:29:55 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1578.13.1 03/10/13 11:20:19 heikki@hundin.mysql.fi +32 -0
  Many files:
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE
    Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x

  innobase/row/row0umod.c
    1.12 03/10/13 11:18:36 heikki@hundin.mysql.fi +7 -0
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  innobase/row/row0uins.c
    1.8 03/10/13 11:18:36 heikki@hundin.mysql.fi +7 -0
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  innobase/row/row0purge.c
    1.12 03/10/13 11:18:36 heikki@hundin.mysql.fi +8 -0
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  innobase/row/row0mysql.c
    1.46 03/10/13 11:18:36 heikki@hundin.mysql.fi +0 -3
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  innobase/page/page0page.c
    1.13 03/10/13 11:18:12 heikki@hundin.mysql.fi +2 -1
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  innobase/include/ibuf0ibuf.ic
    1.3 03/10/13 11:17:26 heikki@hundin.mysql.fi +1 -1
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  innobase/include/ha0ha.ic
    1.4 03/10/13 11:17:26 heikki@hundin.mysql.fi +5 -30
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  innobase/include/buf0buf.ic
    1.10 03/10/13 11:17:26 heikki@hundin.mysql.fi +6 -5
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  innobase/include/row0mysql.h
    1.18 03/10/13 11:17:23 heikki@hundin.mysql.fi +39 -0
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  innobase/include/hash0hash.h
    1.2 03/10/13 11:17:22 heikki@hundin.mysql.fi +3 -1
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  innobase/include/ha0ha.h
    1.4 03/10/13 11:17:22 heikki@hundin.mysql.fi +1 -1
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  innobase/include/buf0buf.h
    1.19 03/10/13 11:17:22 heikki@hundin.mysql.fi +7 -0
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  innobase/fil/fil0fil.c
    1.15 03/10/13 11:16:58 heikki@hundin.mysql.fi +25 -16
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  innobase/btr/btr0sea.c
    1.16 03/10/13 11:15:25 heikki@hundin.mysql.fi +2 -2
    Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x

  innobase/btr/btr0btr.c
    1.22 03/10/13 11:15:25 heikki@hundin.mysql.fi +2 -1
    Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x

  innobase/buf/buf0rea.c
    1.8 03/10/13 11:15:10 heikki@hundin.mysql.fi +2 -1
    Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x

  innobase/buf/buf0lru.c
    1.13 03/10/13 11:15:10 heikki@hundin.mysql.fi +60 -23
    Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x

  innobase/buf/buf0flu.c
    1.19 03/10/13 11:15:10 heikki@hundin.mysql.fi +18 -8
    Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x

  innobase/buf/buf0buf.c
    1.26 03/10/13 11:15:10 heikki@hundin.mysql.fi +28 -4
    Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x

  innobase/ha/hash0hash.c
    1.2 03/10/13 11:15:04 heikki@hundin.mysql.fi +1 -0
    Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x

  innobase/ha/ha0ha.c
    1.8 03/10/13 11:15:04 heikki@hundin.mysql.fi +60 -9
    Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x

  sql/sql_yacc.yy
    1.203.77.1 03/10/13 11:11:12 heikki@hundin.mysql.fi +6 -0
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  sql/sql_lex.h
    1.102.22.6 03/10/13 11:11:04 heikki@hundin.mysql.fi +6 -0
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  sql/sql_class.h
    1.146.20.1 03/10/13 11:11:04 heikki@hundin.mysql.fi +1 -0
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  sql/mysql_priv.h
    1.186.35.1 03/10/13 11:11:04 heikki@hundin.mysql.fi +1 -0
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  sql/lex.h
    1.82.1.43 03/10/13 11:11:04 heikki@hundin.mysql.fi +3 -0
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  sql/handler.h
    1.81.3.1 03/10/13 11:11:04 heikki@hundin.mysql.fi +1 -0
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  sql/ha_innodb.h
    1.55 03/10/13 11:11:03 heikki@hundin.mysql.fi +1 -0
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  sql/sql_table.cc
    1.157.16.1 03/10/13 11:11:00 heikki@hundin.mysql.fi +72 -5
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  sql/sql_parse.cc
    1.271.34.1 03/10/13 11:10:59 heikki@hundin.mysql.fi +3 -1
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  sql/sql_class.cc
    1.105.7.1 03/10/13 11:10:59 heikki@hundin.mysql.fi +1 -0
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

  sql/ha_innodb.cc
    1.90.1.11 03/10/13 11:10:58 heikki@hundin.mysql.fi +45 -6
    ALTER TABLE ... DISCARD/IMPORT TABLESPACE

ChangeSet
  1.1578.12.1 03/10/12 17:56:05 bell@laptop.sanja.is.com.ua +17 -0
  fixed printability of Items (all items except subselects)
  (SCRUM) (WL#1274)

  sql/sql_yacc.yy
    1.203.76.1 03/10/12 17:55:17 bell@laptop.sanja.is.com.ua +18 -13
    layout fixed
    correct convertion to String

  sql/item_uniq.h
    1.16 03/10/12 17:55:16 bell@laptop.sanja.is.com.ua +2 -0
    fixed printability of Items

  sql/item_timefunc.h
    1.38 03/10/12 17:55:16 bell@laptop.sanja.is.com.ua +14 -10
    layout fixed
    fixed printability of Items

  sql/item_timefunc.cc
    1.42.1.1 03/10/12 17:55:16 bell@laptop.sanja.is.com.ua +75 -3
    fixed printability of Items

  sql/item_sum.h
    1.47 03/10/12 17:55:16 bell@laptop.sanja.is.com.ua +2 -0
    fixed printability of Items

  sql/item_sum.cc
    1.87.1.1 03/10/12 17:55:16 bell@laptop.sanja.is.com.ua +33 -0
    fixed printability of Items

  sql/item_strfunc.h
    1.71 03/10/12 17:55:16 bell@laptop.sanja.is.com.ua +7 -2
    fixed printability of Items

  sql/item_strfunc.cc
    1.140.1.1 03/10/12 17:55:16 bell@laptop.sanja.is.com.ua +8 -0
    fixed printability of Items

  sql/item_row.h
    1.13 03/10/12 17:55:16 bell@laptop.sanja.is.com.ua +1 -0
    fixed printability of Items

  sql/item_row.cc
    1.18 03/10/12 17:55:16 bell@laptop.sanja.is.com.ua +12 -0
    fixed printability of Items

  sql/item_geofunc.h
    1.4 03/10/12 17:55:16 bell@laptop.sanja.is.com.ua +3 -0
    added DBUG_ASSERT to catch error in debuging timw

  sql/item_func.h
    1.68.1.22 03/10/12 17:55:16 bell@laptop.sanja.is.com.ua +8 -0
    fixed printability of Items

  sql/item_func.cc
    1.124.10.1 03/10/12 17:55:16 bell@laptop.sanja.is.com.ua +38 -0
    fixed printability of Items

  sql/item_cmpfunc.h
    1.65 03/10/12 17:55:16 bell@laptop.sanja.is.com.ua +6 -2
    fixed printability of Items

  sql/item_cmpfunc.cc
    1.105 03/10/12 17:55:16 bell@laptop.sanja.is.com.ua +51 -3
    fixed printability of Items

  sql/item.h
    1.56.1.37 03/10/12 17:55:16 bell@laptop.sanja.is.com.ua +11 -1
    fixed printability of Items

  sql/item.cc
    1.58.25.1 03/10/12 17:55:16 bell@laptop.sanja.is.com.ua +13 -3
    fixed printability of Items

ChangeSet
  1.1578.9.2 03/10/12 15:16:45 serg@serg.mylan +26 -0
  wrong ER_TOO_BIG_FOR_UNCOMPRESS error in UNCOMPRESS() fixed.
  typo in error message text corrected.
  new tests added

  sql/share/ukrainian/errmsg.txt
    1.27.11.1 03/10/12 15:16:17 serg@serg.mylan +2 -2
    typo fixed

  sql/share/swedish/errmsg.txt
    1.64.12.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/share/spanish/errmsg.txt
    1.64.15.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/share/slovak/errmsg.txt
    1.64.13.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/share/serbian/errmsg.txt
    1.18.11.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/share/russian/errmsg.txt
    1.61.11.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/share/romanian/errmsg.txt
    1.62.13.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/share/portuguese/errmsg.txt
    1.64.14.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/share/polish/errmsg.txt
    1.63.12.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/share/norwegian/errmsg.txt
    1.63.13.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/share/norwegian-ny/errmsg.txt
    1.63.13.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/share/korean/errmsg.txt
    1.63.12.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/share/japanese/errmsg.txt
    1.63.12.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/share/italian/errmsg.txt
    1.70.13.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/share/hungarian/errmsg.txt
    1.65.12.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/share/greek/errmsg.txt
    1.64.12.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/share/german/errmsg.txt
    1.64.13.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/share/french/errmsg.txt
    1.63.13.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/share/estonian/errmsg.txt
    1.64.12.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/share/english/errmsg.txt
    1.70.15.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/share/dutch/errmsg.txt
    1.66.13.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/share/danish/errmsg.txt
    1.62.13.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/share/czech/errmsg.txt
    1.64.13.1 03/10/12 15:16:16 serg@serg.mylan +2 -2
    typo fixed

  sql/item_strfunc.cc
    1.141 03/10/12 15:16:16 serg@serg.mylan +3 -2
    max size of uncompressed data is max_allowed_packet not 8K

  mysql-test/t/func_compress.test
    1.4 03/10/12 15:16:16 serg@serg.mylan +7 -3
    new tests added

  mysql-test/r/func_compress.result
    1.4 03/10/12 15:16:16 serg@serg.mylan +16 -4
    new tests added

ChangeSet
  1.1578.11.1 03/10/12 16:10:40 bell@laptop.sanja.is.com.ua +3 -0
  fixed fix_fields() parameters for GROUP_CONCAT() ORDER BY clause
  (BUG#1537)

  sql/item_sum.cc
    1.88 03/10/12 16:09:39 bell@laptop.sanja.is.com.ua +2 -2
    passing correct address of pointer to item to fix_dields(), using that addres to get access to item after fix_fields

  mysql-test/t/func_gconcat.test
    1.9 03/10/12 16:09:39 bell@laptop.sanja.is.com.ua +8 -1
    test of BUG#1537

  mysql-test/r/func_gconcat.result
    1.16 03/10/12 16:09:39 bell@laptop.sanja.is.com.ua +11 -0
    test of BUG#1537

ChangeSet
  1.1578.10.1 03/10/11 23:26:39 monty@mashka.mysql.fi +16 -0
  Add warnings for single line inserts. To do this I had to convert count_cuted_fields to an enum (to be able to detect setting a NOT NULL field to NULL)

  sql/sql_update.cc
    1.83.2.17 03/10/11 23:26:34 monty@mashka.mysql.fi +4 -4
    Add warnings for single line inserts

  sql/sql_table.cc
    1.157.9.14 03/10/11 23:26:34 monty@mashka.mysql.fi +2 -2
    Add warnings for single line inserts

  sql/sql_select.cc
    1.216.32.1 03/10/11 23:26:34 monty@mashka.mysql.fi +2 -2
    Add warnings for single line inserts

  sql/sql_load.cc
    1.46.3.14 03/10/11 23:26:34 monty@mashka.mysql.fi +2 -2
    Add warnings for single line inserts

  sql/sql_insert.cc
    1.86.2.22 03/10/11 23:26:34 monty@mashka.mysql.fi +12 -7
    Add warnings for single line inserts

  sql/sql_class.h
    1.146.1.41 03/10/11 23:26:34 monty@mashka.mysql.fi +5 -1
    Add warnings for single line inserts

  sql/sql_class.cc
    1.105.1.23 03/10/11 23:26:34 monty@mashka.mysql.fi +2 -1
    Add warnings for single line inserts

  sql/item_func.cc
    1.124.1.31 03/10/11 23:26:34 monty@mashka.mysql.fi +9 -0
    Remove compile warnings

  sql/field_conv.cc
    1.22 03/10/11 23:26:34 monty@mashka.mysql.fi +2 -2
    Add warnings for single line inserts

  mysql-test/t/select_found.test
    1.15 03/10/11 23:26:34 monty@mashka.mysql.fi +1 -1
    update results after adding more warnings

  mysql-test/t/myisam.test
    1.23 03/10/11 23:26:33 monty@mashka.mysql.fi +2 -0
    Disable some warnings

  mysql-test/t/ctype_mb.test
    1.3 03/10/11 23:26:33 monty@mashka.mysql.fi +7 -0
    Add missing drop table

  mysql-test/r/warnings.result
    1.14 03/10/11 23:26:33 monty@mashka.mysql.fi +2 -0
    update results after adding more warnings

  mysql-test/r/select_found.result
    1.16 03/10/11 23:26:33 monty@mashka.mysql.fi +1 -1
    update results after adding more warnings

  mysql-test/r/null.result
    1.16 03/10/11 23:26:33 monty@mashka.mysql.fi +2 -0
    update results after adding more warnings

  mysql-test/r/ctype_mb.result
    1.3 03/10/11 23:26:33 monty@mashka.mysql.fi +5 -0
    update results after adding more warnings

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

ChangeSet
  1.1578.9.1 03/10/11 11:21:32 paul@ice.snake.net +1 -0
  mysqld.cc:
    Fix error in --show-slave-auth-info help string.

  sql/mysqld.cc
    1.356.1.49 03/10/11 11:20:39 paul@ice.snake.net +1 -1
    Fix error in --show-slave-auth-info help string.

ChangeSet
  1.1578.1.13 03/10/11 17:41:15 bell@laptop.sanja.is.com.ua +3 -0
  more resonable errors about name resolving in subqueries (BUG#1483)

  sql/item.cc
    1.58.1.32 03/10/11 17:40:39 bell@laptop.sanja.is.com.ua +22 -7
    more resonable errors about name resolving in subqueries

  mysql-test/t/subselect.test
    1.58.21.1 03/10/11 17:40:39 bell@laptop.sanja.is.com.ua +15 -2
    more resonable errors about name resolving in subqueries

  mysql-test/r/subselect.result
    1.67.29.1 03/10/11 17:40:39 bell@laptop.sanja.is.com.ua +10 -1
    more resonable errors about name resolving in subqueries

ChangeSet
  1.1563.48.16 03/10/11 13:06:55 serg@serg.mylan +28 -0
  key_map with more that 64 bits width

  sql/mysql_priv.h
    1.186.28.6 03/10/11 13:06:50 serg@serg.mylan +1 -1
    use Bitmap over ulonglong by default

  BitKeeper/etc/ignore
    1.153.7.1 03/10/11 13:06:50 serg@serg.mylan +1 -0
    Added sql/udf_example.so to the ignore list

  sql/table.cc
    1.84.1.4 03/10/11 12:37:15 serg@serg.mylan +6 -2
    always init bitmaps

  sql/sql_select.h
    1.57 03/10/11 12:37:15 serg@serg.mylan +1 -1
    cleanup

  sql/sql_select.cc
    1.216.31.2 03/10/11 12:37:15 serg@serg.mylan +21 -7
    init bitmaps
    using const for bitmaps whenever possible

  sql/sql_base.cc
    1.145.14.2 03/10/11 12:37:14 serg@serg.mylan +13 -11
    optimization

  sql/slave.cc
    1.188.9.1 03/10/11 12:37:14 serg@serg.mylan +1 -1
    bitmap_init() interface changed

  sql/opt_range.h
    1.26 03/10/11 12:37:14 serg@serg.mylan +1 -2
    optimization

  sql/opt_range.cc
    1.90.2.2 03/10/11 12:37:14 serg@serg.mylan +3 -3
    optimization

  sql/mysqld.cc
    1.356.30.1 03/10/11 12:37:14 serg@serg.mylan +1 -1
    bitmap_init() interface changed

  sql/mysql_priv.h
    1.186.28.5 03/10/11 12:37:14 serg@serg.mylan +88 -42
    >64 bit bitmap

  sql/handler.h
    1.81.1.4 03/10/11 12:37:14 serg@serg.mylan +1 -1
    optimization

  sql/ha_myisammrg.cc
    1.43.1.2 03/10/11 12:37:14 serg@serg.mylan +1 -2
    optimization

  sql/ha_myisam.cc
    1.115.8.2 03/10/11 12:37:14 serg@serg.mylan +3 -4
    optimization

  sql/ha_isam.cc
    1.24 03/10/11 12:37:14 serg@serg.mylan +1 -2
    optimization

  sql/ha_innodb.h
    1.53.1.2 03/10/11 12:37:14 serg@serg.mylan +1 -1
    optimization

  sql/field.h
    1.81 03/10/11 12:37:14 serg@serg.mylan +3 -3
    init bitmaps

  mysys/my_bitmap.c
    1.12 03/10/11 12:37:14 serg@serg.mylan +175 -13
    more bitmap methods

  include/my_bitmap.h
    1.6 03/10/11 12:37:14 serg@serg.mylan +17 -9
    more bitmap methods

ChangeSet
  1.1578.8.1 03/10/10 21:49:48 bell@laptop.sanja.is.com.ua +4 -0
  samall optimisation (any independent query will not save data for rexecution)
  saving/restoring join_tab array (to save it of chnging by create_sort_index() before reexecuting)
  (BUG#1523)

  sql/sql_select.h
    1.55.1.1 03/10/10 21:48:44 bell@laptop.sanja.is.com.ua +4 -2
    field for storing saved join_tab_array

  sql/sql_select.cc
    1.216.1.48 03/10/10 21:48:44 bell@laptop.sanja.is.com.ua +27 -3
    samall optimisation (any independent query will not save data for rexecution)
    layout fix
    saving/restoring join_tab array (to save it of chnging by create_sort_index() before reexecuting)

  mysql-test/t/subselect.test
    1.58.20.1 03/10/10 21:48:44 bell@laptop.sanja.is.com.ua +10 -0
    test of BUG#1523

  mysql-test/r/subselect.result
    1.67.28.1 03/10/10 21:48:44 bell@laptop.sanja.is.com.ua +11 -0
    test of BUG#1523

ChangeSet
  1.1563.62.7 03/10/10 17:01:26 pem@mysql.com +1 -0
  Merge mysql.com:/usr/local/bk/mysql-5.0
  into mysql.com:/home/pem/work/mysql-5.0

  sql/sql_yacc.yy
    1.242 03/10/10 17:01:23 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1563.77.5 03/10/10 16:57:21 pem@mysql.telia.com +42 -0
  WL#962: Added simple, read-only, non-scrolling, asensitive cursors in SPs, using the
  (updated) Protocol_cursor class.
  Also did some bug fixes.

  sql/sql_yacc.yy
    1.239.1.3 03/10/10 16:57:19 pem@mysql.com +139 -16
    Added minimal cursor support (not the full syntax yet).

  sql/sql_lex.h
    1.121 03/10/10 16:57:18 pem@mysql.com +1 -0
    We sometimes need to copy item_lists in LEX when executing substatements in SPs

  sql/sp_rcontext.h
    1.4 03/10/10 16:57:18 pem@mysql.com +76 -3
    Added cursor support, in particular the new sp_cursor class.

  sql/sp_rcontext.cc
    1.2 03/10/10 16:57:18 pem@mysql.com +144 -2
    Added cursor support, in particular the new sp_cursor class.

  sql/sp_pcontext.h
    1.9 03/10/10 16:57:18 pem@mysql.com +26 -2
    Added cursor support

  sql/sp_pcontext.cc
    1.12 03/10/10 16:57:18 pem@mysql.com +39 -3
    Added cursor support

  sql/sp_head.h
    1.24 03/10/10 16:57:18 pem@mysql.com +127 -2
    Added cursor support

  sql/sp_head.cc
    1.42 03/10/10 16:57:18 pem@mysql.com +139 -14
    Added cursor support.
    Also fixed problems with item_lists, where pointers and ref_pointer_arrays.

  sql/share/ukrainian/errmsg.txt
    1.44 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/swedish/errmsg.txt
    1.82 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/spanish/errmsg.txt
    1.81 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/slovak/errmsg.txt
    1.81 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/serbian/errmsg.txt
    1.35 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/russian/errmsg.txt
    1.79 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/romanian/errmsg.txt
    1.78 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/portuguese/errmsg.txt
    1.81 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/polish/errmsg.txt
    1.81 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/norwegian/errmsg.txt
    1.80 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/norwegian-ny/errmsg.txt
    1.80 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/korean/errmsg.txt
    1.80 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/japanese/errmsg.txt
    1.80 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/italian/errmsg.txt
    1.87 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/hungarian/errmsg.txt
    1.82 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/greek/errmsg.txt
    1.81 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/german/errmsg.txt
    1.82 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/french/errmsg.txt
    1.80 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/estonian/errmsg.txt
    1.81 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/english/errmsg.txt
    1.88 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/dutch/errmsg.txt
    1.83 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/danish/errmsg.txt
    1.79 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/share/czech/errmsg.txt
    1.80 03/10/10 16:57:18 pem@mysql.com +8 -0
    New error codes/messages for CURSORs

  sql/protocol_cursor.cc
    1.2 03/10/10 16:57:18 pem@mysql.com +7 -5
    Fixed bugs in Protocol_cursor (for SPs)

  sql/protocol.h
    1.16 03/10/10 16:57:18 pem@mysql.com +3 -5
    Fixed bugs in Protocol_cursor (for SPs)

  sql/protocol.cc
    1.63 03/10/10 16:57:18 pem@mysql.com +0 -9
    We now always have Protocol_cursor (SPs use it)

  mysql-test/t/sp.test
    1.24 03/10/10 16:57:18 pem@mysql.com +31 -0
    New tests for cursors.

  mysql-test/t/sp-error.test
    1.14 03/10/10 16:57:18 pem@mysql.com +106 -0
    New tests for cursors.

  mysql-test/r/sp.result
    1.23 03/10/10 16:57:18 pem@mysql.com +27 -0
    New tests for cursors.

  mysql-test/r/sp-error.result
    1.13 03/10/10 16:57:18 pem@mysql.com +82 -0
    New tests for cursors.

  libmysqld/Makefile.am
    1.36 03/10/10 16:57:18 pem@mysql.com +1 -1
    SP cursors now needs this.

  include/mysqld_error.h
    1.77 03/10/10 16:57:18 pem@mysql.com +9 -1
    New error codes/messages for CURSORs

  Docs/sp-implemented.txt
    1.8 03/10/10 16:57:18 pem@mysql.com +7 -2
    Updated for CURSORs

  Docs/sp-imp-spec.txt
    1.7 03/10/10 16:57:18 pem@mysql.com +142 -6
    Added CURSOR docs (and fixed typos)

ChangeSet
  1.1578.1.12 03/10/10 17:06:18 dlenev@dlenev.mshome +1 -0
  Fix for rpl_openssl test (there was extra spaces in  result file)

  mysql-test/r/rpl_openssl.result
    1.5 03/10/10 17:06:16 dlenev@mysql.com +4 -4
    Removed extra spaces

ChangeSet
  1.1578.1.11 03/10/09 18:16:15 guilhem@gbichot2 +28 -0
  Don't show Slave_IO_State in the testsuite (replace it with #) because it can't be predicted.
  I manually edited rpl_openssl.result because the test is skipped on my
  machine. Hope it's correct.

  mysql-test/t/rpl_until.test
    1.6 03/10/09 18:16:02 guilhem@mysql.com +4 -4
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/t/rpl_trunc_binlog.test
    1.5 03/10/09 18:16:02 guilhem@mysql.com +1 -1
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/t/rpl_rotate_logs.test
    1.46 03/10/09 18:16:02 guilhem@mysql.com +3 -3
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/t/rpl_reset_slave.test
    1.3 03/10/09 18:16:02 guilhem@mysql.com +4 -4
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/t/rpl_replicate_do.test
    1.19 03/10/09 18:16:01 guilhem@mysql.com +1 -1
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/t/rpl_redirect.test
    1.9 03/10/09 18:16:01 guilhem@mysql.com +1 -1
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/t/rpl_openssl.test
    1.3 03/10/09 18:16:01 guilhem@mysql.com +2 -2
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/t/rpl_max_relay_size.test
    1.6 03/10/09 18:16:01 guilhem@mysql.com +6 -6
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/t/rpl_log_pos.test
    1.26 03/10/09 18:16:01 guilhem@mysql.com +4 -4
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/t/rpl_log.test
    1.20 03/10/09 18:16:00 guilhem@mysql.com +1 -1
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/t/rpl_loaddata.test
    1.11 03/10/09 18:16:00 guilhem@mysql.com +3 -3
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/t/rpl_flush_log_loop.test
    1.6 03/10/09 18:16:00 guilhem@mysql.com +1 -1
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/t/rpl_error_ignored_table.test
    1.4 03/10/09 18:15:59 guilhem@mysql.com +1 -1
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/t/rpl_empty_master_crash.test
    1.6 03/10/09 18:15:59 guilhem@mysql.com +1 -1
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/t/rpl000015.test
    1.25 03/10/09 18:15:59 guilhem@mysql.com +4 -4
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/r/rpl_until.result
    1.7 03/10/09 18:15:59 guilhem@mysql.com +4 -4
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/r/rpl_trunc_binlog.result
    1.5 03/10/09 18:15:58 guilhem@mysql.com +1 -1
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/r/rpl_rotate_logs.result
    1.49 03/10/09 18:15:58 guilhem@mysql.com +3 -3
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/r/rpl_reset_slave.result
    1.6 03/10/09 18:15:58 guilhem@mysql.com +4 -4
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/r/rpl_replicate_do.result
    1.20 03/10/09 18:15:58 guilhem@mysql.com +1 -1
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/r/rpl_openssl.result
    1.4 03/10/09 18:15:57 guilhem@mysql.com +4 -4
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/r/rpl_max_relay_size.result
    1.9 03/10/09 18:15:57 guilhem@mysql.com +6 -6
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/r/rpl_log_pos.result
    1.36 03/10/09 18:15:57 guilhem@mysql.com +4 -4
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/r/rpl_log.result
    1.49 03/10/09 18:15:57 guilhem@mysql.com +1 -1
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/r/rpl_loaddata.result
    1.17 03/10/09 18:15:56 guilhem@mysql.com +3 -3
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/r/rpl_flush_log_loop.result
    1.12 03/10/09 18:15:56 guilhem@mysql.com +1 -1
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/r/rpl_error_ignored_table.result
    1.7 03/10/09 18:15:56 guilhem@mysql.com +1 -1
    Don't show Slave_IO_State because it can't be predicted.

  mysql-test/r/rpl000015.result
    1.28 03/10/09 18:15:56 guilhem@mysql.com +3 -3
    Don't show Slave_IO_State because it can't be predicted.

  sql/table.cc
    1.84.1.3 03/10/09 18:04:50 serg@serg.mylan +8 -7
    typedef Bitmap<64> key_map
    all tests pass

  sql/sql_update.cc
    1.83.5.2 03/10/09 18:04:50 serg@serg.mylan +5 -5
    typedef Bitmap<64> key_map
    all tests pass

  sql/sql_test.cc
    1.21.2.1 03/10/09 18:04:50 serg@serg.mylan +3 -2
    typedef Bitmap<64> key_map
    all tests pass

  sql/sql_show.cc
    1.122.7.1 03/10/09 18:04:50 serg@serg.mylan +1 -1
    typedef Bitmap<64> key_map
    all tests pass

  sql/sql_select.h
    1.56 03/10/09 18:04:50 serg@serg.mylan +3 -3
    typedef Bitmap<64> key_map
    all tests pass

  sql/sql_select.cc
    1.216.31.1 03/10/09 18:04:50 serg@serg.mylan +100 -84
    typedef Bitmap<64> key_map
    all tests pass

  sql/sql_delete.cc
    1.99.2.11 03/10/09 18:04:50 serg@serg.mylan +4 -3
    typedef Bitmap<64> key_map
    all tests pass

  sql/sql_base.cc
    1.145.14.1 03/10/09 18:04:50 serg@serg.mylan +14 -14
    typedef Bitmap<64> key_map
    all tests pass

  sql/opt_sum.cc
    1.32 03/10/09 18:04:50 serg@serg.mylan +3 -3
    typedef Bitmap<64> key_map
    all tests pass

  sql/opt_range.h
    1.25 03/10/09 18:04:50 serg@serg.mylan +2 -1
    typedef Bitmap<64> key_map
    all tests pass

  sql/opt_range.cc
    1.90.2.1 03/10/09 18:04:50 serg@serg.mylan +13 -13
    typedef Bitmap<64> key_map
    all tests pass

  sql/mysql_priv.h
    1.186.28.4 03/10/09 18:04:50 serg@serg.mylan +62 -3
    typedef Bitmap<64> key_map
    all tests pass

  sql/item_func.cc
    1.124.9.1 03/10/09 18:04:50 serg@serg.mylan +1 -1
    typedef Bitmap<64> key_map
    all tests pass

  sql/item.cc
    1.58.24.1 03/10/09 18:04:50 serg@serg.mylan +10 -10
    typedef Bitmap<64> key_map
    all tests pass

  sql/handler.h
    1.81.1.3 03/10/09 18:04:50 serg@serg.mylan +1 -1
    typedef Bitmap<64> key_map
    all tests pass

  sql/ha_myisammrg.cc
    1.43.1.1 03/10/09 18:04:50 serg@serg.mylan +2 -1
    typedef Bitmap<64> key_map
    all tests pass

  sql/ha_myisam.cc
    1.115.8.1 03/10/09 18:04:50 serg@serg.mylan +13 -11
    typedef Bitmap<64> key_map
    all tests pass

  sql/ha_isam.cc
    1.23 03/10/09 18:04:50 serg@serg.mylan +2 -1
    typedef Bitmap<64> key_map
    all tests pass

  sql/ha_innodb.h
    1.53.1.1 03/10/09 18:04:50 serg@serg.mylan +1 -1
    typedef Bitmap<64> key_map
    all tests pass

  sql/ha_berkeley.h
    1.54 03/10/09 18:04:50 serg@serg.mylan +1 -1
    typedef Bitmap<64> key_map
    all tests pass

  sql/ha_berkeley.cc
    1.117.2.1 03/10/09 18:04:50 serg@serg.mylan +6 -6
    typedef Bitmap<64> key_map
    all tests pass

  sql/field.h
    1.80 03/10/09 18:04:50 serg@serg.mylan +3 -1
    typedef Bitmap<64> key_map
    all tests pass

  sql/field.cc
    1.116 03/10/09 18:04:50 serg@serg.mylan +1 -2
    typedef Bitmap<64> key_map
    all tests pass

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

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

ChangeSet
  1.1578.7.1 03/10/09 14:55:33 guilhem@gbichot2 +1 -0
  Tiny cleanup after the push of WL#1098 "Seconds_behind_master in SHOW SLAVE STATUS":
  a better comment, and replacing an assignment by an equivalent simpler one.

  sql/log_event.cc
    1.113.1.23 03/10/09 14:55:27 guilhem@mysql.com +6 -2
    a better comment, and replacing an assignment by an equivalent simpler one.

ChangeSet
  1.1581 03/10/09 09:30:26 bell@laptop.sanja.is.com.ua +3 -0
  Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1

  sql/sql_parse.cc
    1.271.24.19 03/10/09 09:30:16 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/set_var.cc
    1.34.17.3 03/10/09 09:30:15 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.38 03/10/09 09:30:15 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1578.6.1 03/10/09 09:20:01 bell@laptop.sanja.is.com.ua +2 -0
  merge

  sql/share/german/errmsg.txt
    1.64.1.27 03/10/09 09:19:55 bell@laptop.sanja.is.com.ua +1 -1
    merge

  sql/set_var.cc
    1.34.18.2 03/10/09 09:13:37 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1578.1.9 03/10/09 08:54:15 heikki@hundin.mysql.fi +1 -0
  os0file.h:
    Fix the Windows compilation error reported by Miguel 1.5 hours ago

  innobase/include/os0file.h
    1.21 03/10/09 08:53:30 heikki@hundin.mysql.fi +1 -1
    Fix the Windows compilation error reported by Miguel 1.5 hours ago

ChangeSet
  1.1578.3.4 03/10/08 18:08:51 paul@ice.snake.net +1 -0
  errmsg.txt:
    Add Stefan's new translations.

  sql/share/german/errmsg.txt
    1.64.1.26 03/10/08 18:08:24 paul@ice.snake.net +158 -158
    Add Stefan's new translations.

ChangeSet
  1.1578.1.6 03/10/09 00:06:21 guilhem@gbichot2 +33 -0
  Final push for WL#1098:
  "Add a column "Timestamp_of_last_master_event_executed" in SHOW SLAVE STATUS".
  Finally this is adding
  - Slave_IO_State (a copy of the State column of SHOW PROCESSLIST for the I/O thread,
  so that the users, most of the time, has enough info with only SHOW SLAVE STATUS).
  - Seconds_behind_master. When the slave connects to the master it does SELECT UNIX_TIMESTAMP()
  on the master, computes the absolute difference between the master's and the slave's clock.
  It records the timestamp of the last event executed by the SQL thread, and does a
  small computation to find the number of seconds by which the slave is late.

  sql/sql_repl.cc
    1.102.1.14 03/10/09 00:05:57 guilhem@mysql.com +7 -3
    clear the Seconds_behind_master column of SHOW SLAVE STATUS when RESET SLAVE or CHANGE MASTER.

  sql/slave.h
    1.69 03/10/09 00:05:57 guilhem@mysql.com +13 -1
    timestamp of the last master's event executed by the SQL thread,
    and difference between the clocks of the master and slave.

  sql/slave.cc
    1.188.1.23 03/10/09 00:05:57 guilhem@mysql.com +64 -14
    in check_master_version() we know read the master's clock, to know the clock difference
    with the slave.
    In show_master_info() we send the state of the I/O thread, and compute the number of
    seconds by which the slave is late.

  sql/log_event.cc
    1.113.1.22 03/10/09 00:05:57 guilhem@mysql.com +2 -0
    when the SQL thread executes an event, we record its timestamp

  mysql-test/t/rpl_until.test
    1.5 03/10/09 00:05:56 guilhem@mysql.com +4 -0
    update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS

  mysql-test/t/rpl_trunc_binlog.test
    1.4 03/10/09 00:05:56 guilhem@mysql.com +1 -0
    update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS

  mysql-test/t/rpl_rotate_logs.test
    1.45 03/10/09 00:05:56 guilhem@mysql.com +3 -0
    update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS

  mysql-test/t/rpl_reset_slave.test
    1.2 03/10/09 00:05:55 guilhem@mysql.com +4 -0
    update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS

  mysql-test/t/rpl_replicate_do.test
    1.18 03/10/09 00:05:55 guilhem@mysql.com +1 -0
    update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS

  mysql-test/t/rpl_redirect.test
    1.8 03/10/09 00:05:55 guilhem@mysql.com +1 -0
    update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS

  mysql-test/t/rpl_openssl.test
    1.2 03/10/09 00:05:54 guilhem@mysql.com +2 -0
    update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS

  mysql-test/t/rpl_max_relay_size.test
    1.5 03/10/09 00:05:54 guilhem@mysql.com +6 -2
    update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS

  mysql-test/t/rpl_log_pos.test
    1.25 03/10/09 00:05:54 guilhem@mysql.com +4 -0
    update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS

  mysql-test/t/rpl_log.test
    1.19 03/10/09 00:05:54 guilhem@mysql.com +1 -0
    update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS

  mysql-test/t/rpl_loaddata.test
    1.10 03/10/09 00:05:53 guilhem@mysql.com +3 -0
    update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS

  mysql-test/t/rpl_flush_log_loop.test
    1.5 03/10/09 00:05:53 guilhem@mysql.com +1 -0
    update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS

  mysql-test/t/rpl_error_ignored_table.test
    1.3 03/10/09 00:05:53 guilhem@mysql.com +1 -0
    update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS

  mysql-test/t/rpl_empty_master_crash.test
    1.5 03/10/09 00:05:53 guilhem@mysql.com +1 -0
    update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS

  mysql-test/t/rpl000015.test
    1.24 03/10/09 00:05:52 guilhem@mysql.com +4 -0
    update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS

  mysql-test/r/rpl_until.result
    1.6 03/10/09 00:05:52 guilhem@mysql.com +8 -8
    result update

  mysql-test/r/rpl_trunc_binlog.result
    1.4 03/10/09 00:05:52 guilhem@mysql.com +2 -2
    result update

  mysql-test/r/rpl_rotate_logs.result
    1.48 03/10/09 00:05:52 guilhem@mysql.com +6 -6
    result update

  mysql-test/r/rpl_reset_slave.result
    1.5 03/10/09 00:05:51 guilhem@mysql.com +8 -8
    result update

  mysql-test/r/rpl_replicate_do.result
    1.19 03/10/09 00:05:51 guilhem@mysql.com +2 -2
    result update

  mysql-test/r/rpl_redirect.result
    1.13 03/10/09 00:05:51 guilhem@mysql.com +1 -1
    result update

  mysql-test/r/rpl_max_relay_size.result
    1.8 03/10/09 00:05:50 guilhem@mysql.com +12 -12
    result update

  mysql-test/r/rpl_log_pos.result
    1.35 03/10/09 00:05:50 guilhem@mysql.com +8 -8
    result update

  mysql-test/r/rpl_log.result
    1.48 03/10/09 00:05:50 guilhem@mysql.com +2 -2
    result update

  mysql-test/r/rpl_loaddata.result
    1.16 03/10/09 00:05:50 guilhem@mysql.com +6 -6
    result update

  mysql-test/r/rpl_flush_log_loop.result
    1.11 03/10/09 00:05:49 guilhem@mysql.com +2 -2
    result update

  mysql-test/r/rpl_error_ignored_table.result
    1.6 03/10/09 00:05:49 guilhem@mysql.com +2 -2
    result update

  mysql-test/r/rpl_empty_master_crash.result
    1.12 03/10/09 00:05:49 guilhem@mysql.com +1 -1
    result update

  mysql-test/r/rpl000015.result
    1.27 03/10/09 00:05:49 guilhem@mysql.com +7 -7
    result update

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

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

ChangeSet
  1.1578.5.1 03/10/09 00:13:15 bell@laptop.sanja.is.com.ua +26 -0
  added worning about changing requested size of query cache (BUG#1502)

  sql/share/ukrainian/errmsg.txt
    1.27.1.24 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/swedish/errmsg.txt
    1.64.1.27 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/spanish/errmsg.txt
    1.64.1.28 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/slovak/errmsg.txt
    1.64.1.27 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/serbian/errmsg.txt
    1.18.1.25 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/russian/errmsg.txt
    1.61.1.25 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/romanian/errmsg.txt
    1.62.1.27 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/portuguese/errmsg.txt
    1.64.1.26 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/polish/errmsg.txt
    1.63.1.27 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/norwegian/errmsg.txt
    1.63.1.27 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.27 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/korean/errmsg.txt
    1.63.1.26 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/japanese/errmsg.txt
    1.63.1.26 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/italian/errmsg.txt
    1.70.1.27 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/hungarian/errmsg.txt
    1.65.1.26 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/greek/errmsg.txt
    1.64.1.26 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/german/errmsg.txt
    1.64.12.1 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/french/errmsg.txt
    1.63.1.27 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/estonian/errmsg.txt
    1.64.1.26 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/english/errmsg.txt
    1.70.1.30 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/dutch/errmsg.txt
    1.66.1.27 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/danish/errmsg.txt
    1.62.1.27 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/share/czech/errmsg.txt
    1.64.1.27 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +1 -0
    new warning

  sql/set_var.cc
    1.34.19.1 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +5 -0
    issue warning is size changed in other way

  mysql-test/r/query_cache.result
    1.26.1.5 03/10/09 00:12:38 bell@laptop.sanja.is.com.ua +8 -0
    new warning

  include/mysqld_error.h
    1.61.1.18 03/10/09 00:12:37 bell@laptop.sanja.is.com.ua +2 -1
    new warning

ChangeSet
  1.1578.3.3 03/10/08 14:32:55 paul@ice.snake.net +1 -0
  Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
  into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1

ChangeSet
  1.1578.3.2 03/10/08 22:41:45 monty@narttu.mysql.fi +1 -0
  deleted conflicting file

  BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1
    1.4 03/10/08 14:32:46 paul@ice.snake.net +0 -0
    Auto merged

  BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1
    1.3 03/10/08 14:32:46 paul@ice.snake.net +0 -0
    Merge rename: BitKeeper/deleted/.del-mysql.ico -> BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1

  BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1
    1.1.1.1 03/10/08 22:36:21 monty@narttu.mysql.fi +0 -0
    Delete: VC++Files/mysqlshutdown/MYSQL.ICO

ChangeSet
  1.1578.4.1 03/10/08 14:29:25 paul@ice.snake.net +1 -0
  Merge

  BitKeeper/deleted/.del-mysql.ico
    1.2 03/10/08 14:29:17 paul@ice.snake.net +0 -0
    Delete: VC++Files/mysqlshutdown/mysql.ico

ChangeSet
  1.1578.3.1 03/10/08 22:05:06 monty@narttu.mysql.fi +1 -0
  Portability fix

  sql/mysqld.cc
    1.356.1.48 03/10/08 22:05:04 monty@narttu.mysql.fi +6 -1
    Portability fix

ChangeSet
  1.1578.1.4 03/10/08 21:50:05 monty@narttu.mysql.fi +13 -0
  Indentation cleanups
  Remove wait_if_global_read_lock on commit as this can cause deadlocks

  sql/sql_select.cc
    1.216.1.47 03/10/08 21:50:03 monty@narttu.mysql.fi +1 -1
    Indentation cleanup

  sql/sql_repl.cc
    1.102.1.13 03/10/08 21:50:03 monty@narttu.mysql.fi +2 -2
    Indentation cleanup

  sql/sql_parse.cc
    1.271.24.18 03/10/08 21:50:03 monty@narttu.mysql.fi +4 -1
    Comment cleanup

  sql/sql_db.cc
    1.68.1.15 03/10/08 21:50:03 monty@narttu.mysql.fi +7 -7
    Comment cleanup

  sql/opt_range.cc
    1.90.1.9 03/10/08 21:50:03 monty@narttu.mysql.fi +5 -5
    Indentation cleanup

  sql/handler.cc
    1.94.1.6 03/10/08 21:50:03 monty@narttu.mysql.fi +0 -3
    Remove wait_if_global_read_lock as this can cause deadlocks

  mysql-test/t/rpl_max_relay_size.test
    1.4 03/10/08 21:50:03 monty@narttu.mysql.fi +2 -0
    Removed failure as this can cause deadlocks

  mysql-test/t/innodb.test
    1.48 03/10/08 21:50:03 monty@narttu.mysql.fi +3 -1
    Removed failure as this can cause deadlocks

  mysql-test/r/rpl_max_relay_size.result
    1.7 03/10/08 21:50:03 monty@narttu.mysql.fi +2 -2
    Make test repeatable

  mysql-test/r/innodb.result
    1.73 03/10/08 21:50:03 monty@narttu.mysql.fi +0 -1
    Removed failure as this can cause deadlocks

  BUILD/compile-pentium-valgrind-max
    1.6 03/10/08 21:50:03 monty@narttu.mysql.fi +11 -21
    Don't write message twice

  BUILD/SETUP.sh
    1.25 03/10/08 21:50:03 monty@narttu.mysql.fi +2 -2
    Cleanup

  BUILD/FINISH.sh
    1.26 03/10/08 21:50:03 monty@narttu.mysql.fi +1 -1
    Cleanup

ChangeSet
  1.676.1.744 03/10/08 21:04:30 monty@mishka.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-3.23
  into mishka.mysql.fi:/home/my/mysql-3.23

  sql/sql_repl.cc
    1.35.1.11 03/10/08 21:04:30 monty@mishka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.676.312.1 03/10/08 21:02:53 monty@mishka.mysql.fi +3 -0
  Fixed memory leak in send_file

  BitKeeper/etc/logging_ok
    1.153.1.98 03/10/08 21:02:53 monty@mishka.mysql.fi +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_repl.cc
    1.35.2.1 03/10/08 21:02:51 monty@mishka.mysql.fi +1 -8
    Fixed memory leak in send_file

  mysql-test/t/myisam.test
    1.2.8.1 03/10/08 21:02:51 monty@mishka.mysql.fi +1 -2
    Cleanup test

ChangeSet
  1.1578.2.1 03/10/08 12:51:10 paul@ice.snake.net +1 -0
  Incorporate Stefan's new translations of German error messages.

  sql/share/german/errmsg.txt
    1.64.1.25 03/10/08 12:51:03 paul@ice.snake.net +250 -247
    Incorporate Stefan's new translations of German error messages.

ChangeSet
  1.1578.1.3 03/10/08 18:55:34 monty@narttu.mysql.fi +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into narttu.mysql.fi:/my/mysql-4.1

  sql/sql_select.cc
    1.216.1.46 03/10/08 18:55:32 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_subselect.cc
    1.60.1.21 03/10/08 18:55:32 monty@narttu.mysql.fi +0 -0
    Auto merged

  libmysqld/examples/Makefile.am
    1.15 03/10/08 18:55:32 monty@narttu.mysql.fi +0 -2
    Auto merged

ChangeSet
  1.1572.1.9 03/10/08 18:53:31 monty@narttu.mysql.fi +15 -0
  Fixed bug in error handling of CREATE ... SELECT
  More tests cases
  After merge fixes

  sql/sql_select.cc
    1.216.1.45 03/10/08 18:53:28 monty@narttu.mysql.fi +17 -6
    Fixed bug in error handling of CREATE ... SELECT

  sql/sql_insert.cc
    1.86.2.21 03/10/08 18:53:28 monty@narttu.mysql.fi +10 -1
    Fixed bug in error handling of CREATE ... SELECT

  sql/sql_class.h
    1.146.1.40 03/10/08 18:53:28 monty@narttu.mysql.fi +1 -4
    Fixed that send_error() is called properly when a SELECT fails

  sql/sql_class.cc
    1.105.1.22 03/10/08 18:53:28 monty@narttu.mysql.fi +10 -6
    Fixed that send_error() is called properly when a SELECT fails

  sql/set_var.cc
    1.34.18.1 03/10/08 18:53:28 monty@narttu.mysql.fi +2 -1
    Added character-sets-dir to 'show variables'

  sql/mysql_priv.h
    1.186.1.37 03/10/08 18:53:28 monty@narttu.mysql.fi +1 -1
    Added character-sets-dir to 'show variables'

  mysql-test/t/mysqlbinlog.test
    1.6 03/10/08 18:53:28 monty@narttu.mysql.fi +2 -2
    Fixed test after merge

  mysql-test/t/insert_select.test
    1.10 03/10/08 18:53:28 monty@narttu.mysql.fi +1 -0
    More tests

  mysql-test/t/create.test
    1.29 03/10/08 18:53:28 monty@narttu.mysql.fi +13 -0
    More tests

  mysql-test/t/ansi.test
    1.4 03/10/08 18:53:28 monty@narttu.mysql.fi +6 -4
    Cleaned up test to be able to remove ansi-master.opt

  mysql-test/r/rpl000009.result
    1.17 03/10/08 18:53:28 monty@narttu.mysql.fi +33 -20
    Updated results

  mysql-test/r/insert_select.result
    1.15 03/10/08 18:53:28 monty@narttu.mysql.fi +5 -0
    Updated results

  mysql-test/r/create.result
    1.48 03/10/08 18:53:28 monty@narttu.mysql.fi +10 -0
    Updated results

  mysql-test/r/ansi.result
    1.3 03/10/08 18:53:28 monty@narttu.mysql.fi +9 -8
    Cleaned up test to be able to remove ansi-master.opt

ChangeSet
  1.1580 03/10/08 17:40:54 bell@laptop.sanja.is.com.ua +5 -0
  Some simple optimisation
  = ANY and <> ALL converted to (NOT) IN to get advantage of IN optimisation

  sql/sql_yacc.yy
    1.203.74.3 03/10/08 17:40:47 bell@laptop.sanja.is.com.ua +3 -18
    same code blocks replaced with function

  sql/sql_parse.cc
    1.271.33.1 03/10/08 17:40:47 bell@laptop.sanja.is.com.ua +39 -0
    layout fix
    new function for subquery creation (convert some ALL/ANY to IN)

  sql/mysql_priv.h
    1.186.34.1 03/10/08 17:40:47 bell@laptop.sanja.is.com.ua +5 -0
    new function for subquery creation

  mysql-test/t/subselect.test
    1.58.1.26 03/10/08 17:40:47 bell@laptop.sanja.is.com.ua +4 -0
    test of new optimisation

  mysql-test/r/subselect.result
    1.67.1.27 03/10/08 17:40:47 bell@laptop.sanja.is.com.ua +18 -0
    test of new optimisation

  BitKeeper/deleted/.del-ansi-master.opt~4d337eb61642a838
    1.2 03/10/08 15:48:19 monty@narttu.mysql.fi +0 -0
    Delete: mysql-test/t/ansi-master.opt

ChangeSet
  1.1578.1.2 03/10/08 13:26:29 lenz@kallisto.local +1 -0
   - portability fix: replaced "uint" with "unsigned int"

  include/mysql_com.h
    1.67.1.17 03/10/08 13:26:26 lenz@mysql.com +2 -2
     - portability fix: replaced "uint" with "unsigned int"

ChangeSet
  1.1578.1.1 03/10/08 13:06:47 lenz@kallisto.local +1 -0
   - added missing link line that seemed to have gone lost during the last
     4.0->4.1 merge (mysqltest needs to be linked with a C++ compiler)

  libmysqld/examples/Makefile.am
    1.13.1.1 03/10/08 13:06:44 lenz@mysql.com +2 -0
     - added missing link line that seemed to have gone lost during the last
       4.0->4.1 merge (mysqltest needs to be linked with a C++ compiler)

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

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

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

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

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

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

ChangeSet
  1.1572.1.8 03/10/08 12:05:27 monty@narttu.mysql.fi +3 -0
  merge with 4.0 to get fix for mysqlbinlog

  mysql-test/t/mysqlbinlog.test
    1.5 03/10/08 12:05:25 monty@narttu.mysql.fi +0 -4
    merge with 4.0 to get fix for mysqlbinlog

  mysql-test/t/rpl_trunc_binlog.test
    1.3 03/10/08 12:04:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysqlbinlog.cc
    1.82 03/10/08 12:04:18 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1572.1.7 03/10/08 12:01:58 monty@narttu.mysql.fi +25 -0
  Fixes after merge

  sql/sql_insert.cc
    1.86.2.20 03/10/08 12:01:56 monty@narttu.mysql.fi +8 -5
    Fix after merge

  sql/slave.cc
    1.188.1.22 03/10/08 12:01:56 monty@narttu.mysql.fi +27 -15
    Fix after merge

  sql/repl_failsafe.cc
    1.32.1.9 03/10/08 12:01:56 monty@narttu.mysql.fi +6 -1
    Fix after merge

  sql/item_subselect.cc
    1.60.13.6 03/10/08 12:01:56 monty@narttu.mysql.fi +0 -1
    Fix after merge

  sql-common/client.c
    1.34 03/10/08 12:01:56 monty@narttu.mysql.fi +0 -4
    Fix after merge

  mysql-test/t/rpl_trunc_binlog.test
    1.1.1.1 03/10/08 12:01:56 monty@narttu.mysql.fi +6 -6
    Fix after merge

  mysql-test/t/rpl_loaddata_rule_m.test
    1.2 03/10/08 12:01:56 monty@narttu.mysql.fi +8 -3
    Fix after merge

  mysql-test/t/rpl_alter.test
    1.5 03/10/08 12:01:56 monty@narttu.mysql.fi +11 -11
    Fix after merge

  mysql-test/t/rpl000009.test
    1.20 03/10/08 12:01:56 monty@narttu.mysql.fi +48 -32
    Fix after merge

  mysql-test/t/mysqlbinlog.test
    1.3.1.1 03/10/08 12:01:56 monty@narttu.mysql.fi +9 -9
    Fix after merge

  mysql-test/t/insert.test
    1.11.1.3 03/10/08 12:01:56 monty@narttu.mysql.fi +5 -5
    Fix after merge

  mysql-test/r/select_safe.result
    1.13 03/10/08 12:01:56 monty@narttu.mysql.fi +1 -1
    Fix after merge

  mysql-test/r/rpl_trunc_binlog.result
    1.3 03/10/08 12:01:56 monty@narttu.mysql.fi +4 -4
    Fix after merge

  mysql-test/r/rpl_loaddata_rule_m.result
    1.3 03/10/08 12:01:56 monty@narttu.mysql.fi +4 -3
    Fix after merge

  mysql-test/r/rpl_loaddata.result
    1.15 03/10/08 12:01:56 monty@narttu.mysql.fi +2 -2
    Fix after merge

  mysql-test/r/rpl_alter.result
    1.7 03/10/08 12:01:56 monty@narttu.mysql.fi +11 -11
    Fix after merge

  mysql-test/r/order_by.result
    1.28 03/10/08 12:01:56 monty@narttu.mysql.fi +3 -3
    Fix after merge

  mysql-test/r/null_key.result
    1.22 03/10/08 12:01:56 monty@narttu.mysql.fi +2 -2
    Fix after merge

  mysql-test/r/mysqldump.result
    1.2 03/10/08 12:01:56 monty@narttu.mysql.fi +3 -0
    Fix after merge

  mysql-test/r/join_outer.result
    1.23 03/10/08 12:01:56 monty@narttu.mysql.fi +1 -1
    Fix after merge

  mysql-test/r/drop_temp_table.result
    1.4 03/10/08 12:01:56 monty@narttu.mysql.fi +5 -5
    Fix after merge

  mysql-test/r/distinct.result
    1.27.1.2 03/10/08 12:01:56 monty@narttu.mysql.fi +2 -2
    Fix after merge

  mysql-test/mysql-test-run.sh
    1.167.1.8 03/10/08 12:01:56 monty@narttu.mysql.fi +1 -0
    Fixed merge problem

  client/mysqltest.c
    1.92.1.17 03/10/08 12:01:56 monty@narttu.mysql.fi +4 -5
    Fixed merge problem

ChangeSet
  1.1579 03/10/08 11:19:09 bell@laptop.sanja.is.com.ua +4 -0
  fixed error handling in SET and DO operators (BUG#1484)

  sql/sql_do.cc
    1.7 03/10/08 11:19:04 bell@laptop.sanja.is.com.ua +1 -0
    DO should ignore all errors

  sql/set_var.cc
    1.34.17.2 03/10/08 11:19:04 bell@laptop.sanja.is.com.ua +38 -5
    value evaluating can fail (because of subqueries for example) => we should check result of operartion and prevent assigning incorrect value

  mysql-test/t/subselect.test
    1.58.1.25 03/10/08 11:19:04 bell@laptop.sanja.is.com.ua +14 -0
    layout fix
    test for BUG#1484

  mysql-test/r/subselect.result
    1.67.1.26 03/10/08 11:19:04 bell@laptop.sanja.is.com.ua +7 -0
    test for BUG#1484

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

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

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

ChangeSet
  1.1576.2.1 03/10/08 10:18:38 bar@bar.mysql.r18.ru +2 -0
  query_cache.result, query_cache.test:
    Character set variables test

  mysql-test/r/query_cache.result
    1.26.1.4 03/10/08 10:18:16 bar@bar.mysql.r18.ru +47 -0
    Character set variables test

  mysql-test/t/query_cache.test
    1.24.1.4 03/10/08 10:17:57 bar@bar.mysql.r18.ru +47 -0
    Character set variables test

ChangeSet
  1.1576.1.1 03/10/08 00:19:44 greg@mysql.com +2 -0
  Fixed test case to work on NetWare.

  mysql-test/t/func_gconcat.test
    1.8 03/10/08 00:19:42 greg@mysql.com +1 -1
    Removed extraneous CR (0x0D)

  mysql-test/r/func_gconcat.result
    1.15 03/10/08 00:19:42 greg@mysql.com +1 -1
    Removed extraneous CR (0x0D)

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

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

ChangeSet
  1.1563.90.1 03/10/07 23:15:13 guilhem@gbichot2 +1 -0
   mysql_real_connect picks the Unix login when the user "" is used.
   This makes the test non-repeatable when running as root.
   So I change to not use the "" user, but a random string which will
   always result in the @localhost user being selected by the server.

  mysql-test/t/rpl_temporary.test
    1.9 03/10/07 23:15:06 guilhem@mysql.com +4 -1
    mysql_real_connect picks the Unix login when the user "" is used.
    This makes the test non-repeatable when running as root.
    So I change to not use the "" user, but a random string which will
    always result in the @localhost user being selected by the server.

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

ChangeSet
  1.1572.1.6 03/10/07 18:07:50 monty@narttu.mysql.fi +5 -0
  merge

ChangeSet
  1.1572.2.6 03/10/07 15:49:37 monty@narttu.mysql.fi +6 -0
  Merge with 4.0 to get fix for mysqlbinlog

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

ChangeSet
  1.1577 03/10/07 21:01:57 bell@laptop.sanja.is.com.ua +2 -0
  Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1

  sql/sql_select.cc
    1.216.30.2 03/10/07 21:01:50 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.1.25 03/10/07 21:01:50 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

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

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

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

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

  mysql-test/std_data/trunc_binlog.000001
    1.2 03/10/07 19:50:34 monty@narttu.mysql.fi +0 -0
    Rename: mysql-test/std_data/trunc_binlog.001 -> mysql-test/std_data/trunc_binlog.000001

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

  sql/item_subselect.cc
    1.60.13.5 03/10/07 18:07:49 monty@narttu.mysql.fi +0 -3
    Use sanjas patch instead

  innobase/row/row0sel.c
    1.37 03/10/07 18:07:49 monty@narttu.mysql.fi +0 -11
    merge (no changes)

  innobase/row/row0mysql.c
    1.45 03/10/07 18:07:49 monty@narttu.mysql.fi +1 -22
    merge (no changes)

  sql/sql_select.cc
    1.216.1.44 03/10/07 18:01:31 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.47 03/10/07 18:01:31 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1575 03/10/07 17:42:59 bell@laptop.sanja.is.com.ua +2 -0
  Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-constructors-4.1

  sql/item_subselect.h
    1.42 03/10/07 17:42:53 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.cc
    1.60.1.20 03/10/07 17:42:53 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1574 03/10/07 17:37:20 bell@laptop.sanja.is.com.ua +1 -0
  after merge fix

  sql/item_subselect.h
    1.41 03/10/07 17:37:15 bell@laptop.sanja.is.com.ua +0 -2
    after merge fix

ChangeSet
  1.1572.1.5 03/10/07 17:28:59 heikki@hundin.mysql.fi +85 -0
  Many files:
    Multiple tablespaces for InnoDB
  sql_table.cc:
    Tell explicitly that InnoDB should retrieve all columns in CHECKSUM TABLE
  sql_update.cc, sql_select.cc, my_base.h:
    More descriptive flag name HA_EXTRA_RETRIEVE_ALL_COLS

  innobase/ut/ut0ut.c
    1.17 03/10/07 17:26:24 heikki@hundin.mysql.fi +0 -1
    Multiple tablespaces for InnoDB

  innobase/ut/ut0byte.c
    1.3 03/10/07 17:26:24 heikki@hundin.mysql.fi +1 -1
    Multiple tablespaces for InnoDB

  innobase/trx/trx0undo.c
    1.9 03/10/07 17:26:15 heikki@hundin.mysql.fi +8 -6
    Multiple tablespaces for InnoDB

  innobase/trx/trx0trx.c
    1.25 03/10/07 17:26:15 heikki@hundin.mysql.fi +7 -7
    Multiple tablespaces for InnoDB

  innobase/trx/trx0sys.c
    1.18 03/10/07 17:26:15 heikki@hundin.mysql.fi +126 -20
    Multiple tablespaces for InnoDB

  innobase/sync/sync0sync.c
    1.17 03/10/07 17:26:05 heikki@hundin.mysql.fi +16 -3
    Multiple tablespaces for InnoDB

  innobase/sync/sync0rw.c
    1.8 03/10/07 17:26:05 heikki@hundin.mysql.fi +13 -1
    Multiple tablespaces for InnoDB

  innobase/srv/srv0start.c
    1.46 03/10/07 17:25:59 heikki@hundin.mysql.fi +194 -117
    Multiple tablespaces for InnoDB

  innobase/srv/srv0srv.c
    1.44 03/10/07 17:25:59 heikki@hundin.mysql.fi +45 -11
    Multiple tablespaces for InnoDB

  innobase/row/row0upd.c
    1.19 03/10/07 17:25:54 heikki@hundin.mysql.fi +2 -1
    Multiple tablespaces for InnoDB

  innobase/row/row0sel.c
    1.35.1.1 03/10/07 17:25:54 heikki@hundin.mysql.fi +85 -48
    Multiple tablespaces for InnoDB

  innobase/row/row0mysql.c
    1.43.1.1 03/10/07 17:25:54 heikki@hundin.mysql.fi +327 -30
    Multiple tablespaces for InnoDB

  innobase/row/row0ins.c
    1.27 03/10/07 17:25:54 heikki@hundin.mysql.fi +9 -0
    Multiple tablespaces for InnoDB

  innobase/que/que0que.c
    1.10 03/10/07 17:25:37 heikki@hundin.mysql.fi +0 -4
    Multiple tablespaces for InnoDB

  innobase/page/page0cur.c
    1.12 03/10/07 17:25:25 heikki@hundin.mysql.fi +3 -2
    Multiple tablespaces for InnoDB

  innobase/os/os0proc.c
    1.7 03/10/07 17:24:51 heikki@hundin.mysql.fi +2 -2
    Multiple tablespaces for InnoDB

  innobase/os/os0file.c
    1.53 03/10/07 17:24:51 heikki@hundin.mysql.fi +336 -22
    Multiple tablespaces for InnoDB

  innobase/mtr/mtr0log.c
    1.5 03/10/07 17:24:43 heikki@hundin.mysql.fi +2 -2
    Multiple tablespaces for InnoDB

  innobase/mem/mem0pool.c
    1.12 03/10/07 17:24:37 heikki@hundin.mysql.fi +2 -2
    Multiple tablespaces for InnoDB

  innobase/mem/mem0dbg.c
    1.6 03/10/07 17:24:37 heikki@hundin.mysql.fi +28 -9
    Multiple tablespaces for InnoDB

  innobase/mach/mach0data.c
    1.2 03/10/07 17:24:29 heikki@hundin.mysql.fi +8 -8
    Multiple tablespaces for InnoDB

  innobase/log/log0recv.c
    1.23 03/10/07 17:23:17 heikki@hundin.mysql.fi +113 -52
    Multiple tablespaces for InnoDB

  innobase/log/log0log.c
    1.26 03/10/07 17:23:17 heikki@hundin.mysql.fi +27 -14
    Multiple tablespaces for InnoDB

  innobase/ibuf/ibuf0ibuf.c
    1.19 03/10/07 17:22:56 heikki@hundin.mysql.fi +730 -155
    Multiple tablespaces for InnoDB

  innobase/ha/ha0ha.c
    1.7 03/10/07 17:22:51 heikki@hundin.mysql.fi +4 -4
    Multiple tablespaces for InnoDB

  innobase/fsp/fsp0fsp.c
    1.16 03/10/07 17:20:58 heikki@hundin.mysql.fi +333 -122
    Multiple tablespaces for InnoDB

  innobase/fil/fil0fil.c
    1.14 03/10/07 17:20:48 heikki@hundin.mysql.fi +2247 -455
    Multiple tablespaces for InnoDB

  innobase/dict/dict0mem.c
    1.10 03/10/07 17:20:28 heikki@hundin.mysql.fi +2 -0
    Multiple tablespaces for InnoDB

  innobase/dict/dict0load.c
    1.11 03/10/07 17:20:28 heikki@hundin.mysql.fi +129 -10
    Multiple tablespaces for InnoDB

  innobase/dict/dict0dict.c
    1.31 03/10/07 17:20:28 heikki@hundin.mysql.fi +62 -8
    Multiple tablespaces for InnoDB

  innobase/dict/dict0crea.c
    1.13 03/10/07 17:20:28 heikki@hundin.mysql.fi +44 -9
    Multiple tablespaces for InnoDB

  innobase/dict/dict0boot.c
    1.6 03/10/07 17:20:28 heikki@hundin.mysql.fi +0 -2
    Multiple tablespaces for InnoDB

  innobase/data/data0type.c
    1.6 03/10/07 17:20:22 heikki@hundin.mysql.fi +1 -1
    Multiple tablespaces for InnoDB

  innobase/buf/buf0rea.c
    1.7 03/10/07 17:20:13 heikki@hundin.mysql.fi +130 -49
    Multiple tablespaces for InnoDB

  innobase/buf/buf0lru.c
    1.12 03/10/07 17:20:13 heikki@hundin.mysql.fi +81 -0
    Multiple tablespaces for InnoDB

  innobase/buf/buf0flu.c
    1.18 03/10/07 17:20:13 heikki@hundin.mysql.fi +2 -3
    Multiple tablespaces for InnoDB

  innobase/buf/buf0buf.c
    1.25 03/10/07 17:20:13 heikki@hundin.mysql.fi +50 -31
    Multiple tablespaces for InnoDB

  innobase/btr/btr0sea.c
    1.15 03/10/07 17:20:00 heikki@hundin.mysql.fi +7 -5
    Multiple tablespaces for InnoDB

  innobase/btr/btr0cur.c
    1.25 03/10/07 17:20:00 heikki@hundin.mysql.fi +17 -11
    Multiple tablespaces for InnoDB

  innobase/include/univ.i
    1.29 03/10/07 17:19:49 heikki@hundin.mysql.fi +1 -2
    Multiple tablespaces for InnoDB

  innobase/include/ut0byte.h
    1.4 03/10/07 17:19:34 heikki@hundin.mysql.fi +1 -1
    Multiple tablespaces for InnoDB

  innobase/include/trx0sys.h
    1.9 03/10/07 17:19:34 heikki@hundin.mysql.fi +27 -4
    Multiple tablespaces for InnoDB

  innobase/include/sync0sync.h
    1.10 03/10/07 17:19:34 heikki@hundin.mysql.fi +3 -3
    Multiple tablespaces for InnoDB

  innobase/include/srv0start.h
    1.9 03/10/07 17:19:34 heikki@hundin.mysql.fi +9 -0
    Multiple tablespaces for InnoDB

  innobase/include/srv0srv.h
    1.26 03/10/07 17:19:34 heikki@hundin.mysql.fi +6 -0
    Multiple tablespaces for InnoDB

  innobase/include/rem0rec.h
    1.4 03/10/07 17:19:34 heikki@hundin.mysql.fi +3 -3
    Multiple tablespaces for InnoDB

  innobase/include/que0types.h
    1.2 03/10/07 17:19:34 heikki@hundin.mysql.fi +2 -1
    Multiple tablespaces for InnoDB

  innobase/include/page0page.h
    1.5 03/10/07 17:19:34 heikki@hundin.mysql.fi +2 -1
    Multiple tablespaces for InnoDB

  innobase/include/os0file.h
    1.20 03/10/07 17:19:34 heikki@hundin.mysql.fi +99 -6
    Multiple tablespaces for InnoDB

  innobase/include/log0recv.h
    1.9 03/10/07 17:19:34 heikki@hundin.mysql.fi +2 -3
    Multiple tablespaces for InnoDB

  innobase/include/log0log.h
    1.11 03/10/07 17:19:33 heikki@hundin.mysql.fi +20 -13
    Multiple tablespaces for InnoDB

  innobase/include/lock0lock.h
    1.8 03/10/07 17:19:33 heikki@hundin.mysql.fi +2 -2
    Multiple tablespaces for InnoDB

  innobase/include/ibuf0ibuf.h
    1.5 03/10/07 17:19:33 heikki@hundin.mysql.fi +31 -3
    Multiple tablespaces for InnoDB

  innobase/include/fsp0fsp.h
    1.5 03/10/07 17:19:33 heikki@hundin.mysql.fi +39 -12
    Multiple tablespaces for InnoDB

  innobase/include/fil0fil.h
    1.8 03/10/07 17:19:33 heikki@hundin.mysql.fi +327 -125
    Multiple tablespaces for InnoDB

  innobase/include/dict0mem.h
    1.15 03/10/07 17:19:33 heikki@hundin.mysql.fi +7 -0
    Multiple tablespaces for InnoDB

  innobase/include/dict0load.h
    1.3 03/10/07 17:19:33 heikki@hundin.mysql.fi +15 -1
    Multiple tablespaces for InnoDB

  innobase/include/dict0dict.h
    1.18 03/10/07 17:19:33 heikki@hundin.mysql.fi +22 -2
    Multiple tablespaces for InnoDB

  innobase/include/dict0boot.h
    1.3 03/10/07 17:19:33 heikki@hundin.mysql.fi +1 -1
    Multiple tablespaces for InnoDB

  innobase/include/db0err.h
    1.9 03/10/07 17:19:33 heikki@hundin.mysql.fi +5 -0
    Multiple tablespaces for InnoDB

  innobase/include/data0type.h
    1.5 03/10/07 17:19:33 heikki@hundin.mysql.fi +23 -8
    Multiple tablespaces for InnoDB

  innobase/include/buf0rea.h
    1.3 03/10/07 17:19:33 heikki@hundin.mysql.fi +9 -4
    Multiple tablespaces for InnoDB

  innobase/include/buf0lru.h
    1.4 03/10/07 17:19:33 heikki@hundin.mysql.fi +10 -0
    Multiple tablespaces for InnoDB

  innobase/include/buf0buf.h
    1.18 03/10/07 17:19:33 heikki@hundin.mysql.fi +17 -9
    Multiple tablespaces for InnoDB

  innobase/include/ut0ut.ic
    1.3 03/10/07 17:19:31 heikki@hundin.mysql.fi +2 -2
    Multiple tablespaces for InnoDB

  innobase/include/ut0byte.ic
    1.3 03/10/07 17:19:31 heikki@hundin.mysql.fi +4 -4
    Multiple tablespaces for InnoDB

  innobase/include/rem0rec.ic
    1.6 03/10/07 17:19:31 heikki@hundin.mysql.fi +15 -15
    Multiple tablespaces for InnoDB

  innobase/include/mtr0log.ic
    1.3 03/10/07 17:19:31 heikki@hundin.mysql.fi +0 -7
    Multiple tablespaces for InnoDB

  innobase/include/mach0data.ic
    1.4 03/10/07 17:19:31 heikki@hundin.mysql.fi +27 -28
    Multiple tablespaces for InnoDB

  innobase/include/log0log.ic
    1.5 03/10/07 17:19:31 heikki@hundin.mysql.fi +4 -4
    Multiple tablespaces for InnoDB

  innobase/include/fut0lst.ic
    1.2 03/10/07 17:19:30 heikki@hundin.mysql.fi +1 -1
    Multiple tablespaces for InnoDB

  innobase/include/dyn0dyn.ic
    1.5 03/10/07 17:19:30 heikki@hundin.mysql.fi +1 -1
    Multiple tablespaces for InnoDB

  innobase/include/data0type.ic
    1.6 03/10/07 17:19:30 heikki@hundin.mysql.fi +42 -8
    Multiple tablespaces for InnoDB

  innobase/include/btr0pcur.ic
    1.5 03/10/07 17:19:30 heikki@hundin.mysql.fi +1 -1
    Multiple tablespaces for InnoDB

  innobase/include/btr0btr.ic
    1.3 03/10/07 17:19:30 heikki@hundin.mysql.fi +11 -1
    Multiple tablespaces for InnoDB

  sql/ha_innodb.h
    1.54 03/10/07 17:17:25 heikki@hundin.mysql.fi +9 -6
    Multiple tablespaces for InnoDB

  sql/sql_cache.cc
    1.46.1.11 03/10/07 17:17:21 heikki@hundin.mysql.fi +2 -2
    Multiple tablespaces for InnoDB

  sql/set_var.cc
    1.34.17.1 03/10/07 17:17:21 heikki@hundin.mysql.fi +2 -0
    Multiple tablespaces for InnoDB

  sql/mysqld.cc
    1.356.29.1 03/10/07 17:17:21 heikki@hundin.mysql.fi +10 -0
    Multiple tablespaces for InnoDB

  sql/ha_innodb.cc
    1.90.1.10 03/10/07 17:17:20 heikki@hundin.mysql.fi +398 -263
    Multiple tablespaces for InnoDB

  sql/sql_db.cc
    1.68.1.14 03/10/07 17:17:10 heikki@hundin.mysql.fi +1 -1
    Multiple tablespaces for InnoDB

  sql/sql_table.cc
    1.157.9.13 03/10/07 17:15:40 heikki@hundin.mysql.fi +8 -0
    Tell explicitly that InnoDB should retrieve all columns in CHECKSUM TABLE

  sql/sql_update.cc
    1.83.2.16 03/10/07 17:14:57 heikki@hundin.mysql.fi +1 -1
    More descriptive flag name HA_EXTRA_RETRIEVE_ALL_COLS

  sql/sql_select.cc
    1.216.30.1 03/10/07 17:14:50 heikki@hundin.mysql.fi +1 -1
    More descriptive flag name HA_EXTRA_RETRIEVE_ALL_COLS

  include/my_base.h
    1.43.1.2 03/10/07 17:14:12 heikki@hundin.mysql.fi +4 -1
    More descriptive flag name HA_EXTRA_RETRIEVE_ALL_COLS

ChangeSet
  1.1572.1.4 03/10/07 16:26:46 bell@laptop.sanja.is.com.ua +1 -0
  fixed error detection

  sql/item_subselect.cc
    1.60.13.4 03/10/07 16:26:40 bell@laptop.sanja.is.com.ua +1 -1
    fixed error detection

ChangeSet
  1.1572.1.3 03/10/07 16:22:48 bell@laptop.sanja.is.com.ua +2 -0
  merge

  sql/item_subselect.cc
    1.60.13.3 03/10/07 16:22:44 bell@laptop.sanja.is.com.ua +0 -9
    merge

  sql/item_subselect.h
    1.39.1.3 03/10/07 16:17:18 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  scripts/mysql_install_db.sh
    1.37.1.16 03/10/07 15:49:36 monty@narttu.mysql.fi +0 -1
    Merge with 4.0 to get fix for mysqlbinlog

  mysql-test/mysql-test-run.sh
    1.167.1.7 03/10/07 15:49:36 monty@narttu.mysql.fi +0 -4
    Cleaned up argument handling for external programs

  sql/sql_select.cc
    1.216.1.43 03/10/07 15:47:24 monty@narttu.mysql.fi +0 -0
    Auto merged

  scripts/Makefile.am
    1.34 03/10/07 15:47:24 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/create.result
    1.47 03/10/07 15:47:24 monty@narttu.mysql.fi +1 -2
    Auto merged

  client/mysqlbinlog.cc
    1.81 03/10/07 15:47:24 monty@narttu.mysql.fi +0 -0
    Auto merged

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

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

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

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

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

ChangeSet
  1.1572.2.5 03/10/07 15:42:26 monty@narttu.mysql.fi +85 -0
  Merge with 4.0.16

  sql/sql_class.h
    1.146.1.39 03/10/07 15:42:24 monty@narttu.mysql.fi +0 -0
    Merge with 4.0.16

  sql/slave.cc
    1.188.1.21 03/10/07 15:42:24 monty@narttu.mysql.fi +3 -14
    Merge with 4.0.16

  BitKeeper/deleted/.del-ins000001.test~2428ee5c9b1bc483
    1.10 03/10/07 15:42:24 monty@narttu.mysql.fi +0 -3
    dummy

  sql/mysql_priv.h
    1.186.1.36 03/10/07 15:42:23 monty@narttu.mysql.fi +1 -7
    Merge with 4.0.16

  sql/log_event.cc
    1.113.1.21 03/10/07 15:42:23 monty@narttu.mysql.fi +23 -69
    Merge with 4.0.16

  sql/item_strfunc.cc
    1.140 03/10/07 15:42:23 monty@narttu.mysql.fi +1 -2
    Merge with 4.0.16

  sql/item_func.h
    1.68.1.21 03/10/07 15:42:23 monty@narttu.mysql.fi +1 -4
    Merge with 4.0.16

  sql/item_func.cc
    1.124.1.30 03/10/07 15:42:23 monty@narttu.mysql.fi +29 -25
    Merge with 4.0.16

  scripts/mysql_install_db.sh
    1.37.1.15 03/10/07 15:42:23 monty@narttu.mysql.fi +3 -7
    Change -eq to =

  scripts/mysql_config.sh
    1.10 03/10/07 15:42:23 monty@narttu.mysql.fi +0 -2
    Merge with 4.0.16

  scripts/Makefile.am
    1.33 03/10/07 15:42:23 monty@narttu.mysql.fi +2 -5
    Merge with 4.0.16

  mysys/default.c
    1.33 03/10/07 15:42:23 monty@narttu.mysql.fi +0 -0
    Merge with 4.0.16

  mysql-test/t/rpl000009.test
    1.19 03/10/07 15:42:23 monty@narttu.mysql.fi +3 -3
    Merge with 4.0.16

  mysql-test/t/insert.test
    1.11.1.2 03/10/07 15:42:23 monty@narttu.mysql.fi +0 -7
    Merge with 4.0.16

  mysql-test/t/fulltext_order_by.test
    1.13 03/10/07 15:42:23 monty@narttu.mysql.fi +0 -0
    Merge with 4.0.16

  mysql-test/t/fulltext_multi.test
    1.8 03/10/07 15:42:23 monty@narttu.mysql.fi +0 -1
    Merge with 4.0.16

  mysql-test/r/select_safe.result
    1.12 03/10/07 15:42:23 monty@narttu.mysql.fi +1 -2
    Updated results for merge

  mysql-test/r/rpl_log.result
    1.47 03/10/07 15:42:23 monty@narttu.mysql.fi +0 -28
    Updated results for merge

  mysql-test/r/rpl_loaddata.result
    1.14 03/10/07 15:42:23 monty@narttu.mysql.fi +2 -2
    Updated results for merge

  mysql-test/r/rpl000009.result
    1.16 03/10/07 15:42:23 monty@narttu.mysql.fi +2 -12
    Updated results for merge

  mysql-test/r/order_by.result
    1.27 03/10/07 15:42:23 monty@narttu.mysql.fi +2 -9
    Updated results for merge

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.5 03/10/07 15:42:23 monty@narttu.mysql.fi +0 -47
    Updated results for merge

  mysql-test/r/join_outer.result
    1.22 03/10/07 15:42:23 monty@narttu.mysql.fi +1 -2
    Updated results for merge

  mysql-test/r/insert_select.result
    1.14 03/10/07 15:42:23 monty@narttu.mysql.fi +1 -2
    Updated results for merge

  mysql-test/r/insert.result
    1.12.1.3 03/10/07 15:42:23 monty@narttu.mysql.fi +0 -5
    Updated results for merge

  mysql-test/r/distinct.result
    1.27.1.1 03/10/07 15:42:23 monty@narttu.mysql.fi +0 -5
    Updated results for merge

  mysql-test/mysql-test-run.sh
    1.167.1.6 03/10/07 15:42:23 monty@narttu.mysql.fi +3 -13
    Merge with 4.0.16

  libmysqld/libmysqld.c
    1.55 03/10/07 15:42:23 monty@narttu.mysql.fi +0 -1
    Merge with 4.0.16

  libmysql/libmysql.c
    1.156.1.33 03/10/07 15:42:23 monty@narttu.mysql.fi +2 -4
    Merge with 4.0.16

  include/mysql.h
    1.97 03/10/07 15:42:23 monty@narttu.mysql.fi +1 -0
    Merge with 4.0.16

  extra/comp_err.c
    1.11 03/10/07 15:42:23 monty@narttu.mysql.fi +0 -0
    Merge with 4.0.16

  configure.in
    1.201.1.43 03/10/07 15:42:23 monty@narttu.mysql.fi +1 -2
    Merge with 4.0.16

  client/mysqltest.c
    1.92.1.16 03/10/07 15:42:23 monty@narttu.mysql.fi +1 -68
    Merge with 4.0.16
    Changed version number to '2.0' to avoid confusion with version numbering in 3.23

  client/mysql.cc
    1.121.1.24 03/10/07 15:42:23 monty@narttu.mysql.fi +1 -2
    Merge with 4.0.16

  support-files/mysql.server.sh
    1.31 03/10/07 14:12:10 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.1.42 03/10/07 14:12:09 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.24.17 03/10/07 14:12:09 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_load.cc
    1.46.3.13 03/10/07 14:12:09 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_base.cc
    1.145.1.15 03/10/07 14:12:09 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql-bench/test-transactions.sh
    1.6 03/10/07 14:12:09 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql-bench/test-insert.sh
    1.41 03/10/07 14:12:09 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql-bench/server-cfg.sh
    1.47 03/10/07 14:12:09 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql-bench/crash-me.sh
    1.45 03/10/07 14:12:09 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/slave.h
    1.68 03/10/07 14:12:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.32.1.8 03/10/07 14:12:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.46 03/10/07 14:12:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/log.cc
    1.108.1.16 03/10/07 14:12:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/des_key_file.cc
    1.9 03/10/07 14:12:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  scripts/make_win_src_distribution.sh
    1.10 03/10/07 14:12:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysys/mf_dirname.c
    1.10 03/10/07 14:12:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/user_var.test
    1.9 03/10/07 14:12:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/select.test
    1.20 03/10/07 14:12:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/rpl_loaddata.test
    1.9 03/10/07 14:12:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/std_data/rpl_loaddata2.dat
    1.4 03/10/07 14:12:07 monty@narttu.mysql.fi +0 -1
    Auto merged

  mysql-test/r/user_var.result
    1.13 03/10/07 14:12:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/select.result
    1.32 03/10/07 14:12:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/fulltext_order_by.result
    1.12 03/10/07 14:12:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/fulltext_multi.result
    1.10 03/10/07 14:12:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  myisam/myisamdef.h
    1.59.4.1 03/10/07 14:12:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  myisam/mi_test2.c
    1.18.1.1 03/10/07 14:12:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  myisam/mi_check.c
    1.105.2.3 03/10/07 14:12:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  libmysqld/examples/Makefile.am
    1.14 03/10/07 14:12:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  libmysql/libmysql.def
    1.18 03/10/07 14:12:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/row/row0sel.c
    1.36 03/10/07 14:12:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/row/row0mysql.c
    1.44 03/10/07 14:12:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/my_global.h
    1.47.2.3 03/10/07 14:12:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  heap/hp_test2.c
    1.20 03/10/07 14:12:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  extra/resolveip.c
    1.20 03/10/07 14:12:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysqlbinlog.cc
    1.80 03/10/07 14:12:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  SSL/server-cert.pem
    1.5 03/10/07 14:12:05 monty@narttu.mysql.fi +0 -1
    Auto merged

  SSL/client-cert.pem
    1.5 03/10/07 14:12:05 monty@narttu.mysql.fi +0 -1
    Auto merged

  SSL/cacert.pem
    1.5 03/10/07 14:12:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  acinclude.m4
    1.89 03/10/07 14:12:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-openssl.imp
    1.2 03/10/07 14:12:04 monty@narttu.mysql.fi +0 -0
    Delete: netware/BUILD/openssl.imp

  BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql
    1.3 03/10/07 14:12:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183
    1.68 03/10/07 14:12:04 monty@narttu.mysql.fi +1 -2
    Auto merged

  BUILD/compile-pentium-valgrind-max
    1.5 03/10/07 14:12:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-knetware.imp
    1.2 03/10/07 14:11:56 monty@narttu.mysql.fi +0 -0
    Delete: netware/BUILD/knetware.imp

  BitKeeper/deleted/.del-compile-netware-src
    1.2 03/10/07 14:11:48 monty@narttu.mysql.fi +0 -0
    Delete: netware/BUILD/compile-netware-src

  BitKeeper/deleted/.del-compile-netware-max-debug
    1.2 03/10/07 14:11:33 monty@narttu.mysql.fi +0 -0
    Delete: netware/BUILD/compile-netware-max-debug

  BitKeeper/deleted/.del-compile-netware-max
    1.2 03/10/07 14:11:23 monty@narttu.mysql.fi +0 -0
    Delete: netware/BUILD/compile-netware-max

  BitKeeper/deleted/.del-mysqldump.test
    1.2 03/10/07 14:10:59 monty@narttu.mysql.fi +0 -0
    Delete: mysql-test/t/mysqldump.test

  BitKeeper/deleted/.del-mysqldump.result
    1.2 03/10/07 14:10:43 monty@narttu.mysql.fi +0 -0
    Delete: mysql-test/r/mysqldump.result

  BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql
    1.1.1.2 03/10/07 14:09:35 monty@narttu.mysql.fi +0 -0
    Merge rename: scripts/mysql_fix_privilege_tables.sql -> BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql

  BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183
    1.48.4.2 03/10/07 14:09:35 monty@narttu.mysql.fi +0 -0
    Merge rename: sql/mini_client.cc -> BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183

  BitKeeper/deleted/.del-ins000001.test~2428ee5c9b1bc483
    1.9 03/10/07 14:09:35 monty@narttu.mysql.fi +0 -0
    Merge rename: mysql-test/t/ins000001.test -> BitKeeper/deleted/.del-ins000001.test~2428ee5c9b1bc483

  BitKeeper/etc/logging_ok
    1.233.1.28 03/10/07 14:09:30 monty@narttu.mysql.fi +0 -3
    auto-union

  BitKeeper/etc/ignore
    1.153.1.13 03/10/07 14:09:30 monty@narttu.mysql.fi +1 -1
    auto-union

ChangeSet
  1.1572.2.4 03/10/07 14:04:59 monty@narttu.mysql.fi +1 -0
  Fixed bug in sub select after last merge

  sql/item_subselect.cc
    1.60.14.2 03/10/07 14:04:57 monty@narttu.mysql.fi +4 -0
    Fixed bug in sub select after last merge

ChangeSet
  1.1572.1.2 03/10/07 13:31:44 bell@laptop.sanja.is.com.ua +2 -0
  after merge fix

  sql/item_subselect.h
    1.39.1.2 03/10/07 13:31:33 bell@laptop.sanja.is.com.ua +1 -1
    after merge fix

  sql/item_subselect.cc
    1.60.13.2 03/10/07 13:31:33 bell@laptop.sanja.is.com.ua +4 -5
    after merge fix

ChangeSet
  1.1572.2.3 03/10/07 13:26:56 monty@narttu.mysql.fi +1 -0
  Simple optimization

  sql/sql_select.cc
    1.216.1.41 03/10/07 13:26:54 monty@narttu.mysql.fi +3 -1
    Simple optimization

ChangeSet
  1.1572.2.2 03/10/07 11:24:38 monty@narttu.mysql.fi +3 -0
  merge

  sql/item_subselect.cc
    1.60.14.1 03/10/07 11:24:36 monty@narttu.mysql.fi +4 -5
    merge

  sql/mysqld.cc
    1.356.1.45 03/10/07 11:22:31 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_subselect.h
    1.39.2.1 03/10/07 11:22:31 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1572.2.1 03/10/07 12:05:35 ram@gw.mysql.r18.ru +4 -0
  WL #562: Change format of slow log in 4.1

  sql/unireg.h
    1.28 03/10/07 12:05:14 ram@gw.mysql.r18.ru +2 -1
    WL #562: Change format of slow log in 4.1

  sql/sql_parse.cc
    1.271.24.16 03/10/07 12:05:14 ram@gw.mysql.r18.ru +1 -1
    WL #562: Change format of slow log in 4.1

  sql/mysqld.cc
    1.356.28.1 03/10/07 12:05:14 ram@gw.mysql.r18.ru +20 -8
    WL #562: Change format of slow log in 4.1

  sql/log.cc
    1.108.1.15 03/10/07 12:05:14 ram@gw.mysql.r18.ru +2 -2
    WL #562: Change format of slow log in 4.1

ChangeSet
  1.1572.1.1 03/10/07 08:51:09 bell@laptop.sanja.is.com.ua +3 -0
  merge

  sql/item_subselect.h
    1.39.1.1 03/10/07 08:51:04 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/item_subselect.cc
    1.60.13.1 03/10/07 08:51:04 bell@laptop.sanja.is.com.ua +1 -2
    merge

  sql/sql_yacc.yy
    1.203.74.2 03/10/07 08:30:14 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1573 03/10/07 07:51:14 bell@laptop.sanja.is.com.ua +2 -0
  merge

  sql/item_subselect.h
    1.40 03/10/07 07:51:09 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/item_subselect.cc
    1.60.1.19 03/10/07 07:51:09 bell@laptop.sanja.is.com.ua +1 -0
    merge

ChangeSet
  1.1572 03/10/07 02:20:23 bell@laptop.sanja.is.com.ua +1 -0
  Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1

  sql/mysql_priv.h
    1.186.1.35 03/10/07 02:20:18 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1571 03/10/07 01:31:16 bell@laptop.sanja.is.com.ua +5 -0
  Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1

  sql/sql_class.cc
    1.105.1.21 03/10/07 01:31:09 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.cc
    1.60.1.18 03/10/07 01:31:09 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.104 03/10/07 01:31:09 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.58.1.31 03/10/07 01:31:09 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.1.24 03/10/07 01:31:09 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1570 03/10/07 01:28:15 bell@laptop.sanja.is.com.ua +1 -0
  after merge fix

  sql/item_subselect.cc
    1.60.1.17 03/10/07 01:23:02 bell@laptop.sanja.is.com.ua +3 -3
    after merge fix

ChangeSet
  1.1563.80.16 03/10/07 00:34:43 monty@narttu.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into narttu.mysql.fi:/my/mysql-4.1

  sql/item_subselect.cc
    1.60.10.2 03/10/07 00:34:42 monty@narttu.mysql.fi +0 -0
    Auto merged

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

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

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

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

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

ChangeSet
  1.1563.63.17 03/10/06 22:57:04 monty@mishka.mysql.fi +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mishka.mysql.fi:/home/my/mysql-4.1

  sql/mysql_priv.h
    1.186.1.34 03/10/06 22:57:01 monty@mishka.mysql.fi +0 -0
    Auto merged

  include/mysql.h
    1.96 03/10/06 22:57:01 monty@mishka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1563.63.16 03/10/06 22:56:34 monty@mishka.mysql.fi +11 -0
  Move init_compiled_charsets to own file
  Remove dependency of charsets (in my_init) to get smaller binaries when charsets are not used
  Simple code cleanup

  mysys/charset-def.c
    1.1 03/10/06 22:56:31 monty@mishka.mysql.fi +93 -0

  sql/sql_insert.cc
    1.86.2.19 03/10/06 22:56:31 monty@mishka.mysql.fi +6 -4
    Code cleanup

  scripts/mysql_fix_privilege_tables.sql
    1.4.1.1 03/10/06 22:56:31 monty@mishka.mysql.fi +35 -0
    Add help tables

  scripts/mysql_create_system_tables.sh
    1.7.1.1 03/10/06 22:56:31 monty@mishka.mysql.fi +1 -1
    Remove run time warning

  mysys/my_init.c
    1.31 03/10/06 22:56:31 monty@mishka.mysql.fi +0 -1
    Remove dependency of charsets

  mysys/charset.c
    1.103 03/10/06 22:56:31 monty@mishka.mysql.fi +13 -88
    Move init_compiled_charsets to own file

  mysys/charset-def.c
    1.0 03/10/06 22:56:31 monty@mishka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.1/mysys/charset-def.c

  mysys/Makefile.am
    1.47 03/10/06 22:56:31 monty@mishka.mysql.fi +1 -1
    Move init_compiled_charsets to own file

  libmysql/Makefile.shared
    1.49 03/10/06 22:56:31 monty@mishka.mysql.fi +1 -1
    Move init_compiled_charsets to own file

  include/mysql.h
    1.94.1.1 03/10/06 22:56:31 monty@mishka.mysql.fi +1 -1
    Remove compiler warning	

  include/my_sys.h
    1.100.1.8 03/10/06 22:56:31 monty@mishka.mysql.fi +2 -1
    Move init_compiled_charsets to own file

  client/mysql.cc
    1.121.1.23 03/10/06 22:56:31 monty@mishka.mysql.fi +12 -15
    Fixed indentation

ChangeSet
  1.1563.88.1 03/10/06 22:35:05 bell@laptop.sanja.is.com.ua +32 -0
  fixed error names

  sql/sql_class.cc
    1.105.6.1 03/10/06 22:33:08 bell@laptop.sanja.is.com.ua +1 -1
    fixed error names

  sql/share/ukrainian/errmsg.txt
    1.27.1.23 03/10/06 22:33:08 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/swedish/errmsg.txt
    1.64.1.26 03/10/06 22:33:08 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/spanish/errmsg.txt
    1.64.1.27 03/10/06 22:33:08 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/slovak/errmsg.txt
    1.64.1.26 03/10/06 22:33:08 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/serbian/errmsg.txt
    1.18.1.24 03/10/06 22:33:08 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/russian/errmsg.txt
    1.61.1.24 03/10/06 22:33:08 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/romanian/errmsg.txt
    1.62.1.26 03/10/06 22:33:08 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/portuguese/errmsg.txt
    1.64.1.25 03/10/06 22:33:08 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/polish/errmsg.txt
    1.63.1.26 03/10/06 22:33:08 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/norwegian/errmsg.txt
    1.63.1.26 03/10/06 22:33:07 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.26 03/10/06 22:33:07 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/korean/errmsg.txt
    1.63.1.25 03/10/06 22:33:07 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/japanese/errmsg.txt
    1.63.1.25 03/10/06 22:33:07 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/italian/errmsg.txt
    1.70.1.26 03/10/06 22:33:07 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/hungarian/errmsg.txt
    1.65.1.25 03/10/06 22:33:07 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/greek/errmsg.txt
    1.64.1.25 03/10/06 22:33:07 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/german/errmsg.txt
    1.64.1.24 03/10/06 22:33:07 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/french/errmsg.txt
    1.63.1.26 03/10/06 22:33:07 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/estonian/errmsg.txt
    1.64.1.25 03/10/06 22:33:07 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/english/errmsg.txt
    1.70.1.29 03/10/06 22:33:07 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/dutch/errmsg.txt
    1.66.1.26 03/10/06 22:33:07 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/danish/errmsg.txt
    1.62.1.26 03/10/06 22:33:07 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/share/czech/errmsg.txt
    1.64.1.26 03/10/06 22:33:07 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as it was suggested by Peter Gulutzan

  sql/item_subselect.cc
    1.60.12.1 03/10/06 22:33:07 bell@laptop.sanja.is.com.ua +3 -3
    fixed error names

  sql/item_row.cc
    1.17 03/10/06 22:33:07 bell@laptop.sanja.is.com.ua +2 -2
    fixed error names

  sql/item_cmpfunc.cc
    1.99.3.6 03/10/06 22:33:07 bell@laptop.sanja.is.com.ua +5 -5
    fixed error names

  sql/item.cc
    1.58.23.1 03/10/06 22:33:07 bell@laptop.sanja.is.com.ua +3 -3
    fixed error names

  mysql-test/r/subselect.result
    1.67.27.3 03/10/06 22:33:07 bell@laptop.sanja.is.com.ua +7 -7
    fixed error message as it was suggested by Peter Gulutzan

  mysql-test/r/row.result
    1.15 03/10/06 22:33:06 bell@laptop.sanja.is.com.ua +7 -7
    fixed error message as it was suggested by Peter Gulutzan

  include/sql_state.h
    1.4 03/10/06 22:33:06 bell@laptop.sanja.is.com.ua +2 -2
    fixed error names

  include/mysqld_error.h
    1.61.1.17 03/10/06 22:33:06 bell@laptop.sanja.is.com.ua +2 -2
    fixed error names

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

ChangeSet
  1.1569 03/10/06 20:55:06 bell@laptop.sanja.is.com.ua +19 -0
  Merge

  mysql-test/t/subselect.test
    1.58.1.24 03/10/06 20:55:02 bell@laptop.sanja.is.com.ua +0 -0
    SCCS merged

  mysql-test/r/subselect.result
    1.67.1.23 03/10/06 20:55:02 bell@laptop.sanja.is.com.ua +0 -0
    SCCS merged

  sql/sql_yacc.yy
    1.203.75.3 03/10/06 20:52:43 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_union.cc
    1.74.1.12 03/10/06 20:52:43 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_derived.cc
    1.43.1.10 03/10/06 20:52:43 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_class.h
    1.146.1.38 03/10/06 20:52:42 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_class.cc
    1.105.1.20 03/10/06 20:52:42 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_base.cc
    1.145.1.14 03/10/06 20:52:42 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.33.3 03/10/06 20:52:42 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item_sum.h
    1.46 03/10/06 20:52:42 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item_sum.cc
    1.87 03/10/06 20:52:42 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.h
    1.39 03/10/06 20:52:42 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.cc
    1.60.1.16 03/10/06 20:52:42 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.64 03/10/06 20:52:42 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.103 03/10/06 20:52:42 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.56.1.36 03/10/06 20:52:41 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.58.1.30 03/10/06 20:52:41 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/union.test
    1.42 03/10/06 20:52:41 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/union.result
    1.44 03/10/06 20:52:41 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

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

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

ChangeSet
  1.1563.80.15 03/10/06 20:23:14 monty@narttu.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into narttu.mysql.fi:/my/mysql-4.1

  sql/mysqld.cc
    1.356.1.44 03/10/06 20:23:13 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1563.80.14 03/10/06 18:01:11 hf@deer.(none) +1 -0
  Fix for #1447

  libmysqld/lib_sql.cc
    1.75.1.11 03/10/06 18:01:09 hf@deer.(none) +5 -0
    Check for unfetched rows added

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

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

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

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

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

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

ChangeSet
  1.1563.80.13 03/10/06 17:06:05 hf@deer.(none) +1 -0
  Fix for #1488

  libmysqld/lib_sql.cc
    1.75.1.10 03/10/06 17:06:03 hf@deer.(none) +3 -0
    net->sqlstate should be initialized here

ChangeSet
  1.1563.87.1 03/10/06 16:32:38 hf@deer.(none) +3 -0
  Fix for #1487

  sql/sql_prepare.cc
    1.34.1.18 03/10/06 16:32:36 hf@deer.(none) +10 -1
    query arguments retrieval added for embedded case
    code not necessary in embedded server #ifdefed

  sql/sql_class.h
    1.146.1.37 03/10/06 16:32:36 hf@deer.(none) +2 -0
    members to store query arguments

  libmysqld/lib_sql.cc
    1.75.1.9 03/10/06 16:32:36 hf@deer.(none) +4 -1
    arg_parameters now are stored in these THD members

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

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

ChangeSet
  1.1563.80.11 03/10/06 13:16:56 bell@laptop.sanja.is.com.ua +3 -0
  fix error messages
  fix derived inside subqueries

  sql/sql_yacc.yy
    1.203.75.2 03/10/06 13:16:49 bell@laptop.sanja.is.com.ua +2 -1
    allow derived inside subselects

  mysql-test/t/derived.test
    1.27 03/10/06 13:16:49 bell@laptop.sanja.is.com.ua +2 -2
    code changing

  mysql-test/r/subselect.result
    1.67.27.2 03/10/06 13:16:49 bell@laptop.sanja.is.com.ua +14 -14
    error tex changes whi i forgot to commit

ChangeSet
  1.1563.62.6 03/10/06 12:08:28 bell@laptop.sanja.is.com.ua +2 -0
  Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
  into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-udf-5.0

  sql/sql_yacc.yy
    1.241 03/10/06 12:08:18 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.300 03/10/06 12:08:17 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1563.62.5 03/10/06 11:13:25 bell@laptop.sanja.is.com.ua +4 -0
  after review patch (SCRUM)

  tests/udf_test
    1.4 03/10/06 11:11:03 bell@laptop.sanja.is.com.ua +1 -1
    added test of AS

  tests/udf_test.res
    1.4 03/10/06 11:11:03 bell@laptop.sanja.is.com.ua +6 -6
    added test of AS

  sql/udf_example.cc
    1.16 03/10/06 11:11:02 bell@laptop.sanja.is.com.ua +0 -3
    not used function

  sql/sql_parse.cc
    1.299 03/10/06 11:11:02 bell@laptop.sanja.is.com.ua +0 -2
    already fixed in right way

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

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

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

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

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

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

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

ChangeSet
  1.1563.86.1 03/10/06 12:09:20 hf@deer.(none) +2 -0
  Fix for #1470

  sql/sql_prepare.cc
    1.34.1.17 03/10/06 12:09:17 hf@deer.(none) +1 -0
    set success mark here

  libmysqld/lib_sql.cc
    1.75.1.8 03/10/06 12:09:17 hf@deer.(none) +2 -0
    check for error

ChangeSet
  1.1563.80.8 03/10/05 21:13:54 bell@laptop.sanja.is.com.ua +18 -0
  Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-errs-4.1

  sql/share/spanish/errmsg.txt
    1.64.1.26 03/10/05 21:13:47 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/share/slovak/errmsg.txt
    1.64.1.25 03/10/05 21:13:47 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/share/serbian/errmsg.txt
    1.18.1.23 03/10/05 21:13:47 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/share/romanian/errmsg.txt
    1.62.1.25 03/10/05 21:13:47 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.63.1.25 03/10/05 21:13:47 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.25 03/10/05 21:13:47 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/share/norwegian/errmsg.txt
    1.63.1.25 03/10/05 21:13:46 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/share/korean/errmsg.txt
    1.63.1.24 03/10/05 21:13:46 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/share/japanese/errmsg.txt
    1.63.1.24 03/10/05 21:13:46 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/share/italian/errmsg.txt
    1.70.1.25 03/10/05 21:13:46 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/share/hungarian/errmsg.txt
    1.65.1.24 03/10/05 21:13:46 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/share/greek/errmsg.txt
    1.64.1.24 03/10/05 21:13:46 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/share/french/errmsg.txt
    1.63.1.25 03/10/05 21:13:46 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/share/estonian/errmsg.txt
    1.64.1.24 03/10/05 21:13:46 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.70.1.28 03/10/05 21:13:46 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/share/dutch/errmsg.txt
    1.66.1.25 03/10/05 21:13:46 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/share/danish/errmsg.txt
    1.62.1.25 03/10/05 21:13:45 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/share/czech/errmsg.txt
    1.64.1.25 03/10/05 21:13:45 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1563.85.1 03/10/05 21:09:50 bell@laptop.sanja.is.com.ua +3 -0
  prohibited using derived tables in UPDATE command (BUG#1477)
  fixed incorrect table name in test

  sql/sql_yacc.yy
    1.203.75.1 03/10/05 21:09:19 bell@laptop.sanja.is.com.ua +6 -0
    prohibited using derived tables in UPDATE command

  mysql-test/t/derived.test
    1.26 03/10/05 21:09:19 bell@laptop.sanja.is.com.ua +17 -4
    fixed incorrect table name in test
    new test of derived table

  mysql-test/r/derived.result
    1.28 03/10/05 21:09:19 bell@laptop.sanja.is.com.ua +13 -4
    fixed incorrect table name in test
    new test of derived table

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

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

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

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

ChangeSet
  1.1563.80.7 03/10/04 19:28:50 hf@deer.(none) +1 -0
  Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into deer.(none):/home/hf/work/mysql-4.1.stmt

  sql/sql_parse.cc
    1.271.24.15 03/10/04 19:28:47 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1563.75.3 03/10/04 19:28:08 hf@deer.(none) +6 -0
  Fix for bugs #1437, #1446

  sql/sql_parse.cc
    1.271.32.1 03/10/04 19:28:06 hf@deer.(none) +7 -3
    storage of result of COM_STATISTIC changed in embedded library

  sql-common/client.c
    1.33 03/10/04 19:28:06 hf@deer.(none) +2 -1
    cli_read_statistic added to the table

  libmysqld/lib_sql.cc
    1.75.1.7 03/10/04 19:28:06 hf@deer.(none) +11 -1
    emb_read_statistic implemented
    server_version initialized

  libmysql/libmysql.c
    1.156.1.32 03/10/04 19:28:06 hf@deer.(none) +11 -6
    read_statistic and mysql_stat code changes

  libmysql/client_settings.h
    1.13 03/10/04 19:28:06 hf@deer.(none) +1 -0
    interface for cli_read_statistic added

  include/mysql.h
    1.95 03/10/04 19:28:06 hf@deer.(none) +1 -0
    read_statistic added to virtual methods

ChangeSet
  1.1563.82.4 03/10/04 13:46:23 bell@laptop.sanja.is.com.ua +18 -0
  fixed error message as suggested by Peter Gulutzan

  sql/share/spanish/errmsg.txt
    1.64.14.1 03/10/04 13:44:59 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as suggested by Peter Gulutzan

  sql/share/slovak/errmsg.txt
    1.64.12.1 03/10/04 13:44:59 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as suggested by Peter Gulutzan

  sql/share/serbian/errmsg.txt
    1.18.10.1 03/10/04 13:44:59 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as suggested by Peter Gulutzan

  sql/share/romanian/errmsg.txt
    1.62.12.1 03/10/04 13:44:59 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as suggested by Peter Gulutzan

  sql/share/polish/errmsg.txt
    1.63.11.1 03/10/04 13:44:59 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as suggested by Peter Gulutzan

  sql/share/norwegian/errmsg.txt
    1.63.12.1 03/10/04 13:44:58 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as suggested by Peter Gulutzan

  sql/share/norwegian-ny/errmsg.txt
    1.63.12.1 03/10/04 13:44:58 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as suggested by Peter Gulutzan

  sql/share/korean/errmsg.txt
    1.63.11.1 03/10/04 13:44:58 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as suggested by Peter Gulutzan

  sql/share/japanese/errmsg.txt
    1.63.11.1 03/10/04 13:44:58 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as suggested by Peter Gulutzan

  sql/share/italian/errmsg.txt
    1.70.12.1 03/10/04 13:44:58 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as suggested by Peter Gulutzan

  sql/share/hungarian/errmsg.txt
    1.65.11.1 03/10/04 13:44:58 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as suggested by Peter Gulutzan

  sql/share/greek/errmsg.txt
    1.64.11.1 03/10/04 13:44:58 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as suggested by Peter Gulutzan

  sql/share/french/errmsg.txt
    1.63.12.1 03/10/04 13:44:58 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as suggested by Peter Gulutzan

  sql/share/estonian/errmsg.txt
    1.64.11.1 03/10/04 13:44:58 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as suggested by Peter Gulutzan

  sql/share/english/errmsg.txt
    1.70.14.1 03/10/04 13:44:58 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as suggested by Peter Gulutzan

  sql/share/dutch/errmsg.txt
    1.66.12.1 03/10/04 13:44:58 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as suggested by Peter Gulutzan

  sql/share/danish/errmsg.txt
    1.62.12.1 03/10/04 13:44:58 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as suggested by Peter Gulutzan

  sql/share/czech/errmsg.txt
    1.64.12.1 03/10/04 13:44:58 bell@laptop.sanja.is.com.ua +1 -1
    fixed error message as suggested by Peter Gulutzan

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

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

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

ChangeSet
  1.1563.83.1 03/10/03 17:22:17 vva@eagle.mysql.r18.ru +1 -0
  fixed bug with Item_sum_min/Item_sum_max from test func_gconcat.test

  sql/item_sum.h
    1.44.1.7 03/10/03 17:22:07 vva@eagle.mysql.r18.ru +1 -1
    fixed bug with Item_sum_min/Item_sum_max from test func_gconcat.test

ChangeSet
  1.1563.80.5 03/10/03 22:14:23 guilhem@gbichot2 +2 -0
  editing comments.

  sql/log_event.cc
    1.113.1.20 03/10/03 22:14:12 guilhem@mysql.com +12 -19
    removed irrelevant comment, added another one.

  mysql-test/t/rpl_relayrotate.test
    1.6 03/10/03 22:14:11 guilhem@mysql.com +2 -0
    a comment

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

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

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

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

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

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

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

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

ChangeSet
  1.1563.80.4 03/10/03 20:07:08 guilhem@gbichot2 +4 -0
  Fix for a rpl_relayrotate failure.
  Changed Rotate_log_event::exec_event() to not increment positions when the
  event is seen in the middle of a transaction.

  sql/log_event.cc
    1.113.1.19 03/10/03 20:07:02 guilhem@mysql.com +26 -25
    Fix for a rpl_relayrotate failure. The problem was that Rotate_log_event::exec_event()
    believed that the relay log was corrupted. Fixed it by moving the test for
    corruption to Start_log_event::exec_event(). 
    Changed Rotate_log_event::exec_event() to not increment positions when the
    event is seen in the middle of a transaction (that was an old bug found by
    chance :)

  mysql-test/t/rpl_relayrotate.test
    1.5 03/10/03 20:07:01 guilhem@mysql.com +1 -4
    removed timeout which was too short for Valgrind

  mysql-test/r/rpl_until.result
    1.5 03/10/03 20:07:01 guilhem@mysql.com +1 -1
    updated error message

  mysql-test/r/rpl_relayrotate.result
    1.3 03/10/03 20:07:01 guilhem@mysql.com +3 -3
    remove timeout which was too short for Valgrind

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

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

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

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

ChangeSet
  1.1563.77.4 03/10/03 17:38:12 pem@mysql.telia.com +30 -0
  Check that a FUNCTION contains RETURN and that we actually get a return value.

  sql/sql_yacc.yy
    1.239.1.2 03/10/03 17:38:09 pem@mysql.com +1 -0
    Check that a FUNCTION contains RETURN.

  sql/sql_parse.cc
    1.297.1.1 03/10/03 17:38:09 pem@mysql.com +7 -0
    Check that a FUNCTION contains RETURN.

  sql/sp_head.h
    1.23 03/10/03 17:38:09 pem@mysql.com +1 -0
    Check that a FUNCTION contains RETURN.

  sql/sp_head.cc
    1.41 03/10/03 17:38:09 pem@mysql.com +14 -2
    Check that a FUNCTION contains RETURN and that we actually get a return value.

  sql/share/ukrainian/errmsg.txt
    1.43 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/swedish/errmsg.txt
    1.81 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/spanish/errmsg.txt
    1.80 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/slovak/errmsg.txt
    1.80 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/serbian/errmsg.txt
    1.34 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/russian/errmsg.txt
    1.78 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/romanian/errmsg.txt
    1.77 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/portuguese/errmsg.txt
    1.80 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/polish/errmsg.txt
    1.80 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/norwegian/errmsg.txt
    1.79 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/norwegian-ny/errmsg.txt
    1.79 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/korean/errmsg.txt
    1.79 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/japanese/errmsg.txt
    1.79 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/italian/errmsg.txt
    1.86 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/hungarian/errmsg.txt
    1.81 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/greek/errmsg.txt
    1.80 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/german/errmsg.txt
    1.81 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/french/errmsg.txt
    1.79 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/estonian/errmsg.txt
    1.80 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/english/errmsg.txt
    1.87 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/dutch/errmsg.txt
    1.82 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/danish/errmsg.txt
    1.78 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  sql/share/czech/errmsg.txt
    1.79 03/10/03 17:38:09 pem@mysql.com +2 -0
    New error codes/messages for missing RETURNs in FUNCTIONs.

  mysql-test/t/sp-error.test
    1.13 03/10/03 17:38:09 pem@mysql.com +23 -0
    New error tests for missing RETURNs in FUNCTIONs.

  mysql-test/r/sp-error.result
    1.12 03/10/03 17:38:09 pem@mysql.com +17 -0
    New error tests for missing RETURNs in FUNCTIONs.

  include/mysqld_error.h
    1.76 03/10/03 17:38:09 pem@mysql.com +3 -1
    New error codes/messages for missing RETURNs in FUNCTIONs.

ChangeSet
  1.1563.82.2 03/10/03 17:09:54 bar@bar.mysql.r18.ru +2 -0
  sql_cache.cc, mysql_priv.h:
    Query cache now takes in account character_set_results and collation_connection

  sql/sql_cache.cc
    1.46.1.10 03/10/03 17:08:35 bar@bar.mysql.r18.ru +7 -3
    Query cache now takes in account character_set_results and collation_connection

  sql/mysql_priv.h
    1.186.33.2 03/10/03 17:08:10 bar@bar.mysql.r18.ru +3 -1
    Query cache now takes in account character_set_results and collation_connection

ChangeSet
  1.1563.77.3 03/10/03 12:39:12 pem@mysql.telia.com +4 -0
  Fixed BUG#822: Copying and clearing some things in thd/lex when
  executing sub-statements (selects) prevents crashes intermittent
  crashes.
  Also fixed bug in sql_yacc.yy (generated a hpop instruction when
  not needed).

  sql/sql_yacc.yy
    1.239.1.1 03/10/03 12:39:10 pem@mysql.com +5 -3
    Only generate hpop instruction when we actually have handlers.

  sql/sp_head.cc
    1.40 03/10/03 12:39:10 pem@mysql.com +25 -0
    Fixed BUG#822; needed to copy and clear some stuff when calling sub-statements.

  mysql-test/t/sp.test
    1.23 03/10/03 12:39:10 pem@mysql.com +17 -0
    Test-case for BUG#822.

  mysql-test/r/sp.result
    1.22 03/10/03 12:39:10 pem@mysql.com +17 -0
    Test-case for BUG#822.

ChangeSet
  1.1563.63.15 03/10/03 01:48:32 monty@mishka.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mishka.mysql.fi:/home/my/mysql-4.1

ChangeSet
  1.1563.82.1 03/10/02 19:08:48 greg@mysql.com +6 -0
  Changes in NetWare directory from Novell, pre-4.1.1

  netware/static_init_db.sql
    1.1 03/10/02 19:08:34 greg@mysql.com +34 -0

  netware/static_init_db.sql
    1.0 03/10/02 19:08:34 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/4.1/netware/static_init_db.sql

  netware/BUILD/openssl.imp
    1.1 03/10/02 19:08:33 greg@mysql.com +9 -0

  netware/BUILD/knetware.imp
    1.1 03/10/02 19:08:33 greg@mysql.com +2 -0

  netware/BUILD/compile-netware-src
    1.1 03/10/02 19:08:33 greg@mysql.com +36 -0

  netware/BUILD/compile-netware-max
    1.1 03/10/02 19:08:33 greg@mysql.com +23 -0

  netware/BUILD/compile-netware-max-debug
    1.1 03/10/02 19:08:33 greg@mysql.com +23 -0

  netware/BUILD/openssl.imp
    1.0 03/10/02 19:08:33 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/4.1/netware/BUILD/openssl.imp

  netware/BUILD/knetware.imp
    1.0 03/10/02 19:08:33 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/4.1/netware/BUILD/knetware.imp

  netware/BUILD/compile-netware-src
    1.0 03/10/02 19:08:33 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/4.1/netware/BUILD/compile-netware-src

  netware/BUILD/compile-netware-max
    1.0 03/10/02 19:08:33 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/4.1/netware/BUILD/compile-netware-max

  netware/BUILD/compile-netware-max-debug
    1.0 03/10/02 19:08:33 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/4.1/netware/BUILD/compile-netware-max-debug

  sql/mysql_priv.h
    1.186.1.33 03/10/03 01:48:31 monty@mishka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1563.48.15 03/10/02 23:41:10 serg@serg.mylan +2 -0
  minor error messages cleanup

  sql/sql_update.cc
    1.83.5.1 03/10/02 23:41:07 serg@serg.mylan +1 -2
    minor error messages cleanup

  sql/sql_acl.cc
    1.74.5.1 03/10/02 23:41:07 serg@serg.mylan +5 -0
    minor error messages cleanup

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

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

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

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

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

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

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

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

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

ChangeSet
  1.1563.81.1 03/10/02 22:19:41 bell@laptop.sanja.is.com.ua +3 -0
  thd pointer storing moved to fix_fields() (WL#1254) (SCRUM)

  sql/sql_yacc.yy
    1.203.74.1 03/10/02 22:18:58 bell@laptop.sanja.is.com.ua +11 -13
    thd pointer storing moved to fix_fields()

  sql/item_subselect.h
    1.34.3.1 03/10/02 22:18:58 bell@laptop.sanja.is.com.ua +20 -13
    thd pointer storing moved to fix_fields()

  sql/item_subselect.cc
    1.60.11.1 03/10/02 22:18:58 bell@laptop.sanja.is.com.ua +29 -30
    thd pointer storing moved to fix_fields()

ChangeSet
  1.1563.48.14 03/10/02 21:13:51 serg@serg.mylan +1 -0
  WL#1172 - no row scan on trunc* operator

  myisam/ft_boolean_search.c
    1.61 03/10/02 21:13:47 serg@serg.mylan +4 -0
    WL#1172 - no row scan on trunc* operator

ChangeSet
  1.1563.48.13 03/10/02 20:22:29 serg@serg.mylan +8 -0
  ft1->ft2 auto-conversion on INSERT (WL#725)

  mysql-test/t/fulltext2.test
    1.7 03/10/02 20:22:25 serg@serg.mylan +79 -1
    ft1->ft2 auto-conversion on INSERT (WL#725)

  mysql-test/r/fulltext2.result
    1.6 03/10/02 20:22:25 serg@serg.mylan +103 -1
    ft1->ft2 auto-conversion on INSERT (WL#725)

  myisam/myisamdef.h
    1.59.3.2 03/10/02 20:22:25 serg@serg.mylan +5 -1
    ft1->ft2 auto-conversion on INSERT (WL#725)

  myisam/mi_write.c
    1.34.1.2 03/10/02 20:22:25 serg@serg.mylan +75 -10
    ft1->ft2 auto-conversion on INSERT (WL#725)

  myisam/mi_open.c
    1.71 03/10/02 20:22:24 serg@serg.mylan +4 -3
    ft1->ft2 auto-conversion on INSERT (WL#725)

  myisam/mi_delete.c
    1.22.1.1 03/10/02 20:22:24 serg@serg.mylan +13 -5
    ft1->ft2 auto-conversion on INSERT (WL#725)

  myisam/fulltext.h
    1.9 03/10/02 20:22:24 serg@serg.mylan +2 -0
    ft1->ft2 auto-conversion on INSERT (WL#725)

  myisam/ft_update.c
    1.29 03/10/02 20:22:24 serg@serg.mylan +50 -9
    ft1->ft2 auto-conversion on INSERT (WL#725)

ChangeSet
  1.1563.80.3 03/10/02 16:39:48 guilhem@gbichot2 +21 -0
  minor edit (changed tense) as suggested by our docs team.
  Portuguese and Swedish are not affected (they were already translated).

  sql/share/ukrainian/errmsg.txt
    1.27.1.22 03/10/02 16:39:45 guilhem@mysql.com +2 -2
    changed tense

  sql/share/spanish/errmsg.txt
    1.64.1.25 03/10/02 16:39:45 guilhem@mysql.com +2 -2
    changed tense

  sql/share/slovak/errmsg.txt
    1.64.1.24 03/10/02 16:39:45 guilhem@mysql.com +2 -2
    changed tense

  sql/share/serbian/errmsg.txt
    1.18.1.22 03/10/02 16:39:45 guilhem@mysql.com +2 -2
    changed tense

  sql/share/russian/errmsg.txt
    1.61.1.23 03/10/02 16:39:45 guilhem@mysql.com +2 -2
    changed tense

  sql/share/romanian/errmsg.txt
    1.62.1.24 03/10/02 16:39:45 guilhem@mysql.com +2 -2
    changed tense

  sql/share/polish/errmsg.txt
    1.63.1.24 03/10/02 16:39:45 guilhem@mysql.com +2 -2
    changed tense

  sql/share/norwegian/errmsg.txt
    1.63.1.24 03/10/02 16:39:45 guilhem@mysql.com +2 -2
    changed tense

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.24 03/10/02 16:39:45 guilhem@mysql.com +2 -2
    changed tense

  sql/share/korean/errmsg.txt
    1.63.1.23 03/10/02 16:39:45 guilhem@mysql.com +2 -2
    changed tense

  sql/share/japanese/errmsg.txt
    1.63.1.23 03/10/02 16:39:44 guilhem@mysql.com +2 -2
    changed tense

  sql/share/italian/errmsg.txt
    1.70.1.24 03/10/02 16:39:44 guilhem@mysql.com +2 -2
    changed tense

  sql/share/hungarian/errmsg.txt
    1.65.1.23 03/10/02 16:39:44 guilhem@mysql.com +2 -2
    changed tense

  sql/share/greek/errmsg.txt
    1.64.1.23 03/10/02 16:39:44 guilhem@mysql.com +2 -2
    changed tense

  sql/share/german/errmsg.txt
    1.64.1.23 03/10/02 16:39:44 guilhem@mysql.com +2 -2
    changed tense

  sql/share/french/errmsg.txt
    1.63.1.24 03/10/02 16:39:44 guilhem@mysql.com +2 -2
    changed tense

  sql/share/estonian/errmsg.txt
    1.64.1.23 03/10/02 16:39:44 guilhem@mysql.com +2 -2
    changed tense

  sql/share/english/errmsg.txt
    1.70.1.27 03/10/02 16:39:44 guilhem@mysql.com +2 -2
    changed tense

  sql/share/dutch/errmsg.txt
    1.66.1.24 03/10/02 16:39:44 guilhem@mysql.com +2 -2
    changed tense

  sql/share/danish/errmsg.txt
    1.62.1.24 03/10/02 16:39:44 guilhem@mysql.com +2 -2
    changed tense

  sql/share/czech/errmsg.txt
    1.64.1.24 03/10/02 16:39:44 guilhem@mysql.com +2 -2
    changed tense

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

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

ChangeSet
  1.1563.78.2 03/10/02 16:19:33 guilhem@gbichot2 +3 -0
  Had mangled the order of if()s in a previous changeset (1.1596) (not pushed),
  correcting it now. Thanks Dmitri for spotting this.

  sql/item_func.cc
    1.124.1.29 03/10/02 16:19:26 guilhem@mysql.com +10 -12
    Had mangled the order of if()s in a previous changeset (1.1596) (not pushed),
    correcting it now.

  mysql-test/t/user_var.test
    1.8 03/10/02 16:19:26 guilhem@mysql.com +3 -0
    a simple test

  mysql-test/r/user_var.result
    1.12 03/10/02 16:19:25 guilhem@mysql.com +4 -0
    result update

ChangeSet
  1.1563.80.1 03/10/02 12:18:34 bell@laptop.sanja.is.com.ua +3 -0
  Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-qc_struct-4.1

  sql/sql_parse.cc
    1.271.24.14 03/10/02 12:18:26 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_cache.cc
    1.46.1.9 03/10/02 12:18:26 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.33.1 03/10/02 12:18:26 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1563.79.1 03/10/02 12:02:05 bell@laptop.sanja.is.com.ua +3 -0
  Structure for storing parameters of query in query cache (asked by Bar)

  sql/sql_parse.cc
    1.271.31.1 03/10/02 12:01:40 bell@laptop.sanja.is.com.ua +2 -2
    Structure for storing parameters of query in query cache

  sql/sql_cache.cc
    1.46.5.1 03/10/02 12:01:40 bell@laptop.sanja.is.com.ua +36 -35
    Structure for storing parameters of query in query cache

  sql/mysql_priv.h
    1.186.32.1 03/10/02 12:01:40 bell@laptop.sanja.is.com.ua +8 -0
    Structure for storing parameters of query in query cache

ChangeSet
  1.1563.78.1 03/10/02 10:31:37 guilhem@gbichot2 +3 -0
  fix for BUG#1331: "Unexistent user variable is not replicated".
  When an update query is to be written to the binlog, and it reads unset
  user variables (example: INSERT INTO t VALUEs(@a) where @a does not exist),
  we create the variable like if it had been set with SET before, and we loop
  (i.e. we redo the steps of logging, now that the variable exists).

  sql/item_func.cc
    1.124.1.28 03/10/02 10:31:30 guilhem@mysql.com +98 -39
    When an update query is to be written to the binlog, and it reads unset
    user variables (example: INSERT INTO t VALUEs(@a) where @a does not exist),
    we create the variable like if it had been set with SET before, and we loop
    (i.e. we redo the steps of logging, now that the variable exists).

  mysql-test/t/rpl_user_variables.test
    1.4 03/10/02 10:31:30 guilhem@mysql.com +4 -1
    test to see if unset user variables are written to the binlog

  mysql-test/r/rpl_user_variables.result
    1.5 03/10/02 10:31:30 guilhem@mysql.com +42 -8
    result update.

ChangeSet
  1.1563.74.6 03/10/01 23:37:05 igor@rurik.mysql.com +7 -0
  Many files:
    Fix after manual merge

  sql/sql_parse.cc
    1.271.1.19 03/10/01 23:34:20 igor@rurik.mysql.com +4 -2
    Fix after manual merge

  sql/sql_base.cc
    1.145.11.3 03/10/01 23:34:07 igor@rurik.mysql.com +1 -1
    Fix after manual merge

  sql/set_var.cc
    1.34.1.34 03/10/01 23:33:44 igor@rurik.mysql.com +2 -1
    Fix after manual merge

  sql/opt_range.cc
    1.96 03/10/01 23:33:23 igor@rurik.mysql.com +7 -1
    Fix after manual merge

  sql/mysql_priv.h
    1.186.31.2 03/10/01 23:32:59 igor@rurik.mysql.com +1 -2
    Fix after manual merge

  sql/handler.cc
    1.101 03/10/01 23:32:34 igor@rurik.mysql.com +2 -1
    Fix after manual merge

  mysql-test/r/range.result
    1.15 03/10/01 23:31:24 igor@rurik.mysql.com +11 -11
    Fix after manual merge

ChangeSet
  1.1563.74.5 03/10/01 20:20:17 igor@rurik.mysql.com +7 -0
  Manual merge after improving concurrency for key cache reassignment

  sql/set_var.h
    1.34 03/10/01 20:20:15 igor@rurik.mysql.com +0 -0
    Manual merge after improving concurrency for key cache reassignment

  sql/opt_range.cc
    1.95 03/10/01 20:20:15 igor@rurik.mysql.com +0 -6
    Manual merge after improving concurrency for key cache reassignment

  sql/mysql_priv.h
    1.186.31.1 03/10/01 20:20:15 igor@rurik.mysql.com +0 -0
    Manual merge after improving concurrency for key cache reassignment

  sql/handler.h
    1.86 03/10/01 20:20:15 igor@rurik.mysql.com +0 -0
    Manual merge after improving concurrency for key cache reassignment

  sql/handler.cc
    1.100 03/10/01 20:20:14 igor@rurik.mysql.com +18 -21
    Manual merge after improving concurrency for key cache reassignment

  mysql-test/t/range.test
    1.8 03/10/01 20:20:14 igor@rurik.mysql.com +39 -39
    Manual merge after improving concurrency for key cache reassignment

  mysql-test/r/range.result
    1.14 03/10/01 20:20:14 igor@rurik.mysql.com +0 -0
    Manual merge after improving concurrency for key cache reassignment

ChangeSet
  1.1563.74.4 03/10/01 20:16:36 igor@rurik.mysql.com +23 -0
  Manual merge after improving concurrency for key cache reassignment

  include/my_sys.h
    1.108 03/10/01 20:16:33 igor@rurik.mysql.com +2 -2
    Manual merge after improving concurrency for key cache reassignment

  sql/sql_yacc.yy
    1.203.1.66 03/10/01 18:21:34 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_test.cc
    1.23 03/10/01 18:21:34 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_table.cc
    1.157.2.15 03/10/01 18:21:34 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.1.18 03/10/01 18:21:34 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.1.32 03/10/01 18:21:34 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_lex.cc
    1.90 03/10/01 18:21:34 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_base.cc
    1.145.11.2 03/10/01 18:21:34 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/set_var.cc
    1.34.1.33 03/10/01 18:21:34 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.27.3 03/10/01 18:21:34 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.61.1.3 03/10/01 18:21:33 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/ha_myisam.h
    1.49 03/10/01 18:21:33 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.115.1.9 03/10/01 18:21:33 igor@rurik.mysql.com +0 -0
    Auto merged

  mysys/mf_keycache.c
    1.31 03/10/01 18:21:33 igor@rurik.mysql.com +0 -0
    Auto merged

  mysql-test/r/func_group.result
    1.19 03/10/01 18:21:33 igor@rurik.mysql.com +0 -0
    Auto merged

  myisam/myisamlog.c
    1.23 03/10/01 18:21:33 igor@rurik.mysql.com +0 -0
    Auto merged

  myisam/myisamchk.c
    1.92.1.7 03/10/01 18:21:33 igor@rurik.mysql.com +0 -0
    Auto merged

  myisam/mi_write.c
    1.36 03/10/01 18:21:33 igor@rurik.mysql.com +0 -0
    Auto merged

  myisam/mi_search.c
    1.40 03/10/01 18:21:33 igor@rurik.mysql.com +0 -0
    Auto merged

  myisam/mi_locking.c
    1.29 03/10/01 18:21:33 igor@rurik.mysql.com +0 -0
    Auto merged

  myisam/mi_check.c
    1.105.1.7 03/10/01 18:21:33 igor@rurik.mysql.com +0 -0
    Auto merged

  isam/isamchk.c
    1.25 03/10/01 18:21:33 igor@rurik.mysql.com +0 -0
    Auto merged

  include/myisam.h
    1.53 03/10/01 18:21:33 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1563.2.21 03/10/01 18:20:07 igor@rurik.mysql.com +7 -0
  Many files:
    Improved concurrency for key cache reassignment

  sql/sql_table.cc
    1.157.2.14 03/10/01 18:17:19 igor@rurik.mysql.com +18 -2
    Improved concurrency for key cache reassignment

  sql/ha_myisam.cc
    1.115.1.8 03/10/01 18:16:25 igor@rurik.mysql.com +1 -1
    Improved concurrency for key cache reassignment

  mysys/mf_keycache.c
    1.30 03/10/01 18:15:41 igor@rurik.mysql.com +12 -4
    Improved concurrency for key cache reassignment

  myisam/mi_locking.c
    1.28 03/10/01 18:15:00 igor@rurik.mysql.com +1 -6
    Improved concurrency for key cache reassignment

  myisam/mi_keycache.c
    1.3 03/10/01 18:14:39 igor@rurik.mysql.com +48 -4
    Improved concurrency for key cache reassignment

  include/myisam.h
    1.52 03/10/01 18:13:47 igor@rurik.mysql.com +3 -2
    Improved concurrency for key cache reassignment

  include/my_sys.h
    1.107 03/10/01 18:12:45 igor@rurik.mysql.com +5 -1
    Improved concurrency for key cache reassignment

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

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

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

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

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

ChangeSet
  1.1563.77.2 03/10/01 17:15:24 monty@mishka.mysql.fi +1 -0
  Made SELECT INTO variable-list re-entrant, which fixes bug in stored procedures (#822)

  sql/sql_class.cc
    1.124 03/10/01 17:15:22 monty@mishka.mysql.fi +8 -9
    Made SELECT INTO variable-list re-entrant, which fixes bug in stored procedures (#822)

ChangeSet
  1.1563.77.1 03/10/01 16:50:50 monty@mishka.mysql.fi +2 -0
  Add proc table if not exists

  BitKeeper/etc/logging_ok
    1.245 03/10/01 16:50:50 monty@mishka.mysql.fi +1 -0
    Logging to logging@openlogging.org accepted

  scripts/mysql_fix_privilege_tables.sql
    1.5 03/10/01 16:50:16 monty@mishka.mysql.fi +17 -0
    Add proc table if not exists

ChangeSet
  1.1563.76.1 03/10/01 16:44:57 hf@deer.(none) +4 -0
  Fix for #1430
  there was an error about sendind prepared parameters to the server

  sql/sql_prepare.cc
    1.34.1.16 03/10/01 16:44:55 hf@deer.(none) +23 -10
    i added macroses to make headers of store_param_xxx functions
    they have different number of parameters in standalone an embedded servers
    also get_param_length now is implemented differently in embedded server

  sql/item.h
    1.56.1.35 03/10/01 16:44:55 hf@deer.(none) +4 -0
    add the data_len parameter in the embedded case

  sql/ha_berkeley.cc
    1.117.1.3 03/10/01 16:44:55 hf@deer.(none) +3 -1
    these lines sometimes crashes in embedded library
    so i #ifdef-ed it

  libmysqld/lib_sql.cc
    1.75.1.6 03/10/01 16:44:55 hf@deer.(none) +8 -2
    parameter's length added as a parameter

ChangeSet
  1.1563.75.1 03/10/01 11:04:19 bar@bar.mysql.r18.ru +1 -0
  ctype-mb.c:
    Stupid typo. Led to compilation failure with non-gcc compilers.

  strings/ctype-mb.c
    1.15 03/10/01 11:03:16 bar@bar.mysql.r18.ru +1 -1
    Stupid typo. Led to compilation failure with non-gcc compilers.

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

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

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

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

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

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

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

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

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

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

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

ChangeSet
  1.1563.74.2 03/09/30 11:40:15 paul@teton.kitebird.com +20 -0
  Subselect -> subquery

  sql/share/swedish/errmsg.txt
    1.64.1.25 03/09/30 11:40:04 paul@teton.kitebird.com +2 -2
    Subselect -> subquery

  sql/share/spanish/errmsg.txt
    1.64.1.24 03/09/30 11:40:04 paul@teton.kitebird.com +1 -1
    Subselect -> subquery

  sql/share/slovak/errmsg.txt
    1.64.1.23 03/09/30 11:40:04 paul@teton.kitebird.com +1 -1
    Subselect -> subquery

  sql/share/serbian/errmsg.txt
    1.18.1.21 03/09/30 11:40:04 paul@teton.kitebird.com +1 -1
    Subselect -> subquery

  sql/share/romanian/errmsg.txt
    1.62.1.23 03/09/30 11:40:04 paul@teton.kitebird.com +1 -1
    Subselect -> subquery

  sql/share/polish/errmsg.txt
    1.63.1.23 03/09/30 11:40:04 paul@teton.kitebird.com +1 -1
    Subselect -> subquery

  sql/share/norwegian/errmsg.txt
    1.63.1.23 03/09/30 11:40:04 paul@teton.kitebird.com +1 -1
    Subselect -> subquery

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.23 03/09/30 11:40:04 paul@teton.kitebird.com +1 -1
    Subselect -> subquery

  sql/share/korean/errmsg.txt
    1.63.1.22 03/09/30 11:40:04 paul@teton.kitebird.com +1 -1
    Subselect -> subquery

  sql/share/japanese/errmsg.txt
    1.63.1.22 03/09/30 11:40:04 paul@teton.kitebird.com +1 -1
    Subselect -> subquery

  sql/share/italian/errmsg.txt
    1.70.1.23 03/09/30 11:40:04 paul@teton.kitebird.com +1 -1
    Subselect -> subquery

  sql/share/hungarian/errmsg.txt
    1.65.1.22 03/09/30 11:40:04 paul@teton.kitebird.com +1 -1
    Subselect -> subquery

  sql/share/greek/errmsg.txt
    1.64.1.22 03/09/30 11:40:04 paul@teton.kitebird.com +1 -1
    Subselect -> subquery

  sql/share/french/errmsg.txt
    1.63.1.23 03/09/30 11:40:04 paul@teton.kitebird.com +1 -1
    Subselect -> subquery

  sql/share/estonian/errmsg.txt
    1.64.1.22 03/09/30 11:40:03 paul@teton.kitebird.com +1 -1
    Subselect -> subquery

  sql/share/english/errmsg.txt
    1.70.1.26 03/09/30 11:40:03 paul@teton.kitebird.com +1 -1
    Subselect -> subquery

  sql/share/dutch/errmsg.txt
    1.66.1.23 03/09/30 11:40:03 paul@teton.kitebird.com +1 -1
    Subselect -> subquery

  sql/share/danish/errmsg.txt
    1.62.1.23 03/09/30 11:40:03 paul@teton.kitebird.com +1 -1
    Subselect -> subquery

  sql/share/czech/errmsg.txt
    1.64.1.23 03/09/30 11:40:03 paul@teton.kitebird.com +1 -1
    Subselect -> subquery

  mysql-test/r/subselect.result
    1.67.27.1 03/09/30 11:40:03 paul@teton.kitebird.com +14 -14
    Subselect -> subquery

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

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

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

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

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

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

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

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

ChangeSet
  1.1563.74.1 03/09/29 22:45:00 lenz@kallisto.local +1 -0
   - fixed yet another C++ comment inside a .c file

  strings/ctype-mb.c
    1.14 03/09/29 22:44:57 lenz@mysql.com +1 -1
     - fixed yet another C++ comment inside a .c file

ChangeSet
  1.676.1.742 03/09/29 15:42:33 vva@eagle.mysql.r18.ru +2 -0
  fixed processing of COM_BINLOG_DUMP to use in mysqlbinlog

  sql/sql_repl.cc
    1.35.1.10 03/09/29 15:42:20 vva@eagle.mysql.r18.ru +7 -1
    fixed mysql_binlog_send to use COM_BINLOG_DUMP in mysqlbinlog

  sql/sql_parse.cc
    1.120.2.40 03/09/29 15:42:20 vva@eagle.mysql.r18.ru +2 -1
    fixed processing of COM_BINLOG_DUMP to use in mysqlbinlog

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

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

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

ChangeSet
  1.1563.63.14 03/09/29 22:06:49 monty@mishka.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mishka.mysql.fi:/home/my/mysql-4.1

  sql/mysql_priv.h
    1.186.1.32 03/09/29 22:06:47 monty@mishka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1563.73.1 03/09/29 22:06:31 monty@mishka.mysql.fi +1 -0
  Add missing define (after merge)

  sql/mysql_priv.h
    1.186.30.1 03/09/29 22:06:28 monty@mishka.mysql.fi +1 -0
    Add missing define (after merge)

ChangeSet
  1.1563.63.13 03/09/29 18:34:18 hf@deer.(none) +3 -0
  fix for #1344
  handling of init-file option added to embedded library
  main problem was killing of output (resulting recordsets etc)
  i added checks for empty output in Protocol:: methods
  better solution could be special Protocol_nul class to redirect
  results to nowhere

ChangeSet
  1.1563.63.12 03/09/29 17:10:48 hf@deer.(none) +1 -0
  Bugfix for #1342
  I made libmysqld not to do freopen(stdout...)
  I think we need better solution here so i added it as a worklog entry #1247

ChangeSet
  1.1563.72.1 03/09/29 12:40:03 monty@narttu.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into narttu.mysql.fi:/my/mysql-4.1

ChangeSet
  1.1563.63.11 03/09/29 15:36:08 hf@deer.(none) +2 -0
  bugfix for #1375

ChangeSet
  1.1563.69.1 03/09/29 11:39:00 vva@eagle.mysql.r18.ru +1 -0
  added fine error messages in scripts/fill_help_tables.sh

  scripts/fill_help_tables.sh
    1.8 03/09/29 11:38:50 vva@eagle.mysql.r18.ru +36 -10
    added fine error messages

  sql/sql_parse.cc
    1.271.24.13 03/09/29 18:34:16 hf@deer.(none) +10 -2
    handle_bootstrap modified to work in embedded library

  sql/mysqld.cc
    1.356.27.2 03/09/29 18:34:16 hf@deer.(none) +8 -2
    bootstrap function extended to work in embedded library

  libmysqld/lib_sql.cc
    1.75.1.5 03/09/29 18:34:16 hf@deer.(none) +20 -2
    code was added to call read_init_file
    Protocol methods now can support output to nowhere

  sql/mysqld.cc
    1.356.27.1 03/09/29 17:10:46 hf@deer.(none) +2 -0
    freopen #ifdef-ed
    Not a perfect solution though

  sql/log.cc
    1.108.1.14 03/09/29 15:36:06 hf@deer.(none) +2 -2
    in embedded library these members can be NULL

  libmysqld/lib_sql.cc
    1.75.1.4 03/09/29 15:36:06 hf@deer.(none) +2 -0
    some programs check mysql_error for empty string

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

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

  sql/mysqld.cc
    1.356.1.43 03/09/29 12:40:00 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1563.66.4 03/09/29 12:39:38 monty@narttu.mysql.fi +4 -0
  Don't print warnings about 'setrlimit' if --warnings is not given
  Code review/cleanup of sub subselect_uniquesubquery_engine

  sql/mysqld.cc
    1.356.26.1 03/09/29 12:39:36 monty@narttu.mysql.fi +5 -3
    Don't print warnings about 'setrlimit' if --warnings is not given

  sql/item_subselect.h
    1.34.2.1 03/09/29 12:39:36 monty@narttu.mysql.fi +8 -3
    Removed end_exec();

  sql/item_subselect.cc
    1.60.10.1 03/09/29 12:39:36 monty@narttu.mysql.fi +38 -39
    Safety fix (reset engine)
    Code review/cleanup of sub subselect_uniquesubquery_engine
    Remove 'end_exec'. (Should be done on query end, not in the middle)

  sql/ha_myisam.cc
    1.115.4.5 03/09/29 12:39:36 monty@narttu.mysql.fi +2 -2
    Removed unnecessary casts
    

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

ChangeSet
  1.1563.63.9 03/09/29 14:09:51 hf@deer.(none) +4 -0
  SCRUM
  embedded library
  some fixes - cleanup procedure changed for embedded library - deletion of
  embedded mysql->thd

  sql-common/client.c
    1.32 03/09/29 14:09:49 hf@deer.(none) +6 -1
    call of free_embedded_thd added

  libmysqld/lib_sql.cc
    1.75.1.3 03/09/29 14:09:49 hf@deer.(none) +10 -11
    function moved upper in file

  libmysqld/embedded_priv.h
    1.9 03/09/29 14:09:49 hf@deer.(none) +0 -1
    function deleted

  include/mysql.h
    1.94 03/09/29 14:09:49 hf@deer.(none) +1 -1
    free_embedded_thd added to the list of virtual methods

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

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

ChangeSet
  1.1563.63.8 03/09/29 12:50:28 hf@deer.(none) +1 -0
  SCRUM
  WL604 Privilegies in embedded library
  another bug fixed

  sql/sql_parse.cc
    1.271.24.12 03/09/29 12:50:26 hf@deer.(none) +3 -6
    flag selection fixed

ChangeSet
  1.1563.63.7 03/09/29 12:27:39 hf@deer.(none) +1 -0
  Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into deer.(none):/home/hf/work/mysql-4.1.stmt

  sql/sql_db.cc
    1.68.1.13 03/09/29 12:27:37 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1563.63.6 03/09/29 11:47:37 hf@deer.(none) +2 -0
  SCRUM
  WL#604 Privileges in embedded library
  bugs fixed

  sql/sql_parse.cc
    1.271.24.11 03/09/29 11:47:35 hf@deer.(none) +6 -7
    ifdefs added/removed

  sql/mysql_priv.h
    1.186.1.31 03/09/29 11:47:35 hf@deer.(none) +1 -1
    reload_acl_and_cache interface unifdefed

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

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

ChangeSet
  1.1563.48.12 03/09/28 18:47:22 serg@serg.mylan +2 -0
  set table->charset to default for 3.22 .frm files (bug #1161)

  sql/unireg.cc
    1.28 03/09/28 18:47:19 serg@serg.mylan +1 -1
    cleanup

  sql/table.cc
    1.84.1.2 03/09/28 18:47:19 serg@serg.mylan +3 -2
    set table->charset to default for 3.22 .frm files (bug #1161)

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

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

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

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

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

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

ChangeSet
  1.1563.62.3 03/09/28 12:00:30 bell@laptop.sanja.is.com.ua +7 -0
  Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
  into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-udf-5.0

  sql/udf_example.cc
    1.15 03/09/28 12:00:22 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.240 03/09/28 12:00:22 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.298 03/09/28 12:00:21 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.132 03/09/28 12:00:21 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.64 03/09/28 12:00:21 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.71 03/09/28 12:00:21 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  include/mysql_com.h
    1.73 03/09/28 12:00:21 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

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

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

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

  sql/mini_client.cc
    1.19.1.9 03/09/27 17:16:15 guilhem@mysql.com +1 -1
    backport of a fix made in 4.0 to make replication work in 64-bit binaries.

ChangeSet
  1.1563.68.2 03/09/27 00:25:57 lenz@kallisto.local +1 -0
   - better test for a string to avoid "test: integer expression expected"
     if a variable is not defined (empty).

  scripts/mysql_install_db.sh
    1.37.1.14 03/09/27 00:25:52 lenz@mysql.com +3 -3
     - better test for a string to avoid "test: integer expression expected"
       if a variable is not defined (empty).

ChangeSet
  1.1563.68.1 03/09/26 23:57:06 lenz@kallisto.local +1 -0
   - added missing zlib subdirectory to the source distribution
     (crc32.c is included by mysys/my_crc32.c)

  Makefile.am
    1.51 03/09/26 23:57:03 lenz@mysql.com +1 -1
     - added missing zlib subdirectory to the source distribution
       (crc32.c is included by mysys/my_crc32.c)

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

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

ChangeSet
  1.1563.67.1 03/09/26 22:56:13 guilhem@gbichot2 +2 -0
  A fix of the fix for BUG#1209 (was: SELECT DATABASE() still shows dropped database).
  Don't free the client's selected db (thd->db) when it has been DROPped,
  if this is a slave thread; the x_free() was causing a lot
  of various bugs in rpl_loaddata_rule_m (garbage characters, segfault, hangs in
  other threads).
  A small post-merge fix (rli->inside_transaction exists in 4.0 only).

  sql/sql_db.cc
    1.68.2.1 03/09/26 22:56:02 guilhem@mysql.com +24 -2
    Don't free the client's selected db (thd->db) when it has been DROPped,
    if this is a slave thread; the x_free() was causing a lot
    of various bugs in rpl_loaddata_rule_m which does a DROP DATABASE 
    (garbage characters, segfault, hangs in other threads).

  sql/log_event.cc
    1.113.1.18 03/09/26 22:56:02 guilhem@mysql.com +7 -4
    Post-merge fix (rli->inside_transaction existed in 4.0 only)

ChangeSet
  1.1563.65.1 03/09/26 17:42:05 dlenev@dlenev.mshome +2 -0
  Fixed spurios failures of rpl_until test.

  mysql-test/t/rpl_until.test
    1.4 03/09/26 17:42:03 dlenev@mysql.com +5 -2
    Fixed race then sometimes io slave thread stopped without managing to get any data from master and sometimes not.

  mysql-test/r/rpl_until.result
    1.4 03/09/26 17:42:03 dlenev@mysql.com +5 -5
    Fixed race then sometimes io slave thread stopped without managing to get any data from master and sometimes not.

ChangeSet
  1.1563.63.5 03/09/26 15:40:26 hf@deer.(none) +19 -0
  Merge

  sql/sql_parse.cc
    1.271.24.10 03/09/26 15:40:24 hf@deer.(none) +0 -0
    SCCS merged

  libmysqld/libmysqld.c
    1.54 03/09/26 15:40:24 hf@deer.(none) +0 -0
    SCCS merged

  libmysqld/lib_sql.cc
    1.75.1.2 03/09/26 15:40:24 hf@deer.(none) +0 -0
    SCCS merged

  sql/sql_show.cc
    1.122.4.8 03/09/26 15:35:59 hf@deer.(none) +0 -0
    Auto merged

  sql/sql_repl.cc
    1.102.1.12 03/09/26 15:35:59 hf@deer.(none) +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.34.1.15 03/09/26 15:35:59 hf@deer.(none) +0 -0
    Auto merged

  sql-common/client.c
    1.31 03/09/26 15:35:59 hf@deer.(none) +0 -0
    Auto merged

  sql/sql_insert.cc
    1.86.2.18 03/09/26 15:35:58 hf@deer.(none) +0 -0
    Auto merged

  sql/sql_derived.cc
    1.43.6.3 03/09/26 15:35:58 hf@deer.(none) +0 -0
    Auto merged

  sql/sql_class.cc
    1.105.1.19 03/09/26 15:35:58 hf@deer.(none) +0 -0
    Auto merged

  sql/sql_cache.cc
    1.46.1.8 03/09/26 15:35:58 hf@deer.(none) +0 -0
    Auto merged

  sql/sql_base.cc
    1.145.12.3 03/09/26 15:35:58 hf@deer.(none) +0 -0
    Auto merged

  sql/sql_acl.cc
    1.74.1.18 03/09/26 15:35:58 hf@deer.(none) +0 -0
    Auto merged

  sql/set_var.cc
    1.34.1.32 03/09/26 15:35:58 hf@deer.(none) +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.32.1.7 03/09/26 15:35:58 hf@deer.(none) +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.30 03/09/26 15:35:58 hf@deer.(none) +0 -0
    Auto merged

  sql/log.cc
    1.108.1.13 03/09/26 15:35:58 hf@deer.(none) +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.139 03/09/26 15:35:58 hf@deer.(none) +0 -0
    Auto merged

  include/mysql.h
    1.93 03/09/26 15:35:58 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1563.64.1 03/09/26 15:33:13 hf@deer.(none) +24 -0
  SCRUM:
  WL#604 Privileges in embedded library
  code added to check privileges in embedded library
  NO_EMBEDDED_ACCESS_CHECKS macros inserted in code so we can exclude
  access-checking parts. Actually we now can exclude these parts from
  standalone server as well. Do we need it?
  Access checks are disabled in embedded server by default. One should
  edit libmysqld/Makefile manually to get this working.
  We definitely need the separate configure for embedded server

  sql/sql_update.cc
    1.83.2.15 03/09/26 15:33:10 hf@deer.(none) +8 -0
    #ifndef-s added

  sql/sql_show.cc
    1.122.6.1 03/09/26 15:33:10 hf@deer.(none) +10 -1
    #ifndef-s added

  sql/sql_repl.cc
    1.102.5.2 03/09/26 15:33:10 hf@deer.(none) +2 -2
    parameters added

  sql/sql_prepare.cc
    1.34.3.1 03/09/26 15:33:10 hf@deer.(none) +16 -11
    #ifndef-s added

  sql/sql_parse.cc
    1.271.30.1 03/09/26 15:33:10 hf@deer.(none) +184 -106
    a horde of #ifndef-s added

  sql/sql_insert.cc
    1.86.8.1 03/09/26 15:33:10 hf@deer.(none) +7 -2
    #ifndef-s added

  sql/sql_derived.cc
    1.43.7.1 03/09/26 15:33:10 hf@deer.(none) +7 -3
    #ifndef-s added

  sql/sql_db.cc
    1.68.1.12 03/09/26 15:33:10 hf@deer.(none) +6 -2
    #ifndef-s added

  sql/sql_class.cc
    1.105.5.1 03/09/26 15:33:10 hf@deer.(none) +3 -1
    #ifndef-s added

  sql/sql_cache.cc
    1.46.4.1 03/09/26 15:33:10 hf@deer.(none) +2 -0
    #ifndef-s added

  sql/sql_base.cc
    1.145.13.1 03/09/26 15:33:10 hf@deer.(none) +4 -2
    #ifndef-s added

  sql/sql_acl.h
    1.24 03/09/26 15:33:10 hf@deer.(none) +5 -1
    #ifndef-s added

  sql/sql_acl.cc
    1.74.4.1 03/09/26 15:33:10 hf@deer.(none) +49 -46
    #ifndef-s added

  sql/set_var.cc
    1.34.16.1 03/09/26 15:33:10 hf@deer.(none) +12 -1
    #ifndef-s added

  sql/repl_failsafe.cc
    1.32.6.1 03/09/26 15:33:10 hf@deer.(none) +1 -2
    parameters added

  sql/mysqld.cc
    1.356.1.42 03/09/26 15:33:10 hf@deer.(none) +8 -4
    #ifndef-s added
    localhost renamed to my_localhost

  sql/mysql_priv.h
    1.186.29.1 03/09/26 15:33:10 hf@deer.(none) +12 -6
    #ifndef-s added
    also i removed default parameters from check_access and check_table_access
    definitions to set definitions working

  sql/log.cc
    1.108.4.2 03/09/26 15:33:10 hf@deer.(none) +10 -4
    #ifndef-s added

  sql/item_strfunc.cc
    1.135.3.1 03/09/26 15:33:10 hf@deer.(none) +2 -0
    #ifndef-s added

  sql-common/client.c
    1.27.1.1 03/09/26 15:33:10 hf@deer.(none) +4 -3
    one mysql_close left now

  libmysqld/libmysqld.c
    1.51.1.1 03/09/26 15:33:10 hf@deer.(none) +34 -49
    code #ifdef-ed - we use this only when we check permissions

  libmysqld/lib_sql.cc
    1.72.1.1 03/09/26 15:33:10 hf@deer.(none) +56 -37
    necessary code for getting passwords and access checks added

  libmysqld/Makefile.am
    1.29.1.9 03/09/26 15:33:10 hf@deer.(none) +1 -0
    Usually one doesn't need access checking in embedded library
    we definitely should separate configure for embedded server

  include/mysql.h
    1.89.1.1 03/09/26 15:33:10 hf@deer.(none) +2 -1
    options added so user of embedded library can set the client host
    it will work as if the usual client connects from this host

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

ChangeSet
  1.1563.63.4 03/09/25 18:06:39 bar@bar.mysql.r18.ru +2 -0
  LPAD and RPAD test with UCS2 was added.

  mysql-test/t/ctype_ucs.test
    1.3 03/09/25 18:06:37 bar@bar.mysql.r18.ru +18 -0
    LPAD and RPAD test with UCS2 was added.

  mysql-test/r/ctype_ucs.result
    1.3 03/09/25 18:06:37 bar@bar.mysql.r18.ru +34 -0
    LPAD and RPAD test with UCS2 was added.

ChangeSet
  1.1563.63.3 03/09/25 17:31:20 bar@bar.mysql.r18.ru +2 -0
  LPAD() and RPAD() are now multibyte-compatible

  sql/item_strfunc.cc
    1.138 03/09/25 17:31:18 bar@bar.mysql.r18.ru +60 -55
    LPAD() and RPAD() are now multibyte-compatible

  mysql-test/r/func_str.result
    1.43 03/09/25 17:31:18 bar@bar.mysql.r18.ru +1 -1
    LPAD() and RPAD() are now multibyte-compatible

ChangeSet
  1.1563.63.2 03/09/25 13:35:21 bar@bar.mysql.r18.ru +5 -0
  CHARSET_INFO::instr was extended to return more substring match results:
  - offset of substr begining
  - offset of substr end
  - number of characters (MB compatible)

  strings/ctype-simple.c
    1.37 03/09/25 13:35:19 bar@bar.mysql.r18.ru +27 -5
    CHARSET_INFO::instr was extended to return more substring match results:
    - offset of substr begining
    - offset of substr end
    - number of characters (MB compatible)

  strings/ctype-mb.c
    1.13 03/09/25 13:35:19 bar@bar.mysql.r18.ru +31 -8
    CHARSET_INFO::instr was extended to return more substring match results:
    - offset of substr begining
    - offset of substr end
    - number of characters (MB compatible)

  strings/ctype-bin.c
    1.35 03/09/25 13:35:19 bar@bar.mysql.r18.ru +27 -5
    CHARSET_INFO::instr was extended to return more substring match results:
    - offset of substr begining
    - offset of substr end
    - number of characters (MB compatible)

  sql/item_func.cc
    1.124.1.27 03/09/25 13:35:19 bar@bar.mysql.r18.ru +6 -5
    CHARSET_INFO::instr was extended to return more substring match results:
    - offset of substr begining
    - offset of substr end
    - number of characters (MB compatible)

  include/m_ctype.h
    1.77 03/09/25 13:35:19 bar@bar.mysql.r18.ru +15 -6
    CHARSET_INFO::instr was extended to return more substring match results:
    - offset of substr begining
    - offset of substr end
    - number of characters (MB compatible)

ChangeSet
  1.1563.63.1 03/09/25 13:02:45 hf@deer.(none) +3 -0
  Bug fixed
  null_string wasn't known in libmysqld/lib_sql.cc, that caused compiler's error
  i put the declaration of the null_string in mysql_priv.h and renamed it
  to my_null_string to reduce the probability of name's intersections

  sql/sql_prepare.cc
    1.34.1.14 03/09/25 13:02:42 hf@deer.(none) +2 -2
    null_string -> my_null_string

  sql/mysql_priv.h
    1.186.1.29 03/09/25 13:02:42 hf@deer.(none) +1 -0
    my_null_string was made known

  libmysqld/lib_sql.cc
    1.75.1.1 03/09/25 13:02:42 hf@deer.(none) +1 -1
    null_string -> my_null_string

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

ChangeSet
  1.1563.62.2 03/09/24 15:26:20 pem@mysql.telia.com +16 -0
  Post-merge fixes.

  sql/sql_repl.cc
    1.109 03/09/24 15:26:17 pem@mysql.com +7 -7
    Post-merge fixes.

  sql/sql_prepare.cc
    1.44 03/09/24 15:26:17 pem@mysql.com +1 -1
    Post-merge fixes.

  sql/sql_insert.cc
    1.94 03/09/24 15:26:17 pem@mysql.com +1 -1
    Post-merge fixes.

  sql/sql_cache.cc
    1.54 03/09/24 15:26:17 pem@mysql.com +1 -1
    Post-merge fixes.

  sql/sp_cache.h
    1.2 03/09/24 15:26:17 pem@mysql.com +1 -1
    Post-merge fixes.

  sql/sp.cc
    1.26 03/09/24 15:26:17 pem@mysql.com +2 -2
    Post-merge fixes.

  sql/lex.h
    1.101 03/09/24 15:26:17 pem@mysql.com +0 -1
    Post-merge fixes.

  sql/item.cc
    1.69.1.2 03/09/24 15:26:17 pem@mysql.com +1 -1
    Post-merge fixes.

  mysql-test/t/sp-error.test
    1.12 03/09/24 15:26:17 pem@mysql.com +23 -23
    Post-merge fixes.

  mysql-test/t/distinct.test
    1.15 03/09/24 15:26:17 pem@mysql.com +2 -2
    Post-merge fixes.

  mysql-test/r/variables.result
    1.32 03/09/24 15:26:17 pem@mysql.com +1 -1
    Post-merge fixes.

  mysql-test/r/sp-error.result
    1.11 03/09/24 15:26:17 pem@mysql.com +1 -1
    Post-merge fixes.

  mysql-test/r/query_cache.result
    1.31 03/09/24 15:26:17 pem@mysql.com +4 -4
    Post-merge fixes.

  mysql-test/r/distinct.result
    1.28 03/09/24 15:26:17 pem@mysql.com +2 -2
    Post-merge fixes.

  libmysqld/lib_sql.cc
    1.76 03/09/24 15:26:17 pem@mysql.com +2 -2
    Post-merge fixes.

  client/mysqltest.c
    1.100 03/09/24 15:26:17 pem@mysql.com +2 -1
    Post-merge fixes.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

ChangeSet
  1.1563.62.1 03/09/24 11:29:38 pem@mysql.com +91 -0
  Merging 4.1 -> 5.0

  sql/sql_union.cc
    1.79 03/09/24 11:29:34 pem@mysql.com +2 -3
    Merging 4.1 -> 5.0

  sql/sql_prepare.cc
    1.43 03/09/24 11:29:34 pem@mysql.com +3 -3
    Merging 4.1 -> 5.0

  sql/sql_parse.cc
    1.297 03/09/24 11:29:34 pem@mysql.com +1 -1
    Merging 4.1 -> 5.0

  sql/sql_lex.h
    1.120 03/09/24 11:29:34 pem@mysql.com +0 -0
    Merging 4.1 -> 5.0

  sql/share/ukrainian/errmsg.txt
    1.42 03/09/24 11:29:34 pem@mysql.com +11 -11
    Merging 4.1 -> 5.0

  sql/share/swedish/errmsg.txt
    1.80 03/09/24 11:29:34 pem@mysql.com +11 -11
    Merging 4.1 -> 5.0

  sql/share/spanish/errmsg.txt
    1.79 03/09/24 11:29:34 pem@mysql.com +11 -11
    Merging 4.1 -> 5.0

  sql/share/slovak/errmsg.txt
    1.79 03/09/24 11:29:34 pem@mysql.com +11 -11
    Merging 4.1 -> 5.0

  sql/share/serbian/errmsg.txt
    1.33 03/09/24 11:29:34 pem@mysql.com +11 -11
    Merging 4.1 -> 5.0

  sql/share/russian/errmsg.txt
    1.77 03/09/24 11:29:34 pem@mysql.com +11 -11
    Merging 4.1 -> 5.0

  sql/share/romanian/errmsg.txt
    1.76 03/09/24 11:29:34 pem@mysql.com +0 -0
    Merging 4.1 -> 5.0

  sql/share/portuguese/errmsg.txt
    1.79 03/09/24 11:29:34 pem@mysql.com +23 -43
    Merging 4.1 -> 5.0

  sql/share/polish/errmsg.txt
    1.79 03/09/24 11:29:34 pem@mysql.com +11 -11
    Merging 4.1 -> 5.0

  sql/share/norwegian/errmsg.txt
    1.78 03/09/24 11:29:34 pem@mysql.com +11 -11
    Merging 4.1 -> 5.0

  sql/share/norwegian-ny/errmsg.txt
    1.78 03/09/24 11:29:34 pem@mysql.com +11 -11
    Merging 4.1 -> 5.0

  sql/share/korean/errmsg.txt
    1.78 03/09/24 11:29:34 pem@mysql.com +11 -11
    Merging 4.1 -> 5.0

  sql/share/japanese/errmsg.txt
    1.78 03/09/24 11:29:34 pem@mysql.com +11 -11
    Merging 4.1 -> 5.0

  sql/share/italian/errmsg.txt
    1.85 03/09/24 11:29:34 pem@mysql.com +11 -11
    Merging 4.1 -> 5.0

  sql/share/hungarian/errmsg.txt
    1.80 03/09/24 11:29:34 pem@mysql.com +11 -11
    Merging 4.1 -> 5.0

  sql/share/greek/errmsg.txt
    1.79 03/09/24 11:29:34 pem@mysql.com +11 -11
    Merging 4.1 -> 5.0

  sql/share/german/errmsg.txt
    1.80 03/09/24 11:29:34 pem@mysql.com +11 -11
    Merging 4.1 -> 5.0

  sql/share/french/errmsg.txt
    1.78 03/09/24 11:29:34 pem@mysql.com +11 -11
    Merging 4.1 -> 5.0

  sql/share/estonian/errmsg.txt
    1.79 03/09/24 11:29:34 pem@mysql.com +11 -11
    Merging 4.1 -> 5.0

  sql/share/english/errmsg.txt
    1.86 03/09/24 11:29:34 pem@mysql.com +6 -6
    Merging 4.1 -> 5.0

  sql/share/dutch/errmsg.txt
    1.81 03/09/24 11:29:34 pem@mysql.com +11 -11
    Merging 4.1 -> 5.0

  sql/share/danish/errmsg.txt
    1.77 03/09/24 11:29:34 pem@mysql.com +11 -11
    Merging 4.1 -> 5.0

  sql/share/czech/errmsg.txt
    1.78 03/09/24 11:29:34 pem@mysql.com +0 -0
    Merging 4.1 -> 5.0

  sql/item.h
    1.62.1.1 03/09/24 11:29:34 pem@mysql.com +0 -0
    Merging 4.1 -> 5.0

  sql/item.cc
    1.69.1.1 03/09/24 11:29:34 pem@mysql.com +2 -4
    Merging 4.1 -> 5.0

  scripts/make_binary_distribution.sh
    1.57 03/09/24 11:29:34 pem@mysql.com +2 -4
    Merging 4.1 -> 5.0

  mysql-test/t/query_cache.test
    1.27 03/09/24 11:29:34 pem@mysql.com +2 -0
    Merging 4.1 -> 5.0

  mysql-test/r/query_cache.result
    1.30 03/09/24 11:29:34 pem@mysql.com +0 -0
    Merging 4.1 -> 5.0

  include/mysqld_error.h
    1.75 03/09/24 11:29:34 pem@mysql.com +18 -19
    Merging 4.1 -> 5.0

  client/mysqltest.c
    1.99 03/09/24 11:29:34 pem@mysql.com +12 -1
    Merging 4.1 -> 5.0

ChangeSet
  1.1563.61.1 03/09/24 13:57:26 bar@bar.mysql.r18.ru +4 -0
  regexp worked only with the default character set.
  Now it can work with any character set.

  regex/regcomp.c
    1.12 03/09/24 13:57:23 bar@bar.mysql.r18.ru +34 -21
    regexp worked only with the default character set.
    Now it can work with any character set.

  regex/cclass.h
    1.4 03/09/24 13:57:23 bar@bar.mysql.r18.ru +1 -0
    regexp worked only with the default character set.
    Now it can work with any character set.

  mysql-test/t/func_regexp.test
    1.6 03/09/24 13:57:23 bar@bar.mysql.r18.ru +14 -0
    regexp worked only with the default character set.
    Now it can work with any character set.

  mysql-test/r/func_regexp.result
    1.6 03/09/24 13:57:23 bar@bar.mysql.r18.ru +24 -0
    regexp worked only with the default character set.
    Now it can work with any character set.

  sql/sql_yacc.yy
    1.239 03/09/24 10:05:05 pem@mysql.com +0 -1
    Auto merged

  sql/sql_update.cc
    1.94 03/09/24 10:05:05 pem@mysql.com +0 -0
    Auto merged

  sql/sql_table.cc
    1.166 03/09/24 10:05:05 pem@mysql.com +0 -0
    Auto merged

  sql/sql_show.cc
    1.127 03/09/24 10:05:05 pem@mysql.com +0 -0
    Auto merged

  sql/sql_select.cc
    1.227 03/09/24 10:05:04 pem@mysql.com +0 -0
    Auto merged

  sql/sql_repl.h
    1.31 03/09/24 10:05:04 pem@mysql.com +0 -0
    Auto merged

  sql/sql_repl.cc
    1.108 03/09/24 10:05:04 pem@mysql.com +0 -0
    Auto merged

  sql/sql_load.cc
    1.52 03/09/24 10:05:04 pem@mysql.com +0 -0
    Auto merged

  sql/sql_lex.cc
    1.87.1.2 03/09/24 10:05:04 pem@mysql.com +0 -0
    Auto merged

  sql/sql_insert.cc
    1.93 03/09/24 10:05:04 pem@mysql.com +0 -0
    Auto merged

  sql/sql_derived.cc
    1.47 03/09/24 10:05:04 pem@mysql.com +0 -0
    Auto merged

  sql/sql_db.cc
    1.73 03/09/24 10:05:04 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.162 03/09/24 10:05:04 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.123 03/09/24 10:05:04 pem@mysql.com +0 -0
    Auto merged

  sql/sql_cache.cc
    1.53 03/09/24 10:05:04 pem@mysql.com +0 -0
    Auto merged

  sql/sql_base.cc
    1.151 03/09/24 10:05:03 pem@mysql.com +0 -0
    Auto merged

  sql/sql_acl.cc
    1.79 03/09/24 10:05:03 pem@mysql.com +0 -0
    Auto merged

  sql/slave.cc
    1.197 03/09/24 10:05:03 pem@mysql.com +0 -0
    Auto merged

  sql/set_var.cc
    1.41 03/09/24 10:05:03 pem@mysql.com +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.35 03/09/24 10:05:03 pem@mysql.com +0 -0
    Auto merged

  sql/records.cc
    1.25 03/09/24 10:05:03 pem@mysql.com +0 -0
    Auto merged

  sql/protocol.cc
    1.62 03/09/24 10:05:03 pem@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.368 03/09/24 10:05:03 pem@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.199 03/09/24 10:05:03 pem@mysql.com +0 -0
    Auto merged

  sql/log_event.cc
    1.120 03/09/24 10:05:03 pem@mysql.com +0 -0
    Auto merged

  sql/log.cc
    1.114 03/09/24 10:05:03 pem@mysql.com +0 -0
    Auto merged

  sql/lock.cc
    1.45 03/09/24 10:05:02 pem@mysql.com +0 -0
    Auto merged

  sql/lex.h
    1.100 03/09/24 10:05:02 pem@mysql.com +0 -0
    Auto merged

  sql/item_sum.cc
    1.82.1.5 03/09/24 10:05:02 pem@mysql.com +0 -0
    Auto merged

  sql/item_subselect.cc
    1.66 03/09/24 10:05:02 pem@mysql.com +0 -0
    Auto merged

  sql/item_func.h
    1.76 03/09/24 10:05:02 pem@mysql.com +0 -0
    Auto merged

  sql/item_func.cc
    1.130.1.1 03/09/24 10:05:02 pem@mysql.com +0 -0
    Auto merged

  sql/item_create.cc
    1.37 03/09/24 10:05:02 pem@mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.99.1.8 03/09/24 10:05:02 pem@mysql.com +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.122 03/09/24 10:05:02 pem@mysql.com +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.94 03/09/24 10:05:02 pem@mysql.com +0 -0
    Auto merged

  sql/ha_berkeley.cc
    1.119 03/09/24 10:05:02 pem@mysql.com +0 -0
    Auto merged

  sql/filesort.cc
    1.77 03/09/24 10:05:02 pem@mysql.com +0 -0
    Auto merged

  scripts/mysql_install_db.sh
    1.47 03/09/24 10:05:02 pem@mysql.com +0 -0
    Auto merged

  scripts/mysql_create_system_tables.sh
    1.8 03/09/24 10:05:02 pem@mysql.com +0 -0
    Auto merged

  mysys/my_pthread.c
    1.40 03/09/24 10:05:01 pem@mysql.com +1 -2
    Auto merged

  mysql-test/t/subselect.test
    1.68 03/09/24 10:05:01 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/symlink.result
    1.12 03/09/24 10:05:01 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.78 03/09/24 10:05:01 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/show_check.result
    1.35 03/09/24 10:05:01 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/connect.result
    1.5 03/09/24 10:05:01 pem@mysql.com +0 -0
    Auto merged

  myisam/myisamchk.c
    1.97 03/09/24 10:05:01 pem@mysql.com +0 -0
    Auto merged

  myisam/mi_check.c
    1.109 03/09/24 10:05:01 pem@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-sel000100.test~548501cad19a1a59
    1.14 03/09/24 10:05:00 pem@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-sel000100.result~84ed46856cb3a69f
    1.12 03/09/24 10:05:00 pem@mysql.com +0 -0
    Auto merged

  libmysql/libmysql.c
    1.160 03/09/24 10:05:00 pem@mysql.com +0 -0
    Auto merged

  include/mysql_com.h
    1.71.1.1 03/09/24 10:05:00 pem@mysql.com +0 -0
    Auto merged

  include/my_pthread.h
    1.68 03/09/24 10:05:00 pem@mysql.com +0 -0
    Auto merged

  configure.in
    1.215 03/09/24 10:05:00 pem@mysql.com +0 -0
    Auto merged

  client/mysql.cc
    1.131 03/09/24 10:05:00 pem@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-sel000100.test~548501cad19a1a59
    1.13 03/09/24 10:05:00 pem@mysql.com +0 -0
    Merge rename: mysql-test/t/sel000100.test -> BitKeeper/deleted/.del-sel000100.test~548501cad19a1a59

  BitKeeper/deleted/.del-sel000100.result~84ed46856cb3a69f
    1.11 03/09/24 10:05:00 pem@mysql.com +0 -0
    Merge rename: mysql-test/r/sel000100.result -> BitKeeper/deleted/.del-sel000100.result~84ed46856cb3a69f

  BitKeeper/etc/logging_ok
    1.244 03/09/24 10:04:50 pem@mysql.com +1 -1
    auto-union

  BitKeeper/etc/ignore
    1.158 03/09/24 10:04:50 pem@mysql.com +0 -4
    auto-union

ChangeSet
  1.1563.1.25 03/09/24 09:18:39 monty@mishka.mysql.fi +12 -0
  merge

ChangeSet
  1.1563.1.24 03/09/24 10:24:55 monty@narttu.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into narttu.mysql.fi:/my/mysql-4.1

  sql/sql_parse.cc
    1.271.24.9 03/09/24 09:14:58 monty@mishka.mysql.fi +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.28.5 03/09/24 10:24:52 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1563.53.14 03/09/24 08:35:02 lenz@kallisto.local +6 -0
   - Code cleanup: replaced C++-style comments with the proper syntax for
     .c files (the IBM Visual Age C compiler aborts with a syntax error
     on these)

  sql/net_serv.cc
    1.63 03/09/24 09:14:56 monty@mishka.mysql.fi +0 -0
    Auto merged

  tests/client_test.c
    1.39 03/09/24 08:34:59 lenz@mysql.com +1 -1
     - replaced C++-style comment with the proper syntax for .c files
       (the IBM Visual Age C compiler aborts with a syntax error on these)

  strings/ctype-bin.c
    1.34 03/09/24 08:34:59 lenz@mysql.com +1 -1
     - replaced C++-style comment with the proper syntax for .c files
       (the IBM Visual Age C compiler aborts with a syntax error on these)

  sql/net_serv.cc
    1.61.1.1 03/09/24 08:34:59 lenz@mysql.com +2 -2
     - replaced C++-style comment with the proper syntax for .c files
       (the IBM Visual Age C compiler aborts with a syntax error on these)

  mysys/my_getopt.c
    1.38 03/09/24 08:34:59 lenz@mysql.com +1 -1
     - replaced C++-style comment with the proper syntax for .c files
       (the IBM Visual Age C compiler aborts with a syntax error on these)

  libmysql/libmysql.c
    1.156.1.31 03/09/24 08:34:59 lenz@mysql.com +1 -1
     - replaced C++-style comment with the proper syntax for .c files
       (the IBM Visual Age C compiler aborts with a syntax error on these)

  libmysql/dll.c
    1.10 03/09/24 08:34:59 lenz@mysql.com +1 -1
     - replaced C++-style comment with the proper syntax for .c files
       (the IBM Visual Age C compiler aborts with a syntax error on these)

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

  sql/mysql_priv.h
    1.186.1.28 03/09/24 09:18:28 monty@mishka.mysql.fi +0 -1
    merge

  sql/table.cc
    1.86 03/09/24 09:15:01 monty@mishka.mysql.fi +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.203.1.65 03/09/24 09:14:59 monty@mishka.mysql.fi +0 -0
    Auto merged

  sql/sql_table.cc
    1.157.9.12 03/09/24 09:14:59 monty@mishka.mysql.fi +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.34.1.13 03/09/24 09:14:59 monty@mishka.mysql.fi +0 -0
    Auto merged

  sql/set_var.cc
    1.34.1.31 03/09/24 09:14:57 monty@mishka.mysql.fi +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.32.1.6 03/09/24 09:14:57 monty@mishka.mysql.fi +0 -0
    Auto merged

  sql/lock.cc
    1.42.1.2 03/09/24 09:14:55 monty@mishka.mysql.fi +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.137 03/09/24 09:14:55 monty@mishka.mysql.fi +0 -0
    Auto merged

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

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

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

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

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

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

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

ChangeSet
  1.1563.53.13 03/09/23 13:45:13 lenz@kallisto.local +1 -0
   - added option "--readline" to enable linking against libreadline
     (instead of libedit, which is the default for 4.1)
   - brushed up the usage help text a bit

  Build-tools/Do-compile
    1.79 03/09/23 13:45:10 lenz@mysql.com +20 -12
     - added option "--readline" to enable linking against libreadline
       (instead of libedit, which is the default for 4.1)
     - brushed up the usage help text a bit

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

ChangeSet
  1.1563.58.8 03/09/23 15:00:58 bar@bar.mysql.r18.ru +1 -0
  derror.cc:
    Typo fix: redundant "in"

  sql/derror.cc
    1.13 03/09/23 15:00:03 bar@bar.mysql.r18.ru +1 -1
    Typo fix: redundant "in"

ChangeSet
  1.1563.58.7 03/09/23 10:41:58 bar@bar.mysql.r18.ru +1 -0
  charset.c:
    comp_err failed to compile error message file when a
    character set was not incompiled.

  mysys/charset.c
    1.102 03/09/23 10:40:23 bar@bar.mysql.r18.ru +14 -0
    comp_err failed to compile error message file when a
    character set was not incompiled.

ChangeSet
  1.1563.58.6 03/09/23 10:06:27 bar@bar.mysql.r18.ru +1 -0
  derror.cc:
    Better English message

  sql/derror.cc
    1.12 03/09/23 10:05:55 bar@bar.mysql.r18.ru +2 -2
    Better English message

ChangeSet
  1.1563.60.1 03/09/23 00:38:01 lenz@kallisto.local +7 -0
   - Polished mysql-copyright a bit and added call to remove
     cmd-line-utils/readline from the commercial distribution
   - fixed some copyright headers so mysql-copyright can process them

  sql/records.cc
    1.19.1.4 03/09/23 00:37:58 lenz@mysql.com +0 -1
     - fixed copyright header

  sql/item_cmpfunc.cc
    1.99.3.5 03/09/23 00:37:58 lenz@mysql.com +1 -1
     - fixed copyright header

  sql/item.h
    1.56.1.34 03/09/23 00:37:58 lenz@mysql.com +1 -1
     - fixed copyright header

  sql/gen_lex_hash.cc
    1.58 03/09/23 00:37:58 lenz@mysql.com +3 -12
     - fixed copyright header

  sql/filesort.cc
    1.70.1.7 03/09/23 00:37:58 lenz@mysql.com +0 -1
     - fixed copyright header

  include/my_pthread.h
    1.65.1.3 03/09/23 00:37:58 lenz@mysql.com +0 -1
     - fixed copyright header

  Build-tools/mysql-copyright
    1.9 03/09/23 00:37:58 lenz@mysql.com +16 -11
     - remove the cmd-line-utils/readline directory from the commercial
       distribution
     - make use of more builtin Perl functions instead of forking 
       subprocesses

ChangeSet
  1.1563.59.1 03/09/22 17:18:47 bar@bar.mysql.r18.ru +3 -0
  Bug 1181 fix. LIKE didn't work with UCS2 character set.

  strings/ctype-ucs2.c
    1.10 03/09/22 17:18:44 bar@bar.mysql.r18.ru +255 -8
    Bug 1181 fix. LIKE didn't work with UCS2 character set.

  mysql-test/t/ctype_ucs.test
    1.2 03/09/22 17:18:44 bar@bar.mysql.r18.ru +46 -0
    Bug 1181 fix. LIKE didn't work with UCS2 character set.

  mysql-test/r/ctype_ucs.result
    1.2 03/09/22 17:18:44 bar@bar.mysql.r18.ru +127 -0
    Bug 1181 fix. LIKE didn't work with UCS2 character set.

ChangeSet
  1.1563.58.3 03/09/22 11:39:29 ram@gw.mysql.r18.ru +1 -0
  Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into gw.mysql.r18.ru:/usr/home/ram/work/4.1

  sql/item_strfunc.cc
    1.135.1.2 03/09/22 11:39:26 ram@gw.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1563.58.2 03/09/22 11:26:14 bar@bar.mysql.r18.ru +1 -0
  xml.c:
    Bug fix

  strings/xml.c
    1.3 03/09/22 11:25:57 bar@bar.mysql.r18.ru +1 -1
    Bug fix

ChangeSet
  1.1563.58.1 03/09/22 11:11:36 bar@bar.mysql.r18.ru +5 -0
  Bug 1350 fix

  sql/sql_show.cc
    1.122.4.7 03/09/22 11:11:33 bar@bar.mysql.r18.ru +10 -4
    Bug 1350 fix

  sql/derror.cc
    1.11 03/09/22 11:11:33 bar@bar.mysql.r18.ru +12 -6
    Bug 1350 fix

  mysys/charset.c
    1.101 03/09/22 11:11:33 bar@bar.mysql.r18.ru +34 -34
    Bug 1350 fix

  include/m_ctype.h
    1.76 03/09/22 11:11:33 bar@bar.mysql.r18.ru +1 -0
    Bug 1350 fix

  extra/comp_err.c
    1.10 03/09/22 11:11:33 bar@bar.mysql.r18.ru +0 -2
    Bug 1350 fix

ChangeSet
  1.1563.57.1 03/09/20 18:31:56 bell@laptop.sanja.is.com.ua +2 -0
  code cleanup: removed unused constructors and methods

  sql/item_subselect.h
    1.34.1.5 03/09/20 18:30:54 bell@laptop.sanja.is.com.ua +1 -27
    removed unused constructors & methods

  sql/item_subselect.cc
    1.60.8.10 03/09/20 18:30:54 bell@laptop.sanja.is.com.ua +0 -13
    removed unused constructors

ChangeSet
  1.1563.56.1 03/09/20 18:30:36 bell@laptop.sanja.is.com.ua +4 -0
  fixed processing aggregate functions with static tables (BUG#1318)

  sql/sql_select.cc
    1.216.29.1 03/09/20 18:29:49 bell@laptop.sanja.is.com.ua +5 -3
    hixed processing of static tables

  mysql-test/t/func_group.test
    1.16 03/09/20 18:29:49 bell@laptop.sanja.is.com.ua +9 -0
    test of BUG#1318

  mysql-test/r/subselect.result
    1.67.18.10 03/09/20 18:29:49 bell@laptop.sanja.is.com.ua +1 -0
    correct results

  mysql-test/r/func_group.result
    1.17.1.2 03/09/20 18:29:49 bell@laptop.sanja.is.com.ua +9 -0
    test of BUG#1318

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

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

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

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

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

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

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

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

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

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

ChangeSet
  1.1563.53.8 03/09/19 18:16:32 bar@bar.mysql.r18.ru +1 -0
  comp_err.c:
    There are some problems compiling with pure "configure"
    I need to fix it first.

  extra/comp_err.c
    1.9 03/09/19 18:15:56 bar@bar.mysql.r18.ru +3 -1
    There are some problems compiling with pure "configure"
    I need to fix it first.

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

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

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

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

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

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

ChangeSet
  1.1563.53.7 03/09/19 16:59:14 bar@bar.mysql.r18.ru +2 -0
  New test for UTF8 functionality

  mysql-test/t/ctype_utf8.test
    1.1 03/09/19 16:59:11 bar@bar.mysql.r18.ru +35 -0

  mysql-test/r/ctype_utf8.result
    1.1 03/09/19 16:59:11 bar@bar.mysql.r18.ru +61 -0

  mysql-test/t/ctype_utf8.test
    1.0 03/09/19 16:59:11 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/t/ctype_utf8.test

  mysql-test/r/ctype_utf8.result
    1.0 03/09/19 16:59:11 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/r/ctype_utf8.result

ChangeSet
  1.1563.53.6 03/09/19 15:19:15 bar@bar.mysql.r18.ru +1 -0
  Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
  into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

  sql/item_func.cc
    1.124.1.26 03/09/19 15:19:11 bar@bar.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1563.55.1 03/09/19 15:18:19 bar@bar.mysql.r18.ru +21 -0
  Fixed that multibyte charsets didn't honor multibyte
  sequence boundaries in functions LIKE and LOCATE in
  the case of "binary" collation. Comparison was done
  like if the strings were just a binary strings without
  character set assumption.

  strings/ctype-win1250ch.c
    1.30 03/09/19 15:18:16 bar@bar.mysql.r18.ru +1 -0
    Fixed that multibyte charsets didn't honor multibyte
    sequence boundaries in functions LIKE and LOCATE in
    the case of "binary" collation. Comparison was done
    like if the strings were just a binary strings without
    character set assumption.

  strings/ctype-utf8.c
    1.51 03/09/19 15:18:16 bar@bar.mysql.r18.ru +2 -1
    Fixed that multibyte charsets didn't honor multibyte
    sequence boundaries in functions LIKE and LOCATE in
    the case of "binary" collation. Comparison was done
    like if the strings were just a binary strings without
    character set assumption.

  strings/ctype-ujis.c
    1.43 03/09/19 15:18:16 bar@bar.mysql.r18.ru +2 -1
    Fixed that multibyte charsets didn't honor multibyte
    sequence boundaries in functions LIKE and LOCATE in
    the case of "binary" collation. Comparison was done
    like if the strings were just a binary strings without
    character set assumption.

  strings/ctype-ucs2.c
    1.9 03/09/19 15:18:16 bar@bar.mysql.r18.ru +2 -1
    Fixed that multibyte charsets didn't honor multibyte
    sequence boundaries in functions LIKE and LOCATE in
    the case of "binary" collation. Comparison was done
    like if the strings were just a binary strings without
    character set assumption.

  strings/ctype-tis620.c
    1.52 03/09/19 15:18:16 bar@bar.mysql.r18.ru +2 -1
    Fixed that multibyte charsets didn't honor multibyte
    sequence boundaries in functions LIKE and LOCATE in
    the case of "binary" collation. Comparison was done
    like if the strings were just a binary strings without
    character set assumption.

  strings/ctype-sjis.c
    1.49 03/09/19 15:18:16 bar@bar.mysql.r18.ru +2 -1
    Fixed that multibyte charsets didn't honor multibyte
    sequence boundaries in functions LIKE and LOCATE in
    the case of "binary" collation. Comparison was done
    like if the strings were just a binary strings without
    character set assumption.

  strings/ctype-simple.c
    1.36 03/09/19 15:18:16 bar@bar.mysql.r18.ru +39 -0
    Fixed that multibyte charsets didn't honor multibyte
    sequence boundaries in functions LIKE and LOCATE in
    the case of "binary" collation. Comparison was done
    like if the strings were just a binary strings without
    character set assumption.

  strings/ctype-mb.c
    1.12 03/09/19 15:18:16 bar@bar.mysql.r18.ru +219 -4
    Fixed that multibyte charsets didn't honor multibyte
    sequence boundaries in functions LIKE and LOCATE in
    the case of "binary" collation. Comparison was done
    like if the strings were just a binary strings without
    character set assumption.

  strings/ctype-latin1.c
    1.18 03/09/19 15:18:16 bar@bar.mysql.r18.ru +2 -1
    Fixed that multibyte charsets didn't honor multibyte
    sequence boundaries in functions LIKE and LOCATE in
    the case of "binary" collation. Comparison was done
    like if the strings were just a binary strings without
    character set assumption.

  strings/ctype-gbk.c
    1.44 03/09/19 15:18:16 bar@bar.mysql.r18.ru +2 -1
    Fixed that multibyte charsets didn't honor multibyte
    sequence boundaries in functions LIKE and LOCATE in
    the case of "binary" collation. Comparison was done
    like if the strings were just a binary strings without
    character set assumption.

  strings/ctype-gb2312.c
    1.40 03/09/19 15:18:16 bar@bar.mysql.r18.ru +5 -4
    Fixed that multibyte charsets didn't honor multibyte
    sequence boundaries in functions LIKE and LOCATE in
    the case of "binary" collation. Comparison was done
    like if the strings were just a binary strings without
    character set assumption.

  strings/ctype-euc_kr.c
    1.43 03/09/19 15:18:16 bar@bar.mysql.r18.ru +4 -3
    Fixed that multibyte charsets didn't honor multibyte
    sequence boundaries in functions LIKE and LOCATE in
    the case of "binary" collation. Comparison was done
    like if the strings were just a binary strings without
    character set assumption.

  strings/ctype-czech.c
    1.40 03/09/19 15:18:16 bar@bar.mysql.r18.ru +1 -0
    Fixed that multibyte charsets didn't honor multibyte
    sequence boundaries in functions LIKE and LOCATE in
    the case of "binary" collation. Comparison was done
    like if the strings were just a binary strings without
    character set assumption.

  strings/ctype-bin.c
    1.33 03/09/19 15:18:16 bar@bar.mysql.r18.ru +41 -2
    Fixed that multibyte charsets didn't honor multibyte
    sequence boundaries in functions LIKE and LOCATE in
    the case of "binary" collation. Comparison was done
    like if the strings were just a binary strings without
    character set assumption.

  strings/ctype-big5.c
    1.44 03/09/19 15:18:16 bar@bar.mysql.r18.ru +2 -1
    Fixed that multibyte charsets didn't honor multibyte
    sequence boundaries in functions LIKE and LOCATE in
    the case of "binary" collation. Comparison was done
    like if the strings were just a binary strings without
    character set assumption.

  sql/item_func.cc
    1.124.8.1 03/09/19 15:18:16 bar@bar.mysql.r18.ru +12 -42
    Fixed that multibyte charsets didn't honor multibyte
    sequence boundaries in functions LIKE and LOCATE in
    the case of "binary" collation. Comparison was done
    like if the strings were just a binary strings without
    character set assumption.

  mysys/charset.c
    1.100 03/09/19 15:18:16 bar@bar.mysql.r18.ru +1 -1
    Fixed that multibyte charsets didn't honor multibyte
    sequence boundaries in functions LIKE and LOCATE in
    the case of "binary" collation. Comparison was done
    like if the strings were just a binary strings without
    character set assumption.

  mysql-test/t/ctype_ujis.test
    1.4 03/09/19 15:18:16 bar@bar.mysql.r18.ru +26 -0
    Fixed that multibyte charsets didn't honor multibyte
    sequence boundaries in functions LIKE and LOCATE in
    the case of "binary" collation. Comparison was done
    like if the strings were just a binary strings without
    character set assumption.

  mysql-test/r/have_ujis.require
    1.4 03/09/19 15:18:16 bar@bar.mysql.r18.ru +1 -1
    Fixed that multibyte charsets didn't honor multibyte
    sequence boundaries in functions LIKE and LOCATE in
    the case of "binary" collation. Comparison was done
    like if the strings were just a binary strings without
    character set assumption.

  mysql-test/r/ctype_ujis.result
    1.3 03/09/19 15:18:16 bar@bar.mysql.r18.ru +58 -0
    Fixed that multibyte charsets didn't honor multibyte
    sequence boundaries in functions LIKE and LOCATE in
    the case of "binary" collation. Comparison was done
    like if the strings were just a binary strings without
    character set assumption.

  include/m_ctype.h
    1.75 03/09/19 15:18:16 bar@bar.mysql.r18.ru +13 -1
    Fixed that multibyte charsets didn't honor multibyte
    sequence boundaries in functions LIKE and LOCATE in
    the case of "binary" collation. Comparison was done
    like if the strings were just a binary strings without
    character set assumption.

ChangeSet
  1.1563.53.5 03/09/19 14:44:31 hf@deer.(none) +20 -0
  SCRUM
  embedded library
  hash_insert renamed to my_hash_insert to avoid name intersection
  with another libraries
  is there better idea?

  tools/mysqlmanager.c
    1.38 03/09/19 14:44:28 hf@deer.(none) +2 -2
    hash_insert ->my_hash_insert

  sql/table.cc
    1.84.1.1 03/09/19 14:44:28 hf@deer.(none) +1 -1
    hash_insert ->my_hash_insert

  sql/sql_udf.cc
    1.32 03/09/19 14:44:28 hf@deer.(none) +1 -1
    hash_insert ->my_hash_insert

  sql/sql_select.cc
    1.216.1.40 03/09/19 14:44:28 hf@deer.(none) +1 -1
    hash_insert ->my_hash_insert

  sql/sql_parse.cc
    1.271.28.4 03/09/19 14:44:28 hf@deer.(none) +1 -1
    hash_insert ->my_hash_insert

  sql/sql_cache.cc
    1.46.1.7 03/09/19 14:44:28 hf@deer.(none) +2 -2
    hash_insert ->my_hash_insert

  sql/sql_base.cc
    1.145.12.2 03/09/19 14:44:28 hf@deer.(none) +1 -1
    hash_insert ->my_hash_insert

  sql/sql_acl.cc
    1.74.1.17 03/09/19 14:44:28 hf@deer.(none) +5 -5
    hash_insert ->my_hash_insert

  sql/slave.cc
    1.188.1.20 03/09/19 14:44:28 hf@deer.(none) +1 -1
    hash_insert ->my_hash_insert

  sql/set_var.cc
    1.34.15.4 03/09/19 14:44:28 hf@deer.(none) +1 -1
    hash_insert ->my_hash_insert

  sql/repl_failsafe.cc
    1.32.5.2 03/09/19 14:44:28 hf@deer.(none) +2 -2
    hash_insert ->my_hash_insert

  sql/lock.cc
    1.42.2.1 03/09/19 14:44:28 hf@deer.(none) +1 -1
    hash_insert ->my_hash_insert

  sql/item_func.cc
    1.124.1.25 03/09/19 14:44:28 hf@deer.(none) +2 -2
    hash_insert ->my_hash_insert

  sql/hash_filo.h
    1.10 03/09/19 14:44:28 hf@deer.(none) +1 -1
    hash_insert ->my_hash_insert

  sql/ha_innodb.cc
    1.90.1.9 03/09/19 14:44:28 hf@deer.(none) +1 -1
    hash_insert ->my_hash_insert

  sql/ha_berkeley.cc
    1.117.1.2 03/09/19 14:44:28 hf@deer.(none) +1 -1
    hash_insert ->my_hash_insert

  mysys/testhash.c
    1.7 03/09/19 14:44:28 hf@deer.(none) +2 -2
    hash_insert ->my_hash_insert

  mysys/hash.c
    1.28 03/09/19 14:44:28 hf@deer.(none) +1 -1
    hash_insert ->my_hash_insert

  include/hash.h
    1.12 03/09/19 14:44:28 hf@deer.(none) +1 -1
    hash_insert ->my_hash_insert

  client/mysqltest.c
    1.92.1.15 03/09/19 14:44:28 hf@deer.(none) +4 -4
    hash_insert ->my_hash_insert

ChangeSet
  1.1563.53.4 03/09/19 14:17:55 hf@deer.(none) +3 -0
  SCRUM
  embedded library
  missed memory freeing added

  libmysqld/libmysqld.c
    1.53 03/09/19 14:17:53 hf@deer.(none) +3 -0
    mysql->thd releasing

  libmysqld/lib_sql.cc
    1.75 03/09/19 14:17:53 hf@deer.(none) +10 -0
    implementation added

  libmysqld/embedded_priv.h
    1.8 03/09/19 14:17:53 hf@deer.(none) +1 -0
    declaration added

ChangeSet
  1.1563.53.3 03/09/19 14:05:28 hf@deer.(none) +6 -0
  SCRUM
  prepared statements in embedded library.
  some fixes after testing

  sql/client_settings.h
    1.12 03/09/19 14:05:26 hf@deer.(none) +0 -5
    decided to remove such defines - i placed single #ifdef in client.c

  sql-common/client.c
    1.30 03/09/19 14:05:26 hf@deer.(none) +6 -3
    added items in methods table

  libmysqld/lib_sql.cc
    1.74 03/09/19 14:05:26 hf@deer.(none) +24 -4
    implementation added

  libmysql/libmysql.c
    1.156.1.30 03/09/19 14:05:26 hf@deer.(none) +12 -4
    implementation added
    mysql_fetch changed to work in both libraries

  libmysql/client_settings.h
    1.12 03/09/19 14:05:26 hf@deer.(none) +1 -0
    declaration added

  include/mysql.h
    1.92 03/09/19 14:05:26 hf@deer.(none) +3 -0
    virtual method added

ChangeSet
  1.1563.54.2 03/09/19 14:02:49 ram@gw.mysql.r18.ru +2 -0
  Test for mysqldump

  mysql-test/t/mysqldump.test
    1.1 03/09/19 14:02:47 ram@gw.mysql.r18.ru +10 -0

  mysql-test/t/mysqldump.test
    1.0 03/09/19 14:02:47 ram@gw.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/ram/work/4.1/mysql-test/t/mysqldump.test

  mysql-test/r/mysqldump.result
    1.1 03/09/19 14:02:46 ram@gw.mysql.r18.ru +20 -0

  mysql-test/r/mysqldump.result
    1.0 03/09/19 14:02:46 ram@gw.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/ram/work/4.1/mysql-test/r/mysqldump.result

ChangeSet
  1.1563.54.1 03/09/19 12:25:03 ram@gw.mysql.r18.ru +4 -0
  Fix for the bug #1333: COMPRESS(NULL) segfaults.

  BitKeeper/etc/logging_ok
    1.233.1.26 03/09/19 12:25:02 ram@gw.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  sql/item_strfunc.cc
    1.135.2.1 03/09/19 12:24:54 ram@gw.mysql.r18.ru +10 -0
    Fix for the bug #1333: COMPRESS(NULL) segfaults.

  mysql-test/t/func_compress.test
    1.3 03/09/19 12:24:54 ram@gw.mysql.r18.ru +6 -0
    Test for the bug #1333: COMPRESS(NULL) segfaults.

  mysql-test/r/func_compress.result
    1.3 03/09/19 12:24:54 ram@gw.mysql.r18.ru +6 -0
    Test for the bug #1333: COMPRESS(NULL) segfaults.

ChangeSet
  1.1563.53.2 03/09/18 18:58:02 hf@deer.(none) +9 -0
  SCRUM
  embedded library
  some dirty places cleaned:
  
  uint removed from mysql.h as Miguel suggested
  empty_string renamed as my_empty_string to get rid of name's intersections
  using embedded library

  sql/sql_prepare.cc
    1.34.1.12 03/09/18 18:57:59 hf@deer.(none) +2 -0
    net_flush ifdef-ed

  sql/sql_class.cc
    1.105.1.18 03/09/18 18:57:59 hf@deer.(none) +1 -1
    empty_string -> my_empty_string

  sql/set_var.cc
    1.34.15.3 03/09/18 18:57:59 hf@deer.(none) +1 -1
    empty_string -> my_empty_string

  sql/mysql_priv.h
    1.186.28.3 03/09/18 18:57:59 hf@deer.(none) +1 -1
    empty_string -> my_empty_string

  sql/item_strfunc.cc
    1.135.1.1 03/09/18 18:57:59 hf@deer.(none) +20 -20
    empty_string -> my_empty_string

  sql-common/client.c
    1.29 03/09/18 18:57:59 hf@deer.(none) +2 -2
    uint -> unsigned int

  libmysqld/lib_sql.cc
    1.73 03/09/18 18:57:59 hf@deer.(none) +2 -2
    uint -> unsigned int

  include/mysql_com.h
    1.67.1.16 03/09/18 18:57:59 hf@deer.(none) +1 -1
    this caused warnings when not in expression

  include/mysql.h
    1.91 03/09/18 18:57:59 hf@deer.(none) +2 -2
    uint -> unsigned int

ChangeSet
  1.1563.53.1 03/09/18 18:28:42 hf@deer.(none) +5 -0
  SCRUM:
  embedded library
  I decided to get rid of #define mysql_some_function in mysql.h
  It puzzles users and makes problems with dynamic libraries
  
  Finally, there are only two functions left, that are covered with
  the #define-s and it won't hurt performance at all

  sql-common/client.c
    1.28 03/09/18 18:28:38 hf@deer.(none) +4 -4
    skip wrapper function

  libmysqld/libmysqld.c
    1.52 03/09/18 18:28:38 hf@deer.(none) +1 -1
    skip wrapper function

  libmysql/libmysql.c
    1.156.1.29 03/09/18 18:28:38 hf@deer.(none) +15 -4
    that'll be faster that calls of wrapper functions

  include/mysql.h
    1.90 03/09/18 18:28:38 hf@deer.(none) +2 -3
    #defines changed to functions

  client/mysqltest.c
    1.92.1.14 03/09/18 18:28:38 hf@deer.(none) +1 -1
    that'll be faster

ChangeSet
  1.1563.52.1 03/09/18 14:54:53 bar@bar.mysql.r18.ru +1 -0
  configure.in:
    Fix the problem with errmsg compilation

  configure.in
    1.201.1.42 03/09/18 14:54:32 bar@bar.mysql.r18.ru +2 -2
    Fix the problem with errmsg compilation

ChangeSet
  1.1563.48.7 03/09/18 12:25:00 hf@deer.(none) +6 -0
  SCRUM
  prepared statements in embedded library

  sql/sql_prepare.cc
    1.34.1.11 03/09/18 12:24:58 hf@deer.(none) +0 -2
    now it works in embedded library

  sql/protocol.h
    1.15 03/09/18 12:24:58 hf@deer.(none) +1 -0
    definition for net_store_data

  sql/protocol.cc
    1.56.1.15 03/09/18 12:24:58 hf@deer.(none) +3 -1
    net_store_data should work that way in Protocol_prep (embedded server)

  libmysqld/libmysqld.c
    1.51 03/09/18 12:24:58 hf@deer.(none) +0 -2
    we already have the define in client_settings.h

  libmysqld/lib_sql.cc
    1.72 03/09/18 12:24:58 hf@deer.(none) +10 -3
    some bugs fixed

  include/mysql_com.h
    1.67.1.15 03/09/18 12:24:58 hf@deer.(none) +1 -1
    to make net_flush() working in expressions

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

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

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

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

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

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

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

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

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

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

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

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

ChangeSet
  1.1563.48.5 03/09/17 20:48:53 hf@deer.(none) +11 -0
  SCRUM:
  prepared statements in embedded library

  sql/sql_prepare.cc
    1.34.1.10 03/09/17 20:48:51 hf@deer.(none) +18 -6
    parts of code #ifndef-ed

  sql/sql_class.h
    1.146.1.36 03/09/17 20:48:51 hf@deer.(none) +5 -0
    i changed this only for embedded case, but i think it's better to do the
    same for remote server also

  sql/protocol.h
    1.14 03/09/17 20:48:51 hf@deer.(none) +13 -0
    had to change Protocol's interface for embedded library

  sql/protocol.cc
    1.56.1.14 03/09/17 20:48:51 hf@deer.(none) +9 -0
    the stub added

  sql/mysql_priv.h
    1.186.28.2 03/09/17 20:48:51 hf@deer.(none) +2 -0
    these functions became global

  sql/client_settings.h
    1.11 03/09/17 20:48:51 hf@deer.(none) +1 -0
    no prepared statements in mimiclient

  sql-common/client.c
    1.27 03/09/17 20:48:51 hf@deer.(none) +2 -1
    method added to the table

  libmysqld/lib_sql.cc
    1.71 03/09/17 20:48:51 hf@deer.(none) +127 -11
    one error fixed (we do need parameter's buffer in embedded library)
    embedded recordset transfer methods implementations added

  libmysql/libmysql.c
    1.156.1.28 03/09/17 20:48:51 hf@deer.(none) +11 -11
    mysql_execute edited to work with embedded implementation

  libmysql/client_settings.h
    1.11 03/09/17 20:48:51 hf@deer.(none) +1 -0
    client implementation declared

  include/mysql.h
    1.89 03/09/17 20:48:51 hf@deer.(none) +2 -0
    Another 'virtual' method

ChangeSet
  1.1563.51.2 03/09/17 14:55:27 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1

  sql/sql_parse.cc
    1.271.28.3 03/09/17 14:55:24 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1563.51.1 03/09/17 16:22:58 bar@bar.mysql.r18.ru +5 -0
  Charset number is now stored into error.sys by comp_err and loaded by mysqld.

  sql/share/Makefile.am
    1.23 03/09/17 16:22:55 bar@bar.mysql.r18.ru +1 -1
    Charset number is now stored into error.sys by comp_err and loaded by mysqld.

  sql/derror.cc
    1.10 03/09/17 16:22:55 bar@bar.mysql.r18.ru +11 -0
    Charset number is now stored into error.sys by comp_err and loaded by mysqld.

  mysys/charset.c
    1.99 03/09/17 16:22:55 bar@bar.mysql.r18.ru +23 -16
    Charset number is now stored into error.sys by comp_err and loaded by mysqld.

  include/my_sys.h
    1.100.1.7 03/09/17 16:22:55 bar@bar.mysql.r18.ru +3 -1
    Charset number is now stored into error.sys by comp_err and loaded by mysqld.

  extra/comp_err.c
    1.8 03/09/17 16:22:55 bar@bar.mysql.r18.ru +11 -3
    Charset number is now stored into error.sys by comp_err and loaded by mysqld.

ChangeSet
  1.1563.4.5 03/09/17 12:30:05 pem@mysql.telia.com +1 -0
  Fix bug in sp.cc:db_find_routine() which made tables remain open in some cases.

  sql/sp.cc
    1.25 03/09/17 12:30:02 pem@mysql.com +2 -2
    Fix bug which made tables remain open in some cases.

ChangeSet
  1.1563.49.2 03/09/17 15:18:18 hf@deer.(none) +7 -0
  SCRUM
  prepared statements in embedded library

  sql/client_settings.h
    1.10 03/09/17 15:18:16 hf@deer.(none) +1 -0
    no need for prepared statements in miniclient

  sql-common/client.c
    1.26 03/09/17 15:18:16 hf@deer.(none) +5 -4
    cli_stmt_execute added to the methods table

  libmysqld/lib_sql.cc
    1.70 03/09/17 15:18:16 hf@deer.(none) +41 -2
    code for embedded stmt_execute added

  libmysql/libmysql.c
    1.156.1.27 03/09/17 15:18:16 hf@deer.(none) +41 -28
    some functions changed to be usable from embedded library

  libmysql/client_settings.h
    1.10 03/09/17 15:18:16 hf@deer.(none) +1 -0
    declaration for cli_stmt_execute

  include/sql_common.h
    1.8 03/09/17 15:18:16 hf@deer.(none) +7 -0
    two functions became global

  include/mysql.h
    1.88 03/09/17 15:18:16 hf@deer.(none) +1 -0
    stmt_execute 'virtual' method added

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

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

ChangeSet
  1.1563.48.3 03/09/17 14:25:04 bar@bar.mysql.r18.ru +24 -0
  Preparing to support character set in error messages

  sql/share/ukrainian/errmsg.txt
    1.27.1.21 03/09/17 14:25:01 bar@bar.mysql.r18.ru +2 -0
    Preparing to support character set in error messages

  sql/share/swedish/errmsg.txt
    1.64.1.24 03/09/17 14:25:01 bar@bar.mysql.r18.ru +2 -0
    Preparing to support character set in error messages

  sql/share/spanish/errmsg.txt
    1.64.1.23 03/09/17 14:25:01 bar@bar.mysql.r18.ru +3 -0
    Preparing to support character set in error messages

  sql/share/slovak/errmsg.txt
    1.64.1.22 03/09/17 14:25:01 bar@bar.mysql.r18.ru +2 -0
    Preparing to support character set in error messages

  sql/share/serbian/errmsg.txt
    1.18.1.20 03/09/17 14:25:01 bar@bar.mysql.r18.ru +2 -0
    Preparing to support character set in error messages

  sql/share/russian/errmsg.txt
    1.61.1.22 03/09/17 14:25:01 bar@bar.mysql.r18.ru +2 -0
    Preparing to support character set in error messages

  sql/share/romanian/errmsg.txt
    1.62.1.22 03/09/17 14:25:01 bar@bar.mysql.r18.ru +2 -0
    Preparing to support character set in error messages

  sql/share/portuguese/errmsg.txt
    1.64.1.24 03/09/17 14:25:01 bar@bar.mysql.r18.ru +3 -0
    Preparing to support character set in error messages

  sql/share/polish/errmsg.txt
    1.63.1.22 03/09/17 14:25:01 bar@bar.mysql.r18.ru +2 -0
    Preparing to support character set in error messages

  sql/share/norwegian/errmsg.txt
    1.63.1.22 03/09/17 14:25:01 bar@bar.mysql.r18.ru +2 -0
    Preparing to support character set in error messages

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.22 03/09/17 14:25:01 bar@bar.mysql.r18.ru +2 -0
    Preparing to support character set in error messages

  sql/share/korean/errmsg.txt
    1.63.1.21 03/09/17 14:25:01 bar@bar.mysql.r18.ru +2 -0
    Preparing to support character set in error messages

  sql/share/japanese/errmsg.txt
    1.63.1.21 03/09/17 14:25:01 bar@bar.mysql.r18.ru +2 -0
    Preparing to support character set in error messages

  sql/share/italian/errmsg.txt
    1.70.1.22 03/09/17 14:25:01 bar@bar.mysql.r18.ru +2 -0
    Preparing to support character set in error messages

  sql/share/hungarian/errmsg.txt
    1.65.1.21 03/09/17 14:25:01 bar@bar.mysql.r18.ru +2 -0
    Preparing to support character set in error messages

  sql/share/greek/errmsg.txt
    1.64.1.21 03/09/17 14:25:01 bar@bar.mysql.r18.ru +2 -0
    Preparing to support character set in error messages

  sql/share/german/errmsg.txt
    1.64.1.22 03/09/17 14:25:01 bar@bar.mysql.r18.ru +2 -0
    Preparing to support character set in error messages

  sql/share/french/errmsg.txt
    1.63.1.22 03/09/17 14:25:01 bar@bar.mysql.r18.ru +2 -0
    Preparing to support character set in error messages

  sql/share/estonian/errmsg.txt
    1.64.1.21 03/09/17 14:25:01 bar@bar.mysql.r18.ru +2 -0
    Preparing to support character set in error messages

  sql/share/english/errmsg.txt
    1.70.1.25 03/09/17 14:25:01 bar@bar.mysql.r18.ru +2 -0
    Preparing to support character set in error messages

  sql/share/dutch/errmsg.txt
    1.66.1.22 03/09/17 14:25:01 bar@bar.mysql.r18.ru +2 -0
    Preparing to support character set in error messages

  sql/share/danish/errmsg.txt
    1.62.1.22 03/09/17 14:25:01 bar@bar.mysql.r18.ru +2 -0
    Preparing to support character set in error messages

  sql/share/czech/errmsg.txt
    1.64.1.22 03/09/17 14:25:01 bar@bar.mysql.r18.ru +2 -0
    Preparing to support character set in error messages

  extra/comp_err.c
    1.7 03/09/17 14:25:01 bar@bar.mysql.r18.ru +25 -0
    Preparing to support character set in error messages

ChangeSet
  1.1563.48.2 03/09/17 00:30:29 greg@mysql.com +1 -0
  BUG #1305: ISAM table handler should not be compiled by default under 4.1

  include/config-win.h
    1.36 03/09/17 00:30:14 greg@mysql.com +0 -1
    ISAM table handler is no longer compiled with 4.1

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

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

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

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

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

ChangeSet
  1.1563.50.1 03/09/16 15:23:38 serg@sergbook.mysql.com +2 -0
  minor cleanups

  sql/item_timefunc.cc
    1.43 03/09/16 15:23:10 serg@sergbook.mysql.com +3 -3
    unnecessary "typedef" keyword removed (VC++ warning)

  heap/hp_info.c
    1.7 03/09/16 15:23:10 serg@sergbook.mysql.com +1 -2
    flag in not really unused here :)

ChangeSet
  1.1563.4.4 03/09/16 14:26:08 pem@mysql.telia.com +42 -0
  Implemented SP CONDITIONs and HANDLERs, with the extension of handling
  MySQL error codes as well.
  (No UNDO HANDLERs yet, and no SIGNAL or RESIGNAL.)
  WL#850

  sql/sp_rcontext.cc
    1.1 03/09/16 14:26:05 pem@mysql.com +95 -0

  sql/sql_yacc.yy
    1.238 03/09/16 14:26:05 pem@mysql.com +175 -19
    New CONDITION and HANDLER code.

  sql/sp_rcontext.h
    1.3 03/09/16 14:26:05 pem@mysql.com +89 -8
    New CONDITION and HANDLER code.

  sql/sp_rcontext.cc
    1.0 03/09/16 14:26:05 pem@mysql.com +0 -0
    BitKeeper file /home/pem/work/mysql-5.0/sql/sp_rcontext.cc

  sql/sp_pcontext.h
    1.8 03/09/16 14:26:05 pem@mysql.com +59 -3
    New CONDITION and HANDLER code.

  sql/sp_pcontext.cc
    1.11 03/09/16 14:26:05 pem@mysql.com +46 -4
    New CONDITION and HANDLER code.

  sql/sp_head.h
    1.22 03/09/16 14:26:05 pem@mysql.com +100 -6
    New HANDLER code.

  sql/sp_head.cc
    1.39 03/09/16 14:26:05 pem@mysql.com +74 -7
    New HANDLER code.

  sql/share/ukrainian/errmsg.txt
    1.41 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/swedish/errmsg.txt
    1.79 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/spanish/errmsg.txt
    1.78 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/slovak/errmsg.txt
    1.78 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/serbian/errmsg.txt
    1.32 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/russian/errmsg.txt
    1.76 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/romanian/errmsg.txt
    1.75 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/portuguese/errmsg.txt
    1.78 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/polish/errmsg.txt
    1.78 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/norwegian/errmsg.txt
    1.77 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/norwegian-ny/errmsg.txt
    1.77 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/korean/errmsg.txt
    1.77 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/japanese/errmsg.txt
    1.77 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/italian/errmsg.txt
    1.84 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/hungarian/errmsg.txt
    1.79 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/greek/errmsg.txt
    1.78 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/german/errmsg.txt
    1.79 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/french/errmsg.txt
    1.77 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/estonian/errmsg.txt
    1.78 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/english/errmsg.txt
    1.85 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/dutch/errmsg.txt
    1.80 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/danish/errmsg.txt
    1.76 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/share/czech/errmsg.txt
    1.77 03/09/16 14:26:05 pem@mysql.com +1 -0
    New error for undeclared CONDITION.

  sql/protocol.cc
    1.61 03/09/16 14:26:05 pem@mysql.com +13 -0
    Catch error if we have a handler for it.

  sql/mysqld.cc
    1.367 03/09/16 14:26:05 pem@mysql.com +5 -0
    Catch error if we have a handler for it.

  sql/lex.h
    1.99 03/09/16 14:26:05 pem@mysql.com +10 -2
    New symbols for CONDITIONs, HANDLERs and CURSORs.

  sql/Makefile.am
    1.86 03/09/16 14:26:05 pem@mysql.com +2 -1
    New file: sp_rcontext.cc.

  mysql-test/t/sp.test
    1.22 03/09/16 14:26:05 pem@mysql.com +70 -0
    New tests for CONDITIONs and HANDLERs.

  mysql-test/t/sp-error.test
    1.11 03/09/16 14:26:05 pem@mysql.com +29 -0
    New tests for CONDITIONs and HANDLERs.

  mysql-test/r/sp.result
    1.21 03/09/16 14:26:05 pem@mysql.com +57 -0
    New tests for CONDITIONs and HANDLERs.

  mysql-test/r/sp-error.result
    1.10 03/09/16 14:26:05 pem@mysql.com +25 -0
    New tests for CONDITIONs and HANDLERs.

  libmysqld/Makefile.am
    1.35 03/09/16 14:26:05 pem@mysql.com +1 -1
    New file: sp_rcontext.cc.

  include/mysqld_error.h
    1.74 03/09/16 14:26:05 pem@mysql.com +2 -1
    New error for undeclared CONDITION.

  Docs/sp-implemented.txt
    1.7 03/09/16 14:26:05 pem@mysql.com +15 -5
    Updated info about caching, CONDITIONs and HANDLERs.

  Docs/sp-imp-spec.txt
    1.6 03/09/16 14:26:05 pem@mysql.com +342 -91
    Spec of CONDITIONs and HANDLERs (and updated some old stuff too).

ChangeSet
  1.1563.48.1 03/09/16 17:14:23 bar@bar.mysql.r18.ru +3 -0
  Bug fix: 
    SET character_set_connection=newcharset;
    SELECT hex('text');
  
  The above sequence failed in some cases.

  sql/set_var.cc
    1.34.15.2 03/09/16 17:14:20 bar@bar.mysql.r18.ru +1 -0
    Bug fix: 
      SET character_set_connection=newcharset;
      SELECT hex('text');
    
    The above sequence failed in some cases.

  mysql-test/t/ctype_recoding.test
    1.8 03/09/16 17:14:20 bar@bar.mysql.r18.ru +5 -0
    Bug fix: 
      SET character_set_connection=newcharset;
      SELECT hex('text');
    
    The above sequence failed in some cases.

  mysql-test/r/ctype_recoding.result
    1.11 03/09/16 17:14:20 bar@bar.mysql.r18.ru +8 -0
    Bug fix: 
      SET character_set_connection=newcharset;
      SELECT hex('text');
    
    The above sequence failed in some cases.

ChangeSet
  1.1563.1.23 03/09/16 14:52:38 monty@narttu.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into narttu.mysql.fi:/my/mysql-4.1

  sql/sql_parse.cc
    1.271.29.3 03/09/16 14:52:35 monty@narttu.mysql.fi +0 -0
    Auto merged

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

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

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

ChangeSet
  1.1563.1.22 03/09/16 16:26:33 bar@bar.mysql.r18.ru +2 -0
  UCS tests

  mysql-test/t/ctype_ucs.test
    1.1 03/09/16 16:26:31 bar@bar.mysql.r18.ru +130 -0

  mysql-test/t/ctype_ucs.test
    1.0 03/09/16 16:26:31 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/t/ctype_ucs.test

  mysql-test/r/ctype_ucs.result
    1.1 03/09/16 16:26:31 bar@bar.mysql.r18.ru +111 -0

  mysql-test/r/ctype_ucs.result
    1.0 03/09/16 16:26:30 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/r/ctype_ucs.result

ChangeSet
  1.1563.46.1 03/09/16 16:07:00 hf@deer.(none) +1 -0
  Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into deer.(none):/home/hf/work/mysql-4.1.stmt

  sql/sql_class.h
    1.146.1.35 03/09/16 16:06:58 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1563.34.8 03/09/16 16:06:25 hf@deer.(none) +10 -0
  SCRUM
  Prepared statements in embedded server
  Several changes in library code with two goals:
  to make mysql_prepare_stmt working in embedded server
  to get rid of #define mysql_interface_func mysql->methods->interface_func
  in user's interface

  sql/sql_prepare.cc
    1.34.1.9 03/09/16 16:06:23 hf@deer.(none) +6 -5
    storing of prepare_statement result for embedded server added

  sql/sql_class.h
    1.146.19.1 03/09/16 16:06:22 hf@deer.(none) +3 -0
    place to store statement data added to THD

  sql-common/client.c
    1.25 03/09/16 16:06:22 hf@deer.(none) +9 -8
    several changes with the declared goal

  libmysqld/libmysqld.c
    1.50 03/09/16 16:06:22 hf@deer.(none) +1 -144
    embedded 'virtual' function was moved out of here

  libmysqld/lib_sql.cc
    1.69 03/09/16 16:06:22 hf@deer.(none) +110 -44
    all embedded 'virtual' functions moved here so they can be static

  libmysqld/embedded_priv.h
    1.7 03/09/16 16:06:22 hf@deer.(none) +3 -0
    libmysqld.c <--> lib_sql.cc interface moved here

  libmysql/libmysql.c
    1.156.1.26 03/09/16 16:06:22 hf@deer.(none) +29 -23
    several functions changed with declared goals

  libmysql/client_settings.h
    1.9 03/09/16 16:06:22 hf@deer.(none) +12 -2
    interface of some functions declared in client.c moved here

  include/sql_common.h
    1.7 03/09/16 16:06:22 hf@deer.(none) +0 -2
    read_rows function got 'virtual'

  include/mysql.h
    1.87 03/09/16 16:06:22 hf@deer.(none) +7 -6
    modifications of interface
    two goals: to implement prepared statements and to get rid
    of #define mysql_proc (mysql->smth) in interface

ChangeSet
  1.1563.1.21 03/09/16 15:43:17 bar@bar.mysql.r18.ru +15 -0
  Bug fix:
  
  http://bugs.mysql.com/bug.php?id=1264

  strings/ctype-utf8.c
    1.50 03/09/16 15:43:13 bar@bar.mysql.r18.ru +1 -0
    Bug fix:
    
    http://bugs.mysql.com/bug.php?id=1264

  strings/ctype-ujis.c
    1.42 03/09/16 15:43:13 bar@bar.mysql.r18.ru +1 -0
    Bug fix:
    
    http://bugs.mysql.com/bug.php?id=1264

  strings/ctype-ucs2.c
    1.8 03/09/16 15:43:12 bar@bar.mysql.r18.ru +20 -1
    Bug fix:
    
    http://bugs.mysql.com/bug.php?id=1264

  strings/ctype-tis620.c
    1.51 03/09/16 15:43:12 bar@bar.mysql.r18.ru +1 -0
    Bug fix:
    
    http://bugs.mysql.com/bug.php?id=1264

  strings/ctype-sjis.c
    1.48 03/09/16 15:43:12 bar@bar.mysql.r18.ru +1 -0
    Bug fix:
    
    http://bugs.mysql.com/bug.php?id=1264

  strings/ctype-simple.c
    1.35 03/09/16 15:43:12 bar@bar.mysql.r18.ru +11 -0
    Bug fix:
    
    http://bugs.mysql.com/bug.php?id=1264

  strings/ctype-latin1.c
    1.17 03/09/16 15:43:12 bar@bar.mysql.r18.ru +1 -0
    Bug fix:
    
    http://bugs.mysql.com/bug.php?id=1264

  strings/ctype-gbk.c
    1.43 03/09/16 15:43:12 bar@bar.mysql.r18.ru +1 -0
    Bug fix:
    
    http://bugs.mysql.com/bug.php?id=1264

  strings/ctype-gb2312.c
    1.39 03/09/16 15:43:12 bar@bar.mysql.r18.ru +1 -0
    Bug fix:
    
    http://bugs.mysql.com/bug.php?id=1264

  strings/ctype-euc_kr.c
    1.42 03/09/16 15:43:12 bar@bar.mysql.r18.ru +1 -0
    Bug fix:
    
    http://bugs.mysql.com/bug.php?id=1264

  strings/ctype-bin.c
    1.32 03/09/16 15:43:12 bar@bar.mysql.r18.ru +1 -0
    Bug fix:
    
    http://bugs.mysql.com/bug.php?id=1264

  strings/ctype-big5.c
    1.43 03/09/16 15:43:12 bar@bar.mysql.r18.ru +1 -0
    Bug fix:
    
    http://bugs.mysql.com/bug.php?id=1264

  sql/field.cc
    1.115 03/09/16 15:43:12 bar@bar.mysql.r18.ru +2 -6
    Bug fix:
    
    http://bugs.mysql.com/bug.php?id=1264

  mysql-test/r/ctype_many.result
    1.5 03/09/16 15:43:12 bar@bar.mysql.r18.ru +131 -131
    Bug fix:
    
    http://bugs.mysql.com/bug.php?id=1264

  include/m_ctype.h
    1.74 03/09/16 15:43:12 bar@bar.mysql.r18.ru +3 -0
    Bug fix:
    
    http://bugs.mysql.com/bug.php?id=1264

ChangeSet
  1.1563.1.20 03/09/16 12:36:36 bar@bar.mysql.r18.ru +2 -0
  Bug fix:
  http://bugs.mysql.com/bug.php?id=1264

  sql/sql_show.cc
    1.122.4.6 03/09/16 12:36:34 bar@bar.mysql.r18.ru +1 -1
    Bug fix:
    http://bugs.mysql.com/bug.php?id=1264

  mysql-test/r/show_check.result
    1.31.1.7 03/09/16 12:36:34 bar@bar.mysql.r18.ru +1 -1
    Bug fix:
    http://bugs.mysql.com/bug.php?id=1264

ChangeSet
  1.1563.1.19 03/09/16 12:14:40 bar@bar.mysql.r18.ru +6 -0
  Bug fix:
  http://bugs.mysql.com/bug.php?id=1129
  From:	Georg Richter
  Description: there is a problem with special chars like umlauts in comments 
  

  sql/sql_yacc.yy
    1.203.72.4 03/09/16 12:14:37 bar@bar.mysql.r18.ru +5 -3
    Bug fix:
    http://bugs.mysql.com/bug.php?id=1129
    From:	Georg Richter
    Description: there is a problem with special chars like umlauts in comments 
    

  sql/sql_parse.cc
    1.271.29.2 03/09/16 12:14:37 bar@bar.mysql.r18.ru +3 -3
    Bug fix:
    http://bugs.mysql.com/bug.php?id=1129
    From:	Georg Richter
    Description: there is a problem with special chars like umlauts in comments 
    

  sql/sql_lex.h
    1.102.22.5 03/09/16 12:14:37 bar@bar.mysql.r18.ru +2 -1
    Bug fix:
    http://bugs.mysql.com/bug.php?id=1129
    From:	Georg Richter
    Description: there is a problem with special chars like umlauts in comments 
    

  sql/mysql_priv.h
    1.186.28.1 03/09/16 12:14:37 bar@bar.mysql.r18.ru +2 -1
    Bug fix:
    http://bugs.mysql.com/bug.php?id=1129
    From:	Georg Richter
    Description: there is a problem with special chars like umlauts in comments 
    

  mysql-test/t/ctype_recoding.test
    1.7 03/09/16 12:14:37 bar@bar.mysql.r18.ru +2 -2
    Bug fix:
    http://bugs.mysql.com/bug.php?id=1129
    From:	Georg Richter
    Description: there is a problem with special chars like umlauts in comments 
    

  mysql-test/r/ctype_recoding.result
    1.10 03/09/16 12:14:37 bar@bar.mysql.r18.ru +8 -8
    Bug fix:
    http://bugs.mysql.com/bug.php?id=1129
    From:	Georg Richter
    Description: there is a problem with special chars like umlauts in comments 
    

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

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

ChangeSet
  1.1563.45.1 03/09/16 02:58:46 dlenev@dlenev.mshome +2 -0
  Made rpl_until test independent from mysqld version

  mysql-test/t/rpl_until.test
    1.3 03/09/16 02:58:44 dlenev@mysql.com +4 -0
    Made test indepdendent from mysqld version

  mysql-test/r/rpl_until.result
    1.3 03/09/16 02:58:44 dlenev@mysql.com +1 -1
    Made test indepdendent from mysqld version

ChangeSet
  1.1563.1.17 03/09/16 02:39:25 kostja@oak.local +1 -0
  minor authentification optimisation

  sql/sql_parse.cc
    1.271.29.1 03/09/16 02:39:21 kostja@oak.local +9 -9
    authentification fix: one constructor and two
    variables optimised

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

ChangeSet
  1.1563.1.16 03/09/15 16:40:49 bar@bar.mysql.r18.ru +1 -0
  Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
  into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

  sql/sql_yacc.yy
    1.203.72.3 03/09/15 16:40:46 bar@bar.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1563.43.5 03/09/15 16:31:04 bar@bar.mysql.r18.ru +9 -0
  New SQL variables "collation_server" and "collation_database"

  sql/sql_yacc.yy
    1.203.73.1 03/09/15 16:31:01 bar@bar.mysql.r18.ru +3 -3
    New SQL variables "collation_server" and "collation_database"

  sql/sql_load.cc
    1.46.3.12 03/09/15 16:31:01 bar@bar.mysql.r18.ru +1 -1
    New SQL variables "collation_server" and "collation_database"

  sql/sql_db.cc
    1.68.1.11 03/09/15 16:31:01 bar@bar.mysql.r18.ru +6 -6
    New SQL variables "collation_server" and "collation_database"

  sql/sql_class.h
    1.146.1.34 03/09/15 16:31:01 bar@bar.mysql.r18.ru +5 -2
    New SQL variables "collation_server" and "collation_database"

  sql/sql_class.cc
    1.105.1.17 03/09/15 16:31:01 bar@bar.mysql.r18.ru +1 -1
    New SQL variables "collation_server" and "collation_database"

  sql/sql_base.cc
    1.145.12.1 03/09/15 16:31:01 bar@bar.mysql.r18.ru +2 -2
    New SQL variables "collation_server" and "collation_database"

  sql/set_var.h
    1.33 03/09/15 16:31:01 bar@bar.mysql.r18.ru +17 -0
    New SQL variables "collation_server" and "collation_database"

  sql/set_var.cc
    1.34.15.1 03/09/15 16:31:01 bar@bar.mysql.r18.ru +85 -9
    New SQL variables "collation_server" and "collation_database"

  sql/mysqld.cc
    1.356.1.41 03/09/15 16:31:01 bar@bar.mysql.r18.ru +6 -6
    New SQL variables "collation_server" and "collation_database"

ChangeSet
  1.1563.1.14 03/09/15 12:43:31 guilhem@gbichot2 +2 -0
  Accept SLAVE START and STOP, even if deprecated.

  sql/sql_yacc.yy
    1.203.72.2 03/09/15 12:43:24 guilhem@mysql.com +16 -2
    Accept SLAVE START and STOP, even if deprecated.

  sql/log_event.cc
    1.113.1.17 03/09/15 12:43:24 guilhem@mysql.com +0 -6
    undoing a wrong change (the case is handled in Rotate_log_event::exec_event)

ChangeSet
  1.1563.44.2 03/09/15 14:45:42 bar@bar.mysql.r18.ru +4 -0
  In CREATE syntax: KEY a (field_name(10))
  
  10 now means "number of characters", not number of bytes.

  sql/sql_table.cc
    1.157.15.1 03/09/15 14:45:39 bar@bar.mysql.r18.ru +6 -2
    In CREATE syntax: KEY a (field_name(10))
    
    10 now means "number of characters", not number of bytes.

  sql/sql_show.cc
    1.122.4.5 03/09/15 14:45:39 bar@bar.mysql.r18.ru +3 -1
    In CREATE syntax: KEY a (field_name(10))
    
    10 now means "number of characters", not number of bytes.

  mysql-test/t/ctype_mb.test
    1.2 03/09/15 14:45:39 bar@bar.mysql.r18.ru +11 -0
    In CREATE syntax: KEY a (field_name(10))
    
    10 now means "number of characters", not number of bytes.

  mysql-test/r/ctype_mb.result
    1.2 03/09/15 14:45:39 bar@bar.mysql.r18.ru +31 -0
    In CREATE syntax: KEY a (field_name(10))
    
    10 now means "number of characters", not number of bytes.

ChangeSet
  1.1563.44.1 03/09/15 12:48:34 bar@bar.mysql.r18.ru +1 -0
  type_nchar.result:
    I forgot to push it in the previous changeset.

  mysql-test/r/type_nchar.result
    1.2 03/09/15 12:47:57 bar@bar.mysql.r18.ru +50 -0
    I forgot to push it in the previous changeset.

ChangeSet
  1.1563.43.1 03/09/15 10:26:48 bar@bar.mysql.r18.ru +4 -0
  New syntax:
  
  CREATE TABLE t1(a NVARCHAR(10))
  This is for compatibility with MSSQL, DB2, Informix and some other DBMSs.
  
  Note, standard SQL doesn't have "NVARCHAR" syntax.
  There are only these syntaxes in SQL2003:
   NATIONAL VARCHAR
   NCHAR VARCHAR
   NATIONAL CHARACTER VARYING 
   NCHAR VARYING
  
  - Tests were added for all the above syntaxes.

  mysql-test/t/type_nchar.test
    1.1 03/09/15 10:26:45 bar@bar.mysql.r18.ru +35 -0

  mysql-test/r/type_nchar.result
    1.1 03/09/15 10:26:45 bar@bar.mysql.r18.ru +0 -0

  sql/sql_yacc.yy
    1.203.72.1 03/09/15 10:26:45 bar@bar.mysql.r18.ru +3 -0
    New syntax:
    
    CREATE TABLE t1(a NVARCHAR(10))
    This is for compatibility with MSSQL, DB2, Informix and some other DBMSs.
    
    Note, standard SQL doesn't have "NVARCHAR" syntax.
    There are only these syntaxes in SQL2003:
     NATIONAL VARCHAR
     NCHAR VARCHAR
     NATIONAL CHARACTER VARYING 
     NCHAR VARYING

  mysql-test/t/type_nchar.test
    1.0 03/09/15 10:26:45 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/t/type_nchar.test

  mysql-test/r/type_nchar.result
    1.0 03/09/15 10:26:45 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/r/type_nchar.result

  sql/lex.h
    1.82.1.42 03/09/15 10:26:44 bar@bar.mysql.r18.ru +1 -0
    New syntax:
    
    CREATE TABLE t1(a NVARCHAR(10))
    This is for compatibility with MSSQL, DB2, Informix and some other DBMSs.
    
    Note, standard SQL doesn't have "NVARCHAR" syntax.
    There are only these syntaxes in SQL2003:
     NATIONAL VARCHAR
     NCHAR VARCHAR
     NATIONAL CHARACTER VARYING 
     NCHAR VARYING

ChangeSet
  1.1563.42.1 03/09/14 22:12:55 bell@sanja.is.com.ua +5 -0
  fixed proccesing global LIMIT in last SELECT of UNION

  sql/sql_union.cc
    1.74.5.17 03/09/14 22:12:40 bell@sanja.is.com.ua +22 -10
    fixed proccesing global LIMIT in last SELECT of UNION

  sql/sql_parse.cc
    1.271.28.2 03/09/14 22:12:40 bell@sanja.is.com.ua +4 -0
    comment + TODO

  mysql-test/t/subselect.test
    1.58.14.12 03/09/14 22:12:40 bell@sanja.is.com.ua +1 -0
    to be sure that results are correct

  mysql-test/r/union.result
    1.42.1.5 03/09/14 22:12:40 bell@sanja.is.com.ua +2 -2
    correct results

  mysql-test/r/subselect.result
    1.67.18.9 03/09/14 22:12:40 bell@sanja.is.com.ua +3 -2
    correct results

ChangeSet
  1.1563.41.1 03/09/14 18:14:43 monty@mashka.mysql.fi +5 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mashka.mysql.fi:/home/my/mysql-4.1

  sql/sql_yacc.yy
    1.203.1.64 03/09/14 18:14:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_repl.cc
    1.102.1.11 03/09/14 18:14:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.24.8 03/09/14 18:14:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.32.1.5 03/09/14 18:14:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/log.cc
    1.108.1.12 03/09/14 18:14:38 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1563.36.7 03/09/14 18:07:14 dlenev@dlenev.mshome +1 -0
  Fixed openssl_1 test after error message was updated

  mysql-test/r/openssl_1.result
    1.8 03/09/14 18:07:12 dlenev@mysql.com +4 -4
    Fixed test after error message was updated

ChangeSet
  1.1563.36.5 03/09/14 17:18:38 dlenev@dlenev.mshome +15 -0
  Post merge fixes. Fixed tests after adding UNTIL conditions 
  to SHOW SLAVE STATUS.

  mysql-test/t/rpl_until.test
    1.2 03/09/14 17:18:33 dlenev@mysql.com +5 -5
    Post merge fix

  mysql-test/r/rpl_until.result
    1.2 03/09/14 17:18:33 dlenev@mysql.com +9 -9
    Post merge fix

  mysql-test/r/rpl_rotate_logs.result
    1.47 03/09/14 17:18:33 dlenev@mysql.com +6 -6
    Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS

  mysql-test/r/rpl_reset_slave.result
    1.4 03/09/14 17:18:33 dlenev@mysql.com +8 -8
    Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS

  mysql-test/r/rpl_replicate_do.result
    1.18 03/09/14 17:18:33 dlenev@mysql.com +2 -2
    Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS

  mysql-test/r/rpl_redirect.result
    1.12 03/09/14 17:18:33 dlenev@mysql.com +1 -1
    Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS

  mysql-test/r/rpl_openssl.result
    1.3 03/09/14 17:18:33 dlenev@mysql.com +4 -4
    Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS

  mysql-test/r/rpl_max_relay_size.result
    1.6 03/09/14 17:18:33 dlenev@mysql.com +12 -12
    Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS

  mysql-test/r/rpl_log_pos.result
    1.34 03/09/14 17:18:33 dlenev@mysql.com +8 -8
    Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS

  mysql-test/r/rpl_log.result
    1.46 03/09/14 17:18:33 dlenev@mysql.com +2 -2
    Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS

  mysql-test/r/rpl_loaddata.result
    1.13 03/09/14 17:18:33 dlenev@mysql.com +6 -6
    Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS

  mysql-test/r/rpl_flush_log_loop.result
    1.10 03/09/14 17:18:33 dlenev@mysql.com +2 -2
    Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS

  mysql-test/r/rpl_error_ignored_table.result
    1.5 03/09/14 17:18:33 dlenev@mysql.com +2 -2
    Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS

  mysql-test/r/rpl_empty_master_crash.result
    1.11 03/09/14 17:18:33 dlenev@mysql.com +1 -1
    Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS

  mysql-test/r/rpl000015.result
    1.26 03/09/14 17:18:33 dlenev@mysql.com +7 -7
    Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS

ChangeSet
  1.1563.40.1 03/09/14 09:40:57 bell@sanja.is.com.ua +6 -0
  renamed join_types (as was suggested by Peter Gulutzan)

  sql/sql_select.h
    1.55 03/09/14 09:40:42 bell@sanja.is.com.ua +1 -1
    renamed join_types (as was suggested by Peter Gulutzan)

  sql/sql_select.cc
    1.216.1.39 03/09/14 09:40:42 bell@sanja.is.com.ua +20 -18
    renamed join_types (as was suggested by Peter Gulutzan)

  sql/item_subselect.h
    1.34.1.4 03/09/14 09:40:42 bell@sanja.is.com.ua +11 -11
    renamed join_types (as was suggested by Peter Gulutzan)

  sql/item_subselect.cc
    1.60.8.9 03/09/14 09:40:42 bell@sanja.is.com.ua +9 -9
    renamed join_types (as was suggested by Peter Gulutzan)

  mysql-test/r/subselect2.result
    1.2 03/09/14 09:40:42 bell@sanja.is.com.ua +5 -5
    renamed join_types (as was suggested by Peter Gulutzan)

  mysql-test/r/subselect.result
    1.67.18.8 03/09/14 09:40:42 bell@sanja.is.com.ua +8 -8
    renamed join_types (as was suggested by Peter Gulutzan)

ChangeSet
  1.1563.36.4 03/09/14 01:57:09 dlenev@mysql.com +40 -0
  Manual merge after commiting START SLAVE UNTIL

  sql/sql_yacc.yy
    1.203.1.63 03/09/14 01:57:06 dlenev@mysql.com +27 -29
    Manual merge

  sql/sql_repl.cc
    1.102.5.1 03/09/14 01:57:06 dlenev@mysql.com +3 -2
    Manual merge

  sql/slave.h
    1.67 03/09/14 01:57:06 dlenev@mysql.com +1 -1
    Manual merge

  sql/slave.cc
    1.188.1.19 03/09/14 01:57:06 dlenev@mysql.com +3 -1
    Manual merge

  sql/share/ukrainian/errmsg.txt
    1.27.1.20 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/swedish/errmsg.txt
    1.64.1.23 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/spanish/errmsg.txt
    1.64.1.22 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/slovak/errmsg.txt
    1.64.1.21 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/serbian/errmsg.txt
    1.18.1.19 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/russian/errmsg.txt
    1.61.1.21 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/romanian/errmsg.txt
    1.62.1.21 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/portuguese/errmsg.txt
    1.64.1.23 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/polish/errmsg.txt
    1.63.1.21 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/norwegian/errmsg.txt
    1.63.1.21 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.21 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/korean/errmsg.txt
    1.63.1.20 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/japanese/errmsg.txt
    1.63.1.20 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/italian/errmsg.txt
    1.70.1.21 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/hungarian/errmsg.txt
    1.65.1.20 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/greek/errmsg.txt
    1.64.1.20 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/german/errmsg.txt
    1.64.1.21 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/french/errmsg.txt
    1.63.1.21 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/estonian/errmsg.txt
    1.64.1.20 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/english/errmsg.txt
    1.70.1.24 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/dutch/errmsg.txt
    1.66.1.21 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/danish/errmsg.txt
    1.62.1.21 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  sql/share/czech/errmsg.txt
    1.64.1.21 03/09/14 01:57:06 dlenev@mysql.com +3 -3
    Manual merge

  mysql-test/r/rpl_rotate_logs.result
    1.46 03/09/14 01:57:06 dlenev@mysql.com +0 -6
    Manual merge

  mysql-test/r/rpl_replicate_do.result
    1.17 03/09/14 01:57:06 dlenev@mysql.com +0 -2
    Manual merge

  mysql-test/r/rpl_redirect.result
    1.11 03/09/14 01:57:06 dlenev@mysql.com +0 -1
    Manual merge

  mysql-test/r/rpl_log_pos.result
    1.33 03/09/14 01:57:06 dlenev@mysql.com +0 -8
    Manual merge

  mysql-test/r/rpl_log.result
    1.45 03/09/14 01:57:06 dlenev@mysql.com +0 -2
    Manual merge

  mysql-test/r/rpl_flush_log_loop.result
    1.9 03/09/14 01:57:06 dlenev@mysql.com +0 -2
    Manual merge

  mysql-test/r/rpl_empty_master_crash.result
    1.10 03/09/14 01:57:06 dlenev@mysql.com +0 -1
    Manual merge

  mysql-test/r/rpl000015.result
    1.25 03/09/14 01:57:06 dlenev@mysql.com +0 -7
    Manual merge

  include/mysqld_error.h
    1.61.1.16 03/09/14 01:57:06 dlenev@mysql.com +4 -5
    Manual merge

  sql/repl_failsafe.cc
    1.32.5.1 03/09/14 00:24:14 dlenev@mysql.com +0 -0
    Auto merged

  sql/log_event.cc
    1.113.1.16 03/09/14 00:24:14 dlenev@mysql.com +0 -0
    Auto merged

  sql/log.cc
    1.108.4.1 03/09/14 00:24:14 dlenev@mysql.com +0 -0
    Auto merged

  sql/lex.h
    1.82.1.41 03/09/14 00:24:14 dlenev@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1546.61.7 03/09/14 00:13:41 dlenev@dlenev.mshome +42 -0
  Implemented support for START SLAVE UNTIL (WL#868)

  mysql-test/t/rpl_until.test
    1.1 03/09/14 00:13:21 dlenev@mysql.com +70 -0

  mysql-test/r/rpl_until.result
    1.1 03/09/14 00:13:21 dlenev@mysql.com +72 -0

  sql/sql_yacc.yy
    1.203.71.1 03/09/14 00:13:21 dlenev@mysql.com +69 -39
    Added support for UNTIL clause in START SLAVE. This involved 
    extraction of some of master_defs to separate master_file_def
    non-terminal.

  sql/sql_repl.cc
    1.102.4.1 03/09/14 00:13:21 dlenev@mysql.com +74 -5
    Now honoring UNTIL clause then starting slave thread. Proper 
    errors and warnings.

  sql/slave.h
    1.62.4.1 03/09/14 00:13:21 dlenev@mysql.com +54 -0
    Members in RELAY_LOG_INFO for storing UNTIL condition. Also 
    methods for for invalidation of cached UNTIL condition comparison
    results

  sql/slave.cc
    1.188.8.1 03/09/14 00:13:21 dlenev@mysql.com +156 -14
    Fixed wrong locking order in init_relay_log_pos()
    Added until condition fields to SHOW SLAVE STATUS
    Added checking if UNTIL condition is reached 
    (added proper method, added its invocation, reorganized locking 
    in exec_relay_log_event() and next_event())

  sql/share/ukrainian/errmsg.txt
    1.27.10.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/swedish/errmsg.txt
    1.64.11.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/spanish/errmsg.txt
    1.64.13.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/slovak/errmsg.txt
    1.64.11.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/serbian/errmsg.txt
    1.18.9.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/russian/errmsg.txt
    1.61.10.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/romanian/errmsg.txt
    1.62.11.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/portuguese/errmsg.txt
    1.64.13.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/polish/errmsg.txt
    1.63.10.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/norwegian/errmsg.txt
    1.63.11.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/norwegian-ny/errmsg.txt
    1.63.11.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/korean/errmsg.txt
    1.63.10.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/japanese/errmsg.txt
    1.63.10.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/italian/errmsg.txt
    1.70.11.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/hungarian/errmsg.txt
    1.65.10.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/greek/errmsg.txt
    1.64.10.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/german/errmsg.txt
    1.64.11.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/french/errmsg.txt
    1.63.11.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/estonian/errmsg.txt
    1.64.10.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/english/errmsg.txt
    1.70.13.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/dutch/errmsg.txt
    1.66.11.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/danish/errmsg.txt
    1.62.11.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/share/czech/errmsg.txt
    1.64.11.1 03/09/14 00:13:21 dlenev@mysql.com +3 -0
    Added error and warning message for START SLAVE UNTIL

  sql/repl_failsafe.cc
    1.32.4.1 03/09/14 00:13:21 dlenev@mysql.com +6 -0
    Cancel until condition if LOAD MASTER DATA is executed

  sql/log_event.cc
    1.113.3.1 03/09/14 00:13:21 dlenev@mysql.com +1 -0
    Invalidating until_log_name comparison result if group_master_log_name is changed

  sql/log.cc
    1.108.3.1 03/09/14 00:13:21 dlenev@mysql.com +1 -0
    Invalidating until_log_name comparison result if group_relay_log_name is changed

  sql/lex.h
    1.82.18.1 03/09/14 00:13:21 dlenev@mysql.com +1 -0
    Added UNTIL symbol

  mysql-test/t/rpl_until.test
    1.0 03/09/14 00:13:21 dlenev@mysql.com +0 -0
    BitKeeper file /home/dlenev/src/mysql-4.1-868/mysql-test/t/rpl_until.test

  mysql-test/r/rpl_until.result
    1.0 03/09/14 00:13:21 dlenev@mysql.com +0 -0
    BitKeeper file /home/dlenev/src/mysql-4.1-868/mysql-test/r/rpl_until.result

  mysql-test/r/rpl_rotate_logs.result
    1.41.2.1 03/09/14 00:13:21 dlenev@mysql.com +6 -6
    Fixed test because 3 new columns to SHOW SLAVE STATUS output were added

  mysql-test/r/rpl_replicate_do.result
    1.14.2.1 03/09/14 00:13:21 dlenev@mysql.com +2 -2
    Fixed test because 3 new columns to SHOW SLAVE STATUS output were added

  mysql-test/r/rpl_redirect.result
    1.9.1.1 03/09/14 00:13:21 dlenev@mysql.com +1 -1
    Fixed test because 3 new columns to SHOW SLAVE STATUS output were added

  mysql-test/r/rpl_log_pos.result
    1.29.2.1 03/09/14 00:13:21 dlenev@mysql.com +8 -8
    Fixed test because 3 new columns to SHOW SLAVE STATUS output were added

  mysql-test/r/rpl_log.result
    1.39.2.1 03/09/14 00:13:21 dlenev@mysql.com +2 -2
    Fixed test because 3 new columns to SHOW SLAVE STATUS output were added

  mysql-test/r/rpl_flush_log_loop.result
    1.6.2.1 03/09/14 00:13:21 dlenev@mysql.com +2 -2
    Fixed test because 3 new columns to SHOW SLAVE STATUS output were added

  mysql-test/r/rpl_empty_master_crash.result
    1.8.1.1 03/09/14 00:13:21 dlenev@mysql.com +1 -1
    Fixed test because 3 new columns to SHOW SLAVE STATUS output were added

  mysql-test/r/rpl000015.result
    1.23.1.1 03/09/14 00:13:21 dlenev@mysql.com +7 -7
    Fixed test because 3 new columns to SHOW SLAVE STATUS output were added

  include/mysqld_error.h
    1.61.9.1 03/09/14 00:13:21 dlenev@mysql.com +4 -1
    Added error codes for warnings and error messages for START SLAVE UNTIL

ChangeSet
  1.1563.36.2 03/09/13 19:56:58 Sinisa@sinisa.nasamreza.org +4 -0
  Fixes for OPTION_FOUND_ROWS in UNION's

  sql/sql_union.cc
    1.74.5.16 03/09/13 19:56:52 Sinisa@sinisa.nasamreza.org +3 -2
    Fixes for OPTION_FOUND_ROWS in UNION's

  sql/sql_parse.cc
    1.271.28.1 03/09/13 19:56:52 Sinisa@sinisa.nasamreza.org +1 -1
    Fixes for OPTION_FOUND_ROWS in UNION's

  mysql-test/r/union.result
    1.42.1.4 03/09/13 19:56:52 Sinisa@sinisa.nasamreza.org +2 -2
    two changes.
    
    First one is due to the proper handling of LIMIT offset, limit in 
    UNION without all.
    
    Second is a change in behaviour due to the fact that ORDER by in a 
    UNION without braces is not now applicable to the last SELECT node.
    
    It can not be applied until one bug is fixed (after my vacation).
    
    Should be documented.

  mysql-test/r/subselect.result
    1.67.18.7 03/09/13 19:56:52 Sinisa@sinisa.nasamreza.org +2 -0
    A warning added to subselect test due to the recent changes.
    
    UNION in sub-select returns the empty set, which is why this warning is
    a mistery to me.

ChangeSet
  1.1563.39.1 03/09/13 17:47:59 bell@sanja.is.com.ua +9 -0
  new UDF arguments interface (WL#1017) (SCRUM)

  tests/udf_test
    1.3 03/09/13 17:47:36 bell@sanja.is.com.ua +3 -0
    new UDF example (stupid function to test parameters)

  tests/udf_test.res
    1.3 03/09/13 17:47:36 bell@sanja.is.com.ua +24 -0
    new UDF example (stupid function to test parameters)

  sql/udf_example.cc
    1.13.1.1 03/09/13 17:47:36 bell@sanja.is.com.ua +47 -1
    new UDF example (stupid function to test parameters)

  sql/sql_yacc.yy
    1.236.1.1 03/09/13 17:47:36 bell@sanja.is.com.ua +39 -5
    new syntax of UDF arguments

  sql/sql_parse.cc
    1.295.1.1 03/09/13 17:47:36 bell@sanja.is.com.ua +2 -0
    fixed problem with UDF in 5.0

  sql/item_func.cc
    1.131 03/09/13 17:47:36 bell@sanja.is.com.ua +12 -5
    new UDF arguments

  sql/item.h
    1.63 03/09/13 17:47:36 bell@sanja.is.com.ua +1 -0
    added lenghth name foe item (to avoid strlen() call)

  sql/item.cc
    1.70 03/09/13 17:47:36 bell@sanja.is.com.ua +4 -3
    added lenghth name foe item (to avoid strlen() call)

  include/mysql_com.h
    1.72 03/09/13 17:47:36 bell@sanja.is.com.ua +2 -0
    new UDF arguments interface

ChangeSet
  1.1563.37.4 03/09/13 16:05:17 serg@serg.mylan +3 -0
  "normal" warning in test suite disabled
  bad merge fixed

  mysql-test/t/subselect.test
    1.58.14.11 03/09/13 16:05:14 serg@serg.mylan +2 -0
    "normal" warning in test suite disabled

  mysql-test/t/lock_tables_lost_commit.test
    1.3 03/09/13 16:05:14 serg@serg.mylan +1 -1
    "normal" warning in test suite disabled

  mysql-test/t/isam.test
    1.8 03/09/13 16:05:14 serg@serg.mylan +0 -18
    bad merge fixed

ChangeSet
  1.1563.37.3 03/09/13 13:13:10 serg@serg.mylan +22 -0
  error messages from english/errmsg.txt added to other languages.
  bug#1269

  sql/share/ukrainian/errmsg.txt
    1.27.1.19 03/09/13 13:13:06 serg@serg.mylan +5 -0
    error messages from english/errmsg.txt added to other languages.
    bug##1269

  sql/share/swedish/errmsg.txt
    1.64.1.22 03/09/13 13:13:06 serg@serg.mylan +5 -0
    error messages from english/errmsg.txt added to other languages.
    bug##1269

  sql/share/spanish/errmsg.txt
    1.64.1.21 03/09/13 13:13:06 serg@serg.mylan +5 -0
    error messages from english/errmsg.txt added to other languages.
    bug##1269

  sql/share/slovak/errmsg.txt
    1.64.1.20 03/09/13 13:13:06 serg@serg.mylan +5 -0
    error messages from english/errmsg.txt added to other languages.
    bug##1269

  sql/share/serbian/errmsg.txt
    1.18.1.18 03/09/13 13:13:06 serg@serg.mylan +5 -0
    error messages from english/errmsg.txt added to other languages.
    bug##1269

  sql/share/russian/errmsg.txt
    1.61.1.20 03/09/13 13:13:06 serg@serg.mylan +5 -0
    error messages from english/errmsg.txt added to other languages.
    bug##1269

  sql/share/romanian/errmsg.txt
    1.62.1.20 03/09/13 13:13:06 serg@serg.mylan +5 -0
    error messages from english/errmsg.txt added to other languages.
    bug##1269

  sql/share/portuguese/errmsg.txt
    1.64.1.22 03/09/13 13:13:06 serg@serg.mylan +5 -0
    error messages from english/errmsg.txt added to other languages.
    bug##1269

  sql/share/polish/errmsg.txt
    1.63.1.20 03/09/13 13:13:06 serg@serg.mylan +5 -0
    error messages from english/errmsg.txt added to other languages.
    bug##1269

  sql/share/norwegian/errmsg.txt
    1.63.1.20 03/09/13 13:13:06 serg@serg.mylan +5 -0
    error messages from english/errmsg.txt added to other languages.
    bug##1269

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.20 03/09/13 13:13:06 serg@serg.mylan +5 -0
    error messages from english/errmsg.txt added to other languages.
    bug##1269

  sql/share/korean/errmsg.txt
    1.63.1.19 03/09/13 13:13:06 serg@serg.mylan +5 -0
    error messages from english/errmsg.txt added to other languages.
    bug##1269

  sql/share/japanese/errmsg.txt
    1.63.1.19 03/09/13 13:13:06 serg@serg.mylan +5 -0
    error messages from english/errmsg.txt added to other languages.
    bug##1269

  sql/share/italian/errmsg.txt
    1.70.1.20 03/09/13 13:13:06 serg@serg.mylan +5 -0
    error messages from english/errmsg.txt added to other languages.
    bug##1269

  sql/share/hungarian/errmsg.txt
    1.65.1.19 03/09/13 13:13:06 serg@serg.mylan +5 -0
    error messages from english/errmsg.txt added to other languages.
    bug##1269

  sql/share/greek/errmsg.txt
    1.64.1.19 03/09/13 13:13:06 serg@serg.mylan +5 -0
    error messages from english/errmsg.txt added to other languages.
    bug##1269

  sql/share/german/errmsg.txt
    1.64.1.20 03/09/13 13:13:06 serg@serg.mylan +5 -0
    error messages from english/errmsg.txt added to other languages.
    bug##1269

  sql/share/french/errmsg.txt
    1.63.1.20 03/09/13 13:13:06 serg@serg.mylan +5 -0
    error messages from english/errmsg.txt added to other languages.
    bug##1269

  sql/share/estonian/errmsg.txt
    1.64.1.19 03/09/13 13:13:06 serg@serg.mylan +5 -0
    error messages from english/errmsg.txt added to other languages.
    bug##1269

  sql/share/dutch/errmsg.txt
    1.66.1.20 03/09/13 13:13:05 serg@serg.mylan +5 -0
    error messages from english/errmsg.txt added to other languages.
    bug##1269

  sql/share/danish/errmsg.txt
    1.62.1.20 03/09/13 13:13:05 serg@serg.mylan +5 -0
    error messages from english/errmsg.txt added to other languages.
    bug##1269

  sql/share/czech/errmsg.txt
    1.64.1.20 03/09/13 13:13:05 serg@serg.mylan +6 -1
    error messages from english/errmsg.txt added to other languages.
    bug##1269

ChangeSet
  1.1563.38.1 03/09/13 11:35:29 monty@mashka.mysql.fi +19 -0
  Remove 'extern' references from .cc files

  sql/table.cc
    1.85 03/09/13 11:35:20 monty@mashka.mysql.fi +0 -1
    Remove 'extern' references

  sql/sql_yacc.yy
    1.203.70.1 03/09/13 11:35:20 monty@mashka.mysql.fi +0 -1
    Remove 'extern' references

  sql/sql_test.cc
    1.21.1.1 03/09/13 11:35:19 monty@mashka.mysql.fi +0 -2
    Remove 'extern' references

  sql/sql_table.cc
    1.157.9.11 03/09/13 11:35:19 monty@mashka.mysql.fi +0 -1
    Remove 'extern' references

  sql/sql_string.cc
    1.64 03/09/13 11:35:19 monty@mashka.mysql.fi +5 -0
    Added comment

  sql/sql_repl.cc
    1.102.1.10 03/09/13 11:35:19 monty@mashka.mysql.fi +0 -2
    Remove 'extern' references

  sql/sql_prepare.cc
    1.34.2.1 03/09/13 11:35:19 monty@mashka.mysql.fi +0 -1
    Remove 'extern' references

  sql/sql_parse.cc
    1.271.24.7 03/09/13 11:35:19 monty@mashka.mysql.fi +0 -2
    Remove 'extern' references

  sql/sql_insert.cc
    1.86.2.17 03/09/13 11:35:19 monty@mashka.mysql.fi +0 -2
    Remove 'extern' references

  sql/sql_derived.cc
    1.43.6.2 03/09/13 11:35:19 monty@mashka.mysql.fi +0 -2
    Remove 'extern' references

  sql/set_var.cc
    1.34.1.30 03/09/13 11:35:19 monty@mashka.mysql.fi +0 -2
    Remove 'extern' references

  sql/repl_failsafe.cc
    1.32.1.4 03/09/13 11:35:19 monty@mashka.mysql.fi +0 -1
    Remove 'extern' references

  sql/net_serv.cc
    1.62 03/09/13 11:35:19 monty@mashka.mysql.fi +6 -1
    Added comment

  sql/mysql_priv.h
    1.186.1.27 03/09/13 11:35:19 monty@mashka.mysql.fi +17 -1
    Add 'extern' references

  sql/log.cc
    1.108.1.11 03/09/13 11:35:19 monty@mashka.mysql.fi +0 -1
    Remove 'extern' references

  sql/lock.cc
    1.42.1.1 03/09/13 11:35:19 monty@mashka.mysql.fi +0 -2
    Remove 'extern' references

  sql/item_strfunc.cc
    1.136 03/09/13 11:35:19 monty@mashka.mysql.fi +6 -9
    Remove 'extern' references

  mysys/my_static.h
    1.16 03/09/13 11:35:18 monty@mashka.mysql.fi +0 -1
    Remove not used include file

  mysys/checksum.c
    1.9 03/09/13 11:35:18 monty@mashka.mysql.fi +4 -2
    Cleanup

ChangeSet
  1.1563.37.2 03/09/13 10:30:41 bell@sanja.is.com.ua +1 -0
  removed double procedure deletetion

  sql/sql_select.cc
    1.216.1.38 03/09/13 10:30:39 bell@sanja.is.com.ua +4 -8
    removed double procedure deletetion

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

ChangeSet
  1.1563.37.1 03/09/13 02:07:06 bell@sanja.is.com.ua +1 -0
  fixed memory leak (now JOIN cleaning procedure always called)

  sql/sql_select.cc
    1.216.1.37 03/09/13 02:06:39 bell@sanja.is.com.ua +2 -5
    always clean JOIN

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

ChangeSet
  1.1563.36.1 03/09/12 19:23:47 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/sql_yacc.yy
    1.203.1.62 03/09/12 19:23:40 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1563.28.7 03/09/12 19:17:30 Sinisa@sinisa.nasamreza.org +3 -0
  Fix for a bug #1231
  
  Parse error caused global ORDER BY to be initialized although it should
  not have been.

  sql/sql_yacc.yy
    1.203.69.2 03/09/12 19:17:24 Sinisa@sinisa.nasamreza.org +6 -3
    Fix for a bug #1231
    
    Parse error caused global ORDER BY to be initialized although it should
    not have been.

  mysql-test/t/derived.test
    1.25 03/09/12 19:17:23 Sinisa@sinisa.nasamreza.org +2 -0
    Fix for a bug #1231
    
    Parse error caused global ORDER BY to be initialized although it should
    not have been.

  mysql-test/r/derived.result
    1.27 03/09/12 19:17:23 Sinisa@sinisa.nasamreza.org +2 -0
    Fix for a bug #1231
    
    Parse error caused global ORDER BY to be initialized although it should
    not have been.

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

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

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

ChangeSet
  1.1563.34.7 03/09/12 19:36:42 hf@deer.(none) +3 -0
  Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into deer.(none):/home/hf/work/mysql-4.1.stmt

  libmysqld/libmysqld.c
    1.49 03/09/12 19:36:39 hf@deer.(none) +0 -0
    Auto merged

  libmysql/libmysql.c
    1.156.1.25 03/09/12 19:36:39 hf@deer.(none) +0 -0
    Auto merged

  include/mysql.h
    1.86 03/09/12 19:36:39 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1563.35.1 03/09/12 19:35:34 hf@deer.(none) +7 -0
  SCRUM:
  #977 Prepared statements in embedded library

  sql/sql_prepare.cc
    1.34.1.8 03/09/12 19:35:16 hf@deer.(none) +10 -3
    embedded send_prep_stmt added

  sql/client_settings.h
    1.9 03/09/12 19:35:16 hf@deer.(none) +1 -0
    we don't need prepared statements in mini_client

  sql-common/client.c
    1.24 03/09/12 19:35:16 hf@deer.(none) +2 -1
    cli_read_prepare_result added to the client_methods

  libmysqld/libmysqld.c
    1.47.1.1 03/09/12 19:35:16 hf@deer.(none) +5 -1
    emb_read_prepare_result prototype

  libmysql/libmysql.c
    1.156.8.2 03/09/12 19:35:16 hf@deer.(none) +11 -13
    some code moved from implementation of read_prepare_result to 
    mysql_prepare_result to make creating separate (remote and embedded-server)
    versions easier

  libmysql/client_settings.h
    1.8 03/09/12 19:35:16 hf@deer.(none) +1 -0
    declare proper function for libmysql

  include/mysql.h
    1.84.1.1 03/09/12 19:35:15 hf@deer.(none) +1 -0
    read_prepare_result function moved to 'virtual'

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

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

ChangeSet
  1.1346.358.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.14.2.6 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.1346.358.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.10.1.2 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.191.1.93 03/09/12 12:42:32 lenz@mysql.com +1 -1
     - removed "-traditional-cpp" from the darwin6 compile flags, as it broke
       compilation with gcc-3.3 and does not seem to be required in general.

ChangeSet
  1.1563.34.6 03/09/12 13:44:41 hf@deer.(none) +1 -0
  Monty's merge bug fixed

  libmysqld/lib_sql.cc
    1.68 03/09/12 13:44:39 hf@deer.(none) +3 -2
    these definitions moved to be after my_bool declaration

ChangeSet
  1.1563.34.5 03/09/12 05:54:12 monty@mashka.mysql.fi +3 -0
  Fix results for mix_innodb_myisam_binlog
  Optimize calls to current_thd

  sql/ha_innodb.cc
    1.90.1.8 03/09/12 05:54:09 monty@mashka.mysql.fi +33 -34
    Don't call current_thd in an assert that is not deleted in release version
    (Because current_thd is slow)

  mysql-test/t/mix_innodb_myisam_binlog.test
    1.3 03/09/12 05:54:09 monty@mashka.mysql.fi +0 -3
    Fix for 4.1

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.4 03/09/12 05:54:09 monty@mashka.mysql.fi +6 -3
    updated results

ChangeSet
  1.1563.34.4 03/09/12 04:18:07 monty@mashka.mysql.fi +12 -0
  Optimize thai character handling
  Remove sel000xxxx tests
  After merge fixes

  strings/ctype-tis620.c
    1.50 03/09/12 04:18:03 monty@mashka.mysql.fi +101 -87
    Remove usage of strnlen
    Optimize code and make it \0 safe

  sql/sql_select.cc
    1.216.1.36 03/09/12 04:18:03 monty@mashka.mysql.fi +9 -6
    After merge fixes

  sql/log_event.cc
    1.113.1.15 03/09/12 04:18:03 monty@mashka.mysql.fi +0 -2
    Remove duplicate allocation

  mysql-test/t/range.test
    1.5.1.4 03/09/12 04:18:03 monty@mashka.mysql.fi +8 -0
    Merge test with sel000033

  mysql-test/t/distinct.test
    1.14 03/09/12 04:18:03 monty@mashka.mysql.fi +47 -0
    Merge test with sel000100

  mysql-test/r/range.result
    1.10.1.5 03/09/12 04:18:03 monty@mashka.mysql.fi +19 -6
    After merge fix
    Merge test with sel000033

  mysql-test/r/grant.result
    1.13 03/09/12 04:18:03 monty@mashka.mysql.fi +1 -1
    Update result after merge

  mysql-test/r/distinct.result
    1.27 03/09/12 04:18:03 monty@mashka.mysql.fi +37 -0
    Merge test with sel000100

  BitKeeper/deleted/.del-sel000100.test~548501cad19a1a59
    1.11.1.1 03/09/12 04:14:39 monty@mashka.mysql.fi +0 -0
    Delete: mysql-test/t/sel000100.test

  BitKeeper/deleted/.del-sel000100.result~84ed46856cb3a69f
    1.9.1.1 03/09/12 04:14:39 monty@mashka.mysql.fi +0 -0
    Delete: mysql-test/r/sel000100.result

  BitKeeper/deleted/.del-sel000033.result~56d1d02d72b94602
    1.7 03/09/12 04:14:39 monty@mashka.mysql.fi +0 -0
    Delete: mysql-test/r/sel000033.result

  BitKeeper/deleted/.del-sel000033.test~3971fbe746eec069
    1.8 03/09/12 04:14:38 monty@mashka.mysql.fi +0 -0
    Delete: mysql-test/t/sel000033.test

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

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

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

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

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

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

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

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

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

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

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

ChangeSet
  1.1563.34.3 03/09/11 20:31:40 monty@mashka.mysql.fi +22 -0
  merge with 4.1 tree

  sql/sql_parse.cc
    1.271.24.6 03/09/11 20:31:37 monty@mashka.mysql.fi +0 -4
    merge with 4.1 tree

  libmysqld/libmysqld.c
    1.48 03/09/11 20:31:37 monty@mashka.mysql.fi +2 -7
    merge with 4.1 tree

  libmysqld/lib_sql.cc
    1.67 03/09/11 20:31:37 monty@mashka.mysql.fi +0 -4
    merge with 4.1 tree

  tests/client_test.c
    1.38 03/09/11 20:25:51 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.203.1.61 03/09/11 20:25:51 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_table.cc
    1.157.9.10 03/09/11 20:25:51 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.1.35 03/09/11 20:25:51 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/spanish/errmsg.txt
    1.64.1.20 03/09/11 20:25:51 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/portuguese/errmsg.txt
    1.64.1.21 03/09/11 20:25:51 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.40 03/09/11 20:25:50 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.26 03/09/11 20:25:50 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_func.h
    1.68.1.20 03/09/11 20:25:50 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_func.cc
    1.124.1.24 03/09/11 20:25:50 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.99.3.4 03/09/11 20:25:50 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item.h
    1.56.1.33 03/09/11 20:25:49 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item.cc
    1.58.1.29 03/09/11 20:25:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/field.cc
    1.114 03/09/11 20:25:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.167.1.5 03/09/11 20:25:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysql/libmysql.c
    1.156.1.24 03/09/11 20:25:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysql/errmsg.c
    1.23 03/09/11 20:25:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/mysql.h
    1.85 03/09/11 20:25:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  client/mysqltest.c
    1.92.1.13 03/09/11 20:25:48 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1563.21.6 03/09/11 20:24:14 monty@mashka.mysql.fi +30 -0
  merge with 4.0.15

  sql/sql_select.cc
    1.216.1.34 03/09/11 20:24:10 monty@mashka.mysql.fi +0 -5
    merge with 4.0.15

  sql/sql_parse.cc
    1.271.24.5 03/09/11 20:24:10 monty@mashka.mysql.fi +1 -15
    merge with 4.0.15

  sql/sql_acl.cc
    1.74.1.16 03/09/11 20:24:10 monty@mashka.mysql.fi +9 -7
    merge with 4.0.15

  scripts/mysql_install_db.sh
    1.37.1.13 03/09/11 20:24:10 monty@mashka.mysql.fi +0 -0
    merge with 4.0.15

  mysql-test/t/myisam.test
    1.22 03/09/11 20:24:10 monty@mashka.mysql.fi +0 -1
    merge with 4.0.15

  mysql-test/r/range.result
    1.10.1.4 03/09/11 20:24:10 monty@mashka.mysql.fi +4 -4
    merge with 4.0.15

  mysql-test/r/myisam.result
    1.29 03/09/11 20:24:10 monty@mashka.mysql.fi +0 -0
    merge with 4.0.15

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.3 03/09/11 20:24:10 monty@mashka.mysql.fi +47 -51
    merge with 4.0.15

  libmysqld/libmysqld.c
    1.43.1.1 03/09/11 20:24:10 monty@mashka.mysql.fi +6 -17
    merge with 4.0.15

  libmysqld/lib_sql.cc
    1.61.1.1 03/09/11 20:24:10 monty@mashka.mysql.fi +4 -7
    merge with 4.0.15

  include/m_ctype.h
    1.73 03/09/11 20:24:10 monty@mashka.mysql.fi +0 -0
    merge with 4.0.15

  configure.in
    1.201.1.41 03/09/11 20:24:10 monty@mashka.mysql.fi +0 -1
    merge with 4.0.15

  client/mysqlimport.c
    1.38 03/09/11 20:24:10 monty@mashka.mysql.fi +1 -2
    merge with 4.0.15

  client/mysqldump.c
    1.99 03/09/11 20:24:10 monty@mashka.mysql.fi +2 -2
    merge with 4.0.15

  support-files/mysql.spec.sh
    1.68 03/09/11 19:23:00 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/opt_range.cc
    1.90.1.8 03/09/11 19:22:59 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.39 03/09/11 19:22:59 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_berkeley.cc
    1.117.1.1 03/09/11 19:22:59 monty@mashka.mysql.fi +0 -0
    Auto merged

  scripts/make_win_src_distribution.sh
    1.9 03/09/11 19:22:58 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/range.test
    1.5.1.3 03/09/11 19:22:58 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/grant.test
    1.9 03/09/11 19:22:58 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/bdb.test
    1.29 03/09/11 19:22:58 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/grant.result
    1.12 03/09/11 19:22:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/bdb.result
    1.29 03/09/11 19:22:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/myisampack.c
    1.28 03/09/11 19:22:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/mi_update.c
    1.14 03/09/11 19:22:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/mi_open.c
    1.70 03/09/11 19:22:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/mysql.h
    1.83.1.2 03/09/11 19:22:57 monty@mashka.mysql.fi +1 -1
    Auto merged

  BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql
    1.2 03/09/11 19:22:56 monty@mashka.mysql.fi +0 -0
    Delete: scripts/mysql_fix_privilege_tables.sql

  BitKeeper/etc/logging_ok
    1.233.1.25 03/09/11 19:15:13 monty@mashka.mysql.fi +0 -2
    auto-union

ChangeSet
  1.1563.21.5 03/09/11 19:06:23 monty@mashka.mysql.fi +32 -0
  After merge fixes.
  Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)

  tests/client_test.c
    1.36.1.1 03/09/11 19:06:12 monty@mashka.mysql.fi +12 -13
    mysql_prepare_result() -> mysql_get_metadata()

  sql/sql_union.cc
    1.74.5.15 03/09/11 19:06:12 monty@mashka.mysql.fi +6 -21
    After merge fixes.
    Note that after this the union test still fails; Will be fixed shortly...

  sql/sql_table.cc
    1.157.9.9 03/09/11 19:06:12 monty@mashka.mysql.fi +22 -24
    After merge fix
    Cleanup of mysql_checksum_table()

  sql/sql_show.cc
    1.122.4.4 03/09/11 19:06:12 monty@mashka.mysql.fi +1 -1
    After merge fix

  sql/sql_select.cc
    1.216.1.33 03/09/11 19:06:11 monty@mashka.mysql.fi +1 -0
    After merge fix

  sql/sql_acl.cc
    1.74.1.15 03/09/11 19:06:11 monty@mashka.mysql.fi +25 -48
    After merge fix + code cleanup

  sql/slave.cc
    1.188.1.18 03/09/11 19:06:11 monty@mashka.mysql.fi +0 -1
    After merge fix

  sql/opt_range.cc
    1.90.1.7 03/09/11 19:06:10 monty@mashka.mysql.fi +5 -4
    Simple optimzation and after merge fixes

  sql/log_event.cc
    1.113.1.14 03/09/11 19:06:10 monty@mashka.mysql.fi +8 -17
    After merge fix; (Some code should be checked by Guilhem)

  sql/item_cmpfunc.cc
    1.99.3.3 03/09/11 19:06:10 monty@mashka.mysql.fi +1 -1
    After merge fix

  sql/ha_innodb.cc
    1.90.1.7 03/09/11 19:06:10 monty@mashka.mysql.fi +7 -88
    Removed some functions that uses inernal (private) MySQL information

  sql/field.h
    1.79 03/09/11 19:06:09 monty@mashka.mysql.fi +7 -0
    Added is_null_in_record() to make ha_innodb.cc code more general

  sql-bench/compare-results.sh
    1.10 03/09/11 19:06:09 monty@mashka.mysql.fi +1 -1
    Fix for now output format

  mysql-test/t/union.test
    1.40.1.2 03/09/11 19:06:09 monty@mashka.mysql.fi +3 -1
    Update after merge

  mysql-test/t/myisam.test
    1.21 03/09/11 19:06:09 monty@mashka.mysql.fi +1 -1
    Update after merge

  mysql-test/t/lowercase_table.test
    1.7 03/09/11 19:06:09 monty@mashka.mysql.fi +1 -1
    Update after merge

  mysql-test/r/union.result
    1.42.1.3 03/09/11 19:06:09 monty@mashka.mysql.fi +2 -6
    Updated results after merge

  mysql-test/r/rpl_log.result
    1.44 03/09/11 19:06:09 monty@mashka.mysql.fi +11 -8
    Updated results after merge

  mysql-test/r/rpl_loaddata_rule_s.result
    1.2 03/09/11 19:06:08 monty@mashka.mysql.fi +2 -2
    Updated results after merge

  mysql-test/r/rpl_loaddata_rule_m.result
    1.2 03/09/11 19:06:08 monty@mashka.mysql.fi +2 -2
    Updated results after merge

  mysql-test/r/rpl_loaddata.result
    1.12 03/09/11 19:06:08 monty@mashka.mysql.fi +1 -1
    Updated results after merge

  mysql-test/r/range.result
    1.10.1.3 03/09/11 19:06:08 monty@mashka.mysql.fi +18 -18
    Updated results after merge

  mysql-test/r/myisam.result
    1.28 03/09/11 19:06:08 monty@mashka.mysql.fi +6 -0
    Updated results after merge

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.1.1.1 03/09/11 19:06:08 monty@mashka.mysql.fi +47 -47
    Updated results after merge (note that this is still not correct; Need patch to mysqld to fix this properly)

  mysql-test/r/lowercase_table.result
    1.5 03/09/11 19:06:08 monty@mashka.mysql.fi +2 -1
    Updated results after merge

  mysql-test/r/loaddata.result
    1.7 03/09/11 19:06:08 monty@mashka.mysql.fi +2 -0
    Updated results after merge

  mysql-test/r/grant.result
    1.11 03/09/11 19:06:08 monty@mashka.mysql.fi +1 -1
    Updated results after merge

  mysql-test/r/func_test.result
    1.19 03/09/11 19:06:08 monty@mashka.mysql.fi +5 -5
    Updated results after merge

  mysql-test/r/func_group.result
    1.17.1.1 03/09/11 19:06:07 monty@mashka.mysql.fi +1 -1
    Updated results after merge

  libmysql/libmysql.c
    1.156.1.23 03/09/11 19:06:07 monty@mashka.mysql.fi +54 -117
    mysql_prepare_result -> mysql_get_metadata()
    Added test for offset overflow when using mysql_fetch_column()
    Cleaned up mysql_fetch_column()
    Optimized fetch_result() usage

  include/mysql.h
    1.83.1.1 03/09/11 19:06:07 monty@mashka.mysql.fi +4 -2
    Some additions to MYSQL_BIND for cleaner prepared statement code

  client/mysql.cc
    1.121.1.22 03/09/11 19:06:07 monty@mashka.mysql.fi +0 -1
    After merge fix

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

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

ChangeSet
  1.1563.34.2 03/09/11 13:50:18 ram@mysql.r18.ru +1 -0
  Fix for the bug #1200: Can't start MySQL if bind-address set to hostname that starts with a number.

  sql/mysqld.cc
    1.356.25.2 03/09/11 13:50:14 ram@mysql.r18.ru +1 -5
    Fix for the bug #1200: Can't start MySQL if bind-address set to hostname that starts with a number.

ChangeSet
  1.1563.34.1 03/09/11 09:46:31 hf@deer.(none) +7 -0
  SCRUM
  embedded&client library
  some fixes: zero at the end of the data added
  mysql_list_fields became 'virtual'

  sql/client_settings.h
    1.8 03/09/11 09:46:29 hf@deer.(none) +2 -0
    we don't need mysql_list_fields in mini_client code

  sql-common/client.c
    1.23 03/09/11 09:46:29 hf@deer.(none) +3 -1
    cli_list_fields member set for client library

  libmysqld/libmysqld.c
    1.47 03/09/11 09:46:29 hf@deer.(none) +35 -1
    implementation for embedded server

  libmysqld/lib_sql.cc
    1.66 03/09/11 09:46:29 hf@deer.(none) +2 -1
    we still need zero at the end of the data in client (see mysql.cc).
    I feel it should be changed

  libmysql/libmysql.c
    1.156.8.1 03/09/11 09:46:29 hf@deer.(none) +1 -1
    implementation for remote server

  libmysql/client_settings.h
    1.7 03/09/11 09:46:29 hf@deer.(none) +2 -0
    in client library we need proper implementation for list_fields

  include/mysql.h
    1.84 03/09/11 09:46:29 hf@deer.(none) +7 -4
    mysql_list_fields became 'virtual'

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

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

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

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

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

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

ChangeSet
  1.1563.33.1 03/09/10 17:25:26 bar@bar.mysql.r18.ru +3 -0
  mysql_create_table now accepts field lengths in CREATE form, not in internal form.
  This is to simplify fixing indexes to mean number of chars rather than bytes too.

  sql/sql_table.cc
    1.157.14.1 03/09/10 17:25:23 bar@bar.mysql.r18.ru +4 -13
    mysql_create_table now accepts field lengths in CREATE form, not in internal form.
    This is to simplify fixing indexes to mean number of chars rather than bytes too.

  sql/sql_parse.cc
    1.271.25.7 03/09/10 17:25:23 bar@bar.mysql.r18.ru +0 -8
    mysql_create_table now accepts field lengths in CREATE form, not in internal form.
    This is to simplify fixing indexes to mean number of chars rather than bytes too.

  sql/field.cc
    1.112.1.1 03/09/10 17:25:23 bar@bar.mysql.r18.ru +21 -0
    mysql_create_table now accepts field lengths in CREATE form, not in internal form.
    This is to simplify fixing indexes to mean number of chars rather than bytes too.

ChangeSet
  1.1563.32.2 03/09/10 12:58:26 hf@deer.(none) +2 -0
  SCRUM: embedde library
  Minor fixes

  libmysqld/libmysqld.c
    1.46 03/09/10 12:58:24 hf@deer.(none) +6 -6
    this part of code should be moved under if (mysql)

  libmysqld/lib_sql.cc
    1.65 03/09/10 12:58:24 hf@deer.(none) +6 -0
    Comment added

ChangeSet
  1.1563.31.1 03/09/10 12:09:24 hf@deer.(none) +2 -0
  SCRUM: embedded library
  mysql_fetch_length fixed for embedded library. Now data length is stored
  before the data. Pointers in row still points to the data so you have to
  get *(uint*)(data_ptr - sizeof(uint)) to get data length

  libmysqld/libmysqld.c
    1.45 03/09/10 12:09:06 hf@deer.(none) +1 -3
    emb_fetch_length changed to retrive data length stored before the data

  libmysqld/lib_sql.cc
    1.64 03/09/10 12:09:06 hf@deer.(none) +6 -7
    bug fixed - user didn't get error description
    Protocol::net_store_data changed to store data length before the data

ChangeSet
  1.1563.1.7 03/09/10 09:43:30 bell@sanja.is.com.ua +2 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1

  mysql-test/t/subselect.test
    1.58.14.10 03/09/10 09:43:28 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.18.6 03/09/10 09:43:28 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1563.26.5 03/09/10 11:19:01 ram@mysql.r18.ru +1 -0
  Fix for the fix for the bug #1209: SELECT DATABASE().

  sql/sql_db.cc
    1.68.1.10 03/09/10 11:18:59 ram@mysql.r18.ru +3 -0
    Fix for the fix for the bug #1209: SELECT DATABASE().

ChangeSet
  1.1563.1.5 03/09/09 23:07:39 bell@sanja.is.com.ua +1 -0
  after merge fix

  mysql-test/r/subselect.result
    1.67.18.5 03/09/09 23:07:37 bell@sanja.is.com.ua +7 -7
    after merge fix

ChangeSet
  1.1563.1.4 03/09/09 22:26:19 bell@sanja.is.com.ua +26 -0
  merge

  sql/share/ukrainian/errmsg.txt
    1.27.1.18 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/swedish/errmsg.txt
    1.64.1.21 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/spanish/errmsg.txt
    1.64.12.1 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/slovak/errmsg.txt
    1.64.1.19 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/serbian/errmsg.txt
    1.18.1.17 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/russian/errmsg.txt
    1.61.1.19 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/romanian/errmsg.txt
    1.62.1.19 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/portuguese/errmsg.txt
    1.64.12.1 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/polish/errmsg.txt
    1.63.1.19 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/norwegian/errmsg.txt
    1.63.1.19 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.19 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/korean/errmsg.txt
    1.63.1.18 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/japanese/errmsg.txt
    1.63.1.18 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/italian/errmsg.txt
    1.70.1.19 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/hungarian/errmsg.txt
    1.65.1.18 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/greek/errmsg.txt
    1.64.1.18 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/german/errmsg.txt
    1.64.1.19 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/french/errmsg.txt
    1.63.1.19 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/estonian/errmsg.txt
    1.64.1.18 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/english/errmsg.txt
    1.70.1.23 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/dutch/errmsg.txt
    1.66.1.19 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/danish/errmsg.txt
    1.62.1.19 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  sql/share/czech/errmsg.txt
    1.64.1.19 03/09/09 22:26:17 bell@sanja.is.com.ua +1 -1
    merge

  include/mysqld_error.h
    1.61.1.15 03/09/09 22:26:17 bell@sanja.is.com.ua +2 -1
    merge

  sql/item.cc
    1.58.1.28 03/09/09 22:00:33 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.18.4 03/09/09 22:00:33 bell@sanja.is.com.ua +0 -0
    Auto merged

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

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

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

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

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

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

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

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

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

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

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

ChangeSet
  1.1563.7.23 03/09/09 17:38:21 bell@sanja.is.com.ua +3 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-optimized_prepared-4.1

  sql/sql_lex.h
    1.102.22.4 03/09/09 17:38:18 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.h
    1.68.8.2 03/09/09 17:38:18 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.124.6.2 03/09/09 17:38:18 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1563.28.6 03/09/09 15:23:38 Sinisa@sinisa.nasamreza.org +3 -0
  Fix for a bug #1226.
  
  Happens when braces are used on a single select, which leads
  to the uninitialized global parameters structure.

  sql/sql_yacc.yy
    1.203.69.1 03/09/09 15:23:33 Sinisa@sinisa.nasamreza.org +3 -2
    Fix for a bug #1226.
    
    Happens when braces are used on a single select, which leads
    to the uninitialized global parameters structure.

  mysql-test/t/subselect.test
    1.58.19.1 03/09/09 15:23:33 Sinisa@sinisa.nasamreza.org +2 -0
    Fix for a bug #1226.
    
    Happens when braces are used on a single select, which leads
    to the uninitialized global parameters structure.

  mysql-test/r/subselect.result
    1.67.26.1 03/09/09 15:23:32 Sinisa@sinisa.nasamreza.org +6 -0
    Fix for a bug #1226.
    
    Happens when braces are used on a single select, which leads
    to the uninitialized global parameters structure.

ChangeSet
  1.1563.30.1 03/09/08 21:58:09 bell@sanja.is.com.ua +6 -0
  removing additional IN subquery condition
  fixed IN optimisation bug

  sql/sql_select.cc
    1.216.28.3 03/09/08 21:58:07 bell@sanja.is.com.ua +44 -2
    removing additional IN subquery condition

  sql/mysqld.cc
    1.356.25.1 03/09/08 21:58:07 bell@sanja.is.com.ua +2 -0
    constant for additional IN subquery condition detecting

  sql/mysql_priv.h
    1.186.27.1 03/09/08 21:58:07 bell@sanja.is.com.ua +1 -1
    constant for additional IN subquery condition detecting

  sql/item_subselect.cc
    1.60.8.8 03/09/08 21:58:07 bell@sanja.is.com.ua +13 -10
    fixed IN optimisation bug

  mysql-test/t/subselect.test
    1.58.14.9 03/09/08 21:58:07 bell@sanja.is.com.ua +13 -0
    test of IN optimisation bug

  mysql-test/r/subselect.result
    1.67.21.10 03/09/08 21:58:07 bell@sanja.is.com.ua +24 -1
    test of IN optimisation bug

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

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

ChangeSet
  1.1563.29.1 03/09/08 16:55:30 serg@serg.mylan +1 -0
  Merge

  innobase/row/row0sel.c
    1.35 03/09/08 16:55:27 serg@serg.mylan +0 -0
    SCCS merged

ChangeSet
  1.1563.28.4 03/09/08 18:49:23 hf@deer.(none) +1 -0
  fix for #1219

  libmysqld/lib_sql.cc
    1.63 03/09/08 18:49:22 hf@deer.(none) +9 -7
    we need ER() macrodefinition from errmsg.h

ChangeSet
  1.1563.26.4 03/09/08 17:30:53 ram@mysql.r18.ru +4 -0
  Fix for the bug #1209: SELECT DATABASE().

  sql/sql_db.cc
    1.68.1.9 03/09/08 17:30:50 ram@mysql.r18.ru +2 -0
    Fix for the bug #1209: SELECT DATABASE().

  sql/item_strfunc.cc
    1.135 03/09/08 17:30:50 ram@mysql.r18.ru +2 -2
    Fix for the bug #1209: SELECT DATABASE().

  mysql-test/t/create.test
    1.28 03/09/08 17:30:50 ram@mysql.r18.ru +16 -0
    Fix for the bug #1209: SELECT DATABASE().

  mysql-test/r/create.result
    1.46 03/09/08 17:30:50 ram@mysql.r18.ru +13 -0
    Fix for the bug #1209: SELECT DATABASE().

ChangeSet
  1.1563.28.3 03/09/08 17:00:39 hf@deer.(none) +1 -0
  fix for #1218

  sql/sql_parse.cc
    1.271.25.6 03/09/08 17:00:37 hf@deer.(none) +2 -0
    This line fails in libmysqld.
    And isn't needed while we don't check privileges in embedded library

ChangeSet
  1.1563.28.2 03/09/08 15:08:53 hf@deer.(none) +1 -0
  Trimming of embedded library code

  sql/sql_parse.cc
    1.271.25.5 03/09/08 15:08:51 hf@deer.(none) +11 -11
    It's better to check for HAVE_REPLICATION here instead of EMBEDDED_LIBRARY

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

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

ChangeSet
  1.1563.27.1 03/09/08 13:11:18 hf@deer.(none) +4 -0
  fix for #1210

  libmysqld/libmysqld.c
    1.44 03/09/08 13:11:16 hf@deer.(none) +16 -0
    check for mysql_server_init execution added

  libmysqld/lib_sql.cc
    1.62 03/09/08 13:11:16 hf@deer.(none) +4 -3
    static inited variable changed to global server_inited

  libmysql/errmsg.c
    1.21.1.1 03/09/08 13:11:16 hf@deer.(none) +6 -3
    Error message added

  include/errmsg.h
    1.17 03/09/08 13:11:16 hf@deer.(none) +1 -0
    Error code added

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

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

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

ChangeSet
  1.1563.26.2 03/09/08 10:53:51 ram@mysql.r18.ru +2 -0
  #1169: Add --exec command to mysqltest

  mysql-test/mysql-test-run.sh
    1.167.2.1 03/09/08 10:53:49 ram@mysql.r18.ru +8 -0
    #1169: Add --exec command to mysqltest

  client/mysqltest.c
    1.92.4.1 03/09/08 10:53:49 ram@mysql.r18.ru +65 -0
    #1169: Add --exec command to mysqltest

ChangeSet
  1.1563.25.1 03/09/07 20:35:10 bell@sanja.is.com.ua +3 -0
  fixed row union processing

  sql/item_subselect.cc
    1.60.8.7 03/09/07 20:33:53 bell@sanja.is.com.ua +1 -1
    fixed row union processing

  mysql-test/t/subselect.test
    1.58.14.8 03/09/07 20:33:53 bell@sanja.is.com.ua +10 -0
    row union test

  mysql-test/r/subselect.result
    1.67.21.9 03/09/07 20:33:53 bell@sanja.is.com.ua +8 -0
    row union test

ChangeSet
  1.1563.21.4 03/09/07 15:14:32 monty@mashka.mysql.fi +5 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mashka.mysql.fi:/home/my/mysql-tmp

  sql/sql_parse.cc
    1.271.24.4 03/09/07 15:14:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_load.cc
    1.46.3.11 03/09/07 15:14:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_sum.h
    1.44.1.6 03/09/07 15:14:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_sum.cc
    1.82.2.6 03/09/07 15:14:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item.cc
    1.58.18.10 03/09/07 15:14:27 monty@mashka.mysql.fi +0 -0
    Auto merged

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

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

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

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

ChangeSet
  1.1563.23.5 03/09/06 18:50:30 hf@deer.(none) +3 -0
  Fix for LOAD DATA to work with embedded library

  sql/sql_parse.cc
    1.271.25.4 03/09/06 18:50:10 hf@deer.(none) +2 -2
    LOAD DATA enabled for embedded library

  sql/sql_load.cc
    1.46.5.1 03/09/06 18:50:10 hf@deer.(none) +23 -7
    mysql_load fixed to work with embedded library

  libmysqld/lib_sql.cc
    1.61 03/09/06 18:50:10 hf@deer.(none) +0 -1
    There's now one common SCRAMBLE_LENGTH

ChangeSet
  1.1346.1.210 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.206.1.81 03/09/05 14:44:20 carsten@tsort.bitbybit.dk +1 -0
    Logging to logging@openlogging.org accepted

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

ChangeSet
  1.1346.1.208 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.152.1.102 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.1346.347.3 03/09/05 08:16:13 monty@mashka.mysql.fi +1 -0
  after merge fixes

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

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

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

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

ChangeSet
  1.1346.347.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.7.1.12 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.10.1.13 03/09/05 06:42:53 monty@mashka.mysql.fi +22 -0
    Added test case for MyISAM UPDATE bug

  myisam/mi_update.c
    1.10.1.3 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.46.1.19 03/09/05 06:42:53 monty@mashka.mysql.fi +5 -4
    Added DBUG info

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

ChangeSet
  1.1346.345.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.1346.345.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.7.1.1 03/09/04 12:55:45 greg@mysql.com +36 -13
    Fix in case of default to .zip, use 'recode' if available

ChangeSet
  1.1563.23.4 03/09/04 17:12:20 gluh@gluh.mysql.r18.ru +3 -0
  Fix for bug 1176

  sql/sql_derived.cc
    1.43.6.1 03/09/04 17:11:52 gluh@gluh.mysql.r18.ru +1 -1
    Fix for bug 1176

  mysql-test/t/derived.test
    1.24 03/09/04 17:11:52 gluh@gluh.mysql.r18.ru +13 -0
    Fix for bug 1176

  mysql-test/r/derived.result
    1.26 03/09/04 17:11:52 gluh@gluh.mysql.r18.ru +8 -0
    Fix for bug 1176

ChangeSet
  1.1563.23.3 03/09/04 06:44:16 wax@kishkin.ru +4 -0
  BUG
  correct bug 1085 (a problem with min/max functions)
  add tests of bugs 833,836,1085

  sql/item_sum.h
    1.44.1.5 03/09/04 06:44:14 wax@mysql.com +2 -2
    correct bug 1085

  sql/item_sum.cc
    1.82.2.5 03/09/04 06:44:14 wax@mysql.com +4 -4
    merge

  mysql-test/t/func_gconcat.test
    1.7 03/09/04 06:44:14 wax@mysql.com +21 -0
    add tests of bugs #833, 836, 1085

  mysql-test/r/func_gconcat.result
    1.14 03/09/04 06:44:14 wax@mysql.com +18 -0
    add tests of bugs 833, 836, 1085

ChangeSet
  1.1563.23.2 03/09/04 06:13:21 wax@mysql.com +1 -0
  merge

  sql/item_sum.cc
    1.82.2.4 03/09/04 06:13:20 wax@mysql.com +0 -4
    merge

ChangeSet
  1.1563.24.1 03/09/04 03:02:19 monty@narttu.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into narttu.mysql.fi:/my/mysql-4.1

  sql/sql_parse.cc
    1.271.27.1 03/09/04 03:02:16 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1563.19.7 03/09/04 02:49:35 monty@mashka.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mashka.mysql.fi:/home/my/mysql-tmp

  sql/sql_parse.cc
    1.271.24.3 03/09/04 02:49:31 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.1.207 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.54.1.30 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.4.1.4 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.6.1.6 03/09/03 22:27:01 serg@serg.mylan +13 -0
    bug #1172 - crash on force index() and SEL_ARG::MAYBE_KEY

ChangeSet
  1.1563.23.1 03/09/03 21:52:42 kostja@oak.local +1 -0
  fixed bug - check_user shall not be included into the
  embedded library.

  sql/sql_parse.cc
    1.271.25.3 03/09/03 21:52:29 kostja@oak.local +4 -0
    fixed bug - check_user shall not be included into the
    embedded library.

ChangeSet
  1.1563.19.6 03/09/03 19:53:08 monty@narttu.mysql.fi +38 -0
  merge

  sql/sql_acl.cc
    1.74.1.14 03/09/03 19:53:06 monty@narttu.mysql.fi +73 -56
    Merge and code cleanup of acl_getroot()

  sql/handler.cc
    1.94.1.5 03/09/03 19:53:06 monty@narttu.mysql.fi +1 -1
    Merge

  sql/sql_yacc.yy
    1.203.1.60 03/09/03 19:22:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_union.cc
    1.74.5.14 03/09/03 19:22:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_table.cc
    1.157.9.8 03/09/03 19:22:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/spanish/errmsg.txt
    1.64.1.19 03/09/03 19:22:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/portuguese/errmsg.txt
    1.64.1.20 03/09/03 19:22:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_show.cc
    1.122.4.3 03/09/03 19:22:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.1.32 03/09/03 19:22:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_repl.cc
    1.102.1.9 03/09/03 19:22:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.24.2 03/09/03 19:22:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_insert.cc
    1.86.2.16 03/09/03 19:22:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_class.h
    1.146.1.33 03/09/03 19:22:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_class.cc
    1.105.1.16 03/09/03 19:22:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/slave.h
    1.66 03/09/03 19:22:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/slave.cc
    1.188.1.17 03/09/03 19:22:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/set_var.cc
    1.34.1.29 03/09/03 19:22:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.32.1.3 03/09/03 19:22:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.38 03/09/03 19:22:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.25 03/09/03 19:22:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_sum.cc
    1.82.4.2 03/09/03 19:22:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_func.h
    1.68.1.19 03/09/03 19:22:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_func.cc
    1.124.1.23 03/09/03 19:22:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item.h
    1.56.1.32 03/09/03 19:22:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.115.4.4 03/09/03 19:22:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/myisam.test
    1.20 03/09/03 19:22:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/show_check.result
    1.31.1.6 03/09/03 19:22:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/rpl_log.result
    1.43 03/09/03 19:22:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/rpl_loaddata.result
    1.11 03/09/03 19:22:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/myisam.result
    1.27 03/09/03 19:22:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/isam.result
    1.18 03/09/03 19:22:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  libmysql/libmysql.c
    1.156.1.22 03/09/03 19:22:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  isam/open.c
    1.14 03/09/03 19:22:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/mysql_com.h
    1.67.1.14 03/09/03 19:22:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/my_sys.h
    1.100.1.6 03/09/03 19:22:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysqldump.c
    1.98 03/09/03 19:22:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.233.1.24 03/09/03 19:21:51 monty@narttu.mysql.fi +0 -0
    auto-union

  BitKeeper/etc/ignore
    1.153.1.12 03/09/03 19:21:50 monty@narttu.mysql.fi +0 -4
    auto-union

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.1563.19.4 03/09/03 16:31:01 serg@serg.mylan +3 -0
  C cleanups

  sql/password.c
    1.30 03/09/03 16:30:57 serg@serg.mylan +3 -3
    C cleanups

  libmysql/libmysql.c
    1.156.1.21 03/09/03 16:30:57 serg@serg.mylan +3 -2
    C cleanups

  include/mysql_com.h
    1.67.1.13 03/09/03 16:30:57 serg@serg.mylan +1 -1
    C cleanups

ChangeSet
  1.1346.346.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.206.1.80 03/09/03 08:07:57 gerberb@ou800.zenez.com +1 -0
    Logging to logging@openlogging.org accepted

ChangeSet
  1.1563.22.3 03/09/03 18:07:00 kostja@oak.local +1 -0
  Monty explanation for net_store_length(uint) put to the comment

  sql/protocol.cc
    1.56.1.13 03/09/03 18:06:58 kostja@oak.local +7 -1
    Monty explanation for net_store_length(uint) put to the comment

ChangeSet
  1.1563.19.3 03/09/03 15:40:19 serg@serg.mylan +9 -0
  Merge bk-internal:/home/bk/mysql-4.1/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  sql/sql_yacc.yy
    1.203.1.59 03/09/03 15:40:14 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.25.2 03/09/03 15:40:14 serg@serg.mylan +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.37 03/09/03 15:40:14 serg@serg.mylan +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.24 03/09/03 15:40:13 serg@serg.mylan +0 -0
    Auto merged

  sql/lex.h
    1.82.1.40 03/09/03 15:40:13 serg@serg.mylan +0 -0
    Auto merged

  sql/item_strfunc.h
    1.70 03/09/03 15:40:13 serg@serg.mylan +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.134 03/09/03 15:40:13 serg@serg.mylan +0 -0
    Auto merged

  sql/item_create.h
    1.32 03/09/03 15:40:13 serg@serg.mylan +0 -0
    Auto merged

  sql/item_create.cc
    1.33.1.17 03/09/03 15:40:13 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1563.22.2 03/09/03 17:29:51 kostja@oak.local +1 -0
  fixed after-merge bug in CHANG_USER command

  sql/sql_parse.cc
    1.271.26.2 03/09/03 17:29:49 kostja@oak.local +6 -8
    fixed after-merge bug in CHANGE_USER command

ChangeSet
  1.1563.22.1 03/09/03 16:44:40 kostja@oak.local +1 -0
  Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into oak.local:/home/kostja/mysql/mysql-4.1-root

  BitKeeper/etc/ignore
    1.153.1.11 03/09/03 16:44:31 kostja@oak.local +0 -0
    auto-union

ChangeSet
  1.1563.20.2 03/09/03 16:43:41 kostja@oak.local +2 -0
  post-merge fixes

  sql/slave.cc
    1.188.1.16 03/09/03 16:43:39 kostja@oak.local +1 -1
    post-merge fix

  mysql-test/r/func_crypt.result
    1.13 03/09/03 16:43:39 kostja@oak.local +6 -6
    _dig_vec converted lowercase

  configure.in
    1.191.1.91 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.1563.20.1 03/09/03 14:12:10 kostja@oak.local +49 -0
  merge commit, hope that none of bar and dlenev changes were
  lost.

  sql/sql_repl.h
    1.28.1.2 03/09/03 14:12:07 kostja@oak.local +0 -1
    merge commit

  sql/sql_parse.cc
    1.271.26.1 03/09/03 14:12:07 kostja@oak.local +9 -15
    merge commit

  sql/sql_acl.cc
    1.74.1.13 03/09/03 14:12:07 kostja@oak.local +26 -39
    merge commit

  sql/slave.h
    1.65 03/09/03 14:12:07 kostja@oak.local +0 -1
    merge commit

  sql/slave.cc
    1.188.1.15 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/ukrainian/errmsg.txt
    1.27.1.17 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/swedish/errmsg.txt
    1.64.1.20 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/spanish/errmsg.txt
    1.64.1.18 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/slovak/errmsg.txt
    1.64.1.18 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/serbian/errmsg.txt
    1.18.1.16 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/russian/errmsg.txt
    1.61.1.18 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/romanian/errmsg.txt
    1.62.1.18 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/portuguese/errmsg.txt
    1.64.1.19 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/polish/errmsg.txt
    1.63.1.18 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/norwegian/errmsg.txt
    1.63.1.18 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.18 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/korean/errmsg.txt
    1.63.1.17 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/japanese/errmsg.txt
    1.63.1.17 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/italian/errmsg.txt
    1.70.1.18 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/hungarian/errmsg.txt
    1.65.1.17 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/greek/errmsg.txt
    1.64.1.17 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/german/errmsg.txt
    1.64.1.18 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/french/errmsg.txt
    1.63.1.18 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/estonian/errmsg.txt
    1.64.1.17 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/english/errmsg.txt
    1.70.1.22 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/dutch/errmsg.txt
    1.66.1.18 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/danish/errmsg.txt
    1.62.1.18 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/share/czech/errmsg.txt
    1.64.1.18 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit

  sql/set_var.h
    1.32 03/09/03 14:12:07 kostja@oak.local +0 -1
    merge commit

  sql/mysql_priv.h
    1.186.1.23 03/09/03 14:12:07 kostja@oak.local +0 -0
    merge commit: autoremerge

  sql-common/client.c
    1.22 03/09/03 14:12:07 kostja@oak.local +2 -1
    merge commit

  include/mysqld_error.h
    1.61.1.14 03/09/03 14:12:07 kostja@oak.local +2 -3
    merge commit: new error message added

ChangeSet
  1.1563.19.2 03/09/03 12:07:18 serg@serg.mylan +22 -0
  merged

  sql/sql_lex.h
    1.102.24.1 03/09/03 12:07:14 serg@serg.mylan +0 -1
    merged

  sql/item_func.cc
    1.124.7.1 03/09/03 12:07:14 serg@serg.mylan +0 -2
    merged

  sql/sql_yacc.yy
    1.203.68.2 03/09/03 11:55:26 serg@serg.mylan +0 -2
    Auto merged

  sql/sql_table.cc
    1.157.9.7 03/09/03 11:55:26 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.28.2 03/09/03 11:55:25 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.25.1 03/09/03 11:55:25 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_insert.cc
    1.86.7.1 03/09/03 11:55:25 serg@serg.mylan +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.24.2 03/09/03 11:55:25 serg@serg.mylan +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.26.1 03/09/03 11:55:24 serg@serg.mylan +0 -0
    Auto merged

  sql/lex.h
    1.82.14.5 03/09/03 11:55:24 serg@serg.mylan +0 -0
    Auto merged

  sql/item_strfunc.h
    1.63.1.5 03/09/03 11:55:24 serg@serg.mylan +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.126.1.11 03/09/03 11:55:24 serg@serg.mylan +0 -0
    Auto merged

  sql/item_func.h
    1.68.9.1 03/09/03 11:55:24 serg@serg.mylan +0 -0
    Auto merged

  sql/item_create.h
    1.28.1.3 03/09/03 11:55:24 serg@serg.mylan +0 -0
    Auto merged

  sql/item_create.cc
    1.33.5.3 03/09/03 11:55:24 serg@serg.mylan +0 -0
    Auto merged

  sql/handler.h
    1.81.1.2 03/09/03 11:55:24 serg@serg.mylan +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.115.7.1 03/09/03 11:55:24 serg@serg.mylan +0 -0
    Auto merged

  mysql-test/t/myisam.test
    1.18.1.1 03/09/03 11:55:24 serg@serg.mylan +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.47 03/09/03 11:55:23 serg@serg.mylan +0 -0
    Auto merged

  mysql-test/r/myisam.result
    1.25.1.1 03/09/03 11:55:23 serg@serg.mylan +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.72 03/09/03 11:55:23 serg@serg.mylan +0 -0
    Auto merged

  include/my_sys.h
    1.100.1.5 03/09/03 11:55:23 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1546.28.57 03/09/03 11:37:59 serg@serg.mylan +1 -0
  making InnoDB to return the row exactly the same (bytewise) as it was written to it

  innobase/row/row0sel.c
    1.33.1.1 03/09/03 11:37:56 serg@serg.mylan +16 -17
    making InnoDB to return the row exactly the same (bytewise) as it was written to it

ChangeSet
  1.1546.28.56 03/09/03 11:34:32 serg@serg.mylan +11 -0
  CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ]

  sql/sql_yacc.yy
    1.203.63.4 03/09/03 11:34:28 serg@serg.mylan +10 -4
    CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ]

  sql/sql_table.cc
    1.157.12.2 03/09/03 11:34:28 serg@serg.mylan +51 -15
    CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ]

  sql/sql_parse.cc
    1.271.23.2 03/09/03 11:34:28 serg@serg.mylan +1 -1
    CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ]

  sql/mysql_priv.h
    1.186.23.2 03/09/03 11:34:28 serg@serg.mylan +2 -1
    CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ]

  mysys/checksum.c
    1.8 03/09/03 11:34:28 serg@serg.mylan +3 -1
    switching to crc32 as a checksum algorithm

  mysql-test/t/myisam.test
    1.17.1.1 03/09/03 11:34:28 serg@serg.mylan +12 -1
    CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ]

  mysql-test/t/innodb.test
    1.43.1.2 03/09/03 11:34:28 serg@serg.mylan +12 -0
    CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ]

  mysql-test/r/show_check.result
    1.31.3.1 03/09/03 11:34:28 serg@serg.mylan +1 -1
    results updated

  mysql-test/r/myisam.result
    1.23.1.1 03/09/03 11:34:28 serg@serg.mylan +20 -3
    CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ]

  mysql-test/r/innodb.result
    1.68.1.2 03/09/03 11:34:28 serg@serg.mylan +25 -0
    CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ]

  myisam/mi_checksum.c
    1.6 03/09/03 11:34:28 serg@serg.mylan +1 -1
    workaround for zlib's crc32 glitch

  sql/sql_yacc.yy
    1.203.1.58 03/09/03 12:37:34 kostja@oak.local +0 -0
    Auto merged

  sql/sql_class.h
    1.146.1.32 03/09/03 12:37:34 kostja@oak.local +0 -0
    Auto merged

  sql/sql_class.cc
    1.105.1.15 03/09/03 12:37:34 kostja@oak.local +0 -0
    Auto merged

  sql/sql_acl.h
    1.23 03/09/03 12:37:34 kostja@oak.local +0 -0
    Auto merged

  sql/set_var.cc
    1.34.1.28 03/09/03 12:37:34 kostja@oak.local +0 -0
    Auto merged

  sql/protocol.h
    1.13 03/09/03 12:37:34 kostja@oak.local +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.36 03/09/03 12:37:34 kostja@oak.local +0 -0
    Auto merged

  sql/lex.h
    1.82.1.39 03/09/03 12:37:33 kostja@oak.local +0 -0
    Auto merged

  sql/item_strfunc.h
    1.69 03/09/03 12:37:33 kostja@oak.local +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.133 03/09/03 12:37:33 kostja@oak.local +0 -0
    Auto merged

  sql/item_create.h
    1.31 03/09/03 12:37:33 kostja@oak.local +0 -0
    Auto merged

  sql/item_create.cc
    1.33.1.16 03/09/03 12:37:33 kostja@oak.local +0 -0
    Auto merged

  scripts/mysql_fix_privilege_tables.sql
    1.4 03/09/03 12:37:33 kostja@oak.local +0 -0
    Auto merged

  libmysql/libmysql.c
    1.156.1.20 03/09/03 12:37:33 kostja@oak.local +0 -0
    Auto merged

  include/mysql_com.h
    1.67.1.12 03/09/03 12:37:33 kostja@oak.local +0 -0
    Auto merged

  include/mysql.h
    1.83 03/09/03 12:37:33 kostja@oak.local +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.233.1.23 03/09/03 12:37:14 kostja@oak.local +0 -0
    auto-union

ChangeSet
  1.1563.19.1 03/09/03 12:19:30 dlenev@dlenev.mshome +1 -0
  Added automatically created SSL certificates from mysql-test/std_data 
  to ignore list.

  BitKeeper/etc/ignore
    1.153.6.1 03/09/03 12:19:28 dlenev@mysql.com +1 -0
    Added automatically created SSL certificates from mysql-test/std_data 
    to ignore list.

ChangeSet
  1.1563.7.22 03/09/03 10:59:14 bell@sanja.is.com.ua +1 -0
  inserted forgoten ASSERT (BUG#1180)

  sql/sql_prepare.cc
    1.34.1.7 03/09/03 10:59:11 bell@sanja.is.com.ua +1 -2
    inserted forgoten ASSERT

ChangeSet
  1.1563.7.21 03/09/02 19:56:55 bell@sanja.is.com.ua +9 -0
  fixed BUG#1180 (changing WHERE clause of prepared statements by optimisation)

  tests/client_test.c
    1.37 03/09/02 19:56:42 bell@sanja.is.com.ua +80 -0
    test suite for bug #1180

  sql/sql_prepare.cc
    1.34.1.6 03/09/02 19:56:42 bell@sanja.is.com.ua +22 -1
    saving WHERE root
    creating new AND/OR structure before executing prepared statement

  sql/sql_lex.h
    1.102.22.3 03/09/02 19:56:42 bell@sanja.is.com.ua +1 -0
    field for saving WHERE root

  sql/sql_lex.cc
    1.87.2.1 03/09/02 19:56:42 bell@sanja.is.com.ua +1 -0
    field for saving WHERE root

  sql/item_func.h
    1.68.8.1 03/09/02 19:56:42 bell@sanja.is.com.ua +3 -0
    constructor for aloning AND/OR structure of WHERE clause

  sql/item_func.cc
    1.124.6.1 03/09/02 19:56:42 bell@sanja.is.com.ua +21 -0
    constructor for aloning AND/OR structure of WHERE clause

  sql/item_cmpfunc.h
    1.61.2.2 03/09/02 19:56:42 bell@sanja.is.com.ua +28 -5
    constructor and method for aloning AND/OR structure of WHERE clause

  sql/item_cmpfunc.cc
    1.99.4.1 03/09/02 19:56:42 bell@sanja.is.com.ua +25 -0
    constructor and method for aloning AND/OR structure of WHERE clause

  sql/item.h
    1.56.13.2 03/09/02 19:56:42 bell@sanja.is.com.ua +5 -1
    constructor and method for aloning AND/OR structure of WHERE clause

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.1346.345.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.1346.345.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.1346.1.205 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

ChangeSet
  1.1563.7.20 03/09/02 14:37:06 bell@sanja.is.com.ua +2 -0
  fixed string parameter assugnment (coping instead of asigning pointer to buffer) (BUG#1115)
  fixed test_field_misc (UTF variable value)

  tests/client_test.c
    1.36 03/09/02 14:36:53 bell@sanja.is.com.ua +86 -2
    test for BUG#1115
    fixed test_field_misc (UTF variable value)

  sql/item.cc
    1.58.22.1 03/09/02 14:36:53 bell@sanja.is.com.ua +21 -10
    added debug informetion
    fixed string parameter assugnment (coping instead of asigning pointer to buffer)

  sql/ha_berkeley.cc
    1.105.1.5 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.27.1.1 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.22.1.5 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.1346.1.204 03/09/02 08:37:27 serg@serg.mylan +1 -0
  s/\t/ / in command-line help text

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

ChangeSet
  1.1346.344.1 03/09/01 11:15:53 vva@eagle.mysql.r18.ru +1 -0
  fixed bug #1073 
  (Replication LOAD DATA INFILE mysqlbinlog doesn't cleanup tmp files) 

  client/mysqlbinlog.cc
    1.70.5.1 03/09/01 11:15:32 vva@eagle.mysql.r18.ru +18 -2
    fixed bug #1073 
    (Replication LOAD DATA INFILE mysqlbinlog doesn't cleanup tmp files) 

ChangeSet
  1.1563.7.19 03/09/01 19:13:19 dlenev@dlenev.mshome +6 -0
  Updated various tests results which were missed during auto-merge 
  with replication over SSL patch.

  mysql-test/r/rpl_rotate_logs.result
    1.45 03/09/01 19:10:46 dlenev@mysql.com +1 -1
    Fixed bad manual merge result

  mysql-test/r/rpl_reset_slave.result
    1.3 03/09/01 19:10:46 dlenev@mysql.com +8 -8
    New SSL related fields in SHOW SLAVE STATUS

  mysql-test/r/rpl_openssl.result
    1.2 03/09/01 19:10:46 dlenev@mysql.com +2 -2
    Post merge update of SHOW SLAVE STATUS result

  mysql-test/r/rpl_max_relay_size.result
    1.5 03/09/01 19:10:46 dlenev@mysql.com +12 -12
    New SSL related fields in SHOW SLAVE STATUS

  mysql-test/r/rpl_loaddata.result
    1.9.1.1 03/09/01 19:10:46 dlenev@mysql.com +6 -6
    New SSL related fields in SHOW SLAVE STATUS

  mysql-test/r/rpl_error_ignored_table.result
    1.4 03/09/01 19:10:46 dlenev@mysql.com +2 -2
    New SSL related fields in SHOW SLAVE STATUS

ChangeSet
  1.1346.343.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.152.1.101 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.4.1.3 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.6.1.5 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.1563.7.18 03/09/01 16:14:54 dlenev@mysql.com +36 -0
  Manual merge fixes

  sql/slave.h
    1.62.3.1 03/09/01 16:14:52 dlenev@mysql.com +5 -6
    Mabual merge

  sql/slave.cc
    1.188.7.1 03/09/01 16:14:52 dlenev@mysql.com +16 -13
    Mabual merge

  mysql-test/r/rpl_rotate_logs.result
    1.44 03/09/01 16:14:52 dlenev@mysql.com +1 -2
    Mabual merge

  mysql-test/r/rpl_replicate_do.result
    1.16 03/09/01 16:14:52 dlenev@mysql.com +1 -2
    Mabual merge

  mysql-test/r/rpl_log_pos.result
    1.32 03/09/01 16:14:52 dlenev@mysql.com +2 -4
    Mabual merge

  mysql-test/r/rpl_log.result
    1.41.1.1 03/09/01 16:14:52 dlenev@mysql.com +1 -2
    Mabual merge

  mysql-test/r/rpl_flush_log_loop.result
    1.8 03/09/01 16:14:52 dlenev@mysql.com +1 -2
    Mabual merge

  include/mysqld_error.h
    1.61.7.3 03/09/01 16:14:52 dlenev@mysql.com +2 -3
    Mabual merge

  sql/sql_yacc.yy
    1.203.68.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/sql_repl.cc
    1.102.3.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.22.2 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/ukrainian/errmsg.txt
    1.27.9.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/swedish/errmsg.txt
    1.64.10.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/spanish/errmsg.txt
    1.64.11.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/slovak/errmsg.txt
    1.64.10.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/russian/errmsg.txt
    1.61.9.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/romanian/errmsg.txt
    1.62.10.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/portuguese/errmsg.txt
    1.64.11.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.63.9.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/norwegian/errmsg.txt
    1.63.10.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/norwegian-ny/errmsg.txt
    1.63.10.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/korean/errmsg.txt
    1.63.9.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/japanese/errmsg.txt
    1.63.9.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/italian/errmsg.txt
    1.70.10.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/hungarian/errmsg.txt
    1.65.9.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/greek/errmsg.txt
    1.64.9.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/german/errmsg.txt
    1.64.10.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/french/errmsg.txt
    1.63.10.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/estonian/errmsg.txt
    1.64.9.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.70.12.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/dutch/errmsg.txt
    1.66.10.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/danish/errmsg.txt
    1.62.10.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/share/czech/errmsg.txt
    1.64.10.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.32.3.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.24.1 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

  sql/lex.h
    1.82.14.4 03/09/01 15:23:32 dlenev@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1546.82.1 03/09/01 15:16:20 dlenev@dlenev.mshome +43 -0
  Implemented replication over SSL
   Added proper options to CHANGE MASTER TO, new fields to SHOW SLAVE STATUS,
   Honoring this parameters during connection to master.
   Introduced new format of master.info file

  mysql-test/t/rpl_openssl.test
    1.1 03/09/01 15:16:00 dlenev@mysql.com +60 -0

  mysql-test/r/rpl_openssl.result
    1.1 03/09/01 15:16:00 dlenev@mysql.com +30 -0

  sql/sql_yacc.yy
    1.203.67.1 03/09/01 15:16:00 dlenev@mysql.com +37 -0
    Added SSL parameters for CHANGE MASTER TO

  sql/sql_repl.cc
    1.102.2.1 03/09/01 15:16:00 dlenev@mysql.com +19 -0
    Added SSL parameters for CHANGE MASTER TO

  sql/sql_lex.h
    1.102.23.1 03/09/01 15:16:00 dlenev@mysql.com +7 -0
    Added SSL parameters for CHANGE MASTER TO

  sql/slave.h
    1.62.2.1 03/09/01 15:16:00 dlenev@mysql.com +11 -1
    Added SSL parameters to MASTER_INFO

  sql/slave.cc
    1.188.6.1 03/09/01 15:16:00 dlenev@mysql.com +135 -11
    Introduced new format of master.info file
    Added support of SSL params in master.info and SHOW SLAVE STATUS
    Added support of SSL connections

  sql/share/ukrainian/errmsg.txt
    1.27.8.1 03/09/01 15:16:00 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/share/swedish/errmsg.txt
    1.64.9.1 03/09/01 15:16:00 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/share/spanish/errmsg.txt
    1.64.10.1 03/09/01 15:16:00 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/share/slovak/errmsg.txt
    1.64.9.1 03/09/01 15:16:00 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/share/serbian/errmsg.txt
    1.18.8.1 03/09/01 15:16:00 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/share/russian/errmsg.txt
    1.61.8.1 03/09/01 15:16:00 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/share/romanian/errmsg.txt
    1.62.9.1 03/09/01 15:16:00 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/share/portuguese/errmsg.txt
    1.64.10.1 03/09/01 15:16:00 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  mysql-test/t/rpl_openssl.test
    1.0 03/09/01 15:16:00 dlenev@mysql.com +0 -0
    BitKeeper file /home/dlenev/src/mysql-4.1-1095/mysql-test/t/rpl_openssl.test

  mysql-test/r/rpl_openssl.result
    1.0 03/09/01 15:16:00 dlenev@mysql.com +0 -0
    BitKeeper file /home/dlenev/src/mysql-4.1-1095/mysql-test/r/rpl_openssl.result

  sql/share/polish/errmsg.txt
    1.63.8.1 03/09/01 15:15:59 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/share/norwegian/errmsg.txt
    1.63.9.1 03/09/01 15:15:59 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/share/norwegian-ny/errmsg.txt
    1.63.9.1 03/09/01 15:15:59 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/share/korean/errmsg.txt
    1.63.8.1 03/09/01 15:15:59 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/share/japanese/errmsg.txt
    1.63.8.1 03/09/01 15:15:59 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/share/italian/errmsg.txt
    1.70.9.1 03/09/01 15:15:59 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/share/hungarian/errmsg.txt
    1.65.8.1 03/09/01 15:15:59 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/share/greek/errmsg.txt
    1.64.8.1 03/09/01 15:15:59 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/share/german/errmsg.txt
    1.64.9.1 03/09/01 15:15:59 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/share/french/errmsg.txt
    1.63.9.1 03/09/01 15:15:59 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/share/estonian/errmsg.txt
    1.64.8.1 03/09/01 15:15:59 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/share/english/errmsg.txt
    1.70.11.1 03/09/01 15:15:59 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/share/dutch/errmsg.txt
    1.66.9.1 03/09/01 15:15:59 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/share/danish/errmsg.txt
    1.62.9.1 03/09/01 15:15:59 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/share/czech/errmsg.txt
    1.64.9.1 03/09/01 15:15:59 dlenev@mysql.com +1 -0
    Added "slave without SSL ignored SSL params" warning

  sql/repl_failsafe.cc
    1.32.2.1 03/09/01 15:15:59 dlenev@mysql.com +11 -0
    Added SSL support to connect_to_master()

  sql/mysqld.cc
    1.356.23.1 03/09/01 15:15:59 dlenev@mysql.com +17 -15
    Added --master-ssl-ca parameter. Fixed description of other master-ssl parameters

  sql/lex.h
    1.82.17.1 03/09/01 15:15:59 dlenev@mysql.com +6 -0
    Added MASTER_SSL lexems for CHANGE MASTER

  mysql-test/r/rpl_rotate_logs.result
    1.41.1.1 03/09/01 15:15:59 dlenev@mysql.com +6 -6
    Added fields to SHOW SLAVE STATUS for replication over SSL

  mysql-test/r/rpl_replicate_do.result
    1.14.1.1 03/09/01 15:15:59 dlenev@mysql.com +2 -2
    Added fields to SHOW SLAVE STATUS for replication over SSL

  mysql-test/r/rpl_redirect.result
    1.10 03/09/01 15:15:59 dlenev@mysql.com +1 -1
    Added fields to SHOW SLAVE STATUS for replication over SSL

  mysql-test/r/rpl_log_pos.result
    1.29.1.1 03/09/01 15:15:59 dlenev@mysql.com +8 -8
    Added fields to SHOW SLAVE STATUS for replication over SSL

  mysql-test/r/rpl_log.result
    1.39.1.1 03/09/01 15:15:59 dlenev@mysql.com +2 -2
    Added fields to SHOW SLAVE STATUS for replication over SSL

  mysql-test/r/rpl_flush_log_loop.result
    1.6.1.1 03/09/01 15:15:59 dlenev@mysql.com +2 -2
    Added fields to SHOW SLAVE STATUS for replication over SSL

  mysql-test/r/rpl_empty_master_crash.result
    1.9 03/09/01 15:15:59 dlenev@mysql.com +1 -1
    Added fields to SHOW SLAVE STATUS for replication over SSL

  mysql-test/r/rpl000015.result
    1.24 03/09/01 15:15:59 dlenev@mysql.com +7 -7
    Added fields to SHOW SLAVE STATUS for replication over SSL

  mysql-test/Makefile.am
    1.25 03/09/01 15:15:59 dlenev@mysql.com +10 -2
    Copy files required for rpl_openssl test during the make process

  include/mysqld_error.h
    1.61.8.1 03/09/01 15:15:59 dlenev@mysql.com +2 -1
    Added error code for "slave without SSL ignored SSL params warning"

ChangeSet
  1.1346.342.1 03/09/01 15:36:53 gluh@gluh.mysql.r18.ru +1 -0
  Fix for Bug #1142 
  './configure - error in file causes failure of compile (SSL option needed)'

  acinclude.m4
    1.77.1.16 03/09/01 15:36:45 gluh@gluh.mysql.r18.ru +2 -2
    Fix for Bug #1142 
    './configure - error in file causes failure of compile (SSL option needed)'

ChangeSet
  1.1346.1.202 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.61.1.10 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.1563.18.2 03/08/30 18:21:24 Sinisa@sinisa.nasamreza.org +2 -0
  Two small fixes

  sql/sql_union.cc
    1.74.8.2 03/08/30 18:21:17 Sinisa@sinisa.nasamreza.org +2 -2
    Better fix for VC++

  mysql-test/r/isam.result
    1.16.1.1 03/08/30 18:21:17 Sinisa@sinisa.nasamreza.org +0 -8
    Fixing results to match test changes

ChangeSet
  1.1563.17.1 03/08/30 17:13:10 Sinisa@sinisa.nasamreza.org +1 -0
  Fix for a compilation problem with VC++

  sql/sql_union.cc
    1.74.8.1 03/08/30 17:13:03 Sinisa@sinisa.nasamreza.org +3 -3
    Fix for a compilation problem with VC++

ChangeSet
  1.1563.7.14 03/08/29 22:13:57 miguel@hegel.local +1 -0
  Fix VC++ compiler error with redifinition return type

  include/thr_alarm.h
    1.15 03/08/29 22:13:15 miguel@hegel.local +1 -1
    Fix VC++ compiler error with redefinition return type

ChangeSet
  1.1346.1.201 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.61.1.9 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.1563.16.1 03/08/29 16:24:03 bell@sanja.is.com.ua +4 -0
  tmp_table_field() renamed to get_tmp_table_field() to avoid redifinition of tmp_table_field(TABLE *t_arg)

  sql/sql_select.cc
    1.216.28.1 03/08/29 16:23:40 bell@sanja.is.com.ua +6 -6
    tmp_table_field() renamed to get_tmp_table_field() to avoid redifinition of tmp_table_field(TABLE *t_arg)

  sql/item_timefunc.h
    1.37 03/08/29 16:23:40 bell@sanja.is.com.ua +0 -11
    no need redefine tmp_table_field(), it will be inherited

  sql/item_sum.cc
    1.82.5.1 03/08/29 16:23:40 bell@sanja.is.com.ua +4 -4
    tmp_table_field() renamed to get_tmp_table_field() to avoid redifinition of tmp_table_field(TABLE *t_arg)

  sql/item.h
    1.56.13.1 03/08/29 16:23:40 bell@sanja.is.com.ua +3 -3
    tmp_table_field() renamed to get_tmp_table_field() to avoid redifinition of tmp_table_field(TABLE *t_arg)

ChangeSet
  1.1563.7.12 03/08/29 17:14:10 kostja@oak.local +1 -0
  comment left after merge was moved to correct
  place

  sql/sql_class.h
    1.146.18.1 03/08/29 17:13:45 kostja@oak.local +1 -1
    comment moved to correct place

ChangeSet
  1.1563.15.1 03/08/29 13:44:35 monty@narttu.mysql.fi +163 -0
  merge with 4.0.15

  vio/viosocket.c
    1.19 03/08/29 13:44:31 monty@narttu.mysql.fi +3 -2
    merge with 4.0.15

  strings/ctype-tis620.c
    1.49 03/08/29 13:44:31 monty@narttu.mysql.fi +0 -0
    merge with 4.0.15

  sql/sql_yacc.yy
    1.203.66.3 03/08/29 13:44:31 monty@narttu.mysql.fi +0 -0
    merge with 4.0.15

  sql/sql_union.cc
    1.74.5.13 03/08/29 13:44:31 monty@narttu.mysql.fi +29 -13
    merge with 4.0.15

  sql/sql_table.cc
    1.157.13.1 03/08/29 13:44:31 monty@narttu.mysql.fi +0 -0
    merge with 4.0.15

  sql/sql_show.cc
    1.122.5.1 03/08/29 13:44:31 monty@narttu.mysql.fi +66 -136
    merge with 4.0.15

  sql/sql_select.cc
    1.216.1.31 03/08/29 13:44:31 monty@narttu.mysql.fi +7 -17
    merge with 4.0.15

  sql/sql_parse.cc
    1.271.24.1 03/08/29 13:44:31 monty@narttu.mysql.fi +0 -3
    merge with 4.0.15

  sql/sql_insert.cc
    1.86.2.15 03/08/29 13:44:31 monty@narttu.mysql.fi +4 -2
    merge with 4.0.15

  sql/sql_acl.cc
    1.74.2.6 03/08/29 13:44:31 monty@narttu.mysql.fi +10 -17
    merge with 4.0.15

  sql/slave.h
    1.62.1.3 03/08/29 13:44:31 monty@narttu.mysql.fi +2 -6
    merge with 4.0.15

  sql/slave.cc
    1.188.5.6 03/08/29 13:44:31 monty@narttu.mysql.fi +42 -48
    merge with 4.0.15

  sql/share/spanish/errmsg.txt
    1.64.9.1 03/08/29 13:44:31 monty@narttu.mysql.fi +0 -1
    merge with 4.0.15

  sql/share/portuguese/errmsg.txt
    1.64.9.1 03/08/29 13:44:31 monty@narttu.mysql.fi +0 -20
    merge with 4.0.15

  sql/set_var.cc
    1.34.14.4 03/08/29 13:44:31 monty@narttu.mysql.fi +5 -4
    merge with 4.0.15

  sql/opt_range.cc
    1.90.1.6 03/08/29 13:44:31 monty@narttu.mysql.fi +0 -0
    merge with 4.0.15

  sql/mysqld.cc
    1.356.18.7 03/08/29 13:44:31 monty@narttu.mysql.fi +6 -11
    merge with 4.0.15

  sql/mysql_priv.h
    1.186.25.1 03/08/29 13:44:31 monty@narttu.mysql.fi +13 -15
    merge with 4.0.15

  sql/log_event.cc
    1.113.1.13 03/08/29 13:44:31 monty@narttu.mysql.fi +99 -128
    merge with 4.0.15

  sql/log.cc
    1.108.1.10 03/08/29 13:44:31 monty@narttu.mysql.fi +0 -1
    merge with 4.0.15

  sql/item_sum.h
    1.44.3.1 03/08/29 13:44:31 monty@narttu.mysql.fi +1 -1
    merge with 4.0.15

  sql/item_sum.cc
    1.82.4.1 03/08/29 13:44:31 monty@narttu.mysql.fi +3 -9
    merge with 4.0.15

  sql/item_func.h
    1.68.1.18 03/08/29 13:44:31 monty@narttu.mysql.fi +0 -0
    merge with 4.0.15

  sql/item_func.cc
    1.124.1.22 03/08/29 13:44:30 monty@narttu.mysql.fi +0 -1
    merge with 4.0.15

  sql/item_cmpfunc.cc
    1.99.3.2 03/08/29 13:44:30 monty@narttu.mysql.fi +4 -7
    merge with 4.0.15

  sql/item.h
    1.56.1.31 03/08/29 13:44:30 monty@narttu.mysql.fi +0 -0
    merge with 4.0.15

  sql/item.cc
    1.58.18.9 03/08/29 13:44:30 monty@narttu.mysql.fi +6 -4
    merge with 4.0.15

  sql/field.cc
    1.113 03/08/29 13:44:30 monty@narttu.mysql.fi +2 -2
    merge with 4.0.15

  mysys/mf_keycache.c
    1.26.1.1 03/08/29 13:44:30 monty@narttu.mysql.fi +0 -13
    Keep local file

  mysql-test/t/union.test
    1.40.1.1 03/08/29 13:44:30 monty@narttu.mysql.fi +0 -1
    merge with 4.0.15

  mysql-test/t/query_cache.test
    1.24.1.3 03/08/29 13:44:30 monty@narttu.mysql.fi +0 -0
    merge with 4.0.15

  mysql-test/t/myisam.test
    1.19 03/08/29 13:44:30 monty@narttu.mysql.fi +3 -1
    merge with 4.0.15
    Extra tests

  mysql-test/t/loaddata.test
    1.5 03/08/29 13:44:30 monty@narttu.mysql.fi +1 -0
    merge with 4.0.15

  mysql-test/t/isam.test
    1.7 03/08/29 13:44:30 monty@narttu.mysql.fi +26 -4
    merge with 4.0.15

  mysql-test/t/func_test.test
    1.16 03/08/29 13:44:30 monty@narttu.mysql.fi +7 -1
    merge with 4.0.15

  mysql-test/r/union.result
    1.42.1.2 03/08/29 13:44:30 monty@narttu.mysql.fi +0 -1
    merge with 4.0.15

  mysql-test/r/symlink.result
    1.11 03/08/29 13:44:30 monty@narttu.mysql.fi +2 -4
    merge with 4.0.15

  mysql-test/r/rpl_log.result
    1.42 03/08/29 13:44:30 monty@narttu.mysql.fi +1 -11
    merge with 4.0.15

  mysql-test/r/rpl_loaddata.result
    1.10 03/08/29 13:44:30 monty@narttu.mysql.fi +1 -1
    merge with 4.0.15

  mysql-test/r/myisam.result
    1.26 03/08/29 13:44:30 monty@narttu.mysql.fi +0 -1
    merge with 4.0.15

  mysql-test/r/grant.result
    1.10 03/08/29 13:44:30 monty@narttu.mysql.fi +0 -3
    merge with 4.0.15

  mysql-test/r/func_test.result
    1.18 03/08/29 13:44:30 monty@narttu.mysql.fi +5 -5
    merge with 4.0.15

  myisam/ft_nlq_search.c
    1.24 03/08/29 13:44:30 monty@narttu.mysql.fi +1 -2
    merge with 4.0.15

  myisam/ft_dump.c
    1.20 03/08/29 13:44:30 monty@narttu.mysql.fi +0 -0
    merge with 4.0.15

  libmysql/Makefile.shared
    1.48 03/08/29 13:44:30 monty@narttu.mysql.fi +1 -2
    merge with 4.0.15

  include/violite.h
    1.33 03/08/29 13:44:30 monty@narttu.mysql.fi +34 -23
    merge with 4.0.15

  include/config-win.h
    1.35 03/08/29 13:44:30 monty@narttu.mysql.fi +0 -0
    merge with 4.0.15

  client/mysqltest.c
    1.92.1.12 03/08/29 13:44:30 monty@narttu.mysql.fi +1 -2
    merge with 4.0.15

  client/mysql.cc
    1.121.1.21 03/08/29 13:44:30 monty@narttu.mysql.fi +1 -2
    merge with 4.0.15

  VC++Files/sql/mysqld.dsp
    1.16 03/08/29 13:44:30 monty@narttu.mysql.fi +1 -8
    merge with 4.0.15

  VC++Files/mysqldemb/mysqldemb.dsp
    1.7 03/08/29 13:44:30 monty@narttu.mysql.fi +1 -5
    merge with 4.0.15

  VC++Files/libmysqld/libmysqld.dsp
    1.10 03/08/29 13:44:30 monty@narttu.mysql.fi +1 -3
    merge with 4.0.15

  BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220
    1.20 03/08/29 13:44:30 monty@narttu.mysql.fi +1 -0
    merge with 4.0.15

ChangeSet
  1.1346.1.200 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.206.1.79 03/08/29 14:38:39 kostja@oak.local +1 -0
    Logging to logging@openlogging.org accepted

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

  vio/vio.c
    1.16 03/08/29 04:21:42 monty@narttu.mysql.fi +0 -0
    Auto merged

  vio/Makefile.am
    1.13 03/08/29 04:21:42 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_update.cc
    1.83.2.14 03/08/29 04:21:41 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_repl.cc
    1.102.1.8 03/08/29 04:21:41 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_load.cc
    1.46.3.10 03/08/29 04:21:41 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_class.h
    1.146.17.1 03/08/29 04:21:41 monty@narttu.mysql.fi +5 -4
    Auto merged

  sql/sql_class.cc
    1.105.4.3 03/08/29 04:21:40 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.32.1.2 03/08/29 04:21:40 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/net_serv.cc
    1.61 03/08/29 04:21:40 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/log_event.h
    1.88 03/08/29 04:21:40 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_uniq.h
    1.15 03/08/29 04:21:40 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/handler.cc
    1.94.2.1 03/08/29 04:21:39 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.115.4.3 03/08/29 04:21:39 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.90.1.6 03/08/29 04:21:39 monty@narttu.mysql.fi +0 -0
    Auto merged

  scripts/mysqld_safe.sh
    1.62 03/08/29 04:21:39 monty@narttu.mysql.fi +0 -0
    Auto merged

  scripts/mysql_install_db.sh
    1.37.1.12 03/08/29 04:21:39 monty@narttu.mysql.fi +0 -0
    Auto merged

  scripts/make_win_src_distribution.sh
    1.8 03/08/29 04:21:39 monty@narttu.mysql.fi +0 -0
    Auto merged

  scripts/make_binary_distribution.sh
    1.55.1.1 03/08/29 04:21:39 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysys/my_pthread.c
    1.37.1.2 03/08/29 04:21:39 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysys/my_getopt.c
    1.37 03/08/29 04:21:39 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysys/default.c
    1.32 03/08/29 04:21:38 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/symlink.test
    1.6 03/08/29 04:21:38 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/show_check.test
    1.21 03/08/29 04:21:38 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/select_safe.test
    1.7 03/08/29 04:21:38 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/rpl_log.test
    1.18 03/08/29 04:21:38 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/rpl_loaddata.test
    1.8 03/08/29 04:21:38 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/range.test
    1.5.1.2 03/08/29 04:21:38 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/openssl_1.test
    1.7 03/08/29 04:21:38 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/multi_update.test
    1.25 03/08/29 04:21:38 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/lowercase_table.test
    1.6 03/08/29 04:21:38 monty@narttu.mysql.fi +0 -1
    Auto merged

  mysql-test/t/lock_tables_lost_commit-master.opt
    1.3 03/08/29 04:21:38 monty@narttu.mysql.fi +0 -1
    Auto merged

  mysql-test/t/group_by.test
    1.24 03/08/29 04:21:38 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/grant.test
    1.8 03/08/29 04:21:38 monty@narttu.mysql.fi +0 -5
    Auto merged

  mysql-test/r/show_check.result
    1.31.1.5 03/08/29 04:21:38 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/select_safe.result
    1.11 03/08/29 04:21:38 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/range.result
    1.10.1.2 03/08/29 04:21:38 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/query_cache.result
    1.26.1.3 03/08/29 04:21:38 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/packet.result
    1.3 03/08/29 04:21:38 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/openssl_1.result
    1.7 03/08/29 04:21:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/multi_update.result
    1.24 03/08/29 04:21:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/lowercase_table.result
    1.4 03/08/29 04:21:37 monty@narttu.mysql.fi +0 -1
    Auto merged

  mysql-test/r/loaddata.result
    1.6 03/08/29 04:21:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/isam.result
    1.17 03/08/29 04:21:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/group_by.result
    1.33 03/08/29 04:21:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.167.1.4 03/08/29 04:21:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  myisam/myisamlog.c
    1.20.1.1 03/08/29 04:21:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  myisam/myisamchk.c
    1.92.3.2 03/08/29 04:21:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  myisam/mi_write.c
    1.34.1.1 03/08/29 04:21:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  myisam/mi_search.c
    1.38.1.1 03/08/29 04:21:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  myisam/mi_open.c
    1.69 03/08/29 04:21:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  myisam/mi_create.c
    1.31 03/08/29 04:21:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  myisam/mi_check.c
    1.105.2.2 03/08/29 04:21:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  libmysql/libmysql.c
    1.156.7.3 03/08/29 04:21:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  libmysql/errmsg.c
    1.22 03/08/29 04:21:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  libmysql/Makefile.am
    1.37 03/08/29 04:21:36 monty@narttu.mysql.fi +0 -0
    Auto merged

  isam/_search.c
    1.13 03/08/29 04:21:36 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/os/os0file.c
    1.52 03/08/29 04:21:36 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/dict/dict0dict.c
    1.30 03/08/29 04:21:36 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/mysql_com.h
    1.67.5.2 03/08/29 04:21:36 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/my_sys.h
    1.100.2.2 03/08/29 04:21:36 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/m_string.h
    1.21 03/08/29 04:21:36 monty@narttu.mysql.fi +0 -0
    Auto merged

  extra/resolveip.c
    1.19 03/08/29 04:21:36 monty@narttu.mysql.fi +0 -0
    Auto merged

  extra/my_print_defaults.c
    1.12 03/08/29 04:21:36 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysqlimport.c
    1.37 03/08/29 04:21:36 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysqldump.c
    1.96.1.1 03/08/29 04:21:36 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysqlbinlog.cc
    1.79 03/08/29 04:21:36 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/zlib/zlib.dsp
    1.6 03/08/29 04:21:36 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/vio/vio.dsp
    1.7 03/08/29 04:21:36 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/thr_test/thr_test.dsp
    1.7 03/08/29 04:21:36 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/test1/test1.dsp
    1.7 03/08/29 04:21:36 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/replace/replace.dsp
    1.7 03/08/29 04:21:36 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/perror/perror.dsp
    1.8 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/pack_isam/pack_isam.dsp
    1.8 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/mysys/mysys.dsp
    1.12 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -4
    Auto merged

  VC++Files/mysqlshutdown/mysqlshutdown.dsp
    1.5 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/mysqlserver/mysqlserver.dsp
    1.6 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/mysqlmanager/MySqlManager.dsp
    1.8 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/mysqlcheck/mysqlcheck.dsp
    1.7 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/mysqlbinlog/mysqlbinlog.dsp
    1.11 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/mysql.dsw
    1.10 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/myisamlog/myisamlog.dsp
    1.5 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/my_print_defaults/my_print_defaults.dsp
    1.4 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/libmysqltest/myTest.dsp
    1.7 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/libmysql/libmysql.dsp
    1.17 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/isamchk/isamchk.dsp
    1.5 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/innobase/innobase.dsp
    1.10 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -5
    Auto merged

  VC++Files/comp_err/comp_err.dsp
    1.4 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/client/mysqlshow.dsp
    1.7 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/client/mysqlimport.dsp
    1.7 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/client/mysqldump.dsp
    1.7 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/client/mysqlclient.dsp
    1.17 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -3
    Auto merged

  VC++Files/client/mysqladmin.dsp
    1.7 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/client/mysql.dsp
    1.8 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -0
    Auto merged

  SSL/server-key.pem
    1.4 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -13
    Auto merged

  SSL/server-cert.pem
    1.4 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -24
    Auto merged

  SSL/client-key.pem
    1.4 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -13
    Auto merged

  SSL/client-cert.pem
    1.4 03/08/29 04:21:35 monty@narttu.mysql.fi +0 -24
    Auto merged

  configure.in
    1.201.1.40 03/08/29 04:21:34 monty@narttu.mysql.fi +0 -0
    Auto merged

  acinclude.m4
    1.88 03/08/29 04:21:34 monty@narttu.mysql.fi +0 -0
    Auto merged

  acconfig.h
    1.35 03/08/29 04:21:34 monty@narttu.mysql.fi +0 -0
    Auto merged

  SSL/cacert.pem
    1.4 03/08/29 04:21:34 monty@narttu.mysql.fi +0 -18
    Auto merged

  Build-tools/Do-compile
    1.78 03/08/29 04:21:34 monty@narttu.mysql.fi +0 -0
    Auto merged

  Build-tools/Bootstrap
    1.10 03/08/29 04:21:34 monty@narttu.mysql.fi +1 -2
    Auto merged

  BitKeeper/deleted/.del-openssl_2.test~f2dfa927f19d14f8
    1.8 03/08/29 04:21:34 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183
    1.67 03/08/29 04:21:34 monty@narttu.mysql.fi +1 -2
    Auto merged

  BitKeeper/deleted/.del-have_openssl_2.require~53bbdfc136fb514
    1.5 03/08/29 04:21:34 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-have_openssl_2.inc~8c9f1a45676b698f
    1.5 03/08/29 04:21:34 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-database.c~af098622e818ce0d
    1.5 03/08/29 04:21:34 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-openssl_2.test~f2dfa927f19d14f8
    1.7 03/08/29 04:21:33 monty@narttu.mysql.fi +0 -0
    Merge rename: mysql-test/t/openssl_2.test -> BitKeeper/deleted/.del-openssl_2.test~f2dfa927f19d14f8

  BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183
    1.48.3.2 03/08/29 04:21:33 monty@narttu.mysql.fi +0 -0
    Merge rename: sql/mini_client.cc -> BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183

  BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220
    1.11.1.6 03/08/29 04:21:33 monty@narttu.mysql.fi +0 -0
    Merge rename: libmysqld/lib_vio.c -> BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220

  BitKeeper/deleted/.del-have_openssl_2.require~53bbdfc136fb514
    1.4 03/08/29 04:21:33 monty@narttu.mysql.fi +0 -0
    Merge rename: mysql-test/r/have_openssl_2.require -> BitKeeper/deleted/.del-have_openssl_2.require~53bbdfc136fb514

  BitKeeper/deleted/.del-have_openssl_2.inc~8c9f1a45676b698f
    1.4 03/08/29 04:21:33 monty@narttu.mysql.fi +0 -0
    Merge rename: mysql-test/include/have_openssl_2.inc -> BitKeeper/deleted/.del-have_openssl_2.inc~8c9f1a45676b698f

  BitKeeper/deleted/.del-database.c~af098622e818ce0d
    1.3.1.2 03/08/29 04:21:33 monty@narttu.mysql.fi +0 -0
    Merge rename: fs/database.c -> BitKeeper/deleted/.del-database.c~af098622e818ce0d

  BitKeeper/etc/logging_ok
    1.233.13.6 03/08/29 04:21:25 monty@narttu.mysql.fi +0 -2
    auto-union

  BitKeeper/etc/ignore
    1.153.5.1 03/08/29 04:21:25 monty@narttu.mysql.fi +6 -7
    auto-union

ChangeSet
  1.1346.341.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.145.1.75 03/08/29 04:17:29 monty@narttu.mysql.fi +0 -4
    Revert change of lower-case-table handling 

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

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

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

  sql/sql_class.cc
    1.71.1.35 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.1.1.3 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.2.1.2 03/08/29 04:17:28 monty@narttu.mysql.fi +9 -2
    Revert change of lower-case-table handling 

ChangeSet
  1.1563.7.10 03/08/29 03:23:18 dlenev@dlenev.mshome +1 -0
  Fixed problem with absence of gmtime_r under Windows.

  include/my_pthread.h
    1.65.1.2 03/08/29 03:23:16 dlenev@mysql.com +0 -1
    HAVE_GMTIME_R should not be defined under Windows
    (it is ok for HAVE_LOCALTIME_R since there additional implementation 
    in my_windcond.c.

ChangeSet
  1.1563.14.1 03/08/29 02:30:11 wax@mysql.com +2 -0
  Merge mysql.com:/home/wax/mysql/mysql-4.1
  into mysql.com:/home/wax/mysql/mysql-4.1mm

  sql/item_sum.h
    1.44.1.4 03/08/29 02:30:09 wax@mysql.com +0 -0
    Auto merged

  sql/item_sum.cc
    1.82.2.3 03/08/29 02:30:09 wax@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1563.13.1 03/08/29 02:28:32 wax@kishkin.ru +2 -0
  BUG
  correct bugs #833 and #836

  sql/item_sum.h
    1.44.2.1 03/08/29 02:28:20 wax@mysql.com +1 -0
    correct bug #836 
    add method no_rows_in_result()

  sql/item_sum.cc
    1.82.3.1 03/08/29 02:28:20 wax@mysql.com +4 -4
    correct bug #833 (add real_item())

ChangeSet
  1.1346.340.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.54.1.29 03/08/28 16:06:03 jcole@mugatu.spaceapes.com +41 -32
    Fixes for out of memory conditions.

ChangeSet
  1.1346.1.197 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.7.1.4 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.1346.339.1 03/08/28 22:18:02 monty@narttu.mysql.fi +7 -0
  Portability fixes

  sql/sql_class.h
    1.111.1.49 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.71.1.34 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.150.1.55 03/08/28 22:18:00 monty@narttu.mysql.fi +4 -0
    Cleanup

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

  mysql-test/r/isam.result
    1.7.2.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.77.1.28 03/08/28 22:18:00 monty@narttu.mysql.fi +0 -59
    Removed not used functions

ChangeSet
  1.1346.1.196 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.17.1.13 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.10.1.3 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.1563.7.9 03/08/28 20:38:08 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-enum-4.1

  sql/sql_select.cc
    1.216.1.30 03/08/28 20:38:06 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1563.7.8 03/08/28 18:31:38 bell@sanja.is.com.ua +1 -0
  fixed typo

  sql/item_sum.h
    1.44.1.3 03/08/28 18:31:35 bell@sanja.is.com.ua +1 -1
    fixed typo

ChangeSet
  1.1563.12.2 03/08/28 12:31:29 ram@mysql.r18.ru +1 -0
  Fix for the bug #1125 mysqldump -X creates invalid XML

ChangeSet
  1.1563.9.2 03/08/28 10:26:56 vva@eagle.mysql.r18.ru +2 -0
  fixed merge mistake 

  mysql-test/t/create.test
    1.27 03/08/28 10:26:54 vva@eagle.mysql.r18.ru +0 -2
    fixed merge mistake 

  mysql-test/r/create.result
    1.45 03/08/28 10:26:54 vva@eagle.mysql.r18.ru +0 -1
    fixed merge mistake 

ChangeSet
  1.1563.6.4 03/08/28 18:09:00 gluh@gluh.mysql.r18.ru +6 -0
  Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
  This commit is related to my previos one(ChangeSet 1.1583 03/08/27 18:03:39).
  Note about COMMIT&ROLLBACK:
    Only 'COMMIT' statement updates the binary log. 
    'ROLLBACK' statement doesn't update the binlog.

  sql/sql_table.cc
    1.157.9.6 03/08/28 18:08:58 gluh@gluh.mysql.r18.ru +7 -21
    Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE

  sql/handler.cc
    1.94.1.4 03/08/28 18:08:58 gluh@gluh.mysql.r18.ru +3 -0
    Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE

  mysql-test/t/innodb.test
    1.46 03/08/28 18:08:58 gluh@gluh.mysql.r18.ru +15 -0
    Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE

  mysql-test/t/drop.test
    1.15 03/08/28 18:08:58 gluh@gluh.mysql.r18.ru +1 -1
    Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE

  mysql-test/r/innodb.result
    1.71 03/08/28 18:08:58 gluh@gluh.mysql.r18.ru +12 -0
    Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE

  mysql-test/r/drop.result
    1.17 03/08/28 18:08:58 gluh@gluh.mysql.r18.ru +1 -1
    Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE

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

  mysql-test/r/isam.result
    1.7.1.3 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.1346.338.1 03/08/28 12:37:50 serg@serg.mylan +1 -0
  oom protection

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

ChangeSet
  1.1563.11.1 03/08/28 13:21:30 bell@laptop.sanja.is.com.ua +3 -0
  enum renamed (asked for compilation under windows)

  sql/sql_select.cc
    1.216.27.1 03/08/28 13:20:52 bell@laptop.sanja.is.com.ua +2 -2
    enum renamed (asked for compilation under windows)

  sql/item_subselect.h
    1.34.1.3 03/08/28 13:20:51 bell@laptop.sanja.is.com.ua +1 -1
    enum renamed (asked for compilation under windows)

  sql/item_subselect.cc
    1.60.8.6 03/08/28 13:20:51 bell@laptop.sanja.is.com.ua +17 -17
    enum renamed (asked for compilation under windows)

ChangeSet
  1.1346.337.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.5.1.1 03/08/28 12:35:35 monty@narttu.mysql.fi +45 -45
    merge

  mysql-test/r/isam.result
    1.7.1.2 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.46.1.18 03/08/28 12:31:04 monty@narttu.mysql.fi +0 -2
    Auto merged

  isam/open.c
    1.12.1.1 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.1563.10.1 03/08/28 13:39:46 hf@deer.(none) +4 -0
  SCRUM:
  Fixed some mess with STDCALL in function's declarations

  sql-common/client.c
    1.20.1.3 03/08/28 13:39:44 hf@deer.(none) +2 -2
    should be declared as STDCALL

  libmysqld/libmysqld.c
    1.43 03/08/28 13:39:44 hf@deer.(none) +2 -2
    should be declared as STDCALL

  libmysqld/lib_sql.cc
    1.60 03/08/28 13:39:44 hf@deer.(none) +1 -1
    should be declared as STDCALL

  include/mysql.h
    1.81.1.1 03/08/28 13:39:44 hf@deer.(none) +5 -5
    That definitions are more correct

  client/mysqldump.c
    1.97 03/08/28 12:31:26 ram@mysql.r18.ru +4 -4
    Fix for the bug #1125 mysqldump -X creates invalid XML

ChangeSet
  1.1346.1.191 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.80.1.58 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.35.1.3 03/08/28 06:08:15 monty@narttu.mysql.fi +9 -5
    Remove C++ comments

  mysys/default.c
    1.17.1.12 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.7.1.11 03/08/28 06:08:15 monty@narttu.mysql.fi +4 -2
    More tests

  mysql-test/r/myisam.result
    1.10.1.12 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.46.1.17 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.13.1.7 03/08/28 06:08:15 monty@narttu.mysql.fi +4 -2
    Add detection of in_addr_t

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

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

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

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

ChangeSet
  1.1563.9.1 03/08/27 21:26:00 vva@eagle.mysql.r18.ru +7 -0
  Merge

  sql/item_cmpfunc.h
    1.61.2.1 03/08/27 21:25:57 vva@eagle.mysql.r18.ru +0 -0
    SCCS merged

  mysql-test/t/create.test
    1.26 03/08/27 21:25:28 vva@eagle.mysql.r18.ru +3 -1
    merge

  mysql-test/r/create.result
    1.44 03/08/27 21:23:54 vva@eagle.mysql.r18.ru +1 -0
    merge

  sql/item_cmpfunc.cc
    1.99.3.1 03/08/27 21:20:44 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/item.h
    1.56.1.30 03/08/27 21:20:44 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/item.cc
    1.58.18.8 03/08/27 21:20:44 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/field.h
    1.78 03/08/27 21:20:44 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1563.7.5 03/08/28 03:10:14 bell@laptop.sanja.is.com.ua +7 -0
  reset() split in 2 function clear() & add()
  aggregate function reinitialization (if no rows was found) made with help of clear()
  (fixed BUG#860)

  sql/sql_select.h
    1.54 03/08/28 03:09:42 bell@laptop.sanja.is.com.ua +1 -0
    function for clearing if there was not found any row in group

  sql/sql_select.cc
    1.216.1.29 03/08/28 03:09:42 bell@laptop.sanja.is.com.ua +22 -10
    removed NULL value assigment, now it will be done by clear() call
    function for clearing if there was not found any row in group

  sql/item_uniq.h
    1.14 03/08/28 03:09:42 bell@laptop.sanja.is.com.ua +1 -1
    reset() replaced with clear()

  sql/item_sum.h
    1.44.1.2 03/08/28 03:09:42 bell@laptop.sanja.is.com.ua +14 -15
    reset() replaced with clear()
    (reset now is just composition of clear() and add())

  sql/item_sum.cc
    1.82.2.2 03/08/28 03:09:42 bell@laptop.sanja.is.com.ua +12 -19
    reset() replaced with clear()

  mysql-test/t/subselect.test
    1.58.14.7 03/08/28 03:09:42 bell@laptop.sanja.is.com.ua +10 -0
    test for BUG#860

  mysql-test/r/subselect.result
    1.67.21.8 03/08/28 03:09:42 bell@laptop.sanja.is.com.ua +9 -0
    test for BUG#860

ChangeSet
  1.1346.336.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.3.1.1 03/08/28 01:35:56 lenz@mysql.com +6 -6
     - replaced C++-style comments in .c file

ChangeSet
  1.1546.81.1 03/08/27 19:15:27 vva@eagle.mysql.r18.ru +3 -0
  Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
  into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1

  sql/item_cmpfunc.cc
    1.87.7.2 03/08/27 19:15:24 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/item.h
    1.56.12.1 03/08/27 19:15:24 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/field.h
    1.76.1.1 03/08/27 19:15:24 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1546.80.1 03/08/27 19:11:54 vva@eagle.mysql.r18.ru +7 -0
  fixed bug #910 (right type of ifnull function)

  sql/item_cmpfunc.h
    1.50.4.1 03/08/27 19:11:44 vva@eagle.mysql.r18.ru +4 -0
    fixed bug #910 (right type of ifnull function)

  sql/item_cmpfunc.cc
    1.87.8.1 03/08/27 19:11:44 vva@eagle.mysql.r18.ru +13 -0
    fixed bug #910 (right type of ifnull function)

  sql/item.h
    1.56.11.1 03/08/27 19:11:44 vva@eagle.mysql.r18.ru +2 -0
    added Item::tmp_table_field_from_field_type

  sql/item.cc
    1.58.21.1 03/08/27 19:11:44 vva@eagle.mysql.r18.ru +67 -0
    added Item::tmp_table_field_from_field_type

  sql/field.h
    1.75.2.1 03/08/27 19:11:44 vva@eagle.mysql.r18.ru +29 -0
    added new constructors of Field_decimal, Field_tiny, Field_short, Field_float,
    Field_null, Field_year
    for using in Item::tmp_table_field_from_field_type

  mysql-test/t/create.test
    1.24.1.1 03/08/27 19:11:44 vva@eagle.mysql.r18.ru +38 -0
    added test for bug #910 (right type of ifnull function)

  mysql-test/r/create.result
    1.41.1.1 03/08/27 19:11:44 vva@eagle.mysql.r18.ru +49 -0
    added test for bug #910 (right type of ifnull function)

ChangeSet
  1.1346.334.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.26.1.6 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.1563.8.1 03/08/27 22:30:50 monty@narttu.mysql.fi +10 -0
  hanged UDF interface to use clear() instead of reset()

  BUILD/cleanup
    1.1 03/08/27 22:30:48 monty@narttu.mysql.fi +8 -0

  sql/udf_example.cc
    1.14 03/08/27 22:30:48 monty@narttu.mysql.fi +17 -8
    Changed UDF interface to use clear() instead of reset()

  sql/sql_yacc.yy
    1.203.66.2 03/08/27 22:30:48 monty@narttu.mysql.fi +2 -0
    ERRORS and WARNINGS should not be reserved words

  sql/sql_udf.h
    1.6 03/08/27 22:30:48 monty@narttu.mysql.fi +8 -17
    Changed UDF interface to use clear() instead of reset()

  sql/sql_udf.cc
    1.31 03/08/27 22:30:48 monty@narttu.mysql.fi +7 -4
    Changed UDF interface to use clear() instead of reset()

  sql/slave.cc
    1.188.5.5 03/08/27 22:30:48 monty@narttu.mysql.fi +3 -2
    Fixed checking of eof for slave/master protocol. (Bug #887)

  sql/item_sum.h
    1.44.1.1 03/08/27 22:30:48 monty@narttu.mysql.fi +2 -1
    Changed UDF interface to use clear() instead of reset()

  sql/item_sum.cc
    1.82.2.1 03/08/27 22:30:48 monty@narttu.mysql.fi +2 -2
    Changed UDF interface to use clear() instead of reset()

  scripts/mysql_fix_privilege_tables.sql
    1.2.1.1 03/08/27 22:30:48 monty@narttu.mysql.fi +12 -0
    Added 'USE mysql' for easer use on windows

  BUILD/cleanup
    1.0 03/08/27 22:30:48 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.1/BUILD/cleanup

  BUILD/FINISH.sh
    1.25 03/08/27 22:30:48 monty@narttu.mysql.fi +6 -2
    Add just_clean option (for cleanup script)

ChangeSet
  1.1346.1.189 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.60.1.39 03/08/27 20:00:16 monty@narttu.mysql.fi +2 -2
    Test for stack checking

  sql/item_cmpfunc.cc
    1.20.1.39 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.1346.335.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.47.1.12 03/08/27 12:22:18 miguel@hegel.local +17 -17
    Updating Translation

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

ChangeSet
  1.1346.334.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.56.1.8 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.17.1.11 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.43.1.8 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.75.1.26 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.10.1.1 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.1563.4.3 03/08/27 17:04:33 pem@mysql.telia.com +4 -0
  Adopt to the introduction of a separate CLIENT_MULTI_RESULTS flag.

  sql/sql_yacc.yy
    1.237 03/08/27 17:04:30 pem@mysql.com +1 -1
    Adopt to the introduction of a separate CLIENT_MULTI_RESULTS flag.

  sql/sql_parse.cc
    1.296 03/08/27 17:04:30 pem@mysql.com +3 -3
    Adopt to the introduction of a separate CLIENT_MULTI_RESULTS flag.

  sql/sp_head.h
    1.21 03/08/27 17:04:30 pem@mysql.com +1 -1
    Adopt to the introduction of a separate CLIENT_MULTI_RESULTS flag.

  sql/sp_head.cc
    1.38 03/08/27 17:04:30 pem@mysql.com +1 -1
    Adopt to the introduction of a separate CLIENT_MULTI_RESULTS flag.

ChangeSet
  1.1563.6.3 03/08/27 18:03:39 gluh@gluh.mysql.r18.ru +3 -0
  Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE

  sql/sql_table.cc
    1.157.9.5 03/08/27 18:03:36 gluh@gluh.mysql.r18.ru +17 -0
    Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE

  mysql-test/t/drop.test
    1.14 03/08/27 18:03:36 gluh@gluh.mysql.r18.ru +10 -0
    Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE

  mysql-test/r/drop.result
    1.16 03/08/27 18:03:36 gluh@gluh.mysql.r18.ru +10 -0
    Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE

ChangeSet
  1.1563.7.3 03/08/27 15:32:52 Sinisa@sinisa.nasamreza.org +1 -0
  Merge fixes

  sql/sql_union.cc
    1.74.5.12 03/08/27 15:32:48 Sinisa@sinisa.nasamreza.org +25 -28
    Some further merge fixes

ChangeSet
  1.1563.7.2 03/08/27 15:24:52 Sinisa@sinisa.nasamreza.org +1 -0
  sql_union.cc:
    Post merge fixes

  sql/sql_union.cc
    1.74.5.11 03/08/27 15:24:13 Sinisa@sinisa.nasamreza.org +1 -1
    Post merge fixes

ChangeSet
  1.1563.7.1 03/08/27 14:36:38 Sinisa@sinisa.nasamreza.org +3 -0
  merge fixes

  sql/sql_union.cc
    1.74.5.10 03/08/27 14:36:33 Sinisa@sinisa.nasamreza.org +27 -31
    merge fixes

  sql/sql_select.cc
    1.216.1.28 03/08/27 14:30:31 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.22.1 03/08/27 14:30:30 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1346.334.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.10.1.2 03/08/27 12:26:19 lenz@mysql.com +1 -1
     - added missing file vio_priv.h to source distribution

ChangeSet
  1.1346.1.188 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.34.1.17 03/08/27 10:26:02 monty@narttu.mysql.fi +0 -1
    Removed not needed line

  sql/item_sum.cc
    1.25.1.9 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.17.1.2 03/08/27 10:26:02 monty@narttu.mysql.fi +7 -0
    test case for bug fix

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

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

ChangeSet
  1.1346.333.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.15.1.4 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.13.1.2 03/08/27 02:51:37 monty@narttu.mysql.fi +3 -7
    Added timeouts for windows

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

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

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

  sql/mysqld.cc
    1.297.1.156 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.48.3.1 03/08/27 02:51:37 monty@narttu.mysql.fi +1 -1
    vio ssl structure renames 

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

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

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

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

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

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

  include/violite.h
    1.21.3.4 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.93.1.47 03/08/27 02:51:37 monty@narttu.mysql.fi +4 -3
    vio ssl structure renames

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

ChangeSet
  1.1346.1.186 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.80.1.28 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.1563.2.20 03/08/26 15:16:29 igor@rurik.mysql.com +1 -0
  Merge rurik.mysql.com:/home/igor/mysql-4.1
  into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  sql/sql_yacc.yy
    1.203.61.9 03/08/26 15:16:24 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1563.3.5 03/08/26 15:14:13 igor@rurik.mysql.com +5 -0
  key_cache.result, sql_lex.h, sql_yacc.yy, set_var.cc, sql_lex.cc:
    After merge fix

  mysql-test/r/key_cache.result
    1.4 03/08/26 15:13:01 igor@rurik.mysql.com +2 -2
    After merge fix

  sql/sql_lex.h
    1.102.1.31 03/08/26 15:10:42 igor@rurik.mysql.com +2 -2
    After merge fix

  sql/sql_yacc.yy
    1.203.61.8 03/08/26 15:10:18 igor@rurik.mysql.com +10 -10
    After merge fix

  sql/set_var.cc
    1.34.12.5 03/08/26 15:09:56 igor@rurik.mysql.com +26 -20
    After merge fix

  sql/sql_lex.cc
    1.89 03/08/26 15:08:59 igor@rurik.mysql.com +3 -0
    After merge fix

ChangeSet
  1.1346.1.185 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.86.1.37 03/08/26 23:57:11 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1346.332.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.86.6.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.1346.1.184 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.17.1.2 03/08/26 22:02:54 Sinisa@sinisa.nasamreza.org +9 -1
    Fixed  a very rarge memory overrun bug in the myisamlog program.

ChangeSet
  1.1563.6.2 03/08/26 20:23:48 monty@narttu.mysql.fi +4 -0
  Fix for bug in ROLLUP when all tables where 'const' tables (Bug #714)

  sql/sql_select.cc
    1.216.1.27 03/08/26 20:23:45 monty@narttu.mysql.fi +15 -10
    Fix for bug in ROLLUP when all tables where 'const' tables (Bug #714)

  sql-common/client.c
    1.20.1.2 03/08/26 20:23:45 monty@narttu.mysql.fi +1 -1
    Safety fix

  mysql-test/t/olap.test
    1.7 03/08/26 20:23:45 monty@narttu.mysql.fi +11 -0
    new test case for bug

  mysql-test/r/olap.result
    1.9 03/08/26 20:23:45 monty@narttu.mysql.fi +15 -0
    new test case for bug

ChangeSet
  1.1563.4.2 03/08/26 17:41:40 pem@mysql.telia.com +17 -0
  Post-merge fixes.

  sql/sql_yacc.yy
    1.236 03/08/26 17:41:19 pem@mysql.com +39 -9
    Post-merge fixes.

  sql/sql_update.cc
    1.93 03/08/26 17:41:19 pem@mysql.com +1 -1
    Post-merge fixes.

  sql/sql_union.cc
    1.78 03/08/26 17:41:19 pem@mysql.com +1 -1
    Post-merge fixes.

  sql/sql_table.cc
    1.165 03/08/26 17:41:19 pem@mysql.com +1 -1
    Post-merge fixes.

  sql/sql_parse.cc
    1.295 03/08/26 17:41:19 pem@mysql.com +1 -1
    Post-merge fixes.

  sql/sp_head.cc
    1.37 03/08/26 17:41:19 pem@mysql.com +2 -2
    Post-merge fixes.

  sql/slave.cc
    1.196 03/08/26 17:41:19 pem@mysql.com +1 -1
    Post-merge fixes.

  sql/mysqld.cc
    1.366 03/08/26 17:41:19 pem@mysql.com +0 -1
    Post-merge fixes.

  sql/item_subselect.cc
    1.65 03/08/26 17:41:19 pem@mysql.com +6 -6
    Post-merge fixes.

  sql/item.cc
    1.69 03/08/26 17:41:19 pem@mysql.com +1 -1
    Post-merge fixes.

  mysql-test/t/sp-error.test
    1.10 03/08/26 17:41:19 pem@mysql.com +21 -21
    Post-merge fixes.

  mysql-test/t/sel000100.test
    1.12 03/08/26 17:41:19 pem@mysql.com +2 -2
    Post-merge fixes.

  mysql-test/r/variables.result
    1.31 03/08/26 17:41:19 pem@mysql.com +1 -1
    Post-merge fixes.

  mysql-test/r/symlink.result
    1.9.1.1 03/08/26 17:41:19 pem@mysql.com +0 -2
    Post-merge fixes.

  mysql-test/r/sp-error.result
    1.9 03/08/26 17:41:19 pem@mysql.com +1 -1
    Post-merge fixes.

  mysql-test/r/sel000100.result
    1.10 03/08/26 17:41:19 pem@mysql.com +2 -2
    Post-merge fixes.

  mysql-test/r/query_cache.result
    1.29 03/08/26 17:41:19 pem@mysql.com +4 -4
    Post-merge fixes.

ChangeSet
  1.1563.6.1 03/08/26 17:53:42 monty@narttu.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into narttu.mysql.fi:/my/mysql-4.1

  sql/sql_yacc.yy
    1.203.66.1 03/08/26 17:53:38 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1546.79.1 03/08/26 17:52:54 monty@narttu.mysql.fi +5 -0
  Cleanups
  BTREE, HASH and RTREE are not reserved symbols anymore

  sql/table.cc
    1.84 03/08/26 17:52:51 monty@narttu.mysql.fi +2 -5
    Simple optimization

  sql/sql_yacc.yy
    1.203.64.4 03/08/26 17:52:51 monty@narttu.mysql.fi +3 -0
    BTREE, HASH and RTREE are not reserved symbols anymore

  mysys/my_realloc.c
    1.6 03/08/26 17:52:51 monty@narttu.mysql.fi +17 -16
    Fixed old style variable name

  mysys/my_malloc.c
    1.8 03/08/26 17:52:51 monty@narttu.mysql.fi +17 -17
    Fixed old style variable name

  mysql-test/t/loaddata.test
    1.4 03/08/26 17:52:51 monty@narttu.mysql.fi +0 -4
    Removed empty lines

ChangeSet
  1.1563.1.3 03/08/26 17:45:42 bell@laptop.sanja.is.com.ua +1 -0
  after merge fix

  mysql-test/r/subselect.result
    1.67.18.3 03/08/26 17:45:36 bell@laptop.sanja.is.com.ua +6 -6
    after merge fix

  BitKeeper/deleted/.del-openssl_2.test~f2dfa927f19d14f8
    1.5.1.1 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.2.1.1 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.2.1.1 03/08/26 17:10:07 monty@narttu.mysql.fi +0 -0
    Delete: mysql-test/include/have_openssl_2.inc

ChangeSet
  1.1563.1.2 03/08/26 16:49:53 bell@laptop.sanja.is.com.ua +26 -0
  merge

  sql/share/ukrainian/errmsg.txt
    1.27.6.6 03/08/26 16:49:48 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/swedish/errmsg.txt
    1.64.7.7 03/08/26 16:49:48 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/spanish/errmsg.txt
    1.64.7.7 03/08/26 16:49:48 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/slovak/errmsg.txt
    1.64.7.7 03/08/26 16:49:48 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/serbian/errmsg.txt
    1.18.6.6 03/08/26 16:49:48 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/russian/errmsg.txt
    1.61.6.6 03/08/26 16:49:48 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/romanian/errmsg.txt
    1.62.7.7 03/08/26 16:49:48 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/portuguese/errmsg.txt
    1.64.7.5 03/08/26 16:49:48 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/polish/errmsg.txt
    1.63.6.7 03/08/26 16:49:48 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/norwegian/errmsg.txt
    1.63.7.7 03/08/26 16:49:48 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/norwegian-ny/errmsg.txt
    1.63.7.7 03/08/26 16:49:48 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/korean/errmsg.txt
    1.63.6.6 03/08/26 16:49:47 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/japanese/errmsg.txt
    1.63.6.6 03/08/26 16:49:47 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/italian/errmsg.txt
    1.70.7.7 03/08/26 16:49:47 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/hungarian/errmsg.txt
    1.65.6.7 03/08/26 16:49:47 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/greek/errmsg.txt
    1.64.6.7 03/08/26 16:49:47 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/german/errmsg.txt
    1.64.7.7 03/08/26 16:49:47 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/french/errmsg.txt
    1.63.7.7 03/08/26 16:49:47 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/estonian/errmsg.txt
    1.64.6.7 03/08/26 16:49:47 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/english/errmsg.txt
    1.70.9.9 03/08/26 16:49:47 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/dutch/errmsg.txt
    1.66.7.7 03/08/26 16:49:47 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/danish/errmsg.txt
    1.62.7.8 03/08/26 16:49:47 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/share/czech/errmsg.txt
    1.64.7.6 03/08/26 16:49:47 bell@laptop.sanja.is.com.ua +0 -0
    merge

  mysql-test/r/subselect.result
    1.67.18.2 03/08/26 16:49:47 bell@laptop.sanja.is.com.ua +1 -1
    merge

  include/mysqld_error.h
    1.61.6.2 03/08/26 16:49:47 bell@laptop.sanja.is.com.ua +2 -3
    merge

ChangeSet
  1.1563.5.1 03/08/26 16:42:49 bell@laptop.sanja.is.com.ua +2 -0
  Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1

  sql/sql_cache.h
    1.22 03/08/26 16:42:43 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_cache.cc
    1.46.1.6 03/08/26 16:42:43 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.58.1.27 03/08/26 16:41:09 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.1.183 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.35.1.3 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.1563.4.1 03/08/26 11:51:09 pem@mysql.com +91 -0
  Merge 4.1 into 5.0

  sql/sql_yacc.yy
    1.235 03/08/26 11:51:05 pem@mysql.com +4 -39
    Merge 4.1 into 5.0

  sql/sql_update.cc
    1.92 03/08/26 11:51:05 pem@mysql.com +1 -1
    Merge 4.1 into 5.0

  sql/sql_union.cc
    1.77 03/08/26 11:51:05 pem@mysql.com +4 -10
    Merge 4.1 into 5.0

  sql/sql_table.cc
    1.164 03/08/26 11:51:05 pem@mysql.com +1 -3
    Merge 4.1 into 5.0

  sql/sql_parse.cc
    1.294 03/08/26 11:51:05 pem@mysql.com +20 -21
    Merge 4.1 into 5.0

  sql/sql_lex.h
    1.119 03/08/26 11:51:05 pem@mysql.com +0 -0
    Merge 4.1 into 5.0

  sql/sql_delete.cc
    1.106 03/08/26 11:51:05 pem@mysql.com +2 -3
    Merge 4.1 into 5.0

  sql/sql_class.h
    1.161 03/08/26 11:51:05 pem@mysql.com +1 -0
    Merge 4.1 into 5.0

  sql/sql_cache.cc
    1.52 03/08/26 11:51:05 pem@mysql.com +1 -1
    Merge 4.1 into 5.0

  sql/share/ukrainian/errmsg.txt
    1.40 03/08/26 11:51:05 pem@mysql.com +2 -1
    Merge 4.1 into 5.0

  sql/share/swedish/errmsg.txt
    1.78 03/08/26 11:51:05 pem@mysql.com +2 -1
    Merge 4.1 into 5.0

  sql/share/spanish/errmsg.txt
    1.77 03/08/26 11:51:05 pem@mysql.com +2 -1
    Merge 4.1 into 5.0

  sql/share/slovak/errmsg.txt
    1.77 03/08/26 11:51:05 pem@mysql.com +2 -1
    Merge 4.1 into 5.0

  sql/share/serbian/errmsg.txt
    1.31 03/08/26 11:51:05 pem@mysql.com +2 -1
    Merge 4.1 into 5.0

  sql/share/russian/errmsg.txt
    1.75 03/08/26 11:51:05 pem@mysql.com +2 -1
    Merge 4.1 into 5.0

  sql/share/romanian/errmsg.txt
    1.74 03/08/26 11:51:05 pem@mysql.com +0 -0
    Merge 4.1 into 5.0

  sql/share/portuguese/errmsg.txt
    1.77 03/08/26 11:51:05 pem@mysql.com +3 -2
    Merge 4.1 into 5.0

  sql/share/polish/errmsg.txt
    1.77 03/08/26 11:51:05 pem@mysql.com +2 -1
    Merge 4.1 into 5.0

  sql/share/norwegian/errmsg.txt
    1.76 03/08/26 11:51:05 pem@mysql.com +2 -1
    Merge 4.1 into 5.0

  sql/share/norwegian-ny/errmsg.txt
    1.76 03/08/26 11:51:05 pem@mysql.com +2 -1
    Merge 4.1 into 5.0

  sql/share/korean/errmsg.txt
    1.76 03/08/26 11:51:05 pem@mysql.com +2 -1
    Merge 4.1 into 5.0

  sql/share/japanese/errmsg.txt
    1.76 03/08/26 11:51:05 pem@mysql.com +2 -1
    Merge 4.1 into 5.0

  sql/share/italian/errmsg.txt
    1.83 03/08/26 11:51:05 pem@mysql.com +2 -1
    Merge 4.1 into 5.0

  sql/share/hungarian/errmsg.txt
    1.78 03/08/26 11:51:05 pem@mysql.com +2 -1
    Merge 4.1 into 5.0

  sql/share/greek/errmsg.txt
    1.77 03/08/26 11:51:05 pem@mysql.com +2 -1
    Merge 4.1 into 5.0

  sql/share/german/errmsg.txt
    1.78 03/08/26 11:51:05 pem@mysql.com +2 -1
    Merge 4.1 into 5.0

  sql/share/french/errmsg.txt
    1.76 03/08/26 11:51:05 pem@mysql.com +2 -1
    Merge 4.1 into 5.0

  sql/share/estonian/errmsg.txt
    1.77 03/08/26 11:51:05 pem@mysql.com +2 -1
    Merge 4.1 into 5.0

  sql/share/english/errmsg.txt
    1.84 03/08/26 11:51:05 pem@mysql.com +2 -1
    Merge 4.1 into 5.0

  sql/share/dutch/errmsg.txt
    1.79 03/08/26 11:51:05 pem@mysql.com +2 -1
    Merge 4.1 into 5.0

  sql/share/danish/errmsg.txt
    1.75 03/08/26 11:51:05 pem@mysql.com +2 -1
    Merge 4.1 into 5.0

  sql/share/czech/errmsg.txt
    1.76 03/08/26 11:51:05 pem@mysql.com +0 -0
    Merge 4.1 into 5.0

  sql/mysqld.cc
    1.365 03/08/26 11:51:05 pem@mysql.com +0 -2
    Merge 4.1 into 5.0

  sql/log.cc
    1.113 03/08/26 11:51:05 pem@mysql.com +0 -6
    Merge 4.1 into 5.0

  sql/item_sum.cc
    1.82.1.4 03/08/26 11:51:05 pem@mysql.com +3 -6
    Merge 4.1 into 5.0

  sql/item_subselect.cc
    1.64 03/08/26 11:51:05 pem@mysql.com +6 -8
    Merge 4.1 into 5.0

  sql/item_func.cc
    1.130 03/08/26 11:51:05 pem@mysql.com +0 -1
    Merge 4.1 into 5.0

  sql/item.h
    1.62 03/08/26 11:51:05 pem@mysql.com +3 -0
    Merge 4.1 into 5.0

  sql/item.cc
    1.68 03/08/26 11:51:05 pem@mysql.com +6 -13
    Merge 4.1 into 5.0

  mysql-test/t/subselect.test
    1.67 03/08/26 11:51:05 pem@mysql.com +0 -0
    Merge 4.1 into 5.0

  mysql-test/t/query_cache.test
    1.26 03/08/26 11:51:05 pem@mysql.com +0 -2
    Merge 4.1 into 5.0

  mysql-test/r/subselect.result
    1.77 03/08/26 11:51:04 pem@mysql.com +0 -2
    Merge 4.1 into 5.0

  mysql-test/r/query_cache.result
    1.28 03/08/26 11:51:04 pem@mysql.com +0 -0
    Merge 4.1 into 5.0

  include/mysqld_error.h
    1.73 03/08/26 11:51:04 pem@mysql.com +17 -18
    Merge 4.1 into 5.0

  sql/sql_show.cc
    1.126 03/08/26 10:44:03 pem@mysql.com +0 -0
    Auto merged

  sql/sql_select.cc
    1.226 03/08/26 10:44:03 pem@mysql.com +0 -0
    Auto merged

  sql/sql_repl.h
    1.30 03/08/26 10:44:02 pem@mysql.com +0 -0
    Auto merged

  sql/sql_repl.cc
    1.107 03/08/26 10:44:02 pem@mysql.com +0 -0
    Auto merged

  sql/sql_rename.cc
    1.18 03/08/26 10:44:02 pem@mysql.com +0 -0
    Auto merged

  sql/sql_load.cc
    1.51 03/08/26 10:44:01 pem@mysql.com +0 -0
    Auto merged

  sql/sql_lex.cc
    1.87.1.1 03/08/26 10:44:01 pem@mysql.com +0 -0
    Auto merged

  sql/sql_insert.cc
    1.92 03/08/26 10:44:01 pem@mysql.com +0 -0
    Auto merged

  sql/sql_derived.cc
    1.46 03/08/26 10:44:01 pem@mysql.com +0 -0
    Auto merged

  sql/sql_db.cc
    1.72 03/08/26 10:44:01 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.122 03/08/26 10:44:01 pem@mysql.com +0 -0
    Auto merged

  sql/sql_base.cc
    1.150 03/08/26 10:44:01 pem@mysql.com +0 -0
    Auto merged

  sql/sql_acl.cc
    1.78 03/08/26 10:44:01 pem@mysql.com +0 -0
    Auto merged

  sql/slave.cc
    1.195 03/08/26 10:44:00 pem@mysql.com +0 -0
    Auto merged

  sql/set_var.cc
    1.40 03/08/26 10:44:00 pem@mysql.com +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.34 03/08/26 10:44:00 pem@mysql.com +0 -0
    Auto merged

  sql/records.cc
    1.24 03/08/26 10:44:00 pem@mysql.com +0 -0
    Auto merged

  sql/protocol.cc
    1.60 03/08/26 10:44:00 pem@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.198 03/08/26 10:44:00 pem@mysql.com +0 -0
    Auto merged

  sql/log_event.cc
    1.119 03/08/26 10:44:00 pem@mysql.com +0 -0
    Auto merged

  sql/lex.h
    1.98 03/08/26 10:44:00 pem@mysql.com +0 -0
    Auto merged

  sql/item_func.h
    1.75 03/08/26 10:44:00 pem@mysql.com +0 -0
    Auto merged

  sql/item_create.cc
    1.36 03/08/26 10:43:59 pem@mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.99.1.7 03/08/26 10:43:59 pem@mysql.com +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.121 03/08/26 10:43:59 pem@mysql.com +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.93 03/08/26 10:43:59 pem@mysql.com +0 -0
    Auto merged

  sql/filesort.cc
    1.76 03/08/26 10:43:59 pem@mysql.com +0 -0
    Auto merged

  sql/Makefile.am
    1.85 03/08/26 10:43:59 pem@mysql.com +0 -0
    Auto merged

  scripts/mysql_install_db.sh
    1.46 03/08/26 10:43:59 pem@mysql.com +0 -0
    Auto merged

  mysys/my_pthread.c
    1.39 03/08/26 10:43:59 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/variables.test
    1.21 03/08/26 10:43:59 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/insert.test
    1.13 03/08/26 10:43:59 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/variables.result
    1.30 03/08/26 10:43:59 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/insert.result
    1.14 03/08/26 10:43:59 pem@mysql.com +0 -0
    Auto merged

  myisam/myisamdef.h
    1.63 03/08/26 10:43:59 pem@mysql.com +0 -0
    Auto merged

  myisam/myisamchk.c
    1.96 03/08/26 10:43:58 pem@mysql.com +0 -0
    Auto merged

  myisam/mi_check.c
    1.108 03/08/26 10:43:58 pem@mysql.com +0 -0
    Auto merged

  libmysqld/Makefile.am
    1.34 03/08/26 10:43:58 pem@mysql.com +0 -0
    Auto merged

  libmysql/libmysql.c
    1.159 03/08/26 10:43:58 pem@mysql.com +0 -0
    Auto merged

  include/mysql_com.h
    1.71 03/08/26 10:43:58 pem@mysql.com +0 -0
    Auto merged

  include/my_pthread.h
    1.67 03/08/26 10:43:58 pem@mysql.com +0 -0
    Auto merged

  include/my_global.h
    1.49 03/08/26 10:43:58 pem@mysql.com +0 -0
    Auto merged

  configure.in
    1.214 03/08/26 10:43:58 pem@mysql.com +0 -0
    Auto merged

  client/mysqltest.c
    1.98 03/08/26 10:43:58 pem@mysql.com +0 -0
    Auto merged

  client/mysql.cc
    1.130 03/08/26 10:43:58 pem@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.243 03/08/26 10:43:49 pem@mysql.com +0 -1
    auto-union

  BitKeeper/etc/ignore
    1.157 03/08/26 10:43:49 pem@mysql.com +5 -5
    auto-union

ChangeSet
  1.1563.3.4 03/08/26 00:15:49 igor@rurik.mysql.com +1 -0
  Manual merge

  sql/sql_yacc.yy
    1.203.61.7 03/08/26 00:15:47 igor@rurik.mysql.com +1 -2
    Manual merge

ChangeSet
  1.1563.3.3 03/08/26 00:13:22 igor@rurik.mysql.com +27 -0
  Manual merge

  sql/sql_lex.h
    1.102.1.30 03/08/26 00:13:18 igor@rurik.mysql.com +6 -2
    Manual merge

  sql/sql_lex.cc
    1.88 03/08/26 00:13:18 igor@rurik.mysql.com +27 -1
    Manual merge

  sql/set_var.cc
    1.34.12.4 03/08/26 00:13:18 igor@rurik.mysql.com +24 -43
    Manual merge
    

  sql/mysqld.cc
    1.356.17.5 03/08/26 00:13:18 igor@rurik.mysql.com +0 -5
    Manual merge

  mysql-test/t/range.test
    1.7 03/08/26 00:13:18 igor@rurik.mysql.com +11 -13
    Manual merge

  mysql-test/r/range.result
    1.13 03/08/26 00:13:18 igor@rurik.mysql.com +0 -0
    Manual merge

  sql/table.h
    1.54 03/08/25 21:47:39 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_table.cc
    1.157.2.13 03/08/25 21:47:39 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.1.17 03/08/25 21:47:39 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_base.cc
    1.145.11.1 03/08/25 21:47:39 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/set_var.h
    1.29.2.4 03/08/25 21:47:38 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/opt_range.cc
    1.94 03/08/25 21:47:38 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.24.1 03/08/25 21:47:38 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.61.1.2 03/08/25 21:47:38 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/handler.h
    1.85 03/08/25 21:47:38 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/handler.cc
    1.99 03/08/25 21:47:38 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.115.1.7 03/08/25 21:47:38 igor@rurik.mysql.com +0 -0
    Auto merged

  mysql-test/t/key_cache.test
    1.3 03/08/25 21:47:38 igor@rurik.mysql.com +0 -0
    Auto merged

  mysql-test/r/key_cache.result
    1.3 03/08/25 21:47:38 igor@rurik.mysql.com +0 -1
    Auto merged

  myisam/myisamdef.h
    1.59.1.7 03/08/25 21:47:38 igor@rurik.mysql.com +0 -0
    Auto merged

  myisam/myisamchk.c
    1.92.1.6 03/08/25 21:47:38 igor@rurik.mysql.com +0 -0
    Auto merged

  myisam/mi_locking.c
    1.27 03/08/25 21:47:38 igor@rurik.mysql.com +0 -0
    Auto merged

  myisam/mi_extra.c
    1.35 03/08/25 21:47:38 igor@rurik.mysql.com +0 -0
    Auto merged

  myisam/mi_check.c
    1.105.1.6 03/08/25 21:47:37 igor@rurik.mysql.com +0 -0
    Auto merged

  include/my_sys.h
    1.106 03/08/25 21:47:37 igor@rurik.mysql.com +0 -0
    Auto merged

  include/my_global.h
    1.47.1.2 03/08/25 21:47:37 igor@rurik.mysql.com +0 -0
    Auto merged

  include/my_base.h
    1.45 03/08/25 21:47:37 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.1.181 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.77.1.52 03/08/25 17:20:49 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.330.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.50.1.14 03/08/25 16:20:11 guilhem@mysql.com +24 -0
    comments

  sql/slave.cc
    1.164.1.86 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.1346.1.180 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.76.1.37 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.92.1.36 03/08/25 17:19:42 monty@narttu.mysql.fi +1 -1
    simple optimization

  mysys/mf_keycache.c
    1.21.1.1 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.3.1.2 03/08/25 17:19:42 monty@narttu.mysql.fi +2 -0
    Update results

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

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

ChangeSet
  1.1546.78.2 03/08/25 17:07:14 Sinisa@sinisa.nasamreza.org +1 -0
  symlink.result:
    Fix for a small error in the merge from 4.0

  mysql-test/r/symlink.result
    1.10 03/08/25 17:06:35 Sinisa@sinisa.nasamreza.org +0 -2
    Fix for a small error in the merge from 4.0

ChangeSet
  1.1563.3.2 03/08/25 16:40:14 bell@laptop.sanja.is.com.ua +1 -0
  removed --rpl option of ./mysql-test-run
  (./mysql-test-run t/rpl*.test  do same work)

  mysql-test/mysql-test-run.sh
    1.167.1.3 03/08/25 16:39:45 bell@laptop.sanja.is.com.ua +4 -15
    removed --rpl option of ./mysql-test-run
    (./mysql-test-run t/rpl*.test  do same work)

ChangeSet
  1.1346.331.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.86.1.24 03/08/25 14:13:52 guilhem@mysql.com +7 -7
    clearer thd->proc_info for binlog_dump thread

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

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

  sql/log.cc
    1.80.1.57 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.1346.1.179 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.77.9.1 03/08/25 14:27:30 monty@narttu.mysql.fi +0 -2
    Fix compiler warning

  sql/handler.cc
    1.82.1.25 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.80.1.27 03/08/25 14:27:30 monty@narttu.mysql.fi +5 -0
    New comment

  myisam/mi_locking.c
    1.23.1.3 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.86.1.36 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.3.1.2 03/08/25 14:27:30 monty@narttu.mysql.fi +4 -4
    Update of project files

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  VC++Files/myisamlog/myisamlog.dsp
    1.2.1.2 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.1.1.2 03/08/25 14:27:30 monty@narttu.mysql.fi +11 -11
    Update of project files

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

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

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

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

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

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

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

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

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

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

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

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

ChangeSet
  1.1346.330.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.44.1.15 03/08/24 03:43:58 heikki@hundin.mysql.fi +1 -6
    strerror() does not work in Windows

ChangeSet
  1.1546.78.1 03/08/23 21:21:02 Sinisa@sinisa.nasamreza.org +4 -0
  union.result:
    same as above
  sql_lex.h:
    same as above 
  sql_union.cc:
    same as aobve
  sql_select.cc:
    Fixing that SQL_CALC_FOUND_ROWS work properly in UNION's in 4.1
    Plus updating some fields in THD in the proper places 
    plus fixing a wrong result

  mysql-test/r/union.result
    1.42.1.1 03/08/23 21:20:38 Sinisa@sinisa.nasamreza.org +1 -1
    same as above

  sql/sql_lex.h
    1.102.21.3 03/08/23 21:20:34 Sinisa@sinisa.nasamreza.org +2 -2
    same as above 

  sql/sql_union.cc
    1.74.2.13 03/08/23 21:20:22 Sinisa@sinisa.nasamreza.org +24 -15
    same as aobve

  sql/sql_select.cc
    1.216.25.3 03/08/23 21:19:09 Sinisa@sinisa.nasamreza.org +3 -2
    Fixing that SQL_CALC_FOUND_ROWS work properly in UNION's in 4.1
    Plus updating some fields in THD in the proper places 
    plus fixing a wrong result

ChangeSet
  1.1346.330.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.164.1.84 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.1346.283.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.164.1.83 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.77.1.51 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.1568 03/08/23 13:33:02 bell@laptop.sanja.is.com.ua +6 -0
  Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1
  into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1

  sql/sql_class.h
    1.146.15.4 03/08/23 13:32:56 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_class.cc
    1.105.3.2 03/08/23 13:32:56 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.h
    1.38 03/08/23 13:32:55 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.cc
    1.60.1.15 03/08/23 13:32:55 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.58.1.23 03/08/23 13:32:55 bell@laptop.sanja.is.com.ua +0 -1
    Auto merged

  mysql-test/r/subselect.result
    1.67.1.22 03/08/23 13:32:55 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1566.1.3 03/08/23 13:29:38 bell@laptop.sanja.is.com.ua +13 -0
  fixed bug of lack of fix_fields call (after merge bugfix (SCRUM))
  fixed bug in Item_sum
  fixed bug in dependence remover
  after merge fix

  sql/sql_union.cc
    1.74.1.11 03/08/23 13:29:33 bell@laptop.sanja.is.com.ua +3 -0
    fixed bug of lack of fix_fields call

  sql/sql_derived.cc
    1.43.1.9 03/08/23 13:29:32 bell@laptop.sanja.is.com.ua +3 -0
    fixed bug of lack of fix_fields call

  sql/sql_base.cc
    1.145.1.13 03/08/23 13:29:32 bell@laptop.sanja.is.com.ua +15 -0
    setup_fields reverter

  sql/mysql_priv.h
    1.186.17.7 03/08/23 13:29:32 bell@laptop.sanja.is.com.ua +1 -0
    setup_fields reverter

  sql/item_sum.h
    1.45 03/08/23 13:29:32 bell@laptop.sanja.is.com.ua +2 -0
    fixed absence of walk method of Item_sum

  sql/item_sum.cc
    1.86 03/08/23 13:29:32 bell@laptop.sanja.is.com.ua +14 -0
    fixed absence of walk method of Item_sum

  sql/item_subselect.h
    1.36.1.2 03/08/23 13:29:32 bell@laptop.sanja.is.com.ua +2 -1
    fixed initialisation

  sql/item.h
    1.56.10.1 03/08/23 13:29:32 bell@laptop.sanja.is.com.ua +1 -0
    fixed flag dropper
    (I was not able to find Item whicj need more to be fix_fielded twice)

  sql/item.cc
    1.58.20.1 03/08/23 13:29:32 bell@laptop.sanja.is.com.ua +1 -1
    fixed returned value

  mysql-test/t/union.test
    1.41 03/08/23 13:29:32 bell@laptop.sanja.is.com.ua +10 -0
    new test

  mysql-test/t/subselect.test
    1.58.18.2 03/08/23 13:29:32 bell@laptop.sanja.is.com.ua +1 -1
    after merge fix

  mysql-test/r/union.result
    1.43 03/08/23 13:29:32 bell@laptop.sanja.is.com.ua +14 -0
    new test

  mysql-test/r/subselect.result
    1.67.25.2 03/08/23 13:29:32 bell@laptop.sanja.is.com.ua +1 -1
    after merge fix

ChangeSet
  1.1346.1.178 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.112.1.54 03/08/23 12:26:06 monty@narttu.mysql.fi +0 -0
    Auto merged

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

ChangeSet
  1.1346.329.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.112.10.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.76.1.36 03/08/23 12:25:38 monty@narttu.mysql.fi +55 -37
    show symlinked directories in SHOW CREATE TABLE

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

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

ChangeSet
  1.1546.28.55 03/08/22 23:41:56 serg@serg.mylan +1 -0
  added support for --libs_r

  scripts/mysql_config.sh
    1.9 03/08/22 23:41:52 serg@serg.mylan +4 -0
    added support for --libs_r

ChangeSet
  1.1566.1.2 03/08/22 19:56:03 bell@laptop.sanja.is.com.ua +1 -0
  Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1

  sql/sql_yacc.yy
    1.203.56.8 03/08/22 19:55:57 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1546.28.54 03/08/22 18:21:23 serg@serg.mylan +3 -0
  bug #1078. two innodb+delayed crashes

  sql/sql_insert.cc
    1.86.6.1 03/08/22 18:21:16 serg@serg.mylan +4 -0
    bug #1078. two innodb+delayed crashes

  mysql-test/t/innodb.test
    1.43.1.1 03/08/22 18:21:16 serg@serg.mylan +14 -0
    bug #1078. two innodb+delayed crashes

  mysql-test/r/innodb.result
    1.68.1.1 03/08/22 18:21:16 serg@serg.mylan +12 -0
    bug #1078. two innodb+delayed crashes

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

ChangeSet
  1.1346.1.176 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.5.2.1 03/08/22 18:31:27 Sinisa@sinisa.nasamreza.org +20 -0
    Fix for a bug #878

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

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

ChangeSet
  1.1346.328.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.218.30.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.63.1.40 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.111.3.3 03/08/22 15:39:15 guilhem@mysql.com +1 -1
    prototype

  sql/log_event.cc
    1.77.1.50 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.80.1.56 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.82.1.24 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.2.1.6 03/08/22 15:39:14 guilhem@mysql.com +6 -8
    minor edit: simplifying the test.

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

  client/mysqldump.c
    1.65.1.28 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.1346.283.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.34.1.16 03/08/22 04:08:14 monty@narttu.mysql.fi +0 -0
    Auto merged

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

ChangeSet
  1.1346.327.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.34.2.1 03/08/22 04:07:38 monty@narttu.mysql.fi +6 -2
    Safety fix

  sql/mysqld.cc
    1.297.1.154 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.51.1.26 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.3.1.4 03/08/22 04:07:38 monty@narttu.mysql.fi +2 -2
    Make test repeatable

  mysql-test/t/query_cache.test
    1.16.1.10 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.1.1.2 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.6.1.3 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.15.1.10 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.1.1.2 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.146.1.29 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.95.1.34 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.13.1.3 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.77.7.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.1346.283.71 03/08/21 21:39:22 serg@serg.mylan +4 -0
  merged

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

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

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

  extra/resolveip.c
    1.13.1.6 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.1346.283.69 03/08/21 20:13:26 serg@serg.mylan +1 -0
  crash BUG#1116 fixed

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

ChangeSet
  1.1546.28.53 03/08/21 18:30:43 serg@serg.mylan +7 -0
  use crc32() from bundled zlib if system zlib is unavailable

  mysys/my_crc32.c
    1.1 03/08/21 18:30:39 serg@serg.mylan +36 -0

  sql/lex.h
    1.82.16.1 03/08/21 18:30:39 serg@serg.mylan +0 -2
    previous patch cleanup

  sql/item_strfunc.h
    1.63.2.4 03/08/21 18:30:39 serg@serg.mylan +20 -20
    previous patch cleanup

  sql/item_strfunc.cc
    1.126.3.2 03/08/21 18:30:39 serg@serg.mylan +3 -16
    previous patch cleanup

  sql/item_create.h
    1.28.2.1 03/08/21 18:30:39 serg@serg.mylan +0 -2
    previous patch cleanup

  mysys/my_crc32.c
    1.0 03/08/21 18:30:39 serg@serg.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-4.1/mysys/my_crc32.c

  mysys/Makefile.am
    1.46 03/08/21 18:30:38 serg@serg.mylan +1 -1
    use crc32() from bundled zlib if system zlib is unavailable

  include/my_sys.h
    1.100.1.4 03/08/21 18:30:38 serg@serg.mylan +2 -1
    use crc32() from bundled zlib if system zlib is unavailable

ChangeSet
  1.1546.28.52 03/08/21 16:15:06 serg@serg.mylan +12 -0
  fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib
  moved them all from different places to item_strfunc.{h,cc}
  checksum table command
  Com_xxx status variables updated

  sql/sql_yacc.yy
    1.203.63.3 03/08/21 16:15:02 serg@serg.mylan +13 -2
    checksum table command

  sql/sql_table.cc
    1.157.12.1 03/08/21 16:15:02 serg@serg.mylan +65 -1
    checksum table command

  sql/sql_parse.cc
    1.271.23.1 03/08/21 16:15:02 serg@serg.mylan +8 -0
    checksum table command

  sql/sql_lex.h
    1.102.17.4 03/08/21 16:15:02 serg@serg.mylan +2 -2
    checksum table command

  sql/mysqld.cc
    1.356.22.1 03/08/21 16:15:02 serg@serg.mylan +8 -3
    Com_xxx updated

  sql/mysql_priv.h
    1.186.23.1 03/08/21 16:15:02 serg@serg.mylan +1 -0
    checksum table command

  sql/item_strfunc.h
    1.63.2.3 03/08/21 16:15:02 serg@serg.mylan +48 -1
    fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib
    moved them all from different places to item_strfunc.{h,cc}

  sql/item_strfunc.cc
    1.126.3.1 03/08/21 16:15:02 serg@serg.mylan +46 -9
    fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib
    moved them all from different places to item_strfunc.{h,cc}

  sql/item_geofunc.h
    1.3 03/08/21 16:15:02 serg@serg.mylan +0 -24
    fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib
    moved them all from different places to item_strfunc.{h,cc}

  sql/item_func.h
    1.68.7.1 03/08/21 16:15:02 serg@serg.mylan +0 -21
    fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib
    moved them all from different places to item_strfunc.{h,cc}

  sql/item_func.cc
    1.124.5.1 03/08/21 16:15:02 serg@serg.mylan +2 -34
    fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib
    moved them all from different places to item_strfunc.{h,cc}

  sql/item_create.cc
    1.33.6.1 03/08/21 16:15:01 serg@serg.mylan +4 -17
    fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib
    moved them all from different places to item_strfunc.{h,cc}

ChangeSet
  1.1346.324.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.74.1.4 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.1563.3.1 03/08/21 14:15:25 bar@bar.mysql.r18.ru +7 -0
  CAST(expr AS CHAR(10)) is now working 

  sql/sql_yacc.yy
    1.203.61.6 03/08/21 14:15:22 bar@bar.mysql.r18.ru +29 -12
    CAST(expr AS CHAR(10)) is now working 

  sql/item_timefunc.h
    1.36 03/08/21 14:15:22 bar@bar.mysql.r18.ru +8 -6
    CAST(expr AS CHAR(10)) is now working 

  sql/item_timefunc.cc
    1.42 03/08/21 14:15:22 bar@bar.mysql.r18.ru +53 -0
    CAST(expr AS CHAR(10)) is now working 

  sql/item_create.h
    1.28.1.2 03/08/21 14:15:22 bar@bar.mysql.r18.ru +1 -1
    CAST(expr AS CHAR(10)) is now working 

  sql/item_create.cc
    1.33.5.2 03/08/21 14:15:22 bar@bar.mysql.r18.ru +5 -5
    CAST(expr AS CHAR(10)) is now working 

  mysql-test/t/cast.test
    1.6 03/08/21 14:15:22 bar@bar.mysql.r18.ru +41 -0
    CAST(expr AS CHAR(10)) is now working 

  mysql-test/r/cast.result
    1.9 03/08/21 14:15:22 bar@bar.mysql.r18.ru +54 -0
    CAST(expr AS CHAR(10)) is now working 

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

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

ChangeSet
  1.1346.324.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.164.1.82 03/08/21 10:24:33 guilhem@mysql.com +121 -0
    Enabling again process_io_create_file

ChangeSet
  1.1346.324.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.11.1.3 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.26.1.9 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.1.1.7 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.1563.2.17 03/08/21 00:41:08 bell@laptop.sanja.is.com.ua +2 -0
  merge

  mysql-test/t/subselect.test
    1.58.14.6 03/08/21 00:41:03 bell@laptop.sanja.is.com.ua +2 -2
    error code changed

  mysql-test/r/subselect.result
    1.67.21.7 03/08/21 00:41:03 bell@laptop.sanja.is.com.ua +1 -0
    correct result after merging with fixed Item_in_optimiser::fix_left()

ChangeSet
  1.1346.324.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.164.1.81 03/08/20 23:25:52 guilhem@mysql.com +0 -0
    Auto merged

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

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

ChangeSet
  1.1346.326.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.86.1.23 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.34.1.15 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.164.9.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.71.1.11 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.77.8.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.80.5.1 03/08/20 23:24:35 guilhem@mysql.com +1 -0
    debug info

  mysql-test/t/rpl_loaddata.test
    1.2.1.5 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.1.1.6 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.1563.2.16 03/08/20 23:39:17 bell@laptop.sanja.is.com.ua +4 -0
  merge

  mysql-test/t/subselect.test
    1.58.14.5 03/08/20 23:39:14 bell@laptop.sanja.is.com.ua +11 -11
    merge

  mysql-test/r/subselect.result
    1.67.21.6 03/08/20 23:39:14 bell@laptop.sanja.is.com.ua +7 -7
    merge

  sql/item.h
    1.56.1.29 03/08/20 23:35:22 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.58.18.7 03/08/20 23:35:22 bell@laptop.sanja.is.com.ua +0 -1
    Auto merged

ChangeSet
  1.1566.1.1 03/08/20 22:17:57 bell@laptop.sanja.is.com.ua +9 -0
  merge

  mysql-test/t/subselect.test
    1.58.18.1 03/08/20 22:17:52 bell@laptop.sanja.is.com.ua +0 -1
    merge

  mysql-test/r/subselect.result
    1.67.25.1 03/08/20 22:17:52 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/sql_yacc.yy
    1.203.56.7 03/08/20 22:15:02 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_union.cc
    1.74.1.10 03/08/20 22:15:01 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item_sum.cc
    1.85 03/08/20 22:15:01 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.h
    1.36.1.1 03/08/20 22:15:01 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.cc
    1.60.9.1 03/08/20 22:15:01 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.63 03/08/20 22:15:01 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.102 03/08/20 22:15:01 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1563.2.14 03/08/20 21:57:37 bell@laptop.sanja.is.com.ua +3 -0
  quick fix for found row counter
  code cleunup

  sql/sql_update.cc
    1.83.2.13 03/08/20 21:57:29 bell@laptop.sanja.is.com.ua +1 -1
    lelect_limit in THD is not used

  sql/sql_union.cc
    1.74.5.9 03/08/20 21:57:29 bell@laptop.sanja.is.com.ua +15 -10
    quick fix for found row counter
    layout fixed

  sql/sql_class.h
    1.146.15.3 03/08/20 21:57:29 bell@laptop.sanja.is.com.ua +1 -1
    removed unused variables

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

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

ChangeSet
  1.1563.2.13 03/08/20 17:45:04 bell@laptop.sanja.is.com.ua +2 -0
  Merge

  sql/sql_union.cc
    1.74.5.8 03/08/20 17:45:00 bell@laptop.sanja.is.com.ua +0 -0
    SCCS merged

ChangeSet
  1.1546.2.29 03/08/20 16:39:11 lenz@kallisto.local +2 -0
   - make sure that both libedit and readline are added to the source
     distribution. libedit is used by default, one needs to use
     "--with-readline" when compiling with readline instead.

  configure.in
    1.201.1.39 03/08/20 16:39:08 lenz@mysql.com +3 -16
     - create both Makefiles for libedit and libedit

  cmd-line-utils/Makefile.am
    1.2 03/08/20 16:39:07 lenz@mysql.com +1 -0
     - add both libedit and readline to the source distribution

  sql/sql_parse.cc
    1.271.1.16 03/08/20 17:37:47 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1563.2.12 03/08/20 17:35:12 bell@laptop.sanja.is.com.ua +6 -0
  after merge changing
  uninitialized value fixed

  sql/sql_yacc.yy
    1.203.61.5 03/08/20 17:35:05 bell@laptop.sanja.is.com.ua +2 -2
    after merge changing

  sql/sql_union.cc
    1.74.5.7 03/08/20 17:35:05 bell@laptop.sanja.is.com.ua +5 -0
    fake st_select_lex should have item list for ref_array allocation

  sql/sql_parse.cc
    1.271.1.15 03/08/20 17:35:05 bell@laptop.sanja.is.com.ua +2 -2
    used same new operator for all allocation in subroutine

  sql/mysql_priv.h
    1.186.17.6 03/08/20 17:35:05 bell@laptop.sanja.is.com.ua +1 -1
    after merge chenges.

  sql/item_subselect.cc
    1.60.8.5 03/08/20 17:35:05 bell@laptop.sanja.is.com.ua +1 -1
    fixed reported table bit

  sql/item_cmpfunc.cc
    1.99.1.6 03/08/20 17:35:05 bell@laptop.sanja.is.com.ua +6 -4
    fixed uninitialized used_tables_cache
    othyer caches moved on proper place

ChangeSet
  1.1546.77.1 03/08/20 16:32:00 guilhem@gbichot2 +1 -0
  sleep instead of system sleep

  mysql-test/t/rpl_relayrotate.test
    1.4 03/08/20 16:31:57 guilhem@mysql.com +1 -1
    sleep instead of system sleep

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

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

ChangeSet
  1.1346.324.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.22.3.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.152.1.99 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.46.1.13 03/08/20 16:25:42 monty@narttu.mysql.fi +16 -11
    Indentation changes + trivial optimization

  sql/mysqld.cc
    1.297.1.153 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.80.1.54 03/08/20 16:25:42 monty@narttu.mysql.fi +2 -1
    Indentation fix

  sql/item_uniq.h
    1.5.1.3 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.15.1.7 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.25.1.8 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.20.3.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.73.15.1 03/08/20 16:25:42 monty@narttu.mysql.fi +0 -1
    Remove wrong include file

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

  mysql-test/t/union.test
    1.22.2.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.17.2.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.1.1.1 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.146.1.28 03/08/20 16:25:42 monty@narttu.mysql.fi +0 -6
    Add options handled by general skip- option

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

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

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

  include/m_string.h
    1.17.1.1 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.1346.1.174 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.17.1.8 03/08/20 16:13:43 Sinisa@sinisa.nasamreza.org +55 -1

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

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

ChangeSet
  1.1346.1.173 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.11.2.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.9.2.1 03/08/20 15:51:36 Sinisa@sinisa.nasamreza.org +7 -0
    Test case for the LEAST() bug in LEFT JOIN

ChangeSet
  1.1346.1.172 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.39.1.21 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.73.1.111 03/08/20 15:19:11 Sinisa@sinisa.nasamreza.org +0 -1
    Fix for a configure bug

  mysql-test/r/multi_update.result
    1.15.1.6 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.17.1.6 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.54.1.37 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.1546.2.28 03/08/20 13:56:32 Sinisa@sinisa.nasamreza.org +1 -0
  fixing limit and SQL_CALC_FOUND_ROWS issues

  sql/sql_union.cc
    1.74.2.12 03/08/20 13:56:24 Sinisa@sinisa.nasamreza.org +24 -16
    fixing limit and SQL_CALC_FOUND_ROWS issues

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

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

ChangeSet
  1.1346.323.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.218.30.3 03/08/20 03:38:11 dlenev@mysql.com +1 -0
    Added comment about broken SHOW NEW MASTER

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

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

  sql/slave.cc
    1.164.1.80 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.11.1.22 03/08/20 03:38:11 dlenev@mysql.com +15 -0
    Added comment about broken SHOW NEW MASTER

  sql/log_event.cc
    1.77.1.48 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.26.1.8 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.1346.322.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.14.1.5 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.1563.2.11 03/08/19 20:14:35 bell@laptop.sanja.is.com.ua +21 -0
  merge

  sql/sql_union.cc
    1.74.5.6 03/08/19 20:14:30 bell@laptop.sanja.is.com.ua +1 -2
    merge

  sql/sql_base.cc
    1.145.1.12 03/08/19 20:14:30 bell@laptop.sanja.is.com.ua +0 -0
    merge

  sql/table.h
    1.53 03/08/19 19:50:51 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.203.61.4 03/08/19 19:50:51 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_update.cc
    1.83.2.12 03/08/19 19:50:51 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_table.cc
    1.157.9.4 03/08/19 19:50:50 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.1.26 03/08/19 19:50:50 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.1.14 03/08/19 19:50:50 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.1.29 03/08/19 19:50:50 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.87 03/08/19 19:50:50 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_delete.cc
    1.99.2.10 03/08/19 19:50:49 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.18.6 03/08/19 19:50:49 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.17.5 03/08/19 19:50:49 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.h
    1.68.1.17 03/08/19 19:50:49 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.124.1.21 03/08/19 19:50:49 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.61.1.1 03/08/19 19:50:49 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.99.1.5 03/08/19 19:50:48 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.56.1.28 03/08/19 19:50:48 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.58.18.6 03/08/19 19:50:48 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.58.14.4 03/08/19 19:50:48 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.21.5 03/08/19 19:50:48 bell@laptop.sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.321.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.8.1.6 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.1346.283.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.77.1.47 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.80.1.53 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.75.1.25 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.1346.283.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.71.1.10 03/08/19 15:46:43 guilhem@mysql.com +1 -0
    prototype

  sql/log_event.cc
    1.77.1.46 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.70.1.10 03/08/19 15:46:41 guilhem@mysql.com +7 -1
    a comment

ChangeSet
  1.1546.2.27 03/08/19 16:40:31 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/sql_parse.cc
    1.271.19.7 03/08/19 16:40:22 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1546.76.1 03/08/19 16:35:17 Sinisa@sinisa.nasamreza.org +3 -0
  A fix for a bug with long definition of SET or ENUM.
  
  Barkov approved it already
  

  sql/sql_parse.cc
    1.271.22.1 03/08/19 16:35:11 Sinisa@sinisa.nasamreza.org +3 -2
    A fix for a bug with long definition of SET or ENUM.
    
    Barkov approved it already
    

  mysql-test/t/type_set.test
    1.4 03/08/19 16:35:11 Sinisa@sinisa.nasamreza.org +2 -0
    A fix for a bug with long definition of SET or ENUM.
    
    Barkov approved it already
    

  mysql-test/r/type_set.result
    1.7 03/08/19 16:35:10 Sinisa@sinisa.nasamreza.org +2 -0
    A fix for a bug with long definition of SET or ENUM.
    
    Barkov approved it already
    

ChangeSet
  1.1346.320.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.70.1.9 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.1346.319.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.1.1.1 03/08/19 16:03:15 monty@mashka.mysql.fi +1 -1
    Fix test case

ChangeSet
  1.1546.2.26 03/08/19 16:00:36 monty@mashka.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mashka.mysql.fi:/home/my/mysql-4.1

  include/m_ctype.h
    1.72 03/08/19 16:00:33 monty@mashka.mysql.fi +0 -1
    Auto merged

ChangeSet
  1.1546.2.25 03/08/19 16:00:12 monty@mashka.mysql.fi +11 -0
  After merge fixes + bugs from last merge

  sql/table.cc
    1.83 03/08/19 16:00:08 monty@mashka.mysql.fi +17 -14
    Code cleanup

  sql/sql_parse.cc
    1.271.19.6 03/08/19 16:00:08 monty@mashka.mysql.fi +17 -20
    Move current_tablenr to open_tables()
    Simple cleanup

  sql/sql_class.cc
    1.105.4.2 03/08/19 16:00:07 monty@mashka.mysql.fi +1 -3
    Move current_tablenr to open_tables()
    Add missing update_charset()

  sql/sql_base.cc
    1.145.6.4 03/08/19 16:00:07 monty@mashka.mysql.fi +2 -0
    Move current_tablenr to open_tables()

  sql/slave.cc
    1.188.5.4 03/08/19 16:00:06 monty@mashka.mysql.fi +5 -3
    Reset thd->lex.current_select before execute

  sql/set_var.cc
    1.34.14.3 03/08/19 16:00:06 monty@mashka.mysql.fi +3 -1
    After merge fix

  sql/protocol.h
    1.11.1.1 03/08/19 16:00:06 monty@mashka.mysql.fi +1 -1
    Fixed wrong memory reference

  sql/log_event.cc
    1.113.1.12 03/08/19 16:00:05 monty@mashka.mysql.fi +0 -2
    Move current_tablenr to open_tables()

  sql/item.cc
    1.58.19.1 03/08/19 16:00:05 monty@mashka.mysql.fi +1 -1
    Fixed typo

  mysql-test/t/union.test
    1.40 03/08/19 16:00:04 monty@mashka.mysql.fi +1 -1
    After merge fix

  mysql-test/mysql-test-run.sh
    1.167.1.2 03/08/19 16:00:04 monty@mashka.mysql.fi +3 -3
    Use --skip-bdb with valgrind (as bdb tables causes valgrind to hang)
    Fix --ddd option

ChangeSet
  1.1346.283.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.1346.283.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.8.1.5 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.1546.75.4 03/08/19 12:49:47 ram@mysql.r18.ru +1 -0
  Removed idle MY_LEX_SIGNED_NUMBER

  include/m_ctype.h
    1.70.1.1 03/08/19 12:49:22 ram@mysql.r18.ru +1 -1
    Removed idle MY_LEX_SIGNED_NUMBER

ChangeSet
  1.1546.2.24 03/08/19 00:10:21 monty@mashka.mysql.fi +19 -0
  merge

  strings/ctype-latin1.c
    1.16 03/08/19 00:10:18 monty@mashka.mysql.fi +1 -1
    merge

  sql/sql_yacc.yy
    1.203.64.3 03/08/19 00:08:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_update.cc
    1.83.2.11 03/08/19 00:08:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_union.cc
    1.74.2.11 03/08/19 00:08:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_table.cc
    1.157.11.1 03/08/19 00:08:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.25.2 03/08/19 00:08:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.19.5 03/08/19 00:08:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/lex.h
    1.82.14.3 03/08/19 00:08:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_timefunc.h
    1.35 03/08/19 00:08:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_timefunc.cc
    1.41 03/08/19 00:08:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.87.6.12 03/08/19 00:08:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item.h
    1.56.6.13 03/08/19 00:08:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/field.h
    1.77 03/08/19 00:08:56 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/field.cc
    1.112 03/08/19 00:08:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.58.17.1 03/08/19 00:08:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/func_time.test
    1.19 03/08/19 00:08:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.24.1 03/08/19 00:08:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/func_time.result
    1.21 03/08/19 00:08:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  configure.in
    1.201.1.38 03/08/19 00:08:56 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1546.2.23 03/08/19 00:08:08 monty@mashka.mysql.fi +108 -0
  After merge fixes
  Use server character set if --default-character-set is not used
  Added convert_string() for more efficient alloc+character-set convert of strings

  strings/ctype-latin1.c
    1.14.1.1 03/08/19 00:08:03 monty@mashka.mysql.fi +117 -164
    Port latin_de conversion code from 4.0

  sql/sql_yacc.yy
    1.203.65.2 03/08/19 00:08:03 monty@mashka.mysql.fi +43 -53
    After merge fix
    Avoid calling mysql_charset_same() when parsing identifiers

  sql/sql_repl.cc
    1.102.1.7 03/08/19 00:08:03 monty@mashka.mysql.fi +4 -4
    After merge fix

  sql/sql_parse.cc
    1.271.21.2 03/08/19 00:08:02 monty@mashka.mysql.fi +40 -25
    Optimize and fix memory reference errors reported by valgrind

  sql/sql_lex.h
    1.102.21.2 03/08/19 00:08:02 monty@mashka.mysql.fi +2 -0
    After merge fix

  sql/sql_handler.cc
    1.40 03/08/19 00:08:02 monty@mashka.mysql.fi +1 -1
    After merge fix

  sql/sql_class.h
    1.146.15.2 03/08/19 00:08:02 monty@mashka.mysql.fi +5 -0
    Added convert_string() for more efficient alloc+character-set convert of strings
    Add cached flags to avoid calling mysql_charset_same() during parsing.

  sql/sql_class.cc
    1.105.4.1 03/08/19 00:08:02 monty@mashka.mysql.fi +53 -0
    Added convert_string() for more efficient alloc+character-set convert of strings
    Add cached flags to avoid calling mysql_charset_same() during parsing.

  sql/sql_acl.cc
    1.74.2.5 03/08/19 00:08:02 monty@mashka.mysql.fi +9 -7
    After merge fix
    Code cleanup

  sql/slave.cc
    1.188.5.3 03/08/19 00:08:02 monty@mashka.mysql.fi +4 -4
    After merge fix

  sql/set_var.h
    1.29.3.3 03/08/19 00:08:02 monty@mashka.mysql.fi +21 -17
    Fixed wrong usage of base_names (like medium.key_buffer) that caused core dumps

  sql/set_var.cc
    1.34.14.2 03/08/19 00:08:02 monty@mashka.mysql.fi +82 -38
    Code cleanup
    Fixed wrong usage of base_names (like medium.key_buffer) that caused core dumps

  sql/opt_range.cc
    1.90.1.5 03/08/19 00:08:02 monty@mashka.mysql.fi +1 -1
    After merge fix

  sql/mysqld.cc
    1.356.21.2 03/08/19 00:08:02 monty@mashka.mysql.fi +6 -2
    After merge fix

  sql/log_event.cc
    1.113.1.11 03/08/19 00:08:02 monty@mashka.mysql.fi +7 -7
    After merge fix

  sql/log.cc
    1.108.1.9 03/08/19 00:08:02 monty@mashka.mysql.fi +0 -3
    After merge fix

  sql/ha_myisammrg.h
    1.28 03/08/19 00:08:02 monty@mashka.mysql.fi +1 -2
    After merge fix

  sql/field.cc
    1.110.1.1 03/08/19 00:08:02 monty@mashka.mysql.fi +20 -10
    After merge fix
    Don't give warnings when storing data in fields in optimizer.

  sql-common/client.c
    1.20.1.1 03/08/19 00:08:02 monty@mashka.mysql.fi +83 -38
    After merge fix
    Change my_connect() to use poll()
    If character set is not given, use servers character set.

  scripts/make_win_src_distribution.sh
    1.2.1.1 03/08/19 00:08:02 monty@mashka.mysql.fi +1 -1
    after merge fixes

  mysql-test/t/warnings.test
    1.13 03/08/19 00:08:02 monty@mashka.mysql.fi +1 -0
    After merge fix

  mysql-test/t/variables.test
    1.18.1.4 03/08/19 00:08:02 monty@mashka.mysql.fi +1 -1
    After merge fix

  mysql-test/t/type_uint.test
    1.5 03/08/19 00:08:02 monty@mashka.mysql.fi +1 -0
    After merge fix

  mysql-test/t/type_ranges.test
    1.8 03/08/19 00:08:02 monty@mashka.mysql.fi +1 -0
    After merge fix

  mysql-test/t/type_decimal.test
    1.13 03/08/19 00:08:02 monty@mashka.mysql.fi +1 -0
    After merge fix

  mysql-test/t/subselect.test
    1.58.16.1 03/08/19 00:08:02 monty@mashka.mysql.fi +25 -26
    After merge fix

  mysql-test/t/row.test
    1.13 03/08/19 00:08:02 monty@mashka.mysql.fi +7 -7
    After merge fix

  mysql-test/t/myisam.test
    1.18 03/08/19 00:08:02 monty@mashka.mysql.fi +3 -0
    After merge fix

  mysql-test/t/lock_tables_lost_commit.test
    1.2 03/08/19 00:08:02 monty@mashka.mysql.fi +2 -0
    After merge fix

  mysql-test/t/lock_tables_lost_commit-master.opt
    1.2 03/08/19 00:08:02 monty@mashka.mysql.fi +1 -1
    After merge fix

  mysql-test/t/key_cache.test
    1.1.1.1 03/08/19 00:08:02 monty@mashka.mysql.fi +1 -1
    After merge fix

  mysql-test/t/key.test
    1.9 03/08/19 00:08:02 monty@mashka.mysql.fi +5 -4
    After merge fix

  mysql-test/t/insert_select.test
    1.9 03/08/19 00:08:02 monty@mashka.mysql.fi +0 -1
    After merge fix

  mysql-test/t/innodb.test
    1.45 03/08/19 00:08:02 monty@mashka.mysql.fi +1 -1
    After merge fix

  mysql-test/t/heap_hash.test
    1.3 03/08/19 00:08:02 monty@mashka.mysql.fi +1 -1
    After merge fix

  mysql-test/t/heap_btree.test
    1.8 03/08/19 00:08:02 monty@mashka.mysql.fi +1 -1
    After merge fix

  mysql-test/t/heap.test
    1.12 03/08/19 00:08:02 monty@mashka.mysql.fi +1 -1
    After merge fix

  mysql-test/t/handler.test
    1.14 03/08/19 00:08:02 monty@mashka.mysql.fi +2 -4
    After merge fix

  mysql-test/t/group_by.test
    1.23 03/08/19 00:08:01 monty@mashka.mysql.fi +1 -1
    After merge fix

  mysql-test/t/grant.test
    1.7 03/08/19 00:08:01 monty@mashka.mysql.fi +11 -5
    After merge fix

  mysql-test/t/func_test.test
    1.15 03/08/19 00:08:01 monty@mashka.mysql.fi +14 -16
    After merge fix

  mysql-test/t/func_str.test
    1.40 03/08/19 00:08:01 monty@mashka.mysql.fi +23 -23
    After merge fix

  mysql-test/t/func_set.test
    1.6 03/08/19 00:08:01 monty@mashka.mysql.fi +1 -1
    After merge fix

  mysql-test/t/func_in.test
    1.9 03/08/19 00:08:01 monty@mashka.mysql.fi +3 -3
    After merge fix

  mysql-test/t/drop.test
    1.13 03/08/19 00:08:01 monty@mashka.mysql.fi +1 -1
    After merge fix

  mysql-test/t/ctype_latin1_de.test
    1.12 03/08/19 00:08:01 monty@mashka.mysql.fi +4 -0
    After merge fix

  mysql-test/t/ctype_collate.test
    1.13 03/08/19 00:08:01 monty@mashka.mysql.fi +7 -8
    After merge fix

  mysql-test/t/case.test
    1.11 03/08/19 00:08:01 monty@mashka.mysql.fi +4 -4
    After merge fix

  mysql-test/t/auto_increment.test
    1.12 03/08/19 00:08:01 monty@mashka.mysql.fi +1 -0
    After merge fix

  mysql-test/r/warnings.result
    1.13 03/08/19 00:08:01 monty@mashka.mysql.fi +46 -45
    After merge fix

  mysql-test/r/union.result
    1.42 03/08/19 00:08:01 monty@mashka.mysql.fi +8 -1
    After merge fix

  mysql-test/r/type_uint.result
    1.6 03/08/19 00:08:01 monty@mashka.mysql.fi +2 -1
    After merge fix

  mysql-test/r/type_time.result
    1.7 03/08/19 00:08:01 monty@mashka.mysql.fi +3 -3
    After merge fix

  mysql-test/r/type_ranges.result
    1.20 03/08/19 00:08:01 monty@mashka.mysql.fi +34 -32
    After merge fix

  mysql-test/r/type_float.result
    1.15 03/08/19 00:08:01 monty@mashka.mysql.fi +2 -2
    After merge fix

  mysql-test/r/type_decimal.result
    1.16 03/08/19 00:08:01 monty@mashka.mysql.fi +56 -53
    After merge fix

  mysql-test/r/type_blob.result
    1.26 03/08/19 00:08:01 monty@mashka.mysql.fi +3 -3
    After merge fix

  mysql-test/r/subselect.result
    1.67.23.1 03/08/19 00:08:01 monty@mashka.mysql.fi +15 -14
    After merge fix

  mysql-test/r/select_safe.result
    1.10 03/08/19 00:08:01 monty@mashka.mysql.fi +7 -7
    After merge fix

  mysql-test/r/select.result
    1.31 03/08/19 00:08:01 monty@mashka.mysql.fi +28 -28
    After merge fix

  mysql-test/r/rpl_user_variables.result
    1.4 03/08/19 00:08:01 monty@mashka.mysql.fi +6 -6
    After merge fix

  mysql-test/r/rpl_rotate_logs.result
    1.43 03/08/19 00:08:01 monty@mashka.mysql.fi +2 -2
    After merge fix

  mysql-test/r/rpl_reset_slave.result
    1.2 03/08/19 00:08:01 monty@mashka.mysql.fi +10 -10
    After merge fix

  mysql-test/r/rpl_replicate_do.result
    1.15 03/08/19 00:08:01 monty@mashka.mysql.fi +1 -1
    After merge fix

  mysql-test/r/rpl_max_relay_size.result
    1.4 03/08/19 00:08:01 monty@mashka.mysql.fi +15 -15
    After merge fix

  mysql-test/r/rpl_log_pos.result
    1.31 03/08/19 00:08:01 monty@mashka.mysql.fi +2 -2
    After merge fix

  mysql-test/r/rpl_log.result
    1.41 03/08/19 00:08:01 monty@mashka.mysql.fi +1 -1
    After merge fix

  mysql-test/r/rpl_loaddata.result
    1.9 03/08/19 00:08:01 monty@mashka.mysql.fi +6 -6
    After merge fix

  mysql-test/r/rpl_ignore_grant.result
    1.2 03/08/19 00:08:01 monty@mashka.mysql.fi +3 -3
    After merge fix

  mysql-test/r/rpl_error_ignored_table.result
    1.3 03/08/19 00:08:01 monty@mashka.mysql.fi +5 -5
    After merge fix

  mysql-test/r/rpl_do_grant.result
    1.2 03/08/19 00:08:01 monty@mashka.mysql.fi +2 -2
    After merge fix

  mysql-test/r/order_by.result
    1.26 03/08/19 00:08:01 monty@mashka.mysql.fi +7 -7
    After merge fix

  mysql-test/r/null_key.result
    1.21 03/08/19 00:08:01 monty@mashka.mysql.fi +2 -2
    After merge fix

  mysql-test/r/null.result
    1.15 03/08/19 00:08:01 monty@mashka.mysql.fi +10 -10
    After merge fix

  mysql-test/r/myisam.result
    1.25 03/08/19 00:08:01 monty@mashka.mysql.fi +5 -32
    After merge fix

  mysql-test/r/loaddata.result
    1.5 03/08/19 00:08:01 monty@mashka.mysql.fi +10 -10
    After merge fix

  mysql-test/r/key_cache.result
    1.1.1.1 03/08/19 00:08:01 monty@mashka.mysql.fi +1 -1
    After merge fix

  mysql-test/r/key.result
    1.12 03/08/19 00:08:01 monty@mashka.mysql.fi +7 -10
    After merge fix

  mysql-test/r/join_outer.result
    1.21 03/08/19 00:08:01 monty@mashka.mysql.fi +1 -1
    After merge fix

  mysql-test/r/insert_select.result
    1.13 03/08/19 00:08:01 monty@mashka.mysql.fi +3 -4
    After merge fix

  mysql-test/r/insert.result
    1.12.1.2 03/08/19 00:08:00 monty@mashka.mysql.fi +3 -1
    After merge fix

  mysql-test/r/innodb.result
    1.70 03/08/19 00:08:00 monty@mashka.mysql.fi +37 -24
    After merge fix

  mysql-test/r/heap_hash.result
    1.7 03/08/19 00:08:00 monty@mashka.mysql.fi +2 -8
    After merge fix

  mysql-test/r/heap_btree.result
    1.13 03/08/19 00:08:00 monty@mashka.mysql.fi +1 -7
    After merge fix

  mysql-test/r/heap.result
    1.19 03/08/19 00:08:00 monty@mashka.mysql.fi +3 -9
    After merge fix

  mysql-test/r/handler.result
    1.14 03/08/19 00:08:00 monty@mashka.mysql.fi +2 -21
    After merge fix

  mysql-test/r/group_by.result
    1.32 03/08/19 00:08:00 monty@mashka.mysql.fi +1 -59
    After merge fix

  mysql-test/r/grant.result
    1.9 03/08/19 00:08:00 monty@mashka.mysql.fi +38 -2
    After merge fix

  mysql-test/r/func_test.result
    1.17 03/08/19 00:08:00 monty@mashka.mysql.fi +14 -14
    After merge fix

  mysql-test/r/func_str.result
    1.42 03/08/19 00:08:00 monty@mashka.mysql.fi +2 -4
    After merge fix

  mysql-test/r/func_gconcat.result
    1.13 03/08/19 00:08:00 monty@mashka.mysql.fi +2 -2
    After merge fix

  mysql-test/r/fulltext.result
    1.44 03/08/19 00:08:00 monty@mashka.mysql.fi +46 -0
    After merge fix

  mysql-test/r/drop.result
    1.15 03/08/19 00:08:00 monty@mashka.mysql.fi +1 -5
    After merge fix

  mysql-test/r/distinct.result
    1.26 03/08/19 00:08:00 monty@mashka.mysql.fi +2 -2
    After merge fix

  mysql-test/r/ctype_latin1_de.result
    1.12 03/08/19 00:08:00 monty@mashka.mysql.fi +3 -0
    After merge fix

  mysql-test/r/create.result
    1.43 03/08/19 00:08:00 monty@mashka.mysql.fi +3 -3
    After merge fix

  mysql-test/r/auto_increment.result
    1.16 03/08/19 00:08:00 monty@mashka.mysql.fi +4 -3
    After merge fix

  libmysqld/Makefile.am
    1.29.1.8 03/08/19 00:08:00 monty@mashka.mysql.fi +2 -1
    After merge fix

  libmysql/libmysql.c
    1.156.7.2 03/08/19 00:08:00 monty@mashka.mysql.fi +1 -2
    After merge fix

  include/mysql_com.h
    1.67.5.1 03/08/19 00:08:00 monty@mashka.mysql.fi +2 -2
    After merge fix

  include/my_global.h
    1.47.2.2 03/08/19 00:08:00 monty@mashka.mysql.fi +0 -3
    Remove size_str (we already have size_s)

  include/m_ctype.h
    1.71 03/08/19 00:08:00 monty@mashka.mysql.fi +1 -1
    After merge fix

  heap/hp_create.c
    1.12 03/08/19 00:08:00 monty@mashka.mysql.fi +1 -0
    After merge fix

  client/mysqltest.c
    1.92.1.11 03/08/19 00:08:00 monty@mashka.mysql.fi +13 -10
    Code cleanup (merge identical code)
    More debug messages

  client/mysql.cc
    1.121.1.20 03/08/19 00:08:00 monty@mashka.mysql.fi +7 -2
    Use server character set if --default-character-set is not used

  BitKeeper/deleted/.del-make_win_src_distribution.old~5c9ebdc4a852b43b
    1.12 03/08/19 00:06:55 monty@mashka.mysql.fi +0 -0
    Delete: scripts/make_win_src_distribution.old

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.1546.75.3 03/08/18 17:27:09 bar@bar.mysql.r18.ru +2 -0
  Adding Gerogian GEOSTD8 character set

  sql/share/charsets/geostd8.xml
    1.1 03/08/18 17:27:07 bar@bar.mysql.r18.ru +121 -0

  sql/share/charsets/geostd8.xml
    1.0 03/08/18 17:27:07 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/geostd8.xml

  sql/share/charsets/Index.xml
    1.28 03/08/18 17:27:07 bar@bar.mysql.r18.ru +8 -1
    Adding Gerogian GEOSTD8 character set

ChangeSet
  1.1546.75.2 03/08/18 17:24:50 bar@bar.mysql.r18.ru +11 -0
  Fix strnxfrm_multiplye from 0 to 1 for charsets that do not use strnxfrm

  strings/ctype-utf8.c
    1.49 03/08/18 17:24:48 bar@bar.mysql.r18.ru +1 -1
    Fix strnxfrm_multiplye from 0 to 1 for charsets that do not use strnxfrm

  strings/ctype-ujis.c
    1.41 03/08/18 17:24:48 bar@bar.mysql.r18.ru +2 -2
    Fix strnxfrm_multiplye from 0 to 1 for charsets that do not use strnxfrm

  strings/ctype-ucs2.c
    1.7 03/08/18 17:24:48 bar@bar.mysql.r18.ru +1 -1
    Fix strnxfrm_multiplye from 0 to 1 for charsets that do not use strnxfrm

  strings/ctype-tis620.c
    1.48 03/08/18 17:24:48 bar@bar.mysql.r18.ru +1 -1
    Fix strnxfrm_multiplye from 0 to 1 for charsets that do not use strnxfrm

  strings/ctype-sjis.c
    1.47 03/08/18 17:24:48 bar@bar.mysql.r18.ru +1 -1
    Fix strnxfrm_multiplye from 0 to 1 for charsets that do not use strnxfrm

  strings/ctype-latin1.c
    1.15 03/08/18 17:24:48 bar@bar.mysql.r18.ru +2 -2
    Fix strnxfrm_multiplye from 0 to 1 for charsets that do not use strnxfrm

  strings/ctype-gbk.c
    1.42 03/08/18 17:24:48 bar@bar.mysql.r18.ru +1 -1
    Fix strnxfrm_multiplye from 0 to 1 for charsets that do not use strnxfrm

  strings/ctype-gb2312.c
    1.38 03/08/18 17:24:48 bar@bar.mysql.r18.ru +2 -2
    Fix strnxfrm_multiplye from 0 to 1 for charsets that do not use strnxfrm

  strings/ctype-euc_kr.c
    1.41 03/08/18 17:24:47 bar@bar.mysql.r18.ru +2 -2
    Fix strnxfrm_multiplye from 0 to 1 for charsets that do not use strnxfrm

  strings/ctype-bin.c
    1.31 03/08/18 17:24:47 bar@bar.mysql.r18.ru +1 -1
    Fix strnxfrm_multiplye from 0 to 1 for charsets that do not use strnxfrm

  strings/ctype-big5.c
    1.42 03/08/18 17:24:47 bar@bar.mysql.r18.ru +1 -1
    Fix strnxfrm_multiplye from 0 to 1 for charsets that do not use strnxfrm

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

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

ChangeSet
  1.1346.317.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.218.30.2 03/08/17 14:10:43 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.318.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.76.1.33 03/08/17 14:10:13 monty@narttu.mysql.fi +5 -7
    Fix mutex handling in SHOW_VARIABLES

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

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

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

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

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

ChangeSet
  1.1346.317.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.29.1.1 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.1563.2.10 03/08/16 13:26:48 bell@laptop.sanja.is.com.ua +12 -0
  Code cleanup

  sql/sql_update.cc
    1.83.4.2 03/08/16 13:26:42 bell@laptop.sanja.is.com.ua +1 -2
    setup_ref_array moved to st_select_lex class

  sql/sql_union.cc
    1.74.5.5 03/08/16 13:26:42 bell@laptop.sanja.is.com.ua +3 -5
    setup_ref_array moved to st_select_lex class

  sql/sql_table.cc
    1.157.9.3 03/08/16 13:26:42 bell@laptop.sanja.is.com.ua +1 -2
    setup_ref_array moved to st_select_lex class

  sql/sql_select.cc
    1.216.1.25 03/08/16 13:26:42 bell@laptop.sanja.is.com.ua +1 -17
    setup_ref_array moved to st_select_lex class

  sql/sql_lex.h
    1.102.1.28 03/08/16 13:26:42 bell@laptop.sanja.is.com.ua +1 -0
    setup_ref_array moved to st_select_lex class

  sql/sql_lex.cc
    1.86 03/08/16 13:26:42 bell@laptop.sanja.is.com.ua +12 -2
    removed double initialisation
    select_n_having_items moved to any query initializations, because it used in setup_ref_array method
    setup_ref_array moved to st_select_lex class

  sql/sql_derived.cc
    1.43.1.8 03/08/16 13:26:42 bell@laptop.sanja.is.com.ua +3 -5
    setup_ref_array moved to st_select_lex class

  sql/sql_delete.cc
    1.99.2.9 03/08/16 13:26:42 bell@laptop.sanja.is.com.ua +1 -2
    setup_ref_array moved to st_select_lex class

  sql/mysql_priv.h
    1.186.17.4 03/08/16 13:26:42 bell@laptop.sanja.is.com.ua +0 -1
    setup_ref_array moved to st_select_lex class

  sql/item_subselect.cc
    1.60.8.4 03/08/16 13:26:42 bell@laptop.sanja.is.com.ua +7 -5
    replaced Item_ref_on_list_position (which need erly ref_array initialisation)

  sql/item.h
    1.56.1.27 03/08/16 13:26:42 bell@laptop.sanja.is.com.ua +0 -27
    As far as now transformer called after setup_wild() it is impossible to have '*' Item

  sql/item.cc
    1.58.18.5 03/08/16 13:26:41 bell@laptop.sanja.is.com.ua +0 -14
    As far as now transformer called after setup_wild() it is impossible to have '*' Item

ChangeSet
  1.1563.2.9 03/08/16 02:04:29 bell@laptop.sanja.is.com.ua +4 -0
  As far as now transformer called after setup_wild() it is impossible to have '*'

  sql/item_subselect.h
    1.34.1.2 03/08/16 02:04:24 bell@laptop.sanja.is.com.ua +0 -1
    As far as now transformer called after setup_wild() it is impossible to have '*'

  sql/item_subselect.cc
    1.60.8.3 03/08/16 02:04:24 bell@laptop.sanja.is.com.ua +3 -34
    As far as now transformer called after setup_wild() it is impossible to have '*'

  sql/item.h
    1.56.1.26 03/08/16 02:04:24 bell@laptop.sanja.is.com.ua +10 -26
    As far as now transformer called after setup_wild() it is impossible to have '*'

  sql/item.cc
    1.58.18.4 03/08/16 02:04:24 bell@laptop.sanja.is.com.ua +0 -53
    As far as now transformer called after setup_wild() it is impossible to have '*'

ChangeSet
  1.1346.317.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.107.1.41 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.1346.316.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.152.1.98 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.51.1.62 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.54.1.28 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.4.1.4 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.5.1.3 03/08/15 09:54:16 monty@mashka.mysql.fi +3 -0
    Extra test to catch wrong packet bug

  include/config-win.h
    1.23.1.8 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.1546.75.1 03/08/14 13:19:17 kostja@oak.local +1 -0
  added compile-pentium-maintainer -
  equivalent of compile-pentium-debug but with
  --enable-maintainer-mode configure option
  Maybe it's worth to merge compile-mentium-debug
  and compile-pentium-maintainer to a single script

  BUILD/compile-pentium-maintainer
    1.1 03/08/14 13:19:05 kostja@oak.local +13 -0

  BUILD/compile-pentium-maintainer
    1.0 03/08/14 13:19:05 kostja@oak.local +0 -0
    BitKeeper file /home/kostja/mysql/mysql-4.1-cpm/BUILD/compile-pentium-maintainer

ChangeSet
  1.1346.283.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.8.1.4 03/08/13 19:30:43 gweir@build.mysql.com +1 -1
    Create both Windows source packages

ChangeSet
  1.1346.283.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.1346.283.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.1346.283.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

  BitKeeper/deleted/.del-convert.test~f4ceb743194dfe72
    1.2 03/08/13 13:31:23 monty@mashka.mysql.fi +0 -0
    Delete: mysql-test/t/convert.test

  BitKeeper/deleted/.del-convert.result~a3b56e1db6f498e9
    1.2 03/08/13 13:31:23 monty@mashka.mysql.fi +0 -0
    Delete: mysql-test/r/convert.result

ChangeSet
  1.1346.316.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.152.1.97 03/08/13 13:26:47 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1563.2.8 03/08/13 10:12:41 bell@sanja.is.com.ua +5 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1

  sql/sql_union.cc
    1.74.5.4 03/08/13 10:12:38 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.h
    1.53 03/08/13 10:12:38 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.1.24 03/08/13 10:12:38 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_derived.cc
    1.43.1.7 03/08/13 10:12:38 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_sum.cc
    1.82.1.3 03/08/13 10:12:38 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.316.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.8.1.3 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.1346.315.6 03/08/13 07:12:08 lenz@mysql.com +1 -0
  Fixed typo in the Boostrap strip

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

ChangeSet
  1.1346.283.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.1346.283.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.206.1.78 03/08/13 02:13:45 gweir@build.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

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

ChangeSet
  1.1346.283.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.1346.315.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.49.1.4 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.74.1.3 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.1546.73.5 03/08/12 23:45:53 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1

  sql/sql_cache.cc
    1.46.3.1 03/08/12 23:45:50 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1538.71.1 03/08/12 23:45:04 bell@sanja.is.com.ua +3 -0
  fixed query cache intercommunication with innodb engine

  sql/sql_cache.h
    1.20.1.1 03/08/12 23:44:54 bell@sanja.is.com.ua +2 -0
    fixed query cache intercommunication with innodb engine

  sql/sql_cache.cc
    1.46.2.1 03/08/12 23:44:54 bell@sanja.is.com.ua +42 -0
    fixed query cache intercommunication with innodb engine

  mysql-test/r/innodb_cache.result
    1.7 03/08/12 23:44:53 bell@sanja.is.com.ua +4 -4
    new results

ChangeSet
  1.1546.28.50 03/08/12 19:44:13 serg@serg.mylan +2 -0
  Merge bk-internal:/home/bk/mysql-4.1/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  sql/sql_yacc.yy
    1.203.63.2 03/08/12 19:44:09 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.12.17 03/08/12 19:44:09 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1346.315.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.8.1.1 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.1563.2.7 03/08/12 18:51:49 bell@sanja.is.com.ua +2 -0
  after merge fix

  mysql-test/t/subselect.test
    1.58.14.3 03/08/12 18:51:47 bell@sanja.is.com.ua +3 -0
    after merge fix

  mysql-test/r/subselect.result
    1.67.21.4 03/08/12 18:51:47 bell@sanja.is.com.ua +12 -12
    after merge fix

ChangeSet
  1.1563.2.6 03/08/12 17:48:58 bell@sanja.is.com.ua +7 -0
  merge

  sql/sql_union.cc
    1.74.5.3 03/08/12 17:48:56 bell@sanja.is.com.ua +1 -2
    merge

  mysql-test/t/subselect.test
    1.58.14.2 03/08/12 17:48:56 bell@sanja.is.com.ua +12 -15
    merge

  mysql-test/r/subselect.result
    1.67.21.3 03/08/12 17:48:56 bell@sanja.is.com.ua +0 -0
    merge

  sql/sql_yacc.yy
    1.203.61.3 03/08/12 17:44:20 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.1.13 03/08/12 17:44:20 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.99.1.4 03/08/12 17:44:20 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.56.1.25 03/08/12 17:44:20 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1546.73.3 03/08/12 17:40:11 bell@sanja.is.com.ua +1 -0
  fixed layout

  sql/sql_yacc.yy
    1.203.64.2 03/08/12 17:39:59 bell@sanja.is.com.ua +2 -1
    fixed layout

ChangeSet
  1.1346.315.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.80.1.25 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.1346.311.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.1346.311.4 03/08/12 15:28:36 serg@serg.mylan +2 -0
  snprintf compatibility fix

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

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

ChangeSet
  1.1546.74.1 03/08/12 15:04:49 bell@sanja.is.com.ua +8 -0
  fixed problem with reference on derived table fields (BUG#1031)

  sql/sql_update.cc
    1.83.4.1 03/08/12 15:04:35 bell@sanja.is.com.ua +2 -1
    'alias' parameter added to create_tmp_table

  sql/sql_union.cc
    1.74.2.10 03/08/12 15:04:35 bell@sanja.is.com.ua +1 -1
    'alias' parameter added to create_tmp_table

  sql/sql_select.h
    1.47.1.2 03/08/12 15:04:35 bell@sanja.is.com.ua +2 -1
    'alias' parameter added to create_tmp_table

  sql/sql_select.cc
    1.216.26.1 03/08/12 15:04:35 bell@sanja.is.com.ua +7 -7
    'alias' parameter added to create_tmp_table

  sql/sql_derived.cc
    1.43.2.5 03/08/12 15:04:35 bell@sanja.is.com.ua +2 -1
    Derived table should be named (to pass it name to Field and then to Item_field)

  sql/item_sum.cc
    1.78.2.4 03/08/12 15:04:35 bell@sanja.is.com.ua +3 -2
    'alias' parameter added to create_tmp_table

  mysql-test/t/derived.test
    1.23 03/08/12 15:04:35 bell@sanja.is.com.ua +5 -1
    test of BUG#1031

  mysql-test/r/derived.result
    1.25 03/08/12 15:04:35 bell@sanja.is.com.ua +4 -0
    test of BUG#1031

ChangeSet
  1.1346.315.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.8.1.1 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.1546.73.2 03/08/12 16:42:52 bar@bar.mysql.r18.ru +3 -0
  LIKE didn't work with non-default charset

  sql/item_cmpfunc.cc
    1.87.7.1 03/08/12 16:42:50 bar@bar.mysql.r18.ru +1 -1
    LIKE didn't work with non-default charset

  mysql-test/t/func_like.test
    1.9 03/08/12 16:42:50 bar@bar.mysql.r18.ru +20 -0
    LIKE didn't work with non-default charset

  mysql-test/r/func_like.result
    1.9 03/08/12 16:42:50 bar@bar.mysql.r18.ru +67 -0
    LIKE didn't work with non-default charset

ChangeSet
  1.1567 03/08/12 12:38:03 bell@sanja.is.com.ua +6 -0
  optimisation of independent ALL/ANY with aggregate function (WL#1115) (SCRUM)

  sql/sql_class.h
    1.146.16.1 03/08/12 12:37:51 bell@sanja.is.com.ua +16 -0
    class for collaction result for max/min subquery

  sql/sql_class.cc
    1.105.3.1 03/08/12 12:37:51 bell@sanja.is.com.ua +89 -0
    class for collaction result for max/min subquery

  sql/item_subselect.h
    1.37 03/08/12 12:37:51 bell@sanja.is.com.ua +10 -0
    special subselect to finding max/min of returned values

  sql/item_subselect.cc
    1.60.1.14 03/08/12 12:37:51 bell@sanja.is.com.ua +55 -31
    special subselect to finding max/min of returned values
    optimisation of independent ALL/ANY with aggregate function

  mysql-test/t/subselect.test
    1.58.1.22 03/08/12 12:37:51 bell@sanja.is.com.ua +6 -0
    test of new optimisation

  mysql-test/r/subselect.result
    1.67.1.21 03/08/12 12:37:51 bell@sanja.is.com.ua +9 -0
    test of new optimisation

ChangeSet
  1.1546.2.22 03/08/11 22:44:43 monty@mashka.mysql.fi +235 -0
  Merge with 4.0.14

  vio/Makefile.am
    1.12 03/08/11 22:44:35 monty@mashka.mysql.fi +2 -2
    merge with 4.0

  sql/sql_yacc.yy
    1.203.65.1 03/08/11 22:44:35 monty@mashka.mysql.fi +52 -67
    merge with 4.0
    Removed end space to make merge easier

  sql/sql_union.cc
    1.74.7.1 03/08/11 22:44:35 monty@mashka.mysql.fi +5 -8
    Merge with 4.0
    Note that I couldn't find out how to merge OPTION_FOUND_ROWS handling so this has to be fixed later

  sql/sql_table.cc
    1.157.10.1 03/08/11 22:44:34 monty@mashka.mysql.fi +3 -4
    merge with 4.0

  sql/sql_select.cc
    1.216.25.1 03/08/11 22:44:34 monty@mashka.mysql.fi +2 -7
    merge with 4.0

  sql/sql_repl.cc
    1.102.1.6 03/08/11 22:44:34 monty@mashka.mysql.fi +41 -44
    merge with 4.0

  sql/sql_parse.cc
    1.271.21.1 03/08/11 22:44:34 monty@mashka.mysql.fi +39 -15
    merge with 4.0

  sql/sql_lex.h
    1.102.21.1 03/08/11 22:44:34 monty@mashka.mysql.fi +2 -2
    merge with 4.0

  sql/sql_lex.cc
    1.80.3.5 03/08/11 22:44:34 monty@mashka.mysql.fi +0 -1
    merge with 4.0

  sql/sql_handler.cc
    1.39 03/08/11 22:44:34 monty@mashka.mysql.fi +0 -17
    merge with 4.0

  sql/sql_class.h
    1.146.15.1 03/08/11 22:44:34 monty@mashka.mysql.fi +5 -28
    merge with 4.0

  sql/sql_cache.cc
    1.46.1.5 03/08/11 22:44:34 monty@mashka.mysql.fi +3 -4
    merge with 4.0

  sql/sql_acl.h
    1.19.1.2 03/08/11 22:44:34 monty@mashka.mysql.fi +0 -0
    merge with 4.0

  sql/sql_acl.cc
    1.74.2.4 03/08/11 22:44:34 monty@mashka.mysql.fi +48 -90
    merge with 4.0
    Some end space removal to make it easier to do future merges

  sql/slave.h
    1.62.1.2 03/08/11 22:44:34 monty@mashka.mysql.fi +2 -2
    merge with 4.0

  sql/slave.cc
    1.188.5.2 03/08/11 22:44:34 monty@mashka.mysql.fi +17 -18
    Merge + some indentation fixes

  sql/share/ukrainian/errmsg.txt
    1.27.6.5 03/08/11 22:44:34 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/share/swedish/errmsg.txt
    1.64.7.6 03/08/11 22:44:34 monty@mashka.mysql.fi +2 -2
    merge with 4.0

  sql/share/spanish/errmsg.txt
    1.64.7.6 03/08/11 22:44:34 monty@mashka.mysql.fi +2 -4
    merge with 4.0

  sql/share/slovak/errmsg.txt
    1.64.7.6 03/08/11 22:44:34 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/share/russian/errmsg.txt
    1.61.6.5 03/08/11 22:44:34 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/share/romanian/errmsg.txt
    1.62.7.6 03/08/11 22:44:34 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/share/portuguese/errmsg.txt
    1.64.7.4 03/08/11 22:44:34 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/share/polish/errmsg.txt
    1.63.6.6 03/08/11 22:44:34 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/share/norwegian/errmsg.txt
    1.63.7.6 03/08/11 22:44:34 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/share/norwegian-ny/errmsg.txt
    1.63.7.6 03/08/11 22:44:34 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/share/korean/errmsg.txt
    1.63.6.5 03/08/11 22:44:34 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/share/japanese/errmsg.txt
    1.63.6.5 03/08/11 22:44:34 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/share/italian/errmsg.txt
    1.70.7.6 03/08/11 22:44:34 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/share/hungarian/errmsg.txt
    1.65.6.6 03/08/11 22:44:34 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/share/greek/errmsg.txt
    1.64.6.6 03/08/11 22:44:34 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/share/german/errmsg.txt
    1.64.7.6 03/08/11 22:44:34 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/share/french/errmsg.txt
    1.63.7.6 03/08/11 22:44:34 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/share/estonian/errmsg.txt
    1.64.6.6 03/08/11 22:44:34 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/share/english/errmsg.txt
    1.70.9.8 03/08/11 22:44:34 monty@mashka.mysql.fi +2 -3
    merge with 4.0

  sql/share/dutch/errmsg.txt
    1.66.7.6 03/08/11 22:44:33 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/share/danish/errmsg.txt
    1.62.7.7 03/08/11 22:44:33 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/share/czech/errmsg.txt
    1.64.7.5 03/08/11 22:44:33 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/set_var.h
    1.29.3.2 03/08/11 22:44:33 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/set_var.cc
    1.34.14.1 03/08/11 22:44:33 monty@mashka.mysql.fi +11 -17
    merge with 4.0

  sql/repl_failsafe.cc
    1.32.1.1 03/08/11 22:44:33 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/mysqld.cc
    1.356.21.1 03/08/11 22:44:33 monty@mashka.mysql.fi +44 -69
    merge with 4.0

  sql/mysql_priv.h
    1.186.22.2 03/08/11 22:44:33 monty@mashka.mysql.fi +5 -1
    merge with 4.0

  sql/log_event.h
    1.87 03/08/11 22:44:33 monty@mashka.mysql.fi +1 -8
    merge with 4.0

  sql/log_event.cc
    1.113.1.10 03/08/11 22:44:33 monty@mashka.mysql.fi +187 -268
    Merge with 4.0
    Cleanups:
    - Indentation
    - #endif comments
    - Replace strmov() with *pos++= for two byte strings
    - Moved variable declarations to start of functions
    - Merged identical code (LOAD_EVENT)
    - Added casts when subtracting pointers
    Did a full diff between this and 4.0 to ensure that the file is correct after merge.
    

  sql/log.cc
    1.108.1.8 03/08/11 22:44:33 monty@mashka.mysql.fi +4 -12
    merge with 4.0

  sql/lex.h
    1.82.15.1 03/08/11 22:44:33 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  sql/item_timefunc.h
    1.33.1.1 03/08/11 22:44:33 monty@mashka.mysql.fi +0 -0
    merge with 4.0

  sql/item_strfunc.cc
    1.126.1.10 03/08/11 22:44:33 monty@mashka.mysql.fi +10 -15
    merge with 4.0
    Fixed null handling with ELT()

  sql/item_func.h
    1.68.3.7 03/08/11 22:44:33 monty@mashka.mysql.fi +0 -0
    merge with 4.0

  sql/item_cmpfunc.h
    1.50.3.7 03/08/11 22:44:33 monty@mashka.mysql.fi +7 -9
    merge with 4.0

  sql/item_cmpfunc.cc
    1.87.6.11 03/08/11 22:44:33 monty@mashka.mysql.fi +7 -15
    merge with 4.0

  sql/ha_innodb.cc
    1.90.1.5 03/08/11 22:44:33 monty@mashka.mysql.fi +8 -11
    merge with 4.0

  sql/field.h
    1.75.1.1 03/08/11 22:44:33 monty@mashka.mysql.fi +1 -4
    merge with 4.0

ChangeSet
  1.1546.72.1 03/08/11 23:43:01 dlenev@dlenev.mshome +11 -0
  Implemented UTC_TIME, UTC_DATE and UTC_TIMESTAMP functions (WL#345)

  sql/sql_yacc.yy
    1.203.64.1 03/08/11 23:42:42 dlenev@mysql.com +14 -5
    Added UTC_* functions to grammar. Current functions are using 
    classes now. 

  sql/lex.h
    1.82.14.2 03/08/11 23:42:42 dlenev@mysql.com +3 -0
    Added tokens for UTC_TIME, UTC_DATE and UTC_TIMESTAMP

  sql/item_timefunc.h
    1.34 03/08/11 23:42:42 dlenev@mysql.com +75 -5
    Generalized classes for CURDATE, CURTIME and NOW, abstracted them from
    timezone. Added new children classes for implementing these and UTC_*
    functions.

  sql/item_timefunc.cc
    1.39.1.1 03/08/11 23:42:42 dlenev@mysql.com +105 -43
    Generalized classes for CURDATE, CURTIME and NOW, abstracted them from
    timezone. Added new children classes for implementing these and UTC_*
    functions.

  mysys/my_thr_init.c
    1.22 03/08/11 23:42:42 dlenev@mysql.com +3 -3
    Now we also need LOCK_locktime_r if gmtime_r is absent

  mysys/my_pthread.c
    1.37.1.1 03/08/11 23:42:42 dlenev@mysql.com +20 -1
    Our implementation of gmtime_r

  mysql-test/t/func_time.test
    1.17.1.1 03/08/11 23:42:42 dlenev@mysql.com +9 -0
    Added UTC_* functions to test

  mysql-test/r/func_time.result
    1.19.1.1 03/08/11 23:42:42 dlenev@mysql.com +18 -0
    Added UTC_* functions to test

  include/my_pthread.h
    1.65.1.1 03/08/11 23:42:42 dlenev@mysql.com +9 -0
    Use our imeplementation of gmtime_r if system lacks one

  include/config-os2.h
    1.5 03/08/11 23:42:42 dlenev@mysql.com +3 -0
    Supposing that OS/2 have gmtime_r

  configure.in
    1.201.5.1 03/08/11 23:42:41 dlenev@mysql.com +1 -1
    ./configure now tests if gmtime_r is present

  scripts/mysql_fix_privilege_tables.sh
    1.16 03/08/11 22:28:01 monty@mashka.mysql.fi +2 -3
    merge with 4.0 (Add quoting for some variables)

  mysys/charset.c
    1.98 03/08/11 22:28:01 monty@mashka.mysql.fi +0 -1
    merge with 4.0

  mysql-test/t/union.test
    1.39 03/08/11 22:28:01 monty@mashka.mysql.fi +7 -2
    merge with 4.0

  mysql-test/t/symlink.test
    1.5 03/08/11 22:28:01 monty@mashka.mysql.fi +1 -3
    merge with 4.0

  mysql-test/t/select.test
    1.19 03/08/11 22:28:01 monty@mashka.mysql.fi +2 -2
    merge with 4.0

  mysql-test/t/rpl_rotate_logs.test
    1.44 03/08/11 22:28:01 monty@mashka.mysql.fi +6 -5
    merge with 4.0

  mysql-test/t/rpl_loaddata.test
    1.7 03/08/11 22:28:01 monty@mashka.mysql.fi +7 -18
    merge with 4.0

  mysql-test/t/rpl_flush_log_loop.test
    1.4 03/08/11 22:28:01 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  mysql-test/t/query_cache.test
    1.24.1.2 03/08/11 22:28:01 monty@mashka.mysql.fi +0 -1
    merge with 4.0

  mysql-test/t/merge.test
    1.24 03/08/11 22:28:01 monty@mashka.mysql.fi +0 -0
    merge with 4.0

  mysql-test/t/insert_select.test
    1.8 03/08/11 22:28:01 monty@mashka.mysql.fi +1 -9
    merge with 4.0

  mysql-test/t/insert.test
    1.11.1.1 03/08/11 22:28:01 monty@mashka.mysql.fi +0 -1
    merge with 4.0

  mysql-test/t/innodb.test
    1.44 03/08/11 22:28:01 monty@mashka.mysql.fi +48 -5
    Add back EXPLAIN and SHOW KEYS statements, but make them independent of number of rows returned by InnoDB

  mysql-test/t/grant_cache.test
    1.5 03/08/11 22:28:01 monty@mashka.mysql.fi +2 -4
    merge with 4.0

  mysql-test/t/grant.test
    1.6 03/08/11 22:28:01 monty@mashka.mysql.fi +1 -4
    merge with 4.0

  mysql-test/t/func_test.test
    1.14 03/08/11 22:28:01 monty@mashka.mysql.fi +0 -0
    merge with 4.0

  mysql-test/t/func_str.test
    1.39 03/08/11 22:28:01 monty@mashka.mysql.fi +21 -26
    merge with 4.0

  mysql-test/t/func_set.test
    1.5 03/08/11 22:28:01 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  mysql-test/t/fulltext.test
    1.40 03/08/11 22:28:01 monty@mashka.mysql.fi +3 -0
    merge with 4.0

  mysql-test/t/flush.test
    1.14 03/08/11 22:28:01 monty@mashka.mysql.fi +0 -2
    merge with 4.0

  mysql-test/t/drop.test
    1.12 03/08/11 22:28:01 monty@mashka.mysql.fi +0 -0
    merge with 4.0

  mysql-test/t/distinct.test
    1.13 03/08/11 22:28:01 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  mysql-test/t/create.test
    1.25 03/08/11 22:28:01 monty@mashka.mysql.fi +7 -7
    merge with 4.0

  mysql-test/t/alter_table.test
    1.17 03/08/11 22:28:01 monty@mashka.mysql.fi +0 -0
    merge with 4.0

  mysql-test/r/user_var.result
    1.11 03/08/11 22:28:01 monty@mashka.mysql.fi +2 -1
    May need to be fixed after merge

  mysql-test/r/union.result
    1.41 03/08/11 22:28:01 monty@mashka.mysql.fi +0 -0
    May need to be fixed after merge

  mysql-test/r/select.result
    1.30 03/08/11 22:28:01 monty@mashka.mysql.fi +9 -11
    May need to be fixed after merge

  mysql-test/r/rpl_rotate_logs.result
    1.42 03/08/11 22:28:01 monty@mashka.mysql.fi +2 -5
    May need to be fixed after merge

  mysql-test/r/rpl_log_pos.result
    1.30 03/08/11 22:28:01 monty@mashka.mysql.fi +0 -0
    May need to be fixed after merge

  mysql-test/r/rpl_log.result
    1.40 03/08/11 22:28:01 monty@mashka.mysql.fi +0 -0
    May need to be fixed after merge

  mysql-test/r/rpl_loaddata.result
    1.8 03/08/11 22:28:01 monty@mashka.mysql.fi +1 -0
    May need to be fixed after merge

  mysql-test/r/rpl_flush_log_loop.result
    1.7 03/08/11 22:28:01 monty@mashka.mysql.fi +1 -1
    May need to be fixed after merge

  mysql-test/r/query_cache.result
    1.26.1.2 03/08/11 22:28:01 monty@mashka.mysql.fi +0 -1
    May need to be fixed after merge

  mysql-test/r/order_by.result
    1.25 03/08/11 22:28:01 monty@mashka.mysql.fi +3 -6
    May need to be fixed after merge

  mysql-test/r/myisam.result
    1.24 03/08/11 22:28:01 monty@mashka.mysql.fi +3 -8
    May need to be fixed after merge

  mysql-test/r/merge.result
    1.26 03/08/11 22:28:01 monty@mashka.mysql.fi +1 -1
    May need to be fixed after merge

  mysql-test/r/key_diff.result
    1.10 03/08/11 22:28:01 monty@mashka.mysql.fi +1 -2
    May need to be fixed after merge

  mysql-test/r/insert_select.result
    1.12 03/08/11 22:28:01 monty@mashka.mysql.fi +0 -8
    May need to be fixed after merge

  mysql-test/r/insert.result
    1.12.1.1 03/08/11 22:28:01 monty@mashka.mysql.fi +0 -0
    May need to be fixed after merge

  mysql-test/r/innodb.result
    1.69 03/08/11 22:28:01 monty@mashka.mysql.fi +52 -4
    May need to be fixed after merge

  mysql-test/r/heap.result
    1.18 03/08/11 22:28:00 monty@mashka.mysql.fi +1 -2
    May need to be fixed after merge

  mysql-test/r/handler.result
    1.13 03/08/11 22:28:00 monty@mashka.mysql.fi +0 -0
    May need to be fixed after merge

  mysql-test/r/group_by.result
    1.31 03/08/11 22:28:00 monty@mashka.mysql.fi +2 -4
    May need to be fixed after merge

  mysql-test/r/grant.result
    1.8 03/08/11 22:28:00 monty@mashka.mysql.fi +0 -34
    May need to be fixed after merge

  mysql-test/r/func_test.result
    1.16 03/08/11 22:28:00 monty@mashka.mysql.fi +5 -5
    May need to be fixed after merge

  mysql-test/r/func_str.result
    1.41 03/08/11 22:28:00 monty@mashka.mysql.fi +23 -23
    May need to be fixed after merge

  mysql-test/r/func_set.result
    1.6 03/08/11 22:28:00 monty@mashka.mysql.fi +0 -0
    May need to be fixed after merge

  mysql-test/r/fulltext.result
    1.43 03/08/11 22:28:00 monty@mashka.mysql.fi +5 -46
    May need to be fixed after merge

  mysql-test/r/drop.result
    1.14 03/08/11 22:28:00 monty@mashka.mysql.fi +0 -0
    May need to be fixed after merge

  mysql-test/r/distinct.result
    1.25 03/08/11 22:28:00 monty@mashka.mysql.fi +6 -11
    May need to be fixed after merge

  mysql-test/r/create.result
    1.42 03/08/11 22:28:00 monty@mashka.mysql.fi +2 -2
    May need to be fixed after merge

  mysql-test/r/alter_table.result
    1.22 03/08/11 22:28:00 monty@mashka.mysql.fi +0 -0
    May need to be fixed after merge

  myisammrg/myrg_rkey.c
    1.16 03/08/11 22:28:00 monty@mashka.mysql.fi +0 -0
    merge with 4.0

  myisam/myisamchk.c
    1.92.3.1 03/08/11 22:28:00 monty@mashka.mysql.fi +5 -9
    merge with 4.0

  myisam/mi_open.c
    1.68 03/08/11 22:28:00 monty@mashka.mysql.fi +0 -2
    Remove 4.0 specific code

  libmysqld/lib_sql.cc
    1.59 03/08/11 22:28:00 monty@mashka.mysql.fi +1 -5
    merge with 4.0

  libmysql/libmysql.c
    1.156.7.1 03/08/11 22:28:00 monty@mashka.mysql.fi +1 -77
    Remove with 4.0 code that was ported from 4.1

  innobase/log/log0recv.c
    1.22 03/08/11 22:28:00 monty@mashka.mysql.fi +0 -0
    merge with 4.0

  innobase/ha/ha0ha.c
    1.6 03/08/11 22:28:00 monty@mashka.mysql.fi +2 -2
    merge with 4.0
    (Code should be same but we use indentaion from 4.0)

  include/mysqld_error.h
    1.61.7.2 03/08/11 22:28:00 monty@mashka.mysql.fi +37 -38
    merge with 4.0

  include/my_global.h
    1.47.2.1 03/08/11 22:28:00 monty@mashka.mysql.fi +0 -3
    merge with 4.0

  include/my_base.h
    1.43.1.1 03/08/11 22:28:00 monty@mashka.mysql.fi +1 -1
    merge with 4.0

  heap/hp_open.c
    1.17 03/08/11 22:28:00 monty@mashka.mysql.fi +0 -6
    merge with 4.0

  configure.in
    1.201.1.37 03/08/11 22:28:00 monty@mashka.mysql.fi +0 -1
    Keep 4.1 file

  client/mysqlbinlog.cc
    1.78 03/08/11 22:28:00 monty@mashka.mysql.fi +1 -260
    Merge with 4.0 in which we had added code from 4.1
    (We are basicly only using the 4.1 code here)

  acinclude.m4
    1.87 03/08/11 22:28:00 monty@mashka.mysql.fi +0 -12
    Merge with 4.0 (openssl patch)

  BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183
    1.66 03/08/11 22:28:00 monty@mashka.mysql.fi +1249 -12
    merge

  BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e
    1.31 03/08/11 22:28:00 monty@mashka.mysql.fi +91 -129
    merge

ChangeSet
  1.1546.71.1 03/08/11 20:48:51 bell@sanja.is.com.ua +4 -0
  fixed collation of Item_cache family (BUG#951)

  sql/item.h
    1.56.9.2 03/08/11 20:48:39 bell@sanja.is.com.ua +2 -0
    coping collation in the cache

  sql/item.cc
    1.58.10.12 03/08/11 20:48:39 bell@sanja.is.com.ua +1 -1
    coping collation in the cache

  mysql-test/t/subselect.test
    1.58.8.9 03/08/11 20:48:39 bell@sanja.is.com.ua +11 -0
    test of collation

  mysql-test/r/subselect.result
    1.67.14.8 03/08/11 20:48:39 bell@sanja.is.com.ua +7 -0
    test of collation

ChangeSet
  1.1546.28.48 03/08/11 18:18:34 bar@bar.mysql.r18.ru +11 -0
  Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a
  The above query created a field of koi8r charset, not cp1251
  
  Change:
  CREATE TABLE a (a CHAR(1) CHARACTER SET utf8) 
  Length now means character length, not byte length.
  The above creates a field that guarantees can store a multibyte value
  1 character long. For utf8 the above creates a field that can store
  3 bytes.

  mysql-test/t/ctype_mb.test
    1.1 03/08/11 18:18:31 bar@bar.mysql.r18.ru +8 -0

  mysql-test/r/ctype_mb.result
    1.1 03/08/11 18:18:31 bar@bar.mysql.r18.ru +21 -0

  sql/unireg.h
    1.27 03/08/11 18:18:31 bar@bar.mysql.r18.ru +6 -1
    Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a
    The above query created a field of koi8r charset, not cp1251
    
    Change:
    CREATE TABLE a (a CHAR(1) CHARACTER SET utf8) 
    Length now means character length, not byte length.
    The above creates a field that guarantees can store a multibyte value
    1 character long. For utf8 the above creates a field that can store
    3 bytes.

  sql/sql_table.cc
    1.157.9.2 03/08/11 18:18:31 bar@bar.mysql.r18.ru +30 -17
    Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a
    The above query created a field of koi8r charset, not cp1251
    
    Change:
    CREATE TABLE a (a CHAR(1) CHARACTER SET utf8) 
    Length now means character length, not byte length.
    The above creates a field that guarantees can store a multibyte value
    1 character long. For utf8 the above creates a field that can store
    3 bytes.

  sql/sql_parse.cc
    1.271.19.4 03/08/11 18:18:31 bar@bar.mysql.r18.ru +13 -3
    Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a
    The above query created a field of koi8r charset, not cp1251
    
    Change:
    CREATE TABLE a (a CHAR(1) CHARACTER SET utf8) 
    Length now means character length, not byte length.
    The above creates a field that guarantees can store a multibyte value
    1 character long. For utf8 the above creates a field that can store
    3 bytes.

  sql/item.h
    1.56.9.1 03/08/11 18:18:31 bar@bar.mysql.r18.ru +2 -2
    Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a
    The above query created a field of koi8r charset, not cp1251
    
    Change:
    CREATE TABLE a (a CHAR(1) CHARACTER SET utf8) 
    Length now means character length, not byte length.
    The above creates a field that guarantees can store a multibyte value
    1 character long. For utf8 the above creates a field that can store
    3 bytes.

  sql/field.h
    1.76 03/08/11 18:18:31 bar@bar.mysql.r18.ru +1 -0
    Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a
    The above query created a field of koi8r charset, not cp1251
    
    Change:
    CREATE TABLE a (a CHAR(1) CHARACTER SET utf8) 
    Length now means character length, not byte length.
    The above creates a field that guarantees can store a multibyte value
    1 character long. For utf8 the above creates a field that can store
    3 bytes.

  sql/field.cc
    1.111 03/08/11 18:18:31 bar@bar.mysql.r18.ru +22 -2
    Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a
    The above query created a field of koi8r charset, not cp1251
    
    Change:
    CREATE TABLE a (a CHAR(1) CHARACTER SET utf8) 
    Length now means character length, not byte length.
    The above creates a field that guarantees can store a multibyte value
    1 character long. For utf8 the above creates a field that can store
    3 bytes.

  mysql-test/t/ctype_recoding.test
    1.6 03/08/11 18:18:31 bar@bar.mysql.r18.ru +7 -0
    Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a
    The above query created a field of koi8r charset, not cp1251
    
    Change:
    CREATE TABLE a (a CHAR(1) CHARACTER SET utf8) 
    Length now means character length, not byte length.
    The above creates a field that guarantees can store a multibyte value
    1 character long. For utf8 the above creates a field that can store
    3 bytes.

  mysql-test/t/ctype_mb.test
    1.0 03/08/11 18:18:31 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/t/ctype_mb.test

  mysql-test/r/func_system.result
    1.12 03/08/11 18:18:31 bar@bar.mysql.r18.ru +3 -3
    Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a
    The above query created a field of koi8r charset, not cp1251
    
    Change:
    CREATE TABLE a (a CHAR(1) CHARACTER SET utf8) 
    Length now means character length, not byte length.
    The above creates a field that guarantees can store a multibyte value
    1 character long. For utf8 the above creates a field that can store
    3 bytes.

  mysql-test/r/ctype_mb.result
    1.0 03/08/11 18:18:31 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/r/ctype_mb.result

  mysql-test/r/ctype_recoding.result
    1.9 03/08/11 18:18:30 bar@bar.mysql.r18.ru +14 -0
    Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a
    The above query created a field of koi8r charset, not cp1251
    
    Change:
    CREATE TABLE a (a CHAR(1) CHARACTER SET utf8) 
    Length now means character length, not byte length.
    The above creates a field that guarantees can store a multibyte value
    1 character long. For utf8 the above creates a field that can store
    3 bytes.

ChangeSet
  1.1563.2.5 03/08/11 13:17:48 bell@sanja.is.com.ua +1 -0
  after merge fix

  sql/item.cc
    1.58.18.3 03/08/11 13:17:47 bell@sanja.is.com.ua +1 -1
    after merge fix

ChangeSet
  1.1565 03/08/11 12:00:33 bell@sanja.is.com.ua +8 -0
  merge

  mysql-test/t/subselect.test
    1.58.1.21 03/08/11 12:00:31 bell@sanja.is.com.ua +0 -2
    merge

  mysql-test/r/subselect.result
    1.67.1.20 03/08/11 12:00:31 bell@sanja.is.com.ua +0 -0
    merge

  sql/sql_yacc.yy
    1.203.56.6 03/08/11 11:58:34 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_union.cc
    1.74.1.9 03/08/11 11:58:34 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_sum.cc
    1.84 03/08/11 11:58:34 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.h
    1.36 03/08/11 11:58:34 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.cc
    1.60.1.13 03/08/11 11:58:34 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.101 03/08/11 11:58:34 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1563.2.4 03/08/11 11:57:37 bell@sanja.is.com.ua +3 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1

  sql/sql_select.cc
    1.216.1.23 03/08/11 11:57:34 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_sum.cc
    1.82.1.2 03/08/11 11:57:34 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.99.1.3 03/08/11 11:57:34 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1553.1.7 03/08/11 11:51:33 bell@sanja.is.com.ua +11 -0
  merge

  sql/item.cc
    1.58.18.2 03/08/11 11:51:31 bell@sanja.is.com.ua +1 -2
    merge

  sql/table.h
    1.52 03/08/11 11:49:20 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_union.cc
    1.74.5.2 03/08/11 11:49:20 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.22.3 03/08/11 11:49:20 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_derived.cc
    1.43.1.6 03/08/11 11:49:20 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_base.cc
    1.145.1.11 03/08/11 11:49:20 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_sum.cc
    1.80.1.2 03/08/11 11:49:20 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_strfunc.h
    1.63.1.4 03/08/11 11:49:20 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.124.1.20 03/08/11 11:49:20 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.99.2.1 03/08/11 11:49:20 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.56.1.24 03/08/11 11:49:20 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.313.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.145.20.1 03/08/10 05:14:13 monty@mashka.mysql.fi +1 -1
    Indentation cleanup

  sql/sql_select.cc
    1.152.20.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.218.30.1 03/08/10 05:14:13 monty@mashka.mysql.fi +2 -2
    Indentation fix

  sql/log_event.cc
    1.77.1.45 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.11.1.2 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.26.1.7 03/08/10 05:14:13 monty@mashka.mysql.fi +4 -1
    Test of load data ... ignore # lines

ChangeSet
  1.1346.283.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.206.1.77 03/08/10 05:40:09 wax@mysql.com +0 -0
    auto-union

ChangeSet
  1.1346.283.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.23.1.7 03/08/10 05:36:14 wax@mysql.com +0 -1
    remove HAVE_SETFILEPOINTER

ChangeSet
  1.1546.70.1 03/08/09 23:48:57 serg@serg.mylan +4 -0
  Merge bk-internal:/home/bk/mysql-4.1/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  sql/sql_yacc.yy
    1.203.63.1 03/08/09 23:48:42 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.12.16 03/08/09 23:48:41 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.17.3 03/08/09 23:48:41 serg@serg.mylan +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.115.6.1 03/08/09 23:48:41 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1546.1.12 03/08/09 12:57:39 igor@rurik.mysql.com +6 -0
  Merge rurik.mysql.com:/home/igor/mysql-4.1
  into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  sql/table.h
    1.48.5.1 03/08/09 12:57:35 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_table.cc
    1.157.2.12 03/08/09 12:57:35 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_base.cc
    1.145.10.1 03/08/09 12:57:35 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/set_var.h
    1.29.2.3 03/08/09 12:57:35 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/opt_range.cc
    1.93 03/08/09 12:57:35 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.115.1.6 03/08/09 12:57:35 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1546.1.11 03/08/09 11:12:22 igor@rurik.mysql.com +20 -0
  set_var.cc, mysqld.cc, handler.cc, set_var.h, handler.h:
    Added key cache parameters for midpoint insertion strategy
  Many files:
    Added midpoint insertion strategy for key cache
  mi_test2.c:
    Added a parameter to resize_key_cache

  sql/set_var.cc
    1.34.12.3 03/08/09 11:11:04 igor@rurik.mysql.com +57 -3
    Added key cache parameters for midpoint insertion strategy.

  sql/mysqld.cc
    1.356.17.4 03/08/09 11:10:51 igor@rurik.mysql.com +28 -9
    Added key cache parameters for midpoint insertion strategy.

  sql/handler.cc
    1.98 03/08/09 11:10:01 igor@rurik.mysql.com +10 -1
    Added key cache parameters for midpoint insertion strategy.

  sql/set_var.h
    1.29.2.2 03/08/09 11:08:08 igor@rurik.mysql.com +32 -1
    Added key cache parameters for midpoint insertion strategy.

  sql/handler.h
    1.84 03/08/09 11:06:38 igor@rurik.mysql.com +1 -0
    Added key cache parameters for midpoint insertion strategy.

  myisam/myisamdef.h
    1.59.1.6 03/08/09 11:00:16 igor@rurik.mysql.com +5 -4
    Added midpoint insertion strategy for key cache

  include/my_sys.h
    1.105 03/08/09 10:58:27 igor@rurik.mysql.com +12 -5
    Added midpoint insertion strategy for key cache

  isam/_page.c
    1.9 03/08/09 10:56:11 igor@rurik.mysql.com +6 -4
    Added midpoint insertion strategy for key cache

  myisam/mi_test2.c
    1.21 03/08/09 10:53:57 igor@rurik.mysql.com +1 -1
    Added a parameter to resize_key_cache

  myisam/rt_key.c
    1.6 03/08/09 10:53:42 igor@rurik.mysql.com +2 -1
    Added midpoint insertion strategy for key cache

  myisam/mi_write.c
    1.35 03/08/09 10:53:24 igor@rurik.mysql.com +14 -13
    Added midpoint insertion strategy for key cache

  myisam/mi_search.c
    1.39 03/08/09 10:52:57 igor@rurik.mysql.com +5 -5
    Added midpoint insertion strategy for key cache

  myisam/mi_preload.c
    1.5 03/08/09 10:52:29 igor@rurik.mysql.com +4 -2
    Added midpoint insertion strategy for key cache

  myisam/mi_delete.c
    1.23 03/08/09 10:52:06 igor@rurik.mysql.com +21 -19
    Added midpoint insertion strategy for key cache

  myisam/rt_split.c
    1.8 03/08/09 10:51:38 igor@rurik.mysql.com +4 -2
    Added midpoint insertion strategy for key cache

  myisam/rt_index.c
    1.9 03/08/09 10:51:19 igor@rurik.mysql.com +28 -21
    Added midpoint insertion strategy for key cache

  myisam/mi_range.c
    1.10 03/08/09 10:50:03 igor@rurik.mysql.com +1 -1
    Added midpoint insertion strategy for key cache

  myisam/mi_page.c
    1.16 03/08/09 10:49:43 igor@rurik.mysql.com +10 -8
    Added midpoint insertion strategy for key cache

  myisam/mi_check.c
    1.105.1.5 03/08/09 10:49:16 igor@rurik.mysql.com +14 -10
    Added midpoint insertion strategy for key cache

  mysys/mf_keycache.c
    1.29 03/08/09 10:45:34 igor@rurik.mysql.com +508 -126
    Added midpoint insertion strategy for key cache

ChangeSet
  1.1546.28.47 03/08/09 17:10:58 bell@sanja.is.com.ua +2 -0
  test for BUG#969

  mysql-test/t/derived.test
    1.22 03/08/09 17:10:57 bell@sanja.is.com.ua +16 -0
    test for BUG#969

  mysql-test/r/derived.result
    1.24 03/08/09 17:10:57 bell@sanja.is.com.ua +32 -0
    test for BUG#969

ChangeSet
  1.1546.28.46 03/08/09 16:53:23 bell@sanja.is.com.ua +3 -0
  merge

  mysql-test/t/subselect.test
    1.58.8.8 03/08/09 16:53:21 bell@sanja.is.com.ua +12 -15
    merge

  mysql-test/r/subselect.result
    1.67.14.7 03/08/09 16:53:21 bell@sanja.is.com.ua +12 -12
    merge

  sql/sql_union.cc
    1.74.2.9 03/08/09 16:49:32 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1546.69.1 03/08/09 14:39:54 bell@sanja.is.com.ua +3 -0
  fixed union unlocking problem (BUG#906)

  sql/sql_union.cc
    1.74.6.1 03/08/09 14:39:40 bell@sanja.is.com.ua +2 -1
    prohibit unlocking all tables by fake select execution

  mysql-test/t/subselect.test
    1.58.15.1 03/08/09 14:39:40 bell@sanja.is.com.ua +15 -1
    test of union unlocking problem

  mysql-test/r/subselect.result
    1.67.22.1 03/08/09 14:39:40 bell@sanja.is.com.ua +12 -0
    test of union unlocking problem

ChangeSet
  1.1346.311.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.152.1.96 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.6.1.4 03/08/09 01:20:00 serg@serg.mylan +1 -1
    BETWEEN bug fix: non-const expressions on both ends

ChangeSet
  1.1346.312.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.111.3.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.16.1.9 03/08/08 23:27:20 bell@sanja.is.com.ua +12 -518
    rewritten test using loop

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

ChangeSet
  1.1346.311.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.54.1.27 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.6.1.3 03/08/08 19:13:24 serg@serg.mylan +1 -1
    between range optimization bug (between with const on one end only)

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

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

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

ChangeSet
  1.1546.2.21 03/08/07 21:10:19 monty@mashka.mysql.fi +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mashka.mysql.fi:/home/my/mysql-4.1

ChangeSet
  1.1546.28.45 03/08/07 10:44:20 greg@gcw.ath.cx +2 -0
  Add --win-dist parameter to Bootstrap, to run make_win_src_distribution

ChangeSet
  1.1546.28.44 03/08/07 14:19:41 vva@eagle.mysql.r18.ru +1 -0
  Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1

  client/mysqldump.c
    1.96 03/08/07 14:19:39 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1546.67.1 03/08/07 14:18:43 vva@eagle.mysql.r18.ru +1 -0
  fixed bug with missing '\' in string constant in client/mysqldump.cc

  client/mysqldump.c
    1.94.1.1 03/08/07 14:18:41 vva@eagle.mysql.r18.ru +1 -1
    fixed bug with missing '\' in string constant

  vio/viosocket.c
    1.18 03/08/07 21:17:35 monty@mashka.mysql.fi +0 -0
    Auto merged

  support-files/mysql.spec.sh
    1.67 03/08/07 21:17:35 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/uniques.cc
    1.15 03/08/07 21:17:33 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/table.h
    1.48.1.5 03/08/07 21:17:33 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/table.cc
    1.82 03/08/07 21:17:33 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_update.cc
    1.83.2.10 03/08/07 21:17:33 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/sql_repl.h
    1.28.2.1 03/08/07 21:17:32 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_rename.cc
    1.16.1.1 03/08/07 21:17:32 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_load.cc
    1.46.3.9 03/08/07 21:17:32 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_list.h
    1.21 03/08/07 21:17:32 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_insert.cc
    1.86.2.14 03/08/07 21:17:32 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_delete.cc
    1.99.4.1 03/08/07 21:17:32 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_db.cc
    1.68.1.8 03/08/07 21:17:31 monty@mashka.mysql.fi +0 -2
    Auto merged

  sql/sql_cache.h
    1.21 03/08/07 21:17:31 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_base.cc
    1.145.6.3 03/08/07 21:17:31 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/opt_range.cc
    1.90.1.4 03/08/07 21:17:30 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/nt_servc.cc
    1.14 03/08/07 21:17:30 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/net_serv.cc
    1.60 03/08/07 21:17:30 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_timefunc.cc
    1.40 03/08/07 21:17:29 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_func.cc
    1.124.3.14 03/08/07 21:17:29 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item.h
    1.56.6.12 03/08/07 21:17:29 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/handler.h
    1.81.2.1 03/08/07 21:17:28 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/handler.cc
    1.94.1.3 03/08/07 21:17:28 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_myisammrg.h
    1.27 03/08/07 21:17:28 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.115.4.2 03/08/07 21:17:28 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.h
    1.53 03/08/07 21:17:28 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/field_conv.cc
    1.21 03/08/07 21:17:28 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/Makefile.am
    1.77.1.11 03/08/07 21:17:28 monty@mashka.mysql.fi +0 -0
    Auto merged

  scripts/mysqld_safe.sh
    1.61 03/08/07 21:17:28 monty@mashka.mysql.fi +0 -0
    Auto merged

  scripts/mysql_install_db.sh
    1.37.1.11 03/08/07 21:17:28 monty@mashka.mysql.fi +0 -0
    Auto merged

  scripts/Makefile.am
    1.32 03/08/07 21:17:27 monty@mashka.mysql.fi +0 -2
    Auto merged

  mysys/tree.c
    1.24 03/08/07 21:17:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysys/thr_lock.c
    1.37 03/08/07 21:17:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysys/my_getopt.c
    1.36 03/08/07 21:17:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysys/mf_format.c
    1.18 03/08/07 21:17:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysys/default.c
    1.31 03/08/07 21:17:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/user_var.test
    1.7 03/08/07 21:17:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/type_datetime.test
    1.10 03/08/07 21:17:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/type_date.test
    1.6 03/08/07 21:17:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/select_safe.test
    1.6 03/08/07 21:17:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/sel000100.test
    1.11 03/08/07 21:17:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/rpl_insert_id.test
    1.4 03/08/07 21:17:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/rpl000018.test
    1.10 03/08/07 21:17:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/rpl000001.test
    1.34 03/08/07 21:17:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/range.test
    1.5.1.1 03/08/07 21:17:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/order_by.test
    1.17 03/08/07 21:17:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/join_outer.test
    1.11 03/08/07 21:17:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/join.test
    1.20 03/08/07 21:17:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/heap.test
    1.11 03/08/07 21:17:25 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/handler.test
    1.13 03/08/07 21:17:25 monty@mashka.mysql.fi +0 -14
    Auto merged

  mysql-test/t/func_time.test
    1.18 03/08/07 21:17:25 monty@mashka.mysql.fi +0 -4
    Auto merged

  mysql-test/t/fulltext_left_join.test
    1.8 03/08/07 21:17:25 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/ctype_latin1_de.test
    1.11 03/08/07 21:17:24 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/alias.test
    1.4 03/08/07 21:17:24 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/type_datetime.result
    1.14 03/08/07 21:17:24 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/type_date.result
    1.8 03/08/07 21:17:24 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/symlink.result
    1.9 03/08/07 21:17:24 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/select_safe.result
    1.9 03/08/07 21:17:24 monty@mashka.mysql.fi +0 -2
    Auto merged

  mysql-test/r/rpl_relayspace.result
    1.3 03/08/07 21:17:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/rpl_master_pos_wait.result
    1.3 03/08/07 21:17:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/rpl_insert_id.result
    1.6 03/08/07 21:17:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/rpl000018.result
    1.8 03/08/07 21:17:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/range.result
    1.10.1.1 03/08/07 21:17:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/join_outer.result
    1.20 03/08/07 21:17:22 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/join.result
    1.23 03/08/07 21:17:22 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/grant_cache.result
    1.7 03/08/07 21:17:21 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/func_time.result
    1.20 03/08/07 21:17:21 monty@mashka.mysql.fi +0 -5
    Auto merged

  mysql-test/r/flush.result
    1.11 03/08/07 21:17:21 monty@mashka.mysql.fi +0 -1
    Auto merged

  mysql-test/r/ctype_latin1_de.result
    1.11 03/08/07 21:17:21 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.167.1.1 03/08/07 21:17:21 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisammrg/myrg_queue.c
    1.10 03/08/07 21:17:20 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/myisamdef.h
    1.59.3.1 03/08/07 21:17:20 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/mi_key.c
    1.19 03/08/07 21:17:20 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/mi_extra.c
    1.32.1.1 03/08/07 21:17:20 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/mi_check.c
    1.105.2.1 03/08/07 21:17:20 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/ft_boolean_search.c
    1.60 03/08/07 21:17:20 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/ut/ut0ut.c
    1.16 03/08/07 21:17:19 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/ut/ut0mem.c
    1.12 03/08/07 21:17:19 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/trx/trx0trx.c
    1.24 03/08/07 21:17:19 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/trx/trx0sys.c
    1.17 03/08/07 21:17:19 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/srv/srv0start.c
    1.45 03/08/07 21:17:19 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/srv/srv0srv.c
    1.43 03/08/07 21:17:19 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/row/row0sel.c
    1.34 03/08/07 21:17:18 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/row/row0mysql.c
    1.43 03/08/07 21:17:18 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/os/os0file.c
    1.51 03/08/07 21:17:18 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/mem/mem0pool.c
    1.11 03/08/07 21:17:18 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/log/log0log.c
    1.25 03/08/07 21:17:18 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/lock/lock0lock.c
    1.23 03/08/07 21:17:17 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/include/ut0mem.h
    1.7 03/08/07 21:17:17 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/include/srv0srv.h
    1.25 03/08/07 21:17:17 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/include/row0sel.h
    1.4 03/08/07 21:17:17 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/include/log0recv.h
    1.8 03/08/07 21:17:17 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/include/buf0buf.h
    1.17 03/08/07 21:17:17 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/dict/dict0load.c
    1.10 03/08/07 21:17:17 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/dict/dict0dict.c
    1.29 03/08/07 21:17:17 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/buf/buf0flu.c
    1.17 03/08/07 21:17:16 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/buf/buf0buf.c
    1.24 03/08/07 21:17:16 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/btr/btr0pcur.c
    1.8 03/08/07 21:17:16 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/btr/btr0cur.c
    1.24 03/08/07 21:17:16 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/my_sys.h
    1.100.2.1 03/08/07 21:17:16 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/config-win.h
    1.34 03/08/07 21:17:15 monty@mashka.mysql.fi +0 -0
    Auto merged

  extra/perror.c
    1.22 03/08/07 21:17:15 monty@mashka.mysql.fi +0 -0
    Auto merged

  client/mysqltest.c
    1.92.1.10 03/08/07 21:17:15 monty@mashka.mysql.fi +0 -0
    Auto merged

  client/mysql.cc
    1.121.1.19 03/08/07 21:17:15 monty@mashka.mysql.fi +0 -0
    Auto merged

  client/get_password.c
    1.10 03/08/07 21:17:14 monty@mashka.mysql.fi +0 -0
    Auto merged

  Docs/Makefile.am
    1.40 03/08/07 21:17:14 monty@mashka.mysql.fi +0 -0
    Auto merged

  Build-tools/Do-compile
    1.77 03/08/07 21:17:14 monty@mashka.mysql.fi +0 -0
    Auto merged

  Build-tools/Bootstrap
    1.9 03/08/07 21:17:14 monty@mashka.mysql.fi +0 -16
    Auto merged

  BitKeeper/deleted/.del-sel000001.test~9567c1646058cc
    1.11 03/08/07 21:17:14 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-sel000001.result~383913ae4505ec86
    1.9 03/08/07 21:17:14 monty@mashka.mysql.fi +0 -0
    Auto merged

  BUILD/compile-pentium-debug-max
    1.11 03/08/07 21:17:14 monty@mashka.mysql.fi +0 -0
    Auto merged

  scripts/make_win_src_distribution.old
    1.11 03/08/07 21:17:13 monty@mashka.mysql.fi +0 -0
    Merge rename: scripts/make_win_src_distribution.sh -> scripts/make_win_src_distribution.old

  BitKeeper/deleted/.del-sel000001.test~9567c1646058cc
    1.9.1.2 03/08/07 21:13:33 monty@mashka.mysql.fi +0 -0
    Merge rename: mysql-test/t/sel000001.test -> BitKeeper/deleted/.del-sel000001.test~9567c1646058cc

  BitKeeper/deleted/.del-sel000001.result~383913ae4505ec86
    1.7.1.2 03/08/07 21:13:33 monty@mashka.mysql.fi +0 -0
    Merge rename: mysql-test/r/sel000001.result -> BitKeeper/deleted/.del-sel000001.result~383913ae4505ec86

  BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183
    1.48.1.7 03/08/07 21:13:33 monty@mashka.mysql.fi +0 -0
    Merge rename: sql/mini_client.cc -> BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183

  BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e
    1.7.1.3 03/08/07 21:13:33 monty@mashka.mysql.fi +0 -0
    Merge rename: strings/ctype-latin1_de.c -> BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e

  BitKeeper/etc/logging_ok
    1.233.13.5 03/08/07 21:13:26 monty@mashka.mysql.fi +0 -6
    auto-union

  sql/item_func.cc
    1.124.3.13 03/08/07 21:10:12 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.233.13.4 03/08/07 21:09:59 monty@mashka.mysql.fi +0 -0
    auto-union

ChangeSet
  1.1546.2.20 03/08/07 20:42:26 monty@mashka.mysql.fi +2 -0
  Fix that -integer works as in 4.0

  sql/item_func.cc
    1.124.4.1 03/08/07 20:40:47 monty@mashka.mysql.fi +55 -15
    Indentation changes
    Fix that -integer works as in 4.0

ChangeSet
  1.1346.302.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.51.1.61 03/08/07 20:18:42 monty@mashka.mysql.fi +0 -0
    Auto merged

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

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

ChangeSet
  1.1346.310.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.51.12.1 03/08/07 20:16:29 monty@mashka.mysql.fi +4 -7
    Simple optimization

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

  sql/slave.cc
    1.164.8.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.297.1.152 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.48.1.6 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.77.1.44 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.16.1.2 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.1.1.4 03/08/07 20:16:27 monty@mashka.mysql.fi +1 -0
    Add test if server supports innodb

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

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

ChangeSet
  1.1346.302.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.21.1.5 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.

  BitKeeper/etc/logging_ok
    1.233.14.1 03/08/07 10:44:19 greg@gcw.ath.cx +1 -0
    Logging to logging@openlogging.org accepted

  Build-tools/Bootstrap
    1.4.1.1 03/08/07 10:44:14 greg@gcw.ath.cx +16 -3
    Add --win-dist parameter to run make_win_src_distribution

ChangeSet
  1.1346.309.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.206.25.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.5.1.1 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.5.1.1 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.2.1.1 03/08/07 15:13:05 dlenev@build.mysql.com +13 -13
    Regenerated expired certificates

  SSL/server-cert.pem
    1.2.1.1 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.2.1.1 03/08/07 15:11:53 dlenev@build.mysql.com +13 -13
    Regenerated expired certificates

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

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

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

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

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

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

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

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

ChangeSet
  1.1346.307.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.112.10.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.1546.66.1 03/08/07 13:29:25 kostja@oak.local +7 -0
  Merge oak.local:/home/kostja/mysql/mysql-4.1-root
  into oak.local:/home/kostja/mysql/mysql-4.1

  sql/sql_yacc.yy
    1.203.1.57 03/08/07 13:29:22 kostja@oak.local +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.13.6 03/08/07 13:29:22 kostja@oak.local +0 -0
    Auto merged

  sql/sql_acl.cc
    1.74.1.12 03/08/07 13:29:22 kostja@oak.local +0 -0
    Auto merged

  sql/set_var.h
    1.31 03/08/07 13:29:22 kostja@oak.local +0 -0
    Auto merged

  sql/item_strfunc.h
    1.68 03/08/07 13:29:22 kostja@oak.local +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.132 03/08/07 13:29:22 kostja@oak.local +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.233.1.22 03/08/07 13:29:15 kostja@oak.local +0 -1
    auto-union

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.1563.2.3 03/08/07 11:16:02 bell@sanja.is.com.ua +7 -0
  fixed bug in used_tables() report of left expression of IN subquery
  fixed number of rows of external field reported to optimizer
  added check of choosen key (checked left expression tag)
  (SCRUM fix for simple IN optimisation)

  sql/sql_select.cc
    1.216.1.22 03/08/07 11:16:00 bell@sanja.is.com.ua +13 -3
    checked left expression reference tag
    fixed number of rows in outer reference (it should be constant)

  sql/mysqld.cc
    1.356.18.5 03/08/07 11:16:00 bell@sanja.is.com.ua +2 -0
    left expression reference tag

  sql/mysql_priv.h
    1.186.17.3 03/08/07 11:16:00 bell@sanja.is.com.ua +1 -0
    left expression reference tag

  sql/item_subselect.h
    1.34.1.1 03/08/07 11:16:00 bell@sanja.is.com.ua +2 -2
    fixed layout

  sql/item_subselect.cc
    1.60.8.2 03/08/07 11:16:00 bell@sanja.is.com.ua +2 -2
    added left expression referenca tag

  sql/item_cmpfunc.cc
    1.99.1.2 03/08/07 11:16:00 bell@sanja.is.com.ua +17 -16
    fixed used_tables asignment

  mysql-test/r/subselect.result
    1.67.21.2 03/08/07 11:15:59 bell@sanja.is.com.ua +6 -6
    new EXPLAIN results ufter fixing used_tables() of Item_cache

ChangeSet
  1.1346.302.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.21.1.4 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.1346.302.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.21.1.3 03/08/06 22:56:53 greg@gcw.ath.cx +1 -0
    Add make_win_src_distribution to EXTRA_SCRIPTS

ChangeSet
  1.1546.28.43 03/08/06 18:59:26 Sinisa@sinisa.nasamreza.org +6 -0
  merge

  sql/table.h
    1.48.1.4 03/08/06 18:59:22 Sinisa@sinisa.nasamreza.org +1 -1
    merge

  sql/sql_union.cc
    1.74.2.8 03/08/06 18:51:01 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.12.15 03/08/06 18:51:01 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_derived.cc
    1.43.2.4 03/08/06 18:51:01 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_base.cc
    1.145.6.2 03/08/06 18:51:01 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.68 03/08/06 18:51:01 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1546.44.2 03/08/06 18:48:34 Sinisa@sinisa.nasamreza.org +4 -0
  sql_union.cc, sql_select.cc:
    Code clean-up
  sql_union.cc, union.test, union.result:
    A fix for a bug #978.
    This enables that NULL's can be entered into UNION's result set,
    although first SELECT columns are NOT NULL.
    This is also a start of fixing UNION's properly regarding type
    acceptance.
  sql_select.cc:
    A commit for my second July SPRINT task

  sql/sql_union.cc
    1.74.2.7 03/08/06 18:41:38 Sinisa@sinisa.nasamreza.org +0 -8
    Code clean-up

  sql/sql_select.cc
    1.216.23.2 03/08/06 18:41:37 Sinisa@sinisa.nasamreza.org +0 -11
    Code clean-up

ChangeSet
  1.1346.306.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.17.1.6 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.4.1.1 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.6.1.1 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.1546.65.1 03/08/06 16:58:03 kostja@oak.local +3 -0
  fix for bug #958 and tests for it
  aligned with Sergey notes.

  mysql-test/t/count_distinct3.test
    1.1 03/08/06 16:57:51 kostja@oak.local +55 -0

  mysql-test/r/count_distinct3.result
    1.1 03/08/06 16:57:51 kostja@oak.local +7 -0

  mysql-test/t/count_distinct3.test
    1.0 03/08/06 16:57:51 kostja@oak.local +0 -0
    BitKeeper file /home/kostja/mysql/mysql-4.1-count-distinct/mysql-test/t/count_distinct3.test

  mysql-test/r/count_distinct3.result
    1.0 03/08/06 16:57:51 kostja@oak.local +0 -0
    BitKeeper file /home/kostja/mysql/mysql-4.1-count-distinct/mysql-test/r/count_distinct3.result

  sql/records.cc
    1.19.1.3 03/08/06 16:57:50 kostja@oak.local +7 -1
    fix for bug #958 - big select with 
    count distinct and group by
    aligned with Sergey notes.

ChangeSet
  1.1346.305.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.35.1.2 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.1346.305.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.61.1.8 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.1546.56.2 03/08/05 21:14:15 serg@serg.mylan +15 -0
  table checksum background:
     my_checksum() mysys function
     NISAM checksum code moved from mysys to isam/ - it's obsolete
     MyISAM checksum code moved to mysys
     table's checksum accessible from sql layer
     SHOW TABLE STATUS shows checksum (WL#646)
  code cleanup

  sql/sql_yacc.yy
    1.203.62.1 03/08/05 21:14:11 serg@serg.mylan +12 -10
    cleanup
    (DROP TABLES syntax added as a side effect :))

  sql/sql_show.cc
    1.122.4.2 03/08/05 21:14:11 serg@serg.mylan +6 -0
    SHOW TABLE STATUS shows checksum (WL#646)

  sql/sql_select.cc
    1.216.24.1 03/08/05 21:14:11 serg@serg.mylan +1 -1
    warning removed

  sql/sql_lex.h
    1.102.20.1 03/08/05 21:14:11 serg@serg.mylan +10 -10
    table checksum background: table's checksum accessible from sql layer
    code cleanup

  sql/handler.h
    1.81.1.1 03/08/05 21:14:11 serg@serg.mylan +36 -35
    table checksum background: table's checksum accessible from sql layer
    code cleanup

  sql/ha_myisam.h
    1.47.1.1 03/08/05 21:14:11 serg@serg.mylan +1 -0
    table checksum background: table's checksum accessible from sql layer

  sql/ha_myisam.cc
    1.115.5.1 03/08/05 21:14:11 serg@serg.mylan +8 -0
    table checksum background: table's checksum accessible from sql layer

  mysys/checksum.c
    1.7 03/08/05 21:14:11 serg@serg.mylan +11 -10
    table checksum background: my_checksum() mysys function
    MyISAM checksum code moved to mysys

  myisam/mi_checksum.c
    1.5 03/08/05 21:14:11 serg@serg.mylan +7 -12
    table checksum background: my_checksum() mysys function
    MyISAM checksum code moved to mysys

  isam/pack_isam.c
    1.15 03/08/05 21:14:11 serg@serg.mylan +1 -1
    table checksum background:
    NISAM checksum code moved from mysys to isam/ - it's obsolete

  isam/open.c
    1.13 03/08/05 21:14:11 serg@serg.mylan +19 -0
    table checksum background:
    NISAM checksum code moved from mysys to isam/ - it's obsolete

  isam/isamdef.h
    1.13 03/08/05 21:14:11 serg@serg.mylan +1 -0
    table checksum background:
    NISAM checksum code moved from mysys to isam/ - it's obsolete

  isam/isamchk.c
    1.22.1.1 03/08/05 21:14:11 serg@serg.mylan +1 -1
    table checksum background:
    NISAM checksum code moved from mysys to isam/ - it's obsolete

  include/myisam.h
    1.49.1.1 03/08/05 21:14:11 serg@serg.mylan +0 -2
    table checksum background: my_checksum() mysys function
    MyISAM checksum code moved to mysys

  include/my_sys.h
    1.100.1.3 03/08/05 21:14:11 serg@serg.mylan +4 -2
    table checksum background: my_checksum() mysys function

  sql/sql_union.cc
    1.74.2.6 03/08/05 18:55:59 Sinisa@sinisa.nasamreza.org +6 -2
    A fix for a bug #978.
    
    This enables that NULL's can be entered into UNION's result set,
    although first SELECT columns are NOT NULL.
    
    This is also a start of fixing UNION's properly regarding type
    acceptance.

  sql/sql_select.cc
    1.216.23.1 03/08/05 18:55:59 Sinisa@sinisa.nasamreza.org +11 -0
    A commit for my second July SPRINT task

  mysql-test/t/union.test
    1.38 03/08/05 18:55:59 Sinisa@sinisa.nasamreza.org +9 -0
    A fix for a bug #978.
    
    This enables that NULL's can be entered into UNION's result set,
    although first SELECT columns are NOT NULL.
    
    This is also a start of fixing UNION's properly regarding type
    acceptance.

  mysql-test/r/union.result
    1.40 03/08/05 18:55:58 Sinisa@sinisa.nasamreza.org +13 -0
    A fix for a bug #978.
    
    This enables that NULL's can be entered into UNION's result set,
    although first SELECT columns are NOT NULL.
    
    This is also a start of fixing UNION's properly regarding type
    acceptance.

ChangeSet
  1.1346.304.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.13.1.16 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.9.1.2 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.11.1.2 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)

  acinclude.m4
    1.86 03/08/05 16:09:59 monty@mashka.mysql.fi +12 -3
    Fix for RedHat9 and openssl

ChangeSet
  1.1546.2.19 03/08/05 16:08:36 monty@mashka.mysql.fi +2 -0
  Merge

  sql/gen_lex_hash.cc
    1.57 03/08/05 16:08:34 monty@mashka.mysql.fi +0 -1
    Merge

ChangeSet
  1.1546.28.41 03/08/05 12:52:37 bar@bar.mysql.r18.ru +15 -0
  Old style charset() and set_charset() were removed.

  sql/sql_select.cc
    1.216.12.14 03/08/05 12:52:34 bar@bar.mysql.r18.ru +4 -4
    Old style charset() and set_charset() were removed.

  sql/sql_analyse.cc
    1.40 03/08/05 12:52:34 bar@bar.mysql.r18.ru +6 -6
    Old style charset() and set_charset() were removed.

  sql/set_var.h
    1.29.3.1 03/08/05 12:52:34 bar@bar.mysql.r18.ru +1 -1
    Old style charset() and set_charset() were removed.

  sql/opt_range.cc
    1.90.1.3 03/08/05 12:52:34 bar@bar.mysql.r18.ru +1 -1
    Old style charset() and set_charset() were removed.

  sql/item_timefunc.h
    1.33 03/08/05 12:52:34 bar@bar.mysql.r18.ru +10 -10
    Old style charset() and set_charset() were removed.

  sql/item_timefunc.cc
    1.39 03/08/05 12:52:34 bar@bar.mysql.r18.ru +4 -4
    Old style charset() and set_charset() were removed.

  sql/item_sum.cc
    1.78.2.3 03/08/05 12:52:34 bar@bar.mysql.r18.ru +1 -1
    Old style charset() and set_charset() were removed.

  sql/item_strfunc.h
    1.63.2.2 03/08/05 12:52:34 bar@bar.mysql.r18.ru +12 -14
    Old style charset() and set_charset() were removed.

  sql/item_strfunc.cc
    1.126.1.9 03/08/05 12:52:34 bar@bar.mysql.r18.ru +22 -21
    Old style charset() and set_charset() were removed.

  sql/item_func.cc
    1.124.3.12 03/08/05 12:52:34 bar@bar.mysql.r18.ru +8 -8
    Old style charset() and set_charset() were removed.

  sql/item_cmpfunc.cc
    1.87.6.10 03/08/05 12:52:34 bar@bar.mysql.r18.ru +22 -20
    Old style charset() and set_charset() were removed.

  sql/item_buff.cc
    1.8 03/08/05 12:52:34 bar@bar.mysql.r18.ru +1 -1
    Old style charset() and set_charset() were removed.

  sql/item.h
    1.56.6.11 03/08/05 12:52:34 bar@bar.mysql.r18.ru +3 -18
    Old style charset() and set_charset() were removed.

  sql/item.cc
    1.58.10.11 03/08/05 12:52:34 bar@bar.mysql.r18.ru +12 -11
    Old style charset() and set_charset() were removed.

  sql/filesort.cc
    1.70.1.6 03/08/05 12:52:34 bar@bar.mysql.r18.ru +2 -2
    Old style charset() and set_charset() were removed.

ChangeSet
  1.1563.2.2 03/08/05 09:58:00 bell@sanja.is.com.ua +6 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1

  sql/sql_select.cc
    1.216.1.21 03/08/05 09:57:57 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.1.27 03/08/05 09:57:57 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_sum.cc
    1.82.1.1 03/08/05 09:57:57 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.cc
    1.60.8.1 03/08/05 09:57:57 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.58.14.1 03/08/05 09:57:57 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.21.1 03/08/05 09:57:57 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1553.1.6 03/08/05 09:56:21 bell@sanja.is.com.ua +14 -0
  merge

  sql/sql_lex.h
    1.102.19.1 03/08/05 09:56:19 bell@sanja.is.com.ua +6 -7
    merge

  sql/sql_lex.cc
    1.85 03/08/05 09:56:19 bell@sanja.is.com.ua +1 -2
    merge

  sql/item_subselect.cc
    1.60.7.1 03/08/05 09:56:19 bell@sanja.is.com.ua +0 -1
    merge

  mysql-test/t/subselect.test
    1.58.11.2 03/08/05 09:56:19 bell@sanja.is.com.ua +23 -25
    merge

  mysql-test/r/subselect.result
    1.67.17.2 03/08/05 09:56:19 bell@sanja.is.com.ua +14 -14
    merge

  sql/sql_yacc.yy
    1.203.61.2 03/08/05 09:43:03 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_union.cc
    1.74.5.1 03/08/05 09:43:03 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.22.2 03/08/05 09:43:03 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.1.12 03/08/05 09:43:03 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_derived.cc
    1.43.1.5 03/08/05 09:43:02 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_sum.cc
    1.80.1.1 03/08/05 09:43:02 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.124.1.19 03/08/05 09:43:02 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.56.1.23 03/08/05 09:43:02 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.58.18.1 03/08/05 09:43:02 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1546.28.40 03/08/05 11:26:31 bar@bar.mysql.r18.ru +3 -0
  Fix:
  CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german2_ci);
  INSERT INTO t1 VALUES ('');
  SELECT FIELD('ue',s1) FROM t1;
  The above returned 0 in error.
  Now 1 is returned.

  sql/item_func.cc
    1.124.3.11 03/08/05 11:26:28 bar@bar.mysql.r18.ru +1 -2
    Fix:
    CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german2_ci);
    INSERT INTO t1 VALUES ('');
    SELECT FIELD('ue',s1) FROM t1;
    The above returned 0 in error.
    Now 1 is returned.

  mysql-test/t/ctype_latin1_de.test
    1.10 03/08/05 11:26:28 bar@bar.mysql.r18.ru +1 -0
    Fix:
    CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german2_ci);
    INSERT INTO t1 VALUES ('');
    SELECT FIELD('ue',s1) FROM t1;
    The above returned 0 in error.
    Now 1 is returned.

  mysql-test/r/ctype_latin1_de.result
    1.10 03/08/05 11:26:28 bar@bar.mysql.r18.ru +4 -0
    Fix:
    CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german2_ci);
    INSERT INTO t1 VALUES ('');
    SELECT FIELD('ue',s1) FROM t1;
    The above returned 0 in error.
    Now 1 is returned.

ChangeSet
  1.1546.28.39 03/08/05 11:03:05 bar@bar.mysql.r18.ru +4 -0
  Fix:
  
  CREATE TABLE t1 (s1 CHAR(5) CHARACTER SET latin1 COLLATE latin1_german2_ci);
  INSERT INTO t1 VALUES ('');
  INSERT INTO t1 VALUES ('ue');
  SELECT DISTINCT s1 FROM t1;
  
  The above returned two rows in error.
  Now it returns one row, in latin1_german2_ci:   == ue

  sql/item_sum.cc
    1.78.2.2 03/08/05 11:03:02 bar@bar.mysql.r18.ru +3 -1
    Fix:
    
    CREATE TABLE t1 (s1 CHAR(5) CHARACTER SET latin1 COLLATE latin1_german2_ci);
    INSERT INTO t1 VALUES ('');
    INSERT INTO t1 VALUES ('ue');
    SELECT DISTINCT s1 FROM t1;
    
    The above returned two rows in error.
    Now it returns one row, in latin1_german2_ci:   == ue

  mysql-test/t/ctype_latin1_de.test
    1.9 03/08/05 11:03:02 bar@bar.mysql.r18.ru +10 -0
    Fix:
    
    CREATE TABLE t1 (s1 CHAR(5) CHARACTER SET latin1 COLLATE latin1_german2_ci);
    INSERT INTO t1 VALUES ('');
    INSERT INTO t1 VALUES ('ue');
    SELECT DISTINCT s1 FROM t1;
    
    The above returned two rows in error.
    Now it returns one row, in latin1_german2_ci:   == ue

  mysql-test/r/ctype_latin1_de.result
    1.9 03/08/05 11:03:02 bar@bar.mysql.r18.ru +15 -0
    Fix:
    
    CREATE TABLE t1 (s1 CHAR(5) CHARACTER SET latin1 COLLATE latin1_german2_ci);
    INSERT INTO t1 VALUES ('');
    INSERT INTO t1 VALUES ('ue');
    SELECT DISTINCT s1 FROM t1;
    
    The above returned two rows in error.
    Now it returns one row, in latin1_german2_ci:   == ue

  heap/hp_hash.c
    1.26 03/08/05 11:03:02 bar@bar.mysql.r18.ru +6 -4
    Fix:
    
    CREATE TABLE t1 (s1 CHAR(5) CHARACTER SET latin1 COLLATE latin1_german2_ci);
    INSERT INTO t1 VALUES ('');
    INSERT INTO t1 VALUES ('ue');
    SELECT DISTINCT s1 FROM t1;
    
    The above returned two rows in error.
    Now it returns one row, in latin1_german2_ci:   == ue

ChangeSet
  1.1546.28.38 03/08/05 10:08:16 bar@bar.mysql.r18.ru +3 -0
  fix_fields recoursion didn't stop when some level's fix_length_and_dec
  produced an error. This led to server crash in some cases, e.g.:
  create table t7 (s1 char);
  select * from t7
  where concat(s1 collate latin1_general_ci,s1 collate latin1_swedish_ci)
  = 'AA';

  sql/item_func.cc
    1.124.3.10 03/08/05 10:08:14 bar@bar.mysql.r18.ru +2 -0
    fix_fields recoursion didn't stop when some level's fix_length_and_dec
    produced an error. This led to server crash in some cases, e.g.:
    create table t7 (s1 char);
    select * from t7
    where concat(s1 collate latin1_general_ci,s1 collate latin1_swedish_ci)
    = 'AA';

  mysql-test/t/func_str.test
    1.38 03/08/05 10:08:14 bar@bar.mysql.r18.ru +10 -0
    fix_fields recoursion didn't stop when some level's fix_length_and_dec
    produced an error. This led to server crash in some cases, e.g.:
    create table t7 (s1 char);
    select * from t7
    where concat(s1 collate latin1_general_ci,s1 collate latin1_swedish_ci)
    = 'AA';

  mysql-test/r/func_str.result
    1.40 03/08/05 10:08:14 bar@bar.mysql.r18.ru +5 -0
    fix_fields recoursion didn't stop when some level's fix_length_and_dec
    produced an error. This led to server crash in some cases, e.g.:
    create table t7 (s1 char);
    select * from t7
    where concat(s1 collate latin1_general_ci,s1 collate latin1_swedish_ci)
    = 'AA';

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.1346.302.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.86.1.22 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.50.1.12 03/08/04 10:59:37 guilhem@mysql.com +2 -0
    declarations for new functions.

  sql/slave.cc
    1.164.1.78 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.2.1.4 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.1.1.5 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

  BitKeeper/etc/logging_ok
    1.233.13.3 03/08/03 16:28:21 monty@mashka.mysql.fi +0 -0
    auto-union

ChangeSet
  1.1346.302.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.51.1.59 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.1546.61.6 03/08/02 17:24:44 guilhem@mysql.com +1 -0
  Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
  into mysql.com:/home/mysql_src/mysql-4.1

  sql/sql_acl.cc
    1.74.2.3 03/08/02 17:24:36 guilhem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1546.64.1 03/08/02 17:23:39 guilhem@gbichot2 +1 -0
  There were two wrong calls to tables_ok() in MySQL 4.0 (BUG#980),
  which are fixed now.
  In 4.1 there are 3 calls; 2 of them will be fixed when there is a merge;
  here I fix the 3rd, new one. 

  sql/sql_acl.cc
    1.74.3.2 03/08/02 17:23:34 guilhem@mysql.com +11 -2
    There were two wrong calls to tables_ok() in MySQL 4.0 (BUG#980),
    which are fixed now.
    In 4.1 there are 3 calls; 2 of them will be fixed when there is a merge;
    here I fix the 3rd, new one. 

ChangeSet
  1.1346.302.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.51.1.58 03/08/02 16:11:29 guilhem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.303.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.51.11.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.1546.1.9 03/08/02 03:27:13 igor@rurik.mysql.com +13 -0
  Merge rurik.mysql.com:/home/igor/mysql-4.1
  into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  sql/table.h
    1.48.3.3 03/08/02 03:27:07 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.203.57.8 03/08/02 03:27:07 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.17.3 03/08/02 03:27:07 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.16.2 03/08/02 03:27:07 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_lex.cc
    1.80.1.3 03/08/02 03:27:07 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_base.cc
    1.145.7.4 03/08/02 03:27:06 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/set_var.cc
    1.34.12.2 03/08/02 03:27:06 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.17.3 03/08/02 03:27:06 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.19.3 03/08/02 03:27:06 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.50.1.11 03/08/02 03:27:06 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/handler.cc
    1.97 03/08/02 03:27:06 igor@rurik.mysql.com +0 -0
    Auto merged

  mysql-test/r/func_group.result
    1.18 03/08/02 03:27:06 igor@rurik.mysql.com +0 -0
    Auto merged

  include/my_sys.h
    1.104 03/08/02 03:27:06 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1546.1.8 03/08/02 03:26:02 igor@rurik.mysql.com +2 -0
  resolving bk problems

  mysql-test/r/func_group.result
    1.16.1.1 03/08/02 03:25:41 igor@rurik.mysql.com +2 -2

  sql/sql_parse.cc
    1.271.17.2 03/08/02 03:22:03 igor@rurik.mysql.com +1 -1

ChangeSet
  1.1546.1.7 03/08/02 02:43:18 igor@rurik.mysql.com +43 -0
  Many files:
    Added key cache assignment
  mi_locking.c:
    Added key cache assignment: correction
  my_sys.h:
    Added key cache variable structure

  mysql-test/r/key_cache.result
    1.2 03/08/02 01:53:55 igor@rurik.mysql.com +192 -1
    Added key cache assignment

  mysql-test/t/key_cache.test
    1.2 03/08/02 01:53:39 igor@rurik.mysql.com +81 -1
    Added key cache assignment

  mysys/mf_keycache.c
    1.28 03/08/02 01:50:40 igor@rurik.mysql.com +132 -102
    Added key cache assignment

  sql/sql_yacc.yy
    1.203.58.5 03/08/02 01:49:45 igor@rurik.mysql.com +14 -3
    Added key cache assignment

  sql/sql_test.cc
    1.22 03/08/02 01:49:10 igor@rurik.mysql.com +3 -2
    Added key cache assignment

  sql/sql_table.cc
    1.157.2.11 03/08/02 01:48:03 igor@rurik.mysql.com +70 -1
    Added key cache assignment

  sql/sql_base.cc
    1.145.9.1 03/08/02 01:47:36 igor@rurik.mysql.com +129 -2
    Added key cache assignment

  sql/set_var.cc
    1.34.13.1 03/08/02 01:47:07 igor@rurik.mysql.com +107 -49
    Added key cache assignment

  sql/mysqld.cc
    1.356.17.2 03/08/02 01:46:36 igor@rurik.mysql.com +49 -24
    Added key cache assignment

  sql/handler.cc
    1.96 03/08/02 01:45:47 igor@rurik.mysql.com +30 -6
    Added key cache assignment

  sql/ha_myisammrg.cc
    1.44 03/08/02 01:44:54 igor@rurik.mysql.com +6 -0
    Added key cache assignment

  sql/ha_myisam.cc
    1.115.1.5 03/08/02 01:44:34 igor@rurik.mysql.com +86 -13
    Added key cache assignment

  sql/table.h
    1.48.4.1 03/08/02 01:38:49 igor@rurik.mysql.com +32 -2
    Added key cache assignment

  sql/set_var.h
    1.29.2.1 03/08/02 01:38:10 igor@rurik.mysql.com +36 -5
    Added key cache assignment

  sql/mysql_priv.h
    1.186.19.2 03/08/02 01:36:33 igor@rurik.mysql.com +7 -1
    Added key cache assignment

  sql/handler.h
    1.83 03/08/02 01:35:37 igor@rurik.mysql.com +3 -2
    Added key cache assignment

  myisam/mi_keycache.c
    1.2 03/08/02 01:23:32 igor@rurik.mysql.com +20 -4
    Added key cache assignment

  myisam/mi_locking.c
    1.26 03/08/02 01:22:29 igor@rurik.mysql.com +2 -2
    Added key cache assignment: correction

  myisam/mi_delete_all.c
    1.13 03/08/02 00:47:10 igor@rurik.mysql.com +1 -1
    Added key cache assignment

  myisam/myisamlog.c
    1.22 03/08/02 00:41:44 igor@rurik.mysql.com +4 -3
    Added key cache assignment

  myisam/myisamchk.c
    1.92.1.5 03/08/02 00:41:14 igor@rurik.mysql.com +12 -4
    Added key cache assignment

  myisam/mi_test3.c
    1.12 03/08/02 00:40:17 igor@rurik.mysql.com +1 -1
    Added key cache assignment

  myisam/mi_test2.c
    1.20 03/08/02 00:39:53 igor@rurik.mysql.com +4 -3
    Added key cache assignment

  myisam/mi_test1.c
    1.18 03/08/02 00:39:23 igor@rurik.mysql.com +1 -1
    Added key cache assignment

  myisam/mi_preload.c
    1.4 03/08/02 00:38:19 igor@rurik.mysql.com +3 -3
    Added key cache assignment

  myisam/mi_panic.c
    1.8 03/08/02 00:37:46 igor@rurik.mysql.com +1 -1
    Added key cache assignment

  myisam/mi_page.c
    1.15 03/08/02 00:37:14 igor@rurik.mysql.com +4 -4
    Added key cache assignment

  myisam/mi_locking.c
    1.25 03/08/02 00:36:34 igor@rurik.mysql.com +17 -3
    Added key cache assignment

  myisam/mi_extra.c
    1.34 03/08/02 00:35:41 igor@rurik.mysql.com +5 -2
    Added key cache assignment

  myisam/mi_close.c
    1.15 03/08/02 00:35:00 igor@rurik.mysql.com +1 -1
    Added key cache assignment

  myisam/mi_check.c
    1.105.1.4 03/08/02 00:32:40 igor@rurik.mysql.com +11 -11
    Added key cache assignment

  myisam/myisamdef.h
    1.59.1.5 03/08/02 00:31:06 igor@rurik.mysql.com +2 -0
    Added key cache assignment

  isam/test3.c
    1.11 03/08/02 00:28:56 igor@rurik.mysql.com +1 -1
    Added key cache assignment

  isam/test2.c
    1.13 03/08/02 00:28:36 igor@rurik.mysql.com +1 -1
    Added key cache assignment

  isam/_locking.c
    1.8 03/08/02 00:28:03 igor@rurik.mysql.com +2 -2
    Added key cache assignment

  isam/panic.c
    1.6 03/08/02 00:27:12 igor@rurik.mysql.com +1 -1
    Added key cache assignment

  isam/isamlog.c
    1.13 03/08/02 00:26:38 igor@rurik.mysql.com +4 -4
    Added key cache assignment

  isam/isamchk.c
    1.24 03/08/02 00:25:18 igor@rurik.mysql.com +7 -5
    Added key cache assignment

  isam/close.c
    1.7 03/08/02 00:24:25 igor@rurik.mysql.com +1 -1
    Added key cache assignment

  isam/_page.c
    1.8 03/08/02 00:23:32 igor@rurik.mysql.com +4 -4
    Added key cache assignment

  include/my_global.h
    1.47.1.1 03/08/02 00:15:27 igor@rurik.mysql.com +3 -0
    Added key cache assignment

  include/myisam.h
    1.51 03/08/02 00:14:34 igor@rurik.mysql.com +1 -1
    Added key cache assignment

  include/my_base.h
    1.44 03/08/02 00:11:07 igor@rurik.mysql.com +3 -1
    Added key cache assignment

  include/my_sys.h
    1.103 03/08/02 00:08:57 igor@rurik.mysql.com +40 -17
    Added key cache variable structure

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.1546.61.4 03/08/01 19:04:35 bell@sanja.is.com.ua +1 -0
  merge fix

  mysql-test/t/subselect.test
    1.58.8.7 03/08/01 19:04:33 bell@sanja.is.com.ua +0 -2
    merge fix

ChangeSet
  1.1546.63.1 03/08/01 19:44:27 konstantin@mysql.com +1 -0
  Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/kostja/mysql/mysql-4.1-root

  BitKeeper/etc/logging_ok
    1.233.13.2 03/08/01 19:44:22 konstantin@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

ChangeSet
  1.1546.61.3 03/08/01 18:24:27 bell@sanja.is.com.ua +7 -0
  merge

  mysql-test/t/subselect.test
    1.58.8.6 03/08/01 18:24:25 bell@sanja.is.com.ua +10 -22
    merge

  mysql-test/r/subselect.result
    1.67.14.6 03/08/01 18:24:25 bell@sanja.is.com.ua +6 -20
    merge

  sql/sql_yacc.yy
    1.203.57.7 03/08/01 18:22:34 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.19.3 03/08/01 18:22:34 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.17.2 03/08/01 18:22:34 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.80.3.4 03/08/01 18:22:34 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.58.10.10 03/08/01 18:22:34 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1546.62.1 03/08/01 18:49:30 kostja@oak.local +3 -0
  added disable_query_log to fulltext2.test

  BitKeeper/etc/logging_ok
    1.233.13.1 03/08/01 18:49:29 kostja@oak.local +1 -0
    Logging to logging@openlogging.org accepted

  mysql-test/t/fulltext2.test
    1.6 03/08/01 18:49:10 kostja@oak.local +2 -0
    test is now more silent

  mysql-test/r/fulltext2.result
    1.5 03/08/01 18:49:09 kostja@oak.local +0 -765
    result updated

ChangeSet
  1.1546.61.1 03/08/01 16:51:54 bell@sanja.is.com.ua +5 -0
  merge

  mysql-test/t/subselect.test
    1.58.8.5 03/08/01 16:51:52 bell@sanja.is.com.ua +1 -1
    merge
    fixed test

  mysql-test/r/subselect.result
    1.67.14.5 03/08/01 16:51:52 bell@sanja.is.com.ua +1 -0
    merge
    fixed test

  sql/sql_lex.cc
    1.80.3.3 03/08/01 16:48:39 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.cc
    1.60.3.6 03/08/01 16:48:39 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.58.10.9 03/08/01 16:48:39 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.297.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.14.1.1 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.8.1.1 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.1346.302.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.20.1.7 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.1346.302.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.77.1.13 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.1346.302.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.9.1.3 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.1546.60.1 03/07/31 17:11:52 kostja@oak.local +43 -0
  manual merge

  sql/sql_parse.cc
    1.271.13.5 03/07/31 17:11:50 kostja@oak.local +16 -14
    merge commit
    convert of database to utf8 in case of cahnge_user added

  sql/sql_acl.cc
    1.74.1.11 03/07/31 17:11:50 kostja@oak.local +88 -96
    manual merge

  sql/share/ukrainian/errmsg.txt
    1.27.1.16 03/07/31 17:11:50 kostja@oak.local +0 -0
    manual merge

  sql/share/swedish/errmsg.txt
    1.64.1.19 03/07/31 17:11:50 kostja@oak.local +0 -0
    manual merge

  sql/share/spanish/errmsg.txt
    1.64.1.17 03/07/31 17:11:50 kostja@oak.local +0 -0
    manual merge

  sql/share/slovak/errmsg.txt
    1.64.1.17 03/07/31 17:11:50 kostja@oak.local +0 -0
    manual merge

  sql/share/serbian/errmsg.txt
    1.18.1.15 03/07/31 17:11:50 kostja@oak.local +0 -0
    manual merge

  sql/share/russian/errmsg.txt
    1.61.1.17 03/07/31 17:11:50 kostja@oak.local +0 -0
    manual merge

  sql/share/romanian/errmsg.txt
    1.62.1.17 03/07/31 17:11:50 kostja@oak.local +0 -0
    manual merge

  sql/share/portuguese/errmsg.txt
    1.64.1.18 03/07/31 17:11:50 kostja@oak.local +0 -0
    manual merge

  sql/share/polish/errmsg.txt
    1.63.1.17 03/07/31 17:11:50 kostja@oak.local +0 -0
    manual merge

  sql/share/norwegian/errmsg.txt
    1.63.1.17 03/07/31 17:11:50 kostja@oak.local +0 -0
    manual merge

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.17 03/07/31 17:11:50 kostja@oak.local +0 -0
    manual merge

  sql/share/korean/errmsg.txt
    1.63.1.16 03/07/31 17:11:50 kostja@oak.local +0 -0
    manual merge

  sql/share/japanese/errmsg.txt
    1.63.1.16 03/07/31 17:11:50 kostja@oak.local +0 -0
    manual merge

  sql/share/italian/errmsg.txt
    1.70.1.17 03/07/31 17:11:50 kostja@oak.local +0 -0
    manual merge

  sql/share/hungarian/errmsg.txt
    1.65.1.16 03/07/31 17:11:50 kostja@oak.local +0 -0
    manual merge

  sql/share/greek/errmsg.txt
    1.64.1.16 03/07/31 17:11:50 kostja@oak.local +0 -0
    manual merge

  sql/share/german/errmsg.txt
    1.64.1.17 03/07/31 17:11:50 kostja@oak.local +0 -0
    manual merge

  sql/share/french/errmsg.txt
    1.63.1.17 03/07/31 17:11:50 kostja@oak.local +0 -0
    manual merge

  sql/share/estonian/errmsg.txt
    1.64.1.16 03/07/31 17:11:49 kostja@oak.local +0 -0
    manual merge

  sql/share/english/errmsg.txt
    1.70.1.21 03/07/31 17:11:49 kostja@oak.local +0 -0
    manual merge

  sql/share/dutch/errmsg.txt
    1.66.1.17 03/07/31 17:11:49 kostja@oak.local +0 -0
    manual merge

  sql/share/danish/errmsg.txt
    1.62.1.17 03/07/31 17:11:49 kostja@oak.local +0 -0
    manual merge

  sql/share/czech/errmsg.txt
    1.64.1.17 03/07/31 17:11:49 kostja@oak.local +0 -0
    manual merge

  include/mysqld_error.h
    1.61.1.13 03/07/31 17:11:49 kostja@oak.local +2 -3
    manual merge

  sql-common/client.c
    1.21 03/07/31 15:47:42 kostja@oak.local +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.203.1.56 03/07/31 15:47:41 kostja@oak.local +0 -0
    Auto merged

  sql/sql_acl.h
    1.22 03/07/31 15:47:41 kostja@oak.local +0 -0
    Auto merged

  sql/slave.h
    1.64 03/07/31 15:47:41 kostja@oak.local +0 -0
    Auto merged

  sql/slave.cc
    1.188.1.14 03/07/31 15:47:41 kostja@oak.local +0 -0
    Auto merged

  sql/set_var.cc
    1.34.1.27 03/07/31 15:47:41 kostja@oak.local +0 -0
    Auto merged

  sql/protocol.cc
    1.56.1.12 03/07/31 15:47:41 kostja@oak.local +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.35 03/07/31 15:47:41 kostja@oak.local +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.22 03/07/31 15:47:41 kostja@oak.local +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.131 03/07/31 15:47:41 kostja@oak.local +0 -0
    Auto merged

  sql/item_create.h
    1.30 03/07/31 15:47:41 kostja@oak.local +0 -0
    Auto merged

  sql/item_create.cc
    1.33.1.15 03/07/31 15:47:41 kostja@oak.local +0 -0
    Auto merged

  libmysql/libmysql.c
    1.156.1.19 03/07/31 15:47:41 kostja@oak.local +0 -0
    Auto merged

  include/mysql_com.h
    1.67.1.11 03/07/31 15:47:41 kostja@oak.local +0 -0
    Auto merged

  include/mysql.h
    1.82 03/07/31 15:47:41 kostja@oak.local +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.233.1.21 03/07/31 15:47:34 kostja@oak.local +0 -0
    auto-union

  BitKeeper/etc/ignore
    1.153.1.10 03/07/31 15:47:33 kostja@oak.local +11 -11
    auto-union

ChangeSet
  1.1546.31.25 03/07/31 15:47:00 kostja@oak.local +1 -0
  merge commit

  sql-common/client.c
    1.11.1.6 03/07/31 15:46:12 kostja@oak.local +1 -1
    comment fix

ChangeSet
  1.1346.297.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.34.2.4 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.29.1.10 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.47.1.9 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.1546.28.36 03/07/31 09:00:22 bar@bar.mysql.r18.ru +1 -0
  mysqldump.c:
    Use the default character set instead of binary. This is to make "mysqlshow" -> "cat'n'paste database name" -> "mysqldump dbname" circle working.

  client/mysqldump.c
    1.95 03/07/31 08:58:57 bar@bar.mysql.r18.ru +2 -1
    Use the default character set instead of binary. This is to make "mysqlshow" -> "cat'n'paste database name" -> "mysqldump dbname" circle working.

ChangeSet
  1.1546.28.35 03/07/31 08:33:59 bar@bar.mysql.r18.ru +1 -0
  cp1251.xml:
    Upper/lower case translation bug for letter 't' fix.

  sql/share/charsets/cp1251.xml
    1.7 03/07/31 08:33:33 bar@bar.mysql.r18.ru +4 -4
    Upper/lower case translation bug for letter 't' fix.

ChangeSet
  1.1346.283.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.206.1.76 03/07/31 04:17:35 wax@mysql.com +0 -0
    auto-union

ChangeSet
  1.1346.301.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.206.24.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.23.1.6 03/07/31 04:13:17 wax@mysql.com +1 -0
    add HAVE_SETFILEPOINTER

ChangeSet
  1.1346.297.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.80.1.24 03/07/30 16:14:30 serg@serg.mylan +7 -3
    help text clarified

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

ChangeSet
  1.1546.28.34 03/07/30 17:51:42 bar@bar.mysql.r18.ru +3 -0
  Database name and national characters fixes.

  sql/sql_parse.cc
    1.271.20.1 03/07/30 17:51:39 bar@bar.mysql.r18.ru +15 -4
    Database name and national characters fixes.

  mysql-test/t/ctype_recoding.test
    1.5 03/07/30 17:51:39 bar@bar.mysql.r18.ru +11 -0
    Database name and national characters fixes.

  mysql-test/r/ctype_recoding.result
    1.8 03/07/30 17:51:39 bar@bar.mysql.r18.ru +14 -0
    Database name and national characters fixes.

ChangeSet
  1.1346.283.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.17.2.1 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.16.1.8 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.15.1.8 03/07/30 14:59:50 bell@sanja.is.com.ua +534 -1
    test of many merged tales

ChangeSet
  1.1546.28.33 03/07/30 02:13:20 venu@myvenu.com +1 -0
  Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1
  into myvenu.com:/home/venu/work/sql/dev-4.1

ChangeSet
  1.1546.28.32 03/07/30 14:15:25 bar@bar.mysql.r18.ru +7 -0
  Derivation attribute was not processed correctly
  by MAX/MIN in some cases:
  SELECT coercibility(max(s1)) from t1;
  
  Subselect collation and derivation was not processed
  correctly:
  
  create table a select (select s1 from t1);
  select * from t1 where s1 = (select s2 from t1);
  

  sql/item.cc
    1.58.16.2 03/07/30 02:13:16 venu@myvenu.com +0 -0
    Auto merged

  sql/item_sum.cc
    1.78.2.1 03/07/30 14:15:23 bar@bar.mysql.r18.ru +1 -1
    Derivation attribute was not processed correctly
    by MAX/MIN in some cases:
    SELECT coercibility(max(s1)) from t1;
    
    Subselect collation and derivation was not processed
    correctly:
    
    create table a select (select s1 from t1);
    select * from t1 where s1 = (select s2 from t1);
    

  sql/item_subselect.cc
    1.60.6.1 03/07/30 14:15:23 bar@bar.mysql.r18.ru +2 -0
    Derivation attribute was not processed correctly
    by MAX/MIN in some cases:
    SELECT coercibility(max(s1)) from t1;
    
    Subselect collation and derivation was not processed
    correctly:
    
    create table a select (select s1 from t1);
    select * from t1 where s1 = (select s2 from t1);
    

  sql/item.cc
    1.58.17.1 03/07/30 14:15:23 bar@bar.mysql.r18.ru +1 -1
    Derivation attribute was not processed correctly
    by MAX/MIN in some cases:
    SELECT coercibility(max(s1)) from t1;
    
    Subselect collation and derivation was not processed
    correctly:
    
    create table a select (select s1 from t1);
    select * from t1 where s1 = (select s2 from t1);
    

  mysql-test/t/subselect.test
    1.58.13.1 03/07/30 14:15:22 bar@bar.mysql.r18.ru +12 -1
    Derivation attribute was not processed correctly
    by MAX/MIN in some cases:
    SELECT coercibility(max(s1)) from t1;
    
    Subselect collation and derivation was not processed
    correctly:
    
    create table a select (select s1 from t1);
    select * from t1 where s1 = (select s2 from t1);
    

  mysql-test/t/func_group.test
    1.15 03/07/30 14:15:22 bar@bar.mysql.r18.ru +5 -0
    Derivation attribute was not processed correctly
    by MAX/MIN in some cases:
    SELECT coercibility(max(s1)) from t1;
    
    Subselect collation and derivation was not processed
    correctly:
    
    create table a select (select s1 from t1);
    select * from t1 where s1 = (select s2 from t1);
    

  mysql-test/r/subselect.result
    1.67.20.1 03/07/30 14:15:22 bar@bar.mysql.r18.ru +13 -0
    Derivation attribute was not processed correctly
    by MAX/MIN in some cases:
    SELECT coercibility(max(s1)) from t1;
    
    Subselect collation and derivation was not processed
    correctly:
    
    create table a select (select s1 from t1);
    select * from t1 where s1 = (select s2 from t1);
    

  mysql-test/r/func_group.result
    1.17 03/07/30 14:15:22 bar@bar.mysql.r18.ru +6 -0
    Derivation attribute was not processed correctly
    by MAX/MIN in some cases:
    SELECT coercibility(max(s1)) from t1;
    
    Subselect collation and derivation was not processed
    correctly:
    
    create table a select (select s1 from t1);
    select * from t1 where s1 = (select s2 from t1);
    

ChangeSet
  1.1546.57.2 03/07/30 02:01:53 venu@myvenu.com +2 -0
  Fix for timestamp issue (BR #819)

  sql/item.cc
    1.58.16.1 03/07/30 02:00:13 venu@myvenu.com +5 -0
    Fix for timestamp issue (BR #819)

  tests/client_test.c
    1.35 03/07/30 01:58:42 venu@myvenu.com +52 -24
    Updated test_ts() test (For BR# 819)

ChangeSet
  1.1346.299.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.206.1.75 03/07/30 03:33:48 dlenev@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_acl.cc
    1.51.1.57 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.1346.283.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.26.1.5 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.1546.28.31 03/07/29 12:51:24 paul@teton.kitebird.com +1 -0
  README.1st:
    Revise 4.1 Windows-install instructions.

  Docs/README.1st
    1.2 03/07/29 12:50:54 paul@teton.kitebird.com +38 -24
    Revise 4.1 Windows-install instructions.

ChangeSet
  1.1553.1.5 03/07/29 20:26:14 bell@sanja.is.com.ua +7 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1

  sql/table.h
    1.51 03/07/29 20:26:11 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.203.61.1 03/07/29 20:26:11 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.1.11 03/07/29 20:26:11 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.84 03/07/29 20:26:11 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_base.cc
    1.145.1.10 03/07/29 20:26:11 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.17.2 03/07/29 20:26:11 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.99.1.1 03/07/29 20:26:11 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1546.59.1 03/07/29 16:59:46 bell@sanja.is.com.ua +7 -0
  prevented finding references in item_list for non-SELECT st_select_lex
  (fixed BUG#943)

  sql/sql_yacc.yy
    1.203.60.1 03/07/29 16:59:37 bell@sanja.is.com.ua +9 -4
    bool field changed with enum
    PRIMARY SELECT command st_select_lex marked as SELECT

  sql/sql_parse.cc
    1.271.19.2 03/07/29 16:59:37 bell@sanja.is.com.ua +2 -0
    all subqueries and UNION parts marked as SELECT

  sql/sql_lex.h
    1.102.18.1 03/07/29 16:59:37 bell@sanja.is.com.ua +15 -2
    bool field changed with enum

  sql/sql_lex.cc
    1.80.5.1 03/07/29 16:59:37 bell@sanja.is.com.ua +2 -1
    bool field changed with enum

  sql/item.cc
    1.58.15.1 03/07/29 16:59:37 bell@sanja.is.com.ua +7 -4
    bool field changed with enum
    prevented finding references in item_list for non-SELECT st_select_lex

  mysql-test/t/subselect.test
    1.58.12.1 03/07/29 16:59:37 bell@sanja.is.com.ua +14 -1
    test for bug 943

  mysql-test/r/subselect.result
    1.67.19.1 03/07/29 16:59:37 bell@sanja.is.com.ua +7 -0
    test for bug 943

ChangeSet
  1.1546.28.30 03/07/29 17:39:39 bar@bar.mysql.r18.ru +3 -0
  Fixed that this sequence didn't produce an error as it should have:
  CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german1_ci,
                   s2 CHAR(5) COLLATE latin1_swedish_ci);
  SELECT * FROM t1 WHERE s1 = s2;
  

  sql/item_cmpfunc.cc
    1.87.6.9 03/07/29 17:39:36 bar@bar.mysql.r18.ru +2 -1
    Fixed that this sequence didn't produce an error as it should have:
    CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german1_ci,
                     s2 CHAR(5) COLLATE latin1_swedish_ci);
    SELECT * FROM t1 WHERE s1 = s2;
    

  mysql-test/t/ctype_collate.test
    1.12 03/07/29 17:39:36 bar@bar.mysql.r18.ru +8 -0
    Fixed that this sequence didn't produce an error as it should have:
    CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german1_ci,
                     s2 CHAR(5) COLLATE latin1_swedish_ci);
    SELECT * FROM t1 WHERE s1 = s2;
    

  mysql-test/r/ctype_collate.result
    1.19 03/07/29 17:39:36 bar@bar.mysql.r18.ru +6 -0
    Fixed that this sequence didn't produce an error as it should have:
    CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german1_ci,
                     s2 CHAR(5) COLLATE latin1_swedish_ci);
    SELECT * FROM t1 WHERE s1 = s2;
    

ChangeSet
  1.1546.28.29 03/07/29 17:12:14 bar@bar.mysql.r18.ru +33 -0
  A new separate error message: Unknown collation 'blablabla'

  sql/sql_yacc.yy
    1.203.57.6 03/07/29 17:12:07 bar@bar.mysql.r18.ru +1 -1
    A new separate error message: Unknown collation 'blablabla'

  sql/sql_lex.cc
    1.80.4.1 03/07/29 17:12:07 bar@bar.mysql.r18.ru +1 -1
    A new separate error message: Unknown collation 'blablabla'

  sql/sql_db.cc
    1.68.1.7 03/07/29 17:12:07 bar@bar.mysql.r18.ru +1 -1
    A new separate error message: Unknown collation 'blablabla'

  sql/share/ukrainian/errmsg.txt
    1.27.6.4 03/07/29 17:12:07 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/swedish/errmsg.txt
    1.64.7.5 03/07/29 17:12:07 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/spanish/errmsg.txt
    1.64.7.5 03/07/29 17:12:07 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/slovak/errmsg.txt
    1.64.7.5 03/07/29 17:12:07 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/serbian/errmsg.txt
    1.18.6.5 03/07/29 17:12:07 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/russian/errmsg.txt
    1.61.6.4 03/07/29 17:12:07 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/romanian/errmsg.txt
    1.62.7.5 03/07/29 17:12:07 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/portuguese/errmsg.txt
    1.64.7.3 03/07/29 17:12:07 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/polish/errmsg.txt
    1.63.6.5 03/07/29 17:12:07 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/norwegian/errmsg.txt
    1.63.7.5 03/07/29 17:12:07 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/norwegian-ny/errmsg.txt
    1.63.7.5 03/07/29 17:12:07 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/korean/errmsg.txt
    1.63.6.4 03/07/29 17:12:07 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/japanese/errmsg.txt
    1.63.6.4 03/07/29 17:12:07 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/italian/errmsg.txt
    1.70.7.5 03/07/29 17:12:07 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/hungarian/errmsg.txt
    1.65.6.5 03/07/29 17:12:06 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/greek/errmsg.txt
    1.64.6.5 03/07/29 17:12:06 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/german/errmsg.txt
    1.64.7.5 03/07/29 17:12:06 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/french/errmsg.txt
    1.63.7.5 03/07/29 17:12:06 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/estonian/errmsg.txt
    1.64.6.5 03/07/29 17:12:06 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/english/errmsg.txt
    1.70.9.7 03/07/29 17:12:06 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/dutch/errmsg.txt
    1.66.7.5 03/07/29 17:12:06 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/danish/errmsg.txt
    1.62.7.6 03/07/29 17:12:06 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/share/czech/errmsg.txt
    1.64.7.4 03/07/29 17:12:06 bar@bar.mysql.r18.ru +1 -0
    A new separate error message: Unknown collation 'blablabla'

  sql/set_var.cc
    1.34.12.1 03/07/29 17:12:06 bar@bar.mysql.r18.ru +1 -1
    A new separate error message: Unknown collation 'blablabla'

  sql/item_strfunc.cc
    1.126.1.8 03/07/29 17:12:06 bar@bar.mysql.r18.ru +7 -1
    A new separate error message: Unknown collation 'blablabla'

  mysql-test/t/variables.test
    1.18.1.3 03/07/29 17:12:06 bar@bar.mysql.r18.ru +2 -0
    A new separate error message: Unknown collation 'blablabla'

  mysql-test/t/ctype_collate.test
    1.11 03/07/29 17:12:06 bar@bar.mysql.r18.ru +6 -1
    A new separate error message: Unknown collation 'blablabla'

  mysql-test/r/variables.result
    1.21.1.8 03/07/29 17:12:06 bar@bar.mysql.r18.ru +2 -0
    A new separate error message: Unknown collation 'blablabla'

  mysql-test/r/ctype_collate.result
    1.18 03/07/29 17:12:06 bar@bar.mysql.r18.ru +5 -1
    A new separate error message: Unknown collation 'blablabla'

  include/mysqld_error.h
    1.61.7.1 03/07/29 17:12:06 bar@bar.mysql.r18.ru +2 -1
    A new separate error message: Unknown collation 'blablabla'

ChangeSet
  1.1546.58.1 03/07/29 13:00:32 bell@sanja.is.com.ua +10 -0
  count HAVING clause elements with select list elements, because agregate function can be present in it (BUG#922)
  removerd unused loop_id

  sql/sql_union.cc
    1.74.4.1 03/07/29 13:00:22 bell@sanja.is.com.ua +2 -1
    new name of field

  sql/sql_select.cc
    1.216.12.13 03/07/29 13:00:22 bell@sanja.is.com.ua +2 -1
    new name of field

  sql/sql_lex.h
    1.102.17.1 03/07/29 13:00:22 bell@sanja.is.com.ua +6 -2
    new name of field

  sql/sql_lex.cc
    1.80.3.2 03/07/29 13:00:22 bell@sanja.is.com.ua +1 -1
    new name of field

  sql/sql_derived.cc
    1.43.5.1 03/07/29 13:00:22 bell@sanja.is.com.ua +2 -1
    new name of field

  sql/item_subselect.cc
    1.60.3.5 03/07/29 13:00:22 bell@sanja.is.com.ua +1 -1
    new name of field

  sql/item.h
    1.56.6.10 03/07/29 13:00:22 bell@sanja.is.com.ua +0 -1
    removerd unused loop_id

  sql/item.cc
    1.58.10.8 03/07/29 13:00:22 bell@sanja.is.com.ua +8 -5
    removerd unused loop_id
    we need count HAVING clause elements, because agregate function can be present in it

  mysql-test/t/subselect.test
    1.58.8.4 03/07/29 13:00:22 bell@sanja.is.com.ua +12 -1
    test of BUG#922

  mysql-test/r/subselect.result
    1.67.14.4 03/07/29 13:00:22 bell@sanja.is.com.ua +7 -0
    test of BUG#922

ChangeSet
  1.1546.57.1 03/07/29 00:40:50 gweir@build.mysql.com +2 -0
  logging_ok:
    Logging to logging@openlogging.org accepted
  README.1st:
    new file - Readme for Windows distribution

  BitKeeper/etc/logging_ok
    1.233.1.20 03/07/29 00:39:34 gweir@build.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  Docs/README.1st
    1.1 03/07/29 00:38:04 gweir@build.mysql.com +62 -0

  Docs/README.1st
    1.0 03/07/29 00:38:04 gweir@build.mysql.com +0 -0
    BitKeeper file /users/gweir/mysql-4.1/Docs/README.1st

ChangeSet
  1.1346.283.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.297.1.151 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.1546.56.1 03/07/28 21:21:42 serg@serg.mylan +1 -0
  INSTALL-WIN-SOURCE:
    Change mode to -rw-rw-r--

  INSTALL-WIN-SOURCE
    1.6 03/07/28 20:05:12 serg@serg.mylan +0 -0
    Change mode to -rw-rw-r--

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.1546.55.1 03/07/28 18:28:44 bell@sanja.is.com.ua +3 -0
  tabe & query hashes made case insensitive (BUG#933)

  sql/sql_cache.cc
    1.46.1.4 03/07/28 18:28:34 bell@sanja.is.com.ua +2 -2
    query & table comparision should be case insensitive

  mysql-test/t/query_cache.test
    1.24.1.1 03/07/28 18:28:34 bell@sanja.is.com.ua +12 -2
    fixed charecter sets
    new case sensetive test

  mysql-test/r/query_cache.result
    1.26.1.1 03/07/28 18:28:34 bell@sanja.is.com.ua +22 -12
    fixed charecter sets
    new case sensetive test

ChangeSet
  1.1546.54.1 03/07/28 20:16:11 hf@deer.(none) +1 -0
  Fix for #886

  sql-common/client.c
    1.20 03/07/28 20:15:52 hf@deer.(none) +4 -0
    SOCKET_EINTR is handled differently working in replication

ChangeSet
  1.1546.28.26 03/07/28 14:37:49 serg@serg.mylan +2 -0
  bugs #701 and #783 - old .frm files were read in incorrectly in 4.1 (each field was assigned a charset, BLOBs were converted to TEXT)

ChangeSet
  1.1546.28.25 03/07/28 12:49:06 serg@serg.mylan +2 -0
  test results fixed

ChangeSet
  1.1546.28.24 03/07/28 10:58:50 vva@eagle.mysql.r18.ru +1 -0
  Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
  into eagle.mysql.r18.ru:/home/vva/work/BUG_663/mysql-4.1

  sql/sql_base.cc
    1.145.7.3 03/07/28 10:58:48 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1546.53.1 03/07/28 10:57:46 vva@eagle.mysql.r18.ru +7 -0
  changed for AUTO_VALUE_ON_ZERO

  sql/table.h
    1.48.3.2 03/07/28 10:57:44 vva@eagle.mysql.r18.ru +1 -1
    changed for AUTO_VALUE_ON_ZERO

  sql/sql_insert.cc
    1.86.2.13 03/07/28 10:57:44 vva@eagle.mysql.r18.ru +0 -1
    changed for AUTO_VALUE_ON_ZERO

  sql/sql_base.cc
    1.145.8.2 03/07/28 10:57:44 vva@eagle.mysql.r18.ru +4 -4
    changed for AUTO_VALUE_ON_ZERO

  sql/handler.cc
    1.94.1.2 03/07/28 10:57:44 vva@eagle.mysql.r18.ru +5 -4
    changed for AUTO_VALUE_ON_ZERO

  sql/field_conv.cc
    1.20 03/07/28 10:57:44 vva@eagle.mysql.r18.ru +1 -1
    changed for AUTO_VALUE_ON_ZERO

  mysql-test/t/auto_increment.test
    1.11 03/07/28 10:57:44 vva@eagle.mysql.r18.ru +25 -6
    added test for AUTO_VALUE_ON_ZERO

  mysql-test/r/auto_increment.result
    1.15 03/07/28 10:57:44 vva@eagle.mysql.r18.ru +75 -12
    added test for AUTO_VALUE_ON_ZERO

ChangeSet
  1.1346.283.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.11.1.21 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.

  sql/table.cc
    1.81 03/07/28 14:37:45 serg@serg.mylan +4 -6
    bugs #701 and #783 - old .frm files were read in incorrectly in 4.1 (each field was assigned a charset, BLOBs were converted to TEXT)

  sql/field.h
    1.75 03/07/28 14:37:45 serg@serg.mylan +3 -2
    bugs #701 and #783 - old .frm files were read in incorrectly in 4.1 (each field was assigned a charset, BLOBs were converted to TEXT)

  mysql-test/t/grant2.test
    1.3 03/07/28 12:49:03 serg@serg.mylan +1 -2
    test results fixed

  mysql-test/r/grant2.result
    1.3 03/07/28 12:49:03 serg@serg.mylan +1 -1
    test results fixed

ChangeSet
  1.1546.28.23 03/07/27 10:26:29 serg@serg.mylan +1 -0
  'mysqld --verbose' should not print help screen

  sql/mysqld.cc
    1.356.18.4 03/07/27 10:26:25 serg@serg.mylan +1 -1
    'mysqld --verbose' should not print help screen

ChangeSet
  1.1546.28.22 03/07/27 10:17:04 serg@serg.mylan +1 -0
  ulong is not portable

  include/mysql.h
    1.81 03/07/27 10:17:01 serg@serg.mylan +6 -6
    ulong is not portable

ChangeSet
  1.1546.28.21 03/07/27 09:59:24 serg@serg.mylan +2 -0
  Merge bk-internal:/home/bk/mysql-4.1/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  sql/sql_base.cc
    1.145.7.2 03/07/27 09:59:20 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_acl.cc
    1.74.2.2 03/07/27 09:59:19 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1546.52.1 03/07/26 23:14:09 guilhem@gbichot2 +2 -0
  My changes to test rpl_insert_id in 4.0 about replication of foreign_key_checks
  have in fact no effect, because in 4.0 the slave always runs with --skip-innodb.
  In 4.1, mysqld accepts option --innodb which can override --skip-innodb.
  So I add this option to the test.
  When the updated test (using InnoDB tables) from 4.0 will be merged
  into 4.1, with this good .opt file, we'll have a meaningful test in 4.1.
  Until then, the test in 4.1 will pass but be useless.
  And in 4.0, it will stay useless forever.
  ("it" = the part of the test which tests replication of foreign_key_checks)

  mysql-test/t/rpl_insert_id-slave.opt
    1.1 03/07/26 23:05:42 guilhem@mysql.com +1 -0

  mysql-test/t/rpl_insert_id-slave.opt
    1.0 03/07/26 23:05:42 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.1/mysql-test/t/rpl_insert_id-slave.opt

  BitKeeper/deleted/.del-rpl_insert_id-slave.opt~ba10e66ea50b556
    1.2 03/07/26 23:04:57 guilhem@mysql.com +0 -0
    Delete: mysql-test/rpl_insert_id-slave.opt

  mysql-test/rpl_insert_id-slave.opt
    1.1 03/07/26 23:04:34 guilhem@mysql.com +1 -0

  mysql-test/rpl_insert_id-slave.opt
    1.0 03/07/26 23:04:34 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.1/mysql-test/rpl_insert_id-slave.opt

ChangeSet
  1.1346.298.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.1.1.3 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.2.1.3 03/07/26 17:58:59 guilhem@mysql.com +2 -2
    result update

ChangeSet
  1.1346.283.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.35.1.21 03/07/25 22:24:20 heikki@hundin.mysql.fi +14 -1
    Merge

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

  innobase/include/log0recv.h
    1.6.1.1 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.20.1.10 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.17.1.8 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.19.1.3 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.20.1.6 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.1346.297.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.152.1.94 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.12.1.8 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.8.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

ChangeSet
  1.1546.51.1 03/07/25 11:03:57 gluh@gluh.mysql.r18.ru +1 -0
  Bug#909: mysqld --verbose --help != mysqld --help --verbose
  Proposed fix for bug#909

  sql/mysqld.cc
    1.356.18.3 03/07/25 11:03:46 gluh@gluh.mysql.r18.ru +9 -9
    Bug#909: mysqld --verbose --help != mysqld --help --verbose
    Proposed fix for bug#909

ChangeSet
  1.1346.296.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.77.1.12 03/07/25 09:25:48 gluh@gluh.mysql.r18.ru +6 -1
    Fix: remove compile warnings on RH(with openssl)

ChangeSet
  1.1563.1.1 03/07/25 01:02:42 bell@sanja.is.com.ua +26 -0
  added warning about external fields resolving to EXPLAIN command
  (SCRUM) (WL#1053)

  sql/share/ukrainian/errmsg.txt
    1.27.7.1 03/07/25 01:02:33 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/swedish/errmsg.txt
    1.64.8.1 03/07/25 01:02:33 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/spanish/errmsg.txt
    1.64.8.1 03/07/25 01:02:33 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/slovak/errmsg.txt
    1.64.8.1 03/07/25 01:02:33 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/serbian/errmsg.txt
    1.18.7.1 03/07/25 01:02:33 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/russian/errmsg.txt
    1.61.7.1 03/07/25 01:02:33 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/romanian/errmsg.txt
    1.62.8.1 03/07/25 01:02:33 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/portuguese/errmsg.txt
    1.64.8.1 03/07/25 01:02:33 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/polish/errmsg.txt
    1.63.7.1 03/07/25 01:02:33 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/norwegian/errmsg.txt
    1.63.8.1 03/07/25 01:02:33 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/norwegian-ny/errmsg.txt
    1.63.8.1 03/07/25 01:02:33 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/korean/errmsg.txt
    1.63.7.1 03/07/25 01:02:33 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/japanese/errmsg.txt
    1.63.7.1 03/07/25 01:02:33 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/italian/errmsg.txt
    1.70.8.1 03/07/25 01:02:33 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/hungarian/errmsg.txt
    1.65.7.1 03/07/25 01:02:33 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/greek/errmsg.txt
    1.64.7.1 03/07/25 01:02:33 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/german/errmsg.txt
    1.64.8.1 03/07/25 01:02:32 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/french/errmsg.txt
    1.63.8.1 03/07/25 01:02:32 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/estonian/errmsg.txt
    1.64.7.1 03/07/25 01:02:32 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/english/errmsg.txt
    1.70.10.1 03/07/25 01:02:32 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/dutch/errmsg.txt
    1.66.8.1 03/07/25 01:02:32 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/danish/errmsg.txt
    1.62.8.1 03/07/25 01:02:32 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/czech/errmsg.txt
    1.64.8.1 03/07/25 01:02:32 bell@sanja.is.com.ua +1 -0
    new warning

  sql/item.cc
    1.58.1.26 03/07/25 01:02:32 bell@sanja.is.com.ua +19 -6
    warning for external fields resolving

  mysql-test/r/subselect.result
    1.67.18.1 03/07/25 01:02:32 bell@sanja.is.com.ua +11 -0
    new warning

  include/mysqld_error.h
    1.61.6.1 03/07/25 01:02:32 bell@sanja.is.com.ua +2 -1
    new warning

ChangeSet
  1.1346.295.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.86.1.21 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.1346.295.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.50.1.11 03/07/24 22:25:31 guilhem@mysql.com +2 -1
    declarations.

  sql/slave.cc
    1.164.1.77 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.77.1.43 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.1546.28.18 03/07/24 12:43:57 paul@teton.kitebird.com +24 -0
  Print accounts in error messages as 'user'@'host' rather than 'user@host'.
  The latter is misleading because differs from the syntax used for GRANT/REVOKE.
  
  Fix up test result affected by error message edits.

  sql/share/ukrainian/errmsg.txt
    1.27.6.3 03/07/24 12:43:52 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/swedish/errmsg.txt
    1.64.7.4 03/07/24 12:43:52 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/spanish/errmsg.txt
    1.64.7.4 03/07/24 12:43:52 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/slovak/errmsg.txt
    1.64.7.4 03/07/24 12:43:52 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/serbian/errmsg.txt
    1.18.6.4 03/07/24 12:43:52 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/russian/errmsg.txt
    1.61.6.3 03/07/24 12:43:52 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/romanian/errmsg.txt
    1.62.7.4 03/07/24 12:43:52 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/portuguese/errmsg.txt
    1.64.7.2 03/07/24 12:43:52 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/polish/errmsg.txt
    1.63.6.4 03/07/24 12:43:52 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/norwegian/errmsg.txt
    1.63.7.4 03/07/24 12:43:52 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/norwegian-ny/errmsg.txt
    1.63.7.4 03/07/24 12:43:52 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/korean/errmsg.txt
    1.63.6.3 03/07/24 12:43:52 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/japanese/errmsg.txt
    1.63.6.3 03/07/24 12:43:52 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/italian/errmsg.txt
    1.70.7.4 03/07/24 12:43:52 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/hungarian/errmsg.txt
    1.65.6.4 03/07/24 12:43:51 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/greek/errmsg.txt
    1.64.6.4 03/07/24 12:43:51 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/german/errmsg.txt
    1.64.7.4 03/07/24 12:43:51 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/french/errmsg.txt
    1.63.7.4 03/07/24 12:43:51 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/estonian/errmsg.txt
    1.64.6.4 03/07/24 12:43:51 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/english/errmsg.txt
    1.70.9.6 03/07/24 12:43:51 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/dutch/errmsg.txt
    1.66.7.4 03/07/24 12:43:51 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/danish/errmsg.txt
    1.62.7.5 03/07/24 12:43:51 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  sql/share/czech/errmsg.txt
    1.64.7.3 03/07/24 12:43:51 paul@teton.kitebird.com +5 -5
    Print user@host in syntax actually used for GRANT/REVOKE.

  mysql-test/r/grant_cache.result
    1.6 03/07/24 12:43:51 paul@teton.kitebird.com +5 -5
    Fix up test result to match error message edit.

ChangeSet
  1.1564 03/07/24 15:26:21 bell@sanja.is.com.ua +9 -0
  independent ALL/ANY subselect on top of WHERE clause (subselect without GROUP BY or aggregate functions) optimisation
  
  (SCRUM) (WL#1086)

  sql/sql_yacc.yy
    1.203.56.5 03/07/24 15:26:10 bell@sanja.is.com.ua +3 -3
    support of ALL optimisation

  sql/sql_union.cc
    1.74.1.8 03/07/24 15:26:10 bell@sanja.is.com.ua +0 -1
    removed debuging print

  sql/item_sum.cc
    1.83 03/07/24 15:26:10 bell@sanja.is.com.ua +2 -1
    prevent fixlields call for parameters of min/max if it is already done

  sql/item_subselect.h
    1.35 03/07/24 15:26:10 bell@sanja.is.com.ua +5 -2
    independent ALL/ANY in top of WHERE clause optimisation

  sql/item_subselect.cc
    1.60.1.12 03/07/24 15:26:10 bell@sanja.is.com.ua +64 -13
    independent ALL/ANY in top of WHERE clause optimisation

  sql/item_cmpfunc.h
    1.62 03/07/24 15:26:10 bell@sanja.is.com.ua +10 -0
    new NOT

  sql/item_cmpfunc.cc
    1.100 03/07/24 15:26:10 bell@sanja.is.com.ua +16 -0
    new NOT

  mysql-test/t/subselect.test
    1.58.1.20 03/07/24 15:26:10 bell@sanja.is.com.ua +13 -1
    new optimisation tests

  mysql-test/r/subselect.result
    1.67.1.19 03/07/24 15:26:10 bell@sanja.is.com.ua +17 -0
    new optimisation tests

ChangeSet
  1.1346.283.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.297.1.150 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.16.1.1 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.75.1.23 03/07/23 21:57:39 miguel@hegel.local +1 -0
    Fix for service issue with paths having spaces (bug #687)

ChangeSet
  1.1546.28.17 03/07/23 19:49:42 dlenev@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/dlenev/src/mysql-4.1-local

  BitKeeper/etc/logging_ok
    1.233.1.19 03/07/23 19:49:37 dlenev@mysql.com +0 -0
    auto-union

ChangeSet
  1.1546.49.2 03/07/23 18:50:18 dlenev@dlenev.mshome +2 -0
  Fix security bug. mysqld server without ssl support was completly 
  ignorant about ssl_type attribute

  BitKeeper/etc/logging_ok
    1.233.12.1 03/07/23 18:50:17 dlenev@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_acl.cc
    1.74.3.1 03/07/23 18:49:53 dlenev@mysql.com +10 -4
    Now acl_getroot() honors ssl_type attribute even if we compile without openssl

ChangeSet
  1.1546.28.16 03/07/23 16:48:45 guilhem@gbichot2 +2 -0
  temporary modification of rpl_loaddata.test until 4.0 is merged in 4.1.
  This is to avoid a test failure, which is fixed in 4.0 in
  ChangeSet@1.1455.34.1, 2003-06-10 23:29:49+02:00, guilhem@mysql.com
  by making RESET SLAVE reset the error.

  mysql-test/t/rpl_loaddata.test
    1.6 03/07/23 16:48:38 guilhem@mysql.com +16 -9
    temporary modification until 4.0 is merged in 4.1

  mysql-test/r/rpl_loaddata.result
    1.7 03/07/23 16:48:38 guilhem@mysql.com +0 -4
    temporary modification until 4.0 is merged in 4.1

ChangeSet
  1.1346.1.170 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.145.1.73 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.112.1.52 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.218.1.115 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.111.1.46 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.150.1.52 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.1.1.2 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.2.1.1 03/07/23 17:36:52 Sinisa@sinisa.nasamreza.org +2 -1
    Fuller implementation of lower case table names.
    
    Bug record #828

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

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

ChangeSet
  1.1546.50.1 03/07/23 15:46:46 guilhem@gbichot2 +11 -0
  On Feb 4th, 2003, Monty said he would push my patch to print replicate-do-table
  and other replicate-*-table options in SHOW SLAVE STATUS.
  Seems like it had not been done, so I push it now:
  there's 4 new columns to SHOW SLAVE STATUS.

  sql/slave.h
    1.62.1.1 03/07/23 15:46:38 guilhem@mysql.com +2 -0
    two functions to make a string of replicate_*_table lists.

  sql/slave.cc
    1.188.5.1 03/07/23 15:46:37 guilhem@mysql.com +63 -0
    Print replicate_*_table options in SHOW SLAVE STATUS

  mysql-test/t/rpl_replicate_do.test
    1.17 03/07/23 15:46:37 guilhem@mysql.com +4 -0
    Result update (more columns)

  mysql-test/r/rpl_rotate_logs.result
    1.41 03/07/23 15:46:37 guilhem@mysql.com +6 -6
    Result update (more columns)

  mysql-test/r/rpl_replicate_do.result
    1.14 03/07/23 15:46:37 guilhem@mysql.com +3 -0
    Result update (more columns)

  mysql-test/r/rpl_redirect.result
    1.9 03/07/23 15:46:36 guilhem@mysql.com +1 -1
    Result update (more columns)

  mysql-test/r/rpl_log_pos.result
    1.29 03/07/23 15:46:36 guilhem@mysql.com +8 -8
    Result update (more columns)

  mysql-test/r/rpl_log.result
    1.39 03/07/23 15:46:36 guilhem@mysql.com +2 -2
    Result update (more columns)

  mysql-test/r/rpl_flush_log_loop.result
    1.6 03/07/23 15:46:36 guilhem@mysql.com +2 -2
    Result update (more columns)

  mysql-test/r/rpl_empty_master_crash.result
    1.8 03/07/23 15:46:35 guilhem@mysql.com +1 -1
    Result update (more columns)

  mysql-test/r/rpl000015.result
    1.23 03/07/23 15:46:35 guilhem@mysql.com +7 -7
    Result update (more columns)

ChangeSet
  1.1546.28.13 03/07/23 15:23:20 hf@deer.(none) +7 -0
  SCRUM - adding client into embedded server
  error handling fixed
  fetch_lengths made to work differently in embedded and client cases

  sql/protocol.cc
    1.56.1.11 03/07/23 15:23:18 hf@deer.(none) +2 -0
    handling of sqlstate for embedded library added

  sql-common/client.c
    1.19 03/07/23 15:23:18 hf@deer.(none) +23 -6
    we have to return old fetch_lengths implementation for 'client' case

  libmysqld/libmysqld.c
    1.42 03/07/23 15:23:18 hf@deer.(none) +27 -8
    error data is in mysql->net now

  libmysqld/lib_sql.cc
    1.58 03/07/23 15:23:18 hf@deer.(none) +7 -3
    error informations now is moved from thd->net to mysql-net

  libmysql/libmysql.c
    1.156.1.18 03/07/23 15:23:18 hf@deer.(none) +4 -1
    implementations for fetch_lengths to be 'virtual' added

  include/sql_common.h
    1.6 03/07/23 15:23:18 hf@deer.(none) +0 -1
    fetch_lengths declaration removed

  include/mysql.h
    1.80 03/07/23 15:23:18 hf@deer.(none) +2 -3
    removed 'embedded' error containers - they're unnecessary now
    added declarations for fetch_lengths to be 'virtual'

ChangeSet
  1.1546.21.6 03/07/23 01:35:24 greg@gcw.ath.cx +5 -0
  mysql_test_run.c and associated files, with my initial changes and WAX's changes for Windows

  BitKeeper/etc/logging_ok
    1.242 03/07/23 01:32:44 greg@gcw.ath.cx +1 -0
    Logging to logging@openlogging.org accepted

  netware/mysql_test_run.c
    1.5 03/07/23 01:29:24 greg@gcw.ath.cx +357 -276
    Various changes toward platform independence

  netware/my_manage.h
    1.3 03/07/23 01:29:24 greg@gcw.ath.cx +32 -2
    Various changes toward platform independence

  netware/my_manage.c
    1.3 03/07/23 01:29:24 greg@gcw.ath.cx +521 -247
    Various changes toward platform independence

  netware/Makefile.am
    1.9 03/07/23 01:29:24 greg@gcw.ath.cx +28 -28
    Replace tabs

ChangeSet
  1.1546.49.1 03/07/22 19:02:36 vva@eagle.mysql.r18.ru +4 -0
  Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
  into eagle.mysql.r18.ru:/home/vva/work/BUG_663/mysql-4.1

  sql/sql_insert.cc
    1.86.2.12 03/07/22 19:02:34 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.18.2 03/07/22 19:02:34 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.22.1 03/07/22 19:02:33 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/field_conv.cc
    1.19 03/07/22 19:02:33 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1546.48.1 03/07/22 18:58:30 vva@eagle.mysql.r18.ru +10 -0
  fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump)

  sql/table.h
    1.48.3.1 03/07/22 18:58:21 vva@eagle.mysql.r18.ru +1 -0
    fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump)

  sql/sql_insert.cc
    1.86.5.1 03/07/22 18:58:21 vva@eagle.mysql.r18.ru +1 -0
    fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump)

  sql/sql_base.cc
    1.145.8.1 03/07/22 18:58:21 vva@eagle.mysql.r18.ru +8 -1
    fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump)

  sql/mysqld.cc
    1.356.20.1 03/07/22 18:58:21 vva@eagle.mysql.r18.ru +1 -1
    fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump)

  sql/mysql_priv.h
    1.186.21.1 03/07/22 18:58:21 vva@eagle.mysql.r18.ru +1 -0
    fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump)

  sql/handler.cc
    1.94.1.1 03/07/22 18:58:21 vva@eagle.mysql.r18.ru +4 -1
    fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump)

  sql/field_conv.cc
    1.17.1.1 03/07/22 18:58:21 vva@eagle.mysql.r18.ru +3 -0
    fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump)

  mysql-test/t/auto_increment.test
    1.10 03/07/22 18:58:21 vva@eagle.mysql.r18.ru +14 -0
    fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump)

  mysql-test/r/auto_increment.result
    1.14 03/07/22 18:58:21 vva@eagle.mysql.r18.ru +25 -0
    fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump)

  client/mysqldump.c
    1.94 03/07/22 18:58:21 vva@eagle.mysql.r18.ru +13 -0
    fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump)

ChangeSet
  1.1546.47.5 03/07/22 22:21:23 serg@serg.mylan +12 -0
  now GRANT db.* ... compares patterns correctly to prevent privilege escalation

  sql/sql_yacc.yy
    1.203.57.5 03/07/22 22:21:19 serg@serg.mylan +0 -1
    now GRANT db.* ... compares patterns correctly to prevent privilege escalation

  sql/sql_show.cc
    1.122.4.1 03/07/22 22:21:19 serg@serg.mylan +4 -4
    now GRANT db.* ... compares patterns correctly to prevent privilege escalation

  sql/sql_parse.cc
    1.271.19.1 03/07/22 22:21:19 serg@serg.mylan +2 -2
    now GRANT db.* ... compares patterns correctly to prevent privilege escalation

  sql/sql_db.cc
    1.68.1.6 03/07/22 22:21:19 serg@serg.mylan +7 -7
    now GRANT db.* ... compares patterns correctly to prevent privilege escalation

  sql/sql_base.cc
    1.145.7.1 03/07/22 22:21:19 serg@serg.mylan +1 -1
    now GRANT db.* ... compares patterns correctly to prevent privilege escalation

  sql/sql_acl.h
    1.19.1.1 03/07/22 22:21:19 serg@serg.mylan +1 -1
    now GRANT db.* ... compares patterns correctly to prevent privilege escalation

  sql/sql_acl.cc
    1.74.2.1 03/07/22 22:21:19 serg@serg.mylan +5 -5
    now GRANT db.* ... compares patterns correctly to prevent privilege escalation

  mysys/mf_wfile.c
    1.7 03/07/22 22:21:19 serg@serg.mylan +2 -2
    now GRANT db.* ... compares patterns correctly to prevent privilege escalation

  mysys/mf_wcomp.c
    1.5 03/07/22 22:21:19 serg@serg.mylan +44 -21
    now GRANT db.* ... compares patterns correctly to prevent privilege escalation

  mysql-test/t/grant2.test
    1.2 03/07/22 22:21:19 serg@serg.mylan +6 -12
    now GRANT db.* ... compares patterns correctly to prevent privilege escalation

  mysql-test/r/grant2.result
    1.2 03/07/22 22:21:19 serg@serg.mylan +12 -13
    now GRANT db.* ... compares patterns correctly to prevent privilege escalation

  include/my_sys.h
    1.100.1.2 03/07/22 22:21:19 serg@serg.mylan +1 -1
    now GRANT db.* ... compares patterns correctly to prevent privilege escalation

ChangeSet
  1.1546.47.4 03/07/22 22:00:51 serg@serg.mylan +2 -0
  wild_compare fun: bug in GRANT db_pattern.* ...

  mysql-test/t/grant2.test
    1.1 03/07/22 22:00:48 serg@serg.mylan +37 -0

  mysql-test/t/grant2.test
    1.0 03/07/22 22:00:48 serg@serg.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-4.1/mysql-test/t/grant2.test

  mysql-test/r/grant2.result
    1.1 03/07/22 22:00:47 serg@serg.mylan +24 -0

  mysql-test/r/grant2.result
    1.0 03/07/22 22:00:47 serg@serg.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-4.1/mysql-test/r/grant2.result

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

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

ChangeSet
  1.1563 03/07/22 13:05:03 bell@sanja.is.com.ua +1 -0
  fix olap test filing

  sql/item_sum.cc
    1.82 03/07/22 13:05:02 bell@sanja.is.com.ua +2 -0
    fix olap test filing

ChangeSet
  1.1346.294.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.77.1.9 03/07/22 15:04:30 gluh@gluh.mysql.r18.ru +42 -13
    Bug #554: Support for --with-openssl[=DIR]

ChangeSet
  1.1562 03/07/22 11:20:02 bell@sanja.is.com.ua +3 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1

  sql/sql_select.h
    1.52 03/07/22 11:20:00 bell@sanja.is.com.ua +0 -1
    Auto merged

  sql/item_func.h
    1.68.1.16 03/07/22 11:20:00 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.61 03/07/22 11:20:00 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1553.1.4 03/07/22 11:18:51 bell@sanja.is.com.ua +8 -0
  merge

  sql/item_cmpfunc.h
    1.59.1.1 03/07/22 11:18:49 bell@sanja.is.com.ua +0 -2
    merge

  sql/item_cmpfunc.cc
    1.99 03/07/22 11:18:49 bell@sanja.is.com.ua +0 -0
    merge

  sql/sql_yacc.yy
    1.203.56.4 03/07/22 11:17:00 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.h
    1.48.1.1 03/07/22 11:17:00 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.83 03/07/22 11:17:00 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.h
    1.68.6.1 03/07/22 11:17:00 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.124.1.18 03/07/22 11:17:00 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.56.1.22 03/07/22 11:17:00 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.283.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.191.1.89 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.1346.283.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.20.1.7 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.1346.283.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.20.1.6 03/07/22 03:22:54 heikki@hundin.mysql.fi +14 -14
    Fix an error in the previous push

ChangeSet
  1.1346.283.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.20.1.5 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.1346.283.26 03/07/21 22:21:07 serg@serg.mylan +1 -0
  myisamchk --sort-records crash on compressed tables fixed.

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

ChangeSet
  1.1546.47.3 03/07/21 21:13:52 serg@serg.mylan +1 -0
  gen_lex_hash sigsegv fixed

  sql/gen_lex_hash.cc
    1.55.1.1 03/07/21 21:13:47 serg@serg.mylan +3 -2
    gen_lex_hash sigsegv fixed

ChangeSet
  1.1546.47.2 03/07/21 12:23:41 paul@teton.kitebird.com +1 -0
  INSTALL-WIN-SOURCE:
    tweak

  INSTALL-WIN-SOURCE
    1.5 03/07/21 12:23:21 paul@teton.kitebird.com +1 -1
    tweak

ChangeSet
  1.1546.47.1 03/07/21 19:37:18 venu@hundin.mysql.fi +3 -0
    undo one row warning instead use sql_warnings=1

  mysql-test/r/warnings.result
    1.12 03/07/21 19:35:37 venu@hundin.mysql.fi +3 -0
    Fix result file

  mysql-test/t/warnings.test
    1.12 03/07/21 19:35:04 venu@hundin.mysql.fi +3 -0
    undo one row warning instead use sql_warnings=1

  sql/sql_insert.cc
    1.86.2.11 03/07/21 19:18:58 venu@hundin.mysql.fi +1 -3
    Undo warnings for single row inserts

ChangeSet
  1.1346.283.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.51.1.56 03/07/21 13:46:55 serg@serg.mylan +1 -1
    Bug #473 - GRANT ... TO ''@... was requiring FLUSH PRIVILEGES to work

ChangeSet
  1.1546.30.6 03/07/21 16:19:00 hf@deer.(none) +1 -0
  Another fix for "client code in embedded library"

  include/mysql.h
    1.79 03/07/21 16:18:58 hf@deer.(none) +2 -2
    mysql_close isn't virtual nown

ChangeSet
  1.1546.28.10 03/07/21 00:13:22 venu@myvenu.com +5 -0
  Enable warnings by default for single value list inserts also when the client protocol is >= 4.1

  INSTALL-WIN-SOURCE
    1.4 03/07/21 00:12:40 venu@myvenu.com +1 -1

  mysql-test/r/warnings.result
    1.11 03/07/21 00:11:06 venu@myvenu.com +3 -0
    Updated warnings results

  mysql-test/t/warnings.test
    1.11 03/07/21 00:10:37 venu@myvenu.com +1 -0
    Updated test for single value list insert warning

  sql/sql_insert.cc
    1.86.2.10 03/07/21 00:05:09 venu@myvenu.com +3 -1
    Enable warnings by default for single value list
    protocol

ChangeSet
  1.1546.28.9 03/07/21 00:33:13 serg@serg.mylan +1 -0
  Merge bk-internal:/home/bk/mysql-4.1/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  mysql-test/r/innodb.result
    1.65.1.3 03/07/21 00:33:09 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1546.46.1 03/07/21 00:32:35 serg@serg.mylan +2 -0
  absurd (and syntaxically incorrect) column definition corrected

  mysql-test/t/innodb.test
    1.43 03/07/21 00:32:31 serg@serg.mylan +1 -1
    absurd (and syntaxically incorrect) column definition corrected

  mysql-test/r/innodb.result
    1.65.2.1 03/07/21 00:32:31 serg@serg.mylan +1 -1
    absurd (and syntaxically incorrect) column definition corrected

ChangeSet
  1.1546.45.2 03/07/20 07:00:00 paul@ice.snake.net +4 -0
  Fix test results affected by error message edit.

  mysql-test/r/repair_part1.result
    1.7 03/07/20 06:59:53 paul@ice.snake.net +1 -1
    Fix test result affected by error message edit.

  mysql-test/r/isam.result
    1.16 03/07/20 06:59:53 paul@ice.snake.net +3 -3
    Fix test result affected by error message edit.

  mysql-test/r/innodb.result
    1.65.1.2 03/07/20 06:59:52 paul@ice.snake.net +3 -3
    Fix test result affected by error message edit.

  mysql-test/r/bdb.result
    1.28 03/07/20 06:59:52 paul@ice.snake.net +1 -1
    Fix test result affected by error message edit.

ChangeSet
  1.1546.28.7 03/07/20 12:26:18 serg@serg.mylan +9 -0
  bug #715: SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0'   => syntax error

  sql/sql_yacc.yy
    1.203.57.4 03/07/20 12:26:15 serg@serg.mylan +3 -4
    bug #715: SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0'   => syntax error
    unary '+' added

  sql/sql_lex.cc
    1.80.3.1 03/07/20 12:26:14 serg@serg.mylan +7 -31
    bug #715: SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0'   => syntax error

  sql/item_func.cc
    1.124.3.9 03/07/20 12:26:14 serg@serg.mylan +2 -1
    bug #715: SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0'   => syntax error

  sql/item.h
    1.56.6.9 03/07/20 12:26:14 serg@serg.mylan +1 -1
    round(9999999999999999999) fixed

  mysys/charset.c
    1.97 03/07/20 12:26:14 serg@serg.mylan +2 -3
    bug #715: SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0'   => syntax error

  mysql-test/t/type_decimal.test
    1.12 03/07/20 12:26:14 serg@serg.mylan +3 -3
    error numbers updated

  mysql-test/t/bigint.test
    1.17 03/07/20 12:26:14 serg@serg.mylan +2 -0
    new tests added

  mysql-test/r/type_decimal.result
    1.15 03/07/20 12:26:14 serg@serg.mylan +3 -3
    test results updated

  mysql-test/r/bigint.result
    1.19 03/07/20 12:26:14 serg@serg.mylan +5 -2
    test results updated

ChangeSet
  1.1546.45.1 03/07/19 23:19:19 paul@ice.snake.net +1 -0
  errmsg.txt:
    fix typo

  sql/share/english/errmsg.txt
    1.70.9.5 03/07/19 23:18:09 paul@ice.snake.net +1 -1
    fix typo

ChangeSet
  1.1546.44.1 03/07/19 18:49:04 Sinisa@sinisa.nasamreza.org +7 -0
  Merge

  sql/table.h
    1.48.1.3 03/07/19 18:46:43 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_union.cc
    1.74.2.5 03/07/19 18:46:43 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_table.cc
    1.157.9.1 03/07/19 18:46:43 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_derived.cc
    1.43.2.3 03/07/19 18:46:43 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_base.cc
    1.145.6.1 03/07/19 18:46:43 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.115.4.1 03/07/19 18:46:43 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.67 03/07/19 18:46:42 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

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

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

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

  myisam/myisamchk.c
    1.80.1.22 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.23.1.2 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.1546.28.6 03/07/18 18:06:45 serg@serg.mylan +2 -0
  Merge bk-internal:/home/bk/mysql-4.1/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  sql/sql_yacc.yy
    1.203.57.3 03/07/18 18:06:41 serg@serg.mylan +0 -0
    Auto merged

  sql/item_func.h
    1.68.3.6 03/07/18 18:06:41 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1546.31.24 03/07/18 18:57:21 kostja@oak.local +3 -0
  few compile-time bugs fixed

  sql/sql_class.h
    1.146.1.31 03/07/18 18:56:56 kostja@oak.local +1 -1
    fixed compile-time bug

  sql/sql_class.cc
    1.105.1.14 03/07/18 18:56:56 kostja@oak.local +1 -1
    fixed compile-time bug

  include/mysql.h
    1.70.1.7 03/07/18 18:56:55 kostja@oak.local +1 -1
    fixed compile-time bug

ChangeSet
  1.1546.31.23 03/07/18 18:25:54 kostja@oak.local +11 -0
  Style fixes, comments for 4.1.1 authorization
  Now special 1-byte packet is used for request of old password
  Fixed bug with --skip-grant-tables and acl_getroot

  sql/sql_parse.cc
    1.271.13.4 03/07/18 18:25:19 kostja@oak.local +30 -26
    style fixes
    few comments added

  sql/sql_crypt.cc
    1.6 03/07/18 18:25:19 kostja@oak.local +1 -1
    fixed with new hash_password proto

  sql/sql_class.h
    1.146.1.30 03/07/18 18:25:19 kostja@oak.local +1 -7
    thd->scramble_323 removed as now
    old functions accept not null-terminated scrambles

  sql/sql_acl.cc
    1.74.1.10 03/07/18 18:25:19 kostja@oak.local +34 -20
    style fixes, bug with --skip-grant-tables and acl_getroot
    fixed

  sql/protocol.h
    1.12 03/07/18 18:25:19 kostja@oak.local +1 -0
    added send_old_password_request function

  sql/protocol.cc
    1.56.7.1 03/07/18 18:25:19 kostja@oak.local +19 -0
    added send_old_password_request function

  sql/password.c
    1.29 03/07/18 18:25:19 kostja@oak.local +45 -48
    comments beautified
    hash_password now accepts password length

  sql-common/client.c
    1.11.1.5 03/07/18 18:25:19 kostja@oak.local +7 -6
    now server sends special 1-byte packet instead of old scramble
    to re-request password.
    mysql->scramble_323 replaces with mysql->scramble

  libmysql/libmysql.c
    1.156.5.5 03/07/18 18:25:19 kostja@oak.local +6 -4
    now server sends special 1-byte packet instead of old scramble
    to re-request password.
    mysql->scramble_323 replaced with mysql->scramble

  include/mysql_com.h
    1.67.3.9 03/07/18 18:25:19 kostja@oak.local +2 -2
    updated declarations

  include/mysql.h
    1.70.1.6 03/07/18 18:25:19 kostja@oak.local +2 -2
    removed scramble_323 member as now scramble_323 function does not count
    on trailing zero for scramble

ChangeSet
  1.1546.31.22 03/07/18 18:16:46 kostja@oak.local +1 -0
  Merge oak.local:/home/kostja/mysql/mysql-4.1-root
  into oak.local:/home/kostja/mysql/mysql-4.1

  sql/mysqld.cc
    1.356.1.34 03/07/18 18:16:43 kostja@oak.local +0 -0
    Auto merged

ChangeSet
  1.1546.21.5 03/07/18 16:34:50 bell@sanja.is.com.ua +4 -0
  allow to look up queries with leading comments

  sql/sql_cache.cc
    1.51 03/07/18 16:34:40 bell@sanja.is.com.ua +9 -4
    allow to look up queries with leading comments

  mysql-test/t/query_cache.test
    1.25 03/07/18 16:34:40 bell@sanja.is.com.ua +14 -0
    test of query with leding comment

  mysql-test/r/query_cache.result
    1.27 03/07/18 16:34:40 bell@sanja.is.com.ua +24 -0
    test of query with leding comment

  BitKeeper/etc/ignore
    1.156 03/07/18 16:34:40 bell@sanja.is.com.ua +1 -0
    Added libmysqld/sp_cache.cc to the ignore list

ChangeSet
  1.1546.30.4 03/07/18 16:26:35 hf@deer.(none) +4 -0
  SCRUM
  Including client code into embedded library
  fixes

  sql-common/client.c
    1.18 03/07/18 16:26:32 hf@deer.(none) +5 -20
    We have to redo fetch_lengths to count lengths looking at '\0' in string.
    It works slower, but is correct for both client and embedded libraries

  libmysqld/libmysqld.c
    1.41 03/07/18 16:26:32 hf@deer.(none) +9 -3
    mysql_close can't be "virtual"
    mysqltest.c calls mysql_close before mysql_connect

  libmysqld/lib_sql.cc
    1.57 03/07/18 16:26:32 hf@deer.(none) +3 -0
    Necessary initializations added

  libmysql/libmysql.c
    1.156.1.17 03/07/18 16:26:32 hf@deer.(none) +1 -1
    We should call this way

ChangeSet
  1.1346.1.169 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.20.1.36 03/07/18 14:14:16 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1546.31.21 03/07/18 15:50:40 bar@bar.mysql.r18.ru +2 -0
  All functions now use the same function to aggregate comparison
  and result types

  sql/item_cmpfunc.cc
    1.87.6.8 03/07/18 15:50:38 bar@bar.mysql.r18.ru +41 -48
    All functions now use the same function to aggregate comparison
    and result types

  mysql-test/r/null.result
    1.14 03/07/18 15:50:38 bar@bar.mysql.r18.ru +1 -1
    All functions now use the same function to aggregate comparison
    and result types

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

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

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

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

ChangeSet
  1.1546.43.1 03/07/18 14:11:01 gluh@gluh.mysql.r18.ru +17 -0
  SCRUM:
  Task 499 'init_connect, init_slave options'

  mysql-test/t/rpl_init_slave.test
    1.1 03/07/18 14:10:49 gluh@gluh.mysql.r18.ru +26 -0

  mysql-test/t/rpl_init_slave-slave.opt
    1.1 03/07/18 14:10:49 gluh@gluh.mysql.r18.ru +1 -0

  mysql-test/t/init_connect.test
    1.1 03/07/18 14:10:49 gluh@gluh.mysql.r18.ru +34 -0

  mysql-test/t/rpl_init_slave.test
    1.0 03/07/18 14:10:49 gluh@gluh.mysql.r18.ru +0 -0
    BitKeeper file /home/gluh/mysql-4.1.init/mysql-test/t/rpl_init_slave.test

  mysql-test/t/rpl_init_slave-slave.opt
    1.0 03/07/18 14:10:49 gluh@gluh.mysql.r18.ru +0 -0
    BitKeeper file /home/gluh/mysql-4.1.init/mysql-test/t/rpl_init_slave-slave.opt

  mysql-test/t/init_connect.test
    1.0 03/07/18 14:10:49 gluh@gluh.mysql.r18.ru +0 -0
    BitKeeper file /home/gluh/mysql-4.1.init/mysql-test/t/init_connect.test

  mysql-test/t/init_connect-master.opt
    1.1 03/07/18 14:10:48 gluh@gluh.mysql.r18.ru +1 -0

  mysql-test/r/rpl_init_slave.result
    1.1 03/07/18 14:10:48 gluh@gluh.mysql.r18.ru +23 -0

  mysql-test/r/init_connect.result
    1.1 03/07/18 14:10:48 gluh@gluh.mysql.r18.ru +24 -0

  sql/sql_show.cc
    1.122.1.12 03/07/18 14:10:48 gluh@gluh.mysql.r18.ru +5 -2
    Task 499 'init_connect, init_slave options'

  sql/sql_parse.cc
    1.271.18.1 03/07/18 14:10:48 gluh@gluh.mysql.r18.ru +47 -3
    Task 499 'init_connect, init_slave options'

  sql/sql_class.h
    1.146.14.1 03/07/18 14:10:48 gluh@gluh.mysql.r18.ru +1 -0
    Task 499 'init_connect, init_slave options'

  sql/sql_class.cc
    1.105.2.1 03/07/18 14:10:48 gluh@gluh.mysql.r18.ru +1 -0
    Task 499 'init_connect, init_slave options'

  sql/slave.cc
    1.188.4.1 03/07/18 14:10:48 gluh@gluh.mysql.r18.ru +32 -0
    Task 499 'init_connect, init_slave options'

  sql/set_var.h
    1.29.1.1 03/07/18 14:10:48 gluh@gluh.mysql.r18.ru +3 -0
    Task 499 'init_connect, init_slave options'

  sql/set_var.cc
    1.34.11.1 03/07/18 14:10:48 gluh@gluh.mysql.r18.ru +91 -0
    Task 499 'init_connect, init_slave options'

  sql/protocol.cc
    1.56.5.4 03/07/18 14:10:48 gluh@gluh.mysql.r18.ru +2 -0
    Task 499 'init_connect, init_slave options'

  sql/mysqld.cc
    1.356.19.1 03/07/18 14:10:48 gluh@gluh.mysql.r18.ru +26 -3
    Task 499 'init_connect, init_slave options'

  sql/mysql_priv.h
    1.186.20.1 03/07/18 14:10:48 gluh@gluh.mysql.r18.ru +1 -1
    Task 499 'init_connect, init_slave options'

  mysql-test/t/init_connect-master.opt
    1.0 03/07/18 14:10:48 gluh@gluh.mysql.r18.ru +0 -0
    BitKeeper file /home/gluh/mysql-4.1.init/mysql-test/t/init_connect-master.opt

  mysql-test/r/rpl_init_slave.result
    1.0 03/07/18 14:10:48 gluh@gluh.mysql.r18.ru +0 -0
    BitKeeper file /home/gluh/mysql-4.1.init/mysql-test/r/rpl_init_slave.result

  mysql-test/r/init_connect.result
    1.0 03/07/18 14:10:48 gluh@gluh.mysql.r18.ru +0 -0
    BitKeeper file /home/gluh/mysql-4.1.init/mysql-test/r/init_connect.result

  mysql-test/mysql-test-run.sh
    1.168 03/07/18 14:10:48 gluh@gluh.mysql.r18.ru +1 -1
    Task 499 'init_connect, init_slave options'
    This change needs because mysql-test-run cuts string variable on first space

ChangeSet
  1.1546.31.19 03/07/18 14:03:54 bar@bar.mysql.r18.ru +4 -0
  IN now aggregates all argument types for comparison

  sql/item_cmpfunc.h
    1.50.3.6 03/07/18 14:03:51 bar@bar.mysql.r18.ru +1 -0
    IN now aggregates all argument types for comparison

  sql/item_cmpfunc.cc
    1.87.6.7 03/07/18 14:03:51 bar@bar.mysql.r18.ru +4 -3
    IN now aggregates all argument types for comparison

  mysql-test/t/func_in.test
    1.8 03/07/18 14:03:51 bar@bar.mysql.r18.ru +8 -0
    IN now aggregates all argument types for comparison

  mysql-test/r/func_in.result
    1.9 03/07/18 14:03:51 bar@bar.mysql.r18.ru +21 -0
    IN now aggregates all argument types for comparison

ChangeSet
  1.1546.41.1 03/07/18 13:28:38 gluh@gluh.mysql.r18.ru +1 -0
  Scrum task 425: Added --verbose option for --help

  sql/mysqld.cc
    1.356.18.1 03/07/18 13:28:36 gluh@gluh.mysql.r18.ru +17 -3
    Scrum task 425: Added --verbose option for --help

ChangeSet
  1.1546.31.18 03/07/18 13:11:47 bar@bar.mysql.r18.ru +1 -0
  CASE optimization

  sql/item_cmpfunc.cc
    1.87.6.6 03/07/18 13:11:44 bar@bar.mysql.r18.ru +30 -28
    CASE optimization

ChangeSet
  1.1546.31.17 03/07/18 12:42:35 bar@bar.mysql.r18.ru +3 -0
  Some fixes in CASE.
  Test suit was extended to conver various arguments mixes.

  sql/item_cmpfunc.cc
    1.87.6.5 03/07/18 12:42:33 bar@bar.mysql.r18.ru +2 -3
    Some fixes in CASE.
    Test suit was extended to conver various arguments mixes.

  mysql-test/t/case.test
    1.10 03/07/18 12:42:33 bar@bar.mysql.r18.ru +38 -1
    Some fixes in CASE.
    Test suit was extended to conver various arguments mixes.

  mysql-test/r/case.result
    1.9 03/07/18 12:42:33 bar@bar.mysql.r18.ru +44 -2
    Some fixes in CASE.
    Test suit was extended to conver various arguments mixes.

ChangeSet
  1.1346.293.2 03/07/18 04:37:37 monty@narttu.mysql.fi +1 -0
  Removed wrong "Found lock of type # that is write and read locked" warnings.

  mysys/thr_lock.c
    1.34.1.2 03/07/18 04:37:35 monty@narttu.mysql.fi +14 -7
    Removed wrong "Found lock of type # that is write and read locked" warnings.

ChangeSet
  1.1346.293.1 03/07/18 04:04:24 monty@narttu.mysql.fi +6 -0
  Fixed memory overrun when doing REPAIR on table with multi-part auto_increment key where one part was a packed CHAR

  sql/sql_acl.cc
    1.51.1.55 03/07/18 04:04:22 monty@narttu.mysql.fi +5 -1
    Fixed core dump when running with --debug

  mysys/safemalloc.c
    1.23 03/07/18 04:04:22 monty@narttu.mysql.fi +3 -3
    Removed compiler warnings

  mysql-test/t/insert_select.test
    1.5.1.5 03/07/18 04:04:22 monty@narttu.mysql.fi +10 -0
    Added test case for memory corruption

  mysql-test/r/insert_select.result
    1.7.1.5 03/07/18 04:04:22 monty@narttu.mysql.fi +5 -0
    Added test case for memory corruption

  myisam/mi_key.c
    1.13.1.4 03/07/18 04:04:22 monty@narttu.mysql.fi +1 -1
    Fixed unnecessary memory allocation

  myisam/mi_check.c
    1.86.1.33 03/07/18 04:04:22 monty@narttu.mysql.fi +18 -4
    Fixed memory overrun in _mi_put_key_in_record

ChangeSet
  1.1346.292.1 03/07/17 20:17:46 serg@serg.mylan +3 -0
  my_strnncoll_latin1_de rewritten from scratch. Bug with overlapping combos went away.

  strings/ctype-latin1_de.c
    1.7.1.2 03/07/17 20:17:43 serg@serg.mylan +49 -108
    my_strnncoll_latin1_de rewritten from scratch. Bug with overlapping combos went away.

  mysql-test/t/ctype_latin1_de.test
    1.4.1.3 03/07/17 20:17:43 serg@serg.mylan +4 -0
    testing overlapping combos

  mysql-test/r/ctype_latin1_de.result
    1.7.1.1 03/07/17 20:17:43 serg@serg.mylan +3 -0
    testing overlapping combos

ChangeSet
  1.1546.37.3 03/07/17 18:35:09 bar@bar.mysql.r18.ru +2 -0
  CASE now aggregates all argument types instead of using the only one argument

ChangeSet
  1.1561 03/07/17 19:39:31 bell@sanja.is.com.ua +8 -0
  new optimisation for ref_null (SCRUM) (WL#818)

  sql/sql_select.h
    1.51 03/07/17 19:39:29 bell@sanja.is.com.ua +1 -0
    item_subselect.cc need safe_index_read

  sql/sql_select.cc
    1.216.1.20 03/07/17 19:39:29 bell@sanja.is.com.ua +45 -26
    new optimisation for ref_or_null

  sql/item_subselect.h
    1.34 03/07/17 19:39:28 bell@sanja.is.com.ua +6 -2
    new optimisation for ref_or_null

  sql/item_subselect.cc
    1.60.1.11 03/07/17 19:39:28 bell@sanja.is.com.ua +19 -3
    new optimisation for ref_or_null

  sql/item_func.h
    1.68.1.15 03/07/17 19:39:28 bell@sanja.is.com.ua +1 -1
    function type

  sql/item_cmpfunc.h
    1.60 03/07/17 19:39:28 bell@sanja.is.com.ua +1 -0
    function type

  mysql-test/t/subselect.test
    1.58.1.19 03/07/17 19:39:28 bell@sanja.is.com.ua +5 -1
    results of new optimisation

  mysql-test/r/subselect.result
    1.67.1.18 03/07/17 19:39:28 bell@sanja.is.com.ua +14 -1
    results of new optimisation

ChangeSet
  1.1546.38.1 03/07/17 12:15:41 vva@eagle.mysql.r18.ru +1 -0
  fixed bug with location of mysql_create_sytem_tables

  scripts/mysql_install_db.sh
    1.37.1.10 03/07/17 12:15:39 vva@eagle.mysql.r18.ru +1 -1
    fixed bug with location of mysql_create_sytem_tables

  sql/item_cmpfunc.h
    1.50.3.5 03/07/17 18:35:06 bar@bar.mysql.r18.ru +2 -1
    CASE now aggregates all argument types instead of using the only one argument

  sql/item_cmpfunc.cc
    1.87.6.4 03/07/17 18:35:06 bar@bar.mysql.r18.ru +51 -9
    CASE now aggregates all argument types instead of using the only one argument

  tests/client_test.c
    1.34 03/07/17 05:20:04 venu@myvenu.com +87 -4
    test for timestamp bug (BR #819)

ChangeSet
  1.1546.37.1 03/07/17 16:07:56 bar@bar.mysql.r18.ru +4 -0
  CASE stores first_expr and else_expr in args[] array now.
  This allowed to reuse a lot of code. 

  sql/item_func.h
    1.68.5.2 03/07/17 16:07:54 bar@bar.mysql.r18.ru +1 -0
    CASE stores first_expr and else_expr in args[] array now.
    This allowed to reuse a lot of code. 

  sql/item_func.cc
    1.124.3.8 03/07/17 16:07:54 bar@bar.mysql.r18.ru +8 -3
    CASE stores first_expr and else_expr in args[] array now.
    This allowed to reuse a lot of code. 

  sql/item_cmpfunc.h
    1.50.3.4 03/07/17 16:07:54 bar@bar.mysql.r18.ru +17 -7
    CASE stores first_expr and else_expr in args[] array now.
    This allowed to reuse a lot of code. 

  sql/item_cmpfunc.cc
    1.87.6.3 03/07/17 16:07:54 bar@bar.mysql.r18.ru +20 -98
    CASE stores first_expr and else_expr in args[] array now.
    This allowed to reuse a lot of code. 

ChangeSet
  1.1546.36.2 03/07/17 14:55:13 kostja@oak.local +27 -0
  Merge oak.local:/home/kostja/mysql/mysql-4.1-root
  into oak.local:/home/kostja/mysql/mysql-4.1

  sql/sql_yacc.yy
    1.203.1.55 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/ukrainian/errmsg.txt
    1.27.1.15 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/swedish/errmsg.txt
    1.64.1.18 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/spanish/errmsg.txt
    1.64.1.16 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/slovak/errmsg.txt
    1.64.1.16 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/serbian/errmsg.txt
    1.18.1.14 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/russian/errmsg.txt
    1.61.1.16 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/romanian/errmsg.txt
    1.62.1.16 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/portuguese/errmsg.txt
    1.64.1.17 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.63.1.16 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/norwegian/errmsg.txt
    1.63.1.16 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.16 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/korean/errmsg.txt
    1.63.1.15 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/japanese/errmsg.txt
    1.63.1.15 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/italian/errmsg.txt
    1.70.1.16 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/hungarian/errmsg.txt
    1.65.1.15 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/greek/errmsg.txt
    1.64.1.15 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/german/errmsg.txt
    1.64.1.16 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/french/errmsg.txt
    1.63.1.16 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/estonian/errmsg.txt
    1.64.1.15 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.70.1.20 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/dutch/errmsg.txt
    1.66.1.16 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/danish/errmsg.txt
    1.62.1.16 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/share/czech/errmsg.txt
    1.64.1.16 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/lex.h
    1.82.1.38 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/item_strfunc.h
    1.67 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.130 03/07/17 14:55:09 kostja@oak.local +0 -0
    Auto merged

ChangeSet
  1.1546.35.2 03/07/17 10:21:30 bar@bar.mysql.r18.ru +1 -0
  ctype-utf8.c:
    Stupid bug fix

  strings/ctype-utf8.c
    1.48 03/07/17 10:21:02 bar@bar.mysql.r18.ru +1 -1
    Stupid bug fix

ChangeSet
  1.1546.31.15 03/07/16 23:47:48 paul@ice.snake.net +4 -0
  Fix openssl_2 test so it passes or fails. (It was being reported
  as [skipped], even when run explicitly.)

  mysql-test/t/openssl_2.test
    1.6 03/07/16 23:47:35 paul@ice.snake.net +1 -1
    Use actual lettercase of SSL status variables.
    (Test will work with uppercase, but there's no
    reason not to use the actual lettercase.)

  mysql-test/r/openssl_2.result
    1.4 03/07/16 23:47:35 paul@ice.snake.net +24 -1
    Add output of SHOW STATUS to test result.

  mysql-test/r/have_openssl_2.require
    1.3 03/07/16 23:47:35 paul@ice.snake.net +1 -1
    Require file required garbage. Fix to require something sensible.

  mysql-test/include/have_openssl_2.inc
    1.3 03/07/16 23:47:35 paul@ice.snake.net +1 -1
    There is no such variable as SSL_get_cipher.

ChangeSet
  1.1346.290.1 03/07/16 18:15:35 vva@eagle.mysql.r18.ru +1 -0
  fixed bug Bug #683 (Prompt for password doesn't go to console for Windows)

  client/get_password.c
    1.8.1.1 03/07/16 18:15:14 vva@eagle.mysql.r18.ru +1 -1
    fixed bug Bug #683 (Prompt for password doesn't go to console for Windows)

ChangeSet
  1.1546.1.6 03/07/16 13:57:04 igor@rurik.mysql.com +1 -0
  Makefile.am:
    Added mi_keycache.c

  myisam/Makefile.am
    1.25 03/07/16 13:56:34 igor@rurik.mysql.com +1 -1
    Added mi_keycache.c

ChangeSet
  1.1546.1.5 03/07/16 13:35:34 igor@rurik.mysql.com +11 -0
  Conflict resolution

  sql/mysqld.cc
    1.356.17.1 03/07/16 13:35:32 igor@rurik.mysql.com +1 -1
    Manual merge

  sql/sql_yacc.yy
    1.203.58.4 03/07/16 12:53:51 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_table.cc
    1.157.2.10 03/07/16 12:53:51 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.17.1 03/07/16 12:53:51 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.16.1 03/07/16 12:53:51 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_lex.cc
    1.80.1.2 03/07/16 12:53:51 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/opt_range.cc
    1.92 03/07/16 12:53:51 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.19.1 03/07/16 12:53:51 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.50.1.10 03/07/16 12:53:51 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/handler.cc
    1.95 03/07/16 12:53:51 igor@rurik.mysql.com +0 -0
    Auto merged

  include/my_sys.h
    1.102 03/07/16 12:53:51 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1546.31.14 03/07/16 14:37:00 paul@ice.snake.net +23 -0
  Error message consistency edits + updates to affected test results.

  sql/share/english/errmsg.txt
    1.70.9.4 03/07/16 14:36:53 paul@ice.snake.net +2 -2
    Error message consistency edits.

  sql/share/ukrainian/errmsg.txt
    1.27.6.2 03/07/16 14:36:52 paul@ice.snake.net +1 -1
    Error message consistency edits.

  sql/share/swedish/errmsg.txt
    1.64.7.3 03/07/16 14:36:52 paul@ice.snake.net +2 -2
    Error message consistency edits.

  sql/share/spanish/errmsg.txt
    1.64.7.3 03/07/16 14:36:52 paul@ice.snake.net +2 -2
    Error message consistency edits.

  sql/share/slovak/errmsg.txt
    1.64.7.3 03/07/16 14:36:52 paul@ice.snake.net +2 -2
    Error message consistency edits.

  sql/share/serbian/errmsg.txt
    1.18.6.3 03/07/16 14:36:52 paul@ice.snake.net +2 -2
    Error message consistency edits.

  sql/share/romanian/errmsg.txt
    1.62.7.3 03/07/16 14:36:52 paul@ice.snake.net +2 -2
    Error message consistency edits.

  sql/share/portuguese/errmsg.txt
    1.64.7.1 03/07/16 14:36:52 paul@ice.snake.net +2 -2
    Error message consistency edits.

  sql/share/polish/errmsg.txt
    1.63.6.3 03/07/16 14:36:52 paul@ice.snake.net +2 -2
    Error message consistency edits.

  sql/share/danish/errmsg.txt
    1.62.7.4 03/07/16 14:36:52 paul@ice.snake.net +2 -2
    Error message consistency edits.

  sql/share/norwegian/errmsg.txt
    1.63.7.3 03/07/16 14:36:51 paul@ice.snake.net +2 -2
    Error message consistency edits.

  sql/share/norwegian-ny/errmsg.txt
    1.63.7.3 03/07/16 14:36:51 paul@ice.snake.net +2 -2
    Error message consistency edits.

  sql/share/italian/errmsg.txt
    1.70.7.3 03/07/16 14:36:51 paul@ice.snake.net +2 -2
    Error message consistency edits.

  sql/share/hungarian/errmsg.txt
    1.65.6.3 03/07/16 14:36:51 paul@ice.snake.net +2 -2
    Error message consistency edits.

  sql/share/greek/errmsg.txt
    1.64.6.3 03/07/16 14:36:51 paul@ice.snake.net +1 -1
    Error message consistency edits.

  sql/share/german/errmsg.txt
    1.64.7.3 03/07/16 14:36:51 paul@ice.snake.net +17 -17
    Error message consistency edits.

  sql/share/french/errmsg.txt
    1.63.7.3 03/07/16 14:36:51 paul@ice.snake.net +2 -2
    Error message consistency edits.

  sql/share/estonian/errmsg.txt
    1.64.6.3 03/07/16 14:36:51 paul@ice.snake.net +2 -2
    Error message consistency edits.

  sql/share/dutch/errmsg.txt
    1.66.7.3 03/07/16 14:36:51 paul@ice.snake.net +2 -2
    Error message consistency edits.

  sql/share/czech/errmsg.txt
    1.64.7.2 03/07/16 14:36:51 paul@ice.snake.net +2 -2
    Error message consistency edits.

  mysql-test/r/type_blob.result
    1.25 03/07/16 14:36:50 paul@ice.snake.net +1 -1
    Fix test result to correspond to error message edits.

  mysql-test/r/repair_part2.result
    1.2 03/07/16 14:36:50 paul@ice.snake.net +1 -1
    Fix test result to correspond to error message edits.

  mysql-test/r/innodb.result
    1.65.1.1 03/07/16 14:36:50 paul@ice.snake.net +1 -1
    Fix test result to correspond to error message edits.

ChangeSet
  1.1546.1.4 03/07/16 12:30:49 igor@rurik.mysql.com +12 -0
  mi_keycache.c:
    new file
  Many files:
    Added CACHE INDEX command

  myisam/mi_keycache.c
    1.1 03/07/16 12:02:26 igor@rurik.mysql.com +47 -0

  myisam/mi_keycache.c
    1.0 03/07/16 12:02:26 igor@rurik.mysql.com +0 -0
    BitKeeper file /home/igor/dev/mysql-4.1-0/myisam/mi_keycache.c

  include/myisam.h
    1.50 03/07/16 12:00:55 igor@rurik.mysql.com +2 -0

  sql/sql_yacc.yy
    1.203.59.1 03/07/16 11:59:16 igor@rurik.mysql.com +35 -6
    Added CACHE INDEX command

  sql/sql_lex.h
    1.102.14.3 03/07/16 11:58:43 igor@rurik.mysql.com +6 -3
    Added CACHE INDEX command

  sql/mysql_priv.h
    1.186.18.1 03/07/16 11:58:16 igor@rurik.mysql.com +1 -0
    Added CACHE INDEX command

  sql/handler.h
    1.82 03/07/16 11:57:12 igor@rurik.mysql.com +1 -0
    Added CACHE INDEX command

  sql/ha_myisam.h
    1.48 03/07/16 11:56:38 igor@rurik.mysql.com +1 -0
    Added CACHE INDEX command

  sql/sql_table.cc
    1.157.8.1 03/07/16 11:56:12 igor@rurik.mysql.com +21 -0
    Added CACHE INDEX command

  sql/sql_parse.cc
    1.271.16.1 03/07/16 11:55:50 igor@rurik.mysql.com +11 -2
    Added CACHE INDEX command

  sql/sql_lex.cc
    1.78.2.3 03/07/16 11:55:03 igor@rurik.mysql.com +2 -1
    Added CACHE INDEX command

  sql/handler.cc
    1.93.1.2 03/07/16 11:54:39 igor@rurik.mysql.com +5 -0
    Added CACHE INDEX command

  sql/ha_myisam.cc
    1.115.1.4 03/07/16 11:53:25 igor@rurik.mysql.com +58 -0
    Added CACHE INDEX command

  sql/share/english/errmsg.txt
    1.70.9.3 03/07/16 10:55:32 paul@ice.snake.net +2 -2
    store engine -> storage engine

ChangeSet
  1.1346.283.18 03/07/16 17:13:45 lenz@mysql.com +1 -0
   - heavily reworked the comments and layout of the new sample my.cnf file
     as requested by PeterZ

  support-files/my-innodb-heavy-4G.cnf.sh
    1.2 03/07/16 17:13:42 lenz@mysql.com +312 -272
     - heavily reworked the comments and layout as requested by PeterZ

ChangeSet
  1.1559 03/07/16 14:11:35 bell@sanja.is.com.ua +2 -0
  fixed memory leak

  sql/item_sum.h
    1.44 03/07/16 14:11:34 bell@sanja.is.com.ua +2 -2
    fixed initialization

  sql/item_sum.cc
    1.81 03/07/16 14:11:34 bell@sanja.is.com.ua +5 -0
    fixed memory leak

ChangeSet
  1.1553.1.3 03/07/16 13:58:11 bell@sanja.is.com.ua +6 -0
  merge

  sql/item_strfunc.h
    1.63.1.3 03/07/16 13:58:09 bell@sanja.is.com.ua +0 -5
    merge

  sql/item_func.h
    1.68.1.14 03/07/16 13:58:09 bell@sanja.is.com.ua +0 -5
    merge

  sql/item_cmpfunc.h
    1.59 03/07/16 13:58:09 bell@sanja.is.com.ua +0 -5
    merge

  sql/sql_yacc.yy
    1.203.56.3 03/07/16 13:53:29 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.124.1.17 03/07/16 13:53:29 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.98 03/07/16 13:53:29 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.283.17 03/07/16 12:06:55 lenz@mysql.com +2 -0
   - fixed the automatic generation of support-files/MacOSX/ReadMe.txt - 
     a node name was changed in manual.texi which resulted in a very large
     ReadMe.txt file, as the generating script could not find the (renamed)
     ending node. Fixed the ending node name in Docs/Makefile.am and the 
     Docs/Support/generate-text-files.pl Perl script to make sure this does
     not happen again (I only discovered this because the Do-pkg script was
     not able to add the ReadMe.txt to the Apple Disk image because it ran out
     of disk space due to the size of the file)

  Docs/Support/generate-text-files.pl
    1.3 03/07/16 12:06:52 lenz@mysql.com +6 -3
     - added a safeguard: if the ending node was not found, abort with an error
       to indicate that the generated text file might be too large (as it would
       contain the whole manual, down from the starting node)
     - made some cosmetical changes

  Docs/Makefile.am
    1.38.1.1 03/07/16 12:06:52 lenz@mysql.com +1 -1
     - Fixed a node name that was changed in manual.texi and resulted in
       the generation of a _very_ large ReadMe.txt file (down to the very end
       of the manual, since the ending node was not found)

ChangeSet
  1.1546.35.1 03/07/16 11:29:16 bar@bar.mysql.r18.ru +8 -0
  Item_func_null doesn't have a separate Item for the first argument anymore.
  args[0] is used instead. This allowed to resuse a lot of code.

  sql/sql_yacc.yy
    1.203.58.3 03/07/16 11:28:21 bar@bar.mysql.r18.ru +4 -4
    Item_func_null doesn't have a separate Item for the first argument anymore.
    args[0] is used instead. This allowed to resuse a lot of code.

  sql/opt_range.cc
    1.90.1.2 03/07/16 11:28:21 bar@bar.mysql.r18.ru +2 -2
    Item_func_null doesn't have a separate Item for the first argument anymore.
    args[0] is used instead. This allowed to resuse a lot of code.

  sql/item_cmpfunc.h
    1.50.3.3 03/07/16 11:28:21 bar@bar.mysql.r18.ru +5 -21
    Item_func_null doesn't have a separate Item for the first argument anymore.
    args[0] is used instead. This allowed to resuse a lot of code.

  sql/item_cmpfunc.cc
    1.87.6.2 03/07/16 11:28:21 bar@bar.mysql.r18.ru +28 -50
    Item_func_null doesn't have a separate Item for the first argument anymore.
    args[0] is used instead. This allowed to resuse a lot of code.

  mysql-test/t/func_str.test
    1.37 03/07/16 11:28:21 bar@bar.mysql.r18.ru +5 -5
    Item_func_null doesn't have a separate Item for the first argument anymore.
    args[0] is used instead. This allowed to resuse a lot of code.

  mysql-test/t/func_in.test
    1.7 03/07/16 11:28:21 bar@bar.mysql.r18.ru +19 -0
    Item_func_null doesn't have a separate Item for the first argument anymore.
    args[0] is used instead. This allowed to resuse a lot of code.

  mysql-test/r/func_str.result
    1.39 03/07/16 11:28:21 bar@bar.mysql.r18.ru +5 -5
    Item_func_null doesn't have a separate Item for the first argument anymore.
    args[0] is used instead. This allowed to resuse a lot of code.

  mysql-test/r/func_in.result
    1.8 03/07/16 11:28:21 bar@bar.mysql.r18.ru +32 -0
    Item_func_null doesn't have a separate Item for the first argument anymore.
    args[0] is used instead. This allowed to resuse a lot of code.

ChangeSet
  1.1546.31.11 03/07/15 14:37:22 paul@teton.kitebird.com +2 -0
  Update openssl_1 test.

  mysql-test/t/openssl_1.test
    1.6 03/07/15 14:37:17 paul@teton.kitebird.com +2 -0
    Update openssl_1 test.

  mysql-test/r/openssl_1.result
    1.6 03/07/15 14:37:17 paul@teton.kitebird.com +4 -4
    Update openssl_1 test.

ChangeSet
  1.1346.283.16 03/07/15 20:44:29 serg@serg.mylan +1 -0
  Merge bk-internal:/home/bk/mysql-4.0/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.0

  sql/handler.cc
    1.82.1.22 03/07/15 20:44:26 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1346.289.1 03/07/15 20:43:57 serg@serg.mylan +2 -0
  bug #702 - ALTER TABLE tm UNION=(t1,t2) doesn't work if t1.MYD is compressed

  sql/handler.cc
    1.82.5.1 03/07/15 20:43:54 serg@serg.mylan +3 -0
    map EACCES to ER_OPEN_AS_READONLY.
    can only happen on modifying merge table that has (some) read-only myisam tables

  myisammrg/myrg_open.c
    1.22 03/07/15 20:43:54 serg@serg.mylan +3 -6
    never mark merge table as readonly even if all underlying myisam tables are readonly,
    otherwise ALTER TABLE merge UNION=(t1,t2,t3,...) will not work

  sql/share/danish/errmsg.txt
    1.62.7.3 03/07/15 12:21:42 paul@ice.snake.net +2 -2
    Use same word consistently.

ChangeSet
  1.1546.34.1 03/07/15 11:33:01 paul@ice.snake.net +21 -0
  Modifications to error messages, and affected test results.

  sql/share/swedish/errmsg.txt
    1.64.7.2 03/07/15 11:32:55 paul@ice.snake.net +5 -5
    Ellipses are three dots, not four or five.
    Remove other extraneous periods.

  sql/share/spanish/errmsg.txt
    1.64.7.2 03/07/15 11:32:55 paul@ice.snake.net +2 -2
    Ellipses are three dots, not four or five.
    Remove other extraneous periods.

  sql/share/slovak/errmsg.txt
    1.64.7.2 03/07/15 11:32:55 paul@ice.snake.net +2 -2
    Ellipses are three dots, not four or five.
    Remove other extraneous periods.

  sql/share/serbian/errmsg.txt
    1.18.6.2 03/07/15 11:32:55 paul@ice.snake.net +2 -2
    Ellipses are three dots, not four or five.
    Remove other extraneous periods.

  sql/share/russian/errmsg.txt
    1.61.6.2 03/07/15 11:32:54 paul@ice.snake.net +2 -2
    Ellipses are three dots, not four or five.
    Remove other extraneous periods.

  sql/share/romanian/errmsg.txt
    1.62.7.2 03/07/15 11:32:54 paul@ice.snake.net +2 -2
    Ellipses are three dots, not four or five.
    Remove other extraneous periods.

  sql/share/polish/errmsg.txt
    1.63.6.2 03/07/15 11:32:54 paul@ice.snake.net +2 -2
    Ellipses are three dots, not four or five.
    Remove other extraneous periods.

  sql/share/norwegian/errmsg.txt
    1.63.7.2 03/07/15 11:32:54 paul@ice.snake.net +2 -2
    Ellipses are three dots, not four or five.
    Remove other extraneous periods.

  sql/share/norwegian-ny/errmsg.txt
    1.63.7.2 03/07/15 11:32:54 paul@ice.snake.net +2 -2
    Ellipses are three dots, not four or five.
    Remove other extraneous periods.

  sql/share/korean/errmsg.txt
    1.63.6.2 03/07/15 11:32:54 paul@ice.snake.net +3 -3
    Ellipses are three dots, not four or five.
    Remove other extraneous periods.

  sql/share/japanese/errmsg.txt
    1.63.6.2 03/07/15 11:32:54 paul@ice.snake.net +3 -3
    Remove extraneous periods.

  sql/share/italian/errmsg.txt
    1.70.7.2 03/07/15 11:32:53 paul@ice.snake.net +2 -2
    Ellipses are three dots, not four or five.
    Remove other extraneous periods.

  sql/share/hungarian/errmsg.txt
    1.65.6.2 03/07/15 11:32:53 paul@ice.snake.net +2 -2
    Remove extraneous periods.

  sql/share/greek/errmsg.txt
    1.64.6.2 03/07/15 11:32:53 paul@ice.snake.net +2 -2
    Ellipses are three dots, not four or five.
    Remove other extraneous periods.

  sql/share/german/errmsg.txt
    1.64.7.2 03/07/15 11:32:53 paul@ice.snake.net +2 -2
    Remove extraneous periods.

  sql/share/french/errmsg.txt
    1.63.7.2 03/07/15 11:32:53 paul@ice.snake.net +1 -1
    Remove extraneous periods.

  sql/share/estonian/errmsg.txt
    1.64.6.2 03/07/15 11:32:53 paul@ice.snake.net +1 -1
    Remove extraneous periods.

  sql/share/english/errmsg.txt
    1.70.9.2 03/07/15 11:32:53 paul@ice.snake.net +4 -4
    Ellipses are three dots, not four or five.
    Remove other extraneous periods.

  sql/share/dutch/errmsg.txt
    1.66.7.2 03/07/15 11:32:52 paul@ice.snake.net +2 -2
    Remove extraneous periods.

  sql/share/danish/errmsg.txt
    1.62.7.2 03/07/15 11:32:52 paul@ice.snake.net +2 -2
    Ellipses are three dots, not four or five.
    Remove other extraneous periods.

  mysql-test/r/merge.result
    1.25 03/07/15 11:32:52 paul@ice.snake.net +2 -2
    Sync to modified error message.

ChangeSet
  1.1546.28.5 03/07/15 15:20:22 serg@serg.mylan +1 -0
  cut&paste fixed

  sql/sql_select.h
    1.47.1.1 03/07/15 15:20:16 serg@serg.mylan +1 -1
    cut&paste fixed

ChangeSet
  1.1546.33.1 03/07/15 18:11:49 bar@bar.mysql.r18.ru +5 -0
  ELT passes the first argument in args[0] instead of having a separate Item.

  sql/sql_yacc.yy
    1.203.58.2 03/07/15 18:11:46 bar@bar.mysql.r18.ru +1 -1
    ELT passes the first argument in args[0] instead of having a separate Item.

  sql/item_strfunc.h
    1.63.2.1 03/07/15 18:11:46 bar@bar.mysql.r18.ru +1 -17
    ELT passes the first argument in args[0] instead of having a separate Item.

  sql/item_strfunc.cc
    1.126.1.7 03/07/15 18:11:46 bar@bar.mysql.r18.ru +8 -36
    ELT passes the first argument in args[0] instead of having a separate Item.

  mysql-test/t/func_str.test
    1.36 03/07/15 18:11:46 bar@bar.mysql.r18.ru +2 -2
    ELT passes the first argument in args[0] instead of having a separate Item.

  mysql-test/r/func_str.result
    1.38 03/07/15 18:11:46 bar@bar.mysql.r18.ru +2 -2
    ELT passes the first argument in args[0] instead of having a separate Item.

ChangeSet
  1.1546.28.3 03/07/15 14:58:04 serg@serg.mylan +2 -0
  Merge bk-internal:/home/bk/mysql-4.1/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  sql/sql_yacc.yy
    1.203.57.2 03/07/15 14:58:00 serg@serg.mylan +0 -0
    Auto merged

  sql/item_func.h
    1.68.3.5 03/07/15 14:58:00 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1546.2.17 03/07/15 15:53:20 monty@mashka.(none) +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mashka.(none):/home/my/mysql-4.1

  BitKeeper/etc/logging_ok
    1.233.11.1 03/07/15 15:53:17 monty@mashka.(none) +1 -0
    Logging to logging@openlogging.org accepted

ChangeSet
  1.1546.32.1 03/07/15 17:38:01 ram@mysql.r18.ru +1 -0
  bugfix for the bugfix for the bug #539

  client/mysql.cc
    1.121.1.18 03/07/15 17:37:59 ram@mysql.r18.ru +4 -5
    bugfix for the bugfix for the bug #539

ChangeSet
  1.1546.31.8 03/07/15 17:33:00 bar@bar.mysql.r18.ru +5 -0
  Item_func_field doesn't have a separate Item to store the first argument.
  It's now passed as args[0]. This fix allowed to resuse a lot of code.

  sql/sql_yacc.yy
    1.203.58.1 03/07/15 17:32:57 bar@bar.mysql.r18.ru +1 -1
    Item_func_field doesn't have a separate Item to store the first argument.
    It's now passed as args[0]. This fix allowed to resuse a lot of code.

  sql/item_func.h
    1.68.5.1 03/07/15 17:32:57 bar@bar.mysql.r18.ru +1 -20
    Item_func_field doesn't have a separate Item to store the first argument.
    It's now passed as args[0]. This fix allowed to resuse a lot of code.

  sql/item_func.cc
    1.124.3.7 03/07/15 17:32:57 bar@bar.mysql.r18.ru +12 -43
    Item_func_field doesn't have a separate Item to store the first argument.
    It's now passed as args[0]. This fix allowed to resuse a lot of code.

  mysql-test/t/func_str.test
    1.35 03/07/15 17:32:57 bar@bar.mysql.r18.ru +2 -2
    Item_func_field doesn't have a separate Item to store the first argument.
    It's now passed as args[0]. This fix allowed to resuse a lot of code.

  mysql-test/r/func_str.result
    1.37 03/07/15 17:32:57 bar@bar.mysql.r18.ru +2 -2
    Item_func_field doesn't have a separate Item to store the first argument.
    It's now passed as args[0]. This fix allowed to resuse a lot of code.

ChangeSet
  1.1346.283.15 03/07/15 12:50:17 lenz@mysql.com +1 -0
   - removed options sort_buffer and key_buffer from calls to (my)isamchk
     in mysqld_safe (commented out by default), to not override any options
     defined in my.cnf (thanks to Axel Schwenke from Jobpilot.de for the
     suggestion)

  scripts/mysqld_safe.sh
    1.56.1.7 03/07/15 12:50:15 lenz@mysql.com +8 -4
     - removed options sort_buffer and key_buffer from calls to (my)isamchk
       in mysqld_safe (commented out by default), to not override any options
       defined in my.cnf (thanks to Axel Schwenke from Jobpilot.de for the
       suggestion)

ChangeSet
  1.1346.283.14 03/07/15 13:10:20 monty@narttu.mysql.fi +2 -0
  Portability fixes

  sql/item_strfunc.cc
    1.36.1.31 03/07/15 13:10:18 monty@narttu.mysql.fi +4 -0
    Portability fix (for Linux Alpha)

  acinclude.m4
    1.77.1.7 03/07/15 13:10:18 monty@narttu.mysql.fi +10 -3
    Made test for compress more reliable (for Solaris)

ChangeSet
  1.1546.31.7 03/07/15 14:38:48 ram@mysql.r18.ru +1 -0
  mysql should ignore ' " ` symbols inside comments (Bug #539).

  client/mysql.cc
    1.121.1.17 03/07/15 14:38:46 ram@mysql.r18.ru +8 -6
    mysql should ignore ' " ` symbols inside comments (Bug #539).

ChangeSet
  1.1546.31.6 03/07/15 12:55:29 gluh@gluh.mysql.r18.ru +1 -0
  Fix bug: mysqld crashes on func_sapdb test.

  sql/item_timefunc.cc
    1.38 03/07/15 12:55:06 gluh@gluh.mysql.r18.ru +1 -1
    Fix bug: mysqld crashes on func_sapdb test.

ChangeSet
  1.1346.283.13 03/07/14 23:52:17 monty@narttu.mysql.fi +2 -0
  merge

  mysql-test/t/rpl_max_relay_size.test
    1.3 03/07/14 23:52:15 monty@narttu.mysql.fi +0 -6
    merge

  mysql-test/r/rpl_max_relay_size.result
    1.3 03/07/14 23:50:11 monty@narttu.mysql.fi +0 -6
    Auto merged

ChangeSet
  1.1346.288.1 03/07/14 23:49:19 monty@narttu.mysql.fi +3 -0
  Fixed wrong test in LOG::close
  Fixed test for binary build

  sql/log.cc
    1.80.1.52 03/07/14 23:49:17 monty@narttu.mysql.fi +2 -2
    Fixed wrong test in close

  mysql-test/t/rpl_max_relay_size.test
    1.1.1.1 03/07/14 23:49:17 monty@narttu.mysql.fi +6 -0
    Fixed test for binary build

  mysql-test/r/rpl_max_relay_size.result
    1.1.1.1 03/07/14 23:49:17 monty@narttu.mysql.fi +6 -6
    Fixed test for binary build

ChangeSet
  1.1346.283.12 03/07/14 22:02:26 guilhem@mysql.com +2 -0
  Added missing --replace_result for ports in SHOW SLAVE STATUS.

  mysql-test/t/rpl_max_relay_size.test
    1.2 03/07/14 22:02:21 guilhem@mysql.com +6 -0
    port-independent test

  mysql-test/r/rpl_max_relay_size.result
    1.2 03/07/14 22:02:21 guilhem@mysql.com +6 -6
    result update

ChangeSet
  1.1546.31.2 03/07/14 19:28:36 bar@bar.mysql.r18.ru +3 -0
  COALESCE now aggregates its argument types in this way:
  if some of the arguments is STRING_RESULT the STRING_RESULT
  else if some of the arguments is REAL_RESULT then REAL_RESULT
  else INT_RESULT 

  sql/item_cmpfunc.cc
    1.87.6.1 03/07/14 19:28:33 bar@bar.mysql.r18.ru +6 -0
    COALESCE now aggregates its argument types in this way:
    if some of the arguments is STRING_RESULT the STRING_RESULT
    else if some of the arguments is REAL_RESULT then REAL_RESULT
    else INT_RESULT 

  mysql-test/t/case.test
    1.9 03/07/14 19:28:33 bar@bar.mysql.r18.ru +22 -0
    COALESCE now aggregates its argument types in this way:
    if some of the arguments is STRING_RESULT the STRING_RESULT
    else if some of the arguments is REAL_RESULT then REAL_RESULT
    else INT_RESULT 

  mysql-test/r/case.result
    1.8 03/07/14 19:28:32 bar@bar.mysql.r18.ru +21 -0
    COALESCE now aggregates its argument types in this way:
    if some of the arguments is STRING_RESULT the STRING_RESULT
    else if some of the arguments is REAL_RESULT then REAL_RESULT
    else INT_RESULT 

ChangeSet
  1.1346.283.11 03/07/14 16:04:20 heikki@hundin.mysql.fi +1 -0
  errmsg.txt:
    Correct a misleading error message about max row length

  sql/share/english/errmsg.txt
    1.51.1.16 03/07/14 16:04:12 heikki@hundin.mysql.fi +1 -1
    Correct a misleading error message about max row length

ChangeSet
  1.1546.31.1 03/07/14 18:00:27 bar@bar.mysql.r18.ru +2 -0
  A test for character conversion in ALTER TABLE was added

  mysql-test/t/alter_table.test
    1.16 03/07/14 18:00:24 bar@bar.mysql.r18.ru +27 -0
    A test for character conversion in ALTER TABLE was added

  mysql-test/r/alter_table.result
    1.21 03/07/14 18:00:24 bar@bar.mysql.r18.ru +39 -0
    A test for character conversion in ALTER TABLE was added

ChangeSet
  1.1346.283.10 03/07/14 15:53:50 heikki@hundin.mysql.fi +1 -0
  ha_innodb.h:
    Revert the previous patch: MySQL would not allow creation of VARCHAR columns whose total max length is > 8000 bytes, though InnoDB can easily store them as trailing spaces are removed

  sql/ha_innodb.h
    1.48.2.13 03/07/14 15:53:39 heikki@hundin.mysql.fi +1 -3
    Revert the previous patch: MySQL would not allow creation of VARCHAR columns whose total max length is > 8000 bytes, though InnoDB can easily store them as trailing spaces are removed

ChangeSet
  1.1346.283.9 03/07/14 15:38:20 heikki@hundin.mysql.fi +1 -0
  ha_innodb.h:
    Fix wrong error message: If one tried to create table with a very big row len, MySQL claimed the max len is 64 kB for InnoDB, while it normally is 8000 bytes

  sql/ha_innodb.h
    1.48.2.12 03/07/14 15:38:10 heikki@hundin.mysql.fi +3 -2
    Fix wrong error message: If one tried to create table with a very big row len, MySQL claimed the max len is 64 kB for InnoDB, while it normally is 8000 bytes

ChangeSet
  1.1346.283.8 03/07/14 14:59:26 monty@narttu.mysql.fi +5 -0
  Better fix for bug #791: At binlog rotation, INSERTs may not find their way into the binlog

  sql/sql_class.h
    1.111.1.45 03/07/14 14:59:24 monty@narttu.mysql.fi +8 -4
    Better handling of log.close()

  sql/slave.cc
    1.164.1.76 03/07/14 14:59:24 monty@narttu.mysql.fi +3 -3
    Fix argument to close()

  sql/mysqld.cc
    1.297.1.149 03/07/14 14:59:24 monty@narttu.mysql.fi +2 -2
    Better startup message

  sql/log.cc
    1.80.1.51 03/07/14 14:59:24 monty@narttu.mysql.fi +16 -14
    Better fix for bug #791:
    Mark log as LOG_TO_BE_OPENED instead of LOG_CLOSED when it's closed and opened.

  mysql-test/t/rpl_flush_log_loop.test
    1.2.1.1 03/07/14 14:59:24 monty@narttu.mysql.fi +1 -0
    Add timer to avoid problem when 'flush logs' is executed before we have read all data from master

ChangeSet
  1.1546.30.1 03/07/14 16:41:58 hf@deer.(none) +5 -0
  Including client code into libmysqld
  Merging 

  sql/net_serv.cc
    1.59 03/07/14 16:41:57 hf@deer.(none) +0 -2
    #ifndef was removed

  sql/protocol.cc
    1.56.1.10 03/07/14 16:39:24 hf@deer.(none) +0 -0
    Auto merged

  libmysql/libmysql.c
    1.156.1.16 03/07/14 16:39:24 hf@deer.(none) +0 -0
    Auto merged

  include/mysql_com.h
    1.67.1.10 03/07/14 16:39:24 hf@deer.(none) +0 -0
    Auto merged

  include/mysql.h
    1.78 03/07/14 16:39:24 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1546.17.2 03/07/14 16:38:51 hf@deer.(none) +5 -0
  Some mistakes fixed

  sql/sql_client.cc
    1.4 03/07/14 16:38:49 hf@deer.(none) +0 -2
    we do need this function

  sql-common/pack.c
    1.4 03/07/14 16:38:49 hf@deer.(none) +0 -18
    Function was moved to old place

  libmysqld/libmysqld.c
    1.40 03/07/14 16:38:49 hf@deer.(none) +0 -1
    We don't need this line here

  libmysqld/Makefile.am
    1.29.1.7 03/07/14 16:38:49 hf@deer.(none) +1 -0
    link should be removed first

  libmysql/libmysql.c
    1.156.1.15 03/07/14 16:38:49 hf@deer.(none) +20 -0
    was removed by mistake during merging

ChangeSet
  1.1546.29.1 03/07/14 15:32:31 ram@mysql.r18.ru +4 -0
  Fix for the bug #841: wrong number of warnings

  sql/sql_update.cc
    1.83.2.9 03/07/14 15:32:23 ram@mysql.r18.ru +4 -4
    Fix for the bug #841: wrong number of warnings

  sql/sql_table.cc
    1.157.2.9 03/07/14 15:32:23 ram@mysql.r18.ru +2 -2
    Fix for the bug #841: wrong number of warnings

  sql/sql_load.cc
    1.46.3.8 03/07/14 15:32:23 ram@mysql.r18.ru +2 -2
    Fix for the bug #841: wrong number of warnings

  sql/sql_insert.cc
    1.86.2.9 03/07/14 15:32:23 ram@mysql.r18.ru +9 -10
    Fix for the bug #841: wrong number of warnings

ChangeSet
  1.1546.28.1 03/07/14 10:54:22 serg@serg.mylan +3 -0
  Merge bk-internal:/home/bk/mysql-4.1/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  sql/sql_yacc.yy
    1.203.57.1 03/07/14 10:54:17 serg@serg.mylan +0 -0
    Auto merged

  sql/item_create.h
    1.28.1.1 03/07/14 10:54:17 serg@serg.mylan +0 -0
    Auto merged

  sql/item_create.cc
    1.33.5.1 03/07/14 10:54:17 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1346.287.1 03/07/14 12:40:58 hf@deer.(none) +3 -0
  Proposed bugfix for #712
  Monty revoked any locks for temporary tables in
  ha_myisam::external_lock()
  But further code bans using write cache on nonlocked tables
  this makes operations much slower

  sql/ha_myisam.cc
    1.92.1.34 03/07/14 12:40:57 hf@deer.(none) +5 -4
    now we lock temporary tables using MI_TEMPORARY_TABLE lock

  myisam/myisamdef.h
    1.45.1.14 03/07/14 12:40:57 hf@deer.(none) +1 -0
    defining of MI_TEMPORARY_TABLE

  myisam/mi_locking.c
    1.23.1.1 03/07/14 12:40:57 hf@deer.(none) +8 -0
    Handling of MI_TEMPORARY_TABLE lock

ChangeSet
  1.1346.286.1 03/07/14 12:39:10 ram@mysql.r18.ru +2 -0
  backport fix for the bug #803: INTERVAL(NULL, ....)

  sql/item_cmpfunc.cc
    1.20.3.2 03/07/14 12:39:08 ram@mysql.r18.ru +2 -5
    backport fix for the bug #803: INTERVAL(NULL, ....)

  mysql-test/r/func_set.result
    1.4.1.2 03/07/14 12:39:08 ram@mysql.r18.ru +1 -1
    backport fix for the bug #803: INTERVAL(NULL, ....)

ChangeSet
  1.1346.284.13 03/07/14 10:12:05 monty@mashka.mysql.fi +17 -0
  Safety and speedup fixes:
  Changed is_open() to work as before.
  Added back inited argument to LOG

  sql/sql_update.cc
    1.54.1.36 03/07/14 10:12:03 monty@mashka.mysql.fi +2 -2
    Changed is_open() to work as before

  sql/sql_table.cc
    1.112.1.51 03/07/14 10:12:03 monty@mashka.mysql.fi +5 -5
    Changed is_open() to work as before

  sql/sql_repl.cc
    1.86.1.20 03/07/14 10:12:03 monty@mashka.mysql.fi +6 -6
    Changed is_open() to work as before

  sql/sql_rename.cc
    1.13.1.6 03/07/14 10:12:03 monty@mashka.mysql.fi +1 -1
    Changed is_open() to work as before

  sql/sql_parse.cc
    1.218.1.114 03/07/14 10:12:03 monty@mashka.mysql.fi +2 -2
    Changed is_open() to work as before

  sql/sql_load.cc
    1.34.1.14 03/07/14 10:12:03 monty@mashka.mysql.fi +4 -4
    Changed is_open() to work as before

  sql/sql_insert.cc
    1.63.1.39 03/07/14 10:12:03 monty@mashka.mysql.fi +4 -4
    Changed is_open() to work as before

  sql/sql_delete.cc
    1.74.1.24 03/07/14 10:12:03 monty@mashka.mysql.fi +3 -3
    Changed is_open() to work as before

  sql/sql_db.cc
    1.39.1.23 03/07/14 10:12:03 monty@mashka.mysql.fi +2 -2
    Changed is_open() to work as before

  sql/sql_class.h
    1.111.1.44 03/07/14 10:12:03 monty@mashka.mysql.fi +5 -9
    Changed is_open() to work as before. Added back 'inited' variable

  sql/sql_base.cc
    1.117.1.47 03/07/14 10:12:03 monty@mashka.mysql.fi +1 -1
    Changed is_open() to work as before

  sql/repl_failsafe.cc
    1.11.1.20 03/07/14 10:12:03 monty@mashka.mysql.fi +1 -1
    Changed is_open() to work as before

  sql/log_event.cc
    1.77.1.42 03/07/14 10:12:03 monty@mashka.mysql.fi +5 -5
    Changed is_open() to work as before

  sql/log.cc
    1.80.1.50 03/07/14 10:12:03 monty@mashka.mysql.fi +33 -40
    Part revert of previous patch.
    The reason for adding back 'inited' is that is that we can't be 100 % sure that init_pthread_objects() is called before mysqld dies (for example on windows)
    I removed mutex lock handling in is_open() as the new code didn't have ANY affect except beeing slower.
    Added back checking of is_open() to some functions as we don't want to do a mutex lock when we are not using logging.
    Indentation/comment fixes

  sql/item_func.cc
    1.60.1.37 03/07/14 10:12:03 monty@mashka.mysql.fi +1 -1
    Changed is_open() to work as before

  sql/handler.cc
    1.82.1.21 03/07/14 10:12:03 monty@mashka.mysql.fi +2 -2
    Changed is_open() to work as before

  mysql-test/r/rpl_flush_log_loop.result
    1.3.1.2 03/07/14 10:12:03 monty@mashka.mysql.fi +1 -1
    Fixed results (probably bug in previous rpatch)

ChangeSet
  1.1546.27.1 03/07/14 05:54:08 monty@mashka.mysql.fi +1 -0
  Fixed wrong getopt table which caused core dumps

  sql/gen_lex_hash.cc
    1.56 03/07/14 05:54:05 monty@mashka.mysql.fi +1 -0
    Fixed wrong getopt table which caused core dumps

ChangeSet
  1.1546.24.4 03/07/13 09:53:31 venu@myvenu.com +1 -0
  Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1
  into myvenu.com:/home/venu/work/sql/dev-4.1

  sql/item_strfunc.cc
    1.126.1.6 03/07/13 09:53:27 venu@myvenu.com +0 -0
    Auto merged

ChangeSet
  1.1346.284.12 03/07/13 18:50:43 heikki@hundin.mysql.fi +1 -0
  srv0srv.c:
    Put back a 50 millisecond sleep in too high concurrency situations which I removed in the previous push; count also such sleeping threads to the InnoDB queue in SHOW INNODB STATUS

  innobase/srv/srv0srv.c
    1.35.1.20 03/07/13 18:50:33 heikki@hundin.mysql.fi +24 -1
    Put back a 50 millisecond sleep in too high concurrency situations which I removed in the previous push; count also such sleeping threads to the InnoDB queue in SHOW INNODB STATUS

ChangeSet
  1.1346.284.11 03/07/13 17:18:06 heikki@hundin.mysql.fi +1 -0
  srv0srv.c:
    Fix a benign bug introduced in 4.0.14: InnoDB could complain 'Error: trying to declare trx to enter InnoDB' if several threads tried to init the auto-inc counter for the same table at the same time; in theory, the bug could even lead to a hang of the server, but that shuld be extremely improbable

  innobase/srv/srv0srv.c
    1.35.1.19 03/07/13 17:17:45 heikki@hundin.mysql.fi +20 -25
    Fix a benign bug introduced in 4.0.14: InnoDB could complain 'Error: trying to declare trx to enter InnoDB' if several threads tried to init the auto-inc counter for the same table at the same time; in theory, the bug could even lead to a hang of the server, but that shuld be extremely improbable

ChangeSet
  1.1553.1.2 03/07/13 13:04:59 bell@sanja.is.com.ua +5 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1

  sql/sql_yacc.yy
    1.203.56.2 03/07/13 13:04:57 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.1.10 03/07/13 13:04:57 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.82 03/07/13 13:04:57 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.17.1 03/07/13 13:04:57 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.124.1.16 03/07/13 13:04:56 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1546.26.2 03/07/13 01:20:15 miguel@hegel.local +1 -0
  Removed unreferenced local variable

  sql/item_strfunc.cc
    1.126.2.1 03/07/13 01:20:10 miguel@hegel.local +0 -1
    Removed unreferenced local variable

ChangeSet
  1.1546.26.1 03/07/12 23:31:21 guilhem@gbichot2 +3 -0
  Added SHOW MASTER LOGS as synonym for SHOW BINARY LOGS.
  Added PURGE BINARY LOGS as synonym for PURGE MASTER LOGS.
  Removed PURGE LOGS (now PURGE MASTER LOGS).
  Added SHOW BDB LOGS as synonym for SHOW LOGS.
  Note: tests key_cache.test hanged, rpl_log_pos.test, rpl_rotate_logs.test failed for me.
  For the second and third one I guess this will disappear after merging 4.0.

  sql/sql_yacc.yy
    1.203.56.1 03/07/12 23:31:14 guilhem@mysql.com +8 -3
    Added SHOW MASTER LOGS as synonym for SHOW BINARY LOGS.
    Added PURGE BINARY LOGS as synonym for PURGE MASTER LOGS.
    Removed PURGE LOGS (now PURGE MASTER LOGS).
    Added SHOW BDB LOGS as synonym for SHOW LOGS.

  mysql-test/t/rpl_rotate_logs.test
    1.43 03/07/12 23:31:14 guilhem@mysql.com +4 -1
    added test for synonym PURGE BINARY LOGS, changed PURGE LOGS to
    PURGE MASTER LOGS.

  mysql-test/r/rpl_rotate_logs.result
    1.40 03/07/12 23:31:14 guilhem@mysql.com +6 -1
    result update

ChangeSet
  1.1346.284.10 03/07/13 00:17:02 heikki@hundin.mysql.fi +4 -0
  srv0start.c, srv0srv.h, os0file.h, os0file.c:
    Allow also O_DIRECT as innodb_flush_method; it only affects writing to data files

  innobase/srv/srv0start.c
    1.37.1.11 03/07/13 00:16:42 heikki@hundin.mysql.fi +4 -0
    Allow also O_DIRECT as innodb_flush_method; it only affects writing to data files

  innobase/include/srv0srv.h
    1.21.1.4 03/07/13 00:16:25 heikki@hundin.mysql.fi +1 -0
    Allow also O_DIRECT as innodb_flush_method; it only affects writing to data files

  innobase/include/os0file.h
    1.19 03/07/13 00:16:24 heikki@hundin.mysql.fi +5 -1
    Allow also O_DIRECT as innodb_flush_method; it only affects writing to data files

  innobase/os/os0file.c
    1.44.1.13 03/07/13 00:16:07 heikki@hundin.mysql.fi +86 -31
    Allow also O_DIRECT as innodb_flush_method; it only affects writing to data files

ChangeSet
  1.1346.284.9 03/07/12 11:45:43 paul@ice.local +2 -0
  perror.c:
    fix typo.

  BitKeeper/etc/logging_ok
    1.206.1.73 03/07/12 11:45:41 paul@ice.local +1 -0
    Logging to logging@openlogging.org accepted

  extra/perror.c
    1.20.1.1 03/07/12 11:44:35 paul@ice.local +1 -1
    fix typo.

ChangeSet
  1.1346.284.8 03/07/12 16:04:42 guilhem@mysql.com +1 -0
  Cleaning after removing LOG_INFO_PURGE_NO_ROTATE.

  sql/sql_repl.cc
    1.86.1.19 03/07/12 16:04:37 guilhem@mysql.com +0 -2
    In my previous change I removed 'no_rotate' from MYSQL_LOG, so this made
    LOG_INFO_PURGE_NO_ROTATE useless (an error code which was never returned),
    so I remove it of the 'switch'.

ChangeSet
  1.1346.284.7 03/07/12 15:48:26 guilhem@mysql.com +2 -0
  Member no_rotate in MYSQL_LOG was always 0, I delete it.

  sql/sql_class.h
    1.111.1.43 03/07/12 15:48:19 guilhem@mysql.com +0 -2
    suppress no_rotate

  sql/log.cc
    1.80.1.49 03/07/12 15:48:19 guilhem@mysql.com +32 -43
    Member no_rotate of MYSQL_LOG is useless; this shows it for sure:
    [guilhem@gbichot2 mysql-4.0]$ bk -r grep no_rotate
    sql/log.cc      1.83       no_rotate(0), need_start_event(1)
    sql/log.cc      1.75      if (no_rotate)
    sql/log.cc      1.89      if (!no_rotate)
    sql/sql_class.h 1.119     bool no_rotate;
    i.e. no_rotate is 0 all the time. So we don't need it.
    Biggest part of the patch is indentation change.

ChangeSet
  1.1346.285.1 03/07/12 15:06:40 guilhem@mysql.com +3 -0
  removed 2 small useless if().

  sql/sql_class.h
    1.111.1.42 03/07/12 15:06:34 guilhem@mysql.com +0 -1
    remove set_no_rotate as we don't need it.

  sql/mysqld.cc
    1.297.1.148 03/07/12 15:06:34 guilhem@mysql.com +3 -8
    if (p) is not needed: fn_ext() always returns a valid pointed; the way
    to test if an extension was found is if (*p), not if (p).
    But here even if there's no extension, we still want to truncate opt_name
    to FN_REFLEN, so we always execute the code.
    By design, the test was always 'false' (because we strip the extension before
    testing if there's an extension) so log->set_no_rotate never executed.

  sql/log.cc
    1.80.1.48 03/07/12 15:06:33 guilhem@mysql.com +8 -1
    a comment for the future.

ChangeSet
  1.1546.25.1 03/07/11 18:55:03 venu@myvenu.com +4 -0
  Add the support of 'SUBSTR' function compatible with Oracle and SAPDB (SCRUM #872)

  mysql-test/r/func_str.result
    1.36 03/07/11 18:52:44 venu@myvenu.com +21 -0
    Updated SUBSTR results

  mysql-test/t/func_str.test
    1.34 03/07/11 18:52:24 venu@myvenu.com +11 -0
    New tests for SUBSTR

  sql/item_strfunc.cc
    1.126.1.5 03/07/11 18:51:35 venu@myvenu.com +2 -1
    Implement SUBSTR negative offset

  sql/lex.h
    1.82.14.1 03/07/11 18:51:19 venu@myvenu.com +1 -0
    Add SUBSTR aliased to SUBSTRING

ChangeSet
  1.1346.284.5 03/07/11 22:18:53 lenz@mysql.com +2 -0
   - fixed an error in the rpl_error_ignored_table test suite: the master
     port number can be different from 3306 when doing the release builds
     with Do-compile, therefore it has to be replaced with the correct
     value during the test run using the "--replace_result" function.

  mysql-test/t/rpl_error_ignored_table.test
    1.2 03/07/11 22:18:50 lenz@mysql.com +3 -0
     - replaced hard-coded master port number with MASTER_PORT variable, since
       the port number is different when running the test suite during the 
       release builds with "Do-compile".

  mysql-test/r/rpl_error_ignored_table.result
    1.2 03/07/11 22:18:50 lenz@mysql.com +1 -1
     - replaced hard-coded master port number with MASTER_PORT variable, since
       the port number is different when running the test suite during the 
       release builds with "Do-compile".

ChangeSet
  1.1346.284.4 03/07/11 19:32:29 lenz@mysql.com +1 -0
   - fixed a typo in previous push

  Build-tools/Bootstrap
    1.6 03/07/11 19:32:27 lenz@mysql.com +2 -1
     - duh!

ChangeSet
  1.1346.284.3 03/07/11 18:24:13 lenz@mysql.com +1 -0
   - fixed a bug in Bootstrap script: simply searching for the last tagged 
     ChangeSet was not sufficient to get the full ChangeLog between two
     released versions (when using "--changelog=last") as merging between 
     trees also merges the BK tags. Now we explicitely search for the last
     tagged ChangeSet that matches our major+minor version number, which 
     should match the last ChangeSet used for the previous release.

  Build-tools/Bootstrap
    1.5 03/07/11 18:24:11 lenz@mysql.com +3 -1
     - fixed a bug: simply searching for the last tagged ChangeSet was not
       sufficient to get the full ChangeLog between two released versions
       (when using "--changelog=last") as merging between trees also merges
       the BK tags. Now we explicitely search for the last tagged ChangeSet
       that matches our major+minor version number, which should match the
       last ChangeSet used for the previous release.

ChangeSet
  1.1346.284.2 03/07/11 14:26:44 guilhem@mysql.com +18 -0
  Fix for BUG#791:
  a safer way of initing the mutexes in MYSQL_LOG.
  is_open() is now always thread-safe.
  See each file for details.

  sql/sql_update.cc
    1.54.1.35 03/07/11 14:25:46 guilhem@mysql.com +2 -2
    is_open() with locks

  sql/sql_table.cc
    1.112.1.50 03/07/11 14:25:45 guilhem@mysql.com +5 -5
    is_open() with locks

  sql/sql_repl.cc
    1.86.1.18 03/07/11 14:25:45 guilhem@mysql.com +7 -7
    is_open() with locks

  sql/sql_rename.cc
    1.13.1.5 03/07/11 14:25:42 guilhem@mysql.com +1 -1
    is_open() with locks

  sql/sql_parse.cc
    1.218.1.113 03/07/11 14:25:42 guilhem@mysql.com +2 -2
    is_open() with locks

  sql/sql_load.cc
    1.34.1.13 03/07/11 14:25:41 guilhem@mysql.com +4 -4
    is_open() with locks

  sql/sql_insert.cc
    1.63.1.38 03/07/11 14:25:41 guilhem@mysql.com +4 -4
    is_open() with locks

  sql/sql_delete.cc
    1.74.1.23 03/07/11 14:25:41 guilhem@mysql.com +3 -3
    is_open() with locks

  sql/sql_db.cc
    1.39.1.22 03/07/11 14:25:41 guilhem@mysql.com +2 -2
    is_open() with locks

  sql/sql_class.h
    1.111.1.41 03/07/11 14:25:40 guilhem@mysql.com +9 -2
    Before, we inited LOCK_log in MYSQL_LOG::open(), so in other places of the code
    when we were never 100% sure that it had been inited. For example, if the server
    was running without --log-bin, ::open() was not called so the mutex was not
    inited. We could detect it with !inited, but not safely as 'inited' was not
    protected by any mutex.
    So now:
    we *always* init the LOCK_log mutex, even if the log is not used. We can't init
    the mutex in MYSQL_LOG's constructor, because for global objects like
    mysql_bin_log, mysql_log etc, the constructor is called before MY_INIT(), but
    safe_mutex depends on MY_INIT(). So we have a new function MYSQL_LOG::init_pthread_objects
    which we call in main(), after MY_INIT().
    For the relay log, we call this function in the constructor of
    st_relay_log_info, which is called before any function tries to
    use the relay log (the relay log is always invoked as rli.relay_log).
    So now we should be safe in all cases and we don't need 'inited'.

  sql/sql_base.cc
    1.117.1.46 03/07/11 14:25:40 guilhem@mysql.com +1 -1
    is_open() with locks

  sql/slave.cc
    1.164.1.75 03/07/11 14:25:40 guilhem@mysql.com +10 -4
    init pthread objects (mutexes, conds) in the constructor of st_relay_log_info.
    Some better locking in rotate_relay_log().

  sql/repl_failsafe.cc
    1.11.1.19 03/07/11 14:25:39 guilhem@mysql.com +1 -1
    is_open() with locks

  sql/mysqld.cc
    1.297.1.147 03/07/11 14:25:39 guilhem@mysql.com +13 -0
    Init mutexes for the global MYSQL_LOG objects.
    We care about no_rotate, because we can't do it in open() anymore (because
    we don't have 'inited' anymore).

  sql/log_event.cc
    1.77.1.41 03/07/11 14:25:36 guilhem@mysql.com +5 -5
    is_open() with locks

  sql/log.cc
    1.80.1.47 03/07/11 14:25:35 guilhem@mysql.com +159 -151
    No more 'inited'.
    We now always use is_open() in a thread-safe manner.
    This simplifies some functions (no more need to test is_open() twice).

  sql/item_func.cc
    1.60.1.36 03/07/11 14:25:34 guilhem@mysql.com +1 -1
    is_open() with locks

  sql/handler.cc
    1.82.1.20 03/07/11 14:25:34 guilhem@mysql.com +2 -2
    is_open() with locks

ChangeSet
  1.1546.24.2 03/07/11 16:11:17 bar@bar.mysql.r18.ru +1 -0
  field_conv.cc:
    Data was not converted when ALTER TABLE CHAGE changed a field character set.

  sql/field_conv.cc
    1.18 03/07/11 16:10:23 bar@bar.mysql.r18.ru +2 -0
    Data was not converted when ALTER TABLE CHAGE changed a field character set.

ChangeSet
  1.1346.283.4 03/07/11 14:17:18 ram@mysql.r18.ru +3 -0
  Fix for the bug #801: create table t1 select x'41'; doesn't work

  sql/sql_select.cc
    1.152.1.93 03/07/11 14:17:16 ram@mysql.r18.ru +1 -0
    Fix for the bug #801: create table t1 select x'41'; doesn't work

  mysql-test/t/create.test
    1.11.1.6 03/07/11 14:17:16 ram@mysql.r18.ru +7 -0
    Fix for the bug #801: create table t1 select x'41'; doesn't work

  mysql-test/r/create.result
    1.12.1.7 03/07/11 14:17:16 ram@mysql.r18.ru +2 -0
    Fix for the bug #801: create table t1 select x'41'; doesn't work

ChangeSet
  1.1346.284.1 03/07/10 16:03:29 guilhem@mysql.com +2 -0
  Fix for BUG#812 
  "mysqlhotcopy fails to copy tables but does not indicate a failure"
  ("does not indicate a failure");
  this is about "mysqlhotcopy fails to copy tables".

  scripts/mysqlhotcopy.sh
    1.36 03/07/10 16:03:24 guilhem@mysql.com +49 -21
    Fix for BUG#812.
    The problem was that with many tables to copy (10000 in the bug's example),
    the generated 'cp' command line was 1MB long, whereas (at least on my Linux) it
    should not exceed 128 kB. Testing the 'cp' in a shell terminal gives
    "arguments list too long".
    So we issue several small (100 kB) 'cp' command lines instead of a big one.
    Of course, this will still fail on systems where the limit is below 100 kB.
    We now have safe_system() which cuts the command line in pieces,
    and calls safe_simple_system() (execution) for each piece. 

  mysql-test/t/rpl_error_ignored_table-slave.opt
    1.2 03/07/10 16:03:24 guilhem@mysql.com +1 -1
    added a missing newline

ChangeSet
  1.1546.21.4 03/07/10 12:45:34 pem@mysql.telia.com +2 -0
  A test in subselect.test turned out to be correct after all, a difference between
  5.0 and 4.1 (where it fails).

  mysql-test/t/subselect.test
    1.66 03/07/10 12:45:32 pem@mysql.com +2 -2
    It turns out that it's correct that this test doesn't give an error in 5.0.

  mysql-test/r/subselect.result
    1.76 03/07/10 12:45:32 pem@mysql.com +8 -0
    It turns out that it's correct that this test doesn't give an error in 5.0.

ChangeSet
  1.1346.283.2 03/07/10 15:27:02 ram@mysql.r18.ru +3 -0
  Fix for the bug #803.
  Now INTERVAL(NULL, N1, N2, ...) returns NULL.

  sql/item_cmpfunc.cc
    1.20.3.1 03/07/10 15:27:00 ram@mysql.r18.ru +12 -10
    Fix for the bug #803.
    Now INTERVAL(NULL, N1, N2, ...) returns NULL.

  mysql-test/t/func_set.test
    1.3.1.1 03/07/10 15:27:00 ram@mysql.r18.ru +1 -0
    Fix for the bug #803.
    Now INTERVAL(NULL, N1, N2, ...) returns NULL.

  mysql-test/r/func_set.result
    1.4.1.1 03/07/10 15:27:00 ram@mysql.r18.ru +3 -0
    Fix for the bug #803.
    Now INTERVAL(NULL, N1, N2, ...) returns NULL.

ChangeSet
  1.1546.24.1 03/07/10 10:02:57 lenz@kallisto.local +5 -0
   - Updated error message tests in several results of the test suite after
     the server error messages had been modified in errmsg.txt

  mysql-test/r/warnings.result
    1.10 03/07/10 10:02:54 lenz@mysql.com +1 -1
     - Updated error message in result after errmsg.txt has been modified

  mysql-test/r/symlink.result
    1.8 03/07/10 10:02:54 lenz@mysql.com +1 -1
     - Updated error message in result after errmsg.txt has been modified

  mysql-test/r/rpl000009.result
    1.15 03/07/10 10:02:54 lenz@mysql.com +3 -3
     - Updated error message in result after errmsg.txt has been modified

  mysql-test/r/drop.result
    1.13 03/07/10 10:02:54 lenz@mysql.com +3 -3
     - Updated error message in result after errmsg.txt has been modified

  mysql-test/r/create.result
    1.41 03/07/10 10:02:54 lenz@mysql.com +2 -2
     - Updated error message in result after errmsg.txt has been modified

ChangeSet
  1.1546.23.1 03/07/09 18:42:54 paul@teton.kitebird.com +22 -0
  Error message style consistency edits.

  sql/share/ukrainian/errmsg.txt
    1.27.6.1 03/07/09 18:42:48 paul@teton.kitebird.com +2 -2
    Error message style consistency edits.

  sql/share/swedish/errmsg.txt
    1.64.7.1 03/07/09 18:42:48 paul@teton.kitebird.com +2 -2
    Error message style consistency edits.

  sql/share/spanish/errmsg.txt
    1.64.7.1 03/07/09 18:42:48 paul@teton.kitebird.com +2 -2
    Error message style consistency edits.

  sql/share/slovak/errmsg.txt
    1.64.7.1 03/07/09 18:42:48 paul@teton.kitebird.com +2 -2
    Error message style consistency edits.

  sql/share/serbian/errmsg.txt
    1.18.6.1 03/07/09 18:42:48 paul@teton.kitebird.com +2 -2
    Error message style consistency edits.

  sql/share/russian/errmsg.txt
    1.61.6.1 03/07/09 18:42:48 paul@teton.kitebird.com +1 -1
    Error message style consistency edits.

  sql/share/romanian/errmsg.txt
    1.62.7.1 03/07/09 18:42:48 paul@teton.kitebird.com +2 -2
    Error message style consistency edits.

  sql/share/polish/errmsg.txt
    1.63.6.1 03/07/09 18:42:48 paul@teton.kitebird.com +2 -2
    Error message style consistency edits.

  sql/share/norwegian/errmsg.txt
    1.63.7.1 03/07/09 18:42:48 paul@teton.kitebird.com +2 -2
    Error message style consistency edits.

  sql/share/norwegian-ny/errmsg.txt
    1.63.7.1 03/07/09 18:42:48 paul@teton.kitebird.com +2 -2
    Error message style consistency edits.

  sql/share/korean/errmsg.txt
    1.63.6.1 03/07/09 18:42:48 paul@teton.kitebird.com +1 -1
    Error message style consistency edits.

  sql/share/japanese/errmsg.txt
    1.63.6.1 03/07/09 18:42:48 paul@teton.kitebird.com +1 -1
    Error message style consistency edits.

  sql/share/italian/errmsg.txt
    1.70.7.1 03/07/09 18:42:48 paul@teton.kitebird.com +1 -1
    Error message style consistency edits.

  sql/share/hungarian/errmsg.txt
    1.65.6.1 03/07/09 18:42:48 paul@teton.kitebird.com +1 -1
    Error message style consistency edits.

  sql/share/greek/errmsg.txt
    1.64.6.1 03/07/09 18:42:48 paul@teton.kitebird.com +3 -3
    Error message style consistency edits.

  sql/share/german/errmsg.txt
    1.64.7.1 03/07/09 18:42:48 paul@teton.kitebird.com +4 -4
    Error message style consistency edits.

  sql/share/french/errmsg.txt
    1.63.7.1 03/07/09 18:42:48 paul@teton.kitebird.com +2 -2
    Error message style consistency edits.

  sql/share/estonian/errmsg.txt
    1.64.6.1 03/07/09 18:42:48 paul@teton.kitebird.com +1 -1
    Error message style consistency edits.

  sql/share/english/errmsg.txt
    1.70.9.1 03/07/09 18:42:48 paul@teton.kitebird.com +2 -2
    Error message style consistency edits.

  sql/share/dutch/errmsg.txt
    1.66.7.1 03/07/09 18:42:48 paul@teton.kitebird.com +1 -1
    Error message style consistency edits.

  sql/share/danish/errmsg.txt
    1.62.7.1 03/07/09 18:42:48 paul@teton.kitebird.com +2 -2
    Error message style consistency edits.

  sql/share/czech/errmsg.txt
    1.64.7.1 03/07/09 18:42:48 paul@teton.kitebird.com +2 -2
    Error message style consistency edits.

ChangeSet
  1.1346.1.167 03/07/09 22:33:26 Sinisa@sinisa.nasamreza.org +2 -0
  Test case for bug #807

  mysql-test/t/group_by.test
    1.13.1.10 03/07/09 22:33:23 Sinisa@sinisa.nasamreza.org +2 -0
    Test case for bug #807

  mysql-test/r/group_by.result
    1.16.1.17 03/07/09 22:33:23 Sinisa@sinisa.nasamreza.org +11 -0
    Test case for bug #807

ChangeSet
  1.1546.21.3 03/07/09 17:07:12 pem@mysql.telia.com +40 -0
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
  One test in subselect.test still wrong.
  Had to reconstruct all errmsg.txt files completely, since auto-merge made
  a mess of the lot. :-(

  sql/sql_update.cc
    1.91 03/07/09 17:06:49 pem@mysql.com +1 -1
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/sql_select.cc
    1.225 03/07/09 17:06:49 pem@mysql.com +3 -3
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/sql_parse.cc
    1.293 03/07/09 17:06:49 pem@mysql.com +2 -7
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/sql_insert.cc
    1.91 03/07/09 17:06:49 pem@mysql.com +0 -2
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/sql_cache.cc
    1.50 03/07/09 17:06:49 pem@mysql.com +1 -1
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/sql_base.cc
    1.149 03/07/09 17:06:49 pem@mysql.com +3 -3
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/sp.cc
    1.24 03/07/09 17:06:49 pem@mysql.com +1 -1
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/share/ukrainian/errmsg.txt
    1.39 03/07/09 17:06:49 pem@mysql.com +33 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/share/swedish/errmsg.txt
    1.77 03/07/09 17:06:49 pem@mysql.com +33 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/share/spanish/errmsg.txt
    1.76 03/07/09 17:06:49 pem@mysql.com +33 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/share/slovak/errmsg.txt
    1.76 03/07/09 17:06:49 pem@mysql.com +33 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/share/serbian/errmsg.txt
    1.30 03/07/09 17:06:49 pem@mysql.com +33 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/share/russian/errmsg.txt
    1.74 03/07/09 17:06:49 pem@mysql.com +33 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/share/portuguese/errmsg.txt
    1.76 03/07/09 17:06:49 pem@mysql.com +63 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/share/polish/errmsg.txt
    1.76 03/07/09 17:06:49 pem@mysql.com +33 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/share/norwegian/errmsg.txt
    1.75 03/07/09 17:06:49 pem@mysql.com +33 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/share/norwegian-ny/errmsg.txt
    1.75 03/07/09 17:06:49 pem@mysql.com +33 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/share/korean/errmsg.txt
    1.75 03/07/09 17:06:49 pem@mysql.com +33 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/share/japanese/errmsg.txt
    1.75 03/07/09 17:06:49 pem@mysql.com +33 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/share/italian/errmsg.txt
    1.82 03/07/09 17:06:49 pem@mysql.com +33 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/share/hungarian/errmsg.txt
    1.77 03/07/09 17:06:49 pem@mysql.com +33 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/share/greek/errmsg.txt
    1.76 03/07/09 17:06:48 pem@mysql.com +33 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/share/german/errmsg.txt
    1.77 03/07/09 17:06:48 pem@mysql.com +33 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/share/french/errmsg.txt
    1.75 03/07/09 17:06:48 pem@mysql.com +33 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/share/estonian/errmsg.txt
    1.76 03/07/09 17:06:48 pem@mysql.com +33 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/share/english/errmsg.txt
    1.83 03/07/09 17:06:48 pem@mysql.com +38 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/share/dutch/errmsg.txt
    1.78 03/07/09 17:06:48 pem@mysql.com +33 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/share/danish/errmsg.txt
    1.74 03/07/09 17:06:48 pem@mysql.com +33 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/mysqld.cc
    1.364 03/07/09 17:06:48 pem@mysql.com +12 -2
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/mysql_priv.h
    1.197 03/07/09 17:06:48 pem@mysql.com +1 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/item_sum.cc
    1.78.1.4 03/07/09 17:06:48 pem@mysql.com +3 -3
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/item_subselect.cc
    1.63 03/07/09 17:06:48 pem@mysql.com +6 -6
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/item_cmpfunc.cc
    1.87.1.18 03/07/09 17:06:48 pem@mysql.com +1 -1
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  sql/item.cc
    1.67 03/07/09 17:06:48 pem@mysql.com +3 -3
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  scripts/mysql_create_system_tables.sh
    1.6.1.1 03/07/09 17:06:48 pem@mysql.com +20 -0
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  mysql-test/t/subselect.test
    1.65 03/07/09 17:06:48 pem@mysql.com +2 -1
    Merging 4.1 into 5.0 (second pass; post-merge fixes).
    One test still wrong (different from 4.1), left for Sanja :)

  mysql-test/t/sp-error.test
    1.9 03/07/09 17:06:48 pem@mysql.com +21 -21
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  mysql-test/r/variables.result
    1.29 03/07/09 17:06:48 pem@mysql.com +1 -1
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

  mysql-test/r/subselect.result
    1.75 03/07/09 17:06:48 pem@mysql.com +2 -1
    Merging 4.1 into 5.0 (second pass; post-merge fixes).
    One test still wrong (different from 4.1), left for Sanja. :)

  mysql-test/r/sp-error.result
    1.8 03/07/09 17:06:48 pem@mysql.com +25 -25
    Merging 4.1 into 5.0 (second pass; post-merge fixes).

ChangeSet
  1.1546.22.1 03/07/09 18:24:43 kostja@oak.local +36 -0
  resolved conflict with pulled changeset

  sql/share/ukrainian/errmsg.txt
    1.27.1.14 03/07/09 18:24:41 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/swedish/errmsg.txt
    1.64.1.17 03/07/09 18:24:41 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/spanish/errmsg.txt
    1.64.1.15 03/07/09 18:24:41 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/slovak/errmsg.txt
    1.64.1.15 03/07/09 18:24:41 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/serbian/errmsg.txt
    1.18.1.13 03/07/09 18:24:40 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/russian/errmsg.txt
    1.61.1.15 03/07/09 18:24:40 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/romanian/errmsg.txt
    1.62.1.15 03/07/09 18:24:40 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/portuguese/errmsg.txt
    1.64.1.16 03/07/09 18:24:40 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/polish/errmsg.txt
    1.63.1.15 03/07/09 18:24:40 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/norwegian/errmsg.txt
    1.63.1.15 03/07/09 18:24:40 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.15 03/07/09 18:24:40 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/korean/errmsg.txt
    1.63.1.14 03/07/09 18:24:40 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/japanese/errmsg.txt
    1.63.1.14 03/07/09 18:24:40 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/italian/errmsg.txt
    1.70.1.15 03/07/09 18:24:40 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/hungarian/errmsg.txt
    1.65.1.14 03/07/09 18:24:40 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/greek/errmsg.txt
    1.64.1.14 03/07/09 18:24:40 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/german/errmsg.txt
    1.64.1.15 03/07/09 18:24:40 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/french/errmsg.txt
    1.63.1.15 03/07/09 18:24:40 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/estonian/errmsg.txt
    1.64.1.14 03/07/09 18:24:40 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/english/errmsg.txt
    1.70.1.19 03/07/09 18:24:40 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/dutch/errmsg.txt
    1.66.1.15 03/07/09 18:24:40 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/danish/errmsg.txt
    1.62.1.15 03/07/09 18:24:40 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/share/czech/errmsg.txt
    1.64.1.15 03/07/09 18:24:40 kostja@oak.local +1 -1
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/set_var.h
    1.30 03/07/09 18:24:40 kostja@oak.local +3 -1
    manually resolved conflict

  include/mysqld_error.h
    1.61.1.12 03/07/09 18:24:40 kostja@oak.local +2 -3
    manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT

  sql/sql_yacc.yy
    1.203.1.54 03/07/09 18:09:58 kostja@oak.local +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.13.3 03/07/09 18:09:58 kostja@oak.local +0 -0
    Auto merged

  sql/set_var.cc
    1.34.1.26 03/07/09 18:09:58 kostja@oak.local +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.33 03/07/09 18:09:58 kostja@oak.local +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.21 03/07/09 18:09:58 kostja@oak.local +0 -0
    Auto merged

  sql/lex.h
    1.82.1.37 03/07/09 18:09:58 kostja@oak.local +0 -0
    Auto merged

  sql/item_create.h
    1.29 03/07/09 18:09:58 kostja@oak.local +0 -0
    Auto merged

  sql/item_create.cc
    1.33.1.14 03/07/09 18:09:58 kostja@oak.local +0 -0
    Auto merged

  libmysql/libmysql.c
    1.156.5.4 03/07/09 18:09:58 kostja@oak.local +0 -0
    Auto merged

  include/mysql_com.h
    1.67.3.8 03/07/09 18:09:58 kostja@oak.local +0 -0
    Auto merged

  include/mysql.h
    1.70.1.5 03/07/09 18:09:58 kostja@oak.local +0 -0
    Auto merged

ChangeSet
  1.1346.280.2 03/07/09 15:51:31 lenz@mysql.com +2 -0
   - enhanced the RPM spec file (use more RPM macros, cleanups, allow to
     override CC/CXX when using a special compiler)
   - the RPM should now build on AMD64 and IA64, too

  support-files/mysql.spec.sh
    1.61.1.7 03/07/09 15:51:29 lenz@mysql.com +120 -101
     - removed the GIF Icon (file was not included in the sources anyway)
     - removed unused variable %shared_lib_version
     - do not run automake before building the standard binary
       (should not be necessary)
     - add server suffix '-standard' to standard binary (to be in line
       with the binary tarball distributions)
     - Use more RPM macros (_exec_prefix, _sbindir, _libdir, _sysconfdir,
       _datadir, _includedir) throughout the spec file (using _libdir was
       required to be used anyway to be able to build on AMD64).
     - allow overriding CC and CXX (required when building with other compilers)

  support-files/MySQL-shared-compat.spec.sh
    1.2 03/07/09 15:51:29 lenz@mysql.com +1 -1
     - use %_libdir macro instead of hardcoded value (required on AMD64,
       where %_libdir is /usr/lib64 instead)

ChangeSet
  1.1346.282.1 03/07/09 15:52:51 Sinisa@sinisa.nasamreza.org +1 -0
  Fix for a  bug #807

  sql/item_cmpfunc.cc
    1.20.1.35 03/07/09 15:52:43 Sinisa@sinisa.nasamreza.org +1 -0
    Fix for a  bug #807

ChangeSet
  1.1546.2.13 03/07/09 13:00:44 serg@sergbook.mylan +1 -0
  comment clarified

  sql/net_serv.cc
    1.56.1.1 03/07/09 13:00:13 serg@sergbook.mylan +1 -1
    comment clarified

ChangeSet
  1.1346.281.1 03/07/09 00:55:07 monty@mashka.mysql.fi +5 -0
  Cleanups

  sql/sql_parse.cc
    1.218.1.112 03/07/09 00:55:04 monty@mashka.mysql.fi +1 -1
    Simple optimization

  sql/sql_delete.cc
    1.74.1.22 03/07/09 00:55:04 monty@mashka.mysql.fi +9 -6
    Cleanup

  sql/slave.cc
    1.164.1.74 03/07/09 00:55:04 monty@mashka.mysql.fi +28 -25
    Cleanup

  sql/log.cc
    1.80.1.46 03/07/09 00:55:04 monty@mashka.mysql.fi +5 -5
    Cleanup

  mysql-test/t/distinct.test
    1.11.1.3 03/07/09 00:55:04 monty@mashka.mysql.fi +5 -2
    Cleanup

ChangeSet
  1.1346.280.1 03/07/08 23:29:55 lenz@mysql.com +1 -0
   - Fixed mysqlhotcopy to actually abort if copying the tables failed.
     (BUG#812)

  scripts/mysqlhotcopy.sh
    1.35 03/07/08 23:29:53 lenz@mysql.com +2 -2
     - Actually die if copying the tables fails instead of going on as if
       nothing was wrong (BUG#812)

ChangeSet
  1.1346.1.163 03/07/09 00:00:16 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/mysqld.cc
    1.297.1.146 03/07/09 00:00:12 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.279.1 03/07/08 23:58:04 monty@mashka.mysql.fi +8 -0
  Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS
  Removed double my_thread_end() which caused fatal error on windows if mysqld died on startup

  sql/table.h
    1.31.1.13 03/07/08 23:58:00 monty@mashka.mysql.fi +1 -1
    Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS

  sql/table.cc
    1.46.1.19 03/07/08 23:58:00 monty@mashka.mysql.fi +3 -0
    Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS

  sql/sql_table.cc
    1.112.1.49 03/07/08 23:58:00 monty@mashka.mysql.fi +8 -6
    Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS

  sql/mysqld.cc
    1.297.33.1 03/07/08 23:58:00 monty@mashka.mysql.fi +0 -1
    Removed double my_thread_end() which caused fatal error on windows if mysqld died on startup

  sql/ha_myisam.cc
    1.92.1.33 03/07/08 23:58:00 monty@mashka.mysql.fi +5 -2
    Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS

  mysql-test/t/alter_table.test
    1.12.1.4 03/07/08 23:58:00 monty@mashka.mysql.fi +62 -0
    Test DISABLE/ENABLE KEY

  mysql-test/r/alter_table.result
    1.9.1.5 03/07/08 23:58:00 monty@mashka.mysql.fi +69 -0
    Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS

  myisam/mi_extra.c
    1.31.1.1 03/07/08 23:58:00 monty@mashka.mysql.fi +4 -0
    Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS

ChangeSet
  1.1546.2.12 03/07/08 23:54:48 monty@mashka.mysql.fi +16 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mashka.mysql.fi:/home/my/mysql-4.1

  sql/share/swedish/errmsg.txt
    1.64.1.16 03/07/08 23:54:40 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/spanish/errmsg.txt
    1.64.1.14 03/07/08 23:54:40 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/slovak/errmsg.txt
    1.64.1.14 03/07/08 23:54:40 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/serbian/errmsg.txt
    1.18.1.12 03/07/08 23:54:40 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/romanian/errmsg.txt
    1.62.1.14 03/07/08 23:54:40 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/portuguese/errmsg.txt
    1.64.1.15 03/07/08 23:54:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.63.1.14 03/07/08 23:54:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/norwegian/errmsg.txt
    1.63.1.14 03/07/08 23:54:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.14 03/07/08 23:54:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/italian/errmsg.txt
    1.70.1.14 03/07/08 23:54:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/german/errmsg.txt
    1.64.1.14 03/07/08 23:54:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/french/errmsg.txt
    1.63.1.14 03/07/08 23:54:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.70.1.18 03/07/08 23:54:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/dutch/errmsg.txt
    1.66.1.14 03/07/08 23:54:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/danish/errmsg.txt
    1.62.1.14 03/07/08 23:54:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/czech/errmsg.txt
    1.64.1.14 03/07/08 23:54:38 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1546.18.4 03/07/08 23:48:04 monty@mashka.mysql.fi +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mashka.mysql.fi:/home/my/mysql-4.1

  sql/sql_yacc.yy
    1.203.1.53 03/07/08 23:47:58 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.13.2 03/07/08 23:47:58 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.20 03/07/08 23:47:57 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.1.162 03/07/08 20:51:45 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Prevent the user from creating InnoDB tables with > 1000 columns

  sql/ha_innodb.cc
    1.73.1.110 03/07/08 20:51:29 heikki@hundin.mysql.fi +7 -0
    Prevent the user from creating InnoDB tables with > 1000 columns

ChangeSet
  1.1346.1.161 03/07/08 11:26:46 paul@teton.kitebird.com +0 -0

ChangeSet
  1.1346.1.160 03/07/08 11:25:46 paul@teton.kitebird.com +1 -0
  mysqlhotcopy.sh:
    Undo serg's patch that used my_print_defaults,
    and instead simply do not define $opt{user}.
    This allows the script to use option files properly.

  scripts/mysqlhotcopy.sh
    1.34 03/07/08 11:23:11 paul@teton.kitebird.com +6 -5
    Undo serg's patch that used my_print_defaults,
    and instead simply do not define $opt{user}.
    This allows the script to use option files properly.

ChangeSet
  1.1546.21.2 03/07/08 17:50:23 pem@mysql.telia.com +105 -0
  Merge 4.1 into 5.0 (first pass).

  sql/sql_yacc.yy
    1.234 03/07/08 17:50:17 pem@mysql.com +12 -21
    Merge 4.1 into 5.0 (first pass).

  sql/sql_update.cc
    1.90 03/07/08 17:50:17 pem@mysql.com +4 -11
    Merge 4.1 into 5.0 (first pass).

  sql/sql_parse.cc
    1.292 03/07/08 17:50:17 pem@mysql.com +4 -5
    Merge 4.1 into 5.0 (first pass).

  sql/sql_lex.h
    1.118 03/07/08 17:50:17 pem@mysql.com +0 -0
    Merge 4.1 into 5.0 (first pass).

  sql/sql_lex.cc
    1.80.2.1 03/07/08 17:50:17 pem@mysql.com +0 -0
    Merge 4.1 into 5.0 (first pass).

  sql/sql_insert.cc
    1.90 03/07/08 17:50:17 pem@mysql.com +0 -0
    Merge 4.1 into 5.0 (first pass).

  sql/sql_cache.cc
    1.49 03/07/08 17:50:17 pem@mysql.com +0 -0
    Merge 4.1 into 5.0 (first pass).

  sql/share/ukrainian/errmsg.txt
    1.38 03/07/08 17:50:17 pem@mysql.com +0 -33
    Merge 4.1 into 5.0 (first pass).

  sql/share/swedish/errmsg.txt
    1.76 03/07/08 17:50:17 pem@mysql.com +0 -33
    Merge 4.1 into 5.0 (first pass).

  sql/share/spanish/errmsg.txt
    1.75 03/07/08 17:50:17 pem@mysql.com +0 -33
    Merge 4.1 into 5.0 (first pass).

  sql/share/slovak/errmsg.txt
    1.75 03/07/08 17:50:17 pem@mysql.com +0 -33
    Merge 4.1 into 5.0 (first pass).

  sql/share/serbian/errmsg.txt
    1.29 03/07/08 17:50:17 pem@mysql.com +0 -33
    Merge 4.1 into 5.0 (first pass).

  sql/share/russian/errmsg.txt
    1.73 03/07/08 17:50:17 pem@mysql.com +0 -33
    Merge 4.1 into 5.0 (first pass).

  sql/share/romanian/errmsg.txt
    1.73 03/07/08 17:50:17 pem@mysql.com +0 -0
    Merge 4.1 into 5.0 (first pass).

  sql/share/portuguese/errmsg.txt
    1.75 03/07/08 17:50:17 pem@mysql.com +0 -63
    Merge 4.1 into 5.0 (first pass).

  sql/share/polish/errmsg.txt
    1.75 03/07/08 17:50:17 pem@mysql.com +0 -33
    Merge 4.1 into 5.0 (first pass).

  sql/share/norwegian/errmsg.txt
    1.74 03/07/08 17:50:17 pem@mysql.com +0 -33
    Merge 4.1 into 5.0 (first pass).

  sql/share/norwegian-ny/errmsg.txt
    1.74 03/07/08 17:50:17 pem@mysql.com +0 -33
    Merge 4.1 into 5.0 (first pass).

  sql/share/korean/errmsg.txt
    1.74 03/07/08 17:50:17 pem@mysql.com +0 -33
    Merge 4.1 into 5.0 (first pass).

  sql/share/japanese/errmsg.txt
    1.74 03/07/08 17:50:17 pem@mysql.com +0 -33
    Merge 4.1 into 5.0 (first pass).

  sql/share/italian/errmsg.txt
    1.81 03/07/08 17:50:17 pem@mysql.com +0 -33
    Merge 4.1 into 5.0 (first pass).

  sql/share/hungarian/errmsg.txt
    1.76 03/07/08 17:50:17 pem@mysql.com +0 -33
    Merge 4.1 into 5.0 (first pass).

  sql/share/greek/errmsg.txt
    1.75 03/07/08 17:50:17 pem@mysql.com +0 -33
    Merge 4.1 into 5.0 (first pass).

  sql/share/german/errmsg.txt
    1.76 03/07/08 17:50:17 pem@mysql.com +0 -33
    Merge 4.1 into 5.0 (first pass).

  sql/share/french/errmsg.txt
    1.74 03/07/08 17:50:17 pem@mysql.com +0 -33
    Merge 4.1 into 5.0 (first pass).

  sql/share/estonian/errmsg.txt
    1.75 03/07/08 17:50:17 pem@mysql.com +0 -33
    Merge 4.1 into 5.0 (first pass).

  sql/share/english/errmsg.txt
    1.82 03/07/08 17:50:17 pem@mysql.com +0 -38
    Merge 4.1 into 5.0 (first pass).

  sql/share/dutch/errmsg.txt
    1.77 03/07/08 17:50:17 pem@mysql.com +0 -33
    Merge 4.1 into 5.0 (first pass).

  sql/share/danish/errmsg.txt
    1.73 03/07/08 17:50:17 pem@mysql.com +0 -33
    Merge 4.1 into 5.0 (first pass).

  sql/share/czech/errmsg.txt
    1.75 03/07/08 17:50:17 pem@mysql.com +0 -0
    Merge 4.1 into 5.0 (first pass).

  sql/mysqld.cc
    1.363 03/07/08 17:50:17 pem@mysql.com +0 -13
    Merge 4.1 into 5.0 (first pass).

  sql/mysql_priv.h
    1.196 03/07/08 17:50:17 pem@mysql.com +0 -1
    Merge 4.1 into 5.0 (first pass).

  sql/lex.h
    1.97 03/07/08 17:50:17 pem@mysql.com +2 -2
    Merge 4.1 into 5.0 (first pass).

  sql/item_sum.cc
    1.78.1.3 03/07/08 17:50:17 pem@mysql.com +1 -1
    Merge 4.1 into 5.0 (first pass).

  sql/item_subselect.cc
    1.62 03/07/08 17:50:17 pem@mysql.com +0 -3
    Merge 4.1 into 5.0 (first pass).

  sql/item_func.cc
    1.129 03/07/08 17:50:17 pem@mysql.com +72 -0
    Merge 4.1 into 5.0 (first pass).

  sql/item.cc
    1.66 03/07/08 17:50:17 pem@mysql.com +2 -4
    Merge 4.1 into 5.0 (first pass).

  sql/ha_innodb.cc
    1.92 03/07/08 17:50:17 pem@mysql.com +0 -2
    Merge 4.1 into 5.0 (first pass).

  sql/Makefile.am
    1.84 03/07/08 17:50:16 pem@mysql.com +1 -2
    Merge 4.1 into 5.0 (first pass).

  scripts/mysql_install_db.sh
    1.45 03/07/08 17:50:16 pem@mysql.com +0 -18
    Merge 4.1 into 5.0 (first pass).

  mysys/my_pthread.c
    1.38 03/07/08 17:50:16 pem@mysql.com +0 -23
    Merge 4.1 into 5.0 (first pass).

  mysql-test/r/subselect.result
    1.74 03/07/08 17:50:16 pem@mysql.com +0 -2
    Merge 4.1 into 5.0 (first pass).

  mysql-test/install_test_db.sh
    1.30 03/07/08 17:50:16 pem@mysql.com +0 -16
    Merge 4.1 into 5.0 (first pass).

  libmysql/libmysql.c
    1.158 03/07/08 17:50:16 pem@mysql.com +0 -0
    Merge 4.1 into 5.0 (first pass).

  include/mysqld_error.h
    1.72 03/07/08 17:50:16 pem@mysql.com +17 -18
    Merge 4.1 into 5.0 (first pass).

ChangeSet
  1.1346.278.1 03/07/08 17:27:22 serg@serg.mylan +1 -0
  added missing ~/.my.cnf support to mysqlhotcopy (bug #808)

  scripts/mysqlhotcopy.sh
    1.33 03/07/08 17:27:20 serg@serg.mylan +5 -0
    added missing ~/.my.cnf support to mysqlhotcopy (bug #808)

ChangeSet
  1.1346.277.1 03/07/08 15:50:57 guilhem@mysql.com +29 -0
  Fix for
  BUG#797 "If query ignored on slave (replicate-ignore-table) the slave still checks if
  the returned error (0) is the same as the one on the master, whereas it shouldn't
  test this.
  Plus a new test for BUG#797.

  sql/sql_parse.cc
    1.218.1.111 03/07/08 15:50:40 guilhem@mysql.com +11 -7
    when in sql_parse in the slave thread we ignore the query because of replicate-do
    and replicate-ignore options, we return a specific error to the slave thread,
    so that it knows that the query has been ignored (which is different from a
    successful query).
    A small cleanup (test was done twice).

  sql/share/ukrainian/errmsg.txt
    1.11.1.10 03/07/08 15:50:40 guilhem@mysql.com +1 -0
    for BUG#797

  sql/share/swedish/errmsg.txt
    1.46.1.11 03/07/08 15:50:39 guilhem@mysql.com +1 -0
    for BUG#797

  sql/share/spanish/errmsg.txt
    1.47.1.11 03/07/08 15:50:39 guilhem@mysql.com +1 -0
    for BUG#797

  sql/share/slovak/errmsg.txt
    1.46.1.10 03/07/08 15:50:39 guilhem@mysql.com +1 -0
    for BUG#797

  sql/share/russian/errmsg.txt
    1.45.1.11 03/07/08 15:50:39 guilhem@mysql.com +1 -0
    for BUG#797

  sql/share/romanian/errmsg.txt
    1.44.1.10 03/07/08 15:50:38 guilhem@mysql.com +1 -0
    for BUG#797

  sql/share/portuguese/errmsg.txt
    1.47.1.11 03/07/08 15:50:38 guilhem@mysql.com +1 -0
    for BUG#797

  sql/share/polish/errmsg.txt
    1.45.1.10 03/07/08 15:50:38 guilhem@mysql.com +1 -0
    for BUG#797

  sql/share/norwegian/errmsg.txt
    1.45.1.10 03/07/08 15:50:38 guilhem@mysql.com +1 -0
    for BUG#797

  sql/share/norwegian-ny/errmsg.txt
    1.45.1.10 03/07/08 15:50:37 guilhem@mysql.com +1 -0
    for BUG#797

  sql/share/korean/errmsg.txt
    1.45.1.10 03/07/08 15:50:37 guilhem@mysql.com +1 -0
    for BUG#797

  sql/share/japanese/errmsg.txt
    1.45.1.10 03/07/08 15:50:37 guilhem@mysql.com +1 -0
    for BUG#797

  sql/share/italian/errmsg.txt
    1.52.1.11 03/07/08 15:50:37 guilhem@mysql.com +1 -0
    for BUG#797

  sql/share/hungarian/errmsg.txt
    1.47.1.10 03/07/08 15:50:36 guilhem@mysql.com +1 -0
    for BUG#797

  sql/share/greek/errmsg.txt
    1.46.1.10 03/07/08 15:50:36 guilhem@mysql.com +1 -0
    for BUG#797

  sql/share/german/errmsg.txt
    1.47.1.10 03/07/08 15:50:36 guilhem@mysql.com +1 -0
    for BUG#797

  sql/share/french/errmsg.txt
    1.46.1.10 03/07/08 15:50:36 guilhem@mysql.com +1 -0
    for BUG#797

  sql/share/estonian/errmsg.txt
    1.47.1.10 03/07/08 15:50:35 guilhem@mysql.com +1 -0
    for BUG#797

  sql/share/english/errmsg.txt
    1.51.1.15 03/07/08 15:50:35 guilhem@mysql.com +1 -0
    for BUG#797

  sql/share/dutch/errmsg.txt
    1.49.1.13 03/07/08 15:50:35 guilhem@mysql.com +1 -0
    for BUG#797

  sql/share/danish/errmsg.txt
    1.45.1.10 03/07/08 15:50:35 guilhem@mysql.com +1 -0
    for BUG#797

  sql/share/czech/errmsg.txt
    1.46.1.10 03/07/08 15:50:34 guilhem@mysql.com +1 -0
    for BUG#797

  sql/log_event.cc
    1.77.1.40 03/07/08 15:50:34 guilhem@mysql.com +2 -1
    ER_SLAVE_IGNORED_TABLE is an ignorable error.

  sql/log.cc
    1.80.1.45 03/07/08 15:50:33 guilhem@mysql.com +3 -8
    removed comment from a previous debugging.

  include/mysqld_error.h
    1.46.3.5 03/07/08 15:50:33 guilhem@mysql.com +2 -1
    New error code (can be sent only to the slave thread, not to normal clients).

  sql/sql_union.cc
    1.76 03/07/08 15:29:16 pem@mysql.com +0 -0
    Auto merged

  sql/sql_table.cc
    1.163 03/07/08 15:29:16 pem@mysql.com +0 -0
    Auto merged

  sql/sql_show.cc
    1.125 03/07/08 15:29:16 pem@mysql.com +0 -0
    Auto merged

  sql/sql_select.cc
    1.224 03/07/08 15:29:16 pem@mysql.com +0 -0
    Auto merged

  sql/sql_repl.cc
    1.106 03/07/08 15:29:15 pem@mysql.com +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.42 03/07/08 15:29:15 pem@mysql.com +0 -0
    Auto merged

  sql/sql_load.cc
    1.50 03/07/08 15:29:15 pem@mysql.com +0 -0
    Auto merged

  sql/sql_error.cc
    1.17 03/07/08 15:29:15 pem@mysql.com +0 -0
    Auto merged

  sql/sql_derived.cc
    1.45 03/07/08 15:29:15 pem@mysql.com +0 -0
    Auto merged

  sql/sql_delete.cc
    1.105 03/07/08 15:29:15 pem@mysql.com +0 -0
    Auto merged

  sql/sql_db.cc
    1.71 03/07/08 15:29:15 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.160 03/07/08 15:29:15 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.121 03/07/08 15:29:15 pem@mysql.com +0 -0
    Auto merged

  sql/sql_base.cc
    1.148 03/07/08 15:29:15 pem@mysql.com +0 -0
    Auto merged

  sql/sql_acl.cc
    1.77 03/07/08 15:29:15 pem@mysql.com +0 -0
    Auto merged

  sql/slave.cc
    1.194 03/07/08 15:29:14 pem@mysql.com +0 -0
    Auto merged

  sql/set_var.cc
    1.39 03/07/08 15:29:14 pem@mysql.com +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.33 03/07/08 15:29:14 pem@mysql.com +0 -0
    Auto merged

  sql/records.cc
    1.23 03/07/08 15:29:14 pem@mysql.com +0 -0
    Auto merged

  sql/protocol.cc
    1.59 03/07/08 15:29:14 pem@mysql.com +0 -0
    Auto merged

  sql/log_event.cc
    1.118 03/07/08 15:29:14 pem@mysql.com +0 -0
    Auto merged

  sql/log.cc
    1.112 03/07/08 15:29:14 pem@mysql.com +0 -0
    Auto merged

  sql/item_func.h
    1.74 03/07/08 15:29:14 pem@mysql.com +0 -0
    Auto merged

  sql/item_create.cc
    1.35 03/07/08 15:29:13 pem@mysql.com +0 -0
    Auto merged

  sql/item.h
    1.61 03/07/08 15:29:13 pem@mysql.com +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.120 03/07/08 15:29:13 pem@mysql.com +0 -0
    Auto merged

  sql/filesort.cc
    1.75 03/07/08 15:29:13 pem@mysql.com +0 -0
    Auto merged

  netware/BUILD/nwbootstrap
    1.5 03/07/08 15:29:13 pem@mysql.com +0 -10
    Auto merged

  netware/BUILD/mwldnlm
    1.4 03/07/08 15:29:13 pem@mysql.com +0 -3
    Auto merged

  netware/BUILD/mwccnlm
    1.4 03/07/08 15:29:13 pem@mysql.com +0 -3
    Auto merged

  netware/BUILD/mwasmnlm
    1.4 03/07/08 15:29:13 pem@mysql.com +0 -3
    Auto merged

  netware/BUILD/compile-netware-standard
    1.4 03/07/08 15:29:13 pem@mysql.com +0 -7
    Auto merged

  netware/BUILD/compile-netware-debug
    1.4 03/07/08 15:29:13 pem@mysql.com +0 -6
    Auto merged

  netware/BUILD/compile-netware-all
    1.4 03/07/08 15:29:13 pem@mysql.com +0 -6
    Auto merged

  netware/BUILD/compile-netware-START
    1.4 03/07/08 15:29:13 pem@mysql.com +0 -4
    Auto merged

  netware/BUILD/compile-netware-END
    1.4 03/07/08 15:29:13 pem@mysql.com +0 -6
    Auto merged

  netware/BUILD/compile-linux-tools
    1.4 03/07/08 15:29:13 pem@mysql.com +0 -4
    Auto merged

  netware/BUILD/compile-AUTOTOOLS
    1.4 03/07/08 15:29:13 pem@mysql.com +0 -6
    Auto merged

  mysql-test/t/variables.test
    1.20 03/07/08 15:29:13 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.64 03/07/08 15:29:13 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/variables.result
    1.28 03/07/08 15:29:13 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/show_check.result
    1.34 03/07/08 15:29:13 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/rpl_temporary.result
    1.7 03/07/08 15:29:13 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/connect.result
    1.4 03/07/08 15:29:13 pem@mysql.com +0 -0
    Auto merged

  myisam/sort.c
    1.37 03/07/08 15:29:13 pem@mysql.com +0 -0
    Auto merged

  myisam/myisamdef.h
    1.62 03/07/08 15:29:13 pem@mysql.com +0 -0
    Auto merged

  myisam/myisamchk.c
    1.95 03/07/08 15:29:12 pem@mysql.com +0 -0
    Auto merged

  myisam/mi_check.c
    1.107 03/07/08 15:29:12 pem@mysql.com +0 -0
    Auto merged

  libmysqld/Makefile.am
    1.33 03/07/08 15:29:12 pem@mysql.com +0 -0
    Auto merged

  include/mysql_com.h
    1.70 03/07/08 15:29:12 pem@mysql.com +0 -0
    Auto merged

  include/my_pthread.h
    1.66 03/07/08 15:29:12 pem@mysql.com +0 -5
    Auto merged

  include/my_global.h
    1.48 03/07/08 15:29:12 pem@mysql.com +0 -0
    Auto merged

  configure.in
    1.213 03/07/08 15:29:12 pem@mysql.com +0 -0
    Auto merged

  client/mysqltest.c
    1.97 03/07/08 15:29:12 pem@mysql.com +0 -0
    Auto merged

  client/mysql.cc
    1.129 03/07/08 15:29:12 pem@mysql.com +0 -0
    Auto merged

  BitKeeper/triggers/post-commit
    1.25 03/07/08 15:29:12 pem@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-crontab
    1.2 03/07/08 15:29:12 pem@mysql.com +0 -0
    Delete: netware/BUILD/crontab

  BitKeeper/deleted/.del-cron-build
    1.2 03/07/08 15:28:50 pem@mysql.com +0 -0
    Delete: netware/BUILD/cron-build

  BitKeeper/etc/logging_ok
    1.241 03/07/08 15:23:36 pem@mysql.com +0 -0
    auto-union

  BitKeeper/etc/ignore
    1.155 03/07/08 15:23:36 pem@mysql.com +0 -0
    auto-union

ChangeSet
  1.1346.1.157 03/07/08 14:16:27 heikki@hundin.mysql.fi +1 -0
  trx0trx.c:
    A cosmetic change: set trx id to zero at creation so that SHOW INNODB STATUS does not print a random value for the id of a transaction object for which the transaction has never been started yet (for example, running SHOW INNODB STATUS as the first command from a mysql prompt printed a random id for the trx object associated with the session itself running the SHOW INNODB STATUS command)

  innobase/trx/trx0trx.c
    1.20.1.9 03/07/08 14:16:19 heikki@hundin.mysql.fi +4 -0
    A cosmetic change: set trx id to zero at creation so that SHOW INNODB STATUS does not print a random value for the id of a transaction object for which the transaction has never been started yet (for example, running SHOW INNODB STATUS as the first command from a mysql prompt printed a random id for the trx object associated with the session itself running the SHOW INNODB STATUS command)

ChangeSet
  1.1546.18.3 03/07/08 15:06:43 gluh@gluh.mysql.r18.ru +1 -0
  Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC

  sql/mysql_priv.h
    1.186.1.19 03/07/08 15:06:41 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1546.18.2 03/07/08 15:06:05 gluh@gluh.mysql.r18.ru +12 -0
  SAPDB date/time finctions

  sql/time.cc
    1.32 03/07/08 15:06:03 gluh@gluh.mysql.r18.ru +1 -0
    SAPDB date/time finctions

  sql/sql_yacc.yy
    1.203.1.52 03/07/08 15:06:03 gluh@gluh.mysql.r18.ru +6 -3
    SAPDB date/time finctions

  sql/sql_string.h
    1.37 03/07/08 15:06:03 gluh@gluh.mysql.r18.ru +2 -0
    SAPDB date/time finctions

  sql/sql_string.cc
    1.63 03/07/08 15:06:03 gluh@gluh.mysql.r18.ru +17 -0
    SAPDB date/time finctions

  sql/protocol.cc
    1.56.5.3 03/07/08 15:06:03 gluh@gluh.mysql.r18.ru +13 -0
    SAPDB date/time finctions

  sql/mysql_priv.h
    1.186.1.18 03/07/08 15:06:03 gluh@gluh.mysql.r18.ru +2 -0
    SAPDB date/time finctions

  sql/item_timefunc.h
    1.32 03/07/08 15:06:03 gluh@gluh.mysql.r18.ru +18 -64
    SAPDB date/time finctions

  sql/item_timefunc.cc
    1.37 03/07/08 15:06:03 gluh@gluh.mysql.r18.ru +162 -160
    SAPDB date/time finctions

  sql/item_create.cc
    1.33.1.13 03/07/08 15:06:03 gluh@gluh.mysql.r18.ru +2 -2
    SAPDB date/time finctions

  mysql-test/t/func_sapdb.test
    1.2 03/07/08 15:06:03 gluh@gluh.mysql.r18.ru +4 -2
    SAPDB date/time finctions

  mysql-test/r/func_sapdb.result
    1.2 03/07/08 15:06:03 gluh@gluh.mysql.r18.ru +9 -3
    SAPDB date/time finctions

  mysql-test/r/cast.result
    1.8 03/07/08 15:06:03 gluh@gluh.mysql.r18.ru +2 -2
    Changes for SAPDB date/time finctions

  mysql-test/r/rpl_error_ignored_table.result
    1.1 03/07/08 11:59:45 guilhem@mysql.com +15 -0

  mysql-test/r/rpl_error_ignored_table.result
    1.0 03/07/08 11:59:45 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/r/rpl_error_ignored_table.result

  mysql-test/t/rpl_error_ignored_table.test
    1.1 03/07/08 11:59:33 guilhem@mysql.com +22 -0

  mysql-test/t/rpl_error_ignored_table.test
    1.0 03/07/08 11:59:33 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/rpl_error_ignored_table.test

  mysql-test/t/rpl_error_ignored_table-slave.opt
    1.1 03/07/08 11:59:27 guilhem@mysql.com +1 -0

  mysql-test/t/rpl_error_ignored_table-slave.opt
    1.0 03/07/08 11:59:27 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/rpl_error_ignored_table-slave.opt

ChangeSet
  1.1546.20.1 03/07/08 02:27:21 venu@myvenu.com +7 -0
  implementation of mysql_stmt_reset client end

  sql/mysql_priv.h
    1.186.16.1 03/07/08 02:24:46 venu@myvenu.com +1 -0
    add defination of mysql_stmt_reset

  sql/sql_parse.cc
    1.271.15.1 03/07/08 02:17:48 venu@myvenu.com +5 -0
    Add COM_STMT_RESET

  sql/sql_prepare.cc
    1.34.1.5 03/07/08 02:17:13 venu@myvenu.com +1 -1
    Fix selects hang after windows slowdown issue fix (send_fields)

  libmysql/libmysql.def
    1.17 03/07/08 02:16:58 venu@myvenu.com +1 -0
    Add mysql_stmt_reset def

  libmysql/libmysql.c
    1.156.6.1 03/07/08 02:16:37 venu@myvenu.com +23 -0
    implementation of mysql_stmt_reset client end

  include/mysql_com.h
    1.67.4.1 03/07/08 02:16:16 venu@myvenu.com +1 -0
    add COM_STMT_RESET 

  include/mysql.h
    1.70.2.1 03/07/08 02:15:58 venu@myvenu.com +1 -0
    add mysql_stmt_reset prototype

ChangeSet
  1.1546.19.1 03/07/08 12:03:46 kostja@oak.local +7 -0
  Merge oak.local:/home/kostja/mysql/mysql-4.1-root
  into oak.local:/home/kostja/mysql/mysql-4.1

  sql/sql_yacc.yy
    1.203.55.1 03/07/08 12:03:43 kostja@oak.local +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.14.1 03/07/08 12:03:43 kostja@oak.local +0 -0
    Auto merged

  sql/sql_class.h
    1.146.1.29 03/07/08 12:03:43 kostja@oak.local +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.16.1 03/07/08 12:03:43 kostja@oak.local +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.15.1 03/07/08 12:03:42 kostja@oak.local +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.129 03/07/08 12:03:42 kostja@oak.local +0 -0
    Auto merged

  scripts/mysql_create_system_tables.sh
    1.7 03/07/08 12:03:42 kostja@oak.local +0 -0
    Auto merged

ChangeSet
  1.1557 03/07/08 11:03:30 bell@sanja.is.com.ua +2 -0
  test of big subquery

  mysql-test/t/subselect2.test
    1.1 03/07/08 11:03:28 bell@sanja.is.com.ua +149 -0

  mysql-test/r/subselect2.result
    1.1 03/07/08 11:03:28 bell@sanja.is.com.ua +131 -0

  mysql-test/t/subselect2.test
    1.0 03/07/08 11:03:28 bell@sanja.is.com.ua +0 -0
    BitKeeper file /home/bell/mysql/bk/work-simple_in-4.1/mysql-test/t/subselect2.test

  mysql-test/r/subselect2.result
    1.0 03/07/08 11:03:28 bell@sanja.is.com.ua +0 -0
    BitKeeper file /home/bell/mysql/bk/work-simple_in-4.1/mysql-test/r/subselect2.result

ChangeSet
  1.1546.18.1 03/07/08 12:57:00 gluh@gluh.mysql.r18.ru +5 -0
  Merge gluh@gw:/home/bk/mysql-4.1
  into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC

  sql/sql_yacc.yy
    1.203.1.51 03/07/08 12:56:56 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/protocol.cc
    1.56.5.2 03/07/08 12:56:56 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.17 03/07/08 12:56:56 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/item_create.cc
    1.33.1.12 03/07/08 12:56:56 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/field.cc
    1.110 03/07/08 12:56:56 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1546.2.10 03/07/07 23:35:24 paul@ice.snake.net +16 -0
  Error message edits. (Change sentence ending with period + sentence
  not ending with period into single sentence.)

  sql/share/swedish/errmsg.txt
    1.64.6.1 03/07/07 23:35:16 paul@ice.snake.net +1 -1
    Error message edits.

  sql/share/spanish/errmsg.txt
    1.64.6.1 03/07/07 23:35:16 paul@ice.snake.net +2 -2
    Error message edits.

  sql/share/slovak/errmsg.txt
    1.64.6.1 03/07/07 23:35:15 paul@ice.snake.net +2 -2
    Error message edits.

  sql/share/serbian/errmsg.txt
    1.18.5.1 03/07/07 23:35:15 paul@ice.snake.net +2 -2
    Error message edits.

  sql/share/romanian/errmsg.txt
    1.62.6.1 03/07/07 23:35:15 paul@ice.snake.net +2 -2
    Error message edits.

  sql/share/portuguese/errmsg.txt
    1.64.6.1 03/07/07 23:35:15 paul@ice.snake.net +2 -2
    Error message edits.

  sql/share/polish/errmsg.txt
    1.63.5.1 03/07/07 23:35:15 paul@ice.snake.net +2 -2
    Error message edits.

  sql/share/norwegian/errmsg.txt
    1.63.6.1 03/07/07 23:35:15 paul@ice.snake.net +2 -2
    Error message edits.

  sql/share/norwegian-ny/errmsg.txt
    1.63.6.1 03/07/07 23:35:15 paul@ice.snake.net +2 -2
    Error message edits.

  sql/share/italian/errmsg.txt
    1.70.6.1 03/07/07 23:35:15 paul@ice.snake.net +2 -2
    Error message edits.

  sql/share/german/errmsg.txt
    1.64.6.1 03/07/07 23:35:14 paul@ice.snake.net +2 -2
    Error message edits.

  sql/share/french/errmsg.txt
    1.63.6.1 03/07/07 23:35:14 paul@ice.snake.net +2 -2
    Error message edits.

  sql/share/english/errmsg.txt
    1.70.8.1 03/07/07 23:35:14 paul@ice.snake.net +2 -2
    Error message edits.

  sql/share/dutch/errmsg.txt
    1.66.6.1 03/07/07 23:35:14 paul@ice.snake.net +2 -2
    Error message edits.

  sql/share/danish/errmsg.txt
    1.62.6.1 03/07/07 23:35:14 paul@ice.snake.net +2 -2
    Error message edits.

  sql/share/czech/errmsg.txt
    1.64.6.1 03/07/07 23:35:14 paul@ice.snake.net +1 -1
    Error message edits.

ChangeSet
  1.1546.6.3 03/07/08 02:36:14 kostja@oak.local +42 -0
  Preliminary support for options --secure-auth, 
  --old-passwords
  Support for option --old-protocol was removed.
  Some test performed.
  Tests for SSL and replication are pending.
  More strict following to specification for --old-passwords
  is in the TODO.

  sql/share/ukrainian/errmsg.txt
    1.27.5.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/swedish/errmsg.txt
    1.64.5.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/spanish/errmsg.txt
    1.64.5.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/slovak/errmsg.txt
    1.64.5.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/serbian/errmsg.txt
    1.18.4.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/russian/errmsg.txt
    1.61.5.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/romanian/errmsg.txt
    1.62.5.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/portuguese/errmsg.txt
    1.64.5.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/polish/errmsg.txt
    1.63.4.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/norwegian/errmsg.txt
    1.63.5.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/norwegian-ny/errmsg.txt
    1.63.5.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/korean/errmsg.txt
    1.63.5.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/japanese/errmsg.txt
    1.63.5.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/italian/errmsg.txt
    1.70.5.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/hungarian/errmsg.txt
    1.65.5.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/greek/errmsg.txt
    1.64.5.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/german/errmsg.txt
    1.64.5.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/french/errmsg.txt
    1.63.5.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/estonian/errmsg.txt
    1.64.5.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/english/errmsg.txt
    1.70.7.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/dutch/errmsg.txt
    1.66.5.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/danish/errmsg.txt
    1.62.5.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/share/czech/errmsg.txt
    1.64.5.2 03/07/08 02:36:11 kostja@oak.local +1 -1
    error message for --secure-auth added
    (as suggested by Paul)

  sql/sql_yacc.yy
    1.203.53.3 03/07/08 02:15:51 kostja@oak.local +4 -3
    global variable use_old_passwords 
    replaced with thread-specific variable 
    old_passwords

  sql/sql_parse.cc
    1.271.11.3 03/07/08 02:15:51 kostja@oak.local +26 -6
    support for 3.20 clients removed
    now check_user takes into account option
    secure_auth

  sql/sql_class.h
    1.146.13.2 03/07/08 02:15:51 kostja@oak.local +1 -0
    added system/thread variable old_passwords

  sql/sql_acl.h
    1.21 03/07/08 02:15:51 kostja@oak.local +2 -2
    support for 3.20 clients removed

  sql/sql_acl.cc
    1.74.1.9 03/07/08 02:15:51 kostja@oak.local +54 -28
    support for 3.20 passwords removed
    now acl_init honors options works properly with
    options/variables --secure-auth and --old-passwords

  sql/share/ukrainian/errmsg.txt
    1.27.5.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/swedish/errmsg.txt
    1.64.5.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/spanish/errmsg.txt
    1.64.5.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/slovak/errmsg.txt
    1.64.5.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/serbian/errmsg.txt
    1.18.4.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/russian/errmsg.txt
    1.61.5.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/romanian/errmsg.txt
    1.62.5.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/portuguese/errmsg.txt
    1.64.5.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/polish/errmsg.txt
    1.63.4.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/norwegian/errmsg.txt
    1.63.5.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/norwegian-ny/errmsg.txt
    1.63.5.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/korean/errmsg.txt
    1.63.5.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/japanese/errmsg.txt
    1.63.5.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/italian/errmsg.txt
    1.70.5.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/hungarian/errmsg.txt
    1.65.5.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/greek/errmsg.txt
    1.64.5.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/german/errmsg.txt
    1.64.5.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/french/errmsg.txt
    1.63.5.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/estonian/errmsg.txt
    1.64.5.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/english/errmsg.txt
    1.70.7.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/dutch/errmsg.txt
    1.66.5.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/danish/errmsg.txt
    1.62.5.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/share/czech/errmsg.txt
    1.64.5.1 03/07/08 02:15:51 kostja@oak.local +1 -0
    error message for --secure-auth added

  sql/set_var.h
    1.28.1.1 03/07/08 02:15:51 kostja@oak.local +2 -0
    sys_old_passwords needs to be exported 
    because sys_old_passwords.after_update is used
    in sql_acl.cc

  sql/set_var.cc
    1.34.10.1 03/07/08 02:15:51 kostja@oak.local +6 -0
    added system variable 'secure_auth'
    added system/thread variable 'old_passwords'

  sql/password.c
    1.28 03/07/08 02:15:51 kostja@oak.local +11 -44
    removed support for 3.20 clients and 
    old scrambles 

  sql/mysqld.cc
    1.356.15.2 03/07/08 02:15:51 kostja@oak.local +14 -11
    added option opt_secure_auth
    option old-password placed according to
    sort order

  sql/mysql_priv.h
    1.186.12.2 03/07/08 02:15:51 kostja@oak.local +1 -1
    added declarartion for option opt_secure_auth

  sql/item_strfunc.h
    1.66 03/07/08 02:15:51 kostja@oak.local +1 -1
    fixed comment

  sql-common/client.c
    1.11.1.4 03/07/08 02:15:51 kostja@oak.local +2 -4
    removed support for 3.20 servers and 
    protocol version 9

  mysql-test/t/func_crypt.test
    1.11 03/07/08 02:15:51 kostja@oak.local +30 -4
    tests for two-argument of password() were removed.
    Instead added tests for cooperation of password() and
    old_passwords session/global variable, passwords() and spaces 
    in argument string 

  mysql-test/t/connect.test
    1.5 03/07/08 02:15:51 kostja@oak.local +4 -1
    added check for new syntax of
    set password

  mysql-test/r/func_crypt.result
    1.12 03/07/08 02:15:51 kostja@oak.local +76 -12
    tests for two-argument of password() were removed.
    Instead added tests for cooperation of password() and
    old_passwords session/global variable, passwords() and spaces 
    in argument string 

  mysql-test/r/connect.result
    1.1.1.4 03/07/08 02:15:51 kostja@oak.local +1 -0
    added check for new syntax of 
    set password

  libmysql/libmysql.c
    1.156.5.3 03/07/08 02:15:51 kostja@oak.local +2 -4
    removed support for 3.20 password and protocol
    version 9

  include/mysqld_error.h
    1.61.5.1 03/07/08 02:15:51 kostja@oak.local +2 -1
    added error code for --secure-auth mode

  include/mysql_com.h
    1.67.3.7 03/07/08 02:15:51 kostja@oak.local +2 -3
    support for 3.20 passwords removed from
    scramble_323

ChangeSet
  1.1556 03/07/08 00:08:00 bell@sanja.is.com.ua +6 -0
  new IN subquery engine added for simple IN with non-primary index but without NULL returning
  (SCRUM) (part of WL#818)

  sql/sql_select.h
    1.50 03/07/08 00:07:58 bell@sanja.is.com.ua +3 -2
    some common operation moved in separate method

  sql/sql_select.cc
    1.216.1.19 03/07/08 00:07:58 bell@sanja.is.com.ua +61 -29
    new engine added
    some common operation moved in separate method

  sql/item_subselect.h
    1.33 03/07/08 00:07:58 bell@sanja.is.com.ua +13 -0
    new engine added
    some common operation moved in separate method

  sql/item_subselect.cc
    1.60.1.10 03/07/08 00:07:58 bell@sanja.is.com.ua +65 -12
    new engine added
    some common operation moved in separate method

  mysql-test/t/subselect.test
    1.58.1.18 03/07/08 00:07:58 bell@sanja.is.com.ua +7 -1
    test of new engine

  mysql-test/r/subselect.result
    1.67.1.17 03/07/08 00:07:58 bell@sanja.is.com.ua +26 -4
    test of new engine

ChangeSet
  1.1346.1.156 03/07/07 19:35:11 serg@serg.mylan +1 -0
  typos fixed

  sql/mysqld.cc
    1.297.1.145 03/07/07 19:35:08 serg@serg.mylan +6 -6
    typos fixed

ChangeSet
  1.1346.274.3 03/07/07 19:02:58 serg@serg.mylan +3 -0
  finally proper recursive descent for parsing expressions with MATCH ... AGAINST in add_ft_keys()

  sql/sql_select.cc
    1.152.1.92 03/07/07 19:02:55 serg@serg.mylan +3 -17
    finally proper recursive descent for parsing expressions with MATCH ... AGAINST in add_ft_keys()

  mysql-test/t/fulltext.test
    1.34.2.3 03/07/07 19:02:55 serg@serg.mylan +18 -4
    finally proper recursive descent for parsing expressions with MATCH ... AGAINST in add_ft_keys()

  mysql-test/r/fulltext.result
    1.29.1.9 03/07/07 19:02:55 serg@serg.mylan +35 -8
    finally proper recursive descent for parsing expressions with MATCH ... AGAINST in add_ft_keys()

ChangeSet
  1.1555 03/07/07 18:51:14 bell@sanja.is.com.ua +4 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1

  sql/sql_select.h
    1.49 03/07/07 18:51:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.1.18 03/07/07 18:51:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.58.1.17 03/07/07 18:51:11 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.1.16 03/07/07 18:51:11 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1553.1.1 03/07/07 18:49:54 bell@sanja.is.com.ua +4 -0
  merge

  sql/sql_select.h
    1.48 03/07/07 18:49:53 bell@sanja.is.com.ua +1 -2
    merge

  mysql-test/t/subselect.test
    1.58.11.1 03/07/07 18:49:53 bell@sanja.is.com.ua +11 -11
    merge

  mysql-test/r/subselect.result
    1.67.17.1 03/07/07 18:49:53 bell@sanja.is.com.ua +12 -12
    merge

  sql/sql_select.cc
    1.216.22.1 03/07/07 18:45:30 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1554 03/07/07 18:40:19 bell@sanja.is.com.ua +7 -0
  Optimisation if simple IN subselect with primary index
  (SCRUM) (part of WL#818)

  sql/sql_select.h
    1.43.1.4 03/07/07 18:40:02 bell@sanja.is.com.ua +3 -2
    new JT_ type (just for information in EXPLAIN statement)
    report_error can't be static, because it used in new engine

  sql/sql_select.cc
    1.216.1.17 03/07/07 18:40:02 bell@sanja.is.com.ua +41 -2
    engine changing
    report_error can't be static, because it used in new engine

  sql/sql_lex.h
    1.102.1.26 03/07/07 18:40:02 bell@sanja.is.com.ua +1 -1
    fixed typo

  sql/item_subselect.h
    1.32 03/07/07 18:40:02 bell@sanja.is.com.ua +43 -0
    new engine for simple IN with primary index

  sql/item_subselect.cc
    1.60.1.9 03/07/07 18:40:02 bell@sanja.is.com.ua +78 -4
    new engine for simple IN with primary index

  mysql-test/t/subselect.test
    1.58.1.16 03/07/07 18:40:02 bell@sanja.is.com.ua +2 -0
    test of new optimisation

  mysql-test/r/subselect.result
    1.67.1.15 03/07/07 18:40:02 bell@sanja.is.com.ua +9 -1
    test of new optimisation

ChangeSet
  1.1346.274.2 03/07/07 16:45:19 serg@serg.mylan +1 -0
  correct (finally) condition for MATCH >0, >=0 etc in add_ft_keys (SW#1647)
  still no rec. descent

  sql/sql_select.cc
    1.152.1.91 03/07/07 16:45:17 serg@serg.mylan +9 -9
    correct (finally) condition for MATCH >0, >=0 etc in add_ft_keys (SW#1647)
    still no rec. descent

ChangeSet
  1.1346.1.154 03/07/07 16:39:53 heikki@hundin.mysql.fi +1 -0
  sql_delete.cc:
    Fix bug: if a DELETE failed in a FOREIGN KEY error and it had already deleted some rows, then MySQL did not roll back the failed SQL statement, and also wrote it to the binlog

  sql/sql_delete.cc
    1.74.1.21 03/07/07 16:39:42 heikki@hundin.mysql.fi +6 -1
    Fix bug: if a DELETE failed in a FOREIGN KEY error and it had already deleted some rows, then MySQL did not roll back the failed SQL statement, and also wrote it to the binlog

ChangeSet
  1.1524.1.17 03/07/07 14:55:10 pem@mysql.com +4 -0
  Fixed the old kludge for pre-loading functions and made it more efficient
  using a hash table instead (and made it work with lex pointers).
  Some additional code cleanup too.

  sql/sql_lex.h
    1.117 03/07/07 14:55:08 pem@mysql.com +12 -2
    Use hash table for function pre-loading (isntead of list).

  sql/sql_lex.cc
    1.76.1.6 03/07/07 14:55:08 pem@mysql.com +6 -1
    Use hash table for function pre-loading (isntead of list).

  sql/sp_head.h
    1.20 03/07/07 14:55:08 pem@mysql.com +1 -1
    Some additional code cleanup.

  sql/sp.cc
    1.23 03/07/07 14:55:08 pem@mysql.com +45 -45
    Fixed the old kludge for pre-loading functions and made it more efficient
    using a hash table instead (and made it work with lex pointers).
    Some additional cleanup of comments too.

ChangeSet
  1.1553 03/07/07 10:30:52 bell@sanja.is.com.ua +7 -0
  merge

  sql/item_sum.cc
    1.80 03/07/07 10:30:51 bell@sanja.is.com.ua +3 -6
    merge

  sql/item_func.h
    1.68.1.13 03/07/07 10:30:51 bell@sanja.is.com.ua +0 -0
    merge

  sql/sql_select.cc
    1.216.1.16 03/07/07 10:27:54 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.124.1.15 03/07/07 10:27:54 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.58 03/07/07 10:27:54 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.97 03/07/07 10:27:54 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.58.1.15 03/07/07 10:27:54 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1546.2.8 03/07/07 00:45:51 bell@sanja.is.com.ua +2 -0
  fixed subselect with to temporary tables executing
  (now it return correct results. Test was commited before, but it is not pushed,
  BUG# is not registered, because bug was introduced after release)

  sql/sql_select.h
    1.47 03/07/07 00:45:49 bell@sanja.is.com.ua +3 -1
    fixed subselect with to temporary tables executing

  sql/sql_select.cc
    1.216.12.12 03/07/07 00:45:49 bell@sanja.is.com.ua +14 -0
    fixed subselect with to temporary tables executing

ChangeSet
  1.1546.12.9 03/07/06 21:36:59 serg@serg.mylan +1 -0
  Merge bk-internal:/home/bk/mysql-4.1/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  sql/item_func.h
    1.68.3.4 03/07/06 21:36:54 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1546.16.1 03/07/06 19:09:57 monty@mashka.mysql.fi +42 -0
  Support for variables with components
  Added framework to create/drop and manager buffers for multiple key caches

  mysql-test/t/key_cache.test
    1.1 03/07/06 19:09:53 monty@mashka.mysql.fi +42 -0

  mysql-test/t/key_cache.test
    1.0 03/07/06 19:09:53 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.1/mysql-test/t/key_cache.test

  mysql-test/t/key_cache-master.opt
    1.1 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0

  mysql-test/r/key_cache.result
    1.1 03/07/06 19:09:52 monty@mashka.mysql.fi +43 -0

  sql/sql_yacc.yy
    1.203.54.1 03/07/06 19:09:52 monty@mashka.mysql.fi +29 -4
    Support for variables with components (To support multiple key caches)

  sql/sql_show.cc
    1.122.1.11 03/07/06 19:09:52 monty@mashka.mysql.fi +4 -1
    Fix after introducing variable components

  sql/sql_parse.cc
    1.271.13.1 03/07/06 19:09:52 monty@mashka.mysql.fi +8 -3
    Fix after changing prototype for get_system_var

  sql/sql_lex.cc
    1.80.1.1 03/07/06 19:09:52 monty@mashka.mysql.fi +14 -9
    Fixes for quoting of variables.

  sql/share/ukrainian/errmsg.txt
    1.27.1.13 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/swedish/errmsg.txt
    1.64.1.15 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/spanish/errmsg.txt
    1.64.1.13 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/slovak/errmsg.txt
    1.64.1.13 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/serbian/errmsg.txt
    1.18.1.11 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/russian/errmsg.txt
    1.61.1.14 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/romanian/errmsg.txt
    1.62.1.13 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/portuguese/errmsg.txt
    1.64.1.14 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/polish/errmsg.txt
    1.63.1.13 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/norwegian/errmsg.txt
    1.63.1.13 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.13 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/korean/errmsg.txt
    1.63.1.13 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/japanese/errmsg.txt
    1.63.1.13 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/italian/errmsg.txt
    1.70.1.13 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/hungarian/errmsg.txt
    1.65.1.13 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/greek/errmsg.txt
    1.64.1.13 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/german/errmsg.txt
    1.64.1.13 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/french/errmsg.txt
    1.63.1.13 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/estonian/errmsg.txt
    1.64.1.13 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/english/errmsg.txt
    1.70.1.17 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/dutch/errmsg.txt
    1.66.1.13 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/danish/errmsg.txt
    1.62.1.13 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/share/czech/errmsg.txt
    1.64.1.13 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -0
    New error messages

  sql/set_var.h
    1.29 03/07/06 19:09:52 monty@mashka.mysql.fi +82 -23
    Added support for multiple key caches

  sql/set_var.cc
    1.34.1.25 03/07/06 19:09:52 monty@mashka.mysql.fi +184 -34
    Added support for multiple key caches

  sql/mysqld.cc
    1.356.1.32 03/07/06 19:09:52 monty@mashka.mysql.fi +26 -5
    Added support for multiple key caches

  sql/mysql_priv.h
    1.186.14.1 03/07/06 19:09:52 monty@mashka.mysql.fi +5 -3
    Added support for variable components

  sql/item_func.cc
    1.124.3.6 03/07/06 19:09:52 monty@mashka.mysql.fi +66 -12
    Added support for variable components

  sql/Makefile.am
    1.77.1.10 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -1
    Make sql_yacc.o depend on all header files in sql directory

  mysys/my_getopt.c
    1.34.1.3 03/07/06 19:09:52 monty@mashka.mysql.fi +33 -28
    Fixed bugs with GET_ASK_ADDR

  mysql-test/t/key_cache-master.opt
    1.0 03/07/06 19:09:52 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.1/mysql-test/t/key_cache-master.opt

  mysql-test/r/variables.result
    1.21.1.7 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -1
    Updated test results

  mysql-test/r/select_safe.result
    1.8 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -1
    Updated test results

  mysql-test/r/key_cache.result
    1.0 03/07/06 19:09:52 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.1/mysql-test/r/key_cache.result

  include/mysqld_error.h
    1.61.1.11 03/07/06 19:09:52 monty@mashka.mysql.fi +2 -1
    New error messages

  include/my_sys.h
    1.100.1.1 03/07/06 19:09:52 monty@mashka.mysql.fi +6 -0
    Added (temporary) KEY_CACHE type

  include/my_getopt.h
    1.13 03/07/06 19:09:52 monty@mashka.mysql.fi +1 -1
    Fixed prototype

ChangeSet
  1.1346.1.153 03/07/06 18:01:39 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/sql_parse.cc
    1.218.1.110 03/07/06 18:01:32 guilhem@mysql.com +0 -0
    Auto merged

  sql/slave.h
    1.50.1.10 03/07/06 18:01:31 guilhem@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.150.1.51 03/07/06 18:01:30 guilhem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.276.1 03/07/06 17:59:54 guilhem@mysql.com +15 -0
  WL#912 (more user control on relay logs):
  FLUSH LOGS now rotates relay logs,
  and a new variable max_relay_log_size.
  Plus a very small bit of code cleaning.

  mysql-test/t/rpl_max_relay_size.test
    1.1 03/07/06 17:59:46 guilhem@mysql.com +81 -0

  mysql-test/r/rpl_max_relay_size.result
    1.1 03/07/06 17:59:46 guilhem@mysql.com +61 -0

  mysql-test/t/rpl_max_relay_size.test
    1.0 03/07/06 17:59:46 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/rpl_max_relay_size.test

  mysql-test/r/rpl_max_relay_size.result
    1.0 03/07/06 17:59:46 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/r/rpl_max_relay_size.result

  sql/sql_parse.cc
    1.218.28.3 03/07/06 17:59:45 guilhem@mysql.com +8 -0
    Flush the relay log in FLUSH LOGS.

  sql/sql_class.h
    1.111.1.40 03/07/06 17:59:45 guilhem@mysql.com +15 -3
    New member max_size of MYSQL_LOG (for automatic rotation).
    New method set_max_size() for setting on-the-fly.

  sql/slave.h
    1.50.2.1 03/07/06 17:59:45 guilhem@mysql.com +1 -0
    New function rotate_relay_log().

  sql/slave.cc
    1.164.1.73 03/07/06 17:59:45 guilhem@mysql.com +51 -1
    New function rotate_relay_log().

  sql/set_var.cc
    1.12.1.24 03/07/06 17:59:44 guilhem@mysql.com +29 -1
    New variable max_relay_log_size.
    If it is 0, then max_binlog_size will apply to relay logs.
    When one of these variables is changed, fix_max_%log_size is called
    to update max_size of the binary and/or relay logs.

  sql/mysqld.cc
    1.297.1.144 03/07/06 17:59:44 guilhem@mysql.com +19 -11
    New variable and option max_relay_log_size.
    max_binlog_size and max_relay_log_size are multiples of IO_SIZE.
    No more default arguments for log functions.

  sql/mysql_priv.h
    1.150.10.1 03/07/06 17:59:43 guilhem@mysql.com +4 -3
    no defaults in open_log().
    New variables max_relay_log_size.

  sql/log.cc
    1.80.1.44 03/07/06 17:59:43 guilhem@mysql.com +57 -15
    Got rid of default arguments of various MYSQL_LOG methods (the default arguments
    made code reading uneasy).
    Set max_size in ::init().
    New function set_max_size() to set max_size of a MYSQL_LOG on-the-fly.
    More DBUG info.

  mysql-test/t/rpl_rotate_logs-master.opt
    1.5 03/07/06 17:59:43 guilhem@mysql.com +1 -1
    now max_binlog_size must be a multiple of 4096 (see change in mysqld.cc)

  mysql-test/r/rpl_rotate_logs.result
    1.32.1.3 03/07/06 17:59:43 guilhem@mysql.com +2 -4
    result update now that max_binlog_size is 4096.

  mysql-test/r/rpl_log.result
    1.26.1.6 03/07/06 17:59:42 guilhem@mysql.com +1 -1
    result update now that FLUSH LOGS rotates relay logs.

  mysql-test/r/rpl_flush_log_loop.result
    1.3.1.1 03/07/06 17:59:42 guilhem@mysql.com +1 -1
    result update now that FLUSH LOGS rotates relay logs.

  libmysqld/lib_sql.cc
    1.25.3.10 03/07/06 17:59:42 guilhem@mysql.com +4 -4
    open_log has no default arguments anymore.

ChangeSet
  1.1546.15.1 03/07/06 17:12:45 serg@serg.mylan +4 -0
  renamed enum Item_cast as it's not a 'class Item' child

  sql/sql_yacc.yy
    1.203.51.3 03/07/06 17:12:40 serg@serg.mylan +1 -1
    renamed enum Item_cast as it's not a 'class Item' child

  sql/item_func.h
    1.68.4.1 03/07/06 17:12:40 serg@serg.mylan +1 -1
    renamed enum Item_cast as it's not a 'class Item' child

  sql/item_create.h
    1.27.2.1 03/07/06 17:12:40 serg@serg.mylan +1 -1
    renamed enum Item_cast as it's not a 'class Item' child

  sql/item_create.cc
    1.33.4.1 03/07/06 17:12:40 serg@serg.mylan +1 -1
    renamed enum Item_cast as it's not a 'class Item' child

ChangeSet
  1.1546.12.8 03/07/06 18:11:19 bell@sanja.is.com.ua +3 -0
  fixed memory leak in group_concat function (BUG#796)
  fixed test func_gconcat to be repeatable independent of presend tables and avoid removing user tables

  sql/item_sum.cc
    1.78.1.2 03/07/06 18:11:17 bell@sanja.is.com.ua +12 -6
    added debug information
    fixed memory leak in group_concat function

  mysql-test/t/func_gconcat.test
    1.6 03/07/06 18:11:17 bell@sanja.is.com.ua +16 -16
    removed warning in test
    fixed table tnames (should be tN, where N is number)

  mysql-test/r/func_gconcat.result
    1.12 03/07/06 18:11:17 bell@sanja.is.com.ua +12 -20
    removed warning in test
    fixed table tnames (should be tN, where N is number)

ChangeSet
  1.1346.1.152 03/07/06 18:01:51 heikki@hundin.mysql.fi +1 -0
  row0mysql.c:
    Fix performance bug: if there were thousands of tables, DROP TABLE could take as much as a second CPU time

  innobase/row/row0mysql.c
    1.39.1.9 03/07/06 18:01:32 heikki@hundin.mysql.fi +2 -1
    Fix performance bug: if there were thousands of tables, DROP TABLE could take as much as a second CPU time

ChangeSet
  1.1346.275.1 03/07/06 16:17:02 heikki@hundin.mysql.fi +2 -0
  srv0srv.c:
    In background loop run purge to completion before doing other background operations: it does not make sense to flush buffer pool pages if they are soon modified again by purge
  trx0purge.c:
    Increase purge_sys->n_pages_handled for every undo log we purge, even if that log would be only a hundred bytes: that way we get the purge batches of 20 pages to set a fresh purge view (limit) more often, and we can reduce the number of old row versions purge has to look at when it decides if it can remove some delete-marked index record

  innobase/srv/srv0srv.c
    1.35.1.18 03/07/06 16:15:19 heikki@hundin.mysql.fi +23 -4
    In background loop run purge to completion before doing other background operations: it does not make sense to flush buffer pool pages if they are soon modified again by purge

  innobase/trx/trx0purge.c
    1.9 03/07/06 16:13:59 heikki@hundin.mysql.fi +3 -10
    Increase purge_sys->n_pages_handled for every undo log we purge, even if that log would be only a hundred bytes: that way we get the purge batches of 20 pages to set a fresh purge view (limit) more often, and we can reduce the number of old row versions purge has to look at when it decides if it can remove some delete-marked index record

ChangeSet
  1.1552 03/07/05 17:21:39 bell@sanja.is.com.ua +3 -0
  avoiding of allocating JOIN structure on every UNION executing
  (SCRUM)

  sql/sql_union.cc
    1.74.1.7 03/07/05 17:21:29 bell@sanja.is.com.ua +27 -1
    avoiding of allocating JOIN structure on every UNION executing

  sql/sql_select.h
    1.43.1.3 03/07/05 17:21:29 bell@sanja.is.com.ua +49 -32
    JOIN clean for fake_select_lex

  sql/sql_select.cc
    1.216.1.15 03/07/05 17:21:29 bell@sanja.is.com.ua +17 -5
    support of fake_select_lex join clean
    removed compiler warning

ChangeSet
  1.1346.1.150 03/07/05 16:29:11 Sinisa@sinisa.nasamreza.org +2 -0
  missing test case for DISTINCT .. LEFT ..

  mysql-test/t/distinct.test
    1.11.1.2 03/07/05 16:29:07 Sinisa@sinisa.nasamreza.org +7 -0
    missing test case for DISTINCT .. LEFT ..

  mysql-test/r/distinct.result
    1.14.1.8 03/07/05 16:29:07 Sinisa@sinisa.nasamreza.org +9 -0
    missing test case for DISTINCT .. LEFT ..

ChangeSet
  1.1546.12.7 03/07/05 03:03:31 bell@sanja.is.com.ua +4 -0
  reduced using of slow current_thd/current_lex macro
  initialization of item_thd moved to constructor (in any case we need thd in constructor)
  initialization of group_concat_max_len to constructor to avoid incorrect length reporting (BUG#757)
  removed Item_func_group_concat::fix_length_and_dec() because item have its own fix_fields and will not have inherited items

  sql/item_sum.h
    1.43 03/07/05 03:03:21 bell@sanja.is.com.ua +0 -1
    removed Item_func_group_concat::fix_length_and_dec() because item have its own fix_fields and will not have inherited items

  sql/item_sum.cc
    1.78.1.1 03/07/05 03:03:21 bell@sanja.is.com.ua +8 -8
    reduced using of slow current_thd/current_lex macro
    initialization of item_thd moved to constructor (in any case we need thd in constructor)
    initialization of group_concat_max_len to constructor to avoid incorrect length reporting (BUG#757)

  mysql-test/t/func_gconcat.test
    1.5 03/07/05 03:03:21 bell@sanja.is.com.ua +6 -0
    test for BUG#757

  mysql-test/r/func_gconcat.result
    1.11 03/07/05 03:03:21 bell@sanja.is.com.ua +9 -0
    test for BUG#757

ChangeSet
  1.1546.2.7 03/07/05 00:10:51 bell@sanja.is.com.ua +2 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc_group-4.1

  sql/sql_select.cc
    1.216.12.11 03/07/05 00:10:49 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.58.8.3 03/07/05 00:10:48 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.1.149 03/07/04 21:17:46 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

ChangeSet
  1.1346.1.148 03/07/04 18:20:26 jani@rhols221.adsl.netsonic.fi +1 -0
  Fixed a compatibility bug in mysqlhotcopy between different
  versions of DBD. New mysqlhotcopy version supports both old
  and new DBD versions while versions elder than 1.19 support
  only old DBD versions.

ChangeSet
  1.1346.1.146 03/07/04 16:36:22 monty@narttu.mysql.fi +5 -0
  Remove compiler warnings
  Simple cleanup of previous pull

ChangeSet
  1.1346.273.1 03/07/04 16:06:17 vva@eagle.mysql.r18.ru +3 -0
  fixed bug #670

  sql/log_event.h
    1.71.1.9 03/07/04 16:36:20 monty@narttu.mysql.fi +7 -2
    Indentation fix

  sql/log_event.h
    1.71.1.8 03/07/04 16:06:01 vva@eagle.mysql.r18.ru +8 -0
    fixed bug #670

  sql/log_event.cc
    1.77.1.39 03/07/04 16:06:01 vva@eagle.mysql.r18.ru +25 -4
    fixed bug #670

  client/mysqlbinlog.cc
    1.70.1.8 03/07/04 16:06:01 vva@eagle.mysql.r18.ru +266 -20
    fixed bug #670

  sql/sql_parse.cc
    1.218.1.109 03/07/04 21:14:33 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1538.70.1 03/07/04 10:54:10 venu@myvenu.com +1 -0
  Fix for send_fields flush after a fix for windows slowdown issue

  sql/sql_prepare.cc
    1.34.1.4 03/07/04 10:53:08 venu@myvenu.com +3 -0
    Fix for send_fields flush after a fix for windows slowdown issue

ChangeSet
  1.1546.6.2 03/07/04 20:52:04 kostja@oak.local +13 -0
  Bug fixes for authentication
  OLD_PASSWORD made a keyword to allow set password=old_password('abc') constructions.

  sql/sql_yacc.yy
    1.203.53.2 03/07/04 20:51:11 kostja@oak.local +16 -21
    OLD_PASSWORD now is keyword, to allow statements like
    set password=old_password('abc')

  sql/sql_parse.cc
    1.271.11.2 03/07/04 20:51:11 kostja@oak.local +131 -133
    authenticate merged with check_user
    check_user return values reversed, support for ER_AUTH in check_user.added

  sql/sql_acl.cc
    1.74.1.8 03/07/04 20:51:11 kostja@oak.local +7 -2
    incorporated patch from Lycos team
    41 replaced with constant
    acl_getroot rewritten to support ER_AUTH_... error

  sql/password.c
    1.27 03/07/04 20:51:11 kostja@oak.local +4 -8
    fixed scramble return value
    trailing zero now is not written

  sql/lex.h
    1.82.13.1 03/07/04 20:51:11 kostja@oak.local +1 -1
    OLD_PASSWORD now is keyword, to allow statements like
    set password=old_password('abc')

  sql/item_strfunc.h
    1.65 03/07/04 20:51:11 kostja@oak.local +2 -1
    Added alloc() function to Item_func_password, Item_func_old_password, which is used in sql_yacc.yy

  sql/item_strfunc.cc
    1.128 03/07/04 20:51:11 kostja@oak.local +16 -0
    Added alloc() function to Item_func_password, Item_func_old_password, which is used in sql_yacc.yy

  sql/item_create.h
    1.27.1.1 03/07/04 20:51:11 kostja@oak.local +0 -2
    removed create_func_old_password, create_func_password as they are not used any more

  sql/item_create.cc
    1.33.3.2 03/07/04 20:51:11 kostja@oak.local +0 -12
    removed create_func_old_password, create_func_password as they are not used any more

  sql-common/client.c
    1.11.1.3 03/07/04 20:51:11 kostja@oak.local +14 -10
    applied patch from Lycos team
    fixed bug with scramble containing zero byte

  libmysql/libmysql.c
    1.156.5.2 03/07/04 20:51:11 kostja@oak.local +11 -7
    fixed bug with with failed authentification when scramble contained zero byte

  include/mysql_com.h
    1.67.3.6 03/07/04 20:51:11 kostja@oak.local +1 -1
    scramble return type changed to void as now it's not used

  BitKeeper/etc/ignore
    1.153.4.2 03/07/04 20:51:11 kostja@oak.local +5 -0
    Added BitKeeper/post-commit BitKeeper/post-commit-manual build_tags.sh tests/connect_test BUILD/compile-pentium-maintainer to the ignore list

  scripts/mysqlhotcopy.sh
    1.32 03/07/04 18:20:24 jani@rhols221.adsl.netsonic.fi +5 -1
    Fixed a compatibility bug in mysqlhotcopy between different
    versions of DBD. New mysqlhotcopy version supports both old
    and new DBD versions while versions elder than 1.19 support
    only old DBD versions.

ChangeSet
  1.1546.12.5 03/07/04 20:19:07 bar@bar.mysql.r18.ru +3 -0
  More code was reused

  sql/item_strfunc.cc
    1.126.1.4 03/07/04 20:19:04 bar@bar.mysql.r18.ru +2 -1
    More code was reused

  sql/item_func.cc
    1.124.3.5 03/07/04 20:19:04 bar@bar.mysql.r18.ru +4 -11
    More code was reused

  sql/item_cmpfunc.cc
    1.87.1.17 03/07/04 20:19:04 bar@bar.mysql.r18.ru +7 -34
    More code was reused

ChangeSet
  1.1546.12.4 03/07/04 19:56:32 bar@bar.mysql.r18.ru +3 -0
  Better arguments format to allow reuse more code

  sql/item_strfunc.cc
    1.126.1.3 03/07/04 19:56:29 bar@bar.mysql.r18.ru +6 -6
    Better arguments format to allow reuse more code

  sql/item_func.h
    1.68.3.3 03/07/04 19:56:29 bar@bar.mysql.r18.ru +2 -2
    Better arguments format to allow reuse more code

  sql/item_func.cc
    1.124.3.4 03/07/04 19:56:29 bar@bar.mysql.r18.ru +10 -10
    Better arguments format to allow reuse more code

  sql/sql_parse.cc
    1.218.1.108 03/07/04 16:36:20 monty@narttu.mysql.fi +4 -1
    Removed compiler warning

  sql/sql_handler.cc
    1.19.1.15 03/07/04 16:36:20 monty@narttu.mysql.fi +1 -1
    Simple ptimization

  sql/sql_cache.cc
    1.29.1.26 03/07/04 16:36:20 monty@narttu.mysql.fi +1 -1
    Indentation fix

  sql/item_strfunc.cc
    1.36.1.30 03/07/04 16:36:20 monty@narttu.mysql.fi +1 -1
    Removed compiler warning

ChangeSet
  1.1546.14.1 03/07/04 18:12:23 bar@bar.mysql.r18.ru +5 -0
  New methods 
    Item_func::agg_arg_collations()
    Item_func::arr_arg_collations_for_comparison()
   to aggregate argument collations.
  It helps to reuse a lot of code.

  sql/item_strfunc.cc
    1.126.1.2 03/07/04 18:12:20 bar@bar.mysql.r18.ru +18 -57
    New methods 
      Item_func::agg_arg_collations()
      Item_func::arr_arg_collations_for_comparison()
     to aggregate argument collations.
    It helps to reuse a lot of code.

  sql/item_func.h
    1.68.3.2 03/07/04 18:12:20 bar@bar.mysql.r18.ru +3 -0
    New methods 
      Item_func::agg_arg_collations()
      Item_func::arr_arg_collations_for_comparison()
     to aggregate argument collations.
    It helps to reuse a lot of code.

  sql/item_func.cc
    1.124.3.3 03/07/04 18:12:20 bar@bar.mysql.r18.ru +55 -0
    New methods 
      Item_func::agg_arg_collations()
      Item_func::arr_arg_collations_for_comparison()
     to aggregate argument collations.
    It helps to reuse a lot of code.

  mysql-test/t/func_str.test
    1.33 03/07/04 18:12:20 bar@bar.mysql.r18.ru +8 -0
    New methods 
      Item_func::agg_arg_collations()
      Item_func::arr_arg_collations_for_comparison()
     to aggregate argument collations.
    It helps to reuse a lot of code.

  mysql-test/r/func_str.result
    1.35 03/07/04 18:12:20 bar@bar.mysql.r18.ru +6 -0
    New methods 
      Item_func::agg_arg_collations()
      Item_func::arr_arg_collations_for_comparison()
     to aggregate argument collations.
    It helps to reuse a lot of code.

ChangeSet
  1.1346.272.1 03/07/04 14:42:57 serg@serg.mylan +3 -0
  merge + order by (bug #515) temporary fix
  properly fixed in 4.1

  sql/sql_select.cc
    1.152.1.90 03/07/04 14:42:54 serg@serg.mylan +2 -0
    merge + order by (bug #515) temporary fix
    properly fixed in 4.1

  sql/ha_myisammrg.h
    1.24.1.2 03/07/04 14:42:54 serg@serg.mylan +2 -1
    merge + order by (bug #515) temporary fix
    properly fixed in 4.1

  mysql-test/r/merge.result
    1.11.1.11 03/07/04 14:42:54 serg@serg.mylan +2 -0
    merge + order by (bug #515) temporary fix
    properly fixed in 4.1

ChangeSet
  1.1346.1.144 03/07/04 17:15:16 ram@mysql.r18.ru +3 -0
  fix and test case for the bug #787: HANDLER without INDEX doesn't work with deleted rows

  sql/sql_handler.cc
    1.19.1.14 03/07/04 17:15:14 ram@mysql.r18.ru +17 -22
    fix for the bug #787: HANDLER without INDEX doesn't work with deleted rows

  mysql-test/t/handler.test
    1.7.1.5 03/07/04 17:15:14 ram@mysql.r18.ru +15 -0
    test case for the bug #787: HANDLER without INDEX doesn't work with deleted rows

  mysql-test/r/handler.result
    1.7.1.5 03/07/04 17:15:09 ram@mysql.r18.ru +19 -0
    test case for the bug #787: HANDLER without INDEX doesn't work with deleted rows

ChangeSet
  1.1346.1.143 03/07/04 12:55:46 serg@serg.mylan +1 -0
  Merge bk-internal:/home/bk/mysql-4.0/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.0

  sql/sql_handler.cc
    1.19.1.13 03/07/04 12:55:43 serg@serg.mylan +0 -1
    Auto merged

ChangeSet
  1.1346.271.1 03/07/04 12:55:25 serg@serg.mylan +3 -0
  handler should be used with constant expressions only (or rand)

  sql/sql_handler.cc
    1.19.2.1 03/07/04 12:55:23 serg@serg.mylan +6 -1
    handler should be used with constant expressions only (or rand)

  mysql-test/t/handler.test
    1.7.1.4 03/07/04 12:55:23 serg@serg.mylan +2 -0
    handler should be used with constant expressions only (or rand)

  mysql-test/r/handler.result
    1.7.1.4 03/07/04 12:55:23 serg@serg.mylan +2 -0
    handler should be used with constant expressions only (or rand)

ChangeSet
  1.1546.11.1 03/07/04 12:07:06 serg@serg.mylan +2 -0
  enabling HA_READ_PREFIX_LAST_OR_PREV

  sql/opt_range.cc
    1.90.1.1 03/07/04 12:07:03 serg@serg.mylan +1 -1
    enabling HA_READ_PREFIX_LAST_OR_PREV

  mysql-test/t/subselect.test
    1.58.10.1 03/07/04 12:07:03 serg@serg.mylan +2 -0
    fixed test case for no InnoDB

ChangeSet
  1.1538.69.1 03/07/04 14:41:01 ram@mysql.r18.ru +3 -0
  fix and test case for the bug #787: HANDLER without INDEX doesn't work with deleted rows

  sql/sql_handler.cc
    1.38 03/07/04 14:40:28 ram@mysql.r18.ru +17 -22
    fix for the bug #787: HANDLER without INDEX doesn't work with deleted rows

  mysql-test/t/handler.test
    1.12 03/07/04 14:40:28 ram@mysql.r18.ru +14 -0
    test case for the bug #787: HANDLER without INDEX doesn't work with deleted rows

  mysql-test/r/handler.result
    1.12 03/07/04 14:40:28 ram@mysql.r18.ru +19 -0
    test case for the bug #787: HANDLER without INDEX doesn't work with deleted rows

ChangeSet
  1.1546.7.10 03/07/04 13:21:14 hf@deer.(none) +7 -0
  Resolving conflicts

  libmysqld/libmysqld.c
    1.39 03/07/04 13:21:13 hf@deer.(none) +0 -97
    This code seems to be unnecessary

  include/mysql.h
    1.77 03/07/04 13:21:13 hf@deer.(none) +0 -1
    Merging (prolly it's the mistake)

ChangeSet
  1.1346.1.142 03/07/04 11:06:58 monty@narttu.mysql.fi +1 -0
  Fixed memory/lock leak from bug fix

  sql/sql_handler.cc
    1.19.1.12 03/07/04 11:06:57 monty@narttu.mysql.fi +1 -1
    Fixed memory/lock leak from bug fix

  sql/sql_client.cc
    1.3 03/07/04 11:54:11 hf@deer.(none) +0 -0
    Auto merged

  sql/protocol.cc
    1.56.1.9 03/07/04 11:54:11 hf@deer.(none) +0 -0
    Auto merged

  sql-common/client.c
    1.17 03/07/04 11:54:11 hf@deer.(none) +0 -0
    Auto merged

  client/mysqltest.c
    1.92.1.9 03/07/04 11:54:11 hf@deer.(none) +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.233.1.18 03/07/04 11:54:06 hf@deer.(none) +0 -0
    auto-union

ChangeSet
  1.1538.24.19 03/07/04 11:40:10 hf@deer.(none) +7 -0
  SCRUM
  Including client code into embedded library
  
  Code trimming (fixes of comments etc)

  sql/net_serv.cc
    1.58 03/07/04 11:40:08 hf@deer.(none) +0 -2
    #undef should work anyway

  sql-common/client.c
    1.16 03/07/04 11:40:08 hf@deer.(none) +0 -4
    #undef should work anyway

  libmysqld/libmysqld.c
    1.38 03/07/04 11:40:08 hf@deer.(none) +1 -2
    comment fixed

  libmysql/libmysql.c
    1.156.1.14 03/07/04 11:40:08 hf@deer.(none) +0 -4
    #undef should work anyway

  include/violite.h
    1.32 03/07/04 11:40:08 hf@deer.(none) +1 -2
    comment fixed

  include/mysql_embed.h
    1.8 03/07/04 11:40:08 hf@deer.(none) +1 -3
    comment fixed

  include/mysql_com.h
    1.67.1.9 03/07/04 11:40:08 hf@deer.(none) +1 -3
    Comment fixed

ChangeSet
  1.1346.270.1 03/07/04 03:18:15 monty@narttu.mysql.fi +8 -0
  Status query on killed mysql connection results in segmentation fault (Bug #738)
  Added MAX_PASSWORD_LENGTH. This increased master-slave passwords to 32 bytes (Bug #766)
  Fixed server crash on purge master logs or show master logs when binlog is off. (Bug #733)

  strings/strmake.c
    1.7 03/07/04 03:18:13 monty@narttu.mysql.fi +1 -1
    Fixed comment

  sql/sql_repl.h
    1.24.2.3 03/07/04 03:18:13 monty@narttu.mysql.fi +1 -1
    Fixed to use right define

  sql/sql_repl.cc
    1.86.1.17 03/07/04 03:18:13 monty@narttu.mysql.fi +13 -12
    Memory overrun safety fixes (not critical)
    Fixed server crash on purge master logs or show master logs when binlog is off. (Bug #733)

  sql/slave.h
    1.50.1.9 03/07/04 03:18:13 monty@narttu.mysql.fi +5 -6
    Optimized structure

  sql/mysql_priv.h
    1.150.1.50 03/07/04 03:18:13 monty@narttu.mysql.fi +1 -0
    Added MAX_PASSWORD_LENGTH. This increased master-slave passwords to 32 bytes

  include/my_global.h
    1.34.1.20 03/07/04 03:18:13 monty@narttu.mysql.fi +0 -4
    Removed wrong patch from previous changeset

  configure.in
    1.191.1.88 03/07/04 03:18:13 monty@narttu.mysql.fi +12 -10
    Portability fix for Unixware

  client/mysql.cc
    1.93.1.46 03/07/04 03:18:13 monty@narttu.mysql.fi +2 -1
    status query on killed mysql connection results in segmentation fault (Bug #738)

ChangeSet
  1.1546.10.1 03/07/04 01:21:42 monty@narttu.mysql.fi +1 -0
  Fixed problem with stacksize on Unixware

  sql/mysqld.cc
    1.356.1.31 03/07/04 01:21:39 monty@narttu.mysql.fi +15 -16
    Fixed problem with stacksize on Unixware

ChangeSet
  1.1346.269.1 03/07/03 23:41:07 Sinisa@sinisa.nasamreza.org +1 -0
  Fix for bug #676
  A security leak with SHOW TABLES/ TABLE STATUS FROM db ...

  sql/sql_parse.cc
    1.218.29.1 03/07/03 23:41:03 Sinisa@sinisa.nasamreza.org +8 -0
    Fix for bug #676
    A security leak with SHOW TABLES/ TABLE STATUS FROM db ...

ChangeSet
  1.1346.1.140 03/07/03 22:48:13 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Since the mysql interactive client or some other phase in communication cuts > 64 kB strings to very short, restrict the output of SHOW INNODB STATUS to at most 60 kB

  sql/ha_innodb.cc
    1.73.1.109 03/07/03 22:47:42 heikki@hundin.mysql.fi +4 -4
    Since the mysql interactive client or some other phase in communication cuts > 64 kB strings to very short, restrict the output of SHOW INNODB STATUS to at most 60 kB

ChangeSet
  1.1346.1.139 03/07/03 21:09:14 heikki@hundin.mysql.fi +9 -0
  Many files:
    Remove potential starvation of a full log buffer flush: only flush up to the lsn which was the largest at the time when we requested the full log buffer flush
  os0sync.h, os0sync.c:
    Fix a bug in os_event on Unix: even though we signaled the event, some threads could continue waiting if the event became nonsignaled quickly again; this made group commit less efficient than it should be

ChangeSet
  1.1346.268.1 03/07/03 23:24:23 hf@deer.(none) +3 -0
  Fix for #739
  check for negative count in RPAD added

  sql/item_strfunc.cc
    1.36.1.29 03/07/03 23:24:21 hf@deer.(none) +1 -1
    we return NULL if count < 0

  mysql-test/t/func_str.test
    1.15.2.4 03/07/03 23:24:21 hf@deer.(none) +14 -0
    testcase added

  mysql-test/r/func_str.result
    1.16.2.5 03/07/03 23:24:21 hf@deer.(none) +10 -0
    Appropriate result

  innobase/btr/btr0btr.c
    1.20 03/07/03 21:05:34 heikki@hundin.mysql.fi +29 -0
    Remove potential starvation of a full log buffer flush: only flush up to the lsn which was the largest at the time when we requested the full log buffer flush

  sql/ha_innodb.cc
    1.73.1.108 03/07/03 21:04:47 heikki@hundin.mysql.fi +5 -5
    Remove potential starvation of a full log buffer flush: only flush up to the lsn which was the largest at the time when we requested the full log buffer flush

  innobase/trx/trx0trx.c
    1.20.1.8 03/07/03 21:00:51 heikki@hundin.mysql.fi +4 -0
    Remove potential starvation of a full log buffer flush: only flush up to the lsn which was the largest at the time when we requested the full log buffer flush

  innobase/row/row0mysql.c
    1.39.1.8 03/07/03 21:00:44 heikki@hundin.mysql.fi +1 -1
    Remove potential starvation of a full log buffer flush: only flush up to the lsn which was the largest at the time when we requested the full log buffer flush

  innobase/srv/srv0srv.c
    1.35.1.17 03/07/03 21:00:16 heikki@hundin.mysql.fi +11 -9
    Remove potential starvation of a full log buffer flush: only flush up to the lsn which was the largest at the time when we requested the full log buffer flush

  innobase/include/log0log.h
    1.9 03/07/03 20:59:43 heikki@hundin.mysql.fi +6 -0
    Remove potential starvation of a full log buffer flush: only flush up to the lsn which was the largest at the time when we requested the full log buffer flush

  innobase/log/log0log.c
    1.20.1.5 03/07/03 20:59:30 heikki@hundin.mysql.fi +23 -2
    Remove potential starvation of a full log buffer flush: only flush up to the lsn which was the largest at the time when we requested the full log buffer flush

  innobase/include/os0sync.h
    1.13 03/07/03 20:54:51 heikki@hundin.mysql.fi +6 -2
    Fix a bug in os_event on Unix: even though we signaled the event, some threads could continue waiting if the event became nonsignaled quickly again; this made group commit less efficient than it should be

  innobase/os/os0sync.c
    1.21 03/07/03 20:54:36 heikki@hundin.mysql.fi +12 -3
    Fix a bug in os_event on Unix: even though we signaled the event, some threads could continue waiting if the event became nonsignaled quickly again; this made group commit less efficient than it should be

ChangeSet
  1.1346.1.135 03/07/03 19:23:06 monty@narttu.mysql.fi +4 -0
  Fix for UNIXWARE 7
  Remove unaligned warnings on Ia64 from client library when using --host
  Fix for replication when using many file descriptors 

  sql/mini_client.cc
    1.48.1.5 03/07/03 19:23:05 monty@narttu.mysql.fi +116 -57
    Ported connect timeout code from libmysql.c

  mysql-test/r/symlink.result
    1.4.1.1 03/07/03 19:23:05 monty@narttu.mysql.fi +5 -4
    Updated results

  libmysql/libmysql.c
    1.95.1.33 03/07/03 19:23:05 monty@narttu.mysql.fi +14 -2
    Portability fix (removes unaligned warnings on Ia64)

  include/my_global.h
    1.34.1.19 03/07/03 19:23:05 monty@narttu.mysql.fi +8 -0
    Fix for UNIXWARE 7

ChangeSet
  1.1346.266.7 03/07/03 20:57:51 hf@deer.(none) +5 -0
  Proposed fix for #751
  Fields in key_expr (mysql_ha_read) wasn't linked to tables.
  Hmm. How did it work at all?

  sql/sql_handler.cc
    1.19.1.11 03/07/03 20:57:31 hf@deer.(none) +2 -0
    fix_fields called

  mysql-test/t/handler.test
    1.7.1.3 03/07/03 20:57:31 hf@deer.(none) +10 -0
    test case for #751

  mysql-test/t/alias.test
    1.2.1.2 03/07/03 20:57:31 hf@deer.(none) +2 -0
    it's better to drop table after test

  mysql-test/r/handler.result
    1.7.1.3 03/07/03 20:57:31 hf@deer.(none) +6 -0
    appropriate result

  mysql-test/r/alias.result
    1.5 03/07/03 20:57:31 hf@deer.(none) +1 -0
    It's better to delete table after the test

ChangeSet
  1.1346.266.6 03/07/03 17:36:33 heikki@hundin.mysql.fi +1 -0
  trx0trx.c:
    Fix bug: group commit still did not work when we had MySQL binlogging on

  innobase/trx/trx0trx.c
    1.20.1.7 03/07/03 17:36:20 heikki@hundin.mysql.fi +67 -31
    Fix bug: group commit still did not work when we had MySQL binlogging on

ChangeSet
  1.1546.9.3 03/07/03 19:24:38 bar@bar.mysql.r18.ru +4 -0
  FIELD() now takes in account arguments collations

  sql/item_func.h
    1.68.3.1 03/07/03 19:24:35 bar@bar.mysql.r18.ru +3 -7
    FIELD() now takes in account arguments collations

  sql/item_func.cc
    1.124.3.2 03/07/03 19:24:35 bar@bar.mysql.r18.ru +54 -8
    FIELD() now takes in account arguments collations

  mysql-test/t/func_str.test
    1.32 03/07/03 19:24:35 bar@bar.mysql.r18.ru +13 -0
    FIELD() now takes in account arguments collations

  mysql-test/r/func_str.result
    1.34 03/07/03 19:24:35 bar@bar.mysql.r18.ru +19 -0
    FIELD() now takes in account arguments collations

ChangeSet
  1.1524.1.16 03/07/03 16:01:31 pem@mysql.com +2 -0
  Add the new sp cache files too (should have been in previous changeset).

  sql/sp_cache.h
    1.1 03/07/03 16:01:29 pem@mysql.com +65 -0

  sql/sp_cache.cc
    1.1 03/07/03 16:01:29 pem@mysql.com +53 -0

  sql/sp_cache.h
    1.0 03/07/03 16:01:29 pem@mysql.com +0 -0
    BitKeeper file /home/pem/work/mysql-5.0/sql/sp_cache.h

  sql/sp_cache.cc
    1.0 03/07/03 16:01:29 pem@mysql.com +0 -0
    BitKeeper file /home/pem/work/mysql-5.0/sql/sp_cache.cc

ChangeSet
  1.1346.242.4 03/07/03 19:01:01 hf@deer.(none) +2 -0
  Test case for #570 added

  mysql-test/t/alias.test
    1.2.1.1 03/07/03 19:01:00 hf@deer.(none) +19 -0
    Testcase for #570

  mysql-test/r/alias.result
    1.4 03/07/03 19:01:00 hf@deer.(none) +11 -0
    Appropriate test result

ChangeSet
  1.1524.1.15 03/07/03 15:58:37 pem@mysql.com +7 -0
  Code cleanup (and moved sp cache to separate file).

  sql/sql_class.h
    1.159 03/07/03 15:58:35 pem@mysql.com +3 -1
    Code cleanup (and moved sp cache to separate file).

  sql/sql_class.cc
    1.120 03/07/03 15:58:35 pem@mysql.com +11 -13
    Code cleanup (and moved sp cache to separate file).

  sql/sp_head.h
    1.19 03/07/03 15:58:35 pem@mysql.com +1 -1
    Code cleanup (and moved sp cache to separate file).

  sql/sp_head.cc
    1.36 03/07/03 15:58:35 pem@mysql.com +1 -1
    Code cleanup (and moved sp cache to separate file).

  sql/sp.cc
    1.22 03/07/03 15:58:35 pem@mysql.com +18 -51
    Code cleanup (and moved sp cache to separate file).

  sql/Makefile.am
    1.83 03/07/03 15:58:35 pem@mysql.com +2 -2
    Code cleanup (and moved sp cache to separate file).

  libmysqld/Makefile.am
    1.32 03/07/03 15:58:35 pem@mysql.com +1 -1
    Code cleanup (and moved sp cache to separate file).

ChangeSet
  1.1346.266.4 03/07/03 18:21:59 ram@mysql.r18.ru +3 -0
  Fix and test-case for the bug #775: SELECT misses rows in indexed HEAP table columns.

  mysql-test/t/heap.test
    1.7.1.2 03/07/03 18:21:46 ram@mysql.r18.ru +9 -0
    Test-case for the bug #775: SELECT misses rows in indexed HEAP table columns.

  mysql-test/r/heap.result
    1.10.1.4 03/07/03 18:21:46 ram@mysql.r18.ru +14 -0
    Test-case for the bug #775: SELECT misses rows in indexed HEAP table columns.

  heap/hp_open.c
    1.9.1.2 03/07/03 18:21:46 ram@mysql.r18.ru +6 -3
    Fix for the bug #775: SELECT misses rows in indexed HEAP table columns.

ChangeSet
  1.1346.267.1 03/07/03 16:41:46 peter@mysql.com +1 -0
  New Sample config file.
  The changes for actual loads and memory sizes are to be done after
  text and format are  improved.

  support-files/my-innodb-heavy-4G.cnf.sh
    1.1 03/07/03 16:41:43 peter@mysql.com +469 -0

  support-files/my-innodb-heavy-4G.cnf.sh
    1.0 03/07/03 16:41:43 peter@mysql.com +0 -0
    BitKeeper file /home/pz/mysql/mysql-4.0/support-files/my-innodb-heavy-4G.cnf.sh

ChangeSet
  1.1546.7.6 03/07/03 15:25:00 bell@sanja.is.com.ua +1 -0
  fixed typo in previous fix

  sql/sql_select.cc
    1.216.21.2 03/07/03 15:24:58 bell@sanja.is.com.ua +1 -1
    fixed typo in previous fix
    
    
    

ChangeSet
  1.1346.1.134 03/07/03 15:18:32 monty@narttu.mysql.fi +1 -0
  Merge with 3.23 (no files changed)

  sql/ha_innodb.cc
    1.73.1.107 03/07/03 15:18:31 monty@narttu.mysql.fi +5 -6
    Use local version

  sql/ha_innodb.cc
    1.45.26.2 03/07/03 15:14:36 monty@narttu.mysql.fi +0 -0
    Merge rename: sql/ha_innobase.cc -> sql/ha_innodb.cc

ChangeSet
  1.1546.9.2 03/07/03 17:00:01 bar@bar.mysql.r18.ru +4 -0
  Row comparison now does compare field collations, e.g.
    ROW('a','b','c) = ROW('A' collate latin1_bin,'b','c') returns 0
  When a number is compared to a string, character sets and 
  collations are not aggregated. e.g. this returned error in 4.1.0:
  
  SELECT 1=_latin2'1';
  because character sets was aggregated, and 1 was considered as
  a string of latin1 charset during this aggregation.

  sql/item_cmpfunc.h
    1.50.3.2 03/07/03 16:59:58 bar@bar.mysql.r18.ru +3 -4
    Row comparison now does compare field collations, e.g.
      ROW('a','b','c) = ROW('A' collate latin1_bin,'b','c') returns 0
    When a number is compared to a string, character sets and 
    collations are not aggregated. e.g. this returned error in 4.1.0:
    
    SELECT 1=_latin2'1';
    because character sets was aggregated, and 1 was considered as
    a string of latin1 charset during this aggregation.

  sql/item_cmpfunc.cc
    1.87.1.16 03/07/03 16:59:58 bar@bar.mysql.r18.ru +19 -30
    Row comparison now does compare field collations, e.g.
      ROW('a','b','c) = ROW('A' collate latin1_bin,'b','c') returns 0
    When a number is compared to a string, character sets and 
    collations are not aggregated. e.g. this returned error in 4.1.0:
    
    SELECT 1=_latin2'1';
    because character sets was aggregated, and 1 was considered as
    a string of latin1 charset during this aggregation.

  mysql-test/t/func_str.test
    1.31 03/07/03 16:59:58 bar@bar.mysql.r18.ru +17 -0
    Row comparison now does compare field collations, e.g.
      ROW('a','b','c) = ROW('A' collate latin1_bin,'b','c') returns 0
    When a number is compared to a string, character sets and 
    collations are not aggregated. e.g. this returned error in 4.1.0:
    
    SELECT 1=_latin2'1';
    because character sets was aggregated, and 1 was considered as
    a string of latin1 charset during this aggregation.

  mysql-test/r/func_str.result
    1.33 03/07/03 16:59:58 bar@bar.mysql.r18.ru +29 -0
    Row comparison now does compare field collations, e.g.
      ROW('a','b','c) = ROW('A' collate latin1_bin,'b','c') returns 0
    When a number is compared to a string, character sets and 
    collations are not aggregated. e.g. this returned error in 4.1.0:
    
    SELECT 1=_latin2'1';
    because character sets was aggregated, and 1 was considered as
    a string of latin1 charset during this aggregation.

ChangeSet
  1.1346.266.1 03/07/03 16:50:17 hf@deer.(none) +1 -0
  Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
  into deer.(none):/home/hf/work/mysql-4.0.628

  sql/item_strfunc.cc
    1.36.1.28 03/07/03 16:50:15 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1546.4.3 03/07/03 14:48:47 monty@narttu.mysql.fi +2 -0
  Fixed test case to be more portable

ChangeSet
  1.1346.248.2 03/07/03 16:48:47 hf@deer.(none) +2 -0
  Testcase for #628

  mysql-test/t/func_gconcat.test
    1.4 03/07/03 14:48:46 monty@narttu.mysql.fi +2 -0
    Make tests repeatable.  The problem is that due to floating point handling / qsort implementation the way rows are read may differ between versions

  mysql-test/r/func_gconcat.result
    1.10 03/07/03 14:48:46 monty@narttu.mysql.fi +2 -2
    Update results

  mysql-test/t/func_misc.test
    1.7 03/07/03 16:48:46 hf@deer.(none) +5 -0
    Test case added

  mysql-test/r/func_misc.result
    1.9 03/07/03 16:48:46 hf@deer.(none) +3 -0
    Appropriate result

ChangeSet
  1.1546.7.5 03/07/03 14:13:47 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1

  sql/sql_select.cc
    1.216.21.1 03/07/03 14:13:45 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1546.8.1 03/07/03 14:11:08 bell@sanja.is.com.ua +1 -0
  after review fix

  sql/sql_select.cc
    1.216.20.1 03/07/03 14:11:05 bell@sanja.is.com.ua +4 -12
    after review fix

ChangeSet
  1.1346.1.132 03/07/03 12:30:52 monty@narttu.mysql.fi +1 -0
  Fixed wrong usage of libvio.a (Bug #556)

  vio/Makefile.am
    1.10.1.1 03/07/03 12:30:48 monty@narttu.mysql.fi +17 -14
    Fixed wrong usage of libvio.a (Bug #556)

ChangeSet
  1.1551 03/07/03 11:59:57 bell@sanja.is.com.ua +14 -0
  merged

  sql/item.h
    1.56.1.21 03/07/03 11:59:56 bell@sanja.is.com.ua +8 -0
    merged

ChangeSet
  1.1346.1.131 03/07/03 11:56:30 monty@narttu.mysql.fi +4 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.0
  into narttu.mysql.fi:/my/mysql-4.0

  sql/sql_yacc.yy
    1.145.1.72 03/07/03 11:56:28 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_parse.cc
    1.218.1.107 03/07/03 11:56:28 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.28.1.20 03/07/03 11:56:28 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.40.1.31 03/07/03 11:56:28 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.203.50.4 03/07/03 11:56:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.1.14 03/07/03 11:56:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.1.9 03/07/03 11:56:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.1.25 03/07/03 11:56:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.81 03/07/03 11:56:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.11.2 03/07/03 11:56:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.cc
    1.60.1.8 03/07/03 11:56:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.124.1.14 03/07/03 11:56:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.57 03/07/03 11:56:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.96 03/07/03 11:56:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.58.1.25 03/07/03 11:56:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.58.1.14 03/07/03 11:56:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.1.14 03/07/03 11:56:12 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.1.130 03/07/03 11:55:36 monty@narttu.mysql.fi +26 -0
  Cleaner implementation if INSERT ... SELECT with same tables
  Tests cleanup (put drop database first in tests)

  mysql-test/t/ctype_cp1251.test
    1.1 03/07/03 11:55:34 monty@narttu.mysql.fi +17 -0

  mysql-test/t/ctype_cp1251-master.opt
    1.1 03/07/03 11:55:34 monty@narttu.mysql.fi +2 -0

  mysql-test/r/ctype_cp1251.result
    1.1 03/07/03 11:55:34 monty@narttu.mysql.fi +24 -0

  sql/sql_yacc.yy
    1.145.19.1 03/07/03 11:55:34 monty@narttu.mysql.fi +6 -4
    Cleaner implementation if INSERT ... SELECT with same tables

  sql/sql_parse.cc
    1.218.1.106 03/07/03 11:55:34 monty@narttu.mysql.fi +14 -22
    Cleaner implementation if INSERT ... SELECT with same tables

  sql/sql_list.h
    1.10.1.4 03/07/03 11:55:34 monty@narttu.mysql.fi +22 -15
    Indentation cleanup

  sql/sql_lex.h
    1.66.1.15 03/07/03 11:55:34 monty@narttu.mysql.fi +1 -1
    Cleaner implementation if INSERT ... SELECT with same tables

  sql/mysql_priv.h
    1.150.1.49 03/07/03 11:55:34 monty@narttu.mysql.fi +11 -0
    Cleaner implementation if INSERT ... SELECT with same tables

  mysql-test/t/symlink.test
    1.3.1.1 03/07/03 11:55:34 monty@narttu.mysql.fi +13 -12
    Clean up tests

  mysql-test/t/query_cache.test
    1.16.1.7 03/07/03 11:55:34 monty@narttu.mysql.fi +2 -1
    Clean up tests

  mysql-test/t/merge.test
    1.18.1.2 03/07/03 11:55:34 monty@narttu.mysql.fi +13 -0
    Test of bug 515

  mysql-test/t/insert_select.test
    1.5.1.4 03/07/03 11:55:34 monty@narttu.mysql.fi +22 -0
    Added more tests

  mysql-test/t/innodb.test
    1.28.3.1 03/07/03 11:55:34 monty@narttu.mysql.fi +2 -0
    Clean up tests

  mysql-test/t/grant_cache.test
    1.2.1.2 03/07/03 11:55:34 monty@narttu.mysql.fi +4 -1
    Clean up tests

  mysql-test/t/flush.test
    1.12.1.1 03/07/03 11:55:34 monty@narttu.mysql.fi +2 -2
    Clean up tests

  mysql-test/t/drop.test
    1.10.1.1 03/07/03 11:55:34 monty@narttu.mysql.fi +0 -2
    Clean up tests

  mysql-test/t/ctype_cp1251.test
    1.0 03/07/03 11:55:34 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/t/ctype_cp1251.test

  mysql-test/t/ctype_cp1251-master.opt
    1.0 03/07/03 11:55:34 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/t/ctype_cp1251-master.opt

  mysql-test/r/query_cache.result
    1.15.1.7 03/07/03 11:55:34 monty@narttu.mysql.fi +2 -1
    Clean up results

  mysql-test/r/merge.result
    1.11.1.10 03/07/03 11:55:34 monty@narttu.mysql.fi +12 -0
    Clean up results

  mysql-test/r/insert_select.result
    1.7.1.4 03/07/03 11:55:34 monty@narttu.mysql.fi +20 -0
    Clean up results

  mysql-test/r/innodb.result
    1.40.5.1 03/07/03 11:55:34 monty@narttu.mysql.fi +1 -0
    Clean up results

  mysql-test/r/grant_cache.result
    1.2.1.1 03/07/03 11:55:34 monty@narttu.mysql.fi +1 -0
    Clean up results

  mysql-test/r/flush.result
    1.8.1.1 03/07/03 11:55:34 monty@narttu.mysql.fi +1 -1
    Clean up results

  mysql-test/r/drop.result
    1.10.1.1 03/07/03 11:55:34 monty@narttu.mysql.fi +0 -2
    Clean up results

  mysql-test/r/ctype_cp1251.result
    1.0 03/07/03 11:55:34 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/r/ctype_cp1251.result

  include/my_global.h
    1.34.1.18 03/07/03 11:55:34 monty@narttu.mysql.fi +5 -2
    Portability fix

  include/config-win.h
    1.23.1.5 03/07/03 11:55:34 monty@narttu.mysql.fi +0 -1
    Remove HAVE_CHSIZE on windows as it's not 64 bit clean

  client/mysql.cc
    1.93.1.45 03/07/03 11:55:34 monty@narttu.mysql.fi +5 -9
    Cleanup of code in last pull

ChangeSet
  1.1346.261.12 03/07/03 10:42:13 hf@deer.(none) +3 -0
  Proposed bugfix for #717
  Current table is placed into read_tables set of the current join_tab->select
  so get_mm_parts function thinks that current table's record is read and
  tries to calculate WHERE condition with the fields of the record.
  Result of these calculations is unpredictable.
  Looks funny - outcome of the SELECT depends on the queries executed before.
  
  Anyway i think we should have testcase on this part of the code.

  sql/sql_select.cc
    1.152.1.89 03/07/03 10:42:01 hf@deer.(none) +1 -1
    I think we should count current table out of read_tables set

  mysql-test/t/sel000001.test
    1.9.1.1 03/07/03 10:42:01 hf@deer.(none) +13 -0
    testcase added

  mysql-test/r/sel000001.result
    1.7.1.1 03/07/03 10:42:01 hf@deer.(none) +14 -0
    appropriate result added

ChangeSet
  1.1346.261.11 03/07/03 03:21:11 heikki@hundin.mysql.fi +1 -0
  lock0lock.c:
    Remove outdated comment and the corresponding assertion in debug version code

ChangeSet
  1.1346.261.10 03/07/02 20:34:19 miguel@hegel.(none) +1 -0
  Fix VC++ compiler error on Windows

  mysys/thr_alarm.c
    1.37 03/07/02 20:34:15 miguel@hegel.(none) +1 -1
    Fix VC++ compiler error on Windows

  innobase/lock/lock0lock.c
    1.20.1.4 03/07/03 03:20:34 heikki@hundin.mysql.fi +0 -10
    Remove outdated comment and the corresponding assertion in debug version code

ChangeSet
  1.1550 03/07/03 02:30:52 bell@sanja.is.com.ua +11 -0
  (SCRUM)
  It looks like samll revolution in SELECT_LEX tree, but it was only natural way to solve problem with name resolution of external fields inside subselect which belongs to global order of union
  also it have following advantages:
   - removed mess with current_select type conversion
     - type checking/converting
     - a lot of virtual methods
   - fake select for union execution allocated only once (it was allocated for every subselect with union executing)
  
  changes:
  fixed bug with outer fields name resolution of subqueries which belong to global ORDER BY clause
  remuved select_lex() function, now thd->lex.current_select always have type SELECT_LEX
  new SELECT_LEX (fake_select_lex) will be allocated in case of UNION for using in UNION processing
  fake_select_lex allocated for union hold global ORDER BY & LIMIT clauses and have linkage equal to GLOBAL_OPTIONS_TYPE 
  new description of SELECT_LEX tree
  
  (SCRUM)

  sql/sql_yacc.yy
    1.203.50.3 03/07/03 02:30:50 bell@sanja.is.com.ua +52 -51
    global parameters moved to fake_select_lex

  sql/sql_union.cc
    1.74.1.6 03/07/03 02:30:50 bell@sanja.is.com.ua +11 -13
    global parameters moved to fake_select_lex

  sql/sql_select.cc
    1.216.1.13 03/07/03 02:30:50 bell@sanja.is.com.ua +3 -2
    now fake_select_lex marked as GLOBAL_OPTIONS_TYPE

  sql/sql_parse.cc
    1.271.12.1 03/07/03 02:30:50 bell@sanja.is.com.ua +24 -10
    global parameters moved to fake_select_lex
    allocation of fake_select_lex on demand

  sql/sql_lex.h
    1.102.13.5 03/07/03 02:30:50 bell@sanja.is.com.ua +55 -57
    comments about new tree of select_lex s
    not used fields/mrthods moved from st_select_lex_node to st_select_lex
    global parameters moved to fake_select_lex

  sql/sql_lex.cc
    1.78.1.5 03/07/03 02:30:50 bell@sanja.is.com.ua +62 -80
    not used fields/mrthods moved from st_select_lex_node to st_select_lex
    global parameters moved to fake_select_lex

  sql/sql_derived.cc
    1.43.1.4 03/07/03 02:30:50 bell@sanja.is.com.ua +1 -1
    global parameters moved to fake_select_lex

  sql/sql_delete.cc
    1.99.2.8 03/07/03 02:30:50 bell@sanja.is.com.ua +1 -1
    no need type checking & converion now

  sql/item_sum.cc
    1.79 03/07/03 02:30:50 bell@sanja.is.com.ua +3 -3
    no need type checking & converion now

  sql/item_subselect.cc
    1.60.1.7 03/07/03 02:30:50 bell@sanja.is.com.ua +7 -6
    global parameters moved to fake_select_lex

  sql/item.cc
    1.58.1.24 03/07/03 02:30:50 bell@sanja.is.com.ua +3 -3
    global parameters moved to fake_select_lex

ChangeSet
  1.1346.261.9 03/07/02 21:15:06 guilhem@mysql.com +6 -0
  I committed the same changeset in my tree yesterday, but broke the tree since,
  so I commit again in a fresh tree.
  Fix for bug#763 (Relay_log_space too big by 4 bytes),
  plus comments and DBUG_PRINT, and we don't start replication
  if --bootstrap.

ChangeSet
  1.1346.261.8 03/07/02 17:55:11 pem@mysql.com +5 -0
  Added missing (char*) casts in bzero calls.
  (Needed for platforms with the traditional bzero prototype.)
  Fixes BUG#460.

ChangeSet
  1.1346.261.7 03/07/02 18:31:05 heikki@hundin.mysql.fi +2 -0
  innodb.result, innodb.test:
    Remove all nondeterministic tests from innodb.test; but I have to study why on 64 bits we get different estimates

  sql/sql_repl.cc
    1.86.1.16 03/07/02 21:14:02 guilhem@mysql.com +19 -0
    A comment.

ChangeSet
  1.1346.265.1 03/07/02 19:08:31 vva@eagle.mysql.r18.ru +2 -0
  add comment for BUG 672

  sql/sql_repl.cc
    1.86.1.15 03/07/02 19:08:30 vva@eagle.mysql.r18.ru +1 -1
    add comment for BUG 672

  sql/sql_parse.cc
    1.218.28.2 03/07/02 19:08:30 vva@eagle.mysql.r18.ru +1 -1
    add comment for BUG 672

ChangeSet
  1.1346.261.4 03/07/02 17:37:23 vva@eagle.mysql.r18.ru +3 -0
  Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
  into eagle.mysql.r18.ru:/home/vva/work/BUG_672/mysql-4.0

  sql/sql_repl.cc
    1.86.1.14 03/07/02 17:37:20 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_parse.cc
    1.218.28.1 03/07/02 17:37:20 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  client/mysqlbinlog.cc
    1.70.1.7 03/07/02 17:37:20 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1346.264.1 03/07/02 16:56:27 vva@eagle.mysql.r18.ru +3 -0
  fixed bug #672

  sql/sql_repl.cc
    1.86.2.1 03/07/02 16:56:11 vva@eagle.mysql.r18.ru +7 -1
    fixed bug #672

  sql/sql_parse.cc
    1.218.27.1 03/07/02 16:56:11 vva@eagle.mysql.r18.ru +2 -1
    fixed bug #672

  client/mysqlbinlog.cc
    1.70.4.1 03/07/02 16:56:11 vva@eagle.mysql.r18.ru +1 -1
    changed format of eof-packet for protocol 4.1

  sql/sql_acl.cc
    1.51.1.54 03/07/02 21:14:02 guilhem@mysql.com +1 -1
    Replaced a return by DBUG_RETURN (happened to find this reading a debug log).

  sql/slave.cc
    1.164.1.72 03/07/02 21:14:01 guilhem@mysql.com +25 -2
    Fix for bug 763 (Relay_log_space too big by 4 bytes).
    A DBUG_PRINT.

  sql/mysqld.cc
    1.297.1.143 03/07/02 21:14:01 guilhem@mysql.com +2 -0
    Don't start replication if in bootstrap mode (bootstrap isn't supposed to have
    several threads).

  mysql-test/r/rpl_log_pos.result
    1.22.1.3 03/07/02 21:14:01 guilhem@mysql.com +1 -1
    Result update

  mysql-test/r/rpl_log.result
    1.26.1.5 03/07/02 21:14:00 guilhem@mysql.com +1 -1
    Result update

  sql/sql_yacc.yy
    1.145.1.71 03/07/02 17:55:09 pem@mysql.com +1 -1
    Added missing (char*) casts in bzero calls.
    (Needed for platforms with the traditional bzero prototype.)
    Fixes BUG#460.

  sql/sql_lex.cc
    1.32.1.8 03/07/02 17:55:09 pem@mysql.com +1 -1
    Added missing (char*) casts in bzero calls.
    (Needed for platforms with the traditional bzero prototype.)
    Fixes BUG#460.

  sql/sql_acl.cc
    1.51.1.53 03/07/02 17:55:09 pem@mysql.com +2 -2
    Added missing (char*) casts in bzero calls.
    (Needed for platforms with the traditional bzero prototype.)
    Fixes BUG#460.

  sql/slave.h
    1.50.1.8 03/07/02 17:55:09 pem@mysql.com +1 -1
    Added missing (char*) casts in bzero calls.
    (Needed for platforms with the traditional bzero prototype.)
    Fixes BUG#460.

  sql/slave.cc
    1.164.1.71 03/07/02 17:55:09 pem@mysql.com +2 -2
    Added missing (char*) casts in bzero calls.
    (Needed for platforms with the traditional bzero prototype.)
    Fixes BUG#460.

  mysql-test/r/innodb.result
    1.40.1.30 03/07/02 18:30:51 heikki@hundin.mysql.fi +0 -51
    Remove all nondeterministic tests from innodb.test; but I have to study why on 64 bits we get different estimates

  mysql-test/t/innodb.test
    1.28.1.19 03/07/02 18:30:43 heikki@hundin.mysql.fi +0 -16
    Remove all nondeterministic tests from innodb.test; but I have to study why on 64 bits we get different estimates

ChangeSet
  1.1346.263.1 03/07/02 17:12:50 serg@serg.mylan +3 -0
  bug #504: in "datetime op int" comparison int wasn't converted to datetime

  sql/item_cmpfunc.cc
    1.20.1.34 03/07/02 17:12:47 serg@serg.mylan +1 -1
    bug #504: in "datetime op int" comparison int wasn't converted to datetime

  mysql-test/t/type_datetime.test
    1.6.1.3 03/07/02 17:12:47 serg@serg.mylan +4 -1
    bug #504: in "datetime op int" comparison int wasn't converted to datetime

  mysql-test/r/type_datetime.result
    1.8.1.5 03/07/02 17:12:47 serg@serg.mylan +8 -1
    bug #504: in "datetime op int" comparison int wasn't converted to datetime

ChangeSet
  1.1546.7.4 03/07/02 18:34:43 bar@bar.mysql.r18.ru +7 -0
  There is no Item->binary() anymore. It was remain from 4.0.

  sql/sql_analyse.h
    1.18 03/07/02 18:34:40 bar@bar.mysql.r18.ru +1 -4
    There is no Item->binary() anymore. It was remain from 4.0.

  sql/sql_analyse.cc
    1.39 03/07/02 18:34:40 bar@bar.mysql.r18.ru +0 -6
    There is no Item->binary() anymore. It was remain from 4.0.

  sql/item_strfunc.cc
    1.126.1.1 03/07/02 18:34:40 bar@bar.mysql.r18.ru +1 -1
    There is no Item->binary() anymore. It was remain from 4.0.

  sql/item_func.cc
    1.124.3.1 03/07/02 18:34:40 bar@bar.mysql.r18.ru +12 -1
    There is no Item->binary() anymore. It was remain from 4.0.

  sql/item_cmpfunc.h
    1.50.3.1 03/07/02 18:34:40 bar@bar.mysql.r18.ru +0 -2
    There is no Item->binary() anymore. It was remain from 4.0.

  sql/item_cmpfunc.cc
    1.87.1.15 03/07/02 18:34:40 bar@bar.mysql.r18.ru +3 -8
    There is no Item->binary() anymore. It was remain from 4.0.

  sql/item.h
    1.56.6.8 03/07/02 18:34:39 bar@bar.mysql.r18.ru +0 -3
    There is no Item->binary() anymore. It was remain from 4.0.

ChangeSet
  1.1546.7.3 03/07/02 15:03:49 bell@sanja.is.com.ua +1 -0
  fixed typos

  sql/item.cc
    1.58.10.7 03/07/02 15:03:47 bell@sanja.is.com.ua +2 -2
    fixed typos

ChangeSet
  1.1346.262.1 03/07/02 14:57:40 Sinisa@sinisa.nasamreza.org +3 -0
  Fix for a problem with :
  
  CREATE / INSERT ... (SELECT ...) UNION (SELECT ...) LIMIT;

  sql/sql_yacc.yy
    1.145.1.70 03/07/02 14:57:36 Sinisa@sinisa.nasamreza.org +3 -1
    Fix for a problem with :
    
    CREATE / INSERT ... (SELECT ...) UNION (SELECT ...) LIMIT;

  mysql-test/t/union.test
    1.22.1.6 03/07/02 14:57:36 Sinisa@sinisa.nasamreza.org +2 -2
    Fix for a problem with :
    
    CREATE / INSERT ... (SELECT ...) UNION (SELECT ...) LIMIT;

  mysql-test/r/union.result
    1.17.1.7 03/07/02 14:57:36 Sinisa@sinisa.nasamreza.org +2 -10
    Fix for a problem with :
    
    CREATE / INSERT ... (SELECT ...) UNION (SELECT ...) LIMIT;

ChangeSet
  1.1546.7.2 03/07/02 14:45:35 bell@sanja.is.com.ua +1 -0
  fixed bug, which lead to crash mysqld by running 'mysql some_db_with_tables'

  sql/item.cc
    1.58.10.6 03/07/02 14:45:26 bell@sanja.is.com.ua +7 -1
    fixed bug, which lead to crash mysqld by running 'mysql some_db_with_tables'

ChangeSet
  1.1346.261.2 03/07/02 13:15:45 heikki@hundin.mysql.fi +2 -0
  innodb.test, innodb.result:
    Remove nondeterministic EXPLAIN SELECT which gives on 64-bit platforms a slightly different estimate (sometimes we should study why we get different results on 64-bit and 32-bit)

  mysql-test/t/innodb.test
    1.28.1.18 03/07/02 13:15:11 heikki@hundin.mysql.fi +0 -1
    Remove nondeterministic EXPLAIN SELECT which gives on 64-bit platforms a slightly different estimate (sometimes we should study why we get different results on 64-bit and 32-bit)

  mysql-test/r/innodb.result
    1.40.1.29 03/07/02 13:15:01 heikki@hundin.mysql.fi +0 -3
    Remove nondeterministic EXPLAIN SELECT which gives on 64-bit platforms a slightly different estimate (sometimes we should study why we get different results on 64-bit and 32-bit)

ChangeSet
  1.1549 03/07/02 13:12:18 bell@sanja.is.com.ua +10 -0
  Item tree iterator
  fixed dependence of items from reduced subquery
  (SCRUM)

  sql/item_subselect.cc
    1.60.1.6 03/07/02 13:12:16 bell@sanja.is.com.ua +6 -1
    Item tree iterator

  sql/item_strfunc.h
    1.63.1.2 03/07/02 13:12:16 bell@sanja.is.com.ua +16 -0
    Item tree iterator

  sql/item_row.h
    1.12 03/07/02 13:12:16 bell@sanja.is.com.ua +2 -0
    Item tree iterator

  sql/item_row.cc
    1.16 03/07/02 13:12:16 bell@sanja.is.com.ua +10 -0
    Item tree iterator

  sql/item_func.h
    1.68.1.12 03/07/02 13:12:16 bell@sanja.is.com.ua +9 -0
    Item tree iterator

  sql/item_func.cc
    1.124.1.13 03/07/02 13:12:15 bell@sanja.is.com.ua +22 -0
    Item tree iterator

  sql/item_cmpfunc.h
    1.56 03/07/02 13:12:15 bell@sanja.is.com.ua +9 -0
    Item tree iterator

  sql/item_cmpfunc.cc
    1.95 03/07/02 13:12:15 bell@sanja.is.com.ua +17 -0
    Item tree iterator

  sql/item.h
    1.56.1.20 03/07/02 13:12:15 bell@sanja.is.com.ua +23 -0
    fixed dependence of items from reduced subquery
    Item tree iterator

  sql/item.cc
    1.58.1.23 03/07/02 13:12:15 bell@sanja.is.com.ua +9 -0
    fixed dependence of items from reduced subquery

ChangeSet
  1.1346.261.1 03/07/02 13:03:59 heikki@hundin.mysql.fi +1 -0
  sync0sync.c:
    Make execution with UNIV_SYNC_DEBUG faster

  innobase/sync/sync0sync.c
    1.16 03/07/02 13:03:50 heikki@hundin.mysql.fi +1 -1
    Make execution with UNIV_SYNC_DEBUG faster

ChangeSet
  1.1346.1.129 03/07/02 10:57:03 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.218.1.105 03/07/02 10:57:01 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.260.1 03/07/02 10:56:39 monty@narttu.mysql.fi +1 -0
  Fixed password check problem on windows (Bug #464)

  sql/sql_parse.cc
    1.218.25.7 03/07/02 10:56:38 monty@narttu.mysql.fi +1 -1
    Fixed password check problem on windows (Bug #464)

ChangeSet
  1.1546.7.1 03/07/02 10:49:07 venu@hundin.mysql.fi +1 -0
  Removed dbug.h inclussion from client/get_password.c (windows build fix)

  client/get_password.c
    1.9 03/07/02 10:46:41 venu@hundin.mysql.fi +0 -1
    Removed dbug.h inclussion (windows build fix)

ChangeSet
  1.1346.1.128 03/07/02 04:57:31 heikki@hundin.mysql.fi +1 -0
  lock0lock.c:
    Fix a latching order violation in the previous (2003-06-15) push: could lead to a hang on the btr0sea.c semaphore

  innobase/lock/lock0lock.c
    1.20.1.3 03/07/02 04:57:20 heikki@hundin.mysql.fi +8 -19
    Fix a latching order violation in the previous (2003-06-15) push: could lead to a hang on the btr0sea.c semaphore

ChangeSet
  1.1346.1.127 03/07/02 02:01:11 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Cleanup

  sql/ha_innodb.cc
    1.73.1.106 03/07/02 02:01:03 heikki@hundin.mysql.fi +0 -2
    Cleanup

ChangeSet
  1.1346.1.126 03/07/02 01:57:40 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Remove still some potential hangs over the btr0sea.c semaphore

  sql/ha_innodb.cc
    1.73.1.105 03/07/02 01:57:22 heikki@hundin.mysql.fi +25 -13
    Remove still some potential hangs over the btr0sea.c semaphore

ChangeSet
  1.1548 03/07/02 01:45:22 bell@sanja.is.com.ua +17 -0
  after review changes (SCRUM)
  removed outer resolving flag (because of movingtransformation after fix_fields)

  sql/sql_union.cc
    1.74.1.5 03/07/02 01:45:19 bell@sanja.is.com.ua +1 -10
    after review changes

  sql/sql_select.cc
    1.216.1.12 03/07/02 01:45:19 bell@sanja.is.com.ua +1 -1
    after review changes

  sql/sql_lex.h
    1.102.13.4 03/07/02 01:45:19 bell@sanja.is.com.ua +2 -0
    after review changes

  sql/sql_lex.cc
    1.78.1.4 03/07/02 01:45:19 bell@sanja.is.com.ua +22 -1
    after review changes

  sql/sql_base.cc
    1.145.1.9 03/07/02 01:45:19 bell@sanja.is.com.ua +2 -11
    after review changes

  sql/mysql_priv.h
    1.186.13.1 03/07/02 01:45:19 bell@sanja.is.com.ua +21 -0
    after review changes

  sql/item_subselect.h
    1.31 03/07/02 01:45:19 bell@sanja.is.com.ua +7 -7
    after review changes
    removed outer resolving flag (because of movingtransformation after fix_fields)

  sql/item_subselect.cc
    1.60.1.5 03/07/02 01:45:19 bell@sanja.is.com.ua +22 -44
    after review changes
    removed outer resolving flag (because of movingtransformation after fix_fields)

  sql/item_strfunc.h
    1.63.1.1 03/07/02 01:45:19 bell@sanja.is.com.ua +0 -15
    removed outer resolving flag (because of movingtransformation after fix_fields)

  sql/item_row.h
    1.11 03/07/02 01:45:19 bell@sanja.is.com.ua +0 -1
    removed outer resolving flag (because of movingtransformation after fix_fields)

  sql/item_row.cc
    1.15 03/07/02 01:45:19 bell@sanja.is.com.ua +0 -6
    removed outer resolving flag (because of movingtransformation after fix_fields)

  sql/item_func.h
    1.68.1.11 03/07/02 01:45:19 bell@sanja.is.com.ua +0 -7
    removed outer resolving flag (because of movingtransformation after fix_fields)

  sql/item_func.cc
    1.124.1.12 03/07/02 01:45:19 bell@sanja.is.com.ua +0 -17
    removed outer resolving flag (because of movingtransformation after fix_fields)

  sql/item_cmpfunc.h
    1.55 03/07/02 01:45:19 bell@sanja.is.com.ua +0 -7
    removed outer resolving flag (because of movingtransformation after fix_fields)

  sql/item_cmpfunc.cc
    1.94 03/07/02 01:45:19 bell@sanja.is.com.ua +0 -16
    removed outer resolving flag (because of movingtransformation after fix_fields)

  sql/item.h
    1.56.1.19 03/07/02 01:45:19 bell@sanja.is.com.ua +1 -7
    removed outer resolving flag (because of movingtransformation after fix_fields)

  sql/item.cc
    1.58.1.22 03/07/02 01:45:19 bell@sanja.is.com.ua +14 -32
    removed outer resolving flag (because of movingtransformation after fix_fields)

ChangeSet
  1.1346.1.124 03/07/02 01:24:05 Sinisa@sinisa.nasamreza.org +4 -0
  Some fixes for CREATE / INSERT FROM UNIO >..

  sql/sql_yacc.yy
    1.145.1.69 03/07/02 01:24:02 Sinisa@sinisa.nasamreza.org +3 -6
    Some fixes for CREATE / INSERT FROM UNIO >..

  mysql-test/t/union.test
    1.22.1.5 03/07/02 01:24:02 Sinisa@sinisa.nasamreza.org +2 -2
    Some fixes for CREATE / INSERT FROM UNIO >..

  mysql-test/t/grant.test
    1.4.1.3 03/07/02 01:24:02 Sinisa@sinisa.nasamreza.org +1 -1
    Some fixes for CREATE / INSERT FROM UNIO >..

  mysql-test/r/union.result
    1.17.1.6 03/07/02 01:24:02 Sinisa@sinisa.nasamreza.org +28 -2
    Some fixes for CREATE / INSERT FROM UNIO >..

ChangeSet
  1.1346.1.123 03/07/02 00:26:23 Sinisa@sinisa.nasamreza.org +4 -0
  merge changes

  sql/sql_yacc.yy
    1.145.1.68 03/07/02 00:26:20 Sinisa@sinisa.nasamreza.org +1 -29
    merge changes

  sql/sql_select.cc
    1.152.1.88 03/07/02 00:12:17 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/t/insert_select.test
    1.5.1.3 03/07/02 00:12:17 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/r/insert_select.result
    1.7.1.3 03/07/02 00:12:17 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1346.1.122 03/07/02 00:10:47 Sinisa@sinisa.nasamreza.org +11 -0
  Lot's of clean-ups and fixes for 4.0.14.

  sql/sql_union.cc
    1.22.1.22 03/07/02 00:10:44 Sinisa@sinisa.nasamreza.org +1 -2
    P

  sql/sql_select.cc
    1.152.1.87 03/07/02 00:10:44 Sinisa@sinisa.nasamreza.org +1 -5
    removing a fix

  sql/sql_parse.cc
    1.218.1.104 03/07/02 00:10:44 Sinisa@sinisa.nasamreza.org +7 -3
    Fix for INSERT... SELECT

  sql/sql_acl.cc
    1.51.1.52 03/07/02 00:10:44 Sinisa@sinisa.nasamreza.org +1 -1
    Fix for granting global privileges on db level

  mysql-test/t/union.test
    1.22.1.4 03/07/02 00:10:44 Sinisa@sinisa.nasamreza.org +13 -0
    Test cases for bug fixes

  mysql-test/t/insert_select.test
    1.5.2.1 03/07/02 00:10:44 Sinisa@sinisa.nasamreza.org +16 -0
    Test cases for bug fixes

  mysql-test/t/grant.test
    1.4.1.2 03/07/02 00:10:44 Sinisa@sinisa.nasamreza.org +2 -0
    Test cases for bug fixes

  mysql-test/r/union.result
    1.17.1.5 03/07/02 00:10:44 Sinisa@sinisa.nasamreza.org +18 -0
    Test cases for bug fixes

  mysql-test/r/insert_select.result
    1.7.2.1 03/07/02 00:10:44 Sinisa@sinisa.nasamreza.org +490 -0
    Test cases for bug fixes

  mysql-test/r/grant.result
    1.5.1.2 03/07/02 00:10:44 Sinisa@sinisa.nasamreza.org +2 -0
    Test cases for bug fixes

  include/my_global.h
    1.34.1.17 03/07/02 00:10:44 Sinisa@sinisa.nasamreza.org +1 -1
    CONFIG_SMP

ChangeSet
  1.676.1.721 03/07/02 00:08:29 heikki@hundin.mysql.fi +1 -0
  ha_innobase.cc:
    Backport from 4.0 of the btr0sea.c latch hang fix

  sql/ha_innobase.cc
    1.45.26.1 03/07/02 00:08:17 heikki@hundin.mysql.fi +6 -14
    Backport from 4.0 of the btr0sea.c latch hang fix

ChangeSet
  1.1346.257.6 03/07/01 23:52:59 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Fix a possible hang over the btr0sea.c latch

  sql/ha_innodb.cc
    1.73.1.104 03/07/01 23:52:32 heikki@hundin.mysql.fi +34 -27
    Fix a possible hang over the btr0sea.c latch

ChangeSet
  1.1546.6.1 03/07/01 23:40:59 kostja@oak.local +23 -0
  First version of new authentification procedure: now authentification is one-stage (instead of two-stage in 4.1)
  
  For now following tasks have been done:
  - PASSWORD() function was rewritten. PASSWORD() now returns SHA1
    hash_stage2; for new passwords user.password contains '*'hash_stage2; sql_yacc.yy also fixed; 
  
  - password.c: new functions were implemented, old rolled back to 4.0 state
  
  - server code was rewritten to use new authorization algorithm (check_user(), change
    user, and other stuff in sql/sql_parse.cc)
  
  - client code was rewritten to use new authorization algorithm
    (mysql_real_connect, myslq_authenticate in sql-common/client.c)
  
  - now server barks on 45-byte-length 4.1.0 passwords and refuses 4.1.0-style
    authentification. Users with 4.1.0 passwords are blocked (sql/sql_acl.cc)
  
  - mysqladmin.c was fixed to work correctly with new passwords
  
  Tests for 4.0-4.1.1, 4.1.1-4.1.1 (with or without db/password) logons was performed;
  mysqladmin also was tested. Additional check are nevertheless necessary.

  BitKeeper/etc/logging_ok
    1.233.10.3 03/07/01 23:35:14 kostja@oak.local +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_yacc.yy
    1.203.53.1 03/07/01 23:34:47 kostja@oak.local +35 -15
    Two-argument form of PASSWORD() was removed
    PASSWORD() function was fixed with new password api.

  sql/sql_repl.h
    1.28.1.1 03/07/01 23:34:47 kostja@oak.local +1 -1
    HASH_PASSWORD_LENGTH replaced with SCRAMBLED_PASSWORD_CHAR_LENGTH
    bug #766 remains

  sql/sql_parse.cc
    1.271.11.1 03/07/01 23:34:47 kostja@oak.local +253 -329
    check_connections was renamed to check_connection as this name reflects better what this function does
    authorization part of check_connection was rewritten
    check_user was rewritten with new password and acl api
    new function 'authenticate', which optionally re-request scramble from client was added
    fixed some typos
    COM_CHANGE_USER piece of dipsatch_command() was rewritten

  sql/sql_class.h
    1.146.13.1 03/07/01 23:34:47 kostja@oak.local +10 -4
    same thing as in struct mysql - scramble is used for new family of functions, scramble_323 - for old

  sql/sql_class.cc
    1.105.1.13 03/07/01 23:34:47 kostja@oak.local +1 -0
    initialization for new members added

  sql/sql_acl.h
    1.20 03/07/01 23:34:47 kostja@oak.local +5 -8
    ditto 

  sql/sql_acl.cc
    1.74.1.7 03/07/01 23:34:47 kostja@oak.local +320 -353
    rewritten to support new passwords (41 byte-long) and password api

  sql/slave.h
    1.63 03/07/01 23:34:47 kostja@oak.local +1 -1
    fixed to new constant; Buf #766 remains to be fixed

  sql/slave.cc
    1.188.1.13 03/07/01 23:34:47 kostja@oak.local +3 -3
    Fixed to new constant; Bug #766 remains to be fixed

  sql/password.c
    1.26 03/07/01 23:34:47 kostja@oak.local +340 -508
    All 4.1 functions were rolled back to 4.0 with attempt to save all possible 4.0-4.1 changes.
    Names for 4.0 functions were suffixed with '_323'
    Functions for new handshake were added.

  sql/mysqld.cc
    1.356.15.1 03/07/01 23:34:47 kostja@oak.local +0 -6
    scramble initialization moved to sql_parce.cc:check_connection

  sql/mysql_priv.h
    1.186.12.1 03/07/01 23:34:47 kostja@oak.local +0 -3
    removed unnecessary declaration as now all constants defined is in mysql_com.h

  sql/item_strfunc.h
    1.64 03/07/01 23:34:47 kostja@oak.local +22 -8
    bit commented, numbers replaced with #defined constants

  sql/item_strfunc.cc
    1.127 03/07/01 23:34:47 kostja@oak.local +12 -74
    Item_func_password and Item_func_old_password rewritten with new password api

  sql-common/client.c
    1.11.1.2 03/07/01 23:34:47 kostja@oak.local +64 -102
    mysql_real_connect rewritten to support new handshake procedure

  scripts/mysql_fix_privilege_tables.sql
    1.3 03/07/01 23:34:47 kostja@oak.local +1 -1
    fixed 'Password' column length to 41

  scripts/mysql_create_system_tables.sh
    1.5.1.1 03/07/01 23:34:47 kostja@oak.local +1 -1
    fixed 'Password' column length to 41

  libmysql/libmysql.c
    1.156.5.1 03/07/01 23:34:47 kostja@oak.local +34 -24
    mysql_change_user rewritten to work with new password api

  include/mysql_com.h
    1.67.3.5 03/07/01 23:34:47 kostja@oak.local +36 -25
    new constants and password.c api changes

  include/mysql.h
    1.70.1.4 03/07/01 23:34:47 kostja@oak.local +3 -1
    So as scramble_323 accepts only null-terminated message, two scramble buffs are necessary.
    gotta be fixed

  client/mysqladmin.c
    1.78 03/07/01 23:34:47 kostja@oak.local +6 -3
    fixed with new password api

  BitKeeper/etc/ignore
    1.153.4.1 03/07/01 23:34:47 kostja@oak.local +2 -0
    Added start_mysqld.sh mysys/main.cc to the ignore list

ChangeSet
  1.1346.259.2 03/07/01 14:00:57 vva@eagle.mysql.r18.ru +1 -0
  made error output more detailed

  client/mysqlbinlog.cc
    1.70.1.6 03/07/01 14:00:56 vva@eagle.mysql.r18.ru +4 -4
    made error output more detailed

ChangeSet
  1.1346.259.1 03/07/01 13:21:35 vva@eagle.mysql.r18.ru +1 -0
  Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
  into eagle.mysql.r18.ru:/home/vva/work/BUG_671/mysql-4.0

  client/mysqlbinlog.cc
    1.70.1.5 03/07/01 13:21:33 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1346.258.1 03/07/01 13:17:03 vva@eagle.mysql.r18.ru +1 -0
  removed --table option (fixed Bug #671)

  client/mysqlbinlog.cc
    1.70.3.1 03/07/01 13:16:48 vva@eagle.mysql.r18.ru +4 -50
    removed --table option

ChangeSet
  1.1546.2.5 03/07/01 19:48:31 bell@sanja.is.com.ua +4 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc_group-4.1

  sql/sql_select.h
    1.46 03/07/01 19:48:29 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.12.10 03/07/01 19:48:29 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.58.8.2 03/07/01 19:48:29 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.14.3 03/07/01 19:48:29 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1524.1.14 03/07/01 18:14:24 pem@mysql.com +5 -0
  SP cache (WL#730). (Mostly by vva, additions by pem.)

  sql/sql_parse.cc
    1.291 03/07/01 18:14:22 pem@mysql.com +0 -19
    In-memory cache added.
    sp_clear_function_cache() no longer needed.
    Don't delete sp_heads after each use.

  sql/sql_class.h
    1.158 03/07/01 18:14:22 pem@mysql.com +1 -1
    In-memory cache added.

  sql/sql_class.cc
    1.119 03/07/01 18:14:22 pem@mysql.com +13 -6
    In-memory cache added.

  sql/sp.h
    1.7 03/07/01 18:14:22 pem@mysql.com +2 -4
    In-memory cache added.
    sp_clear_function_cache() no longer needed.

  sql/sp.cc
    1.21 03/07/01 18:14:22 pem@mysql.com +53 -42
    In-memory cache added.
    sp_clear_function_cache() no longer needed.

ChangeSet
  1.1546.2.4 03/07/01 19:05:31 bell@sanja.is.com.ua +3 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-err-4.1

  sql/sql_select.cc
    1.216.12.9 03/07/01 19:05:28 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.1.8 03/07/01 19:05:28 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.14.2 03/07/01 19:05:28 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1546.2.3 03/07/01 19:05:08 bell@sanja.is.com.ua +2 -0
  fixed uninitialized pointer

  sql/sql_parse.cc
    1.271.10.1 03/07/01 19:05:06 bell@sanja.is.com.ua +5 -0
    fixed uninitialized pointer

  sql/mysqld.cc
    1.356.1.30 03/07/01 19:05:06 bell@sanja.is.com.ua +6 -1
    fixed uninitialized pointer

ChangeSet
  1.1524.1.13 03/07/01 17:19:48 pem@mysql.com +4 -0
  Bugfixes for the sp_head memroot stuff.

  sql/sql_yacc.yy
    1.233 03/07/01 17:19:46 pem@mysql.com +18 -12
    Bugfixes for the sp_head memroot stuff. Make sure everything goes to the
    right memroot. Must do things in the correct order for this.

  sql/sp_head.h
    1.18 03/07/01 17:19:46 pem@mysql.com +5 -1
    Need separate post-reset-memroot init method.

  sql/sp_head.cc
    1.35 03/07/01 17:19:46 pem@mysql.com +15 -8
    Bugfixes for the sp_head memroot stuff. Make sure everything goes to the
    right memroot. Need separate post-reset-memroot init in sp_head.

  sql/sp.cc
    1.20 03/07/01 17:19:46 pem@mysql.com +8 -5
    Bugfixes for the sp_head memroot stuff. (Do things in the correct order
    at error clean-up.)

ChangeSet
  1.1546.4.2 03/07/01 18:00:17 monty@mashka.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mashka.mysql.fi:/home/my/mysql-4.1

  mysql-test/r/grant_cache.result
    1.5 03/07/01 18:00:12 monty@mashka.mysql.fi +0 -1
    Auto merged

ChangeSet
  1.1546.5.2 03/07/01 17:59:42 monty@mashka.mysql.fi +3 -0
  Fixed testcases and bug introduced by last changeset

  mysys/mf_loadpath.c
    1.9 03/07/01 17:59:39 monty@mashka.mysql.fi +6 -3
    Fix for my_load_path() and ./directory handling from last changeset

  mysql-test/r/grant_cache.result
    1.3.1.1 03/07/01 17:59:39 monty@mashka.mysql.fi +1 -1
    Updated test case (Wrong push by some developer)

  mysql-test/r/func_gconcat.result
    1.9 03/07/01 17:59:39 monty@mashka.mysql.fi +1 -1
    Fixed test case after merge

ChangeSet
  1.1546.5.1 03/07/01 15:57:45 monty@mashka.mysql.fi +6 -0
  merge

  sql/sql_select.cc
    1.216.19.1 03/07/01 15:57:42 monty@mashka.mysql.fi +2 -1
    merge

  sql/sql_yacc.yy
    1.203.51.2 03/07/01 15:50:47 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_class.h
    1.146.1.28 03/07/01 15:50:47 monty@mashka.mysql.fi +0 -0
    Auto merged

  scripts/mysql_create_system_tables.sh
    1.6 03/07/01 15:50:47 monty@mashka.mysql.fi +0 -2
    Auto merged

  mysql-test/r/subselect.result
    1.67.16.1 03/07/01 15:50:47 monty@mashka.mysql.fi +0 -0
    Auto merged

  acinclude.m4
    1.85 03/07/01 15:50:47 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1538.58.7 03/07/01 15:49:32 monty@mashka.mysql.fi +4 -0
  Fix needed to support MERGE tables in different databases

  mysys/my_symlink.c
    1.6 03/07/01 15:49:30 monty@mashka.mysql.fi +7 -5
    Fix needed to support MERGE tables in different databases

  mysys/mf_loadpath.c
    1.8 03/07/01 15:49:30 monty@mashka.mysql.fi +3 -3
    Fix needed to support MERGE tables in different databases

  mysql-test/t/merge.test
    1.23 03/07/01 15:49:30 monty@mashka.mysql.fi +6 -4
    Test of MERGE table patch

  mysql-test/r/merge.result
    1.24 03/07/01 15:49:30 monty@mashka.mysql.fi +8 -4
    Test of MERGE table patch

ChangeSet
  1.1346.257.4 03/07/01 15:38:11 monty@mashka.mysql.fi +1 -0
  Updated results after merge

  mysql-test/r/user_var.result
    1.6.1.3 03/07/01 15:38:09 monty@mashka.mysql.fi +4 -0
    Updated results after merge

ChangeSet
  1.1346.257.3 03/07/01 15:02:16 monty@mashka.mysql.fi +19 -0
  Merge with 3.23 tree to get latest bug fixes

  sql/sql_select.cc
    1.152.19.2 03/07/01 15:02:13 monty@mashka.mysql.fi +3 -13
    Use patch in 4.0 for range with NULL problem

  sql/sql_class.h
    1.111.1.39 03/07/01 15:02:13 monty@mashka.mysql.fi +0 -1
    Use local version

  sql/slave.cc
    1.164.1.70 03/07/01 15:02:13 monty@mashka.mysql.fi +0 -22
    Use local version

  sql/share/spanish/errmsg.txt
    1.47.1.10 03/07/01 15:02:13 monty@mashka.mysql.fi +0 -2
    merge

  sql/log.cc
    1.80.1.43 03/07/01 15:02:13 monty@mashka.mysql.fi +0 -13
    Use local version

  mysql-test/t/order_by.test
    1.9.2.4 03/07/01 15:02:13 monty@mashka.mysql.fi +0 -23
    Use local version (test is already in range.test)

  mysql-test/r/user_var.result
    1.6.1.2 03/07/01 15:02:13 monty@mashka.mysql.fi +2 -2
    merge with 3.23

  mysql-test/r/order_by.result
    1.11.1.8 03/07/01 15:02:13 monty@mashka.mysql.fi +0 -4
    Use local version

  innobase/row/row0vers.c
    1.10 03/07/01 15:02:13 monty@mashka.mysql.fi +0 -0
    Use local version

  innobase/row/row0sel.c
    1.28.1.11 03/07/01 15:02:13 monty@mashka.mysql.fi +0 -21
    Use local version

  innobase/page/page0page.c
    1.12 03/07/01 15:02:13 monty@mashka.mysql.fi +6 -0
    Use local version

  innobase/os/os0file.c
    1.44.1.12 03/07/01 15:02:13 monty@mashka.mysql.fi +0 -11
    Use local version

  configure.in
    1.191.1.87 03/07/01 15:02:13 monty@mashka.mysql.fi +0 -1
    Use local version

ChangeSet
  1.1546.4.1 03/07/01 14:54:34 bell@sanja.is.com.ua +1 -0
  fexed erroro message

  mysql-test/r/grant_cache.result
    1.4 03/07/01 14:54:25 bell@sanja.is.com.ua +1 -1
    fexed erroro message

  sql/nt_servc.cc
    1.11.1.2 03/07/01 14:40:13 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/log_event.h
    1.71.1.7 03/07/01 14:40:13 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/log_event.cc
    1.77.1.38 03/07/01 14:40:13 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/user_var.test
    1.5.1.1 03/07/01 14:40:12 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_func.cc
    1.60.1.35 03/07/01 14:40:12 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/user_var.test
    1.3.1.2 03/07/01 14:40:12 monty@mashka.mysql.fi +0 -0
    Turn off SCCS flag

  mysql-test/r/user_var.result
    1.3.1.2 03/07/01 14:40:12 monty@mashka.mysql.fi +0 -0
    Turn off SCCS flag

  BitKeeper/etc/logging_ok
    1.206.1.72 03/07/01 14:40:07 monty@mashka.mysql.fi +2 -4
    auto-union

ChangeSet
  1.1346.257.2 03/07/01 14:38:38 monty@mashka.mysql.fi +4 -0
  Optimized old patches
  Don't set field to DEFAULT value when set to NULL

  sql/opt_range.cc
    1.54.1.26 03/07/01 14:38:36 monty@mashka.mysql.fi +5 -1
    Safety fix for range with null patch

  sql/item_strfunc.cc
    1.36.1.27 03/07/01 14:38:36 monty@mashka.mysql.fi +5 -12
    Optimized patch for null handling with elt

  sql/field_conv.cc
    1.6.1.6 03/07/01 14:38:36 monty@mashka.mysql.fi +3 -3
    Revert patch: Don't set field to DEFAULT value when set to NULL

  mysql-test/r/insert.result
    1.9.1.2 03/07/01 14:38:36 monty@mashka.mysql.fi +1 -1
    Updated results after patch

ChangeSet
  1.1546.3.2 03/07/01 13:57:46 bell@sanja.is.com.ua +4 -0
  merge

  mysql-test/t/subselect.test
    1.58.9.1 03/07/01 13:57:43 bell@sanja.is.com.ua +11 -12
    merge

  mysql-test/r/subselect.result
    1.67.15.1 03/07/01 13:57:43 bell@sanja.is.com.ua +12 -12
    merge

  sql/sql_select.h
    1.45 03/07/01 13:56:08 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.18.1 03/07/01 13:56:08 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.257.1 03/07/01 13:30:55 monty@mashka.mysql.fi +2 -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.152.19.1 03/07/01 13:30:53 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.36.1.26 03/07/01 13:30:53 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.253.6 03/07/01 13:29:55 monty@mashka.mysql.fi +5 -0
  Code/testcase cleanups

  sql/slave.cc
    1.164.1.69 03/07/01 13:29:52 monty@mashka.mysql.fi +1 -2
    Simple optimizations

  mysql-test/t/join_outer.test
    1.6.1.4 03/07/01 13:29:52 monty@mashka.mysql.fi +12 -0
    New test case for inner join table dependency

  mysql-test/t/insert_select.test
    1.5.1.2 03/07/01 13:29:52 monty@mashka.mysql.fi +10 -13
    Remove not used drop tables.
    Fixed table names

  mysql-test/r/join_outer.result
    1.10.1.6 03/07/01 13:29:52 monty@mashka.mysql.fi +8 -0
    New test case for inner join table dependency

  mysql-test/r/insert_select.result
    1.7.1.2 03/07/01 13:29:52 monty@mashka.mysql.fi +8 -11
    Fixed results

ChangeSet
  1.1538.68.1 03/07/01 00:30:16 venu@myvenu.com +1 -0
  sql_state.h:
    Minor fixups for SQLSTATE values to be compatible with ODBC spec

  include/sql_state.h
    1.3 03/07/01 00:29:39 venu@myvenu.com +3 -3
    Minor fixups for SQLSTATE values to be compatible with ODBC spec

ChangeSet
  1.1546.2.1 03/07/01 10:03:20 bell@sanja.is.com.ua +7 -0
  merged

  mysql-test/t/subselect.test
    1.58.8.1 03/07/01 10:03:19 bell@sanja.is.com.ua +13 -14
    merged

  mysql-test/r/subselect.result
    1.67.14.1 03/07/01 10:03:19 bell@sanja.is.com.ua +13 -13
    merged

  sql/sql_select.cc
    1.216.12.8 03/07/01 10:00:34 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.1.24 03/07/01 10:00:34 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.80 03/07/01 10:00:34 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.29 03/07/01 10:00:34 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.cc
    1.60.3.4 03/07/01 10:00:34 bell@sanja.is.com.ua +0 -6
    Auto merged

ChangeSet
  1.1346.200.97 03/06/30 22:24:03 serg@serg.mylan +1 -0
  new syntax:
    CREATE TABLE ...(SELECT ...) UNION ...
    INSERT ...      (SELECT ...) UNION ...

  sql/sql_yacc.yy
    1.145.18.2 03/06/30 22:23:58 serg@serg.mylan +30 -18
    new syntax:
      CREATE TABLE ...(SELECT ...) UNION ...
      INSERT ...      (SELECT ...) UNION ...

ChangeSet
  1.1546.1.3 03/06/30 11:13:41 igor@rurik.mysql.com +2 -0
  range.result, range.test:
    Added inequality predicate to range optimization

  mysql-test/r/range.result
    1.12 03/06/30 10:56:46 igor@rurik.mysql.com +6 -6
    Added inequality predicate to range optimization

  mysql-test/r/range.result
    1.11 03/06/30 10:28:48 igor@rurik.mysql.com +132 -1
    Added inequality predicate to range optimization

  mysql-test/t/range.test
    1.6 03/06/30 10:28:14 igor@rurik.mysql.com +84 -1
    Added inequality predicate to range optimization

ChangeSet
  1.1546.1.2 03/06/30 09:53:04 igor@rurik.mysql.com +4 -0
  Merge rurik.mysql.com:/home/igor/mysql-4.1
  into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  sql/mysqld.cc
    1.356.13.2 03/06/30 09:52:59 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.50.1.9 03/06/30 09:52:59 igor@rurik.mysql.com +0 -0
    Auto merged

  myisam/myisamchk.c
    1.92.1.4 03/06/30 09:52:59 igor@rurik.mysql.com +0 -0
    Auto merged

  myisam/mi_preload.c
    1.3 03/06/30 09:52:59 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1538.53.6 03/06/30 09:52:30 igor@rurik.mysql.com +2 -0
  item_cmpfunc.h, opt_range.cc:
    Added inequality predicate to range optimization

  sql/item_cmpfunc.h
    1.50.2.1 03/06/30 09:52:13 igor@rurik.mysql.com +1 -1
    Added inequality predicate to range optimization

  sql/opt_range.cc
    1.91 03/06/30 09:51:23 igor@rurik.mysql.com +15 -0
    Added inequality predicate to range optimization

ChangeSet
  1.1538.53.5 03/06/30 09:47:56 igor@rurik.mysql.com +2 -0
  mysqld.cc, handler.cc:
    Added multiple key cache

  sql/mysqld.cc
    1.356.14.1 03/06/30 09:46:20 igor@rurik.mysql.com +1 -1
    Added multiple key cache

  sql/handler.cc
    1.93.1.1 03/06/30 09:45:36 igor@rurik.mysql.com +3 -2
    Added multiple key cache

ChangeSet
  1.1538.53.4 03/06/30 09:41:41 igor@rurik.mysql.com +22 -0
  Many files:
    Added multiple key cache

  include/my_sys.h
    1.101 03/06/30 09:39:49 igor@rurik.mysql.com +14 -7
    Added multiple key cache

  mysys/mf_keycache.c
    1.27 03/06/30 09:38:54 igor@rurik.mysql.com +484 -404
    Added multiple key cache

  isam/test3.c
    1.10 03/06/30 09:37:53 igor@rurik.mysql.com +1 -1
    Added multiple key cache

  isam/test2.c
    1.12 03/06/30 09:37:45 igor@rurik.mysql.com +2 -2
    Added multiple key cache

  isam/isamchk.c
    1.23 03/06/30 09:37:06 igor@rurik.mysql.com +6 -5
    Added multiple key cache

  isam/close.c
    1.6 03/06/30 09:36:42 igor@rurik.mysql.com +2 -1
    Added multiple key cache

  isam/panic.c
    1.5 03/06/30 09:36:25 igor@rurik.mysql.com +1 -1
    Added multiple key cache

  isam/_locking.c
    1.7 03/06/30 09:36:05 igor@rurik.mysql.com +2 -2
    Added multiple key cache

  isam/_page.c
    1.7 03/06/30 09:35:50 igor@rurik.mysql.com +13 -9
    Added multiple key cache

  myisam/mi_test3.c
    1.11 03/06/30 09:35:16 igor@rurik.mysql.com +1 -1
    Added multiple key cache

  myisam/mi_test2.c
    1.19 03/06/30 09:34:39 igor@rurik.mysql.com +7 -4
    Added multiple key cache

  myisam/mi_test1.c
    1.17 03/06/30 09:33:53 igor@rurik.mysql.com +1 -1
    Added multiple key cache

  myisam/mi_close.c
    1.14 03/06/30 09:33:14 igor@rurik.mysql.com +1 -1
    Added multiple key cache

  myisam/myisamlog.c
    1.21 03/06/30 09:30:11 igor@rurik.mysql.com +3 -3
    Added multiple key cache

  myisam/myisamchk.c
    1.92.2.1 03/06/30 09:29:54 igor@rurik.mysql.com +3 -2
    Added multiple key cache

  myisam/mi_check.c
    1.105.1.3 03/06/30 09:29:33 igor@rurik.mysql.com +13 -10
    Added multiple key cache

  myisam/mi_preload.c
    1.1.1.1 03/06/30 09:29:15 igor@rurik.mysql.com +5 -3
    Added multiple key cache

  myisam/mi_panic.c
    1.7 03/06/30 09:28:46 igor@rurik.mysql.com +1 -1
    Added multiple key cache

  myisam/mi_locking.c
    1.24 03/06/30 09:28:29 igor@rurik.mysql.com +3 -2
    Added multiple key cache

  myisam/mi_extra.c
    1.33 03/06/30 09:27:52 igor@rurik.mysql.com +2 -2
    Added multiple key cache

  myisam/mi_delete_all.c
    1.12 03/06/30 09:27:33 igor@rurik.mysql.com +1 -1
    Added multiple key cache

  myisam/mi_page.c
    1.14 03/06/30 09:26:32 igor@rurik.mysql.com +8 -4
    Added multiple key cache

ChangeSet
  1.1346.256.1 03/06/30 17:00:11 serg@serg.mylan +1 -0
  REPAIR/OPTIMIZE/CHECK/RESTORE/etc commands close relevant open HANDLERs

  sql/sql_table.cc
    1.112.1.48 03/06/30 17:00:08 serg@serg.mylan +1 -0
    REPAIR/OPTIMIZE/CHECK/RESTORE/etc commands close relevant open HANDLERs

ChangeSet
  1.1346.200.95 03/06/30 15:00:28 lenz@mysql.com +1 -0
   - make sure to compile with the correct --localstatedir and --libexedir 
     paths for the binary distributions (this will hopefully resolve the
     "file /usr/local/mysql/libexec/mysqld doesn't exist" error that many
     people are facing)

  Build-tools/Do-compile
    1.74.1.2 03/06/30 15:00:26 lenz@mysql.com +2 -1
     - make sure to compile with the correct --localstatedir and --libexedir 
       paths for the binary distributions (this will hopefully resolve the
       "file /usr/local/mysql/libexec/mysqld doesn't exist" error that many
       people are facing)

ChangeSet
  1.1546.1.1 03/06/30 15:49:29 jani@rhols221.adsl.netsonic.fi +1 -0
  Made check for structured option handling more robust and faster.
  Earlier it could have failed in some special cases.

  mysys/my_getopt.c
    1.34.1.2 03/06/30 15:49:26 jani@rhols221.adsl.netsonic.fi +8 -6
    Made check for structured option handling more robust and faster.
    Earlier it could have failed in some special cases.

ChangeSet
  1.1538.58.6 03/06/30 13:28:36 monty@mashka.mysql.fi +4 -0
  LAST_INSERT_ID() should not be set if we couldn't generate an auto_increment id.

  sql/sql_class.h
    1.146.12.1 03/06/30 13:28:33 monty@mashka.mysql.fi +17 -2
    Another fix for LAST_INSERT_ID()

  sql/handler.cc
    1.94 03/06/30 13:28:33 monty@mashka.mysql.fi +2 -0
    Another fix for LAST_INSERT_ID()

  mysql-test/t/auto_increment.test
    1.9 03/06/30 13:28:33 monty@mashka.mysql.fi +4 -0
    Another fix for LAST_INSERT_ID()

  mysql-test/r/auto_increment.result
    1.13 03/06/30 13:28:33 monty@mashka.mysql.fi +6 -1
    Update after auto_increment fix

ChangeSet
  1.1538.58.5 03/06/30 13:23:54 monty@mashka.mysql.fi +10 -0
  Remove FORCE_INIT_OF_VARS when compiling for valgrind/purify to spot wrong LINT_INIT() options
  Fixed bug in ALTER TABLE ... MODIFY integer-column
  Added ref_or_null optimization (needed for subqueries)

  sql/unireg.cc
    1.27 03/06/30 13:23:50 monty@mashka.mysql.fi +3 -1
    Safety fix for ALTER TABLE .. MODIFY

  sql/table.cc
    1.80 03/06/30 13:23:50 monty@mashka.mysql.fi +3 -1
    Safety fix for ALTER TABLE .. MODIFY

  sql/sql_yacc.yy
    1.203.52.1 03/06/30 13:23:50 monty@mashka.mysql.fi +1 -0
    Fixed bug in ALTER TABLE ... MODIFY integer-column

  sql/sql_select.h
    1.43.1.2 03/06/30 13:23:50 monty@mashka.mysql.fi +5 -2
    Added ref_or_null optimization

  sql/sql_select.cc
    1.216.17.1 03/06/30 13:23:50 monty@mashka.mysql.fi +346 -259
    Added ref_or_null optimization
    Optimized find_best_combinations() and read-functions

  mysql-test/t/null_key.test
    1.8 03/06/30 13:23:50 monty@mashka.mysql.fi +34 -1
    New tests for ref_or_null optimization

  mysql-test/r/subselect.result
    1.67.13.1 03/06/30 13:23:50 monty@mashka.mysql.fi +1 -1
    Update after ref_or_null optimization

  mysql-test/r/null_key.result
    1.20 03/06/30 13:23:50 monty@mashka.mysql.fi +106 -4
    Update after ref_or_null optimization

  mysql-test/r/distinct.result
    1.24 03/06/30 13:23:50 monty@mashka.mysql.fi +3 -3
    Update of test results (new optimizer)

  BUILD/compile-pentium-valgrind-max
    1.4 03/06/30 13:23:50 monty@mashka.mysql.fi +1 -1
    Remove FORCE_INIT_OF_VARS to spot wrong LINT_INIT() options

ChangeSet
  1.1547 03/06/30 13:14:18 bell@sanja.is.com.ua +10 -0
  Merge

  sql/sql_lex.h
    1.102.13.3 03/06/30 13:14:16 bell@sanja.is.com.ua +0 -0
    SCCS merged

  sql/sql_yacc.yy
    1.203.50.2 03/06/30 13:13:38 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_union.cc
    1.74.1.4 03/06/30 13:13:38 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.1.11 03/06/30 13:13:38 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.78.1.3 03/06/30 13:13:38 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.54 03/06/30 13:13:38 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.93 03/06/30 13:13:38 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.58.1.21 03/06/30 13:13:38 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.58.1.13 03/06/30 13:13:38 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.1.13 03/06/30 13:13:38 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.1.121 03/06/30 12:33:35 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/sql_acl.cc
    1.51.1.51 03/06/30 12:32:47 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.676.305.1 03/06/29 21:15:51 monty@mashka.mysql.fi +3 -0
  Fixed 'Unknown error' when doing ORDER BY on reference table which
  was used with NULL value on NOT NULL column. (Bug #479)

  sql/sql_select.cc
    1.91.1.42 03/06/29 21:15:49 monty@mashka.mysql.fi +13 -1
    Fixed problem with lookup on NULL

  mysql-test/t/order_by.test
    1.4.1.2 03/06/29 21:15:49 monty@mashka.mysql.fi +23 -0
    Test of new code

  mysql-test/r/order_by.result
    1.3.1.2 03/06/29 21:15:49 monty@mashka.mysql.fi +4 -0
    Update of results

ChangeSet
  1.1524.1.12 03/06/29 18:15:17 pem@mysql.com +7 -0
  sp_head now has its own mem_root (WL#961).
  Also fixed some difficult memory leaks that became apparent
  in this task.

  sql/sql_yacc.yy
    1.232 03/06/29 18:15:15 pem@mysql.com +6 -1
    sp_head now has its own mem_root.

  sql/sql_prepare.cc
    1.41 03/06/29 18:15:15 pem@mysql.com +10 -2
    Fixed SP memory leaks.

  sql/sql_parse.cc
    1.290 03/06/29 18:15:15 pem@mysql.com +23 -11
    sp_head now has its own mem_root.
    Fixed SP memory leaks.

  sql/sql_lex.h
    1.116 03/06/29 18:15:15 pem@mysql.com +1 -0
    Fixed some memory leaks in sp_head. Need to keep track on used lex:es.

  sql/sp_head.h
    1.17 03/06/29 18:15:15 pem@mysql.com +36 -5
    sp_head now has its own mem_root.

  sql/sp_head.cc
    1.34 03/06/29 18:15:15 pem@mysql.com +76 -15
    sp_head now has its own mem_root.
    Also fixed some difficult memory leaks.

  sql/sp.cc
    1.19 03/06/29 18:15:15 pem@mysql.com +3 -2
    sp_head now has its own mem_root.

ChangeSet
  1.1546 03/06/29 15:35:48 bell@sanja.is.com.ua +6 -0
  merged

  mysql-test/t/subselect.test
    1.58.1.12 03/06/29 15:35:46 bell@sanja.is.com.ua +26 -27
    merged

  mysql-test/r/subselect.result
    1.67.1.12 03/06/29 15:35:46 bell@sanja.is.com.ua +22 -22
    merged

  sql/sql_select.cc
    1.216.12.7 03/06/29 15:34:21 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.14.2 03/06/29 15:34:21 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.78.2.2 03/06/29 15:34:21 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.87.1.14 03/06/29 15:34:21 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.253.5 03/06/29 12:58:43 monty@mashka.mysql.fi +5 -0
  SET CHARACTER SET DEFAULT didn't work (Bug #462)

  mysql-test/t/convert.test
    1.1 03/06/29 12:58:41 monty@mashka.mysql.fi +11 -0

  mysql-test/r/convert.result
    1.1 03/06/29 12:58:41 monty@mashka.mysql.fi +17 -0

  sql/set_var.h
    1.4.1.5 03/06/29 12:58:41 monty@mashka.mysql.fi +1 -0
    SET CHARACTER SET DEFAULT didn't work

  sql/set_var.cc
    1.12.1.23 03/06/29 12:58:41 monty@mashka.mysql.fi +5 -0
    SET CHARACTER SET DEFAULT didn't work

  mysql-test/t/convert.test
    1.0 03/06/29 12:58:41 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysql-test/t/convert.test

  mysql-test/r/convert.result
    1.0 03/06/29 12:58:41 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysql-test/r/convert.result

  BUILD/compile-pentium-debug-max
    1.9.1.1 03/06/29 12:58:41 monty@mashka.mysql.fi +1 -1
    Removed -DBIG_TABLES because of problems with gdb 5.3

ChangeSet
  1.1538.6.9 03/06/28 23:54:33 serg@serg.mylan +2 -0
  fixed a bug that made 4.0 MYI+FT files unreadable in 4.1

  myisam/myisamchk.c
    1.92.1.3 03/06/28 23:54:30 serg@serg.mylan +1 -1
    fixed a bug that made 4.0 MYI+FT files unreadable in 4.1

  myisam/mi_open.c
    1.67 03/06/28 23:54:30 serg@serg.mylan +0 -1
    fixed a bug that made 4.0 MYI+FT files unreadable in 4.1

ChangeSet
  1.1538.6.8 03/06/28 23:01:33 serg@serg.mylan +1 -0
  timestamp MYD-4.0 format compatibility fix

  sql/field.cc
    1.109 03/06/28 23:01:29 serg@serg.mylan +1 -0
    timestamp MYD-4.0 format compatibility fix

ChangeSet
  1.1544 03/06/28 17:04:26 bell@sanja.is.com.ua +3 -0
  fixed bug #745
  (resolving fields of reduced subselect)

  sql/sql_union.cc
    1.74.2.4 03/06/28 17:04:17 bell@sanja.is.com.ua +2 -1
    to get chance of outer resolved_fields resolve fields of result table as usual fileds

  mysql-test/t/subselect.test
    1.58.1.11 03/06/28 17:04:17 bell@sanja.is.com.ua +2 -0
    test of bug #745

  mysql-test/r/subselect.result
    1.67.1.11 03/06/28 17:04:17 bell@sanja.is.com.ua +3 -0
    test of bug #745

ChangeSet
  1.1543 03/06/28 14:32:06 bell@sanja.is.com.ua +3 -0
  Merge

  mysql-test/t/subselect.test
    1.58.1.10 03/06/28 14:32:05 bell@sanja.is.com.ua +0 -0
    SCCS merged

  mysql-test/r/subselect.result
    1.67.1.10 03/06/28 14:32:05 bell@sanja.is.com.ua +0 -0
    SCCS merged

  sql/item.cc
    1.58.10.5 03/06/28 14:30:43 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1542 03/06/28 13:43:18 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-cset-4.1

  sql/sql_select.cc
    1.216.12.6 03/06/28 13:43:16 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1541 03/06/28 13:34:07 bell@sanja.is.com.ua +2 -0
  merging
  test moved to other bug 

  mysql-test/t/subselect.test
    1.58.1.9 03/06/28 13:34:01 bell@sanja.is.com.ua +0 -1
    merging
    test moved to other bug 

  mysql-test/r/subselect.result
    1.67.1.9 03/06/28 13:34:00 bell@sanja.is.com.ua +3 -4
    merging
    test moved to other bug 

ChangeSet
  1.1540 03/06/27 23:14:20 bell@sanja.is.com.ua +6 -0
  merging

  sql/sql_yacc.yy
    1.203.51.1 03/06/27 23:14:19 bell@sanja.is.com.ua +0 -0
    merging

  mysql-test/t/subselect.test
    1.58.1.8 03/06/27 23:14:19 bell@sanja.is.com.ua +1 -1
    merging

  mysql-test/r/subselect.result
    1.67.1.8 03/06/27 23:14:19 bell@sanja.is.com.ua +0 -3
    merging

  sql/sql_lex.h
    1.102.15.1 03/06/27 23:06:01 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.78.3.1 03/06/27 23:06:01 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.58.14.6 03/06/27 23:06:01 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1538.6.6 03/06/27 23:00:33 bell@sanja.is.com.ua +1 -0
  after review patch

  sql/sql_select.cc
    1.216.12.5 03/06/27 23:00:32 bell@sanja.is.com.ua +1 -1
    after review patch

ChangeSet
  1.1538.6.5 03/06/27 22:19:14 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-order-4.1

  sql/sql_select.cc
    1.216.12.4 03/06/27 22:19:12 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1538.63.3 03/06/27 19:32:59 serg@serg.mylan +1 -0
  fix test when no InnoDB is present

  mysql-test/t/func_group.test
    1.14 03/06/27 19:32:55 serg@serg.mylan +2 -0
    fix test when no InnoDB is present

ChangeSet
  1.1538.67.1 03/06/27 18:51:39 jani@rhols221.adsl.netsonic.fi +3 -0
  Added support for structured options (WL task ID 947).

  sql/mysqld.cc
    1.356.13.1 03/06/27 18:39:40 jani@rhols221.adsl.netsonic.fi +11 -1
    Added support for structured options (WL task ID 947).

  mysys/my_getopt.c
    1.34.1.1 03/06/27 18:39:40 jani@rhols221.adsl.netsonic.fi +100 -40
    Added support for structured options (WL task ID 947).

  include/my_getopt.h
    1.12 03/06/27 18:39:40 jani@rhols221.adsl.netsonic.fi +8 -1
    Added support for structured options (WL task ID 947).

ChangeSet
  1.1538.58.3 03/06/27 16:29:10 monty@mashka.mysql.fi +9 -0
  Allow one to use MERGE tables with tables from different databases
  Added command 'replace_column' to mysqltest

  sql/sql_show.cc
    1.122.1.10 03/06/27 16:29:06 monty@mashka.mysql.fi +24 -28
    Extended append_identifier()

  sql/sql_parse.cc
    1.271.1.7 03/06/27 16:29:06 monty@mashka.mysql.fi +1 -5
    Allow one to use MERGE tables with tables from different databases

  sql/mysql_priv.h
    1.186.11.1 03/06/27 16:29:06 monty@mashka.mysql.fi +2 -0
    Added function

  sql/ha_myisammrg.cc
    1.43 03/06/27 16:29:06 monty@mashka.mysql.fi +66 -25
    Allow one to use MERGE tables with tables from different databases

  scripts/mysql_create_system_tables.sh
    1.3.1.1 03/06/27 16:29:06 monty@mashka.mysql.fi +2 -2
    Fixed syntax error

  mysql-test/t/merge.test
    1.22 03/06/27 16:29:06 monty@mashka.mysql.fi +16 -5
    New tests for testing MERGE tables with multiple databases

  mysql-test/t/innodb.test
    1.42 03/06/27 16:29:06 monty@mashka.mysql.fi +2 -2
    User replace_column to make tests repeatable

  mysql-test/r/merge.result
    1.23 03/06/27 16:29:06 monty@mashka.mysql.fi +25 -13
    Update of tests

  client/mysqltest.c
    1.92.3.1 03/06/27 16:29:06 monty@mashka.mysql.fi +88 -10
    Added user command replace_column

ChangeSet
  1.1538.66.3 03/06/27 16:09:53 bar@bar.mysql.r18.ru +1 -0
  item.cc:
    A better comment

  sql/item.cc
    1.58.14.5 03/06/27 16:09:35 bar@bar.mysql.r18.ru +2 -1
    A better comment

ChangeSet
  1.1538.66.2 03/06/27 16:08:52 bar@bar.mysql.r18.ru +3 -0
  When unifying arguments for comparion, binary strings won character strings,
  and comparison was done binary. Now, a binary string wins a character sting 
  taking in account their derivation. That means a character field wins a
  binary literal and comparison is done according to the character field
  collation, not binary. 

  sql/item.cc
    1.58.14.4 03/06/27 16:08:48 bar@bar.mysql.r18.ru +11 -12
    When unifying arguments for comparion, binary strings won character strings,
    and comparison was done binary. Now, a binary string wins a character sting 
    taking in account their derivation. That means a character field wins a
    binary literal and comparison is done according to the character field
    collation, not binary. 

  mysql-test/t/ctype_latin1_de.test
    1.8 03/06/27 16:08:48 bar@bar.mysql.r18.ru +8 -5
    When unifying arguments for comparion, binary strings won character strings,
    and comparison was done binary. Now, a binary string wins a character sting 
    taking in account their derivation. That means a character field wins a
    binary literal and comparison is done according to the character field
    collation, not binary. 

  mysql-test/r/ctype_latin1_de.result
    1.8 03/06/27 16:08:48 bar@bar.mysql.r18.ru +5 -5
    When unifying arguments for comparion, binary strings won character strings,
    and comparison was done binary. Now, a binary string wins a character sting 
    taking in account their derivation. That means a character field wins a
    binary literal and comparison is done according to the character field
    collation, not binary. 

ChangeSet
  1.1538.1.27 03/06/27 13:36:03 bell@sanja.is.com.ua +2 -0
  optimization results (SCRUM) WL#902

  mysql-test/t/subselect.test
    1.58.7.2 03/06/27 13:36:01 bell@sanja.is.com.ua +35 -0
    optimization results

  mysql-test/r/subselect.result
    1.67.6.5 03/06/27 13:36:01 bell@sanja.is.com.ua +50 -0
    optimization results

ChangeSet
  1.1538.66.1 03/06/27 13:52:38 bar@bar.mysql.r18.ru +4 -0
  str0 IN (str1, str2, ...)  now works according to collation rules

  sql/item_cmpfunc.h
    1.50.1.8 03/06/27 13:52:36 bar@bar.mysql.r18.ru +9 -6
    str0 IN (str1, str2, ...)  now works according to collation rules

  sql/item_cmpfunc.cc
    1.87.5.3 03/06/27 13:52:36 bar@bar.mysql.r18.ru +23 -24
    str0 IN (str1, str2, ...)  now works according to collation rules

  mysql-test/t/func_str.test
    1.30 03/06/27 13:52:36 bar@bar.mysql.r18.ru +15 -0
    str0 IN (str1, str2, ...)  now works according to collation rules

  mysql-test/r/func_str.result
    1.32 03/06/27 13:52:36 bar@bar.mysql.r18.ru +22 -0
    str0 IN (str1, str2, ...)  now works according to collation rules

ChangeSet
  1.1538.65.2 03/06/27 10:07:22 lenz@kallisto.local +1 -0
   - fixed typo (dbl -> dnl) in acinclude.m4

  acinclude.m4
    1.83.1.1 03/06/27 10:07:20 lenz@mysql.com +1 -1
     - fixed typo (dbl -> dnl)

ChangeSet
  1.1538.65.1 03/06/27 12:02:08 bar@bar.mysql.r18.ru +4 -0
  BETWEEN now works according to collation rules

  sql/item_cmpfunc.h
    1.50.1.7 03/06/27 12:02:05 bar@bar.mysql.r18.ru +1 -1
    BETWEEN now works according to collation rules

  sql/item_cmpfunc.cc
    1.87.5.2 03/06/27 12:02:05 bar@bar.mysql.r18.ru +29 -9
    BETWEEN now works according to collation rules

  mysql-test/t/func_str.test
    1.29 03/06/27 12:02:05 bar@bar.mysql.r18.ru +12 -0
    BETWEEN now works according to collation rules

  mysql-test/r/func_str.result
    1.31 03/06/27 12:02:05 bar@bar.mysql.r18.ru +20 -0
    BETWEEN now works according to collation rules

ChangeSet
  1.1346.253.4 03/06/27 06:40:24 monty@mashka.mysql.fi +2 -0
  Fixed testcase after last changes

  mysql-test/t/select_safe.test
    1.3.1.3 03/06/27 06:40:17 monty@mashka.mysql.fi +4 -3
    Fixed testcase after last changes

  mysql-test/r/select_safe.result
    1.6.1.2 03/06/27 06:40:17 monty@mashka.mysql.fi +8 -5
    Fixed testcase after last changes

ChangeSet
  1.1346.253.3 03/06/27 03:04:54 monty@mashka.mysql.fi +17 -0
  Added thread variable max_seeks_for_key
  Change optimizer to prefer key lookups before table scan
  Change table scans to be done after tables with constrains on scanned table 

  sql/sql_select.cc
    1.152.17.2 03/06/27 03:04:51 monty@mashka.mysql.fi +29 -12
    Added max_seeks_for_key
    Change optimizer to prefer key lookups before table scan.
    Change table scans to be done after tables with constrains on scanned table 

  sql/sql_class.h
    1.111.1.38 03/06/27 03:04:51 monty@mashka.mysql.fi +1 -0
    Added max_seeks_for_key

  sql/set_var.cc
    1.12.1.22 03/06/27 03:04:51 monty@mashka.mysql.fi +4 -0
    Added max_seeks_for_key

  sql/mysqld.cc
    1.297.1.142 03/06/27 03:04:51 monty@mashka.mysql.fi +6 -1
    Added max_seeks_for_key

  sql/item_cmpfunc.cc
    1.20.1.33 03/06/27 03:04:51 monty@mashka.mysql.fi +2 -2
    Initialize not_null_tables_cache properly

  sql/handler.h
    1.71.1.16 03/06/27 03:04:51 monty@mashka.mysql.fi +19 -18
    Optimize structure for 64 bit machines (and to avoid problems with gdb)

  mysql-test/t/select_safe.test
    1.3.1.2 03/06/27 03:04:51 monty@mashka.mysql.fi +13 -2
    Add tests for MAX_SEEKS_FOR_KEY

  mysql-test/t/join.test
    1.13.1.6 03/06/27 03:04:51 monty@mashka.mysql.fi +1 -4
    Change test to be repeatable

  mysql-test/t/distinct.test
    1.11.1.1 03/06/27 03:04:51 monty@mashka.mysql.fi +1 -1
    Change test to be repeatable

  mysql-test/r/select_safe.result
    1.6.1.1 03/06/27 03:04:51 monty@mashka.mysql.fi +19 -4
    Update results

  mysql-test/r/order_by.result
    1.11.1.7 03/06/27 03:04:51 monty@mashka.mysql.fi +3 -3
    Update results

  mysql-test/r/myisam.result
    1.10.1.11 03/06/27 03:04:51 monty@mashka.mysql.fi +5 -5
    Update results

  mysql-test/r/key_diff.result
    1.5.1.4 03/06/27 03:04:51 monty@mashka.mysql.fi +1 -1
    Update results

  mysql-test/r/join.result
    1.17.1.7 03/06/27 03:04:51 monty@mashka.mysql.fi +1 -3
    Update results

  mysql-test/r/heap.result
    1.10.1.3 03/06/27 03:04:51 monty@mashka.mysql.fi +1 -1
    Update results

  mysql-test/r/group_by.result
    1.16.1.16 03/06/27 03:04:51 monty@mashka.mysql.fi +2 -2
    Update results

  mysql-test/r/distinct.result
    1.14.1.7 03/06/27 03:04:50 monty@mashka.mysql.fi +6 -6
    Update results

ChangeSet
  1.1346.255.1 03/06/26 21:30:53 serg@serg.mylan +3 -0
  bug with ranges and not_null_col=can_be_null_expr fixed

  sql/opt_range.cc
    1.54.1.25 03/06/26 21:30:50 serg@serg.mylan +5 -1
    bug with ranges and not_null_col=can_be_null_expr fixed

  mysql-test/t/range.test
    1.4.1.1 03/06/26 21:30:50 serg@serg.mylan +52 -32
    new test added
    long lines reformatted

  mysql-test/r/range.result
    1.6.1.1 03/06/26 21:30:50 serg@serg.mylan +50 -31
    new test added
    long lines reformatted

ChangeSet
  1.1538.64.1 03/06/26 11:04:20 paul@teton.kitebird.com +23 -0
  Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
  into teton.kitebird.com:/home/paul/mysql-4.1

  sql/share/ukrainian/errmsg.txt
    1.27.1.12 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/swedish/errmsg.txt
    1.64.1.14 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/spanish/errmsg.txt
    1.64.1.12 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/slovak/errmsg.txt
    1.64.1.12 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/serbian/errmsg.txt
    1.18.1.10 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/russian/errmsg.txt
    1.61.1.13 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/romanian/errmsg.txt
    1.62.1.12 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/portuguese/errmsg.txt
    1.64.1.13 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.63.1.12 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/norwegian/errmsg.txt
    1.63.1.12 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.12 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/korean/errmsg.txt
    1.63.1.12 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/japanese/errmsg.txt
    1.63.1.12 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/italian/errmsg.txt
    1.70.1.12 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/hungarian/errmsg.txt
    1.65.1.12 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/greek/errmsg.txt
    1.64.1.12 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/german/errmsg.txt
    1.64.1.12 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/french/errmsg.txt
    1.63.1.12 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/estonian/errmsg.txt
    1.64.1.12 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.70.1.16 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/dutch/errmsg.txt
    1.66.1.12 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/danish/errmsg.txt
    1.62.1.12 03/06/26 11:04:14 paul@teton.kitebird.com +0 -0
    Auto merged

  sql/share/czech/errmsg.txt
    1.64.1.12 03/06/26 11:04:13 paul@teton.kitebird.com +0 -0
    Auto merged

ChangeSet
  1.676.1.719 03/06/26 10:31:35 vva@eagle.mysql.r18.ru +1 -0
  Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-3.23
  into eagle.mysql.r18.ru:/home/vva/work/BUG_479_/mysql-3.23

  BitKeeper/etc/logging_ok
    1.153.1.96 03/06/26 10:31:31 vva@eagle.mysql.r18.ru +0 -1
    auto-union

ChangeSet
  1.1538.1.26 03/06/26 15:07:42 bell@sanja.is.com.ua +2 -0
  Item::str_value can't be used for storing value
  (fixed error in Item_cache_str)

  sql/item.h
    1.56.1.18 03/06/26 15:07:32 bell@sanja.is.com.ua +1 -1
    Item::str_value can't be used for storing value 

  sql/item.cc
    1.58.1.20 03/06/26 15:07:32 bell@sanja.is.com.ua +6 -6
    Item::str_value can't be used for storing value 

ChangeSet
  1.1538.55.9 03/06/26 13:23:08 serg@serg.mylan +1 -0
  preload.test:
    Change mode to -rw-rw-r--

  mysql-test/t/preload.test
    1.4 03/06/26 13:22:24 serg@serg.mylan +0 -0
    Change mode to -rw-rw-r--

ChangeSet
  1.1538.63.1 03/06/26 15:45:04 bar@bar.mysql.r18.ru +28 -0
  New messages for 3-adic and N-adic operations
  REPLACE() now processed arguments collations according to standard

  sql/share/ukrainian/errmsg.txt
    1.27.4.1 03/06/26 15:45:02 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/swedish/errmsg.txt
    1.64.4.1 03/06/26 15:45:02 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/spanish/errmsg.txt
    1.64.4.1 03/06/26 15:45:02 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/slovak/errmsg.txt
    1.64.4.1 03/06/26 15:45:02 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/serbian/errmsg.txt
    1.18.3.1 03/06/26 15:45:02 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/russian/errmsg.txt
    1.61.4.1 03/06/26 15:45:02 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/romanian/errmsg.txt
    1.62.4.1 03/06/26 15:45:02 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/portuguese/errmsg.txt
    1.64.4.1 03/06/26 15:45:01 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/polish/errmsg.txt
    1.63.3.1 03/06/26 15:45:01 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/norwegian/errmsg.txt
    1.63.4.1 03/06/26 15:45:01 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/norwegian-ny/errmsg.txt
    1.63.4.1 03/06/26 15:45:01 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/korean/errmsg.txt
    1.63.4.1 03/06/26 15:45:01 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/japanese/errmsg.txt
    1.63.4.1 03/06/26 15:45:01 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/italian/errmsg.txt
    1.70.4.1 03/06/26 15:45:01 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/hungarian/errmsg.txt
    1.65.4.1 03/06/26 15:45:01 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/greek/errmsg.txt
    1.64.4.1 03/06/26 15:45:01 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/german/errmsg.txt
    1.64.4.1 03/06/26 15:45:01 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/french/errmsg.txt
    1.63.4.1 03/06/26 15:45:01 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/estonian/errmsg.txt
    1.64.4.1 03/06/26 15:45:01 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/english/errmsg.txt
    1.70.6.1 03/06/26 15:45:01 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/dutch/errmsg.txt
    1.66.4.1 03/06/26 15:45:01 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/danish/errmsg.txt
    1.62.4.1 03/06/26 15:45:01 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/share/czech/errmsg.txt
    1.64.4.1 03/06/26 15:45:01 bar@bar.mysql.r18.ru +2 -0
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/item_strfunc.cc
    1.126 03/06/26 15:45:01 bar@bar.mysql.r18.ru +21 -11
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/item_func.cc
    1.124.1.11 03/06/26 15:45:01 bar@bar.mysql.r18.ru +1 -1
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/item_cmpfunc.h
    1.50.1.6 03/06/26 15:45:01 bar@bar.mysql.r18.ru +1 -1
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  sql/item_cmpfunc.cc
    1.87.5.1 03/06/26 15:45:01 bar@bar.mysql.r18.ru +13 -7
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

  include/mysqld_error.h
    1.61.1.10 03/06/26 15:45:01 bar@bar.mysql.r18.ru +4 -2
    New messages for 3-adic and N-adic operations
    REPLACE() now processed arguments collations according to standard

ChangeSet
  1.1538.1.25 03/06/26 11:31:13 bell@sanja.is.com.ua +6 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/work-cond_count-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-top2-4.1

  sql/sql_select.cc
    1.216.1.10 03/06/26 11:31:11 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.13.2 03/06/26 11:31:10 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.78.1.2 03/06/26 11:31:10 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.cc
    1.60.1.4 03/06/26 11:31:10 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.92 03/06/26 11:31:10 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.6.4 03/06/26 11:31:10 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1538.57.5 03/06/26 11:09:11 bell@sanja.is.com.ua +10 -0
  cond_count moved to SELECT_LEX_NODE
  fixed BUG #726

  sql/sql_select.cc
    1.216.16.2 03/06/26 11:09:00 bell@sanja.is.com.ua +2 -1
    cond_count moved to SELECT_LEX_NODE

  sql/sql_lex.h
    1.102.14.1 03/06/26 11:09:00 bell@sanja.is.com.ua +1 -0
    cond_count moved to SELECT_LEX_NODE

  sql/sql_lex.cc
    1.78.2.1 03/06/26 11:09:00 bell@sanja.is.com.ua +1 -0
    cond_count moved to SELECT_LEX_NODE

  sql/sql_class.h
    1.146.1.27 03/06/26 11:09:00 bell@sanja.is.com.ua +1 -1
    cond_count moved to SELECT_LEX_NODE

  sql/sql_class.cc
    1.105.1.12 03/06/26 11:09:00 bell@sanja.is.com.ua +0 -1
    cond_count moved to SELECT_LEX_NODE

  sql/sql_base.cc
    1.145.1.8 03/06/26 11:09:00 bell@sanja.is.com.ua +3 -3
    cond_count moved to SELECT_LEX_NODE

  sql/item_subselect.cc
    1.60.5.1 03/06/26 11:09:00 bell@sanja.is.com.ua +6 -3
    fixed current_select pointer

  sql/item_cmpfunc.cc
    1.87.1.13 03/06/26 11:09:00 bell@sanja.is.com.ua +1 -1
    cond_count moved to SELECT_LEX_NODE

  mysql-test/t/subselect.test
    1.58.7.1 03/06/26 11:09:00 bell@sanja.is.com.ua +28 -0
    test of bug #726

  mysql-test/r/subselect.result
    1.67.12.1 03/06/26 11:09:00 bell@sanja.is.com.ua +25 -0
    test of bug #726

ChangeSet
  1.1346.200.93 03/06/26 12:49:03 gluh@gluh.mysql.r18.ru +1 -0
  Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
  into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.for_fix

  sql/sql_acl.cc
    1.51.9.2 03/06/26 12:49:00 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1346.254.1 03/06/26 12:47:36 gluh@gluh.mysql.r18.ru +3 -0
  Fix bug #673: MySQL 4.0.13 no SSL connection with mysql client possible

  vio/viosslfactories.c
    1.13 03/06/26 12:47:35 gluh@gluh.mysql.r18.ru +10 -3
    Fix bug #673 MySQL 4.0.13 no SSL connection with mysql client possible

  vio/viossl.c
    1.20 03/06/26 12:47:35 gluh@gluh.mysql.r18.ru +2 -4
    Fix bug #673 MySQL 4.0.13 no SSL connection with mysql client possible

  sql/sql_acl.cc
    1.51.10.1 03/06/26 12:47:34 gluh@gluh.mysql.r18.ru +5 -2
    Fix bug #673 MySQL 4.0.13 no SSL connection with mysql client possible

ChangeSet
  1.1346.253.2 03/06/26 07:56:55 monty@mashka.mysql.fi +5 -0
  Fixed memory allocation in Unique to not allocate too much memory

  sql/uniques.cc
    1.11.1.2 03/06/26 07:56:53 monty@mashka.mysql.fi +3 -3
    Fixed memory allocation in Unique to not allocate too much memory

  sql/sql_class.h
    1.111.1.37 03/06/26 07:56:53 monty@mashka.mysql.fi +22 -20
    Fixed memory allocation in Unique to not allocate too much memory

  sql/net_serv.cc
    1.46.1.12 03/06/26 07:56:53 monty@mashka.mysql.fi +3 -0
    Added comment

  mysys/tree.c
    1.14.1.2 03/06/26 07:56:53 monty@mashka.mysql.fi +5 -0
    Added comment

  myisam/mi_info.c
    1.13 03/06/26 07:56:53 monty@mashka.mysql.fi +7 -5
    Updated comments

ChangeSet
  1.1538.57.4 03/06/26 09:39:23 gluh@gluh.mysql.r18.ru +1 -0
  Bug fixed: mysql-test failure on rpl tests

  scripts/mysql_create_system_tables.sh
    1.5 03/06/26 09:39:10 gluh@gluh.mysql.r18.ru +1 -0
    Fixed bug: mysql-test failure on rpl tests

ChangeSet
  1.1346.253.1 03/06/26 05:38:19 monty@mashka.mysql.fi +9 -0
  LEFT JOIN optimization: Change LEFT JOIN to normal join if possible

  sql/sql_base.cc
    1.117.1.45 03/06/26 05:38:16 monty@mashka.mysql.fi +12 -4
    Heart of LEFT JOIN optimization

  sql/item_strfunc.cc
    1.36.5.1 03/06/26 05:38:16 monty@mashka.mysql.fi +10 -7
    LEFT JOIN optimization

  sql/item_func.h
    1.39.1.20 03/06/26 05:38:16 monty@mashka.mysql.fi +7 -2
    LEFT JOIN optimization

  sql/item_func.cc
    1.60.1.34 03/06/26 05:38:16 monty@mashka.mysql.fi +11 -3
    LEFT JOIN optimization

  sql/item_cmpfunc.h
    1.13.1.15 03/06/26 05:38:16 monty@mashka.mysql.fi +13 -5
    LEFT JOIN optimization

  sql/item_cmpfunc.cc
    1.20.1.32 03/06/26 05:38:16 monty@mashka.mysql.fi +31 -10
    LEFT JOIN optimization

  sql/item.h
    1.20.1.19 03/06/26 05:38:16 monty@mashka.mysql.fi +17 -0
    LEFT JOIN optimization

  mysql-test/t/select.test
    1.12.1.7 03/06/26 05:38:16 monty@mashka.mysql.fi +14 -0
    Added test for LEFT JOIN optimization

  mysql-test/r/select.result
    1.8.1.19 03/06/26 05:38:16 monty@mashka.mysql.fi +32 -2
    Added test for LEFT JOIN optimization

ChangeSet
  1.676.304.1 03/06/25 21:11:23 vva@eagle.mysql.r18.ru +4 -0
  fixed bug with type of user variables (bug #551)

  BitKeeper/etc/logging_ok
    1.153.31.1 03/06/25 21:11:23 vva@eagle.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  sql/item_func.cc
    1.36.1.18 03/06/25 21:11:08 vva@eagle.mysql.r18.ru +1 -0
    fixed bug with type of user variables (bug #551)

  mysql-test/t/user_var.test
    1.3.1.1 03/06/25 21:11:08 vva@eagle.mysql.r18.ru +6 -0
    added tests for user variables comparing (bug #551)

  mysql-test/r/user_var.result
    1.3.1.1 03/06/25 21:11:08 vva@eagle.mysql.r18.ru +8 -0
    added tests for user variables comparing (bug #551)

ChangeSet
  1.1538.62.1 03/06/26 05:06:49 wax@kishkin.ru +2 -0
  Merge kishkin.ru:/home/wax/mysql-4.1 into kishkin.ru:/home/wax/mysql-4g

  sql/item_sum.cc
    1.78 03/06/26 05:06:46 wax@kishkin.ru +0 -0
    Auto merged

  sql/field.h
    1.74 03/06/26 05:06:46 wax@kishkin.ru +0 -0
    Auto merged

ChangeSet
  1.1538.60.4 03/06/25 16:25:03 paul@teton.kitebird.com +23 -0
  modify error message

  sql/share/ukrainian/errmsg.txt
    1.27.1.11 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/swedish/errmsg.txt
    1.64.1.13 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/spanish/errmsg.txt
    1.64.1.11 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/slovak/errmsg.txt
    1.64.1.11 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/serbian/errmsg.txt
    1.18.1.9 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/russian/errmsg.txt
    1.61.1.12 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/romanian/errmsg.txt
    1.62.1.11 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/portuguese/errmsg.txt
    1.64.1.12 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/polish/errmsg.txt
    1.63.1.11 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/norwegian/errmsg.txt
    1.63.1.11 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.11 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/korean/errmsg.txt
    1.63.1.11 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/japanese/errmsg.txt
    1.63.1.11 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/italian/errmsg.txt
    1.70.1.11 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/hungarian/errmsg.txt
    1.65.1.11 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/greek/errmsg.txt
    1.64.1.11 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/german/errmsg.txt
    1.64.1.11 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/french/errmsg.txt
    1.63.1.11 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/estonian/errmsg.txt
    1.64.1.11 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/english/errmsg.txt
    1.70.1.15 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/dutch/errmsg.txt
    1.66.1.11 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/danish/errmsg.txt
    1.62.1.11 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

  sql/share/czech/errmsg.txt
    1.64.1.11 03/06/25 16:24:57 paul@teton.kitebird.com +1 -1
    modify error message

ChangeSet
  1.1538.1.24 03/06/26 00:16:03 bell@sanja.is.com.ua +1 -0
  after merging fix

  mysql-test/r/subselect.result
    1.67.6.3 03/06/26 00:16:01 bell@sanja.is.com.ua +1 -1
    after merging fix

ChangeSet
  1.1538.1.23 03/06/25 23:52:15 bell@sanja.is.com.ua +14 -0
  merged

  sql/sql_select.cc
    1.216.1.9 03/06/25 23:52:13 bell@sanja.is.com.ua +0 -0
    merging

  sql/item_subselect.cc
    1.60.1.3 03/06/25 23:52:13 bell@sanja.is.com.ua +0 -1
    merging

  mysql-test/r/subselect.result
    1.67.6.2 03/06/25 23:52:13 bell@sanja.is.com.ua +0 -1
    merging (wiil be fixed after building)

  sql/table.h
    1.50 03/06/25 23:42:05 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.203.50.1 03/06/25 23:42:05 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_union.cc
    1.74.1.3 03/06/25 23:42:05 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.13.1 03/06/25 23:42:05 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.78.1.1 03/06/25 23:42:05 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_derived.cc
    1.43.1.3 03/06/25 23:42:05 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.h
    1.30 03/06/25 23:42:05 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.53 03/06/25 23:42:05 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.91 03/06/25 23:42:05 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.56.1.17 03/06/25 23:42:05 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.58.1.19 03/06/25 23:42:05 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1538.58.2 03/06/25 19:43:06 monty@mashka.mysql.fi +1 -0
  Fixed slowdown problem on windows

  sql/protocol.cc
    1.56.6.1 03/06/25 19:43:03 monty@mashka.mysql.fi +1 -1
    Fixed slowdown problem on windows

ChangeSet
  1.1346.1.120 03/06/25 18:40:31 Sinisa@sinisa.nasamreza.org +4 -0
  Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
  into sinisa.nasamreza.org:/mnt/work/mysql-4.0

  sql/sql_yacc.yy
    1.145.1.67 03/06/25 18:40:24 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_select.cc
    1.152.1.86 03/06/25 18:40:23 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_parse.cc
    1.218.1.103 03/06/25 18:40:23 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_acl.cc
    1.51.1.50 03/06/25 18:40:23 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

ChangeSet
  1.1346.1.119 03/06/25 18:36:52 Sinisa@sinisa.nasamreza.org +1 -0
  Fix for a bug which results in "Unknown Error".
  
  Query should actually return empty result set, but currently can't, as
  it attempts to store NULL in NOT NULL field, because that is a match
  made by self join conditions.

  sql/sql_select.cc
    1.152.18.1 03/06/25 18:36:47 Sinisa@sinisa.nasamreza.org +8 -1
    Fix for a bug which results in "Unknown Error".
    
    Query should actually return empty result set, but currently can't, as
    it attempts to store NULL in NOT NULL field, because that is a match
    made by self join conditions.

ChangeSet
  1.1538.37.3 03/06/25 18:34:46 Sinisa@sinisa.nasamreza.org +1 -0
  code cleanup

  sql/sql_union.cc
    1.74.3.3 03/06/25 18:34:38 Sinisa@sinisa.nasamreza.org +1 -1
    code cleanup

ChangeSet
  1.1538.60.3 03/06/25 19:50:27 bar@bar.mysql.r18.ru +1 -0
  item_func.cc:
    My stupid typo fix

  sql/item_func.cc
    1.124.1.10 03/06/25 19:49:41 bar@bar.mysql.r18.ru +1 -1
    My stupid typo fix
    ,

ChangeSet
  1.1538.61.1 03/06/25 16:51:00 bell@sanja.is.com.ua +1 -0
  fixed mistyping (BUG #699)

  sql/sql_select.cc
    1.216.16.1 03/06/25 16:50:51 bell@sanja.is.com.ua +2 -2
    fixed mistyping (BUG #699)

ChangeSet
  1.1346.200.91 03/06/25 17:16:53 hf@deer.(none) +1 -0
  Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
  into deer.(none):/home/hf/work/mysql-4.0.674

  sql/sql_select.cc
    1.152.1.85 03/06/25 17:16:51 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1346.243.5 03/06/25 17:15:33 hf@deer.(none) +2 -0
  Testcase for #674 added

  mysql-test/t/sel000100.test
    1.9.1.1 03/06/25 17:15:31 hf@deer.(none) +15 -0
    checking for bug #674 added

  mysql-test/r/sel000100.result
    1.9 03/06/25 17:15:31 hf@deer.(none) +10 -0
    Result of the testcase added

ChangeSet
  1.1538.60.1 03/06/25 15:07:20 bar@bar.mysql.r18.ru +6 -0
  LOCATE(), INSTR(), POSITION(), FIND_IN_SET(), SUBSTRING_INDEX()
  now process arguments according to standard SQL collation determation
  rules.

  sql/item_strfunc.h
    1.63 03/06/25 15:07:18 bar@bar.mysql.r18.ru +1 -1
    LOCATE(), INSTR(), POSITION(), FIND_IN_SET(), SUBSTRING_INDEX()
    now process arguments according to standard SQL collation determation
    rules.

  sql/item_strfunc.cc
    1.125 03/06/25 15:07:18 bar@bar.mysql.r18.ru +11 -0
    LOCATE(), INSTR(), POSITION(), FIND_IN_SET(), SUBSTRING_INDEX()
    now process arguments according to standard SQL collation determation
    rules.

  sql/item_func.h
    1.68.1.10 03/06/25 15:07:17 bar@bar.mysql.r18.ru +3 -6
    LOCATE(), INSTR(), POSITION(), FIND_IN_SET(), SUBSTRING_INDEX()
    now process arguments according to standard SQL collation determation
    rules.

  sql/item_func.cc
    1.124.1.9 03/06/25 15:07:17 bar@bar.mysql.r18.ru +15 -5
    LOCATE(), INSTR(), POSITION(), FIND_IN_SET(), SUBSTRING_INDEX()
    now process arguments according to standard SQL collation determation
    rules.

  mysql-test/t/func_str.test
    1.28 03/06/25 15:07:17 bar@bar.mysql.r18.ru +27 -0
    LOCATE(), INSTR(), POSITION(), FIND_IN_SET(), SUBSTRING_INDEX()
    now process arguments according to standard SQL collation determation
    rules.

  mysql-test/r/func_str.result
    1.30 03/06/25 15:07:17 bar@bar.mysql.r18.ru +27 -0
    LOCATE(), INSTR(), POSITION(), FIND_IN_SET(), SUBSTRING_INDEX()
    now process arguments according to standard SQL collation determation
    rules.

ChangeSet
  1.1346.200.90 03/06/25 11:16:06 lenz@mysql.com +1 -0
   - reverted change from AC_CONFIG_HEADERS to AM_CONFIG_HEADER in configure.in
     again - even though the automake docs consider AM_CONFIG_HEADER obsolete, 
     it currently still breaks for too many people to justify this change
     at the moment.

  configure.in
    1.191.1.86 03/06/25 11:16:03 lenz@mysql.com +1 -1
     - reverted change from AC_CONFIG_HEADERS to AM_CONFIG_HEADER again - even
       though the automake docs consider AM_CONFIG_HEADER obsolete, it currently
       still breaks for too many people to justify this change at the moment.

ChangeSet
  1.1538.59.1 03/06/25 01:19:09 bell@sanja.is.com.ua +7 -0
  Fixed  error handling to be able do not interrupt update (907) (SCRUM)
  fixed bug of current select pointer in subselect execution
  fixed layuot

  sql/sql_select.cc
    1.216.15.2 03/06/25 01:18:58 bell@sanja.is.com.ua +3 -0
    switch on error convering to warnings in select executing if IGNORE option present

  sql/sql_lex.h
    1.102.1.23 03/06/25 01:18:58 bell@sanja.is.com.ua +1 -0
    flag which force converting errors to warnings

  sql/sql_lex.cc
    1.79 03/06/25 01:18:58 bell@sanja.is.com.ua +2 -1
    initialization

  sql/mysqld.cc
    1.356.1.28 03/06/25 01:18:58 bell@sanja.is.com.ua +15 -7
    error converting to warnings if hd->lex.current_select->no_error id true
    layout fixed

  sql/item_subselect.cc
    1.60.3.3 03/06/25 01:18:58 bell@sanja.is.com.ua +6 -3
    fixed bug of current select pointer

  mysql-test/t/subselect.test
    1.58.6.1 03/06/25 01:18:58 bell@sanja.is.com.ua +14 -0
    test of update with IGNORE option and error in subselect

  mysql-test/r/subselect.result
    1.67.11.1 03/06/25 01:18:58 bell@sanja.is.com.ua +13 -0
    test of update with IGNORE option and error in subselect

ChangeSet
  1.1538.55.7 03/06/24 10:43:57 venu@myvenu.com +1 -0
    test for SQL_MODE with PIPES_AS_CONCAT, ANSI and IGNORE_SPACE

  tests/client_test.c
    1.33 03/06/24 10:42:23 venu@myvenu.com +135 -4
    test for SQL_MODE with PIPES_AS_CONCAT, ANSI and IGNORE_SPACE

ChangeSet
  1.1538.55.6 03/06/24 17:12:07 bar@bar.mysql.r18.ru +6 -0
  String comparison functions now use the same DTCollation with
  CONCAT() and other string functions. This allows to reuse a lot
  if code and to simplify further development.

  sql/item_strfunc.cc
    1.124 03/06/24 17:12:05 bar@bar.mysql.r18.ru +21 -29
    String comparison functions now use the same DTCollation with
    CONCAT() and other string functions. This allows to reuse a lot
    if code and to simplify further development.

  sql/item_func.cc
    1.124.1.8 03/06/24 17:12:04 bar@bar.mysql.r18.ru +2 -3
    String comparison functions now use the same DTCollation with
    CONCAT() and other string functions. This allows to reuse a lot
    if code and to simplify further development.

  sql/item_cmpfunc.h
    1.50.1.5 03/06/24 17:12:04 bar@bar.mysql.r18.ru +5 -5
    String comparison functions now use the same DTCollation with
    CONCAT() and other string functions. This allows to reuse a lot
    if code and to simplify further development.

  sql/item_cmpfunc.cc
    1.87.1.12 03/06/24 17:12:04 bar@bar.mysql.r18.ru +35 -100
    String comparison functions now use the same DTCollation with
    CONCAT() and other string functions. This allows to reuse a lot
    if code and to simplify further development.

  sql/item.h
    1.56.6.7 03/06/24 17:12:04 bar@bar.mysql.r18.ru +6 -6
    String comparison functions now use the same DTCollation with
    CONCAT() and other string functions. This allows to reuse a lot
    if code and to simplify further development.

  sql/item.cc
    1.58.14.3 03/06/24 17:12:04 bar@bar.mysql.r18.ru +42 -25
    String comparison functions now use the same DTCollation with
    CONCAT() and other string functions. This allows to reuse a lot
    if code and to simplify further development.

ChangeSet
  1.1346.247.2 03/06/24 17:07:43 hf@deer.(none) +2 -0
  Test case for bug #666

  mysql-test/t/func_str.test
    1.15.2.3 03/06/24 17:07:42 hf@deer.(none) +12 -0
    test for bug #666

  mysql-test/r/func_str.result
    1.16.2.4 03/06/24 17:07:42 hf@deer.(none) +13 -0
    test for bug #666 result 

ChangeSet
  1.1538.55.5 03/06/24 15:55:39 bar@bar.mysql.r18.ru +1 -0
  mysql_create_system_tables.sh:
    Type fix

  scripts/mysql_create_system_tables.sh
    1.4 03/06/24 15:55:21 bar@bar.mysql.r18.ru +2 -2
    Type fix

ChangeSet
  1.1538.58.1 03/06/24 13:43:36 monty@mashka.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mashka.mysql.fi:/home/my/mysql-4.1

  BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43
    1.35 03/06/24 13:43:32 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43
    1.29.1.2 03/06/24 13:11:42 monty@mashka.mysql.fi +0 -0
    Merge rename: Docs/internals.texi -> BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43

ChangeSet
  1.1538.56.1 03/06/24 15:11:07 bar@bar.mysql.r18.ru +11 -0
  New class DTCollation (SQL:2003 calls it "declared type collation")
  It's a combination of collation and its derivation (precedence order)

  sql/sql_class.h
    1.146.1.26 03/06/24 15:11:05 bar@bar.mysql.r18.ru +1 -2
    New class DTCollation (SQL:2003 calls it "declared type collation")
    It's a combination of collation and its derivation (precedence order)

  sql/log_event.cc
    1.113.1.9 03/06/24 15:11:05 bar@bar.mysql.r18.ru +1 -1
    New class DTCollation (SQL:2003 calls it "declared type collation")
    It's a combination of collation and its derivation (precedence order)

  sql/item_strfunc.h
    1.62 03/06/24 15:11:04 bar@bar.mysql.r18.ru +5 -5
    New class DTCollation (SQL:2003 calls it "declared type collation")
    It's a combination of collation and its derivation (precedence order)

  sql/item_strfunc.cc
    1.123 03/06/24 15:11:04 bar@bar.mysql.r18.ru +53 -75
    New class DTCollation (SQL:2003 calls it "declared type collation")
    It's a combination of collation and its derivation (precedence order)

  sql/item_func.h
    1.68.1.9 03/06/24 15:11:04 bar@bar.mysql.r18.ru +1 -1
    New class DTCollation (SQL:2003 calls it "declared type collation")
    It's a combination of collation and its derivation (precedence order)

  sql/item_func.cc
    1.124.1.7 03/06/24 15:11:04 bar@bar.mysql.r18.ru +23 -20
    New class DTCollation (SQL:2003 calls it "declared type collation")
    It's a combination of collation and its derivation (precedence order)

  sql/item_create.cc
    1.33.3.1 03/06/24 15:11:04 bar@bar.mysql.r18.ru +1 -1
    New class DTCollation (SQL:2003 calls it "declared type collation")
    It's a combination of collation and its derivation (precedence order)

  sql/item_cmpfunc.h
    1.50.1.4 03/06/24 15:11:04 bar@bar.mysql.r18.ru +2 -2
    New class DTCollation (SQL:2003 calls it "declared type collation")
    It's a combination of collation and its derivation (precedence order)

  sql/item_cmpfunc.cc
    1.87.1.11 03/06/24 15:11:04 bar@bar.mysql.r18.ru +35 -35
    New class DTCollation (SQL:2003 calls it "declared type collation")
    It's a combination of collation and its derivation (precedence order)

  sql/item.h
    1.56.6.6 03/06/24 15:11:04 bar@bar.mysql.r18.ru +80 -29
    New class DTCollation (SQL:2003 calls it "declared type collation")
    It's a combination of collation and its derivation (precedence order)

  sql/item.cc
    1.58.14.2 03/06/24 15:11:04 bar@bar.mysql.r18.ru +11 -13
    New class DTCollation (SQL:2003 calls it "declared type collation")
    It's a combination of collation and its derivation (precedence order)

ChangeSet
  1.1524.23.1 03/06/24 13:09:48 monty@mashka.mysql.fi +1 -0
  indentation change

  Docs/internals.texi
    1.29.1.1 03/06/24 13:09:45 monty@mashka.mysql.fi +12 -11
    indentation change

ChangeSet
  1.1538.52.3 03/06/24 12:10:35 monty@narttu.mysql.fi +21 -0
  Fixed some new memory leaks
  Updated VC++ files

  sql/sql_help.cc
    1.15 03/06/24 12:10:33 monty@narttu.mysql.fi +22 -3
    Fixed memory leak

  sql/sql_client.cc
    1.1.1.1 03/06/24 12:10:33 monty@narttu.mysql.fi +1 -1
    Portability fix

  sql/slave.cc
    1.188.1.12 03/06/24 12:10:33 monty@narttu.mysql.fi +5 -4
    Cleanup

  sql/item_sum.cc
    1.77 03/06/24 12:10:33 monty@narttu.mysql.fi +2 -1
    Removed compiler warning

  sql-common/client.c
    1.11.1.1 03/06/24 12:10:33 monty@narttu.mysql.fi +8 -7
    Fixed memory leak

  scripts/mysql_fix_privilege_tables.sh
    1.15 03/06/24 12:10:33 monty@narttu.mysql.fi +3 -0
    Allow on to run this from the source distribution

  scripts/mysql_create_system_tables.sh
    1.3 03/06/24 12:10:33 monty@narttu.mysql.fi +5 -6
    Change so that localhost has full access (to make this like 4.0)

  scripts/make_win_src_distribution.sh
    1.10 03/06/24 12:10:32 monty@narttu.mysql.fi +3 -2
    Fixed typo
    Don't run zip in verbose mode

  myisam/mi_preload.c
    1.2 03/06/24 12:10:32 monty@narttu.mysql.fi +9 -13
    Fixed compiler warning.
    Small code cleanup

  libmysqld/libmysqld.def
    1.3 03/06/24 12:10:32 monty@narttu.mysql.fi +124 -59
    sort functions to enable comparison with libmysql.def
    Added missing functions

  libmysqld/libmysqld.c
    1.35.1.1 03/06/24 12:10:32 monty@narttu.mysql.fi +99 -3
    Add missing client functions to embedded server

  libmysql/libmysql.def
    1.16 03/06/24 12:10:32 monty@narttu.mysql.fi +63 -84
    sort functions to enable comparison with libmysqld.def

  include/mysql.h
    1.70.1.3 03/06/24 12:10:32 monty@narttu.mysql.fi +1 -0
    Add missing client functions to embedded server

  VC++Files/sql/mysqld.dsp
    1.15 03/06/24 12:10:32 monty@narttu.mysql.fi +15 -11
    Update of VC++ files

  VC++Files/mysql.dsw
    1.9 03/06/24 12:10:32 monty@narttu.mysql.fi +0 -9
    Update of VC++ files

  VC++Files/myisam/myisam.dsp
    1.7 03/06/24 12:10:32 monty@narttu.mysql.fi +4 -0
    Update of VC++ files

  VC++Files/libmysqld/libmysqld.dsp
    1.9 03/06/24 12:10:32 monty@narttu.mysql.fi +46 -4
    Update of VC++ files

  VC++Files/libmysqld/libmysqld.def
    1.2 03/06/24 12:10:32 monty@narttu.mysql.fi +124 -59
    Update of VC++ files

  VC++Files/libmysqld/examples/test_libmysqld.dsp
    1.4 03/06/24 12:10:32 monty@narttu.mysql.fi +18 -6
    Update of VC++ files

  VC++Files/client/mysqlclient.dsp
    1.16 03/06/24 12:10:32 monty@narttu.mysql.fi +3 -23
    Update of VC++ files

  VC++Files/client/mysql.dsp
    1.7 03/06/24 12:10:32 monty@narttu.mysql.fi +9 -1
    Update of VC++ files

ChangeSet
  1.1538.55.2 03/06/24 13:37:11 bar@bar.mysql.r18.ru +3 -0
  Item character set is stored in Item itself now, not in ITem->str_value

  sql/sql_select.cc
    1.216.15.1 03/06/24 13:37:08 bar@bar.mysql.r18.ru +2 -2
    Item character set is stored in Item itself now, not in ITem->str_value

  sql/item.h
    1.56.6.5 03/06/24 13:37:08 bar@bar.mysql.r18.ru +10 -8
    Item character set is stored in Item itself now, not in ITem->str_value

  sql/item.cc
    1.58.14.1 03/06/24 13:37:08 bar@bar.mysql.r18.ru +3 -1
    Item character set is stored in Item itself now, not in ITem->str_value

ChangeSet
  1.1346.246.2 03/06/24 10:53:21 hf@deer.(none) +4 -0
  Another bugfix for #615
  Looks a bit nicer than previous one

  sql/field_conv.cc
    1.6.1.5 03/06/24 10:53:19 hf@deer.(none) +2 -4
    Now we can just replace field->reset() with field->set_default() here

  sql/field.h
    1.33.1.18 03/06/24 10:53:19 hf@deer.(none) +4 -2
    Field::set_default fixed

  mysql-test/t/insert.test
    1.8.1.1 03/06/24 10:53:19 hf@deer.(none) +12 -0
    testcase for the bug added

  mysql-test/r/insert.result
    1.9.1.1 03/06/24 10:53:19 hf@deer.(none) +10 -0
    Test results added

ChangeSet
  1.1346.200.88 03/06/23 23:32:07 monty@narttu.mysql.fi +1 -0
  Changed connect with timeout to use poll() instead if socket() to avoid problems with many open files

  libmysql/libmysql.c
    1.95.1.32 03/06/23 23:32:03 monty@narttu.mysql.fi +67 -27
    Changed connect with timeout to use poll() instead if socket() to avoid problems with many open files

ChangeSet
  1.1346.200.87 03/06/23 20:05:54 monty@narttu.mysql.fi +6 -0
  Simple code cleanup

  sql/sql_select.cc
    1.152.17.1 03/06/23 20:05:53 monty@narttu.mysql.fi +7 -7
    Simple code cleanup

  sql/sql_repl.cc
    1.86.1.13 03/06/23 20:05:53 monty@narttu.mysql.fi +0 -5
    Comment cleanup

  sql/slave.cc
    1.164.1.68 03/06/23 20:05:53 monty@narttu.mysql.fi +13 -19
    Indentation fixes and comments cleanup

  sql/log_event.cc
    1.77.1.37 03/06/23 20:05:53 monty@narttu.mysql.fi +3 -3
    Fixed usage of fn_format()

  mysys/mf_pack.c
    1.14 03/06/23 20:05:53 monty@narttu.mysql.fi +19 -7
    Added comments

  mysql-test/r/innodb.result
    1.40.1.28 03/06/23 20:05:53 monty@narttu.mysql.fi +4 -4
    Fixed test case after innodb optimize->analyze fix

ChangeSet
  1.1346.200.86 03/06/23 20:03:59 monty@narttu.mysql.fi +4 -0
   SHOW GRANTS hided real grants when grants on both column and table (Bug 654)

  sql/sql_acl.h
    1.14.1.4 03/06/23 20:03:57 monty@narttu.mysql.fi +2 -2
    Fixed grant bug

  sql/sql_acl.cc
    1.51.9.1 03/06/23 20:03:57 monty@narttu.mysql.fi +203 -158
    SHOW GRANTS hided real grants when grants on both column and table (Bug 654)
    Code cleanup (Bigger than intended because of editor problem)

  mysql-test/t/grant.test
    1.4.1.1 03/06/23 20:03:57 monty@narttu.mysql.fi +32 -2
    Test of grant BUG

  mysql-test/r/grant.result
    1.5.1.1 03/06/23 20:03:57 monty@narttu.mysql.fi +42 -5
    Test of grant BUG

ChangeSet
  1.1346.1.118 03/06/23 16:05:22 Sinisa@sinisa.nasamreza.org +1 -0
  Removing one fix.

  sql/sql_acl.cc
    1.51.1.49 03/06/23 16:05:18 Sinisa@sinisa.nasamreza.org +4 -9
    Removing one fix.

ChangeSet
  1.1346.252.1 03/06/23 12:49:38 serg@sergbook.mylan +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.0
  into sergbook.mylan:/usr/home/serg/Abk/mysql-4.0

  BitKeeper/etc/logging_ok
    1.206.1.71 03/06/23 12:49:21 serg@sergbook.mylan +0 -0
    auto-union

ChangeSet
  1.1346.251.1 03/06/23 12:48:55 serg@sergbook.mylan +2 -0
  fixed bug in references column grants

  BitKeeper/etc/logging_ok
    1.206.23.1 03/06/23 12:48:55 serg@sergbook.mylan +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_acl.h
    1.14.1.3 03/06/23 12:48:48 serg@sergbook.mylan +2 -2
    fixed bug in references column grants

ChangeSet
  1.1346.200.84 03/06/23 13:04:21 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/ha_innodb.h
    1.48.2.11 03/06/23 13:04:19 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.73.1.103 03/06/23 13:04:19 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.250.1 03/06/23 13:03:04 monty@narttu.mysql.fi +2 -0
  Added analyze as alias for optimize

  sql/ha_innodb.h
    1.48.4.1 03/06/23 13:03:03 monty@narttu.mysql.fi +1 -0
    Added analyze as alias for optimize

  sql/ha_innodb.cc
    1.73.14.1 03/06/23 13:03:03 monty@narttu.mysql.fi +6 -0
    Added analyze as alias for optimize

ChangeSet
  1.1538.51.5 03/06/23 13:02:28 gluh@gluh.mysql.r18.ru +8 -0
  Merge gluh@gw:/home/bk/mysql-4.1
  into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC

  sql/time.cc
    1.31 03/06/23 13:02:25 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.203.1.50 03/06/23 13:02:23 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/protocol.cc
    1.56.5.1 03/06/23 13:02:23 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.16 03/06/23 13:02:23 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/lex.h
    1.82.1.36 03/06/23 13:02:23 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/item_create.h
    1.28 03/06/23 13:02:23 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/item_create.cc
    1.33.1.11 03/06/23 13:02:22 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/field.cc
    1.106.1.2 03/06/23 13:02:22 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1538.54.1 03/06/23 12:56:44 gluh@gluh.mysql.r18.ru +12 -0
  Internal commit

  mysql-test/t/func_sapdb.test
    1.1 03/06/23 12:56:32 gluh@gluh.mysql.r18.ru +97 -0

  mysql-test/t/func_sapdb.test
    1.0 03/06/23 12:56:32 gluh@gluh.mysql.r18.ru +0 -0
    BitKeeper file /home/gluh/mysql-4.1.DTFUNC/mysql-test/t/func_sapdb.test

  mysql-test/r/func_sapdb.result
    1.1 03/06/23 12:56:31 gluh@gluh.mysql.r18.ru +194 -0

  sql/time.cc
    1.29.1.1 03/06/23 12:56:31 gluh@gluh.mysql.r18.ru +12 -1
    Internal commit

  sql/sql_yacc.yy
    1.203.49.1 03/06/23 12:56:31 gluh@gluh.mysql.r18.ru +33 -0
    Internal commit

  sql/protocol.cc
    1.56.4.1 03/06/23 12:56:31 gluh@gluh.mysql.r18.ru +4 -0
    Internal commit

  sql/mysql_priv.h
    1.186.10.1 03/06/23 12:56:31 gluh@gluh.mysql.r18.ru +1 -0
    Internal commit

  sql/lex.h
    1.82.12.1 03/06/23 12:56:31 gluh@gluh.mysql.r18.ru +14 -2
    Internal commit

  sql/item_timefunc.h
    1.31 03/06/23 12:56:31 gluh@gluh.mysql.r18.ru +158 -3
    Internal commit

  sql/item_timefunc.cc
    1.36 03/06/23 12:56:31 gluh@gluh.mysql.r18.ru +508 -26
    Internal commit

  sql/item_create.h
    1.26.1.1 03/06/23 12:56:31 gluh@gluh.mysql.r18.ru +7 -0
    Internal commit

  sql/item_create.cc
    1.33.2.1 03/06/23 12:56:31 gluh@gluh.mysql.r18.ru +35 -0
    Internal commit

  sql/field.cc
    1.105.2.1 03/06/23 12:56:31 gluh@gluh.mysql.r18.ru +2 -0
    Internal commit

  mysql-test/r/func_sapdb.result
    1.0 03/06/23 12:56:31 gluh@gluh.mysql.r18.ru +0 -0
    BitKeeper file /home/gluh/mysql-4.1.DTFUNC/mysql-test/r/func_sapdb.result

ChangeSet
  1.1346.200.83 03/06/23 12:03:50 gluh@gluh.mysql.r18.ru +1 -0
  Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
  into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.defweek

  sql/mysqld.cc
    1.297.1.141 03/06/23 12:03:48 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1346.249.3 03/06/22 16:20:06 heikki@hundin.mysql.fi +3 -0
  dict0dict.h, dict0dict.c, ha_innodb.cc:
    In ORDER BY MySQL seems to set the key read flag also in the case where the primary key contains only a prefix of a column - not the whole column; to prevent potential bugs retrieve the whole column if the index contains a prefix of it

  innobase/include/dict0dict.h
    1.17 03/06/22 16:19:52 heikki@hundin.mysql.fi +10 -0
    In ORDER BY MySQL seems to set the key read flag also in the case where the primary key contains only a prefix of a column - not the whole column; to prevent potential bugs retrieve the whole column if the index contains a prefix of it

  innobase/dict/dict0dict.c
    1.26.1.4 03/06/22 16:19:45 heikki@hundin.mysql.fi +40 -0
    In ORDER BY MySQL seems to set the key read flag also in the case where the primary key contains only a prefix of a column - not the whole column; to prevent potential bugs retrieve the whole column if the index contains a prefix of it

  sql/ha_innodb.cc
    1.73.1.102 03/06/22 16:19:34 heikki@hundin.mysql.fi +7 -4
    In ORDER BY MySQL seems to set the key read flag also in the case where the primary key contains only a prefix of a column - not the whole column; to prevent potential bugs retrieve the whole column if the index contains a prefix of it

ChangeSet
  1.1346.249.2 03/06/22 14:10:46 guilhem@mysql.com +2 -0
  Fixed cleanup_load_tmpdir() which deleted nothing.

  sql/sql_repl.cc
    1.86.1.12 03/06/22 14:10:39 guilhem@mysql.com +6 -3
    - fix fake_rotate_event() for pos>4G (correction of a change I pushed yesterday).

  sql/log_event.cc
    1.77.1.36 03/06/22 14:10:39 guilhem@mysql.com +6 -3
    - cleanup_load_tmpdir() did not work at all because it forgot to indicate
    the directory part of the path when calling my_delete().
    - A misplaced R_POS_OFFSET (fortunately this was no bug as this constant is 0).

ChangeSet
  1.1346.249.1 03/06/21 18:10:59 guilhem@mysql.com +3 -0
  Always send a fake Rotate event (this is roughly 70 bytes) when starting binlog_dump.
  This way 3.23.58 slaves will always detect a 4.0.14 master (and stop)
  immediately. BUG#198.

  sql/sql_repl.cc
    1.86.1.11 03/06/21 18:10:54 guilhem@mysql.com +29 -14
    Always send a fake Rotate event (this is roughly 70 bytes) when starting binlog_dump.
    This way 3.23.58 slaves will always detect a 4.0.14 master (and stop)
    immediately. BUG#198.

  mysql-test/r/rpl_log_pos.result
    1.22.1.2 03/06/21 18:10:54 guilhem@mysql.com +1 -1
    result update (the relay log now contains a fake Rotate_log_event).

  mysql-test/r/rpl_log.result
    1.26.1.4 03/06/21 18:10:53 guilhem@mysql.com +1 -1
    result update (the relay log now contains a fake Rotate_log_event).

ChangeSet
  1.1346.248.1 03/06/21 20:17:50 hf@deer.(none) +1 -0
  Fix for bug #628

  sql/item_strfunc.cc
    1.36.4.1 03/06/21 20:17:41 hf@deer.(none) +1 -1
    just silly mistake
    pos was set outside alloced space

ChangeSet
  1.1538.51.3 03/06/21 19:42:36 bk@mysql.r18.ru +1 -0
  Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.r18.ru:/usr/home/bk/mysql-4.1

  BitKeeper/etc/logging_ok
    1.233.10.2 03/06/21 19:42:25 bk@mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

ChangeSet
  1.676.1.718 03/06/21 16:32:27 guilhem@mysql.com +1 -0
  Can't believe it: one more cset (04-27) which never found his way to the central
  repository (incredible that I forgot to push, but why not).
  So unfortunately the bugfix missed 3.23.57 and will be in .58 :(
  Instead of looking like working (bug #198), replication between
  a 3.23 slave and 4.0 master should frankly stop. Here we detect
  4.0 masters in the 3.23 slave code when we see a strange Rotate
  event, and in that case we print an error and stop.
  4.0.13 and older masters will be "often" caught (see the patch); 4.0.14
  and newer masters will always be immediately caught.

  sql/slave.cc
    1.100.1.39 03/06/21 16:32:23 guilhem@mysql.com +22 -0
    Instead of looking like working (bug #198), replication between
    a 3.23 slave and 4.0 master should frankly stop. Here we detect
    4.0 masters in the 3.23 slave code when we see a strange Rotate
    event, and in that case we print an error and stop.
    4.0.13 and older masters will be "often" caught (see the patch); 4.0.14
    and newer masters will always be immediately caught.

ChangeSet
  1.1346.243.4 03/06/21 16:59:40 hf@deer.(none) +1 -0
  Proposed fix for #674
  
  This crash happens in rather exotic case when we try to run 
  SELECT DISTINCT some_func(SUM(some_field)) GROUP BY another_field;
  on a table with single row.
  Optimizer marks this table as const, sets group=NULL (with remove_const)
  thus, create_tmp_table makes mistake collecting columns for temporary table
  and then crashes because the field_count gets less than hidden_columns_count.

  sql/sql_select.cc
    1.152.1.84 03/06/21 16:59:29 hf@deer.(none) +3 -0
    There's several ways to fix this bug.
    This one looks easy and correct to me

ChangeSet
  1.1346.247.1 03/06/20 20:04:52 hf@deer.(none) +1 -0
  Fix for bug #666 (Nice number, yeah?)

  sql/item_strfunc.cc
    1.36.1.25 03/06/20 20:04:38 hf@deer.(none) +21 -12
    Item_func_elt::valXXX() functions don't expect NULL argument if it is 
    not the first one.

ChangeSet
  1.1538.53.3 03/06/20 19:05:45 bar@bar.mysql.r18.ru +1 -0
  item_cmpfunc.cc:
    Temporarily fix for test failure
    ,.

  sql/item_cmpfunc.cc
    1.87.1.10 03/06/20 19:04:38 bar@bar.mysql.r18.ru +7 -0
    Temporarily fix for test failure
    ,.

ChangeSet
  1.1346.246.1 03/06/20 18:52:40 hf@deer.(none) +1 -0
  Proposed fix for #615
  So now for the CREATE TABLE foo (id integer NOT NULL default 9)
  INSERT INTO foo VALUES (NULL); we get an error
  INSERT INTO foo VALUES (1), (NULL), (2); we get one warning
            and second record is set to 9
  
  Is that what we want?

  sql/field_conv.cc
    1.6.1.4 03/06/20 18:52:30 hf@deer.(none) +2 -0
    field->set_default() calls added

ChangeSet
  1.1346.245.1 03/06/20 15:48:52 guilhem@mysql.com +1 -0
  fix for BUG#691 (4.0 mysqlbinlog couldn't read 3.23 binlog).
  Safe parenthesis.

  client/mysqlbinlog.cc
    1.70.1.4 03/06/20 15:48:42 guilhem@mysql.com +2 -2
    fix for BUG#691 (4.0 mysqlbinlog couldn't read 3.23 binlog).
    Safe parenthesis.

ChangeSet
  1.1538.53.2 03/06/20 18:45:28 bar@bar.mysql.r18.ru +1 -0
  item_cmpfunc.cc:
    Rewritten in nicer way
    ,

  sql/item_cmpfunc.cc
    1.87.1.9 03/06/20 18:45:00 bar@bar.mysql.r18.ru +37 -24
    Rewritten in nicer way
    ,

ChangeSet
  1.1346.244.1 03/06/20 15:19:51 lenz@mysql.com +1 -0
   - added $(EXEEXT) to gen_lex_hash generation/execution to fix a build
     problem on Windows/cygwin (BUG#668)

  sql/Makefile.am
    1.66.1.8 03/06/20 15:19:47 lenz@mysql.com +2 -2
     - added $(EXEEXT) to gen_lex_hash generation/execution to fix a build
       problem on Windows/cygwin (BUG#668)

ChangeSet
  1.1538.53.1 03/06/20 13:57:51 lenz@kallisto.local +1 -0
   - make sure that scripts/*.sql files are being added to the source
     distribution as well

  scripts/Makefile.am
    1.31 03/06/20 13:57:43 lenz@mysql.com +1 -1
     - make sure that scripts/*.sql files are being added to the source
       distribution as well

ChangeSet
  1.1346.243.1 03/06/20 13:54:22 guilhem@mysql.com +1 -0
  Warn that --log-slave-updates is used without --log-bin and disabled (WL#998)

  sql/mysqld.cc
    1.297.32.1 03/06/20 13:54:12 guilhem@mysql.com +6 -0
    Warn that --log-slave-updates is used without --log-bin and disabled.

ChangeSet
  1.1538.52.1 03/06/20 13:40:21 bell@sanja.is.com.ua +4 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc-4.1

  sql/sql_yacc.yy
    1.203.1.49 03/06/20 13:40:18 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.1.6 03/06/20 13:40:18 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.1.22 03/06/20 13:40:18 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.78 03/06/20 13:40:17 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1538.51.2 03/06/20 14:53:37 ram@mysql.r18.ru +5 -0
  Renamed xxx_as_text() and xxx__from_text().

  sql/spatial.h
    1.7 03/06/20 14:53:34 ram@mysql.r18.ru +21 -21
    Renamed xxx_as_text() and xxx__from_text().

  sql/spatial.cc
    1.12 03/06/20 14:53:34 ram@mysql.r18.ru +45 -45
    Renamed xxx_as_text() and xxx__from_text().

  sql/item_geofunc.h
    1.2 03/06/20 14:53:34 ram@mysql.r18.ru +2 -2
    Renamed xxx_as_text() and xxx__from_text().

  sql/item_geofunc.cc
    1.4 03/06/20 14:53:34 ram@mysql.r18.ru +2 -2
    Renamed xxx_as_text() and xxx__from_text().

  sql/item_create.cc
    1.33.1.10 03/06/20 14:53:34 ram@mysql.r18.ru +1 -1
    Renamed xxx_as_text() and xxx__from_text().

ChangeSet
  1.1538.51.1 03/06/20 14:31:47 ram@mysql.r18.ru +3 -0
  Added AsWKT() alias for AsText().
  Renamed as_text().

  sql/lex.h
    1.82.1.35 03/06/20 14:31:23 ram@mysql.r18.ru +2 -1
    Added AsWKT() alias for AsText().

  sql/item_create.h
    1.27 03/06/20 14:31:23 ram@mysql.r18.ru +1 -1
    Renamed as_text().

  sql/item_create.cc
    1.33.1.9 03/06/20 14:31:22 ram@mysql.r18.ru +1 -1
    Renamed as_text().

ChangeSet
  1.1538.50.2 03/06/20 10:15:58 bell@sanja.is.com.ua +3 -0
  fixed BUG #679
  
  outer resolved fields now do not marked as dependent if they is not really belong to outer SELECT
  one-letter variables name fixed

  sql/item.cc
    1.58.10.4 03/06/20 10:15:40 bell@sanja.is.com.ua +51 -27
    outer resolved fields now do not marked as dependent if they is not really belong to outer SELECT
    one-letter variables name fixed
     

  mysql-test/t/subselect.test
    1.58.2.5 03/06/20 10:15:40 bell@sanja.is.com.ua +10 -0
    test of bug 679

  mysql-test/r/subselect.result
    1.67.10.1 03/06/20 10:15:40 bell@sanja.is.com.ua +5 -0
    test of bug 679

ChangeSet
  1.1346.242.3 03/06/19 22:06:51 hf@deer.(none) +1 -0
  Bug #570 fixed

  sql/sql_update.cc
    1.54.1.34 03/06/19 22:06:50 hf@deer.(none) +2 -1
    field_list_in_tables needs TABLE_LIST::alias to be initialized

ChangeSet
  1.1346.242.2 03/06/19 12:38:14 miguel@hegel.(none) +2 -0
  Fix error msg. Bug #681

  BitKeeper/etc/logging_ok
    1.206.1.70 03/06/19 12:38:13 miguel@hegel.(none) +1 -0
    Logging to logging@openlogging.org accepted

  sql/nt_servc.cc
    1.11.1.1 03/06/19 12:37:44 miguel@hegel.(none) +1 -1
    Fix error msg. Bug #681

ChangeSet
  1.1538.50.1 03/06/19 12:17:23 miguel@hegel.(none) +2 -0
  Fix error msg. Bug #681

  BitKeeper/etc/logging_ok
    1.233.10.1 03/06/19 12:17:22 miguel@hegel.(none) +1 -0
    Logging to logging@openlogging.org accepted

  sql/nt_servc.cc
    1.13 03/06/19 12:16:41 miguel@hegel.(none) +1 -1
    Fix error msg. Bug #681

ChangeSet
  1.676.1.717 03/06/19 12:09:32 miguel@hegel.(none) +1 -0
  Fix error msg. Bug #681

  sql/nt_servc.cc
    1.7.1.2 03/06/19 12:09:30 miguel@hegel.(none) +1 -1
    Fix error msg. Bug #681

ChangeSet
  1.1538.6.4 03/06/19 16:15:11 bell@sanja.is.com.ua +3 -0
  merging

  mysql-test/t/subselect.test
    1.58.1.7 03/06/19 16:15:10 bell@sanja.is.com.ua +0 -1
    merging

  mysql-test/r/subselect.result
    1.67.7.4 03/06/19 16:15:10 bell@sanja.is.com.ua +0 -0
    merging

  sql/sql_select.cc
    1.216.12.3 03/06/19 16:12:57 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1538.6.3 03/06/19 16:08:11 bell@sanja.is.com.ua +1 -0
  after merge fix

  mysql-test/r/func_group.result
    1.16 03/06/19 16:08:09 bell@sanja.is.com.ua +0 -2
    after merge fix

ChangeSet
  1.1538.6.2 03/06/19 15:25:41 bell@sanja.is.com.ua +7 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-item-4.1

  sql/sql_yacc.yy
    1.203.39.7 03/06/19 15:25:38 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_union.cc
    1.74.2.3 03/06/19 15:25:38 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.12.2 03/06/19 15:25:38 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.9.3 03/06/19 15:25:38 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_sum.cc
    1.76 03/06/19 15:25:37 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.cc
    1.60.3.2 03/06/19 15:25:37 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.58.10.3 03/06/19 15:25:37 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1538.46.3 03/06/19 13:46:10 lenz@kallisto.local +1 -0
   - added missing include/sql_state.h to source distribution

  include/Makefile.am
    1.42 03/06/19 13:46:08 lenz@mysql.com +2 -1
     - added missing sql_state.h to source distribution

ChangeSet
  1.1538.24.18 03/06/19 16:38:51 hf@deer.(none) +1 -0
  Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into deer.(none):/home/hf/work/mysql-4.1.2way

  BitKeeper/etc/logging_ok
    1.233.1.17 03/06/19 16:38:43 hf@deer.(none) +0 -0
    auto-union

ChangeSet
  1.1538.24.17 03/06/19 16:38:21 hf@deer.(none) +4 -0
  SCRUM
  client code added to the embedded library
  some fixes

  sql-common/client.c
    1.15 03/06/19 16:38:19 hf@deer.(none) +0 -9
    we don't need that ugly wrapper

  libmysqld/lib_sql.cc
    1.56 03/06/19 16:38:19 hf@deer.(none) +2 -1
    errors stored in the same place for embedded and client libraries now

  libmysqld/embedded_priv.h
    1.6 03/06/19 16:38:19 hf@deer.(none) +0 -2
    this declaration obsolete

  include/mysql.h
    1.76 03/06/19 16:38:19 hf@deer.(none) +3 -32
    test code removed
    simple_command is the macrodefinition now

ChangeSet
  1.1346.242.1 03/06/19 15:38:52 gluh@gluh.mysql.r18.ru +1 -0
  Fix for bug #616 mysqld crash / SSL with SQLyog

  sql/sql_parse.cc
    1.218.25.6 03/06/19 15:38:50 gluh@gluh.mysql.r18.ru +5 -0
    Fix for bug #616 mysqld crash / SSL with SQLyog

ChangeSet
  1.1538.49.1 03/06/19 12:19:28 lenz@mysql.com +1 -0
  Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/space/my/mysql-4.1

  sql/item_strfunc.cc
    1.122 03/06/19 12:19:25 lenz@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1538.46.2 03/06/19 12:18:04 lenz@kallisto.local +1 -0
   - revert wrong include of zlib.h as zlib is not part of the source 
     distribution - better use -I../zlib where appropriate (usually we use
     the zlib installed in the system)

  sql/item_strfunc.cc
    1.120.1.1 03/06/19 12:18:01 lenz@mysql.com +1 -1
     - revert wrong include of zlib.h as zlib is not part of the source 
       distribution - better use -I../zlib where appropriate (usually we use
       the zlib installed in the system)

ChangeSet
  1.1538.48.1 03/06/19 02:39:46 igor@rurik.mysql.com +1 -0
  Merge rurik.mysql.com:/home/igor/mysql-4.1
  into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  sql/sql_yacc.yy
    1.203.42.11 03/06/19 02:39:42 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1538.47.1 03/06/19 02:34:33 igor@rurik.mysql.com +4 -0
  preload.result, preload.test:
    Removed non-generic info (key used blocks)
  preload.result, preload.test, lex.h, sql_yacc.yy:
    Syntax change for preload statement

  mysql-test/r/preload.result
    1.3 03/06/19 02:10:14 igor@rurik.mysql.com +15 -62
    Removed non-generic info (key used blocks)

  mysql-test/t/preload.test
    1.3 03/06/19 02:09:15 igor@rurik.mysql.com +15 -16
    Removed non-generic info (key used blocks)

ChangeSet
  1.1346.200.82 03/06/19 14:02:19 gluh@gluh.mysql.r18.ru +6 -0
  SCRUM
  
  Task ID 894:
  Backport default_week_format variable to 4.0

  sql/sql_yacc.yy
    1.145.18.1 03/06/19 14:02:17 gluh@gluh.mysql.r18.ru +5 -1
    Backport default_week_format variable to 4.0

  sql/sql_class.h
    1.111.1.36 03/06/19 14:02:17 gluh@gluh.mysql.r18.ru +1 -0
    Backport default_week_format variable to 4.0

  sql/set_var.cc
    1.12.1.21 03/06/19 14:02:17 gluh@gluh.mysql.r18.ru +4 -0
    Backport default_week_format variable to 4.0

  sql/mysqld.cc
    1.297.1.140 03/06/19 14:02:17 gluh@gluh.mysql.r18.ru +7 -1
    Backport default_week_format variable to 4.0

  mysql-test/t/func_time.test
    1.14.1.2 03/06/19 14:02:17 gluh@gluh.mysql.r18.ru +4 -0
    Backport default_week_format variable to 4.0

  mysql-test/r/func_time.result
    1.17.1.2 03/06/19 14:02:17 gluh@gluh.mysql.r18.ru +5 -0
    Backport default_week_format variable to 4.0

ChangeSet
  1.1538.46.1 03/06/19 10:46:45 lenz@kallisto.local +1 -0
   - added libmysql/client_settings.h to distribution

  libmysql/Makefile.am
    1.36 03/06/19 10:46:42 lenz@mysql.com +1 -0
     - added client_settings.h to distribution

ChangeSet
  1.1538.39.17 03/06/19 13:12:55 bar@bar.mysql.r18.ru +3 -0
  LPAD, RPAD, MAKE_SET and EXPORT_SET now works correctly with collations

  sql/item_strfunc.cc
    1.121 03/06/19 13:12:52 bar@bar.mysql.r18.ru +46 -1
    LPAD, RPAD, MAKE_SET and EXPORT_SET now works correctly with collations

  mysql-test/t/func_str.test
    1.27 03/06/19 13:12:52 bar@bar.mysql.r18.ru +8 -0
    LPAD, RPAD, MAKE_SET and EXPORT_SET now works correctly with collations

  mysql-test/r/func_str.result
    1.29 03/06/19 13:12:52 bar@bar.mysql.r18.ru +20 -0
    LPAD, RPAD, MAKE_SET and EXPORT_SET now works correctly with collations

ChangeSet
  1.676.1.716 03/06/19 04:02:29 greg@gcw.ath.cx +2 -0
  Tagged ChangeSet 1.1385 as mysql-3.23.57

  BitKeeper/etc/logging_ok
    1.153.1.95 03/06/19 04:02:28 greg@gcw.ath.cx +1 -0
    Logging to logging@openlogging.org accepted

  configure.in
    1.124.1.86 03/06/19 04:02:12 greg@gcw.ath.cx +1 -1
    Updated AM_INIT_AUTOMAKE to following version

ChangeSet
  1.1538.39.16 03/06/19 11:36:44 bar@bar.mysql.r18.ru +5 -0
  These functions now return a result of proper collation:
  BIN
  OCT
  CONV
  HEX
  CHAR
  FORMAT
  REPLACE

  sql/item_strfunc.h
    1.61 03/06/19 11:36:42 bar@bar.mysql.r18.ru +16 -3
    These functions now return a result of proper collation:
    BIN
    OCT
    CONV
    HEX
    CHAR
    FORMAT
    REPLACE

  sql/item_strfunc.cc
    1.120 03/06/19 11:36:42 bar@bar.mysql.r18.ru +15 -0
    These functions now return a result of proper collation:
    BIN
    OCT
    CONV
    HEX
    CHAR
    FORMAT
    REPLACE

  sql/item.cc
    1.58.11.5 03/06/19 11:36:42 bar@bar.mysql.r18.ru +1 -1
    These functions now return a result of proper collation:
    BIN
    OCT
    CONV
    HEX
    CHAR
    FORMAT
    REPLACE

  mysql-test/t/func_str.test
    1.26 03/06/19 11:36:41 bar@bar.mysql.r18.ru +15 -2
    These functions now return a result of proper collation:
    BIN
    OCT
    CONV
    HEX
    CHAR
    FORMAT
    REPLACE

  mysql-test/r/func_str.result
    1.28 03/06/19 11:36:41 bar@bar.mysql.r18.ru +39 -2
    These functions now return a result of proper collation:
    BIN
    OCT
    CONV
    HEX
    CHAR
    FORMAT
    REPLACE

ChangeSet
  1.1346.200.81 03/06/19 01:05:24 heikki@hundin.mysql.fi +1 -0
  page0page.c:
    Track an assertion failure reported on the mailing list June 18th, 2003

  innobase/page/page0page.c
    1.11 03/06/19 01:05:01 heikki@hundin.mysql.fi +16 -5
    Track an assertion failure reported on the mailing list June 18th, 2003

ChangeSet
  1.1538.39.15 03/06/18 23:13:29 lenz@kallisto.local +4 -0
   - added sql-common subdirectory and sql_common.h to source distribution

  include/Makefile.am
    1.41 03/06/18 23:13:26 lenz@mysql.com +1 -1
     - added sql_common.h to distribution

  configure.in
    1.201.1.36 03/06/18 23:13:26 lenz@mysql.com +5 -3
     - minor fixes
     - added sql-common/Makefile to AC_OUTPUT

  Makefile.am
    1.50 03/06/18 23:13:26 lenz@mysql.com +1 -1
     - added sql-common directory to distribution

  sql-common/Makefile.am
    1.1 03/06/18 23:07:34 lenz@mysql.com +21 -0

  sql-common/Makefile.am
    1.0 03/06/18 23:07:33 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.1-build/sql-common/Makefile.am

ChangeSet
  1.1346.200.80 03/06/18 22:08:04 lenz@mysql.com +1 -0
   - Added /usr/lib64 to the path to search for libssl.a (required on AMD64)
   - fixed a typo

  acinclude.m4
    1.77.1.6 03/06/18 22:08:02 lenz@mysql.com +2 -2
     - Added /usr/lib64 to the path to search for libssl.a (required on AMD64)
     - fixed a typo

ChangeSet
  1.676.1.715 03/06/18 15:50:33 miguel@hegel.(none) +49 -0
  InstallShield Files requested by Greg

  BitKeeper/etc/logging_ok
    1.153.1.94 03/06/18 15:50:31 miguel@hegel.(none) +1 -0
    Logging to logging@openlogging.org accepted

  VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Setup.tsb
    1.1 03/06/18 15:50:06 miguel@hegel.(none) +76 -0

  VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Build.tsb
    1.1 03/06/18 15:50:06 miguel@hegel.(none) +56 -0

  VC++Files/InstallShield/3.23.XXcom/String Tables/Default.shl
    1.1 03/06/18 15:50:06 miguel@hegel.(none) +74 -0

  VC++Files/InstallShield/3.23.XXcom/String Tables/0009-English/value.shl
    1.1 03/06/18 15:50:06 miguel@hegel.(none) +23 -0

  VC++Files/InstallShield/3.23.XXcom/Shell Objects/Default.shl
    1.1 03/06/18 15:50:06 miguel@hegel.(none) +12 -0

  VC++Files/InstallShield/3.23.XXcom/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP
    1.1 03/06/18 15:50:06 miguel@hegel.(none) +350 -0

  VC++Files/InstallShield/3.23.XXcom/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.1 03/06/18 15:50:06 miguel@hegel.(none) +24 -0

  VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Setup.tsb
    1.0 03/06/18 15:50:06 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Setup.tsb

  VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Build.tsb
    1.0 03/06/18 15:50:06 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Build.tsb

  VC++Files/InstallShield/3.23.XXcom/String Tables/Default.shl
    1.0 03/06/18 15:50:06 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/String Tables/Default.shl

  VC++Files/InstallShield/3.23.XXcom/String Tables/0009-English/value.shl
    1.0 03/06/18 15:50:06 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/String Tables/0009-English/value.shl

  VC++Files/InstallShield/3.23.XXcom/Shell Objects/Default.shl
    1.0 03/06/18 15:50:06 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/Shell Objects/Default.shl

  VC++Files/InstallShield/3.23.XXcom/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP
    1.0 03/06/18 15:50:06 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP

  VC++Files/InstallShield/3.23.XXcom/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.0 03/06/18 15:50:06 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt

  VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.rul
    1.1 03/06/18 15:50:06 miguel@hegel.(none) +641 -0

  VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.obs
    1.1 03/06/18 15:50:05 miguel@hegel.(none) +1460 -0

  VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ins
    1.1 03/06/18 15:50:05 miguel@hegel.(none) +1271 -0

  VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ino
    1.1 03/06/18 15:50:05 miguel@hegel.(none) +1304 -0

  VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.dbg
    1.1 03/06/18 15:50:05 miguel@hegel.(none) +634 -0

  VC++Files/InstallShield/3.23.XXcom/Registry Entries/Default.rge
    1.1 03/06/18 15:50:05 miguel@hegel.(none) +4 -0

  VC++Files/InstallShield/3.23.XXcom/MySQL 3.23.com.ipr
    1.1 03/06/18 15:50:05 miguel@hegel.(none) +51 -0

  VC++Files/InstallShield/3.23.XXcom/File Groups/Servers.fgl
    1.1 03/06/18 15:50:05 miguel@hegel.(none) +183 -0

  VC++Files/InstallShield/3.23.XXcom/File Groups/Grant Tables.fgl
    1.1 03/06/18 15:50:05 miguel@hegel.(none) +36 -0

  VC++Files/InstallShield/3.23.XXcom/File Groups/Documentation.fgl
    1.1 03/06/18 15:50:05 miguel@hegel.(none) +98 -0

  VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.rul
    1.0 03/06/18 15:50:05 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.rul

  VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.obs
    1.0 03/06/18 15:50:05 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.obs

  VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ins
    1.0 03/06/18 15:50:05 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ins

  VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ino
    1.0 03/06/18 15:50:05 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ino

  VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.dbg
    1.0 03/06/18 15:50:05 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.dbg

  VC++Files/InstallShield/3.23.XXcom/Registry Entries/Default.rge
    1.0 03/06/18 15:50:05 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/Registry Entries/Default.rge

  VC++Files/InstallShield/3.23.XXcom/MySQL 3.23.com.ipr
    1.0 03/06/18 15:50:05 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/MySQL 3.23.com.ipr

  VC++Files/InstallShield/3.23.XXcom/File Groups/Servers.fgl
    1.0 03/06/18 15:50:05 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/File Groups/Servers.fgl

  VC++Files/InstallShield/3.23.XXcom/File Groups/Grant Tables.fgl
    1.0 03/06/18 15:50:05 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/File Groups/Grant Tables.fgl

  VC++Files/InstallShield/3.23.XXcom/File Groups/Documentation.fgl
    1.0 03/06/18 15:50:05 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/File Groups/Documentation.fgl

  VC++Files/InstallShield/3.23.XXcom/File Groups/Development.fgl
    1.1 03/06/18 15:50:05 miguel@hegel.(none) +190 -0

  VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fgl
    1.1 03/06/18 15:50:04 miguel@hegel.(none) +4 -0

  VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fdf
    1.1 03/06/18 15:50:04 miguel@hegel.(none) +82 -0

  VC++Files/InstallShield/3.23.XXcom/File Groups/Clients and Tools.fgl
    1.1 03/06/18 15:50:04 miguel@hegel.(none) +35 -0

  VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.fgl
    1.1 03/06/18 15:50:04 miguel@hegel.(none) +42 -0

  VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.cdf
    1.1 03/06/18 15:50:04 miguel@hegel.(none) +192 -0

  VC++Files/InstallShield/3.23.XXcom/Component Definitions/.fgl
    1.1 03/06/18 15:50:04 miguel@hegel.(none) +37 -0

  VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Setup.tsb
    1.1 03/06/18 15:50:04 miguel@hegel.(none) +76 -0

  VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Build.tsb
    1.1 03/06/18 15:50:04 miguel@hegel.(none) +56 -0

  VC++Files/InstallShield/3.23.XX-gpl/String Tables/Default.shl
    1.1 03/06/18 15:50:04 miguel@hegel.(none) +74 -0

  VC++Files/InstallShield/3.23.XX-gpl/String Tables/0009-English/value.shl
    1.1 03/06/18 15:50:04 miguel@hegel.(none) +23 -0

  VC++Files/InstallShield/3.23.XXcom/File Groups/Development.fgl
    1.0 03/06/18 15:50:04 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/File Groups/Development.fgl

  VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fgl
    1.0 03/06/18 15:50:04 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fgl

  VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fdf
    1.0 03/06/18 15:50:04 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fdf

  VC++Files/InstallShield/3.23.XXcom/File Groups/Clients and Tools.fgl
    1.0 03/06/18 15:50:04 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/File Groups/Clients and Tools.fgl

  VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.fgl
    1.0 03/06/18 15:50:04 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.fgl

  VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.cdf
    1.0 03/06/18 15:50:04 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.cdf

  VC++Files/InstallShield/3.23.XXcom/Component Definitions/.fgl
    1.0 03/06/18 15:50:04 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XXcom/Component Definitions/.fgl

  VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Setup.tsb
    1.0 03/06/18 15:50:04 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Setup.tsb

  VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Build.tsb
    1.0 03/06/18 15:50:04 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Build.tsb

  VC++Files/InstallShield/3.23.XX-gpl/String Tables/Default.shl
    1.0 03/06/18 15:50:04 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/String Tables/Default.shl

  VC++Files/InstallShield/3.23.XX-gpl/String Tables/0009-English/value.shl
    1.0 03/06/18 15:50:04 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/String Tables/0009-English/value.shl

  VC++Files/InstallShield/3.23.XX-gpl/Shell Objects/Default.shl
    1.1 03/06/18 15:50:03 miguel@hegel.(none) +12 -0

  VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP
    1.1 03/06/18 15:50:03 miguel@hegel.(none) +350 -0

  VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.1 03/06/18 15:50:03 miguel@hegel.(none) +24 -0

  VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.rul
    1.1 03/06/18 15:50:03 miguel@hegel.(none) +641 -0

  VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.obs
    1.1 03/06/18 15:50:03 miguel@hegel.(none) +1460 -0

  VC++Files/InstallShield/3.23.XX-gpl/Shell Objects/Default.shl
    1.0 03/06/18 15:50:03 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/Shell Objects/Default.shl

  VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP
    1.0 03/06/18 15:50:03 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP

  VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.0 03/06/18 15:50:03 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt

  VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.rul
    1.0 03/06/18 15:50:03 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.rul

  VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.obs
    1.0 03/06/18 15:50:03 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.obs

  VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ins
    1.1 03/06/18 15:50:02 miguel@hegel.(none) +1271 -0

  VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ino
    1.1 03/06/18 15:50:02 miguel@hegel.(none) +1304 -0

  VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.dbg
    1.1 03/06/18 15:50:02 miguel@hegel.(none) +634 -0

  VC++Files/InstallShield/3.23.XX-gpl/Registry Entries/Default.rge
    1.1 03/06/18 15:50:02 miguel@hegel.(none) +4 -0

  VC++Files/InstallShield/3.23.XX-gpl/MySQL 3.23.XX-GPL.ipr
    1.1 03/06/18 15:50:02 miguel@hegel.(none) +51 -0

  VC++Files/InstallShield/3.23.XX-gpl/File Groups/Servers.fgl
    1.1 03/06/18 15:50:02 miguel@hegel.(none) +184 -0

  VC++Files/InstallShield/3.23.XX-gpl/File Groups/Grant Tables.fgl
    1.1 03/06/18 15:50:02 miguel@hegel.(none) +36 -0

  VC++Files/InstallShield/3.23.XX-gpl/File Groups/Documentation.fgl
    1.1 03/06/18 15:50:02 miguel@hegel.(none) +99 -0

  VC++Files/InstallShield/3.23.XX-gpl/File Groups/Development.fgl
    1.1 03/06/18 15:50:02 miguel@hegel.(none) +191 -0

  VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fgl
    1.1 03/06/18 15:50:02 miguel@hegel.(none) +4 -0

  VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ins
    1.0 03/06/18 15:50:02 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ins

  VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ino
    1.0 03/06/18 15:50:02 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ino

  VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.dbg
    1.0 03/06/18 15:50:02 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.dbg

  VC++Files/InstallShield/3.23.XX-gpl/Registry Entries/Default.rge
    1.0 03/06/18 15:50:02 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/Registry Entries/Default.rge

  VC++Files/InstallShield/3.23.XX-gpl/MySQL 3.23.XX-GPL.ipr
    1.0 03/06/18 15:50:02 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/MySQL 3.23.XX-GPL.ipr

  VC++Files/InstallShield/3.23.XX-gpl/File Groups/Servers.fgl
    1.0 03/06/18 15:50:02 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Servers.fgl

  VC++Files/InstallShield/3.23.XX-gpl/File Groups/Grant Tables.fgl
    1.0 03/06/18 15:50:02 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Grant Tables.fgl

  VC++Files/InstallShield/3.23.XX-gpl/File Groups/Documentation.fgl
    1.0 03/06/18 15:50:02 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Documentation.fgl

  VC++Files/InstallShield/3.23.XX-gpl/File Groups/Development.fgl
    1.0 03/06/18 15:50:02 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Development.fgl

  VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fgl
    1.0 03/06/18 15:50:02 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fgl

  VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fdf
    1.1 03/06/18 15:50:01 miguel@hegel.(none) +82 -0

  VC++Files/InstallShield/3.23.XX-gpl/File Groups/Clients and Tools.fgl
    1.1 03/06/18 15:50:01 miguel@hegel.(none) +35 -0

  VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.fgl
    1.1 03/06/18 15:50:01 miguel@hegel.(none) +42 -0

  VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.cdf
    1.1 03/06/18 15:50:01 miguel@hegel.(none) +192 -0

  VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/.fgl
    1.1 03/06/18 15:50:01 miguel@hegel.(none) +37 -0

  VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fdf
    1.0 03/06/18 15:50:01 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fdf

  VC++Files/InstallShield/3.23.XX-gpl/File Groups/Clients and Tools.fgl
    1.0 03/06/18 15:50:01 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Clients and Tools.fgl

  VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.fgl
    1.0 03/06/18 15:50:01 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.fgl

  VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.cdf
    1.0 03/06/18 15:50:01 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.cdf

  VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/.fgl
    1.0 03/06/18 15:50:01 miguel@hegel.(none) +0 -0
    BitKeeper file /home/miguel/mysql-dev/mysql-3.23/VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/.fgl

ChangeSet
  1.1538.45.6 03/06/18 12:10:40 paul@teton.kitebird.com +1 -0
  INSTALL-WIN-SOURCE:
    More edits to INSTALL-WIN-SOURCE.

  INSTALL-WIN-SOURCE
    1.3 03/06/18 12:09:23 paul@teton.kitebird.com +64 -54
    More edits to INSTALL-WIN-SOURCE.

ChangeSet
  1.1538.28.21 03/06/18 07:31:23 igor@rurik.mysql.com +6 -0
  Merge

  sql/sql_yacc.yy
    1.203.48.1 03/06/18 07:29:39 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.3.19 03/06/18 07:29:39 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/set_var.cc
    1.34.1.24 03/06/18 07:29:39 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.27 03/06/18 07:29:38 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.15 03/06/18 07:29:38 igor@rurik.mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.233.1.16 03/06/18 07:29:32 igor@rurik.mysql.com +0 -0
    auto-union

ChangeSet
  1.1538.45.5 03/06/18 14:12:50 serg@sergbook.mylan +4 -0
  triggers magic
  enforce REAL_EMAIL

  BitKeeper/etc/logging_ok
    1.233.9.4 03/06/18 14:12:23 serg@sergbook.mylan +1 -0
    Logging to logging@openlogging.org accepted

  BitKeeper/triggers/pre-commit
    1.1 03/06/18 14:12:15 serg@sergbook.mylan +12 -0

  BitKeeper/triggers/pre-commit
    1.0 03/06/18 14:12:15 serg@sergbook.mylan +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-4.1/BitKeeper/triggers/pre-commit

  BitKeeper/deleted/.del-post-outgoing~1dd3d8f0f6e8f3cd
    1.2 03/06/18 14:11:34 serg@sergbook.mylan +0 -0
    Delete: BitKeeper/triggers/post-outgoing

  BitKeeper/deleted/.del-post-incoming~9f2168f531f09f3b
    1.3 03/06/18 14:11:34 serg@sergbook.mylan +0 -0
    Delete: BitKeeper/triggers/post-incoming

ChangeSet
  1.1538.24.15 03/06/18 15:58:57 hf@deer.(none) +7 -0
  SCRUM
  including client code into embedded server
  code to guess what library to use added
  net_field_length moved to pack.c

  sql/protocol.cc
    1.56.1.8 03/06/18 15:58:55 hf@deer.(none) +0 -34
    net_store_length moved to sql-common/pack.c

  sql-common/pack.c
    1.3 03/06/18 15:58:55 hf@deer.(none) +27 -0
    net_store_length implementation moved here

  sql-common/client.c
    1.14 03/06/18 15:58:55 hf@deer.(none) +5 -0
    options checking added

  libmysqld/libmysqld.c
    1.37 03/06/18 15:58:55 hf@deer.(none) +13 -1
    added code to guess whether to use remote or embedded connection

  libmysql/libmysql.c
    1.156.1.13 03/06/18 15:58:55 hf@deer.(none) +0 -33
    net_store_length moved to sql-common/pack.c

  include/mysql_com.h
    1.67.1.8 03/06/18 15:58:55 hf@deer.(none) +1 -0
    net_store_length declaration

  include/mysql.h
    1.75 03/06/18 15:58:55 hf@deer.(none) +12 -9
    typedefinitions moved for suitability
    mysql_option.methods_to_use added

ChangeSet
  1.1538.24.14 03/06/18 10:34:09 hf@deer.(none) +5 -0
  Last part of resolving conflicts after pull
  Some intersections with Monty encountered

  sql/sql_client.cc
    1.2 03/06/18 10:34:07 hf@deer.(none) +2 -0
    this function was moved to sql-common/pack.c by me
    i think the pack.c is the better place for it

  sql/client_settings.h
    1.7 03/06/18 10:34:07 hf@deer.(none) +0 -1
    we don't need this #define anymore

  sql-common/client.c
    1.13 03/06/18 10:34:07 hf@deer.(none) +3 -7
    code simplified with the moving of mysql_use_result here

  libmysql/libmysql.c
    1.156.1.12 03/06/18 10:34:07 hf@deer.(none) +1 -52
    mysql_use_result moved in sql-common/client.c

  libmysql/client_settings.h
    1.6 03/06/18 10:34:07 hf@deer.(none) +0 -4
    We don't need the trick with macroses since Monty moved cli_mysql_use_result
    into sql-common/client.c

ChangeSet
  1.676.303.1 03/06/18 04:05:10 heikki@hundin.mysql.fi +2 -0
  row0vers.c, row0sel.c:
    Backport the clust rec bug fix from 4.0

  innobase/row/row0vers.c
    1.5.1.1 03/06/18 04:04:59 heikki@hundin.mysql.fi +0 -14
    Backport the clust rec bug fix from 4.0

  innobase/row/row0sel.c
    1.15.1.8 03/06/18 04:04:59 heikki@hundin.mysql.fi +21 -2
    Backport the clust rec bug fix from 4.0

ChangeSet
  1.1346.200.78 03/06/18 03:53:18 heikki@hundin.mysql.fi +1 -0
  row0vers.c:
    Add forgotten mutex_enter()

  innobase/row/row0vers.c
    1.9 03/06/18 03:53:07 heikki@hundin.mysql.fi +1 -0
    Add forgotten mutex_enter()

ChangeSet
  1.1346.200.77 03/06/18 03:49:34 heikki@hundin.mysql.fi +1 -0
  row0vers.c:
    Add forgotten mtr_commit()

  innobase/row/row0vers.c
    1.8 03/06/18 03:49:23 heikki@hundin.mysql.fi +2 -0
    Add forgotten mtr_commit()

ChangeSet
  1.1346.200.76 03/06/18 03:38:09 heikki@hundin.mysql.fi +2 -0
  row0sel.c, row0ins.c:
    Fix error in previous push

  innobase/row/row0sel.c
    1.28.1.10 03/06/18 03:37:49 heikki@hundin.mysql.fi +12 -4
    Fix error in previous push

  innobase/row/row0ins.c
    1.26 03/06/18 03:37:49 heikki@hundin.mysql.fi +4 -2
    Fix error in previous push

ChangeSet
  1.1346.200.75 03/06/18 02:18:19 heikki@hundin.mysql.fi +3 -0
  row0vers.c, row0sel.c, row0ins.c:
    Fix bug: InnoDB could print that it cannot find a clustered index record if an update undo, purge, and a consistent read coincided, in rare cases it might also have returned a wrong row in a query

  innobase/row/row0vers.c
    1.7 03/06/18 02:17:48 heikki@hundin.mysql.fi +11 -17
    Fix bug: InnoDB could print that it cannot find a clustered index record if an update undo, purge, and a consistent read coincided, in rare cases it might also have returned a wrong row in a query

  innobase/row/row0sel.c
    1.28.1.9 03/06/18 02:17:48 heikki@hundin.mysql.fi +64 -25
    Fix bug: InnoDB could print that it cannot find a clustered index record if an update undo, purge, and a consistent read coincided, in rare cases it might also have returned a wrong row in a query

  innobase/row/row0ins.c
    1.25 03/06/18 02:17:48 heikki@hundin.mysql.fi +13 -12
    Fix bug: InnoDB could print that it cannot find a clustered index record if an update undo, purge, and a consistent read coincided, in rare cases it might also have returned a wrong row in a query

ChangeSet
  1.1538.45.4 03/06/17 17:47:23 paul@teton.kitebird.com +1 -0
  INSTALL-WIN-SOURCE:
    Initial cleanup edits.

  INSTALL-WIN-SOURCE
    1.2 03/06/17 17:45:59 paul@teton.kitebird.com +107 -88
    Initial cleanup edits.

ChangeSet
  1.1538.45.3 03/06/17 14:29:20 venu@myvenu.com +1 -0
    Fix for --dirname and --suffix (missed ones) 

  scripts/make_win_src_distribution.sh
    1.9 03/06/17 14:28:41 venu@myvenu.com +2 -0
    Fix for --dirname and --suffix (missed ones)

ChangeSet
  1.1346.200.74 03/06/17 23:19:38 guilhem@mysql.com +4 -0
  Changed change_master() to use ER_MASTER_INFO (better display).

  sql/sql_repl.cc
    1.86.1.10 03/06/17 23:19:33 guilhem@mysql.com +1 -1
    Use ER_MASTER_INFO instead of custom message and zero error code (which display
    badly).

  sql/slave.cc
    1.164.1.67 03/06/17 23:19:33 guilhem@mysql.com +1 -0
    A DBUG_PRINT

  mysql-test/t/rpl_rotate_logs.test
    1.34.1.4 03/06/17 23:19:32 guilhem@mysql.com +8 -2
    comments and test update with the error code

  mysql-test/r/rpl_rotate_logs.result
    1.32.1.2 03/06/17 23:19:32 guilhem@mysql.com +1 -1
    result update

ChangeSet
  1.1538.45.2 03/06/17 12:22:57 venu@myvenu.com +2 -0
  Added new HOWTO doc 'INSTALL-WIN-SOURCE' on building 'mysql clients and server' on WINDOWS from BitKeeper as well as from distributed source archive

  scripts/make_win_src_distribution.sh
    1.8 03/06/17 12:20:52 venu@myvenu.com +1 -1
    Fix for INSTALL-WIN-SOURCE

  INSTALL-WIN-SOURCE
    1.1 03/06/17 12:20:48 venu@myvenu.com +192 -0

  INSTALL-WIN-SOURCE
    1.0 03/06/17 12:20:48 venu@myvenu.com +0 -0
    BitKeeper file /home/venu/work/sql/dev-4.1/INSTALL-WIN-SOURCE

ChangeSet
  1.1538.24.13 03/06/17 21:53:13 hf@deer.(none) +10 -0
  SCRUM
  merged conflicts about my previous commit
  it seems there are some errors left - gonna check...

  sql/protocol.cc
    1.56.1.7 03/06/17 21:53:11 hf@deer.(none) +1 -0
    conflict merged

  sql/client_settings.h
    1.6 03/06/17 21:53:11 hf@deer.(none) +1 -1
    conflicts merged

  sql-common/client.c
    1.12 03/06/17 21:53:11 hf@deer.(none) +1 -1
    conflicts merged

  libmysql/libmysql.c
    1.156.1.11 03/06/17 21:53:11 hf@deer.(none) +48 -16
    conflicts merged

  libmysql/client_settings.h
    1.5 03/06/17 21:53:11 hf@deer.(none) +2 -2
    conflicts merged

  include/mysql.h
    1.74 03/06/17 21:53:11 hf@deer.(none) +0 -0
    conflicts merged

  include/sql_common.h
    1.5 03/06/17 21:37:04 hf@deer.(none) +0 -0
    Auto merged

  include/mysql_com.h
    1.67.1.7 03/06/17 21:37:04 hf@deer.(none) +0 -0
    Auto merged

  client/mysqltest.c
    1.92.1.8 03/06/17 21:37:04 hf@deer.(none) +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.233.6.7 03/06/17 21:36:59 hf@deer.(none) +0 -0
    auto-union

ChangeSet
  1.1538.24.12 03/06/17 21:32:31 hf@deer.(none) +19 -0
  SCRUM
  
  client capabilities included into libmysqld
  some API methods became "virtual"
  lots of duplicated code removed
  
  IMHO all the above made library's code way more pleasant to look at, didn't it?

  sql/protocol.cc
    1.56.3.1 03/06/17 21:32:29 hf@deer.(none) +0 -23
    code moved to sql-common/pack.c

  sql/net_serv.cc
    1.57 03/06/17 21:32:29 hf@deer.(none) +17 -2
    file included in embedded server

  sql/client_settings.h
    1.3.1.1 03/06/17 21:32:29 hf@deer.(none) +2 -0
    we don't need mysql_use_result for mini_client

  sql-common/pack.c
    1.2 03/06/17 21:32:29 hf@deer.(none) +34 -0
    some code moved here from libmysql.c and protocol.cc

  sql-common/client.c
    1.8.1.1 03/06/17 21:32:29 hf@deer.(none) +54 -14
    code trimmed with new model of calling

  libmysqld/libmysqld.c
    1.36 03/06/17 21:32:29 hf@deer.(none) +32 -1213
    duplicated code removed

  libmysqld/lib_sql.cc
    1.55 03/06/17 21:32:29 hf@deer.(none) +6 -26
    code duplications removed
    emb_advanced_command was made from simple_command

  libmysqld/examples/Makefile.am
    1.13 03/06/17 21:32:29 hf@deer.(none) +1 -1
    now we need CLIENT_LIBS here

  libmysqld/Makefile.am
    1.29.1.6 03/06/17 21:32:29 hf@deer.(none) +8 -6
    libmysql.c, client.c, pack.c symlinked and added to sources
    lib_vio.c removed

  libmysql/libmysql.c
    1.156.4.1 03/06/17 21:32:29 hf@deer.(none) +21 -35
    global variables and my_net_local_init moved to sql-common/pack.c

  libmysql/client_settings.h
    1.2.1.1 03/06/17 21:32:29 hf@deer.(none) +6 -2
    changes to make this working with both client and embedded

  include/violite.h
    1.31 03/06/17 21:32:29 hf@deer.(none) +2 -2
    implementation of Vio included in libmysqld

  include/sql_common.h
    1.3.1.1 03/06/17 21:32:29 hf@deer.(none) +2 -3
    declarations changed

  include/mysql_embed.h
    1.7 03/06/17 21:32:29 hf@deer.(none) +3 -1
    now we include implementations of Vio structure in libmysqld

  include/mysql_com.h
    1.67.1.6 03/06/17 21:32:29 hf@deer.(none) +3 -0
    todo added

  include/mysql.h
    1.73 03/06/17 21:32:29 hf@deer.(none) +22 -4
    MYSQL and related structures unified
    four methods made "virtual"
    relative wrappers added

  client/mysqltest.c
    1.92.2.1 03/06/17 21:32:29 hf@deer.(none) +1 -1
    we don't need this now

  BitKeeper/etc/ignore
    1.153.1.9 03/06/17 21:32:29 hf@deer.(none) +4 -0
    Added libmysqld/client.c libmysqld/client_settings.h libmysqld/libmysql.c libmysqld/pack.c to the ignore list

ChangeSet
  1.1346.241.1 03/06/17 16:35:20 guilhem@mysql.com +2 -0
  Better error reporting in mysql-test-run (don't hide the important message
  with 'head').
  Test fix (this sync_with_master was nonsense).
  Now all tests pass in 4.0 in autobuild.

  mysql-test/t/rpl_rotate_logs.test
    1.34.1.3 03/06/17 16:35:15 guilhem@mysql.com +0 -3
    Dont sync_with_master as the SQL slave thread may be stopped at this moment;
    just wait_for_slave_to_stop. Doing sync_with_master caused a non-deterministic
    behaviour, because (note that save_master_pos was called to early) sometimes
    MASTER_POS_WAIT() started before the SQL thread died (because of unique
    violation) so returned 0, other times it started after the SQL thread died
    so returned NULL (which is reported by mysqltest as an error, on stderr).

  mysql-test/mysql-test-run.sh
    1.146.1.27 03/06/17 16:35:15 guilhem@mysql.com +3 -1
    Error reporting (how mysql-test-run filters the messages which mysqltest prints
    on stderr) is not reliable. It does a 'head the first line only' which in
    my case caused me to lose some time, because in fact the worrying message was
    on the second line (logically, the one which caused the die() is at the
    end of the $TIMEFILE file, not at the beginning).
    Doing a 'tail' is better but not perfect (depending on the build, one may get
    "Maximum memory usage" as the last line); it's always good to have all messages
    and spot the important one oneself. So we print all $TIMEFILE (that's a few lines
    at most).

ChangeSet
  1.1346.1.117 03/06/17 16:24:31 Sinisa@sinisa.nasamreza.org +3 -0
  Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
  into sinisa.nasamreza.org:/mnt/work/mysql-4.0

  sql/sql_yacc.yy
    1.145.1.66 03/06/17 16:24:24 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_parse.cc
    1.218.1.102 03/06/17 16:24:24 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  include/my_global.h
    1.34.1.16 03/06/17 16:24:24 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1346.1.116 03/06/17 16:20:07 Sinisa@sinisa.nasamreza.org +4 -0
  Two Sprint tasks and two behaviour changes.

  sql/sql_yacc.yy
    1.145.17.1 03/06/17 16:20:03 Sinisa@sinisa.nasamreza.org +41 -11
    SCRUM TASK no 2.
    
    Making CREATE and INSERT to work with any UNION>

  sql/sql_union.cc
    1.22.1.21 03/06/17 16:20:03 Sinisa@sinisa.nasamreza.org +6 -6
    Changing behaviour for SQL_OPTION_FOUND_ROWS in unins.

  sql/sql_parse.cc
    1.218.1.101 03/06/17 16:20:03 Sinisa@sinisa.nasamreza.org +10 -7
    SCRUM TASK No 1.
    
    Adding support for INSERT .. SELECT with a table in the join
    that is to be inserted into.
    
    test case pending.

  sql/sql_acl.cc
    1.51.1.48 03/06/17 16:20:03 Sinisa@sinisa.nasamreza.org +9 -4
    Fix for a grant bug.
    If there is a table privilege, for which no column privileges 
    are defined , and the same privilege is granted for a column, 
    new code prevents that table privilege is reduced to a column
    privilege.
    
    To accomplish that, now a REVOKE command has to be used first.

ChangeSet
  1.1538.45.1 03/06/17 18:10:35 bar@bar.mysql.r18.ru +1 -0
  The default collation for cp1251 has been changed to general_ci

  sql/share/charsets/Index.xml
    1.27 03/06/17 18:10:33 bar@bar.mysql.r18.ru +2 -2
    The default collation for cp1251 has been changed to general_ci

  BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220
    1.19 03/06/17 15:48:14 hf@deer.(none) +0 -0
    Delete: libmysqld/lib_vio.c

ChangeSet
  1.676.302.1 03/06/16 23:38:33 guilhem@mysql.com +2 -0
  Do not use 'created' for time anymore in Start_log_event, it's the same
  as the already-stored timestamp. Now 'created' is used only to know if
  this is a first binlog or not. And we may re-use the superfluous bytes
  in 5.0 when we need room.

  sql/log_event.h
    1.41.1.8 03/06/16 23:38:29 guilhem@mysql.com +11 -0
    In Start_log_event, 'created' is always the same as 'when', or O.
    We didn't need 4 bytes for this, a bit would have been enough (O or
    "same as 'when'"). Possibly in 5.0 we will re-use the useless bytes.

  sql/log_event.cc
    1.38.1.11 03/06/16 23:38:29 guilhem@mysql.com +3 -5
    This sort of reverts a change I made in 3.23.57. In 3.23.57 I set 'created' to 0
    if this was a non-first binlog, so I made mysqlbinlog not print the "created xx"
    part if created == 0. While this was sensible, as 'created' is 0 or equal to
    the timestamp which is already stored in the event, we can always print
    "created xx" by using the timestamp, and leaving the use of 'created' only to
    know if this is a first binlog or not (which we print as "created at startup").

ChangeSet
  1.1346.200.72 03/06/16 23:05:45 serg@serg.mylan +6 -0
  fulltext and left join bug fixed

  sql/sql_select.cc
    1.152.1.83 03/06/16 23:05:43 serg@serg.mylan +3 -0
    fulltext and left join bug fixed

  sql/item_func.cc
    1.60.1.33 03/06/16 23:05:43 serg@serg.mylan +3 -0
    fulltext and left join bug fixed

  mysql-test/t/fulltext_left_join.test
    1.6.1.1 03/06/16 23:05:43 serg@serg.mylan +12 -0
    explain select fulltext test

  mysql-test/t/fulltext.test
    1.34.2.2 03/06/16 23:05:43 serg@serg.mylan +1 -0
    explain select fulltext test

  mysql-test/r/fulltext_left_join.result
    1.9 03/06/16 23:05:43 serg@serg.mylan +11 -0
    fulltext and left join bug fixed

  mysql-test/r/fulltext.result
    1.29.1.8 03/06/16 23:05:43 serg@serg.mylan +3 -0
    fulltext and left join bug fixed

ChangeSet
  1.1346.200.71 03/06/16 19:07:48 serg@serg.mylan +1 -0
  reverting Monty's "fix" that turned a warning into an error.

  myisam/mi_open.c
    1.46.1.16 03/06/16 19:07:45 serg@serg.mylan +2 -5
    reverting Monty's "fix" that turned a warning into an error.

ChangeSet
  1.1346.240.1 03/06/16 15:49:54 guilhem@mysql.com +7 -0
  Fix for nightly build test failure (test update).
  More messages.
  Testcase for bug 651.

  sql/slave.cc
    1.164.1.66 03/06/16 15:49:47 guilhem@mysql.com +11 -2
    A longer DBUG_PRINT.

  mysql-test/t/rpl_master_pos_wait.test
    1.2 03/06/16 15:49:47 guilhem@mysql.com +8 -2
    Discovered we had 'send' to send a query without waiting for the resultn so could had a testcase for bug 651.
    Shorter timeouts as there is no risk the position is reached.

  mysql-test/t/rpl_loaddata.test
    1.2.1.3 03/06/16 15:49:46 guilhem@mysql.com +2 -6
    Discovered we had wait_for_slave_to_stop, so used it as it automates things.

  mysql-test/t/rpl000001.test
    1.30.1.2 03/06/16 15:49:46 guilhem@mysql.com +2 -2
    sync_with_master (=MASTER_POS_WAIT()) was called when we could expect the SQL slave thread had stopped.
    As I yesterday changed code so that "SQL thread stops => MASTER_POS_WAIT() returns NULL immediately" (bugfix),
    sync_with_master received NULL (on build.mysql.com, not on my machine; this is a question of milliseconds,
    if the slave server will process MASTER_POS_WAIT() before or after the slave SQL thread has stopped), and
    in mysqltest.c, sync_with_master complained that it could not sync.
    So I just remove this sync_with_master, which does not make sense anymore: we just wait for the slave SQL
    thread to stop. 

  mysql-test/r/rpl_master_pos_wait.result
    1.1.1.1 03/06/16 15:49:46 guilhem@mysql.com +6 -2
    result update

  mysql-test/r/rpl_loaddata.result
    1.1.1.4 03/06/16 15:49:46 guilhem@mysql.com +0 -3
    result update

  client/mysqltest.c
    1.77.1.25 03/06/16 15:49:45 guilhem@mysql.com +2 -1
    More explicit error message if MASTER_POS_WAIT() returns NULL.

ChangeSet
  1.1538.44.1 03/06/16 13:18:57 serg@serg.mylan +1 -0
  comment added

  mysys/tree.c
    1.23 03/06/16 13:18:53 serg@serg.mylan +10 -0
    comment added

ChangeSet
  1.1538.39.12 03/06/16 10:32:49 lenz@mysql.com +1 -0
   - changed "password" to "Password" as suggested by Paul DuBois to be
     consistent with the other column names in the table.

  scripts/mysql_fix_privilege_tables.sql
    1.2 03/06/16 10:32:46 lenz@mysql.com +1 -1
     - changed "password" to "Password" as suggested by Paul DuBois to be
       consistent with the other column names in the table.

ChangeSet
  1.1538.39.11 03/06/15 22:33:59 serg@serg.mylan +1 -0
  Merge bk-internal:/home/bk/mysql-4.1/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

ChangeSet
  1.1538.39.10 03/06/15 23:41:28 monty@narttu.mysql.fi +1 -0
  Add missing defines

ChangeSet
  1.1538.43.3 03/06/15 22:33:31 serg@serg.mylan +3 -0
  bad merge fixed

ChangeSet
  1.1538.39.9 03/06/15 23:26:40 monty@narttu.mysql.fi +2 -0
  merge

ChangeSet
  1.1538.43.2 03/06/15 20:46:41 hf@deer.(none) +2 -0
  Fix for compilation error.
  Compiler can signal error when init_sigpipe_variables expands as empty place.
  Had to remove all semicolons after init_sigpipe_variables

ChangeSet
  1.1346.200.69 03/06/16 00:39:46 heikki@hundin.mysql.fi +4 -0
  row0mysql.c, dict0dict.ic:
    Cleanup
  ha_innodb.cc, data0type.h:
    Make sure non-latin1 users can downgrade from 4.0.14 to an earlier version if they have not created DATA_BLOB column prefix indexes

  innobase/row/row0mysql.c
    1.39.1.7 03/06/16 00:39:05 heikki@hundin.mysql.fi +9 -0
    Cleanup

  innobase/include/dict0dict.ic
    1.5 03/06/16 00:38:48 heikki@hundin.mysql.fi +0 -1
    Cleanup

  sql/ha_innodb.cc
    1.73.1.101 03/06/16 00:37:57 heikki@hundin.mysql.fi +2 -1
    Make sure non-latin1 users can downgrade from 4.0.14 to an earlier version if they have not created DATA_BLOB column prefix indexes

  innobase/include/data0type.h
    1.4 03/06/16 00:37:46 heikki@hundin.mysql.fi +3 -3
    Make sure non-latin1 users can downgrade from 4.0.14 to an earlier version if they have not created DATA_BLOB column prefix indexes

  sql/client_settings.h
    1.5 03/06/15 23:41:26 monty@narttu.mysql.fi +2 -0
    Add missing defines

  sql/sql_yacc.yy
    1.203.46.2 03/06/15 22:33:55 serg@serg.mylan +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.203.47.1 03/06/15 22:33:28 serg@serg.mylan +3 -1
    bad merge fixed

  mysql-test/t/fulltext.test
    1.39 03/06/15 22:33:28 serg@serg.mylan +2 -2
    test for CREATE FULLTEXT INDEX

  mysql-test/r/fulltext.result
    1.42 03/06/15 22:33:28 serg@serg.mylan +2 -2
    test for CREATE FULLTEXT INDEX

  scripts/mysql_install_db.sh
    1.37.1.9 03/06/15 23:26:38 monty@narttu.mysql.fi +0 -1
    Use local version

  sql-common/client.c
    1.11 03/06/15 23:24:58 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1538.39.8 03/06/15 23:24:37 monty@narttu.mysql.fi +10 -0
  Fixes for make_win_src_distributions
  Removed compiler warnings

  strings/ctype-utf8.c
    1.47 03/06/15 23:24:35 monty@narttu.mysql.fi +6 -6
    Removed compiler warning

  sql/sql_yacc.yy
    1.203.46.1 03/06/15 23:24:35 monty@narttu.mysql.fi +1 -1
    Removed compiler warning

  sql/sql_select.cc
    1.216.14.3 03/06/15 23:24:35 monty@narttu.mysql.fi +1 -2
    Removed compiler warning

  sql/sql_parse.cc
    1.271.9.1 03/06/15 23:24:35 monty@narttu.mysql.fi +0 -1
    Removed compiler warning

  sql/sql_acl.cc
    1.74.1.6 03/06/15 23:24:35 monty@narttu.mysql.fi +9 -5
    Indentation cleanup
    Removed compiler warning

  sql/item_cmpfunc.cc
    1.87.1.8 03/06/15 23:24:35 monty@narttu.mysql.fi +2 -0
    Removed compiler warning

  sql-common/client.c
    1.9.1.1 03/06/15 23:24:35 monty@narttu.mysql.fi +1 -1
    Portability fix

  scripts/mysql_install_db.sh
    1.37.2.1 03/06/15 23:24:35 monty@narttu.mysql.fi +34 -26
    Update for usage with make_win_src_distribution

  scripts/mysql_create_system_tables.sh
    1.2 03/06/15 23:24:35 monty@narttu.mysql.fi +16 -17
    Update for usage with make_win_src_distribution

  scripts/make_win_src_distribution.sh
    1.7 03/06/15 23:24:35 monty@narttu.mysql.fi +21 -16
    Added option --dirname
    Also copy sql-common directory
    Create mysql data files even if mysqld is not installed

ChangeSet
  1.1346.200.68 03/06/15 23:23:04 heikki@hundin.mysql.fi +3 -0
  handler.h, ha_innodb.h, ha_innodb.cc:
    Cleanup; remove compiler warning on Windows

  sql/handler.h
    1.71.1.15 03/06/15 23:22:44 heikki@hundin.mysql.fi +2 -1
    Cleanup; remove compiler warning on Windows

  sql/ha_innodb.h
    1.48.2.10 03/06/15 23:22:44 heikki@hundin.mysql.fi +2 -1
    Cleanup; remove compiler warning on Windows

  sql/ha_innodb.cc
    1.73.1.100 03/06/15 23:22:44 heikki@hundin.mysql.fi +15 -11
    Cleanup; remove compiler warning on Windows

  sql-common/client.c
    1.10 03/06/15 20:46:29 hf@deer.(none) +4 -4
    we don't need semicolons after init_sigpipe_variables

  libmysql/client_settings.h
    1.4 03/06/15 20:46:29 hf@deer.(none) +1 -1
    semicolon added

ChangeSet
  1.1346.200.66 03/06/15 12:01:51 guilhem@mysql.com +4 -0
  Simplified a test.
  thd->enter_cond() and exit_cond(), so that the I/O thread accepts to stop
  when it's waiting for relay log space.
  Reset ignore_log_space_limit to 0 when the SQL thread terminates.

  sql/slave.cc
    1.164.1.65 03/06/15 12:01:46 guilhem@mysql.com +9 -6
    thd->enter_cond() and exit_cond(), so that the I/O thread accepts to stop
    when it's waiting on cond (waiting for relay log space).
    Reset ignore_log_space_limit to 0 when the SQL thread terminates.

  mysql-test/t/rpl_relayspace.test
    1.2 03/06/15 12:01:41 guilhem@mysql.com +16 -17
    Less queries in the test, to make it simpler.
    Testcase if the IO thread blocked in wait_for_relay_log_space
    accepts to stop when STOP SLAVE.

  mysql-test/t/rpl_relayspace-slave.opt
    1.2 03/06/15 12:01:40 guilhem@mysql.com +1 -1
    smaller relay_log_space_limit to speed up things.

  mysql-test/r/rpl_relayspace.result
    1.1.1.1 03/06/15 12:01:40 guilhem@mysql.com +8 -2
    result update

ChangeSet
  1.1538.39.7 03/06/15 12:34:04 monty@narttu.mysql.fi +2 -0
  LAST_INSERT_ID()}will now return 0 if the last INSERT didn't insert any rows.

  sql/sql_insert.cc
    1.86.2.8 03/06/15 12:34:03 monty@narttu.mysql.fi +13 -2
    LAST_INSERT_ID()}will now return 0 if the last INSERT didn't insert any rows.

  mysql-test/r/auto_increment.result
    1.12 03/06/15 12:34:03 monty@narttu.mysql.fi +1 -1
    Update results after bug fix

ChangeSet
  1.1346.239.2 03/06/15 01:04:28 heikki@hundin.mysql.fi +75 -0
  Many files:
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/ut/ut0ut.c
    1.12.1.2 03/06/15 00:59:02 heikki@hundin.mysql.fi +2 -0
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/ut/ut0mem.c
    1.8.1.4 03/06/15 00:59:02 heikki@hundin.mysql.fi +7 -7
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/trx/trx0trx.c
    1.20.1.6 03/06/15 00:58:52 heikki@hundin.mysql.fi +5 -0
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/trx/trx0sys.c
    1.13.1.3 03/06/15 00:58:52 heikki@hundin.mysql.fi +1 -1
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/trx/trx0roll.c
    1.10 03/06/15 00:58:52 heikki@hundin.mysql.fi +185 -37
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/trx/trx0rec.c
    1.7 03/06/15 00:58:52 heikki@hundin.mysql.fi +14 -10
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/srv/srv0start.c
    1.37.1.10 03/06/15 00:58:37 heikki@hundin.mysql.fi +5 -3
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/srv/srv0srv.c
    1.35.1.16 03/06/15 00:58:36 heikki@hundin.mysql.fi +9 -7
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/row/row0vers.c
    1.6 03/06/15 00:58:28 heikki@hundin.mysql.fi +11 -1
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/row/row0upd.c
    1.18 03/06/15 00:58:28 heikki@hundin.mysql.fi +58 -61
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/row/row0umod.c
    1.11 03/06/15 00:58:28 heikki@hundin.mysql.fi +3 -2
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/row/row0sel.c
    1.28.1.8 03/06/15 00:58:28 heikki@hundin.mysql.fi +152 -76
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/row/row0row.c
    1.4 03/06/15 00:58:28 heikki@hundin.mysql.fi +47 -45
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/row/row0mysql.c
    1.39.1.6 03/06/15 00:58:28 heikki@hundin.mysql.fi +21 -39
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/row/row0ins.c
    1.24 03/06/15 00:58:28 heikki@hundin.mysql.fi +117 -17
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/rem/rem0cmp.c
    1.13 03/06/15 00:58:24 heikki@hundin.mysql.fi +82 -35
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/pars/pars0pars.c
    1.5 03/06/15 00:58:04 heikki@hundin.mysql.fi +3 -5
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/pars/pars0opt.c
    1.6 03/06/15 00:58:04 heikki@hundin.mysql.fi +3 -4
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/page/page0page.c
    1.10 03/06/15 00:57:59 heikki@hundin.mysql.fi +49 -5
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/page/page0cur.c
    1.11 03/06/15 00:57:58 heikki@hundin.mysql.fi +18 -1
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/os/os0thread.c
    1.23 03/06/15 00:57:53 heikki@hundin.mysql.fi +2 -2
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/os/os0file.c
    1.44.1.11 03/06/15 00:57:53 heikki@hundin.mysql.fi +243 -22
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/mem/mem0pool.c
    1.9.1.1 03/06/15 00:57:42 heikki@hundin.mysql.fi +27 -1
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/log/log0recv.c
    1.19.1.2 03/06/15 00:57:32 heikki@hundin.mysql.fi +9 -5
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/log/log0log.c
    1.20.1.4 03/06/15 00:57:32 heikki@hundin.mysql.fi +32 -13
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/lock/lock0lock.c
    1.20.1.2 03/06/15 00:57:25 heikki@hundin.mysql.fi +82 -4
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/trx0sys.ic
    1.3 03/06/15 00:57:12 heikki@hundin.mysql.fi +10 -0
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/row0mysql.ic
    1.5 03/06/15 00:57:12 heikki@hundin.mysql.fi +2 -2
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/ut0mem.h
    1.5.1.1 03/06/15 00:57:11 heikki@hundin.mysql.fi +1 -1
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/ut0dbg.h
    1.10 03/06/15 00:57:11 heikki@hundin.mysql.fi +31 -0
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/trx0types.h
    1.3 03/06/15 00:57:11 heikki@hundin.mysql.fi +1 -0
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/trx0trx.h
    1.26 03/06/15 00:57:11 heikki@hundin.mysql.fi +6 -1
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/trx0roll.h
    1.3 03/06/15 00:57:11 heikki@hundin.mysql.fi +64 -0
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/data0type.ic
    1.5 03/06/15 00:57:11 heikki@hundin.mysql.fi +27 -8
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/srv0srv.h
    1.21.1.3 03/06/15 00:57:10 heikki@hundin.mysql.fi +1 -0
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/row0upd.h
    1.6 03/06/15 00:57:10 heikki@hundin.mysql.fi +13 -17
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/row0sel.h
    1.2.1.1 03/06/15 00:57:10 heikki@hundin.mysql.fi +6 -3
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/row0row.h
    1.3 03/06/15 00:57:10 heikki@hundin.mysql.fi +4 -3
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/rem0cmp.h
    1.4 03/06/15 00:57:10 heikki@hundin.mysql.fi +16 -0
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/page0page.h
    1.4 03/06/15 00:57:10 heikki@hundin.mysql.fi +9 -0
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/os0file.h
    1.18 03/06/15 00:57:10 heikki@hundin.mysql.fi +23 -0
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/lock0lock.h
    1.7 03/06/15 00:57:10 heikki@hundin.mysql.fi +12 -0
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/fil0fil.h
    1.6 03/06/15 00:57:10 heikki@hundin.mysql.fi +5 -2
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/dict0mem.h
    1.14 03/06/15 00:57:10 heikki@hundin.mysql.fi +17 -8
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/dict0dict.h
    1.16 03/06/15 00:57:10 heikki@hundin.mysql.fi +13 -0
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/db0err.h
    1.8 03/06/15 00:57:09 heikki@hundin.mysql.fi +3 -1
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/data0type.h
    1.3 03/06/15 00:57:09 heikki@hundin.mysql.fi +44 -22
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/data0data.h
    1.6 03/06/15 00:57:09 heikki@hundin.mysql.fi +0 -2
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/buf0buf.h
    1.12.1.2 03/06/15 00:57:09 heikki@hundin.mysql.fi +15 -2
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/include/btr0cur.h
    1.10 03/06/15 00:57:09 heikki@hundin.mysql.fi +7 -1
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/ibuf/ibuf0ibuf.c
    1.18 03/06/15 00:56:49 heikki@hundin.mysql.fi +4 -4
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/ha/ha0ha.c
    1.4.1.1 03/06/15 00:56:43 heikki@hundin.mysql.fi +5 -3
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/fsp/fsp0fsp.c
    1.13 03/06/15 00:56:29 heikki@hundin.mysql.fi +2 -2
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/fil/fil0fil.c
    1.12 03/06/15 00:56:19 heikki@hundin.mysql.fi +3 -3
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/dict/dict0mem.c
    1.9 03/06/15 00:56:04 heikki@hundin.mysql.fi +9 -4
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/dict/dict0load.c
    1.7.1.2 03/06/15 00:56:04 heikki@hundin.mysql.fi +25 -3
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/dict/dict0dict.c
    1.26.1.3 03/06/15 00:56:04 heikki@hundin.mysql.fi +102 -60
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/dict/dict0crea.c
    1.12 03/06/15 00:56:04 heikki@hundin.mysql.fi +25 -3
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/dict/dict0boot.c
    1.5 03/06/15 00:56:04 heikki@hundin.mysql.fi +8 -8
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/data/data0type.c
    1.5 03/06/15 00:55:54 heikki@hundin.mysql.fi +0 -2
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/data/data0data.c
    1.10 03/06/15 00:55:54 heikki@hundin.mysql.fi +18 -12
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/buf/buf0flu.c
    1.14.1.5 03/06/15 00:55:39 heikki@hundin.mysql.fi +16 -8
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/buf/buf0buf.c
    1.17.1.7 03/06/15 00:55:39 heikki@hundin.mysql.fi +81 -29
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/btr/btr0pcur.c
    1.5.1.2 03/06/15 00:55:27 heikki@hundin.mysql.fi +2 -0
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  innobase/btr/btr0cur.c
    1.20.1.4 03/06/15 00:55:27 heikki@hundin.mysql.fi +14 -52
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  mysql-test/r/innodb.result
    1.40.1.27 03/06/15 00:54:29 heikki@hundin.mysql.fi +0 -10
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  mysql-test/t/innodb.test
    1.28.1.17 03/06/15 00:54:19 heikki@hundin.mysql.fi +0 -9
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  include/my_base.h
    1.30.1.10 03/06/15 00:53:54 heikki@hundin.mysql.fi +1 -0
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  sql/sql_yacc.yy
    1.145.1.65 03/06/15 00:53:04 heikki@hundin.mysql.fi +1 -2
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  sql/sql_parse.cc
    1.218.25.5 03/06/15 00:52:49 heikki@hundin.mysql.fi +15 -1
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  sql/handler.cc
    1.82.1.19 03/06/15 00:52:48 heikki@hundin.mysql.fi +64 -1
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  sql/ha_innodb.cc
    1.73.1.99 03/06/15 00:52:48 heikki@hundin.mysql.fi +365 -89
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  sql/sql_lex.h
    1.66.1.14 03/06/15 00:52:33 heikki@hundin.mysql.fi +3 -2
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  sql/handler.h
    1.71.1.14 03/06/15 00:52:33 heikki@hundin.mysql.fi +2 -0
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

  sql/ha_innodb.h
    1.48.2.9 03/06/15 00:52:33 heikki@hundin.mysql.fi +16 -3
    Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed

ChangeSet
  1.1538.29.2 03/06/14 17:33:25 vva@eagle.mysql.r18.ru +1 -0
  fixed bug with './' prefix in mysql_install_db

  scripts/mysql_install_db.sh
    1.37.1.8 03/06/14 17:33:23 vva@eagle.mysql.r18.ru +1 -1
    fixed bug with './' prefix 

ChangeSet
  1.1346.200.64 03/06/14 16:40:00 guilhem@mysql.com +1 -0
  - Fix for bug 651: now a dying SQL slave threads wakes up any waiting MASTER_POS_WAIT().
  Could not add a testcase for this: if the test goes into a MASTER_POS_WAIT, it waits
  until this terminates (even doing "connection other_con" to launch "stop slave" is blocked).
  - In MASTER_POS_WAIT() don't test if the I/O slave is running, but if the SQL thread
  is running.
  - Some DBUG info for this bugfix.

  sql/slave.cc
    1.164.1.64 03/06/14 16:39:52 guilhem@mysql.com +32 -4
    Fix for bug 651: now a dying SQL slave threads wakes up any waiting MASTER_POS_WAIT().
    In MASTER_POS_WAIT() don't test if the I/O slave is running, but if the SQL thread
    is running.
    Some DBUG info.

ChangeSet
  1.1346.239.1 03/06/14 12:29:42 jani@rhols221.adsl.netsonic.fi +1 -0
  Added option --skip-kill-mysqld to mysqld_safe. This can be useful,
  if one is running many mysqlds through mysqld_multi, for example.
  Without this option, on Linux one mysqld_safe process may kill
  other mysqlds as well, if started using the same binary and path.

  scripts/mysqld_safe.sh
    1.56.1.6 03/06/14 12:29:40 jani@rhols221.adsl.netsonic.fi +7 -1
    Added option --skip-kill-mysqld to mysqld_safe. This can be useful,
    if one is running many mysqlds through mysqld_multi, for example.
    Without this option, on Linux one mysqld_safe process may kill
    other mysqlds as well, if started using the same binary and path.

ChangeSet
  1.1538.39.6 03/06/14 11:38:09 monty@narttu.mysql.fi +6 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into narttu.mysql.fi:/my/mysql-4.1

  sql/slave.cc
    1.188.1.11 03/06/14 11:38:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/set_var.cc
    1.34.9.1 03/06/14 11:38:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.11.2 03/06/14 11:38:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/log.cc
    1.108.1.7 03/06/14 11:38:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/type_blob.result
    1.24 03/06/14 11:38:02 monty@narttu.mysql.fi +0 -1
    Auto merged

  client/mysql.cc
    1.121.1.16 03/06/14 11:38:02 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1538.42.1 03/06/14 11:37:42 monty@narttu.mysql.fi +22 -0
  Cleanup after split of libmysql.c to client.c and libmysql.c.  A 4.1 master/slave will now use the 4.1 protocol
  Fixed wrong value for SQLSTATE_LENGTH
  Added CLIENT_REMEMBER_OPTIONS to mysql_real_connect()
  Changed mysql_port and mysql_unix_port to mysqld_xxxx

  sql/sql_client.cc
    1.1 03/06/14 11:37:39 monty@narttu.mysql.fi +45 -0

  sql/sql_client.cc
    1.0 03/06/14 11:37:39 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.1/sql/sql_client.cc

  sql/slave.cc
    1.188.3.1 03/06/14 11:37:39 monty@narttu.mysql.fi +24 -25
    Cleanup after split of libmysql.c to client.c and libmysql.c

  sql/set_var.cc
    1.34.8.1 03/06/14 11:37:39 monty@narttu.mysql.fi +2 -2
    Changed mysql_port and mysql_unix_port to mysqld_xxxx

  sql/repl_failsafe.cc
    1.32 03/06/14 11:37:39 monty@narttu.mysql.fi +11 -10
    Cleanup after split of libmysql.c to client.c and libmysql.c

  sql/protocol.cc
    1.56.1.6 03/06/14 11:37:39 monty@narttu.mysql.fi +1 -24
    Fix for SQLSTATE_LENGTH
    Moved function to sql_client.c

  sql/mysqld.cc
    1.356.12.1 03/06/14 11:37:39 monty@narttu.mysql.fi +35 -33
    Changed mysql_port and mysql_unix_port to mysqld_xxxx

  sql/mysql_priv.h
    1.186.9.1 03/06/14 11:37:39 monty@narttu.mysql.fi +2 -2
    Changed mysql_port and mysql_unix_port to mysqld_xxxx

  sql/log.cc
    1.108.2.1 03/06/14 11:37:39 monty@narttu.mysql.fi +2 -2
    Changed mysql_port and mysql_unix_port to mysqld_xxxx

  sql/client_settings.h
    1.4 03/06/14 11:37:39 monty@narttu.mysql.fi +7 -10
    Cleanup after split of libmysql.c to client.c and libmysql.c

  sql/Makefile.am
    1.77.1.9 03/06/14 11:37:39 monty@narttu.mysql.fi +1 -1
    Added sql_client.cc

  sql-common/client.c
    1.9 03/06/14 11:37:39 monty@narttu.mysql.fi +380 -441
    Cleanup after split of libmysql.c to client.c and libmysql.c

  mysys/errors.c
    1.13 03/06/14 11:37:39 monty@narttu.mysql.fi +1 -1
    Fixed wrong error message

  mysys/charset.c
    1.96 03/06/14 11:37:39 monty@narttu.mysql.fi +8 -4
    More debug information

  mysql-test/r/type_blob.result
    1.22.1.1 03/06/14 11:37:39 monty@narttu.mysql.fi +1 -1
    Update results after someone updated error messages without running tests

  libmysql/libmysql.c
    1.156.1.10 03/06/14 11:37:39 monty@narttu.mysql.fi +89 -94
    Cleanup after split of libmysql.c to client.c and libmysql.c

  libmysql/client_settings.h
    1.3 03/06/14 11:37:39 monty@narttu.mysql.fi +4 -21
    Cleanup after split of libmysql.c to client.c and libmysql.c

  include/sql_state.h
    1.2 03/06/14 11:37:39 monty@narttu.mysql.fi +0 -3
    Removed default states

  include/sql_common.h
    1.4 03/06/14 11:37:39 monty@narttu.mysql.fi +0 -4
    Cleanup after split of libmysql.c to client.c and libmysql.c

  include/mysql_com.h
    1.67.3.4 03/06/14 11:37:39 monty@narttu.mysql.fi +2 -1
    Fixed wrong value for SQLSTATE_LENGTH
    Added CLIENT_REMEMBER_OPTIONS

  include/mysql.h
    1.70.1.2 03/06/14 11:37:39 monty@narttu.mysql.fi +10 -12
    Added read_timeout and write_timeout to mysql options struct.
    This is to be used for slave when connection to master.
    code cleanup

  client/sql_string.h
    1.11 03/06/14 11:37:39 monty@narttu.mysql.fi +8 -0
    Fix to remove valgrind warnings

  client/mysql.cc
    1.121.3.1 03/06/14 11:37:39 monty@narttu.mysql.fi +4 -1
    Removed valgrind & compiler warnings

ChangeSet
  1.1538.39.5 03/06/13 23:00:04 serg@serg.mylan +2 -0
  bug #251 - destroyed object reused - fixed

  sql/sql_select.cc
    1.216.14.2 03/06/13 23:00:00 serg@serg.mylan +1 -1
    bug #251 - destroyed object reused - fixed

  sql/field.h
    1.72.1.2 03/06/13 23:00:00 serg@serg.mylan +5 -4
    bug #251 - destroyed object reused - fixed

ChangeSet
  1.1538.41.2 03/06/13 19:25:26 serg@serg.mylan +1 -0
  mysql.server should read [server] group from my.cnf - according to the manual

  support-files/mysql.server.sh
    1.30 03/06/13 19:25:23 serg@serg.mylan +1 -1
    mysql.server should read [server] group from my.cnf - according to the manual

  mysql-test/r/preload.result
    1.2 03/06/13 09:09:18 igor@rurik.mysql.com +5 -5
    Syntax change for preload statement

  mysql-test/t/preload.test
    1.2 03/06/13 09:08:59 igor@rurik.mysql.com +5 -5
    Syntax change for preload statement

  sql/lex.h
    1.82.1.34 03/06/13 09:08:20 igor@rurik.mysql.com +0 -1
    Syntax change for preload statement

  sql/sql_yacc.yy
    1.203.42.10 03/06/13 09:07:37 igor@rurik.mysql.com +4 -6
    Syntax change for preload statement

ChangeSet
  1.1346.236.9 03/06/13 14:47:23 lenz@mysql.com +1 -0
   - replaced obsolete Macro AM_CONFIG_HEADER with AC_CONFIG_HEADERS
   - Added missing function name in checking for sem_init in posix4 libs on
     Solaris

  configure.in
    1.191.1.85 03/06/13 14:47:19 lenz@mysql.com +2 -2
     - replaced obsolete Macro AM_CONFIG_HEADER with AC_CONFIG_HEADERS
     - Added missing function name in checking for sem_init in posix4 libs on
       Solaris

ChangeSet
  1.1538.39.3 03/06/13 11:17:31 guilhem@mysql.com +3 -0
  cleaned user used in tests 'connect' and 'rpl_temporary'

  mysql-test/t/rpl_temporary.test
    1.8 03/06/13 11:17:26 guilhem@mysql.com +1 -3
    use '' instead of 'boo'

  mysql-test/t/connect.test
    1.4 03/06/13 11:17:26 guilhem@mysql.com +5 -0
    clean after we are done

  mysql-test/r/connect.result
    1.1.1.3 03/06/13 11:17:25 guilhem@mysql.com +2 -0
    result update

ChangeSet
  1.1538.41.1 03/06/13 10:59:02 serg@serg.mylan +18 -0
  consistency fix - all help texts for command-line options should end with a dot.

  tools/mysqlmanager.c
    1.37 03/06/13 10:58:59 serg@serg.mylan +7 -7
    consistency fix - all help texts for command-line options should end with a dot.

  myisam/myisampack.c
    1.27 03/06/13 10:58:59 serg@serg.mylan +2 -2
    consistency fix - all help texts for command-line options should end with a dot.

  myisam/myisamchk.c
    1.92.1.2 03/06/13 10:58:59 serg@serg.mylan +25 -26
    consistency fix - all help texts for command-line options should end with a dot.

  myisam/ft_dump.c
    1.19 03/06/13 10:58:59 serg@serg.mylan +10 -8
    consistency fix - all help texts for command-line options should end with a dot.

  extra/resolveip.c
    1.18 03/06/13 10:58:59 serg@serg.mylan +1 -1
    consistency fix - all help texts for command-line options should end with a dot.

  extra/perror.c
    1.21 03/06/13 10:58:59 serg@serg.mylan +2 -2
    consistency fix - all help texts for command-line options should end with a dot.

  extra/my_print_defaults.c
    1.11 03/06/13 10:58:58 serg@serg.mylan +6 -7
    consistency fix - all help texts for command-line options should end with a dot.

  client/mysqltest.c
    1.92.1.7 03/06/13 10:58:58 serg@serg.mylan +14 -15
    consistency fix - all help texts for command-line options should end with a dot.

  client/mysqlshow.c
    1.31 03/06/13 10:58:58 serg@serg.mylan +8 -8
    consistency fix - all help texts for command-line options should end with a dot.

  client/mysqlmanager-pwgen.c
    1.10 03/06/13 10:58:58 serg@serg.mylan +4 -4
    consistency fix - all help texts for command-line options should end with a dot.

  client/mysqlimport.c
    1.36 03/06/13 10:58:58 serg@serg.mylan +7 -7
    consistency fix - all help texts for command-line options should end with a dot.

  client/mysqldump.c
    1.93 03/06/13 10:58:58 serg@serg.mylan +7 -7
    consistency fix - all help texts for command-line options should end with a dot.

  client/mysqlcheck.c
    1.32 03/06/13 10:58:58 serg@serg.mylan +7 -7
    consistency fix - all help texts for command-line options should end with a dot.

  client/mysqlbinlog.cc
    1.77 03/06/13 10:58:58 serg@serg.mylan +14 -14
    consistency fix - all help texts for command-line options should end with a dot.

  client/mysqladmin.c
    1.77 03/06/13 10:58:58 serg@serg.mylan +9 -9
    consistency fix - all help texts for command-line options should end with a dot.

  client/mysql.cc
    1.121.1.15 03/06/13 10:58:58 serg@serg.mylan +5 -5
    consistency fix - all help texts for command-line options should end with a dot.

ChangeSet
  1.1538.39.2 03/06/12 23:16:21 guilhem@mysql.com +1 -0
  user change to avoid conflicts with user 'test'

  mysql-test/t/rpl_temporary.test
    1.7 03/06/12 23:16:15 guilhem@mysql.com +3 -1
    user change to avoid conflicts with user 'test'
    (to which test connect.test gives password "gambling", so depending
    on the order of the tests, 'test' has password '' or 'gambling':
    better to use an unknown user which will be directed to ''@localhost
    with password always '').

  sql/mysqld.cc
    1.356.11.1 03/06/12 21:59:18 serg@serg.mylan +118 -120
    consistency fix - all help texts for command-line options should end with a dot.

  include/sslopt-longopts.h
    1.9 03/06/12 21:59:18 serg@serg.mylan +6 -6
    consistency fix - all help texts for command-line options should end with a dot.

ChangeSet
  1.1346.236.8 03/06/12 22:40:08 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.218.25.4 03/06/12 22:40:06 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.238.2 03/06/12 22:39:45 monty@narttu.mysql.fi +7 -0
  Changed safemalloc structure to not have to be 8 byte aligned. (Portability problem)
  

  sql/sql_parse.cc
    1.218.26.1 03/06/12 22:39:44 monty@narttu.mysql.fi +3 -2
    Changed safe_malloc variables to start with sf_

  sql/mysqld.cc
    1.297.1.139 03/06/12 22:39:44 monty@narttu.mysql.fi +1 -1
    Changed safe_malloc variables to start with sf_

  mysys/safemalloc.c
    1.22 03/06/12 22:39:44 monty@narttu.mysql.fi +148 -157
    Changed safemalloc structure to not have to be 8 byte aligned. (portability fix)
    BIG code cleanup
    

  mysys/my_static.h
    1.15 03/06/12 22:39:44 monty@narttu.mysql.fi +14 -18
    Changed safe_malloc variables to start with sf_
    Changed safemalloc structure to not have to be 8 byte aligned

  mysys/my_static.c
    1.12 03/06/12 22:39:44 monty@narttu.mysql.fi +5 -6
    Changed safe_malloc variables to start with sf_

  mysys/default.c
    1.17.1.10 03/06/12 22:39:44 monty@narttu.mysql.fi +0 -2
    Use safemalloc (as we use dynamic_arrays() that uses it inderectly anyway)

  include/my_sys.h
    1.75.1.22 03/06/12 22:39:44 monty@narttu.mysql.fi +2 -2
    Changed safe_malloc variables to start with sf_

ChangeSet
  1.1346.236.7 03/06/12 18:46:12 serg@serg.mylan +1 -0
  removed a wrong cast that limited ulonglong options to max. ulong value.

  mysys/my_getopt.c
    1.35 03/06/12 18:46:09 serg@serg.mylan +2 -2
    removed a wrong cast that limited ulonglong options to max. ulong value.

ChangeSet
  1.1346.236.6 03/06/12 17:38:15 serg@serg.mylan +1 -0
  HANDLER priv check fixed

  sql/sql_parse.cc
    1.218.25.3 03/06/12 17:38:13 serg@serg.mylan +4 -2
    HANDLER priv check fixed

ChangeSet
  1.1346.236.5 03/06/12 17:05:45 serg@serg.mylan +1 -0
  typed moved to a proper place

  include/my_global.h
    1.34.4.2 03/06/12 17:05:43 serg@serg.mylan +3 -3
    typed moved to a proper place

ChangeSet
  1.1538.38.1 03/06/12 16:20:31 guilhem@mysql.com +5 -0
  See each file's changeset for details.
  - Comments for future devs.
  - Start_log_event::exec_event() : when we hit it, do a rollback.
  - We don't need LOG_EVENT_FORCED_ROTATE_F.
  - Stop_log_event::exec_event() : when we hit it, we needn't clean anything.
  - Removed LOG_EVENT_TIME_F and LOG_EVENT_FORCED_ROTATE_F.
  - We don't need Stop events in the relay log.
  - Now filtering of server id is done in the I/O thread first.

  sql/slave.h
    1.62 03/06/12 16:20:24 guilhem@mysql.com +0 -2
    We don't need master_info.ignore_stop_event anymore, as we don't write Stop_event
    to the relay log anymore.

  sql/slave.cc
    1.188.1.10 03/06/12 16:20:24 guilhem@mysql.com +56 -23
    - We don't need Stop events in the relay log (see changeset's description about
    log_event.cc). So we can make event queuing (writing to the relay log) simpler.
    - Something that was marked TODO: now filtering of server id (if the server id
    of this event is the same as mine ignore it) is done in the I/O thread if
    the master is 4.x (it still also done in the SQL thread whatever the version of
    the master is, for safe upgrades). This saves disk space.

  sql/log_event.h
    1.86 03/06/12 16:20:23 guilhem@mysql.com +108 -11
    - Comments for future devs.
    - Removed LOG_EVENT_TIME_F and LOG_EVENT_FORCED_ROTATE_F.

  sql/log_event.cc
    1.113.1.8 03/06/12 16:20:23 guilhem@mysql.com +31 -28
    - Comments for future devs.
    - Start_log_event::exec_event() : when we hit it, do a rollback. If the SQL
    thread was inside a transaction (for example, the master died while writing
    to the binlog, so did not commit (because we write to the binlog before committing),
    so will rollback), it's sensible to rollback. If we're not in a transaction,
    rollback will not hurt (it will do nothing).
    - We don't need LOG_EVENT_FORCED_ROTATE_F.
    - Stop_log_event::exec_event() : when we hit it, we needn't clean anything, because
    each threads has already written some cleaning statements (DROP TEMPORARY TABLE,
    DO RELEASE_LOCK); we still clean in Start_log_event::exec_event() (if 4.x).

  sql/log.cc
    1.108.1.6 03/06/12 16:20:23 guilhem@mysql.com +0 -8
    We don't need LOG_EVENT_FORCED_ROTATE_F

ChangeSet
  1.1538.32.8 03/06/12 16:52:36 Sinisa@sinisa.nasamreza.org +6 -0
  Derived tables bug fix .......

  sql/table.h
    1.48.2.1 03/06/12 16:52:31 Sinisa@sinisa.nasamreza.org +1 -0
    Derived tables bug fix .......

  sql/sql_table.cc
    1.157.7.1 03/06/12 16:52:31 Sinisa@sinisa.nasamreza.org +13 -4
    DISABLE KEYS warnings

  sql/sql_derived.cc
    1.43.3.3 03/06/12 16:52:31 Sinisa@sinisa.nasamreza.org +10 -2
    Derived tables bug fix .......

  sql/sql_base.cc
    1.145.5.1 03/06/12 16:52:31 Sinisa@sinisa.nasamreza.org +3 -1
    Derived tables bug fix .......

  sql/ha_myisam.cc
    1.115.3.1 03/06/12 16:52:31 Sinisa@sinisa.nasamreza.org +12 -0
    DISABLE KEYS warnings

  mysql-test/r/innodb.result
    1.66 03/06/12 16:52:31 Sinisa@sinisa.nasamreza.org +5 -5
    Derived tables bug fix .......

ChangeSet
  1.1524.1.11 03/06/12 15:31:20 pem@mysql.com +3 -0
  Fixed bug #643, which caused intermittent crashes in net_printf() with repeated
  syntax errors in stored procedures.

  sql/sp_head.cc
    1.33 03/06/12 15:31:13 pem@mysql.com +1 -0
    Forgot to copy a slot from the original lex. (bug #643)

  mysql-test/t/sp-error.test
    1.8 03/06/12 15:31:13 pem@mysql.com +10 -0
    New test case for bugfix (#643)

  mysql-test/r/sp-error.result
    1.7 03/06/12 15:31:12 pem@mysql.com +6 -0
    New test case for bugfix (#643)

ChangeSet
  1.1346.238.1 03/06/12 16:25:26 monty@narttu.mysql.fi +1 -0
  Indentation

  mysys/safemalloc.c
    1.21 03/06/12 16:25:24 monty@narttu.mysql.fi +123 -128
    Indentation fixes
    Changes (long*) to (uint32*) to fix a portability problem

ChangeSet
  1.1538.28.17 03/06/12 06:22:35 igor@rurik.mysql.com +16 -0
  Merge rurik.mysql.com:/home/igor/mysql-4.1
  into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  sql/sql_yacc.yy
    1.203.42.9 03/06/12 06:22:31 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_table.cc
    1.157.2.8 03/06/12 06:22:31 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.3.18 03/06/12 06:22:31 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.11.2 03/06/12 06:22:31 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.146.1.25 03/06/12 06:22:31 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/sql_base.cc
    1.145.1.7 03/06/12 06:22:31 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/set_var.cc
    1.34.1.23 03/06/12 06:22:31 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.26 03/06/12 06:22:31 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.14 03/06/12 06:22:31 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/lex.h
    1.82.1.33 03/06/12 06:22:31 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/handler.h
    1.81 03/06/12 06:22:31 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/handler.cc
    1.93 03/06/12 06:22:31 igor@rurik.mysql.com +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.115.1.3 03/06/12 06:22:31 igor@rurik.mysql.com +0 -0
    Auto merged

  myisam/myisamdef.h
    1.59.1.4 03/06/12 06:22:31 igor@rurik.mysql.com +0 -0
    Auto merged

  include/my_sys.h
    1.100 03/06/12 06:22:31 igor@rurik.mysql.com +0 -0
    Auto merged

  include/my_base.h
    1.43 03/06/12 06:22:31 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1538.28.16 03/06/12 06:20:11 igor@rurik.mysql.com +1 -0
  Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
  into rurik.mysql.com:/home/igor/mysql-4.1

  BitKeeper/etc/logging_ok
    1.233.1.15 03/06/12 06:19:56 igor@rurik.mysql.com +0 -0
    auto-union

ChangeSet
  1.1524.2.13 03/06/12 05:26:50 igor@rurik.mysql.com +2 -0
  preload.result, preload.test:
    new file

  mysql-test/r/preload.result
    1.1 03/06/12 05:26:16 igor@rurik.mysql.com +214 -0

  mysql-test/r/preload.result
    1.0 03/06/12 05:26:16 igor@rurik.mysql.com +0 -0
    BitKeeper file /home/igor/dev/mysql-4.1-0/mysql-test/r/preload.result

  mysql-test/t/preload.test
    1.1 03/06/12 05:26:02 igor@rurik.mysql.com +101 -0

  mysql-test/t/preload.test
    1.0 03/06/12 05:26:02 igor@rurik.mysql.com +0 -0
    BitKeeper file /home/igor/dev/mysql-4.1-0/mysql-test/t/preload.test

ChangeSet
  1.1346.236.4 03/06/12 13:52:24 lenz@mysql.com +1 -0
   - applied patch for mysqld_safe from Christian Hammers to be able to
     define a different niceness level in my.cnf (Bug #627)

  scripts/mysqld_safe.sh
    1.56.1.5 03/06/12 13:52:22 lenz@mysql.com +12 -3
     - applied patch from Christian Hammers to be able to define a different
       niceness level in my.cnf (Bug #627)

ChangeSet
  1.1524.2.12 03/06/12 04:29:02 igor@rurik.mysql.com +23 -0
  Many files:
    New feature: preload indexes into key cache.
  mi_preload.c:
    new file
  Many files:
    Added preload statement.

ChangeSet
  1.1538.36.1 03/06/12 12:41:29 serg@serg.mylan +1 -0
  FT2 bug in mi_delete fixed

  myisam/mi_delete.c
    1.22 03/06/12 12:41:26 serg@serg.mylan +1 -1
    FT2 bug in mi_delete fixed

ChangeSet
  1.1538.28.14 03/06/11 16:27:26 paul@ice.snake.net +2 -0
  ft_update.c:
    Fix parse error per serg instructions.

  BitKeeper/etc/logging_ok
    1.233.9.3 03/06/11 16:27:25 paul@ice.snake.net +1 -0
    Logging to logging@openlogging.org accepted

  myisam/ft_update.c
    1.28 03/06/11 16:25:42 paul@ice.snake.net +12 -2
    Fix parse error per serg instructions.

ChangeSet
  1.1346.237.2 03/06/11 22:07:23 hf@deer.(none) +2 -0
  test case for bug #614

  mysql-test/t/func_time.test
    1.14.1.1 03/06/11 22:07:22 hf@deer.(none) +2 -0
    testcase added

  mysql-test/r/func_time.result
    1.17.1.1 03/06/11 22:07:22 hf@deer.(none) +3 -0
    result's checking added

  include/myisam.h
    1.49 03/06/11 09:58:05 igor@rurik.mysql.com +1 -0
    New feature: preload indexes into key cache.

  include/my_sys.h
    1.97.2.1 03/06/11 09:57:43 igor@rurik.mysql.com +2 -0
    New feature: preload indexes into key cache.

  include/my_base.h
    1.41.1.1 03/06/11 09:57:22 igor@rurik.mysql.com +3 -1
    New feature: preload indexes into key cache.

  myisam/mi_preload.c
    1.1 03/06/11 09:56:00 igor@rurik.mysql.com +118 -0

  myisam/mi_preload.c
    1.0 03/06/11 09:56:00 igor@rurik.mysql.com +0 -0
    BitKeeper file /home/igor/dev/mysql-4.1-0/myisam/mi_preload.c

  myisam/Makefile.am
    1.24 03/06/11 09:54:59 igor@rurik.mysql.com +1 -0
    New feature: preload indexes into key cache.

  myisam/mi_extra.c
    1.32 03/06/11 09:54:39 igor@rurik.mysql.com +3 -0
    New feature: preload indexes into key cache.

  myisam/myisamdef.h
    1.59.2.2 03/06/11 09:54:20 igor@rurik.mysql.com +1 -2
    New feature: preload indexes into key cache.

  mysys/mf_keycache.c
    1.26 03/06/11 09:53:34 igor@rurik.mysql.com +80 -0
    New feature: preload indexes into key cache.

  sql/sql_class.h
    1.146.11.1 03/06/11 09:52:52 igor@rurik.mysql.com +1 -0

  sql/table.h
    1.48.1.2 03/06/11 09:52:14 igor@rurik.mysql.com +1 -1
    New feature: preload indexes into key cache.

  sql/ha_myisam.cc
    1.115.2.2 03/06/11 09:51:42 igor@rurik.mysql.com +24 -87
    New feature: preload indexes into key cache.

  sql/sql_yacc.yy
    1.203.43.2 03/06/11 09:51:21 igor@rurik.mysql.com +31 -29
    New feature: preload indexes into key cache.

  sql/set_var.cc
    1.34.7.1 03/06/11 09:50:27 igor@rurik.mysql.com +4 -0
    New feature: preload indexes into key cache.

  sql/mysqld.cc
    1.356.10.1 03/06/11 09:49:16 igor@rurik.mysql.com +6 -0
    New feature: preload indexes into key cache.

  sql/sql_parse.cc
    1.271.7.2 03/06/11 09:48:18 igor@rurik.mysql.com +2 -3
    New feature: preload indexes into key cache.

  sql/sql_table.cc
    1.157.5.2 03/06/11 09:46:06 igor@rurik.mysql.com +15 -1
    New feature: preload indexes into key cache.

ChangeSet
  1.1346.237.1 03/06/11 20:09:37 hf@deer.(none) +3 -0
  Bugfix for #614
  
  Item_extract needs special implementation for eq().
  Item_func::eq doesn't work correctly because we have to compare 
  Item_extract::int_type parameters also
  
  We need to propagate this to 4.1

  BitKeeper/etc/logging_ok
    1.206.1.69 03/06/11 20:09:37 hf@deer.(none) +1 -0
    Logging to logging@openlogging.org accepted

  sql/item_timefunc.h
    1.13.1.9 03/06/11 20:09:09 hf@deer.(none) +1 -0
    Item_extract::eq definition added

  sql/item_timefunc.cc
    1.17.1.5 03/06/11 20:09:09 hf@deer.(none) +16 -0
    Item_extract::eq implementation added

ChangeSet
  1.1538.28.12 03/06/11 17:07:34 serg@serg.mylan +2 -0
  test result updated

ChangeSet
  1.1538.35.1 03/06/11 17:07:33 guilhem@mysql.com +4 -0
  We now require SUPER privilege for SET PSEUDO_THREAD_ID.

  mysql-test/t/rpl_relayrotate.test
    1.3 03/06/11 17:07:31 serg@serg.mylan +2 -0
    when mysqld has no innodb compiled in it's not a bug!

  mysql-test/r/type_blob.result
    1.23 03/06/11 17:07:31 serg@serg.mylan +1 -1
    test result updated

  sql/set_var.h
    1.28 03/06/11 17:07:27 guilhem@mysql.com +9 -0
    Class for pseudo_thread_id

  sql/set_var.cc
    1.34.1.22 03/06/11 17:07:26 guilhem@mysql.com +16 -1
    Class for pseudo_thread_id (it used to be sys_var_thd_ulong, but we 
    decided to require the SUPER privilege so we needed a check() function,
    which sys_var_thd_ulong does not feature (check() is virtual in sys_var
    and in sys_var_thd_ulong too).

  mysql-test/t/rpl_temporary.test
    1.6 03/06/11 17:07:26 guilhem@mysql.com +8 -0
    test that PSEUDO_THREAD_ID now requires SUPER.

  mysql-test/r/rpl_temporary.result
    1.3.1.3 03/06/11 17:07:26 guilhem@mysql.com +2 -0
    result update

ChangeSet
  1.676.1.712 03/06/11 15:41:03 heikki@hundin.mysql.fi +1 -0
  os0file.c:
    Prevent on Windows starting of two mysqld instances on SAME InnoDB files: that could cause severe database corruption

  innobase/os/os0file.c
    1.31.1.18 03/06/11 15:40:56 heikki@hundin.mysql.fi +11 -6
    Prevent on Windows starting of two mysqld instances on SAME InnoDB files: that could cause severe database corruption

ChangeSet
  1.1346.236.2 03/06/11 13:40:20 lenz@mysql.com +1 -0
   - applied patch to mysql_explain_log.sh provided by Dennis Haney
     to accept --socket option (Bug #592)

  scripts/mysql_explain_log.sh
    1.3 03/06/11 13:40:17 lenz@mysql.com +12 -3
     - applied patch provided by Dennis Haney to accept --socket option
       (Bug #592)

ChangeSet
  1.1346.236.1 03/06/11 13:38:02 lenz@mysql.com +1 -0
   - fixed a path to init script in RPM spec file (/sbin/init.d is obsolete)

  support-files/mysql.spec.sh
    1.61.1.6 03/06/11 13:37:58 lenz@mysql.com +1 -1
     - fixed path to init script (/sbin/init.d is obsolete)

ChangeSet
  1.1538.28.11 03/06/11 13:32:50 serg@serg.mylan +1 -0
  protect deleted objects from reusal with safemalloc technique

  sql/field.h
    1.72.1.1 03/06/11 13:32:46 serg@serg.mylan +5 -1
    protect deleted objects from reusal with safemalloc technique

ChangeSet
  1.1346.200.63 03/06/10 23:31:09 guilhem@mysql.com +1 -0
  Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
  into mysql.com:/home/mysql_src/mysql-4.0

  mysql-test/mysql-test-run.sh
    1.146.1.26 03/06/10 23:31:03 guilhem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.235.1 03/06/10 23:29:49 guilhem@mysql.com +5 -0
  More error messages. This is intended to help debugging; presently I have a
  support issue with an unclear message which can have N reasons for appearing.
  This should help us know at which point it failed, and get the errno when
  my_open was involved (as the reason for the unclear message is often a
  permission problem).
  RESET SLAVE resets last_error and last_errno in SHOW SLAVE STATUS (without this,
  rpl_loaddata.test, which is expected to generate an error in last_error, influenced
  rpl_log_pos.test).
  A small test update.
  Added STOP SLAVE to mysql-test-run to get rid of several stupid error messages
  which are printed while the master restarts and the slave attempts/manages to
  connect to it and sends it nonsense binlog requests.

  sql/sql_repl.cc
    1.86.1.9 03/06/10 23:29:43 guilhem@mysql.com +13 -2
    More error messages.
    RESET SLAVE resets last_error and last_errno in SHOW SLAVE STATUS.

  sql/slave.cc
    1.164.1.63 03/06/10 23:29:42 guilhem@mysql.com +93 -26
    More error messages.

  mysql-test/t/rpl000018.test
    1.6.1.1 03/06/10 23:29:42 guilhem@mysql.com +2 -0
    This test does "show master logs" so should do "reset master" instead of
    relying on the previous tests.

  mysql-test/r/rpl000018.result
    1.4.1.1 03/06/10 23:29:42 guilhem@mysql.com +1 -0
    Result update.

  mysql-test/mysql-test-run.sh
    1.146.6.1 03/06/10 23:29:41 guilhem@mysql.com +16 -0
    Before running a test, stop slave threads if they exist (if they don't
    the script goes on fine). This also works fine with the manager.
    Before this change, when the master was stopped/restarted (which happened before
    the slave server was stopped/restarted), the slave threads
    noticed the stop (so printed an error message in slave.err), then managed to
    reconnect (to the new master, the one that is running for the _next_ test),
    and this reconnection had time to produce error messages (because, for example,
    the binlog the slave thread was asking had been deleted) before the slave server
    was killed. This change reduces by 10% (40 lines) slave.err in replication tests.

ChangeSet
  1.1346.200.62 03/06/10 21:42:29 monty@narttu.mysql.fi +6 -0
  Don't install signal handler for SIGINT by default
  Added option --gdb
  Free memory used by replicate_xxx and binglog_xxx options

  sql/sql_list.cc
    1.6 03/06/10 21:42:28 monty@narttu.mysql.fi +15 -0
    Added free_list() to free memory on shutdown.

  sql/repl_failsafe.cc
    1.11.1.18 03/06/10 21:42:28 monty@narttu.mysql.fi +1 -0
    Incremented aborted_connects on failure

  sql/mysqld.cc
    1.297.1.138 03/06/10 21:42:28 monty@narttu.mysql.fi +33 -10
    Don't install signal handler for SIGINT by default
    Added option --gdb
    Free memory used by replicate_xxx and binglog_xxx options.
    Add statistics variable for killed threads

  sql/mysql_priv.h
    1.150.1.48 03/06/10 21:42:27 monty@narttu.mysql.fi +5 -0
    Don't install signal handler for SIGINT by default

  mysys/thr_alarm.c
    1.36 03/06/10 21:42:27 monty@narttu.mysql.fi +5 -4
    Safety check

  mysql-test/mysql-test-run.sh
    1.146.1.25 03/06/10 21:42:27 monty@narttu.mysql.fi +6 -0
    Added --gdb when using gdb

ChangeSet
  1.1538.31.4 03/06/10 15:19:59 serg@serg.mylan +3 -0
  test results updated

  mysql-test/r/replace.result
    1.7 03/06/10 15:19:56 serg@serg.mylan +2 -2
    test results updated

  mysql-test/r/isam.result
    1.15 03/06/10 15:19:56 serg@serg.mylan +8 -8
    test results updated

  mysql-test/r/grant.result
    1.7 03/06/10 15:19:56 serg@serg.mylan +2 -2
    test results updated

ChangeSet
  1.1538.34.1 03/06/10 17:53:06 bar@bar.mysql.r18.ru +3 -0
  LOAD_FILE() is now COERCIBLE
  LOAD_FILE() tests

  sql/item_strfunc.h
    1.60 03/06/10 17:53:04 bar@bar.mysql.r18.ru +2 -2
    LOAD_FILE() is now COERCIBLE
    LOAD_FILE() tests

  mysql-test/t/type_blob.test
    1.14 03/06/10 17:53:04 bar@bar.mysql.r18.ru +7 -0
    LOAD_FILE() is now COERCIBLE
    LOAD_FILE() tests

  mysql-test/r/type_blob.result
    1.22 03/06/10 17:53:04 bar@bar.mysql.r18.ru +11 -0
    LOAD_FILE() is now COERCIBLE
    LOAD_FILE() tests

ChangeSet
  1.1538.32.7 03/06/10 15:21:19 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  mysql-test/r/derived.result
    1.23 03/06/10 15:18:33 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1538.32.6 03/06/10 16:41:42 bar@bar.mysql.r18.ru +3 -0
  Function INSERT() now works according to coercibility rules
  Test for INSERT() has been added

  sql/item_strfunc.cc
    1.119 03/06/10 16:41:39 bar@bar.mysql.r18.ru +8 -0
    Function INSERT() now works according to coercibility rules
    Test for INSERT() has been added

  mysql-test/t/func_str.test
    1.25 03/06/10 16:41:39 bar@bar.mysql.r18.ru +3 -1
    Function INSERT() now works according to coercibility rules
    Test for INSERT() has been added

  mysql-test/r/func_str.result
    1.27 03/06/10 16:41:39 bar@bar.mysql.r18.ru +7 -2
    Function INSERT() now works according to coercibility rules
    Test for INSERT() has been added

ChangeSet
  1.1538.32.5 03/06/10 15:25:27 bar@bar.mysql.r18.ru +2 -0
  Coercibility tests for
    - equal predicate
    - LIKE predicate
    - strcmp() function

  mysql-test/t/func_test.test
    1.13 03/06/10 15:25:24 bar@bar.mysql.r18.ru +35 -0
    Coercibility tests for
      - equal predicate
      - LIKE predicate
      - strcmp() function

  mysql-test/r/func_test.result
    1.15 03/06/10 15:25:24 bar@bar.mysql.r18.ru +57 -0
    Coercibility tests for
      - equal predicate
      - LIKE predicate
      - strcmp() function

ChangeSet
  1.1538.32.4 03/06/10 14:54:03 bar@bar.mysql.r18.ru +5 -0
  Some more functions work according to coercibility now:
  repeat, reverse, quote, soundex, substring
  Test func_str has been extended to check them

  sql/item_strfunc.h
    1.59 03/06/10 14:54:01 bar@bar.mysql.r18.ru +5 -1
    Some more functions work according to coercibility now:
    repeat, reverse, quote, soundex, substring
    Test func_str has been extended to check them

  sql/item_strfunc.cc
    1.118 03/06/10 14:54:01 bar@bar.mysql.r18.ru +4 -1
    Some more functions work according to coercibility now:
    repeat, reverse, quote, soundex, substring
    Test func_str has been extended to check them

  sql/item_cmpfunc.h
    1.50.1.3 03/06/10 14:54:01 bar@bar.mysql.r18.ru +0 -7
    Some more functions work according to coercibility now:
    repeat, reverse, quote, soundex, substring
    Test func_str has been extended to check them

  mysql-test/t/func_str.test
    1.24 03/06/10 14:54:01 bar@bar.mysql.r18.ru +12 -1
    Some more functions work according to coercibility now:
    repeat, reverse, quote, soundex, substring
    Test func_str has been extended to check them

  mysql-test/r/func_str.result
    1.26 03/06/10 14:54:01 bar@bar.mysql.r18.ru +27 -2
    Some more functions work according to coercibility now:
    repeat, reverse, quote, soundex, substring
    Test func_str has been extended to check them

ChangeSet
  1.1538.33.1 03/06/10 12:19:28 ram@mysql.r18.ru +3 -0
  Bugfix for HEAP table rb-index scan.

  mysql-test/t/heap_btree.test
    1.7 03/06/10 12:19:11 ram@mysql.r18.ru +2 -2
    Bugfix for HEAP table rb-index scan.

  mysql-test/r/heap_btree.result
    1.12 03/06/10 12:19:11 ram@mysql.r18.ru +2 -2
    Bugfix for HEAP table rb-index scan.

  heap/hp_rkey.c
    1.13 03/06/10 12:19:11 ram@mysql.r18.ru +2 -2
    Bugfix for HEAP table rb-index scan.

ChangeSet
  1.1538.32.2 03/06/10 12:07:02 bar@bar.mysql.r18.ru +1 -0
  mysqldump.c:
    SET NAMES is not sent to server when SET NAMES is not dumped
    Server decides which character set to use in this case

  client/mysqldump.c
    1.92 03/06/10 12:05:59 bar@bar.mysql.r18.ru +2 -1
    SET NAMES is not sent to server when SET NAMES is not dumped
    Server decides which character set to use in this case

ChangeSet
  1.1538.32.1 03/06/10 11:34:00 bar@bar.mysql.r18.ru +1 -0
  mysqldump.c:
    SET NAMES is not produced in compatibility modes

  client/mysqldump.c
    1.91 03/06/10 11:33:39 bar@bar.mysql.r18.ru +2 -0
    SET NAMES is not produced in compatibility modes

ChangeSet
  1.1538.31.1 03/06/09 22:28:15 serg@serg.mylan +1 -0
  Merge bk-internal:/home/bk/mysql-4.1/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  myisam/mi_delete.c
    1.21 03/06/09 22:28:09 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1524.22.1 03/06/09 22:26:22 serg@serg.mylan +3 -0
  more DBUG_xxx tags

  myisam/mi_page.c
    1.13 03/06/09 22:26:19 serg@serg.mylan +10 -5
    more DBUG_xxx tags

  myisam/mi_delete.c
    1.19.1.1 03/06/09 22:26:19 serg@serg.mylan +14 -1
    more DBUG_xxx tags

  myisam/ft_update.c
    1.27 03/06/09 22:26:19 serg@serg.mylan +45 -21
    more DBUG_xxx tags

ChangeSet
  1.1538.28.9 03/06/09 15:22:28 carsten@tsort.bitbybit.dk +2 -0
  Some error messages re. BLOBs are true for TEXTs as well

  BitKeeper/etc/logging_ok
    1.233.9.2 03/06/09 15:22:27 carsten@tsort.bitbybit.dk +1 -0
    Logging to logging@openlogging.org accepted

  sql/share/english/errmsg.txt
    1.70.1.14 03/06/09 15:22:12 carsten@tsort.bitbybit.dk +3 -3
    Some messages re. BLOBs are true for TEXTs as well

ChangeSet
  1.1538.24.11 03/06/09 14:51:40 hf@deer.(none) +3 -0
  Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into deer.(none):/home/hf/work/mysql-4.1.2way

  include/mysql_com.h
    1.67.1.5 03/06/09 14:51:37 hf@deer.(none) +0 -0
    Auto merged

  include/mysql.h
    1.72 03/06/09 14:51:37 hf@deer.(none) +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.233.6.6 03/06/09 14:51:32 hf@deer.(none) +0 -0
    auto-union

ChangeSet
  1.1538.28.8 03/06/08 09:11:14 venu@myvenu.com +5 -0
    Fix for mysql_list_fields & reset stmt buffers from stmt_free_result
    Windows build fix 

  tests/client_test.c
    1.32 03/06/08 09:09:30 venu@myvenu.com +191 -47
    Updated test for DEFAULT value for mysql_list_fields()
    New tests for mysql_stmt_free_result()

  libmysql/libmysql.c
    1.156.1.9 03/06/08 09:08:51 venu@myvenu.com +7 -3
    Fix for mysql_list_fields & reset stmt buffers from stmt_free_result

  include/thr_alarm.h
    1.14 03/06/08 09:00:58 venu@myvenu.com +1 -1
    Windows build fix 

  include/mysql_com.h
    1.67.3.3 03/06/08 08:59:57 venu@myvenu.com +1 -1
    Windows build fix (mismatch declaration of my_bool and bool from defination)

  VC++Files/sql/mysqld.dsp
    1.14 03/06/08 08:18:41 venu@myvenu.com +4 -0
    Added sql_state.c to wrk space

ChangeSet
  1.676.1.711 03/06/08 02:53:41 miguel@sartre.local +2 -0
  Translation updated

  BitKeeper/etc/logging_ok
    1.153.1.93 03/06/08 02:53:30 miguel@sartre.local +1 -0
    Logging to logging@openlogging.org accepted

  sql/share/spanish/errmsg.txt
    1.23.1.12 03/06/08 02:52:02 miguel@sartre.local +8 -8
    Translation updated

ChangeSet
  1.676.1.710 03/06/07 10:25:56 heikki@hundin.mysql.fi +1 -0
  page0page.c:
    Fix a bug: a race condition could cause that the first B-tree page splits would get a corrupt page directory, whic often results in the assertion in page_dir_find_slot(); found with a test of 3000 startups/shutdowns; it is not clear that this would have caused any corruption which users have reported

  innobase/page/page0page.c
    1.5.1.2 03/06/07 10:25:49 heikki@hundin.mysql.fi +0 -6
    Fix a bug: a race condition could cause that the first B-tree page splits would get a corrupt page directory, whic often results in the assertion in page_dir_find_slot(); found with a test of 3000 startups/shutdowns; it is not clear that this would have caused any corruption which users have reported

ChangeSet
  1.1538.7.22 03/06/07 02:28:11 wax@kishkin.ru +4 -0
  Merge kishkin.ru:/home/wax/mysql-4.1 into kishkin.ru:/home/wax/mysql-4g

  sql/item_sum.h
    1.42 03/06/07 02:28:05 wax@kishkin.ru +0 -0
    Auto merged

  sql/item_sum.cc
    1.73.1.3 03/06/07 02:28:04 wax@kishkin.ru +0 -0
    Auto merged

  sql/field.cc
    1.108 03/06/07 02:28:04 wax@kishkin.ru +0 -0
    Auto merged

  mysql-test/r/func_gconcat.result
    1.8 03/06/07 02:28:04 wax@kishkin.ru +0 -0
    Auto merged

ChangeSet
  1.1346.234.1 03/06/06 16:41:28 guilhem@mysql.com +3 -0
  Fix for bug 254 :
  we now make a distinction between if the master is < 3.23.57, 3.23 && >=57, and 4.x
  (before the 2 3.23 were one). This is because in 3.23.57 we have a way to distinguish between
  a Start_log_event written at server startup and one written at FLUSH LOGS, so we
  have a way to know if the slave must drop old temp tables or not.
  Change: mi->old_format was bool, now it's enum (to handle 3 cases). However, functions
  which had 'bool old_format' as an argument have their prototypes unchanged, because
  the old old_format == 0 now corresponds to the enum value BINLOG_FORMAT_CURRENT which
  is equal to 0, so boolean tests are left untouched. The only case were we use mi->old_format
  as an enum instead of casting it implicitly to a bool, is in Start_log_event::exec_event,
  where we want to distinguish between the 3 possible enum values.

  sql/slave.h
    1.50.1.7 03/06/06 16:41:22 guilhem@mysql.com +8 -3
    fix for bug 254 : mi->old_format is now enum.

  sql/slave.cc
    1.164.1.62 03/06/06 16:41:22 guilhem@mysql.com +18 -2
    Fix for bug 254 : mi->old_format is now enum.
    An unrelated comment.

  sql/log_event.cc
    1.77.1.35 03/06/06 16:41:22 guilhem@mysql.com +27 -11
    Fix for bug 254 :
    we now make a distinction between if the master is < 3.23.57, 3.23 && >=57, and 4.x
    (before the 2 3.23 were one), to know if the slave must drop old temp tables or not.

ChangeSet
  1.1538.28.7 03/06/06 17:44:33 gluh@gluh.mysql.r18.ru +2 -0
  Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.revoke

  sql/sql_yacc.yy
    1.203.42.8 03/06/06 17:44:29 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.3.17 03/06/06 17:44:29 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1538.30.1 03/06/06 17:43:23 gluh@gluh.mysql.r18.ru +32 -0
  REVOKE all privileges and delete user(244)

  sql/sql_yacc.yy
    1.203.45.1 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +26 -4
    REVOKE all privileges and delete user(244)

  sql/sql_parse.cc
    1.271.8.1 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +32 -0
    REVOKE all privileges and delete user(244)

  sql/sql_lex.h
    1.102.12.1 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +1 -1
    REVOKE all privileges and delete user(244)

  sql/sql_acl.h
    1.19 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    REVOKE all privileges and delete user(244)

  sql/sql_acl.cc
    1.74.1.5 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +273 -15
    REVOKE all privileges and delete user(244)

  sql/share/ukrainian/errmsg.txt
    1.27.1.10 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/swedish/errmsg.txt
    1.64.1.12 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/spanish/errmsg.txt
    1.64.1.10 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/slovak/errmsg.txt
    1.64.1.10 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/serbian/errmsg.txt
    1.18.1.8 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/russian/errmsg.txt
    1.61.1.11 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/romanian/errmsg.txt
    1.62.1.10 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/portuguese/errmsg.txt
    1.64.1.11 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/polish/errmsg.txt
    1.63.1.10 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/norwegian/errmsg.txt
    1.63.1.10 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.10 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/korean/errmsg.txt
    1.63.1.10 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/japanese/errmsg.txt
    1.63.1.10 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/italian/errmsg.txt
    1.70.1.10 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/hungarian/errmsg.txt
    1.65.1.10 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/greek/errmsg.txt
    1.64.1.10 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/german/errmsg.txt
    1.64.1.10 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/french/errmsg.txt
    1.63.1.10 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/estonian/errmsg.txt
    1.64.1.10 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/english/errmsg.txt
    1.70.1.13 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/dutch/errmsg.txt
    1.66.1.10 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/danish/errmsg.txt
    1.62.1.10 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/share/czech/errmsg.txt
    1.64.1.10 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  sql/lex.h
    1.82.1.32 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +1 -1
    REVOKE all privileges and delete user(244)

  mysql-test/t/grant.test
    1.5 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +38 -0
    Test for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  mysql-test/r/grant.result
    1.6 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +35 -0
    Test for DROP USER, REVOKE ALL PRIVILEGES, GRANT

  include/mysqld_error.h
    1.61.1.9 03/06/06 17:43:10 gluh@gluh.mysql.r18.ru +2 -0
    Error messages for DROP USER, REVOKE ALL PRIVILEGES, GRANT

ChangeSet
  1.676.1.709 03/06/06 14:13:26 guilhem@mysql.com +1 -0
  In Start_log_event::print, don't print "created 1970 etc" if created == 0.
  Otherwise, we'll get questions from users about this curious 1970.

  sql/log_event.cc
    1.38.1.10 03/06/06 14:13:15 guilhem@mysql.com +6 -2
    In Start_log_event::print, don't print "created 1970 etc" if created == 0.
    Otherwise, we'll get questions from users about this curious 1970.

ChangeSet
  1.676.1.708 03/06/06 13:52:15 guilhem@mysql.com +3 -0
  -- already approved; it would be nice if it goes into 3.23.57 --
  Fix for bug 254 : the first Start_log_event after server startup will
  have created=now(), whereas the next ones (FLUSH LOGS, auto rotation)
  will have created=0. Before this, it was always now().
  This way, slaves >=4.0.14 will know when they must
  drop stale temp tables or not. The next task is now modify 4.0.14 to
  implement this.

  sql/sql_class.h
    1.63.2.8 03/06/06 13:52:10 guilhem@mysql.com +1 -1
    Prototype change (see log.cc).

  sql/log_event.h
    1.41.1.7 03/06/06 13:52:10 guilhem@mysql.com +9 -0
    An explanation.

  sql/log.cc
    1.55.1.18 03/06/06 13:52:09 guilhem@mysql.com +13 -3
    Fix for bug 254 : the first Start_log_event after server startup will
    have created=now(), whereas the next ones (FLUSH LOGS, auto rotation)
    will have created=0. Before this, it was always now().
    This way, slaves >=4.0.14 will know when they must
    drop stale temp tables or not.

ChangeSet
  1.1538.28.6 03/06/06 11:06:45 bar@bar.mysql.r18.ru +1 -0
  client.c:
    Compilation falure fix

  sql-common/client.c
    1.8 03/06/06 11:06:29 bar@bar.mysql.r18.ru +1 -1
    Compilation falure fix

ChangeSet
  1.1538.28.5 03/06/06 10:50:13 bar@bar.mysql.r18.ru +1 -0
  my_global.h:
    ulong was used before the line it have been declared

  include/my_global.h
    1.47 03/06/06 10:49:25 bar@bar.mysql.r18.ru +2 -2
    ulong was used before the line it have been declared

ChangeSet
  1.1346.200.60 03/06/06 04:18:58 heikki@hundin.mysql.fi +5 -0
  sql_yacc.yy, sql_parse.cc, sql_lex.h, mysqld.cc, lex.h:
    Add syntax SAVEPOINT id and ROLLBACK TO SAVEPOINT id. This is compatible with DB2 and Oracle but not with SQL Server. Savepoints do not do anything yet, this is just parsing.

  sql/sql_yacc.yy
    1.145.1.64 03/06/06 04:16:49 heikki@hundin.mysql.fi +21 -3
    Add syntax SAVEPOINT id and ROLLBACK TO SAVEPOINT id. This is compatible with DB2 and Oracle but not with SQL Server. Savepoints do not do anything yet, this is just parsing.

  sql/sql_parse.cc
    1.218.25.2 03/06/06 04:16:49 heikki@hundin.mysql.fi +3 -0
    Add syntax SAVEPOINT id and ROLLBACK TO SAVEPOINT id. This is compatible with DB2 and Oracle but not with SQL Server. Savepoints do not do anything yet, this is just parsing.

  sql/sql_lex.h
    1.66.1.13 03/06/06 04:16:49 heikki@hundin.mysql.fi +3 -1
    Add syntax SAVEPOINT id and ROLLBACK TO SAVEPOINT id. This is compatible with DB2 and Oracle but not with SQL Server. Savepoints do not do anything yet, this is just parsing.

  sql/mysqld.cc
    1.297.1.137 03/06/06 04:16:49 heikki@hundin.mysql.fi +1 -0
    Add syntax SAVEPOINT id and ROLLBACK TO SAVEPOINT id. This is compatible with DB2 and Oracle but not with SQL Server. Savepoints do not do anything yet, this is just parsing.

  sql/lex.h
    1.66.1.26 03/06/06 04:16:49 heikki@hundin.mysql.fi +1 -0
    Add syntax SAVEPOINT id and ROLLBACK TO SAVEPOINT id. This is compatible with DB2 and Oracle but not with SQL Server. Savepoints do not do anything yet, this is just parsing.

ChangeSet
  1.1538.28.4 03/06/05 20:26:05 monty@narttu.mysql.fi +5 -0
  After merge fixes

ChangeSet
  1.1538.29.1 03/06/05 16:19:54 vva@eagle.mysql.r18.ru +1 -0
  fixed bug (writting outside mallocced buffer in sql_help.cc)

  sql/sql_help.cc
    1.14 03/06/05 16:19:46 vva@eagle.mysql.r18.ru +3 -3
    fixed bug (writting outside mallocced buffer)

  sql-common/client.c
    1.7 03/06/05 20:26:04 monty@narttu.mysql.fi +27 -27
    After merge fixes

  scripts/Makefile.am
    1.30 03/06/05 20:26:04 monty@narttu.mysql.fi +3 -2
    Added back fill_help_tables.sql

  include/sql_common.h
    1.3 03/06/05 20:26:04 monty@narttu.mysql.fi +1 -0
    Declare not_error_sqlstate

ChangeSet
  1.1346.200.59 03/06/05 17:02:00 guilhem@mysql.com +4 -0
  Test for bug 578. And a comment in slave.cc.

  mysql-test/t/lock_tables_lost_commit.test
    1.1 03/06/05 17:01:51 guilhem@mysql.com +18 -0

  mysql-test/t/lock_tables_lost_commit-master.opt
    1.1 03/06/05 17:01:51 guilhem@mysql.com +1 -0

  mysql-test/r/lock_tables_lost_commit.result
    1.1 03/06/05 17:01:51 guilhem@mysql.com +8 -0

  mysql-test/t/lock_tables_lost_commit.test
    1.0 03/06/05 17:01:51 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/lock_tables_lost_commit.test

  mysql-test/t/lock_tables_lost_commit-master.opt
    1.0 03/06/05 17:01:51 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/lock_tables_lost_commit-master.opt

  mysql-test/r/lock_tables_lost_commit.result
    1.0 03/06/05 17:01:51 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/r/lock_tables_lost_commit.result

  sql/slave.cc
    1.164.1.61 03/06/05 17:01:50 guilhem@mysql.com +20 -0
    Comment to remember that size of relay logs on disk is not the total size
    of the relay log.

ChangeSet
  1.1538.28.2 03/06/05 17:33:38 monty@narttu.mysql.fi +20 -0
  Merge with 4.0.13

  sql/unireg.h
    1.26 03/06/05 17:33:37 monty@narttu.mysql.fi +0 -1
    Merge with 4.0.13

  sql/sql_yacc.yy
    1.203.42.7 03/06/05 17:33:37 monty@narttu.mysql.fi +0 -0
    Merge with 4.0.13

  sql/sql_parse.cc
    1.271.3.16 03/06/05 17:33:37 monty@narttu.mysql.fi +1 -1
    Merge with 4.0.13

  sql/mysqld.cc
    1.356.1.25 03/06/05 17:33:36 monty@narttu.mysql.fi +1 -2
    Merge with 4.0.13

  sql/log_event.cc
    1.113.1.7 03/06/05 17:33:36 monty@narttu.mysql.fi +32 -38
    Merge with 4.0.13

  sql/ha_innodb.cc
    1.90.1.4 03/06/05 17:33:36 monty@narttu.mysql.fi +2 -2
    Merge with 4.0.13

  Docs/Makefile.am
    1.39 03/06/05 17:33:36 monty@narttu.mysql.fi +1 -0
    Merge with 4.0.13

  support-files/mysql.spec.sh
    1.66 03/06/05 17:25:51 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_repl.cc
    1.102.1.5 03/06/05 17:25:51 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/slave.cc
    1.188.1.9 03/06/05 17:25:51 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/net_serv.cc
    1.56 03/06/05 17:25:51 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.117 03/06/05 17:25:50 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/handler.cc
    1.92 03/06/05 17:25:50 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/rpl_loaddata.test
    1.5 03/06/05 17:25:50 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/rpl_loaddata.result
    1.6 03/06/05 17:25:50 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/func_str.result
    1.25 03/06/05 17:25:50 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/srv/srv0start.c
    1.44 03/06/05 17:25:50 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/srv/srv0srv.c
    1.42 03/06/05 17:25:50 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/os/os0file.c
    1.50 03/06/05 17:25:50 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43
    1.34 03/06/05 17:25:50 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.200.58 03/06/05 17:25:09 monty@narttu.mysql.fi +1 -0
  Added function comment

  mysys/thr_alarm.c
    1.35 03/06/05 17:25:08 monty@narttu.mysql.fi +15 -3
    Added function comment

ChangeSet
  1.1346.233.1 03/06/05 16:56:38 jani@ua126d19.elisa.omakaista.fi +1 -0
  mysqld won't give a warning any more, if --user=user_name is used,
  if 'user_name' is the current user and it is not root.

  sql/mysqld.cc
    1.297.1.136 03/06/05 16:56:34 jani@ua126d19.elisa.omakaista.fi +11 -4
    mysqld won't give a warning any more, if --user=user_name is used,
    if 'user_name' is the current user and it is not root.

  mysql-test/t/repair_part1.test
    1.4 03/06/05 16:13:02 monty@narttu.mysql.fi +0 -0
    Rename: mysql-test/t/repair.test -> mysql-test/t/repair_part1.test

  mysql-test/r/repair_part1.result
    1.6 03/06/05 16:12:49 monty@narttu.mysql.fi +0 -0
    Rename: mysql-test/r/repair.result -> mysql-test/r/repair_part1.result

ChangeSet
  1.1346.200.56 03/06/05 16:06:38 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Revert a change to dict_mem_index_add_field which slipped prematurely into the bk tree

  sql/ha_innodb.cc
    1.73.1.98 03/06/05 16:06:26 heikki@hundin.mysql.fi +1 -2
    Revert a change to dict_mem_index_add_field which slipped prematurely into the bk tree

ChangeSet
  1.1346.200.55 03/06/05 15:58:23 heikki@hundin.mysql.fi +2 -0
  ha_innodb.cc, handler.cc:
    Fix the BDB crash in the previous push; to save CPU remove duplicate calls of commit in InnoDB

  sql/ha_innodb.cc
    1.73.1.97 03/06/05 15:58:13 heikki@hundin.mysql.fi +149 -78
    Fix the BDB crash in the previous push; to save CPU remove duplicate calls of commit in InnoDB

  sql/handler.cc
    1.82.1.18 03/06/05 15:58:06 heikki@hundin.mysql.fi +8 -26
    Fix the BDB crash in the previous push; to save CPU remove duplicate calls of commit in InnoDB

ChangeSet
  1.1346.200.54 03/06/05 15:21:10 monty@narttu.mysql.fi +1 -0
  Merged fix for alarm on big blocks

  sql/net_serv.cc
    1.46.1.11 03/06/05 15:21:09 monty@narttu.mysql.fi +1 -2
    Merged fix for alarm on big blocks

ChangeSet
  1.676.1.707 03/06/05 15:15:27 monty@narttu.mysql.fi +1 -0
  Fixed test if thr_alarm() failed

  sql/net_serv.cc
    1.15.1.9 03/06/05 15:15:24 monty@narttu.mysql.fi +1 -1
    Fixed test if thr_alarm() failed

ChangeSet
  1.1346.232.1 03/06/05 15:06:19 jani@ua126d19.elisa.omakaista.fi +2 -0
  Fixed a bug in concat_ws(), which did not add concat separator
  in case of an empty string. Bug ID 586.

  sql/item_strfunc.cc
    1.36.1.24 03/06/05 15:06:15 jani@ua126d19.elisa.omakaista.fi +4 -4
    Fixed a bug in concat_ws(), which did not add concat separator
    in case of an empty string. Bug ID 586.

  mysql-test/r/func_str.result
    1.16.2.3 03/06/05 15:06:14 jani@ua126d19.elisa.omakaista.fi +1 -1
    Fixed a bug in concat_ws(), which did not add concat separator
    in case of an empty string. Bug ID 586.

ChangeSet
  1.1346.200.52 03/06/05 12:29:13 monty@narttu.mysql.fi +5 -0
  Print error if we can't delete an alarm
  More debugging variables
  Increment aborted_threads in case of killed or too big packet

  sql/sql_parse.cc
    1.218.25.1 03/06/05 12:29:12 monty@narttu.mysql.fi +7 -0
    Increment aborted_threads in case of killed or too big packet

  sql/net_serv.cc
    1.46.1.10 03/06/05 12:29:12 monty@narttu.mysql.fi +6 -1
    statistics variable (for debugging)

  sql/mysqld.cc
    1.297.1.135 03/06/05 12:29:12 monty@narttu.mysql.fi +1 -1
    Statistics variable (for debugging)

  mysys/thr_alarm.c
    1.34 03/06/05 12:29:12 monty@narttu.mysql.fi +5 -6
    Print error if we can't delete an alarm

  include/thr_alarm.h
    1.13 03/06/05 12:29:11 monty@narttu.mysql.fi +1 -1
    made prototype more portable

ChangeSet
  1.1346.200.50 03/06/05 12:00:06 monty@narttu.mysql.fi +1 -0
  Merge with 3.23 to get fix for thr_alarm and big packets

  sql/net_serv.cc
    1.46.1.9 03/06/05 12:00:05 monty@narttu.mysql.fi +2 -7
    Merge with 3.23 to get fix for thr_alarm and big packets

ChangeSet
  1.676.1.706 03/06/05 11:55:03 monty@narttu.mysql.fi +1 -0
  Fixed problem with alarms when reading too big packet

  sql/net_serv.cc
    1.15.1.8 03/06/05 11:55:03 monty@narttu.mysql.fi +5 -5
    Fixed problem with alarms when reading too big packet

ChangeSet
  1.1538.28.1 03/06/05 00:12:45 monty@narttu.mysql.fi +38 -0
  merge with public tree

  scripts/Makefile.am
    1.29 03/06/05 00:12:43 monty@narttu.mysql.fi +1 -0
    merge with public tree

  libmysqld/Makefile.am
    1.29.1.5 03/06/05 00:12:43 monty@narttu.mysql.fi +1 -3
    merge with public tree

  libmysql/libmysql.c
    1.156.1.8 03/06/05 00:12:43 monty@narttu.mysql.fi +35 -50
    merge with public tree

  sql/sql_yacc.yy
    1.203.42.6 03/06/05 00:01:46 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_table.cc
    1.157.2.7 03/06/05 00:01:46 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_string.h
    1.36 03/06/05 00:01:46 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_string.cc
    1.62 03/06/05 00:01:46 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_show.cc
    1.122.1.9 03/06/05 00:01:46 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_insert.cc
    1.86.2.7 03/06/05 00:01:46 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_base.cc
    1.145.1.6 03/06/05 00:01:46 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/slave.cc
    1.188.1.8 03/06/05 00:01:46 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/set_var.h
    1.27 03/06/05 00:01:45 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/set_var.cc
    1.34.1.21 03/06/05 00:01:45 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/protocol.cc
    1.56.1.5 03/06/05 00:01:45 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.24 03/06/05 00:01:45 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.13 03/06/05 00:01:45 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.87.1.7 03/06/05 00:01:45 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item.h
    1.56.6.4 03/06/05 00:01:45 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item.cc
    1.58.11.4 03/06/05 00:01:45 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/field.cc
    1.106.1.1 03/06/05 00:01:45 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/Makefile.am
    1.77.1.8 03/06/05 00:01:45 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysys/default.c
    1.30 03/06/05 00:01:45 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.58.2.4 03/06/05 00:01:45 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/type_blob.result
    1.21 03/06/05 00:01:45 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.7.3 03/06/05 00:01:45 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/show_check.result
    1.31.1.4 03/06/05 00:01:44 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.65 03/06/05 00:01:44 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/ctype_collate.result
    1.17 03/06/05 00:01:44 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/create.result
    1.40 03/06/05 00:01:44 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/alter_table.result
    1.20 03/06/05 00:01:44 monty@narttu.mysql.fi +0 -0
    Auto merged

  libmysqld/lib_sql.cc
    1.54 03/06/05 00:01:44 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/mysql_version.h.in
    1.15 03/06/05 00:01:44 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/mysql.h
    1.70.1.1 03/06/05 00:01:44 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/config-win.h
    1.33 03/06/05 00:01:44 monty@narttu.mysql.fi +0 -0
    Auto merged

  configure.in
    1.201.1.35 03/06/05 00:01:44 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysql.cc
    1.121.1.14 03/06/05 00:01:44 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.233.9.1 03/06/05 00:01:36 monty@narttu.mysql.fi +0 -0
    auto-union

  BitKeeper/etc/ignore
    1.153.1.8 03/06/05 00:01:35 monty@narttu.mysql.fi +3 -3
    auto-union

ChangeSet
  1.1346.230.2 03/06/04 22:31:06 lenz@mysql.com +1 -0
   - When compiling the Max package incl. RAID support using gcc, make sure
     to set CXX=gcc (cannot link the code with g++) - this should help to
     recompile the RPM on Distributions using gcc 3
   - Added a symlink /usr/sbin/rcmysql -> /etc/init.d/mysql

  support-files/mysql.spec.sh
    1.61.1.5 03/06/04 22:31:03 lenz@mysql.com +12 -0
     - When compiling the Max package incl. RAID support using gcc, make sure
       to set CXX=gcc (cannot link the code with g++) - this should help to
       recompile the RPM on Distributions using gcc 3
     - Added a symlink /usr/sbin/rcmysql -> /etc/init.d/mysql

ChangeSet
  1.1538.27.3 03/06/04 23:17:01 monty@narttu.mysql.fi +8 -0
  After merge fix

  sql/set_var.cc
    1.34.6.3 03/06/04 23:17:00 monty@narttu.mysql.fi +0 -1
    After merge fix

  mysql-test/t/rpl_log.test
    1.17 03/06/04 23:17:00 monty@narttu.mysql.fi +1 -1
    After merge fix

  mysql-test/t/lowercase_table.test
    1.5 03/06/04 23:16:59 monty@narttu.mysql.fi +0 -2
    MySQL 4.1 does this correct

  mysql-test/r/rpl_log.result
    1.38 03/06/04 23:16:59 monty@narttu.mysql.fi +14 -8
    After merge fix

  mysql-test/r/query_cache.result
    1.26 03/06/04 23:16:59 monty@narttu.mysql.fi +1 -1
    After merge fix

  mysql-test/r/lowercase_table.result
    1.3 03/06/04 23:16:59 monty@narttu.mysql.fi +4 -2
    After merge fix

  mysql-test/r/loaddata.result
    1.4 03/06/04 23:16:59 monty@narttu.mysql.fi +5 -0
    After merge fix

  mysql-test/r/insert_select.result
    1.11 03/06/04 23:16:59 monty@narttu.mysql.fi +2 -3
    After merge fix

ChangeSet
  1.1538.27.2 03/06/04 19:21:51 monty@narttu.mysql.fi +53 -0
  Merge with 4.0.13

  sql/sql_yacc.yy
    1.203.44.2 03/06/04 19:21:49 monty@narttu.mysql.fi +1 -1
    Merge with 4.0.13

  sql/sql_insert.cc
    1.86.4.1 03/06/04 19:21:49 monty@narttu.mysql.fi +0 -0
    Merge with 4.0.13

  sql/slave.cc
    1.188.2.2 03/06/04 19:21:49 monty@narttu.mysql.fi +0 -1
    Merge with 4.0.13

  sql/set_var.cc
    1.34.6.2 03/06/04 19:21:49 monty@narttu.mysql.fi +0 -0
    Merge with 4.0.13

  sql/mysqld.cc
    1.356.9.2 03/06/04 19:21:49 monty@narttu.mysql.fi +2 -14
    Merge with 4.0.13

  sql/mysql_priv.h
    1.186.8.2 03/06/04 19:21:49 monty@narttu.mysql.fi +0 -0
    Merge with 4.0.13

  mysql-test/t/errors.test
    1.11 03/06/04 19:21:49 monty@narttu.mysql.fi +0 -23
    Merge with 4.0.13

  sql/log_event.cc
    1.113.1.6 03/06/04 19:21:48 monty@narttu.mysql.fi +0 -11
    Merge with 4.0.13

  sql/log.cc
    1.108.1.5 03/06/04 19:21:48 monty@narttu.mysql.fi +2 -8
    Merge with 4.0.13

  sql/item_cmpfunc.cc
    1.87.4.1 03/06/04 19:21:48 monty@narttu.mysql.fi +0 -4
    Merge with 4.0.13

  mysys/default.c
    1.27.1.1 03/06/04 19:21:48 monty@narttu.mysql.fi +0 -1
    Merge with 4.0.13

  mysql-test/t/rpl_log.test
    1.16 03/06/04 19:21:48 monty@narttu.mysql.fi +1 -1
    Merge with 4.0.13

  mysql-test/t/lowercase_table.test
    1.4 03/06/04 19:21:48 monty@narttu.mysql.fi +0 -0
    Merge with 4.0.13

  mysql-test/t/insert_select.test
    1.7 03/06/04 19:21:48 monty@narttu.mysql.fi +1 -3
    Merge with 4.0.13

  mysql-test/r/rpl_log.result
    1.37 03/06/04 19:21:48 monty@narttu.mysql.fi +0 -14
    Merge with 4.0.13

  mysql-test/r/query_cache.result
    1.25 03/06/04 19:21:48 monty@narttu.mysql.fi +0 -0
    Merge with 4.0.13

  mysql-test/r/insert_select.result
    1.10 03/06/04 19:21:48 monty@narttu.mysql.fi +1 -3
    Merge with 4.0.13

  libmysqld/lib_sql.cc
    1.52.1.1 03/06/04 19:21:48 monty@narttu.mysql.fi +0 -0
    No changes

  libmysql/libmysql.c
    1.156.3.2 03/06/04 19:21:48 monty@narttu.mysql.fi +1 -2
    Merge with 4.0.13

  configure.in
    1.201.4.1 03/06/04 19:21:48 monty@narttu.mysql.fi +0 -1
    No changes

  client/mysql.cc
    1.121.2.2 03/06/04 19:21:48 monty@narttu.mysql.fi +3 -4
    Merge with 4.0.13

  sql/time.cc
    1.30 03/06/04 18:32:19 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_update.cc
    1.83.2.8 03/06/04 18:32:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_table.cc
    1.157.6.2 03/06/04 18:32:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_cache.cc
    1.46.1.3 03/06/04 18:32:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.90.1.3 03/06/04 18:32:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/field.cc
    1.105.1.1 03/06/04 18:32:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/rpl_loaddata.test
    1.4 03/06/04 18:32:17 monty@narttu.mysql.fi +0 -1
    Auto merged

  mysql-test/t/rpl_insert_id.test
    1.3 03/06/04 18:32:17 monty@narttu.mysql.fi +0 -2
    Auto merged

  mysql-test/t/raid.test
    1.6 03/06/04 18:32:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/query_cache.test
    1.24 03/06/04 18:32:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/loaddata.test
    1.3 03/06/04 18:32:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/alter_table.test
    1.15 03/06/04 18:32:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/std_data/rpl_loaddata2.dat
    1.3 03/06/04 18:32:17 monty@narttu.mysql.fi +0 -4
    Auto merged

  mysql-test/r/rpl_loaddata.result
    1.5 03/06/04 18:32:17 monty@narttu.mysql.fi +0 -1
    Auto merged

  mysql-test/r/rpl_insert_id.result
    1.5 03/06/04 18:32:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/loaddata.result
    1.3 03/06/04 18:32:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/errors.result
    1.6 03/06/04 18:32:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/alter_table.result
    1.18.1.1 03/06/04 18:32:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.167 03/06/04 18:32:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/ut/ut0mem.c
    1.11 03/06/04 18:32:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/srv/srv0start.c
    1.43 03/06/04 18:32:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/errors.test
    1.10 03/06/04 18:32:16 monty@narttu.mysql.fi +0 -0
    Merge rename: mysql-test/t/err000001.test -> mysql-test/t/errors.test

  mysql-test/r/errors.result
    1.4.1.2 03/06/04 18:32:16 monty@narttu.mysql.fi +0 -0
    Merge rename: mysql-test/r/err000001.result -> mysql-test/r/errors.result

  innobase/srv/srv0srv.c
    1.41 03/06/04 18:32:16 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/os/os0file.c
    1.49 03/06/04 18:32:16 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/log/log0log.c
    1.24 03/06/04 18:32:16 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/include/srv0srv.h
    1.24 03/06/04 18:32:16 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/mysql_com.h
    1.67.3.2 03/06/04 18:32:16 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/my_global.h
    1.46 03/06/04 18:32:16 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/config-win.h
    1.31.1.1 03/06/04 18:32:16 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysqltest.c
    1.92.1.6 03/06/04 18:32:16 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43
    1.33 03/06/04 18:32:16 monty@narttu.mysql.fi +0 -0
    Auto merged

  BUILD/SETUP.sh
    1.24 03/06/04 18:32:16 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.233.8.1 03/06/04 18:32:10 monty@narttu.mysql.fi +0 -0
    auto-union

ChangeSet
  1.1346.230.1 03/06/04 17:31:21 lenz@mysql.com +1 -0
   - Updated Default-Stop run levels in the LSB header section to satisfy
     Red Hat's chkconfig (Bug #272) (The LSB spec is a bit ambigous about
     what actually needs to be put into this field)

  support-files/mysql.server.sh
    1.29 03/06/04 17:31:18 lenz@mysql.com +1 -1
     - Updated Default-Stop run levels in the LSB header section to satisfy
       Red Hat's chkconfig (Bug #272) (The LSB spec is a bit ambigous about
       what actually needs to be put into this field)

ChangeSet
  1.1538.27.1 03/06/04 18:28:51 monty@narttu.mysql.fi +117 -0
  Added SQLSTATE to client/server protocol
  bmove_allign -> bmove_align
  Added OLAP function ROLLUP
  Split mysql_fix_privilege_tables to a script and a .sql data file
  Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
  Added table_alias_charset, for easier --lower-case-table-name handling
  Better SQL_MODE handling (Setting complex options also sets sub options)
  New (faster) assembler string functions for x86

  sql/sql_state.c
    1.1 03/06/04 18:28:48 monty@narttu.mysql.fi +53 -0

  scripts/mysql_fix_privilege_tables.sql
    1.1 03/06/04 18:28:48 monty@narttu.mysql.fi +89 -0

  include/sql_state.h
    1.1 03/06/04 18:28:48 monty@narttu.mysql.fi +164 -0

  strings/strings.asm
    1.4 03/06/04 18:28:48 monty@narttu.mysql.fi +8 -8
    move_allg

  strings/strings-x86.s
    1.6 03/06/04 18:28:48 monty@narttu.mysql.fi +48 -38
    Faster bmove_align, bmove_upp and strmake

  strings/str_test.c
    1.9 03/06/04 18:28:48 monty@narttu.mysql.fi +3 -1
    Added test of bmove_align

  strings/ctype.c
    1.59 03/06/04 18:28:48 monty@narttu.mysql.fi +0 -2
    Removed empty lines

  strings/Makefile.am
    1.35 03/06/04 18:28:48 monty@narttu.mysql.fi +1 -1
    Fix to be able to compile str_test.c

  sql/unireg.h
    1.25 03/06/04 18:28:48 monty@narttu.mysql.fi +2 -2
    bmove_allign ->bmove_align

  sql/sql_yacc.yy
    1.203.44.1 03/06/04 18:28:48 monty@narttu.mysql.fi +2 -17
    ROLLUP

  sql/sql_union.cc
    1.74.3.2 03/06/04 18:28:48 monty@narttu.mysql.fi +1 -1
    Update after prototype change

  sql/sql_table.cc
    1.157.6.1 03/06/04 18:28:48 monty@narttu.mysql.fi +1 -4
    Simpler --lower-case-table-name handling

  sql/sql_string.h
    1.34.1.1 03/06/04 18:28:48 monty@narttu.mysql.fi +4 -1
    Added function to be able to avoid calling current_thd() when doing new Item.

  sql/sql_string.cc
    1.60.1.1 03/06/04 18:28:48 monty@narttu.mysql.fi +0 -4
    Move CHARSET_INFO to mysqld (to be together with all other global variables)

  sql/sql_state.c
    1.0 03/06/04 18:28:48 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.1/sql/sql_state.c

  sql/sql_show.cc
    1.122.3.1 03/06/04 18:28:48 monty@narttu.mysql.fi +11 -16
    Easier SQL_MODE handling

  sql/sql_select.h
    1.43.1.1 03/06/04 18:28:48 monty@narttu.mysql.fi +37 -12
    structures for rollup

  sql/sql_select.cc
    1.216.14.1 03/06/04 18:28:48 monty@narttu.mysql.fi +392 -97
    Added ROLLUP

  scripts/mysql_fix_privilege_tables.sql
    1.0 03/06/04 18:28:48 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.1/scripts/mysql_fix_privilege_tables.sql

  include/sql_state.h
    1.0 03/06/04 18:28:48 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.1/include/sql_state.h

  sql/sql_prepare.cc
    1.34.1.3 03/06/04 18:28:47 monty@narttu.mysql.fi +1 -1
    Update after prototype change

  sql/sql_list.h
    1.20 03/06/04 18:28:47 monty@narttu.mysql.fi +3 -0
    Added safety assert
    Addes support of alloc without current_thd()

  sql/sql_cache.cc
    1.46.1.2 03/06/04 18:28:47 monty@narttu.mysql.fi +2 -1
    Indentation cleanup

  sql/sql_base.cc
    1.145.4.1 03/06/04 18:28:47 monty@narttu.mysql.fi +18 -9
    Make alias depend on --lower-case-table-names
    Make find_item_in_list also check database name

  sql/set_var.h
    1.23.1.1 03/06/04 18:28:47 monty@narttu.mysql.fi +5 -1
    Better SQL_MODE handling

  sql/set_var.cc
    1.34.6.1 03/06/04 18:28:47 monty@narttu.mysql.fi +99 -34
    Better SQL_MODE handling (Setting complex options also sets sub options)

  sql/protocol.cc
    1.56.2.1 03/06/04 18:28:47 monty@narttu.mysql.fi +4 -3
    Send SQLSTATE to client

  sql/net_serv.cc
    1.55 03/06/04 18:28:47 monty@narttu.mysql.fi +7 -0
    New comment

  sql/mysqld.cc
    1.356.9.1 03/06/04 18:28:47 monty@narttu.mysql.fi +34 -34
    Added ANSI as it's own mode
    Moved charset_info variables here
    Cleaned up handler_count handling (for NT)
    Added table_alias_charset, for easier --lower-case-table-name handling

  sql/mysql_priv.h
    1.186.8.1 03/06/04 18:28:47 monty@narttu.mysql.fi +5 -5
    Updated MODE flags

  sql/item_uniq.h
    1.13 03/06/04 18:28:47 monty@narttu.mysql.fi +1 -1
    Fixed return value

  sql/item_sum.h
    1.40.1.1 03/06/04 18:28:47 monty@narttu.mysql.fi +41 -38
    Moved some functions to item_sum.cc
    Added make_unique() for ROLLUP

  sql/item_sum.cc
    1.73.3.1 03/06/04 18:28:47 monty@narttu.mysql.fi +139 -21
    Moved copy_or_same() and some reset() functions from item_sum.h
    Needed to be able to access thd->mem_root.
     

  sql/item.h
    1.56.8.1 03/06/04 18:28:47 monty@narttu.mysql.fi +2 -0
    Added function to be able to avoid calling current_thd() when doing new Item.

  sql/item.cc
    1.58.13.1 03/06/04 18:28:47 monty@narttu.mysql.fi +31 -3
    Extended Item_field::eq() to be able to better match GROUP BY fields on the command line.
    Needed for ROLLUP

  sql/Makefile.am
    1.77.3.1 03/06/04 18:28:47 monty@narttu.mysql.fi +2 -1
    Added sql_state.cc

  scripts/mysql_fix_privilege_tables.sh
    1.14 03/06/04 18:28:47 monty@narttu.mysql.fi +158 -204
    Totally new script.  This bascily just pipes mysql_fix_privilege_tables.sql through 'mysql' to 'mysqld'

  scripts/Makefile.am
    1.27.1.1 03/06/04 18:28:47 monty@narttu.mysql.fi +1 -1
    Added mysql_fix_privilege_tables.sql

  mysql-test/t/subselect.test
    1.58.5.1 03/06/04 18:28:47 monty@narttu.mysql.fi +8 -6
    Added a few new tests (to find a bug in the item_ref code)

  mysql-test/t/sql_mode.test
    1.2 03/06/04 18:28:47 monty@narttu.mysql.fi +2 -2
    More test for sql_mode

  mysql-test/t/olap.test
    1.6 03/06/04 18:28:47 monty@narttu.mysql.fi +72 -24
    A lot of new tests

  mysql-test/t/lowercase_table.test
    1.3 03/06/04 18:28:47 monty@narttu.mysql.fi +0 -1
    Cleanup

  mysql-test/t/func_system.test
    1.8 03/06/04 18:28:47 monty@narttu.mysql.fi +1 -1
    Make this independen of the MySQL server name

  mysql-test/t/derived.test
    1.21 03/06/04 18:28:47 monty@narttu.mysql.fi +9 -0
    Updated results

  mysql-test/t/ansi.test
    1.3 03/06/04 18:28:47 monty@narttu.mysql.fi +5 -0
    Test of sql_mode

  mysql-test/r/variables.result
    1.21.1.6 03/06/04 18:28:47 monty@narttu.mysql.fi +18 -18
    Updated results

  mysql-test/r/varbinary.result
    1.11 03/06/04 18:28:47 monty@narttu.mysql.fi +2 -2
    Updated results

  mysql-test/r/user_var.result
    1.10 03/06/04 18:28:47 monty@narttu.mysql.fi +1 -1
    Updated results

  mysql-test/r/update.result
    1.14 03/06/04 18:28:47 monty@narttu.mysql.fi +3 -3
    Updated results

  mysql-test/r/union.result
    1.39 03/06/04 18:28:47 monty@narttu.mysql.fi +13 -13
    Updated results

  mysql-test/r/type_ranges.result
    1.19 03/06/04 18:28:47 monty@narttu.mysql.fi +1 -1
    Updated results

  mysql-test/r/type_float.result
    1.14 03/06/04 18:28:47 monty@narttu.mysql.fi +1 -1
    Updated results

  mysql-test/r/type_decimal.result
    1.14 03/06/04 18:28:47 monty@narttu.mysql.fi +3 -3
    Updated results

  mysql-test/r/type_blob.result
    1.19.1.1 03/06/04 18:28:47 monty@narttu.mysql.fi +3 -3
    Updated results

  mysql-test/r/truncate.result
    1.9 03/06/04 18:28:47 monty@narttu.mysql.fi +2 -2
    Updated results

  mysql-test/r/temp_table.result
    1.8 03/06/04 18:28:47 monty@narttu.mysql.fi +3 -3
    Updated results

  mysql-test/r/subselect.result
    1.67.9.1 03/06/04 18:28:47 monty@narttu.mysql.fi +62 -59
    Updated results

  mysql-test/r/sql_mode.result
    1.3 03/06/04 18:28:47 monty@narttu.mysql.fi +4 -4
    Updated results

  mysql-test/r/show_check.result
    1.31.2.1 03/06/04 18:28:47 monty@narttu.mysql.fi +1 -1
    Updated results

  mysql-test/r/select_safe.result
    1.7 03/06/04 18:28:47 monty@narttu.mysql.fi +8 -8
    Updated results

  mysql-test/r/select.result
    1.29 03/06/04 18:28:47 monty@narttu.mysql.fi +6 -6
    Updated results

  mysql-test/r/rpl_rotate_logs.result
    1.39 03/06/04 18:28:47 monty@narttu.mysql.fi +2 -2
    Updated results

  mysql-test/r/rpl_replicate_do.result
    1.13 03/06/04 18:28:47 monty@narttu.mysql.fi +1 -1
    Updated results

  mysql-test/r/rpl_log.result
    1.36 03/06/04 18:28:47 monty@narttu.mysql.fi +1 -1
    Updated results

  mysql-test/r/rpl_empty_master_crash.result
    1.7 03/06/04 18:28:47 monty@narttu.mysql.fi +2 -2
    Updated results

  mysql-test/r/rpl000009.result
    1.14 03/06/04 18:28:47 monty@narttu.mysql.fi +1 -1
    Updated results

  mysql-test/r/rpl000001.result
    1.24 03/06/04 18:28:47 monty@narttu.mysql.fi +1 -1
    Updated results

  mysql-test/r/row.result
    1.14 03/06/04 18:28:47 monty@narttu.mysql.fi +7 -7
    Updated results

  mysql-test/r/query_cache.result
    1.24 03/06/04 18:28:47 monty@narttu.mysql.fi +2 -2
    Updated results

  mysql-test/r/packet.result
    1.2 03/06/04 18:28:47 monty@narttu.mysql.fi +1 -1
    Updated results

  mysql-test/r/order_by.result
    1.24 03/06/04 18:28:47 monty@narttu.mysql.fi +7 -7
    Updated results

  mysql-test/r/olap.result
    1.8 03/06/04 18:28:47 monty@narttu.mysql.fi +256 -27
    Updated results

  mysql-test/r/null.result
    1.13 03/06/04 18:28:47 monty@narttu.mysql.fi +8 -8
    Updated results

  mysql-test/r/myisam.result
    1.23 03/06/04 18:28:47 monty@narttu.mysql.fi +5 -5
    Updated results

  mysql-test/r/multi_update.result
    1.23 03/06/04 18:28:47 monty@narttu.mysql.fi +5 -5
    Updated results

  mysql-test/r/merge.result
    1.22 03/06/04 18:28:47 monty@narttu.mysql.fi +2 -2
    Updated results

  mysql-test/r/lock_multi.result
    1.6 03/06/04 18:28:47 monty@narttu.mysql.fi +1 -1
    Updated results

  mysql-test/r/lock.result
    1.10 03/06/04 18:28:47 monty@narttu.mysql.fi +2 -2
    Updated results

  mysql-test/r/key.result
    1.11 03/06/04 18:28:47 monty@narttu.mysql.fi +1 -1
    Updated results

  mysql-test/r/join_outer.result
    1.19 03/06/04 18:28:46 monty@narttu.mysql.fi +6 -6
    Updated results

  mysql-test/r/join.result
    1.22 03/06/04 18:28:46 monty@narttu.mysql.fi +1 -1
    Updated results

  mysql-test/r/insert_update.result
    1.5 03/06/04 18:28:46 monty@narttu.mysql.fi +1 -1
    Updated results

  mysql-test/r/insert_select.result
    1.9 03/06/04 18:28:46 monty@narttu.mysql.fi +1 -1
    Updated results

  mysql-test/r/innodb_handler.result
    1.6 03/06/04 18:28:46 monty@narttu.mysql.fi +4 -4
    Updated results

  mysql-test/r/innodb.result
    1.63.1.1 03/06/04 18:28:46 monty@narttu.mysql.fi +10 -10
    Updated results

  mysql-test/r/heap_hash.result
    1.6 03/06/04 18:28:46 monty@narttu.mysql.fi +2 -2
    Updated results

  mysql-test/r/heap_btree.result
    1.11 03/06/04 18:28:46 monty@narttu.mysql.fi +2 -2
    Updated results

  mysql-test/r/heap.result
    1.17 03/06/04 18:28:46 monty@narttu.mysql.fi +2 -2
    Updated results

  mysql-test/r/handler.result
    1.11 03/06/04 18:28:46 monty@narttu.mysql.fi +6 -6
    Updated results

  mysql-test/r/group_by.result
    1.30 03/06/04 18:28:46 monty@narttu.mysql.fi +3 -3
    Updated results

  mysql-test/r/grant_cache.result
    1.3 03/06/04 18:28:46 monty@narttu.mysql.fi +6 -6
    Updated results

  mysql-test/r/func_system.result
    1.11 03/06/04 18:28:46 monty@narttu.mysql.fi +2 -2
    Updated results

  mysql-test/r/func_gconcat.result
    1.6.1.1 03/06/04 18:28:46 monty@narttu.mysql.fi +2 -2
    Updated results

  mysql-test/r/fulltext.result
    1.41 03/06/04 18:28:46 monty@narttu.mysql.fi +3 -3
    Updated results

  mysql-test/r/flush.result
    1.10 03/06/04 18:28:46 monty@narttu.mysql.fi +1 -1
    Updated results

  mysql-test/r/explain.result
    1.14 03/06/04 18:28:46 monty@narttu.mysql.fi +2 -2
    Updated results

  mysql-test/r/err000001.result
    1.4.1.1 03/06/04 18:28:46 monty@narttu.mysql.fi +10 -10
    Updated results

  mysql-test/r/drop.result
    1.12 03/06/04 18:28:46 monty@narttu.mysql.fi +3 -3
    Updated results

  mysql-test/r/distinct.result
    1.23 03/06/04 18:28:46 monty@narttu.mysql.fi +2 -2
    Updated results

  mysql-test/r/derived.result
    1.21.1.1 03/06/04 18:28:46 monty@narttu.mysql.fi +17 -10
    Updated results

  mysql-test/r/delete.result
    1.12 03/06/04 18:28:46 monty@narttu.mysql.fi +1 -1
    Updated results

  mysql-test/r/delayed.result
    1.8 03/06/04 18:28:46 monty@narttu.mysql.fi +1 -1
    Updated results

  mysql-test/r/ctype_collate.result
    1.15.1.1 03/06/04 18:28:46 monty@narttu.mysql.fi +6 -6
    Updated results

  mysql-test/r/create.result
    1.38.1.1 03/06/04 18:28:46 monty@narttu.mysql.fi +21 -21
    Updated results

  mysql-test/r/comments.result
    1.6 03/06/04 18:28:46 monty@narttu.mysql.fi +1 -1
    Updated results

  mysql-test/r/bdb.result
    1.27 03/06/04 18:28:46 monty@narttu.mysql.fi +9 -9
    Updated results

  mysql-test/r/bdb-deadlock.result
    1.5 03/06/04 18:28:46 monty@narttu.mysql.fi +1 -1
    Updated results

  mysql-test/r/auto_increment.result
    1.11 03/06/04 18:28:46 monty@narttu.mysql.fi +2 -2
    Updated results

  mysql-test/r/ansi.result
    1.2 03/06/04 18:28:46 monty@narttu.mysql.fi +9 -1
    Updated results

  mysql-test/r/analyse.result
    1.13 03/06/04 18:28:46 monty@narttu.mysql.fi +15 -15
    Updated results

  libmysqld/libmysqld.c
    1.35 03/06/04 18:28:46 monty@narttu.mysql.fi +9 -2
    Added sqlstate

  libmysqld/Makefile.am
    1.29.3.1 03/06/04 18:28:46 monty@narttu.mysql.fi +2 -1
    Added sql_state.cc

  libmysql/libmysql.c
    1.156.3.1 03/06/04 18:28:46 monty@narttu.mysql.fi +99 -93
    Changed default error state to HY000
    Applied code cleanup patch

  include/mysql_com.h
    1.67.3.1 03/06/04 18:28:46 monty@narttu.mysql.fi +1 -0
    Send correct SQLSTATE for the error to the client

  include/mysql.h
    1.68.1.1 03/06/04 18:28:46 monty@narttu.mysql.fi +2 -1
    Added SQLSTATE (for embedded version)

  include/m_string.h
    1.20 03/06/04 18:28:46 monty@narttu.mysql.fi +5 -5
    Rename bmove_allign as bmove_align

  dbug/dbug.c
    1.15 03/06/04 18:28:46 monty@narttu.mysql.fi +10 -14
    Portability fixes

  client/mysqltest.c
    1.92.1.5 03/06/04 18:28:46 monty@narttu.mysql.fi +5 -1
    Write ERROR SQLSTATE for all errors

  client/mysql.cc
    1.121.2.1 03/06/04 18:28:46 monty@narttu.mysql.fi +25 -14
    Added SQLSTATE to error messages
    Added new function put_error() to be able to clean up some old code.

  BitKeeper/etc/ignore
    1.153.3.2 03/06/04 18:23:58 monty@narttu.mysql.fi +1 -0
    added libmysqld/sql_state.c

  BitKeeper/etc/ignore
    1.153.3.1 03/06/04 18:23:26 monty@narttu.mysql.fi +1 -0
    added strings/str_test

ChangeSet
  1.1346.229.2 03/06/04 18:22:48 monty@narttu.mysql.fi +1 -0
  Fixed (not fatal) buffer overflow

  libmysql/libmysql.c
    1.95.1.31 03/06/04 18:22:47 monty@narttu.mysql.fi +1 -1
    Fixed (not fatal) buffer overflow

ChangeSet
  1.1346.200.48 03/06/04 17:58:41 heikki@hundin.mysql.fi +1 -0
  handler.cc:
    If the autocommit is on, let handler.cc commit or rollback the whole transaction at an updating SQL statement end. This probably fixes bug number 578. The problem was that when explicit LOCK TABLES is used, then the lock count method in autocommit does not work.

  sql/handler.cc
    1.82.1.17 03/06/04 17:58:30 heikki@hundin.mysql.fi +27 -5
    If the autocommit is on, let handler.cc commit or rollback the whole transaction at an updating SQL statement end. This probably fixes bug number 578. The problem was that when explicit LOCK TABLES is used, then the lock count method in autocommit does not work.

ChangeSet
  1.1346.229.1 03/06/04 16:05:27 monty@narttu.mysql.fi +5 -0
  Added [mysqld-base-version] as a default group for the mysqld server
  Portability fix for Windows 64

  sql/mysqld.cc
    1.297.1.134 03/06/04 16:05:25 monty@narttu.mysql.fi +1 -1
    Added [mysqld-base-version] as a default group for the mysqld server

  innobase/include/univ.i
    1.28 03/06/04 16:05:25 monty@narttu.mysql.fi +4 -0
    Portability fix for Windows 64

  include/mysql_version.h.in
    1.13.1.1 03/06/04 16:05:25 monty@narttu.mysql.fi +1 -0
    Added [mysqld-base-version] as a default group for the mysqld server

  include/my_global.h
    1.34.4.1 03/06/04 16:05:25 monty@narttu.mysql.fi +1 -1
    Portability fix for Windows 64

  include/config-win.h
    1.23.1.4 03/06/04 16:05:25 monty@narttu.mysql.fi +7 -1
    Portability fix for Windows 64

ChangeSet
  1.1538.24.10 03/06/04 15:13:07 hf@deer.(none) +3 -0
  Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into deer.(none):/home/hf/work/mysql-4.1.2way

  include/mysql_com.h
    1.67.1.4 03/06/04 15:13:04 hf@deer.(none) +0 -0
    Auto merged

  include/mysql.h
    1.71 03/06/04 15:13:04 hf@deer.(none) +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.233.6.5 03/06/04 15:13:01 hf@deer.(none) +0 -1
    auto-union

ChangeSet
  1.1538.26.1 03/06/04 15:12:32 hf@deer.(none) +3 -0
  SCRUM
  simultaneously usable libraries
  
  unification of client structures

  BitKeeper/etc/logging_ok
    1.233.7.1 03/06/04 15:12:31 hf@deer.(none) +1 -0
    Logging to logging@openlogging.org accepted

  include/mysql_com.h
    1.67.2.1 03/06/04 15:12:03 hf@deer.(none) +1 -1
    unification NET structure for client and embedded library

  include/mysql.h
    1.67.1.1 03/06/04 15:12:03 hf@deer.(none) +10 -4
    Unification of MYSQL structure for client library and embedded library

ChangeSet
  1.1538.24.9 03/06/04 00:21:49 venu@myvenu.com +1 -0
  client.c:
    Missed file from earlier commit

  sql-common/client.c
    1.6 03/06/04 00:21:09 venu@myvenu.com +4 -0
    Missed file from earlier commit

ChangeSet
  1.1538.24.8 03/06/04 00:19:09 venu@myvenu.com +1 -0
    protocol test update 
    (fix for memory ovverun bug from DBD(ranger) + changes for removal of collation from explain)

  tests/client_test.c
    1.31 03/06/04 00:18:11 venu@myvenu.com +125 -5
    protocol test update 
    (fix for memory ovverun bug from DBD(ranger) + changes for removal of collation from explain)

ChangeSet
  1.1538.24.7 03/06/04 00:17:48 venu@myvenu.com +6 -0
   1. Portability fixups for Connector/ODBC 3.52 & DBD
      (Addition of mysql_fetch_column & mysql_stmt_free_result)
   2. Windows build fixups for libmysqld, mysqlbinlog and mysqldemb

  libmysql/libmysql.def
    1.15 03/06/04 00:16:22 venu@myvenu.com +1 -0

  libmysql/libmysql.c
    1.156.1.7 03/06/04 00:15:48 venu@myvenu.com +29 -22
    Portability fixups for Connector/ODBC 3.52 & DBD
    (Addition of mysql_fetch_column & mysql_stmt_free_result)

  include/mysql.h
    1.70 03/06/04 00:14:49 venu@myvenu.com +1 -0
    Portability fixups for Connector/ODBC 3.52 & DBD

  VC++Files/mysqlbinlog/mysqlbinlog.dsp
    1.10 03/06/04 00:06:06 venu@myvenu.com +4 -0
    Resolve linker errors by adding mf_tmpdir.c to binlog wrk space

  VC++Files/libmysqld/libmysqld.dsp
    1.8 03/06/04 00:05:51 venu@myvenu.com +12 -0
    remove old files and add new ones

  VC++Files/mysqldemb/mysqldemb.dsp
    1.6 03/06/04 00:05:39 venu@myvenu.com +0 -8
    Remove old files

ChangeSet
  1.1538.24.6 03/06/03 22:57:42 venu@myvenu.com +4 -0
  Windows build fixups (Fix for slave_net_timeout)

  sql-common/client.c
    1.5 03/06/03 22:56:53 venu@myvenu.com +1 -1
    Fix warning

  sql/slave.h
    1.61 03/06/03 22:56:19 venu@myvenu.com +5 -1
    Fix for client.c - slave_net_timeout

  sql/client_settings.h
    1.3 03/06/03 22:56:09 venu@myvenu.com +2 -1

  VC++Files/libmysqld/libmysqld.dsp
    1.7 03/06/03 22:55:23 venu@myvenu.com +0 -8
    Remove the old files from Embedded library

ChangeSet
  1.1538.24.5 03/06/03 20:59:32 venu@myvenu.com +7 -0
  Fix windows build after applyiing the changes from new client.c(sql-common)
  NOTE: Still the build fails to compile core server on Windows due to slave_net_timeout linker error from client.obj
        and make sure to have the next changeset, which fixes this.

  VC++Files/sql/mysqld.dsp
    1.13 03/06/03 20:57:05 venu@myvenu.com +1 -5
    add client.c and remove old convert.cpp and mini_client.c

  VC++Files/libmysql/libmysql.dsp
    1.16 03/06/03 20:56:53 venu@myvenu.com +4 -0
    add client.c

  VC++Files/client/mysqlclient.dsp
    1.15 03/06/03 20:56:41 venu@myvenu.com +4 -0
    add client.c

  libmysql/libmysql.c
    1.156.1.6 03/06/03 20:56:19 venu@myvenu.com +0 -207
    Fix for redefination stuff from client.c

  sql-common/client.c
    1.4 03/06/03 20:55:52 venu@myvenu.com +205 -1
    Delete and move redefination of shared memory stuff

  sql/sql_help.cc
    1.13 03/06/03 20:55:38 venu@myvenu.com +6 -7
    Fix compiler errors

  sql/item_geofunc.cc
    1.3 03/06/03 20:55:24 venu@myvenu.com +2 -2
    Fix warnings

ChangeSet
  1.1538.24.4 03/06/03 18:45:53 venu@myvenu.com +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into myvenu.com:/home/venu/work/sql/dev-4.1

  sql/sql_show.cc
    1.122.1.8 03/06/03 18:45:49 venu@myvenu.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.23 03/06/03 18:45:49 venu@myvenu.com +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.87.1.6 03/06/03 18:45:49 venu@myvenu.com +0 -0
    Auto merged

ChangeSet
  1.1538.25.1 03/06/03 18:45:07 venu@myvenu.com +8 -0
  Windows build fixups with the latest source

  VC++Files/sql/mysqld.dsp
    1.12 03/06/03 18:42:40 venu@myvenu.com +8 -0
    Take care of newly added/removed files

  VC++Files/libmysql/libmysql.dsp
    1.15 03/06/03 18:42:23 venu@myvenu.com +3 -7
    Take care of newly added/removed files

  VC++Files/client/mysqlclient.dsp
    1.14 03/06/03 18:41:58 venu@myvenu.com +0 -4
    Take care of newly added/removed files

  include/config-win.h
    1.32 03/06/03 18:41:18 venu@myvenu.com +2 -0
    Fix for Windows build to go (charsets + collation default defs)

  sql/sql_show.cc
    1.122.2.1 03/06/03 18:40:54 venu@myvenu.com +0 -2
    Remove unused variables

  sql/sql_insert.cc
    1.86.2.6 03/06/03 18:40:19 venu@myvenu.com +1 -1
    fix the windows error (without cast)

  sql/mysqld.cc
    1.356.8.1 03/06/03 18:39:39 venu@myvenu.com +1 -2
    fix the defination as this is different from the prototype (cl compiler failed)

  sql/item_cmpfunc.cc
    1.87.3.1 03/06/03 18:38:51 venu@myvenu.com +0 -1
    Remove unused variables

ChangeSet
  1.1346.224.20 03/06/03 23:13:06 guilhem@mysql.com +4 -0
  One-line fix for bug 576 (DBUG_ASSERT failure when using CHANGE MASTER TO RELAY_LOG_POS=4).
  Plus a changeset which I had committed but forgot to push (and this changeset is lost on
  another computer, so I recreate it here). This changeset is "user-friendly SHOW BINLOG EVENTS
  and CHANGE MASTER TO when log positions < 4 are used.

  sql/unireg.h
    1.16.1.3 03/06/03 23:12:58 guilhem@mysql.com +6 -2
    warning comment

  sql/sql_yacc.yy
    1.145.1.63 03/06/03 23:12:57 guilhem@mysql.com +14 -0
    User-friendly CHANGE MASTER TO:
    presently when one does CHANGE MASTER TO MASTER_LOG_POS=0 he gets
        030425 10:12:41  Slave I/O thread: connected to master 'root@localhost:3306',  r
        eplication started in log 'gbichot-bin.013' at position 151
        030425 10:12:41  Error reading packet from server: Client requested master to st
        art replication from impossible position (server_errno=1236)
        030425 10:12:41  Got fatal error 1236: 'Client requested master to start replica
        tion from impossible position' from master when reading data from binary log
        030425 10:12:41  Slave I/O thread exiting, read up to log 'gbichot-bin.013', pos
        ition 151
        
    while she/he probably just wanted to start at the beginning of the
    binlog, which is 4. So we silently convert <4 to 4 in sql_yacc.yy
    (i.e. in the slave code; fortunately all versions have the same
    BIN_LOG_HEADER_SIZE=4 and we should not change this). See comments
    for an explaination of why we have to do this in sql_yacc.yy,
    not in sql_repl.cc.
    Same thing for CHANGE MASTER TO RELAY_LOG_POS.    

  sql/sql_repl.cc
    1.86.1.8 03/06/03 23:12:57 guilhem@mysql.com +1 -7
    User-friendly SHOW BINLOG EVENTS:
    SHOW BINLOG EVENTS FROM 0: currently one gets
        MASTER> show binlog events from 0;
        ERROR 1220: Error when executing command SHOW BINLOG EVENTS: Invalid log position
    so we silently convert <4 to 4.

  sql/slave.cc
    1.164.1.60 03/06/03 23:12:57 guilhem@mysql.com +1 -1
    fix for bug 576 (DBUG_ASSERT failure when using CHANGE MASTER TO RELAY_LOG_POS=4).

ChangeSet
  1.1346.1.115 03/06/03 18:25:45 Sinisa@sinisa.nasamreza.org +1 -0
  A  fix for small stack overflow ...

  sql/sql_parse.cc
    1.218.1.100 03/06/03 18:25:41 Sinisa@sinisa.nasamreza.org +1 -1
    A  fix for small stack overflow ...

ChangeSet
  1.1346.224.19 03/06/03 15:47:29 guilhem@mysql.com +3 -0
  -- Waiting for Monty's approval before push --
  Bug 571: play LOAD DATA INFILE the same way on the slave as it was on the master: 
  if it was with IGNORE, do it with IGNORE,
  if it was with REPLACE, do it with REPLACE,
  and (the change) if it was with nothing, do it with nothing (not with IGNORE !!).
  Bug 573: print a proper error message in case of duplicate entry in LOAD DATA INFILE
  on the slave, i.e. a message where the keyname and key value appear :
  'Duplicate entry '1' for key 1' and not 'Duplicate entry '%-.64s' for key %d'

  sql/log_event.cc
    1.77.1.34 03/06/03 15:47:23 guilhem@mysql.com +31 -6
    Bug 571: play LOAD DATA INFILE the same way on the slave as it was on the master: 
    if it was with IGNORE, do it with IGNORE,
    if it was with REPLACE, do it with REPLACE,
    and (the change) if it was with nothing, do it with nothing (not with IGNORE !!).
    Bug 573: print a proper error message in case of duplicate entry in LOAD DATA INFILE
    on the slave, i.e. a message where the keyname and key value appear :
    'Duplicate entry '1' for key 1' and not 'Duplicate entry '%-.64s' for key %d'

  mysql-test/t/rpl_loaddata.test
    1.2.1.2 03/06/03 15:47:23 guilhem@mysql.com +17 -0
    check if duplicate entries on the slave trigger an error 
    when the slave replicates LOAD DATA INFILE (without IGNORE or REPLACE)
    (bug 571).

  mysql-test/r/rpl_loaddata.result
    1.1.1.3 03/06/03 15:47:23 guilhem@mysql.com +6 -0
    result update

ChangeSet
  1.1538.24.3 03/06/03 18:24:57 bar@bar.mysql.r18.ru +1 -0
  SPACE() is now ucs2 compatible

  sql/item_create.cc
    1.33.1.8 03/06/03 18:24:54 bar@bar.mysql.r18.ru +14 -1
    SPACE() is now ucs2 compatible

ChangeSet
  1.1538.24.2 03/06/03 17:13:19 bar@bar.mysql.r18.ru +2 -0
  Collation & coercibility tests for LTRIM, RTRIM and TRIM

  mysql-test/t/func_str.test
    1.23 03/06/03 17:13:17 bar@bar.mysql.r18.ru +14 -1
    Collation & coercibility tests for LTRIM, RTRIM and TRIM

  mysql-test/r/func_str.result
    1.24 03/06/03 17:13:17 bar@bar.mysql.r18.ru +33 -2
    Collation & coercibility tests for LTRIM, RTRIM and TRIM

ChangeSet
  1.1538.24.1 03/06/03 16:57:14 bar@bar.mysql.r18.ru +4 -0
  LTRIM, RTRIM and TRIM now honors coercibility
  LTRIM, RTRIM and TRIM now work fine with ucs2

  sql/sql_yacc.yy
    1.203.42.5 03/06/03 16:57:12 bar@bar.mysql.r18.ru +11 -9
    LTRIM, RTRIM and TRIM now honors coercibility
    LTRIM, RTRIM and TRIM now work fine with ucs2

  sql/item_strfunc.h
    1.58 03/06/03 16:57:12 bar@bar.mysql.r18.ru +16 -14
    LTRIM, RTRIM and TRIM now honors coercibility
    LTRIM, RTRIM and TRIM now work fine with ucs2

  sql/item_strfunc.cc
    1.116 03/06/03 16:57:12 bar@bar.mysql.r18.ru +26 -3
    LTRIM, RTRIM and TRIM now honors coercibility
    LTRIM, RTRIM and TRIM now work fine with ucs2

  sql/item_create.cc
    1.33.1.7 03/06/03 16:57:12 bar@bar.mysql.r18.ru +2 -2
    LTRIM, RTRIM and TRIM now honors coercibility
    LTRIM, RTRIM and TRIM now work fine with ucs2

ChangeSet
  1.1538.7.20 03/06/03 17:07:46 wax@kishkin.ru +4 -0
  Merge kishkin.ru:/home/wax/mysql-4n into kishkin.ru:/home/wax/mysql-4g

  sql/item_sum.h
    1.41 03/06/03 17:07:44 wax@kishkin.ru +0 -0
    Auto merged

  sql/item_sum.cc
    1.73.1.2 03/06/03 17:07:44 wax@kishkin.ru +0 -0
    Auto merged

  sql/field.h
    1.73 03/06/03 17:07:44 wax@kishkin.ru +0 -0
    Auto merged

  sql/field.cc
    1.107 03/06/03 17:07:43 wax@kishkin.ru +0 -0
    Auto merged

ChangeSet
  1.1524.21.2 03/06/03 17:02:51 wax@kishkin.ru +1 -0
  BUG
  correct bug with empty table

  sql/item_sum.cc
    1.73.2.2 03/06/03 17:02:48 wax@kishkin.ru +5 -0
    correct bug with empty table

ChangeSet
  1.1538.7.18 03/06/03 15:27:17 hf@deer.(none) +3 -0
  Obsolete files removed

  BitKeeper/etc/ignore
    1.153.1.7 03/06/03 15:27:15 hf@deer.(none) +1 -0
    Added sql/client.c to the ignore list

  BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183
    1.65 03/06/03 15:24:44 hf@deer.(none) +0 -0
    Delete: sql/mini_client.cc

  BitKeeper/deleted/.del-mini_client.h~be0e3c44e9b0f67d
    1.14 03/06/03 15:24:42 hf@deer.(none) +0 -0
    Delete: sql/mini_client.h

ChangeSet
  1.1538.7.17 03/06/03 15:03:29 hf@deer.(none) +2 -0
  Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into deer.(none):/home/hf/work/mysql-4.1.emb_bind

  sql/Makefile.am
    1.77.1.7 03/06/03 15:03:27 hf@deer.(none) +0 -0
    Auto merged

  libmysqld/Makefile.am
    1.29.1.4 03/06/03 15:03:27 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1538.7.16 03/06/03 15:02:57 hf@deer.(none) +9 -0
  SCRUM:
  splittiln common client's parts

  sql/slave.cc
    1.188.1.7 03/06/03 15:02:55 hf@deer.(none) +1 -0
    option's initialization added

  sql/repl_failsafe.cc
    1.31 03/06/03 15:02:55 hf@deer.(none) +1 -0
    option's initialization added

  sql/client_settings.h
    1.2 03/06/03 15:02:55 hf@deer.(none) +7 -7
    code trimmed

  sql-common/client.c
    1.3 03/06/03 15:02:55 hf@deer.(none) +32 -33
    code trimmed and simplified

  mysys/default.c
    1.29 03/06/03 15:02:55 hf@deer.(none) +0 -2
    this is not needed anymore - calling code fixed

  libmysqld/lib_sql.cc
    1.53 03/06/03 15:02:55 hf@deer.(none) +1 -1
    here we had wrong parameters

  libmysql/libmysql.c
    1.156.1.5 03/06/03 15:02:55 hf@deer.(none) +1 -5
    some litter removed

  libmysql/client_settings.h
    1.2 03/06/03 15:02:55 hf@deer.(none) +0 -3
    superfluous #ifdef-s removed

  include/sql_common.h
    1.2 03/06/03 15:02:55 hf@deer.(none) +0 -4
    superfluous #ifdef-s removed

ChangeSet
  1.1538.23.3 03/06/03 14:59:17 bar@bar.mysql.r18.ru +16 -0
  MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
  Some default_charset_info were removed

  strings/ctype-ucs2.c
    1.6 03/06/03 14:59:15 bar@bar.mysql.r18.ru +2 -2
    MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
    Some default_charset_info were removed

  sql/sql_yacc.yy
    1.203.42.4 03/06/03 14:59:15 bar@bar.mysql.r18.ru +5 -5
    MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
    Some default_charset_info were removed

  sql/sql_string.h
    1.35 03/06/03 14:59:15 bar@bar.mysql.r18.ru +1 -1
    MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
    Some default_charset_info were removed

  sql/sql_string.cc
    1.61 03/06/03 14:59:15 bar@bar.mysql.r18.ru +2 -2
    MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
    Some default_charset_info were removed

  sql/sql_parse.cc
    1.271.3.15 03/06/03 14:59:14 bar@bar.mysql.r18.ru +1 -1
    MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
    Some default_charset_info were removed

  sql/item_strfunc.cc
    1.115 03/06/03 14:59:14 bar@bar.mysql.r18.ru +2 -2
    MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
    Some default_charset_info were removed

  sql/item_geofunc.cc
    1.2 03/06/03 14:59:14 bar@bar.mysql.r18.ru +1 -1
    MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
    Some default_charset_info were removed

  sql/item_create.cc
    1.33.1.6 03/06/03 14:59:14 bar@bar.mysql.r18.ru +1 -1
    MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
    Some default_charset_info were removed

  sql/item.cc
    1.58.11.3 03/06/03 14:59:14 bar@bar.mysql.r18.ru +1 -1
    MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
    Some default_charset_info were removed

  sql/field.cc
    1.106 03/06/03 14:59:14 bar@bar.mysql.r18.ru +10 -10
    MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
    Some default_charset_info were removed

  myisam/sp_test.c
    1.7 03/06/03 14:59:14 bar@bar.mysql.r18.ru +1 -1
    MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
    Some default_charset_info were removed

  myisam/rt_test.c
    1.8 03/06/03 14:59:14 bar@bar.mysql.r18.ru +1 -1
    MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
    Some default_charset_info were removed

  myisam/mi_test2.c
    1.18 03/06/03 14:59:14 bar@bar.mysql.r18.ru +4 -4
    MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
    Some default_charset_info were removed

  myisam/mi_test1.c
    1.16 03/06/03 14:59:14 bar@bar.mysql.r18.ru +2 -2
    MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
    Some default_charset_info were removed

  myisam/mi_create.c
    1.30 03/06/03 14:59:14 bar@bar.mysql.r18.ru +1 -1
    MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
    Some default_charset_info were removed

  include/m_ctype.h
    1.70 03/06/03 14:59:14 bar@bar.mysql.r18.ru +1 -1
    MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
    Some default_charset_info were removed

ChangeSet
  1.1346.228.1 03/06/02 17:30:47 guilhem@mysql.com +1 -0
  Clearer error message (in the customer's case, the relay log was corrupted,
  not the master's binlog) (SW 1571).

  sql/slave.cc
    1.164.1.59 03/06/02 17:30:42 guilhem@mysql.com +7 -2
    Clearer error message (in the customer's case, the relay log was corrupted,
    not the master's binlog).

ChangeSet
  1.1346.224.17 03/06/02 17:58:18 heikki@hundin.mysql.fi +1 -0
  os0sync.c:
    Do not try to reserve os_sync_mutex in shutdown after it has been freed

  innobase/os/os0sync.c
    1.20 03/06/02 17:58:05 heikki@hundin.mysql.fi +21 -4
    Do not try to reserve os_sync_mutex in shutdown after it has been freed

ChangeSet
  1.1346.224.16 03/06/02 16:11:06 heikki@hundin.mysql.fi +1 -0
  com0shm.c:
    Removed auto event creation because it is not needed in any MySQL/InnoDB code

  innobase/com/com0shm.c
    1.3 03/06/02 16:10:59 heikki@hundin.mysql.fi +6 -3
    Removed auto event creation because it is not needed in any MySQL/InnoDB code

ChangeSet
  1.1538.23.2 03/06/02 17:19:06 bar@bar.mysql.r18.ru +11 -0
  "Collation" has been moved to SHOW FULL FIELDS
  SHOW COLLATION columns have been removed:
    D -> Default
    C -> Compiled
    Y -> Yes

  sql/sql_show.cc
    1.122.1.7 03/06/02 17:19:03 bar@bar.mysql.r18.ru +8 -6
    "Collation" has been moved to SHOW FULL FIELDS
    SHOW COLLATION columns have been removed:
      D -> Default
      C -> Compiled
      Y -> Yes

  mysql-test/r/type_blob.result
    1.20 03/06/02 17:19:03 bar@bar.mysql.r18.ru +10 -10
    "Collation" has been moved to SHOW FULL FIELDS
    SHOW COLLATION columns have been removed:
      D -> Default
      C -> Compiled
      Y -> Yes

  mysql-test/r/show_check.result
    1.31.1.3 03/06/02 17:19:03 bar@bar.mysql.r18.ru +16 -16
    "Collation" has been moved to SHOW FULL FIELDS
    SHOW COLLATION columns have been removed:
      D -> Default
      C -> Compiled
      Y -> Yes

  mysql-test/r/innodb.result
    1.64 03/06/02 17:19:03 bar@bar.mysql.r18.ru +2 -2
    "Collation" has been moved to SHOW FULL FIELDS
    SHOW COLLATION columns have been removed:
      D -> Default
      C -> Compiled
      Y -> Yes

  mysql-test/r/have_ujis.require
    1.3 03/06/02 17:19:03 bar@bar.mysql.r18.ru +2 -2
    "Collation" has been moved to SHOW FULL FIELDS
    SHOW COLLATION columns have been removed:
      D -> Default
      C -> Compiled
      Y -> Yes

  mysql-test/r/have_ucs2.require
    1.3 03/06/02 17:19:03 bar@bar.mysql.r18.ru +2 -2
    "Collation" has been moved to SHOW FULL FIELDS
    SHOW COLLATION columns have been removed:
      D -> Default
      C -> Compiled
      Y -> Yes

  mysql-test/r/gis.result
    1.9 03/06/02 17:19:03 bar@bar.mysql.r18.ru +43 -43
    "Collation" has been moved to SHOW FULL FIELDS
    SHOW COLLATION columns have been removed:
      D -> Default
      C -> Compiled
      Y -> Yes

  mysql-test/r/ctype_recoding.result
    1.7 03/06/02 17:19:03 bar@bar.mysql.r18.ru +6 -6
    "Collation" has been moved to SHOW FULL FIELDS
    SHOW COLLATION columns have been removed:
      D -> Default
      C -> Compiled
      Y -> Yes

  mysql-test/r/ctype_collate.result
    1.16 03/06/02 17:19:03 bar@bar.mysql.r18.ru +6 -6
    "Collation" has been moved to SHOW FULL FIELDS
    SHOW COLLATION columns have been removed:
      D -> Default
      C -> Compiled
      Y -> Yes

  mysql-test/r/create.result
    1.39 03/06/02 17:19:03 bar@bar.mysql.r18.ru +19 -19
    "Collation" has been moved to SHOW FULL FIELDS
    SHOW COLLATION columns have been removed:
      D -> Default
      C -> Compiled
      Y -> Yes

  mysql-test/r/alter_table.result
    1.19 03/06/02 17:19:03 bar@bar.mysql.r18.ru +3 -3
    "Collation" has been moved to SHOW FULL FIELDS
    SHOW COLLATION columns have been removed:
      D -> Default
      C -> Compiled
      Y -> Yes

ChangeSet
  1.1346.1.113 03/06/02 14:14:10 Sinisa@sinisa.nasamreza.org +2 -0
  Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
  into sinisa.nasamreza.org:/mnt/work/mysql-4.0

  include/my_global.h
    1.34.1.15 03/06/02 14:11:57 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  client/mysql.cc
    1.93.1.44 03/06/02 14:11:56 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1346.224.15 03/06/02 13:45:45 heikki@hundin.mysql.fi +1 -0
  os0file.c:
    Put back Monty's patch which the previous push accidentally erased: print also operation type in os_file_handle_error()

  innobase/os/os0file.c
    1.44.1.10 03/06/02 13:45:37 heikki@hundin.mysql.fi +24 -18
    Put back Monty's patch which the previous push accidentally erased: print also operation type in os_file_handle_error()

ChangeSet
  1.1346.224.14 03/06/02 13:11:20 heikki@hundin.mysql.fi +8 -0
  os0thread.h, os0sync.ic, os0sync.h, os0thread.c, os0sync.c, os0file.c:
    Release all event semaphores at shutdown also in Windows
  srv0start.c, srv0srv.c:
    make test sometimes failed because lock timeout thread exited without decrementing the InnoDB thread counter

  innobase/include/os0thread.h
    1.12 03/06/02 13:10:00 heikki@hundin.mysql.fi +3 -1
    Release all event semaphores at shutdown also in Windows

  innobase/include/os0sync.ic
    1.7 03/06/02 13:10:00 heikki@hundin.mysql.fi +0 -1
    Release all event semaphores at shutdown also in Windows

  innobase/include/os0sync.h
    1.12 03/06/02 13:10:00 heikki@hundin.mysql.fi +33 -18
    Release all event semaphores at shutdown also in Windows

  innobase/os/os0thread.c
    1.22 03/06/02 13:09:25 heikki@hundin.mysql.fi +4 -0
    Release all event semaphores at shutdown also in Windows

  innobase/os/os0sync.c
    1.19 03/06/02 13:09:25 heikki@hundin.mysql.fi +85 -99
    Release all event semaphores at shutdown also in Windows

  innobase/os/os0file.c
    1.44.1.9 03/06/02 13:09:25 heikki@hundin.mysql.fi +40 -43
    Release all event semaphores at shutdown also in Windows

  innobase/srv/srv0start.c
    1.37.1.9 03/06/02 13:08:29 heikki@hundin.mysql.fi +26 -6
    make test sometimes failed because lock timeout thread exited without decrementing the InnoDB thread counter

  innobase/srv/srv0srv.c
    1.35.1.15 03/06/02 13:08:29 heikki@hundin.mysql.fi +43 -1
    make test sometimes failed because lock timeout thread exited without decrementing the InnoDB thread counter

ChangeSet
  1.1524.1.10 03/06/02 14:25:01 gluh@gluh.mysql.r18.ru +4 -0
  'Expand the mysql.proc table to include (almost) all fields' task(851)
  Fix after review

  sql/sp_head.cc
    1.32 03/06/02 14:24:59 gluh@gluh.mysql.r18.ru +1 -1
    'Expand the mysql.proc table to include (almost) all fields' task(851)
    Fix after review

  sql/sp.cc
    1.18 03/06/02 14:24:59 gluh@gluh.mysql.r18.ru +5 -9
    'Expand the mysql.proc table to include (almost) all fields' task(851)
    Fix after review

  scripts/mysql_install_db.sh
    1.44 03/06/02 14:24:59 gluh@gluh.mysql.r18.ru +1 -1
    'Expand the mysql.proc table to include (almost) all fields' task(851)
    Fix after review

  mysql-test/install_test_db.sh
    1.29 03/06/02 14:24:59 gluh@gluh.mysql.r18.ru +1 -1
    'Expand the mysql.proc table to include (almost) all fields' task(851)
    Fix after review

ChangeSet
  1.1538.23.1 03/06/02 14:12:46 bar@bar.mysql.r18.ru +1 -0
  ctype-ucs2.c:
    define ILSEQ for platforms that do not define it themself

  strings/ctype-ucs2.c
    1.5 03/06/02 14:12:12 bar@bar.mysql.r18.ru +4 -0
    define ILSEQ for platforms that do not define it themself

ChangeSet
  1.1346.200.45 03/06/02 07:55:57 lenz@mysql.com +1 -0
  Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
  into mysql.com:/space/my/mysql-4.0

  BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43
    1.22.1.18 03/06/02 07:55:51 lenz@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.224.13 03/06/01 23:40:01 monty@narttu.mysql.fi +6 -0
  Small fixes (nothing nameworthy)

  sql/mysqld.cc
    1.297.1.133 03/06/01 23:39:59 monty@narttu.mysql.fi +4 -10
    Added sigemptyset() (bug found by valgrind)
    Removed some wrong usage of thd when writing variable values

  mysys/thr_alarm.c
    1.33 03/06/01 23:39:59 monty@narttu.mysql.fi +31 -10
    Made end_thr_alarm() work also with internal alarm thread.
    (Not critical for MySQL)

  mysql-test/t/errors.test
    1.8.1.2 03/06/01 23:39:59 monty@narttu.mysql.fi +23 -10
    Cleaned up file to new error number standard

  innobase/os/os0file.c
    1.44.1.8 03/06/01 23:39:59 monty@narttu.mysql.fi +24 -13
    Added operation to error messages

  include/my_global.h
    1.34.1.14 03/06/01 23:39:59 monty@narttu.mysql.fi +4 -1
    typedef for future functions that needs string length as an argument

  mysql-test/r/errors.result
    1.5 03/06/01 17:50:25 monty@narttu.mysql.fi +0 -0
    Rename: mysql-test/r/err000001.result -> mysql-test/r/errors.result

  mysql-test/t/errors.test
    1.8.1.1 03/06/01 17:50:05 monty@narttu.mysql.fi +0 -0
    Rename: mysql-test/t/err000001.test -> mysql-test/t/errors.test

ChangeSet
  1.1346.224.12 03/06/01 12:43:08 monty@narttu.mysql.fi +3 -0
  Merge

  innobase/srv/srv0srv.c
    1.35.1.14 03/06/01 12:43:07 monty@narttu.mysql.fi +0 -9
    Use local version. Heikki needs to check if the os_thread_sleep() should go to 4.0 or not

  BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43
    1.22.2.2 03/06/01 12:36:54 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-global.h~e80d28157acfdcb5
    1.55 03/06/01 12:36:54 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43
    1.22.2.1 03/06/01 12:36:54 monty@narttu.mysql.fi +0 -0
    Merge rename: Docs/internals.texi -> BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43

  BitKeeper/deleted/.del-global.h~e80d28157acfdcb5
    1.39.10.2 03/06/01 12:36:54 monty@narttu.mysql.fi +0 -0
    Merge rename: include/global.h -> BitKeeper/deleted/.del-global.h~e80d28157acfdcb5

ChangeSet
  1.1346.224.11 03/06/01 12:33:23 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/mysql_priv.h
    1.150.1.47 03/06/01 12:33:21 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.227.1 03/06/01 12:32:53 monty@narttu.mysql.fi +6 -0
  Fixed bug in ALTER TABLE DISABLE KEYS and INSERT DELAYED. Bug #478

  sql/sql_table.cc
    1.112.1.47 03/06/01 12:32:51 monty@narttu.mysql.fi +82 -53
    Fixed bug in ALTER TABLE DISABLE KEYS and INSERT DELAYED

  sql/mysql_priv.h
    1.150.9.1 03/06/01 12:32:51 monty@narttu.mysql.fi +0 -1
    Made closed_cached_table local

  mysql-test/t/lowercase_table.test
    1.1.1.1 03/06/01 12:32:51 monty@narttu.mysql.fi +11 -0
    Added test of alias name comparison

  mysql-test/t/alter_table.test
    1.12.1.3 03/06/01 12:32:51 monty@narttu.mysql.fi +9 -0
    Test of ALTER TABLE DISABLE KEYS + INSERT DELAYED

  mysql-test/r/lowercase_table.result
    1.2 03/06/01 12:32:51 monty@narttu.mysql.fi +12 -0
    new results

  mysql-test/r/alter_table.result
    1.9.1.4 03/06/01 12:32:51 monty@narttu.mysql.fi +5 -0
    new results

ChangeSet
  1.1346.1.112 03/05/31 21:35:20 Sinisa@sinisa.nasamreza.org +4 -0
  several bug fixes

  sql/sql_parse.cc
    1.218.1.99 03/05/31 21:35:14 Sinisa@sinisa.nasamreza.org +4 -3
    Fix for the non-functioning max_user_connections

  sql/sql_acl.cc
    1.51.1.47 03/05/31 21:35:14 Sinisa@sinisa.nasamreza.org +12 -3
    Sending error when global privilege is attempted at db level

  mysys/charset.c
    1.29.1.5 03/05/31 21:35:14 Sinisa@sinisa.nasamreza.org +1 -0
    Fix for a bug with LEFT(), RIGHT() ... and GROUP BY clause

  include/my_global.h
    1.34.3.1 03/05/31 21:35:14 Sinisa@sinisa.nasamreza.org +3 -1
    Fix for a clash with include files from Linux kernel source

ChangeSet
  1.676.301.1 03/05/31 18:44:37 monty@narttu.mysql.fi +1 -0
  Fixed compiler optimization problem with doubleget()
  (Casused problems in GIS functions in 4.1)

  include/global.h
    1.39.10.1 03/05/31 18:44:36 monty@narttu.mysql.fi +5 -2
    Fixed compiler optimization problem with doubleget()

ChangeSet
  1.1538.14.8 03/05/31 18:38:41 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/sql_derived.cc
    1.43.3.2 03/05/31 18:38:32 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1538.22.1 03/05/31 18:31:57 Sinisa@sinisa.nasamreza.org +2 -0
  Fix for the optimiser problem caused by the fact that with derived
  tables one (or more tables) is opened / closed twice.

  sql/sql_derived.cc
    1.43.4.1 03/05/31 18:31:49 Sinisa@sinisa.nasamreza.org +2 -0
    Fix for the optimiser problem caused by the fact that with derived
    tables one (or more tables) is opened / closed twice.

  mysql-test/r/derived.result
    1.22 03/05/31 18:31:48 Sinisa@sinisa.nasamreza.org +1 -1
    Fix for the optimiser problem caused by the fact that with derived
    tables one (or more tables) is opened / closed twice.

ChangeSet
  1.1538.7.15 03/05/31 15:15:46 hf@deer.(none) +15 -0
  SCRUM:
  Here is another pack of changes about gathering common client code in
  sql-common/client.c.
  Now i symlink the client.c from sql/ and libmysql/. These directories
  have client_settings.h files to be included to client.c. It contains
  defines and declarations to compile client.c in appropriate manner.
  Also i've added include/sql_common.h, containing declarations of what
  is exported from client.c
  
  I removed as many #ifdef-s from client.c as i dared to. I think it's better
  push it with some extra #ifdef-s now (of course, if everythihg besides it is
  ok) so other people can check the code.

  sql/client_settings.h
    1.1 03/05/31 15:15:44 hf@deer.(none) +33 -0

  libmysql_r/client_settings.h
    1.1 03/05/31 15:15:44 hf@deer.(none) +0 -0

  libmysql/client_settings.h
    1.1 03/05/31 15:15:44 hf@deer.(none) +61 -0

  include/sql_common.h
    1.1 03/05/31 15:15:44 hf@deer.(none) +53 -0

  sql/sql_repl.cc
    1.102.1.4 03/05/31 15:15:44 hf@deer.(none) +0 -1
    mini_client isn't needed anymore

  sql/slave.cc
    1.188.1.6 03/05/31 15:15:44 hf@deer.(none) +5 -4
    trimming code to the changed function's prototypes

  sql/repl_failsafe.cc
    1.30 03/05/31 15:15:44 hf@deer.(none) +2 -3
    mysql_real_connect prototype was unified, so we've got to set connection timeout separately

  sql/client_settings.h
    1.0 03/05/31 15:15:44 hf@deer.(none) +0 -0
    BitKeeper file /home/hf/work/mysql-4.1.emb_bind/sql/client_settings.h

  libmysql_r/client_settings.h
    1.0 03/05/31 15:15:44 hf@deer.(none) +0 -0
    BitKeeper file /home/hf/work/mysql-4.1.emb_bind/libmysql_r/client_settings.h

  libmysql/client_settings.h
    1.0 03/05/31 15:15:44 hf@deer.(none) +0 -0
    BitKeeper file /home/hf/work/mysql-4.1.emb_bind/libmysql/client_settings.h

  include/sql_common.h
    1.0 03/05/31 15:15:44 hf@deer.(none) +0 -0
    BitKeeper file /home/hf/work/mysql-4.1.emb_bind/include/sql_common.h

  sql/Makefile.am
    1.77.2.1 03/05/31 15:15:43 hf@deer.(none) +5 -3
    mini_client.h has to be removed

  sql-common/client.c
    1.2 03/05/31 15:15:43 hf@deer.(none) +325 -259
    a lot of changes about code separating

  mysys/default.c
    1.28 03/05/31 15:15:43 hf@deer.(none) +1 -1
    changed to keep compiler happy

  libmysql/libmysql.c
    1.156.1.4 03/05/31 15:15:43 hf@deer.(none) +127 -92
    a lot of changes about separating code between libmysql.c and client.c

  libmysql/Makefile.shared
    1.47 03/05/31 15:15:43 hf@deer.(none) +1 -1
    client.lo added to the list of objects

  libmysql/Makefile.am
    1.35 03/05/31 15:15:43 hf@deer.(none) +3 -2
    ../libmysql/client_settings.h added to the list of necessary h-files

  include/mysql.h
    1.69 03/05/31 15:15:43 hf@deer.(none) +4 -0
    MYSQL_CLIENT define moved here from libmysql/Makefile

  Makefile.am
    1.49 03/05/31 15:15:43 hf@deer.(none) +4 -1
    symlinking of sql-common/client.c was added

ChangeSet
  1.1524.21.1 03/05/31 15:44:19 wax@kishkin.ru +6 -0
  URGENT
  SCRUM
  BUG
  correct wrong code in group_concat

  sql/item_sum.h
    1.39.1.1 03/05/31 15:44:09 wax@kishkin.ru +21 -8
    correct wrong code

  sql/item_sum.cc
    1.73.2.1 03/05/31 15:44:09 wax@kishkin.ru +54 -43
    correct wrong code

  sql/field.h
    1.65.2.1 03/05/31 15:44:09 wax@kishkin.ru +1 -0
    add new variable for group_concat

  sql/field.cc
    1.98.2.1 03/05/31 15:44:09 wax@kishkin.ru +1 -1
    add new variable for group_concat

  mysql-test/t/func_gconcat.test
    1.3 03/05/31 15:44:09 wax@kishkin.ru +15 -1
    add new tests

  mysql-test/r/func_gconcat.result
    1.7 03/05/31 15:44:09 wax@kishkin.ru +19 -1
    add new tests

ChangeSet
  1.1346.224.9 03/05/31 03:23:42 heikki@hundin.mysql.fi +4 -0
  os0thread.c, os0thread.h, os0sync.h:
    Cleanup
  os0sync.c:
    Free all OS sync primitives and allocated memory in InnoDB shutdown

  innobase/os/os0thread.c
    1.21 03/05/31 03:23:31 heikki@hundin.mysql.fi +1 -0
    Cleanup

  innobase/include/os0thread.h
    1.11 03/05/31 03:23:19 heikki@hundin.mysql.fi +0 -1
    Cleanup

  innobase/include/os0sync.h
    1.11 03/05/31 03:23:19 heikki@hundin.mysql.fi +1 -2
    Cleanup

  innobase/os/os0sync.c
    1.18 03/05/31 03:19:16 heikki@hundin.mysql.fi +1 -2
    Free all OS sync primitives and allocated memory in InnoDB shutdown

ChangeSet
  1.1346.224.8 03/05/31 03:12:03 heikki@hundin.mysql.fi +10 -0
  Many files:
    Free all OS sync primitives and allocated memory in InnoDB shutdown

  innobase/ut/ut0mem.c
    1.8.1.3 03/05/31 03:11:44 heikki@hundin.mysql.fi +2 -0
    Free all OS sync primitives and allocated memory in InnoDB shutdown

  innobase/sync/sync0sync.c
    1.15 03/05/31 03:11:34 heikki@hundin.mysql.fi +21 -6
    Free all OS sync primitives and allocated memory in InnoDB shutdown

  innobase/srv/srv0start.c
    1.37.1.8 03/05/31 03:11:23 heikki@hundin.mysql.fi +16 -16
    Free all OS sync primitives and allocated memory in InnoDB shutdown

  innobase/srv/srv0srv.c
    1.35.1.13 03/05/31 03:11:23 heikki@hundin.mysql.fi +11 -58
    Free all OS sync primitives and allocated memory in InnoDB shutdown

  innobase/ibuf/ibuf0ibuf.c
    1.17 03/05/31 03:10:27 heikki@hundin.mysql.fi +2 -2
    Free all OS sync primitives and allocated memory in InnoDB shutdown

  innobase/ibuf/ibuf0ibuf.c
    1.16 03/05/31 03:09:08 heikki@hundin.mysql.fi +2 -2
    Free all OS sync primitives and allocated memory in InnoDB shutdown

  innobase/include/srv0start.h
    1.8 03/05/31 03:08:12 heikki@hundin.mysql.fi +4 -3
    Free all OS sync primitives and allocated memory in InnoDB shutdown

  innobase/include/srv0srv.h
    1.21.1.2 03/05/31 03:08:12 heikki@hundin.mysql.fi +6 -0
    Free all OS sync primitives and allocated memory in InnoDB shutdown

  innobase/include/os0sync.h
    1.10 03/05/31 03:08:03 heikki@hundin.mysql.fi +27 -9
    Free all OS sync primitives and allocated memory in InnoDB shutdown

  innobase/os/os0thread.c
    1.20 03/05/31 03:07:49 heikki@hundin.mysql.fi +6 -6
    Free all OS sync primitives and allocated memory in InnoDB shutdown

  innobase/os/os0sync.c
    1.17 03/05/31 03:07:49 heikki@hundin.mysql.fi +120 -8
    Free all OS sync primitives and allocated memory in InnoDB shutdown

ChangeSet
  1.1346.226.1 03/05/31 01:41:11 bell@sanja.is.com.ua +3 -0
  fixed bug 549 - incorect query cache memory formating on very small query cache sizes

  sql/sql_cache.cc
    1.29.1.25 03/05/31 01:41:06 bell@sanja.is.com.ua +7 -9
    fixed query cache size showing
    fixed query cache low memory detection

  mysql-test/t/query_cache.test
    1.16.1.6 03/05/31 01:41:06 bell@sanja.is.com.ua +26 -9
    test of 2 parts of bug 549

  mysql-test/r/query_cache.result
    1.15.1.6 03/05/31 01:41:06 bell@sanja.is.com.ua +50 -10
    test of 2 parts of bug 549

ChangeSet
  1.1346.224.7 03/05/30 23:00:37 heikki@hundin.mysql.fi +1 -0
  srv0start.c:
    Cleanup

  innobase/srv/srv0start.c
    1.37.1.7 03/05/30 23:00:29 heikki@hundin.mysql.fi +1 -12
    Cleanup

ChangeSet
  1.1346.224.6 03/05/30 22:44:37 heikki@hundin.mysql.fi +9 -0
  Many files:
    Exit all threads created by innoDB at shutdown

  innobase/srv/srv0start.c
    1.37.1.6 03/05/30 22:44:21 heikki@hundin.mysql.fi +58 -0
    Exit all threads created by innoDB at shutdown

  innobase/srv/srv0srv.c
    1.35.1.12 03/05/30 22:44:21 heikki@hundin.mysql.fi +13 -0
    Exit all threads created by innoDB at shutdown

  innobase/log/log0log.c
    1.20.1.3 03/05/30 22:44:14 heikki@hundin.mysql.fi +15 -12
    Exit all threads created by innoDB at shutdown

  innobase/include/os0thread.h
    1.10 03/05/30 22:43:48 heikki@hundin.mysql.fi +4 -4
    Exit all threads created by innoDB at shutdown

  innobase/include/os0sync.h
    1.9 03/05/30 22:43:48 heikki@hundin.mysql.fi +11 -1
    Exit all threads created by innoDB at shutdown

  innobase/include/os0file.h
    1.17 03/05/30 22:43:48 heikki@hundin.mysql.fi +7 -0
    Exit all threads created by innoDB at shutdown

  innobase/os/os0thread.c
    1.19 03/05/30 22:43:29 heikki@hundin.mysql.fi +28 -2
    Exit all threads created by innoDB at shutdown

  innobase/os/os0sync.c
    1.16 03/05/30 22:43:29 heikki@hundin.mysql.fi +25 -2
    Exit all threads created by innoDB at shutdown

  innobase/os/os0file.c
    1.44.1.7 03/05/30 22:43:29 heikki@hundin.mysql.fi +44 -1
    Exit all threads created by innoDB at shutdown

ChangeSet
  1.1538.21.1 03/05/30 22:14:52 bell@sanja.is.com.ua +4 -0
  priventing allocation unused Item_buff (alloc_group_fields())

  sql/sql_select.h
    1.44 03/05/30 22:14:41 bell@sanja.is.com.ua +1 -1
    priventing allocation unused Item_buff

  sql/sql_select.cc
    1.216.13.2 03/05/30 22:14:41 bell@sanja.is.com.ua +41 -4
    priventing allocation unused Item_buff

  mysql-test/t/subselect.test
    1.58.4.1 03/05/30 22:14:41 bell@sanja.is.com.ua +12 -0
    new test for code coverage

  mysql-test/r/subselect.result
    1.67.8.1 03/05/30 22:14:41 bell@sanja.is.com.ua +12 -0
    new test for code coverage

ChangeSet
  1.1538.16.7 03/05/30 17:10:19 bell@sanja.is.com.ua +1 -0
  after review changes

ChangeSet
  1.1538.16.6 03/05/30 17:14:54 bar@bar.mysql.r18.ru +8 -0
  mysqlshow and mysqldump now send their vharacter set to server
  character_set_results is now the same with character_set_client by default

ChangeSet
  1.1538.16.5 03/05/30 15:25:13 ram@mysql.r18.ru +1 -0
  Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.r18.ru:/usr/home/ram/work/4.1.latest

ChangeSet
  1.1538.19.1 03/05/30 14:08:58 vva@eagle.mysql.r18.ru +1 -0
  fix some warnings in sql_help.cc

  sql/sql_help.cc
    1.12 03/05/30 14:08:56 vva@eagle.mysql.r18.ru +2 -2
    fix some warnings

  sql/sql_parse.cc
    1.271.3.14 03/05/30 17:10:17 bell@sanja.is.com.ua +8 -6
    after review changes

ChangeSet
  1.1346.224.5 03/05/30 18:41:19 gluh@gluh.mysql.r18.ru +2 -0
  Fix for compiling MySQL-4.0.13 with SSL support on OpenBSD

  sql/mysql_priv.h
    1.150.1.46 03/05/30 18:41:18 gluh@gluh.mysql.r18.ru +1 -0
    Fix for compiling MySQL-4.0.13 with SSL support on OpenBSD

  include/my_global.h
    1.34.1.13 03/05/30 18:41:18 gluh@gluh.mysql.r18.ru +1 -1
    Fix for compiling MySQL-4.0.13 with SSL support on OpenBSD

  sql/sql_yacc.yy
    1.203.42.3 03/05/30 17:14:52 bar@bar.mysql.r18.ru +1 -1
    mysqlshow and mysqldump now send their vharacter set to server
    character_set_results is now the same with character_set_client by default

  sql/sql_parse.cc
    1.271.3.13 03/05/30 17:14:52 bar@bar.mysql.r18.ru +10 -3
    mysqlshow and mysqldump now send their vharacter set to server
    character_set_results is now the same with character_set_client by default

  sql/set_var.cc
    1.34.1.20 03/05/30 17:14:52 bar@bar.mysql.r18.ru +1 -1
    mysqlshow and mysqldump now send their vharacter set to server
    character_set_results is now the same with character_set_client by default

  sql/protocol.cc
    1.56.1.4 03/05/30 17:14:52 bar@bar.mysql.r18.ru +1 -1
    mysqlshow and mysqldump now send their vharacter set to server
    character_set_results is now the same with character_set_client by default

  sql/mysqld.cc
    1.356.1.22 03/05/30 17:14:52 bar@bar.mysql.r18.ru +2 -2
    mysqlshow and mysqldump now send their vharacter set to server
    character_set_results is now the same with character_set_client by default

  mysql-test/t/cast.test
    1.5 03/05/30 17:14:52 bar@bar.mysql.r18.ru +1 -0
    mysqlshow and mysqldump now send their vharacter set to server
    character_set_results is now the same with character_set_client by default

  mysql-test/r/cast.result
    1.7 03/05/30 17:14:52 bar@bar.mysql.r18.ru +1 -0
    mysqlshow and mysqldump now send their vharacter set to server
    character_set_results is now the same with character_set_client by default

  client/mysqlshow.c
    1.30 03/05/30 17:14:52 bar@bar.mysql.r18.ru +8 -2
    mysqlshow and mysqldump now send their vharacter set to server
    character_set_results is now the same with character_set_client by default

  BitKeeper/etc/ignore
    1.153.1.6 03/05/30 15:25:01 ram@mysql.r18.ru +3 -3
    auto-union

ChangeSet
  1.1538.16.4 03/05/30 15:22:34 ram@mysql.r18.ru +12 -0
  Moved spatial functions to the sql/item_geofunc.cc file.

  sql/item_geofunc.h
    1.1 03/05/30 15:22:27 ram@mysql.r18.ru +360 -0

  sql/item_geofunc.h
    1.0 03/05/30 15:22:27 ram@mysql.r18.ru +0 -0
    BitKeeper file /usr/home/ram/work/4.1.latest/sql/item_geofunc.h

  sql/item_geofunc.cc
    1.1 03/05/30 15:22:26 ram@mysql.r18.ru +653 -0

  BitKeeper/etc/ignore
    1.153.2.1 03/05/30 15:22:27 ram@mysql.r18.ru +1 -0
    Added libmysqld/item_geofunc.cc to the ignore list

  sql/item_strfunc.h
    1.57 03/05/30 15:22:26 ram@mysql.r18.ru +0 -239
    Moved spatial functions to the sql/item_geofunc.cc file.

  sql/item_strfunc.cc
    1.114 03/05/30 15:22:26 ram@mysql.r18.ru +0 -422
    Moved spatial functions to the sql/item_geofunc.cc file.

  sql/item_geofunc.cc
    1.0 03/05/30 15:22:26 ram@mysql.r18.ru +0 -0
    BitKeeper file /usr/home/ram/work/4.1.latest/sql/item_geofunc.cc

  sql/item_func.h
    1.68.1.8 03/05/30 15:22:26 ram@mysql.r18.ru +0 -95
    Moved spatial functions to the sql/item_geofunc.cc file.

  sql/item_func.cc
    1.124.1.6 03/05/30 15:22:26 ram@mysql.r18.ru +0 -136
    Moved spatial functions to the sql/item_geofunc.cc file.

  sql/item_cmpfunc.h
    1.50.1.2 03/05/30 15:22:26 ram@mysql.r18.ru +0 -76
    Moved spatial functions to the sql/item_geofunc.cc file.

  sql/item_cmpfunc.cc
    1.87.1.5 03/05/30 15:22:26 ram@mysql.r18.ru +0 -82
    Moved spatial functions to the sql/item_geofunc.cc file.

  sql/item.h
    1.56.6.3 03/05/30 15:22:26 ram@mysql.r18.ru +1 -0
    Moved spatial functions to the sql/item_geofunc.cc file.

  sql/Makefile.am
    1.77.1.6 03/05/30 15:22:26 ram@mysql.r18.ru +2 -2
    Moved spatial functions to the sql/item_geofunc.cc file.

  libmysqld/Makefile.am
    1.29.2.2 03/05/30 15:22:26 ram@mysql.r18.ru +1 -1
    Moved spatial functions to the sql/item_geofunc.cc file.

ChangeSet
  1.1538.18.4 03/05/30 15:21:03 bar@bar.mysql.r18.ru +1 -0
  mysqldump.c:
    mysqldump now produces SET NAMES. It can be disabled by --no-set-names

  client/mysqldump.c
    1.90 03/05/30 15:20:21 bar@bar.mysql.r18.ru +9 -2
    mysqldump now produces SET NAMES. It can be disabled by --no-set-names

ChangeSet
  1.1538.18.3 03/05/30 13:56:02 bar@bar.mysql.r18.ru +2 -0
  SET character_set_results=NULL  is now working

  sql/set_var.h
    1.26 03/05/30 13:55:59 bar@bar.mysql.r18.ru +5 -2
    SET character_set_results=NULL  is now working

  sql/set_var.cc
    1.34.1.19 03/05/30 13:55:59 bar@bar.mysql.r18.ru +9 -3
    SET character_set_results=NULL  is now working

ChangeSet
  1.1538.18.2 03/05/30 13:24:24 bar@bar.mysql.r18.ru +2 -0
  set_var.cc, set_var.h:
    character_set_connection new variable

  sql/set_var.cc
    1.34.1.18 03/05/30 13:24:08 bar@bar.mysql.r18.ru +19 -0
    character_set_connection new variable

  sql/set_var.h
    1.25 03/05/30 13:23:51 bar@bar.mysql.r18.ru +9 -0
    character_set_connection new variable

ChangeSet
  1.1538.18.1 03/05/30 13:03:56 bar@bar.mysql.r18.ru +11 -0
  character_set_server is now updatable
  character_set_database was added
  Code optimization: reuse more code for all character sets variables

  BitKeeper/etc/ignore
    1.153.1.5 03/05/30 13:03:54 bar@bar.mysql.r18.ru +1 -0
    Added scripts/mysql_create_system_tables to the ignore list

  sql/sql_yacc.yy
    1.203.42.2 03/05/30 13:03:53 bar@bar.mysql.r18.ru +3 -3
    character_set_server is now updatable
    character_set_database was added

  sql/sql_table.cc
    1.157.2.6 03/05/30 13:03:53 bar@bar.mysql.r18.ru +2 -1
    character_set_server is now updatable
    character_set_database was added

  sql/sql_load.cc
    1.46.3.7 03/05/30 13:03:53 bar@bar.mysql.r18.ru +1 -1
    character_set_server is now updatable
    character_set_database was added

  sql/sql_db.cc
    1.68.1.5 03/05/30 13:03:53 bar@bar.mysql.r18.ru +28 -16
    character_set_server is now updatable
    character_set_database was added

  sql/sql_class.h
    1.146.1.24 03/05/30 13:03:53 bar@bar.mysql.r18.ru +2 -0
    character_set_server is now updatable
    character_set_database was added

  sql/sql_class.cc
    1.105.1.11 03/05/30 13:03:53 bar@bar.mysql.r18.ru +1 -1
    character_set_server is now updatable
    character_set_database was added

  sql/sql_base.cc
    1.145.1.5 03/05/30 13:03:53 bar@bar.mysql.r18.ru +2 -2
    character_set_server is now updatable
    character_set_database was added

  sql/set_var.h
    1.24 03/05/30 13:03:53 bar@bar.mysql.r18.ru +23 -5
    character_set_server is now updatable
    character_set_database was added

  sql/set_var.cc
    1.34.1.17 03/05/30 13:03:53 bar@bar.mysql.r18.ru +68 -39
    character_set_server is now updatable
    character_set_database was added

  sql/mysqld.cc
    1.356.1.21 03/05/30 13:03:53 bar@bar.mysql.r18.ru +11 -7
    character_set_server is now updatable
    character_set_database was added

ChangeSet
  1.1538.17.1 03/05/30 13:03:00 ram@mysql.r18.ru +1 -0
  Fix for the bug #537 (UDF example broken on 4.1).

  sql/udf_example.cc
    1.13 03/05/30 13:02:43 ram@mysql.r18.ru +2 -2
    Fix for the bug #537 (UDF example broken on 4.1).

ChangeSet
  1.1538.16.2 03/05/29 17:47:31 vva@eagle.mysql.r18.ru +13 -0
  new version of help

  scripts/mysql_create_system_tables.sh
    1.1 03/05/29 17:47:23 vva@eagle.mysql.r18.ru +311 -0

  sql/table.cc
    1.79 03/05/29 17:47:23 vva@eagle.mysql.r18.ru +27 -0
    new version of help

  sql/sql_help.cc
    1.11 03/05/29 17:47:23 vva@eagle.mysql.r18.ru +531 -261
    new version of help

  sql/protocol.h
    1.11 03/05/29 17:47:23 vva@eagle.mysql.r18.ru +2 -0
    new version of help

  sql/mysql_priv.h
    1.186.1.12 03/05/29 17:47:23 vva@eagle.mysql.r18.ru +1 -0
    new version of help

  scripts/mysql_install_db.sh
    1.37.1.7 03/05/29 17:47:23 vva@eagle.mysql.r18.ru +18 -202
    new version of help

  scripts/mysql_create_system_tables.sh
    1.0 03/05/29 17:47:23 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/NEW_HELP/4.1.clear/scripts/mysql_create_system_tables.sh

  scripts/fill_help_tables.sh
    1.7 03/05/29 17:47:23 vva@eagle.mysql.r18.ru +433 -127
    new version of help

  scripts/Makefile.am
    1.28 03/05/29 17:47:23 vva@eagle.mysql.r18.ru +7 -13
    new version of help

  mysql-test/t/help.test
    1.2 03/05/29 17:47:23 vva@eagle.mysql.r18.ru +88 -23
    new version of help

  mysql-test/r/help.result
    1.2 03/05/29 17:47:23 vva@eagle.mysql.r18.ru +187 -67
    new version of help

  mysql-test/r/connect.result
    1.1.1.2 03/05/29 17:47:23 vva@eagle.mysql.r18.ru +3 -0
    new version of help

  mysql-test/install_test_db.sh
    1.24.1.2 03/05/29 17:47:23 vva@eagle.mysql.r18.ru +3 -207
    new version of help

  client/mysql.cc
    1.121.1.13 03/05/29 17:47:23 vva@eagle.mysql.r18.ru +47 -36
    new version of help

ChangeSet
  1.1524.1.9 03/05/29 14:44:00 greg@mysql.com +1 -0
  Reviewed Novell-supplied patch for 5.0 tree

  configure.in
    1.212 03/05/29 14:43:58 greg@mysql.com +0 -1
    Can't put this in yet because of 'make dist'

ChangeSet
  1.1524.1.8 03/05/29 14:28:02 greg@mysql.com[greg] +27 -0
  rlyon-5.0.0-alpha.patch

  netware/BUILD/knetware.imp
    1.1 03/05/22 09:27:03 greg@mysql.com[greg] +2 -0
    Import patch rlyon-5.0.0-alpha.patch

  netware/BUILD/crontab
    1.1 03/05/22 09:27:03 greg@mysql.com[greg] +4 -0
    Import patch rlyon-5.0.0-alpha.patch

  netware/BUILD/cron-build
    1.1 03/05/22 09:27:03 greg@mysql.com[greg] +46 -0
    Import patch rlyon-5.0.0-alpha.patch

  netware/BUILD/compile-netware-src
    1.1 03/05/22 09:27:03 greg@mysql.com[greg] +36 -0
    Import patch rlyon-5.0.0-alpha.patch

  sql/slave.cc
    1.193 03/05/22 09:27:03 greg@mysql.com[greg] +0 -4
    Import patch rlyon-5.0.0-alpha.patch

  sql/mysqld.cc
    1.362 03/05/22 09:27:03 greg@mysql.com[greg] +4 -5
    Import patch rlyon-5.0.0-alpha.patch

  scripts/make_binary_distribution.sh
    1.56 03/05/22 09:27:03 greg@mysql.com[greg] +65 -28
    Import patch rlyon-5.0.0-alpha.patch

  netware/mysql_test_run.c
    1.4 03/05/22 09:27:03 greg@mysql.com[greg] +15 -0
    Import patch rlyon-5.0.0-alpha.patch

  netware/Makefile.am
    1.8 03/05/22 09:27:03 greg@mysql.com[greg] +20 -21
    Import patch rlyon-5.0.0-alpha.patch

  netware/BUILD/nwbootstrap
    1.3.1.1 03/05/22 09:27:03 greg@mysql.com[greg] +23 -2
    Import patch rlyon-5.0.0-alpha.patch

  netware/BUILD/mwldnlm
    1.2.1.1 03/05/22 09:27:03 greg@mysql.com[greg] +3 -0
    Import patch rlyon-5.0.0-alpha.patch

  netware/BUILD/mwenv
    1.5 03/05/22 09:27:03 greg@mysql.com[greg] +4 -4
    Import patch rlyon-5.0.0-alpha.patch

  netware/BUILD/mwccnlm
    1.2.1.1 03/05/22 09:27:02 greg@mysql.com[greg] +3 -0
    Import patch rlyon-5.0.0-alpha.patch

  netware/BUILD/mwasmnlm
    1.2.1.1 03/05/22 09:27:03 greg@mysql.com[greg] +3 -0
    Import patch rlyon-5.0.0-alpha.patch

  netware/BUILD/knetware.imp
    1.0 03/05/22 09:27:03 greg@mysql.com[greg] +0 -0
    BitKeeper file /home/greg/bk/p50/netware/BUILD/knetware.imp

  netware/BUILD/crontab
    1.0 03/05/22 09:27:03 greg@mysql.com[greg] +0 -0
    BitKeeper file /home/greg/bk/p50/netware/BUILD/crontab

  netware/BUILD/cron-build
    1.0 03/05/22 09:27:03 greg@mysql.com[greg] +0 -0
    BitKeeper file /home/greg/bk/p50/netware/BUILD/cron-build

  netware/BUILD/compile-netware-standard
    1.2.1.1 03/05/22 09:27:03 greg@mysql.com[greg] +8 -1
    Import patch rlyon-5.0.0-alpha.patch

  netware/BUILD/compile-netware-src
    1.0 03/05/22 09:27:03 greg@mysql.com[greg] +0 -0
    BitKeeper file /home/greg/bk/p50/netware/BUILD/compile-netware-src

  netware/BUILD/compile-netware-debug
    1.2.1.1 03/05/22 09:27:03 greg@mysql.com[greg] +6 -0
    Import patch rlyon-5.0.0-alpha.patch

  netware/BUILD/compile-netware-all
    1.2.1.1 03/05/22 09:27:03 greg@mysql.com[greg] +7 -0
    Import patch rlyon-5.0.0-alpha.patch

  netware/BUILD/compile-netware-START
    1.2.1.1 03/05/22 09:27:03 greg@mysql.com[greg] +4 -1
    Import patch rlyon-5.0.0-alpha.patch

  netware/BUILD/compile-netware-END
    1.2.1.1 03/05/22 09:27:03 greg@mysql.com[greg] +7 -1
    Import patch rlyon-5.0.0-alpha.patch

  netware/BUILD/compile-linux-tools
    1.2.1.1 03/05/22 09:27:03 greg@mysql.com[greg] +4 -1
    Import patch rlyon-5.0.0-alpha.patch

  netware/BUILD/compile-AUTOTOOLS
    1.2.1.1 03/05/22 09:27:03 greg@mysql.com[greg] +6 -0
    Import patch rlyon-5.0.0-alpha.patch

  mysys/my_pthread.c
    1.36.1.1 03/05/22 09:27:03 greg@mysql.com[greg] +23 -0
    Import patch rlyon-5.0.0-alpha.patch

  include/my_pthread.h
    1.64.1.1 03/05/22 09:27:02 greg@mysql.com[greg] +5 -0
    Import patch rlyon-5.0.0-alpha.patch

  include/my_global.h
    1.44.1.1 03/05/22 09:27:02 greg@mysql.com[greg] +7 -0
    Import patch rlyon-5.0.0-alpha.patch

  include/config-netware.h
    1.3 03/05/22 09:27:02 greg@mysql.com[greg] +18 -2
    Import patch rlyon-5.0.0-alpha.patch

  configure.in
    1.211 03/05/22 09:27:03 greg@mysql.com[greg] +10 -7
    Import patch rlyon-5.0.0-alpha.patch

  client/mysql.cc
    1.128 03/05/22 09:27:03 greg@mysql.com[greg] +3 -0
    Import patch rlyon-5.0.0-alpha.patch

ChangeSet
  1.1346.224.4 03/05/29 14:52:25 gluh@gluh.mysql.r18.ru +1 -0
  Fix for bug #529 ("x509" no allowed as field name)

  sql/sql_yacc.yy
    1.145.1.62 03/05/29 14:52:09 gluh@gluh.mysql.r18.ru +1 -0
    Fix for bug #529 ("x509" no allowed as field name)

ChangeSet
  1.676.1.704 03/05/28 20:31:33 heikki@hundin.mysql.fi +1 -0
  srv0srv.c:
    Prevent the InnoDB main thread from hogging CPU if a table lingers in the background drop queue (though it is essentially a bug if a table end up there at all)

  innobase/srv/srv0srv.c
    1.11.1.24 03/05/28 20:31:23 heikki@hundin.mysql.fi +9 -0
    Prevent the InnoDB main thread from hogging CPU if a table lingers in the background drop queue (though it is essentially a bug if a table end up there at all)

  sql/sql_base.cc
    1.145.3.1 03/05/28 09:26:58 igor@rurik.mysql.com +2 -4
    Added preload statement.

  sql/sql_lex.h
    1.102.11.1 03/05/28 09:23:10 igor@rurik.mysql.com +1 -1
    Added preload statement.

  myisam/myisamdef.h
    1.59.2.1 03/05/28 09:05:11 igor@rurik.mysql.com +2 -0
    Added preload statement.

  sql/table.h
    1.48.1.1 03/05/28 09:04:22 igor@rurik.mysql.com +1 -0
    Added preload statement.

  sql/sql_yacc.yy
    1.203.43.1 03/05/28 09:04:04 igor@rurik.mysql.com +56 -3
    Added preload statement.

  sql/sql_table.cc
    1.157.5.1 03/05/28 09:03:47 igor@rurik.mysql.com +9 -0
    Added preload statement.

  sql/sql_parse.cc
    1.271.7.1 03/05/28 09:03:27 igor@rurik.mysql.com +11 -0
    Added preload statement.

  sql/mysql_priv.h
    1.186.7.1 03/05/28 09:03:05 igor@rurik.mysql.com +5 -0
    Added preload statement.

  sql/lex.h
    1.82.11.1 03/05/28 09:02:38 igor@rurik.mysql.com +2 -0
    Added preload statement.

  sql/handler.h
    1.79.1.1 03/05/28 09:02:23 igor@rurik.mysql.com +1 -0

  sql/handler.cc
    1.90.1.1 03/05/28 09:01:47 igor@rurik.mysql.com +5 -0
    Added preload statement.

  sql/ha_myisam.h
    1.47 03/05/28 09:01:12 igor@rurik.mysql.com +1 -0
    Added preload statement.

  sql/ha_myisam.cc
    1.115.2.1 03/05/28 08:58:53 igor@rurik.mysql.com +129 -0
    Added preload statement.

ChangeSet
  1.1538.16.1 03/05/28 18:02:14 bell@sanja.is.com.ua +1 -0
  manual types casting to satisfy gcc 3.2.1 compiler

  sql/item_create.cc
    1.33.1.5 03/05/28 18:01:56 bell@sanja.is.com.ua +2 -2
    manual types casting to satisfy gcc 3.2.1 compiler

ChangeSet
  1.1538.15.1 03/05/28 16:52:56 bell@sanja.is.com.ua +4 -0
  added mem_root switching for subselect if it is necessary
  (bug #518 fixed)

  sql/item_subselect.h
    1.28.1.1 03/05/28 16:52:54 bell@sanja.is.com.ua +3 -0
    added storing THD for mem_root testinmg & switching
    exec() - wrapper around engine->exec() to test and switch mem_root if necessary

  sql/item_subselect.cc
    1.60.4.1 03/05/28 16:52:54 bell@sanja.is.com.ua +27 -11
    test and switch mem_root if it is necessary
    exec() - wrapper around engine->exec() to test and switch mem_root if necessary

  mysql-test/t/subselect.test
    1.58.2.3 03/05/28 16:52:54 bell@sanja.is.com.ua +14 -0
    test of bug #518

  mysql-test/r/subselect.result
    1.67.7.2 03/05/28 16:52:54 bell@sanja.is.com.ua +14 -0
    test of bug #518

ChangeSet
  1.1538.14.4 03/05/28 17:57:58 bar@bar.mysql.r18.ru +5 -0
  CAST(expr AS char) now supports character set with conversion:
  
  SELECT CAST(_latin1'string' AS CHAR CHARACTER SET latin2)

  sql/sql_yacc.yy
    1.203.42.1 03/05/28 17:57:55 bar@bar.mysql.r18.ru +13 -11
    CAST(expr AS char) now supports character set with conversion:
    
    SELECT CAST(_latin1'string' AS CHAR CHARACTER SET latin2)

  sql/item_create.h
    1.26 03/05/28 17:57:55 bar@bar.mysql.r18.ru +1 -1
    CAST(expr AS char) now supports character set with conversion:
    
    SELECT CAST(_latin1'string' AS CHAR CHARACTER SET latin2)

  sql/item_create.cc
    1.33.1.4 03/05/28 17:57:55 bar@bar.mysql.r18.ru +5 -2
    CAST(expr AS char) now supports character set with conversion:
    
    SELECT CAST(_latin1'string' AS CHAR CHARACTER SET latin2)

  mysql-test/t/cast.test
    1.4 03/05/28 17:57:55 bar@bar.mysql.r18.ru +9 -0
    CAST(expr AS char) now supports character set with conversion:
    
    SELECT CAST(_latin1'string' AS CHAR CHARACTER SET latin2)

  mysql-test/r/cast.result
    1.6 03/05/28 17:57:55 bar@bar.mysql.r18.ru +13 -0
    CAST(expr AS char) now supports character set with conversion:
    
    SELECT CAST(_latin1'string' AS CHAR CHARACTER SET latin2)

ChangeSet
  1.1538.14.3 03/05/28 16:48:48 bar@bar.mysql.r18.ru +1 -0
  ctype-win1250ch.c:
    bug #521 fix: ('3'='4')  was true in cp1250_czech_ci

  strings/ctype-win1250ch.c
    1.29 03/05/28 16:47:23 bar@bar.mysql.r18.ru +1 -1
    bug #521 fix: ('3'='4')  was true in cp1250_czech_ci

ChangeSet
  1.1538.14.2 03/05/28 16:23:04 bar@bar.mysql.r18.ru +8 -0
  --with-collation argument for configure. Now one can for example use this:
  
  ./configure --with-charset=latin1 --with-collation=latin1_danish_ci

  sql/mysqld.cc
    1.356.1.20 03/05/28 16:23:02 bar@bar.mysql.r18.ru +2 -2
    --with-collation argument for configure. Now one can for example use this:
    
    ./configure --with-charset=latin1 --with-collation=latin1_danish_ci

  include/mysql_version.h.in
    1.14 03/05/28 16:23:02 bar@bar.mysql.r18.ru +0 -3
    --with-collation argument for configure. Now one can for example use this:
    
    ./configure --with-charset=latin1 --with-collation=latin1_danish_ci

  configure.in
    1.201.1.34 03/05/28 16:23:02 bar@bar.mysql.r18.ru +167 -4
    --with-collation argument for configure. Now one can for example use this:
    
    ./configure --with-charset=latin1 --with-collation=latin1_danish_ci

  client/mysqlimport.c
    1.35 03/05/28 16:23:02 bar@bar.mysql.r18.ru +1 -1
    --with-collation argument for configure. Now one can for example use this:
    
    ./configure --with-charset=latin1 --with-collation=latin1_danish_ci

  client/mysqldump.c
    1.89 03/05/28 16:23:02 bar@bar.mysql.r18.ru +1 -1
    --with-collation argument for configure. Now one can for example use this:
    
    ./configure --with-charset=latin1 --with-collation=latin1_danish_ci

  client/mysqlcheck.c
    1.31 03/05/28 16:23:02 bar@bar.mysql.r18.ru +2 -1
    --with-collation argument for configure. Now one can for example use this:
    
    ./configure --with-charset=latin1 --with-collation=latin1_danish_ci

  client/mysql.cc
    1.121.1.12 03/05/28 16:23:02 bar@bar.mysql.r18.ru +1 -1
    --with-collation argument for configure. Now one can for example use this:
    
    ./configure --with-charset=latin1 --with-collation=latin1_danish_ci

  acconfig.h
    1.34 03/05/28 16:23:02 bar@bar.mysql.r18.ru +4 -1
    --with-collation argument for configure. Now one can for example use this:
    
    ./configure --with-charset=latin1 --with-collation=latin1_danish_ci

ChangeSet
  1.1538.14.1 03/05/28 14:46:25 bar@bar.mysql.r18.ru +1 -0
  ctype-win1250ch.c:
    ifdef wrong structure has been fixed

  strings/ctype-win1250ch.c
    1.28 03/05/28 14:46:07 bar@bar.mysql.r18.ru +7 -6
    ifdef wrong structure has been fixed

ChangeSet
  1.1538.7.13 03/05/28 14:13:14 hf@deer.(none) +1 -0
  resolving of merging conflict

  libmysql/libmysql.c
    1.156.1.3 03/05/28 14:13:12 hf@deer.(none) +0 -2
    conflict resolved

ChangeSet
  1.1538.13.1 03/05/28 13:54:58 hf@deer.(none) +6 -0
  Lots of conflicts resolved

  BitKeeper/etc/logging_ok
    1.233.6.4 03/05/28 13:54:58 hf@deer.(none) +1 -0
    Logging to logging@openlogging.org accepted

ChangeSet
  1.1538.7.12 03/05/28 13:54:18 bar@bar.mysql.r18.ru +3 -0
  "mysql" now sends client character set to server.

  sql/sql_parse.cc
    1.271.3.12 03/05/28 13:54:15 bar@bar.mysql.r18.ru +9 -0
    "mysql" now sends client character set to server.

  libmysql/libmysql.c
    1.156.2.5 03/05/28 13:54:15 bar@bar.mysql.r18.ru +2 -1
    "mysql" now sends client character set to server.

  client/mysql.cc
    1.121.1.11 03/05/28 13:54:15 bar@bar.mysql.r18.ru +1 -0
    "mysql" now sends client character set to server.

  sql/mini_client.cc
    1.64 03/05/28 13:53:58 hf@deer.(none) +0 -0
    resolved conflicts

  libmysql/libmysql.c
    1.156.1.2 03/05/28 13:53:58 hf@deer.(none) +10 -113
    Resolved conflicts

  sql/slave.cc
    1.188.1.5 03/05/28 11:32:24 hf@deer.(none) +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.29 03/05/28 11:32:24 hf@deer.(none) +0 -0
    Auto merged

  libmysqld/Makefile.am
    1.29.1.3 03/05/28 11:32:24 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1346.224.3 03/05/28 11:24:48 bar@bar.mysql.r18.ru +1 -0
  item_cmpfunc.cc:
    Fix for multibyte charsets

  sql/item_cmpfunc.cc
    1.20.1.31 03/05/28 11:24:30 bar@bar.mysql.r18.ru +4 -0
    Fix for multibyte charsets

ChangeSet
  1.1346.225.1 03/05/28 03:36:44 monty@narttu.mysql.fi +1 -0
  Removed not used variable

  libmysqld/lib_sql.cc
    1.25.3.9 03/05/28 03:36:43 monty@narttu.mysql.fi +0 -1
    Removed not used variable

ChangeSet
  1.1538.7.11 03/05/28 02:06:56 bell@sanja.is.com.ua +1 -0
  after-review fix

  sql/sql_parse.cc
    1.271.3.11 03/05/28 02:06:54 bell@sanja.is.com.ua +45 -44
    after-review fix

ChangeSet
  1.1538.12.1 03/05/28 00:49:24 bell@sanja.is.com.ua +3 -0
  fixed priority checking bug in sub select handling

  sql/sql_parse.cc
    1.271.3.10 03/05/28 00:49:14 bell@sanja.is.com.ua +44 -10
    fixed priority checking bug in sub select handling

  mysql-test/t/subselect.test
    1.58.2.2 03/05/28 00:49:14 bell@sanja.is.com.ua +1 -1
    fixed subselect test

  mysql-test/r/subselect.result
    1.67.7.1 03/05/28 00:49:14 bell@sanja.is.com.ua +4 -2
    fixed subselect test

ChangeSet
  1.1346.224.1 03/05/27 23:07:32 guilhem@mysql.com +2 -0
  A trick (a useless update) to force the slave to wait for TWO rotate events
  before stopping. This is to make the test's result predictable (depending
  on the machine the results could formerly be slightly different, though
  everything is sane in the code; it's not a bug).

  mysql-test/t/rpl_log.test
    1.11.1.1 03/05/27 23:07:30 guilhem@mysql.com +22 -0
    A trick (a useless update) to force the slave to wait for TWO rotate events
    before stopping. This is to make the test's result predictable (depending
    on the machine the results could formerly be slightly different, though
    everything is sane in the code; it's not a bug).

  mysql-test/r/rpl_log.result
    1.26.1.3 03/05/27 23:07:30 guilhem@mysql.com +14 -8
    result update

ChangeSet
  1.1538.7.9 03/05/27 20:22:47 lenz@mysql.com +1 -0
   - removed all traces of internals.texi from Docs/Makefile.am to avoid
     compile problems

  Docs/Makefile.am
    1.37.1.1 03/05/27 20:21:58 lenz@mysql.com +0 -48
     - removed all traces of internals.texi to avoid compile problems

ChangeSet
  1.1346.200.44 03/05/27 18:47:50 lenz@mysql.com +2 -0
   - removed internals.texi (has been moved to mysqldoc BK tree)

  Docs/Makefile.am
    1.38 03/05/27 18:47:48 lenz@mysql.com +0 -47
     - removed all traces of internals.texi

  BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43
    1.22.1.17 03/05/27 18:44:01 lenz@mysql.com +0 -0
    Delete: Docs/internals.texi

ChangeSet
  1.676.1.703 03/05/27 18:34:03 lenz@mysql.com +1 -0
   - removed internals.texi (has been moved to the "mysqldoc" BK tree)

  BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43
    1.11.1.1 03/05/27 18:32:50 lenz@mysql.com +0 -0
    Delete: Docs/internals.texi

ChangeSet
  1.1346.223.1 03/05/27 18:16:50 guilhem@mysql.com +1 -0
  Removed bad mutex locking

  sql/slave.cc
    1.164.1.58 03/05/27 18:16:48 guilhem@mysql.com +0 -4
    Removed bad mutex locking

ChangeSet
  1.1538.7.8 03/05/27 18:40:37 monty@narttu.mysql.fi +7 -0
  ORDER BY optimization
  Fixed new bug when reading field types

  sql/sql_select.cc
    1.216.13.1 03/05/27 18:40:34 monty@narttu.mysql.fi +26 -10
    New ORDER BY optimization
    
    This alllows MySQL to change a ref/range index from (a,b) to (a,c) when 'b' was not used to find rows and one did
    ORDER BY a,c or ORDER BY c

  sql/set_var.cc
    1.34.1.16 03/05/27 18:40:34 monty@narttu.mysql.fi +2 -2
    Speed optimization

  sql/opt_range.h
    1.24 03/05/27 18:40:34 monty@narttu.mysql.fi +1 -1
    New ORDER BY optimization

  sql/opt_range.cc
    1.90 03/05/27 18:40:34 monty@narttu.mysql.fi +3 -2
    New ORDER BY optimization

  mysql-test/r/order_by.result
    1.23 03/05/27 18:40:34 monty@narttu.mysql.fi +1 -1
    Result after new order by optimization

  libmysql/libmysql.c
    1.156.2.4 03/05/27 18:40:34 monty@narttu.mysql.fi +5 -1
    Filled missing fields in new MYSQL_FIELD structure
    Fixed new bug when reading field types

  client/mysql.cc
    1.121.1.10 03/05/27 18:40:34 monty@narttu.mysql.fi +2 -3
    Fixed output for -T

ChangeSet
  1.1346.222.1 03/05/27 16:40:14 monty@narttu.mysql.fi +12 -0
  Fixed problem with mysql prompt when server disconnect. (Bug 356)
  Fixed problem with localtime -> gmt where some times resulted in
  different (but correct) timestamps. Now MySQL should use the smallest
  possible timestamp value in this case.  (Bug 316)

  mysql-test/t/timezone.test
    1.1 03/05/27 16:40:13 monty@narttu.mysql.fi +28 -0

  mysql-test/t/timezone-master.opt
    1.1 03/05/27 16:40:13 monty@narttu.mysql.fi +1 -0

  mysql-test/r/timezone.result
    1.1 03/05/27 16:40:13 monty@narttu.mysql.fi +25 -0

  mysql-test/r/have_mest_timezone.require
    1.1 03/05/27 16:40:13 monty@narttu.mysql.fi +2 -0

  sql/time.cc
    1.19.1.6 03/05/27 16:40:13 monty@narttu.mysql.fi +35 -21
    Fixed problem with localtime -> gmt where some times resulted in
    different (but correct) timestamps. Now MySQL should use the smallest
    possible timestamp value in this case.  (Bug 316)

  sql/mysqld.cc
    1.297.1.132 03/05/27 16:40:13 monty@narttu.mysql.fi +0 -10
    Remove LOCK_timezone.
    Code cleanup

  sql/mysql_priv.h
    1.150.1.45 03/05/27 16:40:13 monty@narttu.mysql.fi +1 -1
    New my_gmt_sec() parameters

  sql/field.cc
    1.51.1.23 03/05/27 16:40:13 monty@narttu.mysql.fi +2 -1
    New my_gmt_sec() parameters

  mysql-test/t/timezone.test
    1.0 03/05/27 16:40:13 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/t/timezone.test

  mysql-test/t/timezone-master.opt
    1.0 03/05/27 16:40:13 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/t/timezone-master.opt

  mysql-test/t/raid.test
    1.3.1.2 03/05/27 16:40:13 monty@narttu.mysql.fi +2 -0
    Fixed test if raid is enabled

  mysql-test/r/timezone.result
    1.0 03/05/27 16:40:13 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/r/timezone.result

  mysql-test/r/have_mest_timezone.require
    1.0 03/05/27 16:40:13 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/r/have_mest_timezone.require

  mysql-test/mysql-test-run.sh
    1.146.1.24 03/05/27 16:40:13 monty@narttu.mysql.fi +11 -1
    Added support for --timezone in -master.opt

  client/mysqltest.c
    1.77.1.24 03/05/27 16:40:13 monty@narttu.mysql.fi +5 -1
    More debug information

  client/mysql.cc
    1.93.5.1 03/05/27 16:40:12 monty@narttu.mysql.fi +14 -5
    Fixed problem with prompt when server disconnect. (Bug 356)

ChangeSet
  1.1538.11.5 03/05/27 15:31:18 arjen@george.bitbike.com +1 -0
  Deleted internals.texi (moved to mysqldoc tree - Monty req).

  BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43
    1.32 03/05/27 15:30:47 arjen@george.bitbike.com +0 -0
    Delete: Docs/internals.texi

ChangeSet
  1.1346.200.41 03/05/27 14:50:14 guilhem@mysql.com +2 -0
  temporary update of the test to satisfy merge; will commit a final update
  soon.

  mysql-test/t/rpl_insert_id.test
    1.1.1.2 03/05/27 14:50:13 guilhem@mysql.com +3 -9
    temporary update of the test to satisfy merge; will commit a final update
    soon.

ChangeSet
  1.1538.11.4 03/05/27 16:58:57 vva@mysql.r18.ru +2 -0
  fixed small merge bug

  BitKeeper/etc/logging_ok
    1.233.6.3 03/05/27 16:58:57 vva@mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  scripts/mysql_install_db.sh
    1.37.1.6 03/05/27 16:58:24 vva@mysql.r18.ru +1 -1
    fixed small merge bug

  mysql-test/r/rpl_insert_id.result
    1.2.1.2 03/05/27 13:07:19 guilhem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1538.11.3 03/05/27 12:59:08 mysql@home.(none) +1 -0
  conf_to_src.c:
    Changes according to CHARSET_INFO structure

  strings/conf_to_src.c
    1.12 03/05/27 12:58:29 mysql@home.(none) +25 -39
    Changes according to CHARSET_INFO structure

ChangeSet
  1.1538.11.2 03/05/27 12:57:02 mysql@home.(none) +1 -0
  Index.xml:
    utf8 was not marked as compiled

  sql/share/charsets/Index.xml
    1.26 03/05/27 12:56:17 mysql@home.(none) +8 -2
    utf8 was not marked as compiled

ChangeSet
  1.1538.11.1 03/05/27 04:42:47 wax@kishkin.ru +1 -0
  Merge kishkin.ru:/home/wax/mysql-4n into kishkin.ru:/home/wax/mysql-4sm

  sql/mysqld.cc
    1.356.1.19 03/05/27 04:42:43 wax@kishkin.ru +0 -0
    Auto merged

ChangeSet
  1.1538.7.6 03/05/26 20:59:40 monty@narttu.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into narttu.mysql.fi:/my/mysql-4.1

  sql/field.h
    1.72 03/05/26 20:59:37 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1538.10.1 03/05/26 20:59:09 monty@narttu.mysql.fi +1 -0
  Portability fix

  sql/field.h
    1.70.1.1 03/05/26 20:59:07 monty@narttu.mysql.fi +2 -1
    Portability fix

ChangeSet
  1.1538.7.5 03/05/26 20:48:40 monty@mashka.mysql.fi +4 -0
  ixed wrong unlock of tables (new bug)

  sql/sql_update.cc
    1.83.2.7 03/05/26 20:48:37 monty@mashka.mysql.fi +6 -7
    Fixed wrong unlock of tables.
    (Unlock must be done after writing to binary log

  sql/sql_load.cc
    1.46.3.6 03/05/26 20:48:37 monty@mashka.mysql.fi +4 -2
    Comment cleanup

  sql/sql_insert.cc
    1.86.2.5 03/05/26 20:48:37 monty@mashka.mysql.fi +4 -8
    Comment cleanup

  sql/sql_delete.cc
    1.99.2.7 03/05/26 20:48:37 monty@mashka.mysql.fi +4 -2
    Comment cleanup

ChangeSet
  1.1346.200.40 03/05/26 20:35:27 monty@narttu.mysql.fi +1 -0
  Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0

  sql/mysqld.cc
    1.297.1.131 03/05/26 20:35:26 monty@narttu.mysql.fi +2 -4
    Auto merged

ChangeSet
  1.676.1.702 03/05/26 20:09:53 monty@narttu.mysql.fi +1 -0
  Fixed bug when installing mysqld as a service with 2 arguments (option + service-name)

  sql/mysqld.cc
    1.162.1.114 03/05/26 20:09:52 monty@narttu.mysql.fi +5 -2
    Fixed bug when installing mysqld as a service with 2 arguments (option + service-name)

ChangeSet
  1.1346.200.39 03/05/26 19:11:22 monty@narttu.mysql.fi +2 -0
  Fix for 64 bit machines (To remove warnings on Itanium)

  mysys/thr_alarm.c
    1.32 03/05/26 19:11:21 monty@narttu.mysql.fi +1 -0
    Safety fix

  include/my_global.h
    1.34.1.12 03/05/26 19:11:21 monty@narttu.mysql.fi +5 -0
    Fix for 64 bit machines (To remove warnings on Itanium)

ChangeSet
  1.1538.9.1 03/05/26 19:10:43 heikki@hundin.mysql.fi +5 -0
  ha_innodb.cc:
    Remove accidenatlly committed debug printfs when query cache is used
  sql_update.cc, sql_load.cc, sql_insert.cc, sql_delete.cc:
    For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.

  sql/ha_innodb.cc
    1.90.1.2 03/05/26 19:10:29 heikki@hundin.mysql.fi +2 -2
    Remove accidenatlly committed debug printfs when query cache is used

  sql/sql_update.cc
    1.83.2.6 03/05/26 19:08:11 heikki@hundin.mysql.fi +23 -18
    For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.

  sql/sql_load.cc
    1.46.3.5 03/05/26 19:08:11 heikki@hundin.mysql.fi +4 -2
    For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.

  sql/sql_insert.cc
    1.86.2.4 03/05/26 19:08:11 heikki@hundin.mysql.fi +20 -13
    For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.

  sql/sql_delete.cc
    1.99.2.6 03/05/26 19:08:11 heikki@hundin.mysql.fi +13 -11
    For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.

ChangeSet
  1.1538.7.3 03/05/26 19:03:25 monty@mashka.mysql.fi +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mashka.mysql.fi:/home/my/mysql-4.1-narttu

  sql/mysqld.cc
    1.356.1.18 03/05/26 19:03:20 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/field.h
    1.71 03/05/26 19:03:20 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/field.cc
    1.105 03/05/26 19:03:20 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1538.8.1 03/05/26 19:01:20 monty@mashka.mysql.fi +12 -0
  New 4.1 protocol; SQLSTATE, CLIENT_MULTI_RESULTS, client character set
   

  sql/sql_parse.cc
    1.271.3.9 03/05/26 19:01:17 monty@mashka.mysql.fi +23 -8
    New 4.1 protocol

  sql/repl_failsafe.cc
    1.27.2.1 03/05/26 19:01:16 monty@mashka.mysql.fi +1 -1
    Fixed arguments to close_connection()

  sql/protocol.h
    1.10 03/05/26 19:01:16 monty@mashka.mysql.fi +0 -1
    Removed net_send_error()

  sql/protocol.cc
    1.56.1.3 03/05/26 19:01:16 monty@mashka.mysql.fi +42 -42
    Fixed bug in TIME handling
    Added SQLSTATE on errors
    Removed net_send_error()

  sql/mysqld.cc
    1.356.7.1 03/05/26 19:01:16 monty@mashka.mysql.fi +18 -14
    Changed arguments to close_connection()
    Added checking of extra arguments to mysqld

  sql/mysql_priv.h
    1.186.1.11 03/05/26 19:01:16 monty@mashka.mysql.fi +1 -1
    Changed arguments to close_connection()

  sql/field.h
    1.68.1.1 03/05/26 19:01:16 monty@mashka.mysql.fi +1 -2
    Indentation cleanup

  sql/field.cc
    1.102.1.1 03/05/26 19:01:16 monty@mashka.mysql.fi +1 -1
    Indentation cleanup

  libmysql/libmysql.c
    1.156.2.3 03/05/26 19:01:16 monty@mashka.mysql.fi +165 -81
    Added sqlstate handling
    Added CLIENT_MULTI_RESULTS

  include/mysql_com.h
    1.67.1.3 03/05/26 19:01:16 monty@mashka.mysql.fi +10 -7
    New 4.1 protocol

  include/mysql.h
    1.68 03/05/26 19:01:16 monty@mashka.mysql.fi +5 -0
    Added catalog to MYSQL_FIELD
    Added sqlstate handling to protocol

  Docs/internals.texi
    1.31 03/05/26 19:01:16 monty@mashka.mysql.fi +12 -6
    Updated protocol information

ChangeSet
  1.1538.7.2 03/05/26 20:22:23 bar@bar.mysql.r18.ru +9 -0
  --with-charset was not up to date
  ctype_ucs2 and ctype_ujis were skipped in mistake

  strings/ctype-win1250ch.c
    1.27 03/05/26 20:22:20 bar@bar.mysql.r18.ru +5 -0
    --with-charset was not up to date
    ctype_ucs2 and ctype_ujis were skipped in mistake

  strings/ctype-euc_kr.c
    1.40 03/05/26 20:22:20 bar@bar.mysql.r18.ru +1 -1
    --with-charset was not up to date
    ctype_ucs2 and ctype_ujis were skipped in mistake

  strings/ctype-czech.c
    1.39 03/05/26 20:22:20 bar@bar.mysql.r18.ru +1 -1
    --with-charset was not up to date
    ctype_ucs2 and ctype_ujis were skipped in mistake

  mysys/charset.c
    1.95 03/05/26 20:22:20 bar@bar.mysql.r18.ru +6 -6
    --with-charset was not up to date
    ctype_ucs2 and ctype_ujis were skipped in mistake

  mysql-test/r/have_ujis.require
    1.2 03/05/26 20:22:20 bar@bar.mysql.r18.ru +1 -1
    --with-charset was not up to date
    ctype_ucs2 and ctype_ujis were skipped in mistake

  mysql-test/r/have_ucs2.require
    1.2 03/05/26 20:22:20 bar@bar.mysql.r18.ru +1 -1
    --with-charset was not up to date
    ctype_ucs2 and ctype_ujis were skipped in mistake

  mysql-test/r/ctype_ujis.result
    1.2 03/05/26 20:22:20 bar@bar.mysql.r18.ru +1 -1
    --with-charset was not up to date
    ctype_ucs2 and ctype_ujis were skipped in mistake

  configure.in
    1.201.1.33 03/05/26 20:22:20 bar@bar.mysql.r18.ru +79 -85
    --with-charset was not up to date
    ctype_ucs2 and ctype_ujis were skipped in mistake

  acconfig.h
    1.33 03/05/26 20:22:20 bar@bar.mysql.r18.ru +13 -16
    --with-charset was not up to date
    ctype_ucs2 and ctype_ujis were skipped in mistake

ChangeSet
  1.1538.7.1 03/05/26 20:01:18 bar@bar.mysql.r18.ru +1 -0
  Index.xml:
    cp1250_czech_ci was displayed even when not compiled-in in mistake.

  sql/share/charsets/Index.xml
    1.25 03/05/26 20:00:33 bar@bar.mysql.r18.ru +3 -1
    cp1250_czech_ci was displayed even when not compiled-in in mistake.

ChangeSet
  1.1346.200.38 03/05/26 17:55:49 monty@narttu.mysql.fi +5 -0
  Merge with 3.23 to get fix for kill mysqld-pid

  sql/mysqld.cc
    1.297.1.130 03/05/26 17:55:47 monty@narttu.mysql.fi +0 -2
    Merge with 3.23 to get fix for kill mysqld-pid

  sql/ha_innodb.cc
    1.73.1.96 03/05/26 17:55:47 monty@narttu.mysql.fi +0 -11
    Keep local copy

  sql/log_event.cc
    1.77.1.33 03/05/26 17:52:02 monty@narttu.mysql.fi +0 -5
    Auto merged

  sql/ha_innodb.cc
    1.45.25.3 03/05/26 17:52:01 monty@narttu.mysql.fi +0 -0
    Merge rename: sql/ha_innobase.cc -> sql/ha_innodb.cc

  include/mysql_com.h
    1.43.1.7 03/05/26 17:52:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.206.1.68 03/05/26 17:51:54 monty@narttu.mysql.fi +0 -1
    auto-union

ChangeSet
  1.676.300.1 03/05/26 17:24:16 monty@narttu.mysql.fi +1 -0
  Fixed problem with 'kill pid-of-mysqld' on Mac OS X

  sql/mysqld.cc
    1.162.1.113 03/05/26 17:24:15 monty@narttu.mysql.fi +11 -4
    Fixed problem with 'kill pid-of-mysqld' on Mac OS X

ChangeSet
  1.1538.6.1 03/05/26 15:52:19 bell@sanja.is.com.ua +8 -0
  merging

  mysql-test/t/func_group.test
    1.13 03/05/26 15:52:17 bell@sanja.is.com.ua +5 -8
    merging

  mysql-test/r/func_group.result
    1.15 03/05/26 15:52:17 bell@sanja.is.com.ua +2 -1
    merging

ChangeSet
  1.1346.200.37 03/05/26 15:50:05 jani@ua126d19.elisa.omakaista.fi +1 -0
  Merge jani@192.168.0.2:/my/mysql-4.0
  into ua126d19.elisa.omakaista.fi:/home/my/bk/mysql-4.0

  BitKeeper/etc/logging_ok
    1.206.1.67 03/05/26 15:50:01 jani@ua126d19.elisa.omakaista.fi +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_yacc.yy
    1.203.39.6 03/05/26 15:47:22 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_union.cc
    1.74.2.2 03/05/26 15:47:22 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.12.1 03/05/26 15:47:22 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_derived.cc
    1.43.2.2 03/05/26 15:47:22 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_sum.cc
    1.75 03/05/26 15:47:22 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.58.10.2 03/05/26 15:47:22 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.220.3 03/05/26 15:08:17 monty@narttu.mysql.fi +3 -0
  code cleanup

  sql/log.cc
    1.80.1.42 03/05/26 15:08:16 monty@narttu.mysql.fi +25 -32
    Code cleanup

  mysql-test/t/rpl_insert_id.test
    1.1.2.1 03/05/26 15:08:16 monty@narttu.mysql.fi +7 -3
    Test logging of FOREIGN_KEY_CHECKS

  mysql-test/r/rpl_insert_id.result
    1.2.2.1 03/05/26 15:08:16 monty@narttu.mysql.fi +2 -0
    Test logging of FOREIGN_KEY_CHECKS

ChangeSet
  1.1346.220.2 03/05/26 13:36:43 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.77.1.32 03/05/26 13:36:41 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.221.2 03/05/26 13:10:08 monty@narttu.mysql.fi +3 -0
  Fixed core dump bug when shuting down mysqld

  sql/mysqld.cc
    1.297.1.129 03/05/26 13:10:07 monty@narttu.mysql.fi +4 -3
    Fixed core dump bug when shuting down mysqld

  mysys/thr_alarm.c
    1.31 03/05/26 13:10:07 monty@narttu.mysql.fi +47 -28
    Fixed core dump bug when shuting down mysqld

  include/thr_alarm.h
    1.12 03/05/26 13:10:07 monty@narttu.mysql.fi +1 -1
    Fixed core dump bug when shuting down mysqld

ChangeSet
  1.1346.221.1 03/05/26 11:47:03 monty@narttu.mysql.fi +5 -0
  Added testing of LOAD DATA ... STARTING BY
  Added read_only variable

  sql/sql_update.cc
    1.54.1.33 03/05/26 11:47:02 monty@narttu.mysql.fi +0 -1
    Remove not used variable

  sql/set_var.cc
    1.12.1.20 03/05/26 11:47:02 monty@narttu.mysql.fi +2 -3
    Added read_only variable

  sql/log_event.cc
    1.77.7.1 03/05/26 11:47:02 monty@narttu.mysql.fi +1 -2
    Code cleanup

  mysql-test/t/loaddata.test
    1.1.1.1 03/05/26 11:47:02 monty@narttu.mysql.fi +8 -0
    Added testing of STARTING BY

  mysql-test/r/loaddata.result
    1.1.1.1 03/05/26 11:47:01 monty@narttu.mysql.fi +7 -0
    Added testing of STARTING BY

ChangeSet
  1.1538.1.21 03/05/26 09:28:56 bell@sanja.is.com.ua +8 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-top-4.1

  sql/sql_yacc.yy
    1.203.28.10 03/05/26 09:28:53 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_union.cc
    1.74.1.2 03/05/26 09:28:53 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.1.8 03/05/26 09:28:53 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_derived.cc
    1.43.1.2 03/05/26 09:28:53 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.52 03/05/26 09:28:53 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.90 03/05/26 09:28:53 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.56.1.16 03/05/26 09:28:53 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.58.1.18 03/05/26 09:28:52 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.676.1.700 03/05/26 06:16:50 monty@mashka.mysql.fi +1 -0
  Added missing free for last patch

  sql/ha_innobase.cc
    1.45.25.2 03/05/26 06:16:48 monty@mashka.mysql.fi +1 -0
    Added missing free for last patch

ChangeSet
  1.676.299.1 03/05/26 05:57:27 monty@mashka.mysql.fi +1 -0
  Remove not used flag

  include/mysql_com.h
    1.17.1.6 03/05/26 05:57:26 monty@mashka.mysql.fi +0 -1
    Remove not used flag

ChangeSet
  1.1346.215.20 03/05/25 23:09:46 guilhem@mysql.com +1 -0
  - Fix for memory leak if the SQL slave thread is killed just after reading an event.
  - A few more mutex locks and unlocks of rli.log_space_lock for doing clean reads of
  rli.ignore_log_space_limit
  - Broadcast after unlock, not before (small speed optimisation).

  sql/slave.cc
    1.164.1.57 03/05/25 23:09:43 guilhem@mysql.com +27 -2
    - Fix for memory leak if the SQL slave thread is killed just after reading an event.
    - A few more mutex locks and unlocks of rli.log_space_lock for doing clean reads of
    rli.ignore_log_space_limit
    - Broadcast after unlock, not before (small speed optimisation).

ChangeSet
  1.1346.220.1 03/05/25 23:37:32 heikki@hundin.mysql.fi +1 -0
  log.cc:
    If FOREIGN_KEY_CHECKS=0, wrap in binlog SQL statements inside SET FOREIGN_...=0; ... ; SET FOREIGN_...=1

  sql/log.cc
    1.80.1.41 03/05/25 23:37:22 heikki@hundin.mysql.fi +46 -1
    If FOREIGN_KEY_CHECKS=0, wrap in binlog SQL statements inside SET FOREIGN_...=0; ... ; SET FOREIGN_...=1

ChangeSet
  1.1538.1.20 03/05/24 23:30:55 mysql@home.(none) +1 -0
  symlink.result:
    Character set in this test results was displayed dispite the fact that the table has the same character set

  mysql-test/r/symlink.result
    1.7 03/05/24 23:29:56 mysql@home.(none) +4 -2
    Character set in this test results was displayed dispite the fact that the table has the same character set

ChangeSet
  1.1346.215.19 03/05/24 16:43:53 guilhem@mysql.com +5 -0
  Fix for bug #490 and #491 (see details below)

  sql/sql_insert.cc
    1.63.1.37 03/05/24 16:43:50 guilhem@mysql.com +21 -3
    - In INSERT ... SELECT, if it fails with error but one row has been inserted and
    the table is not transactional, we must write to the binlog (the slave will stop
    because of the error code in the binlog event, this is normal). bug 491.
    - we must set INSERT_ID before writing to the binlog (bug 490
    accidentally introduced by another dev in 4.0.13).

  mysql-test/t/rpl_insert_id.test
    1.1.1.1 03/05/24 16:43:50 guilhem@mysql.com +27 -6
    Test for bug #490 (INSERT SELECT in auto_increment)

  mysql-test/t/insert_select.test
    1.5.1.1 03/05/24 16:43:50 guilhem@mysql.com +19 -0
    Check if a partly completed INSERT SELECT (failing because of "Duplicate key"
    after successfully inserting other rows) is written to the binlog if the
    table is not transactional and at least one row has been inserted (bug #491)

  mysql-test/r/rpl_insert_id.result
    1.2.1.1 03/05/24 16:43:50 guilhem@mysql.com +28 -0
    Test update

  mysql-test/r/insert_select.result
    1.7.1.1 03/05/24 16:43:50 guilhem@mysql.com +14 -0
    Result update.

ChangeSet
  1.1346.215.18 03/05/23 18:23:50 guilhem@mysql.com +1 -0
  Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
  into mysql.com:/home/mysql_src/mysql-4.0

  configure.in
    1.191.1.84 03/05/23 18:23:47 guilhem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.219.1 03/05/23 18:20:57 guilhem@mysql.com +2 -0
  Outcome of discussions with Lenz and Monty about handling ccache in the build commands.

  configure.in
    1.191.14.1 03/05/23 18:20:55 guilhem@mysql.com +1 -1
    Accept "ccache gcc" in the test.

  BUILD/SETUP.sh
    1.17.1.7 03/05/23 18:20:55 guilhem@mysql.com +17 -1
    Quote $CXX to make a test work even if CXX had spaces in it.
    Automatically add ccache to CC and CXX if ccache is present.

ChangeSet
  1.676.1.698 03/05/23 16:40:21 guilhem@mysql.com +1 -0
  Fix for #468 [Ver]: SHOW VARIABLES trims innodb_data_file_path
  (this bug was already fixed in 4.0, I just copied and pasted two lines).

  sql/ha_innobase.cc
    1.45.25.1 03/05/23 16:40:18 guilhem@mysql.com +10 -2
    Fix for #468 [Ver]: SHOW VARIABLES trims innodb_data_file_path
    (this bug was already fixed in 4.0, I just copied and pasted two lines).

ChangeSet
  1.1538.1.19 03/05/23 18:54:48 bar@bar.mysql.r18.ru +2 -0
  latin7.xml:
    c
  Index.xml:
    Collation names form lati7 were mixed

  sql/share/charsets/latin7.xml
    1.6 03/05/23 18:54:38 bar@bar.mysql.r18.ru +3 -3
    c

  sql/share/charsets/Index.xml
    1.24 03/05/23 18:54:17 bar@bar.mysql.r18.ru +1 -1
    Collation names form lati7 were mixed

ChangeSet
  1.1538.1.18 03/05/23 18:39:55 bar@bar.mysql.r18.ru +12 -0
  BINARY collations for every character set

  strings/ctype-utf8.c
    1.46 03/05/23 18:39:53 bar@bar.mysql.r18.ru +26 -2
    BINARY collations for every character set

  strings/ctype-ujis.c
    1.40 03/05/23 18:39:53 bar@bar.mysql.r18.ru +23 -1
    BINARY collations for every character set

  strings/ctype-ucs2.c
    1.4 03/05/23 18:39:53 bar@bar.mysql.r18.ru +26 -2
    BINARY collations for every character set

  strings/ctype-tis620.c
    1.47 03/05/23 18:39:53 bar@bar.mysql.r18.ru +25 -2
    BINARY collations for every character set

  strings/ctype-sjis.c
    1.46 03/05/23 18:39:53 bar@bar.mysql.r18.ru +24 -2
    BINARY collations for every character set

  strings/ctype-latin1.c
    1.14 03/05/23 18:39:53 bar@bar.mysql.r18.ru +26 -3
    BINARY collations for every character set

  strings/ctype-gbk.c
    1.41 03/05/23 18:39:53 bar@bar.mysql.r18.ru +25 -2
    BINARY collations for every character set

  strings/ctype-gb2312.c
    1.37 03/05/23 18:39:53 bar@bar.mysql.r18.ru +25 -2
    BINARY collations for every character set

  strings/ctype-euc_kr.c
    1.39 03/05/23 18:39:53 bar@bar.mysql.r18.ru +26 -2
    BINARY collations for every character set

  strings/ctype-big5.c
    1.41 03/05/23 18:39:53 bar@bar.mysql.r18.ru +25 -2
    BINARY collations for every character set

  sql/share/charsets/Index.xml
    1.23 03/05/23 18:39:53 bar@bar.mysql.r18.ru +37 -2
    BINARY collations for every character set

  mysys/charset.c
    1.94 03/05/23 18:39:52 bar@bar.mysql.r18.ru +12 -1
    BINARY collations for every character set

ChangeSet
  1.1524.1.7 03/05/23 15:32:31 pem@mysql.com +9 -0
  Adopt SP stuff to the new lex pointer.

  sql/sql_prepare.cc
    1.40 03/05/23 15:32:15 pem@mysql.com +3 -0
    Restore lex pointer.

  sql/sql_parse.cc
    1.289 03/05/23 15:32:14 pem@mysql.com +23 -12
    SPs wants to init lex only.

  sql/sql_lex.h
    1.115 03/05/23 15:32:14 pem@mysql.com +2 -2
    SPs wants to init lex only.

  sql/sp_head.h
    1.16 03/05/23 15:32:14 pem@mysql.com +4 -4
    lex is now a pointer.

  sql/sp_head.cc
    1.31 03/05/23 15:32:14 pem@mysql.com +31 -40
    lex is now a pointer, so reset things the right way.

  sql/sp.cc
    1.17 03/05/23 15:32:14 pem@mysql.com +23 -10
    Restore lex pointer (and fixed memory leak).

  sql/mysql_priv.h
    1.195 03/05/23 15:32:14 pem@mysql.com +1 -1
    SPs wants to init lex only.

  mysql-test/t/sp.test
    1.21 03/05/23 15:32:14 pem@mysql.com +18 -0
    New test (of more call levels).

  mysql-test/r/sp.result
    1.20 03/05/23 15:32:14 pem@mysql.com +17 -0
    New test (of more call levels).

ChangeSet
  1.1538.1.17 03/05/23 17:45:52 bar@bar.mysql.r18.ru +27 -0
  CHARSET_INFO structure reorganization for easier maintainance

  strings/ctype-win1250ch.c
    1.26 03/05/23 17:45:50 bar@bar.mysql.r18.ru +13 -27
    CHARSET_INFO structure reorganization for easier maintainance

  strings/ctype-utf8.c
    1.45 03/05/23 17:45:50 bar@bar.mysql.r18.ru +39 -26
    CHARSET_INFO structure reorganization for easier maintainance

  strings/ctype-ujis.c
    1.39 03/05/23 17:45:50 bar@bar.mysql.r18.ru +31 -18
    CHARSET_INFO structure reorganization for easier maintainance

  strings/ctype-ucs2.c
    1.3 03/05/23 17:45:50 bar@bar.mysql.r18.ru +46 -33
    CHARSET_INFO structure reorganization for easier maintainance

  strings/ctype-tis620.c
    1.46 03/05/23 17:45:50 bar@bar.mysql.r18.ru +30 -18
    CHARSET_INFO structure reorganization for easier maintainance

  strings/ctype-sjis.c
    1.45 03/05/23 17:45:50 bar@bar.mysql.r18.ru +40 -27
    CHARSET_INFO structure reorganization for easier maintainance

  strings/ctype-simple.c
    1.34 03/05/23 17:45:50 bar@bar.mysql.r18.ru +35 -0
    CHARSET_INFO structure reorganization for easier maintainance

  strings/ctype-latin1.c
    1.13 03/05/23 17:45:50 bar@bar.mysql.r18.ru +41 -54
    CHARSET_INFO structure reorganization for easier maintainance

  strings/ctype-gbk.c
    1.40 03/05/23 17:45:50 bar@bar.mysql.r18.ru +39 -27
    CHARSET_INFO structure reorganization for easier maintainance

  strings/ctype-gb2312.c
    1.36 03/05/23 17:45:50 bar@bar.mysql.r18.ru +39 -27
    CHARSET_INFO structure reorganization for easier maintainance

  strings/ctype-extra.c
    1.12 03/05/23 17:45:50 bar@bar.mysql.r18.ru +0 -26
    CHARSET_INFO structure reorganization for easier maintainance

  strings/ctype-euc_kr.c
    1.38 03/05/23 17:45:50 bar@bar.mysql.r18.ru +39 -27
    CHARSET_INFO structure reorganization for easier maintainance

  strings/ctype-czech.c
    1.38 03/05/23 17:45:50 bar@bar.mysql.r18.ru +13 -27
    CHARSET_INFO structure reorganization for easier maintainance

  strings/ctype-bin.c
    1.30 03/05/23 17:45:50 bar@bar.mysql.r18.ru +38 -27
    CHARSET_INFO structure reorganization for easier maintainance

  strings/ctype-big5.c
    1.40 03/05/23 17:45:50 bar@bar.mysql.r18.ru +39 -28
    CHARSET_INFO structure reorganization for easier maintainance

  sql/sql_string.cc
    1.60 03/05/23 17:45:50 bar@bar.mysql.r18.ru +7 -7
    CHARSET_INFO structure reorganization for easier maintainance

  sql/item_timefunc.cc
    1.35 03/05/23 17:45:50 bar@bar.mysql.r18.ru +5 -5
    CHARSET_INFO structure reorganization for easier maintainance

  sql/item_strfunc.cc
    1.113 03/05/23 17:45:49 bar@bar.mysql.r18.ru +3 -3
    CHARSET_INFO structure reorganization for easier maintainance

  sql/item_cmpfunc.cc
    1.87.1.4 03/05/23 17:45:49 bar@bar.mysql.r18.ru +2 -2
    CHARSET_INFO structure reorganization for easier maintainance

  sql/field.h
    1.70 03/05/23 17:45:49 bar@bar.mysql.r18.ru +1 -1
    CHARSET_INFO structure reorganization for easier maintainance

  sql/field.cc
    1.104 03/05/23 17:45:49 bar@bar.mysql.r18.ru +30 -27
    CHARSET_INFO structure reorganization for easier maintainance

  mysys/hash.c
    1.27 03/05/23 17:45:49 bar@bar.mysql.r18.ru +1 -1
    CHARSET_INFO structure reorganization for easier maintainance

  mysys/charset.c
    1.93 03/05/23 17:45:49 bar@bar.mysql.r18.ru +6 -36
    CHARSET_INFO structure reorganization for easier maintainance

  myisam/mi_unique.c
    1.15 03/05/23 17:45:49 bar@bar.mysql.r18.ru +1 -1
    CHARSET_INFO structure reorganization for easier maintainance

  include/m_ctype.h
    1.69 03/05/23 17:45:49 bar@bar.mysql.r18.ru +67 -54
    CHARSET_INFO structure reorganization for easier maintainance

  heap/hp_hash.c
    1.25 03/05/23 17:45:49 bar@bar.mysql.r18.ru +2 -2
    CHARSET_INFO structure reorganization for easier maintainance

  client/sql_string.cc
    1.18 03/05/23 17:45:49 bar@bar.mysql.r18.ru +6 -6
    CHARSET_INFO structure reorganization for easier maintainance

ChangeSet
  1.1538.1.16 03/05/23 15:10:05 bar@bar.mysql.r18.ru +9 -0
  Character set sets now check if required non-dynamic charsets were really compiled

  mysql-test/r/have_ujis.require
    1.1 03/05/23 15:10:03 bar@bar.mysql.r18.ru +2 -0

  mysql-test/r/have_ucs2.require
    1.1 03/05/23 15:10:03 bar@bar.mysql.r18.ru +2 -0

  mysql-test/include/have_ujis.inc
    1.1 03/05/23 15:10:03 bar@bar.mysql.r18.ru +4 -0

  mysql-test/r/have_ujis.require
    1.0 03/05/23 15:10:03 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/r/have_ujis.require

  mysql-test/r/have_ucs2.require
    1.0 03/05/23 15:10:03 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/r/have_ucs2.require

  mysql-test/include/have_ujis.inc
    1.0 03/05/23 15:10:03 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/include/have_ujis.inc

  mysql-test/include/have_ucs2.inc
    1.1 03/05/23 15:10:02 bar@bar.mysql.r18.ru +4 -0

  sql/share/charsets/Index.xml
    1.22 03/05/23 15:10:02 bar@bar.mysql.r18.ru +12 -3
    Character set sets now check if required non-dynamic charsets were really compiled

  mysql-test/t/ctype_ujis.test
    1.3 03/05/23 15:10:02 bar@bar.mysql.r18.ru +3 -1
    Character set sets now check if required non-dynamic charsets were really compiled

  mysql-test/t/ctype_many.test
    1.15 03/05/23 15:10:02 bar@bar.mysql.r18.ru +2 -0
    Character set sets now check if required non-dynamic charsets were really compiled

  mysql-test/r/isam.result
    1.14 03/05/23 15:10:02 bar@bar.mysql.r18.ru +6 -6
    Character set sets now check if required non-dynamic charsets were really compiled

  mysql-test/include/have_ucs2.inc
    1.0 03/05/23 15:10:02 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/include/have_ucs2.inc

  BitKeeper/deleted/.del-ctype_ujis-master.opt~9f5cc09930fc1cf9
    1.2 03/05/23 14:40:19 bar@bar.mysql.r18.ru +0 -0
    Delete: mysql-test/t/ctype_ujis-master.opt

ChangeSet
  1.1346.215.17 03/05/23 11:38:37 lenz@mysql.com +1 -0
   - Portability fix: FreeBSD 4.8-STABLE (480101) and 5.0-CURRENT (500110)
     now have a thread safe realpath(3) implementation - added check to only
     define -DHAVE_BROKEN_REALPATH where required
     (thanks to Martin Blapp from the FreeBSD team for the patch)

  configure.in
    1.191.1.83 03/05/23 11:38:35 lenz@mysql.com +10 -2
     - FreeBSD 4.8-STABLE (480101) and 5.0-CURRENT (500110) now have a thread
       safe realpath(3) implementation - added check to only define
       -DHAVE_BROKEN_REALPATH where required

ChangeSet
  1.1538.1.15 03/05/23 14:24:52 bar@bar.mysql.r18.ru +1 -0
  charset.c:
    Bug fix: if latin2_czech_ci is not compiled, loader din't load other latin2 collations

  mysys/charset.c
    1.92 03/05/23 14:24:03 bar@bar.mysql.r18.ru +2 -1
    Bug fix: if latin2_czech_ci is not compiled, loader din't load other latin2 collations

ChangeSet
  1.1538.1.14 03/05/23 14:02:27 bar@bar.mysql.r18.ru +3 -0
  convert.cc was removed

  sql/Makefile.am
    1.77.1.5 03/05/23 14:02:25 bar@bar.mysql.r18.ru +1 -1
    convert.cc was removed

  libmysqld/Makefile.am
    1.29.2.1 03/05/23 14:02:24 bar@bar.mysql.r18.ru +1 -1
    convert.cc was removed

  BitKeeper/deleted/.del-convert.cc~437689acaffb7446
    1.16 03/05/23 13:30:27 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/convert.cc

ChangeSet
  1.1538.1.13 03/05/23 13:10:25 bar@bar.mysql.r18.ru +14 -0
  SHOW FIELDS changes, more SQL99 INFORMATION_SCHEMA.COLUMNS compatibility:
  Character set is not displayed in "Type" column anymore
  In "Collation" column NULL instead of BINARY is now displayd for for non-character data types

  sql/sql_show.cc
    1.122.1.6 03/05/23 13:10:23 bar@bar.mysql.r18.ru +27 -14
    Character set is not displayed in "Type" column of SHOW FIELDS anymore

  sql/field.h
    1.69 03/05/23 13:10:23 bar@bar.mysql.r18.ru +7 -2
    Character set is not displayed in "Type" column of SHOW FIELDS anymore

  sql/field.cc
    1.103 03/05/23 13:10:23 bar@bar.mysql.r18.ru +0 -29
    Character set is not displayed in "Type" column of SHOW FIELDS anymore

  mysql-test/r/type_ranges.result
    1.18 03/05/23 13:10:23 bar@bar.mysql.r18.ru +63 -63
    Character set is not displayed in "Type" column of SHOW FIELDS anymore

  mysql-test/r/type_float.result
    1.13 03/05/23 13:10:23 bar@bar.mysql.r18.ru +14 -14
    Character set is not displayed in "Type" column of SHOW FIELDS anymore

  mysql-test/r/type_blob.result
    1.19 03/05/23 13:10:23 bar@bar.mysql.r18.ru +7 -7
    Character set is not displayed in "Type" column of SHOW FIELDS anymore

  mysql-test/r/show_check.result
    1.31.1.2 03/05/23 13:10:23 bar@bar.mysql.r18.ru +20 -20
    Character set is not displayed in "Type" column of SHOW FIELDS anymore

  mysql-test/r/select.result
    1.28 03/05/23 13:10:23 bar@bar.mysql.r18.ru +4 -4
    Character set is not displayed in "Type" column of SHOW FIELDS anymore

  mysql-test/r/innodb.result
    1.63 03/05/23 13:10:23 bar@bar.mysql.r18.ru +1 -1
    Character set is not displayed in "Type" column of SHOW FIELDS anymore

  mysql-test/r/gis.result
    1.8 03/05/23 13:10:23 bar@bar.mysql.r18.ru +33 -33
    Character set is not displayed in "Type" column of SHOW FIELDS anymore

  mysql-test/r/ctype_recoding.result
    1.6 03/05/23 13:10:23 bar@bar.mysql.r18.ru +3 -3
    Character set is not displayed in "Type" column of SHOW FIELDS anymore

  mysql-test/r/ctype_collate.result
    1.15 03/05/23 13:10:23 bar@bar.mysql.r18.ru +1 -1
    Character set is not displayed in "Type" column of SHOW FIELDS anymore

  mysql-test/r/create.result
    1.38 03/05/23 13:10:23 bar@bar.mysql.r18.ru +11 -11
    Character set is not displayed in "Type" column of SHOW FIELDS anymore

  mysql-test/r/alter_table.result
    1.18 03/05/23 13:10:23 bar@bar.mysql.r18.ru +3 -3
    Character set is not displayed in "Type" column of SHOW FIELDS anymore

ChangeSet
  1.1538.5.1 03/05/23 11:32:35 bar@bar.mysql.r18.ru +3 -0
  CREATE TABLE t1 SELECT left(_latin2'a',1)  didn't work, the charset got lost
  Collation and coercibility tests for string functions

  sql/item_strfunc.cc
    1.112 03/05/23 11:32:33 bar@bar.mysql.r18.ru +3 -1
    Collation and coercibility tests for string functions

  mysql-test/t/func_str.test
    1.22 03/05/23 11:32:33 bar@bar.mysql.r18.ru +23 -0
    Collation and coercibility tests for string functions

  mysql-test/r/func_str.result
    1.23 03/05/23 11:32:33 bar@bar.mysql.r18.ru +42 -0
    Collation and coercibility tests for string functions

ChangeSet
  1.1538.4.1 03/05/23 03:06:00 administrador@light.hegel.local +2 -0
  Translation English -> Protuguese

  BitKeeper/etc/logging_ok
    1.233.6.2 03/05/23 03:05:48 administrador@light.hegel.local +1 -0
    Logging to logging@openlogging.org accepted

  sql/share/portuguese/errmsg.txt
    1.64.1.10 03/05/23 03:01:39 administrador@light.hegel.local +43 -43
    Translation English -> Portuguese

ChangeSet
  1.1538.1.10 03/05/23 10:55:49 bar@bar.mysql.r18.ru +2 -0
  More tests for system functions

  mysql-test/t/func_system.test
    1.7 03/05/23 10:55:47 bar@bar.mysql.r18.ru +19 -1
    More tests for system functions

  mysql-test/r/func_system.result
    1.10 03/05/23 10:55:47 bar@bar.mysql.r18.ru +45 -3
    More tests for system functions

ChangeSet
  1.1538.1.9 03/05/23 10:45:46 bar@bar.mysql.r18.ru +3 -0
  Automatic conversion into supersets (utf8, ucs2) for comparison in some cases
  USER(), DATABASE() and VERSION() return in utf8 now

  sql/item_strfunc.h
    1.56 03/05/23 10:45:44 bar@bar.mysql.r18.ru +4 -4
    Automatic conversion into supersets (utf8, ucs2) for comparison in some cases
    USER(), DATABASE() and VERSION() return in utf8 now

  sql/item_strfunc.cc
    1.111 03/05/23 10:45:44 bar@bar.mysql.r18.ru +5 -3
    Automatic conversion into supersets (utf8, ucs2) for comparison in some cases
    USER(), DATABASE() and VERSION() return in utf8 now

  sql/item_cmpfunc.cc
    1.87.1.3 03/05/23 10:45:44 bar@bar.mysql.r18.ru +56 -0
    Automatic conversion into supersets (utf8, ucs2) for comparison in some cases
    USER(), DATABASE() and VERSION() return in utf8 now

ChangeSet
  1.1538.1.8 03/05/22 22:29:44 guilhem@mysql.com +2 -0
  Cleaning DROP TABLE which is important if the tests are run in a certain order.
  This is because rpl_relayrotate.test uses InnoDB.
  Example of a failing sequence:
  rpl_relayrotate.test repl_user_variables.test rpl_relayrotate.test
  Explaination in the files.
  Btw all other tests which use InnoDB (innodb*.test) already have this final
  DROP TABLE.
  Removed a wrong comment of mine.

  mysql-test/t/rpl_relayrotate.test
    1.2 03/05/22 22:29:42 guilhem@mysql.com +11 -3
    cleaning DROP TABLE which is important if the tests are run in a certain order.

  mysql-test/r/rpl_relayrotate.result
    1.2 03/05/22 22:29:42 guilhem@mysql.com +1 -0
    result update

ChangeSet
  1.1538.3.1 03/05/22 16:00:19 lenz@mysql.com +1 -0
   - ISAM storage engine is now disabled by default. To enable it, configure
     the sources with "--with-isam"

  acinclude.m4
    1.84 03/05/22 15:59:58 lenz@mysql.com +2 -2
     - ISAM storage engine is now disabled by default. To enable it, configure
       the sources with "--with-isam"

ChangeSet
  1.1538.1.7 03/05/22 18:41:47 bar@bar.mysql.r18.ru +2 -0
  USER, DATABASE and VERSION functions returns now IMPLICIT coercibility

  sql/item_strfunc.h
    1.55 03/05/22 18:41:45 bar@bar.mysql.r18.ru +2 -2
    USER, DATABASE and VERSION functions returns now IMPLICIT coercibility

  sql/item_create.cc
    1.33.1.3 03/05/22 18:41:45 bar@bar.mysql.r18.ru +1 -1
    USER, DATABASE and VERSION functions returns now IMPLICIT coercibility

ChangeSet
  1.1538.1.6 03/05/22 18:22:21 bar@bar.mysql.r18.ru +1 -0
  mysqld.cc:
    default_collation is now displayed correctly in mysqld --help
    mysqld --help now displays default_collation corretly, according to --default-character-set

  sql/mysqld.cc
    1.356.1.17 03/05/22 18:21:40 bar@bar.mysql.r18.ru +2 -1
    default_collation is now displayed correctly in mysqld --help

  sql/mysqld.cc
    1.356.1.16 03/05/22 18:13:47 bar@bar.mysql.r18.ru +5 -0
    mysqld --help now displays default_collation corretly, according to --default-character-set

ChangeSet
  1.1538.1.5 03/05/22 17:20:19 bar@bar.mysql.r18.ru +17 -0
  Variables were rename, binary collation names were added
  Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled

  strings/ctype.c
    1.58 03/05/22 17:20:17 bar@bar.mysql.r18.ru +2 -0
    Variables were rename, binary collation names were added
    Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled

  strings/ctype-win1250ch.c
    1.25 03/05/22 17:20:17 bar@bar.mysql.r18.ru +1 -1
    Variables were rename, binary collation names were added
    Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled

  strings/ctype-utf8.c
    1.44 03/05/22 17:20:17 bar@bar.mysql.r18.ru +2 -2
    Variables were rename, binary collation names were added
    Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled

  strings/ctype-ujis.c
    1.38 03/05/22 17:20:17 bar@bar.mysql.r18.ru +1 -1
    Variables were rename, binary collation names were added
    Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled

  strings/ctype-ucs2.c
    1.2 03/05/22 17:20:17 bar@bar.mysql.r18.ru +2 -2
    Variables were rename, binary collation names were added
    Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled

  strings/ctype-tis620.c
    1.45 03/05/22 17:20:17 bar@bar.mysql.r18.ru +1 -1
    Variables were rename, binary collation names were added
    Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled

  strings/ctype-sjis.c
    1.44 03/05/22 17:20:17 bar@bar.mysql.r18.ru +1 -1
    Variables were rename, binary collation names were added
    Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled

  strings/ctype-latin1.c
    1.12 03/05/22 17:20:17 bar@bar.mysql.r18.ru +1 -1
    Variables were rename, binary collation names were added
    Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled

  strings/ctype-gbk.c
    1.39 03/05/22 17:20:17 bar@bar.mysql.r18.ru +1 -1
    Variables were rename, binary collation names were added
    Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled

  strings/ctype-gb2312.c
    1.35 03/05/22 17:20:16 bar@bar.mysql.r18.ru +1 -1
    Variables were rename, binary collation names were added
    Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled

  strings/ctype-euc_kr.c
    1.37 03/05/22 17:20:16 bar@bar.mysql.r18.ru +1 -1
    Variables were rename, binary collation names were added
    Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled

  strings/ctype-czech.c
    1.37 03/05/22 17:20:16 bar@bar.mysql.r18.ru +1 -1
    Variables were rename, binary collation names were added
    Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled

  strings/ctype-big5.c
    1.39 03/05/22 17:20:16 bar@bar.mysql.r18.ru +1 -1
    Variables were rename, binary collation names were added
    Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled

  sql/sql_string.cc
    1.59 03/05/22 17:20:16 bar@bar.mysql.r18.ru +3 -3
    Variables were rename, binary collation names were added
    Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled

  sql/sql_show.cc
    1.122.1.5 03/05/22 17:20:16 bar@bar.mysql.r18.ru +2 -2
    Variables were rename, binary collation names were added
    Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled

  mysys/charset.c
    1.91 03/05/22 17:20:16 bar@bar.mysql.r18.ru +15 -48
    Variables were rename, binary collation names were added
    Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled

  include/m_ctype.h
    1.68 03/05/22 17:20:16 bar@bar.mysql.r18.ru +23 -13
    Variables were rename, binary collation names were added
    Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled

ChangeSet
  1.1538.1.4 03/05/22 16:57:06 bar@bar.mysql.r18.ru +1 -0
  Index.xml:
    Typos fixes

  sql/share/charsets/Index.xml
    1.21 03/05/22 16:56:36 bar@bar.mysql.r18.ru +3 -3
    Typos fixes

ChangeSet
  1.1538.1.3 03/05/22 14:37:01 bar@bar.mysql.r18.ru +4 -0
  mysqlimport.c, mysqldump.c, mysqlcheck.c:
    Bug fix: latin1 is not compiled charset and is not specified..
  mysql.cc:
    Bug fix: latin1 is not compiled charset and is not specified...

  client/mysqlimport.c
    1.34 03/05/22 14:36:44 bar@bar.mysql.r18.ru +2 -1
    Bug fix: latin1 is not compiled charset and is not specified..

  client/mysqldump.c
    1.88 03/05/22 14:36:43 bar@bar.mysql.r18.ru +2 -1
    Bug fix: latin1 is not compiled charset and is not specified..

  client/mysqlcheck.c
    1.30 03/05/22 14:36:40 bar@bar.mysql.r18.ru +2 -1
    Bug fix: latin1 is not compiled charset and is not specified..

  client/mysql.cc
    1.121.1.9 03/05/22 14:36:15 bar@bar.mysql.r18.ru +2 -1
    Bug fix: latin1 is not compiled charset and is not specified...

ChangeSet
  1.1538.1.2 03/05/22 11:58:39 monty@mashka.mysql.fi +4 -0
  Updated results & after merge fix

  sql/mysqld.cc
    1.356.1.15 03/05/22 11:58:37 monty@mashka.mysql.fi +5 -4
    Fix after merge

  mysql-test/r/loaddata.result
    1.2 03/05/22 11:58:37 monty@mashka.mysql.fi +7 -0
    Updated results

  mysql-test/r/create.result
    1.37 03/05/22 11:58:37 monty@mashka.mysql.fi +1 -1
    Update results

  BitKeeper/etc/ignore
    1.153.1.4 03/05/22 11:57:55 monty@mashka.mysql.fi +1 -0
    added include/readline/*.h

ChangeSet
  1.1538.2.1 03/05/22 09:52:22 bell@sanja.is.com.ua +6 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-top-4.1

  sql/sql_yacc.yy
    1.203.28.9 03/05/22 09:52:20 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.11.1 03/05/22 09:52:20 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.6.6 03/05/22 09:52:20 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.89 03/05/22 09:52:19 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.56.1.15 03/05/22 09:52:19 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.6.1 03/05/22 09:52:19 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1538.1.1 03/05/22 02:57:27 monty@mashka.mysql.fi +57 -0
  merge

  sql/mysqld.cc
    1.356.1.14 03/05/22 02:57:23 monty@mashka.mysql.fi +1 -3
    merge

  sql/item_cmpfunc.cc
    1.87.1.2 03/05/22 02:57:23 monty@mashka.mysql.fi +4 -1
    merge

  mysql-test/t/rpl_flush_tables.test
    1.3 03/05/22 02:57:23 monty@mashka.mysql.fi +0 -3
    merge

  mysql-test/r/rpl_flush_tables.result
    1.3 03/05/22 02:57:23 monty@mashka.mysql.fi +0 -2
    merge

ChangeSet
  1.1346.215.16 03/05/22 00:05:33 heikki@hundin.mysql.fi +1 -0
  row0ins.c:
    Disable UNIQU KEY error reporting in SHOW INNODB STATUS until we know if it slows down REPLACE significantly

  innobase/row/row0ins.c
    1.23 03/05/22 00:05:26 heikki@hundin.mysql.fi +5 -0
    Disable UNIQU KEY error reporting in SHOW INNODB STATUS until we know if it slows down REPLACE significantly

ChangeSet
  1.1539 03/05/21 23:35:51 bell@sanja.is.com.ua +6 -0
  fixed subqueries name resolution with INSERT/REPLACE (found during bug 446 investigation)

  sql/sql_yacc.yy
    1.203.41.2 03/05/21 23:35:42 bell@sanja.is.com.ua +7 -0
    Primary (top) simple INSERT/REPLACE st_select_lex indicator

  sql/sql_lex.h
    1.102.10.1 03/05/21 23:35:42 bell@sanja.is.com.ua +8 -0
    Primary (top) simple INSERT/REPLACE st_select_lex indicator

  sql/sql_lex.cc
    1.76.7.1 03/05/21 23:35:42 bell@sanja.is.com.ua +1 -1
    Primary (top) simple INSERT/REPLACE st_select_lex indicator

  sql/item.cc
    1.58.12.1 03/05/21 23:35:42 bell@sanja.is.com.ua +16 -3
    avoid resolving of INSER/REPLACE tables field in subqueries

  mysql-test/t/subselect.test
    1.58.3.1 03/05/21 23:35:42 bell@sanja.is.com.ua +8 -2
    INSERT DELAYED INTO t1 (x) VALUES ((SELECT SUM(x) FROM t2));

  mysql-test/r/subselect.result
    1.67.1.7 03/05/21 23:35:42 bell@sanja.is.com.ua +5 -3
    subselect test changed

ChangeSet
  1.676.1.697 03/05/21 15:18:30 vva@eagle.mysql.r18.ru +2 -0
  Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-3.23
  into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-3.23

  sql/log_event.cc
    1.38.1.9 03/05/21 15:18:29 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.153.1.92 03/05/21 15:18:27 vva@eagle.mysql.r18.ru +0 -1
    auto-union

ChangeSet
  1.676.298.1 03/05/21 15:16:56 vva@eagle.mysql.r18.ru +2 -0
  fixed "LINES STARTING" in load data replication

  BitKeeper/etc/logging_ok
    1.153.30.1 03/05/21 15:16:56 vva@eagle.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  sql/log_event.cc
    1.38.2.1 03/05/21 15:16:43 vva@eagle.mysql.r18.ru +5 -1
    fixed "LINES STARTING" in load data replication

ChangeSet
  1.1346.215.15 03/05/21 18:19:39 bell@sanja.is.com.ua +1 -0
  repair_part2 is made repeatable

ChangeSet
  1.1346.215.14 03/05/21 14:58:11 vva@eagle.mysql.r18.ru +1 -0
  Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
  into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-4.0

  sql/log_event.cc
    1.77.1.31 03/05/21 14:58:09 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1346.218.1 03/05/21 14:54:02 vva@eagle.mysql.r18.ru +4 -0
  fixed 'STARTING BY' in replication

  sql/log_event.cc
    1.77.6.1 03/05/21 14:53:46 vva@eagle.mysql.r18.ru +10 -2
    fixed 'STARTING BY'

  mysql-test/t/rpl_loaddata.test
    1.2.1.1 03/05/21 14:53:46 vva@eagle.mysql.r18.ru +1 -2
    added test for 'STARTING BY'

  mysql-test/std_data/rpl_loaddata2.dat
    1.1.1.1 03/05/21 14:53:46 vva@eagle.mysql.r18.ru +4 -4
    added test for 'STARTING BY'

  mysql-test/r/rpl_loaddata.result
    1.1.1.2 03/05/21 14:53:46 vva@eagle.mysql.r18.ru +1 -1
    added test for 'STARTING BY'

  sql/share/ukrainian/errmsg.txt
    1.27.1.9 03/05/21 21:40:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/swedish/errmsg.txt
    1.64.1.11 03/05/21 21:40:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/spanish/errmsg.txt
    1.64.1.9 03/05/21 21:40:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/slovak/errmsg.txt
    1.64.1.9 03/05/21 21:40:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/russian/errmsg.txt
    1.61.1.10 03/05/21 21:40:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/romanian/errmsg.txt
    1.62.1.9 03/05/21 21:40:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/portuguese/errmsg.txt
    1.64.1.9 03/05/21 21:40:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/norwegian/errmsg.txt
    1.63.1.9 03/05/21 21:40:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.9 03/05/21 21:40:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/korean/errmsg.txt
    1.63.1.9 03/05/21 21:40:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/japanese/errmsg.txt
    1.63.1.9 03/05/21 21:40:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/italian/errmsg.txt
    1.70.1.9 03/05/21 21:40:37 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/hungarian/errmsg.txt
    1.65.1.9 03/05/21 21:40:37 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/greek/errmsg.txt
    1.64.1.9 03/05/21 21:40:37 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/german/errmsg.txt
    1.64.1.9 03/05/21 21:40:37 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/french/errmsg.txt
    1.63.1.9 03/05/21 21:40:37 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/estonian/errmsg.txt
    1.64.1.9 03/05/21 21:40:37 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.70.1.12 03/05/21 21:40:37 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/dutch/errmsg.txt
    1.66.1.9 03/05/21 21:40:37 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/danish/errmsg.txt
    1.62.1.9 03/05/21 21:40:37 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/czech/errmsg.txt
    1.64.1.9 03/05/21 21:40:37 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.203.39.5 03/05/21 21:40:36 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_update.cc
    1.83.2.5 03/05/21 21:40:36 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_table.cc
    1.157.2.5 03/05/21 21:40:36 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.1.7 03/05/21 21:40:36 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.3.8 03/05/21 21:40:35 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_load.cc
    1.46.3.4 03/05/21 21:40:35 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_insert.cc
    1.86.2.3 03/05/21 21:40:35 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_class.h
    1.146.1.23 03/05/21 21:40:35 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/set_var.h
    1.23 03/05/21 21:40:35 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/set_var.cc
    1.34.1.15 03/05/21 21:40:35 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.10 03/05/21 21:40:34 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/log_event.cc
    1.113.1.5 03/05/21 21:40:34 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.110 03/05/21 21:40:34 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_func.cc
    1.124.1.5 03/05/21 21:40:34 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item.h
    1.56.6.2 03/05/21 21:40:34 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/field.h
    1.68 03/05/21 21:40:34 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/field.cc
    1.102 03/05/21 21:40:33 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysys/charset.c
    1.90 03/05/21 21:40:33 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/variables.test
    1.18.1.2 03/05/21 21:40:33 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/ctype_latin1_de-master.opt
    1.5 03/05/21 21:40:33 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/variables.result
    1.21.1.5 03/05/21 21:40:33 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/type_decimal.result
    1.13 03/05/21 21:40:33 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/order_by.result
    1.22 03/05/21 21:40:32 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/null_key.result
    1.19 03/05/21 21:40:32 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/myisam.result
    1.22 03/05/21 21:40:32 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/key.result
    1.10 03/05/21 21:40:32 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/group_by.result
    1.29 03/05/21 21:40:32 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/create.result
    1.36 03/05/21 21:40:32 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysql/libmysql.def
    1.14 03/05/21 21:40:32 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/my_sys.h
    1.99 03/05/21 21:40:32 monty@mashka.mysql.fi +0 -0
    Auto merged

  client/mysqlbinlog.cc
    1.76 03/05/21 21:40:32 monty@mashka.mysql.fi +0 -0
    Auto merged

  VC++Files/libmysql/libmysql.dsp
    1.14 03/05/21 21:40:32 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1524.15.2 03/05/21 21:39:58 monty@mashka.mysql.fi +64 -0
  After merge fixes
  Added initialization of all important global variables

  strings/ctype-ujis.c
    1.37 03/05/21 21:39:53 monty@mashka.mysql.fi +1 -1
    Fixed bug in converting to ujis

  sql/unireg.h
    1.24 03/05/21 21:39:53 monty@mashka.mysql.fi +1 -0
    Added MAX_ALIAS_NAME

  sql/thr_malloc.cc
    1.11 03/05/21 21:39:53 monty@mashka.mysql.fi +30 -0
    Added sql_strmake_with_convert()

  sql/sql_yacc.yy
    1.203.39.4 03/05/21 21:39:53 monty@mashka.mysql.fi +8 -6
    After merge fix

  sql/sql_update.cc
    1.83.3.3 03/05/21 21:39:53 monty@mashka.mysql.fi +4 -4
    After merge fix

  sql/sql_string.h
    1.34 03/05/21 21:39:53 monty@mashka.mysql.fi +3 -0
    Made copy_and_convert global

  sql/sql_string.cc
    1.58 03/05/21 21:39:53 monty@mashka.mysql.fi +1 -4
    Made copy_and_convert global

  sql/sql_show.cc
    1.122.1.4 03/05/21 21:39:53 monty@mashka.mysql.fi +1 -2
    After merge fix

  sql/sql_select.cc
    1.216.9.2 03/05/21 21:39:53 monty@mashka.mysql.fi +7 -9
    After merge fix
    Fixed derived name handling in EXPLAIN

  sql/sql_parse.cc
    1.271.6.4 03/05/21 21:39:53 monty@mashka.mysql.fi +3 -3
    After merge fix

  sql/sql_list.h
    1.19 03/05/21 21:39:53 monty@mashka.mysql.fi +1 -0
    Added empty() to base_ilist

  sql/sql_insert.cc
    1.86.3.3 03/05/21 21:39:53 monty@mashka.mysql.fi +6 -4
    Indentation cleanups

  sql/sql_derived.cc
    1.43.3.1 03/05/21 21:39:53 monty@mashka.mysql.fi +10 -6
    After merge fix

  sql/sql_db.cc
    1.68.1.4 03/05/21 21:39:53 monty@mashka.mysql.fi +2 -2
    After merge fix

  sql/sql_acl.cc
    1.74.1.4 03/05/21 21:39:53 monty@mashka.mysql.fi +5 -2
    After merge fix
    Better error message

  sql/set_var.cc
    1.34.4.2 03/05/21 21:39:53 monty@mashka.mysql.fi +1 -2
    Code cleanup

  sql/opt_sum.cc
    1.31 03/05/21 21:39:53 monty@mashka.mysql.fi +1 -0
    After merge fix

  sql/mysqld.cc
    1.356.1.13 03/05/21 21:39:53 monty@mashka.mysql.fi +322 -227
    Added initialization of all important global variables.
    Cleanup of variable declarations
    This is needed ot make the embedded version restartable

  sql/mysql_priv.h
    1.186.1.9 03/05/21 21:39:53 monty@mashka.mysql.fi +5 -1
    New prototypes and variables

  sql/log_event.cc
    1.113.1.4 03/05/21 21:39:53 monty@mashka.mysql.fi +30 -30
    Comment cleanup

  sql/item_strfunc.cc
    1.109 03/05/21 21:39:53 monty@mashka.mysql.fi +1 -1
    Faster check for BINARY

  sql/item_func.cc
    1.124.1.4 03/05/21 21:39:52 monty@mashka.mysql.fi +7 -5
    After merge fix

  sql/item_cmpfunc.h
    1.50.1.1 03/05/21 21:39:52 monty@mashka.mysql.fi +2 -1
    New prototypes

  sql/item_cmpfunc.cc
    1.87.2.1 03/05/21 21:39:52 monty@mashka.mysql.fi +41 -32
    Code Code cleanup
    Item_bool_func2::fix_fields() added to get error handling right for cmp_charset

  sql/item.cc
    1.58.11.2 03/05/21 21:39:52 monty@mashka.mysql.fi +20 -23
    More efficient set_name() (no mallocs)

  sql/filesort.cc
    1.70.1.5 03/05/21 21:39:52 monty@mashka.mysql.fi +1 -1
    Remove compiler warning

  sql/field.cc
    1.98.1.3 03/05/21 21:39:52 monty@mashka.mysql.fi +7 -11
    After merge fixes

  sql/convert.cc
    1.15 03/05/21 21:39:52 monty@mashka.mysql.fi +2 -2
    Code cleanup

  mysql-test/t/subselect.test
    1.58.2.1 03/05/21 21:39:52 monty@mashka.mysql.fi +2 -0
    After merge fixes

  mysql-test/t/status.test
    1.9 03/05/21 21:39:52 monty@mashka.mysql.fi +1 -1
    After merge fixes

  mysql-test/t/rpl_flush_tables.test
    1.1.1.1 03/05/21 21:39:52 monty@mashka.mysql.fi +2 -0
    After merge fixes

  mysql-test/t/order_by.test
    1.16 03/05/21 21:39:52 monty@mashka.mysql.fi +1 -1
    After merge fixes

  mysql-test/t/loaddata.test
    1.2 03/05/21 21:39:52 monty@mashka.mysql.fi +2 -0
    After merge fixes

  mysql-test/t/join_outer.test
    1.10 03/05/21 21:39:52 monty@mashka.mysql.fi +1 -1
    After merge fixes

  mysql-test/t/innodb.test
    1.41 03/05/21 21:39:52 monty@mashka.mysql.fi +0 -1
    After merge fixes

  mysql-test/t/fulltext.test
    1.38 03/05/21 21:39:52 monty@mashka.mysql.fi +0 -2
    After merge fixes

  mysql-test/t/ctype_ujis.test
    1.2 03/05/21 21:39:52 monty@mashka.mysql.fi +2 -0
    After merge fixes

  mysql-test/t/ctype_recoding.test
    1.4 03/05/21 21:39:52 monty@mashka.mysql.fi +1 -0
    After merge fixes

  mysql-test/t/create.test
    1.24 03/05/21 21:39:52 monty@mashka.mysql.fi +7 -3
    After merge fixes

  mysql-test/t/ansi.test
    1.2 03/05/21 21:39:52 monty@mashka.mysql.fi +2 -0
    After merge fixes

  mysql-test/r/update.result
    1.13 03/05/21 21:39:52 monty@mashka.mysql.fi +4 -1
    Updated results after merge

  mysql-test/r/union.result
    1.38 03/05/21 21:39:52 monty@mashka.mysql.fi +17 -20
    Updated results after merge

  mysql-test/r/rpl_flush_tables.result
    1.1.1.1 03/05/21 21:39:52 monty@mashka.mysql.fi +2 -2
    Updated results after merge

  mysql-test/r/repair.result
    1.5 03/05/21 21:39:52 monty@mashka.mysql.fi +1 -1
    Updated results after merge

  mysql-test/r/query_cache.result
    1.23 03/05/21 21:39:52 monty@mashka.mysql.fi +10 -10
    Updated results after merge

  mysql-test/r/order_by.result
    1.20.1.2 03/05/21 21:39:52 monty@mashka.mysql.fi +2 -2
    Updated results after merge

  mysql-test/r/null_key.result
    1.17.1.2 03/05/21 21:39:52 monty@mashka.mysql.fi +1 -1
    Updated results after merge

  mysql-test/r/join_outer.result
    1.18 03/05/21 21:39:52 monty@mashka.mysql.fi +0 -1
    Updated results after merge

  mysql-test/r/innodb.result
    1.62 03/05/21 21:39:52 monty@mashka.mysql.fi +7 -5
    Updated results after merge

  mysql-test/r/group_by.result
    1.27.1.2 03/05/21 21:39:52 monty@mashka.mysql.fi +8 -8
    Updated results after merge

  mysql-test/r/func_group.result
    1.13.1.2 03/05/21 21:39:52 monty@mashka.mysql.fi +42 -52
    Updated results after merge

  mysql-test/r/fulltext.result
    1.40 03/05/21 21:39:52 monty@mashka.mysql.fi +0 -1
    Updated results after merge

  mysql-test/r/ctype_recoding.result
    1.5 03/05/21 21:39:52 monty@mashka.mysql.fi +1 -0
    Updated results after merge

  mysql-test/r/create.result
    1.32.1.3 03/05/21 21:39:52 monty@mashka.mysql.fi +4 -2
    Updated results after merge

  mysql-test/r/alter_table.result
    1.17 03/05/21 21:39:52 monty@mashka.mysql.fi +2 -2
    Updated results after merge

  mysql-test/include/not_embedded.inc
    1.3 03/05/21 21:39:52 monty@mashka.mysql.fi +1 -1
    Fix test (because of wrong utf8 test)

  myisam/myisamdef.h
    1.59.1.3 03/05/21 21:39:52 monty@mashka.mysql.fi +2 -2
    After merge fix

  myisam/mi_search.c
    1.38 03/05/21 21:39:52 monty@mashka.mysql.fi +2 -2
    After merge fix

  myisam/mi_rkey.c
    1.15 03/05/21 21:39:52 monty@mashka.mysql.fi +1 -1
    After merge fix

  myisam/mi_range.c
    1.9 03/05/21 21:39:52 monty@mashka.mysql.fi +3 -2
    After merge fix

  myisam/mi_open.c
    1.66 03/05/21 21:39:52 monty@mashka.mysql.fi +0 -6
    After merge fix

  myisam/mi_key.c
    1.18 03/05/21 21:39:52 monty@mashka.mysql.fi +1 -1
    Indentation change

  client/mysqltest.c
    1.92.1.4 03/05/21 21:39:52 monty@mashka.mysql.fi +31 -29
    Added variable SERVER_VERSION

  BUILD/SETUP.sh
    1.23 03/05/21 21:39:52 monty@mashka.mysql.fi +1 -1
    build with readline

  mysql-test/mysql-test-run.sh
    1.146.1.23 03/05/21 18:19:34 bell@sanja.is.com.ua +2 -0
    repair_part2 is made repeatable

ChangeSet
  1.1538 03/05/21 17:44:12 bar@bar.mysql.r18.ru +11 -0
  Some SHOW VARIABLES have been renamed:
  collation_client  -> character_set_client
  collation_results -> character_set_results
  character_set     -> character_set_server
  
  SET NAMES now doesn't start client->server conversion
  SET CHARACTER SET now starts both client->server and server->client conversion

  sql/sql_yacc.yy
    1.203.41.1 03/05/21 17:44:10 bar@bar.mysql.r18.ru +6 -12
    Some SHOW VARIABLES have been renamed:
    collation_client  -> character_set_client
    collation_results -> character_set_results
    character_set     -> character_set_server
    
    SET NAMES now doesn't start client->server conversion
    SET CHARACTER SET now starts both client->server and server->client conversion

  sql/sql_class.h
    1.146.1.22 03/05/21 17:44:10 bar@bar.mysql.r18.ru +3 -3
    Some SHOW VARIABLES have been renamed:
    collation_client  -> character_set_client
    collation_results -> character_set_results
    character_set     -> character_set_server
    
    SET NAMES now doesn't start client->server conversion
    SET CHARACTER SET now starts both client->server and server->client conversion

  sql/set_var.h
    1.21.1.2 03/05/21 17:44:10 bar@bar.mysql.r18.ru +27 -12
    Some SHOW VARIABLES have been renamed:
    collation_client  -> character_set_client
    collation_results -> character_set_results
    character_set     -> character_set_server
    
    SET NAMES now doesn't start client->server conversion
    SET CHARACTER SET now starts both client->server and server->client conversion

  sql/set_var.cc
    1.34.1.14 03/05/21 17:44:10 bar@bar.mysql.r18.ru +50 -32
    Some SHOW VARIABLES have been renamed:
    collation_client  -> character_set_client
    collation_results -> character_set_results
    character_set     -> character_set_server
    
    SET NAMES now doesn't start client->server conversion
    SET CHARACTER SET now starts both client->server and server->client conversion

  sql/protocol.cc
    1.56.1.2 03/05/21 17:44:10 bar@bar.mysql.r18.ru +8 -6
    Some SHOW VARIABLES have been renamed:
    collation_client  -> character_set_client
    collation_results -> character_set_results
    character_set     -> character_set_server
    
    SET NAMES now doesn't start client->server conversion
    SET CHARACTER SET now starts both client->server and server->client conversion

  sql/mysqld.cc
    1.356.6.3 03/05/21 17:44:10 bar@bar.mysql.r18.ru +4 -4
    Some SHOW VARIABLES have been renamed:
    collation_client  -> character_set_client
    collation_results -> character_set_results
    character_set     -> character_set_server
    
    SET NAMES now doesn't start client->server conversion
    SET CHARACTER SET now starts both client->server and server->client conversion

  mysys/charset.c
    1.88.1.2 03/05/21 17:44:10 bar@bar.mysql.r18.ru +1 -3
    Some SHOW VARIABLES have been renamed:
    collation_client  -> character_set_client
    collation_results -> character_set_results
    character_set     -> character_set_server
    
    SET NAMES now doesn't start client->server conversion
    SET CHARACTER SET now starts both client->server and server->client conversion

  mysql-test/t/variables.test
    1.18.2.1 03/05/21 17:44:10 bar@bar.mysql.r18.ru +2 -2
    Some SHOW VARIABLES have been renamed:
    collation_client  -> character_set_client
    collation_results -> character_set_results
    character_set     -> character_set_server
    
    SET NAMES now doesn't start client->server conversion
    SET CHARACTER SET now starts both client->server and server->client conversion

  mysql-test/t/ctype_collate.test
    1.10 03/05/21 17:44:10 bar@bar.mysql.r18.ru +15 -31
    Some SHOW VARIABLES have been renamed:
    collation_client  -> character_set_client
    collation_results -> character_set_results
    character_set     -> character_set_server
    
    SET NAMES now doesn't start client->server conversion
    SET CHARACTER SET now starts both client->server and server->client conversion

  mysql-test/r/variables.result
    1.21.2.1 03/05/21 17:44:10 bar@bar.mysql.r18.ru +3 -3
    Some SHOW VARIABLES have been renamed:
    collation_client  -> character_set_client
    collation_results -> character_set_results
    character_set     -> character_set_server
    
    SET NAMES now doesn't start client->server conversion
    SET CHARACTER SET now starts both client->server and server->client conversion

  mysql-test/r/ctype_collate.result
    1.14 03/05/21 17:44:10 bar@bar.mysql.r18.ru +14 -60
    Some SHOW VARIABLES have been renamed:
    collation_client  -> character_set_client
    collation_results -> character_set_results
    character_set     -> character_set_server
    
    SET NAMES now doesn't start client->server conversion
    SET CHARACTER SET now starts both client->server and server->client conversion

ChangeSet
  1.1537 03/05/21 15:29:44 bar@bar.mysql.r18.ru +4 -0
  UCS2 and UTF8 are in separate files now

  strings/ctype-ucs2.c
    1.1 03/05/21 15:29:42 bar@bar.mysql.r18.ru +1047 -0

  strings/ctype-ucs2.c
    1.0 03/05/21 15:29:42 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/strings/ctype-ucs2.c

  strings/ctype-utf8.c
    1.43 03/05/21 15:28:22 bar@bar.mysql.r18.ru +1 -1021
    UCS2 and UTF8 are in separate files now

  strings/Makefile.am
    1.34 03/05/21 15:28:22 bar@bar.mysql.r18.ru +4 -4
    UCS2 and UTF8 are in separate files now

  libmysql/Makefile.shared
    1.46 03/05/21 15:28:22 bar@bar.mysql.r18.ru +1 -1
    UCS2 and UTF8 are in separate files now

ChangeSet
  1.1536 03/05/21 13:59:00 bar@bar.mysql.r18.ru +1 -0
  Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
  into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

  sql/set_var.cc
    1.34.1.13 03/05/21 13:58:58 bar@bar.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1524.19.3 03/05/21 13:58:30 bar@bar.mysql.r18.ru +6 -0
  "character_sets" has been removed from SHOW VARIABLES. Use SHOW CHARACTER SET instead.
   "character_set_system" has been added to display the system character set

  sql/set_var.h
    1.21.1.1 03/05/21 13:58:28 bar@bar.mysql.r18.ru +1 -0
    "character_sets" has been removed from SHOW VARIABLES. Use SHOW CHARACTER SET instead.
     "character_set_system" has been added to display the system character set

  sql/set_var.cc
    1.34.5.1 03/05/21 13:58:28 bar@bar.mysql.r18.ru +6 -2
    "character_sets" has been removed from SHOW VARIABLES. Use SHOW CHARACTER SET instead.
     "character_set_system" has been added to display the system character set

  sql/mysqld.cc
    1.356.6.2 03/05/21 13:58:28 bar@bar.mysql.r18.ru +2 -4
    "character_sets" has been removed from SHOW VARIABLES. Use SHOW CHARACTER SET instead.
     "character_set_system" has been added to display the system character set

  sql/mysql_priv.h
    1.186.6.1 03/05/21 13:58:28 bar@bar.mysql.r18.ru +1 -1
    "character_sets" has been removed from SHOW VARIABLES. Use SHOW CHARACTER SET instead.
     "character_set_system" has been added to display the system character set

  mysys/charset.c
    1.88.1.1 03/05/21 13:58:28 bar@bar.mysql.r18.ru +0 -67
    "character_sets" has been removed from SHOW VARIABLES. Use SHOW CHARACTER SET instead.
     "character_set_system" has been added to display the system character set

  include/my_sys.h
    1.97.1.1 03/05/21 13:58:28 bar@bar.mysql.r18.ru +0 -1
    "character_sets" has been removed from SHOW VARIABLES. Use SHOW CHARACTER SET instead.
     "character_set_system" has been added to display the system character set

ChangeSet
  1.1534 03/05/21 01:21:06 venu@myvenu.com +4 -0
  Fix merge conflict by changing warning codes to new one

  sql/share/english/errmsg.txt
    1.70.1.11 03/05/21 01:19:57 venu@myvenu.com +1 -12
    Fix the merge conflict

  mysql-test/r/warnings.result
    1.9 03/05/21 01:19:42 venu@myvenu.com +1 -0
    Fix merge conflict

  mysql-test/r/create.result
    1.35 03/05/21 01:19:35 venu@myvenu.com +1 -1
    Fix merge conflict

  mysql-test/t/warnings.test
    1.10 03/05/21 01:19:17 venu@myvenu.com +1 -0
    Fix merge conflict by changing warning code

ChangeSet
  1.1533 03/05/21 01:15:04 venu@myvenu.com +1 -0
  client_test.c:
    Updated protocol test

  tests/client_test.c
    1.30 03/05/21 01:14:38 venu@myvenu.com +715 -7
    Updated protocol test

ChangeSet
  1.1524.19.1 03/05/21 12:26:35 bar@bar.mysql.r18.ru +2 -0
  Two separate startup arguments for mysqld:
  --default-character-set and --default-collation 

  sql/mysqld.cc
    1.356.6.1 03/05/21 12:26:33 bar@bar.mysql.r18.ru +26 -2
    Two separate startup arguments for mysqld:
    --default-character-set and --default-collation 

  mysql-test/t/ctype_latin1_de-master.opt
    1.3.1.1 03/05/21 12:26:32 bar@bar.mysql.r18.ru +1 -1
    Two separate startup arguments for mysqld:
    --default-character-set and --default-collation 

ChangeSet
  1.1524.18.1 03/05/21 12:26:06 ram@mysql.r18.ru +1 -0
  Added AsBinary alias for AsWKB function.

  sql/lex.h
    1.82.1.31 03/05/21 12:25:37 ram@mysql.r18.ru +1 -0
    Added AsBinary alias for AsWKB funtion.

ChangeSet
  1.1532 03/05/21 00:14:56 venu@myvenu.com +3 -0
  Resolve merge conflict

  sql/share/english/errmsg.txt
    1.70.1.10 03/05/21 00:14:53 venu@myvenu.com +23 -15
    Resolve merge conflict

  mysql-test/t/warnings.test
    1.9 03/05/21 00:14:53 venu@myvenu.com +6 -5
    Resolve merge conflict

  mysql-test/r/warnings.result
    1.8 03/05/21 00:14:53 venu@myvenu.com +6 -8
    Resolve merge conflict

ChangeSet
  1.1531 03/05/21 00:12:09 venu@myvenu.com +13 -0
  Resolve merge colflict

  include/mysqld_error.h
    1.61.1.8 03/05/21 00:12:06 venu@myvenu.com +3 -4
    Resolve merge colflict by changing the warning codes

  sql/sql_update.cc
    1.83.2.4 03/05/20 23:45:44 venu@myvenu.com +0 -0
    Auto merged

  sql/sql_table.cc
    1.157.2.4 03/05/20 23:45:44 venu@myvenu.com +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.1.6 03/05/20 23:45:44 venu@myvenu.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.3.7 03/05/20 23:45:43 venu@myvenu.com +0 -0
    Auto merged

  sql/sql_load.cc
    1.46.3.3 03/05/20 23:45:43 venu@myvenu.com +0 -0
    Auto merged

  sql/sql_insert.cc
    1.86.2.2 03/05/20 23:45:42 venu@myvenu.com +0 -0
    Auto merged

  sql/field.h
    1.67 03/05/20 23:45:42 venu@myvenu.com +0 -0
    Auto merged

  sql/field.cc
    1.101 03/05/20 23:45:42 venu@myvenu.com +0 -0
    Auto merged

  scripts/make_win_src_distribution.sh
    1.6 03/05/20 23:45:42 venu@myvenu.com +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.1.6 03/05/20 23:45:42 venu@myvenu.com +0 -0
    Auto merged

  mysql-test/r/isam.result
    1.13 03/05/20 23:45:42 venu@myvenu.com +0 -0
    Auto merged

  mysql-test/r/create.result
    1.34 03/05/20 23:45:41 venu@myvenu.com +0 -0
    Auto merged

ChangeSet
  1.1530 03/05/20 23:44:28 venu@myvenu.com +3 -0
  Fix for Windows build by adding pack.c to appropriate .dsp files

  VC++Files/libmysql/libmysql.dsp
    1.12.1.1 03/05/20 23:43:22 venu@myvenu.com +4 -0
    Added pack.c

  VC++Files/client/mysqlclient.dsp
    1.13 03/05/20 23:42:56 venu@myvenu.com +4 -0
    Added pack.c 

  libmysql/libmysql.c
    1.156.2.2 03/05/20 23:42:37 venu@myvenu.com +3 -0
    Fix for Windows builds

ChangeSet
  1.1529 03/05/20 23:41:15 venu@myvenu.com +3 -0
  Added mysql_fetch_column function
  Added MYSQL_TYPE_NULL as a dummy bind case for fetch buffers
  Fix for offset based re-fetch using mysql_fetch_column
  Misc cleanups for ODBC compatibility

  libmysql/libmysql.def
    1.12.1.1 03/05/20 23:38:26 venu@myvenu.com +9 -0
    Updated new APIs

  libmysql/libmysql.c
    1.156.2.1 03/05/20 23:37:53 venu@myvenu.com +208 -23
    Added mysql_fetch_column function
    Added MYSQL_TYPE_NULL as a dummy bind case for fetch buffers

  include/mysql.h
    1.67 03/05/20 23:37:10 venu@myvenu.com +37 -28
    Fix for offset based re-fetch using mysql_fetch_column

ChangeSet
  1.1524.9.14 03/05/21 04:57:59 wax@kishkin.ru +1 -0
  add check of __NT__  definition for shared_memory for tree 4.1

  sql/mysqld.cc
    1.356.5.1 03/05/21 04:57:57 wax@kishkin.ru +6 -0
    add check of __NT__  definition for shared_memory for tree 4.1

ChangeSet
  1.1524.17.1 03/05/20 17:03:18 vva@eagle.mysql.r18.ru +6 -0
  changed processing of LOAD DATA in mysqlbinlog

  sql/log_event.cc
    1.113.2.1 03/05/20 17:03:06 vva@eagle.mysql.r18.ru +12 -4
    fixed some bugs in processing of LOAD DATA

  mysql-test/t/rpl_loaddata.test
    1.3 03/05/20 17:03:06 vva@eagle.mysql.r18.ru +1 -2
    added LINE STARTING BY '>'

  mysql-test/std_data/rpl_loaddata2.dat
    1.2 03/05/20 17:03:06 vva@eagle.mysql.r18.ru +4 -4
    added LINE STARTING BY '>'

  mysql-test/r/rpl_loaddata.result
    1.4 03/05/20 17:03:06 vva@eagle.mysql.r18.ru +1 -1
    added LINE STARTING BY '>'

  client/mysqlbinlog.cc
    1.74.1.1 03/05/20 17:03:06 vva@eagle.mysql.r18.ru +45 -42
    changed processing of LOAD DATA

  client/Makefile.am
    1.32 03/05/20 17:03:06 vva@eagle.mysql.r18.ru +1 -1
    added ../mysys/mf_tempdir.c to mysqlbinlog_SOURCES

ChangeSet
  1.1524.16.1 03/05/20 17:09:53 bell@sanja.is.com.ua +1 -0
  do not find keys in external fields (bug 446 related)

  sql/sql_select.cc
    1.216.10.1 03/05/20 17:09:44 bell@sanja.is.com.ua +16 -4
    do not find keys in external fields

ChangeSet
  1.1524.9.12 03/05/20 16:36:59 bar@bar.mysql.r18.ru +28 -0
  A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/ukrainian/errmsg.txt
    1.27.3.1 03/05/20 16:36:57 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/swedish/errmsg.txt
    1.64.3.1 03/05/20 16:36:57 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/spanish/errmsg.txt
    1.64.3.1 03/05/20 16:36:57 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/slovak/errmsg.txt
    1.64.3.1 03/05/20 16:36:57 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/serbian/errmsg.txt
    1.18.1.7 03/05/20 16:36:56 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/russian/errmsg.txt
    1.61.3.1 03/05/20 16:36:56 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/romanian/errmsg.txt
    1.62.3.1 03/05/20 16:36:56 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/portuguese/errmsg.txt
    1.64.3.1 03/05/20 16:36:56 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/polish/errmsg.txt
    1.63.1.9 03/05/20 16:36:56 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/norwegian/errmsg.txt
    1.63.3.1 03/05/20 16:36:56 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/norwegian-ny/errmsg.txt
    1.63.3.1 03/05/20 16:36:56 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/korean/errmsg.txt
    1.63.3.1 03/05/20 16:36:56 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/japanese/errmsg.txt
    1.63.3.1 03/05/20 16:36:56 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/italian/errmsg.txt
    1.70.3.1 03/05/20 16:36:56 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/hungarian/errmsg.txt
    1.65.3.1 03/05/20 16:36:56 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/greek/errmsg.txt
    1.64.3.1 03/05/20 16:36:56 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/german/errmsg.txt
    1.64.3.1 03/05/20 16:36:56 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/french/errmsg.txt
    1.63.3.1 03/05/20 16:36:56 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/estonian/errmsg.txt
    1.64.3.1 03/05/20 16:36:56 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/english/errmsg.txt
    1.70.5.1 03/05/20 16:36:56 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/dutch/errmsg.txt
    1.66.3.1 03/05/20 16:36:56 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/danish/errmsg.txt
    1.62.3.1 03/05/20 16:36:56 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/share/czech/errmsg.txt
    1.64.3.1 03/05/20 16:36:56 bar@bar.mysql.r18.ru +1 -0
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/item_strfunc.cc
    1.107.1.1 03/05/20 16:36:56 bar@bar.mysql.r18.ru +12 -3
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/item_func.cc
    1.124.2.1 03/05/20 16:36:56 bar@bar.mysql.r18.ru +4 -1
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/item_cmpfunc.cc
    1.87.1.1 03/05/20 16:36:56 bar@bar.mysql.r18.ru +16 -4
    A separate, better error message when it's impossible to aggregate strings for some operation

  sql/item.h
    1.56.7.1 03/05/20 16:36:56 bar@bar.mysql.r18.ru +12 -1
    A separate, better error message when it's impossible to aggregate strings for some operation

  include/mysqld_error.h
    1.61.4.2 03/05/20 16:36:56 bar@bar.mysql.r18.ru +2 -1
    A separate, better error message when it's impossible to aggregate strings for some operation

ChangeSet
  1.1524.9.11 03/05/20 10:16:26 guilhem@mysql.com +2 -0
  Version substitution so that tests pass on any build, independently of the
  version is '-log', '-debug' etc.

  mysql-test/t/rpl_flush_tables.test
    1.2 03/05/20 10:16:24 guilhem@mysql.com +3 -0
    Version substitution

  mysql-test/r/rpl_flush_tables.result
    1.2 03/05/20 10:16:23 guilhem@mysql.com +2 -2
    Version substitution

ChangeSet
  1.1346.215.13 03/05/19 16:36:50 lenz@mysql.com +1 -0
   - Tagged ChangeSet 1.1497 as "mysql-4.0.13"
   - Updated version number in configure.in to 4.0.14 now that 4.0.13 has
     been tagged 

  configure.in
    1.191.1.82 03/05/19 16:36:48 lenz@mysql.com +1 -1
     - Updated version number to 4.0.14 now that 4.0.13 has been tagged

ChangeSet
  1.1524.15.1 03/05/19 16:35:49 monty@narttu.mysql.fi +192 -0
  Merge with 4.0.13

  support-files/mysql.spec.sh
    1.65 03/05/19 16:35:46 monty@narttu.mysql.fi +1 -3
    Merge with 4.0.13

  support-files/Makefile.am
    1.20 03/05/19 16:35:46 monty@narttu.mysql.fi +0 -2
    Merge with 4.0.13

  sql/time.cc
    1.29 03/05/19 16:35:46 monty@narttu.mysql.fi +0 -0
    Merge with 4.0.13

  sql/sql_yacc.yy
    1.203.39.3 03/05/19 16:35:46 monty@narttu.mysql.fi +1 -0
    Merge with 4.0.13

  sql/sql_update.cc
    1.83.3.2 03/05/19 16:35:46 monty@narttu.mysql.fi +27 -31
    Merge with 4.0.13

  sql/sql_union.cc
    1.74.3.1 03/05/19 16:35:46 monty@narttu.mysql.fi +1 -6
    Merge with 4.0.13

  sql/sql_table.cc
    1.157.4.3 03/05/19 16:35:46 monty@narttu.mysql.fi +0 -0
    Merge with 4.0.13

  sql/sql_show.cc
    1.122.1.3 03/05/19 16:35:46 monty@narttu.mysql.fi +3 -5
    Merge with 4.0.13

  sql/sql_select.h
    1.43 03/05/19 16:35:46 monty@narttu.mysql.fi +0 -2
    Merge with 4.0.13

  sql/sql_select.cc
    1.216.9.1 03/05/19 16:35:46 monty@narttu.mysql.fi +5 -12
    Merge with 4.0.13

  sql/sql_repl.cc
    1.102.1.3 03/05/19 16:35:46 monty@narttu.mysql.fi +1 -1
    Merge with 4.0.13

  sql/sql_parse.cc
    1.271.6.3 03/05/19 16:35:46 monty@narttu.mysql.fi +7 -10
    Merge with 4.0.13

  sql/sql_insert.cc
    1.86.3.2 03/05/19 16:35:46 monty@narttu.mysql.fi +3 -6
    Merge with 4.0.13

  sql/sql_delete.cc
    1.99.2.5 03/05/19 16:35:46 monty@narttu.mysql.fi +1 -2
    Merge with 4.0.13

  sql/sql_db.cc
    1.68.1.3 03/05/19 16:35:46 monty@narttu.mysql.fi +1 -1
    Merge with 4.0.13

  sql/sql_cache.cc
    1.46.1.1 03/05/19 16:35:46 monty@narttu.mysql.fi +5 -8
    Merge with 4.0.13

  sql/sql_base.cc
    1.145.1.4 03/05/19 16:35:46 monty@narttu.mysql.fi +2 -4
    Merge with 4.0.13

  sql/sql_acl.cc
    1.74.1.3 03/05/19 16:35:46 monty@narttu.mysql.fi +41 -89
    Merge with 4.0.13

  sql/share/german/errmsg.txt
    1.64.1.8 03/05/19 16:35:45 monty@narttu.mysql.fi +1 -2
    Merge with 4.0.13

  sql/set_var.h
    1.22 03/05/19 16:35:45 monty@narttu.mysql.fi +0 -4
    Merge with 4.0.13

  sql/set_var.cc
    1.34.4.1 03/05/19 16:35:45 monty@narttu.mysql.fi +3 -3
    Merge with 4.0.13

  sql/opt_sum.cc
    1.30 03/05/19 16:35:45 monty@narttu.mysql.fi +49 -65
    Merge with 4.0.13

  sql/mysqld.cc
    1.356.1.12 03/05/19 16:35:45 monty@narttu.mysql.fi +1 -4
    Merge with 4.0.13

  sql/mysql_priv.h
    1.186.1.8 03/05/19 16:35:45 monty@narttu.mysql.fi +1 -1
    Merge with 4.0.13

  sql/log_event.h
    1.85 03/05/19 16:35:45 monty@narttu.mysql.fi +5 -5
    Merge with 4.0.13

  sql/log_event.cc
    1.113.1.3 03/05/19 16:35:45 monty@narttu.mysql.fi +272 -367
    Merge with 4.0.13
    Cleaned up comment syntax

  sql/log.cc
    1.108.1.4 03/05/19 16:35:45 monty@narttu.mysql.fi +6 -6
    Merge with 4.0.13

  sql/item_sum.h
    1.40 03/05/19 16:35:45 monty@narttu.mysql.fi +0 -0
    Merge with 4.0.13

  sql/item_func.cc
    1.124.1.3 03/05/19 16:35:45 monty@narttu.mysql.fi +11 -17
    Merge with 4.0.13

  sql/item.h
    1.56.6.1 03/05/19 16:35:45 monty@narttu.mysql.fi +0 -1
    Merge with 4.0.13

  sql/ha_innodb.cc
    1.90.1.1 03/05/19 16:35:45 monty@narttu.mysql.fi +21 -27
    Merge with 4.0.13

  sql/filesort.cc
    1.70.1.4 03/05/19 16:35:45 monty@narttu.mysql.fi +0 -0
    Merge with 4.0.13

  sql/field.h
    1.65.1.2 03/05/19 16:35:45 monty@narttu.mysql.fi +0 -0
    Merge with 4.0.13

  sql/field.cc
    1.98.1.2 03/05/19 16:35:45 monty@narttu.mysql.fi +4 -5
    Merge with 4.0.13

  scripts/mysql_install_db.sh
    1.37.1.5 03/05/19 16:35:45 monty@narttu.mysql.fi +1 -0
    Merge with 4.0.13

  mysys/charset.c
    1.89 03/05/19 16:35:45 monty@narttu.mysql.fi +0 -1
    Merge with 4.0.13

  mysql-test/t/update.test
    1.10 03/05/19 16:35:45 monty@narttu.mysql.fi +4 -2
    Merge with 4.0.13

  mysql-test/t/union.test
    1.37 03/05/19 16:35:45 monty@narttu.mysql.fi +18 -16
    Merge with 4.0.13

  mysql-test/t/rpl_alter.test
    1.4 03/05/19 16:35:45 monty@narttu.mysql.fi +0 -11
    Merge with 4.0.13

  mysql-test/t/raid.test
    1.5 03/05/19 16:35:45 monty@narttu.mysql.fi +8 -3
    Merge with 4.0.13

  mysql-test/t/order_by.test
    1.15 03/05/19 16:35:45 monty@narttu.mysql.fi +0 -2
    Merge with 4.0.13

  mysql-test/t/innodb.test
    1.40 03/05/19 16:35:45 monty@narttu.mysql.fi +11 -3
    Merge with 4.0.13

  mysql-test/t/having.test
    1.7 03/05/19 16:35:45 monty@narttu.mysql.fi +4 -0
    Merge with 4.0.13

  mysql-test/t/group_by.test
    1.22 03/05/19 16:35:45 monty@narttu.mysql.fi +0 -0
    Merge with 4.0.13

  mysql-test/t/func_group.test
    1.11.1.1 03/05/19 16:35:45 monty@narttu.mysql.fi +22 -23
    Merge with 4.0.13

  mysql-test/t/ctype_latin1_de-master.opt
    1.4 03/05/19 16:35:45 monty@narttu.mysql.fi +0 -2
    Merge with 4.0.13

  mysql-test/t/create.test
    1.23 03/05/19 16:35:45 monty@narttu.mysql.fi +22 -1
    Merge with 4.0.13

  mysql-test/r/update.result
    1.12 03/05/19 16:35:45 monty@narttu.mysql.fi +1 -2
    Merge with 4.0.13

  mysql-test/r/union.result
    1.37 03/05/19 16:35:45 monty@narttu.mysql.fi +0 -1
    Merge with 4.0.13

  mysql-test/r/rpl_alter.result
    1.6 03/05/19 16:35:45 monty@narttu.mysql.fi +0 -11
    Merge with 4.0.13

  mysql-test/r/order_by.result
    1.20.1.1 03/05/19 16:35:45 monty@narttu.mysql.fi +0 -0
    Merge with 4.0.13

  mysql-test/r/null_key.result
    1.17.1.1 03/05/19 16:35:45 monty@narttu.mysql.fi +1 -2
    Merge with 4.0.13

  mysql-test/r/innodb.result
    1.61 03/05/19 16:35:45 monty@narttu.mysql.fi +12 -6
    Merge with 4.0.13

  mysql-test/r/having.result
    1.8 03/05/19 16:35:45 monty@narttu.mysql.fi +0 -0
    Merge with 4.0.13

  mysql-test/r/group_by.result
    1.27.1.1 03/05/19 16:35:45 monty@narttu.mysql.fi +4 -13
    Merge with 4.0.13

  mysql-test/r/func_group.result
    1.13.1.1 03/05/19 16:35:45 monty@narttu.mysql.fi +11 -2
    Merge with 4.0.13

  mysql-test/r/create.result
    1.32.1.2 03/05/19 16:35:45 monty@narttu.mysql.fi +23 -0
    Merge with 4.0.13

  mysql-test/r/alter_table.result
    1.16 03/05/19 16:35:45 monty@narttu.mysql.fi +2 -2
    Merge with 4.0.13

  mysql-test/mysql-test-run.sh
    1.166 03/05/19 16:35:45 monty@narttu.mysql.fi +1 -2
    Merge with 4.0.13

  myisam/myisamdef.h
    1.59.1.2 03/05/19 16:35:45 monty@narttu.mysql.fi +0 -2
    Merge with 4.0.13

  myisam/myisamchk.c
    1.92.1.1 03/05/19 16:35:45 monty@narttu.mysql.fi +1 -2
    Merge with 4.0.13

  myisam/mi_test2.c
    1.17 03/05/19 16:35:45 monty@narttu.mysql.fi +0 -3
    Merge with 4.0.13

  myisam/mi_rkey.c
    1.14 03/05/19 16:35:45 monty@narttu.mysql.fi +20 -13
    Merge with 4.0.13

  libmysqld/libmysqld.c
    1.34 03/05/19 16:35:45 monty@narttu.mysql.fi +2 -4
    Merge with 4.0.13

  libmysqld/lib_sql.cc
    1.52 03/05/19 16:35:45 monty@narttu.mysql.fi +0 -2
    Merge with 4.0.13

  libmysql/libmysql.def
    1.13 03/05/19 16:35:45 monty@narttu.mysql.fi +1 -10
    Merge with 4.0.13

  innobase/dict/dict0load.c
    1.9 03/05/19 16:35:45 monty@narttu.mysql.fi +2 -4
    Merge with 4.0.13

  innobase/dict/dict0dict.c
    1.28 03/05/19 16:35:45 monty@narttu.mysql.fi +1 -2
    Merge with 4.0.13

  innobase/buf/buf0buf.c
    1.23 03/05/19 16:35:45 monty@narttu.mysql.fi +16 -0
    Merge with 4.0.13

  include/Makefile.am
    1.40 03/05/19 16:35:45 monty@narttu.mysql.fi +0 -0
    Merge with 4.0.13

  configure.in
    1.201.1.32 03/05/19 16:35:45 monty@narttu.mysql.fi +0 -1
    Merge with 4.0.13

  bdb/dist/s_symlink
    1.6 03/05/19 16:35:45 monty@narttu.mysql.fi +0 -40
    Merge with 4.0.13

  Docs/internals.texi
    1.30 03/05/19 16:35:45 monty@narttu.mysql.fi +626 -11
    Merge with 4.0.13

ChangeSet
  1.1524.14.1 03/05/19 15:32:38 bell@sanja.is.com.ua +3 -0
  fixed bugs 442/443 (reduced subselect in ORDER/GROUP clauses)

  sql/sql_select.cc
    1.216.8.1 03/05/19 15:32:29 bell@sanja.is.com.ua +4 -2
    added reassigning temporary variable

  mysql-test/t/subselect.test
    1.58.1.6 03/05/19 15:32:29 bell@sanja.is.com.ua +17 -0
    test of reduced subselects in ORDER/GROUP

  mysql-test/r/subselect.result
    1.67.5.1 03/05/19 15:32:29 bell@sanja.is.com.ua +17 -0
    test of reduced subselects in ORDER/GROUP

ChangeSet
  1.1524.9.10 03/05/19 15:06:17 bell@sanja.is.com.ua +1 -0
  new error message

  mysql-test/r/isam.result
    1.11.1.1 03/05/19 15:06:10 bell@sanja.is.com.ua +3 -3
    new error message

  tests/grant.res
    1.11 03/05/19 12:05:07 monty@narttu.mysql.fi +0 -12
    Auto merged

  strings/ctype-tis620.c
    1.44 03/05/19 12:05:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql-bench/test-transactions.sh
    1.5 03/05/19 12:05:07 monty@narttu.mysql.fi +0 -1
    Auto merged

  sql-bench/crash-me.sh
    1.44 03/05/19 12:05:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/unireg.h
    1.23 03/05/19 12:05:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/ukrainian/errmsg.txt
    1.27.1.8 03/05/19 12:05:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/swedish/errmsg.txt
    1.64.1.10 03/05/19 12:05:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/spanish/errmsg.txt
    1.64.1.8 03/05/19 12:05:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/slovak/errmsg.txt
    1.64.1.8 03/05/19 12:05:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/russian/errmsg.txt
    1.61.1.9 03/05/19 12:05:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/romanian/errmsg.txt
    1.62.1.8 03/05/19 12:05:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/portuguese/errmsg.txt
    1.64.1.8 03/05/19 12:05:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/norwegian/errmsg.txt
    1.63.1.8 03/05/19 12:05:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.8 03/05/19 12:05:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/korean/errmsg.txt
    1.63.1.8 03/05/19 12:05:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/japanese/errmsg.txt
    1.63.1.8 03/05/19 12:05:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/italian/errmsg.txt
    1.70.1.8 03/05/19 12:05:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/hungarian/errmsg.txt
    1.65.1.8 03/05/19 12:05:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/greek/errmsg.txt
    1.64.1.8 03/05/19 12:05:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/french/errmsg.txt
    1.63.1.8 03/05/19 12:05:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/estonian/errmsg.txt
    1.64.1.8 03/05/19 12:05:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.70.4.2 03/05/19 12:05:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/dutch/errmsg.txt
    1.66.1.8 03/05/19 12:05:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/danish/errmsg.txt
    1.62.1.8 03/05/19 12:05:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/czech/errmsg.txt
    1.64.1.8 03/05/19 12:05:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_load.cc
    1.46.4.2 03/05/19 12:05:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_list.h
    1.18 03/05/19 12:05:05 monty@narttu.mysql.fi +0 -2
    Auto merged

  sql/sql_class.h
    1.146.10.1 03/05/19 12:05:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_class.cc
    1.105.1.10 03/05/19 12:05:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_analyse.cc
    1.38 03/05/19 12:05:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_acl.h
    1.18 03/05/19 12:05:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/slave.cc
    1.188.2.1 03/05/19 12:05:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/records.cc
    1.19.1.2 03/05/19 12:05:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/opt_range.cc
    1.89 03/05/19 12:05:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/net_serv.cc
    1.54 03/05/19 12:05:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/mini_client.cc
    1.62.1.1 03/05/19 12:05:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_sum.cc
    1.73.1.1 03/05/19 12:05:03 monty@narttu.mysql.fi +0 -3
    Auto merged

  sql/item_strfunc.cc
    1.108 03/05/19 12:05:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_create.cc
    1.33.1.2 03/05/19 12:05:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item.cc
    1.58.11.1 03/05/19 12:05:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/init.cc
    1.11 03/05/19 12:05:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/handler.h
    1.80 03/05/19 12:05:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/handler.cc
    1.91 03/05/19 12:05:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.115.1.2 03/05/19 12:05:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.h
    1.52 03/05/19 12:05:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/ha_heap.h
    1.22 03/05/19 12:05:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  scripts/mysqld_safe.sh
    1.60 03/05/19 12:05:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  scripts/mysql_fix_privilege_tables.sh
    1.13 03/05/19 12:05:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysys/my_pthread.c
    1.37 03/05/19 12:05:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysys/default.c
    1.27 03/05/19 12:05:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/variables.test
    1.18.1.1 03/05/19 12:05:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/type_decimal.test
    1.11 03/05/19 12:05:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/select_safe.test
    1.5 03/05/19 12:05:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/repair.test
    1.3 03/05/19 12:05:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/query_cache.test
    1.23 03/05/19 12:05:02 monty@narttu.mysql.fi +0 -1
    Auto merged

  mysql-test/t/myisam.test
    1.17 03/05/19 12:05:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/multi_update.test
    1.24 03/05/19 12:05:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/key.test
    1.8 03/05/19 12:05:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/join_outer.test
    1.9 03/05/19 12:05:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/join.test
    1.19 03/05/19 12:05:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/innodb_handler.test
    1.5 03/05/19 12:05:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/fulltext.test
    1.37 03/05/19 12:05:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/delete.test
    1.12 03/05/19 12:05:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/ctype_latin1_de.test
    1.7 03/05/19 12:05:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/alter_table.test
    1.14 03/05/19 12:05:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/variables.result
    1.21.1.4 03/05/19 12:05:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/select.result
    1.27 03/05/19 12:05:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/query_cache.result
    1.22 03/05/19 12:05:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/myisam.result
    1.20.1.1 03/05/19 12:05:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/multi_update.result
    1.22 03/05/19 12:05:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/key.result
    1.8.1.1 03/05/19 12:05:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/join_outer.result
    1.17 03/05/19 12:05:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/join.result
    1.21 03/05/19 12:05:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/innodb_handler.result
    1.5 03/05/19 12:05:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/fulltext.result
    1.39 03/05/19 12:05:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/delete.result
    1.11 03/05/19 12:05:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  myisam/sort.c
    1.35.1.1 03/05/19 12:05:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  myisam/mi_search.c
    1.37 03/05/19 12:05:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  myisam/mi_range.c
    1.8 03/05/19 12:05:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  myisam/mi_open.c
    1.65 03/05/19 12:05:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  myisam/mi_key.c
    1.17 03/05/19 12:05:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  myisam/mi_check.c
    1.105.1.2 03/05/19 12:05:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  myisam/ft_boolean_search.c
    1.59 03/05/19 12:05:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/ut/ut0ut.c
    1.15 03/05/19 12:04:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/trx/trx0trx.c
    1.23 03/05/19 12:04:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/trx/trx0sys.c
    1.16 03/05/19 12:04:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/srv/srv0start.c
    1.42 03/05/19 12:04:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/srv/srv0srv.c
    1.40 03/05/19 12:04:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/row/row0sel.c
    1.33 03/05/19 12:04:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/row/row0mysql.c
    1.42 03/05/19 12:04:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/os/os0file.c
    1.48 03/05/19 12:04:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/log/log0recv.c
    1.21 03/05/19 12:04:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/log/log0log.c
    1.23 03/05/19 12:04:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/lock/lock0lock.c
    1.22 03/05/19 12:04:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/include/srv0srv.h
    1.23 03/05/19 12:04:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/include/row0mysql.h
    1.17 03/05/19 12:04:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/include/buf0lru.h
    1.3 03/05/19 12:04:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/include/buf0buf.h
    1.16 03/05/19 12:04:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/buf/buf0lru.c
    1.11 03/05/19 12:04:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/buf/buf0flu.c
    1.16 03/05/19 12:04:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/violite.h
    1.30 03/05/19 12:04:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/my_sys.h
    1.98 03/05/19 12:04:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/my_pthread.h
    1.65 03/05/19 12:04:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/my_global.h
    1.45 03/05/19 12:04:58 monty@narttu.mysql.fi +0 -11
    Auto merged

  include/my_base.h
    1.42 03/05/19 12:04:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/config-win.h
    1.31 03/05/19 12:04:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysqldump.c
    1.87 03/05/19 12:04:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysqlbinlog.cc
    1.75 03/05/19 12:04:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysql.cc
    1.121.1.8 03/05/19 12:04:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/mysql.dsw
    1.8 03/05/19 12:04:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/libmysql/libmysql.dsp
    1.13 03/05/19 12:04:58 monty@narttu.mysql.fi +0 -8
    Auto merged

  Build-tools/Do-compile
    1.76 03/05/19 12:04:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/triggers/post-commit
    1.22.1.2 03/05/19 12:04:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  acinclude.m4
    1.83 03/05/19 12:04:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  Makefile.am
    1.48 03/05/19 12:04:57 monty@narttu.mysql.fi +0 -4
    Auto merged

  BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c
    1.4 03/05/19 12:04:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  BUILD/SETUP.sh
    1.22 03/05/19 12:04:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.233.6.1 03/05/19 12:04:46 monty@narttu.mysql.fi +1 -3
    auto-union

  BitKeeper/etc/ignore
    1.153.1.3 03/05/19 12:04:45 monty@narttu.mysql.fi +9 -9
    auto-union

ChangeSet
  1.1346.215.12 03/05/19 12:02:11 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/mysql_priv.h
    1.150.1.44 03/05/19 12:02:09 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.217.1 03/05/19 12:01:38 monty@narttu.mysql.fi +6 -0
  Added option --read-only (Thanks to Markus Benning)

  sql/sql_parse.cc
    1.218.1.98 03/05/19 12:01:37 monty@narttu.mysql.fi +12 -0
    Option --read-only

  sql/set_var.cc
    1.12.1.19 03/05/19 12:01:37 monty@narttu.mysql.fi +4 -0
    Option --read-only

  sql/mysqld.cc
    1.297.1.128 03/05/19 12:01:37 monty@narttu.mysql.fi +10 -4
    Removed not used variables
    Added option --read-only
    Change opt_do_pstack and master_ssl to get them to work with my_getopt

  sql/mysql_priv.h
    1.150.8.1 03/05/19 12:01:37 monty@narttu.mysql.fi +1 -2
    Remove not used variables

  sql/init.cc
    1.5.1.1 03/05/19 12:01:37 monty@narttu.mysql.fi +0 -2
    Remove not used variables

  myisam/myisamchk.c
    1.80.1.21 03/05/19 12:01:37 monty@narttu.mysql.fi +2 -1
    Removed warning from fulltext when repairing many tables with fulltext index

ChangeSet
  1.1524.9.9 03/05/19 11:53:42 monty@narttu.mysql.fi +1 -0
  Fix for when compiling with HAVE_ISAM enabled

  sql/mysqld.cc
    1.356.1.11 03/05/19 11:53:40 monty@narttu.mysql.fi +5 -2
    Fix for when compiling with HAVE_ISAM enabled

ChangeSet
  1.1524.9.8 03/05/19 11:09:46 monty@narttu.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into narttu.mysql.fi:/my/mysql-4.1

  sql/mysqld.cc
    1.356.1.10 03/05/19 11:09:43 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1524.13.1 03/05/19 11:09:24 monty@narttu.mysql.fi +2 -0
  Add empty() function for baselist.

  sql/sql_list.h
    1.17 03/05/19 11:09:22 monty@narttu.mysql.fi +2 -1
    Add empty() function for baselist.

  sql/mysqld.cc
    1.356.4.1 03/05/19 11:09:22 monty@narttu.mysql.fi +2 -8
    Simple cleanup

ChangeSet
  1.1346.215.11 03/05/18 21:46:19 heikki@hundin.mysql.fi +1 -0
  srv0start.c:
    Better instructions for the user if adding of new ibdata files fails

  innobase/srv/srv0start.c
    1.37.1.5 03/05/18 21:46:06 heikki@hundin.mysql.fi +23 -10
    Better instructions for the user if adding of new ibdata files fails

ChangeSet
  1.1346.215.10 03/05/17 16:23:46 heikki@hundin.mysql.fi +1 -0
  buf0buf.c:
    When calculating the buf pool dirty pages ratio, add also free pages to the LRU list length: no need to active flushing if there are lots of free pages in the buffer pool

  innobase/buf/buf0buf.c
    1.17.1.6 03/05/17 16:23:31 heikki@hundin.mysql.fi +2 -1
    When calculating the buf pool dirty pages ratio, add also free pages to the LRU list length: no need to active flushing if there are lots of free pages in the buffer pool

ChangeSet
  1.1524.12.1 03/05/17 10:05:07 bell@sanja.is.com.ua +11 -0
  fixed memory overrun (bug 380)

  sql/sql_yacc.yy
    1.203.40.1 03/05/17 10:04:58 bell@sanja.is.com.ua +45 -9
    create_refs changed with parsing_place enum variable

  sql/sql_union.cc
    1.74.2.1 03/05/17 10:04:58 bell@sanja.is.com.ua +1 -1
    use number of item in select list for array creation

  sql/sql_select.cc
    1.216.7.2 03/05/17 10:04:58 bell@sanja.is.com.ua +1 -1
    use number of item in select list for array creation

  sql/sql_lex.h
    1.102.9.2 03/05/17 10:04:58 bell@sanja.is.com.ua +10 -3
    added items in select list counter
    create_refs changed with parsing_place enum variable
    with_sum_func now is boolean

  sql/sql_lex.cc
    1.76.6.1 03/05/17 10:04:58 bell@sanja.is.com.ua +4 -2
    create_refs changed with parsing_place enum variable

  sql/sql_derived.cc
    1.43.2.1 03/05/17 10:04:58 bell@sanja.is.com.ua +1 -1
    use number of item in select list for array creation

  sql/item_sum.cc
    1.74 03/05/17 10:04:58 bell@sanja.is.com.ua +1 -2
    with_sum_func now is boolean

  sql/item_subselect.cc
    1.60.3.1 03/05/17 10:04:58 bell@sanja.is.com.ua +1 -1
    use number of item in select list for array creation

  sql/item.cc
    1.58.10.1 03/05/17 10:04:58 bell@sanja.is.com.ua +2 -0
    count items in select list

  mysql-test/t/func_group.test
    1.12 03/05/17 10:04:58 bell@sanja.is.com.ua +7 -2
    new tests

  mysql-test/r/func_group.result
    1.14 03/05/17 10:04:58 bell@sanja.is.com.ua +10 -1
    new tests

ChangeSet
  1.1524.9.7 03/05/16 15:28:17 guilhem@mysql.com +1 -0
  LOCAL is an alias of NO_WRITE_TO_BINLOG

ChangeSet
  1.1346.215.9 03/05/16 16:27:50 heikki@hundin.mysql.fi +7 -0
  buf0lru.c, buf0flu.c, buf0buf.c, buf0lru.h:
    Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
  trx0trx.c:
    Add forgotten return value (it was not used anywhere, fortunately)
  ha_innodb.h, mysql_priv.h:
    Move declaration of srv_buf_pool_max_modified_pct to ha_innodb.h and enclose it to denote it is a C variable, not C++

  sql/sql_yacc.yy
    1.203.39.2 03/05/16 15:27:35 guilhem@mysql.com +1 -0
    LOCAL is an alias of NO_WRITE_TO_BINLOG

  innobase/buf/buf0lru.c
    1.9.1.2 03/05/16 16:26:13 heikki@hundin.mysql.fi +35 -14
    Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush

  innobase/buf/buf0flu.c
    1.14.1.4 03/05/16 16:26:13 heikki@hundin.mysql.fi +21 -15
    Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush

  innobase/buf/buf0buf.c
    1.17.1.5 03/05/16 16:26:13 heikki@hundin.mysql.fi +5 -3
    Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush

  innobase/include/buf0lru.h
    1.1.1.1 03/05/16 16:25:55 heikki@hundin.mysql.fi +14 -11
    Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush

  innobase/trx/trx0trx.c
    1.20.1.5 03/05/16 16:21:52 heikki@hundin.mysql.fi +2 -0
    Add forgotten return value (it was not used anywhere, fortunately)

  sql/ha_innodb.h
    1.48.2.8 03/05/16 16:20:55 heikki@hundin.mysql.fi +3 -0
    Move declaration of srv_buf_pool_max_modified_pct to ha_innodb.h and enclose it to denote it is a C variable, not C++

  sql/mysql_priv.h
    1.150.1.43 03/05/16 16:20:48 heikki@hundin.mysql.fi +0 -4
    Move declaration of srv_buf_pool_max_modified_pct to ha_innodb.h and enclose it to denote it is a C variable, not C++

ChangeSet
  1.1346.215.8 03/05/16 13:36:13 mysqldev@build.mysql2.com +1 -0
   - re-enabled RAID support for the Max subpackage again

  support-files/mysql.spec.sh
    1.61.1.4 03/05/16 13:35:21 mysqldev@build.mysql2.com +6 -2
     - re-enabled RAID support for the Max subpackage again

ChangeSet
  1.1346.215.7 03/05/16 13:03:47 mysqldev@build.mysql2.com +2 -0
  my_global.h:
    - QNX 6.2.1 actually defines HAVE_RINT
    - fixed rint(A) #define as it was causing compile errors on QNX

  BitKeeper/etc/logging_ok
    1.206.1.66 03/05/16 13:03:42 mysqldev@build.mysql2.com +1 -0
    Logging to logging@openlogging.org accepted

  include/my_global.h
    1.34.1.11 03/05/16 13:01:51 mysqldev@build.mysql2.com +1 -2
    - QNX 6.2.1 actually defines HAVE_RINT
    - fixed rint(A) #define as it was causing compile errors on QNX

ChangeSet
  1.1524.9.6 03/05/15 23:00:58 guilhem@mysql.com +1 -0
  changes to mysqladmin : use queries instead of commands (so that they have a chance to go
  into the binlog), SLAVE START -> START SLAVE, error test changes.

  client/mysqladmin.c
    1.76 03/05/15 23:00:54 guilhem@mysql.com +8 -8
    Now that FLUSH TABLES and some other FLUSH go into the binlog, the same commands
    issued from mysqladmin should also go into the binlog. How could I explain to
    a user that "mysql -e 'flush tables'" is not exactly the same as "mysqladmin
    flush-tables" ?? So I replace mysql_refresh() by mysql_query().
    Also SLAVE START -> START SLAVE to make this work with 4.1 (it won't work with
    3.23 anymore).
    Also the code tested for mysql_refresh() < 0 for errors, but this cannot happen :
    - mysql_refresh() calls simple_command()
    - in 4.1 the return type of simple_command() is my_bool, and I have checked the 4.1 libmysql
    code and it returns 0 or 1, not negative values.
    - note that in 4.0 libmysql, simple_command() returns int which can be < 0, but we don't
    care here as we link the 4.1 mysqladmin with the 4.1 libmysql.
    Btw, some other parts of the code already checked
    for mysql_refresh() != 0, not < 0. So now it's homogenous : we always test for != 0
    instead of < 0.

ChangeSet
  1.1524.11.1 03/05/15 18:35:39 guilhem@mysql.com +10 -0
  Scrum task 845. Thi is a behaviour change :
  now by default, FLUSH, OPTIMIZE, ANALYZE, REPAIR commands are written to the
  binlog, unless the new NO_WRITE_TO_BINLOG keyword was used :
  OPTIMIZE NO_WRITE_TO_BINLOG table t;
  
  Previously these commands were never written to the binlog, but there are
  2 reasons to change this :
  - the RENAME TABLE in MERGE table bug (#175) on slave
  - the possible "differently optimised queries may lead to different
  updates on the master and slave" bug, until we have automatic ORDER BY.
  
  FLUSH LOGS/SLAVE/MASTER/TABLES WITH READ LOCK are never written to the binlog.
  New test for the new logging behaviour.
  Other small change : reload_acl_and_cache() and reset_slave() don't send their errors themselves,
  this is more usual.

  mysql-test/t/rpl_flush_tables.test
    1.1 03/05/15 18:35:36 guilhem@mysql.com +33 -0

  mysql-test/r/rpl_flush_tables.result
    1.1 03/05/15 18:35:36 guilhem@mysql.com +40 -0

  sql/sql_yacc.yy
    1.203.39.1 03/05/15 18:35:36 guilhem@mysql.com +15 -5
    New optional keyword NO_WRITE_TO_BINLOG for OPTIMIZE/ANALYZE/REPAIR/FLUSH :
    OPTIMIZE NO_WRITE_TO_BINLOG TABLE t;
    ANALYZE NO_WRITE_TO_BINLOG TABLE t;
    REPAIR NO_WRITE_TO_BINLOG TABLE t;
    FLUSH NO_WRITE_TO_BINLOG TABLE t;

  sql/sql_repl.cc
    1.102.1.2 03/05/15 18:35:36 guilhem@mysql.com +2 -9
    reset_slave() does not send its errors himself.

  sql/sql_parse.cc
    1.271.6.2 03/05/15 18:35:36 guilhem@mysql.com +105 -27
    reload_acl_and_cache() now does not send its errors itself;
    it saves the error and the caller sends it.
    FLUSH, OPTIMIZE, ANALYZE, REPAIR commands don't write to the binlog
    if the NO_WRITE_TO_BINLOG keyword was used.

  sql/sql_lex.h
    1.102.9.1 03/05/15 18:35:36 guilhem@mysql.com +1 -1
    New boolean no_write_to_binlog in the lex structure.

  mysql-test/t/rpl_flush_tables.test
    1.0 03/05/15 18:35:36 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.1/mysql-test/t/rpl_flush_tables.test

  mysql-test/r/rpl_flush_tables.result
    1.0 03/05/15 18:35:36 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.1/mysql-test/r/rpl_flush_tables.result

  sql/mysqld.cc
    1.356.1.9 03/05/15 18:35:35 guilhem@mysql.com +2 -2
    updated for new prototype of reload_acl_and_cache().

  sql/mysql_priv.h
    1.186.1.7 03/05/15 18:35:35 guilhem@mysql.com +2 -1
    reload_acl_and_cache() now decides if we want to write the FLUSH command
    to the binlog or not (FLUSH MASTER, FLUSH SLAVE, FLUSH TABLES
    WITH READ LOCK, FLUSH LOGS cannot go into the binlog).

  sql/lex.h
    1.82.1.30 03/05/15 18:35:35 guilhem@mysql.com +1 -0
    New keyword NO_WRITE_TO_BINLOG

  mysql-test/mysql-test-run.sh
    1.165 03/05/15 18:35:35 guilhem@mysql.com +3 -1
    rpl_flush_tables.test generates 'table xx is open on rename'.
    This is normal and done on purpose, so don't report it.

ChangeSet
  1.1524.9.4 03/05/15 17:50:57 monty@narttu.mysql.fi +3 -0
  Fix to get thread_test to compile

  tests/thread_test.c
    1.14 03/05/15 17:50:56 monty@narttu.mysql.fi +4 -3
    Remove compiler warnings

  tests/Makefile.am
    1.12 03/05/15 17:50:56 monty@narttu.mysql.fi +3 -0
    Fix to get thread_test to compile

  BitKeeper/etc/ignore
    1.153.1.2 03/05/15 17:50:34 monty@narttu.mysql.fi +1 -0
    added insert_test

  BitKeeper/etc/ignore
    1.153.1.1 03/05/15 17:50:01 monty@narttu.mysql.fi +3 -0
    added client_test thread_test select_test

ChangeSet
  1.1524.10.1 03/05/15 15:51:42 monty@narttu.mysql.fi +1 -0
  Remove warning from automake

  tests/Makefile.am
    1.11 03/05/15 15:51:41 monty@narttu.mysql.fi +1 -2
    Remove warning from automake

ChangeSet
  1.1524.9.2 03/05/15 16:57:34 bar@bar.mysql.r18.ru +1 -0
  configure.in:
    ./configure --with-charset=big5  didn't work

  configure.in
    1.201.1.31 03/05/15 16:57:02 bar@bar.mysql.r18.ru +1 -1
    ./configure --with-charset=big5  didn't work

ChangeSet
  1.1524.1.6 03/05/14 19:48:58 vva@eagle.mysql.r18.ru +4 -0
  Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-5.0
  into eagle.mysql.r18.ru:/home/vva/work/LEX_PTR/mysql-5.0

  sql/sql_yacc.yy
    1.231 03/05/14 19:48:56 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_class.cc
    1.118 03/05/14 19:48:55 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/sp_head.cc
    1.30 03/05/14 19:48:55 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/sp.cc
    1.16 03/05/14 19:48:55 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1524.7.3 03/05/15 00:39:41 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-top-4.1

  sql/sql_select.cc
    1.216.4.5 03/05/15 00:39:39 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1524.8.1 03/05/15 00:31:12 monty@narttu.mysql.fi +5 -0
  Fixed new bug in ORDER BY

  strings/my_strtoll10.c
    1.2 03/05/15 00:31:10 monty@narttu.mysql.fi +1 -1
    Updated comments

  strings/my_strtoll10-x86.s
    1.2 03/05/15 00:31:10 monty@narttu.mysql.fi +20 -14
    Faster str->longlong

  sql/sql_select.cc
    1.216.7.1 03/05/15 00:31:10 monty@narttu.mysql.fi +1 -1
    Fixed new bug in ORDER BY

  mysql-test/r/type_blob.result
    1.18 03/05/15 00:31:10 monty@narttu.mysql.fi +1 -1
    Update for new error messages

  mysql-test/r/create.result
    1.32.1.1 03/05/15 00:31:10 monty@narttu.mysql.fi +3 -1
    Update for new error messages

ChangeSet
  1.1346.215.6 03/05/14 23:06:06 monty@narttu.mysql.fi +2 -0
  Portability fix for 64 bit machines

  mysql-test/t/variables.test
    1.11.1.4 03/05/14 23:06:05 monty@narttu.mysql.fi +1 -0
    Portability fix for 64 bit machines

  mysql-test/r/variables.result
    1.15.1.4 03/05/14 23:06:05 monty@narttu.mysql.fi +1 -1
    Portability fix for 64 bit machines

ChangeSet
  1.1346.215.5 03/05/14 22:28:54 monty@narttu.mysql.fi +4 -0
  Merge with 3.23 (No releavant code changes)

  sql/sql_show.cc
    1.76.1.32 03/05/14 22:28:53 monty@narttu.mysql.fi +0 -3
    No change

  innobase/os/os0sync.c
    1.15 03/05/14 22:28:53 monty@narttu.mysql.fi +0 -1
    No change

  configure.in
    1.191.1.81 03/05/14 22:28:53 monty@narttu.mysql.fi +0 -1
    Merge with 3.23

  acinclude.m4
    1.77.1.5 03/05/14 22:13:56 monty@narttu.mysql.fi +0 -2
    Auto merged

ChangeSet
  1.1346.216.1 03/05/14 22:12:55 monty@narttu.mysql.fi +4 -0
  Fixed bug in CREATE ... DECIMAL(-1,1). Bug #432

  sql/sql_parse.cc
    1.218.1.97 03/05/14 22:12:54 monty@narttu.mysql.fi +9 -7
    Fixed bug in CREATE ... DECIMAL(-1,1)

  mysql-test/t/type_decimal.test
    1.8.1.2 03/05/14 22:12:54 monty@narttu.mysql.fi +10 -0
    Test for bug with decimal()

  mysql-test/r/type_decimal.result
    1.11.1.1 03/05/14 22:12:54 monty@narttu.mysql.fi +6 -0
    Test for bug with decimal()

  mysql-test/mysql-test-run.sh
    1.146.1.22 03/05/14 22:12:54 monty@narttu.mysql.fi +2 -1
    Ensure that tests are sorted

ChangeSet
  1.676.1.696 03/05/14 22:08:30 monty@narttu.mysql.fi +2 -0
  Portability fixes OpenUnix 8 & UnixWare 7.1.x

  configure.in
    1.124.1.85 03/05/14 22:08:30 monty@narttu.mysql.fi +2 -6
    Portability fixes OpenUnix 8 & UnixWare 7.1.x

  acinclude.m4
    1.35.1.13 03/05/14 22:08:30 monty@narttu.mysql.fi +2 -1
    Portability fixes OpenUnix 8 & UnixWare 7.1.x

ChangeSet
  1.1524.7.2 03/05/14 22:01:56 bell@sanja.is.com.ua +7 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-top-4.1

  sql/sql_yacc.yy
    1.203.28.8 03/05/14 22:01:54 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.4.4 03/05/14 22:01:54 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.cc
    1.60.1.2 03/05/14 22:01:53 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.88 03/05/14 22:01:53 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.56.1.14 03/05/14 22:01:53 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.58.1.17 03/05/14 22:01:53 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.3.3 03/05/14 22:01:53 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1524.5.3 03/05/14 21:51:33 bell@sanja.is.com.ua +15 -0
  subselect transformation moved in after-fix_field place
  removed "of is null" if it is possible
    (this cset should be SCRUM related, but not approved as scrum task yet)

  sql/table.h
    1.49 03/05/14 21:51:23 bell@sanja.is.com.ua +2 -9
    'table & 'table_list' now is different fields

  sql/sql_yacc.yy
    1.203.38.1 03/05/14 21:51:23 bell@sanja.is.com.ua +3 -1
    fixed layout

  sql/sql_union.cc
    1.74.1.1 03/05/14 21:51:23 bell@sanja.is.com.ua +58 -54
    prepare make on fix_fields

  sql/sql_select.cc
    1.216.6.1 03/05/14 21:51:23 bell@sanja.is.com.ua +15 -1
    'table' & 'table_list' now is not union
    transforming subselect

  sql/sql_olap.cc
    1.8 03/05/14 21:51:23 bell@sanja.is.com.ua +2 -1
    fixed table assignment
    TODO added

  sql/sql_lex.h
    1.102.6.5 03/05/14 21:51:23 bell@sanja.is.com.ua +3 -1
    mark fake st_select_lex

  sql/sql_lex.cc
    1.76.5.1 03/05/14 21:51:23 bell@sanja.is.com.ua +4 -1
    'table' & 'table_list' now is not union to support reinit only shared tables (but all)

  sql/sql_derived.cc
    1.43.1.1 03/05/14 21:51:23 bell@sanja.is.com.ua +2 -1
    'table' & 'table_list' now is not union

  sql/item_subselect.h
    1.29 03/05/14 21:51:23 bell@sanja.is.com.ua +28 -9
    new transformation

  sql/item_subselect.cc
    1.60.2.1 03/05/14 21:51:23 bell@sanja.is.com.ua +269 -200
    new transformation

  sql/item_cmpfunc.h
    1.51 03/05/14 21:51:23 bell@sanja.is.com.ua +2 -3
    new method to support transformation after fix_fields
    fixed Item printing

  sql/item_cmpfunc.cc
    1.86.1.1 03/05/14 21:51:23 bell@sanja.is.com.ua +14 -8
    new method to support transformation after fix_fields

  sql/item.h
    1.56.5.1 03/05/14 21:51:23 bell@sanja.is.com.ua +19 -1
    unneed ';'
    fixed print pethod

  sql/item.cc
    1.58.9.1 03/05/14 21:51:23 bell@sanja.is.com.ua +8 -10
    layout fix

  mysql-test/r/subselect.result
    1.67.4.1 03/05/14 21:51:23 bell@sanja.is.com.ua +2 -3
    new subselect test result (new place of error detecting & and more subselect reducing)

ChangeSet
  1.1346.215.3 03/05/14 20:22:55 heikki@hundin.mysql.fi +1 -0
  os0sync.c:
    Check return value of pthread_cond_...

  innobase/os/os0sync.c
    1.14 03/05/14 20:22:46 heikki@hundin.mysql.fi +5 -4
    Check return value of pthread_cond_...

ChangeSet
  1.1346.215.2 03/05/14 20:17:01 heikki@hundin.mysql.fi +1 -0
  os0sync.c:
    Check that pthread_mutex_init and pthread_mutex_destroy return 0

  innobase/os/os0sync.c
    1.13 03/05/14 20:16:38 heikki@hundin.mysql.fi +3 -3
    Check that pthread_mutex_init and pthread_mutex_destroy return 0

ChangeSet
  1.676.297.1 03/05/14 19:09:05 heikki@hundin.mysql.fi +1 -0
  os0sync.c:
    Backport from 4.0: We had forgotten to call pthread_mutex_destroy when we free an OS mutex in Unix

  innobase/os/os0sync.c
    1.9.1.1 03/05/14 19:07:15 heikki@hundin.mysql.fi +1 -2
    Backport from 4.0: We had forgotten to call pthread_mutex_destroy when we free an OS mutex in Unix

ChangeSet
  1.1346.215.1 03/05/14 19:00:17 heikki@hundin.mysql.fi +1 -0
  os0sync.c:
    We had forgotten to call pthread_mutex_destroy when we free an OS mutex in Unix

  innobase/os/os0sync.c
    1.12 03/05/14 19:00:09 heikki@hundin.mysql.fi +1 -4
    We had forgotten to call pthread_mutex_destroy when we free an OS mutex in Unix

ChangeSet
  1.1346.200.36 03/05/14 16:47:55 jani@hynda.(none) +1 -0
  Fixed a bug with having comments after options in config files.
  Bug ID: 235

  mysys/default.c
    1.17.1.9 03/05/14 16:47:52 jani@hynda.(none) +28 -2
    Fixed a bug with having comments after options in config files.
    Bug ID: 235

ChangeSet
  1.1346.200.35 03/05/14 13:49:43 jani@hynda.(none) +1 -0
  Fixed documentation for mysql_fix_privilege_tables man page.
  Bug ID: 384

  man/mysql_fix_privilege_tables.1
    1.2 03/05/14 13:49:41 jani@hynda.(none) +3 -4
    Fixed documentation for mysql_fix_privilege_tables man page.
    Bug ID: 384

ChangeSet
  1.676.1.694 03/05/14 09:37:04 monty@narttu.mysql.fi +1 -0
  SHOW TABLE STATUS displayed wrong Row_format for myisampack'ed tables. (Bug #427)

  sql/sql_show.cc
    1.47.1.22 03/05/14 09:37:03 monty@narttu.mysql.fi +4 -3
    SHOW TABLE STATUS displayed wrong Row_format for myisampack'ed tables.

ChangeSet
  1.1346.200.34 03/05/14 01:55:23 monty@narttu.mysql.fi +1 -0
  Fix for checking global_access rights

  sql/sql_parse.cc
    1.218.1.96 03/05/14 01:55:22 monty@narttu.mysql.fi +23 -8
    Fix for checking global_access rights

ChangeSet
  1.1346.200.33 03/05/14 01:28:59 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.218.1.95 03/05/14 01:28:55 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.200.32 03/05/14 01:27:26 monty@narttu.mysql.fi +11 -0
  Fix for MacOSX and symlinks
  Fix for USE_FRM and crashed index file

  mysql-test/t/repair_part2.test
    1.1 03/05/14 01:27:23 monty@narttu.mysql.fi +7 -0

  mysql-test/t/repair_part2-master.sh
    1.1 03/05/14 01:27:23 monty@narttu.mysql.fi +1 -0

  mysql-test/r/repair_part2.result
    1.1 03/05/14 01:27:23 monty@narttu.mysql.fi +8 -0

  sql/sql_table.cc
    1.112.1.46 03/05/14 01:27:23 monty@narttu.mysql.fi +80 -66
    Fix for USE_FRM and crashed index file

  sql/handler.cc
    1.82.1.16 03/05/14 01:27:23 monty@narttu.mysql.fi +6 -4
    Indentation changes

  mysql-test/t/update.test
    1.6.1.4 03/05/14 01:27:23 monty@narttu.mysql.fi +15 -0
    Added test case from bugs system

  mysql-test/t/repair_part2.test
    1.0 03/05/14 01:27:23 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/t/repair_part2.test

  mysql-test/t/repair_part2-master.sh
    1.0 03/05/14 01:27:23 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/t/repair_part2-master.sh

  mysql-test/t/repair.test
    1.1.1.3 03/05/14 01:27:23 monty@narttu.mysql.fi +4 -0
    Added test with crashed MyISAM index header

  mysql-test/r/update.result
    1.8.1.4 03/05/14 01:27:23 monty@narttu.mysql.fi +16 -0
    new test case

  mysql-test/r/repair_part2.result
    1.0 03/05/14 01:27:23 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/r/repair_part2.result

  mysql-test/r/repair.result
    1.4 03/05/14 01:27:23 monty@narttu.mysql.fi +2 -1
    new test case

  myisam/mi_open.c
    1.46.1.15 03/05/14 01:27:23 monty@narttu.mysql.fi +6 -1
    Give better error message in case of of crashed index file

  configure.in
    1.191.1.80 03/05/14 01:27:23 monty@narttu.mysql.fi +6 -4
    Fix for MacOSX and symlinks

ChangeSet
  1.1346.214.1 03/05/13 23:03:00 guilhem@mysql.com +1 -0
  Fix for bug 343 : we require only REPLICATION CLIENT for
  SHOW SLAVE STATUS and SHOW MASTER STATUS, because this is what
  the manual states. We still accept SUPER.

  sql/sql_parse.cc
    1.218.24.1 03/05/13 23:02:57 guilhem@mysql.com +6 -2
    Fix for bug 343 : we require only REPLICATION CLIENT for
    SHOW SLAVE STATUS and SHOW MASTER STATUS, because this is what
    the manual states. We still accept SUPER.

ChangeSet
  1.1524.7.1 03/05/13 22:50:28 guilhem@mysql.com +5 -0
  Proper replication of CONNECTION_ID() and 4.1 PASSWORD() (bugs 177 and 344),
  new test for this.

  mysql-test/t/rpl_misc_functions.test
    1.1 03/05/13 22:49:54 guilhem@mysql.com +30 -0

  mysql-test/t/rpl_misc_functions-slave.sh
    1.1 03/05/13 22:49:54 guilhem@mysql.com +1 -0

  mysql-test/r/rpl_misc_functions.result
    1.1 03/05/13 22:49:54 guilhem@mysql.com +21 -0

  sql/item_strfunc.cc
    1.107 03/05/13 22:49:54 guilhem@mysql.com +12 -0
    Proper replication of the new 4.1 PASSWORD() (bug 344)

  mysql-test/t/rpl_misc_functions.test
    1.0 03/05/13 22:49:54 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.1/mysql-test/t/rpl_misc_functions.test

  mysql-test/t/rpl_misc_functions-slave.sh
    1.0 03/05/13 22:49:54 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.1/mysql-test/t/rpl_misc_functions-slave.sh

  mysql-test/r/rpl_misc_functions.result
    1.0 03/05/13 22:49:54 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.1/mysql-test/r/rpl_misc_functions.result

  sql/item_create.cc
    1.33.1.1 03/05/13 22:49:53 guilhem@mysql.com +6 -2
    Proper replication of CONNECTION_ID() (bug 177).
    This is just for replication; mysqlbinlog|mysql still does not work
    with CONNECTION_ID(), it will wait for row-level binlogging.

ChangeSet
  1.1346.200.31 03/05/13 22:35:41 monty@narttu.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.0
  into narttu.mysql.fi:/my/mysql-4.0

  include/my_global.h
    1.34.1.10 03/05/13 22:35:39 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.211.2 03/05/13 22:28:34 jani@hynda.(none) +5 -0
  Fixed a bug in DROP DATABASE when database had a RAID type table.
  Bug ID 381.

  sql/sql_db.cc
    1.39.1.21 03/05/13 22:28:30 jani@hynda.(none) +18 -3
    Fixed a bug in DROP DATABASE when database had a RAID type table.
    Bug ID 381.

  sql/set_var.cc
    1.12.1.18 03/05/13 22:28:30 jani@hynda.(none) +1 -1
    Fixed a bug in DROP DATABASE when database had a RAID type table.
    Bug ID 381.

  sql/mysqld.cc
    1.297.1.127 03/05/13 22:28:30 jani@hynda.(none) +2 -4
    Fixed a bug in DROP DATABASE when database had a RAID type table.
    Bug ID 381.

  mysql-test/t/raid.test
    1.3.1.1 03/05/13 22:28:30 jani@hynda.(none) +3 -0
    Fixed a bug in DROP DATABASE when database had a RAID type table.
    Bug ID 381.

  mysql-test/r/raid.result
    1.5 03/05/13 22:28:30 jani@hynda.(none) +3 -0
    Fixed a bug in DROP DATABASE when database had a RAID type table.
    Bug ID 381.

ChangeSet
  1.1524.2.7 03/05/13 12:06:34 igor@rurik.mysql.com +2 -0
  logging_ok:
    Logging to logging@openlogging.org accepted
  mf_keycache.c:
    Fixed a deadlock when reading from an index file fails.

  BitKeeper/etc/logging_ok
    1.233.1.14 03/05/13 12:02:12 igor@rurik.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  mysys/mf_keycache.c
    1.25 03/05/13 11:47:03 igor@rurik.mysql.com +6 -3
    Fixed a deadlock when reading from an index file fails.

ChangeSet
  1.1346.212.2 03/05/13 19:30:07 lenz@mysql.com +2 -0
   - disabled all "EXPLAIN SELECT" tests from the InnoDB test because of
     nodeterministic results on some platforms

  mysql-test/t/innodb.test
    1.28.1.16 03/05/13 19:30:05 lenz@mysql.com +4 -4
     - disabled all "EXPLAIN SELECT" tests from the InnoDB test because of
       nodeterministic results on some platforms

  mysql-test/r/innodb.result
    1.40.1.26 03/05/13 19:30:05 lenz@mysql.com +0 -12
     - disabled all "EXPLAIN SELECT" tests from the InnoDB test because of
       nodeterministic results on some platforms

ChangeSet
  1.1346.213.2 03/05/13 19:19:57 pem@mysql.com +1 -0
  Forgot to correct comment in key.test (after fixing bug 390).

  mysql-test/t/key.test
    1.6.1.2 03/05/13 19:19:56 pem@mysql.com +1 -1
    Forgot to correct comment (after fixing bug 390).

ChangeSet
  1.1346.213.1 03/05/13 19:16:30 pem@mysql.com +5 -0
  Fix of bug 390: primary key now implies (silently) NOT NULL for key fields.

  sql/sql_table.cc
    1.112.1.45 03/05/13 19:16:28 pem@mysql.com +3 -2
    Fix of bug 390: primary key now implies (silently) NOT NULL for key fields.

  mysql-test/t/key.test
    1.6.1.1 03/05/13 19:16:28 pem@mysql.com +2 -2
    Fix of bug 390: primary key now implies (silently) NOT NULL for key fields.

  mysql-test/t/create.test
    1.11.1.5 03/05/13 19:16:28 pem@mysql.com +10 -2
    Fix of bug 390: primary key now implies (silently) NOT NULL for key fields.

  mysql-test/r/key.result
    1.7.1.1 03/05/13 19:16:28 pem@mysql.com +0 -1
    Fix of bug 390: primary key now implies (silently) NOT NULL for key fields.

  mysql-test/r/create.result
    1.12.1.6 03/05/13 19:16:28 pem@mysql.com +9 -4
    Fix of bug 390: primary key now implies (silently) NOT NULL for key fields.

ChangeSet
  1.1346.200.29 03/05/13 20:07:43 monty@narttu.mysql.fi +3 -0
  Fixed 'Unknown error' when using 'UPDATE ... LIMIT'. Bug 373

  sql/sql_update.cc
    1.54.1.32 03/05/13 20:07:42 monty@narttu.mysql.fi +4 -0
    Fixed 'Unknown error' when using 'UPDATE ... LIMIT'

  mysql-test/t/update.test
    1.6.1.3 03/05/13 20:07:42 monty@narttu.mysql.fi +17 -0
    Test of UPDATE ... LIMIT

  mysql-test/r/update.result
    1.8.1.3 03/05/13 20:07:42 monty@narttu.mysql.fi +12 -0
    new test

ChangeSet
  1.1346.212.1 03/05/13 18:54:20 lenz@mysql.com +15 -0
   - added mysql_fix_privilege_tables(1) man page to distribution
     (thanks to Christian Hammers from the Debian project for providing it)
   - Updated version number in man pages (3.23 -> 4.0)

  man/replace.1
    1.4 03/05/13 18:54:17 lenz@mysql.com +1 -1
     - Updated version number ("MySQL-3.23" -> "MySQL 4.0")

  man/perror.1
    1.6 03/05/13 18:54:17 lenz@mysql.com +1 -1
     - Updated version number ("MySQL-3.23" -> "MySQL 4.0")

  man/mysqlshow.1
    1.5 03/05/13 18:54:17 lenz@mysql.com +1 -1
     - Updated version number ("MySQL-3.23" -> "MySQL 4.0")

  man/mysqldump.1
    1.5 03/05/13 18:54:17 lenz@mysql.com +1 -1
     - Updated version number ("MySQL-3.23" -> "MySQL 4.0")

  man/mysqld_safe.1
    1.6 03/05/13 18:54:17 lenz@mysql.com +1 -1
     - Updated version number ("MySQL-3.23" -> "MySQL 4.0")

  man/mysqld_multi.1
    1.4 03/05/13 18:54:17 lenz@mysql.com +1 -1
     - Updated version number ("MySQL-3.23" -> "MySQL 4.0")

  man/mysqld.1
    1.5 03/05/13 18:54:17 lenz@mysql.com +1 -1
     - Updated version number ("MySQL-3.23" -> "MySQL 4.0")

  man/mysqladmin.1
    1.5 03/05/13 18:54:17 lenz@mysql.com +1 -1
     - Updated version number ("MySQL-3.23" -> "MySQL 4.0")

  man/mysqlaccess.1
    1.5 03/05/13 18:54:17 lenz@mysql.com +1 -1
     - Updated version number ("MySQL-3.23" -> "MySQL 4.0")

  man/mysql_zap.1
    1.4 03/05/13 18:54:17 lenz@mysql.com +1 -1
     - Updated version number ("MySQL-3.23" -> "MySQL 4.0")

  man/mysql.1
    1.7 03/05/13 18:54:17 lenz@mysql.com +1 -1
     - Updated version number ("MySQL-3.23" -> "MySQL 4.0")

  man/isamlog.1
    1.4 03/05/13 18:54:17 lenz@mysql.com +1 -1
     - Updated version number ("MySQL-3.23" -> "MySQL 4.0")

  man/isamchk.1
    1.5 03/05/13 18:54:17 lenz@mysql.com +1 -1
     - Updated version number ("MySQL-3.23" -> "MySQL 4.0")

  man/Makefile.am
    1.7 03/05/13 18:54:17 lenz@mysql.com +1 -1
     - added mysql_fix_privilege_tables(1) man page to man_MANS

  man/mysql_fix_privilege_tables.1
    1.1 03/05/13 18:51:28 lenz@mysql.com +23 -0

  man/mysql_fix_privilege_tables.1
    1.0 03/05/13 18:51:28 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.0-build/man/mysql_fix_privilege_tables.1

ChangeSet
  1.1346.211.1 03/05/13 19:34:51 jani@hynda.(none) +6 -0
  - Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 and 342
  - Fix for QNX: UNIX sockets available since 6.2.1

  sql/set_var.h
    1.4.1.4 03/05/13 19:33:12 jani@hynda.(none) +14 -0
    Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339

  sql/set_var.cc
    1.12.1.17 03/05/13 19:33:12 jani@hynda.(none) +28 -4
    Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339

  sql/mysqld.cc
    1.297.1.126 03/05/13 19:33:12 jani@hynda.(none) +3 -2
    Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339

  mysql-test/t/variables.test
    1.11.1.3 03/05/13 19:33:12 jani@hynda.(none) +8 -5
    Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339

  mysql-test/r/variables.result
    1.15.1.3 03/05/13 19:33:12 jani@hynda.(none) +10 -9
    Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339

  include/my_global.h
    1.34.2.1 03/05/13 19:33:11 jani@hynda.(none) +0 -1
    Fix for QNX: UNIX sockets available since 6.2.1

ChangeSet
  1.1346.200.28 03/05/13 19:26:07 monty@narttu.mysql.fi +4 -0
  Fixed problem with ansi mode and GROUP BY with constants. (Bug #387)

  mysql-test/t/ansi.test
    1.1 03/05/13 19:26:06 monty@narttu.mysql.fi +17 -0

  mysql-test/t/ansi-master.opt
    1.1 03/05/13 19:26:06 monty@narttu.mysql.fi +1 -0

  mysql-test/t/ansi.test
    1.0 03/05/13 19:26:06 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/t/ansi.test

  mysql-test/t/ansi-master.opt
    1.0 03/05/13 19:26:06 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/t/ansi-master.opt

  mysql-test/r/ansi.result
    1.1 03/05/13 19:26:05 monty@narttu.mysql.fi +10 -0

  sql/sql_select.cc
    1.152.1.82 03/05/13 19:26:05 monty@narttu.mysql.fi +2 -1
    Fixed problem with ansi mode and GROUP BY with constants

  mysql-test/r/ansi.result
    1.0 03/05/13 19:26:05 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/r/ansi.result

ChangeSet
  1.1346.200.27 03/05/13 18:58:26 monty@narttu.mysql.fi +11 -0
  Fix for UNION and LEFT JOIN (Bug #386)
  Fixed wrong logging of Access denied error (Bug #398)

  sql/sql_update.cc
    1.54.1.31 03/05/13 18:58:25 monty@narttu.mysql.fi +3 -3
    Fix for UNION and LEFT JOIN

  sql/sql_union.cc
    1.22.1.20 03/05/13 18:58:25 monty@narttu.mysql.fi +3 -2
    Fix for UNION and LEFT JOIN

  sql/sql_parse.cc
    1.218.1.94 03/05/13 18:58:25 monty@narttu.mysql.fi +9 -2
    Fixed wrong logging of Access denied error

  sql/sql_insert.cc
    1.63.1.36 03/05/13 18:58:25 monty@narttu.mysql.fi +5 -5
    Fix for UNION and LEFT JOIN

  sql/sql_base.cc
    1.117.1.44 03/05/13 18:58:25 monty@narttu.mysql.fi +4 -4
    Fix for UNION and LEFT JOIN

  sql/mysql_priv.h
    1.150.1.42 03/05/13 18:58:25 monty@narttu.mysql.fi +2 -2
    Fix for UNION and LEFT JOIN

  sql/field.h
    1.33.1.17 03/05/13 18:58:25 monty@narttu.mysql.fi +2 -0
    Fix for UNION and LEFT JOIN

  mysys/my_seek.c
    1.10 03/05/13 18:58:25 monty@narttu.mysql.fi +3 -0
    Safety fix to find out when pos gets a wrong value

  mysql-test/t/union.test
    1.22.1.3 03/05/13 18:58:25 monty@narttu.mysql.fi +60 -1
    Test of bug in union and left join

  mysql-test/r/union.result
    1.17.1.4 03/05/13 18:58:25 monty@narttu.mysql.fi +58 -1
    new test case

  include/my_global.h
    1.34.1.9 03/05/13 18:58:25 monty@narttu.mysql.fi +1 -1
    Fix for QNX

ChangeSet
  1.1346.210.1 03/05/13 11:39:07 jani@rhols221.adsl.netsonic.fi +1 -0
  Removed timing of tests from mysql-test-run.
  Needed by QNX, and there was no real use for timing.

  mysql-test/mysql-test-run.sh
    1.146.1.21 03/05/13 11:38:50 jani@rhols221.adsl.netsonic.fi +5 -23
    Removed timing of tests from mysql-test-run.
    Needed by QNX, and there was no real use for timing.

ChangeSet
  1.1524.2.6 03/05/13 11:15:11 monty@mashka.mysql.fi +47 -0
  Give warning if MySQL doesn't honor given storage engine
  Allow syntax CREATE TABLE t1 (LIKE t2)

  mysql-test/t/warnings-master.opt
    1.1 03/05/13 11:15:06 monty@mashka.mysql.fi +1 -0

  sql/sql_yacc.yy
    1.203.28.7 03/05/13 11:15:06 monty@mashka.mysql.fi +7 -1
    Allow syntax CREATE TABLE t1 (LIKE t2).

  sql/sql_table.cc
    1.157.4.2 03/05/13 11:15:06 monty@mashka.mysql.fi +23 -3
    Give warning if MySQL doesn't honor given storage engine

  sql/sql_select.cc
    1.216.4.3 03/05/13 11:15:06 monty@mashka.mysql.fi +2 -1
    Fixed bug in new sub select optimization

  sql/sql_parse.cc
    1.271.6.1 03/05/13 11:15:06 monty@mashka.mysql.fi +3 -1
    Fix bug in access checking of derived tables

  sql/sql_base.cc
    1.145.1.3 03/05/13 11:15:06 monty@mashka.mysql.fi +3 -3
    Indentation change

  sql/sql_acl.cc
    1.74.1.2 03/05/13 11:15:06 monty@mashka.mysql.fi +1 -1
    Fix bug in access checking of derived tables

  sql/share/ukrainian/errmsg.txt
    1.27.1.7 03/05/13 11:15:06 monty@mashka.mysql.fi +13 -12
    Added missing ','

  sql/share/swedish/errmsg.txt
    1.64.1.9 03/05/13 11:15:06 monty@mashka.mysql.fi +12 -11
    Added missing ','

  sql/share/spanish/errmsg.txt
    1.64.1.7 03/05/13 11:15:06 monty@mashka.mysql.fi +13 -12
    Added missing ','

  sql/share/slovak/errmsg.txt
    1.64.1.7 03/05/13 11:15:06 monty@mashka.mysql.fi +13 -12
    Added missing ','

  sql/share/serbian/errmsg.txt
    1.18.1.6 03/05/13 11:15:06 monty@mashka.mysql.fi +13 -12
    Added missing ','

  sql/share/russian/errmsg.txt
    1.61.1.8 03/05/13 11:15:06 monty@mashka.mysql.fi +13 -12
    Added missing ','

  sql/share/romanian/errmsg.txt
    1.62.1.7 03/05/13 11:15:06 monty@mashka.mysql.fi +13 -12
    Added missing ','

  mysql-test/t/warnings-master.opt
    1.0 03/05/13 11:15:06 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.1/mysql-test/t/warnings-master.opt

  sql/share/portuguese/errmsg.txt
    1.64.1.7 03/05/13 11:15:05 monty@mashka.mysql.fi +13 -12
    Added missing ','

  sql/share/polish/errmsg.txt
    1.63.1.8 03/05/13 11:15:05 monty@mashka.mysql.fi +13 -12
    Added missing ','

  sql/share/norwegian/errmsg.txt
    1.63.1.7 03/05/13 11:15:05 monty@mashka.mysql.fi +13 -12
    Added missing ','

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.7 03/05/13 11:15:05 monty@mashka.mysql.fi +13 -12
    Added missing ','

  sql/share/korean/errmsg.txt
    1.63.1.7 03/05/13 11:15:05 monty@mashka.mysql.fi +13 -12
    Added missing ','

  sql/share/japanese/errmsg.txt
    1.63.1.7 03/05/13 11:15:05 monty@mashka.mysql.fi +13 -12
    Added missing ','

  sql/share/italian/errmsg.txt
    1.70.1.7 03/05/13 11:15:05 monty@mashka.mysql.fi +13 -12
    Added missing ','

  sql/share/hungarian/errmsg.txt
    1.65.1.7 03/05/13 11:15:05 monty@mashka.mysql.fi +13 -12
    Added missing ','

  sql/share/greek/errmsg.txt
    1.64.1.7 03/05/13 11:15:05 monty@mashka.mysql.fi +13 -12
    Added missing ','

  sql/share/german/errmsg.txt
    1.64.1.7 03/05/13 11:15:05 monty@mashka.mysql.fi +10 -9
    Added missing ','

  sql/share/french/errmsg.txt
    1.63.1.7 03/05/13 11:15:05 monty@mashka.mysql.fi +13 -12
    Added missing ','

  sql/share/estonian/errmsg.txt
    1.64.1.7 03/05/13 11:15:05 monty@mashka.mysql.fi +13 -12
    Added missing ','

  sql/share/english/errmsg.txt
    1.70.4.1 03/05/13 11:15:05 monty@mashka.mysql.fi +18 -17
    Added missing ','
    changed table handler -> storage engine

  sql/share/dutch/errmsg.txt
    1.66.1.7 03/05/13 11:15:05 monty@mashka.mysql.fi +13 -12
    Added missing ','

  sql/share/danish/errmsg.txt
    1.62.1.7 03/05/13 11:15:05 monty@mashka.mysql.fi +13 -12
    Added missing ','

  sql/share/czech/errmsg.txt
    1.64.1.7 03/05/13 11:15:05 monty@mashka.mysql.fi +13 -12
    Added missing ','

  sql/mysqld.cc
    1.356.1.8 03/05/13 11:15:05 monty@mashka.mysql.fi +20 -2
    Added option --skip-isam

  sql/item.cc
    1.58.1.16 03/05/13 11:15:05 monty@mashka.mysql.fi +2 -3
    Deleted probably wrong bug fix

  sql/handler.cc
    1.90 03/05/13 11:15:05 monty@mashka.mysql.fi +8 -0
    Added option --skip-isam

  sql/ha_isam.h
    1.21 03/05/13 11:15:05 monty@mashka.mysql.fi +2 -0
    Added option --skip-isam

  sql/ha_isam.cc
    1.22 03/05/13 11:15:05 monty@mashka.mysql.fi +2 -1
    Added option --skip-isam

  mysql-test/t/warnings.test
    1.6.1.1 03/05/13 11:15:05 monty@mashka.mysql.fi +5 -0
    Test if creating handler of not existing table type

  mysql-test/t/variables-master.opt
    1.2 03/05/13 11:15:05 monty@mashka.mysql.fi +1 -1
    Fixed wrong parameter

  mysql-test/t/subselect.test
    1.58.1.5 03/05/13 11:15:05 monty@mashka.mysql.fi +2 -0
    New test

  mysql-test/t/innodb.test
    1.39 03/05/13 11:15:05 monty@mashka.mysql.fi +31 -0
    Added test case for derivied tables

  mysql-test/r/warnings.result
    1.5.1.1 03/05/13 11:15:05 monty@mashka.mysql.fi +8 -0
    Test of warning if MySQL creates table with another handler than specified

  mysql-test/r/variables.result
    1.21.1.3 03/05/13 11:15:05 monty@mashka.mysql.fi +1 -1
    New test

  mysql-test/r/subselect.result
    1.67.3.2 03/05/13 11:15:05 monty@mashka.mysql.fi +2 -0
    New test

  mysql-test/r/innodb.result
    1.60 03/05/13 11:15:05 monty@mashka.mysql.fi +34 -5
    new error message

  mysql-test/r/bdb.result
    1.26 03/05/13 11:15:05 monty@mashka.mysql.fi +1 -1
    new error message

  include/mysqld_error.h
    1.61.4.1 03/05/13 11:15:05 monty@mashka.mysql.fi +1 -1
    New error

  BUILD/compile-pentium-valgrind-max
    1.3 03/05/13 11:15:05 monty@mashka.mysql.fi +1 -1
    Disable isam

  BUILD/compile-pentium-debug-max
    1.10 03/05/13 11:15:05 monty@mashka.mysql.fi +1 -1
    Disable isam

ChangeSet
  1.1346.209.5 03/05/13 10:54:07 monty@mashka.mysql.fi +14 -0
  Safety fix to enable RAID in max binaries
  Better fix for format('nan')
  Fix for HAVING COUNT(DISTINCT...)

  tests/table_types.pl
    1.3 03/05/13 10:54:04 monty@mashka.mysql.fi +14 -21
    Fixed wrong merge

  tests/big_record.pl
    1.5 03/05/13 10:54:04 monty@mashka.mysql.fi +34 -7
    Extend test to abuse packed MyISAM tables

  sql/sql_yacc.yy
    1.145.1.61 03/05/13 10:54:04 monty@mashka.mysql.fi +6 -2
    Fix for HAVING COUNT(DISTINCT...)

  sql/mysqld.cc
    1.297.1.125 03/05/13 10:54:04 monty@mashka.mysql.fi +1 -0
    Give stacktrace on assert()

  sql/item_strfunc.cc
    1.36.1.23 03/05/13 10:54:03 monty@mashka.mysql.fi +8 -6
    Better fix for format('nan')

  scripts/mysql_install_db.sh
    1.35.1.1 03/05/13 10:54:03 monty@mashka.mysql.fi +2 -4
    Create data directories even if --in-rpm is used (for MaxOSX)

  mysys/raid.cc
    1.29 03/05/13 10:54:03 monty@mashka.mysql.fi +2 -2
    Safety fix to enable RAID in max binaries

  mysql-test/t/having.test
    1.4.1.2 03/05/13 10:54:03 monty@mashka.mysql.fi +2 -0
    Added test for count(distinct) in having

  mysql-test/t/func_misc.test
    1.6 03/05/13 10:54:03 monty@mashka.mysql.fi +5 -0
    Added back test for format('nan')

  mysql-test/r/having.result
    1.6.1.2 03/05/13 10:54:03 monty@mashka.mysql.fi +8 -0
    New test

  mysql-test/r/func_misc.result
    1.8 03/05/13 10:54:03 monty@mashka.mysql.fi +3 -0
    Added back test for format('nan')

  myisam/myisamchk.c
    1.80.1.20 03/05/13 10:54:03 monty@mashka.mysql.fi +9 -7
    Better error messages

  myisam/mi_dynrec.c
    1.26 03/05/13 10:54:03 monty@mashka.mysql.fi +8 -13
    Simple code cleanup

  myisam/mi_check.c
    1.86.1.32 03/05/13 10:54:03 monty@mashka.mysql.fi +8 -4
    Better error message

ChangeSet
  1.1346.200.24 03/05/12 17:09:31 lenz@mysql.com +1 -0
   - On Mac OS X, better call mysql_install_db with "-IN-RPM" during 
     the installation to make sure the privilege tables are being
     installed even if the DNS configuration is broken, which seems
     to be quite common (reverse lookups to "hostname" fail).
  
     This should resolve the problem many Mac OS users experience
     ("Fatal error: Can't open privilege tables: Table 'mysql.host' doesn't
     exist") when they try to start MySQL after installing the PKG.

  support-files/MacOSX/postinstall.sh
    1.3 03/05/12 17:09:29 lenz@mysql.com +1 -1
     - On Mac OS X, better call mysql_install_db with "-IN-RPM" during 
       the installation to make sure the privilege tables are being
       installed even if the DNS configuration is broken, which seems
       to be quite common (reverse lookups to "hostname" fail).
    
       This should resolve the problem many Mac OS users experience
       ("Fatal error: Can't open privilege tables: Table 'mysql.host' doesn't
       exist") when they try to start MySQL after installing the PKG.

ChangeSet
  1.1346.200.23 03/05/12 17:33:42 heikki@hundin.mysql.fi +2 -0
  srv0start.c, trx0sys.c:
    Let InnoDB to skip writing of pages from the doublewrite buffer if innodb_force_recovery=6; normally, if the page is corrupt AND the corresponding page in the doublewrite buffer is also corrupt, InnoDB calls exit(1)

  innobase/srv/srv0start.c
    1.37.1.4 03/05/12 17:06:46 heikki@hundin.mysql.fi +4 -1
    Let InnoDB to skip writing of pages from the doublewrite buffer if innodb_force_recovery=6; normally, if the page is corrupt AND the corresponding page in the doublewrite buffer is also corrupt, InnoDB calls exit(1)

  innobase/trx/trx0sys.c
    1.13.1.2 03/05/12 17:06:36 heikki@hundin.mysql.fi +11 -2
    Let InnoDB to skip writing of pages from the doublewrite buffer if innodb_force_recovery=6; normally, if the page is corrupt AND the corresponding page in the doublewrite buffer is also corrupt, InnoDB calls exit(1)

ChangeSet
  1.1524.6.2 03/05/12 15:36:31 guilhem@mysql.com +3 -0
  Task #627 : user variables' names are now case-insensitive :
  @test=@"tEsT"=@`teST` etc. Tests updated.
  Note that the patch to sql_class.cc does not use HASH_CASE_INSENSITIVE as did the one which I sent for review. This is because meanwhile HASH_CASE_INSENSITIVE has disappeared (since cset 1.1504.1.6).

  sql/sql_class.cc
    1.116.1.1 03/05/12 15:36:04 guilhem@mysql.com +3 -3
    Task #627 : user variables' names are now case-insensitive :
    @test=@"tEsT"=@`teST` etc.

  mysql-test/t/variables.test
    1.19 03/05/12 15:36:04 guilhem@mysql.com +14 -2
    updated test

  mysql-test/r/variables.result
    1.27 03/05/12 15:36:04 guilhem@mysql.com +26 -4
    updated test

ChangeSet
  1.1346.200.22 03/05/10 14:52:22 guilhem@mysql.com +1 -0
     MySQL-classic did not pass the test suite rpl_rotate_logs.test anymore because a recent 1.1424.2.17 cset introduced an opt_using_transactions
      which prevented binlogs to be rotated if transactions were not enabled. Fix for this. This bug did not affect releases.

  sql/log.cc
    1.80.1.40 03/05/10 14:52:11 guilhem@mysql.com +17 -15
    MySQL-classic did not pass the test suite rpl_rotate_logs.test anymore because a recent 1.1424.2.17 cset introduced an opt_using_transactions
    which prevented binlogs to be rotated if transactions were not enabled. Fix for this. This bug did not affect releases.

ChangeSet
  1.1346.209.4 03/05/08 01:47:20 monty@mashka.mysql.fi +2 -0
  More tests

  tests/grant.res
    1.7.1.5 03/05/08 01:47:12 monty@mashka.mysql.fi +14 -4
    More tests

  tests/grant.pl
    1.14 03/05/08 01:47:11 monty@mashka.mysql.fi +8 -2
    More tests

ChangeSet
  1.1346.209.3 03/05/08 00:41:46 monty@mashka.mysql.fi +1 -0
  merge with 3.23

  sql/sql_base.cc
    1.117.1.43 03/05/08 00:41:43 monty@mashka.mysql.fi +1 -5
    merge

ChangeSet
  1.676.1.693 03/05/08 00:34:23 monty@mashka.mysql.fi +1 -0
  Better grant test for SELECT *

  sql/sql_base.cc
    1.74.1.33 03/05/08 00:34:22 monty@mashka.mysql.fi +4 -4
    Better grant test for SELECT *

ChangeSet
  1.1346.209.2 03/05/08 00:12:46 monty@mashka.mysql.fi +8 -0
  Merge to get security patch

  sql/sql_parse.cc
    1.218.1.93 03/05/08 00:12:44 monty@mashka.mysql.fi +0 -1
    Merge to get security patch

  sql/sql_base.cc
    1.117.1.42 03/05/08 00:12:44 monty@mashka.mysql.fi +0 -3
    Merge to get security patch

  client/mysqldump.c
    1.65.1.27 03/05/08 00:12:44 monty@mashka.mysql.fi +1 -2
    Merge to get crash fix

  BitKeeper/triggers/post-commit
    1.19.1.7 03/05/08 00:12:44 monty@mashka.mysql.fi +0 -5
    use local file

  tests/grant.res
    1.7.1.4 03/05/08 00:00:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  tests/grant.pl
    1.13 03/05/08 00:00:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_acl.cc
    1.51.1.46 03/05/08 00:00:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.206.1.65 03/05/08 00:00:29 monty@mashka.mysql.fi +0 -1
    auto-union

ChangeSet
  1.676.1.692 03/05/07 23:59:24 monty@mashka.mysql.fi +5 -0
  Security patch to remove wrong error when one had a global update/delete privilige and a database specific SELECT privilege. 

  tests/grant.res
    1.3.1.4 03/05/07 23:59:22 monty@mashka.mysql.fi +15 -0
    Test of security patch

  tests/grant.pl
    1.4.1.4 03/05/07 23:59:22 monty@mashka.mysql.fi +13 -0
    Test of security patch

  sql/sql_parse.cc
    1.120.2.38 03/05/07 23:59:22 monty@mashka.mysql.fi +11 -1
    Security patch

  sql/sql_base.cc
    1.74.1.32 03/05/07 23:59:22 monty@mashka.mysql.fi +4 -5
    Security patch

  sql/sql_acl.cc
    1.27.1.15 03/05/07 23:59:22 monty@mashka.mysql.fi +6 -3
    Security patch

ChangeSet
  1.1346.209.1 03/05/07 23:15:46 monty@mashka.mysql.fi +1 -0
  Updated comment

  sql/sql_parse.cc
    1.218.1.92 03/05/07 23:15:37 monty@mashka.mysql.fi +2 -1
    Updated comment

ChangeSet
  1.1346.200.21 03/05/07 19:13:56 heikki@hundin.mysql.fi +1 -0
  my_base.h:
    Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value

  include/my_base.h
    1.30.1.9 03/05/07 19:13:48 heikki@hundin.mysql.fi +1 -0
    Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value

ChangeSet
  1.1346.200.20 03/05/07 19:01:45 heikki@hundin.mysql.fi +2 -0
  sql_select.cc, opt_sum.cc:
    Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value

  sql/sql_select.cc
    1.152.1.81 03/05/07 19:01:36 heikki@hundin.mysql.fi +9 -0
    Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value

  sql/opt_sum.cc
    1.16.1.12 03/05/07 19:01:36 heikki@hundin.mysql.fi +37 -13
    Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value

ChangeSet
  1.1346.200.19 03/05/06 22:33:08 lenz@mysql.com +2 -0
   - added MySQL-shared-compat.spec(.sh) to the distribution. This spec file
     can be used to build a compatibility package that includes the shared
     libraries of MySQL 3.23.xx and MySQL 4.0.xx for backwards compatibility
     with dynamically linked applications. It simply repackages the two
     MySQL-shared RPMs, so these need to be created or downloaded separately.

  support-files/MySQL-shared-compat.spec.sh
    1.1 03/05/06 22:33:05 lenz@mysql.com +72 -0

  support-files/MySQL-shared-compat.spec.sh
    1.0 03/05/06 22:33:05 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.0-build/support-files/MySQL-shared-compat.spec.sh

  support-files/Makefile.am
    1.18.1.1 03/05/06 22:33:05 lenz@mysql.com +6 -3
     - added MySQL-shared-compat.spec(.sh) to the distribution

ChangeSet
  1.1524.6.1 03/05/06 21:09:20 gluh@gluh.mysql.r18.ru +7 -0
  Expand the mysql.proc table

  sql/sql_yacc.yy
    1.229.1.1 03/05/06 21:09:08 gluh@gluh.mysql.r18.ru +2 -2
    Expand the mysql.proc table

  sql/sp_head.h
    1.15 03/05/06 21:09:08 gluh@gluh.mysql.r18.ru +21 -1
    Expand the mysql.proc table

  sql/sp_head.cc
    1.28.1.1 03/05/06 21:09:08 gluh@gluh.mysql.r18.ru +17 -3
    Expand the mysql.proc table

  sql/sp.h
    1.6 03/05/06 21:09:08 gluh@gluh.mysql.r18.ru +4 -2
    Expand the mysql.proc table

  sql/sp.cc
    1.14.1.1 03/05/06 21:09:08 gluh@gluh.mysql.r18.ru +59 -5
    Expand the mysql.proc table

  scripts/mysql_install_db.sh
    1.43 03/05/06 21:09:08 gluh@gluh.mysql.r18.ru +5 -0
    Expand the mysql.proc table

  mysql-test/install_test_db.sh
    1.28 03/05/06 21:09:08 gluh@gluh.mysql.r18.ru +5 -0
    Expand the mysql.proc table

ChangeSet
  1.1524.2.5 03/05/06 06:21:40 monty@mashka.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mashka.mysql.fi:/home/my/mysql-4.1

  sql/item.h
    1.56.1.13 03/05/06 06:21:37 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1504.33.1 03/05/06 06:20:16 monty@mashka.mysql.fi +2 -0
  Varbinary should be string as default

  sql/item.h
    1.56.4.1 03/05/06 06:20:13 monty@mashka.mysql.fi +1 -1
    Varbinary should be string as default

  scripts/make_win_src_distribution.sh
    1.4.1.1 03/05/06 06:20:13 monty@mashka.mysql.fi +6 -0
    make sql_yacc.cpp portable

ChangeSet
  1.1524.2.4 03/05/06 01:42:33 monty@narttu.mysql.fi +5 -0
  merge

  sql/item_strfunc.cc
    1.106 03/05/06 01:42:32 monty@narttu.mysql.fi +0 -1
    merge

  sql/unireg.h
    1.22 03/05/06 01:38:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.4.2 03/05/06 01:38:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_sum.cc
    1.73 03/05/06 01:38:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item.cc
    1.58.1.15 03/05/06 01:38:58 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1524.2.3 03/05/06 01:38:38 monty@narttu.mysql.fi +21 -0
  Removed compiler warnings
  Fixed memory leak in new filesort code
  Optimzed sub selects to use keys with outer references.
  Increased max tables in join to 62

  sql/unireg.h
    1.20.1.1 03/05/06 01:38:36 monty@narttu.mysql.fi +2 -1
    Sub select optimization

  sql/sql_select.cc
    1.216.5.1 03/05/06 01:38:36 monty@narttu.mysql.fi +16 -8
    subselect optimization
    Call filesort_free_buffers() to free memory from filesort

  sql/records.cc
    1.19.2.2 03/05/06 01:38:36 monty@narttu.mysql.fi +1 -13
    Moved free of filesort buffers to own function

  sql/mysql_priv.h
    1.186.1.6 03/05/06 01:38:36 monty@narttu.mysql.fi +2 -1
    Made table_map ulonglong to allow 62 tables in join

  sql/log.cc
    1.108.1.3 03/05/06 01:38:36 monty@narttu.mysql.fi +1 -0
    Removed compiler warning

  sql/item_sum.h
    1.39 03/05/06 01:38:36 monty@narttu.mysql.fi +15 -16
    Simple code cleanup

  sql/item_sum.cc
    1.72 03/05/06 01:38:36 monty@narttu.mysql.fi +24 -30
    Removed compiler warnings

  sql/item_subselect.cc
    1.60.1.1 03/05/06 01:38:36 monty@narttu.mysql.fi +1 -1
    Sub select optimization

  sql/item_cmpfunc.cc
    1.87 03/05/06 01:38:36 monty@narttu.mysql.fi +2 -2
    Sub select optimization

  sql/item.cc
    1.58.8.1 03/05/06 01:38:36 monty@narttu.mysql.fi +1 -1
    Sub select optimization

  sql/filesort.cc
    1.70.1.3 03/05/06 01:38:36 monty@narttu.mysql.fi +16 -0
    Added function to free buffers allocated by filesort

  mysql-test/t/subselect.test
    1.58.1.4 03/05/06 01:38:36 monty@narttu.mysql.fi +9 -0
    new test

  mysql-test/t/join.test
    1.18 03/05/06 01:38:36 monty@narttu.mysql.fi +1 -1
    Updated test

  mysql-test/r/subselect.result
    1.67.3.1 03/05/06 01:38:36 monty@narttu.mysql.fi +11 -0
    new test

  myisam/myisamlog.c
    1.20 03/05/06 01:38:36 monty@narttu.mysql.fi +0 -6
    Remove 'rnd' variable to make usage repeatable

  myisam/myisamdef.h
    1.59.1.1 03/05/06 01:38:36 monty@narttu.mysql.fi +0 -1
    Remove 'rnd' variable to make usage repeatable

  myisam/mi_write.c
    1.34 03/05/06 01:38:36 monty@narttu.mysql.fi +2 -1
    Remove 'rnd' variable to make usage repeatable

  myisam/mi_open.c
    1.64 03/05/06 01:38:36 monty@narttu.mysql.fi +0 -4
    Remove 'rnd' variable to make usage repeatable

  myisam/mi_delete.c
    1.20 03/05/06 01:38:36 monty@narttu.mysql.fi +1 -1
    Remove 'rnd' variable to make usage repeatable

  myisam/mi_check.c
    1.105.1.1 03/05/06 01:38:36 monty@narttu.mysql.fi +8 -4
    Remove compiler warnings

  client/Makefile.am
    1.31 03/05/06 01:38:36 monty@narttu.mysql.fi +0 -1
    Remve test programs

ChangeSet
  1.1524.1.5 03/05/05 14:54:37 vva@eagle.mysql.r18.ru +31 -0
  made lex a pointer in THD

  sql/sql_yacc.yy
    1.230 03/05/05 14:54:21 vva@eagle.mysql.r18.ru +13 -13
    made lex a pointer in THD

  sql/sql_update.cc
    1.89 03/05/05 14:54:21 vva@eagle.mysql.r18.ru +15 -15
    made lex a pointer in THD

  sql/sql_union.cc
    1.75 03/05/05 14:54:21 vva@eagle.mysql.r18.ru +14 -14
    made lex a pointer in THD

  sql/sql_table.cc
    1.162 03/05/05 14:54:21 vva@eagle.mysql.r18.ru +3 -3
    made lex a pointer in THD

  sql/sql_select.cc
    1.223 03/05/05 14:54:21 vva@eagle.mysql.r18.ru +8 -8
    made lex a pointer in THD

  sql/sql_repl.cc
    1.105 03/05/05 14:54:21 vva@eagle.mysql.r18.ru +8 -8
    made lex a pointer in THD

  sql/sql_prepare.cc
    1.39 03/05/05 14:54:21 vva@eagle.mysql.r18.ru +17 -17
    made lex a pointer in THD

  sql/sql_parse.cc
    1.288 03/05/05 14:54:21 vva@eagle.mysql.r18.ru +14 -14
    made lex a pointer in THD

  sql/sql_lex.h
    1.114 03/05/05 14:54:21 vva@eagle.mysql.r18.ru +1 -1
    made lex a pointer in THD

  sql/sql_lex.cc
    1.76.1.5 03/05/05 14:54:21 vva@eagle.mysql.r18.ru +2 -2
    made lex a pointer in THD

  sql/sql_insert.cc
    1.89 03/05/05 14:54:21 vva@eagle.mysql.r18.ru +4 -4
    made lex a pointer in THD

  sql/sql_error.cc
    1.15.1.1 03/05/05 14:54:20 vva@eagle.mysql.r18.ru +1 -1
    made lex a pointer in THD

  sql/sql_delete.cc
    1.104 03/05/05 14:54:20 vva@eagle.mysql.r18.ru +12 -12
    made lex a pointer in THD

  sql/sql_class.h
    1.157 03/05/05 14:54:20 vva@eagle.mysql.r18.ru +2 -1
    made lex a pointer in THD

  sql/sql_class.cc
    1.117 03/05/05 14:54:20 vva@eagle.mysql.r18.ru +2 -1
    made lex a pointer in THD

  sql/sql_cache.cc
    1.48 03/05/05 14:54:20 vva@eagle.mysql.r18.ru +5 -5
    made lex a pointer in THD

  sql/sql_acl.cc
    1.76 03/05/05 14:54:20 vva@eagle.mysql.r18.ru +21 -21
    made lex a pointer in THD

  sql/sp_head.cc
    1.29 03/05/05 14:54:20 vva@eagle.mysql.r18.ru +30 -30
    made lex a pointer in THD

  sql/sp.cc
    1.15 03/05/05 14:54:20 vva@eagle.mysql.r18.ru +1 -1
    made lex a pointer in THD

  sql/set_var.cc
    1.38 03/05/05 14:54:20 vva@eagle.mysql.r18.ru +1 -1
    made lex a pointer in THD

  sql/repl_failsafe.cc
    1.27.1.1 03/05/05 14:54:20 vva@eagle.mysql.r18.ru +1 -1
    made lex a pointer in THD

  sql/mysqld.cc
    1.361 03/05/05 14:54:20 vva@eagle.mysql.r18.ru +2 -2
    made lex a pointer in THD

  sql/mysql_priv.h
    1.194 03/05/05 14:54:20 vva@eagle.mysql.r18.ru +4 -4
    made lex a pointer in THD

  sql/item_sum.cc
    1.70.2.1 03/05/05 14:54:20 vva@eagle.mysql.r18.ru +1 -1
    made lex a pointer in THD

  sql/item_subselect.cc
    1.61 03/05/05 14:54:20 vva@eagle.mysql.r18.ru +8 -8
    made lex a pointer in THD

  sql/item_func.cc
    1.128 03/05/05 14:54:20 vva@eagle.mysql.r18.ru +3 -3
    made lex a pointer in THD

  sql/item_create.cc
    1.34 03/05/05 14:54:20 vva@eagle.mysql.r18.ru +7 -7
    made lex a pointer in THD

  sql/item.cc
    1.65 03/05/05 14:54:20 vva@eagle.mysql.r18.ru +12 -12
    made lex a pointer in THD

  sql/ha_myisam.cc
    1.119 03/05/05 14:54:20 vva@eagle.mysql.r18.ru +2 -2
    made lex a pointer in THD

  sql/ha_innodb.cc
    1.91 03/05/05 14:54:20 vva@eagle.mysql.r18.ru +4 -4
    made lex a pointer in THD

  sql/filesort.cc
    1.74 03/05/05 14:54:20 vva@eagle.mysql.r18.ru +1 -1
    made lex a pointer in THD

ChangeSet
  1.1346.203.2 03/05/05 14:52:39 monty@narttu.mysql.fi +4 -0
  Fixed that reading a DATE string of 000000 is interpreted as 0000-00-00 instead of 2000-00-00

  mysql-test/t/loaddata.test
    1.1 03/05/05 14:52:38 monty@narttu.mysql.fi +11 -0

  mysql-test/std_data/loaddata1.dat
    1.1 03/05/05 14:52:38 monty@narttu.mysql.fi +3 -0

  mysql-test/r/loaddata.result
    1.1 03/05/05 14:52:38 monty@narttu.mysql.fi +11 -0

  sql/time.cc
    1.19.1.5 03/05/05 14:52:38 monty@narttu.mysql.fi +2 -140
    Removed not used code
    Fixed that reading a DATE string of 000000 is interpreted as 0000-00-00 instead of 2000-00-00

  mysql-test/t/loaddata.test
    1.0 03/05/05 14:52:38 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/t/loaddata.test

  mysql-test/std_data/loaddata1.dat
    1.0 03/05/05 14:52:38 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/std_data/loaddata1.dat

  mysql-test/r/loaddata.result
    1.0 03/05/05 14:52:38 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/r/loaddata.result

ChangeSet
  1.1346.200.17 03/05/05 10:54:56 heikki@hundin.mysql.fi +2 -0
  buf0lru.c, buf0flu.c:
    Better warning message if more than 4 / 5 of the buffer pool is consumed by locks of adaptive hash index

  innobase/buf/buf0lru.c
    1.9.1.1 03/05/05 10:54:45 heikki@hundin.mysql.fi +6 -3
    Better warning message if more than 4 / 5 of the buffer pool is consumed by locks of adaptive hash index

  innobase/buf/buf0flu.c
    1.14.1.3 03/05/05 10:54:45 heikki@hundin.mysql.fi +2 -1
    Better warning message if more than 4 / 5 of the buffer pool is consumed by locks of adaptive hash index

ChangeSet
  1.1346.200.16 03/05/05 00:30:18 serg@serg.mylan +2 -0
  Merge bk-internal:/home/bk/mysql-4.0/
  into serg.mylan:/usr/home/serg/Abk/mysql-4.0

  sql/set_var.cc
    1.12.1.16 03/05/05 00:30:15 serg@serg.mylan +0 -0
    Auto merged

  sql/mysqld.cc
    1.297.1.124 03/05/05 00:30:15 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1346.207.2 03/05/04 23:24:23 heikki@hundin.mysql.fi +4 -0
  row0ins.c, dict0dict.c, dict0dict.h, srv0srv.c:
    Let SHOW INNODB STATUS print detailed info of the latest unique key violation, note that REPLACE and INSERT IGNORE mask the error from the user

  innobase/row/row0ins.c
    1.22 03/05/04 23:22:44 heikki@hundin.mysql.fi +48 -5
    Let SHOW INNODB STATUS print detailed info of the latest unique key violation, note that REPLACE and INSERT IGNORE mask the error from the user

  innobase/dict/dict0dict.c
    1.26.1.2 03/05/04 23:22:22 heikki@hundin.mysql.fi +7 -3
    Let SHOW INNODB STATUS print detailed info of the latest unique key violation, note that REPLACE and INSERT IGNORE mask the error from the user

  innobase/include/dict0dict.h
    1.15 03/05/04 23:22:01 heikki@hundin.mysql.fi +4 -3
    Let SHOW INNODB STATUS print detailed info of the latest unique key violation, note that REPLACE and INSERT IGNORE mask the error from the user

  innobase/srv/srv0srv.c
    1.35.1.11 03/05/04 23:21:50 heikki@hundin.mysql.fi +14 -1
    Let SHOW INNODB STATUS print detailed info of the latest unique key violation, note that REPLACE and INSERT IGNORE mask the error from the user

ChangeSet
  1.1346.200.13 03/05/04 21:35:20 peter@mysql.com +1 -0
  Minor fix to previous code

  sql/mysql_priv.h
    1.150.1.41 03/05/04 21:35:17 peter@mysql.com +3 -0
    Add ifdef to allow compilation without Innodb 

ChangeSet
  1.1346.208.2 03/05/04 18:43:37 serg@serg.mylan +5 -0
  parallel-repair available in mysqld

  sql/sql_class.h
    1.111.1.35 03/05/04 18:43:35 serg@serg.mylan +1 -0
    parallel-repair available in mysqld

  sql/set_var.cc
    1.12.4.1 03/05/04 18:43:35 serg@serg.mylan +6 -3
    parallel-repair available in mysqld

  sql/mysqld.cc
    1.297.31.1 03/05/04 18:43:35 serg@serg.mylan +7 -2
    parallel-repair available in mysqld

  sql/ha_myisam.cc
    1.92.1.32 03/05/04 18:43:35 serg@serg.mylan +17 -3
    parallel-repair available in mysqld

  myisam/mi_check.c
    1.86.1.31 03/05/04 18:43:35 serg@serg.mylan +11 -1
    parallel-repair available in mysqld

ChangeSet
  1.1346.208.1 03/05/04 18:43:07 serg@serg.mylan +3 -0
  count_bits() moved to mysys/

  sql/item_func.cc
    1.60.1.32 03/05/04 18:43:05 serg@serg.mylan +2 -43
    count_bits() moved to mysys/

  mysys/my_bit.c
    1.3 03/05/04 18:43:05 serg@serg.mylan +42 -0
    count_bits() moved to mysys/

  include/my_sys.h
    1.75.1.21 03/05/04 18:43:05 serg@serg.mylan +1 -0
    count_bits() moved to mysys/

ChangeSet
  1.1346.207.1 03/05/04 15:42:47 heikki@hundin.mysql.fi +1 -0
  os0file.c:
    Print progress information if at startup InnoDB creates and writes bigger than 100 MB data file or log file

  innobase/os/os0file.c
    1.44.1.6 03/05/04 15:42:38 heikki@hundin.mysql.fi +20 -0
    Print progress information if at startup InnoDB creates and writes bigger than 100 MB data file or log file

ChangeSet
  1.1346.200.11 03/05/04 15:14:33 heikki@hundin.mysql.fi +1 -0
  srv0srv.c:
    Do not let the main thread sleep the 1 second if we had to do a bug pool flush batch trying to establish srv_max_buf_pool_modified_pct

  innobase/srv/srv0srv.c
    1.35.1.10 03/05/04 15:14:17 heikki@hundin.mysql.fi +17 -1
    Do not let the main thread sleep the 1 second if we had to do a bug pool flush batch trying to establish srv_max_buf_pool_modified_pct

ChangeSet
  1.1346.206.1 03/05/04 14:41:21 peter@mysql.com +3 -0
  Added innodb_max_dirty_pages_pct parameter to limit amount 
      of dirty pages in the buffer pool (can be changed online)

  sql/set_var.cc
    1.12.1.15 03/05/04 14:39:44 peter@mysql.com +9 -0
    Added new variable handling 

  sql/mysqld.cc
    1.297.1.123 03/05/04 14:39:44 peter@mysql.com +5 -0
    Added new option

  sql/mysql_priv.h
    1.150.1.40 03/05/04 14:39:44 peter@mysql.com +1 -0
    Added innodb_max_dirty_pages_pct parameter to limit amount 
    of dirty pages in the buffer pool (can be changed online)

ChangeSet
  1.1346.205.1 03/05/04 11:00:45 serg@serg.mylan +1 -0
  result updated

  mysql-test/r/delete.result
    1.6.1.3 03/05/04 11:00:43 serg@serg.mylan +11 -0
    result updated

ChangeSet
  1.1346.200.9 03/05/03 19:46:03 heikki@hundin.mysql.fi +1 -0
  srv0srv.c:
    Clean up the working of the main thread; add a tunable parameter srv_max_buf_pool_modified_pct which can be used to make the flush phase in shutdown quicker

  innobase/srv/srv0srv.c
    1.35.1.9 03/05/03 19:45:39 heikki@hundin.mysql.fi +1 -1
    Clean up the working of the main thread; add a tunable parameter srv_max_buf_pool_modified_pct which can be used to make the flush phase in shutdown quicker

ChangeSet
  1.1346.200.8 03/05/03 19:44:46 heikki@hundin.mysql.fi +4 -0
  buf0buf.c, srv0srv.h, buf0buf.h, srv0srv.c:
    Clean up the working of the main thread; add a tunable parameter srv_max_buf_pool_modified_pct which can be used to make the flush phase in shutdown quicker

  innobase/buf/buf0buf.c
    1.17.1.4 03/05/03 19:41:10 heikki@hundin.mysql.fi +22 -0
    Clean up the working of the main thread; add a tunable parameter srv_max_buf_pool_modified_pct which can be used to make the flush phase in shutdown quicker

  innobase/include/srv0srv.h
    1.21.1.1 03/05/03 19:40:51 heikki@hundin.mysql.fi +3 -0
    Clean up the working of the main thread; add a tunable parameter srv_max_buf_pool_modified_pct which can be used to make the flush phase in shutdown quicker

  innobase/include/buf0buf.h
    1.12.1.1 03/05/03 19:40:50 heikki@hundin.mysql.fi +7 -0
    Clean up the working of the main thread; add a tunable parameter srv_max_buf_pool_modified_pct which can be used to make the flush phase in shutdown quicker

  innobase/srv/srv0srv.c
    1.35.1.8 03/05/03 19:40:30 heikki@hundin.mysql.fi +86 -28
    Clean up the working of the main thread; add a tunable parameter srv_max_buf_pool_modified_pct which can be used to make the flush phase in shutdown quicker

ChangeSet
  1.1346.204.1 03/05/03 18:08:11 serg@serg.mylan +2 -0
  "delete from table where const" bug fixed

  sql/sql_delete.cc
    1.74.1.20 03/05/03 18:08:08 serg@serg.mylan +1 -1
    "delete from table where const" bug fixed

  mysql-test/t/delete.test
    1.7.1.3 03/05/03 18:08:08 serg@serg.mylan +6 -0
    "delete from table where const" bug fixed

ChangeSet
  1.1346.200.6 03/05/03 16:16:52 lenz@mysql.com +1 -0
   - applied patch from Tim Bunce (new --addtodest option that adds copied
     files into an already existing directory)

  scripts/mysqlhotcopy.sh
    1.31 03/05/03 16:16:50 lenz@mysql.com +27 -9
     - applied patch from Tim Bunce (new --addtodest option that adds copied
       files into an already existing directory)

ChangeSet
  1.1346.203.1 03/05/03 16:22:56 monty@narttu.mysql.fi +4 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.0
  into narttu.mysql.fi:/my/mysql-4.0

  sql/sql_update.cc
    1.54.1.30 03/05/03 16:22:54 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_base.cc
    1.117.1.41 03/05/03 16:22:54 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.28.1.15 03/05/03 16:22:54 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.40.1.25 03/05/03 16:22:53 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.202.1 03/05/03 16:21:43 monty@narttu.mysql.fi +5 -0
  Fix problem where key_read was not cleaned up properly, which caused assert in innodb test.

  sql/sql_update.cc
    1.54.5.2 03/05/03 16:21:42 monty@narttu.mysql.fi +14 -11
    Fix problem where key_read was not cleaned up properly, which caused assert in innodb test.

  sql/sql_base.cc
    1.117.7.1 03/05/03 16:21:42 monty@narttu.mysql.fi +3 -2
    Safety assert

  sql/opt_sum.cc
    1.16.1.11 03/05/03 16:21:42 monty@narttu.mysql.fi +10 -4
    Safety fix

  mysql-test/t/innodb.test
    1.28.2.3 03/05/03 16:21:42 monty@narttu.mysql.fi +2 -2
    Changed tests to make them repeatable.

  mysql-test/r/innodb.result
    1.40.4.4 03/05/03 16:21:42 monty@narttu.mysql.fi +23 -11
    Changed tests to make them repeatable.

ChangeSet
  1.1346.200.4 03/05/03 15:21:39 serg@serg.mylan +2 -0
  test case added

  mysql-test/t/repair.test
    1.1.1.2 03/05/03 15:21:37 serg@serg.mylan +5 -0
    test case added

  mysql-test/r/repair.result
    1.3 03/05/03 15:21:37 serg@serg.mylan +3 -0
    test case added

ChangeSet
  1.1346.201.1 03/05/03 14:48:51 serg@serg.mylan +1 -0
  mising reset_tree() in ft_reinit_search() added

  myisam/ft_boolean_search.c
    1.47.1.8 03/05/03 14:48:49 serg@serg.mylan +2 -2
    mising reset_tree() in ft_reinit_search() added

ChangeSet
  1.1524.5.1 03/05/03 14:00:59 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/item_strfunc.cc
    1.104.1.1 03/05/03 14:00:52 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1522.1.1 03/05/03 13:59:41 Sinisa@sinisa.nasamreza.org +1 -0
  removing unnecessary patch.

  sql/item_strfunc.cc
    1.103.1.1 03/05/03 13:59:34 Sinisa@sinisa.nasamreza.org +1 -2
    removing unnecessary patch.

ChangeSet
  1.1346.200.2 03/05/03 02:29:40 heikki@hundin.mysql.fi +13 -0
  Many files:
    Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released

  innobase/row/row0mysql.c
    1.39.1.5 03/05/03 02:27:48 heikki@hundin.mysql.fi +1 -1
    Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released

  innobase/srv/srv0srv.c
    1.35.1.7 03/05/03 02:27:39 heikki@hundin.mysql.fi +7 -10
    Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released

  innobase/log/log0log.c
    1.20.1.2 03/05/03 02:27:31 heikki@hundin.mysql.fi +73 -85
    Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released

  innobase/trx/trx0trx.c
    1.20.1.4 03/05/03 02:27:23 heikki@hundin.mysql.fi +44 -4
    Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released

  innobase/buf/buf0flu.c
    1.14.1.2 03/05/03 02:27:04 heikki@hundin.mysql.fi +1 -1
    Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released

  innobase/os/os0file.c
    1.44.1.5 03/05/03 02:26:52 heikki@hundin.mysql.fi +4 -3
    Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released

  innobase/include/trx0trx.h
    1.25 03/05/03 02:26:44 heikki@hundin.mysql.fi +14 -0
    Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released

  innobase/include/log0log.h
    1.8 03/05/03 02:26:43 heikki@hundin.mysql.fi +35 -30
    Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released

  sql/ha_innodb.h
    1.48.2.7 03/05/03 02:26:26 heikki@hundin.mysql.fi +2 -0
    Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released

  sql/ha_innodb.cc
    1.73.1.95 03/05/03 02:26:23 heikki@hundin.mysql.fi +46 -18
    Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released

  sql/handler.h
    1.71.1.13 03/05/03 02:26:17 heikki@hundin.mysql.fi +1 -0
    Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released

  sql/handler.cc
    1.82.1.15 03/05/03 02:26:15 heikki@hundin.mysql.fi +29 -1
    Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released

  sql/log.cc
    1.80.1.39 03/05/03 02:26:09 heikki@hundin.mysql.fi +19 -1
    Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released

ChangeSet
  1.1524.3.2 03/05/03 01:16:56 serg@serg.mylan +19 -0
  INSERT ... UPDATE ... VALUES()

  sql/unireg.h
    1.21 03/05/03 01:16:52 serg@serg.mylan +6 -6
    INSERT ... UPDATE ... VALUES()

  sql/table.h
    1.48 03/05/03 01:16:52 serg@serg.mylan +4 -3
    INSERT ... UPDATE ... VALUES()

  sql/table.cc
    1.78 03/05/03 01:16:52 serg@serg.mylan +4 -2
    INSERT ... UPDATE ... VALUES()

  sql/sql_yacc.yy
    1.203.28.6 03/05/03 01:16:52 serg@serg.mylan +5 -3
    INSERT ... UPDATE ... VALUES()

  sql/sql_update.cc
    1.83.3.1 03/05/03 01:16:52 serg@serg.mylan +4 -4
    INSERT ... UPDATE ... VALUES()

  sql/sql_udf.cc
    1.30 03/05/03 01:16:52 serg@serg.mylan +1 -1
    INSERT ... UPDATE ... VALUES()

  sql/sql_table.cc
    1.157.4.1 03/05/03 01:16:52 serg@serg.mylan +1 -1
    INSERT ... UPDATE ... VALUES()

  sql/sql_show.cc
    1.122.1.2 03/05/03 01:16:52 serg@serg.mylan +3 -3
    INSERT ... UPDATE ... VALUES()

  sql/sql_select.cc
    1.216.4.1 03/05/03 01:16:52 serg@serg.mylan +9 -9
    INSERT ... UPDATE ... VALUES()

  sql/sql_load.cc
    1.46.4.1 03/05/03 01:16:52 serg@serg.mylan +1 -1
    INSERT ... UPDATE ... VALUES()

  sql/sql_insert.cc
    1.86.3.1 03/05/03 01:16:52 serg@serg.mylan +20 -8
    INSERT ... UPDATE ... VALUES()

  sql/sql_acl.cc
    1.74.1.1 03/05/03 01:16:52 serg@serg.mylan +13 -13
    INSERT ... UPDATE ... VALUES()

  sql/item_sum.cc
    1.70.1.1 03/05/03 01:16:52 serg@serg.mylan +2 -2
    INSERT ... UPDATE ... VALUES()

  sql/item.h
    1.56.1.12 03/05/03 01:16:52 serg@serg.mylan +24 -5
    INSERT ... UPDATE ... VALUES()

  sql/item.cc
    1.58.1.14 03/05/03 01:16:52 serg@serg.mylan +55 -2
    INSERT ... UPDATE ... VALUES()

  sql/field.h
    1.65.1.1 03/05/03 01:16:52 serg@serg.mylan +2 -2
    INSERT ... UPDATE ... VALUES()

  sql/field.cc
    1.98.1.1 03/05/03 01:16:51 serg@serg.mylan +2 -2
    INSERT ... UPDATE ... VALUES()

  mysql-test/t/insert_update.test
    1.5 03/05/03 01:16:51 serg@serg.mylan +2 -0
    INSERT ... UPDATE ... VALUES()

  mysql-test/r/insert_update.result
    1.4 03/05/03 01:16:51 serg@serg.mylan +8 -0
    INSERT ... UPDATE ... VALUES()

ChangeSet
  1.1346.200.1 03/05/02 22:12:15 serg@serg.mylan +1 -0
  avoid sigsegv when open_ltable() fails in REPAIR ... USE_FRM

  sql/sql_table.cc
    1.112.1.44 03/05/02 22:12:13 serg@serg.mylan +5 -0
    avoid sigsegv when open_ltable() fails in REPAIR ... USE_FRM

ChangeSet
  1.1524.4.1 03/05/02 21:07:41 hf@deer.mysql.r18.ru +7 -0
  SCRUM
  common parts of libmysql.c and sql/mini_client.cc moved to sql-common/client.c
  names of functions now are same in both cases

  sql-common/client.c
    1.1 03/05/02 21:07:36 hf@deer.mysql.r18.ru +2299 -0

  sql/slave.cc
    1.188.1.4 03/05/02 21:07:36 hf@deer.mysql.r18.ru +28 -28
    _mc prefixes removed

  sql/repl_failsafe.cc
    1.28 03/05/02 21:07:36 hf@deer.mysql.r18.ru +34 -33
    mc_ prefixes removed

  sql/mini_client.h
    1.13 03/05/02 21:07:36 hf@deer.mysql.r18.ru +26 -24
    mc_ prefixes were deleted

  sql/mini_client.cc
    1.63 03/05/02 21:07:36 hf@deer.mysql.r18.ru +6 -1329
    most of the file moved to sql-common/client.c

  sql-common/client.c
    1.0 03/05/02 21:07:36 hf@deer.mysql.r18.ru +0 -0
    BitKeeper file /home/hf/work/mysql-4.1.emb_bind/sql-common/client.c

  libmysqld/Makefile.am
    1.29.1.2 03/05/02 21:07:36 hf@deer.mysql.r18.ru +4 -4
    superfluous files removed

  libmysql/libmysql.c
    1.156.1.1 03/05/02 21:07:36 hf@deer.mysql.r18.ru +3 -2143
    many parts moved to sql-common/client.c

ChangeSet
  1.1524.2.2 03/05/02 15:22:04 monty@narttu.mysql.fi +3 -0
  Merge

  sql/item_strfunc.cc
    1.105 03/05/02 15:22:03 monty@narttu.mysql.fi +0 -2
    Merge + removed wrong bug fix (?)

  client/Makefile.am
    1.30 03/05/02 15:22:03 monty@narttu.mysql.fi +1 -1
    Merge

  tests/ssl_test.c
    1.8 03/05/02 15:16:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  tests/ssl_test.c
    1.6.1.2 03/05/02 15:16:57 monty@narttu.mysql.fi +0 -0
    Merge rename: client/ssl_test.c -> tests/ssl_test.c

ChangeSet
  1.1346.1.110 03/05/01 20:01:39 Sinisa@sinisa.nasamreza.org +1 -0
  A fix for the crashing bug in mysql client program

  client/mysql.cc
    1.93.1.43 03/05/01 20:01:34 Sinisa@sinisa.nasamreza.org +2 -0
    A fix for the crashing bug in mysql client program

ChangeSet
  1.1528 03/04/30 09:42:08 venu@myvenu.com +1 -0
  make_win_src_distribution.sh:
    Fix for bdb/cxx as they contain .cpp files directly ( for 4.0 to go )

  scripts/make_win_src_distribution.sh
    1.5 03/04/30 09:41:17 venu@myvenu.com +1 -1
    Fix for bdb/cxx as they contain .cpp files directly ( for 4.0 to go )

ChangeSet
  1.1346.1.109 03/04/30 17:39:23 Sinisa@sinisa.nasamreza.org +2 -0
  removing architecture dependent test

  mysql-test/t/func_misc.test
    1.5 03/04/30 17:39:20 Sinisa@sinisa.nasamreza.org +0 -1
    removing architecture dependent test

  mysql-test/r/func_misc.result
    1.7 03/04/30 17:39:20 Sinisa@sinisa.nasamreza.org +0 -3
    removing architecture dependent test

ChangeSet
  1.1524.3.1 03/04/30 14:15:24 serg@serg.mylan +2 -0
  make compilation to work w/o InnoDB as well 

  BitKeeper/etc/logging_ok
    1.233.1.13 03/04/30 14:15:24 serg@serg.mylan +1 -0
    Logging to logging@openlogging.org accepted

  sql/handler.cc
    1.89 03/04/30 14:15:18 serg@serg.mylan +3 -1
    make compilation to work w/o InnoDB as well 

ChangeSet
  1.1346.1.108 03/04/30 14:27:51 Sinisa@sinisa.nasamreza.org +2 -0
  Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
  into sinisa.nasamreza.org:/mnt/work/mysql-4.0

  sql/sql_parse.cc
    1.218.1.91 03/04/30 14:27:47 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_acl.cc
    1.51.1.45 03/04/30 14:27:47 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1524.2.1 03/04/30 13:10:53 pem@mysql.com +1 -0
  Fixed bug in Item_func_compress::val_str() on MacOS X (bigendian); the length
  was not properly stored in the buffer.

  sql/item_strfunc.cc
    1.104 03/04/30 13:10:51 pem@mysql.com +3 -2
    Made it work on MacOS X (bigendian) where int4store is a macro that expands
    the arguments several times.
    It's possible this should be done differently, like not side-stepping the
    String methods the way it's done here, or fixing String::c_ptr(), but this
    simple fix was the quickest way.

ChangeSet
  1.1346.199.1 03/04/30 12:32:43 serg@serg.mylan +2 -0
  more #ifdef THREAD added

  mysys/my_semaphore.c
    1.3 03/04/30 12:32:39 serg@serg.mylan +2 -2
    more #ifdef THREAD added

  include/my_semaphore.h
    1.7 03/04/30 12:32:39 serg@serg.mylan +5 -0
    more #ifdef THREAD added

ChangeSet
  1.1346.168.73 03/04/30 11:30:45 lenz@mysql.com +1 -0
   - fixed Max RPM package description (removed RAID)

  support-files/mysql.spec.sh
    1.61.1.3 03/04/30 11:30:43 lenz@mysql.com +2 -2
     - fixed Max RPM package description (removed RAID)

ChangeSet
  1.1346.168.72 03/04/30 11:27:13 lenz@mysql.com +1 -0
   - disabled MyISAM RAID (--with-raid) for the 4.0 Max binaries for now
     (several users reported crashes, even when not using RAID) (see bug #346)

  support-files/mysql.spec.sh
    1.61.1.2 03/04/30 11:27:10 lenz@mysql.com +6 -2
     - disabled MyISAM RAID (--with-raid) for the 4.0 Max binaries for now
       (several users reported crashes, even when not using RAID) (see bug #346)

ChangeSet
  1.1346.168.71 03/04/30 10:15:09 monty@narttu.mysql.fi +7 -0
  Fix reference to not initialized memory
  Changed handing of priv_host to fix bug in FLUSH PRIVILEGES

  sql/unireg.h
    1.16.1.2 03/04/30 10:15:08 monty@narttu.mysql.fi +1 -0
    Changed handing of priv_host to fix bug in FLUSH PRIVILEGES

  sql/sql_parse.cc
    1.218.23.4 03/04/30 10:15:08 monty@narttu.mysql.fi +1 -1
    Changed handing of priv_host to fix bug in FLUSH PRIVILEGES

  sql/sql_class.h
    1.111.1.34 03/04/30 10:15:08 monty@narttu.mysql.fi +2 -1
    Changed handing of priv_host to fix bug in FLUSH PRIVILEGES

  sql/sql_acl.h
    1.14.1.2 03/04/30 10:15:08 monty@narttu.mysql.fi +1 -1
    Changed handing of priv_host to fix bug in FLUSH PRIVILEGES

  sql/sql_acl.cc
    1.51.8.3 03/04/30 10:15:08 monty@narttu.mysql.fi +5 -2
    Changed handing of priv_host to fix bug in FLUSH PRIVILEGES

  myisam/mi_rkey.c
    1.11.1.2 03/04/30 10:15:08 monty@narttu.mysql.fi +6 -3
    Fix reference to not initialized memory

  libmysqld/lib_sql.cc
    1.25.3.8 03/04/30 10:15:08 monty@narttu.mysql.fi +1 -1
    Changed handing of priv_host to fix bug in FLUSH PRIVILEGES

ChangeSet
  1.1527 03/04/30 00:07:37 venu@myvenu.com +21 -0
  Updated warning test
  Updated all tests to catchup warnings for all field conversions

  mysql-test/r/type_decimal.result
    1.12 03/04/30 00:06:33 venu@myvenu.com +78 -0

  mysql-test/r/type_ranges.result
    1.17 03/04/30 00:06:32 venu@myvenu.com +37 -0

  mysql-test/r/subselect.result
    1.67.1.5 03/04/30 00:06:31 venu@myvenu.com +6 -0

  mysql-test/r/warnings.result
    1.7 03/04/30 00:06:30 venu@myvenu.com +73 -17

  mysql-test/r/order_by.result
    1.21 03/04/30 00:06:30 venu@myvenu.com +5 -0

  mysql-test/r/type_uint.result
    1.5 03/04/30 00:06:28 venu@myvenu.com +2 -0

  mysql-test/r/type_time.result
    1.6 03/04/30 00:06:28 venu@myvenu.com +4 -0

  mysql-test/r/type_float.result
    1.12 03/04/30 00:06:27 venu@myvenu.com +3 -0

  mysql-test/r/group_by.result
    1.28 03/04/30 00:06:26 venu@myvenu.com +58 -0

  mysql-test/r/myisam.result
    1.21 03/04/30 00:06:25 venu@myvenu.com +28 -0

  mysql-test/r/null_key.result
    1.18 03/04/30 00:06:23 venu@myvenu.com +2 -0

  mysql-test/r/null.result
    1.12 03/04/30 00:06:23 venu@myvenu.com +16 -0

  mysql-test/r/key.result
    1.9 03/04/30 00:06:22 venu@myvenu.com +12 -0

  mysql-test/r/isam.result
    1.12 03/04/30 00:06:22 venu@myvenu.com +8 -0

  mysql-test/r/heap_hash.result
    1.5 03/04/30 00:06:21 venu@myvenu.com +6 -0

  mysql-test/r/heap_btree.result
    1.10 03/04/30 00:06:20 venu@myvenu.com +6 -0

  mysql-test/r/heap.result
    1.16 03/04/30 00:06:20 venu@myvenu.com +6 -0

  mysql-test/r/create.result
    1.33 03/04/30 00:06:18 venu@myvenu.com +2 -0

  mysql-test/r/auto_increment.result
    1.10 03/04/30 00:06:17 venu@myvenu.com +2 -0

  mysql-test/t/warnings.test
    1.8 03/04/30 00:06:03 venu@myvenu.com +35 -2
    More warning tests

  mysql-test/t/ctype_many.test
    1.14 03/04/30 00:05:02 venu@myvenu.com +3 -0
    Disable the warnings for misc conversion

ChangeSet
  1.1526 03/04/30 00:02:28 venu@myvenu.com +14 -0
  Support of warnings for all DML statements (Insert, Update and Alter)
  Fix LOAD DATA INFILE warnings to have a better meanigful messages
  Fix to make the mysql command line to automatically show the warnings count for all basic commands

  sql/share/english/errmsg.txt
    1.70.1.9 03/04/29 23:57:36 venu@myvenu.com +6 -4

  include/mysqld_error.h
    1.61.1.7 03/04/29 23:57:25 venu@myvenu.com +5 -4

  sql/sql_update.cc
    1.83.2.3 03/04/29 23:56:49 venu@myvenu.com +1 -0

  sql/sql_table.cc
    1.157.2.3 03/04/29 23:56:48 venu@myvenu.com +3 -1

  sql/sql_select.cc
    1.216.1.5 03/04/29 23:56:48 venu@myvenu.com +2 -0

  sql/sql_parse.cc
    1.271.3.6 03/04/29 23:56:47 venu@myvenu.com +2 -1

  sql/sql_load.cc
    1.46.3.2 03/04/29 23:56:47 venu@myvenu.com +16 -37

  sql/sql_insert.cc
    1.86.2.1 03/04/29 23:56:46 venu@myvenu.com +1 -0

  sql/sql_error.cc
    1.16 03/04/29 23:56:46 venu@myvenu.com +1 -0

  sql/sql_class.h
    1.146.1.21 03/04/29 23:56:45 venu@myvenu.com +2 -0

  sql/set_var.cc
    1.34.1.12 03/04/29 23:56:44 venu@myvenu.com +2 -1

  sql/field_conv.cc
    1.17 03/04/29 23:56:43 venu@myvenu.com +8 -5

  sql/field.h
    1.66 03/04/29 23:56:43 venu@myvenu.com +3 -1

  sql/field.cc
    1.100 03/04/29 23:56:40 venu@myvenu.com +129 -110

ChangeSet
  1.676.1.690 03/04/29 18:24:33 Sinisa@sinisa.nasamreza.org +1 -0
  Porting back security fix from 4.0.
  
  All tests plus grant.pl test passed.

  sql/sql_base.cc
    1.74.1.31 03/04/29 18:24:30 Sinisa@sinisa.nasamreza.org +3 -2
    Porting back security fix from 4.0.
    
    All tests plus grant.pl test passed.

ChangeSet
  1.1346.198.1 03/04/29 15:11:45 serg@serg.mylan +1 -0
  followup to CURRENT_USER() fix

  libmysqld/lib_sql.cc
    1.25.3.7 03/04/29 15:11:43 serg@serg.mylan +2 -1
    followup to CURRENT_USER() fix

ChangeSet
  1.1524.1.3 03/04/29 15:00:16 pem@mysql.com +1 -0
  One final post-merge fix.

  sql/sql_prepare.cc
    1.38 03/04/29 15:00:14 pem@mysql.com +1 -1
    One final post-merge fix.

ChangeSet
  1.1346.1.106 03/04/29 14:35:10 Sinisa@sinisa.nasamreza.org +13 -0
  merge fix

  sql/sql_yacc.yy
    1.145.1.60 03/04/29 14:35:07 Sinisa@sinisa.nasamreza.org +0 -0
    merge fix

  sql/sql_base.cc
    1.117.1.40 03/04/29 14:35:07 Sinisa@sinisa.nasamreza.org +0 -2
    merge fix

  sql/sql_table.cc
    1.112.1.43 03/04/29 14:21:27 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_select.cc
    1.152.1.80 03/04/29 14:21:27 Sinisa@sinisa.nasamreza.org +0 -10
    Auto merged

  sql/sql_parse.cc
    1.218.1.90 03/04/29 14:21:27 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_db.cc
    1.39.1.20 03/04/29 14:21:27 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_acl.cc
    1.51.1.44 03/04/29 14:21:26 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.36.1.22 03/04/29 14:21:26 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/item.cc
    1.19.1.11 03/04/29 14:21:26 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.73.1.94 03/04/29 14:21:26 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.28.1.14 03/04/29 14:21:26 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/r/join_outer.result
    1.10.1.5 03/04/29 14:21:26 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.40.1.24 03/04/29 14:21:26 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1346.1.105 03/04/29 14:13:22 Sinisa@sinisa.nasamreza.org +3 -0
  code cleanup

  sql/sql_base.cc
    1.117.6.1 03/04/29 14:13:15 Sinisa@sinisa.nasamreza.org +2 -1
    committing a fix in order to pull new stuff

  mysql-test/t/innodb.test
    1.28.1.13 03/04/29 14:13:15 Sinisa@sinisa.nasamreza.org +1 -1
    fixing test

  mysql-test/r/innodb.result
    1.40.1.23 03/04/29 14:13:15 Sinisa@sinisa.nasamreza.org +1 -0
    fixing result

ChangeSet
  1.1524.1.2 03/04/29 12:31:03 pem@mysql.com +1 -0
  Post-merge fix.

  client/mysql.cc
    1.127 03/04/29 12:31:01 pem@mysql.com +1 -32
    Post-merge fix.

ChangeSet
  1.1524.1.1 03/04/29 12:06:04 pem@mysql.com +37 -0
  Merged 4.1 to 5.0.

  sql/sql_lex.h
    1.113 03/04/29 12:06:01 pem@mysql.com +1 -0
    Merged 4.1 to 5.0.

  sql/filesort.cc
    1.73 03/04/29 12:06:01 pem@mysql.com +0 -1
    Merged 4.1 to 5.0.

  sql/Makefile.am
    1.82 03/04/29 12:06:01 pem@mysql.com +1 -2
    Merged 4.1 to 5.0.

  client/mysql.cc
    1.126 03/04/29 12:06:01 pem@mysql.com +0 -7
    Merged 4.1 to 5.0.

  sql/sql_yacc.yy
    1.229 03/04/29 11:56:48 pem@mysql.com +0 -0
    Auto merged

  sql/sql_update.cc
    1.88 03/04/29 11:56:48 pem@mysql.com +0 -0
    Auto merged

  sql/sql_table.cc
    1.161 03/04/29 11:56:48 pem@mysql.com +0 -0
    Auto merged

  sql/sql_select.cc
    1.222 03/04/29 11:56:48 pem@mysql.com +0 -0
    Auto merged

  sql/sql_repl.cc
    1.104 03/04/29 11:56:48 pem@mysql.com +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.37 03/04/29 11:56:48 pem@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.287 03/04/29 11:56:48 pem@mysql.com +0 -0
    Auto merged

  sql/sql_lex.cc
    1.76.1.4 03/04/29 11:56:48 pem@mysql.com +0 -0
    Auto merged

  sql/sql_derived.cc
    1.44 03/04/29 11:56:47 pem@mysql.com +0 -0
    Auto merged

  sql/sql_delete.cc
    1.103 03/04/29 11:56:47 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.156 03/04/29 11:56:47 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.116 03/04/29 11:56:47 pem@mysql.com +0 -0
    Auto merged

  sql/sql_cache.cc
    1.47 03/04/29 11:56:47 pem@mysql.com +0 -0
    Auto merged

  sql/sql_base.cc
    1.147 03/04/29 11:56:47 pem@mysql.com +0 -0
    Auto merged

  sql/slave.cc
    1.192 03/04/29 11:56:47 pem@mysql.com +0 -0
    Auto merged

  sql/set_var.cc
    1.37 03/04/29 11:56:47 pem@mysql.com +0 -0
    Auto merged

  sql/records.cc
    1.22 03/04/29 11:56:47 pem@mysql.com +0 -0
    Auto merged

  sql/protocol.cc
    1.58 03/04/29 11:56:47 pem@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.360 03/04/29 11:56:47 pem@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.193 03/04/29 11:56:47 pem@mysql.com +0 -0
    Auto merged

  sql/log_event.cc
    1.117 03/04/29 11:56:47 pem@mysql.com +0 -0
    Auto merged

  sql/log.cc
    1.111 03/04/29 11:56:46 pem@mysql.com +0 -0
    Auto merged

  sql/lex.h
    1.96 03/04/29 11:56:46 pem@mysql.com +0 -0
    Auto merged

  sql/item_func.cc
    1.127 03/04/29 11:56:46 pem@mysql.com +0 -0
    Auto merged

  sql/item.h
    1.60 03/04/29 11:56:46 pem@mysql.com +0 -0
    Auto merged

  sql/item.cc
    1.64 03/04/29 11:56:46 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.63 03/04/29 11:56:46 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/variables.result
    1.26 03/04/29 11:56:46 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.73 03/04/29 11:56:46 pem@mysql.com +0 -0
    Auto merged

  libmysql/libmysql.c
    1.157 03/04/29 11:56:46 pem@mysql.com +0 -0
    Auto merged

  include/mysql_com.h
    1.69 03/04/29 11:56:45 pem@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.240 03/04/29 11:56:38 pem@mysql.com +0 -0
    auto-union

  BitKeeper/etc/ignore
    1.154 03/04/29 11:56:38 pem@mysql.com +3 -0
    auto-union

ChangeSet
  1.1346.168.69 03/04/29 09:52:14 lenz@mysql.com +2 -0
   - minor fixups (no more warnings)
   - the preferred mailing list is internals@ not dev-public@
     (this is a public document)
   - Rather use the 4.1 tree for new development (4.0 is frozen)

  BitKeeper/etc/ignore
    1.107.1.40 03/04/29 09:52:11 lenz@mysql.com +4 -0
    Added Docs/internals.html Docs/internals.pdf Docs/internals.txt Docs/internals_toc.html to the ignore list

  Docs/internals.texi
    1.22.1.16 03/04/29 09:50:26 lenz@mysql.com +6 -6
     - minor fixups (no more warnings)
     - the preferred mailing list is internals@ not dev-public@
       (this is a public document)
     - Rather use the 4.1 tree for new development (4.0 is frozen)

ChangeSet
  1.1346.168.68 03/04/28 18:52:04 peterg@mysql.com +1 -0
  Update PeterG's internals documentation per comments from 
  Monty; minor changes only.

  Docs/internals.texi
    1.22.1.15 03/04/28 18:52:03 peterg@mysql.com +6 -6
    Update PeterG's internals documentation per comments from 
    Monty; minor changes only.

ChangeSet
  1.1346.168.67 03/04/28 18:21:06 peterg@mysql.com +1 -0
  Updated PeterG's internals documentation per comments from 
  Monty; clarified differences between the MySQL library 
  directories.

  Docs/internals.texi
    1.22.1.14 03/04/28 18:21:04 peterg@mysql.com +28 -26
    Updated PeterG's internals documentation per comments from 
    Monty; clarified differences between the MySQL library 
    directories.

ChangeSet
  1.1346.168.66 03/04/28 17:20:26 peterg@mysql.com +1 -0
  Updated PeterG's internals documentation per comments 
  from Monty; minor changes only.

  Docs/internals.texi
    1.22.1.13 03/04/28 17:20:25 peterg@mysql.com +1 -5
    Updated PeterG's internals documentation per comments 
    from Monty; minor changes only.

ChangeSet
  1.1346.168.65 03/04/28 17:13:48 peterg@mysql.com +1 -0
  Updated PeterG's internals documentation per comments from 
  Monty; new description of /man subdirectory

  Docs/internals.texi
    1.22.1.12 03/04/28 17:13:46 peterg@mysql.com +7 -5
    Updated PeterG's internals documentation per comments from 
    Monty; new description of /man subdirectory

ChangeSet
  1.1346.168.64 03/04/28 17:01:19 peterg@mysql.com +1 -0
  Updated PeterG's internals documentation per comments from 
  Monty; one minor change, plus addition of how HEAP works.

  Docs/internals.texi
    1.22.1.11 03/04/28 17:01:17 peterg@mysql.com +6 -2
    Updated PeterG's internals documentation per comments from 
    Monty; one minor change, plus addition of how HEAP works.

ChangeSet
  1.1346.197.1 03/04/28 16:40:33 peterg@mysql.com +1 -0
  Updated PeterG's internals documentation per comments from 
  Monty; added additional description of MySQL's three types 
  of record formats.

  Docs/internals.texi
    1.22.1.10 03/04/28 16:40:31 peterg@mysql.com +69 -4
    Updated PeterG's internals documentation per comments from 
    Monty; added additional description of MySQL's three types
    of record formats.

ChangeSet
  1.1346.196.1 03/04/29 00:15:18 serg@serg.mylan +7 -0
  CURRENT_USER() and "access denied" error messages now report hostname exactly as it was specified in the GRANT command (with wildcards, that is)

  BitKeeper/etc/logging_ok
    1.206.1.64 03/04/29 00:15:18 serg@serg.mylan +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_parse.cc
    1.218.23.3 03/04/29 00:15:09 serg@serg.mylan +5 -4
    CURRENT_USER() and "access denied" error messages now report hostname exactly as it was specified in the GRANT command (with wildcards, that is)

  sql/sql_db.cc
    1.39.2.1 03/04/29 00:15:09 serg@serg.mylan +2 -2
    CURRENT_USER() and "access denied" error messages now report hostname exactly as it was specified in the GRANT command (with wildcards, that is)

  sql/sql_class.h
    1.111.1.33 03/04/29 00:15:09 serg@serg.mylan +2 -3
    CURRENT_USER() and "access denied" error messages now report hostname exactly as it was specified in the GRANT command (with wildcards, that is)

  sql/sql_acl.h
    1.14.1.1 03/04/29 00:15:09 serg@serg.mylan +2 -1
    CURRENT_USER() and "access denied" error messages now report hostname exactly as it was specified in the GRANT command (with wildcards, that is)

  sql/sql_acl.cc
    1.51.8.2 03/04/29 00:15:09 serg@serg.mylan +10 -8
    CURRENT_USER() and "access denied" error messages now report hostname exactly as it was specified in the GRANT command (with wildcards, that is)

  sql/item_create.cc
    1.15.1.13 03/04/29 00:15:09 serg@serg.mylan +1 -1
    CURRENT_USER() and "access denied" error messages now report hostname exactly as it was specified in the GRANT command (with wildcards, that is)

ChangeSet
  1.1346.195.1 03/04/29 00:14:17 monty@mashka.mysql.fi +2 -0
  Added missing dependency to VC++ project file

  VC++Files/mysql.dsw
    1.5.1.2 03/04/29 00:14:15 monty@mashka.mysql.fi +3 -0
    Added missing dependency

  Docs/internals.texi
    1.22.1.9 03/04/29 00:14:15 monty@mashka.mysql.fi +219 -187
    Moved code guidelines first
    Fixed texinfo nodes & menus

ChangeSet
  1.676.1.688 03/04/28 20:09:38 serg@serg.mylan +2 -0
  Merge bk-internal:/home/bk/mysql-3.23/
  into serg.mylan:/usr/home/serg/Abk/mysql

  BitKeeper/etc/logging_ok
    1.153.1.91 03/04/28 20:09:36 serg@serg.mylan +1 -0
    Logging to logging@openlogging.org accepted

  client/mysqldump.c
    1.37.1.16 03/04/28 20:09:04 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1524 03/04/28 20:40:41 bell@laptop.sanja.is.com.ua +2 -0
  Documentation fixed according bug 185 fixing patch (1.1551 03/04/23 00:

  BitKeeper/etc/logging_ok
    1.233.1.12 03/04/28 20:40:41 bell@laptop.sanja.is.com.ua +1 -0
    Logging to logging@openlogging.org accepted

  Docs/internals.texi
    1.29 03/04/28 20:40:29 bell@laptop.sanja.is.com.ua +13 -4
    Documentation fixed according bug 185 fixing patch (1.1551 03/04/23 00:01:19)

ChangeSet
  1.1346.194.1 03/04/28 18:35:15 lenz@mysql.com +1 -0
   - removed Benchmark results from source distribution (they are not
     up-to-date anyway)

  sql-bench/Makefile.am
    1.19 03/04/28 18:35:12 lenz@mysql.com +0 -7
     - removed Benchmark results from source distribution (they are not
       up-to-date anyway)

ChangeSet
  1.1346.193.1 03/04/28 19:05:57 monty@mashka.mysql.fi +6 -0
  Fix to remove compiler warnings

  vio/viossl.c
    1.19 03/04/28 19:05:55 monty@mashka.mysql.fi +9 -3
    Fix to remove compiler warning

  myisammrg/myrg_extra.c
    1.12 03/04/28 19:05:55 monty@mashka.mysql.fi +1 -1
    Fix to remove compiler warning

  myisam/sort.c
    1.23.1.5 03/04/28 19:05:55 monty@mashka.mysql.fi +2 -0
    Fix to remove compiler warning

  libmysqld/libmysqld.c
    1.14.2.3 03/04/28 19:05:55 monty@mashka.mysql.fi +3 -3
    Fix to remove compiler warning

  include/violite.h
    1.21.3.3 03/04/28 19:05:55 monty@mashka.mysql.fi +2 -2
    Fix to remove compiler warning

  include/my_global.h
    1.34.1.8 03/04/28 19:05:55 monty@mashka.mysql.fi +1 -1
    Fixed wrong #ifdef

ChangeSet
  1.1346.168.58 03/04/28 16:05:27 lenz@mysql.com +2 -0
   - Removed two EXPLAIN SELECT statements from the InnoDB test suite
    (the results are nondeterministic and provide different output on 32bit
    and 64bit architectures)

  mysql-test/t/innodb.test
    1.28.2.2 03/04/28 16:05:24 lenz@mysql.com +0 -2
     - removed two EXPLAIN SELECT tests because the results are nondeterministic
       (the result was different on 64bit platforms)

  mysql-test/r/innodb.result
    1.40.4.3 03/04/28 16:05:24 lenz@mysql.com +0 -6
     - removed two EXPLAIN SELECT results because the output is nondeterministic
       (the result was different on 64bit platforms)

ChangeSet
  1.1346.168.57 03/04/28 15:59:04 lenz@mysql.com +1 -0
   - Fixed some texi errors in internals.texi (still some more left)

  Docs/internals.texi
    1.22.1.8 03/04/28 15:59:01 lenz@mysql.com +25 -19
     - fixed some structural errors

ChangeSet
  1.1346.168.56 03/04/28 12:31:19 monty@mashka.mysql.fi +1 -0
  Better test for regular files.

  mysys/default.c
    1.17.1.8 03/04/28 12:31:17 monty@mashka.mysql.fi +7 -2
    Better test for regular files.

ChangeSet
  1.1523 03/04/28 14:29:22 hf@deer.mysql.r18.ru +1 -0
  Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.cursor

  BitKeeper/etc/ignore
    1.153 03/04/28 14:28:59 hf@deer.mysql.r18.ru +5 -5
    auto-union

ChangeSet
  1.1504.28.2 03/04/28 14:25:29 hf@deer.mysql.r18.ru +5 -0
  SCRUM
  Protocol_cursor task
  net_field_length definitions trimmed with Monty's suggestions

  sql/mini_client.cc
    1.62 03/04/28 14:25:23 hf@deer.mysql.r18.ru +1 -1
    unnecessary cast removed

  include/mysql_com.h
    1.67.1.2 03/04/28 14:25:23 hf@deer.mysql.r18.ru +1 -0
    net_field_length_ll definition is here now

  include/mysql.h
    1.66 03/04/28 14:25:23 hf@deer.mysql.r18.ru +2 -4
    we define my_ulonglong here only if no global.h included

  include/my_global.h
    1.44 03/04/28 14:25:23 hf@deer.mysql.r18.ru +9 -0
    my_ulonglong definition moved here from mysql.h

  BitKeeper/etc/ignore
    1.151.2.1 03/04/28 14:25:23 hf@deer.mysql.r18.ru +1 -0
    Added sql/pack.c to the ignore list

ChangeSet
  1.1346.168.55 03/04/28 12:00:04 monty@mashka.mysql.fi +1 -0
  Use my.cnf file from datadir even if datadir is different from the default one.

  support-files/mysql.server.sh
    1.28 03/04/28 12:00:02 monty@mashka.mysql.fi +12 -1
    Use my.cnf file from datadir even if datadir is different from the default one.

ChangeSet
  1.1346.192.1 03/04/28 10:32:56 monty@mashka.mysql.fi +7 -0
  Fix for openssl on Solaris
  Fix for grant bug with SELECT *

  tests/grant.res
    1.7.1.3 03/04/28 10:32:53 monty@mashka.mysql.fi +37 -18
    new grant results

  tests/grant.pl
    1.12 03/04/28 10:32:53 monty@mashka.mysql.fi +17 -3
    New grant test for SELECT *

  sql/sql_parse.cc
    1.218.23.2 03/04/28 10:32:53 monty@mashka.mysql.fi +14 -6
    Added comment

  sql/sql_base.cc
    1.117.1.39 03/04/28 10:32:53 monty@mashka.mysql.fi +3 -2
    Fix for grant bug with SELECT *

  sql/sql_acl.cc
    1.51.8.1 03/04/28 10:32:53 monty@mashka.mysql.fi +9 -8
    Indentation cleanup

  sql/item_strfunc.cc
    1.36.3.2 03/04/28 10:32:53 monty@mashka.mysql.fi +0 -3
    Fix for openssl on Solaris

  include/my_global.h
    1.34.1.7 03/04/28 10:32:53 monty@mashka.mysql.fi +4 -0
    Fix for openssl on Solaris

ChangeSet
  1.1346.168.53 03/04/27 21:16:20 greg@mysql.com +3 -0
  Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
  into mysql.com:/home/greg/bk/mysql-4.0

  sql/slave.cc
    1.164.1.56 03/04/27 21:16:19 greg@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.297.1.122 03/04/27 21:16:19 greg@mysql.com +0 -0
    Auto merged

  sql/mini_client.cc
    1.48.1.4 03/04/27 21:16:18 greg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.184.14 03/04/27 21:15:52 greg@mysql.com +1 -0
  Change to NetWare platform mods, per Monty

  mysys/my_pthread.c
    1.35.1.2 03/04/27 21:15:50 greg@mysql.com +1 -1
    Move #undef directive out of function

ChangeSet
  1.1346.168.52 03/04/27 22:12:38 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/ha_innodb.cc
    1.73.11.9 03/04/27 22:12:36 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.168.51 03/04/27 22:12:08 monty@mashka.mysql.fi +25 -0
  Fixed problem when comparing a key for a multi-byte-character set. (bug 152)
  Use 0x.... as strings if 'new' mode. (bug 152)
  Don't report -max on windows when InnoDB is enabled. (bug 332)
  Reset current_linfo;  This could cause a hang when doing PURGE LOGS.
  Fix for row numbers in EXPLAIN (bug 322)
   Fix that USE_FRM works for all table types (bug 97)

  sql/sql_yacc.yy
    1.145.16.2 03/04/27 22:12:05 monty@mashka.mysql.fi +1 -5
    Removed compiler warnings.

  sql/sql_table.cc
    1.112.9.2 03/04/27 22:12:05 monty@mashka.mysql.fi +26 -6
    Fix that USE_FRM works for all table types (without strange errors)

  sql/sql_select.cc
    1.152.16.3 03/04/27 22:12:05 monty@mashka.mysql.fi +3 -0
    Fix for row numbers in EXPLAIN

  sql/sql_repl.cc
    1.86.1.7 03/04/27 22:12:05 monty@mashka.mysql.fi +3 -0
    Reset current_linfo;  This could cause a hang when doing PURGE LOGS.

  sql/sql_insert.cc
    1.63.1.35 03/04/27 22:12:05 monty@mashka.mysql.fi +1 -1
    Removed debug message

  sql/sql_analyse.cc
    1.12.1.7 03/04/27 22:12:05 monty@mashka.mysql.fi +0 -1
    Removed unused variable

  sql/mysqld.cc
    1.297.30.3 03/04/27 22:12:05 monty@mashka.mysql.fi +2 -2
    Don't report -max on windows when InnoDB is enabled.

  sql/item.h
    1.20.1.18 03/04/27 22:12:05 monty@mashka.mysql.fi +1 -1
    Use 0x.... as strings if 'new' mode

  sql/item.cc
    1.19.2.2 03/04/27 22:12:05 monty@mashka.mysql.fi +8 -0
    Use 0x.... as strings if 'new' mode

  sql/field.cc
    1.51.1.22 03/04/27 22:12:05 monty@mashka.mysql.fi +23 -2
    Fixed problem when comparing a key for a multi-byte-character set.

  mysql-test/t/repair.test
    1.1.1.1 03/04/27 22:12:05 monty@mashka.mysql.fi +3 -1
    Test of USE_FRM and HEAP tables

  mysql-test/t/ctype_latin1_de.test
    1.4.1.2 03/04/27 22:12:05 monty@mashka.mysql.fi +23 -0
    New test for latin1_de

  mysql-test/t/ctype_latin1_de-master.opt
    1.2.1.1 03/04/27 22:12:05 monty@mashka.mysql.fi +2 -1
    --new is needed to get 0x... strings to work properly

  mysql-test/r/rpl_alter.result
    1.3.1.1 03/04/27 22:12:05 monty@mashka.mysql.fi +11 -11
    New test results

  mysql-test/r/repair.result
    1.2 03/04/27 22:12:05 monty@mashka.mysql.fi +5 -1
    New test results

  mysql-test/r/join.result
    1.17.1.6 03/04/27 22:12:05 monty@mashka.mysql.fi +8 -0
    New test results

  mysql-test/r/ctype_latin1_de.result
    1.7 03/04/27 22:12:05 monty@mashka.mysql.fi +52 -0
    New test results

  myisam/sort.c
    1.23.1.4 03/04/27 22:12:05 monty@mashka.mysql.fi +3 -3
    Fixed printf statements

  myisam/myisamdef.h
    1.45.1.13 03/04/27 22:12:05 monty@mashka.mysql.fi +3 -1
    Fixed problem when comparing a key for a multi-byte-character set.

  myisam/mi_test2.c
    1.12.1.3 03/04/27 22:12:05 monty@mashka.mysql.fi +6 -6
    Fixed printf statements

  myisam/mi_search.c
    1.30.1.4 03/04/27 22:12:05 monty@mashka.mysql.fi +31 -0
    Fixed problem when comparing a key for a multi-byte-character set.

  myisam/mi_rkey.c
    1.11.1.1 03/04/27 22:12:05 monty@mashka.mysql.fi +23 -10
    Fixed problem when comparing a key for a multi-byte-character set.

  myisam/mi_range.c
    1.6.1.1 03/04/27 22:12:05 monty@mashka.mysql.fi +2 -1
    Fixed problem when comparing a key for a multi-byte-character set.

  myisam/mi_key.c
    1.13.1.3 03/04/27 22:12:05 monty@mashka.mysql.fi +20 -3
    Fixed problem when comparing a key for a multi-byte-character set.

  VC++Files/libmysql/libmysql.dsp
    1.7.1.2 03/04/27 22:12:05 monty@mashka.mysql.fi +15 -7
    Added new source files

ChangeSet
  1.1504.1.44 03/04/27 17:35:54 pem@mysql.com +10 -0
  Post-fix of bug #302 fix.
  Fixed bug #320.
  Some new tests and cosmetic changes.
  Another strcasecmp() replaced.

  sql/sql_yacc.yy
    1.228 03/04/27 17:35:51 pem@mysql.com +2 -1
    Another strcasecmp() replaced.

  sql/sql_parse.cc
    1.286 03/04/27 17:35:51 pem@mysql.com +5 -1
    Post-fix of bugfix (free memory on error), and added comment.

  sql/sql_derived.cc
    1.41.1.1 03/04/27 17:35:51 pem@mysql.com +7 -1
    Don't set org_table_list->derived to 1 when debugging, as this breaks certain
    subselect args to SPs.

  sql/sp_head.h
    1.14 03/04/27 17:35:51 pem@mysql.com +1 -1
    Minor comment fix.

  sql/sp_head.cc
    1.28 03/04/27 17:35:51 pem@mysql.com +2 -2
    Minor layout and comment fix.

  sql/sp.cc
    1.14 03/04/27 17:35:51 pem@mysql.com +2 -2
    Don't close derived tables.

  mysql-test/t/subselect.test
    1.62 03/04/27 17:35:51 pem@mysql.com +0 -16
    Moved SP tests to sp.test.

  mysql-test/t/sp.test
    1.20 03/04/27 17:35:51 pem@mysql.com +30 -0
    Moved SP tests from subselect and added some more.

  mysql-test/r/subselect.result
    1.72 03/04/27 17:35:51 pem@mysql.com +0 -17
    Moved SP tests to sp.test.

  mysql-test/r/sp.result
    1.19 03/04/27 17:35:51 pem@mysql.com +27 -0
    Moved SP tests from subselect and added some more.

ChangeSet
  1.1346.191.4 03/04/27 17:25:39 heikki@hundin.mysql.fi +3 -0
  trx0trx.h, trx0trx.c, ha_innodb.cc:
    Remove code never actually used in IGNORE; InnoDB just rolls back the latest row insert or update on a duplicate key error and leaves it for MySQL to decide whether to ignore the error

  innobase/include/trx0trx.h
    1.24 03/04/27 17:24:19 heikki@hundin.mysql.fi +0 -4
    Remove code never actually used in IGNORE; InnoDB just rolls back the latest row insert or update on a duplicate key error and leaves it for MySQL to decide whether to ignore the error

  innobase/trx/trx0trx.c
    1.20.1.3 03/04/27 17:24:13 heikki@hundin.mysql.fi +0 -2
    Remove code never actually used in IGNORE; InnoDB just rolls back the latest row insert or update on a duplicate key error and leaves it for MySQL to decide whether to ignore the error

  sql/ha_innodb.cc
    1.73.13.1 03/04/27 17:23:53 heikki@hundin.mysql.fi +0 -9
    Remove code never actually used in IGNORE; InnoDB just rolls back the latest row insert or update on a duplicate key error and leaves it for MySQL to decide whether to ignore the error

ChangeSet
  1.1346.191.3 03/04/26 18:58:55 peterg@mysql.com +1 -0
  Update PeterG's internals documentation per comments from 
  Monty; minor changes only.

  Docs/internals.texi
    1.22.1.7 03/04/26 18:58:53 peterg@mysql.com +32 -27
    Update PeterG's internals documentation per comments from 
    Monty; minor changes only.

ChangeSet
  1.1346.191.2 03/04/26 16:00:52 peterg@mysql.com +1 -0
  Update PeterG's internals documentation per Monty's comments; 
  minor changes only.

  Docs/internals.texi
    1.22.1.6 03/04/26 16:00:50 peterg@mysql.com +347 -537
    Update PeterG's internals documentation per Monty's comments; 
    minor changes only.

ChangeSet
  1.1346.168.50 03/04/26 21:10:13 monty@mashka.mysql.fi +12 -0
  Merge with 3.23:
  Set innobase_flush_log_at_trx_commit to 1 by default
  Fix problem with timestamp on 64 bit systems
  Reserve alarms for up to 10 slave threads

  sql/sql_list.h
    1.10.1.3 03/04/26 21:10:11 monty@mashka.mysql.fi +0 -2
    Use local version

  sql/slave.cc
    1.164.7.1 03/04/26 21:10:11 monty@mashka.mysql.fi +0 -2
    Use local version

  sql/mysqld.cc
    1.297.30.2 03/04/26 21:10:11 monty@mashka.mysql.fi +0 -6
    Reserve alarms for up to 10 slave threads

  sql/mini_client.cc
    1.48.2.1 03/04/26 21:10:11 monty@mashka.mysql.fi +0 -5
    Use local version

  sql/log_event.h
    1.71.1.6 03/04/26 21:10:11 monty@mashka.mysql.fi +1 -4
    Merge with 3.23; Fix problem with timestamp on 64 bit systems

  sql/ha_innodb.cc
    1.73.11.8 03/04/26 21:10:11 monty@mashka.mysql.fi +1 -2
    Merge with 3.23;  Set innobase_flush_log_at_trx_commit to 1 by default

  mysql-test/t/join.test
    1.13.1.5 03/04/26 21:10:11 monty@mashka.mysql.fi +14 -14
    Merge with 3.23

  mysql-test/r/join.result
    1.17.1.5 03/04/26 21:10:11 monty@mashka.mysql.fi +0 -0
    Merge with 3.23

  sql/log_event.cc
    1.77.1.30 03/04/26 20:59:13 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysys/charset.c
    1.29.1.4 03/04/26 20:59:13 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/rpl_alter.test
    1.2.1.1 03/04/26 20:59:13 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.45.24.2 03/04/26 20:59:12 monty@mashka.mysql.fi +0 -0
    Merge rename: sql/ha_innobase.cc -> sql/ha_innodb.cc

  BitKeeper/etc/logging_ok
    1.206.1.63 03/04/26 20:58:38 monty@mashka.mysql.fi +0 -1
    auto-union

ChangeSet
  1.1346.191.1 03/04/26 20:57:13 heikki@hundin.mysql.fi +1 -0
  srv0start.c:
    fflush stderr after startup

  innobase/srv/srv0start.c
    1.37.1.3 03/04/26 20:57:05 heikki@hundin.mysql.fi +3 -1
    fflush stderr after startup

ChangeSet
  1.1346.168.49 03/04/26 20:43:28 monty@mashka.mysql.fi +17 -0
  Fix for -fbranch-probabilites (bug 268)
  Fix for LEFT/RIGHT/MID with multi-byte-character sets (bug 314)
  Fix for new bison 1.875
  max_insert_delayed_threads and delayed_insert_timeout now works as documented (bug 211)
  Don't show port in SHOW PROCESSLIST for system threads
  Fix problem with ORDER BY being discarded for some DISTINCT queries (bug 275)
  Fixed bug with NATURAL LEFT JOIN, NATURAL RIGHT JOIN and RIGHT JOIN when
  using many joined tables (Bug 212)

  mysql-test/t/ctype_ujis.test
    1.1 03/04/26 20:43:26 monty@mashka.mysql.fi +13 -0

  mysql-test/t/ctype_ujis-master.opt
    1.1 03/04/26 20:43:26 monty@mashka.mysql.fi +1 -0

  mysql-test/t/ctype_ujis.test
    1.0 03/04/26 20:43:26 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysql-test/t/ctype_ujis.test

  mysql-test/t/ctype_ujis-master.opt
    1.0 03/04/26 20:43:26 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysql-test/t/ctype_ujis-master.opt

  mysql-test/r/ctype_ujis.result
    1.1 03/04/26 20:43:25 monty@mashka.mysql.fi +8 -0

  sql/sql_yacc.yy
    1.145.16.1 03/04/26 20:43:25 monty@mashka.mysql.fi +14 -12
    Fixed bug with NATURAL LEFT JOIN, NATURAL RIGHT JOIN and RIGHT JOIN when
    using many joined tables.

  sql/sql_select.cc
    1.152.16.2 03/04/26 20:43:25 monty@mashka.mysql.fi +10 -0
    Fix problem with ORDER BY being discarded and results returned un-sorted

  sql/sql_parse.cc
    1.218.23.1 03/04/26 20:43:25 monty@mashka.mysql.fi +20 -3
    Added comment

  sql/sql_insert.cc
    1.63.1.34 03/04/26 20:43:25 monty@mashka.mysql.fi +4 -1
    max_insert_delayed_threads now works as documented.
    delayed_insert_timeout now works on Linux

  sql/sql_class.cc
    1.71.1.32 03/04/26 20:43:25 monty@mashka.mysql.fi +1 -0
    Don't show port in SHOW PROCESSLIST for system threads

  sql/mysqld.cc
    1.297.30.1 03/04/26 20:43:25 monty@mashka.mysql.fi +2 -2
    Fix for new bison 1.875 (Wrong error text message when one got syntax error)

  sql/item_strfunc.cc
    1.36.3.1 03/04/26 20:43:25 monty@mashka.mysql.fi +2 -2
    Fix for LEFT/RIGHT/MID with multi-byte-character sets

  mysql-test/t/join.test
    1.13.1.4 03/04/26 20:43:25 monty@mashka.mysql.fi +32 -0
    Update results after change to NATURAL/LEFT/RIGHT JOIN

  mysql-test/r/select.result
    1.8.1.18 03/04/26 20:43:25 monty@mashka.mysql.fi +2 -14
    Update results after change to NATURAL/LEFT/RIGHT JOIN

  mysql-test/r/join_outer.result
    1.10.2.2 03/04/26 20:43:25 monty@mashka.mysql.fi +1 -6
    Update results after change to NATURAL/LEFT/RIGHT JOIN

  mysql-test/r/join.result
    1.17.1.4 03/04/26 20:43:25 monty@mashka.mysql.fi +87 -0
    Update results after change to NATURAL/LEFT/RIGHT JOIN

  mysql-test/r/ctype_ujis.result
    1.0 03/04/26 20:43:25 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysql-test/r/ctype_ujis.result

  myisam/mi_open.c
    1.46.1.14 03/04/26 20:43:25 monty@mashka.mysql.fi +5 -2
    Give error instead of writing to stderr (Which user can't see)

  configure.in
    1.191.1.79 03/04/26 20:43:25 monty@mashka.mysql.fi +3 -3
    Fix for -fbranch-probabilites

  acinclude.m4
    1.77.1.4 03/04/26 20:43:25 monty@mashka.mysql.fi +1 -1
    Fix for -fbranch-probabilites

ChangeSet
  1.676.296.1 03/04/26 17:57:19 monty@mashka.mysql.fi +2 -0
  Fix possible memory overrun when reading broken character set files

  sql/mysqld.cc
    1.162.1.112 03/04/26 17:57:17 monty@mashka.mysql.fi +1 -1
    Safety fix.

  mysys/charset.c
    1.24.1.2 03/04/26 17:57:16 monty@mashka.mysql.fi +1 -1
    Fix possible memory overrun when reading broken character set files

ChangeSet
  1.1346.1.104 03/04/26 16:44:42 Sinisa@sinisa.nasamreza.org +36 -0
  merge fix

  strings/ctype-tis620.c
    1.16.1.5 03/04/26 16:44:39 Sinisa@sinisa.nasamreza.org +1 -0
    merge fix

  sql/sql_update.cc
    1.54.1.29 03/04/26 16:44:39 Sinisa@sinisa.nasamreza.org +1 -2
    merge fix

  sql/share/swedish/errmsg.txt
    1.46.1.10 03/04/26 16:44:39 Sinisa@sinisa.nasamreza.org +0 -1
    merge fix

  sql/share/japanese/errmsg.txt
    1.45.1.9 03/04/26 16:44:39 Sinisa@sinisa.nasamreza.org +0 -1
    merge fix

  sql/share/english/errmsg.txt
    1.51.1.14 03/04/26 16:44:39 Sinisa@sinisa.nasamreza.org +0 -1
    merge fix

  mysql-test/t/innodb.test
    1.28.1.12 03/04/26 16:44:39 Sinisa@sinisa.nasamreza.org +14 -13
    merge fix

  mysql-test/r/select_safe.result
    1.6 03/04/26 16:44:39 Sinisa@sinisa.nasamreza.org +0 -1
    merge fix

  mysql-test/r/innodb.result
    1.40.1.22 03/04/26 16:44:39 Sinisa@sinisa.nasamreza.org +18 -19
    merge fix

  sql/sql_table.cc
    1.112.1.42 03/04/26 16:05:07 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/share/ukrainian/errmsg.txt
    1.11.1.9 03/04/26 16:05:07 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

  sql/share/spanish/errmsg.txt
    1.47.1.9 03/04/26 16:05:07 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

  sql/share/slovak/errmsg.txt
    1.46.1.9 03/04/26 16:05:07 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

  sql/share/russian/errmsg.txt
    1.45.1.10 03/04/26 16:05:07 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

  sql/share/romanian/errmsg.txt
    1.44.1.9 03/04/26 16:05:07 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

  sql/share/portuguese/errmsg.txt
    1.47.1.10 03/04/26 16:05:07 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

  sql/share/norwegian/errmsg.txt
    1.45.1.9 03/04/26 16:05:07 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

  sql/share/norwegian-ny/errmsg.txt
    1.45.1.9 03/04/26 16:05:07 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

  sql/share/korean/errmsg.txt
    1.45.1.9 03/04/26 16:05:07 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

  sql/share/italian/errmsg.txt
    1.52.1.10 03/04/26 16:05:07 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

  sql/share/hungarian/errmsg.txt
    1.47.1.9 03/04/26 16:05:07 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

  sql/share/greek/errmsg.txt
    1.46.1.9 03/04/26 16:05:07 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

  sql/share/german/errmsg.txt
    1.47.1.9 03/04/26 16:05:07 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

  sql/share/french/errmsg.txt
    1.46.1.9 03/04/26 16:05:07 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

  sql/share/estonian/errmsg.txt
    1.47.1.9 03/04/26 16:05:07 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

  sql/share/dutch/errmsg.txt
    1.49.1.12 03/04/26 16:05:07 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

  sql/share/danish/errmsg.txt
    1.45.1.9 03/04/26 16:05:07 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

  sql/share/czech/errmsg.txt
    1.46.1.9 03/04/26 16:05:07 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

  sql/sql_select.cc
    1.152.1.79 03/04/26 16:05:06 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/set_var.cc
    1.12.1.14 03/04/26 16:05:05 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

  sql/ha_innodb.cc
    1.73.1.93 03/04/26 16:05:05 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/t/multi_update.test
    1.17.1.5 03/04/26 16:05:05 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/t/join_outer.test
    1.6.1.3 03/04/26 16:05:05 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/t/alter_table.test
    1.12.1.2 03/04/26 16:05:05 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/r/multi_update.result
    1.15.1.5 03/04/26 16:05:05 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/r/join_outer.result
    1.10.1.4 03/04/26 16:05:05 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/r/alter_table.result
    1.9.1.3 03/04/26 16:05:05 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1346.1.103 03/04/26 16:03:33 Sinisa@sinisa.nasamreza.org +1 -0
  code clean-up

  strings/ctype-tis620.c
    1.16.1.4 03/04/26 16:03:29 Sinisa@sinisa.nasamreza.org +0 -2
    making final code clean-up

ChangeSet
  1.1522 03/04/26 15:58:39 Sinisa@sinisa.nasamreza.org +1 -0
  Post-merge fix.

  sql/sql_delete.cc
    1.99.2.4 03/04/26 15:58:35 Sinisa@sinisa.nasamreza.org +2 -2
    Post-merge fix.

ChangeSet
  1.1346.190.1 03/04/26 15:53:27 bell@laptop.sanja.is.com.ua +2 -0
  fixed incorrect number of affected rows in REPLACE...SELECT... (bug 130)

  BitKeeper/etc/logging_ok
    1.206.1.62 03/04/26 15:53:23 bell@laptop.sanja.is.com.ua +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_insert.cc
    1.63.1.33 03/04/26 15:53:08 bell@laptop.sanja.is.com.ua +1 -1
    fixed incorrect number of affected rows in REPLACE...SELECT...

ChangeSet
  1.1521 03/04/26 15:26:28 Sinisa@sinisa.nasamreza.org +9 -0
  merge fix

  sql/sql_delete.cc
    1.99.2.3 03/04/26 15:26:24 Sinisa@sinisa.nasamreza.org +2 -5
    merge fix

  sql/sql_table.cc
    1.157.2.2 03/04/26 15:21:44 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_select.cc
    1.216.1.4 03/04/26 15:21:44 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.6.4 03/04/26 15:21:44 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_lex.cc
    1.76.1.3 03/04/26 15:21:44 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_class.h
    1.146.1.20 03/04/26 15:21:43 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.103 03/04/26 15:21:43 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/item.cc
    1.58.1.13 03/04/26 15:21:43 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/handler.h
    1.79 03/04/26 15:21:43 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1520 03/04/26 15:12:14 Sinisa@sinisa.nasamreza.org +6 -0
  Making a better fix for double released pointers and safe 
  TMP_TABLE_PARAM.
  This involved moving things around in include files.
  All tests, including the ones with Valgrind passed.

  sql/sql_union.cc
    1.74 03/04/26 15:12:08 Sinisa@sinisa.nasamreza.org +2 -3
    Making a better fix for double released pointers and safe 
    TMP_TABLE_PARAM.
    This involved moving things around in include files.
    All tests, including the ones with Valgrind passed.

  sql/sql_select.h
    1.42 03/04/26 15:12:08 Sinisa@sinisa.nasamreza.org +0 -39
    Making a better fix for double released pointers and safe 
    TMP_TABLE_PARAM.
    This involved moving things around in include files.
    All tests, including the ones with Valgrind passed.

  sql/sql_select.cc
    1.216.1.3 03/04/26 15:12:08 Sinisa@sinisa.nasamreza.org +8 -20
    Making a better fix for double released pointers and safe 
    TMP_TABLE_PARAM.
    This involved moving things around in include files.
    All tests, including the ones with Valgrind passed.

  sql/sql_lex.h
    1.102.7.10 03/04/26 15:12:08 Sinisa@sinisa.nasamreza.org +2 -2
    Making a better fix for double released pointers and safe 
    TMP_TABLE_PARAM.
    This involved moving things around in include files.
    All tests, including the ones with Valgrind passed.

  sql/sql_derived.cc
    1.43 03/04/26 15:12:08 Sinisa@sinisa.nasamreza.org +1 -1
    Making a better fix for double released pointers and safe 
    TMP_TABLE_PARAM.
    This involved moving things around in include files.
    All tests, including the ones with Valgrind passed.

  sql/sql_class.h
    1.146.9.1 03/04/26 15:12:08 Sinisa@sinisa.nasamreza.org +42 -1
    Making a better fix for double released pointers and safe 
    TMP_TABLE_PARAM.
    This involved moving things around in include files.
    All tests, including the ones with Valgrind passed.

ChangeSet
  1.1346.168.47 03/04/26 14:54:53 igor@hundin.mysql.fi +3 -0
  filesort.cc, order_by.result:
     Fixed bug 263
  order_by.test:
    Fixed bug 263

  sql/filesort.cc
    1.45.1.10 03/04/26 14:53:39 igor@hundin.mysql.fi +7 -4
     Fixed bug 263

  mysql-test/r/order_by.result
    1.11.1.6 03/04/26 14:53:02 igor@hundin.mysql.fi +25 -0
     Fixed bug 263

  mysql-test/t/order_by.test
    1.9.2.3 03/04/26 14:52:14 igor@hundin.mysql.fi +14 -0
    Fixed bug 263

ChangeSet
  1.1346.188.3 03/04/25 21:58:25 lenz@mysql.com +1 -0
   - Applied patch provided by Martin Mokrejs <mmokrejs@natur.cuni.cz>
     (General code cleanup, use the GRANT statement instead of updating
     the privilege tables directly, added option to revoke privileges)

  scripts/mysql_setpermission.sh
    1.4 03/04/25 21:58:23 lenz@mysql.com +112 -121
     - Applied patch provided by Martin Mokrejs <mmokrejs@natur.cuni.cz>
       (General code cleanup, use the GRANT statement instead of updating
       the privilege tables directly, added option to revoke privileges)

ChangeSet
  1.1346.168.45 03/04/25 21:12:44 heikki@hundin.mysql.fi +1 -0
  ut0dbg.h:
    Print the failing assertion if it fails; helps to analyze bug reports

  innobase/include/ut0dbg.h
    1.9 03/04/25 21:12:15 heikki@hundin.mysql.fi +3 -2
    Print the failing assertion if it fails; helps to analyze bug reports

ChangeSet
  1.1346.168.44 03/04/25 21:28:11 hf@deer.mysql.r18.ru +1 -0
  Trimming code with Monty's suggestions

  strings/ctype-tis620.c
    1.16.2.2 03/04/25 21:28:06 hf@deer.mysql.r18.ru +82 -90
    thai2sortable code optimized
    all the file formatted with company standards

ChangeSet
  1.1346.187.2 03/04/25 14:42:01 lenz@mysql.com +2 -0
   - Updated innodb test results on Heikki's request (InnoDB now supports
     ANALYZE TABLE)

  mysql-test/r/innodb.result
    1.40.4.2 03/04/25 14:41:59 lenz@mysql.com +3 -3
     - Updated innodb test results on Heikki's request (InnoDB now supports
       ANALYZE TABLE)

  BitKeeper/etc/ignore
    1.107.1.39 03/04/25 14:41:59 lenz@mysql.com +1 -0
    Added support-files/MacOSX/ReadMe.txt to the ignore list

ChangeSet
  1.1346.188.1 03/04/25 16:27:16 bar@bar.mysql.r18.ru +1 -0
  ctype-tis620.c:
    Don't allow access outside the string

  strings/ctype-tis620.c
    1.16.2.1 03/04/25 16:26:22 bar@bar.mysql.r18.ru +1 -1
    Don't allow access outside the string

ChangeSet
  1.1346.187.1 03/04/25 13:02:44 lenz@mysql.com +3 -0
   - support-files/MacOSX/ReadMe.txt is now autogenerated from the manual
     instead of being an individual file to avoid redundancy

  support-files/MacOSX/Makefile.am
    1.3 03/04/25 13:02:42 lenz@mysql.com +2 -1
     - Added MacOS X ReadMe.txt to CLEANFILES now that it's being autogenerated

  Docs/Makefile.am
    1.37 03/04/25 13:02:42 lenz@mysql.com +4 -1
     - Generate the MacOS ReadMe.txt from the manual

ChangeSet
  1.1504.27.9 03/04/25 12:31:51 guilhem@mysql.com +1 -0
  forgot to commit this one in cset 1.1561 (replication)

  sql/ha_innodb.cc
    1.90 03/04/25 12:31:43 guilhem@mysql.com +4 -4
    forgot to commit this one in cset 1.1561 (replication)

  BitKeeper/deleted/.del-ReadMe.txt~bd880aa05a0baccd
    1.4 03/04/25 12:13:38 lenz@mysql.com +92 -77
    Delete: support-files/MacOSX/ReadMe.txt

ChangeSet
  1.1346.184.13 03/04/24 20:48:54 greg@mysql.com +7 -0
  Changes from Novell for NetWare platform

  sql/sql_load.cc
    1.34.1.12 03/04/24 20:48:52 greg@mysql.com +1 -1
    Stat properites should not be checked here on NetWare.

  sql/slave.cc
    1.164.1.55 03/04/24 20:48:52 greg@mysql.com +0 -4
    Consolidated NetWare pthread_exit() changes.

  sql/mysqld.cc
    1.297.1.121 03/04/24 20:48:52 greg@mysql.com +3 -5
    Consolidated NetWare pthread_exit() changes.

  sql/mini_client.cc
    1.48.1.3 03/04/24 20:48:52 greg@mysql.com +1 -1
    Modified to match my_connect().

  mysys/my_pthread.c
    1.35.1.1 03/04/24 20:48:52 greg@mysql.com +23 -0
    Consolidated NetWare pthread_exit() changes.

  mysys/mf_path.c
    1.9 03/04/24 20:48:52 greg@mysql.com +3 -0
    NetWare needs a semicolon path delimiter.

  include/my_pthread.h
    1.57.1.5 03/04/24 20:48:52 greg@mysql.com +5 -0
    Consolidated NetWare pthread_exit() changes.

ChangeSet
  1.1346.184.12 03/04/24 18:15:52 greg@mysql.com +14 -0
  Minor changes in netware directory (From Rob Lyon - Novell)

  netware/BUILD/crontab
    1.1 03/04/24 18:15:51 greg@mysql.com +4 -0

  netware/BUILD/crontab
    1.0 03/04/24 18:15:51 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/crontab

  netware/BUILD/cron-build
    1.1 03/04/24 18:15:50 greg@mysql.com +46 -0

  netware/BUILD/nwbootstrap
    1.4 03/04/24 18:15:50 greg@mysql.com +10 -2
    Add target path suffix

  netware/BUILD/mwldnlm
    1.3 03/04/24 18:15:50 greg@mysql.com +3 -0
    Turned on error checking in all NetWare build scripts.

  netware/BUILD/mwccnlm
    1.3 03/04/24 18:15:50 greg@mysql.com +3 -0
    Turned on error checking in all NetWare build scripts.

  netware/BUILD/mwasmnlm
    1.3 03/04/24 18:15:50 greg@mysql.com +3 -0
    Turned on error checking in all NetWare build scripts.

  netware/BUILD/cron-build
    1.0 03/04/24 18:15:50 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/cron-build

  netware/BUILD/compile-netware-standard
    1.3 03/04/24 18:15:50 greg@mysql.com +7 -0
    Turned on error checking in all NetWare build scripts.

  netware/BUILD/compile-netware-debug
    1.3 03/04/24 18:15:50 greg@mysql.com +6 -0
    Turned on error checking in all NetWare build scripts.

  netware/BUILD/compile-netware-all
    1.3 03/04/24 18:15:50 greg@mysql.com +6 -0
    Turned on error checking in all NetWare build scripts.

  netware/BUILD/compile-netware-START
    1.3 03/04/24 18:15:50 greg@mysql.com +4 -1
    Turned on error checking in all NetWare build scripts.

  netware/BUILD/compile-netware-END
    1.3 03/04/24 18:15:50 greg@mysql.com +6 -0
    Turned on error checking in all NetWare build scripts.

  netware/BUILD/compile-linux-tools
    1.3 03/04/24 18:15:50 greg@mysql.com +4 -1
    Turned on error checking in all NetWare build scripts.

  netware/BUILD/compile-AUTOTOOLS
    1.3 03/04/24 18:15:50 greg@mysql.com +6 -0
    Turned on error checking in all NetWare build scripts.

ChangeSet
  1.1346.184.11 03/04/24 23:24:11 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    When FLUSH LOGS is called, flush InnoDB logs to disk also in the case innodb_flush_log_at_trx_commit=0

  sql/ha_innodb.cc
    1.73.11.7 03/04/24 23:23:57 heikki@hundin.mysql.fi +1 -0
    When FLUSH LOGS is called, flush InnoDB logs to disk also in the case innodb_flush_log_at_trx_commit=0

ChangeSet
  1.1346.184.10 03/04/24 23:03:00 heikki@hundin.mysql.fi +1 -0
  srv0srv.c:
    Make sure we do not do insert buffer merge in fast shutdown even if there is some buglet which increments srv_activity_counter during a shutdown

  innobase/srv/srv0srv.c
    1.35.1.6 03/04/24 23:02:52 heikki@hundin.mysql.fi +5 -5
    Make sure we do not do insert buffer merge in fast shutdown even if there is some buglet which increments srv_activity_counter during a shutdown

ChangeSet
  1.1346.184.9 03/04/24 21:51:00 heikki@hundin.mysql.fi +1 -0
  srv0srv.c:
    Make buffer pool flush batches bigger as that may save some time if fsync is very inefficient

  innobase/srv/srv0srv.c
    1.35.1.5 03/04/24 21:50:40 heikki@hundin.mysql.fi +10 -6
    Make buffer pool flush batches bigger as that may save some time if fsync is very inefficient

ChangeSet
  1.1504.27.8 03/04/24 15:32:37 guilhem@mysql.com +3 -0
  Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/mysql_src/mysql-4.1

ChangeSet
  1.1504.32.2 03/04/24 14:49:41 igor@hundin.mysql.fi +6 -0
  Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
  into hundin.mysql.fi:/home/igor/dev/mysql-4.1

ChangeSet
  1.1504.31.1 03/04/24 11:37:55 vva@eagle.mysql.r18.ru +1 -0
  added '.' to end of compressed string

  sql/item_strfunc.cc
    1.99.2.2 03/04/24 11:37:53 vva@eagle.mysql.r18.ru +10 -1
    added '.' to end of compressed string

  sql/sql_class.h
    1.146.1.19 03/04/24 15:32:30 guilhem@mysql.com +0 -0
    Auto merged

  sql/set_var.cc
    1.34.1.11 03/04/24 15:32:30 guilhem@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.7 03/04/24 15:32:30 guilhem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1504.27.7 03/04/24 15:29:25 guilhem@mysql.com +14 -0
  Replication: new code to not modify in-memory log positions until the COMMIT
  is executed, even if the transaction spans on >=2 relay logs (bug #53).
  New variable relay_log_purge =0|1
  New test to verify bug #53

  mysql-test/t/rpl_relayrotate.test
    1.1 03/04/24 15:29:16 guilhem@mysql.com +61 -0

  mysql-test/t/rpl_relayrotate-slave.opt
    1.1 03/04/24 15:29:16 guilhem@mysql.com +4 -0

  mysql-test/t/rpl_relayrotate.test
    1.0 03/04/24 15:29:16 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.1/mysql-test/t/rpl_relayrotate.test

  mysql-test/t/rpl_relayrotate-slave.opt
    1.0 03/04/24 15:29:16 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.1/mysql-test/t/rpl_relayrotate-slave.opt

  mysql-test/r/rpl_relayrotate.result
    1.1 03/04/24 15:29:15 guilhem@mysql.com +18 -0

  sql/sql_repl.cc
    1.102.1.1 03/04/24 15:29:15 guilhem@mysql.com +21 -20
    Better tracking of the relay log's name and position
    lastly executed, even if we are in a transaction which spans on
    2 or more relay logs.
    Turn relay_log_purge silently off when someone does CHANGE
    MASTER TO RELAY_LOG_*

  mysql-test/r/rpl_relayrotate.result
    1.0 03/04/24 15:29:15 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.1/mysql-test/r/rpl_relayrotate.result

  sql/sql_parse.cc
    1.271.3.5 03/04/24 15:29:14 guilhem@mysql.com +1 -1
    removed thd argument (was not used in the function's body)

  sql/sql_class.h
    1.146.8.1 03/04/24 15:29:14 guilhem@mysql.com +6 -4
    prototypes change

  sql/slave.h
    1.60 03/04/24 15:29:14 guilhem@mysql.com +51 -40
    Better tracking of the relay log's name and position
    lastly executed, even if we are in a transaction which spans on
    2 or more relay logs.

  sql/slave.cc
    1.188.1.3 03/04/24 15:29:14 guilhem@mysql.com +99 -105
    Better tracking of the relay log's name and position
    lastly executed, even if we are in a transaction which spans on
    2 or more relay logs.
    Now we purge a relay log only when we are sure we won't need it,
    i.e. we have executed the final query (if autocommit=1) or the COMMIT

  sql/set_var.cc
    1.34.3.1 03/04/24 15:29:14 guilhem@mysql.com +10 -0
    new variable relay_log_purge

  sql/repl_failsafe.cc
    1.27 03/04/24 15:29:13 guilhem@mysql.com +7 -4
    Better tracking of the relay log's name and position
    lastly executed, even if we are in a transaction which spans on
    2 or more relay logs.

  sql/mysqld.cc
    1.356.3.1 03/04/24 15:29:13 guilhem@mysql.com +41 -15
    new option --innodb (replaces --skip-innodb).
    Useful for the test suite : we have skip-innodb in mysql-test-run,
    but we can ('-opt.info' file) choose to start the server with
    InnoDB for this test only.
    New option --bdb 

  sql/mysql_priv.h
    1.186.1.5 03/04/24 15:29:12 guilhem@mysql.com +1 -1
    new option relay_log_purge (the user can now decide himself
    if he wants his relay logs to be automatically purged or not,
    we don't make unsafe guesses like before)

  sql/log_event.cc
    1.113.1.2 03/04/24 15:29:12 guilhem@mysql.com +49 -31
    Better tracking of the relay log's name and position
    lastly executed, even if we are in a transaction which spans on
    2 or more relay logs.

  sql/log.cc
    1.108.1.2 03/04/24 15:29:11 guilhem@mysql.com +105 -62
    Now we purge a relay log only when we are sure we won't need it,
    i.e. we have executed the final query (if autocommit=1) or the COMMIT.

ChangeSet
  1.1346.184.8 03/04/24 15:34:43 heikki@hundin.mysql.fi +2 -0
  ha_innodb.h, ha_innodb.cc:
    Make ANALYZE TABLE to update index cardinality and other statistics also for an InnoDB table; note that the estimates are based on 10 random dives, not on an exhaustive read of the table

  sql/ha_innodb.h
    1.48.2.6 03/04/24 15:34:32 heikki@hundin.mysql.fi +1 -0
    Make ANALYZE TABLE to update index cardinality and other statistics also for an InnoDB table; note that the estimates are based on 10 random dives, not on an exhaustive read of the table

  sql/ha_innodb.cc
    1.73.11.6 03/04/24 15:34:29 heikki@hundin.mysql.fi +17 -0
    Make ANALYZE TABLE to update index cardinality and other statistics also for an InnoDB table; note that the estimates are based on 10 random dives, not on an exhaustive read of the table

  sql/sql_select.cc
    1.216.2.2 03/04/24 14:49:36 igor@hundin.mysql.fi +0 -0
    Auto merged

  sql/sql_class.h
    1.146.1.18 03/04/24 14:49:36 igor@hundin.mysql.fi +0 -0
    Auto merged

  sql/sql_base.cc
    1.145.1.2 03/04/24 14:49:36 igor@hundin.mysql.fi +0 -0
    Auto merged

  sql/set_var.cc
    1.34.1.10 03/04/24 14:49:36 igor@hundin.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.6 03/04/24 14:49:36 igor@hundin.mysql.fi +0 -0
    Auto merged

  mysql-test/r/ctype_collate.result
    1.13 03/04/24 14:49:35 igor@hundin.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1504.30.2 03/04/24 14:49:01 igor@hundin.mysql.fi +3 -0
  func_gconcat.result, ctype_many.result:
     Added the MAX_LENGTH_FOR_SORT_DATA option
  ctype_collate.result:
    Added the MAX_LENGTH_FOR_SORT_DATA option

  mysql-test/r/func_gconcat.result
    1.6 03/04/24 14:48:33 igor@hundin.mysql.fi +1 -1
     Added the MAX_LENGTH_FOR_SORT_DATA option

  mysql-test/r/ctype_many.result
    1.4 03/04/24 14:47:49 igor@hundin.mysql.fi +1 -1
     Added the MAX_LENGTH_FOR_SORT_DATA option

  mysql-test/r/ctype_collate.result
    1.11.1.1 03/04/24 14:46:34 igor@hundin.mysql.fi +42 -42
    Added the MAX_LENGTH_FOR_SORT_DATA option

ChangeSet
  1.1504.30.1 03/04/24 14:33:33 igor@hundin.mysql.fi +15 -0
  Many files:
     Added the MAX_LENGTH_FOR_SORT_DATA option
  filesort.cc:
    Added the MAX_LENGTH_FOR_SORT_DATA option

  sql/uniques.cc
    1.14 03/04/24 14:32:55 igor@hundin.mysql.fi +5 -5
     Added the MAX_LENGTH_FOR_SORT_DATA option

  sql/table.h
    1.47 03/04/24 14:32:52 igor@hundin.mysql.fi +12 -3
     Added the MAX_LENGTH_FOR_SORT_DATA option

  sql/structs.h
    1.29 03/04/24 14:32:48 igor@hundin.mysql.fi +1 -0
     Added the MAX_LENGTH_FOR_SORT_DATA option

  sql/sql_update.cc
    1.83.2.2 03/04/24 14:32:42 igor@hundin.mysql.fi +2 -2
     Added the MAX_LENGTH_FOR_SORT_DATA option

  sql/sql_table.cc
    1.157.3.1 03/04/24 14:32:30 igor@hundin.mysql.fi +5 -5
     Added the MAX_LENGTH_FOR_SORT_DATA option

  sql/sql_sort.h
    1.4 03/04/24 14:30:37 igor@hundin.mysql.fi +30 -3
     Added the MAX_LENGTH_FOR_SORT_DATA option

  sql/sql_select.cc
    1.216.3.1 03/04/24 14:30:31 igor@hundin.mysql.fi +11 -11
     Added the MAX_LENGTH_FOR_SORT_DATA option

  sql/sql_delete.cc
    1.99.3.1 03/04/24 14:30:23 igor@hundin.mysql.fi +5 -5
     Added the MAX_LENGTH_FOR_SORT_DATA option

  sql/sql_class.h
    1.146.7.1 03/04/24 14:30:17 igor@hundin.mysql.fi +1 -0
     Added the MAX_LENGTH_FOR_SORT_DATA option

  sql/sql_base.cc
    1.145.2.1 03/04/24 14:30:13 igor@hundin.mysql.fi +4 -9
     Added the MAX_LENGTH_FOR_SORT_DATA option

  sql/set_var.cc
    1.34.2.1 03/04/24 14:30:09 igor@hundin.mysql.fi +6 -0
     Added the MAX_LENGTH_FOR_SORT_DATA option

  sql/records.cc
    1.19.2.1 03/04/24 14:29:22 igor@hundin.mysql.fi +92 -9
     Added the MAX_LENGTH_FOR_SORT_DATA option

  sql/opt_range.cc
    1.88 03/04/24 14:29:12 igor@hundin.mysql.fi +4 -4
     Added the MAX_LENGTH_FOR_SORT_DATA option

  sql/mysqld.cc
    1.356.2.1 03/04/24 14:27:03 igor@hundin.mysql.fi +6 -1
     Added the MAX_LENGTH_FOR_SORT_DATA option

  sql/filesort.cc
    1.70.1.2 03/04/24 14:21:51 igor@hundin.mysql.fi +353 -136
    Added the MAX_LENGTH_FOR_SORT_DATA option

ChangeSet
  1.1346.184.7 03/04/24 09:18:53 monty@narttu.mysql.fi +24 -0
  Fixed bug in SET SQL_BIG_SELECTS

  sql/share/ukrainian/errmsg.txt
    1.11.2.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Updated error messages

  sql/share/swedish/errmsg.txt
    1.46.2.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Updated error messages

  sql/share/spanish/errmsg.txt
    1.47.2.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Updated error messages

  sql/share/slovak/errmsg.txt
    1.46.2.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Updated error messages

  sql/share/russian/errmsg.txt
    1.45.2.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Updated error messages

  sql/share/romanian/errmsg.txt
    1.44.2.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Updated error messages

  sql/share/portuguese/errmsg.txt
    1.47.2.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Updated error messages

  sql/share/norwegian/errmsg.txt
    1.45.2.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Updated error messages

  sql/share/norwegian-ny/errmsg.txt
    1.45.2.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Updated error messages

  sql/share/korean/errmsg.txt
    1.45.2.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Updated error messages

  sql/share/japanese/errmsg.txt
    1.45.2.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Updated error messages

  sql/share/italian/errmsg.txt
    1.52.2.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Updated error messages

  sql/share/hungarian/errmsg.txt
    1.47.2.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Updated error messages

  sql/share/greek/errmsg.txt
    1.46.2.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Updated error messages

  sql/share/german/errmsg.txt
    1.47.2.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Updated error messages

  sql/share/french/errmsg.txt
    1.46.2.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Updated error messages

  sql/share/estonian/errmsg.txt
    1.47.2.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Updated error messages

  sql/share/english/errmsg.txt
    1.51.2.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Updated error messages

  sql/share/dutch/errmsg.txt
    1.49.2.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Updated error messages

  sql/share/danish/errmsg.txt
    1.45.2.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Updated error messages

  sql/share/czech/errmsg.txt
    1.46.2.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Updated error messages

  sql/set_var.cc
    1.12.3.1 03/04/24 09:18:51 monty@narttu.mysql.fi +1 -1
    Fixed bug in SQL_BIG_SELECTS

  mysql-test/t/select_safe.test
    1.3.1.1 03/04/24 09:18:51 monty@narttu.mysql.fi +29 -7
    Added test for SQL_BIG_SELECTS

  mysql-test/r/select_safe.result
    1.4.1.1 03/04/24 09:18:51 monty@narttu.mysql.fi +26 -2
    Updated results

ChangeSet
  1.1504.29.1 03/04/24 08:22:11 hf@deer.mysql.r18.ru +1 -0
  SCRUM
  two versions of KILL
  small fix

  sql/sql_select.cc
    1.221 03/04/24 08:22:06 hf@deer.mysql.r18.ru +1 -1
    it's more logical to use killed here

ChangeSet
  1.1346.184.6 03/04/24 02:23:25 monty@narttu.mysql.fi +2 -0
  Changed test slightly to make it repeatable
  (There was a problem on some AMD system when the floating point precision wasn't accurate enough)

  mysql-test/t/group_by.test
    1.13.1.9 03/04/24 02:23:24 monty@narttu.mysql.fi +2 -0
    Changed test slightly to make it repeatable

  mysql-test/r/group_by.result
    1.16.1.15 03/04/24 02:23:24 monty@narttu.mysql.fi +4 -2
    new test result

ChangeSet
  1.1346.184.5 03/04/24 00:36:48 monty@narttu.mysql.fi +6 -0
  merge

  support-files/my-large.cnf.sh
    1.18 03/04/24 00:36:47 monty@narttu.mysql.fi +1 -1
    Added query_cache_size

  support-files/my-huge.cnf.sh
    1.19 03/04/24 00:36:47 monty@narttu.mysql.fi +1 -1
    Added query_cache_size

  sql/sql_list.h
    1.10.1.2 03/04/24 00:09:42 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.297.1.120 03/04/24 00:09:42 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.h
    1.48.2.5 03/04/24 00:09:42 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.73.11.5 03/04/24 00:09:42 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.676.295.2 03/04/24 00:09:19 monty@narttu.mysql.fi +1 -0
  Put changeset number in emails

  BitKeeper/triggers/post-commit
    1.8.1.6 03/04/24 00:09:19 monty@narttu.mysql.fi +5 -3
    Put changeset number in emails

ChangeSet
  1.1346.186.1 03/04/23 13:20:23 peterg@mysql.com +1 -0
  Minor changes to PeterG's internals documentation per comments 
  from Monty.

  Docs/internals.texi
    1.22.1.5 03/04/23 13:20:21 peterg@mysql.com +131 -183
    Minor changes to PeterG's internals documentation per comments 
    from Monty.

ChangeSet
  1.1504.1.42 03/04/23 22:31:47 bell@sanja.is.com.ua +5 -0
  subselect in procedure argument list (Bug #302)

  sql/sql_parse.cc
    1.285 03/04/23 22:31:39 bell@sanja.is.com.ua +5 -0
    subselect in procedure argument list

  sql/sp_head.cc
    1.27 03/04/23 22:31:39 bell@sanja.is.com.ua +6 -0
    subselect in procedure argument list

  mysql-test/t/subselect.test
    1.61 03/04/23 22:31:39 bell@sanja.is.com.ua +20 -0
    test of subselect in procedure argument list

  mysql-test/r/subselect.result
    1.71 03/04/23 22:31:39 bell@sanja.is.com.ua +17 -0
    test of subselect in procedure argument list

  BitKeeper/etc/ignore
    1.151.1.1 03/04/23 22:31:39 bell@sanja.is.com.ua +3 -0
    Added libmysqld/sp_pcontext.cc libmysqld/sp.cc libmysqld/sp_head.cc to the ignore list

ChangeSet
  1.1346.185.1 03/04/23 21:52:16 monty@narttu.mysql.fi +50 -0
  Fixes for valgrind
  Added optimzation for clustered index
  Fixed bug in UPDATE ... ORDER BY
  Fixed handling of UPDATE ... LIMIT

  support-files/my-large.cnf.sh
    1.16.1.1 03/04/23 21:52:14 monty@narttu.mysql.fi +1 -0
    Added default size for query cache

  support-files/my-huge.cnf.sh
    1.17.1.1 03/04/23 21:52:14 monty@narttu.mysql.fi +1 -0
    Added default size for query cache

  sql/sql_update.cc
    1.54.5.1 03/04/23 21:52:14 monty@narttu.mysql.fi +82 -63
    Fixed bug in UPDATE ... ORDER BY
    Fixed handling of UPDATE ... LIMIT

  sql/sql_union.cc
    1.22.1.19 03/04/23 21:52:14 monty@narttu.mysql.fi +2 -1
    Removed some usage of current_thd

  sql/sql_select.h
    1.22.2.5 03/04/23 21:52:14 monty@narttu.mysql.fi +2 -2
    Removed some usage of current_thd

  sql/sql_select.cc
    1.152.16.1 03/04/23 21:52:14 monty@narttu.mysql.fi +14 -10
    Removed some usage of current_thd

  sql/sql_list.h
    1.10.2.1 03/04/23 21:52:14 monty@narttu.mysql.fi +1 -1
    Fixed comment

  sql/records.cc
    1.19.1.1 03/04/23 21:52:14 monty@narttu.mysql.fi +1 -1
    Fixed comment

  sql/opt_range.cc
    1.54.1.24 03/04/23 21:52:14 monty@narttu.mysql.fi +8 -4
    Added optimzation for clustered index

  sql/mysqld.cc
    1.297.29.1 03/04/23 21:52:14 monty@narttu.mysql.fi +1 -1
    Fix bug when compiling for purify/valgrind

  sql/item_sum.cc
    1.25.1.7 03/04/23 21:52:14 monty@narttu.mysql.fi +3 -2
    Removed some usage of current_thd

  sql/handler.h
    1.71.1.12 03/04/23 21:52:14 monty@narttu.mysql.fi +2 -1
    Added optimzation for clustered index

  sql/ha_innodb.h
    1.48.3.1 03/04/23 21:52:14 monty@narttu.mysql.fi +1 -0
    Added optimzation for clustered index

  sql/ha_innodb.cc
    1.73.12.1 03/04/23 21:52:14 monty@narttu.mysql.fi +25 -4
    Added optimzation for clustered index

  sql/ha_heap.h
    1.19.1.1 03/04/23 21:52:14 monty@narttu.mysql.fi +3 -2
    Added optimzation for clustered index

  sql/field.cc
    1.51.1.21 03/04/23 21:52:14 monty@narttu.mysql.fi +1 -1
    Simple optimization

  mysql-test/t/update.test
    1.6.1.2 03/04/23 21:52:14 monty@narttu.mysql.fi +9 -5
    Better test for UPDATE ... ORDER BY

  mysql-test/t/multi_update.test
    1.17.2.1 03/04/23 21:52:14 monty@narttu.mysql.fi +1 -1
    Slight change of test to catch more bugs

  mysql-test/t/join_outer.test
    1.6.2.1 03/04/23 21:52:14 monty@narttu.mysql.fi +1 -1
    Changed test to be repeatable

  mysql-test/t/innodb.test
    1.28.2.1 03/04/23 21:52:14 monty@narttu.mysql.fi +53 -0
    Added test for UPDATE ... ORDER BY

  mysql-test/t/group_by.test
    1.13.1.8 03/04/23 21:52:14 monty@narttu.mysql.fi +3 -13
    Added extra explain to 'suspicious' test.

  mysql-test/r/update.result
    1.8.1.2 03/04/23 21:52:14 monty@narttu.mysql.fi +33 -7
    New test results

  mysql-test/r/null_key.result
    1.10.1.6 03/04/23 21:52:14 monty@narttu.mysql.fi +1 -1
    New test results

  mysql-test/r/multi_update.result
    1.15.2.1 03/04/23 21:52:14 monty@narttu.mysql.fi +10 -10
    New test results

  mysql-test/r/join_outer.result
    1.10.2.1 03/04/23 21:52:14 monty@narttu.mysql.fi +2 -2
    New test results

  mysql-test/r/innodb.result
    1.40.4.1 03/04/23 21:52:14 monty@narttu.mysql.fi +71 -0
    New test results

  mysql-test/r/group_by.result
    1.16.1.14 03/04/23 21:52:14 monty@narttu.mysql.fi +19 -23
    New test results

  myisam/mi_info.c
    1.12 03/04/23 21:52:14 monty@narttu.mysql.fi +1 -1
    Updated comment

  include/my_global.h
    1.34.1.6 03/04/23 21:52:14 monty@narttu.mysql.fi +6 -0
    Fix for purify/valgrind

ChangeSet
  1.1346.168.40 03/04/23 22:46:47 serg@sergbook.mysql.com +1 -0
  do not execute \* commands inside `identifiers`

  client/mysql.cc
    1.93.1.42 03/04/23 22:46:45 serg@sergbook.mysql.com +1 -1
    do not execute \* commands inside `identifiers`

ChangeSet
  1.1346.1.102 03/04/23 21:44:24 Sinisa@sinisa.nasamreza.org +1 -0
  improved bug fix

  sql/sql_select.cc
    1.152.1.78 03/04/23 21:44:20 Sinisa@sinisa.nasamreza.org +10 -2
    somewhat improved bug fix

ChangeSet
  1.1346.184.3 03/04/23 13:27:39 mmatthew@markslaptop. +2 -0
  config-win.h:
    Enable 'LOAD LOCAL INFILE', for parity with unix binaries.

  BitKeeper/etc/logging_ok
    1.206.1.61 03/04/23 13:26:50 mmatthew@markslaptop. +1 -0
    Logging to logging@openlogging.org accepted

ChangeSet
  1.1346.184.2 03/04/23 11:43:30 peterg@mysql.com +2 -0
  Modify PeterG's internals documentation per Monty. Added 
  more detailed explanation of record header and column 
  storage.

  BitKeeper/etc/logging_ok
    1.206.1.60 03/04/23 11:43:30 peterg@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  Docs/internals.texi
    1.22.1.4 03/04/23 11:43:16 peterg@mysql.com +7 -1
    Modify PeterG's internals documentation per Monty. Added 
    more detailed explanation of record header and column 
    storage.

  include/config-win.h
    1.23.1.3 03/04/23 13:19:48 mmatthew@markslaptop. +3 -0
    Enable 'LOAD LOCAL INFILE', for parity with unix binaries.

ChangeSet
  1.1346.1.101 03/04/23 20:42:07 Sinisa@sinisa.nasamreza.org +1 -0
  properly back quoting db.table names in SHOW GRANTS

  sql/sql_acl.cc
    1.51.1.43 03/04/23 20:41:58 Sinisa@sinisa.nasamreza.org +3 -3
    properly back quoting db.table names in SHOW GRANTS

ChangeSet
  1.1504.28.1 03/04/23 19:37:33 hf@deer.mysql.r18.ru +11 -0
  SCRUM
  Protocol_cursor class and sql-common/ directory

  sql/protocol_cursor.cc
    1.1 03/04/23 19:37:29 hf@deer.mysql.r18.ru +143 -0

  sql/protocol_cursor.cc
    1.0 03/04/23 19:37:29 hf@deer.mysql.r18.ru +0 -0
    BitKeeper file /home/hf/work/mysql-4.1.cursor/sql/protocol_cursor.cc

  sql-common/pack.c
    1.1 03/04/23 19:37:28 hf@deer.mysql.r18.ru +64 -0

  sql/protocol.h
    1.9 03/04/23 19:37:28 hf@deer.mysql.r18.ru +24 -2
    Protocol_cursor class added

  sql/mini_client.cc
    1.61 03/04/23 19:37:28 hf@deer.mysql.r18.ru +11 -73
    mc_net_field_length functions replaced with net_field_length

  sql/Makefile.am
    1.77.1.4 03/04/23 19:37:28 hf@deer.mysql.r18.ru +4 -2
    pack.c added to the sources

  sql-common/pack.c
    1.0 03/04/23 19:37:28 hf@deer.mysql.r18.ru +0 -0
    BitKeeper file /home/hf/work/mysql-4.1.cursor/sql-common/pack.c

  libmysql/libmysql.c
    1.156 03/04/23 19:37:28 hf@deer.mysql.r18.ru +4 -68
    net_field_length removed from here

  libmysql/Makefile.shared
    1.45 03/04/23 19:37:28 hf@deer.mysql.r18.ru +3 -1
    pack.lo target added

  libmysql/Makefile.am
    1.34 03/04/23 19:37:28 hf@deer.mysql.r18.ru +5 -0
    sql-common files symlinked

  include/mysql_com.h
    1.67.1.1 03/04/23 19:37:28 hf@deer.mysql.r18.ru +4 -0
    net_field_length declaration added

  include/mysql.h
    1.65 03/04/23 19:37:28 hf@deer.mysql.r18.ru +4 -0
    net_field_length_ll declaration added

  Makefile.am
    1.47 03/04/23 19:37:28 hf@deer.mysql.r18.ru +1 -1
    pack.c added to linked sources

ChangeSet
  1.1504.1.41 03/04/23 16:21:56 pem@mysql.com +1 -0
  Fixes bug #302: call u((select 1)) now works.
  More complex cases, like call u((select x from table limit 1)) does not.

  sql/sp_head.cc
    1.26 03/04/23 16:21:55 pem@mysql.com +1 -1
    Fixes bug #302: call u((select 1)) now works.
    More complex cases, like call u((select x from table limit 1)) does not.

ChangeSet
  1.1504.27.6 03/04/23 18:38:54 bar@bar.mysql.r18.ru +1 -0
  set_var.cc:
    We don't need this code any more. It was used to initialize CONVERT structure in 4.0.

  sql/set_var.cc
    1.34.1.9 03/04/23 18:38:18 bar@bar.mysql.r18.ru +0 -6
    We don't need this code any more. It was used to initialize CONVERT structure in 4.0.

ChangeSet
  1.1504.27.5 03/04/23 18:19:22 bar@bar.mysql.r18.ru +13 -0
  Variable names have been renamed:
  
    client_collation -> collation_client
    result_collation -> collation_results
    connection_collation -> collation_connection

  sql/sql_yacc.yy
    1.203.28.5 03/04/23 18:19:20 bar@bar.mysql.r18.ru +13 -14
    Variable names have been renamed:
    
      client_collation -> collation_client
      result_collation -> collation_results
      connection_collation -> collation_connection

  BitKeeper/etc/ignore
    1.152 03/04/23 18:19:20 bar@bar.mysql.r18.ru +1 -0
    Added client/ssl_test to the ignore list

  sql/sql_class.h
    1.146.1.17 03/04/23 18:19:19 bar@bar.mysql.r18.ru +4 -4
    Variable names have been renamed:
    
      client_collation -> collation_client
      result_collation -> collation_results
      connection_collation -> collation_connection

  sql/sql_class.cc
    1.105.1.9 03/04/23 18:19:19 bar@bar.mysql.r18.ru +0 -1
    Variable names have been renamed:
    
      client_collation -> collation_client
      result_collation -> collation_results
      connection_collation -> collation_connection

  sql/set_var.h
    1.21 03/04/23 18:19:19 bar@bar.mysql.r18.ru +14 -14
    Variable names have been renamed:
    
      client_collation -> collation_client
      result_collation -> collation_results
      connection_collation -> collation_connection

  sql/set_var.cc
    1.34.1.8 03/04/23 18:19:19 bar@bar.mysql.r18.ru +41 -41
    Variable names have been renamed:
    
      client_collation -> collation_client
      result_collation -> collation_results
      connection_collation -> collation_connection

  sql/protocol.cc
    1.56.1.1 03/04/23 18:19:19 bar@bar.mysql.r18.ru +1 -1
    Variable names have been renamed:
    
      client_collation -> collation_client
      result_collation -> collation_results
      connection_collation -> collation_connection

  sql/mysqld.cc
    1.356.1.5 03/04/23 18:19:19 bar@bar.mysql.r18.ru +6 -6
    Variable names have been renamed:
    
      client_collation -> collation_client
      result_collation -> collation_results
      connection_collation -> collation_connection

  sql/item.cc
    1.58.7.2 03/04/23 18:19:19 bar@bar.mysql.r18.ru +1 -1
    Variable names have been renamed:
    
      client_collation -> collation_client
      result_collation -> collation_results
      connection_collation -> collation_connection

  mysql-test/t/variables.test
    1.18 03/04/23 18:19:19 bar@bar.mysql.r18.ru +2 -2
    Variable names have been renamed:
    
      client_collation -> collation_client
      result_collation -> collation_results
      connection_collation -> collation_connection

  mysql-test/t/ctype_collate.test
    1.9 03/04/23 18:19:19 bar@bar.mysql.r18.ru +10 -10
    Variable names have been renamed:
    
      client_collation -> collation_client
      result_collation -> collation_results
      connection_collation -> collation_connection

  mysql-test/r/variables.result
    1.21.1.2 03/04/23 18:19:19 bar@bar.mysql.r18.ru +3 -3
    Variable names have been renamed:
    
      client_collation -> collation_client
      result_collation -> collation_results
      connection_collation -> collation_connection

  mysql-test/r/ctype_collate.result
    1.12 03/04/23 18:19:19 bar@bar.mysql.r18.ru +20 -20
    Variable names have been renamed:
    
      client_collation -> collation_client
      result_collation -> collation_results
      connection_collation -> collation_connection

ChangeSet
  1.1346.184.1 03/04/23 18:00:07 gluh@gluh.mysql.r18.ru +3 -0
  Task 761:'mysqlbinlog should not die when reading
  unknown event'

  sql/log_event.h
    1.71.1.5 03/04/23 17:59:55 gluh@gluh.mysql.r18.ru +18 -4
    Task 761:'mysqlbinlog should not die when reading
    unknown event'
    The 'Unknown_log_event' class has been added.

  sql/log_event.cc
    1.77.1.29 03/04/23 17:59:55 gluh@gluh.mysql.r18.ru +21 -1
    Task 761:'mysqlbinlog should not die when reading
    unknown event'
    The'Unknown_log_event' class has been added

  client/mysqlbinlog.cc
    1.70.1.3 03/04/23 17:59:55 gluh@gluh.mysql.r18.ru +4 -0
    Task 761:'mysqlbinlog should not die when reading
    unknown event'
    The 'force-read' option has been added.

ChangeSet
  1.1346.1.100 03/04/23 15:27:11 Sinisa@sinisa.nasamreza.org +1 -0
  removing back tick support from the server in change_db()

  sql/sql_db.cc
    1.39.1.19 03/04/23 15:27:08 Sinisa@sinisa.nasamreza.org +0 -7
    removing back tick support from the server in change_db()

ChangeSet
  1.1504.27.4 03/04/23 17:10:24 gluh@gluh.mysql.r18.ru +2 -0
  Fix bug#68: ssl_test.c does not compile/work

  client/ssl_test.c
    1.6.1.1 03/04/23 17:10:10 gluh@gluh.mysql.r18.ru +4 -3
    Fix bug#68: ssl_test.c does not compile/work

  client/Makefile.am
    1.28.1.1 03/04/23 17:10:10 gluh@gluh.mysql.r18.ru +1 -1
    Fix bug#68: ssl_test.c does not compile/work

ChangeSet
  1.1346.179.5 03/04/23 15:44:39 serg@sergbook.mysql.com +3 -0
  bug 283: FULLTEXT index on a TEXT filed converted to a CHAR field doesn't work anymore

  sql/sql_table.cc
    1.112.9.1 03/04/23 15:44:37 serg@sergbook.mysql.com +12 -9
    bug 283: FULLTEXT index on a TEXT filed converted to a CHAR field doesn't work anymore

  mysql-test/t/fulltext.test
    1.34.2.1 03/04/23 15:44:37 serg@sergbook.mysql.com +13 -0
    bug 283: FULLTEXT index on a TEXT filed converted to a CHAR field doesn't work anymore

  mysql-test/r/fulltext.result
    1.29.1.7 03/04/23 15:44:37 serg@sergbook.mysql.com +11 -0
    bug 283: FULLTEXT index on a TEXT filed converted to a CHAR field doesn't work anymore

ChangeSet
  1.1346.179.4 03/04/23 15:37:11 serg@sergbook.mysql.com +1 -0
  correct test result

  mysql-test/r/alter_table.result
    1.9.2.2 03/04/23 15:37:10 serg@sergbook.mysql.com +3 -3
    correct test result

ChangeSet
  1.1346.168.38 03/04/23 12:44:00 lenz@mysql.com +1 -0
   - added $(SUPERCLEANFILES) to DISTCLEANFILES (bug #201) - thanks to
     Christian Hammers for providing this patch

  include/Makefile.am
    1.29.1.10 03/04/23 12:43:54 lenz@mysql.com +1 -1
     - added $(SUPERCLEANFILES) to DISTCLEANFILES (bug #201) - thanks to
       Christian Hammers for providing this patch

ChangeSet
  1.1346.179.3 03/04/23 14:03:21 serg@sergbook.mysql.com +2 -0
  warning when a 4.1 MYI file is opened in 4.0

  myisam/myisamdef.h
    1.45.1.12 03/04/23 14:03:19 serg@sergbook.mysql.com +2 -1
    warning when a 4.1 MYI file is opened in 4.0

  myisam/mi_open.c
    1.46.1.13 03/04/23 14:03:19 serg@sergbook.mysql.com +3 -0
    warning when a 4.1 MYI file is opened in 4.0

ChangeSet
  1.1504.27.3 03/04/23 11:20:19 bell@sanja.is.com.ua +6 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-order-4.1

  sql/sql_yacc.yy
    1.203.28.4 03/04/23 11:20:16 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.3.4 03/04/23 11:20:16 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.6.3 03/04/23 11:20:16 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.76.1.2 03/04/23 11:20:16 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.58.1.3 03/04/23 11:20:16 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.1.4 03/04/23 11:20:16 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1504.27.2 03/04/23 10:37:13 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1

  sql/item_cmpfunc.cc
    1.86 03/04/23 10:37:11 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1504.1.40 03/04/23 09:22:54 pem@mysql.com +8 -0
  Made multiple queries (SELECT without INTO) work in SPs.
  This included bug fixes in the 4.1 protocol (actually send and receive the
  server_status flags).

  sql/sql_yacc.yy
    1.227 03/04/23 09:22:52 pem@mysql.com +55 -32
    Made multiple queries (SELECT without INTO) work in SPs.

  sql/sql_parse.cc
    1.284 03/04/23 09:22:52 pem@mysql.com +28 -5
    Made multiple queries (SELECT without INTO) work in SPs.

  sql/sp_head.h
    1.13 03/04/23 09:22:52 pem@mysql.com +2 -0
    Made multiple queries (SELECT without INTO) work in SPs.

  sql/sp_head.cc
    1.25 03/04/23 09:22:52 pem@mysql.com +1 -1
    Made multiple queries (SELECT without INTO) work in SPs.

  sql/protocol.cc
    1.57 03/04/23 09:22:52 pem@mysql.com +1 -1
    Actually send the server_status flags in send_eof() (4.1 protocol), not just zero.

  mysql-test/t/sp-error.test
    1.7 03/04/23 09:22:52 pem@mysql.com +9 -3
    Test for "bad selects" in non-CLIENT_MULTI_QUERIES clients (as mysqltest for the
    momen; this test will have to go away eventually).

  mysql-test/r/sp-error.result
    1.6 03/04/23 09:22:52 pem@mysql.com +7 -2
    Test for "bad selects" in non-CLIENT_MULTI_QUERIES clients (as mysqltest for the
    momen; this test will have to go away eventually).

  libmysql/libmysql.c
    1.152.1.1 03/04/23 09:22:52 pem@mysql.com +5 -0
    Pick up the server_status (with the 4.1 protocol) as well.

ChangeSet
  1.1504.27.1 03/04/23 03:29:03 jani@hynda.(none) +2 -0
  Added --delimiter option to mysql

  client/mysql.cc
    1.121.1.7 03/04/23 03:28:27 jani@hynda.(none) +77 -37
    Added --delimiter option to mysql. Statement terminator
    can be a character (';' by default) or a string.
    
    Code clean up

  client/client_priv.h
    1.20 03/04/23 03:28:27 jani@hynda.(none) +1 -1
    Added --delimiter option to mysql

ChangeSet
  1.1346.168.37 03/04/22 19:54:17 lenz@mysql.com +4 -0
   - updated sample my.cnf files: removed deprecated set-variable keywords

ChangeSet
  1.1346.183.2 03/04/22 19:18:49 lenz@mysql.com +1 -0
   - Only ignore _regular_ world-writeable files (thanks to Tim Bunce for
     discovering this)

ChangeSet
  1.1346.183.1 03/04/22 19:11:02 lenz@mysql.com +1 -0
   - fixed typo in instructions on how to add a PATH to .tcshrc on Mac OS X

ChangeSet
  1.1346.168.35 03/04/22 20:09:52 heikki@hundin.mysql.fi +1 -0
  row0mysql.c:
    Give sensible advice to the user if InnoDB notices index corruption

ChangeSet
  1.1346.182.1 03/04/22 19:50:21 vva@eagle.mysql.r18.ru +1 -0
  Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
  into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0

  sql/log_event.cc
    1.77.1.28 03/04/22 19:50:20 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1346.175.2 03/04/22 19:38:57 vva@eagle.mysql.r18.ru +1 -0
  fix error message for for load data infile 

  sql/log_event.cc
    1.77.5.1 03/04/22 19:38:56 vva@eagle.mysql.r18.ru +6 -6
    fix error message for for load data infile 

ChangeSet
  1.1504.14.18 03/04/22 22:42:34 monty@narttu.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into narttu.mysql.fi:/my/mysql-4.1

ChangeSet
  1.1504.26.1 03/04/22 18:41:47 vva@eagle.mysql.r18.ru +7 -0
  small compress/uncompress modification after monty's review

  sql/item_strfunc.cc
    1.99.1.4 03/04/22 22:42:31 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/lex.h
    1.82.1.29 03/04/22 18:41:39 vva@eagle.mysql.r18.ru +0 -4
    small compress/uncompress modification after monty's review

  sql/item_strfunc.cc
    1.99.2.1 03/04/22 18:41:39 vva@eagle.mysql.r18.ru +15 -24
    small compress/uncompress modification after monty's review

  sql/item_func.cc
    1.124.1.2 03/04/22 18:41:39 vva@eagle.mysql.r18.ru +2 -1
    small compress/uncompress modification after monty's review

  sql/item_create.h
    1.25 03/04/22 18:41:39 vva@eagle.mysql.r18.ru +0 -2
    small compress/uncompress modification after monty's review

  sql/item_create.cc
    1.33 03/04/22 18:41:39 vva@eagle.mysql.r18.ru +7 -1
    small compress/uncompress modification after monty's review

  mysql-test/t/func_compress.test
    1.2 03/04/22 18:41:39 vva@eagle.mysql.r18.ru +7 -2
    small compress/uncompress modification after monty's review

  mysql-test/r/func_compress.result
    1.2 03/04/22 18:41:39 vva@eagle.mysql.r18.ru +12 -5
    small compress/uncompress modification after monty's review

ChangeSet
  1.676.295.1 03/04/23 00:13:37 monty@narttu.mysql.fi +5 -0
  Fixed problem with timestamps in binary log on 64 bit machines
  Backported fix from 4.1 for bug 212: SELECT query containing a NATURAL JOIN and parentheses in the WHERE clause

  sql/sql_list.h
    1.6.1.2 03/04/23 00:13:37 monty@narttu.mysql.fi +2 -0
    Fix for bug 212 (back ported from 4.1)

  sql/log_event.h
    1.41.1.6 03/04/23 00:13:37 monty@narttu.mysql.fi +4 -4
    Fixed problem with timestamps in binary log on 64 bit machines

  sql/log_event.cc
    1.38.1.8 03/04/23 00:13:37 monty@narttu.mysql.fi +1 -1
    Removed wrong cast

  mysql-test/t/join.test
    1.3.2.6 03/04/23 00:13:37 monty@narttu.mysql.fi +14 -0
    Test for bug 212

  mysql-test/r/join.result
    1.3.3.6 03/04/23 00:13:36 monty@narttu.mysql.fi +3 -0
    New test results

ChangeSet
  1.1504.25.1 03/04/23 00:01:19 bell@sanja.is.com.ua +8 -0
  fixed bug 185 (constant IN (SELECT field ...) do not return NULL correctly)

  sql/sql_select.cc
    1.216.2.1 03/04/23 00:01:10 bell@sanja.is.com.ua +3 -2
    some layout fix

  sql/item_subselect.h
    1.28 03/04/23 00:01:10 bell@sanja.is.com.ua +1 -0
    Item_is_not_null_test can change was_null flag

  sql/item_subselect.cc
    1.60 03/04/23 00:01:10 bell@sanja.is.com.ua +25 -3
    if IN was rewrited through WHERE thien it will be rewrited in following way:
    
    WHERE left_expr=item or is null(item) heving is_not_null_test(item)

  sql/item_cmpfunc.h
    1.50 03/04/23 00:01:10 bell@sanja.is.com.ua +19 -2
    new Item to control NULL value in HAVING clouse

  sql/item_cmpfunc.cc
    1.84.1.1 03/04/23 00:01:10 bell@sanja.is.com.ua +37 -0
    new Item to control NULL value in HAVING clouse

  sql/item.h
    1.56.1.11 03/04/23 00:01:10 bell@sanja.is.com.ua +1 -0
    new method

  mysql-test/t/subselect.test
    1.58.1.2 03/04/23 00:01:10 bell@sanja.is.com.ua +8 -0
    test of bug 185

  mysql-test/r/subselect.result
    1.67.1.3 03/04/23 00:01:10 bell@sanja.is.com.ua +9 -3
    new test results
    test of bug 185

ChangeSet
  1.1346.179.2 03/04/23 00:53:07 serg@sergbook.mysql.com +3 -0
  do not mark the table as analyzed unless all the key parts are REALLY analyzed.

  mysql-test/t/alter_table.test
    1.12.2.1 03/04/23 00:53:05 serg@sergbook.mysql.com +16 -0
    do not mark the table as analyzed unless all the key parts are REALLY analyzed.

  mysql-test/r/alter_table.result
    1.9.2.1 03/04/23 00:53:05 serg@sergbook.mysql.com +116 -0
    do not mark the table as analyzed unless all the key parts are REALLY analyzed.

  myisam/mi_check.c
    1.86.1.30 03/04/23 00:53:05 serg@sergbook.mysql.com +6 -4
    do not mark the table as analyzed unless all the key parts are REALLY analyzed.

ChangeSet
  1.1504.24.1 03/04/22 22:41:59 monty@narttu.mysql.fi +31 -0
  Removed some not used files
  Remove the 'fs' file systems as this is not maintained.
  Moved programs from client to tests

  tests/Makefile.am
    1.10 03/04/22 22:41:57 monty@narttu.mysql.fi +7 -0
    Added test programs 

  sql/item_sum.cc
    1.71 03/04/22 22:41:57 monty@narttu.mysql.fi +7 -6
    Simple code cleanup.

  sql/item_strfunc.cc
    1.99.1.3 03/04/22 22:41:57 monty@narttu.mysql.fi +4 -2
    Simple optimization

  extra/Makefile.am
    1.13 03/04/22 22:41:57 monty@narttu.mysql.fi +1 -1
    Remove not used program mysql_install

  client/Makefile.am
    1.29 03/04/22 22:41:57 monty@narttu.mysql.fi +0 -6
    Move insert_test, select_test and thread_test under 'tests'

  support-files/my-small.cnf.sh
    1.15 03/04/22 19:54:14 lenz@mysql.com +18 -18
     - removed deprecated "set-variable" keywords from options

  support-files/my-medium.cnf.sh
    1.17 03/04/22 19:54:14 lenz@mysql.com +24 -24
     - removed deprecated "set-variable" keywords from options

  support-files/my-large.cnf.sh
    1.17 03/04/22 19:54:14 lenz@mysql.com +26 -26
     - removed deprecated "set-variable" keywords from options

  support-files/my-huge.cnf.sh
    1.18 03/04/22 19:54:14 lenz@mysql.com +26 -26
     - removed deprecated "set-variable" keywords from options

  BitKeeper/deleted/.del-cache_manager.h~adb8639e510c6f6e
    1.5 03/04/22 20:48:57 monty@narttu.mysql.fi +0 -0
    Delete: sql/cache_manager.h

  BitKeeper/deleted/.del-cache_manager.cc~c506b365b140d30c
    1.6 03/04/22 20:48:57 monty@narttu.mysql.fi +0 -0
    Delete: sql/cache_manager.cc

  mysys/default.c
    1.17.1.7 03/04/22 19:18:45 lenz@mysql.com +2 -1
     - Only ignore _regular_ world-writeable files (thanks to Tim Bunce for
       discovering this)

  innobase/row/row0mysql.c
    1.39.1.4 03/04/22 20:09:45 heikki@hundin.mysql.fi +11 -0
    Give sensible advice to the user if InnoDB notices index corruption

  support-files/MacOSX/ReadMe.txt
    1.3 03/04/22 19:09:32 lenz@mysql.com +1 -2
     - fixed typo in instructions on how to add a PATH to .tcshrc on Mac OS X

  BitKeeper/deleted/.del-mysql_install.c~8c089740d79a92
    1.6 03/04/22 17:40:35 monty@narttu.mysql.fi +0 -0
    Delete: extra/mysql_install.c

  tests/ssl_test.c
    1.7 03/04/22 17:30:01 monty@narttu.mysql.fi +0 -0
    Rename: client/ssl_test.c -> tests/ssl_test.c

  tests/showdb_test.c
    1.7 03/04/22 17:24:05 monty@narttu.mysql.fi +0 -0
    Rename: client/showdb_test.c -> tests/showdb_test.c

  tests/connect_test.c
    1.8 03/04/22 17:23:24 monty@narttu.mysql.fi +0 -0
    Rename: client/connect_test.c -> tests/connect_test.c

  tests/thread_test.c
    1.13 03/04/22 17:22:38 monty@narttu.mysql.fi +0 -0
    Rename: client/thread_test.c -> tests/thread_test.c

  BitKeeper/deleted/.del-thimble.cc~3fa3754a4c639242
    1.5 03/04/22 17:19:26 monty@narttu.mysql.fi +0 -0
    Delete: client/thimble.cc

  tests/select_test.c
    1.12 03/04/22 17:18:14 monty@narttu.mysql.fi +0 -0
    Rename: client/select_test.c -> tests/select_test.c

  tests/list_test.c
    1.6 03/04/22 17:17:57 monty@narttu.mysql.fi +0 -0
    Rename: client/list_test.c -> tests/list_test.c

  tests/insert_test.c
    1.10 03/04/22 17:17:32 monty@narttu.mysql.fi +0 -0
    Rename: client/insert_test.c -> tests/insert_test.c

  BitKeeper/deleted/.del-master-slave.inc~6775f6ae10137c39
    1.3 03/04/22 17:04:44 monty@narttu.mysql.fi +0 -0
    Delete: repl-tests/include/master-slave.inc

  BitKeeper/deleted/.del-test.master~5829e7b3770179db
    1.3 03/04/22 17:04:32 monty@narttu.mysql.fi +0 -0
    Delete: repl-tests/test-repl-alter/test.master

  BitKeeper/deleted/.del-sum-wlen-slave.master~f016d98833433084
    1.3 03/04/22 17:04:32 monty@narttu.mysql.fi +0 -0
    Delete: repl-tests/test-repl/sum-wlen-slave.master

  BitKeeper/deleted/.del-sum-wlen-master.master~1a5ea625c79e978
    1.3 03/04/22 17:04:32 monty@narttu.mysql.fi +0 -0
    Delete: repl-tests/test-repl/sum-wlen-master.master

  BitKeeper/deleted/.del-run.test~ce5e626c91b760ec
    1.4 03/04/22 17:04:32 monty@narttu.mysql.fi +0 -0
    Delete: repl-tests/test-repl-ts/run.test

  BitKeeper/deleted/.del-run.test~a1e32ea1e4253af4
    1.4 03/04/22 17:04:32 monty@narttu.mysql.fi +0 -0
    Delete: repl-tests/test-repl/run.test

  BitKeeper/deleted/.del-repl-timestamp.master~4b7782da5cc13161
    1.3 03/04/22 17:04:32 monty@narttu.mysql.fi +0 -0
    Delete: repl-tests/test-repl-ts/repl-timestamp.master

  BitKeeper/deleted/.del-repl-timestamp.master.reject~3492d2b74b413771
    1.3 03/04/22 17:04:32 monty@narttu.mysql.fi +0 -0
    Delete: repl-tests/test-repl-ts/repl-timestamp.master.reject

  BitKeeper/deleted/.del-foo-dump-slave.master~f16ed20457d59be9
    1.3 03/04/22 17:04:32 monty@narttu.mysql.fi +0 -0
    Delete: repl-tests/test-repl/foo-dump-slave.master

  BitKeeper/deleted/.del-foo-dump-master.master~b49ae6bec1e918ee
    1.3 03/04/22 17:04:32 monty@narttu.mysql.fi +0 -0
    Delete: repl-tests/test-repl/foo-dump-master.master

  BitKeeper/deleted/.del-x.master~3b248cbac9abda2b
    1.2 03/04/22 17:04:31 monty@narttu.mysql.fi +0 -0
    Delete: repl-tests/test-bad-query/x.master

  BitKeeper/deleted/.del-x.master~29a93ed7956c8693
    1.2 03/04/22 17:04:31 monty@narttu.mysql.fi +0 -0
    Delete: repl-tests/test-auto-inc/x.master

  BitKeeper/deleted/.del-table-dump-select.master~744acb955e33f3db
    1.3 03/04/22 17:04:31 monty@narttu.mysql.fi +0 -0
    Delete: repl-tests/test-dump/table-dump-select.master

  BitKeeper/deleted/.del-table-dump-check.master~e13afeb8c79264b5
    1.3 03/04/22 17:04:31 monty@narttu.mysql.fi +0 -0
    Delete: repl-tests/test-dump/table-dump-check.master

  BitKeeper/deleted/.del-run.test~b1f0c1f96554df8
    1.2 03/04/22 17:04:31 monty@narttu.mysql.fi +0 -0
    Delete: repl-tests/test-auto-inc/run.test

  BitKeeper/deleted/.del-run.test~452f2b66537404a8
    1.5 03/04/22 17:04:31 monty@narttu.mysql.fi +0 -0
    Delete: repl-tests/test-dump/run.test

  BitKeeper/deleted/.del-run.test~4020771cff278f14
    1.2 03/04/22 17:04:31 monty@narttu.mysql.fi +0 -0
    Delete: repl-tests/test-bad-query/run.test

  BitKeeper/deleted/.del-run.test~3dc5b9bd1e9feea5
    1.4 03/04/22 17:04:31 monty@narttu.mysql.fi +0 -0
    Delete: repl-tests/test-repl-alter/run.test

  BitKeeper/deleted/.del-run-all-tests~4deb6479a13e4568
    1.3 03/04/22 17:03:45 monty@narttu.mysql.fi +0 -0
    Delete: repl-tests/run-all-tests

  BitKeeper/deleted/.del-README~d5a4e7ca3a2e87a9
    1.3 03/04/22 17:03:45 monty@narttu.mysql.fi +0 -0
    Delete: repl-tests/README

ChangeSet
  1.1504.14.16 03/04/22 19:01:24 bar@bar.mysql.r18.ru +1 -0
  sql_base.cc:
    Table name cache is case-sensitive now like in 4.0.

  sql/sql_base.cc
    1.145.1.1 03/04/22 19:00:38 bar@bar.mysql.r18.ru +1 -1
    Table name cache is case-sensitive now like in 4.0.

  BitKeeper/deleted/.del-.cvsignore~7e29af89a3559f4c
    1.3 03/04/22 16:55:41 monty@narttu.mysql.fi +0 -0
    Delete: Images/.cvsignore

  BitKeeper/deleted/.del-mysqlfsck~247a2d2b9729b95e
    1.2 03/04/22 16:53:46 monty@narttu.mysql.fi +0 -0
    Delete: fs/mysqlfsck

  BitKeeper/deleted/.del-README~b9f437fbd6dce7a5
    1.2 03/04/22 16:53:25 monty@narttu.mysql.fi +0 -0
    Delete: fs/README

  BitKeeper/deleted/.del-mysqlcorbafs_test.c~8bb3afa230542e05
    1.3 03/04/22 16:52:49 monty@narttu.mysql.fi +0 -0
    Delete: fs/mysqlcorbafs_test.c

  BitKeeper/deleted/.del-mysqlcorbafs.h~414821d6836e655a
    1.4 03/04/22 16:52:49 monty@narttu.mysql.fi +0 -0
    Delete: fs/mysqlcorbafs.h

  BitKeeper/deleted/.del-mysqlcorbafs.c~fc58c116eeea996a
    1.4 03/04/22 16:52:49 monty@narttu.mysql.fi +0 -0
    Delete: fs/mysqlcorbafs.c

  BitKeeper/deleted/.del-my.cnf~bbd975fd6377e704
    1.2 03/04/22 16:52:49 monty@narttu.mysql.fi +0 -0
    Delete: fs/my.cnf

  BitKeeper/deleted/.del-libmysqlfs.h~7b60f308be50370e
    1.3 03/04/22 16:52:49 monty@narttu.mysql.fi +0 -0
    Delete: fs/libmysqlfs.h

  BitKeeper/deleted/.del-libmysqlfs.c~70cc07d61deedd16
    1.3 03/04/22 16:52:49 monty@narttu.mysql.fi +0 -0
    Delete: fs/libmysqlfs.c

  BitKeeper/deleted/.del-korbit-kernel-2.4.1-patch~742e5e67c1132b2e
    1.2 03/04/22 16:52:49 monty@narttu.mysql.fi +0 -0
    Delete: fs/korbit-kernel-2.4.1-patch

  BitKeeper/deleted/.del-dump.sql~68646092f0c5bc96
    1.2 03/04/22 16:52:49 monty@narttu.mysql.fi +0 -0
    Delete: fs/dump.sql

  BitKeeper/deleted/.del-database.c~af098622e818ce0d
    1.4 03/04/22 16:52:49 monty@narttu.mysql.fi +0 -0
    Delete: fs/database.c

  BitKeeper/deleted/.del-RunServer.sh~34ea2653535fbb5c
    1.2 03/04/22 16:52:49 monty@narttu.mysql.fi +0 -0
    Delete: fs/RunServer.sh

  BitKeeper/deleted/.del-Makefile.am~95f21e278745904c
    1.3 03/04/22 16:52:49 monty@narttu.mysql.fi +0 -0
    Delete: fs/Makefile.am

  BitKeeper/deleted/.del-CorbaFS.idl~719ba9d93c206620
    1.2 03/04/22 16:52:49 monty@narttu.mysql.fi +0 -0
    Delete: fs/CorbaFS.idl

  tests/deadlock_test.c
    1.4 03/04/22 16:48:22 monty@narttu.mysql.fi +0 -0
    Rename: div/deadlock_test.c -> tests/deadlock_test.c

ChangeSet
  1.1504.23.2 03/04/22 00:54:33 venu@myvenu.com +3 -0
    update the test for LOAD DATA INFILE warnings

  mysql-test/std_data/warnings_loaddata.dat
    1.1 03/04/22 00:54:10 venu@myvenu.com +8 -0

  mysql-test/std_data/warnings_loaddata.dat
    1.0 03/04/22 00:54:10 venu@myvenu.com +0 -0
    BitKeeper file /home/venu/work/sql/dev-4.1/mysql-test/std_data/warnings_loaddata.dat

  mysql-test/r/warnings.result
    1.6 03/04/22 00:53:50 venu@myvenu.com +24 -0

  mysql-test/t/warnings.test
    1.7 03/04/22 00:53:19 venu@myvenu.com +12 -0
    update the test for LOAD DATA INFILE warnings

ChangeSet
  1.1504.23.1 03/04/22 00:53:07 venu@myvenu.com +4 -0
    Fix to return appropriate warnings using SHOW WARNINGS for LOAD DATA INFILE (scrum)

  include/mysqld_error.h
    1.61.1.6 03/04/22 00:51:40 venu@myvenu.com +5 -1
    New error codes for LOAD DATA warnings

  sql/share/english/errmsg.txt
    1.70.1.8 03/04/22 00:51:22 venu@myvenu.com +6 -1
    New warning messages specific to LOAD DATA

  sql/sql_load.cc
    1.46.3.1 03/04/22 00:50:42 venu@myvenu.com +53 -7
    Store appropriate warning message for each cuted_fields increment

  sql/field.cc
    1.99 03/04/22 00:50:19 venu@myvenu.com +6 -1
    Fix to return correct error status to check for warnings from LOAD DATA command

ChangeSet
  1.1504.14.15 03/04/22 12:27:35 bar@bar.mysql.r18.ru +6 -0
  I renamed system variable literal_collation into connection_collation

  sql/sql_yacc.yy
    1.203.30.23 03/04/22 12:27:32 bar@bar.mysql.r18.ru +4 -4
    I renamed system variable literal_collation into connection_collation

  sql/sql_class.h
    1.146.1.16 03/04/22 12:27:32 bar@bar.mysql.r18.ru +1 -1
    I renamed system variable literal_collation into connection_collation

  sql/set_var.h
    1.20 03/04/22 12:27:32 bar@bar.mysql.r18.ru +5 -5
    I renamed system variable literal_collation into connection_collation

  sql/set_var.cc
    1.34.1.7 03/04/22 12:27:32 bar@bar.mysql.r18.ru +13 -13
    I renamed system variable literal_collation into connection_collation

  sql/mysqld.cc
    1.356.1.4 03/04/22 12:27:32 bar@bar.mysql.r18.ru +2 -2
    I renamed system variable literal_collation into connection_collation

  sql/item.cc
    1.58.7.1 03/04/22 12:27:32 bar@bar.mysql.r18.ru +1 -1
    I renamed system variable literal_collation into connection_collation

ChangeSet
  1.1504.14.14 03/04/22 12:01:28 bar@bar.mysql.r18.ru +1 -0
  item_cmpfunc.cc:
    Turbo() is not used anymore for multibyte charsets.

  sql/item_cmpfunc.cc
    1.85 03/04/22 12:00:59 bar@bar.mysql.r18.ru +1 -1
    Turbo() is not used anymore for multibyte charsets.

ChangeSet
  1.1346.1.99 03/04/21 22:54:02 Sinisa@sinisa.nasamreza.org +2 -0
  Fixing few small problems in SET PASSWORD:
  
  * comparison with correct cached variable
  * preventing check_change_password to be called twice, once from 
    set_var::check and the other time from change_password itself

  sql/sql_acl.cc
    1.51.1.42 03/04/21 22:53:53 Sinisa@sinisa.nasamreza.org +1 -5
    Fixing few small problems in SET PASSWORD:
    
    * comparison with correct cached variable
    * preventing check_change_password to be called twice, once from 
      set_var::check and the other time from change_password itself

  mysql-test/r/select_safe.result
    1.5 03/04/21 22:53:53 Sinisa@sinisa.nasamreza.org +1 -1
    Fixing result for fixed error message

ChangeSet
  1.1519 03/04/21 21:03:32 Sinisa@sinisa.nasamreza.org +6 -0
  Fix for a bug record #307.
  
  Very nasty bug.
  It was caused by double free()-ing memory of join->select and 
  join->quick. 
  
  I was able to pinpoint it only after using Valgrind.
  
  Plus better fix for bug with TMP_TABLE_PARAM.
  
  Plus new constructor for SELECT_LEX.

  sql/sql_union.cc
    1.73 03/04/21 21:03:27 Sinisa@sinisa.nasamreza.org +9 -11
    Fixing bug #307.
    
    Also, a better fix for TMP_TABLE_PARAM bug.
    
    Also, use of the new constructor for SELECT_LEX.

  sql/sql_select.cc
    1.216.1.2 03/04/21 21:03:27 Sinisa@sinisa.nasamreza.org +21 -4
    Fix for a bug record #307.
    
    Very nasty bug.
    It was caused by double free()-ing memory of join->select and 
    join->quick. 
    
    I was able to pinpoint it only after using Valgrind.

  sql/sql_lex.h
    1.102.7.9 03/04/21 21:03:27 Sinisa@sinisa.nasamreza.org +3 -1
    Adding a usefull constructor which additionally required few more
    definitions.

  sql/sql_lex.cc
    1.76.4.3 03/04/21 21:03:27 Sinisa@sinisa.nasamreza.org +11 -0
    Adding a usefull constructor

  mysql-test/t/innodb.test
    1.38 03/04/21 21:03:27 Sinisa@sinisa.nasamreza.org +8 -0
    Fix for a bug record #307.
    
    Very nasty bug.
    It was caused by double free()-ing memory of join->select and 
    join->quick. 
    
    I was able to pinpoint it only after using Valgrind.

  mysql-test/r/innodb.result
    1.59 03/04/21 21:03:27 Sinisa@sinisa.nasamreza.org +12 -0
    Fix for a bug record #307.
    
    Very nasty bug.
    It was caused by double free()-ing memory of join->select and 
    join->quick. 
    
    I was able to pinpoint it only after using Valgrind.

ChangeSet
  1.1346.1.98 03/04/21 14:11:17 Sinisa@sinisa.nasamreza.org +21 -0
  Dropping out deprecated OPTION from the error messages.

  sql/share/ukrainian/errmsg.txt
    1.11.1.8 03/04/21 14:11:13 Sinisa@sinisa.nasamreza.org +1 -1
    Dropping out deprecated OPTION from the error messages.

  sql/share/swedish/errmsg.txt
    1.46.1.9 03/04/21 14:11:13 Sinisa@sinisa.nasamreza.org +1 -1
    Dropping out deprecated OPTION from the error messages.

  sql/share/spanish/errmsg.txt
    1.47.1.8 03/04/21 14:11:13 Sinisa@sinisa.nasamreza.org +1 -1
    Dropping out deprecated OPTION from the error messages.

  sql/share/slovak/errmsg.txt
    1.46.1.8 03/04/21 14:11:13 Sinisa@sinisa.nasamreza.org +1 -1
    Dropping out deprecated OPTION from the error messages.

  sql/share/russian/errmsg.txt
    1.45.1.9 03/04/21 14:11:13 Sinisa@sinisa.nasamreza.org +1 -1
    Dropping out deprecated OPTION from the error messages.

  sql/share/romanian/errmsg.txt
    1.44.1.8 03/04/21 14:11:13 Sinisa@sinisa.nasamreza.org +1 -1
    Dropping out deprecated OPTION from the error messages.

  sql/share/portuguese/errmsg.txt
    1.47.1.9 03/04/21 14:11:13 Sinisa@sinisa.nasamreza.org +1 -1
    Dropping out deprecated OPTION from the error messages.

  sql/share/norwegian/errmsg.txt
    1.45.1.8 03/04/21 14:11:13 Sinisa@sinisa.nasamreza.org +1 -1
    Dropping out deprecated OPTION from the error messages.

  sql/share/norwegian-ny/errmsg.txt
    1.45.1.8 03/04/21 14:11:13 Sinisa@sinisa.nasamreza.org +1 -1
    Dropping out deprecated OPTION from the error messages.

  sql/share/korean/errmsg.txt
    1.45.1.8 03/04/21 14:11:13 Sinisa@sinisa.nasamreza.org +1 -1
    Dropping out deprecated OPTION from the error messages.

  sql/share/japanese/errmsg.txt
    1.45.1.8 03/04/21 14:11:13 Sinisa@sinisa.nasamreza.org +1 -1
    Dropping out deprecated OPTION from the error messages.

  sql/share/italian/errmsg.txt
    1.52.1.9 03/04/21 14:11:13 Sinisa@sinisa.nasamreza.org +1 -1
    Dropping out deprecated OPTION from the error messages.

  sql/share/hungarian/errmsg.txt
    1.47.1.8 03/04/21 14:11:13 Sinisa@sinisa.nasamreza.org +1 -1
    Dropping out deprecated OPTION from the error messages.

  sql/share/greek/errmsg.txt
    1.46.1.8 03/04/21 14:11:13 Sinisa@sinisa.nasamreza.org +1 -1
    Dropping out deprecated OPTION from the error messages.

  sql/share/german/errmsg.txt
    1.47.1.8 03/04/21 14:11:13 Sinisa@sinisa.nasamreza.org +1 -1
    Dropping out deprecated OPTION from the error messages.

  sql/share/french/errmsg.txt
    1.46.1.8 03/04/21 14:11:13 Sinisa@sinisa.nasamreza.org +1 -1
    Dropping out deprecated OPTION from the error messages.

  sql/share/estonian/errmsg.txt
    1.47.1.8 03/04/21 14:11:13 Sinisa@sinisa.nasamreza.org +1 -1
    Dropping out deprecated OPTION from the error messages.

  sql/share/english/errmsg.txt
    1.51.1.13 03/04/21 14:11:13 Sinisa@sinisa.nasamreza.org +1 -1
    Dropping out deprecated OPTION from the error messages.

  sql/share/dutch/errmsg.txt
    1.49.1.11 03/04/21 14:11:13 Sinisa@sinisa.nasamreza.org +1 -1
    Dropping out deprecated OPTION from the error messages.

  sql/share/danish/errmsg.txt
    1.45.1.8 03/04/21 14:11:13 Sinisa@sinisa.nasamreza.org +1 -1
    Dropping out deprecated OPTION from the error messages.

  sql/share/czech/errmsg.txt
    1.46.1.8 03/04/21 14:11:12 Sinisa@sinisa.nasamreza.org +1 -1
    Dropping out deprecated OPTION from the error messages.

ChangeSet
  1.1346.168.33 03/04/21 12:56:54 heikki@hundin.mysql.fi +1 -0
  buf0buf.c:
    No buffer pool activity in SHOW INNODB STATUS actually meant no page gets

  innobase/buf/buf0buf.c
    1.17.1.3 03/04/21 12:56:47 heikki@hundin.mysql.fi +1 -1
    No buffer pool activity in SHOW INNODB STATUS actually meant no page gets

ChangeSet
  1.1504.14.13 03/04/21 12:44:29 bar@bar.mysql.r18.ru +1 -0
  my_vsnprintf.c:
    The last character was not printed into out string

  strings/my_vsnprintf.c
    1.22 03/04/21 12:43:56 bar@bar.mysql.r18.ru +1 -1
    The last character was not printed into out string

ChangeSet
  1.1504.14.12 03/04/20 22:18:32 bell@sanja.is.com.ua +1 -0
  fixed bug in processing transaction in query cache (inserted lost lines)

  sql/sql_cache.cc
    1.46 03/04/20 22:18:23 bell@sanja.is.com.ua +9 -0
    fixed bug in processing transaction in query cache (inserted lost lines)

ChangeSet
  1.1346.168.32 03/04/20 19:36:09 heikki@hundin.mysql.fi +1 -0
  univ.i:
    If HAVE_purify is defined, define UNIV_SET_MEM_TO_ZERO to eliminate Purify warnings

  innobase/include/univ.i
    1.27 03/04/20 19:36:01 heikki@hundin.mysql.fi +9 -0
    If HAVE_purify is defined, define UNIV_SET_MEM_TO_ZERO to eliminate Purify warnings

ChangeSet
  1.1346.1.97 03/04/19 23:18:35 Sinisa@sinisa.nasamreza.org +4 -0
  Three bug fixes and one fix being undone.

  strings/ctype-tis620.c
    1.16.1.3 03/04/19 23:18:31 Sinisa@sinisa.nasamreza.org +3 -2
    Fixing a crashing bug

  sql/sql_update.cc
    1.54.1.28 03/04/19 23:18:31 Sinisa@sinisa.nasamreza.org +0 -5
    Undoing a fix

  sql/sql_db.cc
    1.39.1.18 03/04/19 23:18:31 Sinisa@sinisa.nasamreza.org +7 -0
    Adding suport for backquotes in change_db()

  mysql-test/r/innodb_handler.result
    1.2.1.4 03/04/19 23:18:31 Sinisa@sinisa.nasamreza.org +1 -0
    change of test case after Heikki's fix

ChangeSet
  1.1346.168.31 03/04/19 20:09:01 heikki@hundin.mysql.fi +1 -0
  buf0buf.c:
    Do not set buffer pool to zero when we start up: that takes too much time for big buffer pools; Purify users must define UNIV_SET_MEM_TO_ZERO in univ.i to eliminate spurious (?) Purify warnings

  innobase/buf/buf0buf.c
    1.17.1.2 03/04/19 20:08:51 heikki@hundin.mysql.fi +0 -3
    Do not set buffer pool to zero when we start up: that takes too much time for big buffer pools; Purify users must define UNIV_SET_MEM_TO_ZERO in univ.i to eliminate spurious (?) Purify warnings

ChangeSet
  1.1346.168.30 03/04/18 22:06:10 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Prevent crash if MySQL calls rnd_end WITOUT calling rnd_init first: only restore active_index if it the old value was pushed in rnd_init
    Initialize active_index to a sensible value: prevent crash if we restore it to the original value after an table scan

  sql/ha_innodb.cc
    1.73.11.4 03/04/18 21:58:56 heikki@hundin.mysql.fi +10 -2
    Prevent crash if MySQL calls rnd_end WITOUT calling rnd_init first: only restore active_index if it the old value was pushed in rnd_init

  sql/ha_innodb.cc
    1.73.11.3 03/04/18 21:37:13 heikki@hundin.mysql.fi +2 -0
    Initialize active_index to a sensible value: prevent crash if we restore it to the original value after an table scan

ChangeSet
  1.1346.168.29 03/04/18 18:42:43 heikki@hundin.mysql.fi +3 -0
  ha_innodb.h, ha_innodb.cc:
    Make InnoDB to restore old active_index value after a table scan: MySQL may assume that a scan does NOT change active_index; this partially fixes bug 241 of UPDATE ... ORDER BY ... but it still remains that MySQL actually ignores the ORDER BY for both MyISAM and InnoDB tables
  log0recv.c:
    Use fflush to make sure report of a corrupt log record is printed to .err log before mysqld crashes

  sql/ha_innodb.h
    1.48.2.4 03/04/18 18:42:14 heikki@hundin.mysql.fi +9 -1
    Make InnoDB to restore old active_index value after a table scan: MySQL may assume that a scan does NOT change active_index; this partially fixes bug 241 of UPDATE ... ORDER BY ... but it still remains that MySQL actually ignores the ORDER BY for both MyISAM and InnoDB tables

  sql/ha_innodb.cc
    1.73.11.2 03/04/18 18:42:11 heikki@hundin.mysql.fi +43 -28
    Make InnoDB to restore old active_index value after a table scan: MySQL may assume that a scan does NOT change active_index; this partially fixes bug 241 of UPDATE ... ORDER BY ... but it still remains that MySQL actually ignores the ORDER BY for both MyISAM and InnoDB tables

  innobase/log/log0recv.c
    1.19.1.1 03/04/17 16:39:13 heikki@hundin.mysql.fi +8 -3
    Use fflush to make sure report of a corrupt log record is printed to .err log before mysqld crashes

ChangeSet
  1.1504.14.11 03/04/17 16:24:56 bell@sanja.is.com.ua +1 -0
  new result of Query Cache with Innodb

  mysql-test/r/innodb_cache.result
    1.6 03/04/17 16:24:55 bell@sanja.is.com.ua +2 -2
    new result of Query Cache with Innodb

ChangeSet
  1.1504.1.39 03/04/17 13:20:02 pem@mysql.com +27 -0
  Check the number of args to SPs.
  Fixes bug #280.

  sql/sp_head.cc
    1.24 03/04/17 13:19:59 pem@mysql.com +18 -2
    Check the number of args to SPs.

  sql/share/ukrainian/errmsg.txt
    1.37 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/swedish/errmsg.txt
    1.75 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/spanish/errmsg.txt
    1.74 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/slovak/errmsg.txt
    1.74 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/serbian/errmsg.txt
    1.28 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/russian/errmsg.txt
    1.72 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/romanian/errmsg.txt
    1.72 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/portuguese/errmsg.txt
    1.74 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/polish/errmsg.txt
    1.74 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/norwegian/errmsg.txt
    1.73 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/norwegian-ny/errmsg.txt
    1.73 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/korean/errmsg.txt
    1.73 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/japanese/errmsg.txt
    1.73 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/italian/errmsg.txt
    1.80 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/hungarian/errmsg.txt
    1.75 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/greek/errmsg.txt
    1.74 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/german/errmsg.txt
    1.75 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/french/errmsg.txt
    1.73 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/estonian/errmsg.txt
    1.74 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/english/errmsg.txt
    1.81 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/dutch/errmsg.txt
    1.76 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/danish/errmsg.txt
    1.72 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  sql/share/czech/errmsg.txt
    1.74 03/04/17 13:19:59 pem@mysql.com +1 -0
    Check the number of args to SPs.

  mysql-test/t/sp-error.test
    1.6 03/04/17 13:19:59 pem@mysql.com +20 -2
    Check the number of args to SPs.

  mysql-test/r/sp-error.result
    1.5 03/04/17 13:19:59 pem@mysql.com +16 -2
    Check the number of args to SPs.

  include/mysqld_error.h
    1.71 03/04/17 13:19:59 pem@mysql.com +2 -1
    Check the number of args to SPs.

ChangeSet
  1.1518 03/04/17 13:47:37 Sinisa@sinisa.nasamreza.org +2 -0
  Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/item_strfunc.cc
    1.102 03/04/17 13:47:28 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/item.cc
    1.58.1.12 03/04/17 13:47:28 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1346.1.96 03/04/17 13:44:26 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/ha_innodb.cc
    1.73.1.92 03/04/17 13:44:20 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1504.14.9 03/04/16 16:53:12 venu@myvenu.com +1 -0
  Added the missed OK packet status to internals.texi

  Docs/internals.texi
    1.28 03/04/16 16:52:31 venu@myvenu.com +2 -1
    Added the missed OK packet status

ChangeSet
  1.1346.168.28 03/04/17 02:51:50 heikki@hundin.mysql.fi +1 -0
  row0sel.c:
    Do not allow InnoDB to cache result set in HANDLER because user can use PREV and NEXT and scroll the cursor

  innobase/row/row0sel.c
    1.28.1.7 03/04/17 02:51:43 heikki@hundin.mysql.fi +14 -3
    Do not allow InnoDB to cache result set in HANDLER because user can use PREV and NEXT and scroll the cursor

ChangeSet
  1.1504.14.8 03/04/16 16:47:01 venu@myvenu.com +2 -0
  Fix to have a reserved OK byte (prepare result)

  sql/sql_prepare.cc
    1.34.1.2 03/04/16 16:46:02 venu@myvenu.com +5 -4
    FFix to send a reserved OK byte on a prepared call 

  libmysql/libmysql.c
    1.155 03/04/16 16:45:29 venu@myvenu.com +3 -3
    Fix to have a reserved OK byte (prepare result)

ChangeSet
  1.1346.168.27 03/04/17 02:28:40 heikki@hundin.mysql.fi +4 -0
  ha_innodb.cc, row0sel.c, row0mysql.c, row0mysql.h:
    Allow HANDLER PREV and NEXT also after positioning the cursor with a unique search on the primary key

  sql/ha_innodb.cc
    1.73.11.1 03/04/17 02:28:15 heikki@hundin.mysql.fi +5 -1
    Allow HANDLER PREV and NEXT also after positioning the cursor with a unique search on the primary key

  innobase/row/row0sel.c
    1.28.1.6 03/04/17 02:27:58 heikki@hundin.mysql.fi +15 -11
    Allow HANDLER PREV and NEXT also after positioning the cursor with a unique search on the primary key

  innobase/row/row0mysql.c
    1.39.1.3 03/04/17 02:27:40 heikki@hundin.mysql.fi +3 -0
    Allow HANDLER PREV and NEXT also after positioning the cursor with a unique search on the primary key

  innobase/include/row0mysql.h
    1.15.1.1 03/04/17 02:27:32 heikki@hundin.mysql.fi +9 -1
    Allow HANDLER PREV and NEXT also after positioning the cursor with a unique search on the primary key

ChangeSet
  1.1504.1.38 03/04/17 00:34:15 pem@mysql.com +32 -0
  Post post-merge fix.

  include/mysqld_error.h
    1.70 03/04/17 00:34:13 pem@mysql.com +2 -3
    Post post-merge fix.

  sql/share/ukrainian/errmsg.txt
    1.36 03/04/17 00:26:30 pem@mysql.com +0 -0
    Auto merged

  sql/share/swedish/errmsg.txt
    1.74 03/04/17 00:26:30 pem@mysql.com +0 -0
    Auto merged

  sql/share/spanish/errmsg.txt
    1.73 03/04/17 00:26:30 pem@mysql.com +0 -0
    Auto merged

  sql/share/slovak/errmsg.txt
    1.73 03/04/17 00:26:30 pem@mysql.com +0 -0
    Auto merged

  sql/share/serbian/errmsg.txt
    1.27 03/04/17 00:26:30 pem@mysql.com +0 -0
    Auto merged

  sql/share/russian/errmsg.txt
    1.71 03/04/17 00:26:30 pem@mysql.com +0 -0
    Auto merged

  sql/share/romanian/errmsg.txt
    1.71 03/04/17 00:26:30 pem@mysql.com +0 -0
    Auto merged

  sql/share/portuguese/errmsg.txt
    1.73 03/04/17 00:26:30 pem@mysql.com +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.73 03/04/17 00:26:30 pem@mysql.com +0 -0
    Auto merged

  sql/share/norwegian/errmsg.txt
    1.72 03/04/17 00:26:30 pem@mysql.com +0 -0
    Auto merged

  sql/share/norwegian-ny/errmsg.txt
    1.72 03/04/17 00:26:30 pem@mysql.com +0 -0
    Auto merged

  sql/share/korean/errmsg.txt
    1.72 03/04/17 00:26:30 pem@mysql.com +0 -0
    Auto merged

  sql/share/japanese/errmsg.txt
    1.72 03/04/17 00:26:30 pem@mysql.com +0 -0
    Auto merged

  sql/share/italian/errmsg.txt
    1.79 03/04/17 00:26:30 pem@mysql.com +0 -0
    Auto merged

  sql/share/hungarian/errmsg.txt
    1.74 03/04/17 00:26:30 pem@mysql.com +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.226 03/04/17 00:26:29 pem@mysql.com +0 -0
    Auto merged

  sql/sql_update.cc
    1.87 03/04/17 00:26:29 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.155 03/04/17 00:26:29 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.115 03/04/17 00:26:29 pem@mysql.com +0 -0
    Auto merged

  sql/sql_cache.cc
    1.39.1.14 03/04/17 00:26:29 pem@mysql.com +0 -0
    Auto merged

  sql/share/greek/errmsg.txt
    1.73 03/04/17 00:26:29 pem@mysql.com +0 -0
    Auto merged

  sql/share/german/errmsg.txt
    1.74 03/04/17 00:26:29 pem@mysql.com +0 -0
    Auto merged

  sql/share/french/errmsg.txt
    1.72 03/04/17 00:26:29 pem@mysql.com +0 -0
    Auto merged

  sql/share/estonian/errmsg.txt
    1.73 03/04/17 00:26:29 pem@mysql.com +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.80 03/04/17 00:26:29 pem@mysql.com +0 -0
    Auto merged

  sql/share/dutch/errmsg.txt
    1.75 03/04/17 00:26:29 pem@mysql.com +0 -0
    Auto merged

  sql/share/danish/errmsg.txt
    1.71 03/04/17 00:26:29 pem@mysql.com +0 -0
    Auto merged

  sql/share/czech/errmsg.txt
    1.73 03/04/17 00:26:29 pem@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.359 03/04/17 00:26:29 pem@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.192 03/04/17 00:26:29 pem@mysql.com +0 -0
    Auto merged

  sql/lex.h
    1.95 03/04/17 00:26:29 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1504.22.2 03/04/17 00:18:29 pem@mysql.com +3 -0
  Post-merge fixes.

  mysql-test/t/sp-error.test
    1.5 03/04/17 00:18:14 pem@mysql.com +17 -17
    Post-merge fixes.

  mysql-test/r/variables.result
    1.25 03/04/17 00:18:14 pem@mysql.com +1 -1
    Post-merge fixes.

  mysql-test/r/sp-error.result
    1.4 03/04/17 00:18:14 pem@mysql.com +1 -1
    Post-merge fixes.

ChangeSet
  1.1504.22.1 03/04/16 23:23:23 pem@mysql.com +42 -0
  Merged 4.1 into 5.0.

  sql/share/ukrainian/errmsg.txt
    1.33.1.3 03/04/16 23:23:20 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/share/swedish/errmsg.txt
    1.71.1.4 03/04/16 23:23:20 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/share/spanish/errmsg.txt
    1.70.1.3 03/04/16 23:23:20 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/share/slovak/errmsg.txt
    1.70.1.3 03/04/16 23:23:20 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/share/serbian/errmsg.txt
    1.24.1.3 03/04/16 23:23:20 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/share/russian/errmsg.txt
    1.68.1.3 03/04/16 23:23:20 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/share/portuguese/errmsg.txt
    1.70.1.3 03/04/16 23:23:20 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/share/polish/errmsg.txt
    1.70.1.3 03/04/16 23:23:20 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/share/norwegian/errmsg.txt
    1.69.1.3 03/04/16 23:23:20 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/share/norwegian-ny/errmsg.txt
    1.69.1.3 03/04/16 23:23:20 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/share/korean/errmsg.txt
    1.69.1.3 03/04/16 23:23:20 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/share/japanese/errmsg.txt
    1.69.1.3 03/04/16 23:23:20 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/share/italian/errmsg.txt
    1.76.1.3 03/04/16 23:23:20 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/share/hungarian/errmsg.txt
    1.71.1.3 03/04/16 23:23:20 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/share/greek/errmsg.txt
    1.70.1.3 03/04/16 23:23:20 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/share/german/errmsg.txt
    1.71.1.3 03/04/16 23:23:20 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/share/french/errmsg.txt
    1.69.1.3 03/04/16 23:23:20 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/share/estonian/errmsg.txt
    1.70.1.3 03/04/16 23:23:20 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/share/english/errmsg.txt
    1.77.1.3 03/04/16 23:23:20 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/share/dutch/errmsg.txt
    1.72.1.3 03/04/16 23:23:20 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/share/danish/errmsg.txt
    1.68.1.3 03/04/16 23:23:20 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  include/mysqld_error.h
    1.67.1.3 03/04/16 23:23:20 pem@mysql.com +15 -17
    Merged 4.1 into 5.0.

  configure.in
    1.210 03/04/16 23:23:20 pem@mysql.com +0 -1
    Merged 4.1 into 5.0.

  sql/sql_yacc.yy
    1.222.1.5 03/04/16 23:11:02 pem@mysql.com +0 -0
    Auto merged

  sql/sql_update.cc
    1.83.1.2 03/04/16 23:11:02 pem@mysql.com +0 -0
    Auto merged

  sql/sql_lex.h
    1.112 03/04/16 23:11:02 pem@mysql.com +0 -0
    Auto merged

  sql/share/romanian/errmsg.txt
    1.68.1.3 03/04/16 23:11:02 pem@mysql.com +0 -0
    Auto merged

  sql/share/czech/errmsg.txt
    1.70.1.3 03/04/16 23:11:02 pem@mysql.com +0 -0
    Auto merged

  sql/sql_lex.cc
    1.76.2.8 03/04/16 23:11:01 pem@mysql.com +0 -0
    Auto merged

  sql/sql_db.cc
    1.70 03/04/16 23:11:01 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.149.1.3 03/04/16 23:11:01 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.112.1.3 03/04/16 23:11:01 pem@mysql.com +0 -0
    Auto merged

  sql/set_var.cc
    1.36 03/04/16 23:11:01 pem@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.357.1.1 03/04/16 23:11:01 pem@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.188.1.3 03/04/16 23:11:01 pem@mysql.com +0 -0
    Auto merged

  sql/lex.h
    1.91.1.3 03/04/16 23:11:01 pem@mysql.com +0 -0
    Auto merged

  sql/item_func.h
    1.73 03/04/16 23:11:01 pem@mysql.com +0 -0
    Auto merged

  sql/item_func.cc
    1.126 03/04/16 23:11:00 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.60 03/04/16 23:11:00 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/variables.result
    1.24 03/04/16 23:11:00 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.70 03/04/16 23:11:00 pem@mysql.com +0 -0
    Auto merged

  client/mysql.cc
    1.125 03/04/16 23:11:00 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.168.26 03/04/16 23:05:22 heikki@hundin.mysql.fi +1 -0
  row0ins.c:
    Better fix for the ON DELETE SET NULL problem

  innobase/row/row0ins.c
    1.21 03/04/16 23:05:14 heikki@hundin.mysql.fi +10 -12
    Better fix for the ON DELETE SET NULL problem

ChangeSet
  1.1346.168.25 03/04/16 22:50:12 heikki@hundin.mysql.fi +1 -0
  row0ins.c:
    Fix bug: we did not allow ON DELETE SET NULL to modify the same table where the delete was made; we can allow it because that cannot produce infinite loops cascaded operations

  innobase/row/row0ins.c
    1.20 03/04/16 22:49:13 heikki@hundin.mysql.fi +10 -9
    Fix bug: we did not allow ON DELETE SET NULL to modify the same table where the delete was made; we can allow it because that cannot produce infinite loops cascaded operations

ChangeSet
  1.1346.1.95 03/04/16 22:24:58 Sinisa@sinisa.nasamreza.org +1 -0
  undoing a fix

  sql/ha_innodb.cc
    1.73.1.91 03/04/16 22:24:54 Sinisa@sinisa.nasamreza.org +0 -3
    undoing a fix

ChangeSet
  1.1504.14.7 03/04/16 12:11:32 venu@myvenu.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into myvenu.com:/home/venu/work/sql/dev-4.1

  sql/sql_yacc.yy
    1.203.30.22 03/04/16 12:11:28 venu@myvenu.com +0 -0
    Auto merged

ChangeSet
  1.1504.14.6 03/04/16 11:49:52 venu@myvenu.com +9 -0
  Fix broken windows distribution workspace file (libmysql.dsp), which is causing VC IDE to crash while loading
  Remove ctype_latin1_de.c from respective dsp files
  Fix to make_win_src_distribution.sh to delete all newly added IS Bitkeeper files
  

  scripts/make_win_src_distribution.sh
    1.4 03/04/16 11:47:01 venu@myvenu.com +3 -4

  sql/sql_analyse.cc
    1.37 03/04/16 11:46:33 venu@myvenu.com +0 -1

  sql/item_strfunc.cc
    1.99.1.2 03/04/16 11:46:32 venu@myvenu.com +1 -1

  sql/item.cc
    1.58.1.11 03/04/16 11:46:30 venu@myvenu.com +3 -5

  libmysql/libmysql.c
    1.154 03/04/16 11:46:16 venu@myvenu.com +18 -5

  include/mysql.h
    1.64 03/04/16 11:46:00 venu@myvenu.com +1 -0

  VC++Files/client/mysqlclient.dsp
    1.12 03/04/16 11:45:33 venu@myvenu.com +0 -4

  VC++Files/strings/strings.dsp
    1.8 03/04/16 11:45:25 venu@myvenu.com +0 -4

  VC++Files/libmysql/libmysql.dsp
    1.12 03/04/16 11:45:02 venu@myvenu.com +4 -8
    Fix the broken file

ChangeSet
  1.1346.168.24 03/04/16 21:36:42 heikki@hundin.mysql.fi +1 -0
  row0sel.c:
    Fix crash in HANDLER PREV or NEXT if the cursor was positioned using a unique search condition on the primary key: in that case InnoDB does NOT store the cursor position for later fetch prev or next

  innobase/row/row0sel.c
    1.28.1.5 03/04/16 21:36:33 heikki@hundin.mysql.fi +15 -15
    Fix crash in HANDLER PREV or NEXT if the cursor was positioned using a unique search condition on the primary key: in that case InnoDB does NOT store the cursor position for later fetch prev or next

ChangeSet
  1.1346.1.94 03/04/16 21:10:45 Sinisa@sinisa.nasamreza.org +3 -0
  Fix for a bug with InnoDB SQL handler, when previous query failed
  and an attempt is made to read previous / next value.

  sql/ha_innodb.cc
    1.73.1.90 03/04/16 21:10:41 Sinisa@sinisa.nasamreza.org +3 -0
    Fix for a bug with InnoDB SQL handler, when previous query failed
    and an attempt is made to read previous / next value.

  mysql-test/t/innodb_handler.test
    1.2.1.4 03/04/16 21:10:41 Sinisa@sinisa.nasamreza.org +7 -1
    Fix for a bug with InnoDB SQL handler, when previous query failed
    and an attempt is made to read previous / next value.

  mysql-test/r/innodb_handler.result
    1.2.1.3 03/04/16 21:10:41 Sinisa@sinisa.nasamreza.org +9 -1
    Fix for a bug with InnoDB SQL handler, when previous query failed
    and an attempt is made to read previous / next value.

ChangeSet
  1.1504.17.23 03/04/16 20:35:29 bell@sanja.is.com.ua +6 -0
  merging

  sql/ha_innodb.h
    1.51 03/04/16 20:35:28 bell@sanja.is.com.ua +1 -1
    merging

  sql/sql_cache.h
    1.20 03/04/16 20:33:44 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_cache.cc
    1.45 03/04/16 20:33:44 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/handler.h
    1.78 03/04/16 20:33:44 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/handler.cc
    1.88 03/04/16 20:33:44 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.89 03/04/16 20:33:44 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.168.23 03/04/16 21:37:22 hf@deer.mysql.r18.ru +1 -0
  Fix for #126

  sql/ha_myisam.cc
    1.92.1.31 03/04/16 21:37:18 hf@deer.mysql.r18.ru +1 -1
    Flag added to turn on check sum recounting

ChangeSet
  1.1346.181.1 03/04/16 11:43:04 miguel@hegel.local +2 -0
  Exported functions required by MySQLCC

  libmysql/libmysql.def
    1.6.1.2 03/04/16 11:42:34 miguel@hegel.local +4 -0
    Exported functions required by MySQLCC

  BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c
    1.1.1.1 03/04/16 11:35:07 miguel@hegel.local +0 -0
    Delete: VC++Files/libmysql/libmysql.def

ChangeSet
  1.1346.168.21 03/04/16 19:48:58 hf@deer.mysql.r18.ru +1 -0
  fix for bug #212

  sql/sql_list.h
    1.10.1.1 03/04/16 19:48:53 hf@deer.mysql.r18.ru +2 -0
    We should reset list::last here

ChangeSet
  1.1346.1.93 03/04/16 17:07: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/sql_show.cc
    1.76.1.31 03/04/16 17:07:14 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1346.168.20 03/04/16 16:45:01 heikki@hundin.mysql.fi +17 -0
  Many files:
    Merge InnoDB-4.0.13; DROP FOREIGN KEY now works

  sql/ha_innodb.cc
    1.73.1.89 03/04/16 16:44:30 heikki@hundin.mysql.fi +14 -0
    Merge InnoDB-4.0.13; DROP FOREIGN KEY now works

  innobase/ut/ut0ut.c
    1.12.1.1 03/04/16 16:43:11 heikki@hundin.mysql.fi +1 -1
    Merge InnoDB-4.0.13; DROP FOREIGN KEY now works

  innobase/srv/srv0srv.c
    1.35.1.4 03/04/16 16:42:44 heikki@hundin.mysql.fi +16 -6
    Merge InnoDB-4.0.13; DROP FOREIGN KEY now works

  innobase/row/row0upd.c
    1.17 03/04/16 16:42:34 heikki@hundin.mysql.fi +1 -1
    Merge InnoDB-4.0.13; DROP FOREIGN KEY now works

  innobase/row/row0sel.c
    1.28.1.4 03/04/16 16:42:34 heikki@hundin.mysql.fi +18 -17
    Merge InnoDB-4.0.13; DROP FOREIGN KEY now works

  innobase/row/row0mysql.c
    1.39.1.2 03/04/16 16:42:34 heikki@hundin.mysql.fi +83 -38
    Merge InnoDB-4.0.13; DROP FOREIGN KEY now works

  innobase/row/row0ins.c
    1.19 03/04/16 16:42:34 heikki@hundin.mysql.fi +154 -6
    Merge InnoDB-4.0.13; DROP FOREIGN KEY now works

  innobase/os/os0file.c
    1.44.1.4 03/04/16 16:42:03 heikki@hundin.mysql.fi +16 -6
    Merge InnoDB-4.0.13; DROP FOREIGN KEY now works

  innobase/lock/lock0lock.c
    1.20.1.1 03/04/16 16:41:32 heikki@hundin.mysql.fi +26 -16
    Merge InnoDB-4.0.13; DROP FOREIGN KEY now works

  innobase/include/row0ins.h
    1.4 03/04/16 16:39:27 heikki@hundin.mysql.fi +0 -1
    Merge InnoDB-4.0.13; DROP FOREIGN KEY now works

  innobase/include/dict0dict.h
    1.14 03/04/16 16:39:26 heikki@hundin.mysql.fi +35 -0
    Merge InnoDB-4.0.13; DROP FOREIGN KEY now works

  innobase/include/db0err.h
    1.7 03/04/16 16:39:26 heikki@hundin.mysql.fi +2 -0
    Merge InnoDB-4.0.13; DROP FOREIGN KEY now works

  innobase/ibuf/ibuf0ibuf.c
    1.15 03/04/16 16:39:20 heikki@hundin.mysql.fi +9 -4
    Merge InnoDB-4.0.13; DROP FOREIGN KEY now works

  innobase/dict/dict0load.c
    1.7.1.1 03/04/16 16:38:40 heikki@hundin.mysql.fi +33 -6
    Merge InnoDB-4.0.13; DROP FOREIGN KEY now works

  innobase/dict/dict0dict.c
    1.26.1.1 03/04/16 16:38:40 heikki@hundin.mysql.fi +574 -100
    Merge InnoDB-4.0.13; DROP FOREIGN KEY now works

  innobase/dict/dict0crea.c
    1.11 03/04/16 16:38:40 heikki@hundin.mysql.fi +8 -0
    Merge InnoDB-4.0.13; DROP FOREIGN KEY now works

  innobase/buf/buf0flu.c
    1.14.1.1 03/04/16 16:38:05 heikki@hundin.mysql.fi +9 -3
    Merge InnoDB-4.0.13; DROP FOREIGN KEY now works

ChangeSet
  1.1346.168.19 03/04/16 17:47:36 gluh@gluh.mysql.r18.ru +1 -0
  Memory leak fixed.

  sql/mysqld.cc
    1.297.1.119 03/04/16 17:47:34 gluh@gluh.mysql.r18.ru +2 -0
    Memory leak fixed.

ChangeSet
  1.1346.168.18 03/04/16 17:25:05 gluh@gluh.mysql.r18.ru +1 -0
  Fix bug (273):The x509 cert issuer seems not to be checked against the CA
  

  vio/viossl.c
    1.18 03/04/16 17:25:03 gluh@gluh.mysql.r18.ru +4 -2
    Fix bug (273):The x509 cert issuer seems not to be checked against the CA
    

ChangeSet
  1.1346.1.92 03/04/16 13:39:39 Sinisa@sinisa.nasamreza.org +3 -0
  fix for a bug with two natural joins.

  sql/sql_yacc.yy
    1.145.1.59 03/04/16 13:39:30 Sinisa@sinisa.nasamreza.org +2 -2
    fix for a bug with two natural joins.

  mysql-test/t/join_outer.test
    1.6.1.2 03/04/16 13:39:30 Sinisa@sinisa.nasamreza.org +9 -0
    fix for a bug with two natural joins.

  mysql-test/r/join_outer.result
    1.10.1.3 03/04/16 13:39:30 Sinisa@sinisa.nasamreza.org +12 -0
    fix for a bug with two natural joins.

ChangeSet
  1.1346.168.17 03/04/16 15:05:47 gluh@gluh.mysql.r18.ru +1 -0
  Fix bug: Crash server when grant ssl options are used and ssl handshake is not set

  sql/sql_acl.cc
    1.51.1.41 03/04/16 15:05:23 gluh@gluh.mysql.r18.ru +58 -57
    Fix bug: Crash server when grant ssl options are used and ssl handshake is not set

ChangeSet
  1.1504.21.1 03/04/16 14:49:46 hf@deer.mysql.r18.ru +1 -0
  Bugfix for segfault in mysql with embedded library

  mysys/default.c
    1.26 03/04/16 14:49:41 hf@deer.mysql.r18.ru +5 -3
    Fix for bug in mysql with embedded library
    we can get NULL in *argv

ChangeSet
  1.1504.14.5 03/04/16 00:07:10 venu@myvenu.com +2 -0
  Added the support of statement result navigation APIs

  include/mysql.h
    1.63 03/04/16 00:06:04 venu@myvenu.com +5 -6
    Prototypes for new stmt result navigation APIs

  libmysql/libmysql.c
    1.153 03/04/16 00:05:17 venu@myvenu.com +82 -9
    Added statement result set navigation APIs (buffered results only)

ChangeSet
  1.1504.17.21 03/04/16 09:26:24 monty@mashka.mysql.fi +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mashka.mysql.fi:/home/my/mysql-4.1

  sql/sql_yacc.yy
    1.203.35.8 03/04/16 09:26:19 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/lex.h
    1.82.1.28 03/04/16 09:26:19 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1504.20.1 03/04/16 09:25:43 monty@mashka.mysql.fi +5 -0
  Add mysys specific error messages
  Make RELAY_THREAD and alias for IO_THREAD
  Added new interface for string -> (unsigned) long long.

  strings/my_strtoll10.c
    1.1 03/04/16 09:25:40 monty@mashka.mysql.fi +237 -0

  strings/my_strtoll10-x86.s
    1.1 03/04/16 09:25:40 monty@mashka.mysql.fi +396 -0

  strings/my_strtoll10.c
    1.0 03/04/16 09:25:40 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.1/strings/my_strtoll10.c

  strings/my_strtoll10-x86.s
    1.0 03/04/16 09:25:40 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.1/strings/my_strtoll10-x86.s

  sql/sql_yacc.yy
    1.203.37.1 03/04/16 09:25:40 monty@mashka.mysql.fi +3 -3
    Make RELAY_THREAD an alias for IO_THREAD

  sql/lex.h
    1.82.10.1 03/04/16 09:25:40 monty@mashka.mysql.fi +2 -1
    Make RELAY_THREAD an alias for IO_THREAD

  include/my_sys.h
    1.97 03/04/16 09:25:40 monty@mashka.mysql.fi +4 -1
    Add mysys specific error messages

ChangeSet
  1.1504.19.1 03/04/16 11:08:21 hf@deer.mysql.r18.ru +1 -0
  Fix for bug #212

  sql/sql_list.h
    1.16 03/04/16 11:08:16 hf@deer.mysql.r18.ru +2 -0
    Here we should reset item::last sometimes

ChangeSet
  1.1346.180.1 03/04/15 22:04:16 monty@mashka.mysql.fi +9 -0
  Fixed bug in SUM() with NULL:s
  Added logging of warnings for failed connections with ssl.
  Fixed bug in symbolic link handling on Windows

  sql/sql_show.cc
    1.76.4.3 03/04/15 22:04:14 monty@mashka.mysql.fi +1 -1
    Changed to use HAVE_REPLICATION instead of EMBEDDED_LIBRARY

  sql/sql_acl.cc
    1.51.1.40 03/04/15 22:04:14 monty@mashka.mysql.fi +12 -0
    Added logging of warnings for failed connections with ssl.

  sql/net_serv.cc
    1.46.1.8 03/04/15 22:04:14 monty@mashka.mysql.fi +11 -11
    Code cleanup

  sql/mysqld.cc
    1.297.1.118 03/04/15 22:04:14 monty@mashka.mysql.fi +5 -8
    Added option --symbolic-links
    Fixed bug in symbolic link handling on Windows

  sql/item_sum.h
    1.15.1.6 03/04/15 22:04:13 monty@mashka.mysql.fi +5 -3
    Fixed bug in SUM() with NULL:s

  sql/item_sum.cc
    1.25.1.6 03/04/15 22:04:13 monty@mashka.mysql.fi +10 -3
    Fixed bug in SUM() with NULL:s

  mysql-test/t/func_group.test
    1.4.1.3 03/04/15 22:04:13 monty@mashka.mysql.fi +21 -0
    Added test for SUM(NULL)

  mysql-test/r/func_group.result
    1.6.1.3 03/04/15 22:04:13 monty@mashka.mysql.fi +42 -1
    Added test for SUM(NULL)

  include/my_global.h
    1.34.1.5 03/04/15 22:04:13 monty@mashka.mysql.fi +5 -0
    Added replication flags from 4.1

ChangeSet
  1.1504.17.19 03/04/16 00:22:43 wax@kishkin.ru +3 -0
  replace default separator in group_concat, correct a bug

  sql/sql_yacc.yy
    1.203.35.7 03/04/16 00:22:41 wax@kishkin.ru +1 -1
    replace default separator

  sql/item_sum.h
    1.38 03/04/16 00:22:41 wax@kishkin.ru +2 -0
    add fix_length_and_dec() and copy_or_same()

  mysql-test/r/func_gconcat.result
    1.5 03/04/16 00:22:41 wax@kishkin.ru +28 -28
    replace default separator

ChangeSet
  1.1346.168.15 03/04/15 17:34:56 lenz@mysql.com +4 -0
   - Updated variable names that have been renamed in my.cnf example files
     (bug #223)
   - Added more detailed info about how to set up replication

  support-files/my-small.cnf.sh
    1.14 03/04/15 17:34:53 lenz@mysql.com +12 -4
     - updated variable names that have been renamed in 4.0 (bug #223)
     - added hint and commented out sample about skip-networking option
       (security enhancement) 

  support-files/my-medium.cnf.sh
    1.16 03/04/15 17:34:53 lenz@mysql.com +33 -4
     - updated variable names that have been renamed in 4.0 (bug #223)
     - added more detailed info about how to set up replication (suggestion
       made by Guilhem)

  support-files/my-large.cnf.sh
    1.16 03/04/15 17:34:53 lenz@mysql.com +34 -5
     - updated variable names that have been renamed in 4.0 (bug #223)
     - added more detailed info about how to set up replication (suggestion
       made by Guilhem)

  support-files/my-huge.cnf.sh
    1.17 03/04/15 17:34:53 lenz@mysql.com +34 -5
     - updated variable names that have been renamed in 4.0 (bug #223)
     - added more detailed info about how to set up replication (suggestion
       made by Guilhem)

ChangeSet
  1.1346.168.14 03/04/15 16:11:37 lenz@mysql.com +1 -0
   - added missing dashes to parameter "open-files-limit" in mysqld_safe
     (bug #264)

  scripts/mysqld_safe.sh
    1.56.1.4 03/04/15 16:11:34 lenz@mysql.com +1 -1
     - added missing dashes to parameter "open-files-limit" in mysqld_safe
       (bug #264)

ChangeSet
  1.1346.1.91 03/04/14 21:46:24 Sinisa@sinisa.nasamreza.org +3 -0
  Fix for a NAN problem in FORMAT(...) string function ..

  sql/item_strfunc.cc
    1.36.1.21 03/04/14 21:46:21 Sinisa@sinisa.nasamreza.org +1 -1
    Fix for a NAN problem in FORMAT(...) string function ..

  mysql-test/t/func_misc.test
    1.4 03/04/14 21:46:21 Sinisa@sinisa.nasamreza.org +1 -0
    Fix for a NAN problem in FORMAT(...) string function ..

  mysql-test/r/func_misc.result
    1.6 03/04/14 21:46:21 Sinisa@sinisa.nasamreza.org +3 -0
    Fix for a NAN problem in FORMAT(...) string function ..

ChangeSet
  1.676.291.10 03/04/14 20:58:41 Sinisa@sinisa.nasamreza.org +1 -0
  Back porting a fix from 4.0 at customer's request

  sql/sql_parse.cc
    1.120.2.37 03/04/14 20:58:39 Sinisa@sinisa.nasamreza.org +1 -1
    Back porting a fix from 4.0 at customer's request

ChangeSet
  1.1346.1.90 03/04/14 19:45:09 Sinisa@sinisa.nasamreza.org +1 -0
  A fix for a bug with uncached database privileges.
  

  sql/sql_parse.cc
    1.218.1.89 03/04/14 19:45:06 Sinisa@sinisa.nasamreza.org +1 -1
    A fix for a bug with uncached database privileges.
    

ChangeSet
  1.1516 03/04/14 14:51:52 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/item_strfunc.cc
    1.101 03/04/14 14:51:44 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1504.14.4 03/04/12 20:07:52 venu@myvenu.com +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into myvenu.com:/home/venu/work/sql/dev-4.1

  sql/sql_yacc.yy
    1.203.30.21 03/04/12 20:07:49 venu@myvenu.com +0 -0
    Auto merged

  sql/sql_class.h
    1.146.1.15 03/04/12 20:07:48 venu@myvenu.com +0 -0
    Auto merged

ChangeSet
  1.1504.17.18 03/04/12 04:26:55 wax@kishkin.ru +1 -0
  correct codes of warnings in result file

  mysql-test/r/func_gconcat.result
    1.4 03/04/12 04:26:53 wax@kishkin.ru +2 -2
    correct codes of warnings in result file

ChangeSet
  1.1504.17.17 03/04/11 14:48:03 miguel@hegel.local +1 -0
  Exported functions claimed by MySQLCC

  libmysql/libmysql.def
    1.12 03/04/11 14:47:58 miguel@hegel.local +2 -0
    Exported functions claimed by MySQLCC

ChangeSet
  1.1346.1.88 03/04/11 20:09:24 Sinisa@sinisa.nasamreza.org +4 -0
  Two bug fixes

  sql/sql_update.cc
    1.54.1.27 03/04/11 20:09:20 Sinisa@sinisa.nasamreza.org +7 -0
    Fix for a glitch that caused too many tables to be locked.

  sql/sql_select.cc
    1.152.1.77 03/04/11 20:09:20 Sinisa@sinisa.nasamreza.org +2 -0
    Fix for a bug that caused queries with ORDER BY field_in_select_list
    to be returned entirely unsorted.
    

  mysql-test/t/innodb.test
    1.28.1.11 03/04/11 20:09:20 Sinisa@sinisa.nasamreza.org +5 -0
    Fix for a bug that caused queries with ORDER BY field_in_select_list
    to be returned entirely unsorted.
    

  mysql-test/r/innodb.result
    1.40.1.21 03/04/11 20:09:20 Sinisa@sinisa.nasamreza.org +10 -0
    Fix for a bug that caused queries with ORDER BY field_in_select_list
    to be returned entirely unsorted.
    

ChangeSet
  1.1504.17.16 03/04/11 17:20:32 lenz@mysql.com +1 -0
   - make sure to generate the BDB tags file, otherwise s_symlink will create
     a lot of broken symlinks to the non-existing tags file (which magically
     causes the source distribution to grow about three times in size
     (most likely a bug in GNU tar - need to investigate if it still happens
     with recent versions)

  bdb/dist/s_all
    1.7 03/04/11 17:20:30 lenz@mysql.com +1 -1
     - make sure to generate the BDB tags file, otherwise s_symlink will create
       a lot of broken symlinks to the non-existing tags file (which magically
       causes the source distribution to grow about three times in size
       (most likely a bug in GNU tar - need to investigate if it still happens
       with recent versions)

ChangeSet
  1.1346.168.13 03/04/11 17:07:58 lenz@mysql.com +3 -0
  Distribution cleanups:
  
   - added Dummy file Docs/manual_toc.html to make "make dist" happy if the
     real manual.texi has not been copied into Docs/ (which would make sure
     a "real" manual_toc.html would be created
   - fixed symlinking in the bdb subdirectory (docs are not included anyway)
   - added dist-hook to Makefile.am to remove superfluous SCCS directories
     from the source distribution

  bdb/dist/s_symlink
    1.2.1.1 03/04/11 17:07:49 lenz@mysql.com +40 -40
     - don't try to create symlinks to nonexisting doc files

  Makefile.am
    1.40.1.7 03/04/11 17:07:48 lenz@mysql.com +4 -0
     - added dist-hook to remove superfluous SCCS directories from the source
       distribution

  Docs/manual_toc.html
    1.1 03/04/11 13:07:25 lenz@mysql.com +9 -0

  Docs/manual_toc.html
    1.0 03/04/11 13:07:25 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.0-build/Docs/manual_toc.html

ChangeSet
  1.1346.168.12 03/04/11 13:02:16 lenz@mysql.com +1 -0
   - corrected shutdown priority on Red Hat (should be shut down very early)
   - adjusted LSB run levels to be identical as on Red Hat (2-5)

  support-files/mysql.server.sh
    1.27 03/04/11 13:02:14 lenz@mysql.com +3 -3
     - corrected shutdown priority on Red Hat (should be shut down very early)
     - adjusted LSB run levels to be identical as on Red Hat (2-5)

ChangeSet
  1.1504.17.15 03/04/10 14:49:10 miguel@hegel.local +1 -0
  For to use the /libmysql/libmysql.def file instead

  BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c
    1.3 03/04/10 14:44:46 miguel@hegel.local +0 -0
    Delete: VC++Files/libmysql/libmysql.def

ChangeSet
  1.1515 03/04/10 21:05:28 Sinisa@sinisa.nasamreza.org +3 -0
  A fix for a crashing bug in EXPLAIN on derived tables with a join.

  sql/sql_derived.cc
    1.42 03/04/10 21:05:21 Sinisa@sinisa.nasamreza.org +4 -1
    A fix for a crashing bug in EXPLAIN on derived tables with a join.

  mysql-test/t/derived.test
    1.20 03/04/10 21:05:21 Sinisa@sinisa.nasamreza.org +1 -0
    A fix for a crashing bug in EXPLAIN on derived tables with a join.

  mysql-test/r/derived.result
    1.21 03/04/10 21:05:21 Sinisa@sinisa.nasamreza.org +5 -0
    A fix for a crashing bug in EXPLAIN on derived tables with a join.

ChangeSet
  1.1346.168.11 03/04/10 20:03:52 lenz@mysql.com +32 -0
   - Fixed bug in "make DESTDIR=<dir> install" - the InnoDB static
     libraries always ended up in "dir..", even though they were not supposed
     to be installed anyway (they are only required at link time). Fixed it by
     replacing libs_LIBRARIES with noinst_LIBRARIES for all InnoDB Makefile.am 
     files and by removing "libsdir = " from innobase/include/Makefile.i .

  innobase/ut/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/usr/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/trx/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/thr/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/sync/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/srv/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/row/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/rem/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/read/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/que/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/pars/Makefile.am
    1.4 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/page/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/os/Makefile.am
    1.3 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/odbc/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/mtr/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/mem/Makefile.am
    1.4 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/mach/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/log/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/lock/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/include/Makefile.i
    1.6 03/04/10 20:03:50 lenz@mysql.com +0 -2
     - removed libsdir = ../libs to fix a bug in "make DESTDIR=<dir> install"
       (the libs always got installed in "dir../")

  innobase/ibuf/Makefile.am
    1.3 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/ha/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/fut/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/fsp/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/fil/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/eval/Makefile.am
    1.3 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/dyn/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/dict/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/data/Makefile.am
    1.3 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/com/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/buf/Makefile.am
    1.2 03/04/10 20:03:50 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

  innobase/btr/Makefile.am
    1.3 03/04/10 20:03:49 lenz@mysql.com +1 -1
     - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
       be installed anyway)

ChangeSet
  1.1504.17.14 03/04/10 10:25:21 vva@eagle.mysql.r18.ru +32 -0
  Merge

  sql/share/ukrainian/errmsg.txt
    1.27.1.6 03/04/10 10:25:15 vva@eagle.mysql.r18.ru +1 -1
    merge.

  sql/share/swedish/errmsg.txt
    1.64.1.8 03/04/10 10:19:49 vva@eagle.mysql.r18.ru +1 -1
    merge.

  sql/share/spanish/errmsg.txt
    1.64.1.6 03/04/10 10:19:12 vva@eagle.mysql.r18.ru +1 -1
    merge.

  sql/share/slovak/errmsg.txt
    1.64.1.6 03/04/10 10:18:45 vva@eagle.mysql.r18.ru +1 -1
    merge.

  sql/share/serbian/errmsg.txt
    1.18.1.5 03/04/10 10:18:19 vva@eagle.mysql.r18.ru +1 -1
    merge.

  sql/share/russian/errmsg.txt
    1.61.1.7 03/04/10 10:17:56 vva@eagle.mysql.r18.ru +1 -1
    merge.

  sql/share/romanian/errmsg.txt
    1.62.1.6 03/04/10 10:17:20 vva@eagle.mysql.r18.ru +0 -0
    SCCS merged

  sql/share/portuguese/errmsg.txt
    1.64.1.6 03/04/10 10:16:56 vva@eagle.mysql.r18.ru +1 -1
    merge.

  sql/share/polish/errmsg.txt
    1.63.1.7 03/04/10 10:16:25 vva@eagle.mysql.r18.ru +1 -1
    merge.

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.6 03/04/10 10:15:53 vva@eagle.mysql.r18.ru +1 -1
    merge.

  sql/share/norwegian/errmsg.txt
    1.63.1.6 03/04/10 10:14:00 vva@eagle.mysql.r18.ru +1 -1
    merge.

  sql/share/korean/errmsg.txt
    1.63.1.6 03/04/10 10:13:14 vva@eagle.mysql.r18.ru +1 -1
    merge.

  sql/share/japanese/errmsg.txt
    1.63.1.6 03/04/10 10:11:38 vva@eagle.mysql.r18.ru +1 -1
    merge.

  sql/share/italian/errmsg.txt
    1.70.1.6 03/04/10 10:11:16 vva@eagle.mysql.r18.ru +1 -1
    merge.

  sql/share/hungarian/errmsg.txt
    1.65.1.6 03/04/10 10:10:41 vva@eagle.mysql.r18.ru +1 -1
    e
    merge.

  sql/share/greek/errmsg.txt
    1.64.1.6 03/04/10 10:10:20 vva@eagle.mysql.r18.ru +1 -1
    merge.

  sql/share/german/errmsg.txt
    1.64.1.6 03/04/10 10:09:54 vva@eagle.mysql.r18.ru +1 -1
    merge.

  sql/share/french/errmsg.txt
    1.63.1.6 03/04/10 10:09:25 vva@eagle.mysql.r18.ru +1 -1
    merge.

  sql/share/estonian/errmsg.txt
    1.64.1.6 03/04/10 10:03:56 vva@eagle.mysql.r18.ru +1 -1
    merge.

  sql/share/english/errmsg.txt
    1.70.1.7 03/04/10 10:03:35 vva@eagle.mysql.r18.ru +1 -1
    merge.

  sql/share/dutch/errmsg.txt
    1.66.1.6 03/04/10 10:03:02 vva@eagle.mysql.r18.ru +1 -1
    merge .

  sql/share/danish/errmsg.txt
    1.62.1.6 03/04/10 10:02:35 vva@eagle.mysql.r18.ru +1 -1
    merge.

  sql/share/czech/errmsg.txt
    1.64.1.6 03/04/10 10:02:13 vva@eagle.mysql.r18.ru +0 -0
    SCCS merged

  include/mysqld_error.h
    1.61.1.5 03/04/10 10:01:48 vva@eagle.mysql.r18.ru +3 -3
    merge.

  sql/set_var.cc
    1.34.1.6 03/04/10 09:58:13 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/mysqld.cc
    1.356.1.3 03/04/10 09:58:13 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.4 03/04/10 09:58:13 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/lex.h
    1.82.1.27 03/04/10 09:58:13 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/item_strfunc.h
    1.54 03/04/10 09:58:12 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.99.1.1 03/04/10 09:58:12 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/item_create.h
    1.24 03/04/10 09:58:12 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/item_create.cc
    1.32 03/04/10 09:58:12 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1494.52.1 03/04/09 20:50:30 vva@eagle.mysql.r18.ru +38 -0
  added compress/uncompress function

  mysql-test/t/func_compress.test
    1.1 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +20 -0

  mysql-test/r/have_compress.require
    1.1 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +2 -0

  mysql-test/r/func_compress.result
    1.1 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +35 -0

  mysql-test/include/have_compress.inc
    1.1 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +4 -0

  sql/share/ukrainian/errmsg.txt
    1.27.2.1 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/share/swedish/errmsg.txt
    1.64.2.1 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/share/spanish/errmsg.txt
    1.64.2.1 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/share/slovak/errmsg.txt
    1.64.2.1 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/share/serbian/errmsg.txt
    1.18.2.1 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/share/russian/errmsg.txt
    1.61.2.1 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/share/romanian/errmsg.txt
    1.62.2.1 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/share/portuguese/errmsg.txt
    1.64.2.1 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/share/polish/errmsg.txt
    1.63.2.1 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/share/norwegian/errmsg.txt
    1.63.2.1 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/share/norwegian-ny/errmsg.txt
    1.63.2.1 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/share/korean/errmsg.txt
    1.63.2.1 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/share/japanese/errmsg.txt
    1.63.2.1 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/share/italian/errmsg.txt
    1.70.2.1 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/share/hungarian/errmsg.txt
    1.65.2.1 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/share/greek/errmsg.txt
    1.64.2.1 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/share/german/errmsg.txt
    1.64.2.1 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  mysql-test/t/func_compress.test
    1.0 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/COMPRESS_UNCOMPRESS/mysql-4.1.copy/mysql-test/t/func_compress.test

  mysql-test/r/have_compress.require
    1.0 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/COMPRESS_UNCOMPRESS/mysql-4.1.copy/mysql-test/r/have_compress.require

  mysql-test/r/func_compress.result
    1.0 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/COMPRESS_UNCOMPRESS/mysql-4.1.copy/mysql-test/r/func_compress.result

  mysql-test/include/have_compress.inc
    1.0 03/04/09 20:50:21 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/COMPRESS_UNCOMPRESS/mysql-4.1.copy/mysql-test/include/have_compress.inc

  sql/share/french/errmsg.txt
    1.63.2.1 03/04/09 20:50:20 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/share/estonian/errmsg.txt
    1.64.2.1 03/04/09 20:50:20 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/share/english/errmsg.txt
    1.70.3.1 03/04/09 20:50:20 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/share/dutch/errmsg.txt
    1.66.2.1 03/04/09 20:50:20 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/share/danish/errmsg.txt
    1.62.2.1 03/04/09 20:50:20 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/share/czech/errmsg.txt
    1.64.2.1 03/04/09 20:50:20 vva@eagle.mysql.r18.ru +4 -0
    added compress/uncompress function

  sql/set_var.cc
    1.30.3.1 03/04/09 20:50:20 vva@eagle.mysql.r18.ru +1 -0
    added have_compress variable 

  sql/mysqld.cc
    1.351.3.1 03/04/09 20:50:20 vva@eagle.mysql.r18.ru +5 -0
    added have_compress variable 

  sql/mysql_priv.h
    1.186.5.1 03/04/09 20:50:20 vva@eagle.mysql.r18.ru +1 -0
    added have_compress variable 

  sql/lex.h
    1.82.9.1 03/04/09 20:50:20 vva@eagle.mysql.r18.ru +7 -0
    added compress/uncompress function

  sql/item_strfunc.h
    1.51.1.1 03/04/09 20:50:20 vva@eagle.mysql.r18.ru +23 -0
    added compress/uncompress function

  sql/item_strfunc.cc
    1.92.2.1 03/04/09 20:50:20 vva@eagle.mysql.r18.ru +88 -0
    added compress/uncompress function

  sql/item_func.h
    1.68.1.7 03/04/09 20:50:20 vva@eagle.mysql.r18.ru +9 -0
    added compress/uncompress function

  sql/item_func.cc
    1.124.1.1 03/04/09 20:50:20 vva@eagle.mysql.r18.ru +13 -1
    added compress/uncompress function

  sql/item_create.h
    1.22.1.1 03/04/09 20:50:20 vva@eagle.mysql.r18.ru +7 -0
    added compress/uncompress function

  sql/item_create.cc
    1.30.1.1 03/04/09 20:50:20 vva@eagle.mysql.r18.ru +20 -0
    added compress/uncompress function

  include/mysqld_error.h
    1.61.3.1 03/04/09 20:50:20 vva@eagle.mysql.r18.ru +5 -1
    added compress/uncompress function

ChangeSet
  1.1346.168.10 03/04/09 22:14:21 lenz@mysql.com +3 -0
   - worked around bug #235 (my-huge.cnf error) by reformatting the comments 
     in the sample configuration files
   - reworked the replication options and comments a bit
   - added option "skip-networking" (commented out by default) to the
     sample configuration files (enhancement request from bug report #234)

  support-files/my-medium.cnf.sh
    1.15 03/04/09 22:14:19 lenz@mysql.com +41 -0
     - work around bug #235 (comments at the end of configuration options lead
       to errors) by reformatting the comments to be above the options instead
     - enhanced comments on the replication options a bit
     - added option "skip-networking" (commented out by default) with an
       appropriate comment (bug #234)

  support-files/my-large.cnf.sh
    1.15 03/04/09 22:14:19 lenz@mysql.com +45 -4
     - work around bug #235 (comments at the end of configuration options lead
       to errors) by reformatting the comments to be above the options instead
     - enhanced comments on the replication options a bit
     - added option "skip-networking" (commented out by default) with an
       appropriate comment (bug #234)

  support-files/my-huge.cnf.sh
    1.16 03/04/09 22:14:19 lenz@mysql.com +40 -14
     - work around bug #235 (comments at the end of configuration options lead
       to errors) by reformatting the comments to be above the options instead
     - enhanced comments on the replication options a bit
     - added option "skip-networking" (commented out by default) with an
       appropriate comment (bug #234)

ChangeSet
  1.1346.168.9 03/04/09 21:19:53 lenz@mysql.com +1 -0
   - applied patch from provided by Christian Hammers from Debian to be able
     to run the script even if mysqld is not up and running on upgrade

  scripts/mysql_fix_privilege_tables.sh
    1.9.1.2 03/04/09 21:19:51 lenz@mysql.com +15 -9
     - applied Patch provided by Christian Hammers from Debian to be able to run
       this script on every upgrade without having to worry that the server
       is really running. Therefore "mysqld --bootstrap" is used to make the
       changes. For this to work all SQL statements are sent to stderr when
       "--sqlonly" is given and the echo's are piped to /dev/null.
       The echo_stderr that is used is just a "#!/bin/sh\necho "$*" >&2"
       script.

ChangeSet
  1.1514 03/04/09 19:17:12 Sinisa@sinisa.nasamreza.org +1 -0
  Post - post merge fix.

  sql/sql_union.cc
    1.72 03/04/09 19:17:06 Sinisa@sinisa.nasamreza.org +0 -1
    Post - post merge fix.

ChangeSet
  1.1513 03/04/09 18:52:33 Sinisa@sinisa.nasamreza.org +1 -0
  merge fix

  sql/sql_union.cc
    1.71 03/04/09 18:52:30 Sinisa@sinisa.nasamreza.org +1 -0
    merge fix

ChangeSet
  1.1512 03/04/09 18:22:17 Sinisa@sinisa.nasamreza.org +1 -0
  A fix for DELETE with ORDER BY and LIMIT.
  
  How come we do not have a test case for this ??
  

  sql/sql_delete.cc
    1.99.2.2 03/04/09 18:22:12 Sinisa@sinisa.nasamreza.org +9 -6
    A fix for DELETE with ORDER BY and LIMIT.
    
    How come we do not have a test case for this ??
    

ChangeSet
  1.1511 03/04/09 17:34:06 Sinisa@sinisa.nasamreza.org +1 -0
  fix for a :
  
  SELECT USER();

  sql/item_strfunc.cc
    1.100 03/04/09 17:34:00 Sinisa@sinisa.nasamreza.org +2 -1
    fix for a :
    
    SELECT USER();

ChangeSet
  1.1346.179.1 03/04/09 15:16:12 guilhem@mysql.com +1 -0
  fix for #254
  (3.23 master, 4.0 slave. 
  Slave loss temp tables everytime FLUSH LOGS on master). 
  This fix is less bad than the bug, it will cause a problem only maybe
  if the master dies the hard way (I say maybe because I could not
  cause a problem, and I don't see how it could happen).

  sql/log_event.cc
    1.77.1.27 03/04/09 15:16:10 guilhem@mysql.com +22 -6
    fix for #254
    (3.23 master, 4.0 slave. 
    Slave loss temp tables everytime FLUSH LOGS on master). 
    This fix is less bad than the bug, it will cause a problem only maybe
    if the master dies the hard way. (I say maybe because I could not
    cause a problem, and I don't see how it could happen).

ChangeSet
  1.1346.168.7 03/04/09 14:53:20 lenz@mysql.com +1 -0
   - don't override CXX if it's already defined

  BUILD/SETUP.sh
    1.17.1.6 03/04/09 14:53:18 lenz@mysql.com +3 -1
     - don't override CXX if it's already defined

ChangeSet
  1.1510 03/04/08 20:39:50 Sinisa@sinisa.nasamreza.org +3 -0
  a fix for a crashing bug when attempting to create InnoDB table 
  with GEOMETRY field type.

  sql/sql_table.cc
    1.157.2.1 03/04/08 20:39:45 Sinisa@sinisa.nasamreza.org +6 -0
    a fix for a crashing bug when attempting to create InnoDB table 
    with GEOMETRY field type.

  sql/handler.h
    1.75.1.4 03/04/08 20:39:45 Sinisa@sinisa.nasamreza.org +1 -0
    a fix for a crashing bug when attempting to create InnoDB table 
    with GEOMETRY field type.

  sql/ha_myisam.h
    1.46 03/04/08 20:39:45 Sinisa@sinisa.nasamreza.org +1 -1
    a fix for a crashing bug when attempting to create InnoDB table 
    with GEOMETRY field type.

ChangeSet
  1.1504.17.12 03/04/08 17:49:16 lenz@mysql.com +1 -0
   - bumped up version number to 4.1.1-alpha now that 4.0.1 has been tagged
   - tagged ChangeSet@1.1529 as mysql-4.1.0

  configure.in
    1.201.1.30 03/04/08 17:49:14 lenz@mysql.com +1 -1
     - bumped up version number to 4.1.1-alpha now that 4.0.1 has been tagged
     - tagged ChangeSet@1.1529 as mysql-4.1.0

ChangeSet
  1.1504.1.37 03/04/08 19:43:24 hf@deer.mysql.r18.ru +45 -0
  Merging

  sql/share/ukrainian/errmsg.txt
    1.35 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/swedish/errmsg.txt
    1.73 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/spanish/errmsg.txt
    1.72 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/slovak/errmsg.txt
    1.72 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/serbian/errmsg.txt
    1.26 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/russian/errmsg.txt
    1.70 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/romanian/errmsg.txt
    1.70 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/portuguese/errmsg.txt
    1.72 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/polish/errmsg.txt
    1.72 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/norwegian/errmsg.txt
    1.71 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/norwegian-ny/errmsg.txt
    1.71 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/korean/errmsg.txt
    1.71 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/japanese/errmsg.txt
    1.71 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/italian/errmsg.txt
    1.78 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/hungarian/errmsg.txt
    1.73 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/greek/errmsg.txt
    1.72 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/german/errmsg.txt
    1.73 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/french/errmsg.txt
    1.71 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/estonian/errmsg.txt
    1.72 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/english/errmsg.txt
    1.79 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/dutch/errmsg.txt
    1.74 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/danish/errmsg.txt
    1.70 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  sql/share/czech/errmsg.txt
    1.72 03/04/08 19:43:22 hf@deer.mysql.r18.ru +0 -0
    error messages trimmed

  include/mysqld_error.h
    1.69 03/04/08 19:43:22 hf@deer.mysql.r18.ru +2 -3
    error messages trimmed

  sql/sql_yacc.yy
    1.225 03/04/08 19:28:35 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_update.cc
    1.86 03/04/08 19:28:35 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_table.cc
    1.160 03/04/08 19:28:35 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_show.cc
    1.124 03/04/08 19:28:35 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_select.cc
    1.220 03/04/08 19:28:35 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_parse.cc
    1.283 03/04/08 19:28:35 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_load.cc
    1.49 03/04/08 19:28:35 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_insert.cc
    1.88 03/04/08 19:28:35 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_delete.cc
    1.102 03/04/08 19:28:35 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_class.h
    1.154 03/04/08 19:28:35 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_class.cc
    1.114 03/04/08 19:28:35 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_cache.cc
    1.39.5.1 03/04/08 19:28:35 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/slave.cc
    1.191 03/04/08 19:28:34 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/mysqld.cc
    1.358 03/04/08 19:28:34 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/mysql_priv.h
    1.191 03/04/08 19:28:34 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/log_event.cc
    1.116 03/04/08 19:28:34 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/lex.h
    1.94 03/04/08 19:28:34 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.118 03/04/08 19:28:34 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/filesort.cc
    1.72 03/04/08 19:28:34 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  myisam/sort.c
    1.36 03/04/08 19:28:34 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  myisam/mi_check.c
    1.106 03/04/08 19:28:34 hf@deer.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1494.44.10 03/04/08 19:18:33 hf@deer.mysql.r18.ru +17 -0
  SCRUM
  two KILL versions
  code trimming with headquarter's suggestions 

  sql/sql_update.cc
    1.85 03/04/08 19:17:32 hf@deer.mysql.r18.ru +1 -1
    error sending trimmed

  sql/sql_table.cc
    1.159 03/04/08 19:17:32 hf@deer.mysql.r18.ru +1 -1
    error sending trimmed

  sql/sql_select.cc
    1.219 03/04/08 19:17:32 hf@deer.mysql.r18.ru +10 -10
    error sending trimmed

  sql/sql_prepare.cc
    1.36 03/04/08 19:17:32 hf@deer.mysql.r18.ru +1 -1
    error sending trimmed

  sql/sql_parse.cc
    1.282 03/04/08 19:17:32 hf@deer.mysql.r18.ru +2 -2
    error sending trimmed

  sql/sql_load.cc
    1.48 03/04/08 19:17:32 hf@deer.mysql.r18.ru +2 -2
    error sending trimmed

  sql/sql_delete.cc
    1.101 03/04/08 19:17:32 hf@deer.mysql.r18.ru +1 -1
    error sending trimmed

  sql/sql_class.h
    1.153 03/04/08 19:17:32 hf@deer.mysql.r18.ru +8 -0
    inline functions to send right message about killing added

  sql/slave.cc
    1.190 03/04/08 19:17:32 hf@deer.mysql.r18.ru +2 -2
    error sending trimmed

  sql/records.cc
    1.21 03/04/08 19:17:32 hf@deer.mysql.r18.ru +1 -1
    error sending trimmed

  sql/log_event.cc
    1.115 03/04/08 19:17:32 hf@deer.mysql.r18.ru +1 -1
    error sending trimmed

  sql/lock.cc
    1.44 03/04/08 19:17:32 hf@deer.mysql.r18.ru +1 -1
    error sending trimmed

  sql/ha_myisam.cc
    1.117 03/04/08 19:17:32 hf@deer.mysql.r18.ru +2 -2
    killed_ptr function changed backward

  myisam/sort.c
    1.34.1.2 03/04/08 19:17:32 hf@deer.mysql.r18.ru +2 -2
    killed_ptr function changed backward

  myisam/myisamdef.h
    1.61 03/04/08 19:17:32 hf@deer.mysql.r18.ru +1 -1
    killed_ptr function changed backward

  myisam/myisamchk.c
    1.94 03/04/08 19:17:32 hf@deer.mysql.r18.ru +2 -2
    killed_ptr function changed backward

  myisam/mi_check.c
    1.104.1.2 03/04/08 19:17:32 hf@deer.mysql.r18.ru +1 -1
    killed_ptr function changed backward

ChangeSet
  1.1509 03/04/08 15:55:28 Sinisa@sinisa.nasamreza.org +3 -0
  Fix for a bug with empty item list in UNION's

  sql/item.cc
    1.58.6.1 03/04/08 15:55:23 Sinisa@sinisa.nasamreza.org +4 -3
    Fix for a bug with empty item list in UNION's

  mysql-test/t/union.test
    1.36 03/04/08 15:55:23 Sinisa@sinisa.nasamreza.org +2 -0
    Fix for a bug with empty item list in UNION's

  mysql-test/r/union.result
    1.36 03/04/08 15:55:23 Sinisa@sinisa.nasamreza.org +2 -0
    Fix for a bug with empty item list in UNION's

ChangeSet
  1.1504.17.11 03/04/08 14:38:17 bar@bar.mysql.r18.ru +10 -0
  Use of CHARSWT_INFO *result_collation
  instead of bool convert_result_charset
  SET CHARACTER SET inststead of SET NAMES in tests

  sql/sql_yacc.yy
    1.203.35.6 03/04/08 14:38:15 bar@bar.mysql.r18.ru +32 -17
    Use of CHARSWT_INFO *result_collation
    instead of bool convert_result_charset
    SET CHARACTER SET inststead of SET NAMES in tests

  sql/sql_class.h
    1.146.6.3 03/04/08 14:38:15 bar@bar.mysql.r18.ru +2 -4
    Use of CHARSWT_INFO *result_collation
    instead of bool convert_result_charset
    SET CHARACTER SET inststead of SET NAMES in tests

  sql/set_var.h
    1.19 03/04/08 14:38:14 bar@bar.mysql.r18.ru +17 -6
    Use of CHARSWT_INFO *result_collation
    instead of bool convert_result_charset
    SET CHARACTER SET inststead of SET NAMES in tests

  sql/set_var.cc
    1.34.1.5 03/04/08 14:38:14 bar@bar.mysql.r18.ru +31 -17
    Use of CHARSWT_INFO *result_collation
    instead of bool convert_result_charset
    SET CHARACTER SET inststead of SET NAMES in tests

  sql/protocol.cc
    1.56 03/04/08 14:38:14 bar@bar.mysql.r18.ru +2 -3
    Use of CHARSWT_INFO *result_collation
    instead of bool convert_result_charset
    SET CHARACTER SET inststead of SET NAMES in tests

  sql/mysqld.cc
    1.356.1.2 03/04/08 14:38:14 bar@bar.mysql.r18.ru +5 -1
    Use of CHARSWT_INFO *result_collation
    instead of bool convert_result_charset
    SET CHARACTER SET inststead of SET NAMES in tests

  mysql-test/t/ctype_recoding.test
    1.3 03/04/08 14:38:14 bar@bar.mysql.r18.ru +1 -1
    Use of CHARSWT_INFO *result_collation
    instead of bool convert_result_charset
    SET CHARACTER SET inststead of SET NAMES in tests

  mysql-test/t/ctype_collate.test
    1.8 03/04/08 14:38:14 bar@bar.mysql.r18.ru +11 -11
    Use of CHARSWT_INFO *result_collation
    instead of bool convert_result_charset
    SET CHARACTER SET inststead of SET NAMES in tests

  mysql-test/r/ctype_recoding.result
    1.4 03/04/08 14:38:14 bar@bar.mysql.r18.ru +5 -5
    Use of CHARSWT_INFO *result_collation
    instead of bool convert_result_charset
    SET CHARACTER SET inststead of SET NAMES in tests

  mysql-test/r/ctype_collate.result
    1.11 03/04/08 14:38:14 bar@bar.mysql.r18.ru +12 -12
    Use of CHARSWT_INFO *result_collation
    instead of bool convert_result_charset
    SET CHARACTER SET inststead of SET NAMES in tests

ChangeSet
  1.1504.17.10 03/04/08 11:33:54 bar@bar.mysql.r18.ru +7 -0
  SET NAMES doesn't start recoding
  SET CHARACTER SET does

  sql/sql_yacc.yy
    1.203.35.5 03/04/08 11:33:52 bar@bar.mysql.r18.ru +1 -1
    SET NAMES doesn't start recoding
    SET CHARACTER SET does

  sql/sql_db.cc
    1.68.1.2 03/04/08 11:33:52 bar@bar.mysql.r18.ru +0 -1
    SET NAMES doesn't start recoding
    SET CHARACTER SET does

  sql/set_var.cc
    1.34.1.4 03/04/08 11:33:52 bar@bar.mysql.r18.ru +6 -4
    SET NAMES doesn't start recoding
    SET CHARACTER SET does

  mysql-test/t/ctype_recoding.test
    1.2 03/04/08 11:33:52 bar@bar.mysql.r18.ru +3 -3
    SET NAMES doesn't start recoding
    SET CHARACTER SET does

  mysql-test/t/ctype_many.test
    1.13 03/04/08 11:33:52 bar@bar.mysql.r18.ru +5 -5
    SET NAMES doesn't start recoding
    SET CHARACTER SET does

  mysql-test/r/ctype_recoding.result
    1.3 03/04/08 11:33:52 bar@bar.mysql.r18.ru +7 -7
    SET NAMES doesn't start recoding
    SET CHARACTER SET does

  mysql-test/r/ctype_many.result
    1.3 03/04/08 11:33:52 bar@bar.mysql.r18.ru +853 -852
    SET NAMES doesn't start recoding
    SET CHARACTER SET does

ChangeSet
  1.1346.168.6 03/04/08 10:35:13 hf@deer.mysql.r18.ru +2 -0
  #244 bugfix (thread stack error message in embedded library)

  sql/sql_parse.cc
    1.218.1.88 03/04/08 10:35:10 hf@deer.mysql.r18.ru +2 -0
    code of check_stack_overrun ifdefed

  sql/mysql_priv.h
    1.150.1.39 03/04/08 10:35:10 hf@deer.mysql.r18.ru +5 -0
    stack checking suppressed in EMBEDDED case

ChangeSet
  1.1504.17.9 03/04/08 03:54:02 monty@mashka.mysql.fi +1 -0
  A better fix for UNION and slow query log.

  sql/sql_union.cc
    1.69.1.1 03/04/08 03:53:59 monty@mashka.mysql.fi +44 -27
    A better fix for UNION and slow query log.
    This patch also fixes some indentation issues

ChangeSet
  1.676.291.9 03/04/07 21:37:25 monty@mashka.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-3.23
  into mashka.mysql.fi:/home/my/mysql-3.23

  sql/slave.cc
    1.100.1.38 03/04/07 21:37:24 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.676.294.1 03/04/07 21:36:45 monty@mashka.mysql.fi +5 -0
  Changed innobase_flush_log_at_trx_commit to be 1 as default
  Fixed problem with not freed thr_alarm() on slave connect

  sql/slave.cc
    1.100.3.1 03/04/07 21:36:44 monty@mashka.mysql.fi +1 -4
    Simple code cleanup

  sql/mysqld.cc
    1.162.1.111 03/04/07 21:36:44 monty@mashka.mysql.fi +6 -2
    Allocate some extra thr_alarm slots just to be safe

  sql/mini_client.cc
    1.19.1.8 03/04/07 21:36:44 monty@mashka.mysql.fi +5 -7
    Fixed problem with not freed thr_alarm()

  sql/ha_innobase.cc
    1.45.24.1 03/04/07 21:36:44 monty@mashka.mysql.fi +1 -1
    Changed innobase_flush_log_at_trx_commit to be 1 as default

  mysql-test/t/rpl_alter.test
    1.1.1.1 03/04/07 21:36:44 monty@mashka.mysql.fi +11 -11
    Changed name of created test database

ChangeSet
  1.1346.168.5 03/04/07 19:05:00 lenz@mysql.com +1 -0
   - don't add separate debug symbol file to the binary distribution, 
     if it's built with debugging enabled or not stripped (save disk
     space)

  Build-tools/Do-compile
    1.74.1.1 03/04/07 19:04:47 lenz@mysql.com +5 -1
     - don't add separate debug symbol file to the binary distribution, 
       if it's built with debugging enabled or not stripped (save disk
       space)

ChangeSet
  1.1504.17.8 03/04/07 18:49:56 bar@bar.mysql.r18.ru +15 -0
  All collation names are now fit into convension

  strings/ctype-utf8.c
    1.42 03/04/07 18:49:54 bar@bar.mysql.r18.ru +2 -2
    All collation names are now fit into convension

  strings/ctype-ujis.c
    1.36 03/04/07 18:49:54 bar@bar.mysql.r18.ru +1 -1
    All collation names are now fit into convension

  strings/ctype-tis620.c
    1.43 03/04/07 18:49:54 bar@bar.mysql.r18.ru +1 -1
    All collation names are now fit into convension

  strings/ctype-sjis.c
    1.43 03/04/07 18:49:54 bar@bar.mysql.r18.ru +1 -1
    All collation names are now fit into convension

  strings/ctype-gbk.c
    1.38 03/04/07 18:49:54 bar@bar.mysql.r18.ru +1 -1
    All collation names are now fit into convension

  strings/ctype-gb2312.c
    1.34 03/04/07 18:49:54 bar@bar.mysql.r18.ru +1 -1
    All collation names are now fit into convension

  strings/ctype-euc_kr.c
    1.36 03/04/07 18:49:54 bar@bar.mysql.r18.ru +1 -1
    All collation names are now fit into convension

  strings/ctype-big5.c
    1.38 03/04/07 18:49:54 bar@bar.mysql.r18.ru +1 -1
    All collation names are now fit into convension

  sql/share/charsets/macroman.xml
    1.3 03/04/07 18:49:54 bar@bar.mysql.r18.ru +1 -1
    All collation names are now fit into convension

  sql/share/charsets/macce.xml
    1.3 03/04/07 18:49:54 bar@bar.mysql.r18.ru +1 -1
    All collation names are now fit into convension

  sql/share/charsets/keybcs2.xml
    1.3 03/04/07 18:49:54 bar@bar.mysql.r18.ru +1 -1
    All collation names are now fit into convension

  sql/share/charsets/hebrew.xml
    1.3 03/04/07 18:49:54 bar@bar.mysql.r18.ru +1 -1
    All collation names are now fit into convension

  sql/share/charsets/greek.xml
    1.4 03/04/07 18:49:54 bar@bar.mysql.r18.ru +1 -1
    All collation names are now fit into convension

  sql/share/charsets/cp1257.xml
    1.5 03/04/07 18:49:54 bar@bar.mysql.r18.ru +1 -1
    All collation names are now fit into convension

  sql/share/charsets/Index.xml
    1.20 03/04/07 18:49:54 bar@bar.mysql.r18.ru +25 -65
    All collation names are now fit into convension

ChangeSet
  1.1346.1.85 03/04/07 14:32:25 Sinisa@sinisa.nasamreza.org +3 -0
  merge fix

  myisam/mi_dynrec.c
    1.25 03/04/07 14:32:22 Sinisa@sinisa.nasamreza.org +0 -1
    merge fix

  mysql-test/t/myisam.test
    1.7.1.10 03/04/07 14:20:05 Sinisa@sinisa.nasamreza.org +0 -2
    Auto merged

  mysql-test/r/myisam.result
    1.10.1.10 03/04/07 14:20:05 Sinisa@sinisa.nasamreza.org +0 -2
    Auto merged

ChangeSet
  1.1504.17.7 03/04/07 16:10:27 bar@bar.mysql.r18.ru +11 -0
  sys_var_collation is now abstract class
  Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
  for "literal_collation" and "client_collation" variables.

  sql/sql_yacc.yy
    1.203.35.4 03/04/07 16:10:25 bar@bar.mysql.r18.ru +1 -1
    sys_var_collation is now abstract class
    Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
    for "literal_collation" and "client_collation" variables.

  sql/sql_lex.h
    1.102.7.8 03/04/07 16:10:25 bar@bar.mysql.r18.ru +0 -1
    sys_var_collation is now abstract class
    Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
    for "literal_collation" and "client_collation" variables.

  sql/sql_lex.cc
    1.76.4.2 03/04/07 16:10:25 bar@bar.mysql.r18.ru +2 -3
    sys_var_collation is now abstract class
    Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
    for "literal_collation" and "client_collation" variables.

  sql/sql_db.cc
    1.68.1.1 03/04/07 16:10:25 bar@bar.mysql.r18.ru +1 -1
    sys_var_collation is now abstract class
    Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
    for "literal_collation" and "client_collation" variables.

  sql/sql_class.h
    1.146.6.2 03/04/07 16:10:25 bar@bar.mysql.r18.ru +4 -3
    sys_var_collation is now abstract class
    Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
    for "literal_collation" and "client_collation" variables.

  sql/sql_class.cc
    1.105.1.8 03/04/07 16:10:25 bar@bar.mysql.r18.ru +1 -1
    sys_var_collation is now abstract class
    Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
    for "literal_collation" and "client_collation" variables.

  sql/sql_analyse.cc
    1.36 03/04/07 16:10:25 bar@bar.mysql.r18.ru +4 -4
    sys_var_collation is now abstract class
    Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
    for "literal_collation" and "client_collation" variables.

  sql/set_var.h
    1.18 03/04/07 16:10:25 bar@bar.mysql.r18.ru +22 -6
    sys_var_collation is now abstract class
    Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
    for "literal_collation" and "client_collation" variables.

  sql/set_var.cc
    1.34.1.3 03/04/07 16:10:25 bar@bar.mysql.r18.ru +74 -40
    sys_var_collation is now abstract class
    Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
    for "literal_collation" and "client_collation" variables.

  sql/protocol.cc
    1.55 03/04/07 16:10:25 bar@bar.mysql.r18.ru +2 -2
    sys_var_collation is now abstract class
    Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
    for "literal_collation" and "client_collation" variables.

  sql/mysqld.cc
    1.356.1.1 03/04/07 16:10:25 bar@bar.mysql.r18.ru +2 -0
    sys_var_collation is now abstract class
    Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
    for "literal_collation" and "client_collation" variables.

ChangeSet
  1.1504.17.6 03/04/07 13:52:48 bar@bar.mysql.r18.ru +3 -0
  New methods to store strings with "convert to" argimument

  sql/sql_class.h
    1.146.6.1 03/04/07 13:52:45 bar@bar.mysql.r18.ru +2 -0
    New methods to store strings with "convert to" argimument

  sql/protocol.h
    1.8 03/04/07 13:52:45 bar@bar.mysql.r18.ru +6 -0
    New methods to store strings with "convert to" argimument

  sql/protocol.cc
    1.54 03/04/07 13:52:45 bar@bar.mysql.r18.ru +56 -15
    New methods to store strings with "convert to" argimument

ChangeSet
  1.1504.17.5 03/04/06 20:14:36 vva@eagle.mysql.r18.ru +4 -0
  fixed bug with locales in libedit

  configure.in
    1.201.1.29 03/04/06 20:14:28 vva@eagle.mysql.r18.ru +1 -1
    fixed bug with external libedit

  cmd-line-utils/libedit/refresh.c
    1.4 03/04/06 20:14:28 vva@eagle.mysql.r18.ru +3 -3
    fixed bug with locales in libedit

  cmd-line-utils/libedit/map.c
    1.4 03/04/06 20:14:28 vva@eagle.mysql.r18.ru +129 -129
    fixed bug with locales in libedit

  client/mysql.cc
    1.121.1.6 03/04/06 20:14:28 vva@eagle.mysql.r18.ru +7 -0
    fixed bug with locales in libedit

ChangeSet
  1.1504.17.4 03/04/05 21:51:03 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1

  sql/sql_yacc.yy
    1.203.35.3 03/04/05 21:51:01 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1504.18.3 03/04/05 18:56:15 mysql@home.(none) +7 -0
  Some optimization in SET NAMES

  sql/sql_yacc.yy
    1.203.36.3 03/04/05 18:56:10 mysql@home.(none) +26 -47
    Some optimization in SET NAMES

  sql/set_var.h
    1.17 03/04/05 18:56:10 mysql@home.(none) +6 -2
    Some optimization in SET NAMES

  sql/set_var.cc
    1.34.1.2 03/04/05 18:56:10 mysql@home.(none) +13 -12
    Some optimization in SET NAMES

  mysql-test/t/variables.test
    1.17 03/04/05 18:56:10 mysql@home.(none) +0 -8
    SET NAMES charset COLLATE collation is new syntax

  mysql-test/t/ctype_collate.test
    1.7 03/04/05 18:56:10 mysql@home.(none) +2 -2
    SET NAMES charset COLLATE collation is new syntax

  mysql-test/r/variables.result
    1.21.1.1 03/04/05 18:56:10 mysql@home.(none) +0 -12
    SET NAMES charset COLLATE collation is new syntax

  mysql-test/r/ctype_collate.result
    1.10 03/04/05 18:56:10 mysql@home.(none) +2 -2
    SET NAMES charset COLLATE collation is new syntax

ChangeSet
  1.1504.17.3 03/04/05 15:17:16 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1

  sql/sql_yacc.yy
    1.203.35.2 03/04/05 15:17:13 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1504.18.2 03/04/05 17:02:34 mysql@home.(none) +1 -0
  sql_yacc.yy:
    I wonder how it happend that I compiled this!

  sql/sql_yacc.yy
    1.203.36.2 03/04/05 17:01:45 mysql@home.(none) +1 -1
    I wonder how it happend that I compiled this!

ChangeSet
  1.1504.18.1 03/04/05 15:59:29 mysql@home.(none) +3 -0
  sql_yacc.yy, set_var.h, set_var.cc:
    Optimization of SET NAMES

  sql/sql_yacc.yy
    1.203.36.1 03/04/05 15:58:47 mysql@home.(none) +3 -14
    Optimization of SET NAMES

  sql/set_var.h
    1.16 03/04/05 15:58:45 mysql@home.(none) +15 -0
    Optimization of SET NAMES

  sql/set_var.cc
    1.34.1.1 03/04/05 15:58:24 mysql@home.(none) +28 -0
    Optimization of SET NAMES

ChangeSet
  1.1504.17.2 03/04/05 09:29:58 bell@sanja.is.com.ua +2 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1

  sql/sql_yacc.yy
    1.203.35.1 03/04/05 09:29:56 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.67.1.2 03/04/05 09:29:55 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1497.2.1 03/04/05 09:29:28 bell@sanja.is.com.ua +4 -0
  fixed st_select_lex initialization
  fixed mustiupdate subselect compatibility
  
  (bug 217)
  

  sql/sql_yacc.yy
    1.203.34.1 03/04/05 09:29:19 bell@sanja.is.com.ua +2 -2
    right st_select_lex initialization 
    layout fix

  sql/sql_update.cc
    1.83.2.1 03/04/05 09:29:19 bell@sanja.is.com.ua +4 -2
    added subselect compatibility to query cache

  mysql-test/t/subselect.test
    1.58.1.1 03/04/05 09:29:19 bell@sanja.is.com.ua +17 -0
    test of multi-update & subselect

  mysql-test/r/subselect.result
    1.67.2.1 03/04/05 09:29:19 bell@sanja.is.com.ua +17 -0
    test of multi-update & subselect

ChangeSet
  1.1504.17.1 03/04/05 07:59:10 mysql@home.(none) +1 -0
  sql_cache.cc:
    Cast to unsigned char

  sql/sql_cache.cc
    1.39.1.13 03/04/05 07:58:35 mysql@home.(none) +2 -2
    Cast to unsigned char

ChangeSet
  1.1504.14.3 03/04/04 13:25:53 venu@myvenu.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into myvenu.com:/home/venu/work/sql/dev-4.1

  sql/sql_class.h
    1.146.1.14 03/04/04 13:25:44 venu@myvenu.com +0 -0
    Auto merged

ChangeSet
  1.1504.16.1 03/04/04 12:33:17 venu@myvenu.com +7 -0
  Fix to support update + bianry logs with prepared statements (Dynamic query)

  sql/sql_string.h
    1.33 03/04/04 12:32:18 venu@myvenu.com +1 -0
    Added new replace()

  sql/sql_prepare.cc
    1.34.1.1 03/04/04 12:32:00 venu@myvenu.com +113 -23
    Fix for binary + update logs

  sql/sql_yacc.yy
    1.203.30.20 03/04/04 12:31:20 venu@myvenu.com +1 -1
    Change to take param marker position to Item_param as an argument

  sql/sql_string.cc
    1.57 03/04/04 12:30:51 venu@myvenu.com +13 -6
    Duplicate String::replace to take char * and length as arguments

  sql/sql_class.h
    1.146.5.1 03/04/04 12:30:40 venu@myvenu.com +3 -0
    Changes for PREP_STMT

  sql/item.h
    1.56.1.10 03/04/04 12:30:27 venu@myvenu.com +8 -5
    Misc defination changes for Item_param

  sql/item.cc
    1.58.1.10 03/04/04 12:29:56 venu@myvenu.com +73 -0
    query_val_str to return param item value in string format

ChangeSet
  1.1346.169.18 03/04/04 17:43:54 guilhem@mysql.com +1 -0
  Documented undocumented replication options, now that the manual is up-to-date.

  sql/mysqld.cc
    1.297.1.117 03/04/04 17:43:51 guilhem@mysql.com +15 -7
    Documented undocumented replication options, now that the manual is up-to-date.

ChangeSet
  1.1504.1.36 03/04/04 15:47:43 pem@mysql.com +7 -0
  Post merge fixes.

  sql/sp_pcontext.cc
    1.10 03/04/04 15:47:41 pem@mysql.com +3 -6
    Post merge fixes.

  sql/sp.cc
    1.13 03/04/04 15:47:41 pem@mysql.com +11 -2
    Post merge fixes.

  mysql-test/t/sp.test
    1.19 03/04/04 15:47:41 pem@mysql.com +13 -9
    Enabled the cs test as it works now.

  mysql-test/t/sp-error.test
    1.4 03/04/04 15:47:41 pem@mysql.com +17 -17
    Post merge fixes.

  mysql-test/r/variables.result
    1.23 03/04/04 15:47:41 pem@mysql.com +1 -1
    Post merge fixes.

  mysql-test/r/sp.result
    1.18 03/04/04 15:47:41 pem@mysql.com +10 -2
    Enabled the cs test as it works now.

  mysql-test/r/sp-error.result
    1.3 03/04/04 15:47:41 pem@mysql.com +1 -1
    Post merge fixes.

ChangeSet
  1.1504.1.35 03/04/04 14:38:56 pem@mysql.com +22 -0
  Merge

  sql/share/ukrainian/errmsg.txt
    1.33.1.2 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

  sql/share/swedish/errmsg.txt
    1.71.1.3 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

  sql/share/spanish/errmsg.txt
    1.70.1.2 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

  sql/share/slovak/errmsg.txt
    1.70.1.2 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

  sql/share/serbian/errmsg.txt
    1.24.1.2 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

  sql/share/russian/errmsg.txt
    1.68.1.2 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

  sql/share/romanian/errmsg.txt
    1.68.1.2 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

  sql/share/portuguese/errmsg.txt
    1.70.1.2 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

  sql/share/polish/errmsg.txt
    1.70.1.2 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

  sql/share/norwegian/errmsg.txt
    1.69.1.2 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

  sql/share/norwegian-ny/errmsg.txt
    1.69.1.2 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

  sql/share/korean/errmsg.txt
    1.69.1.2 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

  sql/share/japanese/errmsg.txt
    1.69.1.2 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

  sql/share/italian/errmsg.txt
    1.76.1.2 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

  sql/share/hungarian/errmsg.txt
    1.71.1.2 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

  sql/share/greek/errmsg.txt
    1.70.1.2 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

  sql/share/german/errmsg.txt
    1.71.1.2 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

  sql/share/french/errmsg.txt
    1.69.1.2 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

  sql/share/estonian/errmsg.txt
    1.70.1.2 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

  sql/share/dutch/errmsg.txt
    1.72.1.2 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

  sql/share/danish/errmsg.txt
    1.68.1.2 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

  sql/share/czech/errmsg.txt
    1.70.1.2 03/04/04 14:38:54 pem@mysql.com +0 -0
    SCCS merged

ChangeSet
  1.1504.15.1 03/04/04 14:23:24 pem@mysql.com +22 -0
  Added missing error message (was only added in english/).
  Removed extraneous error message from german/errmsg.txt.

  sql/share/ukrainian/errmsg.txt
    1.27.1.5 03/04/04 14:23:22 pem@mysql.com +1 -0
    Added missing error message (was only added in english/).

  sql/share/swedish/errmsg.txt
    1.64.1.7 03/04/04 14:23:22 pem@mysql.com +1 -0
    Added missing error message (was only added in english/).

  sql/share/spanish/errmsg.txt
    1.64.1.5 03/04/04 14:23:22 pem@mysql.com +1 -0
    Added missing error message (was only added in english/).

  sql/share/slovak/errmsg.txt
    1.64.1.5 03/04/04 14:23:22 pem@mysql.com +1 -0
    Added missing error message (was only added in english/).

  sql/share/serbian/errmsg.txt
    1.18.1.4 03/04/04 14:23:22 pem@mysql.com +1 -0
    Added missing error message (was only added in english/).

  sql/share/russian/errmsg.txt
    1.61.1.6 03/04/04 14:23:22 pem@mysql.com +1 -0
    Added missing error message (was only added in english/).

  sql/share/romanian/errmsg.txt
    1.62.1.5 03/04/04 14:23:22 pem@mysql.com +1 -0
    Added missing error message (was only added in english/).

  sql/share/portuguese/errmsg.txt
    1.64.1.5 03/04/04 14:23:22 pem@mysql.com +1 -0
    Added missing error message (was only added in english/).

  sql/share/polish/errmsg.txt
    1.63.1.6 03/04/04 14:23:22 pem@mysql.com +1 -0
    Added missing error message (was only added in english/).

  sql/share/norwegian/errmsg.txt
    1.63.1.5 03/04/04 14:23:22 pem@mysql.com +1 -0
    Added missing error message (was only added in english/).

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.5 03/04/04 14:23:22 pem@mysql.com +1 -0
    Added missing error message (was only added in english/).

  sql/share/korean/errmsg.txt
    1.63.1.5 03/04/04 14:23:22 pem@mysql.com +1 -0
    Added missing error message (was only added in english/).

  sql/share/japanese/errmsg.txt
    1.63.1.5 03/04/04 14:23:22 pem@mysql.com +1 -0
    Added missing error message (was only added in english/).

  sql/share/italian/errmsg.txt
    1.70.1.5 03/04/04 14:23:22 pem@mysql.com +1 -0
    Added missing error message (was only added in english/).

  sql/share/hungarian/errmsg.txt
    1.65.1.5 03/04/04 14:23:22 pem@mysql.com +1 -0
    Added missing error message (was only added in english/).

  sql/share/greek/errmsg.txt
    1.64.1.5 03/04/04 14:23:22 pem@mysql.com +1 -0
    Added missing error message (was only added in english/).

  sql/share/german/errmsg.txt
    1.64.1.5 03/04/04 14:23:22 pem@mysql.com +1 -1
    Added missing error message (was only added in english/).
    Removed extraneous error message.

  sql/share/french/errmsg.txt
    1.63.1.5 03/04/04 14:23:22 pem@mysql.com +1 -0
    Added missing error message (was only added in english/).

  sql/share/estonian/errmsg.txt
    1.64.1.5 03/04/04 14:23:22 pem@mysql.com +1 -0
    Added missing error message (was only added in english/).

  sql/share/dutch/errmsg.txt
    1.66.1.5 03/04/04 14:23:22 pem@mysql.com +1 -0
    Added missing error message (was only added in english/).

  sql/share/danish/errmsg.txt
    1.62.1.5 03/04/04 14:23:22 pem@mysql.com +1 -0
    Added missing error message (was only added in english/).

  sql/share/czech/errmsg.txt
    1.64.1.5 03/04/04 14:23:22 pem@mysql.com +1 -0
    Added missing error message (was only added in english/).

ChangeSet
  1.1504.13.1 03/04/04 17:21:48 bar@bar.mysql.r18.ru +1 -0
  Index.xml:
    Type

  sql/share/charsets/Index.xml
    1.19 03/04/04 17:21:38 bar@bar.mysql.r18.ru +8 -8
    Type

ChangeSet
  1.1504.1.34 03/04/04 13:45:35 pem@mysql.com +25 -0
  Merging 4.1 to 5.0.

  sql/sql_lex.h
    1.111 03/04/04 13:45:33 pem@mysql.com +0 -0
    Merging 4.1 to 5.0.

  sql/sql_class.cc
    1.112.1.2 03/04/04 13:45:33 pem@mysql.com +1 -0
    Merging 4.1 to 5.0.

  sql/share/english/errmsg.txt
    1.77.1.2 03/04/04 13:45:33 pem@mysql.com +0 -0
    Merging 4.1 to 5.0.

  include/mysqld_error.h
    1.67.1.2 03/04/04 13:45:33 pem@mysql.com +15 -16
    Merging 4.1 to 5.0.

  sql/sql_yacc.yy
    1.222.1.4 03/04/04 13:36:11 pem@mysql.com +0 -1
    Auto merged

  sql/share/swedish/errmsg.txt
    1.71.1.2 03/04/04 13:36:11 pem@mysql.com +0 -0
    Auto merged

  sql/sql_select.cc
    1.217.1.1 03/04/04 13:36:10 pem@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.278.1.6 03/04/04 13:36:10 pem@mysql.com +0 -0
    Auto merged

  sql/sql_load.cc
    1.46.1.2 03/04/04 13:36:10 pem@mysql.com +0 -0
    Auto merged

  sql/sql_lex.cc
    1.76.2.7 03/04/04 13:36:10 pem@mysql.com +0 -0
    Auto merged

  sql/sql_delete.cc
    1.99.1.2 03/04/04 13:36:10 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.149.1.2 03/04/04 13:36:10 pem@mysql.com +0 -0
    Auto merged

  sql/sql_acl.cc
    1.75 03/04/04 13:36:09 pem@mysql.com +0 -0
    Auto merged

  sql/set_var.cc
    1.35 03/04/04 13:36:09 pem@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.357 03/04/04 13:36:09 pem@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.188.1.2 03/04/04 13:36:09 pem@mysql.com +0 -0
    Auto merged

  sql/log.cc
    1.110 03/04/04 13:36:09 pem@mysql.com +0 -0
    Auto merged

  sql/lex.h
    1.91.1.2 03/04/04 13:36:09 pem@mysql.com +0 -0
    Auto merged

  sql/item.cc
    1.63 03/04/04 13:36:09 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/variables.result
    1.22 03/04/04 13:36:09 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.69 03/04/04 13:36:09 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/show_check.result
    1.33 03/04/04 13:36:09 pem@mysql.com +0 -0
    Auto merged

  client/mysql.cc
    1.124 03/04/04 13:36:09 pem@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.239 03/04/04 13:36:01 pem@mysql.com +0 -0
    auto-union

  BitKeeper/etc/gone
    1.93 03/04/04 13:36:01 pem@mysql.com +0 -0
    auto-union

ChangeSet
  1.1504.1.33 03/04/04 13:33:01 pem@mysql.com +1 -0
  Updating subselect results after SUBSELECT was changed into SUBQUERY.

  mysql-test/r/subselect.result
    1.67.1.1 03/04/04 13:32:59 pem@mysql.com +24 -24
    Updating results after SUBSELECT was changed into SUBQUERY.

ChangeSet
  1.1504.1.32 03/04/04 14:10:24 ram@mysql.r18.ru +1 -0
  Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp

  sql/item_strfunc.cc
    1.99 03/04/04 14:10:21 ram@mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1504.12.1 03/04/04 14:09:08 ram@mysql.r18.ru +1 -0
  Fixed envelope() function.

  sql/item_strfunc.cc
    1.97.1.1 03/04/04 14:09:06 ram@mysql.r18.ru +9 -8
    Fixed envelope() function.

ChangeSet
  1.1346.169.17 03/04/04 10:14:06 heikki@hundin.mysql.fi +1 -0
  log.cc:
    Fix crash in previous bug fix log.cc reported by Rob Lyon if --skip-innodb is specified

  sql/log.cc
    1.80.1.38 03/04/04 10:13:56 heikki@hundin.mysql.fi +2 -1
    Fix crash in previous bug fix log.cc reported by Rob Lyon if --skip-innodb is specified

ChangeSet
  1.1504.1.31 03/04/04 14:06:52 arjen@george.bitbike.com +1 -0
  Sync string in EXPLAIN code with phrasing of manual (subquery, not subselect).

  sql/sql_select.cc
    1.216.1.1 03/04/04 14:06:47 arjen@george.bitbike.com +3 -3
    Sync string in EXPLAIN code with phrasing of manual (subquery, not subselect).

ChangeSet
  1.1504.1.30 03/04/04 12:41:58 arjen@george.bitbike.com +1 -0
  gis.txt deleted - updated text merged into manual (mysqldoc tree).

  BitKeeper/deleted/.del-gis.txt~2dde6d55b3075921
    1.3 03/04/04 12:41:14 arjen@george.bitbike.com +0 -0
    Delete: Docs/gis.txt

ChangeSet
  1.676.291.8 03/04/03 20:26:13 vva@eagle.mysql.r18.ru +2 -0
  fux bug #183

  BitKeeper/etc/logging_ok
    1.153.1.90 03/04/03 20:26:13 vva@eagle.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  sql/slave.cc
    1.100.1.37 03/04/03 20:25:59 vva@eagle.mysql.r18.ru +1 -1
    fux bug #183

ChangeSet
  1.1346.169.16 03/04/04 02:54:07 walrus@mysql.com +1 -0
  crash-me.sh:
    add sorted_group_by parameter

  sql-bench/crash-me.sh
    1.34.1.16 03/04/04 02:53:29 walrus@mysql.com +45 -0
    add sorted_group_by parameter

ChangeSet
  1.1504.1.29 03/04/03 18:10:25 pem@mysql.com +1 -0
  And got rid of signess warnings...

ChangeSet
  1.1504.1.27 03/04/03 18:03:02 pem@mysql.com +1 -0
  Got rid of silly compiler errors on HP-UX and SGI Irix.

ChangeSet
  1.1504.1.26 03/04/03 17:16:00 bar@bar.mysql.r18.ru +1 -0
  field.cc:
    Geometry is now large blob

ChangeSet
  1.1504.1.25 03/04/03 14:39:51 monty@narttu.mysql.fi +5 -0
  Fixed bug in warning handling (Memory was allocated from wrong MEM_ROOT)

ChangeSet
  1.1346.177.1 03/04/03 16:20:54 heikki@hundin.mysql.fi +1 -0
  Merge heikki@build.mysql.com:/home/bk/mysql-4.0
  into hundin.mysql.fi:/home/heikki/mysql-4.0

ChangeSet
  1.1346.169.13 03/04/03 16:32:41 guilhem@mysql.com +1 -0
  More honest --master-ssl* options description. As these do nothing
  yet, better say it and see no traffic on bugs@ and support@.

ChangeSet
  1.1504.1.24 03/04/03 14:07:34 monty@narttu.mysql.fi +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into narttu.mysql.fi:/my/mysql-4.1

ChangeSet
  1.1346.176.1 03/04/03 16:20:15 heikki@hundin.mysql.fi +1 -0
  log.cc:
    Fix bug number 224: do not call ha_report_binlog_offset_and_commit() when a MyISAM table is updated; this also makes CREATE TABLE not to commit an InnoDB transaction, even when binlogging is enabled

ChangeSet
  1.1346.169.12 03/04/03 15:28:38 guilhem@mysql.com +1 -0
  Explicit message to warn that logging (e.g. binary) is permanently turned off
  because of writing problems (such message would have been useful during a recent
  support task).

ChangeSet
  1.1504.10.1 03/04/03 14:06:49 monty@narttu.mysql.fi +34 -0
  Merge with 4.0

ChangeSet
  1.1346.169.10 03/04/03 13:44:25 monty@narttu.mysql.fi +1 -0
  After merge fix

ChangeSet
  1.1346.175.1 03/04/03 14:19:09 vva@eagle.mysql.r18.ru +1 -0
  add test file for rpl_loaddata.test

  mysql-test/std_data/rpl_loaddata2.dat
    1.1 03/04/03 14:19:07 vva@eagle.mysql.r18.ru +8 -0

  mysql-test/std_data/rpl_loaddata2.dat
    1.0 03/04/03 14:19:07 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/LOADDATA_BUG/mysql-4.0/mysql-test/std_data/rpl_loaddata2.dat

ChangeSet
  1.1346.1.84 03/04/03 21:17:53 Sinisa@sinisa.nasamreza.org +2 -0
  test case for displaying and correct functioning of ALTER TABLE 
  ENABLE / DISABLE KEYS

  mysql-test/t/alter_table.test
    1.12.1.1 03/04/03 21:17:49 Sinisa@sinisa.nasamreza.org +2 -0
    test case for displaying and correct functioning of ALTER TABLE 
    ENABLE / DISABLE KEYS

  mysql-test/r/alter_table.result
    1.9.1.2 03/04/03 21:17:49 Sinisa@sinisa.nasamreza.org +38 -0
    test case for displaying and correct functioning of ALTER TABLE 
    ENABLE / DISABLE KEYS

ChangeSet
  1.1494.50.6 03/04/03 20:00:52 pem@mysql.com +3 -0
  Fixed the last memory leaks in the SP code.

  sql/sql_parse.cc
    1.278.1.5 03/04/03 20:00:50 pem@mysql.com +11 -5
    Moved sp_clear_function_cache call so it *works*.
    Added missing memory freeing call.

  sql/sp_head.cc
    1.23 03/04/03 20:00:50 pem@mysql.com +6 -0
    Added more DBUG output to help finding memory leak.

  sql/sp.cc
    1.12 03/04/03 20:00:50 pem@mysql.com +4 -6
    Fixed clear_function_cache bug that made memory freeing work for functions too.

ChangeSet
  1.1346.1.83 03/04/03 20:24:15 Sinisa@sinisa.nasamreza.org +4 -0
  One test case, one bug fix and one new feature

  sql/sql_table.cc
    1.112.1.41 03/04/03 20:24:11 Sinisa@sinisa.nasamreza.org +17 -7
    Fix for a serious bug with ALTER TABLE ENABLE / DISABLE KEYS

  sql/sql_show.cc
    1.76.1.30 03/04/03 20:24:10 Sinisa@sinisa.nasamreza.org +4 -1
    Displaying disabled keys in SHOW KEYS

  mysql-test/t/innodb.test
    1.28.1.10 03/04/03 20:24:10 Sinisa@sinisa.nasamreza.org +8 -0
    A test case for non-functional rollback after inserting a row into
    MyISAM table with binary log enabled.

  mysql-test/r/innodb.result
    1.40.1.20 03/04/03 20:24:10 Sinisa@sinisa.nasamreza.org +9 -0
    A test case for non-functional rollback after inserting a row into
    MyISAM table with binary log enabled.

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

ChangeSet
  1.1346.174.2 03/04/03 14:26:58 jani@hynda.(none) +1 -0
  Fixed a bug when printing error messages. stdout and stderr were
  mixed wrongly sometimes.

ChangeSet
  1.1346.172.2 03/04/03 12:54:08 vva@eagle.mysql.r18.ru +3 -0
  added test for replication load data into temporary table with additional options

  mysql-test/t/rpl_loaddata.test
    1.2 03/04/03 12:54:07 vva@eagle.mysql.r18.ru +19 -1
    added test for replication load data into temporary table with additional options

  mysql-test/r/rpl_loaddata.result
    1.3 03/04/03 13:47:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/rpl_loaddata.result
    1.1.1.1 03/04/03 12:54:06 vva@eagle.mysql.r18.ru +11 -0
    added test for replication load data into temporary table with additional options

  sql/item_sum.cc
    1.70 03/04/03 18:10:23 pem@mysql.com +4 -4
    And got rid of signess warnings...

  sql/item_sum.cc
    1.69 03/04/03 18:03:00 pem@mysql.com +5 -3
    Got rid of silly compiler errors on HP-UX and SGI Irix.

ChangeSet
  1.1504.9.1 03/04/03 21:53:04 walrus@mysql.com +1 -0
  test-transactions.sh:
    correct misprint in the sub test_update

  sql-bench/test-transactions.sh
    1.3.1.1 03/04/03 21:52:29 walrus@mysql.com +1 -1
    correct misprint in the sub test_update

ChangeSet
  1.1346.173.1 03/04/03 21:51:14 walrus@mysql.com +1 -0
  test-transactions.sh:
    correct misprint in the test_update

  sql-bench/test-transactions.sh
    1.4 03/04/03 21:49:55 walrus@mysql.com +1 -1
    correct misprint in the test_update

  sql/mysqld.cc
    1.297.1.116 03/04/03 16:32:38 guilhem@mysql.com +9 -5
    More honest --master-ssl* options description. As these do nothing
    yet, better say it and see no traffic on bugs@ and support@.

  sql/log_event.cc
    1.113.1.1 03/04/03 14:06:48 monty@narttu.mysql.fi +25 -36
    Merge with 4.0

  sql/log_event.cc
    1.77.1.26 03/04/03 13:44:24 monty@narttu.mysql.fi +9 -10
    Fixed a wrong && test -> &

  sql/log_event.cc
    1.77.1.25 03/04/03 13:22:12 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/log_event.cc
    1.77.1.24 03/04/03 10:26:13 vva@eagle.mysql.r18.ru +1 -1
    fix bug #183 (Replication of temporary tables not working)

ChangeSet
  1.1494.50.5 03/04/03 16:00:09 pem@mysql.com +2 -0
  Got rid of the last unecessary Item_strings.

  sql/sp_head.h
    1.12 03/04/03 16:00:07 pem@mysql.com +4 -6
    Got rid of the last unecessary Item_strings.

  sql/sp_head.cc
    1.22 03/04/03 16:00:07 pem@mysql.com +11 -12
    Got rid of the last unecessary Item_strings.

  sql/log.cc
    1.80.1.37 03/04/03 16:20:51 heikki@hundin.mysql.fi +0 -0
    Auto merged

  sql/log.cc
    1.80.4.1 03/04/03 15:28:35 guilhem@mysql.com +4 -1
    Explicit message to warn that logging (e.g. binary) is permanently turned off
    because of writing problems (such message would have been useful during a recent
    support task).

  sql/log.cc
    1.80.1.36 03/04/03 16:20:06 heikki@hundin.mysql.fi +8 -1
    Fix bug number 224: do not call ha_report_binlog_offset_and_commit() when a MyISAM table is updated; this also makes CREATE TABLE not to commit an InnoDB transaction, even when binlogging is enabled

  sql/field.cc
    1.98 03/04/03 17:14:34 bar@bar.mysql.r18.ru +2 -2
    Geometry is now large blob

  strings/my_vsnprintf.c
    1.21 03/04/03 14:39:50 monty@narttu.mysql.fi +0 -1
    After merge fix

  sql/sql_error.cc
    1.15 03/04/03 14:39:50 monty@narttu.mysql.fi +15 -2
    Fixed bug in warning handling.

  sql/sql_class.h
    1.146.1.13 03/04/03 14:39:50 monty@narttu.mysql.fi +3 -6
    Fixed bug in warning handling.

  sql/item_sum.h
    1.37 03/04/03 14:39:50 monty@narttu.mysql.fi +3 -1
    Fixed bug in warning handling.

  sql/item_sum.cc
    1.68 03/04/03 14:39:50 monty@narttu.mysql.fi +19 -17
    Fixed bug in warning handling.

  client/mysql.cc
    1.93.1.41 03/04/03 14:26:55 jani@hynda.(none) +14 -13
    Fixed a bug when printing error messages. stdout and stderr were
    mixed wrongly sometimes.

  sql/mysqld.cc
    1.356 03/04/03 14:07:31 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.98 03/04/03 14:07:31 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.233.1.11 03/04/03 14:07:28 monty@narttu.mysql.fi +0 -0
    auto-union

  sql/sql_parse.cc
    1.271.4.11 03/04/03 14:06:48 monty@narttu.mysql.fi +13 -10
    Merge with 4.0 (Ignore not existing tables with DROP TEMPOARAY TABLE on slave)

  sql/mysqld.cc
    1.353.1.1 03/04/03 14:06:48 monty@narttu.mysql.fi +1 -2
    Merge with 4.0

  sql/item_strfunc.cc
    1.96.1.1 03/04/03 14:06:48 monty@narttu.mysql.fi +1 -3
    Merge with 4.0

  mysql-test/t/func_str.test
    1.21 03/04/03 14:06:48 monty@narttu.mysql.fi +1 -1
    Merge with 4.0

  client/mysqldump.c
    1.86 03/04/03 14:06:48 monty@narttu.mysql.fi +2 -3
    Merge with 4.0

  client/client_priv.h
    1.19 03/04/03 14:06:48 monty@narttu.mysql.fi +0 -0
    Merge with 4.0

  strings/my_vsnprintf.c
    1.20 03/04/03 13:47:38 monty@narttu.mysql.fi +0 -4
    Auto merged

  sql/sql_show.cc
    1.122.1.1 03/04/03 13:47:38 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_delete.cc
    1.99.2.1 03/04/03 13:47:38 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_acl.cc
    1.74 03/04/03 13:47:38 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/slave.cc
    1.188.1.2 03/04/03 13:47:38 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql-bench/crash-me.sh
    1.43 03/04/03 13:47:38 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/log.cc
    1.108.1.1 03/04/03 13:47:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.115.1.1 03/04/03 13:47:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  scripts/make_binary_distribution.sh
    1.55 03/04/03 13:47:37 monty@narttu.mysql.fi +0 -40
    Auto merged

  mysys/thr_mutex.c
    1.22 03/04/03 13:47:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysys/my_pthread.c
    1.36 03/04/03 13:47:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysys/my_init.c
    1.30 03/04/03 13:47:37 monty@narttu.mysql.fi +1 -0
    Auto merged

  mysys/default.c
    1.25 03/04/03 13:47:37 monty@narttu.mysql.fi +0 -1
    Auto merged

  mysql-test/t/myisam.test
    1.16 03/04/03 13:47:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/backup.test
    1.13 03/04/03 13:47:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/myisam.result
    1.20 03/04/03 13:47:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/func_str.result
    1.22 03/04/03 13:47:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  libmysqld/examples/Makefile.am
    1.12 03/04/03 13:47:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/my_pthread.h
    1.64 03/04/03 13:47:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysql.cc
    1.121.1.5 03/04/03 13:47:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9
    1.4 03/04/03 13:47:37 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e
    1.6 03/04/03 13:47:36 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716
    1.3 03/04/03 13:47:36 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-mysql.xdc
    1.2 03/04/03 13:47:36 monty@narttu.mysql.fi +0 -0
    Delete: netware/mysql.xdc

  BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c
    1.3 03/04/03 13:47:36 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e
    1.5 03/04/03 13:46:35 monty@narttu.mysql.fi +0 -0
    Merge rename: BitKeeper/deleted/.del-nwbootstrap -> BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e

  strings/my_vsnprintf.c
    1.13.1.2 03/04/03 13:45:52 monty@narttu.mysql.fi +0 -0
    Merge rename: mysys/my_vsnprintf.c -> strings/my_vsnprintf.c

  BitKeeper/etc/logging_ok
    1.233.5.1 03/04/03 13:45:42 monty@narttu.mysql.fi +0 -1
    auto-union

  BitKeeper/etc/logging_ok
    1.206.1.59 03/04/03 13:22:10 monty@narttu.mysql.fi +0 -0
    auto-union

ChangeSet
  1.1346.169.7 03/04/03 13:21:39 monty@narttu.mysql.fi +1 -0
  Updated results after merge

  mysql-test/r/myisam.result
    1.10.2.1 03/04/03 13:21:38 monty@narttu.mysql.fi +2 -2
    Updated results after merge

ChangeSet
  1.1504.8.1 03/04/03 15:13:14 ram@mysql.r18.ru +7 -0
  AsWKB() function has been added.

  sql/lex.h
    1.82.1.26 03/04/03 15:13:12 ram@mysql.r18.ru +1 -0
    AsWKB() function has been added.

  sql/item_strfunc.h
    1.53 03/04/03 15:13:12 ram@mysql.r18.ru +9 -0
    AsWKB() function has been added.

  sql/item_strfunc.cc
    1.97 03/04/03 15:13:12 ram@mysql.r18.ru +21 -0
    AsWKB() function has been added.

  sql/item_create.h
    1.23 03/04/03 15:13:12 ram@mysql.r18.ru +1 -0
    AsWKB() function has been added.

  sql/item_create.cc
    1.31 03/04/03 15:13:12 ram@mysql.r18.ru +5 -0
    AsWKB() function has been added.

  mysql-test/t/gis.test
    1.7 03/04/03 15:13:12 ram@mysql.r18.ru +3 -1
    AsWKB() function has been added.

  mysql-test/r/gis.result
    1.7 03/04/03 15:13:12 ram@mysql.r18.ru +4 -1
    AsWKB() function has been added.

ChangeSet
  1.1346.169.6 03/04/03 13:08:28 monty@narttu.mysql.fi +3 -0
  Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0

  sql/log.cc
    1.80.1.35 03/04/03 13:08:26 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.92.1.30 03/04/03 13:08:26 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysys/my_vsnprintf.c
    1.13.1.1 03/04/03 13:08:26 monty@narttu.mysql.fi +0 -1
    Auto merged

ChangeSet
  1.676.291.7 03/04/03 13:07:42 monty@narttu.mysql.fi +3 -0
  Fixed bug in memory allocation that could affect 64 bit systems (affected hammer)

  sql/log.cc
    1.55.1.17 03/04/03 13:07:41 monty@narttu.mysql.fi +1 -0
    safety fix

  sql/ha_myisam.cc
    1.73.2.12 03/04/03 13:07:41 monty@narttu.mysql.fi +1 -1
    Fixed bug in memory allocation that could affect 64 bit systems (affected hammer)

  mysys/my_vsnprintf.c
    1.9.1.1 03/04/03 13:07:41 monty@narttu.mysql.fi +8 -1
    safety fix

ChangeSet
  1.1504.1.22 03/04/03 14:52:12 bar@bar.mysql.r18.ru +1 -0
  sql_cache.cc:
    Windows compilation fix

  sql/sql_cache.cc
    1.39.1.12 03/04/03 14:51:47 bar@bar.mysql.r18.ru +5 -7
    Windows compilation fix

ChangeSet
  1.1346.169.5 03/04/03 12:33:13 monty@narttu.mysql.fi +9 -0
  Merge with 3.23 to get fixes for:
  mysqldump --delete-master-logs
  Portability fix for hammer
  Memory overrun for MyISAM
  LOAD DATA LOCAL replication bug fix.

  sql/sql_delete.cc
    1.74.1.19 03/04/03 12:33:12 monty@narttu.mysql.fi +0 -4
    Merge with 3.23

  sql/slave.cc
    1.164.1.54 03/04/03 12:33:12 monty@narttu.mysql.fi +0 -2
    Merge with 3.23

  sql/log_event.cc
    1.77.4.1 03/04/03 12:33:12 monty@narttu.mysql.fi +9 -12
    Merge with 3.23

  mysql-test/t/myisam.test
    1.7.2.1 03/04/03 12:33:12 monty@narttu.mysql.fi +2 -4
    Merge with 3.23

  myisam/mi_dynrec.c
    1.23.1.1 03/04/03 12:33:12 monty@narttu.mysql.fi +1 -3
    Merge with 3.23

  client/mysqldump.c
    1.65.1.26 03/04/03 12:33:11 monty@narttu.mysql.fi +33 -15
    Merge with 3.23

  client/client_priv.h
    1.15.1.1 03/04/03 12:33:11 monty@narttu.mysql.fi +1 -2
    Merge with 3.23

  sql/log.cc
    1.80.1.34 03/04/03 12:12:23 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/myisam.test
    1.2.7.2 03/04/03 12:12:23 monty@narttu.mysql.fi +0 -0
    Turn off SCCS flag

  BitKeeper/etc/logging_ok
    1.206.22.1 03/04/03 12:12:18 monty@narttu.mysql.fi +0 -1
    auto-union

ChangeSet
  1.676.291.6 03/04/03 12:10:38 monty@narttu.mysql.fi +1 -0
  Portability fix (for AMD hammer)

  sql/log.cc
    1.55.1.16 03/04/03 12:10:37 monty@narttu.mysql.fi +1 -0
    Portability fix (for hammer)

ChangeSet
  1.1346.171.1 03/04/03 11:29:10 monty@narttu.mysql.fi +1 -0
  Safer stack checking

  sql/mysqld.cc
    1.297.1.115 03/04/03 11:29:09 monty@narttu.mysql.fi +1 -1
    Safer stack checking

ChangeSet
  1.1494.50.4 03/04/02 21:18:52 pem@mysql.com +1 -0
  Updated result file.

  mysql-test/r/variables.result
    1.19.1.1 03/04/02 21:18:50 pem@mysql.com +2 -0
    Updated result file.

ChangeSet
  1.1494.50.3 03/04/02 20:42:56 pem@mysql.com +1 -0
  Merge mysql.com:/usr/local/bk/mysql-5.0
  into mysql.com:/home/pem/work/mysql-5.0

  sql/sql_parse.cc
    1.278.1.4 03/04/02 20:42:54 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1494.51.1 03/04/02 20:42:28 pem@mysql.com +9 -0
  Getting rid of lots of memory leaks (but not quite all of them yet,
  some will go away when temporary code is replaced).

  sql/sql_parse.cc
    1.278.2.1 03/04/02 20:42:26 pem@mysql.com +4 -0
    Getting rid of lots of memory leaks (but not quite all of them yet,
    some will go away when temporary code is replaced).

  sql/sql_class.cc
    1.112.1.1 03/04/02 20:42:26 pem@mysql.com +7 -0
    Getting rid of lots of memory leaks (but not quite all of them yet,
    some will go away when temporary code is replaced).

  sql/sp_pcontext.h
    1.7 03/04/02 20:42:26 pem@mysql.com +24 -17
    Getting rid of lots of memory leaks (but not quite all of them yet,
    some will go away when temporary code is replaced).

  sql/sp_pcontext.cc
    1.9 03/04/02 20:42:26 pem@mysql.com +24 -33
    Getting rid of lots of memory leaks (but not quite all of them yet,
    some will go away when temporary code is replaced).

  sql/sp_head.h
    1.11 03/04/02 20:42:26 pem@mysql.com +9 -13
    Getting rid of lots of memory leaks (but not quite all of them yet,
    some will go away when temporary code is replaced).

  sql/sp_head.cc
    1.21 03/04/02 20:42:26 pem@mysql.com +21 -7
    Getting rid of lots of memory leaks (but not quite all of them yet,
    some will go away when temporary code is replaced).

  sql/sp.cc
    1.11 03/04/02 20:42:26 pem@mysql.com +9 -2
    Getting rid of lots of memory leaks (but not quite all of them yet,
    some will go away when temporary code is replaced).

  mysql-test/t/sp.test
    1.18 03/04/02 20:42:26 pem@mysql.com +3 -0
    Drop db before creating.

  mysql-test/r/sp.result
    1.17 03/04/02 20:42:26 pem@mysql.com +1 -0
    Drop db before creating.

ChangeSet
  1.1504.1.21 03/04/02 21:47:22 wax@kishkin.ru +1 -0
  correct code of warning of group_concat

  mysql-test/r/func_gconcat.result
    1.3 03/04/02 21:47:20 wax@kishkin.ru +2 -2
    correct code of warning of group_concat

ChangeSet
  1.1504.1.20 03/04/02 20:49:16 wax@kishkin.ru +1 -0
  mysqld.cc:
    missing comma

  sql/mysqld.cc
    1.355 03/04/02 20:47:38 wax@kishkin.ru +1 -1
    missing comma

ChangeSet
  1.1346.1.82 03/04/02 17:05:34 Sinisa@sinisa.nasamreza.org +4 -0
  A fix for a bug in multi-table updates which was always caused
  whenever a temporary MyISAM table had to be created from HEAP table.

  mysql-test/t/multi_update-master.opt
    1.1 03/04/02 17:05:30 Sinisa@sinisa.nasamreza.org +1 -0

  sql/sql_update.cc
    1.54.1.26 03/04/02 17:05:30 Sinisa@sinisa.nasamreza.org +1 -1
    A fix for a bug in multi-table updates which was always caused
    whenever a temporary MyISAM table had to be created from HEAP table.

  mysql-test/t/multi_update.test
    1.17.1.4 03/04/02 17:05:30 Sinisa@sinisa.nasamreza.org +8 -0
    A fix for a bug in multi-table updates which was always caused
    whenever a temporary MyISAM table had to be created from HEAP table.

  mysql-test/t/multi_update-master.opt
    1.0 03/04/02 17:05:30 Sinisa@sinisa.nasamreza.org +0 -0
    BitKeeper file /mnt/work/mysql-4.0/mysql-test/t/multi_update-master.opt

  mysql-test/r/multi_update.result
    1.15.1.4 03/04/02 17:05:30 Sinisa@sinisa.nasamreza.org +8 -0
    A fix for a bug in multi-table updates which was always caused
    whenever a temporary MyISAM table had to be created from HEAP table.

ChangeSet
  1.1504.1.18 03/04/02 19:16:19 wax@kishkin.ru +5 -0
  resolve new updates group_concat

  sql/sql_class.h
    1.146.1.12 03/04/02 19:16:18 wax@kishkin.ru +0 -0
    resolve

  sql/share/english/errmsg.txt
    1.70.1.6 03/04/02 19:16:18 wax@kishkin.ru +1 -2
    resolve error message

  sql/set_var.cc
    1.34 03/04/02 19:16:18 wax@kishkin.ru +3 -2
    resolve variable 

  sql/mysqld.cc
    1.354 03/04/02 19:16:18 wax@kishkin.ru +1 -2
    resolve option

  include/mysqld_error.h
    1.61.1.4 03/04/02 19:16:18 wax@kishkin.ru +2 -3
    resolve error message

ChangeSet
  1.1504.6.1 03/04/02 14:38:25 lenz@mysql.com +2 -0
   - increased bdb_max_lock value to pass sql-bench
   - re-enabled OpenSSL for the Max RPM package

  support-files/mysql.spec.sh
    1.64 03/04/02 14:38:18 lenz@mysql.com +3 -2
     - re-enabled OpenSSL for the 4.1 Max RPM

  Build-tools/Do-compile
    1.75 03/04/02 14:38:18 lenz@mysql.com +1 -1
     - increased bdb_max_lock value from 60000 -> 240000
       (got many errors "Lock table is out of available locks" when running
       sql-bench with InnoDB)

ChangeSet
  1.1504.1.17 03/04/02 18:15:16 wax@kishkin.ru +9 -0
  Auto merged

  sql/sql_yacc.yy
    1.203.30.19 03/04/02 17:56:54 wax@kishkin.ru +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.7.7 03/04/02 17:56:54 wax@kishkin.ru +0 -0
    Auto merged

  sql/sql_error.cc
    1.14 03/04/02 17:56:54 wax@kishkin.ru +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.3 03/04/02 17:56:53 wax@kishkin.ru +0 -0
    Auto merged

  sql/lex.h
    1.82.1.25 03/04/02 17:56:53 wax@kishkin.ru +0 -0
    Auto merged

  sql/item_sum.h
    1.36 03/04/02 17:56:53 wax@kishkin.ru +0 -0
    Auto merged

  sql/item_sum.cc
    1.67 03/04/02 17:56:53 wax@kishkin.ru +0 -0
    Auto merged

  sql/field.h
    1.65 03/04/02 17:56:53 wax@kishkin.ru +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.233.1.10 03/04/02 17:56:39 wax@kishkin.ru +0 -1
    auto-union

ChangeSet
  1.1455.15.2 03/04/02 17:55:53 wax@kishkin.ru +4 -0
  SCRUM
  correct sql_alloc, ORDER BY and NULL value in group_concat
  add comments
  move test msg_arg
  add test on NULL

  sql/sql_class.h
    1.146.3.2 03/04/02 17:55:52 wax@kishkin.ru +3 -3
    move test msg_arg

  sql/item_sum.cc
    1.60.1.2 03/04/02 17:55:52 wax@kishkin.ru +186 -180
    correct sql_alloc, ORDER BY and NULL value
    add comments

  mysql-test/t/func_gconcat.test
    1.2 03/04/02 17:55:52 wax@kishkin.ru +3 -1
    add test on NULL

  mysql-test/r/func_gconcat.result
    1.2 03/04/02 17:55:52 wax@kishkin.ru +13 -7
    change work with NULL

ChangeSet
  1.1504.5.1 03/04/02 15:38:06 ram@mysql.r18.ru +3 -0
  GEOMCOLLFROMWKB(), GEOMETRYCOLLECTIONFROMWKB(), 
  LINEFROMWKB(), LINESTRINGFROMWKB(), MLINEFROMWKB(), MPOINTFROMWKB(),
  MPOLYFROMWKB(), MULTILINESTRINGFROMWKB(), MULTIPOINTFROMWKB(),
  MULTIPOLYGONFROMWKB(), POINTFROMWKB(), POLYFROMWKB(), POLYGONFROMWKB()
  functions have been added (as synonyms for GEOMFROMWKB()).

  sql/lex.h
    1.82.1.24 03/04/02 15:38:04 ram@mysql.r18.ru +15 -2
    GEOMCOLLFROMWKB(), GEOMETRYCOLLECTIONFROMWKB(),
    LINEFROMWKB(), LINESTRINGFROMWKB(), MLINEFROMWKB(), MPOINTFROMWKB(),
    MPOLYFROMWKB(), MULTILINESTRINGFROMWKB(), MULTIPOINTFROMWKB(),
    MULTIPOLYGONFROMWKB(), POINTFROMWKB(), POLYFROMWKB(), POLYGONFROMWKB()
    functions have been added (as synonyms for GEOMFROMWKB()).

  mysql-test/t/gis.test
    1.6 03/04/02 15:38:03 ram@mysql.r18.ru +5 -5
    GEOMCOLLFROMWKB(), GEOMETRYCOLLECTIONFROMWKB(),
    LINEFROMWKB(), LINESTRINGFROMWKB(), MLINEFROMWKB(), MPOINTFROMWKB(),
    MPOLYFROMWKB(), MULTILINESTRINGFROMWKB(), MULTIPOINTFROMWKB(),
    MULTIPOLYGONFROMWKB(), POINTFROMWKB(), POLYFROMWKB(), POLYGONFROMWKB()
    functions have been added (as synonyms for GEOMFROMWKB()).

  mysql-test/r/gis.result
    1.6 03/04/02 15:38:03 ram@mysql.r18.ru +5 -5
    GEOMCOLLFROMWKB(), GEOMETRYCOLLECTIONFROMWKB(), 
    LINEFROMWKB(), LINESTRINGFROMWKB(), MLINEFROMWKB(), MPOINTFROMWKB(),
    MPOLYFROMWKB(), MULTILINESTRINGFROMWKB(), MULTIPOINTFROMWKB(),
    MULTIPOLYGONFROMWKB(), POINTFROMWKB(), POLYFROMWKB(), POLYGONFROMWKB()
    functions have been added (as synonyms for GEOMFROMWKB()).

ChangeSet
  1.1504.4.1 03/04/02 20:12:01 arjen@george.bitbike.com +1 -0
  prepare.texi merged into manual (mysqldoc tree), file removed.

  BitKeeper/deleted/.del-prepare.texi~20a263ee73a181f
    1.3 03/04/02 20:09:06 arjen@george.bitbike.com +0 -0
    Delete: Docs/prepare.texi

ChangeSet
  1.1504.1.14 03/04/02 13:06:33 monty@narttu.mysql.fi +4 -0
  Fixed problem with const table named with crashed test suite on MacOSX

  sql/sql_class.h
    1.146.1.11 03/04/02 13:06:32 monty@narttu.mysql.fi +3 -1
    Fixed problem with const table named with crashed test suite on MacOSX

  sql/sql_class.cc
    1.105.1.7 03/04/02 13:06:32 monty@narttu.mysql.fi +6 -0
    Fixed problem with const table named with crashed test suite on MacOSX

  myisam/rt_test.c
    1.7 03/04/02 13:06:32 monty@narttu.mysql.fi +1 -1
    Fixed compiler warning

  myisam/mi_test3.c
    1.10 03/04/02 13:06:32 monty@narttu.mysql.fi +1 -1
    Fixed compiler warning

ChangeSet
  1.1494.50.2 03/04/02 10:59:21 guilhem@mysql.com +1 -0
  Tiny optimisation for a (boolean || boolean) test, as SQL_LOG_BIN is set to 1 by default

  sql/sql_insert.cc
    1.86.1.2 03/04/02 10:59:18 guilhem@mysql.com +1 -1
    Tiny optimisation

ChangeSet
  1.1494.50.1 03/04/02 00:15:20 guilhem@mysql.com +36 -0
  Deprecated the update log (Sprint task #792). Now --log-update
  just turns on --log-bin and prints a warning. SQL_LOG_UPDATE
  is handled in two ways (see mysqld.cc for comments).

  sql/sql_update.cc
    1.83.1.1 03/04/02 00:08:20 guilhem@mysql.com +0 -2
    deprecated update log

  sql/sql_table.cc
    1.157.1.1 03/04/02 00:08:20 guilhem@mysql.com +10 -21
    deprecated update log

  sql/sql_rename.cc
    1.17 03/04/02 00:08:20 guilhem@mysql.com +0 -1
    deprecated update log

  sql/sql_parse.cc
    1.278.1.3 03/04/02 00:08:20 guilhem@mysql.com +4 -9
    deprecated update log

  sql/sql_load.cc
    1.46.2.1 03/04/02 00:08:20 guilhem@mysql.com +0 -3
    deprecated update log

  sql/sql_insert.cc
    1.86.1.1 03/04/02 00:08:20 guilhem@mysql.com +8 -28
    deprecated update log

  sql/sql_delete.cc
    1.99.1.1 03/04/02 00:08:20 guilhem@mysql.com +0 -3
    deprecated update log

  sql/sql_db.cc
    1.69 03/04/02 00:08:20 guilhem@mysql.com +0 -3
    deprecated update log

  sql/sql_acl.cc
    1.72.1.1 03/04/02 00:08:19 guilhem@mysql.com +0 -1
    deprecated update log

  sql/share/ukrainian/errmsg.txt
    1.33.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/swedish/errmsg.txt
    1.71.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/spanish/errmsg.txt
    1.70.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/slovak/errmsg.txt
    1.70.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/serbian/errmsg.txt
    1.24.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/russian/errmsg.txt
    1.68.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/romanian/errmsg.txt
    1.68.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/portuguese/errmsg.txt
    1.70.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/polish/errmsg.txt
    1.70.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/norwegian/errmsg.txt
    1.69.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/norwegian-ny/errmsg.txt
    1.69.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/korean/errmsg.txt
    1.69.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/japanese/errmsg.txt
    1.69.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/italian/errmsg.txt
    1.76.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/hungarian/errmsg.txt
    1.71.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/greek/errmsg.txt
    1.70.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/german/errmsg.txt
    1.71.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/french/errmsg.txt
    1.69.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/estonian/errmsg.txt
    1.70.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/english/errmsg.txt
    1.77.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/dutch/errmsg.txt
    1.72.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/danish/errmsg.txt
    1.68.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/share/czech/errmsg.txt
    1.70.1.1 03/04/02 00:08:19 guilhem@mysql.com +2 -0
    deprecated update log

  sql/set_var.cc
    1.30.1.8 03/04/02 00:08:19 guilhem@mysql.com +27 -1
    deprecated update log

  sql/mysqld.cc
    1.351.2.1 03/04/02 00:08:19 guilhem@mysql.com +56 -9
    deprecated update log

  sql/log.cc
    1.109 03/04/02 00:08:19 guilhem@mysql.com +3 -10
    deprecated update log

  include/mysqld_error.h
    1.67.1.1 03/04/02 00:08:19 guilhem@mysql.com +3 -1
    deprecated update log

ChangeSet
  1.1346.169.3 03/04/01 22:49:40 guilhem@mysql.com +1 -0
  Sprint task #856 : make table exclusion rules (in replication)
  apply to GRANT and REVOKE too. For example if replicate-wild-ignore-table=mysql.%,
  GRANT and REVOKE will not be replicated on the slave.

  sql/sql_acl.cc
    1.51.1.39 03/04/01 22:49:37 guilhem@mysql.com +22 -0
    Sprint task #856 : make table exclusion rules (in replication)
    apply to GRANT and REVOKE too. For example if replicate-wild-ignore-table=mysql.%,
    GRANT and REVOKE will not be replicated on the slave.

ChangeSet
  1.676.291.5 03/04/01 18:19:15 guilhem@mysql.com +2 -0
  Small-and-safe fix for bug #218: "LOAD DATA INFILE IGNORE is well
  logged, but read as LOAD DATA INFILE REPLACE"
  This was just bad && instead of &, but nasty consequences.
  This should be merged to 4.0 BUT it will not be automatic (some code
  has moved from log_event.h to log_event.cc, and log_event.cc has changed);
  please Merging Man, do 'bk grep REPLACE_FLAG' in 4.0/sql
  to find all the new places.

  sql/slave.cc
    1.100.1.36 03/04/01 18:19:12 guilhem@mysql.com +2 -2
    & instead of && when testing flags

  sql/log_event.cc
    1.38.1.7 03/04/01 18:19:12 guilhem@mysql.com +3 -3
    & instead of && when testing flags

ChangeSet
  1.1504.1.13 03/04/01 19:03:02 bar@bar.mysql.r18.ru +2 -0
  cp1257.xml, Index.xml:
    cp1257 is Lithuanian sorting

  sql/share/charsets/cp1257.xml
    1.4 03/04/01 19:02:52 bar@bar.mysql.r18.ru +1 -1
    cp1257 is Lithuanian sorting

  sql/share/charsets/Index.xml
    1.18 03/04/01 19:02:34 bar@bar.mysql.r18.ru +3 -3
    cp1257 is Lithuanian sorting

ChangeSet
  1.1504.1.12 03/04/01 18:54:01 bar@bar.mysql.r18.ru +26 -0
  Some collation have been renamed to fit into convension

  strings/ctype-win1250ch.c
    1.24 03/04/01 18:53:58 bar@bar.mysql.r18.ru +1 -1
    Some collation have been renamed to fit into convension

  strings/ctype-latin1.c
    1.11 03/04/01 18:53:58 bar@bar.mysql.r18.ru +1 -1
    Some collation have been renamed to fit into convension

  sql/share/charsets/swe7.xml
    1.3 03/04/01 18:53:58 bar@bar.mysql.r18.ru +1 -1
    Some collation have been renamed to fit into convension

  sql/share/charsets/latin7.xml
    1.5 03/04/01 18:53:58 bar@bar.mysql.r18.ru +2 -2
    Some collation have been renamed to fit into convension

  sql/share/charsets/latin5.xml
    1.4 03/04/01 18:53:58 bar@bar.mysql.r18.ru +1 -1
    Some collation have been renamed to fit into convension

  sql/share/charsets/latin1.xml
    1.5 03/04/01 18:53:58 bar@bar.mysql.r18.ru +1 -1
    Some collation have been renamed to fit into convension

  sql/share/charsets/koi8u.xml
    1.3 03/04/01 18:53:58 bar@bar.mysql.r18.ru +1 -1
    Some collation have been renamed to fit into convension

  sql/share/charsets/koi8r.xml
    1.3 03/04/01 18:53:58 bar@bar.mysql.r18.ru +1 -1
    Some collation have been renamed to fit into convension

  sql/share/charsets/hp8.xml
    1.3 03/04/01 18:53:58 bar@bar.mysql.r18.ru +1 -1
    Some collation have been renamed to fit into convension

  sql/share/charsets/dec8.xml
    1.3 03/04/01 18:53:58 bar@bar.mysql.r18.ru +2 -2
    Some collation have been renamed to fit into convension

  sql/share/charsets/cp866.xml
    1.3 03/04/01 18:53:58 bar@bar.mysql.r18.ru +1 -1
    Some collation have been renamed to fit into convension

  sql/share/charsets/cp1256.xml
    1.4 03/04/01 18:53:58 bar@bar.mysql.r18.ru +1 -1
    Some collation have been renamed to fit into convension

  sql/share/charsets/cp1251.xml
    1.6 03/04/01 18:53:58 bar@bar.mysql.r18.ru +4 -4
    Some collation have been renamed to fit into convension

  sql/share/charsets/cp1250.xml
    1.3 03/04/01 18:53:58 bar@bar.mysql.r18.ru +2 -2
    Some collation have been renamed to fit into convension

  sql/share/charsets/ascii.xml
    1.3 03/04/01 18:53:58 bar@bar.mysql.r18.ru +1 -1
    Some collation have been renamed to fit into convension

  sql/share/charsets/armscii8.xml
    1.3 03/04/01 18:53:58 bar@bar.mysql.r18.ru +1 -1
    Some collation have been renamed to fit into convension

  sql/share/charsets/Index.xml
    1.17 03/04/01 18:53:58 bar@bar.mysql.r18.ru +30 -30
    Some collation have been renamed to fit into convension

  mysql-test/r/variables.result
    1.21 03/04/01 18:53:58 bar@bar.mysql.r18.ru +3 -3
    Some collation have been renamed to fit into convension

  mysql-test/r/type_ranges.result
    1.16 03/04/01 18:53:58 bar@bar.mysql.r18.ru +27 -27
    Some collation have been renamed to fit into convension

  mysql-test/r/type_blob.result
    1.17 03/04/01 18:53:58 bar@bar.mysql.r18.ru +9 -9
    Some collation have been renamed to fit into convension

  mysql-test/r/show_check.result
    1.31.1.1 03/04/01 18:53:58 bar@bar.mysql.r18.ru +2 -2
    Some collation have been renamed to fit into convension

  mysql-test/r/select.result
    1.26 03/04/01 18:53:58 bar@bar.mysql.r18.ru +8 -8
    Some collation have been renamed to fit into convension

  mysql-test/r/ctype_recoding.result
    1.2 03/04/01 18:53:58 bar@bar.mysql.r18.ru +3 -3
    Some collation have been renamed to fit into convension

  mysql-test/r/ctype_collate.result
    1.9 03/04/01 18:53:58 bar@bar.mysql.r18.ru +14 -14
    Some collation have been renamed to fit into convension

  mysql-test/r/create.result
    1.32 03/04/01 18:53:58 bar@bar.mysql.r18.ru +8 -8
    Some collation have been renamed to fit into convension

  mysql-test/r/alter_table.result
    1.15 03/04/01 18:53:58 bar@bar.mysql.r18.ru +2 -2
    Some collation have been renamed to fit into convension

ChangeSet
  1.1504.1.11 03/04/01 17:49:24 bar@bar.mysql.r18.ru +5 -0
  Standard charset names:
  pclatin1 -> cp850
  pclatin2 -> cp852

  sql/share/charsets/cp852.xml
    1.2 03/04/01 17:49:22 bar@bar.mysql.r18.ru +2 -2
    Standard charset names:
    pclatin1 -> cp850
    pclatin2 -> cp852

  sql/share/charsets/cp850.xml
    1.2 03/04/01 17:49:22 bar@bar.mysql.r18.ru +3 -3
    Standard charset names:
    pclatin1 -> cp850
    pclatin2 -> cp852

  sql/share/charsets/Index.xml
    1.16 03/04/01 17:49:22 bar@bar.mysql.r18.ru +6 -7
    Standard charset names:
    pclatin1 -> cp850
    pclatin2 -> cp852

  sql/share/charsets/cp852.xml
    1.1 03/04/01 17:41:54 bar@bar.mysql.r18.ru +119 -0

  sql/share/charsets/cp852.xml
    1.0 03/04/01 17:41:54 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/cp852.xml

  sql/share/charsets/cp850.xml
    1.1 03/04/01 17:41:51 bar@bar.mysql.r18.ru +121 -0

  sql/share/charsets/cp850.xml
    1.0 03/04/01 17:41:51 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/cp850.xml

  BitKeeper/deleted/.del-pclatin2.xml~419e68f6672a99a
    1.2 03/04/01 17:41:39 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/pclatin2.xml

  BitKeeper/deleted/.del-pclatin1.xml~d42c4a35e61526fa
    1.3 03/04/01 17:41:27 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/pclatin1.xml

ChangeSet
  1.1504.1.10 03/04/01 17:26:28 bar@bar.mysql.r18.ru +1 -0
  charset2html.c:
    It's now working under HTTPD as a CGI. Very convenient!

  mysys/charset2html.c
    1.4 03/04/01 17:25:52 bar@bar.mysql.r18.ru +37 -2
    It's now working under HTTPD as a CGI. Very convenient!

ChangeSet
  1.1504.1.9 03/04/01 15:52:09 bar@bar.mysql.r18.ru +18 -0
  mbcharlen() is now used instead of ismbhead(). The last one has been removed.

  strings/ctype-win1250ch.c
    1.23 03/04/01 15:52:07 bar@bar.mysql.r18.ru +0 -1
    mbcharlen() is now used instead of ismbhead(). The last one has been removed.

  strings/ctype-utf8.c
    1.41 03/04/01 15:52:07 bar@bar.mysql.r18.ru +0 -13
    mbcharlen() is now used instead of ismbhead(). The last one has been removed.

  strings/ctype-ujis.c
    1.35 03/04/01 15:52:07 bar@bar.mysql.r18.ru +0 -6
    mbcharlen() is now used instead of ismbhead(). The last one has been removed.

  strings/ctype-tis620.c
    1.42 03/04/01 15:52:07 bar@bar.mysql.r18.ru +0 -1
    mbcharlen() is now used instead of ismbhead(). The last one has been removed.

  strings/ctype-sjis.c
    1.42 03/04/01 15:52:07 bar@bar.mysql.r18.ru +0 -6
    mbcharlen() is now used instead of ismbhead(). The last one has been removed.

  strings/ctype-mb.c
    1.11 03/04/01 15:52:07 bar@bar.mysql.r18.ru +1 -1
    mbcharlen() is now used instead of ismbhead(). The last one has been removed.

  strings/ctype-latin1.c
    1.10 03/04/01 15:52:07 bar@bar.mysql.r18.ru +0 -2
    mbcharlen() is now used instead of ismbhead(). The last one has been removed.

  strings/ctype-gbk.c
    1.37 03/04/01 15:52:07 bar@bar.mysql.r18.ru +4 -10
    mbcharlen() is now used instead of ismbhead(). The last one has been removed.

  strings/ctype-gb2312.c
    1.33 03/04/01 15:52:07 bar@bar.mysql.r18.ru +0 -6
    mbcharlen() is now used instead of ismbhead(). The last one has been removed.

  strings/ctype-extra.c
    1.11 03/04/01 15:52:07 bar@bar.mysql.r18.ru +0 -1
    mbcharlen() is now used instead of ismbhead(). The last one has been removed.

  strings/ctype-euc_kr.c
    1.35 03/04/01 15:52:07 bar@bar.mysql.r18.ru +0 -6
    mbcharlen() is now used instead of ismbhead(). The last one has been removed.

  strings/ctype-czech.c
    1.36 03/04/01 15:52:07 bar@bar.mysql.r18.ru +0 -1
    mbcharlen() is now used instead of ismbhead(). The last one has been removed.

  strings/ctype-bin.c
    1.29 03/04/01 15:52:07 bar@bar.mysql.r18.ru +0 -1
    mbcharlen() is now used instead of ismbhead(). The last one has been removed.

  strings/ctype-big5.c
    1.37 03/04/01 15:52:07 bar@bar.mysql.r18.ru +0 -6
    mbcharlen() is now used instead of ismbhead(). The last one has been removed.

  sql/sql_load.cc
    1.46.1.1 03/04/01 15:52:07 bar@bar.mysql.r18.ru +2 -2
    mbcharlen() is now used instead of ismbhead(). The last one has been removed.

  sql/sql_lex.cc
    1.76.4.1 03/04/01 15:52:07 bar@bar.mysql.r18.ru +5 -5
    mbcharlen() is now used instead of ismbhead(). The last one has been removed.

  mysys/charset.c
    1.88 03/04/01 15:52:07 bar@bar.mysql.r18.ru +1 -1
    mbcharlen() is now used instead of ismbhead(). The last one has been removed.

  include/m_ctype.h
    1.67 03/04/01 15:52:07 bar@bar.mysql.r18.ru +0 -3
    mbcharlen() is now used instead of ismbhead(). The last one has been removed.

ChangeSet
  1.1504.1.8 03/04/01 15:33:09 ram@mysql.r18.ru +1 -0
  Bug fix: should use my_free() instead of my_afree() after my_multi_malloc().

  myisam/rt_split.c
    1.7 03/04/01 15:33:07 ram@mysql.r18.ru +1 -1
    Bug fix: should use my_free() instead of my_afree() after my_multi_malloc().

ChangeSet
  1.1504.1.7 03/04/01 14:17:28 bar@bar.mysql.r18.ru +21 -0
  my_strncasecmp() is not used anymore. Use my_strncoll() instead.

  strings/ctype-win1250ch.c
    1.22 03/04/01 14:17:26 bar@bar.mysql.r18.ru +0 -1
    my_strncasecmp() is not used anymore. Use my_strncoll() instead.

  strings/ctype-utf8.c
    1.40 03/04/01 14:17:26 bar@bar.mysql.r18.ru +0 -2
    my_strncasecmp() is not used anymore. Use my_strncoll() instead.

  strings/ctype-ujis.c
    1.34 03/04/01 14:17:26 bar@bar.mysql.r18.ru +0 -1
    my_strncasecmp() is not used anymore. Use my_strncoll() instead.

  strings/ctype-tis620.c
    1.41 03/04/01 14:17:26 bar@bar.mysql.r18.ru +0 -1
    my_strncasecmp() is not used anymore. Use my_strncoll() instead.

  strings/ctype-sjis.c
    1.41 03/04/01 14:17:26 bar@bar.mysql.r18.ru +0 -1
    my_strncasecmp() is not used anymore. Use my_strncoll() instead.

  strings/ctype-simple.c
    1.33 03/04/01 14:17:26 bar@bar.mysql.r18.ru +0 -8
    my_strncasecmp() is not used anymore. Use my_strncoll() instead.

  strings/ctype-mb.c
    1.10 03/04/01 14:17:26 bar@bar.mysql.r18.ru +0 -24
    my_strncasecmp() is not used anymore. Use my_strncoll() instead.

  strings/ctype-latin1.c
    1.9 03/04/01 14:17:26 bar@bar.mysql.r18.ru +0 -2
    my_strncasecmp() is not used anymore. Use my_strncoll() instead.

  strings/ctype-gbk.c
    1.36 03/04/01 14:17:26 bar@bar.mysql.r18.ru +0 -1
    my_strncasecmp() is not used anymore. Use my_strncoll() instead.

  strings/ctype-gb2312.c
    1.32 03/04/01 14:17:26 bar@bar.mysql.r18.ru +0 -1
    my_strncasecmp() is not used anymore. Use my_strncoll() instead.

  strings/ctype-extra.c
    1.10 03/04/01 14:17:25 bar@bar.mysql.r18.ru +0 -1
    my_strncasecmp() is not used anymore. Use my_strncoll() instead.

  strings/ctype-euc_kr.c
    1.34 03/04/01 14:17:25 bar@bar.mysql.r18.ru +0 -1
    my_strncasecmp() is not used anymore. Use my_strncoll() instead.

  strings/ctype-czech.c
    1.35 03/04/01 14:17:25 bar@bar.mysql.r18.ru +0 -1
    my_strncasecmp() is not used anymore. Use my_strncoll() instead.

  strings/ctype-bin.c
    1.28 03/04/01 14:17:25 bar@bar.mysql.r18.ru +0 -7
    my_strncasecmp() is not used anymore. Use my_strncoll() instead.

  strings/ctype-big5.c
    1.36 03/04/01 14:17:25 bar@bar.mysql.r18.ru +0 -1
    my_strncasecmp() is not used anymore. Use my_strncoll() instead.

  sql/spatial.cc
    1.11 03/04/01 14:17:25 bar@bar.mysql.r18.ru +2 -1
    my_strncasecmp() is not used anymore. Use my_strncoll() instead.

  sql/slave.cc
    1.188.1.1 03/04/01 14:17:25 bar@bar.mysql.r18.ru +1 -1
    my_strncasecmp() is not used anymore. Use my_strncoll() instead.

  mysys/hash.c
    1.26 03/04/01 14:17:25 bar@bar.mysql.r18.ru +1 -1
    my_strncasecmp() is not used anymore. Use my_strncoll() instead.

  mysys/charset.c
    1.87 03/04/01 14:17:25 bar@bar.mysql.r18.ru +0 -2
    my_strncasecmp() is not used anymore. Use my_strncoll() instead.

  include/m_ctype.h
    1.66 03/04/01 14:17:25 bar@bar.mysql.r18.ru +1 -6
    my_strncasecmp() is not used anymore. Use my_strncoll() instead.

  client/mysql.cc
    1.121.1.4 03/04/01 14:17:25 bar@bar.mysql.r18.ru +2 -1
    my_strncasecmp() is not used anymore. Use my_strncoll() instead.

ChangeSet
  1.1504.1.6 03/04/01 12:45:16 bar@bar.mysql.r18.ru +25 -0
  Some optimization in CHARSET_INFO:
    We don't need separate hash_sort() and hash_caseup()
    We don't need tosort(). strnxfrm will do the same.

  strings/ctype-win1250ch.c
    1.21 03/04/01 12:45:13 bar@bar.mysql.r18.ru +0 -2
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  strings/ctype-utf8.c
    1.39 03/04/01 12:45:13 bar@bar.mysql.r18.ru +0 -50
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  strings/ctype-ujis.c
    1.33 03/04/01 12:45:13 bar@bar.mysql.r18.ru +0 -2
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  strings/ctype-tis620.c
    1.40 03/04/01 12:45:13 bar@bar.mysql.r18.ru +0 -2
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  strings/ctype-sjis.c
    1.40 03/04/01 12:45:13 bar@bar.mysql.r18.ru +0 -2
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  strings/ctype-simple.c
    1.32 03/04/01 12:45:13 bar@bar.mysql.r18.ru +14 -47
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  strings/ctype-latin1.c
    1.8 03/04/01 12:45:13 bar@bar.mysql.r18.ru +0 -4
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  strings/ctype-gbk.c
    1.35 03/04/01 12:45:13 bar@bar.mysql.r18.ru +0 -2
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  strings/ctype-gb2312.c
    1.31 03/04/01 12:45:13 bar@bar.mysql.r18.ru +0 -2
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  strings/ctype-extra.c
    1.9 03/04/01 12:45:13 bar@bar.mysql.r18.ru +0 -2
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  strings/ctype-euc_kr.c
    1.33 03/04/01 12:45:13 bar@bar.mysql.r18.ru +0 -2
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  strings/ctype-czech.c
    1.34 03/04/01 12:45:13 bar@bar.mysql.r18.ru +0 -2
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  strings/ctype-bin.c
    1.27 03/04/01 12:45:13 bar@bar.mysql.r18.ru +2 -44
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  strings/ctype-big5.c
    1.35 03/04/01 12:45:13 bar@bar.mysql.r18.ru +0 -2
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  sql/table.cc
    1.77 03/04/01 12:45:13 bar@bar.mysql.r18.ru +1 -2
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  sql/sql_udf.cc
    1.29 03/04/01 12:45:13 bar@bar.mysql.r18.ru +1 -2
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  sql/sql_class.cc
    1.105.1.6 03/04/01 12:45:13 bar@bar.mysql.r18.ru +2 -2
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  sql/sql_acl.cc
    1.73 03/04/01 12:45:13 bar@bar.mysql.r18.ru +3 -5
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  sql/set_var.cc
    1.33 03/04/01 12:45:13 bar@bar.mysql.r18.ru +1 -1
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  sql/filesort.cc
    1.70.1.1 03/04/01 12:45:13 bar@bar.mysql.r18.ru +2 -4
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  mysys/hash.c
    1.25 03/04/01 12:45:13 bar@bar.mysql.r18.ru +11 -58
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  mysys/charset.c
    1.86 03/04/01 12:45:13 bar@bar.mysql.r18.ru +0 -4
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  isam/_key.c
    1.9 03/04/01 12:45:13 bar@bar.mysql.r18.ru +8 -3
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  include/m_ctype.h
    1.65 03/04/01 12:45:13 bar@bar.mysql.r18.ru +0 -7
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

  include/hash.h
    1.11 03/04/01 12:45:13 bar@bar.mysql.r18.ru +0 -4
    Some optimization in CHARSET_INFO:
      We don't need separate hash_sort() and hash_caseup()
      We don't need tosort(). strnxfrm will do the same.

ChangeSet
  1.1504.1.5 03/04/01 10:26:36 bar@bar.mysql.r18.ru +2 -0
  Better error message

  sql/share/charsets/Index.xml
    1.15 03/04/01 10:26:34 bar@bar.mysql.r18.ru +2 -1
    Better error message

  sql/item_strfunc.cc
    1.96 03/04/01 10:26:34 bar@bar.mysql.r18.ru +3 -9
    Better error message

ChangeSet
  1.1504.3.1 03/04/01 09:28:53 bar@bar.mysql.r18.ru +1 -0
  sql_string.cc:
    We finally decided that national character set is utf8 :)

  sql/sql_string.cc
    1.56 03/04/01 09:28:14 bar@bar.mysql.r18.ru +1 -1
    We finally decided that national character set is utf8 :)

ChangeSet
  1.1504.1.3 03/03/31 11:33:22 greg@mysql.com +2 -0
  New XDC file for NetWare pre-emption

ChangeSet
  1.1494.49.1 03/03/31 18:39:14 vva@eagle.mysql.r18.ru +2 -0
  temporary trick for work with different locales (koi8r for example) 

  cmd-line-utils/libedit/refresh.c
    1.3 03/03/31 18:38:54 vva@eagle.mysql.r18.ru +3 -3
    temporary trick for work with different locales (koi8r for example) 

  cmd-line-utils/libedit/map.c
    1.3 03/03/31 18:38:54 vva@eagle.mysql.r18.ru +129 -129
    temporary trick for work with different locales (koi8r for example) 

ChangeSet
  1.1494.48.2 03/03/31 23:14:26 serg@sergbook.mysql.com +3 -0
  don't increment LAST_INSERT_ID() when incremented value cannot be stored in auto_increment column (e.g. is too big)

  sql/handler.cc
    1.84.1.8 03/03/31 23:14:24 serg@sergbook.mysql.com +2 -2
    don't increment LAST_INSERT_ID() when incremented value cannot be stored in auto_increment column (e.g. is too big)

  mysql-test/t/auto_increment.test
    1.8 03/03/31 23:14:24 serg@sergbook.mysql.com +30 -0
    more tests

  mysql-test/r/auto_increment.result
    1.9 03/03/31 23:14:24 serg@sergbook.mysql.com +38 -0
    more tests

  netware/mysql.xdc
    1.1 03/03/31 11:33:20 greg@mysql.com +4 -0

  netware/mysql.xdc
    1.0 03/03/31 11:33:20 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.1/netware/mysql.xdc

  netware/mysql.xdc
    1.2 03/03/31 11:31:17 greg@mysql.com +0 -0
    Change mode to -rw-rw-r--

  BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716
    1.1.1.1 03/03/31 11:30:14 greg@mysql.com +0 -0
    Delete: netware/mysqld.xdc

ChangeSet
  1.1346.170.1 03/03/31 11:28:20 greg@mysql.com +5 -0
  Add new XDC file for NetWare pre-emption, drop old build scripts, libmysqld.def

  netware/mysql.xdc
    1.1 03/03/31 11:28:19 greg@mysql.com +4 -0

  netware/mysql.xdc
    1.0 03/03/31 11:28:19 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/mysql.xdc

  BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c
    1.1.1.1 03/03/31 11:26:16 greg@mysql.com +0 -0
    Delete: netware/libmysqld.def

  BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9
    1.1.1.1 03/03/31 11:26:04 greg@mysql.com +0 -0
    Delete: netware/nwconfigure

  BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e
    1.2.1.1 03/03/31 11:26:01 greg@mysql.com +0 -0
    Delete: netware/nwbootstrap

  BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716
    1.2 03/03/31 11:25:46 greg@mysql.com +0 -0
    Delete: netware/mysqld.xdc

ChangeSet
  1.1504.1.1 03/03/31 19:53:50 bar@bar.mysql.r18.ru +1 -0
  lex.h:
    Use MBRContains() style for what we have implemented. Contains() will be used for real "contains" relation in the future.

  sql/lex.h
    1.82.1.23 03/03/31 19:52:38 bar@bar.mysql.r18.ru +7 -0
    Use MBRContains() style for what we have implemented. Contains() will be used for real "contains" relation in the future.

ChangeSet
  1.1346.169.1 03/03/31 14:50:29 lenz@mysql.com +1 -0
   - Fix for bug #200 (added missing @WRAPLIBS@ to LIBS in 
     libmysqld/examples/Makefile.am (thanks to Christian Hammers from Debian
     for pointing this out)

  libmysqld/examples/Makefile.am
    1.10.1.1 03/03/31 14:50:26 lenz@mysql.com +1 -1
     - added missing @WRAPLIBS@ to LIBS

ChangeSet
  1.1494.47.3 03/03/31 13:42:37 hf@genie.(none) +27 -0
  Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
  into genie.(none):/home/hf/work/mysql-5.0.kil

  sql/share/swedish/errmsg.txt
    1.72 03/03/31 13:42:34 hf@genie.(none) +0 -0
    Auto merged

  sql/share/russian/errmsg.txt
    1.69 03/03/31 13:42:34 hf@genie.(none) +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.71 03/03/31 13:42:34 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.224 03/03/31 13:42:33 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_update.cc
    1.84 03/03/31 13:42:33 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_table.cc
    1.158 03/03/31 13:42:33 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_show.cc
    1.123 03/03/31 13:42:33 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_select.cc
    1.218 03/03/31 13:42:33 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_repl.h
    1.29 03/03/31 13:42:31 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_repl.cc
    1.103 03/03/31 13:42:31 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.35 03/03/31 13:42:31 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_parse.cc
    1.281 03/03/31 13:42:31 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_insert.cc
    1.87 03/03/31 13:42:31 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_class.h
    1.152 03/03/31 13:42:31 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_class.cc
    1.113 03/03/31 13:42:31 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_cache.cc
    1.39.3.2 03/03/31 13:42:31 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_base.cc
    1.146 03/03/31 13:42:31 hf@genie.(none) +0 -0
    Auto merged

  sql/slave.cc
    1.189 03/03/31 13:42:31 hf@genie.(none) +0 -0
    Auto merged

  sql/mysqld.cc
    1.351.1.1 03/03/31 13:42:30 hf@genie.(none) +0 -0
    Auto merged

  sql/mysql_priv.h
    1.190 03/03/31 13:42:30 hf@genie.(none) +0 -0
    Auto merged

  sql/log_event.cc
    1.114 03/03/31 13:42:30 hf@genie.(none) +0 -0
    Auto merged

  sql/lock.cc
    1.43 03/03/31 13:42:30 hf@genie.(none) +0 -0
    Auto merged

  sql/lex.h
    1.93 03/03/31 13:42:30 hf@genie.(none) +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.116 03/03/31 13:42:30 hf@genie.(none) +0 -0
    Auto merged

  sql/filesort.cc
    1.71 03/03/31 13:42:30 hf@genie.(none) +0 -0
    Auto merged

  myisam/mi_check.c
    1.104.1.1 03/03/31 13:42:30 hf@genie.(none) +0 -0
    Auto merged

  include/mysql_com.h
    1.68 03/03/31 13:42:30 hf@genie.(none) +0 -0
    Auto merged

ChangeSet
  1.1494.32.5 03/03/31 13:39:46 hf@genie.(none) +51 -0
  SCRUM
  two KILL commands implementation (version 2)

  sql/sql_update.cc
    1.79.1.1 03/03/31 13:33:06 hf@genie.(none) +1 -1
    two errors are possible here now

  sql/sql_table.cc
    1.155.1.2 03/03/31 13:33:06 hf@genie.(none) +1 -1
    two errors are possible here now

  sql/sql_show.cc
    1.114.2.1 03/03/31 13:33:06 hf@genie.(none) +1 -1
    notification adopted to changes in class THD

  sql/sql_select.cc
    1.212.1.4 03/03/31 13:33:06 hf@genie.(none) +9 -9
    two errors are possible here now

  sql/sql_repl.h
    1.27.1.1 03/03/31 13:33:06 hf@genie.(none) +1 -1
    awake parameter changed

  sql/sql_repl.cc
    1.98.1.3 03/03/31 13:33:06 hf@genie.(none) +1 -1
    the parameter to awake is of THD::killed_state type now

  sql/sql_prepare.cc
    1.33.1.1 03/03/31 13:33:06 hf@genie.(none) +1 -1
    two errors are possible here now

  sql/sql_parse.cc
    1.280 03/03/31 13:33:06 hf@genie.(none) +6 -15
    kill_one_thread function changed to handle KILL_QUERY

  sql/sql_load.cc
    1.47 03/03/31 13:33:06 hf@genie.(none) +2 -2
    two errors are possible here now

  sql/sql_insert.cc
    1.85.1.1 03/03/31 13:33:06 hf@genie.(none) +8 -8
    THD::killed has enum type now

  sql/sql_delete.cc
    1.100 03/03/31 13:33:06 hf@genie.(none) +1 -1
    two errors are possible here now

  sql/sql_class.h
    1.151 03/03/31 13:33:06 hf@genie.(none) +5 -3
    class THD changed to handle KILL_QUERY

  sql/sql_class.cc
    1.111.1.1 03/03/31 13:33:06 hf@genie.(none) +8 -7
    THD::awake implementation changed to handle KILL_QUERY

  sql/sql_cache.cc
    1.39.4.1 03/03/31 13:33:06 hf@genie.(none) +1 -1
    THD::killed has enum type now

  sql/sql_base.cc
    1.143.1.1 03/03/31 13:33:06 hf@genie.(none) +1 -1
    THD::killed has enum type now

  sql/slave.cc
    1.183.1.3 03/03/31 13:33:06 hf@genie.(none) +1 -1
    two errors are possible here now

  sql/share/ukrainian/errmsg.txt
    1.34 03/03/31 13:33:06 hf@genie.(none) +1 -0
    new error message

  sql/share/swedish/errmsg.txt
    1.70.1.1 03/03/31 13:33:06 hf@genie.(none) +1 -0
    new error message

  sql/share/spanish/errmsg.txt
    1.71 03/03/31 13:33:06 hf@genie.(none) +1 -0
    new error message

  sql/share/slovak/errmsg.txt
    1.71 03/03/31 13:33:05 hf@genie.(none) +1 -0
    new error message

  sql/share/serbian/errmsg.txt
    1.25 03/03/31 13:33:05 hf@genie.(none) +1 -0
    new error message

  sql/share/russian/errmsg.txt
    1.67.1.1 03/03/31 13:33:05 hf@genie.(none) +1 -0
    new error message

  sql/share/romanian/errmsg.txt
    1.69 03/03/31 13:33:05 hf@genie.(none) +1 -0
    new error message

  sql/share/portuguese/errmsg.txt
    1.71 03/03/31 13:33:05 hf@genie.(none) +1 -0
    new error message 

  sql/share/polish/errmsg.txt
    1.69.1.1 03/03/31 13:33:05 hf@genie.(none) +1 -0
    new error message

  sql/share/norwegian/errmsg.txt
    1.70 03/03/31 13:33:05 hf@genie.(none) +1 -0
    new error message

  sql/share/norwegian-ny/errmsg.txt
    1.70 03/03/31 13:33:05 hf@genie.(none) +1 -0
    new error message

  sql/share/korean/errmsg.txt
    1.70 03/03/31 13:33:05 hf@genie.(none) +1 -0
    new error message

  sql/share/japanese/errmsg.txt
    1.70 03/03/31 13:33:05 hf@genie.(none) +1 -0
    new error message

  sql/share/italian/errmsg.txt
    1.77 03/03/31 13:33:05 hf@genie.(none) +1 -0
    new error message

  sql/share/hungarian/errmsg.txt
    1.72 03/03/31 13:33:05 hf@genie.(none) +1 -0
    new error message

  sql/share/greek/errmsg.txt
    1.71 03/03/31 13:33:05 hf@genie.(none) +1 -0
    new error message

  sql/share/german/errmsg.txt
    1.72 03/03/31 13:33:05 hf@genie.(none) +1 -0
    new error message

  sql/share/french/errmsg.txt
    1.70 03/03/31 13:33:05 hf@genie.(none) +1 -0
    new error message

  sql/share/estonian/errmsg.txt
    1.71 03/03/31 13:33:05 hf@genie.(none) +1 -0
    new error message

  sql/share/english/errmsg.txt
    1.78 03/03/31 13:33:05 hf@genie.(none) +1 -0
    new error message

  sql/share/dutch/errmsg.txt
    1.73 03/03/31 13:33:05 hf@genie.(none) +1 -0
    new error message

  sql/share/danish/errmsg.txt
    1.69 03/03/31 13:33:05 hf@genie.(none) +1 -0
    new error message

  sql/share/czech/errmsg.txt
    1.71 03/03/31 13:33:05 hf@genie.(none) +1 -0
    new error message

  sql/records.cc
    1.20 03/03/31 13:33:05 hf@genie.(none) +1 -1
    two errors are possible here now

  sql/mysqld.cc
    1.345.1.2 03/03/31 13:33:05 hf@genie.(none) +3 -3
    THD::killed has enum type now

  sql/log_event.cc
    1.108.2.1 03/03/31 13:33:05 hf@genie.(none) +1 -1
    two ways of killing possible here now

  sql/lock.cc
    1.41.1.1 03/03/31 13:33:04 hf@genie.(none) +1 -1
    two different errors possible here now

  sql/ha_myisam.cc
    1.111.1.2 03/03/31 13:33:04 hf@genie.(none) +2 -2
    killed_ptr returns value now

  sql/ha_berkeley.cc
    1.118 03/03/31 13:33:04 hf@genie.(none) +1 -1
    THD::killed has enum type

  sql/filesort.cc
    1.69.1.1 03/03/31 13:33:04 hf@genie.(none) +4 -4
    THD::killed now has enum type

  myisam/sort.c
    1.34.1.1 03/03/31 13:33:04 hf@genie.(none) +3 -2
    killed_ptr returns value now

  myisam/myisamdef.h
    1.60 03/03/31 13:33:04 hf@genie.(none) +1 -1
    killed_ptr returns value now

  myisam/myisamchk.c
    1.93 03/03/31 13:33:04 hf@genie.(none) +2 -2
    killed_ptr returns value now

  myisam/mi_check.c
    1.103.1.1 03/03/31 13:33:04 hf@genie.(none) +1 -1
    killed_ptr now retutns only value - not pointer

  include/mysqld_error.h
    1.68 03/03/31 13:33:04 hf@genie.(none) +2 -1
    Error message about query interruption added

ChangeSet
  1.1504 03/03/31 13:32:34 ram@mysql.r18.ru +1 -0
  Bug fix: should use my_multi_malloc() here!!!

  myisam/rt_split.c
    1.6 03/03/31 13:32:32 ram@mysql.r18.ru +7 -8
    Bug fix: should use my_multi_malloc() here!!!

ChangeSet
  1.1346.168.3 03/03/31 09:49:09 bell@sanja.is.com.ua +4 -0
  fixed bug 209 (SQL_SELECT_LIMIT and query cache incompatibility)

  sql/sql_parse.cc
    1.218.1.87 03/03/31 09:49:04 bell@sanja.is.com.ua +2 -1
    room for SQL_SELECT_LAYOUT storing added

  sql/sql_cache.cc
    1.29.1.24 03/03/31 09:49:04 bell@sanja.is.com.ua +15 -10
    layout fixed
    SQL_SELECT_LIMIT stored in query cache now

  mysql-test/t/query_cache.test
    1.16.1.5 03/03/31 09:49:04 bell@sanja.is.com.ua +14 -3
    test of SET OPTION SQL_SELECT_LIMIT

  mysql-test/r/query_cache.result
    1.15.1.5 03/03/31 09:49:04 bell@sanja.is.com.ua +18 -0
    test of SET OPTION SQL_SELECT_LIMIT

ChangeSet
  1.1503 03/03/31 09:19:20 bar@bar.mysql.r18.ru +3 -0
  ALTER TABLE didn't remember the exact
  geometry type (POINT, LINESTRING, etc)
  and changed all into "GEOMETRY".

  sql/field.cc
    1.97 03/03/31 09:19:16 bar@bar.mysql.r18.ru +4 -0
    ALTER TABLE didn't remember the exact
    geometry type (POINT, LINESTRING, etc)
    and changed all into "GEOMETRY".

  mysql-test/t/gis.test
    1.5 03/03/31 09:19:16 bar@bar.mysql.r18.ru +19 -0
    ALTER TABLE didn't remember the exact
    geometry type (POINT, LINESTRING, etc)
    and changed all into "GEOMETRY".

  mysql-test/r/gis.result
    1.5 03/03/31 09:19:16 bar@bar.mysql.r18.ru +33 -0
    ALTER TABLE didn't remember the exact
    geometry type (POINT, LINESTRING, etc)
    and changed all into "GEOMETRY".

ChangeSet
  1.1502 03/03/30 19:36:14 jani@dsl-kpogw4gb5.dial.inet.fi +1 -0
  Added quotes around CREATE DATABASE IF EXISTS `name` if -Q was given.

  client/mysqldump.c
    1.85 03/03/30 19:36:11 jani@dsl-kpogw4gb5.dial.inet.fi +5 -2
    Added quotes around CREATE DATABASE IF EXISTS `name` if -Q was given.

ChangeSet
  1.1346.168.1 03/03/30 18:36:01 hf@deer.mysql.r18.ru +3 -0
  truncating REPLACE result bug fix

  sql/item_strfunc.cc
    1.36.1.20 03/03/30 18:35:24 hf@deer.mysql.r18.ru +2 -2
    fix for counting REPLACE result length

  mysql-test/t/func_str.test
    1.15.2.2 03/03/30 18:35:24 hf@deer.mysql.r18.ru +1 -0
    test with long arguments for REPLACE

  mysql-test/r/func_str.result
    1.16.2.2 03/03/30 18:35:24 hf@deer.mysql.r18.ru +3 -0
    test result for truncating REPLACE result

ChangeSet
  1.1494.47.2 03/03/30 13:25:43 pem@per-erik-martins-dator.local +4 -0
  Implemented DEFAULT for DECLARE variables.

  BitKeeper/etc/logging_ok
    1.238 03/03/30 13:25:32 pem@per-erik-martins-dator.local +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_yacc.yy
    1.222.1.3 03/03/30 13:23:42 pem@per-erik-martins-dator.local +20 -4
    Implemented DEFAULT for DECLARE variables.

  mysql-test/t/sp.test
    1.17 03/03/30 13:23:42 pem@per-erik-martins-dator.local +6 -10
    Implemented DEFAULT for DECLARE variables.

  mysql-test/r/sp.result
    1.16 03/03/30 13:23:42 pem@per-erik-martins-dator.local +5 -10
    Implemented DEFAULT for DECLARE variables.

ChangeSet
  1.1494.48.1 03/03/29 20:40:03 serg@sergbook.mysql.com +4 -0
  ft benchmark suite: initial checkin

  myisam/ftbench/ft-test-run.sh
    1.1 03/03/29 20:39:03 serg@sergbook.mysql.com +81 -0

  myisam/ftbench/Ereport.pl
    1.1 03/03/29 20:39:03 serg@sergbook.mysql.com +53 -0

  myisam/ftbench/Ecompare.pl
    1.1 03/03/29 20:39:03 serg@sergbook.mysql.com +96 -0

  BitKeeper/etc/ignore
    1.151 03/03/29 20:39:03 serg@sergbook.mysql.com +2 -0
    Added myisam/ftbench/data myisam/ftbench/t to the ignore list

  myisam/ftbench/ft-test-run.sh
    1.0 03/03/29 20:39:03 serg@sergbook.mysql.com +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-4.1/myisam/ftbench/ft-test-run.sh

  myisam/ftbench/Ereport.pl
    1.0 03/03/29 20:39:03 serg@sergbook.mysql.com +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-4.1/myisam/ftbench/Ereport.pl

  myisam/ftbench/Ecompare.pl
    1.0 03/03/29 20:39:03 serg@sergbook.mysql.com +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-4.1/myisam/ftbench/Ecompare.pl

  BitKeeper/etc/ignore
    1.150 03/03/29 20:39:03 serg@sergbook.mysql.com +0 -1
    removed wrong entry myisam/ftbench/var

  BitKeeper/etc/ignore
    1.149 03/03/29 20:37:00 serg@sergbook.mysql.com +1 -0
    added myisam/ftbench/var/*

  BitKeeper/etc/ignore
    1.148 03/03/29 20:36:49 serg@sergbook.mysql.com +1 -0
    added myisam/ftbench/var

ChangeSet
  1.1501 03/03/29 16:59:03 jani@dsl-kpogw4gb5.dial.inet.fi +1 -0
  Added quotes around database name, when using -Q.

  client/mysqldump.c
    1.84 03/03/29 16:58:59 jani@dsl-kpogw4gb5.dial.inet.fi +4 -2
    Added quotes around database name, when using -Q.

ChangeSet
  1.1498.1.1 03/03/29 16:41:01 Sinisa@sinisa.nasamreza.org +1 -0
  Fix for a crashing bug in union.
  
  Parameters for temporary tables were created locally in the function
  and it's address passed to a field in select_result, which produced
  random errors when MyISAM table was created based on this bogus
  address.

  sql/sql_union.cc
    1.70 03/03/29 16:40:57 Sinisa@sinisa.nasamreza.org +4 -5
    Fix for a crashing bug in union.
    
    Parameters for temporary tables were created locally in the function
    and it's address passed to a field in select_result, which produced
    random errors when MyISAM table was created based on this bogus
    address.

ChangeSet
  1.1500 03/03/28 14:24:32 greg@mysql.com +10 -0
  Manual merge of Novell's changes for NetWare platform from 4.0, 4.1 patches

  scripts/make_binary_distribution.sh
    1.54 03/03/28 14:24:23 greg@mysql.com +35 -21
    Made bin directory files more flexible for alternate platforms, without unnecessary repetition

  netware/Makefile.am
    1.7 03/03/28 14:24:23 greg@mysql.com +1 -1
    Add isam/isamchk.def to netware_build_files

  netware/BUILD/mwenv
    1.4 03/03/28 14:24:23 greg@mysql.com +3 -3
    Add zlib to environment variables

  mysys/thr_mutex.c
    1.20.1.1 03/03/28 14:24:23 greg@mysql.com +0 -5
    NetWare: no need for pthread_mutex_lock calls

  mysys/my_pthread.c
    1.34.1.1 03/03/28 14:24:23 greg@mysql.com +0 -13
    NetWare only: special my_pthread_cond_timedwait no longer needed

  mysys/my_init.c
    1.29 03/03/28 14:24:23 greg@mysql.com +0 -10
    Changes to netware_init

  mysys/default.c
    1.24 03/03/28 14:24:23 greg@mysql.com +1 -1
    Add conditional for NetWare

  include/my_pthread.h
    1.63 03/03/28 14:24:23 greg@mysql.com +0 -8
    NetWare only: pthread_cond_timedwait now present in LibC

  client/mysqldump.c
    1.83 03/03/28 14:24:23 greg@mysql.com +1 -9
    NetWare only: Remove pthread_yield on large screen results

  client/mysql.cc
    1.121.1.3 03/03/28 14:24:23 greg@mysql.com +0 -25
    NetWare only: Remove pthread_yield on large screen results

ChangeSet
  1.1494.47.1 03/03/28 18:27:36 pmartin@build.mysql2.com +2 -0
  Renamed .del-makefile.w32 to .del-makefile3.w32

  BitKeeper/etc/logging_ok
    1.237 03/03/28 18:24:14 pmartin@build.mysql2.com +1 -0
    Logging to logging@openlogging.org accepted

  BitKeeper/deleted/.del-makefile3.w32
    1.2 03/03/28 18:09:54 pmartin@build.mysql2.com +0 -0
    Rename: BitKeeper/deleted/.del-makefile.w32 -> BitKeeper/deleted/.del-makefile3.w32

ChangeSet
  1.1494.44.6 03/03/28 17:02:31 pem@mysql.com +1 -0
  Check for thd->killed in execution loop. (Makes more graceful behaviour in
  certain interrupt cases.)

  sql/sp_head.cc
    1.20 03/03/28 17:02:29 pem@mysql.com +7 -2
    Check for thd->killed in execution loop. (Makes more graceful behaviour in
    certain interrupt cases.)

ChangeSet
  1.1346.1.79 03/03/28 17:58:30 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/sql_show.cc
    1.76.1.29 03/03/28 17:58:25 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1497.1.1 03/03/28 19:37:25 bar@bar.mysql.r18.ru +1 -0
  charset.c:
    strcasecmp -> my_strcasecmp
    This fix compilation problem on windows

  mysys/charset.c
    1.85 03/03/28 19:36:35 bar@bar.mysql.r18.ru +4 -3
    strcasecmp -> my_strcasecmp
    This fix compilation problem on windows

ChangeSet
  1.1498 03/03/28 16:58:52 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/item.cc
    1.58.1.9 03/03/28 16:58:44 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1494.1.27 03/03/28 16:57:03 Sinisa@sinisa.nasamreza.org +4 -0
  Fixing crashing bugs as reported in bugs database 
  #195

  sql/item_strfunc.h
    1.52 03/03/28 16:56:58 Sinisa@sinisa.nasamreza.org +2 -1
    Fixing crashing bugs as reported in bugs database 
    #195

  sql/item_cmpfunc.cc
    1.84 03/03/28 16:56:58 Sinisa@sinisa.nasamreza.org +2 -1
    Fixing crashing bugs as reported in bugs database 
    #195

  mysql-test/t/cast.test
    1.3 03/03/28 16:56:58 Sinisa@sinisa.nasamreza.org +1 -0
    Fixing crashing bugs as reported in bugs database 
    #195

  mysql-test/r/cast.result
    1.5 03/03/28 16:56:58 Sinisa@sinisa.nasamreza.org +3 -0
    Fixing crashing bugs as reported in bugs database 
    #195

ChangeSet
  1.1496 03/03/28 12:16:09 bell@sanja.is.com.ua +6 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/bk/work-qcvar-4.1

ChangeSet
  1.1494.45.7 03/03/28 16:01:52 bar@bar.mysql.r18.ru +1 -0
  sql_yacc.yy:
    Fix for possible failure reason on big-endian machines
    ,

ChangeSet
  1.1494.45.6 03/03/28 11:27:59 ram@mysql.r18.ru +1 -0
  Free allocated memory even in case of error.

ChangeSet
  1.1494.45.5 03/03/28 11:22:16 ram@mysql.r18.ru +1 -0
  Bug fix: should check _mi_new() return value.

ChangeSet
  1.1494.45.4 03/03/28 11:11:15 ram@mysql.r18.ru +1 -0
  Bug fix: should check _mi_write_keypage() return value.

ChangeSet
  1.1494.45.3 03/03/28 18:18:22 hf@deer.mysql.r18.ru +1 -0
  small addition to fix of truncating in replace

  sql/item_strfunc.cc
    1.95 03/03/28 18:18:16 hf@deer.mysql.r18.ru +1 -1
    uint is better here

ChangeSet
  1.1346.167.1 03/03/28 15:36:42 bell@sanja.is.com.ua +3 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
  into sanja.is.com.ua:/home/bell/mysql/bk/work-show-4.0

  sql/sql_yacc.yy
    1.145.1.58 03/03/28 15:36:40 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/query_cache.test
    1.16.1.4 03/03/28 15:36:40 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/query_cache.result
    1.15.1.4 03/03/28 15:36:40 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.203.30.18 03/03/28 16:01:19 bar@bar.mysql.r18.ru +8 -8
    Fix for possible failure reason on big-endian machines
    ,

  sql/sql_cache.cc
    1.39.1.11 03/03/28 12:16:06 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/set_var.cc
    1.32 03/03/28 12:16:06 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysqld.cc
    1.353 03/03/28 12:16:06 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.1.2 03/03/28 12:16:06 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/query_cache.test
    1.22 03/03/28 12:16:06 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/query_cache.result
    1.21 03/03/28 12:16:06 bell@sanja.is.com.ua +0 -0
    Auto merged

  myisam/rt_split.c
    1.5 03/03/28 11:27:48 ram@mysql.r18.ru +5 -2
    Free allocated memory even in case of error.

  myisam/rt_split.c
    1.4 03/03/28 11:22:14 ram@mysql.r18.ru +5 -2
    Bug fix: should check _mi_new() return value.

  myisam/rt_split.c
    1.3 03/03/28 11:11:13 ram@mysql.r18.ru +1 -4
    Bug fix: should check _mi_write_keypage() return value.

ChangeSet
  1.1494.45.2 03/03/28 05:50:58 hf@deer.mysql.r18.ru +1 -0
  Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.rpc

  sql/item_strfunc.cc
    1.94 03/03/28 05:50:56 hf@deer.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1346.1.78 03/03/27 18:13:37 greg@mysql.com +2 -0
  Improve make_binary_distribution from Novell code at Monty's request

  scripts/make_binary_distribution.sh
    1.49.1.3 03/03/27 18:13:36 greg@mysql.com +25 -30
    Split BIN_FILES into more generic parts, with no repetition

ChangeSet
  1.1494.44.5 03/03/27 17:47:25 pem@mysql.com +1 -0
  ...and got rid of the strncasecmps too.

  sql/sp.cc
    1.10 03/03/27 17:47:23 pem@mysql.com +2 -2
    ...and got rid of the strncasecmps too.

ChangeSet
  1.1494.44.4 03/03/27 17:35:27 pem@mysql.com +3 -0
  Replaced a couple of strcasecmps.

  sql/sp_pcontext.cc
    1.8 03/03/27 17:33:41 pem@mysql.com +1 -1
    Replaced a couple of strcasecmps.

  sql/sp_head.cc
    1.19 03/03/27 17:33:41 pem@mysql.com +2 -2
    Replaced a couple of strcasecmps.

  sql/sp.cc
    1.9 03/03/27 17:33:41 pem@mysql.com +1 -1
    Replaced a couple of strcasecmps.

ChangeSet
  1.1494.1.26 03/03/27 16:11:01 Sinisa@sinisa.nasamreza.org +4 -0
  Fixing a bug #195
  Fixing UNION's popping up in slow query log

  sql/sql_union.cc
    1.69 03/03/27 16:10:57 Sinisa@sinisa.nasamreza.org +6 -2
    Fixing UNION's popping up in the slow query log

  sql/item_timefunc.h
    1.30 03/03/27 16:10:57 Sinisa@sinisa.nasamreza.org +2 -1
    Fixing a bug #195

  mysql-test/t/cast.test
    1.2 03/03/27 16:10:57 Sinisa@sinisa.nasamreza.org +1 -0
    Fixing a bug #195

  mysql-test/r/cast.result
    1.4 03/03/27 16:10:57 Sinisa@sinisa.nasamreza.org +3 -0
    Fixing a bug #195

ChangeSet
  1.1494.45.1 03/03/27 14:17:51 monty@mashka.mysql.fi +4 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mashka.mysql.fi:/home/my/mysql-4.1

  sql/sql_yacc.yy
    1.203.30.17 03/03/27 14:17:47 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.4.10 03/03/27 14:17:47 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.233.1.9 03/03/27 14:17:41 monty@mashka.mysql.fi +0 -0
    auto-union

  BitKeeper/etc/gone
    1.92 03/03/27 14:17:41 monty@mashka.mysql.fi +0 -0
    auto-union

ChangeSet
  1.1494.42.2 03/03/27 14:15:42 monty@mashka.mysql.fi +4 -0
  After merge fixes

  sql/sql_yacc.yy
    1.203.30.16 03/03/27 14:15:40 monty@mashka.mysql.fi +2 -2
    After merge fix

  sql/sql_parse.cc
    1.271.4.9 03/03/27 14:15:40 monty@mashka.mysql.fi +1 -1
    After merge fix

  mysql-test/t/query_cache.test
    1.20.1.2 03/03/27 14:15:40 monty@mashka.mysql.fi +1 -2
    Updated test for 4.1

  mysql-test/r/query_cache.result
    1.19.1.3 03/03/27 14:15:40 monty@mashka.mysql.fi +0 -1
    Updated test for 4.1

ChangeSet
  1.1346.163.7 03/03/27 13:54:22 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/mysqld.cc
    1.297.1.114 03/03/27 13:54:19 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1494.44.3 03/03/27 12:09:11 pem@mysql.com +23 -0
  Merged 4.1 into 5.0.

  sql/sql_yacc.yy
    1.222.1.2 03/03/27 12:09:09 pem@mysql.com +1 -5
    Merged 4.1 into 5.0.

  sql/sql_parse.cc
    1.278.1.2 03/03/27 12:09:09 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/share/swedish/errmsg.txt
    1.71 03/03/27 12:09:09 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/item_func.cc
    1.125 03/03/27 12:09:09 pem@mysql.com +0 -1
    Merged 4.1 into 5.0.

  sql/item.cc
    1.62 03/03/27 12:09:09 pem@mysql.com +0 -1
    Merged 4.1 into 5.0.

  scripts/mysql_install_db.sh
    1.42 03/03/27 12:09:09 pem@mysql.com +0 -0
    Merged 4.1 into 5.0.

  sql/sql_select.cc
    1.217 03/03/27 11:52:47 pem@mysql.com +0 -0
    Auto merged

  sql/share/russian/errmsg.txt
    1.68 03/03/27 11:52:47 pem@mysql.com +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.70 03/03/27 11:52:47 pem@mysql.com +0 -0
    Auto merged

  sql/sql_lex.h
    1.110 03/03/27 11:52:46 pem@mysql.com +0 -0
    Auto merged

  sql/sql_lex.cc
    1.76.2.6 03/03/27 11:52:46 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.149.1.1 03/03/27 11:52:46 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.112 03/03/27 11:52:46 pem@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.188.1.1 03/03/27 11:52:46 pem@mysql.com +0 -0
    Auto merged

  sql/lex.h
    1.91.1.1 03/03/27 11:52:46 pem@mysql.com +0 -0
    Auto merged

  sql/item_func.h
    1.72 03/03/27 11:52:46 pem@mysql.com +0 -0
    Auto merged

  sql/item.h
    1.59 03/03/27 11:52:46 pem@mysql.com +0 -0
    Auto merged

  libmysqld/Makefile.am
    1.31 03/03/27 11:52:45 pem@mysql.com +0 -0
    Auto merged

  configure.in
    1.209 03/03/27 11:52:45 pem@mysql.com +0 -0
    Auto merged

  client/mysqltest.c
    1.96 03/03/27 11:52:45 pem@mysql.com +0 -0
    Auto merged

  client/mysql.cc
    1.123 03/03/27 11:52:45 pem@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.236 03/03/27 11:52:38 pem@mysql.com +0 -0
    auto-union

  BitKeeper/etc/gone
    1.86.1.12 03/03/27 11:52:38 pem@mysql.com +0 -0
    auto-union

ChangeSet
  1.1346.163.6 03/03/27 12:17:27 heikki@hundin.mysql.fi +1 -0
  mysqld.cc:
    Make the default value of innodb_flush_log_at_trx_commit 1, not 0 which compromises the Durability of a transaction

  sql/mysqld.cc
    1.297.28.1 03/03/27 12:17:18 heikki@hundin.mysql.fi +1 -1
    Make the default value of innodb_flush_log_at_trx_commit 1, not 0 which compromises the Durability of a transaction

ChangeSet
  1.1494.44.2 03/03/27 13:46:56 bar@bar.mysql.r18.ru +1 -0
  lex.h:
    GeometryCollectionFromText is now alias for GeomCollFromText

  sql/lex.h
    1.82.1.22 03/03/27 13:46:32 bar@bar.mysql.r18.ru +1 -0
    GeometryCollectionFromText is now alias for GeomCollFromText

ChangeSet
  1.1494.44.1 03/03/27 13:09:09 bar@bar.mysql.r18.ru +10 -0
  More OpenGIS compatibility:
  Point, MultiLine, Poligom, etc, are now not aliases
  for Geometry, but separate field types.

  sql/unireg.cc
    1.26 03/03/27 13:09:07 bar@bar.mysql.r18.ru +5 -1
    More OpenGIS compatibility:
    Point, MultiLine, Poligom, etc, are now not aliases
    for Geometry, but separate field types.

  sql/table.cc
    1.76 03/03/27 13:09:07 bar@bar.mysql.r18.ru +14 -2
    More OpenGIS compatibility:
    Point, MultiLine, Poligom, etc, are now not aliases
    for Geometry, but separate field types.

  sql/sql_yacc.yy
    1.203.33.1 03/03/27 13:09:07 bar@bar.mysql.r18.ru +12 -2
    More OpenGIS compatibility:
    Point, MultiLine, Poligom, etc, are now not aliases
    for Geometry, but separate field types.

  sql/sql_parse.cc
    1.271.5.1 03/03/27 13:09:07 bar@bar.mysql.r18.ru +3 -1
    More OpenGIS compatibility:
    Point, MultiLine, Poligom, etc, are now not aliases
    for Geometry, but separate field types.

  sql/sql_lex.h
    1.102.7.6 03/03/27 13:09:07 bar@bar.mysql.r18.ru +1 -0
    More OpenGIS compatibility:
    Point, MultiLine, Poligom, etc, are now not aliases
    for Geometry, but separate field types.

  sql/mysql_priv.h
    1.186.2.7 03/03/27 13:09:06 bar@bar.mysql.r18.ru +2 -1
    More OpenGIS compatibility:
    Point, MultiLine, Poligom, etc, are now not aliases
    for Geometry, but separate field types.

  sql/field.h
    1.64 03/03/27 13:09:06 bar@bar.mysql.r18.ru +17 -5
    More OpenGIS compatibility:
    Point, MultiLine, Poligom, etc, are now not aliases
    for Geometry, but separate field types.

  sql/field.cc
    1.96 03/03/27 13:09:06 bar@bar.mysql.r18.ru +29 -2
    More OpenGIS compatibility:
    Point, MultiLine, Poligom, etc, are now not aliases
    for Geometry, but separate field types.

  mysql-test/t/gis.test
    1.4 03/03/27 13:09:06 bar@bar.mysql.r18.ru +10 -0
    More OpenGIS compatibility:
    Point, MultiLine, Poligom, etc, are now not aliases
    for Geometry, but separate field types.

  mysql-test/r/gis.result
    1.4 03/03/27 13:09:06 bar@bar.mysql.r18.ru +32 -0
    More OpenGIS compatibility:
    Point, MultiLine, Poligom, etc, are now not aliases
    for Geometry, but separate field types.

ChangeSet
  1.1346.163.5 03/03/26 22:04:20 bell@sanja.is.com.ua +1 -0
  fixed problem of port without host in SHOW PROCESSLIST (bug 189)

  sql/sql_show.cc
    1.76.4.2 03/03/26 22:04:14 bell@sanja.is.com.ua +1 -1
    fixed problem of port without host in SHOW PROCESSLIST

ChangeSet
  1.1494.43.1 03/03/26 23:31:42 hf@deer.mysql.r18.ru +1 -0
  Fix of the #173 bug
  (Truncating of Replace result)

  sql/item_strfunc.cc
    1.92.1.1 03/03/26 23:31:36 hf@deer.mysql.r18.ru +2 -2
    max_length for Replace function was counted in wrong way

ChangeSet
  1.1494.42.1 03/03/26 18:37:38 monty@mashka.mysql.fi +29 -0
  Merge with 4.0.13

  sql/sql_yacc.yy
    1.203.30.15 03/03/26 18:37:35 monty@mashka.mysql.fi +2 -6
    Merge with 4.0.13

  sql/sql_parse.cc
    1.271.4.8 03/03/26 18:37:35 monty@mashka.mysql.fi +2 -9
    Merge with 4.0.13

  sql/share/swedish/errmsg.txt
    1.64.1.6 03/03/26 18:37:35 monty@mashka.mysql.fi +1 -10
    Merge with 4.0.13

  sql/mysqld.cc
    1.352 03/03/26 18:37:35 monty@mashka.mysql.fi +6 -10
    Merge with 4.0.13

  sql/item_strfunc.cc
    1.93 03/03/26 18:37:35 monty@mashka.mysql.fi +10 -7
    Merge with 4.0.13

  sql/item.cc
    1.58.5.3 03/03/26 18:37:35 monty@mashka.mysql.fi +1 -1
    Merge with 4.0.13

  myisam/mi_check.c
    1.105 03/03/26 18:37:35 monty@mashka.mysql.fi +0 -1
    Merge with 4.0.13

  include/myisam.h
    1.48 03/03/26 18:37:35 monty@mashka.mysql.fi +0 -2
    Merge with 4.0.13

  client/mysql.cc
    1.121.1.2 03/03/26 18:37:35 monty@mashka.mysql.fi +0 -10
    Keep old code

  sql-bench/crash-me.sh
    1.42 03/03/26 18:05:24 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/update.test
    1.9 03/03/26 18:05:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/type_ranges.test
    1.7 03/03/26 18:05:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/type_decimal.test
    1.10 03/03/26 18:05:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/type_blob.test
    1.13 03/03/26 18:05:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/query_cache.test
    1.20.1.1 03/03/26 18:05:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/order_by.test
    1.14 03/03/26 18:05:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/join_outer.test
    1.8 03/03/26 18:05:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/group_by.test
    1.21 03/03/26 18:05:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/bdb-crash.test
    1.8 03/03/26 18:05:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/update.result
    1.11 03/03/26 18:05:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/type_ranges.result
    1.15 03/03/26 18:05:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/type_blob.result
    1.16 03/03/26 18:05:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/query_cache.result
    1.19.1.2 03/03/26 18:05:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/order_by.result
    1.20 03/03/26 18:05:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/join_outer.result
    1.16 03/03/26 18:05:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/group_by.result
    1.27 03/03/26 18:05:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/sort.c
    1.35 03/03/26 18:05:23 monty@mashka.mysql.fi +0 -1
    Auto merged

  BitKeeper/etc/logging_ok
    1.233.4.1 03/03/26 18:05:12 monty@mashka.mysql.fi +0 -0
    auto-union

  BitKeeper/etc/gone
    1.91 03/03/26 18:05:12 monty@mashka.mysql.fi +0 -10
    auto-union

ChangeSet
  1.1494.41.2 03/03/26 15:02:48 pem@mysql.com +4 -0
  Fixed save/restore of current database when calling a procedure.

  sql/sp_head.cc
    1.18 03/03/26 15:02:46 pem@mysql.com +15 -0
    Fixed save/restore of current database when calling a procedure.

  mysql-test/t/sp.test
    1.16 03/03/26 15:02:46 pem@mysql.com +12 -0
    Fixed save/restore of current database when calling a procedure.

  mysql-test/r/sp.result
    1.15 03/03/26 15:02:46 pem@mysql.com +10 -0
    Fixed save/restore of current database when calling a procedure.

  Docs/sp-imp-spec.txt
    1.5 03/03/26 15:02:46 pem@mysql.com +20 -0
    Fixed save/restore of current database when calling a procedure.

ChangeSet
  1.1346.166.2 03/03/26 14:51:22 monty@mashka.mysql.fi +1 -0
  Fix for stack size checking on Solaris.

  sql/mysqld.cc
    1.297.1.113 03/03/26 14:51:21 monty@mashka.mysql.fi +3 -2
    Fix for stack size checking on Solaris.

ChangeSet
  1.1346.166.1 03/03/26 14:11:17 monty@mashka.mysql.fi +2 -0
  Fix for glibc with small stack size (fixes bug when running crash-me)

  sql/mysqld.cc
    1.297.1.112 03/03/26 14:11:15 monty@mashka.mysql.fi +4 -3
    Fix for glibc with small stack size (fixes bug when running crash-me)

  sql-bench/limits/mysql.cfg
    1.20 03/03/26 14:11:15 monty@mashka.mysql.fi +23 -23
    Update to new crash me

ChangeSet
  1.1494.41.1 03/03/26 12:29:58 pem@mysql.com +7 -0
  Added IF EXISTS to DROP PROCEDURE|FUNCTION.
  Changed another unecessary use of Item_string into LEX_STRING (in sp_pcontext).

  sql/sql_yacc.yy
    1.222.1.1 03/03/26 12:29:56 pem@mysql.com +6 -4
    Added IF EXISTS to DROP PROCEDURE|FUNCTION

  sql/sql_parse.cc
    1.278.1.1 03/03/26 12:29:56 pem@mysql.com +9 -0
    Added IF EXISTS to DROP PROCEDURE|FUNCTION

  sql/sp_pcontext.h
    1.6 03/03/26 12:29:56 pem@mysql.com +1 -1
    Changed another unecessary use of Item_string into LEX_STRING.

  sql/sp_pcontext.cc
    1.7 03/03/26 12:29:56 pem@mysql.com +5 -6
    Changed another unecessary use of Item_string into LEX_STRING.

  mysql-test/t/sp-error.test
    1.3 03/03/26 12:29:56 pem@mysql.com +1 -0
    Added IF EXISTS to DROP PROCEDURE|FUNCTION

  mysql-test/r/sp-error.result
    1.2 03/03/26 12:29:56 pem@mysql.com +3 -0
    Added IF EXISTS to DROP PROCEDURE|FUNCTION

  Docs/sp-implemented.txt
    1.6 03/03/26 12:29:56 pem@mysql.com +1 -1
    Added IF EXISTS to DROP PROCEDURE|FUNCTION

ChangeSet
  1.1494.1.24 03/03/26 14:11:04 bar@bar.mysql.r18.ru +1 -0
  greek.xml:
    Comments why "greek" is ISO greek

  sql/share/charsets/greek.xml
    1.3 03/03/26 14:10:43 bar@bar.mysql.r18.ru +4 -0
    Comments why "greek" is ISO greek

ChangeSet
  1.1494.1.23 03/03/26 13:27:19 bar@bar.mysql.r18.ru +19 -0
  German Phone book collation is always compiled
  Some collation names have been renamed

  strings/ctype-latin1.c
    1.7 03/03/26 13:27:17 bar@bar.mysql.r18.ru +267 -9
    German Phone book collation is always compiled

  strings/ctype-extra.c
    1.8 03/03/26 13:27:17 bar@bar.mysql.r18.ru +0 -3966
    Don't compile dynamic charset. We should decide names convension before 
    making this available.

  strings/ctype-czech.c
    1.33 03/03/26 13:27:17 bar@bar.mysql.r18.ru +4 -4
    Some collation names have been renamed

  strings/Makefile.am
    1.33 03/03/26 13:27:17 bar@bar.mysql.r18.ru +4 -4
    German Phone book collation is always compiled

  sql/sql_show.cc
    1.122 03/03/26 13:27:17 bar@bar.mysql.r18.ru +5 -7
    Nicer output from SHOW COLLATION

  sql/share/charsets/macroman.xml
    1.2 03/03/26 13:27:17 bar@bar.mysql.r18.ru +2 -2
    Some collation names have been renamed

  sql/share/charsets/macce.xml
    1.2 03/03/26 13:27:17 bar@bar.mysql.r18.ru +2 -2
    Some collation names have been renamed

  sql/share/charsets/latin7.xml
    1.4 03/03/26 13:27:17 bar@bar.mysql.r18.ru +3 -3
    Some collation names have been renamed

  sql/share/charsets/latin2.xml
    1.3 03/03/26 13:27:17 bar@bar.mysql.r18.ru +4 -4
    Some collation names have been renamed

  sql/share/charsets/latin1.xml
    1.4 03/03/26 13:27:17 bar@bar.mysql.r18.ru +5 -5
    Some collation names have been renamed

  sql/share/charsets/cp1257.xml
    1.3 03/03/26 13:27:17 bar@bar.mysql.r18.ru +2 -2
    Some collation names have been renamed

  sql/share/charsets/cp1251.xml
    1.5 03/03/26 13:27:17 bar@bar.mysql.r18.ru +2 -2
    Some collation names have been renamed

  sql/share/charsets/Index.xml
    1.14 03/03/26 13:27:17 bar@bar.mysql.r18.ru +25 -42
    Some collation names have been renamed

  mysys/charset.c
    1.84 03/03/26 13:27:17 bar@bar.mysql.r18.ru +4 -1
    get_charset_by_name() now will find its default collation if charset name is passed

  mysql-test/t/ctype_latin1_de-master.opt
    1.3 03/03/26 13:27:17 bar@bar.mysql.r18.ru +1 -1
    Some collation names have been renamed

  mysql-test/t/ctype_collate.test
    1.6 03/03/26 13:27:17 bar@bar.mysql.r18.ru +18 -18
    Some collation names have been renamed

  mysql-test/r/ctype_collate.result
    1.8 03/03/26 13:27:17 bar@bar.mysql.r18.ru +17 -17
    Some collation names have been renamed

  libmysql/Makefile.shared
    1.44 03/03/26 13:27:17 bar@bar.mysql.r18.ru +1 -1
    German Phone book collation is always compiled

  BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e
    1.30 03/03/26 09:05:59 bar@bar.mysql.r18.ru +0 -0
    Delete: strings/ctype-latin1_de.c

ChangeSet
  1.1346.165.1 03/03/25 19:58:40 vva@eagle.mysql.r18.ru +2 -0
  Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
  into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0

  sql/log_event.cc
    1.77.1.23 03/03/25 19:58:37 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.206.1.58 03/03/25 19:58:33 vva@eagle.mysql.r18.ru +0 -0
    auto-union

ChangeSet
  1.1346.164.1 03/03/25 19:57:38 vva@eagle.mysql.r18.ru +2 -0
  fix bug with parameters of LOAD DATA INFILE in exec_event

  BitKeeper/etc/logging_ok
    1.206.21.1 03/03/25 19:57:38 vva@eagle.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  sql/log_event.cc
    1.77.3.1 03/03/25 19:56:57 vva@eagle.mysql.r18.ru +5 -0
    fix bug with parameters of LOAD DATA INFILE in exec_event

ChangeSet
  1.1494.1.22 03/03/25 22:48:13 lenz@mysql.com +1 -0
   - removed redundant readline_dir from SUBDIRS to fix "make distclean"
     (there is a Makefile in readline_topdir that already lists
     readline_dir in SUBDIRS)

  Makefile.am
    1.46 03/03/25 22:46:11 lenz@mysql.com +1 -1
     - removed redundant readline_dir from SUBDIRS to fix "make distclean"
       (there is a Makefile in readline_topdir that already lists
       readline_dir in SUBDIRS)

ChangeSet
  1.1346.163.4 03/03/25 22:38:12 lenz@mysql.com +1 -0
   - fixed typo (build_command -> build-command)

  Build-tools/Bootstrap
    1.4 03/03/25 22:37:58 lenz@mysql.com +1 -1
     - fixed typo (build_command -> build-command)

ChangeSet
  1.1346.163.3 03/03/25 22:20:07 lenz@mysql.com +1 -0
   - added new option "--build-command" to be able to use different
     commands for building the sources
   - removed duplicate option "--revision"
   - added help for new option and reformatted help text a bit

  Build-tools/Bootstrap
    1.3 03/03/25 22:19:57 lenz@mysql.com +45 -31
     - added new option "--build-command" to be able to use different
       commands for building the sources
     - removed duplicate option "--revision"
     - added help for new option and reformatted help text a bit

ChangeSet
  1.1346.163.2 03/03/26 00:19:56 walrus@mysql.com +1 -0
  crash-me.sh:
    add new parameter  checks length_of_varchar_field,
    add new auxilary functions:
    get_recordset
    compare_recordset
    print_recordset

  sql-bench/crash-me.sh
    1.34.1.15 03/03/26 00:18:13 walrus@mysql.com +109 -0
    add new parameter  checks length_of_varchar_field,
    add new auxilary functions:
    get_recordset
    compare_recordset
    print_recordset

ChangeSet
  1.1346.163.1 03/03/25 16:52:48 guilhem@mysql.com +1 -0
  Fix for small bug #186 (If a connection has temporary tables and does
  RESET MASTER, this breaks replication).
  In the slave SQL thread, any DROP TEMPORARY TABLE is silently
  converted to DROP TEMPORARY TABLE IF EXISTS, not to have irrelevant
  "table does not exist". See comments in code or bug #186 for an example
  of how irrelevant errors like this can arise.

  sql/sql_parse.cc
    1.218.1.86 03/03/25 16:52:46 guilhem@mysql.com +10 -0
    Fix for small bug #186 (If a connection has temporary tables and does
    RESET MASTER, this breaks replication).
    In the slave SQL thread, any DROP TEMPORARY TABLE is silently
    converted to DROP TEMPORARY TABLE IF EXISTS, not to have irrelevant
    "table does not exist". See comments in code or bug #186 for an example
    of how irrelevant errors like this can arise.

ChangeSet
  1.1346.162.2 03/03/25 15:47:16 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.cc
    1.19.1.10 03/03/25 15:47:09 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

ChangeSet
  1.676.291.4 03/03/25 14:49:43 Sinisa@sinisa.nasamreza.org +2 -0
  A fix for a bug in MyISAM with large number of NULL columns and at
  least one BLOB column.

  mysql-test/t/myisam.test
    1.2.7.1 03/03/25 14:49:40 Sinisa@sinisa.nasamreza.org +2 -2
    A fix for a bug in MyISAM with large number of NULL columns and at
    least one BLOB column.

  myisam/mi_dynrec.c
    1.10.1.1 03/03/25 14:49:40 Sinisa@sinisa.nasamreza.org +2 -2
    A fix for a bug in MyISAM with large number of NULL columns and at
    least one BLOB column.

ChangeSet
  1.1494.1.20 03/03/25 13:46:10 lenz@mysql.com +2 -0
   - fixed comments so mysql_copyright does not eat the whole files

  sql/sql_prepare.cc
    1.34 03/03/25 13:42:07 lenz@mysql.com +1 -2
     - fixed comment so mysql_copyright does not eat the whole file

  sql/sql_error.cc
    1.13 03/03/25 13:42:07 lenz@mysql.com +1 -2
     - fixed comment so mysql_copyright does not eat the whole file

ChangeSet
  1.1494.35.21 03/03/25 16:12:49 bar@bar.mysql.r18.ru +8 -0
  SHOW CHARACTER SET now can display comments
  Low case letters are used in charset names

  sql/share/charsets/macroman.xml
    1.1 03/03/25 16:12:47 bar@bar.mysql.r18.ru +182 -0

  sql/share/charsets/macroman.xml
    1.0 03/03/25 16:12:47 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/macroman.xml

  sql/share/charsets/macce.xml
    1.1 03/03/25 16:12:46 bar@bar.mysql.r18.ru +189 -0

  strings/ctype.c
    1.57 03/03/25 16:12:46 bar@bar.mysql.r18.ru +8 -1
    SHOW CHARACTER SET now can display comments

  sql/sql_show.cc
    1.121 03/03/25 16:12:46 bar@bar.mysql.r18.ru +2 -0
    SHOW CHARACTER SET now can display comments

  sql/share/charsets/macce.xml
    1.0 03/03/25 16:12:46 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/macce.xml

  sql/share/charsets/Index.xml
    1.13 03/03/25 16:12:46 bar@bar.mysql.r18.ru +35 -2
    SHOW CHARACTER SET now can display comments

  mysys/charset.c
    1.83 03/03/25 16:12:46 bar@bar.mysql.r18.ru +7 -1
    SHOW CHARACTER SET now can display comments

  BitKeeper/deleted/.del-MacCE.xml~fca413f3126f6189
    1.3 03/03/25 15:48:48 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/MacCE.xml

  BitKeeper/deleted/.del-MacRoman.xml~f890bce37d31d382
    1.4 03/03/25 15:48:39 bar@bar.mysql.r18.ru +1 -1
    Delete: sql/share/charsets/MacRoman.xml

ChangeSet
  1.1346.162.1 03/03/25 13:07:02 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/t/group_by.test
    1.13.1.7 03/03/25 13:07:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/group_by.result
    1.16.1.13 03/03/25 13:06:59 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.161.1 03/03/25 13:06:20 monty@narttu.mysql.fi +3 -0
  Fixed bug with GROUP BY and alias

  sql/item.cc
    1.19.2.1 03/03/25 13:06:18 monty@narttu.mysql.fi +1 -0
    Fixed bug with GROUP BY and alias

  mysql-test/t/group_by.test
    1.13.2.1 03/03/25 13:06:18 monty@narttu.mysql.fi +12 -0
    Test for group by + alias bug

  mysql-test/r/group_by.result
    1.16.2.1 03/03/25 13:06:18 monty@narttu.mysql.fi +19 -0
    Test for group by + alias bug

ChangeSet
  1.1494.35.20 03/03/25 14:54:07 bar@bar.mysql.r18.ru +1 -0
  sql_string.cc:
    NATIONAL CHARACTER() has latin1 charset now.
    Reasons are (by Monty):
    I think we should keepy having latin1 (default configure option)
    as the national character set.  The reason for this is simple that:
  
  - This is ok for a large part of the world.
  - It's faster and takes less space than utf8.

  sql/sql_string.cc
    1.55 03/03/25 14:52:46 bar@bar.mysql.r18.ru +1 -1
    NATIONAL CHARACTER() has latin1 charset now.
    Reasons are (by Monty):
    I think we should keepy having latin1 (default configure option)
    as the national character set.  The reason for this is simple that:

ChangeSet
  1.1494.35.19 03/03/25 13:42:01 bar@bar.mysql.r18.ru +1 -0
  sql_show.cc:
    LIKE was used against wrong name

  sql/sql_show.cc
    1.120 03/03/25 13:41:22 bar@bar.mysql.r18.ru +1 -1
    LIKE was used against wrong name

ChangeSet
  1.1494.35.18 03/03/25 13:38:05 bar@bar.mysql.r18.ru +5 -0
  Two separate commands: SHOW COLLATION and SHOW CHARACTER SET

  sql/sql_yacc.yy
    1.203.30.14 03/03/25 13:38:03 bar@bar.mysql.r18.ru +2 -0
    Two separate commands: SHOW COLLATION and SHOW CHARACTER SET

  sql/sql_show.cc
    1.119 03/03/25 13:38:03 bar@bar.mysql.r18.ru +70 -18
    Two separate commands: SHOW COLLATION and SHOW CHARACTER SET

  sql/sql_parse.cc
    1.271.4.7 03/03/25 13:38:03 bar@bar.mysql.r18.ru +3 -0
    Two separate commands: SHOW COLLATION and SHOW CHARACTER SET

  sql/sql_lex.h
    1.102.7.5 03/03/25 13:38:03 bar@bar.mysql.r18.ru +1 -1
    Two separate commands: SHOW COLLATION and SHOW CHARACTER SET

  sql/mysql_priv.h
    1.186.2.6 03/03/25 13:38:03 bar@bar.mysql.r18.ru +1 -0
    Two separate commands: SHOW COLLATION and SHOW CHARACTER SET

ChangeSet
  1.1494.35.17 03/03/25 12:07:46 bar@bar.mysql.r18.ru +3 -0
  Collation names have been renamed to common style

  strings/ctype-extra.c
    1.7 03/03/25 12:07:43 bar@bar.mysql.r18.ru +1 -1
    Collation names have been renamed to common style

  sql/share/charsets/latin7.xml
    1.3 03/03/25 12:07:43 bar@bar.mysql.r18.ru +3 -3
    Collation names have been renamed to common style

  sql/share/charsets/Index.xml
    1.12 03/03/25 12:07:43 bar@bar.mysql.r18.ru +12 -3
    Collation names have been renamed to common style

ChangeSet
  1.1494.40.1 03/03/25 02:37:41 monty@narttu.mysql.fi +6 -0
  Fixed bug in allocation memory in key cache. (Memory was not properly aligned which cased core dumps on sparc CPU's)
  Changed keycache variables to start with my_ instead of _my_

  sql/sql_test.cc
    1.21 03/03/25 02:37:39 monty@narttu.mysql.fi +2 -2
    Changed keycache variables to start with my_ instead of _my_

  sql/mysqld.cc
    1.351 03/03/25 02:37:39 monty@narttu.mysql.fi +7 -7
    Changed keycache variables to start with my_ instead of _my_

  mysys/mf_keycache.c
    1.24 03/03/25 02:37:39 monty@narttu.mysql.fi +494 -443
    Fixed bug in allocation memory (Memory was not properly aligned which cased core dumps on sparc CPU's)
    Changed keycache variables to start with my_ instead of _my_
    Fixed indentation and comment syntax.
    Removed end space.
    
    

  myisam/sp_test.c
    1.6 03/03/25 02:37:39 monty@narttu.mysql.fi +1 -1
    Removed compiler warning

  myisam/mi_test2.c
    1.16 03/03/25 02:37:39 monty@narttu.mysql.fi +5 -5
    Changed keycache variables to start with my_ instead of _my_
    Removed compiler warnings

  include/my_sys.h
    1.96 03/03/25 02:37:39 monty@narttu.mysql.fi +3 -3
    Changed keycache variables to start with my_ instead of _my_

ChangeSet
  1.676.293.1 03/03/24 23:24:45 monty@narttu.mysql.fi +1 -0
  Fixed bug that binary log was not locked during a DELETE FROM TABLE_NAME;

  sql/sql_delete.cc
    1.34.1.6 03/03/24 23:24:44 monty@narttu.mysql.fi +4 -1
    Fixed bug that binary log was not locked during a DELETE FROM TABLE_NAME;

ChangeSet
  1.1346.133.62 03/03/24 22:52:46 Sinisa@sinisa.nasamreza.org +4 -0
  A fix for bug #176
  code cleanup

  sql/item_func.cc
    1.60.1.31 03/03/24 22:52:43 Sinisa@sinisa.nasamreza.org +20 -17
    Code cleanup

  sql/item.cc
    1.19.1.9 03/03/24 22:52:43 Sinisa@sinisa.nasamreza.org +1 -0
    A for the bug  #176

  mysql-test/t/having.test
    1.4.1.1 03/03/24 22:52:43 Sinisa@sinisa.nasamreza.org +4 -0
    A test for the bug fix for bug #176

  mysql-test/r/having.result
    1.6.1.1 03/03/24 22:52:43 Sinisa@sinisa.nasamreza.org +7 -0
    A test for the bug fix for bug #176

ChangeSet
  1.1494.35.15 03/03/24 20:01:05 bar@bar.mysql.r18.ru +1 -0
  item_strfunc.cc:
    Fixed that concat() didn't set character set in val_str
    concat_ws() now honors coercibility

  sql/item_strfunc.cc
    1.92 03/03/24 19:59:59 bar@bar.mysql.r18.ru +11 -6
    Fixed that concat() didn't set character set in val_str
    concat_ws() now honors coercibility

ChangeSet
  1.1494.35.14 03/03/24 19:33:44 bar@bar.mysql.r18.ru +1 -0
  item_strfunc.cc:
    The result didn't return proper collation

  sql/item_strfunc.cc
    1.91 03/03/24 19:33:09 bar@bar.mysql.r18.ru +4 -1
    The result didn't return proper collation

ChangeSet
  1.1494.35.13 03/03/24 19:23:43 bar@bar.mysql.r18.ru +1 -0
  item_strfunc.cc:
    A bug has been fixed. ELT() didn't honor the second argument.
    Coercibility support has been added.

  sql/item_strfunc.cc
    1.90 03/03/24 19:22:59 bar@bar.mysql.r18.ru +13 -1
    A bug has been fixed. ELT() didn't honor the second argument.
    Coercibility support has been added.

ChangeSet
  1.1346.1.74 03/03/24 15:06:11 lenz@mysql.com +1 -0
   - fixed wrong order of commands in Mac OS X Readme.txt
     (Thanks to Marc Liyanage for spotting this)

  support-files/MacOSX/ReadMe.txt
    1.2 03/03/24 15:04:36 lenz@mysql.com +1 -1
     - fixed wrong order of commands in Mac OS X Readme.txt
       (Thanks to Marc Liyanage for spotting this)

ChangeSet
  1.1494.10.33 03/03/24 15:04:01 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/item.cc
    1.58.1.8 03/03/24 15:03:56 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1346.133.61 03/03/24 15:00:32 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/sql_show.cc
    1.76.1.28 03/03/24 14:42:06 Sinisa@sinisa.nasamreza.org +0 -2
    Auto merged

ChangeSet
  1.1494.1.16 03/03/24 12:19:07 lenz@mysql.com +1 -0
  Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/suse80/my/mysql-4.1

  BitKeeper/etc/logging_ok
    1.233.1.8 03/03/24 12:11:30 lenz@mysql.com +0 -0
    auto-union

ChangeSet
  1.1346.1.73 03/03/24 12:05:05 lenz@mysql.com +1 -0
  Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
  into mysql.com:/suse80/my/mysql-4.0

  BitKeeper/etc/logging_ok
    1.206.1.57 03/03/24 12:03:27 lenz@mysql.com +0 -0
    auto-union

ChangeSet
  1.1346.160.5 03/03/24 11:19:28 serg@sergbook.mysql.com +3 -0
  make myisam usable without threads (and even w/o pthread_t)

  myisam/sort.c
    1.23.1.3 03/03/24 11:19:25 serg@sergbook.mysql.com +3 -1
    make myisam usable without threads (and even w/o pthread_t)

  myisam/mi_check.c
    1.86.1.29 03/03/24 11:19:25 serg@sergbook.mysql.com +5 -1
    make myisam usable without threads (and even w/o pthread_t)

  include/myisam.h
    1.36.1.17 03/03/24 11:19:24 serg@sergbook.mysql.com +4 -0
    make myisam usable without threads (and even w/o pthread_t)

ChangeSet
  1.1346.160.4 03/03/23 11:30:45 jani@rhols221.adsl.netsonic.fi +1 -0
  Reverted fix away from 4.0, because it may in rare circumstanses
  cause compatibility problems. Fix will be enabled in 4.1.

  sql/sql_parse.cc
    1.218.1.85 03/03/23 11:30:43 jani@rhols221.adsl.netsonic.fi +6 -0
    Reverted fix away from 4.0, because it may in rare circumstanses
    cause compatibility problems. Fix will be enabled in 4.1.

ChangeSet
  1.1346.160.3 03/03/22 20:34:20 jani@hynda.(none) +16 -0
  Changed some tests to pass with new auto_increment handling,
  e.g. default value is not accepted with auto_increment anymore.

  mysql-test/t/update.test
    1.6.1.1 03/03/22 20:34:17 jani@hynda.(none) +1 -1
    Changed some tests to pass with new auto_increment handling,
    e.g. default value is not accepted with auto_increment anymore.

  mysql-test/t/type_ranges.test
    1.4.1.1 03/03/22 20:34:17 jani@hynda.(none) +2 -2
    Changed some tests to pass with new auto_increment handling,
    e.g. default value is not accepted with auto_increment anymore.

  mysql-test/t/type_decimal.test
    1.8.1.1 03/03/22 20:34:17 jani@hynda.(none) +1 -1
    Changed some tests to pass with new auto_increment handling,
    e.g. default value is not accepted with auto_increment anymore.

  mysql-test/t/type_blob.test
    1.8.1.2 03/03/22 20:34:17 jani@hynda.(none) +4 -4
    Changed some tests to pass with new auto_increment handling,
    e.g. default value is not accepted with auto_increment anymore.

  mysql-test/t/order_by.test
    1.9.2.2 03/03/22 20:34:17 jani@hynda.(none) +1 -1
    Changed some tests to pass with new auto_increment handling,
    e.g. default value is not accepted with auto_increment anymore.

  mysql-test/t/join_outer.test
    1.6.1.1 03/03/22 20:34:17 jani@hynda.(none) +7 -7
    Changed some tests to pass with new auto_increment handling,
    e.g. default value is not accepted with auto_increment anymore.

  mysql-test/t/group_by.test
    1.13.1.6 03/03/22 20:34:17 jani@hynda.(none) +5 -5
    Changed some tests to pass with new auto_increment handling,
    e.g. default value is not accepted with auto_increment anymore.

  mysql-test/t/bdb-crash.test
    1.6.1.1 03/03/22 20:34:17 jani@hynda.(none) +1 -1
    Changed some tests to pass with new auto_increment handling,
    e.g. default value is not accepted with auto_increment anymore.

  mysql-test/r/update.result
    1.8.1.1 03/03/22 20:34:17 jani@hynda.(none) +1 -1
    Changed some tests to pass with new auto_increment handling,
    e.g. default value is not accepted with auto_increment anymore.

  mysql-test/r/type_ranges.result
    1.6.1.1 03/03/22 20:34:17 jani@hynda.(none) +2 -2
    Changed some tests to pass with new auto_increment handling,
    e.g. default value is not accepted with auto_increment anymore.

  mysql-test/r/type_decimal.result
    1.11 03/03/22 20:34:17 jani@hynda.(none) +1 -1
    Changed some tests to pass with new auto_increment handling,
    e.g. default value is not accepted with auto_increment anymore.

  mysql-test/r/type_blob.result
    1.8.1.2 03/03/22 20:34:17 jani@hynda.(none) +4 -4
    Changed some tests to pass with new auto_increment handling,
    e.g. default value is not accepted with auto_increment anymore.

  mysql-test/r/order_by.result
    1.11.1.5 03/03/22 20:34:17 jani@hynda.(none) +1 -1
    Changed some tests to pass with new auto_increment handling,
    e.g. default value is not accepted with auto_increment anymore.

  mysql-test/r/join_outer.result
    1.10.1.2 03/03/22 20:34:17 jani@hynda.(none) +7 -7
    Changed some tests to pass with new auto_increment handling,
    e.g. default value is not accepted with auto_increment anymore.

  mysql-test/r/group_by.result
    1.16.1.12 03/03/22 20:34:17 jani@hynda.(none) +5 -5
    Changed some tests to pass with new auto_increment handling,
    e.g. default value is not accepted with auto_increment anymore.

  mysql-test/r/bdb-crash.result
    1.5 03/03/22 20:34:17 jani@hynda.(none) +1 -1
    Changed some tests to pass with new auto_increment handling,
    e.g. default value is not accepted with auto_increment anymore.

ChangeSet
  1.1346.160.2 03/03/22 19:55:09 jani@hynda.(none) +1 -0
  Added error in case auto_increment and default where defined
  at the same time.

  sql/sql_parse.cc
    1.218.1.84 03/03/22 19:55:01 jani@hynda.(none) +14 -6
    Added error in case auto_increment and default where defined
    at the same time.

ChangeSet
  1.1346.160.1 03/03/22 15:22:59 guilhem@mysql.com +1 -0
  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.36.1.19 03/03/22 15:22:57 guilhem@mysql.com +3 -1
    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.

  netware/BUILD/create-patch
    1.2 03/03/21 16:46:23 greg@mysql.com +0 -0
    Change mode to -rwxrwxr-x

ChangeSet
  1.1346.159.8 03/03/21 16:45:39 greg@mysql.com +9 -0
  Post-4.0.12 changes from Novell: mostly NetWare-related code changes to utilize new LibC

  scripts/make_binary_distribution.sh
    1.49.1.2 03/03/21 16:45:38 greg@mysql.com +54 -28
    Changes to clear up extraneous EXTRA_BIN_FILES, NetWare sections

  mysys/thr_mutex.c
    1.21 03/03/21 16:45:38 greg@mysql.com +0 -5
    Remove unnecessary NetWare block

  mysys/my_pthread.c
    1.35 03/03/21 16:45:38 greg@mysql.com +0 -13
    Remove unnecessary NetWare version of my_pthread_cond_timedwait

  mysys/my_init.c
    1.21.1.6 03/03/21 16:45:38 greg@mysql.com +2 -12
    Remove working directory change from netware_init()

  mysys/default.c
    1.17.1.6 03/03/21 16:45:38 greg@mysql.com +1 -1
    Add conditional to avoid non-applicable file checking on NetWare

  mysql-test/t/backup.test
    1.9.1.3 03/03/21 16:45:37 greg@mysql.com +2 -2
    replace_result added so test passes correctly on NetWare

  include/my_pthread.h
    1.57.1.4 03/03/21 16:45:37 greg@mysql.com +0 -8
    Special extern my_pthread_cond_timedwait no longer required for NetWare

  client/mysqldump.c
    1.65.1.25 03/03/21 16:45:37 greg@mysql.com +0 -8
    Remove unnecessary pthread_yield calls for NetWare

  client/mysql.cc
    1.93.1.40 03/03/21 16:45:37 greg@mysql.com +2 -27
    Remove unnecessary pthread_yield calls for NetWare

ChangeSet
  1.1346.159.7 03/03/21 16:14:52 greg@mysql.com +1 -0
  Missed one file from Novell changes in 1.1686

  netware/mysqld_safe.c
    1.4 03/03/21 16:14:51 greg@mysql.com +47 -47
    Changes to argument handling, spawn, etc

ChangeSet
  1.1346.159.6 03/03/21 15:43:38 greg@mysql.com +34 -0
  Changes from Novell for various NetWare-only files, post-4.0.12

  netware/comp_err.def
    1.1 03/03/21 15:43:37 greg@mysql.com +10 -0

  netware/comp_err.def
    1.0 03/03/21 15:43:37 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/comp_err.def

  netware/BUILD/create-patch
    1.1 03/03/21 15:43:36 greg@mysql.com +56 -0

  netware/resolveip.def
    1.3 03/03/21 15:43:36 greg@mysql.com +1 -0
    Add XDCDATA

  netware/replace.def
    1.3 03/03/21 15:43:36 greg@mysql.com +1 -0
    Add XDCDATA

  netware/perror.def
    1.3 03/03/21 15:43:36 greg@mysql.com +1 -0
    Add XDCDATA

  netware/pack_isam.def
    1.3 03/03/21 15:43:36 greg@mysql.com +2 -1
    Add XDCDATA

  netware/mysqltest.def
    1.3 03/03/21 15:43:36 greg@mysql.com +1 -0
    Add XDCDATA

  netware/mysqlshow.def
    1.3 03/03/21 15:43:36 greg@mysql.com +1 -0
    Add XDCDATA

  netware/mysqlimport.def
    1.3 03/03/21 15:43:36 greg@mysql.com +1 -0
    Add XDCDATA

  netware/mysqldump.def
    1.3 03/03/21 15:43:36 greg@mysql.com +1 -0
    Add XDCDATA

  netware/mysqld_safe.def
    1.2 03/03/21 15:43:36 greg@mysql.com +2 -0
    Add XDCDATA

  netware/mysqld.def
    1.2 03/03/21 15:43:36 greg@mysql.com +1 -1
    Add XDCDATA

  netware/mysqlcheck.def
    1.3 03/03/21 15:43:36 greg@mysql.com +1 -0
    Add XDCDATA

  netware/mysqlbinlog.def
    1.3 03/03/21 15:43:36 greg@mysql.com +1 -0
    Add XDCDATA

  netware/mysqladmin.def
    1.3 03/03/21 15:43:36 greg@mysql.com +1 -0
    Add XDCDATA

  netware/mysql_test_run.def
    1.3 03/03/21 15:43:36 greg@mysql.com +1 -0
    Add XDCDATA

  netware/mysql_test_run.c
    1.3 03/03/21 15:43:36 greg@mysql.com +108 -104
    Argument handling, spawn changes, etc

  netware/mysql_install_db.def
    1.3 03/03/21 15:43:36 greg@mysql.com +1 -0
    Add XDCDATA

  netware/mysql_install_db.c
    1.3 03/03/21 15:43:36 greg@mysql.com +31 -26
    Argument handling changes, etc

  netware/mysql_install.def
    1.2 03/03/21 15:43:36 greg@mysql.com +1 -0
    Add XDCDATA

  netware/mysql.def
    1.3 03/03/21 15:43:36 greg@mysql.com +1 -0
    Add XDCDATA

  netware/myisampack.def
    1.3 03/03/21 15:43:36 greg@mysql.com +1 -0
    Add XDCDATA

  netware/myisamlog.def
    1.3 03/03/21 15:43:36 greg@mysql.com +1 -0
    Add XDCDATA

  netware/myisamchk.def
    1.3 03/03/21 15:43:36 greg@mysql.com +1 -0
    Add XDCDATA

  netware/my_print_defaults.def
    1.3 03/03/21 15:43:36 greg@mysql.com +1 -0
    Add XDCDATA

  netware/my_manage.h
    1.2 03/03/21 15:43:36 greg@mysql.com +14 -10
    Changes to argument handling, spawn

  netware/my_manage.c
    1.2 03/03/21 15:43:36 greg@mysql.com +109 -112
    Changes in argument handling, use procve

  netware/libmysql.def
    1.3 03/03/21 15:43:36 greg@mysql.com +1 -0
    Add XDCDATA

  netware/isamlog.def
    1.3 03/03/21 15:43:36 greg@mysql.com +2 -1
    Add XDCDATA

  netware/isamchk.def
    1.3 03/03/21 15:43:36 greg@mysql.com +1 -0
    Add XDCDATA

  netware/Makefile.am
    1.6 03/03/21 15:43:36 greg@mysql.com +4 -3
    Remove isamchk.def, mysqld.xdc, add comp_err.def to netware_build_files

  netware/BUILD/nwbootstrap
    1.3 03/03/21 15:43:36 greg@mysql.com +1 -1
    bk changes syntax

  netware/BUILD/mwenv
    1.3 03/03/21 15:43:36 greg@mysql.com +5 -5
    Changes to compiler flags

  netware/BUILD/create-patch
    1.0 03/03/21 15:43:36 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/create-patch

  include/config-netware.h
    1.2 03/03/21 15:43:36 greg@mysql.com +3 -4
    Define USE_OLD_FUNCTIONS, remove NKS header includes

ChangeSet
  1.1494.39.1 03/03/21 21:08:56 guilhem@mysql.com +1 -0
  Fix for bug #174 (charset 0 caused segfault)

  sql/log_event.cc
    1.113 03/03/21 21:08:51 guilhem@mysql.com +1 -1
    Fix for bug #174 (charset 0 caused segfault)

ChangeSet
  1.1494.35.11 03/03/21 18:54:53 monty@narttu.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into narttu.mysql.fi:/my/mysql-4.1

  sql/mysqld.cc
    1.350 03/03/21 18:54:51 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1494.38.2 03/03/21 18:53:55 monty@narttu.mysql.fi +9 -0
  Fixes for fill_help_tables.sql

  support-files/binary-configure.sh
    1.6 03/03/21 18:53:54 monty@narttu.mysql.fi +2 -2
    Don't use config files

  support-files/Makefile.am
    1.19 03/03/21 18:53:54 monty@narttu.mysql.fi +3 -3
    Don't install binary-configure

  sql/mysqld.cc
    1.348.1.1 03/03/21 18:53:54 monty@narttu.mysql.fi +1 -1
    Don't write shutdown message when called from mysql_install_db

  scripts/mysql_install_db.sh
    1.37.1.4 03/03/21 18:53:54 monty@narttu.mysql.fi +56 -19
    Search for and use fill_help_tables.sql

  scripts/make_binary_distribution.sh
    1.53 03/03/21 18:53:54 monty@narttu.mysql.fi +3 -2
    Install and use fill_help_tables.sql

  scripts/fill_help_tables.sh
    1.6 03/03/21 18:53:54 monty@narttu.mysql.fi +4 -5
    use INSERT IGNORE to avoid errors

  scripts/Makefile.am
    1.27 03/03/21 18:53:54 monty@narttu.mysql.fi +12 -7
    Install fill_help_tables.sql in prefix/share/mysql
    Don't install make_binary_distribution

  mysql-test/t/innodb.test
    1.37 03/03/21 18:53:54 monty@narttu.mysql.fi +1 -1
    Another fix for cardinality

  innobase/ha/ha0ha.c
    1.5 03/03/21 18:53:54 monty@narttu.mysql.fi +3 -3
    Removed compiler warnings

ChangeSet
  1.1346.159.5 03/03/21 21:42:51 walrus@mysql.com +1 -0
  crash-me.sh:
    add foreign key value update test

  sql-bench/crash-me.sh
    1.34.1.14 03/03/21 21:42:10 walrus@mysql.com +14 -0
    add foreign key value update test

ChangeSet
  1.1494.35.10 03/03/21 19:02:07 bar@bar.mysql.r18.ru +1 -0
  item_cmpfunc.cc:
    IFNULL() now honors collations

  sql/item_cmpfunc.cc
    1.83 03/03/21 19:01:29 bar@bar.mysql.r18.ru +5 -0
    IFNULL() now honors collations

ChangeSet
  1.1494.35.9 03/03/21 18:31:41 bar@bar.mysql.r18.ru +2 -0
  IF() and LEAST() now honors coercibility

  sql/item_func.cc
    1.124 03/03/21 18:31:39 bar@bar.mysql.r18.ru +8 -3
    IF() and LEAST() now honors coercibility

  sql/item_cmpfunc.cc
    1.82 03/03/21 18:31:39 bar@bar.mysql.r18.ru +7 -2
    IF() and LEAST() now honors coercibility

ChangeSet
  1.1494.35.8 03/03/21 17:21:45 bar@bar.mysql.r18.ru +2 -0
  All charset related actions have been moved from fix_fields() to fix_length_and_dec()

  sql/item_strfunc.h
    1.51 03/03/21 17:21:43 bar@bar.mysql.r18.ru +1 -4
    All charset related actions have been moved from fix_fields() to fix_length_and_dec()

  sql/item_strfunc.cc
    1.89 03/03/21 17:21:43 bar@bar.mysql.r18.ru +7 -42
    All charset related actions have been moved from fix_fields() to fix_length_and_dec()

ChangeSet
  1.1346.159.4 03/03/21 14:14:36 jani@rhols221.adsl.netsonic.fi +1 -0
  Fixed a bug in comment handling.

  client/mysql.cc
    1.93.1.39 03/03/21 14:14:34 jani@rhols221.adsl.netsonic.fi +10 -2
    Fixed a bug in comment handling.

ChangeSet
  1.1494.35.7 03/03/21 15:44:15 bar@bar.mysql.r18.ru +1 -0
  sql_yacc.yy:
    Reduce/reduce conflict
    fix. 

  sql/sql_yacc.yy
    1.203.30.13 03/03/21 15:42:30 bar@bar.mysql.r18.ru +4 -4
    Reduce/reduce conflict
    fix. 

ChangeSet
  1.1494.35.6 03/03/21 15:18:52 bar@bar.mysql.r18.ru +5 -0
  New variable to turn off automatic charset conversion of query results
  Some speed improvements

  sql/sql_class.h
    1.146.1.10 03/03/21 15:18:50 bar@bar.mysql.r18.ru +1 -0
    New variable to turn off automatic charset conversion of query results
    Some speed improvements

  sql/set_var.cc
    1.30.1.7 03/03/21 15:18:50 bar@bar.mysql.r18.ru +4 -1
    New variable to turn off automatic charset conversion of query results
    Some speed improvements

  sql/protocol.h
    1.7 03/03/21 15:18:50 bar@bar.mysql.r18.ru +2 -0
    New variable to turn off automatic charset conversion of query results
    Some speed improvements

  sql/protocol.cc
    1.53 03/03/21 15:18:50 bar@bar.mysql.r18.ru +15 -11
    New variable to turn off automatic charset conversion of query results
    Some speed improvements

  sql/mysqld.cc
    1.349 03/03/21 15:18:50 bar@bar.mysql.r18.ru +1 -0
    New variable to turn off automatic charset conversion of query results
    Some speed improvements

ChangeSet
  1.1494.37.1 03/03/21 11:49:17 monty@narttu.mysql.fi +2 -0
  Fixed reference to uninitialized memory

  strings/ctype-utf8.c
    1.38 03/03/21 11:49:16 monty@narttu.mysql.fi +7 -8
    Fixed reference to uninitialized memory

  mysql-test/t/innodb.test
    1.36 03/03/21 11:49:16 monty@narttu.mysql.fi +1 -1
    Another fix to take InnoDB cardinality changes into account

ChangeSet
  1.1494.36.2 03/03/21 12:04:08 bar@bar.mysql.r18.ru +1 -0
  COLLATE precedence bug has been fixed:
  
  "a LIKE b COLLATE c"  worked as "(a LIKE b) COLLATE c" which is not right

  sql/sql_yacc.yy
    1.203.30.12 03/03/21 12:04:06 bar@bar.mysql.r18.ru +5 -5
    COLLATE precedence bug has been fixed:
    
    "a LIKE b COLLATE c"  worked as "(a LIKE b) COLLATE c" which is not right

ChangeSet
  1.1346.159.3 03/03/21 10:03:43 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.0
  into sanja.is.com.ua:/home/bell/mysql/work-qcfile-4.0

  sql/sql_yacc.yy
    1.145.14.2 03/03/21 10:03:42 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1494.36.1 03/03/21 11:21:01 bar@bar.mysql.r18.ru +6 -0
  A separate variable national_charset_info 
  Fixes according coercibility tables, p162, SQL Complete

  sql/sql_yacc.yy
    1.203.30.11 03/03/21 11:20:59 bar@bar.mysql.r18.ru +7 -8
    A separate variable national_charset_info 

  sql/sql_string.cc
    1.54 03/03/21 11:20:59 bar@bar.mysql.r18.ru +3 -0
    A separate variable national_charset_info 

  sql/mysql_priv.h
    1.186.2.5 03/03/21 11:20:59 bar@bar.mysql.r18.ru +3 -1
    Declaration has been moved here from /include

  sql/item_cmpfunc.cc
    1.81 03/03/21 11:20:59 bar@bar.mysql.r18.ru +15 -1
    Fixes acording SQL complete, page 162

  sql/item.cc
    1.58.5.2 03/03/21 11:20:59 bar@bar.mysql.r18.ru +12 -4
    Fixes acording SQL complete, page 162

  include/my_sys.h
    1.95 03/03/21 11:20:59 bar@bar.mysql.r18.ru +0 -1
    Declaration has been moved to /sql directory

ChangeSet
  1.1494.35.2 03/03/21 11:06:15 hf@genie.(none) +5 -0
  Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into genie.(none):/home/hf/work/mysql-4.1.lck

  sql/lex.h
    1.82.1.21 03/03/21 11:06:09 hf@genie.(none) +0 -0
    Auto merged

  sql/item_func.h
    1.68.1.6 03/03/21 11:06:09 hf@genie.(none) +0 -0
    Auto merged

  sql/item_func.cc
    1.123 03/03/21 11:06:09 hf@genie.(none) +0 -0
    Auto merged

  sql/item_create.h
    1.22 03/03/21 11:06:08 hf@genie.(none) +0 -0
    Auto merged

  sql/item_create.cc
    1.30 03/03/21 11:06:08 hf@genie.(none) +0 -0
    Auto merged

ChangeSet
  1.1494.32.4 03/03/21 10:06:04 hf@genie.(none) +5 -0
  Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
  into genie.(none):/home/hf/work/mysql-5.0.kil

  sql/sql_yacc.yy
    1.223 03/03/21 10:06:00 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_parse.cc
    1.279 03/03/21 10:06:00 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_class.h
    1.150 03/03/21 10:06:00 hf@genie.(none) +0 -0
    Auto merged

  sql/mysql_priv.h
    1.189 03/03/21 10:06:00 hf@genie.(none) +0 -0
    Auto merged

  sql/lex.h
    1.92 03/03/21 10:06:00 hf@genie.(none) +0 -0
    Auto merged

ChangeSet
  1.1455.4.17 03/03/21 09:37:01 hf@genie.(none) +6 -0
  SCRUM
  two versions of KILL implementation

  sql/sql_yacc.yy
    1.221.1.1 03/03/21 09:36:14 hf@genie.(none) +9 -3
    KILL syntax extended with CONNECTION an QUERY options

  sql/sql_parse.cc
    1.277.1.1 03/03/21 09:36:14 hf@genie.(none) +17 -5
    handling of KILL QUERY feature added

  sql/sql_class.h
    1.148.1.1 03/03/21 09:36:14 hf@genie.(none) +1 -0
    only_kill_query flag added to the THD structure

  sql/mysql_priv.h
    1.187.1.1 03/03/21 09:36:14 hf@genie.(none) +1 -1
    kill_one_thread function extended

  sql/lex.h
    1.90.1.1 03/03/21 09:36:14 hf@genie.(none) +1 -0
    CONNECTION keyword added

  include/mysql_com.h
    1.66.1.1 03/03/21 09:36:14 hf@genie.(none) +2 -0
    ONLY_KILL_QUERY flag definition

ChangeSet
  1.1494.35.1 03/03/20 21:35:17 monty@narttu.mysql.fi +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into narttu.mysql.fi:/my/mysql-4.1

  sql/sql_update.cc
    1.83 03/03/20 21:35:15 monty@narttu.mysql.fi +0 -1
    Auto merged

  sql/password.c
    1.25 03/03/20 21:35:15 monty@narttu.mysql.fi +0 -2
    Auto merged

ChangeSet
  1.1494.34.1 03/03/20 21:35:03 monty@narttu.mysql.fi +9 -0
  After merge fixes
  Fixed bug in Item::set_name()
  Fix for memory leak with geometry type

  sql/table.cc
    1.75 03/03/20 21:35:01 monty@narttu.mysql.fi +3 -2
    Fix for memory leak with geometry type

  sql/sql_update.cc
    1.81.1.1 03/03/20 21:35:01 monty@narttu.mysql.fi +1 -1
    After merge fix

  sql/password.c
    1.23.1.1 03/03/20 21:35:01 monty@narttu.mysql.fi +2 -2
    After merge fix

  sql/item.cc
    1.58.5.1 03/03/20 21:35:01 monty@narttu.mysql.fi +15 -12
    Fixed bug in Item::set_name()

  sql/ha_myisam.cc
    1.115 03/03/20 21:35:01 monty@narttu.mysql.fi +4 -2
    Indentation cleanup

  mysql-test/t/innodb.test
    1.35 03/03/20 21:35:01 monty@narttu.mysql.fi +6 -0
    Hack to make test repeatable
    (InnoDB's cardinality numbers varies a bit between tests)

  mysql-test/r/rpl_relayspace.result
    1.2 03/03/20 21:35:01 monty@narttu.mysql.fi +2 -2
    After merge fix

  mysql-test/r/innodb.result
    1.58 03/03/20 21:35:01 monty@narttu.mysql.fi +6 -6
    Hack to make test repeatable
    (InnoDB's cardinality numbers varies a bit between tests)

  mysql-test/r/create.result
    1.31 03/03/20 21:35:01 monty@narttu.mysql.fi +2 -2
    Fixed results after merge

ChangeSet
  1.1494.10.32 03/03/20 21:10:04 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/item.cc
    1.58.1.7 03/03/20 21:09:55 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1494.28.9 03/03/20 20:44:56 Sinisa@sinisa.nasamreza.org +2 -0
  A test case for the bug fix as per PEM's reported bug #118.
  Patch is already commited and approved by Sanja ..;o)

  mysql-test/t/variables.test
    1.16 03/03/20 20:44:52 Sinisa@sinisa.nasamreza.org +1 -0
    A test case for the bug fix as per PEM's reported bug #118.
    Patch is already commited and approved by Sanja ..;o)

  mysql-test/r/variables.result
    1.20 03/03/20 20:44:52 Sinisa@sinisa.nasamreza.org +1 -0
    A test case for the bug fix as per PEM's reported bug #118.
    Patch is already commited and approved by Sanja ..;o)

ChangeSet
  1.1494.10.31 03/03/20 22:43:40 bar@bar.mysql.r18.ru +1 -0
  item_cmpfunc.cc:
    cmp_charset was not initialized
    valgrind fix
    LIKE now works according to coercibility rules

  sql/item_cmpfunc.cc
    1.80 03/03/20 22:40:59 bar@bar.mysql.r18.ru +7 -9
    cmp_charset was not initialized
    valgrind fix
    LIKE now works according to coercibility rules

ChangeSet
  1.1494.10.30 03/03/20 22:01:03 bar@bar.mysql.r18.ru +4 -0
  SELECT N'string'

  sql/sql_yacc.yy
    1.203.30.10 03/03/20 22:01:01 bar@bar.mysql.r18.ru +6 -1
    SELECT N'string'

  sql/sql_lex.cc
    1.76.2.5 03/03/20 22:01:01 bar@bar.mysql.r18.ru +20 -0
    SELECT N'string'

  mysys/charset.c
    1.82 03/03/20 22:01:01 bar@bar.mysql.r18.ru +1 -0
    SELECT N'string'

  include/m_ctype.h
    1.64 03/03/20 22:01:01 bar@bar.mysql.r18.ru +2 -1
    SELECT N'string'

ChangeSet
  1.1346.133.60 03/03/20 19:13:45 Sinisa@sinisa.nasamreza.org +2 -0
  A test case for bug in record #166 :
  select @@not_a_variable closes the connection

  mysql-test/t/variables.test
    1.11.1.2 03/03/20 19:13:42 Sinisa@sinisa.nasamreza.org +7 -0
    A test case for bug in record #166 :
    select @@not_a_variable closes the connection

  mysql-test/r/variables.result
    1.15.1.2 03/03/20 19:13:42 Sinisa@sinisa.nasamreza.org +5 -0
    A test case for bug in record #166 :
    select @@not_a_variable closes the connection

ChangeSet
  1.1346.133.59 03/03/20 19:04:30 Sinisa@sinisa.nasamreza.org +3 -0
  A fix for a bug when INSERT is attempted into a table with a BLOB and
  many NULL columns.
  
  It could be ported back to 3.23 too ....

  mysql-test/t/myisam.test
    1.7.1.9 03/03/20 19:04:25 Sinisa@sinisa.nasamreza.org +2 -2
    A fix for a bug when INSERT is attempted into a table with a BLOB and
    many NULL columns.
    
    It could be ported back to 3.23 too ....

  mysql-test/r/myisam.result
    1.10.1.9 03/03/20 19:04:25 Sinisa@sinisa.nasamreza.org +2 -2
    A fix for a bug when INSERT is attempted into a table with a BLOB and
    many NULL columns.
    
    It could be ported back to 3.23 too ....

  myisam/mi_dynrec.c
    1.24 03/03/20 19:04:25 Sinisa@sinisa.nasamreza.org +1 -1
    A fix for a bug when INSERT is attempted into a table with a BLOB and
    many NULL columns.
    
    It could be ported back to 3.23 too ....

ChangeSet
  1.1494.10.29 03/03/20 20:57:07 ram@mysql.r18.ru +1 -0
  Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp

  sql/field.cc
    1.95 03/03/20 20:57:04 ram@mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1494.31.2 03/03/20 20:55:53 ram@mysql.r18.ru +3 -0
  R-tree bug fixes. 

  sql/field.cc
    1.91.1.3 03/03/20 20:55:51 ram@mysql.r18.ru +1 -1
    To get rid of warning.

  myisam/sp_key.c
    1.6 03/03/20 20:55:51 ram@mysql.r18.ru +29 -4
    Fixed spatial key creation.

  myisam/rt_index.c
    1.8 03/03/20 20:55:51 ram@mysql.r18.ru +8 -1
    Should call find_first() instead of find_next() after key deletion.
    Fixed type cast.

ChangeSet
  1.1494.10.28 03/03/20 20:04:21 bar@bar.mysql.r18.ru +1 -0
  NATIONAL CHARACTER VARYING(n)
  NATIONAL CHAR VARYING(n)
  NCHAR VARYING(n)
  
  are now aliases for
  
  VARCHAR(n) CHARACTER SET utf8

  sql/sql_yacc.yy
    1.203.30.9 03/03/20 20:01:43 bar@bar.mysql.r18.ru +13 -4

ChangeSet
  1.1494.10.27 03/03/20 19:31:01 bar@bar.mysql.r18.ru +1 -0
  
  NCHAR(n) and NATIONAL CHARACTER(n)
  is now synonim for
  CHARACTER(n) CHARACTER SET utf8

  sql/sql_yacc.yy
    1.203.30.8 03/03/20 19:29:14 bar@bar.mysql.r18.ru +13 -3

ChangeSet
  1.1494.10.26 03/03/20 19:11:15 bar@bar.mysql.r18.ru +1 -0
    New syntax for character strings:
  SELECT _latin1 0x345678;
  SELECT _latin x'345678';

  sql/sql_yacc.yy
    1.203.30.7 03/03/20 19:07:58 bar@bar.mysql.r18.ru +8 -0

ChangeSet
  1.1494.10.25 03/03/20 12:09:20 serg@serg.mysql.com +1 -0
  another bad merge fixed

  sql/sql_update.cc
    1.82 03/03/20 12:09:16 serg@serg.mysql.com +1 -1
    another bad merge fixed

ChangeSet
  1.1494.32.3 03/03/20 11:57:05 pem@mysql.com +4 -0
  Post post merge fix. Made the broken ip test work again.

  sql/sp_pcontext.cc
    1.6 03/03/20 11:57:03 pem@mysql.com +5 -1
    Post post merge fix.

  sql/sp_head.cc
    1.17 03/03/20 11:57:03 pem@mysql.com +11 -3
    Added some more DBUG output.

  mysql-test/t/sp.test
    1.15 03/03/20 11:57:03 pem@mysql.com +2 -3
    Post post merge fix. Made the broken ip test work again.

  mysql-test/r/sp.result
    1.14 03/03/20 11:57:03 pem@mysql.com +6 -0
    Post post merge fix. Made the broken ip test work again.

ChangeSet
  1.1494.10.24 03/03/20 11:48:02 serg@serg.mysql.com +1 -0
  fixed bad merge (s/rnd/my_rnd/)

  sql/password.c
    1.24 03/03/20 11:47:57 serg@serg.mysql.com +3 -3
    fixed bad merge (s/rnd/my_rnd/)

ChangeSet
  1.1494.10.22 03/03/20 02:06:08 monty@narttu.mysql.fi +19 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into narttu.mysql.fi:/my/mysql-4.1

  sql/sql_yacc.yy
    1.203.30.6 03/03/20 02:06:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_show.cc
    1.118 03/03/20 02:06:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_repl.cc
    1.102 03/03/20 02:06:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_class.h
    1.146.1.9 03/03/20 02:06:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/slave.cc
    1.188 03/03/20 02:06:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/set_var.cc
    1.30.1.6 03/03/20 02:06:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.26 03/03/20 02:06:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.348 03/03/20 02:06:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/log_event.cc
    1.112 03/03/20 02:06:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/log.cc
    1.108 03/03/20 02:06:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/lex.h
    1.82.7.2 03/03/20 02:06:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_func.cc
    1.121.1.5 03/03/20 02:06:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.79 03/03/20 02:06:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item.h
    1.56.1.9 03/03/20 02:06:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item.cc
    1.58.1.6 03/03/20 02:06:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/field.h
    1.63 03/03/20 02:06:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/field.cc
    1.94 03/03/20 02:06:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  libmysqld/lib_sql.cc
    1.51 03/03/20 02:06:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  configure.in
    1.201.1.28 03/03/20 02:06:04 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1494.10.21 03/03/19 22:25:44 monty@narttu.mysql.fi +41 -0
  Merge with 4.0.12

  sql/sql_update.cc
    1.81 03/03/19 22:25:43 monty@narttu.mysql.fi +4 -4
    Merge with 4.0.12

  sql/sql_test.cc
    1.20 03/03/19 22:25:43 monty@narttu.mysql.fi +0 -1
    Merge with 4.0.12

  sql/sql_parse.cc
    1.271.4.6 03/03/19 22:25:43 monty@narttu.mysql.fi +3 -3
    Merge with 4.0.12

  sql/password.c
    1.23 03/03/19 22:25:43 monty@narttu.mysql.fi +0 -0
    Merge with 4.0.12

  mysql-test/t/multi_update.test
    1.23 03/03/19 22:25:42 monty@narttu.mysql.fi +1 -1
    Merge with 4.0.12

  mysql-test/t/innodb.test
    1.34 03/03/19 22:25:42 monty@narttu.mysql.fi +0 -0
    Merge with 4.0.12

  mysql-test/t/create.test
    1.22 03/03/19 22:25:42 monty@narttu.mysql.fi +15 -17
    Merge with 4.0.12

  mysql-test/r/multi_update.result
    1.21 03/03/19 22:25:42 monty@narttu.mysql.fi +1 -1
    Merge with 4.0.12

  mysql-test/r/create.result
    1.30 03/03/19 22:25:42 monty@narttu.mysql.fi +23 -23
    Merge with 4.0.12

  include/Makefile.am
    1.39 03/03/19 22:25:42 monty@narttu.mysql.fi +1 -2
    Merge with 4.0.12

  configure.in
    1.201.1.27 03/03/19 22:25:42 monty@narttu.mysql.fi +0 -1
    Merge with 4.0.12

  client/mysql.cc
    1.121.1.1 03/03/19 22:25:42 monty@narttu.mysql.fi +1 -2
    Merge with 4.0.12

  strings/strto.c
    1.14 03/03/19 22:16:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/table.cc
    1.74 03/03/19 22:16:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.203.30.5 03/03/19 22:16:05 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_show.cc
    1.117 03/03/19 22:16:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_repl.cc
    1.101 03/03/19 22:16:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_class.cc
    1.105.1.5 03/03/19 22:16:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/slave.h
    1.59 03/03/19 22:16:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/slave.cc
    1.187 03/03/19 22:16:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.347 03/03/19 22:16:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/log.cc
    1.107 03/03/19 22:16:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/lex.h
    1.82.8.1 03/03/19 22:16:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/key.cc
    1.20 03/03/19 22:16:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_func.cc
    1.121.1.4 03/03/19 22:16:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/handler.h
    1.75.1.3 03/03/19 22:16:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/handler.cc
    1.84.1.7 03/03/19 22:16:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-password.c~76f30876e68eddb4
    1.10 03/03/19 22:16:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.114 03/03/19 22:16:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.h
    1.48.1.3 03/03/19 22:16:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/heap.test
    1.10 03/03/19 22:16:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.57 03/03/19 22:16:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/heap.result
    1.15 03/03/19 22:16:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  libmysqld/lib_vio.c
    1.18 03/03/19 22:16:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  libmysqld/Makefile.am
    1.29.1.1 03/03/19 22:16:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  libmysql/Makefile.am
    1.33 03/03/19 22:16:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/row/row0sel.c
    1.32 03/03/19 22:16:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/row/row0mysql.c
    1.41 03/03/19 22:16:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/mysql_com.h
    1.67 03/03/19 22:16:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/my_global.h
    1.43 03/03/19 22:16:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  Docs/internals.texi
    1.27 03/03/19 22:16:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-password.c~76f30876e68eddb4
    1.5.3.4 03/03/19 22:16:03 monty@narttu.mysql.fi +0 -191
    Merge file types: FILE -> SYMLINK

  BitKeeper/deleted/.del-password.c~76f30876e68eddb4
    1.9 03/03/19 22:04:06 monty@narttu.mysql.fi +0 -0
    Merge rename: libmysql/password.c -> BitKeeper/deleted/.del-password.c~76f30876e68eddb4

ChangeSet
  1.1346.157.2 03/03/19 21:43:41 monty@narttu.mysql.fi +6 -0
  Print right hostname or IP in SHOW PROCESSLIST
  Use SESSION TABLE_HANDLER as default table handler if given table handler doesn't exists

  sql/sql_show.cc
    1.76.4.1 03/03/19 21:43:40 monty@narttu.mysql.fi +2 -2
    Print right hostname or IP in SHOW PROCESSLIST

  sql/sql_parse.cc
    1.218.1.83 03/03/19 21:43:40 monty@narttu.mysql.fi +3 -0
    Fix that we return hostname instead of IP in SHOW PROCESSLIST

  sql/handler.cc
    1.82.1.14 03/03/19 21:43:40 monty@narttu.mysql.fi +8 -1
    Use SESSION TABLE_HANDLER as default table handler if given table handler doesn't exists.

  mysql-test/t/create.test
    1.11.1.4 03/03/19 21:43:40 monty@narttu.mysql.fi +17 -0
    New tests

  mysql-test/r/create.result
    1.12.1.5 03/03/19 21:43:40 monty@narttu.mysql.fi +23 -0
    New tests

  Docs/internals.texi
    1.22.1.3 03/03/19 21:43:40 monty@narttu.mysql.fi +11 -8
    Updated description for how DATE, TIME and TIMESTAMP are stored

ChangeSet
  1.1494.10.20 03/03/19 21:23:13 monty@narttu.mysql.fi +12 -0
  Added support for ULONG division with DIV
  Fixed non fatal memory leak in slave code.

  sql/unireg.h
    1.20 03/03/19 21:23:11 monty@narttu.mysql.fi +7 -0
    Moved memory defaults to include file

  sql/sql_parse.cc
    1.271.4.5 03/03/19 21:23:11 monty@narttu.mysql.fi +2 -11
    Added init_for_queries() to fix memory leak in slave code

  sql/sql_error.cc
    1.12 03/03/19 21:23:11 monty@narttu.mysql.fi +2 -0
    More DBUG statements

  sql/sql_class.h
    1.146.1.8 03/03/19 21:23:11 monty@narttu.mysql.fi +1 -0
    Added init_for_queries() to fix memory leak in slave code

  sql/sql_class.cc
    1.105.1.4 03/03/19 21:23:11 monty@narttu.mysql.fi +15 -0
    Added init_for_queries() to fix memory leak in slave code

  sql/sql_base.cc
    1.145 03/03/19 21:23:11 monty@narttu.mysql.fi +3 -1
    More DBUG statements

  sql/slave.cc
    1.186 03/03/19 21:23:11 monty@narttu.mysql.fi +3 -3
    Fixed memory leak (Wrong call to init_sql_alloc)

  sql/log_event.cc
    1.111 03/03/19 21:23:11 monty@narttu.mysql.fi +2 -6
    Fixed memory leak (Wrong call to init_sql_alloc)

  sql/item_func.cc
    1.121.1.3 03/03/19 21:23:11 monty@narttu.mysql.fi +4 -1
    Added support for ULONG division with DIV

  mysys/my_alloc.c
    1.19 03/03/19 21:23:11 monty@narttu.mysql.fi +10 -4
    More DBUG statements

  mysql-test/t/func_test.test
    1.12 03/03/19 21:23:11 monty@narttu.mysql.fi +1 -0
    Added test for DIV

  mysql-test/r/func_test.result
    1.14 03/03/19 21:23:11 monty@narttu.mysql.fi +3 -0
    Added test for DIV

ChangeSet
  1.1494.28.8 03/03/19 20:27:11 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/item.cc
    1.58.2.4 03/03/19 20:27:05 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1346.133.58 03/03/19 17:46:36 Sinisa@sinisa.nasamreza.org +1 -0
  Fixed a bug when SELECT @@inexistent_variable caused the
  error in client - server protocl due to two net_printf() being
  sent to the client.

  sql/item_func.cc
    1.60.1.30 03/03/19 17:46:31 Sinisa@sinisa.nasamreza.org +0 -3
    Fixed a bug when SELECT @@inexistent_variable caused the
    error in client - server protocl due to two net_printf() being
    sent to the client.

ChangeSet
  1.1494.30.15 03/03/19 19:33:26 bar@bar.mysql.r18.ru +1 -0
  configure.in:
    Always compile utf8

  configure.in
    1.201.3.1 03/03/19 19:33:12 bar@bar.mysql.r18.ru +5 -1
    Always compile utf8

ChangeSet
  1.1346.133.57 03/03/19 17:25:59 Sinisa@sinisa.nasamreza.org +1 -0
  A fix for the bug with setting of SQL_BIG_SELECTS option.

  sql/set_var.cc
    1.12.1.13 03/03/19 17:25:54 Sinisa@sinisa.nasamreza.org +1 -1
    A fix for the bug with setting of SQL_BIG_SELECTS option.

ChangeSet
  1.1494.30.14 03/03/19 19:13:28 bar@bar.mysql.r18.ru +8 -0
  Strings comparison is now done according to "Collating sequences used for
  comparison" table, "SQL Complete, Really", page 162

  sql/item_create.cc
    1.28.1.2 03/03/19 19:13:26 bar@bar.mysql.r18.ru +1 -1
    Strings comparison is now done according to "Collating sequences used for
    comparison" table, "SQL Complete, Really", page 162

  sql/item_cmpfunc.h
    1.49 03/03/19 19:13:26 bar@bar.mysql.r18.ru +2 -0
    Strings comparison is now done according to "Collating sequences used for
    comparison" table, "SQL Complete, Really", page 162

  sql/item_cmpfunc.cc
    1.77.1.3 03/03/19 19:13:26 bar@bar.mysql.r18.ru +35 -3
    Strings comparison is now done according to "Collating sequences used for
    comparison" table, "SQL Complete, Really", page 162

  sql/item.cc
    1.58.4.4 03/03/19 19:13:26 bar@bar.mysql.r18.ru +1 -1
    Strings comparison is now done according to "Collating sequences used for
    comparison" table, "SQL Complete, Really", page 162

  mysql-test/t/func_system.test
    1.6 03/03/19 19:13:26 bar@bar.mysql.r18.ru +1 -1
    Strings comparison is now done according to "Collating sequences used for
    comparison" table, "SQL Complete, Really", page 162

  mysql-test/t/ctype_many.test
    1.12 03/03/19 19:13:26 bar@bar.mysql.r18.ru +4 -4
    Strings comparison is now done according to "Collating sequences used for
    comparison" table, "SQL Complete, Really", page 162

  mysql-test/r/func_system.result
    1.9 03/03/19 19:13:26 bar@bar.mysql.r18.ru +2 -2
    Strings comparison is now done according to "Collating sequences used for
    comparison" table, "SQL Complete, Really", page 162

  mysql-test/r/ctype_many.result
    1.2 03/03/19 19:13:26 bar@bar.mysql.r18.ru +191 -190
    Strings comparison is now done according to "Collating sequences used for
    comparison" table, "SQL Complete, Really", page 162

ChangeSet
  1.676.292.1 03/03/19 15:16:51 guilhem@mysql.com +3 -0
  Do not silently do RESET MASTER when one does 'mysqldump --master-data' ;
  only do it if the user specifies --delete-master-logs (new option).
  Safer + fixes bug #159.

  BitKeeper/etc/logging_ok
    1.153.1.89 03/03/19 15:16:50 guilhem@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  client/mysqldump.c
    1.37.2.1 03/03/19 15:15:38 guilhem@mysql.com +17 -8
    New option --delete-master-logs for mysqldump

  client/client_priv.h
    1.1.1.4 03/03/19 15:15:38 guilhem@mysql.com +2 -1
    New option --delete-master-logs for mysqldump

ChangeSet
  1.1346.133.56 03/03/19 16:10:16 Sinisa@sinisa.nasamreza.org +1 -0
  A fix for SHOW PROCESSLIST bug

  sql/sql_show.cc
    1.76.1.27 03/03/19 16:10:12 Sinisa@sinisa.nasamreza.org +2 -2
    A fix for SHOW PROCESSLIST bug

ChangeSet
  1.1494.30.13 03/03/19 17:24:46 bar@bar.mysql.r18.ru +2 -0
  Produce an error when arguments are not compatible for CONCAT()

  sql/item_strfunc.cc
    1.88 03/03/19 17:24:43 bar@bar.mysql.r18.ru +6 -2
    Produce an error when arguments are not compatible for CONCAT()

  sql/item.cc
    1.58.4.3 03/03/19 17:24:43 bar@bar.mysql.r18.ru +9 -7
    Produce an error when arguments are not compatible for CONCAT()

ChangeSet
  1.1494.33.1 03/03/19 14:13:37 pem@mysql.com +1 -0
  Fixed a few typos, and translated new messages.

  sql/share/swedish/errmsg.txt
    1.64.1.5 03/03/19 14:13:36 pem@mysql.com +14 -14
    Fixed a few typos, and translated new messages.

ChangeSet
  1.1346.158.1 03/03/19 14:04:30 pem@mysql.com +1 -0
  Fixed lots of typos, and translated a few messages.

  sql/share/swedish/errmsg.txt
    1.46.1.8 03/03/19 14:04:28 pem@mysql.com +85 -85
    Fixed lots of typos, and translated a few messages.

ChangeSet
  1.1494.30.12 03/03/19 15:55:17 bar@bar.mysql.r18.ru +6 -0
  Getting closer to be more SQL99 in dyadic operations

  sql/item_strfunc.h
    1.50 03/03/19 15:55:15 bar@bar.mysql.r18.ru +5 -1
    Use arg's attributes

  sql/item_strfunc.cc
    1.87 03/03/19 15:55:15 bar@bar.mysql.r18.ru +12 -5
    Function to choose collation for dyadic operations

  sql/item_func.cc
    1.121.2.3 03/03/19 15:55:15 bar@bar.mysql.r18.ru +0 -33
    Function to choose collation for dyadic operations

  sql/item.h
    1.56.3.2 03/03/19 15:55:14 bar@bar.mysql.r18.ru +9 -2
    NO COLLATION has less coercibility than IMPLICIT and COERCIBLE

  sql/item.cc
    1.58.4.2 03/03/19 15:55:14 bar@bar.mysql.r18.ru +34 -2
    Function to choose collation for dyadic operations

  mysql-test/r/ctype_collate.result
    1.7 03/03/19 15:55:14 bar@bar.mysql.r18.ru +6 -6
    NO COLLATION has less coercibility than IMPLICIT and COERCIBLE

ChangeSet
  1.1494.32.2 03/03/19 11:36:32 pem@mysql.com +7 -0
  Post-merge fixes.

  sql/sp_pcontext.cc
    1.5 03/03/19 11:32:44 pem@mysql.com +6 -2
    Post-merge fixes.

  sql/share/german/errmsg.txt
    1.71 03/03/19 11:32:44 pem@mysql.com +1 -2
    Post-merge fixes.

  sql/item.cc
    1.61 03/03/19 11:32:44 pem@mysql.com +1 -0
    Post-merge fixes.

  mysql-test/t/sp.test
    1.14 03/03/19 11:32:44 pem@mysql.com +3 -2
    Post-merge fixes.
    (And disabled the ip test, since some change in 4.1 broke it.)

  mysql-test/t/sp-error.test
    1.2 03/03/19 11:32:44 pem@mysql.com +17 -17
    Post-merge fixes.

  mysql-test/r/sp.result
    1.13 03/03/19 11:32:44 pem@mysql.com +0 -6
    Post-merge fixes.
    (And disabled the ip test, since some change in 4.1 broke it.)

  client/mysqltest.c
    1.95 03/03/19 11:32:43 pem@mysql.com +1 -1
    Post-merge fixes.

ChangeSet
  1.1346.157.1 03/03/19 00:47:38 monty@narttu.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.0
  into narttu.mysql.fi:/my/mysql-4.0

  configure.in
    1.191.1.78 03/03/19 00:47:36 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.156.3 03/03/19 00:45:44 monty@narttu.mysql.fi +13 -0
  Allow optimzation of multi-table-update also for InnoDB tables
  MEMORY is alias for HEAP for CREATE TABLE ... TYPE=HEAP
  Fixed bug in multi-table-update where a row could be updated several times

  sql/sql_yacc.yy
    1.145.15.1 03/03/19 00:45:43 monty@narttu.mysql.fi +3 -0
    MEMORY is alias for HEAP

  sql/sql_update.cc
    1.54.1.25 03/03/19 00:45:43 monty@narttu.mysql.fi +105 -41
    Fixed bug in multi-table-update where a row could be updated several times

  sql/sql_test.cc
    1.9.1.3 03/03/19 00:45:43 monty@narttu.mysql.fi +1 -1
    Fixed wrong printf

  sql/lex.h
    1.66.1.25 03/03/19 00:45:43 monty@narttu.mysql.fi +1 -0
    MEMORY is alias for HEAP

  sql/key.cc
    1.13.1.4 03/03/19 00:45:43 monty@narttu.mysql.fi +1 -1
    After merge fix

  sql/handler.h
    1.71.1.11 03/03/19 00:45:43 monty@narttu.mysql.fi +0 -1
    Allow optimzation of multi-update also for InnoDB tables

  sql/ha_innodb.h
    1.48.2.3 03/03/19 00:45:43 monty@narttu.mysql.fi +1 -2
    Allow optimzation of multi-table-update also for InnoDB tables

  mysql-test/t/multi_update.test
    1.17.1.3 03/03/19 00:45:43 monty@narttu.mysql.fi +28 -0
    Added multi-update-test

  mysql-test/t/innodb.test
    1.28.1.9 03/03/19 00:45:43 monty@narttu.mysql.fi +28 -0
    Added multi-update-test

  mysql-test/t/heap.test
    1.7.1.1 03/03/19 00:45:43 monty@narttu.mysql.fi +1 -1
    Test of CREATE TABLE ... type=MEMORY

  mysql-test/r/multi_update.result
    1.15.1.3 03/03/19 00:45:43 monty@narttu.mysql.fi +64 -0
    Added multi-update-test

  mysql-test/r/innodb.result
    1.40.1.19 03/03/19 00:45:43 monty@narttu.mysql.fi +79 -0
    Added multi-update-test

  mysql-test/r/heap.result
    1.10.1.2 03/03/19 00:45:43 monty@narttu.mysql.fi +1 -1
    Test of CREATE TABLE ... type=MEMORY

ChangeSet
  1.1346.133.54 03/03/18 22:14:02 lenz@mysql.com +10 -0
   - renamed "rnd" to "my_rnd" as the name was too generic (and is an exported
     symbol in libmysqlclient) (thanks to Dennis Haney for the initial patch)
   - cleanup: removed client/password.c (not used at all) and
     libmysql/password.c (should rather be a symlink to sql/password.c instead)
   - applied HPUX11 portability fix for char_val declaration to sql/password.c
     (taken from libmysql/password.c)

  sql/sql_crypt.cc
    1.5 03/03/18 22:13:45 lenz@mysql.com +3 -3
     - replaced "rnd" with "my_rnd"

  sql/sql_class.cc
    1.71.1.31 03/03/18 22:13:45 lenz@mysql.com +1 -1
     - replaced "rnd" with "my_rnd"

  sql/password.c
    1.6.1.2 03/03/18 22:13:45 lenz@mysql.com +6 -6
     - replaced "rnd" with "my_rnd"

  sql/mysqld.cc
    1.297.1.111 03/03/18 22:13:45 lenz@mysql.com +1 -1
     - replaced "rnd" with "my_rnd"

  sql/item_func.cc
    1.60.1.29 03/03/18 22:13:45 lenz@mysql.com +1 -1
     - replaced "rnd" with "my_rnd"

  libmysqld/Makefile.am
    1.19.1.4 03/03/18 22:13:45 lenz@mysql.com +2 -2
     - use password.c from the sql directory instead

  libmysql/Makefile.am
    1.29.1.2 03/03/18 22:13:45 lenz@mysql.com +3 -5
     - removed dead piece of code ($qs was not defined)
     - symlink password.c from the sql directory

  include/mysql_com.h
    1.43.1.6 03/03/18 22:13:45 lenz@mysql.com +1 -1
     - replaced "rnd" with "my_rnd"

ChangeSet
  1.1494.32.1 03/03/18 16:12:50 pem@mysql.com +45 -0
  Merged 4.1 -> 5.0.

  sql/sql_yacc.yy
    1.222 03/03/18 16:12:48 pem@mysql.com +10 -22
    Merged 4.1 -> 5.0.

  sql/sql_lex.cc
    1.76.3.1 03/03/18 16:12:48 pem@mysql.com +0 -0
    Merged 4.1 -> 5.0.

  sql/share/ukrainian/errmsg.txt
    1.33 03/03/18 16:12:48 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/share/swedish/errmsg.txt
    1.70 03/03/18 16:12:48 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/share/spanish/errmsg.txt
    1.70 03/03/18 16:12:48 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/share/slovak/errmsg.txt
    1.70 03/03/18 16:12:48 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/share/serbian/errmsg.txt
    1.24 03/03/18 16:12:47 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/share/russian/errmsg.txt
    1.67 03/03/18 16:12:47 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/share/romanian/errmsg.txt
    1.68 03/03/18 16:12:47 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/share/portuguese/errmsg.txt
    1.70 03/03/18 16:12:47 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/share/polish/errmsg.txt
    1.69 03/03/18 16:12:47 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/share/norwegian/errmsg.txt
    1.69 03/03/18 16:12:47 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/share/norwegian-ny/errmsg.txt
    1.69 03/03/18 16:12:47 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/share/korean/errmsg.txt
    1.69 03/03/18 16:12:47 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/share/japanese/errmsg.txt
    1.69 03/03/18 16:12:47 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/share/italian/errmsg.txt
    1.76 03/03/18 16:12:47 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/share/hungarian/errmsg.txt
    1.71 03/03/18 16:12:47 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/share/greek/errmsg.txt
    1.70 03/03/18 16:12:47 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/share/german/errmsg.txt
    1.70 03/03/18 16:12:47 pem@mysql.com +1 -1
    Merged 4.1 -> 5.0.

  sql/share/french/errmsg.txt
    1.69 03/03/18 16:12:47 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/share/estonian/errmsg.txt
    1.70 03/03/18 16:12:47 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/share/english/errmsg.txt
    1.77 03/03/18 16:12:47 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/share/dutch/errmsg.txt
    1.72 03/03/18 16:12:47 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/share/danish/errmsg.txt
    1.68 03/03/18 16:12:47 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/share/czech/errmsg.txt
    1.70 03/03/18 16:12:47 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  sql/item_func.cc
    1.121.3.1 03/03/18 16:12:47 pem@mysql.com +0 -0
    Merged 4.1 -> 5.0.

  sql/item.cc
    1.60 03/03/18 16:12:47 pem@mysql.com +0 -1
    Merged 4.1 -> 5.0.

  include/mysqld_error.h
    1.67 03/03/18 16:12:47 pem@mysql.com +13 -14
    Merged 4.1 -> 5.0.

  client/mysqltest.c
    1.94 03/03/18 16:12:47 pem@mysql.com +0 -0
    Merged 4.1 -> 5.0.

  BitKeeper/deleted/.del-password.c~76f30876e68eddb4
    1.5.3.3 03/03/18 16:05:32 lenz@mysql.com +0 -0
    Delete: libmysql/password.c

  libmysql/password.c
    1.5.3.2 03/03/18 16:02:23 lenz@mysql.com +0 -0
    Rename: BitKeeper/deleted/.del-password.c~76f30876e68eddb4 -> libmysql/password.c

  sql/sql_select.cc
    1.212.1.3 03/03/18 15:42:56 pem@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.278 03/03/18 15:42:56 pem@mysql.com +0 -0
    Auto merged

  sql/sql_lex.h
    1.109 03/03/18 15:42:56 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.149 03/03/18 15:42:56 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.111 03/03/18 15:42:56 pem@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.188 03/03/18 15:42:56 pem@mysql.com +0 -0
    Auto merged

  sql/lex.h
    1.91 03/03/18 15:42:56 pem@mysql.com +0 -0
    Auto merged

  sql/item_func.h
    1.71 03/03/18 15:42:56 pem@mysql.com +0 -0
    Auto merged

  sql/item.h
    1.58 03/03/18 15:42:56 pem@mysql.com +0 -0
    Auto merged

  scripts/mysql_install_db.sh
    1.41 03/03/18 15:42:56 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.59 03/03/18 15:42:56 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.68 03/03/18 15:42:56 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/rpl_temporary.result
    1.6 03/03/18 15:42:55 pem@mysql.com +0 -0
    Auto merged

  configure.in
    1.208 03/03/18 15:42:55 pem@mysql.com +0 -0
    Auto merged

  client/mysql.cc
    1.122 03/03/18 15:42:55 pem@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.235 03/03/18 15:42:50 pem@mysql.com +0 -0
    auto-union

  BitKeeper/deleted/.del-password.c~76f30876e68eddb4
    1.5.3.1 03/03/18 15:31:06 lenz@mysql.com +0 -0
    Delete: libmysql/password.c

  BitKeeper/deleted/.del-password.c~c036d4f8b3280843
    1.6 03/03/18 15:30:51 lenz@mysql.com +0 -0
    Delete: client/password.c

ChangeSet
  1.1494.31.1 03/03/18 17:01:38 ram@mysql.r18.ru +2 -0
  Should use GeometryFromWKB().

  mysql-test/t/gis-rtree.test
    1.2 03/03/18 17:01:35 ram@mysql.r18.ru +4 -7
    Should use GeometryFromWKB().

  mysql-test/r/gis-rtree.result
    1.2 03/03/18 17:01:35 ram@mysql.r18.ru +202 -304
    Should use GeometryFromWKB().

ChangeSet
  1.1494.30.10 03/03/18 17:01:32 bar@bar.mysql.r18.ru +18 -0
  CONVERT class was removed

  sql/sql_yacc.yy
    1.203.31.4 03/03/18 17:01:30 bar@bar.mysql.r18.ru +8 -2
    CONVERT class was removed

  sql/sql_show.cc
    1.114.1.4 03/03/18 17:01:30 bar@bar.mysql.r18.ru +2 -2
    CONVERT class was removed

  sql/sql_lex.h
    1.102.7.4 03/03/18 17:01:30 bar@bar.mysql.r18.ru +0 -1
    CONVERT class was removed

  sql/sql_lex.cc
    1.76.2.4 03/03/18 17:01:30 bar@bar.mysql.r18.ru +1 -11
    CONVERT class was removed

  sql/sql_db.cc
    1.68 03/03/18 17:01:30 bar@bar.mysql.r18.ru +0 -1
    CONVERT class was removed

  sql/sql_class.h
    1.146.4.1 03/03/18 17:01:30 bar@bar.mysql.r18.ru +0 -27
    CONVERT class was removed

  sql/sql_cache.cc
    1.39.3.1 03/03/18 17:01:30 bar@bar.mysql.r18.ru +4 -10
    CONVERT class was removed

  sql/set_var.h
    1.15 03/03/18 17:01:30 bar@bar.mysql.r18.ru +0 -18
    CONVERT class was removed

  sql/set_var.cc
    1.30.2.1 03/03/18 17:01:30 bar@bar.mysql.r18.ru +28 -48
    CONVERT class was removed

  sql/protocol.h
    1.6 03/03/18 17:01:30 bar@bar.mysql.r18.ru +0 -4
    CONVERT class was removed

  sql/protocol.cc
    1.52 03/03/18 17:01:30 bar@bar.mysql.r18.ru +0 -15
    CONVERT class was removed

  sql/log_event.cc
    1.108.1.3 03/03/18 17:01:30 bar@bar.mysql.r18.ru +2 -2
    CONVERT class was removed

  sql/log.cc
    1.105.1.1 03/03/18 17:01:30 bar@bar.mysql.r18.ru +2 -0
    CONVERT class was removed

  sql/convert.cc
    1.14 03/03/18 17:01:30 bar@bar.mysql.r18.ru +3 -0
    CONVERT class was removed

  mysql-test/t/variables.test
    1.15 03/03/18 17:01:30 bar@bar.mysql.r18.ru +6 -6
    CONVERT class was removed

  mysql-test/r/variables.result
    1.19 03/03/18 17:01:30 bar@bar.mysql.r18.ru +10 -10
    CONVERT class was removed

  mysql-test/r/query_cache.result
    1.19.1.1 03/03/18 17:01:30 bar@bar.mysql.r18.ru +1 -1
    CONVERT class was removed

  libmysqld/lib_sql.cc
    1.49.1.1 03/03/18 17:01:30 bar@bar.mysql.r18.ru +2 -0
    CONVERT class was removed

ChangeSet
  1.1494.30.9 03/03/18 15:30:32 ram@mysql.r18.ru +16 -0
  SRID support.
  GeomertyFromWKB() function.
  SRID() function.
  ::store() methods for Field_geom.
  Code cleanup.

  sql/sql_yacc.yy
    1.203.31.3 03/03/18 15:30:29 ram@mysql.r18.ru +13 -8
    Fix for xxxFromText() functions.
    GeometryFromWKB() function.

  sql/spatial.h
    1.6 03/03/18 15:30:29 ram@mysql.r18.ru +0 -1
    Code cleanup.

  sql/spatial.cc
    1.10 03/03/18 15:30:29 ram@mysql.r18.ru +9 -9
    Code cleanup.

  sql/lex.h
    1.82.7.1 03/03/18 15:30:29 ram@mysql.r18.ru +4 -1
    GeometryFromWKB() function.
    SRID() function.

  sql/item_strfunc.h
    1.49 03/03/18 15:30:29 ram@mysql.r18.ru +15 -1
    SRID support.
    GeometryFromWKB() function.
    Code cleanup.

  sql/item_strfunc.cc
    1.86 03/03/18 15:30:29 ram@mysql.r18.ru +128 -67
    SRID support.
    GeometryFromWKB() function.
    Code cleanup.

  sql/item_func.h
    1.68.2.1 03/03/18 15:30:29 ram@mysql.r18.ru +11 -0
    SRID support.

  sql/item_func.cc
    1.121.2.2 03/03/18 15:30:29 ram@mysql.r18.ru +67 -53
    SRID support.
    Code cleanup.

  sql/item_create.h
    1.20.1.1 03/03/18 15:30:29 ram@mysql.r18.ru +36 -36
    Code cleanup.

  sql/item_create.cc
    1.28.1.1 03/03/18 15:30:29 ram@mysql.r18.ru +37 -37
    Code cleanup.

  sql/item_cmpfunc.cc
    1.77.1.2 03/03/18 15:30:29 ram@mysql.r18.ru +18 -15
    SRID support.
    Code cleanup.

  sql/field.h
    1.61.1.1 03/03/18 15:30:29 ram@mysql.r18.ru +7 -3
    SRID support.
    ::store() methods for Field_geom.
    Code cleanup.

  sql/field.cc
    1.91.1.2 03/03/18 15:30:29 ram@mysql.r18.ru +59 -30
    SRID support.
    ::store() methods for Field_geom.
    Code cleanup.

  mysql-test/t/gis.test
    1.3 03/03/18 15:30:29 ram@mysql.r18.ru +6 -6
    We should use GeometryFromWKB().

  mysql-test/r/gis.result
    1.3 03/03/18 15:30:29 ram@mysql.r18.ru +6 -6
    We should use GeometryFromWKB().

  myisam/sp_key.c
    1.5 03/03/18 15:30:29 ram@mysql.r18.ru +1 -1
    SRID support.

ChangeSet
  1.1494.30.7 03/03/18 13:42:45 bar@bar.mysql.r18.ru +6 -0
  SHOW CREATE TABLE didn't display field names in the proper charset

  mysql-test/t/ctype_recoding.test
    1.1 03/03/18 13:42:43 bar@bar.mysql.r18.ru +28 -0

  mysql-test/r/ctype_recoding.result
    1.1 03/03/18 13:42:43 bar@bar.mysql.r18.ru +43 -0

  sql/sql_string.h
    1.32 03/03/18 13:42:43 bar@bar.mysql.r18.ru +1 -0
    SHOW CREATE TABLE didn't display field names in the proper charset

  sql/sql_string.cc
    1.53 03/03/18 13:42:43 bar@bar.mysql.r18.ru +28 -0
    SHOW CREATE TABLE didn't display field names in the proper charset

  sql/sql_show.cc
    1.114.1.3 03/03/18 13:42:43 bar@bar.mysql.r18.ru +2 -2
    SHOW CREATE TABLE didn't display field names in the proper charset

  mysys/charset.c
    1.81 03/03/18 13:42:43 bar@bar.mysql.r18.ru +2 -0
    Clear all fields at the end of previous charset

  mysql-test/t/ctype_recoding.test
    1.0 03/03/18 13:42:43 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/t/ctype_recoding.test

  mysql-test/r/ctype_recoding.result
    1.0 03/03/18 13:42:43 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/r/ctype_recoding.result

ChangeSet
  1.1494.10.19 03/03/18 11:17:48 monty@narttu.mysql.fi +7 -0
  Fixes to avoid errors from valgrind
  Fixed problem with 'wrong packet number' in union

  strings/ctype-simple.c
    1.31 03/03/18 11:17:47 monty@narttu.mysql.fi +10 -0
    Fix for valgrind

  sql/sql_union.cc
    1.68 03/03/18 11:17:47 monty@narttu.mysql.fi +3 -7
    Simple code cleanup

  sql/sql_select.cc
    1.216 03/03/18 11:17:47 monty@narttu.mysql.fi +33 -13
    More DBUG_PRINT messages
    Fixed problem with 'wrong packet number' in union (tmp_join.error was not correctly reset)

  sql/set_var.cc
    1.30.1.5 03/03/18 11:17:46 monty@narttu.mysql.fi +1 -1
    Fix to avoid reference to uninitialized memory

  sql/item.h
    1.56.1.8 03/03/18 11:17:46 monty@narttu.mysql.fi +1 -1
    Indentation change

  mysql-test/t/rpl_rotate_logs.test
    1.42 03/03/18 11:17:46 monty@narttu.mysql.fi +1 -0
    Fix to avoid timeing problem

  include/my_global.h
    1.42 03/03/18 11:17:46 monty@narttu.mysql.fi +6 -0
    Fix for valgrind

ChangeSet
  1.1346.133.53 03/03/18 10:00:29 lenz@mysql.com +1 -0
   - updated version number (4.0.12 -> 4.0.13)
   - tagged ChangeSet 1.1671 as mysql-4.0.12

  configure.in
    1.191.13.1 03/03/18 10:00:27 lenz@mysql.com +1 -1
     - updated version number (4.0.12 -> 4.0.13)

ChangeSet
  1.1494.30.6 03/03/18 11:34:19 bar@bar.mysql.r18.ru +4 -0
  Replication were broken because of automatic charset conversion.
  As a fix, my_charset_bin is now used in master-slave packets instead
  of system_charset_info.

  sql/sql_repl.cc
    1.98.1.2 03/03/18 11:34:17 bar@bar.mysql.r18.ru +6 -6
    Replication were broken because of automatic charset conversion.
    As a fix, my_charset_bin is now used in master-slave packets instead
    of system_charset_info.

  sql/slave.cc
    1.183.1.2 03/03/18 11:34:17 bar@bar.mysql.r18.ru +8 -8
    Replication were broken because of automatic charset conversion.
    As a fix, my_charset_bin is now used in master-slave packets instead
    of system_charset_info.

  sql/repl_failsafe.cc
    1.23.1.2 03/03/18 11:34:17 bar@bar.mysql.r18.ru +4 -4
    Replication were broken because of automatic charset conversion.
    As a fix, my_charset_bin is now used in master-slave packets instead
    of system_charset_info.

  sql/log_event.cc
    1.108.1.2 03/03/18 11:34:16 bar@bar.mysql.r18.ru +14 -14
    Replication were broken because of automatic charset conversion.
    As a fix, my_charset_bin is now used in master-slave packets instead
    of system_charset_info.

ChangeSet
  1.1494.30.5 03/03/18 10:02:57 bar@bar.mysql.r18.ru +1 -0
  sql_yacc.yy:
    SET NAMES BINARY now works

  sql/sql_yacc.yy
    1.203.31.2 03/03/18 10:02:33 bar@bar.mysql.r18.ru +3 -1
    SET NAMES BINARY now works

ChangeSet
  1.1346.156.2 03/03/18 03:19:20 monty@narttu.mysql.fi +7 -0
  Merge with 3.23 to get fix for halloween problem on Update of InnoDB tables

  strings/strto.c
    1.8.1.2 03/03/18 03:19:18 monty@narttu.mysql.fi +0 -0
    Merge with 3.23

  mysql-test/t/innodb.test
    1.28.1.8 03/03/18 03:19:18 monty@narttu.mysql.fi +11 -11
    Merge with 3.23

  mysql-test/r/innodb.result
    1.40.1.18 03/03/18 03:19:18 monty@narttu.mysql.fi +0 -10
    Merge with 3.23

  configure.in
    1.191.1.77 03/03/18 03:19:18 monty@narttu.mysql.fi +0 -1
    Merge with 3.23

  sql/key.cc
    1.13.1.3 03/03/18 03:16:49 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.11.4.2 03/03/18 03:16:49 monty@narttu.mysql.fi +0 -0
    Turn off SCCS flag

  mysql-test/r/innodb.result
    1.9.8.2 03/03/18 03:16:49 monty@narttu.mysql.fi +0 -0
    Turn off SCCS flag

  innobase/row/row0sel.c
    1.28.1.3 03/03/18 03:16:49 monty@narttu.mysql.fi +0 -7
    Auto merged

  innobase/row/row0mysql.c
    1.39.1.1 03/03/18 03:16:49 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.156.1 03/03/18 03:16:12 monty@narttu.mysql.fi +3 -0
  Test of range optimizer in InnoDB

  sql/ha_myisam.cc
    1.92.1.29 03/03/18 03:16:10 monty@narttu.mysql.fi +30 -0
    Added function comment

  mysql-test/t/innodb.test
    1.28.1.7 03/03/18 03:16:10 monty@narttu.mysql.fi +33 -1
    Test of range optimizer in InnoDB

  mysql-test/r/innodb.result
    1.40.1.17 03/03/18 03:16:10 monty@narttu.mysql.fi +32 -1
    Test of range optimizer in InnoDB

ChangeSet
  1.676.291.1 03/03/18 02:51:16 monty@narttu.mysql.fi +4 -0
  Fix of 'halloween bug' with UPDATE of InnoDB tables.

  strings/strto.c
    1.5.1.2 03/03/18 02:51:15 monty@narttu.mysql.fi +2 -0
    Portability fix

  sql/key.cc
    1.10.1.2 03/03/18 02:51:15 monty@narttu.mysql.fi +8 -0
    Fix of 'halloween bug' with UPDATE of InnoDB tables.

  mysql-test/t/innodb.test
    1.11.4.1 03/03/18 02:51:15 monty@narttu.mysql.fi +11 -0
    Test of 'halloween bug'

  mysql-test/r/innodb.result
    1.9.8.1 03/03/18 02:51:15 monty@narttu.mysql.fi +10 -0
    Test of 'halloween bug'

ChangeSet
  1.1455.15.1 03/03/18 04:07:40 wax@kishkin.ru +16 -0
  This is full commit of group_concat with support subselects

  BitKeeper/etc/logging_ok
    1.233.3.1 03/03/18 04:07:38 wax@kishkin.ru +1 -0
    Logging to logging@openlogging.org accepted

  mysql-test/t/func_gconcat.test
    1.1 03/03/18 04:07:24 wax@kishkin.ru +77 -0

  mysql-test/r/func_gconcat.result
    1.1 03/03/18 04:07:24 wax@kishkin.ru +155 -0

  sql/sql_yacc.yy
    1.203.32.1 03/03/18 04:07:24 wax@kishkin.ru +33 -3
    add structure of group_concat

  sql/sql_lex.h
    1.102.4.2 03/03/18 04:07:24 wax@kishkin.ru +1 -0
    add qorder_list for function

  sql/sql_error.cc
    1.10.1.1 03/03/18 04:07:24 wax@kishkin.ru +9 -3
    change push_warning

  sql/sql_class.h
    1.146.3.1 03/03/18 04:07:24 wax@kishkin.ru +7 -2
    change MY_ERROR class

  sql/share/english/errmsg.txt
    1.70.2.1 03/03/18 04:07:24 wax@kishkin.ru +2 -1
    add new message text

  sql/set_var.cc
    1.27.1.1 03/03/18 04:07:24 wax@kishkin.ru +3 -0
    add new system variable

  sql/mysqld.cc
    1.335.2.1 03/03/18 04:07:24 wax@kishkin.ru +7 -1
    add new option

  sql/mysql_priv.h
    1.186.4.1 03/03/18 04:07:24 wax@kishkin.ru +2 -2
    change push_warning

  sql/lex.h
    1.82.6.1 03/03/18 04:07:24 wax@kishkin.ru +2 -0
    add lex

  sql/item_sum.h
    1.34.1.1 03/03/18 04:07:24 wax@kishkin.ru +85 -1
    add class

  sql/item_sum.cc
    1.60.1.1 03/03/18 04:07:24 wax@kishkin.ru +450 -0
    add function

  sql/field.h
    1.60.1.1 03/03/18 04:07:24 wax@kishkin.ru +1 -0
    add friend class

  mysql-test/t/func_gconcat.test
    1.0 03/03/18 04:07:24 wax@kishkin.ru +0 -0
    BitKeeper file /home/wax/mysql-4gcn/mysql-test/t/func_gconcat.test

  mysql-test/r/func_gconcat.result
    1.0 03/03/18 04:07:24 wax@kishkin.ru +0 -0
    BitKeeper file /home/wax/mysql-4gcn/mysql-test/r/func_gconcat.result

  include/mysqld_error.h
    1.61.2.1 03/03/18 04:07:24 wax@kishkin.ru +2 -1
    add warning

ChangeSet
  1.1346.133.52 03/03/17 22:51:56 guilhem@mysql.com +7 -0
  New variable rli->ignore_log_space_limit to resolve
  a deadlock between I/O and SQL threads in replication
  when relay_log_space is too small. This fixes bug #79.

  mysql-test/t/rpl_relayspace.test
    1.1 03/03/17 22:51:53 guilhem@mysql.com +33 -0

  mysql-test/t/rpl_relayspace-slave.opt
    1.1 03/03/17 22:51:53 guilhem@mysql.com +1 -0

  mysql-test/r/rpl_relayspace.result
    1.1 03/03/17 22:51:53 guilhem@mysql.com +13 -0

  sql/sql_repl.cc
    1.86.1.6 03/03/17 22:51:53 guilhem@mysql.com +4 -4
    New variable rli->ignore_log_space_limit to resolve
    a deadlock between I/O and SQL threads in replication
    when relay_log_space is too small.

  sql/slave.h
    1.50.1.6 03/03/17 22:51:53 guilhem@mysql.com +7 -0
    New variable rli->ignore_log_space_limit to resolve
    a deadlock between I/O and SQL threads in replication
    when relay_log_space is too small.

  sql/slave.cc
    1.164.1.53 03/03/17 22:51:53 guilhem@mysql.com +51 -9
    New variable rli->ignore_log_space_limit to resolve
    a deadlock between I/O and SQL threads in replication
    when relay_log_space is too small.

  sql/log.cc
    1.80.1.33 03/03/17 22:51:53 guilhem@mysql.com +2 -0
    New variable rli->ignore_log_space_limit to resolve
    a deadlock between I/O and SQL threads in replication
    when relay_log_space is too small.

  mysql-test/t/rpl_relayspace.test
    1.0 03/03/17 22:51:53 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/rpl_relayspace.test

  mysql-test/t/rpl_relayspace-slave.opt
    1.0 03/03/17 22:51:53 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/rpl_relayspace-slave.opt

  mysql-test/r/rpl_relayspace.result
    1.0 03/03/17 22:51:53 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/r/rpl_relayspace.result

ChangeSet
  1.1494.28.6 03/03/17 21:29:38 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/item.cc
    1.58.2.3 03/03/17 21:29:31 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.676.290.4 03/03/17 19:39:01 serg@serg.mysql.com +1 -0
  crash fix

  client/mysqldump.c
    1.37.1.15 03/03/17 19:39:00 serg@serg.mysql.com +1 -1
    crash fix

ChangeSet
  1.1494.30.4 03/03/17 22:01:57 bar@bar.mysql.r18.ru +1 -0
  ctype_many.result:
    new file
  
    As far as bk could not apply delta,
    I removed it.  Now I'm adding the
    new version into the tree again.

  mysql-test/r/ctype_many.result
    1.1 03/03/17 22:00:48 bar@bar.mysql.r18.ru +857 -0

  mysql-test/r/ctype_many.result
    1.0 03/03/17 22:00:48 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/r/ctype_many.result

ChangeSet
  1.1494.30.3 03/03/17 22:00:03 bar@bar.mysql.r18.ru +1 -0
  .del-ctype_many.result~9b541c4def2b5afb:
    Delete: mysql-test/r/ctype_many.result
  
    I could not commit it, bk told it can't apply binary delta
    for textual file.

  BitKeeper/deleted/.del-ctype_many.result~9b541c4def2b5afb
    1.11 03/03/17 21:58:52 bar@bar.mysql.r18.ru +0 -0
    Delete: mysql-test/r/ctype_many.result

ChangeSet
  1.1494.30.2 03/03/17 21:56:34 bar@bar.mysql.r18.ru +12 -0
  

  strings/ctype-utf8.c
    1.37 03/03/17 21:56:32 bar@bar.mysql.r18.ru +4 -0
    Automatic client-server charset recoding has been added

  sql/sql_yacc.yy
    1.203.31.1 03/03/17 21:56:32 bar@bar.mysql.r18.ru +104 -43
    Automatic client-server charset recoding has been added

  sql/sql_string.cc
    1.52 03/03/17 21:56:32 bar@bar.mysql.r18.ru +1 -1
    Automatic client-server charset recoding has been added

  sql/protocol.cc
    1.51 03/03/17 21:56:32 bar@bar.mysql.r18.ru +11 -6
    Automatic client-server charset recoding has been added

  sql/mysqld.cc
    1.345.1.1 03/03/17 21:56:32 bar@bar.mysql.r18.ru +0 -1
    Automatic client-server charset recoding has been added

  sql/item_strfunc.cc
    1.85 03/03/17 21:56:32 bar@bar.mysql.r18.ru +2 -53
    Automatic client-server charset recoding has been added

  sql/item_func.cc
    1.121.2.1 03/03/17 21:56:32 bar@bar.mysql.r18.ru +3 -3
    Automatic client-server charset recoding has been added

  sql/item_cmpfunc.cc
    1.77.1.1 03/03/17 21:56:32 bar@bar.mysql.r18.ru +3 -3
    Automatic client-server charset recoding has been added

  sql/item.h
    1.56.3.1 03/03/17 21:56:32 bar@bar.mysql.r18.ru +3 -3
    Automatic client-server charset recoding has been added

  sql/item.cc
    1.58.4.1 03/03/17 21:56:32 bar@bar.mysql.r18.ru +13 -9
    Automatic client-server charset recoding has been added

  mysys/charset.c
    1.80 03/03/17 21:56:32 bar@bar.mysql.r18.ru +1 -1
    Automatic client-server charset recoding has been added

  mysql-test/t/ctype_many.test
    1.11 03/03/17 21:56:32 bar@bar.mysql.r18.ru +9 -1
    Automatic client-server charset recoding has been added

ChangeSet
  1.1494.30.1 03/03/17 21:52:03 bar@bar.mysql.r18.ru +1 -0
  ctype_collate.result:
    Automatic client-server charset recoding has been added

  mysql-test/r/ctype_collate.result
    1.6 03/03/17 21:50:35 bar@bar.mysql.r18.ru +3 -3
    Automatic client-server charset recoding has been added

ChangeSet
  1.1346.155.1 03/03/17 19:06:14 monty@narttu.mysql.fi +6 -0
  Change dbug.h -> my_dbug.h (Portability fix)
  Ensure that \ is not allowed in filenames, even on Unix

  sql/table.cc
    1.46.1.18 03/03/17 19:06:13 monty@narttu.mysql.fi +1 -1
    Ensure that \ is not allowed in filenames, even on Unix

  libmysqld/lib_vio.c
    1.11.1.4 03/03/17 19:06:13 monty@narttu.mysql.fi +0 -1
    Change dbug.h -> my_dbug.h

  libmysql/get_password.c
    1.11 03/03/17 19:06:13 monty@narttu.mysql.fi +0 -1
    Change dbug.h -> my_dbug.h

  include/my_global.h
    1.34.1.4 03/03/17 19:06:13 monty@narttu.mysql.fi +1 -1
    Change dbug.h -> my_dbug.h

  include/Makefile.am
    1.29.1.9 03/03/17 19:06:13 monty@narttu.mysql.fi +1 -1
    Change dbug.h -> my_dbug.h

  include/my_dbug.h
    1.7 03/03/17 16:29:36 monty@narttu.mysql.fi +0 -0
    Rename: include/dbug.h -> include/my_dbug.h

ChangeSet
  1.1494.28.5 03/03/17 15:53:43 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/item.cc
    1.58.2.2 03/03/17 15:53:37 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1346.133.50 03/03/17 15:50:56 jani@hynda.(none) +1 -0
  Fixed a bug in --one-database.

  client/mysql.cc
    1.93.1.38 03/03/17 15:50:50 jani@hynda.(none) +2 -1
    Fixed a bug in --one-database.

ChangeSet
  1.1494.28.4 03/03/17 17:30:34 bar@bar.mysql.r18.ru +1 -0
  sql_show.cc:
    Bug fix
    0 stayed for length here, now it is charset.

  sql/sql_show.cc
    1.114.1.2 03/03/17 17:29:46 bar@bar.mysql.r18.ru +1 -1
    Bug fix

ChangeSet
  1.1494.29.1 03/03/17 15:16:26 Sinisa@sinisa.nasamreza.org +1 -0
  A fix for a bug reported by Per Erik Martin, partaining to 
  usage of expressions whose result are to be saved into user vars.

  sql/item.cc
    1.58.3.1 03/03/17 15:16:19 Sinisa@sinisa.nasamreza.org +10 -1
    A fix for a bug reported by Per Erik Martin, partaining to 
    usage of expressions whose result are to be saved into user vars.

ChangeSet
  1.1494.10.18 03/03/17 15:06:06 monty@narttu.mysql.fi +11 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into narttu.mysql.fi:/my/mysql-4.1

  sql/sql_table.cc
    1.157 03/03/17 15:06:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_show.cc
    1.116 03/03/17 15:06:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_select.cc
    1.215 03/03/17 15:06:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_repl.cc
    1.100 03/03/17 15:06:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/slave.cc
    1.185 03/03/17 15:06:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.25 03/03/17 15:06:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/log_event.cc
    1.110 03/03/17 15:06:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item.cc
    1.58.1.5 03/03/17 15:06:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.113 03/03/17 15:06:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.85.1.19 03/03/17 15:06:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/field.cc
    1.93 03/03/17 15:06:03 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1494.10.17 03/03/17 15:05:04 monty@narttu.mysql.fi +14 -0
  After merge fixes
  Don't create temporary objects with no table name

  sql/sql_yacc.yy
    1.203.30.4 03/03/17 15:05:02 monty@narttu.mysql.fi +3 -2
    Remove usage of thd when creating 'Table_ident'

  sql/sql_select.cc
    1.214 03/03/17 15:05:02 monty@narttu.mysql.fi +2 -2
    After merge fix
    Fixed wrong return -> DBUG_RETURN()

  sql/sql_derived.cc
    1.41 03/03/17 15:05:02 monty@narttu.mysql.fi +4 -2
    Indentation fix

  sql/sql_class.h
    1.146.1.7 03/03/17 15:05:02 monty@narttu.mysql.fi +6 -3
    Remove usage of thd when creating 'Table_ident'
    Don't create temporary objects with no table name

  mysql-test/t/delete.test
    1.11 03/03/17 15:05:02 monty@narttu.mysql.fi +4 -4
    Change to not use table 't'

  mysql-test/r/type_timestamp.result
    1.10 03/03/17 15:05:02 monty@narttu.mysql.fi +2 -2
    After merge fix

  mysql-test/r/rpl_loaddatalocal.result
    1.3 03/03/17 15:05:02 monty@narttu.mysql.fi +2 -2
    After merge fix

  mysql-test/r/innodb.result
    1.56 03/03/17 15:05:02 monty@narttu.mysql.fi +3 -0
    After merge fix

  mysql-test/r/func_like.result
    1.8 03/03/17 15:05:02 monty@narttu.mysql.fi +4 -4
    After merge fix

  mysql-test/r/delete.result
    1.10 03/03/17 15:05:02 monty@narttu.mysql.fi +4 -4
    After merge fix

  mysql-test/r/create.result
    1.29 03/03/17 15:05:02 monty@narttu.mysql.fi +2 -0
    After merge fix

  mysql-test/r/backup.result
    1.10 03/03/17 15:05:02 monty@narttu.mysql.fi +23 -18
    After merge fix

  mysql-test/r/analyse.result
    1.12 03/03/17 15:05:02 monty@narttu.mysql.fi +15 -2
    After merge fix

  myisam/mi_open.c
    1.63 03/03/17 15:05:02 monty@narttu.mysql.fi +2 -2
    After merge fix

ChangeSet
  1.1494.28.3 03/03/17 13:40:40 bar@bar.mysql.r18.ru +1 -0
  sql_string.cc:
    Copy as is if src or dst are binary

  sql/sql_string.cc
    1.51 03/03/17 13:39:59 bar@bar.mysql.r18.ru +4 -0
    Copy as is if src or dst are binary

ChangeSet
  1.1494.28.2 03/03/17 13:14:04 bar@bar.mysql.r18.ru +18 -0
  Preparing to client<->server autoconvert

  sql/sql_table.cc
    1.155.1.1 03/03/17 13:14:02 bar@bar.mysql.r18.ru +29 -28
    Preparing to client<->server autoconvert

  sql/sql_show.cc
    1.114.1.1 03/03/17 13:14:02 bar@bar.mysql.r18.ru +63 -60
    Preparing to client<->server autoconvert

  sql/sql_select.cc
    1.212.1.2 03/03/17 13:14:02 bar@bar.mysql.r18.ru +1 -1
    Preparing to client<->server autoconvert

  sql/sql_repl.cc
    1.98.1.1 03/03/17 13:14:02 bar@bar.mysql.r18.ru +2 -2
    Preparing to client<->server autoconvert

  sql/sql_help.cc
    1.10 03/03/17 13:14:02 bar@bar.mysql.r18.ru +6 -6
    Preparing to client<->server autoconvert

  sql/sql_error.cc
    1.11 03/03/17 13:14:02 bar@bar.mysql.r18.ru +2 -2
    Preparing to client<->server autoconvert

  sql/sql_db.cc
    1.67 03/03/17 13:14:02 bar@bar.mysql.r18.ru +2 -2
    Preparing to client<->server autoconvert

  sql/sql_acl.cc
    1.72 03/03/17 13:14:02 bar@bar.mysql.r18.ru +3 -3
    Preparing to client<->server autoconvert

  sql/slave.cc
    1.183.1.1 03/03/17 13:14:02 bar@bar.mysql.r18.ru +8 -8
    Preparing to client<->server autoconvert

  sql/repl_failsafe.cc
    1.23.1.1 03/03/17 13:14:02 bar@bar.mysql.r18.ru +4 -4
    Preparing to client<->server autoconvert

  sql/protocol.h
    1.5 03/03/17 13:14:01 bar@bar.mysql.r18.ru +4 -4
    Preparing to client<->server autoconvert

  sql/protocol.cc
    1.50 03/03/17 13:14:01 bar@bar.mysql.r18.ru +24 -13
    Preparing to client<->server autoconvert

  sql/log_event.cc
    1.108.1.1 03/03/17 13:14:01 bar@bar.mysql.r18.ru +14 -14
    Preparing to client<->server autoconvert

  sql/item.cc
    1.58.2.1 03/03/17 13:14:01 bar@bar.mysql.r18.ru +1 -1
    Preparing to client<->server autoconvert

  sql/ha_myisam.cc
    1.111.1.1 03/03/17 13:14:01 bar@bar.mysql.r18.ru +4 -4
    Preparing to client<->server autoconvert

  sql/ha_innodb.cc
    1.85.5.1 03/03/17 13:14:01 bar@bar.mysql.r18.ru +1 -1
    Preparing to client<->server autoconvert

  sql/ha_berkeley.cc
    1.117 03/03/17 13:14:01 bar@bar.mysql.r18.ru +4 -4
    Preparing to client<->server autoconvert

  sql/field.cc
    1.91.1.1 03/03/17 13:14:01 bar@bar.mysql.r18.ru +1 -1
    Preparing to client<->server autoconvert

ChangeSet
  1.1494.28.1 03/03/17 10:47:08 bar@bar.mysql.r18.ru +1 -0
  sql_select.cc:
    binary comparing alway must be used, because sort_string() is executed for textual data.

  sql/sql_select.cc
    1.212.1.1 03/03/17 10:46:24 bar@bar.mysql.r18.ru +1 -2
    binary comparing alway must be used, because sort_string() is executed for textual data.

ChangeSet
  1.1494.10.16 03/03/16 19:17:54 monty@narttu.mysql.fi +220 -0
  Merge with 4.0

  sql/sql_table.cc
    1.156 03/03/16 19:17:50 monty@narttu.mysql.fi +1 -0
    Merge with 4.0

  sql/sql_show.cc
    1.115 03/03/16 19:17:50 monty@narttu.mysql.fi +1 -1
    Merge with 4.0

  sql/sql_select.cc
    1.213 03/03/16 19:17:50 monty@narttu.mysql.fi +1 -1
    Merge with 4.0

  sql/sql_parse.cc
    1.271.4.4 03/03/16 19:17:50 monty@narttu.mysql.fi +5 -2
    Merge with 4.0

  sql/sql_insert.cc
    1.86 03/03/16 19:17:50 monty@narttu.mysql.fi +0 -1
    Merge with 4.0

  sql/sql_class.cc
    1.105.1.3 03/03/16 19:17:50 monty@narttu.mysql.fi +11 -9
    Merge with 4.0

  sql/share/russian/errmsg.txt
    1.61.1.5 03/03/16 19:17:50 monty@narttu.mysql.fi +2 -2
    Merge with 4.0

  sql/set_var.cc
    1.30.1.4 03/03/16 19:17:50 monty@narttu.mysql.fi +0 -0
    Merge with 4.0

  sql/mysqld.cc
    1.346 03/03/16 19:17:50 monty@narttu.mysql.fi +1 -5
    Merge with 4.0

  sql/log_event.cc
    1.109 03/03/16 19:17:50 monty@narttu.mysql.fi +1 -1
    Merge with 4.0

  sql/item.h
    1.56.1.7 03/03/16 19:17:50 monty@narttu.mysql.fi +0 -0
    Merge with 4.0

  sql/ha_innodb.cc
    1.85.1.18 03/03/16 19:17:50 monty@narttu.mysql.fi +1 -1
    Merge with 4.0

  sql/gen_lex_hash.cc
    1.55 03/03/16 19:17:50 monty@narttu.mysql.fi +0 -1
    Merge with 4.0

  sql/field.h
    1.62 03/03/16 19:17:50 monty@narttu.mysql.fi +0 -2
    Merge with 4.0

  sql/field.cc
    1.92 03/03/16 19:17:50 monty@narttu.mysql.fi +3 -45
    Merge with 4.0

  mysql-test/t/select.test
    1.18 03/03/16 19:17:50 monty@narttu.mysql.fi +0 -3
    Merge with 4.0

  mysql-test/t/lock_multi.test
    1.5 03/03/16 19:17:50 monty@narttu.mysql.fi +0 -2
    Merge with 4.0

  mysql-test/t/delete.test
    1.10 03/03/16 19:17:50 monty@narttu.mysql.fi +9 -10
    Merge with 4.0

  mysql-test/t/ctype_latin1_de.test
    1.6 03/03/16 19:17:50 monty@narttu.mysql.fi +0 -0
    Merge with 4.0

  mysql-test/t/backup.test
    1.12 03/03/16 19:17:50 monty@narttu.mysql.fi +3 -3
    Merge with 4.0

  mysql-test/t/analyse.test
    1.9 03/03/16 19:17:50 monty@narttu.mysql.fi +0 -1
    Merge with 4.0

  mysql-test/r/type_timestamp.result
    1.9 03/03/16 19:17:50 monty@narttu.mysql.fi +0 -0
    Merge with 4.0

  mysql-test/r/type_datetime.result
    1.13 03/03/16 19:17:50 monty@narttu.mysql.fi +2 -2
    Merge with 4.0

  mysql-test/r/delete.result
    1.9 03/03/16 19:17:50 monty@narttu.mysql.fi +8 -8
    Merge with 4.0

  mysql-test/r/backup.result
    1.9 03/03/16 19:17:50 monty@narttu.mysql.fi +19 -23
    Merge with 4.0

  mysql-test/r/analyse.result
    1.11 03/03/16 19:17:50 monty@narttu.mysql.fi +2 -15
    Merge with 4.0

  mysql-test/mysql-test-run.sh
    1.164 03/03/16 19:17:50 monty@narttu.mysql.fi +1 -1
    Merge with 4.0

  myisam/mi_open.c
    1.62 03/03/16 19:17:50 monty@narttu.mysql.fi +1 -1
    Merge with 4.0

  myisam/mi_check.c
    1.104 03/03/16 19:17:50 monty@narttu.mysql.fi +1 -3
    Merge with 4.0

  libmysqld/lib_sql.cc
    1.50 03/03/16 19:17:50 monty@narttu.mysql.fi +0 -15
    Merge with 4.0

  libmysql/libmysql.c
    1.152 03/03/16 19:17:50 monty@narttu.mysql.fi +0 -26
    Merge with 4.0

  include/Makefile.am
    1.38 03/03/16 19:17:50 monty@narttu.mysql.fi +1 -2
    Merge with 4.0

  configure.in
    1.201.1.26 03/03/16 19:17:50 monty@narttu.mysql.fi +0 -1
    Merge with 4.0

  client/mysqltest.c
    1.92.1.3 03/03/16 19:17:50 monty@narttu.mysql.fi +2 -2
    Merge with 4.0

  VC++Files/strings/strings.dsp
    1.7 03/03/16 19:17:50 monty@narttu.mysql.fi +0 -2
    Merge with 4.0

  VC++Files/sql/mysqld.dsp
    1.11 03/03/16 19:17:50 monty@narttu.mysql.fi +0 -1
    Merge with 4.0

  vio/viosocket.c
    1.17 03/03/16 18:09:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  tests/grant.res
    1.10 03/03/16 18:09:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  support-files/mysql.spec.sh
    1.63 03/03/16 18:09:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  strings/t_ctype.h
    1.7 03/03/16 18:09:04 monty@narttu.mysql.fi +0 -4
    Auto merged

  strings/ctype-tis620.c
    1.39 03/03/16 18:09:04 monty@narttu.mysql.fi +0 -2
    Auto merged

  sql/unireg.h
    1.19 03/03/16 18:09:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/table.cc
    1.73 03/03/16 18:09:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/stacktrace.c
    1.14 03/03/16 18:09:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_update.cc
    1.80 03/03/16 18:09:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_repl.h
    1.28 03/03/16 18:09:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_repl.cc
    1.99 03/03/16 18:09:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_rename.cc
    1.16 03/03/16 18:09:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_class.h
    1.146.1.6 03/03/16 18:09:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.63.1.5 03/03/16 18:09:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql-bench/crash-me.sh
    1.41 03/03/16 18:09:03 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_base.cc
    1.144 03/03/16 18:09:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_analyse.cc
    1.35 03/03/16 18:09:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/slave.h
    1.58 03/03/16 18:09:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/slave.cc
    1.184 03/03/16 18:09:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/repl_failsafe.h
    1.9 03/03/16 18:09:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.24 03/03/16 18:09:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/opt_range.cc
    1.87 03/03/16 18:09:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/net_serv.cc
    1.53 03/03/16 18:09:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.2.4 03/03/16 18:09:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/mf_iocache.cc
    1.26 03/03/16 18:09:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/log_event.h
    1.84 03/03/16 18:09:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/log.cc
    1.106 03/03/16 18:09:02 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/lock.cc
    1.42 03/03/16 18:09:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_func.cc
    1.121.1.2 03/03/16 18:09:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.78 03/03/16 18:09:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item.cc
    1.58.1.4 03/03/16 18:09:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/handler.h
    1.75.1.2 03/03/16 18:09:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/handler.cc
    1.84.1.6 03/03/16 18:09:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.112 03/03/16 18:09:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.h
    1.48.1.2 03/03/16 18:09:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/filesort.cc
    1.70 03/03/16 18:09:01 monty@narttu.mysql.fi +0 -0
    Auto merged

  scripts/mysqld_safe.sh
    1.59 03/03/16 18:09:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  scripts/make_binary_distribution.sh
    1.52 03/03/16 18:09:00 monty@narttu.mysql.fi +0 -1
    Auto merged

  mysys/thr_lock.c
    1.36 03/03/16 18:09:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysys/default.c
    1.23 03/03/16 18:09:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/type_timestamp.test
    1.9 03/03/16 18:09:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/type_datetime.test
    1.9 03/03/16 18:09:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/join.test
    1.17 03/03/16 18:09:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.33 03/03/16 18:09:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/group_by.test
    1.20 03/03/16 18:09:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/func_like.test
    1.8 03/03/16 18:09:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/create.test
    1.21 03/03/16 18:09:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/auto_increment.test
    1.7 03/03/16 18:09:00 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/select.result
    1.25 03/03/16 18:08:59 monty@narttu.mysql.fi +0 -1
    Auto merged

  mysql-test/r/rpl000001.result
    1.23 03/03/16 18:08:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/join.result
    1.20 03/03/16 18:08:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.55 03/03/16 18:08:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/group_by.result
    1.26 03/03/16 18:08:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/create.result
    1.28 03/03/16 18:08:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/Makefile.am
    1.24 03/03/16 18:08:59 monty@narttu.mysql.fi +0 -2
    Auto merged

  myisam/mi_create.c
    1.29 03/03/16 18:08:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  libmysqld/lib_vio.c
    1.17 03/03/16 18:08:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/trx/trx0sys.c
    1.15 03/03/16 18:08:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/srv/srv0start.c
    1.41 03/03/16 18:08:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/row/row0sel.c
    1.31 03/03/16 18:08:59 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/os/os0file.c
    1.47 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/buf/buf0buf.c
    1.22 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/violite.h
    1.29 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/thr_lock.h
    1.13 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/myisam.h
    1.47 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/my_sys.h
    1.94 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/my_global.h
    1.41 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysqlshow.c
    1.29 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -1
    Auto merged

  client/mysqlbinlog.cc
    1.74 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/zlib/zlib.dsp
    1.5 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/vio/vio.dsp
    1.6 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/thr_test/thr_test.dsp
    1.6 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -8
    Auto merged

  VC++Files/thr_insert_test/thr_insert_test.dsp
    1.6 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/test1/test1.dsp
    1.6 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -8
    Auto merged

  VC++Files/strings/strings.dsw
    1.3 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/strings/noMASM/strings.dsw
    1.3 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/strings/noMASM/strings.dsp
    1.4 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/strings/backup/strings.dsw
    1.3 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/strings/backup/strings.dsp
    1.3 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -9
    Auto merged

  VC++Files/strings/MASM6x/strings.dsw
    1.3 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/strings/MASM6x/strings.dsp
    1.3 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -9
    Auto merged

  VC++Files/sql/old/mysqld.dsw
    1.3 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/sql/mysqldmax.dsp
    1.4 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -56
    Auto merged

  VC++Files/sql/mysqld.dsw
    1.3 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/replace/replace.dsp
    1.6 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/regex/regex.dsw
    1.4 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/regex/regex.dsp
    1.4 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/perror/perror.dsp
    1.7 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/pack_isam/pack_isam.dsp
    1.7 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/mysys/mysys.dsw
    1.4 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/mysys/mysys.dsp
    1.11 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -4
    Auto merged

  VC++Files/mysqlwatch/mysqlwatch.dsp
    1.4 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -6
    Auto merged

  VC++Files/mysqlshutdown/mysqlshutdown.dsp
    1.4 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/mysqlshutdown/myshutdown.dsp
    1.4 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/mysqlserver/mysqlserver.dsp
    1.5 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/mysqlmanager/mysqlmanager.dsw
    1.4 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/mysqlmanager/MySqlManager.dsp
    1.7 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/mysqldemb/mysqldemb.dsp
    1.5 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/mysqlcheck/mysqlcheck.dsp
    1.6 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/mysqlbinlog/mysqlbinlog.dsp
    1.9 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/myisampack/myisampack.dsp
    1.5 03/03/16 18:08:58 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/mysql.dsw
    1.7 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/mysql.dsp
    1.4 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -8
    Auto merged

  VC++Files/myisammrg/myisammrg.dsp
    1.6 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/myisamlog/myisamlog.dsp
    1.4 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/myisamchk/myisamchk.dsp
    1.4 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/myisam/myisam.dsp
    1.6 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/my_print_defaults/my_print_defaults.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/merge/merge.dsw
    1.4 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/merge/merge.dsp
    1.5 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/libmysqltest/mytest.dsw
    1.4 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/libmysqltest/myTest.dsp
    1.6 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/libmysqld/libmysqld.dsp
    1.6 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/libmysqld/examples/test_libmysqld.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -6
    Auto merged

  VC++Files/libmysql/libmysql.dsw
    1.4 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/libmysql/libmysql.dsp
    1.11 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/isamchk/isamchk.dsp
    1.4 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/isam/isam.dsw
    1.4 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/isam/isam.dsp
    1.4 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/innobase/innobase.dsp
    1.9 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/heap/heap.dsp
    1.4 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -8
    Auto merged

  VC++Files/dbug/dbug.dsw
    1.4 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/dbug/dbug.dsp
    1.4 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/contrib/minizip/zlibvc.dsw
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/contrib/minizip/zlibvc.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -38
    Auto merged

  VC++Files/contrib/asm386/zlibvc.dsw
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/contrib/asm386/zlibvc.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -38
    Auto merged

  VC++Files/comp_err/comp_err.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -6
    Auto merged

  VC++Files/client/mysqlshow.dsp
    1.6 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/client/mysqlimport.dsp
    1.6 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/client/mysqldump.dsp
    1.6 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -8
    Auto merged

  VC++Files/client/mysqlclient.dsw
    1.4 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/client/mysqlclient.dsp
    1.11 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/client/mysqlcheck.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -6
    Auto merged

  VC++Files/client/mysqladmin.dsp
    1.6 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/client/mysql.dsp
    1.6 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -8
    Auto merged

  VC++Files/bdb/build_win32/excxx_tpcb.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/excxx_mpool.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/excxx_lock.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/excxx_env.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/excxx_btrec.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/excxx_access.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/ex_tpcb.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/ex_mpool.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/ex_lock.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/ex_env.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/ex_btrec.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/ex_access.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/db_verify.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/db_upgrade.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/db_test.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/db_tcl.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/db_static1.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -8
    Auto merged

  VC++Files/bdb/build_win32/db_static.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/db_stat.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/db_recover.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/db_printlog.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/db_load.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/db_java.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -29
    Auto merged

  VC++Files/bdb/build_win32/db_dump.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/db_dll.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/db_deadlock.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/db_checkpoint.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/db_buildall.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -8
    Auto merged

  VC++Files/bdb/build_win32/db_archive.dsp
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -7
    Auto merged

  VC++Files/bdb/build_win32/Berkeley_DB.dsw
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  VC++Files/bdb/bdb.dsp
    1.5 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  Docs/internals.texi
    1.26 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -1
    Auto merged

  BitKeeper/deleted/.del-netware.patch~f70a3a965f54d9ee
    1.3 03/03/16 18:08:57 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-mwldnlm~efb26c57cba3c980
    1.3 03/03/16 18:08:56 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-mwldnlm~efb26c57cba3c980
    1.1.1.4 03/03/16 18:08:56 monty@narttu.mysql.fi +0 -0
    Change mode to -rw-rw-r--

  BitKeeper/deleted/.del-mwccnlm~be63afd25a14c3f
    1.3 03/03/16 18:08:55 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-mwenv~35c8b56062f4b6aa
    1.4 03/03/16 18:08:55 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-mwccnlm~be63afd25a14c3f
    1.1.1.4 03/03/16 18:08:55 monty@narttu.mysql.fi +0 -0
    Change mode to -rw-rw-r--

  BitKeeper/deleted/.del-mwasmnlm~bc5746809d67feb5
    1.3 03/03/16 18:08:53 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-mwasmnlm~bc5746809d67feb5
    1.1.1.4 03/03/16 18:08:53 monty@narttu.mysql.fi +0 -0
    Change mode to -rw-rw-r--

  BitKeeper/deleted/.del-compile-netware-debug
    1.3 03/03/16 18:08:37 monty@narttu.mysql.fi +0 -0
    Delete: netware/BUILD/compile-netware-debug

  BitKeeper/deleted/.del-compile-netware-all
    1.3 03/03/16 18:08:35 monty@narttu.mysql.fi +0 -0
    Delete: netware/BUILD/compile-netware-all

  BitKeeper/deleted/.del-compile-netware-START
    1.3 03/03/16 18:08:34 monty@narttu.mysql.fi +0 -0
    Delete: netware/BUILD/compile-netware-START

  BitKeeper/deleted/.del-compile-netware-END
    1.3 03/03/16 18:08:31 monty@narttu.mysql.fi +0 -0
    Delete: netware/BUILD/compile-netware-END

  BitKeeper/deleted/.del-compile-linux-tools
    1.3 03/03/16 18:08:21 monty@narttu.mysql.fi +0 -0
    Delete: netware/BUILD/compile-linux-tools

  BitKeeper/deleted/.del-compile-AUTOTOOLS
    1.3 03/03/16 18:08:12 monty@narttu.mysql.fi +0 -0
    Delete: netware/BUILD/compile-AUTOTOOLS

  BitKeeper/deleted/.del-mwldnlm~efb26c57cba3c980
    1.1.1.3 03/03/16 18:08:06 monty@narttu.mysql.fi +0 -0
    Merge rename: netware/BUILD/mwldnlm -> BitKeeper/deleted/.del-mwldnlm~efb26c57cba3c980

  BitKeeper/deleted/.del-mwccnlm~be63afd25a14c3f
    1.1.1.3 03/03/16 18:08:02 monty@narttu.mysql.fi +0 -0
    Merge rename: netware/BUILD/mwccnlm -> BitKeeper/deleted/.del-mwccnlm~be63afd25a14c3f

  BitKeeper/deleted/.del-nwbootstrap
    1.4 03/03/16 18:07:52 monty@narttu.mysql.fi +0 -0
    Delete: netware/BUILD/nwbootstrap

  BitKeeper/deleted/.del-mwenv
    1.4 03/03/16 18:07:46 monty@narttu.mysql.fi +0 -0
    Delete: netware/BUILD/mwenv

  BitKeeper/deleted/.del-compile-netware-standard
    1.3 03/03/16 18:05:56 monty@narttu.mysql.fi +0 -0
    Delete: netware/BUILD/compile-netware-standard

  BitKeeper/deleted/.del-mwasmnlm~bc5746809d67feb5
    1.1.1.3 03/03/16 18:05:41 monty@narttu.mysql.fi +0 -0
    Merge rename: netware/BUILD/mwasmnlm -> BitKeeper/deleted/.del-mwasmnlm~bc5746809d67feb5

  BitKeeper/etc/logging_ok
    1.233.1.7 03/03/16 18:05:13 monty@narttu.mysql.fi +0 -3
    auto-union

  BitKeeper/etc/ignore
    1.147 03/03/16 18:05:13 monty@narttu.mysql.fi +0 -8
    auto-union

ChangeSet
  1.1494.10.15 03/03/16 16:34:55 monty@mashka.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mashka.mysql.fi:/home/my/mysql-4.1

  sql/mysqld.cc
    1.345 03/03/16 16:34:52 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.154.3 03/03/16 16:28:30 monty@mashka.mysql.fi +3 -0
  Write binlog before commit when doing INSERT ... SELECT

  sql/sql_update.cc
    1.54.1.24 03/03/16 16:28:28 monty@mashka.mysql.fi +12 -1
    Added comment

  sql/sql_insert.cc
    1.63.1.32 03/03/16 16:28:28 monty@mashka.mysql.fi +8 -6
    Write binlog before commit

  mysql-test/r/create.result
    1.12.1.4 03/03/16 16:28:28 monty@mashka.mysql.fi +7 -0
    After merge fix

ChangeSet
  1.1494.10.14 03/03/16 17:19:24 mysql@home.(none) +7 -0
  New function my_charset_same()

  BitKeeper/etc/logging_ok
    1.233.1.6 03/03/16 17:19:12 mysql@home.(none) +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_yacc.yy
    1.203.30.3 03/03/16 17:19:00 mysql@home.(none) +3 -3
    New function my_charset_same()

  sql/item_strfunc.cc
    1.84 03/03/16 17:19:00 mysql@home.(none) +1 -1
    New function my_charset_same()

  sql/item_func.cc
    1.121.1.1 03/03/16 17:19:00 mysql@home.(none) +1 -1
    New function my_charset_same()

  mysys/charset.c
    1.79 03/03/16 17:19:00 mysql@home.(none) +4 -0
    New function my_charset_same()

  include/my_sys.h
    1.93 03/03/16 17:18:59 mysql@home.(none) +1 -0
    New function my_charset_same()

  include/m_ctype.h
    1.63 03/03/16 17:18:59 mysql@home.(none) +1 -0
    New function my_charset_same()

ChangeSet
  1.676.290.3 03/03/16 14:40:41 heikki@hundin.mysql.fi +1 -0
  row0mysql.c:
    Test if merging from 3.23 to 4.0 succeeds

  innobase/row/row0mysql.c
    1.16.1.24 03/03/16 14:40:27 heikki@hundin.mysql.fi +1 -1
    Test if merging from 3.23 to 4.0 succeeds

ChangeSet
  1.1494.10.13 03/03/16 12:30:10 root@home.(none) +14 -0
  system_charset_info has been moved to /sql directory
  and isn't used in libraries any longer

  tools/mysqlmanager.c
    1.36 03/03/16 12:30:04 root@home.(none) +13 -11
    system_charset_info has been moved to /sql directory
    and isn't used in libraries any longer

  sql/sql_string.cc
    1.50 03/03/16 12:30:03 root@home.(none) +1 -0
    system_charset_info has been moved to /sql directory
    and isn't used in libraries any longer

  mysys/typelib.c
    1.10 03/03/16 12:30:02 root@home.(none) +2 -2
    system_charset_info has been moved to /sql directory
    and isn't used in libraries any longer

  mysys/my_init.c
    1.28 03/03/16 12:30:01 root@home.(none) +1 -1
    system_charset_info has been moved to /sql directory
    and isn't used in libraries any longer

  mysys/my_getwd.c
    1.10 03/03/16 12:29:59 root@home.(none) +1 -1
    system_charset_info has been moved to /sql directory
    and isn't used in libraries any longer

  mysys/my_error.c
    1.13 03/03/16 12:29:59 root@home.(none) +1 -1
    system_charset_info has been moved to /sql directory
    and isn't used in libraries any longer

  mysys/mf_iocache2.c
    1.23 03/03/16 12:29:58 root@home.(none) +1 -1
    system_charset_info has been moved to /sql directory
    and isn't used in libraries any longer

  mysys/default.c
    1.22 03/03/16 12:29:57 root@home.(none) +5 -5
    system_charset_info has been moved to /sql directory
    and isn't used in libraries any longer

  mysys/charset.c
    1.78 03/03/16 12:29:56 root@home.(none) +0 -1
    system_charset_info has been moved to /sql directory
    and isn't used in libraries any longer

  libmysql/libmysql.c
    1.151 03/03/16 12:29:55 root@home.(none) +10 -10
    system_charset_info has been moved to /sql directory
    and isn't used in libraries any longer

  extra/resolveip.c
    1.17 03/03/16 12:29:55 root@home.(none) +1 -1
    system_charset_info has been moved to /sql directory
    and isn't used in libraries any longer

  extra/resolve_stack_dump.c
    1.12 03/03/16 12:29:54 root@home.(none) +5 -5
    system_charset_info has been moved to /sql directory
    and isn't used in libraries any longer

  extra/replace.c
    1.13 03/03/16 12:29:52 root@home.(none) +1 -1
    system_charset_info has been moved to /sql directory
    and isn't used in libraries any longer

  extra/mysql_install.c
    1.5 03/03/16 12:29:47 root@home.(none) +1 -1
    system_charset_info has been moved to /sql directory
    and isn't used in libraries any longer

ChangeSet
  1.1494.10.12 03/03/16 11:20:45 root@home.(none) +5 -0
  mysqltest.c, mysqlimport.c, mysqldump.c, mysqlcheck.c, mysql.cc:
    system_charset_info was removed

  client/mysqltest.c
    1.92.1.2 03/03/16 11:20:23 root@home.(none) +25 -24
    system_charset_info was removed

  client/mysqlimport.c
    1.33 03/03/16 11:20:22 root@home.(none) +5 -6
    system_charset_info was removed

  client/mysqldump.c
    1.82 03/03/16 11:20:20 root@home.(none) +10 -11
    system_charset_info was removed

  client/mysqlcheck.c
    1.29 03/03/16 11:20:18 root@home.(none) +4 -6
    system_charset_info was removed

  client/mysql.cc
    1.121 03/03/16 11:20:04 root@home.(none) +38 -39
    system_charset_info was removed

ChangeSet
  1.1346.133.48 03/03/16 09:01:47 heikki@hundin.mysql.fi +1 -0
  trx0roll.c:
    Fix compiler warning in Windows about ib_longlong to ulint conversion

  innobase/trx/trx0roll.c
    1.9 03/03/16 09:01:36 heikki@hundin.mysql.fi +3 -3
    Fix compiler warning in Windows about ib_longlong to ulint conversion

ChangeSet
  1.1494.10.11 03/03/16 10:56:14 root@home.(none) +14 -0
  set_default_charset() is not used anymore
  Some system_charset_info were removed

  BitKeeper/etc/logging_ok
    1.233.1.5 03/03/16 10:56:10 root@home.(none) +1 -0
    Logging to logging@openlogging.org accepted

  sql/mysqld.cc
    1.342.1.3 03/03/16 10:55:18 root@home.(none) +2 -1
    set_default_charset() is not used anymore
    Some system_charset_info were removed

  mysys/test_charset.c
    1.16 03/03/16 10:55:17 root@home.(none) +3 -2
    set_default_charset() is not used anymore
    Some system_charset_info were removed

  mysys/charset2html.c
    1.3 03/03/16 10:55:16 root@home.(none) +3 -2
    set_default_charset() is not used anymore
    Some system_charset_info were removed

  mysys/charset.c
    1.77 03/03/16 10:55:15 root@home.(none) +0 -37
    set_default_charset() is not used anymore
    Some system_charset_info were removed

  isam/isamchk.c
    1.22 03/03/16 10:55:13 root@home.(none) +1 -1
    set_default_charset() is not used anymore
    Some system_charset_info were removed

  include/my_sys.h
    1.92 03/03/16 10:55:12 root@home.(none) +0 -2
    set_default_charset() is not used anymore
    Some system_charset_info were removed

  heap/hp_test2.c
    1.19 03/03/16 10:55:09 root@home.(none) +6 -5
    set_default_charset() is not used anymore
    Some system_charset_info were removed

  heap/hp_test1.c
    1.13 03/03/16 10:55:08 root@home.(none) +1 -1
    set_default_charset() is not used anymore
    Some system_charset_info were removed

  client/sql_string.h
    1.10 03/03/16 10:55:04 root@home.(none) +2 -2
    set_default_charset() is not used anymore
    Some system_charset_info were removed

  client/mysqlimport.c
    1.32 03/03/16 10:55:03 root@home.(none) +1 -1
    set_default_charset() is not used anymore
    Some system_charset_info were removed

  client/mysqldump.c
    1.81 03/03/16 10:55:01 root@home.(none) +1 -1
    set_default_charset() is not used anymore
    Some system_charset_info were removed

  client/mysqlcheck.c
    1.28 03/03/16 10:55:00 root@home.(none) +1 -1
    set_default_charset() is not used anymore
    Some system_charset_info were removed

  client/mysql.cc
    1.120 03/03/16 10:54:57 root@home.(none) +1 -1
    set_default_charset() is not used anymore
    Some system_charset_info were removed

ChangeSet
  1.676.290.2 03/03/15 20:05:55 heikki@hundin.mysql.fi +1 -0
  row0sel.c:
    Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal

  innobase/row/row0sel.c
    1.15.1.7 03/03/15 20:05:47 heikki@hundin.mysql.fi +7 -12
    Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal

ChangeSet
  1.1346.133.47 03/03/15 20:05:03 heikki@hundin.mysql.fi +1 -0
  row0sel.c:
    Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal

  innobase/row/row0sel.c
    1.28.1.2 03/03/15 20:04:54 heikki@hundin.mysql.fi +7 -12
    Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal

ChangeSet
  1.1346.133.46 03/03/15 18:42:55 lenz@mysql.com +2 -0
   - fixed C++-style comments to make IBM C compiler happy

  strings/t_ctype.h
    1.5.1.1 03/03/15 18:42:53 lenz@mysql.com +4 -4
     - fixed C++-style comments to make IBM C compiler happy

  client/mysqlshow.c
    1.25.1.1 03/03/15 18:42:53 lenz@mysql.com +1 -1
     - fixed C++-style comment to make IBM C compiler happy

ChangeSet
  1.1494.27.2 03/03/15 17:24:21 bar@bar.mysql.r18.ru +2 -0
  sql_parse.cc, sql_db.cc:
    less system_charset_info

  sql/sql_parse.cc
    1.271.4.3 03/03/15 17:23:56 bar@bar.mysql.r18.ru +4 -4
    less system_charset_info

  sql/sql_db.cc
    1.66 03/03/15 17:23:38 bar@bar.mysql.r18.ru +4 -4
    less system_charset_info

ChangeSet
  1.1494.10.9 03/03/15 14:16:57 bell@sanja.is.com.ua +4 -0
  Merge

  mysql-test/t/subselect.test
    1.58 03/03/15 14:16:55 bell@sanja.is.com.ua +0 -0
    SCCS merged

  mysql-test/r/subselect.result
    1.67 03/03/15 14:16:55 bell@sanja.is.com.ua +0 -0
    SCCS merged

  sql/sql_select.cc
    1.212 03/03/15 14:12:30 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.cc
    1.59 03/03/15 14:12:29 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.676.290.1 03/03/15 12:35:09 lenz@mysql.com +1 -0
   - tagged ChangeSet 1.1358 as mysql-3.23.56
   - bumped up version number to 3.23.57 in configure.in

  configure.in
    1.124.1.84 03/03/15 12:35:07 lenz@mysql.com +1 -1
     - tagged ChangeSet 1.1358 as mysql-3.23.56
     - bumped up version number to 3.23.57 in configure.in

ChangeSet
  1.1494.27.1 03/03/15 15:19:06 bar@bar.mysql.r18.ru +1 -0
  sql_lex.cc:
    Use LEX charset instead of system one

  sql/sql_lex.cc
    1.76.2.3 03/03/15 15:18:40 bar@bar.mysql.r18.ru +5 -4
    Use LEX charset instead of system one

ChangeSet
  1.1494.23.5 03/03/15 11:56:03 serg@serg.mysql.com +1 -0
  fixed typo (double ++ in assert)
  removed all side effects from asserts for not to confuse casual reader

  sql/protocol.cc
    1.49 03/03/15 11:56:00 serg@serg.mysql.com +20 -12
    fixed typo (double ++ in assert)
    removed all side effects from asserts for not to confuse casual reader

ChangeSet
  1.1494.26.1 03/03/15 11:24:44 bell@sanja.is.com.ua +2 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1

  sql/item_subselect.cc
    1.58 03/03/15 11:24:42 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.63.2.1 03/03/15 11:24:42 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.154.2 03/03/15 04:41:57 monty@mashka.mysql.fi +8 -0
  merge with 3.23 to get:
  - Fix for empty table/column names

  tests/grant.res
    1.7.1.2 03/03/15 04:41:55 monty@mashka.mysql.fi +2 -2
    merge with 3.23

  sql/sql_table.cc
    1.112.1.40 03/03/15 04:41:55 monty@mashka.mysql.fi +0 -0
    merge with 3.23

  sql/filesort.cc
    1.45.1.9 03/03/15 04:41:54 monty@mashka.mysql.fi +2 -3
    merge with 3.23

  tests/grant.pl
    1.11 03/03/15 04:34:40 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/table.cc
    1.46.1.17 03/03/15 04:34:40 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.73.1.88 03/03/15 04:34:39 monty@mashka.mysql.fi +0 -10
    Auto merged

  sql/sql_parse.cc
    1.218.1.82 03/03/15 04:34:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.45.23.2 03/03/15 04:34:39 monty@mashka.mysql.fi +0 -0
    Merge rename: sql/ha_innobase.cc -> sql/ha_innodb.cc

  mysql-test/t/create.test
    1.11.1.3 03/03/15 04:34:39 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.154.1 03/03/15 04:34:06 monty@mashka.mysql.fi +1 -0
  Code cleanup

  sql/sql_parse.cc
    1.218.1.81 03/03/15 04:34:03 monty@mashka.mysql.fi +0 -5
    Removed not needed test

ChangeSet
  1.676.1.685 03/03/14 23:06:55 monty@mashka.mysql.fi +1 -0
  Code cleanup

  sql/filesort.cc
    1.30.1.4 03/03/14 23:06:54 monty@mashka.mysql.fi +6 -10
    Code cleanup

ChangeSet
  1.1494.23.4 03/03/14 20:25:50 serg@serg.mysql.com +3 -0
  Merge bk-internal:/home/bk/mysql-4.1/
  into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1

  strings/ctype-bin.c
    1.26 03/03/14 20:25:46 serg@serg.mysql.com +0 -0
    Auto merged

  sql/sql_select.h
    1.41 03/03/14 20:25:46 serg@serg.mysql.com +0 -0
    Auto merged

  sql/sql_select.cc
    1.210.1.1 03/03/14 20:25:46 serg@serg.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1494.9.3 03/03/14 20:22:06 serg@serg.mysql.com +3 -0
  cleanup

  sql/sql_select.h
    1.39.1.1 03/03/14 20:22:03 serg@serg.mysql.com +1 -2
    cleanup

  sql/sql_select.cc
    1.208.1.1 03/03/14 20:22:03 serg@serg.mysql.com +5 -9
    cleanup

  sql/key.cc
    1.19 03/03/14 20:22:03 serg@serg.mysql.com +1 -1
    cleanup

ChangeSet
  1.1494.25.1 03/03/14 10:35:13 venu@myvenu.com +1 -0
  Fix for not to assert in DBUG mode when the result type is INT24 as data is sent in INT32 format 
  (normal protocol only, prepared protocol already handles it)

  sql/protocol.cc
    1.48 03/03/14 10:33:03 venu@myvenu.com +3 -1
    Fix for not to assert in DBUG mode when the result type is INT24 as data is sent in INT32 format 

ChangeSet
  1.676.289.1 03/03/14 17:08:42 monty@mashka.mysql.fi +6 -0
  Check for empty table/column names

  tests/grant.res
    1.3.1.3 03/03/14 17:08:40 monty@mashka.mysql.fi +5 -0
    More tests

  tests/grant.pl
    1.4.1.3 03/03/14 17:08:40 monty@mashka.mysql.fi +10 -0
    More tests

  sql/table.cc
    1.39.1.9 03/03/14 17:08:40 monty@mashka.mysql.fi +6 -1
    Check for empty table/column names

  sql/sql_table.cc
    1.83.1.30 03/03/14 17:08:40 monty@mashka.mysql.fi +5 -7
    Check for empty table/column names

  sql/sql_parse.cc
    1.120.2.36 03/03/14 17:08:40 monty@mashka.mysql.fi +1 -2
    Check for empty table/column names

  mysql-test/t/create.test
    1.4.1.2 03/03/14 17:08:40 monty@mashka.mysql.fi +8 -0
    Test for empty table/column name

ChangeSet
  1.1346.153.1 03/03/14 16:07:15 guilhem@mysql.com +1 -0
  Small fixes in mysql_tableinfo. It's only code tiny changes, does not modify
  the output of the script.

  scripts/mysql_tableinfo.sh
    1.2 03/03/14 16:07:11 guilhem@mysql.com +56 -58
    Small fixes in this program which I contributed some time ago. These fixes
    are waiting in Monty's mailbox since August, and there are tiny :
    * use array{'x'} instead of array{x}
    * use fetchrow_arrayref instead of fetchrow_array
    * try to hide the command-line options from 'ps' like mysqlhotcopy does
    * use 'map' instead of homegrown function
    * use $_ instead of $i when possible

ChangeSet
  1.1494.15.4 03/03/14 17:03:42 monty@mashka.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mashka.mysql.fi:/home/my/mysql-4.1

  sql/mysqld.cc
    1.344 03/03/14 17:03:37 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1494.23.2 03/03/14 18:11:20 bar@bar.mysql.r18.ru +1 -0
  Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
  into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

  sql/sql_lex.h
    1.102.7.3 03/03/14 18:11:18 bar@bar.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1494.24.1 03/03/14 18:08:12 bar@bar.mysql.r18.ru +19 -0
  Every charset now have its own parser state arrays

  strings/ctype-win1250ch.c
    1.20 03/03/14 18:08:09 bar@bar.mysql.r18.ru +1 -0
    Every charset now have its own parser state arrays

  strings/ctype-utf8.c
    1.36 03/03/14 18:08:09 bar@bar.mysql.r18.ru +2 -0
    Every charset now have its own parser state arrays

  strings/ctype-ujis.c
    1.32 03/03/14 18:08:09 bar@bar.mysql.r18.ru +1 -0
    Every charset now have its own parser state arrays

  strings/ctype-tis620.c
    1.38 03/03/14 18:08:09 bar@bar.mysql.r18.ru +1 -0
    Every charset now have its own parser state arrays

  strings/ctype-sjis.c
    1.39 03/03/14 18:08:09 bar@bar.mysql.r18.ru +1 -0
    Every charset now have its own parser state arrays

  strings/ctype-latin1_de.c
    1.29 03/03/14 18:08:09 bar@bar.mysql.r18.ru +1 -0
    Every charset now have its own parser state arrays

  strings/ctype-latin1.c
    1.6 03/03/14 18:08:09 bar@bar.mysql.r18.ru +1 -0
    Every charset now have its own parser state arrays

  strings/ctype-gbk.c
    1.34 03/03/14 18:08:09 bar@bar.mysql.r18.ru +1 -0
    Every charset now have its own parser state arrays

  strings/ctype-gb2312.c
    1.30 03/03/14 18:08:09 bar@bar.mysql.r18.ru +1 -0
    Every charset now have its own parser state arrays

  strings/ctype-extra.c
    1.6 03/03/14 18:08:09 bar@bar.mysql.r18.ru +24 -0
    Every charset now have its own parser state arrays

  strings/ctype-euc_kr.c
    1.32 03/03/14 18:08:09 bar@bar.mysql.r18.ru +1 -0
    Every charset now have its own parser state arrays

  strings/ctype-czech.c
    1.32 03/03/14 18:08:09 bar@bar.mysql.r18.ru +1 -0
    Every charset now have its own parser state arrays

  strings/ctype-bin.c
    1.25 03/03/14 18:08:09 bar@bar.mysql.r18.ru +1 -0
    Every charset now have its own parser state arrays

  strings/ctype-big5.c
    1.34 03/03/14 18:08:09 bar@bar.mysql.r18.ru +1 -0
    Every charset now have its own parser state arrays

  sql/sql_yacc.yy
    1.203.30.2 03/03/14 18:08:09 bar@bar.mysql.r18.ru +3 -3
    Every charset now have its own parser state arrays

  sql/sql_lex.h
    1.102.8.1 03/03/14 18:08:09 bar@bar.mysql.r18.ru +1 -14
    Every charset now have its own parser state arrays

  sql/sql_lex.cc
    1.76.2.2 03/03/14 18:08:09 bar@bar.mysql.r18.ru +127 -174
    Every charset now have its own parser state arrays

  mysys/charset.c
    1.76 03/03/14 18:08:09 bar@bar.mysql.r18.ru +63 -1
    Every charset now have its own parser state arrays

  include/m_ctype.h
    1.62 03/03/14 18:08:09 bar@bar.mysql.r18.ru +18 -0
    Every charset now have its own parser state arrays

ChangeSet
  1.1346.133.44 03/03/14 14:17:56 lenz@mysql.com +1 -0
   - we need to require an installation on the root volume (/usr/local/mysql)

  support-files/MacOSX/Info.plist.sh
    1.2 03/03/14 14:17:18 lenz@mysql.com +1 -1
     - we need to require an installation on the root volume (/usr/local/mysql)

ChangeSet
  1.1494.23.1 03/03/14 14:16:09 bell@sanja.is.com.ua +3 -0
  fixed uncachable union (bug #150)

  sql/sql_lex.h
    1.102.7.2 03/03/14 14:16:00 bell@sanja.is.com.ua +6 -4
    fixed uncachable union

  mysql-test/t/union.test
    1.35 03/03/14 14:16:00 bell@sanja.is.com.ua +2 -0
    sect of uncachable union

  mysql-test/r/union.result
    1.35 03/03/14 14:16:00 bell@sanja.is.com.ua +4 -0
    sect of uncachable union

ChangeSet
  1.1494.19.5 03/03/14 13:12:04 hf@genie.(none) +1 -0
  Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into genie.(none):/home/hf/work/mysql-4.1.lck

  sql/item_func.cc
    1.122 03/03/14 13:12:01 hf@genie.(none) +0 -0
    Auto merged

ChangeSet
  1.1494.22.1 03/03/14 13:10:33 hf@genie.(none) +5 -0
  SCRUM
  IS_USED_LOCK('lock') implementation

  sql/lex.h
    1.82.1.20 03/03/14 13:10:27 hf@genie.(none) +1 -0
    IS_USED_LOCK function added to the SQL

  sql/item_func.h
    1.68.1.5 03/03/14 13:10:27 hf@genie.(none) +10 -0
    class Item_func_is_used_lock added

  sql/item_func.cc
    1.120.1.1 03/03/14 13:10:27 hf@genie.(none) +26 -2
    thread_id member added to the ULL class

  sql/item_create.h
    1.21 03/03/14 13:10:27 hf@genie.(none) +1 -0
    create_func_is_used_lock declaration

  sql/item_create.cc
    1.29 03/03/14 13:10:27 hf@genie.(none) +6 -0
    create_func_is_used_lock implementation

ChangeSet
  1.676.1.683 03/03/13 23:10:50 heikki@hundin.mysql.fi +1 -0
  ha_innobase.cc:
    Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range

  sql/ha_innobase.cc
    1.45.23.1 03/03/13 23:10:38 heikki@hundin.mysql.fi +10 -0
    Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range

ChangeSet
  1.1346.133.43 03/03/13 23:09:25 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range

  sql/ha_innodb.cc
    1.73.1.87 03/03/13 23:09:16 heikki@hundin.mysql.fi +10 -0
    Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range

ChangeSet
  1.1346.152.1 03/03/13 18:51:50 serg@serg.mysql.com +1 -0
  Merge

  sql/filesort.cc
    1.45.1.8 03/03/13 18:51:48 serg@serg.mysql.com +0 -0
    SCCS merged

ChangeSet
  1.676.1.682 03/03/13 18:46:40 serg@serg.mysql.com +1 -0
  fix for crash with small sort_buffer

  sql/filesort.cc
    1.30.1.3 03/03/13 18:46:38 serg@serg.mysql.com +5 -0
    fix for crash with small sort_buffer

ChangeSet
  1.1346.151.2 03/03/13 18:16:47 lenz@mysql.com +1 -0
   - added option "--skip-disk-image" and short form "-s" in addition to the
     already existing "--skip-dmg" (per Monty request)
   - Fixed handling of license files

  Build-tools/Do-pkg
    1.4 03/03/13 18:16:45 lenz@mysql.com +9 -7
     - added option "--skip-disk-image" and short form "-s" in addition to the
       already existing "--skip-dmg" (per Monty request)
     - Fixed handling of license files

ChangeSet
  1.1346.133.40 03/03/13 17:57:24 serg@serg.mysql.com +3 -0
  merged

  tests/grant.pl
    1.10 03/03/13 17:57:22 serg@serg.mysql.com +1 -5
    merged

  tests/grant.res
    1.7.1.1 03/03/13 17:52:54 serg@serg.mysql.com +0 -2
    Auto merged

  sql/sql_base.cc
    1.117.1.38 03/03/13 17:52:53 serg@serg.mysql.com +0 -0
    Auto merged

ChangeSet
  1.676.1.681 03/03/13 16:43:43 monty@mashka.mysql.fi +3 -0
  Better fix for GRANT bug

  tests/grant.res
    1.3.1.2 03/03/13 16:43:42 monty@mashka.mysql.fi +7 -7
    new test results

  tests/grant.pl
    1.4.1.2 03/03/13 16:43:42 monty@mashka.mysql.fi +33 -22
    More options for test

  sql/sql_base.cc
    1.74.1.30 03/03/13 16:43:42 monty@mashka.mysql.fi +5 -2
    Better fix for GRANT bug

ChangeSet
  1.1346.133.38 03/03/13 14:40:13 serg@serg.mysql.com +2 -0
  make test result more obvious

  mysql-test/t/select.test
    1.12.1.6 03/03/13 14:40:11 serg@serg.mysql.com +1 -1
    make test result more obvious

  mysql-test/r/select.result
    1.8.1.17 03/03/13 14:40:11 serg@serg.mysql.com +2 -1
    make test result more obvious

ChangeSet
  1.1346.133.37 03/03/13 14:34:07 serg@serg.mysql.com +3 -0
  test result updated after merge

  mysql-test/r/select.result
    1.8.1.16 03/03/13 14:34:04 serg@serg.mysql.com +11 -2
    test result updated after merge

  mysql-test/r/group_by.result
    1.16.1.11 03/03/13 14:34:04 serg@serg.mysql.com +5 -0
    test result updated after merge

  mysql-test/r/analyse.result
    1.4.1.2 03/03/13 14:34:04 serg@serg.mysql.com +15 -2
    test result updated after merge

ChangeSet
  1.1346.151.1 03/03/13 13:52:15 lenz@mysql.com +1 -0
   - fixed newly added DBUG_RETURN to DBUG_VOID_RETURN (compile failed with
     "DBUG_RETURN undeclared" on Mac OS X)

  sql/sql_class.cc
    1.71.1.30 03/03/13 13:52:14 lenz@mysql.com +1 -1
     - fixed newly added DBUG_RETURN to DBUG_VOID_RETURN (compile failed with
       "DBUG_RETURN undeclared" on Mac OS X)

ChangeSet
  1.1346.133.36 03/03/13 13:44:03 serg@serg.mysql.com +17 -0
  merged

  sql/sql_base.cc
    1.117.1.37 03/03/13 13:44:00 serg@serg.mysql.com +0 -4
    merged

  sql/sql_analyse.cc
    1.12.1.6 03/03/13 13:44:00 serg@serg.mysql.com +0 -11
    merged

  sql/net_serv.cc
    1.46.1.7 03/03/13 13:44:00 serg@serg.mysql.com +0 -1
    merged

  sql/item.h
    1.20.1.17 03/03/13 13:44:00 serg@serg.mysql.com +0 -0
    merged

  mysql-test/t/select.test
    1.12.1.5 03/03/13 13:44:00 serg@serg.mysql.com +11 -10
    merged

  mysql-test/t/group_by.test
    1.13.1.5 03/03/13 13:44:00 serg@serg.mysql.com +2 -1
    merged

  mysql-test/t/analyse.test
    1.4.1.1 03/03/13 13:44:00 serg@serg.mysql.com +1 -0
    merged

  mysql-test/r/select.result
    1.8.1.15 03/03/13 13:44:00 serg@serg.mysql.com +0 -1
    ul

  mysql-test/r/group_by.result
    1.16.1.10 03/03/13 13:44:00 serg@serg.mysql.com +0 -1
    ul

  mysql-test/r/analyse.result
    1.4.1.1 03/03/13 13:44:00 serg@serg.mysql.com +0 -12
    ul

ChangeSet
  1.1494.21.2 03/03/13 16:23:18 bar@bar.mysql.r18.ru +1 -0
  sql_lex.cc:
    Move all charset recoding to the same place

  sql/sql_lex.cc
    1.76.2.1 03/03/13 16:22:37 bar@bar.mysql.r18.ru +2 -2
    Move all charset recoding to the same place

  strings/ctype-tis620.c
    1.16.1.2 03/03/13 12:42:45 serg@serg.mysql.com +0 -15
    Auto merged

  sql/sql_select.cc
    1.152.1.76 03/03/13 12:42:44 serg@serg.mysql.com +0 -0
    Auto merged

  sql/item.cc
    1.19.1.8 03/03/13 12:42:44 serg@serg.mysql.com +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.92.1.28 03/03/13 12:42:44 serg@serg.mysql.com +0 -1
    Auto merged

  sql/gen_lex_hash.cc
    1.47.1.10 03/03/13 12:42:44 serg@serg.mysql.com +0 -0
    Auto merged

  scripts/mysqld_safe.sh
    1.56.1.3 03/03/13 12:42:44 serg@serg.mysql.com +0 -0
    Auto merged

  mysql-test/r/select.result
    1.2.2.2 03/03/13 12:42:44 serg@serg.mysql.com +0 -0
    Turn off SCCS flag

  man/perror.1
    1.5 03/03/13 12:42:43 serg@serg.mysql.com +0 -0
    Auto merged

  man/perror.1
    1.1.2.2 03/03/13 12:42:43 serg@serg.mysql.com +0 -0
    Change mode to -rw-rw-r--

  scripts/mysqld_safe.sh
    1.39.10.2 03/03/13 12:42:15 serg@serg.mysql.com +0 -0
    Merge rename: scripts/safe_mysqld.sh -> scripts/mysqld_safe.sh

ChangeSet
  1.1494.21.1 03/03/13 15:34:46 bar@bar.mysql.r18.ru +5 -0
  filesort.cc, sql_analyse.cc, item_func.cc, item_strfunc.cc, field.cc:
    Unnesessary binary() calls have been removed

  sql/filesort.cc
    1.69 03/03/13 15:34:35 bar@bar.mysql.r18.ru +12 -19
    Unnesessary binary() calls have been removed

  sql/sql_analyse.cc
    1.34 03/03/13 15:34:34 bar@bar.mysql.r18.ru +4 -4
    Unnesessary binary() calls have been removed

  sql/item_func.cc
    1.121 03/03/13 15:34:32 bar@bar.mysql.r18.ru +2 -2
    Unnesessary binary() calls have been removed

  sql/item_strfunc.cc
    1.83 03/03/13 15:34:29 bar@bar.mysql.r18.ru +5 -5
    Unnesessary binary() calls have been removed

  sql/field.cc
    1.91 03/03/13 15:34:04 bar@bar.mysql.r18.ru +1 -1
    Unnesessary binary() calls have been removed

ChangeSet
  1.1346.133.35 03/03/13 12:20:29 serg@serg.mysql.com +1 -0
  texinfo syntax cleanup. 4.1 protocol sections are still too broken for this file to be compiled :(

  Docs/internals.texi
    1.22.1.2 03/03/13 12:20:27 serg@serg.mysql.com +87 -22
    texinfo syntax cleanup. 4.1 protocol sections are still too broken for this file to be compiled :(

ChangeSet
  1.1346.133.34 03/03/13 11:23:34 serg@serg.mysql.com +1 -0
  Merge bk-internal:/home/bk/mysql-4.0/
  into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

  sql/mysqld.cc
    1.297.1.110 03/03/13 11:23:30 serg@serg.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1494.20.1 03/03/13 14:12:28 gluh@gluh.mysql.r18.ru +3 -0
  Fix for embeded library compile

  sql/sql_parse.cc
    1.271.4.2 03/03/13 14:12:15 gluh@gluh.mysql.r18.ru +2 -0
    Fix for embeded library compile

  sql/mysqld.cc
    1.342.1.2 03/03/13 14:12:15 gluh@gluh.mysql.r18.ru +2 -0
    Fix for embeded library compile

  sql/log.cc
    1.105 03/03/13 14:12:15 gluh@gluh.mysql.r18.ru +2 -0
    Fix for embeded library compile

ChangeSet
  1.1494.19.2 03/03/13 12:54:34 bar@bar.mysql.r18.ru +3 -0
  Case insensitivrly has been added in charset and collation names.

  mysys/charset.c
    1.75 03/03/13 12:54:33 bar@bar.mysql.r18.ru +2 -2
    Case insensitivrly has been added in charset and collation names.

  mysql-test/t/ctype_collate.test
    1.5 03/03/13 12:54:32 bar@bar.mysql.r18.ru +2 -0
    Case insensitivrly has been added in charset and collation names.

  mysql-test/r/ctype_collate.result
    1.5 03/03/13 12:54:32 bar@bar.mysql.r18.ru +4 -0
    Case insensitivrly has been added in charset and collation names.

ChangeSet
  1.1346.133.33 03/03/12 21:35:57 pgulutzan@linux.local +2 -0
  Added PeterG's new internals documenation.

  BitKeeper/etc/logging_ok
    1.206.17.18 03/03/12 21:35:49 pgulutzan@linux.local +1 -0
    Logging to logging@openlogging.org accepted

  Docs/internals.texi
    1.22.1.1 03/03/12 21:35:29 pgulutzan@linux.local +3782 -0
    Added PeterG's new internals documentation.

ChangeSet
  1.1346.133.32 03/03/12 23:16:36 miguel@hegel.local +66 -0
  VC++ InstallShield Setup Programs for 4.0.XX tree

  VC++Files/InstallShield/4.0.XX-pro/Text Substitutions/Setup.tsb
    1.1 03/03/12 23:16:07 miguel@hegel.local +76 -0

  VC++Files/InstallShield/4.0.XX-pro/Text Substitutions/Setup.tsb
    1.0 03/03/12 23:16:07 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Text Substitutions/Setup.tsb

  VC++Files/InstallShield/4.0.XX-pro/Text Substitutions/Build.tsb
    1.1 03/03/12 23:16:06 miguel@hegel.local +56 -0

  VC++Files/InstallShield/4.0.XX-pro/String Tables/Default.shl
    1.1 03/03/12 23:16:06 miguel@hegel.local +74 -0

  VC++Files/InstallShield/4.0.XX-pro/String Tables/0009-English/value.shl
    1.1 03/03/12 23:16:06 miguel@hegel.local +23 -0

  VC++Files/InstallShield/4.0.XX-pro/Shell Objects/Default.shl
    1.1 03/03/12 23:16:06 miguel@hegel.local +12 -0

  VC++Files/InstallShield/4.0.XX-pro/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
    1.1 03/03/12 23:16:06 miguel@hegel.local +350 -0

  VC++Files/InstallShield/4.0.XX-pro/Text Substitutions/Build.tsb
    1.0 03/03/12 23:16:06 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Text Substitutions/Build.tsb

  VC++Files/InstallShield/4.0.XX-pro/String Tables/Default.shl
    1.0 03/03/12 23:16:06 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/String Tables/Default.shl

  VC++Files/InstallShield/4.0.XX-pro/String Tables/0009-English/value.shl
    1.0 03/03/12 23:16:06 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/String Tables/0009-English/value.shl

  VC++Files/InstallShield/4.0.XX-pro/Shell Objects/Default.shl
    1.0 03/03/12 23:16:06 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Shell Objects/Default.shl

  VC++Files/InstallShield/4.0.XX-pro/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
    1.0 03/03/12 23:16:06 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp

  VC++Files/InstallShield/4.0.XX-pro/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.1 03/03/12 23:16:05 miguel@hegel.local +25 -0

  VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul
    1.1 03/03/12 23:16:05 miguel@hegel.local +640 -0

  VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.obs
    1.1 03/03/12 23:16:05 miguel@hegel.local +1460 -0

  VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.ins
    1.1 03/03/12 23:16:05 miguel@hegel.local +1271 -0

  VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.ino
    1.1 03/03/12 23:16:05 miguel@hegel.local +1304 -0

  VC++Files/InstallShield/4.0.XX-pro/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.0 03/03/12 23:16:05 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt

  VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul
    1.0 03/03/12 23:16:05 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul

  VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.obs
    1.0 03/03/12 23:16:05 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.obs

  VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.ins
    1.0 03/03/12 23:16:05 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.ins

  VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.ino
    1.0 03/03/12 23:16:05 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.ino

  VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.dbg
    1.1 03/03/12 23:16:04 miguel@hegel.local +634 -0

  VC++Files/InstallShield/4.0.XX-pro/Registry Entries/Default.rge
    1.1 03/03/12 23:16:04 miguel@hegel.local +4 -0

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl
    1.1 03/03/12 23:16:04 miguel@hegel.local +226 -0

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Grant Tables.fgl
    1.1 03/03/12 23:16:04 miguel@hegel.local +36 -0

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Documentation.fgl
    1.1 03/03/12 23:16:04 miguel@hegel.local +99 -0

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Development.fgl
    1.1 03/03/12 23:16:04 miguel@hegel.local +239 -0

  VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.dbg
    1.0 03/03/12 23:16:04 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.dbg

  VC++Files/InstallShield/4.0.XX-pro/Registry Entries/Default.rge
    1.0 03/03/12 23:16:04 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Registry Entries/Default.rge

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl
    1.0 03/03/12 23:16:04 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Grant Tables.fgl
    1.0 03/03/12 23:16:04 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/File Groups/Grant Tables.fgl

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Documentation.fgl
    1.0 03/03/12 23:16:04 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/File Groups/Documentation.fgl

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Development.fgl
    1.0 03/03/12 23:16:04 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/File Groups/Development.fgl

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Default.fdf
    1.1 03/03/12 23:16:03 miguel@hegel.local +82 -0

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Clients and Tools.fgl
    1.1 03/03/12 23:16:03 miguel@hegel.local +31 -0

  VC++Files/InstallShield/4.0.XX-pro/Component Definitions/Default.fgl
    1.1 03/03/12 23:16:03 miguel@hegel.local +42 -0

  VC++Files/InstallShield/4.0.XX-pro/Component Definitions/Default.cdf
    1.1 03/03/12 23:16:03 miguel@hegel.local +192 -0

  VC++Files/InstallShield/4.0.XX-pro/4.0.XX-pro.ipr
    1.1 03/03/12 23:16:03 miguel@hegel.local +52 -0

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Default.fdf
    1.0 03/03/12 23:16:03 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/File Groups/Default.fdf

  VC++Files/InstallShield/4.0.XX-pro/File Groups/Clients and Tools.fgl
    1.0 03/03/12 23:16:03 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/File Groups/Clients and Tools.fgl

  VC++Files/InstallShield/4.0.XX-pro/Component Definitions/Default.fgl
    1.0 03/03/12 23:16:03 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Component Definitions/Default.fgl

  VC++Files/InstallShield/4.0.XX-pro/Component Definitions/Default.cdf
    1.0 03/03/12 23:16:03 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/Component Definitions/Default.cdf

  VC++Files/InstallShield/4.0.XX-pro/4.0.XX-pro.ipr
    1.0 03/03/12 23:16:03 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-pro/4.0.XX-pro.ipr

  VC++Files/InstallShield/4.0.XX-gpl/Text Substitutions/Setup.tsb
    1.1 03/03/12 23:16:02 miguel@hegel.local +76 -0

  VC++Files/InstallShield/4.0.XX-gpl/Text Substitutions/Build.tsb
    1.1 03/03/12 23:16:02 miguel@hegel.local +56 -0

  VC++Files/InstallShield/4.0.XX-gpl/String Tables/Default.shl
    1.1 03/03/12 23:16:02 miguel@hegel.local +74 -0

  VC++Files/InstallShield/4.0.XX-gpl/String Tables/0009-English/value.shl
    1.1 03/03/12 23:16:02 miguel@hegel.local +23 -0

  VC++Files/InstallShield/4.0.XX-gpl/Shell Objects/Default.shl
    1.1 03/03/12 23:16:02 miguel@hegel.local +12 -0

  VC++Files/InstallShield/4.0.XX-gpl/Text Substitutions/Setup.tsb
    1.0 03/03/12 23:16:02 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Text Substitutions/Setup.tsb

  VC++Files/InstallShield/4.0.XX-gpl/Text Substitutions/Build.tsb
    1.0 03/03/12 23:16:02 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Text Substitutions/Build.tsb

  VC++Files/InstallShield/4.0.XX-gpl/String Tables/Default.shl
    1.0 03/03/12 23:16:02 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/String Tables/Default.shl

  VC++Files/InstallShield/4.0.XX-gpl/String Tables/0009-English/value.shl
    1.0 03/03/12 23:16:02 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/String Tables/0009-English/value.shl

  VC++Files/InstallShield/4.0.XX-gpl/Shell Objects/Default.shl
    1.0 03/03/12 23:16:02 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Shell Objects/Default.shl

  VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
    1.1 03/03/12 23:16:01 miguel@hegel.local +350 -0

  VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.1 03/03/12 23:16:01 miguel@hegel.local +25 -0

  VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul
    1.1 03/03/12 23:16:01 miguel@hegel.local +640 -0

  VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.obs
    1.1 03/03/12 23:16:01 miguel@hegel.local +1460 -0

  VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.ins
    1.1 03/03/12 23:16:01 miguel@hegel.local +1271 -0

  VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
    1.0 03/03/12 23:16:01 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp

  VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.0 03/03/12 23:16:01 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt

  VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul
    1.0 03/03/12 23:16:01 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul

  VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.obs
    1.0 03/03/12 23:16:01 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.obs

  VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.ins
    1.0 03/03/12 23:16:01 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.ins

  VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.ino
    1.1 03/03/12 23:16:00 miguel@hegel.local +1304 -0

  VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.dbg
    1.1 03/03/12 23:16:00 miguel@hegel.local +634 -0

  VC++Files/InstallShield/4.0.XX-gpl/Registry Entries/Default.rge
    1.1 03/03/12 23:16:00 miguel@hegel.local +4 -0

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl
    1.1 03/03/12 23:16:00 miguel@hegel.local +229 -0

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Grant Tables.fgl
    1.1 03/03/12 23:16:00 miguel@hegel.local +36 -0

  VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.ino
    1.0 03/03/12 23:16:00 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.ino

  VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.dbg
    1.0 03/03/12 23:16:00 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.dbg

  VC++Files/InstallShield/4.0.XX-gpl/Registry Entries/Default.rge
    1.0 03/03/12 23:16:00 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Registry Entries/Default.rge

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl
    1.0 03/03/12 23:16:00 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Grant Tables.fgl
    1.0 03/03/12 23:16:00 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/File Groups/Grant Tables.fgl

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Documentation.fgl
    1.1 03/03/12 23:15:59 miguel@hegel.local +101 -0

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Development.fgl
    1.1 03/03/12 23:15:59 miguel@hegel.local +241 -0

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Default.fdf
    1.1 03/03/12 23:15:59 miguel@hegel.local +82 -0

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Clients and Tools.fgl
    1.1 03/03/12 23:15:59 miguel@hegel.local +31 -0

  VC++Files/InstallShield/4.0.XX-gpl/Component Definitions/Default.fgl
    1.1 03/03/12 23:15:59 miguel@hegel.local +42 -0

  VC++Files/InstallShield/4.0.XX-gpl/Component Definitions/Default.cdf
    1.1 03/03/12 23:15:59 miguel@hegel.local +192 -0

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Documentation.fgl
    1.0 03/03/12 23:15:59 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/File Groups/Documentation.fgl

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Development.fgl
    1.0 03/03/12 23:15:59 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/File Groups/Development.fgl

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Default.fdf
    1.0 03/03/12 23:15:59 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/File Groups/Default.fdf

  VC++Files/InstallShield/4.0.XX-gpl/File Groups/Clients and Tools.fgl
    1.0 03/03/12 23:15:59 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/File Groups/Clients and Tools.fgl

  VC++Files/InstallShield/4.0.XX-gpl/Component Definitions/Default.fgl
    1.0 03/03/12 23:15:59 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Component Definitions/Default.fgl

  VC++Files/InstallShield/4.0.XX-gpl/Component Definitions/Default.cdf
    1.0 03/03/12 23:15:59 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/Component Definitions/Default.cdf

  VC++Files/InstallShield/4.0.XX-gpl/4.0.XX-gpl.ipr
    1.1 03/03/12 23:15:58 miguel@hegel.local +51 -0

  VC++Files/InstallShield/4.0.XX-classic/Text Substitutions/Setup.tsb
    1.1 03/03/12 23:15:58 miguel@hegel.local +76 -0

  VC++Files/InstallShield/4.0.XX-classic/Text Substitutions/Build.tsb
    1.1 03/03/12 23:15:58 miguel@hegel.local +56 -0

  VC++Files/InstallShield/4.0.XX-classic/String Tables/Default.shl
    1.1 03/03/12 23:15:58 miguel@hegel.local +74 -0

  VC++Files/InstallShield/4.0.XX-classic/String Tables/0009-English/value.shl
    1.1 03/03/12 23:15:58 miguel@hegel.local +23 -0

  VC++Files/InstallShield/4.0.XX-gpl/4.0.XX-gpl.ipr
    1.0 03/03/12 23:15:58 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-gpl/4.0.XX-gpl.ipr

  VC++Files/InstallShield/4.0.XX-classic/Text Substitutions/Setup.tsb
    1.0 03/03/12 23:15:58 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Text Substitutions/Setup.tsb

  VC++Files/InstallShield/4.0.XX-classic/Text Substitutions/Build.tsb
    1.0 03/03/12 23:15:58 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Text Substitutions/Build.tsb

  VC++Files/InstallShield/4.0.XX-classic/String Tables/Default.shl
    1.0 03/03/12 23:15:58 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/String Tables/Default.shl

  VC++Files/InstallShield/4.0.XX-classic/String Tables/0009-English/value.shl
    1.0 03/03/12 23:15:58 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/String Tables/0009-English/value.shl

  VC++Files/InstallShield/4.0.XX-classic/Shell Objects/Default.shl
    1.1 03/03/12 23:15:57 miguel@hegel.local +12 -0

  VC++Files/InstallShield/4.0.XX-classic/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
    1.1 03/03/12 23:15:57 miguel@hegel.local +350 -0

  VC++Files/InstallShield/4.0.XX-classic/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.1 03/03/12 23:15:57 miguel@hegel.local +25 -0

  VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul
    1.1 03/03/12 23:15:57 miguel@hegel.local +640 -0

  VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.obs
    1.1 03/03/12 23:15:57 miguel@hegel.local +1460 -0

  VC++Files/InstallShield/4.0.XX-classic/Shell Objects/Default.shl
    1.0 03/03/12 23:15:57 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Shell Objects/Default.shl

  VC++Files/InstallShield/4.0.XX-classic/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
    1.0 03/03/12 23:15:57 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp

  VC++Files/InstallShield/4.0.XX-classic/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
    1.0 03/03/12 23:15:57 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt

  VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul
    1.0 03/03/12 23:15:57 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul

  VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.obs
    1.0 03/03/12 23:15:57 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.obs

  VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.ins
    1.1 03/03/12 23:15:56 miguel@hegel.local +1271 -0

  VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.ino
    1.1 03/03/12 23:15:56 miguel@hegel.local +1304 -0

  VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.dbg
    1.1 03/03/12 23:15:56 miguel@hegel.local +634 -0

  VC++Files/InstallShield/4.0.XX-classic/Registry Entries/Default.rge
    1.1 03/03/12 23:15:56 miguel@hegel.local +4 -0

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl
    1.1 03/03/12 23:15:56 miguel@hegel.local +226 -0

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Grant Tables.fgl
    1.1 03/03/12 23:15:56 miguel@hegel.local +36 -0

  VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.ins
    1.0 03/03/12 23:15:56 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.ins

  VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.ino
    1.0 03/03/12 23:15:56 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.ino

  VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.dbg
    1.0 03/03/12 23:15:56 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.dbg

  VC++Files/InstallShield/4.0.XX-classic/Registry Entries/Default.rge
    1.0 03/03/12 23:15:56 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Registry Entries/Default.rge

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl
    1.0 03/03/12 23:15:56 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Grant Tables.fgl
    1.0 03/03/12 23:15:56 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/File Groups/Grant Tables.fgl

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Documentation.fgl
    1.1 03/03/12 23:15:55 miguel@hegel.local +99 -0

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Development.fgl
    1.1 03/03/12 23:15:55 miguel@hegel.local +239 -0

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Default.fdf
    1.1 03/03/12 23:15:55 miguel@hegel.local +82 -0

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Clients and Tools.fgl
    1.1 03/03/12 23:15:55 miguel@hegel.local +31 -0

  VC++Files/InstallShield/4.0.XX-classic/Component Definitions/Default.fgl
    1.1 03/03/12 23:15:55 miguel@hegel.local +42 -0

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Documentation.fgl
    1.0 03/03/12 23:15:55 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/File Groups/Documentation.fgl

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Development.fgl
    1.0 03/03/12 23:15:55 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/File Groups/Development.fgl

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Default.fdf
    1.0 03/03/12 23:15:55 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/File Groups/Default.fdf

  VC++Files/InstallShield/4.0.XX-classic/File Groups/Clients and Tools.fgl
    1.0 03/03/12 23:15:55 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/File Groups/Clients and Tools.fgl

  VC++Files/InstallShield/4.0.XX-classic/Component Definitions/Default.fgl
    1.0 03/03/12 23:15:55 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Component Definitions/Default.fgl

  VC++Files/InstallShield/4.0.XX-classic/Component Definitions/Default.cdf
    1.1 03/03/12 23:15:54 miguel@hegel.local +192 -0

  VC++Files/InstallShield/4.0.XX-classic/4.0.XX-classic.ipr
    1.1 03/03/12 23:15:54 miguel@hegel.local +51 -0

  VC++Files/InstallShield/4.0.XX-classic/Component Definitions/Default.cdf
    1.0 03/03/12 23:15:54 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/Component Definitions/Default.cdf

  VC++Files/InstallShield/4.0.XX-classic/4.0.XX-classic.ipr
    1.0 03/03/12 23:15:54 miguel@hegel.local +0 -0
    BitKeeper file /home/miguel/mysql-4.0/VC++Files/InstallShield/4.0.XX-classic/4.0.XX-classic.ipr

ChangeSet
  1.1346.150.1 03/03/13 01:23:43 serg@serg.mysql.com +1 -0
  better help message

  sql/mysqld.cc
    1.297.27.1 03/03/13 01:23:40 serg@serg.mysql.com +1 -1
    better help message

ChangeSet
  1.676.288.1 03/03/12 22:50:22 bell@sanja.is.com.ua +1 -0
  added comment

  sql/sql_select.cc
    1.91.1.41 03/03/12 22:50:21 bell@sanja.is.com.ua +4 -0
    added comment

ChangeSet
  1.1494.19.1 03/03/12 21:43:40 Sinisa@sinisa.nasamreza.org +1 -0
  A fix for mysql client program when `use` or `connect` were used 
  without arguments ...

  client/mysql.cc
    1.119 03/03/12 21:43:34 Sinisa@sinisa.nasamreza.org +3 -1
    A fix for bug #90

ChangeSet
  1.1346.133.31 03/03/12 20:33:41 Sinisa@sinisa.nasamreza.org +2 -0
  making sure that test works.

  mysql-test/t/innodb.test
    1.28.1.6 03/03/12 20:33:36 Sinisa@sinisa.nasamreza.org +1 -1
    making sure that test works.

  mysql-test/r/innodb.result
    1.40.1.16 03/03/12 20:33:36 Sinisa@sinisa.nasamreza.org +1 -1
    making sure that test works.

ChangeSet
  1.676.1.679 03/03/12 18:32:27 serg@serg.mysql.com +1 -0
  ha_myisam.cc:
    typo fixed

  sql/ha_myisam.cc
    1.73.2.11 03/03/12 18:32:15 serg@serg.mysql.com +1 -1
    typo fixed

ChangeSet
  1.1346.133.30 03/03/12 17:11:48 Sinisa@sinisa.nasamreza.org +4 -0
  Better fix for "Halloween" effect ...

  sql/sql_update.cc
    1.54.1.23 03/03/12 17:11:45 Sinisa@sinisa.nasamreza.org +6 -8
    Better fix for "Halloween" effect ...

  sql/sql_class.h
    1.111.1.32 03/03/12 17:11:45 Sinisa@sinisa.nasamreza.org +2 -2
    Better fix for "Halloween" effect ...

  sql/handler.h
    1.71.1.10 03/03/12 17:11:45 Sinisa@sinisa.nasamreza.org +1 -0
    Better fix for "Halloween" effect ...

  sql/ha_innodb.h
    1.48.2.2 03/03/12 17:11:45 Sinisa@sinisa.nasamreza.org +2 -1
    Better fix for "Halloween" effect ...

ChangeSet
  1.676.284.3 03/03/12 17:08:48 Sinisa@sinisa.nasamreza.org +1 -0
  Fix for a bug with column privileges ...

  sql/sql_base.cc
    1.74.1.29 03/03/12 17:08:46 Sinisa@sinisa.nasamreza.org +4 -3
    Fix for a bug with column privileges ...

ChangeSet
  1.676.1.676 03/03/12 16:43:01 monty@mashka.mysql.fi +3 -0
  NEWDATE -> DATE in anylyse() output
  Changed that analyse(#) also affects strings

  sql/sql_analyse.cc
    1.8.1.3 03/03/12 16:43:00 monty@mashka.mysql.fi +48 -32
    NEWDATE -> DATE in anylyse() output
    Changed that analyse(#) also affects strings
    Fixed that number of elements in ENUM is limited by # not by #+1

  mysql-test/t/analyse.test
    1.2.1.1 03/03/12 16:43:00 monty@mashka.mysql.fi +3 -2
    Better analyse test

  mysql-test/r/analyse.result
    1.2.1.1 03/03/12 16:43:00 monty@mashka.mysql.fi +12 -0
    Better analyse test

ChangeSet
  1.1494.18.3 03/03/12 16:52:02 ram@mysql.r18.ru +2 -0
  Test case for rtree indexes.

  mysql-test/t/gis-rtree.test
    1.1 03/03/12 16:51:59 ram@mysql.r18.ru +72 -0

  mysql-test/r/gis-rtree.result
    1.1 03/03/12 16:51:59 ram@mysql.r18.ru +814 -0

  mysql-test/t/gis-rtree.test
    1.0 03/03/12 16:51:59 ram@mysql.r18.ru +0 -0
    BitKeeper file /usr/home/ram/work/mysql-4.1.sp/mysql-test/t/gis-rtree.test

  mysql-test/r/gis-rtree.result
    1.0 03/03/12 16:51:59 ram@mysql.r18.ru +0 -0
    BitKeeper file /usr/home/ram/work/mysql-4.1.sp/mysql-test/r/gis-rtree.result

ChangeSet
  1.1346.133.29 03/03/12 14:48:00 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/sql_parse.cc
    1.218.1.80 03/03/12 14:47:56 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1346.148.6 03/03/12 14:34:54 monty@mashka.mysql.fi +2 -0
  Fix for --new option (Timestamp in YYYY-MM-DD HH:MM:SS format)

  sql/field.h
    1.33.1.16 03/03/12 14:34:52 monty@mashka.mysql.fi +2 -1
    Fix for --new option

  sql/field.cc
    1.51.1.20 03/03/12 14:34:52 monty@mashka.mysql.fi +25 -0
    Fix for --new option

ChangeSet
  1.1346.133.28 03/03/12 14:34:07 Sinisa@sinisa.nasamreza.org +2 -0
  A little bit improved test case

  mysql-test/t/innodb.test
    1.28.1.5 03/03/12 14:34:01 Sinisa@sinisa.nasamreza.org +1 -1
    A little bit improved test case

  mysql-test/r/innodb.result
    1.40.1.15 03/03/12 14:34:01 Sinisa@sinisa.nasamreza.org +1 -1
    A little bit improved test case

ChangeSet
  1.1494.18.2 03/03/12 15:37:39 hf@genie.(none) +1 -0
  ALTER TABLE ADD SPATIAL KEY bug fix

  myisam/mi_check.c
    1.103 03/03/12 15:36:54 hf@genie.(none) +2 -2
    Additional condition added - we only can create 
    spatial key row-by-row now

ChangeSet
  1.1346.148.5 03/03/12 08:08:07 monty@mashka.mysql.fi +1 -0
  Proper fix for INSERT DELAYED and --max-delayed-threads

  sql/sql_insert.cc
    1.63.1.31 03/03/12 08:08:03 monty@mashka.mysql.fi +2 -3
    Proper fix for INSERT DELAYED and --max-delayed-threads

ChangeSet
  1.1346.148.4 03/03/12 07:51:08 monty@mashka.mysql.fi +2 -0
  Fix for replication of INSERT | REPLACE | CREATE  ... SELECT

  sql/sql_select.cc
    1.152.1.75 03/03/12 07:51:06 monty@mashka.mysql.fi +5 -8
    Fix for repllication of INSERT | REPLACE | CREATE  ... SELECT

  sql/sql_parse.cc
    1.218.22.1 03/03/12 07:51:06 monty@mashka.mysql.fi +3 -0
    Fix for replication of INSERT | REPLACE | CREATE  ... SELECT

ChangeSet
  1.1346.148.3 03/03/12 05:21:31 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

  mysql-test/mysql-test-run.sh
    1.146.1.20 03/03/12 05:21:28 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.148.2 03/03/12 01:06:21 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_select.cc
    1.152.1.74 03/03/12 01:06:19 guilhem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.149.1 03/03/12 01:05:04 guilhem@mysql.com +1 -0
  Fix for bug #136. We must write the
  INSERT into u SELECT * from t
  to the binlog
  BEFORE unlocking t (which was read-locked at least in MyISAM),
  and not the contrary.

  sql/sql_select.cc
    1.152.15.1 03/03/12 01:05:00 guilhem@mysql.com +8 -1
    Fix for bug #136. We must write the
    INSERT into u SELECT * from t
    to the binlog
    BEFORE unlocking t (which was read-locked at least in MyISAM),
    and not the contrary.

ChangeSet
  1.1346.147.2 03/03/12 01:40:06 monty@mashka.mysql.fi +5 -0
  Simple fixes (nothing notable)

  sql/sql_class.cc
    1.71.1.29 03/03/12 01:40:02 monty@mashka.mysql.fi +2 -0
    Added DBUG info

  sql/slave.cc
    1.164.1.52 03/03/12 01:40:02 monty@mashka.mysql.fi +5 -11
    Simple optimization

  mysys/my_lib.c
    1.13 03/03/12 01:40:02 monty@mashka.mysql.fi +1 -1
    Fixed wrong dbug printf

  mysql-test/mysql-test-run.sh
    1.146.5.2 03/03/12 01:40:02 monty@mashka.mysql.fi +1 -1
    Longer stack trace from valgrind

  dbug/dbug.c
    1.14 03/03/12 01:40:02 monty@mashka.mysql.fi +0 -1
    Remove duplicate va_end() call

ChangeSet
  1.676.285.5 03/03/11 22:47:29 lenz@mysql.com +1 -0
   - Fixed man page for apropos/whatis (thanks to Christian Hammers from Debian
     for the patch) (bug #135)

  man/perror.1
    1.1.2.1 03/03/11 22:47:28 lenz@mysql.com +5 -10
     - Fixed man page for apropos/whatis (thanks to Christian Hammers from Debian
       for the patch) (bug #135)

ChangeSet
  1.676.287.1 03/03/11 21:20:53 serg@serg.mysql.com +4 -0
  fixed an obscure bug in group by + having + Item_ref::get_date

  sql/item.h
    1.11.1.5 03/03/11 21:20:51 serg@serg.mysql.com +7 -4
    fixed an obscure bug in group by + having + Item_ref::get_date

  sql/item.cc
    1.12.1.3 03/03/11 21:20:51 serg@serg.mysql.com +11 -0
    fixed an obscure bug in group by + having + Item_ref::get_date

  mysql-test/t/group_by.test
    1.3.1.9 03/03/11 21:20:51 serg@serg.mysql.com +8 -0
    fixed an obscure bug in group by + having + Item_ref::get_date

  mysql-test/r/group_by.result
    1.3.1.9 03/03/11 21:20:51 serg@serg.mysql.com +1 -0
    fixed an obscure bug in group by + having + Item_ref::get_date

ChangeSet
  1.1346.147.1 03/03/11 21:45:39 monty@mashka.mysql.fi +4 -0
  merge with 3.23 to get:
  - Better detection of crashed .MYI file
  - Ignore writeable config files

  sql/mysqld.cc
    1.297.1.109 03/03/11 21:45:36 monty@mashka.mysql.fi +1 -2
    merge with 3.23

  myisam/mi_open.c
    1.46.1.12 03/03/11 21:45:36 monty@mashka.mysql.fi +1 -2
    merge with 3.23

  mysys/default.c
    1.17.1.5 03/03/11 21:39:11 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.146.5.1 03/03/11 21:39:11 monty@mashka.mysql.fi +0 -2
    Auto merged

ChangeSet
  1.676.1.675 03/03/11 21:25:17 monty@mashka.mysql.fi +1 -0
  Cleaned up disk_pos_assert() to be more general. 

  myisam/mi_open.c
    1.31.1.6 03/03/11 21:25:16 monty@mashka.mysql.fi +13 -14
    Cleaned up disk_pos_assert() to be more general. 

ChangeSet
  1.676.285.2 03/03/11 18:54:57 lenz@mysql.com +1 -0
   - made test for multiple --user options more sh-compatible

  scripts/safe_mysqld.sh
    1.39.10.1 03/03/11 18:54:56 lenz@mysql.com +2 -2
     - made test for multiple --user options more sh-compatible

ChangeSet
  1.1346.133.27 03/03/11 19:40:49 Sinisa@sinisa.nasamreza.org +4 -0
  A  bug fix for multi-table updates with InnoDB storage engine

  sql/sql_update.cc
    1.54.1.22 03/03/11 19:40:45 Sinisa@sinisa.nasamreza.org +8 -5
    A  bug fix for multi-table updates with InnoDB storage engine

  sql/sql_class.h
    1.111.1.31 03/03/11 19:40:45 Sinisa@sinisa.nasamreza.org +1 -1
    A  bug fix for multi-table updates with InnoDB storage engine

  mysql-test/t/innodb.test
    1.28.1.4 03/03/11 19:40:45 Sinisa@sinisa.nasamreza.org +11 -0
    A  bug fix for multi-table updates with InnoDB storage engine

  mysql-test/r/innodb.result
    1.40.1.14 03/03/11 19:40:45 Sinisa@sinisa.nasamreza.org +17 -0
    A  bug fix for multi-table updates with InnoDB storage engine

ChangeSet
  1.676.286.1 03/03/11 18:34:00 bell@sanja.is.com.ua +3 -0
  fixed bug of unchecked random part of WHERE clause (bug #142)

  sql/sql_select.cc
    1.91.1.40 03/03/11 18:33:58 bell@sanja.is.com.ua +2 -0
    fixed bug of unchecked random part of WHERE clause

  mysql-test/t/select.test
    1.6.1.1 03/03/11 18:33:58 bell@sanja.is.com.ua +16 -1
    test of random WHERE clause

  mysql-test/r/select.result
    1.2.2.1 03/03/11 18:33:58 bell@sanja.is.com.ua +1 -0
    test of random WHERE clause

ChangeSet
  1.676.285.1 03/03/11 15:37:31 lenz@mysql.com +2 -0
   - fixed C++-style comments in .c files to make IBM compiler happy
     (it barfs on these with a syntax error)

  strings/ctype-tis620.c
    1.14.1.1 03/03/11 15:37:30 lenz@mysql.com +15 -15
     - fixed many C++-style comments

  sql/net_serv.cc
    1.15.1.7 03/03/11 15:37:30 lenz@mysql.com +1 -1
     - fixed C++-style comment (this file is copied as libmysql_r/net.c)

ChangeSet
  1.1494.18.1 03/03/11 16:32:17 gluh@gluh.mysql.r18.ru +12 -0
  Conflicts relsolving

  sql/sql_yacc.yy
    1.203.30.1 03/03/11 16:32:15 gluh@gluh.mysql.r18.ru +1 -0
    Conflicts relsolving

  sql/sql_parse.cc
    1.271.4.1 03/03/11 16:32:15 gluh@gluh.mysql.r18.ru +0 -0
    Conflicts relsolving

  sql/mysqld.cc
    1.342.1.1 03/03/11 16:32:15 gluh@gluh.mysql.r18.ru +12 -13
    Conflicts relsolving

  sql/log.cc
    1.104 03/03/11 16:32:15 gluh@gluh.mysql.r18.ru +0 -0
    Conflicts relsolving

  sql/sql_repl.h
    1.27 03/03/11 15:47:22 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_repl.cc
    1.98 03/03/11 15:47:22 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.7.1 03/03/11 15:47:22 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_class.h
    1.146.1.5 03/03/11 15:47:22 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/set_var.cc
    1.30.1.3 03/03/11 15:47:21 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.2.3 03/03/11 15:47:21 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/lex.h
    1.82.1.19 03/03/11 15:47:20 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  mysql-test/t/rpl_rotate_logs.test
    1.41 03/03/11 15:47:20 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1494.10.8 03/03/11 13:26:26 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-in-4.1

  sql/item_cmpfunc.cc
    1.77 03/03/11 13:26:24 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1494.10.7 03/03/11 12:43:30 bell@sanja.is.com.ua +3 -0
  fixed cached constsnt determination (bug #142 related)

  sql/item_cmpfunc.cc
    1.75.1.1 03/03/11 12:43:28 bell@sanja.is.com.ua +12 -2
    fixed cached constsnt determination

  mysql-test/t/subselect.test
    1.56.2.3 03/03/11 12:43:28 bell@sanja.is.com.ua +17 -0
    test of constant redecing

  mysql-test/r/subselect.result
    1.66 03/03/11 12:43:28 bell@sanja.is.com.ua +23 -0
    test of constant redecing

ChangeSet
  1.1346.133.25 03/03/11 13:52:19 gluh@gluh.mysql.r18.ru +3 -0
  Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
  into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.last

  mysql-test/mysql-test-run.sh
    1.146.1.19 03/03/11 13:52:16 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  client/mysqltest.c
    1.77.1.23 03/03/11 13:52:15 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.206.17.17 03/03/11 13:52:09 gluh@gluh.mysql.r18.ru +0 -0
    auto-union

ChangeSet
  1.1403.75.2 03/03/11 13:49:06 gluh@gluh.mysql.r18.ru +8 -0
  Added 'PURGE LOGS BEFORE' command
  Added expire-logs-days option 

  sql/sql_yacc.yy
    1.203.24.2 03/03/11 13:49:04 gluh@gluh.mysql.r18.ru +5 -6
    For 'Purge logs before' command

  sql/sql_parse.cc
    1.235.41.2 03/03/11 13:49:04 gluh@gluh.mysql.r18.ru +1 -1
    Added 'expire-logs-days' option

  sql/sql_class.h
    1.123.9.11 03/03/11 13:49:04 gluh@gluh.mysql.r18.ru +1 -0
    For 'Purge logs before' command

  sql/set_var.cc
    1.20.4.1 03/03/11 13:49:04 gluh@gluh.mysql.r18.ru +4 -0
    Added 'expire-logs-days' option

  sql/mysqld.cc
    1.316.5.2 03/03/11 13:49:04 gluh@gluh.mysql.r18.ru +3 -3
    Added 'expire-logs-days' option

  sql/log.cc
    1.92.3.2 03/03/11 13:49:04 gluh@gluh.mysql.r18.ru +19 -23
    For 'Purge logs before' command

  mysql-test/t/rpl_rotate_logs.test
    1.39.1.1 03/03/11 13:49:04 gluh@gluh.mysql.r18.ru +3 -1
    Added test for 'PURGE LOGS BEFORE' 

  mysql-test/r/rpl_rotate_logs.result
    1.38 03/03/11 13:49:04 gluh@gluh.mysql.r18.ru +6 -1
    Added test for 'PURGE LOGS BEFORE' 

ChangeSet
  1.1346.146.1 03/03/11 13:41:53 gluh@gluh.mysql.r18.ru +7 -0
  Openssl test

  BitKeeper/etc/logging_ok
    1.206.20.1 03/03/11 13:41:53 gluh@gluh.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  mysql-test/t/openssl_1.test
    1.5 03/03/11 13:41:36 gluh@gluh.mysql.r18.ru +41 -4
    Openssl test

  mysql-test/r/openssl_1.result
    1.5 03/03/11 13:41:36 gluh@gluh.mysql.r18.ru +32 -2
    Openssl test

  mysql-test/r/have_openssl_1.require
    1.3 03/03/11 13:41:36 gluh@gluh.mysql.r18.ru +1 -1
    Openssl test

  mysql-test/mysql-test-run.sh
    1.146.4.1 03/03/11 13:41:36 gluh@gluh.mysql.r18.ru +6 -2
    Openssl test

  mysql-test/include/have_openssl_1.inc
    1.3 03/03/11 13:41:36 gluh@gluh.mysql.r18.ru +1 -1
    Openssl test

  client/mysqltest.c
    1.77.6.1 03/03/11 13:41:36 gluh@gluh.mysql.r18.ru +17 -1
    For openssl test

ChangeSet
  1.1346.145.1 03/03/10 18:32:38 greg@mysql.com[greg] +1 -0
  novell40c.patch

  netware/mysqld_safe.c
    1.3 03/03/10 09:47:40 greg@mysql.com[greg] +52 -2
    Import patch novell40c.patch

ChangeSet
  1.1494.17.1 03/03/11 01:06:28 bell@sanja.is.com.ua +6 -0
  processing of subselect in global ORDER BY (fifed crash of server)
    this implementation have limitation: prohibited subselect in ORDER BY dependence of most outer query (will be solved after removing passing first select_lex as fake select for global mysql_select())

  sql/sql_yacc.yy
    1.203.28.3 03/03/11 01:06:18 bell@sanja.is.com.ua +1 -1
    processing of subselect in global ORDER BY

  sql/sql_parse.cc
    1.271.3.3 03/03/11 01:06:18 bell@sanja.is.com.ua +8 -3
    processing of subselect in global ORDER BY

  sql/sql_lex.h
    1.102.6.2 03/03/11 01:06:18 bell@sanja.is.com.ua +8 -0
    processing of subselect in global ORDER BY

  sql/sql_lex.cc
    1.76.1.1 03/03/11 01:06:18 bell@sanja.is.com.ua +46 -9
    fixed comments
    processing of subselect in global ORDER BY

  mysql-test/t/subselect.test
    1.56.3.1 03/03/11 01:06:18 bell@sanja.is.com.ua +5 -0
    test of subselect in global ORDER BY

  mysql-test/r/subselect.result
    1.63.1.1 03/03/11 01:06:18 bell@sanja.is.com.ua +8 -0
    test of subselect in global ORDER BY

ChangeSet
  1.1494.15.3 03/03/11 00:39:55 monty@mashka.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mashka.mysql.fi:/home/my/mysql-4.1

  sql/mysqld.cc
    1.343 03/03/11 00:39:42 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1494.16.1 03/03/11 00:30:35 monty@mashka.mysql.fi +3 -0
  Portability fixes

  sql/mysqld.cc
    1.340.2.2 03/03/11 00:30:33 monty@mashka.mysql.fi +14 -13
    Move stack checking to right position

  configure.in
    1.201.1.25 03/03/11 00:30:33 monty@mashka.mysql.fi +4 -19
    Portability fix
    (Don't call AC_PROG_CC twice)

  cmd-line-utils/libedit/el.c
    1.3 03/03/11 00:30:33 monty@mashka.mysql.fi +9 -1
    Portability fix

ChangeSet
  1.676.1.674 03/03/11 00:17:34 monty@mashka.mysql.fi +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-3.23
  into mashka.mysql.fi:/home/my/mysql-3.23

  mysql-test/mysql-test-run.sh
    1.66.1.27 03/03/11 00:17:33 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.144.2 03/03/11 02:32:24 walrus@mysql.com +1 -0
  crash-me.sh:
    misprint correction

  sql-bench/crash-me.sh
    1.34.1.13 03/03/11 02:31:50 walrus@mysql.com +1 -1
    misprint correction

ChangeSet
  1.1494.10.6 03/03/10 22:25:52 bell@sanja.is.com.ua +3 -0
  fixed cleanup bug

  sql/sql_select.cc
    1.211 03/03/10 22:25:50 bell@sanja.is.com.ua +14 -1
    fixed cleanup

  mysql-test/t/subselect.test
    1.56.2.2 03/03/10 22:25:50 bell@sanja.is.com.ua +43 -0
    test of cleanup bug

  mysql-test/r/subselect.result
    1.65 03/03/10 22:25:50 bell@sanja.is.com.ua +35 -0
    test of cleanup bug

ChangeSet
  1.1346.144.1 03/03/10 20:21:11 lenz@mysql.com +1 -0
  - added missing file mysql_secure_installation to server RPM subpackage
    (bug #141) (please merge with 4.1 and onwards)

  support-files/mysql.spec.sh
    1.61.1.1 03/03/10 20:21:09 lenz@mysql.com +6 -0
    - added missing file mysql_secure_installation to server RPM subpackage
      (bug #141)

ChangeSet
  1.1494.15.2 03/03/10 20:54:18 Sinisa@sinisa.nasamreza.org +3 -0
  Fix for a bug with ROW(..) <=> ROW(...)

  sql/item_cmpfunc.cc
    1.76 03/03/10 20:54:14 Sinisa@sinisa.nasamreza.org +2 -3
    Fix for a bug with ROW(..) <=> ROW(...)

  mysql-test/t/row.test
    1.12 03/03/10 20:54:14 Sinisa@sinisa.nasamreza.org +2 -0
    Fix for a bug with ROW(..) <=> ROW(...)

  mysql-test/r/row.result
    1.13 03/03/10 20:54:14 Sinisa@sinisa.nasamreza.org +6 -0
    Fix for a bug with ROW(..) <=> ROW(...)

ChangeSet
  1.676.283.1 03/03/10 16:48:13 serg@serg.mysql.com +1 -0
  more propection in mi_open against badly corrupted MYI headers

  myisam/mi_open.c
    1.31.1.5 03/03/10 16:48:11 serg@serg.mysql.com +17 -2
    more propection in mi_open against badly corrupted MYI headers

ChangeSet
  1.676.282.1 03/03/10 17:14:01 Sinisa@sinisa.nasamreza.org +1 -0
  A fix for an obvious bug in hash generating proram.

  sql/gen_lex_hash.cc
    1.39.1.5 03/03/10 17:13:59 Sinisa@sinisa.nasamreza.org +1 -1
    A fix for an obvious bug in hash generating proram.

ChangeSet
  1.1494.15.1 03/03/10 17:07:39 Sinisa@sinisa.nasamreza.org +4 -0
  Adding tests for the fixed ORDER BY 0 bug

  mysql-test/t/union.test
    1.34 03/03/10 17:07:35 Sinisa@sinisa.nasamreza.org +2 -0
    Adding tests for the fixed ORDER BY 0 bug

  mysql-test/t/derived.test
    1.19 03/03/10 17:07:34 Sinisa@sinisa.nasamreza.org +2 -0
    Adding tests for the fixed ORDER BY 0 bug

  mysql-test/r/union.result
    1.34 03/03/10 17:07:34 Sinisa@sinisa.nasamreza.org +2 -0
    Adding tests for the fixed ORDER BY 0 bug

  mysql-test/r/derived.result
    1.20 03/03/10 17:07:34 Sinisa@sinisa.nasamreza.org +2 -0
    Adding tests for the fixed ORDER BY 0 bug

ChangeSet
  1.1346.143.1 03/03/10 16:58:07 Sinisa@sinisa.nasamreza.org +1 -0
  A fix for privilege checking bug.

  sql/sql_parse.cc
    1.218.1.79 03/03/10 16:57:23 Sinisa@sinisa.nasamreza.org +7 -1
    Fix for a privilege bug in multi-table updates.
    Seems like better fix then chec_table_access.

ChangeSet
  1.1494.10.5 03/03/10 16:38:26 bell@sanja.is.com.ua +2 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-in-4.1

  sql/item_subselect.cc
    1.56.1.3 03/03/10 16:38:24 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.56.1.6 03/03/10 16:38:24 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1494.14.1 03/03/10 16:38:06 bell@sanja.is.com.ua +4 -0
  fixed crash on non-well-constructed reference

  sql/item_subselect.cc
    1.56.3.1 03/03/10 16:37:58 bell@sanja.is.com.ua +2 -0
    fixed crash on non-well-constructed reference

  sql/item.h
    1.56.2.1 03/03/10 16:37:58 bell@sanja.is.com.ua +1 -1
    fixed crash on non-well-constructed reference

  mysql-test/t/subselect.test
    1.56.2.1 03/03/10 16:37:58 bell@sanja.is.com.ua +6 -0
    test of IN with error

  mysql-test/r/subselect.result
    1.64 03/03/10 16:37:58 bell@sanja.is.com.ua +2 -0
    test of IN with error

ChangeSet
  1.676.1.672 03/03/10 13:41:37 lenz@mysql.com +1 -0
   - typo fix for newly added error message

  sql/mysqld.cc
    1.162.1.110 03/03/10 13:41:36 lenz@mysql.com +1 -1
     - typo fix for newly added error message

ChangeSet
  1.676.1.671 03/03/10 13:16:59 serg@serg.mysql.com +1 -0
  warning added

  mysys/default.c
    1.14.1.3 03/03/10 13:16:58 serg@serg.mysql.com +5 -1
    warning added

ChangeSet
  1.1346.133.23 03/03/10 14:13:46 monty@narttu.mysql.fi +20 -0
  merge

  sql/sql_table.cc
    1.112.1.39 03/03/10 14:13:45 monty@narttu.mysql.fi +2 -7
    merge

  sql/sql_rename.cc
    1.13.1.4 03/03/10 14:13:45 monty@narttu.mysql.fi +2 -3
    merge

  sql/sql_select.cc
    1.152.1.73 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_repl.h
    1.24.2.2 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/slave.cc
    1.164.1.51 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.45.1.9 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.297.1.108 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.150.1.38 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/log_event.h
    1.71.1.4 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/lock.cc
    1.38.1.6 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.92.1.27 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/field.h
    1.33.1.15 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/type_datetime.test
    1.6.1.2 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -1
    Auto merged

  mysql-test/t/delete.test
    1.7.1.2 03/03/10 14:04:07 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/type_datetime.result
    1.8.1.4 03/03/10 14:04:06 monty@narttu.mysql.fi +0 -6
    Auto merged

  mysql-test/r/delete.result
    1.6.1.2 03/03/10 14:04:06 monty@narttu.mysql.fi +0 -15
    Auto merged

  libmysql/libmysql.c
    1.95.1.30 03/03/10 14:04:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysqlbinlog.cc
    1.70.1.2 03/03/10 14:04:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-delete.result
    1.3 03/03/10 14:04:06 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/ignore
    1.107.1.38 03/03/10 14:04:02 monty@narttu.mysql.fi +0 -8
    auto-union

ChangeSet
  1.1346.135.13 03/03/10 13:54:20 monty@narttu.mysql.fi +6 -0
  after merge fixes

  sql/mysqld.cc
    1.297.26.2 03/03/10 13:54:19 monty@narttu.mysql.fi +4 -4
    after merge fixes

  mysys/my_getopt.c
    1.34 03/03/10 13:54:19 monty@narttu.mysql.fi +2 -2
    after merge fixes

  mysql-test/r/type_datetime.result
    1.8.2.2 03/03/10 13:54:19 monty@narttu.mysql.fi +6 -0
    after merge fixes

  mysql-test/r/join.result
    1.17.1.3 03/03/10 13:54:19 monty@narttu.mysql.fi +19 -0
    after merge fixes

  mysql-test/r/delete.result
    1.6.2.1 03/03/10 13:54:19 monty@narttu.mysql.fi +15 -0
    after merge fixes

  mysql-test/r/backup.result
    1.7.1.2 03/03/10 13:54:19 monty@narttu.mysql.fi +23 -19
    after merge fixes

ChangeSet
  1.676.281.1 03/03/10 12:31:49 serg@serg.mysql.com +1 -0
  ignore world-writeable my.cnf's

  mysys/default.c
    1.14.1.2 03/03/10 12:31:48 serg@serg.mysql.com +13 -2
    ignore world-writeable my.cnf's

ChangeSet
  1.1346.135.12 03/03/10 12:48:43 monty@narttu.mysql.fi +27 -0
  Merge with 3.23 to get fixes for --user and BACKUP TABLE

  sql/sql_repl.h
    1.24.3.1 03/03/10 12:48:42 monty@narttu.mysql.fi +0 -1
    use local version

  sql/slave.cc
    1.164.6.2 03/03/10 12:48:42 monty@narttu.mysql.fi +3 -18
    use local version

  sql/mysqld.cc
    1.297.26.1 03/03/10 12:48:42 monty@narttu.mysql.fi +7 -8
    Use first --user option

  sql/mysql_priv.h
    1.150.1.37 03/03/10 12:48:42 monty@narttu.mysql.fi +0 -1
    merge

  sql/log_event.h
    1.71.2.1 03/03/10 12:48:42 monty@narttu.mysql.fi +0 -1
    merge

  sql/ha_myisam.cc
    1.92.5.1 03/03/10 12:48:42 monty@narttu.mysql.fi +5 -24
    Don't let BACKUP TABLE overwrite old files

  scripts/mysqld_safe.sh
    1.56.1.2 03/03/10 12:48:42 monty@narttu.mysql.fi +4 -0
    Only use first --user option

  mysql-test/t/backup.test
    1.9.1.2 03/03/10 12:48:42 monty@narttu.mysql.fi +0 -1
    merge with 3.23

  mysql-test/r/type_datetime.result
    1.8.2.1 03/03/10 12:48:42 monty@narttu.mysql.fi +0 -1
    merge (needs to be updated)

  mysql-test/r/join.result
    1.17.1.2 03/03/10 12:48:42 monty@narttu.mysql.fi +0 -0
    merge (needs to be updated)

  mysql-test/r/backup.result
    1.7.1.1 03/03/10 12:48:42 monty@narttu.mysql.fi +6 -8
    merge (needs to be updated)

  mysql-test/mysql-test-run.sh
    1.146.1.18 03/03/10 12:48:42 monty@narttu.mysql.fi +0 -1
    merge with 3.23.56

  sql/sql_select.cc
    1.152.14.1 03/03/10 12:31:09 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_rename.cc
    1.13.1.3 03/03/10 12:31:09 monty@narttu.mysql.fi +0 -2
    Auto merged

  sql/share/polish/errmsg.txt
    1.45.2.1 03/03/10 12:31:09 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/opt_range.cc
    1.54.1.23 03/03/10 12:31:09 monty@narttu.mysql.fi +1 -1
    Auto merged

  sql/field.h
    1.33.4.1 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysys/my_copy.c
    1.11 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/type_datetime.test
    1.6.2.1 03/03/10 12:31:08 monty@narttu.mysql.fi +1 -1
    Auto merged

  mysql-test/t/join.test
    1.13.1.3 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/delete.test
    1.7.2.1 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/backup.test
    1.6.2.2 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Turn off SCCS flag

  mysql-test/r/backup.result
    1.4.1.2 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Turn off SCCS flag

  libmysql/libmysql.c
    1.95.2.1 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/my_sys.h
    1.75.1.20 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysqlbinlog.cc
    1.70.2.1 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-stamp-h.in~4a5d6676232516c5
    1.3 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-delete.result
    1.1.1.1 03/03/10 12:31:08 monty@narttu.mysql.fi +0 -0
    Delete: mysql-test/r/delete.result

  scripts/mysqld_safe.sh
    1.39.9.2 03/03/10 12:30:45 monty@narttu.mysql.fi +0 -0
    Merge rename: scripts/safe_mysqld.sh -> scripts/mysqld_safe.sh

  BitKeeper/etc/ignore
    1.107.4.1 03/03/10 12:30:34 monty@narttu.mysql.fi +8 -8
    auto-union

ChangeSet
  1.676.1.669 03/03/10 12:24:22 monty@narttu.mysql.fi +2 -0
  Don't allow multiple --user options to mysqld
  (First one is used)

  sql/mysqld.cc
    1.162.1.109 03/03/10 12:24:22 monty@narttu.mysql.fi +4 -1
    Don't allow multiple --user options

  scripts/safe_mysqld.sh
    1.39.9.1 03/03/10 12:24:22 monty@narttu.mysql.fi +6 -2
    Don't allow multiple --user options

ChangeSet
  1.1346.133.22 03/03/10 14:06:21 hf@deer.mysql.r18.ru +2 -0
  Handling of log-error added in embedded server

  BitKeeper/etc/logging_ok
    1.206.17.16 03/03/10 14:06:21 hf@deer.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  libmysqld/lib_sql.cc
    1.25.3.6 03/03/10 14:05:23 hf@deer.mysql.r18.ru +15 -0
    handling of log-error added to embedded server

ChangeSet
  1.1346.135.11 03/03/10 12:00:19 monty@narttu.mysql.fi +2 -0
  Fix that round(0.1,1) == round(0.1,1)

  sql/slave.cc
    1.164.6.1 03/03/10 12:00:18 monty@narttu.mysql.fi +4 -3
    Fixed problem with --debug output in handle_slave

  sql/item_func.cc
    1.60.1.28 03/03/10 12:00:18 monty@narttu.mysql.fi +13 -5
    Fix that round(0.1,1) == round(0.1,1)

ChangeSet
  1.676.1.668 03/03/10 11:50:46 monty@narttu.mysql.fi +1 -0
  Better fix for connect timeout problem.

  libmysql/libmysql.c
    1.56.1.23 03/03/10 11:50:46 monty@narttu.mysql.fi +37 -34
    Better fix for connect timeout problem.

ChangeSet
  1.676.280.1 03/03/10 11:22:37 monty@narttu.mysql.fi +8 -0
  Don't allow BACKUP TABLE to overwrite files
  Fixed memory leak when replication restarts in debug mode

  mysql-test/t/backup-master.sh
    1.1 03/03/10 11:22:36 monty@narttu.mysql.fi +5 -0

  sql/slave.cc
    1.100.1.35 03/03/10 11:22:36 monty@narttu.mysql.fi +18 -16
    Fixed problem with --debug output from 'handle_slave'
    Fixed memory leak when replication restarts in debug mode

  sql/ha_myisam.cc
    1.73.2.10 03/03/10 11:22:36 monty@narttu.mysql.fi +21 -21
    Don't allow BACKUP TABLE to overwrite files

  mysys/my_copy.c
    1.7.1.1 03/03/10 11:22:36 monty@narttu.mysql.fi +22 -8
    Added option to not overwrite files to my_copy()

  mysql-test/t/backup.test
    1.6.2.1 03/03/10 11:22:36 monty@narttu.mysql.fi +21 -18
    Update for security fix in BACKUP TABLE

  mysql-test/t/backup-master.sh
    1.0 03/03/10 11:22:36 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-3.23/mysql-test/t/backup-master.sh

  mysql-test/r/backup.result
    1.4.1.1 03/03/10 11:22:36 monty@narttu.mysql.fi +8 -6
    Update for security fix in BACKUP TABLE

  mysql-test/mysql-test-run.sh
    1.66.6.1 03/03/10 11:22:36 monty@narttu.mysql.fi +2 -2
    Fixed --ddd option
    Fixed that mysqld is restarted if there is a testname-master.sh file

  include/my_sys.h
    1.41.1.11 03/03/10 11:22:36 monty@narttu.mysql.fi +1 -0
    Added option to not overwrite files to my_copy()

ChangeSet
  1.676.275.17 03/03/10 00:21:04 serg@serg.mysql.com +1 -0
  .del-stamp-h.in~4a5d6676232516c5:
    Delete: innobase/stamp-h.in

  BitKeeper/deleted/.del-stamp-h.in~4a5d6676232516c5
    1.1.1.1 03/03/10 00:20:56 serg@serg.mysql.com +0 -0
    Delete: innobase/stamp-h.in

ChangeSet
  1.1346.133.21 03/03/09 19:03:55 jani@rhols221.adsl.netsonic.fi +2 -0
  Made it possible to use --max-delayed-threads=0 in order to disable
  INSERT DELAYED.

  sql/sql_insert.cc
    1.63.1.30 03/03/09 19:03:53 jani@rhols221.adsl.netsonic.fi +2 -1
    Made it possible to use --max-delayed-threads=0 in order to disable
    INSERT DELAYED.

  sql/mysqld.cc
    1.297.1.107 03/03/09 19:03:53 jani@rhols221.adsl.netsonic.fi +2 -2
    Made it possible to use --max-delayed-threads=0 in order to disable
    INSERT DELAYED.

ChangeSet
  1.676.279.1 03/03/09 17:13:37 monty@mashka.mysql.fi +1 -0
  Changed --debug to append to test instead of creating new trace files.
  (This patch is already in 4.0)

  mysql-test/mysql-test-run.sh
    1.66.1.26 03/03/09 17:13:35 monty@mashka.mysql.fi +2 -2
    Changed --debug to append to test instead of creating new trace files

ChangeSet
  1.676.1.665 03/03/08 22:37:22 Sinisa@sinisa.nasamreza.org +1 -0
  Additional bug fix

  libmysql/libmysql.c
    1.56.1.22 03/03/08 22:37:20 Sinisa@sinisa.nasamreza.org +3 -0
    Additional fix for connection being established during select()

ChangeSet
  1.1494.10.4 03/03/08 22:19:41 Sinisa@sinisa.nasamreza.org +1 -0
  Fix for a crashing bug

  sql/sql_select.cc
    1.210 03/03/08 22:19:35 Sinisa@sinisa.nasamreza.org +1 -1
    Fix for a crashing bug

ChangeSet
  1.1346.133.20 03/03/08 18:53:32 guilhem@mysql.com +3 -0
  Clearer error message when one forgot to grant REPLICATION SLAVE :
  now we'll have something like this :
  030308 18:46:58  Slave I/O thread: connected to master 'gb@localhost:3306',  replication started in log 'FIRST' at position 4
  030308 18:46:58  While trying to obtain the list of slaves from the master 'localhost:3306', user 'gb' got the following error: 'Access denied. You need the REPLICATION SLAVE privilege for this operation'
  030308 18:46:58  Slave I/O thread exiting, read up to log 'FIRST', position 4
  instead of "Error updating slave list: Query error".
  This fixes bug #80.

  sql/slave.cc
    1.164.1.50 03/03/08 18:53:27 guilhem@mysql.com +1 -1
    Updated for new syntax of update_slave_list

  sql/repl_failsafe.h
    1.6.1.1 03/03/08 18:53:27 guilhem@mysql.com +1 -1
    Clearer error message when one forgot to grant REPLICATION SLAVE

  sql/repl_failsafe.cc
    1.11.1.17 03/03/08 18:53:27 guilhem@mysql.com +33 -5
    Clearer error message when one forgot to grant REPLICATION SLAVE

ChangeSet
  1.676.1.664 03/03/08 19:35:44 Sinisa@sinisa.nasamreza.org +1 -0
  A correct fix for the timeout problem

  libmysql/libmysql.c
    1.56.1.21 03/03/08 19:35:41 Sinisa@sinisa.nasamreza.org +4 -7
    A correct fix for the timeout problem

ChangeSet
  1.1494.10.3 03/03/07 21:48:22 Sinisa@sinisa.nasamreza.org +2 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/sql_yacc.yy
    1.203.28.2 03/03/07 21:48:11 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186.2.2 03/03/07 21:48:11 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1494.10.2 03/03/07 21:47:04 Sinisa@sinisa.nasamreza.org +3 -0
  An interim code cleanup.
  Major re-write of code yet has to be done, to circumvent
  assigning of UNIT to current select and to deal better with 
  offset, limit.

  sql/sql_yacc.yy
    1.203.29.1 03/03/07 21:46:59 Sinisa@sinisa.nasamreza.org +4 -4
    An interim code cleanup.
    Major re-write of code yet has to be done, to circumvent
    assigning of UNIT to current select and to deal better with 
    offset, limit.

  sql/sql_parse.cc
    1.271.3.2 03/03/07 21:46:59 Sinisa@sinisa.nasamreza.org +0 -1
    An interim code cleanup.
    Major re-write of code yet has to be done, to circumvent
    assigning of UNIT to current select and to deal better with 
    offset, limit.

  mysql-test/r/union.result
    1.33 03/03/07 21:46:59 Sinisa@sinisa.nasamreza.org +0 -1
    A fix of merge fix

ChangeSet
  1.1494.13.1 03/03/07 10:16:23 venu@myvenu.com +3 -0
  Change -IN_RPM -> --rpm and -WINDOWS -> --windows from mysql_install_db

  scripts/mysql_install_db.sh
    1.37.1.3 03/03/07 10:15:23 venu@myvenu.com +9 -9
    Change -IN_RPM -> --rpm and -WINDOWS -> --windows

  scripts/make_win_src_distribution.sh
    1.3 03/03/07 10:15:02 venu@myvenu.com +63 -60
    Change -WINDOWS -> --windows (call to mysql_install_db)

  support-files/mysql.spec.sh
    1.62 03/03/07 10:14:19 venu@myvenu.com +1 -1
    Change -IN_RPM -> --rpm

ChangeSet
  1.1346.133.19 03/03/07 15:22:05 serg@serg.mysql.com +1 -0
  error messages translated by Egor

  sql/share/russian/errmsg.txt
    1.45.1.8 03/03/07 15:22:02 serg@serg.mysql.com +222 -223
    error messages translated by Egor

ChangeSet
  1.676.1.663 03/03/07 14:40:37 monty@mashka.mysql.fi +4 -0
  Fixed an unlikely optimizer bug that casued a core dump in pt_range.cc::sel_cmp()

  sql/sql_rename.cc
    1.6.1.3 03/03/07 14:40:35 monty@mashka.mysql.fi +2 -2
    Added missing DEBUG_PRINT()

  sql/opt_range.cc
    1.44.1.4 03/03/07 14:40:35 monty@mashka.mysql.fi +8 -4
    Fixed an unlikely optimizer bug that casued a core dump in pt_range.cc::sel_cmp()

  mysql-test/t/join.test
    1.3.2.5 03/03/07 14:40:35 monty@mashka.mysql.fi +24 -0
    Test of range optimizer bug

  mysql-test/r/join.result
    1.3.3.5 03/03/07 14:40:35 monty@mashka.mysql.fi +4 -0
    Test of range optimizer bug

ChangeSet
  1.1346.133.18 03/03/07 11:58:07 serg@serg.mysql.com +1 -0
  Merge work:/home/bk/mysql-4.0
  into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

  sql/mysqld.cc
    1.297.1.106 03/03/07 11:58:04 serg@serg.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.140.4 03/03/07 11:55:07 serg@serg.mysql.com +1 -0
  missing grant check added

  sql/sql_parse.cc
    1.218.1.78 03/03/07 11:55:04 serg@serg.mysql.com +2 -0
    missing grant check added

ChangeSet
  1.1346.133.17 03/03/07 12:37:18 monty@mashka.mysql.fi +2 -0
  Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0

  configure.in
    1.191.1.76 03/03/07 12:37:16 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/ignore
    1.107.1.37 03/03/07 12:37:10 monty@mashka.mysql.fi +0 -2
    auto-union

ChangeSet
  1.1346.142.3 03/03/07 12:36:52 monty@mashka.mysql.fi +7 -0
  Fixed AUTO_INCREMENT handling in MyISAM (last auto_increment patch broke things)
  Some after merge fixes

  sql/ha_myisam.cc
    1.92.1.26 03/03/07 12:36:51 monty@mashka.mysql.fi +7 -7
    Fixed AUTO_INCREMENT handling in MyISAM (last auto_increment patch broke things)

  mysql-test/t/select.test
    1.12.1.4 03/03/07 12:36:51 monty@mashka.mysql.fi +0 -2
    Remove explicit database usage

  mysql-test/t/ctype_latin1_de.test
    1.4.1.1 03/03/07 12:36:51 monty@mashka.mysql.fi +2 -2
    Changed test to have more relevant results

  mysql-test/r/type_datetime.result
    1.8.1.3 03/03/07 12:36:51 monty@mashka.mysql.fi +0 -15
    Updated results after merge

  mysql-test/r/select.result
    1.8.1.14 03/03/07 12:36:51 monty@mashka.mysql.fi +0 -1
    Remove explicit database usage

  mysql-test/r/delete.result
    1.6.1.1 03/03/07 12:36:51 monty@mashka.mysql.fi +15 -0
    Updated results after merge

  mysql-test/r/ctype_latin1_de.result
    1.6 03/03/07 12:36:51 monty@mashka.mysql.fi +107 -103
    Changed test to have more relevant results

ChangeSet
  1.1455.4.16 03/03/07 10:58:42 pem@mysql.com +2 -0
  Updated documentation with the latest FUNCTION stuff.

  Docs/sp-implemented.txt
    1.5 03/03/07 10:58:40 pem@mysql.com +14 -18
    Updated documentation with the latest FUNCTION stuff.

  Docs/sp-imp-spec.txt
    1.4 03/03/07 10:58:40 pem@mysql.com +51 -8
    Updated documentation with the latest FUNCTION stuff.

ChangeSet
  1.1494.12.4 03/03/07 13:39:53 bar@bar.mysql.r18.ru +5 -0
  item_func.cc, item_cmpfunc.cc, unireg.cc, table.cc, sql_base.cc:
    some default_charset_info were removed

  sql/item_func.cc
    1.120 03/03/07 13:39:26 bar@bar.mysql.r18.ru +1 -1
    some default_charset_info were removed

  sql/item_cmpfunc.cc
    1.75 03/03/07 13:39:24 bar@bar.mysql.r18.ru +5 -5
    some default_charset_info were removed

  sql/unireg.cc
    1.25 03/03/07 13:39:22 bar@bar.mysql.r18.ru +3 -3
    some default_charset_info were removed

  sql/table.cc
    1.72 03/03/07 13:39:12 bar@bar.mysql.r18.ru +1 -1
    some default_charset_info were removed

  sql/sql_base.cc
    1.143 03/03/07 13:39:01 bar@bar.mysql.r18.ru +2 -3
    some default_charset_info were removed

ChangeSet
  1.1494.12.3 03/03/07 12:55:55 bar@bar.mysql.r18.ru +1 -0
  sql_load.cc:
    LOAD DATA INFILE now uses database character set instead of server character set. This is not excellent but at least allows to load for example cyrillic data into cyrillic database if server charset is latin1. In the future we should add a syntax to specify file charset or evern charset of each field.

  sql/sql_load.cc
    1.46 03/03/07 12:54:04 bar@bar.mysql.r18.ru +16 -14
    LOAD DATA INFILE now uses database character set instead of server character set. This is not excellent but at least allows to load for example cyrillic data into cyrillic database if server charset is latin1. In the future we should add a syntax to specify file charset or evern charset of each field.

ChangeSet
  1.1494.12.2 03/03/07 12:21:32 bar@bar.mysql.r18.ru +7 -0
  sql_acl.cc, item.h:
    use of new argument
  sql_analyse.h:
    macros from mysql_priv.h. Should be deleted soon.
  mysql_priv.h:
    _default_charset_info has been removed
  item_cmpfunc.h:
    Use cmp_charset
  hostname.cc, hash_filo.h:
    Move charset to constructor argument

  sql/sql_acl.cc
    1.71 03/03/07 12:21:12 bar@bar.mysql.r18.ru +1 -1
    use of new argument

  sql/item.h
    1.56.1.5 03/03/07 12:20:59 bar@bar.mysql.r18.ru +5 -4
    use of new argument

ChangeSet
  1.1346.133.16 03/03/07 10:20:44 heikki@hundin.mysql.fi +1 -0
  os0file.c:
    Fix bug in previous push

  innobase/os/os0file.c
    1.44.1.3 03/03/07 10:20:37 heikki@hundin.mysql.fi +2 -2
    Fix bug in previous push

  sql/sql_analyse.h
    1.17 03/03/07 12:20:25 bar@bar.mysql.r18.ru +2 -0
    macros from mysql_priv.h. Should be deleted soon.

  sql/mysql_priv.h
    1.186.3.1 03/03/07 12:19:50 bar@bar.mysql.r18.ru +0 -1
    _default_charset_info has been removed

  sql/item_cmpfunc.h
    1.48 03/03/07 12:19:20 bar@bar.mysql.r18.ru +1 -1
    Use cmp_charset

  sql/hostname.cc
    1.23 03/03/07 12:19:13 bar@bar.mysql.r18.ru +2 -1
    Move charset to constructor argument

  sql/hash_filo.h
    1.9 03/03/07 12:18:54 bar@bar.mysql.r18.ru +6 -3
    Move charset to constructor argument

ChangeSet
  1.1346.133.15 03/03/07 10:07:06 heikki@hundin.mysql.fi +1 -0
  os0file.c:
    Print and error message also if a read from file results in the Linux error EEXIST; may happen if the disk is broken

  innobase/os/os0file.c
    1.44.1.2 03/03/07 10:06:57 heikki@hundin.mysql.fi +24 -4
    Print and error message also if a read from file results in the Linux error EEXIST; may happen if the disk is broken

ChangeSet
  1.1494.12.1 03/03/07 11:54:26 bar@bar.mysql.r18.ru +3 -0
  New syntax to change client collation:
  SET COLLATION latin1
  SET COLLATION 'latin1'
  SET COLLATION DEFAULT

  sql/sql_yacc.yy
    1.203.28.1 03/03/07 11:54:25 bar@bar.mysql.r18.ru +29 -1
    New syntax to change client collation:
    SET COLLATION latin1
    SET COLLATION 'latin1'
    SET COLLATION DEFAULT

  mysql-test/t/ctype_collate.test
    1.4 03/03/07 11:54:25 bar@bar.mysql.r18.ru +15 -0
    New syntax to change client collation:
    SET COLLATION latin1
    SET COLLATION 'latin1'
    SET COLLATION DEFAULT

  mysql-test/r/ctype_collate.result
    1.4 03/03/07 11:54:25 bar@bar.mysql.r18.ru +39 -0
    New syntax to change client collation:
    SET COLLATION latin1
    SET COLLATION 'latin1'
    SET COLLATION DEFAULT

ChangeSet
  1.1494.11.2 03/03/07 09:05:17 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-lookup-4.1

  sql/sql_yacc.yy
    1.203.1.48 03/03/07 09:05:15 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.142.2 03/03/07 01:20:56 monty@mashka.mysql.fi +17 -0
  Merge to get fix for LOCK TABLES + DROP TABLE in another thread

  sql/sql_table.cc
    1.112.8.1 03/03/07 01:20:54 monty@mashka.mysql.fi +7 -11
    Merge to get fix for LOCK TABLES + DROP TABLE in another thread

  sql/sql_repl.h
    1.24.2.1 03/03/07 01:20:54 monty@mashka.mysql.fi +0 -1
    Use local version

  sql/sql_rename.cc
    1.13.2.1 03/03/07 01:20:54 monty@mashka.mysql.fi +3 -3
    Merge to get fix for LOCK TABLES + DROP TABLE in another thread

  sql/mysqld.cc
    1.297.25.1 03/03/07 01:20:54 monty@mashka.mysql.fi +0 -3
    Use local version

  sql/mysql_priv.h
    1.150.7.1 03/03/07 01:20:54 monty@mashka.mysql.fi +0 -1
    Use local version

  sql/log_event.h
    1.71.1.3 03/03/07 01:20:54 monty@mashka.mysql.fi +0 -1
    Use local version

  mysql-test/r/type_datetime.result
    1.8.1.2 03/03/07 01:20:54 monty@mashka.mysql.fi +21 -1
    Update results after merge

  sql/sql_select.cc
    1.152.1.72 03/03/07 01:02:14 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.45.1.8 03/03/07 01:02:14 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/lock.cc
    1.38.2.1 03/03/07 01:02:13 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/field.h
    1.33.1.14 03/03/07 01:02:13 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/type_datetime.test
    1.6.1.1 03/03/07 01:02:13 monty@mashka.mysql.fi +1 -1
    Auto merged

  mysql-test/t/delete.test
    1.7.1.1 03/03/07 01:02:13 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysql/libmysql.c
    1.95.1.29 03/03/07 01:02:13 monty@mashka.mysql.fi +0 -0
    Auto merged

  client/mysqlbinlog.cc
    1.70.1.1 03/03/07 01:02:13 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-delete.result
    1.2 03/03/07 01:02:13 monty@mashka.mysql.fi +0 -0
    Delete: mysql-test/r/delete.result

  BitKeeper/etc/ignore
    1.107.3.1 03/03/07 01:01:18 monty@mashka.mysql.fi +8 -8
    auto-union

ChangeSet
  1.1346.142.1 03/03/07 01:00:58 monty@mashka.mysql.fi +3 -0
  Portability fix for IBM compiler on AIX

  sql-bench/crash-me.sh
    1.34.1.12 03/03/07 01:00:55 monty@mashka.mysql.fi +30 -7
    Fix for connect test

  mysys/my_tempnam.c
    1.13 03/03/07 01:00:55 monty@mashka.mysql.fi +8 -2
    Portability fix for IBM compiler on AIX

  configure.in
    1.191.12.1 03/03/07 01:00:55 monty@mashka.mysql.fi +0 -1
    Remove duplicated configure line

ChangeSet
  1.1494.11.1 03/03/07 03:44:15 wax@kishkin.ru +1 -0
  Merge kishkin.ru:/home/wax/mysql-4n into kishkin.ru:/home/wax/mysql-4nh

  sql/mysqld.cc
    1.342 03/03/07 03:44:08 wax@kishkin.ru +0 -0
    Auto merged

ChangeSet
  1.1346.133.14 03/03/06 22:53:58 guilhem@mysql.com +1 -0
  remove spaces according to coding rules

  sql/sql_insert.cc
    1.63.1.29 03/03/06 22:53:56 guilhem@mysql.com +2 -2
    remove spaces according to coding rules

ChangeSet
  1.1346.133.13 03/03/06 22:46:24 guilhem@mysql.com +1 -0
  Fix so that INSERT DELAYED cares about SQL_LOG_BIN=0 (bug #104)

  sql/sql_insert.cc
    1.63.1.28 03/03/06 22:41:06 guilhem@mysql.com +28 -11
    Fix so that INSERT DELAYED cares about SQL_LOG_BIN=0 (bug #104)

ChangeSet
  1.1455.4.15 03/03/06 19:16:46 pem@mysql.com +4 -0
  Fixed reentrantness bugs in select (lex->result) and select_dumpvar, and added cool
  prime number test example.

  sql/sql_select.cc
    1.203.1.1 03/03/06 19:16:41 pem@mysql.com +2 -1
    Don't delete result if it's a lex member (since lex needs to be reentrant).

  sql/sql_class.cc
    1.110 03/03/06 19:16:41 pem@mysql.com +3 -0
    Reset row_count in select_dumpvar when preparing, to make it reentrant as a lex member.

  mysql-test/t/sp.test
    1.13 03/03/06 19:16:41 pem@mysql.com +91 -1
    New prime number example. (Good for future benchmarkings too.)

  mysql-test/r/sp.result
    1.12 03/03/06 19:16:41 pem@mysql.com +69 -7
    New prime number example. (Good for future benchmarkings too.)

ChangeSet
  1.1346.141.1 03/03/06 17:37:12 bell@sanja.is.com.ua +3 -0
  do not allow to cache queries with INTO clause

  sql/sql_yacc.yy
    1.145.14.1 03/03/06 17:37:07 bell@sanja.is.com.ua +6 -2
    do not allow to cache queries with INTO clause

  mysql-test/t/query_cache.test
    1.16.2.1 03/03/06 17:37:07 bell@sanja.is.com.ua +13 -0
    INTO OUTFILE/DUMPFILE test

  mysql-test/r/query_cache.result
    1.15.2.1 03/03/06 17:37:07 bell@sanja.is.com.ua +12 -0
    INTO OUTFILE/DUMPFILE test

ChangeSet
  1.1494.10.1 03/03/06 17:31:22 Sinisa@sinisa.nasamreza.org +8 -0
  merge fixes

  sql/sql_prepare.cc
    1.33 03/03/06 17:31:18 Sinisa@sinisa.nasamreza.org +3 -5
    merge fixes

  mysql-test/t/union.test
    1.33 03/03/06 17:31:18 Sinisa@sinisa.nasamreza.org +0 -0
    merge fixes

  mysql-test/r/union.result
    1.32 03/03/06 17:31:18 Sinisa@sinisa.nasamreza.org +1 -0
    merge fixes

ChangeSet
  1.1494.1.15 03/03/06 16:29:41 lenz@mysql.com +2 -0
  Merge kallisto:/my/mysql-4.1 into mysql.com:/my/mysql-4.1

  BitKeeper/etc/logging_ok
    1.233.2.1 03/03/06 16:27:17 lenz@mysql.com +0 -1
    auto-union

  BitKeeper/etc/gone
    1.86.8.1 03/03/06 16:27:16 lenz@mysql.com +0 -1077
    auto-union

ChangeSet
  1.1346.133.12 03/03/06 16:22:31 guilhem@mysql.com +1 -0
  Make log_pos be non-zero in the binary log, for BEGIN and COMMIT Query_log_events.
  Now log_pos is the real position of the event. For events that are between BEGIN and COMMIT,
  log_pos is still the BEGIN's log_pos.
  This fixes bug #52 (If only transactions are run on the master then t

  sql/log.cc
    1.80.1.32 03/03/06 16:22:29 guilhem@mysql.com +9 -0
    Make log_pos be non-zero in the binary log, for BEGIN and COMMIT Query_log_events.
    Now log_pos is the real position of the event. For events that are between BEGIN and COMMIT,
    log_pos is still the BEGIN's log_pos.
    This fixes bug #52 (If only transactions are run on the master then t

ChangeSet
  1.1346.1.72 03/03/06 16:18:28 lenz@mysql.com +2 -0
  Merge kallisto:/my/mysql-4.0 into mysql.com:/my/mysql-4.0

  BitKeeper/etc/logging_ok
    1.206.1.56 03/03/06 16:17:18 lenz@mysql.com +0 -0
    auto-union

  BitKeeper/etc/gone
    1.90 03/03/06 16:17:18 lenz@mysql.com +0 -0
    auto-union

  sql/sql_update.cc
    1.79 03/03/06 17:15:16 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_union.cc
    1.67 03/03/06 17:15:16 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_select.cc
    1.209 03/03/06 17:15:15 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_parse.cc
    1.271.3.1 03/03/06 17:15:15 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/item_subselect.cc
    1.56.1.2 03/03/06 17:15:15 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1463.2.1 03/03/06 17:02:10 Sinisa@sinisa.nasamreza.org +12 -0
  three bug fixes and major code cleanup

  sql/sql_update.cc
    1.77.1.1 03/03/06 17:02:05 Sinisa@sinisa.nasamreza.org +1 -1
    three bug fixes and major code cleanup

  sql/sql_union.cc
    1.65.1.1 03/03/06 17:02:05 Sinisa@sinisa.nasamreza.org +39 -25
    three bug fixes and major code cleanup

  sql/sql_select.h
    1.40 03/03/06 17:02:05 Sinisa@sinisa.nasamreza.org +1 -2
    three bug fixes and major code cleanup

  sql/sql_select.cc
    1.206.2.1 03/03/06 17:02:05 Sinisa@sinisa.nasamreza.org +13 -17
    three bug fixes and major code cleanup

  sql/sql_prepare.cc
    1.29.1.1 03/03/06 17:02:05 Sinisa@sinisa.nasamreza.org +1 -1
    three bug fixes and major code cleanup

  sql/sql_parse.cc
    1.271.2.1 03/03/06 17:02:05 Sinisa@sinisa.nasamreza.org +1 -1
    three bug fixes and major code cleanup

  sql/sql_lex.h
    1.102.6.1 03/03/06 17:02:05 Sinisa@sinisa.nasamreza.org +12 -0
    three bug fixes and major code cleanup

  sql/sql_derived.cc
    1.40 03/03/06 17:02:05 Sinisa@sinisa.nasamreza.org +1 -1
    three bug fixes and major code cleanup

  sql/mysql_priv.h
    1.186.2.1 03/03/06 17:02:05 Sinisa@sinisa.nasamreza.org +1 -2
    three bug fixes and major code cleanup

  sql/item_subselect.cc
    1.56.2.1 03/03/06 17:02:05 Sinisa@sinisa.nasamreza.org +1 -1
    three bug fixes and major code cleanup

  mysql-test/t/union.test
    1.31.1.1 03/03/06 17:02:05 Sinisa@sinisa.nasamreza.org +1 -0
    three bug fixes and major code cleanup

  mysql-test/r/union.result
    1.30.1.1 03/03/06 17:02:05 Sinisa@sinisa.nasamreza.org +4 -0
    three bug fixes and major code cleanup

ChangeSet
  1.1494.9.2 03/03/06 15:29:55 serg@serg.mysql.com +2 -0
  make the test more obvious

  mysql-test/t/binary.test
    1.8 03/03/06 15:29:53 serg@serg.mysql.com +8 -8
    make the test more obvious

  mysql-test/r/binary.result
    1.10 03/03/06 15:29:53 serg@serg.mysql.com +23 -23
    make the test more obvious

ChangeSet
  1.1494.9.1 03/03/06 14:58:37 serg@serg.mysql.com +2 -0
  trim spaces from CHAR() BINARY consistently

  strings/ctype-bin.c
    1.23.1.1 03/03/06 14:58:34 serg@serg.mysql.com +16 -1
    trim spaces from CHAR() BINARY consistently

  mysql-test/r/binary.result
    1.9 03/03/06 14:58:34 serg@serg.mysql.com +1 -0
    trim spaces from CHAR() BINARY consistently

ChangeSet
  1.1494.7.1 03/03/06 13:51:37 lenz@mysql.com +5 -0
   - Changed C++-style comments to C-style comments to make IBM compiler happy

  strings/t_ctype.h
    1.6 03/03/06 13:51:34 lenz@mysql.com +4 -4
     - Changed C++-style comments to C-style comments to make IBM compiler happy

  strings/ctype-mb.c
    1.9 03/03/06 13:51:34 lenz@mysql.com +9 -9
     - Changed C++-style comments to C-style comments to make IBM compiler happy

  strings/ctype-bin.c
    1.24 03/03/06 13:51:34 lenz@mysql.com +8 -8
     - Changed C++-style comments to C-style comments to make IBM compiler happy

  client/mysqlshow.c
    1.28 03/03/06 13:51:34 lenz@mysql.com +1 -1
     - Changed C++-style comments to C-style comments to make IBM compiler happy

  client/mysqldump.c
    1.80 03/03/06 13:51:34 lenz@mysql.com +1 -1
     - Changed C++-style comments to C-style comments to make IBM compiler happy

ChangeSet
  1.1494.1.13 03/03/06 16:25:06 ram@mysql.r18.ru +2 -0
  Added IsClosed() tests for MultiLineString objects.
  Added Centroid(), Area() tests for MultiPolygon objects.

  mysql-test/t/gis.test
    1.2 03/03/06 16:25:02 ram@mysql.r18.ru +5 -0
    Added IsClosed() tests for MultiLineString objects.
    Added Centroid(), Area() tests for MultiPolygon objects.

  mysql-test/r/gis.result
    1.2 03/03/06 16:25:02 ram@mysql.r18.ru +15 -0
    Added IsClosed() tests for MultiLineString objects.
    Added Centroid(), Area() tests for MultiPolygon objects.

ChangeSet
  1.1494.1.12 03/03/06 15:44:52 ram@mysql.r18.ru +1 -0
  Bug fix: should use float8get() instead of (double *) type cast.
  Code clean-up according 'Coding Standards and Styles'

  sql/spatial.cc
    1.9 03/03/06 15:44:46 ram@mysql.r18.ru +92 -71
    Bug fix: should use float8get() instead of (double *) type cast.
    Code clean-up according 'Coding Standards and Styles'

ChangeSet
  1.1346.140.3 03/03/06 10:54:27 serg@serg.mysql.com +2 -0
  disable partial timestamps in --new mode

  sql/field.cc
    1.51.1.19 03/03/06 10:54:24 serg@serg.mysql.com +6 -10
    disable partial timestamps in --new mode

  mysql-test/r/type_timestamp.result
    1.7.1.2 03/03/06 10:54:24 serg@serg.mysql.com +2 -2
    disable partial timestamps in --new mode

ChangeSet
  1.1494.1.11 03/03/05 18:52:47 greg@mysql.com[greg] +4 -0
  novell41b.patch

  netware/test_db.sql
    1.3 03/03/05 11:18:07 greg@mysql.com[greg] +13 -5
    Import patch novell41b.patch

  netware/init_db.sql
    1.3 03/03/05 11:18:07 greg@mysql.com[greg] +8 -7
    Import patch novell41b.patch

  netware/BUILD/mwenv
    1.3 03/03/05 11:18:07 greg@mysql.com[greg] +6 -6
    Import patch novell41b.patch

  BitKeeper/deleted/.del-netware.patch~f70a3a965f54d9ee
    1.1.1.1 03/03/05 18:52:45 greg@mysql.com[greg] +0 -0
    Delete: netware/netware.patch

ChangeSet
  1.1346.133.11 03/03/05 18:47:08 greg@mysql.com +1 -0
  Remove netware.patch (not needed)

  BitKeeper/deleted/.del-netware.patch~f70a3a965f54d9ee
    1.2 03/03/05 18:43:58 greg@mysql.com +0 -0
    Delete: netware/netware.patch

ChangeSet
  1.1494.6.1 03/03/05 23:32:59 bell@sanja.is.com.ua +4 -0
  calloc replaced with alloc in st_select_lex_node 'new' operator (SCRUM?)

  sql/sql_yacc.yy
    1.203.27.1 03/03/05 23:32:48 bell@sanja.is.com.ua +0 -1
    removed initialization which will be done in init_qiery method

  sql/sql_parse.cc
    1.271.1.5 03/03/05 23:32:48 bell@sanja.is.com.ua +1 -1
    no need full initialization here

  sql/sql_lex.h
    1.102.1.21 03/03/05 23:32:48 bell@sanja.is.com.ua +1 -2
    calloc replaced with alloc

  sql/sql_lex.cc
    1.77 03/03/05 23:32:48 bell@sanja.is.com.ua +13 -8
    initialization of all need field

ChangeSet
  1.1455.4.14 03/03/05 19:45:17 pem@mysql.com +32 -0
  Improved error handling regarding SPs (with info like names etc in the output).
  Disabled queries in FUNCTIONs.

  mysql-test/t/sp-error.test
    1.1 03/03/05 19:45:12 pem@mysql.com +110 -0

  mysql-test/r/sp-error.result
    1.1 03/03/05 19:45:12 pem@mysql.com +70 -0

  sql/sql_yacc.yy
    1.221 03/03/05 19:45:12 pem@mysql.com +54 -14
    Improved error handling regarding SPs (adding info like names etc in output).
    Disabled queries in FUNCTIONS (since it can't work anyway).

  sql/sql_parse.cc
    1.277 03/03/05 19:45:12 pem@mysql.com +30 -15
    Improved error handling regarding SPs (adding info like names etc in output).

  sql/sql_lex.h
    1.108 03/03/05 19:45:12 pem@mysql.com +1 -1
    Added SQLCOM_CREATE_SPFUNCTION (for improved error handling).

  sql/sp_head.h
    1.10 03/03/05 19:45:12 pem@mysql.com +1 -5
    Moved sp_instr_jump::execute() to sp_head.cc.

  sql/sp_head.cc
    1.16 03/03/05 19:45:12 pem@mysql.com +13 -0
    Added debug output to sp_instr_jump::execute(). (Moved from sp_head.h)

  sql/share/ukrainian/errmsg.txt
    1.32 03/03/05 19:45:12 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  sql/share/swedish/errmsg.txt
    1.69 03/03/05 19:45:12 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  sql/share/spanish/errmsg.txt
    1.69 03/03/05 19:45:12 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  sql/share/slovak/errmsg.txt
    1.69 03/03/05 19:45:12 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  sql/share/serbian/errmsg.txt
    1.23 03/03/05 19:45:12 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  sql/share/russian/errmsg.txt
    1.66 03/03/05 19:45:12 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  sql/share/romanian/errmsg.txt
    1.67 03/03/05 19:45:12 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  sql/share/portuguese/errmsg.txt
    1.69 03/03/05 19:45:12 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  sql/share/polish/errmsg.txt
    1.68 03/03/05 19:45:12 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  mysql-test/t/sp-error.test
    1.0 03/03/05 19:45:12 pem@mysql.com +0 -0
    BitKeeper file /home/pem/work/mysql-5.0/mysql-test/t/sp-error.test

  mysql-test/r/sp-error.result
    1.0 03/03/05 19:45:12 pem@mysql.com +0 -0
    BitKeeper file /home/pem/work/mysql-5.0/mysql-test/r/sp-error.result

  sql/share/norwegian/errmsg.txt
    1.68 03/03/05 19:45:11 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  sql/share/norwegian-ny/errmsg.txt
    1.68 03/03/05 19:45:11 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  sql/share/korean/errmsg.txt
    1.68 03/03/05 19:45:11 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  sql/share/japanese/errmsg.txt
    1.68 03/03/05 19:45:11 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  sql/share/italian/errmsg.txt
    1.75 03/03/05 19:45:11 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  sql/share/hungarian/errmsg.txt
    1.70 03/03/05 19:45:11 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  sql/share/greek/errmsg.txt
    1.69 03/03/05 19:45:11 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  sql/share/german/errmsg.txt
    1.69 03/03/05 19:45:11 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  sql/share/french/errmsg.txt
    1.68 03/03/05 19:45:11 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  sql/share/estonian/errmsg.txt
    1.69 03/03/05 19:45:11 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  sql/share/english/errmsg.txt
    1.76 03/03/05 19:45:11 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  sql/share/dutch/errmsg.txt
    1.71 03/03/05 19:45:11 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  sql/share/danish/errmsg.txt
    1.67 03/03/05 19:45:11 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  sql/share/czech/errmsg.txt
    1.69 03/03/05 19:45:11 pem@mysql.com +11 -10
    New error message for queries in FUNCTIONs.
    Improved most of the SP error messages with added info.

  mysql-test/t/sp.test
    1.12 03/03/05 19:45:11 pem@mysql.com +0 -18
    Moved error tests to sp-error.test.

  include/mysqld_error.h
    1.66 03/03/05 19:45:11 pem@mysql.com +2 -1
    New error message for queries in FUNCTIONs.

ChangeSet
  1.1346.140.2 03/03/05 18:43:56 serg@serg.mysql.com +7 -0
  --new option and local variable to optionally turn on
  "very new functions" - for now 4.1-compatible TIMESTAMT format

  sql/unireg.h
    1.16.1.1 03/03/05 18:43:53 serg@serg.mysql.com +1 -2
    --new option and local variable to optionally turn on
    "very new functions" - for now 4.1-compatible TIMESTAMT format

  sql/sql_class.h
    1.111.1.30 03/03/05 18:43:53 serg@serg.mysql.com +2 -1
    --new option and local variable to optionally turn on
    "very new functions" - for now 4.1-compatible TIMESTAMT format

  sql/set_var.cc
    1.12.1.12 03/03/05 18:43:53 serg@serg.mysql.com +3 -0
    --new option and local variable to optionally turn on
    "very new functions" - for now 4.1-compatible TIMESTAMT format

  sql/mysqld.cc
    1.297.1.105 03/03/05 18:43:53 serg@serg.mysql.com +8 -9
    --new option and local variable to optionally turn on
    "very new functions" - for now 4.1-compatible TIMESTAMT format

  sql/field.cc
    1.51.1.18 03/03/05 18:43:53 serg@serg.mysql.com +23 -6
    --new option and local variable to optionally turn on
    "very new functions" - for now 4.1-compatible TIMESTAMT format

  mysql-test/t/type_timestamp.test
    1.6.1.1 03/03/05 18:43:53 serg@serg.mysql.com +14 -0
    --new option and local variable to optionally turn on
    "very new functions" - for now 4.1-compatible TIMESTAMT format

  mysql-test/r/type_timestamp.result
    1.7.1.1 03/03/05 18:43:53 serg@serg.mysql.com +20 -0
    --new option and local variable to optionally turn on
    "very new functions" - for now 4.1-compatible TIMESTAMT format

ChangeSet
  1.1494.1.10 03/03/05 16:10:40 monty@mashka.mysql.fi +1 -0
  Fixed character set bug when replicating user variables

  sql/log_event.cc
    1.108 03/03/05 16:10:37 monty@mashka.mysql.fi +17 -13
    Fixed character set bug when replicating user variables.
    Simple optimisation of User_var_log_event::write_data

ChangeSet
  1.676.1.662 03/03/05 15:45:11 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql
  into sinisa.nasamreza.org:/mnt/work/mysql

  sql/mysql_priv.h
    1.93.1.17 03/03/05 15:45:09 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.676.1.661 03/03/05 15:34:58 Sinisa@sinisa.nasamreza.org +5 -0
  A better, but larger fix for server_id bug ..

  sql/sql_repl.h
    1.5.1.3 03/03/05 15:34:55 Sinisa@sinisa.nasamreza.org +1 -1
    A better, but larger fix for server_id bug ..

  sql/mysqld.cc
    1.162.1.108 03/03/05 15:34:55 Sinisa@sinisa.nasamreza.org +3 -3
    A better, but larger fix for server_id bug ..

  sql/mysql_priv.h
    1.93.3.1 03/03/05 15:34:55 Sinisa@sinisa.nasamreza.org +1 -1
    A better, but larger fix for server_id bug ..

  sql/log_event.h
    1.41.1.5 03/03/05 15:34:55 Sinisa@sinisa.nasamreza.org +1 -1
    A better, but larger fix for server_id bug ..

  client/mysqlbinlog.cc
    1.44.1.7 03/03/05 15:34:55 Sinisa@sinisa.nasamreza.org +1 -1
    A better, but larger fix for server_id bug ..

ChangeSet
  1.1494.5.1 03/03/05 16:43:10 bar@bar.mysql.r18.ru +18 -0
  New fields in CHARSET_INFO structure to optimize searching for
  binary and primary collations in the future

  strings/ctype.c
    1.56 03/03/05 16:43:08 bar@bar.mysql.r18.ru +10 -0
    New fields in CHARSET_INFO structure to optimize searching for
    binary and primary collations in the future

  strings/ctype-win1250ch.c
    1.19 03/03/05 16:43:08 bar@bar.mysql.r18.ru +1 -1
    New fields in CHARSET_INFO structure to optimize searching for
    binary and primary collations in the future

  strings/ctype-utf8.c
    1.35 03/03/05 16:43:08 bar@bar.mysql.r18.ru +2 -2
    New fields in CHARSET_INFO structure to optimize searching for
    binary and primary collations in the future

  strings/ctype-ujis.c
    1.31 03/03/05 16:43:08 bar@bar.mysql.r18.ru +1 -1
    New fields in CHARSET_INFO structure to optimize searching for
    binary and primary collations in the future

  strings/ctype-tis620.c
    1.37 03/03/05 16:43:08 bar@bar.mysql.r18.ru +1 -1
    New fields in CHARSET_INFO structure to optimize searching for
    binary and primary collations in the future

  strings/ctype-sjis.c
    1.38 03/03/05 16:43:08 bar@bar.mysql.r18.ru +1 -1
    New fields in CHARSET_INFO structure to optimize searching for
    binary and primary collations in the future

  strings/ctype-latin1_de.c
    1.28 03/03/05 16:43:08 bar@bar.mysql.r18.ru +1 -1
    New fields in CHARSET_INFO structure to optimize searching for
    binary and primary collations in the future

  strings/ctype-latin1.c
    1.5 03/03/05 16:43:08 bar@bar.mysql.r18.ru +1 -1
    New fields in CHARSET_INFO structure to optimize searching for
    binary and primary collations in the future

  strings/ctype-gbk.c
    1.33 03/03/05 16:43:08 bar@bar.mysql.r18.ru +1 -1
    New fields in CHARSET_INFO structure to optimize searching for
    binary and primary collations in the future

  strings/ctype-gb2312.c
    1.29 03/03/05 16:43:07 bar@bar.mysql.r18.ru +1 -1
    New fields in CHARSET_INFO structure to optimize searching for
    binary and primary collations in the future

  strings/ctype-extra.c
    1.5 03/03/05 16:43:07 bar@bar.mysql.r18.ru +67 -27
    New fields in CHARSET_INFO structure to optimize searching for
    binary and primary collations in the future

  strings/ctype-euc_kr.c
    1.31 03/03/05 16:43:07 bar@bar.mysql.r18.ru +1 -1
    New fields in CHARSET_INFO structure to optimize searching for
    binary and primary collations in the future

  strings/ctype-czech.c
    1.31 03/03/05 16:43:07 bar@bar.mysql.r18.ru +1 -1
    New fields in CHARSET_INFO structure to optimize searching for
    binary and primary collations in the future

  strings/ctype-bin.c
    1.23 03/03/05 16:43:07 bar@bar.mysql.r18.ru +1 -1
    New fields in CHARSET_INFO structure to optimize searching for
    binary and primary collations in the future

  strings/ctype-big5.c
    1.33 03/03/05 16:43:07 bar@bar.mysql.r18.ru +1 -1
    New fields in CHARSET_INFO structure to optimize searching for
    binary and primary collations in the future

  sql/sql_yacc.yy
    1.203.1.47 03/03/05 16:43:07 bar@bar.mysql.r18.ru +13 -15
    New fields in CHARSET_INFO structure to optimize searching for
    binary and primary collations in the future

  mysys/charset.c
    1.74 03/03/05 16:43:07 bar@bar.mysql.r18.ru +10 -0
    New fields in CHARSET_INFO structure to optimize searching for
    binary and primary collations in the future

  include/m_ctype.h
    1.61 03/03/05 16:43:07 bar@bar.mysql.r18.ru +2 -0
    New fields in CHARSET_INFO structure to optimize searching for
    binary and primary collations in the future

ChangeSet
  1.1346.140.1 03/03/05 13:10:23 serg@serg.mysql.com +1 -0
  my_dir.h is included by raid.h

  include/Makefile.am
    1.29.1.8 03/03/05 13:10:21 serg@serg.mysql.com +2 -2
    my_dir.h is included by raid.h

ChangeSet
  1.1494.1.8 03/03/05 16:07:12 ram@mysql.r18.ru +1 -0
  Bug fix: we should set proper my_errno

  myisam/rt_index.c
    1.7 03/03/05 16:07:09 ram@mysql.r18.ru +13 -1
    Bug fix: we should set proper my_errno

ChangeSet
  1.1346.133.10 03/03/05 12:42:10 lenz@mysql.com +1 -0
   - Fixed URL to Using_stack_trace.html (the old one still works, but gets
     redirected to the new location

  sql/stacktrace.c
    1.12.1.1 03/03/05 12:42:08 lenz@mysql.com +1 -1
     - Fixed URL to Using_stack_trace.html (the old one still works, but gets
       redirected to the new location

ChangeSet
  1.1346.133.9 03/03/05 09:49:28 lenz@mysql.com +1 -0
   - safeguard against an endless loop when MIT pthreads are not installed
     (Bug #121)

  configure.in
    1.191.1.75 03/03/05 09:49:25 lenz@mysql.com +1 -1
     - safeguard against an endless loop when MIT pthreads are not installed
       (Bug #121)

ChangeSet
  1.1494.1.7 03/03/05 12:37:39 bar@bar.mysql.r18.ru +5 -0
  SET NAMES has been extended to support optional collation:
  
  SET NAMES <charset name> [COLLATE <collation name>]

  sql/sql_yacc.yy
    1.203.1.46 03/03/05 12:37:38 bar@bar.mysql.r18.ru +27 -7
    SET NAMES has been extended to support optional collation:
    
    SET NAMES <charset name> [COLLATE <collation name>]

  sql/set_var.h
    1.14 03/03/05 12:37:38 bar@bar.mysql.r18.ru +2 -2
    SET NAMES has been extended to support optional collation:
    
    SET NAMES <charset name> [COLLATE <collation name>]

  sql/set_var.cc
    1.30.1.2 03/03/05 12:37:38 bar@bar.mysql.r18.ru +9 -9
    SET NAMES has been extended to support optional collation:
    
    SET NAMES <charset name> [COLLATE <collation name>]

  mysql-test/t/ctype_collate.test
    1.3 03/03/05 12:37:38 bar@bar.mysql.r18.ru +14 -0
    SET NAMES has been extended to support optional collation:
    
    SET NAMES <charset name> [COLLATE <collation name>]

  mysql-test/r/ctype_collate.result
    1.3 03/03/05 12:37:38 bar@bar.mysql.r18.ru +18 -0
    SET NAMES has been extended to support optional collation:
    
    SET NAMES <charset name> [COLLATE <collation name>]

ChangeSet
  1.1494.1.6 03/03/05 08:13:37 lenz@mysql.com +1 -0
   - typo fix (replaced blanks with a tab)

  mysql-test/Makefile.am
    1.23 03/03/05 08:13:34 lenz@mysql.com +1 -1
     - typo fix (replaced blanks with a tab)

ChangeSet
  1.1494.1.4 03/03/04 14:31:42 venu@myvenu.com +1 -0
  sql_prepare.cc:
    Remove the unused code (from previous commit)

  sql/sql_prepare.cc
    1.32 03/03/04 14:30:53 venu@myvenu.com +0 -5
    Remove the unused code (from previous commit)

ChangeSet
  1.1494.1.3 03/03/04 14:22:30 venu@myvenu.com +2 -0
  Fix EXPLAIN bug with binary protocol
  Added new client tests (EXPLAIN + DECIMAL conv)
  

  tests/client_test.c
    1.29 03/03/04 14:21:00 venu@myvenu.com +216 -5
    New tests for EXPLAIN + DECIMAL conv

  sql/sql_prepare.cc
    1.31 03/03/04 14:20:41 venu@myvenu.com +31 -23
    Fix EXPLAIN bug with binary protocol

ChangeSet
  1.1494.2.13 03/03/04 22:24:00 lenz@mysql.com +2 -0
   - added missing file mysql-test/std_data/des_key_file to source and binary
     distribution to fix a test failure in test "func_encrypt"

  scripts/make_binary_distribution.sh
    1.51 03/03/04 22:23:57 lenz@mysql.com +1 -0
     - added missing file mysql-test/std_data/des_key_file to source and binary
       distribution to fix a test failure in test "func_encrypt"

  mysql-test/Makefile.am
    1.22 03/03/04 22:23:57 lenz@mysql.com +2 -0
     - added missing file mysql-test/std_data/des_key_file to source and binary
       distribution to fix a test failure in test "func_encrypt"

ChangeSet
  1.1494.4.1 03/03/04 12:30:29 greg@mysql.com +11 -0
  Many files:
    Change mode to -rwxrwxr-x

  netware/BUILD/mwldnlm
    1.1.1.2 03/03/04 12:22:50 greg@mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/mwenv
    1.2 03/03/04 12:22:50 greg@mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/mwccnlm
    1.1.1.2 03/03/04 12:22:50 greg@mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/mwasmnlm
    1.1.1.2 03/03/04 12:22:50 greg@mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/compile-netware-standard
    1.2 03/03/04 12:22:50 greg@mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/compile-netware-debug
    1.2 03/03/04 12:22:50 greg@mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/compile-netware-all
    1.2 03/03/04 12:22:50 greg@mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/compile-netware-START
    1.2 03/03/04 12:22:50 greg@mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/compile-netware-END
    1.2 03/03/04 12:22:50 greg@mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/compile-linux-tools
    1.2 03/03/04 12:22:50 greg@mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/compile-AUTOTOOLS
    1.2 03/03/04 12:22:50 greg@mysql.com +0 -0
    Change mode to -rwxrwxr-x

ChangeSet
  1.1346.138.4 03/03/04 18:20:11 gweir@work.mysql.com +12 -0
  Many files:
    Change mode to -rwxrwxr-x

ChangeSet
  1.1346.139.1 03/03/04 18:18:05 lenz@mysql.com +2 -0
   - added missing file mysql-test/std_data/des_key_file to source and binary
     distribution to fix a test failure in test "func_encrypt"

  scripts/make_binary_distribution.sh
    1.49.1.1 03/03/04 18:18:03 lenz@mysql.com +1 -0
     - added missing file mysql-test/std_data/des_key_file to source and binary
       distribution to fix a test failure in test "func_encrypt"

  mysql-test/Makefile.am
    1.19.1.2 03/03/04 18:18:03 lenz@mysql.com +2 -0
     - added missing file mysql-test/std_data/des_key_file to source and binary
       distribution to fix a test failure in test "func_encrypt"

  netware/BUILD/nwbootstrap
    1.2 03/03/04 18:16:17 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/mwldnlm
    1.2 03/03/04 18:16:17 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/mwenv
    1.2 03/03/04 18:16:17 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/mwccnlm
    1.2 03/03/04 18:16:17 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/mwasmnlm
    1.2 03/03/04 18:16:17 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/compile-netware-standard
    1.2 03/03/04 18:16:17 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/compile-netware-debug
    1.2 03/03/04 18:16:17 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/compile-netware-all
    1.2 03/03/04 18:16:16 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/compile-netware-START
    1.2 03/03/04 18:16:16 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/compile-netware-END
    1.2 03/03/04 18:16:16 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/compile-linux-tools
    1.2 03/03/04 18:16:16 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

  netware/BUILD/compile-AUTOTOOLS
    1.2 03/03/04 18:16:16 gweir@work.mysql.com +0 -0
    Change mode to -rwxrwxr-x

ChangeSet
  1.1346.138.3 03/03/04 19:14:37 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Add comment that Guilhem should check master_log_name, pending etc are right if the master log gets rotated

  sql/ha_innodb.cc
    1.73.1.86 03/03/04 19:14:28 heikki@hundin.mysql.fi +4 -0
    Add comment that Guilhem should check master_log_name, pending etc are right if the master log gets rotated

ChangeSet
  1.1346.138.2 03/03/04 19:06:40 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Remove (already commented out) code about storing the latest relay log pos info to InnoDB: we will probably use only the master log pos info when we restart a slave after a crash

  sql/ha_innodb.cc
    1.73.1.85 03/03/04 19:06:33 heikki@hundin.mysql.fi +1 -4
    Remove (already commented out) code about storing the latest relay log pos info to InnoDB: we will probably use only the master log pos info when we restart a slave after a crash

ChangeSet
  1.676.278.1 03/03/04 18:02:56 serg@serg.mysql.com +4 -0
  fixed Field::eq() to work with CHAR(0) fields

  mysql-test/r/delete.result
    1.1 03/03/04 18:02:55 serg@serg.mysql.com +4 -0

  sql/field.h
    1.25.1.5 03/03/04 18:02:55 serg@serg.mysql.com +1 -1
    fixed Field::eq() to work with CHAR(0) fields

  mysql-test/t/delete.test
    1.2.1.1 03/03/04 18:02:55 serg@serg.mysql.com +20 -0
    fixed Field::eq() to work with CHAR(0) fields

  mysql-test/r/delete.result
    1.0 03/03/04 18:02:55 serg@serg.mysql.com +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql/mysql-test/r/delete.result

  BitKeeper/etc/ignore
    1.61.1.22 03/03/04 18:02:55 serg@serg.mysql.com +2 -0
    Added configure.lineno innobase/configure.lineno to the ignore list

ChangeSet
  1.676.1.660 03/03/04 18:23:15 Sinisa@sinisa.nasamreza.org +1 -0
  Fix for SHOW VARIABLES on 64-bit platforms

  sql/mysqld.cc
    1.162.1.107 03/03/04 18:23:13 Sinisa@sinisa.nasamreza.org +1 -1
    Fix for SHOW VARIABLES on 64-bit platforms

ChangeSet
  1.1494.3.1 03/03/04 19:53:53 bar@bar.mysql.r18.ru +8 -0
  SELECT BINARY expr 
    is now synonim for
  SELECT expr COLLATE <expr_charset>_bin

  sql/sql_yacc.yy
    1.203.1.45 03/03/04 19:53:51 bar@bar.mysql.r18.ru +12 -4
    SELECT BINARY expr 
      is now synonim for
    SELECT expr COLLATE <expr_charset>_bin

  sql/sql_lex.cc
    1.76 03/03/04 19:53:51 bar@bar.mysql.r18.ru +2 -1
    SELECT BINARY expr 
      is now synonim for
    SELECT expr COLLATE <expr_charset>_bin

  sql/set_var.cc
    1.30.1.1 03/03/04 19:53:51 bar@bar.mysql.r18.ru +1 -1
    SELECT BINARY expr 
      is now synonim for
    SELECT expr COLLATE <expr_charset>_bin

  sql/item_strfunc.h
    1.48 03/03/04 19:53:51 bar@bar.mysql.r18.ru +2 -4
    SELECT BINARY expr 
      is now synonim for
    SELECT expr COLLATE <expr_charset>_bin

  sql/item_strfunc.cc
    1.82 03/03/04 19:53:51 bar@bar.mysql.r18.ru +27 -9
    SELECT BINARY expr 
      is now synonim for
    SELECT expr COLLATE <expr_charset>_bin

  mysys/charset.c
    1.73 03/03/04 19:53:51 bar@bar.mysql.r18.ru +4 -2
    SELECT BINARY expr 
      is now synonim for
    SELECT expr COLLATE <expr_charset>_bin

  mysql-test/r/type_ranges.result
    1.14 03/03/04 19:53:51 bar@bar.mysql.r18.ru +1 -1
    SELECT BINARY expr 
      is now synonim for
    SELECT expr COLLATE <expr_charset>_bin

  include/my_sys.h
    1.91 03/03/04 19:53:51 bar@bar.mysql.r18.ru +2 -1
    SELECT BINARY expr 
      is now synonim for
    SELECT expr COLLATE <expr_charset>_bin

ChangeSet
  1.1494.2.10 03/03/04 10:34:32 greg@mysql.com[greg] +16 -0
  novell41.patch

  netware/BUILD/mwenv
    1.1 03/03/04 10:34:31 greg@mysql.com[greg] +29 -0

  netware/BUILD/compile-netware-standard
    1.1 03/03/04 10:34:31 greg@mysql.com[greg] +14 -0

  netware/BUILD/compile-netware-debug
    1.1 03/03/04 10:34:31 greg@mysql.com[greg] +15 -0

  netware/BUILD/compile-netware-all
    1.1 03/03/04 10:34:31 greg@mysql.com[greg] +8 -0

  netware/BUILD/compile-netware-START
    1.1 03/03/04 10:34:31 greg@mysql.com[greg] +23 -0

  netware/BUILD/compile-netware-END
    1.1 03/03/04 10:34:31 greg@mysql.com[greg] +35 -0

  netware/BUILD/compile-linux-tools
    1.1 03/03/04 10:34:31 greg@mysql.com[greg] +52 -0

  netware/BUILD/compile-AUTOTOOLS
    1.1 03/03/04 10:34:31 greg@mysql.com[greg] +16 -0

  scripts/make_binary_distribution.sh
    1.50 03/02/28 11:06:19 greg@mysql.com[greg] +5 -4
    Import patch novell41.patch

  netware/BUILD/nwbootstrap
    1.3 03/02/28 11:06:19 greg@mysql.com[greg] +133 -112
    Import patch novell41.patch

  netware/BUILD/mwldnlm
    1.1.1.1 03/02/28 11:06:19 greg@mysql.com[greg] +0 -0
    Import patch novell41.patch

  netware/BUILD/mwenv
    1.0 03/03/04 10:34:31 greg@mysql.com[greg] +0 -0
    BitKeeper file /home/greg/bk/mysql-4.1/netware/BUILD/mwenv

  netware/BUILD/mwccnlm
    1.1.1.1 03/02/28 11:06:19 greg@mysql.com[greg] +0 -0
    Import patch novell41.patch

  netware/BUILD/mwasmnlm
    1.1.1.1 03/02/28 11:06:19 greg@mysql.com[greg] +0 -0
    Import patch novell41.patch

  netware/BUILD/compile-netware-standard
    1.0 03/03/04 10:34:31 greg@mysql.com[greg] +0 -0
    BitKeeper file /home/greg/bk/mysql-4.1/netware/BUILD/compile-netware-standard

  netware/BUILD/compile-netware-debug
    1.0 03/03/04 10:34:31 greg@mysql.com[greg] +0 -0
    BitKeeper file /home/greg/bk/mysql-4.1/netware/BUILD/compile-netware-debug

  netware/BUILD/compile-netware-all
    1.0 03/03/04 10:34:31 greg@mysql.com[greg] +0 -0
    BitKeeper file /home/greg/bk/mysql-4.1/netware/BUILD/compile-netware-all

  netware/BUILD/compile-netware-START
    1.0 03/03/04 10:34:31 greg@mysql.com[greg] +0 -0
    BitKeeper file /home/greg/bk/mysql-4.1/netware/BUILD/compile-netware-START

  netware/BUILD/compile-netware-END
    1.0 03/03/04 10:34:31 greg@mysql.com[greg] +0 -0
    BitKeeper file /home/greg/bk/mysql-4.1/netware/BUILD/compile-netware-END

  netware/BUILD/compile-linux-tools
    1.0 03/03/04 10:34:31 greg@mysql.com[greg] +0 -0
    BitKeeper file /home/greg/bk/mysql-4.1/netware/BUILD/compile-linux-tools

  netware/BUILD/compile-AUTOTOOLS
    1.0 03/03/04 10:34:31 greg@mysql.com[greg] +0 -0
    BitKeeper file /home/greg/bk/mysql-4.1/netware/BUILD/compile-AUTOTOOLS

  BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9
    1.3 03/03/04 10:34:31 greg@mysql.com[greg] +0 -0
    Delete: netware/nwconfigure

  BitKeeper/deleted/.del-mwenv~35c8b56062f4b6aa
    1.3 03/03/04 10:34:31 greg@mysql.com[greg] +0 -0
    Delete: netware/mw/mwenv

  BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c
    1.2 03/03/04 10:34:31 greg@mysql.com[greg] +0 -0
    Delete: netware/libmysqld.def

ChangeSet
  1.1494.2.9 03/03/04 18:01:59 bar@bar.mysql.r18.ru +11 -0
  stringcmp() and sortcmp() have been unified
  into the only one sortcmp() with additional
  CHARSET_INFO *cmp_charset argument.

  sql/sql_string.h
    1.31 03/03/04 18:01:57 bar@bar.mysql.r18.ru +2 -4
    stringcmp() and sortcmp() have been unified
    into the only one sortcmp() with additional
    CHARSET_INFO *cmp_charset argument.

  sql/sql_string.cc
    1.49 03/03/04 18:01:57 bar@bar.mysql.r18.ru +1 -17
    stringcmp() and sortcmp() have been unified
    into the only one sortcmp() with additional
    CHARSET_INFO *cmp_charset argument.

  sql/sql_analyse.cc
    1.33 03/03/04 18:01:57 bar@bar.mysql.r18.ru +6 -16
    stringcmp() and sortcmp() have been unified
    into the only one sortcmp() with additional
    CHARSET_INFO *cmp_charset argument.

  sql/item_sum.h
    1.35 03/03/04 18:01:57 bar@bar.mysql.r18.ru +5 -3
    stringcmp() and sortcmp() have been unified
    into the only one sortcmp() with additional
    CHARSET_INFO *cmp_charset argument.

  sql/item_sum.cc
    1.66 03/03/04 18:01:57 bar@bar.mysql.r18.ru +10 -5
    stringcmp() and sortcmp() have been unified
    into the only one sortcmp() with additional
    CHARSET_INFO *cmp_charset argument.

  sql/item_func.h
    1.68.1.4 03/03/04 18:01:57 bar@bar.mysql.r18.ru +0 -1
    stringcmp() and sortcmp() have been unified
    into the only one sortcmp() with additional
    CHARSET_INFO *cmp_charset argument.

  sql/item_func.cc
    1.119 03/03/04 18:01:57 bar@bar.mysql.r18.ru +14 -11
    stringcmp() and sortcmp() have been unified
    into the only one sortcmp() with additional
    CHARSET_INFO *cmp_charset argument.

  sql/item_cmpfunc.h
    1.47 03/03/04 18:01:57 bar@bar.mysql.r18.ru +18 -39
    stringcmp() and sortcmp() have been unified
    into the only one sortcmp() with additional
    CHARSET_INFO *cmp_charset argument.

  sql/item_cmpfunc.cc
    1.74 03/03/04 18:01:57 bar@bar.mysql.r18.ru +42 -30
    stringcmp() and sortcmp() have been unified
    into the only one sortcmp() with additional
    CHARSET_INFO *cmp_charset argument.

  sql/item_buff.cc
    1.7 03/03/04 18:01:57 bar@bar.mysql.r18.ru +1 -3
    stringcmp() and sortcmp() have been unified
    into the only one sortcmp() with additional
    CHARSET_INFO *cmp_charset argument.

  sql/item.cc
    1.58.1.3 03/03/04 18:01:57 bar@bar.mysql.r18.ru +3 -3
    stringcmp() and sortcmp() have been unified
    into the only one sortcmp() with additional
    CHARSET_INFO *cmp_charset argument.

ChangeSet
  1.1494.2.8 03/03/04 15:17:29 monty@narttu.mysql.fi +1 -0
  Fix for reading variables from binary log.

  sql/log_event.cc
    1.107 03/03/04 15:17:27 monty@narttu.mysql.fi +9 -3
    Fix for reading variables from binary log.

ChangeSet
  1.1494.2.7 03/03/04 15:02:49 monty@narttu.mysql.fi +5 -0
  Fix for using unitialized mutex when running version compiled with --debug

  sql/sql_parse.cc
    1.271.1.4 03/03/04 15:02:47 monty@narttu.mysql.fi +2 -4
    Simply code cleanup

  sql/mysqld.cc
    1.340.2.1 03/03/04 15:02:47 monty@narttu.mysql.fi +4 -6
    Fix for --debug version (init_thread_environment was called in wrong place)

  sql/log_event.h
    1.83 03/03/04 15:02:47 monty@narttu.mysql.fi +2 -2
    Portability fix

  libmysqld/lib_sql.cc
    1.49 03/03/04 15:02:47 monty@narttu.mysql.fi +0 -6
    Fix for --debug version (init_thread_environment was called in wrong place)

  include/mysql_embed.h
    1.6 03/03/04 15:02:47 monty@narttu.mysql.fi +1 -0
    Disable shared memory for embedded version

ChangeSet
  1.1346.138.1 03/03/04 14:05:23 heikki@hundin.mysql.fi +1 -0
  buf0buf.c:
    Do not try to resolve the table name of a corrupt page if the code is in ibbackup, i.e., the dict system is not initialized

  innobase/buf/buf0buf.c
    1.17.1.1 03/03/04 14:05:15 heikki@hundin.mysql.fi +11 -3
    Do not try to resolve the table name of a corrupt page if the code is in ibbackup, i.e., the dict system is not initialized

ChangeSet
  1.1346.135.10 03/03/04 13:36:59 monty@narttu.mysql.fi +4 -0
  Merge with 3.23 to get fix for deadlock when doing LOCK TABLES in one thread and DROP TABLE in another thread

  sql/sql_table.cc
    1.112.1.38 03/03/04 13:36:58 monty@narttu.mysql.fi +7 -9
    merge

  sql/sql_rename.cc
    1.13.1.2 03/03/04 13:36:58 monty@narttu.mysql.fi +3 -3
    merge

  sql/mysql_priv.h
    1.150.1.36 03/03/04 13:07:44 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/lock.cc
    1.38.1.5 03/03/04 13:07:44 monty@narttu.mysql.fi +0 -1
    Auto merged

ChangeSet
  1.1346.135.9 03/03/04 12:32:28 monty@narttu.mysql.fi +3 -0
  Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0

  sql/handler.cc
    1.82.1.13 03/03/04 12:32:26 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.146.1.17 03/03/04 12:32:26 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysqltest.c
    1.77.1.22 03/03/04 12:32:26 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.137.1 03/03/04 12:22:35 monty@narttu.mysql.fi +11 -0
  Fixed bug in LOCK TABLE + DROP TABLE when other thread was waiting for a table that was locked bug not droped

  sql/sql_base.cc
    1.117.1.36 03/03/04 12:22:34 monty@narttu.mysql.fi +38 -8
    Fixed bug in LOCK TABLE + DROP TABLE when other thread was waiting for a table that was locked bug not droped

  sql/mysqld.cc
    1.297.1.104 03/03/04 12:22:34 monty@narttu.mysql.fi +2 -2
    Use automatic recover even with --safe

  sql/mysql_priv.h
    1.150.1.35 03/03/04 12:22:33 monty@narttu.mysql.fi +1 -0
    Added function to abort a lock for a specific thread

  sql/lock.cc
    1.38.1.4 03/03/04 12:22:33 monty@narttu.mysql.fi +19 -0
    Added function to abort a lock for a specific thread

  sql/handler.cc
    1.82.4.1 03/03/04 12:22:33 monty@narttu.mysql.fi +2 -1
    Indentation cleanup

  mysys/thr_lock.c
    1.34.1.1 03/03/04 12:22:33 monty@narttu.mysql.fi +48 -0
    Added function to abort a lock for a specific thread

  mysql-test/t/lock_multi.test
    1.3.1.1 03/03/04 12:22:33 monty@narttu.mysql.fi +22 -2
    Test for LOCK TABLE + DROP TABLE bug

  mysql-test/r/lock_multi.result
    1.5 03/03/04 12:22:33 monty@narttu.mysql.fi +8 -1
    Test for LOCK TABLE + DROP TABLE bug

  mysql-test/mysql-test-run.sh
    1.146.3.1 03/03/04 12:22:33 monty@narttu.mysql.fi +2 -1
    Fixed where mysqltest traces are put

  include/thr_lock.h
    1.10.1.2 03/03/04 12:22:33 monty@narttu.mysql.fi +1 -0
    Added function to abort a lock for a specific thread

  client/mysqltest.c
    1.77.5.1 03/03/04 12:22:33 monty@narttu.mysql.fi +1 -0
    Fixed bug that comments did a ping

ChangeSet
  1.1494.2.6 03/03/04 12:33:52 bar@bar.mysql.r18.ru +5 -0
  Fix for SHOW, it didn't display CHARACTER SET and COLLATE clause
  for binary collations

  sql/sql_show.cc
    1.114 03/03/04 12:33:50 bar@bar.mysql.r18.ru +1 -1
    Fix for SHOW, it didn't display CHARACTER SET and COLLATE clause
    for binary collations

  sql/field.h
    1.61 03/03/04 12:33:50 bar@bar.mysql.r18.ru +1 -10
    Fix for SHOW, it didn't display CHARACTER SET and COLLATE clause
    for binary collations

  sql/field.cc
    1.90 03/03/04 12:33:50 bar@bar.mysql.r18.ru +12 -7
    Fix for SHOW, it didn't display CHARACTER SET and COLLATE clause
    for binary collations

  mysql-test/t/ctype_collate.test
    1.2 03/03/04 12:33:50 bar@bar.mysql.r18.ru +15 -0
    Fix for SHOW, it didn't display CHARACTER SET and COLLATE clause
    for binary collations

  mysql-test/r/ctype_collate.result
    1.2 03/03/04 12:33:49 bar@bar.mysql.r18.ru +27 -0
    Fix for SHOW, it didn't display CHARACTER SET and COLLATE clause
    for binary collations

ChangeSet
  1.1494.2.5 03/03/04 11:04:19 bar@bar.mysql.r18.ru +25 -0
  Every character set now has binary collation

  strings/ctype.c
    1.55 03/03/04 11:04:18 bar@bar.mysql.r18.ru +2 -0
    Every character set now has binary collation

  sql/share/charsets/swe7.xml
    1.2 03/03/04 11:04:18 bar@bar.mysql.r18.ru +2 -0
    Every character set now has binary collation

  sql/share/charsets/pclatin1.xml
    1.2 03/03/04 11:04:18 bar@bar.mysql.r18.ru +2 -0
    Every character set now has binary collation

  sql/share/charsets/latin7.xml
    1.2 03/03/04 11:04:18 bar@bar.mysql.r18.ru +1 -0
    Every character set now has binary collation

  sql/share/charsets/latin5.xml
    1.3 03/03/04 11:04:18 bar@bar.mysql.r18.ru +1 -0
    Every character set now has binary collation

  sql/share/charsets/latin2.xml
    1.2 03/03/04 11:04:18 bar@bar.mysql.r18.ru +1 -0
    Every character set now has binary collation

  sql/share/charsets/latin1.xml
    1.3 03/03/04 11:04:18 bar@bar.mysql.r18.ru +1 -20
    Every character set now has binary collation

  sql/share/charsets/koi8u.xml
    1.2 03/03/04 11:04:18 bar@bar.mysql.r18.ru +2 -0
    Every character set now has binary collation

  sql/share/charsets/koi8r.xml
    1.2 03/03/04 11:04:18 bar@bar.mysql.r18.ru +2 -0
    Every character set now has binary collation

  sql/share/charsets/keybcs2.xml
    1.2 03/03/04 11:04:18 bar@bar.mysql.r18.ru +2 -0
    Every character set now has binary collation

  sql/share/charsets/hp8.xml
    1.2 03/03/04 11:04:18 bar@bar.mysql.r18.ru +2 -0
    Every character set now has binary collation

  sql/share/charsets/hebrew.xml
    1.2 03/03/04 11:04:18 bar@bar.mysql.r18.ru +2 -0
    Every character set now has binary collation

  sql/share/charsets/greek.xml
    1.2 03/03/04 11:04:18 bar@bar.mysql.r18.ru +2 -0
    Every character set now has binary collation

  sql/share/charsets/dec8.xml
    1.2 03/03/04 11:04:17 bar@bar.mysql.r18.ru +1 -0
    Every character set now has binary collation

  sql/share/charsets/cp866.xml
    1.2 03/03/04 11:04:17 bar@bar.mysql.r18.ru +2 -0
    Every character set now has binary collation

  sql/share/charsets/cp1257.xml
    1.2 03/03/04 11:04:17 bar@bar.mysql.r18.ru +1 -20
    Every character set now has binary collation

  sql/share/charsets/cp1256.xml
    1.3 03/03/04 11:04:17 bar@bar.mysql.r18.ru +1 -0
    Every character set now has binary collation

  sql/share/charsets/cp1251.xml
    1.4 03/03/04 11:04:17 bar@bar.mysql.r18.ru +1 -20
    Every character set now has binary collation

  sql/share/charsets/cp1250.xml
    1.2 03/03/04 11:04:17 bar@bar.mysql.r18.ru +2 -0
    Every character set now has binary collation

  sql/share/charsets/ascii.xml
    1.2 03/03/04 11:04:17 bar@bar.mysql.r18.ru +2 -0
    Every character set now has binary collation

  sql/share/charsets/armscii8.xml
    1.2 03/03/04 11:04:17 bar@bar.mysql.r18.ru +2 -0
    Every character set now has binary collation

  sql/share/charsets/MacRoman.xml
    1.3 03/03/04 11:04:17 bar@bar.mysql.r18.ru +1 -20
    Every character set now has binary collation

  sql/share/charsets/MacCE.xml
    1.2 03/03/04 11:04:17 bar@bar.mysql.r18.ru +1 -21
    Every character set now has binary collation

  sql/share/charsets/Index.xml
    1.11 03/03/04 11:04:17 bar@bar.mysql.r18.ru +51 -14
    Every character set now has binary collation

  mysys/charset.c
    1.72 03/03/04 11:04:17 bar@bar.mysql.r18.ru +32 -13
    Every character set now has binary collation

ChangeSet
  1.1346.135.8 03/03/03 23:04:36 greg@mysql.com +16 -0
  New build scripts for NetWare

  netware/BUILD/nwbootstrap
    1.1 03/03/03 23:04:35 greg@mysql.com +166 -0

  netware/BUILD/mwldnlm
    1.1 03/03/03 23:04:35 greg@mysql.com +5 -0

  netware/BUILD/mwenv
    1.1 03/03/03 23:04:35 greg@mysql.com +29 -0

  netware/BUILD/mwccnlm
    1.1 03/03/03 23:04:35 greg@mysql.com +7 -0

  netware/BUILD/mwasmnlm
    1.1 03/03/03 23:04:35 greg@mysql.com +5 -0

  netware/BUILD/compile-netware-standard
    1.1 03/03/03 23:04:35 greg@mysql.com +14 -0

  netware/BUILD/nwbootstrap
    1.0 03/03/03 23:04:35 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/nwbootstrap

  netware/BUILD/mwldnlm
    1.0 03/03/03 23:04:35 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/mwldnlm

  netware/BUILD/mwenv
    1.0 03/03/03 23:04:35 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/mwenv

  netware/BUILD/mwccnlm
    1.0 03/03/03 23:04:35 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/mwccnlm

  netware/BUILD/mwasmnlm
    1.0 03/03/03 23:04:35 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/mwasmnlm

  netware/BUILD/compile-netware-standard
    1.0 03/03/03 23:04:35 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/compile-netware-standard

  netware/BUILD/compile-netware-debug
    1.1 03/03/03 23:04:34 greg@mysql.com +15 -0

  netware/BUILD/compile-netware-all
    1.1 03/03/03 23:04:34 greg@mysql.com +8 -0

  netware/BUILD/compile-netware-START
    1.1 03/03/03 23:04:34 greg@mysql.com +23 -0

  netware/BUILD/compile-netware-END
    1.1 03/03/03 23:04:34 greg@mysql.com +35 -0

  netware/BUILD/compile-linux-tools
    1.1 03/03/03 23:04:34 greg@mysql.com +52 -0

  netware/BUILD/compile-AUTOTOOLS
    1.1 03/03/03 23:04:34 greg@mysql.com +16 -0

  netware/BUILD/compile-netware-debug
    1.0 03/03/03 23:04:34 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/compile-netware-debug

  netware/BUILD/compile-netware-all
    1.0 03/03/03 23:04:34 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/compile-netware-all

  netware/BUILD/compile-netware-START
    1.0 03/03/03 23:04:34 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/compile-netware-START

  netware/BUILD/compile-netware-END
    1.0 03/03/03 23:04:34 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/compile-netware-END

  netware/BUILD/compile-linux-tools
    1.0 03/03/03 23:04:34 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/compile-linux-tools

  netware/BUILD/compile-AUTOTOOLS
    1.0 03/03/03 23:04:34 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/BUILD/compile-AUTOTOOLS

  BitKeeper/deleted/.del-mwldnlm~efb26c57cba3c980
    1.2 03/03/03 23:02:17 greg@mysql.com +0 -0
    Delete: netware/mw/mwldnlm

  BitKeeper/deleted/.del-mwccnlm~be63afd25a14c3f
    1.2 03/03/03 23:02:17 greg@mysql.com +0 -0
    Delete: netware/mw/mwccnlm

  BitKeeper/deleted/.del-mwasmnlm~bc5746809d67feb5
    1.2 03/03/03 23:02:17 greg@mysql.com +0 -0
    Delete: netware/mw/mwasmnlm

  BitKeeper/deleted/.del-mwenv~35c8b56062f4b6aa
    1.1.1.1 03/03/03 23:02:07 greg@mysql.com +0 -0
    Delete: netware/mw/mwenv

ChangeSet
  1.1346.135.7 03/03/03 23:00:49 greg@mysql.com[greg] +1 -0
  novell40b.patch

  netware/mysql_fix_privilege_tables.pl
    1.1 03/03/03 11:05:15 greg@mysql.com[greg] +125 -0
    Import patch novell40b.patch

  netware/mysql_fix_privilege_tables.pl
    1.0 03/03/03 11:05:15 greg@mysql.com[greg] +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/mysql_fix_privilege_tables.pl

ChangeSet
  1.1494.2.4 03/03/03 23:12:17 guilhem@mysql.com +26 -0
  Do not give an error when the user does START SLAVE on an already
  running slave, just give a warning. Same thing for STOP SLAVE.
  This will make scripts writing easier for users.

  sql/sql_repl.cc
    1.97 03/03/03 23:12:12 guilhem@mysql.com +36 -7
    Do not give an error when the user does START SLAVE on an already
    running slave, just give a warning. Same thing for STOP SLAVE.

  sql/share/ukrainian/errmsg.txt
    1.27.1.4 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/swedish/errmsg.txt
    1.64.1.4 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/spanish/errmsg.txt
    1.64.1.4 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/slovak/errmsg.txt
    1.64.1.4 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/serbian/errmsg.txt
    1.18.1.3 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/russian/errmsg.txt
    1.61.1.4 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/romanian/errmsg.txt
    1.62.1.4 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/portuguese/errmsg.txt
    1.64.1.4 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/polish/errmsg.txt
    1.63.1.4 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/norwegian/errmsg.txt
    1.63.1.4 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.4 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/korean/errmsg.txt
    1.63.1.4 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/japanese/errmsg.txt
    1.63.1.4 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/italian/errmsg.txt
    1.70.1.4 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/hungarian/errmsg.txt
    1.65.1.4 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/greek/errmsg.txt
    1.64.1.4 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/german/errmsg.txt
    1.64.1.4 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/french/errmsg.txt
    1.63.1.4 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/estonian/errmsg.txt
    1.64.1.4 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/english/errmsg.txt
    1.70.1.5 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/dutch/errmsg.txt
    1.66.1.4 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/danish/errmsg.txt
    1.62.1.4 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  sql/share/czech/errmsg.txt
    1.64.1.4 03/03/03 23:12:12 guilhem@mysql.com +2 -0
    New messages to warn that the slave was already started or stopped

  mysql-test/include/master-slave.inc
    1.11 03/03/03 23:12:12 guilhem@mysql.com +5 -2
    STOP SLAVE now prints a warning, not an error, so we should expect a warning here

  include/mysqld_error.h
    1.61.1.3 03/03/03 23:12:12 guilhem@mysql.com +3 -1
    New error codes (warning codes in fact) to warn that the slave was already started or stopped

ChangeSet
  1.676.275.15 03/03/03 20:42:49 monty@narttu.mysql.fi +4 -0
  Fixed a deadlock problem when using LOCK TABLE in one thread and DROP TABLE in another

  sql/sql_table.cc
    1.83.1.29 03/03/03 20:42:48 monty@narttu.mysql.fi +7 -4
    Require table name locks when doing drop table.
    This fixed a deadlock problem when using LOCK TABLE in one thread and DROP TABLE in another

  sql/sql_rename.cc
    1.6.1.2 03/03/03 20:42:48 monty@narttu.mysql.fi +10 -22
    Use new general table name lock functions

  sql/mysql_priv.h
    1.93.1.16 03/03/03 20:42:48 monty@narttu.mysql.fi +3 -0
    Added functions to handle list of named locks

  sql/lock.cc
    1.24.1.6 03/03/03 20:42:48 monty@narttu.mysql.fi +74 -2
    Added functions to handle list of table name locks

ChangeSet
  1.1346.135.5 03/03/03 19:31:01 heikki@hundin.mysql.fi +5 -0
  ha_innodb.h, ha_innodb.cc, handler.h, handler.cc, sql_class.cc:
    Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time

  sql/ha_innodb.h
    1.48.2.1 03/03/03 19:30:46 heikki@hundin.mysql.fi +1 -0
    Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time

  sql/ha_innodb.cc
    1.73.1.84 03/03/03 19:30:44 heikki@hundin.mysql.fi +13 -0
    Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time

  sql/handler.h
    1.71.1.9 03/03/03 19:30:37 heikki@hundin.mysql.fi +1 -0
    Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time

  sql/handler.cc
    1.82.1.12 03/03/03 19:30:35 heikki@hundin.mysql.fi +30 -0
    Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time

  sql/sql_class.cc
    1.71.1.28 03/03/03 19:30:29 heikki@hundin.mysql.fi +16 -0
    Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time

ChangeSet
  1.1346.136.1 03/03/03 16:01:05 lenz@mysql.com +1 -0
   - added option "--skip-dmg" to skip the building of the disk image after
     packaging
   - enclosed some variables in quotes for safeguarding
   - add a license file (GPL or MySQLEULA) to the package so it will be
     displayed during installation (needs to be tested)

  Build-tools/Do-pkg
    1.3 03/03/03 16:01:03 lenz@mysql.com +36 -4
     - added option "--skip-dmg" to skip the building of the disk image after
       packaging
     - enclosed some variables in quotes for safeguarding
     - add a license file (GPL or MySQLEULA) to the package so it will be
       displayed during installation (needs to be tested)

ChangeSet
  1.1346.135.4 03/03/03 16:29:16 heikki@hundin.mysql.fi +1 -0
  srv0start.c:
    Print a more precise error message if log files or data files are of a size different from what is specified in my.cnf

  innobase/srv/srv0start.c
    1.37.1.2 03/03/03 16:29:07 heikki@hundin.mysql.fi +17 -6
    Print a more precise error message if log files or data files are of a size different from what is specified in my.cnf

ChangeSet
  1.1455.4.13 03/03/03 15:03:19 pem@mysql.com +4 -0
  New FUNCTION documentation, and a minor test case modification.

  mysql-test/t/sp.test
    1.11 03/03/03 15:03:18 pem@mysql.com +29 -42
    Changed the ifac test example into a combination of a procedure and a function.

  mysql-test/r/sp.result
    1.11 03/03/03 15:03:18 pem@mysql.com +42 -54
    Changed the ifac test example into a combination of a procedure and a function.

  Docs/sp-implemented.txt
    1.4 03/03/03 15:03:18 pem@mysql.com +19 -6
    Updated docs about stored FUNCTIONs.

  Docs/sp-imp-spec.txt
    1.3 03/03/03 15:03:18 pem@mysql.com +61 -3
    Updated docs about stored FUNCTIONs.

ChangeSet
  1.1346.135.3 03/03/03 14:57:02 guilhem@mysql.com +5 -0
  Replication: small bug fixes in mysql-test-run.sh and in replication code (more reinitializations)
  + fix for #70 
  + test result fix for LOAD DATA LOCAL bug #82

  sql/sql_repl.cc
    1.86.1.5 03/03/03 14:57:00 guilhem@mysql.com +6 -0
    When we RESET SLAVE, clear mi->master_log_* to give a good display in SHOW SLAVE STATUS (bug #70)

  sql/slave.cc
    1.164.1.49 03/03/03 14:57:00 guilhem@mysql.com +27 -6
    When we RESET SLAVE, clear rli->master_log_* to give a good display in SHOW SLAVE STATUS ;
    seeing the old values may confuse the user.
    When we START SLAVE, clear rli->master_log_name, not only rli->master_log_pos.

  mysql-test/r/rpl000001.result
    1.19.1.2 03/03/03 14:57:00 guilhem@mysql.com +1 -1
    SUM is 1022 (1021 was when we had the LOAD DATA LOCAL bug #82).
    It's logical to have an even number as we load the same file twice.

  mysql-test/mysql-test-run.sh
    1.146.1.16 03/03/03 14:57:00 guilhem@mysql.com +4 -4
    Fix $slave_datadir variable because this
      if [ -n "$1" ] ; 
       slave_datadir="var/$slave_ident-data/"
      else
        slave_datadir=$SLAVE_MYDDIR
    was not coherent and led to problems of master.info not being deleted.
    Delete relay-log.info too.

  client/mysqltest.c
    1.77.1.21 03/03/03 14:56:59 guilhem@mysql.com +0 -7
    Removed wrong comment and useless sleep

ChangeSet
  1.1494.2.2 03/03/03 13:16:39 bar@bar.mysql.r18.ru +5 -0
  Coercibility is now stored in user vars

  sql/sql_class.h
    1.146.1.4 03/03/03 13:16:37 bar@bar.mysql.r18.ru +1 -0
    Coercibility is now stored in user vars

  sql/log_event.cc
    1.106 03/03/03 13:16:37 bar@bar.mysql.r18.ru +1 -1
    Coercibility is now stored in user vars

  sql/item_func.h
    1.68.1.3 03/03/03 13:16:37 bar@bar.mysql.r18.ru +2 -1
    Coercibility is now stored in user vars

  sql/item_func.cc
    1.118 03/03/03 13:16:37 bar@bar.mysql.r18.ru +11 -6
    Change constant values order according to the word "coercibility" nature

  sql/item.h
    1.56.1.4 03/03/03 13:16:37 bar@bar.mysql.r18.ru +2 -2
    Change constant values order according to the word "coercibility" nature

ChangeSet
  1.1494.2.1 03/03/03 10:53:08 bar@bar.mysql.r18.ru +11 -0
  Strings which appear without charset context, 
  like number-to-string-convertion-result, now 
  takes current database character set, instead of
  thread character set. This makes it easy to be
  SQL99 conformant and 4.0 compatible.
  
  Item->thd_charset() is renamed to Item->default_charset()
  as old name doesn't describe its nature anymore.

  sql/procedure.h
    1.15 03/03/03 10:53:06 bar@bar.mysql.r18.ru +5 -5
    Strings which appear without charset context, 
    like number-to-string-convertion-result, now 
    takes current database character set, instead of
    thread character set. This makes it easy to be
    SQL99 conformant and 4.0 compatible.
    
    Item->thd_charset() is renamed to Item->default_charset()
    as old name doesn't describe its nature anymore.

  sql/item_timefunc.h
    1.29 03/03/03 10:53:06 bar@bar.mysql.r18.ru +39 -39
    Strings which appear without charset context, 
    like number-to-string-convertion-result, now 
    takes current database character set, instead of
    thread character set. This makes it easy to be
    SQL99 conformant and 4.0 compatible.
    
    Item->thd_charset() is renamed to Item->default_charset()
    as old name doesn't describe its nature anymore.

  sql/item_timefunc.cc
    1.34 03/03/03 10:53:06 bar@bar.mysql.r18.ru +14 -14
    Strings which appear without charset context, 
    like number-to-string-convertion-result, now 
    takes current database character set, instead of
    thread character set. This makes it easy to be
    SQL99 conformant and 4.0 compatible.
    
    Item->thd_charset() is renamed to Item->default_charset()
    as old name doesn't describe its nature anymore.

  sql/item_sum.cc
    1.65 03/03/03 10:53:06 bar@bar.mysql.r18.ru +9 -9
    Strings which appear without charset context, 
    like number-to-string-convertion-result, now 
    takes current database character set, instead of
    thread character set. This makes it easy to be
    SQL99 conformant and 4.0 compatible.
    
    Item->thd_charset() is renamed to Item->default_charset()
    as old name doesn't describe its nature anymore.

  sql/item_subselect.cc
    1.56.1.1 03/03/03 10:53:06 bar@bar.mysql.r18.ru +2 -2
    Strings which appear without charset context, 
    like number-to-string-convertion-result, now 
    takes current database character set, instead of
    thread character set. This makes it easy to be
    SQL99 conformant and 4.0 compatible.
    
    Item->thd_charset() is renamed to Item->default_charset()
    as old name doesn't describe its nature anymore.

  sql/item_strfunc.h
    1.47 03/03/03 10:53:06 bar@bar.mysql.r18.ru +6 -6
    Strings which appear without charset context, 
    like number-to-string-convertion-result, now 
    takes current database character set, instead of
    thread character set. This makes it easy to be
    SQL99 conformant and 4.0 compatible.
    
    Item->thd_charset() is renamed to Item->default_charset()
    as old name doesn't describe its nature anymore.

  sql/item_strfunc.cc
    1.81 03/03/03 10:53:06 bar@bar.mysql.r18.ru +6 -6
    Strings which appear without charset context, 
    like number-to-string-convertion-result, now 
    takes current database character set, instead of
    thread character set. This makes it easy to be
    SQL99 conformant and 4.0 compatible.
    
    Item->thd_charset() is renamed to Item->default_charset()
    as old name doesn't describe its nature anymore.

  sql/item_func.cc
    1.117 03/03/03 10:53:06 bar@bar.mysql.r18.ru +15 -15
    Strings which appear without charset context, 
    like number-to-string-convertion-result, now 
    takes current database character set, instead of
    thread character set. This makes it easy to be
    SQL99 conformant and 4.0 compatible.
    
    Item->thd_charset() is renamed to Item->default_charset()
    as old name doesn't describe its nature anymore.

  sql/item_cmpfunc.cc
    1.73 03/03/03 10:53:06 bar@bar.mysql.r18.ru +2 -2
    Strings which appear without charset context, 
    like number-to-string-convertion-result, now 
    takes current database character set, instead of
    thread character set. This makes it easy to be
    SQL99 conformant and 4.0 compatible.
    
    Item->thd_charset() is renamed to Item->default_charset()
    as old name doesn't describe its nature anymore.

  sql/item.h
    1.56.1.3 03/03/03 10:53:06 bar@bar.mysql.r18.ru +3 -3
    Strings which appear without charset context, 
    like number-to-string-convertion-result, now 
    takes current database character set, instead of
    thread character set. This makes it easy to be
    SQL99 conformant and 4.0 compatible.
    
    Item->thd_charset() is renamed to Item->default_charset()
    as old name doesn't describe its nature anymore.

  sql/item.cc
    1.58.1.2 03/03/03 10:53:06 bar@bar.mysql.r18.ru +10 -10
    Strings which appear without charset context, 
    like number-to-string-convertion-result, now 
    takes current database character set, instead of
    thread character set. This makes it easy to be
    SQL99 conformant and 4.0 compatible.
    
    Item->thd_charset() is renamed to Item->default_charset()
    as old name doesn't describe its nature anymore.

ChangeSet
  1.1494.1.1 03/03/02 14:05:51 venu@myvenu.com +2 -0
  Fix for the windows src distribution script - SCRUM:
    -- To take care of .zip and .tar
    -- Initialization of 'data' directory without any host dependancy data
    -- Incorporate all changes from Monty

  scripts/mysql_install_db.sh
    1.37.1.2 03/03/02 13:48:54 venu@myvenu.com +19 -7
    Changes for Windows related though 'WINDOWS' flag

  scripts/make_win_src_distribution.sh
    1.2 03/03/02 13:48:25 venu@myvenu.com +150 -124
    Fix to take care of .zip and initialization of 'data' directory

ChangeSet
  1.1346.135.2 03/03/02 22:34:09 heikki@hundin.mysql.fi +3 -0
  trx0sys.c, trx0roll.c, srv0start.h:
    Print trx rollback progress info in crash recovery

  innobase/trx/trx0sys.c
    1.13.1.1 03/03/02 22:33:51 heikki@hundin.mysql.fi +24 -2
    Print trx rollback progress info in crash recovery

  innobase/trx/trx0roll.c
    1.8 03/03/02 22:33:46 heikki@hundin.mysql.fi +44 -5
    Print trx rollback progress info in crash recovery

  innobase/include/srv0start.h
    1.7 03/03/02 22:33:34 heikki@hundin.mysql.fi +1 -0
    Print trx rollback progress info in crash recovery

ChangeSet
  1.1495 03/03/02 21:39:03 bell@sanja.is.com.ua +7 -0
  made variable query_cache_min_res_unit from QUERY_CACHE_MIN_RESULT_DATA_SIZE (SCRUM)

  sql/sql_cache.h
    1.17.1.3 03/03/02 21:38:53 bell@sanja.is.com.ua +3 -0
    method for parameter changing

  sql/sql_cache.cc
    1.39.1.10 03/03/02 21:38:53 bell@sanja.is.com.ua +8 -0
    method for parameter changing

  sql/set_var.cc
    1.31 03/03/02 21:38:52 bell@sanja.is.com.ua +16 -0
    made variable query_cache_min_res_unit from QUERY_CACHE_MIN_RESULT_DATA_SIZE

  sql/mysqld.cc
    1.340.1.1 03/03/02 21:38:52 bell@sanja.is.com.ua +9 -2
    made variable query_cache_min_res_unit from QUERY_CACHE_MIN_RESULT_DATA_SIZE

  sql/mysql_priv.h
    1.186.1.1 03/03/02 21:38:52 bell@sanja.is.com.ua +4 -1
    made variable query_cache_min_res_unit from QUERY_CACHE_MIN_RESULT_DATA_SIZE

  mysql-test/t/query_cache.test
    1.21 03/03/02 21:38:52 bell@sanja.is.com.ua +25 -0
    test of query_cache_min_res_unit

  mysql-test/r/query_cache.result
    1.20 03/03/02 21:38:52 bell@sanja.is.com.ua +59 -0
    test of query_cache_min_res_unit

ChangeSet
  1.1455.4.12 03/03/02 19:17:41 pem@mysql.com +11 -0
  Made FUNCTIONs work in insert and select queries, as well as nested function invocations.
  Had to add a cahing mechanism which is in parts an ugly kludge, but it will be
  reworked once the real SP caching is implemented.

  sql/sql_yacc.yy
    1.220 03/03/02 19:17:39 pem@mysql.com +3 -1
    Collect used function names in lex.

  sql/sql_parse.cc
    1.276 03/03/02 19:17:39 pem@mysql.com +12 -0
    Read used FUNCTIONs from db and cache them in thd before doing anything else
    in a query execution. (This is necessary since we can't open mysql.proc during
    query execution.)

  sql/sql_lex.h
    1.107 03/03/02 19:17:39 pem@mysql.com +1 -0
    Added SP function name list to lex.

  sql/sql_lex.cc
    1.72.1.3 03/03/02 19:17:39 pem@mysql.com +1 -0
    Added SP function name list to lex.

  sql/sql_class.h
    1.148 03/03/02 19:17:39 pem@mysql.com +1 -0
    Added SP function cache list to thd.

  sql/sp_head.h
    1.9 03/03/02 19:17:39 pem@mysql.com +5 -2
    Fixed some bugs in the function and procedure execution.
    Disabled some data collections that's not used at the moment.

  sql/sp_head.cc
    1.15 03/03/02 19:17:39 pem@mysql.com +18 -16
    Fixed some bugs in the function and procedure execution.
    Disabled some data collections that's not used at the moment.

  sql/sp.h
    1.5 03/03/02 19:17:39 pem@mysql.com +12 -0
    New (temporary) FUNCTION caching functions.

  sql/sp.cc
    1.8 03/03/02 19:17:39 pem@mysql.com +149 -22
    Big rehack of mysql.proc table usage strategy and adding a function cache
    mechanism, since we need to read used functions from the db before doing anything else
    when executing a query. (This cache is temporary and will probably be replaced by
    the real thing later.)

  mysql-test/t/sp.test
    1.10 03/03/02 19:17:39 pem@mysql.com +27 -0
    New function tests.

  mysql-test/r/sp.result
    1.10 03/03/02 19:17:39 pem@mysql.com +30 -0
    New function tests.

ChangeSet
  1.1346.135.1 03/03/02 18:20:32 guilhem@mysql.com +3 -0
  ChangeSet 1.1625 was faulty as regards sql/mf_iocache.cc and LOAD DATA LOCAL replication tests

  sql/mf_iocache.cc
    1.22.2.2 03/03/02 18:20:30 guilhem@mysql.com +0 -1
    ChangeSet 1.1625 was faulty as regards this file (LOAD DATA LOCAL bug)

  mysql-test/t/rpl_loaddatalocal.test
    1.2 03/03/02 18:20:30 guilhem@mysql.com +36 -0
    ChangeSet 1.1625 was faulty as regards this file (LOAD DATA LOCAL bug)

  mysql-test/r/rpl_loaddatalocal.result
    1.2 03/03/02 18:20:30 guilhem@mysql.com +14 -0
    ChangeSet 1.1625 was faulty as regards this file (LOAD DATA LOCAL bug)

ChangeSet
  1.1492.1.1 03/03/02 19:35:37 wax@kishkin.ru +2 -0
  URGENT fixed bug in shared memory (handler_count)

  BitKeeper/etc/logging_ok
    1.233.1.4 03/03/02 19:35:37 wax@kishkin.ru +1 -0
    Logging to logging@openlogging.org accepted

  sql/mysqld.cc
    1.341 03/03/02 19:35:28 wax@kishkin.ru +2 -0
    fixed bug in shared memory

ChangeSet
  1.1346.133.7 03/03/02 14:07:32 serg@serg.mysql.com +4 -0
  optimizer should check for "field LIKE const" not "field like STRING"

  sql/item_cmpfunc.cc
    1.20.1.30 03/03/02 14:07:30 serg@serg.mysql.com +8 -4
    optimizer should check for "field LIKE const" not "field like STRING"

  mysql-test/t/func_like.test
    1.6.1.1 03/03/02 14:07:30 serg@serg.mysql.com +7 -4
    optimizer should check for "field LIKE const" not "field like STRING"

  mysql-test/r/func_like.result
    1.7 03/03/02 14:07:30 serg@serg.mysql.com +10 -0
    optimizer should check for "field LIKE const" not "field like STRING"

  BitKeeper/etc/ignore
    1.107.1.36 03/03/02 14:07:30 serg@serg.mysql.com +2 -0
    Added configure.lineno innobase/configure.lineno to the ignore list

ChangeSet
  1.1494 03/03/02 16:19:26 bar@bar.mysql.r18.ru +2 -0
  COLLATE tests

  mysql-test/t/ctype_collate.test
    1.1 03/03/02 16:19:24 bar@bar.mysql.r18.ru +115 -0

  mysql-test/t/ctype_collate.test
    1.0 03/03/02 16:19:24 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/t/ctype_collate.test

  mysql-test/r/ctype_collate.result
    1.1 03/03/02 16:16:48 bar@bar.mysql.r18.ru +486 -0

  mysql-test/r/ctype_collate.result
    1.0 03/03/02 16:16:48 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/mysql-test/r/ctype_collate.result

ChangeSet
  1.1493 03/03/02 14:47:56 bar@bar.mysql.r18.ru +1 -0
  sql_yacc.yy:
    Produce an error when a field collation and charset are not compatible

  sql/sql_yacc.yy
    1.203.1.44 03/03/02 14:47:12 bar@bar.mysql.r18.ru +14 -1
    Produce an error when a field collation and charset are not compatible

ChangeSet
  1.1492 03/03/02 14:05:03 bar@bar.mysql.r18.ru +25 -0
  New error message for situation like:
  
  SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/ukrainian/errmsg.txt
    1.27.1.3 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/swedish/errmsg.txt
    1.64.1.3 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/spanish/errmsg.txt
    1.64.1.3 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/slovak/errmsg.txt
    1.64.1.3 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/serbian/errmsg.txt
    1.18.1.2 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/russian/errmsg.txt
    1.61.1.3 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/romanian/errmsg.txt
    1.62.1.3 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/portuguese/errmsg.txt
    1.64.1.3 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/polish/errmsg.txt
    1.63.1.3 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/norwegian/errmsg.txt
    1.63.1.3 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.3 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/korean/errmsg.txt
    1.63.1.3 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/japanese/errmsg.txt
    1.63.1.3 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/italian/errmsg.txt
    1.70.1.3 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/hungarian/errmsg.txt
    1.65.1.3 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/greek/errmsg.txt
    1.64.1.3 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/german/errmsg.txt
    1.64.1.3 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/french/errmsg.txt
    1.63.1.3 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/estonian/errmsg.txt
    1.64.1.3 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/english/errmsg.txt
    1.70.1.4 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/dutch/errmsg.txt
    1.66.1.3 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/danish/errmsg.txt
    1.62.1.3 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/share/czech/errmsg.txt
    1.64.1.3 03/03/02 14:04:59 bar@bar.mysql.r18.ru +1 -0
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  sql/item_strfunc.cc
    1.80 03/03/02 14:04:59 bar@bar.mysql.r18.ru +10 -1
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

  include/mysqld_error.h
    1.61.1.2 03/03/02 14:04:59 bar@bar.mysql.r18.ru +2 -1
    New error message for situation like:
    
    SELECT latin1_expr COLLATE anpther_charset_collation

ChangeSet
  1.1346.134.1 03/03/02 01:48:57 serg@serg.mysql.com +6 -0
  fix auto-increment in sub-key and insert ... select

  sql/ha_myisam.cc
    1.92.1.25 03/03/02 01:48:55 serg@serg.mysql.com +4 -3
    fix auto-increment in sub-key and insert ... select

  mysql-test/t/auto_increment.test
    1.5.1.1 03/03/02 01:48:55 serg@serg.mysql.com +8 -0
    fix auto-increment in sub-key and insert ... select

  mysql-test/r/auto_increment.result
    1.8 03/03/02 01:48:55 serg@serg.mysql.com +10 -0
    fix auto-increment in sub-key and insert ... select

  myisam/mi_create.c
    1.21.1.9 03/03/02 01:48:55 serg@serg.mysql.com +1 -1
    fix auto-increment in sub-key and insert ... select

  myisam/mi_check.c
    1.86.1.28 03/03/02 01:48:55 serg@serg.mysql.com +2 -2
    fix auto-increment in sub-key and insert ... select

  include/myisam.h
    1.36.1.16 03/03/02 01:48:55 serg@serg.mysql.com +1 -0
    fix auto-increment in sub-key and insert ... select

ChangeSet
  1.1346.133.5 03/03/02 00:45:19 guilhem@mysql.com +2 -0
  Replication: simplification of init_relay_log_pos: always initialize,
  remove variable rli->log_pos_current.

  sql/slave.h
    1.50.1.5 03/03/02 00:45:15 guilhem@mysql.com +0 -1
    Simplification of init_relay_log_pos : always initialize,
    remove variable rli->log_pos_current.

  sql/slave.cc
    1.164.1.48 03/03/02 00:45:15 guilhem@mysql.com +1 -8
    Simplification of init_relay_log_pos : always initialize,
    remove variable rli->log_pos_current.

ChangeSet
  1.1346.133.4 03/03/02 00:34:44 guilhem@mysql.com +2 -0
  When the SQL thread cannot read an event from the relay log
  ("Event too big" etc), stop this thread instead of going on
  with the next event, which would certainly lead to slave's data
  corruption.

  BitKeeper/etc/logging_ok
    1.206.17.15 03/03/02 00:34:43 guilhem@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/log_event.cc
    1.77.1.22 03/03/02 00:33:37 guilhem@mysql.com +9 -0
    When the SQL thread cannot read an event from the relay log
    ("Event too big" etc), stop this thread instead of going on
    with the next event, which would certainly lead to slave's data
    corruption.

ChangeSet
  1.1491 03/03/01 23:59:27 papa@gbichot.local +2 -0
  Replication: give the slave I/O thread a higher priority than the slave SQL thread
  so that it has fetched the most from the master's binlog before the master
  accidently dies. SCRUM task #756.

  sql/slave.h
    1.57 03/03/01 23:59:23 papa@gbichot.local +2 -1
    Replication: give the slave I/O thread a higher priority than the slave SQL thread
    so that it has fetched the most from the master's binlog before the master
    accidently dies.

  sql/slave.cc
    1.183 03/03/01 23:59:23 papa@gbichot.local +6 -3
    Replication: give the slave I/O thread a higher priority than the slave SQL thread
    so that it has fetched the most from the master's binlog before the master
    accidently dies.

ChangeSet
  1.1490 03/03/01 23:34:34 papa@gbichot.local +3 -0
  Added options reconnect/enable-reconnect/disable-reconnect/skip-reconnect to the 'mysql' command-line client.
  Disabling can be safer when the server silently dies & restarts.
  This is for SCRUM task #727.

  BitKeeper/etc/logging_ok
    1.233.1.3 03/03/01 23:34:31 papa@gbichot.local +1 -0
    Logging to logging@openlogging.org accepted

  client/mysql.cc
    1.118 03/03/01 23:34:24 papa@gbichot.local +9 -6
    Added options reconnect/enable-reconnect/disable-reconnect/skip-reconnect to the 'mysql' command-line client.
    Disabling can be safer when the server silently dies & restarts.

  client/client_priv.h
    1.18 03/03/01 23:34:24 papa@gbichot.local +1 -1
    Added options reconnect/enable-reconnect/disable-reconnect/skip-reconnect to the 'mysql' command-line client

ChangeSet
  1.1489 03/03/01 14:18:55 serg@serg.mysql.com +2 -0
  Merge work:/home/bk/mysql-4.1
  into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1

  sql/sql_select.cc
    1.208 03/03/01 14:18:51 serg@serg.mysql.com +0 -0
    Auto merged

  BitKeeper/etc/ignore
    1.146 03/03/01 14:18:39 serg@serg.mysql.com +1 -2
    auto-union

ChangeSet
  1.1488 03/03/01 13:16:39 ram@mysql.r18.ru +2 -0
  Test case for spatial objects.

  mysql-test/t/gis.test
    1.1 03/03/01 13:16:31 ram@mysql.r18.ru +108 -0

  mysql-test/r/gis.result
    1.1 03/03/01 13:16:31 ram@mysql.r18.ru +310 -0

  mysql-test/t/gis.test
    1.0 03/03/01 13:16:31 ram@mysql.r18.ru +0 -0
    BitKeeper file /usr/home/ram/work/mysql-4.1.sp/mysql-test/t/gis.test

  mysql-test/r/gis.result
    1.0 03/03/01 13:16:31 ram@mysql.r18.ru +0 -0
    BitKeeper file /usr/home/ram/work/mysql-4.1.sp/mysql-test/r/gis.result

ChangeSet
  1.1486.1.2 03/03/01 12:43:09 ram@mysql.r18.ru +1 -0
  os_rename.c:
    Typo fix.

  bdb/os_win32/os_rename.c
    1.6 03/03/01 12:42:19 ram@mysql.r18.ru +1 -1
    Typo fix.

ChangeSet
  1.1486.1.1 03/03/01 12:40:08 ram@mysql.r18.ru +1 -0
  os_rename.c:
    Portability fix. GetLongPathName is not supported by Windows95.

  bdb/os_win32/os_rename.c
    1.5 03/03/01 12:38:14 ram@mysql.r18.ru +5 -2
    Portability fix. GetLongPathName is not supported by Windows95.

ChangeSet
  1.1346.132.3 03/02/28 22:24:00 monty@narttu.mysql.fi +105 -0
  LOAD DATA INFILE is not replicated if replicate_*_table is set
  LOAD DATA LOCAL INFILE was not replicated correctly

  mysql-test/t/rpl_loaddatalocal.test
    1.1 03/02/28 22:23:59 monty@narttu.mysql.fi +0 -0

  mysql-test/r/rpl_loaddatalocal.result
    1.1 03/02/28 22:23:59 monty@narttu.mysql.fi +0 -0

  sql/mf_iocache.cc
    1.22.2.1 03/02/28 22:23:59 monty@narttu.mysql.fi +7 -2
    LOAD DATA LOCAL INFILE was not replicated correctly

  sql/log_event.cc
    1.77.1.21 03/02/28 22:23:59 monty@narttu.mysql.fi +1 -0
    LOAD DATA INFILE is not replicated if replicate_*_table is set

  mysql-test/t/rpl_loaddatalocal.test
    1.0 03/02/28 22:23:59 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/t/rpl_loaddatalocal.test

  mysql-test/r/rpl_loaddatalocal.result
    1.0 03/02/28 22:23:59 monty@narttu.mysql.fi +0 -0
    BitKeeper file /my/mysql-4.0/mysql-test/r/rpl_loaddatalocal.result

  include/my_global.h
    1.34.1.3 03/02/28 22:23:59 monty@narttu.mysql.fi +1 -0
    Always include errno.h

  VC++Files/zlib/zlib.dsp
    1.3.1.1 03/02/28 22:23:59 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/vio/vio.dsp
    1.4.1.1 03/02/28 22:23:59 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/thr_test/thr_test.dsp
    1.4.1.1 03/02/28 22:23:59 monty@narttu.mysql.fi +8 -8
    Updated VC++ files +end space removed

  VC++Files/thr_insert_test/thr_insert_test.dsp
    1.4.1.1 03/02/28 22:23:59 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/test1/test1.dsp
    1.4.1.1 03/02/28 22:23:59 monty@narttu.mysql.fi +8 -8
    Updated VC++ files +end space removed

  VC++Files/strings/strings.dsw
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/strings/strings.dsp
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +9 -9
    Updated VC++ files +end space removed

  VC++Files/strings/noMASM/strings.dsw
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/strings/noMASM/strings.dsp
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/strings/backup/strings.dsw
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/strings/backup/strings.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +9 -9
    Updated VC++ files +end space removed

  VC++Files/strings/MASM6x/strings.dsw
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/strings/MASM6x/strings.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +9 -9
    Updated VC++ files +end space removed

  VC++Files/sql/old/mysqld.dsw
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/sql/mysqldmax.dsp
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +56 -56
    Updated VC++ files +end space removed

  VC++Files/sql/mysqld.dsw
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/sql/mysqld.dsp
    1.6.1.2 03/02/28 22:23:58 monty@narttu.mysql.fi +56 -56
    Updated VC++ files +end space removed

  VC++Files/replace/replace.dsp
    1.4.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/regex/regex.dsw
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/regex/regex.dsp
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/perror/perror.dsp
    1.5.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/pack_isam/pack_isam.dsp
    1.5.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/mysys/mysys.dsw
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/mysys/mysys.dsp
    1.6.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +13 -9
    Updated VC++ files +end space removed

  VC++Files/mysqlwatch/mysqlwatch.dsp
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +6 -6
    Updated VC++ files +end space removed

  VC++Files/mysqlshutdown/mysqlshutdown.dsp
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/mysqlshutdown/myshutdown.dsp
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/mysqlserver/mysqlserver.dsp
    1.3.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/mysqlmanager/mysqlmanager.dsw
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/mysqlmanager/MySqlManager.dsp
    1.4.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +8 -8
    Updated VC++ files +end space removed

  VC++Files/mysqldemb/mysqldemb.dsp
    1.3.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/mysqlcheck/mysqlcheck.dsp
    1.4.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/mysqlbinlog/mysqlbinlog.dsp
    1.7.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/mysql.dsw
    1.5.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +3 -4
    Updated VC++ files +end space removed

  VC++Files/mysql.dsp
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +8 -8
    Updated VC++ files +end space removed

  VC++Files/myisampack/myisampack.dsp
    1.3.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/myisammrg/myisammrg.dsp
    1.3.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/myisamlog/myisamlog.dsp
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/myisamchk/myisamchk.dsp
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/myisam/myisam.dsp
    1.3.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/my_print_defaults/my_print_defaults.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/merge/merge.dsw
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/merge/merge.dsp
    1.3.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/libmysqltest/mytest.dsw
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/libmysqltest/myTest.dsp
    1.4.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/libmysqld/libmysqld.dsp
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/libmysqld/examples/test_libmysqld.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +6 -6
    Updated VC++ files +end space removed

  VC++Files/libmysql/libmysql.dsw
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +1 -2
    Updated VC++ files +end space removed

  VC++Files/libmysql/libmysql.dsp
    1.7.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +31 -23
    Updated VC++ files +end space removed

  VC++Files/isamchk/isamchk.dsp
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/isam/isam.dsw
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/isam/isam.dsp
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/innobase/innobase.dsp
    1.7.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/heap/heap.dsp
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +8 -8
    Updated VC++ files +end space removed

  VC++Files/dbug/dbug.dsw
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/dbug/dbug.dsp
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/contrib/minizip/zlibvc.dsw
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/contrib/minizip/zlibvc.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +38 -38
    Updated VC++ files +end space removed

  VC++Files/contrib/asm386/zlibvc.dsw
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/contrib/asm386/zlibvc.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +38 -38
    Updated VC++ files +end space removed

  VC++Files/comp_err/comp_err.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +6 -6
    Updated VC++ files +end space removed

  VC++Files/client/mysqlshow.dsp
    1.4.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/client/mysqlimport.dsp
    1.4.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/client/mysqldump.dsp
    1.4.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +8 -8
    Updated VC++ files +end space removed

  VC++Files/client/mysqlclient.dsw
    1.2.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/client/mysqlclient.dsp
    1.6.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +8 -8
    Updated VC++ files +end space removed

  VC++Files/client/mysqlcheck.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +6 -6
    Updated VC++ files +end space removed

  VC++Files/client/mysqladmin.dsp
    1.4.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/client/mysql.dsp
    1.4.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +8 -8
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/excxx_tpcb.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/excxx_mpool.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/excxx_lock.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/excxx_env.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/excxx_btrec.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/excxx_access.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/ex_tpcb.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/ex_mpool.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/ex_lock.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/ex_env.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/ex_btrec.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/ex_access.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_verify.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_upgrade.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_test.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_tcl.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_static1.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +8 -8
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_static.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_stat.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_recover.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_printlog.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_load.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_java.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +29 -29
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_dump.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_dll.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_deadlock.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_checkpoint.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_buildall.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +8 -8
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/db_archive.dsp
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

  VC++Files/bdb/build_win32/Berkeley_DB.dsw
    1.1.1.1 03/02/28 22:23:58 monty@narttu.mysql.fi +0 -1
    Updated VC++ files +end space removed

  VC++Files/bdb/bdb.dsp
    1.3.1.1 03/02/28 22:23:57 monty@narttu.mysql.fi +7 -7
    Updated VC++ files +end space removed

ChangeSet
  1.1346.133.2 03/02/28 21:17:44 bell@sanja.is.com.ua +1 -0
  used correct function (SCRUM)

  sql/sql_show.cc
    1.76.1.26 03/02/28 21:17:38 bell@sanja.is.com.ua +2 -2
    used correct function

ChangeSet
  1.1346.132.2 03/02/28 20:00:19 monty@narttu.mysql.fi +2 -0
  merge (use local version)

  sql/slave.cc
    1.164.1.47 03/02/28 20:00:18 monty@narttu.mysql.fi +0 -1
    merge (use local version)

  BitKeeper/deleted/.del-global.h~e80d28157acfdcb5
    1.54 03/02/28 19:59:55 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-global.h~e80d28157acfdcb5
    1.39.9.2 03/02/28 19:59:54 monty@narttu.mysql.fi +0 -0
    Merge rename: include/global.h -> BitKeeper/deleted/.del-global.h~e80d28157acfdcb5

ChangeSet
  1.676.275.14 03/02/28 19:52:14 monty@narttu.mysql.fi +1 -0
  Always include errno.h

  include/global.h
    1.39.9.1 03/02/28 19:52:13 monty@narttu.mysql.fi +1 -0
    Portability fix
    (Using errno before including errno.h can give big problems on Linux)

ChangeSet
  1.676.275.13 03/02/28 19:50:05 monty@narttu.mysql.fi +1 -0
  LOAD DATA INFILE is not replicated by slave if replicate_*_table is set

  sql/slave.cc
    1.100.1.34 03/02/28 19:50:04 monty@narttu.mysql.fi +1 -0
    LOAD DATA INFILE is not replicated by slave if replicate_*_table is set

ChangeSet
  1.1487 03/02/28 21:17:08 ram@mysql.r18.ru +2 -0
  Added GeometryFromText, MultiPointFromText aliases.
  Added GeometryCollection type.

  sql/sql_yacc.yy
    1.203.1.43 03/02/28 21:17:05 ram@mysql.r18.ru +3 -0
    Added GeometryFromText, MultiPointFromText aliases.
    Added GeometryCollection type.

  sql/lex.h
    1.82.1.18 03/02/28 21:17:05 ram@mysql.r18.ru +3 -1
    Added GeometryFromText, MultiPointFromText aliases.
    Added GeometryCollection type.

ChangeSet
  1.1486 03/02/28 20:56:18 bar@bar.mysql.r18.ru +1 -0
  item_func.cc:
    Fix for coercibility of function

  sql/item_func.cc
    1.116 03/02/28 20:55:49 bar@bar.mysql.r18.ru +23 -4
    Fix for coercibility of function

ChangeSet
  1.1485 03/02/28 20:25:25 bar@bar.mysql.r18.ru +1 -0
  item_strfunc.cc:
    Charset conversion function changes coercibility to IMPLICIT

  sql/item_strfunc.cc
    1.79 03/02/28 20:24:52 bar@bar.mysql.r18.ru +1 -0
    Charset conversion function changes coercibility to IMPLICIT

ChangeSet
  1.1484 03/02/28 20:20:24 bar@bar.mysql.r18.ru +2 -0
  sql_yacc.yy:
    _charset cast changes coercibility to implicit
  item_strfunc.cc:
    Collation cast change coercibility to EXPLICIT

  sql/sql_yacc.yy
    1.203.1.42 03/02/28 20:19:58 bar@bar.mysql.r18.ru +1 -1
    _charset cast changes coercibility to implicit

  sql/item_strfunc.cc
    1.78 03/02/28 20:19:38 bar@bar.mysql.r18.ru +1 -0
    Collation cast change coercibility to EXPLICIT

ChangeSet
  1.1483 03/02/28 19:22:20 bar@bar.mysql.r18.ru +8 -0
  Many files:
     Coercibility, initial stage
  item_func.h:
    Coercibility, initial stage

  sql/sql_yacc.yy
    1.203.1.41 03/02/28 19:22:09 bar@bar.mysql.r18.ru +1 -1
     Coercibility, initial stage

  sql/lex.h
    1.82.1.17 03/02/28 19:22:07 bar@bar.mysql.r18.ru +1 -0
     Coercibility, initial stage

  sql/item_func.cc
    1.115 03/02/28 19:22:06 bar@bar.mysql.r18.ru +11 -0
     Coercibility, initial stage

  sql/item.h
    1.56.1.2 03/02/28 19:22:03 bar@bar.mysql.r18.ru +9 -3
     Coercibility, initial stage

  sql/item_create.h
    1.20 03/02/28 19:22:01 bar@bar.mysql.r18.ru +1 -0
     Coercibility, initial stage

  sql/item_create.cc
    1.28 03/02/28 19:21:59 bar@bar.mysql.r18.ru +5 -0
     Coercibility, initial stage

  sql/item.cc
    1.58.1.1 03/02/28 19:21:54 bar@bar.mysql.r18.ru +6 -2
     Coercibility, initial stage

  sql/item_func.h
    1.68.1.2 03/02/28 19:21:33 bar@bar.mysql.r18.ru +9 -0
    Coercibility, initial stage

ChangeSet
  1.1455.4.11 03/02/28 15:07:14 pem@mysql.com +5 -0
  Closing tables during SP execution the proper way.

  sql/sql_class.cc
    1.109 03/02/28 15:07:12 pem@mysql.com +0 -27
    Removed closing of tables in various send_eof() methods again.

  sql/sp_head.cc
    1.14 03/02/28 15:07:12 pem@mysql.com +5 -0
    Close tables after each sub statement.

  sql/sp.cc
    1.7 03/02/28 15:07:12 pem@mysql.com +11 -9
    Fixed closing of tables.

  mysql-test/r/status.result
    1.5 03/02/28 15:07:12 pem@mysql.com +1 -1
    proc table now shows up in different places.

  mysql-test/r/show_check.result
    1.32 03/02/28 15:07:12 pem@mysql.com +1 -0
    proc table now shows up in different places.

ChangeSet
  1.1473.2.3 03/02/28 14:32:40 monty@narttu.mysql.fi +4 -0
  Portability fixes

  strings/xml.c
    1.2 03/02/28 14:32:39 monty@narttu.mysql.fi +34 -9
    Portability fix (True64)

  include/my_xml.h
    1.3 03/02/28 14:32:39 monty@narttu.mysql.fi +16 -10
    Portability fix (True64)
    ('leave' is already defined)

  include/my_global.h
    1.40 03/02/28 14:32:39 monty@narttu.mysql.fi +1 -1
    Portability fix (For Tru64)

  cmd-line-utils/libedit/readline.c
    1.4 03/02/28 14:32:39 monty@narttu.mysql.fi +2 -2
    Portability fix (For IRIX)

ChangeSet
  1.1346.133.1 03/02/28 12:47:26 lenz@mysql.com +1 -0
   - Changed version number from "4.0.12-gamma" to "4.0.12" (confirmed by
     Monty)

  configure.in
    1.191.1.74 03/02/28 12:47:25 lenz@mysql.com +1 -1
     - Changed version number from "4.0.12-gamma" to "4.0.12" (confirmed by
       Monty)

ChangeSet
  1.1473.2.2 03/02/28 13:29:48 monty@narttu.mysql.fi +11 -0
  Merge with 3.23 -> 4.0

  sql/mysqld.cc
    1.340 03/02/28 13:29:47 monty@narttu.mysql.fi +2 -2
    merge

  sql/log_event.cc
    1.105 03/02/28 13:29:47 monty@narttu.mysql.fi +2 -4
    merge

  sql/sql_show.cc
    1.113 03/02/28 13:28:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_insert.cc
    1.85 03/02/28 13:28:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_class.cc
    1.105.1.2 03/02/28 13:28:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/slave.cc
    1.182 03/02/28 13:28:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.23 03/02/28 13:28:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/Makefile.am
    1.21 03/02/28 13:28:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/thr_lock.h
    1.12 03/02/28 13:28:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/config-win.h
    1.30 03/02/28 13:28:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  configure.in
    1.201.1.24 03/02/28 13:28:18 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1473.2.1 03/02/28 13:27:48 monty@narttu.mysql.fi +2 -0
  Portability fixes

  include/my_global.h
    1.39 03/02/28 13:27:46 monty@narttu.mysql.fi +1 -1
    Portability fix for AIX

  include/config-win.h
    1.29 03/02/28 13:27:46 monty@narttu.mysql.fi +1 -1
    Removed wrong ;

ChangeSet
  1.1346.132.1 03/02/28 12:33:10 monty@narttu.mysql.fi +1 -0
  Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0

  mysql-test/Makefile.am
    1.19.1.1 03/02/28 12:33:08 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.676.275.12 03/02/28 12:32:37 monty@narttu.mysql.fi +1 -0
  Added copying of *.slave-mi mysql-test files

  mysql-test/Makefile.am
    1.16.1.2 03/02/28 12:32:36 monty@narttu.mysql.fi +3 -1
    Added copying of *.slave-mi mysql-test files

ChangeSet
  1.1481 03/02/28 08:53:54 igor@hundin.mysql.fi +3 -0
  func_group.result:
    Added new tests for better coverage of
    min/max optimization code.
  func_group.test:
    Added new tests for better coverage of 
    min/max optimization code.
  opt_sum.cc:
    Fixed wrong previous manual merge.
    Fixed bugs concerning fields used in min/max
    functions for which there are conditions of
    the form field=const.

  mysql-test/r/func_group.result
    1.13 03/02/28 08:50:54 igor@hundin.mysql.fi +117 -3
    Added new tests for better coverage of
    min/max optimization code.

  mysql-test/t/func_group.test
    1.11 03/02/28 08:49:18 igor@hundin.mysql.fi +55 -2
    Added new test for better coverage of 
    min/max optimization code.

  sql/opt_sum.cc
    1.29 03/02/28 08:44:41 igor@hundin.mysql.fi +26 -30
    Fixed wrong previous manual merge.
    Fixed bugs concerning fields used in min/max
    functions for which there are conditions of
    the form field=const.

ChangeSet
  1.1346.46.210 03/02/27 22:26:09 bell@sanja.is.com.ua +4 -0
  fixed SQL_SELECT option with UNIONs

  sql/sql_yacc.yy
    1.145.1.57 03/02/27 22:26:08 bell@sanja.is.com.ua +4 -1
    fixed SQL_SELECT option with UNIONs

  sql/sql_cache.cc
    1.29.1.23 03/02/27 22:26:08 bell@sanja.is.com.ua +1 -1
    fixed SQL_SELECT option with UNIONs

  mysql-test/t/query_cache.test
    1.16.1.3 03/02/27 22:26:08 bell@sanja.is.com.ua +3 -2
    test of SQL_CACHE with UNIONs

  mysql-test/r/query_cache.result
    1.15.1.3 03/02/27 22:26:08 bell@sanja.is.com.ua +8 -3
    test of SQL_CACHE with UNIONs

ChangeSet
  1.1346.46.209 03/02/27 21:29:56 bell@sanja.is.com.ua +2 -0
  postmerging fix (SCRUM)

  libmysqld/lib_vio.c
    1.11.1.3 03/02/27 21:29:55 bell@sanja.is.com.ua +1 -1
    postmerging fix

  include/violite.h
    1.21.3.2 03/02/27 21:29:55 bell@sanja.is.com.ua +2 -2
    postmerging fix

ChangeSet
  1.1346.46.208 03/02/27 20:31:54 bell@sanja.is.com.ua +3 -0
  posreview changing (SCRUM)
  
  increased compatibility
  postmerge changing

  vio/viosocket.c
    1.15.1.2 03/02/27 20:31:52 bell@sanja.is.com.ua +1 -1
    increased compatibility

  sql/sql_show.cc
    1.76.1.25 03/02/27 20:31:52 bell@sanja.is.com.ua +2 -5
    postmerge changing

  sql/sql_class.h
    1.111.1.29 03/02/27 20:31:52 bell@sanja.is.com.ua +1 -1
    increased compatibility

ChangeSet
  1.1455.4.10 03/02/27 19:08:52 pem@mysql.com +5 -0
  A small step forward. Fixed a few bugs and made string type functions work,
  but still strange interferences between multiple function invocations...

  sql/sp_head.cc
    1.13 03/02/27 19:08:50 pem@mysql.com +3 -3
    Fixed string type bug, and set the right charset.

  sql/item_func.h
    1.70 03/02/27 19:08:50 pem@mysql.com +3 -3
    Fixed field_type bug; now string functions work too.
    Removed unecessary function which was added in a state of confusion.

  sql/item_func.cc
    1.110.1.2 03/02/27 19:08:50 pem@mysql.com +23 -23
    Fixed field_type bug; now string functions work too.
    Removed unecessary function which was added in a state of confusion.

  mysql-test/t/sp.test
    1.9 03/02/27 19:08:50 pem@mysql.com +10 -2
    New FUNCTION tests.

  mysql-test/r/sp.result
    1.9 03/02/27 19:08:50 pem@mysql.com +13 -6
    New FUNCTION tests.

ChangeSet
  1.1346.46.207 03/02/27 19:38:39 bell@sanja.is.com.ua +2 -0
  merging

  sql/sql_show.cc
    1.76.1.24 03/02/27 19:38:38 bell@sanja.is.com.ua +0 -1
    merging

  sql/sql_parse.cc
    1.218.1.77 03/02/27 19:35:38 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.46.206 03/02/27 17:35:51 monty@narttu.mysql.fi +9 -0
  Added detection if pthread_attr_getstacksize() exists
  Fixed bug in RAND() usage in mysqlbinlog

  sql/sql_show.cc
    1.76.3.2 03/02/27 17:35:49 monty@narttu.mysql.fi +1 -4
    Set host_or_ip for system threads (to make other code simpler)

  sql/sql_insert.cc
    1.63.1.27 03/02/27 17:35:49 monty@narttu.mysql.fi +1 -0
    Set host_or_ip for system threads (to make other code simpler)

  sql/sql_class.cc
    1.71.1.27 03/02/27 17:35:49 monty@narttu.mysql.fi +1 -1
    Set host_or_ip for system threads (to make other code simpler)

  sql/slave.cc
    1.164.1.46 03/02/27 17:35:49 monty@narttu.mysql.fi +1 -1
    Set host_or_ip for system threads (to make other code simpler)

  sql/repl_failsafe.cc
    1.11.1.16 03/02/27 17:35:49 monty@narttu.mysql.fi +1 -1
    Set host_or_ip for system threads (to make other code simpler)

  sql/mysqld.cc
    1.297.1.103 03/02/27 17:35:49 monty@narttu.mysql.fi +2 -0
    Portablity fix

  sql/log_event.cc
    1.77.1.20 03/02/27 17:35:49 monty@narttu.mysql.fi +2 -2
    Fixed bug in RAND() usage in mysqlbinlog

  include/thr_lock.h
    1.10.1.1 03/02/27 17:35:49 monty@narttu.mysql.fi +2 -2
    Fixed wrong comment

  configure.in
    1.191.1.73 03/02/27 17:35:49 monty@narttu.mysql.fi +1 -0
    Added detection if pthread_attr_getstacksize() exists

ChangeSet
  1.1480 03/02/27 17:45:40 bar@bar.mysql.r18.ru +1 -0
  sql_yacc.yy:
    set names binary  didn't work
    ,

  sql/sql_yacc.yy
    1.203.1.40 03/02/27 17:45:23 bar@bar.mysql.r18.ru +1 -0
    set names binary  didn't work
    ,

ChangeSet
  1.1479 03/02/27 16:53:10 bar@bar.mysql.r18.ru +3 -0
  sql_yacc.yy, item_strfunc.cc:
    Two separate functions charset() and collatio()
  item_strfunc.h:
    Two separate functions charset() and collation()

  sql/sql_yacc.yy
    1.203.1.39 03/02/27 16:52:47 bar@bar.mysql.r18.ru +2 -0
    Two separate functions charset() and collatio()

  sql/item_strfunc.h
    1.46 03/02/27 16:52:39 bar@bar.mysql.r18.ru +13 -0
    Two separate functions charset() and collation()

  sql/item_strfunc.cc
    1.77 03/02/27 16:52:24 bar@bar.mysql.r18.ru +11 -0
    Two separate functions charset() and collatio()

ChangeSet
  1.1478 03/02/27 12:45:00 bell@sanja.is.com.ua +1 -0
  fixed bug on case insensetive file systems

  sql/sql_parse.cc
    1.271.1.3 03/02/27 12:44:50 bell@sanja.is.com.ua +2 -2
    fixed bug on case insensetive file systems

ChangeSet
  1.1346.46.205 03/02/27 11:20:07 monty@narttu.mysql.fi +1 -0
  Add missing SIGNAL_WITH_VIO_CLOSE to fix problem with SLAVE STOP on windows

  include/config-win.h
    1.23.1.2 03/02/27 11:20:06 monty@narttu.mysql.fi +5 -0
    Add missing SIGNAL_WITH_VIO_CLOSE to fix problem with SLAVE STOP on windows

ChangeSet
  1.1475.1.1 03/02/27 12:10:41 bar@bar.mysql.r18.ru +1 -0
  field.cc:
    Now all text fields convert data into proper charset before storing

  sql/field.cc
    1.89 03/02/27 12:10:04 bar@bar.mysql.r18.ru +45 -1
    Now all text fields convert data into proper charset before storing

ChangeSet
  1.1473.1.1 03/02/27 10:01:50 igor@hundin.mysql.fi +3 -0
  func_group.result, func_group.test:
    Added tests for extended max/min optimization
  opt_sum.cc:
    Extended min/max optimization

  mysql-test/r/func_group.result
    1.12 03/02/27 09:58:30 igor@hundin.mysql.fi +250 -6
    Added tests for extended max/min optimization

  mysql-test/t/func_group.test
    1.10 03/02/27 09:56:36 igor@hundin.mysql.fi +149 -2
    Added tests for extended max/min optimization

ChangeSet
  1.1475 03/02/27 11:48:48 bar@bar.mysql.r18.ru +2 -0
  ctype_many.test:
    Insert constants with an explicit character set
  ctype_many.result:
    Fix according test change

  mysql-test/t/ctype_many.test
    1.10 03/02/27 11:48:23 bar@bar.mysql.r18.ru +64 -64
    Insert constants with an explicit character set

  mysql-test/r/ctype_many.result
    1.10 03/02/27 11:47:56 bar@bar.mysql.r18.ru +64 -64
    Fix according test change

ChangeSet
  1.1474 03/02/27 11:44:45 bar@bar.mysql.r18.ru +1 -0
  field.cc:
    rename len -> length, to look in common style

  sql/field.cc
    1.88 03/02/27 11:44:16 bar@bar.mysql.r18.ru +5 -5
    rename len -> length, to look in common style

  sql/opt_sum.cc
    1.28 03/02/27 09:43:26 igor@hundin.mysql.fi +618 -288
    Extended min/max optimization

ChangeSet
  1.1473 03/02/27 04:07:29 monty@narttu.mysql.fi +3 -0
  Merge work:/my/mysql-4.1 into narttu.mysql.fi:/my/mysql-4.1

  sql/sql_show.cc
    1.112 03/02/27 04:07:27 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/lex.h
    1.82.1.16 03/02/27 04:07:27 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/item_func.cc
    1.114 03/02/27 04:07:27 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1467.3.2 03/02/27 03:49:26 monty@narttu.mysql.fi +7 -0
  Merge with 4.0

  sql/sql_show.cc
    1.110.1.2 03/02/27 03:49:24 monty@narttu.mysql.fi +0 -1
    merge

  sql/item.h
    1.56.1.1 03/02/27 03:49:24 monty@narttu.mysql.fi +0 -5
    merge (use local copy)

  sql/sql_load.cc
    1.45 03/02/27 03:45:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_lex.cc
    1.75 03/02/27 03:45:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.85.1.17 03/02/27 03:45:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/bigint.test
    1.16 03/02/27 03:45:04 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/bigint.result
    1.18 03/02/27 03:45:04 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1467.3.1 03/02/27 03:44:44 monty@narttu.mysql.fi +30 -0
  Portability fixes
  Don't define crc32 if we are not linking with gzip

  sql/sql_show.cc
    1.110.1.1 03/02/27 03:44:32 monty@narttu.mysql.fi +0 -1
    Name can't be NULL

  sql/lex.h
    1.82.5.1 03/02/27 03:44:32 monty@narttu.mysql.fi +2 -0
    Don't define crc32 if we are not linking with gzip

  sql/item_func.h
    1.68.1.1 03/02/27 03:44:32 monty@narttu.mysql.fi +3 -1
    Don't define crc32 if we are not linking with gzip

  sql/item_func.cc
    1.112.1.1 03/02/27 03:44:32 monty@narttu.mysql.fi +5 -0
    Don't define crc32 if we are not linking with gzip

  sql/item_create.h
    1.19 03/02/27 03:44:32 monty@narttu.mysql.fi +2 -0
    Don't define crc32 if we are not linking with gzip

  sql/item_create.cc
    1.27 03/02/27 03:44:32 monty@narttu.mysql.fi +3 -0
    Don't define crc32 if we are not linking with gzip

  sql/gstream.h
    1.3 03/02/27 03:44:32 monty@narttu.mysql.fi +1 -1
    Portablity fix

  sql/gen_lex_hash.cc
    1.54 03/02/27 03:44:32 monty@narttu.mysql.fi +55 -25
    Fixed portability bug.

  mysql-test/t/union.test
    1.32 03/02/27 03:44:32 monty@narttu.mysql.fi +17 -0
    New union tests

  mysql-test/r/union.result
    1.31 03/02/27 03:44:32 monty@narttu.mysql.fi +33 -0
    New union tests

  libmysql/libmysql.c
    1.150 03/02/27 03:44:32 monty@narttu.mysql.fi +1 -1
    Removed wrong cast

  include/my_global.h
    1.38 03/02/27 03:44:32 monty@narttu.mysql.fi +20 -0
    Portability fixes for HPUX11

  heap/hp_rkey.c
    1.12 03/02/27 03:44:32 monty@narttu.mysql.fi +2 -1
    Portability fix

  heap/hp_hash.c
    1.24 03/02/27 03:44:32 monty@narttu.mysql.fi +8 -5
    Portability fix

  heap/_check.c
    1.15 03/02/27 03:44:32 monty@narttu.mysql.fi +2 -2
    Portability fix

  cmd-line-utils/libedit/term.c
    1.3 03/02/27 03:44:32 monty@narttu.mysql.fi +11 -3
    Portablity fixes
    Fixed core dump when using a terminal without arrow key definitions

  cmd-line-utils/libedit/sig.h
    1.2 03/02/27 03:44:31 monty@narttu.mysql.fi +3 -1
    sig_t is not portable

  cmd-line-utils/libedit/sig.c
    1.3 03/02/27 03:44:31 monty@narttu.mysql.fi +3 -3
    sig_t is not portable

  cmd-line-utils/libedit/readline/readline.h
    1.2 03/02/27 03:44:31 monty@narttu.mysql.fi +1 -2
    Systems that has sys/cdefs may not have __BEGIN_DECLS

  cmd-line-utils/libedit/readline.c
    1.3 03/02/27 03:44:31 monty@narttu.mysql.fi +7 -4
    Portability fixes (for HPUX11 and AIX)

  cmd-line-utils/libedit/read.c
    1.3 03/02/27 03:44:31 monty@narttu.mysql.fi +4 -0
    Portability fixes (for HPUX11 and AIX)

  cmd-line-utils/libedit/makelist
    1.2 03/02/27 03:44:31 monty@narttu.mysql.fi +2 -0
    Portability fixes (for HPUX11 and AIX)

  cmd-line-utils/libedit/key.h
    1.2 03/02/27 03:44:31 monty@narttu.mysql.fi +4 -0
    Portability fixes (for HPUX11 and AIX)

  cmd-line-utils/libedit/el.h
    1.2 03/02/27 03:44:31 monty@narttu.mysql.fi +1 -1
    Portability fixes (for HPUX11 and AIX)

  cmd-line-utils/libedit/Makefile.am
    1.3 03/02/27 03:44:31 monty@narttu.mysql.fi +1 -1
    Portability fixes (for HPUX11 and AIX)

  client/select_test.c
    1.11 03/02/27 03:44:31 monty@narttu.mysql.fi +0 -1
    Removed wrong include file
    (my_global.h should never be included by an external client)

  client/insert_test.c
    1.9 03/02/27 03:44:31 monty@narttu.mysql.fi +0 -1
    Removed wrong include file
    (my_global.h should never be included by an external client)

  client/connect_test.c
    1.7 03/02/27 03:44:31 monty@narttu.mysql.fi +0 -1
    Removed wrong include file
    (my_global.h should never be included by an external client)

  BitKeeper/etc/ignore
    1.145 03/02/27 03:42:42 monty@narttu.mysql.fi +1 -0
    added scripts/make_win_src_distribution

ChangeSet
  1.1346.46.204 03/02/27 02:10:19 monty@narttu.mysql.fi +4 -0
  Integer values between 9223372036854775807 and 9999999999999999999 are now
  regarded as unsigned longlongss, not as floats. This make these values work
  similar to values between 10000000000000000000 and 18446744073709551615.

  sql/sql_lex.cc
    1.32.1.7 03/02/27 02:10:18 monty@narttu.mysql.fi +1 -1
    Returns numbers between 9223372036854775807 and 9999999999999999999 as unsigned 64 bit numbers

  sql/item.h
    1.20.1.16 03/02/27 02:10:18 monty@narttu.mysql.fi +5 -0
    Mark unsigned big ints as unsigned

  mysql-test/t/bigint.test
    1.12.1.4 03/02/27 02:10:18 monty@narttu.mysql.fi +0 -6
    Fixed results for bigints

  mysql-test/r/bigint.result
    1.14.1.3 03/02/27 02:10:18 monty@narttu.mysql.fi +2 -2
    Fixed results for bigints

ChangeSet
  1.1346.46.203 03/02/27 00:06:09 monty@narttu.mysql.fi +1 -0
  Code cleanup

  sql/sql_load.cc
    1.34.1.11 03/02/27 00:06:08 monty@narttu.mysql.fi +3 -8
    Code cleanup

ChangeSet
  1.1346.131.1 03/02/26 23:35:58 monty@narttu.mysql.fi +1 -0
  Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0

  sql/sql_show.cc
    1.76.3.1 03/02/26 23:35:57 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1472 03/02/26 13:43:54 greg@mysql.com +3 -0
  Minor changes from 4.0->4.1 by Novell (Rob Lyon)

  sql/mysqld.cc
    1.339 03/02/26 13:43:37 greg@mysql.com +0 -1
    Removed duplicate call to pthread_exit(0)

  netware/nwconfigure
    1.2 03/02/26 13:43:37 greg@mysql.com +1 -1
    with-extra-charsets changed to latin1_de

  netware/mw/mwenv
    1.2 03/02/26 13:43:37 greg@mysql.com +5 -6
    MW environment for 4.1 (add zlib dir, change path)

ChangeSet
  1.1455.4.9 03/02/26 19:22:29 pem@mysql.com +12 -0
  Made stored FUNCTION invokation work almost always. Still buggy and unstable, and
  various known problems, but good enough for a checkpoint commit.

  sql/sql_yacc.yy
    1.219 03/02/26 19:22:27 pem@mysql.com +20 -3
    Added parsing of stored FUNCTION invocation and code generation for RETURN statement.

  sql/sql_parse.cc
    1.275 03/02/26 19:22:27 pem@mysql.com +3 -1
    sp_head::execute was renamed into execute_procedure.

  sql/sql_lex.cc
    1.72.1.2 03/02/26 19:22:27 pem@mysql.com +13 -0
    Added check for stored FUNCTION, analogous to UDFs.

  sql/sp_rcontext.h
    1.2 03/02/26 19:22:27 pem@mysql.com +14 -1
    Added result slot for FUNCTIONs.

  sql/sp_head.h
    1.8 03/02/26 19:22:27 pem@mysql.com +41 -2
    New code for executing a FUNCTION.

  sql/sp_head.cc
    1.12 03/02/26 19:22:27 pem@mysql.com +111 -55
    New code for executing a FUNCTION. (And reworked some of the old code in the process.)

  sql/sp.h
    1.4 03/02/26 19:22:27 pem@mysql.com +4 -0
    Added temporary sp_function_exists() function for checking without parsing.

  sql/sp.cc
    1.6 03/02/26 19:22:27 pem@mysql.com +19 -2
    Close mysql.proc table earlier so recursive find_function calls work.
    Added temporary sp_function_exists() function for checking without parsing.

  sql/item_func.h
    1.69 03/02/26 19:22:27 pem@mysql.com +66 -0
    New Item_func_sp for stored FUNCTIONs.

  sql/item_func.cc
    1.110.1.1 03/02/26 19:22:27 pem@mysql.com +75 -0
    New Item_func_sp for stored FUNCTIONs.

  mysql-test/t/sp.test
    1.8 03/02/26 19:22:27 pem@mysql.com +23 -4
    New tests for invoking simple FUNCTIONs.

  mysql-test/r/sp.result
    1.8 03/02/26 19:22:27 pem@mysql.com +19 -3
    New tests for invoking simple FUNCTIONs.

ChangeSet
  1.1346.46.201 03/02/26 19:52:31 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Remove DEBUG_ASSERT if MySQL internally names a UNIQUE index as the PRIMARY KEY, but inside InnoDB there is no primary key for the table

  sql/ha_innodb.cc
    1.73.1.83 03/02/26 19:52:23 heikki@hundin.mysql.fi +7 -1
    Remove DEBUG_ASSERT if MySQL internally names a UNIQUE index as the PRIMARY KEY, but inside InnoDB there is no primary key for the table

ChangeSet
  1.1346.46.200 03/02/26 19:31:05 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Add docs to store_lock()

  sql/ha_innodb.cc
    1.73.1.82 03/02/26 19:30:57 heikki@hundin.mysql.fi +6 -3
    Add docs to store_lock()

ChangeSet
  1.1471 03/02/26 20:25:48 ram@mysql.r18.ru +25 -0
  All segments of SPATIAL keys MUST be NOT NULL.
  Allow NULL geometry fields.

  sql/sql_table.cc
    1.155 03/02/26 20:25:44 ram@mysql.r18.ru +5 -5
    All segments of SPATIAL keys MUST be NOT NULL.
    Allow NULL geometry fields.

  sql/share/ukrainian/errmsg.txt
    1.27.1.2 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/swedish/errmsg.txt
    1.64.1.2 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/spanish/errmsg.txt
    1.64.1.2 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/slovak/errmsg.txt
    1.64.1.2 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/serbian/errmsg.txt
    1.18.1.1 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/russian/errmsg.txt
    1.61.1.2 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/romanian/errmsg.txt
    1.62.1.2 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/portuguese/errmsg.txt
    1.64.1.2 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/polish/errmsg.txt
    1.63.1.2 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/norwegian/errmsg.txt
    1.63.1.2 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.2 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/korean/errmsg.txt
    1.63.1.2 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/japanese/errmsg.txt
    1.63.1.2 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/italian/errmsg.txt
    1.70.1.2 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/hungarian/errmsg.txt
    1.65.1.2 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/greek/errmsg.txt
    1.64.1.2 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/german/errmsg.txt
    1.64.1.2 03/02/26 20:25:44 ram@mysql.r18.ru +1 -0
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/french/errmsg.txt
    1.63.1.2 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/estonian/errmsg.txt
    1.64.1.2 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/english/errmsg.txt
    1.70.1.3 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/dutch/errmsg.txt
    1.66.1.2 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/danish/errmsg.txt
    1.62.1.2 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  sql/share/czech/errmsg.txt
    1.64.1.2 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

  include/mysqld_error.h
    1.61.1.1 03/02/26 20:25:44 ram@mysql.r18.ru +2 -1
    new error message: "All parts of a SPATIAL KEY must be NOT NULL"

ChangeSet
  1.1470 03/02/26 19:23:11 ram@mysql.r18.ru +1 -0
  Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
  into mysql.r18.ru:/usr/home/ram/work/mysql-4.1

  sql/spatial.cc
    1.8 03/02/26 19:23:07 ram@mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1469 03/02/26 19:13:01 ram@mysql.r18.ru +2 -0
  Added num_geometries() and geometry_n() methods for MultiX geometry objects.

  sql/spatial.h
    1.5 03/02/26 19:12:58 ram@mysql.r18.ru +7 -3
    Added num_geometries() and geometry_n() methods for MultiX geometry objects.

  sql/spatial.cc
    1.6.1.1 03/02/26 19:12:58 ram@mysql.r18.ru +107 -0
    Added num_geometries() and geometry_n() methods for MultiX geometry objects.

  cmd-line-utils/libedit/libedit_term.h
    1.2 03/02/26 17:05:04 monty@narttu.mysql.fi +0 -0
    Rename: cmd-line-utils/libedit/term.h -> cmd-line-utils/libedit/libedit_term.h

ChangeSet
  1.1346.130.1 03/02/26 15:28:28 Sinisa@sinisa.nasamreza.org +1 -0
  A fix for a crashing bug with unspecified database in this  type of
  command:
  
  load  data infile 'filename' into table db.table;

  sql/sql_load.cc
    1.34.1.10 03/02/26 15:27:42 Sinisa@sinisa.nasamreza.org +9 -2
    A fix for a crashing bug with unspecified database in this  type of
    command:
    
    load  data infile 'filename' into table db.table;

ChangeSet
  1.1467.1.12 03/02/26 17:02:36 bar@bar.mysql.r18.ru +2 -0
  sql_yacc.yy, lex.h:
    SET NAMES is now working

  sql/sql_yacc.yy
    1.203.1.38 03/02/26 17:02:15 bar@bar.mysql.r18.ru +11 -0
    SET NAMES is now working

  sql/lex.h
    1.82.1.15 03/02/26 17:02:04 bar@bar.mysql.r18.ru +2 -0
    SET NAMES is now working

ChangeSet
  1.1467.1.11 03/02/26 16:37:41 bar@bar.mysql.r18.ru +2 -0
  set_var.cc, set_var.h:
    New thread variable client_character_set

  sql/set_var.cc
    1.30 03/02/26 16:37:24 bar@bar.mysql.r18.ru +52 -0
    New thread variable client_character_set

  sql/set_var.h
    1.13 03/02/26 16:37:06 bar@bar.mysql.r18.ru +17 -0
    New thread variable client_character_set

ChangeSet
  1.1463.1.1 03/02/26 13:23:45 serg@serg.mysql.com +2 -0
  error message fixed

  sql/sql_select.cc
    1.206.1.1 03/02/26 13:23:42 serg@serg.mysql.com +1 -1
    error message fixed

  BitKeeper/etc/ignore
    1.143.1.1 03/02/26 13:23:42 serg@serg.mysql.com +1 -0
    Added scripts/make_win_src_distribution to the ignore list

ChangeSet
  1.1467.1.10 03/02/26 14:54:57 bar@bar.mysql.r18.ru +1 -0
  sql_show.cc:
    Less default_charset_info

  sql/sql_show.cc
    1.111 03/02/26 14:54:45 bar@bar.mysql.r18.ru +7 -7
    Less default_charset_info

ChangeSet
  1.1467.1.9 03/02/26 14:50:59 bar@bar.mysql.r18.ru +1 -0
  sql_class.h:
    New method to simplify access to thd charset

  sql/sql_class.h
    1.146.1.3 03/02/26 14:50:26 bar@bar.mysql.r18.ru +1 -0
    New method to simplify access to thd charset

ChangeSet
  1.1467.1.8 03/02/26 14:30:39 bar@bar.mysql.r18.ru +1 -0
  sql_test.cc:
    Less default_charset_info

  sql/sql_test.cc
    1.19 03/02/26 14:30:28 bar@bar.mysql.r18.ru +3 -3
    Less default_charset_info

ChangeSet
  1.1467.1.7 03/02/26 14:08:31 bar@bar.mysql.r18.ru +2 -0
  sql_udf.cc, protocol.cc:
    Less default_charset_info

  sql/sql_udf.cc
    1.28 03/02/26 14:08:11 bar@bar.mysql.r18.ru +2 -2
    Less default_charset_info

  sql/protocol.cc
    1.47 03/02/26 14:08:02 bar@bar.mysql.r18.ru +3 -3
    Less default_charset_info

ChangeSet
  1.1467.1.6 03/02/26 13:34:35 bar@bar.mysql.r18.ru +4 -0
  set_var.cc, sql_table.cc, handler.cc, field.cc:
    Less default_charset_info

  sql/set_var.cc
    1.29 03/02/26 13:34:15 bar@bar.mysql.r18.ru +1 -1
    Less default_charset_info

  sql/sql_table.cc
    1.154 03/02/26 13:34:08 bar@bar.mysql.r18.ru +1 -1
    Less default_charset_info

  sql/handler.cc
    1.84.1.5 03/02/26 13:34:01 bar@bar.mysql.r18.ru +1 -1
    Less default_charset_info

  sql/field.cc
    1.87 03/02/26 13:33:54 bar@bar.mysql.r18.ru +1 -1
    Less default_charset_info

ChangeSet
  1.1467.1.5 03/02/26 13:16:02 bar@bar.mysql.r18.ru +3 -0
  sql_analyse.cc, spatial.cc:
    Some default_charset_info were removed
  sql_select.cc:
    Some default_charset_info were removed.

  sql/sql_analyse.cc
    1.32 03/02/26 13:15:31 bar@bar.mysql.r18.ru +10 -10
    Some default_charset_info were removed

  sql/sql_select.cc
    1.207 03/02/26 13:15:15 bar@bar.mysql.r18.ru +15 -21
    Some default_charset_info were removed.

  sql/spatial.cc
    1.7 03/02/26 13:14:58 bar@bar.mysql.r18.ru +1 -2
    Some default_charset_info were removed

ChangeSet
  1.1467.1.4 03/02/26 12:29:17 bar@bar.mysql.r18.ru +2 -0
  item_func.cc:
    Some reoganization
    Fixed that binary arguments do not affect result charset
    anymore
    For example, the second argument doesn't affect charset of result in LEFT(string,10)
  sql_string.h:
    Strings are binary by default now

  sql/item_func.cc
    1.113 03/02/26 12:27:47 bar@bar.mysql.r18.ru +12 -15
    Some reoganization
    Fixed that binary arguments do not affect result charset
    anymore
    For example, the second argument doesn't affect charset of result in LEFT(string,10)

  sql/sql_string.h
    1.30 03/02/26 12:27:27 bar@bar.mysql.r18.ru +2 -2
    Strings are binary by default now

ChangeSet
  1.676.275.11 03/02/26 10:16:50 monty@narttu.mysql.fi +1 -0
  Fix for SHOW TABLE STATUS with empty .frm file

  sql/sql_show.cc
    1.47.1.21 03/02/26 10:16:49 monty@narttu.mysql.fi +1 -1
    Fix for SHOW TABLE STATUS with empty .frm file

ChangeSet
  1.676.275.10 03/02/26 09:52:19 monty@narttu.mysql.fi +1 -0
  Comment column in SHOW TABLE STATUS now reports that it can
  contain NULL values (which is the case for a crashed .frm file).

  sql/sql_show.cc
    1.47.1.20 03/02/26 09:52:19 monty@narttu.mysql.fi +1 -0
    Comment column in SHOW TABLE STATUS now reports that it can
    contain NULL values (which is the case for a crashed .frm file).

ChangeSet
  1.1467.1.3 03/02/26 11:00:36 bar@bar.mysql.r18.ru +1 -0
  item_sum.cc:
    Fixed that MIN() didn't return proper charset for CREATE from SELECT

  sql/item_sum.cc
    1.64 03/02/26 10:58:47 bar@bar.mysql.r18.ru +1 -0
    Fixed that MIN() didn't return proper charset for CREATE from SELECT

ChangeSet
  1.1467.2.1 03/02/26 10:33:45 bar@bar.mysql.r18.ru +1 -0
  Fix for MIX and MAX. Item must be checked against binary().

  sql/item_sum.cc
    1.63 03/02/26 10:33:43 bar@bar.mysql.r18.ru +1 -1
    Fix for MIX and MAX. Item must be checked against binary().

ChangeSet
  1.1467.1.1 03/02/26 01:03:47 monty@narttu.mysql.fi +58 -0
  Merge with 4.0.11

  sql/sql_yacc.yy
    1.203.1.37 03/02/26 01:03:45 monty@narttu.mysql.fi +3 -4
    Merge with 4.0.11

  sql/sql_union.cc
    1.66 03/02/26 01:03:45 monty@narttu.mysql.fi +0 -1
    Merge with 4.0.11

  sql/sql_parse.cc
    1.271.1.2 03/02/26 01:03:45 monty@narttu.mysql.fi +1 -2
    Merge with 4.0.11

  sql/sql_analyse.h
    1.16 03/02/26 01:03:45 monty@narttu.mysql.fi +0 -6
    Merge with 4.0.11

  sql/sql_analyse.cc
    1.31 03/02/26 01:03:45 monty@narttu.mysql.fi +0 -4
    Merge with 4.0.11

  sql/share/german/errmsg.txt
    1.64.1.1 03/02/26 01:03:45 monty@narttu.mysql.fi +5 -7
    Merge with 4.0.11

  sql/ha_innodb.cc
    1.85.1.16 03/02/26 01:03:45 monty@narttu.mysql.fi +3 -9
    Merge with 4.0.11

  configure.in
    1.201.1.23 03/02/26 01:03:45 monty@narttu.mysql.fi +0 -2
    Merge with 4.0.11

  sql/table.h
    1.46 03/02/26 00:54:52 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/ukrainian/errmsg.txt
    1.27.1.1 03/02/26 00:54:52 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/swedish/errmsg.txt
    1.64.1.1 03/02/26 00:54:52 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/spanish/errmsg.txt
    1.64.1.1 03/02/26 00:54:52 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/slovak/errmsg.txt
    1.64.1.1 03/02/26 00:54:52 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/russian/errmsg.txt
    1.61.1.1 03/02/26 00:54:52 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/romanian/errmsg.txt
    1.62.1.1 03/02/26 00:54:52 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/portuguese/errmsg.txt
    1.64.1.1 03/02/26 00:54:52 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.63.1.1 03/02/26 00:54:52 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/norwegian/errmsg.txt
    1.63.1.1 03/02/26 00:54:52 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/norwegian-ny/errmsg.txt
    1.63.1.1 03/02/26 00:54:52 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/korean/errmsg.txt
    1.63.1.1 03/02/26 00:54:52 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/japanese/errmsg.txt
    1.63.1.1 03/02/26 00:54:52 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/italian/errmsg.txt
    1.70.1.1 03/02/26 00:54:52 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/hungarian/errmsg.txt
    1.65.1.1 03/02/26 00:54:52 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/greek/errmsg.txt
    1.64.1.1 03/02/26 00:54:52 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/french/errmsg.txt
    1.63.1.1 03/02/26 00:54:52 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/estonian/errmsg.txt
    1.64.1.1 03/02/26 00:54:52 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.70.1.2 03/02/26 00:54:52 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/dutch/errmsg.txt
    1.66.1.1 03/02/26 00:54:52 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/danish/errmsg.txt
    1.62.1.1 03/02/26 00:54:52 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/czech/errmsg.txt
    1.64.1.1 03/02/26 00:54:52 monty@narttu.mysql.fi +1 -1
    Auto merged

  sql/sql_update.cc
    1.78 03/02/26 00:54:51 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_table.cc
    1.153 03/02/26 00:54:51 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_load.cc
    1.44 03/02/26 00:54:51 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_handler.cc
    1.37 03/02/26 00:54:51 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_class.cc
    1.105.1.1 03/02/26 00:54:51 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_acl.cc
    1.70 03/02/26 00:54:51 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/opt_sum.cc
    1.27 03/02/26 00:54:51 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.338 03/02/26 00:54:51 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/query_cache.test
    1.20 03/02/26 00:54:51 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/innodb_handler.test
    1.4 03/02/26 00:54:51 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.32 03/02/26 00:54:51 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/handler.test
    1.11 03/02/26 00:54:51 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/bigint.test
    1.15 03/02/26 00:54:51 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/query_cache.result
    1.19 03/02/26 00:54:51 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/innodb_handler.result
    1.4 03/02/26 00:54:51 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.54 03/02/26 00:54:50 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/handler.result
    1.10 03/02/26 00:54:50 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/r/bigint.result
    1.17 03/02/26 00:54:50 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.163 03/02/26 00:54:50 monty@narttu.mysql.fi +0 -0
    Auto merged

  myisam/myisamchk.c
    1.92 03/02/26 00:54:50 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/ut/ut0mem.c
    1.10 03/02/26 00:54:50 monty@narttu.mysql.fi +0 -0
    Auto merged

  innobase/row/row0sel.c
    1.30 03/02/26 00:54:50 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/my_pthread.h
    1.62 03/02/26 00:54:50 monty@narttu.mysql.fi +0 -0
    Auto merged

  include/my_base.h
    1.41 03/02/26 00:54:50 monty@narttu.mysql.fi +0 -0
    Auto merged

  client/mysqldump.c
    1.79 03/02/26 00:54:50 monty@narttu.mysql.fi +0 -0
    Auto merged

  BUILD/FINISH.sh
    1.24 03/02/26 00:54:50 monty@narttu.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.233.1.2 03/02/26 00:54:43 monty@narttu.mysql.fi +1 -2
    auto-union

  BitKeeper/etc/ignore
    1.144 03/02/26 00:54:43 monty@narttu.mysql.fi +5 -5
    auto-union

ChangeSet
  1.1346.129.5 03/02/26 00:22:35 monty@narttu.mysql.fi +30 -0
  merge with 3.23 to get corrected error message files and rename of files in mysql-test

  sql/sql_class.cc
    1.71.1.26 03/02/26 00:22:33 monty@narttu.mysql.fi +0 -1
    merge with 3.23 (Keep local copy)

  sql/share/swedish/errmsg.txt
    1.46.1.7 03/02/26 00:22:33 monty@narttu.mysql.fi +1 -2
    merge with 3.23

  sql/share/estonian/errmsg.txt
    1.47.1.7 03/02/26 00:22:33 monty@narttu.mysql.fi +0 -2
    merge with 3.23

  sql/share/dutch/errmsg.txt
    1.49.1.10 03/02/26 00:22:33 monty@narttu.mysql.fi +3 -6
    merge with 3.23

  sql/share/danish/errmsg.txt
    1.45.1.7 03/02/26 00:22:33 monty@narttu.mysql.fi +1 -3
    merge with 3.23

  sql/share/czech/errmsg.txt
    1.46.1.7 03/02/26 00:22:33 monty@narttu.mysql.fi +0 -187
    merge with 3.23

  scripts/make_binary_distribution.sh
    1.49 03/02/26 00:22:33 monty@narttu.mysql.fi +1 -2
    merge with 3.23

  mysql-test/mysql-test-run.sh
    1.146.1.15 03/02/26 00:22:33 monty@narttu.mysql.fi +0 -0
    merge with 3.23

  mysql-test/t/rpl_rotate_logs.slave-mi
    1.8 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/rpl000015.slave-mi
    1.7 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/ukrainian/errmsg.txt
    1.11.1.7 03/02/26 00:14:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/spanish/errmsg.txt
    1.47.1.7 03/02/26 00:14:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/slovak/errmsg.txt
    1.46.1.7 03/02/26 00:14:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/russian/errmsg.txt
    1.45.1.7 03/02/26 00:14:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/romanian/errmsg.txt
    1.44.1.7 03/02/26 00:14:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/portuguese/errmsg.txt
    1.47.1.8 03/02/26 00:14:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.45.1.7 03/02/26 00:14:18 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/rpl_rotate_logs.slave-mi
    1.1.2.2 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Turn off SCCS flag

  mysql-test/t/rpl000015.slave-mi
    1.1.1.2 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Turn off SCCS flag

  sql/sql_analyse.h
    1.11.1.1 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/sql_analyse.cc
    1.12.1.5 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/norwegian/errmsg.txt
    1.45.1.7 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/norwegian-ny/errmsg.txt
    1.45.1.7 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/korean/errmsg.txt
    1.45.1.7 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/japanese/errmsg.txt
    1.45.1.7 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/italian/errmsg.txt
    1.52.1.8 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/hungarian/errmsg.txt
    1.47.1.7 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/greek/errmsg.txt
    1.46.1.7 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/german/errmsg.txt
    1.47.1.7 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/french/errmsg.txt
    1.46.1.7 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.51.1.12 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

  mysql-test/t/rpl_rotate_logs.slave-mi
    1.7 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Merge rename: mysql-test/t/rpl_rotate_logs-slave-master-info.opt -> mysql-test/t/rpl_rotate_logs.slave-mi

  mysql-test/t/rpl000015.slave-mi
    1.6 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Merge rename: mysql-test/t/rpl000015-slave-master-info.opt -> mysql-test/t/rpl000015.slave-mi

  innobase/ibuf/ibuf0ibuf.c
    1.14 03/02/26 00:14:17 monty@narttu.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.129.4 03/02/26 00:13:18 monty@narttu.mysql.fi +6 -0
  Safety fix (caused a core dump on slave during shutdown when shutting down replication on some OS)

  netware/mysql_test_run.c
    1.2 03/02/26 00:13:17 monty@narttu.mysql.fi +1 -1
    slave-master-info.opt -> .slave-mi

  mysys/thr_alarm.c
    1.30 03/02/26 00:13:17 monty@narttu.mysql.fi +2 -0
    Safety fix (caused a core dump on slave during shutdown when shutting down replication on some OS)

  mysql-test/t/bigint.test
    1.12.1.3 03/02/26 00:13:17 monty@narttu.mysql.fi +1 -0
    New bigint test

  mysql-test/r/bigint.result
    1.14.1.2 03/02/26 00:13:17 monty@narttu.mysql.fi +3 -0
    New bigint test

ChangeSet
  1.676.275.9 03/02/26 00:04:13 monty@narttu.mysql.fi +4 -0
  change 'slave-master-info.opt' to .slave-mi to avoid problems with long filenames on some OS

  scripts/make_binary_distribution.sh
    1.29.1.8 03/02/26 00:04:05 monty@narttu.mysql.fi +1 -1
    change 'slave-master-info.opt' to .slave-mi to avoid problems with long filenames on some OS

  mysql-test/mysql-test-run.sh
    1.66.1.25 03/02/26 00:04:05 monty@narttu.mysql.fi +1 -1
    change 'slave-master-info.opt' to .slave-mi to avoid problems with long filenames on some OS

  mysql-test/t/rpl000015.slave-mi
    1.1.1.1 03/02/25 23:38:11 monty@narttu.mysql.fi +0 -0
    Rename: mysql-test/t/rpl000015-slave-master-info.opt -> mysql-test/t/rpl000015.slave-mi

  mysql-test/t/rpl_rotate_logs.slave-mi
    1.1.2.1 03/02/25 23:38:03 monty@narttu.mysql.fi +0 -0
    Rename: mysql-test/t/rpl_rotate_logs-slave-master-info.opt -> mysql-test/t/rpl_rotate_logs.slave-mi

  mysql-test/t/rpl000015-slave-master-info.opt
    1.5 03/02/25 23:37:22 monty@narttu.mysql.fi +0 -0
    Rename: mysql-test/t/rpl000015.slave-mi -> mysql-test/t/rpl000015-slave-master-info.opt

  mysql-test/t/rpl_rotate_logs-slave-master-info.opt
    1.6 03/02/25 23:37:13 monty@narttu.mysql.fi +0 -0
    Rename: mysql-test/t/rpl_rotate_logs.slave-mi -> mysql-test/t/rpl_rotate_logs-slave-master-info.opt

  mysql-test/t/rpl_rotate_logs.slave-mi
    1.5 03/02/25 23:33:06 monty@narttu.mysql.fi +0 -0
    Rename: mysql-test/t/rpl_rotate_logs-slave-master-info.opt -> mysql-test/t/rpl_rotate_logs.slave-mi

  mysql-test/t/rpl000015.slave-mi
    1.4 03/02/25 23:32:50 monty@narttu.mysql.fi +0 -0
    Rename: mysql-test/t/rpl000015-slave-master-info.opt -> mysql-test/t/rpl000015.slave-mi

ChangeSet
  1.1346.46.196 03/02/25 21:20:22 serg@serg.mysql.com +1 -0
  fixed again

  mysql-test/t/innodb_handler.test
    1.2.1.3 03/02/25 21:20:20 serg@serg.mysql.com +2 -2
    fixed again

ChangeSet
  1.1346.129.3 03/02/25 22:20:17 monty@narttu.mysql.fi +1 -0
  Portability fix

  mysql-test/t/bigint.test
    1.12.1.2 03/02/25 22:20:16 monty@narttu.mysql.fi +6 -0
    Portability fix

ChangeSet
  1.1346.129.2 03/02/25 21:44:13 monty@narttu.mysql.fi +1 -0
  Ignore some automaticly generated files

  BitKeeper/etc/ignore
    1.107.1.35 03/02/25 21:43:46 monty@narttu.mysql.fi +3 -0
    added support-files/MacOSX/StartupParameters.plist support-files/MacOSX/postinstall support-files/MacOSX/preinstall

ChangeSet
  1.1346.129.1 03/02/25 21:43:24 monty@narttu.mysql.fi +4 -0
  Portability fix for HPUX10.20

  sql/mysqld.cc
    1.297.1.102 03/02/25 21:43:08 monty@narttu.mysql.fi +5 -7
    Simple code cleanup

  mysys/my_pthread.c
    1.34 03/02/25 21:43:08 monty@narttu.mysql.fi +11 -1
    Portability fix for HPUX10.20

  include/my_pthread.h
    1.57.1.3 03/02/25 21:43:07 monty@narttu.mysql.fi +5 -0
    Portability fix for HPUX10.20

  BUILD/compile-pentium-debug-max
    1.9 03/02/25 21:43:07 monty@narttu.mysql.fi +1 -1
    Added -DBIG_TABLES

ChangeSet
  1.1346.128.1 03/02/25 20:37:49 serg@serg.mysql.com +2 -0
  fix a bug in the test

  mysql-test/t/innodb_handler.test
    1.2.1.2 03/02/25 20:37:47 serg@serg.mysql.com +4 -2
    fix a bug in the test

  mysql-test/r/innodb_handler.result
    1.2.1.2 03/02/25 20:37:47 serg@serg.mysql.com +4 -2
    fix a bug in the test

ChangeSet
  1.1468 03/02/25 19:07:59 ram@mysql.r18.ru +1 -0
  rtree_find_X functions speed-up: we don't need to store whole key buffer for next search.
  Code clean-up.

  myisam/rt_index.c
    1.6 03/02/25 19:07:57 ram@mysql.r18.ru +13 -21
    rtree_find_X functions speed-up: we don't need to store whole key buffer for next search.
    Code clean-up.

ChangeSet
  1.1346.46.193 03/02/25 15:20:07 lenz@mysql.com +4 -0
   - Heavily reworked the Do-pkg script to use functions from logger.pm
   - moved helper functions from Bootstrap script to logger.pm 

  support-files/MacOSX/postinstall.sh
    1.2 03/02/25 15:20:06 lenz@mysql.com +9 -6
     - made script more robust

  Build-tools/logger.pm
    1.2 03/02/25 15:20:06 lenz@mysql.com +56 -1
     - added functions run_command() and abort() from Bootstrap script for
       better code reusability

  Build-tools/Do-pkg
    1.2 03/02/25 15:20:06 lenz@mysql.com +109 -49
     - heavily reworked: now make use of the logger.pm helper functions
     - added new options: --dry-run, --log, --mail, --verbose

  Build-tools/Bootstrap
    1.2 03/02/25 15:20:06 lenz@mysql.com +8 -63
     - renamed logfile -> LOGFILE
     - moved functions abort() and run_command() to logger.pm for better
       reusability

ChangeSet
  1.676.1.658 03/02/25 16:09:47 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql
  into sinisa.nasamreza.org:/mnt/work/mysql

  sql/share/polish/errmsg.txt
    1.22.1.11 03/02/25 16:09:09 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1346.46.192 03/02/25 13:10:16 lenz@mysql.com +1 -0
   - bumped up version number from 4.0.11-gamma -> 4.0.12-gamma in configure.in
   - tagged ChangeSet 1.1594 as "mysql-4.0.11"

  configure.in
    1.191.1.72 03/02/25 13:10:14 lenz@mysql.com +1 -1
     - bumped up version number from 4.0.11-gamma -> 4.0.12-gamma in configure.in
     - tagged ChangeSet 1.1594 as "mysql-4.0.11"

ChangeSet
  1.676.275.8 03/02/25 13:41:08 monty@mashka.mysql.fi +22 -0
  Fixed "syntax" errors in text message files.
  Ensured that all errors messages ends with: ",

  sql/share/ukrainian/errmsg.txt
    1.1.1.6 03/02/25 13:41:07 monty@mashka.mysql.fi +1 -1
    Fixed "syntax" errors.

  sql/share/swedish/errmsg.txt
    1.23.1.12 03/02/25 13:41:07 monty@mashka.mysql.fi +7 -7
    Fixed "syntax" errors.

  sql/share/spanish/errmsg.txt
    1.23.1.11 03/02/25 13:41:07 monty@mashka.mysql.fi +3 -3
    Fixed "syntax" errors.

  sql/share/slovak/errmsg.txt
    1.23.1.10 03/02/25 13:41:07 monty@mashka.mysql.fi +3 -3
    Fixed "syntax" errors.

  sql/share/russian/errmsg.txt
    1.23.1.10 03/02/25 13:41:07 monty@mashka.mysql.fi +3 -3
    Fixed "syntax" errors.

  sql/share/romanian/errmsg.txt
    1.21.1.10 03/02/25 13:41:07 monty@mashka.mysql.fi +1 -1
    Fixed "syntax" errors.

  sql/share/portuguese/errmsg.txt
    1.23.1.14 03/02/25 13:41:07 monty@mashka.mysql.fi +1 -1
    Fixed "syntax" errors.

  sql/share/polish/errmsg.txt
    1.22.2.1 03/02/25 13:41:07 monty@mashka.mysql.fi +5 -5
    Fixed "syntax" errors.

  sql/share/norwegian/errmsg.txt
    1.22.1.10 03/02/25 13:41:07 monty@mashka.mysql.fi +4 -4
    Fixed "syntax" errors.

  sql/share/norwegian-ny/errmsg.txt
    1.22.1.10 03/02/25 13:41:07 monty@mashka.mysql.fi +4 -4
    Fixed "syntax" errors.

  sql/share/korean/errmsg.txt
    1.22.1.10 03/02/25 13:41:07 monty@mashka.mysql.fi +3 -3
    Fixed "syntax" errors.

  sql/share/japanese/errmsg.txt
    1.22.1.10 03/02/25 13:41:07 monty@mashka.mysql.fi +2 -2
    Fixed "syntax" errors.

  sql/share/italian/errmsg.txt
    1.27.1.12 03/02/25 13:41:07 monty@mashka.mysql.fi +3 -3
    Fixed "syntax" errors.

  sql/share/hungarian/errmsg.txt
    1.24.1.10 03/02/25 13:41:07 monty@mashka.mysql.fi +3 -3
    Fixed "syntax" errors.

  sql/share/greek/errmsg.txt
    1.23.1.10 03/02/25 13:41:07 monty@mashka.mysql.fi +2 -2
    Fixed "syntax" errors.

  sql/share/german/errmsg.txt
    1.23.1.11 03/02/25 13:41:06 monty@mashka.mysql.fi +3 -3
    Fixed "syntax" errors.

  sql/share/french/errmsg.txt
    1.22.1.11 03/02/25 13:41:06 monty@mashka.mysql.fi +4 -4
    Fixed "syntax" errors.

  sql/share/estonian/errmsg.txt
    1.22.1.12 03/02/25 13:41:06 monty@mashka.mysql.fi +2 -2
    Fixed "syntax" errors.

  sql/share/english/errmsg.txt
    1.26.1.10 03/02/25 13:41:06 monty@mashka.mysql.fi +2 -2
    Fixed "syntax" errors.

  sql/share/dutch/errmsg.txt
    1.23.1.11 03/02/25 13:41:06 monty@mashka.mysql.fi +3 -3
    Fixed "syntax" errors.

  sql/share/danish/errmsg.txt
    1.22.1.10 03/02/25 13:41:06 monty@mashka.mysql.fi +4 -4
    Fixed "syntax" errors.

  sql/share/czech/errmsg.txt
    1.23.1.10 03/02/25 13:41:06 monty@mashka.mysql.fi +190 -190
    Fixed new line terminations

ChangeSet
  1.676.275.7 03/02/25 11:05:07 monty@mashka.mysql.fi +1 -0
  Indentation cleanup

  sql/sql_analyse.h
    1.7.1.2 03/02/25 11:05:06 monty@mashka.mysql.fi +2 -0
    Indentation cleanup

ChangeSet
  1.1467 03/02/25 11:45:32 ram@mysql.r18.ru +1 -0
  Forbid NULL geometry fields 

  sql/sql_table.cc
    1.152 03/02/25 11:45:30 ram@mysql.r18.ru +5 -0
    Forbid NULL geometry fields 

ChangeSet
  1.1466 03/02/24 17:22:02 venu@myvenu.com +1 -0
  Fix for the prepared statement access checks

  sql/sql_prepare.cc
    1.30 03/02/24 17:16:44 venu@myvenu.com +26 -5
    Fix for the prepared statement access checks

ChangeSet
  1.1465 03/02/24 17:05:03 venu@myvenu.com +2 -0
  1. Fix for the crash in debug mode when the .frm is corrupted and SHOW TABLE STATUS is executed.This also fixes to return the error message to comment field in SHOW TABLE STATUS when the .frm is corrupted
  2. Test for corrupted .frm and the SHOW TABLE STATUS

  tests/client_test.c
    1.28 03/02/24 17:01:30 venu@myvenu.com +305 -36
    test for corrupted .frm and the SHOW TABLE STATUS

  sql/sql_show.cc
    1.110 03/02/24 17:00:32 venu@myvenu.com +2 -1
    Fix for the crash in debug mode when the .frm is corrupted and SHOW TABLE STATUS is executed
    This also fixes to return the error message to comment field in SHOW TABLE STATUS when the .frm is corrupted

ChangeSet
  1.1346.127.1 03/02/24 21:25:09 serg@serg.mysql.com +2 -0
  test updated

  mysql-test/t/innodb_handler.test
    1.2.1.1 03/02/24 21:25:07 serg@serg.mysql.com +5 -7
    test updated

  mysql-test/r/innodb_handler.result
    1.2.1.1 03/02/24 21:25:06 serg@serg.mysql.com +5 -4
    test updated

ChangeSet
  1.1464 03/02/24 23:54:58 wax@mysql.com +3 -0
  Merge vkishkin@work.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/wax/mysql-4n

  sql/sql_yacc.yy
    1.203.1.36 03/02/24 23:54:54 wax@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.146.1.2 03/02/24 23:54:54 wax@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.337 03/02/24 23:54:54 wax@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.126.1 03/02/24 16:57:54 jani@rhols221.adsl.netsonic.fi +1 -0
  Applied a patch which fixes a quoting problem with
  mysql_hot_copy when --checkpoint or --record-log-pos was used.

  scripts/mysqlhotcopy.sh
    1.30 03/02/24 16:57:52 jani@rhols221.adsl.netsonic.fi +16 -3
    Applied a patch which fixes a quoting problem with
    mysql_hot_copy when --checkpoint or --record-log-pos was used.

ChangeSet
  1.1346.46.189 03/02/24 16:13:17 heikki@hundin.mysql.fi +1 -0
  ut0mem.c:
    Correct printf format

  innobase/ut/ut0mem.c
    1.8.1.2 03/02/24 16:13:09 heikki@hundin.mysql.fi +1 -1
    Correct printf format

ChangeSet
  1.1346.46.188 03/02/24 16:05:54 heikki@hundin.mysql.fi +1 -0
  ut0mem.c:
    Print correct OS error number also on Windows if we run out of memory

  innobase/ut/ut0mem.c
    1.8.1.1 03/02/24 16:05:46 heikki@hundin.mysql.fi +7 -1
    Print correct OS error number also on Windows if we run out of memory

ChangeSet
  1.1346.125.1 03/02/24 11:46:07 serg@serg.mysql.com +1 -0
  allow --without-extra-charsets

  configure.in
    1.191.1.71 03/02/24 11:46:05 serg@serg.mysql.com +3 -1
    allow --without-extra-charsets

ChangeSet
  1.1346.46.186 03/02/24 11:34:41 lenz@mysql.com +1 -0
   - re-added missing reservedwords.texi (disappeared after last merge with 
     3.23.x) and removed mirrors.texi again

  Docs/Makefile.am
    1.36 03/02/24 11:34:40 lenz@mysql.com +1 -1
     - re-added missing reservedwords.texi (disappeared after last merge with 
       3.23.x) and removed mirrors.texi again

ChangeSet
  1.1346.46.185 03/02/23 04:27:03 igor@hundin.mysql.fi +2 -0
  opt_sum.cc:
    Correction for min/max optimization of queries with outer joins

  BitKeeper/etc/logging_ok
    1.206.17.14 03/02/23 04:27:02 igor@hundin.mysql.fi +1 -0
    Logging to logging@openlogging.org accepted

  sql/opt_sum.cc
    1.16.1.10 03/02/23 04:20:58 igor@hundin.mysql.fi +2 -1
    Correction for min/max optimization of queries with outer joins

ChangeSet
  1.1346.46.184 03/02/22 18:22:39 serg@serg.mysql.com +2 -0
  tests updated

  mysql-test/t/handler.test
    1.7.1.2 03/02/22 18:22:37 serg@serg.mysql.com +5 -3
    tests updated

  mysql-test/r/handler.result
    1.7.1.2 03/02/22 18:22:37 serg@serg.mysql.com +4 -1
    tests updated

ChangeSet
  1.1346.46.183 03/02/22 18:00:34 serg@serg.mysql.com +2 -0
  ALTER TABLE closes all open HANDLER's for the table in question
  fixed error handling in HANDLER ... READ FIRST

  sql/sql_table.cc
    1.112.1.37 03/02/22 18:00:32 serg@serg.mysql.com +1 -0
    ALTER TABLE closes all open HANDLER's for the table in question

  sql/sql_handler.cc
    1.19.1.10 03/02/22 18:00:32 serg@serg.mysql.com +7 -4
    fix error handling in HANDLER ... READ FIRST

ChangeSet
  1.1462 03/02/22 17:14:50 Sinisa@sinisa.nasamreza.org +4 -0
  merge fix

  sql/sql_derived.cc
    1.39 03/02/22 17:14:44 Sinisa@sinisa.nasamreza.org +0 -1
    merge fix

  sql/sql_yacc.yy
    1.203.1.35 03/02/22 17:09:05 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  libmysql/libmysql.c
    1.149 03/02/22 17:09:05 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

  client/mysql.cc
    1.117 03/02/22 17:09:04 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1461 03/02/22 17:02:36 Sinisa@sinisa.nasamreza.org +3 -0
  Allowing NULL values in UNION's with first SELECT having only NOT NULL
  columns.

  sql/sql_union.cc
    1.65 03/02/22 17:02:29 Sinisa@sinisa.nasamreza.org +4 -1
    Allowing NULL values in UNION's with first SELECT having only NOT NULL
    columns.

  mysql-test/t/union.test
    1.31 03/02/22 17:02:29 Sinisa@sinisa.nasamreza.org +17 -0
    Allowing NULL values in UNION's with first SELECT having only NOT NULL
    columns.

  mysql-test/r/union.result
    1.30 03/02/22 17:02:29 Sinisa@sinisa.nasamreza.org +27 -0
    Allowing NULL values in UNION's with first SELECT having only NOT NULL
    columns.

ChangeSet
  1.1346.46.182 03/02/22 15:51:21 serg@serg.mysql.com +1 -0
  make myisamchk -R to work, if the table contains fulltext indexes

  myisam/myisamchk.c
    1.80.1.19 03/02/22 15:51:18 serg@serg.mysql.com +2 -2
    make myisamchk -R to work, if the table contains fulltext indexes

ChangeSet
  1.1346.46.181 03/02/22 11:44:26 serg@serg.mysql.com +1 -0
  do not accept -R (sort by index) for FULLTEXT indexes

  myisam/myisamchk.c
    1.80.1.18 03/02/22 11:44:24 serg@serg.mysql.com +7 -0
    do not accept -R (sort by index) for FULLTEXT indexes

ChangeSet
  1.1346.124.1 03/02/22 01:07:17 serg@serg.mysql.com +1 -0
  do not allow COLUMN and AFTER/FIRST in
  
  ALTER TABLE ... ADD KEY

  sql/sql_yacc.yy
    1.145.1.56 03/02/22 01:07:15 serg@serg.mysql.com +12 -3
    do not allow COLUMN and AFTER/FIRST in
    
    ALTER TABLE ... ADD KEY

ChangeSet
  1.1455.14.1 03/02/21 15:00:05 venu@myvenu.com +1 -0
  Fix for mysql_stmt_close(), so that the PHP layer can map it easily to know whether the 'stmt' is really freed, so that they can free their internal stmts

  libmysql/libmysql.c
    1.146.1.5 03/02/21 14:58:49 venu@myvenu.com +18 -13
    Fix for mysql_stmt_close(), so that the PHP layer can map it easily to know whether the 'stmt' is really freed, so that they can free their internal stmts

ChangeSet
  1.1455.2.18 03/02/21 23:38:56 guilhem@mysql.com +7 -0
  Test's result update because std_data/words.dat has been lengthened by 500 bytes.
  Increased some tests' robustness a bit :
  - Added RESET MASTER to all tests who do SHOW BINLOG EVENTS, to make them independent from previous tests.
  - Added save_master_pos to these tests to wait for the slave to start before purging its binary logs.

  BitKeeper/etc/logging_ok
    1.233.1.1 03/02/21 23:38:52 guilhem@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  mysql-test/t/rpl_user_variables.test
    1.3 03/02/21 23:37:39 guilhem@mysql.com +17 -0
    Added RESET MASTER to make positions shown by SHOW BINLOG EVENTS independent of any previous test.

  mysql-test/t/rpl_temporary.test
    1.5 03/02/21 23:37:39 guilhem@mysql.com +17 -0
    Added RESET MASTER to make positions shown by SHOW BINLOG EVENTS independent of any previous test.

  mysql-test/t/rpl_log.test
    1.15 03/02/21 23:37:39 guilhem@mysql.com +11 -1
    Added save_master_pos to wait for the slave to have started before purging its binary logs.
    Otherwise, we could purge before the slave finishes starting, and then the slave could log events implicitly provoked by previous tests. 

  mysql-test/r/rpl_user_variables.result
    1.3 03/02/21 23:37:39 guilhem@mysql.com +1 -0
    Added RESET MASTER to make positions shown by SHOW BINLOG EVENTS independent of any previous test.

  mysql-test/r/rpl_temporary.result
    1.3.1.2 03/02/21 23:37:39 guilhem@mysql.com +1 -0
    Added RESET MASTER to make positions shown by SHOW BINLOG EVENTS independent of any previous test.

  mysql-test/r/rpl_log.result
    1.35 03/02/21 23:37:39 guilhem@mysql.com +12 -12
    Updated SHOW BINLOG EVENTS's positions as Monty lengthened std_data/words.dat by 500 bytes.

ChangeSet
  1.676.275.6 03/02/21 23:11:31 heikki@hundin.mysql.fi +1 -0
  ibuf0ibuf.c:
    Add diagnostic prints if insert buffer merge is tried to a page whose type is not an index page, try to recover from the situation by discarding the insert buffer records

  innobase/ibuf/ibuf0ibuf.c
    1.9.1.3 03/02/21 23:11:10 heikki@hundin.mysql.fi +41 -2
    Add diagnostic prints if insert buffer merge is tried to a page whose type is not an index page, try to recover from the situation by discarding the insert buffer records

ChangeSet
  1.1346.46.179 03/02/21 17:42:48 lenz@mysql.com +1 -0
   - removed +DD64 compile option from the HPUX11 default CFLAGS in
     configure.in - there are 32bit installations of HPUX11 out there
     and compiling for these by manually adding +DAportable to CFLAGS
     did not work. Better add +DD64 manually, if you need it.

  configure.in
    1.191.1.70 03/02/21 17:42:46 lenz@mysql.com +2 -2
     - removed +DD64 compile option from the HPUX11 default CFLAGS in
       configure.in - there are 32bit installations of HPUX11 out there
       and compiling for these by manually adding +DAportable to CFLAGS
       did not work. Better add +DD64 manually, if you need it.

ChangeSet
  1.1455.4.8 03/02/21 17:37:05 pem@mysql.com +37 -0
  Most of the groundwork for sprint task 729 (implement FUNCTIONs).
  Expanded the mysql.proc table, reworked the find/create/drop functions
  completely, added new functions for FUNCTIONs (lotta functions here :),
  got rid of some unnecessary use of Item_strings while at it. Extended
  the parser correspondingly, and fiddled around a bit to make SP FUNCTIONs
  coexist with UDFs.
  Can now CREATE and DROP FUNCTIONs. Invoking yet to come...

  sql/sql_yacc.yy
    1.218 03/02/21 17:37:02 pem@mysql.com +85 -39
    Some former UDF specific symbols renamed.
    Added CREATE FUNCTION parsing.
    DROP FUNCTION had to be partly merged with the old UDF code, because of the similar
    syntax.
    RETURN statement added, but still a no-op.

  sql/sql_parse.cc
    1.274 03/02/21 17:37:02 pem@mysql.com +67 -41
    Added FUNCTION support ("drop" merged with the old UDF code), and made some
    additional changes for better error handling (following the sp.cc rehacking).

  sql/sql_lex.h
    1.106 03/02/21 17:37:02 pem@mysql.com +2 -2
    New stored FUNCTION commands.

  sql/sp_head.h
    1.7 03/02/21 17:37:02 pem@mysql.com +18 -2
    Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)

  sql/sp_head.cc
    1.11 03/02/21 17:37:02 pem@mysql.com +21 -17
    Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)

  sql/sp.h
    1.3 03/02/21 17:37:02 pem@mysql.com +12 -7
    Major rehack to accomodate FUNCTIONs, and to make it easier to add
    future in-memory cache of prepared SPs.

  sql/sp.cc
    1.5 03/02/21 17:37:02 pem@mysql.com +177 -57
    Major rehack to accomodate FUNCTIONs, and to make it easier to add
    future in-memory cache of prepared SPs.

  sql/share/ukrainian/errmsg.txt
    1.31 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/swedish/errmsg.txt
    1.68 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/spanish/errmsg.txt
    1.68 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/slovak/errmsg.txt
    1.68 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/serbian/errmsg.txt
    1.22 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/russian/errmsg.txt
    1.65 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/romanian/errmsg.txt
    1.66 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/portuguese/errmsg.txt
    1.68 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/polish/errmsg.txt
    1.67 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/norwegian/errmsg.txt
    1.67 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/norwegian-ny/errmsg.txt
    1.67 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/korean/errmsg.txt
    1.67 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/japanese/errmsg.txt
    1.67 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/italian/errmsg.txt
    1.74 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/hungarian/errmsg.txt
    1.69 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/greek/errmsg.txt
    1.68 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/german/errmsg.txt
    1.68 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/french/errmsg.txt
    1.67 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/estonian/errmsg.txt
    1.68 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/english/errmsg.txt
    1.75 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/dutch/errmsg.txt
    1.70 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/danish/errmsg.txt
    1.66 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/share/czech/errmsg.txt
    1.68 03/02/21 17:37:02 pem@mysql.com +1 -0
    New error message for misuse of RETURN.

  sql/lex.h
    1.90 03/02/21 17:37:02 pem@mysql.com +3 -2
    De-UDFed some symbol names, as they are now used for SPs as well.
    Added RETURN_SYM.

  scripts/mysql_install_db.sh
    1.40 03/02/21 17:37:02 pem@mysql.com +2 -1
    Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.

  mysql-test/t/sp.test
    1.7 03/02/21 17:37:02 pem@mysql.com +27 -0
    New test for creating and dropping FUNCTIONS.

  mysql-test/r/sp.result
    1.7 03/02/21 17:37:02 pem@mysql.com +16 -0
    New test for creating and dropping FUNCTIONS.

  mysql-test/install_test_db.sh
    1.27 03/02/21 17:37:02 pem@mysql.com +2 -1
    Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.

  include/mysqld_error.h
    1.65 03/02/21 17:37:02 pem@mysql.com +2 -2
    New error message for misuse of RETURN.

  Docs/sp-implemented.txt
    1.3 03/02/21 17:37:02 pem@mysql.com +12 -2
    Updated with info about CASCADE/RESTICT and METHOD, and some answers to questions.

ChangeSet
  1.1455.13.1 03/02/21 17:01:12 serg@serg.mysql.com +1 -0
  make EXPLAIN killable

  sql/sql_select.cc
    1.206 03/02/21 17:01:09 serg@serg.mysql.com +4 -2
    make EXPLAIN killable

ChangeSet
  1.1455.12.1 03/02/21 16:37:18 lenz@mysql.com +2 -0
   - removed duplicate my_sys.h inclusion from lib_vio.c
   - removed obsolete compile options from compile-pentium-debug-openssl

  libmysqld/lib_vio.c
    1.16 03/02/21 16:37:16 lenz@mysql.com +0 -1
     - removed duplicate my_sys.h inclusion

  BUILD/compile-pentium-debug-openssl
    1.3 03/02/21 16:37:16 lenz@mysql.com +1 -1
     - removed "--without-innodb" (InnoDB is on by default) and "--with-vio"
       (--with-openssl implies --with-vio)

ChangeSet
  1.1455.2.16 03/02/21 18:24:41 bar@bar.mysql.r18.ru +3 -0
  DATABASE character set is never blank anymore

  sql/sql_yacc.yy
    1.203.26.2 03/02/21 18:24:39 bar@bar.mysql.r18.ru +2 -2
    DATABASE character set is never blank anymore

  sql/sql_table.cc
    1.151 03/02/21 18:24:39 bar@bar.mysql.r18.ru +1 -3
    DATABASE character set is never blank anymore

  sql/sql_db.cc
    1.65 03/02/21 18:24:39 bar@bar.mysql.r18.ru +7 -5
    DATABASE character set is never blank anymore

ChangeSet
  1.1455.2.15 03/02/20 23:42:35 venu@myvenu.com +1 -0
  Another missed fix for Embedded Library (Windows specific)

  libmysqld/libmysqld.c
    1.33 03/02/20 23:41:20 venu@myvenu.com +3 -4
    Another missed fix for Embedded Library

ChangeSet
  1.1455.2.14 03/02/20 15:40:58 venu@myvenu.com +1 -0
    Minor tweak to fix the Netware portability to libmysqld

  libmysqld/libmysqld.c
    1.32 03/02/20 15:39:14 venu@myvenu.com +1 -1
    Minor tweak to fix the Netware portability to libmysqld

ChangeSet
  1.1455.2.13 03/02/20 14:16:57 venu@myvenu.com +7 -0
  Fix .dsp files to have all new changes to work with src disribution package script

  VC++Files/strings/strings.dsp
    1.6 03/02/20 14:16:06 venu@myvenu.com +33 -51
    .

  VC++Files/mysys/mysys.dsp
    1.10 03/02/20 14:16:06 venu@myvenu.com +4 -0
    .

  VC++Files/mysqlmanager/MySqlManager.dsp
    1.6 03/02/20 14:16:06 venu@myvenu.com +24 -0
    .

  VC++Files/myisammrg/myisammrg.dsp
    1.5 03/02/20 14:16:06 venu@myvenu.com +4 -0
    .

  VC++Files/libmysqld/libmysqld.dsp
    1.5 03/02/20 14:16:06 venu@myvenu.com +14 -6
    .

  VC++Files/libmysql/libmysql.dsp
    1.10 03/02/20 14:16:06 venu@myvenu.com +17 -2
    .

  VC++Files/client/mysqlclient.dsp
    1.10 03/02/20 14:16:06 venu@myvenu.com +12 -0
    .

ChangeSet
  1.1455.2.12 03/02/20 14:14:37 venu@myvenu.com +13 -0
  Windows portabilty fixups (last commit caused some errors, so recomitting) - SCRUM

  libmysqld/libmysqld.c
    1.31 03/02/20 14:12:14 venu@myvenu.com +1 -1
    Port the netware change to remove mysql_once_init to libmysqld

  libmysqld/lib_sql.cc
    1.48 03/02/20 14:11:38 venu@myvenu.com +0 -1
    Remove unused variable

  mysys/mf_keycache.c
    1.23 03/02/20 14:11:08 venu@myvenu.com +4 -4
    Add a correct cast and remove the unused variables

  sql/sql_yacc.yy
    1.203.26.1 03/02/20 14:10:27 venu@myvenu.com +4 -4
    Change POINT->POINT_SYM due to redefination error from windef.h

  sql/sql_parse.cc
    1.271.1.1 03/02/20 14:10:01 venu@myvenu.com +2 -0
    Remove unused variables from Embedded server

  sql/sql_help.cc
    1.9 03/02/20 14:09:20 venu@myvenu.com +2 -2
    Need a cast to make it compile

  sql/sql_derived.cc
    1.36.1.2 03/02/20 14:08:54 venu@myvenu.com +1 -1
    Windows won't let you compile for this kind of assignments

  sql/sql_class.h
    1.146.2.1 03/02/20 14:08:43 venu@myvenu.com +0 -4
    Remove silly usage

  sql/protocol.cc
    1.46 03/02/20 14:08:19 venu@myvenu.com +2 -0
    Remove unused variables from Embedded Server

  sql/mysqld.cc
    1.335.1.1 03/02/20 14:07:55 venu@myvenu.com +8 -4
    Fix Embedded Server related code

  sql/lex.h
    1.82.1.14 03/02/20 14:07:23 venu@myvenu.com +1 -1
    Change POINT->POINT_SYM due to redefination error from windef.h

  sql/filesort.cc
    1.68 03/02/20 14:07:02 venu@myvenu.com +0 -1
    Remove unused variable

  strings/strto.c
    1.13 03/02/20 14:06:24 venu@myvenu.com +6 -6
    Windows won't compile for a wrong argument passing, expects a charset pointer

ChangeSet
  1.1455.2.11 03/02/20 14:05:58 venu@myvenu.com +2 -0
  Initial script to create a windows src distribution package

  scripts/make_win_src_distribution.sh
    1.1 03/02/20 14:04:04 venu@myvenu.com +360 -0

  scripts/make_win_src_distribution.sh
    1.0 03/02/20 14:04:04 venu@myvenu.com +0 -0
    BitKeeper file /home/venu/work/sql/dev-4.1/scripts/make_win_src_distribution.sh

  scripts/Makefile.am
    1.26 03/02/20 14:03:52 venu@myvenu.com +3 -1

ChangeSet
  1.1346.46.178 03/02/20 15:13:47 lenz@mysql.com +1 -0
   - temporarily removed netware from AC_OUTPUT to be able to perform the
     builds and until I've found a way on how to add this conditionally

  configure.in
    1.191.1.69 03/02/20 15:13:45 lenz@mysql.com +0 -1
     - temporarily removed netware from AC_OUTPUT to be able to perform the
       builds and until I've found a way on how to add this conditionally

ChangeSet
  1.1455.2.10 03/02/20 17:54:25 bar@bar.mysql.r18.ru +1 -0
  charset.c:
    SHOW CHARACTER SET now displays "1" in mb_maxlen even if a charset is not loaded yet

  mysys/charset.c
    1.71 03/02/20 17:53:47 bar@bar.mysql.r18.ru +1 -0
    SHOW CHARACTER SET now displays "1" in mb_maxlen even if a charset is not loaded yet

ChangeSet
  1.1455.2.9 03/02/20 16:44:34 ram@mysql.r18.ru +1 -0
  Bug fix: we should not use info->buff for searching after we found last key in page

  myisam/rt_index.c
    1.5 03/02/20 16:44:31 ram@mysql.r18.ru +8 -1
    Bug fix: we should not use info->buff for searching after we found last key in page

ChangeSet
  1.1346.46.177 03/02/20 10:20:26 lenz@mysql.com +1 -0
   - autom4te.cache is a directory - remove it recursively

  BUILD/FINISH.sh
    1.18.1.5 03/02/20 10:20:25 lenz@mysql.com +1 -1
     - autom4te.cache is a directory - remove it recursively

ChangeSet
  1.1346.46.176 03/02/19 21:52:38 lenz@mysql.com +1 -0
   - removed leading slashes (thanks Jim!)

  BUILD/FINISH.sh
    1.18.1.4 03/02/19 21:52:37 lenz@mysql.com +1 -1
     - removed leading slashes (thanks Jim!)

ChangeSet
  1.1346.46.175 03/02/19 21:41:01 lenz@mysql.com +1 -0
   - remove "autom4te.cache" directories, too

  BUILD/FINISH.sh
    1.18.1.3 03/02/19 21:41:00 lenz@mysql.com +1 -1
     - remove "autom4te.cache" directories, too

ChangeSet
  1.1346.123.1 03/02/19 21:02:05 lenz@mysql.com +9 -0
   - added more files to support-files/MacOSX and added them to the
     distribution
   - added Bootstrap, logger.pm and Do-pkg to Build-tools:
     Bootstrap is used to build the source distribution for the binary builds
     logger.pm includes some helper functions
     Do-pkg converts a binary distribution into a Mac OS X PKG (still needs
     some polishing)

  support-files/MacOSX/Makefile.am
    1.2 03/02/19 21:02:03 lenz@mysql.com +18 -3
     - Added more files (StartupParameters.plist, postinstall, preinstall) to
       distribution

  support-files/MacOSX/Description.plist.sh
    1.2 03/02/19 21:02:03 lenz@mysql.com +1 -1
     - Shortened IFPkgDescriptionDescription a bit

  support-files/MacOSX/preinstall.sh
    1.1 03/02/19 20:54:41 lenz@mysql.com +18 -0

  support-files/MacOSX/postinstall.sh
    1.1 03/02/19 20:54:41 lenz@mysql.com +18 -0

  support-files/MacOSX/StartupParameters.plist.sh
    1.1 03/02/19 20:54:41 lenz@mysql.com +19 -0

  support-files/MacOSX/preinstall.sh
    1.0 03/02/19 20:54:41 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.0-build/support-files/MacOSX/preinstall.sh

  support-files/MacOSX/postinstall.sh
    1.0 03/02/19 20:54:41 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.0-build/support-files/MacOSX/postinstall.sh

  support-files/MacOSX/StartupParameters.plist.sh
    1.0 03/02/19 20:54:41 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.0-build/support-files/MacOSX/StartupParameters.plist.sh

  support-files/MacOSX/ReadMe.txt
    1.1 03/02/19 20:54:40 lenz@mysql.com +80 -0

  support-files/MacOSX/ReadMe.txt
    1.0 03/02/19 20:54:40 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.0-build/support-files/MacOSX/ReadMe.txt

ChangeSet
  1.1346.122.2 03/02/19 12:49:12 greg@mysql.com +1 -0
  nwbootstrap:
    Change mode to -rwxrwxr-x

  netware/nwbootstrap
    1.2 03/02/19 12:48:46 greg@mysql.com +0 -0
    Change mode to -rwxrwxr-x

  Build-tools/Do-pkg
    1.1 03/02/19 18:43:31 lenz@mysql.com +147 -0

  Build-tools/Do-pkg
    1.0 03/02/19 18:43:31 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.0-build/Build-tools/Do-pkg

ChangeSet
  1.1346.122.1 03/02/19 19:38:38 heikki@hundin.mysql.fi +1 -0
  row0sel.c:
    Print a warning if MySQL uses a partial-field key value prefix in a search; that would not work if the search flag would happen to be HA_READ_PREFIX_LAST

  innobase/row/row0sel.c
    1.28.1.1 03/02/19 19:38:29 heikki@hundin.mysql.fi +13 -1
    Print a warning if MySQL uses a partial-field key value prefix in a search; that would not work if the search flag would happen to be HA_READ_PREFIX_LAST

ChangeSet
  1.1455.11.2 03/02/19 21:28:19 ram@mysql.r18.ru +1 -0
  Code cleanup

  myisam/rt_key.c
    1.5 03/02/19 21:28:17 ram@mysql.r18.ru +2 -15
    Code cleanup

ChangeSet
  1.1455.11.1 03/02/19 21:14:50 ram@mysql.r18.ru +3 -0
  Bug fix: we should set have_rtree value in case of table reopen.
  Code cleanup.

  myisam/rt_index.c
    1.4 03/02/19 21:14:49 ram@mysql.r18.ru +5 -5
    code cleanup

  myisam/myisamdef.h
    1.59 03/02/19 21:14:49 ram@mysql.r18.ru +1 -1
    code cleanup

  myisam/mi_open.c
    1.61 03/02/19 21:14:49 ram@mysql.r18.ru +5 -1
    Bug fix: we should set have_rtree value in case of table reopen.

ChangeSet
  1.1346.46.172 03/02/19 16:16:27 lenz@mysql.com +2 -0
  Reverted Sinisa's patch "Fixing the error messages returned on GRANT
  commands" again, since this problem had been fixed differently
  already (Thanks to Serg for spotting this)

  sql/sql_acl.cc
    1.51.1.38 03/02/19 16:16:26 lenz@mysql.com +2 -6
    Reverted Sinisa's patch again, since this problem had been fixed differently
    already (Thanks to Serg for spotting this)

  sql/share/english/errmsg.txt
    1.51.1.11 03/02/19 16:16:26 lenz@mysql.com +1 -1
    Reverted Sinisa's patch again, since this problem had been fixed differently
    already (Thanks to Serg for spotting this)

ChangeSet
  1.1346.46.171 03/02/19 15:08:29 lenz@mysql.com +4 -0
  Applied Sinisa's patch:
  "A fix for non-releasing locks for multi table updates and multi
  table deletes with InnoDB tables."

  sql/sql_update.cc
    1.54.1.21 03/02/19 15:08:27 lenz@mysql.com +1 -1
    Applied Sinisa's patch:
    "A fix for non-releasing locks for multi table updates and multi
    table deletes with InnoDB tables."

  sql/sql_parse.cc
    1.218.21.2 03/02/19 15:08:27 lenz@mysql.com +1 -1
    Applied Sinisa's patch:
    "A fix for non-releasing locks for multi table updates and multi
    table deletes with InnoDB tables."

  mysql-test/t/innodb.test
    1.28.1.3 03/02/19 15:08:27 lenz@mysql.com +6 -0
    Applied Sinisa's patch:
    "A fix for non-releasing locks for multi table updates and multi
    table deletes with InnoDB tables."

  mysql-test/r/innodb.result
    1.40.1.13 03/02/19 15:08:27 lenz@mysql.com +6 -0
    Applied Sinisa's patch:
    "A fix for non-releasing locks for multi table updates and multi
    table deletes with InnoDB tables."

ChangeSet
  1.1346.46.170 03/02/19 14:58:44 lenz@mysql.com +3 -0
  Applying Sinisa's patch:
  "Cleaning the code of the remaining OLAP code.
  This code is unnecessary in 4.1/5.0"

  sql/table.h
    1.31.1.12 03/02/19 14:58:43 lenz@mysql.com +0 -1
    Applying Sinisa's patch:
    "Cleaning the code of the remaining OLAP code.
    This code is unnecessary in 4.1/5.0"

  sql/sql_union.cc
    1.22.1.18 03/02/19 14:58:43 lenz@mysql.com +1 -5
    Applying Sinisa's patch:
    "Cleaning the code of the remaining OLAP code.
    This code is unnecessary in 4.1/5.0"

  sql/sql_parse.cc
    1.218.21.1 03/02/19 14:58:42 lenz@mysql.com +0 -1
    Applying Sinisa's patch:
    "Cleaning the code of the remaining OLAP code.
    This code is unnecessary in 4.1/5.0"

ChangeSet
  1.1346.46.169 03/02/19 14:50:40 lenz@mysql.com +2 -0
   - Applying Sinisa's Patch "Fixing the error messages returned on 
     GRANT commands"

  sql/sql_acl.cc
    1.51.1.37 03/02/19 14:50:38 lenz@mysql.com +6 -2
     - Applying Sinisa's Patch "Fixing the error messages returned on 
       GRANT commands"

  sql/share/english/errmsg.txt
    1.51.1.10 03/02/19 14:50:38 lenz@mysql.com +1 -1
     - Applying Sinisa's Patch "Fixing the error messages returned on 
       GRANT commands"

ChangeSet
  1.1455.10.1 03/02/19 17:05:35 wax@mysql.com +6 -0
  add option default-week-format and variable default_week_format 
  (SCRUM)

  sql/sql_yacc.yy
    1.203.25.1 03/02/19 17:05:20 wax@mysql.com +4 -1
    change lex of week() with one parameter

  sql/sql_class.h
    1.146.1.1 03/02/19 17:05:20 wax@mysql.com +1 -0
    add default_week_format into structure system_variables

  sql/set_var.cc
    1.28 03/02/19 17:05:20 wax@mysql.com +4 -0
    add system variable default_week_format

  sql/mysqld.cc
    1.336 03/02/19 17:05:20 wax@mysql.com +7 -1
    add option default-week-format

  mysql-test/t/func_time.test
    1.17 03/02/19 17:05:20 wax@mysql.com +4 -0
    test of default_week_format

  mysql-test/r/func_time.result
    1.19 03/02/19 17:05:20 wax@mysql.com +5 -0
    result of test default_week_format

ChangeSet
  1.1455.4.7 03/02/19 12:42:32 pem@mysql.com +3 -0
  Fixed SELECT INTO OUTFILE/DUMPFILE and stored procedures, and extended and
  reorganized the sp.test file.

  sql/sql_class.cc
    1.108 03/02/19 12:42:31 pem@mysql.com +18 -0
    Unlock tables and set thd->lock=0 in select_export::send_eof() and
    select_dump::send_eof().
    This fixes a problem with an assert() in lock_tables(), and made
    SELECT ... INTO OUTFILE and ... INTO DUMPFILE work in stored procedures.

  mysql-test/t/sp.test
    1.6 03/02/19 12:42:31 pem@mysql.com +208 -104
    Reorganized the tests, and added a few new ones. ("fac" and more "select into")

  mysql-test/r/sp.result
    1.6 03/02/19 12:42:30 pem@mysql.com +216 -138
    New results from the reorganized sp.test file.

  Build-tools/logger.pm
    1.1 03/02/19 11:58:32 lenz@mysql.com +51 -0

  Build-tools/Bootstrap
    1.1 03/02/19 11:58:32 lenz@mysql.com +424 -0

  Build-tools/logger.pm
    1.0 03/02/19 11:58:32 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.0-build/Build-tools/logger.pm

  Build-tools/Bootstrap
    1.0 03/02/19 11:58:32 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.0-build/Build-tools/Bootstrap

ChangeSet
  1.1455.2.7 03/02/19 11:10:23 pem@mysql.com +1 -0
  Fixed typo in mysqltest command name.

  client/mysqltest.c
    1.92.1.1 03/02/19 11:10:21 pem@mysql.com +1 -1
    Fixed typo in command name.

ChangeSet
  1.1455.9.1 03/02/19 13:21:21 ram@mysql.r18.ru +1 -0
  Bug fix: rtree should handle nulls itself

  sql/opt_range.cc
    1.86 03/02/19 13:21:19 ram@mysql.r18.ru +1 -1
    Bug fix: rtree should handle nulls itself

ChangeSet
  1.1455.6.4 03/02/19 09:38:08 bell@sanja.is.com.ua +1 -0
  Added chapter about subselect transformations

  Docs/internals.texi
    1.25 03/02/19 09:38:07 bell@sanja.is.com.ua +237 -2
    Added chapter about subselect transformations

ChangeSet
  1.1346.120.4 03/02/18 17:48:04 greg@mysql.com +7 -0
  mwldnlm, mwenv, mwccnlm, mwasmnlm, nwconfigure, nwbootstrap:
    new file

  BitKeeper/etc/logging_ok
    1.206.17.13 03/02/18 17:48:04 greg@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  netware/mw/mwldnlm
    1.1 03/02/18 17:46:21 greg@mysql.com +5 -0

  netware/mw/mwenv
    1.1 03/02/18 17:46:21 greg@mysql.com +12 -0

  netware/mw/mwccnlm
    1.1 03/02/18 17:46:21 greg@mysql.com +7 -0

  netware/mw/mwasmnlm
    1.1 03/02/18 17:46:21 greg@mysql.com +5 -0

  netware/mw/mwldnlm
    1.0 03/02/18 17:46:21 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/mw/mwldnlm

  netware/mw/mwenv
    1.0 03/02/18 17:46:21 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/mw/mwenv

  netware/mw/mwccnlm
    1.0 03/02/18 17:46:21 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/mw/mwccnlm

  netware/mw/mwasmnlm
    1.0 03/02/18 17:46:21 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/mw/mwasmnlm

  netware/nwconfigure
    1.1 03/02/18 17:46:13 greg@mysql.com +23 -0

  netware/nwconfigure
    1.0 03/02/18 17:46:13 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/nwconfigure

  netware/nwbootstrap
    1.1 03/02/18 17:45:57 greg@mysql.com +145 -0

  netware/nwbootstrap
    1.0 03/02/18 17:45:57 greg@mysql.com +0 -0
    BitKeeper file /home/greg/bk/mysql-4.0/netware/nwbootstrap

ChangeSet
  1.1346.46.167 03/02/18 20:35:57 serg@serg.mysql.com +1 -0
  Merge work:/home/bk/mysql-4.0
  into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

  client/mysqldump.c
    1.65.1.24 03/02/18 20:35:54 serg@serg.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1455.4.6 03/02/18 19:58:03 pem@mysql.com +4 -0
  Post-merge fixes (adapting new SP code to 4.1 changes).

  sql/sql_yacc.yy
    1.217 03/02/18 19:49:12 pem@mysql.com +3 -3
    Make all bison versions work (hopefully).

  sql/sql_parse.cc
    1.273 03/02/18 19:49:12 pem@mysql.com +4 -0
    Post-merge fixes (adapting new SP code to 4.1 changes).

  sql/sql_class.cc
    1.107 03/02/18 19:49:12 pem@mysql.com +9 -0
    Unlock tables after a SELECT INTO variables, or an assert() in lock_tables() fails.
    Note: This might be a problem with other SELECT variants too.

  sql/sp.cc
    1.4 03/02/18 19:49:12 pem@mysql.com +2 -2
    Post-merge fixes (adapting new SP code to 4.1 changes).

ChangeSet
  1.1455.8.1 03/02/18 20:36:16 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    InnoDB maps HA_READ_PREFIX_LAST_OR_PREV to PAGE_CUR_LE, but note that only complete-field prefixes of the kay value can be used as the search key

  sql/ha_innodb.cc
    1.85.1.15 03/02/18 20:36:07 heikki@hundin.mysql.fi +1 -0
    InnoDB maps HA_READ_PREFIX_LAST_OR_PREV to PAGE_CUR_LE, but note that only complete-field prefixes of the kay value can be used as the search key

ChangeSet
  1.1346.121.3 03/02/18 20:07:06 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Add comment about how to modify InnoDB to deal with partial-field prefixes of key value in the future

  sql/ha_innodb.cc
    1.73.1.81 03/02/18 20:06:58 heikki@hundin.mysql.fi +8 -2
    Add comment about how to modify InnoDB to deal with partial-field prefixes of key value in the future

ChangeSet
  1.1346.121.2 03/02/18 19:57:05 heikki@hundin.mysql.fi +1 -0
  my_base.h:
    Add comment about what kind of key value prefixes HA_READ_KEY_PREFIX_LAST etc. allow as a search key

  include/my_base.h
    1.30.1.8 03/02/18 19:56:56 heikki@hundin.mysql.fi +15 -0
    Add comment about what kind of key value prefixes HA_READ_KEY_PREFIX_LAST etc. allow as a search key

ChangeSet
  1.1346.121.1 03/02/18 19:43:41 heikki@hundin.mysql.fi +2 -0
  page0cur.c:
    Prepare for 5.x where HA_READ_PREFIX_LAST may pass only a few first bytes of the last field in a key value
  ha_innodb.cc:
    In 4.0 always assume HA_READ_PREFIX_LAST passes a complete-field prefix of a key value; LIKE queries use a padding trick

  innobase/page/page0cur.c
    1.10 03/02/18 19:43:04 heikki@hundin.mysql.fi +51 -20
    Prepare for 5.x where HA_READ_PREFIX_LAST may pass only a few first bytes of the last field in a key value

  sql/ha_innodb.cc
    1.73.1.80 03/02/18 19:37:49 heikki@hundin.mysql.fi +2 -2
    In 4.0 always assume HA_READ_PREFIX_LAST passes a complete-field prefix of a key value; LIKE queries use a padding trick

ChangeSet
  1.1455.7.1 03/02/18 18:06:28 serg@serg.mysql.com +4 -0
  bug in ft2 repair-by-sort fixed (sort_key_cmp() using ft2_keydef for ft keys)

  myisam/sort.c
    1.34 03/02/18 18:06:25 serg@serg.mysql.com +7 -7
    typo fixed

  myisam/myisamdef.h
    1.58 03/02/18 18:06:25 serg@serg.mysql.com +1 -0
    bug in ft2 repair-by-sort fixed (sort_key_cmp() using ft2_keydef for ft keys)

  myisam/mi_check.c
    1.102 03/02/18 18:06:25 serg@serg.mysql.com +8 -6
    bug in ft2 repair-by-sort fixed (sort_key_cmp() using ft2_keydef for ft keys)

  myisam/ft_dump.c
    1.18 03/02/18 18:06:25 serg@serg.mysql.com +1 -5
    style fix

ChangeSet
  1.1455.6.1 03/02/18 18:42:30 bell@sanja.is.com.ua +1 -0
  section about SELECT performing

  Docs/internals.texi
    1.24 03/02/18 18:42:29 bell@sanja.is.com.ua +346 -3
    section about SELECT performing

ChangeSet
  1.1455.5.1 03/02/18 16:28:31 bell@sanja.is.com.ua +6 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-qc-4.1

  sql/sql_cache.cc
    1.44 03/02/18 16:28:28 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/handler.cc
    1.87 03/02/18 16:28:28 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/ha_innodb.h
    1.50 03/02/18 16:28:28 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.88 03/02/18 16:28:28 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/ha_berkeley.h
    1.53 03/02/18 16:28:28 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/innodb_cache.result
    1.5 03/02/18 16:28:28 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1388.14.2 03/02/18 16:27:04 bell@sanja.is.com.ua +1 -0
  aftermerging fix

  sql/sql_cache.cc
    1.43 03/02/18 16:27:03 bell@sanja.is.com.ua +3 -2
    aftermerging fix

ChangeSet
  1.1455.4.5 03/02/18 15:05:35 pem@mysql.com +25 -0
  Merging 4.1 into 5.0

  sql/sql_lex.h
    1.105 03/02/18 15:05:33 pem@mysql.com +2 -2
    Merging 4.1 into 5.0

  sql/sql_lex.cc
    1.72.1.1 03/02/18 15:05:33 pem@mysql.com +2 -0
    Merging 4.1 into 5.0

  sql/sql_class.h
    1.147 03/02/18 15:05:33 pem@mysql.com +0 -0
    Merging 4.1 into 5.0

  sql/sql_class.cc
    1.106 03/02/18 15:05:33 pem@mysql.com +0 -1
    Merging 4.1 into 5.0

  sql/item.cc
    1.59 03/02/18 15:05:33 pem@mysql.com +0 -0
    Merging 4.1 into 5.0

  mysql-test/r/rpl_temporary.result
    1.5 03/02/18 15:05:33 pem@mysql.com +0 -1
    Merging 4.1 into 5.0

  mysql-test/install_test_db.sh
    1.26 03/02/18 15:05:33 pem@mysql.com +0 -0
    Merging 4.1 into 5.0

  sql/share/english/errmsg.txt
    1.74 03/02/18 14:33:15 pem@mysql.com +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.216 03/02/18 14:33:14 pem@mysql.com +1 -20
    Auto merged

  sql/sql_parse.cc
    1.272 03/02/18 14:33:14 pem@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.187 03/02/18 14:33:14 pem@mysql.com +0 -0
    Auto merged

  sql/lex.h
    1.89 03/02/18 14:33:14 pem@mysql.com +0 -0
    Auto merged

  sql/item.h
    1.57 03/02/18 14:33:14 pem@mysql.com +0 -0
    Auto merged

  sql/Makefile.am
    1.81 03/02/18 14:33:14 pem@mysql.com +0 -0
    Auto merged

  scripts/mysql_install_db.sh
    1.39 03/02/18 14:33:14 pem@mysql.com +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.56.1.1 03/02/18 14:33:14 pem@mysql.com +0 -1
    Auto merged

  mysql-test/t/insert.test
    1.12 03/02/18 14:33:14 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.62.2.1 03/02/18 14:33:14 pem@mysql.com +0 -1
    Auto merged

  mysql-test/r/insert.result
    1.13 03/02/18 14:33:14 pem@mysql.com +0 -0
    Auto merged

  mysql-test/r/connect.result
    1.3 03/02/18 14:33:14 pem@mysql.com +0 -0
    Auto merged

  client/mysqltest.c
    1.93 03/02/18 14:33:14 pem@mysql.com +0 -0
    Auto merged

  configure.in
    1.207 03/02/18 14:33:13 pem@mysql.com +0 -0
    Auto merged

  client/mysql.cc
    1.115.1.2 03/02/18 14:33:13 pem@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.234 03/02/18 14:33:04 pem@mysql.com +0 -1
    auto-union

  BitKeeper/etc/gone
    1.86.1.11 03/02/18 14:33:04 pem@mysql.com +0 -0
    auto-union

ChangeSet
  1.1403.47.17 03/02/18 13:24:26 pem@mysql.com +1 -0
  Added new files to libmysqld too.

  libmysqld/Makefile.am
    1.30 03/02/18 13:24:24 pem@mysql.com +2 -1
    Added new files to libmysqld too.

ChangeSet
  1.1455.4.4 03/02/18 11:58:19 pem@mysql.com +1 -0
  Made it work with bison 1.875. They've changed the "parse error" string into
  "syntax error".

  sql/mysqld.cc
    1.335 03/02/18 11:58:09 pem@mysql.com +2 -1
    Test for "syntax error" in yyerror() as well.
    They've changed the "parse error" string into "syntax error" in bison 1.875.

ChangeSet
  1.676.276.3 03/02/18 10:18:51 bell@sanja.is.com.ua +1 -0
  prevented crash on deleting non-constructed analyse object

  sql/sql_analyse.h
    1.7.1.1 03/02/18 10:18:50 bell@sanja.is.com.ua +6 -5
    prevented crash on deleting non-constructed analyse object

ChangeSet
  1.1455.4.3 03/02/18 11:49:05 ram@mysql.r18.ru +3 -0
  bug fixes

  myisam/rt_test.c
    1.6 03/02/18 11:49:03 ram@mysql.r18.ru +1 -1
    bug fix

  myisam/rt_key.c
    1.4 03/02/18 11:49:03 ram@mysql.r18.ru +1 -1
    bug fix

  myisam/rt_index.c
    1.3 03/02/18 11:49:03 ram@mysql.r18.ru +1 -1
    bug fix

ChangeSet
  1.1346.119.3 03/02/17 22:07:26 bell@sanja.is.com.ua +6 -0
  client port number added to SHOW PROCESSLIST (SCRUM?)

  vio/viosocket.c
    1.15.1.1 03/02/17 22:07:16 bell@sanja.is.com.ua +3 -1
    port added to reported parameters

  sql/sql_show.cc
    1.76.1.23 03/02/17 22:07:16 bell@sanja.is.com.ua +13 -5
    SHOW PROCESSLIST will report port number if it is possible

  sql/sql_parse.cc
    1.218.1.76 03/02/17 22:07:16 bell@sanja.is.com.ua +4 -3
    port added to reported parameters

  sql/sql_class.h
    1.111.1.28 03/02/17 22:07:16 bell@sanja.is.com.ua +2 -1
    port added to reported parameters

  libmysqld/lib_vio.c
    1.11.1.2 03/02/17 22:07:16 bell@sanja.is.com.ua +1 -1
    port added to reported parameters

  include/violite.h
    1.21.3.1 03/02/17 22:07:16 bell@sanja.is.com.ua +2 -2
    port added to reported parameters

ChangeSet
  1.1455.4.2 03/02/17 19:29:09 ram@mysql.r18.ru +2 -0
  bug fixes

  myisam/rt_split.c
    1.2 03/02/17 19:29:00 ram@mysql.r18.ru +1 -1
    bug fix

  myisam/rt_key.c
    1.3 03/02/17 19:29:00 ram@mysql.r18.ru +1 -1
    bug fix

ChangeSet
  1.1455.2.4 03/02/17 18:06:51 gluh@gluh.mysql.r18.ru +8 -0
  Bug fix: for SHOW STATUS (when ssl is used)
  Added ROW_RESULT to switchs(for documentation purposes)

  sql/sql_show.cc
    1.109 03/02/17 17:42:57 gluh@gluh.mysql.r18.ru +1 -1
    Bug fix: for SHOW STATUS (when ssl is used)

  sql/sql_select.cc
    1.205 03/02/17 17:23:09 gluh@gluh.mysql.r18.ru +2 -0
    For documentation purposes

  sql/sql_lex.cc
    1.74 03/02/17 17:23:09 gluh@gluh.mysql.r18.ru +1 -0
    For documentation purposes

  sql/log_event.cc
    1.104 03/02/17 17:23:09 gluh@gluh.mysql.r18.ru +4 -0
    For documentation purposes

  sql/item_sum.cc
    1.62 03/02/17 17:23:09 gluh@gluh.mysql.r18.ru +4 -1
    For documentation purposes

  sql/item_func.cc
    1.112 03/02/17 17:23:09 gluh@gluh.mysql.r18.ru +9 -1
    For documentation purposes

  sql/item_cmpfunc.cc
    1.72 03/02/17 17:23:09 gluh@gluh.mysql.r18.ru +1 -0
    For documentation purposes

  sql/filesort.cc
    1.67 03/02/17 17:23:09 gluh@gluh.mysql.r18.ru +2 -0
    For documentation purposes

ChangeSet
  1.1455.4.1 03/02/17 16:47:48 bar@bar.mysql.r18.ru +3 -0
  sql_table.cc, field.cc:
    Bug fix
  opt_range.cc:
    Buf fix

  sql/sql_table.cc
    1.150 03/02/17 16:47:06 bar@bar.mysql.r18.ru +14 -8
    Bug fix

  sql/opt_range.cc
    1.85 03/02/17 16:47:02 bar@bar.mysql.r18.ru +1 -1
    Buf fix

  sql/field.cc
    1.86 03/02/17 16:46:56 bar@bar.mysql.r18.ru +0 -1
    Bug fix

ChangeSet
  1.1455.2.3 03/02/17 15:07:01 gluh@gluh.mysql.r18.ru +7 -0
  Merge gluh@192.168.21.1:/usr/home/bk/mysql-4.1
  into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.uvar

  sql/sql_select.cc
    1.204 03/02/17 15:06:57 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_lex.cc
    1.73 03/02/17 15:06:57 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/log_event.cc
    1.103 03/02/17 15:06:57 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/item_sum.cc
    1.61 03/02/17 15:06:57 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/item_func.cc
    1.111 03/02/17 15:06:56 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.71 03/02/17 15:06:56 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/filesort.cc
    1.66 03/02/17 15:06:56 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1455.3.5 03/02/17 05:43:37 monty@mashka.mysql.fi +27 -0
  Merge with 4.0.11 tree to get latest bug fixes

  sql/protocol.cc
    1.45 03/02/17 05:43:35 monty@mashka.mysql.fi +0 -7
    Use local version

  sql/mysqld.cc
    1.334 03/02/17 05:43:35 monty@mashka.mysql.fi +1 -7
    Merge with 4.0.11

  mysql-test/t/type_blob.test
    1.12 03/02/17 05:43:35 monty@mashka.mysql.fi +0 -0
    Merge with 4.0.11

  mysql-test/r/rpl_log.result
    1.34 03/02/17 05:43:35 monty@mashka.mysql.fi +0 -12
    Use local version (needs to be updated)

  mysql-test/mysql-test-run.sh
    1.162 03/02/17 05:43:35 monty@mashka.mysql.fi +1 -1
    Merge with 4.0.11

  Makefile.am
    1.45 03/02/17 05:43:35 monty@mashka.mysql.fi +0 -0
    Merge with 4.0.11

  sql/structs.h
    1.28 03/02/17 05:38:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_table.cc
    1.149 03/02/17 05:38:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_handler.cc
    1.36 03/02/17 05:38:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_delete.cc
    1.99 03/02/17 05:38:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.186 03/02/17 05:38:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.46 03/02/17 05:38:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  scripts/mysqld_safe.sh
    1.58 03/02/17 05:38:25 monty@mashka.mysql.fi +0 -1
    Auto merged

  mysys/my_init.c
    1.27 03/02/17 05:38:25 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/rpl000001.test
    1.33 03/02/17 05:38:25 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.31 03/02/17 05:38:25 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/type_blob.result
    1.15 03/02/17 05:38:25 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/rpl000004.result
    1.7 03/02/17 05:38:25 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/rpl000001.result
    1.22 03/02/17 05:38:25 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.53 03/02/17 05:38:25 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysqld/libmysqld.c
    1.30 03/02/17 05:38:24 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysql/libmysql.c
    1.146.1.4 03/02/17 05:38:24 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/mysql.h
    1.62 03/02/17 05:38:24 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/my_pthread.h
    1.61 03/02/17 05:38:24 monty@mashka.mysql.fi +0 -0
    Auto merged

  configure.in
    1.201.1.22 03/02/17 05:38:24 monty@mashka.mysql.fi +0 -0
    Auto merged

  client/mysqldump.c
    1.78 03/02/17 05:38:24 monty@mashka.mysql.fi +0 -0
    Auto merged

  client/mysql.cc
    1.115.1.1 03/02/17 05:38:24 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/protocol.cc
    1.21.5.2 03/02/17 05:38:23 monty@mashka.mysql.fi +0 -0
    Merge rename: sql/net_pkg.cc -> sql/protocol.cc

ChangeSet
  1.1346.120.3 03/02/17 02:14:37 monty@mashka.mysql.fi +56 -0
  Fixed multi-table-delete for InnoDB tables
  Novell patches

  sql/structs.h
    1.17.1.9 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Fixed multi-table-delete for InnoDB tables

  sql/sql_table.cc
    1.112.1.36 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Code cleanup

  sql/sql_handler.cc
    1.19.1.9 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -8
    Code cleanup

  sql/sql_delete.cc
    1.74.1.18 03/02/17 02:14:34 monty@mashka.mysql.fi +8 -2
    Fixed multi-table-delete for InnoDB tables

  sql/records.cc
    1.19 03/02/17 02:14:34 monty@mashka.mysql.fi +6 -3
    Fixed multi-table-delete for InnoDB tables

  sql/net_pkg.cc
    1.21.5.1 03/02/17 02:14:34 monty@mashka.mysql.fi +7 -8
    Code cleanup

  sql/mysqld.cc
    1.297.1.101 03/02/17 02:14:34 monty@mashka.mysql.fi +6 -40
    Novell patch

  sql/mysql_priv.h
    1.150.1.34 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Code cleanup

  sql/item_cmpfunc.h
    1.13.1.14 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -2
    Optimization of 'IS NULL'

  scripts/make_binary_distribution.sh
    1.48 03/02/17 02:14:34 monty@mashka.mysql.fi +11 -7
    Novell patch

  netware/test_db.sql
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +3 -0
    Novell patch

  netware/resolveip.def
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  netware/replace.def
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  netware/perror.def
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  netware/pack_isam.def
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +2 -2
    Novell patch

  netware/mysqltest.def
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  netware/mysqlshow.def
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  netware/mysqlimport.def
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  netware/mysqldump.def
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  netware/mysqld_safe.c
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +2 -2
    Novell patch

  netware/mysqlcheck.def
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  netware/mysqlbinlog.def
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  netware/mysqladmin.def
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  netware/mysql_test_run.def
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  netware/mysql_install_db.def
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  netware/mysql_install_db.c
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +0 -14
    Novell patch

  netware/mysql.def
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  netware/myisampack.def
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  netware/myisamlog.def
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  netware/myisamchk.def
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  netware/my_print_defaults.def
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  netware/libmysql.def
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  netware/isamlog.def
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +2 -2
    Novell patch

  netware/isamchk.def
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  netware/init_db.sql
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +3 -0
    Novell patch

  netware/Makefile.am
    1.5 03/02/17 02:14:34 monty@mashka.mysql.fi +21 -2
    Novell patch

  mysys/my_netware.c
    1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +3 -2
    Novell patch

  mysys/my_init.c
    1.21.1.5 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  mysql-test/t/type_blob.test
    1.8.1.1 03/02/17 02:14:34 monty@mashka.mysql.fi +14 -0
    Test if BLOB IS NULL on NOT NULL column

  mysql-test/t/rpl000001.test
    1.30.1.1 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Update for new word file

  mysql-test/t/innodb.test
    1.28.1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +13 -0
    test of multi-table-delete

  mysql-test/std_data/words.dat
    1.4 03/02/17 02:14:34 monty@mashka.mysql.fi +60 -0
    Added more words to make type_blob test relevant

  mysql-test/r/type_blob.result
    1.8.1.1 03/02/17 02:14:34 monty@mashka.mysql.fi +7 -0
    Updated results

  mysql-test/r/rpl_log.result
    1.26.1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +12 -12
    Updated results

  mysql-test/r/rpl000004.result
    1.4.1.1 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Updated results

  mysql-test/r/rpl000001.result
    1.19.1.1 03/02/17 02:14:34 monty@mashka.mysql.fi +2 -12
    Updated results

  mysql-test/r/innodb.result
    1.40.1.12 03/02/17 02:14:34 monty@mashka.mysql.fi +10 -0
    Updated results

  mysql-test/mysql-test-run.sh
    1.146.1.14 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -0
    Don't use running server with --valgrind

  libmysqld/libmysqld.c
    1.14.2.2 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  libmysql/libmysql.c
    1.95.1.28 03/02/17 02:14:34 monty@mashka.mysql.fi +3 -2
    Novell patch

  include/mysql.h
    1.42.1.5 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  include/my_pthread.h
    1.57.1.2 03/02/17 02:14:34 monty@mashka.mysql.fi +1 -1
    Novell patch

  extra/mysql_waitpid.c
    1.4 03/02/17 02:14:34 monty@mashka.mysql.fi +14 -0
    Novell patch

  configure.in
    1.191.1.68 03/02/17 02:14:34 monty@mashka.mysql.fi +35 -26
    Novell patch

  client/mysql.cc
    1.93.1.37 03/02/17 02:14:34 monty@mashka.mysql.fi +3 -0
    Novell patch

  Makefile.am
    1.40.1.6 03/02/17 02:14:34 monty@mashka.mysql.fi +10 -5
    Novell patch

ChangeSet
  1.1346.120.2 03/02/17 01:07:29 monty@mashka.mysql.fi +1 -0
  Merge mashka.mysql.fi:/home/my/mysql-3.23
  into mashka.mysql.fi:/home/my/mysql-4.0

  sql/item_cmpfunc.h
    1.13.1.13 03/02/17 01:07:27 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.676.277.1 03/02/17 01:05:04 monty@mashka.mysql.fi +1 -0
  Fixed problem with ISNULL on fields that could not be null

  sql/item_cmpfunc.h
    1.10.1.6 03/02/17 01:05:03 monty@mashka.mysql.fi +10 -8
    Fixed problem with ISNULL on fields that could not be null

ChangeSet
  1.1346.120.1 03/02/16 22:50:00 monty@mashka.mysql.fi +2 -0
  Patch for novell
  Reverted wrong patch for mysqld_safe.sh

  scripts/mysqld_safe.sh
    1.56.1.1 03/02/16 22:49:59 monty@mashka.mysql.fi +1 -1
    Reverted wrong patch.
    (We must delete the files first as otherwise we will get a problem if the files has the wrong permissions or if the machine went down without removing the socket file)

  client/mysqldump.c
    1.65.4.1 03/02/16 22:49:59 monty@mashka.mysql.fi +10 -2
    Patch for novell.

ChangeSet
  1.1455.3.4 03/02/16 20:37:51 bell@sanja.is.com.ua +3 -0
  fixed excluding st_select_lex from global select list
  fixed destroing not well constructed analize object
  fixed wrong detection of unions in derived tables

  sql/sql_lex.cc
    1.72 03/02/16 20:37:50 bell@sanja.is.com.ua +4 -3
    fixed excluding st_select_lex from global select list

  sql/sql_derived.cc
    1.36.1.1 03/02/16 20:37:50 bell@sanja.is.com.ua +1 -1
    fixed wrong detection of unions in derived tables

  sql/sql_analyse.h
    1.15 03/02/16 20:37:50 bell@sanja.is.com.ua +6 -5
    fixed destroing not well constructed analize object

ChangeSet
  1.1403.75.1 03/02/16 20:39:12 gluh@gluh.mysql.r18.ru +10 -0
  SCRUM: 'Replication: PURGE LOGS with date' task
  
  Added:
  
  PURGE [MASTER] LOGS BEFORE date/date_expression
  expire-logs-days option
    With this option old files are deleted when
        - mysqld is started
        - log is rotated
        - someone does FLUSH LOGS
  
  
  
  

  sql/sql_yacc.yy
    1.203.24.1 03/02/16 20:39:09 gluh@gluh.mysql.r18.ru +29 -6
    For PURGE LOGS BEFORE

  sql/sql_repl.h
    1.24.1.1 03/02/16 20:39:09 gluh@gluh.mysql.r18.ru +1 -0
    For PURGE LOGS BEFORE and expire-log-days option

  sql/sql_repl.cc
    1.91.2.1 03/02/16 20:39:09 gluh@gluh.mysql.r18.ru +18 -7
    For PURGE LOGS BEFORE and expire-log-days option

  sql/sql_parse.cc
    1.235.41.1 03/02/16 20:39:09 gluh@gluh.mysql.r18.ru +16 -1
    Old logs are deleted
    when someone does FLUSH LOGS

  sql/sql_lex.h
    1.102.5.1 03/02/16 20:39:09 gluh@gluh.mysql.r18.ru +2 -1
    For PURGE LOGS BEFORE

  sql/sql_class.h
    1.123.9.10 03/02/16 20:39:09 gluh@gluh.mysql.r18.ru +1 -0
    For PURGE LOGS BEFORE and expire-log-days option

  sql/mysqld.cc
    1.316.5.1 03/02/16 20:39:09 gluh@gluh.mysql.r18.ru +15 -1
    Added options expire-logs-days
    When mysqld is started old log files are deleted.

  sql/mysql_priv.h
    1.160.22.1 03/02/16 20:39:09 gluh@gluh.mysql.r18.ru +1 -0
    For startup option --expire-logs-days 

  sql/log.cc
    1.92.3.1 03/02/16 20:39:09 gluh@gluh.mysql.r18.ru +80 -1
    Added purge_logs_before_date to MYSQL_LOG class

  sql/lex.h
    1.82.4.1 03/02/16 20:39:09 gluh@gluh.mysql.r18.ru +1 -0
    For PURGE LOGS BEFORE

ChangeSet
  1.1455.3.3 03/02/15 17:08:18 venu@myvenu.com +1 -0
    Fix to read the correct 'default value'

  libmysql/libmysql.c
    1.146.1.3 03/02/15 17:06:35 venu@myvenu.com +1 -1
    Fix to read the correct 'default value'

ChangeSet
  1.1455.3.2 03/02/15 15:13:58 venu@myvenu.com +1 -0
    Another misc variable test which is of bool type returning a longlong

  tests/client_test.c
    1.27 03/02/15 15:13:19 venu@myvenu.com +20 -1
    Another misc variable test which is of bool type returning a longlong

ChangeSet
  1.1455.3.1 03/02/15 15:01:04 venu@myvenu.com +2 -0
    Updated tests for MYSQL_FIELD members for misc cases

  libmysql/libmysql.c
    1.146.1.2 03/02/15 14:58:25 venu@myvenu.com +0 -1
    Remove the assignment from stmt->fields to stmt->mysql->fields

  tests/client_test.c
    1.26 03/02/15 14:57:42 venu@myvenu.com +176 -12
    Updated tests for MYSQL_FIELD members for misc cases

ChangeSet
  1.1460 03/02/15 16:06:58 Sinisa@sinisa.nasamreza.org +2 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/sql_lex.h
    1.102.1.20 03/02/15 16:06:52 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  libmysql/libmysql.c
    1.148 03/02/15 16:06:52 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1459 03/02/15 16:05:58 Sinisa@sinisa.nasamreza.org +3 -0
  Code clean-up

  sql/sql_union.cc
    1.64 03/02/15 16:05:54 Sinisa@sinisa.nasamreza.org +2 -2
    Code clean-up

  sql/sql_lex.h
    1.102.1.19 03/02/15 16:05:54 Sinisa@sinisa.nasamreza.org +2 -1
    Code clean-up

  sql/sql_derived.cc
    1.38 03/02/15 16:05:54 Sinisa@sinisa.nasamreza.org +36 -29
    Code clean-up

ChangeSet
  1.1455.1.4 03/02/15 00:11:00 bell@sanja.is.com.ua +3 -0
  fix of illegal usage aggregate functions

  sql/item_subselect.cc
    1.57 03/02/15 00:10:58 bell@sanja.is.com.ua +8 -1
    fix of illegal usage aggregate functions

  mysql-test/t/subselect.test
    1.57 03/02/15 00:10:58 bell@sanja.is.com.ua +12 -0
    test of illegal aggregate functions

  mysql-test/r/subselect.result
    1.62.1.1 03/02/15 00:10:58 bell@sanja.is.com.ua +10 -0
    test of illegal aggregate functions

ChangeSet
  1.1346.119.1 03/02/14 22:20:38 bell@sanja.is.com.ua +3 -0
  fixed invalidation of query cache on LOAD DATA

  sql/sql_load.cc
    1.34.1.9 03/02/14 22:20:33 bell@sanja.is.com.ua +1 -0
    fixed invalidation of query cache on LOAD DATA

  mysql-test/t/query_cache.test
    1.16.1.2 03/02/14 22:20:33 bell@sanja.is.com.ua +11 -1
    test of LOAD DATA

  mysql-test/r/query_cache.result
    1.15.1.2 03/02/14 22:20:33 bell@sanja.is.com.ua +11 -0
    test of LOAD DATA

ChangeSet
  1.676.276.1 03/02/14 17:09:09 bell@sanja.is.com.ua +1 -0
  fixed memory leak in ANALIZE initialization error reporting

  sql/sql_analyse.cc
    1.8.1.2 03/02/14 17:09:07 bell@sanja.is.com.ua +4 -0
    fixed memory leak in ANALIZE initialization error reporting

ChangeSet
  1.1455.1.3 03/02/14 14:00:19 bell@sanja.is.com.ua +1 -0
  fixed memory leak in procedure with subselects

  sql/sql_analyse.cc
    1.30 03/02/14 14:00:12 bell@sanja.is.com.ua +3 -0
    fixed memory leak in procedure with subselects

ChangeSet
  1.1451.1.1 03/02/14 11:47:41 monty@mashka.mysql.fi +20 -0
  Fixed problem when connecting to user without a password.
  Fixed problem with LIKE and BINARY

  sql/time.cc
    1.28 03/02/14 11:47:38 monty@mashka.mysql.fi +4 -2
    removed reference to uninitialized memory

  sql/sql_parse.cc
    1.271 03/02/14 11:47:38 monty@mashka.mysql.fi +87 -44
    Fixed problem with user without passwords
    Fixed some connect problems.

  sql/sql_lex.h
    1.102.4.1 03/02/14 11:47:38 monty@mashka.mysql.fi +1 -1
    Fixed problem with uninitialized memory

  sql/sql_acl.cc
    1.69 03/02/14 11:47:38 monty@mashka.mysql.fi +44 -43
    Code cleanup
    Fixed problem when connecting to user without a password.

  sql/protocol.cc
    1.44 03/02/14 11:47:38 monty@mashka.mysql.fi +4 -3
    Simple code cleanup

  sql/mysql_priv.h
    1.185 03/02/14 11:47:38 monty@mashka.mysql.fi +1 -0
    Made is_update_query extern

  sql/mini_client.cc
    1.60 03/02/14 11:47:38 monty@mashka.mysql.fi +4 -2
    Indentation changes

  sql/log_event.h
    1.82 03/02/14 11:47:38 monty@mashka.mysql.fi +1 -1
    Optimized type

  sql/log_event.cc
    1.102 03/02/14 11:47:38 monty@mashka.mysql.fi +21 -105
    Don't store end ASCII(0) for string user variables.
    Fixed comment style
    Some optimizations

  sql/item_func.cc
    1.110 03/02/14 11:47:38 monty@mashka.mysql.fi +16 -16
    Don't store end ASCII(0) for string user variables
    (Made some other code easier)

  sql/item_cmpfunc.cc
    1.70 03/02/14 11:47:38 monty@mashka.mysql.fi +20 -8
    Fixed problem with LIKE and BINARY

  sql/item.cc
    1.58 03/02/14 11:47:37 monty@mashka.mysql.fi +4 -0
    Fixed that Item_ref returns the right character set

  mysql-test/t/type_blob.test
    1.11 03/02/14 11:47:37 monty@mashka.mysql.fi +1 -0
    New test

  mysql-test/t/rpl_user_variables.test
    1.2 03/02/14 11:47:37 monty@mashka.mysql.fi +4 -11
    Cleaned up test

  mysql-test/r/type_blob.result
    1.14 03/02/14 11:47:37 monty@mashka.mysql.fi +4 -0
    New test

  mysql-test/r/rpl_user_variables.result
    1.2 03/02/14 11:47:37 monty@mashka.mysql.fi +15 -19
    Cleaned up test

  libmysqld/lib_sql.cc
    1.47 03/02/14 11:47:37 monty@mashka.mysql.fi +11 -2
    Ensure that new fields in MYSQL_FIELD structure is used

  libmysql/libmysql.c
    1.146.1.1 03/02/14 11:47:37 monty@mashka.mysql.fi +266 -272
    Simple code cleanup
    Simplified connect() and change_user() by using sub function

  client/mysqltest.c
    1.92 03/02/14 11:47:37 monty@mashka.mysql.fi +6 -3
    Better error messages

  BitKeeper/etc/ignore
    1.143 03/02/14 11:38:43 monty@mashka.mysql.fi +1 -0
    added scripts/fill_help_tables

ChangeSet
  1.1455.1.1 03/02/13 17:12:52 serg@serg.mysql.com +6 -0
  Merge serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
  into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1

  BitKeeper/deleted/.del-world.sql~6603b5c62c5bac53
    1.5 03/02/13 17:12:49 serg@serg.mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.105 03/02/13 17:12:49 serg@serg.mysql.com +0 -0
    Auto merged

  sql/opt_sum.cc
    1.26 03/02/13 17:12:49 serg@serg.mysql.com +0 -0
    Auto merged

  scripts/mysqld_safe.sh
    1.57 03/02/13 17:12:49 serg@serg.mysql.com +0 -1
    Auto merged

  client/mysqldump.c
    1.77 03/02/13 17:12:49 serg@serg.mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-world.sql~6603b5c62c5bac53
    1.4 03/02/13 17:12:49 serg@serg.mysql.com +0 -0
    Merge rename: Docs/world.sql -> BitKeeper/deleted/.del-world.sql~6603b5c62c5bac53

  BUILD/FINISH.sh
    1.23 03/02/13 17:12:49 serg@serg.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1457 03/02/13 17:56:01 Sinisa@sinisa.nasamreza.org +6 -0
  fix a bug in derived tables
  UNION's bug fixes and code clean-up

  scripts/fill_func_tables.sh
    1.1 03/02/13 17:55:57 Sinisa@sinisa.nasamreza.org +234 -0

  sql/sql_yacc.yy
    1.203.1.34 03/02/13 17:55:57 Sinisa@sinisa.nasamreza.org +3 -1
    Fixing some bugs in UNION's with code clean-up

  sql/sql_union.cc
    1.63 03/02/13 17:55:57 Sinisa@sinisa.nasamreza.org +71 -49
    Fixing some bugs in UNION's with code clean-up

  sql/sql_lex.h
    1.102.1.18 03/02/13 17:55:57 Sinisa@sinisa.nasamreza.org +1 -1
    Fixing some bugs in UNION's with code clean-up

  sql/sql_derived.cc
    1.37 03/02/13 17:55:57 Sinisa@sinisa.nasamreza.org +1 -1
    Fix a bug that our CTO reported

  scripts/fill_func_tables.sh
    1.0 03/02/13 17:55:57 Sinisa@sinisa.nasamreza.org +0 -0
    BitKeeper file /mnt/work/mysql-4.1/scripts/fill_func_tables.sh

  mysql-test/r/subselect.result
    1.63 03/02/13 17:55:56 Sinisa@sinisa.nasamreza.org +1 -1
    An insignificant consequent of my UNION"s clean-up

ChangeSet
  1.1456 03/02/13 15:16:00 Sinisa@sinisa.nasamreza.org +2 -0
  merge

  libmysql/libmysql.c
    1.147 03/02/13 15:15:57 Sinisa@sinisa.nasamreza.org +3 -0
    I commited this change 2 weeks ago. 
    I am still waiting for approval to push.
    
    Someone meanwhile pushed different commit, so this merge commit.

  client/mysql.cc
    1.116 03/02/13 15:10:24 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1455 03/02/13 13:10:23 bar@bar.mysql.r18.ru +1 -0
  item_strfunc.cc:
    Fix

  sql/item_strfunc.cc
    1.76 03/02/13 13:10:14 bar@bar.mysql.r18.ru +2 -2
    Fix

ChangeSet
  1.1454 03/02/13 11:21:51 bar@bar.mysql.r18.ru +1 -0
  item_strfunc.cc:
    Fix

  sql/item_strfunc.cc
    1.75 03/02/13 11:21:40 bar@bar.mysql.r18.ru +8 -8
    Fix

ChangeSet
  1.1453 03/02/13 10:42:18 bar@bar.mysql.r18.ru +1 -0
  fill_help_tables.sh:
    Typo fix
    ,

  scripts/fill_help_tables.sh
    1.5 03/02/13 10:42:02 bar@bar.mysql.r18.ru +1 -1
    Typo fix
    ,

ChangeSet
  1.1452 03/02/13 10:14:35 bar@bar.mysql.r18.ru +1 -0
  sql_yacc.yy:
    Compilation failure fix

  sql/sql_yacc.yy
    1.203.1.33 03/02/13 10:14:05 bar@bar.mysql.r18.ru +1 -0
    Compilation failure fix

ChangeSet
  1.1451 03/02/12 23:18:00 monty@mashka.mysql.fi +6 -0
  Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1

  sql/sql_yacc.yy
    1.203.1.32 03/02/12 23:17:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_derived.cc
    1.36 03/02/12 23:17:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/lex.h
    1.82.1.13 03/02/12 23:17:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/field.cc
    1.85 03/02/12 23:17:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  scripts/mysqld_safe.sh
    1.55.1.1 03/02/12 23:17:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysql/libmysql.c
    1.146 03/02/12 23:17:55 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1450 03/02/12 23:17:22 monty@mashka.mysql.fi +4 -0
  Updated configure script to handle 1 digit numbers in MySQL version
  Fixed a few typos from last patch

  sql/sql_yacc.yy
    1.203.1.31 03/02/12 23:17:19 monty@mashka.mysql.fi +1 -1
    Fixed typo in last patch

  sql/sql_parse.cc
    1.270 03/02/12 23:17:19 monty@mashka.mysql.fi +1 -1
    Fixed typo in last patch

  libmysqld/libmysqld.c
    1.29 03/02/12 23:17:19 monty@mashka.mysql.fi +6 -0
    Added mysql_get_server_version

  configure.in
    1.201.1.21 03/02/12 23:17:19 monty@mashka.mysql.fi +1 -4
    Updated script to handle 1 digit numbers in MySQL version

ChangeSet
  1.676.275.4 03/02/12 21:32:35 serg@serg.mysql.com +1 -0
  another fix for RAND() initialization

  sql/sql_class.cc
    1.52.1.6 03/02/12 21:32:33 serg@serg.mysql.com +1 -1
    another fix for RAND() initialization

ChangeSet
  1.1346.118.1 03/02/12 22:07:56 monty@mashka.mysql.fi +2 -0
  merge with 3.23 (use local version)

  sql/sql_class.cc
    1.71.1.25 03/02/12 22:07:54 monty@mashka.mysql.fi +0 -1
    merge with 3.23 (use local version)

  sql/opt_sum.cc
    1.16.1.9 03/02/12 22:07:54 monty@mashka.mysql.fi +0 -3
    merge with 3.23 (use local version)

ChangeSet
  1.1449 03/02/12 21:55:37 monty@mashka.mysql.fi +48 -0
  Fixed a lot of wrong memory references as reported by valgrind
  Portability fixes
  Added new client function: mysql_get_server_version()
  New server help code (From Victor Vagin)
  Fixed wrong usage of binary()
  Disabled RTREE usage for now.
  

  mysql-test/t/help.test
    1.1 03/02/12 21:55:33 monty@mashka.mysql.fi +50 -0

  mysql-test/r/help.result
    1.1 03/02/12 21:55:33 monty@mashka.mysql.fi +123 -0

  strings/ctype-bin.c
    1.22 03/02/12 21:55:33 monty@mashka.mysql.fi +44 -20
    Added cha

  sql/time.cc
    1.27 03/02/12 21:55:33 monty@mashka.mysql.fi +27 -9
    Stricter date / datetime handling (to be able to handle timestamps with days and microseconds)

  sql/table.h
    1.45 03/02/12 21:55:33 monty@mashka.mysql.fi +2 -1
    Fixded type of TABLE_LIST->derived

  sql/table.cc
    1.71 03/02/12 21:55:33 monty@mashka.mysql.fi +32 -5
    Make get_field() more general
    More comments

  sql/sql_yacc.yy
    1.203.1.30 03/02/12 21:55:33 monty@mashka.mysql.fi +50 -32
    Removed access to uninitialized memory
    Always set offset_limit and select_limit when using LIMIT (removed warnings)
    Allow usage of 'help week'

  sql/sql_udf.cc
    1.27 03/02/12 21:55:33 monty@mashka.mysql.fi +2 -2
    Make get_field() more general

  sql/sql_table.cc
    1.148 03/02/12 21:55:33 monty@mashka.mysql.fi +4 -0
    Disabled RTREE until 5.0

  sql/sql_prepare.cc
    1.29 03/02/12 21:55:33 monty@mashka.mysql.fi +2 -3
    Indentaion cleanup

  sql/sql_parse.cc
    1.269 03/02/12 21:55:33 monty@mashka.mysql.fi +44 -46
    Fixed (not fatal) access of unitialized memory
    Indentation / code cleanup

  sql/sql_lex.h
    1.102.1.17 03/02/12 21:55:33 monty@mashka.mysql.fi +1 -1
    Removed not used variable (olap)

  sql/sql_lex.cc
    1.71 03/02/12 21:55:33 monty@mashka.mysql.fi +6 -3
    Removed variables that doesn't have to be initialized for each query

  sql/sql_help.cc
    1.8 03/02/12 21:55:33 monty@mashka.mysql.fi +380 -271
    New help functions (from Victor Vagin)

  sql/sql_derived.cc
    1.34.1.1 03/02/12 21:55:33 monty@mashka.mysql.fi +15 -6
    Renamed variables

  sql/sql_class.h
    1.146 03/02/12 21:55:33 monty@mashka.mysql.fi +4 -2
    Added need_strxnfrm to SORT_FIELD to be able to optimise character set handling in filesort

  sql/sql_cache.cc
    1.39.1.9 03/02/12 21:55:33 monty@mashka.mysql.fi +1 -2
    Indentation changes

  sql/sql_base.cc
    1.142 03/02/12 21:55:33 monty@mashka.mysql.fi +42 -26
    Added comments + assertion for double call to mysql_lock_tables

  sql/sql_acl.cc
    1.68 03/02/12 21:55:33 monty@mashka.mysql.fi +31 -30
    Make get_field() more general

  sql/password.c
    1.22 03/02/12 21:55:33 monty@mashka.mysql.fi +24 -23
    Indentation change + variable initialisation moved

  sql/mysql_priv.h
    1.184 03/02/12 21:55:33 monty@mashka.mysql.fi +1 -1
    Make get_field() more general

  sql/lex.h
    1.82.1.12 03/02/12 21:55:33 monty@mashka.mysql.fi +1 -1
    HELP -> HELP_SYM

  sql/key.cc
    1.18 03/02/12 21:55:33 monty@mashka.mysql.fi +2 -1
    Indentation change

  sql/item_sum.h
    1.34 03/02/12 21:55:33 monty@mashka.mysql.fi +3 -1
    Fix wrong usage of binary()

  mysql-test/t/help.test
    1.0 03/02/12 21:55:33 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.1/mysql-test/t/help.test

  mysql-test/r/help.result
    1.0 03/02/12 21:55:33 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.1/mysql-test/r/help.result

  sql/item_sum.cc
    1.60 03/02/12 21:55:32 monty@mashka.mysql.fi +6 -6
    Fix wrong usage of binary()

  sql/item_strfunc.cc
    1.74 03/02/12 21:55:32 monty@mashka.mysql.fi +4 -4
    Fix wrong usage of binary()

  sql/item_func.h
    1.68 03/02/12 21:55:32 monty@mashka.mysql.fi +8 -2
    Fix wrong usage of binary()

  sql/item_func.cc
    1.109 03/02/12 21:55:32 monty@mashka.mysql.fi +19 -9
    Fix wrong usage of binary()

  sql/item_cmpfunc.h
    1.45 03/02/12 21:55:32 monty@mashka.mysql.fi +32 -14
    Fix wrong usage of binary()

  sql/item_cmpfunc.cc
    1.69 03/02/12 21:55:32 monty@mashka.mysql.fi +24 -22
    Fix wrong usage of binary()

  sql/filesort.cc
    1.64.1.2 03/02/12 21:55:32 monty@mashka.mysql.fi +47 -33
    Optimized character set usage

  sql/field.cc
    1.83.1.1 03/02/12 21:55:32 monty@mashka.mysql.fi +5 -3
    Indentation changes

  scripts/fill_help_tables.sh
    1.4 03/02/12 21:55:32 monty@mashka.mysql.fi +30 -37
    Update for new help tables

  mysys/my_symlink.c
    1.5 03/02/12 21:55:32 monty@mashka.mysql.fi +2 -1
    Removed compiler warning

  mysys/charset.c
    1.70 03/02/12 21:55:32 monty@mashka.mysql.fi +1 -1
    Indentation change

  mysql-test/t/type_ranges.test
    1.6 03/02/12 21:55:32 monty@mashka.mysql.fi +1 -1
    Updated test

  mysql-test/t/myisam.test
    1.15 03/02/12 21:55:32 monty@mashka.mysql.fi +9 -0
    Test of RTREE index

  mysql-test/r/type_ranges.result
    1.13 03/02/12 21:55:32 monty@mashka.mysql.fi +1 -1
    updated results

  mysql-test/r/myisam.result
    1.19 03/02/12 21:55:32 monty@mashka.mysql.fi +5 -0
    Test of RTREE index

  mysql-test/r/connect.result
    1.1.1.1 03/02/12 21:55:32 monty@mashka.mysql.fi +9 -0
    Added help tables

  mysql-test/install_test_db.sh
    1.24.1.1 03/02/12 21:55:32 monty@mashka.mysql.fi +43 -0
    Added creation of help tables

  libmysqld/libmysqld.c
    1.28 03/02/12 21:55:32 monty@mashka.mysql.fi +1 -1
    Fixed prototype

  libmysql/libmysql.c
    1.145 03/02/12 21:55:32 monty@mashka.mysql.fi +29 -0
    Added new client function: mysql_get_server_version()

  include/mysql.h
    1.61 03/02/12 21:55:32 monty@mashka.mysql.fi +1 -0
    Added new client function: mysql_get_server_version()

  cmd-line-utils/libedit/fgetln.c
    1.3 03/02/12 21:55:32 monty@mashka.mysql.fi +2 -1
    Portability fix

  cmd-line-utils/libedit/compat.h
    1.2 03/02/12 21:55:32 monty@mashka.mysql.fi +4 -0
    Portability fix

  client/mysql.cc
    1.115 03/02/12 21:55:32 monty@mashka.mysql.fi +16 -19
    Some fixes when using 'help'

  BitKeeper/etc/ignore
    1.142 03/02/12 21:51:38 monty@mashka.mysql.fi +1 -0
    added scripts/fill_help_tables.sql

ChangeSet
  1.1346.117.1 03/02/12 20:46:40 serg@serg.mysql.com +1 -0
  do not ignore --allow-keywords if SHOW CREATE TABLE is used

  client/mysqldump.c
    1.65.1.23 03/02/12 20:46:37 serg@serg.mysql.com +1 -1
    do not ignore --allow-keywords if SHOW CREATE TABLE is used

ChangeSet
  1.676.1.656 03/02/12 20:42:46 Sinisa@sinisa.nasamreza.org +1 -0
  Fixed YES/NO in Polish messages

  sql/share/polish/errmsg.txt
    1.22.1.10 03/02/12 20:42:44 Sinisa@sinisa.nasamreza.org +1 -1
    Fixed YES/NO in Polish messages

ChangeSet
  1.1438.3.6 03/02/12 19:53:30 jani@rhols221.adsl.netsonic.fi +1 -0
  Fixed a bug in mysqld_safe, when it earlier could have removed
  a socket from another, still living MySQL server.

  scripts/mysqld_safe.sh
    1.52.1.2 03/02/12 19:53:27 jani@rhols221.adsl.netsonic.fi +1 -2
    Fixed a bug in mysqld_safe, when it earlier could have removed
    a socket from another, still living MySQL server.

ChangeSet
  1.1346.46.164 03/02/12 19:53:19 jani@rhols221.adsl.netsonic.fi +1 -0
  Fixed a bug in mysqld_safe, when it earlier could have removed
  a socket from another, still living MySQL server.

  scripts/mysqld_safe.sh
    1.56 03/02/12 19:52:49 jani@rhols221.adsl.netsonic.fi +1 -2
    Fixed a bug in mysqld_safe, when it earlier could have removed
    a socket from another, still living MySQL server.

ChangeSet
  1.1438.3.5 03/02/12 19:50:49 bar@bar.mysql.r18.ru +1 -0
  rt_index.c:
    Bug fix

  myisam/rt_index.c
    1.2 03/02/12 19:50:30 bar@bar.mysql.r18.ru +1 -1
    Bug fix

ChangeSet
  1.1403.47.16 03/02/12 16:17:03 pem@mysql.com +4 -0
  Fixed some DBUGing, and optimized SET slightly.

  sql/sql_yacc.yy
    1.215 03/02/12 16:17:01 pem@mysql.com +11 -3
    Small optimization: Don't generate sp_instr_stmt instructions for empty
    SET_OPTIONs. (Which happened if there were only local variables in the SET
    statement.)

  sql/sql_parse.cc
    1.235.1.43 03/02/12 16:17:01 pem@mysql.com +6 -6
    Changed returns into DBUG_RETURNs in mysql_execute_command().

  sql/sp_head.cc
    1.10 03/02/12 16:17:01 pem@mysql.com +21 -8
    Added DBUG statements.

  sql/sp.cc
    1.3 03/02/12 16:17:01 pem@mysql.com +11 -5
    Added DBUG statements.

ChangeSet
  1.1346.116.1 03/02/12 13:08:55 serg@serg.mysql.com +1 -0
  sh syntax is like that :)

  BUILD/FINISH.sh
    1.18.1.2 03/02/12 13:08:53 serg@serg.mysql.com +5 -5
    sh syntax is like that :)

ChangeSet
  1.676.275.3 03/02/12 11:03:41 serg@serg.mysql.com +1 -0
  backported MERGE+MAX bugfix from 4.0

  sql/opt_sum.cc
    1.9.1.2 03/02/12 11:03:39 serg@serg.mysql.com +3 -4
    backported MERGE+MAX bugfix from 4.0

ChangeSet
  1.1346.46.162 03/02/12 10:50:18 lenz@mysql.com +1 -0
  (please merge with 4.1 and upwards)
   - updated logo to current one

  Docs/Images/mysql-logo.gif
    1.3 03/02/12 10:50:16 lenz@mysql.com +287 -62
     - updated logo to current one

ChangeSet
  1.1346.46.161 03/02/12 14:29:12 arjen@george.bitbike.com +1 -0
  Moved template.texi from mysql-4.0 tree to mysqldoc tree.

  BitKeeper/deleted/.del-template.texi~e93e39114ba9bcf7
    1.3 03/02/12 14:28:45 arjen@george.bitbike.com +0 -0
    Delete: Docs/template.texi

ChangeSet
  1.1346.46.160 03/02/12 14:15:04 arjen@george.bitbike.com +2 -0
  Moved mysql.de.texi from mysql-4.0 tree to mysqldoc tree.
  Replaced mysql.de.texi in mysql-4.0 tree with dummy placeholder.
  Moved world.sql sample database to mysqldoc tree.

  Docs/manual.de.texi
    1.14 03/02/12 14:14:58 arjen@george.bitbike.com +38 -56096
    Moved mysql.de.texi from mysql-4.0 tree to mysqldoc tree.
    Replaced mysql.de.texi in mysql-4.0 tree with dummy placeholder.

  BitKeeper/deleted/.del-world.sql~6603b5c62c5bac53
    1.1.1.2 03/02/12 14:09:40 arjen@george.bitbike.com +0 -0
    Delete: Docs/world.sql

ChangeSet
  1.676.275.2 03/02/11 23:19:47 serg@serg.mysql.com +1 -0
  backporting Peter's fix for better RAND() initialization from 4.0

  sql/sql_class.cc
    1.52.1.5 03/02/11 23:19:46 serg@serg.mysql.com +1 -1
    backporting Peter's fix for better RAND() initialization from 4.0
    to see what it does try
    perl -e 'while($N=shift) { printf "N=%-10d",$N; @b=@c=(); for (1..$N) { @a=split(" ",`mysql -BNe "select rand(), rand(), rand(), rand()"`); for(0..3) { $b[$_]+=$a[$_]; $c[$_]+=$a[$_]*$a[$_]; }} for (0..3) { printf "%15.14f ",($c[$_]-$b[$_]*$b[$_]/$N)/$N } print "\n" }' 10 10 10 100 100 10 100 1000
    before and after the fix

ChangeSet
  1.1438.3.4 03/02/11 16:51:02 bar@bar.mysql.r18.ru +1 -0
  gis.txt:
    Updates according to last changes

  Docs/gis.txt
    1.2 03/02/11 16:38:49 bar@bar.mysql.r18.ru +14 -1
    Updates according to last changes

ChangeSet
  1.1438.3.3 03/02/11 16:37:37 bar@bar.mysql.r18.ru +1 -0
  lex.h:
    Typo fix

  sql/lex.h
    1.82.3.3 03/02/11 16:31:42 bar@bar.mysql.r18.ru +1 -1
    Typo fix

ChangeSet
  1.1438.3.2 03/02/11 16:03:00 bar@bar.mysql.r18.ru +1 -0
  lex.h:
    New synonyms for spatial functions for
    compatibility with http://www.opengis.org/testing/sfsql/sqltsch.sql

  sql/lex.h
    1.82.3.2 03/02/11 16:01:58 bar@bar.mysql.r18.ru +4 -0
    New synonyms for spatial functions for
    compatibility with http://www.opengis.org/testing/sfsql/sqltsch.sql

ChangeSet
  1.1438.3.1 03/02/11 15:39:14 bar@bar.mysql.r18.ru +2 -0
  For more OpenGIS compatibility, these symbols are now synomims to GEOMETRY type:
  POINT, LINESTRING, POLYGON, MULTIPOINT, MULTIPOLYGON, MULTILINESTRING

  sql/sql_yacc.yy
    1.203.23.1 03/02/11 15:39:12 bar@bar.mysql.r18.ru +22 -0
    For more OpenGIS compatibility, these symbols are now synomims to GEOMETRY type:
    POINT, LINESTRING, POLYGON, MULTIPOINT, MULTIPOLYGON, MULTILINESTRING

  sql/lex.h
    1.82.3.1 03/02/11 15:39:12 bar@bar.mysql.r18.ru +6 -6
    For more OpenGIS compatibility, these symbols are now synomims to GEOMETRY type:
    POINT, LINESTRING, POLYGON, MULTIPOINT, MULTIPOLYGON, MULTILINESTRING

ChangeSet
  1.1346.46.159 03/02/11 12:27:53 lenz@mysql.com +1 -0
  (please merge into 4.1 and onwards)
  
  - re-added missing pre- and post(un)install scripts to server subpackage
  - added config file /etc/my.cnf to the file list (just for completeness)
  - make sure to create the datadir with 755 permissions

  support-files/mysql.spec.sh
    1.61 03/02/11 12:27:51 lenz@mysql.com +18 -6
    - re-added missing pre- and post(un)install scripts to server subpackage
    - added config file /etc/my.cnf to the file list (just for completeness)
    - make sure to create the datadir with 755 permissions

ChangeSet
  1.1448 03/02/10 18:01:29 monty@mashka.mysql.fi +9 -0
  merge

  sql/item_sum.h
    1.33 03/02/10 18:01:28 monty@mashka.mysql.fi +0 -1
    merge

  sql/sql_acl.cc
    1.67 03/02/10 18:00:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_sum.cc
    1.59 03/02/10 18:00:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.85.1.14 03/02/10 18:00:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/count_distinct.test
    1.7 03/02/10 18:00:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.161 03/02/10 18:00:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/my_sys.h
    1.90 03/02/10 18:00:09 monty@mashka.mysql.fi +0 -1
    Auto merged

  BitKeeper/deleted/.del-configure.in~ac795a92c8fe049c
    1.7 03/02/10 18:00:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-configure.in~ac795a92c8fe049c
    1.5.1.2 03/02/10 18:00:08 monty@mashka.mysql.fi +0 -0
    Merge rename: bdb/dist/configure.in -> BitKeeper/deleted/.del-configure.in~ac795a92c8fe049c

  BitKeeper/etc/ignore
    1.141 03/02/10 18:00:02 monty@mashka.mysql.fi +14 -16
    auto-union

ChangeSet
  1.1447 03/02/10 17:59:16 monty@mashka.mysql.fi +19 -0
  Move tmp_table_used to THD
  Optimize depending sub querys
  Remove valgrind warnings

  sql/sql_table.cc
    1.147 03/02/10 17:59:13 monty@mashka.mysql.fi +2 -2
    Move tmp_table_used to THD

  sql/sql_select.cc
    1.203 03/02/10 17:59:13 monty@mashka.mysql.fi +12 -8
    optimize depending sub querys

  sql/sql_parse.cc
    1.268 03/02/10 17:59:13 monty@mashka.mysql.fi +1 -0
    Move tmp_table_used to THD

  sql/sql_lex.h
    1.102.1.16 03/02/10 17:59:13 monty@mashka.mysql.fi +2 -1
    Move tmp_table_used to THD

  sql/sql_lex.cc
    1.70 03/02/10 17:59:13 monty@mashka.mysql.fi +1 -3
    Move tmp_table_used to THD

  sql/sql_class.h
    1.145 03/02/10 17:59:13 monty@mashka.mysql.fi +1 -0
    Move tmp_table_used to THD

  sql/sql_class.cc
    1.104 03/02/10 17:59:13 monty@mashka.mysql.fi +1 -1
    Move tmp_table_used to THD

  sql/sql_base.cc
    1.141 03/02/10 17:59:13 monty@mashka.mysql.fi +1 -1
    Move tmp_table_used to THD

  sql/log_event.cc
    1.101 03/02/10 17:59:13 monty@mashka.mysql.fi +1 -1
    Move tmp_table_used to THD

  sql/item_subselect.cc
    1.56 03/02/10 17:59:13 monty@mashka.mysql.fi +2 -2
    Better debugging names

  sql/item_strfunc.h
    1.45 03/02/10 17:59:13 monty@mashka.mysql.fi +1 -1
    Fixed memory overrun

  sql/item_row.cc
    1.14 03/02/10 17:59:13 monty@mashka.mysql.fi +1 -1
    Remove warning

  sql/item_func.cc
    1.108 03/02/10 17:59:13 monty@mashka.mysql.fi +2 -2
    Remove warning for uninitalized data

  sql/item.h
    1.56 03/02/10 17:59:13 monty@mashka.mysql.fi +6 -3
    optimize depending sub querys

  sql/item.cc
    1.57 03/02/10 17:59:13 monty@mashka.mysql.fi +1 -1
    Indentation fix

  mysql-test/t/subselect.test
    1.56 03/02/10 17:59:13 monty@mashka.mysql.fi +79 -68
    Don't use table t1

  mysql-test/r/subselect.result
    1.62 03/02/10 17:59:13 monty@mashka.mysql.fi +123 -108
    Don't use table t1

  mysql-test/mysql-test-run.sh
    1.160 03/02/10 17:59:13 monty@mashka.mysql.fi +1 -1
    Remove wrong `

  libmysqld/lib_sql.cc
    1.46 03/02/10 17:59:13 monty@mashka.mysql.fi +1 -2
    Better way to reset errors

ChangeSet
  1.676.1.654 03/02/10 17:50:06 Sinisa@sinisa.nasamreza.org +1 -0
  connect timeout bug fix

  libmysql/libmysql.c
    1.56.1.20 03/02/10 17:50:04 Sinisa@sinisa.nasamreza.org +3 -0
    This is a fix for a bug in connect_timeout.
    
    This bug manifested itself on operating systems that do support poll() 
    system call, which resulted in a timeout twice the value specified.
    
    That is because timeout executed on both select() and poll().

ChangeSet
  1.1346.115.1 03/02/10 17:03:27 monty@mashka.mysql.fi +4 -0
  Better fix for count(distinct) bug

  sql/item_sum.h
    1.15.1.5 03/02/10 17:03:26 monty@mashka.mysql.fi +2 -2
    Better fix for count(distinct) bug

  sql/item_sum.cc
    1.25.1.5 03/02/10 17:03:26 monty@mashka.mysql.fi +2 -2
    Better fix for count(distinct) bug

  mysql-test/mysql-test-run.sh
    1.146.1.13 03/02/10 17:03:26 monty@mashka.mysql.fi +4 -1
    Don't examine log files when you run with --extern

  include/my_sys.h
    1.75.1.19 03/02/10 17:03:26 monty@mashka.mysql.fi +1 -1
    Remove compiler warning

ChangeSet
  1.1346.46.157 03/02/10 14:56:30 serg@sergbook.mysql.com +5 -0
  Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql
  into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0

  sql/sql_acl.cc
    1.51.1.36 03/02/10 14:56:26 serg@sergbook.mysql.com +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.73.1.79 03/02/10 14:56:25 serg@sergbook.mysql.com +0 -1
    Auto merged

  sql/ha_innodb.cc
    1.45.22.2 03/02/10 14:56:25 serg@sergbook.mysql.com +0 -0
    Merge rename: sql/ha_innobase.cc -> sql/ha_innodb.cc

  scripts/mysqlhotcopy.sh
    1.29 03/02/10 14:56:25 serg@sergbook.mysql.com +0 -0
    Auto merged

  bdb/dist/configure.in
    1.5.1.1 03/02/10 14:56:25 serg@sergbook.mysql.com +0 -0
    Auto merged

  Build-tools/Do-compile
    1.74 03/02/10 14:56:25 serg@sergbook.mysql.com +0 -0
    Auto merged

ChangeSet
  1.676.275.1 03/02/10 14:47:39 serg@sergbook.mysql.com +1 -0
  error message fixed (new error code will be introduced in 4.1)

  sql/sql_acl.cc
    1.27.1.14 03/02/10 14:47:38 serg@sergbook.mysql.com +3 -1
    error message fixed (new error code will be introduced in 4.1)

ChangeSet
  1.1346.46.156 03/02/10 12:01:47 serg@sergbook.mysql.com +5 -0
  count(distint) on an empty table crash fixed

  sql/item_sum.h
    1.15.1.4 03/02/10 12:01:45 serg@sergbook.mysql.com +4 -2
    count(distint) on an empty table crash fixed

  sql/item_sum.cc
    1.25.1.4 03/02/10 12:01:45 serg@sergbook.mysql.com +1 -2
    count(distint) on an empty table crash fixed

  mysql-test/t/count_distinct.test
    1.4.1.2 03/02/10 12:01:45 serg@sergbook.mysql.com +9 -0
    count(distint) on an empty table crash fixed

  mysql-test/r/count_distinct.result
    1.7 03/02/10 12:01:45 serg@sergbook.mysql.com +5 -0
    count(distint) on an empty table crash fixed

  BitKeeper/etc/ignore
    1.107.1.34 03/02/10 12:01:45 serg@sergbook.mysql.com +2 -0
    Added support-files/MacOSX/Description.plist support-files/MacOSX/Info.plist to the ignore list

ChangeSet
  1.1446 03/02/10 01:21:39 monty@mashka.mysql.fi +2 -0
  Merge mashka.mysql.fi:/home/my/mysql-4.0
  into mashka.mysql.fi:/home/my/mysql-4.1

  sql/opt_range.cc
    1.84 03/02/10 01:21:36 monty@mashka.mysql.fi +0 -0
    Auto merged

  BUILD/FINISH.sh
    1.22 03/02/10 01:21:36 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.46.155 03/02/10 01:21:09 monty@mashka.mysql.fi +2 -0
  Fixed memory reference error when doing key_column <=> NULL on column that is defined as NOT NULL

  sql/opt_range.cc
    1.54.1.22 03/02/10 01:21:07 monty@mashka.mysql.fi +2 -12
    Fixed memory reference error when doing key_column <=> NULL on column that is defined as NOT NULL

  BUILD/FINISH.sh
    1.18.1.1 03/02/10 01:21:07 monty@mashka.mysql.fi +5 -1
    Abort if one of configuration script fails

ChangeSet
  1.1445 03/02/08 02:09:21 monty@mashka.mysql.fi +8 -0
  after merge fix

  mysql-test/t/rpl000009.test
    1.18 03/02/08 02:09:17 monty@mashka.mysql.fi +1 -1
    after merge fix

  mysql-test/t/func_group.test
    1.9 03/02/08 02:09:17 monty@mashka.mysql.fi +1 -1
    after merge fix

  mysql-test/r/show_check.result
    1.31 03/02/08 02:09:17 monty@mashka.mysql.fi +3 -3
    updated results

  mysql-test/r/rpl_insert_id.result
    1.4 03/02/08 02:09:17 monty@mashka.mysql.fi +0 -3
    updated results

  mysql-test/r/rpl000009.result
    1.13 03/02/08 02:09:17 monty@mashka.mysql.fi +3 -0
    updated results

  mysql-test/r/order_by.result
    1.19 03/02/08 02:09:17 monty@mashka.mysql.fi +4 -1
    updated results

  mysql-test/r/func_group.result
    1.11 03/02/08 02:09:17 monty@mashka.mysql.fi +2 -2
    updated results

  mysql-test/r/explain.result
    1.13 03/02/08 02:09:17 monty@mashka.mysql.fi +6 -6
    updated results

ChangeSet
  1.1444 03/02/08 01:58:58 monty@mashka.mysql.fi +1 -0
  merge with 4.0.11 to get fix for thread stack

  sql/mysqld.cc
    1.333 03/02/08 01:58:56 monty@mashka.mysql.fi +11 -11
    merge with 4.0.11 to get fix for thread stack

ChangeSet
  1.1346.114.1 03/02/08 01:55:16 monty@mashka.mysql.fi +2 -0
  Check how much stack we got;  Needed to be able to run crash-me

  sql/mysqld.cc
    1.297.1.100 03/02/08 01:55:14 monty@mashka.mysql.fi +11 -1
    Check how much stack we got;  Needed to be able to run crash-me

  sql-bench/limits/mysql.cfg
    1.19 03/02/08 01:55:14 monty@mashka.mysql.fi +6496 -24
    Updated results

ChangeSet
  1.1443 03/02/08 01:12:58 monty@mashka.mysql.fi +11 -0
  merge

  sql/lex.h
    1.82.1.11 03/02/08 01:12:54 monty@mashka.mysql.fi +0 -1
    merge

  mysql-test/t/func_crypt.test
    1.10 03/02/08 01:12:54 monty@mashka.mysql.fi +0 -2
    merge

  mysql-test/r/func_crypt.result
    1.11 03/02/08 01:12:54 monty@mashka.mysql.fi +0 -6
    merge

  mysql-test/r/explain.result
    1.12 03/02/08 01:12:54 monty@mashka.mysql.fi +2 -2
    merge

  sql/opt_sum.cc
    1.25 03/02/08 01:03:11 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/opt_range.cc
    1.83 03/02/08 01:03:11 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_create.h
    1.18 03/02/08 01:03:11 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_create.cc
    1.26 03/02/08 01:03:11 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.85.1.13 03/02/08 01:03:11 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/explain.test
    1.6 03/02/08 01:03:10 monty@mashka.mysql.fi +0 -0
    Auto merged

  configure.in
    1.201.1.20 03/02/08 01:03:10 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1442 03/02/08 01:00:35 monty@mashka.mysql.fi +3 -0
  Update lengths for fields in MYSQL_FIELD

  sql/lex.h
    1.82.1.10 03/02/08 01:00:33 monty@mashka.mysql.fi +0 -1
    fix after merge

  libmysql/libmysql.c
    1.144 03/02/08 01:00:33 monty@mashka.mysql.fi +49 -27
    Update lengths for fields in MYSQL_FIELD

  client/mysql.cc
    1.114 03/02/08 01:00:33 monty@mashka.mysql.fi +2 -2
    Use field->name_length

ChangeSet
  1.1346.46.153 03/02/07 20:05:03 gweir@work.mysql.com +1 -0
  mysqld.xdc:
    new file

  netware/mysqld.xdc
    1.1 03/02/07 20:04:42 gweir@work.mysql.com +4 -0

  netware/mysqld.xdc
    1.0 03/02/07 20:04:42 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/mysqld.xdc

ChangeSet
  1.1346.46.152 03/02/07 18:47:13 monty@mashka.mysql.fi +1 -0
  Fixed problem that caused automake to fail

  configure.in
    1.191.1.67 03/02/07 18:47:11 monty@mashka.mysql.fi +2 -1
    Fixed problem that caused automake to fail

ChangeSet
  1.1346.113.1 03/02/07 17:57:07 monty@mashka.mysql.fi +9 -0
  Fix problem in MIN/MAX optimisation (from last patch)
  Don't make OLD_PASSWORD() a reserved word

  sql/opt_sum.cc
    1.16.1.8 03/02/07 17:57:03 monty@mashka.mysql.fi +9 -2
    Fix problem in MIN/MAX optimisation

  sql/opt_range.cc
    1.54.1.21 03/02/07 17:57:03 monty@mashka.mysql.fi +0 -2
    Remove blank space

  sql/lex.h
    1.66.1.24 03/02/07 17:57:03 monty@mashka.mysql.fi +1 -1
    Don't make OLD_PASSWORD() a reserved word

  sql/item_create.h
    1.11.1.8 03/02/07 17:57:03 monty@mashka.mysql.fi +1 -0
    Don't make OLD_PASSWORD() a reserved word

  sql/item_create.cc
    1.15.1.12 03/02/07 17:57:03 monty@mashka.mysql.fi +5 -0
    Don't make OLD_PASSWORD() a reserved word

  mysql-test/t/func_crypt.test
    1.6.1.2 03/02/07 17:57:03 monty@mashka.mysql.fi +2 -1
    Test old_password()

  mysql-test/t/explain.test
    1.3.1.2 03/02/07 17:57:03 monty@mashka.mysql.fi +8 -0
    Test select count(*)

  mysql-test/r/func_crypt.result
    1.8.1.1 03/02/07 17:57:03 monty@mashka.mysql.fi +6 -3
    Test old_password()

  mysql-test/r/explain.result
    1.5.1.3 03/02/07 17:57:03 monty@mashka.mysql.fi +13 -0
    Test select count(*)

ChangeSet
  1.1346.46.150 03/02/07 17:44:09 heikki@hundin.mysql.fi +1 -0
  page0cur.c:
    Disable PAGE_CUR_LE_OR_EXTENDS because it does not work for non-latin1 char sets now

  innobase/page/page0cur.c
    1.9 03/02/07 17:43:59 heikki@hundin.mysql.fi +5 -0
    Disable PAGE_CUR_LE_OR_EXTENDS because it does not work for non-latin1 char sets now

ChangeSet
  1.1346.46.149 03/02/07 17:33:15 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Clarify the meaning of HA_READ_PREFIX_LAST as a search flag. InnoDB assumed the meaning wrong.

  sql/ha_innodb.cc
    1.73.1.78 03/02/07 17:33:07 heikki@hundin.mysql.fi +8 -11
    Clarify the meaning of HA_READ_PREFIX_LAST as a search flag. InnoDB assumed the meaning wrong.

ChangeSet
  1.1441 03/02/07 16:38:37 monty@mashka.mysql.fi +26 -0
  Merge with 4.0 to get fix for MIN/MAX

  sql/table.cc
    1.70 03/02/07 16:38:34 monty@mashka.mysql.fi +0 -20
    USe local

  sql/sql_yacc.yy
    1.203.1.29 03/02/07 16:38:34 monty@mashka.mysql.fi +1 -2
    merge

  sql/mysql_priv.h
    1.183 03/02/07 16:38:34 monty@mashka.mysql.fi +8 -0
    Use local version

  mysql-test/t/join.test
    1.16 03/02/07 16:38:34 monty@mashka.mysql.fi +2 -3
    merge

  mysql-test/t/func_group.test
    1.8 03/02/07 16:38:34 monty@mashka.mysql.fi +0 -1
    merge

  mysql-test/r/show_check.result
    1.30 03/02/07 16:38:34 monty@mashka.mysql.fi +0 -0
    merge

  mysql-test/r/order_by.result
    1.18 03/02/07 16:38:34 monty@mashka.mysql.fi +3 -8
    merge

  mysql-test/r/func_group.result
    1.10 03/02/07 16:38:34 monty@mashka.mysql.fi +0 -2
    merge

  configure.in
    1.201.1.19 03/02/07 16:38:34 monty@mashka.mysql.fi +0 -2
    Use local version

  sql/sql_select.cc
    1.202 03/02/07 15:55:59 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_parse.cc
    1.267 03/02/07 15:55:58 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/slave.cc
    1.181 03/02/07 15:55:58 monty@mashka.mysql.fi +0 -4
    Auto merged

  sql/opt_range.h
    1.23 03/02/07 15:55:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/opt_range.cc
    1.82 03/02/07 15:55:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/lex.h
    1.82.1.9 03/02/07 15:55:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.85.1.12 03/02/07 15:55:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/filesort.cc
    1.64.1.1 03/02/07 15:55:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/show_check.test
    1.20 03/02/07 15:55:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/order_by.test
    1.13 03/02/07 15:55:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.30 03/02/07 15:55:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/join.result
    1.19 03/02/07 15:55:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.52 03/02/07 15:55:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/distinct.result
    1.22 03/02/07 15:55:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/my_global.h
    1.37 03/02/07 15:55:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  Makefile.am
    1.44 03/02/07 15:55:55 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1440 03/02/07 15:47:24 monty@mashka.mysql.fi +34 -0
  After merge fixes & remove compiler warnings
  Added lengths for all MYSQL_FIELD string parameters
  Changed field length to 2 byte in .frm files

  sql/unireg.cc
    1.24 03/02/07 15:47:08 monty@mashka.mysql.fi +9 -9
    Changed field length to 2 byte in .frm files 

  sql/table.cc
    1.69 03/02/07 15:47:08 monty@mashka.mysql.fi +30 -17
    Changed field length to 2 byte in .frm files 

  sql/sql_udf.cc
    1.26 03/02/07 15:47:08 monty@mashka.mysql.fi +1 -1
    After merge fixes

  sql/sql_show.cc
    1.108 03/02/07 15:47:08 monty@mashka.mysql.fi +3 -3
    After merge fixes

  sql/sql_parse.cc
    1.266 03/02/07 15:47:08 monty@mashka.mysql.fi +8 -10
    After merge fixes

  sql/sql_handler.cc
    1.35 03/02/07 15:47:08 monty@mashka.mysql.fi +8 -15
    After merge fixes

  sql/sql_db.cc
    1.64 03/02/07 15:47:08 monty@mashka.mysql.fi +1 -1
    After merge fixes

  sql/mysqld.cc
    1.332 03/02/07 15:47:08 monty@mashka.mysql.fi +4 -2
    After merge fixes

  sql/mysql_priv.h
    1.182 03/02/07 15:47:07 monty@mashka.mysql.fi +2 -1
    After merge fixes

  sql/log.cc
    1.103 03/02/07 15:47:07 monty@mashka.mysql.fi +2 -4
    After merge fixes

  sql/item_strfunc.h
    1.44 03/02/07 15:47:07 monty@mashka.mysql.fi +3 -4
    After merge fixes

  sql/item_strfunc.cc
    1.73 03/02/07 15:47:07 monty@mashka.mysql.fi +24 -15
    After merge fixes

  sql/item_func.h
    1.67 03/02/07 15:47:07 monty@mashka.mysql.fi +1 -1
    After merge fixes

  sql/item_func.cc
    1.107 03/02/07 15:47:07 monty@mashka.mysql.fi +10 -5
    After merge fixes

  sql/item_cmpfunc.h
    1.44 03/02/07 15:47:07 monty@mashka.mysql.fi +1 -2
    After merge fixes

  sql/item_cmpfunc.cc
    1.68 03/02/07 15:47:07 monty@mashka.mysql.fi +13 -22
    After merge fixes

  mysql-test/t/subselect.test
    1.55 03/02/07 15:47:07 monty@mashka.mysql.fi +3 -0
    After merge fixes

  mysql-test/t/rpl_insert_id.test
    1.2 03/02/07 15:47:07 monty@mashka.mysql.fi +2 -4
    After merge fixes

  mysql-test/t/rpl000009.test
    1.17 03/02/07 15:47:07 monty@mashka.mysql.fi +1 -1
    After merge fixes

  mysql-test/r/rpl_master_pos_wait.result
    1.2 03/02/07 15:47:07 monty@mashka.mysql.fi +2 -2
    After merge fixes

  mysql-test/r/rpl_insert_id.result
    1.3 03/02/07 15:47:07 monty@mashka.mysql.fi +4 -2
    After merge fixes

  mysql-test/r/group_by.result
    1.25 03/02/07 15:47:07 monty@mashka.mysql.fi +9 -9
    After merge fixes

  mysql-test/r/func_group.result
    1.9 03/02/07 15:47:07 monty@mashka.mysql.fi +4 -4
    After merge fixes

  myisam/sp_test.c
    1.5 03/02/07 15:47:07 monty@mashka.mysql.fi +7 -4
    Remove compiler warnings

  myisam/sort.c
    1.33 03/02/07 15:47:07 monty@mashka.mysql.fi +20 -15
    Indentation changes

  myisam/mi_delete.c
    1.19 03/02/07 15:47:07 monty@mashka.mysql.fi +5 -2
    Fixed compiler warning

  myisam/ft_stopwords.c
    1.18 03/02/07 15:47:07 monty@mashka.mysql.fi +64 -15
    Copy file from MySQL 4.0

  myisam/ft_dump.c
    1.17 03/02/07 15:47:07 monty@mashka.mysql.fi +4 -3
    Removed compiler warnings

  myisam/ft_boolean_search.c
    1.58 03/02/07 15:47:07 monty@mashka.mysql.fi +3 -4
    Removed compiler warnings

  include/mysql_com.h
    1.66 03/02/07 15:47:07 monty@mashka.mysql.fi +1 -1
    Remove compiler warning

  include/mysql.h
    1.60 03/02/07 15:47:07 monty@mashka.mysql.fi +6 -0
    Added lengths for all MYSQL_FIELD string parameters

  include/my_sys.h
    1.89 03/02/07 15:47:07 monty@mashka.mysql.fi +1 -1
    Remove compiler warnings

  include/ft_global.h
    1.24 03/02/07 15:47:07 monty@mashka.mysql.fi +1 -1
    Fixed copyright

  configure.in
    1.201.1.18 03/02/07 15:47:07 monty@mashka.mysql.fi +2 -1
    After merge fixes

  BitKeeper/etc/ignore
    1.140 03/02/07 15:46:30 monty@mashka.mysql.fi +1 -0
    added support-files/MacOSX/Info.plist

  BitKeeper/etc/ignore
    1.139 03/02/07 15:46:23 monty@mashka.mysql.fi +1 -0
    added support-files/MacOSX/Description.plist

ChangeSet
  1.1438.1.6 03/02/07 14:57:15 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  libmysql/libmysql.c
    1.142.1.5 03/02/07 14:57:10 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1346.46.147 03/02/07 13:28:18 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Since MySQL uses HA_READ_PREFIX_LAST in a wrong place, we make InnoDB to convert it to a right search condition

  sql/ha_innodb.cc
    1.73.1.77 03/02/07 13:28:05 heikki@hundin.mysql.fi +12 -1
    Since MySQL uses HA_READ_PREFIX_LAST in a wrong place, we make InnoDB to convert it to a right search condition

ChangeSet
  1.1346.112.3 03/02/07 12:54:10 monty@mashka.mysql.fi +2 -0
  Added test for SHOW CREATE

  mysql-test/t/show_check.test
    1.17.1.1 03/02/07 12:54:08 monty@mashka.mysql.fi +35 -0
    Added test for SHOW CREATE

  mysql-test/r/show_check.result
    1.21.1.3 03/02/07 12:54:08 monty@mashka.mysql.fi +56 -0
    Added test for SHOW CREATE

ChangeSet
  1.1346.112.2 03/02/07 10:35:08 monty@mashka.mysql.fi +3 -0
  Allow 4.0 to read new 4.1 .frm files

  sql/table.cc
    1.46.1.16 03/02/07 10:35:06 monty@mashka.mysql.fi +20 -11
    Allow 4.0 to read new 4.1 .frm files

  configure.in
    1.191.1.66 03/02/07 10:35:06 monty@mashka.mysql.fi +2 -2
    Keep version gamma

  Makefile.am
    1.40.1.5 03/02/07 10:35:06 monty@mashka.mysql.fi +0 -1
    Remove blank lines

ChangeSet
  1.1438.1.5 03/02/06 14:47:56 venu@myvenu.com +1 -0
  Fix compilation errors reported by Lenz on misc platforms

  libmysql/libmysql.c
    1.142.1.4 03/02/06 14:46:54 venu@myvenu.com +1 -1
    Fix compilation errors reported by Lenz on misc platforms

ChangeSet
  1.1346.46.146 03/02/07 00:44:32 heikki@hundin.mysql.fi +1 -0
  page0cur.c:
    Sinisas patch to InnoDB ORDER BY DESC bug, push it now so that Jani has it available

  innobase/page/page0cur.c
    1.8 03/02/07 00:44:16 heikki@hundin.mysql.fi +1 -1
    Sinisas patch to InnoDB ORDER BY DESC bug, push it now so that Jani has it available

  libmysql/libmysql.c
    1.142.1.3 03/02/06 14:25:51 venu@myvenu.com +3 -3
    Fix compilation errors from misc os's - reported by Lenz

ChangeSet
  1.676.274.1 03/02/06 18:50:12 Sinisa@sinisa.nasamreza.org +3 -0
  A fix for new conditions being defined and upper condition not updated

  sql/sql_select.cc
    1.91.1.39 03/02/06 18:50:10 Sinisa@sinisa.nasamreza.org +5 -0
    Fix for a bug caused implicitely by MySQL having to comply with 
    ODBC standard on datetime comparisons.
    
    This failed to update used_tables() for OR condition, which is why
    query returned all rows on query as in .test above, while
    none of types contains NULL nor 0 datetime (last one from ODBC)

  mysql-test/t/type_datetime.test
    1.3.1.2 03/02/06 18:50:10 Sinisa@sinisa.nasamreza.org +5 -0
    test for datetime fix

  mysql-test/r/type_datetime.result
    1.3.1.2 03/02/06 18:50:10 Sinisa@sinisa.nasamreza.org +1 -0
    result for datetime fix

ChangeSet
  1.1346.112.1 03/02/06 16:55:59 monty@mashka.mysql.fi +19 -0
  Added START TRANSACTION syntax
  Added ALL as parameter option for all group functions.
  Make join handling uniform. This allows us to use ',', JOIN and INNER JOIN the same way.
  Sort NULL last if DESC is used (ANSI SQL 99 requirement)

  sql/sql_yacc.yy
    1.145.1.55 03/02/06 16:55:56 monty@mashka.mysql.fi +27 -12
    Added START TRANSACTION syntax
    Added ALL as parameter option for all group functions.
    Make join handling uniform.

  sql/sql_select.cc
    1.152.1.71 03/02/06 16:55:56 monty@mashka.mysql.fi +5 -0
    Added comment

  sql/sql_parse.cc
    1.218.1.75 03/02/06 16:55:56 monty@mashka.mysql.fi +0 -2
    After merge fix

  sql/slave.cc
    1.164.1.45 03/02/06 16:55:56 monty@mashka.mysql.fi +4 -4
    Indentation changes

  sql/opt_range.h
    1.19.1.3 03/02/06 16:55:56 monty@mashka.mysql.fi +2 -0
    Sort NULL last if DESC is used

  sql/opt_range.cc
    1.54.1.20 03/02/06 16:55:56 monty@mashka.mysql.fi +3 -2
    Sort NULL last if DESC is used

  sql/mysql_priv.h
    1.150.1.33 03/02/06 16:55:56 monty@mashka.mysql.fi +0 -8
    Removed LL()

  sql/lex.h
    1.66.1.23 03/02/06 16:55:56 monty@mashka.mysql.fi +1 -0
    Added OLD_PASSWORD() as synonym for PASSWORD.

  sql/filesort.cc
    1.45.1.7 03/02/06 16:55:56 monty@mashka.mysql.fi +4 -1
    Sort NULL last if DESC is used

  mysql-test/t/order_by.test
    1.9.2.1 03/02/06 16:55:56 monty@mashka.mysql.fi +2 -1
    Added new test of NULL ordering.

  mysql-test/t/join.test
    1.13.1.2 03/02/06 16:55:56 monty@mashka.mysql.fi +24 -1
    Test different join syntaxes

  mysql-test/t/innodb.test
    1.28.1.1 03/02/06 16:55:56 monty@mashka.mysql.fi +1 -1
    Added test for START TRANSACTION

  mysql-test/t/func_group.test
    1.4.1.2 03/02/06 16:55:56 monty@mashka.mysql.fi +1 -1
    Added test for SUM(ALL ...)

  mysql-test/r/order_by.result
    1.11.1.4 03/02/06 16:55:56 monty@mashka.mysql.fi +13 -2
    Updated results

  mysql-test/r/join.result
    1.17.1.1 03/02/06 16:55:56 monty@mashka.mysql.fi +30 -0
    Updated results

  mysql-test/r/innodb.result
    1.40.1.11 03/02/06 16:55:56 monty@mashka.mysql.fi +1 -1
    Updated results

  mysql-test/r/func_group.result
    1.6.1.2 03/02/06 16:55:56 monty@mashka.mysql.fi +2 -2
    Updated results

  mysql-test/r/distinct.result
    1.14.1.6 03/02/06 16:55:55 monty@mashka.mysql.fi +1 -1
    Updated results

  include/my_global.h
    1.34.1.2 03/02/06 16:55:55 monty@mashka.mysql.fi +8 -0
    Moved LL from mysql_priv (as this is also in config-win.h)

ChangeSet
  1.1438.2.2 03/02/06 16:03:13 Sinisa@sinisa.nasamreza.org +1 -0
  a fix for mysql client

  client/mysql.cc
    1.112.1.1 03/02/06 16:00:18 Sinisa@sinisa.nasamreza.org +1 -1
    A fix for mysql client which did filtered out queries of the type:
    /*!40001 select 1 */

ChangeSet
  1.1438.1.4 03/02/05 22:29:42 venu@myvenu.com +1 -0
  Added all new changes (To be incorporated to main manual before the release)

  Docs/prepare.texi
    1.2 03/02/05 22:28:39 venu@myvenu.com +435 -121
    Added all new changes (To be incorporated to main manual before the release)

ChangeSet
  1.1438.1.3 03/02/05 12:21:01 venu@myvenu.com +2 -0
    Fix stupid signed and unsigned conversion - When field and buffer types are different (Client receiving end)
    Added tests for singed and unsigned conversion (client_test.c)

  libmysql/libmysql.c
    1.142.1.2 03/02/05 12:17:04 venu@myvenu.com +22 -16
    Fix signed and unsigned conversion - When field and buffer types are different

  tests/client_test.c
    1.25 03/02/05 12:15:40 venu@myvenu.com +175 -5
    Tests for singed and unsigned conversion

ChangeSet
  1.1438.2.1 03/02/05 22:13:06 Sinisa@sinisa.nasamreza.org +1 -0
  a fix in libmysql.c

  libmysql/libmysql.c
    1.142.2.1 03/02/05 22:13:03 Sinisa@sinisa.nasamreza.org +1 -1
    This crashed my mysql client.
    I hope that fix is correct.

ChangeSet
  1.676.1.652 03/02/05 18:02:12 lenz@mysql.com +1 -0
  Small enhancements for Do-compile:
   - add version number to build log files (e.g. Logs/build-4.1-standard.log)
   - add host name and uname to Subject line of build failure mails
     (e.g. "Subject: build(Linux): mysql-4.1-standard compilation failed")
  
   -> Please merge with all other trees!

  Build-tools/Do-compile
    1.33.1.19 03/02/05 18:02:12 lenz@mysql.com +8 -4
    Small enhancements:
     - add version number to build log files (e.g. Logs/build-4.1-standard.log)
     - add host name and uname to Subject line of build failure mails
       (e.g. "Subject: build(Linux): mysql-4.1-standard compilation failed")

ChangeSet
  1.676.1.651 03/02/05 12:22:28 lenz@mysql.com +1 -0
   - added word of warning about providing the password as cleartext using
     the --password parameter (better add it to my.cnf instead) (Thanks to
     Christian Hammers for the suggestion)

  scripts/mysqlhotcopy.sh
    1.20.1.8 03/02/05 12:22:27 lenz@mysql.com +8 -3
     - added word of warning about providing the password as cleartext using
       the --password parameter (better add it to my.cnf instead)

ChangeSet
  1.676.1.650 03/02/05 11:49:51 lenz@mysql.com +1 -0
   - Yves mail address does not seem to be valid anymore - changed mail
     address to report bugs to bugs@mysql.com (thanks to Christian Hammers
     for pointing this out) - please merge this into all other trees!

  scripts/mysqlaccess.sh
    1.7 03/02/05 11:49:50 lenz@mysql.com +2 -2
     - Yves mail address does not seem to be valid anymore - changed mail
       address to report bugs to bugs@mysql.com (thanks to Christian Hammers
       for pointing this out)

ChangeSet
  1.1438.1.2 03/02/04 18:54:14 venu@myvenu.com +2 -0
  Conversion fix - bug report from PHP
  Added a new conversion bug test
  Changed options with default_options read from my.ini from [client] section
  More cleanups for better usage

  tests/client_test.c
    1.24 03/02/04 18:52:42 venu@myvenu.com +321 -192
    Added a new conversion bug test
    Changed options with default_options read from my.ini from [client] section
    More cleanups for better usage

  libmysql/libmysql.c
    1.142.1.1 03/02/04 18:52:25 venu@myvenu.com +22 -17
    Conversion fix - bug report from PHP

ChangeSet
  1.1438.1.1 03/02/04 18:50:48 venu@myvenu.com +3 -0
  Windows compile fixups (To be verified by respective devs)

  sql/sql_derived.cc
    1.35 03/02/04 18:49:22 venu@myvenu.com +1 -1
    Windows - compile fix

  sql/item_uniq.h
    1.12 03/02/04 18:49:08 venu@myvenu.com +1 -1
    Windows compile fix

  sql/field.cc
    1.84 03/02/04 18:48:38 venu@myvenu.com +1 -1
    Windows - Cast (longlong -> uint)

ChangeSet
  1.1346.46.145 03/02/05 03:40:07 gweir@work.mysql.com +26 -0
  Many files:
    new file
  .del-overlay.tar.gz~5bd3087e191e7574:
    Delete: netware/overlay.tar.gz

  netware/resolveip.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +9 -0

  netware/replace.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +9 -0

  netware/perror.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +9 -0

  netware/pack_isam.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +9 -0

  netware/mysqltest.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +9 -0

  netware/mysqlshow.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +10 -0

  netware/mysqlimport.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +9 -0

  netware/mysqldump.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +9 -0

  netware/mysqld_safe.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +10 -0

  netware/mysqld.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +12 -0

  netware/mysqlcheck.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +9 -0

  netware/mysqlbinlog.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +9 -0

  netware/mysqladmin.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +10 -0

  netware/mysql_test_run.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +10 -0

  netware/mysql_install_db.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +10 -0

  netware/mysql_install.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +9 -0

  netware/mysql.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +11 -0

  netware/myisampack.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +9 -0

  netware/myisamlog.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +9 -0

  netware/myisamchk.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +10 -0

  netware/my_print_defaults.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +9 -0

  netware/libmysqld.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +65 -0

  netware/libmysql.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +10 -0

  netware/isamlog.def
    1.1 03/02/05 03:33:04 gweir@work.mysql.com +9 -0

  netware/resolveip.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/resolveip.def

  netware/replace.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/replace.def

  netware/perror.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/perror.def

  netware/pack_isam.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/pack_isam.def

  netware/mysqltest.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/mysqltest.def

  netware/mysqlshow.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/mysqlshow.def

  netware/mysqlimport.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/mysqlimport.def

  netware/mysqldump.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/mysqldump.def

  netware/mysqld_safe.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/mysqld_safe.def

  netware/mysqld.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/mysqld.def

  netware/mysqlcheck.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/mysqlcheck.def

  netware/mysqlbinlog.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/mysqlbinlog.def

  netware/mysqladmin.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/mysqladmin.def

  netware/mysql_test_run.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/mysql_test_run.def

  netware/mysql_install_db.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/mysql_install_db.def

  netware/mysql_install.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/mysql_install.def

  netware/mysql.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/mysql.def

  netware/myisampack.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/myisampack.def

  netware/myisamlog.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/myisamlog.def

  netware/myisamchk.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/myisamchk.def

  netware/my_print_defaults.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/my_print_defaults.def

  netware/libmysqld.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/libmysqld.def

  netware/libmysql.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/libmysql.def

  netware/isamlog.def
    1.0 03/02/05 03:33:04 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/isamlog.def

  netware/isamchk.def
    1.1 03/02/05 03:33:02 gweir@work.mysql.com +10 -0

  netware/isamchk.def
    1.0 03/02/05 03:33:02 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/isamchk.def

  BitKeeper/deleted/.del-overlay.tar.gz~5bd3087e191e7574
    1.2 03/02/05 03:13:57 gweir@work.mysql.com +0 -0
    Delete: netware/overlay.tar.gz

ChangeSet
  1.676.1.649 03/02/05 01:42:07 heikki@hundin.mysql.fi +1 -0
  ha_innobase.cc:
    Backport from 4.0: fix potential bug if store_lock is called with TL_IGNORE in the middle of a query

  sql/ha_innobase.cc
    1.45.22.1 03/02/05 01:41:59 heikki@hundin.mysql.fi +1 -1
    Backport from 4.0: fix potential bug if store_lock is called with TL_IGNORE in the middle of a query

ChangeSet
  1.1346.46.144 03/02/05 01:24:59 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Fix potential bug: if MySQL calls store_lock with the TL_IGNORE argument in the middle of query processing, then InnoDB select_lock_type could be reset to LOCK_NONE in a wrong place

  sql/ha_innodb.cc
    1.73.1.76 03/02/05 01:24:48 heikki@hundin.mysql.fi +11 -3
    Fix potential bug: if MySQL calls store_lock with the TL_IGNORE argument in the middle of query processing, then InnoDB select_lock_type could be reset to LOCK_NONE in a wrong place

ChangeSet
  1.676.1.648 03/02/04 22:30:47 lenz@mysql.com +1 -0
   - removed LIBOBJS hack (no longer required with newer versions of autoconf
     and actually results in an error with very recent autoconf versions!
     (see http://www.gnu.org/manual/autoconf/html_node/autoconf_165.html or
      "AC_LIBOBJ vs. LIBOBJS" in the autoconf documentation)
     Please merge this into 4.0 as well!

  bdb/dist/configure.in
    1.3.1.2 03/02/04 22:30:35 lenz@mysql.com +0 -7
     - removed LIBOBJS hack (no longer required with newer versions of autoconf
       and actually results in an error with very recent autoconf versions!
       (see http://www.gnu.org/manual/autoconf/html_node/autoconf_165.html or
        "AC_LIBOBJ vs. LIBOBJS" in the autoconf documentation)
       Please merge this into 4.0 as well!

ChangeSet
  1.1439 03/02/04 21:52:14 monty@mashka.mysql.fi +115 -0
  Merge with 4.0.11

  sql/sql_yacc.yy
    1.203.1.28 03/02/04 21:52:10 monty@mashka.mysql.fi +12 -13
    Merge

  sql/sql_select.cc
    1.201 03/02/04 21:52:10 monty@mashka.mysql.fi +2 -3
    Merge

  sql/sql_parse.cc
    1.265 03/02/04 21:52:10 monty@mashka.mysql.fi +5 -9
    Merge

  sql/sql_handler.cc
    1.34 03/02/04 21:52:10 monty@mashka.mysql.fi +11 -4
    Merge

  sql/sql_db.cc
    1.63 03/02/04 21:52:10 monty@mashka.mysql.fi +1 -2
    Merge

  sql/sql_class.h
    1.144 03/02/04 21:52:10 monty@mashka.mysql.fi +1 -0
    Merge

  sql/slave.cc
    1.180 03/02/04 21:52:10 monty@mashka.mysql.fi +104 -255
    Merge

  sql/protocol.cc
    1.43 03/02/04 21:52:10 monty@mashka.mysql.fi +7 -12
    Merge

  sql/mysqld.cc
    1.331 03/02/04 21:52:10 monty@mashka.mysql.fi +41 -51
    Merge

  sql/mysql_priv.h
    1.181 03/02/04 21:52:10 monty@mashka.mysql.fi +3 -4
    Merge

  sql/log.cc
    1.102 03/02/04 21:52:10 monty@mashka.mysql.fi +0 -0
    Merge

  sql/item_strfunc.h
    1.43 03/02/04 21:52:10 monty@mashka.mysql.fi +1 -1
    Merge

  sql/item_func.cc
    1.106 03/02/04 21:52:10 monty@mashka.mysql.fi +4 -4
    Merge

  sql/item_create.cc
    1.25 03/02/04 21:52:10 monty@mashka.mysql.fi +4 -6
    Merge

  sql/item_cmpfunc.h
    1.43 03/02/04 21:52:10 monty@mashka.mysql.fi +3 -3
    Merge

  sql/item_cmpfunc.cc
    1.67 03/02/04 21:52:10 monty@mashka.mysql.fi +8 -5
    Merge

  sql/item.h
    1.55 03/02/04 21:52:10 monty@mashka.mysql.fi +1 -1
    Merge

  mysys/charset.c
    1.69 03/02/04 21:52:10 monty@mashka.mysql.fi +4 -4
    Merge

  mysys/Makefile.am
    1.45 03/02/04 21:52:10 monty@mashka.mysql.fi +3 -7
    Merge

  mysql-test/t/rpl_rotate_logs.test
    1.40 03/02/04 21:52:10 monty@mashka.mysql.fi +0 -0
    Merge

  mysql-test/t/rpl000009.test
    1.16 03/02/04 21:52:10 monty@mashka.mysql.fi +4 -5
    Merge

  mysql-test/t/group_by.test
    1.19 03/02/04 21:52:10 monty@mashka.mysql.fi +0 -0
    Merge

  mysql-test/r/rpl000009.result
    1.12 03/02/04 21:52:10 monty@mashka.mysql.fi +1 -5
    Merge

  mysql-test/r/group_by.result
    1.24 03/02/04 21:52:10 monty@mashka.mysql.fi +11 -11
    Merge

  mysql-test/r/bigint.result
    1.16 03/02/04 21:52:10 monty@mashka.mysql.fi +0 -0
    Merge

  myisam/myisamchk.c
    1.91 03/02/04 21:52:10 monty@mashka.mysql.fi +2 -3
    Merge

  myisam/ft_stopwords.c
    1.17 03/02/04 21:52:10 monty@mashka.mysql.fi +11 -61
    Merge

  libmysqld/lib_sql.cc
    1.45 03/02/04 21:52:10 monty@mashka.mysql.fi +0 -2
    Merge

  libmysql/libmysql.c
    1.143 03/02/04 21:52:10 monty@mashka.mysql.fi +2 -6
    Merge

  configure.in
    1.201.1.17 03/02/04 21:52:10 monty@mashka.mysql.fi +12 -13
    Merge

  client/mysql.cc
    1.113 03/02/04 21:52:10 monty@mashka.mysql.fi +2 -5
    Merge

  Docs/manual.texi
    1.880 03/02/04 21:52:09 monty@mashka.mysql.fi +0 -0
    Use remote version

ChangeSet
  1.1403.47.15 03/02/04 17:40:18 pem@mysql.com +5 -0
  Some new stuff in the Docs/sp-* files, and renamed a few functions in preparation
  for future work.

  sql/sql_parse.cc
    1.235.1.42 03/02/04 17:40:16 pem@mysql.com +4 -4
    Renamed functions.

  sql/sp.h
    1.2 03/02/04 17:40:16 pem@mysql.com +13 -2
    Renamed functions.

  sql/sp.cc
    1.2 03/02/04 17:40:16 pem@mysql.com +2 -2
    Renamed functions.

  Docs/sp-implemented.txt
    1.2 03/02/04 17:40:16 pem@mysql.com +21 -1
    Added som info on SET behaviour, and added Open questions.

  Docs/sp-imp-spec.txt
    1.2 03/02/04 17:40:16 pem@mysql.com +37 -5
    Started on the FUNCTION parts...

  sql/table.cc
    1.68 03/02/04 09:54:24 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.70.1.1 03/02/04 09:54:24 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql-bench/test-insert.sh
    1.40 03/02/04 09:54:24 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql-bench/server-cfg.sh
    1.46 03/02/04 09:54:24 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql-bench/crash-me.sh
    1.40 03/02/04 09:54:24 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_udf.cc
    1.25 03/02/04 09:54:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_table.cc
    1.146 03/02/04 09:54:23 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/sql_show.cc
    1.107 03/02/04 09:54:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_select.h
    1.39 03/02/04 09:54:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_repl.cc
    1.96 03/02/04 09:54:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_insert.cc
    1.84 03/02/04 09:54:23 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_class.cc
    1.103 03/02/04 09:54:22 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_base.cc
    1.140 03/02/04 09:54:22 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_acl.cc
    1.66 03/02/04 09:54:22 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/slave.h
    1.56 03/02/04 09:54:22 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/set_var.cc
    1.27 03/02/04 09:54:22 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.22 03/02/04 09:54:22 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/opt_sum.cc
    1.24 03/02/04 09:54:22 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/net_serv.cc
    1.52 03/02/04 09:54:22 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/lex.h
    1.82.1.8 03/02/04 09:54:21 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_sum.h
    1.32 03/02/04 09:54:21 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_sum.cc
    1.58 03/02/04 09:54:21 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.72 03/02/04 09:54:21 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_func.h
    1.66 03/02/04 09:54:21 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_create.h
    1.17 03/02/04 09:54:21 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item.cc
    1.56 03/02/04 09:54:20 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/hostname.cc
    1.22 03/02/04 09:54:20 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/handler.cc
    1.84.1.4 03/02/04 09:54:20 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_myisammrg.cc
    1.42 03/02/04 09:54:20 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.111 03/02/04 09:54:20 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.85.1.11 03/02/04 09:54:20 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/des_key_file.cc
    1.8 03/02/04 09:54:20 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/Makefile.am
    1.77.1.3 03/02/04 09:54:20 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysys/my_init.c
    1.26 03/02/04 09:54:20 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysys/my_getwd.c
    1.9 03/02/04 09:54:19 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysys/default.c
    1.21 03/02/04 09:54:19 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/rpl000017.test
    1.11 03/02/04 09:54:19 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/rpl000015.test
    1.23 03/02/04 09:54:19 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/query_cache.test
    1.19 03/02/04 09:54:19 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/handler.test
    1.10 03/02/04 09:54:19 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/grant_cache.test
    1.4 03/02/04 09:54:18 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/func_group.test
    1.7 03/02/04 09:54:18 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/func_crypt.test
    1.9 03/02/04 09:54:18 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/count_distinct.test
    1.6 03/02/04 09:54:18 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/binary.test
    1.7 03/02/04 09:54:18 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/bigint.test
    1.14 03/02/04 09:54:18 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/backup.test
    1.11 03/02/04 09:54:18 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/union.result
    1.29 03/02/04 09:54:18 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/select_found.result
    1.15 03/02/04 09:54:18 monty@mashka.mysql.fi +1 -2
    Auto merged

  mysql-test/r/query_cache.result
    1.18 03/02/04 09:54:18 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/handler.result
    1.9 03/02/04 09:54:18 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/func_math.result
    1.12 03/02/04 09:54:18 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/func_group.result
    1.8 03/02/04 09:54:18 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.159 03/02/04 09:54:18 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/myisamdef.h
    1.57 03/02/04 09:54:17 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/mi_test3.c
    1.9 03/02/04 09:54:17 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/mi_open.c
    1.60 03/02/04 09:54:17 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/mi_check.c
    1.101 03/02/04 09:54:17 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/ft_static.c
    1.21 03/02/04 09:54:17 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysqld/libmysqld.c
    1.27 03/02/04 09:54:17 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysql/manager.c
    1.11 03/02/04 09:54:17 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysql/Makefile.shared
    1.43 03/02/04 09:54:17 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysql/Makefile.am
    1.32 03/02/04 09:54:17 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/srv/srv0start.c
    1.40 03/02/04 09:54:16 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/srv/srv0srv.c
    1.39 03/02/04 09:54:16 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/os/os0file.c
    1.46 03/02/04 09:54:16 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/btr/btr0cur.c
    1.23 03/02/04 09:54:16 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/mysql.h
    1.59 03/02/04 09:54:16 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/my_sys.h
    1.88 03/02/04 09:54:16 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/my_pthread.h
    1.60 03/02/04 09:54:16 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/my_global.h
    1.36 03/02/04 09:54:16 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/my_base.h
    1.40 03/02/04 09:54:16 monty@mashka.mysql.fi +0 -1
    Auto merged

  include/config-win.h
    1.28 03/02/04 09:54:16 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/Makefile.am
    1.37 03/02/04 09:54:16 monty@mashka.mysql.fi +0 -0
    Auto merged

  extra/resolveip.c
    1.16 03/02/04 09:54:16 monty@mashka.mysql.fi +0 -0
    Auto merged

  client/mysqltest.c
    1.91 03/02/04 09:54:16 monty@mashka.mysql.fi +0 -0
    Auto merged

  client/mysqldump.c
    1.76 03/02/04 09:54:15 monty@mashka.mysql.fi +0 -0
    Auto merged

  client/mysqlcheck.c
    1.27 03/02/04 09:54:15 monty@mashka.mysql.fi +0 -0
    Auto merged

  client/mysqladmin.c
    1.75 03/02/04 09:54:15 monty@mashka.mysql.fi +0 -0
    Auto merged

  bdb/os/os_handle.c
    1.4 03/02/04 09:54:15 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/protocol.cc
    1.21.3.3 03/02/04 09:54:13 monty@mashka.mysql.fi +0 -0
    Merge rename: sql/net_pkg.cc -> sql/protocol.cc

  Makefile.am
    1.43 03/02/04 09:54:13 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.233 03/02/04 09:54:06 monty@mashka.mysql.fi +1 -1
    auto-union

  BitKeeper/etc/gone
    1.86.1.10 03/02/04 09:54:05 monty@mashka.mysql.fi +1 -1
    auto-union

ChangeSet
  1.1438 03/02/04 06:44:29 monty@mashka.mysql.fi +2 -0
  After merge fix

  sql/sql_parse.cc
    1.264 03/02/04 06:44:21 monty@mashka.mysql.fi +1 -1
    After merge fix

  include/violite.h
    1.28 03/02/04 06:44:20 monty@mashka.mysql.fi +5 -2
    Indentation cleanup

ChangeSet
  1.1437 03/02/04 03:27:47 monty@mashka.mysql.fi +5 -0
  merge

  sql/sql_parse.cc
    1.263 03/02/04 03:27:45 monty@mashka.mysql.fi +0 -1
    merge

  sql/protocol.cc
    1.42 03/02/04 03:19:53 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.330 03/02/04 03:19:53 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.180 03/02/04 03:19:53 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item.cc
    1.55 03/02/04 03:19:53 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1422.8.1 03/02/04 03:19:19 monty@mashka.mysql.fi +10 -0
  Added charset number to result header

  sql/sql_parse.cc
    1.254.1.7 03/02/04 03:19:17 monty@mashka.mysql.fi +3 -5
    Changed clear_error_message() to thd->clear_error()
    Simple optimization.

  sql/protocol.cc
    1.40.1.1 03/02/04 03:19:17 monty@mashka.mysql.fi +62 -47
    Simple code cleanup

  sql/mysqld.cc
    1.328.1.1 03/02/04 03:19:17 monty@mashka.mysql.fi +0 -11
    Removed not used function clear_error_message

  sql/mysql_priv.h
    1.175.1.1 03/02/04 03:19:17 monty@mashka.mysql.fi +0 -2
    Removed clear_error_message()

  sql/item.cc
    1.47.1.2 03/02/04 03:19:17 monty@mashka.mysql.fi +7 -5
    Added charset number to result header

  sql/field.h
    1.60 03/02/04 03:19:17 monty@mashka.mysql.fi +2 -1
    Added charset number to result header

  sql/field.cc
    1.83 03/02/04 03:19:17 monty@mashka.mysql.fi +2 -0
    Added charset number to result header

  libmysql/libmysql.c
    1.142 03/02/04 03:19:17 monty@mashka.mysql.fi +13 -10
    Added charset number to result header

  include/mysql.h
    1.58 03/02/04 03:19:17 monty@mashka.mysql.fi +1 -0
    Added charset number to result header

  Docs/internals.texi
    1.23 03/02/04 03:19:17 monty@mashka.mysql.fi +7 -0
    Updated protocol information

ChangeSet
  1.1346.111.1 03/02/04 01:05:39 monty@mashka.mysql.fi +3 -0
  Fixed bug in ulonglong parsing for constructs that only takes unsigned longlong as parameter.

  sql/sql_yacc.yy
    1.145.1.54 03/02/04 01:05:33 monty@mashka.mysql.fi +4 -3
    Fixed bug in ulonglong parsing for constructs that only takes unsigned longlong as parameter.

  mysql-test/t/bigint.test
    1.12.1.1 03/02/04 01:05:33 monty@mashka.mysql.fi +11 -1
    Test if big LONG_NUM

  mysql-test/r/bigint.result
    1.14.1.1 03/02/04 01:05:33 monty@mashka.mysql.fi +12 -0
    Test if big LONG_NUM

ChangeSet
  1.1346.46.142 03/02/03 20:54:08 lenz@mysql.com +1 -0
  Merge mysql.com:/space/my/mysql-4.0
  into mysql.com:/space/my/mysql-4.0-build

  configure.in
    1.191.1.65 03/02/03 20:54:04 lenz@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.110.1 03/02/03 20:39:48 lenz@mysql.com +17 -0
   - added support-files/MacOSX to include files specific for building
     MacOSX packages using PackageMaker
   - renamed support-files/PKG -> support-files/SCO (PKG is used in MacOS X
     terminology as well)

  support-files/MacOSX/Makefile.am
    1.1 03/02/03 20:39:46 lenz@mysql.com +37 -0

  support-files/MacOSX/Info.plist.sh
    1.1 03/02/03 20:39:46 lenz@mysql.com +38 -0

  support-files/MacOSX/Description.plist.sh
    1.1 03/02/03 20:39:46 lenz@mysql.com +14 -0

  support-files/Makefile.am
    1.18 03/02/03 20:39:46 lenz@mysql.com +2 -0
     - added MacOSX subdirectory

  support-files/MacOSX/Makefile.am
    1.0 03/02/03 20:39:46 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.0-build/support-files/MacOSX/Makefile.am

  support-files/MacOSX/Info.plist.sh
    1.0 03/02/03 20:39:46 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.0-build/support-files/MacOSX/Info.plist.sh

  support-files/MacOSX/Description.plist.sh
    1.0 03/02/03 20:39:46 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.0-build/support-files/MacOSX/Description.plist.sh

  configure.in
    1.191.11.1 03/02/03 20:39:46 lenz@mysql.com +1 -1
     - added support-files/MacOSX

ChangeSet
  1.1346.109.1 03/02/03 20:20:32 monty@mashka.mysql.fi +8 -0
  Fix for MIN/MAX with empty tables
  MIN(key_column) could in some cases return NULL on a column with NULL and other values.
  MIN(key_column) and MAX(key_column) could in some cases return wrong values when used in OUTER JOIN.

  sql/sql_select.cc
    1.152.1.70 03/02/03 20:20:30 monty@mashka.mysql.fi +6 -0
    Fix for MIN/MAX with empty tables

  sql/opt_sum.cc
    1.16.1.7 03/02/03 20:20:30 monty@mashka.mysql.fi +67 -25
    MIN(key_column) could in some cases return NULL on a column
    with NULL and other values.
    MIN(key_column) and MAX(key_column) could in some cases
    return wrong values when used in OUTER JOIN.
    

  sql/item_sum.h
    1.15.1.3 03/02/03 20:20:30 monty@mashka.mysql.fi +2 -0
    Fix for MIN/MAX with empty tables

  sql/item.h
    1.20.1.15 03/02/03 20:20:30 monty@mashka.mysql.fi +1 -0
    Fix for MIN/MAX with empty tables

  mysql-test/t/func_group.test
    1.4.1.1 03/02/03 20:20:30 monty@mashka.mysql.fi +27 -0
    Added test case for MIN/MAX problems

  mysql-test/r/func_group.result
    1.6.1.1 03/02/03 20:20:30 monty@mashka.mysql.fi +53 -0
    Added test case for MIN/MAX problems

  libmysqld/libmysqld.c
    1.14.2.1 03/02/03 20:20:30 monty@mashka.mysql.fi +1 -1
    Portability fix (for windows)

  configure.in
    1.191.1.64 03/02/03 20:20:30 monty@mashka.mysql.fi +1 -1
    Updated version number

ChangeSet
  1.1346.46.140 03/02/03 18:15:48 gweir@work.mysql.com +1 -0
  Makefile.am:
    Added a conditional to prevent compilation of netware executables

  netware/Makefile.am
    1.4 03/02/03 18:15:04 gweir@work.mysql.com +2 -0
    Added a conditional to prevent compilation of netware executables

  support-files/MacOSX/make_mysql_pkg.pl
    1.3 03/02/03 15:51:19 lenz@mysql.com +0 -0
    Rename: support-files/make_mysql_pkg.pl -> support-files/MacOSX/make_mysql_pkg.pl

  support-files/SCO/version
    1.2 03/02/03 15:50:44 lenz@mysql.com +0 -0
    mvdir

  support-files/SCO/prototype.ini
    1.2 03/02/03 15:50:44 lenz@mysql.com +0 -0
    mvdir

  support-files/SCO/preremove
    1.2 03/02/03 15:50:44 lenz@mysql.com +0 -0
    mvdir

  support-files/SCO/preinstall
    1.2 03/02/03 15:50:44 lenz@mysql.com +0 -0
    mvdir

  support-files/SCO/postinstall
    1.2 03/02/03 15:50:44 lenz@mysql.com +0 -0
    mvdir

  support-files/SCO/pkginfo.ini
    1.2 03/02/03 15:50:44 lenz@mysql.com +0 -0
    mvdir

  support-files/SCO/patch
    1.2 03/02/03 15:50:44 lenz@mysql.com +0 -0
    mvdir

  support-files/SCO/mkpkg.sh
    1.2 03/02/03 15:50:44 lenz@mysql.com +0 -0
    mvdir

  support-files/SCO/doc.sh
    1.2 03/02/03 15:50:44 lenz@mysql.com +0 -0
    mvdir

  support-files/SCO/compile.sh
    1.2 03/02/03 15:50:44 lenz@mysql.com +0 -0
    mvdir

  support-files/SCO/INSTALL.sh
    1.2 03/02/03 15:50:44 lenz@mysql.com +0 -0
    mvdir

ChangeSet
  1.1346.46.139 03/02/03 14:39:15 lenz@mysql.com +1 -0
   - really deleted makefile.w32 to resolve a namespace conflict on 
     case-insensitive File Systems (e.g. Mac OS X)

  BitKeeper/etc/gone
    1.86.7.1 03/02/03 14:37:28 lenz@mysql.com +1 -0

ChangeSet
  1.1422.1.32 03/02/03 12:20:24 lenz@mysql.com +3 -0
   - renamed scripts/fill_func_tables.sh to scripts/fill_help_tables and
     updated all relevant files to honor this change (as discussed with vva)
   - added some more comments to the fill_help_tables script
   - minor cleanups

  scripts/mysql_install_db.sh
    1.37.1.1 03/02/03 12:20:15 lenz@mysql.com +1 -1
     - renamed fill_func_tables.sql -> fill_help_tables.sql (this does not yet
       resolve the problem that mysql_install_db does not find this file in 
       the binary distribution)

  scripts/fill_help_tables.sh
    1.3 03/02/03 12:20:15 lenz@mysql.com +15 -3
     - reflect name change, add some more info about the function of this script

  scripts/Makefile.am
    1.25 03/02/03 12:20:15 lenz@mysql.com +11 -10
     - renamed fill_funct_tables -> fill_help_tables to clarify purpose
       of this script (after discussing this with vva)
     - make sure "make clean" removes both the output and the script
     - fixed tabbing

  scripts/fill_help_tables.sh
    1.2 03/02/03 11:42:02 lenz@mysql.com +0 -0
    Rename: scripts/fill_func_tables.sh -> scripts/fill_help_tables.sh

ChangeSet
  1.1422.1.31 03/02/03 11:32:29 lenz@mysql.com +3 -0
   - added missing files/directories from bdb and libedit to source distribution
   - make sure to not included BK's "SCCS" directories in source distribution

  cmd-line-utils/libedit/Makefile.am
    1.2 03/02/03 11:31:57 lenz@mysql.com +3 -1
     - added missing files to source distribution

  bdb/Makefile.in
    1.6 03/02/03 11:31:57 lenz@mysql.com +7 -6
     - added missing subdirectories to source distribution

  Makefile.am
    1.42 03/02/03 11:31:57 lenz@mysql.com +4 -0
     - make sure to not include BKs "SCCS" directories in the source distribution

ChangeSet
  1.1346.108.1 03/02/03 09:17:47 serg@serg.mysql.com +2 -0
  bug tests added

  mysql-test/t/binary.test
    1.5.1.1 03/02/03 09:17:45 serg@serg.mysql.com +9 -2
    bug tests added

  mysql-test/r/binary.result
    1.8 03/02/03 09:17:45 serg@serg.mysql.com +17 -2
    bug tests added

ChangeSet
  1.1435 03/02/02 23:30:01 bell@sanja.is.com.ua +17 -0
  after-review changes (577 SCRUM)

  sql/sql_yacc.yy
    1.203.1.27 03/02/02 23:29:59 bell@sanja.is.com.ua +1 -1
    typo fixed

  sql/sql_update.cc
    1.77 03/02/02 23:29:59 bell@sanja.is.com.ua +7 -7
    name changed

  sql/sql_union.cc
    1.62 03/02/02 23:29:59 bell@sanja.is.com.ua +9 -8
    name changed
    layout fixed

  sql/sql_select.h
    1.38 03/02/02 23:29:59 bell@sanja.is.com.ua +2 -1
    name changed

  sql/sql_select.cc
    1.200 03/02/02 23:29:59 bell@sanja.is.com.ua +101 -54
    layout fixed
    names changed
    comments inserted
    debugging code removed

  sql/sql_prepare.cc
    1.28 03/02/02 23:29:59 bell@sanja.is.com.ua +0 -1
    layout fixed

  sql/sql_lex.h
    1.102.1.15 03/02/02 23:29:59 bell@sanja.is.com.ua +1 -1
    name changed

  sql/sql_insert.cc
    1.83 03/02/02 23:29:59 bell@sanja.is.com.ua +2 -2
    name changed

  sql/sql_delete.cc
    1.98 03/02/02 23:29:59 bell@sanja.is.com.ua +4 -4
    name changed

  sql/sql_base.cc
    1.139 03/02/02 23:29:59 bell@sanja.is.com.ua +5 -4
    some optimization

  sql/mysql_priv.h
    1.179 03/02/02 23:29:59 bell@sanja.is.com.ua +3 -3
    names changed

  sql/item_sum.cc
    1.57 03/02/02 23:29:59 bell@sanja.is.com.ua +5 -1
    layout fixed
    comment inserted

  sql/item_subselect.cc
    1.55 03/02/02 23:29:59 bell@sanja.is.com.ua +7 -1
    comment inserted

  sql/item_func.cc
    1.105 03/02/02 23:29:59 bell@sanja.is.com.ua +1 -1
    new interface

  sql/item_cmpfunc.cc
    1.66 03/02/02 23:29:59 bell@sanja.is.com.ua +1 -0
    comment

  sql/item.h
    1.54 03/02/02 23:29:59 bell@sanja.is.com.ua +1 -1
    typo fix

  sql/item.cc
    1.54 03/02/02 23:29:59 bell@sanja.is.com.ua +1 -1
    typo fix

ChangeSet
  1.1403.47.14 03/02/02 17:49:42 pem@mysql.com +2 -0
  Added some basic implementation documentation for stored procedures.

  Docs/sp-implemented.txt
    1.1 03/02/02 17:49:41 pem@mysql.com +60 -0

  Docs/sp-imp-spec.txt
    1.1 03/02/02 17:49:41 pem@mysql.com +469 -0

  Docs/sp-implemented.txt
    1.0 03/02/02 17:49:41 pem@mysql.com +0 -0
    BitKeeper file /home/pem/work/mysql-5.0/Docs/sp-implemented.txt

  Docs/sp-imp-spec.txt
    1.0 03/02/02 17:49:41 pem@mysql.com +0 -0
    BitKeeper file /home/pem/work/mysql-5.0/Docs/sp-imp-spec.txt

ChangeSet
  1.1403.47.13 03/02/02 17:44:39 pem@mysql.com +1 -0
  Fixed crash bug when certain procedures are called from the top level.

  sql/sp_head.cc
    1.9 03/02/02 17:44:38 pem@mysql.com +38 -4
    Fixed crash bug when certain procedures are called from the top level.
    Attempted to support global user vars as OUT/INOUT parameters too, but
    unfortunately we can't quite manage that yet.

ChangeSet
  1.1403.47.12 03/02/02 17:41:21 pem@mysql.com +2 -0
  Added another select into test.

  mysql-test/t/sp.test
    1.5 03/02/02 17:41:19 pem@mysql.com +19 -7
    Added another test for select into (mixed variable types), and made into_test
    independent of previous tests.

  mysql-test/r/sp.result
    1.5 03/02/02 17:41:19 pem@mysql.com +20 -11
    Added another test for select into (mixed variable types), and made into_test
    independent of previous tests.

ChangeSet
  1.1434 03/02/02 17:39:27 bell@sanja.is.com.ua +6 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-select-4.1

  sql/sql_yacc.yy
    1.203.1.26 03/02/02 17:39:25 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.262 03/02/02 17:39:24 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_class.h
    1.143 03/02/02 17:39:24 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_class.cc
    1.102 03/02/02 17:39:24 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/log_event.cc
    1.100 03/02/02 17:39:24 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.104 03/02/02 17:39:24 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.107.1 03/02/02 05:13:09 monty@mashka.mysql.fi +2 -0
  Fixed core dump bug in 'mysql' when using \p in prompt on Windows.
  Fixed error when mysql_unix_port pointed to const string (not uncommon on windows)
  

  sql/mysqld.cc
    1.297.1.99 03/02/02 05:13:08 monty@mashka.mysql.fi +3 -3
    Fixed error when mysql_unix_port pointed to const string.

  client/mysql.cc
    1.93.1.36 03/02/02 05:13:08 monty@mashka.mysql.fi +5 -2
    Fixed core dump bug when using \p in prompt on Windows.

ChangeSet
  1.1346.46.136 03/02/01 00:42:26 gweir@work.mysql.com +14 -0
  Many files:
    new file
  Makefile.am:
    Changes from Novell diff

  BitKeeper/etc/logging_ok
    1.206.17.12 03/02/01 00:42:26 gweir@work.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  netware/test_db.sql
    1.1 03/02/01 00:40:59 gweir@work.mysql.com +17 -0

  netware/overlay.tar.gz
    1.1 03/02/01 00:40:59 gweir@work.mysql.com +53 -0

  netware/mysqld_safe.c
    1.1 03/02/01 00:40:59 gweir@work.mysql.com +662 -0

  netware/mysql_test_run.c
    1.1 03/02/01 00:40:59 gweir@work.mysql.com +1150 -0

  netware/mysql_secure_installation.pl
    1.1 03/02/01 00:40:59 gweir@work.mysql.com +219 -0

  netware/mysql_install_db.c
    1.1 03/02/01 00:40:59 gweir@work.mysql.com +437 -0

  netware/my_manage.h
    1.1 03/02/01 00:40:59 gweir@work.mysql.com +83 -0

  netware/my_manage.c
    1.1 03/02/01 00:40:59 gweir@work.mysql.com +477 -0

  netware/libmysqlmain.c
    1.1 03/02/01 00:40:59 gweir@work.mysql.com +38 -0

  netware/libmysql.imp
    1.1 03/02/01 00:40:59 gweir@work.mysql.com +85 -0

  netware/install_test_db.ncf
    1.1 03/02/01 00:40:59 gweir@work.mysql.com +1 -0

  netware/test_db.sql
    1.0 03/02/01 00:40:59 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/test_db.sql

  netware/overlay.tar.gz
    1.0 03/02/01 00:40:59 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/overlay.tar.gz

  netware/mysqld_safe.c
    1.0 03/02/01 00:40:59 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/mysqld_safe.c

  netware/mysql_test_run.c
    1.0 03/02/01 00:40:59 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/mysql_test_run.c

  netware/mysql_secure_installation.pl
    1.0 03/02/01 00:40:59 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/mysql_secure_installation.pl

  netware/mysql_install_db.c
    1.0 03/02/01 00:40:59 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/mysql_install_db.c

  netware/my_manage.h
    1.0 03/02/01 00:40:59 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/my_manage.h

  netware/my_manage.c
    1.0 03/02/01 00:40:59 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/my_manage.c

  netware/libmysqlmain.c
    1.0 03/02/01 00:40:59 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/libmysqlmain.c

  netware/libmysql.imp
    1.0 03/02/01 00:40:59 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/libmysql.imp

  netware/install_test_db.ncf
    1.0 03/02/01 00:40:59 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/install_test_db.ncf

  netware/init_db.sql
    1.1 03/02/01 00:40:58 gweir@work.mysql.com +22 -0

  netware/init_db.sql
    1.0 03/02/01 00:40:58 gweir@work.mysql.com +0 -0
    BitKeeper file /home/gweir/bk/mysql-4.0/netware/init_db.sql

  netware/Makefile.am
    1.3 03/02/01 00:34:30 gweir@work.mysql.com +22 -18
    Changes from Novell diff

ChangeSet
  1.1422.1.30 03/01/31 15:20:03 venu@myvenu.com +2 -0
  Force to read all unread packets on stmt_close

  libmysql/libmysql.c
    1.141 03/01/31 15:15:20 venu@myvenu.com +27 -7
    Force to read all unread packets on stmt_close

  tests/client_test.c
    1.23 03/01/31 15:14:55 venu@myvenu.com +17 -4
    tests for un cleared packets

  tests/client_test.c
    1.22 03/01/31 14:32:10 venu@myvenu.com +29 -4
    Added one more missed scenario

ChangeSet
  1.1422.1.29 03/01/31 13:43:38 venu@myvenu.com +2 -0
  Few misc cases check from PHP - client_test
  Fix the buffer_length ovveride when length ptr is NULL - libmysql

  tests/client_test.c
    1.21 03/01/31 13:39:58 venu@myvenu.com +119 -2
    Few misc cases check from PHP

  libmysql/libmysql.c
    1.140 03/01/31 13:39:26 venu@myvenu.com +2 -1
    Fix the buffer_length ovveride when length ptr is NULL

ChangeSet
  1.1422.5.2 03/01/31 10:15:45 venu@myvenu.com +1 -0
    Fix typo - un supported -> unsupported

  libmysql/errmsg.c
    1.21 03/01/31 10:14:50 venu@myvenu.com +3 -3
    Fix typo - un supported -> unsupported

ChangeSet
  1.1422.1.27 03/01/31 17:37:28 bar@bar.mysql.r18.ru +1 -0
  Some USE_MB have been removed.

  sql/item_strfunc.cc
    1.71 03/01/31 17:37:26 bar@bar.mysql.r18.ru +10 -31
    Some USE_MB have been removed.

ChangeSet
  1.1422.1.26 03/01/31 17:08:14 bar@bar.mysql.r18.ru +3 -0
  More use of new CHARSET_INFO functions and two bug fixes

  strings/ctype-utf8.c
    1.34 03/01/31 17:08:11 bar@bar.mysql.r18.ru +1 -1
    Bug fix

  strings/ctype-mb.c
    1.8 03/01/31 17:08:11 bar@bar.mysql.r18.ru +3 -5
    Bug fix

  sql/sql_string.cc
    1.48 03/01/31 17:08:11 bar@bar.mysql.r18.ru +3 -36
    More use of new CHARSET_INFO functions

ChangeSet
  1.1422.1.25 03/01/31 16:22:22 bar@bar.mysql.r18.ru +18 -0
  New functions in CHARSET_INFO structure

  strings/ctype-win1250ch.c
    1.18 03/01/31 16:22:19 bar@bar.mysql.r18.ru +2 -0
    New functions in CHARSET_INFO structure

  strings/ctype-utf8.c
    1.33 03/01/31 16:22:19 bar@bar.mysql.r18.ru +19 -0
    New functions in CHARSET_INFO structure

  strings/ctype-ujis.c
    1.30 03/01/31 16:22:19 bar@bar.mysql.r18.ru +2 -0
    New functions in CHARSET_INFO structure

  strings/ctype-tis620.c
    1.36 03/01/31 16:22:19 bar@bar.mysql.r18.ru +2 -0
    New functions in CHARSET_INFO structure

  strings/ctype-sjis.c
    1.37 03/01/31 16:22:19 bar@bar.mysql.r18.ru +2 -0
    New functions in CHARSET_INFO structure

  strings/ctype-simple.c
    1.30 03/01/31 16:22:19 bar@bar.mysql.r18.ru +15 -1
    New functions in CHARSET_INFO structure

  strings/ctype-mb.c
    1.7 03/01/31 16:22:19 bar@bar.mysql.r18.ru +28 -0
    New functions in CHARSET_INFO structure

  strings/ctype-latin1_de.c
    1.27 03/01/31 16:22:19 bar@bar.mysql.r18.ru +2 -0
    New functions in CHARSET_INFO structure

  strings/ctype-latin1.c
    1.4 03/01/31 16:22:19 bar@bar.mysql.r18.ru +2 -0
    New functions in CHARSET_INFO structure

  strings/ctype-gbk.c
    1.32 03/01/31 16:22:19 bar@bar.mysql.r18.ru +2 -0
    New functions in CHARSET_INFO structure

  strings/ctype-gb2312.c
    1.28 03/01/31 16:22:19 bar@bar.mysql.r18.ru +2 -0
    New functions in CHARSET_INFO structure

  strings/ctype-extra.c
    1.4 03/01/31 16:22:19 bar@bar.mysql.r18.ru +8 -1
    New functions in CHARSET_INFO structure

  strings/ctype-euc_kr.c
    1.30 03/01/31 16:22:19 bar@bar.mysql.r18.ru +2 -0
    New functions in CHARSET_INFO structure

  strings/ctype-czech.c
    1.30 03/01/31 16:22:19 bar@bar.mysql.r18.ru +2 -0
    New functions in CHARSET_INFO structure

  strings/ctype-bin.c
    1.21 03/01/31 16:22:19 bar@bar.mysql.r18.ru +2 -0
    New functions in CHARSET_INFO structure

  strings/ctype-big5.c
    1.32 03/01/31 16:22:19 bar@bar.mysql.r18.ru +2 -0
    New functions in CHARSET_INFO structure

  mysys/charset.c
    1.68 03/01/31 16:22:19 bar@bar.mysql.r18.ru +2 -0
    New functions in CHARSET_INFO structure

  include/m_ctype.h
    1.60 03/01/31 16:22:18 bar@bar.mysql.r18.ru +8 -0
    New functions in CHARSET_INFO structure

ChangeSet
  1.1422.7.1 03/01/31 14:07:07 gluh@gluh.mysql.r18.ru +7 -0
  Changed ROW_RESULT to default

  sql/sql_select.cc
    1.189.1.3 03/01/31 14:07:05 gluh@gluh.mysql.r18.ru +2 -2
    Changed ROW_RESULT to default

  sql/sql_lex.cc
    1.66.1.1 03/01/31 14:07:05 gluh@gluh.mysql.r18.ru +1 -1
    Changed ROW_RESULT to default

  sql/log_event.cc
    1.98.1.4 03/01/31 14:07:05 gluh@gluh.mysql.r18.ru +4 -4
    Changed ROW_RESULT to default

  sql/item_sum.cc
    1.54.1.1 03/01/31 14:07:05 gluh@gluh.mysql.r18.ru +4 -4
    Changed ROW_RESULT to default

  sql/item_func.cc
    1.96.1.4 03/01/31 14:07:05 gluh@gluh.mysql.r18.ru +8 -8
    Changed ROW_RESULT to default

  sql/item_cmpfunc.cc
    1.57.1.3 03/01/31 14:07:05 gluh@gluh.mysql.r18.ru +7 -1
    Changed ROW_RESULT to default
    Add some dafult case

  sql/filesort.cc
    1.65 03/01/31 14:07:05 gluh@gluh.mysql.r18.ru +2 -2
    Changed ROW_RESULT to default

ChangeSet
  1.1422.1.24 03/01/31 14:01:49 bar@bar.mysql.r18.ru +1 -0
  sql_string.cc:
    Use of new CHARSET_INFO function

  sql/sql_string.cc
    1.47 03/01/31 14:01:28 bar@bar.mysql.r18.ru +4 -60
    Use of new CHARSET_INFO function

ChangeSet
  1.1422.6.1 03/01/31 13:48:35 bar@bar.mysql.r18.ru +17 -0
  New CHARSET_INFO function to compare strings regardless to trailing spaces

  strings/ctype-win1250ch.c
    1.17 03/01/31 13:48:32 bar@bar.mysql.r18.ru +12 -0
    New CHARSET_INFO function to compare strings regardless to trailing spaces

  strings/ctype-utf8.c
    1.32 03/01/31 13:48:32 bar@bar.mysql.r18.ru +13 -0
    New CHARSET_INFO function to compare strings regardless to trailing spaces

  strings/ctype-ujis.c
    1.29 03/01/31 13:48:32 bar@bar.mysql.r18.ru +2 -1
    New CHARSET_INFO function to compare strings regardless to trailing spaces

  strings/ctype-tis620.c
    1.35 03/01/31 13:48:32 bar@bar.mysql.r18.ru +12 -0
    New CHARSET_INFO function to compare strings regardless to trailing spaces

  strings/ctype-sjis.c
    1.36 03/01/31 13:48:32 bar@bar.mysql.r18.ru +11 -0
    New CHARSET_INFO function to compare strings regardless to trailing spaces

  strings/ctype-simple.c
    1.29 03/01/31 13:48:32 bar@bar.mysql.r18.ru +20 -0
    New CHARSET_INFO function to compare strings regardless to trailing spaces

  strings/ctype-latin1_de.c
    1.26 03/01/31 13:48:32 bar@bar.mysql.r18.ru +11 -0
    New CHARSET_INFO function to compare strings regardless to trailing spaces

  strings/ctype-latin1.c
    1.3 03/01/31 13:48:32 bar@bar.mysql.r18.ru +1 -0
    New CHARSET_INFO function to compare strings regardless to trailing spaces

  strings/ctype-gbk.c
    1.31 03/01/31 13:48:32 bar@bar.mysql.r18.ru +11 -0
    New CHARSET_INFO function to compare strings regardless to trailing spaces

  strings/ctype-gb2312.c
    1.27 03/01/31 13:48:32 bar@bar.mysql.r18.ru +1 -0
    New CHARSET_INFO function to compare strings regardless to trailing spaces

  strings/ctype-extra.c
    1.3 03/01/31 13:48:31 bar@bar.mysql.r18.ru +24 -0
    New CHARSET_INFO function to compare strings regardless to trailing spaces

  strings/ctype-euc_kr.c
    1.29 03/01/31 13:48:31 bar@bar.mysql.r18.ru +1 -0
    New CHARSET_INFO function to compare strings regardless to trailing spaces

  strings/ctype-czech.c
    1.29 03/01/31 13:48:31 bar@bar.mysql.r18.ru +13 -0
    New CHARSET_INFO function to compare strings regardless to trailing spaces

  strings/ctype-bin.c
    1.20 03/01/31 13:48:31 bar@bar.mysql.r18.ru +1 -0
    New CHARSET_INFO function to compare strings regardless to trailing spaces

  strings/ctype-big5.c
    1.31 03/01/31 13:48:31 bar@bar.mysql.r18.ru +11 -0
    New CHARSET_INFO function to compare strings regardless to trailing spaces

  mysys/charset.c
    1.67 03/01/31 13:48:31 bar@bar.mysql.r18.ru +1 -0
    New CHARSET_INFO function to compare strings regardless to trailing spaces

  include/m_ctype.h
    1.59 03/01/31 13:48:31 bar@bar.mysql.r18.ru +5 -0
    New CHARSET_INFO function to compare strings regardless to trailing spaces

ChangeSet
  1.1422.1.22 03/01/31 00:52:54 venu@myvenu.com +1 -0
  Merge work.mysql.com:/home/bk/mysql-4.1
  into myvenu.com:/home/venu/bk/src-4.1

  sql/sql_parse.cc
    1.254.1.6 03/01/31 00:52:48 venu@myvenu.com +0 -0
    Auto merged

ChangeSet
  1.1422.5.1 03/01/31 00:36:07 venu@myvenu.com +1 -0
  Merge myvenu.com:/home/venu/bk/src-4.1
  into myvenu.com:/home/venu/work/sql/dev-4.1

  sql/sql_parse.cc
    1.254.4.1 03/01/31 00:36:02 venu@myvenu.com +0 -0
    Auto merged

ChangeSet
  1.1422.4.2 03/01/31 00:35:06 venu@myvenu.com +2 -0
    Fix for subsequent error calls in multi-query

  tests/client_test.c
    1.20 03/01/31 00:34:03 venu@myvenu.com +32 -20
    Misc cleanups

  sql/sql_parse.cc
    1.254.3.1 03/01/31 00:33:17 venu@myvenu.com +1 -0
    Fix for subsequent errors calls in multi-query

ChangeSet
  1.1422.1.21 03/01/31 11:43:46 bar@bar.mysql.r18.ru +2 -0
  ctype-simple.c:
    CC comments -> C comments
  ctype-latin1_de.c:
    like_range was the same with like_range_simple
    so I've removed duplicated code

  strings/ctype-simple.c
    1.28 03/01/31 11:43:26 bar@bar.mysql.r18.ru +15 -15
    CC comments -> C comments

  strings/ctype-latin1_de.c
    1.25 03/01/31 11:42:53 bar@bar.mysql.r18.ru +1 -76
    like_range was the same with like_range_simple
    so I've removed duplicated code

ChangeSet
  1.1422.1.20 03/01/31 11:41:39 bar@bar.mysql.r18.ru +2 -0
  Gluh asked me to do it

  sql/log_event.cc
    1.98.1.3 03/01/31 11:41:27 bar@bar.mysql.r18.ru +3 -4
    Gluh asked me to do it

  client/mysqlbinlog.cc
    1.73 03/01/31 11:41:27 bar@bar.mysql.r18.ru +1 -0
    Gluh asked me to do it

ChangeSet
  1.1422.1.19 03/01/31 10:28:13 gluh@gluh.mysql.r18.ru +1 -0
  Fix for mysqlbinlog compilation

  sql/log_event.cc
    1.98.1.2 03/01/31 10:28:12 gluh@gluh.mysql.r18.ru +2 -1
    Fix for mysqlbinlog compilation

ChangeSet
  1.1422.1.18 03/01/31 09:43:53 gluh@gluh.mysql.r18.ru +9 -0
  conflicts resolving 

  sql/sql_parse.cc
    1.254.1.5 03/01/31 09:43:51 gluh@gluh.mysql.r18.ru +2 -1
    merged

  sql/log_event.cc
    1.98.1.1 03/01/31 09:43:51 gluh@gluh.mysql.r18.ru +3 -1
    merged

  sql/sql_class.h
    1.137.1.2 03/01/31 09:18:41 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_class.cc
    1.99.1.1 03/01/31 09:18:41 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/log_event.h
    1.81 03/01/31 09:18:41 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/log.cc
    1.101 03/01/31 09:18:41 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  sql/item_func.cc
    1.96.1.3 03/01/31 09:18:40 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  include/my_sys.h
    1.87 03/01/31 09:18:40 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.232 03/01/31 09:18:32 gluh@gluh.mysql.r18.ru +0 -1
    auto-union

ChangeSet
  1.1422.4.1 03/01/30 14:33:49 venu@myvenu.com +2 -0
  Fix alloc_stmt_fields for non-select statements
  Add tests for show commands + MYSQL_TYPE_NULL coverage

  libmysql/libmysql.c
    1.139 03/01/30 14:32:29 venu@myvenu.com +27 -6
    Fix alloc_stmt_fields for non-select statements

  tests/client_test.c
    1.19 03/01/30 14:30:30 venu@myvenu.com +101 -25
    Add tests for show commands + MYSQL_TYPE_NULL coverage

ChangeSet
  1.1433 03/01/30 22:15:44 bell@sanja.is.com.ua +22 -0
  fixed bug in determinating uncacheable queries
  new fatal_error interface to assign is_fatal_error and ne.report_error
  commant about Item_row

  sql/thr_malloc.cc
    1.10 03/01/30 22:15:42 bell@sanja.is.com.ua +1 -1
    new fatal_error interface to assign is_fatal_error and ne.report_error

  sql/sql_update.cc
    1.76 03/01/30 22:15:42 bell@sanja.is.com.ua +4 -4
    new fatal_error interface to assign is_fatal_error and ne.report_error

  sql/sql_union.cc
    1.61 03/01/30 22:15:42 bell@sanja.is.com.ua +3 -3
    new fatal_error interface to assign is_fatal_error and ne.report_error

  sql/sql_show.cc
    1.106 03/01/30 22:15:42 bell@sanja.is.com.ua +1 -1
    new fatal_error interface to assign is_fatal_error and ne.report_error

  sql/sql_select.cc
    1.199 03/01/30 22:15:42 bell@sanja.is.com.ua +12 -12
    new fatal_error interface to assign is_fatal_error and ne.report_error

  sql/sql_prepare.cc
    1.27 03/01/30 22:15:42 bell@sanja.is.com.ua +1 -1
    new fatal_error interface to assign is_fatal_error and ne.report_error

  sql/sql_parse.cc
    1.261 03/01/30 22:15:42 bell@sanja.is.com.ua +10 -10
    new fatal_error interface to assign is_fatal_error and ne.report_error

  sql/sql_lex.h
    1.102.1.14 03/01/30 22:15:42 bell@sanja.is.com.ua +12 -2
    fixed bug in determinating uncacheable queries

  sql/sql_insert.cc
    1.82 03/01/30 22:15:42 bell@sanja.is.com.ua +11 -11
    new fatal_error interface to assign is_fatal_error and ne.report_error

  sql/sql_delete.cc
    1.97 03/01/30 22:15:42 bell@sanja.is.com.ua +1 -1
    new fatal_error interface to assign is_fatal_error and ne.report_error

  sql/sql_class.h
    1.142 03/01/30 22:15:42 bell@sanja.is.com.ua +6 -1
    new fatal_error interface to assign is_fatal_error and ne.report_error

  sql/sql_class.cc
    1.101 03/01/30 22:15:42 bell@sanja.is.com.ua +1 -1
    new fatal_error interface to assign is_fatal_error and ne.report_error

  sql/sql_base.cc
    1.138 03/01/30 22:15:42 bell@sanja.is.com.ua +2 -2
    new fatal_error interface to assign is_fatal_error and ne.report_error

  sql/protocol.cc
    1.41 03/01/30 22:15:42 bell@sanja.is.com.ua +3 -3
    new fatal_error interface to assign is_fatal_error and ne.report_error

  sql/mysqld.cc
    1.329 03/01/30 22:15:42 bell@sanja.is.com.ua +1 -1
    new fatal_error interface to assign is_fatal_error and ne.report_error

  sql/log_event.cc
    1.99 03/01/30 22:15:42 bell@sanja.is.com.ua +2 -2
    new fatal_error interface to assign is_fatal_error and ne.report_error

  sql/item_subselect.cc
    1.54 03/01/30 22:15:42 bell@sanja.is.com.ua +3 -9
    new fatal_error interface to assign is_fatal_error and ne.report_error
    (message should be sent by allocate routine

  sql/item_row.cc
    1.13 03/01/30 22:15:42 bell@sanja.is.com.ua +9 -0
    comment about row

  sql/item_func.cc
    1.103 03/01/30 22:15:42 bell@sanja.is.com.ua +2 -2
    new fatal_error interface to assign is_fatal_error and ne.report_error

  sql/item.cc
    1.53 03/01/30 22:15:42 bell@sanja.is.com.ua +2 -2
    new fatal_error interface to assign is_fatal_error and ne.report_error

  mysql-test/t/subselect.test
    1.54 03/01/30 22:15:42 bell@sanja.is.com.ua +6 -0
    test of inheritence of uncacheability

  mysql-test/r/subselect.result
    1.61 03/01/30 22:15:42 bell@sanja.is.com.ua +9 -0
    test of inheritence of uncacheability

ChangeSet
  1.1346.46.135 03/01/30 19:34:19 serg@serg.mysql.com +3 -0
  fixed crash with blobs in compressed table

  myisam/myisamdef.h
    1.45.1.11 03/01/30 19:34:16 serg@serg.mysql.com +1 -2
    fixed crash with blobs in compressed table

  myisam/mi_packrec.c
    1.19 03/01/30 19:34:16 serg@serg.mysql.com +5 -7
    fixed crash with blobs in compressed table

  myisam/mi_check.c
    1.86.1.27 03/01/30 19:34:16 serg@serg.mysql.com +2 -2
    fixed crash with blobs in compressed table

ChangeSet
  1.1403.74.1 03/01/30 21:39:54 gluh@gluh.mysql.r18.ru +12 -0
  'Replicate user variables' task

  BitKeeper/etc/logging_ok
    1.212.21.1 03/01/30 21:39:54 gluh@gluh.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  mysql-test/t/rpl_user_variables.test
    1.1 03/01/30 21:39:40 gluh@gluh.mysql.r18.ru +39 -0

  mysql-test/r/rpl_user_variables.result
    1.1 03/01/30 21:39:40 gluh@gluh.mysql.r18.ru +78 -0

  sql/unireg.h
    1.18 03/01/30 21:39:40 gluh@gluh.mysql.r18.ru +2 -0
    'Replicate user variables' task

  sql/sql_parse.cc
    1.235.40.1 03/01/30 21:39:40 gluh@gluh.mysql.r18.ru +6 -0
    'Replicate user variables' task

  sql/sql_class.h
    1.123.14.1 03/01/30 21:39:40 gluh@gluh.mysql.r18.ru +12 -1
    'Replicate user variables' task

  sql/sql_class.cc
    1.82.11.1 03/01/30 21:39:40 gluh@gluh.mysql.r18.ru +12 -0
    'Replicate user variables' task

  sql/log_event.h
    1.76.3.1 03/01/30 21:39:40 gluh@gluh.mysql.r18.ru +49 -1
    'Replicate user variables' task

  sql/log_event.cc
    1.91.6.1 03/01/30 21:39:40 gluh@gluh.mysql.r18.ru +240 -0
    'Replicate user variables' task

  sql/log.cc
    1.92.2.1 03/01/30 21:39:40 gluh@gluh.mysql.r18.ru +17 -0
    'Replicate user variables' task

  sql/item_func.cc
    1.90.5.1 03/01/30 21:39:40 gluh@gluh.mysql.r18.ru +47 -2
    'Replicate user variables' task

  mysql-test/t/rpl_user_variables.test
    1.0 03/01/30 21:39:40 gluh@gluh.mysql.r18.ru +0 -0
    BitKeeper file /home/gluh/mysql-4.1.uvar/mysql-test/t/rpl_user_variables.test

  mysql-test/r/rpl_user_variables.result
    1.0 03/01/30 21:39:40 gluh@gluh.mysql.r18.ru +0 -0
    BitKeeper file /home/gluh/mysql-4.1.uvar/mysql-test/r/rpl_user_variables.result

  include/my_sys.h
    1.82.1.1 03/01/30 21:39:40 gluh@gluh.mysql.r18.ru +1 -0
    Addet reset_dinamic

ChangeSet
  1.1422.1.16 03/01/30 18:52:45 heikki@hundin.mysql.fi +4 -0
  config-win.h, os0proc.h, os0proc.c, srv0start.c:
    Make AWE compilation depend on __WIN2000__

  include/config-win.h
    1.27 03/01/30 18:50:47 heikki@hundin.mysql.fi +6 -0
    Make AWE compilation depend on __WIN2000__

  innobase/include/os0proc.h
    1.5 03/01/30 18:50:34 heikki@hundin.mysql.fi +1 -1
    Make AWE compilation depend on __WIN2000__

  innobase/os/os0proc.c
    1.6 03/01/30 18:50:26 heikki@hundin.mysql.fi +10 -10
    Make AWE compilation depend on __WIN2000__

  innobase/srv/srv0start.c
    1.39 03/01/30 18:50:17 heikki@hundin.mysql.fi +1 -1
    Make AWE compilation depend on __WIN2000__

ChangeSet
  1.1422.1.15 03/01/30 21:23:58 wax@mysql.com +3 -0
  Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4rw

  sql/sql_yacc.yy
    1.203.21.2 03/01/30 21:23:54 wax@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.254.1.4 03/01/30 21:23:54 wax@mysql.com +0 -0
    Auto merged

  sql/item_func.cc
    1.96.1.2 03/01/30 21:23:54 wax@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1432 03/01/30 18:19:28 bell@sanja.is.com.ua +2 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-select-4.1

  sql/sql_prepare.cc
    1.26 03/01/30 18:19:27 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_class.h
    1.141 03/01/30 18:19:26 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1422.3.1 03/01/30 21:15:21 wax@mysql.com +4 -0
  Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4rw

  sql/sql_yacc.yy
    1.203.22.1 03/01/30 21:15:18 wax@mysql.com +0 -0
    Auto merged

  sql/sql_udf.cc
    1.24 03/01/30 21:15:17 wax@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.254.2.1 03/01/30 21:15:17 wax@mysql.com +0 -0
    Auto merged

  sql/item_func.cc
    1.96.2.1 03/01/30 21:15:17 wax@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1431 03/01/30 18:07:39 bell@sanja.is.com.ua +10 -0
  changes based on partial revie of task 577 (SCRUM)

  sql/sql_select.cc
    1.198 03/01/30 18:07:37 bell@sanja.is.com.ua +10 -10
    removed counter-1 and unnessesary initializaton of counter
    THD pointetr added to get_tmp_table_item and change_to_use_tmp_fields.

  sql/sql_base.cc
    1.137 03/01/30 18:07:37 bell@sanja.is.com.ua +1 -3
    count from 0

  sql/item_uniq.h
    1.11 03/01/30 18:07:37 bell@sanja.is.com.ua +6 -2
    Fixed copy constructor to receive THD pointer via arguments.
    Renamed get_same to copy_or_same.
    THD pointetr added to copy_or_same and get_tmp_table_item.

  sql/item_sum.h
    1.31 03/01/30 18:07:37 bell@sanja.is.com.ua +62 -51
    fixed layout
    Fixed copy constructor to receive THD pointer via arguments.
    Renamed get_same to copy_or_same.
    THD pointetr added to copy_or_same and get_tmp_table_item.

  sql/item_sum.cc
    1.56 03/01/30 18:07:37 bell@sanja.is.com.ua +5 -4
    Fixed copy constructor to receive THD pointer via arguments.
    Renamed get_same to copy_or_same.
    THD pointetr added to copy_or_same and get_tmp_table_item.

  sql/item_func.h
    1.65 03/01/30 18:07:37 bell@sanja.is.com.ua +1 -1
    THD pointetr added to get_tmp_table_item.

  sql/item_func.cc
    1.102 03/01/30 18:07:36 bell@sanja.is.com.ua +2 -5
    fiex layout
    THD pointetr added to get_tmp_table_item.

  sql/item_cmpfunc.cc
    1.65 03/01/30 18:07:36 bell@sanja.is.com.ua +3 -6
    fixed layout
    fixed direct call of destructor

  sql/item.h
    1.53 03/01/30 18:07:36 bell@sanja.is.com.ua +26 -15
    Fixed copy constructor to receive THD pointer via arguments.
    Renamed get_same to copy_or_same.
    THD pointetr added to copy_or_same and get_tmp_table_item.

  sql/item.cc
    1.52 03/01/30 18:07:36 bell@sanja.is.com.ua +33 -19
    Fixed Item usual constructor to call current_thd only once.
    Fixed copy constructor to receive THD pointer via arguments.
    added comments
    removed counter-1 and unnessesary initializaton of counter

ChangeSet
  1.1346.46.134 03/01/30 16:02:11 serg@serg.mysql.com +1 -0
  Merge work:/home/bk/mysql-4.0
  into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

  sql/ha_innodb.cc
    1.73.1.75 03/01/30 16:02:09 serg@serg.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1430 03/01/30 14:35:07 bell@sanja.is.com.ua +18 -0
  cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation

  sql/sql_select.h
    1.37 03/01/30 14:35:05 bell@sanja.is.com.ua +0 -1
    cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation

  sql/sql_select.cc
    1.197 03/01/30 14:35:05 bell@sanja.is.com.ua +0 -35
    cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation

  sql/sql_parse.cc
    1.260 03/01/30 14:35:05 bell@sanja.is.com.ua +4 -6
    cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation

  sql/sql_class.h
    1.140 03/01/30 14:35:05 bell@sanja.is.com.ua +0 -4
    cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation

  sql/sql_class.cc
    1.100 03/01/30 14:35:05 bell@sanja.is.com.ua +0 -8
    cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation

  sql/item_subselect.h
    1.27 03/01/30 14:35:05 bell@sanja.is.com.ua +0 -4
    cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation

  sql/item_subselect.cc
    1.53 03/01/30 14:35:05 bell@sanja.is.com.ua +0 -24
    cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation

  sql/item_strfunc.h
    1.42 03/01/30 14:35:04 bell@sanja.is.com.ua +0 -21
    cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation

  sql/item_row.h
    1.10 03/01/30 14:35:04 bell@sanja.is.com.ua +0 -1
    cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation

  sql/item_row.cc
    1.12 03/01/30 14:35:04 bell@sanja.is.com.ua +0 -10
    cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation

  sql/item_func.h
    1.64 03/01/30 14:35:04 bell@sanja.is.com.ua +0 -9
    cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation

  sql/item_func.cc
    1.101 03/01/30 14:35:04 bell@sanja.is.com.ua +0 -31
    cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation

  sql/item_cmpfunc.h
    1.42 03/01/30 14:35:04 bell@sanja.is.com.ua +0 -9
    cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation

  sql/item_cmpfunc.cc
    1.64 03/01/30 14:35:04 bell@sanja.is.com.ua +0 -25
    cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation

  sql/item.h
    1.52 03/01/30 14:35:04 bell@sanja.is.com.ua +0 -6
    cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation

  sql/item.cc
    1.51 03/01/30 14:35:04 bell@sanja.is.com.ua +0 -23
    cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation

  mysql-test/t/subselect.test
    1.53 03/01/30 14:35:04 bell@sanja.is.com.ua +2 -0
    test of cyclic reference false alarm

  mysql-test/r/subselect.result
    1.60 03/01/30 14:35:04 bell@sanja.is.com.ua +3 -0
    test of cyclic reference false alarm

ChangeSet
  1.1422.1.14 03/01/30 01:02:57 venu@myvenu.com +1 -0
  Merge conflict

  tests/client_test.c
    1.18 03/01/30 01:02:48 venu@myvenu.com +0 -3
    Merge conflict

ChangeSet
  1.1417.13.4 03/01/30 00:41:14 venu@myvenu.com +1 -0
  Tests for 'n' concurrent statement execution

  tests/client_test.c
    1.16.1.1 03/01/30 00:40:39 venu@myvenu.com +124 -64
    Tests for 'n' concurrent statement execution

ChangeSet
  1.1417.13.3 03/01/30 00:38:11 venu@myvenu.com +4 -0
  Fix 'n' concurrent prepared executions

  libmysql/libmysql.c
    1.138 03/01/30 00:37:11 venu@myvenu.com +35 -5
    Fix the result meta info for non-SELECT statements

  libmysql/errmsg.c
    1.20 03/01/30 00:36:58 venu@myvenu.com +3 -3
    Fix the missing semicolon for errors

  sql/sql_prepare.cc
    1.21.1.2 03/01/30 00:35:40 venu@myvenu.com +9 -13
    Fix 'n' concurrent executions

  sql/sql_class.h
    1.137.1.1 03/01/30 00:35:37 venu@myvenu.com +1 -0

ChangeSet
  1.1422.1.13 03/01/30 11:15:14 bar@bar.mysql.r18.ru +8 -0
  Always use USE_STRCOLL code

  sql/sql_string.cc
    1.46 03/01/30 11:15:11 bar@bar.mysql.r18.ru +0 -4
    Always use USE_STRCOLL code

  sql/sql_sort.h
    1.3 03/01/30 11:15:11 bar@bar.mysql.r18.ru +0 -2
    Always use USE_STRCOLL code

  sql/filesort.cc
    1.64 03/01/30 11:15:11 bar@bar.mysql.r18.ru +0 -15
    Always use USE_STRCOLL code

  isam/_search.c
    1.12 03/01/30 11:15:11 bar@bar.mysql.r18.ru +0 -4
    Always use USE_STRCOLL code

  isam/_key.c
    1.8 03/01/30 11:15:11 bar@bar.mysql.r18.ru +0 -6
    Always use USE_STRCOLL code

  configure.in
    1.201.1.16 03/01/30 11:15:11 bar@bar.mysql.r18.ru +0 -3
    Always use USE_STRCOLL code

  client/sql_string.cc
    1.17 03/01/30 11:15:11 bar@bar.mysql.r18.ru +0 -4
    Always use USE_STRCOLL code

  acconfig.h
    1.32 03/01/30 11:15:11 bar@bar.mysql.r18.ru +0 -3
    Always use USE_STRCOLL code

ChangeSet
  1.1422.1.12 03/01/30 10:47:15 bar@bar.mysql.r18.ru +1 -0
  Optimization of unicode conversion

  strings/ctype-latin1.c
    1.2 03/01/30 10:47:13 bar@bar.mysql.r18.ru +30 -11
    Optimization of unicode conversion

ChangeSet
  1.1422.1.11 03/01/30 10:19:14 bar@bar.mysql.r18.ru +1 -0

  strings/conf_to_src.c
    1.11 03/01/30 10:18:37 bar@bar.mysql.r18.ru +29 -11

ChangeSet
  1.1422.1.10 03/01/30 10:04:02 bar@bar.mysql.r18.ru +1 -0
  cp1256.xml:
    Fix

  sql/share/charsets/cp1256.xml
    1.2 03/01/30 10:03:47 bar@bar.mysql.r18.ru +1 -1
    Fix

ChangeSet
  1.1422.1.9 03/01/29 21:17:46 bell@sanja.is.com.ua +1 -0
  fixed compiler error

  sql/sql_cache.cc
    1.39.1.8 03/01/29 21:17:38 bell@sanja.is.com.ua +3 -1
    fixed compiler error

ChangeSet
  1.1428 03/01/29 20:44:47 bell@sanja.is.com.ua +7 -0
  fixed row items with group functions
  fixed layout

  sql/item_row.h
    1.9 03/01/29 20:44:44 bell@sanja.is.com.ua +1 -0
    fixed row items with group functions

  sql/item_row.cc
    1.11 03/01/29 20:44:44 bell@sanja.is.com.ua +28 -9
    fixed row item

  sql/item_func.cc
    1.100 03/01/29 20:44:44 bell@sanja.is.com.ua +3 -3
    fixed layout

  sql/item_cmpfunc.cc
    1.63 03/01/29 20:44:44 bell@sanja.is.com.ua +2 -0
    added braces according review

  mysql-test/t/row.test
    1.11 03/01/29 20:44:44 bell@sanja.is.com.ua +12 -0
    test of row with group function

  mysql-test/r/row.result
    1.12 03/01/29 20:44:44 bell@sanja.is.com.ua +15 -0
    test of row with group function

  BitKeeper/etc/ignore
    1.138 03/01/29 20:44:44 bell@sanja.is.com.ua +3 -0
    Added stamp-h2 stamp-h3 stamp-h4 to the ignore list

ChangeSet
  1.1427 03/01/29 19:46:11 bell@sanja.is.com.ua +7 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-select-4.1

  sql/sql_yacc.yy
    1.203.1.25 03/01/29 19:46:07 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_update.cc
    1.75 03/01/29 19:46:07 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.196 03/01/29 19:46:07 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.259 03/01/29 19:46:07 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.99 03/01/29 19:46:07 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.62 03/01/29 19:46:07 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.50 03/01/29 19:46:07 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1426 03/01/29 19:42:39 bell@sanja.is.com.ua +13 -0
  improving of fields list creation in derived tables and unions
  fixed length of fields created in fubselect
  fixed resolving fields of reduced in derived table subselect

  sql/sql_update.cc
    1.74 03/01/29 19:42:36 bell@sanja.is.com.ua +1 -1
    improving of fields list creation in derived tables and unions

  sql/sql_union.cc
    1.60 03/01/29 19:42:36 bell@sanja.is.com.ua +40 -24
    improving of fields list creation in derived tables and unions

  sql/sql_select.h
    1.36 03/01/29 19:42:36 bell@sanja.is.com.ua +1 -1
    improving of fields list creation in derived tables and unions

  sql/sql_select.cc
    1.195 03/01/29 19:42:36 bell@sanja.is.com.ua +10 -8
    improving of fields list creation in derived tables and unions

  sql/sql_prepare.cc
    1.25 03/01/29 19:42:36 bell@sanja.is.com.ua +1 -1
    improving of fields list creation in derived tables and unions

  sql/sql_parse.cc
    1.258 03/01/29 19:42:36 bell@sanja.is.com.ua +1 -1
    improving of fields list creation in derived tables and unions

  sql/sql_lex.h
    1.102.1.13 03/01/29 19:42:36 bell@sanja.is.com.ua +1 -1
    improving of fields list creation in derived tables and unions

  sql/sql_derived.cc
    1.34 03/01/29 19:42:36 bell@sanja.is.com.ua +16 -11
    improving of fields list creation in derived tables and unions

  sql/mysql_priv.h
    1.178 03/01/29 19:42:36 bell@sanja.is.com.ua +4 -2
    improving of fields list creation in derived tables and unions

  sql/item_subselect.cc
    1.52 03/01/29 19:42:36 bell@sanja.is.com.ua +3 -3
    improving of fields list creation in derived tables and unions

  sql/item.cc
    1.49 03/01/29 19:42:36 bell@sanja.is.com.ua +5 -5
    fixed length of fields created in fubselect
    fixed resolving fields of reduced in derived table subselect

  mysql-test/t/subselect.test
    1.52 03/01/29 19:42:36 bell@sanja.is.com.ua +15 -1
    test of created with subselect fields

  mysql-test/r/subselect.result
    1.59 03/01/29 19:42:36 bell@sanja.is.com.ua +34 -0
    test of created with subselect fields

ChangeSet
  1.1346.46.133 03/01/29 19:33:48 monty@mashka.mysql.fi +1 -0
  After merge fix

  mysql-test/r/group_by.result
    1.16.1.9 03/01/29 19:33:46 monty@mashka.mysql.fi +17 -0
    After merge fix

ChangeSet
  1.1346.46.132 03/01/29 19:22:22 monty@mashka.mysql.fi +16 -0
  merge with 3.23.56 to get patches for --lower-case-table-names and
  proper handling of SUM() in some functions.
  

  sql/sql_yacc.yy
    1.145.1.53 03/01/29 19:22:20 monty@mashka.mysql.fi +25 -274
    merge with 3.23.56

  sql/sql_parse.cc
    1.218.1.74 03/01/29 19:22:20 monty@mashka.mysql.fi +1 -6
    merge with 3.23.56

  sql/mysqld.cc
    1.297.1.98 03/01/29 19:22:20 monty@mashka.mysql.fi +0 -1
    merge with 3.23.56

  sql/item_strfunc.h
    1.15.1.9 03/01/29 19:22:20 monty@mashka.mysql.fi +0 -1
    merge with 3.23.56

  mysql-test/t/group_by.test
    1.13.1.4 03/01/29 19:22:20 monty@mashka.mysql.fi +22 -23
    merge with 3.23.56

  mysql-test/r/group_by.result
    1.16.1.8 03/01/29 19:22:20 monty@mashka.mysql.fi +18 -18
    merge with 3.23.56

  sql/table.cc
    1.46.1.15 03/01/29 19:12:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_show.cc
    1.76.1.22 03/01/29 19:12:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_db.cc
    1.39.1.17 03/01/29 19:12:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.150.1.32 03/01/29 19:12:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.36.1.18 03/01/29 19:12:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_func.h
    1.39.1.19 03/01/29 19:12:47 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_func.cc
    1.60.1.27 03/01/29 19:12:47 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.13.1.12 03/01/29 19:12:47 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.20.1.29 03/01/29 19:12:47 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.206.17.11 03/01/29 19:12:41 monty@mashka.mysql.fi +0 -1
    auto-union

ChangeSet
  1.1346.46.131 03/01/29 19:10:33 monty@mashka.mysql.fi +2 -0
  Fixed compilation error on windows

  sql/sql_table.cc
    1.112.1.35 03/01/29 19:10:31 monty@mashka.mysql.fi +43 -5
    Added comments

  sql/mysqld.cc
    1.297.1.97 03/01/29 19:10:31 monty@mashka.mysql.fi +7 -8
    Fixed compilation error on windows

ChangeSet
  1.676.273.1 03/01/29 18:56:34 monty@mashka.mysql.fi +6 -0
  Fixed handling of lower_case_table_names in SHOW TABLE STATUS, mysql_list_fields() and mysql_table_dump().
  This fixes some Errcode 13 errors on Windows when deleting tables.
  

  sql/table.cc
    1.39.1.8 03/01/29 18:56:33 monty@mashka.mysql.fi +22 -2
    Convert database names to lower case in check_db-name() if --lower-case-table-names is used.

  sql/sql_show.cc
    1.47.1.19 03/01/29 18:56:33 monty@mashka.mysql.fi +2 -0
    Moved lower case conversion of database names to check_db_name()

  sql/sql_parse.cc
    1.120.2.35 03/01/29 18:56:33 monty@mashka.mysql.fi +9 -16
    Moved lower case conversion of database names to check_db_name()
    Added checking of lower_case_table_names for mysql_table_dump() and
    mysql_list_fields()

  sql/sql_db.cc
    1.22.1.17 03/01/29 18:56:33 monty@mashka.mysql.fi +0 -2
    Moved lower case conversion of database names to check_db_name()

  sql/mysqld.cc
    1.162.1.106 03/01/29 18:56:33 monty@mashka.mysql.fi +1 -1
    Fix to be able to use 4.0 error message files

  sql/mysql_priv.h
    1.93.1.15 03/01/29 18:56:33 monty@mashka.mysql.fi +1 -1
    Moved lower case conversion of database names to check_db_name()

ChangeSet
  1.1422.1.8 03/01/29 17:56:18 bar@bar.mysql.r18.ru +1 -0
  conf_to_src.c:
    GeGetting closer 

  strings/conf_to_src.c
    1.10 03/01/29 17:55:48 bar@bar.mysql.r18.ru +93 -145
    GeGetting closer 

ChangeSet
  1.1422.1.7 03/01/29 17:31:20 bar@bar.mysql.r18.ru +36 -0
  Move latin1 into a separarte file

  strings/ctype-latin1.c
    1.1 03/01/29 17:31:18 bar@bar.mysql.r18.ru +203 -0

  strings/str2int.c
    1.9 03/01/29 17:31:18 bar@bar.mysql.r18.ru +1 -1
    Move latin1 into a separarte file

  strings/my_vsnprintf.c
    1.19 03/01/29 17:31:18 bar@bar.mysql.r18.ru +1 -1
    Move latin1 into a separarte file

  strings/ctype-latin1.c
    1.0 03/01/29 17:31:18 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/strings/ctype-latin1.c

  strings/ctype-extra.c
    1.2 03/01/29 17:31:18 bar@bar.mysql.r18.ru +0 -2
    Move latin1 into a separarte file

  strings/ctype-bin.c
    1.19 03/01/29 17:31:18 bar@bar.mysql.r18.ru +1 -4
    Move latin1 into a separarte file

  strings/Makefile.am
    1.32 03/01/29 17:31:18 bar@bar.mysql.r18.ru +3 -3
    Move latin1 into a separarte file

  sql/time.cc
    1.26 03/01/29 17:31:18 bar@bar.mysql.r18.ru +20 -20
    Move latin1 into a separarte file

  sql/sql_yacc.yy
    1.203.21.1 03/01/29 17:31:18 bar@bar.mysql.r18.ru +12 -12
    Move latin1 into a separarte file

  sql/sql_update.cc
    1.72.1.1 03/01/29 17:31:18 bar@bar.mysql.r18.ru +1 -1
    Move latin1 into a separarte file

  sql/sql_string.cc
    1.45 03/01/29 17:31:17 bar@bar.mysql.r18.ru +6 -6
    Move latin1 into a separarte file

  sql/sql_select.cc
    1.189.1.2 03/01/29 17:31:17 bar@bar.mysql.r18.ru +3 -3
    Move latin1 into a separarte file

  sql/sql_parse.cc
    1.254.1.3 03/01/29 17:31:17 bar@bar.mysql.r18.ru +2 -2
    Move latin1 into a separarte file

  sql/sql_help.cc
    1.7 03/01/29 17:31:17 bar@bar.mysql.r18.ru +1 -1
    Move latin1 into a separarte file

  sql/sql_class.cc
    1.99 03/01/29 17:31:17 bar@bar.mysql.r18.ru +3 -3
    Move latin1 into a separarte file

  sql/sql_acl.cc
    1.65 03/01/29 17:31:16 bar@bar.mysql.r18.ru +82 -82
    Move latin1 into a separarte file

  sql/opt_range.cc
    1.81 03/01/29 17:31:16 bar@bar.mysql.r18.ru +1 -1
    Move latin1 into a separarte file

  sql/mysqld.cc
    1.328 03/01/29 17:31:16 bar@bar.mysql.r18.ru +4 -4
    Move latin1 into a separarte file

  sql/log_event.cc
    1.98 03/01/29 17:31:16 bar@bar.mysql.r18.ru +1 -1
    Move latin1 into a separarte file

  sql/log.cc
    1.100 03/01/29 17:31:16 bar@bar.mysql.r18.ru +1 -1
    Move latin1 into a separarte file

  sql/item_timefunc.cc
    1.33 03/01/29 17:31:16 bar@bar.mysql.r18.ru +23 -23
    Move latin1 into a separarte file

  sql/item_strfunc.h
    1.41 03/01/29 17:31:15 bar@bar.mysql.r18.ru +3 -3
    Move latin1 into a separarte file

  sql/item_strfunc.cc
    1.70 03/01/29 17:31:15 bar@bar.mysql.r18.ru +3 -3
    Move latin1 into a separarte file

  sql/item_func.cc
    1.96.1.1 03/01/29 17:31:15 bar@bar.mysql.r18.ru +6 -6
    Move latin1 into a separarte file

  sql/item_cmpfunc.cc
    1.57.1.2 03/01/29 17:31:15 bar@bar.mysql.r18.ru +5 -5
    Move latin1 into a separarte file

  sql/item.cc
    1.47.1.1 03/01/29 17:31:15 bar@bar.mysql.r18.ru +6 -6
    Move latin1 into a separarte file

  sql/hostname.cc
    1.21 03/01/29 17:31:15 bar@bar.mysql.r18.ru +2 -2
    Move latin1 into a separarte file

  sql/filesort.cc
    1.63 03/01/29 17:31:15 bar@bar.mysql.r18.ru +1 -1
    Move latin1 into a separarte file

  sql/field.h
    1.59 03/01/29 17:31:15 bar@bar.mysql.r18.ru +3 -3
    Move latin1 into a separarte file

  sql/field.cc
    1.82 03/01/29 17:31:14 bar@bar.mysql.r18.ru +31 -31
    Move latin1 into a separarte file

  sql/des_key_file.cc
    1.7 03/01/29 17:31:14 bar@bar.mysql.r18.ru +1 -1
    Move latin1 into a separarte file

  sql/convert.cc
    1.13 03/01/29 17:31:14 bar@bar.mysql.r18.ru +1 -1
    Move latin1 into a separarte file

  regex/main.c
    1.9 03/01/29 17:31:14 bar@bar.mysql.r18.ru +2 -2
    Move latin1 into a separarte file

  mysys/charset.c
    1.66 03/01/29 17:31:14 bar@bar.mysql.r18.ru +5 -3
    Move latin1 into a separarte file

  libmysql/Makefile.shared
    1.42 03/01/29 17:31:14 bar@bar.mysql.r18.ru +1 -1
    Move latin1 into a separarte file

  include/m_ctype.h
    1.58 03/01/29 17:31:14 bar@bar.mysql.r18.ru +2 -2
    Move latin1 into a separarte file

  client/sql_string.cc
    1.16 03/01/29 17:31:13 bar@bar.mysql.r18.ru +4 -4
    Move latin1 into a separarte file

ChangeSet
  1.1422.1.6 03/01/29 16:33:16 bar@bar.mysql.r18.ru +1 -0
  conf_to_src.c:
    Restoring conf_to_src. Now it loads XML.

  strings/conf_to_src.c
    1.9 03/01/29 16:32:43 bar@bar.mysql.r18.ru +157 -11
    Restoring conf_to_src. Now it loads XML.

ChangeSet
  1.1422.1.5 03/01/29 15:08:09 bar@bar.mysql.r18.ru +17 -0
  Reorganization to restore generating charset C files from conf files

  strings/ctype-extra.c
    1.1 03/01/29 15:08:07 bar@bar.mysql.r18.ru +3943 -0

  strings/strto.c
    1.12 03/01/29 15:08:07 bar@bar.mysql.r18.ru +6 -6
    Reorganization to restore generating charset C files from conf files

  strings/str2int.c
    1.8 03/01/29 15:08:07 bar@bar.mysql.r18.ru +1 -1
    Reorganization to restore generating charset C files from conf files

  strings/my_vsnprintf.c
    1.18 03/01/29 15:08:07 bar@bar.mysql.r18.ru +1 -1
    Reorganization to restore generating charset C files from conf files

  strings/ctype.c
    1.54 03/01/29 15:08:07 bar@bar.mysql.r18.ru +3 -4012
    Reorganization to restore generating charset C files from conf files

  strings/ctype-extra.c
    1.0 03/01/29 15:08:07 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/strings/ctype-extra.c

  strings/conf_to_src.c
    1.8 03/01/29 15:08:07 bar@bar.mysql.r18.ru +82 -30
    Reorganization to restore generating charset C files from conf files

  strings/Makefile.am
    1.31 03/01/29 15:08:07 bar@bar.mysql.r18.ru +4 -4
    Reorganization to restore generating charset C files from conf files

  sql/mysqld.cc
    1.327 03/01/29 15:08:07 bar@bar.mysql.r18.ru +1 -1
    Reorganization to restore generating charset C files from conf files

  regex/reginit.c
    1.6 03/01/29 15:08:07 bar@bar.mysql.r18.ru +1 -2
    Reorganization to restore generating charset C files from conf files

  regex/regex.h
    1.5 03/01/29 15:08:07 bar@bar.mysql.r18.ru +1 -1
    Reorganization to restore generating charset C files from conf files

  regex/regcomp.c
    1.11 03/01/29 15:08:07 bar@bar.mysql.r18.ru +1 -1
    Reorganization to restore generating charset C files from conf files

  regex/main.c
    1.8 03/01/29 15:08:07 bar@bar.mysql.r18.ru +2 -2
    Reorganization to restore generating charset C files from conf files

  regex/Makefile.am
    1.10 03/01/29 15:08:07 bar@bar.mysql.r18.ru +1 -1
    Reorganization to restore generating charset C files from conf files

  mysys/charset.c
    1.65 03/01/29 15:08:06 bar@bar.mysql.r18.ru +72 -0
    Reorganization to restore generating charset C files from conf files

  libmysql/Makefile.shared
    1.41 03/01/29 15:08:06 bar@bar.mysql.r18.ru +1 -1
    Reorganization to restore generating charset C files from conf files

  include/my_sys.h
    1.86 03/01/29 15:08:06 bar@bar.mysql.r18.ru +5 -0
    Reorganization to restore generating charset C files from conf files

  include/m_ctype.h
    1.57 03/01/29 15:08:06 bar@bar.mysql.r18.ru +14 -4
    Reorganization to restore generating charset C files from conf files

ChangeSet
  1.1425 03/01/29 11:03:53 bell@sanja.is.com.ua +4 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-select-4.1

  sql/sql_prepare.cc
    1.24 03/01/29 11:03:51 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.257 03/01/29 11:03:51 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.51 03/01/29 11:03:51 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.58 03/01/29 11:03:51 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.105.1 03/01/29 14:00:08 walrus@mysql.com +1 -0
  crash-me.sh:
    restore nake_time and make_time_r

  sql-bench/crash-me.sh
    1.34.1.11 03/01/29 13:59:13 root@kishkin.(none) +33 -0
    restore nake_time and make_time_r

ChangeSet
  1.676.1.646 03/01/29 10:38:56 bell@sanja.is.com.ua +10 -0
  fixed functions to be able work with group function as argument
  made bisone 1.75 compatible code

  BitKeeper/etc/logging_ok
    1.153.1.88 03/01/29 10:38:56 bell@sanja.is.com.ua +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_yacc.yy
    1.82.2.15 03/01/29 10:38:44 bell@sanja.is.com.ua +275 -36
    made bisone 1.75 compatible code

  sql/item_strfunc.h
    1.7.1.2 03/01/29 10:38:44 bell@sanja.is.com.ua +4 -1
    fixed functions to be able work with group function as argument

  sql/item_strfunc.cc
    1.24.1.4 03/01/29 10:38:44 bell@sanja.is.com.ua +39 -0
    fixed functions to be able work with group function as argument

  sql/item_func.h
    1.23.2.4 03/01/29 10:38:44 bell@sanja.is.com.ua +1 -0
    fixed functions to be able work with group function as argument

  sql/item_func.cc
    1.36.1.17 03/01/29 10:38:44 bell@sanja.is.com.ua +11 -0
    fixed functions to be able work with group function as argument

  sql/item_cmpfunc.h
    1.10.1.5 03/01/29 10:38:44 bell@sanja.is.com.ua +2 -0
    fixed functions to be able work with group function as argument

  sql/item_cmpfunc.cc
    1.14.1.15 03/01/29 10:38:44 bell@sanja.is.com.ua +42 -1
    fixed functions to be able work with group function as argument

  mysql-test/t/group_by.test
    1.3.1.8 03/01/29 10:38:44 bell@sanja.is.com.ua +23 -0
    test of function with agregate function inside

  mysql-test/r/group_by.result
    1.3.1.8 03/01/29 10:38:44 bell@sanja.is.com.ua +18 -0
    test of function with agregate function inside

ChangeSet
  1.1346.46.129 03/01/29 09:22:20 lenz@mysql.com +1 -0
   - fixed typo for better portability (many shells don't support the "=="
     operator)

  scripts/make_binary_distribution.sh
    1.47 03/01/29 09:22:15 lenz@mysql.com +1 -1
     - fixed typo for better portability (many shells don't support the "=="
       operator)

ChangeSet
  1.1422.1.4 03/01/29 11:38:59 bar@bar.mysql.r18.ru +1 -0
  client_test.c:
    Compilation failure fix

  tests/client_test.c
    1.17 03/01/29 11:38:38 bar@bar.mysql.r18.ru +3 -2
    Compilation failure fix

ChangeSet
  1.1417.13.2 03/01/28 21:02:20 venu@myvenu.com +2 -0
  Fix for windows specific errors

  include/violite.h
    1.27 03/01/28 21:01:33 venu@myvenu.com +1 -1

  myisam/mi_check.c
    1.100 03/01/28 21:01:22 venu@myvenu.com +1 -1

ChangeSet
  1.1346.46.128 03/01/29 02:19:00 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Cleanup of the previous bug fix: replace code is either SQLCOM_REPLACE or SQLCOM_REPLACE_SELECT

  sql/ha_innodb.cc
    1.73.10.2 03/01/29 02:18:31 heikki@hundin.mysql.fi +4 -9
    Cleanup of the previous bug fix: replace code is either SQLCOM_REPLACE or SQLCOM_REPLACE_SELECT

ChangeSet
  1.1346.46.127 03/01/29 00:31:56 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Fix a bug REPLACE INTO t SELECT ... did not work if t has an auto-inc column

  sql/ha_innodb.cc
    1.73.10.1 03/01/29 00:31:45 heikki@hundin.mysql.fi +13 -3
    Fix a bug REPLACE INTO t SELECT ... did not work if t has an auto-inc column

ChangeSet
  1.1346.104.1 03/01/28 23:29:59 jani@hynda.(none) +1 -0
  Fixed a bug in --auto-repair.

  client/mysqlcheck.c
    1.25.1.1 03/01/28 23:29:56 jani@hynda.(none) +36 -6
    Fixed a bug in --auto-repair.

ChangeSet
  1.1424 03/01/28 22:28:11 bell@sanja.is.com.ua +2 -0
  fixed memory leak in ROW code (SCRUM 577)

  sql/item_cmpfunc.h
    1.41 03/01/28 22:28:10 bell@sanja.is.com.ua +1 -0
    fixed memory leak in ROW code

  sql/item_cmpfunc.cc
    1.61 03/01/28 22:28:10 bell@sanja.is.com.ua +14 -5
    fixed memory leak in ROW code

ChangeSet
  1.1346.46.124 03/01/28 20:59:41 monty@mashka.mysql.fi +2 -0
  merge

  sql/mysqld.cc
    1.297.1.96 03/01/28 20:59:39 monty@mashka.mysql.fi +0 -1
    Use local vrsion

  sql/mysql_priv.h
    1.150.1.31 03/01/28 20:56:58 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.103.1 03/01/28 20:56:35 monty@mashka.mysql.fi +6 -0
  Only write to the error log if --log-error is specified and --console is not specified
  (On Windows --log-error is enabled by default)
  

  sql/sql_udf.cc
    1.15.1.10 03/01/28 20:56:33 monty@mashka.mysql.fi +1 -1
    Lock the mysql/func table properly

  sql/mysqld.cc
    1.297.24.1 03/01/28 20:56:33 monty@mashka.mysql.fi +24 -22
    Fix for --log-error

  sql/mysql_priv.h
    1.150.6.1 03/01/28 20:56:33 monty@mashka.mysql.fi +1 -1
    Fix for --log-error

  sql/log.cc
    1.80.1.31 03/01/28 20:56:33 monty@mashka.mysql.fi +1 -1
    Fix for --log-error

  scripts/mysqld_safe.sh
    1.55 03/01/28 20:56:33 monty@mashka.mysql.fi +3 -1
    Add option --log-error

  mysys/my_getopt.c
    1.33 03/01/28 20:56:33 monty@mashka.mysql.fi +4 -2
    Call get_one_option() also for boolean values.

ChangeSet
  1.1346.102.1 03/01/28 20:33:47 peter@mysql.com +1 -0
  Fix predicted first rand() call 

  sql/sql_class.cc
    1.71.1.24 03/01/28 20:33:43 peter@mysql.com +1 -1
    Fix Random hash initialization on for new connections to make result
    it more random

ChangeSet
  1.1417.13.1 03/01/28 09:24:27 venu@myvenu.com +3 -0
  Fix leak when the client disconnects with open prep statements 
  

  tests/client_test.c
    1.16 03/01/28 09:22:45 venu@myvenu.com +34 -15
    Enable stmt_close test

  libmysql/libmysql.c
    1.137 03/01/28 09:21:51 venu@myvenu.com +5 -8

  sql/sql_prepare.cc
    1.21.1.1 03/01/28 09:21:23 venu@myvenu.com +32 -27
    Fix leak when the client disconnects with open statements

ChangeSet
  1.1422.2.1 03/01/28 21:03:05 hf@deer.mysql.r18.ru +1 -0
  SIGNAL_WITH_VIO_CLOSES bugfix

  sql/sql_class.cc
    1.98 03/01/28 21:03:00 hf@deer.mysql.r18.ru +2 -0
    This should be #ifdefed

ChangeSet
  1.1403.47.11 03/01/28 18:55:52 Sinisa@sinisa.nasamreza.org +5 -0
  A feature of doing automatick result buffering when INSERT is
  done from the select containing a table to be inserted to.

  sql/sql_parse.cc
    1.235.1.41 03/01/28 18:55:48 Sinisa@sinisa.nasamreza.org +1 -2
    A feature of doing automatick result buffering when INSERT is
    done from the select containing a table to be inserted to.

  mysql-test/t/subselect.test
    1.46.1.1 03/01/28 18:55:48 Sinisa@sinisa.nasamreza.org +0 -1
    A feature of doing automatick result buffering when INSERT is
    done from the select containing a table to be inserted to.

  mysql-test/t/insert.test
    1.9.1.1 03/01/28 18:55:48 Sinisa@sinisa.nasamreza.org +31 -0
    A feature of doing automatick result buffering when INSERT is
    done from the select containing a table to be inserted to.

  mysql-test/r/subselect.result
    1.54.1.1 03/01/28 18:55:48 Sinisa@sinisa.nasamreza.org +2 -1
    A feature of doing automatick result buffering when INSERT is
    done from the select containing a table to be inserted to.

  mysql-test/r/insert.result
    1.10.1.1 03/01/28 18:55:48 Sinisa@sinisa.nasamreza.org +13 -0
    A feature of doing automatick result buffering when INSERT is
    done from the select containing a table to be inserted to.

ChangeSet
  1.1346.46.123 03/01/28 17:49:21 lenz@mysql.com +2 -0
   - added netware subdirectory to distribution

  netware/Makefile.am
    1.2 03/01/28 17:49:20 lenz@mysql.com +22 -0
     - add netware.patch to distribution

  Makefile.am
    1.40.1.4 03/01/28 17:49:19 lenz@mysql.com +1 -1
     - added netware to SUBDIRS

ChangeSet
  1.1346.101.1 03/01/28 17:42:08 serg@serg.mysql.com +10 -0
  low-level error messages cleanup

  sql/handler.cc
    1.82.1.11 03/01/28 17:42:06 serg@serg.mysql.com +1 -1
    correct error reported

  sql/ha_myisammrg.cc
    1.38.1.5 03/01/28 17:42:06 serg@serg.mysql.com +1 -1
    correct error reported

  sql/ha_myisam.cc
    1.92.1.24 03/01/28 17:42:06 serg@serg.mysql.com +1 -1
    reorder table file extensions to get better error on "cannot open the table"

  sql/ha_isam.cc
    1.21 03/01/28 17:42:06 serg@serg.mysql.com +1 -1
    reorder table file extensions to get better error on "cannot open the table"

  sql/ha_innodb.cc
    1.73.1.74 03/01/28 17:42:06 serg@serg.mysql.com +1 -1
    correct error reported

  myisammrg/myrg_open.c
    1.21 03/01/28 17:42:06 serg@serg.mysql.com +1 -1
    correct error reported

  myisam/myisamchk.c
    1.80.1.17 03/01/28 17:42:06 serg@serg.mysql.com +1 -1
    correct error reported

  myisam/mi_open.c
    1.46.1.11 03/01/28 17:42:06 serg@serg.mysql.com +1 -1
    correct error reported

  include/my_base.h
    1.30.1.7 03/01/28 17:42:06 serg@serg.mysql.com +3 -2
    error codes fixups

  extra/perror.c
    1.20 03/01/28 17:42:06 serg@serg.mysql.com +6 -2
    error messages fixups

ChangeSet
  1.1346.46.122 03/01/28 13:50:36 miguel@hegel.local +1 -0
  Use on Unix hostname.err only when --log-error=path.
  Asked by Heikki and Peter.

  sql/mysqld.cc
    1.297.1.95 03/01/28 13:50:18 miguel@hegel.local +2 -0
    Use on Unix hostname.err only when --log-error=path.

ChangeSet
  1.1417.11.2 03/01/28 15:47:30 Sinisa@sinisa.nasamreza.org +5 -0
  moving a feature from 4.1 to 5.0

  sql/sql_parse.cc
    1.254.1.2 03/01/28 15:47:26 Sinisa@sinisa.nasamreza.org +2 -1
    moving a feature from 4.1 to 5.0

  mysql-test/t/subselect.test
    1.47.1.2 03/01/28 15:47:26 Sinisa@sinisa.nasamreza.org +1 -0
    moving a feature from 4.1 to 5.0

  mysql-test/t/insert.test
    1.11 03/01/28 15:47:26 Sinisa@sinisa.nasamreza.org +0 -31
    moving a feature from 4.1 to 5.0

  mysql-test/r/subselect.result
    1.55.1.2 03/01/28 15:47:26 Sinisa@sinisa.nasamreza.org +1 -2
    moving a feature from 4.1 to 5.0

  mysql-test/r/insert.result
    1.12 03/01/28 15:47:26 Sinisa@sinisa.nasamreza.org +0 -13
    moving a feature from 4.1 to 5.0

ChangeSet
  1.1346.46.121 03/01/28 14:37:12 serg@serg.mysql.com +2 -0
  Merge work:/home/bk/mysql-4.0
  into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

  sql/sql_table.cc
    1.112.1.34 03/01/28 14:37:09 serg@serg.mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.150.1.30 03/01/28 14:37:09 serg@serg.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.100.1 03/01/28 14:36:22 serg@serg.mysql.com +5 -0
  fixed "DROP table_open_in_handler" hang

  sql/sql_table.cc
    1.112.7.1 03/01/28 14:36:20 serg@serg.mysql.com +2 -1
    fixed "DROP table_open_in_handler" hang

  sql/sql_handler.cc
    1.19.1.8 03/01/28 14:36:20 serg@serg.mysql.com +22 -15
    fixed "DROP table_open_in_handler" hang

  sql/mysql_priv.h
    1.150.5.1 03/01/28 14:36:20 serg@serg.mysql.com +1 -0
    fixed "DROP table_open_in_handler" hang

  mysql-test/t/handler.test
    1.7.1.1 03/01/28 14:36:20 serg@serg.mysql.com +17 -4
    fixed "DROP table_open_in_handler" hang

  mysql-test/r/handler.result
    1.7.1.1 03/01/28 14:36:20 serg@serg.mysql.com +7 -1
    fixed "DROP table_open_in_handler" hang

ChangeSet
  1.1423 03/01/28 15:34:59 bell@sanja.is.com.ua +6 -0
  Merge

  sql/item.h
    1.51 03/01/28 15:34:58 bell@sanja.is.com.ua +0 -0
    SCCS merged

  sql/sql_yacc.yy
    1.203.1.24 03/01/28 15:32:33 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.194 03/01/28 15:32:33 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.40 03/01/28 15:32:33 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.60 03/01/28 15:32:33 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.48 03/01/28 15:32:32 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1417.1.16 03/01/28 14:48:12 bell@sanja.is.com.ua +11 -0
  fixed bugs in temporary tables in subselect implementation (SCRUM)
  merging with switching on static tables optimization (SCRUM)
  fixed subselects with uncacheable results
  added test for fixed bugs from bugreports

  sql/sql_yacc.yy
    1.203.18.3 03/01/28 14:48:10 bell@sanja.is.com.ua +11 -10
    fixed subselects with uncacheable results

  sql/sql_union.cc
    1.59 03/01/28 14:48:10 bell@sanja.is.com.ua +2 -2
    fixed subselects with uncacheable results

  sql/sql_select.cc
    1.193 03/01/28 14:48:10 bell@sanja.is.com.ua +5 -7
    fixed bugs in temporary tables in subselect implementation
    fixed subselects with uncacheable results

  sql/sql_lex.h
    1.102.1.12 03/01/28 14:48:10 bell@sanja.is.com.ua +8 -0
    fixed subselects with uncacheable results

  sql/sql_lex.cc
    1.69 03/01/28 14:48:10 bell@sanja.is.com.ua +1 -1
    fixed subselects with uncacheable results

  sql/item_subselect.h
    1.26 03/01/28 14:48:10 bell@sanja.is.com.ua +6 -3
    fixed subselects with uncacheable results

  sql/item_subselect.cc
    1.51 03/01/28 14:48:10 bell@sanja.is.com.ua +15 -8
    fixed subselects with uncacheable results
    clean up

  sql/item_func.cc
    1.98 03/01/28 14:48:10 bell@sanja.is.com.ua +2 -2
    fixed subselects with uncacheable results

  sql/item_create.cc
    1.24 03/01/28 14:48:10 bell@sanja.is.com.ua +5 -5
    fixed subselects with uncacheable results

  mysql-test/t/subselect.test
    1.50 03/01/28 14:48:10 bell@sanja.is.com.ua +80 -4
    changes in subselect test after switching on static tables optimization
    fixed bug test added
    uncacheable subselects

  mysql-test/r/subselect.result
    1.57 03/01/28 14:48:10 bell@sanja.is.com.ua +111 -10
    changes in subselect test after switching on static tables optimization
    fixed bug test added
    uncacheable subselects

ChangeSet
  1.1403.47.10 03/01/28 14:44:13 Sinisa@sinisa.nasamreza.org +3 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-5.0
  into sinisa.nasamreza.org:/mnt/work/petica

  sql/sql_yacc.yy
    1.214 03/01/28 14:44:09 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/t/sp.test
    1.4 03/01/28 14:44:08 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/r/sp.result
    1.4 03/01/28 14:44:08 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1422 03/01/28 15:06:23 hf@deer.mysql.r18.ru +1 -0
  Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
  into deer.mysql.r18.ru:/home/hf/work/mysql-default

  sql/field.h
    1.58 03/01/28 15:06:22 hf@deer.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1417.5.8 03/01/28 15:03:33 bar@bar.mysql.r18.ru +1 -0
  resolve

  strings/ctype-simple.c
    1.27 03/01/28 15:03:32 bar@bar.mysql.r18.ru +0 -1
    resolve

ChangeSet
  1.1417.12.1 03/01/28 14:58:06 bar@bar.mysql.r18.ru +18 -0
  New "fill" function in charset_info_st structure

  strings/ctype.c
    1.53 03/01/28 14:58:03 bar@bar.mysql.r18.ru +24 -0
    New "fill" function in charset_info_st structure

  strings/ctype-win1250ch.c
    1.16 03/01/28 14:58:03 bar@bar.mysql.r18.ru +1 -0
    New "fill" function in charset_info_st structure

  strings/ctype-utf8.c
    1.31 03/01/28 14:58:03 bar@bar.mysql.r18.ru +2 -0
    New "fill" function in charset_info_st structure

  strings/ctype-ujis.c
    1.28 03/01/28 14:58:03 bar@bar.mysql.r18.ru +1 -0
    New "fill" function in charset_info_st structure

  strings/ctype-tis620.c
    1.34 03/01/28 14:58:03 bar@bar.mysql.r18.ru +1 -0
    New "fill" function in charset_info_st structure

  strings/ctype-sjis.c
    1.35 03/01/28 14:58:03 bar@bar.mysql.r18.ru +1 -0
    New "fill" function in charset_info_st structure

  strings/ctype-simple.c
    1.25.1.1 03/01/28 14:58:03 bar@bar.mysql.r18.ru +7 -1
    New "fill" function in charset_info_st structure

  strings/ctype-latin1_de.c
    1.24 03/01/28 14:58:03 bar@bar.mysql.r18.ru +1 -0
    New "fill" function in charset_info_st structure

  strings/ctype-gbk.c
    1.30 03/01/28 14:58:03 bar@bar.mysql.r18.ru +1 -0
    New "fill" function in charset_info_st structure

  strings/ctype-gb2312.c
    1.26 03/01/28 14:58:03 bar@bar.mysql.r18.ru +1 -0
    New "fill" function in charset_info_st structure

  strings/ctype-euc_kr.c
    1.28 03/01/28 14:58:03 bar@bar.mysql.r18.ru +1 -0
    New "fill" function in charset_info_st structure

  strings/ctype-czech.c
    1.28 03/01/28 14:58:03 bar@bar.mysql.r18.ru +1 -0
    New "fill" function in charset_info_st structure

  strings/ctype-bin.c
    1.18 03/01/28 14:58:03 bar@bar.mysql.r18.ru +1 -0
    New "fill" function in charset_info_st structure

  strings/ctype-big5.c
    1.30 03/01/28 14:58:03 bar@bar.mysql.r18.ru +2 -1
    New "fill" function in charset_info_st structure

  sql/field.h
    1.56.1.1 03/01/28 14:58:03 bar@bar.mysql.r18.ru +1 -1
    New "fill" function in charset_info_st structure

  sql/field.cc
    1.81 03/01/28 14:58:03 bar@bar.mysql.r18.ru +6 -8
    New "fill" function in charset_info_st structure

  mysys/charset.c
    1.64 03/01/28 14:58:03 bar@bar.mysql.r18.ru +1 -0
    New "fill" function in charset_info_st structure

  include/m_ctype.h
    1.56 03/01/28 14:58:03 bar@bar.mysql.r18.ru +4 -0
    New "fill" function in charset_info_st structure

ChangeSet
  1.1421 03/01/28 12:59:07 hf@deer.mysql.r18.ru +3 -0
  Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
  into deer.mysql.r18.ru:/home/hf/work/mysql-default

  sql/sql_yacc.yy
    1.203.1.23 03/01/28 12:59:05 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/item.h
    1.50 03/01/28 12:59:05 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/item.cc
    1.47 03/01/28 12:59:05 hf@deer.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1346.46.120 03/01/28 09:17:10 monty@mashka.mysql.fi +1 -0
  Updated results for 4.0

  mysql-test/r/rpl_insert_id.result
    1.2 03/01/28 09:17:08 monty@mashka.mysql.fi +26 -0
    Updated results for 4.0

ChangeSet
  1.1346.46.119 03/01/28 09:02:51 monty@mashka.mysql.fi +9 -0
  merge

  sql/mysqld.cc
    1.297.1.94 03/01/28 09:02:49 monty@mashka.mysql.fi +5 -8
    Simple cleanup

  scripts/make_binary_distribution.sh
    1.46 03/01/28 09:02:49 monty@mashka.mysql.fi +1 -1
    Add mysql_waitpid

  innobase/btr/btr0cur.c
    1.20.1.3 03/01/28 09:02:49 monty@mashka.mysql.fi +0 -8
    Use local file

  sql/sql_parse.cc
    1.218.1.73 03/01/28 08:53:49 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/set_var.cc
    1.12.1.11 03/01/28 08:53:49 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.150.1.29 03/01/28 08:53:49 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/log.cc
    1.80.1.30 03/01/28 08:53:49 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_create.cc
    1.15.1.11 03/01/28 08:53:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/my_sys.h
    1.75.1.18 03/01/28 08:53:48 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.98.4 03/01/28 08:51:03 monty@mashka.mysql.fi +9 -0
  Merge with 3.23.56 (Replace manual with 'empty' document)
  Fix for bug when using auto_increment column and LAST_INSERT_ID()

  sql/sql_base.cc
    1.117.1.35 03/01/28 08:51:01 monty@mashka.mysql.fi +1 -6
    Use local version

  sql/log.cc
    1.80.1.29 03/01/28 08:51:01 monty@mashka.mysql.fi +1 -2
    Fix for bug when using auto_increment column and LAST_INSERT_ID()

  libmysql/libmysql.c
    1.95.1.27 03/01/28 08:51:01 monty@mashka.mysql.fi +2 -10
    Use local version

  Docs/manual.texi
    1.862.1.378 03/01/28 08:51:01 monty@mashka.mysql.fi +6 -29
    Merge with 3.23.56 (Replace manual with 'empty' document)

  Docs/Makefile.am
    1.35 03/01/28 08:51:01 monty@mashka.mysql.fi +0 -4
    Merge with 3.23.56

  sql/Makefile.am
    1.66.1.7 03/01/28 08:39:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/btr/btr0cur.c
    1.20.2.1 03/01/28 08:39:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  ltconfig
    1.14 03/01/28 08:39:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  Makefile.am
    1.40.1.3 03/01/28 08:39:06 monty@mashka.mysql.fi +0 -1
    Auto merged

ChangeSet
  1.1346.98.3 03/01/28 08:38:28 monty@mashka.mysql.fi +101 -0
  Fixes for Netware
  Call pthread_mutex_destroy() on not used mutex.
  Changed comments in .h and .c files from // -> /* */
  Added detection of mutex on which one didn't call pthread_mutex_destroy()
  Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
  Added optimisation for ORDER BY NULL

  netware/netware.patch
    1.1 03/01/28 08:38:23 monty@mashka.mysql.fi +4162 -0

  netware/Makefile.am
    1.1 03/01/28 08:38:23 monty@mashka.mysql.fi +0 -0

  mysys/my_netware.c
    1.1 03/01/28 08:38:23 monty@mashka.mysql.fi +150 -0

  mysql-test/r/have_crypt.require
    1.1 03/01/28 08:38:23 monty@mashka.mysql.fi +2 -0

  mysql-test/include/have_crypt.inc
    1.1 03/01/28 08:38:23 monty@mashka.mysql.fi +4 -0

  include/config-netware.h
    1.1 03/01/28 08:38:23 monty@mashka.mysql.fi +86 -0

  vio/viotest-ssl.c
    1.8 03/01/28 08:38:23 monty@mashka.mysql.fi +100 -104
    Simple code cleanup

  vio/test-sslserver.c
    1.8 03/01/28 08:38:23 monty@mashka.mysql.fi +0 -3
    Simple code cleanup

  vio/test-sslclient.c
    1.7 03/01/28 08:38:23 monty@mashka.mysql.fi +0 -3
    Simple code cleanup

  vio/test-ssl.c
    1.7 03/01/28 08:38:23 monty@mashka.mysql.fi +92 -90
    Simple code cleanup

  sql/sql_udf.cc
    1.15.1.9 03/01/28 08:38:23 monty@mashka.mysql.fi +5 -0
    Free mutex on end

  sql/sql_table.cc
    1.112.1.33 03/01/28 08:38:23 monty@mashka.mysql.fi +1 -1
    Fixed bug in create_tmp_field() which causes a memory overrun

  sql/sql_select.h
    1.22.2.4 03/01/28 08:38:23 monty@mashka.mysql.fi +2 -2
    Fixed bug in create_tmp_field() which causes a memory overrun

  sql/sql_select.cc
    1.152.1.69 03/01/28 08:38:23 monty@mashka.mysql.fi +26 -18
    Added optimisation for ORDER BY NULL

  sql/sql_parse.cc
    1.218.1.72 03/01/28 08:38:23 monty@mashka.mysql.fi +5 -5
    Fixes for Netware

  netware/netware.patch
    1.0 03/01/28 08:38:23 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/netware/netware.patch

  netware/Makefile.am
    1.0 03/01/28 08:38:23 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/netware/Makefile.am

  mysys/my_sleep.c
    1.6 03/01/28 08:38:23 monty@mashka.mysql.fi +16 -13
    E

  mysys/my_netware.c
    1.0 03/01/28 08:38:23 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysys/my_netware.c

  mysql-test/r/have_crypt.require
    1.0 03/01/28 08:38:23 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysql-test/r/have_crypt.require

  mysql-test/include/have_crypt.inc
    1.0 03/01/28 08:38:23 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysql-test/include/have_crypt.inc

  include/config-netware.h
    1.0 03/01/28 08:38:23 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/include/config-netware.h

  sql/sql_insert.cc
    1.63.1.26 03/01/28 08:38:22 monty@mashka.mysql.fi +1 -1
    Fixes for Netware

  sql/sql_class.h
    1.111.1.27 03/01/28 08:38:22 monty@mashka.mysql.fi +4 -7
    Portability fixes.
    Added 'cleanup' to log handling to be able to free mutexes.

  sql/sql_base.cc
    1.117.1.34 03/01/28 08:38:22 monty@mashka.mysql.fi +1 -1
    Safety fix

  sql/slave.h
    1.50.1.4 03/01/28 08:38:22 monty@mashka.mysql.fi +3 -28
    Move constructors and destuctors to slave.cc
    (To make it easier to clear all needed variables)

  sql/slave.cc
    1.164.1.44 03/01/28 08:38:22 monty@mashka.mysql.fi +81 -27
    Remove global MASTER_INFO variable and use instead an allocated variable.
    This allows us to correctly free used mutex.

  sql/share/english/errmsg.txt
    1.51.1.9 03/01/28 08:38:22 monty@mashka.mysql.fi +1 -1
    Added version socket and port to stderr log

  sql/set_var.cc
    1.12.2.1 03/01/28 08:38:22 monty@mashka.mysql.fi +1 -0
    Added have_crypt

  sql/repl_failsafe.cc
    1.11.1.15 03/01/28 08:38:22 monty@mashka.mysql.fi +1 -1
    Fixes for Netware

  sql/mysqld.cc
    1.297.23.2 03/01/28 08:38:22 monty@mashka.mysql.fi +237 -32
    Fixes for Netware
    Added Have_crypt
    Properly free mutexes from MYSQL_LOG by calling cleanup
    Free mutex before exit

  sql/mysql_priv.h
    1.150.4.1 03/01/28 08:38:22 monty@mashka.mysql.fi +3 -1
    Fixes for Netware

  sql/my_lock.c
    1.9 03/01/28 08:38:22 monty@mashka.mysql.fi +1 -1
    Fixes for Netware

  sql/log.cc
    1.80.1.28 03/01/28 08:38:22 monty@mashka.mysql.fi +11 -0
    Free used mutexes

  sql/item_sum.cc
    1.25.1.3 03/01/28 08:38:22 monty@mashka.mysql.fi +1 -1
    Fixed bug in create_tmp_field() which causes a memory overrun

  sql/item_func.cc
    1.60.1.26 03/01/28 08:38:22 monty@mashka.mysql.fi +1 -0
    Free used mutexes

  sql/item.h
    1.20.1.14 03/01/28 08:38:22 monty@mashka.mysql.fi +16 -0
    Fixed bug in create_tmp_field() which causes a memory overrun

  sql/hostname.cc
    1.14.1.6 03/01/28 08:38:22 monty@mashka.mysql.fi +2 -0
    Fixes for Netware

  sql/ha_myisam.cc
    1.92.1.23 03/01/28 08:38:22 monty@mashka.mysql.fi +3 -3
    Changed warnings from REPAIR Note:
    (For mysql-test-run)

  sql/ha_innodb.cc
    1.73.1.73 03/01/28 08:38:22 monty@mashka.mysql.fi +1 -0
    Free mutex at end

  sql/des_key_file.cc
    1.4.1.1 03/01/28 08:38:22 monty@mashka.mysql.fi +11 -0
    Free mutex at end

  scripts/make_binary_distribution.sh
    1.44.1.2 03/01/28 08:38:22 monty@mashka.mysql.fi +102 -38
    Fixes for Netware

  mysys/thr_mutex.c
    1.20 03/01/28 08:38:22 monty@mashka.mysql.fi +115 -4
    Added detection of mutex on which one didn't call pthread_mutex_destroy()

  mysys/thr_alarm.c
    1.29 03/01/28 08:38:22 monty@mashka.mysql.fi +15 -4
    Destroy internal mutex on end_thr_alarm.

  mysys/safemalloc.c
    1.20 03/01/28 08:38:22 monty@mashka.mysql.fi +28 -28
    Prefix error messages with "Error:"

  mysys/mysys_priv.h
    1.10 03/01/28 08:38:22 monty@mashka.mysql.fi +3 -3
    Cleanup

  mysys/my_thr_init.c
    1.21 03/01/28 08:38:22 monty@mashka.mysql.fi +12 -0
    Remove created mutexes when program ends.

  mysys/my_tempnam.c
    1.12 03/01/28 08:38:22 monty@mashka.mysql.fi +5 -5
    Fixes for Netware

  mysys/my_redel.c
    1.9 03/01/28 08:38:22 monty@mashka.mysql.fi +1 -1
    Fixes for Netware

  mysys/my_pthread.c
    1.33 03/01/28 08:38:22 monty@mashka.mysql.fi +13 -0
    Fixes for Netware

  mysys/my_os2tls.c
    1.3 03/01/28 08:38:22 monty@mashka.mysql.fi +99 -92
    Changed function comment from // -> /* */
    Fixed indentation

  mysys/my_os2thread.c
    1.4 03/01/28 08:38:22 monty@mashka.mysql.fi +1 -2
    Changed function comment from // -> /* */
    Fixed indentation

  mysys/my_os2mutex.c
    1.3 03/01/28 08:38:22 monty@mashka.mysql.fi +20 -35
    Changed function comment from // -> /* */
    Fixed indentation

  mysys/my_os2file64.c
    1.5 03/01/28 08:38:22 monty@mashka.mysql.fi +193 -192
    Changed function comment from // -> /* */
    Fixed indentation

  mysys/my_os2dirsrch.h
    1.3 03/01/28 08:38:22 monty@mashka.mysql.fi +35 -24
    Changed function comment from // -> /* */
    Fixed indentation

  mysys/my_os2dirsrch.c
    1.3 03/01/28 08:38:22 monty@mashka.mysql.fi +101 -99
    Changed function comment from // -> /* */
    Fixed indentation

  mysys/my_os2cond.c
    1.3 03/01/28 08:38:22 monty@mashka.mysql.fi +0 -1
    Removed comment

  mysys/my_messnc.c
    1.6 03/01/28 08:38:22 monty@mashka.mysql.fi +4 -0
    Fixes for Netware

  mysys/my_lock.c
    1.10 03/01/28 08:38:22 monty@mashka.mysql.fi +52 -2
    Fixes for Netware

  mysys/my_init.c
    1.21.1.4 03/01/28 08:38:22 monty@mashka.mysql.fi +92 -15
    Fixes for Netware

  mysys/my_getwd.c
    1.7.1.1 03/01/28 08:38:22 monty@mashka.mysql.fi +1 -1
    Changed function comment from // -> /* */

  mysys/my_copy.c
    1.10 03/01/28 08:38:22 monty@mashka.mysql.fi +1 -1
    Fixes for Netware

  mysys/my_clock.c
    1.8 03/01/28 08:38:22 monty@mashka.mysql.fi +2 -2
    Fixes for Netware

  mysys/mf_tempfile.c
    1.17 03/01/28 08:38:22 monty@mashka.mysql.fi +3 -3
    Fixes for Netware

  mysys/default.c
    1.17.1.4 03/01/28 08:38:22 monty@mashka.mysql.fi +3 -1
    Fixes for Netware

  mysys/charset.c
    1.29.1.3 03/01/28 08:38:22 monty@mashka.mysql.fi +4 -0
    Fixes for Netware

  mysys/Makefile.am
    1.29.1.15 03/01/28 08:38:21 monty@mashka.mysql.fi +13 -12
    Added my_sleep.c and my_netware.c

  mysql-test/t/rpl_rotate_logs.test
    1.34.1.2 03/01/28 08:38:21 monty@mashka.mysql.fi +2 -2
    Fixes for Netware

  mysql-test/t/rpl000017.test
    1.8.1.1 03/01/28 08:38:21 monty@mashka.mysql.fi +2 -2
    Fixes for Netware

  mysql-test/t/rpl000015.test
    1.20.1.1 03/01/28 08:38:21 monty@mashka.mysql.fi +2 -2
    Fixes for Netware

  mysql-test/t/group_by.test
    1.13.1.3 03/01/28 08:38:21 monty@mashka.mysql.fi +21 -0
    Tests of ORDER BY NULL

  mysql-test/t/grant_cache.test
    1.2.1.1 03/01/28 08:38:21 monty@mashka.mysql.fi +11 -6
    Fixes for Netware

  mysql-test/t/func_crypt.test
    1.6.1.1 03/01/28 08:38:21 monty@mashka.mysql.fi +2 -0
    Fixes for Netware

  mysql-test/t/count_distinct.test
    1.4.1.1 03/01/28 08:38:21 monty@mashka.mysql.fi +1 -0
    More tests

  mysql-test/t/backup.test
    1.9.1.1 03/01/28 08:38:21 monty@mashka.mysql.fi +1 -1
    Fixes for Netware

  mysql-test/r/group_by.result
    1.16.1.7 03/01/28 08:38:21 monty@mashka.mysql.fi +48 -0
    Test of ORDER BY NULL

  mysql-test/r/count_distinct.result
    1.6 03/01/28 08:38:21 monty@mashka.mysql.fi +4 -0
    More tests

  mysql-test/mysql-test-run.sh
    1.146.1.12 03/01/28 08:38:21 monty@mashka.mysql.fi +25 -0
    Give warning if output file contains errors

  myisam/mi_test3.c
    1.5.1.2 03/01/28 08:38:21 monty@mashka.mysql.fi +14 -0
    Disable test for netware

  libmysql/manager.c
    1.9.1.1 03/01/28 08:38:21 monty@mashka.mysql.fi +4 -0
    Fixes for Netware

  libmysql/libmysql.c
    1.95.1.26 03/01/28 08:38:21 monty@mashka.mysql.fi +30 -6
    Fixes for Netware
    Made mysql_once_init() global

  libmysql/get_password.c
    1.10 03/01/28 08:38:21 monty@mashka.mysql.fi +15 -7
    Fixes for Netware

  libmysql/Makefile.shared
    1.24.1.9 03/01/28 08:38:21 monty@mashka.mysql.fi +1 -1
    Added my_sleep

  isam/test3.c
    1.9 03/01/28 08:38:21 monty@mashka.mysql.fi +14 -0
    Disable test on Netware

  innobase/sync/sync0sync.c
    1.14 03/01/28 08:38:21 monty@mashka.mysql.fi +1 -1
    Fixes for Netware

  innobase/srv/srv0start.c
    1.37.1.1 03/01/28 08:38:21 monty@mashka.mysql.fi +21 -1
    Fixes for Netware

  innobase/srv/srv0srv.c
    1.35.1.3 03/01/28 08:38:21 monty@mashka.mysql.fi +55 -0
    Fixes for Netware

  innobase/os/os0thread.c
    1.18 03/01/28 08:38:21 monty@mashka.mysql.fi +2 -0
    Fixes for Netware

  innobase/os/os0sync.c
    1.11 03/01/28 08:38:21 monty@mashka.mysql.fi +2 -0
    Fixes for Netware

  innobase/include/os0thread.h
    1.9 03/01/28 08:38:21 monty@mashka.mysql.fi +2 -1
    Fixes for Netware

  innobase/configure.in
    1.22 03/01/28 08:38:21 monty@mashka.mysql.fi +10 -10
    Fixes for Netware

  include/mysql.h
    1.42.1.4 03/01/28 08:38:21 monty@mashka.mysql.fi +10 -1
    Fixes for Netware

  include/my_sys.h
    1.75.5.1 03/01/28 08:38:21 monty@mashka.mysql.fi +22 -19
    Fixes for Netware
    Added 'extern' before external functions

  include/my_pthread.h
    1.57.1.1 03/01/28 08:38:21 monty@mashka.mysql.fi +36 -2
    Fixes for Netware
    Added detection of mutexes that was not destroyed

  include/my_net.h
    1.13 03/01/28 08:38:21 monty@mashka.mysql.fi +1 -1
    Fixes for Netware

  include/my_global.h
    1.34.1.1 03/01/28 08:38:21 monty@mashka.mysql.fi +14 -5
    Fixes for Netware

  include/config-win.h
    1.23.1.1 03/01/28 08:38:21 monty@mashka.mysql.fi +3 -0
    Portability fix

  include/Makefile.am
    1.29.1.7 03/01/28 08:38:21 monty@mashka.mysql.fi +1 -1
    Fixes for Netware

  extra/resolveip.c
    1.13.1.5 03/01/28 08:38:21 monty@mashka.mysql.fi +4 -1
    Fixes for Netware

  configure.in
    1.191.1.63 03/01/28 08:38:21 monty@mashka.mysql.fi +196 -18
    Fixes for Netware

  client/mysqltest.c
    1.77.1.20 03/01/28 08:38:21 monty@mashka.mysql.fi +3 -15
    Portability fix

  client/mysqldump.c
    1.65.1.22 03/01/28 08:38:21 monty@mashka.mysql.fi +1 -1
    Portability fix

  client/mysql.cc
    1.93.1.35 03/01/28 08:38:20 monty@mashka.mysql.fi +96 -61
    Fixes for Netware.
    Fixed duplicate output when using 'tee'
    Simple optimisations

  bdb/os/os_handle.c
    1.2.1.1 03/01/28 08:38:20 monty@mashka.mysql.fi +1 -1
    Portability fix

  Makefile.am
    1.40.1.2 03/01/28 08:38:19 monty@mashka.mysql.fi +2 -1
    Added platform dirs

  BUILD/compile-pentium-valgrind-max
    1.2 03/01/28 08:38:19 monty@mashka.mysql.fi +1 -1
    Don't use valgrind with safemalloc as this can hide some bugs

ChangeSet
  1.676.1.645 03/01/28 06:48:26 monty@mashka.mysql.fi +4 -0
  Fix when using auto_increment and last_insert_id() in the same insert statement.

  mysql-test/t/rpl_insert_id.test
    1.1 03/01/28 06:48:25 monty@mashka.mysql.fi +39 -0

  mysql-test/r/rpl_insert_id.result
    1.1 03/01/28 06:48:25 monty@mashka.mysql.fi +15 -0

  sql/sql_base.cc
    1.74.1.28 03/01/28 06:48:25 monty@mashka.mysql.fi +6 -13
    S

  sql/log.cc
    1.55.1.15 03/01/28 06:48:25 monty@mashka.mysql.fi +1 -1
    Fix when using auto_increment and last_insert_id() in the same insert statement.

  mysql-test/t/rpl_insert_id.test
    1.0 03/01/28 06:48:25 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-3.23/mysql-test/t/rpl_insert_id.test

  mysql-test/r/rpl_insert_id.result
    1.0 03/01/28 06:48:25 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-3.23/mysql-test/r/rpl_insert_id.result

ChangeSet
  1.1417.5.7 03/01/28 05:34:32 igor@hundin.mysql.fi +2 -0
  my_pthread.h:
    Missing merge in changeset 1.1435

  BitKeeper/etc/logging_ok
    1.231 03/01/28 05:34:22 igor@hundin.mysql.fi +1 -0
    Logging to logging@openlogging.org accepted

  include/my_pthread.h
    1.59 03/01/28 05:22:21 igor@hundin.mysql.fi +7 -3
    Missing merge in changeset 1.1435

ChangeSet
  1.1417.5.6 03/01/28 03:37:57 venu@hundin.mysql.fi +3 -0
  Introduced a scalable key cache management.
  Added some fields to the st_my_thread_var structure to be
    able to link such structures into a list.

  BitKeeper/etc/logging_ok
    1.230 03/01/28 03:37:45 venu@hundin.mysql.fi +1 -0
    Logging to logging@openlogging.org accepted

ChangeSet
  1.676.1.644 03/01/28 02:10:56 monty@mashka.mysql.fi +1 -0
  Make PACKET_TOO_LARGE error handling safer in client

  libmysql/libmysql.c
    1.56.1.19 03/01/28 02:10:55 monty@mashka.mysql.fi +9 -11
    Make PACKET_TOO_LARGE error handling safer

ChangeSet
  1.1346.99.1 03/01/28 00:55:41 serg@serg.mysql.com +4 -0
  do not force CONNECTION_ID(), FOUND_ROWS(), PI(), CURRENT_USER(),
  and VERSION() to be uppercase in e.g. "select pi()"

  sql/item_create.cc
    1.15.3.1 03/01/28 00:55:39 serg@serg.mysql.com +5 -5
    do not force CONNECTION_ID(), FOUND_ROWS(), PI(), CURRENT_USER(),
    and VERSION() to be uppercase in e.g. "select pi()"

  mysql-test/r/union.result
    1.17.1.3 03/01/28 00:55:39 serg@serg.mysql.com +1 -1
    result updated

  mysql-test/r/select_found.result
    1.6.1.3 03/01/28 00:55:39 serg@serg.mysql.com +7 -7
    result updated

  mysql-test/r/func_math.result
    1.8.1.3 03/01/28 00:55:39 serg@serg.mysql.com +1 -1
    result updated

ChangeSet
  1.1417.5.5 03/01/28 00:33:04 serg@serg.mysql.com +1 -0
  do not ignore first char, when truncating spaces in str->num conversion.

  strings/ctype-simple.c
    1.26 03/01/28 00:33:02 serg@serg.mysql.com +1 -1
    do not ignore first char, when truncating spaces.

ChangeSet
  1.676.1.643 03/01/28 01:14:06 heikki@hundin.mysql.fi +1 -0
  btr0cur.c:
    Backport from 4.0: Fix a major bug in InnoDB query estimator for queries of type SELECT ... WHERE col < x and SELECT ... WHERE col > x; MySQL could pick a table scan though the result set was only a few rows in a big table

  innobase/btr/btr0cur.c
    1.7.1.15 03/01/28 01:14:00 heikki@hundin.mysql.fi +8 -4
    Backport from 4.0: Fix a major bug in InnoDB query estimator for queries of type SELECT ... WHERE col < x and SELECT ... WHERE col > x; MySQL could pick a table scan though the result set was only a few rows in a big table

ChangeSet
  1.1346.46.117 03/01/28 01:04:48 heikki@hundin.mysql.fi +1 -0
  btr0cur.c:
    Fix a major bug in InnoDB query estimator for queries of type SELECT ... WHERE col < x and SELECT ... WHERE col > x; MySQL could pick a table scan though the result set was only a few rows in a big table

  innobase/btr/btr0cur.c
    1.20.1.2 03/01/28 01:04:36 heikki@hundin.mysql.fi +8 -4
    Fix a major bug in InnoDB query estimator for queries of type SELECT ... WHERE col < x and SELECT ... WHERE col > x; MySQL could pick a table scan though the result set was only a few rows in a big table

ChangeSet
  1.1403.35.5 03/01/28 03:28:06 wax@mysql.com +1 -0
  correct parameter of hash_search

  sql/sql_udf.cc
    1.22.1.3 03/01/28 03:28:04 wax@mysql.com +1 -1
    correct parameter of hash_search

ChangeSet
  1.1346.46.116 03/01/27 20:55:03 lenz@mysql.com +1 -0
   - removed unused CC and CXX variables
   - CFLAGS and CXXFLAGS should honor RPM_OPT_FLAGS

  support-files/mysql.spec.sh
    1.60 03/01/27 20:55:01 lenz@mysql.com +8 -5
     - removed unused CC and CXX variables
     - CFLAGS and CXXFLAGS should honor RPM_OPT_FLAGS

ChangeSet
  1.1417.10.1 03/01/27 10:54:45 venu@myvenu.com +2 -0
  Fix stmt_close not to close the resources on error(libmysql)
  Enable test_stmt_close() and test output to stdout(client_test)

  libmysql/libmysql.c
    1.136 03/01/27 10:53:03 venu@myvenu.com +9 -7
    Fix stmt_close not to close the resources on error

  tests/client_test.c
    1.15 03/01/27 10:52:20 venu@myvenu.com +40 -26
    Enable test_stmt_close() and test output to stdout

ChangeSet
  1.1417.8.2 03/01/27 20:30:56 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/sql_parse.cc
    1.254.1.1 03/01/27 20:30:48 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1417.9.1 03/01/27 20:29:33 Sinisa@sinisa.nasamreza.org +5 -0
  My second SCRUM task:
  
  Automatically add SQL_BUFFER_RESULT if INSERT is done from 
  SELECT comprising a table to be inserted in.

  sql/sql_parse.cc
    1.252.1.1 03/01/27 20:29:26 Sinisa@sinisa.nasamreza.org +1 -2
    My second SCRUM task:
    
    Automatically add SQL_BUFFER_RESULT if INSERT is done from 
    SELECT comprising a table to be inserted in.

  mysql-test/t/subselect.test
    1.47.1.1 03/01/27 20:29:26 Sinisa@sinisa.nasamreza.org +0 -1
    My second SCRUM task:
    
    Automatically add SQL_BUFFER_RESULT if INSERT is done from 
    SELECT comprising a table to be inserted in.

  mysql-test/t/insert.test
    1.10 03/01/27 20:29:26 Sinisa@sinisa.nasamreza.org +31 -0
    My second SCRUM task:
    
    Automatically add SQL_BUFFER_RESULT if INSERT is done from 
    SELECT comprising a table to be inserted in.

  mysql-test/r/subselect.result
    1.55.1.1 03/01/27 20:29:26 Sinisa@sinisa.nasamreza.org +2 -1
    My second SCRUM task:
    
    Automatically add SQL_BUFFER_RESULT if INSERT is done from 
    SELECT comprising a table to be inserted in.

  mysql-test/r/insert.result
    1.11 03/01/27 20:29:26 Sinisa@sinisa.nasamreza.org +13 -0
    My second SCRUM task:
    
    Automatically add SQL_BUFFER_RESULT if INSERT is done from 
    SELECT comprising a table to be inserted in.

  mysys/mf_keycache.c
    1.22 03/01/27 20:01:04 igor@hundin.mysql.fi +1630 -629
    Introduced a scalable key cache management.

  include/my_pthread.h
    1.58 03/01/27 19:54:22 igor@hundin.mysql.fi +6 -7
    Added some fields to the st_my_thread_var structure to be
    able to link such structures into a list.

ChangeSet
  1.1346.46.115 03/01/27 15:37:25 Administrador@light. +5 -0
  Added option hostname.err

  sql/sql_parse.cc
    1.218.20.1 03/01/27 15:37:06 Administrador@light. +2 -0
    added option hostname.err

  sql/set_var.cc
    1.12.1.10 03/01/27 15:37:06 Administrador@light. +1 -0
    Added option hostname.err

  sql/mysqld.cc
    1.297.1.93 03/01/27 15:37:06 Administrador@light. +25 -4
    Added option hostname.err

  sql/mysql_priv.h
    1.150.1.28 03/01/27 15:37:06 Administrador@light. +4 -0
    Added option hostname.err

  sql/log.cc
    1.80.3.1 03/01/27 15:37:05 Administrador@light. +46 -0
    Added option hostname.err

ChangeSet
  1.1346.46.114 03/01/27 17:52:55 serg@serg.mysql.com +1 -0
  remove warnings

  myisam/ft_stopwords.c
    1.13.1.3 03/01/27 17:52:52 serg@serg.mysql.com +8 -11
    remove warnings

ChangeSet
  1.1417.6.6 03/01/27 17:27:21 serg@serg.mysql.com +1 -0
  protection agains badly charsed indexfile

  myisam/mi_open.c
    1.59 03/01/27 17:27:18 serg@serg.mysql.com +5 -1
    protection agains badly charsed indexfile

ChangeSet
  1.676.1.642 03/01/27 16:28:42 lenz@mysql.com +2 -0
   - replaced manual.texi with a dummy placeholder file (manual.texi is
     now maintained in a separate "mysqldoc" BK source tree) - it will be
     replaced with the correct manual.texi when building the official
     source distribution
   - fixed automake error about reservedwords.texi by moving it to EXTRA_DIST
     instead

  Docs/manual.texi
    1.497.65.55 03/01/27 16:28:38 lenz@mysql.com +32 -55626
     - replaced manual.texi with a dummy placeholder file (manual.texi is
       now maintained in a separate "mysqldoc" BK source tree) - it will be
       replaced with the correct manual.texi when building the official
       source distribution

  Docs/Makefile.am
    1.26.1.2 03/01/27 16:28:38 lenz@mysql.com +2 -2
     - moved reservedwords.texi from info_TEXINFOS to EXTRA_DIST since it is
       not a full-featured texi file and automake would complain about
       "missing @setfilename"

ChangeSet
  1.1417.8.1 03/01/27 18:46:51 bar@bar.mysql.r18.ru +1 -0
  field.cc:
    Use cs->scan() instead of my_isspace()

  sql/field.cc
    1.80 03/01/27 18:46:16 bar@bar.mysql.r18.ru +8 -10
    Use cs->scan() instead of my_isspace()

ChangeSet
  1.1417.7.1 03/01/27 15:37:05 serg@serg.mysql.com +2 -0
  select count(*) from t1 procedure analyse(); bug fixed

  sql/sql_select.cc
    1.189.1.1 03/01/27 15:37:02 serg@serg.mysql.com +3 -1
    select count(*) from t1 procedure analyse(); bug fixed

  mysql-test/r/analyse.result
    1.10 03/01/27 15:37:02 serg@serg.mysql.com +1 -1
    select count(*) from t1 procedure analyse(); bug fixed

  BitKeeper/deleted/.del-ChangeLog~dfc92e15bee6fc75
    1.43 03/01/27 16:34:43 monty@mashka.mysql.fi +0 -0
    Delete: sql/ChangeLog

ChangeSet
  1.1417.6.4 03/01/27 17:31:46 bar@bar.mysql.r18.ru +1 -0
  field.cc:
    tis620 normalization will be implemented ad a SQL function, without automatic normalization on INSERT

  sql/field.cc
    1.79 03/01/27 17:30:39 bar@bar.mysql.r18.ru +0 -33
    tis620 normalization will be implemented ad a SQL function, without automatic normalization on INSERT

ChangeSet
  1.1417.6.3 03/01/27 16:46:03 bar@bar.mysql.r18.ru +11 -0
  wb_wc and wc_mb now checks length inside

  strings/ctype-utf8.c
    1.30 03/01/27 16:46:00 bar@bar.mysql.r18.ru +6 -0
    wb_wc and wc_mb now checks length inside

  strings/ctype-ujis.c
    1.27 03/01/27 16:46:00 bar@bar.mysql.r18.ru +3 -0
    wb_wc and wc_mb now checks length inside

  strings/ctype-sjis.c
    1.34 03/01/27 16:46:00 bar@bar.mysql.r18.ru +6 -0
    wb_wc and wc_mb now checks length inside

  strings/ctype-simple.c
    1.25 03/01/27 16:46:00 bar@bar.mysql.r18.ru +6 -0
    wb_wc and wc_mb now checks length inside

  strings/ctype-gbk.c
    1.29 03/01/27 16:46:00 bar@bar.mysql.r18.ru +6 -0
    wb_wc and wc_mb now checks length inside

  strings/ctype-gb2312.c
    1.25 03/01/27 16:46:00 bar@bar.mysql.r18.ru +6 -0
    wb_wc and wc_mb now checks length inside

  strings/ctype-euc_kr.c
    1.27 03/01/27 16:46:00 bar@bar.mysql.r18.ru +6 -0
    wb_wc and wc_mb now checks length inside

  strings/ctype-bin.c
    1.17 03/01/27 16:46:00 bar@bar.mysql.r18.ru +6 -0
    wb_wc and wc_mb now checks length inside

  strings/ctype-big5.c
    1.29 03/01/27 16:46:00 bar@bar.mysql.r18.ru +6 -0
    wb_wc and wc_mb now checks length inside

  sql/sql_string.cc
    1.44 03/01/27 16:46:00 bar@bar.mysql.r18.ru +1 -1
    wb_wc and wc_mb now checks length inside

  sql/item_strfunc.cc
    1.69 03/01/27 16:46:00 bar@bar.mysql.r18.ru +3 -4
    wb_wc and wc_mb now checks length inside

ChangeSet
  1.676.1.641 03/01/27 13:44:16 lenz@mysql.com +5 -0
   - added a dummy file "reservedwords.texi" to the BK tree and the Makefiles,
     so it's part of the distribution (manual.texi includes this file)
     It will be replaced with the correct one from the mysqldoc tree before
     building the distribution
   - removed generation and inclusion of MIRRORS file, since the mirror list
     is no longer part of manual.texi anyway
   - replaced YFLAGS with AM_YFLAGS in sql/Makefile.am to make automake happy
   - Redirect standard error when checking for dpkg-architecture in ltconfig
     to avoid error message showing during configuration

  sql/Makefile.am
    1.38.1.8 03/01/27 13:44:15 lenz@mysql.com +1 -1
     - replaced YFLAGS with AM_YFLAGS to make automake happy

  ltconfig
    1.6.1.4 03/01/27 13:44:15 lenz@mysql.com +1 -1
     - Redirect standard error when checking for dpkg-architecture
       to avoid error message showing during configuration (thanks to
       John Wythe for the patch)

  Makefile.am
    1.22.1.6 03/01/27 13:44:15 lenz@mysql.com +1 -1
     - removed MIRRORS from EXTRA_DIST (it's not part of the manual anymore)

  Docs/reservedwords.texi
    1.2 03/01/27 13:44:15 lenz@mysql.com +4 -5
     - Updated wording a bit after adding it to the tree

  Docs/Makefile.am
    1.26.1.1 03/01/27 13:44:15 lenz@mysql.com +2 -5
     - added reservedwords.texi (which gets included by manual.texi)
     - removed MIRRORS (mirror list is not part of the manual anymore)

  Docs/reservedwords.texi
    1.1 03/01/27 12:16:11 lenz@mysql.com +15 -0

  Docs/reservedwords.texi
    1.0 03/01/27 12:16:11 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-3.23-build/Docs/reservedwords.texi

ChangeSet
  1.1346.46.113 03/01/27 12:12:12 serg@serg.mysql.com +3 -0
  fixes for SHOW VARIABLES and --ft-stopword-list

  sql/set_var.cc
    1.12.1.9 03/01/27 12:12:10 serg@serg.mysql.com +1 -1
    fixes for SHOW VARIABLES and --ft-stopword-list

  mysql-test/r/fulltext_var.result
    1.8 03/01/27 12:12:10 serg@serg.mysql.com +1 -1
    fixes for SHOW VARIABLES and --ft-stopword-list

  myisam/ft_stopwords.c
    1.13.1.2 03/01/27 12:12:10 serg@serg.mysql.com +5 -2
    fixes for SHOW VARIABLES and --ft-stopword-list

ChangeSet
  1.1346.46.112 03/01/27 11:15:54 serg@serg.mysql.com +2 -0
  ft_stopword_file added to 'SHOW VARIABLES' output

  sql/set_var.cc
    1.12.1.8 03/01/27 11:15:52 serg@serg.mysql.com +2 -1
    ft_stopword_file added to 'SHOW VARIABLES' output

  mysql-test/r/fulltext_var.result
    1.7 03/01/27 11:15:52 serg@serg.mysql.com +2 -1
    ft_stopword_file added to 'SHOW VARIABLES' output

ChangeSet
  1.1417.6.2 03/01/27 13:46:33 bar@bar.mysql.r18.ru +1 -0
  sql_yacc.yy:
    Semicolon has been added

  sql/sql_yacc.yy
    1.203.20.2 03/01/27 13:46:12 bar@bar.mysql.r18.ru +1 -1
    Semicolon has been added

ChangeSet
  1.1346.46.111 03/01/27 00:14:12 serg@serg.mysql.com +1 -0
  ft_init_stopwords() in embedded

  libmysqld/lib_sql.cc
    1.25.3.5 03/01/27 00:14:10 serg@serg.mysql.com +2 -2
    ft_init_stopwords() in embedded

ChangeSet
  1.1417.1.15 03/01/26 21:34:14 bell@sanja.is.com.ua +4 -0
  Merge sanja.is.com.ua:/home/bell/mysql/work-leak-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-select-4.1

  sql/sql_select.cc
    1.192 03/01/26 21:34:11 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.59 03/01/26 21:34:11 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.47.1.4 03/01/26 21:34:11 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.43.1.5 03/01/26 21:34:11 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1417.1.14 03/01/26 21:30:35 bell@sanja.is.com.ua +16 -0
  after merge fix of 577 task (SCRUM, pre commit to be able to merge with static tables optimization fix)
  fixed derived tables with subselect inside

  sql/sql_select.cc
    1.191 03/01/26 21:29:01 bell@sanja.is.com.ua +22 -14
    after merge fix
    fixed derived tables with subselect inside

  sql/sql_prepare.cc
    1.23 03/01/26 21:29:01 bell@sanja.is.com.ua +8 -4
    after merge fix

  sql/sql_parse.cc
    1.256 03/01/26 21:29:01 bell@sanja.is.com.ua +1 -2
    fixed derived tables with subselect inside
    after merge fix

  sql/sql_lex.h
    1.102.1.11 03/01/26 21:29:01 bell@sanja.is.com.ua +4 -2
    fixed derived tables with subselect inside

  sql/sql_lex.cc
    1.68 03/01/26 21:29:01 bell@sanja.is.com.ua +7 -5
    fixed derived tables with subselect inside

  sql/sql_derived.cc
    1.33 03/01/26 21:29:01 bell@sanja.is.com.ua +43 -24
    fixed derived tables with subselect inside

  sql/sql_class.h
    1.139 03/01/26 21:29:01 bell@sanja.is.com.ua +0 -11
    after merge fix

  sql/mysql_priv.h
    1.177 03/01/26 21:29:01 bell@sanja.is.com.ua +1 -0
    fixed derived tables with subselect inside

  sql/item_sum.h
    1.30 03/01/26 21:29:01 bell@sanja.is.com.ua +16 -0
    after merge fix

  sql/item_subselect.cc
    1.50 03/01/26 21:29:01 bell@sanja.is.com.ua +5 -7
    after merge fix

  sql/item_cmpfunc.h
    1.39 03/01/26 21:29:01 bell@sanja.is.com.ua +0 -2
    after merge fix

  sql/item.h
    1.47.1.3 03/01/26 21:29:01 bell@sanja.is.com.ua +3 -3
    after merge fix

  sql/item.cc
    1.43.1.4 03/01/26 21:29:01 bell@sanja.is.com.ua +3 -9
    after merge fix

  mysql-test/t/subselect.test
    1.49 03/01/26 21:29:01 bell@sanja.is.com.ua +12 -9
    subselect test (not finished)

  mysql-test/t/derived.test
    1.18 03/01/26 21:29:01 bell@sanja.is.com.ua +5 -1
    test of subselects inside derived tables

  mysql-test/r/derived.result
    1.19 03/01/26 21:29:01 bell@sanja.is.com.ua +11 -1
    test of subselects inside derived tables

ChangeSet
  1.1403.73.1 03/01/26 21:13:37 bell@sanja.is.com.ua +4 -0
  removed switching off static table optimization for subselects (SCRUM , pre-commit  to be able merge with temporary table fix)
  

  sql/sql_select.cc
    1.173.29.1 03/01/26 21:13:30 bell@sanja.is.com.ua +5 -12
    removed switching off static table optimization for subselects

  sql/item_cmpfunc.cc
    1.53.1.1 03/01/26 21:13:30 bell@sanja.is.com.ua +8 -0
    report other table for outer reference

  sql/item.h
    1.41.12.1 03/01/26 21:13:30 bell@sanja.is.com.ua +10 -4
    report other table for outer reference

  sql/item.cc
    1.27.23.1 03/01/26 21:13:30 bell@sanja.is.com.ua +1 -1
    report other table for outer reference

ChangeSet
  1.1417.6.1 03/01/26 20:01:45 serg@serg.mysql.com +6 -0
  making the keyword ROW for row items optional 

  sql/sql_yacc.yy
    1.203.20.1 03/01/26 20:01:42 serg@serg.mysql.com +43 -29
    making the keyword ROW for row items optional 

  sql/item_cmpfunc.h
    1.37.1.1 03/01/26 20:01:42 serg@serg.mysql.com +3 -16
    making the keyword ROW for row items optional 

  sql/item_cmpfunc.cc
    1.57.1.1 03/01/26 20:01:42 serg@serg.mysql.com +22 -46
    making the keyword ROW for row items optional 

  sql/item.h
    1.47.2.1 03/01/26 20:01:42 serg@serg.mysql.com +1 -1
    making the keyword ROW for row items optional 

  mysql-test/t/row.test
    1.10 03/01/26 20:01:42 serg@serg.mysql.com +10 -7
    making the keyword ROW for row items optional 

  mysql-test/r/row.result
    1.11 03/01/26 20:01:42 serg@serg.mysql.com +15 -4
    making the keyword ROW for row items optional 

ChangeSet
  1.1346.46.110 03/01/26 14:20:43 serg@serg.mysql.com +1 -0
  enadling out-of-cache reads for shared IO_CACHE

  myisam/mi_cache.c
    1.14 03/01/26 14:20:41 serg@serg.mysql.com +4 -3
    enadling out-of-cache reads for shared IO_CACHE

ChangeSet
  1.1346.46.109 03/01/26 12:57:20 serg@serg.mysql.com +1 -0
  do not "trust number of broadcasts" in shared IO_CACHE

  mysys/mf_iocache.c
    1.36 03/01/26 12:57:18 serg@serg.mysql.com +5 -5
    do not "trust number of broadcasts" in shared IO_CACHE

ChangeSet
  1.1346.46.107 03/01/26 12:27:29 serg@serg.mysql.com +3 -0
  fixed bug in parallel repair

  mysys/mf_iocache.c
    1.35 03/01/26 12:27:26 serg@serg.mysql.com +29 -29
    fixed bug in parallel repair

  myisam/mi_check.c
    1.86.1.26 03/01/26 12:27:26 serg@serg.mysql.com +5 -4
    fixed bug in parallel repair

  include/my_sys.h
    1.75.1.17 03/01/26 12:27:26 serg@serg.mysql.com +1 -1
    fixed bug in parallel repair

ChangeSet
  1.1417.5.1 03/01/25 22:52:45 venu@myvenu.com +2 -0
  Remove un-used variables
  Pure coverage tests (debug only)

  tests/client_test.c
    1.14 03/01/25 22:50:57 venu@myvenu.com +22 -0
    Pure coverage tests (debug only)

  include/mysql.h
    1.57 03/01/25 22:50:38 venu@myvenu.com +1 -3
    Remove un-used variables

ChangeSet
  1.1403.35.4 03/01/26 07:00:01 wax@mysql.com +1 -0
  correct parameter of hash_result
  (SCRUM)

  sql/sql_udf.cc
    1.22.1.2 03/01/26 06:59:58 wax@mysql.com +1 -1
    correct parameter of hash_search
    (deleted old bugs, added new bugs)

  mysys/my_sleep.c
    1.5 03/01/25 16:45:59 monty@mashka.mysql.fi +0 -0
    Rename: mysys/mf_sleep.c -> mysys/my_sleep.c

ChangeSet
  1.1346.98.2 03/01/25 15:31:07 monty@mashka.mysql.fi +15 -0
  Merge with 3.23.55

  sql/sql_parse.cc
    1.218.1.71 03/01/25 15:31:05 monty@mashka.mysql.fi +0 -0
    Merge with 3.23.55 (fix double free of user)

  sql/net_serv.cc
    1.46.1.6 03/01/25 15:31:05 monty@mashka.mysql.fi +1 -19
    use local

  sql/ha_innodb.cc
    1.73.1.72 03/01/25 15:31:05 monty@mashka.mysql.fi +0 -10
    use local

  libmysql/libmysql.c
    1.95.1.25 03/01/25 15:31:05 monty@mashka.mysql.fi +9 -11
    Dont abort connection if too big packet error

  configure.in
    1.191.1.62 03/01/25 15:31:05 monty@mashka.mysql.fi +0 -1
    Use local

  client/mysqladmin.c
    1.66.2.2 03/01/25 15:31:05 monty@mashka.mysql.fi +2 -3
    Merge with 3.23.55

  Makefile.am
    1.40.1.1 03/01/25 15:31:05 monty@mashka.mysql.fi +1 -2
    remove double libmysql_r

  Build-tools/Do-compile
    1.73 03/01/25 15:31:05 monty@mashka.mysql.fi +2 -60
    Use local version

  sql/sql_select.cc
    1.152.1.68 03/01/25 15:10:45 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/mysqld.cc
    1.297.23.1 03/01/25 15:10:44 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/log.cc
    1.80.1.27 03/01/25 15:10:44 monty@mashka.mysql.fi +0 -0
    Auto merged

  scripts/make_binary_distribution.sh
    1.44.1.1 03/01/25 15:10:44 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysql/Makefile.am
    1.29.1.1 03/01/25 15:10:44 monty@mashka.mysql.fi +0 -3
    Auto merged

  innobase/os/os0file.c
    1.44.1.1 03/01/25 15:10:44 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-net.c~ef21d6402bb882f9
    1.29 03/01/25 15:10:43 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-net.c~ef21d6402bb882f9
    1.14.1.5 03/01/25 15:10:43 monty@mashka.mysql.fi +0 -685
    Merge file types: FILE -> SYMLINK

  sql/ha_innodb.cc
    1.45.21.2 03/01/25 15:10:11 monty@mashka.mysql.fi +0 -0
    Merge rename: sql/ha_innobase.cc -> sql/ha_innodb.cc

ChangeSet
  1.1346.98.1 03/01/25 15:07:51 monty@mashka.mysql.fi +14 -0
  Added timeout for wait_for_master_pos
  Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000
  Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.

  mysql-test/t/rpl_master_pos_wait.test
    1.1 03/01/25 15:07:47 monty@mashka.mysql.fi +9 -0

  mysql-test/r/rpl_master_pos_wait.result
    1.1 03/01/25 15:07:47 monty@mashka.mysql.fi +9 -0

  sql/sql_yacc.yy
    1.145.1.52 03/01/25 15:07:47 monty@mashka.mysql.fi +11 -0
    Added timeout for wait_for_master_pos
    Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000
    Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
    

  sql/sql_repl.cc
    1.86.1.4 03/01/25 15:07:47 monty@mashka.mysql.fi +10 -11
    Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000

  sql/sql_parse.cc
    1.218.1.70 03/01/25 15:07:47 monty@mashka.mysql.fi +23 -0
    Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.

  mysql-test/t/rpl_master_pos_wait.test
    1.0 03/01/25 15:07:47 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysql-test/t/rpl_master_pos_wait.test

  mysql-test/r/rpl_master_pos_wait.result
    1.0 03/01/25 15:07:47 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysql-test/r/rpl_master_pos_wait.result

  sql/slave.h
    1.50.1.3 03/01/25 15:07:46 monty@mashka.mysql.fi +3 -1
    Added timeout for wait_for_master_pos
    Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
    

  sql/slave.cc
    1.164.1.43 03/01/25 15:07:46 monty@mashka.mysql.fi +238 -36
    Added timeout for wait_for_master_pos
    Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000
    Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
    

  sql/lex.h
    1.66.1.22 03/01/25 15:07:46 monty@mashka.mysql.fi +1 -2
    Added timeout for wait_for_master_pos

  sql/item_func.h
    1.39.1.18 03/01/25 15:07:46 monty@mashka.mysql.fi +2 -1
    Added timeout for wait_for_master_pos

  sql/item_func.cc
    1.60.1.25 03/01/25 15:07:46 monty@mashka.mysql.fi +3 -2
    Added timeout for wait_for_master_pos

  sql/item_create.h
    1.11.1.7 03/01/25 15:07:46 monty@mashka.mysql.fi +0 -1
    Added timeout for wait_for_master_pos

  sql/item_create.cc
    1.15.1.10 03/01/25 15:07:46 monty@mashka.mysql.fi +0 -6
    Added timeout for wait_for_master_pos

  mysql-test/t/rpl000009.test
    1.14.1.1 03/01/25 15:07:46 monty@mashka.mysql.fi +5 -3
    Fixed replication test after fixing replication of DROP/CREATE DATABASE

  mysql-test/r/rpl000009.result
    1.9.1.1 03/01/25 15:07:46 monty@mashka.mysql.fi +5 -3
    Fixed replication test after fixing replication of DROP/CREATE DATABASE

ChangeSet
  1.1346.97.4 03/01/25 17:03:00 walrus@mysql.com +4 -0
  Change bench files for mimer compability, change crash-me for correct testing time datafields

  sql-bench/test-select.sh
    1.21 03/01/25 17:02:56 walrus@mysql.com +15 -12
    some changes for mimer compability

  sql-bench/test-insert.sh
    1.37.1.2 03/01/25 17:02:56 walrus@mysql.com +5 -5
    some changes for mimer compability

  sql-bench/server-cfg.sh
    1.39.1.10 03/01/25 17:02:56 walrus@mysql.com +27 -2
    - Add parameter time_format_inresult  
    - add parameters time_format_ISO, time_format_EUR, time_format_USA,          
     time_format_HHMMSS, time_format_HHHHMMSS
    - changed sub version() for mysql in the server-cfg, that version shows if 
     client connects with SSL
    - made --verbose by default
    - paramters func_extra_time_to_sec, ..sec_to_time, ..addtime, ..subtime, 
    ..timediff, ..maketime, ..time, func_odbc_hour, ..hour_time, ...minute, 
    ...second now uses time formats, that understandable for DBMS

  sql-bench/crash-me.sh
    1.34.1.10 03/01/25 17:02:56 walrus@mysql.com +132 -18
    rectify mimer section

ChangeSet
  1.1417.1.13 03/01/25 13:19:46 bell@sanja.is.com.ua +31 -0
  merging

  sql/sql_select.cc
    1.190 03/01/25 13:19:44 bell@sanja.is.com.ua +11 -3
    merging

  sql/sql_prepare.cc
    1.22 03/01/25 13:19:44 bell@sanja.is.com.ua +2 -8
    merging

  sql/sql_lex.cc
    1.67 03/01/25 13:19:44 bell@sanja.is.com.ua +1 -1
    merging

  sql/sql_derived.cc
    1.32 03/01/25 13:19:44 bell@sanja.is.com.ua +17 -30
    merging

  sql/sql_base.cc
    1.136 03/01/25 13:19:44 bell@sanja.is.com.ua +2 -2
    merging

  sql/item_timefunc.h
    1.28 03/01/25 13:19:44 bell@sanja.is.com.ua +4 -4
    merging

  sql/item_sum.h
    1.29 03/01/25 13:19:44 bell@sanja.is.com.ua +3 -19
    merging

  sql/item_subselect.cc
    1.49 03/01/25 13:19:44 bell@sanja.is.com.ua +7 -12
    merging

  sql/item_func.h
    1.63 03/01/25 13:19:44 bell@sanja.is.com.ua +1 -1
    merging

  sql/item_func.cc
    1.97 03/01/25 13:19:44 bell@sanja.is.com.ua +0 -0
    merging

  sql/item.h
    1.47.1.2 03/01/25 13:19:44 bell@sanja.is.com.ua +0 -1
    merging

  mysql-test/t/subselect.test
    1.48 03/01/25 13:19:44 bell@sanja.is.com.ua +3 -3
    merging

  mysql-test/r/subselect.result
    1.56 03/01/25 13:19:44 bell@sanja.is.com.ua +3 -3
    merging

  sql/sql_yacc.yy
    1.203.18.2 03/01/25 02:32:52 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_update.cc
    1.73 03/01/25 02:32:52 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_union.cc
    1.58 03/01/25 02:32:52 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_table.cc
    1.145 03/01/25 02:32:52 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.h
    1.35 03/01/25 02:32:52 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.255 03/01/25 02:32:51 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_olap.cc
    1.7 03/01/25 02:32:51 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_load.cc
    1.43 03/01/25 02:32:51 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_list.h
    1.15 03/01/25 02:32:51 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.1.10 03/01/25 02:32:51 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_insert.cc
    1.81 03/01/25 02:32:51 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_delete.cc
    1.96 03/01/25 02:32:51 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_class.h
    1.138 03/01/25 02:32:51 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.176 03/01/25 02:32:51 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_sum.cc
    1.55 03/01/25 02:32:51 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.38 03/01/25 02:32:51 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.58 03/01/25 02:32:51 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.43.1.3 03/01/25 02:32:50 bell@sanja.is.com.ua +0 -1
    Auto merged

ChangeSet
  1.1388.22.1 03/01/25 02:25:52 bell@sanja.is.com.ua +33 -0
  fixed subselects with temporary tables (SCRUM)
  fixed memory leacks

  sql/sql_yacc.yy
    1.203.19.1 03/01/25 02:25:49 bell@sanja.is.com.ua +15 -4
    fixed subselects with temporary tables

  sql/sql_update.cc
    1.70.1.1 03/01/25 02:25:49 bell@sanja.is.com.ua +20 -8
    fixed subselects with temporary tables

  sql/sql_union.cc
    1.52.2.1 03/01/25 02:25:49 bell@sanja.is.com.ua +24 -19
    fixed subselects with temporary tables

  sql/sql_table.cc
    1.125.8.1 03/01/25 02:25:49 bell@sanja.is.com.ua +8 -5
    fixed subselects with temporary tables

  sql/sql_select.h
    1.33.1.1 03/01/25 02:25:49 bell@sanja.is.com.ua +41 -13
    fixed subselects with temporary tables

  sql/sql_select.cc
    1.173.28.1 03/01/25 02:25:49 bell@sanja.is.com.ua +581 -355
    fixed subselects with temporary tables

  sql/sql_prepare.cc
    1.13.2.1 03/01/25 02:25:49 bell@sanja.is.com.ua +9 -7
    fixed subselects with temporary tables

  sql/sql_parse.cc
    1.235.39.1 03/01/25 02:25:49 bell@sanja.is.com.ua +11 -4
    fixed subselects with temporary tables

  sql/sql_olap.cc
    1.5.1.1 03/01/25 02:25:49 bell@sanja.is.com.ua +4 -2
    fixed subselects with temporary tables

  sql/sql_load.cc
    1.39.2.1 03/01/25 02:25:49 bell@sanja.is.com.ua +2 -1
    fixed subselects with temporary tables

  sql/sql_list.h
    1.13.1.1 03/01/25 02:25:49 bell@sanja.is.com.ua +14 -3
    fixed subselects with temporary tables

  sql/sql_lex.h
    1.102.3.1 03/01/25 02:25:49 bell@sanja.is.com.ua +9 -4
    fixed subselects with temporary tables

  sql/sql_lex.cc
    1.59.6.1 03/01/25 02:25:49 bell@sanja.is.com.ua +7 -3
    fixed subselects with temporary tables

  sql/sql_insert.cc
    1.79.1.1 03/01/25 02:25:49 bell@sanja.is.com.ua +7 -5
    fixed subselects with temporary tables

  sql/sql_do.cc
    1.6 03/01/25 02:25:49 bell@sanja.is.com.ua +1 -1
    fixed subselects with temporary tables

  sql/sql_derived.cc
    1.23.1.1 03/01/25 02:25:49 bell@sanja.is.com.ua +9 -4
    fixed subselects with temporary tables

  sql/sql_delete.cc
    1.94.1.1 03/01/25 02:25:49 bell@sanja.is.com.ua +5 -1
    fixed subselects with temporary tables

  sql/sql_class.h
    1.123.13.1 03/01/25 02:25:49 bell@sanja.is.com.ua +13 -1
    fixed subselects with temporary tables

  sql/sql_base.cc
    1.122.18.1 03/01/25 02:25:49 bell@sanja.is.com.ua +58 -32
    fixed subselects with temporary tables

  sql/mysql_priv.h
    1.160.21.1 03/01/25 02:25:49 bell@sanja.is.com.ua +20 -15
    fixed subselects with temporary tables

  sql/item_uniq.h
    1.10 03/01/25 02:25:49 bell@sanja.is.com.ua +2 -0
    some item made copyable
    methods for creating copy of item list

  sql/item_timefunc.h
    1.25.1.1 03/01/25 02:25:49 bell@sanja.is.com.ua +14 -13
    tmp_table_field() splited

  sql/item_sum.h
    1.23.2.1 03/01/25 02:25:49 bell@sanja.is.com.ua +68 -4
    some item made copyable
    methods for creating copy of item list

  sql/item_sum.cc
    1.47.3.1 03/01/25 02:25:49 bell@sanja.is.com.ua +58 -16
    some item made copyable
    methods for creating copy of item list

  sql/item_subselect.cc
    1.33.2.1 03/01/25 02:25:49 bell@sanja.is.com.ua +15 -6
    changed references creation

  sql/item_func.h
    1.54.1.1 03/01/25 02:25:49 bell@sanja.is.com.ua +3 -1
    some item made copyable
    methods for creating copy of item list
    changed references creation
    tmp_table_field() splited

  sql/item_func.cc
    1.88.2.1 03/01/25 02:25:49 bell@sanja.is.com.ua +15 -6
    some item made copyable
    methods for creating copy of item list
    changed references creation

  sql/item_cmpfunc.h
    1.27.1.1 03/01/25 02:25:49 bell@sanja.is.com.ua +2 -2
    changed references creation

  sql/item_cmpfunc.cc
    1.43.1.1 03/01/25 02:25:49 bell@sanja.is.com.ua +13 -7
    changed references creation

  sql/item.h
    1.41.11.1 03/01/25 02:25:49 bell@sanja.is.com.ua +23 -4
    some item made copyable
    methods for creating copy of item list
    tmp_table_field() splited

  sql/item.cc
    1.27.22.1 03/01/25 02:25:49 bell@sanja.is.com.ua +72 -4
    some item made copyable
    methods for creating copy of item list
    tmp_table_field() splited

  mysql-test/t/subselect.test
    1.35.1.1 03/01/25 02:25:49 bell@sanja.is.com.ua +6 -6
    some changes in subselect tests

  mysql-test/r/subselect.result
    1.39.2.1 03/01/25 02:25:49 bell@sanja.is.com.ua +4 -10
    some changes in subselect tests

ChangeSet
  1.1346.97.3 03/01/24 16:10:21 lenz@mysql.com +2 -0
   - added mysql_waitpid to the MySQL-client RPM and binary distributions
   - renamed MySQL.rpm to MySQL-server.rpm

  support-files/mysql.spec.sh
    1.59 03/01/24 16:10:19 lenz@mysql.com +38 -3
     - renamed package "MySQL" to "MySQL-server"
     - fixed Copyright tag
     - added mysql_waitpid to "client" subpackage (required for mysql-test-run)

  scripts/make_binary_distribution.sh
    1.45 03/01/24 16:10:19 lenz@mysql.com +1 -1
     - added mysql_waitpid to binary distribution (required for mysql-test-run)

ChangeSet
  1.676.272.4 03/01/24 14:59:36 monty@mashka.mysql.fi +1 -0
  Fix bug in --relative (-r)

  client/mysqladmin.c
    1.41.1.3 03/01/24 14:59:35 monty@mashka.mysql.fi +2 -2
    Fix bug in --relative (-r)

ChangeSet
  1.1417.1.12 03/01/24 03:17:26 venu@myvenu.com +2 -0
  Misc cleanups + pure coverage test + Monty's comments

  libmysql/libmysql.c
    1.135 03/01/24 03:16:13 venu@myvenu.com +27 -8

  tests/client_test.c
    1.13 03/01/24 03:15:57 venu@myvenu.com +155 -20

ChangeSet
  1.1417.1.11 03/01/23 22:39:07 venu@myvenu.com +1 -0
  Add DATE,TIME and TS tests - MYSQL_TIME handling

  tests/client_test.c
    1.12 03/01/23 22:38:55 venu@myvenu.com +274 -21

ChangeSet
  1.1417.1.10 03/01/23 22:36:27 venu@myvenu.com +2 -0
  MYSQL_TIME handling - client
  Remove get_binary_length 
  Enable the clients to work wih date,time and ts directly with binary protocol

  libmysql/libmysql.c
    1.134 03/01/23 22:36:05 venu@myvenu.com +284 -127

  include/mysql.h
    1.56 03/01/23 22:33:50 venu@myvenu.com +18 -0

ChangeSet
  1.1417.1.9 03/01/23 22:32:39 venu@myvenu.com +4 -0
  MYSQL_TIME handling(Direct DATE,TIME and TS th' structure) - server

  sql/item.cc
    1.43.1.2 03/01/23 22:32:03 venu@myvenu.com +29 -0

  sql/item.h
    1.47.1.1 03/01/23 22:32:02 venu@myvenu.com +5 -0

  sql/protocol.cc
    1.40 03/01/23 22:31:52 venu@myvenu.com +1 -0

  sql/sql_prepare.cc
    1.21 03/01/23 22:31:44 venu@myvenu.com +91 -2

ChangeSet
  1.1417.1.8 03/01/24 04:47:06 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Temporary fix to make the new client/server protocol to work: fetch all columns in an index, even if not needed by the SELECT statement; Monty has to fix the parser to tell InnoDB what to fetch

  sql/ha_innodb.cc
    1.85.1.10 03/01/24 04:46:58 heikki@hundin.mysql.fi +17 -4
    Temporary fix to make the new client/server protocol to work: fetch all columns in an index, even if not needed by the SELECT statement; Monty has to fix the parser to tell InnoDB what to fetch

ChangeSet
  1.1346.97.2 03/01/24 01:54:39 bell@sanja.is.com.ua +3 -0
  fixed table invalidation in simple renaming

  sql/sql_table.cc
    1.112.1.32 03/01/24 01:54:34 bell@sanja.is.com.ua +2 -0
    fixed table invalidation in simple renaming

  mysql-test/t/query_cache.test
    1.16.1.1 03/01/24 01:54:34 bell@sanja.is.com.ua +14 -0
    test of simple renaming & QC

  mysql-test/r/query_cache.result
    1.15.1.1 03/01/24 01:54:34 bell@sanja.is.com.ua +11 -0
    test of simple renaming & QC

ChangeSet
  1.1346.97.1 03/01/24 07:41:48 arjen@george.bitbike.com +1 -0
  Moved to mysqldoc tree.

  BitKeeper/deleted/.del-ManualStyleGuidelines.wiki~4e97d272fd42b393
    1.10 03/01/24 07:40:58 arjen@george.bitbike.com +0 -0
    Delete: Docs/ManualStyleGuidelines.wiki

ChangeSet
  1.1417.1.7 03/01/23 21:49:28 monty@mashka.mysql.fi +5 -0
  Avoid memory overruns when buffer_length is too small (when fetching binary data in prepared statements)

  sql/sql_parse.cc
    1.254 03/01/23 21:49:26 monty@mashka.mysql.fi +7 -4
    Clean up multi-query

  sql/mysqld.cc
    1.326 03/01/23 21:49:26 monty@mashka.mysql.fi +140 -134
    Code cleanup; Added back shared memory support (which was accidently deleted)

  libmysqld/lib_sql.cc
    1.44 03/01/23 21:49:26 monty@mashka.mysql.fi +6 -4
    Fixed function name

  libmysql/libmysql.c
    1.133 03/01/23 21:49:26 monty@mashka.mysql.fi +6 -2
    Avoid memory overruns when buffer_length is too small

  include/errmsg.h
    1.16 03/01/23 21:49:26 monty@mashka.mysql.fi +1 -1
    Remove compiler warning

ChangeSet
  1.676.272.3 03/01/23 20:24:29 lenz@mysql.com +1 -0
   - bump up version number 3.23.55 -> 3.23.56 in configure.in
   - tagged ChangeSet 1.1315 as "mysql-3.23.55"

  configure.in
    1.124.1.83 03/01/23 20:24:29 lenz@mysql.com +1 -1
     - bump up version number 3.23.55 -> 3.23.56

ChangeSet
  1.676.272.2 03/01/23 20:07:19 lenz@mysql.com +2 -0
   - merge relevant Do-compile changes from 4.0 tree
   - use "gnutar" on Mac OS X to build the binary distribution

  scripts/make_binary_distribution.sh
    1.29.1.7 03/01/23 20:07:17 lenz@mysql.com +1 -1
     - make sure to use "gnutar" (on Mac OS X) to pack up the binary distribution
       (Mac OS X "tar" seems to be buggy - the resulting tarballs appear to be
       corrupted, e.g. when opening them with Midnight Commander. GNU tar seems
       to extract them correctly, though)

  Build-tools/Do-compile
    1.33.1.18 03/01/23 20:07:17 lenz@mysql.com +60 -23
     - merged relevevant changes from 4.0 (Options no-mysqltest, no-benchmark,
       log_timestamp function)

ChangeSet
  1.1346.46.105 03/01/23 19:54:20 lenz@mysql.com +1 -0
   - removed a redundant "-u root" (it's included in $mysqladmin_args)

  Build-tools/Do-compile
    1.72 03/01/23 19:54:19 lenz@mysql.com +1 -1
     - removed a redundant "-u root" (it's included in $mysqladmin_args)

ChangeSet
  1.676.272.1 03/01/23 16:41:26 lenz@mysql.com +1 -0
   - reverted previous patch ("make distclean" tried to clean libmysql_r
     twice, if --enabable-thread-safe-client is enabled, which broke RPM
     building)

  Makefile.am
    1.22.1.5 03/01/23 16:41:25 lenz@mysql.com +1 -1
     - reverted previous patch and removed libmysql_r from SUBDIRS again
       (it will automatically be added when --enable-thread-safe-client is
       used)

ChangeSet
  1.676.1.639 03/01/23 15:49:56 Sinisa@sinisa.nasamreza.org +1 -0
  small fix for SHOW STATUS

  sql/mysqld.cc
    1.162.1.105 03/01/23 15:49:54 Sinisa@sinisa.nasamreza.org +2 -2
    small fix for SHOW STATUS

ChangeSet
  1.1403.72.2 03/01/23 12:41:54 pem@mysql.com +27 -0
  Added check for selects without into in SPs, and updated error messages and tests
  accordingly.

ChangeSet
  1.1403.72.1 03/01/23 17:00:31 vva@eagle.mysql.r18.ru +4 -0
  solve the lex conflict between the existing repeat() function 
  and repeat SP-construction

  sql/sql_yacc.yy
    1.212.1.2 03/01/23 12:41:51 pem@mysql.com +15 -6
    Check if an SP substatement is a SELECT and if so, has an INTO. If not, it's an
    error.

  mysql-test/t/sp.test
    1.1.1.2 03/01/23 12:41:51 pem@mysql.com +18 -0
    New test for repeat(...) and select with and without into in SPs.

  mysql-test/r/sp.result
    1.1.1.2 03/01/23 12:41:51 pem@mysql.com +13 -0
    New test for repeat(...) and select with and without into in SPs.

  sql/sql_yacc.yy
    1.212.1.1 03/01/23 17:00:13 vva@eagle.mysql.r18.ru +5 -4
    solve the lex conflict between the existing repeat() function 
    and repeat SP-construction

  sql/lex.h
    1.88 03/01/23 17:00:13 vva@eagle.mysql.r18.ru +1 -2
    solve the lex conflict between the existing repeat() function 
    and repeat SP-construction

  mysql-test/t/sp.test
    1.1.1.1 03/01/23 17:00:13 vva@eagle.mysql.r18.ru +3 -3
    solve the lex conflict between the existing repeat() function 
    and repeat SP-construction

  mysql-test/r/sp.result
    1.1.1.1 03/01/23 17:00:13 vva@eagle.mysql.r18.ru +6 -6
    solve the lex conflict between the existing repeat() function 
    and repeat SP-construction

ChangeSet
  1.1346.96.1 03/01/23 13:20:37 serg@serg.mysql.com +5 -0
  --ft_stopword_file command-line option

  sql/mysqld.cc
    1.297.1.92 03/01/23 13:20:34 serg@serg.mysql.com +12 -7
    --ft_stopword_file command-line option

  myisam/myisamchk.c
    1.80.1.16 03/01/23 13:20:34 serg@serg.mysql.com +1 -1
    --ft_stopword_file command-line option

  myisam/ft_stopwords.c
    1.13.1.1 03/01/23 13:20:34 serg@serg.mysql.com +61 -14
    --ft_stopword_file command-line option

  myisam/ft_static.c
    1.14.1.2 03/01/23 13:20:34 serg@serg.mysql.com +1 -0
    --ft_stopword_file command-line option

  include/ft_global.h
    1.23 03/01/23 13:17:51 serg@serg.mysql.com +2 -1
    --ft_stopword_file command-line option

  sql/share/ukrainian/errmsg.txt
    1.30 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/swedish/errmsg.txt
    1.67 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/spanish/errmsg.txt
    1.67 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/slovak/errmsg.txt
    1.67 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/serbian/errmsg.txt
    1.21 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/russian/errmsg.txt
    1.64 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/romanian/errmsg.txt
    1.65 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/portuguese/errmsg.txt
    1.67 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/polish/errmsg.txt
    1.66 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/norwegian/errmsg.txt
    1.66 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/norwegian-ny/errmsg.txt
    1.66 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/korean/errmsg.txt
    1.66 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/japanese/errmsg.txt
    1.66 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/italian/errmsg.txt
    1.73 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/hungarian/errmsg.txt
    1.68 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/greek/errmsg.txt
    1.67 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/german/errmsg.txt
    1.67 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/french/errmsg.txt
    1.66 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/estonian/errmsg.txt
    1.67 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/english/errmsg.txt
    1.73 03/01/23 12:41:51 pem@mysql.com +2 -2
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/dutch/errmsg.txt
    1.69 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/danish/errmsg.txt
    1.65 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  sql/share/czech/errmsg.txt
    1.67 03/01/23 12:41:51 pem@mysql.com +3 -3
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

  include/mysqld_error.h
    1.64 03/01/23 12:41:51 pem@mysql.com +5 -5
    Added bad select in SP error (and fixed leave/iterate label mismatch error).

ChangeSet
  1.1417.3.5 03/01/23 00:03:40 serg@serg.mysql.com +1 -0
  fixed "double Procedure::~Procedure" bug

  sql/sql_select.cc
    1.189 03/01/23 00:03:37 serg@serg.mysql.com +0 -1
    fixed "double Procedure::~Procedure" bug

ChangeSet
  1.1420 03/01/22 20:09:05 hf@deer.mysql.r18.ru +2 -0
  Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
  into deer.mysql.r18.ru:/home/hf/work/mysql-default

ChangeSet
  1.1417.3.4 03/01/22 16:01:45 pem@mysql.com +1 -0
  Fixed bug in Protocol::convert_str() (missing return caused "Out of memory" errors
  when optimized).

ChangeSet
  1.1417.4.1 03/01/22 20:51:51 vva@eagle.mysql.r18.ru +1 -0
  correction for compiling on Linux Suse 7.2

  configure.in
    1.201.1.15 03/01/22 20:51:37 vva@eagle.mysql.r18.ru +5 -2
    correction for compiling on Linux Suse 7.2

  sql/sql_yacc.yy
    1.203.1.22 03/01/22 20:09:02 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/item.cc
    1.46 03/01/22 20:09:02 hf@deer.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1419 03/01/22 20:08:12 hf@deer.mysql.r18.ru +4 -0
  SCRUM
  DEFAULT in SELECT & UPDATE corrections

  sql/item.h
    1.49 03/01/22 20:08:07 hf@deer.mysql.r18.ru +3 -8
    some modifications after talking with Sergey

  sql/item.cc
    1.45 03/01/22 20:08:07 hf@deer.mysql.r18.ru +2 -1
    DEFAULT_ITEM replaced

  mysql-test/t/replace.test
    1.9 03/01/22 20:08:07 hf@deer.mysql.r18.ru +3 -2
    test slightly extended with replace(default)

  mysql-test/r/replace.result
    1.6 03/01/22 20:08:07 hf@deer.mysql.r18.ru +4 -2
    test slightly extended

  sql/protocol.cc
    1.39 03/01/22 16:01:43 pem@mysql.com +2 -2
    Put inline back and added missing return.

ChangeSet
  1.1417.3.2 03/01/22 15:05:37 serg@serg.mysql.com +1 -0
  workaround for gcc bug

  sql/protocol.cc
    1.38 03/01/22 15:05:35 serg@serg.mysql.com +1 -1
    workaround for gcc bug

ChangeSet
  1.1417.3.1 03/01/22 13:24:26 serg@serg.mysql.com +2 -0
  auto-generated binary files deleted

  BitKeeper/deleted/.del-libmysqld.lib~eeb4bc25c97947da
    1.2 03/01/22 13:23:43 serg@serg.mysql.com +0 -0
    Delete: libmysqld/examples/builder-sample/libmysqld.lib

  BitKeeper/deleted/.del-emb_sample.tds~3555f163bebc8355
    1.2 03/01/22 13:23:43 serg@serg.mysql.com +0 -0
    Delete: libmysqld/examples/builder-sample/emb_sample.tds

ChangeSet
  1.1417.2.1 03/01/22 15:29:31 ram@mysql.r18.ru +74 -0
  bdb/ cleanup (SCRUM)

  bdb/dist/s_symlink
    1.5 03/01/22 15:29:20 ram@mysql.r18.ru +4 -4
    bdb/ cleanup

  bdb/dist/s_recover
    1.6 03/01/22 15:29:20 ram@mysql.r18.ru +1 -1
    bdb/ cleanup

  bdb/dist/s_include
    1.4 03/01/22 15:29:20 ram@mysql.r18.ru +1 -1
    removed 'crypto'

ChangeSet
  1.1346.46.104 03/01/22 12:13:51 lenz@mysql.com +1 -0
   - removed duplicate code (merge error)

  Build-tools/Do-compile
    1.71 03/01/22 12:13:49 lenz@mysql.com +0 -6
     - removed duplicate code (merge error)

  BitKeeper/deleted/.del-TpcbExample.java~5d4818c4e5e7320a
    1.4 03/01/22 15:00:43 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/examples/TpcbExample.java

  BitKeeper/deleted/.del-LockExample.java~adc9265cb3d68019
    1.4 03/01/22 15:00:43 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/examples/LockExample.java

  BitKeeper/deleted/.del-EnvExample.java~a44d38fba5efa4ef
    1.4 03/01/22 15:00:43 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/examples/EnvExample.java

  BitKeeper/deleted/.del-Dbt.java~ea175c8ddc0efd2c
    1.4 03/01/22 15:00:43 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/Dbt.java

  BitKeeper/deleted/.del-DbXid.java~77ee0f96aa4eb4e
    1.2 03/01/22 15:00:43 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/xa/DbXid.java

  BitKeeper/deleted/.del-DbXAResource.java~874c6f2697b602db
    1.2 03/01/22 15:00:43 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/xa/DbXAResource.java

  BitKeeper/deleted/.del-BulkAccessExample.java~293cb1f4c373e0cb
    1.2 03/01/22 15:00:43 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/examples/BulkAccessExample.java

  BitKeeper/deleted/.del-BtRecExample.java~642b5d36f9df6088
    1.4 03/01/22 15:00:43 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/examples/BtRecExample.java

  BitKeeper/deleted/.del-AccessExample.java~219ec1dab0b67a6c
    1.4 03/01/22 15:00:43 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/examples/AccessExample.java

  BitKeeper/deleted/.del-Dbc.java~1cb27c86611ea9b0
    1.4 03/01/22 15:00:42 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/Dbc.java

  BitKeeper/deleted/.del-DbUtil.java~7c40dfa8a06a1a50
    1.2 03/01/22 15:00:42 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbUtil.java

  BitKeeper/deleted/.del-DbTxn.java~da61406e8af5d725
    1.4 03/01/22 15:00:42 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbTxn.java

  BitKeeper/deleted/.del-DbSecondaryKeyCreate.java~a154ad043120c3
    1.2 03/01/22 15:00:42 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbSecondaryKeyCreate.java

  BitKeeper/deleted/.del-DbRunRecoveryException.java~6c02e5ffd95ec7d
    1.4 03/01/22 15:00:42 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbRunRecoveryException.java

  BitKeeper/deleted/.del-DbRepTransport.java~ce17e09c2a29ef96
    1.2 03/01/22 15:00:42 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbRepTransport.java

  BitKeeper/deleted/.del-DbPreplist.java~520488d9ab8efca8
    1.2 03/01/22 15:00:42 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbPreplist.java

  BitKeeper/deleted/.del-DbOutputStreamErrcall.java~7b2c1e221fcaf5a
    1.4 03/01/22 15:00:42 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbOutputStreamErrcall.java

  BitKeeper/deleted/.del-DbMultipleRecnoDataIterator.java~7243ef5ba89fbaa0
    1.2 03/01/22 15:00:42 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbMultipleRecnoDataIterator.java

  BitKeeper/deleted/.del-DbMultipleKeyDataIterator.java~e8d9948c3bb3b408
    1.2 03/01/22 15:00:42 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbMultipleKeyDataIterator.java

  BitKeeper/deleted/.del-DbMultipleIterator.java~587d1f79b3783ec0
    1.2 03/01/22 15:00:42 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbMultipleIterator.java

  BitKeeper/deleted/.del-DbMultipleDataIterator.java~38348934676e4a64
    1.2 03/01/22 15:00:42 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbMultipleDataIterator.java

  BitKeeper/deleted/.del-DbMpoolStat.java~d868c0c27966efd8
    1.4 03/01/22 15:00:42 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbMpoolStat.java

  BitKeeper/deleted/.del-DbMemoryException.java~459fea825d4835a
    1.4 03/01/22 15:00:42 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbMemoryException.java

  BitKeeper/deleted/.del-DbLsn.java~813ddabdb6098c13
    1.4 03/01/22 15:00:41 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbLsn.java

  BitKeeper/deleted/.del-DbLogc.java~cf88740f650599c3
    1.2 03/01/22 15:00:41 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbLogc.java

  BitKeeper/deleted/.del-DbLockRequest.java~b6751a2bbac273de
    1.2 03/01/22 15:00:41 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbLockRequest.java

  BitKeeper/deleted/.del-DbLockNotGrantedException.java~4981a6c1878659ec
    1.2 03/01/22 15:00:41 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbLockNotGrantedException.java

  BitKeeper/deleted/.del-DbLock.java~23eaf3e4a1ccadc1
    1.4 03/01/22 15:00:41 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbLock.java

  BitKeeper/deleted/.del-DbKeyRange.java~28b6b373a22ec489
    1.4 03/01/22 15:00:41 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbKeyRange.java

  BitKeeper/deleted/.del-DbHash.java~658cdd90ec5197b2
    1.4 03/01/22 15:00:41 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbHash.java

  BitKeeper/deleted/.del-DbFeedback.java~7e7c1fc71f4ceee5
    1.4 03/01/22 15:00:41 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbFeedback.java

  BitKeeper/deleted/.del-DbException.java~c1ea24cdb4bd795f
    1.4 03/01/22 15:00:41 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbException.java

  BitKeeper/deleted/.del-DbErrcall.java~ae4f822b75a145a9
    1.4 03/01/22 15:00:41 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbErrcall.java

  BitKeeper/deleted/.del-DbEnvFeedback.java~5d68defe7f5b72ac
    1.4 03/01/22 15:00:41 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbEnvFeedback.java

  BitKeeper/deleted/.del-DbEnv.java~79f045af656bde5c
    1.4 03/01/22 15:00:41 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbEnv.java

  BitKeeper/deleted/.del-DbDupCompare.java~905735b85e180ae2
    1.4 03/01/22 15:00:41 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbDupCompare.java

  BitKeeper/deleted/.del-DbDeadlockException.java~568c96bffced5abf
    1.4 03/01/22 15:00:40 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbDeadlockException.java

  BitKeeper/deleted/.del-DbClient.java~526df4e74349d6d6
    1.2 03/01/22 15:00:40 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbClient.java

  BitKeeper/deleted/.del-DbBtreePrefix.java~781bcc5275fd02a7
    1.4 03/01/22 15:00:40 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbBtreePrefix.java

  BitKeeper/deleted/.del-DbBtreeCompare.java~2def264d9d57c5d4
    1.4 03/01/22 15:00:40 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbBtreeCompare.java

  BitKeeper/deleted/.del-DbAppendRecno.java~20e7d8affe21bda4
    1.4 03/01/22 15:00:40 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbAppendRecno.java

  BitKeeper/deleted/.del-DbAppDispatch.java~b6c6964ddeceb451
    1.2 03/01/22 15:00:40 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/DbAppDispatch.java

  BitKeeper/deleted/.del-Db.java.in~e887e6168818e1fe
    1.5 03/01/22 15:00:40 ram@mysql.r18.ru +0 -0
    Delete: bdb/java/src/com/sleepycat/db/Db.java.in

ChangeSet
  1.1417.1.4 03/01/22 01:30:13 venu@myvenu.com +3 -0
  Remove bind_length + Fix the client-test

  libmysql/libmysql.c
    1.132 03/01/22 01:28:59 venu@myvenu.com +24 -21
    Remove bind_length

  include/mysql.h
    1.55 03/01/22 01:27:03 venu@myvenu.com +0 -1
    Remove bind_length

  tests/client_test.c
    1.11 03/01/22 01:26:21 venu@myvenu.com +287 -895
    Fix the tests

ChangeSet
  1.1346.46.103 03/01/21 22:36:56 lenz@mysql.com +1 -0
   - tagged ChangeSet 1.1509 as "mysql-4.0.9"
   - bumped up version number in configure.in to 4.0.10-gamma

  configure.in
    1.191.1.61 03/01/21 22:36:54 lenz@mysql.com +1 -1
     - bump up version number 4.0.9-gamma -> 4.0.10-gamma

ChangeSet
  1.1417.1.3 03/01/21 21:28:51 monty@mashka.mysql.fi +33 -0
  Merge

  sql/protocol.cc
    1.37 03/01/21 21:28:48 monty@mashka.mysql.fi +0 -0
    SCCS merged

  sql/sql_yacc.yy
    1.203.18.1 03/01/21 21:24:59 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_table.cc
    1.144 03/01/21 21:24:58 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_select.cc
    1.188 03/01/21 21:24:58 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_repl.cc
    1.95 03/01/21 21:24:58 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.20 03/01/21 21:24:58 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_parse.cc
    1.253 03/01/21 21:24:58 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_help.cc
    1.6 03/01/21 21:24:58 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_handler.cc
    1.33 03/01/21 21:24:58 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_class.cc
    1.97 03/01/21 21:24:58 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_cache.cc
    1.39.1.7 03/01/21 21:24:58 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_base.cc
    1.135 03/01/21 21:24:58 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_acl.cc
    1.64 03/01/21 21:24:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/slave.cc
    1.179 03/01/21 21:24:57 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/set_var.cc
    1.26 03/01/21 21:24:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/opt_range.cc
    1.80 03/01/21 21:24:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.325 03/01/21 21:24:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.175 03/01/21 21:24:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mf_iocache.cc
    1.25 03/01/21 21:24:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/log_event.cc
    1.97 03/01/21 21:24:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/log.cc
    1.99 03/01/21 21:24:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_sum.cc
    1.54 03/01/21 21:24:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.68 03/01/21 21:24:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_func.cc
    1.96 03/01/21 21:24:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.57 03/01/21 21:24:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item.cc
    1.43.1.1 03/01/21 21:24:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.85.1.9 03/01/21 21:24:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_berkeley.cc
    1.116 03/01/21 21:24:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/field.cc
    1.78 03/01/21 21:24:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysqld/lib_sql.cc
    1.43 03/01/21 21:24:54 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/violite.h
    1.26 03/01/21 21:24:54 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/mysql.h
    1.54 03/01/21 21:24:54 monty@mashka.mysql.fi +0 -0
    Auto merged

  client/mysql.cc
    1.112 03/01/21 21:24:54 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1403.1.82 03/01/21 21:22:45 monty@mashka.mysql.fi +100 -0
  Update to VC++ build files

  bdb/build_win32/Berkeley_DB.dsw
    1.4 03/01/21 21:22:43 monty@mashka.mysql.fi +124 -96
    Update to 4.1.0

  VC++Files/zlib/zlib.dsp
    1.4 03/01/21 21:22:43 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/vio/vio.dsp
    1.5 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/thr_test/thr_test.dsp
    1.5 03/01/21 21:22:42 monty@mashka.mysql.fi +8 -8
    Update to 4.1.0

  VC++Files/thr_insert_test/thr_insert_test.dsp
    1.5 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/test1/test1.dsp
    1.5 03/01/21 21:22:42 monty@mashka.mysql.fi +8 -8
    Update to 4.1.0

  VC++Files/strings/strings.dsw
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +0 -1
    Update to 4.1.0

  VC++Files/strings/strings.dsp
    1.5 03/01/21 21:22:42 monty@mashka.mysql.fi +22 -27
    Update to 4.1.0

  VC++Files/strings/noMASM/strings.dsw
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +0 -1
    Update to 4.1.0

  VC++Files/strings/noMASM/strings.dsp
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/strings/backup/strings.dsw
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +0 -1
    Update to 4.1.0

  VC++Files/strings/backup/strings.dsp
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +9 -9
    Update to 4.1.0

  VC++Files/strings/MASM6x/strings.dsw
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +0 -1
    Update to 4.1.0

  VC++Files/strings/MASM6x/strings.dsp
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +9 -9
    Update to 4.1.0

  VC++Files/sql/old/mysqld.dsw
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +0 -1
    Update to 4.1.0

  VC++Files/sql/mysqldmax.dsp
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +56 -56
    Update to 4.1.0

  VC++Files/sql/mysqld.dsw
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +0 -1
    Update to 4.1.0

  VC++Files/sql/mysqld.dsp
    1.10 03/01/21 21:22:42 monty@mashka.mysql.fi +14 -8
    Update to 4.1.0

  VC++Files/replace/replace.dsp
    1.5 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/regex/regex.dsw
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +0 -1
    Update to 4.1.0

  VC++Files/regex/regex.dsp
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/perror/perror.dsp
    1.6 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/pack_isam/pack_isam.dsp
    1.6 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/mysys/mysys.dsw
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +0 -1
    Update to 4.1.0

  VC++Files/mysys/mysys.dsp
    1.9 03/01/21 21:22:42 monty@mashka.mysql.fi +4 -8
    Update to 4.1.0

  VC++Files/mysqlwatch/mysqlwatch.dsp
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +6 -6
    Update to 4.1.0

  VC++Files/mysqlshutdown/mysqlshutdown.dsp
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/mysqlshutdown/myshutdown.dsp
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/mysqlserver/mysqlserver.dsp
    1.4 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/mysqlmanager/mysqlmanager.dsw
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +0 -1
    Update to 4.1.0

  VC++Files/mysqlmanager/MySqlManager.dsp
    1.5 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/mysqldemb/mysqldemb.dsp
    1.4 03/01/21 21:22:42 monty@mashka.mysql.fi +29 -9
    Update to 4.1.0

  VC++Files/mysqlcheck/mysqlcheck.dsp
    1.5 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/mysqlbinlog/mysqlbinlog.dsp
    1.8 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/mysql.dsw
    1.6 03/01/21 21:22:42 monty@mashka.mysql.fi +0 -1
    Update to 4.1.0

  VC++Files/mysql.dsp
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +8 -8
    Update to 4.1.0

  VC++Files/myisampack/myisampack.dsp
    1.4 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/myisammrg/myisammrg.dsp
    1.4 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/myisamlog/myisamlog.dsp
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/myisamchk/myisamchk.dsp
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/myisam/myisam.dsp
    1.5 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/my_print_defaults/my_print_defaults.dsp
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/merge/merge.dsw
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +0 -1
    Update to 4.1.0

  VC++Files/merge/merge.dsp
    1.4 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/libmysqltest/mytest.dsw
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +0 -1
    Update to 4.1.0

  VC++Files/libmysqltest/myTest.dsp
    1.5 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/libmysqld/libmysqld.dsp
    1.4 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/libmysqld/examples/test_libmysqld.dsp
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +6 -6
    Update to 4.1.0

  VC++Files/libmysql/libmysql.dsw
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +0 -1
    Update to 4.1.0

  VC++Files/isamchk/isamchk.dsp
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/isam/isam.dsw
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +0 -1
    Update to 4.1.0

  VC++Files/isam/isam.dsp
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/innobase/innobase.dsp
    1.8 03/01/21 21:22:42 monty@mashka.mysql.fi +6 -6
    Update to 4.1.0

  VC++Files/heap/heap.dsp
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +8 -8
    Update to 4.1.0

  VC++Files/dbug/dbug.dsw
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +0 -1
    Update to 4.1.0

  VC++Files/dbug/dbug.dsp
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/contrib/minizip/zlibvc.dsw
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +0 -1
    Update to 4.1.0

  VC++Files/contrib/minizip/zlibvc.dsp
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +38 -38
    Update to 4.1.0

  VC++Files/contrib/asm386/zlibvc.dsw
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +0 -1
    Update to 4.1.0

  VC++Files/contrib/asm386/zlibvc.dsp
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +38 -38
    Update to 4.1.0

  VC++Files/comp_err/comp_err.dsp
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +6 -6
    Update to 4.1.0

  VC++Files/client/mysqlshow.dsp
    1.5 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/client/mysqlimport.dsp
    1.5 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/client/mysqldump.dsp
    1.5 03/01/21 21:22:42 monty@mashka.mysql.fi +8 -8
    Update to 4.1.0

  VC++Files/client/mysqlclient.dsw
    1.3 03/01/21 21:22:42 monty@mashka.mysql.fi +0 -1
    Update to 4.1.0

  VC++Files/client/mysqlclient.dsp
    1.9 03/01/21 21:22:42 monty@mashka.mysql.fi +12 -4
    Update to 4.1.0

  VC++Files/client/mysqlcheck.dsp
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +6 -6
    Update to 4.1.0

  VC++Files/client/mysqladmin.dsp
    1.5 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/client/mysql.dsp
    1.5 03/01/21 21:22:42 monty@mashka.mysql.fi +8 -8
    Update to 4.1.0

  VC++Files/bdb/build_win32/excxx_tpcb.dsp
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/excxx_mpool.dsp
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/excxx_lock.dsp
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/excxx_env.dsp
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/excxx_btrec.dsp
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/excxx_access.dsp
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/ex_tpcb.dsp
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/ex_mpool.dsp
    1.2 03/01/21 21:22:42 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/ex_lock.dsp
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/ex_env.dsp
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/ex_btrec.dsp
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/ex_access.dsp
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/db_verify.dsp
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/db_upgrade.dsp
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/db_test.dsp
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/db_tcl.dsp
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/db_static1.dsp
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +8 -8
    Update to 4.1.0

  VC++Files/bdb/build_win32/db_static.dsp
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/db_stat.dsp
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/db_recover.dsp
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/db_printlog.dsp
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/db_load.dsp
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/db_java.dsp
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +29 -29
    Update to 4.1.0

  VC++Files/bdb/build_win32/db_dump.dsp
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/db_dll.dsp
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/db_deadlock.dsp
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/db_checkpoint.dsp
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/db_buildall.dsp
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +8 -8
    Update to 4.1.0

  VC++Files/bdb/build_win32/db_archive.dsp
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +7 -7
    Update to 4.1.0

  VC++Files/bdb/build_win32/Berkeley_DB.dsw
    1.2 03/01/21 21:22:41 monty@mashka.mysql.fi +0 -1
    Update to 4.1.0

  VC++Files/bdb/bdb.dsp
    1.4 03/01/21 21:22:41 monty@mashka.mysql.fi +121 -58
    Update to 4.1.0

ChangeSet
  1.1417.1.2 03/01/21 20:11:24 serg@serg.mysql.com +1 -0
  fulltext2.test: --enable/disable_warnings

  mysql-test/t/fulltext2.test
    1.5 03/01/21 20:08:20 serg@serg.mysql.com +3 -0
    fixed

ChangeSet
  1.1403.1.81 03/01/21 21:07:59 monty@mashka.mysql.fi +69 -0
  Portability fixes (for windows)
  Some changes to the prepared statement protocol to make it easier to use and faster.

  cmd-line-utils/Makefile.am
    1.1 03/01/21 21:07:53 monty@mashka.mysql.fi +6 -0

  cmd-line-utils/Makefile.am
    1.0 03/01/21 21:07:53 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.1/cmd-line-utils/Makefile.am

  tests/client_test.c
    1.10 03/01/21 21:07:52 monty@mashka.mysql.fi +678 -615
    A

  strings/ctype.c
    1.52 03/01/21 21:07:52 monty@mashka.mysql.fi +2 -2
    Portability fix

  strings/ctype-mb.c
    1.6 03/01/21 21:07:52 monty@mashka.mysql.fi +1 -0
    Portability fix

  strings/ctype-bin.c
    1.16 03/01/21 21:07:52 monty@mashka.mysql.fi +3 -3
    Portability fix

  sql/sql_yacc.yy
    1.203.17.1 03/01/21 21:07:52 monty@mashka.mysql.fi +5 -8
    Portability fix
    Remove not accessed code

  sql/sql_table.cc
    1.125.1.22 03/01/21 21:07:52 monty@mashka.mysql.fi +0 -1
    move assert.h to mysql_priv.h

  sql/sql_string.h
    1.29 03/01/21 21:07:52 monty@mashka.mysql.fi +1 -1
    Portability fix

  sql/sql_string.cc
    1.43 03/01/21 21:07:52 monty@mashka.mysql.fi +2 -2
    Portability fix

  sql/sql_select.cc
    1.173.26.3 03/01/21 21:07:52 monty@mashka.mysql.fi +0 -1
    move assert.h to mysql_priv.h

  sql/sql_repl.cc
    1.91.1.3 03/01/21 21:07:51 monty@mashka.mysql.fi +0 -1
    move assert.h to mysql_priv.h

  sql/sql_prepare.cc
    1.14.2.1 03/01/21 21:07:51 monty@mashka.mysql.fi +0 -1
    move assert.h to mysql_priv.h

  sql/sql_parse.cc
    1.235.38.1 03/01/21 21:07:51 monty@mashka.mysql.fi +0 -1
    move assert.h to mysql_priv.h

  sql/sql_lex.h
    1.102.1.9 03/01/21 21:07:51 monty@mashka.mysql.fi +1 -1
    Portability fix

  sql/sql_lex.cc
    1.66 03/01/21 21:07:51 monty@mashka.mysql.fi +3 -2
    Portability fix

  sql/sql_help.cc
    1.3.1.3 03/01/21 21:07:51 monty@mashka.mysql.fi +2 -2
    Removed compiler warning

  sql/sql_handler.cc
    1.22.2.1 03/01/21 21:07:51 monty@mashka.mysql.fi +0 -1
    move assert.h to mysql_priv.h

  sql/sql_class.cc
    1.82.10.1 03/01/21 21:07:51 monty@mashka.mysql.fi +0 -1
    move assert.h to mysql_priv.h

  sql/sql_cache.cc
    1.39.2.3 03/01/21 21:07:51 monty@mashka.mysql.fi +0 -1
    move assert.h to mysql_priv.h

  sql/sql_base.cc
    1.122.17.1 03/01/21 21:07:51 monty@mashka.mysql.fi +0 -1
    move assert.h to mysql_priv.h

  sql/sql_acl.cc
    1.55.1.20 03/01/21 21:07:51 monty@mashka.mysql.fi +0 -1
    move assert.h to mysql_priv.h

  sql/spatial.cc
    1.6 03/01/21 21:07:51 monty@mashka.mysql.fi +2 -1
    Portability fix

  sql/slave.cc
    1.174.1.4 03/01/21 21:07:51 monty@mashka.mysql.fi +0 -1
    move assert.h to mysql_priv.h

  sql/set_var.cc
    1.20.3.1 03/01/21 21:07:51 monty@mashka.mysql.fi +2 -2
    Portability fix

  sql/protocol.cc
    1.23.1.17 03/01/21 21:07:51 monty@mashka.mysql.fi +0 -1
    move assert.h to mysql_priv.h

  sql/password.c
    1.21 03/01/21 21:07:51 monty@mashka.mysql.fi +5 -9
    Portability fix

  sql/opt_range.cc
    1.78.1.1 03/01/21 21:07:51 monty@mashka.mysql.fi +0 -2
    move assert.h to mysql_priv.h

  sql/mysqld.cc
    1.316.1.15 03/01/21 21:07:51 monty@mashka.mysql.fi +0 -1
    move assert.h to mysql_priv.h

  sql/mysql_priv.h
    1.160.1.38 03/01/21 21:07:51 monty@mashka.mysql.fi +1 -0
    move assert.h to mysql_priv.h

  sql/mf_iocache.cc
    1.22.1.1 03/01/21 21:07:51 monty@mashka.mysql.fi +0 -1
    move assert.h to mysql_priv.h

  sql/log_event.cc
    1.91.1.9 03/01/21 21:07:51 monty@mashka.mysql.fi +3 -5
    Portability fix

  sql/log.cc
    1.92.1.4 03/01/21 21:07:51 monty@mashka.mysql.fi +0 -1
    move assert.h to mysql_priv.h

  sql/lock.cc
    1.41 03/01/21 21:07:51 monty@mashka.mysql.fi +1 -2
    move assert.h to mysql_priv.h

  sql/lex.h
    1.82.1.7 03/01/21 21:07:51 monty@mashka.mysql.fi +1 -1
    Portability fix

  sql/item_sum.cc
    1.52.1.1 03/01/21 21:07:51 monty@mashka.mysql.fi +1 -1
    move assert.h to mysql_priv.h

  sql/item_subselect.cc
    1.48 03/01/21 21:07:50 monty@mashka.mysql.fi +1 -1
    Portability fix

  sql/item_strfunc.cc
    1.54.11.1 03/01/21 21:07:50 monty@mashka.mysql.fi +4 -2
    Portability fix

  sql/item_row.cc
    1.10 03/01/21 21:07:50 monty@mashka.mysql.fi +0 -1
    move assert.h to mysql_priv.h

  sql/item_func.cc
    1.90.4.1 03/01/21 21:07:50 monty@mashka.mysql.fi +0 -1
    move assert.h to mysql_priv.h

  sql/item_cmpfunc.cc
    1.55.1.1 03/01/21 21:07:50 monty@mashka.mysql.fi +0 -1
    move assert.h to mysql_priv.h

  sql/item.cc
    1.27.21.1 03/01/21 21:07:50 monty@mashka.mysql.fi +2 -2
    move assert.h to mysql_priv.h
    Fixed syntax error

  sql/ha_innodb.cc
    1.85.4.1 03/01/21 21:07:50 monty@mashka.mysql.fi +0 -1
    move assert.h to mysql_priv.h

  sql/ha_berkeley.cc
    1.111.1.4 03/01/21 21:07:50 monty@mashka.mysql.fi +0 -1
    move assert.h to mysql_priv.h

  sql/filesort.cc
    1.62 03/01/21 21:07:50 monty@mashka.mysql.fi +0 -1
    move assert.h to mysql_priv.h

  sql/field.cc
    1.64.1.43 03/01/21 21:07:50 monty@mashka.mysql.fi +4 -3
    Portability fixes

  mysys/tree.c
    1.22 03/01/21 21:07:50 monty@mashka.mysql.fi +4 -4
    Portability fixes

  mysys/my_once.c
    1.7 03/01/21 21:07:50 monty@mashka.mysql.fi +1 -0
    Portability fix

  mysql-test/r/join.result
    1.18 03/01/21 21:07:50 monty@mashka.mysql.fi +5 -5
    Fix after merge

  mysql-test/r/explain.result
    1.11 03/01/21 21:07:50 monty@mashka.mysql.fi +2 -2
    Fix after merge

  libmysqld/lib_sql.cc
    1.25.1.14 03/01/21 21:07:50 monty@mashka.mysql.fi +0 -1
    Remove compiler warning

  libmysql/libmysql.def
    1.11 03/01/21 21:07:50 monty@mashka.mysql.fi +0 -2
    Remove not existing functions

  libmysql/libmysql.c
    1.131 03/01/21 21:07:50 monty@mashka.mysql.fi +82 -62
    Portability fixes
    Remove obscure usage of the length parameter for prepared statements.

  isam/pack_isam.c
    1.14 03/01/21 21:07:50 monty@mashka.mysql.fi +0 -16
    Portability fixes

  innobase/ut/ut0ut.c
    1.14 03/01/21 21:07:50 monty@mashka.mysql.fi +1 -0
    Portability fixes

  innobase/os/os0proc.c
    1.5 03/01/21 21:07:50 monty@mashka.mysql.fi +6 -6
    Portability fixes (Heikki, please check)

  innobase/include/os0proc.h
    1.4 03/01/21 21:07:50 monty@mashka.mysql.fi +1 -1
    Portability fixes (Heikki, please check)

  innobase/dict/dict0load.c
    1.8 03/01/21 21:07:50 monty@mashka.mysql.fi +2 -2
    Portability fixes

  innobase/dict/dict0dict.c
    1.27 03/01/21 21:07:50 monty@mashka.mysql.fi +2 -1
    Portability fixes

  include/violite.h
    1.21.1.7 03/01/21 21:07:50 monty@mashka.mysql.fi +2 -1
    Portability fixes

  include/mysql.h
    1.43.1.19 03/01/21 21:07:50 monty@mashka.mysql.fi +14 -18
    Cleanup of BIND structure

  include/my_list.h
    1.6 03/01/21 21:07:50 monty@mashka.mysql.fi +2 -2
    Portability fixes

  include/m_ctype.h
    1.55 03/01/21 21:07:50 monty@mashka.mysql.fi +58 -38
    Indentation cleanup

  include/config-win.h
    1.26 03/01/21 21:07:50 monty@mashka.mysql.fi +1 -0
    Portability fixes

  heap/_check.c
    1.14 03/01/21 21:07:50 monty@mashka.mysql.fi +2 -0
    Portability fixes

  configure.in
    1.201.1.14 03/01/21 21:07:50 monty@mashka.mysql.fi +17 -8
    Fix to make dist to work with cmd-line-utils

  client/mysqlbinlog.cc
    1.72 03/01/21 21:07:50 monty@mashka.mysql.fi +7 -8
    Portabiliy fixes and remove usafe of FILE

  client/mysql.cc
    1.108.2.3 03/01/21 21:07:50 monty@mashka.mysql.fi +2 -4
    Portability fixes

  Makefile.am
    1.41 03/01/21 21:07:50 monty@mashka.mysql.fi +2 -1
    Fix to make dist to work with cmd-line-utils

  BUILD/compile-pentium-max
    1.7 03/01/21 21:07:50 monty@mashka.mysql.fi +2 -2
     

ChangeSet
  1.1417.1.1 03/01/21 19:37:38 serg@serg.mysql.com +10 -0
  merged

  myisam/ft_nlq_search.c
    1.23 03/01/21 19:37:35 serg@serg.mysql.com +0 -1
    merged

  mysql-test/t/fulltext.test
    1.36 03/01/21 19:35:51 serg@serg.mysql.com +0 -0
    Auto merged

  mysql-test/r/fulltext.result
    1.38 03/01/21 19:35:51 serg@serg.mysql.com +0 -0
    Auto merged

  myisam/myisamdef.h
    1.56 03/01/21 19:35:51 serg@serg.mysql.com +0 -0
    Auto merged

  myisam/myisamchk.c
    1.90 03/01/21 19:35:51 serg@serg.mysql.com +0 -0
    Auto merged

  myisam/mi_write.c
    1.33 03/01/21 19:35:51 serg@serg.mysql.com +0 -0
    Auto merged

  myisam/mi_open.c
    1.58 03/01/21 19:35:50 serg@serg.mysql.com +0 -0
    Auto merged

  myisam/mi_create.c
    1.28 03/01/21 19:35:50 serg@serg.mysql.com +0 -0
    Auto merged

  myisam/mi_check.c
    1.99 03/01/21 19:35:50 serg@serg.mysql.com +0 -0
    Auto merged

  include/myisam.h
    1.46 03/01/21 19:35:50 serg@serg.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1388.21.1 03/01/21 19:24:34 serg@serg.mysql.com +25 -0
  Two-level index structure for FULLTEXT indexes

  mysql-test/t/fulltext2.test
    1.4 03/01/21 19:23:48 serg@serg.mysql.com +27 -0
    support for ft2 in mi_delete 

  mysql-test/r/fulltext2.result
    1.4 03/01/21 19:23:48 serg@serg.mysql.com +52 -0
    support for ft2 in mi_delete 

  myisam/mi_delete.c
    1.18 03/01/21 19:23:48 serg@serg.mysql.com +72 -18
    support for ft2 in mi_delete 

ChangeSet
  1.1418 03/01/21 20:24:22 hf@deer.mysql.r18.ru +6 -0
  Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
  into deer.mysql.r18.ru:/home/hf/work/mysql-default

  sql/table.h
    1.44 03/01/21 20:24:20 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/table.cc
    1.67 03/01/21 20:24:20 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.203.1.21 03/01/21 20:24:19 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/item.h
    1.48 03/01/21 20:24:19 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/item.cc
    1.44 03/01/21 20:24:19 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/field.h
    1.57 03/01/21 20:24:19 hf@deer.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1403.34.6 03/01/21 20:20:46 hf@deer.mysql.r18.ru +6 -0
  SCRUM
  Default in UPDATE & SELECT

  sql/table.h
    1.43 03/01/21 20:20:42 hf@deer.mysql.r18.ru +1 -1
    member changed with inline function

  sql/table.cc
    1.66 03/01/21 20:20:42 hf@deer.mysql.r18.ru +0 -2
    default_values member removed

  sql/sql_yacc.yy
    1.203.10.2 03/01/21 20:20:42 hf@deer.mysql.r18.ru +8 -6
    changes in syntax for DEFAULT in UPDATE & SELECT

  sql/item.h
    1.41.10.4 03/01/21 20:20:41 hf@deer.mysql.r18.ru +21 -23
    Item_default class deletion

  sql/item.cc
    1.27.10.20 03/01/21 20:20:41 hf@deer.mysql.r18.ru +12 -3
    now only DEFAULT_ITEM

  sql/field.h
    1.46.1.19 03/01/21 20:20:41 hf@deer.mysql.r18.ru +1 -1
    brackets was omitted

ChangeSet
  1.676.271.1 03/01/21 17:30:42 Sinisa@sinisa.nasamreza.org +1 -0
  a symlink that was missing ...

  libmysql/Makefile.am
    1.18.1.4 03/01/21 17:30:40 Sinisa@sinisa.nasamreza.org +3 -1
    a symlink that was missing ...

ChangeSet
  1.676.266.16 03/01/21 16:07:31 serg@serg.mysql.com +1 -0
  fixed double-free bug in COM_CHANGE_USER

  sql/sql_parse.cc
    1.120.2.34 03/01/21 16:07:29 serg@serg.mysql.com +1 -1
    fixed double-free bug in COM_CHANGE_USER

ChangeSet
  1.676.1.636 03/01/21 16:11:01 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql
  into sinisa.nasamreza.org:/mnt/work/mysql

  sql/log.cc
    1.55.1.14 03/01/21 16:10:59 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

ChangeSet
  1.1346.46.102 03/01/21 15:54:36 Sinisa@sinisa.nasamreza.org +3 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
  into sinisa.nasamreza.org:/mnt/work/mysql-4.0

  sql/sql_acl.cc
    1.51.1.35 03/01/21 15:54:33 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/net_pkg.cc
    1.21.3.2 03/01/21 15:54:33 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  scripts/mysqld_safe.sh
    1.54 03/01/21 15:54:32 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1417 03/01/21 15:31:04 bell@sanja.is.com.ua +2 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-cols-4.1

  sql/sql_yacc.yy
    1.203.1.20 03/01/21 15:31:01 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.187 03/01/21 15:31:01 bell@sanja.is.com.ua +0 -0
    Auto merged

  BitKeeper/deleted/.del-TpcbExample.cpp~a3fab717eccade1a
    1.4 03/01/21 17:10:41 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_cxx/TpcbExample.cpp

  BitKeeper/deleted/.del-MpoolExample.cpp~45a8c0095f7149a3
    1.4 03/01/21 17:10:41 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_cxx/MpoolExample.cpp

  BitKeeper/deleted/.del-LockExample.cpp~7ef6698c1a6364c6
    1.4 03/01/21 17:10:41 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_cxx/LockExample.cpp

  BitKeeper/deleted/.del-EnvExample.cpp~ef23df0013fbadfb
    1.4 03/01/21 17:10:41 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_cxx/EnvExample.cpp

  BitKeeper/deleted/.del-BtRecExample.cpp~f79114b5ee4d7c99
    1.4 03/01/21 17:10:41 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_cxx/BtRecExample.cpp

  BitKeeper/deleted/.del-AccessExample.cpp~1016122e96eac900
    1.4 03/01/21 17:10:40 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_cxx/AccessExample.cpp

  BitKeeper/deleted/.del-ex_tpcb.h~1f578e0fb4fb78d3
    1.4 03/01/21 17:10:27 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/ex_tpcb.h

  BitKeeper/deleted/.del-ex_tpcb.c~438b76c1166f4c05
    1.4 03/01/21 17:10:27 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/ex_tpcb.c

  BitKeeper/deleted/.del-ex_thread.c~cff8e0283bd52c4c
    1.4 03/01/21 17:10:27 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/ex_thread.c

  BitKeeper/deleted/.del-ex_rq_util.c~fa9d3ac1141a075c
    1.2 03/01/21 17:10:27 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/ex_repquote/ex_rq_util.c

  BitKeeper/deleted/.del-ex_rq_net.c~a54052285595ec00
    1.2 03/01/21 17:10:27 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/ex_repquote/ex_rq_net.c

  BitKeeper/deleted/.del-ex_rq_master.c~85dbde9ad8245ecb
    1.2 03/01/21 17:10:27 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/ex_repquote/ex_rq_master.c

  BitKeeper/deleted/.del-ex_rq_main.c~da00595d16b60cf0
    1.2 03/01/21 17:10:27 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/ex_repquote/ex_rq_main.c

  BitKeeper/deleted/.del-ex_rq_client.c~d7044f23b55b359
    1.2 03/01/21 17:10:27 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/ex_repquote/ex_rq_client.c

  BitKeeper/deleted/.del-ex_repquote.h~4d3695fe78cc55bf
    1.2 03/01/21 17:10:27 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/ex_repquote/ex_repquote.h

  BitKeeper/deleted/.del-ex_apprec_rec.c~5cc676001646b782
    1.2 03/01/21 17:10:27 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/ex_apprec/ex_apprec_rec.c

  BitKeeper/deleted/.del-ex_apprec.src~3cb70069cd818a9c
    1.2 03/01/21 17:10:27 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/ex_apprec/ex_apprec.src

  BitKeeper/deleted/.del-ex_apprec.h~fbc4e37c9936bed8
    1.2 03/01/21 17:10:27 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/ex_apprec/ex_apprec.h

  BitKeeper/deleted/.del-ex_apprec.c~d76cd5b13fd7f9e
    1.2 03/01/21 17:10:27 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/ex_apprec/ex_apprec.c

  BitKeeper/deleted/.del-auto_rebuild~79f363fad0302f23
    1.2 03/01/21 17:10:27 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/ex_apprec/auto_rebuild

  BitKeeper/deleted/.del-ex_mpool.c~b51c929ad09f2cb8
    1.4 03/01/21 17:10:26 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/ex_mpool.c

  BitKeeper/deleted/.del-ex_lock.c~6b6f72e8b19da0b1
    1.4 03/01/21 17:10:26 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/ex_lock.c

  BitKeeper/deleted/.del-ex_env.c~b2fbf8debefbb955
    1.4 03/01/21 17:10:26 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/ex_env.c

  BitKeeper/deleted/.del-ex_dbclient.c~9560845efc4dcf01
    1.4 03/01/21 17:10:26 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/ex_dbclient.c

  BitKeeper/deleted/.del-ex_btrec.c~1dd4f24b6baa62a5
    1.4 03/01/21 17:10:26 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/ex_btrec.c

  BitKeeper/deleted/.del-ex_access.c~75506e56e42fa9d4
    1.4 03/01/21 17:10:26 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/ex_access.c

  BitKeeper/deleted/.del-bench_001.c~2fa9b35498dae603
    1.2 03/01/21 17:10:26 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/bench_001.c

  BitKeeper/deleted/.del-README~281c91deea8d9cf7
    1.4 03/01/21 17:10:26 ram@mysql.r18.ru +0 -0
    Delete: bdb/examples_c/README

ChangeSet
  1.1415.1.1 03/01/21 14:57:33 Sinisa@sinisa.nasamreza.org +4 -0
  resolve fix

  sql/sql_derived.cc
    1.31 03/01/21 14:57:30 Sinisa@sinisa.nasamreza.org +0 -1
    resolve fix.

  sql/sql_yacc.yy
    1.203.16.1 03/01/21 14:54:21 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_select.cc
    1.185.1.1 03/01/21 14:54:20 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_class.cc
    1.96 03/01/21 14:54:20 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1403.48.14 03/01/21 14:50:55 Sinisa@sinisa.nasamreza.org +1 -0
  A small fix for privilege system as reported by HF.

  sql/sql_derived.cc
    1.28.1.1 03/01/21 14:50:51 Sinisa@sinisa.nasamreza.org +1 -1
    A small fix for privilege system as reported by HF.

ChangeSet
  1.1416 03/01/21 14:03:30 bell@sanja.is.com.ua +7 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-cols-4.1

  sql/sql_select.cc
    1.186 03/01/21 14:03:28 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_handler.cc
    1.32 03/01/21 14:03:28 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_base.cc
    1.134 03/01/21 14:03:28 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/set_var.cc
    1.25 03/01/21 14:03:28 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.67 03/01/21 14:03:27 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.95 03/01/21 14:03:27 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.43 03/01/21 14:03:27 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1403.70.3 03/01/21 13:55:26 bell@sanja.is.com.ua +15 -0
  fixed test of cardinality

  sql/sql_yacc.yy
    1.203.1.19 03/01/21 13:55:18 bell@sanja.is.com.ua +1 -1
    fixed test of cardinality

  sql/sql_select.cc
    1.173.27.1 03/01/21 13:55:18 bell@sanja.is.com.ua +3 -3
    fixed test of cardinality

  sql/sql_handler.cc
    1.22.1.11 03/01/21 13:55:18 bell@sanja.is.com.ua +1 -1
    fixed test of cardinality

  sql/sql_base.cc
    1.122.1.29 03/01/21 13:55:18 bell@sanja.is.com.ua +4 -5
    fixed test of cardinality

  sql/set_var.cc
    1.20.1.5 03/01/21 13:55:18 bell@sanja.is.com.ua +1 -1
    fixed test of cardinality

  sql/item_sum.cc
    1.53 03/01/21 13:55:18 bell@sanja.is.com.ua +2 -2
    fixed test of cardinality

  sql/item_strfunc.h
    1.40 03/01/21 13:55:18 bell@sanja.is.com.ua +6 -6
    fixed test of cardinality

  sql/item_strfunc.cc
    1.54.1.31 03/01/21 13:55:18 bell@sanja.is.com.ua +2 -2
    fixed test of cardinality

  sql/item_func.h
    1.62 03/01/21 13:55:18 bell@sanja.is.com.ua +1 -2
    fixed test of cardinality

  sql/item_func.cc
    1.90.1.6 03/01/21 13:55:18 bell@sanja.is.com.ua +4 -4
    fixed test of cardinality

  sql/item_cmpfunc.h
    1.37 03/01/21 13:55:18 bell@sanja.is.com.ua +1 -2
    fixed test of cardinality

  sql/item_cmpfunc.cc
    1.56 03/01/21 13:55:18 bell@sanja.is.com.ua +7 -9
    fixed test of cardinality

  sql/item.cc
    1.27.20.3 03/01/21 13:55:18 bell@sanja.is.com.ua +2 -2
    fixed test of cardinality

  mysql-test/t/subselect.test
    1.47 03/01/21 13:55:18 bell@sanja.is.com.ua +3 -0
    test of cardinality error

  mysql-test/r/subselect.result
    1.55 03/01/21 13:55:18 bell@sanja.is.com.ua +2 -0
    test of cardinality error

ChangeSet
  1.1415 03/01/21 15:54:14 hf@deer.mysql.r18.ru +2 -0
  fix removation

  sql/sql_derived.cc
    1.30 03/01/21 15:54:09 hf@deer.mysql.r18.ru +1 -2
    fix removed

  sql/mysqld.cc
    1.324 03/01/21 15:50:17 hf@deer.mysql.r18.ru +2 -2
    removing debugging stuff

ChangeSet
  1.676.266.15 03/01/21 13:37:41 heikki@hundin.mysql.fi +1 -0
  os0file.c:
    The problem yesterday in ERROR_LOCK_VIOLATION was not InnoDB Hot Backup, but some file system backup tool: add to file writes 100 retries with 1 second waits

  innobase/os/os0file.c
    1.31.1.17 03/01/21 13:37:35 heikki@hundin.mysql.fi +7 -4
    The problem yesterday in ERROR_LOCK_VIOLATION was not InnoDB Hot Backup, but some file system backup tool: add to file writes 100 retries with 1 second waits

ChangeSet
  1.1414 03/01/21 09:46:07 hf@deer.mysql.r18.ru +3 -0
  Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
  into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.w1

  sql/sql_prepare.cc
    1.19 03/01/21 09:46:05 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_parse.cc
    1.252 03/01/21 09:46:05 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.85.1.8 03/01/21 09:46:05 hf@deer.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1413 03/01/21 09:45:05 hf@deer.mysql.r18.ru +1 -0
  small fix

  sql/sql_derived.cc
    1.29 03/01/21 09:45:00 hf@deer.mysql.r18.ru +2 -1
    I think it's better not to implement another "*any*"

ChangeSet
  1.676.266.14 03/01/21 00:44:49 heikki@hundin.mysql.fi +1 -0
  ha_innobase.cc:
    Backport from 4.0: convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table

  sql/ha_innobase.cc
    1.45.21.1 03/01/21 00:44:42 heikki@hundin.mysql.fi +10 -0
    Backport from 4.0: convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table

ChangeSet
  1.1346.91.25 03/01/21 00:38:55 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table

  sql/ha_innodb.cc
    1.73.1.71 03/01/21 00:38:46 heikki@hundin.mysql.fi +10 -0
    Convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table

ChangeSet
  1.676.266.13 03/01/21 00:18:48 heikki@hundin.mysql.fi +1 -0
  os0file.c:
    Fix an assertion about ERROR_LOCK_VIOLATION 33 in file write if InnoDB Hot Backup is run concurrently with mysqld in Windows

  innobase/os/os0file.c
    1.31.1.16 03/01/21 00:18:30 heikki@hundin.mysql.fi +16 -4
    Fix an assertion about ERROR_LOCK_VIOLATION 33 in file write if InnoDB Hot Backup is run concurrently with mysqld in Windows

ChangeSet
  1.1403.70.2 03/01/20 14:07:10 venu@myvenu.com +1 -0
  Merge work.mysql.com:/home/bk/mysql-4.1
  into myvenu.com:/home/venu/bk/src-4.1

  sql/sql_parse.cc
    1.235.26.22 03/01/20 14:07:06 venu@myvenu.com +0 -0
    Auto merged

ChangeSet
  1.1403.71.1 03/01/20 14:00:50 venu@myvenu.com +2 -0
  Multi query fix the recursion (SCRUM - For Monty)

  sql/sql_prepare.cc
    1.14.1.6 03/01/20 13:58:08 venu@myvenu.com +5 -1

  sql/sql_parse.cc
    1.235.37.1 03/01/20 13:58:03 venu@myvenu.com +24 -9

ChangeSet
  1.1403.70.1 03/01/20 23:39:28 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Remove the question of Monty about user_thd / NULL after a merge from 4.0 to 4.1, user_thd is the right value in 4.1

  sql/ha_innodb.cc
    1.85.3.7 03/01/20 23:39:05 heikki@hundin.mysql.fi +0 -5
    Remove the question of Monty about user_thd / NULL after a merge from 4.0 to 4.1, user_thd is the right value in 4.1

ChangeSet
  1.1403.1.80 03/01/20 18:48:10 monty@mashka.mysql.fi +4 -0
  Merge with 4.0 (Fix bug in LEFT JOIN and EXPLAIN on empty table)

  sql/sql_select.cc
    1.173.26.2 03/01/20 18:48:06 monty@mashka.mysql.fi +7 -15
    Merge with 4.0 (Fix bug in LEFT JOIN and EXPLAIN on empty table)

  mysql-test/t/join.test
    1.15 03/01/20 18:44:35 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/explain.test
    1.5 03/01/20 18:44:34 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/explain.result
    1.10 03/01/20 18:44:34 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.91.24 03/01/20 18:17:14 monty@mashka.mysql.fi +3 -0
  Fixed bug with EXPLAIN on empty table

  sql/sql_select.cc
    1.152.1.67 03/01/20 18:17:10 monty@mashka.mysql.fi +29 -26
    Fixed bug with EXPLAIN on empty table

  mysql-test/t/explain.test
    1.3.1.1 03/01/20 18:17:10 monty@mashka.mysql.fi +5 -2
    test of bug with EXPLAIN on empty table

  mysql-test/r/explain.result
    1.5.1.2 03/01/20 18:17:10 monty@mashka.mysql.fi +3 -0
    test of bug with EXPLAIN on empty table

ChangeSet
  1.1412 03/01/20 18:59:45 hf@deer.mysql.r18.ru +37 -0
  Conflicts resolving

  libmysqld/libmysqld.c
    1.26 03/01/20 18:59:43 hf@deer.mysql.r18.ru +0 -6
    conflicts resolving

  sql/sql_table.cc
    1.143 03/01/20 18:50:45 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_show.cc
    1.105 03/01/20 18:50:45 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_select.cc
    1.185 03/01/20 18:50:44 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.18 03/01/20 18:50:44 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_parse.cc
    1.251 03/01/20 18:50:43 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_load.cc
    1.42 03/01/20 18:50:42 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_handler.cc
    1.31 03/01/20 18:50:42 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_db.cc
    1.62 03/01/20 18:50:42 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_class.h
    1.137 03/01/20 18:50:42 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_class.cc
    1.95 03/01/20 18:50:42 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_cache.cc
    1.39.1.6 03/01/20 18:50:41 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_base.cc
    1.133 03/01/20 18:50:41 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_acl.cc
    1.63 03/01/20 18:50:40 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/slave.cc
    1.178 03/01/20 18:50:40 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/set_var.h
    1.12 03/01/20 18:50:40 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/set_var.cc
    1.24 03/01/20 18:50:40 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/protocol.cc
    1.36 03/01/20 18:50:40 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/net_serv.cc
    1.51 03/01/20 18:50:40 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/mysqld.cc
    1.323 03/01/20 18:50:39 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/mysql_priv.h
    1.174 03/01/20 18:50:39 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/log_event.h
    1.80 03/01/20 18:50:39 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/log_event.cc
    1.96 03/01/20 18:50:38 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/log.cc
    1.98 03/01/20 18:50:37 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.66 03/01/20 18:50:37 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/item_func.cc
    1.94 03/01/20 18:50:37 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/item.h
    1.47 03/01/20 18:50:37 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/item.cc
    1.42 03/01/20 18:50:36 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.85.1.7 03/01/20 18:50:35 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/field.h
    1.56 03/01/20 18:50:34 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/field.cc
    1.77 03/01/20 18:50:33 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  include/mysql_com.h
    1.65 03/01/20 18:50:32 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  include/mysql.h
    1.53 03/01/20 18:50:32 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  include/my_global.h
    1.35 03/01/20 18:50:32 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  client/mysqltest.c
    1.90 03/01/20 18:50:32 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  client/mysql.cc
    1.111 03/01/20 18:50:31 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.229 03/01/20 18:49:16 hf@deer.mysql.r18.ru +0 -0
    auto-union

ChangeSet
  1.1411 03/01/20 18:47:25 hf@deer.mysql.r18.ru +15 -0
  SCRUM
  embedded-related changes

  sql/sql_show.cc
    1.104 03/01/20 18:47:04 hf@deer.mysql.r18.ru +2 -13
    non-protocol sending removed

  sql/sql_parse.cc
    1.250 03/01/20 18:47:03 hf@deer.mysql.r18.ru +2 -5
    comments added debugging stuff deleted

  sql/sql_class.h
    1.136 03/01/20 18:47:03 hf@deer.mysql.r18.ru +6 -3
    embedded-related changes

  sql/sql_class.cc
    1.94 03/01/20 18:47:03 hf@deer.mysql.r18.ru +0 -4
    no need to do special embedded select_send::send_row

  sql/sql_cache.cc
    1.39.1.5 03/01/20 18:47:02 hf@deer.mysql.r18.ru +1 -1
    comment added

  sql/protocol.h
    1.4 03/01/20 18:47:02 hf@deer.mysql.r18.ru +6 -2
    embedded-related changes

  sql/protocol.cc
    1.35 03/01/20 18:47:02 hf@deer.mysql.r18.ru +18 -5
    embedded-related changes

  sql/mysqld.cc
    1.322 03/01/20 18:47:02 hf@deer.mysql.r18.ru +3 -475
    some debug stuff

  sql/log.cc
    1.97 03/01/20 18:47:01 hf@deer.mysql.r18.ru +3 -2
    there's no ports in embedded library

  sql/item.h
    1.46 03/01/20 18:47:01 hf@deer.mysql.r18.ru +0 -18
    embedded-related changes in Protocol class

  sql/item.cc
    1.41 03/01/20 18:47:00 hf@deer.mysql.r18.ru +0 -58
    obsolete functions removed

  sql/field.cc
    1.76 03/01/20 18:46:59 hf@deer.mysql.r18.ru +1 -1
    set_key_image changed

  sql/convert.cc
    1.12 03/01/20 18:46:58 hf@deer.mysql.r18.ru +1 -13
    changes to use convert in embedded library

  libmysqld/lib_sql.cc
    1.42 03/01/20 18:46:58 hf@deer.mysql.r18.ru +38 -248
    Some Protocol:: methods implemented

  include/mysql_com.h
    1.64 03/01/20 18:46:58 hf@deer.mysql.r18.ru +5 -0
    net_flush emptification

ChangeSet
  1.1403.47.9 03/01/20 15:38:35 Sinisa@sinisa.nasamreza.org +2 -0
  Changing some proc names to a more suitable one.

  mysql-test/t/sp.test
    1.3 03/01/20 15:38:28 Sinisa@sinisa.nasamreza.org +3 -3
    Changing some proc names to a more suitable one.

  mysql-test/r/sp.result
    1.3 03/01/20 15:38:28 Sinisa@sinisa.nasamreza.org +3 -3
    Changing some proc names to a more suitable one.

ChangeSet
  1.1403.35.3 03/01/20 02:58:21 wax@mysql.com +1 -0
  delete name_length and change an assign of udf.name (SCRUM)

  sql/sql_yacc.yy
    1.203.13.2 03/01/20 02:58:19 wax@mysql.com +2 -3
    delete name_length and change assign of udf.name

ChangeSet
  1.1346.91.23 03/01/19 17:15:14 monty@mashka.mysql.fi +3 -0
  Fixed bug in LEFT JOIN with impossible ON/WHERE expression

  sql/sql_select.cc
    1.152.1.66 03/01/19 17:15:12 monty@mashka.mysql.fi +31 -12
    Fixed bug in LEFT JOIN with impossible ON/WHERE expression

  mysql-test/t/join.test
    1.13.1.1 03/01/19 17:15:11 monty@mashka.mysql.fi +7 -2
    Test of LEFT JOIN bug

  mysql-test/r/join.result
    1.17 03/01/19 17:15:11 monty@mashka.mysql.fi +11 -2
    Test of LEFT JOIN bug

ChangeSet
  1.1403.1.79 03/01/19 02:28:36 monty@mashka.mysql.fi +2 -0
  Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1

  tests/client_test.c
    1.9 03/01/19 02:28:33 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_parse.cc
    1.235.26.21 03/01/19 02:28:33 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1403.69.2 03/01/19 02:28:07 monty@mashka.mysql.fi +7 -0
  merge with 4.0 to get bug fix for SHOW PROCESSLIST + connected slave

  sql/sql_db.cc
    1.58.1.8 03/01/19 02:28:05 monty@mashka.mysql.fi +0 -13
    merge with 4.0 (use local)

  sql/log_event.cc
    1.91.1.8 03/01/19 02:28:05 monty@mashka.mysql.fi +8 -10
    merge with 4.0

  sql/sql_parse.cc
    1.235.36.1 03/01/19 02:24:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_acl.cc
    1.55.1.19 03/01/19 02:24:26 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/slave.cc
    1.174.1.3 03/01/19 02:24:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/log.cc
    1.92.1.3 03/01/19 02:24:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/mi_create.c
    1.26.1.2 03/01/19 02:24:25 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1403.69.1 03/01/19 02:24:02 monty@mashka.mysql.fi +22 -0
  Removed compiler warnings

  tests/client_test.c
    1.7.1.1 03/01/19 02:24:00 monty@mashka.mysql.fi +1 -1
    Indentation change

  mysys/Makefile.am
    1.44 03/01/19 02:24:00 monty@mashka.mysql.fi +1 -1
    Remove library dependency for charset2html to get correct makefile

  cmd-line-utils/libedit/vi.c
    1.2 03/01/19 02:24:00 monty@mashka.mysql.fi +0 -7
    Removed RCSID to get rid of compiler warnings

  cmd-line-utils/libedit/tty.c
    1.2 03/01/19 02:24:00 monty@mashka.mysql.fi +0 -7
    Removed RCSID to get rid of compiler warnings

  cmd-line-utils/libedit/tokenizer.c
    1.2 03/01/19 02:24:00 monty@mashka.mysql.fi +0 -7
    Removed RCSID to get rid of compiler warnings

  cmd-line-utils/libedit/term.c
    1.2 03/01/19 02:24:00 monty@mashka.mysql.fi +0 -7
    Removed RCSID to get rid of compiler warnings

  cmd-line-utils/libedit/sig.c
    1.2 03/01/19 02:24:00 monty@mashka.mysql.fi +0 -7
    Removed RCSID to get rid of compiler warnings

  cmd-line-utils/libedit/search.c
    1.2 03/01/19 02:24:00 monty@mashka.mysql.fi +0 -7
    Removed RCSID to get rid of compiler warnings

  cmd-line-utils/libedit/refresh.c
    1.2 03/01/19 02:24:00 monty@mashka.mysql.fi +0 -7
    Removed RCSID to get rid of compiler warnings

  cmd-line-utils/libedit/readline.c
    1.2 03/01/19 02:24:00 monty@mashka.mysql.fi +0 -4
    Removed RCSID to get rid of compiler warnings

  cmd-line-utils/libedit/read.c
    1.2 03/01/19 02:24:00 monty@mashka.mysql.fi +0 -7
    Removed RCSID to get rid of compiler warnings

  cmd-line-utils/libedit/prompt.c
    1.2 03/01/19 02:24:00 monty@mashka.mysql.fi +0 -7
    Removed RCSID to get rid of compiler warnings

  cmd-line-utils/libedit/parse.c
    1.2 03/01/19 02:24:00 monty@mashka.mysql.fi +0 -7
    Removed RCSID to get rid of compiler warnings

  cmd-line-utils/libedit/map.c
    1.2 03/01/19 02:24:00 monty@mashka.mysql.fi +0 -7
    Removed RCSID to get rid of compiler warnings

  cmd-line-utils/libedit/key.c
    1.2 03/01/19 02:24:00 monty@mashka.mysql.fi +0 -7
    Removed RCSID to get rid of compiler warnings

  cmd-line-utils/libedit/history.c
    1.2 03/01/19 02:24:00 monty@mashka.mysql.fi +0 -7
    Removed RCSID to get rid of compiler warnings

  cmd-line-utils/libedit/hist.c
    1.2 03/01/19 02:24:00 monty@mashka.mysql.fi +0 -7
    Removed RCSID to get rid of compiler warnings

  cmd-line-utils/libedit/fgetln.c
    1.2 03/01/19 02:24:00 monty@mashka.mysql.fi +3 -2
    Removed RCSID to get rid of compiler warnings
    Removed compiler warning

  cmd-line-utils/libedit/emacs.c
    1.2 03/01/19 02:24:00 monty@mashka.mysql.fi +0 -7
    Removed RCSID to get rid of compiler warnings

  cmd-line-utils/libedit/el.c
    1.2 03/01/19 02:24:00 monty@mashka.mysql.fi +0 -7
    Removed RCSID to get rid of compiler warnings

  cmd-line-utils/libedit/common.c
    1.2 03/01/19 02:24:00 monty@mashka.mysql.fi +0 -7
    Removed RCSID to get rid of compiler warnings

  cmd-line-utils/libedit/chared.c
    1.2 03/01/19 02:24:00 monty@mashka.mysql.fi +0 -7
    Removed RCSID to get rid of compiler warnings

ChangeSet
  1.1346.91.22 03/01/19 02:00:26 monty@mashka.mysql.fi +3 -0
  Fixes cases where thd->query was not protected.
  This fixes a problem with SHOW PROCESSLIST

  sql/sql_db.cc
    1.39.1.16 03/01/19 02:00:24 monty@mashka.mysql.fi +5 -5
    Fixes cases where thd->query was not protected

  sql/sql_acl.cc
    1.51.7.1 03/01/19 02:00:24 monty@mashka.mysql.fi +1 -0
    Table privileges was not reset on FLUSH PRIVILEGES if tables_priv was empty

  sql/log_event.cc
    1.77.1.19 03/01/19 02:00:24 monty@mashka.mysql.fi +8 -2
    Fixes cases where thd->query was not protected

ChangeSet
  1.1346.91.21 03/01/19 01:31:43 monty@mashka.mysql.fi +6 -0
  Merge with 3.23 to get bug fix for SHOW PROCESSLIST + running thread

  sql/sql_parse.cc
    1.218.1.69 03/01/19 01:31:42 monty@mashka.mysql.fi +1 -9
    Merge with 3.23

  sql/sql_db.cc
    1.39.1.15 03/01/19 01:31:42 monty@mashka.mysql.fi +9 -12
    Merge with 3.23

  sql/slave.cc
    1.164.1.42 03/01/19 01:31:42 monty@mashka.mysql.fi +4 -13
    merge with 3.23

  innobase/btr/btr0sea.c
    1.14 03/01/19 01:31:42 monty@mashka.mysql.fi +0 -11
    Merge with 3.23 (use local file)

  sql/log.cc
    1.80.1.26 03/01/19 01:23:04 monty@mashka.mysql.fi +0 -1
    Auto merged

  myisam/mi_create.c
    1.21.1.8 03/01/19 01:23:04 monty@mashka.mysql.fi +0 -1
    Auto merged

ChangeSet
  1.1403.1.78 03/01/18 14:04:34 venu@myvenu.com +10 -0
  Windows build fix 

  sql/sql_test.cc
    1.18 03/01/18 14:04:29 venu@myvenu.com +1 -1
    Windows build fix 

  myisam/rt_mbr.c
    1.4 03/01/18 14:04:29 venu@myvenu.com +4 -4
    Windows build fix 

  myisam/mi_check.c
    1.98 03/01/18 14:04:29 venu@myvenu.com +0 -16
    Windows build fix 

  include/typelib.h
    1.2 03/01/18 14:04:29 venu@myvenu.com +4 -4
    Windows build fix 

  VC++Files/strings/strings.dsp
    1.4 03/01/18 14:04:29 venu@myvenu.com +29 -0
    Windows build fix 

  VC++Files/sql/mysqld.dsp
    1.9 03/01/18 14:04:29 venu@myvenu.com +8 -20
    Windows build fix 

  VC++Files/mysys/mysys.dsp
    1.8 03/01/18 14:04:29 venu@myvenu.com +4 -4
    Windows build fix 

  VC++Files/libmysql/libmysql.dsp
    1.9 03/01/18 14:04:29 venu@myvenu.com +8 -4
    Windows build fix 

  VC++Files/libmysql/libmysql.def
    1.2 03/01/18 14:04:29 venu@myvenu.com +0 -1
    Windows build fix 

  VC++Files/client/mysqlclient.dsp
    1.8 03/01/18 14:04:29 venu@myvenu.com +8 -4
    Windows build fix 

ChangeSet
  1.676.270.1 03/01/18 23:38:55 monty@mashka.mysql.fi +3 -0
  Only set thd->query to 0 if LOCK_thread_count is hold
  This fixes a possible core dump problem in SHOW PROCESSLIST

  sql/sql_parse.cc
    1.120.2.33 03/01/18 23:38:53 monty@mashka.mysql.fi +8 -9
    Indentation changes

  sql/sql_db.cc
    1.22.1.16 03/01/18 23:38:53 monty@mashka.mysql.fi +6 -4
    Only set thd->query to 0 if LOCK_thread_count is hold
    Also first set query_length, then query

  sql/slave.cc
    1.100.1.33 03/01/18 23:38:53 monty@mashka.mysql.fi +26 -8
    Only set thd->query to 0 if LOCK_thread_count is hold

ChangeSet
  1.1403.68.2 03/01/18 12:58:19 venu@myvenu.com +2 -0
  Few more tests + store_result fix

  tests/client_test.c
    1.8 03/01/18 12:57:47 venu@myvenu.com +747 -80

  sql/sql_prepare.cc
    1.14.1.5 03/01/18 12:56:54 venu@myvenu.com +50 -32

ChangeSet
  1.1403.1.76 03/01/18 11:59:36 venu@myvenu.com +2 -0
  Merge work.mysql.com:/home/bk/mysql-4.1
  into myvenu.com:/home/venu/bk/src-4.1

  sql/sql_parse.cc
    1.235.26.20 03/01/18 11:59:31 venu@myvenu.com +0 -0
    Auto merged

  libmysql/libmysql.c
    1.130 03/01/18 11:59:30 venu@myvenu.com +0 -0
    Auto merged

ChangeSet
  1.1403.1.75 03/01/18 21:55:01 monty@mashka.mysql.fi +3 -0
  Removed compiler warnings

  sql/password.c
    1.20 03/01/18 21:54:59 monty@mashka.mysql.fi +8 -8
    Removed compiler warnings

  libmysql/libmysql.c
    1.128.1.1 03/01/18 21:54:59 monty@mashka.mysql.fi +17 -14
    Removed compiler warnings

  client/insert_test.c
    1.8 03/01/18 21:54:59 monty@mashka.mysql.fi +1 -0
    Fixed core dump in test

ChangeSet
  1.1403.68.1 03/01/18 11:53:38 venu@myvenu.com +6 -0
  Initial multi query execution support 

  include/mysql_com.h
    1.60.1.4 03/01/18 11:53:04 venu@myvenu.com +2 -0

  include/mysql.h
    1.43.1.18 03/01/18 11:53:04 venu@myvenu.com +3 -1

  libmysql/libmysql.c
    1.129 03/01/18 11:52:41 venu@myvenu.com +35 -2

  sql/sql_lex.h
    1.102.1.8 03/01/18 11:52:18 venu@myvenu.com +1 -0

  sql/sql_lex.cc
    1.65 03/01/18 11:52:14 venu@myvenu.com +9 -1

  sql/sql_parse.cc
    1.235.35.1 03/01/18 11:52:06 venu@myvenu.com +10 -0

ChangeSet
  1.1403.1.74 03/01/18 18:32:33 monty@mashka.mysql.fi +4 -0
  Simple code cleanups, ignore generated files

ChangeSet
  1.1403.1.73 03/01/18 16:40:14 monty@mashka.mysql.fi +3 -0
  Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1

  mysql-test/t/fulltext2.test
    1.3 03/01/18 18:23:39 serg@serg.mysql.com +11 -0
    two-level tree support in wi_write()

  mysql-test/r/fulltext2.result
    1.3 03/01/18 18:23:39 serg@serg.mysql.com +12 -0
    two-level tree support in wi_write()

  myisam/myisamdef.h
    1.55 03/01/18 18:23:39 serg@serg.mysql.com +1 -1
    two-level tree support in wi_write()

  myisam/mi_delete.c
    1.17 03/01/18 18:23:39 serg@serg.mysql.com +6 -6
    two-level tree support in wi_write()

  myisam/mi_write.c
    1.31.1.1 03/01/18 18:23:38 serg@serg.mysql.com +58 -19
    two-level tree support in wi_write()

  myisam/ft_static.c
    1.20 03/01/18 18:23:38 serg@serg.mysql.com +5 -0
    two-level tree support in wi_write()

ChangeSet
  1.1403.67.1 03/01/18 21:05:02 vva@eagle.mysql.r18.ru +1 -0
  libedit need this file too...

  cmd-line-utils/libedit/compat_conf.h
    1.1 03/01/18 21:04:58 vva@eagle.mysql.r18.ru +2 -0

  cmd-line-utils/libedit/compat_conf.h
    1.0 03/01/18 21:04:58 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/compat_conf.h

ChangeSet
  1.1403.66.2 03/01/18 20:53:46 vva@eagle.mysql.r18.ru +59 -0
  move readline to cmd-line-utils

  myisam/mi_check.c
    1.94.1.3 03/01/18 17:48:16 serg@serg.mysql.com +1 -5
    ft_sintXkorr, ft_intXstore

  myisam/fulltext.h
    1.8 03/01/18 17:48:16 serg@serg.mysql.com +3 -0
    ft_sintXkorr, ft_intXstore

  myisam/ft_nlq_search.c
    1.22 03/01/18 17:48:16 serg@serg.mysql.com +1 -5
    ft_sintXkorr, ft_intXstore

  myisam/ft_boolean_search.c
    1.57 03/01/18 17:48:16 serg@serg.mysql.com +1 -5
    ft_sintXkorr, ft_intXstore

  cmd-line-utils/readline/xmalloc.h
    1.2 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/xmalloc.c
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/vi_mode.c
    1.9 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/vi_keymap.c
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/util.c
    1.5 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/undo.c
    1.6 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/tilde.h
    1.5 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/tilde.c
    1.7 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/text.c
    1.3 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/terminal.c
    1.11 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/tcap.h
    1.7 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/signals.c
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/shell.c
    1.6 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/search.c
    1.6 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/rlwinsize.h
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/rltypedefs.h
    1.2 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/rltty.h
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/rltty.c
    1.7 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/rlstdc.h
    1.6 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/rlshell.h
    1.2 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/rlprivate.h
    1.3 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/rlmbutil.h
    1.3 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/rldefs.h
    1.5 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/rlconf.h
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/readline.h
    1.7 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/readline.c
    1.7 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/posixstat.h
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/posixjmp.h
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/posixdir.h
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/parens.c
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/nls.c
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/misc.c
    1.2 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/mbutil.c
    1.3 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/macro.c
    1.5 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/kill.c
    1.6 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/keymaps.h
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/keymaps.c
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/isearch.c
    1.7 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/input.c
    1.9 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/histsearch.c
    1.5 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/history.h
    1.7 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/history.c
    1.5 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/histlib.h
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/histfile.c
    1.6 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/histexpand.c
    1.8 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/funmap.c
    1.6 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/emacs_keymap.c
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/display.c
    1.9 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/configure.in
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/complete.c
    1.9 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/chardefs.h
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/callback.c
    1.5 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/bind.c
    1.10 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/ansi_stdlib.h
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/README
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/Makefile.am
    1.10 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/INSTALL
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/COPYING
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  cmd-line-utils/readline/.cvsignore
    1.4 03/01/18 20:32:52 vva@eagle.mysql.r18.ru +0 -0
    mvdir

  tests/grant.res
    1.9 03/01/18 18:32:30 monty@mashka.mysql.fi +1 -1
    Updated results for 4.1

  sql/sql_parse.cc
    1.235.26.19 03/01/18 18:32:30 monty@mashka.mysql.fi +39 -38
    Simple code cleanup

  mysys/queues.c
    1.14 03/01/18 18:32:30 monty@mashka.mysql.fi +61 -11
    Added comments

  BitKeeper/etc/ignore
    1.137 03/01/18 18:31:56 monty@mashka.mysql.fi +1 -0
    added cmd-line-utils/libedit/common.h

  BitKeeper/etc/ignore
    1.136 03/01/18 18:31:04 monty@mashka.mysql.fi +1 -0
    added include/readline/readline.h

  BitKeeper/etc/ignore
    1.135 03/01/18 18:30:57 monty@mashka.mysql.fi +7 -0
    added comon.h emacs.h fcns.c fcns.h help.h help.c vi.h

ChangeSet
  1.1403.66.1 03/01/18 20:28:48 vva@eagle.mysql.r18.ru +50 -0
  changes for readline/libedit configuration

  cmd-line-utils/libedit/vi.c
    1.1 03/01/18 20:28:18 vva@eagle.mysql.r18.ru +942 -0

  cmd-line-utils/libedit/tty.h
    1.1 03/01/18 20:28:18 vva@eagle.mysql.r18.ru +484 -0

  cmd-line-utils/libedit/tty.c
    1.1 03/01/18 20:28:18 vva@eagle.mysql.r18.ru +1184 -0

  cmd-line-utils/libedit/vi.c
    1.0 03/01/18 20:28:18 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/vi.c

  cmd-line-utils/libedit/tty.h
    1.0 03/01/18 20:28:18 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/tty.h

  cmd-line-utils/libedit/tty.c
    1.0 03/01/18 20:28:18 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/tty.c

  cmd-line-utils/libedit/tokenizer.h
    1.1 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +54 -0

  cmd-line-utils/libedit/tokenizer.c
    1.1 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +398 -0

  cmd-line-utils/libedit/term.h
    1.1 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +124 -0

  cmd-line-utils/libedit/term.c
    1.1 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +1571 -0

  cmd-line-utils/libedit/sys.h
    1.1 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +94 -0

  cmd-line-utils/libedit/strlcpy.h
    1.1 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +2 -0

  cmd-line-utils/libedit/strlcpy.c
    1.1 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +28 -0

  cmd-line-utils/libedit/sig.h
    1.1 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +72 -0

  cmd-line-utils/libedit/sig.c
    1.1 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +199 -0

  cmd-line-utils/libedit/search.h
    1.1 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +70 -0

  cmd-line-utils/libedit/search.c
    1.1 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +653 -0

  cmd-line-utils/libedit/refresh.h
    1.1 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +63 -0

  cmd-line-utils/libedit/refresh.c
    1.1 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +1107 -0

  cmd-line-utils/libedit/readline/readline.h
    1.1 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +127 -0

  cmd-line-utils/libedit/readline.c
    1.1 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +1665 -0

  cmd-line-utils/libedit/tokenizer.h
    1.0 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/tokenizer.h

  cmd-line-utils/libedit/tokenizer.c
    1.0 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/tokenizer.c

  cmd-line-utils/libedit/term.h
    1.0 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/term.h

  cmd-line-utils/libedit/term.c
    1.0 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/term.c

  cmd-line-utils/libedit/sys.h
    1.0 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/sys.h

  cmd-line-utils/libedit/strlcpy.h
    1.0 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/strlcpy.h

  cmd-line-utils/libedit/strlcpy.c
    1.0 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/strlcpy.c

  cmd-line-utils/libedit/sig.h
    1.0 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/sig.h

  cmd-line-utils/libedit/sig.c
    1.0 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/sig.c

  cmd-line-utils/libedit/search.h
    1.0 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/search.h

  cmd-line-utils/libedit/search.c
    1.0 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/search.c

  cmd-line-utils/libedit/refresh.h
    1.0 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/refresh.h

  cmd-line-utils/libedit/refresh.c
    1.0 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/refresh.c

  cmd-line-utils/libedit/readline/readline.h
    1.0 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/readline/readline.h

  cmd-line-utils/libedit/readline.c
    1.0 03/01/18 20:28:17 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/readline.c

  cmd-line-utils/libedit/read.c
    1.1 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +521 -0

  cmd-line-utils/libedit/prompt.h
    1.1 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +62 -0

  cmd-line-utils/libedit/prompt.c
    1.1 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +175 -0

  cmd-line-utils/libedit/parse.h
    1.1 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +52 -0

  cmd-line-utils/libedit/parse.c
    1.1 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +260 -0

  cmd-line-utils/libedit/map.h
    1.1 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +79 -0

  cmd-line-utils/libedit/map.c
    1.1 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +1419 -0

  cmd-line-utils/libedit/makelist
    1.1 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +254 -0

  cmd-line-utils/libedit/key.h
    1.1 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +79 -0

  cmd-line-utils/libedit/key.c
    1.1 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +688 -0

  cmd-line-utils/libedit/history.c
    1.1 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +871 -0

  cmd-line-utils/libedit/histedit.h
    1.1 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +190 -0

  cmd-line-utils/libedit/hist.h
    1.1 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +80 -0

  cmd-line-utils/libedit/hist.c
    1.1 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +199 -0

  cmd-line-utils/libedit/read.c
    1.0 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/read.c

  cmd-line-utils/libedit/prompt.h
    1.0 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/prompt.h

  cmd-line-utils/libedit/prompt.c
    1.0 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/prompt.c

  cmd-line-utils/libedit/parse.h
    1.0 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/parse.h

  cmd-line-utils/libedit/parse.c
    1.0 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/parse.c

  cmd-line-utils/libedit/map.h
    1.0 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/map.h

  cmd-line-utils/libedit/map.c
    1.0 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/map.c

  cmd-line-utils/libedit/makelist
    1.0 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/makelist

  cmd-line-utils/libedit/key.h
    1.0 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/key.h

  cmd-line-utils/libedit/key.c
    1.0 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/key.c

  cmd-line-utils/libedit/history.c
    1.0 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/history.c

  cmd-line-utils/libedit/histedit.h
    1.0 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/histedit.h

  cmd-line-utils/libedit/hist.h
    1.0 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/hist.h

  cmd-line-utils/libedit/hist.c
    1.0 03/01/18 20:28:16 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/hist.c

  cmd-line-utils/libedit/fgetln.h
    1.1 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +3 -0

  cmd-line-utils/libedit/fgetln.c
    1.1 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +107 -0

  cmd-line-utils/libedit/emacs.c
    1.1 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +489 -0

  cmd-line-utils/libedit/el.h
    1.1 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +142 -0

  cmd-line-utils/libedit/el.c
    1.1 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +475 -0

  cmd-line-utils/libedit/editrc.5
    1.1 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +491 -0

  cmd-line-utils/libedit/editline.3
    1.1 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +619 -0

  cmd-line-utils/libedit/compat.h
    1.1 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +39 -0

  cmd-line-utils/libedit/common.c
    1.1 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +961 -0

  cmd-line-utils/libedit/chared.h
    1.1 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +159 -0

  cmd-line-utils/libedit/chared.c
    1.1 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +697 -0

  cmd-line-utils/libedit/TEST/test.c
    1.1 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +269 -0

  cmd-line-utils/libedit/fgetln.h
    1.0 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/fgetln.h

  cmd-line-utils/libedit/fgetln.c
    1.0 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/fgetln.c

  cmd-line-utils/libedit/emacs.c
    1.0 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/emacs.c

  cmd-line-utils/libedit/el.h
    1.0 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/el.h

  cmd-line-utils/libedit/el.c
    1.0 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/el.c

  cmd-line-utils/libedit/editrc.5
    1.0 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/editrc.5

  cmd-line-utils/libedit/editline.3
    1.0 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/editline.3

  cmd-line-utils/libedit/compat.h
    1.0 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/compat.h

  cmd-line-utils/libedit/common.c
    1.0 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/common.c

  cmd-line-utils/libedit/chared.h
    1.0 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/chared.h

  cmd-line-utils/libedit/chared.c
    1.0 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/chared.c

  cmd-line-utils/libedit/TEST/test.c
    1.0 03/01/18 20:28:15 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/TEST/test.c

  cmd-line-utils/libedit/Makefile.am
    1.1 03/01/18 20:28:14 vva@eagle.mysql.r18.ru +86 -0

  configure.in
    1.201.1.13 03/01/18 16:40:11 monty@mashka.mysql.fi +0 -0
    Auto merged

  client/mysql.cc
    1.108.2.2 03/01/18 16:40:11 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/Makefile.am
    1.36 03/01/18 20:28:14 vva@eagle.mysql.r18.ru +9 -0
    changes for readline/libedit configuration

  configure.in
    1.201.2.1 03/01/18 20:28:14 vva@eagle.mysql.r18.ru +88 -12
    changes for readline/libedit configuration

  cmd-line-utils/libedit/Makefile.am
    1.0 03/01/18 20:28:14 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/add_libedit/experiment/4.1.clear/cmd-line-utils/libedit/Makefile.am

  client/mysql.cc
    1.108.3.1 03/01/18 20:28:14 vva@eagle.mysql.r18.ru +19 -11
    changes for readline/libedit configuration

  acinclude.m4
    1.82 03/01/18 20:28:14 vva@eagle.mysql.r18.ru +40 -0
    changes for readline/libedit configuration

  acconfig.h
    1.31 03/01/18 20:28:14 vva@eagle.mysql.r18.ru +16 -0
    changes for readline/libedit configuration

ChangeSet
  1.1403.47.8 03/01/18 18:21:13 Sinisa@sinisa.nasamreza.org +5 -0
  SELECT ... INTO local_vars ...;
  
  For Stored Procedures

  sql/sql_yacc.yy
    1.213 03/01/18 18:20:28 Sinisa@sinisa.nasamreza.org +21 -2
    SELECT ... INTO local_vars ...;
    
    For Stored Procedures

  sql/sql_class.h
    1.123.1.29 03/01/18 18:20:28 Sinisa@sinisa.nasamreza.org +11 -2
    SELECT ... INTO local_vars ...;
    
    For Stored Procedures

  sql/sql_class.cc
    1.82.1.29 03/01/18 18:20:28 Sinisa@sinisa.nasamreza.org +43 -8
    SELECT ... INTO local_vars ...;
    
    For Stored Procedures

  mysql-test/t/sp.test
    1.2 03/01/18 18:20:28 Sinisa@sinisa.nasamreza.org +13 -0
    SELECT ... INTO local_vars ...;
    
    For Stored Procedures

  mysql-test/r/sp.result
    1.2 03/01/18 18:20:28 Sinisa@sinisa.nasamreza.org +17 -0
    SELECT ... INTO local_vars ...;
    
    For Stored Procedures

  sql/sql_table.cc
    1.125.1.21 03/01/18 16:40:11 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1403.1.72 03/01/18 16:39:21 monty@mashka.mysql.fi +18 -0
  Change client_flag to unsigned long (16 -> 32 bits) to handle more options.
  Don't use new password format if mysql.user has old format
  tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
  Portability fixes for Windows

  tests/grant.res
    1.8 03/01/18 16:39:19 monty@mashka.mysql.fi +18 -18
    Update results

  strings/ctype-win1250ch.c
    1.15 03/01/18 16:39:19 monty@mashka.mysql.fi +32 -22
    Remove compiler warnings

  strings/ctype-utf8.c
    1.29 03/01/18 16:39:19 monty@mashka.mysql.fi +23 -22
    Remove compiler warnings

  sql/sql_yacc.yy
    1.203.1.18 03/01/18 16:39:19 monty@mashka.mysql.fi +4 -2
    Don't use new password format if mysql.user has old format

  sql/sql_parse.cc
    1.235.26.18 03/01/18 16:39:19 monty@mashka.mysql.fi +27 -19
    Change client_flag to unsigned long to handle more options.

  sql/sql_class.h
    1.123.9.9 03/01/18 16:39:19 monty@mashka.mysql.fi +1 -1
    Don't use new password format if mysql.user has old format

  sql/sql_acl.cc
    1.55.1.18 03/01/18 16:39:19 monty@mashka.mysql.fi +37 -20
    Don't use new password format if mysql.user has old format.
    tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty

  sql/mysqld.cc
    1.316.1.14 03/01/18 16:39:19 monty@mashka.mysql.fi +2 -2
    Don't use new password format if mysql.user has old format

  sql/mysql_priv.h
    1.160.1.37 03/01/18 16:39:19 monty@mashka.mysql.fi +1 -0
    Don't use new password format if mysql.user has old format

  sql/item_strfunc.h
    1.39 03/01/18 16:39:19 monty@mashka.mysql.fi +1 -4
    Don't use new password format if mysql.user has old format

  sql/item_strfunc.cc
    1.54.1.30 03/01/18 16:39:18 monty@mashka.mysql.fi +10 -5
    Don't use new password format if mysql.user has old format

  mysql-test/r/rpl_loaddata.result
    1.2 03/01/18 16:39:18 monty@mashka.mysql.fi +2 -2
    Fix test case

  myisam/rt_mbr.c
    1.3 03/01/18 16:39:18 monty@mashka.mysql.fi +35 -34
    Portability fix for Windows

  libmysqld/libmysqld.c
    1.14.1.8 03/01/18 16:39:18 monty@mashka.mysql.fi +7 -7
    Change client_flag to unsigned long to handle more options.

  libmysql/libmysql.c
    1.128 03/01/18 16:39:18 monty@mashka.mysql.fi +31 -33
    Change client_flag to unsigned long to handle more options.

  include/mysql.h
    1.43.1.17 03/01/18 16:39:18 monty@mashka.mysql.fi +5 -3
    Change client_flag to unsigned long to handle more options.

  include/config-win.h
    1.25 03/01/18 16:39:18 monty@mashka.mysql.fi +3 -4
    Fix for myisam/rt_mbr.c

  client/mysql.cc
    1.108.2.1 03/01/18 16:39:18 monty@mashka.mysql.fi +4 -10
    Removed compiler warnings.
    Make quote handling simpler

ChangeSet
  1.1403.48.13 03/01/18 16:23:37 Sinisa@sinisa.nasamreza.org +1 -0
  some code clean-up and small bug fix.

  sql/sql_class.cc
    1.82.6.13 03/01/18 16:23:32 Sinisa@sinisa.nasamreza.org +7 -1
    some code clean-up and small bug fix.

ChangeSet
  1.676.269.3 03/01/18 15:16:26 heikki@hundin.mysql.fi +1 -0
  btr0sea.c:
    Backport from 4.0: fix bug in adaptive hash index search

  innobase/btr/btr0sea.c
    1.5.1.7 03/01/18 15:15:42 heikki@hundin.mysql.fi +11 -1
    Backport from 4.0: fix bug in adaptive hash index search

ChangeSet
  1.1346.91.20 03/01/18 15:01:56 heikki@hundin.mysql.fi +2 -0
  btr0sea.h, btr0sea.c:
    Fix a crash in page_dir_find_owner_slot if an adaptive hash index search coincides with purge or an insert

  innobase/include/btr0sea.h
    1.4 03/01/18 15:01:45 heikki@hundin.mysql.fi +10 -4
    Fix a crash in page_dir_find_owner_slot if an adaptive hash index search coincides with purge or an insert

  innobase/btr/btr0sea.c
    1.13 03/01/18 15:01:35 heikki@hundin.mysql.fi +27 -1
    Fix a crash in page_dir_find_owner_slot if an adaptive hash index search coincides with purge or an insert

ChangeSet
  1.1403.65.2 03/01/18 16:20:22 hf@deer.mysql.r18.ru +1 -0
  Superfluous prepare_for_resend bugfix

  sql/sql_table.cc
    1.125.7.1 03/01/18 16:20:18 hf@deer.mysql.r18.ru +0 -1
    superfluous prepare_for_resend deleted

ChangeSet
  1.1403.65.1 03/01/18 02:36:24 monty@work.mysql.com +2 -0
  Removed and added back typelib.h to get rid of \r that bk did not allow me to remove.

  include/typelib.h
    1.1 03/01/18 02:35:55 monty@work.mysql.com +33 -0

  include/typelib.h
    1.0 03/01/18 02:35:55 monty@work.mysql.com +0 -0
    BitKeeper file /home/bk/mysql-4.1/include/typelib.h

  BitKeeper/deleted/.del-typelib.h~216638fc39e3e368
    1.2 03/01/18 02:34:25 monty@work.mysql.com +0 -0
    Delete: include/typelib.h

ChangeSet
  1.1403.1.71 03/01/18 03:13:37 monty@mashka.mysql.fi +37 -0
  Merge with 4.0.9

  sql/sql_handler.cc
    1.22.1.10 03/01/18 03:13:35 monty@mashka.mysql.fi +0 -4
    merge

  sql/log_event.cc
    1.91.1.7 03/01/18 03:13:35 monty@mashka.mysql.fi +0 -3
    merge

  sql/item_cmpfunc.cc
    1.55 03/01/18 03:13:35 monty@mashka.mysql.fi +3 -14
    merge

  sql/ha_innodb.cc
    1.85.3.6 03/01/18 03:13:35 monty@mashka.mysql.fi +6 -5
    merge

  libmysql/libmysql.def
    1.10 03/01/18 03:13:35 monty@mashka.mysql.fi +0 -0
    merge

  libmysql/Makefile.shared
    1.40 03/01/18 03:13:34 monty@mashka.mysql.fi +0 -0
    merge

  strings/Makefile.am
    1.30 03/01/17 22:59:10 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_table.cc
    1.125.1.20 03/01/17 22:59:10 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_load.cc
    1.39.1.2 03/01/17 22:59:10 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_db.cc
    1.58.1.7 03/01/17 22:59:10 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/protocol.cc
    1.23.1.16 03/01/17 22:59:10 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/opt_sum.cc
    1.23 03/01/17 22:59:10 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/net_serv.cc
    1.48.1.3 03/01/17 22:59:10 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.316.1.13 03/01/17 22:59:10 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_myisammrg.cc
    1.41 03/01/17 22:59:10 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/field_conv.cc
    1.16 03/01/17 22:59:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  scripts/mysql_fix_privilege_tables.sh
    1.12 03/01/17 22:59:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/null.test
    1.8 03/01/17 22:59:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/merge.test
    1.21 03/01/17 22:59:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/group_by.test
    1.18 03/01/17 22:59:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/null.result
    1.11 03/01/17 22:59:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/merge.result
    1.21 03/01/17 22:59:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/group_by.result
    1.23 03/01/17 22:59:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.158 03/01/17 22:59:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/myisamchk.c
    1.88.1.1 03/01/17 22:59:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/mi_unique.c
    1.14 03/01/17 22:59:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/mi_create.c
    1.26.1.1 03/01/17 22:59:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/trx/trx0trx.c
    1.22 03/01/17 22:59:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/srv/srv0srv.c
    1.38 03/01/17 22:59:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/log/log0log.c
    1.22 03/01/17 22:59:09 monty@mashka.mysql.fi +0 -14
    Auto merged

  innobase/btr/btr0pcur.c
    1.7 03/01/17 22:59:09 monty@mashka.mysql.fi +0 -1
    Auto merged

  innobase/btr/btr0cur.c
    1.22 03/01/17 22:59:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-mutex.m4~a13383cde18a64e1
    1.6 03/01/17 22:59:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-mutex.h~d3ae7a2977a68137
    1.5 03/01/17 22:59:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/protocol.cc
    1.21.4.2 03/01/17 22:59:08 monty@mashka.mysql.fi +0 -0
    Merge rename: sql/net_pkg.cc -> sql/protocol.cc

  configure.in
    1.201.1.12 03/01/17 22:59:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  client/mysqltest.c
    1.85.1.5 03/01/17 22:59:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-mutex.m4~a13383cde18a64e1
    1.3.2.2 03/01/17 22:59:08 monty@mashka.mysql.fi +0 -0
    Merge rename: bdb/dist/aclocal/mutex.m4 -> BitKeeper/deleted/.del-mutex.m4~a13383cde18a64e1

  BitKeeper/deleted/.del-mutex.h~d3ae7a2977a68137
    1.3.1.2 03/01/17 22:59:08 monty@mashka.mysql.fi +0 -0
    Merge rename: bdb/include/mutex.h -> BitKeeper/deleted/.del-mutex.h~d3ae7a2977a68137

  BitKeeper/etc/ignore
    1.134 03/01/17 22:59:05 monty@mashka.mysql.fi +3 -4
    auto-union

ChangeSet
  1.1403.1.70 03/01/17 21:41:38 monty@hundin.mysql.fi +2 -0
  merge

  sql/sql_lex.cc
    1.64 03/01/17 21:41:36 monty@hundin.mysql.fi +0 -1
    merge

  sql/sql_yacc.yy
    1.203.1.17 03/01/17 21:38:41 monty@hundin.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1403.60.4 03/01/17 23:34:56 vva@eagle.mysql.r18.ru +1 -0
  'removed redundant -I include dirs' returned!

  readline/Makefile.am
    1.9 03/01/17 23:34:53 vva@eagle.mysql.r18.ru +2 -1
    'removed redundant -I include dirs' in readline/Makefile.am returned!

ChangeSet
  1.1403.64.1 03/01/17 22:04:43 vva@eagle.mysql.r18.ru +1 -0
  Merge vvagin@work.mysql.com:/home/bk/mysql-4.1
  into eagle.mysql.r18.ru:/home/vva/work/BINLOG_LOADDATA/4.1.clear

  sql/log_event.cc
    1.91.1.6 03/01/17 22:04:41 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1403.63.1 03/01/17 21:59:03 vva@eagle.mysql.r18.ru +2 -0
  Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
  into eagle.mysql.r18.ru:/home/vva/work/BINLOG_LOADDATA/4.1.clear

  sql/log_event.h
    1.76.1.3 03/01/17 21:59:01 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/log_event.cc
    1.91.5.1 03/01/17 21:59:01 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1403.62.1 03/01/17 21:52:56 vva@eagle.mysql.r18.ru +3 -0
  new option --local-load in mysqlbinlog 

  sql/log_event.h
    1.76.2.1 03/01/17 21:52:46 vva@eagle.mysql.r18.ru +8 -0
    converting 'load' to 'local load'

  sql/log_event.cc
    1.91.4.1 03/01/17 21:52:46 vva@eagle.mysql.r18.ru +25 -4
    converting 'load' to 'local load'

  client/mysqlbinlog.cc
    1.71 03/01/17 21:52:46 vva@eagle.mysql.r18.ru +173 -3
    new option --local-load

ChangeSet
  1.1403.60.2 03/01/17 16:45:17 monty@mashka.mysql.fi +2 -0
  merge

  strings/ctype-simple.c
    1.24 03/01/17 16:45:16 monty@mashka.mysql.fi +13 -13
    merge
    Change '#if 0' to '#ifdef NOT_USED'

  strings/ctype-utf8.c
    1.28 03/01/17 16:40:13 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1403.61.1 03/01/17 16:33:54 monty@mashka.mysql.fi +6 -0
  Changed my_strntoxxx functions to clear error number on start
  Allow one to change ANSI_QUOTES mode per thread and on the fly

  strings/ctype-utf8.c
    1.24.1.1 03/01/17 16:33:52 monty@mashka.mysql.fi +19 -7
    Changed my_strntoxxx functions to clear error number on start
    Changed my_strtod() to correctly set return error number

  strings/ctype-simple.c
    1.21.1.1 03/01/17 16:33:52 monty@mashka.mysql.fi +18 -8
    Changed my_strntoxxx functions to clear error number on start
    Changed my_strtod() to correctly set return error number

  sql/sql_lex.h
    1.102.1.7 03/01/17 16:33:52 monty@mashka.mysql.fi +2 -1
    Allow one to change ANSI_QUOTES mode per thread and on the fly

  sql/sql_lex.cc
    1.59.2.10 03/01/17 16:33:52 monty@mashka.mysql.fi +16 -11
    Allow one to change ANSI_QUOTES mode per thread and on the fly

  sql/sql_base.cc
    1.122.1.28 03/01/17 16:33:52 monty@mashka.mysql.fi +1 -0
    comment

  sql/field.cc
    1.64.1.42 03/01/17 16:33:52 monty@mashka.mysql.fi +32 -33
    Use new my_strntoxxx functions where function clears errno.
    Change variable names to 'not_used' for variables that is not used in function

ChangeSet
  1.1403.59.1 03/01/17 18:14:54 bar@bar.mysql.r18.ru +16 -0
  New scan() function in CHARSET_INFO structure (not used yet) 

  strings/ctype.c
    1.51 03/01/17 18:14:50 bar@bar.mysql.r18.ru +47 -23
    New scan() function in CHARSET_INFO structure (not used yet) 

  strings/ctype-win1250ch.c
    1.14 03/01/17 18:14:50 bar@bar.mysql.r18.ru +2 -1
    New scan() function in CHARSET_INFO structure (not used yet) 

  strings/ctype-utf8.c
    1.27 03/01/17 18:14:50 bar@bar.mysql.r18.ru +3 -1
    New scan() function in CHARSET_INFO structure (not used yet) 

  strings/ctype-ujis.c
    1.26 03/01/17 18:14:50 bar@bar.mysql.r18.ru +2 -1
    New scan() function in CHARSET_INFO structure (not used yet) 

  strings/ctype-tis620.c
    1.33 03/01/17 18:14:50 bar@bar.mysql.r18.ru +2 -1
    New scan() function in CHARSET_INFO structure (not used yet) 

  strings/ctype-sjis.c
    1.33 03/01/17 18:14:50 bar@bar.mysql.r18.ru +2 -1
    New scan() function in CHARSET_INFO structure (not used yet) 

  strings/ctype-simple.c
    1.23 03/01/17 18:14:50 bar@bar.mysql.r18.ru +26 -0
    New scan() function in CHARSET_INFO structure (not used yet) 

  strings/ctype-latin1_de.c
    1.23 03/01/17 18:14:50 bar@bar.mysql.r18.ru +2 -1
    New scan() function in CHARSET_INFO structure (not used yet) 

  strings/ctype-gbk.c
    1.28 03/01/17 18:14:50 bar@bar.mysql.r18.ru +1 -0
    New scan() function in CHARSET_INFO structure (not used yet) 

  strings/ctype-gb2312.c
    1.24 03/01/17 18:14:50 bar@bar.mysql.r18.ru +2 -1
    New scan() function in CHARSET_INFO structure (not used yet) 

  strings/ctype-euc_kr.c
    1.26 03/01/17 18:14:49 bar@bar.mysql.r18.ru +2 -1
    New scan() function in CHARSET_INFO structure (not used yet) 

  strings/ctype-czech.c
    1.27 03/01/17 18:14:49 bar@bar.mysql.r18.ru +2 -1
    New scan() function in CHARSET_INFO structure (not used yet) 

  strings/ctype-bin.c
    1.15 03/01/17 18:14:49 bar@bar.mysql.r18.ru +1 -0
    New scan() function in CHARSET_INFO structure (not used yet) 

  strings/ctype-big5.c
    1.28 03/01/17 18:14:49 bar@bar.mysql.r18.ru +2 -1
    New scan() function in CHARSET_INFO structure (not used yet) 

  mysys/charset.c
    1.63 03/01/17 18:14:49 bar@bar.mysql.r18.ru +1 -0
    New scan() function in CHARSET_INFO structure (not used yet) 

  include/m_ctype.h
    1.54 03/01/17 18:14:49 bar@bar.mysql.r18.ru +7 -0
    New scan() function in CHARSET_INFO structure (not used yet) 

ChangeSet
  1.676.266.10 03/01/17 15:56:16 monty@mashka.mysql.fi +1 -0
  Fixed bug with the --slow-log when logging an administrator command
  (like FLUSH TABLES).
  (Code is already in 4.0)

  sql/log.cc
    1.55.2.1 03/01/17 15:56:15 monty@mashka.mysql.fi +1 -0
    Fixed bug with the --slow-log when logging an administrator command
    (like FLUSH TABLES).

ChangeSet
  1.1403.47.7 03/01/17 14:38:05 pem@mysql.com +4 -0
  Added the Stored Procedure tests.
  Removed newly added, but now redundant, test file.
  

  mysql-test/t/sp.test
    1.1 03/01/17 14:38:03 pem@mysql.com +290 -0

  mysql-test/t/sp.test
    1.0 03/01/17 14:38:03 pem@mysql.com +0 -0
    BitKeeper file /home/pem/work/mysql-5.0/mysql-test/t/sp.test

  mysql-test/r/sp.result
    1.1 03/01/17 14:38:02 pem@mysql.com +261 -0

  mysql-test/r/sp.result
    1.0 03/01/17 14:38:02 pem@mysql.com +0 -0
    BitKeeper file /home/pem/work/mysql-5.0/mysql-test/r/sp.result

ChangeSet
  1.1403.58.1 03/01/17 15:36:08 bell@sanja.is.com.ua +1 -0
  using internal name conversion in query cache as it was suggested by Shurik

  sql/sql_cache.cc
    1.39.2.2 03/01/17 15:35:55 bell@sanja.is.com.ua +12 -12
    using internal name conversion as it was suggested by Shurik

ChangeSet
  1.1346.93.4 03/01/17 15:26:13 heikki@hundin.mysql.fi +1 -0
  page0cur.c:
    Fix bug in PAGE_CUR_LE_OR_EXTENDS search

  innobase/page/page0cur.c
    1.7 03/01/17 15:26:03 heikki@hundin.mysql.fi +4 -2
    Fix bug in PAGE_CUR_LE_OR_EXTENDS search

  BitKeeper/deleted/.del-mysql_proc.test~8863f59cfc347469
    1.2 03/01/17 13:57:58 pem@mysql.com +0 -0
    Delete: mysql-test/t/mysql_proc.test

  BitKeeper/deleted/.del-mysql_proc.result~63faae2f407c3fc2
    1.2 03/01/17 13:57:58 pem@mysql.com +0 -0
    Delete: mysql-test/r/mysql_proc.result

ChangeSet
  1.1403.52.22 03/01/17 16:40:54 gluh@gluh.mysql.r18.ru +1 -0
  Merge sgluhov@work.mysql.com:/home/bk/mysql-4.1
  into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.upd

  sql/log_event.cc
    1.91.1.5 03/01/17 16:40:51 gluh@gluh.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1403.57.1 03/01/17 16:39:29 gluh@gluh.mysql.r18.ru +4 -0
  Replication: Optimize away string.append
  Fixed problem with replication LOAD DATA INFILE when using  --old-rpl-compat
  Fixed rpl_temporary test

  BitKeeper/etc/logging_ok
    1.212.14.12 03/01/17 16:39:29 gluh@gluh.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  sql/log_event.cc
    1.91.3.1 03/01/17 16:39:17 gluh@gluh.mysql.r18.ru +137 -111
    Replication: Optimize away string.append
    Fixed problem with replication LOAD DATA INFILE when using  --old-rpl-compat

  mysql-test/t/rpl_temporary.test
    1.4 03/01/17 16:39:17 gluh@gluh.mysql.r18.ru +3 -0
    Fixed rpl_temporary test

  mysql-test/r/rpl_temporary.result
    1.3.1.1 03/01/17 16:39:17 gluh@gluh.mysql.r18.ru +1 -1
    Fixed rpl_temporary test

ChangeSet
  1.1403.52.21 03/01/17 16:25:10 bar@bar.mysql.r18.ru +1 -0
  Some comments have been added
  XXX10_to_str were not inizialized

  mysys/charset.c
    1.62 03/01/17 16:25:08 bar@bar.mysql.r18.ru +18 -4
    Some comments have been added
    XXX10_to_str were not inizialized

ChangeSet
  1.1346.91.18 03/01/17 14:23:48 monty@mashka.mysql.fi +2 -0
  Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0

  sql/mysqld.cc
    1.297.1.91 03/01/17 14:23:47 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.73.1.70 03/01/17 14:23:46 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1403.48.12 03/01/17 14:09:44 Sinisa@sinisa.nasamreza.org +2 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/sql_yacc.yy
    1.203.14.4 03/01/17 14:09:39 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_select.cc
    1.173.1.38 03/01/17 14:09:39 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1346.91.17 03/01/17 13:57:15 monty@mashka.mysql.fi +3 -0
  After merge fix

  mysql-test/r/group_by.result
    1.16.1.6 03/01/17 13:57:13 monty@mashka.mysql.fi +14 -0
    After merge fix

  myisam/mi_create.c
    1.21.1.7 03/01/17 13:57:13 monty@mashka.mysql.fi +1 -1
    After merge fix

  BitKeeper/etc/ignore
    1.107.1.33 03/01/17 13:54:44 monty@mashka.mysql.fi +1 -0
    added extra/mysql_waitpid

ChangeSet
  1.676.266.9 03/01/17 13:52:23 monty@mashka.mysql.fi +1 -0
  Fixed typo

  myisam/mi_create.c
    1.14.1.4 03/01/17 13:52:22 monty@mashka.mysql.fi +1 -1
    Fixed typo

ChangeSet
  1.1346.95.1 03/01/17 12:48:23 serg@serg.mysql.com +2 -0
  bugfix for MERGE tables and MAX(key)

  sql/opt_sum.cc
    1.16.1.6 03/01/17 12:48:21 serg@serg.mysql.com +3 -4
    bugfix for MERGE tables and MAX(key)

  mysql-test/r/merge.result
    1.11.1.9 03/01/17 12:48:21 serg@serg.mysql.com +1 -1
    bugfix for MERGE tables and MAX(key)

ChangeSet
  1.1403.56.1 03/01/17 14:48:58 gluh@gluh.mysql.r18.ru +7 -0
  Make the CLI client (client/mysql.cc) work with multi-line SPs.
  Make the mysqltest program (client/mysqltest.c) work with multi-line SPs.

  BitKeeper/etc/logging_ok
    1.212.1.19 03/01/17 14:48:54 gluh@gluh.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  mysql-test/t/mysql_proc.test
    1.1 03/01/17 14:48:26 gluh@gluh.mysql.r18.ru +21 -0

  mysql-test/r/mysql_proc.result
    1.1 03/01/17 14:48:26 gluh@gluh.mysql.r18.ru +22 -0

  mysql-test/t/mysql_proc.test
    1.0 03/01/17 14:48:26 gluh@gluh.mysql.r18.ru +0 -0
    BitKeeper file /home/gluh/mysql-5.0/mysql-test/t/mysql_proc.test

  mysql-test/r/mysql_proc.result
    1.0 03/01/17 14:48:26 gluh@gluh.mysql.r18.ru +0 -0
    BitKeeper file /home/gluh/mysql-5.0/mysql-test/r/mysql_proc.result

  mysql-test/r/connect.result
    1.2 03/01/17 14:48:26 gluh@gluh.mysql.r18.ru +3 -0
    Fix for 'proc' table

  mysql-test/install_test_db.sh
    1.25 03/01/17 14:48:26 gluh@gluh.mysql.r18.ru +14 -0
    Fix for install 'proc' table

  client/mysqltest.c
    1.85.2.1 03/01/17 14:48:26 gluh@gluh.mysql.r18.ru +22 -5
    Added 'delimiter' command

  client/mysql.cc
    1.108.1.5 03/01/17 14:48:26 gluh@gluh.mysql.r18.ru +40 -6
    Added 'delimiter' command

ChangeSet
  1.1403.55.2 03/01/17 13:17:22 bar@bar.mysql.r18.ru +3 -0
  Use always base "10" to remove base guesser in strntoul() implementation

  strings/ctype.c
    1.50 03/01/17 13:17:20 bar@bar.mysql.r18.ru +1 -1
    Use always base "10" to remove base guesser in strntoul() implementation

  strings/ctype-utf8.c
    1.26 03/01/17 13:17:20 bar@bar.mysql.r18.ru +14 -6
    Hide unused code

  strings/ctype-simple.c
    1.22 03/01/17 13:17:20 bar@bar.mysql.r18.ru +27 -3
    Hide unused code

ChangeSet
  1.1403.55.1 03/01/17 12:35:47 bar@bar.mysql.r18.ru +1 -0
  ctype-utf8.c:
    Workaround for platforms which don't support EILSEQ

  strings/ctype-utf8.c
    1.25 03/01/17 12:35:17 bar@bar.mysql.r18.ru +4 -0
    Workaround for platforms which don't support EILSEQ

ChangeSet
  1.1346.94.1 03/01/16 22:29:24 miguel@hegel.local +1 -0
  Fix VC++ error compiler

  sql/mysqld.cc
    1.297.22.1 03/01/16 22:28:51 miguel@hegel.local +1 -1
    Fix VC++ error compiler

ChangeSet
  1.1403.52.19 03/01/16 15:47:46 venu@myvenu.com +1 -0
  Merge work.mysql.com:/home/bk/mysql-4.1
  into myvenu.com:/home/venu/bk/src-4.1

  libmysql/libmysql.c
    1.127 03/01/16 15:47:39 venu@myvenu.com +0 -0
    Auto merged

ChangeSet
  1.1403.54.2 03/01/16 15:00:22 venu@myvenu.com +2 -0
  Implement store_result (read_binary_rows & mysql_stmt_store_result)

  include/mysql.h
    1.43.1.16 03/01/16 15:00:06 venu@myvenu.com +2 -0

  libmysql/libmysql.c
    1.125.1.1 03/01/16 14:59:21 venu@myvenu.com +163 -33

ChangeSet
  1.1403.54.1 03/01/16 14:57:49 venu@myvenu.com +1 -0
  Remove un-used code

  sql/sql_prepare.cc
    1.14.1.4 03/01/16 14:56:50 venu@myvenu.com +0 -62
    Remove uun-used code

ChangeSet
  1.1346.93.1 03/01/17 00:50:27 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Had forgotten to change ha_innodb.cc to reflect that InnoDB now supports HA_READ_PREFIX_LAST

  sql/ha_innodb.cc
    1.73.9.1 03/01/17 00:50:15 heikki@hundin.mysql.fi +1 -13
    Had forgotten to change ha_innodb.cc to reflect that InnoDB now supports HA_READ_PREFIX_LAST

  myisam/mi_rnext.c
    1.13 03/01/16 21:07:17 serg@serg.mysql.com +9 -9
    not a solution at all, but a temporary fix to make
    mi_rnext to work on ft2 index. (only ft_dump uses mi_rnext
    on fulltext indexes for now).

ChangeSet
  1.1346.91.16 03/01/16 20:47:46 monty@mashka.mysql.fi +35 -0
  Merge with 3.23

  sql/sql_db.cc
    1.39.1.14 03/01/16 20:47:45 monty@mashka.mysql.fi +0 -2
    Merge with 3.23 (use local file)

  sql/net_serv.cc
    1.46.1.5 03/01/16 20:47:45 monty@mashka.mysql.fi +0 -1
    Merge with 3.23 (use local file)

  sql/mysqld.cc
    1.297.1.90 03/01/16 20:47:45 monty@mashka.mysql.fi +0 -1
    Merge with 3.23 (use local file)

  sql/ha_innodb.cc
    1.73.1.69 03/01/16 20:47:45 monty@mashka.mysql.fi +0 -19
    merge with 3.23 (use local file)

  scripts/mysql_fix_privilege_tables.sh
    1.9.1.1 03/01/16 20:47:45 monty@mashka.mysql.fi +7 -6
    Merge with 3.23 (Apply debian patches)

  mysql-test/t/group_by.test
    1.13.1.2 03/01/16 20:47:45 monty@mashka.mysql.fi +11 -11
    Merge with 3.23

  mysql-test/r/group_by.result
    1.16.1.5 03/01/16 20:47:45 monty@mashka.mysql.fi +0 -8
    Merge with 3.23

  myisam/mi_create.c
    1.21.1.6 03/01/16 20:47:45 monty@mashka.mysql.fi +2 -3
    Merge with 3.23

  innobase/row/row0purge.c
    1.11 03/01/16 20:47:45 monty@mashka.mysql.fi +1 -3
    merge with 3.23 (use local file)

  innobase/btr/btr0pcur.c
    1.5.1.1 03/01/16 20:47:45 monty@mashka.mysql.fi +0 -6
    merge with 3.23 (use local file)

  client/mysqltest.c
    1.77.1.19 03/01/16 20:47:45 monty@mashka.mysql.fi +3 -6
    merge with 3.23

  Makefile.am
    1.40 03/01/16 20:47:45 monty@mashka.mysql.fi +2 -3
    merge with 3.23

  man/perror.1
    1.4 03/01/16 20:17:30 monty@mashka.mysql.fi +0 -0
    Auto merged

  strings/Makefile.am
    1.19.1.9 03/01/16 20:17:30 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_table.cc
    1.112.1.31 03/01/16 20:17:30 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/net_pkg.cc
    1.21.4.1 03/01/16 20:17:30 monty@mashka.mysql.fi +0 -1
    Auto merged

  scripts/mysqld_safe.sh
    1.52.1.1 03/01/16 20:17:30 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/mi_unique.c
    1.9.1.2 03/01/16 20:17:30 monty@mashka.mysql.fi +0 -0
    Auto merged

  man/replace.1
    1.3 03/01/16 20:17:30 monty@mashka.mysql.fi +0 -0
    Auto merged

  man/perror.1
    1.1.1.2 03/01/16 20:17:30 monty@mashka.mysql.fi +0 -0
    Change mode to -rw-rw-r--

  man/mysqlshow.1
    1.4 03/01/16 20:17:29 monty@mashka.mysql.fi +0 -0
    Auto merged

  man/mysqlshow.1
    1.1.1.2 03/01/16 20:17:29 monty@mashka.mysql.fi +0 -0
    Change mode to -rw-rw-r--

  man/mysqldump.1
    1.4 03/01/16 20:17:28 monty@mashka.mysql.fi +0 -0
    Auto merged

  man/mysqldump.1
    1.1.1.2 03/01/16 20:17:28 monty@mashka.mysql.fi +0 -0
    Change mode to -rw-rw-r--

  man/mysqld_safe.1
    1.5 03/01/16 20:17:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  man/mysqld_safe.1
    1.1.2.3 03/01/16 20:17:27 monty@mashka.mysql.fi +0 -0
    Change mode to -rw-rw-r--

  man/mysqld.1
    1.4 03/01/16 20:17:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  man/mysqld_multi.1
    1.3 03/01/16 20:17:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  man/mysqld.1
    1.1.1.2 03/01/16 20:17:26 monty@mashka.mysql.fi +0 -0
    Change mode to -rw-rw-r--

  man/mysqladmin.1
    1.4 03/01/16 20:17:24 monty@mashka.mysql.fi +0 -0
    Auto merged

  man/mysqladmin.1
    1.1.1.2 03/01/16 20:17:24 monty@mashka.mysql.fi +0 -0
    Change mode to -rw-rw-r--

  man/mysqlaccess.1
    1.4 03/01/16 20:17:19 monty@mashka.mysql.fi +0 -0
    Auto merged

  man/mysqlaccess.1
    1.1.1.2 03/01/16 20:17:19 monty@mashka.mysql.fi +0 -0
    Change mode to -rw-rw-r--

  man/isamchk.1
    1.4 03/01/16 20:17:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  man/mysql_zap.1
    1.3 03/01/16 20:17:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  man/mysql.1
    1.6 03/01/16 20:17:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  man/isamlog.1
    1.3 03/01/16 20:17:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  man/isamchk.1
    1.1.1.2 03/01/16 20:17:09 monty@mashka.mysql.fi +0 -0
    Change mode to -rw-rw-r--

  libmysql/Makefile.shared
    1.24.1.8 03/01/16 20:16:40 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/log/log0log.c
    1.20.1.1 03/01/16 20:16:40 monty@mashka.mysql.fi +0 -21
    Auto merged

  innobase/include/btr0btr.h
    1.10 03/01/16 20:16:40 monty@mashka.mysql.fi +0 -9
    Auto merged

  ltconfig
    1.13 03/01/16 20:16:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/btr/btr0btr.c
    1.19 03/01/16 20:16:39 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/ha_innodb.cc
    1.45.20.2 03/01/16 20:16:38 monty@mashka.mysql.fi +0 -0
    Merge rename: sql/ha_innobase.cc -> sql/ha_innodb.cc

  scripts/mysqld_safe.sh
    1.39.8.2 03/01/16 20:16:38 monty@mashka.mysql.fi +0 -0
    Merge rename: scripts/safe_mysqld.sh -> scripts/mysqld_safe.sh

  man/mysqld_safe.1
    1.1.2.2 03/01/16 20:16:38 monty@mashka.mysql.fi +0 -0
    Merge rename: man/safe_mysqld.1 -> man/mysqld_safe.1

ChangeSet
  1.1403.52.18 03/01/16 18:35:04 heikki@hundin.mysql.fi +1 -0
  lock0lock.c:
    Fix a bug in the query cache algorithm for the AUTOCOMMIT=0 case

  innobase/lock/lock0lock.c
    1.21 03/01/16 18:34:55 heikki@hundin.mysql.fi +2 -1
    Fix a bug in the query cache algorithm for the AUTOCOMMIT=0 case

ChangeSet
  1.1403.52.17 03/01/16 17:17:07 bar@bar.mysql.r18.ru +14 -0
  strnto family functions now return error in a new argument

  strings/ctype.c
    1.49 03/01/16 17:17:05 bar@bar.mysql.r18.ru +7 -3
    strnto family functions now return error in a new argument

  strings/ctype-utf8.c
    1.24 03/01/16 17:17:05 bar@bar.mysql.r18.ru +26 -22
    strnto family functions now return error in a new argument

  strings/ctype-simple.c
    1.21 03/01/16 17:17:05 bar@bar.mysql.r18.ru +18 -14
    strnto family functions now return error in a new argument

  sql/procedure.h
    1.14 03/01/16 17:17:05 bar@bar.mysql.r18.ru +6 -4
    strnto family functions now return error in a new argument

  sql/mysqld.cc
    1.316.1.12 03/01/16 17:17:05 bar@bar.mysql.r18.ru +2 -1
    strnto family functions now return error in a new argument

  sql/item_sum.h
    1.28 03/01/16 17:17:05 bar@bar.mysql.r18.ru +4 -2
    strnto family functions now return error in a new argument

  sql/item_sum.cc
    1.52 03/01/16 17:17:05 bar@bar.mysql.r18.ru +2 -1
    strnto family functions now return error in a new argument

  sql/item_strfunc.cc
    1.54.1.29 03/01/16 17:17:05 bar@bar.mysql.r18.ru +7 -4
    strnto family functions now return error in a new argument

  sql/item_func.h
    1.61 03/01/16 17:17:05 bar@bar.mysql.r18.ru +4 -2
    strnto family functions now return error in a new argument

  sql/item.h
    1.41.4.17 03/01/16 17:17:05 bar@bar.mysql.r18.ru +10 -4
    strnto family functions now return error in a new argument

  sql/item.cc
    1.27.20.2 03/01/16 17:17:05 bar@bar.mysql.r18.ru +10 -4
    strnto family functions now return error in a new argument

  sql/field.cc
    1.64.1.41 03/01/16 17:17:05 bar@bar.mysql.r18.ru +48 -43
    strnto family functions now return error in a new argument

  libmysql/libmysql.c
    1.126 03/01/16 17:17:05 bar@bar.mysql.r18.ru +7 -6
    strnto family functions now return error in a new argument

  include/m_ctype.h
    1.53 03/01/16 17:17:05 bar@bar.mysql.r18.ru +15 -15
    strnto family functions now return error in a new argument

ChangeSet
  1.1346.91.15 03/01/16 13:23:33 serg@serg.mysql.com +3 -0
  bugfix for 'ANALYZE for MERGE' and table-less MERGE table

  sql/ha_myisammrg.cc
    1.38.1.4 03/01/16 13:23:31 serg@serg.mysql.com +1 -1
    bugfix for 'ANALYZE for MERGE' and table-less MERGE table

  mysql-test/t/merge.test
    1.18.1.1 03/01/16 13:23:31 serg@serg.mysql.com +1 -1
    test added

  mysql-test/r/merge.result
    1.11.1.8 03/01/16 13:23:31 serg@serg.mysql.com +1 -1
    test added

ChangeSet
  1.1403.52.16 03/01/16 15:52:37 bar@bar.mysql.r18.ru +1 -0
  field.cc:
    strnxfrm for binary and simple charsets

  sql/field.cc
    1.64.1.40 03/01/16 15:52:11 bar@bar.mysql.r18.ru +8 -27
    strnxfrm for binary and simple charsets

ChangeSet
  1.1403.52.15 03/01/16 15:20:38 bar@bar.mysql.r18.ru +3 -0
  strnxfrm() for simple and binary charsets fixes 

  strings/ctype.c
    1.48 03/01/16 15:20:36 bar@bar.mysql.r18.ru +23 -23
    strnxfrm() for simple and binary charsets fixes 

  strings/ctype-simple.c
    1.20 03/01/16 15:20:36 bar@bar.mysql.r18.ru +2 -1
    strnxfrm() for simple and binary charsets fixes 

  sql/field.cc
    1.64.1.39 03/01/16 15:20:36 bar@bar.mysql.r18.ru +4 -34
    strnxfrm() for simple and binary charsets fixes 

ChangeSet
  1.1346.91.14 03/01/16 08:06:43 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Backport from 4.1: make sure change_active_index is only called with a properly initialized InnoDB table handle

  sql/ha_innodb.cc
    1.73.1.68 03/01/16 08:06:34 heikki@hundin.mysql.fi +5 -2
    Backport from 4.1: make sure change_active_index is only called with a properly initialized InnoDB table handle

ChangeSet
  1.1346.91.13 03/01/16 07:15:55 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Make SHOW INNODB STATUS aware when we are estimating index range size etc.

  sql/ha_innodb.cc
    1.73.1.67 03/01/16 07:15:47 heikki@hundin.mysql.fi +30 -7
    Make SHOW INNODB STATUS aware when we are estimating index range size etc.

ChangeSet
  1.1403.52.14 03/01/16 05:35:59 jani@rhols221.adsl.netsonic.fi +4 -0
  Added --compatible mode to mysqldump.

  sql/sql_show.cc
    1.86.1.25 03/01/16 05:35:55 jani@rhols221.adsl.netsonic.fi +3 -1
    Fixed a bug.

  mysql-test/r/sql_mode.result
    1.2 03/01/16 05:35:55 jani@rhols221.adsl.netsonic.fi +1 -1
    Fixed a bug in sql_show.cc, which affected the result.

  client/mysqldump.c
    1.75 03/01/16 05:35:55 jani@rhols221.adsl.netsonic.fi +142 -36
    Added --compatible mode to mysqldump. This mode can take the following
    values: mysql323,mysql40,postgresql,oracle,mssql,db2,sapdb,no_key_options,
    no_table_options,no_field_options.
    
    The table definition (SHOW CREATE TABLE name) will be compatible with
    the given mode.

  client/client_priv.h
    1.17 03/01/16 05:35:55 jani@rhols221.adsl.netsonic.fi +2 -1
    Added --compatible mode to mysqldump.

ChangeSet
  1.1403.52.13 03/01/16 02:04:50 jani@rhols221.adsl.netsonic.fi +16 -0
  Added support sql_mode, which can be used to produce various outputs
  of SHOW CREATE TABLE 'name'. Depending on the mode, the output can
  be compatible with various databases, including earlier versions of
  MySQL
  .

  sql/sql_yacc.yy
    1.203.15.4 03/01/16 02:04:12 jani@rhols221.adsl.netsonic.fi +3 -3
    Changed previous version of sql_mode to the new noe.

  sql/sql_show.cc
    1.86.1.24 03/01/16 02:04:12 jani@rhols221.adsl.netsonic.fi +98 -70
    Added support for various sql_modes for printing CREATE TABLE.

  sql/sql_select.cc
    1.173.26.1 03/01/16 02:04:12 jani@rhols221.adsl.netsonic.fi +2 -2
    Changed previous version of sql_mode to the new noe.

  sql/sql_parse.cc
    1.235.26.17 03/01/16 02:04:12 jani@rhols221.adsl.netsonic.fi +6 -2
    Changed previous version of sql_mode to the new noe.

  sql/sql_lex.cc
    1.59.2.9 03/01/16 02:04:12 jani@rhols221.adsl.netsonic.fi +2 -2
    Changed previous version of sql_mode to the new noe.

  sql/sql_class.h
    1.123.9.8 03/01/16 02:04:12 jani@rhols221.adsl.netsonic.fi +1 -1
    Removed previous usage of opt_sql_mode.

  sql/sql_class.cc
    1.82.6.12 03/01/16 02:04:12 jani@rhols221.adsl.netsonic.fi +0 -1
    Removed previous usage of opt_sql_mode.

  sql/set_var.h
    1.8.1.3 03/01/16 02:04:12 jani@rhols221.adsl.netsonic.fi +18 -1
    Added support for sql_mode.
    
    Added function that can be used to check values in a set.

  sql/set_var.cc
    1.20.1.4 03/01/16 02:04:12 jani@rhols221.adsl.netsonic.fi +78 -3
    Added support for sql_mode.
    
    Added function that can be used to check values in a set.

  sql/mysqld.cc
    1.316.1.11 03/01/16 02:04:12 jani@rhols221.adsl.netsonic.fi +13 -11
    Added support for sql mode, including some new modes.

  sql/mysql_priv.h
    1.160.1.36 03/01/16 02:04:12 jani@rhols221.adsl.netsonic.fi +5 -0
    Some new sql modes.

  sql/item_func.cc
    1.90.1.5 03/01/16 02:04:12 jani@rhols221.adsl.netsonic.fi +1 -1
    Added support for sql_mode.

  sql/field.h
    1.46.4.2 03/01/16 02:04:12 jani@rhols221.adsl.netsonic.fi +2 -1
    Added support for sql_mode.
    
    Changed find_set() to be aware of possible error. If the argument
    contains a value that is not legal in the set, err_pos and err_len
    are set.

  sql/field.cc
    1.64.1.38 03/01/16 02:04:12 jani@rhols221.adsl.netsonic.fi +46 -21
    Added support for sql_mode.
    
    Changed find_set() to be aware of possible error. If the argument
    contains a value that is not legal in the set, err_pos and err_len
    are set.

  mysql-test/r/sql_mode.result
    1.1 03/01/16 01:34:02 jani@rhols221.adsl.netsonic.fi +87 -0

  mysql-test/r/sql_mode.result
    1.0 03/01/16 01:34:02 jani@rhols221.adsl.netsonic.fi +0 -0
    BitKeeper file /home/my/bk/mysql-4.1/mysql-test/r/sql_mode.result

  mysql-test/t/sql_mode.test
    1.1 03/01/16 01:33:57 jani@rhols221.adsl.netsonic.fi +30 -0

  mysql-test/t/sql_mode.test
    1.0 03/01/16 01:33:57 jani@rhols221.adsl.netsonic.fi +0 -0
    BitKeeper file /home/my/bk/mysql-4.1/mysql-test/t/sql_mode.test

ChangeSet
  1.676.269.2 03/01/16 01:21:13 heikki@hundin.mysql.fi +3 -0
  btr0btr.h, btr0btr.c, row0purge.c:
    Backport from 4.0: fix the BLOB hang if the index tree is of height 1

  innobase/include/btr0btr.h
    1.7.1.1 03/01/16 01:21:00 heikki@hundin.mysql.fi +9 -0
    Backport from 4.0: fix the BLOB hang if the index tree is of height 1

  innobase/btr/btr0btr.c
    1.8.1.5 03/01/16 01:20:50 heikki@hundin.mysql.fi +1 -1
    Backport from 4.0: fix the BLOB hang if the index tree is of height 1

  innobase/row/row0purge.c
    1.5.1.2 03/01/16 01:20:39 heikki@hundin.mysql.fi +3 -1
    Backport from 4.0: fix the BLOB hang if the index tree is of height 1

ChangeSet
  1.676.269.1 03/01/16 01:13:50 heikki@hundin.mysql.fi +1 -0
  ha_innobase.cc:
    Backport from 4.0: fix possible adaprive hash index latch hang

  sql/ha_innobase.cc
    1.45.20.1 03/01/16 01:12:28 heikki@hundin.mysql.fi +19 -19
    Backport from 4.0: fix possible adaprive hash index latch hang

ChangeSet
  1.1346.91.12 03/01/16 01:07:08 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Fix a typo

  sql/ha_innodb.cc
    1.73.1.66 03/01/16 01:06:58 heikki@hundin.mysql.fi +1 -1
    Fix a typo

ChangeSet
  1.1346.91.11 03/01/16 00:44:27 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Fix a possible hang at the adaptive hash index latch if MySQL does query estimations also in the middle of a SELECT statement processing

  sql/ha_innodb.cc
    1.73.1.65 03/01/16 00:43:58 heikki@hundin.mysql.fi +105 -27
    Fix a possible hang at the adaptive hash index latch if MySQL does query estimations also in the middle of a SELECT statement processing

ChangeSet
  1.1346.91.10 03/01/15 22:48:02 heikki@hundin.mysql.fi +1 -0
  srv0srv.c:
    Make SHOW INNODB STATUS aware which trx's are waiting because of innodb_thread_concurrency exceeded

  innobase/srv/srv0srv.c
    1.35.1.2 03/01/15 22:47:53 heikki@hundin.mysql.fi +4 -0
    Make SHOW INNODB STATUS aware which trx's are waiting because of innodb_thread_concurrency exceeded

ChangeSet
  1.1346.91.9 03/01/15 21:26:45 heikki@hundin.mysql.fi +1 -0
  trx0trx.c:
    Print also the thread ids in SHOW INNODB STATUS also in Linux

  innobase/trx/trx0trx.c
    1.20.1.2 03/01/15 21:26:37 heikki@hundin.mysql.fi +2 -2
    Print also the thread ids in SHOW INNODB STATUS also in Linux

ChangeSet
  1.1403.47.5 03/01/15 18:06:07 pem@mysql.com +25 -0
  Fixed some error handling in the SP parts of the parser.

  sql/sql_yacc.yy
    1.212 03/01/15 18:06:05 pem@mysql.com +7 -12
    Replaced dummy printfs with real error messages in the SP parser.

  sql/share/ukrainian/errmsg.txt
    1.29 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  sql/share/swedish/errmsg.txt
    1.66 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  sql/share/spanish/errmsg.txt
    1.66 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  sql/share/slovak/errmsg.txt
    1.66 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  sql/share/serbian/errmsg.txt
    1.20 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  sql/share/russian/errmsg.txt
    1.63 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  sql/share/romanian/errmsg.txt
    1.64 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  sql/share/portuguese/errmsg.txt
    1.66 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  sql/share/polish/errmsg.txt
    1.65 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  sql/share/norwegian/errmsg.txt
    1.65 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  sql/share/norwegian-ny/errmsg.txt
    1.65 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  sql/share/korean/errmsg.txt
    1.65 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  sql/share/japanese/errmsg.txt
    1.65 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  sql/share/italian/errmsg.txt
    1.72 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  sql/share/hungarian/errmsg.txt
    1.67 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  sql/share/greek/errmsg.txt
    1.66 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  sql/share/german/errmsg.txt
    1.66 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  sql/share/french/errmsg.txt
    1.65 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  sql/share/estonian/errmsg.txt
    1.66 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  sql/share/english/errmsg.txt
    1.72 03/01/15 18:06:05 pem@mysql.com +6 -1
    Added SP error messages for the parser.

  sql/share/dutch/errmsg.txt
    1.68 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  sql/share/danish/errmsg.txt
    1.64 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  sql/share/czech/errmsg.txt
    1.66 03/01/15 18:06:05 pem@mysql.com +6 -0
    Added SP error messages for the parser.

  include/mysqld_error.h
    1.63 03/01/15 18:06:05 pem@mysql.com +8 -1
    Added SP error messages for the parser.

ChangeSet
  1.1403.47.4 03/01/15 15:39:36 pem@mysql.com +27 -0
  Fixed some basic error handling for SP functions in mysql_execute_command().

  sql/sql_parse.cc
    1.235.1.40 03/01/15 15:39:34 pem@mysql.com +50 -31
    Changed return value of mysql_execute_command() from void to int; need to be able
    to detect if executions of substatements in SPs failed. Fixed all returns
    accordingly.
    Added error checks for SQLCOM_CREATE_PROCEDURE, CALL, ALTER_PROCEDURE, and
    DROP_PROCEDURE.

  sql/sp_head.cc
    1.8 03/01/15 15:39:34 pem@mysql.com +3 -7
    Moved net.no_send_ok fiddling to sql_parse.cc.
    Check if mysql_execute_command() failed.

  sql/share/ukrainian/errmsg.txt
    1.28 03/01/15 15:39:34 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/share/swedish/errmsg.txt
    1.65 03/01/15 15:39:34 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/share/spanish/errmsg.txt
    1.65 03/01/15 15:39:34 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/share/slovak/errmsg.txt
    1.65 03/01/15 15:39:34 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/share/serbian/errmsg.txt
    1.19 03/01/15 15:39:34 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/share/russian/errmsg.txt
    1.62 03/01/15 15:39:34 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/share/romanian/errmsg.txt
    1.63 03/01/15 15:39:34 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/share/portuguese/errmsg.txt
    1.65 03/01/15 15:39:34 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/share/polish/errmsg.txt
    1.64 03/01/15 15:39:34 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/share/norwegian/errmsg.txt
    1.64 03/01/15 15:39:34 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/share/norwegian-ny/errmsg.txt
    1.64 03/01/15 15:39:34 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/share/korean/errmsg.txt
    1.64 03/01/15 15:39:34 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/share/japanese/errmsg.txt
    1.64 03/01/15 15:39:34 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/share/italian/errmsg.txt
    1.71 03/01/15 15:39:34 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/share/hungarian/errmsg.txt
    1.66 03/01/15 15:39:34 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/share/greek/errmsg.txt
    1.65 03/01/15 15:39:34 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/share/german/errmsg.txt
    1.65 03/01/15 15:39:33 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/share/french/errmsg.txt
    1.64 03/01/15 15:39:33 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/share/estonian/errmsg.txt
    1.65 03/01/15 15:39:33 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/share/english/errmsg.txt
    1.71 03/01/15 15:39:33 pem@mysql.com +6 -1
    Added error messages for SPs.

  sql/share/dutch/errmsg.txt
    1.67 03/01/15 15:39:33 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/share/danish/errmsg.txt
    1.63 03/01/15 15:39:33 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/share/czech/errmsg.txt
    1.65 03/01/15 15:39:33 pem@mysql.com +5 -1
    Added error messages for SPs.

  sql/mysql_priv.h
    1.160.20.1 03/01/15 15:39:33 pem@mysql.com +1 -1
    Changed return value of mysql_execute_command() from void to int; need to be able
    to detect if executions of substatements in SPs failed.

  include/mysqld_error.h
    1.62 03/01/15 15:39:33 pem@mysql.com +5 -1
    Added error codes for SPs

ChangeSet
  1.1403.52.12 03/01/15 18:06:07 bar@bar.mysql.r18.ru +18 -0
  All charsets now have strnxfrm. 
  Some function names have been renamed to be more self-descriptive

  strings/ctype.c
    1.47 03/01/15 18:06:05 bar@bar.mysql.r18.ru +46 -46
    All charsets now have strnxfrm. 
    Some function names have been renamed to be more self-descriptive

  strings/ctype-win1250ch.c
    1.13 03/01/15 18:06:05 bar@bar.mysql.r18.ru +3 -3
    All charsets now have strnxfrm. 
    Some function names have been renamed to be more self-descriptive

  strings/ctype-utf8.c
    1.23 03/01/15 18:06:05 bar@bar.mysql.r18.ru +4 -4
    All charsets now have strnxfrm. 
    Some function names have been renamed to be more self-descriptive

  strings/ctype-ujis.c
    1.25 03/01/15 18:06:05 bar@bar.mysql.r18.ru +3 -3
    All charsets now have strnxfrm. 
    Some function names have been renamed to be more self-descriptive

  strings/ctype-tis620.c
    1.32 03/01/15 18:06:05 bar@bar.mysql.r18.ru +3 -3
    All charsets now have strnxfrm. 
    Some function names have been renamed to be more self-descriptive

  strings/ctype-sjis.c
    1.32 03/01/15 18:06:05 bar@bar.mysql.r18.ru +3 -3
    All charsets now have strnxfrm. 
    Some function names have been renamed to be more self-descriptive

  strings/ctype-simple.c
    1.19 03/01/15 18:06:05 bar@bar.mysql.r18.ru +4 -3
    All charsets now have strnxfrm. 
    Some function names have been renamed to be more self-descriptive

  strings/ctype-latin1_de.c
    1.22 03/01/15 18:06:05 bar@bar.mysql.r18.ru +3 -3
    All charsets now have strnxfrm. 
    Some function names have been renamed to be more self-descriptive

  strings/ctype-gbk.c
    1.27 03/01/15 18:06:04 bar@bar.mysql.r18.ru +3 -3
    All charsets now have strnxfrm. 
    Some function names have been renamed to be more self-descriptive

  strings/ctype-gb2312.c
    1.23 03/01/15 18:06:04 bar@bar.mysql.r18.ru +3 -3
    All charsets now have strnxfrm. 
    Some function names have been renamed to be more self-descriptive

  strings/ctype-euc_kr.c
    1.25 03/01/15 18:06:04 bar@bar.mysql.r18.ru +3 -3
    All charsets now have strnxfrm. 
    Some function names have been renamed to be more self-descriptive

  strings/ctype-czech.c
    1.26 03/01/15 18:06:04 bar@bar.mysql.r18.ru +3 -3
    All charsets now have strnxfrm. 
    Some function names have been renamed to be more self-descriptive

  strings/ctype-bin.c
    1.14 03/01/15 18:06:04 bar@bar.mysql.r18.ru +11 -4
    All charsets now have strnxfrm. 
    Some function names have been renamed to be more self-descriptive

  strings/ctype-big5.c
    1.27 03/01/15 18:06:04 bar@bar.mysql.r18.ru +3 -3
    All charsets now have strnxfrm. 
    Some function names have been renamed to be more self-descriptive

  sql/sql_string.cc
    1.42 03/01/15 18:06:04 bar@bar.mysql.r18.ru +2 -2
    All charsets now have strnxfrm. 
    Some function names have been renamed to be more self-descriptive

  sql/field.cc
    1.64.1.37 03/01/15 18:06:04 bar@bar.mysql.r18.ru +10 -10
    All charsets now have strnxfrm. 
    Some function names have been renamed to be more self-descriptive

  mysys/charset.c
    1.61 03/01/15 18:06:04 bar@bar.mysql.r18.ru +1 -0
    All charsets now have strnxfrm. 
    Some function names have been renamed to be more self-descriptive

  include/m_ctype.h
    1.52 03/01/15 18:06:04 bar@bar.mysql.r18.ru +6 -5
    All charsets now have strnxfrm. 
    Some function names have been renamed to be more self-descriptive

ChangeSet
  1.1403.48.11 03/01/15 16:00:43 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/sql_yacc.yy
    1.203.14.3 03/01/15 16:00:38 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1410 03/01/15 13:15:35 hf@deer.mysql.r18.ru +45 -0
  resolving conflicts

  sql/sql_show.cc
    1.103 03/01/15 13:15:34 hf@deer.mysql.r18.ru +1 -3
    conflicts

  sql/protocol.cc
    1.34 03/01/15 13:15:34 hf@deer.mysql.r18.ru +8 -17
    conflicts

  sql/opt_range.cc
    1.79 03/01/15 13:15:34 hf@deer.mysql.r18.ru +23 -12
    conflicts

  sql/mysqld.cc
    1.321 03/01/15 13:15:34 hf@deer.mysql.r18.ru +473 -2
    conflicts

  sql/log_event.h
    1.79 03/01/15 13:15:34 hf@deer.mysql.r18.ru +0 -0
    conflicts

  sql/log_event.cc
    1.95 03/01/15 13:15:33 hf@deer.mysql.r18.ru +1 -3
    Conflicts resolving

  sql/sql_table.cc
    1.142 03/01/15 12:13:53 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_select.cc
    1.184 03/01/15 12:13:53 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_repl.cc
    1.94 03/01/15 12:13:53 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.17 03/01/15 12:13:53 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_parse.cc
    1.249 03/01/15 12:13:52 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_load.cc
    1.41 03/01/15 12:13:52 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_help.cc
    1.5 03/01/15 12:13:52 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_handler.cc
    1.30 03/01/15 12:13:52 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_error.cc
    1.10 03/01/15 12:13:52 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_db.cc
    1.61 03/01/15 12:13:52 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_class.h
    1.135 03/01/15 12:13:51 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_class.cc
    1.93 03/01/15 12:13:51 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_cache.cc
    1.39.1.4 03/01/15 12:13:51 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_base.cc
    1.132 03/01/15 12:13:51 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_acl.cc
    1.62 03/01/15 12:13:51 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/slave.h
    1.55 03/01/15 12:13:51 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/slave.cc
    1.177 03/01/15 12:13:51 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/set_var.h
    1.11 03/01/15 12:13:51 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/set_var.cc
    1.23 03/01/15 12:13:51 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.21 03/01/15 12:13:51 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/net_serv.cc
    1.50 03/01/15 12:13:51 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/mysql_priv.h
    1.173 03/01/15 12:13:51 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/mini_client.cc
    1.59 03/01/15 12:13:51 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/log.cc
    1.96 03/01/15 12:13:50 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.65 03/01/15 12:13:50 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/item_func.cc
    1.93 03/01/15 12:13:50 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/item.h
    1.45 03/01/15 12:13:50 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/item.cc
    1.40 03/01/15 12:13:50 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.110 03/01/15 12:13:50 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.85.1.6 03/01/15 12:13:50 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/ha_berkeley.cc
    1.115 03/01/15 12:13:50 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/field.h
    1.55 03/01/15 12:13:50 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/field.cc
    1.75 03/01/15 12:13:50 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  libmysqld/libmysqld.c
    1.25 03/01/15 12:13:50 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  include/mysql_com.h
    1.63 03/01/15 12:13:50 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  include/mysql.h
    1.52 03/01/15 12:13:50 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  client/mysqltest.c
    1.89 03/01/15 12:13:50 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  client/mysql.cc
    1.110 03/01/15 12:13:49 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.228 03/01/15 12:13:27 hf@deer.mysql.r18.ru +0 -1
    auto-union

ChangeSet
  1.1409 03/01/15 12:11:44 hf@deer.mysql.r18.ru +31 -0
  SCRUM
  embedded library trimming

  sql/sql_table.cc
    1.141 03/01/15 12:11:39 hf@deer.mysql.r18.ru +0 -1
    set_nfields deletion

  sql/sql_show.cc
    1.102 03/01/15 12:11:39 hf@deer.mysql.r18.ru +13 -7
    mysql_list_processes to work in embedded library

  sql/sql_repl.h
    1.26 03/01/15 12:11:39 hf@deer.mysql.r18.ru +2 -2
    HAVE_REPLICATION instead of EMBEDDED_LIBRARY

  sql/sql_repl.cc
    1.93 03/01/15 12:11:39 hf@deer.mysql.r18.ru +3 -3
    HAVE_REPLICATION instead of EMBEDDED_LIBRARY

  sql/sql_prepare.cc
    1.16 03/01/15 12:11:39 hf@deer.mysql.r18.ru +2 -0
    comment added

  sql/sql_parse.cc
    1.248 03/01/15 12:11:39 hf@deer.mysql.r18.ru +3 -1
    code trimming

  sql/slave.h
    1.54 03/01/15 12:11:39 hf@deer.mysql.r18.ru +2 -2
    HAVE_REPLICATION instead of EMBEDDED_LIBRARY

  sql/slave.cc
    1.176 03/01/15 12:11:39 hf@deer.mysql.r18.ru +5 -2
    HAVE_REPLICATION instead of EMBEDDED_LIBRARY

  sql/set_var.cc
    1.22 03/01/15 12:11:39 hf@deer.mysql.r18.ru +16 -13
    HAVE_REPLICATION instead of EMBEDDED_LIBRARY

  sql/repl_failsafe.h
    1.8 03/01/15 12:11:39 hf@deer.mysql.r18.ru +2 -2
    HAVE_REPLICATION instead of EMBEDDED_LIBRARY

  sql/repl_failsafe.cc
    1.20 03/01/15 12:11:39 hf@deer.mysql.r18.ru +3 -3
    HAVE_REPLICATION instead of EMBEDDED_LIBRARY

  sql/protocol.h
    1.3 03/01/15 12:11:39 hf@deer.mysql.r18.ru +10 -10
    changes to make Protocol working in embedded library

  sql/protocol.cc
    1.33 03/01/15 12:11:39 hf@deer.mysql.r18.ru +36 -34
    net_store_data becomes a member of Protocol

  sql/opt_range.cc
    1.73.1.1 03/01/15 12:11:39 hf@deer.mysql.r18.ru +12 -22
    code trimming

  sql/mysqld.cc
    1.320 03/01/15 12:11:39 hf@deer.mysql.r18.ru +16 -14
    HAVE_REPLICATION instead of EMBEDDED_LIBRARY

  sql/mysql_priv.h
    1.172 03/01/15 12:11:39 hf@deer.mysql.r18.ru +0 -8
    code removation

  sql/mini_client.cc
    1.58 03/01/15 12:11:39 hf@deer.mysql.r18.ru +3 -2
    HAVE_REPLICATION instead of EMBEDDED_LIBRARY

  sql/mf_iocache.cc
    1.24 03/01/15 12:11:39 hf@deer.mysql.r18.ru +2 -3
    HAVE_REPLICATION instead of EMBEDDED_LIBRARY

  sql/log_event.h
    1.78 03/01/15 12:11:39 hf@deer.mysql.r18.ru +26 -30
    #ifdef-s changed

  sql/log_event.cc
    1.94 03/01/15 12:11:39 hf@deer.mysql.r18.ru +74 -119
    #ifdef constructions changed

  sql/log.cc
    1.95 03/01/15 12:11:39 hf@deer.mysql.r18.ru +6 -7
    HAVE_REPLICATION instead of EMBEDDED_LIBRARY

  sql/item_strfunc.cc
    1.64 03/01/15 12:11:39 hf@deer.mysql.r18.ru +0 -6
    superfluous code deleted

  sql/item_func.cc
    1.92 03/01/15 12:11:39 hf@deer.mysql.r18.ru +1 -1
    macro changed

  sql/item.cc
    1.39 03/01/15 12:11:39 hf@deer.mysql.r18.ru +1 -2
    bugfix

  sql/ha_myisam.h
    1.45 03/01/15 12:11:39 hf@deer.mysql.r18.ru +2 -0
    code #ifdef-ed

  sql/ha_myisam.cc
    1.109 03/01/15 12:11:39 hf@deer.mysql.r18.ru +5 -11
    set_nfields deletion

  sql/ha_innodb.cc
    1.85.1.5 03/01/15 12:11:39 hf@deer.mysql.r18.ru +2 -2
    macro changed

  sql/ha_berkeley.cc
    1.114 03/01/15 12:11:39 hf@deer.mysql.r18.ru +0 -1
    set_nfields deletion

  sql/field.cc
    1.74 03/01/15 12:11:39 hf@deer.mysql.r18.ru +4 -6
    geometry type methods implementations

  libmysqld/lib_sql.cc
    1.41 03/01/15 12:11:39 hf@deer.mysql.r18.ru +63 -10
    Protocol:: methods implementation for embedded case

  include/my_global.h
    1.33.1.1 03/01/15 12:11:39 hf@deer.mysql.r18.ru +5 -0
    HAVE_REPLICATION & HAVE_EXTERNAL_CLIENT macro definitions

ChangeSet
  1.1403.53.1 03/01/14 18:00:34 bell@sanja.is.com.ua +6 -0
  after merging fixing

  sql/sql_yacc.yy
    1.203.15.3 03/01/14 18:00:26 bell@sanja.is.com.ua +36 -4
    check possibility of using table name added

  sql/sql_lex.h
    1.102.1.6 03/01/14 18:00:26 bell@sanja.is.com.ua +1 -0
    new flag to detect table name error

  sql/sql_lex.cc
    1.59.2.8 03/01/14 18:00:26 bell@sanja.is.com.ua +1 -1
    new flag to detect table name error

  sql/sql_base.cc
    1.122.1.27 03/01/14 18:00:26 bell@sanja.is.com.ua +2 -6
    error detection moved

  mysql-test/r/union.result
    1.28 03/01/14 18:00:26 bell@sanja.is.com.ua +1 -1
    some changing in error message

  include/m_string.h
    1.19 03/01/14 18:00:26 bell@sanja.is.com.ua +3 -0
    added include to va_list bicame known

ChangeSet
  1.1403.52.10 03/01/14 18:28:50 bar@bar.mysql.r18.ru +2 -0
  bin chatset now handles strnncoll itself so we don't have to check
  if charset is binary anymore

  strings/ctype-bin.c
    1.13 03/01/14 18:28:48 bar@bar.mysql.r18.ru +2 -2
    bin chatset now handles strnncoll itself so we don't have to check
    if charset is binary anymore

  sql/field.cc
    1.64.1.36 03/01/14 18:28:48 bar@bar.mysql.r18.ru +0 -30
    bin chatset now handles strnncoll itself so we don't have to check
    if charset is binary anymore

ChangeSet
  1.1346.46.100 03/01/14 16:15:09 Sinisa@sinisa.nasamreza.org +1 -0
  reverting a fix

  sql/item.cc
    1.19.1.7 03/01/14 16:15:06 Sinisa@sinisa.nasamreza.org +1 -1
    reverting a fix

ChangeSet
  1.1403.52.9 03/01/14 14:33:10 monty@mashka.mysql.fi +7 -0
  merge

  strings/Makefile.am
    1.29 03/01/14 14:33:09 monty@mashka.mysql.fi +3 -6
    merge

  mysys/Makefile.am
    1.43 03/01/14 14:33:09 monty@mashka.mysql.fi +1 -2
    merge

  sql/item_strfunc.cc
    1.54.1.28 03/01/14 14:29:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/create.result
    1.27 03/01/14 14:29:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysql/Makefile.shared
    1.39 03/01/14 14:29:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/m_ctype.h
    1.51 03/01/14 14:29:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/ignore
    1.133 03/01/14 14:28:53 monty@mashka.mysql.fi +1 -0
    added extra/mysql_waitpid

ChangeSet
  1.1403.50.2 03/01/14 14:28:36 monty@mashka.mysql.fi +38 -0
  Updates for multi-byte character sets
  (Note: test 'union' fails, but Sanja promised to fix this)

  strings/my_vsnprintf.c
    1.17 03/01/14 14:28:33 monty@mashka.mysql.fi +51 -6
    Added support for %#d and %#u

  strings/ctype-utf8.c
    1.22 03/01/14 14:28:33 monty@mashka.mysql.fi +13 -19
    Fixed strntod()

  strings/ctype-simple.c
    1.18 03/01/14 14:28:33 monty@mashka.mysql.fi +75 -111
    Code review + cleanup

  strings/Makefile.am
    1.27.1.1 03/01/14 14:28:33 monty@mashka.mysql.fi +3 -3
    Moved my_vsnprintf to strings library

  sql/sql_update.cc
    1.72 03/01/14 14:28:33 monty@mashka.mysql.fi +1 -0
    Cosmetic changes

  sql/sql_string.h
    1.28 03/01/14 14:28:33 monty@mashka.mysql.fi +1 -0
    Added set_latin1()

  sql/sql_string.cc
    1.41 03/01/14 14:28:33 monty@mashka.mysql.fi +112 -40
    Added multi byte support to append.
    Added set_latin1()

  sql/sql_class.cc
    1.82.6.11 03/01/14 14:28:33 monty@mashka.mysql.fi +3 -3
    Fixed for character set handling

  sql/procedure.h
    1.13 03/01/14 14:28:33 monty@mashka.mysql.fi +3 -2
    Fixed for character set handling

  sql/opt_range.cc
    1.78 03/01/14 14:28:33 monty@mashka.mysql.fi +1 -1
    Fixed for character set handling

  sql/mysqld.cc
    1.316.1.10 03/01/14 14:28:33 monty@mashka.mysql.fi +5 -2
    Update to use new test_if_int()

  sql/item_timefunc.cc
    1.32 03/01/14 14:28:33 monty@mashka.mysql.fi +1 -1
    Fixed for character set handling

  sql/item_sum.h
    1.27 03/01/14 14:28:33 monty@mashka.mysql.fi +2 -1
    Fixed for character set handling

  sql/item_sum.cc
    1.51 03/01/14 14:28:33 monty@mashka.mysql.fi +2 -1
    Fixed for character set handling

  sql/item_strfunc.cc
    1.54.10.1 03/01/14 14:28:33 monty@mashka.mysql.fi +2 -1
    Fixed for character set handling

  sql/item_func.h
    1.60 03/01/14 14:28:33 monty@mashka.mysql.fi +1 -1
    Fixed for character set handling

  sql/item_func.cc
    1.90.1.4 03/01/14 14:28:33 monty@mashka.mysql.fi +4 -4
    Fixed for character set handling

  sql/item.h
    1.41.4.16 03/01/14 14:28:33 monty@mashka.mysql.fi +6 -2
    Fixed for character set handling

  sql/item.cc
    1.27.20.1 03/01/14 14:28:33 monty@mashka.mysql.fi +9 -8
    Fixed for character set handling

  sql/field.h
    1.46.4.1 03/01/14 14:28:33 monty@mashka.mysql.fi +4 -1
    Fixed for character set handling

  sql/field.cc
    1.64.1.35 03/01/14 14:28:33 monty@mashka.mysql.fi +193 -213
    Fixed for character set handling

  mysys/Makefile.am
    1.41.1.1 03/01/14 14:28:33 monty@mashka.mysql.fi +1 -1
    Moved my_vsnprintf to strings library

  mysql-test/r/type_set.result
    1.6 03/01/14 14:28:33 monty@mashka.mysql.fi +2 -2
    Moved my_vsnprintf to strings library

  mysql-test/r/type_ranges.result
    1.12 03/01/14 14:28:33 monty@mashka.mysql.fi +17 -17
    Moved my_vsnprintf to strings library

  mysql-test/r/type_enum.result
    1.10 03/01/14 14:28:33 monty@mashka.mysql.fi +2 -2
    Moved my_vsnprintf to strings library

  mysql-test/r/type_blob.result
    1.13 03/01/14 14:28:33 monty@mashka.mysql.fi +10 -10
    Moved my_vsnprintf to strings library

  mysql-test/r/show_check.result
    1.29 03/01/14 14:28:33 monty@mashka.mysql.fi +7 -7
    Moved my_vsnprintf to strings library

  mysql-test/r/select.result
    1.24 03/01/14 14:28:33 monty@mashka.mysql.fi +8 -8
    Moved my_vsnprintf to strings library

  mysql-test/r/merge.result
    1.20 03/01/14 14:28:33 monty@mashka.mysql.fi +1 -1
    Moved my_vsnprintf to strings library

  mysql-test/r/innodb.result
    1.51 03/01/14 14:28:33 monty@mashka.mysql.fi +1 -1
    Moved my_vsnprintf to strings library

  mysql-test/r/fulltext.result
    1.37 03/01/14 14:28:33 monty@mashka.mysql.fi +1 -1
    Moved my_vsnprintf to strings library

  mysql-test/r/ctype_many.result
    1.9 03/01/14 14:28:33 monty@mashka.mysql.fi +4 -4
    Moved my_vsnprintf to strings library

  mysql-test/r/create.result
    1.24.1.2 03/01/14 14:28:33 monty@mashka.mysql.fi +6 -6
    Moved my_vsnprintf to strings library

  mysql-test/r/alter_table.result
    1.14 03/01/14 14:28:33 monty@mashka.mysql.fi +2 -2
    Moved my_vsnprintf to strings library

  libmysql/Makefile.shared
    1.37.1.1 03/01/14 14:28:33 monty@mashka.mysql.fi +2 -2
    Moved my_vsnprintf to strings library

  include/my_sys.h
    1.85 03/01/14 14:28:33 monty@mashka.mysql.fi +0 -3
    Moved my_vsnprintf to strings library

  include/m_string.h
    1.18 03/01/14 14:28:33 monty@mashka.mysql.fi +6 -0
    Moved my_vsnprintf to strings library

  include/m_ctype.h
    1.49.1.1 03/01/14 14:28:33 monty@mashka.mysql.fi +2 -2
    Changed prototype for strntod() to inform the user that source may be modified.

ChangeSet
  1.1403.52.8 03/01/14 13:36:22 bar@bar.mysql.r18.ru +3 -0
  Charset loading has been moved to /string library

  strings/ctype.c
    1.46 03/01/14 13:36:20 bar@bar.mysql.r18.ru +223 -0
    Charset loading has been moved to /string library

  mysys/charset.c
    1.60 03/01/14 13:36:20 bar@bar.mysql.r18.ru +6 -235
    Charset loading has been moved to /string library

  include/m_ctype.h
    1.50 03/01/14 13:36:20 bar@bar.mysql.r18.ru +9 -1
    Charset loading has been moved to /string library

ChangeSet
  1.1346.92.1 03/01/14 11:27:26 monty@mashka.mysql.fi +10 -0
  Guard against compiling without -fno-exceptions
  Allocate bigger default thread stack because of problems with glibc
  Fixed bug in UPDATE ... not_null_field=expression_that_returns_null
  Fixed bug in replication when using auto_increment and LOAD DATA INFILE

  mysql-test/t/rpl_log-master.opt
    1.1 03/01/14 11:27:24 monty@mashka.mysql.fi +1 -0

  mysql-test/t/rpl_loaddata.test
    1.1 03/01/14 11:27:24 monty@mashka.mysql.fi +16 -0

  mysql-test/std_data/rpl_loaddata.dat
    1.1 03/01/14 11:27:24 monty@mashka.mysql.fi +2 -0

  mysql-test/r/rpl_loaddata.result
    1.1 03/01/14 11:27:24 monty@mashka.mysql.fi +13 -0

  sql/sql_load.cc
    1.34.1.8 03/01/14 11:27:24 monty@mashka.mysql.fi +25 -1
    Fixed bug in replication when using auto_increment and LOAD DATA INFILE

  sql/field_conv.cc
    1.6.1.3 03/01/14 11:27:24 monty@mashka.mysql.fi +9 -0
    Fixed bug in UPDATE ... not_null_field=expression_that_returns_null

  mysql-test/t/rpl_log-master.opt
    1.0 03/01/14 11:27:24 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysql-test/t/rpl_log-master.opt

  mysql-test/t/rpl_loaddata.test
    1.0 03/01/14 11:27:24 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysql-test/t/rpl_loaddata.test

  mysql-test/t/null.test
    1.6.1.1 03/01/14 11:27:24 monty@mashka.mysql.fi +31 -0
    Test of using UPDATE/INSERT with NULL on not null fields.

  mysql-test/std_data/rpl_loaddata.dat
    1.0 03/01/14 11:27:24 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysql-test/std_data/rpl_loaddata.dat

  mysql-test/r/rpl_loaddata.result
    1.0 03/01/14 11:27:24 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysql-test/r/rpl_loaddata.result

  mysql-test/r/null.result
    1.9.1.1 03/01/14 11:27:24 monty@mashka.mysql.fi +36 -0
    Updated result

  include/my_pthread.h
    1.57 03/01/14 11:27:24 monty@mashka.mysql.fi +6 -2
    Allocate bigger default thread stack because of problems with glibc

  include/my_global.h
    1.34 03/01/14 11:27:24 monty@mashka.mysql.fi +7 -0
    Guard against compiling without -fno-exceptions

ChangeSet
  1.1403.52.7 03/01/14 11:32:40 bar@bar.mysql.r18.ru +1 -0
  Some reorganization to move loading related code to /strings library.
  This is to reuse code in conf_to_src.c

  mysys/charset.c
    1.59 03/01/14 11:32:38 bar@bar.mysql.r18.ru +243 -232
    Some reorganization to move loading related code to /strings library.
    This is to reuse code in conf_to_src.c

ChangeSet
  1.1346.91.7 03/01/14 12:21:18 arjen@george.bitbike.com +1 -0
  Text fixes: ISAM -> MyISAM for myisamchk (found by Jocelyn Fournier).

  myisam/myisamchk.c
    1.80.1.15 03/01/14 12:21:15 arjen@george.bitbike.com +3 -3
    Text fixes: ISAM -> MyISAM for myisamchk (found by Jocelyn Fournier).

ChangeSet
  1.1403.52.6 03/01/13 23:25:55 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Added some assertions to make sure index_init is only called with a properly prepared InnoDB table handle

  sql/ha_innodb.cc
    1.85.3.5 03/01/13 23:25:46 heikki@hundin.mysql.fi +9 -1
    Added some assertions to make sure index_init is only called with a properly prepared InnoDB table handle

ChangeSet
  1.1346.91.6 03/01/13 23:00:11 heikki@hundin.mysql.fi +1 -0
  sql_handler.cc:
    Backport the InnoDB HANDLER bug fix from 4.1

  sql/sql_handler.cc
    1.19.1.7 03/01/13 22:46:53 heikki@hundin.mysql.fi +4 -2
    Backport the InnoDB HANDLER bug fix from 4.1

ChangeSet
  1.1346.46.99 03/01/13 22:36:50 Sinisa@sinisa.nasamreza.org +1 -0
  Fix for a crashing bug in send_data..

  sql/net_pkg.cc
    1.21.3.1 03/01/13 22:36:47 Sinisa@sinisa.nasamreza.org +9 -4
    Fixing a buffer overflow with huge BLOB's.
    This bug was caused by increasing a storage for lenght of
    data, while memory was not sufficiently allocated for the task.

ChangeSet
  1.1403.52.5 03/01/13 18:20:59 heikki@hundin.mysql.fi +1 -0
  sql_handler.cc:
    Fix InnoDB HANDLER: InnoDB must know in each call that the handle is used by HANDLER; the previous implementation worked only by pure luck

  sql/sql_handler.cc
    1.22.1.9 03/01/13 18:20:24 heikki@hundin.mysql.fi +10 -2
    Fix InnoDB HANDLER: InnoDB must know in each call that the handle is used by HANDLER; the previous implementation worked only by pure luck

ChangeSet
  1.1346.91.5 03/01/13 15:52:39 heikki@hundin.mysql.fi +5 -0
  btr0cur.h, btr0btr.h, btr0btr.c, btr0cur.c, row0purge.c:
    Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it

  innobase/include/btr0cur.h
    1.9 03/01/13 15:37:24 heikki@hundin.mysql.fi +7 -1
    Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it

  innobase/include/btr0btr.h
    1.9 03/01/13 15:37:12 heikki@hundin.mysql.fi +9 -0
    Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it

  innobase/btr/btr0btr.c
    1.18 03/01/13 15:37:02 heikki@hundin.mysql.fi +1 -6
    Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it

  innobase/btr/btr0cur.c
    1.20.1.1 03/01/13 15:36:55 heikki@hundin.mysql.fi +8 -2
    Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it

  mysql-test/t/fulltext2.test
    1.2 03/01/13 14:33:23 serg@sergbook.mysql.com +16 -12
    truncate* tests for ft2

  mysql-test/r/fulltext2.result
    1.2 03/01/13 14:33:23 serg@sergbook.mysql.com +785 -776
    truncate* tests for ft2

  myisam/ft_boolean_search.c
    1.56 03/01/13 14:33:23 serg@sergbook.mysql.com +116 -87
    two-level tree support in ft_boolean_search.c

  innobase/row/row0purge.c
    1.10 03/01/13 15:27:38 heikki@hundin.mysql.fi +11 -0
    Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it

  mysql-test/t/fulltext2.test
    1.1 03/01/13 14:16:36 serg@sergbook.mysql.com +51 -0

  mysql-test/r/fulltext2.result
    1.1 03/01/13 14:16:36 serg@sergbook.mysql.com +798 -0

  mysql-test/t/fulltext2.test
    1.0 03/01/13 14:16:36 serg@sergbook.mysql.com +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-4.1/mysql-test/t/fulltext2.test

  mysql-test/r/fulltext2.result
    1.0 03/01/13 14:16:36 serg@sergbook.mysql.com +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-4.1/mysql-test/r/fulltext2.result

ChangeSet
  1.1403.52.4 03/01/13 16:36:04 ram@mysql.r18.ru +1 -0
  Fix for spatial objects

  sql/item_strfunc.cc
    1.54.1.27 03/01/13 16:36:03 ram@mysql.r18.ru +1 -7
    Fix for spatial objects

  strings/my_vsnprintf.c
    1.16 03/01/13 14:01:29 monty@mashka.mysql.fi +0 -0
    Rename: mysys/my_vsnprintf.c -> strings/my_vsnprintf.c

ChangeSet
  1.1346.91.4 03/01/13 00:44:42 heikki@hundin.mysql.fi +1 -0
  srv0srv.c:
    Add another diagnostic print to determine why the 'queries inside InnoDB' counter might drift upwards

  innobase/srv/srv0srv.c
    1.35.1.1 03/01/13 00:42:10 heikki@hundin.mysql.fi +11 -0
    Add another diagnostic print to determine why the 'queries inside InnoDB' counter might drift upwards

ChangeSet
  1.1403.52.3 03/01/12 23:58:56 heikki@hundin.mysql.fi +7 -0
  ut0mem.c, row0sel.c, row0mysql.c, ut0mem.h, row0sel.h, row0mysql.h:
    Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
  ha_innodb.cc:
    Do not fetch all columns if change_active_index() is called during a query; a sum(a), max(a) query seemed to do that, doing unnecessary copying (the change actually made in the previous bk ci)
    Free BLOB heap of handle when MySQL calls some ::extra()'s

  innobase/ut/ut0mem.c
    1.9 03/01/12 23:55:10 heikki@hundin.mysql.fi +36 -1
    Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails

  innobase/row/row0sel.c
    1.29 03/01/12 23:54:23 heikki@hundin.mysql.fi +32 -5
    Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails

  innobase/row/row0mysql.c
    1.40 03/01/12 23:54:22 heikki@hundin.mysql.fi +13 -0
    Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails

  innobase/include/ut0mem.h
    1.6 03/01/12 23:52:46 heikki@hundin.mysql.fi +10 -0
    Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails

  innobase/include/row0sel.h
    1.3 03/01/12 23:52:40 heikki@hundin.mysql.fi +2 -1
    Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails

  innobase/include/row0mysql.h
    1.16 03/01/12 23:52:40 heikki@hundin.mysql.fi +8 -0
    Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails

  sql/ha_innodb.cc
    1.85.3.4 03/01/12 23:42:46 heikki@hundin.mysql.fi +6 -6
    Do not fetch all columns if change_active_index() is called during a query; a sum(a), max(a) query seemed to do that, doing unnecessary copying (the change actually made in the previous bk ci)

  sql/ha_innodb.cc
    1.85.3.3 03/01/12 23:32:54 heikki@hundin.mysql.fi +17 -5
    Free BLOB heap of handle when MySQL calls some ::extra()'s

ChangeSet
  1.1346.91.3 03/01/12 22:31:16 heikki@hundin.mysql.fi +2 -0
  trx0trx.c:
    Add diagnostic prints to determine why the 'queries inside InnoDB' might drift upwards
  ha_innodb.cc:
    Add more print space to SHOW INNODB STATUS; remove possible memory leak in case there is an error

  innobase/trx/trx0trx.c
    1.20.1.1 03/01/12 22:31:05 heikki@hundin.mysql.fi +16 -0
    Add diagnostic prints to determine why the 'queries inside InnoDB' might drift upwards

  sql/ha_innodb.cc
    1.73.1.64 03/01/12 22:29:49 heikki@hundin.mysql.fi +6 -3
    Add more print space to SHOW INNODB STATUS; remove possible memory leak in case there is an error

ChangeSet
  1.1346.46.97 03/01/11 18:02:10 Sinisa@sinisa.nasamreza.org +4 -0
  Fix for a bug in SHOW GRANTS when :
  
  grant on database.* to xx@yy with grant option;
  
  is done.
  

  sql/sql_acl.cc
    1.51.1.34 03/01/11 18:02:07 Sinisa@sinisa.nasamreza.org +2 -0
    Fix for a bug in SHOW GRANTS when :
    
    grant on database.* to xx@yy with grant option;
    
    is done.
    

  sql/item.cc
    1.19.1.6 03/01/11 18:02:07 Sinisa@sinisa.nasamreza.org +1 -1
    fix for update of non-null column with function returning NULL

  mysql-test/t/grant.test
    1.4 03/01/11 18:02:07 Sinisa@sinisa.nasamreza.org +3 -0
    Fix for a bug in SHOW GRANTS when :
    
    grant on database.* to xx@yy with grant option;
    
    is done.
    

  mysql-test/r/grant.result
    1.5 03/01/11 18:02:07 Sinisa@sinisa.nasamreza.org +5 -0
    Fix for a bug in SHOW GRANTS when :
    
    grant on database.* to xx@yy with grant option;
    
    is done.
    

ChangeSet
  1.1403.52.2 03/01/11 00:36:13 venu@myvenu.com +1 -0
  Fix to make the tables re-inited for every execute call 

  sql/sql_prepare.cc
    1.14.1.3 03/01/11 00:35:37 venu@myvenu.com +21 -1

ChangeSet
  1.1346.91.2 03/01/11 01:56:00 miguel@light. +1 -0
  Added functions required by MySQLCC

  libmysql/libmysql.def
    1.6.1.1 03/01/11 01:53:58 miguel@light. +6 -0
    Added functions required by MySQLCC

ChangeSet
  1.1403.51.1 03/01/10 11:18:43 venu@myvenu.com +1 -0
  Prepared statements - Doc to be incorporated in manual

  Docs/prepare.texi
    1.1 03/01/10 11:17:28 venu@myvenu.com +1422 -0

  Docs/prepare.texi
    1.0 03/01/10 11:17:28 venu@myvenu.com +0 -0
    BitKeeper file /home/venu/work/sql/dev-4.1/Docs/prepare.texi

ChangeSet
  1.1403.48.8 03/01/10 18:26:14 Sinisa@sinisa.nasamreza.org +2 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/sql_yacc.yy
    1.203.14.2 03/01/10 18:26:08 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_select.cc
    1.173.1.37 03/01/10 18:26:07 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1403.47.3 03/01/10 17:14:26 pem@mysql.com +2 -0
  Removed dummy SPSET construct.
  Setting of SP local variables is now part of the existing SET syntax.
  
  Note: This has the result that a somewhat extended syntax (from SQL-99)
  is allowed. We allow a list of settings ("SET a=1, b=2, ...;"), where the
  different variables can be of different types (SP local, system or user (@)).
  This also means that certain optional modifiers, such as GLOBAL, are allowed
  when setting an SP local variable, but then has no meaning and is ignored.

  sql/sql_yacc.yy
    1.211 03/01/10 17:14:24 pem@mysql.com +36 -36
    Removed dummy SPSET construct.
    Setting of SP local variables is now part of the existing SET syntax.

  sql/lex.h
    1.87 03/01/10 17:14:24 pem@mysql.com +0 -1
    Removed dummy SPSET symbol.

ChangeSet
  1.1403.49.2 03/01/10 17:36:59 Sinisa@sinisa.nasamreza.org +5 -0
  Fixex for some crashing bug

  sql/sql_select.cc
    1.173.25.1 03/01/10 17:36:54 Sinisa@sinisa.nasamreza.org +7 -5
    A fix for some crashing bug

  mysql-test/t/handler.test
    1.9 03/01/10 17:36:54 Sinisa@sinisa.nasamreza.org +2 -0
    A fix for some crashing bug

  mysql-test/t/analyse.test
    1.8 03/01/10 17:36:54 Sinisa@sinisa.nasamreza.org +1 -0
    A fix for some crashing bug

  mysql-test/r/handler.result
    1.8 03/01/10 17:36:54 Sinisa@sinisa.nasamreza.org +2 -0
    A fix for some crashing bug

  mysql-test/r/analyse.result
    1.9 03/01/10 17:36:54 Sinisa@sinisa.nasamreza.org +3 -0
    A fix for some crashing bug

ChangeSet
  1.1403.48.7 03/01/10 17:05:17 bar@bar.mysql.r18.ru +1 -0
  .del-xml.c~d20ceb97a91fcc2d:
    Delete: mysys/xml.c
  xml.c:
    Rename: BitKeeper/deleted/.del-xml.c~d20ceb97a91fcc2d -> mysys/xml.c
  
  It is actually moved to /strings 

  BitKeeper/deleted/.del-xml.c~d20ceb97a91fcc2d
    1.5 03/01/10 17:04:55 bar@bar.mysql.r18.ru +0 -0
    Delete: mysys/xml.c

ChangeSet
  1.1403.48.6 03/01/10 17:01:55 bar@bar.mysql.r18.ru +3 -0
  xml.c has been moved to /strings from /mysys
  This is to reuse code to generate charset related C files
  from ther descriptions written in XML files

  strings/Makefile.am
    1.28 03/01/10 17:01:53 bar@bar.mysql.r18.ru +4 -4
    xml.c has been moved to /strings from /mysys
    This is to reuse code to generate charset related C files
    from ther descriptions written in XML files

  mysys/Makefile.am
    1.42 03/01/10 17:01:53 bar@bar.mysql.r18.ru +1 -1
    xml.c has been moved to /strings from /mysys
    This is to reuse code to generate charset related C files
    from ther descriptions written in XML files

  libmysql/Makefile.shared
    1.38 03/01/10 17:01:53 bar@bar.mysql.r18.ru +2 -2
    xml.c has been moved to /strings from /mysys
    This is to reuse code to generate charset related C files
    from ther descriptions written in XML files

ChangeSet
  1.1403.48.5 03/01/10 16:34:53 bar@bar.mysql.r18.ru +1 -0
  xml.c:
    new file

  mysys/xml.c
    1.4 03/01/10 16:17:56 bar@bar.mysql.r18.ru +0 -0
    Rename: BitKeeper/deleted/.del-xml.c~d20ceb97a91fcc2d -> mysys/xml.c

  strings/xml.c
    1.1 03/01/10 16:10:23 bar@bar.mysql.r18.ru +374 -0

  strings/xml.c
    1.0 03/01/10 16:10:23 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/strings/xml.c

  BitKeeper/deleted/.del-xml.c~d20ceb97a91fcc2d
    1.3 03/01/10 16:10:01 bar@bar.mysql.r18.ru +0 -0
    Delete: mysys/xml.c

ChangeSet
  1.1403.48.4 03/01/09 18:32:08 venu@myvenu.com +1 -0
  Added prepared statements sample from manual as a test

  tests/client_test.c
    1.7 03/01/09 18:31:51 venu@myvenu.com +177 -25

ChangeSet
  1.1403.48.3 03/01/09 17:56:34 venu@myvenu.com +4 -0
  Remove/change unwanted variables in client protocol
  Add missed mysql_stmt_affected_rows()
  sql_yacc.yy : Fix the compilation error .. bison 1.75

  sql/sql_yacc.yy
    1.203.15.2 03/01/09 17:53:17 venu@myvenu.com +1 -1
    Fix the compilarion error .. bison 1.75

  sql/sql_prepare.cc
    1.14.1.2 03/01/09 17:53:14 venu@myvenu.com +4 -1

  libmysql/libmysql.c
    1.125 03/01/09 17:53:08 venu@myvenu.com +22 -8

  include/mysql.h
    1.43.1.15 03/01/09 17:53:02 venu@myvenu.com +7 -7

ChangeSet
  1.1346.91.1 03/01/10 01:55:05 monty@mashka.mysql.fi +3 -0
  Fixed core dump bug in str LIKE "%other_str%" where strings contained characters >= 128.
  Fixed problem with replication LOAD DATA INFILE when using  --old-rpl-compat.
  When executing on master LOAD DATA and InnoDB failed with 'table full' error the binary log was corrupted.

  sql/sql_load.cc
    1.34.1.7 03/01/10 01:55:04 monty@mashka.mysql.fi +14 -0
    When executing on master LOAD DATA and InnoDB failed with 'table full' error the binary log was corrupted.

  sql/log_event.cc
    1.77.1.18 03/01/10 01:55:04 monty@mashka.mysql.fi +3 -3
    Fixed problem with replication LOAD DATA INFILE when using  --old-rpl-compat

  sql/item_cmpfunc.cc
    1.20.1.28 03/01/10 01:55:03 monty@mashka.mysql.fi +26 -21
    Fixed core dump bug in str LIKE "%other_str%" where strings contained characters >= 128.

ChangeSet
  1.676.268.1 03/01/09 23:28:30 monty@mashka.mysql.fi +1 -0
  Fixed wrong packed length for packet > 16M.

  sql/net_pkg.cc
    1.16.1.1 03/01/09 23:28:29 monty@mashka.mysql.fi +1 -1
    Fixed wrong packed length for packet > 16M.
    (Not used in 3.23)

ChangeSet
  1.1346.46.95 03/01/09 23:21:20 Sinisa@sinisa.nasamreza.org +2 -0
  changing a bit SHOW GRANTS to display empty row in global table.
  

  sql/sql_acl.cc
    1.51.1.33 03/01/09 23:21:17 Sinisa@sinisa.nasamreza.org +0 -2
    changing a bit SHOW GRANTS to display empty row in global table.
    

  mysql-test/r/grant.result
    1.4 03/01/09 23:21:17 Sinisa@sinisa.nasamreza.org +6 -0
    changing a bit SHOW GRANTS to display empty row in global table.
    

ChangeSet
  1.1403.50.1 03/01/09 22:43:23 monty@mashka.mysql.fi +5 -0
  Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1

  sql/sql_yacc.yy
    1.203.15.1 03/01/09 22:43:21 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_show.cc
    1.86.1.23 03/01/09 22:43:21 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_select.cc
    1.173.1.36 03/01/09 22:43:21 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_lex.cc
    1.59.2.7 03/01/09 22:43:21 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/mem/mem0pool.c
    1.10 03/01/09 22:43:21 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1403.46.3 03/01/09 22:42:31 monty@mashka.mysql.fi +7 -0
  Post merge fix
  Allow empty key list in USE|IGNORE|FORCE INDEX()

  sql/sql_yacc.yy
    1.203.12.3 03/01/09 22:42:29 monty@mashka.mysql.fi +18 -5
    Post merge fix for FORCE INDEX ()
    Allow empty key list in USE|IGNORE|FORCE INDEX()

  sql/sql_parse.cc
    1.235.26.16 03/01/09 22:42:29 monty@mashka.mysql.fi +24 -4
    Post merge fix

  sql/sql_lex.h
    1.102.1.5 03/01/09 22:42:29 monty@mashka.mysql.fi +2 -2
    Post merge fix

  sql/sql_lex.cc
    1.59.5.1 03/01/09 22:42:29 monty@mashka.mysql.fi +7 -1
    Post merge fix

  mysys/my_handler.c
    1.9 03/01/09 22:42:29 monty@mashka.mysql.fi +51 -36
    Updated ha_key_cmp() to be as latest _mi_key_cmp() in 4.0

  mysql-test/t/myisam.test
    1.14 03/01/09 22:42:29 monty@mashka.mysql.fi +2 -0
    test of index()

  mysql-test/r/myisam.result
    1.18 03/01/09 22:42:29 monty@mashka.mysql.fi +25 -19
    New explain format

ChangeSet
  1.1403.49.1 03/01/09 22:17:16 Sinisa@sinisa.nasamreza.org +1 -0
  Fixes for usage of sub-selects in KILL and HANDLER ....
  Approved by Sanja ... ;o)

  sql/sql_yacc.yy
    1.203.14.1 03/01/09 22:17:11 Sinisa@sinisa.nasamreza.org +12 -0
    Fixes for usage of sub-selects in KILL and HANDLER ....
    Approved by Sanja ... ;o)

ChangeSet
  1.1403.48.1 03/01/09 09:55:45 venu@myvenu.com +1 -0
  Merge work.mysql.com:/home/bk/mysql-4.1
  into myvenu.com:/home/venu/bk/src-4.1

  mysql-test/r/create.result
    1.26 03/01/09 09:55:39 venu@myvenu.com +0 -0
    Auto merged

ChangeSet
  1.1403.47.2 03/01/09 18:30:58 pem@mysql.com +1 -0
  Post-merge fix.

  mysql-test/r/rpl_temporary.result
    1.4 03/01/09 18:30:56 pem@mysql.com +1 -1
    Corrected version number in result file.

ChangeSet
  1.1403.47.1 03/01/09 17:56:57 pem@mysql.com +12 -0
  Merge

  sql/sql_lex.h
    1.104 03/01/09 17:56:55 pem@mysql.com +0 -0
    SCCS merged

  sql/sql_lex.cc
    1.59.1.4 03/01/09 17:56:55 pem@mysql.com +0 -0
    SCCS merged

  sql/lex.h
    1.86 03/01/09 17:56:55 pem@mysql.com +0 -0
    SCCS merged

  sql/item.h
    1.41.1.8 03/01/09 17:56:55 pem@mysql.com +0 -0
    SCCS merged

  sql/item.cc
    1.27.1.31 03/01/09 17:56:55 pem@mysql.com +0 -0
    SCCS merged

  sql/sql_yacc.yy
    1.210 03/01/09 17:43:18 pem@mysql.com +0 -1
    Auto merged

  sql/sql_parse.cc
    1.235.1.39 03/01/09 17:43:18 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.123.1.28 03/01/09 17:43:18 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.cc
    1.82.1.28 03/01/09 17:43:18 pem@mysql.com +0 -0
    Auto merged

  sql/Makefile.am
    1.80 03/01/09 17:43:17 pem@mysql.com +0 -0
    Auto merged

  configure.in
    1.206 03/01/09 17:43:17 pem@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.212.1.18 03/01/09 17:43:08 pem@mysql.com +0 -0
    auto-union

ChangeSet
  1.1403.1.69 03/01/09 16:11:03 monty@hundin.mysql.fi +2 -0
  Merge work:/home/bk/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1

  sql/sql_yacc.yy
    1.203.1.16 03/01/09 16:10:59 monty@hundin.mysql.fi +0 -0
    Auto merged

  sql/sql_lex.cc
    1.63 03/01/09 16:10:58 monty@hundin.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1403.1.68 03/01/09 17:41:25 bar@bar.mysql.r18.ru +2 -0
  .del-koi8_u.xml~ec104975f7e009bf:
    Delete: sql/share/charsets/koi8_u.xml
  .del-koi8_r.xml~f95ebf1fb19f94cf:
    Delete: sql/share/charsets/koi8_r.xml

  BitKeeper/deleted/.del-koi8_u.xml~ec104975f7e009bf
    1.2 03/01/09 17:41:18 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/koi8_u.xml

  BitKeeper/deleted/.del-koi8_r.xml~f95ebf1fb19f94cf
    1.2 03/01/09 17:41:15 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/koi8_r.xml

ChangeSet
  1.1403.1.67 03/01/09 17:39:02 bar@bar.mysql.r18.ru +5 -0
  euc_kr, koi8_r and koi8_u have been renamed so that now
  all charset names don't have "_" sign.

  strings/ctype.c
    1.45 03/01/09 17:39:00 bar@bar.mysql.r18.ru +4 -4
    euc_kr, koi8_r and koi8_u have been renamed so that now
    all charset names don't have "_" sign.

  strings/ctype-euc_kr.c
    1.24 03/01/09 17:39:00 bar@bar.mysql.r18.ru +2 -2
    euc_kr, koi8_r and koi8_u have been renamed so that now
    all charset names don't have "_" sign.

  sql/share/charsets/Index.xml
    1.10 03/01/09 17:39:00 bar@bar.mysql.r18.ru +8 -8
    euc_kr, koi8_r and koi8_u have been renamed so that now
    all charset names don't have "_" sign.

  mysql-test/t/ctype_many.test
    1.9 03/01/09 17:39:00 bar@bar.mysql.r18.ru +2 -2
    euc_kr, koi8_r and koi8_u have been renamed so that now
    all charset names don't have "_" sign.

  mysql-test/r/ctype_many.result
    1.8 03/01/09 17:39:00 bar@bar.mysql.r18.ru +7 -7
    euc_kr, koi8_r and koi8_u have been renamed so that now
    all charset names don't have "_" sign.

ChangeSet
  1.1403.1.66 03/01/09 17:27:13 bar@bar.mysql.r18.ru +2 -0
  koi8u.xml, koi8r.xml:
    new file

  sql/share/charsets/koi8u.xml
    1.1 03/01/09 17:27:06 bar@bar.mysql.r18.ru +120 -0

  sql/share/charsets/koi8u.xml
    1.0 03/01/09 17:27:06 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/koi8u.xml

  sql/share/charsets/koi8r.xml
    1.1 03/01/09 17:27:03 bar@bar.mysql.r18.ru +119 -0

  sql/share/charsets/koi8r.xml
    1.0 03/01/09 17:27:03 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/koi8r.xml

ChangeSet
  1.1346.46.94 03/01/09 15:22:38 Sinisa@sinisa.nasamreza.org +1 -0
  A small fix for the type in the script

  scripts/mysqld_safe.sh
    1.53 03/01/09 15:22:34 Sinisa@sinisa.nasamreza.org +1 -1
    A small fix for the type in the script

ChangeSet
  1.1403.35.2 03/01/09 18:09:21 wax@mysql.com +5 -0
  change structure of udf_func and parameter of functions mysql_drop_func and add_func (SCRUM)

  sql/sql_yacc.yy
    1.203.13.1 03/01/09 18:09:19 wax@mysql.com +4 -4
    change according with new structure of udf_func

  sql/sql_udf.h
    1.5 03/01/09 18:09:19 wax@mysql.com +3 -4
    change type of name from *char to LEX_STRING, delete name_length

  sql/sql_udf.cc
    1.22.1.1 03/01/09 18:09:19 wax@mysql.com +25 -24
    change parameter of mysql_drop_func and add_func

  sql/sql_parse.cc
    1.235.34.1 03/01/09 18:09:19 wax@mysql.com +1 -1
    change according with new structure of udf_func

  sql/item_func.cc
    1.90.3.1 03/01/09 18:09:19 wax@mysql.com +2 -2
    change according new structure of udf_func

ChangeSet
  1.1403.1.65 03/01/09 16:38:23 bar@bar.mysql.r18.ru +1 -0
  do not call get_charset_by_name() with string "DEFAULT" 

  sql/sql_db.cc
    1.58.1.6 03/01/09 16:38:20 bar@bar.mysql.r18.ru +5 -3
    do not call get_charset_by_name() with string "DEFAULT" 

ChangeSet
  1.1403.1.64 03/01/09 15:37:59 bar@bar.mysql.r18.ru +14 -0
  Separating CHARSET and COLLATION terms

  sql/sql_yacc.yy
    1.203.1.15 03/01/09 15:37:57 bar@bar.mysql.r18.ru +44 -13
    COLLATE syntax has been added in CREATE TABLE/DATABASE

  sql/sql_show.cc
    1.86.7.1 03/01/09 15:37:57 bar@bar.mysql.r18.ru +18 -1
    COLLATION field has been added into SHOW FIELDS

  sql/sql_lex.cc
    1.59.2.6 03/01/09 15:37:57 bar@bar.mysql.r18.ru +1 -1
    Detect charset names rather than collation names

  sql/sql_db.cc
    1.58.1.5 03/01/09 15:37:57 bar@bar.mysql.r18.ru +7 -3
    COLLATE clause has been added into SHOW CREATE DATABASE

  sql/field.cc
    1.64.1.34 03/01/09 15:37:57 bar@bar.mysql.r18.ru +1 -1
    In field type charset rather than collation name is displayed

  mysql-test/r/type_ranges.result
    1.11 03/01/09 15:37:57 bar@bar.mysql.r18.ru +85 -85
    SHOW FIELDS and SHOW CREATE TABLE now displays collation

  mysql-test/r/type_float.result
    1.11 03/01/09 15:37:57 bar@bar.mysql.r18.ru +16 -16
    SHOW FIELDS and SHOW CREATE TABLE now displays collation

  mysql-test/r/type_blob.result
    1.12 03/01/09 15:37:57 bar@bar.mysql.r18.ru +20 -20
    SHOW FIELDS and SHOW CREATE TABLE now displays collation

  mysql-test/r/show_check.result
    1.28 03/01/09 15:37:57 bar@bar.mysql.r18.ru +27 -27
    SHOW FIELDS and SHOW CREATE TABLE now displays collation

  mysql-test/r/select.result
    1.23 03/01/09 15:37:57 bar@bar.mysql.r18.ru +15 -15
    SHOW FIELDS and SHOW CREATE TABLE now displays collation

  mysql-test/r/isam.result
    1.11 03/01/09 15:37:57 bar@bar.mysql.r18.ru +8 -8
    SHOW FIELDS and SHOW CREATE TABLE now displays collation

  mysql-test/r/innodb.result
    1.50 03/01/09 15:37:57 bar@bar.mysql.r18.ru +2 -2
    SHOW FIELDS and SHOW CREATE TABLE now displays collation

  mysql-test/r/create.result
    1.24.1.1 03/01/09 15:37:57 bar@bar.mysql.r18.ru +19 -19
    SHOW FIELDS and SHOW CREATE TABLE now displays collation

  mysql-test/r/alter_table.result
    1.13 03/01/09 15:37:57 bar@bar.mysql.r18.ru +7 -7
    SHOW FIELDS and SHOW CREATE TABLE now displays collation

ChangeSet
  1.1403.1.63 03/01/09 14:35:01 ram@mysql.r18.ru +2 -0
  fixed order_by test to make it repeatable

  mysql-test/t/order_by.test
    1.12 03/01/09 14:34:49 ram@mysql.r18.ru +5 -5
    fixed order_by test to make it repeatable

  mysql-test/r/order_by.result
    1.17 03/01/09 14:34:49 ram@mysql.r18.ru +13 -13
    fixed order_by test to make it repeatable

ChangeSet
  1.1346.46.93 03/01/09 11:11:06 monty@mashka.mysql.fi +4 -0
  Portability fix

  mysql-test/mysql-test-run.sh
    1.146.1.11 03/01/09 11:11:03 monty@mashka.mysql.fi +1 -1
    Better timeout for valgrind

  extra/mysql_waitpid.c
    1.3 03/01/09 11:11:03 monty@mashka.mysql.fi +21 -4
    Portability fixes

  configure.in
    1.191.1.60 03/01/09 11:11:03 monty@mashka.mysql.fi +6 -1
    Don't do depend files with Compaq compiler

  BUILD/compile-alpha-cxx
    1.8 03/01/09 11:11:02 monty@mashka.mysql.fi +1 -1
    Don't do depend files with Compaq compiler

ChangeSet
  1.1403.46.2 03/01/09 03:55:26 monty@mashka.mysql.fi +32 -0
  merge with 4.0.9
  
  To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys

  sql/sql_yacc.yy
    1.203.12.2 03/01/09 03:55:23 monty@mashka.mysql.fi +30 -48
    merge with 4.0.9

  sql/sql_parse.cc
    1.235.26.15 03/01/09 03:55:23 monty@mashka.mysql.fi +2 -25
    merge with 4.0.9

  sql/sql_lex.h
    1.102.1.4 03/01/09 03:55:23 monty@mashka.mysql.fi +5 -3
    merge with 4.0.9

  sql/mysql_priv.h
    1.160.1.35 03/01/09 03:55:23 monty@mashka.mysql.fi +0 -1
    merge with 4.0.9

  sql/log_event.cc
    1.91.1.4 03/01/09 03:55:23 monty@mashka.mysql.fi +36 -40
    merge with 4.0.9

  mysql-test/t/myisam.test
    1.13 03/01/09 03:55:23 monty@mashka.mysql.fi +2 -3
    merge with 4.0.9

  myisam/mi_search.c
    1.36 03/01/09 03:55:23 monty@mashka.mysql.fi +1 -34
    merge with 4.0.9

  myisam/mi_check.c
    1.97 03/01/09 03:55:23 monty@mashka.mysql.fi +2 -3
    merge with 4.0.9

  innobase/btr/btr0pcur.c
    1.6 03/01/09 03:55:23 monty@mashka.mysql.fi +0 -5
    merge with 4.0.9

  configure.in
    1.201.1.11 03/01/09 03:55:23 monty@mashka.mysql.fi +0 -1
    merge with 4.0.9

  sql/table.h
    1.41.1.1 03/01/09 03:12:41 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_show.cc
    1.86.1.22 03/01/09 03:12:41 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql-bench/test-insert.sh
    1.39 03/01/09 03:12:41 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql-bench/crash-me.sh
    1.39 03/01/09 03:12:41 monty@mashka.mysql.fi +3 -7
    Auto merged

  sql/sql_select.cc
    1.173.24.3 03/01/09 03:12:40 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_base.cc
    1.122.1.26 03/01/09 03:12:40 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/slave.cc
    1.174.1.2 03/01/09 03:12:40 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/protocol.cc
    1.23.1.15 03/01/09 03:12:40 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/opt_range.cc
    1.77 03/01/09 03:12:40 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.316.1.9 03/01/09 03:12:40 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/log_event.h
    1.76.1.2 03/01/09 03:12:40 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/lex.h
    1.82.1.6 03/01/09 03:12:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/myisam.result
    1.17 03/01/09 03:12:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.157 03/01/09 03:12:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/myisamdef.h
    1.52.1.2 03/01/09 03:12:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/mi_open.c
    1.53.1.1 03/01/09 03:12:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/ft_nlq_search.c
    1.18.1.1 03/01/09 03:12:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/log/log0log.c
    1.21 03/01/09 03:12:38 monty@mashka.mysql.fi +0 -21
    Auto merged

  include/my_base.h
    1.39 03/01/09 03:12:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  extra/Makefile.am
    1.12 03/01/09 03:12:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  client/mysqltest.c
    1.85.1.4 03/01/09 03:12:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/protocol.cc
    1.21.2.2 03/01/09 03:12:37 monty@mashka.mysql.fi +0 -0
    Merge rename: sql/net_pkg.cc -> sql/protocol.cc

  client/mysqladmin.c
    1.74 03/01/09 03:12:37 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1403.46.1 03/01/09 03:12:17 monty@mashka.mysql.fi +1 -0
  Add TYPE as an alias for specifying key type

  sql/sql_yacc.yy
    1.203.12.1 03/01/09 03:12:15 monty@mashka.mysql.fi +1 -0
    Add TYPE as an alias for specifying key type

ChangeSet
  1.1346.90.1 03/01/09 02:19:14 monty@mashka.mysql.fi +17 -0
  Don't count NULL values in cardinalty for MyISAM tables.
  Free row buffer cache after each query for MyISAM tables.
  Added table join option FORCE INDEX
  Fixed core dump bug when connecting with hostname that could not be resolved.

  sql/table.h
    1.31.1.11 03/01/09 02:19:11 monty@mashka.mysql.fi +2 -0
    Added table join option FORCE INDEX

  sql/sql_yacc.yy
    1.145.1.51 03/01/09 02:19:11 monty@mashka.mysql.fi +35 -20
    Added table join option FORCE INDEX

  sql/sql_select.cc
    1.152.1.65 03/01/09 02:19:11 monty@mashka.mysql.fi +2 -1
    Added table join option FORCE INDEX

  sql/sql_parse.cc
    1.218.1.68 03/01/09 02:19:11 monty@mashka.mysql.fi +28 -8
    Added table join option FORCE INDEX
    Don't use strlen() on hostname without first checking if it's not NULL

  sql/sql_lex.h
    1.66.1.12 03/01/09 02:19:11 monty@mashka.mysql.fi +1 -1
    Added table join option FORCE INDEX

  sql/sql_base.cc
    1.117.1.33 03/01/09 02:19:11 monty@mashka.mysql.fi +4 -2
    Added table join option FORCE INDEX

  sql/opt_range.cc
    1.54.1.19 03/01/09 02:19:11 monty@mashka.mysql.fi +3 -1
    Added table join option FORCE INDEX

  sql/mysql_priv.h
    1.150.1.27 03/01/09 02:19:11 monty@mashka.mysql.fi +5 -1
    Added table join option FORCE INDEX

  sql/lex.h
    1.66.1.21 03/01/09 02:19:11 monty@mashka.mysql.fi +1 -0
    Added table join option FORCE INDEX

  mysql-test/t/myisam.test
    1.7.1.8 03/01/09 02:19:11 monty@mashka.mysql.fi +25 -1
    Test case for cardinality with NULL keys and FORCE INDEX

  mysql-test/r/myisam.result
    1.10.1.8 03/01/09 02:19:11 monty@mashka.mysql.fi +43 -1
    Test case for cardinality with NULL keys and FORCE INDEX

  myisam/myisamdef.h
    1.45.1.10 03/01/09 02:19:11 monty@mashka.mysql.fi +2 -2
    Change buffer length from uint to uint32 to make it more portable/predictable

  myisam/mi_search.c
    1.30.1.3 03/01/09 02:19:11 monty@mashka.mysql.fi +37 -10
    Don't count NULL values in cardinalty

  myisam/mi_open.c
    1.46.1.10 03/01/09 02:19:11 monty@mashka.mysql.fi +11 -3
    Avoid realloc if cache size doesn't change

  myisam/mi_extra.c
    1.31 03/01/09 02:19:11 monty@mashka.mysql.fi +5 -0
    Free row buffer cache after each query

  myisam/mi_check.c
    1.86.1.25 03/01/09 02:19:11 monty@mashka.mysql.fi +2 -1
    Don't count NULL values in cardinalty

  include/my_base.h
    1.30.1.6 03/01/09 02:19:11 monty@mashka.mysql.fi +1 -0
    Don't count NULL values in cardinalty

ChangeSet
  1.1403.1.62 03/01/09 00:29:49 heikki@hundin.mysql.fi +1 -0
  buf0buf.c:
    Add a sanity check awe mem >= buf pool size

  innobase/buf/buf0buf.c
    1.21 03/01/09 00:29:27 heikki@hundin.mysql.fi +9 -0
    Add a sanity check awe mem >= buf pool size

ChangeSet
  1.1403.1.61 03/01/09 00:13:47 heikki@hundin.mysql.fi +1 -0
  os0proc.c:
    Fix typos

  innobase/os/os0proc.c
    1.4 03/01/09 00:13:36 heikki@hundin.mysql.fi +2 -2
    Fix typos

ChangeSet
  1.1403.1.60 03/01/09 00:10:36 heikki@hundin.mysql.fi +5 -0
  srv0srv.c, mem0pool.c, mem0pool.h, buf0buf.h, buf0buf.c:
    Make smaller buffer headers and the lock table; fix AWE high_end bug

  innobase/srv/srv0srv.c
    1.37 03/01/09 00:09:14 heikki@hundin.mysql.fi +7 -1
    Make smaller buffer headers and the lock table; fix AWE high_end bug

  innobase/mem/mem0pool.c
    1.8.1.1 03/01/09 00:08:22 heikki@hundin.mysql.fi +0 -13
    Make smaller buffer headers and the lock table; fix AWE high_end bug

  innobase/include/mem0pool.h
    1.5 03/01/09 00:07:43 heikki@hundin.mysql.fi +2 -0
    Make smaller buffer headers and the lock table; fix AWE high_end bug

  innobase/include/buf0buf.h
    1.15 03/01/09 00:07:43 heikki@hundin.mysql.fi +0 -8
    Make smaller buffer headers and the lock table; fix AWE high_end bug

  innobase/buf/buf0buf.c
    1.20 03/01/09 00:05:58 heikki@hundin.mysql.fi +21 -10
    Make smaller buffer headers and the lock table; fix AWE high_end bug

  myisam/ft_nlq_search.c
    1.21 03/01/08 22:45:26 serg@sergbook.mysql.com +1 -0
    no _mi_search_next() bug fixed

ChangeSet
  1.1346.89.1 03/01/08 19:40:35 serg@sergbook.mysql.com +1 -0
  ft_nlq_search.c:
    no _mi_search_next() bug fixed

  myisam/ft_nlq_search.c
    1.14.1.4 03/01/08 19:00:56 serg@sergbook.mysql.com +1 -0
    no _mi_search_next() bug fixed

ChangeSet
  1.1403.1.59 03/01/08 19:43:58 hf@deer.mysql.r18.ru +1 -0
  Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
  into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.clean

  sql/item_strfunc.cc
    1.54.1.26 03/01/08 19:43:56 hf@deer.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1403.45.1 03/01/08 19:42:31 hf@deer.mysql.r18.ru +1 -0
  Fix for the bug about point(subselect(...))

  sql/item_strfunc.cc
    1.54.9.1 03/01/08 19:41:38 hf@deer.mysql.r18.ru +6 -4
    null_value-s was indefined here

ChangeSet
  1.1346.88.1 03/01/08 15:43:56 jani@hynda.(none) +1 -0
  Fixed a couple of bugs.

  extra/mysql_waitpid.c
    1.2 03/01/08 15:43:52 jani@hynda.(none) +5 -5
    Fixed a couple of bugs.

ChangeSet
  1.1403.44.1 03/01/08 16:29:31 bar@bar.mysql.r18.ru +1 -0
  Renamed to look in common style

  sql/sql_yacc.yy
    1.203.1.14 03/01/08 16:29:30 bar@bar.mysql.r18.ru +5 -13
    Renamed to look in common style

ChangeSet
  1.1403.43.1 03/01/08 16:25:42 ram@mysql.r18.ru +2 -0
  fix for readline building

  readline/terminal.c
    1.10 03/01/08 16:25:40 ram@mysql.r18.ru +5 -5
    fix for readline building

  readline/tcap.h
    1.6 03/01/08 16:25:40 ram@mysql.r18.ru +1 -1
    fix for readline building

  myisam/sort.c
    1.32 03/01/08 13:00:47 serg@sergbook.mysql.com +18 -22
    bugfixing

  myisam/mi_open.c
    1.57 03/01/08 13:00:47 serg@sergbook.mysql.com +1 -1
    bugfix

  myisam/mi_check.c
    1.94.1.2 03/01/08 13:00:47 serg@sergbook.mysql.com +14 -6
    bugfixing

  myisam/ft_nlq_search.c
    1.20 03/01/08 13:00:47 serg@sergbook.mysql.com +40 -21
    ft_nlq_search now works with new two-level index structure !

  myisam/ft_dump.c
    1.16 03/01/08 13:00:47 serg@sergbook.mysql.com +13 -8
    bugfix

  include/myisam.h
    1.44.1.2 03/01/08 13:00:47 serg@sergbook.mysql.com +3 -5
    this kind of hacks bites :)

ChangeSet
  1.1403.1.56 03/01/08 15:43:03 bar@bar.mysql.r18.ru +1 -0
  charset.c:
    find only primary collations

  mysys/charset.c
    1.58 03/01/08 15:42:19 bar@bar.mysql.r18.ru +2 -1
    find only primary collations

ChangeSet
  1.1403.1.55 03/01/08 15:39:15 bar@bar.mysql.r18.ru +2 -0
  New function to search for charset using charset name rather than collation name

  mysys/charset.c
    1.57 03/01/08 15:39:13 bar@bar.mysql.r18.ru +30 -9
    New function to search for charset using charset name rather than collation name

  include/my_sys.h
    1.84 03/01/08 15:39:13 bar@bar.mysql.r18.ru +1 -0
    New function to search for charset using charset name rather than collation name

ChangeSet
  1.1403.42.1 03/01/08 13:38:11 bar@bar.mysql.r18.ru +1 -0
  COLLATE is field attribute not field type

  sql/sql_yacc.yy
    1.203.1.13 03/01/08 13:38:09 bar@bar.mysql.r18.ru +2 -2
    COLLATE is field attribute not field type

ChangeSet
  1.1346.46.89 03/01/08 11:27:07 monty@mashka.mysql.fi +1 -0
  merge

  sql/sql_show.cc
    1.76.1.21 03/01/08 11:27:06 monty@mashka.mysql.fi +0 -2
    merge

ChangeSet
  1.1346.46.88 03/01/08 11:24:39 monty@mashka.mysql.fi +6 -0
  Fix for bug in LOAD DATA INFILE and replication
  Fix for SHOW VARIABLES in embedded server

  sql/sql_show.cc
    1.76.2.1 03/01/08 11:24:37 monty@mashka.mysql.fi +2 -0
    Fix for SHOW VARIABLES in embedded server

  sql/slave.cc
    1.164.1.41 03/01/08 11:24:37 monty@mashka.mysql.fi +0 -6
    Fix for bug in LOAD DATA INFILE

  sql/log_event.h
    1.71.1.2 03/01/08 11:24:37 monty@mashka.mysql.fi +3 -2
    Fix for bug in LOAD DATA INFILE

  sql/log_event.cc
    1.77.1.17 03/01/08 11:24:37 monty@mashka.mysql.fi +51 -5
    Fix for bug in LOAD DATA INFILE

  configure.in
    1.191.1.59 03/01/08 11:24:37 monty@mashka.mysql.fi +1 -1
    Changed version number

  Docs/internals.texi
    1.22 03/01/08 11:24:37 monty@mashka.mysql.fi +72 -1
    Added documentation for join_buffer_size

ChangeSet
  1.1403.1.53 03/01/08 12:48:49 ram@mysql.r18.ru +2 -0
  resolving type conflict of BC and UP variables on FreeBSD

  readline/terminal.c
    1.9 03/01/08 12:48:47 ram@mysql.r18.ru +5 -5
    resolving type conflict of BC and UP variables on FreeBSD

  readline/tcap.h
    1.5 03/01/08 12:48:47 ram@mysql.r18.ru +1 -1
    resolving type conflict of BC and UP variables on FreeBSD

ChangeSet
  1.1403.1.52 03/01/08 11:53:09 ram@mysql.r18.ru +3 -0
  Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
  into mysql.r18.ru:/usr/home/ram/work/mysql-4.1

  sql/sql_select.cc
    1.173.1.35 03/01/08 11:53:06 ram@mysql.r18.ru +0 -0
    Auto merged

  mysql-test/t/order_by.test
    1.11 03/01/08 11:53:06 ram@mysql.r18.ru +0 -0
    Auto merged

  mysql-test/r/order_by.result
    1.16 03/01/08 11:53:06 ram@mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1403.41.3 03/01/07 18:59:08 venu@myvenu.com +4 -0
  Simple misc cases - warnings

  mysql-test/t/warnings.test
    1.6 03/01/07 18:58:47 venu@myvenu.com +7 -0

  mysql-test/r/warnings.result
    1.5 03/01/07 18:58:41 venu@myvenu.com +17 -0

  mysql-test/r/create.result
    1.25 03/01/07 18:58:35 venu@myvenu.com +1 -1

  mysql-test/t/create.test
    1.20 03/01/07 18:58:28 venu@myvenu.com +1 -1

ChangeSet
  1.1403.41.2 03/01/07 18:57:39 venu@myvenu.com +2 -0
  Code cleaup to fix the conversion routines - binary protocol

  include/mysql.h
    1.43.1.14 03/01/07 18:54:56 venu@myvenu.com +2 -2

  libmysql/libmysql.c
    1.124 03/01/07 18:54:41 venu@myvenu.com +32 -48

ChangeSet
  1.1403.41.1 03/01/07 18:53:46 venu@myvenu.com +1 -0
  Protocol conversion tests

  tests/client_test.c
    1.6 03/01/07 18:52:57 venu@myvenu.com +1015 -45

ChangeSet
  1.1346.87.3 03/01/07 23:46:30 miguel@hegel.br +1 -0
  Fix embedded server crash

  sql/sql_show.cc
    1.76.1.20 03/01/07 23:46:02 miguel@hegel.br +2 -0
    fix embedded server crash

ChangeSet
  1.1403.1.51 03/01/07 23:32:25 monty@mashka.mysql.fi +3 -0
  Enchanced my_once..() functions.
  Cleaned up charset.c
  Removed non fatal memory leak in charset.c

  mysys/my_once.c
    1.6 03/01/07 23:32:22 monty@mashka.mysql.fi +19 -0
    Enchanced my_once..() functions.

  mysys/charset.c
    1.56 03/01/07 23:32:22 monty@mashka.mysql.fi +167 -165
    Moved my_once_strdup() to my_once.cc
    Added usage of my_once_memdup()
    A lot of indentation changes.

  include/my_sys.h
    1.83 03/01/07 23:32:22 monty@mashka.mysql.fi +2 -0
    Enchanced my_once..() functions.

ChangeSet
  1.1346.87.2 03/01/07 21:20:43 heikki@hundin.mysql.fi +1 -0
  mem0pool.c:
    Remove the warning message that mem allocation spills from the additional mem pool to the OS; this does not hit performance with modern malloc libraries

  innobase/mem/mem0pool.c
    1.9 03/01/07 21:20:33 heikki@hundin.mysql.fi +0 -13
    Remove the warning message that mem allocation spills from the additional mem pool to the OS; this does not hit performance with modern malloc libraries

ChangeSet
  1.1346.87.1 03/01/07 19:04:41 jani@hynda.(none) +2 -0
  Added new program, mysql_waitpid.

  extra/Makefile.am
    1.10.1.1 03/01/07 19:04:05 jani@hynda.(none) +1 -1
    Added new program, mysql_waitpid.

  extra/mysql_waitpid.c
    1.1 03/01/07 19:02:24 jani@hynda.(none) +86 -0

  extra/mysql_waitpid.c
    1.0 03/01/07 19:02:24 jani@hynda.(none) +0 -0
    BitKeeper file /home/my/bk/mysql-4.0/extra/mysql_waitpid.c

ChangeSet
  1.1346.86.1 03/01/07 16:53:10 monty@mashka.mysql.fi +12 -0
  Portability fixes
  Fixed test suite for HPUX 10.20 and MacOSX

  sql/slave.cc
    1.164.1.40 03/01/07 16:53:07 monty@mashka.mysql.fi +2 -0
    Added DBUG_PRINT messages

  sql/net_pkg.cc
    1.21.2.1 03/01/07 16:53:07 monty@mashka.mysql.fi +4 -1
    More comments

  sql/mysqld.cc
    1.297.1.89 03/01/07 16:53:07 monty@mashka.mysql.fi +27 -16
    Removed DBUG warnings
    Removed default argument for clean_up() and made it static.
    More comments.
    Ignore SIGHUP during shutdown

  sql/mysql_priv.h
    1.150.1.26 03/01/07 16:53:07 monty@mashka.mysql.fi +0 -1
    Removed not needed prototype.

  sql-bench/test-insert.sh
    1.37.1.1 03/01/07 16:53:07 monty@mashka.mysql.fi +4 -3
    Comment cleanup

  sql-bench/test-alter-table.sh
    1.9 03/01/07 16:53:07 monty@mashka.mysql.fi +37 -6
    Added default time limit
    Changed test to be estimated to get down run time.
    Fixed that add_multi_col is detected

  sql-bench/crash-me.sh
    1.34.1.9 03/01/07 16:53:07 monty@mashka.mysql.fi +72 -54
    Indentation cleanups
    Added DROP for a created table

  sql-bench/bench-init.pl.sh
    1.25 03/01/07 16:53:07 monty@mashka.mysql.fi +4 -1
    Allow tests to change time limit.

  mysql-test/mysql-test-run.sh
    1.146.1.10 03/01/07 16:53:07 monty@mashka.mysql.fi +22 -11
    A lot of safety fixes. 
    This fixes some problems with test suite for HPUX 10.20 and MacOSX

  client/mysqltest.c
    1.77.1.18 03/01/07 16:53:07 monty@mashka.mysql.fi +4 -4
    Always allow --debug flag
    (Makes it easier to run mysql-test-run)

  client/mysqladmin.c
    1.66.2.1 03/01/07 16:53:07 monty@mashka.mysql.fi +40 -22
    Return 1 if pid file isn't deleted on shutdown.
    Fix error message if pid file is not deleted

  Build-tools/Do-compile
    1.70 03/01/07 16:53:07 monty@mashka.mysql.fi +17 -10
    Added timeout to mysqladmin shutdown commands
    Kill old running mysqld started by earlier runs
    Removed run time warning from LD_LIBRARY_PATH

ChangeSet
  1.1403.40.1 03/01/07 11:45:06 monty@mashka.mysql.fi +10 -0
  Fixed that derived tables are properly droped

  sql/sql_select.h
    1.34 03/01/07 11:45:04 monty@mashka.mysql.fi +1 -0
    split fix_tables_pointer() into two functions to be able to reuse code

  sql/sql_select.cc
    1.173.24.2 03/01/07 11:45:04 monty@mashka.mysql.fi +14 -7
    split fix_tables_pointer() into two functions to be able to reuse code

  sql/sql_parse.cc
    1.235.26.14 03/01/07 11:45:04 monty@mashka.mysql.fi +5 -1
    Fixed that derived tables are properly droped

  sql/sql_derived.cc
    1.28 03/01/07 11:45:04 monty@mashka.mysql.fi +59 -50
    Fixed that derived tables are properly droped

  sql/sql_class.h
    1.123.9.7 03/01/07 11:45:04 monty@mashka.mysql.fi +1 -1
    Fixed that derived tables are properly droped

  sql/sql_class.cc
    1.82.6.10 03/01/07 11:45:04 monty@mashka.mysql.fi +1 -1
    Fixed that derived tables are properly droped

  sql/sql_base.cc
    1.122.1.25 03/01/07 11:45:04 monty@mashka.mysql.fi +37 -6
    Fixed that derived tables are properly droped

  sql/mysql_priv.h
    1.160.1.34 03/01/07 11:45:04 monty@mashka.mysql.fi +1 -2
    Fixed that derived tables are properly droped

  sql/item_row.cc
    1.9 03/01/07 11:45:04 monty@mashka.mysql.fi +1 -1
    Removed compiler warnings

  mysys/my_init.c
    1.25 03/01/07 11:45:04 monty@mashka.mysql.fi +1 -1
    Move my_once_free() up to not get warnings for this from safemalloc.

ChangeSet
  1.1403.1.49 03/01/07 12:30:54 bar@bar.mysql.r18.ru +1 -0
  charset.c:
    memory leak fix
    I will move my_once_strdup to my_alloc.c later. 

  mysys/charset.c
    1.55 03/01/07 12:30:13 bar@bar.mysql.r18.ru +12 -2
    memory leak fix
    I will move my_once_strdup to my_alloc.c later. 

ChangeSet
  1.1403.1.47 03/01/06 22:07:25 heikki@hundin.mysql.fi +26 -0
  buf0buf.c, buf0buf.ic, buf0buf.h:
    Reduce memory usage of the buffer headers
  Many files:
    Merge InnoDB-4.1 with AWE support

  innobase/buf/buf0buf.c
    1.19 03/01/06 22:07:06 heikki@hundin.mysql.fi +2 -0
    Reduce memory usage of the buffer headers

  innobase/include/buf0buf.ic
    1.9 03/01/06 22:06:58 heikki@hundin.mysql.fi +5 -4
    Reduce memory usage of the buffer headers

  innobase/include/buf0buf.h
    1.14 03/01/06 22:06:55 heikki@hundin.mysql.fi +2 -1
    Reduce memory usage of the buffer headers

  innobase/ut/ut0ut.c
    1.13 03/01/06 21:46:27 heikki@hundin.mysql.fi +1 -0
    Merge InnoDB-4.1 with AWE support

  innobase/trx/trx0trx.c
    1.21 03/01/06 21:46:02 heikki@hundin.mysql.fi +1 -1
    Merge InnoDB-4.1 with AWE support

  innobase/trx/trx0sys.c
    1.14 03/01/06 21:46:02 heikki@hundin.mysql.fi +3 -3
    Merge InnoDB-4.1 with AWE support

  innobase/srv/srv0start.c
    1.38 03/01/06 21:45:41 heikki@hundin.mysql.fi +40 -1
    Merge InnoDB-4.1 with AWE support

  innobase/srv/srv0srv.c
    1.36 03/01/06 21:45:41 heikki@hundin.mysql.fi +33 -5
    Merge InnoDB-4.1 with AWE support

  innobase/os/os0proc.c
    1.3 03/01/06 21:44:44 heikki@hundin.mysql.fi +460 -2
    Merge InnoDB-4.1 with AWE support

  innobase/os/os0file.c
    1.45 03/01/06 21:44:44 heikki@hundin.mysql.fi +1 -1
    Merge InnoDB-4.1 with AWE support

  innobase/log/log0recv.c
    1.20 03/01/06 21:43:57 heikki@hundin.mysql.fi +16 -8
    Merge InnoDB-4.1 with AWE support

  innobase/log/log0log.c
    1.19.1.1 03/01/06 21:43:57 heikki@hundin.mysql.fi +23 -13
    Merge InnoDB-4.1 with AWE support

  innobase/include/buf0buf.ic
    1.8 03/01/06 21:43:26 heikki@hundin.mysql.fi +53 -57
    Merge InnoDB-4.1 with AWE support

  innobase/include/srv0srv.h
    1.22 03/01/06 21:43:09 heikki@hundin.mysql.fi +3 -0
    Merge InnoDB-4.1 with AWE support

  innobase/include/os0proc.h
    1.3 03/01/06 21:43:09 heikki@hundin.mysql.fi +70 -0
    Merge InnoDB-4.1 with AWE support

  innobase/include/log0recv.h
    1.7 03/01/06 21:43:09 heikki@hundin.mysql.fi +1 -6
    Merge InnoDB-4.1 with AWE support

  innobase/include/buf0lru.h
    1.2 03/01/06 21:43:08 heikki@hundin.mysql.fi +3 -1
    Merge InnoDB-4.1 with AWE support

  innobase/include/buf0buf.h
    1.13 03/01/06 21:43:08 heikki@hundin.mysql.fi +100 -17
    Merge InnoDB-4.1 with AWE support

  innobase/include/btr0pcur.h
    1.5 03/01/06 21:43:08 heikki@hundin.mysql.fi +3 -0
    Merge InnoDB-4.1 with AWE support

  innobase/buf/buf0rea.c
    1.6 03/01/06 21:42:01 heikki@hundin.mysql.fi +1 -1
    Merge InnoDB-4.1 with AWE support

  innobase/buf/buf0lru.c
    1.10 03/01/06 21:42:01 heikki@hundin.mysql.fi +59 -3
    Merge InnoDB-4.1 with AWE support

  innobase/buf/buf0flu.c
    1.15 03/01/06 21:42:01 heikki@hundin.mysql.fi +44 -2
    Merge InnoDB-4.1 with AWE support

  innobase/buf/buf0buf.c
    1.18 03/01/06 21:42:01 heikki@hundin.mysql.fi +261 -44
    Merge InnoDB-4.1 with AWE support

  innobase/btr/btr0pcur.c
    1.4.1.1 03/01/06 21:41:53 heikki@hundin.mysql.fi +32 -10
    Merge InnoDB-4.1 with AWE support

  innobase/btr/btr0cur.c
    1.21 03/01/06 21:41:53 heikki@hundin.mysql.fi +5 -2
    Merge InnoDB-4.1 with AWE support

  sql/ha_innodb.cc
    1.85.3.2 03/01/06 21:40:20 heikki@hundin.mysql.fi +21 -2
    Merge InnoDB-4.1 with AWE support

  sql/ha_innodb.h
    1.48.1.1 03/01/06 21:40:17 heikki@hundin.mysql.fi +2 -1
    Merge InnoDB-4.1 with AWE support

  sql/set_var.cc
    1.20.1.3 03/01/06 21:40:10 heikki@hundin.mysql.fi +1 -0
    Merge InnoDB-4.1 with AWE support

  sql/mysqld.cc
    1.316.1.8 03/01/06 21:39:59 heikki@hundin.mysql.fi +5 -0
    Merge InnoDB-4.1 with AWE support

  myisam/sort.c
    1.31 03/01/06 12:37:40 serg@sergbook.mysql.com +20 -1
    creating two-level ft tree in mi_repair_by_sort

  myisam/myisamdef.h
    1.54 03/01/06 12:37:40 serg@sergbook.mysql.com +13 -4
    creating two-level ft tree in mi_repair_by_sort, cleanups

  myisam/mi_open.c
    1.56 03/01/06 12:37:40 serg@sergbook.mysql.com +17 -7
    creating two-level ft tree in mi_repair_by_sort, cleanups

  myisam/mi_check.c
    1.94.1.1 03/01/06 12:37:40 serg@sergbook.mysql.com +148 -11
    creating two-level ft tree in mi_repair_by_sort, cleanups

  myisam/ft_static.c
    1.19 03/01/06 12:37:40 serg@sergbook.mysql.com +2 -2
    safety fix: charset=7 (koi8-r) -> charset=63 (binary) in static FT_SEGS

  include/myisam.h
    1.44.1.1 03/01/06 12:37:40 serg@sergbook.mysql.com +10 -1
    creating two-level ft tree in mi_repair_by_sort

  include/my_handler.h
    1.4 03/01/06 12:37:40 serg@sergbook.mysql.com +10 -3
    get_key_length_rdonly utility macro

  mysys/mulalloc.c
    1.6 03/01/06 12:23:26 serg@sergbook.mysql.com +8 -6
    function comments clarified

  mysql-test/t/fulltext.test
    1.34.1.1 03/01/06 12:23:26 serg@sergbook.mysql.com +1 -0
    stopword test

  mysql-test/r/fulltext.result
    1.34.1.1 03/01/06 12:23:26 serg@sergbook.mysql.com +2 -0
    stopword test

ChangeSet
  1.1403.1.46 03/01/06 11:44:18 monty@mashka.mysql.fi +1 -0
  Updated test results

  mysql-test/r/subselect.result
    1.54 03/01/06 11:44:17 monty@mashka.mysql.fi +2 -0
    Updated test results

ChangeSet
  1.1403.1.45 03/01/06 02:46:36 monty@mashka.mysql.fi +6 -0
  merge

  mysql-test/t/subselect.test
    1.46 03/01/06 02:46:34 monty@mashka.mysql.fi +2 -2
    merge

  mysql-test/r/subselect.result
    1.53 03/01/06 02:46:34 monty@mashka.mysql.fi +1 -1
    merge

  sql/sql_parse.cc
    1.235.26.13 03/01/06 02:42:21 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.316.1.7 03/01/06 02:42:21 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.160.1.33 03/01/06 02:42:21 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/ctype_many.test
    1.8 03/01/06 02:42:21 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1403.1.44 03/01/06 02:41:53 monty@mashka.mysql.fi +1 -0
  merge post fix

  mysql-test/r/func_str.result
    1.21 03/01/06 02:41:51 monty@mashka.mysql.fi +2 -2
    merge post fix

ChangeSet
  1.1403.1.43 03/01/06 02:04:52 monty@mashka.mysql.fi +22 -0
  Merge with 4.0.8

  sql/sql_union.cc
    1.57 03/01/06 02:04:50 monty@mashka.mysql.fi +0 -1
    Merge with 4.0.8

  sql/sql_parse.cc
    1.235.26.12 03/01/06 02:04:50 monty@mashka.mysql.fi +3 -7
    Merge with 4.0.8

  sql/net_serv.cc
    1.48.1.2 03/01/06 02:04:50 monty@mashka.mysql.fi +4 -8
    Merge with 4.0.8

  sql/ha_berkeley.cc
    1.111.1.3 03/01/06 02:04:50 monty@mashka.mysql.fi +2 -24
    Merge with 4.0.8

  mysql-test/t/func_str.test
    1.20 03/01/06 02:04:50 monty@mashka.mysql.fi +1 -1
    Merge with 4.0.8

  mysql-test/r/func_str.result
    1.20 03/01/06 02:04:50 monty@mashka.mysql.fi +0 -3
    Merge with 4.0.8

  libmysql/libmysql.c
    1.123 03/01/06 02:04:50 monty@mashka.mysql.fi +3 -4
    Merge with 4.0.8

  include/mysql_com.h
    1.60.1.3 03/01/06 02:04:50 monty@mashka.mysql.fi +2 -9
    Merge with 4.0.8

  configure.in
    1.201.1.10 03/01/06 02:04:50 monty@mashka.mysql.fi +0 -1
    Merge with 4.0.8

  tools/mysqlmanager.c
    1.35 03/01/06 01:49:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/table.cc
    1.64.1.1 03/01/06 01:49:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_class.h
    1.123.9.6 03/01/06 01:49:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/protocol.cc
    1.23.1.14 03/01/06 01:49:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mini_client.cc
    1.56.1.1 03/01/06 01:49:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.54.1.25 03/01/06 01:49:39 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/ha_berkeley.h
    1.50.1.4 03/01/06 01:49:39 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/protocol.cc
    1.21.1.7 03/01/06 01:49:38 monty@mashka.mysql.fi +0 -0
    Merge rename: sql/net_pkg.cc -> sql/protocol.cc

  myisam/mi_test1.c
    1.15 03/01/06 01:49:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/mi_check.c
    1.96 03/01/06 01:49:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/mysql.h
    1.43.1.13 03/01/06 01:49:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  acinclude.m4
    1.81 03/01/06 01:49:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  BUILD/SETUP.sh
    1.21 03/01/06 01:49:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.212.14.11 03/01/06 01:49:29 monty@mashka.mysql.fi +0 -1
    auto-union

ChangeSet
  1.1403.1.42 03/01/06 01:48:59 monty@mashka.mysql.fi +248 -0
  Changed mysql-test to print warnings for not existing table to DROP TABLE
  Cleaned up test; Removed wrong DROP TABLE commands and use standard table and database names.
  changed store_warning() -> push_warning_print()
  

  sql/sql_table.cc
    1.125.1.19 03/01/06 01:48:54 monty@mashka.mysql.fi +3 -1
    Change store_warning -> push_warning_printf

  sql/sql_error.cc
    1.8.1.1 03/01/06 01:48:54 monty@mashka.mysql.fi +15 -17
    Change store_warning -> push_warning_printf

  sql/sql_db.cc
    1.58.1.4 03/01/06 01:48:54 monty@mashka.mysql.fi +2 -1
    Change store_warning -> push_warning_printf

  sql/mysql_priv.h
    1.160.1.32 03/01/06 01:48:54 monty@mashka.mysql.fi +2 -1
    Change store_warning -> push_warning_printf

  sql/ha_berkeley.cc
    1.111.1.2 03/01/06 01:48:54 monty@mashka.mysql.fi +5 -1
    Indentation changes

  readline/terminal.c
    1.8 03/01/06 01:48:54 monty@mashka.mysql.fi +1 -1
    Removed compiler warnings

  mysys/my_vsnprintf.c
    1.15 03/01/06 01:48:54 monty@mashka.mysql.fi +4 -1
    Safety fix

  mysql-test/t/warnings.test
    1.5 03/01/06 01:48:54 monty@mashka.mysql.fi +8 -0
    Don't write warnings when initializing test

  mysql-test/t/variables.test
    1.14 03/01/06 01:48:54 monty@mashka.mysql.fi +4 -2
    Don't write warnings when initializing test

  mysql-test/t/varbinary.test
    1.7 03/01/06 01:48:54 monty@mashka.mysql.fi +5 -1
    Don't write warnings when initializing test

  mysql-test/t/user_var.test
    1.6 03/01/06 01:48:53 monty@mashka.mysql.fi +6 -2
    Don't write warnings when initializing test

  mysql-test/t/update.test
    1.8 03/01/06 01:48:53 monty@mashka.mysql.fi +4 -1
    Don't write warnings when initializing test

  mysql-test/t/union.test
    1.30 03/01/06 01:48:53 monty@mashka.mysql.fi +4 -1
    Don't write warnings when initializing test

  mysql-test/t/type_year.test
    1.5 03/01/06 01:48:53 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/type_uint.test
    1.4 03/01/06 01:48:53 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/type_timestamp.test
    1.8 03/01/06 01:48:53 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/type_time.test
    1.5 03/01/06 01:48:53 monty@mashka.mysql.fi +4 -0
    Don't write warnings when initializing test

  mysql-test/t/type_set.test
    1.3 03/01/06 01:48:53 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/type_ranges.test
    1.5 03/01/06 01:48:53 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/type_float.test
    1.6 03/01/06 01:48:53 monty@mashka.mysql.fi +8 -3
    Don't write warnings when initializing test

  mysql-test/t/type_enum.test
    1.6 03/01/06 01:48:53 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/type_decimal.test
    1.9 03/01/06 01:48:53 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/type_datetime.test
    1.8 03/01/06 01:48:53 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/type_date.test
    1.5 03/01/06 01:48:53 monty@mashka.mysql.fi +4 -1
    Don't write warnings when initializing test

  mysql-test/t/type_blob.test
    1.10 03/01/06 01:48:53 monty@mashka.mysql.fi +7 -0
    Don't write warnings when initializing test

  mysql-test/t/truncate.test
    1.9 03/01/06 01:48:53 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/temp_table.test
    1.6 03/01/06 01:48:53 monty@mashka.mysql.fi +3 -3
    Don't write warnings when initializing test

  mysql-test/t/tablelock.test
    1.5 03/01/06 01:48:53 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/symlink.test
    1.4 03/01/06 01:48:53 monty@mashka.mysql.fi +5 -1
    Don't write warnings when initializing test

  mysql-test/t/subselect.test
    1.44.1.1 03/01/06 01:48:53 monty@mashka.mysql.fi +25 -24
    Don't write warnings when initializing test

  mysql-test/t/status.test
    1.8 03/01/06 01:48:53 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/show_check.test
    1.19 03/01/06 01:48:53 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/select_safe.test
    1.4 03/01/06 01:48:53 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/select_found.test
    1.14 03/01/06 01:48:53 monty@mashka.mysql.fi +3 -1
    Don't write warnings when initializing test

  mysql-test/t/select.test
    1.17 03/01/06 01:48:53 monty@mashka.mysql.fi +4 -6
    Don't write warnings when initializing test

  mysql-test/t/sel000100.test
    1.10 03/01/06 01:48:53 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/sel000033.test
    1.7 03/01/06 01:48:53 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/rpl_temporary.test
    1.3 03/01/06 01:48:53 monty@mashka.mysql.fi +7 -5
    Don't write warnings when initializing test

  mysql-test/t/rpl_skip_error.test
    1.3 03/01/06 01:48:53 monty@mashka.mysql.fi +0 -1
    Don't write warnings when initializing test

  mysql-test/t/rpl_rotate_logs.test
    1.39 03/01/06 01:48:53 monty@mashka.mysql.fi +7 -4
    Don't write warnings when initializing test

  mysql-test/t/rpl_replicate_do.test
    1.16 03/01/06 01:48:53 monty@mashka.mysql.fi +4 -1
    Don't write warnings when initializing test

  mysql-test/t/rpl_redirect.test
    1.7 03/01/06 01:48:53 monty@mashka.mysql.fi +0 -1
    Don't write warnings when initializing test

  mysql-test/t/rpl_empty_master_crash.test
    1.4 03/01/06 01:48:53 monty@mashka.mysql.fi +2 -1
    Don't write warnings when initializing test

  mysql-test/t/rpl_alter.test
    1.3 03/01/06 01:48:53 monty@mashka.mysql.fi +14 -11
    Don't write warnings when initializing test

  mysql-test/t/rpl000018.test
    1.9 03/01/06 01:48:53 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/rpl000017.test
    1.10 03/01/06 01:48:53 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/rpl000015.test
    1.22 03/01/06 01:48:53 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/rpl000013.test
    1.16 03/01/06 01:48:53 monty@mashka.mysql.fi +5 -1
    Don't write warnings when initializing test

  mysql-test/t/rpl000012.test
    1.16 03/01/06 01:48:53 monty@mashka.mysql.fi +3 -5
    Don't write warnings when initializing test

  mysql-test/t/rpl000011.test
    1.14 03/01/06 01:48:53 monty@mashka.mysql.fi +1 -1
    Don't write warnings when initializing test

  mysql-test/t/rpl000010.test
    1.12 03/01/06 01:48:53 monty@mashka.mysql.fi +4 -6
    Don't write warnings when initializing test

  mysql-test/t/rpl000009.test
    1.15 03/01/06 01:48:53 monty@mashka.mysql.fi +38 -41
    Don't write warnings when initializing test

  mysql-test/t/rpl000009-slave.opt
    1.5 03/01/06 01:48:53 monty@mashka.mysql.fi +1 -1
    Don't write warnings when initializing test

  mysql-test/t/rpl000008.test
    1.13 03/01/06 01:48:53 monty@mashka.mysql.fi +24 -17
    Don't write warnings when initializing test

  mysql-test/t/rpl000008-slave.opt
    1.5 03/01/06 01:48:53 monty@mashka.mysql.fi +1 -1
    Don't write warnings when initializing test

  mysql-test/t/rpl000006.test
    1.13 03/01/06 01:48:53 monty@mashka.mysql.fi +0 -2
    Don't write warnings when initializing test

  mysql-test/t/rpl000005.test
    1.12 03/01/06 01:48:53 monty@mashka.mysql.fi +1 -1
    Don't write warnings when initializing test

  mysql-test/t/rpl000004.test
    1.12 03/01/06 01:48:53 monty@mashka.mysql.fi +1 -5
    Don't write warnings when initializing test

  mysql-test/t/rpl000002.test
    1.18 03/01/06 01:48:53 monty@mashka.mysql.fi +1 -2
    Don't write warnings when initializing test

  mysql-test/t/rpl000001.test
    1.32 03/01/06 01:48:53 monty@mashka.mysql.fi +1 -1
    Don't write warnings when initializing test

  mysql-test/t/row.test
    1.9 03/01/06 01:48:53 monty@mashka.mysql.fi +7 -2
    Don't write warnings when initializing test

  mysql-test/t/rollback.test
    1.5 03/01/06 01:48:53 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/replace.test
    1.8 03/01/06 01:48:53 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/repair.test
    1.2 03/01/06 01:48:53 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/rename.test
    1.6 03/01/06 01:48:53 monty@mashka.mysql.fi +5 -0
    Don't write warnings when initializing test

  mysql-test/t/range.test
    1.5 03/01/06 01:48:53 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/raid.test
    1.4 03/01/06 01:48:53 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/query_cache.test
    1.18 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/order_fill_sortbuf.test
    1.5 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/order_by.test
    1.9.1.1 03/01/06 01:48:52 monty@mashka.mysql.fi +2 -1
    Don't write warnings when initializing test

  mysql-test/t/olap.test
    1.5 03/01/06 01:48:52 monty@mashka.mysql.fi +13 -9
    Don't write warnings when initializing test

  mysql-test/t/odbc.test
    1.5 03/01/06 01:48:52 monty@mashka.mysql.fi +5 -1
    Don't write warnings when initializing test

  mysql-test/t/null_key.test
    1.7 03/01/06 01:48:52 monty@mashka.mysql.fi +4 -2
    Don't write warnings when initializing test

  mysql-test/t/null.test
    1.7 03/01/06 01:48:52 monty@mashka.mysql.fi +5 -1
    Don't write warnings when initializing test

  mysql-test/t/myisam.test
    1.12 03/01/06 01:48:52 monty@mashka.mysql.fi +4 -3
    Don't write warnings when initializing test

  mysql-test/t/multi_update.test
    1.22 03/01/06 01:48:52 monty@mashka.mysql.fi +7 -5
    Don't write warnings when initializing test

  mysql-test/t/merge.test
    1.20 03/01/06 01:48:52 monty@mashka.mysql.fi +9 -9
    Don't write warnings when initializing test
    cleaned up test

  mysql-test/t/lowercase_table.test
    1.2 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/lock_multi.test
    1.4 03/01/06 01:48:52 monty@mashka.mysql.fi +4 -1
    Don't write warnings when initializing test

  mysql-test/t/lock.test
    1.8 03/01/06 01:48:52 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/limit.test
    1.6 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/kill.test
    1.6 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/keywords.test
    1.5 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/key_primary.test
    1.5 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/key_diff.test
    1.5 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/key.test
    1.7 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -1
    Don't write warnings when initializing test

  mysql-test/t/join_outer.test
    1.7 03/01/06 01:48:52 monty@mashka.mysql.fi +2 -1
    Don't write warnings when initializing test

  mysql-test/t/join_crash.test
    1.4 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/join.test
    1.14 03/01/06 01:48:52 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/isam.test
    1.6 03/01/06 01:48:52 monty@mashka.mysql.fi +10 -4
    Don't write warnings when initializing test
    cleaned up test

  mysql-test/t/insert_update.test
    1.4 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/insert_select.test
    1.6 03/01/06 01:48:52 monty@mashka.mysql.fi +12 -9
    Don't write warnings when initializing test
    Changed to use standard table names

  mysql-test/t/insert.test
    1.9 03/01/06 01:48:52 monty@mashka.mysql.fi +10 -5
    Don't write warnings when initializing test
    cleaned up test.
    Changed to use standard database and table names

  mysql-test/t/ins000001.test
    1.8 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/innodb_handler.test
    1.3 03/01/06 01:48:52 monty@mashka.mysql.fi +4 -1
    Don't write warnings when initializing test

  mysql-test/t/innodb_cache.test
    1.5 03/01/06 01:48:52 monty@mashka.mysql.fi +5 -1
    Don't write warnings when initializing test

  mysql-test/t/innodb.test
    1.29 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -1
    Don't write warnings when initializing test

  mysql-test/t/innodb-deadlock.test
    1.3 03/01/06 01:48:52 monty@mashka.mysql.fi +4 -2
    Don't write warnings when initializing test

  mysql-test/t/heap_hash.test
    1.2 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/heap_btree.test
    1.6 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/heap_auto_increment.test
    1.2 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/heap.test
    1.9 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/having.test
    1.6 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/handler.test
    1.8 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/group_by.test
    1.17 03/01/06 01:48:52 monty@mashka.mysql.fi +10 -3
    Don't write warnings when initializing test
    Cleaned up test

  mysql-test/t/grant_cache.test
    1.3 03/01/06 01:48:52 monty@mashka.mysql.fi +5 -0
    Don't write warnings when initializing test

  mysql-test/t/gcc296.test
    1.2 03/01/06 01:48:52 monty@mashka.mysql.fi +11 -8
    Don't write warnings when initializing test
    Cleaned up test

  mysql-test/t/func_timestamp.test
    1.4 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/func_time.test
    1.16 03/01/06 01:48:52 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/func_str.test
    1.19 03/01/06 01:48:52 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/func_set.test
    1.4 03/01/06 01:48:52 monty@mashka.mysql.fi +18 -0
    Don't write warnings when initializing test
    Merged test with other tests

  mysql-test/t/func_regexp.test
    1.5 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/func_like.test
    1.7 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/func_isnull.test
    1.2 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/func_in.test
    1.6 03/01/06 01:48:52 monty@mashka.mysql.fi +5 -1
    Don't write warnings when initializing test

  mysql-test/t/func_if.test
    1.3 03/01/06 01:48:52 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/func_group.test
    1.6 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/func_equal.test
    1.5 03/01/06 01:48:52 monty@mashka.mysql.fi +5 -1
    Don't write warnings when initializing test

  mysql-test/t/func_encrypt.test
    1.4 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/func_date_add.test
    1.4 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/func_concat.test
    1.2 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/fulltext_update.test
    1.4 03/01/06 01:48:52 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/fulltext_order_by.test
    1.12 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -1
    Don't write warnings when initializing test

  mysql-test/t/fulltext_multi.test
    1.7 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -1
    Don't write warnings when initializing test

  mysql-test/t/fulltext_left_join.test
    1.7 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/fulltext_distinct.test
    1.4 03/01/06 01:48:52 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/fulltext_cache.test
    1.6 03/01/06 01:48:51 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/fulltext.test
    1.35 03/01/06 01:48:51 monty@mashka.mysql.fi +2 -1
    Don't write warnings when initializing test

  mysql-test/t/foreign_key.test
    1.4 03/01/06 01:48:51 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/flush.test
    1.13 03/01/06 01:48:51 monty@mashka.mysql.fi +6 -3
    Don't write warnings when initializing test

  mysql-test/t/explain.test
    1.4 03/01/06 01:48:51 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/err000001.test
    1.9 03/01/06 01:48:51 monty@mashka.mysql.fi +22 -10
    Don't write warnings when initializing test
    Cleaned up test

  mysql-test/t/empty_table.test
    1.4 03/01/06 01:48:51 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/drop.test
    1.11 03/01/06 01:48:51 monty@mashka.mysql.fi +4 -1
    Don't write warnings when initializing test

  mysql-test/t/distinct.test
    1.12 03/01/06 01:48:51 monty@mashka.mysql.fi +4 -4
    Don't write warnings when initializing test
    Cleaned up test

  mysql-test/t/dirty_close.test
    1.5 03/01/06 01:48:51 monty@mashka.mysql.fi +4 -0
    Don't write warnings when initializing test

  mysql-test/t/derived.test
    1.17 03/01/06 01:48:51 monty@mashka.mysql.fi +7 -3
    Don't write warnings when initializing test
    Cleaned up test

  mysql-test/t/delete.test
    1.9 03/01/06 01:48:51 monty@mashka.mysql.fi +3 -2
    Don't write warnings when initializing test
    Cleaned up test

  mysql-test/t/delayed.test
    1.7 03/01/06 01:48:51 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/ctype_many.test
    1.6.1.1 03/01/06 01:48:51 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/ctype_latin1_de.test
    1.5 03/01/06 01:48:51 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/create.test
    1.19 03/01/06 01:48:51 monty@mashka.mysql.fi +10 -5
    Don't write warnings when initializing test
    Cleaned up test

  mysql-test/t/count_distinct2.test
    1.8 03/01/06 01:48:51 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/count_distinct.test
    1.5 03/01/06 01:48:51 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/constraints.test
    1.2 03/01/06 01:48:51 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/connect.test
    1.3 03/01/06 01:48:51 monty@mashka.mysql.fi +0 -1
    Removed empty line

  mysql-test/t/compare.test
    1.5 03/01/06 01:48:51 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/check.test
    1.7 03/01/06 01:48:51 monty@mashka.mysql.fi +4 -1
    Don't write warnings when initializing test

  mysql-test/t/case.test
    1.8 03/01/06 01:48:51 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/bulk_replace.test
    1.3 03/01/06 01:48:51 monty@mashka.mysql.fi +2 -3
    Don't write warnings when initializing test

  mysql-test/t/bool.test
    1.3 03/01/06 01:48:51 monty@mashka.mysql.fi +7 -7
    Don't write warnings when initializing test
    Changed to use standard table names

  mysql-test/t/binary.test
    1.6 03/01/06 01:48:51 monty@mashka.mysql.fi +3 -1
    Don't write warnings when initializing test

  mysql-test/t/bigint.test
    1.13 03/01/06 01:48:51 monty@mashka.mysql.fi +7 -1
    Don't write warnings when initializing test

  mysql-test/t/bench_count_distinct.test
    1.6 03/01/06 01:48:51 monty@mashka.mysql.fi +6 -0
    Don't write warnings when initializing test

  mysql-test/t/bdb_cache.test
    1.3 03/01/06 01:48:51 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/bdb.test
    1.28 03/01/06 01:48:51 monty@mashka.mysql.fi +2 -9
    Don't write warnings when initializing test
    cleaned up test

  mysql-test/t/bdb-deadlock.test
    1.4 03/01/06 01:48:51 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/bdb-crash.test
    1.7 03/01/06 01:48:51 monty@mashka.mysql.fi +2 -0
    Don't write warnings when initializing test

  mysql-test/t/bdb-alter-table-1.test
    1.3 03/01/06 01:48:51 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/t/backup.test
    1.10 03/01/06 01:48:51 monty@mashka.mysql.fi +3 -1
    Don't write warnings when initializing test

  mysql-test/t/auto_increment.test
    1.6 03/01/06 01:48:51 monty@mashka.mysql.fi +3 -1
    Don't write warnings when initializing test

  mysql-test/t/analyse.test
    1.7 03/01/06 01:48:51 monty@mashka.mysql.fi +3 -1
    Don't write warnings when initializing test

  mysql-test/t/alter_table.test
    1.13 03/01/06 01:48:51 monty@mashka.mysql.fi +3 -1
    Don't write warnings when initializing test

  mysql-test/t/alias.test
    1.3 03/01/06 01:48:51 monty@mashka.mysql.fi +3 -0
    Don't write warnings when initializing test

  mysql-test/r/warnings.result
    1.4 03/01/06 01:48:51 monty@mashka.mysql.fi +5 -0
    Updated results

  mysql-test/r/variables.result
    1.18 03/01/06 01:48:51 monty@mashka.mysql.fi +1 -2
    Updated results

  mysql-test/r/varbinary.result
    1.10 03/01/06 01:48:51 monty@mashka.mysql.fi +1 -1
    Updated results

  mysql-test/r/user_var.result
    1.9 03/01/06 01:48:51 monty@mashka.mysql.fi +1 -1
    Updated results

  mysql-test/r/update.result
    1.10 03/01/06 01:48:51 monty@mashka.mysql.fi +1 -1
    Updated results

  mysql-test/r/union.result
    1.27 03/01/06 01:48:51 monty@mashka.mysql.fi +0 -1
    Updated results

  mysql-test/r/type_float.result
    1.10 03/01/06 01:48:51 monty@mashka.mysql.fi +1 -1
    Updated results

  mysql-test/r/type_date.result
    1.7 03/01/06 01:48:51 monty@mashka.mysql.fi +1 -1
    Updated results

  mysql-test/r/temp_table.result
    1.7 03/01/06 01:48:51 monty@mashka.mysql.fi +0 -2
    Updated results

  mysql-test/r/subselect.result
    1.51.1.1 03/01/06 01:48:51 monty@mashka.mysql.fi +29 -33
    Updated results

  mysql-test/r/select.result
    1.22 03/01/06 01:48:51 monty@mashka.mysql.fi +1 -4
    Updated results

  mysql-test/r/rpl_temporary.result
    1.3 03/01/06 01:48:51 monty@mashka.mysql.fi +3 -4
    Updated results

  mysql-test/r/rpl_skip_error.result
    1.5 03/01/06 01:48:51 monty@mashka.mysql.fi +0 -1
    Updated results

  mysql-test/r/rpl_rotate_logs.result
    1.37 03/01/06 01:48:51 monty@mashka.mysql.fi +0 -2
    Updated results

  mysql-test/r/rpl_replicate_do.result
    1.12 03/01/06 01:48:51 monty@mashka.mysql.fi +1 -1
    Updated results

  mysql-test/r/rpl_redirect.result
    1.8 03/01/06 01:48:51 monty@mashka.mysql.fi +0 -1
    Updated results

  mysql-test/r/rpl_empty_master_crash.result
    1.6 03/01/06 01:48:51 monty@mashka.mysql.fi +0 -1
    Updated results

  mysql-test/r/rpl_alter.result
    1.5 03/01/06 01:48:51 monty@mashka.mysql.fi +11 -11
    Updated results

  mysql-test/r/rpl000013.result
    1.12 03/01/06 01:48:51 monty@mashka.mysql.fi +2 -1
    Updated results

  mysql-test/r/rpl000012.result
    1.13 03/01/06 01:48:51 monty@mashka.mysql.fi +5 -5
    Updated results

  mysql-test/r/rpl000011.result
    1.10 03/01/06 01:48:51 monty@mashka.mysql.fi +0 -1
    Updated results

  mysql-test/r/rpl000010.result
    1.10 03/01/06 01:48:51 monty@mashka.mysql.fi +0 -2
    Updated results

  mysql-test/r/rpl000009.result
    1.11 03/01/06 01:48:51 monty@mashka.mysql.fi +51 -53
    Updated results

  mysql-test/r/rpl000008.result
    1.10 03/01/06 01:48:51 monty@mashka.mysql.fi +13 -15
    Updated results

  mysql-test/r/rpl000006.result
    1.12 03/01/06 01:48:51 monty@mashka.mysql.fi +0 -2
    Updated results

  mysql-test/r/rpl000005.result
    1.11 03/01/06 01:48:50 monty@mashka.mysql.fi +0 -1
    Updated results

  mysql-test/r/rpl000004.result
    1.6 03/01/06 01:48:50 monty@mashka.mysql.fi +0 -5
    Updated results

  mysql-test/r/rpl000002.result
    1.17 03/01/06 01:48:50 monty@mashka.mysql.fi +0 -2
    Updated results

  mysql-test/r/rpl000001.result
    1.21 03/01/06 01:48:50 monty@mashka.mysql.fi +0 -1
    Updated results

  mysql-test/r/row.result
    1.10 03/01/06 01:48:50 monty@mashka.mysql.fi +1 -2
    Updated results

  mysql-test/r/rename.result
    1.6 03/01/06 01:48:50 monty@mashka.mysql.fi +2 -0
    Updated results

  mysql-test/r/query_cache.result
    1.17 03/01/06 01:48:50 monty@mashka.mysql.fi +1 -0
    Updated results

  mysql-test/r/order_by.result
    1.15 03/01/06 01:48:50 monty@mashka.mysql.fi +0 -1
    Updated results

  mysql-test/r/olap.result
    1.7 03/01/06 01:48:50 monty@mashka.mysql.fi +9 -9
    Updated results

  mysql-test/r/odbc.result
    1.8 03/01/06 01:48:50 monty@mashka.mysql.fi +1 -1
    Updated results

  mysql-test/r/null_key.result
    1.17 03/01/06 01:48:50 monty@mashka.mysql.fi +1 -2
    Updated results

  mysql-test/r/null.result
    1.10 03/01/06 01:48:50 monty@mashka.mysql.fi +1 -1
    Updated results

  mysql-test/r/myisam.result
    1.16 03/01/06 01:48:50 monty@mashka.mysql.fi +1 -3
    Updated results

  mysql-test/r/multi_update.result
    1.20 03/01/06 01:48:50 monty@mashka.mysql.fi +3 -4
    Updated results

  mysql-test/r/merge.result
    1.19 03/01/06 01:48:50 monty@mashka.mysql.fi +6 -8
    Updated results

  mysql-test/r/key.result
    1.8 03/01/06 01:48:50 monty@mashka.mysql.fi +0 -1
    Updated results

  mysql-test/r/join_outer.result
    1.15 03/01/06 01:48:50 monty@mashka.mysql.fi +0 -1
    Updated results

  mysql-test/r/isam.result
    1.10 03/01/06 01:48:50 monty@mashka.mysql.fi +2 -0
    Updated results

  mysql-test/r/insert_select.result
    1.8 03/01/06 01:48:50 monty@mashka.mysql.fi +8 -9
    Updated results

  mysql-test/r/insert.result
    1.10 03/01/06 01:48:50 monty@mashka.mysql.fi +5 -5
    Updated results

  mysql-test/r/innodb_handler.result
    1.3 03/01/06 01:48:50 monty@mashka.mysql.fi +1 -1
    Updated results

  mysql-test/r/innodb_cache.result
    1.2.1.2 03/01/06 01:48:50 monty@mashka.mysql.fi +1 -1
    Updated results

  mysql-test/r/innodb.result
    1.49 03/01/06 01:48:50 monty@mashka.mysql.fi +0 -1
    Updated results

  mysql-test/r/innodb-deadlock.result
    1.3 03/01/06 01:48:50 monty@mashka.mysql.fi +1 -2
    Updated results

  mysql-test/r/group_by.result
    1.22 03/01/06 01:48:50 monty@mashka.mysql.fi +2 -3
    Updated results

  mysql-test/r/gcc296.result
    1.3 03/01/06 01:48:50 monty@mashka.mysql.fi +8 -8
    Updated results

  mysql-test/r/func_set.result
    1.5 03/01/06 01:48:50 monty@mashka.mysql.fi +17 -0
    Updated results

  mysql-test/r/func_in.result
    1.7 03/01/06 01:48:50 monty@mashka.mysql.fi +1 -1
    Updated results

  mysql-test/r/func_equal.result
    1.7 03/01/06 01:48:50 monty@mashka.mysql.fi +1 -1
    Updated results

  mysql-test/r/fulltext_order_by.result
    1.11 03/01/06 01:48:50 monty@mashka.mysql.fi +0 -1
    Updated results

  mysql-test/r/fulltext_multi.result
    1.9 03/01/06 01:48:50 monty@mashka.mysql.fi +0 -1
    Updated results

  mysql-test/r/fulltext.result
    1.36 03/01/06 01:48:50 monty@mashka.mysql.fi +0 -1
    Updated results

  mysql-test/r/flush.result
    1.9 03/01/06 01:48:50 monty@mashka.mysql.fi +2 -3
    Updated results

  mysql-test/r/drop.result
    1.11 03/01/06 01:48:50 monty@mashka.mysql.fi +4 -1
    Updated results

  mysql-test/r/distinct.result
    1.21 03/01/06 01:48:50 monty@mashka.mysql.fi +2 -3
    Updated results

  mysql-test/r/derived.result
    1.18 03/01/06 01:48:50 monty@mashka.mysql.fi +3 -3
    Updated results

  mysql-test/r/delete.result
    1.8 03/01/06 01:48:50 monty@mashka.mysql.fi +0 -1
    Updated results

  mysql-test/r/create.result
    1.24 03/01/06 01:48:50 monty@mashka.mysql.fi +14 -2
    Updated results

  mysql-test/r/bool.result
    1.3 03/01/06 01:48:50 monty@mashka.mysql.fi +5 -6
    Updated results

  mysql-test/r/bigint.result
    1.15 03/01/06 01:48:50 monty@mashka.mysql.fi +1 -1
    Updated results

  mysql-test/r/bdb.result
    1.25 03/01/06 01:48:50 monty@mashka.mysql.fi +0 -9
    Updated results

  mysql-test/r/backup.result
    1.8 03/01/06 01:48:50 monty@mashka.mysql.fi +1 -1
    Updated results

  mysql-test/include/master-slave.inc
    1.10 03/01/06 01:48:50 monty@mashka.mysql.fi +4 -0
    Don't write warnings on init

  configure.in
    1.201.1.9 03/01/06 01:48:50 monty@mashka.mysql.fi +1 -1
    changed version number of shared libraries

  client/mysqltest.c
    1.85.1.3 03/01/06 01:48:50 monty@mashka.mysql.fi +50 -29
    Added test options:
    --enable_warnings
    --disable_warnings
    --enable_info
    --disable_info

  client/mysql.cc
    1.108.1.4 03/01/06 01:48:50 monty@mashka.mysql.fi +27 -25
    Don't yet print information about SQL help

ChangeSet
  1.1403.38.1 03/01/05 23:39:33 monty@hundin.mysql.fi +2 -0
  Merge work:/home/bk/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1

  sql/sql_yacc.yy
    1.203.11.1 03/01/05 23:39:29 monty@hundin.mysql.fi +0 -0
    Auto merged

  sql/sql_lex.cc
    1.62 03/01/05 23:39:28 monty@hundin.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.676.266.6 03/01/05 22:15:03 heikki@hundin.mysql.fi +2 -0
  log0log.c:
    Backport bugfix from 4.0: combined log file size >= 2 GB could cause log to be written in wrong place
  btr0pcur.c:
    Backport bugfix from 4.0: index cursor restoration could theoretically fail

  innobase/log/log0log.c
    1.9.1.8 03/01/05 22:14:37 heikki@hundin.mysql.fi +21 -11
    Backport bugfix from 4.0: combined log file size >= 2 GB could cause log to be written in wrong place

  innobase/btr/btr0pcur.c
    1.3.1.1 03/01/05 22:13:21 heikki@hundin.mysql.fi +6 -0
    Backport bugfix from 4.0: index cursor restoration could theoretically fail

ChangeSet
  1.1346.46.86 03/01/05 21:58:06 heikki@hundin.mysql.fi +2 -0
  btr0pcur.c:
    Fix bug: an index cursor can theoretically be restored in a wrong place
  log0log.c:
    Fix bug: if combined log file size is >= 2 GB in a 32-bit computer InnoDB can write log to a wrong position

  innobase/btr/btr0pcur.c
    1.5 03/01/05 21:57:48 heikki@hundin.mysql.fi +5 -0
    Fix bug: an index cursor can theoretically be restored in a wrong place

  innobase/log/log0log.c
    1.20 03/01/05 21:56:41 heikki@hundin.mysql.fi +21 -11
    Fix bug: if combined log file size is >= 2 GB in a 32-bit computer InnoDB can write log to a wrong position

  BitKeeper/deleted/.del-rpl000003.test~b7cfc4c5576fbafd
    1.14 03/01/05 20:57:17 monty@mashka.mysql.fi +2 -2
    Delete: mysql-test/t/rpl000003.test

  BitKeeper/deleted/.del-rpl000003.result~68d6ee00beaa011
    1.11 03/01/05 20:57:08 monty@mashka.mysql.fi +0 -0
    Delete: mysql-test/r/rpl000003.result

ChangeSet
  1.1346.46.85 03/01/05 20:18:49 monty@mashka.mysql.fi +19 -0
  A lot of portability fixes.
  Added rename table for BDB. This fixes a bug in ALTER TABLE with BDB tables.

  tools/mysqlmanager.c
    1.30.1.5 03/01/05 20:18:47 monty@mashka.mysql.fi +1 -1
    Added missing 'static'

  sql/table.cc
    1.46.1.14 03/01/05 20:18:47 monty@mashka.mysql.fi +1 -1
    Added reinterpret cast to avoid some warnings.

  sql/sql_union.cc
    1.22.1.17 03/01/05 20:18:47 monty@mashka.mysql.fi +1 -1
    Added reinterpret cast to avoid some warnings.

  sql/sql_parse.cc
    1.218.1.67 03/01/05 20:18:47 monty@mashka.mysql.fi +7 -4
    Added reinterpret cast to avoid some warnings.
    Removed usage of strnlen() as this gave portability problems.

  sql/mini_client.cc
    1.48.1.2 03/01/05 20:18:47 monty@mashka.mysql.fi +8 -3
    Added reinterpret cast to avoid some warnings.

  sql/ha_berkeley.h
    1.50.2.1 03/01/05 20:18:47 monty@mashka.mysql.fi +1 -0
    Added rename table. This fixes a bug in ALTER TABLE with BDB tables.

  sql/ha_berkeley.cc
    1.105.1.4 03/01/05 20:18:47 monty@mashka.mysql.fi +22 -2
    Added rename table. This fixes a bug in ALTER TABLE with BDB tables.
    Fixed compilation problem on OSF1

  mysys/my_getopt.c
    1.32 03/01/05 20:18:47 monty@mashka.mysql.fi +2 -2
    Added missing 'static'

  myisam/mi_test1.c
    1.9.1.4 03/01/05 20:18:47 monty@mashka.mysql.fi +1 -1
    Added missing 'static'

  myisam/mi_check.c
    1.86.1.24 03/01/05 20:18:47 monty@mashka.mysql.fi +1 -1
    Added missing 'static'

  innobase/ut/ut0ut.c
    1.12 03/01/05 20:18:47 monty@mashka.mysql.fi +0 -1
    Removed compiler warning (with gcc)

  innobase/trx/trx0trx.c
    1.20 03/01/05 20:18:47 monty@mashka.mysql.fi +1 -1
    Removed compiler warning (on Hpux11)

  innobase/trx/trx0sys.c
    1.13 03/01/05 20:18:47 monty@mashka.mysql.fi +3 -3
    Removed compiler warning (on Hpux11)

  innobase/os/os0file.c
    1.44 03/01/05 20:18:47 monty@mashka.mysql.fi +1 -1
    Removed compiler warning (on Hpux11)

  innobase/include/univ.i
    1.26 03/01/05 20:18:47 monty@mashka.mysql.fi +1 -0
    Removed compiler warning (on Hpux11)

  configure.in
    1.191.1.58 03/01/05 20:18:47 monty@mashka.mysql.fi +4 -1
    Don't use -O3 as compiler option with aCC

  acinclude.m4
    1.77.1.3 03/01/05 20:18:47 monty@mashka.mysql.fi +1 -1
    Fixed call to wrong function

  Build-tools/Do-compile
    1.69 03/01/05 20:18:47 monty@mashka.mysql.fi +42 -11
    Added options --no-mysqltest and --no-benchmarks
    Log time before each stage
    Removed warnings on some OS (at least hpux11)

  BUILD/SETUP.sh
    1.17.1.5 03/01/05 20:18:47 monty@mashka.mysql.fi +1 -1
    Enabled uninitalized warnings for debug builds.

ChangeSet
  1.1403.37.27 03/01/05 18:18:45 bar@bar.mysql.r18.ru +1 -0
  Index.xml:
    fixes

  sql/share/charsets/Index.xml
    1.9 03/01/05 18:18:32 bar@bar.mysql.r18.ru +1 -2
    fixes

ChangeSet
  1.1403.37.26 03/01/05 17:57:23 bar@bar.mysql.r18.ru +1 -0
  Index.xml:
    typo fix

  sql/share/charsets/Index.xml
    1.8 03/01/05 17:57:12 bar@bar.mysql.r18.ru +1 -1
    typo fix

ChangeSet
  1.1403.34.5 03/01/05 17:56:11 hf@deer.mysql.r18.ru +2 -0
  SCRUM
  additions about DEFAULT in UPDATE and SELECT

  sql/item.h
    1.41.10.3 03/01/05 17:56:07 hf@deer.mysql.r18.ru +6 -0
    Some functions added with Sanja's suggestions

  sql/item.cc
    1.27.10.19 03/01/05 17:56:07 hf@deer.mysql.r18.ru +6 -0
    Item_default_value::print added

ChangeSet
  1.1403.37.25 03/01/05 17:56:02 bar@bar.mysql.r18.ru +1 -0
  charset.c:
    debug code has been removed
    ,

  mysys/charset.c
    1.54 03/01/05 17:55:40 bar@bar.mysql.r18.ru +0 -2
    debug code has been removed
    ,

ChangeSet
  1.1403.37.24 03/01/05 17:48:10 bar@bar.mysql.r18.ru +52 -0
  latin5.xml, cp1251.xml:
    Comments
  Index.xml:
    Languages for cp1256 have been added
  .del-win1251ukr.conf~dc3540b3635ed226:
    Delete: sql/share/charsets/win1251ukr.conf
  .del-win1251.conf~b6bb6681f02917b6:
    Delete: sql/share/charsets/win1251.conf
  .del-win1250.conf~ea4cecf79a9a2b57:
    Delete: sql/share/charsets/win1250.conf
  .del-usa7.conf~7907e7e49aad1374:
    Delete: sql/share/charsets/usa7.conf
  .del-swe7.conf~adc4138b9b597e76:
    Delete: sql/share/charsets/swe7.conf
  .del-pclatin2.conf~2e905fa7381fd785:
    Delete: sql/share/charsets/pclatin2.conf
  .del-macromancsas.conf~cb7d2383e8e4105d:
    Delete: sql/share/charsets/macromancsas.conf
  .del-macromancias.conf~c3061c0b22a0a3cb:
    Delete: sql/share/charsets/macromancias.conf
  .del-macromanciai.conf~ea8974f393a79edd:
    Delete: sql/share/charsets/macromanciai.conf
  .del-macromanbin.conf~b9dcdb2797fbae67:
    Delete: sql/share/charsets/macromanbin.conf
  .del-macroman.conf~ee6a39463223b952:
    Delete: sql/share/charsets/macroman.conf
  .del-maccecsas.conf~5f1b2bfecf71fa0:
    Delete: sql/share/charsets/maccecsas.conf
  .del-maccecias.conf~8a71c3a534e70fdd:
    Delete: sql/share/charsets/maccecias.conf
  .del-macceciai.conf~a4b13482b0d7a5c5:
    Delete: sql/share/charsets/macceciai.conf
  .del-maccebin.conf~b2b9eab235e1a1ae:
    Delete: sql/share/charsets/maccebin.conf
  .del-macce.conf~aa8efe8ce8393c31:
    Delete: sql/share/charsets/macce.conf
  .del-latvian1.conf~6c7c5b2a4c896567:
    Delete: sql/share/charsets/latvian1.conf
  .del-latvian.conf~a7f7110785a5ff4d:
    Delete: sql/share/charsets/latvian.conf
  .del-latin5.conf~be23bc5cf8489338:
    Delete: sql/share/charsets/latin5.conf
  .del-latin2.conf~c45310f353a74d9:
    Delete: sql/share/charsets/latin2.conf
  .del-latin1csas.conf~e8c5219976bde66b:
    Delete: sql/share/charsets/latin1csas.conf
  .del-latin1cias.conf~85465c4ba30e76d8:
    Delete: sql/share/charsets/latin1cias.conf
  .del-latin1bin.conf~76f38a539b7dfa9f:
    Delete: sql/share/charsets/latin1bin.conf
  .del-latin1.conf~b3d65fc96f2ce181:
    Delete: sql/share/charsets/latin1.conf
  .del-koi8_ukr.conf~ce11d6ff8ffc4434:
    Delete: sql/share/charsets/koi8_ukr.conf
  .del-koi8_ru.conf~334df7402af862c8:
    Delete: sql/share/charsets/koi8_ru.conf
  .del-keybcs2.conf~db3e18f91b2075be:
    Delete: sql/share/charsets/keybcs2.conf
  .del-hungarian.conf~3b343f4ff7919cd:
    Delete: sql/share/charsets/hungarian.conf
  .del-hp8.conf~4620f2afc37ae747:
    Delete: sql/share/charsets/hp8.conf
  .del-hebrew.conf~94ba65846b69f5b7:
    Delete: sql/share/charsets/hebrew.conf
  .del-greek.conf~68f2c5692866226d:
    Delete: sql/share/charsets/greek.conf
  .del-german1.conf~765a04d69683cefe:
    Delete: sql/share/charsets/german1.conf
  .del-estonia.conf~e78f662de664f3ac:
    Delete: sql/share/charsets/estonia.conf
  .del-dos.conf~5a4357d3335ba812:
    Delete: sql/share/charsets/dos.conf
  .del-dec8.conf~d882c1e5e4566b87:
    Delete: sql/share/charsets/dec8.conf
  .del-croat.conf~fb40a3e77604268e:
    Delete: sql/share/charsets/croat.conf
  .del-danish.conf~90ffe76b3fa5dd46:
    Delete: sql/share/charsets/danish.conf
  .del-cp866.conf~a70093f2be0a509:
    Delete: sql/share/charsets/cp866.conf
  .del-cp1257ltlvcsas.conf~2e55f43377962ede:
    Delete: sql/share/charsets/cp1257ltlvcsas.conf
  .del-cp1257ltlvcias.conf~883d366fc6aa24a1:
    Delete: sql/share/charsets/cp1257ltlvcias.conf
  .del-cp1257ltlvciai.conf~f47460f62dace37e:
    Delete: sql/share/charsets/cp1257ltlvciai.conf
  .del-cp1257bin.conf~a34eda136d4d93b0:
    Delete: sql/share/charsets/cp1257bin.conf
  .del-cp1257.conf~a47298b64ba2dfc1:
    Delete: sql/share/charsets/cp1257.conf
  .del-cp1256.conf~92e4a7b31184387b:
    Delete: sql/share/charsets/cp1256.conf
  .del-cp1251csas.conf~9c4b69407a10a136:
    Delete: sql/share/charsets/cp1251csas.conf
  .del-cp1251cias.conf~6e9b6b7ebafd497c:
    Delete: sql/share/charsets/cp1251cias.conf
  .del-cp1251bin.conf~a7bf1f052611ca00:
    Delete: sql/share/charsets/cp1251bin.conf
  .del-cp1251.conf~dfafe742142570:
    Delete: sql/share/charsets/cp1251.conf
  .del-armscii8.conf~e612e5fb63e34cd4:
    Delete: sql/share/charsets/armscii8.conf

  sql/share/charsets/latin5.xml
    1.2 03/01/05 17:48:01 bar@bar.mysql.r18.ru +5 -0
    Comments

  sql/share/charsets/cp1251.xml
    1.3 03/01/05 17:48:00 bar@bar.mysql.r18.ru +7 -0
    Comments

  sql/share/charsets/Index.xml
    1.7 03/01/05 17:48:00 bar@bar.mysql.r18.ru +7 -1
    Languages for cp1256 have been added

  BitKeeper/deleted/.del-win1251ukr.conf~dc3540b3635ed226
    1.6 03/01/05 17:46:04 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/win1251ukr.conf

  BitKeeper/deleted/.del-win1251.conf~b6bb6681f02917b6
    1.9 03/01/05 17:45:58 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/win1251.conf

  BitKeeper/deleted/.del-win1250.conf~ea4cecf79a9a2b57
    1.5 03/01/05 17:45:53 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/win1250.conf

  BitKeeper/deleted/.del-usa7.conf~7907e7e49aad1374
    1.5 03/01/05 17:45:48 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/usa7.conf

  BitKeeper/deleted/.del-swe7.conf~adc4138b9b597e76
    1.5 03/01/05 17:45:43 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/swe7.conf

  BitKeeper/deleted/.del-pclatin2.conf~2e905fa7381fd785
    1.2 03/01/05 17:45:39 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/pclatin2.conf

  BitKeeper/deleted/.del-macromancsas.conf~cb7d2383e8e4105d
    1.2 03/01/05 17:45:35 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/macromancsas.conf

  BitKeeper/deleted/.del-macromancias.conf~c3061c0b22a0a3cb
    1.2 03/01/05 17:45:30 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/macromancias.conf

  BitKeeper/deleted/.del-macromanciai.conf~ea8974f393a79edd
    1.2 03/01/05 17:45:26 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/macromanciai.conf

  BitKeeper/deleted/.del-macromanbin.conf~b9dcdb2797fbae67
    1.2 03/01/05 17:45:22 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/macromanbin.conf

  BitKeeper/deleted/.del-macroman.conf~ee6a39463223b952
    1.2 03/01/05 17:45:12 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/macroman.conf

  BitKeeper/deleted/.del-maccecsas.conf~5f1b2bfecf71fa0
    1.2 03/01/05 17:45:08 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/maccecsas.conf

  BitKeeper/deleted/.del-maccecias.conf~8a71c3a534e70fdd
    1.2 03/01/05 17:45:05 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/maccecias.conf

  BitKeeper/deleted/.del-macceciai.conf~a4b13482b0d7a5c5
    1.2 03/01/05 17:45:02 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/macceciai.conf

  BitKeeper/deleted/.del-maccebin.conf~b2b9eab235e1a1ae
    1.2 03/01/05 17:44:58 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/maccebin.conf

  BitKeeper/deleted/.del-macce.conf~aa8efe8ce8393c31
    1.2 03/01/05 17:44:50 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/macce.conf

  BitKeeper/deleted/.del-latvian1.conf~6c7c5b2a4c896567
    1.2 03/01/05 17:44:45 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/latvian1.conf

  BitKeeper/deleted/.del-latvian.conf~a7f7110785a5ff4d
    1.2 03/01/05 17:44:42 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/latvian.conf

  BitKeeper/deleted/.del-latin5.conf~be23bc5cf8489338
    1.3 03/01/05 17:44:28 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/latin5.conf

  BitKeeper/deleted/.del-latin2.conf~c45310f353a74d9
    1.4 03/01/05 17:43:47 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/latin2.conf

  BitKeeper/deleted/.del-latin1csas.conf~e8c5219976bde66b
    1.2 03/01/05 17:43:40 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/latin1csas.conf

  BitKeeper/deleted/.del-latin1cias.conf~85465c4ba30e76d8
    1.2 03/01/05 17:43:37 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/latin1cias.conf

  BitKeeper/deleted/.del-latin1bin.conf~76f38a539b7dfa9f
    1.2 03/01/05 17:43:31 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/latin1bin.conf

  BitKeeper/deleted/.del-latin1.conf~b3d65fc96f2ce181
    1.6 03/01/05 17:43:26 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/latin1.conf

  BitKeeper/deleted/.del-koi8_ukr.conf~ce11d6ff8ffc4434
    1.4 03/01/05 17:43:21 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/koi8_ukr.conf

  BitKeeper/deleted/.del-koi8_ru.conf~334df7402af862c8
    1.4 03/01/05 17:43:18 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/koi8_ru.conf

  BitKeeper/deleted/.del-keybcs2.conf~db3e18f91b2075be
    1.2 03/01/05 17:43:14 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/keybcs2.conf

  BitKeeper/deleted/.del-hungarian.conf~3b343f4ff7919cd
    1.4 03/01/05 17:43:10 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/hungarian.conf

  BitKeeper/deleted/.del-hp8.conf~4620f2afc37ae747
    1.5 03/01/05 17:43:05 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/hp8.conf

  BitKeeper/deleted/.del-hebrew.conf~94ba65846b69f5b7
    1.5 03/01/05 17:43:01 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/hebrew.conf

  BitKeeper/deleted/.del-greek.conf~68f2c5692866226d
    1.5 03/01/05 17:42:57 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/greek.conf

  BitKeeper/deleted/.del-german1.conf~765a04d69683cefe
    1.5 03/01/05 17:42:44 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/german1.conf

  BitKeeper/deleted/.del-estonia.conf~e78f662de664f3ac
    1.4 03/01/05 17:42:40 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/estonia.conf

  BitKeeper/deleted/.del-dos.conf~5a4357d3335ba812
    1.5 03/01/05 17:42:37 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/dos.conf

  BitKeeper/deleted/.del-dec8.conf~d882c1e5e4566b87
    1.5 03/01/05 17:42:34 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/dec8.conf

  BitKeeper/deleted/.del-croat.conf~fb40a3e77604268e
    1.4 03/01/05 17:42:31 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/croat.conf

  BitKeeper/deleted/.del-danish.conf~90ffe76b3fa5dd46
    1.4 03/01/05 17:42:15 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/danish.conf

  BitKeeper/deleted/.del-cp866.conf~a70093f2be0a509
    1.3 03/01/05 17:42:11 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/cp866.conf

  BitKeeper/deleted/.del-cp1257ltlvcsas.conf~2e55f43377962ede
    1.2 03/01/05 17:41:10 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/cp1257ltlvcsas.conf

  BitKeeper/deleted/.del-cp1257ltlvcias.conf~883d366fc6aa24a1
    1.2 03/01/05 17:41:06 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/cp1257ltlvcias.conf

  BitKeeper/deleted/.del-cp1257ltlvciai.conf~f47460f62dace37e
    1.2 03/01/05 17:41:03 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/cp1257ltlvciai.conf

  BitKeeper/deleted/.del-cp1257bin.conf~a34eda136d4d93b0
    1.2 03/01/05 17:40:55 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/cp1257bin.conf

  BitKeeper/deleted/.del-cp1257.conf~a47298b64ba2dfc1
    1.6 03/01/05 17:40:49 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/cp1257.conf

  BitKeeper/deleted/.del-cp1256.conf~92e4a7b31184387b
    1.2 03/01/05 17:39:59 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/cp1256.conf

  BitKeeper/deleted/.del-cp1251csas.conf~9c4b69407a10a136
    1.2 03/01/05 17:38:30 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/cp1251csas.conf

  BitKeeper/deleted/.del-cp1251cias.conf~6e9b6b7ebafd497c
    1.2 03/01/05 17:38:06 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/cp1251cias.conf

  BitKeeper/deleted/.del-cp1251bin.conf~a7bf1f052611ca00
    1.2 03/01/05 17:36:38 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/cp1251bin.conf

  BitKeeper/deleted/.del-cp1251.conf~dfafe742142570
    1.8 03/01/05 17:36:34 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/cp1251.conf

  BitKeeper/deleted/.del-armscii8.conf~e612e5fb63e34cd4
    1.3 03/01/05 17:36:27 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/armscii8.conf

ChangeSet
  1.1403.37.23 03/01/05 17:35:45 bar@bar.mysql.r18.ru +1 -0
  ctype.c:
    koi8_ru -> koi8_r
    koi8_ukr -> koi8_u
    usa7 -> ascii

  strings/ctype.c
    1.44 03/01/05 17:35:12 bar@bar.mysql.r18.ru +5 -5
    koi8_ru -> koi8_r
    koi8_ukr -> koi8_u
    usa7 -> ascii

ChangeSet
  1.1403.37.22 03/01/05 17:34:24 bar@bar.mysql.r18.ru +5 -0
  koi8_ru -> koi8_r
  charset.conf -> charset.xml
  bug fix

  strings/ctype-simple.c
    1.17 03/01/05 17:34:23 bar@bar.mysql.r18.ru +1 -1
    Bug fix

  sql/share/Makefile.am
    1.22 03/01/05 17:34:23 bar@bar.mysql.r18.ru +1 -2
    charset.conf -> charset.xml

  mysys/charset.c
    1.53 03/01/05 17:34:23 bar@bar.mysql.r18.ru +205 -179
    charset.conf -> charset.xml

  mysql-test/t/ctype_many.test
    1.7 03/01/05 17:34:23 bar@bar.mysql.r18.ru +2 -2
    koi8_ru -> koi8_r

  mysql-test/r/ctype_many.result
    1.7 03/01/05 17:34:23 bar@bar.mysql.r18.ru +7 -7
    koi8_ru -> koi8_r

ChangeSet
  1.1403.37.21 03/01/05 16:44:39 bar@bar.mysql.r18.ru +10 -0
  Many files:
    PRIMARY flag for built-in charsets

  strings/ctype.c
    1.43 03/01/05 16:44:25 bar@bar.mysql.r18.ru +1 -1
    PRIMARY flag for built-in charsets

  strings/ctype-utf8.c
    1.21 03/01/05 16:44:25 bar@bar.mysql.r18.ru +2 -2
    PRIMARY flag for built-in charsets

  strings/ctype-ujis.c
    1.24 03/01/05 16:44:24 bar@bar.mysql.r18.ru +1 -1
    PRIMARY flag for built-in charsets

  strings/ctype-tis620.c
    1.31 03/01/05 16:44:24 bar@bar.mysql.r18.ru +1 -1
    PRIMARY flag for built-in charsets

  strings/ctype-sjis.c
    1.31 03/01/05 16:44:24 bar@bar.mysql.r18.ru +1 -1
    PRIMARY flag for built-in charsets

  strings/ctype-gbk.c
    1.26 03/01/05 16:44:24 bar@bar.mysql.r18.ru +1 -1
    PRIMARY flag for built-in charsets

  strings/ctype-gb2312.c
    1.22 03/01/05 16:44:24 bar@bar.mysql.r18.ru +1 -1
    PRIMARY flag for built-in charsets

  strings/ctype-euc_kr.c
    1.23 03/01/05 16:44:24 bar@bar.mysql.r18.ru +1 -1
    PRIMARY flag for built-in charsets

  strings/ctype-bin.c
    1.12 03/01/05 16:44:24 bar@bar.mysql.r18.ru +1 -1
    PRIMARY flag for built-in charsets

  strings/ctype-big5.c
    1.26 03/01/05 16:44:24 bar@bar.mysql.r18.ru +1 -1
    PRIMARY flag for built-in charsets

ChangeSet
  1.1403.37.20 03/01/05 16:14:56 bar@bar.mysql.r18.ru +3 -0
  koi8_u.xml, koi8_r.xml:
    new file
  Index.xml:
    these names look more standard

  sql/share/charsets/koi8_u.xml
    1.1 03/01/05 16:14:41 bar@bar.mysql.r18.ru +120 -0

  sql/share/charsets/koi8_u.xml
    1.0 03/01/05 16:14:41 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/koi8_u.xml

  sql/share/charsets/koi8_r.xml
    1.1 03/01/05 16:14:31 bar@bar.mysql.r18.ru +119 -0

  sql/share/charsets/koi8_r.xml
    1.0 03/01/05 16:14:31 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/koi8_r.xml

  sql/share/charsets/Index.xml
    1.6 03/01/05 16:07:06 bar@bar.mysql.r18.ru +4 -4
    these names look more standard

ChangeSet
  1.1403.37.19 03/01/05 16:02:32 bar@bar.mysql.r18.ru +2 -0
  keybcs2.xml, hp8.xml:
    new file

  sql/share/charsets/keybcs2.xml
    1.1 03/01/05 16:01:03 bar@bar.mysql.r18.ru +120 -0

  sql/share/charsets/keybcs2.xml
    1.0 03/01/05 16:01:03 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/keybcs2.xml

  sql/share/charsets/hp8.xml
    1.1 03/01/05 15:59:03 bar@bar.mysql.r18.ru +120 -0

  sql/share/charsets/hp8.xml
    1.0 03/01/05 15:59:03 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/hp8.xml

ChangeSet
  1.1403.37.18 03/01/05 15:56:37 bar@bar.mysql.r18.ru +2 -0
  hebrew.xml, greek.xml:
    new file

  sql/share/charsets/hebrew.xml
    1.1 03/01/05 15:56:21 bar@bar.mysql.r18.ru +120 -0

  sql/share/charsets/hebrew.xml
    1.0 03/01/05 15:56:21 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/hebrew.xml

  sql/share/charsets/greek.xml
    1.1 03/01/05 15:54:09 bar@bar.mysql.r18.ru +120 -0

  sql/share/charsets/greek.xml
    1.0 03/01/05 15:54:09 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/greek.xml

ChangeSet
  1.1403.37.17 03/01/05 15:50:41 bar@bar.mysql.r18.ru +3 -0
  dec8.xml, armscii8.xml, cp866.xml:
    new file

  sql/share/charsets/dec8.xml
    1.1 03/01/05 15:50:29 bar@bar.mysql.r18.ru +121 -0

  sql/share/charsets/dec8.xml
    1.0 03/01/05 15:50:29 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/dec8.xml

  sql/share/charsets/armscii8.xml
    1.1 03/01/05 15:48:47 bar@bar.mysql.r18.ru +119 -0

  sql/share/charsets/armscii8.xml
    1.0 03/01/05 15:48:47 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/armscii8.xml

  BitKeeper/deleted/.del-sel000032.test~e32da7c3fc4b7ace
    1.7 03/01/05 13:46:30 monty@mashka.mysql.fi +4 -0
    Delete: mysql-test/t/sel000032.test

  BitKeeper/deleted/.del-sel000032.result~6cb30e23cbca9fb0
    1.6 03/01/05 13:46:19 monty@mashka.mysql.fi +0 -0
    Delete: mysql-test/r/sel000032.result

  sql/share/charsets/cp866.xml
    1.1 03/01/05 15:45:33 bar@bar.mysql.r18.ru +122 -0

  sql/share/charsets/cp866.xml
    1.0 03/01/05 15:45:33 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/cp866.xml

ChangeSet
  1.1403.34.4 03/01/05 15:40:14 hf@deer.mysql.r18.ru +1 -0
  small bugfix

  sql/item.h
    1.41.10.2 03/01/05 15:40:09 hf@deer.mysql.r18.ru +1 -1
    silly mistake

ChangeSet
  1.1403.37.16 03/01/05 15:38:43 bar@bar.mysql.r18.ru +3 -0
  swe7.xml, ascii.xml:
    new file
  Index.xml:
    usa7 -> ascii

  sql/share/charsets/swe7.xml
    1.1 03/01/05 15:38:33 bar@bar.mysql.r18.ru +121 -0

  sql/share/charsets/swe7.xml
    1.0 03/01/05 15:38:33 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/swe7.xml

  sql/share/charsets/Index.xml
    1.5 03/01/05 15:38:24 bar@bar.mysql.r18.ru +1 -1
    usa7 -> ascii

  sql/share/charsets/ascii.xml
    1.1 03/01/05 15:38:20 bar@bar.mysql.r18.ru +119 -0

  sql/share/charsets/ascii.xml
    1.0 03/01/05 15:38:20 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/ascii.xml

ChangeSet
  1.1403.37.15 03/01/05 15:34:29 bar@bar.mysql.r18.ru +2 -0
  cp1250.xml:
    new file
  Index.xml:
    win1250 -> cp1250

  sql/share/charsets/cp1250.xml
    1.1 03/01/05 15:34:23 bar@bar.mysql.r18.ru +121 -0

  sql/share/charsets/cp1250.xml
    1.0 03/01/05 15:34:23 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/cp1250.xml

  sql/share/charsets/Index.xml
    1.4 03/01/05 15:32:18 bar@bar.mysql.r18.ru +2 -2
    win1250 -> cp1250

ChangeSet
  1.1403.37.14 03/01/05 15:31:26 bar@bar.mysql.r18.ru +1 -0
  cp1250

  strings/ctype.c
    1.42 03/01/05 15:31:18 bar@bar.mysql.r18.ru +1 -1

ChangeSet
  1.1403.37.13 03/01/05 15:30:02 bar@bar.mysql.r18.ru +1 -0
  ctype-win1250ch.c:
    cp1250_czech
    ,

  strings/ctype-win1250ch.c
    1.12 03/01/05 15:29:44 bar@bar.mysql.r18.ru +1 -1
    cp1250_czech
    ,

ChangeSet
  1.1403.37.12 03/01/05 15:27:57 bar@bar.mysql.r18.ru +3 -0
  pclatin2.xml, pclatin1.xml:
    new file
  Index.xml:
    pclatin1

  sql/share/charsets/pclatin2.xml
    1.1 03/01/05 15:27:50 bar@bar.mysql.r18.ru +119 -0

  sql/share/charsets/pclatin2.xml
    1.0 03/01/05 15:27:50 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/pclatin2.xml

  sql/share/charsets/pclatin1.xml
    1.1 03/01/05 15:27:39 bar@bar.mysql.r18.ru +119 -0

  sql/share/charsets/pclatin1.xml
    1.0 03/01/05 15:27:39 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/pclatin1.xml

  sql/share/charsets/Index.xml
    1.3 03/01/05 15:23:20 bar@bar.mysql.r18.ru +1 -1
    pclatin1

ChangeSet
  1.1403.37.11 03/01/05 15:22:21 bar@bar.mysql.r18.ru +1 -0
  cp1256.xml:
    new file

  sql/share/charsets/cp1256.xml
    1.1 03/01/05 15:22:15 bar@bar.mysql.r18.ru +123 -0

  sql/share/charsets/cp1256.xml
    1.0 03/01/05 15:22:15 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/cp1256.xml

ChangeSet
  1.1403.37.10 03/01/05 15:19:58 bar@bar.mysql.r18.ru +1 -0
  latin7.xml:
    new file

  sql/share/charsets/latin7.xml
    1.1 03/01/05 15:19:51 bar@bar.mysql.r18.ru +168 -0

  sql/share/charsets/latin7.xml
    1.0 03/01/05 15:19:51 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/latin7.xml

ChangeSet
  1.1403.37.9 03/01/05 15:13:50 bar@bar.mysql.r18.ru +1 -0
  latin5.xml:
    new file

  sql/share/charsets/latin5.xml
    1.1 03/01/05 15:13:45 bar@bar.mysql.r18.ru +120 -0

  sql/share/charsets/latin5.xml
    1.0 03/01/05 15:13:45 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/latin5.xml

ChangeSet
  1.1403.37.8 03/01/05 15:11:00 bar@bar.mysql.r18.ru +1 -0
  cp1251.xml:
    win1251ukr has been added

  sql/share/charsets/cp1251.xml
    1.2 03/01/05 15:10:44 bar@bar.mysql.r18.ru +22 -0
    win1251ukr has been added

ChangeSet
  1.1403.37.7 03/01/05 15:07:45 bar@bar.mysql.r18.ru +1 -0
  cp1251.xml:
    new file

  sql/share/charsets/cp1251.xml
    1.1 03/01/05 15:07:39 bar@bar.mysql.r18.ru +187 -0

  sql/share/charsets/cp1251.xml
    1.0 03/01/05 15:07:39 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/cp1251.xml

ChangeSet
  1.1403.37.6 03/01/05 15:02:50 bar@bar.mysql.r18.ru +1 -0
  cp1257.xml:
    new file

  sql/share/charsets/cp1257.xml
    1.1 03/01/05 15:02:44 bar@bar.mysql.r18.ru +229 -0

  sql/share/charsets/cp1257.xml
    1.0 03/01/05 15:02:44 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/cp1257.xml

ChangeSet
  1.1403.37.5 03/01/05 14:52:48 bar@bar.mysql.r18.ru +1 -0
  latin2.xml:
    new file

  sql/share/charsets/latin2.xml
    1.1 03/01/05 14:52:42 bar@bar.mysql.r18.ru +167 -0

  sql/share/charsets/latin2.xml
    1.0 03/01/05 14:52:42 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/latin2.xml

ChangeSet
  1.1403.37.4 03/01/05 14:48:18 bar@bar.mysql.r18.ru +1 -0
  latin1.xml:
    charset name was empty

  sql/share/charsets/latin1.xml
    1.2 03/01/05 14:48:04 bar@bar.mysql.r18.ru +1 -1
    charset name was empty

ChangeSet
  1.1403.37.3 03/01/05 14:47:15 bar@bar.mysql.r18.ru +1 -0
  latin1.xml:
    new file

  sql/share/charsets/latin1.xml
    1.1 03/01/05 14:47:08 bar@bar.mysql.r18.ru +233 -0

  sql/share/charsets/latin1.xml
    1.0 03/01/05 14:47:08 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/latin1.xml

ChangeSet
  1.1403.37.2 03/01/05 14:36:51 bar@bar.mysql.r18.ru +1 -0
  MacRoman.xml:
    charset name was wrong

  sql/share/charsets/MacRoman.xml
    1.2 03/01/05 14:36:38 bar@bar.mysql.r18.ru +1 -1
    charset name was wrong

ChangeSet
  1.1403.37.1 03/01/05 14:34:06 bar@bar.mysql.r18.ru +2 -0
  MacRoman.xml, MacCE.xml:
    new file

  sql/share/charsets/MacRoman.xml
    1.1 03/01/05 14:33:49 bar@bar.mysql.r18.ru +201 -0

  sql/share/charsets/MacRoman.xml
    1.0 03/01/05 14:33:49 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/MacRoman.xml

  sql/share/charsets/MacCE.xml
    1.1 03/01/05 14:33:46 bar@bar.mysql.r18.ru +209 -0

  sql/share/charsets/MacCE.xml
    1.0 03/01/05 14:33:46 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1/sql/share/charsets/MacCE.xml

ChangeSet
  1.1403.34.3 03/01/05 14:12:03 hf@deer.mysql.r18.ru +4 -0
  Conflicts resolving

  sql/item.h
    1.41.10.1 03/01/05 14:12:02 hf@deer.mysql.r18.ru +3 -3
    Conflict resolving

  sql/sql_yacc.yy
    1.203.10.1 03/01/05 14:08:22 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/item.cc
    1.27.10.18 03/01/05 14:08:22 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/field.h
    1.46.1.18 03/01/05 14:08:21 hf@deer.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1403.36.1 03/01/05 14:07:24 hf@deer.mysql.r18.ru +6 -0
  SCRUM
  DEFAULT in UPDATE and SELECT

  sql/table.h
    1.42 03/01/05 14:06:33 hf@deer.mysql.r18.ru +1 -0
    st_table::default_values added

  sql/table.cc
    1.65 03/01/05 14:06:33 hf@deer.mysql.r18.ru +2 -0
    table->default_values initialization added

  sql/sql_yacc.yy
    1.203.9.1 03/01/05 14:06:33 hf@deer.mysql.r18.ru +4 -2
    DEFAULT in UPDATE and SELECT added

  sql/item.h
    1.41.9.1 03/01/05 14:06:33 hf@deer.mysql.r18.ru +13 -2
    Item_default_value class added

  sql/item.cc
    1.27.19.1 03/01/05 14:06:33 hf@deer.mysql.r18.ru +31 -0
    Item_default_value methods implementations added

  sql/field.h
    1.46.3.1 03/01/05 14:06:33 hf@deer.mysql.r18.ru +3 -2
    set_default() implementation changed

ChangeSet
  1.676.1.633 03/01/04 21:02:58 Sinisa@sinisa.nasamreza.org +4 -0
  Fixing that 3.23 API / clients do not disconnect if a large 
  packet is issued.
  

  sql/sql_select.cc
    1.91.1.38 03/01/04 21:02:56 Sinisa@sinisa.nasamreza.org +1 -2
    reversing a fix, but we shall yet see about this one ...

  sql/net_serv.cc
    1.15.1.6 03/01/04 21:02:56 Sinisa@sinisa.nasamreza.org +19 -3
    Fixing that 3.23 API / clients do not disconnect if a large 
    packet is issued.
    

  libmysql/libmysql.c
    1.56.1.18 03/01/04 21:02:56 Sinisa@sinisa.nasamreza.org +15 -6
    Fixing that 3.23 API / clients do not disconnect if a large 
    packet is issued.
    

  BitKeeper/deleted/.del-net.c~ef21d6402bb882f9
    1.14.1.4 03/01/04 18:45:53 Sinisa@sinisa.nasamreza.org +0 -0
    Delete: libmysql/net.c

ChangeSet
  1.1346.46.84 03/01/04 18:19:48 monty@mashka.mysql.fi +1 -0
  Changed shared lib version to 12 as some structures has changed

  configure.in
    1.191.1.57 03/01/04 18:19:45 monty@mashka.mysql.fi +1 -1
    Changed shared lib version to 12 as some structures has changed

  BitKeeper/deleted/.del-sel000031.test~50a19a8e204e99bc
    1.7 03/01/04 18:05:35 monty@mashka.mysql.fi +3 -0
    Delete: mysql-test/t/sel000031.test

  BitKeeper/deleted/.del-sel000031.result~d49aeac63ad7db4d
    1.6 03/01/04 18:05:28 monty@mashka.mysql.fi +0 -0
    Delete: mysql-test/r/sel000031.result

  BitKeeper/deleted/.del-sel000003.result~d7b657b1e3a286a7
    1.8 03/01/04 18:04:18 monty@mashka.mysql.fi +0 -0
    Delete: mysql-test/r/sel000003.result

  BitKeeper/deleted/.del-sel000002.result~d1787e6fd5dbc1cc
    1.8 03/01/04 18:04:18 monty@mashka.mysql.fi +0 -0
    Delete: mysql-test/r/sel000002.result

  BitKeeper/deleted/.del-sel000001.result~383913ae4505ec86
    1.8 03/01/04 18:04:18 monty@mashka.mysql.fi +0 -0
    Delete: mysql-test/r/sel000001.result

  BitKeeper/deleted/.del-sel000003.test~63a5512d18cd20a2
    1.10 03/01/04 18:04:14 monty@mashka.mysql.fi +0 -0
    Delete: mysql-test/t/sel000003.test

  BitKeeper/deleted/.del-sel000002.test~9f500639572e18e1
    1.10 03/01/04 18:04:14 monty@mashka.mysql.fi +0 -0
    Delete: mysql-test/t/sel000002.test

  BitKeeper/deleted/.del-sel000001.test~9567c1646058cc
    1.10 03/01/04 18:04:14 monty@mashka.mysql.fi +2 -0
    Delete: mysql-test/t/sel000001.test

  BitKeeper/deleted/.del-rpl000016-slave.opt~ef76f85ddcc13b87
    1.2 03/01/04 17:56:57 monty@mashka.mysql.fi +0 -0
    Delete: mysql-test/t/rpl000016-slave.opt

ChangeSet
  1.1403.35.1 03/01/04 20:33:17 wax@mysql.com +2 -0
  Fix bug with shared memory's variables

  sql/mysqld.cc
    1.316.4.1 03/01/04 20:33:15 wax@mysql.com +2 -2
    Fix bugs with shared memory's variables

  sql/mysql_priv.h
    1.160.19.1 03/01/04 20:33:15 wax@mysql.com +2 -0
    Fix bugs with shared memory's variables

ChangeSet
  1.1403.34.1 03/01/04 16:33:42 bell@sanja.is.com.ua +3 -0
  fixed SET with subselect

  sql/sql_parse.cc
    1.235.33.1 03/01/04 16:33:41 bell@sanja.is.com.ua +8 -1
    fixed SET with subselect

  mysql-test/t/subselect.test
    1.45 03/01/04 16:33:41 bell@sanja.is.com.ua +5 -0
    test of SET with subselect

  mysql-test/r/subselect.result
    1.52 03/01/04 16:33:41 bell@sanja.is.com.ua +7 -0
    test of SET with subselect

ChangeSet
  1.1403.1.41 03/01/04 15:40:55 monty@mashka.mysql.fi +24 -0
  merge

  sql/set_var.cc
    1.20.1.2 03/01/04 15:40:51 monty@mashka.mysql.fi +0 -0
    merge

  sql/item.h
    1.41.4.15 03/01/04 15:40:51 monty@mashka.mysql.fi +0 -2
    merge

  sql/sql_yacc.yy
    1.203.1.12 03/01/04 15:39:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_udf.cc
    1.23 03/01/04 15:39:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_table.cc
    1.125.1.18 03/01/04 15:39:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_show.cc
    1.86.1.21 03/01/04 15:39:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/italian/errmsg.txt
    1.70 03/01/04 15:39:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.70 03/01/04 15:39:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_select.cc
    1.173.24.1 03/01/04 15:39:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_parse.cc
    1.235.26.11 03/01/04 15:39:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_class.h
    1.123.9.5 03/01/04 15:39:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.316.1.6 03/01/04 15:39:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.160.1.31 03/01/04 15:39:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/log_event.cc
    1.91.1.3 03/01/04 15:39:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_func.h
    1.59 03/01/04 15:39:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_func.cc
    1.90.1.3 03/01/04 15:39:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.54 03/01/04 15:39:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/field.cc
    1.64.1.33 03/01/04 15:39:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysys/Makefile.am
    1.41 03/01/04 15:39:06 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/multi_update.test
    1.21 03/01/04 15:39:05 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/multi_update.result
    1.19 03/01/04 15:39:05 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysql/libmysql.c
    1.122 03/01/04 15:39:05 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/mysql.h
    1.43.1.12 03/01/04 15:39:05 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.212.14.10 03/01/04 15:38:56 monty@mashka.mysql.fi +0 -0
    auto-union

ChangeSet
  1.1403.29.2 03/01/04 15:37:20 monty@mashka.mysql.fi +13 -0
  Added support for DROP TEMPORARY TABLE
  Removed mysql_warnings() API function.
  Post merge fixes.

  sql/sql_table.cc
    1.125.6.1 03/01/04 15:37:17 monty@mashka.mysql.fi +44 -24
    Added support for DROP TEMPORARY TABLE

  sql/sql_repl.cc
    1.91.1.2 03/01/04 15:37:16 monty@mashka.mysql.fi +4 -4
    Post merge fixes

  sql/sql_parse.cc
    1.235.31.2 03/01/04 15:37:16 monty@mashka.mysql.fi +18 -11
    SHOW WARNINGS now shows notes, warnings and errors.
    Support for DROP TEMPORARY TABLE
    Post merge fixes

  sql/sql_db.cc
    1.58.1.3 03/01/04 15:37:16 monty@mashka.mysql.fi +1 -1
    Added support for DROP TEMPORARY TABLE

  sql/mysql_priv.h
    1.160.18.1 03/01/04 15:37:16 monty@mashka.mysql.fi +4 -3
    Added support for DROP TEMPORARY TABLE

  sql/item_create.cc
    1.23 03/01/04 15:37:16 monty@mashka.mysql.fi +2 -1
    Fix after merge

  sql/item.h
    1.41.8.2 03/01/04 15:37:16 monty@mashka.mysql.fi +2 -1
    Fix after merge

  mysql-test/t/rpl_log_pos.test
    1.24 03/01/04 15:37:16 monty@mashka.mysql.fi +4 -4
    Update to new syntax

  mysql-test/t/connect.test
    1.2 03/01/04 15:37:16 monty@mashka.mysql.fi +0 -2
    Removed empty lines

  mysql-test/r/rpl_log_pos.result
    1.28 03/01/04 15:37:16 monty@mashka.mysql.fi +3 -3
    Updated results

  libmysql/libmysql.c
    1.121 03/01/04 15:37:16 monty@mashka.mysql.fi +0 -12
    Removed mysql_warnings() API function

  include/mysql.h
    1.43.5.1 03/01/04 15:37:16 monty@mashka.mysql.fi +0 -1
    Removed mysql_warnings() API function

  client/mysqltest.c
    1.85.1.2 03/01/04 15:37:16 monty@mashka.mysql.fi +8 -3
    Don't use mysql_warnings().

ChangeSet
  1.1346.85.1 03/01/04 15:17:16 monty@mashka.mysql.fi +11 -0
  Added support for max_allowed_packet in option files read by mysql_option()
  Extended max_allowed_packet for clients to 1G
  Fixed bug in sending compressed rows >= 16M
  Fix bug in skiping too long packets from clients.
  Added checking of wrong command number sent by client.

  mysql-test/t/packet.test
    1.1 03/01/04 15:17:13 monty@mashka.mysql.fi +31 -0

  mysql-test/r/packet.result
    1.1 03/01/04 15:17:13 monty@mashka.mysql.fi +25 -0

  tests/big_record.pl
    1.4 03/01/04 15:17:13 monty@mashka.mysql.fi +34 -23
    E

  sql/sql_parse.cc
    1.218.1.66 03/01/04 15:17:13 monty@mashka.mysql.fi +14 -10
    Added checking of wrong command number sent by client.
    Changed handling of too big packets to make code safer

  sql/sql_class.h
    1.111.1.26 03/01/04 15:17:13 monty@mashka.mysql.fi +1 -1
    Changed type of variable

  sql/net_serv.cc
    1.46.1.4 03/01/04 15:17:13 monty@mashka.mysql.fi +149 -84
    Changed MAX_THREE_BYTES -> MAX_PACKET_LENGTH
    More DEBUG output and more comments
    Fixed bug in sending compressed rows >= 16M
    Optimized sending of big packets (fewer memcpy and compress data in bigger blocks)
    Fix bug in skiping too long packets from clients.
    (old code didn't always work for big packets)
    

  mysql-test/t/packet.test
    1.0 03/01/04 15:17:13 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysql-test/t/packet.test

  mysql-test/r/packet.result
    1.0 03/01/04 15:17:13 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysql-test/r/packet.result

  sql/net_pkg.cc
    1.21.1.6 03/01/04 15:17:12 monty@mashka.mysql.fi +1 -1
    Fixed wrong handling of blobs >= 16M

  mysys/my_compress.c
    1.10 03/01/04 15:17:12 monty@mashka.mysql.fi +25 -16
    Debugging output

  libmysql/libmysql.c
    1.95.1.24 03/01/04 15:17:12 monty@mashka.mysql.fi +10 -4
    Extended max_allowed_packet for clients to 1G
    Added support for max_allowed_packet in option files read by mysql_option()

  include/mysql_com.h
    1.43.1.5 03/01/04 15:17:12 monty@mashka.mysql.fi +8 -8
    Added COM_END to be able to check for wrong commands.

  include/mysql.h
    1.42.1.3 03/01/04 15:17:12 monty@mashka.mysql.fi +1 -0
    Added max_allowed_packet as option parameter.

ChangeSet
  1.1403.1.40 03/01/04 15:21:52 bar@bar.mysql.r18.ru +1 -0
  charset.c:
    this function will be used to load both Index and a named charset, so let's add a new argument to pass file name

  mysys/charset.c
    1.52 03/01/04 15:21:00 bar@bar.mysql.r18.ru +3 -3
    this function will be used to load both Index and a named charset, so let's add a new argument to pass file name

ChangeSet
  1.1403.33.1 03/01/04 14:59:52 ram@mysql.r18.ru +3 -0
  Optimization of key usage (ORDER BY) (SCRUM)

  sql/sql_select.cc
    1.173.1.34 03/01/04 14:59:47 ram@mysql.r18.ru +84 -0
    Optimization of key usage (ORDER BY) (SCRUM)

  mysql-test/t/order_by.test
    1.10 03/01/04 14:59:47 ram@mysql.r18.ru +21 -0
    Optimization of key usage (ORDER BY) (SCRUM)

  mysql-test/r/order_by.result
    1.13.1.1 03/01/04 14:59:47 ram@mysql.r18.ru +34 -0
    Optimization of key usage (ORDER BY) (SCRUM)

ChangeSet
  1.1403.1.39 03/01/04 14:50:15 bar@bar.mysql.r18.ru +1 -0
  Index.xml:
    "compiled" flag

  sql/share/charsets/Index.xml
    1.2 03/01/04 14:50:02 bar@bar.mysql.r18.ru +8 -8
    "compiled" flag

ChangeSet
  1.1403.1.38 03/01/04 14:25:05 bar@bar.mysql.r18.ru +1 -0
  .del-Index~a8f78510440e2fc4:
    Delete: sql/share/charsets/Index

  BitKeeper/deleted/.del-Index~a8f78510440e2fc4
    1.20 03/01/04 14:24:56 bar@bar.mysql.r18.ru +0 -0
    Delete: sql/share/charsets/Index

ChangeSet
  1.1403.1.37 03/01/04 14:12:20 bar@bar.mysql.r18.ru +17 -0
  Some changes to separate charset and collation terms

  strings/ctype.c
    1.41 03/01/04 14:12:19 bar@bar.mysql.r18.ru +24 -0
    Some changes to separate charset and collation terms

  strings/ctype-win1250ch.c
    1.11 03/01/04 14:12:19 bar@bar.mysql.r18.ru +1 -0
    Some changes to separate charset and collation terms

  strings/ctype-utf8.c
    1.20 03/01/04 14:12:19 bar@bar.mysql.r18.ru +2 -0
    Some changes to separate charset and collation terms

  strings/ctype-ujis.c
    1.23 03/01/04 14:12:19 bar@bar.mysql.r18.ru +1 -0
    Some changes to separate charset and collation terms

  strings/ctype-tis620.c
    1.30 03/01/04 14:12:19 bar@bar.mysql.r18.ru +1 -0
    Some changes to separate charset and collation terms

  strings/ctype-sjis.c
    1.30 03/01/04 14:12:19 bar@bar.mysql.r18.ru +1 -0
    Some changes to separate charset and collation terms

  strings/ctype-mb.c
    1.5 03/01/04 14:12:19 bar@bar.mysql.r18.ru +1 -1
    Some changes to separate charset and collation terms

  strings/ctype-latin1_de.c
    1.21 03/01/04 14:12:18 bar@bar.mysql.r18.ru +1 -0
    Some changes to separate charset and collation terms

  strings/ctype-gbk.c
    1.25 03/01/04 14:12:18 bar@bar.mysql.r18.ru +1 -0
    Some changes to separate charset and collation terms

  strings/ctype-gb2312.c
    1.21 03/01/04 14:12:18 bar@bar.mysql.r18.ru +1 -0
    Some changes to separate charset and collation terms

  strings/ctype-euc_kr.c
    1.22 03/01/04 14:12:18 bar@bar.mysql.r18.ru +1 -0
    Some changes to separate charset and collation terms

  strings/ctype-czech.c
    1.25 03/01/04 14:12:18 bar@bar.mysql.r18.ru +1 -0
    Some changes to separate charset and collation terms

  strings/ctype-bin.c
    1.11 03/01/04 14:12:18 bar@bar.mysql.r18.ru +1 -0
    Some changes to separate charset and collation terms

  strings/ctype-big5.c
    1.25 03/01/04 14:12:18 bar@bar.mysql.r18.ru +1 -0
    Some changes to separate charset and collation terms

  sql/sql_show.cc
    1.86.1.20 03/01/04 14:12:18 bar@bar.mysql.r18.ru +11 -4
    Some changes to separate charset and collation terms

  mysys/charset.c
    1.51 03/01/04 14:12:18 bar@bar.mysql.r18.ru +23 -4
    Some changes to separate charset and collation terms

  include/m_ctype.h
    1.49 03/01/04 14:12:18 bar@bar.mysql.r18.ru +3 -0
    Some changes to separate charset and collation terms

ChangeSet
  1.1403.1.36 03/01/04 13:35:52 bar@bar.mysql.r18.ru +1 -0
  libmysql.c:
    SLL -> SSL

  libmysql/libmysql.c
    1.119.1.3 03/01/04 13:35:38 bar@bar.mysql.r18.ru +2 -2
    SLL -> SSL

ChangeSet
  1.1403.32.1 03/01/04 13:28:41 bar@bar.mysql.r18.ru +1 -0
  .del-test_xml~6237d9729f4fe38:
    Delete: mysys/test_xml

  BitKeeper/deleted/.del-test_xml~6237d9729f4fe38
    1.2 03/01/04 13:27:51 bar@bar.mysql.r18.ru +0 -0
    Delete: mysys/test_xml

ChangeSet
  1.1403.1.34 03/01/03 23:44:24 venu@myvenu.com +1 -0
  Merge work.mysql.com:/home/bk/mysql-4.1
  into myvenu.com:/home/venu/bk/src-4.1

  sql/field.cc
    1.64.1.32 03/01/03 23:44:18 venu@myvenu.com +0 -0
    Auto merged

ChangeSet
  1.1403.31.2 03/01/03 23:38:47 venu@myvenu.com +1 -0
  Prepared statements + binary protocol test update

  tests/client_test.c
    1.5 03/01/03 23:38:35 venu@myvenu.com +1542 -396

ChangeSet
  1.1403.31.1 03/01/03 23:37:16 venu@myvenu.com +3 -0
  Fix date,time,timestamp,year - binary protocol

  libmysql/libmysql.c
    1.119.1.2 03/01/03 23:36:11 venu@myvenu.com +347 -39

  sql/protocol.cc
    1.23.1.13 03/01/03 23:35:59 venu@myvenu.com +14 -14

  sql/field.cc
    1.64.7.2 03/01/03 23:35:57 venu@myvenu.com +1 -3

ChangeSet
  1.1403.1.33 03/01/04 01:19:17 miguel@hegel.br +2 -0
  Fix warnings and error VC++ compiler

  sql/sql_test.cc
    1.17 03/01/04 01:19:13 miguel@hegel.br +2 -1
    Fix VC++ compiler error that doesn't permits the declaration and
    initialization of variables that can be skipped by the prior
    goto end instruction.

  client/mysql.cc
    1.108.1.3 03/01/04 01:19:13 miguel@hegel.br +0 -1
    Removing unreferenced variables

ChangeSet
  1.1403.1.32 03/01/03 19:35:14 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-do-4.1

  sql/sql_parse.cc
    1.235.26.10 03/01/03 19:35:12 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.84.1 03/01/03 19:46:15 ram@mysql.r18.ru +4 -0
  Fix for the QUOTE() function.

  BitKeeper/etc/logging_ok
    1.206.17.10 03/01/03 19:46:15 ram@mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  sql/item_strfunc.cc
    1.36.1.17 03/01/03 19:45:27 ram@mysql.r18.ru +1 -1
    Fix for the QUOTE() function.

  mysql-test/t/func_str.test
    1.15.2.1 03/01/03 19:45:27 ram@mysql.r18.ru +1 -0
    Fix for the QUOTE() function.

  mysql-test/r/func_str.result
    1.16.2.1 03/01/03 19:45:27 ram@mysql.r18.ru +3 -0
    Fix for the QUOTE() function.

ChangeSet
  1.1403.28.9 03/01/03 17:08:00 bell@sanja.is.com.ua +3 -0
  fixed do with subselects

  sql/sql_parse.cc
    1.235.32.1 03/01/03 17:07:54 bell@sanja.is.com.ua +8 -1
    fixed do with subselects

  mysql-test/t/subselect.test
    1.44 03/01/03 17:07:54 bell@sanja.is.com.ua +9 -1
    test of DO with subselects

  mysql-test/r/subselect.result
    1.51 03/01/03 17:07:54 bell@sanja.is.com.ua +10 -1
    test of DO with subselects

ChangeSet
  1.1403.28.8 03/01/03 15:08:40 Sinisa@sinisa.nasamreza.org +2 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/item.cc
    1.27.10.17 03/01/03 15:08:35 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/field.cc
    1.64.1.31 03/01/03 15:08:35 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1403.27.2 03/01/03 15:07:40 Sinisa@sinisa.nasamreza.org +1 -0
  Further fix for export class problem

  sql/item.cc
    1.27.18.2 03/01/03 15:07:36 Sinisa@sinisa.nasamreza.org +1 -0
    Further fix for export class problem

ChangeSet
  1.1403.28.7 03/01/03 04:12:34 venu@myvenu.com +1 -0
  Missed commit

  include/mysql.h
    1.43.1.11 03/01/03 04:12:13 venu@myvenu.com +1 -1

ChangeSet
  1.1403.28.6 03/01/03 03:54:18 venu@myvenu.com +1 -0
  Merge myvenu.com:/home/venu/bk/src-4.1
  into myvenu.com:/home/venu/work/sql/dev-4.1

  sql/field.cc
    1.64.7.1 03/01/03 03:54:13 venu@myvenu.com +0 -0
    Auto merged

ChangeSet
  1.1403.23.3 03/01/03 03:52:53 venu@myvenu.com +5 -0
  Binary protocol changes (to monty)

  libmysql/libmysql.c
    1.119.1.1 03/01/03 03:38:04 venu@myvenu.com +92 -73

  sql/protocol.cc
    1.23.1.12 03/01/03 03:37:49 venu@myvenu.com +29 -8

  sql/field.h
    1.46.1.17 03/01/03 03:37:41 venu@myvenu.com +1 -5

  sql/field.cc
    1.64.6.1 03/01/03 03:37:38 venu@myvenu.com +32 -3

  sql/sql_prepare.cc
    1.14.1.1 03/01/03 03:37:27 venu@myvenu.com +19 -15

ChangeSet
  1.1403.28.5 03/01/03 14:35:32 bar@bar.mysql.r18.ru +4 -0
  Charset index is sotred in XML now

  sql/share/charsets/Index.xml
    1.1 03/01/03 14:35:30 bar@bar.mysql.r18.ru +455 -0

  sql/share/charsets/Index.xml
    1.0 03/01/03 14:35:30 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.wrk/sql/share/charsets/Index.xml

  sql/share/Makefile.am
    1.21 03/01/03 14:35:30 bar@bar.mysql.r18.ru +2 -2
    Charset index is sotred in XML now

  mysys/charset.c
    1.50 03/01/03 14:35:30 bar@bar.mysql.r18.ru +154 -39
    Charset index is sotred in XML now

  libmysql/Makefile.shared
    1.37 03/01/03 14:35:30 bar@bar.mysql.r18.ru +1 -1
    Charset index is sotred in XML now

ChangeSet
  1.1403.28.4 03/01/03 12:40:09 bar@bar.mysql.r18.ru +1 -0
  ignore:
    added test_xml

  BitKeeper/etc/ignore
    1.132 03/01/03 12:39:56 bar@bar.mysql.r18.ru +1 -0
    added test_xml

ChangeSet
  1.1403.30.1 03/01/03 12:30:01 bar@bar.mysql.r18.ru +2 -0
  User data

  mysys/xml.c
    1.2 03/01/03 12:29:59 bar@bar.mysql.r18.ru +5 -0
    User data

  include/my_xml.h
    1.2 03/01/03 12:29:59 bar@bar.mysql.r18.ru +2 -0
    User data

ChangeSet
  1.1403.29.1 03/01/03 00:04:33 monty@mashka.mysql.fi +67 -0
  Merge with 4.0.8

  sql/sql_yacc.yy
    1.203.8.1 03/01/03 00:04:31 monty@mashka.mysql.fi +0 -7
    Merge with 4.0.8

  sql/sql_show.cc
    1.86.6.1 03/01/03 00:04:31 monty@mashka.mysql.fi +2 -2
    Merge with 4.0.8

  sql/sql_repl.cc
    1.91.1.1 03/01/03 00:04:31 monty@mashka.mysql.fi +3 -5
    Merge with 4.0.8

  sql/sql_parse.cc
    1.235.31.1 03/01/03 00:04:31 monty@mashka.mysql.fi +1 -5
    Merge with 4.0.8

  sql/sql_db.cc
    1.58.1.2 03/01/03 00:04:31 monty@mashka.mysql.fi +0 -0
    Merge with 4.0.8

  sql/sql_class.h
    1.123.12.1 03/01/03 00:04:31 monty@mashka.mysql.fi +0 -2
    Merge with 4.0.8

  sql/sql_analyse.cc
    1.29 03/01/03 00:04:31 monty@mashka.mysql.fi +0 -26
    Merge with 4.0.8

  sql/share/italian/errmsg.txt
    1.68.1.1 03/01/03 00:04:31 monty@mashka.mysql.fi +0 -0
    Merge with 4.0.8

  sql/set_var.cc
    1.20.2.1 03/01/03 00:04:31 monty@mashka.mysql.fi +1 -5
    Merge with 4.0.8

  sql/mysqld.cc
    1.316.3.1 03/01/03 00:04:31 monty@mashka.mysql.fi +5 -8
    Merge with 4.0.8

  sql/log_event.cc
    1.91.2.1 03/01/03 00:04:31 monty@mashka.mysql.fi +13 -13
    Merge with 4.0.8

  sql/item_create.cc
    1.22 03/01/03 00:04:31 monty@mashka.mysql.fi +1 -2
    Merge with 4.0.8

  sql/item.h
    1.41.8.1 03/01/03 00:04:31 monty@mashka.mysql.fi +0 -1
    Merge with 4.0.8

  mysql-test/t/variables.test
    1.13 03/01/03 00:04:31 monty@mashka.mysql.fi +1 -2
    Merge with 4.0.8

  mysql-test/r/variables.result
    1.17 03/01/03 00:04:31 monty@mashka.mysql.fi +2 -1
    Merge with 4.0.8

  mysql-test/r/rpl_log_pos.result
    1.27 03/01/03 00:04:31 monty@mashka.mysql.fi +2 -2
    Merge with 4.0.8

  mysql-test/r/rpl_failsafe.result
    1.7 03/01/03 00:04:31 monty@mashka.mysql.fi +1 -1
    Merge with 4.0.8

  configure.in
    1.201.1.8 03/01/03 00:04:31 monty@mashka.mysql.fi +0 -1
    Merge with 4.0.8

  myisam/mi_open.c
    1.55 03/01/02 21:00:16 serg@sergbook.mysql.com +16 -7
    preserve 4.0 compatibility for FULLTEXT indexes

ChangeSet
  1.1403.1.28 03/01/02 18:04:02 peter@mysql.com +1 -0
  SCRUM password() function changes. 

  sql/item_strfunc.cc
    1.54.1.24 03/01/02 18:03:58 peter@mysql.com +14 -6
    Fix password() function according Monty's comment

  sql/structs.h
    1.27 03/01/02 16:53:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.68.1.1 03/01/02 16:53:38 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql-bench/server-cfg.sh
    1.45 03/01/02 16:53:38 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql-bench/crash-me.sh
    1.38 03/01/02 16:53:38 monty@mashka.mysql.fi +22 -33
    Auto merged

  sql/sql_update.cc
    1.71 03/01/02 16:53:37 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_udf.cc
    1.21.1.1 03/01/02 16:53:37 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_select.cc
    1.173.23.1 03/01/02 16:53:37 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_load.cc
    1.39.1.1 03/01/02 16:53:37 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_insert.cc
    1.80 03/01/02 16:53:37 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_acl.cc
    1.55.1.17 03/01/02 16:53:37 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/slave.h
    1.52.1.1 03/01/02 16:53:37 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/slave.cc
    1.174.1.1 03/01/02 16:53:37 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/set_var.h
    1.8.1.2 03/01/02 16:53:37 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.18.1.1 03/01/02 16:53:36 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/net_serv.cc
    1.48.1.1 03/01/02 16:53:36 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/log.cc
    1.92.1.2 03/01/02 16:53:36 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/lex.h
    1.82.1.5 03/01/02 16:53:36 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/item_func.h
    1.56.1.1 03/01/02 16:53:36 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_func.cc
    1.90.2.1 03/01/02 16:53:36 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_create.h
    1.16 03/01/02 16:53:36 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.48.1.1 03/01/02 16:53:36 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_myisammrg.h
    1.26 03/01/02 16:53:36 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/ha_myisammrg.cc
    1.40 03/01/02 16:53:36 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.98.1.9 03/01/02 16:53:36 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.85.3.1 03/01/02 16:53:35 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/field.cc
    1.64.5.1 03/01/02 16:53:35 monty@mashka.mysql.fi +0 -0
    Auto merged

  scripts/Makefile.am
    1.24 03/01/02 16:53:35 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysys/Makefile.am
    1.39.1.1 03/01/02 16:53:35 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/rpl_log_pos.test
    1.23 03/01/02 16:53:35 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/multi_update.test
    1.18.1.1 03/01/02 16:53:35 monty@mashka.mysql.fi +0 -2
    Auto merged

  mysql-test/r/show_check.result
    1.27 03/01/02 16:53:35 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/select.result
    1.21 03/01/02 16:53:35 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/order_by.result
    1.14 03/01/02 16:53:34 monty@mashka.mysql.fi +0 -3
    Auto merged

  mysql-test/r/multi_update.result
    1.16.1.1 03/01/02 16:53:34 monty@mashka.mysql.fi +0 -7
    Auto merged

  mysql-test/r/key_diff.result
    1.9 03/01/02 16:53:34 monty@mashka.mysql.fi +0 -1
    Auto merged

  mysql-test/r/fulltext.result
    1.35 03/01/02 16:53:34 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/distinct.result
    1.20 03/01/02 16:53:34 monty@mashka.mysql.fi +0 -4
    Auto merged

  mysql-test/r/case.result
    1.7 03/01/02 16:53:34 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.156 03/01/02 16:53:34 monty@mashka.mysql.fi +0 -1
    Auto merged

  myisam/myisamdef.h
    1.52.1.1 03/01/02 16:53:34 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/mi_write.c
    1.32 03/01/02 16:53:34 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/mi_check.c
    1.95 03/01/02 16:53:34 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysql/libmysql.c
    1.120 03/01/02 16:53:34 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/myisammrg.h
    1.14 03/01/02 16:53:34 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/myisam.h
    1.45 03/01/02 16:53:34 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/my_base.h
    1.38 03/01/02 16:53:33 monty@mashka.mysql.fi +0 -0
    Auto merged

  acinclude.m4
    1.80 03/01/02 16:53:33 monty@mashka.mysql.fi +0 -0
    Auto merged

  VC++Files/sql/mysqld.dsp
    1.8 03/01/02 16:53:33 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.212.20.1 03/01/02 16:53:25 monty@mashka.mysql.fi +1 -1
    auto-union

ChangeSet
  1.1346.46.81 03/01/02 16:26:26 monty@mashka.mysql.fi +2 -0
  Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0

  sql/sql_parse.cc
    1.218.1.65 03/01/02 16:26:24 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/net_serv.cc
    1.46.1.3 03/01/02 16:26:24 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.83.1 03/01/02 16:21:22 Sinisa@sinisa.nasamreza.org +2 -0
  Fixing some bugs in client - server protocol and adding a feature 
  that connection does not close in the case when client sends a 
  buffer larger then max_allowed_packet.

  sql/sql_parse.cc
    1.218.19.1 03/01/02 16:21:18 Sinisa@sinisa.nasamreza.org +6 -0
    Fixing some bugs in client - server protocol and adding a feature 
    that connection does not close in the case when client sends a 
    buffer larger then max_allowed_packet.

  sql/net_serv.cc
    1.46.2.1 03/01/02 16:21:18 Sinisa@sinisa.nasamreza.org +18 -3
    Fixing some bugs in client - server protocol and adding a feature 
    that connection does not close in the case when client sends a 
    buffer larger then max_allowed_packet.

ChangeSet
  1.1346.46.80 03/01/02 14:41:31 monty@mashka.mysql.fi +1 -0
  Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0

  sql/ha_innodb.cc
    1.73.1.63 03/01/02 14:41:29 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.46.79 03/01/02 14:29:26 monty@mashka.mysql.fi +2 -0
  Small optimization of sending big blocks.
  Updated Italian error messages

  sql/share/italian/errmsg.txt
    1.52.1.7 03/01/02 14:29:24 monty@mashka.mysql.fi +19 -19
    Updated error messages (by Cristian Giussani)

  sql/net_serv.cc
    1.46.1.2 03/01/02 14:29:24 monty@mashka.mysql.fi +19 -6
    Small optimization of sending big blocks.
    Some small formating changes

ChangeSet
  1.1403.28.1 03/01/02 12:24:33 bell@sanja.is.com.ua +4 -0
  post-post-review fix (SCRUM)

  sql/item_subselect.cc
    1.47 03/01/02 12:24:27 bell@sanja.is.com.ua +1 -1
    post-post-review fix

  sql/item_row.cc
    1.8 03/01/02 12:24:27 bell@sanja.is.com.ua +2 -0
    post-post-review fix

  sql/item_cmpfunc.h
    1.36 03/01/02 12:24:27 bell@sanja.is.com.ua +2 -0
    post-post-review fix

  sql/item.cc
    1.27.10.16 03/01/02 12:24:27 bell@sanja.is.com.ua +3 -2
    post-post-review fix

ChangeSet
  1.1403.1.26 03/01/01 20:11:18 peter@mysql.com +4 -0
  Merge mysql.com:/home/pz/mysql/mysql-4.1-root
  into mysql.com:/home/pz/mysql/mysql-4.1

  sql/sql_yacc.yy
    1.203.1.11 03/01/01 20:11:13 peter@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.235.26.9 03/01/01 20:11:13 peter@mysql.com +0 -0
    Auto merged

  sql/item_strfunc.h
    1.38 03/01/01 20:11:13 peter@mysql.com +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.54.1.23 03/01/01 20:11:13 peter@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1403.1.25 03/01/01 15:59:35 ram@mysql.r18.ru +3 -0
  Fix for QUOTE() function.

  sql/item_strfunc.cc
    1.54.8.3 03/01/01 15:59:12 ram@mysql.r18.ru +1 -1
    Fix for QUOTE() function.

  mysql-test/t/func_str.test
    1.18 03/01/01 15:59:12 ram@mysql.r18.ru +1 -1
    Fix for QUOTE() function.

  mysql-test/r/func_str.result
    1.19 03/01/01 15:59:12 ram@mysql.r18.ru +3 -0
    Fix for QUOTE() function.

ChangeSet
  1.1403.1.24 02/12/31 18:39:16 bell@sanja.is.com.ua +8 -0
  postreviews fix (SCRUM related)
  reordered Item_row class variables to be sorted by memory size

  sql/item_subselect.cc
    1.46 02/12/31 18:39:15 bell@sanja.is.com.ua +26 -11
    postreviews fix

  sql/item_strfunc.cc
    1.54.8.2 02/12/31 18:39:15 bell@sanja.is.com.ua +2 -1
    postreviews fix

  sql/item_row.h
    1.8 02/12/31 18:39:15 bell@sanja.is.com.ua +10 -7
    reordered class variables to be sorted by memory size
    postreviews fix

  sql/item_row.cc
    1.7 02/12/31 18:39:15 bell@sanja.is.com.ua +8 -20
    postreviews fix

  sql/item_cmpfunc.h
    1.35 02/12/31 18:39:15 bell@sanja.is.com.ua +9 -0
    postreviews fix

  sql/item.h
    1.41.4.14 02/12/31 18:39:15 bell@sanja.is.com.ua +4 -0
    postreviews fix

  sql/item.cc
    1.27.10.15 02/12/31 18:39:15 bell@sanja.is.com.ua +3 -2
    postreviews fix

  mysql-test/r/subselect.result
    1.50 02/12/31 18:39:15 bell@sanja.is.com.ua +1 -2
    fix result of subselect test

ChangeSet
  1.1403.27.1 02/12/31 18:01:53 Sinisa@sinisa.nasamreza.org +3 -0
  A fix for a charset bug in the select_export (select into 
  outfile) class.

  sql/item.cc
    1.27.18.1 02/12/31 18:01:46 Sinisa@sinisa.nasamreza.org +1 -0
    A fix for a charset bug in the select_export (select into 
    outfile) class.

  sql/field.cc
    1.64.1.30 02/12/31 18:01:46 Sinisa@sinisa.nasamreza.org +0 -1
    A fix for a charset bug in the select_export (select into 
    outfile) class.

  mysql-test/t/outfile.test
    1.5 02/12/31 18:01:46 Sinisa@sinisa.nasamreza.org +3 -3
    A fix for a charset bug in the select_export (select into 
    outfile) class.

ChangeSet
  1.1403.26.2 02/12/31 17:01:53 wax@mysql.com +1 -0
  Fixed duplicate of handle_count in __NT__ section

  sql/mysqld.cc
    1.316.1.5 02/12/31 17:01:51 wax@mysql.com +0 -1
    Fixed duplicate of handle_count

ChangeSet
  1.1403.26.1 02/12/31 16:58:41 wax@mysql.com +1 -0
  Change locks in sql_udf.cc to rw_locks (SCRUM)

  sql/sql_udf.cc
    1.22 02/12/31 16:58:35 wax@mysql.com +14 -13
    Change locks to rw_locks

ChangeSet
  1.1403.1.23 02/12/31 12:55:03 bell@sanja.is.com.ua +10 -0
  merging

  mysql-test/t/subselect.test
    1.43 02/12/31 12:55:01 bell@sanja.is.com.ua +3 -1
    merging

  sql/sql_table.cc
    1.125.1.17 02/12/31 12:49:29 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_show.cc
    1.86.1.19 02/12/31 12:49:29 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.173.1.33 02/12/31 12:49:29 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.59.2.5 02/12/31 12:49:28 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_derived.cc
    1.27 02/12/31 12:49:28 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_base.cc
    1.122.1.24 02/12/31 12:49:28 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.160.1.30 02/12/31 12:49:28 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.27.10.14 02/12/31 12:49:28 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.49 02/12/31 12:49:28 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1403.1.22 02/12/31 12:48:00 bell@sanja.is.com.ua +6 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-row-4.1

  sql/sql_yacc.yy
    1.203.1.10 02/12/31 12:47:58 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_class.h
    1.123.9.4 02/12/31 12:47:58 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_class.cc
    1.82.6.9 02/12/31 12:47:58 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.27.10.13 02/12/31 12:47:58 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.41.1.1 02/12/31 12:47:58 bell@sanja.is.com.ua +1 -2
    Auto merged

  mysql-test/r/subselect.result
    1.47.1.1 02/12/31 12:47:58 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1403.1.21 02/12/31 13:06:30 bar@bar.mysql.r18.ru +1 -0
  license has been added

  mysys/test_xml.c
    1.2 02/12/31 13:06:01 bar@bar.mysql.r18.ru +16 -0

ChangeSet
  1.1403.1.20 02/12/31 13:00:41 bar@bar.mysql.r18.ru +6 -0
  XML parser

  mysys/xml.c
    1.1 02/12/31 13:00:37 bar@bar.mysql.r18.ru +369 -0

  mysys/test_xml
    1.1 02/12/31 13:00:37 bar@bar.mysql.r18.ru +790 -0

  mysys/test_xml.c
    1.1 02/12/31 13:00:37 bar@bar.mysql.r18.ru +89 -0

  include/my_xml.h
    1.1 02/12/31 13:00:37 bar@bar.mysql.r18.ru +59 -0

  mysys/xml.c
    1.0 02/12/31 13:00:37 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.wrk/mysys/xml.c

  mysys/test_xml
    1.0 02/12/31 13:00:37 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.wrk/mysys/test_xml

  mysys/test_xml.c
    1.0 02/12/31 13:00:37 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.wrk/mysys/test_xml.c

  mysys/Makefile.am
    1.40 02/12/31 13:00:37 bar@bar.mysql.r18.ru +4 -1
    XML parser

  include/my_xml.h
    1.0 02/12/31 13:00:37 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.wrk/include/my_xml.h

  include/Makefile.am
    1.35 02/12/31 13:00:37 bar@bar.mysql.r18.ru +1 -1
    XML parser

ChangeSet
  1.1346.82.2 02/12/31 10:17:35 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Fix bug: could not switch trx isolation back to REPEATABLE READ after switching it to some other level

  sql/ha_innodb.cc
    1.73.8.1 02/12/31 10:16:39 heikki@hundin.mysql.fi +2 -4
    Fix bug: could not switch trx isolation back to REPEATABLE READ after switching it to some other level

ChangeSet
  1.1403.1.18 02/12/30 15:16:12 venu@myvenu.com +1 -0
  Merge work.mysql.com:/home/bk/mysql-4.1
  into myvenu.com:/home/venu/bk/src-4.1

  sql/sql_table.cc
    1.125.3.3 02/12/30 15:16:07 venu@myvenu.com +0 -0
    Auto merged

ChangeSet
  1.1403.23.2 02/12/30 15:10:10 venu@myvenu.com +3 -0
  pure coverage test updates  

  mysql-test/r/create.result
    1.23 02/12/30 15:08:58 venu@myvenu.com +13 -2

  mysql-test/t/create.test
    1.18 02/12/30 15:08:52 venu@myvenu.com +6 -2

  sql/sql_table.cc
    1.125.5.1 02/12/30 15:08:38 venu@myvenu.com +8 -6

ChangeSet
  1.1403.1.17 02/12/30 16:28:00 Sinisa@sinisa.nasamreza.org +5 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

ChangeSet
  1.1403.25.3 02/12/30 21:42:02 vva@eagle.mysql.r18.ru +2 -0
  fixing rpl_temporary.test for FreeBSD/Linux thread-order (it add 4 sec. sleep)

  mysql-test/t/rpl_temporary.test
    1.2 02/12/30 21:41:45 vva@eagle.mysql.r18.ru +5 -0
    fixing rpl_temporary.test for FreeBSD/Linux thread-order (it add 4 sec. sleep)

  mysql-test/r/rpl_temporary.result
    1.2 02/12/30 21:41:45 vva@eagle.mysql.r18.ru +2 -2
    fixing rpl_temporary.test for FreeBSD/Linux thread-order (it add 4 sec. sleep)

  sql/sql_show.cc
    1.86.1.18 02/12/30 16:27:53 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_parse.cc
    1.235.26.8 02/12/30 16:27:53 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_base.cc
    1.122.1.23 02/12/30 16:27:53 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/item.cc
    1.27.10.12 02/12/30 16:27:53 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/field.cc
    1.64.1.29 02/12/30 16:27:52 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1403.21.4 02/12/30 11:10:23 peter@mysql.com +1 -0
  Merge mysql.com:/home/pz/mysql/mysql-4.1-root
  into mysql.com:/home/pz/mysql/mysql-4.1

  sql/sql_parse.cc
    1.235.29.3 02/12/30 11:10:15 peter@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1403.25.2 02/12/29 21:50:52 miguel@hegel.br +5 -0
  Fix compiler warnings removing unreferenced variables

  sql/sql_show.cc
    1.86.5.1 02/12/29 21:50:20 miguel@hegel.br +0 -2
    Remove unreferenced local variable

  sql/sql_select.cc
    1.173.22.1 02/12/29 21:50:19 miguel@hegel.br +1 -1
    Remove unreferenced local variable

  sql/sql_parse.cc
    1.235.30.2 02/12/29 21:50:19 miguel@hegel.br +0 -2
    Remove unreferenced local variable

  sql/item.cc
    1.27.17.1 02/12/29 21:50:19 miguel@hegel.br +0 -1
    Remove unreferenced local variable

  sql/field.cc
    1.64.4.1 02/12/29 21:50:19 miguel@hegel.br +0 -2
    Removing unreferenced local variables 

ChangeSet
  1.1403.25.1 02/12/30 01:59:08 vva@eagle.mysql.r18.ru +11 -0
  Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
  into eagle.mysql.r18.ru:/home/vva/work/BINLOG_TEMPORARY/4.1

  sql/sql_table.cc
    1.125.3.2 02/12/30 01:59:03 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_lex.h
    1.102.1.3 02/12/30 01:59:03 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_lex.cc
    1.59.4.1 02/12/30 01:59:03 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_class.h
    1.123.11.1 02/12/30 01:59:03 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_class.cc
    1.82.8.2 02/12/30 01:59:03 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_base.cc
    1.122.16.1 02/12/30 01:59:03 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/set_var.cc
    1.20.1.1 02/12/30 01:59:03 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/mysqld.cc
    1.316.1.4 02/12/30 01:59:03 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/log_event.h
    1.76.1.1 02/12/30 01:59:03 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/log_event.cc
    1.91.1.2 02/12/30 01:59:03 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.212.14.9 02/12/30 01:58:50 vva@eagle.mysql.r18.ru +0 -1
    auto-union

ChangeSet
  1.1388.20.1 02/12/30 01:46:48 vva@eagle.mysql.r18.ru +13 -0
  processing thread specific queries

  BitKeeper/etc/logging_ok
    1.212.19.1 02/12/30 01:46:48 vva@eagle.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  mysql-test/t/rpl_temporary.test
    1.1 02/12/30 01:42:39 vva@eagle.mysql.r18.ru +72 -0

  mysql-test/t/rpl_temporary.test
    1.0 02/12/30 01:42:39 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/BINLOG_TEMPORARY/4.1/mysql-test/t/rpl_temporary.test

  mysql-test/r/rpl_temporary.result
    1.1 02/12/30 01:42:38 vva@eagle.mysql.r18.ru +74 -0

  sql/sql_table.cc
    1.125.4.1 02/12/30 01:42:38 vva@eagle.mysql.r18.ru +2 -0
    processing thread specific queries

  sql/sql_lex.h
    1.102.2.1 02/12/30 01:42:38 vva@eagle.mysql.r18.ru +1 -0
    processing thread specific queries

  sql/sql_lex.cc
    1.59.3.1 02/12/30 01:42:38 vva@eagle.mysql.r18.ru +1 -0
    processing thread specific queries

  sql/sql_class.h
    1.123.10.1 02/12/30 01:42:38 vva@eagle.mysql.r18.ru +6 -5
    processing thread specific queries

  sql/sql_class.cc
    1.82.9.1 02/12/30 01:42:38 vva@eagle.mysql.r18.ru +1 -1
    processing thread specific queries

  sql/sql_base.cc
    1.122.15.1 02/12/30 01:42:38 vva@eagle.mysql.r18.ru +5 -4
    processing thread specific queries

  sql/set_var.cc
    1.19.2.1 02/12/30 01:42:38 vva@eagle.mysql.r18.ru +6 -0
    processing thread specific queries

  sql/mysqld.cc
    1.316.2.1 02/12/30 01:42:38 vva@eagle.mysql.r18.ru +1 -0
    processing thread specific queries

  sql/log_event.h
    1.75.2.1 02/12/30 01:42:38 vva@eagle.mysql.r18.ru +4 -2
    processing thread specific queries

  sql/log_event.cc
    1.90.2.1 02/12/30 01:42:38 vva@eagle.mysql.r18.ru +7 -3
    processing thread specific queries

  mysql-test/r/rpl_temporary.result
    1.0 02/12/30 01:42:38 vva@eagle.mysql.r18.ru +0 -0
    BitKeeper file /home/vva/work/BINLOG_TEMPORARY/4.1/mysql-test/r/rpl_temporary.result

ChangeSet
  1.1403.21.3 02/12/29 20:06:43 peter@mysql.com +2 -0
  Merge

  sql/sql_yacc.yy
    1.203.5.3 02/12/29 20:05:51 peter@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.235.29.2 02/12/29 20:05:50 peter@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1403.24.1 02/12/29 18:41:58 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-row-4.1

  sql/sql_yacc.yy
    1.203.1.9 02/12/29 18:41:56 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1403.1.16 02/12/28 21:37:16 Sinisa@sinisa.nasamreza.org +2 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/sql_yacc.yy
    1.203.4.4 02/12/28 21:37:08 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_parse.cc
    1.235.26.7 02/12/28 21:37:08 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1403.1.15 02/12/28 21:34:17 Sinisa@sinisa.nasamreza.org +8 -0
  aliases with multi-table updates / deletes
  fix for a bug with derived tables and query cache
  ix for a charset bug in timestamp

  sql/sql_yacc.yy
    1.203.4.3 02/12/28 21:34:12 Sinisa@sinisa.nasamreza.org +1 -1
    aliases with multi-table updates / deletes

  sql/sql_parse.cc
    1.235.26.6 02/12/28 21:34:12 Sinisa@sinisa.nasamreza.org +1 -1
    aliases with multi-table updates / deletes

  sql/field.cc
    1.64.1.28 02/12/28 21:34:12 Sinisa@sinisa.nasamreza.org +1 -0
    fix for a charset bug in timestamp

  mysql-test/t/query_cache.test
    1.17 02/12/28 21:34:12 Sinisa@sinisa.nasamreza.org +1 -0
    fix for a bug with derived tables and query cache

  mysql-test/t/outfile.test
    1.4 02/12/28 21:34:12 Sinisa@sinisa.nasamreza.org +5 -0
    Fix of bug with charset in timestamp

  mysql-test/t/multi_update.test
    1.20 02/12/28 21:34:12 Sinisa@sinisa.nasamreza.org +1 -1
    aliases with multi-table updates / deletes

  mysql-test/r/query_cache.result
    1.16 02/12/28 21:34:12 Sinisa@sinisa.nasamreza.org +1 -0
    fix for query cache with derived tables

  mysql-test/r/multi_update.result
    1.18 02/12/28 21:34:12 Sinisa@sinisa.nasamreza.org +1 -1
    aliases with multi-table updates / deletes

ChangeSet
  1.1403.23.1 02/12/28 01:38:29 venu@myvenu.com +6 -0
  sql_table.cc:
    Fix CREATE LIKE TABLE .. temporary case

  mysql-test/r/create.result
    1.22 02/12/28 01:37:08 venu@myvenu.com +60 -0

  mysql-test/t/create.test
    1.17 02/12/28 01:36:57 venu@myvenu.com +37 -0

  sql/sql_yacc.yy
    1.203.7.1 02/12/28 01:36:40 venu@myvenu.com +8 -1

  sql/sql_parse.cc
    1.235.30.1 02/12/28 01:36:38 venu@myvenu.com +8 -4

  sql/sql_table.cc
    1.125.3.1 02/12/28 01:36:22 venu@myvenu.com +119 -0
    Fix CREATE LIKE TABLE .. temporary case

  sql/mysql_priv.h
    1.160.17.1 02/12/28 01:36:15 venu@myvenu.com +3 -0

ChangeSet
  1.1403.20.4 02/12/28 01:01:05 bell@sanja.is.com.ua +23 -0
  postreview fix (SCRUM)
  fixed layout

  sql/stacktrace.c
    1.13 02/12/28 01:01:03 bell@sanja.is.com.ua +3 -3
    fixed layout

  sql/sql_table.cc
    1.125.1.16 02/12/28 01:01:03 bell@sanja.is.com.ua +1 -1
    fixed layout

  sql/sql_string.cc
    1.40 02/12/28 01:01:03 bell@sanja.is.com.ua +1 -1
    fixed layout

  sql/sql_show.cc
    1.86.4.1 02/12/28 01:01:03 bell@sanja.is.com.ua +2 -2
    fixed layout

  sql/sql_select.cc
    1.173.1.32 02/12/28 01:01:03 bell@sanja.is.com.ua +1 -1
    fixed layout

  sql/sql_olap.cc
    1.6 02/12/28 01:01:03 bell@sanja.is.com.ua +6 -6
    fixed layout

  sql/sql_lex.cc
    1.59.2.4 02/12/28 01:01:03 bell@sanja.is.com.ua +3 -3
    fixed layout

  sql/sql_help.cc
    1.3.1.2 02/12/28 01:01:03 bell@sanja.is.com.ua +7 -7
    fixed layout

  sql/spatial.cc
    1.5 02/12/28 01:01:03 bell@sanja.is.com.ua +3 -3
    fixed layout

  sql/password.c
    1.19 02/12/28 01:01:03 bell@sanja.is.com.ua +1 -1
    fixed layout

  sql/opt_range.cc
    1.76 02/12/28 01:01:03 bell@sanja.is.com.ua +6 -5
    fixed layout

  sql/nt_servc.cc
    1.12 02/12/28 01:01:03 bell@sanja.is.com.ua +16 -16
    fixed layout

  sql/item_subselect.h
    1.25 02/12/28 01:01:03 bell@sanja.is.com.ua +7 -6
    postreview fix

  sql/item_subselect.cc
    1.45 02/12/28 01:01:03 bell@sanja.is.com.ua +37 -76
    postreview fix

  sql/item_strfunc.cc
    1.54.8.1 02/12/28 01:01:03 bell@sanja.is.com.ua +3 -3
    fixed layout

  sql/item_row.h
    1.7 02/12/28 01:01:03 bell@sanja.is.com.ua +1 -1
    fixed layout

  sql/item_func.h
    1.58 02/12/28 01:01:03 bell@sanja.is.com.ua +1 -1
    fixed layout

  sql/item_cmpfunc.h
    1.34 02/12/28 01:01:03 bell@sanja.is.com.ua +2 -2
    fixed layout

  sql/item_cmpfunc.cc
    1.53 02/12/28 01:01:03 bell@sanja.is.com.ua +1 -29
    postreview fix

  sql/item.h
    1.41.4.13 02/12/28 01:01:03 bell@sanja.is.com.ua +3 -3
    postreview fix

  sql/item.cc
    1.27.14.5 02/12/28 01:01:03 bell@sanja.is.com.ua +11 -21
    postreview fix

  sql/gstream.cc
    1.4 02/12/28 01:01:03 bell@sanja.is.com.ua +20 -18
    fixed layout

  sql/filesort.cc
    1.61 02/12/28 01:01:03 bell@sanja.is.com.ua +1 -1
    fixed layout

ChangeSet
  1.676.266.5 02/12/27 23:29:27 monty@mashka.mysql.fi +1 -0
  Added O_BINARY flag to all my_fopen() calls.
  (To make the current tests results work on windows)

  client/mysqltest.c
    1.38.1.11 02/12/27 23:29:26 monty@mashka.mysql.fi +3 -3
    Added O_BINARY flag to all my_fopen() calls.
    (To make the current tests results work on windows)

ChangeSet
  1.1346.81.1 02/12/28 02:17:16 walrus@mysql.com +1 -0
  1) Add option (--verbose) that allows user switch on/off new
  logging in  crash-me
  2) Add new test: no_id_between, that indicates if NOT ID BETWEEN 
  interprets as ID NOT BETWEEN

  sql-bench/crash-me.sh
    1.34.1.8 02/12/28 02:17:11 walrus@mysql.com +44 -6
     1) Add option (--verbose) that allows user switch on/off 
    new logging in crash-me
    2) Add new test: no_id_between, that indicates if NOT ID BETWEEN 
    interprets as ID NOT BETWEEN

ChangeSet
  1.676.266.4 02/12/27 21:39:35 monty@mashka.mysql.fi +4 -0
  Fixed max_key_length when using UNIQUE keys.
  This fixed a bug in GROUP BY on a BLOB column with NULL values.

  mysql-test/t/group_by.test
    1.3.1.7 02/12/27 21:39:34 monty@mashka.mysql.fi +11 -0
    Test of bug

  mysql-test/r/group_by.result
    1.3.1.7 02/12/27 21:39:34 monty@mashka.mysql.fi +8 -0
    Updated results

  myisam/mi_unique.c
    1.8.1.1 02/12/27 21:39:34 monty@mashka.mysql.fi +10 -1
    Simple optimization
    Make different CRC for keys with null and empty strings.

  myisam/mi_create.c
    1.14.1.3 02/12/27 21:39:34 monty@mashka.mysql.fi +1 -1
    Fixed max_key_length when using UNIQUE keys.

ChangeSet
  1.1403.20.3 02/12/27 21:36:56 bell@sanja.is.com.ua +2 -0
  Merge sanja.is.com.ua:/home/bell/mysql/work-row-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-from-4.1

  sql/item_subselect.h
    1.24 02/12/27 21:36:54 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.cc
    1.44 02/12/27 21:36:54 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1403.20.2 02/12/27 21:19:25 bell@sanja.is.com.ua +2 -0
  postreview fix

  sql/item_subselect.h
    1.22.1.1 02/12/27 21:19:24 bell@sanja.is.com.ua +5 -6
    postreview fix

  sql/item_subselect.cc
    1.42.1.1 02/12/27 21:19:24 bell@sanja.is.com.ua +9 -3
    postreview fix

ChangeSet
  1.1403.22.1 02/12/27 21:42:21 peter@mysql.com +1 -0
  Merge mysql.com:/home/pz/mysql/mysql-4.1-root
  into mysql.com:/home/pz/mysql/mysql-4.1

  sql/sql_yacc.yy
    1.203.5.2 02/12/27 21:42:18 peter@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1403.19.2 02/12/27 19:47:23 peter@mysql.com +5 -0
  SCRUM
  Add optional second parameter to password() function. It can be used to force password()
  to return fixed values. 

  sql/sql_yacc.yy
    1.203.6.1 02/12/27 19:47:19 peter@mysql.com +3 -3
    Handling of password with 2 arguments

  sql/item_strfunc.h
    1.36.1.1 02/12/27 19:47:19 peter@mysql.com +1 -0
    New method

  sql/item_strfunc.cc
    1.54.1.22 02/12/27 19:47:19 peter@mysql.com +41 -7
    Add optional second argument to password() function

  mysql-test/t/func_crypt.test
    1.8 02/12/27 19:47:19 peter@mysql.com +6 -1
    new tests

  mysql-test/r/func_crypt.result
    1.10 02/12/27 19:47:19 peter@mysql.com +10 -1
    New test results 

ChangeSet
  1.676.266.3 02/12/27 17:37:55 lenz@mysql.com +2 -0
   - fixes to properly make a "make distclean" (some files were not removed)
     (There are probably some more to fix)

  strings/Makefile.am
    1.15.1.7 02/12/27 17:37:54 lenz@mysql.com +1 -0
     - remove ctype_autonf.c on "make distclean" (it's generated by "configure")

  libmysql/Makefile.shared
    1.10.1.6 02/12/27 17:37:54 lenz@mysql.com +2 -0
     - clean up the vio_* and ctype-* symlinks that are created by link_source
       (thanks to Christian Hammers from Debian for the patch)

ChangeSet
  1.1403.21.1 02/12/27 18:13:32 salle@banica.(none) +3 -0
  Removed ^M
  
  Reported by Georg Richter as it brokes his build with mipspro

  BitKeeper/etc/logging_ok
    1.212.14.8 02/12/27 18:13:32 salle@banica.(none) +1 -0
    Logging to logging@openlogging.org accepted

  client/mysqlshow.c
    1.27 02/12/27 18:13:13 salle@banica.(none) +1 -1
    Removed ^M

  client/mysqlimport.c
    1.31 02/12/27 18:13:13 salle@banica.(none) +1 -1
    Removed ^M

ChangeSet
  1.1403.20.1 02/12/27 17:14:33 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-row-4.1

  sql/sql_yacc.yy
    1.203.1.8 02/12/27 17:14:32 bell@sanja.is.com.ua +0 -0
    Auto merged

  myisam/mi_update.c
    1.13 02/12/27 14:39:38 serg@sergbook.mysql.com +0 -2
    intermediate cleanup checkin

  myisam/mi_open.c
    1.54 02/12/27 14:39:38 serg@sergbook.mysql.com +18 -13
    intermediate cleanup checkin

  myisam/ft_update.c
    1.26 02/12/27 14:39:38 serg@sergbook.mysql.com +2 -8
    intermediate cleanup checkin

  myisam/ft_static.c
    1.18 02/12/27 14:39:38 serg@sergbook.mysql.com +0 -9
    intermediate cleanup checkin

  myisam/ft_parser.c
    1.32 02/12/27 14:39:38 serg@sergbook.mysql.com +0 -32
    intermediate cleanup checkin

  myisam/ft_nlq_search.c
    1.19 02/12/27 14:39:38 serg@sergbook.mysql.com +0 -25
    intermediate cleanup checkin

  myisam/myisamdef.h
    1.53 02/12/27 14:39:37 serg@sergbook.mysql.com +3 -3
    intermediate cleanup checkin

  myisam/myisamchk.c
    1.89 02/12/27 14:39:37 serg@sergbook.mysql.com +2 -2
    intermediate cleanup checkin

  myisam/mi_delete.c
    1.16 02/12/27 14:39:37 serg@sergbook.mysql.com +0 -1
    intermediate cleanup checkin

  myisam/mi_create.c
    1.27 02/12/27 14:39:37 serg@sergbook.mysql.com +11 -34
    intermediate cleanup checkin

  myisam/fulltext.h
    1.7 02/12/27 14:39:37 serg@sergbook.mysql.com +1 -7
    intermediate cleanup checkin

  myisam/ftdefs.h
    1.20 02/12/27 14:39:37 serg@sergbook.mysql.com +0 -13
    intermediate cleanup checkin

  myisam/ft_boolean_search.c
    1.55 02/12/27 14:39:37 serg@sergbook.mysql.com +1 -1
    intermediate cleanup checkin

ChangeSet
  1.676.1.632 02/12/27 14:46:23 Sinisa@sinisa.nasamreza.org +1 -0
  merge fixes

  sql/mysqld.cc
    1.162.1.104 02/12/27 14:46:21 Sinisa@sinisa.nasamreza.org +0 -1
    merge fixes

ChangeSet
  1.676.1.631 02/12/27 14:39:12 Sinisa@sinisa.nasamreza.org +1 -0
  reverting a patch

  sql/mysqld.cc
    1.162.1.103 02/12/27 14:39:08 Sinisa@sinisa.nasamreza.org +1 -1
    reverting a patch

ChangeSet
  1.1403.4.10 02/12/27 11:52:49 bar@bar.mysql.r18.ru +1 -0
  GIS doc

  Docs/gis.txt
    1.1 02/12/27 11:52:47 bar@bar.mysql.r18.ru +861 -0

  Docs/gis.txt
    1.0 02/12/27 11:52:47 bar@bar.mysql.r18.ru +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.wrk/Docs/gis.txt

ChangeSet
  1.1403.1.14 02/12/26 20:04:22 Sinisa@sinisa.nasamreza.org +4 -0
  merge fixes

  sql/item.cc
    1.27.10.11 02/12/26 20:04:18 Sinisa@sinisa.nasamreza.org +0 -2
    Fixes for merge ...

  sql/sql_yacc.yy
    1.203.4.2 02/12/26 20:00:30 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/t/derived.test
    1.16 02/12/26 20:00:30 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/r/derived.result
    1.17 02/12/26 20:00:30 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1346.46.78 02/12/26 18:26:37 monty@mashka.mysql.fi +7 -0
  Cut hostnames at HOSTNAME_LENGTH to avoid theoretical hostname overruns
  Changed long packat handling to check for packets of length 0xffffff.
  This does however break packet handling for older clients.
  If you are using packets >= 16M then you need to upgrade client and server
  after this patch.

  sql/sql_parse.cc
    1.218.1.64 02/12/26 18:26:35 monty@mashka.mysql.fi +2 -0
    Cut hostnames at HOSTNAME_LENGTH to avoid theoretical hostname overruns

  sql/sql_acl.cc
    1.51.1.32 02/12/26 18:26:34 monty@mashka.mysql.fi +1 -1
    Safety fix.

  sql/net_serv.cc
    1.46.1.1 02/12/26 18:26:34 monty@mashka.mysql.fi +1 -1
    Fixed wrong max packet length

  sql/item_create.cc
    1.15.1.9 02/12/26 18:26:34 monty@mashka.mysql.fi +7 -5
    Optimized create of create_func_current_user()

  sql/item.h
    1.20.1.13 02/12/26 18:26:34 monty@mashka.mysql.fi +0 -2
    Removed automatic set of length for Item_string

  sql/ha_innodb.cc
    1.73.1.62 02/12/26 18:26:34 monty@mashka.mysql.fi +3 -6
    Optimization of checking command

  Docs/internals.texi
    1.21 02/12/26 18:26:34 monty@mashka.mysql.fi +42 -41
    Updated documentation for 4.1 protocol

ChangeSet
  1.1403.19.1 02/12/26 19:12:57 peter@mysql.com +25 -0
  Add proper error message for old client connecting new server using user which has password in 
  new format SCRUM

ChangeSet
  1.676.267.2 02/12/26 17:50:07 monty@mashka.mysql.fi +2 -0
  Safety fix to not allow one to specify too big max_alloc_packet to mysqld
  Safety fix to not cause conflicts with extended packages in 4.0.

  sql/net_serv.cc
    1.15.1.5 02/12/26 17:50:06 monty@mashka.mysql.fi +1 -1
    Safety fix to not cause conflicts with extended packages in 4.0.
    (Should not cause any notable changes for 3.23 servers)

  sql/mysqld.cc
    1.162.15.1 02/12/26 17:50:06 monty@mashka.mysql.fi +1 -1
    Safety fix to not allow one to specify too big max_alloc_packet

ChangeSet
  1.1403.4.9 02/12/26 17:48:19 bell@sanja.is.com.ua +3 -0
  added FROM DUAL for derived tables

  sql/sql_yacc.yy
    1.203.5.1 02/12/26 17:48:13 bell@sanja.is.com.ua +1 -0
    added FROM DUAL for derived tables

  mysql-test/t/derived.test
    1.13.1.2 02/12/26 17:48:13 bell@sanja.is.com.ua +1 -0
    added FROM DUAL for derived tables

  mysql-test/r/derived.result
    1.14.1.2 02/12/26 17:48:13 bell@sanja.is.com.ua +3 -0
    added FROM DUAL for derived tables

  sql/sql_parse.cc
    1.235.29.1 02/12/26 18:41:22 peter@mysql.com +27 -16
    Add proper error message if old clients can't authenticate due to unsupported protocol
    SCRUM

  sql/share/ukrainian/errmsg.txt
    1.27 02/12/26 18:41:22 peter@mysql.com +1 -0
    ukrainian

  sql/share/swedish/errmsg.txt
    1.64 02/12/26 18:41:22 peter@mysql.com +1 -0
    swedish

  sql/share/spanish/errmsg.txt
    1.64 02/12/26 18:41:22 peter@mysql.com +1 -0
    spanish

  sql/share/slovak/errmsg.txt
    1.64 02/12/26 18:41:22 peter@mysql.com +1 -0
    slovak

  sql/share/serbian/errmsg.txt
    1.18 02/12/26 18:41:22 peter@mysql.com +1 -0
    se

  sql/share/russian/errmsg.txt
    1.61 02/12/26 18:41:22 peter@mysql.com +1 -0
    russian

  sql/share/romanian/errmsg.txt
    1.62 02/12/26 18:41:22 peter@mysql.com +1 -0
    romanian

  sql/share/portuguese/errmsg.txt
    1.64 02/12/26 18:41:22 peter@mysql.com +1 -0
    portuguese

  sql/share/polish/errmsg.txt
    1.63 02/12/26 18:41:22 peter@mysql.com +1 -0
    polish

  sql/share/norwegian/errmsg.txt
    1.63 02/12/26 18:41:22 peter@mysql.com +1 -0
    norwegian

  sql/share/norwegian-ny/errmsg.txt
    1.63 02/12/26 18:41:22 peter@mysql.com +1 -0
    norwegian-ny

  sql/share/korean/errmsg.txt
    1.63 02/12/26 18:41:22 peter@mysql.com +1 -0
    korean

  sql/share/japanese/errmsg.txt
    1.63 02/12/26 18:41:22 peter@mysql.com +1 -0
    japaneese

  sql/share/italian/errmsg.txt
    1.69 02/12/26 18:41:22 peter@mysql.com +1 -0
    italian

  sql/share/hungarian/errmsg.txt
    1.65 02/12/26 18:41:22 peter@mysql.com +1 -0
    hungarian

  sql/share/greek/errmsg.txt
    1.64 02/12/26 18:41:22 peter@mysql.com +1 -0
    greek

  sql/share/german/errmsg.txt
    1.64 02/12/26 18:41:22 peter@mysql.com +1 -0
    german

  sql/share/french/errmsg.txt
    1.63 02/12/26 18:41:22 peter@mysql.com +1 -0
    french

  sql/share/estonian/errmsg.txt
    1.64 02/12/26 18:41:22 peter@mysql.com +1 -0
    estonian

  sql/share/english/errmsg.txt
    1.69 02/12/26 18:41:22 peter@mysql.com +1 -0
    New Error message for in case old client connects new server and new auth is to be used

  sql/share/dutch/errmsg.txt
    1.66 02/12/26 18:41:22 peter@mysql.com +1 -0
    dutch

  sql/share/danish/errmsg.txt
    1.62 02/12/26 18:41:22 peter@mysql.com +1 -0
    danish

  sql/share/czech/errmsg.txt
    1.64 02/12/26 18:41:22 peter@mysql.com +1 -0
    czech

  include/mysqld_error.h
    1.61 02/12/26 18:41:22 peter@mysql.com +2 -1
    Add new error message 

ChangeSet
  1.676.267.1 02/12/26 16:35:15 monty@mashka.mysql.fi +1 -0
  Updated comment

  sql/sql_table.cc
    1.83.1.28 02/12/26 16:35:14 monty@mashka.mysql.fi +3 -6
    Updated comment

ChangeSet
  1.1346.46.77 02/12/26 15:55:22 monty@mashka.mysql.fi +2 -0
  Test cleanup

  mysql-test/t/case.test
    1.7 02/12/26 15:55:21 monty@mashka.mysql.fi +6 -2
    Removed unnecessary drop commands

  mysql-test/r/case.result
    1.5.1.4 02/12/26 15:55:21 monty@mashka.mysql.fi +1 -2
    Removed unnecessary drop commands

ChangeSet
  1.1346.46.76 02/12/26 15:26:32 monty@mashka.mysql.fi +1 -0
  merge

  mysql-test/r/case.result
    1.5.1.3 02/12/26 15:26:31 monty@mashka.mysql.fi +0 -5
    merge

ChangeSet
  1.1346.80.1 02/12/26 15:24:40 monty@mashka.mysql.fi +1 -0
  Update of test results

  mysql-test/r/case.result
    1.5.2.1 02/12/26 15:24:38 monty@mashka.mysql.fi +5 -0
    Update of test results

ChangeSet
  1.1403.4.8 02/12/26 10:48:03 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-send_error-4.1

  sql/sql_select.cc
    1.173.1.31 02/12/26 10:48:01 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1403.18.7 02/12/26 01:28:59 bell@sanja.is.com.ua +16 -0
  support of subselect without FROM reducing (SCRUM)
  fixed bug of calling setup_fields without correct lex->current_select pointer in mysql_derived
  more correct creation of reference in Item_field::fix_field

  sql/sql_derived.cc
    1.25.1.1 02/12/26 01:28:57 bell@sanja.is.com.ua +5 -4
    fixed bug of calling setup_fields without correct lex->current_select pointer

  sql/sql_base.cc
    1.122.14.1 02/12/26 01:28:57 bell@sanja.is.com.ua +4 -1
    reference in Item_field::fix_field related changes

  sql/mysql_priv.h
    1.160.1.29 02/12/26 01:28:57 bell@sanja.is.com.ua +1 -1
    reference in Item_field::fix_field related changes

  sql/item_subselect.h
    1.23 02/12/26 01:28:57 bell@sanja.is.com.ua +1 -0
    support of subselect without FROM reducing

  sql/item_subselect.cc
    1.43 02/12/26 01:28:57 bell@sanja.is.com.ua +48 -0
    support of subselect without FROM reducing

  sql/item_strfunc.h
    1.37 02/12/26 01:28:57 bell@sanja.is.com.ua +23 -8
    fixed layout
    support of subselect without FROM reducing

  sql/item_row.h
    1.6 02/12/26 01:28:57 bell@sanja.is.com.ua +2 -0
    support of subselect without FROM reducing

  sql/item_row.cc
    1.6 02/12/26 01:28:57 bell@sanja.is.com.ua +16 -1
    support of subselect without FROM reducing

  sql/item_func.h
    1.57 02/12/26 01:28:57 bell@sanja.is.com.ua +7 -0
    support of subselect without FROM reducing

  sql/item_func.cc
    1.90.1.2 02/12/26 01:28:57 bell@sanja.is.com.ua +19 -0
    support of subselect without FROM reducing

  sql/item_cmpfunc.h
    1.33 02/12/26 01:28:57 bell@sanja.is.com.ua +12 -0
    support of subselect without FROM reducing

  sql/item_cmpfunc.cc
    1.52 02/12/26 01:28:57 bell@sanja.is.com.ua +16 -0
    support of subselect without FROM reducing

  sql/item.h
    1.41.4.12 02/12/26 01:28:57 bell@sanja.is.com.ua +5 -2
    support of subselect without FROM reducing

  sql/item.cc
    1.27.14.4 02/12/26 01:28:57 bell@sanja.is.com.ua +26 -16
    support of subselect without FROM reducing
    more correct creation of reference in Item_field::fix_field

  mysql-test/t/subselect.test
    1.42 02/12/26 01:28:57 bell@sanja.is.com.ua +6 -0
    new explain with subselect reduced

  mysql-test/r/subselect.result
    1.48 02/12/26 01:28:57 bell@sanja.is.com.ua +32 -1
    new explain with subselect reduced

ChangeSet
  1.1403.4.7 02/12/25 23:57:01 jani@dsl-kpogw4gb5.dial.inet.fi +1 -0
  Changed get_arg() so that it can be used to fetch more than
  just one argument from command line.
  
  Fixed a bug in interactive 'connect' command, which earlier
  couldn't take quoted arguments.
  
  How-to-repeat:
  
  mysql> connect `stupid db` localhost

  client/mysql.cc
    1.108.1.2 02/12/25 23:56:57 jani@dsl-kpogw4gb5.dial.inet.fi +44 -26
    Changed get_arg() so that it can be used to fetch more than
    just one argument from command line.
    
    Fixed a bug in interactive 'connect' command, which earlier
    couldn't take quoted arguments.
    
    How-to-repeat:
    
    mysql> connect `stupid db` localhost

ChangeSet
  1.1403.1.13 02/12/25 15:07:36 Sinisa@sinisa.nasamreza.org +3 -0
  bug fixes and tests ...

  sql/sql_union.cc
    1.56 02/12/25 15:07:30 Sinisa@sinisa.nasamreza.org +4 -3
    Fix for usage of ORDER BY ... and / or LIMIT .... without braces

  mysql-test/t/update.test
    1.7 02/12/25 15:07:30 Sinisa@sinisa.nasamreza.org +4 -1
    Test for update with subselect and derived table ...

  mysql-test/r/update.result
    1.9 02/12/25 15:07:30 Sinisa@sinisa.nasamreza.org +4 -1
    Test for update with subselect and derived table ...

ChangeSet
  1.1403.4.5 02/12/25 16:34:32 ram@mysql.r18.ru +1 -0
  BDB logs deleting has been moved from start_master 
  to the start of mysql-test-run

  mysql-test/mysql-test-run.sh
    1.155 02/12/25 16:34:31 ram@mysql.r18.ru +3 -2
    BDB logs deleting has been moved from start_master 
    to the start of mysql-test-run

ChangeSet
  1.1403.18.6 02/12/25 14:33:28 bell@sanja.is.com.ua +1 -0
  results fixing

  mysql-test/r/subselect.result
    1.47 02/12/25 14:33:26 bell@sanja.is.com.ua +1 -1
    results fixing

ChangeSet
  1.1403.18.5 02/12/25 12:51:08 bell@sanja.is.com.ua +2 -0
  more correct argument for translation function (SCRUM related)
  fiexd bug in LIMIT check

  sql/item_subselect.h
    1.22 02/12/25 12:50:54 bell@sanja.is.com.ua +5 -5
    more correct argument for translation function

  sql/item_subselect.cc
    1.42 02/12/25 12:50:54 bell@sanja.is.com.ua +20 -21
    more correct argument for translation function
    fiexd bug in LIMIT check

ChangeSet
  1.1403.18.4 02/12/25 12:03:08 bell@sanja.is.com.ua +3 -0
  check of LIMIT in row IN subquery (SCRUM related)

  sql/item_subselect.cc
    1.41 02/12/25 12:03:05 bell@sanja.is.com.ua +14 -0
    check of LIMIT in row IN subquery

  mysql-test/t/subselect.test
    1.41 02/12/25 12:03:05 bell@sanja.is.com.ua +2 -0
    test of LIMIT in row IN subquery

  mysql-test/r/subselect.result
    1.46 02/12/25 12:03:05 bell@sanja.is.com.ua +2 -0
    test of LIMIT in row IN subquery

ChangeSet
  1.1403.18.3 02/12/25 11:09:19 bell@sanja.is.com.ua +5 -0
  merging

  mysql-test/t/subselect.test
    1.40 02/12/25 11:09:18 bell@sanja.is.com.ua +0 -1
    merging

  mysql-test/r/subselect.result
    1.45 02/12/25 11:09:18 bell@sanja.is.com.ua +0 -0
    merging

  sql/sql_class.cc
    1.82.6.8 02/12/25 11:06:00 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.cc
    1.40 02/12/25 11:06:00 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.27.14.3 02/12/25 11:06:00 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1403.18.2 02/12/24 22:40:19 peter@mysql.com +22 -0
  Fix messages in other languages

  sql/share/ukrainian/errmsg.txt
    1.26 02/12/24 22:40:16 peter@mysql.com +2 -2
    Ukrainian

  sql/share/swedish/errmsg.txt
    1.63 02/12/24 22:40:16 peter@mysql.com +2 -2
    Swedish

  sql/share/spanish/errmsg.txt
    1.63 02/12/24 22:40:16 peter@mysql.com +2 -2
    spanish

  sql/share/slovak/errmsg.txt
    1.63 02/12/24 22:40:16 peter@mysql.com +2 -2
    Slovak

  sql/share/serbian/errmsg.txt
    1.17 02/12/24 22:40:16 peter@mysql.com +2 -2
    Serbian

  sql/share/russian/errmsg.txt
    1.60 02/12/24 22:40:16 peter@mysql.com +2 -2
    Russian

  sql/share/romanian/errmsg.txt
    1.61 02/12/24 22:40:16 peter@mysql.com +2 -2
    Romainian

  sql/share/portuguese/errmsg.txt
    1.63 02/12/24 22:40:16 peter@mysql.com +2 -2
    Portuguese

  sql/share/polish/errmsg.txt
    1.62 02/12/24 22:40:16 peter@mysql.com +2 -2
    polish

  sql/share/norwegian/errmsg.txt
    1.62 02/12/24 22:40:16 peter@mysql.com +2 -2
    Norwegian

  sql/share/norwegian-ny/errmsg.txt
    1.62 02/12/24 22:40:16 peter@mysql.com +2 -2
    Norwegian-ny

  sql/share/korean/errmsg.txt
    1.62 02/12/24 22:40:16 peter@mysql.com +2 -2
    Korean

  sql/share/japanese/errmsg.txt
    1.62 02/12/24 22:40:16 peter@mysql.com +2 -2
    Japanese

  sql/share/italian/errmsg.txt
    1.68 02/12/24 22:40:16 peter@mysql.com +2 -2
    Italian

  sql/share/hungarian/errmsg.txt
    1.64 02/12/24 22:40:16 peter@mysql.com +2 -2
    Hungarian

  sql/share/greek/errmsg.txt
    1.63 02/12/24 22:40:16 peter@mysql.com +2 -2
    Greek

  sql/share/german/errmsg.txt
    1.63 02/12/24 22:40:16 peter@mysql.com +2 -2
    German

  sql/share/french/errmsg.txt
    1.62 02/12/24 22:40:16 peter@mysql.com +2 -2
    French

  sql/share/estonian/errmsg.txt
    1.63 02/12/24 22:40:16 peter@mysql.com +2 -2
    Estonian

  sql/share/dutch/errmsg.txt
    1.65 02/12/24 22:40:16 peter@mysql.com +2 -2
    Dutch

  sql/share/danish/errmsg.txt
    1.61 02/12/24 22:40:16 peter@mysql.com +2 -2
    Danish

  sql/share/czech/errmsg.txt
    1.63 02/12/24 22:40:15 peter@mysql.com +2 -2
    Chezh

ChangeSet
  1.1403.18.1 02/12/24 21:44:54 peter@mysql.com +1 -0
  Correct wrong error messages

  sql/share/english/errmsg.txt
    1.68 02/12/24 21:44:51 peter@mysql.com +2 -2
    Correct Error messages to match actual behavior

ChangeSet
  1.1346.46.75 02/12/24 16:25:03 lenz@mysql.com +1 -0
   - bumped up version number to 4.0.8-gamma
   - tagged ChangeSet 1.1484 as mysql-4.0.7

  configure.in
    1.191.1.56 02/12/24 16:25:01 lenz@mysql.com +1 -1
     - bumped up version number to 4.0.8-gamma

ChangeSet
  1.1346.46.74 02/12/24 14:33:11 Sinisa@sinisa.nasamreza.org +2 -0
  fix for an error in the merge from 3.23

  mysql-test/t/case.test
    1.6 02/12/24 14:33:08 Sinisa@sinisa.nasamreza.org +2 -2
    fix for an error in the merge from 3.23

  mysql-test/r/case.result
    1.5.1.2 02/12/24 14:33:08 Sinisa@sinisa.nasamreza.org +5 -0
    fix for an error in the merge from 3.23

ChangeSet
  1.1403.4.2 02/12/24 14:08:44 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-derived-4.1

  sql/item.cc
    1.27.14.2 02/12/24 14:08:40 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1403.1.12 02/12/24 14:02:42 Sinisa@sinisa.nasamreza.org +4 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/sql_parse.cc
    1.235.26.5 02/12/24 14:02:37 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/item.cc
    1.27.10.10 02/12/24 14:02:36 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.37.1.2 02/12/24 14:02:36 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.42.1.2 02/12/24 14:02:36 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1403.1.11 02/12/24 13:58:07 Sinisa@sinisa.nasamreza.org +9 -0
  Many fixes.
  
  I still have to make a test case for :
  
  UPDATE from sub-select with derived table

  sql/sql_yacc.yy
    1.203.4.1 02/12/24 13:58:03 Sinisa@sinisa.nasamreza.org +20 -6
    Three fixes.
    
    One for not allowing mixing of braces and non-braces in UNION's
    
    Second one for table aliases in multi-table deletes / updates
    
    Third one for using derived tables within sub-selects for 
    UPDATE / DELETE commands

  sql/sql_show.cc
    1.86.1.17 02/12/24 13:58:03 Sinisa@sinisa.nasamreza.org +1 -1
    Fix for th eshow of replication status

  sql/sql_parse.cc
    1.235.28.1 02/12/24 13:58:03 Sinisa@sinisa.nasamreza.org +1 -0
    Fix for a bug that involved derived table in sub-select in UPDATE or
    DELETE statement

  sql/sql_derived.cc
    1.26 02/12/24 13:58:02 Sinisa@sinisa.nasamreza.org +2 -7
    Fix for a bug that involved derived table in sub-select in UPDATE or
    DELETE statement

  sql/sql_cache.cc
    1.39.2.1 02/12/24 13:58:02 Sinisa@sinisa.nasamreza.org +2 -0
    Fix for a bug that involved derived table in sub-select in UPDATE or
    DELETE statement

  mysql-test/t/subselect.test
    1.37.2.1 02/12/24 13:58:02 Sinisa@sinisa.nasamreza.org +3 -3
    Fix for new syntax for UNION's

  mysql-test/t/multi_update.test
    1.19 02/12/24 13:58:02 Sinisa@sinisa.nasamreza.org +6 -0
    Test for found rows in multi-table update

  mysql-test/r/subselect.result
    1.42.2.1 02/12/24 13:58:02 Sinisa@sinisa.nasamreza.org +3 -3
    Fix for new syntax for UNION's

  mysql-test/r/multi_update.result
    1.17 02/12/24 13:58:02 Sinisa@sinisa.nasamreza.org +15 -0
    Test for found rows in multi-table update

ChangeSet
  1.1403.17.1 02/12/24 14:06:52 bar@bar.mysql.r18.ru +2 -0
  thd_charset copy in lex

  sql/sql_lex.h
    1.102.1.2 02/12/24 14:06:50 bar@bar.mysql.r18.ru +1 -1
    thd_charset copy in lex

  sql/sql_lex.cc
    1.59.2.3 02/12/24 14:06:50 bar@bar.mysql.r18.ru +1 -0
    thd_charset copy in lex

ChangeSet
  1.1403.16.1 02/12/24 00:53:07 jani@dsl-kpogw4gb5.dial.inet.fi +2 -0
  mysql multiline comment, by Sergey Gluhov.

  BitKeeper/etc/logging_ok
    1.212.14.7 02/12/24 00:53:06 jani@dsl-kpogw4gb5.dial.inet.fi +1 -0
    Logging to logging@openlogging.org accepted

  client/mysql.cc
    1.108.1.1 02/12/24 00:52:07 jani@dsl-kpogw4gb5.dial.inet.fi +31 -12
    mysql multiline comment, by Sergey Gluhov.

ChangeSet
  1.1403.14.5 02/12/23 18:25:25 bell@sanja.is.com.ua +3 -0
  LIMIT is prohibited in IN/ALL/ANY/SOME

  sql/item_subselect.cc
    1.35.1.1 02/12/23 18:25:03 bell@sanja.is.com.ua +14 -0
    LIMIT is prohibited in IN/ALL/ANY/SOME

  mysql-test/t/subselect.test
    1.37.1.1 02/12/23 18:25:03 bell@sanja.is.com.ua +9 -1
    LIMIT is prohibited in IN/ALL/ANY/SOME

  mysql-test/r/subselect.result
    1.42.1.1 02/12/23 18:25:03 bell@sanja.is.com.ua +7 -1
    LIMIT is prohibited in IN/ALL/ANY/SOME

ChangeSet
  1.676.266.1 02/12/23 14:36:40 lenz@mysql.com +20 -0
   - Applied various patches provided by Christian Hammers (MySQL maintainer
     for the Debian project) to fix some architecture-specific problems
     and some bugs

  scripts/safe_mysqld.sh
    1.39.8.1 02/12/23 14:36:39 lenz@mysql.com +2 -0
     - applied patch provided by Debian to enhance security (This way all logs 
       and databases are created world-nothing).

  scripts/mysqlaccess.sh
    1.6 02/12/23 14:36:39 lenz@mysql.com +1 -1
     - make $script_log path less dependent on the shell

  scripts/mysql_fix_privilege_tables.sh
    1.3.1.1 02/12/23 14:36:39 lenz@mysql.com +18 -11
     - fixed some typos
     - script cleanup

  man/safe_mysqld.1
    1.1.2.1 02/12/23 14:36:39 lenz@mysql.com +1 -1
     - some syntactical correction in the headlines of the manpages for
       apropos(1) (Thanks to Christian Hammers from the Debian project for
       the patch)

  man/replace.1
    1.1.1.1 02/12/23 14:36:39 lenz@mysql.com +1 -1
     - some syntactical correction in the headlines of the manpages for
       apropos(1) (Thanks to Christian Hammers from the Debian project for
       the patch)

  man/perror.1
    1.1.1.1 02/12/23 14:36:39 lenz@mysql.com +1 -1
     - some syntactical correction in the headlines of the manpages for
       apropos(1) (Thanks to Christian Hammers from the Debian project for
       the patch)

  man/mysqlshow.1
    1.1.1.1 02/12/23 14:36:39 lenz@mysql.com +1 -1
     - some syntactical correction in the headlines of the manpages for
       apropos(1) (Thanks to Christian Hammers from the Debian project for
       the patch)

  man/mysqldump.1
    1.1.1.1 02/12/23 14:36:39 lenz@mysql.com +3 -3
     - some syntactical correction in the headlines of the manpages for
       apropos(1) (Thanks to Christian Hammers from the Debian project for
       the patch)
     - fixed nroff mistake

  man/mysqld_multi.1
    1.1.1.1 02/12/23 14:36:39 lenz@mysql.com +1 -1
     - some syntactical correction in the headlines of the manpages for
       apropos(1) (Thanks to Christian Hammers from the Debian project for
       the patch)

  man/mysqld.1
    1.1.1.1 02/12/23 14:36:39 lenz@mysql.com +1 -1
     - some syntactical correction in the headlines of the manpages for
       apropos(1) (Thanks to Christian Hammers from the Debian project for
       the patch)

  man/mysqladmin.1
    1.1.1.1 02/12/23 14:36:39 lenz@mysql.com +1 -1
     - some syntactical correction in the headlines of the manpages for
       apropos(1) (Thanks to Christian Hammers from the Debian project for
       the patch)

  man/mysqlaccess.1
    1.1.1.1 02/12/23 14:36:39 lenz@mysql.com +1 -1
     - some syntactical correction in the headlines of the manpages for
       apropos(1) (Thanks to Christian Hammers from the Debian project for
       the patch)

  man/mysql_zap.1
    1.1.1.1 02/12/23 14:36:39 lenz@mysql.com +1 -1
     - some syntactical correction in the headlines of the manpages for
       apropos(1) (Thanks to Christian Hammers from the Debian project for
       the patch)

  man/mysql.1
    1.4.1.1 02/12/23 14:36:39 lenz@mysql.com +1 -1
     - some syntactical correction in the headlines of the manpages for
       apropos(1) (Thanks to Christian Hammers from the Debian project for
       the patch)

  man/isamlog.1
    1.1.1.1 02/12/23 14:36:39 lenz@mysql.com +1 -1
     - some syntactical correction in the headlines of the manpages for
       apropos(1) (Thanks to Christian Hammers from the Debian project for
       the patch)

  man/isamchk.1
    1.1.1.1 02/12/23 14:36:39 lenz@mysql.com +1 -1
     - some syntactical correction in the headlines of the manpages for
       apropos(1) (Thanks to Christian Hammers from the Debian project for
       the patch)

  ltconfig
    1.6.1.3 02/12/23 14:36:39 lenz@mysql.com +10 -0
     - A hardcoded "rpath" is forbidden by the Debian policy (thanks to
       Christian Hammers from the Debian project for forwarding this patch)

  bdb/include/mutex.h
    1.3.1.1 02/12/23 14:36:39 lenz@mysql.com +1 -1
     - Patch for building on m68k architecture (originally provided
       by Michael Fedrowitz for Debian Linux, thanks to Christian Hammers from
       the Debian project for forwarding it)

  bdb/dist/aclocal/mutex.m4
    1.3.2.1 02/12/23 14:36:39 lenz@mysql.com +1 -1
     - Sparc patch for mutexes/pthreads from Christopher C. Chimelis and
       Ben Collins from Debian (thanks to Christian Hammers from the Debian
       project for forwarding it)

  Makefile.am
    1.22.1.4 02/12/23 14:36:39 lenz@mysql.com +2 -2
     - put current directory (.) at front of SUBDIRS list, so that "distclean" 
       is done last. IF done first, "distclean" in include directory fails
       because config.h is missing, which is removed by distclean in current
       directory. (thanks to "jww" for the patch)
     - make "distclean" in libmysql_r, too (Thanks to Christian Hammers from the
       Debian project for the patch)

ChangeSet
  1.676.1.630 02/12/23 14:56:41 Sinisa@sinisa.nasamreza.org +3 -0
  many bug fixes

  sql/sql_select.cc
    1.91.1.37 02/12/23 14:56:38 Sinisa@sinisa.nasamreza.org +2 -1
    Fix for a bug which is caused when a single table is scanned by
    entire index and WHERE clause is so broad that JOIN type is JT_ALL.

  sql/mysqld.cc
    1.162.1.102 02/12/23 14:56:38 Sinisa@sinisa.nasamreza.org +1 -1
    Fix for a bug with max_allowed_packt

  sql/log.cc
    1.55.1.13 02/12/23 14:56:38 Sinisa@sinisa.nasamreza.org +1 -0
    Fix for a bug in query logging ...

ChangeSet
  1.1346.46.73 02/12/23 13:33:55 lenz@mysql.com +1 -0
   - fix CC_VERSION and CXX_VERSION for compilers that return multiple lines of
     output for "--version" (e.g. gcc 3.x)

  configure.in
    1.191.1.55 02/12/23 13:33:53 lenz@mysql.com +2 -2
     - fix CC_VERSION and CXX_VERSION for compilers that return multiple lines of
       output for "--version" (e.g. gcc 3.x)

ChangeSet
  1.1346.46.72 02/12/22 01:54:29 heikki@hundin.mysql.fi +19 -0
  Many files:
    Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
  sql_select.cc:
    Remove superfluous prints to .err log when a locking SELECT fails to a deadlock or a lock wait timeout

  innobase/ut/ut0ut.c
    1.11 02/12/22 01:50:10 heikki@hundin.mysql.fi +2 -2
    Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE

  innobase/srv/srv0start.c
    1.37 02/12/22 01:49:31 heikki@hundin.mysql.fi +11 -2
    Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE

  innobase/row/row0upd.c
    1.16 02/12/22 01:47:37 heikki@hundin.mysql.fi +81 -7
    Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE

  innobase/row/row0sel.c
    1.28 02/12/22 01:47:36 heikki@hundin.mysql.fi +14 -3
    Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE

  innobase/row/row0mysql.c
    1.39 02/12/22 01:47:36 heikki@hundin.mysql.fi +57 -11
    Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE

  innobase/row/row0ins.c
    1.18 02/12/22 01:47:36 heikki@hundin.mysql.fi +229 -16
    Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE

  innobase/mem/mem0pool.c
    1.8 02/12/22 01:46:19 heikki@hundin.mysql.fi +32 -20
    Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE

  innobase/include/mem0mem.ic
    1.4 02/12/22 01:45:40 heikki@hundin.mysql.fi +4 -3
    Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE

  innobase/include/row0upd.h
    1.5 02/12/22 01:45:32 heikki@hundin.mysql.fi +4 -1
    Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE

  innobase/include/row0mysql.h
    1.15 02/12/22 01:45:31 heikki@hundin.mysql.fi +9 -1
    Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE

  innobase/include/mem0mem.h
    1.6 02/12/22 01:45:29 heikki@hundin.mysql.fi +8 -6
    Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE

  innobase/include/dict0mem.h
    1.13 02/12/22 01:45:27 heikki@hundin.mysql.fi +7 -0
    Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE

  innobase/include/db0err.h
    1.6 02/12/22 01:45:26 heikki@hundin.mysql.fi +3 -2
    Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE

  innobase/include/buf0buf.h
    1.12 02/12/22 01:45:25 heikki@hundin.mysql.fi +5 -2
    Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE

  innobase/ibuf/ibuf0ibuf.c
    1.13 02/12/22 01:45:13 heikki@hundin.mysql.fi +9 -4
    Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE

  innobase/fsp/fsp0fsp.c
    1.12 02/12/22 01:44:40 heikki@hundin.mysql.fi +8 -8
    Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE

  innobase/dict/dict0dict.c
    1.26 02/12/22 01:44:09 heikki@hundin.mysql.fi +109 -27
    Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE

  innobase/btr/btr0sea.c
    1.12 02/12/22 01:43:44 heikki@hundin.mysql.fi +71 -21
    Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE

  sql/sql_select.cc
    1.152.1.64 02/12/22 01:41:06 heikki@hundin.mysql.fi +26 -11
    Remove superfluous prints to .err log when a locking SELECT fails to a deadlock or a lock wait timeout

ChangeSet
  1.676.1.629 02/12/21 10:57:53 monty@mashka.mysql.fi +1 -0
  Moved lower_case_table_name check to right place.

  sql/sql_db.cc
    1.22.1.15 02/12/21 10:57:52 monty@mashka.mysql.fi +2 -3
    Moved lower_case_table_name check to right place.

ChangeSet
  1.1346.46.71 02/12/21 10:56:40 monty@mashka.mysql.fi +6 -0
  Merge with 3.23:
  Remove duplicate casedn_str() in mysql_change_db()
  Fix for null handling in CASE

  sql/sql_db.cc
    1.39.1.13 02/12/21 10:56:39 monty@mashka.mysql.fi +0 -3
    Merge with 3.23 (to remove duplicate casedn_str())

  mysql-test/r/case.result
    1.5.1.1 02/12/21 10:56:39 monty@mashka.mysql.fi +1 -1
    merge with 3.23

  sql/item_cmpfunc.cc
    1.20.1.27 02/12/21 10:48:58 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.73.1.61 02/12/21 10:48:58 monty@mashka.mysql.fi +3 -4
    Auto merged

  sql/ha_innodb.cc
    1.45.19.2 02/12/21 10:48:57 monty@mashka.mysql.fi +0 -0
    Merge rename: sql/ha_innobase.cc -> sql/ha_innodb.cc

  mysql-test/t/case.test
    1.5 02/12/21 10:48:57 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/btr/btr0sea.c
    1.11 02/12/21 10:48:57 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.676.1.628 02/12/21 10:45:06 monty@mashka.mysql.fi +1 -0
  Optimization of CASE bug fix

  sql/item_cmpfunc.cc
    1.14.1.14 02/12/21 10:45:05 monty@mashka.mysql.fi +2 -3
    Optimization of CASE bug fix

ChangeSet
  1.1346.46.70 02/12/21 03:50:09 heikki@hundin.mysql.fi +1 -0
  errmsg.txt:
    More descriptive foreign key error messages

  sql/share/english/errmsg.txt
    1.51.1.8 02/12/21 03:49:59 heikki@hundin.mysql.fi +2 -2
    More descriptive foreign key error messages

ChangeSet
  1.1403.15.1 02/12/21 02:53:07 vva@eagle.mysql.r18.ru +2 -0
  fix some warnings

  libmysqld/libmysqld.c
    1.14.1.7 02/12/21 02:53:03 vva@eagle.mysql.r18.ru +8 -3
    fix some warnings

  libmysql/libmysql.c
    1.119 02/12/21 02:53:03 vva@eagle.mysql.r18.ru +8 -3
    fix some warnings

ChangeSet
  1.676.1.627 02/12/20 20:55:51 heikki@hundin.mysql.fi +1 -0
  btr0sea.c:
    Remove an assertion which can fail in a race of 3 threads

  innobase/btr/btr0sea.c
    1.5.1.6 02/12/20 20:55:44 heikki@hundin.mysql.fi +4 -3
    Remove an assertion which can fail in a race of 3 threads

ChangeSet
  1.1346.46.69 02/12/20 19:13:15 serg@sergbook.mysql.com +1 -0
  Merge work:/home/bk/mysql-4.0
  into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0

  sql/mysqld.cc
    1.297.1.88 02/12/20 19:13:12 serg@sergbook.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.79.1 02/12/20 18:50:34 serg@sergbook.mysql.com +1 -0
  merged

  sql/mysqld.cc
    1.297.21.1 02/12/20 18:50:33 serg@sergbook.mysql.com +1 -2
    merged

ChangeSet
  1.676.265.1 02/12/20 18:39:53 serg@sergbook.mysql.com +1 -0
  removed chroot() bugfix, now --chroot in 3.23 is broken again :((

  sql/mysqld.cc
    1.162.1.101 02/12/20 18:39:52 serg@sergbook.mysql.com +2 -1
    removed chroot() bugfix, now --chroot in 3.23 is broken again :((

ChangeSet
  1.1403.14.3 02/12/20 18:08:49 bar@bar.mysql.r18.ru +1 -0
  less default_charset_info

  sql/item.cc
    1.27.16.1 02/12/20 18:08:47 bar@bar.mysql.r18.ru +6 -6
    less default_charset_info

ChangeSet
  1.1403.14.2 02/12/20 17:57:24 bar@bar.mysql.r18.ru +5 -0
  less default_charset_info

  sql/sql_help.cc
    1.3.1.1 02/12/20 17:57:23 bar@bar.mysql.r18.ru +11 -9
    less default_charset_info

  sql/sql_class.cc
    1.82.8.1 02/12/20 17:57:23 bar@bar.mysql.r18.ru +6 -5
    less default_charset_info

  sql/mysqld.cc
    1.316.1.3 02/12/20 17:57:23 bar@bar.mysql.r18.ru +8 -6
    less default_charset_info

  sql/item_strfunc.cc
    1.54.1.21 02/12/20 17:57:23 bar@bar.mysql.r18.ru +9 -6
    less default_charset_info

  sql/item_func.cc
    1.90.1.1 02/12/20 17:57:23 bar@bar.mysql.r18.ru +4 -4
    less default_charset_info

ChangeSet
  1.1403.13.1 02/12/20 17:14:46 bar@bar.mysql.r18.ru +4 -0
  less default_charset_info 

  sql/sql_delete.cc
    1.95 02/12/20 17:14:44 bar@bar.mysql.r18.ru +2 -2
    less default_charset_info 

  sql/opt_range.cc
    1.75 02/12/20 17:14:44 bar@bar.mysql.r18.ru +2 -2
    less default_charset_info 

  sql/key.cc
    1.17 02/12/20 17:14:44 bar@bar.mysql.r18.ru +1 -2
    less default_charset_info 

  sql/filesort.cc
    1.60 02/12/20 17:14:44 bar@bar.mysql.r18.ru +2 -2
    less default_charset_info 

ChangeSet
  1.1346.46.68 02/12/20 14:59:35 monty@mashka.mysql.fi +1 -0
  Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0

  configure.in
    1.191.1.54 02/12/20 14:59:34 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.78.1 02/12/20 14:58:27 monty@mashka.mysql.fi +20 -0
  Changed thd variables max_join_size and select_limit to type ha_rows.
  This fixed some optimization problems when using -DBIG_TABLES
  Portabilty fixes for OpenUnix and HPUX
  Added C and C++ version numbers to mysqlbug

  sql/structs.h
    1.17.1.8 02/12/20 14:58:20 monty@mashka.mysql.fi +1 -1
    Changed thd variables max_join_size and select_limit to type ha_rows

  sql/sql_show.cc
    1.76.1.19 02/12/20 14:58:20 monty@mashka.mysql.fi +3 -0
    Changed thd variables max_join_size and select_limit to type ha_rows

  sql/sql_parse.cc
    1.218.1.63 02/12/20 14:58:20 monty@mashka.mysql.fi +4 -2
    Removed not needed cast
    Fixed security problem with mysql_drop_db()

  sql/sql_class.h
    1.111.1.25 02/12/20 14:58:20 monty@mashka.mysql.fi +2 -2
    Changed thd variables max_join_size and select_limit to type ha_rows

  sql/slave.cc
    1.164.1.39 02/12/20 14:58:19 monty@mashka.mysql.fi +1 -1
    Removed not needed cast

  sql/set_var.h
    1.4.1.3 02/12/20 14:58:19 monty@mashka.mysql.fi +18 -0
    Changed thd variables max_join_size and select_limit to type ha_rows

  sql/set_var.cc
    1.12.1.7 02/12/20 14:58:18 monty@mashka.mysql.fi +60 -9
    Changed thd variables max_join_size and select_limit to type ha_rows

  sql/repl_failsafe.cc
    1.11.1.14 02/12/20 14:58:18 monty@mashka.mysql.fi +1 -1
    Removed not needed cast

  sql/mysqld.cc
    1.297.1.87 02/12/20 14:58:18 monty@mashka.mysql.fi +11 -5
    Changed thd variables max_join_size and select_limit to type ha_rows

  sql/item_func.h
    1.39.1.17 02/12/20 14:58:18 monty@mashka.mysql.fi +3 -4
    Fixed that user variables that changes are not threated as constants.

  sql/item_func.cc
    1.60.1.24 02/12/20 14:58:17 monty@mashka.mysql.fi +5 -2
    Fixed that user variables that changes are not threated as constants.

  scripts/mysqlbug.sh
    1.6 02/12/20 14:58:17 monty@mashka.mysql.fi +2 -0
    Added C and C++ compiler versions to mysqlbug

  scripts/Makefile.am
    1.21.1.2 02/12/20 14:58:17 monty@mashka.mysql.fi +2 -0
    Added C and C++ compiler versions to mysqlbug

  mysys/my_alloc.c
    1.18 02/12/20 14:58:17 monty@mashka.mysql.fi +3 -1
    Safety fixes (not fatal)

  mysys/Makefile.am
    1.29.1.14 02/12/20 14:58:17 monty@mashka.mysql.fi +0 -1
    Removed duplicate row

  mysql-test/t/variables.test
    1.11.1.1 02/12/20 14:58:17 monty@mashka.mysql.fi +3 -0
    Update of max_join_size handling

  mysql-test/r/variables.result
    1.15.1.1 02/12/20 14:58:16 monty@mashka.mysql.fi +2 -2
    Update of max_join_size handling

  configure.in
    1.191.10.1 02/12/20 14:58:16 monty@mashka.mysql.fi +7 -1
    Fix for OpenUnix
    Added C and C++ versions to mysqlbug

  acinclude.m4
    1.77.1.2 02/12/20 14:58:16 monty@mashka.mysql.fi +6 -3
    Fix for configure problem on OpenUnix

  Docs/mysqld_error.txt
    1.7 02/12/20 14:58:16 monty@mashka.mysql.fi +23 -3
    Added new error message

ChangeSet
  1.1403.12.1 02/12/20 13:43:40 lenz@mysql.com +1 -0
   - added missing file sql/protocol.h to distribution

  sql/Makefile.am
    1.77.1.2 02/12/20 13:43:16 lenz@mysql.com +1 -1
     - added missing file sql/protocol.h to distribution

ChangeSet
  1.1403.9.7 02/12/20 16:21:22 bar@bar.mysql.r18.ru +1 -0
  mysql_com.h:
    ulong fails to compile on FreeBSD. Peter, alsways use "unsigned long" instead!!!

  include/mysql_com.h
    1.60.1.2 02/12/20 16:20:42 bar@bar.mysql.r18.ru +2 -2
    ulong fails to compile on FreeBSD. Peter, alsways use "unsigned long" instead!!!

ChangeSet
  1.1346.46.67 02/12/20 12:56:00 lenz@mysql.com +1 -0
   - tagged ChangeSet 1.1477 as MySQL 4.0.6
   - bumped up version number in configure.in to 4.0.7-gamma

  configure.in
    1.191.1.53 02/12/20 12:55:58 lenz@mysql.com +1 -1
     - bumped up version number in configure.in to 4.0.7-gamma

ChangeSet
  1.1403.9.6 02/12/20 13:00:06 bar@bar.mysql.r18.ru +1 -0
  COUNT(DISTINCT) charset related test

  mysql-test/t/ctype_many.test
    1.6 02/12/20 12:58:46 bar@bar.mysql.r18.ru +4 -1
    COUNT(DISTINCT) charset related test

ChangeSet
  1.1403.6.12 02/12/19 21:15:09 bell@sanja.is.com.ua +13 -0
  row IN subselects (SCRUM)

  sql/sql_yacc.yy
    1.203.1.7 02/12/19 21:15:07 bell@sanja.is.com.ua +6 -6
    changed name of class to corerectly reflex its function

  sql/sql_class.h
    1.123.9.3 02/12/19 21:15:07 bell@sanja.is.com.ua +2 -2
    changed name of class to corerectly reflex its function

  sql/sql_class.cc
    1.82.6.7 02/12/19 21:15:07 bell@sanja.is.com.ua +3 -3
    changed name of class to corerectly reflex its function

  sql/item_subselect.h
    1.21 02/12/19 21:15:07 bell@sanja.is.com.ua +7 -5
    changed name of class to corerectly reflex its function
    row IN subselect

  sql/item_subselect.cc
    1.39 02/12/19 21:15:07 bell@sanja.is.com.ua +78 -19
    changed name of class to corerectly reflex its function
    row IN subselect

  sql/item_row.h
    1.5 02/12/19 21:15:07 bell@sanja.is.com.ua +1 -0
    Fixed row Item to be compatible with row subselect

  sql/item_row.cc
    1.5 02/12/19 21:15:07 bell@sanja.is.com.ua +8 -1
    Fixed row Item to be compatible with row subselect

  sql/item_cmpfunc.h
    1.32 02/12/19 21:15:07 bell@sanja.is.com.ua +5 -4
    changed Item_in_optimizer to be able work with row

  sql/item_cmpfunc.cc
    1.51 02/12/19 21:15:07 bell@sanja.is.com.ua +20 -7
    changed Item_in_optimizer to be able work with row

  sql/item.h
    1.41.4.11 02/12/19 21:15:07 bell@sanja.is.com.ua +69 -1
    layout fixed 
    New helper Item - reference on item list by number
    cache item for row

  sql/item.cc
    1.27.15.4 02/12/19 21:15:07 bell@sanja.is.com.ua +109 -0
    New helper Item - reference on item list by number
    cache item for row

  mysql-test/t/subselect.test
    1.39 02/12/19 21:15:07 bell@sanja.is.com.ua +14 -0
    test of row IN subslect

  mysql-test/r/subselect.result
    1.44 02/12/19 21:15:07 bell@sanja.is.com.ua +31 -0
    test of row IN subslect

ChangeSet
  1.676.1.625 02/12/19 20:58:07 heikki@hundin.mysql.fi +1 -0
  ha_innobase.cc:
    Better error message to help users who created tables with < 3.23.54 where MySQL implicitly added a PRIMARY KEY definition

  sql/ha_innobase.cc
    1.45.19.1 02/12/19 20:57:49 heikki@hundin.mysql.fi +8 -1
    Better error message to help users who created tables with < 3.23.54 where MySQL implicitly added a PRIMARY KEY definition

ChangeSet
  1.1388.1.13 02/12/19 18:43:25 pem@mysql.com +2 -0
  Fixed some of the data collection during parsing.

  sql/sp_head.h
    1.6 02/12/19 18:43:23 pem@mysql.com +3 -1
    Renamed m_mylex into m_call_lex.
    Put called procedures and used tables in class member vars (for now at least).

  sql/sp_head.cc
    1.7 02/12/19 18:43:23 pem@mysql.com +40 -16
    Renamed m_mylex into m_call_lex.
    Fixed some data collection.

ChangeSet
  1.1403.9.5 02/12/19 16:50:48 bar@bar.mysql.r18.ru +1 -0
  ctype_many.result:
    COUNT(DISTINCT expr) and charset related test

  mysql-test/r/ctype_many.result
    1.6 02/12/19 16:50:11 bar@bar.mysql.r18.ru +5 -0
    COUNT(DISTINCT expr) and charset related test

ChangeSet
  1.1403.10.1 02/12/19 16:42:35 bar@bar.mysql.r18.ru +2 -0
  COUNT(DISTINCT field) now honors charsets

  sql/item_sum.h
    1.26 02/12/19 16:42:33 bar@bar.mysql.r18.ru +4 -1
    COUNT(DISTINCT field) now honors charsets

  sql/item_sum.cc
    1.50 02/12/19 16:42:33 bar@bar.mysql.r18.ru +25 -16
    COUNT(DISTINCT field) now honors charsets

ChangeSet
  1.1403.6.11 02/12/19 13:35:12 bell@sanja.is.com.ua +5 -0
  Item_in_optimizer is changed to be used with row IN subselect (SCRUM)
  removed unused items

  sql/item_subselect.cc
    1.38 02/12/19 13:35:10 bell@sanja.is.com.ua +3 -2
    Item_in_optimizer is changed to be used with row IN subselect

  sql/item_cmpfunc.h
    1.31 02/12/19 13:35:10 bell@sanja.is.com.ua +7 -12
    Item_in_optimizer is changed to be used with row IN subselect

  sql/item_cmpfunc.cc
    1.50 02/12/19 13:35:10 bell@sanja.is.com.ua +36 -42
    Item_in_optimizer is changed to be used with row IN subselect

  sql/item.h
    1.41.4.10 02/12/19 13:35:10 bell@sanja.is.com.ua +0 -72
    removed unused Items

  sql/item.cc
    1.27.15.3 02/12/19 13:35:10 bell@sanja.is.com.ua +0 -31
    removed unused Items

ChangeSet
  1.1403.9.3 02/12/19 15:34:30 hf@deer.mysql.r18.ru +1 -0
  Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
  into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.spa

  sql/item_strfunc.cc
    1.54.1.20 02/12/19 15:34:28 hf@deer.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1403.9.2 02/12/19 15:27:46 bar@bar.mysql.r18.ru +6 -0
  Less "default_charset_info"

  sql/sql_select.cc
    1.173.1.30 02/12/19 15:27:44 bar@bar.mysql.r18.ru +6 -3
    Less "default_charset_info"

  sql/opt_sum.cc
    1.22 02/12/19 15:27:44 bar@bar.mysql.r18.ru +2 -1
    Less "default_charset_info"

  sql/opt_range.cc
    1.74 02/12/19 15:27:44 bar@bar.mysql.r18.ru +3 -2
    Less "default_charset_info"

  sql/item_buff.cc
    1.6 02/12/19 15:27:44 bar@bar.mysql.r18.ru +1 -1
    Less "default_charset_info"

  sql/field.h
    1.46.1.16 02/12/19 15:27:44 bar@bar.mysql.r18.ru +12 -12
    Less "default_charset_info"

  sql/field.cc
    1.64.1.27 02/12/19 15:27:44 bar@bar.mysql.r18.ru +8 -8
    Less "default_charset_info"

ChangeSet
  1.1408 02/12/19 14:57:24 hf@deer.mysql.r18.ru +15 -0
  Merge

  libmysqld/libmysqld.c
    1.24 02/12/19 14:56:26 hf@deer.mysql.r18.ru +0 -2
    e
    merging with vva's code.

  sql/sql_show.cc
    1.101 02/12/19 14:52:37 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_parse.cc
    1.247 02/12/19 14:52:37 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_db.cc
    1.60 02/12/19 14:52:37 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_class.h
    1.134 02/12/19 14:52:37 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_class.cc
    1.92 02/12/19 14:52:37 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/set_var.h
    1.10 02/12/19 14:52:37 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/protocol.cc
    1.32 02/12/19 14:52:37 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/log_event.cc
    1.93 02/12/19 14:52:37 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/log.cc
    1.94 02/12/19 14:52:37 hf@deer.mysql.r18.ru +0 -1
    Auto merged

  sql/item_strfunc.cc
    1.63 02/12/19 14:52:36 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/item.cc
    1.38 02/12/19 14:52:36 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/field.h
    1.54 02/12/19 14:52:36 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/field.cc
    1.73 02/12/19 14:52:36 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  include/mysql_com.h
    1.62 02/12/19 14:52:36 hf@deer.mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1403.9.1 02/12/19 14:36:05 bar@bar.mysql.r18.ru +2 -0
  BINARY_FLAG has been restored.
  It's needed by ODBC code.

  sql/field.h
    1.46.1.15 02/12/19 14:36:03 bar@bar.mysql.r18.ru +6 -2
    BINARY_FLAG has been restored.
    It's needed by ODBC code.

  include/mysql_com.h
    1.60.1.1 02/12/19 14:36:03 bar@bar.mysql.r18.ru +1 -0
    BINARY_FLAG has been restored.
    It's needed by ODBC code.

ChangeSet
  1.1346.46.66 02/12/19 14:08:25 walrus@mysql.com +1 -0
  server-cfg.sh:
    Corrected some typo.

  sql-bench/server-cfg.sh
    1.39.1.9 02/12/19 14:07:30 walrus@mysql.com +1 -2
    Corrected some typo.

ChangeSet
  1.1403.8.1 02/12/19 12:38:32 ram@mysql.r18.ru +7 -0
  patches from sleepycat.com have been applied (SCRUM)
  ha_berkeley::rename_table() has been added (SCRUM)

  sql/ha_berkeley.h
    1.50.1.3 02/12/19 12:38:14 ram@mysql.r18.ru +1 -0
    ha_berkeley::rename_table() has been added

  sql/ha_berkeley.cc
    1.111.1.1 02/12/19 12:38:14 ram@mysql.r18.ru +18 -0
    ha_berkeley::rename_table() has been added

  bdb/txn/txn.c
    1.4 02/12/19 12:38:14 ram@mysql.r18.ru +34 -12
    patches from sleepycat.com have been applied

  bdb/rep/rep_record.c
    1.2 02/12/19 12:38:14 ram@mysql.r18.ru +3 -0
    patches from sleepycat.com have been applied

  bdb/mp/mp_fopen.c
    1.4 02/12/19 12:38:14 ram@mysql.r18.ru +19 -16
    patches from sleepycat.com have been applied

  bdb/log/log_put.c
    1.5 02/12/19 12:38:14 ram@mysql.r18.ru +2 -0
    patches from sleepycat.com have been applied

  bdb/db/db_open.c
    1.2 02/12/19 12:38:14 ram@mysql.r18.ru +2 -4
    patches from sleepycat.com have been applied

ChangeSet
  1.1407 02/12/19 12:27:46 hf@deer.mysql.r18.ru +1 -0
  several init commands fix

  libmysqld/libmysqld.c
    1.23 02/12/19 12:27:42 hf@deer.mysql.r18.ru +19 -6
    several init commands fix

ChangeSet
  1.1403.6.10 02/12/19 04:06:42 bell@sanja.is.com.ua +8 -0
  support of simple row subselects (SCRUM)

ChangeSet
  1.1403.6.9 02/12/19 01:05:30 bell@sanja.is.com.ua +4 -0
  optimized single value subselect (to be used as row) (SCRUM)

ChangeSet
  1.1403.6.8 02/12/18 20:13:00 bar@bar.mysql.r18.ru +2 -0
  this will make me life easier in the future

ChangeSet
  1.1403.6.7 02/12/18 19:48:18 bar@bar.mysql.r18.ru +3 -0
  less use of system_charset_info

ChangeSet
  1.1403.1.10 02/12/18 17:30:29 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

ChangeSet
  1.1403.6.6 02/12/18 19:17:28 bar@bar.mysql.r18.ru +7 -0
  removed several cases of default_charset_info use 
  a bit more ucs2 compatibility 

ChangeSet
  1.1403.6.5 02/12/18 18:26:47 bar@bar.mysql.r18.ru +10 -0
  thd_charset has been moved to variables structure

ChangeSet
  1.1403.6.4 02/12/18 17:47:38 bar@bar.mysql.r18.ru +1 -0
    New syntax
  CREATE TABLE tname (a CHAR(10) COLLATE latin1_de)

ChangeSet
  1.1403.6.3 02/12/18 16:59:50 bar@bar.mysql.r18.ru +4 -0
    SAPDB-style syntax
  CREATE TABLE tname (a CHAR(10) ASCII)
    as a synonym for
  CREATE TABLE tname (a CHAR(10) CHARACTER SET latin1)

ChangeSet
  1.1403.6.2 02/12/18 16:21:59 bar@bar.mysql.r18.ru +4 -0
  Introducing SAPDB-style 
     "fieldname CHAR(n) UNICODE"
  as a synonym to
     "fieldname CHAR(n) CHARACTER SET ucs2"

ChangeSet
  1.1403.5.1 02/12/19 09:37:33 vva@eagle.mysql.r18.ru +2 -0
  fix warnings

  libmysqld/libmysqld.c
    1.14.1.6 02/12/19 09:37:31 vva@eagle.mysql.r18.ru +2 -2
    fix warnings

  libmysql/libmysql.c
    1.118 02/12/19 09:37:31 vva@eagle.mysql.r18.ru +2 -2
    fix warnings

  sql/sql_class.cc
    1.82.6.6 02/12/19 04:06:35 bell@sanja.is.com.ua +3 -2
    support of simple row subselects

  sql/item_subselect.h
    1.20 02/12/19 04:06:35 bell@sanja.is.com.ua +12 -6
    support of simple row subselects

  sql/item_subselect.cc
    1.37 02/12/19 04:06:35 bell@sanja.is.com.ua +134 -45
    support of simple row subselects

  sql/item_cmpfunc.cc
    1.49 02/12/19 04:06:35 bell@sanja.is.com.ua +7 -0
    support of simple row subselects

  sql/item.h
    1.41.4.9 02/12/19 04:06:35 bell@sanja.is.com.ua +7 -19
    Item_cache_str fixed to correctly store NULL and copy string value

  sql/item.cc
    1.27.15.2 02/12/19 04:06:35 bell@sanja.is.com.ua +54 -0
    Item_cache_str fixed to correctly store NULL and copy string value

  mysql-test/t/subselect.test
    1.38 02/12/19 04:06:35 bell@sanja.is.com.ua +26 -1
    test of simple row subselect
    fixed table dropimg

  mysql-test/r/subselect.result
    1.43 02/12/19 04:06:35 bell@sanja.is.com.ua +69 -1
    test of simple row subselect
    fixed table droping

  sql/sql_class.cc
    1.82.6.5 02/12/19 01:05:29 bell@sanja.is.com.ua +1 -25
    optimized single value subselect (to be used as row)

  sql/item_subselect.h
    1.19 02/12/19 01:05:29 bell@sanja.is.com.ua +8 -24
    optimized single value subselect (to be used as row)

  sql/item_subselect.cc
    1.36 02/12/19 01:05:29 bell@sanja.is.com.ua +53 -8
    optimized single value subselect (to be used as row)

  sql/item.h
    1.41.4.8 02/12/19 01:05:29 bell@sanja.is.com.ua +92 -9
    optimized single value subselect (to be used as row)

ChangeSet
  1.1346.77.2 02/12/19 00:38:38 walrus@mysql.com +1 -0
  crash-me.sh:
    Wrap long lines,
    New test - date_format_inresult (returns which date
    format dbms uses in the result set)
    New tests:
      -date_format_ISO 
      -date_format_ISO_with_date (checks if DBMS supports 
            YYYY-MM-DD or DATE 'YYYY-MM-DD' formats)
      -date_format_EUR
      -date_format_EUR_with_date (the same but 'DD.MM.YYYY' 
            format)
      -date_format_USA
      -date_format_USA_with_date ( the same but 'MM/DD/YYYY' format)
      -date_format_YYYYMMDD
      -date_format_YYYYMMDD_with_date 

  sql-bench/crash-me.sh
    1.34.1.7 02/12/19 00:30:32 walrus@mysql.com +569 -248
    Wrap long lines,
    New test - date_format_inresult (returns which date
    format dbms uses in the result set)
    New tests:
      -date_format_ISO 
      -date_format_ISO_with_date (checks if DBMS supports 
            YYYY-MM-DD or DATE 'YYYY-MM-DD' formats)
      -date_format_EUR
      -date_format_EUR_with_date (the same but 'DD.MM.YYYY' 
            format)
      -date_format_USA
      -date_format_USA_with_date ( the same but 'MM/DD/YYYY' format)
      -date_format_YYYYMMDD
      -date_format_YYYYMMDD_with_date 

ChangeSet
  1.1346.46.64 02/12/18 19:00:00 Sinisa@sinisa.nasamreza.org +3 -0
  Fix for found rows in multi-table updates

  sql/sql_update.cc
    1.54.1.20 02/12/18 18:59:56 Sinisa@sinisa.nasamreza.org +2 -3
    Fix for found rows in multi-table updates

  mysql-test/t/multi_update.test
    1.17.1.2 02/12/18 18:59:56 Sinisa@sinisa.nasamreza.org +10 -0
    Fix for found rows in multi-table updates

  mysql-test/r/multi_update.result
    1.15.1.2 02/12/18 18:59:56 Sinisa@sinisa.nasamreza.org +10 -0
    Fix for found rows in multi-table updates

  sql/sql_parse.cc
    1.235.26.4 02/12/18 20:12:58 bar@bar.mysql.r18.ru +9 -7
    this will make me life easier in the future

  sql/log.cc
    1.92.1.1 02/12/18 20:12:58 bar@bar.mysql.r18.ru +4 -2
    this will make me life easier in the future

  sql/time.cc
    1.25 02/12/18 19:48:16 bar@bar.mysql.r18.ru +24 -24
    less use of system_charset_info

  sql/item_cmpfunc.cc
    1.48 02/12/18 19:48:16 bar@bar.mysql.r18.ru +2 -2
    less use of system_charset_info

  sql/field.cc
    1.64.1.26 02/12/18 19:48:16 bar@bar.mysql.r18.ru +2 -1
    less use of system_charset_info

  sql/item.cc
    1.27.10.9 02/12/18 17:30:24 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/set_var.h
    1.8.1.1 02/12/18 19:17:27 bar@bar.mysql.r18.ru +1 -1
    removed default_charset_info

  sql/log_event.cc
    1.91.1.1 02/12/18 19:17:26 bar@bar.mysql.r18.ru +14 -16
    removed default_charset_info

  sql/item_timefunc.cc
    1.31 02/12/18 19:17:26 bar@bar.mysql.r18.ru +14 -13
    gets closer to ucs2 compatibility

  sql/hostname.cc
    1.20 02/12/18 19:17:26 bar@bar.mysql.r18.ru +2 -2
    removed default_charset_info

  sql/field_conv.cc
    1.15 02/12/18 19:17:26 bar@bar.mysql.r18.ru +4 -4
    removed default_charset_info

  sql/field.cc
    1.64.1.25 02/12/18 19:17:26 bar@bar.mysql.r18.ru +17 -11
    use latin1

  sql/des_key_file.cc
    1.6 02/12/18 19:17:26 bar@bar.mysql.r18.ru +4 -2
    use latin1

  sql/sql_yacc.yy
    1.203.1.6 02/12/18 18:26:45 bar@bar.mysql.r18.ru +2 -2
    thd_charset has been moved to variables structure

  sql/sql_show.cc
    1.86.1.16 02/12/18 18:26:45 bar@bar.mysql.r18.ru +1 -1
    thd_charset has been moved to variables structure

  sql/sql_db.cc
    1.58.1.1 02/12/18 18:26:45 bar@bar.mysql.r18.ru +1 -1
    thd_charset has been moved to variables structure

  sql/sql_class.h
    1.123.9.2 02/12/18 18:26:45 bar@bar.mysql.r18.ru +2 -2
    thd_charset has been moved to variables structure

  sql/sql_class.cc
    1.82.6.4 02/12/18 18:26:45 bar@bar.mysql.r18.ru +1 -1
    thd_charset has been moved to variables structure

  sql/sql_analyse.cc
    1.28 02/12/18 18:26:45 bar@bar.mysql.r18.ru +2 -2
    thd_charset has been moved to variables structure

  sql/protocol.cc
    1.23.1.11 02/12/18 18:26:45 bar@bar.mysql.r18.ru +2 -2
    thd_charset has been moved to variables structure

  sql/item_strfunc.cc
    1.54.7.1 02/12/18 18:26:45 bar@bar.mysql.r18.ru +2 -2
    thd_charset has been moved to variables structure

  sql/item.cc
    1.27.15.1 02/12/18 18:26:45 bar@bar.mysql.r18.ru +1 -1
    thd_charset has been moved to variables structure

  sql/field.cc
    1.64.1.24 02/12/18 18:26:45 bar@bar.mysql.r18.ru +7 -7
    thd_charset has been moved to variables structure

  sql/sql_yacc.yy
    1.203.1.5 02/12/18 17:47:36 bar@bar.mysql.r18.ru +1 -0
      New syntax
    CREATE TABLE tname (a CHAR(10) COLLATE latin1_de)

ChangeSet
  1.1403.3.2 02/12/18 17:17:35 hf@deer.mysql.r18.ru +4 -0
  Spatial-related fixes

  BitKeeper/etc/logging_ok
    1.212.14.6 02/12/18 17:17:34 hf@deer.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_string.h
    1.27 02/12/18 17:12:42 hf@deer.mysql.r18.ru +1 -1
    this is a bit safer

  sql/spatial.cc
    1.4 02/12/18 17:12:42 hf@deer.mysql.r18.ru +2 -2
    spatial type comperations are case-independent now

  sql/item_strfunc.cc
    1.54.1.19 02/12/18 17:12:42 hf@deer.mysql.r18.ru +15 -7
    spatial function's fixes

  sql/sql_yacc.yy
    1.203.1.4 02/12/18 16:59:48 bar@bar.mysql.r18.ru +4 -1
      SAPDB-style syntax
    CREATE TABLE tname (a CHAR(10) ASCII)
      as a synonym for
    CREATE TABLE tname (a CHAR(10) CHARACTER SET latin1)

  sql/lex.h
    1.82.1.4 02/12/18 16:59:48 bar@bar.mysql.r18.ru +1 -1
      SAPDB-style syntax
    CREATE TABLE tname (a CHAR(10) ASCII)
      as a synonym for
    CREATE TABLE tname (a CHAR(10) CHARACTER SET latin1)

  mysql-test/t/ctype_many.test
    1.5 02/12/18 16:59:48 bar@bar.mysql.r18.ru +1 -1
      SAPDB-style syntax
    CREATE TABLE tname (a CHAR(10) ASCII)
      as a synonym for
    CREATE TABLE tname (a CHAR(10) CHARACTER SET latin1)

  mysql-test/r/ctype_many.result
    1.5 02/12/18 16:59:48 bar@bar.mysql.r18.ru +1 -1
      SAPDB-style syntax
    CREATE TABLE tname (a CHAR(10) ASCII)
      as a synonym for
    CREATE TABLE tname (a CHAR(10) CHARACTER SET latin1)

  sql/sql_yacc.yy
    1.203.1.3 02/12/18 16:21:57 bar@bar.mysql.r18.ru +10 -0
    Introducing SAPDB-style 
       "fieldname CHAR(n) UNICODE"
    as a synonym to
       "fieldname CHAR(n) CHARACTER SET ucs2"

  sql/lex.h
    1.82.1.3 02/12/18 16:21:57 bar@bar.mysql.r18.ru +1 -0
    Introducing SAPDB-style 
       "fieldname CHAR(n) UNICODE"
    as a synonym to
       "fieldname CHAR(n) CHARACTER SET ucs2"

  mysql-test/t/ctype_many.test
    1.4 02/12/18 16:21:57 bar@bar.mysql.r18.ru +2 -1
    Introducing SAPDB-style 
       "fieldname CHAR(n) UNICODE"
    as a synonym to
       "fieldname CHAR(n) CHARACTER SET ucs2"

  mysql-test/r/ctype_many.result
    1.4 02/12/18 16:21:57 bar@bar.mysql.r18.ru +2 -1
    Introducing SAPDB-style 
       "fieldname CHAR(n) UNICODE"
    as a synonym to
       "fieldname CHAR(n) CHARACTER SET ucs2"

ChangeSet
  1.1403.4.1 02/12/17 23:18:19 bell@sanja.is.com.ua +3 -0
  fixed derived table visibility scope for derived tables with union

  sql/item.cc
    1.27.14.1 02/12/17 23:18:13 bell@sanja.is.com.ua +8 -4
    fixed derived table visibility scope for derived tables with union

  mysql-test/t/derived.test
    1.13.1.1 02/12/17 23:18:13 bell@sanja.is.com.ua +4 -0
     SELECT 1 as a FROM (SELECT 1 UNION SELECT a) b;

  mysql-test/r/derived.result
    1.14.1.1 02/12/17 23:18:12 bell@sanja.is.com.ua +4 -0
    test of error messages

ChangeSet
  1.1403.1.8 02/12/17 22:36:23 Sinisa@sinisa.nasamreza.org +3 -0
  Fix for fix_fields in derived tables with UNION's ....

  sql/item.cc
    1.27.10.8 02/12/17 22:36:18 Sinisa@sinisa.nasamreza.org +1 -1
    Fix for fix_fields in derived tables with UNION's ....

  mysql-test/t/derived.test
    1.15 02/12/17 22:36:18 Sinisa@sinisa.nasamreza.org +4 -0
    Fix for fix_fields in derived tables with UNION's ....

  mysql-test/r/derived.result
    1.16 02/12/17 22:36:18 Sinisa@sinisa.nasamreza.org +4 -0
    Fix for fix_fields in derived tables with UNION's ....

ChangeSet
  1.1403.1.7 02/12/17 21:04:37 Sinisa@sinisa.nasamreza.org +2 -0
  beautifying the error messages

  sql/sql_base.cc
    1.122.1.22 02/12/17 21:04:32 Sinisa@sinisa.nasamreza.org +1 -1
    beautifying the error messages

  sql/item.cc
    1.27.10.7 02/12/17 21:04:32 Sinisa@sinisa.nasamreza.org +1 -1
    beautifying the error messages

ChangeSet
  1.1403.1.6 02/12/17 20:15:15 Sinisa@sinisa.nasamreza.org +3 -0
  A fix for a bug in fix_fields in case like this:
  
  select .. UNION select some_column;
  
  This is exhibited in sub-selects and derived tables.

  sql/sql_base.cc
    1.122.1.21 02/12/17 20:15:11 Sinisa@sinisa.nasamreza.org +8 -0
    A fix for a bug in fix_fields in case like this:
    
    select .. UNION select some_column;
    
    This is exhibited in sub-selects and derived tables.

  mysql-test/t/derived.test
    1.14 02/12/17 20:15:11 Sinisa@sinisa.nasamreza.org +2 -0
    A fix for a bug in fix_fields in case like this:
    
    select .. UNION select some_column;
    
    This is exhibited in sub-selects and derived tables.

  mysql-test/r/derived.result
    1.15 02/12/17 20:15:11 Sinisa@sinisa.nasamreza.org +2 -0
    A fix for a bug in fix_fields in case like this:
    
    select .. UNION select some_column;
    
    This is exhibited in sub-selects and derived tables.

ChangeSet
  1.1406 02/12/17 19:54:18 hf@deer.mysql.r18.ru +6 -0
  Merging

ChangeSet
  1.1403.1.5 02/12/17 18:29:54 bar@bar.mysql.r18.ru +1 -0
  sql_type() is now ucs2 compatible

  libmysqld/libmysqld.c
    1.22 02/12/17 19:54:17 hf@deer.mysql.r18.ru +4 -20
    Merging

  sql/sql_show.cc
    1.100 02/12/17 19:50:29 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/field.h
    1.53 02/12/17 19:50:29 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/field.cc
    1.72 02/12/17 19:50:29 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  include/mysql.h
    1.51 02/12/17 19:50:29 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.227 02/12/17 19:50:03 hf@deer.mysql.r18.ru +0 -0
    auto-union

ChangeSet
  1.1405 02/12/17 19:33:25 hf@deer.mysql.r18.ru +7 -0
  Merging&testing

  sql/sql_table.cc
    1.140 02/12/17 19:33:20 hf@deer.mysql.r18.ru +1 -0
    sen_nfields added

  sql/protocol.h
    1.2 02/12/17 19:33:20 hf@deer.mysql.r18.ru +9 -0
    n_fields member added

  sql/protocol.cc
    1.31 02/12/17 19:33:20 hf@deer.mysql.r18.ru +4 -14
    Protocol::write edited for embedded case

  sql/mysql_priv.h
    1.171 02/12/17 19:33:20 hf@deer.mysql.r18.ru +1 -1
    embedded_send_row header changed

  sql/ha_myisam.cc
    1.108 02/12/17 19:33:20 hf@deer.mysql.r18.ru +1 -0
    set_nfield call added

  sql/ha_berkeley.cc
    1.113 02/12/17 19:33:20 hf@deer.mysql.r18.ru +2 -0
    set_nfields calls added

  libmysqld/lib_sql.cc
    1.40 02/12/17 19:33:20 hf@deer.mysql.r18.ru +77 -1
    Protocol::send_fields added

ChangeSet
  1.1403.2.1 02/12/17 19:14:38 vva@eagle.mysql.r18.ru +2 -0
  Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
  into eagle.mysql.r18.ru:/home/vva/work/MANY_INIT_COMMANDS/4.1

  libmysql/libmysql.c
    1.117 02/12/17 19:14:31 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.212.14.5 02/12/17 19:14:27 vva@eagle.mysql.r18.ru +0 -1
    auto-union

ChangeSet
  1.1388.19.1 02/12/17 19:13:07 vva@eagle.mysql.r18.ru +4 -0
  Many init commands on connect

  BitKeeper/etc/logging_ok
    1.212.18.1 02/12/17 19:13:07 vva@eagle.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  libmysqld/libmysqld.c
    1.14.1.5 02/12/17 19:12:19 vva@eagle.mysql.r18.ru +48 -12
    Many init commands on connect

  libmysql/libmysql.c
    1.115.1.1 02/12/17 19:12:19 vva@eagle.mysql.r18.ru +48 -12
    Many init commands on connect

  include/mysql.h
    1.43.1.10 02/12/17 19:12:19 vva@eagle.mysql.r18.ru +2 -1
    Many init commands on connect

  sql/field.cc
    1.64.1.23 02/12/17 18:29:52 bar@bar.mysql.r18.ru +87 -43
    sql_type() is now ucs2 compatible

ChangeSet
  1.1403.1.3 02/12/17 14:35:19 bar@bar.mysql.r18.ru +3 -0
  Some fixes to get closer to UCS2 compatible SHOW FIELDS

  sql/sql_show.cc
    1.86.1.15 02/12/17 14:35:16 bar@bar.mysql.r18.ru +1 -1
    Some fixes to get closer to UCS2 compatible SHOW FIELDS

  sql/field.h
    1.46.1.14 02/12/17 14:35:16 bar@bar.mysql.r18.ru +1 -0
    Some fixes to get closer to UCS2 compatible SHOW FIELDS

  sql/field.cc
    1.64.1.22 02/12/17 14:35:16 bar@bar.mysql.r18.ru +53 -50
    Some fixes to get closer to UCS2 compatible SHOW FIELDS

ChangeSet
  1.1388.1.12 02/12/17 10:01:52 pem@mysql.com +5 -0
  Added parsing of CASE (both generic and "simple").

  sql/sql_yacc.yy
    1.209 02/12/17 10:01:50 pem@mysql.com +76 -8
    Added CASE parsing.

  sql/sp_pcontext.h
    1.5 02/12/17 10:01:50 pem@mysql.com +1 -4
    Removed push_gen_label method (not needed any more).
    Fixed bug in pop().

  sql/sp_pcontext.cc
    1.4 02/12/17 10:01:50 pem@mysql.com +0 -14
    Removed push_gen_label method (not needed any more).

  sql/sp_head.h
    1.5 02/12/17 10:01:50 pem@mysql.com +2 -0
    New flag for (simple)case parsing.

  sql/sp_head.cc
    1.6 02/12/17 10:01:50 pem@mysql.com +1 -0
    Init. the simple_case flag.

ChangeSet
  1.1403.1.2 02/12/17 11:25:27 bar@bar.mysql.r18.ru +2 -0
  Move all sql_type() to the same file

  sql/field.h
    1.46.1.13 02/12/17 11:25:26 bar@bar.mysql.r18.ru +1 -1
    Move all sql_type() to the same file

  sql/field.cc
    1.64.1.21 02/12/17 11:25:25 bar@bar.mysql.r18.ru +10 -0
    Move all sql_type() to the same file

ChangeSet
  1.676.264.2 02/12/16 22:16:57 Sinisa@sinisa.nasamreza.org +4 -0
  fix for a bug in CASE ...WHEN ...

  sql/sql_db.cc
    1.22.1.14 02/12/16 22:16:55 Sinisa@sinisa.nasamreza.org +0 -2
    fix for lower case ...

  sql/item_cmpfunc.cc
    1.14.1.13 02/12/16 22:16:54 Sinisa@sinisa.nasamreza.org +2 -0
    fix for a bug in CASE ...WHEN ...

  mysql-test/t/case.test
    1.3.1.1 02/12/16 22:16:54 Sinisa@sinisa.nasamreza.org +5 -0
    fix for a bug in CASE ...WHEN ...

  mysql-test/r/case.result
    1.3.1.1 02/12/16 22:16:54 Sinisa@sinisa.nasamreza.org +4 -0
    fix for a bug in CASE ...WHEN ...

ChangeSet
  1.1346.76.1 02/12/16 22:55:29 walrus@mysql.com +2 -0
  Add log lines to crash-me result file 

  sql-bench/server-cfg.sh
    1.39.1.8 02/12/16 22:55:25 walrus@mysql.com +13 -12
    cleanup field conversation

  sql-bench/crash-me.sh
    1.34.1.6 02/12/16 22:55:25 walrus@mysql.com +280 -104
    add tagline for emacs 
    add log lines to result file
    remove wrong prompt for WEEK()

ChangeSet
  1.1346.75.1 02/12/16 17:28:53 monty@mashka.mysql.fi +1 -0
  Use delayed create index for LOAD DATA INFILE, INSERT ... SELECT and CREATE ... SELECT
  (Accidently disabled by a recent push)

  sql/ha_myisam.cc
    1.92.1.22 02/12/16 17:28:51 monty@mashka.mysql.fi +1 -1
    Use delayed create index for LOAD DATA INFILE, INSERT ... SELECT and CREATE ... SELECT
    (Accidently disabled by a recent push)

ChangeSet
  1.1403.1.1 02/12/16 19:09:48 ram@mysql.r18.ru +1 -0
  extended resolve() and reverse_resolve() UDFs for FreeBSD (SCRUM)

  sql/udf_example.cc
    1.12 02/12/16 19:09:46 ram@mysql.r18.ru +49 -6
    extended resolve() and reverse_resolve() UDFs for FreeBSD (SCRUM)

ChangeSet
  1.1404 02/12/16 18:58:55 hf@deer.mysql.r18.ru +31 -0
  Merging

  sql/sql_table.cc
    1.139 02/12/16 18:58:54 hf@deer.mysql.r18.ru +0 -3
    Merging

  sql/sql_show.cc
    1.99 02/12/16 18:58:54 hf@deer.mysql.r18.ru +5 -25
    Merging

  sql/sql_help.cc
    1.4 02/12/16 18:58:54 hf@deer.mysql.r18.ru +0 -2
    Merging

  sql/sql_handler.cc
    1.29 02/12/16 18:58:54 hf@deer.mysql.r18.ru +0 -1
    Merging

  sql/sql_error.cc
    1.9 02/12/16 18:58:54 hf@deer.mysql.r18.ru +0 -1
    Merging

  sql/sql_db.cc
    1.59 02/12/16 18:58:54 hf@deer.mysql.r18.ru +0 -1
    Merging

  sql/sql_base.cc
    1.131 02/12/16 18:58:54 hf@deer.mysql.r18.ru +0 -0
    Merging

  sql/sql_acl.cc
    1.61 02/12/16 18:58:54 hf@deer.mysql.r18.ru +0 -3
    Merging

  sql/protocol.cc
    1.30 02/12/16 18:58:54 hf@deer.mysql.r18.ru +145 -0
    Merging

  sql/mysqld.cc
    1.319 02/12/16 18:58:54 hf@deer.mysql.r18.ru +0 -0
    Merging

  sql/log_event.h
    1.77 02/12/16 18:58:54 hf@deer.mysql.r18.ru +4 -7
    Merging

  sql/log_event.cc
    1.92 02/12/16 18:58:54 hf@deer.mysql.r18.ru +0 -1
    Merging

  sql/item.h
    1.44 02/12/16 18:58:54 hf@deer.mysql.r18.ru +11 -6
    Merging

  sql/item.cc
    1.37 02/12/16 18:58:54 hf@deer.mysql.r18.ru +0 -2
    Merging

  sql/ha_myisam.cc
    1.107 02/12/16 18:58:54 hf@deer.mysql.r18.ru +0 -1
    Merging

  sql/ha_innodb.cc
    1.85.1.4 02/12/16 18:58:54 hf@deer.mysql.r18.ru +0 -1
    Merging

  sql/ha_berkeley.cc
    1.112 02/12/16 18:58:54 hf@deer.mysql.r18.ru +0 -2
    Merging

ChangeSet
  1.1388.1.11 02/12/16 15:40:44 pem@mysql.com +5 -0
  Fixed the broken backpatching implementation.
  Implemented IF-THEN-ELSE.

  sql/sql_yacc.yy
    1.208 02/12/16 15:40:43 pem@mysql.com +54 -12
    Implemented IF-THEN-ELSE.
    Corrected for the new backpatch method.

  sql/sp_pcontext.h
    1.4 02/12/16 15:40:43 pem@mysql.com +5 -5
    Return the value from push-methods, for convenience.

  sql/sp_pcontext.cc
    1.3 02/12/16 15:40:43 pem@mysql.com +6 -3
    Return the value from push-methods, for convenience.

  sql/sp_head.h
    1.4 02/12/16 15:40:43 pem@mysql.com +13 -3
    Reimplemented the broken backpatching, so it works for nested constructions and
    IF-THEN-ELSE too.

  sql/sp_head.cc
    1.5 02/12/16 15:40:43 pem@mysql.com +18 -11
    Reimplemented the broken backpatching, so it works for nested constructions and
    IF-THEN-ELSE too.

  sql/sql_select.cc
    1.183 02/12/16 18:15:16 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_repl.cc
    1.92 02/12/16 18:15:16 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.15 02/12/16 18:15:16 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_parse.cc
    1.246 02/12/16 18:15:16 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_class.h
    1.133 02/12/16 18:15:15 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_class.cc
    1.91 02/12/16 18:15:15 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/slave.cc
    1.175 02/12/16 18:15:15 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/set_var.cc
    1.21 02/12/16 18:15:15 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.19 02/12/16 18:15:04 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/protocol.cc
    1.29 02/12/16 18:15:03 hf@deer.mysql.r18.ru +0 -0
    Merge rename: sql/net_pkg.cc -> sql/protocol.cc

  sql/mysql_priv.h
    1.170 02/12/16 18:15:03 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/item_func.cc
    1.91 02/12/16 18:15:03 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/field.h
    1.52 02/12/16 18:15:03 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/field.cc
    1.71 02/12/16 18:15:03 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.226 02/12/16 18:14:58 hf@deer.mysql.r18.ru +0 -0
    auto-union

ChangeSet
  1.1388.15.2 02/12/16 17:33:29 hf@deer.mysql.r18.ru +41 -0
  Big purge about embedded library (scrum)

  sql/sql_show.cc
    1.98 02/12/16 17:33:24 hf@deer.mysql.r18.ru +17 -6
    modifications for embedded case

  sql/sql_select.cc
    1.182 02/12/16 17:33:24 hf@deer.mysql.r18.ru +2 -0
    query cache don't work now in embedded library

  sql/sql_repl.h
    1.25 02/12/16 17:33:24 hf@deer.mysql.r18.ru +4 -0
    no replication in embedded library

  sql/sql_repl.cc
    1.89.1.1 02/12/16 17:33:24 hf@deer.mysql.r18.ru +6 -0
    no replication in embedded library

  sql/sql_prepare.cc
    1.13.1.1 02/12/16 17:33:24 hf@deer.mysql.r18.ru +8 -0
    #ifdef-ed code which doesn't work in embedded case

  sql/sql_parse.cc
    1.245 02/12/16 17:33:24 hf@deer.mysql.r18.ru +52 -7
    #ifdef-ed code which doesn't work in embedded case

  sql/sql_load.cc
    1.40 02/12/16 17:33:24 hf@deer.mysql.r18.ru +7 -0
    #ifdef-ed code which doesn't work in embedded case

  sql/sql_help.cc
    1.2.1.1 02/12/16 17:33:24 hf@deer.mysql.r18.ru +2 -2
    modification for embedded case

  sql/sql_error.cc
    1.6.1.1 02/12/16 17:33:24 hf@deer.mysql.r18.ru +1 -1
    modification for embedded case

  sql/sql_db.cc
    1.57.1.1 02/12/16 17:33:24 hf@deer.mysql.r18.ru +1 -1
    modification for embedded case

  sql/sql_class.h
    1.132 02/12/16 17:33:24 hf@deer.mysql.r18.ru +9 -4
    THD structure modified for embedded case

  sql/sql_class.cc
    1.90 02/12/16 17:33:24 hf@deer.mysql.r18.ru +5 -1
    modifications for embedded case

  sql/sql_cache.cc
    1.39.1.3 02/12/16 17:33:24 hf@deer.mysql.r18.ru +3 -1
    modifications for embedded case

  sql/sql_acl.cc
    1.60 02/12/16 17:33:24 hf@deer.mysql.r18.ru +3 -3
    modifications for embedded case

  sql/slave.h
    1.53 02/12/16 17:33:24 hf@deer.mysql.r18.ru +6 -0
    no replication in embedded library

  sql/slave.cc
    1.173.1.1 02/12/16 17:33:24 hf@deer.mysql.r18.ru +3 -1
    no replication in embedded library

  sql/set_var.h
    1.9 02/12/16 17:33:24 hf@deer.mysql.r18.ru +2 -1
    #ifdef-ed variables which have no sense in embedded library

  sql/set_var.cc
    1.19.1.1 02/12/16 17:33:24 hf@deer.mysql.r18.ru +22 -1
    #ifdef-ed variables which have no sense in embedded library

  sql/repl_failsafe.h
    1.7 02/12/16 17:33:24 hf@deer.mysql.r18.ru +2 -0
    no replication in embedded case

  sql/repl_failsafe.cc
    1.17.1.1 02/12/16 17:33:24 hf@deer.mysql.r18.ru +5 -0
    no replication in embedded case

  sql/net_serv.cc
    1.49 02/12/16 17:33:24 hf@deer.mysql.r18.ru +4 -0
    file doesn't work in embedded case

  sql/net_pkg.cc
    1.28 02/12/16 17:33:24 hf@deer.mysql.r18.ru +37 -18
    #ifdef-ed functions which can't work in embedded case

  sql/mysqld.cc
    1.318 02/12/16 17:33:24 hf@deer.mysql.r18.ru +48 -474
    several modifications

  sql/mini_client.cc
    1.57 02/12/16 17:33:24 hf@deer.mysql.r18.ru +3 -0
    file should be removed from embedded library

  sql/mf_iocache.cc
    1.23 02/12/16 17:33:24 hf@deer.mysql.r18.ru +5 -0
    file doesn't work in embedded case

  sql/log_event.h
    1.75.1.1 02/12/16 17:33:24 hf@deer.mysql.r18.ru +36 -3
    #ifdef-ed parts of file which don't work in embedded case

  sql/log_event.cc
    1.90.1.1 02/12/16 17:33:24 hf@deer.mysql.r18.ru +58 -6
    #ifdef-ed parts of file which don't work in embedded case

  sql/log.cc
    1.93 02/12/16 17:33:24 hf@deer.mysql.r18.ru +14 -0
    #ifdef-ed parts of file which don't work in embedded case

  sql/item_func.cc
    1.88.1.1 02/12/16 17:33:24 hf@deer.mysql.r18.ru +2 -0
    modifications for embedded case

  sql/ha_myisam.cc
    1.106 02/12/16 17:33:24 hf@deer.mysql.r18.ru +11 -1
    modifications for embedded case

  sql/ha_innodb.cc
    1.85.2.1 02/12/16 17:33:24 hf@deer.mysql.r18.ru +3 -2
    modifications for embedded case

  sql/ha_berkeley.cc
    1.110.1.1 02/12/16 17:33:24 hf@deer.mysql.r18.ru +2 -1
    modification for embedded case

  libmysqld/libmysqld.c
    1.21 02/12/16 17:33:24 hf@deer.mysql.r18.ru +58 -521
    several modifications

  libmysqld/lib_vio.c
    1.15 02/12/16 17:33:24 hf@deer.mysql.r18.ru +4 -1
    file should be removed

  libmysqld/lib_sql.cc
    1.39 02/12/16 17:33:24 hf@deer.mysql.r18.ru +22 -862
    several modifications

  libmysqld/embedded_priv.h
    1.5 02/12/16 17:33:24 hf@deer.mysql.r18.ru +1 -4
    superfluous functions removed

  include/violite.h
    1.25 02/12/16 17:33:24 hf@deer.mysql.r18.ru +1 -5
    no need to special vio types

  include/mysql_com.h
    1.61 02/12/16 17:33:24 hf@deer.mysql.r18.ru +9 -5
    NET structure changed for embedded case

  include/mysql.h
    1.50 02/12/16 17:33:24 hf@deer.mysql.r18.ru +25 -9
    MYSQL structure changed for embedded case

  client/mysqltest.c
    1.88 02/12/16 17:33:24 hf@deer.mysql.r18.ru +2 -5
    #ifdef EMBEDDED_LIBRARY added

  client/mysql.cc
    1.109 02/12/16 17:33:24 hf@deer.mysql.r18.ru +6 -1
    #ifdef EMBEDDED_LIBRARY added

ChangeSet
  1.1403 02/12/15 21:50:24 bell@sanja.is.com.ua +5 -0
  moved links initialization

ChangeSet
  1.1402 02/12/16 00:01:08 vva@eagle.mysql.r18.ru +1 -0
  Merge vvagin@work.mysql.com:/home/bk/mysql-4.1
  into eagle.mysql.r18.ru:/home/vva/work/sanya_bug/4.1

  BitKeeper/etc/logging_ok
    1.212.14.4 02/12/16 00:00:52 vva@eagle.mysql.r18.ru +0 -1
    auto-union

  sql/sql_parse.cc
    1.235.26.3 02/12/15 21:50:17 bell@sanja.is.com.ua +5 -1
    moved links initialization

  sql/sql_lex.h
    1.102.1.1 02/12/15 21:50:17 bell@sanja.is.com.ua +2 -0
    moved links initialization

  sql/sql_lex.cc
    1.59.2.2 02/12/15 21:50:17 bell@sanja.is.com.ua +2 -2
    moved links initialization

  mysql-test/t/delete.test
    1.8 02/12/15 21:50:17 bell@sanja.is.com.ua +10 -0
    test of delete error

  mysql-test/r/delete.result
    1.7 02/12/15 21:50:17 bell@sanja.is.com.ua +9 -0
    test of delete error

ChangeSet
  1.1388.18.1 02/12/15 22:30:26 vva@eagle.mysql.r18.ru +2 -0
  adding check for duplicated symbols

  BitKeeper/etc/logging_ok
    1.212.17.1 02/12/15 22:30:24 vva@eagle.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  sql/gen_lex_hash.cc
    1.53 02/12/15 22:28:57 vva@eagle.mysql.r18.ru +52 -6
    adding check for duplicated symbols

ChangeSet
  1.1401 02/12/15 11:14:53 bell@sanja.is.com.ua +5 -0
  fixed subselect null test
  fixed method definition (overloading instead of redefinition)
  fixed time expression type definition

  sql/item_timefunc.cc
    1.30 02/12/15 11:14:51 bell@sanja.is.com.ua +1 -1
    fixed time expression type definition

  sql/item_subselect.h
    1.18 02/12/15 11:14:51 bell@sanja.is.com.ua +5 -1
    fixed subselect null test

  sql/item.h
    1.41.4.7 02/12/15 11:14:51 bell@sanja.is.com.ua +1 -1
    fixed method definition (overloading instead of redefinition)

  mysql-test/t/subselect.test
    1.37 02/12/15 11:14:51 bell@sanja.is.com.ua +2 -0
    test of subselect null test 

  mysql-test/r/subselect.result
    1.42 02/12/15 11:14:51 bell@sanja.is.com.ua +5 -0
    test of subselect null test 

ChangeSet
  1.1400 02/12/15 10:23:55 bell@sanja.is.com.ua +1 -0
  fixed test result

  mysql-test/r/analyse.result
    1.8 02/12/15 10:23:48 bell@sanja.is.com.ua +1 -1
    fixed test result

ChangeSet
  1.1346.46.61 02/12/14 22:38:33 heikki@hundin.mysql.fi +1 -0
  perror.c:
    Add to perror the code 150 about wrong foreign key def

  extra/perror.c
    1.19 02/12/14 22:38:21 heikki@hundin.mysql.fi +1 -0
    Add to perror the code 150 about wrong foreign key def

ChangeSet
  1.1399 02/12/14 18:30:28 monty@mashka.mysql.fi +2 -0
  Fix after merge

  sql/item.h
    1.41.4.6 02/12/14 18:30:26 monty@mashka.mysql.fi +1 -1
    Fix after merge

  BitKeeper/etc/ignore
    1.131 02/12/14 18:30:03 monty@mashka.mysql.fi +1 -0
    added libmysqld/protocol.cc

ChangeSet
  1.1398 02/12/14 17:49:01 monty@mashka.mysql.fi +20 -0
  merge

  sql/item.cc
    1.27.10.6 02/12/14 17:48:59 monty@mashka.mysql.fi +0 -2
    merge

  sql/sql_select.cc
    1.173.1.29 02/12/14 17:44:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_class.cc
    1.82.6.3 02/12/14 17:44:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_analyse.cc
    1.27 02/12/14 17:44:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_acl.cc
    1.55.1.16 02/12/14 17:44:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.316.1.2 02/12/14 17:44:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.160.1.28 02/12/14 17:44:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_sum.h
    1.25 02/12/14 17:44:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_sum.cc
    1.49 02/12/14 17:44:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_subselect.h
    1.17 02/12/14 17:44:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_subselect.cc
    1.35 02/12/14 17:44:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item.h
    1.41.4.5 02/12/14 17:44:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/field.h
    1.46.1.12 02/12/14 17:44:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/field.cc
    1.64.1.20 02/12/14 17:44:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/func_str.test
    1.17 02/12/14 17:44:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/union.result
    1.26 02/12/14 17:44:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.41 02/12/14 17:44:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/select.result
    1.20 02/12/14 17:44:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/func_str.result
    1.18 02/12/14 17:44:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/derived.result
    1.14 02/12/14 17:44:07 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1388.10.4 02/12/14 17:43:01 monty@mashka.mysql.fi +42 -0
  Fixes for binary protocol (complement to last push)
  Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format.
  DATE_ADD() and related functions now returns correct DATE/DATETIME type depending on argument types.
  Now all tests passes, still some work left to remove warnings in log files from mysql-test-run

  sql/sql_show.cc
    1.86.1.14 02/12/14 17:42:58 monty@mashka.mysql.fi +1 -0
    Binary protocol

  sql/sql_select.cc
    1.173.20.2 02/12/14 17:42:58 monty@mashka.mysql.fi +8 -2
    Fixed bug in multi-table-update
    Changed EXPLAIN to return NULL instead of empty strings

  sql/sql_repl.cc
    1.91 02/12/14 17:42:57 monty@mashka.mysql.fi +1 -2
    Binary protocol changes

  sql/sql_error.cc
    1.8 02/12/14 17:42:57 monty@mashka.mysql.fi +1 -1
    More optimal types

  sql/sql_class.cc
    1.82.7.2 02/12/14 17:42:57 monty@mashka.mysql.fi +1 -0
    Fixed bug from last push in LIMIT

  sql/sql_analyse.cc
    1.23.1.2 02/12/14 17:42:57 monty@mashka.mysql.fi +26 -24
    Fixed bug in analyze

  sql/set_var.cc
    1.20 02/12/14 17:42:57 monty@mashka.mysql.fi +4 -0
    Fixed that @convert works ok with new protocol

  sql/protocol.cc
    1.23.1.10 02/12/14 17:42:57 monty@mashka.mysql.fi +20 -14
    More type checking

  sql/mysqld.cc
    1.315.1.1 02/12/14 17:42:57 monty@mashka.mysql.fi +1 -1
    Changed default pthread_attr_setstacksize to 129K

  sql/item_timefunc.h
    1.27 02/12/14 17:42:57 monty@mashka.mysql.fi +15 -14
    Changed INTERVAL to return correct type

  sql/item_timefunc.cc
    1.29 02/12/14 17:42:57 monty@mashka.mysql.fi +48 -10
    Changed INTERVAL to return correct type

  sql/item_func.h
    1.56 02/12/14 17:42:57 monty@mashka.mysql.fi +5 -0
    @variables are always returned to the client as strings

  sql/item_func.cc
    1.90 02/12/14 17:42:57 monty@mashka.mysql.fi +1 -0
    Added comment

  sql/item.h
    1.41.6.2 02/12/14 17:42:57 monty@mashka.mysql.fi +3 -1
    Binary protocol update

  sql/item.cc
    1.27.12.2 02/12/14 17:42:57 monty@mashka.mysql.fi +11 -2
    Binary protocol update

  sql/field.h
    1.46.1.11 02/12/14 17:42:57 monty@mashka.mysql.fi +4 -4
    Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format

  sql/field.cc
    1.64.1.19 02/12/14 17:42:57 monty@mashka.mysql.fi +62 -92
    Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format

  mysql-test/t/type_timestamp.test
    1.7 02/12/14 17:42:57 monty@mashka.mysql.fi +1 -1
    Timestamp change

  mysql-test/t/type_datetime.test
    1.7 02/12/14 17:42:57 monty@mashka.mysql.fi +1 -1
    Timestamp change

  mysql-test/t/merge.test
    1.19 02/12/14 17:42:57 monty@mashka.mysql.fi +2 -2
    Remove warnings of wrong drop table

  mysql-test/t/func_time.test
    1.15 02/12/14 17:42:57 monty@mashka.mysql.fi +31 -0
    New test for interval type result

  mysql-test/t/func_str.test
    1.15.1.1 02/12/14 17:42:57 monty@mashka.mysql.fi +2 -2
    Timestamp update

  mysql-test/r/union.result
    1.24.1.1 02/12/14 17:42:57 monty@mashka.mysql.fi +5 -5
    EXPLAIN UPDATE

  mysql-test/r/type_timestamp.result
    1.8 02/12/14 17:42:57 monty@mashka.mysql.fi +25 -25
    Timestamp update

  mysql-test/r/type_ranges.result
    1.10 02/12/14 17:42:57 monty@mashka.mysql.fi +3 -3
    Timestamp update

  mysql-test/r/type_datetime.result
    1.12 02/12/14 17:42:57 monty@mashka.mysql.fi +2 -2
    Timestamp update

  mysql-test/r/subselect.result
    1.39.1.1 02/12/14 17:42:57 monty@mashka.mysql.fi +10 -10
    Fixed EXPLAIN output

  mysql-test/r/select.result
    1.18.1.1 02/12/14 17:42:57 monty@mashka.mysql.fi +2 -2
    Fix after bulk insert change

  mysql-test/r/range.result
    1.10 02/12/14 17:42:57 monty@mashka.mysql.fi +1 -1
    Fix after bulk insert change

  mysql-test/r/odbc.result
    1.7 02/12/14 17:42:57 monty@mashka.mysql.fi +1 -1
    Fix after bulk insert change

  mysql-test/r/merge.result
    1.18 02/12/14 17:42:57 monty@mashka.mysql.fi +2 -2
    Removed warning

  mysql-test/r/keywords.result
    1.6 02/12/14 17:42:57 monty@mashka.mysql.fi +1 -1
    Timestamp change

  mysql-test/r/key_primary.result
    1.7 02/12/14 17:42:57 monty@mashka.mysql.fi +1 -1
    Fix after bulk insert change

  mysql-test/r/join_outer.result
    1.14 02/12/14 17:42:57 monty@mashka.mysql.fi +1 -1
    Fix after bulk insert change

  mysql-test/r/innodb.result
    1.48 02/12/14 17:42:57 monty@mashka.mysql.fi +14 -14
    Timestamp change

  mysql-test/r/func_time.result
    1.18 02/12/14 17:42:57 monty@mashka.mysql.fi +62 -2
    Timestamp change

  mysql-test/r/func_str.result
    1.16.1.1 02/12/14 17:42:57 monty@mashka.mysql.fi +4 -4
    Timestamp change

  mysql-test/r/func_date_add.result
    1.5 02/12/14 17:42:57 monty@mashka.mysql.fi +10 -10
    Timestamp change

  mysql-test/r/explain.result
    1.9 02/12/14 17:42:57 monty@mashka.mysql.fi +1 -1
    Fix after bulk insert change

  mysql-test/r/derived.result
    1.12.1.1 02/12/14 17:42:57 monty@mashka.mysql.fi +1 -1
    Fix after bulk insert change

  mysql-test/r/delayed.result
    1.7 02/12/14 17:42:57 monty@mashka.mysql.fi +3 -3
    Timestamp update

  mysql-test/r/cast.result
    1.3 02/12/14 17:42:57 monty@mashka.mysql.fi +1 -1
    New result for time

ChangeSet
  1.676.264.1 02/12/14 15:32:36 Sinisa@sinisa.nasamreza.org +1 -0
  Fix for a bug with mysql_select_db() on manually created
  database and lower case table names.

  sql/sql_db.cc
    1.22.1.13 02/12/14 15:32:33 Sinisa@sinisa.nasamreza.org +3 -0
    Fix for a bug with mysql_select_db() on manually created
    database and lower case table names.

ChangeSet
  1.1397 02/12/14 15:15:23 Sinisa@sinisa.nasamreza.org +3 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/sql_yacc.yy
    1.203.1.2 02/12/14 15:15:17 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_union.cc
    1.55 02/12/14 15:15:17 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_select.cc
    1.173.1.28 02/12/14 15:15:16 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1396 02/12/14 15:13:25 Sinisa@sinisa.nasamreza.org +1 -0
  Adding comments as per Monty's request.

  sql/sql_derived.cc
    1.25 02/12/14 15:13:22 Sinisa@sinisa.nasamreza.org +39 -4
    Adding comments as per Monty's request.

ChangeSet
  1.1346.46.60 02/12/14 13:02:30 monty@mashka.mysql.fi +1 -0
  Merge mashka.mysql.fi:/home/my/mysql-3.23
  into mashka.mysql.fi:/home/my/mysql-4.0

  mysys/my_rename.c
    1.5 02/12/14 13:02:28 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.676.1.623 02/12/14 12:57:12 monty@mashka.mysql.fi +1 -0
  On windows, delete any conflicting 'to' files on rename(from,to)
  This fixes a bug with REPAIR TABLE t1 USE_FRM on windows.

  mysys/my_rename.c
    1.3.1.1 02/12/14 12:57:11 monty@mashka.mysql.fi +7 -0
    On windows, delete any conflicting 'to' files on rename(from,to)

ChangeSet
  1.1346.46.59 02/12/14 12:49:55 monty@mashka.mysql.fi +3 -0
  Merge with 3.23 to get patch for lower_case_table_names for MacOSX

  sql/mysqld.cc
    1.297.1.86 02/12/14 12:49:53 monty@mashka.mysql.fi +7 -8
    Get patch for lower_case_table_names for MacOSX

  sql/log.cc
    1.80.1.25 02/12/14 12:49:53 monty@mashka.mysql.fi +0 -3
    Use local file

  configure.in
    1.191.1.52 02/12/14 12:49:53 monty@mashka.mysql.fi +2 -5
    merge with 3.23

ChangeSet
  1.1346.46.58 02/12/14 12:45:31 monty@mashka.mysql.fi +11 -0
  Transactions in AUTOCOMMIT=0 mode didn't rotate binary log
  Don't enable any bulk insert or record caching code if inserting less than MIN_ROWS_TO_USE_BULK_INSERT rows (100)

  sql/sql_insert.cc
    1.63.1.25 02/12/14 12:45:29 monty@mashka.mysql.fi +2 -1
    Don't enable any bulk insert or record caching code if inserting less than MIN_ROWS_TO_USE_BULK_INSERT

  sql/log.cc
    1.80.1.24 02/12/14 12:45:29 monty@mashka.mysql.fi +7 -0
    Transactions in AUTOCOMMIT=0 mode didn't rotate binary log.

  sql/ha_myisam.cc
    1.92.1.21 02/12/14 12:45:29 monty@mashka.mysql.fi +12 -5
    Don't disable index when inserting only a few rows

  mysql-test/r/show_check.result
    1.21.1.2 02/12/14 12:45:29 monty@mashka.mysql.fi +1 -1
    Fix result after not doing key statistics for first insert.

  mysql-test/r/select.result
    1.8.1.13 02/12/14 12:45:29 monty@mashka.mysql.fi +2 -2
    Fix result after not doing key statistics for first insert.

  mysql-test/r/order_by.result
    1.11.1.3 02/12/14 12:45:29 monty@mashka.mysql.fi +3 -3
    Fix result after not doing key statistics for first insert.

  mysql-test/r/key_diff.result
    1.5.1.3 02/12/14 12:45:29 monty@mashka.mysql.fi +1 -1
    Fix result after not doing key statistics for first insert.

  mysql-test/r/insert.result
    1.9 02/12/14 12:45:29 monty@mashka.mysql.fi +2 -2
    Fix result after not doing key statistics for first insert.

  mysql-test/r/fulltext.result
    1.29.1.6 02/12/14 12:45:29 monty@mashka.mysql.fi +2 -2
    Fix result after not doing key statistics for first insert.

  mysql-test/r/distinct.result
    1.14.1.5 02/12/14 12:45:29 monty@mashka.mysql.fi +4 -4
    Fix result after not doing key statistics for first insert.

  myisam/mi_check.c
    1.86.1.23 02/12/14 12:45:29 monty@mashka.mysql.fi +7 -7
    Fixed bug in copying statistics for disabled index

ChangeSet
  1.676.1.622 02/12/14 12:25:33 monty@mashka.mysql.fi +2 -0
  Make --lower-case-table-names default on MacOSX

  sql/mysqld.cc
    1.162.1.100 02/12/14 12:25:32 monty@mashka.mysql.fi +6 -1
    Make --lower-case-table-names default on MacOSX

  configure.in
    1.124.1.82 02/12/14 12:25:32 monty@mashka.mysql.fi +4 -4
    Make --lower-case-table-names default on MacOSX

ChangeSet
  1.676.1.621 02/12/14 12:05:45 monty@mashka.mysql.fi +1 -0
  Transactions in AUTOCOMMIT=0 mode didn't rotate binary log.

  sql/log.cc
    1.55.1.12 02/12/14 12:05:42 monty@mashka.mysql.fi +3 -0
    Transactions in AUTOCOMMIT=0 mode didn't rotate binary log.

ChangeSet
  1.1388.5.19 02/12/14 04:53:28 vva@eagle.mysql.r18.ru +1 -0
  fix stupid error in comments to VARIANCE+STD

  sql/item_sum.h
    1.23.1.2 02/12/14 04:53:26 vva@eagle.mysql.r18.ru +12 -8
    fix stupid error in comments to VARIANCE+STD

ChangeSet
  1.1388.5.18 02/12/14 03:38:38 vva@eagle.mysql.r18.ru +7 -0
  Merge vvagin@work.mysql.com:/home/bk/mysql-4.1
  into eagle.mysql.r18.ru:/home/vva/work/VARIANCE/4.1.clone

  sql/sql_yacc.yy
    1.203.2.2 02/12/14 03:38:35 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_select.cc
    1.173.19.2 02/12/14 03:38:34 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/lex.h
    1.82.1.2 02/12/14 03:38:34 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/item_sum.cc
    1.47.1.2 02/12/14 03:38:34 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/item.h
    1.41.4.4 02/12/14 03:38:34 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  sql/item.cc
    1.27.10.5 02/12/14 03:38:34 vva@eagle.mysql.r18.ru +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.212.14.3 02/12/14 03:38:31 vva@eagle.mysql.r18.ru +0 -1
    auto-union

ChangeSet
  1.1388.17.1 02/12/14 03:36:59 vva@eagle.mysql.r18.ru +14 -0
  add VARIANCE function

  BitKeeper/etc/logging_ok
    1.212.16.1 02/12/14 03:36:59 vva@eagle.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_yacc.yy
    1.203.3.1 02/12/14 03:34:13 vva@eagle.mysql.r18.ru +3 -0
    add VARIANCE function

  sql/sql_select.cc
    1.173.21.1 02/12/14 03:34:13 vva@eagle.mysql.r18.ru +3 -2
    add VARIANCE function

  sql/lex.h
    1.82.2.1 02/12/14 03:34:13 vva@eagle.mysql.r18.ru +1 -0
    add VARIANCE function

  sql/item_sum.h
    1.23.1.1 02/12/14 03:34:13 vva@eagle.mysql.r18.ru +45 -12
    add 'VARIANCE' sum function

  sql/item_sum.cc
    1.47.2.1 02/12/14 03:34:13 vva@eagle.mysql.r18.ru +33 -11
    add 'VARIANCE' sum function

  sql/item.h
    1.41.7.1 02/12/14 03:34:13 vva@eagle.mysql.r18.ru +2 -1
    add 'VARIANCE' sum function

  sql/item.cc
    1.27.13.1 02/12/14 03:34:13 vva@eagle.mysql.r18.ru +1 -1
    add 'VARIANCE' sum function

  mysql-test/t/select.test
    1.16 02/12/14 03:34:13 vva@eagle.mysql.r18.ru +2 -2
    add 'VARIANCE' tests

  mysql-test/t/having.test
    1.5 02/12/14 03:34:13 vva@eagle.mysql.r18.ru +1 -0
    add 'VARIANCE' tests

  mysql-test/t/func_group.test
    1.5 02/12/14 03:34:13 vva@eagle.mysql.r18.ru +5 -5
    add 'VARIANCE' tests

  mysql-test/r/select.result
    1.19 02/12/14 03:34:13 vva@eagle.mysql.r18.ru +8 -8
    add 'VARIANCE' tests

  mysql-test/r/having.result
    1.7 02/12/14 03:34:13 vva@eagle.mysql.r18.ru +4 -0
    add 'VARIANCE' tests

  mysql-test/r/func_group.result
    1.7 02/12/14 03:34:13 vva@eagle.mysql.r18.ru +20 -20
    add 'VARIANCE' tests

ChangeSet
  1.1388.5.17 02/12/14 02:18:58 vva@eagle.mysql.r18.ru +1 -0
  Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
  into eagle.mysql.r18.ru:/home/vva/work/SOUNDS_LIKE/4.1

  BitKeeper/etc/logging_ok
    1.212.14.2 02/12/14 02:18:44 vva@eagle.mysql.r18.ru +0 -0
    auto-union

ChangeSet
  1.1388.16.1 02/12/14 02:18:14 vva@eagle.mysql.r18.ru +6 -0
  add 'SOUNDS LIKE' syntax

  BitKeeper/etc/logging_ok
    1.212.15.1 02/12/14 02:18:14 vva@eagle.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_yacc.yy
    1.203.2.1 02/12/14 02:18:02 vva@eagle.mysql.r18.ru +5 -0
    add 'SOUNDS LIKE' syntax

  sql/lex.h
    1.82.1.1 02/12/14 02:18:02 vva@eagle.mysql.r18.ru +1 -0
    add 'SOUNDS' symbol

  mysql-test/t/func_str.test
    1.16 02/12/14 02:18:02 vva@eagle.mysql.r18.ru +5 -0
    add 'SOUNDS LIKE' test

  mysql-test/r/func_str.result
    1.17 02/12/14 02:18:01 vva@eagle.mysql.r18.ru +15 -0
    add 'SOUNDS LIKE' test

  Docs/manual.texi
    1.879 02/12/14 02:18:01 vva@eagle.mysql.r18.ru +4 -0
    add 'SOUNDS LIKE' description

ChangeSet
  1.1388.1.10 02/12/13 18:25:36 pem@mysql.com +3 -0
  Added collection of called procedures in a list.
  Fixed eval bug; now conditions with local variables work in WHILE et al.
  Made mysql_install_db.sh create proc table.

  sql/sp_head.cc
    1.4 02/12/13 18:25:34 pem@mysql.com +33 -7
    Added collection of called procedures in a list.
    Fixed eval bug; now conditions with local variables work in WHILE et al.

  sql/item.h
    1.41.1.7 02/12/13 18:25:34 pem@mysql.com +0 -5
    Removed unused method.

  scripts/mysql_install_db.sh
    1.38 02/12/13 18:25:34 pem@mysql.com +13 -0
    Added creation of the mysql.proc table.
    Note: The table format will change later, right now it's rather minimalistic,
    just so things can be tested (and the database can easily be recreated when
    I break it :-/ ).

ChangeSet
  1.1346.74.2 02/12/13 16:38:52 pem@mysql.com +1 -0
  Fixed syntax error in sql_yacc.yy (with bison 1.75).

  sql/sql_yacc.yy
    1.145.1.50 02/12/13 16:38:50 pem@mysql.com +2 -1
    Fixed syntax error (with bison 1.75).

ChangeSet
  1.1346.74.1 02/12/13 15:42:31 lenz@mysql.com +1 -0
   - HP/UX 11 compile fix: fixed "records_in_range" class definition
     in sql/ha_myisammrg.h (removed "ha_myisammrg::")

  sql/ha_myisammrg.h
    1.24.1.1 02/12/13 15:42:30 lenz@mysql.com +1 -1
     - HP/UX 11 compile fix: fixed "records_in_range" class definition
       in sql/ha_myisammrg.h (removed "ha_myisammrg::")  

ChangeSet
  1.1346.46.55 02/12/13 16:36:08 monty@mashka.mysql.fi +3 -0
  Merge patch for LOCK TABLES and SLAVE STOP

  sql/sql_parse.cc
    1.218.1.62 02/12/13 16:36:07 monty@mashka.mysql.fi +15 -15
    Merge patch for LOCK TABLES and SLAVE STOP

  scripts/mysqld_safe.sh
    1.52 02/12/13 16:36:07 monty@mashka.mysql.fi +0 -2
    Don't apply patch from 3.23

  configure.in
    1.191.1.51 02/12/13 16:36:07 monty@mashka.mysql.fi +0 -1
    merge with 4.0

  scripts/mysqld_safe.sh
    1.39.7.3 02/12/13 16:30:58 monty@mashka.mysql.fi +0 -0
    Merge rename: scripts/safe_mysqld.sh -> scripts/mysqld_safe.sh

ChangeSet
  1.1346.46.54 02/12/13 16:28:15 monty@mashka.mysql.fi +1 -0
  Fixed possible replication problem in LOAD DATA INFILE with innodb tables.

  sql/sql_load.cc
    1.34.1.6 02/12/13 16:28:12 monty@mashka.mysql.fi +9 -6
    Fixed possible replication problem in LOAD DATA INFILE with innodb tables.

ChangeSet
  1.676.263.1 02/12/13 16:01:51 monty@mashka.mysql.fi +1 -0
  Forbid SLAVE STOP if the thread executing the query has locked
  tables.  This removes a possible deadlock situation.

  sql/sql_parse.cc
    1.120.2.32 02/12/13 16:01:50 monty@mashka.mysql.fi +18 -0
    Forbid SLAVE STOP if the thread executing the query has locked
    tables.  This removes a possible deadlock situation.

ChangeSet
  1.676.1.619 02/12/13 13:47:25 lenz@mysql.com +1 -0
   - fixed another typo in NOHUP_NICENESS testing

  scripts/safe_mysqld.sh
    1.39.7.2 02/12/13 13:47:24 lenz@mysql.com +1 -1
     - fixed another typo in NOHUP_NICENESS testing

ChangeSet
  1.1346.46.53 02/12/13 12:05:24 monty@mashka.mysql.fi +5 -0
  RESET SLAVE and CHANGE MASTER will now give an error if slave is running.
  This fixes a problem in replication where RESET SLAVE could crash a running slave.

  sql/sql_repl.cc
    1.86.1.3 02/12/13 12:05:23 monty@mashka.mysql.fi +45 -30
    reset_slave() sends it own error.
    RESET SLAVE and CHANGE MASTER will now give an error if slave is running.
    This fixes a problem in replication where RESET SLAVE could crash a running slave.

  sql/sql_parse.cc
    1.218.1.61 02/12/13 12:05:23 monty@mashka.mysql.fi +28 -9
    reset_slave() sends it's own errors

  mysql-test/t/rpl_log_pos.test
    1.20.1.1 02/12/13 12:05:23 monty@mashka.mysql.fi +4 -0
    Added slave stop before change master

  mysql-test/r/rpl_log_pos.result
    1.22.1.1 02/12/13 12:05:23 monty@mashka.mysql.fi +4 -0
    Added slave stop before change master

  mysql-test/r/rpl_failsafe.result
    1.5.1.1 02/12/13 12:05:22 monty@mashka.mysql.fi +1 -0
    Added missing drop

ChangeSet
  1.1388.5.16 02/12/13 05:18:22 miguel@hegel.br +1 -0
  Remove variables redefined and variable shutdown_event_name fix

  sql/mysqld.cc
    1.316.1.1 02/12/13 05:18:01 miguel@hegel.br +1 -2
    Remove variables redefined and same fix for shutdown_event_name made by Monty on 4.0

ChangeSet
  1.676.1.618 02/12/13 09:56:02 lenz@mysql.com +1 -0
   - added missing "test" to $NOHUP_NICENESS test (thanks to Nick Gaugler for
     spotting and reporting this)

  scripts/safe_mysqld.sh
    1.39.7.1 02/12/13 09:56:02 lenz@mysql.com +1 -1
     - added missing "test" to $NOHUP_NICENESS test (thanks to Nick Gaugler for
       spotting and reporting this)

ChangeSet
  1.1346.46.52 02/12/12 21:01:32 monty@mashka.mysql.fi +12 -0
  Removed compiler warnings
  Fixed wrong variable name for Windows

  sql/sql_update.cc
    1.54.1.19 02/12/12 21:01:30 monty@mashka.mysql.fi +0 -2
    Removed not used label

  sql/mysqld.cc
    1.297.1.85 02/12/12 21:01:30 monty@mashka.mysql.fi +1 -1
    Fixed wrong variable name for Windows

  sql/ha_myisammrg.cc
    1.38.1.3 02/12/12 21:01:30 monty@mashka.mysql.fi +1 -1
    Removed compiler warning

  sql/ha_myisam.cc
    1.92.1.20 02/12/12 21:01:30 monty@mashka.mysql.fi +2 -2
    Removed compiler warning
    Fixed wrong (but not dangerous) if statement

  myisammrg/myrg_open.c
    1.20 02/12/12 21:01:30 monty@mashka.mysql.fi +2 -1
    Removed compiler warning

  innobase/include/univ.i
    1.25 02/12/12 21:01:30 monty@mashka.mysql.fi +2 -1
    Removed compiler warning

  VC++Files/sql/mysqld.dsp
    1.6.1.1 02/12/12 21:01:30 monty@mashka.mysql.fi +1 -1
    Fixed paths

  VC++Files/mysqlserver/mysqlserver.dsp
    1.3 02/12/12 21:01:30 monty@mashka.mysql.fi +2 -10
    Don't use precompiled headers (doesn't work with samba)

  VC++Files/mysqldemb/mysqldemb.dsp
    1.3 02/12/12 21:01:30 monty@mashka.mysql.fi +4 -2
    Don't use precompiled headers (doesn't work with samba)

  VC++Files/mysqlbinlog/mysqlbinlog.dsp
    1.7 02/12/12 21:01:30 monty@mashka.mysql.fi +3 -3
    Fixed included paths

  VC++Files/myisammrg/myisammrg.dsp
    1.3 02/12/12 21:01:30 monty@mashka.mysql.fi +4 -0
    Add missing files

  VC++Files/innobase/innobase.dsp
    1.7 02/12/12 21:01:30 monty@mashka.mysql.fi +8 -4
    Don't use precompiled headers (doesn't work with samba)

ChangeSet
  1.1388.5.15 02/12/12 20:34:16 bell@sanja.is.com.ua +1 -0
  postreview fix

  sql/item_cmpfunc.cc
    1.47 02/12/12 20:34:15 bell@sanja.is.com.ua +1 -4
    postreview fix

ChangeSet
  1.1394 02/12/12 16:09:06 Sinisa@sinisa.nasamreza.org +10 -0
  derived tables with UNION's ...
  
  Scrum task !!!!!

  sql/sql_union.cc
    1.54 02/12/12 16:09:02 Sinisa@sinisa.nasamreza.org +2 -4
    derived tables with UNION's ...

  sql/sql_select.cc
    1.173.1.27 02/12/12 16:09:02 Sinisa@sinisa.nasamreza.org +1 -1
    derived tables with UNION's ...

  sql/sql_lex.cc
    1.59.2.1 02/12/12 16:09:01 Sinisa@sinisa.nasamreza.org +3 -2
    derived tables with UNION's ...

  sql/sql_derived.cc
    1.24 02/12/12 16:09:01 Sinisa@sinisa.nasamreza.org +30 -4
    derived tables with UNION's ...

  sql/sql_analyse.cc
    1.26 02/12/12 16:09:01 Sinisa@sinisa.nasamreza.org +1 -1
    reverting a fix

  sql/mysql_priv.h
    1.160.16.1 02/12/12 16:09:01 Sinisa@sinisa.nasamreza.org +1 -1
    derived tables with UNION's ...

  mysql-test/t/derived.test
    1.13 02/12/12 16:09:01 Sinisa@sinisa.nasamreza.org +4 -0
    derived tables with UNION's ...

  mysql-test/t/analyse.test
    1.6 02/12/12 16:09:01 Sinisa@sinisa.nasamreza.org +1 -28
    reverting a fix

  mysql-test/r/derived.result
    1.13 02/12/12 16:09:01 Sinisa@sinisa.nasamreza.org +25 -0
    derived tables with UNION's ...

  mysql-test/r/analyse.result
    1.7 02/12/12 16:09:01 Sinisa@sinisa.nasamreza.org +0 -33
    reverting a fix

ChangeSet
  1.1388.1.9 02/12/12 13:14:23 pem@mysql.com +10 -0
  Moved create/find/drop functions to a separate files (sp.cc,sp.h).
  Fixed backpatching of forward jumps.
  Implemented LOOP, WHILE, REPEAT (temporarily known as SPREPEAT).
  
  Known bug: Expression evaluation still not quite ok (e.g. "x > 0"),
  which is why IF and CASE is not yet implemented.

  sql/sp.h
    1.1 02/12/12 13:14:21 pem@mysql.com +33 -0

  sql/sp.cc
    1.1 02/12/12 13:14:21 pem@mysql.com +119 -0

  sql/sql_yacc.yy
    1.207 02/12/12 13:14:21 pem@mysql.com +49 -16
    Fixed backpatching of forward jumps.
    Implemented LOOP, WHILE, and REPEAT. (Note: SPREPEAT for now.)

  sql/sql_parse.cc
    1.235.1.38 02/12/12 13:14:21 pem@mysql.com +1 -0
    Include sp.h.

  sql/sp_pcontext.h
    1.3 02/12/12 13:14:21 pem@mysql.com +6 -0
    New method: last_label().

  sql/sp_head.h
    1.3 02/12/12 13:14:21 pem@mysql.com +4 -20
    Moved create/find/drop declarations to sp.h.
    Fixed the backpatch stuff.

  sql/sp_head.cc
    1.3 02/12/12 13:14:21 pem@mysql.com +17 -138
    Moved create/find/drop functions to sp.cc.
    Fixed the backpatch stuff.
    (Also removed some dead code and updated comments.)

  sql/sp.h
    1.0 02/12/12 13:14:21 pem@mysql.com +0 -0
    BitKeeper file /home/pem/work/mysql-5.0/sql/sp.h

  sql/sp.cc
    1.0 02/12/12 13:14:21 pem@mysql.com +0 -0
    BitKeeper file /home/pem/work/mysql-5.0/sql/sp.cc

  sql/lex.h
    1.85 02/12/12 13:14:21 pem@mysql.com +3 -2
    Temporary fix until REPEAT conflict is solved. Use SPREPEAT for now.

  sql/item.h
    1.41.1.6 02/12/12 13:14:21 pem@mysql.com +5 -0
    New deferred result_type() method in Item_splocal.

  sql/Makefile.am
    1.79 02/12/12 13:14:21 pem@mysql.com +2 -2
    Added new sp.h/sp.cc file.

ChangeSet
  1.1346.46.51 02/12/12 11:06:55 ranger@regul.home.lan +2 -0
   - Fix handling of suffix option
   - Replace function 'check_reserved_words' with correct one

  BitKeeper/etc/logging_ok
    1.206.17.9 02/12/12 11:06:55 ranger@regul.home.lan +1 -0
    Logging to logging@openlogging.org accepted

  sql-bench/crash-me.sh
    1.34.1.5 02/12/12 11:06:47 ranger@regul.home.lan +199 -199
     - Fix handling of suffix option
     - Replace function 'check_reserved_words' with correct one

ChangeSet
  1.1388.15.1 02/12/12 12:49:56 hf@deer.mysql.r18.ru +20 -0
  Resolving merge conflicts

  sql/item_strfunc.cc
    1.62 02/12/12 12:49:54 hf@deer.mysql.r18.ru +1 -0
    merging

  libmysqld/lib_sql.cc
    1.38 02/12/12 12:49:54 hf@deer.mysql.r18.ru +6 -7
    merging

  sql/sql_table.cc
    1.138 02/12/12 12:36:56 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_show.cc
    1.97 02/12/12 12:36:56 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_select.cc
    1.181 02/12/12 12:36:56 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_parse.cc
    1.244 02/12/12 12:36:56 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_handler.cc
    1.28 02/12/12 12:36:56 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_class.h
    1.131 02/12/12 12:36:56 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_class.cc
    1.89 02/12/12 12:36:56 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_base.cc
    1.130 02/12/12 12:36:56 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/sql_acl.cc
    1.59 02/12/12 12:36:56 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/mysqld.cc
    1.317 02/12/12 12:36:56 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/mysql_priv.h
    1.169 02/12/12 12:36:56 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/item.h
    1.43 02/12/12 12:36:55 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/item.cc
    1.36 02/12/12 12:36:55 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/field.h
    1.51 02/12/12 12:36:55 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/field.cc
    1.70 02/12/12 12:36:55 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  sql/convert.cc
    1.11 02/12/12 12:36:55 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  include/mysql.h
    1.49 02/12/12 12:36:55 hf@deer.mysql.r18.ru +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.225 02/12/12 12:36:36 hf@deer.mysql.r18.ru +0 -0
    auto-union

ChangeSet
  1.1354.2.45 02/12/12 12:16:34 hf@deer.mysql.r18.ru +10 -0
  Some fixes

  BitKeeper/etc/logging_ok
    1.224 02/12/12 12:16:27 hf@deer.mysql.r18.ru +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_table.cc
    1.137 02/12/12 12:16:07 hf@deer.mysql.r18.ru +1 -1
    small fix

  sql/sql_show.cc
    1.96 02/12/12 12:16:07 hf@deer.mysql.r18.ru +2 -1
    strange code #ifdef-ed

  sql/mysqld.cc
    1.304.1.11 02/12/12 12:16:07 hf@deer.mysql.r18.ru +6 -5
    small fix

  sql/item_strfunc.cc
    1.61 02/12/12 12:16:07 hf@deer.mysql.r18.ru +2 -2
    cs parameter added

  sql/item.cc
    1.35 02/12/12 12:16:07 hf@deer.mysql.r18.ru +9 -1
    fixes about Field::embedded_send

  sql/field.cc
    1.69 02/12/12 12:16:07 hf@deer.mysql.r18.ru +2 -3
    small fix

  libmysqld/libmysqld.c
    1.20 02/12/12 12:16:07 hf@deer.mysql.r18.ru +3 -14
    mysql_fetch_length fixed

  libmysqld/lib_vio.c
    1.14 02/12/12 12:16:07 hf@deer.mysql.r18.ru +1 -1
    name of option changed

  libmysqld/lib_sql.cc
    1.37 02/12/12 12:16:07 hf@deer.mysql.r18.ru +8 -84
    parameters for functions added

ChangeSet
  1.1388.12.9 02/12/11 20:17:15 zak@mysql.com +2 -0
  A set of improvements to the German localized error messages

  BitKeeper/etc/logging_ok
    1.212.14.1 02/12/11 20:17:14 zak@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/share/german/errmsg.txt
    1.62 02/12/11 20:16:20 zak@mysql.com +105 -98
    Improved localized error messages courtesy of Georg Richter (georg@php.net)

ChangeSet
  1.1346.46.50 02/12/11 21:14:48 heikki@hundin.mysql.fi +1 -0
  log.cc:
    We must not commit inside InnoDB when LOAD DATA INFILE just writes a block to the binlog; only commit if the log event type is QUERY_EVENT or EXECUTE_LOAD_EVENT

ChangeSet
  1.1346.73.1 02/12/11 21:22:57 monty@mashka.mysql.fi +2 -0
  Add CHARSET keyword (missing from last push)

  sql/lex.h
    1.66.1.20 02/12/11 21:22:56 monty@mashka.mysql.fi +1 -0
    Add CHARSET keyword (missing from last push)

  sql/field.cc
    1.51.1.17 02/12/11 21:22:56 monty@mashka.mysql.fi +4 -2
    Small safety fix

  sql/log.cc
    1.80.1.23 02/12/11 21:14:39 heikki@hundin.mysql.fi +14 -2
    We must not commit inside InnoDB when LOAD DATA INFILE just writes a block to the binlog; only commit if the log event type is QUERY_EVENT or EXECUTE_LOAD_EVENT

ChangeSet
  1.1346.46.48 02/12/11 19:37:09 lenz@mysql.com +1 -0
   - moved manual pages from "man" to "man/man1" for the binary distribution

  scripts/make_binary_distribution.sh
    1.44 02/12/11 19:37:06 lenz@mysql.com +2 -2
     - moved manual pages from "man" to "man/man1" for the binary distribution

ChangeSet
  1.1388.14.1 02/12/11 19:53:57 bell@sanja.is.com.ua +11 -0
  merging

  sql/sql_cache.cc
    1.42 02/12/11 19:53:56 bell@sanja.is.com.ua +0 -1
    merging

  sql/handler.cc
    1.86 02/12/11 19:53:56 bell@sanja.is.com.ua +0 -2
    merging

  mysql-test/r/innodb_cache.result
    1.4 02/12/11 19:53:56 bell@sanja.is.com.ua +1 -1
    merging

  sql/sql_cache.h
    1.19 02/12/11 19:50:08 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/handler.h
    1.77 02/12/11 19:50:08 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/ha_innodb.h
    1.49 02/12/11 19:50:08 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.87 02/12/11 19:50:08 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/ha_berkeley.h
    1.52 02/12/11 19:50:08 bell@sanja.is.com.ua +0 -0
    Auto merged

  BitKeeper/deleted/.del-bdb_cache.test
    1.2 02/12/11 19:50:08 bell@sanja.is.com.ua +0 -0
    Delete: mysql-test/t/bdb_cache.test

  BitKeeper/deleted/.del-bdb_cache-master.opt
    1.2 02/12/11 19:49:36 bell@sanja.is.com.ua +0 -0
    Delete: mysql-test/t/bdb_cache-master.opt

  BitKeeper/deleted/.del-bdb_cache.result
    1.2 02/12/11 19:49:25 bell@sanja.is.com.ua +0 -0
    Delete: mysql-test/r/bdb_cache.result

ChangeSet
  1.676.1.617 02/12/11 18:27:46 lenz@mysql.com +1 -0
   - tagged ChangeSet 1.1276.3.1 as MySQL 3.23.54
   - bumped up version number in configure.in to 3.23.55

  configure.in
    1.124.1.81 02/12/11 18:27:45 lenz@mysql.com +1 -1
     - tagged ChangeSet 1.1276.3.1 as MySQL 3.23.54
     - bumped up version number in configure.in to 3.23.55

ChangeSet
  1.1388.13.1 02/12/11 16:03:50 jani@rhols221.adsl.netsonic.fi +1 -0
  Fixed a bug in mysql 'use' command. 'use' can now take quoted arguments.

  client/mysql.cc
    1.108 02/12/11 16:03:04 jani@rhols221.adsl.netsonic.fi +63 -10
    Fixed a bug in mysql 'use' command. 'use' can now take quoted arguments.

ChangeSet
  1.1346.46.46 02/12/11 15:46:39 monty@mashka.mysql.fi +9 -0
  Ensure that BEGIN / COMMIT is handled properly if slave dies
  Added syntax support for
  CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;

  sql/sql_yacc.yy
    1.145.1.49 02/12/11 15:46:37 monty@mashka.mysql.fi +5 -0
    Added syntax support for
    
    CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;
    
    To be able to read MySQL 4.1 dump files.
    

  sql/sql_analyse.cc
    1.12.1.4 02/12/11 15:46:37 monty@mashka.mysql.fi +25 -24
    Moved usage of res before res is destroyed (by bzero(&s...))

  sql/slave.h
    1.50.1.2 02/12/11 15:46:37 monty@mashka.mysql.fi +6 -4
    Ensure that BEGIN / COMMIT is handled properly if slave dies

  sql/slave.cc
    1.164.1.38 02/12/11 15:46:37 monty@mashka.mysql.fi +6 -1
    Fixed bug in replication and log rotation

  sql/log_event.cc
    1.77.1.16 02/12/11 15:46:37 monty@mashka.mysql.fi +20 -3
    Ensure that BEGIN / COMMIT is handled properly if slave dies

  sql/log.cc
    1.80.1.22 02/12/11 15:46:37 monty@mashka.mysql.fi +5 -0
    Fixed bug in replication and log rotation

  mysql-test/r/insert.result
    1.8 02/12/11 15:46:37 monty@mashka.mysql.fi +10 -1
    Updated test result from 3.23

  innobase/include/db0err.h
    1.5 02/12/11 15:46:37 monty@mashka.mysql.fi +2 -1
    Merge from 3.23

  Docs/internals.texi
    1.20 02/12/11 15:46:37 monty@mashka.mysql.fi +14 -2
    Update binary protocol description

ChangeSet
  1.1388.12.7 02/12/11 17:42:48 bar@bar.mysql.r18.ru +3 -0
  Preparation to charset dependant test_if_int and test_if_real

  sql/mysqld.cc
    1.316 02/12/11 17:42:46 bar@bar.mysql.r18.ru +1 -1
    Preparation to charset dependant test_if_int and test_if_real

  sql/field.h
    1.46.2.1 02/12/11 17:42:46 bar@bar.mysql.r18.ru +1 -1
    Preparation to charset dependant test_if_int and test_if_real

  sql/field.cc
    1.64.3.4 02/12/11 17:42:46 bar@bar.mysql.r18.ru +28 -24
    Preparation to charset dependant test_if_int and test_if_real

ChangeSet
  1.1388.1.8 02/12/11 14:24:29 pem@mysql.com +6 -0
  Fixed bugs in the parameter evaluation and modified the execution engine
  for better jump support. Some flow control support added too (but not
  complete).

  sql/sql_yacc.yy
    1.206 02/12/11 14:24:27 pem@mysql.com +129 -23
    Outlined flow control constructs (parses, but nothing generated yet).

  sql/sp_pcontext.h
    1.2 02/12/11 14:24:27 pem@mysql.com +25 -0
    Added label support.

  sql/sp_pcontext.cc
    1.2 02/12/11 14:24:27 pem@mysql.com +41 -1
    Added label support.

  sql/sp_head.h
    1.2 02/12/11 14:24:27 pem@mysql.com +122 -14
    Fixed bugs in the parameter evaluation.
    Modified execute() for better jump support.
    Added jump instruction and backpatch support.

  sql/sp_head.cc
    1.2 02/12/11 14:24:27 pem@mysql.com +75 -17
    Fixed bugs in the parameter evaluation.
    Modified execute() for better jump support.
    Added jump instruction and backpatch support.

  sql/lex.h
    1.84 02/12/11 14:24:27 pem@mysql.com +10 -0
    Added more keywords for embedded SQL. 

ChangeSet
  1.1388.12.6 02/12/11 17:20:40 bar@bar.mysql.r18.ru +1 -0
  Always use latin1 for acl

  sql/sql_acl.cc
    1.55.3.1 02/12/11 17:20:38 bar@bar.mysql.r18.ru +82 -82
    Always use latin1 for acl

ChangeSet
  1.1388.12.5 02/12/11 17:12:55 bar@bar.mysql.r18.ru +3 -0
  Some system_charset_info and default_charset_info were replaced by my_charset_latin1

  sql/field_conv.cc
    1.14 02/12/11 17:12:54 bar@bar.mysql.r18.ru +5 -3
    Some system_charset_info and default_charset_info were replaced by my_charset_latin1

  sql/field.cc
    1.64.3.3 02/12/11 17:12:54 bar@bar.mysql.r18.ru +9 -9
    Some system_charset_info and default_charset_info were replaced by my_charset_latin1

  sql/convert.cc
    1.9.1.1 02/12/11 17:12:54 bar@bar.mysql.r18.ru +1 -11
    Some system_charset_info and default_charset_info were replaced by my_charset_latin1

ChangeSet
  1.1388.12.4 02/12/11 16:04:46 bar@bar.mysql.r18.ru +1 -0
  Use of charset dependant num->string conversion routines

  sql/field.cc
    1.64.3.2 02/12/11 16:04:45 bar@bar.mysql.r18.ru +27 -14
    Use of charset dependant num->string conversion routines

ChangeSet
  1.1346.46.45 02/12/11 13:32:31 monty@mashka.mysql.fi +9 -0
  Merge with 3.23

  sql/sql_show.cc
    1.76.1.18 02/12/11 13:32:29 monty@mashka.mysql.fi +0 -2
    Use local code

  innobase/row/row0mysql.c
    1.38 02/12/11 13:32:29 monty@mashka.mysql.fi +5 -32
    Skiped merge (Heikki wants to do this)

  innobase/include/db0err.h
    1.4 02/12/11 13:32:29 monty@mashka.mysql.fi +0 -2
    Skiped merge (Heikki wants to do this)

ChangeSet
  1.1388.12.3 02/12/11 15:29:23 bar@bar.mysql.r18.ru +3 -0
  Use of new num->str functions
  fix in ucs2 charset

  strings/ctype-utf8.c
    1.19 02/12/11 15:29:22 bar@bar.mysql.r18.ru +2 -2
    Fix

  sql/item_sum.cc
    1.47.1.1 02/12/11 15:29:22 bar@bar.mysql.r18.ru +1 -3
    Use of new num->str functions

  sql/field.cc
    1.64.3.1 02/12/11 15:29:22 bar@bar.mysql.r18.ru +10 -6
    Use of new num->str functions

  sql/ha_innodb.cc
    1.73.1.60 02/12/11 13:28:44 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_udf.cc
    1.15.1.8 02/12/11 13:28:44 monty@mashka.mysql.fi +0 -2
    Auto merged

  sql/mysqld.cc
    1.297.1.84 02/12/11 13:28:44 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.45.18.2 02/12/11 13:28:44 monty@mashka.mysql.fi +0 -0
    Merge rename: sql/ha_innobase.cc -> sql/ha_innodb.cc

  scripts/make_binary_distribution.sh
    1.43 02/12/11 13:28:44 monty@mashka.mysql.fi +0 -2
    Auto merged

  libmysql/libmysql.c
    1.95.1.23 02/12/11 13:28:44 monty@mashka.mysql.fi +0 -0
    Auto merged

  innobase/dict/dict0dict.c
    1.25 02/12/11 13:28:44 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1388.12.2 02/12/11 15:26:49 bar@bar.mysql.r18.ru +3 -0
  sql/sql_string.cc@1.39
      New num->str functions
  strings/ctype-simple.c@1.16
      New num->str functions
  strings/ctype-utf8.c@1.18
      New num->str functions

ChangeSet
  1.676.1.616 02/12/11 12:59:55 monty@mashka.mysql.fi +2 -0
  Added back -max to server name if we are using InnoDB.

  sql/mysqld.cc
    1.162.1.99 02/12/11 12:59:54 monty@mashka.mysql.fi +3 -3
    Added back -max if we are using InnoDB.
    (This should not be done in the 3.23 version)

  libmysql/libmysql.c
    1.56.1.17 02/12/11 12:59:54 monty@mashka.mysql.fi +2 -2
    Compatibility fix

ChangeSet
  1.676.262.1 02/12/11 12:44:17 monty@mashka.mysql.fi +2 -0
  Fixed rare bug in show processlist which could cause core dump if a new thread was connecting.

  sql/sql_udf.cc
    1.13.1.2 02/12/11 12:44:16 monty@mashka.mysql.fi +2 -0
    Fixed warning from valgrind

  sql/sql_show.cc
    1.47.1.18 02/12/11 12:44:16 monty@mashka.mysql.fi +7 -5
    Fixed rare bug in show processlist which could cause core dump if a new thread was connecting.
    (We where calling mutex_unlock() without having ever called mutex_lock)
    
    

  strings/ctype-utf8.c
    1.18 02/12/11 14:31:20 bar@bar.mysql.r18.ru +111 -0
    New num->str functions

  strings/ctype-simple.c
    1.16 02/12/11 14:31:20 bar@bar.mysql.r18.ru +88 -8
    New num->str functions

  sql/sql_string.cc
    1.39 02/12/11 14:31:20 bar@bar.mysql.r18.ru +2 -16
    New num->str functions

ChangeSet
  1.1388.12.1 02/12/11 12:30:05 bar@bar.mysql.r18.ru +15 -0
  Preparing for charset dependant int10_to_str

  strings/ctype.c
    1.40 02/12/11 12:30:03 bar@bar.mysql.r18.ru +70 -22
    Preparing for charset dependant int10_to_str

  strings/ctype-win1250ch.c
    1.10 02/12/11 12:30:03 bar@bar.mysql.r18.ru +2 -0
    Preparing for charset dependant int10_to_str

  strings/ctype-utf8.c
    1.17 02/12/11 12:30:03 bar@bar.mysql.r18.ru +5 -1
    Preparing for charset dependant int10_to_str

  strings/ctype-ujis.c
    1.22 02/12/11 12:30:03 bar@bar.mysql.r18.ru +2 -0
    Preparing for charset dependant int10_to_str

  strings/ctype-tis620.c
    1.29 02/12/11 12:30:03 bar@bar.mysql.r18.ru +2 -0
    Preparing for charset dependant int10_to_str

  strings/ctype-sjis.c
    1.29 02/12/11 12:30:03 bar@bar.mysql.r18.ru +2 -0
    Preparing for charset dependant int10_to_str

  strings/ctype-simple.c
    1.15 02/12/11 12:30:03 bar@bar.mysql.r18.ru +23 -0
    Preparing for charset dependant int10_to_str

  strings/ctype-latin1_de.c
    1.20 02/12/11 12:30:03 bar@bar.mysql.r18.ru +2 -0
    Preparing for charset dependant int10_to_str

  strings/ctype-gbk.c
    1.24 02/12/11 12:30:03 bar@bar.mysql.r18.ru +3 -1
    Preparing for charset dependant int10_to_str

  strings/ctype-gb2312.c
    1.20 02/12/11 12:30:03 bar@bar.mysql.r18.ru +2 -0
    Preparing for charset dependant int10_to_str

  strings/ctype-euc_kr.c
    1.21 02/12/11 12:30:03 bar@bar.mysql.r18.ru +2 -0
    Preparing for charset dependant int10_to_str

  strings/ctype-czech.c
    1.24 02/12/11 12:30:03 bar@bar.mysql.r18.ru +2 -0
    Preparing for charset dependant int10_to_str

  strings/ctype-bin.c
    1.10 02/12/11 12:30:03 bar@bar.mysql.r18.ru +3 -2
    Preparing for charset dependant int10_to_str

  strings/ctype-big5.c
    1.24 02/12/11 12:30:03 bar@bar.mysql.r18.ru +3 -0
    Preparing for charset dependant int10_to_str

  include/m_ctype.h
    1.48 02/12/11 12:30:02 bar@bar.mysql.r18.ru +6 -1
    Preparing for charset dependant int10_to_str

ChangeSet
  1.1388.10.3 02/12/11 09:18:43 monty@mashka.mysql.fi +5 -0
  Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1

  sql/sql_parse.cc
    1.235.26.2 02/12/11 09:18:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/procedure.h
    1.12 02/12/11 09:18:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item.h
    1.41.6.1 02/12/11 09:18:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item.cc
    1.27.12.1 02/12/11 09:18:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/field.cc
    1.64.1.18 02/12/11 09:18:39 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1388.11.1 02/12/11 09:17:51 monty@mashka.mysql.fi +47 -0
  rename of net_pkg.cc to protocol.cc
  Class for sending data from server to client (Protocol)
  This handles both the old ( <= 4.0 ) protocol and then new binary protocol that is used for prepared statements.

  tests/fork_big2.pl
    1.1 02/12/11 09:17:47 monty@mashka.mysql.fi +705 -0

  sql/protocol.h
    1.1 02/12/11 09:17:47 monty@mashka.mysql.fi +131 -0

  tests/fork_big2.pl
    1.0 02/12/11 09:17:47 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.1/tests/fork_big2.pl

  sql/time.cc
    1.24 02/12/11 09:17:47 monty@mashka.mysql.fi +17 -0
    New convert function needed by the new protocol functions

  sql/structs.h
    1.26 02/12/11 09:17:47 monty@mashka.mysql.fi +2 -1
    Make second_part ulong to prepare for ANSI sub-seconds

  sql/sql_table.cc
    1.125.1.15 02/12/11 09:17:47 monty@mashka.mysql.fi +45 -47
    New protocol

  sql/sql_string.h
    1.26 02/12/11 09:17:47 monty@mashka.mysql.fi +25 -0
    New functions used by the protocol functions

  sql/sql_show.cc
    1.86.1.13 02/12/11 09:17:47 monty@mashka.mysql.fi +306 -336
    New protocol

  sql/sql_select.cc
    1.173.20.1 02/12/11 09:17:47 monty@mashka.mysql.fi +8 -4
    New protocol

  sql/sql_repl.cc
    1.90 02/12/11 09:17:47 monty@mashka.mysql.fi +25 -20
    New protocol

  sql/sql_prepare.cc
    1.14 02/12/11 09:17:47 monty@mashka.mysql.fi +4 -1
    New protocol

  sql/sql_parse.cc
    1.235.27.1 02/12/11 09:17:47 monty@mashka.mysql.fi +1 -1
    Remove wrong assert (variable was not initalized at this point)

  sql/sql_help.cc
    1.3 02/12/11 09:17:47 monty@mashka.mysql.fi +36 -36
    New protocol

  sql/sql_handler.cc
    1.22.1.8 02/12/11 09:17:47 monty@mashka.mysql.fi +18 -15
    New protocol

  sql/sql_error.cc
    1.7 02/12/11 09:17:47 monty@mashka.mysql.fi +9 -7
    New protocol

  sql/sql_db.cc
    1.58 02/12/11 09:17:47 monty@mashka.mysql.fi +8 -9
    New protocol

  sql/sql_class.h
    1.123.9.1 02/12/11 09:17:47 monty@mashka.mysql.fi +3 -0
    New protocol

  sql/sql_class.cc
    1.82.7.1 02/12/11 09:17:47 monty@mashka.mysql.fi +23 -20
    New protocol

  sql/sql_base.cc
    1.122.1.20 02/12/11 09:17:47 monty@mashka.mysql.fi +0 -244
    Move send_fields() to protocol.cc

  sql/sql_acl.cc
    1.55.1.15 02/12/11 09:17:47 monty@mashka.mysql.fi +13 -14
    New protocol

  sql/slave.cc
    1.174 02/12/11 09:17:47 monty@mashka.mysql.fi +62 -58
    New protocol

  sql/repl_failsafe.cc
    1.18 02/12/11 09:17:47 monty@mashka.mysql.fi +26 -22
    New protocol

  sql/protocol.h
    1.0 02/12/11 09:17:47 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.1/sql/protocol.h

  sql/protocol.cc
    1.23.1.9 02/12/11 09:17:47 monty@mashka.mysql.fi +576 -85
    Class for sending data from server to client.
    This handles both the old ( <= 4.0 ) protocol and then new binary protocol that is used for prepared statements.

  sql/procedure.h
    1.10.1.1 02/12/11 09:17:47 monty@mashka.mysql.fi +3 -3
    Use MYSQL_TYPE instead of FIELD_TYPE

  sql/opt_range.cc
    1.73 02/12/11 09:17:47 monty@mashka.mysql.fi +26 -19
    Indentation cleanups + small optimization

  sql/mysql_priv.h
    1.160.1.27 02/12/11 09:17:47 monty@mashka.mysql.fi +2 -25
    Move things to protocol.h

  sql/log_event.h
    1.76 02/12/11 09:17:47 monty@mashka.mysql.fi +13 -13
    New protocol

  sql/log_event.cc
    1.91 02/12/11 09:17:47 monty@mashka.mysql.fi +39 -37
    New protocol

  sql/item_timefunc.h
    1.26 02/12/11 09:17:47 monty@mashka.mysql.fi +7 -28
    return correct types for casts()
    Use standard make_field()

  sql/item_sum.h
    1.24 02/12/11 09:17:47 monty@mashka.mysql.fi +4 -2
    Use standard make_field()

  sql/item_sum.cc
    1.48 02/12/11 09:17:47 monty@mashka.mysql.fi +12 -15
    Clean up Item_sum::make_field()

  sql/item_subselect.h
    1.15.1.1 02/12/11 09:17:47 monty@mashka.mysql.fi +0 -1
    Use default make_field()

  sql/item_subselect.cc
    1.33.1.1 02/12/11 09:17:47 monty@mashka.mysql.fi +0 -14
    Standard make_field() is now good enough

  sql/item_func.h
    1.55 02/12/11 09:17:47 monty@mashka.mysql.fi +3 -2
    Set cached_result_type as it was previosly used before set

  sql/item_func.cc
    1.89 02/12/11 09:17:47 monty@mashka.mysql.fi +0 -2
    Removed old code from 3.23

  sql/item.h
    1.41.5.1 02/12/11 09:17:47 monty@mashka.mysql.fi +50 -22
    New protocol

  sql/item.cc
    1.27.11.1 02/12/11 09:17:47 monty@mashka.mysql.fi +105 -71
    New protocol

  sql/ha_myisam.cc
    1.98.1.8 02/12/11 09:17:47 monty@mashka.mysql.fi +11 -12
    New protocol

  sql/ha_innodb.cc
    1.85.1.3 02/12/11 09:17:47 monty@mashka.mysql.fi +8 -14
    New protocol

  sql/ha_berkeley.h
    1.50.1.2 02/12/11 09:17:47 monty@mashka.mysql.fi +1 -1
    New protocol

  sql/ha_berkeley.cc
    1.111 02/12/11 09:17:47 monty@mashka.mysql.fi +18 -20
    New protocol

  sql/field.h
    1.46.1.10 02/12/11 09:17:47 monty@mashka.mysql.fi +29 -8
    New protocol

  sql/field.cc
    1.64.2.1 02/12/11 09:17:47 monty@mashka.mysql.fi +88 -15
    Binary protocol
    Added key handling functions for new VARCHAR type

  sql/Makefile.am
    1.77.1.1 02/12/11 09:17:47 monty@mashka.mysql.fi +1 -1
    Rename of net_pkg.cc to protocol.cc

  mysql-test/r/cast.result
    1.2 02/12/11 09:17:47 monty@mashka.mysql.fi +2 -2
    Fixed previously wrong test

  mysql-test/r/case.result
    1.6 02/12/11 09:17:47 monty@mashka.mysql.fi +2 -2
    Fixed previously wrong test

  libmysqld/Makefile.am
    1.29 02/12/11 09:17:47 monty@mashka.mysql.fi +1 -1
    rename of net_pkg.cc to protocol.cc

  libmysql/libmysql.c
    1.116 02/12/11 09:17:46 monty@mashka.mysql.fi +2 -2
    Jump over reserved bits in the binary protocol

ChangeSet
  1.1346.71.4 02/12/10 21:38:00 serg@serg.mysql.com +2 -0
  order_by.result, key_diff.result:
    updated

  mysql-test/r/order_by.result
    1.11.1.2 02/12/10 21:37:45 serg@serg.mysql.com +3 -3
    updated

  mysql-test/r/key_diff.result
    1.5.1.2 02/12/10 21:37:33 serg@serg.mysql.com +1 -1
    updated

ChangeSet
  1.1388.5.12 02/12/10 18:10:00 bell@sanja.is.com.ua +9 -0
  postreview fix (SCRUM)
  NULL fixed
  max_length fixed
  layout fixed

  sql/sql_class.cc
    1.82.6.2 02/12/10 18:09:59 bell@sanja.is.com.ua +1 -1
    postreview fix

  sql/item_row.h
    1.4 02/12/10 18:09:59 bell@sanja.is.com.ua +5 -4
    NULL fixed

  sql/item_row.cc
    1.4 02/12/10 18:09:59 bell@sanja.is.com.ua +19 -0
    NULL fixed

  sql/item_cmpfunc.h
    1.30 02/12/10 18:09:59 bell@sanja.is.com.ua +18 -25
    postreview fix

  sql/item_cmpfunc.cc
    1.46 02/12/10 18:09:59 bell@sanja.is.com.ua +54 -30
    layout fix
    postreview fix
    max_length fix
    NULL fixed

  sql/item.h
    1.41.4.3 02/12/10 18:09:59 bell@sanja.is.com.ua +15 -8
    postreview fix

  sql/item.cc
    1.27.10.4 02/12/10 18:09:59 bell@sanja.is.com.ua +3 -3
    postreview fix

  mysql-test/t/row.test
    1.8 02/12/10 18:09:58 bell@sanja.is.com.ua +2 -0
    NULL fixed

  mysql-test/r/row.result
    1.9 02/12/10 18:09:58 bell@sanja.is.com.ua +7 -1
    NULL fixed

ChangeSet
  1.1346.46.43 02/12/10 19:13:31 walrus@mysql.com +2 -0
  Merge akishkin@work.mysql.com:/home/bk/mysql-4.0
  into mysql.com:/home/walrus/bk/40.ibase

  sql-bench/server-cfg.sh
    1.39.1.7 02/12/10 19:13:26 walrus@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.206.17.8 02/12/10 19:12:57 walrus@mysql.com +0 -1
    auto-union

ChangeSet
  1.1346.72.1 02/12/10 19:09:56 walrus@kishkin.ru +2 -0
  SCRUM task - cleanup interbase section in the server-cfg

  BitKeeper/etc/logging_ok
    1.206.19.1 02/12/10 19:09:55 walrus@kishkin.ru +1 -0
    Logging to logging@openlogging.org accepted

  sql-bench/server-cfg.sh
    1.39.2.1 02/12/10 18:54:20 walrus@kishkin.ru +17 -22
    clean-up interbase section
    corrected misprint in DSN,
    creating indexes,version(), and fields conversations. 

ChangeSet
  1.1346.46.42 02/12/10 18:40:38 walrus@kishkin.ru +3 -0
  merge Ranger's patches to crash-me, add new tests ( DEFAULT VALUES )
  to crash-me 

  BitKeeper/etc/logging_ok
    1.206.17.7 02/12/10 18:40:31 walrus@kishkin.ru +1 -0
    Logging to logging@openlogging.org accepted

  sql-bench/server-cfg.sh
    1.39.1.6 02/12/10 18:39:40 walrus@kishkin.ru +2 -1
    remove "KERNEL" and add "SAPDB" to sapdb version

  sql-bench/crash-me.sh
    1.34.1.4 02/12/10 18:39:40 walrus@kishkin.ru +263 -4
    new tests:
        - INSERT with DEFAULT:
        - INSERT with empty value list:
        - Insert DEFAULT VALUES;
    -------
    -checking of reserved keywords (by courtesy of Ranger)
    --------
    - added "--suffix" option 
    - added description of "--config-file" to help section
    - fixed test for DIFFERENCE()
    - fixed small bug in safe_query_result (was s/,/,/ should s/,/./)
       (by courtesy of Ranger)
    

ChangeSet
  1.676.1.614 02/12/10 14:25:23 lenz@mysql.com +1 -0
   - make sure to replace HOSTNAME in mysql.server when packing up the binary
     distribution (this will still be broken for 3.23.54)
   - make sure that mysql.server in the binary distribution is executable, too

  scripts/make_binary_distribution.sh
    1.29.1.6 02/12/10 14:25:22 lenz@mysql.com +2 -2
     - make sure to replace HOSTNAME in mysql.server when packing up the binary
       distribution (this will still be broken for 3.23.54)
     - make sure that mysql.server in the binary distribution is executable, too

ChangeSet
  1.1393 02/12/10 13:39:06 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/sql_analyse.cc
    1.25 02/12/10 13:39:02 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1388.9.1 02/12/10 13:52:41 ram@mysql.r18.ru +1 -0
  autoconf version check for BDB

  bdb/dist/configure.ac
    1.2 02/12/10 13:52:14 ram@mysql.r18.ru +3 -0
    autoconf version check for BDB

ChangeSet
  1.1388.5.11 02/12/10 11:45:40 bell@sanja.is.com.ua +3 -0
  merging

  sql/item_cmpfunc.h
    1.29 02/12/10 11:45:39 bell@sanja.is.com.ua +2 -4
    merging

  sql/sql_select.cc
    1.173.19.1 02/12/10 11:42:45 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.45 02/12/10 11:42:45 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1388.5.10 02/12/10 11:41:47 bell@sanja.is.com.ua +6 -0
  merging

  sql/item.h
    1.41.4.2 02/12/10 11:41:46 bell@sanja.is.com.ua +0 -1
    merging

  sql/sql_union.cc
    1.52.1.1 02/12/10 11:40:07 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_class.cc
    1.82.6.1 02/12/10 11:40:07 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.28 02/12/10 11:40:07 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.44 02/12/10 11:40:07 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.27.10.3 02/12/10 11:40:07 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1388.5.9 02/12/10 12:43:17 bar@bar.mysql.r18.ru +1 -0
  More new style str->num 

  sql/field.cc
    1.64.1.17 02/12/10 12:43:15 bar@bar.mysql.r18.ru +2 -4
    More new style str->num 

ChangeSet
  1.676.1.613 02/12/10 04:17:31 miguel@hegel.br +1 -0
  Update Windows binaries prefix according MySQL Pro release package

  sql/mysqld.cc
    1.162.1.98 02/12/10 04:17:03 miguel@hegel.br +2 -2
    With the introduction of Pro release version the InnoDB table engine
    was added for all binaries and not more define only the max package

  sql/protocol.cc
    1.23.1.8 02/12/10 09:43:49 monty@mashka.mysql.fi +0 -0
    Rename: sql/net_pkg.cc -> sql/protocol.cc

ChangeSet
  1.1346.71.3 02/12/10 00:07:25 serg@serg.mysql.com +1 -0
  incorrect bugfix removed. EQ+BETWEEN still cannot be optimized :(

  sql/sql_select.cc
    1.152.1.63 02/12/10 00:07:23 serg@serg.mysql.com +1 -1
    incorrect bugfix removed. EQ+BETWEEN still cannot be optimized :(

ChangeSet
  1.1346.71.2 02/12/10 00:06:05 serg@serg.mysql.com +4 -0
  ANALYZE for MERGE

  sql/ha_myisammrg.cc
    1.38.1.2 02/12/10 00:06:03 serg@serg.mysql.com +7 -0
    ANALYZE for MERGE

  myisammrg/myrg_open.c
    1.19 02/12/10 00:06:03 serg@serg.mysql.com +18 -4
    ANALYZE for MERGE

  myisammrg/myrg_info.c
    1.10 02/12/10 00:06:03 serg@serg.mysql.com +8 -9
    ANALYZE for MERGE

  include/myisammrg.h
    1.12.1.1 02/12/10 00:06:03 serg@serg.mysql.com +2 -0
    ANALYZE for MERGE

ChangeSet
  1.1392 02/12/09 20:47:47 Sinisa@sinisa.nasamreza.org +4 -0
  fix for a bug with UNION in sub-select's and start working on 
  UNION's in derived tables

  sql/sql_yacc.yy
    1.203.1.1 02/12/09 20:47:43 Sinisa@sinisa.nasamreza.org +1 -1
    fix for a bug with UNION in sub-select's and start working on 
    UNION's in derived tables

  sql/sql_union.cc
    1.53 02/12/09 20:47:43 Sinisa@sinisa.nasamreza.org +2 -0
    fix for a bug with UNION in sub-select's and start working on 
    UNION's in derived tables

  mysql-test/t/union.test
    1.29 02/12/09 20:47:43 Sinisa@sinisa.nasamreza.org +1 -0
    fix for a bug with UNION in sub-select's and start working on 
    UNION's in derived tables

  mysql-test/r/union.result
    1.25 02/12/09 20:47:43 Sinisa@sinisa.nasamreza.org +3 -0
    fix for a bug with UNION in sub-select's and start working on 
    UNION's in derived tables

ChangeSet
  1.1388.5.7 02/12/09 19:20:05 peter@mysql.com +2 -0
  Proper cleanup for BDB test 

  mysql-test/t/bdb_cache.test
    1.2 02/12/09 19:20:00 peter@mysql.com +2 -1
    Add proper cleanup for the test

  mysql-test/r/bdb_cache.result
    1.2 02/12/09 19:20:00 peter@mysql.com +1 -0
    Results fixed

ChangeSet
  1.1388.8.1 02/12/09 15:19:53 lenz@mysql.com +2 -0
   - delete readline/configure from BK tree (will be autogenerated)
   - Added missing readline header files to distribution

  readline/Makefile.am
    1.8 02/12/09 15:19:51 lenz@mysql.com +3 -1
     - Added missing readline header files to distribution

ChangeSet
  1.1388.7.1 02/12/09 17:57:17 bar@bar.mysql.r18.ru +2 -0
  More use of new str->num conversion routines 

  sql/sql_analyse.cc
    1.23.1.1 02/12/09 17:57:15 bar@bar.mysql.r18.ru +6 -6
    More use of new str->num conversion routines 

  sql/procedure.h
    1.11 02/12/09 17:57:15 bar@bar.mysql.r18.ru +18 -9
    More use of new str->num conversion routines 

ChangeSet
  1.1391 02/12/09 14:04:29 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/sql_select.cc
    1.173.1.26 02/12/09 14:00:00 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1388.5.5 02/12/09 15:58:33 bar@bar.mysql.r18.ru +1 -0
  More use of new str->num conversion routines

  sql/item.cc
    1.27.10.2 02/12/09 15:58:31 bar@bar.mysql.r18.ru +1 -1
    More use of new str->num conversion routines

ChangeSet
  1.1388.5.4 02/12/09 15:45:05 bar@bar.mysql.r18.ru +1 -0
  More use of new str->num functions

  sql/field.cc
    1.64.1.16 02/12/09 15:45:03 bar@bar.mysql.r18.ru +6 -18
    More use of new str->num functions

ChangeSet
  1.1388.6.1 02/12/09 14:29:17 peter@mysql.com +2 -0
  Minor new auth fixes 

  sql/sql_parse.cc
    1.235.26.1 02/12/09 14:29:14 peter@mysql.com +0 -2
    Remove the check. It is done in different place 

  sql/password.c
    1.18 02/12/09 14:29:14 peter@mysql.com +14 -4
    Add checks and fix new auth changes. 

ChangeSet
  1.1388.5.3 02/12/09 14:58:24 bar@bar.mysql.r18.ru +1 -0
  More use of new str->number routines

  sql/item.h
    1.41.4.1 02/12/09 14:58:22 bar@bar.mysql.r18.ru +8 -2
    More use of new str->number routines

ChangeSet
  1.1388.5.2 02/12/09 14:31:11 bar@bar.mysql.r18.ru +2 -0
  More use of new string->number conversion routines

  sql/item.cc
    1.27.10.1 02/12/09 14:31:08 bar@bar.mysql.r18.ru +1 -1
    More use of new string->number conversion routines

  sql/field.cc
    1.64.1.15 02/12/09 14:31:08 bar@bar.mysql.r18.ru +6 -18
    More use of new string->number conversion routines

ChangeSet
  1.1388.5.1 02/12/09 14:08:42 bar@bar.mysql.r18.ru +1 -0
  Use of new string->number conversion routines

  sql/field.cc
    1.64.1.14 02/12/09 14:08:40 bar@bar.mysql.r18.ru +12 -29
    Use of new string->number conversion routines

ChangeSet
  1.1388.2.5 02/12/08 23:56:40 bell@sanja.is.com.ua +1 -0
  fixed typo in cardinality check of row items (SCRUM)

  sql/item_cmpfunc.cc
    1.42.1.4 02/12/08 23:56:37 bell@sanja.is.com.ua +2 -2
    fixed typo

ChangeSet
  1.1388.1.7 02/12/08 19:59:22 pem@mysql.com +15 -0
  Simplistic, experimental framework for Stored Procedures (SPs).
  Implements creation and dropping of PROCEDUREs, IN, OUT, and INOUT parameters,
  single-statement procedures, rudimentary multi-statement (begin-end) prodedures
  (when the client can handle it), and local variables.
  Missing most of the embedded SQL language, all attributes, FUNCTIONs, error handling,
  reparses procedures at each call (no caching), etc, etc.
  Certainly buggy too, but procedures can actually be created and called....

  sql/sp_rcontext.h
    1.1 02/12/08 19:59:20 pem@mysql.com +82 -0

  sql/sp_pcontext.h
    1.1 02/12/08 19:59:20 pem@mysql.com +127 -0

  sql/sp_pcontext.cc
    1.1 02/12/08 19:59:20 pem@mysql.com +91 -0

  sql/sp_head.h
    1.1 02/12/08 19:59:20 pem@mysql.com +200 -0

  sql/sp_head.cc
    1.1 02/12/08 19:59:20 pem@mysql.com +384 -0

  sql/sql_yacc.yy
    1.205 02/12/08 19:59:20 pem@mysql.com +242 -7
    Lots and lots of additions for SPs...
    (Still even more missing, and no error messages...)

  sql/sql_parse.cc
    1.235.1.37 02/12/08 19:59:20 pem@mysql.com +80 -0
    Added SQLCOM_CREATE_PROCEDURE, _CALL, _ALTER_PROCEDURE and _DROP_PROCEDURE cases.
    (Still rudimentary and lacking proper error handling...)

  sql/sql_lex.h
    1.103 02/12/08 19:59:20 pem@mysql.com +8 -0
    New SQLCOM_ tags for SPs, and added pointer to beginning of command pointer and
    SP head and parse-time context to LEX.

  sql/sql_lex.cc
    1.59.1.3 02/12/08 19:59:20 pem@mysql.com +3 -0
    Init. buf pointer to beginning of command (needed by SPs).
    Also initialize SP head and parse time context.

  sql/sql_class.h
    1.123.1.27 02/12/08 19:59:20 pem@mysql.com +2 -0
    Add SP runtime context to THD.

  sql/sp_rcontext.h
    1.0 02/12/08 19:59:20 pem@mysql.com +0 -0
    BitKeeper file /home/pem/work/mysql-5.0/sql/sp_rcontext.h

  sql/sp_pcontext.h
    1.0 02/12/08 19:59:20 pem@mysql.com +0 -0
    BitKeeper file /home/pem/work/mysql-5.0/sql/sp_pcontext.h

  sql/sp_pcontext.cc
    1.0 02/12/08 19:59:20 pem@mysql.com +0 -0
    BitKeeper file /home/pem/work/mysql-5.0/sql/sp_pcontext.cc

  sql/sp_head.h
    1.0 02/12/08 19:59:20 pem@mysql.com +0 -0
    BitKeeper file /home/pem/work/mysql-5.0/sql/sp_head.h

  sql/sp_head.cc
    1.0 02/12/08 19:59:20 pem@mysql.com +0 -0
    BitKeeper file /home/pem/work/mysql-5.0/sql/sp_head.cc

  sql/sql_class.cc
    1.82.1.27 02/12/08 19:59:19 pem@mysql.com +1 -1
    Initialize SP runtime context in THD.

  sql/lex.h
    1.83 02/12/08 19:59:19 pem@mysql.com +6 -0
    Added new symbols for SPs. (Note: SPSET is temporary and will go away later.)

  sql/item.h
    1.41.1.5 02/12/08 19:59:19 pem@mysql.com +53 -0
    Added this*_item() methods for SPs in Item, and the new Item_splocal
    class (SP local variable).

  sql/item.cc
    1.27.1.30 02/12/08 19:59:19 pem@mysql.com +19 -0
    Added this*_item() methods for Item_splocal. (SP local variable)

  sql/Makefile.am
    1.78 02/12/08 19:59:19 pem@mysql.com +4 -2
    Added SP files.

ChangeSet
  1.1388.4.2 02/12/08 15:17:40 pem@mysql.com +4 -0
  Post merge fix.

  BitKeeper/triggers/post-commit
    1.24 02/12/08 15:17:39 pem@mysql.com +3 -6
    Post merge fix.

  sql/sql_yacc.yy
    1.204 02/12/08 15:11:19 pem@mysql.com +0 -22
    Auto merged

  configure.in
    1.205 02/12/08 15:11:19 pem@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.212.1.17 02/12/08 15:11:13 pem@mysql.com +0 -0
    auto-union

ChangeSet
  1.1388.2.4 02/12/08 03:19:03 bell@sanja.is.com.ua +5 -0
  optimized IN with Rows  (SCRUM)
  NULL with row (IN)
  cardinality error of row inside row
  new[]
  fixed layout

  sql/sql_list.h
    1.14 02/12/08 03:19:02 bell@sanja.is.com.ua +9 -1
    fixed layout
    new[]

  sql/item_cmpfunc.h
    1.26.1.3 02/12/08 03:19:02 bell@sanja.is.com.ua +148 -43
    optimized IN with Rows
    NULL with row (IN)
    cardinality error of row inside row
    fixed layout

  sql/item_cmpfunc.cc
    1.42.1.3 02/12/08 03:19:02 bell@sanja.is.com.ua +122 -8
    optimized IN with Rows
    NULL with row (IN)
    cardinality error of row inside row
    

  mysql-test/t/row.test
    1.7 02/12/08 03:19:01 bell@sanja.is.com.ua +21 -4
    test of optimized IN with Rows
    test of NULL with row
    test of cardinality error of row inside row

  mysql-test/r/row.result
    1.8 02/12/08 03:19:01 bell@sanja.is.com.ua +65 -11
    test of optimized IN with Rows
    test of NULL with row
    test of cardinality error of row inside row
    

ChangeSet
  1.1346.71.1 02/12/07 22:40:20 serg@serg.mysql.com +13 -0
  bulk insert code optimized

  sql/sql_insert.cc
    1.63.1.24 02/12/07 22:40:18 serg@serg.mysql.com +7 -13
    bulk insert code optimized

  sql/ha_myisammrg.cc
    1.38.1.1 02/12/07 22:40:18 serg@serg.mysql.com +1 -3
    bulk insert code optimized

  sql/ha_myisam.cc
    1.92.1.19 02/12/07 22:40:18 serg@serg.mysql.com +9 -9
    bulk insert code optimized

  mysql-test/t/insert.test
    1.8 02/12/07 22:40:18 serg@serg.mysql.com +2 -0
    updated

  mysql-test/r/show_check.result
    1.21.1.1 02/12/07 22:40:18 serg@serg.mysql.com +1 -1
    updated

  mysql-test/r/select.result
    1.8.1.12 02/12/07 22:40:18 serg@serg.mysql.com +2 -2
    updated

  mysql-test/r/fulltext.result
    1.29.1.5 02/12/07 22:40:18 serg@serg.mysql.com +2 -2
    updated

  mysql-test/r/distinct.result
    1.14.1.4 02/12/07 22:40:18 serg@serg.mysql.com +4 -4
    updated

  myisam/myisamdef.h
    1.45.1.9 02/12/07 22:40:18 serg@serg.mysql.com +1 -2
    bulk insert code optimized

  myisam/mi_write.c
    1.24.1.8 02/12/07 22:40:17 serg@serg.mysql.com +40 -7
    bulk insert code optimized

  myisam/mi_extra.c
    1.30 02/12/07 22:40:17 serg@serg.mysql.com +0 -27
    bulk insert code optimized

  include/myisam.h
    1.36.1.15 02/12/07 22:40:17 serg@serg.mysql.com +4 -0
    bulk insert code optimized

  include/my_base.h
    1.30.1.5 02/12/07 22:40:17 serg@serg.mysql.com +0 -3
    bulk insert code optimized

ChangeSet
  1.1388.2.3 02/12/07 19:58:05 bell@sanja.is.com.ua +4 -0
  IN with row item without constant optimisation (SCRUM)
  renamed row item test

  sql/item_cmpfunc.h
    1.26.1.2 02/12/07 19:57:45 bell@sanja.is.com.ua +15 -7
    IN with row item without constant optimisation

  sql/item_cmpfunc.cc
    1.42.1.2 02/12/07 19:57:45 bell@sanja.is.com.ua +54 -19
    IN with row item without constant optimisation

  mysql-test/t/row.test
    1.6 02/12/07 19:57:45 bell@sanja.is.com.ua +6 -0
    IN with row item without constant optimisation

  mysql-test/r/row.result
    1.7 02/12/07 19:57:45 bell@sanja.is.com.ua +16 -0
    IN with row item without constant optimisation

  mysql-test/r/row.result
    1.6 02/12/07 19:00:52 bell@sanja.is.com.ua +0 -0
    Rename: mysql-test/t/row.result -> mysql-test/r/row.result

  mysql-test/t/row.result
    1.5 02/12/07 18:53:18 bell@sanja.is.com.ua +0 -0
    Rename: mysql-test/r/row_test.result -> mysql-test/t/row.result

  mysql-test/t/row.test
    1.5 02/12/07 18:53:02 bell@sanja.is.com.ua +0 -0
    Rename: mysql-test/t/row_test.test -> mysql-test/t/row.test

ChangeSet
  1.1354.112.1 02/12/07 16:00:39 bell@sanja.is.com.ua +3 -0
  Row item fixing (SCRUM related)
  Inserted comment

  sql/sql_select.cc
    1.173.18.1 02/12/07 16:00:38 bell@sanja.is.com.ua +10 -0
    Inserted comment

  sql/item_row.h
    1.3 02/12/07 16:00:38 bell@sanja.is.com.ua +9 -3
    Row item fixing

  sql/item_row.cc
    1.3 02/12/07 16:00:38 bell@sanja.is.com.ua +20 -3
    Row item fixing

ChangeSet
  1.1388.4.1 02/12/07 12:35:57 pem@mysql.com +1 -0
  Made sql_yacc.yy work with bison 1.75.

  sql/sql_yacc.yy
    1.203 02/12/07 12:35:55 pem@mysql.com +4 -3
    Made it work with bison 1.75.
    Removed a duplicate type definition, removed two extraneous ; and added two more {}.

ChangeSet
  1.1390 02/12/07 12:19:33 Sinisa@sinisa.nasamreza.org +2 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/sql_select.cc
    1.173.17.1 02/12/07 12:19:27 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_analyse.cc
    1.24 02/12/07 12:19:26 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1388.3.1 02/12/07 10:53:33 bell@sanja.is.com.ua +1 -0
  probably fix depended subselect cleanup
  fixed cleanup on error message handling

  sql/sql_select.cc
    1.173.1.25 02/12/07 10:53:27 bell@sanja.is.com.ua +9 -9
    probably fix depended subselect cleanup
    fixed cleanup on error message handling

ChangeSet
  1.1388.1.3 02/12/06 23:39:11 venu@myvenu.com +6 -0
  item.cc:
    Fix for save_in_field to take extra bool argumnet (4.0 merge compatibility)

  sql/sql_prepare.cc
    1.13 02/12/06 23:12:15 venu@myvenu.com +19 -28
    cleanups for init_param_items

  sql/sql_class.h
    1.123.1.26 02/12/06 23:12:14 venu@myvenu.com +2 -2

  sql/item.h
    1.41.1.4 02/12/06 23:12:12 venu@myvenu.com +1 -1

  sql/item.cc
    1.27.1.29 02/12/06 23:11:48 venu@myvenu.com +1 -1
    Fix for save_in_field to take extra bool argumnet (missed one)

  libmysql/libmysql.c
    1.115 02/12/06 23:11:42 venu@myvenu.com +0 -1

  include/mysql_com.h
    1.60 02/12/06 23:11:36 venu@myvenu.com +1 -1

ChangeSet
  1.1346.70.1 02/12/06 22:49:16 monty@mashka.mysql.fi +4 -0
  Don't initialize fulltext functions twice in multi-table-update

  sql/sql_update.cc
    1.54.1.18 02/12/06 22:49:14 monty@mashka.mysql.fi +0 -1
    Don't initialize fulltext functions twice in multi-table-update

  mysql-test/t/multi_update.test
    1.17.1.1 02/12/06 22:49:14 monty@mashka.mysql.fi +2 -2
    Portability fix

  mysql-test/r/multi_update.result
    1.15.1.1 02/12/06 22:49:14 monty@mashka.mysql.fi +7 -7
    Portability fix

  mysql-test/mysql-test-run.sh
    1.146.1.9 02/12/06 22:49:14 monty@mashka.mysql.fi +1 -0
    Added option --extern (from 4.1)

ChangeSet
  1.1388.1.2 02/12/06 22:01:12 monty@mashka.mysql.fi +2 -0
  Remove usage of acl_getroot() in embedded server.
  Fixed compilation problem when OPENSSL was enabled.

  sql/sql_acl.cc
    1.55.1.14 02/12/06 22:00:43 monty@mashka.mysql.fi +73 -72
    Fixed compilation problem when OPENSSL was enabled

  libmysqld/lib_sql.cc
    1.25.1.13 02/12/06 22:00:43 monty@mashka.mysql.fi +2 -35
    Remove usage of acl_getroot() as user accounts is not useful with embedded server

ChangeSet
  1.1388.2.1 02/12/06 21:55:53 bell@sanja.is.com.ua +12 -0
  _NEW_ IN/ALL/ANY/SOME behaviour with NULL (SCRUM related)
  optimization of left expression evaluation
  more descriptive method name

  sql/sql_union.cc
    1.50.1.1 02/12/06 21:55:51 bell@sanja.is.com.ua +1 -1
    more descriptive method name

  sql/sql_class.cc
    1.82.5.1 02/12/06 21:55:51 bell@sanja.is.com.ua +1 -1
    more descriptive method name

  sql/item_subselect.h
    1.16 02/12/06 21:55:51 bell@sanja.is.com.ua +19 -4
    _NEW_ IN/ALL/ANY/SOME behaviour with NULL
    optimization of left expression evaluation

  sql/item_subselect.cc
    1.34 02/12/06 21:55:51 bell@sanja.is.com.ua +93 -25
    _NEW_ IN/ALL/ANY/SOME behaviour with NULL
    optimization of left expression evaluation

  sql/item_cmpfunc.h
    1.26.1.1 02/12/06 21:55:51 bell@sanja.is.com.ua +23 -1
    _NEW_ IN/ALL/ANY/SOME behaviour with NULL
    optimization of left expression evaluation

  sql/item_cmpfunc.cc
    1.42.1.1 02/12/06 21:55:51 bell@sanja.is.com.ua +61 -1
    _NEW_ IN/ALL/ANY/SOME behaviour with NULL
    optimization of left expression evaluation

  sql/item.h
    1.41.3.1 02/12/06 21:55:51 bell@sanja.is.com.ua +67 -16
    _NEW_ IN/ALL/ANY/SOME behaviour with NULL
    optimization of left expression evaluation

  sql/item.cc
    1.27.9.1 02/12/06 21:55:51 bell@sanja.is.com.ua +42 -1
    _NEW_ IN/ALL/ANY/SOME behaviour with NULL
    optimization of left expression evaluation

  mysql-test/t/subselect.test
    1.36 02/12/06 21:55:51 bell@sanja.is.com.ua +45 -0
    test of _NEW_ IN/ALL/ANY/SOME behaviour with NULL

  mysql-test/t/func_in.test
    1.5 02/12/06 21:55:51 bell@sanja.is.com.ua +32 -0
    test of _NEW_ IN behaviour with NULL

  mysql-test/r/subselect.result
    1.40 02/12/06 21:55:51 bell@sanja.is.com.ua +102 -0
    test of _NEW_ IN/ALL/ANY/SOME behaviour with NULL

  mysql-test/r/func_in.result
    1.6 02/12/06 21:55:51 bell@sanja.is.com.ua +86 -1
    test of _NEW_ IN behaviour with NULL

ChangeSet
  1.1388.1.1 02/12/06 21:15:05 monty@mashka.mysql.fi +18 -0
  merge fix

  sql/sql_parse.cc
    1.235.1.36 02/12/06 21:15:03 monty@mashka.mysql.fi +6 -7
    merge fix

  sql/mysqld.cc
    1.315 02/12/06 21:15:03 monty@mashka.mysql.fi +1 -1
    merge fix

  sql/sql_yacc.yy
    1.202 02/12/06 21:12:28 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql-bench/server-cfg.sh
    1.44 02/12/06 21:12:28 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/sql_update.cc
    1.70 02/12/06 21:12:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_table.cc
    1.125.1.14 02/12/06 21:12:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_insert.cc
    1.79 02/12/06 21:12:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_delete.cc
    1.94 02/12/06 21:12:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_class.h
    1.123.1.25 02/12/06 21:12:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_analyse.cc
    1.23 02/12/06 21:12:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/password.c
    1.17 02/12/06 21:12:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.160.1.26 02/12/06 21:12:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_func.h
    1.54 02/12/06 21:12:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.27 02/12/06 21:12:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.43 02/12/06 21:12:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item.h
    1.41.1.3 02/12/06 21:12:27 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysql/password.c
    1.8 02/12/06 21:12:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysql/password.c
    1.5.2.2 02/12/06 21:12:26 monty@mashka.mysql.fi +0 -191
    Merge file types: FILE -> SYMLINK

  libmysql/libmysql.c
    1.114 02/12/06 21:12:08 monty@mashka.mysql.fi +0 -1
    Auto merged

ChangeSet
  1.1354.111.2 02/12/06 21:11:27 monty@mashka.mysql.fi +18 -0
  After merge fixes
  Added THD to add_to_xxx_list() functions for faster parsing.

  sql/table.h
    1.41 02/12/06 21:11:24 monty@mashka.mysql.fi +2 -1
    After merge fix

  sql/sql_yacc.yy
    1.184.24.6 02/12/06 21:11:24 monty@mashka.mysql.fi +44 -40
    Added THD to all add_xxx_to_list() functions

  sql/sql_update.cc
    1.68.1.2 02/12/06 21:11:24 monty@mashka.mysql.fi +10 -9
    After merge fixes

  sql/sql_union.cc
    1.52 02/12/06 21:11:24 monty@mashka.mysql.fi +5 -5
    Updated argument lists.

  sql/sql_select.h
    1.33 02/12/06 21:11:24 monty@mashka.mysql.fi +4 -7
    Removed test_function_query variable
    Updated prototypes

  sql/sql_select.cc
    1.173.1.24 02/12/06 21:11:24 monty@mashka.mysql.fi +71 -61
    After merge fixes
    Fixed return values from JOIN::optimize()
    Replaced test_function_query with '!tables_list'
    Optimized arguments to create_tmp_table()

  sql/sql_parse.cc
    1.235.25.2 02/12/06 21:11:24 monty@mashka.mysql.fi +8 -9
    Added THD to add_to_list (Faster parsing)

  sql/sql_lex.h
    1.102 02/12/06 21:11:24 monty@mashka.mysql.fi +7 -7
    Added THD to add_to_list (Faster parsing)

  sql/sql_lex.cc
    1.59.1.2 02/12/06 21:11:24 monty@mashka.mysql.fi +8 -8
    Added THD to add_to_list (Faster parsing)

  sql/sql_derived.cc
    1.23 02/12/06 21:11:24 monty@mashka.mysql.fi +2 -2
    Fixed parameters to create_tmp_table()

  sql/mysql_priv.h
    1.160.15.2 02/12/06 21:11:24 monty@mashka.mysql.fi +16 -11
    Added THD to add_to_list (Faster parsing)

  sql/log_event.cc
    1.90 02/12/06 21:11:24 monty@mashka.mysql.fi +9 -3
    Remove compiler warning

  sql/item_sum.cc
    1.47 02/12/06 21:11:24 monty@mashka.mysql.fi +10 -6
    After merge fix

  sql/field.cc
    1.64.1.13 02/12/06 21:11:24 monty@mashka.mysql.fi +5 -4
    After merge fix

  mysql-test/t/multi_update.test
    1.18 02/12/06 21:11:24 monty@mashka.mysql.fi +2 -2
    Make timestamp test portable

  mysql-test/r/multi_update.result
    1.16 02/12/06 21:11:24 monty@mashka.mysql.fi +7 -7
    Make timestamp test portable

  mysql-test/r/distinct.result
    1.19 02/12/06 21:11:24 monty@mashka.mysql.fi +16 -16
    After merge fix

  heap/_check.c
    1.13 02/12/06 21:11:24 monty@mashka.mysql.fi +1 -1
    After merge fix

ChangeSet
  1.1389 02/12/06 18:36:25 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/sql_analyse.cc
    1.21.1.2 02/12/06 18:36:20 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1388 02/12/06 00:40:28 bell@sanja.is.com.ua +5 -0
  fixed bug of PROCEDURE in same query with subselects
  prohibited using procedure inside subquery
  fixed error handling of procedure analize

  sql/sql_yacc.yy
    1.201 02/12/06 00:40:15 bell@sanja.is.com.ua +7 -0
    prohibited using procedure inside subquery

  sql/sql_parse.cc
    1.235.1.35 02/12/06 00:40:15 bell@sanja.is.com.ua +6 -3
    fixed bug of PROCEDURE in same query with subselects

  sql/sql_analyse.cc
    1.21.2.1 02/12/06 00:40:15 bell@sanja.is.com.ua +4 -4
    fixed error handling in procedure analize

  mysql-test/t/subselect.test
    1.35 02/12/06 00:40:15 bell@sanja.is.com.ua +5 -0
    test of PROCEDURE in subselect
    test of PROCEDURE of subselect

  mysql-test/r/subselect.result
    1.39 02/12/06 00:40:15 bell@sanja.is.com.ua +4 -0
    test of PROCEDURE in subselect
    test of PROCEDURE of subselect

ChangeSet
  1.1346.69.1 02/12/05 22:05:31 lenz@mysql.com +1 -0
  Merge mysql.com:/space/my/mysql-4.0
  into mysql.com:/space/my/mysql-4.0-build

  support-files/mysql.server.sh
    1.26 02/12/05 22:05:27 lenz@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1385.1.2 02/12/05 22:57:22 Sinisa@sinisa.nasamreza.org +1 -0
  small error in result

  mysql-test/r/analyse.result
    1.6 02/12/05 22:57:16 Sinisa@sinisa.nasamreza.org +2 -2
    small error in result

ChangeSet
  1.1346.68.1 02/12/05 21:38:27 serg@serg.mysql.com +4 -0
  current_user() to return priv_user

  sql/lex.h
    1.66.1.19 02/12/05 21:38:25 serg@serg.mysql.com +1 -1
    current_user() to return priv_user

  sql/item_create.h
    1.11.1.6 02/12/05 21:38:25 serg@serg.mysql.com +1 -0
    current_user() to return priv_user

  sql/item_create.cc
    1.15.1.8 02/12/05 21:38:25 serg@serg.mysql.com +10 -1
    current_user() to return priv_user

  sql/item.h
    1.20.1.12 02/12/05 21:38:25 serg@serg.mysql.com +3 -1
    current_user() to return priv_user

ChangeSet
  1.1387 02/12/05 12:34:22 venu@myvenu.com +1 -0
  sql_error.cc:
    make tests to go ; becuase of DROP TABLE ID EXISTS warnings

  sql/sql_error.cc
    1.6 02/12/05 12:33:36 venu@myvenu.com +2 -0
    make tests to go ; becuase of DROP TABLE ID EXISTS warnings

ChangeSet
  1.676.1.612 02/12/05 22:09:51 heikki@hundin.mysql.fi +1 -0
  row0mysql.c:
    Heikki will merge to 4.0: cleanup

  innobase/row/row0mysql.c
    1.16.1.23 02/12/05 22:09:43 heikki@hundin.mysql.fi +0 -1
    Heikki will merge to 4.0: cleanup

ChangeSet
  1.676.1.611 02/12/05 22:03:24 heikki@hundin.mysql.fi +4 -0
  row0mysql.c, dict0dict.c, db0err.h, ha_innobase.cc:
    Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd

  innobase/row/row0mysql.c
    1.16.1.22 02/12/05 22:03:15 heikki@hundin.mysql.fi +33 -7
    Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd

  innobase/dict/dict0dict.c
    1.5.1.15 02/12/05 22:03:04 heikki@hundin.mysql.fi +21 -0
    Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd

  innobase/include/db0err.h
    1.2.1.1 02/12/05 22:02:53 heikki@hundin.mysql.fi +2 -0
    Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd

  sql/ha_innobase.cc
    1.45.18.1 02/12/05 22:02:33 heikki@hundin.mysql.fi +5 -1
    Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd

ChangeSet
  1.1385.1.1 02/12/05 21:51:22 Sinisa@sinisa.nasamreza.org +4 -0
  Fix for few PROCEDURE bugs ...

  sql/sql_select.cc
    1.173.16.1 02/12/05 21:51:18 Sinisa@sinisa.nasamreza.org +2 -0
    Fix for few PROCEDURE bugs ...

  sql/sql_analyse.cc
    1.21.1.1 02/12/05 21:51:18 Sinisa@sinisa.nasamreza.org +1 -1
    Fix for few PROCEDURE bugs ...

  mysql-test/t/analyse.test
    1.5 02/12/05 21:51:18 Sinisa@sinisa.nasamreza.org +29 -0
    Fix for few PROCEDURE bugs ...

  mysql-test/r/analyse.result
    1.5 02/12/05 21:51:18 Sinisa@sinisa.nasamreza.org +37 -0
    Fix for few PROCEDURE bugs ...

ChangeSet
  1.1386 02/12/05 11:34:15 venu@myvenu.com +1 -0
  Merge work.mysql.com:/home/bk/mysql-4.1
  into myvenu.com:/home/venu/bk/src-4.1

  sql/mysql_priv.h
    1.160.1.25 02/12/05 11:34:11 venu@myvenu.com +0 -0
    Auto merged

ChangeSet
  1.1354.111.1 02/12/05 19:38:42 monty@mashka.mysql.fi +71 -0
  Merge with 4.0.6

  sql/unireg.cc
    1.23 02/12/05 19:38:39 monty@mashka.mysql.fi +1 -2
    Merge with 4.0.6

  sql/table.h
    1.40 02/12/05 19:38:39 monty@mashka.mysql.fi +1 -4
    Merge with 4.0.6

  sql/sql_yacc.yy
    1.184.24.5 02/12/05 19:38:39 monty@mashka.mysql.fi +12 -16
    Merge with 4.0.6

  sql/sql_update.cc
    1.68.1.1 02/12/05 19:38:39 monty@mashka.mysql.fi +5 -20
    Merge with 4.0.6

  sql/sql_union.cc
    1.51 02/12/05 19:38:39 monty@mashka.mysql.fi +4 -15
    Merge with 4.0.6

  sql/sql_select.h
    1.32 02/12/05 19:38:39 monty@mashka.mysql.fi +0 -1
    Merge with 4.0.6

  sql/sql_select.cc
    1.173.1.23 02/12/05 19:38:39 monty@mashka.mysql.fi +38 -49
    Merge with 4.0.6

  sql/sql_parse.cc
    1.235.25.1 02/12/05 19:38:39 monty@mashka.mysql.fi +4 -14
    Merge with 4.0.6

  sql/sql_insert.cc
    1.77.1.1 02/12/05 19:38:39 monty@mashka.mysql.fi +0 -2
    Merge with 4.0.6

  sql/sql_handler.cc
    1.22.1.7 02/12/05 19:38:39 monty@mashka.mysql.fi +1 -2
    Merge with 4.0.6

  sql/sql_delete.cc
    1.92.1.1 02/12/05 19:38:39 monty@mashka.mysql.fi +1 -1
    Merge with 4.0.6

  sql/sql_class.h
    1.123.8.2 02/12/05 19:38:39 monty@mashka.mysql.fi +25 -22
    Merge with 4.0.6

  sql/sql_base.cc
    1.122.1.19 02/12/05 19:38:39 monty@mashka.mysql.fi +2 -4
    Merge with 4.0.6

  sql/opt_range.cc
    1.72 02/12/05 19:38:39 monty@mashka.mysql.fi +1 -2
    Merge with 4.0.6

  sql/item_timefunc.h
    1.25 02/12/05 19:38:39 monty@mashka.mysql.fi +2 -4
    Merge with 4.0.6

  sql/item_timefunc.cc
    1.28 02/12/05 19:38:39 monty@mashka.mysql.fi +2 -4
    Merge with 4.0.6

  sql/item_cmpfunc.h
    1.25.1.1 02/12/05 19:38:39 monty@mashka.mysql.fi +4 -5
    Merge with 4.0.6

  sql/item_cmpfunc.cc
    1.41.1.1 02/12/05 19:38:39 monty@mashka.mysql.fi +1 -2
    Merge with 4.0.6

  sql/item.h
    1.41.2.1 02/12/05 19:38:39 monty@mashka.mysql.fi +10 -20
    Merge with 4.0.6

  sql/item.cc
    1.27.1.28 02/12/05 19:38:39 monty@mashka.mysql.fi +11 -16
    Merge with 4.0.6

  sql/field.cc
    1.64.1.12 02/12/05 19:38:39 monty@mashka.mysql.fi +8 -11
    Merge with 4.0.6

  sql-bench/server-cfg.sh
    1.42.1.1 02/12/05 19:38:39 monty@mashka.mysql.fi +0 -211
    Use version from 4.0

  sql-bench/crash-me.sh
    1.37 02/12/05 19:38:38 monty@mashka.mysql.fi +0 -259
    Use version from 4.0

  mysql-test/mysql-test-run.sh
    1.154 02/12/05 19:38:38 monty@mashka.mysql.fi +0 -2
    Merge with 4.0.6

  libmysql/errmsg.c
    1.19 02/12/05 19:38:38 monty@mashka.mysql.fi +9 -12
    Merge with 4.0.6

  include/errmsg.h
    1.15 02/12/05 19:38:38 monty@mashka.mysql.fi +1 -2
    Merge with 4.0.6

  heap/hp_write.c
    1.16 02/12/05 19:38:38 monty@mashka.mysql.fi +0 -0
    Merge with 4.0.6

  heap/hp_update.c
    1.9 02/12/05 19:38:38 monty@mashka.mysql.fi +0 -0
    Merge with 4.0.6

  heap/_check.c
    1.12 02/12/05 19:38:38 monty@mashka.mysql.fi +1 -3
    Merge with 4.0.6

  BitKeeper/triggers/post-commit
    1.22.1.1 02/12/05 19:38:38 monty@mashka.mysql.fi +3 -6
    Add changeset to commit messages

  vio/vio.c
    1.15 02/12/05 16:44:11 monty@mashka.mysql.fi +0 -0
    Auto merged

  strings/strto.c
    1.11 02/12/05 16:44:11 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/uniques.cc
    1.13 02/12/05 16:44:10 monty@mashka.mysql.fi +0 -2
    Auto merged

  sql/structs.h
    1.25 02/12/05 16:44:10 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_udf.cc
    1.21 02/12/05 16:44:10 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_table.cc
    1.125.2.1 02/12/05 16:44:10 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_show.cc
    1.86.1.12 02/12/05 16:44:10 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_class.cc
    1.82.1.26 02/12/05 16:44:09 monty@mashka.mysql.fi +0 -6
    Auto merged

  sql/sql_analyse.cc
    1.22 02/12/05 16:44:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/set_var.h
    1.8 02/12/05 16:44:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/set_var.cc
    1.19 02/12/05 16:44:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/opt_sum.cc
    1.21 02/12/05 16:44:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysqld.cc
    1.304.2.11 02/12/05 16:44:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/mysql_priv.h
    1.160.15.1 02/12/05 16:44:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/log.cc
    1.92 02/12/05 16:44:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_func.h
    1.52.1.1 02/12/05 16:44:09 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_func.cc
    1.88 02/12/05 16:44:08 monty@mashka.mysql.fi +0 -3
    Auto merged

  sql/handler.cc
    1.84.1.3 02/12/05 16:44:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.85.1.2 02/12/05 16:44:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/field_conv.cc
    1.13 02/12/05 16:44:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/field.h
    1.46.1.9 02/12/05 16:44:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysys/hash.c
    1.24 02/12/05 16:44:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/select.test
    1.15 02/12/05 16:44:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/group_by.test
    1.16 02/12/05 16:44:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/select.result
    1.18 02/12/05 16:44:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.47 02/12/05 16:44:08 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/group_by.result
    1.21 02/12/05 16:44:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/func_math.result
    1.11 02/12/05 16:44:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/distinct.result
    1.18 02/12/05 16:44:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/alter_table.result
    1.12 02/12/05 16:44:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/sort.c
    1.30 02/12/05 16:44:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/mi_rnext_same.c
    1.11 02/12/05 16:44:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/mi_check.c
    1.94 02/12/05 16:44:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysqld/lib_sql.cc
    1.25.1.12 02/12/05 16:44:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysql/libmysql.c
    1.107.1.3 02/12/05 16:44:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/my_base.h
    1.37 02/12/05 16:44:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  heap/hp_scan.c
    1.6 02/12/05 16:44:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  heap/hp_delete.c
    1.8 02/12/05 16:44:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  configure.in
    1.201.1.7 02/12/05 16:44:06 monty@mashka.mysql.fi +0 -0
    Auto merged

  acinclude.m4
    1.79 02/12/05 16:44:06 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/ignore
    1.130 02/12/05 16:43:52 monty@mashka.mysql.fi +11 -13
    auto-union

ChangeSet
  1.1346.46.38 02/12/05 16:38:49 monty@mashka.mysql.fi +10 -0
  Copy arguments given to mysql_server_init()
  Made keybuff_size longlong (To make show variables work similar on 32
  and 64 bit systems)
  Fixed some 'not initalized variable errors' in multi-table-update.
  Fixed memory leak in multi-table-update.
  Now all tests works under valgrind without any errors.

  sql/sql_update.cc
    1.54.1.17 02/12/05 16:38:47 monty@mashka.mysql.fi +12 -6
    Fixed some 'not initalized variable errors' in multi-table-update.
    Fixed memory leak in multi-table-update

  sql/sql_select.h
    1.22.2.3 02/12/05 16:38:47 monty@mashka.mysql.fi +2 -1
    Make TMP_TABLE_PARAM to be allocated through Sql_alloc

  sql/sql_select.cc
    1.152.1.62 02/12/05 16:38:47 monty@mashka.mysql.fi +4 -6
    Simple cleanup

  sql/set_var.h
    1.4.1.2 02/12/05 16:38:47 monty@mashka.mysql.fi +16 -0
    Made keybuff_size longlong

  sql/set_var.cc
    1.12.1.6 02/12/05 16:38:47 monty@mashka.mysql.fi +18 -1
    Made keybuff_size longlong

  sql/mysqld.cc
    1.297.1.83 02/12/05 16:38:47 monty@mashka.mysql.fi +9 -6
    Made keybuff_size longlong

  sql/mysql_priv.h
    1.150.1.25 02/12/05 16:38:47 monty@mashka.mysql.fi +2 -2
    Made keybuff_size longlong

  sql/handler.cc
    1.82.1.10 02/12/05 16:38:47 monty@mashka.mysql.fi +2 -2
    Made keybuff_size longlong

  mysql-test/r/temp_table.result
    1.6 02/12/05 16:38:47 monty@mashka.mysql.fi +5 -0
    Update test results (after merge form 3.23)

  libmysqld/lib_sql.cc
    1.25.3.4 02/12/05 16:38:47 monty@mashka.mysql.fi +39 -1
    Copy arguments given to mysql_server_init()

ChangeSet
  1.1385 02/12/05 14:01:15 peter@mysql.com +4 -0
  Fix minor bug and add test of connection with new/old/without passwords 

  mysql-test/t/connect.test
    1.1 02/12/05 14:01:10 peter@mysql.com +67 -0

  mysql-test/r/connect.result
    1.1 02/12/05 14:01:10 peter@mysql.com +34 -0

  sql/mini_client.cc
    1.56 02/12/05 14:01:10 peter@mysql.com +0 -1
    The same fix for replication copy

  mysql-test/t/connect.test
    1.0 02/12/05 14:01:10 peter@mysql.com +0 -0
    BitKeeper file /home/pz/mysql/mysql-4.1/mysql-test/t/connect.test

  mysql-test/r/connect.result
    1.0 02/12/05 14:01:10 peter@mysql.com +0 -0
    BitKeeper file /home/pz/mysql/mysql-4.1/mysql-test/r/connect.result

  libmysql/libmysql.c
    1.113 02/12/05 14:01:10 peter@mysql.com +0 -1
    Small fix (resulted in connection without database even if one is specified)

ChangeSet
  1.1346.65.4 02/12/05 11:12:30 lenz@mysql.com +1 -0
  Merge mysql.com:/space/my/mysql-4.0
  into mysql.com:/space/my/mysql-4.0-build

  support-files/mysql.server.sh
    1.25 02/12/05 11:12:26 lenz@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.46.37 02/12/05 03:52:53 monty@mashka.mysql.fi +15 -0
  Merge with 3.23

  sql/structs.h
    1.17.1.7 02/12/05 03:52:51 monty@mashka.mysql.fi +0 -1
    Don't apply change from 3.23

  sql/sql_show.cc
    1.76.1.17 02/12/05 03:52:51 monty@mashka.mysql.fi +0 -4
    Don't apply change from 3.23

  sql/mysqld.cc
    1.297.1.82 02/12/05 03:52:51 monty@mashka.mysql.fi +0 -1
    Don't apply change from 3.23

  mysql-test/t/temp_table.test
    1.5 02/12/05 03:52:51 monty@mashka.mysql.fi +4 -0
    Added comment

  support-files/mysql.server.sh
    1.23.1.2 02/12/05 03:40:56 monty@mashka.mysql.fi +0 -2
    Auto merged

  sql/sql_table.cc
    1.112.1.30 02/12/05 03:40:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_analyse.cc
    1.12.1.3 02/12/05 03:40:56 monty@mashka.mysql.fi +0 -1
    Auto merged

  mysys/my_tempnam.c
    1.11 02/12/05 03:40:56 monty@mashka.mysql.fi +0 -6
    Auto merged

  mysys/my_static.h
    1.14 02/12/05 03:40:56 monty@mashka.mysql.fi +0 -1
    Auto merged

  mysys/my_static.c
    1.11 02/12/05 03:40:56 monty@mashka.mysql.fi +0 -1
    Auto merged

  mysys/hash.c
    1.15.1.4 02/12/05 03:40:56 monty@mashka.mysql.fi +0 -10
    Auto merged

  libmysql/password.c
    1.5.2.1 02/12/05 03:40:56 monty@mashka.mysql.fi +0 -1
    Auto merged

  BitKeeper/deleted/.del-global.h~e80d28157acfdcb5
    1.53 02/12/05 03:40:55 monty@mashka.mysql.fi +0 -0
    Auto merged

  configure.in
    1.191.1.50 02/12/05 03:40:55 monty@mashka.mysql.fi +0 -6
    Auto merged

  BitKeeper/deleted/.del-global.h~e80d28157acfdcb5
    1.39.8.2 02/12/05 03:40:55 monty@mashka.mysql.fi +0 -0
    Merge rename: include/global.h -> BitKeeper/deleted/.del-global.h~e80d28157acfdcb5

  BitKeeper/etc/ignore
    1.107.1.32 02/12/05 03:40:47 monty@mashka.mysql.fi +13 -15
    auto-union

ChangeSet
  1.1346.46.36 02/12/05 03:40:33 monty@mashka.mysql.fi +11 -0
  Removed copying of parameters as this leads to memory leaks in embedded server.
  Fixed 'not initialized' memory error.

  strings/strto.c
    1.8.1.1 02/12/05 03:40:31 monty@mashka.mysql.fi +2 -3
    Simple optimization

  sql/sql_udf.cc
    1.15.1.7 02/12/05 03:40:31 monty@mashka.mysql.fi +2 -0
    Clear current_thd for global thread

  sql/sql_class.cc
    1.71.1.23 02/12/05 03:40:31 monty@mashka.mysql.fi +1 -2
    Fixed non fatal 'not initialized memory reference error' in thread init

  sql/mysqld.cc
    1.297.1.81 02/12/05 03:40:31 monty@mashka.mysql.fi +3 -0
    Added safety asserts

  sql/mysql_priv.h
    1.150.1.24 02/12/05 03:40:31 monty@mashka.mysql.fi +1 -0
    Move external reference to struct to include file

  sql/log.cc
    1.80.1.21 02/12/05 03:40:31 monty@mashka.mysql.fi +37 -33
    Simple optimization

  sql/ha_innodb.cc
    1.73.1.59 02/12/05 03:40:31 monty@mashka.mysql.fi +0 -30
    Remove copying of parameters as this leads to memory leaks in MySQL.
    Should be instead fixed by, in embedded server, make a temporary copy of
    all parameters and free them on server-end

  sql/field.cc
    1.51.1.16 02/12/05 03:40:31 monty@mashka.mysql.fi +15 -7
    Simple optimizations

  mysql-test/t/alter_table.test
    1.12 02/12/05 03:40:31 monty@mashka.mysql.fi +1 -1
    Added missing drop table

  mysql-test/r/alter_table.result
    1.9.1.1 02/12/05 03:40:31 monty@mashka.mysql.fi +1 -1
    Added missing drop table

  mysql-test/mysql-test-run.sh
    1.146.1.8 02/12/05 03:40:31 monty@mashka.mysql.fi +51 -22
    Updates to be able to more easily use --valgrind

ChangeSet
  1.1384 02/12/05 03:55:29 peter@mysql.com +7 -0
  Basically minor code optimizations and cleanups

  sql/sql_parse.cc
    1.235.1.34 02/12/05 03:55:24 peter@mysql.com +21 -28
    Minor optimizations

  sql/sql_acl.h
    1.17 02/12/05 03:55:24 peter@mysql.com +1 -1
    fix prototype

  sql/sql_acl.cc
    1.55.1.13 02/12/05 03:55:24 peter@mysql.com +8 -4
    Get rid of stage parameter and flag old passwords with '*' instead of zero

  sql/password.c
    1.16 02/12/05 03:55:24 peter@mysql.com +1 -1
    Optimiations 

  sql/mini_client.cc
    1.55 02/12/05 03:55:24 peter@mysql.com +14 -7
    Minor optimizations

  libmysql/libmysql.c
    1.112 02/12/05 03:55:24 peter@mysql.com +28 -15
    Minor optimizations

  client/mysqladmin.c
    1.73 02/12/05 03:55:23 peter@mysql.com +3 -3
    fix folding

ChangeSet
  1.676.261.1 02/12/05 01:01:38 serg@serg.mysql.com +1 -0
  better fix for read_rows, same for read_one_row

  libmysql/libmysql.c
    1.56.1.16 02/12/05 01:01:37 serg@serg.mysql.com +9 -2
    better fix for read_rows, same for read_one_row

ChangeSet
  1.1346.67.1 02/12/05 00:33:18 serg@serg.mysql.com +1 -0
  .del-errmsg.c~444b5d4031149217:
    Delete: client/errmsg.c

  BitKeeper/deleted/.del-errmsg.c~444b5d4031149217
    1.11 02/12/05 00:32:38 serg@serg.mysql.com +0 -0
    Delete: client/errmsg.c

ChangeSet
  1.1382 02/12/05 01:14:51 peter@mysql.com +9 -0
  SCRAM Remove spaces from most changed files.
  This alters not only my code so it looks like I'm not only one adding the spaces.
  

  sql/sql_yacc.yy
    1.200 02/12/05 01:14:47 peter@mysql.com +67 -67
    cut spaces 

  sql/sql_parse.cc
    1.235.1.33 02/12/05 01:14:47 peter@mysql.com +1 -1
    cut spaces

  sql/password.c
    1.15 02/12/05 01:14:47 peter@mysql.com +119 -119
    cut spaces

  sql/mysqld.cc
    1.314 02/12/05 01:14:46 peter@mysql.com +78 -78
    cut spaces

  sql/mysql_priv.h
    1.160.1.24 02/12/05 01:14:46 peter@mysql.com +5 -5
    cut spaces

  sql/mini_client.cc
    1.54 02/12/05 01:14:46 peter@mysql.com +8 -8
    cut spaces

  sql/item_strfunc.cc
    1.54.1.18 02/12/05 01:14:46 peter@mysql.com +63 -62
    cut spaces

  include/mysql_com.h
    1.59 02/12/05 01:14:46 peter@mysql.com +31 -31
    cut soaces

  client/mysqladmin.c
    1.72 02/12/05 01:14:46 peter@mysql.com +20 -20
    cut spaces

ChangeSet
  1.676.1.609 02/12/04 21:50:59 Sinisa@sinisa.nasamreza.org +1 -0
  a test case for double free'ing of pointer in alter table ...

  mysql-test/t/temp_table.test
    1.2.1.1 02/12/04 21:50:57 Sinisa@sinisa.nasamreza.org +5 -0
    a test case for double free'ing of pointer in alter table ...

ChangeSet
  1.676.1.608 02/12/04 21:39:15 Sinisa@sinisa.nasamreza.org +1 -0
  some code cleanup

  sql/sql_table.cc
    1.83.1.27 02/12/04 21:39:13 Sinisa@sinisa.nasamreza.org +0 -1
    code cleanup

ChangeSet
  1.1354.109.1 02/12/05 00:20:38 walrus@mysql.com +1 -0
  remove useless field conversation in sql-bench

  sql-bench/server-cfg.sh
    1.43 02/12/05 00:20:25 walrus@mysql.com +1 -1
    remove useless field converstion

ChangeSet
  1.1346.66.1 02/12/05 00:13:45 walrus@mysql.com +1 -0
  Remove useless field conversation

  sql-bench/server-cfg.sh
    1.39.1.5 02/12/05 00:13:36 walrus@mysql.com +1 -1
    Remove useless field conversation

ChangeSet
  1.676.258.3 02/12/04 20:51:18 Sinisa@sinisa.nasamreza.org +2 -0
  A fix for double free'd pointer bug ...

  sql/sql_table.cc
    1.83.1.26 02/12/04 20:51:16 Sinisa@sinisa.nasamreza.org +7 -1
    A fix for double free'd pointer bug ...

  BitKeeper/etc/ignore
    1.61.1.21 02/12/04 20:51:16 Sinisa@sinisa.nasamreza.org +2 -0
    Added innobase/stamp-h1 stamp-h1 to the ignore list

ChangeSet
  1.676.1.606 02/12/04 19:16:45 lenz@mysql.com +1 -0
   - portability patch to work around bugs in the HP compiler's "inline"
     handling (backport from 4.0 tree)

  include/global.h
    1.39.8.1 02/12/04 19:16:44 lenz@mysql.com +4 -0
     - portability patch to work around bugs in the HP compiler's "inline"
       handling (backport from 4.0 tree)

ChangeSet
  1.1346.63.6 02/12/04 17:37:51 serg@serg.mysql.com +3 -0
  new client error added: CR_MALFORMED_PACKET

  libmysql/libmysql.c
    1.95.1.22 02/12/04 17:37:49 serg@serg.mysql.com +1 -1
    new client error added: CR_MALFORMED_PACKET

  libmysql/errmsg.c
    1.13.1.2 02/12/04 17:37:49 serg@serg.mysql.com +7 -4
    new client error added: CR_MALFORMED_PACKET

  include/errmsg.h
    1.10.1.2 02/12/04 17:37:49 serg@serg.mysql.com +5 -3
    new client error added: CR_MALFORMED_PACKET

ChangeSet
  1.1346.46.35 02/12/04 17:40:37 monty@mashka.mysql.fi +3 -0
  Merge with 3.23
  (Fixed problem with autoconf 2.53 on Solaris)

  acinclude.m4
    1.77.1.1 02/12/04 17:40:36 monty@mashka.mysql.fi +3 -2
    Merge with 3.23

  BUILD/compile-solaris-sparc
    1.8 02/12/04 17:40:36 monty@mashka.mysql.fi +1 -2
    Merge with 3.23

  BUILD/compile-solaris-sparc-purify
    1.11 02/12/04 17:40:36 monty@mashka.mysql.fi +1 -2
    Merge with 3.23

ChangeSet
  1.676.260.1 02/12/04 16:16:06 lenz@mysql.com +7 -0
   - Portability fixes for HP compiler on HPUX11 (backport from 4.0 tree)
   - sql_analyse.cc: Fixed bug in decimal handling

  sql/sql_analyse.cc
    1.8.1.1 02/12/04 16:16:06 lenz@mysql.com +1 -1
     - Fixed bug in decimal handling

  mysys/my_tempnam.c
    1.7.1.1 02/12/04 16:16:06 lenz@mysql.com +6 -0
     - Portability fix for HP compiler on HPUX11

  mysys/my_static.h
    1.6.1.1 02/12/04 16:16:05 lenz@mysql.com +1 -1
     - Portability fix for HP compiler on HPUX11

  mysys/my_static.c
    1.7.1.1 02/12/04 16:16:05 lenz@mysql.com +1 -1
     - Portability fix for HP compiler on HPUX11

  mysys/hash.c
    1.8.1.4 02/12/04 16:16:05 lenz@mysql.com +10 -5
     - Portability fix for HP compiler on HPUX11

  libmysql/password.c
    1.3.1.1 02/12/04 16:16:05 lenz@mysql.com +1 -1
     - Portability fix for HP compiler on HPUX11

  configure.in
    1.124.1.80 02/12/04 16:16:05 lenz@mysql.com +6 -0
     - Portability fix for HP compiler on HPUX11

ChangeSet
  1.676.259.4 02/12/04 16:52:46 monty@mashka.mysql.fi +3 -0
  Fixed 'stack direction' check in autoconf
  Workaround for problem with autconf 2.53 on Solaris
  (Fixes problem with SOCKET_SIZE_TYPE)

  acinclude.m4
    1.35.1.12 02/12/04 16:52:39 monty@mashka.mysql.fi +33 -2
    Fixed 'stack direction' check.
    Workaround for problem with autconf 2.53 on Solaris
    (Fixes problem with SOCKET_SIZE_TYPE)

  BUILD/compile-solaris-sparc-purify
    1.8.1.1 02/12/04 16:52:39 monty@mashka.mysql.fi +1 -1
    Removed non standard compiler options

  BUILD/compile-solaris-sparc
    1.6.1.1 02/12/04 16:52:38 monty@mashka.mysql.fi +1 -1
    Removed non standard compiler options

ChangeSet
  1.1346.46.33 02/12/04 15:27:08 Sinisa@sinisa.nasamreza.org +3 -0
  A fix for the bug in a SELECT with joined tables with ORDER BY and 
  LIMIT clause when filesort had to be used.
  
  In that case LIMIT was applied to filesort of one of the tables, 
  although it could not be.
  
  This fix solved problems with LEFT JOIN too...
   

  sql/sql_select.cc
    1.152.1.61 02/12/04 15:27:06 Sinisa@sinisa.nasamreza.org +7 -1
    A fix for the bug in a SELECT with joined tables with ORDER BY and 
    LIMIT clause when filesort had to be used.
    
    In that case LIMIT was applied to filesort of one of the tables, 
    although it could not be.
    
    This fix solved problems with LEFT JOIN too...
     

  mysql-test/t/select.test
    1.12.1.3 02/12/04 15:27:05 Sinisa@sinisa.nasamreza.org +7 -1
    A fix for the bug in a SELECT with joined tables with ORDER BY and 
    LIMIT clause when filesort had to be used.
    
    In that case LIMIT was applied to filesort of one of the tables, 
    although it could not be.
    
    This fix solved problems with LEFT JOIN too...
     

  mysql-test/r/select.result
    1.8.1.11 02/12/04 15:27:05 Sinisa@sinisa.nasamreza.org +13 -0
    A fix for the bug in a SELECT with joined tables with ORDER BY and 
    LIMIT clause when filesort had to be used.
    
    In that case LIMIT was applied to filesort of one of the tables, 
    although it could not be.
    
    This fix solved problems with LEFT JOIN too...
     

ChangeSet
  1.1381 02/12/04 16:26:29 peter@mysql.com +4 -0
  Merge mysql.com:/home/pz/mysql/mysql-4.1-root
  into mysql.com:/home/pz/mysql/mysql-4.1

  sql/sql_yacc.yy
    1.199 02/12/04 16:26:26 peter@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.235.1.32 02/12/04 16:26:26 peter@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.123.1.24 02/12/04 16:26:26 peter@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.160.1.23 02/12/04 16:26:26 peter@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1354.108.3 02/12/04 03:19:08 venu@myvenu.com +4 -0
  Return a warning for DROP DATABASE/TABLE IF EXISTS <non_existing_db/table(s)>

  sql/mysql_priv.h
    1.160.6.15 02/12/04 03:16:54 venu@myvenu.com +2 -1

  sql/sql_error.cc
    1.5 02/12/04 03:16:44 venu@myvenu.com +26 -0

  sql/sql_db.cc
    1.57 02/12/04 03:16:35 venu@myvenu.com +6 -2

  sql/sql_table.cc
    1.125.1.13 02/12/04 03:16:29 venu@myvenu.com +4 -2

ChangeSet
  1.1346.64.2 02/12/04 10:47:51 serg@serg.mysql.com +2 -0
  post-merge fix

  mysql-test/r/group_by.result
    1.16.1.4 02/12/04 10:47:49 serg@serg.mysql.com +15 -0
    post-merge fix

  myisam/mi_rnext_same.c
    1.8.1.1 02/12/04 10:47:49 serg@serg.mysql.com +2 -3
    cleanup

ChangeSet
  1.1346.64.1 02/12/04 10:16:19 serg@serg.mysql.com +11 -0
  merged

  sql/sql_show.cc
    1.76.1.16 02/12/04 10:16:17 serg@serg.mysql.com +0 -1
    merged

  sql/sql_parse.cc
    1.218.1.60 02/12/04 10:16:17 serg@serg.mysql.com +0 -2
    merged

  sql/opt_range.cc
    1.54.1.18 02/12/04 10:16:17 serg@serg.mysql.com +0 -1
    merged

  sql/mysqld.cc
    1.297.1.80 02/12/04 10:16:17 serg@serg.mysql.com +1 -4
    merged

  sql/item_cmpfunc.h
    1.13.1.11 02/12/04 10:16:17 serg@serg.mysql.com +0 -2
    merged

  sql/item_cmpfunc.cc
    1.20.1.26 02/12/04 10:16:17 serg@serg.mysql.com +0 -39
    merged

  mysql-test/t/group_by.test
    1.13.1.1 02/12/04 10:16:17 serg@serg.mysql.com +0 -40
    merged

  mysql-test/r/group_by.result
    1.16.1.3 02/12/04 10:16:17 serg@serg.mysql.com +0 -18
    merged

ChangeSet
  1.1354.108.2 02/12/04 11:01:48 bell@sanja.is.com.ua +5 -0
  changing in Item_row according last review (SCRUM)

  sql/item_row.h
    1.2 02/12/04 11:01:47 bell@sanja.is.com.ua +1 -0
    changing in Item_row according last review

  sql/item_func.h
    1.53 02/12/04 11:01:47 bell@sanja.is.com.ua +3 -41
    changing in Item_row according last review

  sql/item_cmpfunc.h
    1.26 02/12/04 11:01:47 bell@sanja.is.com.ua +61 -2
    changing in Item_row according last review

  sql/item_cmpfunc.cc
    1.42 02/12/04 11:01:47 bell@sanja.is.com.ua +39 -41
    changing in Item_row according last review

  sql/item.h
    1.41.1.2 02/12/04 11:01:47 bell@sanja.is.com.ua +1 -0
    changing in Item_row according last review

  support-files/mysql.server.sh
    1.23.1.1 02/12/04 10:00:11 serg@serg.mysql.com +0 -3
    Auto merged

  sql/opt_sum.cc
    1.16.1.5 02/12/04 10:00:11 serg@serg.mysql.com +0 -13
    Auto merged

  libmysql/libmysql.c
    1.95.1.21 02/12/04 10:00:10 serg@serg.mysql.com +0 -0
    Auto merged

ChangeSet
  1.676.259.3 02/12/04 09:54:58 serg@serg.mysql.com +1 -0
  proper casting in COM_TABLE_DUMP (backported from 4.0)

  sql/sql_parse.cc
    1.120.2.31 02/12/04 09:54:57 serg@serg.mysql.com +2 -2
    proper casting in COM_TABLE_DUMP (backported from 4.0)

ChangeSet
  1.676.259.2 02/12/04 01:26:32 serg@serg.mysql.com +1 -0
  protect from [heap] buffer overrrun by malicious server

  libmysql/libmysql.c
    1.56.1.15 02/12/04 01:26:31 serg@serg.mysql.com +10 -2
    protect from [heap] buffer overrrun by malicious server

ChangeSet
  1.1354.108.1 02/12/04 01:32:45 bell@sanja.is.com.ua +29 -0
  fixed error message

  sql/sql_update.cc
    1.69 02/12/04 01:32:42 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/sql_parse.cc
    1.235.11.13 02/12/04 01:32:42 bell@sanja.is.com.ua +3 -3
    fixed error message

  sql/sql_insert.cc
    1.78 02/12/04 01:32:42 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/sql_delete.cc
    1.93 02/12/04 01:32:42 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/ukrainian/errmsg.txt
    1.25 02/12/04 01:32:42 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/swedish/errmsg.txt
    1.62 02/12/04 01:32:42 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/spanish/errmsg.txt
    1.62 02/12/04 01:32:42 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/slovak/errmsg.txt
    1.62 02/12/04 01:32:42 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/serbian/errmsg.txt
    1.16 02/12/04 01:32:42 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/russian/errmsg.txt
    1.59 02/12/04 01:32:42 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/romanian/errmsg.txt
    1.60 02/12/04 01:32:42 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/portuguese/errmsg.txt
    1.62 02/12/04 01:32:42 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/polish/errmsg.txt
    1.61 02/12/04 01:32:42 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/norwegian/errmsg.txt
    1.61 02/12/04 01:32:42 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/norwegian-ny/errmsg.txt
    1.61 02/12/04 01:32:41 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/korean/errmsg.txt
    1.61 02/12/04 01:32:41 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/japanese/errmsg.txt
    1.61 02/12/04 01:32:41 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/italian/errmsg.txt
    1.67 02/12/04 01:32:41 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/hungarian/errmsg.txt
    1.63 02/12/04 01:32:41 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/greek/errmsg.txt
    1.62 02/12/04 01:32:41 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/german/errmsg.txt
    1.61 02/12/04 01:32:41 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/french/errmsg.txt
    1.61 02/12/04 01:32:41 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/estonian/errmsg.txt
    1.62 02/12/04 01:32:41 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/english/errmsg.txt
    1.67 02/12/04 01:32:41 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/dutch/errmsg.txt
    1.64 02/12/04 01:32:41 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/danish/errmsg.txt
    1.60 02/12/04 01:32:41 bell@sanja.is.com.ua +1 -1
    fixed error message

  sql/share/czech/errmsg.txt
    1.62 02/12/04 01:32:41 bell@sanja.is.com.ua +1 -1
    fixed error message

  mysql-test/r/subselect.result
    1.38 02/12/04 01:32:41 bell@sanja.is.com.ua +7 -7
    fixed error message

  include/mysqld_error.h
    1.60 02/12/04 01:32:41 bell@sanja.is.com.ua +1 -1
    fixed error message

ChangeSet
  1.676.259.1 02/12/04 00:27:09 serg@serg.mysql.com +1 -0
  Security bug: password length check should be in check_user, not check_connections(),
  otherwise COM_CHANGE_USER is unprotected and can be used for both privilege escalation and buffer overrun

  sql/sql_parse.cc
    1.120.2.30 02/12/04 00:27:08 serg@serg.mysql.com +2 -2
    Security bug: password length check should be in check_user, not check_connections(),
    otherwise COM_CHANGE_USER is unprotected and can be used for both privilege escalation and buffer overrun

ChangeSet
  1.1346.63.4 02/12/03 18:16:48 heikki@hundin.mysql.fi +1 -0
  row0sel.c:
    Fix a hang introduced in 4.0.5 in INSERT INTO ... SELECT ... when binlogging is not on

  innobase/row/row0sel.c
    1.27 02/12/03 18:16:39 heikki@hundin.mysql.fi +10 -2
    Fix a hang introduced in 4.0.5 in INSERT INTO ... SELECT ... when binlogging is not on

  BitKeeper/deleted/.del-configure~dea4524fff6db494
    1.4 02/12/03 13:41:27 lenz@mysql.com +0 -0
    Delete: readline/configure

ChangeSet
  1.1354.93.19 02/12/03 13:11:18 monty@hundin.mysql.fi +1 -0
  Merge work:/home/bk/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1

  sql/sql_yacc.yy
    1.184.20.5 02/12/03 13:11:15 monty@hundin.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.63.3 02/12/03 13:08:25 monty@hundin.mysql.fi +25 -0
  Change of internal key_field=NULL handling to avoid error messages.
  Optimized SELECT DISTINCT ... ORDER BY ... LIMIT
  Fixed reference to uninitalized variable

  sql/unireg.cc
    1.13.1.3 02/12/03 13:08:22 monty@hundin.mysql.fi +1 -1
    Change of NULL handling to avoid error messages

  sql/sql_select.h
    1.22.2.2 02/12/03 13:08:22 monty@hundin.mysql.fi +9 -9
    Change of NULL handling to avoid error messages

  sql/sql_select.cc
    1.152.1.60 02/12/03 13:08:22 monty@hundin.mysql.fi +88 -42
    Change of NULL handling to avoid error messages
    Optimized SELECT DISTINCT ... ORDER BY ... LIMIT

  sql/sql_handler.cc
    1.19.1.6 02/12/03 13:08:22 monty@hundin.mysql.fi +2 -2
    Change of NULL handling to avoid error messages

  sql/sql_class.cc
    1.71.1.22 02/12/03 13:08:22 monty@hundin.mysql.fi +7 -8
    Fixed reference to uninitalized variable

  sql/sql_base.cc
    1.117.1.32 02/12/03 13:08:22 monty@hundin.mysql.fi +2 -2
    Change of NULL handling to avoid error messages

  sql/password.c
    1.6.1.1 02/12/03 13:08:22 monty@hundin.mysql.fi +1 -1
    Indentation cleanup

  sql/opt_range.cc
    1.54.1.17 02/12/03 13:08:22 monty@hundin.mysql.fi +3 -3
    Fixed bug in <=> NULL

  sql/item_timefunc.h
    1.13.1.8 02/12/03 13:08:22 monty@hundin.mysql.fi +2 -2
    Change of NULL handling to avoid error messages

  sql/item_timefunc.cc
    1.17.1.4 02/12/03 13:08:22 monty@hundin.mysql.fi +2 -2
    Change of NULL handling to avoid error messages

  sql/item_func.h
    1.39.1.16 02/12/03 13:08:22 monty@hundin.mysql.fi +2 -2
    Cleaned up RND() handling

  sql/item_func.cc
    1.60.1.23 02/12/03 13:08:22 monty@hundin.mysql.fi +15 -10
    Change of NULL handling to avoid error messages

  sql/item_cmpfunc.cc
    1.20.1.25 02/12/03 13:08:21 monty@hundin.mysql.fi +16 -2
    Change of NULL handling to avoid error messages

  sql/item.h
    1.20.1.11 02/12/03 13:08:21 monty@hundin.mysql.fi +14 -13
    Change of NULL handling to avoid error messages

  sql/item.cc
    1.19.1.5 02/12/03 13:08:21 monty@hundin.mysql.fi +15 -14
    Change of NULL handling to avoid error messages

  sql/field_conv.cc
    1.6.1.2 02/12/03 13:08:21 monty@hundin.mysql.fi +21 -3
    Change of NULL handling to avoid error messages

  sql/field.h
    1.33.1.13 02/12/03 13:08:21 monty@hundin.mysql.fi +1 -1
    Change of NULL handling to avoid error messages

  mysql-test/t/null.test
    1.6 02/12/03 13:08:21 monty@hundin.mysql.fi +14 -0
    TEst for bugs

  mysql-test/t/innodb.test
    1.28 02/12/03 13:08:21 monty@hundin.mysql.fi +23 -0
    Test for bugs

  mysql-test/t/func_math.test
    1.7 02/12/03 13:08:21 monty@hundin.mysql.fi +1 -0
    Fixed test of RND()

  mysql-test/t/distinct.test
    1.11 02/12/03 13:08:21 monty@hundin.mysql.fi +10 -0
    New distinct test

  mysql-test/r/null.result
    1.9 02/12/03 13:08:21 monty@hundin.mysql.fi +18 -1
    Updated results for new tests

  mysql-test/r/innodb.result
    1.40.1.10 02/12/03 13:08:21 monty@hundin.mysql.fi +22 -0
    Updated results for new tests

  mysql-test/r/func_math.result
    1.8.1.2 02/12/03 13:08:21 monty@hundin.mysql.fi +2 -1
    Fixed test of RND()

  mysql-test/r/distinct.result
    1.14.1.3 02/12/03 13:08:21 monty@hundin.mysql.fi +24 -0
    Updated results for new tests

ChangeSet
  1.1354.93.18 02/12/02 22:04:26 serg@serg.mysql.com +3 -0
  it's INSERT ... ON DUPLICATE KEY UPDATE , not INSERT ON DUPLICATE KEY UPDATE SET

  sql/sql_yacc.yy
    1.184.24.4 02/12/02 22:04:24 serg@serg.mysql.com +1 -1
    it's INSERT ... ON DUPLICATE KEY UPDATE , not INSERT ON DUPLICATE KEY UPDATE SET

  mysql-test/t/insert_update.test
    1.3 02/12/02 22:04:24 serg@serg.mysql.com +7 -7
    it's INSERT ... ON DUPLICATE KEY UPDATE , not INSERT ON DUPLICATE KEY UPDATE SET

  mysql-test/r/insert_update.result
    1.3 02/12/02 22:04:24 serg@serg.mysql.com +7 -7
    it's INSERT ... ON DUPLICATE KEY UPDATE , not INSERT ON DUPLICATE KEY UPDATE SET

ChangeSet
  1.1354.93.17 02/12/02 21:12:25 serg@serg.mysql.com +2 -0
  one more test

  mysql-test/t/insert_update.test
    1.2 02/12/02 21:12:23 serg@serg.mysql.com +2 -0
    one more test

  mysql-test/r/insert_update.result
    1.2 02/12/02 21:12:23 serg@serg.mysql.com +7 -0
    one more test

ChangeSet
  1.1354.93.16 02/12/02 20:41:34 serg@serg.mysql.com +4 -0
  merged

  sql/sql_parse.cc
    1.235.11.12 02/12/02 20:41:32 serg@serg.mysql.com +1 -1
    merged

  sql/sql_yacc.yy
    1.184.24.3 02/12/02 20:39:20 serg@serg.mysql.com +0 -0
    Auto merged

  sql/sql_insert.cc
    1.77 02/12/02 20:39:20 serg@serg.mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.160.6.14 02/12/02 20:39:20 serg@serg.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1354.99.2 02/12/02 20:38:00 serg@serg.mysql.com +7 -0
  INSERT ... ON DUPLICATE KEY UPDATE ...

  mysql-test/t/insert_update.test
    1.1 02/12/02 20:37:57 serg@serg.mysql.com +19 -0

  mysql-test/r/insert_update.result
    1.1 02/12/02 20:37:57 serg@serg.mysql.com +44 -0

  sql/sql_yacc.yy
    1.184.25.1 02/12/02 20:37:57 serg@serg.mysql.com +3 -2
    INSERT ... ON DUPLICATE KEY UPDATE ...

  sql/sql_parse.cc
    1.235.23.2 02/12/02 20:37:57 serg@serg.mysql.com +9 -2
    INSERT ... ON DUPLICATE KEY UPDATE ...

  sql/sql_insert.cc
    1.74.1.1 02/12/02 20:37:57 serg@serg.mysql.com +46 -16
    INSERT ... ON DUPLICATE KEY UPDATE ...

  sql/sql_class.h
    1.123.8.1 02/12/02 20:37:57 serg@serg.mysql.com +5 -2
    INSERT ... ON DUPLICATE KEY UPDATE ...

  sql/mysql_priv.h
    1.160.14.1 02/12/02 20:37:57 serg@serg.mysql.com +4 -3
    INSERT ... ON DUPLICATE KEY UPDATE ...

  mysql-test/t/insert_update.test
    1.0 02/12/02 20:37:57 serg@serg.mysql.com +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-4.1/mysql-test/t/insert_update.test

  mysql-test/r/insert_update.result
    1.0 02/12/02 20:37:57 serg@serg.mysql.com +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-4.1/mysql-test/r/insert_update.result

ChangeSet
  1.1354.93.15 02/12/02 20:18:51 Sinisa@sinisa.nasamreza.org +28 -0
  Proper handling of ORDER BY table.column in UNION's

  sql/sql_base.cc
    1.122.1.18 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +8 -2
    Proper handling of ORDER BY table.column in UNION's

  sql/share/ukrainian/errmsg.txt
    1.24 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/share/swedish/errmsg.txt
    1.61 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/share/spanish/errmsg.txt
    1.61 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/share/slovak/errmsg.txt
    1.61 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/share/serbian/errmsg.txt
    1.15 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/share/russian/errmsg.txt
    1.58 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/share/romanian/errmsg.txt
    1.59 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/share/portuguese/errmsg.txt
    1.61 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/share/polish/errmsg.txt
    1.60 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/share/norwegian/errmsg.txt
    1.60 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/share/norwegian-ny/errmsg.txt
    1.60 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/share/korean/errmsg.txt
    1.60 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/share/japanese/errmsg.txt
    1.60 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/share/italian/errmsg.txt
    1.66 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/share/hungarian/errmsg.txt
    1.62 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/share/greek/errmsg.txt
    1.61 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/share/german/errmsg.txt
    1.60 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/share/french/errmsg.txt
    1.60 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/share/estonian/errmsg.txt
    1.61 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/share/english/errmsg.txt
    1.66 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +2 -1
    Proper handling of ORDER BY table.column in UNION's

  sql/share/dutch/errmsg.txt
    1.63 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/share/danish/errmsg.txt
    1.59 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/share/czech/errmsg.txt
    1.61 02/12/02 20:18:47 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  sql/item.cc
    1.27.1.27 02/12/02 20:18:46 Sinisa@sinisa.nasamreza.org +3 -5
    Proper handling of ORDER BY table.column in UNION's

  mysql-test/t/union.test
    1.28 02/12/02 20:18:46 Sinisa@sinisa.nasamreza.org +1 -0
    Proper handling of ORDER BY table.column in UNION's

  mysql-test/r/union.result
    1.24 02/12/02 20:18:46 Sinisa@sinisa.nasamreza.org +1 -4
    Proper handling of ORDER BY table.column in UNION's

  include/mysqld_error.h
    1.59 02/12/02 20:18:46 Sinisa@sinisa.nasamreza.org +2 -1
    Proper handling of ORDER BY table.column in UNION's

ChangeSet
  1.1354.103.3 02/12/02 17:03:34 monty@hundin.mysql.fi +2 -0
  Merge work:/home/bk/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1

ChangeSet
  1.1354.106.1 02/12/02 17:52:22 monty@mashka.mysql.fi +9 -0
  Fixed bug when creating keys in temporary HEAP tables.
  (This caused the DISTINCT test to fail)
  Removed one inline as this caused compiler problems

  sql/sql_lex.cc
    1.61 02/12/02 17:03:31 monty@hundin.mysql.fi +0 -0
    Auto merged

  sql/sql_select.cc
    1.173.1.22 02/12/02 17:52:20 monty@mashka.mysql.fi +2 -0
    Fixed bug when creating keys in temporary HEAP tables.

  sql/sql_lex.cc
    1.59.1.1 02/12/02 17:52:20 monty@mashka.mysql.fi +3 -2
    Indentation cleanup

  sql/sql_class.cc
    1.82.1.25 02/12/02 17:52:20 monty@mashka.mysql.fi +10 -9
    Fixed reference to uninitialized value

  sql/item_sum.h
    1.23 02/12/02 17:52:20 monty@mashka.mysql.fi +1 -1
    Removed inline as this caused compiler problems with gcc 3.2

  sql/item_sum.cc
    1.46 02/12/02 17:52:20 monty@mashka.mysql.fi +1 -1
    Removed inline as this caused compiler problems with gcc 3.2
    (Was also non standard usage of inline)

  mysql-test/mysql-test-run.sh
    1.153 02/12/02 17:52:20 monty@mashka.mysql.fi +3 -3
    Better options for valgrind

  heap/hp_write.c
    1.15 02/12/02 17:52:20 monty@mashka.mysql.fi +1 -1
    Indentation cleanup

  heap/hp_update.c
    1.8 02/12/02 17:52:20 monty@mashka.mysql.fi +4 -2
    Indentation cleanup

  heap/hp_create.c
    1.11 02/12/02 17:52:20 monty@mashka.mysql.fi +1 -0
    Comment

  sql/sql_yacc.yy
    1.184.20.4 02/12/02 17:03:31 monty@hundin.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.676.257.2 02/12/02 15:33:16 Sinisa@sinisa.nasamreza.org +3 -0
  Proper fix for SHOW VARS on 64-bit systems

  sql/structs.h
    1.8.1.1 02/12/02 15:33:14 Sinisa@sinisa.nasamreza.org +1 -1
    Proper fix for SHOW VARS on 64-bit systems

  sql/sql_show.cc
    1.47.1.17 02/12/02 15:33:14 Sinisa@sinisa.nasamreza.org +4 -1
    Proper fix for SHOW VARS on 64-bit systems

  sql/mysqld.cc
    1.162.1.97 02/12/02 15:33:14 Sinisa@sinisa.nasamreza.org +1 -1
    Proper fix for SHOW VARS on 64-bit systems

ChangeSet
  1.676.257.1 02/12/02 15:12:56 Sinisa@sinisa.nasamreza.org +1 -0
  moving fix elsewhere ...

  sql/sql_show.cc
    1.47.1.16 02/12/02 15:12:54 Sinisa@sinisa.nasamreza.org +1 -1
    moving a fix to 4.1.

ChangeSet
  1.676.1.600 02/12/02 13:41:51 monty@hundin.mysql.fi +4 -0
  Merge work:/my/mysql-3.23 into hundin.mysql.fi:/my/mysql-3.23

ChangeSet
  1.676.1.598 02/12/02 14:16:02 Sinisa@sinisa.nasamreza.org +4 -0
  Fix for sum_func IN (..)

  sql/item_cmpfunc.h
    1.10.1.4 02/12/02 13:41:50 monty@hundin.mysql.fi +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.14.1.12 02/12/02 13:41:50 monty@hundin.mysql.fi +0 -0
    Auto merged

  mysql-test/t/group_by.test
    1.3.1.6 02/12/02 13:41:50 monty@hundin.mysql.fi +0 -0
    Auto merged

  mysql-test/r/group_by.result
    1.3.1.6 02/12/02 13:41:50 monty@hundin.mysql.fi +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.10.1.3 02/12/02 14:16:01 Sinisa@sinisa.nasamreza.org +2 -1
    Fix for sum_func IN (..)

  sql/item_cmpfunc.cc
    1.14.1.11 02/12/02 14:16:01 Sinisa@sinisa.nasamreza.org +5 -1
    Fix for sum_func IN (..)

  mysql-test/t/group_by.test
    1.3.1.5 02/12/02 14:16:01 Sinisa@sinisa.nasamreza.org +2 -0
    Fix for sum_func IN (..)

  mysql-test/r/group_by.result
    1.3.1.5 02/12/02 14:16:01 Sinisa@sinisa.nasamreza.org +5 -0
    Fix for sum_func IN (..)

ChangeSet
  1.676.256.2 02/12/02 13:41:08 monty@hundin.mysql.fi +5 -0
  Fixed bug in MAX() optimization when used with JOIN and ON expressions
  (Patch from 4.0.5)

  sql/opt_sum.cc
    1.9.1.1 02/12/02 13:41:06 monty@hundin.mysql.fi +13 -0
    Fixed bug in MAX() optimization when used with JOIN and ON expressions

  sql/item_cmpfunc.h
    1.10.2.1 02/12/02 13:41:06 monty@hundin.mysql.fi +2 -0
    Fixed bug in MAX() optimization when used with JOIN and ON expressions

  sql/item_cmpfunc.cc
    1.14.2.1 02/12/02 13:41:06 monty@hundin.mysql.fi +39 -0
    Fixed bug in MAX() optimization when used with JOIN and ON expressions

  mysql-test/t/group_by.test
    1.3.2.1 02/12/02 13:41:06 monty@hundin.mysql.fi +40 -1
    Test for bug

  mysql-test/r/group_by.result
    1.3.2.1 02/12/02 13:41:06 monty@hundin.mysql.fi +6 -0
    Updated results

ChangeSet
  1.1354.105.3 02/12/02 11:08:40 pem@mysql.com +1 -0
  Merge mysql.com:/home/pem/work/mysql-4.1
  into mysql.com:/usr/local/bk/mysql-5.0

  sql/sql_yacc.yy
    1.184.1.29 02/12/02 11:08:38 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.676.256.1 02/12/02 10:47:15 monty@hundin.mysql.fi +1 -0
  Fixed bug in <=> NULL handling

  sql/opt_range.cc
    1.44.1.3 02/12/02 10:47:13 monty@hundin.mysql.fi +1 -1
    Fixed bug in <=> NULL handling

ChangeSet
  1.1354.105.2 02/12/01 17:10:13 pem@mysql.com +1 -0
  Got rid of the (previously) intentional SELECT/UNION reduce/reduce conflict.
  There should be no more reduce/reduce conflicts in sql_yacc.yy from now on!

  sql/sql_yacc.yy
    1.184.24.2 02/12/01 17:10:11 pem@mysql.com +13 -6
    Got rid of the (previously) intentional SELECT/UNION reduce/reduce conflict
    (in the optional_order_or_limit clause).

ChangeSet
  1.1354.105.1 02/12/01 16:03:42 pem@mysql.com +1 -0
  Merge work.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/pem/work/mysql-4.1

  sql/sql_yacc.yy
    1.184.24.1 02/12/01 16:03:40 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1354.103.2 02/12/01 15:05:35 monty@hundin.mysql.fi +2 -0
  Merge work:/home/bk/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1

  sql/sql_yacc.yy
    1.184.20.3 02/12/01 15:05:28 monty@hundin.mysql.fi +0 -0
    Auto merged

  sql/sql_lex.cc
    1.60 02/12/01 15:05:27 monty@hundin.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1354.104.1 02/12/01 14:59:06 monty@hundin.mysql.fi +2 -0
  Fixed that one can use ` in identifiers:  CREATE TABLE `fo``a` ...
  Added BOOLEAN as synonym for tinyint

  sql/sql_yacc.yy
    1.184.23.1 02/12/01 14:53:59 monty@hundin.mysql.fi +2 -0
    Added BOOLEAN as synonym for tinyint

  sql/sql_lex.cc
    1.54.3.1 02/12/01 14:53:58 monty@hundin.mysql.fi +43 -6
    Fixed that one can use ` in identifiers:  CREATE TABLE `fo``a` ... 

ChangeSet
  1.1380 02/12/01 11:18:19 peter@mysql.com +3 -0
  Megrge new changes in...

  sql/sql_parse.cc
    1.235.1.31 02/12/01 11:18:17 peter@mysql.com +0 -1
    Manual Merge

  sql/sql_yacc.yy
    1.198 02/12/01 11:07:52 peter@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.160.1.22 02/12/01 11:07:52 peter@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.63.2 02/12/01 00:03:42 monty@hundin.mysql.fi +1 -0
  Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0

ChangeSet
  1.1346.63.1 02/12/01 00:48:35 monty@mashka.mysql.fi +8 -0
  Fixed some bugs from last multi-table-update push.
  More tests for multi-table-update & timestamp handling

  sql/sql_update.cc
    1.54.1.16 02/12/01 00:48:33 monty@mashka.mysql.fi +2 -2
    Fixed bug in autocommit in multi-table-update

  sql/sql_select.cc
    1.152.1.59 02/12/01 00:48:33 monty@mashka.mysql.fi +1 -1
    Fixed bug in safe mode checking

  mysql-test/t/type_timestamp.test
    1.6 02/12/01 00:48:33 monty@mashka.mysql.fi +16 -5
    New timestamp tests

  mysql-test/t/multi_update.test
    1.17 02/12/01 00:48:33 monty@mashka.mysql.fi +52 -4
    New multi-table-update tests

  mysql-test/t/innodb.test
    1.27 02/12/01 00:48:33 monty@mashka.mysql.fi +13 -0
    New multi-table-update tests

  mysql-test/r/type_timestamp.result
    1.7 02/12/01 00:48:33 monty@mashka.mysql.fi +26 -6
    New timestamp tests

  mysql-test/r/multi_update.result
    1.15 02/12/01 00:48:33 monty@mashka.mysql.fi +70 -0
    New multi-table-update tests

  mysql-test/r/innodb.result
    1.40.1.9 02/12/01 00:48:33 monty@mashka.mysql.fi +15 -0
    New multi-table-update tests

ChangeSet
  1.1354.103.1 02/12/01 00:17:33 bell@sanja.is.com.ua +3 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1

  sql/sql_parse.cc
    1.235.11.11 02/12/01 00:17:31 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.34 02/12/01 00:17:31 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.37 02/12/01 00:17:31 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1354.100.3 02/12/01 00:11:22 bell@sanja.is.com.ua +7 -0
  fix of error handling

  sql/sql_update.cc
    1.68 02/12/01 00:11:20 bell@sanja.is.com.ua +9 -6
    fix of error handling

  sql/sql_union.cc
    1.50 02/12/01 00:11:20 bell@sanja.is.com.ua +1 -1
    fix of error handling

  sql/sql_parse.cc
    1.235.24.2 02/12/01 00:11:20 bell@sanja.is.com.ua +12 -0
    fix of error handling

  sql/sql_insert.cc
    1.76 02/12/01 00:11:20 bell@sanja.is.com.ua +7 -6
    fix of error handling

  sql/sql_delete.cc
    1.92 02/12/01 00:11:20 bell@sanja.is.com.ua +5 -3
    fix of error handling

  mysql-test/t/subselect.test
    1.27.1.6 02/12/01 00:11:20 bell@sanja.is.com.ua +20 -2
    test of error handling with subselect

  mysql-test/r/subselect.result
    1.33.1.2 02/12/01 00:11:20 bell@sanja.is.com.ua +20 -2
    test of error handling with subselect

  sql/mysqld.cc
    1.297.1.79 02/12/01 00:03:38 monty@hundin.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.62.1 02/12/01 00:02:58 monty@hundin.mysql.fi +1 -0
  Fixed --datadir for embedded server

  sql/mysqld.cc
    1.297.20.1 02/12/01 00:02:55 monty@hundin.mysql.fi +2 -0
    Fixed --datadir for embedded server

ChangeSet
  1.1354.93.13 02/11/30 23:13:00 Sinisa@sinisa.nasamreza.org +1 -0
  A better fix

  sql/item.cc
    1.27.1.26 02/11/30 23:12:56 Sinisa@sinisa.nasamreza.org +2 -2
    A better fix

ChangeSet
  1.1354.93.12 02/11/30 22:53:50 Sinisa@sinisa.nasamreza.org +3 -0
  A bug fix for ORDER BY on table.column in provisional entire UNION
  ORDER clause, where table is one of union'ed tables.

  sql/item.cc
    1.27.1.25 02/11/30 22:53:44 Sinisa@sinisa.nasamreza.org +5 -2
    A bug fix for ORDER BY on table.column in provisional entire UNION
    ORDER clause, where table is one of union'ed tables.

  mysql-test/t/union.test
    1.27 02/11/30 22:53:44 Sinisa@sinisa.nasamreza.org +1 -0
    A bug fix for ORDER BY on table.column in provisional entire UNION
    ORDER clause, where table is one of union'ed tables.

  mysql-test/r/union.result
    1.23 02/11/30 22:53:44 Sinisa@sinisa.nasamreza.org +5 -0
    A bug fix for ORDER BY on table.column in provisional entire UNION
    ORDER clause, where table is one of union'ed tables.

ChangeSet
  1.1354.102.1 02/11/30 19:33:01 pem@mysql.com +3 -0
  Fixed ambiguity between the row value syntax and INTERVAL syntax by making the
  ROW keyword mandatory (although it's optional in SQL-99).

  sql/sql_yacc.yy
    1.184.22.1 02/11/30 19:32:59 pem@mysql.com +5 -3
    Fixed ambiguity between the row value syntax and INTERVAL syntax by making the
    ROW keyword mandatory (although it's optional in SQL-99).
    The real problem might actually be INTERVAL, where the two rules
    "INTERVAL_SYM expr interval '+' expr" and
    "INTERVAL_SYM '(' expr ',' expr_list ')'" caused 40+ reduce/reduce conflicts
    with the rows value syntax.
    So possibly, the INTERVAL syntax should be fixed instead...

  mysql-test/t/row_test.test
    1.4 02/11/30 19:32:59 pem@mysql.com +19 -19
    Updated tests to use the ROW keyword.

  mysql-test/r/row_test.result
    1.4 02/11/30 19:32:59 pem@mysql.com +31 -31
    New results with the ROW syntax.

ChangeSet
  1.1379 02/11/30 20:58:53 peter@mysql.com +9 -0
  SCRUM: Montymise code
         fix mysql_change_user() for old clients

  sql/sql_parse.cc
    1.235.1.30 02/11/30 20:58:50 peter@mysql.com +117 -124
    Remove end spaces.

  sql/sql_class.h
    1.123.1.23 02/11/30 20:58:50 peter@mysql.com +4 -1
    Add old scramble for mysql_change_user to work with old clients 

  sql/sql_acl.cc
    1.55.1.12 02/11/30 20:58:50 peter@mysql.com +85 -85
    Remove ending spaces

  sql/password.c
    1.14 02/11/30 20:58:50 peter@mysql.com +23 -29
    Several minor optimizations 

  sql/mysqld.cc
    1.313 02/11/30 20:58:50 peter@mysql.com +3 -0
    Backup old scramble for mysql_change_user to work from old clients 

  sql/mini_client.cc
    1.53 02/11/30 20:58:50 peter@mysql.com +11 -10
    Defines, fold long lines 

  scripts/mysql_fix_privilege_tables.sh
    1.11 02/11/30 20:58:50 peter@mysql.com +9 -1
    Move password modification to separate alter table

  libmysql/libmysql.c
    1.111 02/11/30 20:58:50 peter@mysql.com +130 -127
    Remove end spaces from all lines 

  include/mysql_com.h
    1.58 02/11/30 20:58:50 peter@mysql.com +6 -0
    Mover global defines here

ChangeSet
  1.1354.93.11 02/11/30 19:54:52 Sinisa@sinisa.nasamreza.org +6 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/sql_yacc.yy
    1.184.20.2 02/11/30 19:54:47 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_parse.cc
    1.235.11.10 02/11/30 19:54:47 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_lex.cc
    1.59 02/11/30 19:54:47 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_base.cc
    1.122.1.17 02/11/30 19:54:46 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.33 02/11/30 19:54:46 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.36 02/11/30 19:54:46 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1354.93.10 02/11/30 19:53:31 Sinisa@sinisa.nasamreza.org +5 -0
  some bug fixes and tests for those.
  I am pushing now, because :
  
  * I have a fix for crashing bug
  * Sanja will destroy my changes in sub-select test ... ;)

  sql/sql_derived.cc
    1.22 02/11/30 19:53:27 Sinisa@sinisa.nasamreza.org +4 -1
    Luckily, we have `make test` so that my last changes could be re-checked

  mysql-test/t/subselect.test
    1.32 02/11/30 19:53:27 Sinisa@sinisa.nasamreza.org +2 -2
    tests for recent bugs

  mysql-test/t/derived.test
    1.12 02/11/30 19:53:27 Sinisa@sinisa.nasamreza.org +2 -0
    tests for recent bugs

  mysql-test/r/subselect.result
    1.35 02/11/30 19:53:27 Sinisa@sinisa.nasamreza.org +6 -6
    tests for recent bugs

  mysql-test/r/derived.result
    1.12 02/11/30 19:53:27 Sinisa@sinisa.nasamreza.org +25 -1
    tests for recent bugs

ChangeSet
  1.1354.101.1 02/11/30 19:26:18 bell@sanja.is.com.ua +8 -0
  check of using same table for changing and select

  sql/sql_update.cc
    1.67 02/11/30 19:26:16 bell@sanja.is.com.ua +7 -0
    check of using same table for changing and select

  sql/sql_parse.cc
    1.235.24.1 02/11/30 19:26:16 bell@sanja.is.com.ua +13 -13
    check of using same table for changing and select

  sql/sql_insert.cc
    1.75 02/11/30 19:26:16 bell@sanja.is.com.ua +7 -0
    check of using same table for changing and select

  sql/sql_delete.cc
    1.91 02/11/30 19:26:16 bell@sanja.is.com.ua +6 -0
    check of using same table for changing and select

  sql/sql_base.cc
    1.122.13.1 02/11/30 19:26:16 bell@sanja.is.com.ua +26 -1
    new function

  sql/mysql_priv.h
    1.160.6.13 02/11/30 19:26:16 bell@sanja.is.com.ua +3 -0
    new function

  mysql-test/t/subselect.test
    1.27.1.5 02/11/30 19:26:16 bell@sanja.is.com.ua +15 -3
    test of using same table for changing and select

  mysql-test/r/subselect.result
    1.33.1.1 02/11/30 19:26:16 bell@sanja.is.com.ua +19 -3
    test of using same table for changing and select

ChangeSet
  1.1354.93.9 02/11/30 18:46:24 Sinisa@sinisa.nasamreza.org +6 -0
  many bug fixes

  sql/sql_yacc.yy
    1.184.21.1 02/11/30 18:46:21 Sinisa@sinisa.nasamreza.org +1 -1
    Making possible INSERT from SELECT list_of_constants

  sql/sql_derived.cc
    1.21 02/11/30 18:46:21 Sinisa@sinisa.nasamreza.org +3 -0
    Fixing two more bugs in derived tables.
    
    One in EXPLAIN and another causing wrong result in opt_sum_query()

  sql/item_sum.h
    1.22 02/11/30 18:46:21 Sinisa@sinisa.nasamreza.org +1 -1
    Making us compatible with ISO C++ paragrah 7.1.9.4

  sql/item_sum.cc
    1.45 02/11/30 18:46:21 Sinisa@sinisa.nasamreza.org +1 -1
    Making us compatible with ISO C++ paragrah 7.1.9.4

  sql/item_func.cc
    1.87 02/11/30 18:46:21 Sinisa@sinisa.nasamreza.org +2 -2
    Fixing a bug that caused MySQL to crash on SELECT ...GROUP BY func(feilds)

  mysql-test/t/subselect.test
    1.31 02/11/30 18:46:21 Sinisa@sinisa.nasamreza.org +3 -4
    fixing problems with aliases being forced on derived tables

ChangeSet
  1.676.1.596 02/11/30 18:38:44 Sinisa@sinisa.nasamreza.org +4 -0
  a fix for a bug with HAVING sum_func IN (...)

  sql/item_cmpfunc.h
    1.10.1.2 02/11/30 18:38:42 Sinisa@sinisa.nasamreza.org +2 -0
    a fix for a bug with HAVING sum_func IN (...)

  sql/item_cmpfunc.cc
    1.14.1.10 02/11/30 18:38:42 Sinisa@sinisa.nasamreza.org +8 -0
    a fix for a bug with HAVING sum_func IN (...)

  mysql-test/t/group_by.test
    1.3.1.4 02/11/30 18:38:42 Sinisa@sinisa.nasamreza.org +1 -0
    a fix for a bug with HAVING sum_func IN (...)

  mysql-test/r/group_by.result
    1.3.1.4 02/11/30 18:38:42 Sinisa@sinisa.nasamreza.org +7 -0
    a fix for a bug with HAVING sum_func IN (...)

ChangeSet
  1.1354.100.1 02/11/30 16:43:53 pem@mysql.com +2 -0
  Pass thd as an argument to yylex().

  sql/sql_yacc.yy
    1.184.20.1 02/11/30 16:43:51 pem@mysql.com +5 -3
    Pass thd as an argument to yylex().

  sql/sql_lex.cc
    1.57.1.1 02/11/30 16:43:51 pem@mysql.com +2 -2
    Pass thd as an argument to yylex(), avoiding the use of current_lex
    (and thus current_thd).

ChangeSet
  1.1354.98.5 02/11/30 15:58:06 pem@mysql.com +1 -0
  Undid earlier attempt to clean up this code, as it made merging from 4.1
  a really painful exprience.

  sql/sql_yacc.yy
    1.184.1.28 02/11/30 15:58:04 pem@mysql.com +254 -465
    Undid earlier attempt to clean up this code, as it made merging from 4.1
    a really painful exprience.

ChangeSet
  1.1378 02/11/30 16:31:58 peter@mysql.com +7 -0
  SCRUM: Secure auth
  Implement mysql_change_user
  Get rid of double user search at authentication
  Some cleanups

  sql/sql_parse.cc
    1.235.1.29 02/11/30 16:31:55 peter@mysql.com +112 -29
    Get rid of double user search. Implement mysql_change_user

  sql/sql_acl.h
    1.16 02/11/30 16:31:55 peter@mysql.com +51 -1
    Add class definitions 

  sql/sql_acl.cc
    1.55.1.11 02/11/30 16:31:55 peter@mysql.com +166 -185
    Move class definitions to .h 

  sql/password.c
    1.13 02/11/30 16:31:55 peter@mysql.com +2 -0
    Add author info so who is guilty in errors would be known :) 

  libmysql/libmysql.c
    1.110 02/11/30 16:31:55 peter@mysql.com +94 -15
    mysql_change_user() for new auth + some fixes 

  include/mysql_com.h
    1.57 02/11/30 16:31:55 peter@mysql.com +8 -4
    Fix long lines 

  client/mysqladmin.c
    1.71 02/11/30 16:31:55 peter@mysql.com +3 -2
    Fix long line

ChangeSet
  1.1354.99.1 02/11/30 13:03:55 serg@serg.mysql.com +1 -0
  removed left-over UPDATE_ACL from REPLACE

  sql/sql_parse.cc
    1.235.23.1 02/11/30 13:03:53 serg@serg.mysql.com +1 -1
    removed left-over UPDATE_ACL from REPLACE

ChangeSet
  1.1354.98.4 02/11/30 13:02:54 pem@mysql.com +1 -0
  Another post-merge fix.

  sql/sql_yacc.yy
    1.184.1.27 02/11/30 13:02:37 pem@mysql.com +2 -1
    Another post-merge fix.

ChangeSet
  1.1377 02/11/29 22:03:14 peter@mysql.com +15 -0
  Merging....

  sql/sql_parse.cc
    1.235.1.28 02/11/29 22:03:12 peter@mysql.com +0 -1
    Manual merge

  sql/sql_yacc.yy
    1.197 02/11/29 21:48:02 peter@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.123.1.22 02/11/29 21:48:02 peter@mysql.com +0 -0
    Auto merged

  sql/mysqld.cc
    1.312 02/11/29 21:48:02 peter@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.160.1.21 02/11/29 21:48:02 peter@mysql.com +0 -0
    Auto merged

  sql/lex.h
    1.82 02/11/29 21:48:02 peter@mysql.com +0 -0
    Auto merged

  sql/item_strfunc.h
    1.36 02/11/29 21:48:02 peter@mysql.com +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.54.1.17 02/11/29 21:48:02 peter@mysql.com +0 -0
    Auto merged

  sql/item_create.cc
    1.21 02/11/29 21:48:02 peter@mysql.com +0 -0
    Auto merged

  libmysql/libmysql.c
    1.109 02/11/29 21:48:01 peter@mysql.com +0 -0
    Auto merged

  include/mysql_com.h
    1.56 02/11/29 21:48:01 peter@mysql.com +0 -0
    Auto merged

  include/mysql.h
    1.43.1.9 02/11/29 21:48:01 peter@mysql.com +0 -0
    Auto merged

  client/select_test.c
    1.10 02/11/29 21:48:01 peter@mysql.com +0 -0
    Auto merged

  client/insert_test.c
    1.7 02/11/29 21:48:01 peter@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.212.1.16 02/11/29 21:47:09 peter@mysql.com +0 -0
    auto-union

ChangeSet
  1.1376 02/11/29 21:34:13 peter@mysql.com +5 -0
  Correct bug which exposed itself in rpl000017
  Commit for merge 

  sql/sql_acl.cc
    1.55.1.10 02/11/29 21:34:09 peter@mysql.com +8 -4
    Minor bug correction

  sql/password.c
    1.12 02/11/29 21:34:09 peter@mysql.com +4 -4
    Change prototypes 

  sql/mysql_priv.h
    1.160.1.20 02/11/29 21:34:09 peter@mysql.com +1 -0
    Add expected hash lenght for old paswords.

  include/mysql_com.h
    1.55 02/11/29 21:34:09 peter@mysql.com +2 -2
    Correct prototypes not to have need to include my_global.h

  client/connect_test.c
    1.6 02/11/29 21:34:09 peter@mysql.com +1 -0
    Roll back wrong change

ChangeSet
  1.1354.98.3 02/11/29 19:21:52 pem@mysql.com +1 -0
  Post-merge fix.

  sql/sql_yacc.yy
    1.184.1.26 02/11/29 19:21:45 pem@mysql.com +0 -1
    Post-merge fix.

ChangeSet
  1.1354.98.2 02/11/29 18:33:26 pem@mysql.com +4 -0
  Merge from 4.1.

  sql/sql_yacc.yy
    1.184.1.25 02/11/29 18:33:24 pem@mysql.com +6 -64
    Manual merge from 4.1.

  configure.in
    1.204 02/11/29 17:39:37 pem@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.212.6.5 02/11/29 17:39:24 pem@mysql.com +0 -0
    auto-union

  BitKeeper/etc/gone
    1.86.6.1 02/11/29 17:39:24 pem@mysql.com +0 -0
    auto-union

ChangeSet
  1.676.255.2 02/11/29 17:36:36 lenz@mysql.com +1 -0
   - removed unused variable $defaults
   - parse mysql.server section in my.cnf as well

  support-files/mysql.server.sh
    1.13.1.6 02/11/29 17:36:32 lenz@mysql.com +3 -2
     - removed unused variable $defaults
     - parse mysql.server section in my.cnf as well

ChangeSet
  1.1354.98.1 02/11/29 16:17:52 serg@serg.mysql.com +1 -0
  let's leave "INSERT ... SELECT ... UPDATE" for the future

  sql/sql_yacc.yy
    1.184.1.24 02/11/29 16:17:50 serg@serg.mysql.com +26 -17
    let's leave "INSERT ... SELECT ... UPDATE" for the future

ChangeSet
  1.1354.93.7 02/11/29 17:06:26 Sinisa@sinisa.nasamreza.org +2 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/sql_parse.cc
    1.235.11.9 02/11/29 17:06:21 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_base.cc
    1.122.1.16 02/11/29 17:06:21 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1346.46.28 02/11/29 16:41:12 monty@mashka.mysql.fi +1 -0
  Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0

  sql/sql_yacc.yy
    1.145.1.48 02/11/29 16:41:10 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.61.1 02/11/29 16:40:18 monty@mashka.mysql.fi +29 -0
  New multi-table-update code
  New (simpler) internal timestamp handling.
  More debuging to heap tables.
  Small cleanups to multi-table-delete
  false -> 0 and true -> 1  (We should use TRUE and FALSE)

  sql/uniques.cc
    1.11.1.1 02/11/29 16:40:16 monty@mashka.mysql.fi +2 -1
    Indentation cleanup

  sql/table.h
    1.31.1.10 02/11/29 16:40:16 monty@mashka.mysql.fi +10 -6
    Added union for temporary values.
    Made shared int to be able to store counters.

  sql/sql_yacc.yy
    1.145.13.1 02/11/29 16:40:16 monty@mashka.mysql.fi +6 -5
    false -> 0, true -> 1
    Optimized some list handling

  sql/sql_update.cc
    1.54.1.15 02/11/29 16:40:16 monty@mashka.mysql.fi +409 -375
    New multi-update-table code

  sql/sql_union.cc
    1.22.1.16 02/11/29 16:40:16 monty@mashka.mysql.fi +11 -8
    false -> 0
    Cleaned up timestamp handling

  sql/sql_select.h
    1.22.2.1 02/11/29 16:40:15 monty@mashka.mysql.fi +1 -0
    New prototypes

  sql/sql_select.cc
    1.152.1.58 02/11/29 16:40:15 monty@mashka.mysql.fi +78 -7
    More comments
    Fixed create_tmp_table for multi-table-update

  sql/sql_parse.cc
    1.218.1.59 02/11/29 16:40:15 monty@mashka.mysql.fi +17 -62
    Optimized some list handling.
    Moved multi-table-update to sql_update.cc

  sql/sql_olap.cc
    1.5 02/11/29 16:40:15 monty@mashka.mysql.fi +2 -2
    false -> 0

  sql/sql_insert.cc
    1.63.1.23 02/11/29 16:40:15 monty@mashka.mysql.fi +6 -18
    cleaned up timestamp handling

  sql/sql_delete.cc
    1.74.1.17 02/11/29 16:40:15 monty@mashka.mysql.fi +32 -35
    Fixed OPTION_SAFE_UPDATE checking in multi-table-delete.
    Fixed query-cache invalidation in multi-table-delete

  sql/sql_class.h
    1.111.1.24 02/11/29 16:40:15 monty@mashka.mysql.fi +31 -32
    Cleaned up multi-table-update

  sql/sql_base.cc
    1.117.1.31 02/11/29 16:40:15 monty@mashka.mysql.fi +11 -6
    Fixed grant checking if SELECT tablename.* 

  sql/mysql_priv.h
    1.150.1.23 02/11/29 16:40:15 monty@mashka.mysql.fi +19 -1
    Cleaned up SQL_LIST handling

  sql/item_cmpfunc.cc
    1.20.1.24 02/11/29 16:40:15 monty@mashka.mysql.fi +4 -4
    change true-> 1 and false -> 0

  mysys/mf_iocache.c
    1.34 02/11/29 16:40:15 monty@mashka.mysql.fi +2 -0
    Safety fix

  mysql-test/t/multi_update.test
    1.16 02/11/29 16:40:15 monty@mashka.mysql.fi +21 -29
    Cleanup up to only use table names t1, t2,...

  mysql-test/r/multi_update.result
    1.14 02/11/29 16:40:15 monty@mashka.mysql.fi +19 -29
    Updated results

  myisammrg/myrg_extra.c
    1.11 02/11/29 16:40:15 monty@mashka.mysql.fi +2 -1
    Added option to disable row cache when using updates

  myisam/sort.c
    1.23.1.2 02/11/29 16:40:15 monty@mashka.mysql.fi +12 -10
    Indentaion cleanups

  myisam/mi_extra.c
    1.29 02/11/29 16:40:15 monty@mashka.mysql.fi +4 -0
    Added option to disable row cache when using updates

  myisam/mi_check.c
    1.86.1.22 02/11/29 16:40:15 monty@mashka.mysql.fi +6 -6
    Comment cleanup

  isam/extra.c
    1.10 02/11/29 16:40:15 monty@mashka.mysql.fi +6 -0
    Added option to disable row cache when using updates

  include/my_base.h
    1.30.1.4 02/11/29 16:40:15 monty@mashka.mysql.fi +2 -1
    Added option to disable row cache when using updates

  heap/hp_write.c
    1.9.1.1 02/11/29 16:40:15 monty@mashka.mysql.fi +5 -0
    Extra debugging

  heap/hp_update.c
    1.5.1.1 02/11/29 16:40:15 monty@mashka.mysql.fi +4 -0
    Extra debugging

  heap/hp_scan.c
    1.4.1.1 02/11/29 16:40:15 monty@mashka.mysql.fi +1 -0
    Extra debugging

  heap/hp_delete.c
    1.5.1.1 02/11/29 16:40:15 monty@mashka.mysql.fi +4 -0
    Extra debugging

  heap/_check.c
    1.7.1.1 02/11/29 16:40:15 monty@mashka.mysql.fi +54 -3
    Added checking of rows

ChangeSet
  1.1354.93.6 02/11/29 14:26:25 serg@serg.mysql.com +1 -0
  Merge work:/home/bk/mysql-4.1
  into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1

  sql/sql_yacc.yy
    1.184.1.23 02/11/29 14:26:22 serg@serg.mysql.com +0 -0
    Auto merged

ChangeSet
  1.1354.97.1 02/11/29 15:22:47 Sinisa@sinisa.nasamreza.org +29 -0
  many, many changes

  sql/share/ukrainian/errmsg.txt
    1.23 02/11/29 15:22:44 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  sql/share/swedish/errmsg.txt
    1.60 02/11/29 15:22:44 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  sql/share/spanish/errmsg.txt
    1.60 02/11/29 15:22:44 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  sql/share/slovak/errmsg.txt
    1.60 02/11/29 15:22:44 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  sql/share/serbian/errmsg.txt
    1.14 02/11/29 15:22:44 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  sql/share/russian/errmsg.txt
    1.57 02/11/29 15:22:44 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  sql/share/romanian/errmsg.txt
    1.58 02/11/29 15:22:44 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  sql/share/portuguese/errmsg.txt
    1.60 02/11/29 15:22:44 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  sql/share/polish/errmsg.txt
    1.59 02/11/29 15:22:44 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  sql/share/norwegian/errmsg.txt
    1.59 02/11/29 15:22:44 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  sql/share/norwegian-ny/errmsg.txt
    1.59 02/11/29 15:22:44 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  sql/share/korean/errmsg.txt
    1.59 02/11/29 15:22:44 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  sql/share/japanese/errmsg.txt
    1.59 02/11/29 15:22:44 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  sql/share/italian/errmsg.txt
    1.65 02/11/29 15:22:44 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  sql/share/hungarian/errmsg.txt
    1.61 02/11/29 15:22:44 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  sql/share/greek/errmsg.txt
    1.60 02/11/29 15:22:44 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  sql/share/german/errmsg.txt
    1.59 02/11/29 15:22:43 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  sql/share/french/errmsg.txt
    1.59 02/11/29 15:22:43 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  sql/share/estonian/errmsg.txt
    1.60 02/11/29 15:22:43 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  sql/share/english/errmsg.txt
    1.65 02/11/29 15:22:43 Sinisa@sinisa.nasamreza.org +1 -1
    Merging changes ...

  sql/share/dutch/errmsg.txt
    1.62 02/11/29 15:22:43 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  sql/share/danish/errmsg.txt
    1.58 02/11/29 15:22:43 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  sql/share/czech/errmsg.txt
    1.60 02/11/29 15:22:43 Sinisa@sinisa.nasamreza.org +1 -250
    Merging changes ...

  mysql-test/t/subselect.test
    1.30 02/11/29 15:22:43 Sinisa@sinisa.nasamreza.org +2 -2
    Merging changes ...

  include/mysqld_error.h
    1.58 02/11/29 15:22:43 Sinisa@sinisa.nasamreza.org +2 -3
    Merging changes ...

ChangeSet
  1.1354.93.5 02/11/29 14:20:25 serg@serg.mysql.com +3 -0
  added missing Com_xxx status variables
  moved SQLCOM_END to the end of the list
  bad copy-paste in sql_yacc.yy fixed

  sql/sql_yacc.yy
    1.184.19.2 02/11/29 14:20:22 serg@serg.mysql.com +2 -1
    bad copy-paste fixed :)

  sql/sql_lex.h
    1.101 02/11/29 14:20:22 serg@serg.mysql.com +9 -1
    moved SQLCOM_END to the end. Comments added.

  sql/mysqld.cc
    1.304.2.10 02/11/29 14:20:22 serg@serg.mysql.com +11 -1
    added missing Com_xxx status variables

ChangeSet
  1.1346.60.1 02/11/29 18:07:02 walrus@mysql.com +3 -0
  improvement crash-me

  sql-bench/server-cfg.sh
    1.39.1.4 02/11/29 18:06:57 walrus@mysql.com +1 -1
    Misprint correction (db_Sapdb ->db_sapdb)

  sql-bench/crash-me.sh
    1.34.1.3 02/11/29 18:06:57 walrus@mysql.com +89 -36
    1) restore #!@PERL@ that I (accidentally) deleted  last time
    2) comment order_by_remember_desc section
    3) rectify WEEK test. Now it returns "EURO" ,"USA", "error" (if it returns 
    wrong week number), or "no" (if this function isn't supported)
    4) merge 2 tests for noround() (func_extra_noround and ignoring_noround). 
     Now it returns yes/no/"syntax only"
    5) merge 2 tests for foreign key (foreign_key and foreign_key_syntax). Now it
     returns yes/no/"syntax only"
    6) correct misprint in crash-me help ( --db-start-cmd instead of --start-cmd)

  BitKeeper/etc/ignore
    1.107.1.31 02/11/29 18:06:57 walrus@mysql.com +1 -0
    Added core.2430 to the ignore list

  sql/sql_parse.cc
    1.235.22.1 02/11/29 14:55:03 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_lex.cc
    1.58 02/11/29 14:55:03 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_base.cc
    1.122.12.1 02/11/29 14:55:02 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.34 02/11/29 14:55:02 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1354.89.2 02/11/29 14:49:07 Sinisa@sinisa.nasamreza.org +7 -0
  many bug fixes

  sql/sql_lex.cc
    1.54.2.1 02/11/29 14:49:03 Sinisa@sinisa.nasamreza.org +2 -0
    fix for deadlock

  sql/sql_derived.cc
    1.20 02/11/29 14:49:03 Sinisa@sinisa.nasamreza.org +2 -2
    code cleanup

  sql/sql_base.cc
    1.122.11.1 02/11/29 14:49:03 Sinisa@sinisa.nasamreza.org +2 -2
    A for for a bug which caused a deadlock !
    Also fix for a bug with using() on derived tables

  mysql-test/t/subselect.test
    1.29 02/11/29 14:49:03 Sinisa@sinisa.nasamreza.org +3 -3
    corrections of previous changes caused by a bug ..

  mysql-test/t/derived.test
    1.11 02/11/29 14:49:03 Sinisa@sinisa.nasamreza.org +2 -0
    test for a bug fix which caused a deadlock !
    Also test for a bug fix with using() on derived tables

  mysql-test/r/subselect.result
    1.27.1.2 02/11/29 14:49:03 Sinisa@sinisa.nasamreza.org +7 -7
    correcting previous changes caused by a bug ..

  mysql-test/r/derived.result
    1.11 02/11/29 14:49:03 Sinisa@sinisa.nasamreza.org +6 -0
    test for a bug fix which caused a deadlock !
    Also test for a bug fix with using() on derived tables

ChangeSet
  1.1354.93.4 02/11/29 13:17:54 serg@serg.mysql.com +3 -0
  make multi updates statistics visible in SHOW STATUS as Com_update_multi

  sql/sql_yacc.yy
    1.184.19.1 02/11/29 13:17:52 serg@serg.mysql.com +4 -2
    make multi updates statistics visible in SHOW STATUS as Com_update_multi

  sql/sql_parse.cc
    1.235.11.8 02/11/29 13:17:52 serg@serg.mysql.com +16 -10
    make multi updates statistics visible in SHOW STATUS as Com_update_multi

  sql/mysqld.cc
    1.304.2.9 02/11/29 13:17:52 serg@serg.mysql.com +2 -1
    make multi updates statistics visible in SHOW STATUS as Com_update_multi

ChangeSet
  1.1354.93.3 02/11/29 12:29:27 serg@serg.mysql.com +2 -0
  s/SQLCOM_MULTI_UPDATE/SQLCOM_UPDATE_MULTI/ to be in line with SQLCOM_DELETE_MULTI

  sql/sql_parse.cc
    1.235.11.7 02/11/29 12:29:25 serg@serg.mysql.com +4 -4
    s/SQLCOM_MULTI_UPDATE/SQLCOM_UPDATE_MULTI/ to be in line with SQLCOM_DELETE_MULTI

  sql/sql_lex.h
    1.100 02/11/29 12:29:25 serg@serg.mysql.com +3 -3
    s/SQLCOM_MULTI_UPDATE/SQLCOM_UPDATE_MULTI/ to be in line with SQLCOM_DELETE_MULTI

ChangeSet
  1.1346.46.26 02/11/29 13:05:37 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Make copies of all string-type start/up options in case C-sharp moves them around; remove the need to specify innodb_log_arch_dir in my.cnf, since it has no relevance anyway

  sql/ha_innodb.cc
    1.73.1.58 02/11/29 13:05:28 heikki@hundin.mysql.fi +96 -42
    Make copies of all string-type start/up options in case C-sharp moves them around; remove the need to specify innodb_log_arch_dir in my.cnf, since it has no relevance anyway

ChangeSet
  1.1354.95.1 02/11/29 12:30:04 bell@sanja.is.com.ua +11 -0
  checking columns of top items

  sql/sql_yacc.yy
    1.184.1.22 02/11/29 12:30:03 bell@sanja.is.com.ua +1 -1
    checking columns of top items

  sql/sql_select.cc
    1.173.1.21 02/11/29 12:30:03 bell@sanja.is.com.ua +5 -2
    checking columns of top items

  sql/sql_prepare.cc
    1.12 02/11/29 12:30:03 bell@sanja.is.com.ua +2 -1
    checking columns of top items

  sql/sql_handler.cc
    1.22.1.6 02/11/29 12:30:03 bell@sanja.is.com.ua +1 -1
    checking columns of top items

  sql/sql_base.cc
    1.122.1.15 02/11/29 12:30:03 bell@sanja.is.com.ua +5 -3
    checking columns of top items

  sql/set_var.cc
    1.18 02/11/29 12:30:03 bell@sanja.is.com.ua +1 -1
    checking columns of top items

  sql/item_row.cc
    1.2 02/11/29 12:30:03 bell@sanja.is.com.ua +1 -1
    checking columns of top items

  sql/item.h
    1.41.1.1 02/11/29 12:30:03 bell@sanja.is.com.ua +1 -0
    checking columns of wrapper items

  sql/item.cc
    1.27.1.24 02/11/29 12:30:03 bell@sanja.is.com.ua +4 -4
    checking columns of top items

  mysql-test/t/row_test.test
    1.3 02/11/29 12:30:03 bell@sanja.is.com.ua +16 -1
    new tests

  mysql-test/r/row_test.result
    1.3 02/11/29 12:30:03 bell@sanja.is.com.ua +10 -1
    changed error message (report requestet columns number)
    new tests

ChangeSet
  1.1354.94.2 02/11/29 14:04:36 bar@bar.mysql.r18.ru +1 -0
  UCS2 fixes

  strings/ctype-utf8.c
    1.16 02/11/29 14:04:34 bar@bar.mysql.r18.ru +237 -240
    UCS2 fixes

ChangeSet
  1.1354.94.1 02/11/29 13:29:48 bar@bar.mysql.r18.ru +1 -0
  my_strntod_ucs2 and my_strntol_ucs2 fixes

  strings/ctype-utf8.c
    1.15 02/11/29 13:29:46 bar@bar.mysql.r18.ru +112 -98
    my_strntod_ucs2 and my_strntol_ucs2 fixes

ChangeSet
  1.1354.93.1 02/11/29 10:44:30 bell@sanja.is.com.ua +4 -0
  fixed error handling bug
  fixed naming bug
  fixed bug of subselect excluding

  sql/sql_lex.cc
    1.57 02/11/29 10:44:28 bell@sanja.is.com.ua +3 -0
    fixed subselect excluding bug

  sql/item_subselect.cc
    1.33 02/11/29 10:44:28 bell@sanja.is.com.ua +2 -1
    fixed naming bug
    fixed error handling bug

  mysql-test/t/subselect.test
    1.27.1.4 02/11/29 10:44:28 bell@sanja.is.com.ua +4 -0
    test of error handling bug
    test of naming bug
    test bug of subselect excluding

  mysql-test/r/subselect.result
    1.33 02/11/29 10:44:28 bell@sanja.is.com.ua +8 -0
    test of error handling bug
    test of naming bug
    test bug of subselect excluding

ChangeSet
  1.1354.2.44 02/11/29 12:35:48 hf@genie.(none) +23 -0
  Pull conflicts resolutions

  sql/sql_parse.cc
    1.243 02/11/29 12:35:46 hf@genie.(none) +1 -1
    Pull conflicts resolved

  sql/mysql_priv.h
    1.168 02/11/29 12:35:46 hf@genie.(none) +6 -8
    Pull conflicts resolved

  sql/item_strfunc.cc
    1.60 02/11/29 12:35:46 hf@genie.(none) +5 -1
    Pull conflicts resolved

  sql/item.h
    1.42 02/11/29 12:35:46 hf@genie.(none) +1 -3
    Pull conflicts recolved

  sql/item.cc
    1.34 02/11/29 12:35:46 hf@genie.(none) +0 -1
    Pull conflicts resolved

  include/violite.h
    1.24 02/11/29 12:35:46 hf@genie.(none) +3 -5
    Pull conflicts resolved

  include/mysql.h
    1.48 02/11/29 12:35:46 hf@genie.(none) +3 -5
    Pull conflicts resolved

  sql/sql_table.cc
    1.136 02/11/29 12:16:21 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_show.cc
    1.95 02/11/29 12:16:21 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_select.cc
    1.180 02/11/29 12:16:21 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_class.h
    1.130 02/11/29 12:16:20 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_class.cc
    1.88 02/11/29 12:16:20 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_base.cc
    1.129 02/11/29 12:16:20 hf@genie.(none) +0 -0
    Auto merged

  sql/sql_acl.cc
    1.58 02/11/29 12:16:20 hf@genie.(none) +0 -0
    Auto merged

  sql/mysqld.cc
    1.304.1.10 02/11/29 12:16:20 hf@genie.(none) +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.105 02/11/29 12:16:19 hf@genie.(none) +0 -0
    Auto merged

  sql/field.h
    1.50 02/11/29 12:16:19 hf@genie.(none) +0 -0
    Auto merged

  sql/field.cc
    1.68 02/11/29 12:16:19 hf@genie.(none) +0 -0
    Auto merged

  libmysqld/libmysqld.c
    1.19 02/11/29 12:16:19 hf@genie.(none) +0 -0
    Auto merged

  libmysqld/lib_sql.cc
    1.36 02/11/29 12:16:19 hf@genie.(none) +0 -0
    Auto merged

  client/mysqltest.c
    1.87 02/11/29 12:16:18 hf@genie.(none) +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.223 02/11/29 12:15:53 hf@genie.(none) +0 -0
    auto-union

  BitKeeper/etc/gone
    1.86.1.9 02/11/29 12:15:51 hf@genie.(none) +0 -10
    auto-union

ChangeSet
  1.1354.2.43 02/11/29 11:15:15 bar@bar.mysql.r18.ru +1 -0
  Fixesd that wrong charset were used

  sql/item.cc
    1.27.1.23 02/11/29 11:15:13 bar@bar.mysql.r18.ru +3 -5
    Fixesd that wrong charset were used

ChangeSet
  1.1354.2.42 02/11/29 10:17:43 bar@bar.mysql.r18.ru +1 -0
  mysql.h:
    renamed arg name to avoid a warning that it shadows global variable

  include/mysql.h
    1.43.4.2 02/11/29 10:17:07 bar@bar.mysql.r18.ru +2 -2
    renamed arg name to avoid a warning that it shadows global variable

ChangeSet
  1.1354.2.40 02/11/28 23:31:48 bell@sanja.is.com.ua +2 -0
  test of changing subselects tree

  mysql-test/t/subselect.test
    1.27.1.3 02/11/28 23:31:47 bell@sanja.is.com.ua +2 -0
    test of changing subselects tree

  mysql-test/r/subselect.result
    1.32 02/11/28 23:31:47 bell@sanja.is.com.ua +9 -0
    test of changing subselects tree

ChangeSet
  1.1354.2.39 02/11/28 22:59:35 bell@sanja.is.com.ua +3 -0
  fixed bug IN subselect with ORDER

  sql/item_subselect.cc
    1.32 02/11/28 22:59:34 bell@sanja.is.com.ua +11 -4
    fixed bug IN subselect with ORDER

  mysql-test/t/subselect.test
    1.27.1.2 02/11/28 22:59:34 bell@sanja.is.com.ua +2 -0
    test of IN subselect with ORDER

  mysql-test/r/subselect.result
    1.31 02/11/28 22:59:34 bell@sanja.is.com.ua +3 -0
    test of IN subselect with ORDER

ChangeSet
  1.1354.2.37 02/11/28 20:58:23 bell@sanja.is.com.ua +3 -0
  after review fix(CRUM)
  after merge fix

  sql/item_cmpfunc.h
    1.25 02/11/28 20:58:22 bell@sanja.is.com.ua +2 -3
    after review fix

  sql/item_cmpfunc.cc
    1.41 02/11/28 20:58:21 bell@sanja.is.com.ua +2 -1
    after review fix

  sql/item.cc
    1.27.1.22 02/11/28 20:58:21 bell@sanja.is.com.ua +2 -4
    after merge fix

ChangeSet
  1.676.255.1 02/11/28 19:38:22 serg@serg.mysql.com +1 -0
  Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql

  sql/mysqld.cc
    1.162.1.96 02/11/28 19:38:21 serg@serg.mysql.com +0 -0
    Auto merged

ChangeSet
  1.676.251.3 02/11/28 19:38:01 serg@serg.mysql.com +1 -0
  chroot() need chdir("/") afterwards to work

  sql/mysqld.cc
    1.162.14.1 02/11/28 19:37:59 serg@serg.mysql.com +1 -0
    chroot() need chdir("/") afterwards to work

ChangeSet
  1.1354.2.36 02/11/28 20:12:14 bell@sanja.is.com.ua +30 -0
  merging

  sql/item.cc
    1.27.1.21 02/11/28 20:12:12 bell@sanja.is.com.ua +0 -2
    merging

  sql/share/ukrainian/errmsg.txt
    1.22 02/11/28 20:09:24 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/swedish/errmsg.txt
    1.59 02/11/28 20:09:24 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/spanish/errmsg.txt
    1.59 02/11/28 20:09:24 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/slovak/errmsg.txt
    1.59 02/11/28 20:09:24 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/serbian/errmsg.txt
    1.13 02/11/28 20:09:24 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/russian/errmsg.txt
    1.56 02/11/28 20:09:24 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/romanian/errmsg.txt
    1.57 02/11/28 20:09:24 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/portuguese/errmsg.txt
    1.59 02/11/28 20:09:24 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.58 02/11/28 20:09:24 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/norwegian/errmsg.txt
    1.58 02/11/28 20:09:24 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/norwegian-ny/errmsg.txt
    1.58 02/11/28 20:09:24 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/korean/errmsg.txt
    1.58 02/11/28 20:09:24 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/japanese/errmsg.txt
    1.58 02/11/28 20:09:24 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/italian/errmsg.txt
    1.64 02/11/28 20:09:24 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/hungarian/errmsg.txt
    1.60 02/11/28 20:09:24 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.184.1.21 02/11/28 20:09:23 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.56 02/11/28 20:09:23 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_base.cc
    1.122.1.14 02/11/28 20:09:23 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/greek/errmsg.txt
    1.59 02/11/28 20:09:23 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/german/errmsg.txt
    1.58 02/11/28 20:09:23 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/french/errmsg.txt
    1.58 02/11/28 20:09:23 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/estonian/errmsg.txt
    1.59 02/11/28 20:09:23 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.64 02/11/28 20:09:23 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/dutch/errmsg.txt
    1.61 02/11/28 20:09:23 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/danish/errmsg.txt
    1.57 02/11/28 20:09:23 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/czech/errmsg.txt
    1.59 02/11/28 20:09:23 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.cc
    1.31 02/11/28 20:09:23 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.30 02/11/28 20:09:23 bell@sanja.is.com.ua +0 -0
    Auto merged

  include/mysqld_error.h
    1.57 02/11/28 20:09:23 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1354.2.35 02/11/28 20:04:09 bell@sanja.is.com.ua +5 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-row-4.1

  sql/sql_yacc.yy
    1.184.1.20 02/11/28 20:04:06 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_sum.cc
    1.44 02/11/28 20:04:06 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.54.4.10 02/11/28 20:04:06 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.h
    1.52 02/11/28 20:04:06 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.41 02/11/28 20:04:06 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1354.85.9 02/11/28 20:01:22 bell@sanja.is.com.ua +2 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1

  sql/sql_yacc.yy
    1.184.16.3 02/11/28 20:01:20 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.235.11.6 02/11/28 20:01:20 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.59.1 02/11/28 18:57:56 pem@mysql.com +1 -0
  Added 29 {} at the end of clauses in sql_yacc.yy to make it work with bison 1.75.

  sql/sql_yacc.yy
    1.145.1.47 02/11/28 18:57:54 pem@mysql.com +65 -26
    Added 29 {} at the end of clauses to make it work with bison 1.75.
    Otherwise we get errors of the type 
    "sql_yacc.yy:666.7-672.21: type clash (`NONE' `') on default action".

ChangeSet
  1.1354.92.1 02/11/28 09:56:26 venu@myvenu.com +4 -0
  Get rid of pbool from my_list.h; and avoid using the my_global.h for clients

  client/select_test.c
    1.8.1.2 02/11/28 09:55:03 venu@myvenu.com +0 -1

  client/insert_test.c
    1.5.1.2 02/11/28 09:55:01 venu@myvenu.com +0 -1

  mysys/list.c
    1.7 02/11/28 09:54:51 venu@myvenu.com +1 -1

  include/my_list.h
    1.5 02/11/28 09:54:40 venu@myvenu.com +1 -1

ChangeSet
  1.1354.91.1 02/11/28 19:31:06 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1

  sql/sql_yacc.yy
    1.184.18.1 02/11/28 19:31:04 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1354.90.1 02/11/28 19:29:26 bell@sanja.is.com.ua +35 -0
  fixed * without tables in IN bug
  fixed sunction-test select in IN bug
  fixed unions in subselect bug

  sql/sql_yacc.yy
    1.184.17.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -2
    fixed Lex->describe flag appearence

  sql/sql_union.cc
    1.49 02/11/28 19:29:19 bell@sanja.is.com.ua +4 -0
    fixed unions in subselect

  sql/sql_parse.cc
    1.235.21.1 02/11/28 19:29:19 bell@sanja.is.com.ua +9 -3
    error handling

  sql/sql_lex.h
    1.99 02/11/28 19:29:19 bell@sanja.is.com.ua +3 -0
    mechanisp of removing single subselect for optimisation purposes

  sql/sql_lex.cc
    1.54.1.1 02/11/28 19:29:19 bell@sanja.is.com.ua +25 -0
    mechanisp of removing single subselect for optimisation purposes

  sql/sql_base.cc
    1.122.10.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -1
    fixed case on no name field in UNION subselect

  sql/share/ukrainian/errmsg.txt
    1.19.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/swedish/errmsg.txt
    1.56.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/spanish/errmsg.txt
    1.56.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/slovak/errmsg.txt
    1.56.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/serbian/errmsg.txt
    1.10.3.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/russian/errmsg.txt
    1.53.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/romanian/errmsg.txt
    1.54.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/portuguese/errmsg.txt
    1.56.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/polish/errmsg.txt
    1.55.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/norwegian/errmsg.txt
    1.55.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/norwegian-ny/errmsg.txt
    1.55.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/korean/errmsg.txt
    1.55.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/japanese/errmsg.txt
    1.55.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/italian/errmsg.txt
    1.61.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/hungarian/errmsg.txt
    1.57.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/greek/errmsg.txt
    1.56.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/german/errmsg.txt
    1.55.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/french/errmsg.txt
    1.55.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/estonian/errmsg.txt
    1.56.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/english/errmsg.txt
    1.61.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/dutch/errmsg.txt
    1.58.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/danish/errmsg.txt
    1.54.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/share/czech/errmsg.txt
    1.56.4.1 02/11/28 19:29:19 bell@sanja.is.com.ua +1 -0
    new warning

  sql/item_subselect.h
    1.15 02/11/28 19:29:19 bell@sanja.is.com.ua +6 -0
    mechanism for subselect removing

  sql/item_subselect.cc
    1.28.1.1 02/11/28 19:29:19 bell@sanja.is.com.ua +59 -7
    fixed subselect rewriting with function-test subselect

  sql/item.cc
    1.27.8.1 02/11/28 19:29:19 bell@sanja.is.com.ua +25 -25
    fixed * substitution without tables

  mysql-test/t/subselect.test
    1.27.1.1 02/11/28 19:29:19 bell@sanja.is.com.ua +14 -0
    test of * without tables in IN
    test of sunction-test select in IN
    test of unions in subselect

  mysql-test/r/subselect.result
    1.27.2.1 02/11/28 19:29:19 bell@sanja.is.com.ua +27 -0
    test of * without tables in IN
    test of sunction-test select in IN
    test of unions in subselect

  include/mysqld_error.h
    1.54.3.1 02/11/28 19:29:19 bell@sanja.is.com.ua +2 -1
    new warning

ChangeSet
  1.1354.89.1 02/11/28 19:19:21 Sinisa@sinisa.nasamreza.org +34 -0
  adding mandatory aliases for derived tables as per SQL-99
  doing it in sql_yacc.yy does not work
  this commit contains fixes for other tests
  there are fixes in subselect test which will have to be changed
  once fix_fields is fixed to work with aliased derived tables

  sql/sql_parse.cc
    1.235.20.1 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +7 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/sql_derived.cc
    1.19 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +1 -1
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/ukrainian/errmsg.txt
    1.19.1.5 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/swedish/errmsg.txt
    1.56.1.5 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/spanish/errmsg.txt
    1.56.1.5 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/slovak/errmsg.txt
    1.56.1.5 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/serbian/errmsg.txt
    1.10.1.4 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/russian/errmsg.txt
    1.53.1.5 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/romanian/errmsg.txt
    1.54.1.4 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/portuguese/errmsg.txt
    1.56.1.5 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/polish/errmsg.txt
    1.55.1.5 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/norwegian/errmsg.txt
    1.55.1.5 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/norwegian-ny/errmsg.txt
    1.55.1.5 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/korean/errmsg.txt
    1.55.1.5 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/japanese/errmsg.txt
    1.55.1.5 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/italian/errmsg.txt
    1.61.1.5 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/hungarian/errmsg.txt
    1.57.1.5 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/greek/errmsg.txt
    1.56.1.5 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/german/errmsg.txt
    1.55.1.5 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/french/errmsg.txt
    1.55.1.5 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/estonian/errmsg.txt
    1.56.1.5 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/english/errmsg.txt
    1.61.1.5 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +1 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/dutch/errmsg.txt
    1.58.1.5 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/danish/errmsg.txt
    1.54.1.5 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  sql/share/czech/errmsg.txt
    1.56.1.5 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +250 -0
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  mysql-test/t/subselect.test
    1.28 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +10 -10
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  mysql-test/t/select_found.test
    1.13 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +1 -1
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  mysql-test/t/group_by.test
    1.15 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +1 -1
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  mysql-test/t/derived.test
    1.10 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +11 -11
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  mysql-test/r/subselect.result
    1.27.1.1 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +14 -14
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  mysql-test/r/select_found.result
    1.14 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +1 -1
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  mysql-test/r/group_by.result
    1.20 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +1 -1
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  mysql-test/r/derived.result
    1.10 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +12 -12
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

  include/mysqld_error.h
    1.54.1.4 02/11/28 19:19:17 Sinisa@sinisa.nasamreza.org +2 -1
    adding mandatory aliases for derived tables as per SQL-99
    doing it in sql_yacc.yy does not work
    this commit contains fixes for other tests
    there are fixes in subselect test which will have to be changed
    once fix_fields is fixed to work with aliased derived tables

ChangeSet
  1.1354.85.8 02/11/28 17:25:41 serg@serg.mysql.com +3 -0
  INSERT ... UPDATE syntax (syntax only)
  sql_yacc.yy and sql_parse.cc cleanup

  sql/sql_yacc.yy
    1.184.16.2 02/11/28 17:25:39 serg@serg.mysql.com +55 -54
    INSERT ... UPDATE syntax
    cleanup

  sql/sql_parse.cc
    1.235.11.5 02/11/28 17:25:39 serg@serg.mysql.com +14 -20
    merged SQLCOM_REPLACE and SQLCOM_INSERT the same way their _SELECT counterparts were merged long time ago - just to remove duplicate code and be consistent :)
    now nobody needs SQLCOM_REPLACE* at all :))

  sql/lex.h
    1.78.1.4 02/11/28 17:25:39 serg@serg.mysql.com +2 -1
    INSERT ... UPDATE syntax

ChangeSet
  1.1354.85.7 02/11/28 16:10:29 pem@mysql.com +1 -0
  Fixed the reduce/reduce conflicts introduced by subselects.

  sql/sql_yacc.yy
    1.184.16.1 02/11/28 16:10:28 pem@mysql.com +19 -14
    Fixed the reduce/reduce conflicts introduced by subselects by
    breaking select_init apart.

ChangeSet
  1.1346.58.1 02/11/28 20:01:17 walrus@mysql.com +2 -0
  Merge constraint tests with "ignoring constarint tests"
  for column,table and named constarints. Now constraint test produces
  exactly one line in report, with "yes","no" or syntax only".
  
  add /odbc to server-version if benchmark/crash-me works over odbc

  sql-bench/server-cfg.sh
    1.39.1.3 02/11/28 20:01:13 walrus@mysql.com +31 -9
    add /odbc to server-version if benchmark/crash-me works over odbc

  sql-bench/crash-me.sh
    1.34.1.2 02/11/28 20:01:13 walrus@mysql.com +31 -19
    merge constraint tests with "ignoring constarint tests"
    for column,table and named constarints. Now constraint test produces
    exactly one line in report, with "yes","no" or syntax only".

ChangeSet
  1.676.1.595 02/11/28 16:37:58 Sinisa@sinisa.nasamreza.org +1 -0
  Better fix for 64 bit CPU ..

  sql/sql_show.cc
    1.47.1.15 02/11/28 16:37:56 Sinisa@sinisa.nasamreza.org +1 -1
    Better fix for 64 bit CPU ..

ChangeSet
  1.1346.46.23 02/11/28 12:45:01 pem@mysql.com +1 -0
  A better way to get the ChangeSet revision for the Subject: line.

  BitKeeper/triggers/post-commit
    1.19.1.6 02/11/28 12:44:59 pem@mysql.com +1 -1
    A better way to get the ChangeSet revision for the Subject: line.

ChangeSet
  1.1354.85.6 02/11/28 15:28:23 bar@bar.mysql.r18.ru +1 -0
  Makefile.am:
    libmysys.a is needed for my_errno

ChangeSet
  1.1354.85.5 02/11/28 15:19:42 ram@mysql.r18.ru +2 -0
  ::index_read_last() method has been added

  sql/ha_heap.h
    1.21 02/11/28 15:19:35 ram@mysql.r18.ru +1 -0
    ::index_read_last() method has been added

  sql/ha_heap.cc
    1.31 02/11/28 15:19:35 ram@mysql.r18.ru +9 -1
    ::index_read_last() method has been added

ChangeSet
  1.1354.88.1 02/11/28 15:24:55 wax@mysql.com +4 -0
  Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4mi

  myisam/sort.c
    1.29 02/11/28 15:24:52 wax@mysql.com +0 -1
    Auto merged

  myisam/myisamdef.h
    1.52 02/11/28 15:24:52 wax@mysql.com +0 -0
    Auto merged

  include/myisam.h
    1.44 02/11/28 15:24:52 wax@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.212.11.5 02/11/28 15:24:44 wax@mysql.com +0 -0
    auto-union

ChangeSet
  1.1354.54.3 02/11/28 15:16:56 wax@mysql.com +2 -0
  Correct view of sort.c and mi_too_big_key_for_sort()

  myisam/sort.c
    1.28 02/11/28 15:16:54 wax@mysql.com +7 -6
    Correct view, according rules

  myisam/mi_check.c
    1.93 02/11/28 15:16:53 wax@mysql.com +1 -4
    Correct mi_too_big_key_for_sort()

ChangeSet
  1.1354.87.1 02/11/28 13:31:35 ram@mysql.r18.ru +1 -0
  support for HA_READ_PREFIX_LAST_OR_PREV, HA_READ_PREFIX_LAST and HA_READ_BEFORE_KEY

  mysys/tree.c
    1.21 02/11/28 13:31:21 ram@mysql.r18.ru +33 -20
    support for HA_READ_PREFIX_LAST_OR_PREV, HA_READ_PREFIX_LAST and HA_READ_BEFORE_KEY

ChangeSet
  1.1354.85.3 02/11/28 11:29:35 monty@mashka.mysql.fi +1 -0
  Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1

  libmysql/libmysql.c
    1.107.1.2 02/11/28 11:29:31 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1354.86.1 02/11/28 11:28:49 monty@mashka.mysql.fi +1 -0
  Fix wrong increment in prepared statements handling

  libmysql/libmysql.c
    1.107.2.1 02/11/28 11:28:47 monty@mashka.mysql.fi +1 -1
    Fix wrong increment

  regex/Makefile.am
    1.9 02/11/28 12:28:34 bar@bar.mysql.r18.ru +1 -1
    libmysys.a is needed for my_errno

ChangeSet
  1.1354.85.2 02/11/28 11:33:04 bar@bar.mysql.r18.ru +3 -0
  More use of new string->number conversion functions

  sql/item_sum.cc
    1.42.1.1 02/11/28 11:33:02 bar@bar.mysql.r18.ru +1 -1
    More use of new string->number conversion functions

  sql/item_strfunc.cc
    1.54.5.3 02/11/28 11:33:02 bar@bar.mysql.r18.ru +4 -4
    More use of new string->number conversion functions

  sql/field.cc
    1.64.1.11 02/11/28 11:33:02 bar@bar.mysql.r18.ru +6 -20
    More use of new string->number conversion functions

ChangeSet
  1.1354.2.34 02/11/28 09:11:35 bell@sanja.is.com.ua +6 -0
  Item_func_equal made uniform

  sql/mysqld.cc
    1.304.2.8 02/11/28 09:11:34 bell@sanja.is.com.ua +5 -1
    Item_func_equal made uniform

  sql/item_func.h
    1.51 02/11/28 09:11:34 bell@sanja.is.com.ua +6 -0
    Item_func_equal made uniform

  sql/item_cmpfunc.h
    1.24 02/11/28 09:11:34 bell@sanja.is.com.ua +4 -4
    Item_func_equal made uniform

  sql/item_cmpfunc.cc
    1.40 02/11/28 09:11:34 bell@sanja.is.com.ua +47 -52
    Item_func_equal made uniform

  mysql-test/t/row_test.test
    1.2 02/11/28 09:11:34 bell@sanja.is.com.ua +2 -0
    Equal test

  mysql-test/r/row_test.result
    1.2 02/11/28 09:11:34 bell@sanja.is.com.ua +6 -0
    Equal test

ChangeSet
  1.1354.85.1 02/11/28 11:04:26 bar@bar.mysql.r18.ru +4 -0
  New functions

  strings/ctype-simple.c
    1.14 02/11/28 11:04:24 bar@bar.mysql.r18.ru +10 -10
    New functions

  sql/item_sum.h
    1.21 02/11/28 11:04:24 bar@bar.mysql.r18.ru +2 -2
    New functions

  sql/item_func.h
    1.47.1.5 02/11/28 11:04:24 bar@bar.mysql.r18.ru +2 -2
    New functions

  sql/item.h
    1.39.1.1 02/11/28 11:04:24 bar@bar.mysql.r18.ru +2 -2
    New functions

ChangeSet
  1.1354.2.33 02/11/28 01:00:09 bell@sanja.is.com.ua +5 -0
  changed compare engine in basic row items (SCRUM)
  fixed layout

  sql/sql_select.cc
    1.173.1.20 02/11/28 01:00:08 bell@sanja.is.com.ua +2 -2
    changed compare engine in basic row items

  sql/item_func.h
    1.50 02/11/28 01:00:08 bell@sanja.is.com.ua +56 -24
    changed compare engine in basic row items
    fixed layout

  sql/item_cmpfunc.h
    1.23 02/11/28 01:00:08 bell@sanja.is.com.ua +4 -59
    changed compare engine in basic row items

  BitKeeper/etc/ignore
    1.129 02/11/28 01:00:08 bell@sanja.is.com.ua +1 -0
    Added libmysqld/item_row.cc to the ignore list

  sql/item_cmpfunc.cc
    1.39 02/11/28 01:00:07 bell@sanja.is.com.ua +61 -50
    changed compare engine in basic row items

ChangeSet
  1.1346.57.1 02/11/27 22:57:17 lenz@mysql.com +2 -0
   - Moved the init script from /etc/rc.d/init.d to /etc/init.d for better
     compatibility of the RPMs
   - added "restart" action to the mysql.server init script

  support-files/mysql.spec.sh
    1.58 02/11/27 22:57:15 lenz@mysql.com +47 -16
     - moved init script from /etc/rc.d/init.d to /etc/init.d (the majority of 
       Linux distributions now support this scheme as proposed by the LSB either
       directly or via a compatibility symlink)
     - relaxed the Perl requirements a bit
     - Use new "restart" init script action instead of starting and stopping
       separately
     - Be more flexible in activating the automatic bootup - use insserv (on
       older SuSE versions) or chkconfig (Red Hat, newer SuSE versions and
       others) to create the respective symlinks

  support-files/mysql.server.sh
    1.24 02/11/27 22:57:15 lenz@mysql.com +8 -1
     - added "restart" action

ChangeSet
  1.1354.2.32 02/11/27 22:35:23 bell@sanja.is.com.ua +3 -0
  after-merge fix

  sql/item_subselect.cc
    1.30 02/11/27 22:32:24 bell@sanja.is.com.ua +2 -2
    after-merge fix

  sql/item.cc
    1.27.1.20 02/11/27 22:32:24 bell@sanja.is.com.ua +2 -4
    after-merge fix

  mysql-test/r/subselect.result
    1.29 02/11/27 22:32:24 bell@sanja.is.com.ua +2 -2
    after-merge fix

ChangeSet
  1.1354.2.31 02/11/27 19:31:11 bell@sanja.is.com.ua +43 -0
  merging

  sql/share/ukrainian/errmsg.txt
    1.21 02/11/27 19:31:08 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/swedish/errmsg.txt
    1.58 02/11/27 19:31:08 bell@sanja.is.com.ua +1 -1
    merging

  sql/item_cmpfunc.h
    1.22 02/11/27 19:31:08 bell@sanja.is.com.ua +0 -1
    merging

  sql/item_cmpfunc.cc
    1.38 02/11/27 19:31:08 bell@sanja.is.com.ua +0 -0
    merging

  sql/item.h
    1.40 02/11/27 19:31:08 bell@sanja.is.com.ua +5 -5
    merging

  sql/item.cc
    1.27.1.19 02/11/27 19:31:08 bell@sanja.is.com.ua +0 -0
    merging

  sql/share/spanish/errmsg.txt
    1.58 02/11/27 19:18:14 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/slovak/errmsg.txt
    1.58 02/11/27 19:18:14 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/serbian/errmsg.txt
    1.12 02/11/27 19:18:14 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/russian/errmsg.txt
    1.55 02/11/27 19:18:14 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/romanian/errmsg.txt
    1.56 02/11/27 19:18:14 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/portuguese/errmsg.txt
    1.58 02/11/27 19:18:14 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.57 02/11/27 19:18:14 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/norwegian/errmsg.txt
    1.57 02/11/27 19:18:14 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/norwegian-ny/errmsg.txt
    1.57 02/11/27 19:18:14 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/korean/errmsg.txt
    1.57 02/11/27 19:18:14 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/japanese/errmsg.txt
    1.57 02/11/27 19:18:14 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/italian/errmsg.txt
    1.63 02/11/27 19:18:14 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/hungarian/errmsg.txt
    1.59 02/11/27 19:18:14 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/greek/errmsg.txt
    1.58 02/11/27 19:18:14 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/german/errmsg.txt
    1.57 02/11/27 19:18:14 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/french/errmsg.txt
    1.57 02/11/27 19:18:14 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/estonian/errmsg.txt
    1.58 02/11/27 19:18:14 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.63 02/11/27 19:18:14 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/dutch/errmsg.txt
    1.60 02/11/27 19:18:14 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/danish/errmsg.txt
    1.56 02/11/27 19:18:14 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.184.1.19 02/11/27 19:18:13 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.173.1.19 02/11/27 19:18:13 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.55 02/11/27 19:18:13 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_base.cc
    1.122.1.13 02/11/27 19:18:13 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/czech/errmsg.txt
    1.58 02/11/27 19:18:13 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_sum.cc
    1.43 02/11/27 19:18:13 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.cc
    1.29 02/11/27 19:18:13 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_strfunc.h
    1.30.1.6 02/11/27 19:18:13 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.54.4.9 02/11/27 19:18:13 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.h
    1.49 02/11/27 19:18:13 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.86 02/11/27 19:18:13 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/filesort.cc
    1.59 02/11/27 19:18:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/Makefile.am
    1.77 02/11/27 19:18:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.28 02/11/27 19:18:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  libmysqld/Makefile.am
    1.28 02/11/27 19:18:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  include/mysqld_error.h
    1.56 02/11/27 19:18:12 bell@sanja.is.com.ua +0 -0
    Auto merged

  include/mysql_com.h
    1.46.1.4 02/11/27 19:18:12 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1354.31.23 02/11/27 19:16:06 bell@sanja.is.com.ua +2 -0
  layout fix

  sql/item_cmpfunc.cc
    1.35.1.4 02/11/27 19:16:04 bell@sanja.is.com.ua +2 -2
    layout fix

  sql/filesort.cc
    1.58 02/11/27 19:16:04 bell@sanja.is.com.ua +2 -1
    layout fix

ChangeSet
  1.676.254.1 02/11/27 18:05:41 Sinisa@sinisa.nasamreza.org +1 -0
  fix for SHOW VARS for IA64 and other 64 bit systems

  sql/sql_show.cc
    1.47.1.14 02/11/27 18:05:39 Sinisa@sinisa.nasamreza.org +1 -1
    fix for SHOW VARS for IA64 and other 64 bit systems

ChangeSet
  1.1354.2.30 02/11/27 18:03:10 bell@sanja.is.com.ua +1 -0
  fixed current_thread

  sql/sql_yacc.yy
    1.184.1.18 02/11/27 18:03:08 bell@sanja.is.com.ua +7 -7
    fixed current_thread

ChangeSet
  1.1354.2.28 02/11/27 17:42:15 bell@sanja.is.com.ua +1 -0
  typo fixed

  sql/item.cc
    1.27.1.18 02/11/27 17:42:14 bell@sanja.is.com.ua +2 -2
    typo fixed

ChangeSet
  1.1354.55.32 02/11/27 19:32:47 ram@mysql.r18.ru +1 -0
  support for HA_READ_BEFORE_KEY and HA_READ_PREFIX_LAST_OR_PREV

  sql/ha_berkeley.cc
    1.110 02/11/27 19:32:00 ram@mysql.r18.ru +17 -0
    support for HA_READ_BEFORE_KEY and HA_READ_PREFIX_LAST_OR_PREV

ChangeSet
  1.1354.2.27 02/11/27 17:10:21 bell@sanja.is.com.ua +6 -0
  merging

  sql/sql_yacc.yy
    1.184.1.17 02/11/27 17:10:18 bell@sanja.is.com.ua +3 -2
    merging

  sql/sql_select.cc
    1.173.1.18 02/11/27 17:07:57 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.235.11.4 02/11/27 17:07:57 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.h
    1.98 02/11/27 17:07:57 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/t/subselect.test
    1.27 02/11/27 17:07:57 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.27 02/11/27 17:07:57 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1354.2.26 02/11/27 17:04:43 bell@sanja.is.com.ua +5 -0
  after review changes in IN/ALL/ANY/SOME (SCRUM)

  sql/sql_base.cc
    1.122.1.12 02/11/27 17:04:41 bell@sanja.is.com.ua +23 -0
    after review changes

  sql/mysql_priv.h
    1.160.6.12 02/11/27 17:04:40 bell@sanja.is.com.ua +2 -0
    after review changes

  sql/item_subselect.cc
    1.28 02/11/27 17:04:40 bell@sanja.is.com.ua +3 -3
    after review changes

  sql/item.h
    1.39 02/11/27 17:04:40 bell@sanja.is.com.ua +4 -4
    after review changes

  sql/item.cc
    1.27.1.17 02/11/27 17:04:40 bell@sanja.is.com.ua +37 -15
    after review changes

ChangeSet
  1.1354.82.4 02/11/27 18:08:31 bar@bar.mysql.r18.ru +5 -0
  new string-to-number functions

  strings/ctype-utf8.c
    1.14 02/11/27 18:08:29 bar@bar.mysql.r18.ru +443 -16
    Use new string-to-number functions

  strings/ctype-simple.c
    1.13 02/11/27 18:08:29 bar@bar.mysql.r18.ru +450 -15
    Use new string-to-number functions

  strings/ctype-bin.c
    1.9 02/11/27 18:08:29 bar@bar.mysql.r18.ru +21 -1
    Use new string-to-number functions

  sql/field.cc
    1.64.1.10 02/11/27 18:08:29 bar@bar.mysql.r18.ru +4 -8
    Use new string-to-number functions

  include/m_ctype.h
    1.47 02/11/27 18:08:29 bar@bar.mysql.r18.ru +5 -5
    Typo fix

ChangeSet
  1.676.1.593 02/11/27 10:05:49 miguel@hegel.br +1 -0
  Fix for shutdown on several instances servers started as standalone

  sql/mysqld.cc
    1.162.1.95 02/11/27 10:05:20 miguel@hegel.br +13 -12
    Fix for shutdown on several instances servers started as standalone

ChangeSet
  1.1354.84.2 02/11/27 15:52:32 bell@sanja.is.com.ua +1 -0
  after merging fix

  sql/sql_parse.cc
    1.235.12.20 02/11/27 15:52:29 bell@sanja.is.com.ua +1 -1
    after merging fix

ChangeSet
  1.1354.84.1 02/11/27 14:31:39 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1

  sql/sql_parse.cc
    1.235.12.19 02/11/27 14:31:36 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1354.83.1 02/11/27 16:14:55 vva@genie.(none) +1 -0
  correction for compiling under FreeBSD

  readline/terminal.c
    1.7 02/11/27 16:14:50 vva@genie.(none) +2 -2
    correction for compiling under FreeBSD

ChangeSet
  1.1346.46.22 02/11/27 13:01:50 pem@mysql.com +2 -0
  Add the ChangeSet id to Subject: in all emails.

  BitKeeper/triggers/post-commit
    1.19.1.5 02/11/27 13:01:40 pem@mysql.com +5 -3
    Add the ChangeSet id to Subject: in all emails.

  BitKeeper/etc/ignore
    1.107.1.30 02/11/27 13:01:40 pem@mysql.com +12 -0
    Added autom4te-2.53.cache/output.0 autom4te-2.53.cache/requests autom4te-2.53.cache/traces.0 bdb/dist/autom4te-2.53.cache/output.0 bdb/dist/autom4te-2.53.cache/requests bdb/dist/autom4te-2.53.cache/traces.0 bkpull.log build.log innobase/autom4te-2.53.cache/output.0 innobase/autom4te-2.53.cache/requests innobase/autom4te-2.53.cache/traces.0 pull.log to the ignore list

ChangeSet
  1.1354.82.3 02/11/27 15:47:39 bar@bar.mysql.r18.ru +17 -0
  Preparing to use better string-to-number functions to avoid c_ptr() call,
  wich is slower and is not ucs2 compatible

  strings/ctype.c
    1.39 02/11/27 15:47:27 bar@bar.mysql.r18.ru +115 -115
    Preparing to use better string-to-number functions to avoid c_ptr() call,
    wich is slower and is not ucs2 compatible

  strings/ctype-win1250ch.c
    1.9 02/11/27 15:47:27 bar@bar.mysql.r18.ru +5 -5
    Preparing to use better string-to-number functions to avoid c_ptr() call,
    wich is slower and is not ucs2 compatible

  strings/ctype-utf8.c
    1.13 02/11/27 15:47:27 bar@bar.mysql.r18.ru +25 -25
    Preparing to use better string-to-number functions to avoid c_ptr() call,
    wich is slower and is not ucs2 compatible

  strings/ctype-ujis.c
    1.21 02/11/27 15:47:27 bar@bar.mysql.r18.ru +5 -5
    Preparing to use better string-to-number functions to avoid c_ptr() call,
    wich is slower and is not ucs2 compatible

  strings/ctype-tis620.c
    1.28 02/11/27 15:47:27 bar@bar.mysql.r18.ru +5 -5
    Preparing to use better string-to-number functions to avoid c_ptr() call,
    wich is slower and is not ucs2 compatible

  strings/ctype-sjis.c
    1.28 02/11/27 15:47:27 bar@bar.mysql.r18.ru +5 -5
    Preparing to use better string-to-number functions to avoid c_ptr() call,
    wich is slower and is not ucs2 compatible

  strings/ctype-simple.c
    1.12 02/11/27 15:47:27 bar@bar.mysql.r18.ru +15 -15
    Preparing to use better string-to-number functions to avoid c_ptr() call,
    wich is slower and is not ucs2 compatible

  strings/ctype-latin1_de.c
    1.19 02/11/27 15:47:27 bar@bar.mysql.r18.ru +5 -5
    Preparing to use better string-to-number functions to avoid c_ptr() call,
    wich is slower and is not ucs2 compatible

  strings/ctype-gbk.c
    1.23 02/11/27 15:47:27 bar@bar.mysql.r18.ru +5 -5
    Preparing to use better string-to-number functions to avoid c_ptr() call,
    wich is slower and is not ucs2 compatible

  strings/ctype-gb2312.c
    1.19 02/11/27 15:47:27 bar@bar.mysql.r18.ru +5 -5
    Preparing to use better string-to-number functions to avoid c_ptr() call,
    wich is slower and is not ucs2 compatible

  strings/ctype-euc_kr.c
    1.20 02/11/27 15:47:27 bar@bar.mysql.r18.ru +5 -5
    Preparing to use better string-to-number functions to avoid c_ptr() call,
    wich is slower and is not ucs2 compatible

  strings/ctype-czech.c
    1.23 02/11/27 15:47:27 bar@bar.mysql.r18.ru +5 -5
    Preparing to use better string-to-number functions to avoid c_ptr() call,
    wich is slower and is not ucs2 compatible

  strings/ctype-bin.c
    1.8 02/11/27 15:47:27 bar@bar.mysql.r18.ru +5 -5
    Preparing to use better string-to-number functions to avoid c_ptr() call,
    wich is slower and is not ucs2 compatible

  strings/ctype-big5.c
    1.23 02/11/27 15:47:27 bar@bar.mysql.r18.ru +5 -5
    Preparing to use better string-to-number functions to avoid c_ptr() call,
    wich is slower and is not ucs2 compatible

  sql/gstream.cc
    1.3 02/11/27 15:47:27 bar@bar.mysql.r18.ru +1 -1
    Preparing to use better string-to-number functions to avoid c_ptr() call,
    wich is slower and is not ucs2 compatible

  mysys/charset.c
    1.49 02/11/27 15:47:27 bar@bar.mysql.r18.ru +5 -4
    Preparing to use better string-to-number functions to avoid c_ptr() call,
    wich is slower and is not ucs2 compatible

  include/m_ctype.h
    1.46 02/11/27 15:47:27 bar@bar.mysql.r18.ru +15 -15
    Preparing to use better string-to-number functions to avoid c_ptr() call,
    wich is slower and is not ucs2 compatible

ChangeSet
  1.1354.55.27 02/11/27 13:30:45 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-update-4.1

  sql/sql_parse.cc
    1.235.12.18 02/11/27 13:30:42 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1354.2.25 02/11/27 12:31:32 bell@sanja.is.com.ua +4 -0
  after merging fix

  sql/sql_yacc.yy
    1.184.1.16 02/11/27 12:31:30 bell@sanja.is.com.ua +8 -4
    after merging fix

  sql/sql_select.cc
    1.173.15.2 02/11/27 12:31:30 bell@sanja.is.com.ua +1 -0
    after merging fix

  mysql-test/t/subselect.test
    1.25.1.2 02/11/27 12:31:30 bell@sanja.is.com.ua +14 -22
    after merging fix

  mysql-test/r/subselect.result
    1.25.1.2 02/11/27 12:31:29 bell@sanja.is.com.ua +34 -42
    after merging fix

ChangeSet
  1.1354.82.2 02/11/27 11:23:36 pem@mysql.com +3 -0
  Merge work.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/pem/work/mysql-4.1

  sql/sql_yacc.yy
    1.184.15.1 02/11/27 11:23:34 pem@mysql.com +0 -0
    Auto merged

  sql/sql_prepare.cc
    1.11 02/11/27 11:23:34 pem@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.235.12.17 02/11/27 11:23:33 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1354.2.24 02/11/27 11:32:09 bell@sanja.is.com.ua +17 -0
  merging

  sql/sql_yacc.yy
    1.184.1.15 02/11/27 11:32:06 bell@sanja.is.com.ua +2 -6
    merging

  sql/sql_select.cc
    1.173.15.1 02/11/27 11:32:06 bell@sanja.is.com.ua +0 -1
    merging

  mysql-test/t/subselect.test
    1.25.1.1 02/11/27 11:32:06 bell@sanja.is.com.ua +21 -10
    merging

  mysql-test/r/subselect.result
    1.25.1.1 02/11/27 11:32:06 bell@sanja.is.com.ua +20 -21
    merging

  sql/sql_parse.cc
    1.235.11.3 02/11/27 11:13:02 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.h
    1.97 02/11/27 11:13:02 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.54 02/11/27 11:13:02 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.160.6.11 02/11/27 11:13:01 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/lex.h
    1.78.1.3 02/11/27 11:13:01 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_sum.h
    1.20 02/11/27 11:13:01 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_sum.cc
    1.42 02/11/27 11:13:01 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.h
    1.14 02/11/27 11:13:01 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_subselect.cc
    1.27 02/11/27 11:13:01 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.21 02/11/27 11:13:01 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.37 02/11/27 11:13:01 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.38 02/11/27 11:13:01 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.27.1.16 02/11/27 11:13:01 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1354.82.1 02/11/26 18:54:17 venu@myvenu.com +3 -0
  Merge myvenu.com:/home/venu/bk/src-4.1
  into myvenu.com:/home/venu/work/sql/dev-4.1

  sql/sql_prepare.cc
    1.9.1.1 02/11/26 18:54:12 venu@myvenu.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.235.19.1 02/11/26 18:54:12 venu@myvenu.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.160.6.10 02/11/26 18:54:12 venu@myvenu.com +0 -0
    Auto merged

ChangeSet
  1.1354.81.1 02/11/26 18:51:38 venu@myvenu.com +7 -0
  select_test.c, insert_test.c:
    Added my_global.h to compile after my_list.h is added to mysql.h
  sql_prepare.cc:
    Handle close stmt from client
    Minor fixups to make SET variable=? to work
  sql_parse.cc:
    Added missed COM_CLOSE_STMT
  mysql_priv.h:
    Change mysql_stmt_close to mysql_stmt_free to not to conflict with client type
  libmysql.c:
    Clean all open stmts during mysql_close() implicitly

  client/select_test.c
    1.8.1.1 02/11/26 18:50:13 venu@myvenu.com +1 -0
    Added my_global.h to compile after my_list.h is added to mysql.h

  client/insert_test.c
    1.5.1.1 02/11/26 18:49:39 venu@myvenu.com +1 -0
    Added my_global.h to compile after my_list.h is added to mysql.h

  sql/sql_prepare.cc
    1.7.1.3 02/11/26 18:47:37 venu@myvenu.com +28 -17
    Handle close stmt from client
    Change mysql_stmt_close to mysql_stmt_free to not to conflict with client type
    Minor fixups to make SET variable=? to work

  sql/sql_parse.cc
    1.235.18.1 02/11/26 18:46:50 venu@myvenu.com +6 -1
    Added missed COM_CLOSE_STMT

  sql/mysql_priv.h
    1.160.13.1 02/11/26 18:45:35 venu@myvenu.com +1 -1
    Handle close_stmt from client
    Change mysql_stmt_close to mysql_stmt_free to not to conflict with client type

  libmysql/libmysql.c
    1.107.1.1 02/11/26 18:43:24 venu@myvenu.com +35 -8
    Clean all open stmts during mysql_close() implicitly

  include/mysql.h
    1.43.4.1 02/11/26 18:43:07 venu@myvenu.com +7 -2

ChangeSet
  1.1354.80.1 02/11/27 01:12:16 bell@sanja.is.com.ua +7 -0
  reverse order in global select list allow to avoid recursion in derived tables

  sql/sql_update.cc
    1.66 02/11/27 01:12:10 bell@sanja.is.com.ua +1 -1
    new order in global select list

  sql/sql_select.cc
    1.173.1.17 02/11/27 01:12:10 bell@sanja.is.com.ua +2 -2
    new order in global select list

  sql/sql_parse.cc
    1.235.17.1 02/11/27 01:12:10 bell@sanja.is.com.ua +23 -21
    reverse order in global select list allow to avoid recursion in derived tables

  sql/sql_lex.h
    1.94.1.10 02/11/27 01:12:10 bell@sanja.is.com.ua +2 -0
    pointer to global select list

  sql/sql_insert.cc
    1.74 02/11/27 01:12:10 bell@sanja.is.com.ua +1 -1
    new order in global select list

  sql/sql_derived.cc
    1.18 02/11/27 01:12:10 bell@sanja.is.com.ua +0 -15
    removed recursion from derived tables

  sql/sql_delete.cc
    1.90 02/11/27 01:12:10 bell@sanja.is.com.ua +1 -1
    new order in global select list

ChangeSet
  1.1354.79.1 02/11/27 03:49:35 walrus@mysql.com +1 -0
  add new tests, new functions

  sql-bench/crash-me.sh
    1.36 02/11/27 03:49:30 walrus@mysql.com +228 -21
    Add tests:
    
    - If double double quotes are allowed in identifiers. 
    - Rollback rolls back meta data
    - NULL sort and NULL sort perserve. 
    - remove one check of "serial".   
    - (Column,Table,Named constraints) new test to crash me if the check syntax is 
      only supported by the parser, but not done for real.
    - For all ..USER tests, (like current_user), add an extra test if
      ...USER() is supported.                                   
    - Add tests for constants TRUE and FALSE                     
    - Add test of LIMIT # OFFSET (PostgreSQL syntax) 
    - tests of a lot of new functions

ChangeSet
  1.1346.46.21 02/11/27 03:45:25 walrus@mysql.com +2 -0
  add sapdb section into server-cfg, add a lot of new function and tests into crash-me

  sql-bench/server-cfg.sh
    1.39.1.2 02/11/27 03:45:21 walrus@mysql.com +211 -4
    add sapdb section

  sql-bench/crash-me.sh
    1.34.1.1 02/11/27 03:45:21 walrus@mysql.com +264 -20
    - If double double quotes are allowed in identifiers. 
    - Rollback rolls back meta data
    - NULL sort and NULL sort perserve. 
    - remove one check of "serial".   
    - (Column,Table,Named constraints) new test to crash me if the check syntax is 
      only supported by the parser, but not done for real.
    - For all ..USER tests, (like current_user), add an extra test if
      ...USER() is supported.                                   
    - Add tests for constants TRUE and FALSE                     
    - Add test of LIMIT # OFFSET (PostgreSQL syntax) 
    - add test a lot of new functions

ChangeSet
  1.1354.55.26 02/11/26 22:33:33 bell@sanja.is.com.ua +3 -0
  multi-delete with subselects (SCRUM)

  sql/sql_parse.cc
    1.235.16.1 02/11/26 22:33:32 bell@sanja.is.com.ua +3 -1
    multi-delete with subselects

  mysql-test/t/subselect.test
    1.26 02/11/26 22:33:32 bell@sanja.is.com.ua +15 -0
    Multi-delete with subselect test

  mysql-test/r/subselect.result
    1.26 02/11/26 22:33:32 bell@sanja.is.com.ua +27 -0
    Multi-delete with subselect test

ChangeSet
  1.1354.78.1 02/11/26 16:49:55 Sinisa@sinisa.nasamreza.org +3 -0
  A fix for a bug with derived tables within subselect 
  within derived tables within ......

  sql/sql_derived.cc
    1.17 02/11/26 16:49:52 Sinisa@sinisa.nasamreza.org +11 -7
    A fix for a bug with derived tables within subselect 
    within derived tables within ......

  mysql-test/t/derived.test
    1.9 02/11/26 16:49:52 Sinisa@sinisa.nasamreza.org +2 -1
    A fix for a bug with derived tables within subselect 
    within derived tables within ......

  mysql-test/r/derived.result
    1.9 02/11/26 16:49:52 Sinisa@sinisa.nasamreza.org +3 -0
    A fix for a bug with derived tables within subselect 
    within derived tables within ......

ChangeSet
  1.1354.76.5 02/11/26 15:33:30 serg@serg.mysql.com +1 -0
  temporary fix to make mysql.cc to compile --with-readline
  (thought it won't compile --without-readline)
  preper fix is to follow...

  client/Makefile.am
    1.28 02/11/26 15:33:27 serg@serg.mysql.com +1 -1
    temporary fix to make mysql.cc to compile --with-readline
    (thought it won't compile --without-readline)
    preper fix is to follow...

ChangeSet
  1.1354.76.4 02/11/26 14:19:39 serg@serg.mysql.com +1 -0
  typo fixed

  myisam/ft_parser.c
    1.31 02/11/26 14:19:37 serg@serg.mysql.com +3 -3
    typo fixed

ChangeSet
  1.1354.77.1 02/11/26 14:18:16 pem@mysql.com +4 -0
  Pass thd as an argument to yyparse(), getting rid of all current_thd in the parser.

  sql/sql_yacc.yy
    1.184.14.1 02/11/26 14:18:14 pem@mysql.com +33 -26
    Pass thd as an argument to yyparse(), getting rid of all current_thd in the parser.

  sql/sql_prepare.cc
    1.10 02/11/26 14:18:14 pem@mysql.com +2 -2
    Pass thd as an argument to yyparse(), getting rid of all current_thd in the parser.

  sql/sql_parse.cc
    1.235.12.16 02/11/26 14:18:14 pem@mysql.com +2 -2
    Pass thd as an argument to yyparse(), getting rid of all current_thd in the parser.

  BitKeeper/etc/ignore
    1.128 02/11/26 14:18:14 pem@mysql.com +5 -0
    Added bkpull.log.4 bkpull.log.5 bkpull.log.6 bkpush.log sql/sql_yacc.output to the ignore list

ChangeSet
  1.1354.76.3 02/11/26 14:03:25 serg@serg.mysql.com +1 -0
  mysql.cc has to support older readline to compile on FreeBSD :((

  client/mysql.cc
    1.107 02/11/26 14:03:23 serg@serg.mysql.com +9 -1
    mysql.cc has to support older readline to compile on FreeBSD :((

ChangeSet
  1.1354.76.2 02/11/26 14:01:08 serg@serg.mysql.com +21 -0
  removed redundant -I include-dirs

  vio/Makefile.am
    1.11 02/11/26 14:01:02 serg@serg.mysql.com +1 -1
    removed redundant -I include-dirs

  tools/Makefile.am
    1.11 02/11/26 14:01:02 serg@serg.mysql.com +1 -2
    removed redundant -I include-dirs

  tests/Makefile.am
    1.9 02/11/26 14:01:02 serg@serg.mysql.com +1 -3
    removed redundant -I include-dirs

  strings/Makefile.am
    1.27 02/11/26 14:01:02 serg@serg.mysql.com +1 -1
    removed redundant -I include-dirs

  sql/Makefile.am
    1.75.1.2 02/11/26 14:01:02 serg@serg.mysql.com +2 -3
    removed redundant -I include-dirs

  regex/Makefile.am
    1.8 02/11/26 14:01:02 serg@serg.mysql.com +1 -1
    removed redundant -I include-dirs

  readline/Makefile.am
    1.7 02/11/26 14:01:02 serg@serg.mysql.com +1 -1
    removed redundant -I include-dirs

  pstack/Makefile.am
    1.5 02/11/26 14:01:02 serg@serg.mysql.com +1 -1
    removed redundant -I include-dirs

  mysys/Makefile.am
    1.39 02/11/26 14:01:02 serg@serg.mysql.com +1 -1
    removed redundant -I include-dirs

  myisammrg/Makefile.am
    1.12 02/11/26 14:01:02 serg@serg.mysql.com +1 -1
    removed redundant -I include-dirs

  myisam/Makefile.am
    1.23 02/11/26 14:01:02 serg@serg.mysql.com +1 -1
    removed redundant -I include-dirs

  merge/Makefile.am
    1.8 02/11/26 14:01:02 serg@serg.mysql.com +1 -1
    removed redundant -I include-dirs

  libmysqld/Makefile.am
    1.26.1.1 02/11/26 14:01:02 serg@serg.mysql.com +2 -3
    removed redundant -I include-dirs

  libmysql_r/Makefile.am
    1.10 02/11/26 14:01:02 serg@serg.mysql.com +1 -2
    removed redundant -I include-dirs

  libmysql/Makefile.am
    1.31 02/11/26 14:01:02 serg@serg.mysql.com +1 -2
    removed redundant -I include-dirs

  isam/Makefile.am
    1.8 02/11/26 14:01:02 serg@serg.mysql.com +1 -1
    removed redundant -I include-dirs

  heap/Makefile.am
    1.8 02/11/26 14:01:02 serg@serg.mysql.com +1 -1
    removed redundant -I include-dirs

  fs/Makefile.am
    1.2 02/11/26 14:01:02 serg@serg.mysql.com +2 -5
    removed redundant -I include-dirs

  extra/Makefile.am
    1.11 02/11/26 14:01:02 serg@serg.mysql.com +1 -1
    removed redundant -I include-dirs

  dbug/Makefile.am
    1.8 02/11/26 14:01:02 serg@serg.mysql.com +1 -1
    removed redundant -I include-dirs

  client/Makefile.am
    1.27 02/11/26 14:01:01 serg@serg.mysql.com +2 -3
    removed redundant -I include-dirs

ChangeSet
  1.1346.46.20 02/11/26 11:21:35 lenz@mysql.com +1 -0
   - Updated to Marcs latest version from entropy.ch

  support-files/make_mysql_pkg.pl
    1.2 02/11/26 11:21:33 lenz@mysql.com +75 -14
    make_mysql_pkg.pl
    
     - Updated to Marcs latest version from entropy.ch

ChangeSet
  1.1354.55.24 02/11/26 01:00:05 bell@sanja.is.com.ua +4 -0
  subselects in insert/replace (SCRUM)

  sql/sql_yacc.yy
    1.184.1.14 02/11/26 01:00:03 bell@sanja.is.com.ua +7 -1
    subselects in insert/replace

  sql/sql_insert.cc
    1.73 02/11/26 01:00:03 bell@sanja.is.com.ua +22 -9
    subselects in insert/replace

  mysql-test/t/subselect.test
    1.25 02/11/26 01:00:03 bell@sanja.is.com.ua +38 -1
    test of insert/replace with subselects

  mysql-test/r/subselect.result
    1.25 02/11/26 01:00:03 bell@sanja.is.com.ua +61 -1
    test of insert/replace with subselects

ChangeSet
  1.1354.75.1 02/11/25 22:18:44 serg@serg.mysql.com +9 -0
  myisammrg::index_next_same

  sql/ha_myisammrg.h
    1.25 02/11/25 22:18:42 serg@serg.mysql.com +6 -5
    myisammrg::index_next_same

  sql/ha_myisammrg.cc
    1.39 02/11/25 22:18:42 serg@serg.mysql.com +10 -0
    myisammrg::index_next_same

  myisammrg/myrg_rnext_same.c
    1.3 02/11/25 22:18:42 serg@serg.mysql.com +15 -1
    myisammrg::index_next_same

  myisammrg/myrg_rkey.c
    1.15 02/11/25 22:18:42 serg@serg.mysql.com +2 -2
    myisammrg::index_next_same

  myisam/myisamdef.h
    1.50.1.1 02/11/25 22:18:42 serg@serg.mysql.com +5 -1
    myisammrg::index_next_same

  myisam/mi_rrnd.c
    1.5 02/11/25 22:18:42 serg@serg.mysql.com +4 -1
    myisammrg::index_next_same

  myisam/mi_rkey.c
    1.13 02/11/25 22:18:42 serg@serg.mysql.com +9 -8
    myisammrg::index_next_same

  include/myisammrg.h
    1.13 02/11/25 22:18:42 serg@serg.mysql.com +1 -0
    myisammrg::index_next_same

ChangeSet
  1.1354.55.23 02/11/25 21:27:14 bell@sanja.is.com.ua +3 -0
  subselet in delete (SCRUM)

  sql/sql_delete.cc
    1.89 02/11/25 21:27:11 bell@sanja.is.com.ua +6 -2
    subselet in delete

  mysql-test/t/subselect.test
    1.24 02/11/25 21:27:11 bell@sanja.is.com.ua +11 -0
    subselects in delete test

  mysql-test/r/subselect.result
    1.24 02/11/25 21:27:11 bell@sanja.is.com.ua +19 -0
    subselects in delete test

  myisammrg/Makefile.am
    1.11 02/11/25 19:36:26 serg@serg.mysql.com +2 -1
    myrg_rnext_same.c added

  myisammrg/myrg_rnext_same.c
    1.2 02/11/25 19:33:51 serg@serg.mysql.com +1 -5
    typo fixed. leftover comment removed

  myisammrg/myrg_rnext_same.c
    1.1 02/11/25 19:31:59 serg@serg.mysql.com +30 -0

  myisammrg/myrg_rnext_same.c
    1.0 02/11/25 19:31:59 serg@serg.mysql.com +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-4.1/myisammrg/myrg_rnext_same.c

ChangeSet
  1.1354.55.22 02/11/25 18:34:24 bell@sanja.is.com.ua +4 -0
  merging tests

  mysql-test/t/innodb-deadlock.test
    1.2 02/11/25 18:34:23 bell@sanja.is.com.ua +73 -0
    merging tests

  mysql-test/r/innodb-deadlock.result
    1.2 02/11/25 18:34:23 bell@sanja.is.com.ua +77 -0
    merging tests

  BitKeeper/deleted/.del-innodb-non-simple.result~2f77d5b0aaf5aa90
    1.2 02/11/25 18:30:04 bell@sanja.is.com.ua +0 -0
    Delete: mysql-test/r/innodb-non-simple.result

  BitKeeper/deleted/.del-innodb-non-simple.test~380a6ef42b6e15d1
    1.2 02/11/25 18:29:55 bell@sanja.is.com.ua +0 -0
    Delete: mysql-test/t/innodb-non-simple.test

ChangeSet
  1.1354.55.21 02/11/25 17:53:03 bell@sanja.is.com.ua +9 -0
  Merge

  mysql-test/t/subselect.test
    1.23 02/11/25 17:53:01 bell@sanja.is.com.ua +0 -0
    SCCS merged

  mysql-test/r/subselect.result
    1.23 02/11/25 17:53:01 bell@sanja.is.com.ua +0 -0
    SCCS merged

  sql/sql_yacc.yy
    1.184.1.13 02/11/25 17:50:13 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_update.cc
    1.65 02/11/25 17:50:13 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.173.1.16 02/11/25 17:50:13 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_parse.cc
    1.235.12.15 02/11/25 17:50:13 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_lex.cc
    1.53 02/11/25 17:50:13 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_base.cc
    1.122.1.11 02/11/25 17:50:13 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.160.6.9 02/11/25 17:50:13 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1354.55.20 02/11/25 17:34:51 monty@mashka.mysql.fi +8 -0
  Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1

  sql/sql_yacc.yy
    1.184.11.6 02/11/25 17:34:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_lex.h
    1.94.1.9 02/11/25 17:34:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_lex.cc
    1.49.4.4 02/11/25 17:34:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/opt_range.cc
    1.71 02/11/25 17:34:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.54.5.2 02/11/25 17:34:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_func.h
    1.47.1.4 02/11/25 17:34:47 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_create.cc
    1.19.1.2 02/11/25 17:34:47 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item.h
    1.34.3.4 02/11/25 17:34:47 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1354.74.3 02/11/25 17:33:51 monty@mashka.mysql.fi +5 -0
  Fixed CAST( xxx as CHAR)

  sql/sql_string.h
    1.25 02/11/25 17:33:49 monty@mashka.mysql.fi +3 -2
    Indentation cleanups

  sql/item_timefunc.h
    1.24 02/11/25 17:33:49 monty@mashka.mysql.fi +16 -3
    Fixed CAST( xxx as CHAR)

  sql/item_strfunc.h
    1.30.2.1 02/11/25 17:33:49 monty@mashka.mysql.fi +2 -1
    Fixed BINARY handling

  sql/item_strfunc.cc
    1.54.6.1 02/11/25 17:33:49 monty@mashka.mysql.fi +7 -4
    Optimizations.

  sql/item.h
    1.34.6.1 02/11/25 17:33:49 monty@mashka.mysql.fi +6 -4
    Made some virtual functions non virtual (as they are not used virtually)

ChangeSet
  1.1354.55.19 02/11/25 15:32:44 pem@mysql.com +4 -0
  Merge

  sql/sql_prepare.cc
    1.9 02/11/25 15:32:43 pem@mysql.com +0 -0
    SCCS merged

  sql/sql_lex.h
    1.94.1.8 02/11/25 15:25:08 pem@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.123.1.21 02/11/25 15:25:08 pem@mysql.com +0 -0
    Auto merged

  sql/item_func.cc
    1.84.1.4 02/11/25 15:25:08 pem@mysql.com +0 -0
    Auto merged

ChangeSet
  1.676.1.592 02/11/25 13:30:56 lenz@mysql.com +1 -0
   - fixed tabbing

  support-files/mysql.server.sh
    1.13.1.5 02/11/25 13:30:55 lenz@mysql.com +1 -1
     - fixed tabbing

ChangeSet
  1.1346.46.19 02/11/25 13:25:18 lenz@mysql.com +1 -0
  mysql.server.sh:
  
   - reverted some incompatible/non-portable modifications

  support-files/mysql.server.sh
    1.23 02/11/25 13:25:17 lenz@mysql.com +3 -3
     - reverted some incompatible/non-portable modifications

ChangeSet
  1.676.1.591 02/11/25 13:14:38 lenz@mysql.com +1 -0
  mysql.server.sh:
  
   - reverted some incompatible/non-portable modifications

  support-files/mysql.server.sh
    1.13.1.4 02/11/25 13:14:37 lenz@mysql.com +3 -3
     - reverted non-portable change ("echo -n" does not work on all platforms)
     - reverted incompatible change (better fix the docs than break existing
       installations)

ChangeSet
  1.1354.70.12 02/11/25 13:44:47 bell@sanja.is.com.ua +3 -0
  removed limit for "FOR UPDATE" and "IN SHARE MODE" (now thay allowed for non-simple selects and applyed to current select)
  fix for using subselects with update
  test of locking for non-simple queries
  (SCRUM?)

  mysql-test/t/innodb-non-simple.test
    1.1 02/11/25 13:44:45 bell@sanja.is.com.ua +76 -0

  mysql-test/r/innodb-non-simple.result
    1.1 02/11/25 13:44:45 bell@sanja.is.com.ua +76 -0

  sql/sql_yacc.yy
    1.184.1.12 02/11/25 13:44:45 bell@sanja.is.com.ua +3 -6
    removed limit for "FOR UPDATE" and "IN SHARE MODE" (now thay allowed for non-simple selects and applyed to current select)
    fix for using subselects with update

  mysql-test/t/innodb-non-simple.test
    1.0 02/11/25 13:44:45 bell@sanja.is.com.ua +0 -0
    BitKeeper file /home/bell/mysql/work-update-4.1/mysql-test/t/innodb-non-simple.test

  mysql-test/r/innodb-non-simple.result
    1.0 02/11/25 13:44:45 bell@sanja.is.com.ua +0 -0
    BitKeeper file /home/bell/mysql/work-update-4.1/mysql-test/r/innodb-non-simple.result

ChangeSet
  1.1375 02/11/25 13:34:52 peter@mysql.com +1 -0
  Merge mysql.com:/home/pz/mysql/mysql-4.1-root
  into mysql.com:/home/pz/mysql/mysql-4.1

  sql/mysql_priv.h
    1.160.1.19 02/11/25 13:34:50 peter@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1354.74.2 02/11/25 12:19:28 monty@mashka.mysql.fi +17 -0
  Merge with 4.0

  sql/item_func.h
    1.47.4.1 02/11/25 12:19:26 monty@mashka.mysql.fi +1 -2
    Merge

  sql/sql_yacc.yy
    1.184.13.2 02/11/25 12:13:49 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_update.cc
    1.61.1.7 02/11/25 12:13:49 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_insert.cc
    1.72 02/11/25 12:13:49 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_delete.cc
    1.88 02/11/25 12:13:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/opt_range.cc
    1.69.1.1 02/11/25 12:13:48 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/mysqld.cc
    1.304.2.7 02/11/25 12:13:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/lex.h
    1.78.2.4 02/11/25 12:13:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_timefunc.h
    1.23 02/11/25 12:13:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_create.cc
    1.19.2.1 02/11/25 12:13:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/handler.cc
    1.84.1.2 02/11/25 12:13:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/func_test.test
    1.11 02/11/25 12:13:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/null_key.result
    1.16 02/11/25 12:13:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/func_test.result
    1.13 02/11/25 12:13:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.152 02/11/25 12:13:48 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-mutex.m4~a13383cde18a64e1
    1.5 02/11/25 12:13:47 monty@mashka.mysql.fi +0 -0
    Auto merged

  configure.in
    1.201.1.6 02/11/25 12:13:47 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-mutex.m4~a13383cde18a64e1
    1.3.1.2 02/11/25 12:13:47 monty@mashka.mysql.fi +0 -0
    Merge rename: bdb/dist/aclocal/mutex.m4 -> BitKeeper/deleted/.del-mutex.m4~a13383cde18a64e1

ChangeSet
  1.1354.74.1 02/11/25 12:11:16 monty@mashka.mysql.fi +3 -0
  Faster parsing of identifiers
  Compatibility syntax: SERIAL, [PRIMARY] KEY and VALUE
  

  sql/sql_yacc.yy
    1.184.13.1 02/11/25 12:11:13 monty@mashka.mysql.fi +15 -2
    Added SERIAL (alias for bigint auto_increment)
    Make PRIMARY optional in field specification
    Make VALUE alias for VALUES

  sql/sql_lex.h
    1.94.3.1 02/11/25 12:11:13 monty@mashka.mysql.fi +1 -1
    Faster handling of identifiers

  sql/sql_lex.cc
    1.49.6.1 02/11/25 12:11:13 monty@mashka.mysql.fi +32 -22
    Faster handling of identifiers

ChangeSet
  1.1346.46.18 02/11/25 10:03:55 lenz@mysql.com +1 -0
  Merge lgrimmer@work.mysql.com:/home/bk/mysql-4.0
  into mysql.com:/space/my/mysql-4.0

  support-files/mysql.server.sh
    1.22 02/11/25 10:03:50 lenz@mysql.com +0 -4
    Auto merged

ChangeSet
  1.1354.73.1 02/11/25 10:58:49 bell@sanja.is.com.ua +3 -0
  fixed bug of subselect in derived tables

  sql/item.cc
    1.27.6.5 02/11/25 10:58:48 bell@sanja.is.com.ua +4 -1
    fixed bug of subselect in derived tables

  mysql-test/t/subselect.test
    1.19.3.16 02/11/25 10:58:48 bell@sanja.is.com.ua +2 -0
    test of subselect in derived table

  mysql-test/r/subselect.result
    1.20.4.10 02/11/25 10:58:48 bell@sanja.is.com.ua +2 -0
    test of subselect in derived table

ChangeSet
  1.1354.55.16 02/11/25 12:54:55 vva@genie.(none) +1 -0
  add define of __attribute__ for readline

  readline/rldefs.h
    1.4 02/11/25 12:54:50 vva@genie.(none) +4 -0
    add define of __attribute__ for readline

ChangeSet
  1.1354.65.12 02/11/25 12:15:34 ram@mysql.r18.ru +1 -0
  Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
  into mysql.r18.ru:/usr/home/ram/mysql-4.1.monty1

  sql/opt_range.cc
    1.70 02/11/25 12:15:24 ram@mysql.r18.ru +0 -0
    Auto merged

ChangeSet
  1.1354.65.11 02/11/25 01:38:56 bell@sanja.is.com.ua +5 -0
  supported possiblity of item substitute (fixed bug) in setup_fields
  more efficient reference creation
  fixed table_name of Field in temporary table

  sql/sql_base.cc
    1.122.9.7 02/11/25 01:38:55 bell@sanja.is.com.ua +3 -2
    fixed layout
    supported possiblity of item substitute (fixed bug)

  sql/item.cc
    1.27.6.4 02/11/25 01:38:55 bell@sanja.is.com.ua +1 -1
    more efficient reference creation

  sql/field.h
    1.46.1.8 02/11/25 01:38:55 bell@sanja.is.com.ua +5 -3
    fixed layout
    fixed table name of fields of temporary table (derived table)

  mysql-test/t/subselect.test
    1.19.3.15 02/11/25 01:38:55 bell@sanja.is.com.ua +5 -0
    test of 2 references bugs

  mysql-test/r/subselect.result
    1.20.4.9 02/11/25 01:38:54 bell@sanja.is.com.ua +9 -0
    test of 2 references bugs

ChangeSet
  1.1346.46.17 02/11/24 21:44:25 monty@mashka.mysql.fi +1 -0
  Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0

  sql/opt_range.cc
    1.54.1.16 02/11/24 21:44:23 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.46.16 02/11/24 21:39:22 monty@mashka.mysql.fi +3 -0
  Updated results after merge from 3.23

  mysql-test/t/innodb-deadlock.test
    1.1 02/11/24 21:39:20 monty@mashka.mysql.fi +38 -0

  mysql-test/r/innodb-deadlock.result
    1.1 02/11/24 21:39:20 monty@mashka.mysql.fi +20 -0

  mysql-test/t/innodb-deadlock.test
    1.0 02/11/24 21:39:20 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysql-test/t/innodb-deadlock.test

  mysql-test/r/null_key.result
    1.10.1.5 02/11/24 21:39:20 monty@mashka.mysql.fi +16 -0
    Updated results after merge from 3.23

  mysql-test/r/innodb-deadlock.result
    1.0 02/11/24 21:39:20 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysql-test/r/innodb-deadlock.result

ChangeSet
  1.1354.65.10 02/11/24 21:10:52 bell@sanja.is.com.ua +7 -0
  Reference to field in outer subelect fixed
  Fixed context in error mesages

  sql/sql_lex.h
    1.94.2.1 02/11/24 21:10:51 bell@sanja.is.com.ua +1 -0
    allow access to thd field

  sql/sql_base.cc
    1.122.9.6 02/11/24 21:10:51 bell@sanja.is.com.ua +1 -1
    changed function interface to allow resolving field names inside Item_ref::fix_fields

  sql/mysql_priv.h
    1.160.11.7 02/11/24 21:10:51 bell@sanja.is.com.ua +1 -1
    changed function interface to allow resolving field names inside Item_ref::fix_fields

  sql/item_subselect.cc
    1.20.3.2 02/11/24 21:10:51 bell@sanja.is.com.ua +13 -1
    saving/restoring context for error messages

  sql/item.cc
    1.27.6.3 02/11/24 21:10:51 bell@sanja.is.com.ua +21 -5
    Fixed layout
    Resolving field names of outer select

  mysql-test/t/subselect.test
    1.19.3.14 02/11/24 21:10:51 bell@sanja.is.com.ua +4 -0
    tests of references and error message

  mysql-test/r/subselect.result
    1.20.4.8 02/11/24 21:10:50 bell@sanja.is.com.ua +10 -0
    tests of references and error message

ChangeSet
  1.1354.65.9 02/11/24 17:41:34 bell@sanja.is.com.ua +6 -0
  fixed removed by previos patch thd->allow_sum_func "side effect" of setup_conds
  renamed tables to prevent droping real tables

  sql/sql_select.cc
    1.173.14.3 02/11/24 17:41:33 bell@sanja.is.com.ua +22 -4
    fixed removed by previos patch thd->allow_sum_func "side effect" of setup_conds

  sql/sql_base.cc
    1.122.9.5 02/11/24 17:41:33 bell@sanja.is.com.ua +0 -3
    moved thd->allow_sum_func assignment to upper level

  mysql-test/t/subselect.test
    1.19.3.13 02/11/24 17:41:33 bell@sanja.is.com.ua +62 -61
    renamed tables to prevent droping real tables

  mysql-test/t/group_by.test
    1.14 02/11/24 17:41:33 bell@sanja.is.com.ua +2 -0
    test of error message

  mysql-test/r/subselect.result
    1.20.4.7 02/11/24 17:41:33 bell@sanja.is.com.ua +65 -69
    renamed tables to prevent droping real tables

  mysql-test/r/group_by.result
    1.19 02/11/24 17:41:33 bell@sanja.is.com.ua +2 -0
    test of error message

ChangeSet
  1.1346.46.15 02/11/24 16:37:41 monty@mashka.mysql.fi +12 -0
  merge with 3.23 to get bugfixes for <=> NULL and --bind-address

  support-files/mysql.server.sh
    1.20.1.1 02/11/24 16:37:39 monty@mashka.mysql.fi +4 -27
    Don't apply changes from 3.23

  sql/opt_range.cc
    1.54.3.1 02/11/24 16:37:39 monty@mashka.mysql.fi +0 -0
    merge

  sql/mysqld.cc
    1.297.1.78 02/11/24 16:37:39 monty@mashka.mysql.fi +2 -7
    merge

  scripts/mysqld_safe.sh
    1.51 02/11/24 16:37:39 monty@mashka.mysql.fi +0 -8
    Don't apply NICE handling change from 3.23

  mysql-test/r/null_key.result
    1.10.1.4 02/11/24 16:37:39 monty@mashka.mysql.fi +1 -1
    Update results

  mysql-test/r/func_time.result
    1.17 02/11/24 16:37:39 monty@mashka.mysql.fi +0 -5
    Update results

  mysql-test/mysql-test-run.sh
    1.146.1.7 02/11/24 16:37:39 monty@mashka.mysql.fi +0 -2
    Ignore changes from 3.23

ChangeSet
  1.1374 02/11/24 17:35:24 peter@mysql.com +6 -0
  Merge mysql.com:/home/pz/mysql/mysql-4.1-root
  into mysql.com:/home/pz/mysql/mysql-4.1

  sql/sql_class.h
    1.123.5.2 02/11/24 17:35:21 peter@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.160.1.18 02/11/24 17:35:21 peter@mysql.com +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.54.1.16 02/11/24 17:35:21 peter@mysql.com +0 -0
    Auto merged

  libmysql/libmysql.c
    1.108 02/11/24 17:35:21 peter@mysql.com +0 -0
    Auto merged

  include/mysql_com.h
    1.54 02/11/24 17:35:21 peter@mysql.com +0 -0
    Auto merged

  include/mysql.h
    1.43.1.8 02/11/24 17:35:21 peter@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1373 02/11/24 17:26:26 peter@mysql.com +16 -0
  Merge....

  sql/mysqld.cc
    1.311 02/11/24 17:26:24 peter@mysql.com +1 -2
    Manual merge

  sql/sql_yacc.yy
    1.196 02/11/24 17:23:33 peter@mysql.com +0 -0
    Auto merged

  sql/sql_parse.cc
    1.235.1.27 02/11/24 17:23:33 peter@mysql.com +0 -0
    Auto merged

  sql/sql_class.h
    1.123.7.1 02/11/24 17:23:33 peter@mysql.com +0 -0
    Auto merged

  sql/sql_acl.h
    1.15 02/11/24 17:23:33 peter@mysql.com +0 -0
    Auto merged

  sql/sql_acl.cc
    1.55.1.9 02/11/24 17:23:33 peter@mysql.com +0 -0
    Auto merged

  libmysql/password.c
    1.7 02/11/24 17:23:32 peter@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.160.1.17 02/11/24 17:23:32 peter@mysql.com +0 -0
    Auto merged

  sql/mini_client.cc
    1.52 02/11/24 17:23:32 peter@mysql.com +0 -0
    Auto merged

  sql/lex.h
    1.81 02/11/24 17:23:32 peter@mysql.com +0 -0
    Auto merged

  sql/item_strfunc.h
    1.35 02/11/24 17:23:32 peter@mysql.com +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.54.1.15 02/11/24 17:23:32 peter@mysql.com +0 -0
    Auto merged

  libmysql/password.c
    1.5.1.2 02/11/24 17:23:32 peter@mysql.com +0 -191
    Merge file types: FILE -> SYMLINK

  scripts/mysqld_safe.sh
    1.39.6.3 02/11/24 16:22:39 monty@mashka.mysql.fi +0 -0
    Merge rename: scripts/safe_mysqld.sh -> scripts/mysqld_safe.sh

  mysql-test/t/null_key.test
    1.6 02/11/24 16:22:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/func_time.test
    1.14 02/11/24 16:22:39 monty@mashka.mysql.fi +0 -17
    Auto merged

  mysql-test/t/func_test.test
    1.9.1.1 02/11/24 16:22:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/func_test.result
    1.11.1.1 02/11/24 16:22:39 monty@mashka.mysql.fi +0 -0
    Auto merged

  Build-tools/Do-compile
    1.68 02/11/24 16:22:39 monty@mashka.mysql.fi +0 -9
    Auto merged

  libmysql/libmysql.c
    1.105.1.1 02/11/24 17:22:06 peter@mysql.com +0 -0
    Auto merged

  include/mysql.h
    1.43.3.1 02/11/24 17:22:06 peter@mysql.com +0 -0
    Auto merged

  client/mysqladmin.c
    1.70 02/11/24 17:22:06 peter@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.212.1.15 02/11/24 17:21:50 peter@mysql.com +0 -0
    auto-union

ChangeSet
  1.676.1.590 02/11/24 16:20:41 monty@mashka.mysql.fi +1 -0
  Rewrote nice handling to make more portable

  scripts/safe_mysqld.sh
    1.39.6.2 02/11/24 16:20:40 monty@mashka.mysql.fi +8 -3
    Rewrote nice handling to make more portable

ChangeSet
  1.1372 02/11/24 17:07:53 peter@mysql.com +17 -0
  SCRUM: Main change for Secure connection handling. Still needs some more coding. Commit
  done for merge with newer version of code.

  sql/sql_yacc.yy
    1.195 02/11/24 17:07:51 peter@mysql.com +2 -2
    Adjustment for new prototypes

  sql/sql_parse.cc
    1.235.1.26 02/11/24 17:07:51 peter@mysql.com +109 -29
    Handling server side of new authentication

  sql/sql_class.h
    1.123.6.1 02/11/24 17:07:51 peter@mysql.com +1 -1
    Extend scramble length

  sql/sql_acl.h
    1.13.1.1 02/11/24 17:07:50 peter@mysql.com +1 -1
    Change prototype

  sql/sql_acl.cc
    1.55.1.8 02/11/24 17:07:50 peter@mysql.com +146 -134
    Password handling function adjustment

  sql/password.c
    1.11 02/11/24 17:07:50 peter@mysql.com +493 -46
    A lot of changes to handle new authentication and doccumentation

  sql/mysqld.cc
    1.310 02/11/24 17:07:50 peter@mysql.com +0 -1
    Remove unneeded flag (was added earlier for same change)

  sql/mini_client.cc
    1.50.1.1 02/11/24 17:07:50 peter@mysql.com +83 -7
    Change MiniClient to handle new auth in replication

  sql/item_strfunc.cc
    1.54.1.14 02/11/24 17:07:50 peter@mysql.com +2 -2
    New password generation function needs seed for password generation

  scripts/mysql_install_db.sh
    1.37 02/11/24 17:07:50 peter@mysql.com +1 -1
    Longer passwords 

  scripts/mysql_fix_privilege_tables.sh
    1.10 02/11/24 17:07:50 peter@mysql.com +1 -0
    Increase password length at priv table convertion

  mysql-test/t/rpl000017-slave.sh
    1.10 02/11/24 17:07:50 peter@mysql.com +1 -1
    Adjust test to work with longer password

  mysql-test/install_test_db.sh
    1.24 02/11/24 17:07:50 peter@mysql.com +1 -1
    Extend password length to handle new passwords

  libmysql/libmysql.c
    1.102.1.1 02/11/24 17:07:50 peter@mysql.com +83 -9
    New handshake handling code 

  include/mysql_com.h
    1.53 02/11/24 17:07:50 peter@mysql.com +8 -1
    Add new prototypes for new auth handling

  include/mysql.h
    1.43.2.1 02/11/24 17:07:50 peter@mysql.com +1 -1
    Increase buffer as new scramble is larger

  client/mysqladmin.c
    1.69 02/11/24 17:07:50 peter@mysql.com +15 -7
    Support for new password format 

ChangeSet
  1.1346.46.14 02/11/24 15:47:19 monty@mashka.mysql.fi +13 -0
  Added new ANSI functions LOCALTIME, LOCALTIMESTAMP and CURRENT_USER
  Added CEIL as an alias for CEILING
  Cleaned up CHECK constraint handling.
  (We don't anymore require braces after CHECK)
  Added casting to CHAR.

  mysql-test/t/constraints.test
    1.1 02/11/24 15:47:17 monty@mashka.mysql.fi +21 -0

  mysql-test/t/cast.test
    1.1 02/11/24 15:47:17 monty@mashka.mysql.fi +22 -0

  mysql-test/r/constraints.result
    1.1 02/11/24 15:47:17 monty@mashka.mysql.fi +16 -0

  mysql-test/t/constraints.test
    1.0 02/11/24 15:47:17 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysql-test/t/constraints.test

  mysql-test/t/cast.test
    1.0 02/11/24 15:47:17 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysql-test/t/cast.test

  mysql-test/r/constraints.result
    1.0 02/11/24 15:47:17 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysql-test/r/constraints.result

  mysql-test/r/cast.result
    1.1 02/11/24 15:47:16 monty@mashka.mysql.fi +39 -0

  sql/sql_yacc.yy
    1.145.1.46 02/11/24 15:47:16 monty@mashka.mysql.fi +13 -6
    Cleaned up CHECK constraint handling.

  sql/lex.h
    1.66.1.18 02/11/24 15:47:16 monty@mashka.mysql.fi +4 -0
    Added new ANSI functions LOCALTIME, LOCALTIMESTAMP and CURRENT_USER
    Added CEIL as an alias for CEILING

  sql/item_timefunc.h
    1.13.1.7 02/11/24 15:47:16 monty@mashka.mysql.fi +13 -0
    Added casting to CHAR

  sql/item_func.h
    1.39.1.15 02/11/24 15:47:16 monty@mashka.mysql.fi +1 -1
    Added casting to CHAR

  sql/item_create.cc
    1.15.1.7 02/11/24 15:47:16 monty@mashka.mysql.fi +1 -0
    Added casting to CHAR

  mysql-test/t/func_time.test
    1.13 02/11/24 15:47:16 monty@mashka.mysql.fi +2 -0
    Test of new functions

  mysql-test/t/bigint.test
    1.12 02/11/24 15:47:16 monty@mashka.mysql.fi +0 -8
    Moved casting test to cast.test

  mysql-test/r/func_time.result
    1.16 02/11/24 15:47:16 monty@mashka.mysql.fi +6 -0
    Test of new functions

  mysql-test/r/cast.result
    1.0 02/11/24 15:47:16 monty@mashka.mysql.fi +0 -0
    BitKeeper file /home/my/mysql-4.0/mysql-test/r/cast.result

  mysql-test/r/bigint.result
    1.14 02/11/24 15:47:16 monty@mashka.mysql.fi +0 -21
    Moved casting test to cast.test

ChangeSet
  1.1354.65.8 02/11/24 11:18:32 bell@sanja.is.com.ua +3 -0
  fix of selfreference bug

  sql/item.h
    1.34.3.3 02/11/24 11:18:31 bell@sanja.is.com.ua +2 -2
    fix of selfreference bug

  mysql-test/t/subselect.test
    1.19.3.12 02/11/24 11:18:31 bell@sanja.is.com.ua +2 -0
    test of selfreference

  mysql-test/r/subselect.result
    1.20.4.6 02/11/24 11:18:31 bell@sanja.is.com.ua +2 -0
    test of selfreference

ChangeSet
  1.1354.70.11 02/11/23 23:21:49 bell@sanja.is.com.ua +2 -0
  revert open_ltable changing

  sql/sql_base.cc
    1.122.1.10 02/11/23 23:21:47 bell@sanja.is.com.ua +5 -12
    revert open_ltable changing

  sql/mysql_priv.h
    1.160.6.8 02/11/23 23:21:47 bell@sanja.is.com.ua +1 -2
    revert open_ltable changing

ChangeSet
  1.1354.65.7 02/11/23 22:11:53 bell@sanja.is.com.ua +22 -0
  error messages fix

  sql/share/ukrainian/errmsg.txt
    1.19.1.4 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

  sql/share/swedish/errmsg.txt
    1.56.1.4 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

  sql/share/spanish/errmsg.txt
    1.56.1.4 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

  sql/share/slovak/errmsg.txt
    1.56.1.4 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

  sql/share/serbian/errmsg.txt
    1.10.1.3 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

  sql/share/russian/errmsg.txt
    1.53.1.4 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

  sql/share/portuguese/errmsg.txt
    1.56.1.4 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

  sql/share/polish/errmsg.txt
    1.55.1.4 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

  sql/share/norwegian/errmsg.txt
    1.55.1.4 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

  sql/share/norwegian-ny/errmsg.txt
    1.55.1.4 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

  sql/share/korean/errmsg.txt
    1.55.1.4 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

  sql/share/japanese/errmsg.txt
    1.55.1.4 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

  sql/share/italian/errmsg.txt
    1.61.1.4 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

  sql/share/hungarian/errmsg.txt
    1.57.1.4 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

  sql/share/greek/errmsg.txt
    1.56.1.4 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

  sql/share/german/errmsg.txt
    1.55.1.4 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

  sql/share/french/errmsg.txt
    1.55.1.4 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

  sql/share/estonian/errmsg.txt
    1.56.1.4 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

  sql/share/english/errmsg.txt
    1.61.1.4 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

  sql/share/dutch/errmsg.txt
    1.58.1.4 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

  sql/share/danish/errmsg.txt
    1.54.1.4 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

  sql/share/czech/errmsg.txt
    1.56.1.4 02/11/23 22:11:51 bell@sanja.is.com.ua +1 -1
    error messages fix

ChangeSet
  1.1354.65.6 02/11/23 21:55:39 bell@sanja.is.com.ua +3 -0
  fixed bug with thd->allow_sum_func value in subselect

  sql/sql_base.cc
    1.122.9.4 02/11/23 21:55:37 bell@sanja.is.com.ua +5 -2
    fixed bug with thd->allow_sum_func value in subselect

  mysql-test/t/subselect.test
    1.19.3.11 02/11/23 21:55:37 bell@sanja.is.com.ua +1 -0
    test of sum function with subselect

  mysql-test/r/subselect.result
    1.20.4.5 02/11/23 21:55:37 bell@sanja.is.com.ua +3 -0
    test of sum function with subselect

ChangeSet
  1.1354.70.10 02/11/23 20:40:16 bell@sanja.is.com.ua +4 -0
  after merging fix (update SCRUM?)

  sql/sql_yacc.yy
    1.184.1.11 02/11/23 20:40:13 bell@sanja.is.com.ua +1 -1
    after merging fix

  sql/sql_update.cc
    1.64 02/11/23 20:40:13 bell@sanja.is.com.ua +0 -1
    after merging fix

  sql/sql_lex.cc
    1.52 02/11/23 20:40:12 bell@sanja.is.com.ua +1 -1
    after merging fix

  mysql-test/t/subselect.test
    1.22 02/11/23 20:40:12 bell@sanja.is.com.ua +1 -1
    after merging fix

ChangeSet
  1.1354.65.5 02/11/23 20:32:02 bell@sanja.is.com.ua +28 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1

  sql/share/ukrainian/errmsg.txt
    1.19.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/swedish/errmsg.txt
    1.56.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/spanish/errmsg.txt
    1.56.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/slovak/errmsg.txt
    1.56.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/russian/errmsg.txt
    1.53.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/romanian/errmsg.txt
    1.54.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/portuguese/errmsg.txt
    1.56.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.55.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/norwegian/errmsg.txt
    1.55.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/norwegian-ny/errmsg.txt
    1.55.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/korean/errmsg.txt
    1.55.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/japanese/errmsg.txt
    1.55.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/italian/errmsg.txt
    1.61.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/hungarian/errmsg.txt
    1.57.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/greek/errmsg.txt
    1.56.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/german/errmsg.txt
    1.55.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/french/errmsg.txt
    1.55.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/estonian/errmsg.txt
    1.56.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.61.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/dutch/errmsg.txt
    1.58.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/danish/errmsg.txt
    1.54.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/share/czech/errmsg.txt
    1.56.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.h
    1.47.1.3 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.84.4.1 02/11/23 20:31:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.35.3.2 02/11/23 20:31:58 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.h
    1.34.3.2 02/11/23 20:31:58 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item.cc
    1.27.6.2 02/11/23 20:31:58 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.20.4.4 02/11/23 20:31:58 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1354.70.9 02/11/23 19:20:04 bell@sanja.is.com.ua +8 -0
  merging

  sql/sql_update.cc
    1.63 02/11/23 19:20:03 bell@sanja.is.com.ua +3 -4
    merging

  sql/sql_lex.cc
    1.51 02/11/23 19:20:03 bell@sanja.is.com.ua +0 -2
    merging

  sql/sql_base.cc
    1.122.1.9 02/11/23 19:20:03 bell@sanja.is.com.ua +0 -0
    merging

  mysql-test/t/subselect.test
    1.21 02/11/23 19:20:03 bell@sanja.is.com.ua +0 -1
    merging

  mysql-test/r/subselect.result
    1.22 02/11/23 19:20:03 bell@sanja.is.com.ua +0 -0
    merging

  sql/sql_yacc.yy
    1.184.1.10 02/11/23 19:04:05 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_select.cc
    1.173.1.15 02/11/23 19:04:05 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/mysql_priv.h
    1.160.6.7 02/11/23 19:04:05 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1354.72.1 02/11/23 18:54:15 bell@sanja.is.com.ua +3 -0
  lock option in table list

  sql/sql_yacc.yy
    1.184.12.1 02/11/23 18:54:09 bell@sanja.is.com.ua +9 -4
    lock option in table list

  sql/sql_parse.cc
    1.235.15.1 02/11/23 18:54:09 bell@sanja.is.com.ua +1 -23
    lock option in table list

  sql/sql_lex.cc
    1.49.5.1 02/11/23 18:54:09 bell@sanja.is.com.ua +4 -1
    note about methods location

ChangeSet
  1.1346.53.5 02/11/23 18:41:26 Sinisa@sinisa.nasamreza.org +1 -0
  FreeBSD patch by Jeremy Zawodny.
  
  His explanation:
  
   The socket on which MySQL listens for new connections on a blocking
    socket most of the time but is set to non-blocking during the
    accept() of the new connection.  Due to a bug in the kernel, the new
    socket returned by accept() is a blocking socket but returns the
    O_NONBLOCK flag when queried via fcntl(F_GETFL).  That is, the file
    descriptor and the underlying socket don't agree on the blocking
    mode.
  
    Since MySQL determines via fcntl(F_GETFL) that the socket is
    non-blocking, it expects the first read() in my_real_read to not
    block, so it doesn't enable the timeout alarm.  However, the read
    does block, and thus there's no timeout alarm.  The thread kill
    (which relies on rescheduling the timeout alarm) also does not work
    as a consequence.
  
  The bug shows itself if you build MySQL with LinuxThreads support
  (needed for SMP on FreeBSD).  Issuing a KILL command in MySQL won't be
  "noticed" by the "killed" thread until it runs another query--that
  makes KILL pretty useless.  And the wait_timeout doesn't work either.

  vio/vio.c
    1.13.1.1 02/11/23 18:41:23 Sinisa@sinisa.nasamreza.org +3 -0
    FreeBSD patch by Jeremy Zawodny

ChangeSet
  1.1346.53.3 02/11/23 15:49:12 Sinisa@sinisa.nasamreza.org +2 -0
  reverting a test that belongs to 3.23

  mysql-test/t/delete.test
    1.7 02/11/23 15:49:09 Sinisa@sinisa.nasamreza.org +0 -5
    reverting a test that belongs to 3.23

  mysql-test/r/delete.result
    1.6 02/11/23 15:49:09 Sinisa@sinisa.nasamreza.org +0 -6
    reverting a test that belongs to 3.23

ChangeSet
  1.1354.70.7 02/11/22 18:30:55 venu@myvenu.com +2 -0
  client_test.c:
    Modification to new API test
  sql_prepare.cc:
    Fix for lock_types

  tests/client_test.c
    1.4 02/11/22 18:27:07 venu@myvenu.com +686 -646
    Modification to new API test

  sql/sql_prepare.cc
    1.7.1.2 02/11/22 18:26:13 venu@myvenu.com +14 -21
    Fix for lock_types

ChangeSet
  1.1354.70.6 02/11/22 11:58:20 venu@myvenu.com +2 -0
  Missed include/ files
  

  include/mysql.h
    1.43.1.7 02/11/22 11:57:58 venu@myvenu.com +9 -4

  include/mysql_com.h
    1.46.2.1 02/11/22 11:57:56 venu@myvenu.com +1 -0

ChangeSet
  1.1354.70.5 02/11/22 10:52:52 venu@myvenu.com +1 -0
  libmysql.c:
    fix merge conflict

  libmysql/libmysql.c
    1.107 02/11/22 10:42:44 venu@myvenu.com +2 -5
    fix merge conflict

ChangeSet
  1.1354.70.4 02/11/22 10:21:29 venu@myvenu.com +1 -0
  merge

  libmysql/libmysql.c
    1.106 02/11/22 10:21:27 venu@myvenu.com +4 -2
    merge .

ChangeSet
  1.1354.70.3 02/11/22 10:20:14 venu@myvenu.com +5 -0
  protocol merge

  sql/sql_error.cc
    1.4 02/11/22 10:09:05 venu@myvenu.com +0 -0
    Auto merged

  sql/sql_class.h
    1.123.5.1 02/11/22 10:09:04 venu@myvenu.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.160.11.6 02/11/22 10:09:04 venu@myvenu.com +0 -0
    Auto merged

  sql/item.h
    1.34.4.2 02/11/22 10:09:04 venu@myvenu.com +0 -0
    Auto merged

  libmysql/errmsg.c
    1.18 02/11/22 10:09:04 venu@myvenu.com +0 -0
    Auto merged

ChangeSet
  1.1354.71.1 02/11/22 10:04:42 venu@myvenu.com +9 -0
  protocol fixups

  sql/sql_prepare.cc
    1.7.1.1 02/11/22 10:02:48 venu@myvenu.com +173 -146

  sql/sql_error.cc
    1.2.1.1 02/11/22 10:02:46 venu@myvenu.com +1 -1

  sql/sql_class.h
    1.123.4.1 02/11/22 10:02:46 venu@myvenu.com +1 -2

  sql/mysql_priv.h
    1.160.12.1 02/11/22 10:02:44 venu@myvenu.com +1 -1

  sql/item.h
    1.34.5.1 02/11/22 10:02:43 venu@myvenu.com +7 -6

  sql/item.cc
    1.27.7.1 02/11/22 10:02:42 venu@myvenu.com +6 -11

  libmysql/libmysql.def
    1.9 02/11/22 10:02:38 venu@myvenu.com +18 -2

  libmysql/libmysql.c
    1.103.1.1 02/11/22 10:02:37 venu@myvenu.com +189 -102

  libmysql/errmsg.c
    1.16.1.1 02/11/22 10:02:34 venu@myvenu.com +3 -3

ChangeSet
  1.1346.54.5 02/11/22 18:37:00 lenz@mysql.com +1 -0
  mysql.server:
  
   - fixed some typos and wording (merged from 3.23 tree)
   - fixed parsing the correct section in /etc/my.cnf ([mysql_server] ->
     [mysql.server]) as documented in the manual

  support-files/mysql.server.sh
    1.21 02/11/22 18:36:58 lenz@mysql.com +7 -7
     - fixed some typos and wording (merged from 3.23 tree)
     - fixed parsing the correct section in /etc/my.cnf ([mysql_server] ->
       [mysql.server]) as documented in the manual

ChangeSet
  1.676.1.589 02/11/22 18:26:45 lenz@mysql.com +2 -0
  scripts/safe_mysqld.sh
       - fix setting of niceness level
  
  support-files/mysql.server.sh
       - applied some fixes from 4.0 mysql.server script
       - fix my.cnf parsing

  support-files/mysql.server.sh
    1.13.1.3 02/11/22 18:26:44 lenz@mysql.com +27 -13
     - applied some fixes from 4.0 mysql.server script
     - fix to actually parse the documented section ([mysql.server] not
       [mysql_server]) in my.cnf on startup

  scripts/safe_mysqld.sh
    1.39.6.1 02/11/22 18:26:44 lenz@mysql.com +1 -1
     - fix setting of niceness level, if one adds "renice -20 $$" to safe_mysqld
       as hinted in the manual (which could result in NOHUP_NICENESS having a
       value of "-15" and hence there would be one dash too much)

ChangeSet
  1.1354.70.2 02/11/22 16:04:24 serg@serg.mysql.com +1 -0
  bdb build process requires s_test

  bdb/dist/s_all
    1.6 02/11/22 16:04:21 serg@serg.mysql.com +1 -1
    bdb build process requires s_test

ChangeSet
  1.1354.55.15 02/11/22 18:35:58 vva@genie.(none) +11 -0
  correct some warnings with const char*

  readline/tilde.c
    1.6 02/11/22 18:35:53 vva@genie.(none) +1 -1
    correct some warnings with const char*

  readline/text.c
    1.2 02/11/22 18:35:53 vva@genie.(none) +2 -2
    correct some warnings with const char*

  readline/terminal.c
    1.6 02/11/22 18:35:53 vva@genie.(none) +39 -38
    correct some warnings with const char*

  readline/tcap.h
    1.4 02/11/22 18:35:53 vva@genie.(none) +1 -1
    correct some warnings with const char*

  readline/rlprivate.h
    1.2 02/11/22 18:35:53 vva@genie.(none) +11 -11
    correct some warnings with const char*

  readline/readline.h
    1.6 02/11/22 18:35:53 vva@genie.(none) +2 -2
    correct some warnings with const char*

  readline/isearch.c
    1.6 02/11/22 18:35:53 vva@genie.(none) +2 -2
    correct some warnings with const char*

  readline/history.h
    1.6 02/11/22 18:35:53 vva@genie.(none) +2 -2
    correct some warnings with const char*

  readline/histexpand.c
    1.7 02/11/22 18:35:53 vva@genie.(none) +2 -2
    correct some warnings with const char*

  readline/display.c
    1.8 02/11/22 18:35:53 vva@genie.(none) +6 -5
    correct some warnings with const char*

  readline/bind.c
    1.9 02/11/22 18:35:53 vva@genie.(none) +4 -4
    correct some warnings with const char*

ChangeSet
  1.1354.70.1 02/11/22 15:22:22 serg@serg.mysql.com +62 -0
  autogenerated files removed
  scripts we don't need commented out
  s_dir script for creating directories bdb build process requires

  bdb/dist/s_all
    1.5 02/11/22 15:22:19 serg@serg.mysql.com +5 -18
    move mkdir stuff to a separate file
    comment out scripts we don't need

  bdb/dist/s_dir
    1.1 02/11/22 15:19:00 serg@serg.mysql.com +42 -0

  bdb/dist/s_dir
    1.0 02/11/22 15:19:00 serg@serg.mysql.com +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-4.1/bdb/dist/s_dir

  BitKeeper/deleted/.del-dbdemo.wpj~c8d2fa5d14674437
    1.2 02/11/22 15:07:47 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/dbdemo/dbdemo.wpj

  BitKeeper/deleted/.del-dbdemo.c~e754acbbacde488
    1.2 02/11/22 15:07:47 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/dbdemo/dbdemo.c

  BitKeeper/deleted/.del-db_verify.wpj~1fa472e1eeecb396
    1.2 02/11/22 15:07:47 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_verify/db_verify.wpj

  BitKeeper/deleted/.del-db_verify.c~1b3e9cc5c17323eb
    1.2 02/11/22 15:07:47 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_verify/db_verify.c

  BitKeeper/deleted/.del-component.wpj~b4f7a191ebb2b1e7
    1.2 02/11/22 15:07:47 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/dbdemo/dbdemo/component.wpj

  BitKeeper/deleted/.del-component.wpj~94039e6651ac117
    1.2 02/11/22 15:07:47 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_upgrade/db_upgrade/component.wpj

  BitKeeper/deleted/.del-component.wpj~33b7238376fc4675
    1.2 02/11/22 15:07:47 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_verify/db_verify/component.wpj

  BitKeeper/deleted/.del-component.cdf~7949208c42787c23
    1.2 02/11/22 15:07:47 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_verify/db_verify/component.cdf

  BitKeeper/deleted/.del-component.cdf~4e48fb1399b97382
    1.2 02/11/22 15:07:47 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/dbdemo/dbdemo/component.cdf

  BitKeeper/deleted/.del-Makefile.custom~a1a4e96924c2bc16
    1.2 02/11/22 15:07:47 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/dbdemo/dbdemo/Makefile.custom

  BitKeeper/deleted/.del-Makefile.custom~885ead3079a0a779
    1.2 02/11/22 15:07:47 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_verify/db_verify/Makefile.custom

  BitKeeper/deleted/.del-db_upgrade.wpj~d36d961b31f59dda
    1.2 02/11/22 15:07:46 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_upgrade/db_upgrade.wpj

  BitKeeper/deleted/.del-db_upgrade.c~e7cda8f222da34a7
    1.2 02/11/22 15:07:46 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_upgrade/db_upgrade.c

  BitKeeper/deleted/.del-db_stat.wpj~77f17910b9a94f85
    1.2 02/11/22 15:07:46 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_stat/db_stat.wpj

  BitKeeper/deleted/.del-db_stat.c~4dcfe3213db403f7
    1.2 02/11/22 15:07:46 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_stat/db_stat.c

  BitKeeper/deleted/.del-db_recover.wpj~8ad42e5de67901e2
    1.2 02/11/22 15:07:46 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_recover/db_recover.wpj

  BitKeeper/deleted/.del-db_recover.c~91a305ab726bdd8
    1.2 02/11/22 15:07:46 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_recover/db_recover.c

  BitKeeper/deleted/.del-db_printlog.wpj~a3d309da1bcfd90d
    1.2 02/11/22 15:07:46 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_printlog/db_printlog.wpj

  BitKeeper/deleted/.del-db_printlog.c~577c296df84c5d5e
    1.2 02/11/22 15:07:46 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_printlog/db_printlog.c

  BitKeeper/deleted/.del-component.wpj~b569f98cbb9764e4
    1.2 02/11/22 15:07:46 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_stat/db_stat/component.wpj

  BitKeeper/deleted/.del-component.wpj~ab56c607b6f675f0
    1.2 02/11/22 15:07:46 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_printlog/db_printlog/component.wpj

  BitKeeper/deleted/.del-component.wpj~65b35a15fb66fbf4
    1.2 02/11/22 15:07:46 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_recover/db_recover/component.wpj

  BitKeeper/deleted/.del-component.wpj~2b0236f9e7d93c0e
    1.2 02/11/22 15:07:46 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_load/db_load/component.wpj

  BitKeeper/deleted/.del-component.cdf~c6f1a7b0c99c5a
    1.2 02/11/22 15:07:46 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_stat/db_stat/component.cdf

  BitKeeper/deleted/.del-component.cdf~8dfd6cea1eb16ffb
    1.2 02/11/22 15:07:46 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_recover/db_recover/component.cdf

  BitKeeper/deleted/.del-component.cdf~41e8ac6e554a2c0a
    1.2 02/11/22 15:07:46 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_upgrade/db_upgrade/component.cdf

  BitKeeper/deleted/.del-component.cdf~169be941a9ccfe77
    1.2 02/11/22 15:07:46 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_printlog/db_printlog/component.cdf

  BitKeeper/deleted/.del-Makefile.custom~ead532061f2a01a7
    1.2 02/11/22 15:07:46 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_stat/db_stat/Makefile.custom

  BitKeeper/deleted/.del-Makefile.custom~b56acb71917c4d78
    1.2 02/11/22 15:07:46 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_recover/db_recover/Makefile.custom

  BitKeeper/deleted/.del-Makefile.custom~afc05029de4bf10
    1.2 02/11/22 15:07:46 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_printlog/db_printlog/Makefile.custom

  BitKeeper/deleted/.del-Makefile.custom~1a5a0a49a86a3f28
    1.2 02/11/22 15:07:46 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_upgrade/db_upgrade/Makefile.custom

  BitKeeper/deleted/.del-db_load.wpj~67c6c653a9bea870
    1.2 02/11/22 15:07:45 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_load/db_load.wpj

  BitKeeper/deleted/.del-db_load.c~1dd647c9c5863378
    1.2 02/11/22 15:07:45 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_load/db_load.c

  BitKeeper/deleted/.del-db_dump.wpj~7e28dd5799ef9d7
    1.2 02/11/22 15:07:45 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_dump/db_dump.wpj

  BitKeeper/deleted/.del-db_dump.c~aa0bdb027bcc79
    1.2 02/11/22 15:07:45 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_dump/db_dump.c

  BitKeeper/deleted/.del-db_deadlock.wpj~b8617495863e87b3
    1.2 02/11/22 15:07:45 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_deadlock/db_deadlock.wpj

  BitKeeper/deleted/.del-db_deadlock.c~b110945da1356bd3
    1.2 02/11/22 15:07:45 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_deadlock/db_deadlock.c

  BitKeeper/deleted/.del-db_config.h~f0ffd61a4c4dcc10
    1.4 02/11/22 15:07:45 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_config.h

  BitKeeper/deleted/.del-db_checkpoint.wpj~c11939cdaad080
    1.2 02/11/22 15:07:45 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_checkpoint/db_checkpoint.wpj

  BitKeeper/deleted/.del-component.wpj~dda5a2a73736e0f9
    1.2 02/11/22 15:07:45 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_deadlock/db_deadlock/component.wpj

  BitKeeper/deleted/.del-component.wpj~7bbc0dcd2221ac89
    1.2 02/11/22 15:07:45 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_checkpoint/db_checkpoint/component.wpj

  BitKeeper/deleted/.del-component.wpj~5f1cc866f2597c5b
    1.2 02/11/22 15:07:45 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_dump/db_dump/component.wpj

  BitKeeper/deleted/.del-component.cdf~d2507fbdc31adf16
    1.2 02/11/22 15:07:45 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_dump/db_dump/component.cdf

  BitKeeper/deleted/.del-component.cdf~cbedb82f353d0922
    1.2 02/11/22 15:07:45 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_load/db_load/component.cdf

  BitKeeper/deleted/.del-component.cdf~acf828ccb25f2e7a
    1.2 02/11/22 15:07:45 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_checkpoint/db_checkpoint/component.cdf

  BitKeeper/deleted/.del-component.cdf~88d94c29a18784f3
    1.2 02/11/22 15:07:45 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_deadlock/db_deadlock/component.cdf

  BitKeeper/deleted/.del-Makefile.custom~e2919df8b5a5d18
    1.2 02/11/22 15:07:45 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_checkpoint/db_checkpoint/Makefile.custom

  BitKeeper/deleted/.del-Makefile.custom~6698b0966cb9896e
    1.2 02/11/22 15:07:45 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_dump/db_dump/Makefile.custom

  BitKeeper/deleted/.del-Makefile.custom~37a5b23498b0cb1b
    1.2 02/11/22 15:07:45 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_deadlock/db_deadlock/Makefile.custom

  BitKeeper/deleted/.del-Makefile.custom~1cc8c2668b709944
    1.2 02/11/22 15:07:45 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_load/db_load/Makefile.custom

  BitKeeper/deleted/.del-db_checkpoint.c~9a0937113e3c2aaa
    1.2 02/11/22 15:07:44 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_checkpoint/db_checkpoint.c

  BitKeeper/deleted/.del-db_archive.wpj~9b2944550502e15
    1.2 02/11/22 15:07:44 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_archive/db_archive.wpj

  BitKeeper/deleted/.del-db_archive.c~aa2f07eacf30fed
    1.2 02/11/22 15:07:44 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_archive/db_archive.c

  BitKeeper/deleted/.del-component.wpj~8f2eae1d43fc8a33
    1.2 02/11/22 15:07:44 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_archive/db_archive/component.wpj

  BitKeeper/deleted/.del-component.wpj~13c8b25bc88a79a5
    1.2 02/11/22 15:07:44 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/BerkeleyDB/component.wpj

  BitKeeper/deleted/.del-component.cdf~7713d5d32b01239
    1.2 02/11/22 15:07:44 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_archive/db_archive/component.cdf

  BitKeeper/deleted/.del-component.cdf~42d5e09d10a4debd
    1.2 02/11/22 15:07:44 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/BerkeleyDB/component.cdf

  BitKeeper/deleted/.del-Makefile.custom~683fd022553cf846
    1.2 02/11/22 15:07:44 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/db_archive/db_archive/Makefile.custom

  BitKeeper/deleted/.del-Makefile.custom~2b8f324317bef7ad
    1.2 02/11/22 15:07:44 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/BerkeleyDB/Makefile.custom

  BitKeeper/deleted/.del-BerkeleyDB.wpj~a2a0abe09f33bb61
    1.4 02/11/22 15:07:44 serg@serg.mysql.com +0 -0
    Delete: bdb/build_vxworks/BerkeleyDB.wpj

ChangeSet
  1.1354.66.4 02/11/22 14:50:53 pem@mysql.com +11 -0
  Moved safe_to_cache_query from thd to lex.
  This is required for prepared statements and stored procedures.

  sql/sql_yacc.yy
    1.184.11.5 02/11/22 14:50:45 pem@mysql.com +20 -20
    Moved safe_to_cache_query from thd to lex.

  sql/sql_prepare.cc
    1.8 02/11/22 14:50:45 pem@mysql.com +1 -1
    Moved safe_to_cache_query from thd to lex.
    Must set it after lex_start() has been called.

  sql/sql_parse.cc
    1.235.12.14 02/11/22 14:50:45 pem@mysql.com +0 -1
    Moved safe_to_cache_query from thd to lex.
    No point in setting it here now, it's set in lex_start() later.

  sql/sql_lex.h
    1.94.1.7 02/11/22 14:50:45 pem@mysql.com +1 -0
    Moved safe_to_cache_query from thd to lex.

  sql/sql_lex.cc
    1.49.4.3 02/11/22 14:50:45 pem@mysql.com +2 -1
    Moved safe_to_cache_query from thd to lex.
    We set it to 1 initially. It's then set to 0 in cases where
    it's know not to be safe. (Before this change, it was set to
    0 in thd, and then set to 1 before parsing.)

  sql/sql_class.h
    1.123.1.20 02/11/22 14:50:45 pem@mysql.com +0 -1
    Moved safe_to_cache_query from thd to lex.

  sql/sql_class.cc
    1.82.1.24 02/11/22 14:50:45 pem@mysql.com +1 -1
    Moved safe_to_cache_query from thd to lex.

  sql/sql_cache.cc
    1.39.1.2 02/11/22 14:50:45 pem@mysql.com +5 -5
    Moved safe_to_cache_query from thd to lex.
    Note: Query_cache::is_cacheable() has both a thd and lex argument.
    We assumed that it's the lex->safe_to_cache_query we should test.

  sql/item_func.cc
    1.84.1.3 02/11/22 14:50:45 pem@mysql.com +2 -2
    Moved safe_to_cache_query from thd to lex.

  sql/item_create.cc
    1.19.1.1 02/11/22 14:50:45 pem@mysql.com +7 -7
    Moved safe_to_cache_query from thd to lex.

  BitKeeper/etc/ignore
    1.127 02/11/22 14:50:45 pem@mysql.com +5 -0
    Added bkpull.log bkpull.log.2 bkpull.log.3 build.log sql/safe_to_cache_query.txt to the ignore list

ChangeSet
  1.1346.54.4 02/11/22 13:59:06 heikki@hundin.mysql.fi +1 -0
  ut0mem.c:
    Flush stderr if we run out of memory, so that the error message more probably finds its way to the error log

  innobase/ut/ut0mem.c
    1.8 02/11/22 13:58:58 heikki@hundin.mysql.fi +6 -0
    Flush stderr if we run out of memory, so that the error message more probably finds its way to the error log

ChangeSet
  1.676.252.7 02/11/22 13:52:40 monty@mashka.mysql.fi +4 -0
  Moved test to correct file

  mysql-test/t/func_time.test
    1.7.1.3 02/11/22 13:52:39 monty@mashka.mysql.fi +18 -0
    Moved test to correct file

  mysql-test/t/func_test.test
    1.3.1.3 02/11/22 13:52:38 monty@mashka.mysql.fi +0 -10
    Moved test to correct file

  mysql-test/r/func_time.result
    1.7.1.3 02/11/22 13:52:38 monty@mashka.mysql.fi +5 -0
    Moved test to correct file

  mysql-test/r/func_test.result
    1.3.1.4 02/11/22 13:52:38 monty@mashka.mysql.fi +0 -3
    Moved test to correct file

ChangeSet
  1.1346.53.2 02/11/22 13:47:01 Sinisa@sinisa.nasamreza.org +1 -0
  reverting a change

  sql/opt_range.cc
    1.54.1.15 02/11/22 13:46:58 Sinisa@sinisa.nasamreza.org +1 -1
    reverting a change

ChangeSet
  1.676.252.6 02/11/22 13:38:37 monty@mashka.mysql.fi +1 -0
  Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23

  sql/mysqld.cc
    1.162.1.94 02/11/22 13:38:36 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.676.253.1 02/11/22 13:35:43 monty@mashka.mysql.fi +5 -0
  Fixed bug with indexed NULL column <=> NULL
  Fix for Mac OS X shutdown

  sql/opt_range.cc
    1.44.1.2 02/11/22 13:35:41 monty@mashka.mysql.fi +12 -6
    Fixed bug with indexed NULL column <=> NULL

  sql/mysqld.cc
    1.162.13.1 02/11/22 13:35:41 monty@mashka.mysql.fi +4 -0
    Fix for Mac OS X shutdown

  mysql-test/t/null_key.test
    1.3.1.2 02/11/22 13:35:41 monty@mashka.mysql.fi +21 -0
    Test for bug in <=> NULL

  mysql-test/r/null_key.result
    1.4.1.4 02/11/22 13:35:41 monty@mashka.mysql.fi +17 -0
    Test for bug in <=> NULL

  mysql-test/mysql-test-run.sh
    1.66.1.24 02/11/22 13:35:40 monty@mashka.mysql.fi +2 -1
    Log client error messages

ChangeSet
  1.1346.55.1 02/11/22 00:33:15 bell@sanja.is.com.ua +6 -0
  fixed invalidation of query cache
  excluded double call of 'invalidate()'

  sql/sql_update.cc
    1.54.1.14 02/11/22 00:33:14 bell@sanja.is.com.ua +4 -6
    fixed invalidation of query cache

  sql/sql_insert.cc
    1.63.1.22 02/11/22 00:33:14 bell@sanja.is.com.ua +3 -6
    fixed invalidation of query cache

  sql/sql_delete.cc
    1.74.1.16 02/11/22 00:33:14 bell@sanja.is.com.ua +4 -6
    fixed invalidation of query cache

  sql/handler.cc
    1.82.1.9 02/11/22 00:33:14 bell@sanja.is.com.ua +1 -1
    excluded double call of 'invalidate()'

  mysql-test/t/innodb_cache.test
    1.4 02/11/22 00:33:13 bell@sanja.is.com.ua +8 -1
    test of invalidation

  mysql-test/r/innodb_cache.result
    1.2.1.1 02/11/22 00:33:13 bell@sanja.is.com.ua +10 -0
    test of invalidation

ChangeSet
  1.1346.54.2 02/11/21 22:14:57 lenz@mysql.com +1 -0
  configure.in:
  
   - actually follow the hints in the comment above and "Remember that 
     regexps needs to quote [ and ] since this is run through m4"...

  configure.in
    1.191.1.49 02/11/21 22:14:55 lenz@mysql.com +1 -1
     - actually follow the hints in the comment above and "Remember that 
       regexps needs to quote [ and ] since this is run through m4"...

ChangeSet
  1.1346.54.1 02/11/21 21:42:44 lenz@mysql.com +1 -0
  configure.in:
  
   - fix MYSQL_NO_DASH_VERSION if version number ends on one digit only
     ("comment" test failed when MySQL version was changed from 4.0.5
     to 4.0.5a)

  configure.in
    1.191.1.48 02/11/21 21:42:43 lenz@mysql.com +1 -0
     - fix MYSQL_NO_DASH_VERSION if version number ends on one digit only
       ("comment" test failed when MySQL version was changed from 4.0.5
       to 4.0.5a)

ChangeSet
  1.1354.66.3 02/11/21 22:26:49 monty@mashka.mysql.fi +1 -0
  Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1

  sql-bench/server-cfg.sh
    1.42 02/11/21 22:26:47 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1354.66.2 02/11/21 22:25:53 monty@mashka.mysql.fi +18 -0
  Fixes after merge with 4.0

  sql/sql_yacc.yy
    1.184.11.4 02/11/21 22:25:51 monty@mashka.mysql.fi +13 -10
    Fix after merge

  sql/sql_update.cc
    1.61.1.6 02/11/21 22:25:51 monty@mashka.mysql.fi +2 -1
    Fix after merge

  sql/sql_parse.cc
    1.235.12.13 02/11/21 22:25:51 monty@mashka.mysql.fi +4 -4
    Fix after merge

  sql/sql_lex.h
    1.94.1.6 02/11/21 22:25:51 monty@mashka.mysql.fi +2 -1
    Fix after merge

  sql/sql_lex.cc
    1.49.4.2 02/11/21 22:25:51 monty@mashka.mysql.fi +0 -1
    Fix after merge

  sql/sql_delete.cc
    1.87 02/11/21 22:25:51 monty@mashka.mysql.fi +1 -1
    Fix after merge

  sql/sql_db.cc
    1.56 02/11/21 22:25:51 monty@mashka.mysql.fi +1 -1
    Fix after merge

  sql/sql_class.cc
    1.82.1.23 02/11/21 22:25:51 monty@mashka.mysql.fi +3 -3
    Fix after merge

  sql/sql_acl.cc
    1.55.2.2 02/11/21 22:25:51 monty@mashka.mysql.fi +4 -4
    Fix after merge

  sql/mysql_priv.h
    1.160.11.5 02/11/21 22:25:51 monty@mashka.mysql.fi +0 -1
    Fix after merge

  sql/log_event.cc
    1.89 02/11/21 22:25:51 monty@mashka.mysql.fi +6 -5
    Fix after merge

  sql/item_cmpfunc.h
    1.19.2.2 02/11/21 22:25:51 monty@mashka.mysql.fi +2 -2
    Fix after merge

  mysql-test/r/subselect.result
    1.20.5.1 02/11/21 22:25:51 monty@mashka.mysql.fi +9 -9
    Updated results

  mysql-test/r/select.result
    1.17 02/11/21 22:25:51 monty@mashka.mysql.fi +2 -2
    Updated results

  mysql-test/r/rpl_log.result
    1.33 02/11/21 22:25:51 monty@mashka.mysql.fi +1 -1
    Updated results

  mysql-test/r/merge.result
    1.17 02/11/21 22:25:51 monty@mashka.mysql.fi +10 -10
    Updated results

  mysql-test/r/heap_hash.result
    1.4 02/11/21 22:25:51 monty@mashka.mysql.fi +6 -6
    Updated results

  mysql-test/r/heap_btree.result
    1.9 02/11/21 22:25:51 monty@mashka.mysql.fi +10 -10
    Updated results

ChangeSet
  1.1346.53.1 02/11/21 22:13:23 Sinisa@sinisa.nasamreza.org +3 -0
  A fix for the bug with: 
  delete from table where column<=>NULL 
  on indexed columns

  sql/opt_range.cc
    1.54.1.14 02/11/21 22:13:20 Sinisa@sinisa.nasamreza.org +1 -1
    A fix for the bug with: 
    delete from table where column<=>NULL 
    on indexed columns

  mysql-test/t/delete.test
    1.6 02/11/21 22:13:20 Sinisa@sinisa.nasamreza.org +5 -0
    A fix for the bug with: 
    delete from table where column<=>NULL 
    on indexed columns

  mysql-test/r/delete.result
    1.5 02/11/21 22:13:20 Sinisa@sinisa.nasamreza.org +6 -0
    A fix for the bug with: 
    delete from table where column<=>NULL 
    on indexed columns

ChangeSet
  1.1354.69.1 02/11/21 22:21:14 ram@mysql.r18.ru +1 -0
  fix for wrong index number bug

  sql/opt_range.cc
    1.68.1.1 02/11/21 22:21:07 ram@mysql.r18.ru +2 -2
    fix for wrong index number bug

ChangeSet
  1.1354.67.1 02/11/21 21:36:16 walrus@mysql.com +1 -0
  add sapdb section to server-cfg  (benchmarks)

  sql-bench/server-cfg.sh
    1.40.1.1 02/11/21 21:36:11 walrus@mysql.com +211 -2
    Add sapdb section

ChangeSet
  1.676.252.5 02/11/21 18:14:27 Sinisa@sinisa.nasamreza.org +1 -0
  fix error in result

  mysql-test/r/func_test.result
    1.3.1.3 02/11/21 18:14:26 Sinisa@sinisa.nasamreza.org +0 -1
    Fixing the error in result

ChangeSet
  1.676.252.4 02/11/21 17:55:49 Sinisa@sinisa.nasamreza.org +1 -0
  A fix for --bind-address=hostname

  sql/mysqld.cc
    1.162.1.93 02/11/21 17:55:47 Sinisa@sinisa.nasamreza.org +1 -2
    A fix for --bind-address=hostname

ChangeSet
  1.1354.65.4 02/11/21 16:04:59 bell@sanja.is.com.ua +2 -0
  after merging fix

  mysql-test/t/subselect.test
    1.19.3.10 02/11/21 16:04:57 bell@sanja.is.com.ua +4 -4
    after merging fix

  include/mysqld_error.h
    1.54.1.3 02/11/21 16:04:57 bell@sanja.is.com.ua +1 -1
    after merging fix

ChangeSet
  1.1354.66.1 02/11/21 15:56:48 monty@mashka.mysql.fi +145 -0
  Merge with 4.0

  tests/Makefile.am
    1.8 02/11/21 15:56:44 monty@mashka.mysql.fi +0 -1
    Merge with 4.0

  strings/Makefile.am
    1.26 02/11/21 15:56:44 monty@mashka.mysql.fi +1 -2
    Merge with 4.0

  sql/table.cc
    1.64 02/11/21 15:56:44 monty@mashka.mysql.fi +2 -44
    Merge with 4.0

  sql/sql_yacc.yy
    1.184.11.3 02/11/21 15:56:44 monty@mashka.mysql.fi +47 -70
    Merge with 4.0

  sql/sql_update.cc
    1.61.1.5 02/11/21 15:56:44 monty@mashka.mysql.fi +1 -0
    Added comment

  sql/sql_select.cc
    1.173.14.2 02/11/21 15:56:44 monty@mashka.mysql.fi +7 -22
    Merge with 4.0

  sql/sql_parse.cc
    1.235.12.12 02/11/21 15:56:43 monty@mashka.mysql.fi +7 -8
    Merge with 4.0

  sql/sql_lex.h
    1.94.1.5 02/11/21 15:56:43 monty@mashka.mysql.fi +2 -3
    Merge with 4.0

  sql/sql_delete.cc
    1.86 02/11/21 15:56:43 monty@mashka.mysql.fi +4 -7
    Merge with 4.0

  sql/sql_db.cc
    1.55 02/11/21 15:56:43 monty@mashka.mysql.fi +15 -16
    Merge with 4.0
    Optimized the logging of the drop db call a bit

  sql/sql_class.h
    1.123.1.19 02/11/21 15:56:43 monty@mashka.mysql.fi +1 -1
    Merge with 4.0

  sql/sql_class.cc
    1.82.1.22 02/11/21 15:56:43 monty@mashka.mysql.fi +0 -2
    Merge with 4.0

  sql/sql_base.cc
    1.122.9.3 02/11/21 15:56:43 monty@mashka.mysql.fi +1 -2
    Merge with 4.0

  sql/slave.cc
    1.173 02/11/21 15:56:43 monty@mashka.mysql.fi +2 -4
    Merge with 4.0

  sql/set_var.cc
    1.17 02/11/21 15:56:43 monty@mashka.mysql.fi +0 -0
    Merge with 4.0

  sql/mysqld.cc
    1.304.2.6 02/11/21 15:56:43 monty@mashka.mysql.fi +0 -1
    Merge with 4.0

  sql/mysql_priv.h
    1.160.11.4 02/11/21 15:56:43 monty@mashka.mysql.fi +0 -0
    Merge with 4.0

  sql/log_event.cc
    1.88 02/11/21 15:56:43 monty@mashka.mysql.fi +37 -54
    Merge with 4.0

  sql/item_cmpfunc.h
    1.19.2.1 02/11/21 15:56:43 monty@mashka.mysql.fi +0 -2
    Merge with 4.0

  sql/item_cmpfunc.cc
    1.35.4.1 02/11/21 15:56:43 monty@mashka.mysql.fi +1 -2
    Merge with 4.0

  sql/item.h
    1.34.4.1 02/11/21 15:56:43 monty@mashka.mysql.fi +0 -1
    Merge with 4.0

  sql/ha_myisam.cc
    1.98.1.7 02/11/21 15:56:43 monty@mashka.mysql.fi +1 -5
    Merge with 4.0
    Removed some commented code

  sql/ha_heap.cc
    1.30 02/11/21 15:56:43 monty@mashka.mysql.fi +6 -9
    Merge with 4.0

  sql/field.h
    1.46.1.7 02/11/21 15:56:43 monty@mashka.mysql.fi +0 -5
    Merge with 4.0

  sql/field.cc
    1.64.1.9 02/11/21 15:56:43 monty@mashka.mysql.fi +6 -12
    Merge with 4.0

  mysys/Makefile.am
    1.38 02/11/21 15:56:43 monty@mashka.mysql.fi +1 -3
    Merge with 4.0

  mysql-test/r/user_var.result
    1.8 02/11/21 15:56:43 monty@mashka.mysql.fi +4 -8
    Merge with 4.0

  mysql-test/r/type_datetime.result
    1.11 02/11/21 15:56:43 monty@mashka.mysql.fi +1 -2
    Merge with 4.0

  mysql-test/r/select.result
    1.16 02/11/21 15:56:43 monty@mashka.mysql.fi +13 -26
    Merge with 4.0

  mysql-test/r/rpl_rotate_logs.result
    1.36 02/11/21 15:56:43 monty@mashka.mysql.fi +0 -0
    Merge with 4.0

  mysql-test/r/rpl_log.result
    1.32 02/11/21 15:56:43 monty@mashka.mysql.fi +0 -1
    Merge with 4.0

  mysql-test/r/order_by.result
    1.13 02/11/21 15:56:43 monty@mashka.mysql.fi +19 -38
    Merge with 4.0

  mysql-test/r/null_key.result
    1.15 02/11/21 15:56:43 monty@mashka.mysql.fi +24 -48
    Merge with 4.0

  mysql-test/r/myisam.result
    1.15 02/11/21 15:56:43 monty@mashka.mysql.fi +0 -0
    Merge with 4.0

  mysql-test/r/merge.result
    1.16 02/11/21 15:56:43 monty@mashka.mysql.fi +2 -4
    Merge with 4.0

  mysql-test/r/key_diff.result
    1.8 02/11/21 15:56:43 monty@mashka.mysql.fi +1 -2
    Merge with 4.0

  mysql-test/r/join_outer.result
    1.13 02/11/21 15:56:43 monty@mashka.mysql.fi +7 -14
    Merge with 4.0

  mysql-test/r/innodb.result
    1.46 02/11/21 15:56:43 monty@mashka.mysql.fi +5 -10
    Merge with 4.0

  mysql-test/r/heap.result
    1.14 02/11/21 15:56:43 monty@mashka.mysql.fi +6 -12
    Merge with 4.0

  mysql-test/r/group_by.result
    1.18 02/11/21 15:56:43 monty@mashka.mysql.fi +2 -4
    Merge with 4.0

  mysql-test/r/explain.result
    1.8 02/11/21 15:56:43 monty@mashka.mysql.fi +2 -4
    Merge with 4.0

  mysql-test/r/distinct.result
    1.17 02/11/21 15:56:43 monty@mashka.mysql.fi +6 -12
    Merge with 4.0

  mysql-test/r/create.result
    1.21 02/11/21 15:56:43 monty@mashka.mysql.fi +1 -2
    Merge with 4.0

  mysql-test/r/compare.result
    1.7 02/11/21 15:56:43 monty@mashka.mysql.fi +1 -2
    Merge with 4.0

  mysql-test/r/bdb.result
    1.24 02/11/21 15:56:43 monty@mashka.mysql.fi +4 -8
    Merge with 4.0

  myisam/ft_boolean_search.c
    1.54 02/11/21 15:56:43 monty@mashka.mysql.fi +3 -5
    Merge with 4.0

  libmysql/errmsg.c
    1.17 02/11/21 15:56:43 monty@mashka.mysql.fi +9 -12
    Merge with 4.0

  include/myisampack.h
    1.11 02/11/21 15:56:43 monty@mashka.mysql.fi +1 -3
    Merge with 4.0

  include/my_tree.h
    1.15 02/11/21 15:56:43 monty@mashka.mysql.fi +3 -3
    Merge with 4.0

  include/my_base.h
    1.36 02/11/21 15:56:43 monty@mashka.mysql.fi +0 -0
    Merge with 4.0

  include/errmsg.h
    1.14 02/11/21 15:56:43 monty@mashka.mysql.fi +20 -20
    Merge with 4.0

  configure.in
    1.201.1.5 02/11/21 15:56:43 monty@mashka.mysql.fi +0 -3
    Merge with 4.0

  client/mysqltest.c
    1.85.1.1 02/11/21 15:56:43 monty@mashka.mysql.fi +0 -0
    Merge with 4.0

  client/mysqldump.c
    1.74 02/11/21 15:56:43 monty@mashka.mysql.fi +1 -2
    Merge with 4.0

  client/client_priv.h
    1.16 02/11/21 15:56:42 monty@mashka.mysql.fi +1 -2
    Merge with 4.0

ChangeSet
  1.1354.65.3 02/11/21 12:05:52 bell@sanja.is.com.ua +26 -0
  merging

  sql/share/ukrainian/errmsg.txt
    1.19.3.1 02/11/21 12:05:51 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/swedish/errmsg.txt
    1.56.3.1 02/11/21 12:05:51 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/spanish/errmsg.txt
    1.56.3.1 02/11/21 12:05:51 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/slovak/errmsg.txt
    1.56.3.1 02/11/21 12:05:51 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/serbian/errmsg.txt
    1.10.1.2 02/11/21 12:05:51 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/russian/errmsg.txt
    1.53.3.1 02/11/21 12:05:51 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/romanian/errmsg.txt
    1.54.3.1 02/11/21 12:05:51 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/portuguese/errmsg.txt
    1.56.3.1 02/11/21 12:05:51 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/polish/errmsg.txt
    1.55.3.1 02/11/21 12:05:51 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/norwegian/errmsg.txt
    1.55.3.1 02/11/21 12:05:51 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/norwegian-ny/errmsg.txt
    1.55.3.1 02/11/21 12:05:51 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/korean/errmsg.txt
    1.55.3.1 02/11/21 12:05:51 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/japanese/errmsg.txt
    1.55.3.1 02/11/21 12:05:51 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/italian/errmsg.txt
    1.61.3.1 02/11/21 12:05:51 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/hungarian/errmsg.txt
    1.57.3.1 02/11/21 12:05:51 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/greek/errmsg.txt
    1.56.3.1 02/11/21 12:05:51 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/german/errmsg.txt
    1.55.3.1 02/11/21 12:05:51 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/french/errmsg.txt
    1.55.3.1 02/11/21 12:05:51 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/estonian/errmsg.txt
    1.56.3.1 02/11/21 12:05:50 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/english/errmsg.txt
    1.61.3.1 02/11/21 12:05:50 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/dutch/errmsg.txt
    1.58.3.1 02/11/21 12:05:50 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/danish/errmsg.txt
    1.54.3.1 02/11/21 12:05:50 bell@sanja.is.com.ua +1 -1
    merging

  sql/share/czech/errmsg.txt
    1.56.3.1 02/11/21 12:05:50 bell@sanja.is.com.ua +1 -1
    merging

  include/mysqld_error.h
    1.54.1.2 02/11/21 12:05:50 bell@sanja.is.com.ua +2 -3
    merging

  sql/item_func.h
    1.47.3.1 02/11/21 11:51:59 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/item_func.cc
    1.84.3.1 02/11/21 11:51:59 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1354.57.2 02/11/21 11:01:33 bell@sanja.is.com.ua +36 -0
  prevent using references on sum function (except HAVING clouse of current select) and forward references

  sql/share/ukrainian/errmsg.txt
    1.19.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/swedish/errmsg.txt
    1.56.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/spanish/errmsg.txt
    1.56.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/slovak/errmsg.txt
    1.56.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/serbian/errmsg.txt
    1.10.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/russian/errmsg.txt
    1.53.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/romanian/errmsg.txt
    1.54.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/portuguese/errmsg.txt
    1.56.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/polish/errmsg.txt
    1.55.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/norwegian/errmsg.txt
    1.55.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/norwegian-ny/errmsg.txt
    1.55.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/korean/errmsg.txt
    1.55.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/japanese/errmsg.txt
    1.55.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/italian/errmsg.txt
    1.61.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/hungarian/errmsg.txt
    1.57.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/greek/errmsg.txt
    1.56.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/german/errmsg.txt
    1.55.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/french/errmsg.txt
    1.55.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/estonian/errmsg.txt
    1.56.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/english/errmsg.txt
    1.61.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/dutch/errmsg.txt
    1.58.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/danish/errmsg.txt
    1.54.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/share/czech/errmsg.txt
    1.56.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    new error message

  sql/item_uniq.h
    1.9 02/11/21 11:01:20 bell@sanja.is.com.ua +5 -1
    fix_fields indicator

  sql/item_sum.h
    1.18.1.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    fix_fields indicator

  sql/item_sum.cc
    1.38.2.1 02/11/21 11:01:20 bell@sanja.is.com.ua +2 -0
    fix_fields indicator

  sql/item_subselect.cc
    1.20.3.1 02/11/21 11:01:20 bell@sanja.is.com.ua +1 -0
    fix_fields indicator

  sql/item_strfunc.cc
    1.54.5.1 02/11/21 11:01:20 bell@sanja.is.com.ua +2 -0
    fix_fields indicator

  sql/item_func.h
    1.47.2.1 02/11/21 11:01:19 bell@sanja.is.com.ua +1 -0
    fix_fields indicator

  sql/item_func.cc
    1.84.2.1 02/11/21 11:01:19 bell@sanja.is.com.ua +1 -0
    fix_fields indicator

  sql/item_cmpfunc.cc
    1.35.3.1 02/11/21 11:01:19 bell@sanja.is.com.ua +2 -0
    fix_fields indicator

  sql/item.h
    1.34.3.1 02/11/21 11:01:19 bell@sanja.is.com.ua +1 -0
    fix_fields indicator

  sql/item.cc
    1.27.6.1 02/11/21 11:01:19 bell@sanja.is.com.ua +44 -2
    fix_fields indicator
    test on incorrect references

  mysql-test/t/subselect.test
    1.19.3.9 02/11/21 11:01:19 bell@sanja.is.com.ua +9 -2
    new error message

  mysql-test/r/subselect.result
    1.20.4.3 02/11/21 11:01:19 bell@sanja.is.com.ua +10 -2
    new error message

  include/mysqld_error.h
    1.54.2.1 02/11/21 11:01:19 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/ukrainian/errmsg.txt
    1.19.1.2 02/11/21 04:21:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/swedish/errmsg.txt
    1.56.1.2 02/11/21 04:21:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/spanish/errmsg.txt
    1.56.1.2 02/11/21 04:21:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/slovak/errmsg.txt
    1.56.1.2 02/11/21 04:21:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/russian/errmsg.txt
    1.53.1.2 02/11/21 04:21:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/romanian/errmsg.txt
    1.54.1.2 02/11/21 04:21:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/portuguese/errmsg.txt
    1.56.1.2 02/11/21 04:21:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/polish/errmsg.txt
    1.55.1.2 02/11/21 04:21:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/norwegian-ny/errmsg.txt
    1.55.1.2 02/11/21 04:21:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql-bench/server-cfg.sh
    1.41 02/11/21 04:21:07 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/unireg.cc
    1.22 02/11/21 04:21:06 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/table.h
    1.39 02/11/21 04:21:06 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/norwegian/errmsg.txt
    1.55.1.2 02/11/21 04:21:06 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/korean/errmsg.txt
    1.55.1.2 02/11/21 04:21:06 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/japanese/errmsg.txt
    1.55.1.2 02/11/21 04:21:06 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/italian/errmsg.txt
    1.61.1.2 02/11/21 04:21:06 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/hungarian/errmsg.txt
    1.57.1.2 02/11/21 04:21:06 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/greek/errmsg.txt
    1.56.1.2 02/11/21 04:21:06 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/german/errmsg.txt
    1.55.1.2 02/11/21 04:21:06 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/french/errmsg.txt
    1.55.1.2 02/11/21 04:21:06 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/estonian/errmsg.txt
    1.56.1.2 02/11/21 04:21:06 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.61.1.2 02/11/21 04:21:06 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/dutch/errmsg.txt
    1.58.1.2 02/11/21 04:21:06 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/danish/errmsg.txt
    1.54.1.2 02/11/21 04:21:06 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/share/czech/errmsg.txt
    1.56.1.2 02/11/21 04:21:06 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_udf.cc
    1.20 02/11/21 04:21:05 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_table.cc
    1.125.1.12 02/11/21 04:21:05 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_show.cc
    1.86.1.11 02/11/21 04:21:05 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_repl.cc
    1.89 02/11/21 04:21:05 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_rename.cc
    1.15 02/11/21 04:21:05 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_load.cc
    1.39 02/11/21 04:21:05 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_insert.cc
    1.71 02/11/21 04:21:05 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_cache.cc
    1.39.1.1 02/11/21 04:21:04 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_analyse.cc
    1.21 02/11/21 04:21:04 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_acl.cc
    1.55.2.1 02/11/21 04:21:04 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/slave.h
    1.52 02/11/21 04:21:04 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/set_var.h
    1.7 02/11/21 04:21:04 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/repl_failsafe.cc
    1.17 02/11/21 04:21:04 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/opt_sum.cc
    1.20 02/11/21 04:21:04 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/opt_range.cc
    1.69 02/11/21 04:21:04 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/mini_client.cc
    1.51 02/11/21 04:21:04 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/log_event.h
    1.75 02/11/21 04:21:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/log.cc
    1.91 02/11/21 04:21:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/lock.cc
    1.40 02/11/21 04:21:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/lex.h
    1.78.2.3 02/11/21 04:21:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_timefunc.cc
    1.27 02/11/21 04:21:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_func.h
    1.47.1.2 02/11/21 04:21:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/item_func.cc
    1.84.1.2 02/11/21 04:21:03 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/hostname.cc
    1.19 02/11/21 04:21:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/hash_filo.h
    1.8 02/11/21 04:21:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/handler.h
    1.75.1.1 02/11/21 04:21:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/handler.cc
    1.84.1.1 02/11/21 04:21:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.85.1.1 02/11/21 04:21:03 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_berkeley.cc
    1.109 02/11/21 04:21:02 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/gen_lex_hash.cc
    1.52 02/11/21 04:21:02 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/filesort.cc
    1.56.1.1 02/11/21 04:21:02 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/Makefile.am
    1.75.1.1 02/11/21 04:21:02 monty@mashka.mysql.fi +0 -0
    Auto merged

  scripts/Makefile.am
    1.23 02/11/21 04:21:01 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysys/tree.c
    1.20 02/11/21 04:21:01 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysys/hash.c
    1.23 02/11/21 04:21:01 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/variables.test
    1.12 02/11/21 04:21:01 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/rpl_rotate_logs.test
    1.38 02/11/21 04:21:00 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/myisam.test
    1.11 02/11/21 04:21:00 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/t/func_test.test
    1.10 02/11/21 04:21:00 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/variables.result
    1.16 02/11/21 04:21:00 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/rpl_replicate_do.result
    1.11 02/11/21 04:21:00 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/isam.result
    1.9 02/11/21 04:21:00 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/func_test.result
    1.12 02/11/21 04:21:00 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/r/fulltext.result
    1.34 02/11/21 04:21:00 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysql-test/mysql-test-run.sh
    1.151 02/11/21 04:20:59 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/sort.c
    1.25.1.1 02/11/21 04:20:59 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/mi_write.c
    1.31 02/11/21 04:20:59 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/mi_open.c
    1.53 02/11/21 04:20:59 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/ft_nlq_search.c
    1.18 02/11/21 04:20:59 monty@mashka.mysql.fi +0 -0
    Auto merged

  myisam/Makefile.am
    1.22 02/11/21 04:20:59 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysqld/lib_sql.cc
    1.25.1.11 02/11/21 04:20:59 monty@mashka.mysql.fi +0 -0
    Auto merged

  libmysql/libmysql.c
    1.105 02/11/21 04:20:59 monty@mashka.mysql.fi +0 -0
    Auto merged

  isam/pack_isam.c
    1.13 02/11/21 04:20:59 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/violite.h
    1.21.1.6 02/11/21 04:20:59 monty@mashka.mysql.fi +0 -0
    Auto merged

  include/myisam.h
    1.42.1.1 02/11/21 04:20:58 monty@mashka.mysql.fi +0 -0
    Auto merged

  client/mysqlshow.c
    1.26 02/11/21 04:20:58 monty@mashka.mysql.fi +0 -0
    Auto merged

  client/mysqlcheck.c
    1.26 02/11/21 04:20:58 monty@mashka.mysql.fi +0 -0
    Auto merged

  Docs/manual.texi
    1.878 02/11/21 04:20:58 monty@mashka.mysql.fi +4 -6
    Auto merged

  mysql-test/r/rpl_replicate_do.result
    1.10 02/11/21 04:20:56 monty@mashka.mysql.fi +0 -0
    Merge rename: mysql-test/r/rpl000007.result -> mysql-test/r/rpl_replicate_do.result

  acinclude.m4
    1.78 02/11/21 04:20:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  acconfig.h
    1.30 02/11/21 04:20:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/config
    1.8 02/11/21 04:20:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/deleted/.del-.my_sys.h.swp~f6a4a7f8dae03f18
    1.3 02/11/21 04:20:56 monty@mashka.mysql.fi +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.212.13.2 02/11/21 04:20:47 monty@mashka.mysql.fi +0 -1
    auto-union

  BitKeeper/etc/ignore
    1.126 02/11/21 04:20:47 monty@mashka.mysql.fi +35 -34
    auto-union

  BitKeeper/etc/gone
    1.86.1.8 02/11/21 04:20:47 monty@mashka.mysql.fi +0 -1077
    auto-union

ChangeSet
  1.1346.46.13 02/11/21 02:28:23 monty@mashka.mysql.fi +3 -0
  merge with 3.23

  sql/ha_innodb.cc
    1.73.1.57 02/11/21 02:28:22 monty@mashka.mysql.fi +0 -3
    merge with 3.23

  innobase/include/row0mysql.h
    1.14 02/11/21 02:28:22 monty@mashka.mysql.fi +0 -1
    merge with 3.23

  sql/ha_innodb.cc
    1.45.17.2 02/11/21 02:26:54 monty@mashka.mysql.fi +0 -0
    Merge rename: sql/ha_innobase.cc -> sql/ha_innodb.cc

  innobase/row/row0mysql.c
    1.37 02/11/21 02:26:54 monty@mashka.mysql.fi +0 -1
    Auto merged

ChangeSet
  1.1346.46.12 02/11/21 02:13:37 monty@mashka.mysql.fi +1 -0
  Added 'table lock' state while MySQL is waiting to get locks for tables.

  sql/lock.cc
    1.38.1.3 02/11/21 02:13:35 monty@mashka.mysql.fi +3 -1
    Added 'table lock' state while MySQL is waiting to get locks for tables.

ChangeSet
  1.1354.65.2 02/11/21 02:07:14 monty@mashka.mysql.fi +39 -0
  Automatic conversion from CHAR(length) to BLOB when length > 255
  New operators MOD and DIV
  SELECT ... FROM DUAL
  TRUE = 1 and FALSE = 0

  sql/sql_yacc.yy
    1.184.11.2 02/11/21 02:07:12 monty@mashka.mysql.fi +33 -13
    New operators MOD and DIV
    SELECT ... FROM DUAL
    TRUE = 1 and FALSE = 0

  sql/sql_parse.cc
    1.235.12.11 02/11/21 02:07:12 monty@mashka.mysql.fi +26 -2
    Added automatic conversion from CHAR(length) to BLOB when length > 255
    Added support for BLOB(length)

  sql/sql_lex.cc
    1.49.4.1 02/11/21 02:07:12 monty@mashka.mysql.fi +2 -3
    Fixed comment

  sql/sql_error.cc
    1.3 02/11/21 02:07:12 monty@mashka.mysql.fi +15 -3
    Added support for warnings during parsing

  sql/sql_class.h
    1.123.1.18 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -1
    Added support for warnings during parsing

  sql/sql_class.cc
    1.82.1.21 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    Added support for warnings during parsing

  sql/share/ukrainian/errmsg.txt
    1.19.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/share/swedish/errmsg.txt
    1.56.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +17 -16
    New warning message
    Translated a lot of error messages

  sql/share/spanish/errmsg.txt
    1.56.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/share/slovak/errmsg.txt
    1.56.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/share/serbian/errmsg.txt
    1.10.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/share/russian/errmsg.txt
    1.53.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/share/romanian/errmsg.txt
    1.54.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/share/portuguese/errmsg.txt
    1.56.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/share/polish/errmsg.txt
    1.55.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/share/norwegian/errmsg.txt
    1.55.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/share/norwegian-ny/errmsg.txt
    1.55.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/share/korean/errmsg.txt
    1.55.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/share/japanese/errmsg.txt
    1.55.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/share/italian/errmsg.txt
    1.61.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/share/hungarian/errmsg.txt
    1.57.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/share/greek/errmsg.txt
    1.56.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/share/german/errmsg.txt
    1.55.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/share/french/errmsg.txt
    1.55.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/share/estonian/errmsg.txt
    1.56.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/share/english/errmsg.txt
    1.61.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/share/dutch/errmsg.txt
    1.58.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/share/danish/errmsg.txt
    1.54.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/share/czech/errmsg.txt
    1.56.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +1 -0
    New warning message

  sql/lex.h
    1.78.2.2 02/11/21 02:07:12 monty@mashka.mysql.fi +6 -1
    New keywords

  sql/item_func.h
    1.47.1.1 02/11/21 02:07:12 monty@mashka.mysql.fi +12 -0
    Added function DIV

  sql/item_func.cc
    1.84.1.1 02/11/21 02:07:11 monty@mashka.mysql.fi +19 -0
    Added function DIV

  mysql-test/t/type_blob.test
    1.9 02/11/21 02:07:11 monty@mashka.mysql.fi +27 -1
    Added testing of new functions

  mysql-test/t/func_test.test
    1.7.1.1 02/11/21 02:07:11 monty@mashka.mysql.fi +1 -0
    Added testing of new functions

  mysql-test/t/func_system.test
    1.5 02/11/21 02:07:11 monty@mashka.mysql.fi +1 -0
    Added testing of new functions

  mysql-test/r/type_blob.result
    1.11 02/11/21 02:07:11 monty@mashka.mysql.fi +32 -0
    Added testing of new functions

  mysql-test/r/func_test.result
    1.9.1.1 02/11/21 02:07:11 monty@mashka.mysql.fi +3 -0
    Added testing of new functions

  mysql-test/r/func_system.result
    1.8 02/11/21 02:07:11 monty@mashka.mysql.fi +3 -0
    Added testing of new functions

  include/mysqld_error.h
    1.54.1.1 02/11/21 02:07:11 monty@mashka.mysql.fi +2 -1
    New warning message

ChangeSet
  1.676.1.586 02/11/20 22:16:29 lenz@mysql.com +1 -0
  Do-compile:
  
   - applied some changes from the 4.0 tree (enable multiple 
     --conf-environment options, add --with-debug, don't add "-max"
     prefix just because BDB is enabled)

  Build-tools/Do-compile
    1.33.1.17 02/11/20 22:16:28 lenz@mysql.com +15 -9
     - applied some changes from the 4.0 tree (enable multiple 
       --conf-environment options, add --with-debug, don't add "-max"
       prefix just because BDB is enabled)

ChangeSet
  1.1346.52.1 02/11/20 22:56:57 monty@mashka.mysql.fi +11 -0
  Try to optimize the cache buffer size needed for bulk_insert
  Fix for shutdown on Mac OS X

  sql/table.h
    1.31.1.9 02/11/20 22:56:55 monty@mashka.mysql.fi +1 -0
    Try to optimize the cache buffer size needed for bulk_insert

  sql/table.cc
    1.46.1.13 02/11/20 22:56:55 monty@mashka.mysql.fi +2 -1
    Try to optimize the cache buffer size needed for bulk_insert

  sql/sql_yacc.yy
    1.145.1.45 02/11/20 22:56:55 monty@mashka.mysql.fi +5 -4
    Call thd->strmake() instead of sql_strmake()

  sql/sql_insert.cc
    1.63.1.21 02/11/20 22:56:55 monty@mashka.mysql.fi +7 -3
    Try to optimize the cache buffer size needed for bulk_insert

  sql/mysqld.cc
    1.297.1.77 02/11/20 22:56:55 monty@mashka.mysql.fi +19 -2
    Fix for shutdown on Mac OS X

  sql/mysql_priv.h
    1.150.1.22 02/11/20 22:56:55 monty@mashka.mysql.fi +2 -1
    Small optimization

  mysys/tree.c
    1.14.1.1 02/11/20 22:56:55 monty@mashka.mysql.fi +5 -3
    Try to optimize the cache buffer size needed for bulk_insert

  mysql-test/t/bdb.test
    1.27 02/11/20 22:56:55 monty@mashka.mysql.fi +1 -1
    Make test repeatable

  mysql-test/r/bdb.result
    1.22.1.4 02/11/20 22:56:55 monty@mashka.mysql.fi +2 -2
    Make test repeatable

  myisam/mi_write.c
    1.24.1.7 02/11/20 22:56:55 monty@mashka.mysql.fi +2 -1
    Try to optimize the cache buffer size needed for bulk_insert

  include/my_tree.h
    1.9.1.1 02/11/20 22:56:55 monty@mashka.mysql.fi +2 -0
    Try to optimize the cache buffer size needed for bulk_insert

ChangeSet
  1.1354.65.1 02/11/20 21:44:32 monty@mashka.mysql.fi +7 -0
  Added some compatibility modes (for the future)

  sql/sql_yacc.yy
    1.184.11.1 02/11/20 21:44:18 monty@mashka.mysql.fi +21 -2
    Added compatibility modes

  sql/sql_delete.cc
    1.85 02/11/20 21:44:18 monty@mashka.mysql.fi +11 -9
    Cleaned up SAFE_UPDATES handling

  sql/mysqld.cc
    1.304.2.5 02/11/20 21:44:18 monty@mashka.mysql.fi +8 -4
    Added compatibility modes

  sql/mysql_priv.h
    1.160.11.3 02/11/20 21:44:18 monty@mashka.mysql.fi +5 -0
    Added compatibility modes

  sql/lex.h
    1.78.2.1 02/11/20 21:44:18 monty@mashka.mysql.fi +3 -0
    Added compabitlity keywords

  libmysqld/libmysqld.c
    1.14.1.4 02/11/20 21:44:18 monty@mashka.mysql.fi +40 -7
    Added handling of protocol options (to get source to compile)

  libmysql/libmysql.c
    1.104 02/11/20 21:44:18 monty@mashka.mysql.fi +1 -1
    Removed ^M from source

ChangeSet
  1.1346.48.2 02/11/20 15:17:17 serg@serg.mysql.com +3 -0
  bug in _ftb_strstr fixed :)

  mysql-test/t/fulltext.test
    1.34 02/11/20 15:17:15 serg@serg.mysql.com +1 -0
    bug in _ftb_strstr fixed :)

  mysql-test/r/fulltext.result
    1.29.1.4 02/11/20 15:17:15 serg@serg.mysql.com +3 -0
    bug in _ftb_strstr fixed :)

  myisam/ft_boolean_search.c
    1.47.1.7 02/11/20 15:17:15 serg@serg.mysql.com +3 -3
    bug in _ftb_strstr fixed :)

ChangeSet
  1.1354.59.2 02/11/20 13:30:48 vva@genie.(none) +3 -0
  discard warnings in readline 4.3

  readline/rlmbutil.h
    1.2 02/11/20 13:30:43 vva@genie.(none) +2 -2
    discard warnings in readline 4.3

  readline/mbutil.c
    1.2 02/11/20 13:30:43 vva@genie.(none) +2 -2
    discard warnings in readline 4.3

  readline/display.c
    1.7 02/11/20 13:30:43 vva@genie.(none) +2 -2
    discard warnings in readline 4.3

ChangeSet
  1.1346.46.9 02/11/19 22:59:01 heikki@hundin.mysql.fi +1 -0
  set_var.cc:
    Fix potential bus error in 64-bit computers in SHOW VARIABLES, if int is only 32-bit in them

  sql/set_var.cc
    1.12.1.5 02/11/19 22:58:44 heikki@hundin.mysql.fi +1 -1
    Fix potential bus error in 64-bit computers in SHOW VARIABLES, if int is only 32-bit in them

ChangeSet
  1.1354.64.1 02/11/19 19:43:45 Sinisa@sinisa.nasamreza.org +3 -0
  fixed another small bug with LIMIT )

  sql/sql_select.cc
    1.173.14.1 02/11/19 19:43:42 Sinisa@sinisa.nasamreza.org +1 -1
    fixed another small bug with LIMIT )

  mysql-test/t/select_found.test
    1.12 02/11/19 19:43:42 Sinisa@sinisa.nasamreza.org +2 -0
    fixed another small bug with LIMIT )

  mysql-test/r/select_found.result
    1.13 02/11/19 19:43:42 Sinisa@sinisa.nasamreza.org +5 -0
    fixed another small bug with LIMIT )

ChangeSet
  1.1354.63.1 02/11/19 18:41:47 pem@mysql.com +5 -0
  Merged 4.1 into 5.0.

  sql/sql_yacc.yy
    1.184.10.1 02/11/19 18:41:46 pem@mysql.com +42 -93
    Manually merged.

ChangeSet
  1.1354.62.1 02/11/19 19:58:46 ram@mysql.r18.ru +1 -0
  added 'USING BTREE' for 'show create table' for HEAP

  sql/sql_show.cc
    1.86.1.10 02/11/19 19:58:40 ram@mysql.r18.ru +4 -0
    added 'USING BTREE' for 'show create table' for HEAP

ChangeSet
  1.1354.31.22 02/11/19 17:34:38 bell@sanja.is.com.ua +3 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-row-4.1

  sql/sql_select.cc
    1.173.10.11 02/11/19 17:34:36 bell@sanja.is.com.ua +0 -0
    Auto merged

  sql/sql_base.cc
    1.122.7.6 02/11/19 17:34:36 bell@sanja.is.com.ua +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.20.3.9 02/11/19 17:34:36 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1354.61.1 02/11/19 17:20:57 Sinisa@sinisa.nasamreza.org +2 -0
  Makng sure that LIMIT 0 works in this case to:
  select sql_calc_found_rows * from table limit 0;
  It does ...

  mysql-test/t/select_found.test
    1.11 02/11/19 17:20:53 Sinisa@sinisa.nasamreza.org +2 -0
    Makng sure that LIMIT 0 works in this case to:
    select sql_calc_found_rows * from table limit 0;
    It does ...

  mysql-test/r/select_found.result
    1.12 02/11/19 17:20:53 Sinisa@sinisa.nasamreza.org +5 -0
    Makng sure that LIMIT 0 works in this case to:
    select sql_calc_found_rows * from table limit 0;
    It does ...

ChangeSet
  1.676.252.2 02/11/19 17:08:07 heikki@hundin.mysql.fi +1 -0
  ha_innobase.cc:
    Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table

  sql/ha_innobase.cc
    1.45.17.1 02/11/19 17:07:58 heikki@hundin.mysql.fi +3 -1
    Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table

ChangeSet
  1.676.252.1 02/11/19 16:54:52 heikki@hundin.mysql.fi +2 -0
  row0mysql.c, row0mysql.h:
    Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table

ChangeSet
  1.1354.60.1 02/11/19 18:48:22 ram@mysql.r18.ru +2 -0
  fix for byte ordering bug in HEAP rb-tree

  heap/hp_hash.c
    1.23 02/11/19 18:48:14 ram@mysql.r18.ru +49 -0
    fix for byte ordering bug in HEAP rb-tree

  heap/hp_create.c
    1.10 02/11/19 18:48:14 ram@mysql.r18.ru +16 -0
    fix for byte ordering bug in HEAP rb-tree

  configure.in
    1.203 02/11/19 15:45:49 pem@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-skipkeys~98ee606e6b0fe965
    1.2 02/11/19 15:45:43 pem@mysql.com +0 -0
    'Auto converge rename'

  BitKeeper/etc/logging_ok
    1.212.6.4 02/11/19 15:45:38 pem@mysql.com +0 -3
    auto-union

  BitKeeper/etc/gone
    1.86.5.2 02/11/19 15:45:38 pem@mysql.com +0 -1053
    auto-union

  innobase/row/row0mysql.c
    1.16.1.21 02/11/19 16:35:35 heikki@hundin.mysql.fi +1 -0
    Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table

  innobase/include/row0mysql.h
    1.11.1.1 02/11/19 16:34:35 heikki@hundin.mysql.fi +1 -0
    Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table

ChangeSet
  1.1346.46.8 02/11/19 16:27:26 heikki@hundin.mysql.fi +5 -0
  row0mysql.c, row0mysql.h, ha_innodb.cc, sql_table.cc, handler.h:
    Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp

  innobase/row/row0mysql.c
    1.36 02/11/19 16:27:15 heikki@hundin.mysql.fi +2 -0
    Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp

  innobase/include/row0mysql.h
    1.13 02/11/19 16:27:05 heikki@hundin.mysql.fi +4 -0
    Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp

ChangeSet
  1.1354.59.1 02/11/19 18:26:53 vva@genie.(none) +62 -0
  upgrade readline to version 4.3

  sql/ha_innodb.cc
    1.73.1.56 02/11/19 16:26:45 heikki@hundin.mysql.fi +14 -9
    Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp

  sql/sql_table.cc
    1.112.1.29 02/11/19 16:26:36 heikki@hundin.mysql.fi +0 -1
    Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp

  sql/handler.h
    1.71.1.8 02/11/19 16:26:28 heikki@hundin.mysql.fi +0 -1
    Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp

  readline/xmalloc.h
    1.1 02/11/19 18:25:29 vva@genie.(none) +46 -0

  readline/text.c
    1.1 02/11/19 18:25:29 vva@genie.(none) +1540 -0

  readline/rltypedefs.h
    1.1 02/11/19 18:25:29 vva@genie.(none) +88 -0

  readline/rlshell.h
    1.1 02/11/19 18:25:29 vva@genie.(none) +34 -0

  readline/rlprivate.h
    1.1 02/11/19 18:25:29 vva@genie.(none) +284 -0

  readline/rlmbutil.h
    1.1 02/11/19 18:25:29 vva@genie.(none) +108 -0

  readline/misc.c
    1.1 02/11/19 18:25:29 vva@genie.(none) +496 -0

  readline/mbutil.c
    1.1 02/11/19 18:25:29 vva@genie.(none) +337 -0

  readline/xmalloc.h
    1.0 02/11/19 18:25:29 vva@genie.(none) +0 -0
    BitKeeper file /home/vva/work/new_readline/4.1/readline/xmalloc.h

  readline/xmalloc.c
    1.3 02/11/19 18:25:29 vva@genie.(none) +22 -21
    upgrade readline to version 4.3

  readline/vi_mode.c
    1.8 02/11/19 18:25:29 vva@genie.(none) +248 -152
    upgrade readline to version 4.3

  readline/vi_keymap.c
    1.3 02/11/19 18:25:29 vva@genie.(none) +645 -645
    upgrade readline to version 4.3

  readline/util.c
    1.4 02/11/19 18:25:29 vva@genie.(none) +68 -95
    upgrade readline to version 4.3

  readline/undo.c
    1.5 02/11/19 18:25:29 vva@genie.(none) +19 -14
    upgrade readline to version 4.3

  readline/tilde.h
    1.4 02/11/19 18:25:29 vva@genie.(none) +29 -16
    upgrade readline to version 4.3

  readline/tilde.c
    1.5 02/11/19 18:25:29 vva@genie.(none) +72 -52
    upgrade readline to version 4.3

  readline/text.c
    1.0 02/11/19 18:25:29 vva@genie.(none) +0 -0
    BitKeeper file /home/vva/work/new_readline/4.1/readline/text.c

  readline/rltypedefs.h
    1.0 02/11/19 18:25:29 vva@genie.(none) +0 -0
    BitKeeper file /home/vva/work/new_readline/4.1/readline/rltypedefs.h

  readline/rlshell.h
    1.0 02/11/19 18:25:29 vva@genie.(none) +0 -0
    BitKeeper file /home/vva/work/new_readline/4.1/readline/rlshell.h

  readline/rlprivate.h
    1.0 02/11/19 18:25:29 vva@genie.(none) +0 -0
    BitKeeper file /home/vva/work/new_readline/4.1/readline/rlprivate.h

  readline/rlmbutil.h
    1.0 02/11/19 18:25:29 vva@genie.(none) +0 -0
    BitKeeper file /home/vva/work/new_readline/4.1/readline/rlmbutil.h

  readline/misc.c
    1.0 02/11/19 18:25:29 vva@genie.(none) +0 -0
    BitKeeper file /home/vva/work/new_readline/4.1/readline/misc.c

  readline/mbutil.c
    1.0 02/11/19 18:25:29 vva@genie.(none) +0 -0
    BitKeeper file /home/vva/work/new_readline/4.1/readline/mbutil.c

  readline/terminal.c
    1.5 02/11/19 18:25:28 vva@genie.(none) +299 -195
    upgrade readline to version 4.3

  readline/tcap.h
    1.3 02/11/19 18:25:28 vva@genie.(none) +2 -2
    upgrade readline to version 4.3

  readline/signals.c
    1.3 02/11/19 18:25:28 vva@genie.(none) +36 -32
    upgrade readline to version 4.3

  readline/shell.c
    1.5 02/11/19 18:25:28 vva@genie.(none) +77 -19
    upgrade readline to version 4.3

  readline/search.c
    1.5 02/11/19 18:25:28 vva@genie.(none) +186 -94
    upgrade readline to version 4.3

  readline/rlwinsize.h
    1.3 02/11/19 18:25:28 vva@genie.(none) +2 -3
    upgrade readline to version 4.3

  readline/rltty.h
    1.3 02/11/19 18:25:28 vva@genie.(none) +22 -3
    upgrade readline to version 4.3

  readline/rltty.c
    1.6 02/11/19 18:25:28 vva@genie.(none) +248 -74
    upgrade readline to version 4.3

  readline/rlstdc.h
    1.5 02/11/19 18:25:28 vva@genie.(none) +14 -52
    upgrade readline to version 4.3

  readline/rldefs.h
    1.3 02/11/19 18:25:28 vva@genie.(none) +32 -11
    upgrade readline to version 4.3

  readline/rlconf.h
    1.3 02/11/19 18:25:28 vva@genie.(none) +5 -6
    upgrade readline to version 4.3

  readline/readline.h
    1.5 02/11/19 18:25:28 vva@genie.(none) +433 -255
    upgrade readline to version 4.3

  readline/readline.c
    1.6 02/11/19 18:25:28 vva@genie.(none) +294 -1476
    upgrade readline to version 4.3

  readline/posixstat.h
    1.3 02/11/19 18:25:28 vva@genie.(none) +2 -2
    upgrade readline to version 4.3

  readline/posixjmp.h
    1.3 02/11/19 18:25:28 vva@genie.(none) +18 -0
    upgrade readline to version 4.3

  readline/posixdir.h
    1.3 02/11/19 18:25:28 vva@genie.(none) +10 -2
    upgrade readline to version 4.3

  readline/parens.c
    1.3 02/11/19 18:25:28 vva@genie.(none) +45 -22
    upgrade readline to version 4.3

  readline/nls.c
    1.3 02/11/19 18:25:28 vva@genie.(none) +17 -20
    upgrade readline to version 4.3

  readline/macro.c
    1.4 02/11/19 18:25:28 vva@genie.(none) +37 -49
    upgrade readline to version 4.3

  readline/kill.c
    1.5 02/11/19 18:25:28 vva@genie.(none) +78 -63
    upgrade readline to version 4.3

  readline/keymaps.h
    1.3 02/11/19 18:25:28 vva@genie.(none) +24 -21
    upgrade readline to version 4.3

  readline/keymaps.c
    1.3 02/11/19 18:25:28 vva@genie.(none) +8 -8
    upgrade readline to version 4.3

  readline/isearch.c
    1.5 02/11/19 18:25:28 vva@genie.(none) +188 -77
    upgrade readline to version 4.3

  readline/input.c
    1.8 02/11/19 18:25:28 vva@genie.(none) +174 -191
    upgrade readline to version 4.3

  readline/histsearch.c
    1.4 02/11/19 18:25:28 vva@genie.(none) +10 -15
    upgrade readline to version 4.3

  readline/history.h
    1.5 02/11/19 18:25:28 vva@genie.(none) +43 -45
    upgrade readline to version 4.3

  readline/history.c
    1.4 02/11/19 18:25:28 vva@genie.(none) +26 -33
    upgrade readline to version 4.3

  readline/histlib.h
    1.3 02/11/19 18:25:28 vva@genie.(none) +14 -14
    upgrade readline to version 4.3

  readline/histfile.c
    1.5 02/11/19 18:25:28 vva@genie.(none) +176 -73
    upgrade readline to version 4.3

  readline/histexpand.c
    1.6 02/11/19 18:25:28 vva@genie.(none) +197 -66
    upgrade readline to version 4.3

  readline/funmap.c
    1.5 02/11/19 18:25:28 vva@genie.(none) +28 -27
    upgrade readline to version 4.3

  readline/emacs_keymap.c
    1.3 02/11/19 18:25:28 vva@genie.(none) +640 -652
    upgrade readline to version 4.3

  readline/display.c
    1.6 02/11/19 18:25:28 vva@genie.(none) +920 -296
    upgrade readline to version 4.3

  readline/configure
    1.3 02/11/19 18:25:28 vva@genie.(none) +4578 -1562
    upgrade readline to version 4.3

  readline/configure.in
    1.3 02/11/19 18:25:28 vva@genie.(none) +84 -21
    upgrade readline to version 4.3

  readline/complete.c
    1.8 02/11/19 18:25:28 vva@genie.(none) +453 -197
    upgrade readline to version 4.3

  readline/chardefs.h
    1.3 02/11/19 18:25:28 vva@genie.(none) +59 -42
    upgrade readline to version 4.3

  readline/callback.c
    1.4 02/11/19 18:25:28 vva@genie.(none) +36 -30
    upgrade readline to version 4.3

  readline/bind.c
    1.8 02/11/19 18:25:28 vva@genie.(none) +435 -275
    upgrade readline to version 4.3

  readline/ansi_stdlib.h
    1.3 02/11/19 18:25:28 vva@genie.(none) +17 -4
    upgrade readline to version 4.3

  readline/README
    1.3 02/11/19 18:25:28 vva@genie.(none) +23 -14
    upgrade readline to version 4.3

  readline/Makefile.am
    1.6 02/11/19 18:25:28 vva@genie.(none) +1 -1
    upgrade readline to version 4.3

  readline/INSTALL
    1.3 02/11/19 18:25:28 vva@genie.(none) +191 -94
    upgrade readline to version 4.3

  readline/COPYING
    1.3 02/11/19 18:25:28 vva@genie.(none) +2 -2
    upgrade readline to version 4.3

  client/mysql.cc
    1.106 02/11/19 18:25:28 vva@genie.(none) +9 -9
    correct functions for readline 4.3

  client/completion_hash.h
    1.6 02/11/19 18:25:28 vva@genie.(none) +2 -2
    correct headers of functions for readline 4.3 (add const modifier to char*)

  client/completion_hash.cc
    1.10 02/11/19 18:25:28 vva@genie.(none) +3 -3
    correct headers of functions for readline 4.3 (add const modifier to char*)

ChangeSet
  1.676.1.584 02/11/19 13:45:51 lenz@mysql.com +1 -0
   - applied patch for AMD x86-64
     (thanks to Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>

  bdb/dist/aclocal/mutex.m4
    1.3.1.1 02/11/19 13:45:50 lenz@mysql.com +2 -0
     - applied patch for AMD x86-64

ChangeSet
  1.1354.58.1 02/11/19 16:02:19 ram@mysql.r18.ru +2 -0
  fix for BDB

  bdb/dist/s_all
    1.4 02/11/19 16:01:38 ram@mysql.r18.ru +16 -1
    fix for BDB

  bdb/dist/RELEASE
    1.7 02/11/19 16:01:37 ram@mysql.r18.ru +1 -1
    fix for BDB

ChangeSet
  1.1346.46.7 02/11/19 12:35:17 monty@mashka.mysql.fi +24 -0
  merge with 3.23

  vio/Makefile.am
    1.10 02/11/19 12:35:16 monty@mashka.mysql.fi +0 -0
    merge with 3.23

  myisammrg/Makefile.am
    1.10 02/11/19 12:35:16 monty@mashka.mysql.fi +0 -0
    merge with 3.23

  merge/Makefile.am
    1.7 02/11/19 12:35:16 monty@mashka.mysql.fi +0 -0
    merge with 3.23

  extra/Makefile.am
    1.10 02/11/19 12:35:16 monty@mashka.mysql.fi +1 -1
    merge with 3.23

  acinclude.m4
    1.77 02/11/19 12:35:16 monty@mashka.mysql.fi +0 -0
    merge with 3.23

  strings/Makefile.am
    1.19.1.8 02/11/19 12:18:26 monty@mashka.mysql.fi +0 -1
    Auto merged

  sql/Makefile.am
    1.66.1.6 02/11/19 12:18:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  regex/Makefile.am
    1.7 02/11/19 12:18:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysys/mf_keycache.c
    1.21 02/11/19 12:18:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  mysys/Makefile.am
    1.29.1.13 02/11/19 12:18:26 monty@mashka.mysql.fi +0 -1
    Auto merged

  myisam/Makefile.am
    1.19.1.2 02/11/19 12:18:26 monty@mashka.mysql.fi +0 -0
    Auto merged

  missing
    1.5 02/11/19 12:18:25 monty@mashka.mysql.fi +0 -101
    Auto merged

  ltmain.sh
    1.10 02/11/19 12:18:25 monty@mashka.mysql.fi +0 -1761
    Auto merged

  ltconfig
    1.12 02/11/19 12:18:25 monty@mashka.mysql.fi +0 -2
    Auto merged

  libmysql_r/Makefile.am
    1.9 02/11/19 12:18:25 monty@mashka.mysql.fi +0 -0
    Auto merged

  isam/Makefile.am
    1.7 02/11/19 12:18:25 monty@mashka.mysql.fi +0 -0
    Auto merged

  install-sh
    1.4 02/11/19 12:18:25 monty@mashka.mysql.fi +0 -2
    Auto merged

  heap/Makefile.am
    1.7 02/11/19 12:18:25 monty@mashka.mysql.fi +0 -0
    Auto merged

  dbug/Makefile.am
    1.7 02/11/19 12:18:25 monty@mashka.mysql.fi +0 -0
    Auto merged

  configure.in
    1.191.1.47 02/11/19 12:18:25 monty@mashka.mysql.fi +0 -4
    Auto merged

  config.sub
    1.10 02/11/19 12:18:25 monty@mashka.mysql.fi +0 -177
    Auto merged

  config.guess
    1.9 02/11/19 12:18:25 monty@mashka.mysql.fi +0 -501
    Auto merged

  BitKeeper/deleted/.del-depcomp
    1.2 02/11/19 12:18:25 monty@mashka.mysql.fi +0 -0
    Delete: depcomp

  BitKeeper/etc/ignore
    1.107.1.29 02/11/19 12:17:38 monty@mashka.mysql.fi +0 -9
    auto-union

ChangeSet
  1.1354.55.7 02/11/18 23:11:45 Sinisa@sinisa.nasamreza.org +1 -0
  small revert

  sql/sql_base.cc
    1.122.9.2 02/11/18 23:11:41 Sinisa@sinisa.nasamreza.org +1 -1
    one more change reverted

ChangeSet
  1.1354.55.6 02/11/18 22:41:57 Sinisa@sinisa.nasamreza.org +1 -0
  small change

  sql/sql_class.cc
    1.82.1.20 02/11/18 22:41:53 Sinisa@sinisa.nasamreza.org +2 -2
    reverting some changes and fixig C style of Sanja ... ;o)

ChangeSet
  1.1354.57.1 02/11/18 22:20:28 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-explain-4.1

  sql/sql_select.cc
    1.173.10.10 02/11/18 22:20:26 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1354.56.1 02/11/18 22:19:15 bell@sanja.is.com.ua +3 -0
  Fixed explain error handling

  sql/sql_select.cc
    1.173.13.2 02/11/18 22:19:13 bell@sanja.is.com.ua +10 -6
    Fixed explain error handling

  mysql-test/t/subselect.test
    1.19.3.8 02/11/18 22:19:13 bell@sanja.is.com.ua +2 -1
    test of subselect explain

  mysql-test/r/subselect.result
    1.20.4.2 02/11/18 22:19:13 bell@sanja.is.com.ua +2 -0
    test of subselect explain

ChangeSet
  1.1354.55.5 02/11/18 20:58:04 Sinisa@sinisa.nasamreza.org +2 -0
  fix for message being sent in EXPLAIN ...

  sql/sql_class.cc
    1.82.1.19 02/11/18 20:58:00 Sinisa@sinisa.nasamreza.org +2 -1
    fix for message being sent in EXPLAIN ...

  sql/sql_base.cc
    1.122.9.1 02/11/18 20:57:59 Sinisa@sinisa.nasamreza.org +1 -1
    temporary removal ...

ChangeSet
  1.1346.51.1 02/11/18 20:50:42 vva@genie.(none) +1 -0
  fix xml-output of mysqldump

  client/mysqldump.c
    1.65.1.21 02/11/18 20:49:54 vva@genie.(none) +27 -15
    fix xml-output 

ChangeSet
  1.1354.55.4 02/11/18 18:28:51 Sinisa@sinisa.nasamreza.org +6 -0
  lot's of fixes with test cases

  sql/sql_union.cc
    1.48 02/11/18 18:28:48 Sinisa@sinisa.nasamreza.org +0 -1
    replacing my dirty hack with Sanja's "proper" fix

  sql/sql_select.cc
    1.173.10.9 02/11/18 18:28:48 Sinisa@sinisa.nasamreza.org +4 -3
    SELECT ... LIMIT 0

  mysql-test/t/select_found.test
    1.10 02/11/18 18:28:48 Sinisa@sinisa.nasamreza.org +1 -1
    test case for new behaviour of SELECT ... LIMIT 0

  mysql-test/t/create.test
    1.16 02/11/18 18:28:48 Sinisa@sinisa.nasamreza.org +3 -0
    test case for foreign key bug that is fixed

  mysql-test/r/select_found.result
    1.11 02/11/18 18:28:48 Sinisa@sinisa.nasamreza.org +2 -2
    test case for new select ... limit 0 behaviour

  mysql-test/r/create.result
    1.20 02/11/18 18:28:48 Sinisa@sinisa.nasamreza.org +3 -0
    A test case for foreign key bug that is resolved

ChangeSet
  1.676.251.2 02/11/18 16:50:37 serg@serg.mysql.com +1 -0
  add -DHAVE_BROKEN_REALPATH to CFLAGS on FreeBSD (previous patch touched only CXXFLAGS)

  configure.in
    1.124.1.79 02/11/18 16:50:35 serg@serg.mysql.com +1 -0
    add -DHAVE_BROKEN_REALPATH to CFLAGS on FreeBSD (previous patch touched only CXXFLAGS)

ChangeSet
  1.676.251.1 02/11/18 16:31:03 serg@serg.mysql.com +1 -0
  Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql

  configure.in
    1.124.1.78 02/11/18 16:31:01 serg@serg.mysql.com +0 -0
    Auto merged

ChangeSet
  1.676.250.1 02/11/18 16:30:19 serg@serg.mysql.com +1 -0
  added -DHAVE_BROKEN_REALPATH for FreeBSD builds

  configure.in
    1.124.8.1 02/11/18 16:30:17 serg@serg.mysql.com +1 -1
    added -DHAVE_BROKEN_REALPATH for FreeBSD builds

ChangeSet
  1.676.249.1 02/11/18 14:59:45 monty@mashka.mysql.fi +1 -0
  Small change to make key cache code cleaer

  mysys/mf_keycache.c
    1.14.1.1 02/11/18 14:59:43 monty@mashka.mysql.fi +6 -5
    Small change to make key cache code cleaer

ChangeSet
  1.1354.55.3 02/11/18 14:24:56 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/sql_select.cc
    1.173.10.8 02/11/18 14:24:05 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1346.50.1 02/11/18 13:41:07 salle@geopard.(none) +2 -0
  Added tests for boolean operators in select part
  Redo of changeset I commited, but failed to push

  mysql-test/t/bool.test
    1.2 02/11/18 13:40:20 salle@geopard.(none) +23 -0
    Added tests for boolean operators in select part

  mysql-test/r/bool.result
    1.2 02/11/18 13:40:20 salle@geopard.(none) +26 -0
    Added tests for boolean operators in select part

ChangeSet
  1.1346.46.4 02/11/18 11:41:29 lenz@mysql.com +2 -0
  Merge mysql.com:/space/my/mysql-4.0
  into mysql.com:/space/my/mysql-4.0-build

  sql-bench/test-create.sh
    1.10 02/11/18 11:41:26 lenz@mysql.com +0 -1
    Auto merged

  BitKeeper/etc/ignore
    1.107.1.28 02/11/18 11:41:21 lenz@mysql.com +12 -12
    auto-union

ChangeSet
  1.1346.49.1 02/11/18 11:40:55 lenz@mysql.com +3 -0
   - Tagged ChangeSet 1.1400.1.3 as "mysql-4.0.5"
   - bumped up version number in configure.in
   - fixed a typo in test-create.sh

  sql-bench/test-create.sh
    1.8.1.1 02/11/18 11:40:53 lenz@mysql.com +1 -1
     - typo fixed

  configure.in
    1.191.1.46 02/11/18 11:40:53 lenz@mysql.com +1 -1
     - Bumped up version number to 4.0.6 now that 4.0.5 is tagged (4.0.6 is
       now labelled "gamma", according to conversation with Monty)

  BitKeeper/etc/ignore
    1.107.2.1 02/11/18 11:40:53 lenz@mysql.com +9 -0
    Added autom4te.cache/output.0 autom4te.cache/requests autom4te.cache/traces.0 bdb/dist/autom4te.cache/output.0 bdb/dist/autom4te.cache/requests bdb/dist/autom4te.cache/traces.0 innobase/autom4te.cache/output.0 innobase/autom4te.cache/requests innobase/autom4te.cache/traces.0 to the ignore list

ChangeSet
  1.1354.55.2 02/11/17 22:23:57 bell@sanja.is.com.ua +3 -0
  fixed subselect explain bug

  sql/sql_select.cc
    1.173.13.1 02/11/17 22:23:51 bell@sanja.is.com.ua +3 -8
    remuved difference between optimization for execution and optimization for description

  mysql-test/t/subselect.test
    1.19.3.7 02/11/17 22:23:51 bell@sanja.is.com.ua +15 -0
    test of subselect explain bug

  mysql-test/r/subselect.result
    1.20.4.1 02/11/17 22:23:51 bell@sanja.is.com.ua +18 -0
    test of subselect explain bug

ChangeSet
  1.1346.48.1 02/11/17 20:08:42 serg@serg.mysql.com +1 -0
  better boundary behaviour

  myisammrg/myrg_range.c
    1.2 02/11/17 20:08:40 serg@serg.mysql.com +4 -2
    better boundary behaviour

ChangeSet
  1.1346.47.1 02/11/17 20:41:25 bell@sanja.is.com.ua +5 -0
  new status variable (number of queries deleted because of low memory)

  sql/sql_cache.h
    1.17.1.2 02/11/17 20:41:20 bell@sanja.is.com.ua +1 -1
    new status variable (number of queries deleted because of low memory)

  sql/sql_cache.cc
    1.29.1.22 02/11/17 20:41:20 bell@sanja.is.com.ua +2 -1
    new status variable (number of queries deleted because of low memory)

  sql/mysqld.cc
    1.297.1.76 02/11/17 20:41:20 bell@sanja.is.com.ua +1 -0
    new status variable (number of queries deleted because of low memory)

  mysql-test/t/query_cache.test
    1.16 02/11/17 20:41:20 bell@sanja.is.com.ua +2 -0
    test of new status variable

  mysql-test/r/query_cache.result
    1.15 02/11/17 20:41:20 bell@sanja.is.com.ua +6 -0
    test of new status variable

ChangeSet
  1.1346.46.2 02/11/17 18:58:03 serg@serg.mysql.com +3 -0
  merge::records_in_range and optimizer

  sql/sql_select.cc
    1.152.1.57 02/11/17 18:58:01 serg@serg.mysql.com +2 -2
    optimizer bug fixed. (what's the difference between s->records ans s->found_records ?)

  mysql-test/t/merge.test
    1.18 02/11/17 18:58:01 serg@serg.mysql.com +33 -0
    merge::records_in_range and optimizer

  mysql-test/r/merge.result
    1.11.1.7 02/11/17 18:58:01 serg@serg.mysql.com +37 -2
    merge::records_in_range and optimizer

ChangeSet
  1.1346.46.1 02/11/17 18:54:23 serg@serg.mysql.com +4 -0
  myisammrg::records_in_range

  myisammrg/myrg_range.c
    1.1 02/11/17 18:54:21 serg@serg.mysql.com +39 -0

  sql/ha_myisammrg.h
    1.24 02/11/17 18:54:21 serg@serg.mysql.com +5 -0
    myisammrg::records_in_range

  sql/ha_myisammrg.cc
    1.38 02/11/17 18:54:21 serg@serg.mysql.com +13 -0
    myisammrg::records_in_range

  myisammrg/myrg_range.c
    1.0 02/11/17 18:54:21 serg@serg.mysql.com +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-4.0/myisammrg/myrg_range.c

  myisammrg/Makefile.am
    1.9 02/11/17 18:54:21 serg@serg.mysql.com +1 -1
    myisammrg::records_in_range

ChangeSet
  1.676.1.581 02/11/17 16:45:21 lenz@mysql.com +23 -0
   - Applied required modifications for automake 1.5
   - "make distcheck" needs to be fixed

  vio/Makefile.am
    1.4.1.1 02/11/17 16:29:45 lenz@mysql.com +0 -12
     - removed OMIT_DEPENDENCIES to make automake 1.5 happy

  strings/Makefile.am
    1.15.1.6 02/11/17 16:29:45 lenz@mysql.com +1 -10
     - removed OMIT_DEPENDENCIES to make automake 1.5 happy
     - removed @CHARSET_SRCS@

  sql/Makefile.am
    1.38.1.7 02/11/17 16:29:45 lenz@mysql.com +0 -10
     - removed OMIT_DEPENDENCIES to make automake 1.5 happy

  regex/Makefile.am
    1.5.1.1 02/11/17 16:29:45 lenz@mysql.com +0 -9
     - removed OMIT_DEPENDENCIES to make automake 1.5 happy

  mysys/Makefile.am
    1.21.1.7 02/11/17 16:29:45 lenz@mysql.com +1 -10
     - removed OMIT_DEPENDENCIES to make automake 1.5 happy
     - added $(EXEEXT) to test_charset

  myisammrg/Makefile.am
    1.5.1.1 02/11/17 16:29:45 lenz@mysql.com +0 -8
     - removed OMIT_DEPENDENCIES to make automake 1.5 happy

  myisam/Makefile.am
    1.14.1.1 02/11/17 16:29:45 lenz@mysql.com +0 -11
     - removed OMIT_DEPENDENCIES to make automake 1.5 happy

  missing
    1.2.1.1 02/11/17 16:29:45 lenz@mysql.com +101 -8
     - applied diffs from missing of automake 1.5

  merge/Makefile.am
    1.4.1.1 02/11/17 16:29:45 lenz@mysql.com +0 -9
     - removed OMIT_DEPENDENCIES to make automake 1.5 happy

  ltmain.sh
    1.6.1.2 02/11/17 16:29:45 lenz@mysql.com +1761 -792
     - applied diffs from ltmain.sh of libtool 1.4.2

  ltconfig
    1.6.1.2 02/11/17 16:29:45 lenz@mysql.com +2 -2
     - small correction for new libtool

  libmysql_r/Makefile.am
    1.4.1.3 02/11/17 16:29:45 lenz@mysql.com +0 -11
     - removed OMIT_DEPENDENCIES to make automake 1.5 happy

  isam/Makefile.am
    1.5.1.1 02/11/17 16:29:45 lenz@mysql.com +0 -9
     - removed OMIT_DEPENDENCIES to make automake 1.5 happy

  install-sh
    1.2.1.1 02/11/17 16:29:45 lenz@mysql.com +2 -1
     - applied diffs from install.sh of automake 1.5

  heap/Makefile.am
    1.5.1.1 02/11/17 16:29:45 lenz@mysql.com +0 -9
     - removed OMIT_DEPENDENCIES to make automake 1.5 happy

  extra/Makefile.am
    1.7.1.1 02/11/17 16:29:45 lenz@mysql.com +0 -9
     - removed OMIT_DEPENDENCIES to make automake 1.5 happy

  dbug/Makefile.am
    1.5.1.1 02/11/17 16:29:45 lenz@mysql.com +0 -9
     - removed OMIT_DEPENDENCIES to make automake 1.5 happy

  configure.in
    1.124.1.77 02/11/17 16:29:45 lenz@mysql.com +4 -1
     - renamed "AM_PROG_LIBTOOL" -> "AC_PROG_LIBTOOL"
     - added "AM_PROG_AS" for automake 1.5

  config.sub
    1.5.1.2 02/11/17 16:29:45 lenz@mysql.com +177 -94
     - applied diffs from config.sub of automake 1.5

  config.guess
    1.3.1.2 02/11/17 16:29:45 lenz@mysql.com +501 -269
     - applied diffs from config.guess of automake 1.5

  acinclude.m4
    1.35.1.11 02/11/17 16:29:45 lenz@mysql.com +0 -432
     - removed libtool.m4 (is part of libtool 1.4)

  BitKeeper/etc/ignore
    1.61.1.20 02/11/17 16:29:45 lenz@mysql.com +9 -0
    Added autom4te.cache/output.0 autom4te.cache/requests autom4te.cache/traces.0 bdb/dist/autom4te.cache/output.0 bdb/dist/autom4te.cache/requests bdb/dist/autom4te.cache/traces.0 innobase/autom4te.cache/output.0 innobase/autom4te.cache/requests innobase/autom4te.cache/traces.0 to the ignore list

  depcomp
    1.1 02/11/17 14:33:35 mysqldev@build.mysql2.com +411 -0

  depcomp
    1.0 02/11/17 14:33:35 mysqldev@build.mysql2.com +0 -0
    BitKeeper file /build/mysqldev/my/mysql-3.23-automake/depcomp

ChangeSet
  1.1346.1.71 02/11/17 14:16:25 lenz@mysql.com +2 -0
  Merge lgrimmer@work.mysql.com:/home/bk/mysql-4.0
  into mysql.com:/my/mysql-4.0

  BitKeeper/etc/logging_ok
    1.206.1.55 02/11/17 14:12:08 lenz@mysql.com +0 -1
    auto-union

  BitKeeper/etc/gone
    1.89 02/11/17 14:12:08 lenz@mysql.com +0 -1081
    auto-union

ChangeSet
  1.1354.54.2 02/11/17 05:41:42 wax@mysql.com +3 -0
  Move MI_SORT_PARAM and BUFFPEK to myisamdef.h, delete KEY_STORE, change functions 
  of store keys to temp. file

  myisam/sort.c
    1.27 02/11/17 05:41:39 wax@mysql.com +67 -84
    Delete KEY_STORE, change functions of store keys to temp. file

  myisam/myisamdef.h
    1.51 02/11/17 05:41:39 wax@mysql.com +37 -0
    Move MI_SORT_PARAM and BUFFPEK. Change MI_SORT_PARAM

  include/myisam.h
    1.43 02/11/17 05:41:39 wax@mysql.com +0 -27
    move MI_SORT_PARAM to myisamdef.h

ChangeSet
  1.1346.1.70 02/11/17 00:36:28 serg@serg.mysql.com +3 -0
  Merge serg.mysql.com:/usr/home/serg/Abk/mysql
  into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

  support-files/mysql.server.sh
    1.20 02/11/17 00:36:26 serg@serg.mysql.com +0 -0
    Auto merged

  sql-bench/test-create.sh
    1.9 02/11/17 00:36:26 serg@serg.mysql.com +0 -0
    Auto merged

  scripts/mysqlhotcopy.sh
    1.28 02/11/17 00:36:25 serg@serg.mysql.com +0 -0
    Auto merged

ChangeSet
  1.676.1.580 02/11/17 00:35:13 serg@serg.mysql.com +1 -0
  Delete: include/.my_sys.h.swp

  BitKeeper/deleted/.del-.my_sys.h.swp~f6a4a7f8dae03f18
    1.1.1.1 02/11/17 00:33:58 serg@serg.mysql.com +0 -0
    Delete: include/.my_sys.h.swp

ChangeSet
  1.1354.55.1 02/11/17 00:31:57 serg@serg.mysql.com +2 -0
  typelib.h is required by mysql.h and should be installed

  include/Makefile.am
    1.34 02/11/17 00:31:55 serg@serg.mysql.com +1 -1
    typelib.h is required by mysql.h and should be installed

  BitKeeper/deleted/.del-.my_sys.h.swp~f6a4a7f8dae03f18
    1.2 02/11/17 00:25:55 serg@serg.mysql.com +0 -0
    Delete: include/.my_sys.h.swp

ChangeSet
  1.1354.54.1 02/11/17 04:15:00 wax@mysql.com +1 -0
  Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4mi

  BitKeeper/etc/logging_ok
    1.212.11.4 02/11/17 04:14:53 wax@mysql.com +0 -1
    auto-union

ChangeSet
  1.1354.31.21 02/11/16 23:30:14 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-row-4.1

  sql/item_cmpfunc.cc
    1.35.1.3 02/11/16 23:30:12 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.1.69 02/11/16 21:58:09 monty@mashka.mysql.fi +4 -0
  Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0

  sql/sql_update.cc
    1.54.1.13 02/11/16 21:58:06 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/sql_delete.cc
    1.74.1.15 02/11/16 21:58:06 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_myisam.cc
    1.92.1.18 02/11/16 21:58:06 monty@mashka.mysql.fi +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.73.1.55 02/11/16 21:58:06 monty@mashka.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.1346.45.1 02/11/16 20:19:10 monty@mashka.mysql.fi +26 -0
  Small improvement to alloc_root
  Add support for LIMIT # OFFSET #
  Changed lock handling:  Now all locks should be stored in TABLE_LIST instead of passed to functions.
  Don't call query_cache_invalidate() twice in some cases
  mysql_change_user() now clears states to be equal to close + connect.
  Fixed a bug with multi-table-update and multi-table-delete when used with LOCK TABLES
  Fixed a bug with replicate-do and UPDATE

  mysql-test/t/rpl_replicate_do.test
    1.15 02/11/16 20:19:08 monty@mashka.mysql.fi +20 -14
    Changed tables to use t1,t2,...

  mysql-test/t/rpl_replicate_do-slave.opt
    1.6 02/11/16 20:19:08 monty@mashka.mysql.fi +1 -1
    Changed tables to use t1,t2,...

  sql/sql_yacc.yy
    1.145.1.44 02/11/16 20:19:07 monty@mashka.mysql.fi +84 -52
    Locking type is now stored in TABLE_LIST
    Added support for LIMIT # OFFSET # syntax
    Removed some wrong (never true) checks for SQLCOM_MULTI_UPDATE

  sql/sql_update.cc
    1.54.4.1 02/11/16 20:19:07 monty@mashka.mysql.fi +21 -10
    Remove locking argument from mysql_update()
    Locking type is now stored in TABLE_LIST
    Small code change to not call query_cache_invalidate() twice for transactional tables.

  sql/sql_parse.cc
    1.218.1.58 02/11/16 20:19:07 monty@mashka.mysql.fi +80 -56
    Changes to make mysql_change_user() work as close+connect
    Changed command statistics to use statstics_increment to get more speed
    Update code to handle that locks is now stored in TABLE_LIST

  sql/sql_insert.cc
    1.63.1.20 02/11/16 20:19:07 monty@mashka.mysql.fi +15 -9
    Remove locking argument from mysql_insert()
    Locking type is now stored in TABLE_LIST
    Small code change to not call query_cache_invalidate() twice for transactional tables.
    Don't use bulk insert if bulk_insert_buff_size is 0

  sql/sql_delete.cc
    1.74.4.1 02/11/16 20:19:07 monty@mashka.mysql.fi +19 -11
    Remove locking argument from mysql_delete()
    Locking type is now stored in TABLE_LIST
    Small code change to not call query_cache_invalidate() twice for transactional tables.

  sql/sql_class.h
    1.111.1.23 02/11/16 20:19:07 monty@mashka.mysql.fi +4 -5
    Prototype changes in class THD

  sql/sql_class.cc
    1.71.1.21 02/11/16 20:19:07 monty@mashka.mysql.fi +57 -23
    Split THD::THD to two functions
    Move some code from cleanup() to ~THD:THD
    Add THD::change_user()

  sql/sql_base.cc
    1.117.1.30 02/11/16 20:19:07 monty@mashka.mysql.fi +92 -32
    Change lock handling by open_ltable() and open_and_lock_tables()

  sql/mysqld.cc
    1.297.1.75 02/11/16 20:19:07 monty@mashka.mysql.fi +11 -0
    Added function clear_error_messages()

  sql/mysql_priv.h
    1.150.1.21 02/11/16 20:19:07 monty@mashka.mysql.fi +6 -5
    Change of lock handling

  sql/lock.cc
    1.38.1.2 02/11/16 20:19:07 monty@mashka.mysql.fi +1 -0
    Added assertion

  sql/lex.h
    1.66.1.17 02/11/16 20:19:07 monty@mashka.mysql.fi +1 -0
    Add support for LIMIT # OFFSET #

  sql/ha_myisam.cc
    1.92.4.1 02/11/16 20:19:07 monty@mashka.mysql.fi +1 -1
    Safety change

  sql/ha_innodb.cc
    1.73.7.1 02/11/16 20:19:07 monty@mashka.mysql.fi +1 -0
    More debug messages

  mysys/my_alloc.c
    1.17 02/11/16 20:19:07 monty@mashka.mysql.fi +7 -8
    Small imprevement to alloc_root
    (Don't free blocks less than ALLOC_MAX_BLOCK_ROOT (4K)

  mysql-test/t/rpl_rotate_logs.test
    1.34.1.1 02/11/16 20:19:07 monty@mashka.mysql.fi +2 -2
    Make test independent of if t1 exists

  mysql-test/t/multi_update.test
    1.15 02/11/16 20:19:07 monty@mashka.mysql.fi +27 -1
    Added test with lock tables

  mysql-test/r/rpl_rotate_logs.result
    1.32.1.1 02/11/16 20:19:07 monty@mashka.mysql.fi +2 -1
    Make test independent of if t1 exists

  mysql-test/r/rpl_replicate_do.result
    1.8.1.2 02/11/16 20:19:07 monty@mashka.mysql.fi +22 -14
    Update results

  mysql-test/r/multi_update.result
    1.13 02/11/16 20:19:07 monty@mashka.mysql.fi +26 -1
    Added test with lock tables

  myisam/mi_page.c
    1.12 02/11/16 20:19:07 monty@mashka.mysql.fi +3 -1
    Better DBUG message

  libmysql/libmysql.c
    1.95.1.20 02/11/16 20:19:07 monty@mashka.mysql.fi +1 -0
    Removed compiler warning

  include/my_alloc.h
    1.4 02/11/16 20:19:07 monty@mashka.mysql.fi +2 -1
    Small improvement to alloc_root

  BitKeeper/etc/ignore
    1.107.1.27 02/11/16 20:13:54 monty@mashka.mysql.fi +3 -0
    added autom4te.cache/* bdb/dist/autom4te.cache/* innobase/autom4te.cache/*

ChangeSet
  1.1354.39.24 02/11/16 16:41:29 Sinisa@sinisa.nasamreza.org +4 -0
  Some new tests...................

  mysql-test/t/select_found.test
    1.9 02/11/16 16:41:24 Sinisa@sinisa.nasamreza.org +4 -0
    A test for LIMIT 0

  mysql-test/t/derived.test
    1.8 02/11/16 16:41:24 Sinisa@sinisa.nasamreza.org +12 -0
    A test for derived table which requires creation on temporary MyISAM
    table ...

  mysql-test/r/select_found.result
    1.10 02/11/16 16:41:24 Sinisa@sinisa.nasamreza.org +10 -0
    A test for LIMIT )

  mysql-test/r/derived.result
    1.8 02/11/16 16:41:23 Sinisa@sinisa.nasamreza.org +25 -0
    A test for derived table which requires creation on temporary MyISAM
    table ...

ChangeSet
  1.1354.39.23 02/11/16 14:31:48 Sinisa@sinisa.nasamreza.org +2 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/sql_union.cc
    1.47 02/11/16 14:31:44 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  sql/sql_derived.cc
    1.16 02/11/16 14:31:44 Sinisa@sinisa.nasamreza.org +0 -1
    Auto merged

ChangeSet
  1.1346.1.68 02/11/16 01:59:04 heikki@hundin.mysql.fi +1 -0
  srv0start.c:
    Print an error message if someone tries to call InnoDB startip more than once during process lifetime

  innobase/srv/srv0start.c
    1.36 02/11/16 01:58:54 heikki@hundin.mysql.fi +16 -0
    Print an error message if someone tries to call InnoDB startip more than once during process lifetime

ChangeSet
  1.1354.53.1 02/11/16 00:01:48 bell@sanja.is.com.ua +3 -0
  Fixed bugs pointed by "Crash with 'big' derivated table in MySQL-4.1" bugreport
   - fixed switching from heap to MyISAM table
   - fixed error handler

  sql/sql_union.cc
    1.45.1.1 02/11/16 00:01:43 bell@sanja.is.com.ua +7 -1
    fixed switching from heap to MyISAM table

  sql/sql_parse.cc
    1.235.12.10 02/11/16 00:01:43 bell@sanja.is.com.ua +1 -1
    fixed error handler

  sql/sql_derived.cc
    1.14.1.1 02/11/16 00:01:43 bell@sanja.is.com.ua +1 -2
    A fix for the bug when MyISAM tmp table has to be created in order to resolve derived table.
    fixed error handler

ChangeSet
  1.1346.1.67 02/11/15 23:10:51 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Remove unintentionally pushed printf

  sql/ha_innodb.cc
    1.73.1.54 02/11/15 23:10:43 heikki@hundin.mysql.fi +0 -2
    Remove unintentionally pushed printf

ChangeSet
  1.1346.1.66 02/11/15 22:59:16 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Fix another bug introduced in 4.0.4 in AUTO_INCREMENT and deadlock or lock wait timeout

  sql/ha_innodb.cc
    1.73.1.53 02/11/15 22:59:04 heikki@hundin.mysql.fi +12 -4
    Fix another bug introduced in 4.0.4 in AUTO_INCREMENT and deadlock or lock wait timeout

ChangeSet
  1.1346.44.1 02/11/15 22:01:28 Sinisa@sinisa.nasamreza.org +2 -0
  A fix for safe updates

  sql/sql_update.cc
    1.54.1.12 02/11/15 22:01:25 Sinisa@sinisa.nasamreza.org +3 -5
    A fix for safe updates

  sql/sql_delete.cc
    1.74.1.14 02/11/15 22:01:25 Sinisa@sinisa.nasamreza.org +4 -4
    A fix for safe updates

ChangeSet
  1.1354.52.1 02/11/15 20:32:09 bell@sanja.is.com.ua +47 -0
  basic row Items (SCRUM)

  sql/item_row.h
    1.1 02/11/15 20:32:04 bell@sanja.is.com.ua +65 -0

  sql/item_row.cc
    1.1 02/11/15 20:32:04 bell@sanja.is.com.ua +66 -0

  sql/item_row.h
    1.0 02/11/15 20:32:04 bell@sanja.is.com.ua +0 -0
    BitKeeper file /home/bell/mysql/work-row-4.1/sql/item_row.h

  sql/item_row.cc
    1.0 02/11/15 20:32:04 bell@sanja.is.com.ua +0 -0
    BitKeeper file /home/bell/mysql/work-row-4.1/sql/item_row.cc

  mysql-test/t/row_test.test
    1.1 02/11/15 20:32:04 bell@sanja.is.com.ua +19 -0

  mysql-test/r/row_test.result
    1.1 02/11/15 20:32:03 bell@sanja.is.com.ua +45 -0

  sql/sql_yacc.yy
    1.184.6.10 02/11/15 20:32:03 bell@sanja.is.com.ua +5 -0
    basic row Items

  sql/sql_select.cc
    1.173.12.1 02/11/15 20:32:03 bell@sanja.is.com.ua +10 -4
    basic row Items

  sql/sql_lex.cc
    1.49.3.3 02/11/15 20:32:03 bell@sanja.is.com.ua +4 -0
    basic row Items

  sql/sql_base.cc
    1.122.7.5 02/11/15 20:32:03 bell@sanja.is.com.ua +2 -2
    fix_fields error handling

  sql/share/ukrainian/errmsg.txt
    1.20 02/11/15 20:32:03 bell@sanja.is.com.ua +3 -3
    more wide error mening

  sql/share/swedish/errmsg.txt
    1.57 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  sql/share/spanish/errmsg.txt
    1.57 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  sql/share/slovak/errmsg.txt
    1.57 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  sql/share/serbian/errmsg.txt
    1.11 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  sql/share/russian/errmsg.txt
    1.54 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  sql/share/romanian/errmsg.txt
    1.55 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  sql/share/portuguese/errmsg.txt
    1.57 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  sql/share/polish/errmsg.txt
    1.56 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  sql/share/norwegian/errmsg.txt
    1.56 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  sql/share/norwegian-ny/errmsg.txt
    1.56 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  sql/share/korean/errmsg.txt
    1.56 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  sql/share/japanese/errmsg.txt
    1.56 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  sql/share/italian/errmsg.txt
    1.62 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  sql/share/hungarian/errmsg.txt
    1.58 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  sql/share/greek/errmsg.txt
    1.57 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  sql/share/german/errmsg.txt
    1.56 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  sql/share/french/errmsg.txt
    1.56 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  sql/share/estonian/errmsg.txt
    1.57 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  sql/share/english/errmsg.txt
    1.62 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  sql/share/dutch/errmsg.txt
    1.59 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  sql/share/danish/errmsg.txt
    1.55 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  sql/share/czech/errmsg.txt
    1.57 02/11/15 20:32:03 bell@sanja.is.com.ua +2 -2
    more wide error mening

  sql/item_sum.cc
    1.38.1.3 02/11/15 20:32:03 bell@sanja.is.com.ua +20 -3
    basic row Items

  sql/item_subselect.cc
    1.20.1.6 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    basic row Items

  sql/item_strfunc.h
    1.30.1.5 02/11/15 20:32:03 bell@sanja.is.com.ua +7 -4
    basic row Items

  sql/item_strfunc.cc
    1.54.4.8 02/11/15 20:32:03 bell@sanja.is.com.ua +2 -2
    basic row Items

  sql/item_func.h
    1.48 02/11/15 20:32:03 bell@sanja.is.com.ua +16 -10
    basic row Items

  sql/item_func.cc
    1.85 02/11/15 20:32:03 bell@sanja.is.com.ua +41 -4
    basic row Items

  sql/item_cmpfunc.h
    1.19.1.2 02/11/15 20:32:03 bell@sanja.is.com.ua +86 -19
    basic row Items

  sql/item_cmpfunc.cc
    1.35.2.1 02/11/15 20:32:03 bell@sanja.is.com.ua +96 -47
    basic row Items

  sql/item.h
    1.34.2.2 02/11/15 20:32:03 bell@sanja.is.com.ua +11 -2
    basic row Items

  sql/item.cc
    1.27.4.10 02/11/15 20:32:03 bell@sanja.is.com.ua +14 -0
    basic row Items

  sql/filesort.cc
    1.57 02/11/15 20:32:03 bell@sanja.is.com.ua +8 -0
    basic row Items

  sql/Makefile.am
    1.76 02/11/15 20:32:03 bell@sanja.is.com.ua +4 -2
    basic row Items

  mysql-test/t/row_test.test
    1.0 02/11/15 20:32:03 bell@sanja.is.com.ua +0 -0
    BitKeeper file /home/bell/mysql/work-row-4.1/mysql-test/t/row_test.test

  mysql-test/r/subselect.result
    1.20.3.8 02/11/15 20:32:03 bell@sanja.is.com.ua +2 -2
    more wide error mening

  mysql-test/r/row_test.result
    1.0 02/11/15 20:32:03 bell@sanja.is.com.ua +0 -0
    BitKeeper file /home/bell/mysql/work-row-4.1/mysql-test/r/row_test.result

  libmysqld/Makefile.am
    1.27 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    basic row Items

  include/mysqld_error.h
    1.55 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    more wide error mening

  include/mysql_com.h
    1.46.1.3 02/11/15 20:32:03 bell@sanja.is.com.ua +1 -1
    basic row Items

ChangeSet
  1.1354.39.21 02/11/15 19:58:07 Sinisa@sinisa.nasamreza.org +2 -0
  A fix for the bug when MyISAM tmp table has to be created in order
  to resolve derived table.
  
  Will make a test case for this quite soon.

  sql/sql_union.cc
    1.46 02/11/15 19:58:03 Sinisa@sinisa.nasamreza.org +1 -0
    A fix for the bug when MyISAM tmp table has to be created in order
    to resolve derived table.
    
    Will make a test case for this quite soon.

  sql/sql_derived.cc
    1.15 02/11/15 19:58:03 Sinisa@sinisa.nasamreza.org +2 -1
    A fix for the bug when MyISAM tmp table has to be created in order
    to resolve derived table.
    
    Will make a test case for this quite soon.

ChangeSet
  1.1346.1.64 02/11/15 18:46:23 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Fix bug intoduced in 4.0.4 in REPLACE and AUTO_INCREMENT: if replace did an update, then auto-inc counter was left 1 too low

  sql/ha_innodb.cc
    1.73.1.52 02/11/15 18:46:15 heikki@hundin.mysql.fi +16 -3
    Fix bug intoduced in 4.0.4 in REPLACE and AUTO_INCREMENT: if replace did an update, then auto-inc counter was left 1 too low

ChangeSet
  1.1354.39.20 02/11/15 16:37:44 Sinisa@sinisa.nasamreza.org +2 -0
  few small bug fixes ...

  sql/sql_table.cc
    1.125.1.11 02/11/15 16:37:40 Sinisa@sinisa.nasamreza.org +5 -4
    A fix for foreign key handling ...

  sql/sql_delete.cc
    1.84 02/11/15 16:37:40 Sinisa@sinisa.nasamreza.org +1 -1
    A better fix for safe updates

ChangeSet
  1.1354.51.2 02/11/15 17:34:10 ram@mysql.r18.ru +2 -0
  test for NULL processing has been added

  mysql-test/t/heap_btree.test
    1.5 02/11/15 17:34:03 ram@mysql.r18.ru +7 -0
    test for NULL processing has been added

  mysql-test/r/heap_btree.result
    1.8 02/11/15 17:34:03 ram@mysql.r18.ru +14 -0
    test for NULL processing has been added

ChangeSet
  1.1354.50.1 02/11/15 16:45:08 ram@mysql.r18.ru +3 -0
  fix for NULL processing

  heap/hp_rkey.c
    1.11 02/11/15 16:45:01 ram@mysql.r18.ru +2 -4
    fix for NULL processing

  heap/hp_hash.c
    1.22 02/11/15 16:45:01 ram@mysql.r18.ru +17 -12
    fix for NULL processing

  heap/heapdef.h
    1.12 02/11/15 16:45:01 ram@mysql.r18.ru +2 -1
    fix for NULL processing

ChangeSet
  1.1354.39.18 02/11/15 13:58:24 bar@bar.mysql.r18.ru +2 -0
  Copy from /sql directory

  client/sql_string.h
    1.9 02/11/15 13:58:22 bar@bar.mysql.r18.ru +1 -4
    Copy from /sql directory

  client/sql_string.cc
    1.15 02/11/15 13:58:22 bar@bar.mysql.r18.ru +75 -264
    Copy from /sql directory

ChangeSet
  1.1354.39.17 02/11/15 11:44:23 bar@bar.mysql.r18.ru +17 -0
  move like_range into CHARSET_INFO structure

  strings/ctype.c
    1.38 02/11/15 11:44:21 bar@bar.mysql.r18.ru +23 -23
    move like_range into CHARSET_INFO structure

  strings/ctype-win1250ch.c
    1.8 02/11/15 11:44:21 bar@bar.mysql.r18.ru +4 -5
    move like_range into CHARSET_INFO structure

  strings/ctype-utf8.c
    1.12 02/11/15 11:44:21 bar@bar.mysql.r18.ru +2 -2
    move like_range into CHARSET_INFO structure

  strings/ctype-ujis.c
    1.20 02/11/15 11:44:21 bar@bar.mysql.r18.ru +1 -1
    move like_range into CHARSET_INFO structure

  strings/ctype-tis620.c
    1.27 02/11/15 11:44:21 bar@bar.mysql.r18.ru +4 -5
    move like_range into CHARSET_INFO structure

  strings/ctype-sjis.c
    1.27 02/11/15 11:44:21 bar@bar.mysql.r18.ru +4 -5
    move like_range into CHARSET_INFO structure

  strings/ctype-simple.c
    1.11 02/11/15 11:44:21 bar@bar.mysql.r18.ru +69 -0
    move like_range into CHARSET_INFO structure

  strings/ctype-latin1_de.c
    1.18 02/11/15 11:44:21 bar@bar.mysql.r18.ru +5 -6
    move like_range into CHARSET_INFO structure

  strings/ctype-gbk.c
    1.22 02/11/15 11:44:21 bar@bar.mysql.r18.ru +4 -5
    move like_range into CHARSET_INFO structure

  strings/ctype-gb2312.c
    1.18 02/11/15 11:44:21 bar@bar.mysql.r18.ru +1 -1
    move like_range into CHARSET_INFO structure

  strings/ctype-euc_kr.c
    1.19 02/11/15 11:44:20 bar@bar.mysql.r18.ru +1 -1
    move like_range into CHARSET_INFO structure

  strings/ctype-czech.c
    1.22 02/11/15 11:44:20 bar@bar.mysql.r18.ru +4 -5
    move like_range into CHARSET_INFO structure

  strings/ctype-bin.c
    1.7 02/11/15 11:44:20 bar@bar.mysql.r18.ru +1 -1
    move like_range into CHARSET_INFO structure

  strings/ctype-big5.c
    1.22 02/11/15 11:44:20 bar@bar.mysql.r18.ru +4 -5
    move like_range into CHARSET_INFO structure

  sql/opt_range.cc
    1.68 02/11/15 11:44:20 bar@bar.mysql.r18.ru +8 -87
    move like_range into CHARSET_INFO structure

  mysys/charset.c
    1.48 02/11/15 11:44:20 bar@bar.mysql.r18.ru +1 -0
    move like_range into CHARSET_INFO structure

  include/m_ctype.h
    1.45 02/11/15 11:44:20 bar@bar.mysql.r18.ru +15 -5
    move like_range into CHARSET_INFO structure

ChangeSet
  1.676.1.579 02/11/15 01:57:56 lenz@mysql.com +3 -0
   - Fixed some minor bugs/typos

  support-files/mysql.server.sh
    1.13.1.2 02/11/15 01:57:40 lenz@mysql.com +1 -1
     - fixed typo

  sql-bench/test-create.sh
    1.7.1.1 02/11/15 01:57:40 lenz@mysql.com +1 -1
     - fixed typo

  scripts/mysqlhotcopy.sh
    1.20.1.7 02/11/15 01:57:40 lenz@mysql.com +1 -0
     - added missing "--host" option

ChangeSet
  1.1346.1.63 02/11/14 22:42:19 serg@serg.mysql.com +1 -0
  Merge serg.mysql.com:/usr/home/serg/Abk/mysql
  into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

  sql/ha_myisam.cc
    1.92.1.17 02/11/14 22:42:17 serg@serg.mysql.com +0 -0
    Auto merged

ChangeSet
  1.676.1.578 02/11/14 22:39:46 serg@serg.mysql.com +1 -0
  better fix for OPTIMIZE bug

  sql/ha_myisam.cc
    1.73.2.9 02/11/14 22:39:44 serg@serg.mysql.com +6 -10
    better fix for OPTIMIZE bug

  mysql-test/r/rpl_replicate_do.result
    1.8.1.1 02/11/14 22:11:29 monty@mashka.mysql.fi +0 -0
    Rename: mysql-test/r/rpl000007.result -> mysql-test/r/rpl_replicate_do.result

  mysql-test/t/rpl_replicate_do.test
    1.14 02/11/14 22:11:10 monty@mashka.mysql.fi +0 -0
    Rename: mysql-test/t/rpl000007.test -> mysql-test/t/rpl_replicate_do.test

  mysql-test/t/rpl_replicate_do-slave.opt
    1.5 02/11/14 22:11:00 monty@mashka.mysql.fi +0 -0
    Rename: mysql-test/t/rpl000007-slave.opt -> mysql-test/t/rpl_replicate_do-slave.opt

ChangeSet
  1.1354.48.2 02/11/14 22:10:17 Sinisa@sinisa.nasamreza.org +1 -0
  Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
  into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  sql/sql_select.cc
    1.173.10.7 02/11/14 22:10:12 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

ChangeSet
  1.1354.49.1 02/11/14 22:08:25 Sinisa@sinisa.nasamreza.org +2 -0
  Actually, I do it in order to pull new stuff

  sql/sql_select.cc
    1.173.11.1 02/11/14 22:08:22 Sinisa@sinisa.nasamreza.org +6 -3
    fix for LIMIT 0
    Actually, I do it in order to pull new stuff

  sql/sql_delete.cc
    1.83 02/11/14 22:08:22 Sinisa@sinisa.nasamreza.org +5 -7
    fix for safe_updates
    Actually, I do it in order to pull new stuff

ChangeSet
  1.1354.47.1 02/11/15 00:16:30 wax@mysql.com +20 -0
  Add shared memory protocol and option --protocol

  BitKeeper/etc/logging_ok
    1.212.13.1 02/11/15 00:16:30 wax@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  include/typelib.h
    1.1 02/11/15 00:16:27 wax@mysql.com +33 -0

  vio/viosocket.c
    1.16 02/11/15 00:16:27 wax@mysql.com +155 -29
    Add shared memory protocol

  include/typelib.h
    1.0 02/11/15 00:16:27 wax@mysql.com +0 -0
    BitKeeper file /home/wax/mysql-4sm/include/typelib.h

  vio/vio.c
    1.14 02/11/15 00:16:26 wax@mysql.com +77 -1
    Add shared memory protocol

  sql/set_var.cc
    1.16 02/11/15 00:16:26 wax@mysql.com +4 -0
    Add shared memory protocol variables

  sql/mysqld.cc
    1.304.2.4 02/11/15 00:16:26 wax@mysql.com +260 -6
    Add shared memory protocol and option --shared-memory, correct option --named-pipe

  libmysql/libmysql.c
    1.103 02/11/15 00:16:26 wax@mysql.com +296 -40
    Add shared memory protocol and option --protocol

  libmysql/errmsg.c
    1.16 02/11/15 00:16:26 wax@mysql.com +33 -0
    Add texts of errors of shared memory protocol 

  include/violite.h
    1.21.2.1 02/11/15 00:16:26 wax@mysql.com +26 -1
    Add shared memory protocol

  include/mysql.h
    1.43.1.6 02/11/15 00:16:26 wax@mysql.com +22 -9
    Add shared memory protocol

  include/my_sys.h
    1.82 02/11/15 00:16:26 wax@mysql.com +2 -9
    Delete TYPELIB, moved to typelib.h

  include/errmsg.h
    1.13 02/11/15 00:16:26 wax@mysql.com +12 -0
    Add error codes of shared memory protocol 

  include/config-win.h
    1.24 02/11/15 00:16:26 wax@mysql.com +5 -0
    Add shared memory protocol

  client/mysqlshow.c
    1.24.1.1 02/11/15 00:16:26 wax@mysql.com +31 -1
    Add shared memory protocol and option --protocol

  client/mysqlimport.c
    1.30 02/11/15 00:16:26 wax@mysql.com +31 -1
    Add shared memory protocol and option --protocol

  client/mysqldump.c
    1.73 02/11/15 00:16:26 wax@mysql.com +30 -1
    Add shared memory protocol and option --protocol

  client/mysqlcheck.c
    1.23.1.1 02/11/15 00:16:26 wax@mysql.com +30 -1
    Add shared memory protocol and option --protocol

  client/mysqladmin.c
    1.66.1.2 02/11/15 00:16:26 wax@mysql.com +32 -1
    Add shared memory protocol and option --protocol

  client/mysql.cc
    1.105 02/11/15 00:16:26 wax@mysql.com +31 -1
    Add shared memory protocol and option --protocol

  client/client_priv.h
    1.14.1.1 02/11/15 00:16:26 wax@mysql.com +2 -1
    Add OPT_MYSQL_PROTOCOL and OPT_SHARED_MEMORY_BASE_NAME

ChangeSet
  1.1354.39.15 02/11/14 17:25:34 bar@bar.mysql.r18.ru +3 -0
  wild_case_compate(&String, &String, escape) doesn't exist anymor

  sql/sql_string.h
    1.24 02/11/14 17:25:33 bar@bar.mysql.r18.ru +0 -4
    wild_case_compate(&String, &String, escape) doesn't exist anymor

  sql/sql_string.cc
    1.38 02/11/14 17:25:33 bar@bar.mysql.r18.ru +0 -23
    wild_case_compate(&String, &String, escape) doesn't exist anymor

  sql/item_cmpfunc.cc
    1.35.1.2 02/11/14 17:25:33 bar@bar.mysql.r18.ru +4 -4
    wild_case_compate(&String, &String, escape) doesn't exist anymor

ChangeSet
  1.1354.39.14 02/11/14 16:47:48 bar@bar.mysql.r18.ru +5 -0
  removed unused function
  some bug fixes

  sql/sql_string.cc
    1.37 02/11/14 16:47:46 bar@bar.mysql.r18.ru +6 -239
    removed unused functions

  sql/slave.cc
    1.172 02/11/14 16:47:46 bar@bar.mysql.r18.ru +3 -2
    removed unused function

  sql/mysql_priv.h
    1.160.11.2 02/11/14 16:47:46 bar@bar.mysql.r18.ru +0 -4
    removed unused functions

  mysys/charset.c
    1.47 02/11/14 16:47:46 bar@bar.mysql.r18.ru +1 -0
    wildcmp was not initialized

  include/m_ctype.h
    1.44 02/11/14 16:47:46 bar@bar.mysql.r18.ru +1 -1
    Macros bug fix

ChangeSet
  1.1354.30.3 02/11/14 14:42:18 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-4.1

  sql/sql_select.cc
    1.173.9.4 02/11/14 14:42:17 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1354.39.13 02/11/14 16:07:29 bar@bar.mysql.r18.ru +16 -0
  New wildcmp() function in CHARSET_INFO structure

  strings/ctype.c
    1.37 02/11/14 16:07:14 bar@bar.mysql.r18.ru +27 -3
    New wildcmp() function in CHARSET_INFO structure

  strings/ctype-win1250ch.c
    1.7 02/11/14 16:07:14 bar@bar.mysql.r18.ru +2 -1
    New wildcmp() function in CHARSET_INFO structure

  strings/ctype-utf8.c
    1.11 02/11/14 16:07:14 bar@bar.mysql.r18.ru +13 -11
    New wildcmp() function in CHARSET_INFO structure

  strings/ctype-ujis.c
    1.19 02/11/14 16:07:14 bar@bar.mysql.r18.ru +3 -2
    New wildcmp() function in CHARSET_INFO structure

  strings/ctype-tis620.c
    1.26 02/11/14 16:07:14 bar@bar.mysql.r18.ru +8 -7
    New wildcmp() function in CHARSET_INFO structure

  strings/ctype-sjis.c
    1.26 02/11/14 16:07:14 bar@bar.mysql.r18.ru +1 -0
    New wildcmp() function in CHARSET_INFO structure

  strings/ctype-simple.c
    1.10 02/11/14 16:07:14 bar@bar.mysql.r18.ru +94 -1
    New wildcmp() function in CHARSET_INFO structure

  strings/ctype-mb.c
    1.4 02/11/14 16:07:14 bar@bar.mysql.r18.ru +138 -0
    New wildcmp() function in CHARSET_INFO structure

  strings/ctype-latin1_de.c
    1.17 02/11/14 16:07:14 bar@bar.mysql.r18.ru +8 -7
    New wildcmp() function in CHARSET_INFO structure

  strings/ctype-gbk.c
    1.21 02/11/14 16:07:14 bar@bar.mysql.r18.ru +1 -0
    New wildcmp() function in CHARSET_INFO structure

  strings/ctype-gb2312.c
    1.17 02/11/14 16:07:14 bar@bar.mysql.r18.ru +2 -1
    New wildcmp() function in CHARSET_INFO structure

  strings/ctype-euc_kr.c
    1.18 02/11/14 16:07:13 bar@bar.mysql.r18.ru +2 -1
    New wildcmp() function in CHARSET_INFO structure

  strings/ctype-czech.c
    1.21 02/11/14 16:07:13 bar@bar.mysql.r18.ru +1 -0
    New wildcmp() function in CHARSET_INFO structure

  strings/ctype-bin.c
    1.6 02/11/14 16:07:13 bar@bar.mysql.r18.ru +101 -4
    New wildcmp() function in CHARSET_INFO structure

  strings/ctype-big5.c
    1.21 02/11/14 16:07:13 bar@bar.mysql.r18.ru +1 -0
    New wildcmp() function in CHARSET_INFO structure

  include/m_ctype.h
    1.43 02/11/14 16:07:13 bar@bar.mysql.r18.ru +18 -4
    New wildcmp() function in CHARSET_INFO structure

ChangeSet
  1.1346.43.1 02/11/14 12:21:36 monty@mashka.mysql.fi +16 -0
  Portability fix when using -DBIG_TABLES

  sql/sql_show.cc
    1.76.1.15 02/11/14 12:21:28 monty@mashka.mysql.fi +3 -3
    Portability fix when using -DBIG_TABLES

  sql/sql_select.cc
    1.152.1.56 02/11/14 12:21:28 monty@mashka.mysql.fi +6 -6
    Portability fix when using -DBIG_TABLES

  sql/sql_repl.cc
    1.86.1.2 02/11/14 12:21:28 monty@mashka.mysql.fi +1 -1
    Portability fix when using -DBIG_TABLES

  sql/set_var.cc
    1.12.1.4 02/11/14 12:21:28 monty@mashka.mysql.fi +2 -2
    Portability fix

  sql/log_event.cc
    1.77.1.15 02/11/14 12:21:27 monty@mashka.mysql.fi +2 -2
    Portability fix

  sql/item_timefunc.cc
    1.17.1.3 02/11/14 12:21:27 monty@mashka.mysql.fi +1 -1
    Portability fix

  sql/handler.h
    1.71.1.7 02/11/14 12:21:27 monty@mashka.mysql.fi +1 -1
    Portability fix when using -DBIG_TABLES

  sql/ha_isam.cc
    1.20 02/11/14 12:21:27 monty@mashka.mysql.fi +2 -1
    Portability fix when using -DBIG_TABLES

  sql/ha_innodb.cc
    1.73.1.51 02/11/14 12:21:27 monty@mashka.mysql.fi +5 -4
    Portability fix when using -DBIG_TABLES

  sql/ha_heap.cc
    1.19.1.2 02/11/14 12:21:27 monty@mashka.mysql.fi +3 -3
    Portability fix when using -DBIG_TABLES

  sql/ha_berkeley.h
    1.50.1.1 02/11/14 12:21:27 monty@mashka.mysql.fi +2 -1
    Portability fix when using -DBIG_TABLES

  sql/ha_berkeley.cc
    1.105.1.3 02/11/14 12:21:27 monty@mashka.mysql.fi +2 -2
    Portability fix when using -DBIG_TABLES

  sql/filesort.cc
    1.45.1.6 02/11/14 12:21:27 monty@mashka.mysql.fi +1 -1
    Portability fix when using -DBIG_TABLES

  include/my_base.h
    1.30.1.3 02/11/14 12:21:27 monty@mashka.mysql.fi +2 -0
    Portability fix when using -DBIG_TABLES

  client/mysqlbinlog.cc
    1.70 02/11/14 12:21:27 monty@mashka.mysql.fi +0 -1
    Fixed that --position open works.

  BitKeeper/etc/config
    1.6.1.1 02/11/14 12:21:27 monty@mashka.mysql.fi +2 -2
    Changed Sasha to sys

ChangeSet
  1.1354.39.12 02/11/14 09:43:24 bell@sanja.is.com.ua +7 -0
  fixed bug in cyclic reference refinition

  sql/sql_select.cc
    1.173.10.6 02/11/14 09:43:23 bell@sanja.is.com.ua +17 -0
    fixed bug in cyclic reference refinition

  sql/sql_parse.cc
    1.235.12.9 02/11/14 09:43:23 bell@sanja.is.com.ua +3 -1
    fixed layout
    fixed bug in cyclic reference refinition

  sql/sql_class.h
    1.123.1.17 02/11/14 09:43:23 bell@sanja.is.com.ua +2 -0
    fixed bug in cyclic reference refinition

  sql/sql_class.cc
    1.82.1.18 02/11/14 09:43:23 bell@sanja.is.com.ua +9 -0
    fixed bug in cyclic reference refinition

  sql/item.cc
    1.27.4.9 02/11/14 09:43:23 bell@sanja.is.com.ua +1 -5
    fixed bug in cyclic reference refinition

  mysql-test/t/subselect.test
    1.19.3.6 02/11/14 09:43:23 bell@sanja.is.com.ua +2 -0
    test of cyclic reference

  mysql-test/r/subselect.result
    1.20.3.7 02/11/14 09:43:23 bell@sanja.is.com.ua +2 -0
    test of cyclic reference

ChangeSet
  1.1346.1.61 02/11/14 00:27:14 serg@serg.mysql.com +1 -0
  results updated

  mysql-test/r/myisam.result
    1.10.1.7 02/11/14 00:27:12 serg@serg.mysql.com +212 -8
    updated

ChangeSet
  1.1346.1.60 02/11/13 23:38:19 serg@serg.mysql.com +7 -0
  merged

  mysql-test/t/myisam.test
    1.7.1.7 02/11/13 23:38:17 serg@serg.mysql.com +182 -10
    merged

  mysql-test/r/myisam.result
    1.10.1.6 02/11/13 23:38:17 serg@serg.mysql.com +0 -4
    merged - ul

  innobase/row/row0sel.c
    1.26 02/11/13 23:38:17 serg@serg.mysql.com +5 -1
    merged (ul - as 3.23's fix was a backport from 4.0)

  client/mysqlcheck.c
    1.25 02/11/13 23:38:17 serg@serg.mysql.com +0 -2
    merged

  sql/ha_myisam.cc
    1.92.1.16 02/11/13 23:29:54 serg@serg.mysql.com +0 -0
    Auto merged

  mysql-test/t/myisam.test
    1.2.6.2 02/11/13 23:29:54 serg@serg.mysql.com +0 -0
    Turn off SCCS flag

  mysql-test/r/myisam.result
    1.2.5.2 02/11/13 23:29:54 serg@serg.mysql.com +0 -0
    Turn off SCCS flag

  BitKeeper/etc/logging_ok
    1.206.17.6 02/11/13 23:29:52 serg@serg.mysql.com +0 -0
    auto-union

  BitKeeper/etc/gone
    1.86.1.7 02/11/13 23:29:52 serg@serg.mysql.com +5 -4
    auto-union

ChangeSet
  1.1354.46.1 02/11/14 00:26:18 bell@sanja.is.com.ua +39 -0
  fixed cyclic reference bug

  sql/sql_select.h
    1.31 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    fixed cyclic reference bug

  sql/sql_select.cc
    1.173.10.5 02/11/14 00:26:16 bell@sanja.is.com.ua +18 -0
    fixed cyclic reference bug

  sql/sql_parse.cc
    1.235.12.8 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    fixed cyclic reference bug

  sql/sql_class.h
    1.123.1.16 02/11/14 00:26:16 bell@sanja.is.com.ua +1 -0
    fixed cyclic reference bug

  sql/share/ukrainian/errmsg.txt
    1.19 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/swedish/errmsg.txt
    1.56 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/spanish/errmsg.txt
    1.56 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/slovak/errmsg.txt
    1.56 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/serbian/errmsg.txt
    1.10 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/russian/errmsg.txt
    1.53 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/romanian/errmsg.txt
    1.54 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/portuguese/errmsg.txt
    1.56 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/polish/errmsg.txt
    1.55 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/norwegian/errmsg.txt
    1.55 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/norwegian-ny/errmsg.txt
    1.55 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/korean/errmsg.txt
    1.55 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/japanese/errmsg.txt
    1.55 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/italian/errmsg.txt
    1.61 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/hungarian/errmsg.txt
    1.57 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/greek/errmsg.txt
    1.56 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/german/errmsg.txt
    1.55 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/french/errmsg.txt
    1.55 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/estonian/errmsg.txt
    1.56 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/english/errmsg.txt
    1.61 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/dutch/errmsg.txt
    1.58 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/danish/errmsg.txt
    1.54 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/share/czech/errmsg.txt
    1.56 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    new error message

  sql/item_subselect.h
    1.11.1.2 02/11/14 00:26:16 bell@sanja.is.com.ua +14 -10
    fixed cyclic reference bug

  sql/item_subselect.cc
    1.20.1.5 02/11/14 00:26:16 bell@sanja.is.com.ua +25 -0
    fixed cyclic reference bug

  sql/item_strfunc.h
    1.30.1.4 02/11/14 00:26:16 bell@sanja.is.com.ua +21 -0
    fixed cyclic reference bug

  sql/item_func.h
    1.47 02/11/14 00:26:16 bell@sanja.is.com.ua +9 -0
    fixed cyclic reference bug

  sql/item_func.cc
    1.84 02/11/14 00:26:16 bell@sanja.is.com.ua +29 -0
    fixed cyclic reference bug

  sql/item_cmpfunc.h
    1.19.1.1 02/11/14 00:26:16 bell@sanja.is.com.ua +10 -0
    fixed cyclic reference bug

  sql/item_cmpfunc.cc
    1.35.1.1 02/11/14 00:26:16 bell@sanja.is.com.ua +32 -0
    fixed cyclic reference bug

  sql/item.h
    1.34.2.1 02/11/14 00:26:16 bell@sanja.is.com.ua +6 -2
    fixed cyclic reference bug

  sql/item.cc
    1.27.4.8 02/11/14 00:26:16 bell@sanja.is.com.ua +27 -0
    fixed cyclic reference bug

  mysql-test/t/subselect.test
    1.19.3.5 02/11/14 00:26:16 bell@sanja.is.com.ua +3 -1
    test of cyclic reference

  mysql-test/r/subselect.result
    1.20.3.6 02/11/14 00:26:16 bell@sanja.is.com.ua +3 -1
    test of cyclic reference

  include/mysqld_error.h
    1.54 02/11/14 00:26:16 bell@sanja.is.com.ua +2 -1
    fixed cyclic reference bug

ChangeSet
  1.676.248.1 02/11/13 22:55:32 serg@serg.mysql.com +3 -0
  optimize table corruption fixed, though more clean fix is desired.
  Fix for another optimize bug is undone, as the new one handles both cases.
  test added

  sql/ha_myisam.cc
    1.73.2.8 02/11/13 22:55:31 serg@serg.mysql.com +10 -2
    optimize table corruption fixed, though more clean fix is desired.
    Fix for another optimize bug is undone, as the new one handles both cases.

  mysql-test/t/myisam.test
    1.2.6.1 02/11/13 22:55:31 serg@serg.mysql.com +40 -0
    optimize table corruption test

  mysql-test/r/myisam.result
    1.2.5.1 02/11/13 22:55:31 serg@serg.mysql.com +4 -0
    updated

ChangeSet
  1.1346.42.1 02/11/13 15:57:29 serg@serg.mysql.com +1 -0
  removed redundant line

  sql/sql_base.cc
    1.117.1.29 02/11/13 15:57:28 serg@serg.mysql.com +0 -1
    removed redundant line

ChangeSet
  1.676.1.576 02/11/13 16:24:50 heikki@hundin.mysql.fi +1 -0
  row0sel.c:
    Backport from 4.0 a bug fix: if unique search from a primary key matched a delete-marked record, InnoDB could return the NEXT record

  innobase/row/row0sel.c
    1.15.1.6 02/11/13 16:24:41 heikki@hundin.mysql.fi +1 -9
    Backport from 4.0 a bug fix: if unique search from a primary key matched a delete-marked record, InnoDB could return the NEXT record

ChangeSet
  1.1354.39.10 02/11/13 17:58:07 bar@bar.mysql.r18.ru +2 -0
  Some macros to make life easier

  sql/gstream.cc
    1.2 02/11/13 17:58:05 bar@bar.mysql.r18.ru +1 -1
    Some macros to make life easier

  include/m_ctype.h
    1.42 02/11/13 17:58:05 bar@bar.mysql.r18.ru +6 -0
    Some macros to make life easier

ChangeSet
  1.1346.1.58 02/11/13 15:45:05 heikki@hundin.mysql.fi +1 -0
  row0sel.c:
    Fix bug: if a unique search from a primary key matched to a delete-marked row, it could return the NEXT row

  innobase/row/row0sel.c
    1.25 02/11/13 15:44:56 heikki@hundin.mysql.fi +5 -8
    Fix bug: if a unique search from a primary key matched to a delete-marked row, it could return the NEXT row

ChangeSet
  1.1354.39.9 02/11/13 17:13:29 bar@bar.mysql.r18.ru +15 -0
  Preparing to embed string to number conversion functions into charset structure

  strings/ctype.c
    1.36 02/11/13 17:13:27 bar@bar.mysql.r18.ru +121 -1
    Preparing to embed string to number conversion functions into charset structure

  strings/ctype-win1250ch.c
    1.6 02/11/13 17:13:27 bar@bar.mysql.r18.ru +6 -1
    Preparing to embed string to number conversion functions into charset structure

  strings/ctype-utf8.c
    1.10 02/11/13 17:13:27 bar@bar.mysql.r18.ru +42 -2
    Preparing to embed string to number conversion functions into charset structure

  strings/ctype-ujis.c
    1.18 02/11/13 17:13:27 bar@bar.mysql.r18.ru +6 -1
    Preparing to embed string to number conversion functions into charset structure

  strings/ctype-tis620.c
    1.25 02/11/13 17:13:27 bar@bar.mysql.r18.ru +6 -1
    Preparing to embed string to number conversion functions into charset structure

  strings/ctype-sjis.c
    1.25 02/11/13 17:13:27 bar@bar.mysql.r18.ru +6 -1
    Preparing to embed string to number conversion functions into charset structure

  strings/ctype-simple.c
    1.9 02/11/13 17:13:27 bar@bar.mysql.r18.ru +30 -0
    Preparing to embed string to number conversion functions into charset structure

  strings/ctype-latin1_de.c
    1.16 02/11/13 17:13:27 bar@bar.mysql.r18.ru +6 -1
    Preparing to embed string to number conversion functions into charset structure

  strings/ctype-gbk.c
    1.20 02/11/13 17:13:27 bar@bar.mysql.r18.ru +6 -1
    Preparing to embed string to number conversion functions into charset structure

  strings/ctype-gb2312.c
    1.16 02/11/13 17:13:27 bar@bar.mysql.r18.ru +6 -1
    Preparing to embed string to number conversion functions into charset structure

  strings/ctype-euc_kr.c
    1.17 02/11/13 17:13:27 bar@bar.mysql.r18.ru +6 -1
    Preparing to embed string to number conversion functions into charset structure

  strings/ctype-czech.c
    1.20 02/11/13 17:13:27 bar@bar.mysql.r18.ru +6 -1
    Preparing to embed string to number conversion functions into charset structure

  strings/ctype-big5.c
    1.20 02/11/13 17:13:27 bar@bar.mysql.r18.ru +6 -1
    Preparing to embed string to number conversion functions into charset structure

  mysys/charset.c
    1.46 02/11/13 17:13:27 bar@bar.mysql.r18.ru +4 -0
    Preparing to embed string to number conversion functions into charset structure

  include/m_ctype.h
    1.41 02/11/13 17:13:27 bar@bar.mysql.r18.ru +13 -0
    Preparing to embed string to number conversion functions into charset structure

ChangeSet
  1.1354.45.3 02/11/13 13:07:58 bell@sanja.is.com.ua +1 -0
  fixed possible bug

  sql/sql_parse.cc
    1.235.12.7 02/11/13 13:07:57 bell@sanja.is.com.ua +1 -1
    fixed possible bug

ChangeSet
  1.1354.39.7 02/11/13 15:00:25 bar@bar.mysql.r18.ru +1 -0
  my_snprintf() doesn't support things like %04X so use vsprintf() instead 

  strings/ctype-simple.c
    1.8 02/11/13 15:00:24 bar@bar.mysql.r18.ru +11 -2
    my_snprintf() doesn't support things like %04X so use vsprintf() instead 

ChangeSet
  1.1354.45.2 02/11/13 11:59:03 bell@sanja.is.com.ua +6 -0
  fixed bug of derived table in subselect
  fixed bug in error handling

  sql/sql_select.cc
    1.173.10.4 02/11/13 11:59:01 bell@sanja.is.com.ua +3 -2
    more quick abort on error

  sql/sql_parse.cc
    1.235.12.6 02/11/13 11:59:01 bell@sanja.is.com.ua +14 -11
    fixed processing of derived tables

  sql/sql_lex.h
    1.94.1.4 02/11/13 11:59:01 bell@sanja.is.com.ua +1 -1
    fifex layout

  sql/sql_class.cc
    1.82.1.17 02/11/13 11:59:01 bell@sanja.is.com.ua +0 -1
    fixed error handling error

  mysql-test/t/subselect.test
    1.19.3.4 02/11/13 11:59:01 bell@sanja.is.com.ua +10 -1
    test of error handling
    test of derived tables inside subselect

  mysql-test/r/subselect.result
    1.20.3.5 02/11/13 11:59:01 bell@sanja.is.com.ua +8 -0
    test of error handling
    test of derived tables inside subselect

ChangeSet
  1.1346.41.3 02/11/13 06:11:56 heikki@hundin.mysql.fi +2 -0
  dict0load.c:
    Fix wrong sprintf argument
  row0sel.c:
    Fix uninitialized variable error found by Miguel

  innobase/dict/dict0load.c
    1.7 02/11/13 06:05:35 heikki@hundin.mysql.fi +1 -1
    Fix wrong sprintf argument

  innobase/row/row0sel.c
    1.24 02/11/13 06:03:25 heikki@hundin.mysql.fi +1 -0
    Fix uninitialized variable error found by Miguel

ChangeSet
  1.1346.41.2 02/11/12 22:11:59 miguel@hegel.local +1 -0
  Typo fix (duplicate functions body)

  sql/nt_servc.cc
    1.11 02/11/12 22:11:27 miguel@hegel.local +0 -28
    Typo fix (duplicate fuctions body)

ChangeSet
  1.1354.44.1 02/11/13 01:14:39 bell@sanja.is.com.ua +5 -0
  fixed error handling
  fixed subselects in ORDER bug

  sql/sql_select.cc
    1.173.10.3 02/11/13 01:14:38 bell@sanja.is.com.ua +1 -1
    fixed error handling

  sql/item_subselect.h
    1.11.1.1 02/11/13 01:14:38 bell@sanja.is.com.ua +2 -1
    fixed subselects in ORDER bug

  sql/item_subselect.cc
    1.20.1.4 02/11/13 01:14:38 bell@sanja.is.com.ua +1 -1
    fixed subselects in ORDER bug

  mysql-test/t/subselect.test
    1.19.3.3 02/11/13 01:14:38 bell@sanja.is.com.ua +14 -2
    test of subselects in ORDER clause
    test of error handling bug

  mysql-test/r/subselect.result
    1.20.3.4 02/11/13 01:14:38 bell@sanja.is.com.ua +14 -0
    test of subselects in ORDER clause
    test of error handling bug

ChangeSet
  1.1354.43.2 02/11/13 03:53:45 wax@mysql.com +2 -0
  add functions for store keys to temporary file with variable length

  BitKeeper/etc/logging_ok
    1.212.11.3 02/11/13 03:53:45 wax@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  myisam/sort.c
    1.26 02/11/13 03:53:32 wax@mysql.com +178 -29
    add function for store keys to temporary files with variable length

ChangeSet
  1.1346.39.5 02/11/12 23:26:10 monty@mashka.mysql.fi +1 -0
  Ensure that mysql_home ends in FN_LIBCHAR after realpath()

  sql/mysqld.cc
    1.297.1.74 02/11/12 23:26:09 monty@mashka.mysql.fi +9 -1
    Ensure that mysql_home ends in FN_LIBCHAR after realpath()

ChangeSet
  1.1346.1.56 02/11/12 17:41:31 Sinisa@sinisa.nasamreza.org +1 -0
  small fix

  sql/sql_parse.cc
    1.218.1.57 02/11/12 17:41:28 Sinisa@sinisa.nasamreza.org +1 -1
    fix for a RANME to empty string 

ChangeSet
  1.1354.43.1 02/11/12 19:21:11 ram@mysql.r18.ru +2 -0
  bdb-deadlock test: added reap commands

  mysql-test/t/bdb-deadlock.test
    1.3 02/11/12 19:21:04 ram@mysql.r18.ru +2 -0
    bdb-deadlock test: added reap commands

  mysql-test/r/bdb-deadlock.result
    1.4 02/11/12 19:21:04 ram@mysql.r18.ru +4 -4
    bdb-deadlock test: added reap commands

ChangeSet
  1.1346.1.55 02/11/12 16:27:52 Sinisa@sinisa.nasamreza.org +2 -0
  Merge

  sql/sql_base.cc
    1.117.1.28 02/11/12 16:23:59 Sinisa@sinisa.nasamreza.org +0 -0
    Auto merged

  mysql-test/r/select.result
    1.8.1.10 02/11/12 16:23:59 Sinisa@sinisa.nasamreza.org +0 -2
    Auto merged

ChangeSet
  1.1346.40.1 02/11/12 16:22:26 Sinisa@sinisa.nasamreza.org +2 -0
  IGNORE_INDEX fix for 4.0

  sql/sql_base.cc
    1.117.5.1 02/11/12 16:22:22 Sinisa@sinisa.nasamreza.org +1 -0
    IGNORE_INDEX fix for 4.0

  mysql-test/r/select.result
    1.8.2.1 02/11/12 16:22:22 Sinisa@sinisa.nasamreza.org +2 -2
    IGNORE_INDEX fix for 4.0

ChangeSet
  1.676.1.575 02/11/12 16:09:33 salle@geopard.(none) +1 -0
  Fixed mysqlcheck so it can process table names with dashes.
  Quote all table names with backticks.  

  client/mysqlcheck.c
    1.7.1.3 02/11/12 16:09:32 salle@geopard.(none) +23 -10
    Fixed mysqlcheck so it can process table names with dashes.
    Quote all table names with backticks.  

ChangeSet
  1.1354.42.1 02/11/12 17:32:36 bar@bar.mysql.r18.ru +2 -0
  These functions are now UCS2 compatible:
  CURDATE()
  FROM_DAYS()
  CURTIME()
  NOW()
  SEC_TO_TIME()
  FROM_UNIXTIME()
  DATE_ADD_INTERVAL()  

  sql/item_timefunc.h
    1.22 02/11/12 17:32:35 bar@bar.mysql.r18.ru +122 -29
    These functions are now UCS2 compatible:
    CURDATE()
    FROM_DAYS()
    CURTIME()
    NOW()
    SEC_TO_TIME()
    FROM_UNIXTIME()
    DATE_ADD_INTERVAL()  

  sql/item_timefunc.cc
    1.26 02/11/12 17:32:35 bar@bar.mysql.r18.ru +59 -23
    These functions are now UCS2 compatible:
    CURDATE()
    FROM_DAYS()
    CURTIME()
    NOW()
    SEC_TO_TIME()
    FROM_UNIXTIME()
    DATE_ADD_INTERVAL()  

ChangeSet
  1.1354.39.4 02/11/12 15:27:11 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1

  sql/sql_parse.cc
    1.235.12.5 02/11/12 15:27:10 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1354.39.3 02/11/12 15:25:09 bell@sanja.is.com.ua +3 -0
  fixed 2 typo in BUG_TABLES using
  remuved 'unstable' variable from test

  mysql-test/t/variables.test
    1.9.1.1 02/11/12 15:25:08 bell@sanja.is.com.ua +2 -1
    remuved 'unstable' variable

  mysql-test/r/variables.result
    1.13.1.1 02/11/12 15:25:08 bell@sanja.is.com.ua +1 -4
    remuved 'unstable' variable

  include/myisampack.h
    1.8.1.1 02/11/12 15:25:08 bell@sanja.is.com.ua +2 -2
    fixed 2 typo

ChangeSet
  1.1354.31.18 02/11/12 14:23:55 serg@serg.mysql.com +1 -0
  memory leak closed

  myisam/myisamchk.c
    1.88 02/11/12 14:23:53 serg@serg.mysql.com +1 -0
    memory leak closed

ChangeSet
  1.1354.40.1 02/11/12 14:40:32 Sinisa@sinisa.nasamreza.org +4 -0
  some code cleanup as per CTO's instructions plus  a small bug fix with
  a corresponding test case....

  sql/sql_parse.cc
    1.235.14.1 02/11/12 14:40:27 Sinisa@sinisa.nasamreza.org +2 -2
    some code cleanup as per CTO's instructions plus  a small bug fix with
    a corresponding test case....

  sql/sql_derived.cc
    1.14 02/11/12 14:40:27 Sinisa@sinisa.nasamreza.org +1 -1
    some code cleanup as per CTO's instructions plus  a small bug fix with
    a corresponding test case....

  mysql-test/t/derived.test
    1.7 02/11/12 14:40:27 Sinisa@sinisa.nasamreza.org +1 -0
    some code cleanup as per CTO's instructions plus  a small bug fix with
    a corresponding test case....

  mysql-test/r/derived.result
    1.7 02/11/12 14:40:27 Sinisa@sinisa.nasamreza.org +3 -0
    some code cleanup as per CTO's instructions plus  a small bug fix with
    a corresponding test case....

ChangeSet
  1.1346.1.53 02/11/12 13:28:26 lenz@mysql.com +1 -0
  include/mysisampack.h
  
   - fixed typo: mi_rowkorr(T,A) -> mi_rowkorr(T)

  include/myisampack.h
    1.10 02/11/12 13:28:24 lenz@mysql.com +1 -1
     - fixed typo: mi_rowkorr(T,A) -> mi_rowkorr(T)

ChangeSet
  1.1346.1.52 02/11/12 13:21:44 lenz@mysql.com +1 -0
  include/myisampack.h
  
   - fixed Typo: BIG_TABLE -> BIG_TABLES

  include/myisampack.h
    1.9 02/11/12 13:21:42 lenz@mysql.com +1 -1
     - fixed Typo: BIG_TABLE -> BIG_TABLES

ChangeSet
  1.1346.39.4 02/11/12 14:09:18 monty@mashka.mysql.fi +1 -0
  Fix after last merge

  sql/sql_select.cc
    1.152.1.55 02/11/12 14:09:16 monty@mashka.mysql.fi +1 -1
    Fix after last merge

ChangeSet
  1.1354.39.2 02/11/12 14:00:38 bell@sanja.is.com.ua +1 -0
  Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
  into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1

  sql/sql_parse.cc
    1.235.12.4 02/11/12 14:00:36 bell@sanja.is.com.ua +0 -0
    Auto merged

ChangeSet
  1.1346.39.3 02/11/12 13:28:58 monty@mashka.mysql.fi +3 -0
  merge

  sql/sql_select.cc
    1.152.1.54 02/11/12 13:28:57 monty@mashka.mysql.fi +1 -1
    Merge

  mysql-test/r/innodb.result
    1.40.1.8 02/11/12 13:27:50 monty@mashka.mysql.fi +0 -4
    Auto merged

  mysql-test/r/bdb.result
    1.22.1.3 02/11/12 13:27:50 monty@mashka.mysql.fi +0 -1
    Auto merged

ChangeSet
  1.1354.39.1 02/11/12 14:58:59 bar@bar.mysql.r18.ru +2 -0
  MONTHNAME() & DAYNAME() are now UCS2 compatible

  sql/item_timefunc.h
    1.21 02/11/12 14:58:58 bar@bar.mysql.r18.ru +12 -2
    MONTHNAME() & DAYNAME() are now UCS2 compatible

  sql/item_timefunc.cc
    1.25 02/11/12 14:58:58 bar@bar.mysql.r18.ru +9 -3
    MONTHNAME() & DAYNAME() are now UCS2 compatible

ChangeSet
  1.1346.37.2 02/11/12 12:42:42 monty@mashka.mysql.fi +8 -0
  Extended WEEK() to be able to handle ISO weeks.
  unlink socket file if mysqld dies on startup
  Some optimization of AND expressions

  tests/Makefile.am
    1.6.1.1 02/11/12 12:42:40 monty@mashka.mysql.fi +1 -1
    Added missing myisam-big-rows.tst file to source distribution

  sql/sql_base.cc
    1.117.1.27 02/11/12 12:42:40 monty@mashka.mysql.fi +2 -2
    Fixed problem with SIGHUP and INSERT DELAYED

  sql/mysqld.cc
    1.297.1.73 02/11/12 12:42:39 monty@mashka.mysql.fi +7 -1
    unlink socket file if mysqld dies on startup

  sql/item_timefunc.cc
    1.17.1.2 02/11/12 12:42:39 monty@mashka.mysql.fi +16 -3
    Extended WEEK() to be able to handle ISO weeks.

  sql/item_cmpfunc.h
    1.13.1.10 02/11/12 12:42:39 monty@mashka.mysql.fi +5 -0
    Optimization of AND expressions

  sql/item_cmpfunc.cc
    1.20.1.23 02/11/12 12:42:39 monty@mashka.mysql.fi +2 -3
    Optimization of IF( and-expression,,)

  mysql-test/t/func_time.test
    1.12 02/11/12 12:42:39 monty@mashka.mysql.fi +3 -0
    Update for new week() handling

  mysql-test/r/func_time.result
    1.15 02/11/12 12:42:39 monty@mashka.mysql.fi +6 -0
    Update for new week() handling

ChangeSet
  1.1346.39.2 02/11/12 11:39:52 jani@rhols221.adsl.netsonic.fi +1 -0
  Fixed a problem with reading some innodb options that may contain semicolin.

  scripts/mysqld_multi.sh
    1.12 02/11/12 11:39:50 jani@rhols221.adsl.netsonic.fi +2 -1
    Fixed a problem with reading some innodb options that may contain semicolin.

ChangeSet
  1.1346.38.1 02/11/11 22:43:07 serg@serg.mysql.com +5 -0
  removed DBUG_ENTER/RETURN tags

  sql/sql_select.cc
    1.152.13.1 02/11/11 22:43:05 serg@serg.mysql.com +232 -401
    removed DBUG_ENTER/RETURN tags

  sql/opt_range.cc
    1.54.1.13 02/11/11 22:43:05 serg@serg.mysql.com +116 -234
    removed DBUG_ENTER/RETURN tags

  sql/handler.cc
    1.82.1.8 02/11/11 22:43:05 serg@serg.mysql.com +36 -95
    removed DBUG_ENTER/RETURN tags

  sql/ha_myisammrg.cc
    1.37 02/11/11 22:43:05 serg@serg.mysql.com +26 -77
    removed DBUG_ENTER/RETURN tags

  sql/ha_myisam.cc
    1.92.1.15 02/11/11 22:43:05 serg@serg.mysql.com +79 -166
    removed DBUG_ENTER/RETURN tags

ChangeSet
  1.1354.31.17 02/11/11 20:16:45 serg@serg.mysql.com +2 -0
  removed double-ignored files (bk citool bug ?)

  bdb/dist/RELEASE
    1.6 02/11/11 20:16:43 serg@serg.mysql.com +8 -0
    comment added

  BitKeeper/etc/ignore
    1.125 02/11/11 20:16:43 serg@serg.mysql.com +1 -110
    removed double-ignored files (bk citool bug ?)

ChangeSet
  1.1354.31.16 02/11/11 20:03:40 serg@serg.mysql.com +28 -0
  remove all the auto-generated files but NOT vxworks/* ones.
  The reason is that vxworks files are most often, one file per directory,
  and when such a file is removed directory is gone as well. Though files
  are auto-generated, directories aren't.

  BitKeeper/etc/ignore
    1.124 02/11/11 20:03:35 serg@serg.mysql.com +67 -0
