myisam/mi_rnext_same.c:
  cleanup

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

otherwise COM_CHANGE_USER is unprotected and can be used for both privilege escalation and buffer overrun

Optimized SELECT DISTINCT ... ORDER BY ... LIMIT
Fixed reference to uninitalized variable


mysql-test/r/distinct.result:
  Updated results for new tests
mysql-test/r/func_math.result:
  Fixed test of RND()
mysql-test/r/innodb.result:
  Updated results for new tests
mysql-test/r/null.result:
  Updated results for new tests
mysql-test/t/distinct.test:
  New distinct test
mysql-test/t/func_math.test:
  Fixed test of RND()
mysql-test/t/innodb.test:
  Test for bugs
mysql-test/t/null.test:
  TEst for bugs
sql/field.h:
  Change of NULL handling to avoid error messages
sql/field_conv.cc:
  Change of NULL handling to avoid error messages
sql/item.cc:
  Change of NULL handling to avoid error messages
sql/item.h:
  Change of NULL handling to avoid error messages
sql/item_cmpfunc.cc:
  Change of NULL handling to avoid error messages
sql/item_func.cc:
  Change of NULL handling to avoid error messages
sql/item_func.h:
  Cleaned up RND() handling
sql/item_timefunc.cc:
  Change of NULL handling to avoid error messages
sql/item_timefunc.h:
  Change of NULL handling to avoid error messages
sql/opt_range.cc:
  Fixed bug in <=> NULL
sql/password.c:
  Indentation cleanup
sql/sql_base.cc:
  Change of NULL handling to avoid error messages
sql/sql_class.cc:
  Fixed reference to uninitalized variable
sql/sql_handler.cc:
  Change of NULL handling to avoid error messages
sql/sql_select.cc:
  Change of NULL handling to avoid error messages
  Optimized SELECT DISTINCT ... ORDER BY ... LIMIT
sql/sql_select.h:
  Change of NULL handling to avoid error messages
sql/unireg.cc:
  Change of NULL handling to avoid error messages

mysql-test/r/group_by.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged

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

(Patch from 4.0.5)


mysql-test/r/group_by.result:
  Updated results
mysql-test/t/group_by.test:
  Test for bug
sql/item_cmpfunc.cc:
  Fixed bug in MAX() optimization when used with JOIN and ON expressions
sql/item_cmpfunc.h:
  Fixed bug in MAX() optimization when used with JOIN and ON expressions
sql/opt_sum.cc:
  Fixed bug in MAX() optimization when used with JOIN and ON expressions

sql/mysqld.cc:
  Auto merged

More tests for multi-table-update & timestamp handling


mysql-test/r/innodb.result:
  New multi-table-update tests
mysql-test/r/multi_update.result:
  New multi-table-update tests
mysql-test/r/type_timestamp.result:
  New timestamp tests
mysql-test/t/innodb.test:
  New multi-table-update tests
mysql-test/t/multi_update.test:
  New multi-table-update tests
mysql-test/t/type_timestamp.test:
  New timestamp tests
sql/sql_select.cc:
  Fixed bug in safe mode checking
sql/sql_update.cc:
  Fixed bug in autocommit in multi-table-update

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

sql/sql_yacc.yy:
  Auto merged

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)


heap/_check.c:
  Added checking of rows
heap/hp_delete.c:
  Extra debugging
heap/hp_scan.c:
  Extra debugging
heap/hp_update.c:
  Extra debugging
heap/hp_write.c:
  Extra debugging
include/my_base.h:
  Added option to disable row cache when using updates
isam/extra.c:
  Added option to disable row cache when using updates
myisam/mi_check.c:
  Comment cleanup
myisam/mi_extra.c:
  Added option to disable row cache when using updates
myisam/sort.c:
  Indentaion cleanups
myisammrg/myrg_extra.c:
  Added option to disable row cache when using updates
mysql-test/r/multi_update.result:
  Updated results
mysql-test/t/multi_update.test:
  Cleanup up to only use table names t1, t2,...
mysys/mf_iocache.c:
  Safety fix
sql/item_cmpfunc.cc:
  change true-> 1 and false -> 0
sql/mysql_priv.h:
  Cleaned up SQL_LIST handling
sql/sql_base.cc:
  Fixed grant checking if SELECT tablename.*
sql/sql_class.h:
  Cleaned up multi-table-update
sql/sql_delete.cc:
  Fixed OPTION_SAFE_UPDATE checking in multi-table-delete.
  Fixed query-cache invalidation in multi-table-delete
sql/sql_insert.cc:
  cleaned up timestamp handling
sql/sql_olap.cc:
  false -> 0
sql/sql_parse.cc:
  Optimized some list handling.
  Moved multi-table-update to sql_update.cc
sql/sql_select.cc:
  More comments
  Fixed create_tmp_table for multi-table-update
sql/sql_select.h:
  New prototypes
sql/sql_union.cc:
  false -> 0
  Cleaned up timestamp handling
sql/sql_update.cc:
  New multi-update-table code
sql/sql_yacc.yy:
  false -> 0, true -> 1
  Optimized some list handling
sql/table.h:
  Added union for temporary values.
  Made shared int to be able to store counters.
sql/uniques.cc:
  Indentation cleanup

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

BitKeeper/etc/ignore:
  Added core.2430 to the ignore list
sql-bench/crash-me.sh:
  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)
sql-bench/server-cfg.sh:
  Misprint correction (db_Sapdb ->db_sapdb)

  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:
  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/mysqld.cc:
  Auto merged

into mysql.com:/home/pem/work/mysql-4.0

sql/sql_yacc.yy:
  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".

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

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/crash-me.sh:
  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".
sql-bench/server-cfg.sh:
  add /odbc to server-version if benchmark/crash-me works over odbc

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

BitKeeper/etc/ignore:
  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

sql-bench/crash-me.sh:
  - 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
sql-bench/server-cfg.sh:
  add sapdb section

support-files/make_mysql_pkg.pl:
  make_mysql_pkg.pl
  
   - Updated to Marcs latest version from entropy.ch

 - reverted some incompatible/non-portable modifications


support-files/mysql.server.sh:
   - reverted some incompatible/non-portable modifications

 - reverted some incompatible/non-portable modifications


support-files/mysql.server.sh:
   - reverted non-portable change ("echo -n" does not work on all platforms)
   - reverted incompatible change (better fix the docs than break existing
     installations)

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


support-files/mysql.server.sh:
  Auto merged

sql/opt_range.cc:
  Auto merged