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

  updated


mysql-test/r/key_diff.result:
  updated
mysql-test/r/order_by.result:
  updated

into mysql.com:/home/walrus/bk/40.ibase


BitKeeper/etc/logging_ok:
  auto-union
sql-bench/server-cfg.sh:
  Auto merged

sql-bench/server-cfg.sh:
  clean-up interbase section
  corrected misprint in DSN,
  creating indexes,version(), and fields conversations.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

to crash-me 


sql-bench/crash-me.sh:
  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)
sql-bench/server-cfg.sh:
  remove "KERNEL" and add "SAPDB" to sapdb version
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

mysql-test/r/distinct.result:
  updated
mysql-test/r/fulltext.result:
  updated
mysql-test/r/select.result:
  updated
mysql-test/r/show_check.result:
  updated
mysql-test/t/insert.test:
  updated

mysql-test/mysql-test-run.sh:
  Added option --extern (from 4.1)
mysql-test/r/multi_update.result:
  Portability fix
mysql-test/t/multi_update.test:
  Portability fix

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

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.


libmysqld/lib_sql.cc:
  Copy arguments given to mysql_server_init()
mysql-test/r/temp_table.result:
  Update test results (after merge form 3.23)
sql/handler.cc:
  Made keybuff_size longlong
sql/mysql_priv.h:
  Made keybuff_size longlong
sql/mysqld.cc:
  Made keybuff_size longlong
sql/set_var.cc:
  Made keybuff_size longlong
sql/set_var.h:
  Made keybuff_size longlong
sql/sql_select.cc:
  Simple cleanup
sql/sql_select.h:
  Make TMP_TABLE_PARAM to be allocated through Sql_alloc
sql/sql_update.cc:
  Fixed some 'not initalized variable errors' in multi-table-update.
  Fixed memory leak in multi-table-update

BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
libmysql/password.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/my_static.c:
  Auto merged
mysys/my_static.h:
  Auto merged
mysys/my_tempnam.c:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.server.sh:
  Auto merged
mysql-test/t/temp_table.test:
  Added comment
sql/mysqld.cc:
  Don't apply change from 3.23
sql/sql_show.cc:
  Don't apply change from 3.23
sql/structs.h:
  Don't apply change from 3.23

Fixed 'not initialized' memory error.


mysql-test/mysql-test-run.sh:
  Updates to be able to more easily use --valgrind
mysql-test/r/alter_table.result:
  Added missing drop table
mysql-test/t/alter_table.test:
  Added missing drop table
sql/field.cc:
  Simple optimizations
sql/ha_innodb.cc:
  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/log.cc:
  Simple optimization
sql/mysql_priv.h:
  Move external reference to struct to include file
sql/mysqld.cc:
  Added safety asserts
sql/sql_class.cc:
  Fixed non fatal 'not initialized memory reference error' in thread init
sql/sql_udf.cc:
  Clear current_thd for global thread
strings/strto.c:
  Simple optimization

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

  Delete: client/errmsg.c


BitKeeper/deleted/.del-errmsg.c~444b5d4031149217:
  Delete: client/errmsg.c

into mysql.com:/home/walrus/bk/40

sql/sql_table.cc:
  code cleanup

into sinisa.nasamreza.org:/mnt/work/mysql

BitKeeper/etc/ignore:
  Added innobase/stamp-h1 stamp-h1 to the ignore list

   handling (backport from 4.0 tree)

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

(Fixed problem with autoconf 2.53 on Solaris)


BUILD/compile-solaris-sparc-purify:
  Merge with 3.23
BUILD/compile-solaris-sparc:
  Merge with 3.23
acinclude.m4:
  Merge with 3.23

into mysql.com:/space/my/mysql-3.23-build

 - sql_analyse.cc: Fixed bug in decimal handling


configure.in:
   - Portability fix for HP compiler on HPUX11
libmysql/password.c:
   - Portability fix for HP compiler on HPUX11
mysys/hash.c:
   - Portability fix for HP compiler on HPUX11
mysys/my_static.c:
   - Portability fix for HP compiler on HPUX11
mysys/my_static.h:
   - Portability fix for HP compiler on HPUX11
mysys/my_tempnam.c:
   - Portability fix for HP compiler on HPUX11
sql/sql_analyse.cc:
   - Fixed bug in decimal handling

into mysql.com:/space/my/mysql-3.23

Workaround for problem with autconf 2.53 on Solaris
(Fixes problem with SOCKET_SIZE_TYPE)


BUILD/compile-solaris-sparc:
  Removed non standard compiler options
BUILD/compile-solaris-sparc-purify:
  Removed non standard compiler options
acinclude.m4:
  Fixed 'stack direction' check.
  Workaround for problem with autconf 2.53 on Solaris
  (Fixes problem with SOCKET_SIZE_TYPE)

into sinisa.nasamreza.org:/mnt/work/mysql

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

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...
 

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

myisam/mi_rnext_same.c:
  cleanup

into mysql.com:/space/my/mysql-3.23

libmysql/libmysql.c:
  Auto merged
sql/opt_sum.cc:
  Auto merged
support-files/mysql.server.sh:
  Auto merged