sql/item.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

sql/item.h:
  Made some virtual functions non virtual (as they are not used virtually)
sql/item_strfunc.cc:
  Optimizations.
sql/item_strfunc.h:
  Fixed BINARY handling
sql/sql_string.h:
  Indentation cleanups

sql/item_func.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  SCCS merged

into genie.(none):/home/vva/work/new_readline/4.1

configure.in:
  Auto merged
BitKeeper/deleted/.del-mutex.m4~a13383cde18a64e1:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/r/null_key.result:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item_func.h:
  Merge

Compatibility syntax: SERIAL, [PRIMARY] KEY and VALUE



sql/sql_lex.cc:
  Faster handling of identifiers
sql/sql_lex.h:
  Faster handling of identifiers
sql/sql_yacc.yy:
  Added SERIAL (alias for bigint auto_increment)
  Make PRIMARY optional in field specification
  Make VALUE alias for VALUES

into genie.(none):/home/vva/work/new_readline/4.1

into mysql.r18.ru:/usr/home/ram/mysql-4.1.monty1

mysql-test/r/subselect.result:
  test of subselect in derived table
mysql-test/t/subselect.test:
  test of subselect in derived table

into mysql.r18.ru:/usr/home/ram/mysql-4.1.monty1


sql/opt_range.cc:
  Auto merged

more efficient reference creation
fixed table_name of Field in temporary table


mysql-test/r/subselect.result:
  test of 2 references bugs
mysql-test/t/subselect.test:
  test of 2 references bugs
sql/field.h:
  fixed layout
  fixed table name of fields of temporary table (derived table)
sql/item.cc:
  more efficient reference creation
sql/sql_base.cc:
  fixed layout
  supported possiblity of item substitute (fixed bug)

sql/opt_range.cc:
  Auto merged

Fixed context in error mesages


mysql-test/r/subselect.result:
  tests of references and error message
mysql-test/t/subselect.test:
  tests of references and error message
sql/item.cc:
  Fixed layout
  Resolving field names of outer select
sql/item_subselect.cc:
  saving/restoring context for error messages
sql/mysql_priv.h:
  changed function interface to allow resolving field names inside Item_ref::fix_fields
sql/sql_base.cc:
  changed function interface to allow resolving field names inside Item_ref::fix_fields
sql/sql_lex.h:
  allow access to thd field

renamed tables to prevent droping real tables


mysql-test/r/group_by.result:
  test of error message
mysql-test/r/subselect.result:
  renamed tables to prevent droping real tables
mysql-test/t/group_by.test:
  test of error message
mysql-test/t/subselect.test:
  renamed tables to prevent droping real tables
sql/sql_base.cc:
  moved thd->allow_sum_func assignment to upper level
sql/sql_select.cc:
  fixed removed by previos patch thd->allow_sum_func "side effect" of setup_conds

Build-tools/Do-compile:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/null_key.test:
  Auto merged
mysql-test/mysql-test-run.sh:
  Ignore changes from 3.23
mysql-test/r/func_time.result:
  Update results
mysql-test/r/null_key.result:
  Update results
scripts/mysqld_safe.sh:
  Don't apply NICE handling change from 3.23
sql/mysqld.cc:
  merge
sql/opt_range.cc:
  merge
support-files/mysql.server.sh:
  Don't apply changes from 3.23

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/r/bigint.result:
  Moved casting test to cast.test
mysql-test/r/func_time.result:
  Test of new functions
mysql-test/t/bigint.test:
  Moved casting test to cast.test
mysql-test/t/func_time.test:
  Test of new functions
sql/item_create.cc:
  Added casting to CHAR
sql/item_func.h:
  Added casting to CHAR
sql/item_timefunc.h:
  Added casting to CHAR
sql/lex.h:
  Added new ANSI functions LOCALTIME, LOCALTIMESTAMP and CURRENT_USER
  Added CEIL as an alias for CEILING
sql/sql_yacc.yy:
  Cleaned up CHECK constraint handling.

mysql-test/r/subselect.result:
  test of selfreference
