List:Commits« Previous MessageNext Message »
From:Marc Alff Date:January 5 2011 7:17am
Subject:bzr push into mysql-trunk branch (marc.alff:3456 to 3457)
View as plain text  
 3457 Marc Alff	2011-01-05 [merge]
      Merge mysql-5.5 --> mysql-trunk

    modified:
      mysql-test/suite/perfschema/include/binlog_common.inc
      mysql-test/suite/perfschema/r/binlog_mix.result
      mysql-test/suite/perfschema/r/binlog_row.result
      mysql-test/suite/perfschema/r/binlog_stmt.result
      mysql-test/suite/perfschema/t/binlog_mix.test
      mysql-test/suite/perfschema/t/binlog_row.test
      mysql-test/suite/perfschema/t/binlog_stmt.test
 3456 Magne Mahre	2011-01-04
      Remove configuration preprocessor symbols 'THREAD'
      and 'THREAD_SAFE_CLIENT'.
      
      As of MySQL 5.5, we no longer support non-threaded
      builds.   This patch removes all references to the
      obsolete THREAD and THREAD_SAFE_CLIENT preprocessor
      symbols.  These were used to distinguish between
      threaded and non-threaded builds.

    removed:
      include/my_no_pthread.h
      mysys/mf_brkhant.c
    modified:
      client/mysqladmin.cc
      cmd-line-utils/readline/CMakeLists.txt
      config.h.cmake
      dbug/dbug.c
      dbug/dbug_analyze.c
      dbug/my_main.c
      dbug/tests.c
      include/heap.h
      include/my_base.h
      include/my_bitmap.h
      include/my_global.h
      include/my_pthread.h
      include/my_sys.h
      include/myisam.h
      include/thr_alarm.h
      libmysql/client_settings.h
      libmysql/libmysql.c
      mysys/mf_iocache.c
      mysys/mf_iocache2.c
      mysys/mf_keycache.c
      mysys/mf_keycaches.c
      mysys/my_bitmap.c
      mysys/my_fstream.c
      mysys/my_gethostbyname.c
      mysys/my_init.c
      mysys/my_lib.c
      mysys/my_open.c
      mysys/my_pread.c
      mysys/my_pthread.c
      mysys/my_read.c
      mysys/my_static.c
      mysys/my_thr_init.c
      mysys/my_write.c
      mysys/mysys_priv.h
      mysys/thr_alarm.c
      mysys/thr_lock.c
      mysys/thr_mutex.c
      mysys/thr_rwlock.c
      sql-common/client.c
      sql-common/client_plugin.c
      sql/client_settings.h
      sql/filesort.cc
      storage/heap/heapdef.h
      storage/heap/hp_block.c
      storage/heap/hp_create.c
      storage/heap/hp_open.c
      storage/heap/hp_static.c
      storage/heap/hp_test2.c
      storage/myisam/ha_myisam.cc
      storage/myisam/mi_check.c
      storage/myisam/mi_close.c
      storage/myisam/mi_delete.c
      storage/myisam/mi_delete_all.c
      storage/myisam/mi_dynrec.c
      storage/myisam/mi_log.c
      storage/myisam/mi_open.c
      storage/myisam/mi_static.c
      storage/myisam/mi_statrec.c
      storage/myisam/mi_update.c
      storage/myisam/mi_write.c
      storage/myisam/myisamdef.h
      storage/myisam/sort.c
      storage/myisammrg/myrg_def.h
      tests/thread_test.c
=== modified file 'mysql-test/suite/perfschema/include/binlog_common.inc'
--- a/mysql-test/suite/perfschema/include/binlog_common.inc	2010-11-08 19:35:17 +0000
+++ b/mysql-test/suite/perfschema/include/binlog_common.inc	2011-01-05 07:16:57 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,8 +19,13 @@ RESET MASTER;
 
 select count(*) > 0 from performance_schema.setup_instruments;
 
+# Note:
+# Do not include records that could depend on
+# compiling options (storage engines, SSL),
+# to ensure the expected output in the binlog is predictable.
 update performance_schema.setup_instruments set enabled='NO'
-  where name like "wait/synch/rwlock/%";
+  where name like "wait/synch/rwlock/sql/%"
+  and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock");
 
 select count(*) > 0 from performance_schema.events_waits_current;
 
@@ -37,13 +42,15 @@ insert into test.t1
 
 insert into test.t2
   select name from performance_schema.setup_instruments
-    where name like "wait/synch/rwlock/%";
+    where name like "wait/synch/rwlock/sql/%"
+    and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock");
 
 drop table test.t1;
 drop table test.t2;
 
 update performance_schema.setup_instruments set enabled='YES'
-  where name like "wait/synch/rwlock/%";
+  where name like "wait/synch/rwlock/sql/%"
+  and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock");
 
 --source include/show_binlog_events.inc
 

=== modified file 'mysql-test/suite/perfschema/r/binlog_mix.result'
--- a/mysql-test/suite/perfschema/r/binlog_mix.result	2010-11-09 08:16:50 +0000
+++ b/mysql-test/suite/perfschema/r/binlog_mix.result	2011-01-05 07:16:57 +0000
@@ -4,7 +4,8 @@ select count(*) > 0 from performance_sch
 count(*) > 0
 1
 update performance_schema.setup_instruments set enabled='NO'
