mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

After merge fixes

Browse source
This commit is contained in:
lars@mysql.com 2005-05-09 11:43:09 +02:00
parent bf48175cf4
commit 3ff9aa5fa1
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sql/sql_acl.cc
View file

@ -1514,7 +1514,7 @@ static bool update_user_table(THD *thd, const char *host, const char *user,
*/ */
tables.updating= 1; tables.updating= 1;
/* Thanks to bzero, tables.next==0 */ /* Thanks to bzero, tables.next==0 */
if (!rpl_filter->tables_ok(0, &tables)) if (!(thd->spcont || rpl_filter->tables_ok(0, &tables)))
DBUG_RETURN(0); DBUG_RETURN(0);
} }
#endif #endif
@ -2699,7 +2699,7 @@ bool mysql_table_grant(THD *thd, TABLE_LIST *table_list,
account in tests. account in tests.
*/ */
tables[0].updating= tables[1].updating= tables[2].updating= 1; tables[0].updating= tables[1].updating= tables[2].updating= 1;
if (!rpl_filter->tables_ok(0, tables)) if (!(thd->spcont || rpl_filter->tables_ok(0, tables)))
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
} }
#endif #endif
@ -2904,7 +2904,7 @@ bool mysql_procedure_grant(THD *thd, TABLE_LIST *table_list,
account in tests. account in tests.
*/ */
tables[0].updating= tables[1].updating= 1; tables[0].updating= tables[1].updating= 1;
if (!rpl_filter->tables_ok(0, tables)) if (!(thd->spcont || rpl_filter->tables_ok(0, tables)))
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
} }
#endif #endif
@ -3035,7 +3035,7 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
account in tests. account in tests.
*/ */
tables[0].updating= tables[1].updating= 1; tables[0].updating= tables[1].updating= 1;
if (!rpl_filter->tables_ok(0, tables)) if (!(thd->spcont || rpl_filter->tables_ok(0, tables)))
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
} }
#endif #endif
@ -4245,7 +4245,7 @@ int open_grant_tables(THD *thd, TABLE_LIST *tables)
*/ */
tables[0].updating=tables[1].updating=tables[2].updating= tables[0].updating=tables[1].updating=tables[2].updating=
tables[3].updating=tables[4].updating=1; tables[3].updating=tables[4].updating=1;
if (!rpl_filter->tables_ok(0, tables)) if (!(thd->spcont || rpl_filter->tables_ok(0, tables)))
DBUG_RETURN(1); DBUG_RETURN(1);
tables[0].updating=tables[1].updating=tables[2].updating= tables[0].updating=tables[1].updating=tables[2].updating=
tables[3].updating=tables[4].updating=0;; tables[3].updating=tables[4].updating=0;;

7
sql/sql_parse.cc
View file

@ -168,11 +168,12 @@ static bool begin_trans(THD *thd)
inline bool all_tables_not_ok(THD *thd, TABLE_LIST *tables) inline bool all_tables_not_ok(THD *thd, TABLE_LIST *tables)
{ {
return (rpl_filter->is_on() && tables && return (rpl_filter->is_on() && tables &&
!rpl_filter->tables_ok(thd->db, tables) && !(thd->spcont || rpl_filter->tables_ok(thd->db, tables)) &&
((thd->lex->sql_command != SQLCOM_DELETE_MULTI) || ((thd->lex->sql_command != SQLCOM_DELETE_MULTI) ||
!rpl_filter->tables_ok(thd->db, !(thd->spcont ||
rpl_filter->tables_ok(thd->db,
(TABLE_LIST *) (TABLE_LIST *)
thd->lex->auxilliary_table_list.first))); thd->lex->auxilliary_table_list.first))));
} }
#endif #endif