List:Commits« Previous MessageNext Message »
From:Marc Alff Date:July 1 2009 7:54pm
Subject:bzr push into mysql-6.0-perfschema branch (marc.alff:3189 to 3190)
View as plain text  
 3190 Marc Alff	2009-07-01
      Changed the pool-of-threads tests to always use a storage engine guaranteed to be available,
      to avoid having a test that depends on ./configure build options.
      modified:
        mysql-test/suite/perfschema/r/no_threads.result
        mysql-test/suite/perfschema/r/one_thread_per_con.result
        mysql-test/suite/perfschema/r/pool_of_threads.result
        mysql-test/suite/perfschema/t/no_threads.test
        mysql-test/suite/perfschema/t/one_thread_per_con.test
        mysql-test/suite/perfschema/t/pool_of_threads.test

 3189 Marc Alff	2009-07-01
      Implemented review comments, continued
      
      Renamed mysql_thread_set_id to mysql_thread_set_psi_id.
      modified:
        include/mysql/psi/mysql_thread.h
        sql/backup/be_thread.cc
        sql/event_scheduler.cc
        sql/ha_ndbcluster.cc
        sql/ha_ndbcluster_binlog.cc
        sql/sql_connect.cc
        sql/sql_insert.cc
        sql/sql_parse.cc
        storage/maria/maria_backup_engine.cc
        storage/myisam/myisam_backup_engine.cc

=== modified file 'mysql-test/suite/perfschema/r/no_threads.result'
--- a/mysql-test/suite/perfschema/r/no_threads.result	2009-06-19 04:40:20 +0000
+++ b/mysql-test/suite/perfschema/r/no_threads.result	2009-07-01 19:50:57 +0000
@@ -1,7 +1,7 @@
 update performance_schema.SETUP_INSTRUMENTS set enabled='NO';
 update performance_schema.SETUP_CONSUMERS set enabled='YES';
 update performance_schema.SETUP_INSTRUMENTS set enabled='YES'
-  where name like "wait/synch/mutex/maria/THR_LOCK_maria";
+  where name like "wait/synch/mutex/mysys/THR_LOCK_myisam";
 drop table if exists test.t1;
 truncate table performance_schema.EVENTS_WAITS_CURRENT;
 truncate table performance_schema.EVENTS_WAITS_HISTORY;
@@ -9,7 +9,7 @@ truncate table performance_schema.EVENTS
 show variables like "thread_handling";
 Variable_name	Value
 thread_handling	no-threads
-create table test.t1(a int) engine=MARIA;
+create table test.t1(a int) engine=MYISAM;
 show variables like "performance_schema";
 Variable_name	Value
 performance_schema	ON
@@ -28,13 +28,13 @@ count(*)
 select event_name, operation, source
 from performance_schema.EVENTS_WAITS_CURRENT;
 event_name	operation	source
-wait/synch/mutex/maria/THR_LOCK_maria	lock	ma_create.c:782
+wait/synch/mutex/mysys/THR_LOCK_myisam	lock	mi_create.c:584
 select event_name, operation, source
 from performance_schema.EVENTS_WAITS_HISTORY;
 event_name	operation	source
-wait/synch/mutex/maria/THR_LOCK_maria	lock	ma_create.c:782
+wait/synch/mutex/mysys/THR_LOCK_myisam	lock	mi_create.c:584
 select event_name, operation, source
 from performance_schema.EVENTS_WAITS_HISTORY_LONG;
 event_name	operation	source
-wait/synch/mutex/maria/THR_LOCK_maria	lock	ma_create.c:782
+wait/synch/mutex/mysys/THR_LOCK_myisam	lock	mi_create.c:584
 drop table test.t1;

=== modified file 'mysql-test/suite/perfschema/r/one_thread_per_con.result'
--- a/mysql-test/suite/perfschema/r/one_thread_per_con.result	2009-04-17 18:44:53 +0000
+++ b/mysql-test/suite/perfschema/r/one_thread_per_con.result	2009-07-01 19:50:57 +0000
@@ -1,5 +1,5 @@
 update performance_schema.SETUP_INSTRUMENTS set enabled='YES'
-  where name like "wait/synch/mutex/maria/THR_LOCK_maria";
+  where name like "wait/synch/mutex/mysys/THR_LOCK_myisam";
 drop table if exists test.t1;
 drop table if exists test.t2;
 drop table if exists test.t3;
@@ -8,27 +8,27 @@ show variables like "thread_handling";
 Variable_name	Value
 thread_handling	one-thread-per-connection
 "----------------- Connection 1"
