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

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


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

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

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.

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.

  Fix the Windows compilation error reported by Miguel 1.5 hours ago


innobase/include/os0file.h:
  Fix the Windows compilation error reported by Miguel 1.5 hours ago

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1

  Add Stefan's new translations.


sql/share/german/errmsg.txt:
  Add Stefan's new translations.

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

"Add a column "Timestamp_of_last_master_event_executed" in SHOW SLAVE STATUS".
Finally this is adding
- Slave_IO_State (a copy of the State column of SHOW PROCESSLIST for the I/O thread,
so that the users, most of the time, has enough info with only SHOW SLAVE STATUS).
- Seconds_behind_master. When the slave connects to the master it does SELECT UNIX_TIMESTAMP()
on the master, computes the absolute difference between the master's and the slave's clock.
It records the timestamp of the last event executed by the SQL thread, and does a
small computation to find the number of seconds by which the slave is late.


mysql-test/r/rpl000015.result:
  result update
mysql-test/r/rpl_empty_master_crash.result:
  result update
mysql-test/r/rpl_error_ignored_table.result:
  result update
mysql-test/r/rpl_flush_log_loop.result:
  result update
mysql-test/r/rpl_loaddata.result:
  result update
mysql-test/r/rpl_log.result:
  result update
mysql-test/r/rpl_log_pos.result:
  result update
mysql-test/r/rpl_max_relay_size.result:
  result update
mysql-test/r/rpl_redirect.result:
  result update
mysql-test/r/rpl_replicate_do.result:
  result update
mysql-test/r/rpl_reset_slave.result:
  result update
mysql-test/r/rpl_rotate_logs.result:
  result update
mysql-test/r/rpl_trunc_binlog.result:
  result update
mysql-test/r/rpl_until.result:
  result update
mysql-test/t/rpl000015.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_empty_master_crash.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_error_ignored_table.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_flush_log_loop.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_loaddata.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_log.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_log_pos.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_max_relay_size.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_openssl.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_redirect.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_replicate_do.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_reset_slave.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_rotate_logs.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_trunc_binlog.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_until.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
sql/log_event.cc:
  when the SQL thread executes an event, we record its timestamp
sql/slave.cc:
  in check_master_version() we know read the master's clock, to know the clock difference
  with the slave.
  In show_master_info() we send the state of the I/O thread, and compute the number of
  seconds by which the slave is late.
sql/slave.h:
  timestamp of the last master's event executed by the SQL thread,
  and difference between the clocks of the master and slave.
sql/sql_repl.cc:
  clear the Seconds_behind_master column of SHOW SLAVE STATUS when RESET SLAVE or CHANGE MASTER.

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1


BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1:
  Auto merged

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

BitKeeper/deleted/.del-mysql.ico:
  Delete: VC++Files/mysqlshutdown/mysql.ico

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

Remove wait_if_global_read_lock on commit as this can cause deadlocks


BUILD/FINISH.sh:
  Cleanup
BUILD/SETUP.sh:
  Cleanup
BUILD/compile-pentium-valgrind-max:
  Don't write message twice
mysql-test/r/innodb.result:
  Removed failure as this can cause deadlocks
mysql-test/r/rpl_max_relay_size.result:
  Make test repeatable
mysql-test/t/innodb.test:
  Removed failure as this can cause deadlocks
mysql-test/t/rpl_max_relay_size.test:
  Removed failure as this can cause deadlocks
sql/handler.cc:
  Remove wait_if_global_read_lock as this can cause deadlocks
sql/opt_range.cc:
  Indentation cleanup
sql/sql_db.cc:
  Comment cleanup
sql/sql_parse.cc:
  Comment cleanup
sql/sql_repl.cc:
  Indentation cleanup
sql/sql_select.cc:
  Indentation cleanup

into narttu.mysql.fi:/my/mysql-4.1


libmysqld/examples/Makefile.am:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

More tests cases
After merge fixes


BitKeeper/deleted/.del-ansi-master.opt~4d337eb61642a838:
  Delete: mysql-test/t/ansi-master.opt
mysql-test/r/ansi.result:
  Cleaned up test to be able to remove ansi-master.opt
mysql-test/r/create.result:
  Updated results
mysql-test/r/insert_select.result:
  Updated results
mysql-test/r/rpl000009.result:
  Updated results
mysql-test/t/ansi.test:
  Cleaned up test to be able to remove ansi-master.opt