mysql-test/t/subselect.test:
  test of selfreference

mysql-test/r/subselect.result:
  test of sum function with subselect
mysql-test/t/subselect.test:
  test of sum function with subselect

into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged

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

  Modification to new API test
sql_prepare.cc:
  Fix for lock_types


sql/sql_prepare.cc:
  Fix for lock_types
tests/client_test.c:
  Modification to new API test

  fix merge conflict


libmysql/libmysql.c:
  fix merge conflict

libmysql/libmysql.c:
  merge .

libmysql/errmsg.c:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_error.cc:
  Auto merged

     - fix setting of niceness level

support-files/mysql.server.sh
     - applied some fixes from 4.0 mysql.server script
     - fix my.cnf parsing


scripts/safe_mysqld.sh:
   - 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)
support-files/mysql.server.sh:
   - 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

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

scripts we don't need commented out
s_dir script for creating directories bdb build process requires


BitKeeper/deleted/.del-BerkeleyDB.wpj~a2a0abe09f33bb61:
  Delete: bdb/build_vxworks/BerkeleyDB.wpj
BitKeeper/deleted/.del-Makefile.custom~2b8f324317bef7ad:
  Delete: bdb/build_vxworks/BerkeleyDB/Makefile.custom
BitKeeper/deleted/.del-Makefile.custom~683fd022553cf846:
  Delete: bdb/build_vxworks/db_archive/db_archive/Makefile.custom
BitKeeper/deleted/.del-component.cdf~42d5e09d10a4debd:
  Delete: bdb/build_vxworks/BerkeleyDB/component.cdf
BitKeeper/deleted/.del-component.cdf~7713d5d32b01239:
  Delete: bdb/build_vxworks/db_archive/db_archive/component.cdf
BitKeeper/deleted/.del-component.wpj~13c8b25bc88a79a5:
  Delete: bdb/build_vxworks/BerkeleyDB/component.wpj
BitKeeper/deleted/.del-component.wpj~8f2eae1d43fc8a33:
  Delete: bdb/build_vxworks/db_archive/db_archive/component.wpj
BitKeeper/deleted/.del-db_archive.c~aa2f07eacf30fed:
  Delete: bdb/build_vxworks/db_archive/db_archive.c
BitKeeper/deleted/.del-db_archive.wpj~9b2944550502e15:
  Delete: bdb/build_vxworks/db_archive/db_archive.wpj
BitKeeper/deleted/.del-db_checkpoint.c~9a0937113e3c2aaa:
  Delete: bdb/build_vxworks/db_checkpoint/db_checkpoint.c
BitKeeper/deleted/.del-Makefile.custom~1cc8c2668b709944:
  Delete: bdb/build_vxworks/db_load/db_load/Makefile.custom
BitKeeper/deleted/.del-Makefile.custom~37a5b23498b0cb1b:
  Delete: bdb/build_vxworks/db_deadlock/db_deadlock/Makefile.custom
BitKeeper/deleted/.del-Makefile.custom~6698b0966cb9896e:
  Delete: bdb/build_vxworks/db_dump/db_dump/Makefile.custom
BitKeeper/deleted/.del-Makefile.custom~e2919df8b5a5d18:
  Delete: bdb/build_vxworks/db_checkpoint/db_checkpoint/Makefile.custom
BitKeeper/deleted/.del-component.cdf~88d94c29a18784f3:
  Delete: bdb/build_vxworks/db_deadlock/db_deadlock/component.cdf
BitKeeper/deleted/.del-component.cdf~acf828ccb25f2e7a:
  Delete: bdb/build_vxworks/db_checkpoint/db_checkpoint/component.cdf
BitKeeper/deleted/.del-component.cdf~cbedb82f353d0922:
  Delete: bdb/build_vxworks/db_load/db_load/component.cdf
BitKeeper/deleted/.del-component.cdf~d2507fbdc31adf16:
  Delete: bdb/build_vxworks/db_dump/db_dump/component.cdf
