Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
This commit is contained in:
commit
e6f860aad0
@ -3327,7 +3327,6 @@ purposes internal to the MySQL server", MYF(0));
|
|||||||
!db_ok_with_wild_table(lex->name)))
|
!db_ok_with_wild_table(lex->name)))
|
||||||
{
|
{
|
||||||
my_error(ER_SLAVE_IGNORED_TABLE, MYF(0));
|
my_error(ER_SLAVE_IGNORED_TABLE, MYF(0));
|
||||||
reset_one_shot_variables(thd);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@ -3363,7 +3362,6 @@ purposes internal to the MySQL server", MYF(0));
|
|||||||
!db_ok_with_wild_table(lex->name)))
|
!db_ok_with_wild_table(lex->name)))
|
||||||
{
|
{
|
||||||
my_error(ER_SLAVE_IGNORED_TABLE, MYF(0));
|
my_error(ER_SLAVE_IGNORED_TABLE, MYF(0));
|
||||||
reset_one_shot_variables(thd);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@ -3404,7 +3402,6 @@ purposes internal to the MySQL server", MYF(0));
|
|||||||
!db_ok_with_wild_table(db)))
|
!db_ok_with_wild_table(db)))
|
||||||
{
|
{
|
||||||
my_error(ER_SLAVE_IGNORED_TABLE, MYF(0));
|
my_error(ER_SLAVE_IGNORED_TABLE, MYF(0));
|
||||||
reset_one_shot_variables(thd);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user