mysql-test/t/create.test:
  More tests
mysql-test/t/insert_select.test:
  More tests
mysql-test/t/mysqlbinlog.test:
  Fixed test after merge
sql/mysql_priv.h:
  Added character-sets-dir to 'show variables'
sql/set_var.cc:
  Added character-sets-dir to 'show variables'
sql/sql_class.cc:
  Fixed that send_error() is called properly when a SELECT fails
sql/sql_class.h:
  Fixed that send_error() is called properly when a SELECT fails
sql/sql_insert.cc:
  Fixed bug in error handling of CREATE ... SELECT
sql/sql_select.cc:
  Fixed bug in error handling of CREATE ... SELECT

   4.0->4.1 merge (mysqltest needs to be linked with a C++ compiler)

client/mysqlbinlog.cc:
  Auto merged
mysql-test/t/rpl_trunc_binlog.test:
  Auto merged

mysql-test/std_data/trunc_binlog.000001:
  Rename: mysql-test/std_data/trunc_binlog.001 -> mysql-test/std_data/trunc_binlog.000001
client/mysqltest.c:
  Fixed merge problem
mysql-test/mysql-test-run.sh:
  Fixed merge problem
mysql-test/r/distinct.result:
  Fix after merge
mysql-test/r/drop_temp_table.result:
  Fix after merge
mysql-test/r/join_outer.result:
  Fix after merge
mysql-test/r/mysqldump.result:
  Fix after merge
mysql-test/r/null_key.result:
  Fix after merge
mysql-test/r/order_by.result:
  Fix after merge
mysql-test/r/rpl_alter.result:
  Fix after merge
mysql-test/r/rpl_loaddata.result:
  Fix after merge
mysql-test/r/rpl_loaddata_rule_m.result:
  Fix after merge
mysql-test/r/rpl_trunc_binlog.result:
  Fix after merge
mysql-test/r/select_safe.result:
  Fix after merge
mysql-test/t/insert.test:
  Fix after merge
mysql-test/t/mysqlbinlog.test:
  Fix after merge
mysql-test/t/rpl000009.test:
  Fix after merge
mysql-test/t/rpl_alter.test:
  Fix after merge
mysql-test/t/rpl_loaddata_rule_m.test:
  Fix after merge
mysql-test/t/rpl_trunc_binlog.test:
  Fix after merge
sql-common/client.c:
  Fix after merge
sql/item_subselect.cc:
  Fix after merge
sql/repl_failsafe.cc:
  Fix after merge
sql/slave.cc:
  Fix after merge
sql/sql_insert.cc:
  Fix after merge

Changed --remote to --read-from-remote-server (mysqlbinlog)


client/mysqlbinlog.cc:
  Changed --remote to --read-from-remote-server to make option more understandable
mysql-test/t/mysqlbinlog.test:
  Fixed test case that --remote broke

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

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

  Character set variables test


mysql-test/t/query_cache.test:
  Character set variables test
mysql-test/r/query_cache.result:
  Character set variables test

mysql-test/r/func_gconcat.result:
  Removed extraneous CR (0x0D)
mysql-test/t/func_gconcat.test:
  Removed extraneous CR (0x0D)

into narttu.mysql.fi:/my/mysql-4.0

client/mysqlbinlog.cc:
  Fix for option 'R' (connect to remote server)

 This makes the test non-repeatable when running as root.
 So I change to not use the "" user, but a random string which will
 always result in the @localhost user being selected by the server.


mysql-test/t/rpl_temporary.test:
  mysql_real_connect picks the Unix login when the user "" is used.
  This makes the test non-repeatable when running as root.
  So I change to not use the "" user, but a random string which will
  always result in the @localhost user being selected by the server.

sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
innobase/row/row0mysql.c:
  merge (no changes)
innobase/row/row0sel.c:
  merge (no changes)
sql/item_subselect.cc:
  Use sanjas patch instead

as the test is meaningful only if the slave supports transactions,
we require this. As in 4.0 the slave runs with --skip-innodb, we
test for BDB.

client/mysqlbinlog.cc:
  Auto merged
mysql-test/r/create.result:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Cleaned up argument handling for external programs

into narttu.mysql.fi:/my/mysql-4.0

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

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


mysql-test/r/subselect.result:
  Auto merged
sql/sql_select.cc:
  Auto merged

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

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


sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged