Commit f19d9b41 authored by unknown's avatar unknown
Browse files

Post-merge fixes.


mysql-test/r/read_only.result:
  A post-merge fix: update results.
server-tools/instance-manager/guardian.cc:
  Remove initialization of a non-existent member.
parent fabf58c6
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -89,11 +89,11 @@ select @@global.read_only;
@@global.read_only
1
unlock tables;
set global read_only=0;
drop temporary table ttt;
ERROR 42S02: Unknown table 'ttt'
drop temporary table if exists ttt;
Warnings:
Note	1051	Unknown table 'ttt'
set global read_only=0;
drop table t1,t2;
drop user test@localhost;
+1 −2
Original line number Diff line number Diff line
@@ -53,8 +53,7 @@ Guardian::Guardian(Thread_registry *thread_registry_arg,
  :shutdown_requested(FALSE),
  stopped(FALSE),
  thread_registry(thread_registry_arg),
  instance_map(instance_map_arg),
  guarded_instances(0)
  instance_map(instance_map_arg)
{
  pthread_mutex_init(&LOCK_guardian, 0);
  pthread_cond_init(&COND_guardian, 0);