-create table test.t1(a int) engine=MARIA;
+create table test.t1(a int) engine=MYISAM;
 "----------------- Connection 2"
-create table test.t2(a int) engine=MARIA;
+create table test.t2(a int) engine=MYISAM;
 "----------------- Connection 3"
-create table test.t3(a int) engine=MARIA;
+create table test.t3(a int) engine=MYISAM;
 "----------------- Connection default"
 execute stmt_dump_events using @tid;
 event_name	source	operation	number_of_bytes
-wait/synch/mutex/maria/THR_LOCK_maria	ma_create.c:782	lock	NULL
+wait/synch/mutex/mysys/THR_LOCK_myisam	mi_create.c:584	lock	NULL
 execute stmt_dump_thread using @tid;
 name
 thread/sql/OneConnection
 execute stmt_dump_events using @tid;
 event_name	source	operation	number_of_bytes
-wait/synch/mutex/maria/THR_LOCK_maria	ma_create.c:782	lock	NULL
+wait/synch/mutex/mysys/THR_LOCK_myisam	mi_create.c:584	lock	NULL
 execute stmt_dump_thread using @tid;
 name
 thread/sql/OneConnection
 execute stmt_dump_events using @tid;
 event_name	source	operation	number_of_bytes
-wait/synch/mutex/maria/THR_LOCK_maria	ma_create.c:782	lock	NULL
+wait/synch/mutex/mysys/THR_LOCK_myisam	mi_create.c:584	lock	NULL
 execute stmt_dump_thread using @tid;
 name
 thread/sql/OneConnection

=== modified file 'mysql-test/suite/perfschema/r/pool_of_threads.result'
--- a/mysql-test/suite/perfschema/r/pool_of_threads.result	2009-04-17 18:44:53 +0000
+++ b/mysql-test/suite/perfschema/r/pool_of_threads.result	2009-07-01 19:50:57 +0000
@@ -1,5 +1,5 @@
 update performance_schema.SETUP_INSTRUMENTS set enabled='YES'
-  where name like "wait/synch/mutex/maria/THR_LOCK_maria";
+  where name like "wait/synch/mutex/mysys/THR_LOCK_myisam";
 drop table if exists test.t1;
 drop table if exists test.t2;
 drop table if exists test.t3;
@@ -8,27 +8,27 @@ show variables like "thread_handling";
 Variable_name	Value
 thread_handling	pool-of-threads
 "----------------- Connection 1"
-create table test.t1(a int) engine=MARIA;
+create table test.t1(a int) engine=MYISAM;
 "----------------- Connection 2"
-create table test.t2(a int) engine=MARIA;
+create table test.t2(a int) engine=MYISAM;
 "----------------- Connection 3"
-create table test.t3(a int) engine=MARIA;
+create table test.t3(a int) engine=MYISAM;
 "----------------- Connection default"
 execute stmt_dump_events using @tid;
 event_name	source	operation	number_of_bytes
-wait/synch/mutex/maria/THR_LOCK_maria	ma_create.c:782	lock	NULL
+wait/synch/mutex/mysys/THR_LOCK_myisam	mi_create.c:584	lock	NULL
 execute stmt_dump_thread using @tid;
 name
 thread/sql/OneConnection
 execute stmt_dump_events using @tid;
 event_name	source	operation	number_of_bytes
-wait/synch/mutex/maria/THR_LOCK_maria	ma_create.c:782	lock	NULL
+wait/synch/mutex/mysys/THR_LOCK_myisam	mi_create.c:584	lock	NULL
 execute stmt_dump_thread using @tid;
 name
 thread/sql/OneConnection
 execute stmt_dump_events using @tid;
 event_name	source	operation	number_of_bytes
-wait/synch/mutex/maria/THR_LOCK_maria	ma_create.c:782	lock	NULL
+wait/synch/mutex/mysys/THR_LOCK_myisam	mi_create.c:584	lock	NULL
 execute stmt_dump_thread using @tid;
 name
 thread/sql/OneConnection

=== modified file 'mysql-test/suite/perfschema/t/no_threads.test'
--- a/mysql-test/suite/perfschema/t/no_threads.test	2009-06-03 18:11:10 +0000
+++ b/mysql-test/suite/perfschema/t/no_threads.test	2009-07-01 19:50:57 +0000
@@ -16,7 +16,6 @@
 # Tests for PERFORMANCE_SCHEMA
 
 --source include/not_embedded.inc
---source include/have_maria.inc
 
 
 # Setup : in this main thread