BitKeeper/deleted/.del-component.wpj~5f1cc866f2597c5b:
  Delete: bdb/build_vxworks/db_dump/db_dump/component.wpj
BitKeeper/deleted/.del-component.wpj~7bbc0dcd2221ac89:
  Delete: bdb/build_vxworks/db_checkpoint/db_checkpoint/component.wpj
BitKeeper/deleted/.del-component.wpj~dda5a2a73736e0f9:
  Delete: bdb/build_vxworks/db_deadlock/db_deadlock/component.wpj
BitKeeper/deleted/.del-db_checkpoint.wpj~c11939cdaad080:
  Delete: bdb/build_vxworks/db_checkpoint/db_checkpoint.wpj
BitKeeper/deleted/.del-db_config.h~f0ffd61a4c4dcc10:
  Delete: bdb/build_vxworks/db_config.h
BitKeeper/deleted/.del-db_deadlock.c~b110945da1356bd3:
  Delete: bdb/build_vxworks/db_deadlock/db_deadlock.c
BitKeeper/deleted/.del-db_deadlock.wpj~b8617495863e87b3:
  Delete: bdb/build_vxworks/db_deadlock/db_deadlock.wpj
BitKeeper/deleted/.del-db_dump.c~aa0bdb027bcc79:
  Delete: bdb/build_vxworks/db_dump/db_dump.c
BitKeeper/deleted/.del-db_dump.wpj~7e28dd5799ef9d7:
  Delete: bdb/build_vxworks/db_dump/db_dump.wpj
BitKeeper/deleted/.del-db_load.c~1dd647c9c5863378:
  Delete: bdb/build_vxworks/db_load/db_load.c
BitKeeper/deleted/.del-db_load.wpj~67c6c653a9bea870:
  Delete: bdb/build_vxworks/db_load/db_load.wpj
BitKeeper/deleted/.del-Makefile.custom~1a5a0a49a86a3f28:
  Delete: bdb/build_vxworks/db_upgrade/db_upgrade/Makefile.custom
BitKeeper/deleted/.del-Makefile.custom~afc05029de4bf10:
  Delete: bdb/build_vxworks/db_printlog/db_printlog/Makefile.custom
BitKeeper/deleted/.del-Makefile.custom~b56acb71917c4d78:
  Delete: bdb/build_vxworks/db_recover/db_recover/Makefile.custom
BitKeeper/deleted/.del-Makefile.custom~ead532061f2a01a7:
  Delete: bdb/build_vxworks/db_stat/db_stat/Makefile.custom
BitKeeper/deleted/.del-component.cdf~169be941a9ccfe77:
  Delete: bdb/build_vxworks/db_printlog/db_printlog/component.cdf
BitKeeper/deleted/.del-component.cdf~41e8ac6e554a2c0a:
  Delete: bdb/build_vxworks/db_upgrade/db_upgrade/component.cdf
BitKeeper/deleted/.del-component.cdf~8dfd6cea1eb16ffb:
  Delete: bdb/build_vxworks/db_recover/db_recover/component.cdf
BitKeeper/deleted/.del-component.cdf~c6f1a7b0c99c5a:
  Delete: bdb/build_vxworks/db_stat/db_stat/component.cdf
BitKeeper/deleted/.del-component.wpj~2b0236f9e7d93c0e:
  Delete: bdb/build_vxworks/db_load/db_load/component.wpj
BitKeeper/deleted/.del-component.wpj~65b35a15fb66fbf4:
  Delete: bdb/build_vxworks/db_recover/db_recover/component.wpj
BitKeeper/deleted/.del-component.wpj~ab56c607b6f675f0:
  Delete: bdb/build_vxworks/db_printlog/db_printlog/component.wpj
BitKeeper/deleted/.del-component.wpj~b569f98cbb9764e4:
  Delete: bdb/build_vxworks/db_stat/db_stat/component.wpj
BitKeeper/deleted/.del-db_printlog.c~577c296df84c5d5e:
  Delete: bdb/build_vxworks/db_printlog/db_printlog.c
BitKeeper/deleted/.del-db_printlog.wpj~a3d309da1bcfd90d:
  Delete: bdb/build_vxworks/db_printlog/db_printlog.wpj
BitKeeper/deleted/.del-db_recover.c~91a305ab726bdd8:
  Delete: bdb/build_vxworks/db_recover/db_recover.c
BitKeeper/deleted/.del-db_recover.wpj~8ad42e5de67901e2:
  Delete: bdb/build_vxworks/db_recover/db_recover.wpj
BitKeeper/deleted/.del-db_stat.c~4dcfe3213db403f7:
  Delete: bdb/build_vxworks/db_stat/db_stat.c
BitKeeper/deleted/.del-db_stat.wpj~77f17910b9a94f85:
  Delete: bdb/build_vxworks/db_stat/db_stat.wpj
BitKeeper/deleted/.del-db_upgrade.c~e7cda8f222da34a7:
  Delete: bdb/build_vxworks/db_upgrade/db_upgrade.c
BitKeeper/deleted/.del-db_upgrade.wpj~d36d961b31f59dda:
  Delete: bdb/build_vxworks/db_upgrade/db_upgrade.wpj
BitKeeper/deleted/.del-Makefile.custom~885ead3079a0a779:
  Delete: bdb/build_vxworks/db_verify/db_verify/Makefile.custom
BitKeeper/deleted/.del-Makefile.custom~a1a4e96924c2bc16:
  Delete: bdb/build_vxworks/dbdemo/dbdemo/Makefile.custom
BitKeeper/deleted/.del-component.cdf~4e48fb1399b97382:
  Delete: bdb/build_vxworks/dbdemo/dbdemo/component.cdf
BitKeeper/deleted/.del-component.cdf~7949208c42787c23:
  Delete: bdb/build_vxworks/db_verify/db_verify/component.cdf
BitKeeper/deleted/.del-component.wpj~33b7238376fc4675:
  Delete: bdb/build_vxworks/db_verify/db_verify/component.wpj
BitKeeper/deleted/.del-component.wpj~94039e6651ac117:
  Delete: bdb/build_vxworks/db_upgrade/db_upgrade/component.wpj
BitKeeper/deleted/.del-component.wpj~b4f7a191ebb2b1e7:
  Delete: bdb/build_vxworks/dbdemo/dbdemo/component.wpj
BitKeeper/deleted/.del-db_verify.c~1b3e9cc5c17323eb:
  Delete: bdb/build_vxworks/db_verify/db_verify.c
BitKeeper/deleted/.del-db_verify.wpj~1fa472e1eeecb396:
  Delete: bdb/build_vxworks/db_verify/db_verify.wpj
BitKeeper/deleted/.del-dbdemo.c~e754acbbacde488:
  Delete: bdb/build_vxworks/dbdemo/dbdemo.c
BitKeeper/deleted/.del-dbdemo.wpj~c8d2fa5d14674437:
  Delete: bdb/build_vxworks/dbdemo/dbdemo.wpj
bdb/dist/s_all:
  move mkdir stuff to a separate file
  comment out scripts we don't need

This is required for prepared statements and stored procedures.


BitKeeper/etc/ignore:
  Added bkpull.log bkpull.log.2 bkpull.log.3 build.log sql/safe_to_cache_query.txt to the ignore list
sql/item_create.cc:
  Moved safe_to_cache_query from thd to lex.
sql/item_func.cc:
  Moved safe_to_cache_query from thd to lex.
sql/sql_cache.cc:
  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/sql_class.cc:
  Moved safe_to_cache_query from thd to lex.
sql/sql_class.h:
  Moved safe_to_cache_query from thd to lex.
sql/sql_lex.cc:
  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_lex.h:
  Moved safe_to_cache_query from thd to lex.
sql/sql_parse.cc:
  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_prepare.cc:
  Moved safe_to_cache_query from thd to lex.
  Must set it after lex_start() has been called.
sql/sql_yacc.yy:
  Moved safe_to_cache_query from thd to lex.

  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:
  Flush stderr if we run out of memory, so that the error message more probably finds its way to the error log