BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-configure.in~ac795a92c8fe049c:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/count_distinct.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged

Optimize depending sub querys
Remove valgrind warnings


libmysqld/lib_sql.cc:
  Better way to reset errors
mysql-test/mysql-test-run.sh:
  Remove wrong `
mysql-test/r/subselect.result:
  Don't use table t1
mysql-test/t/subselect.test:
  Don't use table t1
sql/item.cc:
  Indentation fix
sql/item.h:
  optimize depending sub querys
sql/item_func.cc:
  Remove warning for uninitalized data
sql/item_row.cc:
  Remove warning
sql/item_strfunc.h:
  Fixed memory overrun
sql/item_subselect.cc:
  Better debugging names
sql/log_event.cc:
  Move tmp_table_used to THD
sql/sql_base.cc:
  Move tmp_table_used to THD
sql/sql_class.cc:
  Move tmp_table_used to THD
sql/sql_class.h:
  Move tmp_table_used to THD
sql/sql_lex.cc:
  Move tmp_table_used to THD
sql/sql_lex.h:
  Move tmp_table_used to THD
sql/sql_parse.cc:
  Move tmp_table_used to THD
sql/sql_select.cc:
  optimize depending sub querys
sql/sql_table.cc:
  Move tmp_table_used to THD

include/my_sys.h:
  Remove compiler warning
mysql-test/mysql-test-run.sh:
  Don't examine log files when you run with --extern

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


Build-tools/Do-compile:
  Auto merged
bdb/dist/configure.in:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged

BitKeeper/etc/ignore:
  Added support-files/MacOSX/Description.plist support-files/MacOSX/Info.plist to the ignore list

into mashka.mysql.fi:/home/my/mysql-4.1


BUILD/FINISH.sh:
  Auto merged
sql/opt_range.cc:
  Auto merged

BUILD/FINISH.sh:
  Abort if one of configuration script fails

mysql-test/r/explain.result:
  updated results
mysql-test/r/func_group.result:
  updated results
mysql-test/r/order_by.result:
  updated results
mysql-test/r/rpl000009.result:
  updated results
mysql-test/r/rpl_insert_id.result:
  updated results
mysql-test/r/show_check.result:
  updated results

sql-bench/limits/mysql.cfg:
  Updated results

configure.in:
  Auto merged
mysql-test/t/explain.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged

client/mysql.cc:
  Use field->name_length
sql/lex.h:
  fix after merge

  new file

Don't make OLD_PASSWORD() a reserved word


mysql-test/r/explain.result:
  Test select count(*)
mysql-test/r/func_crypt.result:
  Test old_password()
mysql-test/t/explain.test:
  Test select count(*)
mysql-test/t/func_crypt.test:
  Test old_password()
sql/item_create.cc:
  Don't make OLD_PASSWORD() a reserved word
sql/item_create.h:
  Don't make OLD_PASSWORD() a reserved word
sql/lex.h:
  Don't make OLD_PASSWORD() a reserved word
sql/opt_range.cc:
  Remove blank space
sql/opt_sum.cc:
  Fix problem in MIN/MAX optimisation

  Disable PAGE_CUR_LE_OR_EXTENDS because it does not work for non-latin1 char sets now


innobase/page/page0cur.c:
  Disable PAGE_CUR_LE_OR_EXTENDS because it does not work for non-latin1 char sets now

  Clarify the meaning of HA_READ_PREFIX_LAST as a search flag. InnoDB assumed the meaning wrong.


sql/ha_innodb.cc:
  Clarify the meaning of HA_READ_PREFIX_LAST as a search flag. InnoDB assumed the meaning wrong.

BitKeeper/etc/ignore:
  added support-files/MacOSX/Info.plist
Makefile.am:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
configure.in:
  Use local version
mysql-test/r/func_group.result:
  merge
mysql-test/r/order_by.result:
  merge
mysql-test/r/show_check.result:
  merge
mysql-test/t/func_group.test:
  merge
mysql-test/t/join.test:
  merge
sql/mysql_priv.h:
  Use local version
sql/sql_yacc.yy:
  merge
sql/table.cc:
  USe local

Added lengths for all MYSQL_FIELD string parameters
Changed field length to 2 byte in .frm files


configure.in:
  After merge fixes
include/ft_global.h:
  Fixed copyright
include/my_sys.h:
  Remove compiler warnings
include/mysql.h:
  Added lengths for all MYSQL_FIELD string parameters
include/mysql_com.h:
  Remove compiler warning
myisam/ft_boolean_search.c:
  Removed compiler warnings
myisam/ft_dump.c:
  Removed compiler warnings
myisam/ft_stopwords.c:
  Copy file from MySQL 4.0
myisam/mi_delete.c:
  Fixed compiler warning
myisam/sort.c:
  Indentation changes
myisam/sp_test.c:
  Remove compiler warnings
mysql-test/r/func_group.result:
  After merge fixes
mysql-test/r/group_by.result:
  After merge fixes
mysql-test/r/rpl_insert_id.result:
  After merge fixes
mysql-test/r/rpl_master_pos_wait.result:
  After merge fixes
mysql-test/t/rpl000009.test:
  After merge fixes
mysql-test/t/rpl_insert_id.test:
  After merge fixes
mysql-test/t/subselect.test:
  After merge fixes
sql/item_cmpfunc.cc:
  After merge fixes
sql/item_cmpfunc.h:
  After merge fixes
sql/item_func.cc:
  After merge fixes
sql/item_func.h:
  After merge fixes
sql/item_strfunc.cc:
  After merge fixes
sql/item_strfunc.h:
  After merge fixes
sql/log.cc:
  After merge fixes
sql/mysql_priv.h:
  After merge fixes
sql/mysqld.cc:
  After merge fixes
sql/sql_db.cc:
  After merge fixes
sql/sql_handler.cc:
  After merge fixes
sql/sql_parse.cc:
  After merge fixes
sql/sql_show.cc:
  After merge fixes
sql/sql_udf.cc:
  After merge fixes
sql/table.cc:
  Changed field length to 2 byte in .frm files
sql/unireg.cc:
  Changed field length to 2 byte in .frm files

  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:
  Since MySQL uses HA_READ_PREFIX_LAST in a wrong place, we make InnoDB to convert it to a right search condition

Makefile.am:
  Remove blank lines
configure.in:
  Keep version gamma

  Sinisas patch to InnoDB ORDER BY DESC bug, push it now so that Jani has it available


innobase/page/page0cur.c:
  Sinisas patch to InnoDB ORDER BY DESC bug, push it now so that Jani has it available

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)


include/my_global.h:
  Moved LL from mysql_priv (as this is also in config-win.h)
mysql-test/r/distinct.result:
  Updated results
mysql-test/r/func_group.result:
  Updated results
mysql-test/r/innodb.result:
  Updated results
mysql-test/r/join.result:
  Updated results
mysql-test/r/order_by.result:
  Updated results
mysql-test/t/func_group.test:
  Added test for SUM(ALL ...)
mysql-test/t/innodb.test:
  Added test for START TRANSACTION
mysql-test/t/join.test:
  Test different join syntaxes
mysql-test/t/order_by.test:
  Added new test of NULL ordering.
sql/filesort.cc:
  Sort NULL last if DESC is used
sql/lex.h:
  Added OLD_PASSWORD() as synonym for PASSWORD.
sql/mysql_priv.h:
  Removed LL()
sql/opt_range.cc:
  Sort NULL last if DESC is used
sql/opt_range.h:
  Sort NULL last if DESC is used
sql/slave.cc:
  Indentation changes
sql/sql_parse.cc:
  After merge fix
sql/sql_select.cc:
  Added comment
sql/sql_yacc.yy:
  Added START TRANSACTION syntax
  Added ALL as parameter option for all group functions.
  Make join handling uniform.

 - 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:
  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")

   the --password parameter (better add it to my.cnf instead) (Thanks to
   Christian Hammers for the suggestion)


scripts/mysqlhotcopy.sh:
   - added word of warning about providing the password as cleartext using
     the --password parameter (better add it to my.cnf instead)

   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:
   - 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)

  new file
.del-overlay.tar.gz~5bd3087e191e7574:
  Delete: netware/overlay.tar.gz


BitKeeper/deleted/.del-overlay.tar.gz~5bd3087e191e7574:
  Delete: netware/overlay.tar.gz

  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:
  Backport from 4.0: fix potential bug if store_lock is called with TL_IGNORE in the middle of a query

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

   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!

BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Makefile.am:
  Auto merged
bdb/os/os_handle.c:
  Auto merged
client/mysqladmin.c:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/Makefile.am:
  Auto merged
include/config-win.h:
  Auto merged
include/my_base.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/manager.c:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
myisam/ft_static.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_test3.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/handler.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/select_found.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/bigint.test:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
mysql-test/t/count_distinct.test:
  Auto merged
mysql-test/t/func_crypt.test:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl000017.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_getwd.c:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/des_key_file.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql-bench/test-insert.sh:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/table.cc:
  Auto merged
Docs/manual.texi:
  Use remote version
client/mysql.cc:
  Merge
configure.in:
  Merge
libmysql/libmysql.c:
  Merge
libmysqld/lib_sql.cc:
  Merge
myisam/ft_stopwords.c:
  Merge
myisam/myisamchk.c:
  Merge
mysql-test/r/bigint.result:
  Merge
mysql-test/r/group_by.result:
  Merge
mysql-test/r/rpl000009.result:
  Merge
mysql-test/t/group_by.test:
  Merge
mysql-test/t/rpl000009.test:
  Merge
mysql-test/t/rpl_rotate_logs.test:
  Merge
mysys/Makefile.am:
  Merge
mysys/charset.c:
  Merge
sql/item.h:
  Merge
sql/item_cmpfunc.cc:
  Merge
sql/item_cmpfunc.h:
  Merge
sql/item_create.cc:
  Merge
sql/item_func.cc:
  Merge
sql/item_strfunc.h:
  Merge
sql/log.cc:
  Merge
sql/mysql_priv.h:
  Merge
sql/mysqld.cc:
  Merge
sql/protocol.cc:
  Merge
sql/slave.cc:
  Merge
sql/sql_class.h:
  Merge
sql/sql_db.cc:
  Merge
sql/sql_handler.cc:
  Merge
sql/sql_parse.cc:
  Merge
sql/sql_select.cc:
  Merge
sql/sql_yacc.yy:
  Merge

include/violite.h:
  Indentation cleanup

sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged

Docs/internals.texi:
  Updated protocol information
sql/mysql_priv.h:
  Removed clear_error_message()
sql/mysqld.cc:
  Removed not used function clear_error_message
sql/protocol.cc:
  Simple code cleanup
sql/sql_parse.cc:
  Changed clear_error_message() to thd->clear_error()
  Simple optimization.