Commit 03618c71 authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 

into  mysql.com:/usr/home/ram/work/bug19736/my50-bug19736
parents e3f0e67b bc9f9011

mysql-test/r/rpl_view.result

+2 −2
Original line number Diff line number Diff line
@@ -47,11 +47,11 @@ show binlog events limit 1,100; 
Log_name	Pos	Event_type	Server_id	End_log_pos	Info

slave-bin.000001	#	Query	1	#	use `test`; create table t1 (a int)

slave-bin.000001	#	Query	1	#	use `test`; insert into t1 values (1)

slave-bin.000001	#	Query	1	#	use `test`; CREATE ALGORITHM=UNDEFINED DEFINER=root@localhost SQL SECURITY DEFINER VIEW v1 AS select a from t1

slave-bin.000001	#	Query	1	#	use `test`; CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select a from t1

slave-bin.000001	#	Query	1	#	use `test`; insert into v1 values (2)

slave-bin.000001	#	Query	1	#	use `test`; update v1 set a=3 where a=1

slave-bin.000001	#	Query	1	#	use `test`; delete from v1 where a=2

slave-bin.000001	#	Query	1	#	use `test`; ALTER ALGORITHM=UNDEFINED DEFINER=root@localhost SQL SECURITY DEFINER VIEW v1 AS select a as b from t1

slave-bin.000001	#	Query	1	#	use `test`; ALTER ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select a as b from t1

slave-bin.000001	#	Query	1	#	use `test`; drop view v1

slave-bin.000001	#	Query	1	#	use `test`; drop table t1

sql/slave.cc

+15 −13
Original line number Diff line number Diff line
@@ -2854,8 +2854,21 @@ improper_arguments: %d timed_out: %d", 


void set_slave_thread_options(THD* thd)

{

  thd->options = ((opt_log_slave_updates) ? OPTION_BIN_LOG:0) |

    OPTION_AUTO_IS_NULL;

  /*

     It's nonsense to constrain the slave threads with max_join_size; if a

     query succeeded on master, we HAVE to execute it. So set

     OPTION_BIG_SELECTS. Setting max_join_size to HA_POS_ERROR is not enough

     (and it's not needed if we have OPTION_BIG_SELECTS) because an INSERT

     SELECT examining more than 4 billion rows would still fail (yes, because

     when max_join_size is 4G, OPTION_BIG_SELECTS is automatically set, but

     only for client threads.

  */

  ulonglong options= thd->options | OPTION_BIG_SELECTS;

  if (opt_log_slave_updates)

    options|= OPTION_BIN_LOG;

  else

    options&= ~OPTION_BIN_LOG;

  thd->options= options;

  thd->variables.completion_type= 0;

}
@@ -2885,17 +2898,6 @@ static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type) 
  thd->net.read_timeout = slave_net_timeout;

  thd->slave_thread = 1;

  set_slave_thread_options(thd);

  /* 

     It's nonsense to constrain the slave threads with max_join_size; if a

     query succeeded on master, we HAVE to execute it. So set

     OPTION_BIG_SELECTS. Setting max_join_size to HA_POS_ERROR is not enough

     (and it's not needed if we have OPTION_BIG_SELECTS) because an INSERT

     SELECT examining more than 4 billion rows would still fail (yes, because

     when max_join_size is 4G, OPTION_BIG_SELECTS is automatically set, but

     only for client threads.

  */

  thd->options = ((opt_log_slave_updates) ? OPTION_BIN_LOG:0) |

    OPTION_AUTO_IS_NULL | OPTION_BIG_SELECTS;

  thd->client_capabilities = CLIENT_LOCAL_FILES;

  thd->real_id=pthread_self();

  pthread_mutex_lock(&LOCK_thread_count);