database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

BUG#46166

Browse Source 
Manual merge from mysql-5.1-bugteam into mysql-5.5-bugteam.

Conflicts
=========

Text conflict in sql/log.cc
Text conflict in sql/log.h
Text conflict in sql/slave.cc
Text conflict in sql/sql_parse.cc
Text conflict in sql/sql_priv.h
This commit is contained in:
Luis Soares
2010-12-07 16:11:13 +00:00
parent c872e3db80 bd0709cc87
commit 5d6e142b2b
18 changed files with 968 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_reload.h
View File

@@ -19,7 +19,7 @@ class THD;
struct TABLE_LIST;
bool reload_acl_and_cache(THD *thd, unsigned long options,
TABLE_LIST *tables, bool *write_to_binlog);
TABLE_LIST *tables, int *write_to_binlog);
bool flush_tables_with_read_lock(THD *thd, TABLE_LIST *all_tables);