database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-07 17:42:39 +03:00
Code Activity

Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

Browse Source 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1
This commit is contained in:
bell@laptop.sanja.is.com.ua
2003-10-09 09:30:26 +03:00
parent afac13d033 e32fb9191f
commit 200eb65df7
217 changed files with 3535 additions and 7210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_parse.cc
View File

@@ -1987,9 +1987,12 @@ mysql_execute_command(THD *thd)
break;
}
LOCK_ACTIVE_MI;
// fetch_master_table will send the error to the client on failure
/*
fetch_master_table will send the error to the client on failure.
Give error if the table already exists.
*/
if (!fetch_master_table(thd, tables->db, tables->real_name,
active_mi, 0))
active_mi, 0, 0))
{
send_ok(thd);
}
@@ -4446,7 +4449,10 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables,
{
if ((options & REFRESH_READ_LOCK) && thd)
{
// writing to the binlog could cause deadlocks, as we don't log UNLOCK TABLES
/*
Writing to the binlog could cause deadlocks, as we don't log
UNLOCK TABLES
*/
tmp_write_to_binlog= 0;
if (lock_global_read_lock(thd))
return 1;