1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge from mysql-trunk.

Browse Source
This commit is contained in:
Alexander Nozdrin 2009-08-27 16:46:34 +04:00
commit 6fbb712fed
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
# #
# When changing major version number please also check switch statement # When changing major version number please also check switch statement
# in client/mysqlbinlog.cc:check_master_version(). # in client/mysqlbinlog.cc:check_master_version().
AM_INIT_AUTOMAKE(mysql, 5.4.2-beta) AM_INIT_AUTOMAKE(mysql, 5.4.3-beta)
AM_CONFIG_HEADER([include/config.h:config.h.in]) AM_CONFIG_HEADER([include/config.h:config.h.in])
PROTOCOL_VERSION=10 PROTOCOL_VERSION=10

2
man/Makefile.am
View File

@ -23,7 +23,7 @@ EXTRA_DIST = $(man1_MANS) $(man8_MANS)
# "make_win_*" are not needed in Unix binary packages, # "make_win_*" are not needed in Unix binary packages,
install-data-hook: install-data-hook:
rm -f $(DESTDIR)$(manlibdir)/man1/make_win_* rm -f $(DESTDIR)$(mandir)/man1/make_win_*
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%

1
storage/innobase/handler/handler0alter.cc
View File

@ -863,6 +863,7 @@ error_handling:
indexed_table->n_mysql_handles_opened++; indexed_table->n_mysql_handles_opened++;
error = row_merge_drop_table(trx, innodb_table); error = row_merge_drop_table(trx, innodb_table);
innodb_table = indexed_table;
goto convert_error; goto convert_error;
case DB_TOO_BIG_RECORD: case DB_TOO_BIG_RECORD:

7
storage/innobase/lock/lock0lock.c
View File

@ -3574,7 +3574,8 @@ lock_table_remove_low(
and lock_grant()). Therefore it can be empty and we and lock_grant()). Therefore it can be empty and we
need to check for that. */ need to check for that. */
if (!ib_vector_is_empty(trx->autoinc_locks)) { if (!lock_get_wait(lock)
&& !ib_vector_is_empty(trx->autoinc_locks)) {
lock_t* autoinc_lock; lock_t* autoinc_lock;
autoinc_lock = ib_vector_pop(trx->autoinc_locks); autoinc_lock = ib_vector_pop(trx->autoinc_locks);
@ -3647,8 +3648,10 @@ lock_table_enqueue_waiting(
if (lock_deadlock_occurs(lock, trx)) { if (lock_deadlock_occurs(lock, trx)) {
lock_reset_lock_and_trx_wait(lock); /* The order here is important, we don't want to
lose the state of the lock before calling remove. */
lock_table_remove_low(lock); lock_table_remove_low(lock);
lock_reset_lock_and_trx_wait(lock);
return(DB_DEADLOCK); return(DB_DEADLOCK);
} }