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

Merge gleb.loc:/home/uchum/work/bk/5.1

Browse Source 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
This commit is contained in:
gshchepa/uchum@gleb.loc
2007-06-25 03:40:30 +05:00
parent 65ce26a619 9866b45f3b
commit a1ebc8590c
37 changed files with 617 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sql/sql_parse.cc
View File

@ -2507,12 +2507,7 @@ end_with_restore_list:
/*
Presumably, REPAIR and binlog writing doesn't require synchronization
*/
if (mysql_bin_log.is_open())
{
thd->clear_error(); // No binlog error generated
thd->binlog_query(THD::STMT_QUERY_TYPE,
thd->query, thd->query_length, 0, FALSE);
}
write_bin_log(thd, TRUE, thd->query, thd->query_length);
}
select_lex->table_list.first= (uchar*) first_table;
lex->query_tables=all_tables;
@ -2542,12 +2537,7 @@ end_with_restore_list:
/*
Presumably, ANALYZE and binlog writing doesn't require synchronization
*/
if (mysql_bin_log.is_open())
{
thd->clear_error(); // No binlog error generated
thd->binlog_query(THD::STMT_QUERY_TYPE,
thd->query, thd->query_length, 0, FALSE);
}
write_bin_log(thd, TRUE, thd->query, thd->query_length);
}
select_lex->table_list.first= (uchar*) first_table;
lex->query_tables=all_tables;
@ -2569,12 +2559,7 @@ end_with_restore_list:
/*
Presumably, OPTIMIZE and binlog writing doesn't require synchronization
*/
if (mysql_bin_log.is_open())
{
thd->clear_error(); // No binlog error generated
thd->binlog_query(THD::STMT_QUERY_TYPE,
thd->query, thd->query_length, 0, FALSE);
}
write_bin_log(thd, TRUE, thd->query, thd->query_length);
}
select_lex->table_list.first= (uchar*) first_table;
lex->query_tables=all_tables;
@ -3474,11 +3459,7 @@ end_with_restore_list:
*/
if (!lex->no_write_to_binlog && write_to_binlog)
{
if (mysql_bin_log.is_open())
{
thd->binlog_query(THD::STMT_QUERY_TYPE,
thd->query, thd->query_length, 0, FALSE);
}
write_bin_log(thd, FALSE, thd->query, thd->query_length);
}
send_ok(thd);
}