database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Post-merge fixes.

Browse Source 
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.
This commit is contained in:
unknown
2006-12-12 23:22:46 +03:00
parent fabf58c6cc
commit f19d9b41cd
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/read_only.result
View File

@ -89,11 +89,11 @@ select @@global.read_only;
@@global.read_only @@global.read_only
1 1
unlock tables; unlock tables;
set global read_only=0;
drop temporary table ttt; drop temporary table ttt;
ERROR 42S02: Unknown table 'ttt' ERROR 42S02: Unknown table 'ttt'
drop temporary table if exists ttt; drop temporary table if exists ttt;
Warnings: Warnings:
Note 1051 Unknown table 'ttt' Note 1051 Unknown table 'ttt'
set global read_only=0;
drop table t1,t2; drop table t1,t2;
drop user test@localhost; drop user test@localhost;

3
server-tools/instance-manager/guardian.cc
View File

@ -53,8 +53,7 @@ Guardian::Guardian(Thread_registry *thread_registry_arg,
:shutdown_requested(FALSE), :shutdown_requested(FALSE),
stopped(FALSE), stopped(FALSE),
thread_registry(thread_registry_arg), thread_registry(thread_registry_arg),
instance_map(instance_map_arg), instance_map(instance_map_arg)
guarded_instances(0)
{ {
pthread_mutex_init(&LOCK_guardian, 0); pthread_mutex_init(&LOCK_guardian, 0);
pthread_cond_init(&COND_guardian, 0); pthread_cond_init(&COND_guardian, 0);