database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.0-base -> 10.0

Browse Source
This commit is contained in:
Igor Babaev
2013-04-17 10:18:04 -07:00
parent 0e7410a154 43fe53acc2
commit a1cd28e2e5
64 changed files with 5911 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_parse.cc
View File

@ -171,8 +171,8 @@ const char *xa_state_names[]={
*/
inline bool all_tables_not_ok(THD *thd, TABLE_LIST *tables)
{
return rpl_filter->is_on() && tables && !thd->spcont &&
!rpl_filter->tables_ok(thd->db, tables);
return thd->rpl_filter->is_on() && tables && !thd->spcont &&
!thd->rpl_filter->tables_ok(thd->db, tables);
}
#endif
@ -2155,6 +2155,8 @@ mysql_execute_command(THD *thd)
#ifdef HAVE_REPLICATION
/* have table map for update for multi-update statement (BUG#37051) */
bool have_table_map_for_update= FALSE;
/* */
Rpl_filter *rpl_filter= thd->rpl_filter;
#endif
DBUG_ENTER("mysql_execute_command");
#ifdef WITH_PARTITION_STORAGE_ENGINE
@ -2652,6 +2654,11 @@ case SQLCOM_PREPARE:
else
delete mi;
}
else
{
mi->rpl_filter= get_or_create_rpl_filter(lex_mi->connection_name.str,
lex_mi->connection_name.length);
}
mysql_mutex_unlock(&LOCK_active_mi);
break;