libmysql/libmysql.c:
  Auto merged

into mysql.com:/home/my/mysql-4.0

Fixed unlikely bug in the range optimzer when using many IN() queries on different key parts. (Bug #4157)


mysql-test/r/range.result:
  Test of range optimizer bug
mysql-test/t/range.test:
  Test of range optimizer bug
sql/opt_range.cc:
  Fixed unlikely bug in the range optimzer when using many IN() queries on
  different key parts. (Bug #4157)

  Put back mem_print_info() functions that are used to analyze memory leaks; Marko removed them by accident in his Feb 20th, 2004 patch; these functions are very important for debugging, and should always be kept in the source code base


innobase/mem/mem0dbg.c:
  Put back mem_print_info() functions that are used to analyze memory leaks; Marko removed them by accident in his Feb 20th, 2004 patch; these functions are very important for debugging, and should always be kept in the source code base
innobase/include/mem0dbg.h:
  Put back mem_print_info() functions that are used to analyze memory leaks; Marko removed them by accident in his Feb 20th, 2004 patch; these functions are very important for debugging, and should always be kept in the source code base

into mysql.com:/home/mysql_src/mysql-3.23


libmysql/libmysql.c:
  Auto merged

libmysql/libmysql.c:
  safety fix

  Put asserts that make sure srv_que_task_enqueue() is never called under MySQL


innobase/srv/srv0que.c:
  Put asserts that make sure srv_que_task_enqueu() is never called under MySQL
innobase/que/que0que.c:
  Put asserts that make sure srv_que_task_enqueu() is never called under MySQL

  Revert the patch that put log debug code behind UNIV_LOG_DEBUG


innobase/log/log0recv.c:
  Revert the patch that put log debug code behind UNIV_LOG_DEBUG

  Revert the patch that put log debug code behind UNIV_LOG_DEBUG
log0log.ic, log0recv.c, log0log.c, log0log.h:
  Revert 1.1730.18.1 about UNIV_LOG_DEBUG: debug code is often needed in debugging the production version


innobase/log/log0log.c:
  Revert 1.1730.18.1 about UNIV_LOG_DEBUG: debug code is often needed in debugging the production version
innobase/log/log0recv.c:
  Revert 1.1730.18.1 about UNIV_LOG_DEBUG: debug code is often needed in debugging the production version
innobase/include/log0log.ic:
  Revert 1.1730.18.1 about UNIV_LOG_DEBUG: debug code is often needed in debugging the production version
innobase/include/log0log.h:
  Revert the patch that put log debug code behind UNIV_LOG_DEBUG

innobase/include/que0que.h:
  Exclude
innobase/include/que0que.ic:
  Exclude
innobase/que/que0que.c:
  Exclude

into hundin.mysql.fi:/home/heikki/mysql-4.0

innobase/trx/trx0sys.c:
  Remove #ifdef UNIV_HOT_BACKUP: best to keep the codebase as uniform as possible
innobase/dict/dict0dict.c:
  Exclude
innobase/dict/dict0mem.c:
  Exclude
innobase/ha/hash0hash.c:
  Exclude
innobase/include/data0data.h:
  Exclude
innobase/include/dict0mem.h:
  Exclude
innobase/include/hash0hash.h:
  Exclude
innobase/include/hash0hash.ic:
  Exclude
innobase/include/mtr0mtr.h:
  Exclude
innobase/include/row0ins.h:
  Exclude
innobase/include/row0upd.h:
  Exclude
innobase/row/row0ins.c:
  Exclude
innobase/row/row0upd.c:
  Exclude
innobase/thr/thr0loc.c:
  Exclude

innobase/que/que0que.c:
  Exclude

  Revert Marko's untested changeset 1.1844.1.6 to the stable 4.0 version; stable 4.0 must NOT BE modified except in case of bugs
srv0que.c, srv0que.h:
  new file


innobase/srv/srv0que.c:
  Revert Marko's untested changeset 1.1844.1.6 to the stable 4.0 version; stable 4.0 must NOT BE modified except in case of bugs

BitKeeper/deleted/.del-srv0que.c~d1feebb77b5a9b96:
  Exclude
BitKeeper/deleted/.del-srv0que.h~f12ecb4b5afe203e:
  Exclude
innobase/include/que0que.h:
  Exclude
innobase/include/trx0roll.h:
  Exclude
innobase/include/trx0trx.h:
  Exclude
innobase/include/usr0sess.h:
  Exclude
innobase/que/que0que.c:
  Exclude
innobase/srv/Makefile.am:
  Exclude
innobase/include/Makefile.am:
  Exclude
innobase/srv/srv0srv.c:
  Exclude
innobase/trx/trx0purge.c:
  Exclude
innobase/trx/trx0roll.c:
  Exclude
innobase/trx/trx0trx.c:
  Exclude
innobase/usr/usr0sess.c:
  Exclude

No commit message

sql/sql_parse.cc:
  Exclude

sql/sql_parse.cc:
  Exclude

  Remove printf's that were accidentally pushed in the last push


innobase/ut/ut0mem.c:
  Remove printf's that were accidentally pushed in the last push

  Implement ut_realloc
lexyy.c, pars0lex.l:
  Start using ut_malloc, ut_free, ut_realloc in pars0lex.l and lexyy.c; mem_realloc was broken; eliminate possible memcpy(NULL, ..., 0) from string_append()


innobase/pars/pars0lex.l:
  Start using ut_malloc, ut_free, ut_realloc in pars0lex.l and lexyy.c; mem_realloc was broken; eliminate possible memcpy(NULL, ..., 0) from string_append()
innobase/pars/lexyy.c:
  Start using ut_malloc, ut_free, ut_realloc in pars0lex.l and lexyy.c; mem_realloc was broken; eliminate possible memcpy(NULL, ..., 0) from string_append()
innobase/ut/ut0mem.c:
  Implement ut_realloc
innobase/include/ut0mem.h:
  Implement ut_realloc

  Remove broken mem_realloc(); a patch to remove its uses in pars0lex.l and fil0fil.c will soon follow


innobase/include/mem0mem.h:
  Remove broken mem_realloc(); a patch to remove its uses in pars0lex.l and fil0fil.c will soon follow
innobase/include/mem0mem.ic:
  Remove broken mem_realloc(); a patch to remove its uses in pars0lex.l and fil0fil.c will soon follow

innobase/include/mem0mem.ic:
  mem_realloc(): preserve the old buffer contents

be needed when testing production releases


innobase/btr/btr0btr.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/buf/buf0buf.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/buf/buf0flu.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/buf/buf0lru.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/buf/buf0rea.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/data/data0type.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/dict/dict0dict.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/fsp/fsp0fsp.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/fut/fut0lst.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/ibuf/ibuf0ibuf.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/btr0btr.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/buf0buf.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/buf0buf.ic:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/buf0flu.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/buf0lru.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/data0type.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/dict0dict.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/fsp0fsp.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/fut0lst.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/lock0lock.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/mem0dbg.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/mem0dbg.ic:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/mem0pool.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/mtr0mtr.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/pars0opt.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/sync0rw.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/sync0sync.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/lock/lock0lock.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/mem/mem0dbg.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/mem/mem0pool.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/mtr/mtr0mtr.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/pars/pars0opt.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/srv/srv0start.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/sync/sync0rw.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/sync/sync0sync.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/trx/trx0roll.c:
  Remove #ifdef UNIV_DEBUG around debug code

  * added 'local $/' to keep from undef-ing $/ (the newline setting) for the whole script
  * removed the target dir removal (target dir is not a temp dir!)
  * use split to create filelist (cleaner way than using chomp!)
  * removed use of chomp because it caused some file names to be mangled
  * print out which file is being processed if verbose
mysql-copyright-2:
  * added cpp to list of files to be processed (for windows archives)


Build-tools/mysql-copyright-2:
  * added cpp to list of files to be processed (for windows archives)
Build-tools/mysql-copyright:
  * added 'local $/' to keep from undef-ing $/ (the newline setting) for the whole script
  * removed the target dir removal (target dir is not a temp dir!)
  * use split to create filelist (cleaner way than using chomp!)
  * removed use of chomp because it caused some file names to be mangled
  * print out which file is being processed if verbose

innobase/row/row0mysql.c:
  row_create_table_for_mysql(), row_drop_table_for_mysql():
   Make InnoDB recognize the special table names innodb_* again.

mysql-copyright -> more fixes to deal with problems in removing temporary tar directory. Had to use `cd $WD` vs chdir($WD).
Servers.fgl -> made sure all charset files were accounted for (cp 1256 was missing)


Build-tools/mysql-copyright:
  more fixes to deal with problems in removing temporary tar directory. Had to use `cd $WD` vs chdir($WD).
VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl:
  made sure all charset files were accounted for (cp 1256 was missing)
VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl:
  made sure all charset files were accounted for (cp 1256 was missing)
VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl:
  made sure all charset files were accounted for (cp 1256 was missing)

into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0

client/mysqltest.c:
  allow big commands in mysql-test

  Small fixes to handle packaging of windows src (commercial) file


Build-tools/mysql-copyright:
  Small fixes to handle packaging of windows src (commercial) file

into mysql.com:/home/my/mysql-4.0

scripts/mysql_install_db.sh:
  Cleanup

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

scripts/mysqld_safe.sh:
  don't protect mysqld from multiple --user commands - mysqld can take care of itself
sql/mysqld.cc:
  warn about multiple --user parameters only if their arguments differ

into mysql.com:/home/my/mysql-4.0


sql/sql_parse.cc:
  Auto merged

mysql-test/t/type_date.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
mysql-test/r/type_date.result:
  merge with 3.23

sql/sql_parse.cc:
  Cleanup of patch

if OpenSSL is installed in non-statndart directory
('openssl/opensslv.h: No such file or directory')


include/my_global.h:
  Fixed issue with compilation MySQL with OpenSSL 
  if OpenSSL is installed in non-statndart directory
include/violite.h:
  Fixed issue with compilation MySQL with OpenSSL 
  if OpenSSL is installed in non-statndart directory

the rpm postinstall script must call mysql_install_db with --user=mysql,
and mysql_install_db must then pass this to mysqld. Otherwise, mysqld
runs as root, and if you have --log-bin=somewhere_out_of_var_lib_mysql
it creates binlog files owned by root in this dir, and this dir is not
fixed by the 'chmod mysql', so files remain owned by root, and later mysqld
(running as 'mysql') can't read them.
I'm hardcoding 'mysql' in the postinstall script, but it's already hardcoded
there in many places (see the useradd and chown) so it's ok.


scripts/mysql_install_db.sh:
  Pass --user to mysqld
support-files/mysql.spec.sh:
  in postinstall, call mysql_install_db with --user=mysql, so that mysqld (which installs the grant tables)
  is started with --user=mysql.