diff options
| -rw-r--r-- | myisam/Makefile.am | 3 | ||||
| -rw-r--r-- | mysql-test/r/flush_block_commit.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/flush_block_commit.test | 5 | ||||
| -rw-r--r-- | sql/Makefile.am | 3 | ||||
| -rw-r--r-- | sql/handler.cc | 2 | ||||
| -rw-r--r-- | sql/sql_db.cc | 2 | ||||
| -rw-r--r-- | sql/sql_rename.cc | 2 | ||||
| -rw-r--r-- | sql/sql_table.cc | 2 |
8 files changed, 11 insertions, 10 deletions
diff --git a/myisam/Makefile.am b/myisam/Makefile.am index 9f4eef348a3..378e8107814 100644 --- a/myisam/Makefile.am +++ b/myisam/Makefile.am @@ -21,8 +21,7 @@ INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/dbug/libdbug.a \ - @ZLIB_LIBS@ \ - $(top_builddir)/strings/libmystrings.a + $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ pkglib_LIBRARIES = libmyisam.a bin_PROGRAMS = myisamchk myisamlog myisampack myisam_ftdump myisamchk_DEPENDENCIES= $(LIBRARIES) diff --git a/mysql-test/r/flush_block_commit.result b/mysql-test/r/flush_block_commit.result index 3205dd9dad9..17991f15382 100644 --- a/mysql-test/r/flush_block_commit.result +++ b/mysql-test/r/flush_block_commit.result @@ -1,5 +1,5 @@ drop table if exists t1; -create table t1 (a int) type=innodb; +create table t1 (a int) engine=innodb; begin; insert into t1 values(1); flush tables with read lock; diff --git a/mysql-test/t/flush_block_commit.test b/mysql-test/t/flush_block_commit.test index 20ecec1361c..3d13086f517 100644 --- a/mysql-test/t/flush_block_commit.test +++ b/mysql-test/t/flush_block_commit.test @@ -8,8 +8,11 @@ connect (con1,localhost,root,,); connect (con2,localhost,root,,); connect (con3,localhost,root,,); connection con1; + +--disable_warnings drop table if exists t1; -create table t1 (a int) type=innodb; +--enable_warnings +create table t1 (a int) engine=innodb; # blocks COMMIT ? diff --git a/sql/Makefile.am b/sql/Makefile.am index ec4e729bedb..d951aae91e1 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -30,7 +30,6 @@ noinst_PROGRAMS = gen_lex_hash bin_PROGRAMS = mysql_tzinfo_to_sql gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@ LDADD = @isam_libs@ \ - @ZLIB_LIBS@ \ $(top_builddir)/myisam/libmyisam.a \ $(top_builddir)/myisammrg/libmyisammrg.a \ $(top_builddir)/heap/libheap.a \ @@ -38,7 +37,7 @@ LDADD = @isam_libs@ \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/regex/libregex.a \ - $(top_builddir)/strings/libmystrings.a + $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ @bdb_libs@ @innodb_libs@ @pstack_libs@ \ diff --git a/sql/handler.cc b/sql/handler.cc index 39a6296a525..119e29a6a03 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -476,7 +476,7 @@ int ha_commit_trans(THD *thd, THD_TRANS* trans) #ifdef USING_TRANSACTIONS if (opt_using_transactions) { - bool operation_done= 0; + bool transaction_commited= 0; bool operation_done= 0, need_start_waiters= 0; /* If transaction has done some updates to tables */ diff --git a/sql/sql_db.cc b/sql/sql_db.cc index f786e7476ac..cfc75e3be95 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -498,7 +498,7 @@ int mysql_alter_db(THD *thd, const char *db, HA_CREATE_INFO *create_info) VOID(pthread_mutex_lock(&LOCK_mysql_create_db)); // do not alter database if another thread is holding read lock - if ((error=wait_if_global_read_lock(thd,0))) + if ((error=wait_if_global_read_lock(thd,0,1))) goto exit2; /* Check directory */ diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc index d2b575c0838..afaf2ed0923 100644 --- a/sql/sql_rename.cc +++ b/sql/sql_rename.cc @@ -48,7 +48,7 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list) DBUG_RETURN(1); } - if (wait_if_global_read_lock(thd,0)) + if (wait_if_global_read_lock(thd,0,1)) DBUG_RETURN(1); VOID(pthread_mutex_lock(&LOCK_open)); if (lock_table_names(thd, table_list)) diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 9ff46f219b1..b0b92178198 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1206,7 +1206,7 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name, my_error(ER_TABLE_EXISTS_ERROR, MYF(0), alias); DBUG_RETURN(-1); } - if (wait_if_global_read_lock(thd, 0)) + if (wait_if_global_read_lock(thd, 0, 1)) DBUG_RETURN(error); VOID(pthread_mutex_lock(&LOCK_open)); if (!tmp_table && !(create_info->options & HA_LEX_CREATE_TMP_TABLE)) |