database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.fix
This commit is contained in:
unknown
2003-08-29 11:24:33 +05:00
parent fb3ab3c855 241ed6b81c
commit f5558db162
6 changed files with 57 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/r/drop.result
View File

@ -44,3 +44,13 @@ mysql
test test
drop database mysqltest; drop database mysqltest;
ERROR HY000: Can't drop database 'mysqltest'; database doesn't exist ERROR HY000: Can't drop database 'mysqltest'; database doesn't exist
drop table t1;
flush tables with read lock;
create table t1(n int);
ERROR HY000: Can't execute the query because you have a conflicting read lock
unlock tables;
create table t1(n int);
show tables;
Tables_in_test
t1
drop table t1;

12
mysql-test/r/innodb.result
View File

@ -251,6 +251,18 @@ n
6 6
rollback; rollback;
drop table t1; drop table t1;
create table t1 (n int not null primary key) type=innodb;
start transaction;
insert into t1 values (4);
flush tables with read lock;
commit;
ERROR HY000: Can't execute the query because you have a conflicting read lock
unlock tables;
commit;
select * from t1;
n
4
drop table t1;
create table t1 ( id int NOT NULL PRIMARY KEY, nom varchar(64)) type=innodb; create table t1 ( id int NOT NULL PRIMARY KEY, nom varchar(64)) type=innodb;
begin; begin;
insert into t1 values(1,'hamdouni'); insert into t1 values(1,'hamdouni');

10
mysql-test/t/drop.test
View File

@ -43,3 +43,13 @@ drop database mysqltest;
show databases; show databases;
--error 1008 --error 1008
drop database mysqltest; drop database mysqltest;
# test create table and FLUSH TABLES WITH READ LOCK
drop table t1;
flush tables with read lock;
--error 1223;
create table t1(n int);
unlock tables;
create table t1(n int);
show tables;
drop table t1;

15
mysql-test/t/innodb.test
View File

@ -133,6 +133,21 @@ select n from t1;
rollback; rollback;
drop table t1; drop table t1;
#
# Test for commit and FLUSH TABLES WITH READ LOCK
#
create table t1 (n int not null primary key) type=innodb;
start transaction;
insert into t1 values (4);
flush tables with read lock;
--error 1223;
commit;
unlock tables;
commit;
select * from t1;
drop table t1;
# #
# Testing transactions # Testing transactions
# #

3
sql/handler.cc
View File

@ -359,7 +359,10 @@ int ha_commit_trans(THD *thd, THD_TRANS* trans)
if (trans == &thd->transaction.all && mysql_bin_log.is_open() && if (trans == &thd->transaction.all && mysql_bin_log.is_open() &&
my_b_tell(&thd->transaction.trans_log)) my_b_tell(&thd->transaction.trans_log))
{ {
if (wait_if_global_read_lock(thd, 0))
DBUG_RETURN(1);
mysql_bin_log.write(thd, &thd->transaction.trans_log); mysql_bin_log.write(thd, &thd->transaction.trans_log);
start_waiting_global_read_lock(thd);
reinit_io_cache(&thd->transaction.trans_log, reinit_io_cache(&thd->transaction.trans_log,
WRITE_CACHE, (my_off_t) 0, 0, 1); WRITE_CACHE, (my_off_t) 0, 0, 1);
thd->transaction.trans_log.end_of_file= max_binlog_cache_size; thd->transaction.trans_log.end_of_file= max_binlog_cache_size;

11
sql/sql_table.cc
View File

@ -899,16 +899,18 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
my_error(ER_TABLE_EXISTS_ERROR,MYF(0),table_name); my_error(ER_TABLE_EXISTS_ERROR,MYF(0),table_name);
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
if (wait_if_global_read_lock(thd, 0))
DBUG_RETURN(error);
VOID(pthread_mutex_lock(&LOCK_open)); VOID(pthread_mutex_lock(&LOCK_open));
if (!tmp_table && !(create_info->options & HA_LEX_CREATE_TMP_TABLE)) if (!tmp_table && !(create_info->options & HA_LEX_CREATE_TMP_TABLE))
{ {
if (!access(path,F_OK)) if (!access(path,F_OK))
{ {
VOID(pthread_mutex_unlock(&LOCK_open));
if (create_info->options & HA_LEX_CREATE_IF_NOT_EXISTS) if (create_info->options & HA_LEX_CREATE_IF_NOT_EXISTS)
DBUG_RETURN(0); error= 0;
my_error(ER_TABLE_EXISTS_ERROR,MYF(0),table_name); else
DBUG_RETURN(-1); my_error(ER_TABLE_EXISTS_ERROR,MYF(0),table_name);
goto end;
} }
} }
@ -946,6 +948,7 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
error=0; error=0;
end: end:
VOID(pthread_mutex_unlock(&LOCK_open)); VOID(pthread_mutex_unlock(&LOCK_open));
start_waiting_global_read_lock(thd);
thd->proc_info="After create"; thd->proc_info="After create";
DBUG_RETURN(error); DBUG_RETURN(error);
} }