BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1:
  Auto merged
client/client_priv.h:
  Auto merged
extra/resolveip.c:
  Auto merged
include/mysql.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
myisam/myisamchk.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged

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


sql/item_strfunc.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

After merge fixes


include/my_base.h:
  Fix comment syntax
libmysql/client_settings.h:
  Portability fixes for windows
libmysql/libmysql.c:
  Portability fixes for windows
libmysql/libmysql.def:
  Portability fixes for windows
mysql-test/r/variables.result:
  Fix result after merge
sql-common/client.c:
  Portability fixes for windows
sql/ha_berkeley.cc:
  Use defines instead of constants
sql/item_strfunc.cc:
  Portability fixes for windows
sql/mysql_priv.h:
  Use defines instead of defines
sql/mysqld.cc:
  After merge fix
sql/opt_range.h:
  After merge fix
sql/set_var.h:
  Portability fixes for windows
sql/sql_class.cc:
  Defines instead of constants
sql/sql_help.cc:
  after merge fixes
  More OOM error checking
sql/sql_prepare.cc:
  After merge fixes
sql/sql_table.cc:
  Portability fixes for windows

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

Fixed chsize() problem on windows
Extend default timeout on windows clients to 1 year (to avoid timeout problems)


include/mysql.h:
  Added client timeouts (for TCP/IP)
libmysql/libmysql.c:
  Added client timeouts (for TCP/IP)
mysql-test/r/create.result:
  More tests for CREATE TABLE IF NOT EXISTS ... SELECT
mysql-test/t/create.test:
  More tests for CREATE TABLE IF NOT EXISTS ... SELECT
mysys/my_chsize.c:
  Fix for windows
sql/handler.h:
  Remove not used field 'if_not_exists'
  Ordered fields to be more optimized for new CPU's
  Added field 'table_existed'
sql/slave.cc:
  Cleanup temporary tables when slave ends
sql/sql_class.h:
  Remove not used 'do_not_drop' field
sql/sql_insert.cc:
  Better fix for CREATE TABLE IF NOT EXISTS ... SELECT
sql/sql_table.cc:
  Better fix for CREATE TABLE IF NOT EXISTS ... SELECT

mysys/queues.c:
  Comments for new functions (no code change)
mysys/thr_alarm.c:
  Updated comment

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


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

  Win compilation problem fix
ctype-bin.c:
  Win compilation problem fix
  ,
  ,
m_ctype.h:
  Win compilation problem fix
  ,


include/m_ctype.h:
  Win compilation problem fix
  ,
strings/ctype-bin.c:
  Win compilation problem fix
  ,
  ,
strings/ctype-mb.c:
  Win compilation problem fix
strings/ctype-simple.c:
  Win compilation problem fix

sql/sql_test.cc:
  Add more information about memory usage

into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.max


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into mysql.com:/usr/home/harry/mysqlstuff/mysql-4.1

  Visual C++ apparently does not know what -1LL (= -1 in longlong type) means


innobase/fil/fil0fil.c:
  Visual C++ apparently does not know what -1LL (= -1 in longlong type) means

sql/item_sum.cc:
  Add in bit_xor class functions.
sql/item_sum.h:
  Add bit_xor class.
sql/lex.h:
  Add in bit_xor symbol.
sql/sql_yacc.yy:
  Add in bit_xor function
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Fix Visual C++ compilation errors reported by Miguel


innobase/os/os0file.c:
  Fix Visual C++ compilation errors reported by Miguel

existed, causing problems on non-case-sensitive OSes.
Deleted conflicting file.


BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1:
  Delete: VC++Files/mysqlshutdown/MYSQL.ICO

BitKeeper/etc/ignore:
  auto-union
mysql-test/t/variables.test:
  Auto merged

BitKeeper/etc/ignore:
  added scripts/make_sharedlib_distribution
mysql-test/r/variables.result:
  Add test for enum_system_variable=NULL
mysql-test/t/variables.test:
  Add test for enum_system_variable=NULL
sql/set_var.cc:
  Fixed bug in SET enum_system_variable=NULL
  Moved some array elements to get result sorted

  IMPORT TABLESPACE must reset lsns if they are too high
ha_innodb.cc:
  DISCARD/IMPORT TABLESPACE must have a TL_WRITE lock on the table


