#At file:///Users/kaa/src/bzr/mysql-6.0-bugteam/ based on revid:alexey.kopytov@stripped
3028 Alexey Kopytov 2009-02-06 [merge]
Merge from the team tree.
modified:
mysql-test/r/myisampack.result
mysql-test/r/status.result
mysql-test/suite/falcon/r/ps_8falcon.result
mysql-test/suite/funcs_1/r/innodb_trig_09.result
mysql-test/suite/funcs_1/r/memory_trig_09.result
mysql-test/suite/funcs_1/r/myisam_trig_09.result
mysql-test/suite/funcs_1/r/ndb_trig_09.result
mysql-test/suite/funcs_1/triggers/triggers_09.inc
mysql-test/suite/parts/inc/partition_auto_increment.inc
mysql-test/suite/parts/r/partition_auto_increment_blackhole.result
mysql-test/suite/parts/r/partition_auto_increment_falcon.result
mysql-test/suite/parts/r/partition_auto_increment_innodb.result
mysql-test/suite/parts/r/partition_auto_increment_maria.result
mysql-test/suite/parts/r/partition_auto_increment_memory.result
mysql-test/suite/parts/r/partition_auto_increment_myisam.result
mysql-test/suite/parts/r/partition_auto_increment_ndb.result
mysql-test/suite/rpl/t/rpl_heartbeat.test
mysql-test/t/myisampack.test
mysql-test/t/status.test
storage/myisam/myisampack.c
=== modified file 'mysql-test/r/myisampack.result'
--- a/mysql-test/r/myisampack.result 2009-02-03 09:51:32 +0000
+++ b/mysql-test/r/myisampack.result 2009-02-05 13:40:26 +0000
@@ -60,12 +60,14 @@ CREATE TABLE t1(a INT);
INSERT INTO t1 VALUES(20);
CREATE TABLE t2(a INT);
INSERT INTO t2 VALUES(40);
+FLUSH TABLE t1,t2;
#If the myisampack --join operation is successful, we have table t3(.frm)
#so we should be able to query about the table from server.
SELECT COUNT(a) FROM t3;
COUNT(a)
1024
# ===== myisampack.2 =====
+FLUSH TABLE t3;
#Tests the myisampack join operation with an existing destination .frm file,
#the command should return correct exit status(0) and
#we should be able to query the table.
=== modified file 'mysql-test/r/status.result'
--- a/mysql-test/r/status.result 2009-01-30 14:13:39 +0000
+++ b/mysql-test/r/status.result 2009-02-05 17:02:57 +0000
@@ -196,7 +196,7 @@ create table db37908.t1(f1 int);
insert into db37908.t1 values(1);
grant usage,execute on test.* to mysqltest_1@localhost;
create procedure proc37908() begin select 1; end |
-create function func37908() returns int sql security invoker
+create function func37908() returns int sql security invoker
return (select * from db37908.t1 limit 1)|
select * from db37908.t1;
ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't1'
=== modified file 'mysql-test/suite/falcon/r/ps_8falcon.result'
--- a/mysql-test/suite/falcon/r/ps_8falcon.result 2008-09-19 09:12:48 +0000
+++ b/mysql-test/suite/falcon/r/ps_8falcon.result 2009-02-06 06:11:22 +0000
@@ -1286,11 +1286,12 @@ a b
set @arg00=NULL;
set @arg01=2;
execute stmt1 using @arg00, @arg01;
-ERROR 23000: Column 'a' cannot be null
+Warnings:
+Warning 1048 Column 'a' cannot be null
select a,b from t1 order by a;
a b
+0 two
1 one
-2 two
3 three
4 four
set @arg00=0;
=== modified file 'mysql-test/suite/funcs_1/r/innodb_trig_09.result'
--- a/mysql-test/suite/funcs_1/r/innodb_trig_09.result 2009-01-31 21:00:48 +0000
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_09.result 2009-02-05 13:52:18 +0000
@@ -183,7 +183,8 @@ a NULL Test 3.5.9.4 7 999 995.2400000000
0 0 0 0 0 0
Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
where f122='Test 3.5.9.4';
-ERROR 23000: Column 'f136' cannot be null
+Warnings:
+Warning 1048 Column 'f136' cannot be null
Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
where f122='Test 3.5.9.4';
select f118, f121, f122, f136, f151, f163 from tb3
=== modified file 'mysql-test/suite/funcs_1/r/memory_trig_09.result'
--- a/mysql-test/suite/funcs_1/r/memory_trig_09.result 2009-01-31 21:00:48 +0000
+++ b/mysql-test/suite/funcs_1/r/memory_trig_09.result 2009-02-05 13:52:18 +0000
@@ -184,7 +184,8 @@ a NULL Test 3.5.9.4 7 999 995.2400000000
0 0 0 0 0 0
Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
where f122='Test 3.5.9.4';
-ERROR 23000: Column 'f136' cannot be null
+Warnings:
+Warning 1048 Column 'f136' cannot be null
Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
where f122='Test 3.5.9.4';
select f118, f121, f122, f136, f151, f163 from tb3
=== modified file 'mysql-test/suite/funcs_1/r/myisam_trig_09.result'
--- a/mysql-test/suite/funcs_1/r/myisam_trig_09.result 2009-01-31 21:00:48 +0000
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_09.result 2009-02-05 13:52:18 +0000
@@ -184,7 +184,8 @@ a NULL Test 3.5.9.4 7 999 995.2400000000
0 0 0 0 0 0
Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
where f122='Test 3.5.9.4';
-ERROR 23000: Column 'f136' cannot be null
+Warnings:
+Warning 1048 Column 'f136' cannot be null
Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
where f122='Test 3.5.9.4';
select f118, f121, f122, f136, f151, f163 from tb3
=== modified file 'mysql-test/suite/funcs_1/r/ndb_trig_09.result'
--- a/mysql-test/suite/funcs_1/r/ndb_trig_09.result 2009-01-31 21:00:48 +0000
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_09.result 2009-02-05 13:52:18 +0000
@@ -183,7 +183,8 @@ a NULL Test 3.5.9.4 7 999 995.2400000000
0 0 0 0 0 0
Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
where f122='Test 3.5.9.4';
-ERROR 23000: Column 'f136' cannot be null
+Warnings:
+Warning 1048 Column 'f136' cannot be null
Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
where f122='Test 3.5.9.4';
select f118, f121, f122, f136, f151, f163 from tb3
=== modified file 'mysql-test/suite/funcs_1/triggers/triggers_09.inc'
--- a/mysql-test/suite/funcs_1/triggers/triggers_09.inc 2009-01-31 21:00:48 +0000
+++ b/mysql-test/suite/funcs_1/triggers/triggers_09.inc 2009-02-05 13:52:18 +0000
@@ -184,7 +184,6 @@ let $message= Testcase 3.5.9.4:;
@tr_var_af_136, @tr_var_af_151, @tr_var_af_163;
--enable_query_log
---error ER_BAD_NULL_ERROR
Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
where f122='Test 3.5.9.4';
=== modified file 'mysql-test/suite/parts/inc/partition_auto_increment.inc'
--- a/mysql-test/suite/parts/inc/partition_auto_increment.inc 2008-11-06 06:18:15 +0000
+++ b/mysql-test/suite/parts/inc/partition_auto_increment.inc 2009-02-05 17:57:15 +0000
@@ -51,13 +51,7 @@ if (!$skip_update)
UPDATE t1 SET c1 = 40 WHERE c1 = 50;
SELECT AUTO_INCREMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='test'
AND TABLE_NAME='t1';
- -- error 0, ER_BAD_NULL_ERROR
UPDATE t1 SET c1 = NULL WHERE c1 = 4;
-if (!$mysql_errno)
-{
- echo # ERROR (only OK if Blackhole) should give ER_BAD_NULL_ERROR;
- echo # mysql_errno: $mysql_errno;
-}
INSERT INTO t1 VALUES (NULL);
INSERT INTO t1 VALUES (NULL);
}
@@ -207,13 +201,7 @@ if (!$skip_update)
UPDATE t1 SET c1 = 140 WHERE c1 = 150;
SELECT AUTO_INCREMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='test'
AND TABLE_NAME='t1';
- -- error 0, ER_BAD_NULL_ERROR
UPDATE t1 SET c1 = NULL WHERE c1 = 4;
-if (!$mysql_errno)
-{
- echo # ERROR (only OK if Blackhole) should give ER_BAD_NULL_ERROR;
- echo # mysql_errno: $mysql_errno;
-}
INSERT INTO t1 VALUES (NULL);
INSERT INTO t1 VALUES (NULL);
}
=== modified file 'mysql-test/suite/parts/r/partition_auto_increment_blackhole.result'
--- a/mysql-test/suite/parts/r/partition_auto_increment_blackhole.result 2008-11-06 06:18:15 +0000
+++ b/mysql-test/suite/parts/r/partition_auto_increment_blackhole.result 2009-02-05 17:57:15 +0000
@@ -44,8 +44,6 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
AUTO_INCREMENT
1
UPDATE t1 SET c1 = NULL WHERE c1 = 4;
-# ERROR (only OK if Blackhole) should give ER_BAD_NULL_ERROR
-# mysql_errno: 0
INSERT INTO t1 VALUES (NULL);
INSERT INTO t1 VALUES (NULL);
SELECT * FROM t1 ORDER BY c1;
@@ -196,8 +194,6 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
AUTO_INCREMENT
1
UPDATE t1 SET c1 = NULL WHERE c1 = 4;
-# ERROR (only OK if Blackhole) should give ER_BAD_NULL_ERROR
-# mysql_errno: 0
INSERT INTO t1 VALUES (NULL);
INSERT INTO t1 VALUES (NULL);
SELECT * FROM t1 ORDER BY c1;
=== modified file 'mysql-test/suite/parts/r/partition_auto_increment_falcon.result'
--- a/mysql-test/suite/parts/r/partition_auto_increment_falcon.result 2008-11-07 16:31:51 +0000
+++ b/mysql-test/suite/parts/r/partition_auto_increment_falcon.result 2009-02-05 17:57:15 +0000
@@ -42,12 +42,14 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
AUTO_INCREMENT
52
UPDATE t1 SET c1 = NULL WHERE c1 = 4;
+Warnings:
+Warning 1048 Column 'c1' cannot be null
INSERT INTO t1 VALUES (NULL);
INSERT INTO t1 VALUES (NULL);
SELECT * FROM t1 ORDER BY c1;
c1
+0
2
-4
5
6
10
@@ -214,12 +216,14 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
AUTO_INCREMENT
152
UPDATE t1 SET c1 = NULL WHERE c1 = 4;
+Warnings:
+Warning 1048 Column 'c1' cannot be null
INSERT INTO t1 VALUES (NULL);
INSERT INTO t1 VALUES (NULL);
SELECT * FROM t1 ORDER BY c1;
c1
+0
2
-4
5
6
9
=== modified file 'mysql-test/suite/parts/r/partition_auto_increment_innodb.result'
--- a/mysql-test/suite/parts/r/partition_auto_increment_innodb.result 2008-11-06 06:18:15 +0000
+++ b/mysql-test/suite/parts/r/partition_auto_increment_innodb.result 2009-02-05 17:57:15 +0000
@@ -42,12 +42,14 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
AUTO_INCREMENT
31
UPDATE t1 SET c1 = NULL WHERE c1 = 4;
+Warnings:
+Warning 1048 Column 'c1' cannot be null
INSERT INTO t1 VALUES (NULL);
INSERT INTO t1 VALUES (NULL);
SELECT * FROM t1 ORDER BY c1;
c1
+0
2
-4
5
6
10
@@ -215,12 +217,14 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
AUTO_INCREMENT
141
UPDATE t1 SET c1 = NULL WHERE c1 = 4;
+Warnings:
+Warning 1048 Column 'c1' cannot be null
INSERT INTO t1 VALUES (NULL);
INSERT INTO t1 VALUES (NULL);
SELECT * FROM t1 ORDER BY c1;
c1
+0
2
-4
5
6
9
=== modified file 'mysql-test/suite/parts/r/partition_auto_increment_maria.result'
--- a/mysql-test/suite/parts/r/partition_auto_increment_maria.result 2008-11-21 14:21:50 +0000
+++ b/mysql-test/suite/parts/r/partition_auto_increment_maria.result 2009-02-05 17:57:15 +0000
@@ -42,12 +42,14 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
AUTO_INCREMENT
52
UPDATE t1 SET c1 = NULL WHERE c1 = 4;
+Warnings:
+Warning 1048 Column 'c1' cannot be null
INSERT INTO t1 VALUES (NULL);
INSERT INTO t1 VALUES (NULL);
SELECT * FROM t1 ORDER BY c1;
c1
+0
2
-4
5
6
10
@@ -214,12 +216,14 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
AUTO_INCREMENT
152
UPDATE t1 SET c1 = NULL WHERE c1 = 4;
+Warnings:
+Warning 1048 Column 'c1' cannot be null
INSERT INTO t1 VALUES (NULL);
INSERT INTO t1 VALUES (NULL);
SELECT * FROM t1 ORDER BY c1;
c1
+0
2
-4
5
6
9
=== modified file 'mysql-test/suite/parts/r/partition_auto_increment_memory.result'
--- a/mysql-test/suite/parts/r/partition_auto_increment_memory.result 2008-11-05 20:13:54 +0000
+++ b/mysql-test/suite/parts/r/partition_auto_increment_memory.result 2009-02-05 17:47:24 +0000
@@ -42,12 +42,14 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
AUTO_INCREMENT
52
UPDATE t1 SET c1 = NULL WHERE c1 = 4;
+Warnings:
+Warning 1048 Column 'c1' cannot be null
INSERT INTO t1 VALUES (NULL);
INSERT INTO t1 VALUES (NULL);
SELECT * FROM t1 ORDER BY c1;
c1
+0
2
-4
5
6
10
@@ -214,12 +216,14 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
AUTO_INCREMENT
152
UPDATE t1 SET c1 = NULL WHERE c1 = 4;
+Warnings:
+Warning 1048 Column 'c1' cannot be null
INSERT INTO t1 VALUES (NULL);
INSERT INTO t1 VALUES (NULL);
SELECT * FROM t1 ORDER BY c1;
c1
+0
2
-4
5
6
9
=== modified file 'mysql-test/suite/parts/r/partition_auto_increment_myisam.result'
--- a/mysql-test/suite/parts/r/partition_auto_increment_myisam.result 2008-11-06 06:18:15 +0000
+++ b/mysql-test/suite/parts/r/partition_auto_increment_myisam.result 2009-02-05 17:57:15 +0000
@@ -42,12 +42,14 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
AUTO_INCREMENT
52
UPDATE t1 SET c1 = NULL WHERE c1 = 4;
+Warnings:
+Warning 1048 Column 'c1' cannot be null
INSERT INTO t1 VALUES (NULL);
INSERT INTO t1 VALUES (NULL);
SELECT * FROM t1 ORDER BY c1;
c1
+0
2
-4
5
6
10
@@ -214,12 +216,14 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
AUTO_INCREMENT
152
UPDATE t1 SET c1 = NULL WHERE c1 = 4;
+Warnings:
+Warning 1048 Column 'c1' cannot be null
INSERT INTO t1 VALUES (NULL);
INSERT INTO t1 VALUES (NULL);
SELECT * FROM t1 ORDER BY c1;
c1
+0
2
-4
5
6
9
=== modified file 'mysql-test/suite/parts/r/partition_auto_increment_ndb.result'
--- a/mysql-test/suite/parts/r/partition_auto_increment_ndb.result 2008-11-05 20:13:54 +0000
+++ b/mysql-test/suite/parts/r/partition_auto_increment_ndb.result 2009-02-05 17:47:24 +0000
@@ -43,12 +43,14 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
AUTO_INCREMENT
52
UPDATE t1 SET c1 = NULL WHERE c1 = 4;
+Warnings:
+Warning 1048 Column 'c1' cannot be null
INSERT INTO t1 VALUES (NULL);
INSERT INTO t1 VALUES (NULL);
SELECT * FROM t1 ORDER BY c1;
c1
+0
2
-4
5
6
10
@@ -215,12 +217,14 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
AUTO_INCREMENT
152
UPDATE t1 SET c1 = NULL WHERE c1 = 4;
+Warnings:
+Warning 1048 Column 'c1' cannot be null
INSERT INTO t1 VALUES (NULL);
INSERT INTO t1 VALUES (NULL);
SELECT * FROM t1 ORDER BY c1;
c1
+0
2
-4
5
6
9
=== modified file 'mysql-test/suite/rpl/t/rpl_heartbeat.test'
--- a/mysql-test/suite/rpl/t/rpl_heartbeat.test 2009-01-30 14:25:16 +0000
+++ b/mysql-test/suite/rpl/t/rpl_heartbeat.test 2009-02-05 13:07:55 +0000
@@ -8,7 +8,9 @@
# - SHOW STATUS like 'Slave_heartbeat_period' report
-- source include/have_log_bin.inc
--- source include/not_windows.inc
+### commented out to watch for bug#37714 regression after mtr2 is pushed
+### -- source include/not_windows.inc
+
connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
=== modified file 'mysql-test/t/myisampack.test'
--- a/mysql-test/t/myisampack.test 2009-02-03 09:51:32 +0000
+++ b/mysql-test/t/myisampack.test 2009-02-05 13:40:26 +0000
@@ -81,7 +81,7 @@ let $i=9;
--disable_query_log
while ($i)
{
- INSERT INTO t1 SELECT ROUND(a * RAND() * 10) from t1;
+ INSERT INTO t1 SELECT a from t1;
dec $i;
}
--enable_query_log
@@ -93,11 +93,12 @@ let $i=9;
--disable_query_log
while ($i)
{
- INSERT INTO t2 SELECT ROUND(a * RAND() * 10) from t2;
+ INSERT INTO t2 SELECT a from t2;
dec $i;
}
--enable_query_log
+FLUSH TABLE t1,t2;
--exec $MYISAMPACK --join=$MYSQLD_DATADIR/test/t3 $MYSQLD_DATADIR/test/t1 $MYSQLD_DATADIR/test/t2 2>&1
--echo #If the myisampack --join operation is successful, we have table t3(.frm)
@@ -110,6 +111,7 @@ SELECT COUNT(a) FROM t3;
# It should finish the join operation successfully
#############################################################################
--echo # ===== myisampack.2 =====
+FLUSH TABLE t3;
--remove_file $MYSQLD_DATADIR/test/t3.MYI
--remove_file $MYSQLD_DATADIR/test/t3.MYD
--exec $MYISAMPACK --join=$MYSQLD_DATADIR/test/t3 $MYSQLD_DATADIR/test/t1 $MYSQLD_DATADIR/test/t2 2>&1
=== modified file 'mysql-test/t/status.test'
--- a/mysql-test/t/status.test 2009-01-30 14:13:39 +0000
+++ b/mysql-test/t/status.test 2009-02-05 17:02:57 +0000
@@ -4,6 +4,9 @@
# embedded server causes different stat
-- source include/not_embedded.inc
+# Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
# Disable concurrent inserts to avoid sporadic test failures as it might
# affect the the value of variables used throughout the test case.
set @old_concurrent_insert= @@global.concurrent_insert;
@@ -88,7 +91,7 @@ show status like 'last_query_cost';
drop table t1;
#
-# Test for Bug #15933 max_used_connections is wrong after FLUSH STATUS
+# Test for Bug#15933 max_used_connections is wrong after FLUSH STATUS
# if connections are cached
#
#
@@ -188,7 +191,7 @@ disconnect con1;
#
-# Bug #30377: EXPLAIN loses last_query_cost when used with UNION
+# Bug#30377 EXPLAIN loses last_query_cost when used with UNION
#
CREATE TABLE t1 ( a INT );
@@ -241,7 +244,7 @@ eval select substring_index('$rnd_next2'
disconnect con1;
connection default;
-#
+#
# Bug#30252 Com_create_function is not incremented.
#
flush status;
@@ -260,7 +263,7 @@ drop function f1;
show status like 'Com%function';
#
-# Bug#37908: Skipped access right check caused server crash.
+# Bug#37908 Skipped access right check caused server crash.
#
connect (root, localhost, root,,test);
connection root;
@@ -272,20 +275,20 @@ insert into db37908.t1 values(1);
grant usage,execute on test.* to mysqltest_1@localhost;
delimiter |;
create procedure proc37908() begin select 1; end |
-create function func37908() returns int sql security invoker
+create function func37908() returns int sql security invoker
return (select * from db37908.t1 limit 1)|
delimiter ;|
-
+
connect (user1,localhost,mysqltest_1,,test);
connection user1;
---error 1142
+--error ER_TABLEACCESS_DENIED_ERROR
select * from db37908.t1;
---error 1142
+--error ER_TABLEACCESS_DENIED_ERROR
show status where variable_name ='uptime' and 2 in (select * from db37908.t1);
---error 1142
+--error ER_TABLEACCESS_DENIED_ERROR
show procedure status where name ='proc37908' and 1 in (select f1 from db37908.t1);
---error 1142
+--error ER_TABLEACCESS_DENIED_ERROR
show function status where name ='func37908' and 1 in (select func37908());
connection default;
@@ -296,6 +299,8 @@ drop procedure proc37908;
drop function func37908;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost;
DROP USER mysqltest_1@localhost;
+# Wait till we reached the initial number of concurrent sessions
+--source include/wait_until_count_sessions.inc
#
# Bug#41131 "Questions" fails to increment - ignores statements instead stored procs
@@ -336,7 +341,7 @@ DROP FUNCTION f1;
# End of 5.1 tests
#
-# Bug #17954: Threads_connected > Threads_created
+# Bug#17954 Threads_connected > Threads_created
#
--disable_warnings
@@ -351,7 +356,7 @@ SELECT NAME FROM v1 WHERE NAME = 'Thread
DROP VIEW v1;
#
-# Bug#39916: pool-of-threads fails to increment the number of created threads
+# Bug#39916 pool-of-threads fails to increment the number of created threads
#
SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.GLOBAL_STATUS
@@ -362,3 +367,7 @@ SELECT VARIABLE_NAME FROM INFORMATION_SC
# Restore global concurrent_insert value. Keep in the end of the test file.
--connection default
set @@global.concurrent_insert= @old_concurrent_insert;
+
+# Wait till we reached the initial number of concurrent sessions
+--source include/wait_until_count_sessions.inc
+
=== modified file 'storage/myisam/myisampack.c'
--- a/storage/myisam/myisampack.c 2009-02-03 09:51:32 +0000
+++ b/storage/myisam/myisampack.c 2009-02-05 13:40:26 +0000
@@ -786,7 +786,6 @@ static int compress(PACK_MRG_INFO *mrg,c
static int create_dest_frm(char *source_table, char *dest_table)
{
char source_name[FN_REFLEN], dest_name[FN_REFLEN];
- int error;
DBUG_ENTER("create_dest_frm");
| Thread |
|---|
| • bzr commit into mysql-6.0-bugteam branch (Alexey.Kopytov:3028) | Alexey Kopytov | 6 Feb |
