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

Automerge "trunk" (5.4.2 cloning + version number increase to 5.4.3)

Browse Source 
into "trunk-build".
This commit is contained in:
Joerg Bruehe 2009-08-27 10:44:50 +02:00
commit 7810f50aa4
2 changed files with 2 additions and 1 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
# 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])
PROTOCOL_VERSION=10

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

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