innobase/mem/mem0pool.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
configure.in:
Ignore changes that were backported to 4.0
scripts/mysql_install_db.sh:
Ignore Ramil's changes for now
--with-uca configure.in argument.
The rest of the changes are pending from 4.1 tree
config/ac-macros/character_sets.m4:
--with-uca configure.in argument.
The rest of the changes are pending from 4.1 tree
perror.c:
Copy output of strerr to temp buffer to prevent system overwrite on Windows
extra/perror.c:
Copy output of strerr to temp buffer to prevent system overwrite on Windows
into bob.(none):/home/reggie/bk/mysql5.0
BitKeeper/etc/logging_ok:
auto-union
innobase/include/srv0srv.h:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
into bob.(none):/home/reggie/bk/mysql5.0
BitKeeper/etc/logging_ok:
auto-union
innobase/include/srv0srv.h:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_table.cc:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
client/mysqldump.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
strings/ctype-simple.c:
SCCS merged
sql_table.cc:
use fn_format to resolve symlinks in mysql_create_like_table
sql/sql_table.cc:
use fn_format to resolve symlinks in mysql_create_like_table
Fix an assertion failure in 64-bit computers if UNIV_MEM_DEBUG is defined
innobase/mem/mem0pool.c:
Fix an assertion failure in 64-bit computers if UNIV_MEM_DEBUG is defined
+ ion shutdown - don't close files that are not open
+ abort in debug - if closing a fd == -1
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
innobase/row/row0mysql.c:
row_truncate_for_mysql(): Always lock the data dictionary.
row_truncate_for_mysql(): Improve comments and diagnostic messages.
sql/ha_innodb.cc:
delete_all_rows(): Replace innobase_commit_low()
with innobase_commit(). (partial fix to Bug #8151)
Fix replication for multi-update
new test - rpl_multi_update2
sql/mysql_priv.h:
Bug#7011
New function mysql_multi_update_lock()
sql/sql_parse.cc:
Bug#7011
New function check_multi_update_lock()
For multi-update on slave, perform an early open&lock
sql/sql_update.cc:
Bug#7011
Split out multi-update locking into its own function,
mysql_multi_update_lock()
mysys/my_handler.c:
Fix for a bug in multi table updates, when offset of one table is
5 bytes or more. This occured because in that case binary(5) indexed
column is space packed, so it was hit by this bug in the function
for binary comparison.
Bug #7788