sql/ha_innodb.cc:
  DISCARD/IMPORT TABLESPACE must have a TL_WRITE lock on the table
innobase/fil/fil0fil.c:
  IMPORT TABLESPACE must reset lsns if they are too high
innobase/include/fil0fil.h:
  IMPORT TABLESPACE must reset lsns if they are too high
innobase/include/os0file.h:
  IMPORT TABLESPACE must reset lsns if they are too high
innobase/os/os0file.c:
  IMPORT TABLESPACE must reset lsns if they are too high
innobase/row/row0mysql.c:
  IMPORT TABLESPACE must reset lsns if they are too high
innobase/row/row0purge.c:
  IMPORT TABLESPACE must reset lsns if they are too high

make LOCK TABLES to work when Lock_tables_priv is granted on the DB level and Select_priv is granted on the table level.

  Add DISCARD etc. in the keyword: rule of sql_yacc.yy
sql_table.cc:
  Add comment that DISCARD/IMPORT TABLESPACE is always the only clause in an ALTER TABLE


sql/sql_table.cc:
  Add comment that DISCARD/IMPORT TABLESPACE is always the only clause in an ALTER TABLE
sql/sql_yacc.yy:
  Add DISCARD etc. in the keyword: rule of sql_yacc.yy

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


sql/slave.cc:
  Auto merged

configure.in:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
scripts/Makefile.am:
  merge
sql/log_event.cc:
  merge
sql/mysqld.cc:
  merge
sql/opt_range.cc:
  merge
sql/set_var.cc:
  merge
sql/sql_class.h:
  merge
sql/sql_delete.cc:
  merge
sql/sql_parse.cc:
  merge

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

  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x


sql/ha_innodb.cc:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/sql_class.cc:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/sql_parse.cc:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/sql_table.cc:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/ha_innodb.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/handler.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/lex.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/mysql_priv.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/sql_class.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/sql_lex.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/sql_yacc.yy:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/ha/ha0ha.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/ha/hash0hash.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/buf/buf0buf.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/buf/buf0flu.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/buf/buf0lru.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/buf/buf0rea.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/btr/btr0btr.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/btr/btr0sea.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/fil/fil0fil.c:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/include/buf0buf.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/include/ha0ha.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/include/hash0hash.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/include/row0mysql.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/include/buf0buf.ic:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/include/ha0ha.ic:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/include/ibuf0ibuf.ic:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/page/page0page.c:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/row/row0mysql.c:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/row/row0purge.c:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/row/row0uins.c:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/row/row0umod.c:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE

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

typo in error message text corrected.
new tests added


mysql-test/r/func_compress.result:
  new tests added
mysql-test/t/func_compress.test:
  new tests added
sql/item_strfunc.cc:
  max size of uncompressed data is max_allowed_packet not 8K
sql/share/czech/errmsg.txt:
  typo fixed
sql/share/danish/errmsg.txt:
  typo fixed
sql/share/dutch/errmsg.txt:
  typo fixed
sql/share/english/errmsg.txt:
  typo fixed
sql/share/estonian/errmsg.txt:
  typo fixed
sql/share/french/errmsg.txt:
  typo fixed
sql/share/german/errmsg.txt:
  typo fixed
sql/share/greek/errmsg.txt:
  typo fixed
sql/share/hungarian/errmsg.txt:
  typo fixed
sql/share/italian/errmsg.txt:
  typo fixed
sql/share/japanese/errmsg.txt:
  typo fixed
sql/share/korean/errmsg.txt:
  typo fixed
sql/share/norwegian-ny/errmsg.txt:
  typo fixed
sql/share/norwegian/errmsg.txt:
  typo fixed
sql/share/polish/errmsg.txt:
  typo fixed
sql/share/portuguese/errmsg.txt:
  typo fixed
sql/share/romanian/errmsg.txt:
  typo fixed
sql/share/russian/errmsg.txt:
  typo fixed
sql/share/serbian/errmsg.txt:
  typo fixed
sql/share/slovak/errmsg.txt:
  typo fixed
sql/share/spanish/errmsg.txt:
  typo fixed
sql/share/swedish/errmsg.txt:
  typo fixed
sql/share/ukrainian/errmsg.txt:
  typo fixed

(BUG#1537)


mysql-test/r/func_gconcat.result:
  test of BUG#1537
mysql-test/t/func_gconcat.test:
  test of BUG#1537
sql/item_sum.cc:
  passing correct address of pointer to item to fix_dields(), using that addres to get access to item after fix_fields

Add warnings for single line inserts. To do this I had to convert count_cuted_fields to an enum (to be able to detect setting a NOT NULL field to NULL)


mysql-test/r/ctype_mb.result:
  update results after adding more warnings
mysql-test/r/null.result:
  update results after adding more warnings
mysql-test/r/select_found.result:
  update results after adding more warnings
mysql-test/r/warnings.result:
  update results after adding more warnings
mysql-test/t/ctype_mb.test:
  Add missing drop table
mysql-test/t/myisam.test:
  Disable some warnings
mysql-test/t/select_found.test:
  update results after adding more warnings
sql/field_conv.cc:
  Add warnings for single line inserts
sql/item_func.cc:
  Remove compile warnings
sql/sql_class.cc:
  Add warnings for single line inserts
sql/sql_class.h:
  Add warnings for single line inserts
sql/sql_insert.cc:
  Add warnings for single line inserts
sql/sql_load.cc:
  Add warnings for single line inserts
sql/sql_select.cc:
  Add warnings for single line inserts
sql/sql_table.cc:
  Add warnings for single line inserts
sql/sql_update.cc:
  Add warnings for single line inserts

query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size
Add more checks for "out of memory" detection in range optimization


configure.in:
  Added detection of mallinfo
mysql-test/r/variables.result:
  Test of new variables
mysql-test/t/variables.test:
  Test of new variables
sql/ha_berkeley.cc:
  Use init_sql_alloc instead of init_alloc_root for better OOM detection
sql/log_event.cc:
  Add new user variables for tuning memory usage
sql/mysql_priv.h:
  Add new user variables for tuning memory usage
sql/mysqld.cc:
  Add new user variables for tuning memory usage
sql/opt_ft.cc:
  Add new user variables for tuning memory usage
sql/opt_ft.h:
  Add new user variables for tuning memory usage
sql/opt_range.cc:
  Add new user variables for tuning memory usage
  Add more checks for out of memory conditions
sql/opt_range.h:
  Add new user variables for tuning memory usage
sql/set_var.cc:
  Add new user variables for tuning memory usage
sql/sql_acl.cc:
  Add new user variables for tuning memory usage
sql/sql_class.h:
  Add new user variables for tuning memory usage
sql/sql_delete.cc:
  Add new user variables for tuning memory usage
sql/sql_parse.cc:
  Add new user variables for tuning memory usage
sql/sql_select.cc:
  Add new user variables for tuning memory usage
sql/sql_test.cc:
  Add information about memory useage if system supports mallinfo()
sql/sql_udf.cc:
  Add new user variables for tuning memory usage
sql/sql_update.cc:
  Add new user variables for tuning memory usage
sql/table.cc:
  Add new user variables for tuning memory usage

  Fix error in --show-slave-auth-info help string.


sql/mysqld.cc:
  Fix error in --show-slave-auth-info help string.

into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.0

mysql-test/r/rpl_openssl.result:
  Removed extra spaces

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

I manually edited rpl_openssl.result because the test is skipped on my
machine. Hope it's correct.


mysql-test/r/rpl000015.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_error_ignored_table.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_flush_log_loop.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_loaddata.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_log.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_log_pos.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_max_relay_size.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_openssl.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_replicate_do.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_reset_slave.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_rotate_logs.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_trunc_binlog.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_until.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl000015.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_empty_master_crash.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_error_ignored_table.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_flush_log_loop.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_loaddata.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_log.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_log_pos.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_max_relay_size.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_openssl.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_redirect.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_replicate_do.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_reset_slave.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_rotate_logs.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_trunc_binlog.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_until.test:
  Don't show Slave_IO_State because it can't be predicted.

a Format_description_log_event (or maybe it will be named
Description_log_event) which is not recognized by 4.0, so
a 4.0 can't be a slave of 5.0. We detect it early to produce
a helpful message instead of "corrupted relay log" later.


sql/slave.cc:
  Make the slave die if master is 5.0.

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

a better comment, and replacing an assignment by an equivalent simpler one.


sql/log_event.cc:
  a better comment, and replacing an assignment by an equivalent simpler one.