@@ -24,7 +23,7 @@
 update performance_schema.SETUP_INSTRUMENTS set enabled='NO';
 update performance_schema.SETUP_CONSUMERS set enabled='YES';
 update performance_schema.SETUP_INSTRUMENTS set enabled='YES'
-  where name like "wait/synch/mutex/maria/THR_LOCK_maria";
+  where name like "wait/synch/mutex/mysys/THR_LOCK_myisam";
 
 --disable_warnings
 drop table if exists test.t1;
@@ -38,7 +37,7 @@ show variables like "thread_handling";
 
 # Code to test : in this main thread
 
-create table test.t1(a int) engine=MARIA;
+create table test.t1(a int) engine=MYISAM;
 
 show variables like "performance_schema";
 show variables like "performance_schema_max_thread%";

=== modified file 'mysql-test/suite/perfschema/t/one_thread_per_con.test'
--- a/mysql-test/suite/perfschema/t/one_thread_per_con.test	2009-06-03 18:11:10 +0000
+++ b/mysql-test/suite/perfschema/t/one_thread_per_con.test	2009-07-01 19:50:57 +0000
@@ -16,19 +16,18 @@
 # Tests for PERFORMANCE_SCHEMA
 
 --source include/not_embedded.inc
---source include/have_maria.inc
 
 # Setup
 
 --source ../include/setup_helper.inc
 
-# We use a maria table here because CREATE TABLE has a known,
-# stable behavior (it will lock THR_LOCK_maria once).
-# The point is not to test maria, but to test that each
+# We use a myisam table here because CREATE TABLE has a known,
+# stable behavior (it will lock THR_LOCK_myisam once).
+# The point is not to test myisam, but to test that each
 # connection is properly instrumented, with one-thread-per-connection
 
 update performance_schema.SETUP_INSTRUMENTS set enabled='YES'
-  where name like "wait/synch/mutex/maria/THR_LOCK_maria";
+  where name like "wait/synch/mutex/mysys/THR_LOCK_myisam";
 
 --disable_warnings
 drop table if exists test.t1;
@@ -45,17 +44,17 @@ show variables like "thread_handling";
 connection con1;
 
 -- echo "----------------- Connection 1"
-create table test.t1(a int) engine=MARIA;
+create table test.t1(a int) engine=MYISAM;
 
 connection con2;
 
 -- echo "----------------- Connection 2"
-create table test.t2(a int) engine=MARIA;
+create table test.t2(a int) engine=MYISAM;
 
 connection con3;
 
 -- echo "----------------- Connection 3"
-create table test.t3(a int) engine=MARIA;
+create table test.t3(a int) engine=MYISAM;
 
 # Verification
 

=== modified file 'mysql-test/suite/perfschema/t/pool_of_threads.test'
--- a/mysql-test/suite/perfschema/t/pool_of_threads.test	2009-04-17 18:44:53 +0000
+++ b/mysql-test/suite/perfschema/t/pool_of_threads.test	2009-07-01 19:50:57 +0000
@@ -22,13 +22,13 @@
 
 --source ../include/setup_helper.inc
 
-# We use a maria table here because CREATE TABLE has a known,
-# stable behavior (it will lock THR_LOCK_maria once).
-# The point is not to test maria, but to test that each
+# We use a myisam table here because CREATE TABLE has a known,
+# stable behavior (it will lock THR_LOCK_myisam once).
+# The point is not to test myisam, but to test that each
 # connection in a pool of thread is properly instrumented.
 
 update performance_schema.SETUP_INSTRUMENTS set enabled='YES'
-  where name like "wait/synch/mutex/maria/THR_LOCK_maria";
+  where name like "wait/synch/mutex/mysys/THR_LOCK_myisam";
 
 --disable_warnings
 drop table if exists test.t1;
@@ -45,17 +45,17 @@ show variables like "thread_handling";
 connection con1;
 
 -- echo "----------------- Connection 1"
-create table test.t1(a int) engine=MARIA;
+create table test.t1(a int) engine=MYISAM;
 
 connection con2;
 
 -- echo "----------------- Connection 2"
-create table test.t2(a int) engine=MARIA;
+create table test.t2(a int) engine=MYISAM;
 
 connection con3;
 
 -- echo "----------------- Connection 3"
-create table test.t3(a int) engine=MARIA;
+create table test.t3(a int) engine=MYISAM;
 
 # Verification
 

Thread
bzr push into mysql-6.0-perfschema branch (marc.alff:3189 to 3190) Marc Alff1 Jul
  • RE: bzr push into mysql-6.0-perfschema branch (marc.alff:3189 to 3190)Vladislav Vaintroub10 Jul