-  where name like "wait/synch/rwlock/%";
+  where name like "wait/synch/rwlock/sql/%"
+  and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock");
 select count(*) > 0 from performance_schema.events_waits_current;
 count(*) > 0
 1
@@ -16,11 +17,13 @@ insert into test.t1
 select thread_id from performance_schema.events_waits_current;
 insert into test.t2
 select name from performance_schema.setup_instruments
-where name like "wait/synch/rwlock/%";
+where name like "wait/synch/rwlock/sql/%"
+    and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock");
 drop table test.t1;
 drop table test.t2;
 update performance_schema.setup_instruments set enabled='YES'
-  where name like "wait/synch/rwlock/%";
+  where name like "wait/synch/rwlock/sql/%"
+  and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock");
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN

=== modified file 'mysql-test/suite/perfschema/r/binlog_row.result'
--- a/mysql-test/suite/perfschema/r/binlog_row.result	2010-11-09 08:16:50 +0000
+++ b/mysql-test/suite/perfschema/r/binlog_row.result	2011-01-05 07:16:57 +0000
@@ -4,7 +4,8 @@ select count(*) > 0 from performance_sch
 count(*) > 0
 1
 update performance_schema.setup_instruments set enabled='NO'
-  where name like "wait/synch/rwlock/%";
+  where name like "wait/synch/rwlock/sql/%"
+  and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock");
 select count(*) > 0 from performance_schema.events_waits_current;
 count(*) > 0
 1
@@ -16,11 +17,13 @@ insert into test.t1
 select thread_id from performance_schema.events_waits_current;
 insert into test.t2
 select name from performance_schema.setup_instruments
-where name like "wait/synch/rwlock/%";
+where name like "wait/synch/rwlock/sql/%"
+    and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock");
 drop table test.t1;
 drop table test.t2;
 update performance_schema.setup_instruments set enabled='YES'
-  where name like "wait/synch/rwlock/%";
+  where name like "wait/synch/rwlock/sql/%"
+  and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock");
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN

=== modified file 'mysql-test/suite/perfschema/r/binlog_stmt.result'
--- a/mysql-test/suite/perfschema/r/binlog_stmt.result	2010-11-03 15:42:33 +0000
+++ b/mysql-test/suite/perfschema/r/binlog_stmt.result	2011-01-04 09:04:02 +0000
@@ -5,7 +5,8 @@ select count(*) > 0 from performance_sch
 count(*) > 0
 1
 update performance_schema.setup_instruments set enabled='NO'
-  where name like "wait/synch/rwlock/%";
+  where name like "wait/synch/rwlock/sql/%"
+  and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock");
 Warnings:
 Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
 select count(*) > 0 from performance_schema.events_waits_current;
@@ -21,20 +22,23 @@ Warnings:
 Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
 insert into test.t2
 select name from performance_schema.setup_instruments
-where name like "wait/synch/rwlock/%";
+where name like "wait/synch/rwlock/sql/%"
+    and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock");
 Warnings:
 Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
 drop table test.t1;
 drop table test.t2;
 update performance_schema.setup_instruments set enabled='YES'
-  where name like "wait/synch/rwlock/%";
+  where name like "wait/synch/rwlock/sql/%"
+  and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock");
 Warnings:
 Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses the general log, slow query log, or performance_schema table(s). This is unsafe because system tables may differ on slaves.
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; update performance_schema.setup_instruments set enabled='NO'
-  where name like "wait/synch/rwlock/%"
+  where name like "wait/synch/rwlock/sql/%"
+  and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock")
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by server */
@@ -47,11 +51,13 @@ master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into test.t2
 select name from performance_schema.setup_instruments
-where name like "wait/synch/rwlock/%"
+where name like "wait/synch/rwlock/sql/%"
+    and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock")
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t2` /* generated by server */
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; update performance_schema.setup_instruments set enabled='YES'
-  where name like "wait/synch/rwlock/%"
+  where name like "wait/synch/rwlock/sql/%"
+  and name not in ("wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock")
 master-bin.000001	#	Query	#	#	COMMIT

=== modified file 'mysql-test/suite/perfschema/t/binlog_mix.test'
--- a/mysql-test/suite/perfschema/t/binlog_mix.test	2010-06-03 13:30:54 +0000
+++ b/mysql-test/suite/perfschema/t/binlog_mix.test	2011-01-05 07:16:57 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,9 +19,6 @@
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
 
-# See Bug#46896 binlog: case sensitivity of table names
---source include/have_lowercase0.inc
-
 set binlog_format=mixed;
 
 --source ../include/binlog_common.inc

=== modified file 'mysql-test/suite/perfschema/t/binlog_row.test'
--- a/mysql-test/suite/perfschema/t/binlog_row.test	2010-06-03 13:30:54 +0000
+++ b/mysql-test/suite/perfschema/t/binlog_row.test	2011-01-05 07:16:57 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,9 +19,6 @@
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
 
-# See Bug#46896 binlog: case sensitivity of table names
---source include/have_lowercase0.inc
-
 set binlog_format=row;
 
 --source ../include/binlog_common.inc

=== modified file 'mysql-test/suite/perfschema/t/binlog_stmt.test'
--- a/mysql-test/suite/perfschema/t/binlog_stmt.test	2010-06-03 13:30:54 +0000
+++ b/mysql-test/suite/perfschema/t/binlog_stmt.test	2011-01-05 07:16:57 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (marc.alff:3456 to 3457) Marc Alff5 Jan