mirror of
https://github.com/MariaDB/server.git
synced 2026-04-25 01:35:31 +02:00
show_check.test fixed cleanup problem
rpl000014.test fixed bug in testcase rename.test fixed cleanup problem handler.cc added a comment sql_class.h fixed bug in active_transaction() when MySQL was not compiled with transaction support mysql-test/t/rename.test: fixed cleanup problem mysql-test/t/rpl000014.test: fixed bug in testcase mysql-test/t/show_check.test: fixed cleanup problem sql/handler.cc: added a comment sql/sql_class.h: fixed bug in active_transaction() when MySQL was not compiled with transaction support
This commit is contained in:
parent
2218bce9cc
commit
1cf31b8537
5 changed files with 9 additions and 2 deletions
|
|
@ -2,7 +2,7 @@
|
|||
# Test of rename table
|
||||
#
|
||||
|
||||
drop table if exists t1,t2,t3,t4;
|
||||
drop table if exists t0,t1,t2,t3,t4;
|
||||
create table t0 SELECT 1,"table 1";
|
||||
create table t2 SELECT 2,"table 2";
|
||||
create table t3 SELECT 3,"table 3";
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ change master to master_log_pos=173;
|
|||
show slave status;
|
||||
connection master;
|
||||
show master status;
|
||||
create table if not exists foo(n int);
|
||||
drop table if exists foo;
|
||||
create table foo (n int);
|
||||
insert into foo values (1),(2),(3);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
#
|
||||
# Test of some show commands
|
||||
#
|
||||
drop table if exists t1,t2;
|
||||
create table t1 (a int not null primary key, b int not null,c int not null, key(b,c));
|
||||
insert into t1 values (1,2,2),(2,2,3),(3,2,4),(4,2,4);
|
||||
create table t2 type=isam select * from t1;
|
||||
|
|
|
|||
|
|
@ -241,7 +241,7 @@ int ha_commit_trans(THD *thd, THD_TRANS* trans)
|
|||
#endif
|
||||
if (error && trans == &thd->transaction.all && mysql_bin_log.is_open())
|
||||
sql_print_error("Error: Got error during commit; Binlog is not up to date!");
|
||||
#endif
|
||||
#endif // using transactions
|
||||
DBUG_RETURN(error);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -299,9 +299,14 @@ public:
|
|||
}
|
||||
inline bool active_transaction()
|
||||
{
|
||||
#ifdef USING_TRANSACTIONS
|
||||
return (transaction.all.bdb_tid != 0 ||
|
||||
transaction.all.innobase_tid != 0 ||
|
||||
transaction.all.gemini_tid != 0);
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
|
||||
}
|
||||
inline gptr alloc(unsigned int size) { return alloc_root(&mem_root,size); }
|
||||
inline gptr calloc(unsigned int size)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue