bk commit into 5.1 tree (malff:1.2577) BUG#30237

[marc.alff]

Below is the list of changes that have just been committed into a local
5.1 repository of marcsql. When marcsql does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-08-08 15:48:01-06:00, malff@weblab.(none) +5 -0
  Bug#30237 (Performance regression in boolean expressions)
  
  NOT A FULL PATCH -- tests scripts used with mysqlslap (only available in 5.1)
  
  For reference only, not to push.

  sql-bench/bug30237_create.sql@stripped, 2007-08-08 15:47:54-06:00, malff@weblab.(none) +4 -0
    Bug#30237 (Performance regression in boolean expressions)
    
    NOT A FULL PATCH -- tests scripts used with mysqlslap (only available in 5.1)
    

  sql-bench/bug30237_create.sql@stripped, 2007-08-08 15:47:54-06:00, malff@weblab.(none) +0 -0

  sql-bench/bug30237_post.sql@stripped, 2007-08-08 15:47:54-06:00, malff@weblab.(none) +1 -0
    Bug#30237 (Performance regression in boolean expressions)
    
    NOT A FULL PATCH -- tests scripts used with mysqlslap (only available in 5.1)
    

  sql-bench/bug30237_post.sql@stripped, 2007-08-08 15:47:54-06:00, malff@weblab.(none) +0 -0

  sql-bench/bug30237_pre.sql@stripped, 2007-08-08 15:47:54-06:00, malff@weblab.(none) +2 -0
    Bug#30237 (Performance regression in boolean expressions)
    
    NOT A FULL PATCH -- tests scripts used with mysqlslap (only available in 5.1)
    

  sql-bench/bug30237_pre.sql@stripped, 2007-08-08 15:47:54-06:00, malff@weblab.(none) +0 -0

  sql-bench/bug30237_query.sql@stripped, 2007-08-08 15:47:54-06:00, malff@weblab.(none) +1 -0
    Bug#30237 (Performance regression in boolean expressions)
    
    NOT A FULL PATCH -- tests scripts used with mysqlslap (only available in 5.1)
    

  sql-bench/bug30237_query.sql@stripped, 2007-08-08 15:47:54-06:00, malff@weblab.(none) +0 -0

  sql-bench/bug30237_slap.sh@stripped, 2007-08-08 15:47:54-06:00, malff@weblab.(none) +34 -0
    Bug#30237 (Performance regression in boolean expressions)
    
    NOT A FULL PATCH -- tests scripts used with mysqlslap (only available in 5.1)
    

  sql-bench/bug30237_slap.sh@stripped, 2007-08-08 15:47:54-06:00, malff@weblab.(none) +0 -0

diff -Nrup a/sql-bench/bug30237_create.sql b/sql-bench/bug30237_create.sql
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/sql-bench/bug30237_create.sql	2007-08-08 15:47:54 -06:00
@@ -0,0 +1,4 @@
+drop database if exists mysqlslap;
+create database mysqlslap;
+drop table if exists mysqlslap.table_30237;
+create table mysqlslap.table_30237 (a int) engine = blackhole;
diff -Nrup a/sql-bench/bug30237_post.sql b/sql-bench/bug30237_post.sql
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/sql-bench/bug30237_post.sql	2007-08-08 15:47:54 -06:00
@@ -0,0 +1 @@
+set global general_log=on;
diff -Nrup a/sql-bench/bug30237_pre.sql b/sql-bench/bug30237_pre.sql
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/sql-bench/bug30237_pre.sql	2007-08-08 15:47:54 -06:00
@@ -0,0 +1,2 @@
+set global general_log=off;
+flush tables;
diff -Nrup a/sql-bench/bug30237_query.sql b/sql-bench/bug30237_query.sql
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/sql-bench/bug30237_query.sql	2007-08-08 15:47:54 -06:00
@@ -0,0 +1 @@
+insert into mysqlslap.table_30237 values (1), (2), (3), (4), (5), (6), (7), (8), (9),
(10), (1), (2), (3), (4), (5), (6), (7), (8), (9), (10), (1), (2), (3), (4), (5), (6),
(7), (8), (9), (10), (1), (2), (3), (4), (5), (6), (7), (8), (9), (10), (1), (2), (3),
(4), (5), (6), (7), (8), (9), (10), (1), (2), (3), (4), (5), (6), (7), (8), (9), (10),
(1), (2), (3), (4), (5), (6), (7), (8), (9), (10), (1), (2), (3), (4), (5), (6), (7),
(8), (9), (10), (1), (2), (3), (4), (5), (6), (7), (8), (9), (10), (1), (2), (3), (4),
(5), (6), (7), (8), (9), (10);
diff -Nrup a/sql-bench/bug30237_slap.sh b/sql-bench/bug30237_slap.sh
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/sql-bench/bug30237_slap.sh	2007-08-08 15:47:54 -06:00
@@ -0,0 +1,34 @@
+
+# ../mysql-test/mysql-test-run.pl --start-and-exit
+
+# export CON_OPT="--socket=../mysql-test/var/tmp/master.sock"
+# export CON_OPT="--socket=../../mysql-5.1-runtime/mysql-test/var/tmp/master.sock"
+export CON_OPT="--socket=../../mysql-5.1-30237/mysql-test/var/tmp/master.sock"
+
+export CON_OPT="$CON_OPT --user=root"
+
+## export SLAP_OPT="$SLAP_OPT --delimiter=\";\""
+export SLAP_OPT="--query=./bug30237_query.sql"
+export SLAP_OPT="$SLAP_OPT --concurrency=1"
+export SLAP_OPT="$SLAP_OPT --iterations=1000000"
+
+# This test exposes how the server consumes CPU when parsing boolean
+# expressions. For this test to be meaningful, all disk i/o should be
+# limited to a minimum, to make sure the total time is CPU bound.
+# To achieve this:
+# - the general log is turned off
+# - the storage engine used is blackhole
+
+echo "Creating the test environment ..."
+
+../client/mysql $CON_OPT < ./bug30237_create.sql
+../client/mysql $CON_OPT < ./bug30237_pre.sql
+
+echo "mysqlslap $CON_OPT $SLAP_OPT"
+
+time ../client/mysqlslap $CON_OPT $SLAP_OPT
+
+echo "Restoring logs ..."
+
+../client/mysql $CON_OPT < ./bug30237_post.sql
+