Commit b86ffcef authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

merge

parents b531e001 1e76c806

mysql-test/r/flush.result

+2 −0
Original line number Diff line number Diff line 
n

3

n

23

n

345

mysql-test/t/flush.test

+15 −0
Original line number Diff line number Diff line
@@ -33,6 +33,21 @@ unlock tables; 
connection con1;

reap;



#test if drop database will wait until we release the global read lock

connection con1;

drop database if exists foo;

create database foo;

create table foo.t1(n int);

insert into foo.t1 values (23);

flush tables with read lock;

connection con2;

send drop database foo;

connection con1;

select * from foo.t1;

unlock tables;

connection con2;

reap;



# test if dirty close releases global read lock

connection con1;

create table t1 (n int);

sql/log.cc

+2 −0
Original line number Diff line number Diff line
@@ -688,6 +688,8 @@ bool MYSQL_LOG::write(Query_log_event* event_info) 
    {

      Intvar_log_event e((uchar)LAST_INSERT_ID_EVENT, thd->last_insert_id);

      e.set_log_seq(thd, this);

      if(thd->server_id)

        e.server_id = thd->server_id;

      if (e.write(file))

	goto err;

    }

sql/share/czech/errmsg.txt

+2 −2
Original line number Diff line number Diff line
@@ -218,5 +218,5 @@ 
"Lock wait timeout exceeded",

"The total number of locks exceeds the lock table size",

"Update locks cannot be acquired during a READ UNCOMMITTED transaction",

"Error connecting to master: %-.128s",

"Error running query on master: %-.128s",
 
"DROP DATABASE not allowed while thread is holding global read lock",

"CREATE DATABASE not allowed while thread is holding global read lock",

sql/share/danish/errmsg.txt

+2 −2
Original line number Diff line number Diff line
@@ -212,5 +212,5 @@ 
"Lock wait timeout exceeded",

"The total number of locks exceeds the lock table size",

"Update locks cannot be acquired during a READ UNCOMMITTED transaction",

"Error connecting to master: %-.128s",

"Error running query on master: %-.128s",
 
"DROP DATABASE not allowed while thread is holding global read lock",

"CREATE DATABASE not allowed while thread is holding global read lock",