Commit e6f860aa authored by unknown's avatar unknown
Browse files

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
parents 53043f53 e6560c0d

sql/sql_parse.cc

+0 −3
Original line number Diff line number Diff line
@@ -3327,7 +3327,6 @@ purposes internal to the MySQL server", MYF(0)); 
	 !db_ok_with_wild_table(lex->name)))

    {

      my_error(ER_SLAVE_IGNORED_TABLE, MYF(0));

      reset_one_shot_variables(thd);

      break;

    }

#endif
@@ -3363,7 +3362,6 @@ purposes internal to the MySQL server", MYF(0)); 
	 !db_ok_with_wild_table(lex->name)))

    {

      my_error(ER_SLAVE_IGNORED_TABLE, MYF(0));

      reset_one_shot_variables(thd);

      break;

    }

#endif
@@ -3404,7 +3402,6 @@ purposes internal to the MySQL server", MYF(0)); 
	 !db_ok_with_wild_table(db)))

    {

      my_error(ER_SLAVE_IGNORED_TABLE, MYF(0));

      reset_one_shot_variables(thd);

      break;

    }

#endif