MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Davi Arnaut Date:April 30 2008 1:28pm
Subject:bk commit into 5.1 tree (davi:1.2573) BUG#35788
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of davi.  When davi 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, 2008-04-30 10:28:19-03:00, davi@stripped +6 -0
  Bug#35788 A few tests fail due to concurrent inserts
  
  The problem is that since MyISAM's concurrent_insert is on by
  default some concurrent SELECT statements might not see changes
  made by INSERT statements in other connections, even if the
  INSERT statement has returned.
  
  The solution is to disable concurrent_insert so that INSERT
  statements returns after the data is actually visible to other
  statements.

  mysql-test/r/client_xml.result@stripped, 2008-04-30 10:28:16-03:00, davi@stripped +3 -0
    Update test case result.

  mysql-test/r/federated.result@stripped, 2008-04-30 10:28:16-03:00, davi@stripped +3 -0
    Update test case result.

  mysql-test/r/federated_bug_25714.result@stripped, 2008-04-30 10:28:16-03:00, davi@stripped +3 -0
    Update test case result.

  mysql-test/t/client_xml.test@stripped, 2008-04-30 10:28:17-03:00, davi@stripped +9 -0
    Disable concurrent insert and restore old value at the
    end of the test so it doesn't affect other tests.

  mysql-test/t/federated.test@stripped, 2008-04-30 10:28:17-03:00, davi@stripped +12 -0
    Disable concurrent insert and restore old value at the
    end of the test so it doesn't affect other tests.

  mysql-test/t/federated_bug_25714.test@stripped, 2008-04-30 10:28:17-03:00, davi@stripped +10 -1
    Disable concurrent insert and restore old value at the
    end of the test so it doesn't affect other tests.

diff -Nrup a/mysql-test/r/client_xml.result b/mysql-test/r/client_xml.result
--- a/mysql-test/r/client_xml.result	2007-04-09 09:53:08 -03:00
+++ b/mysql-test/r/client_xml.result	2008-04-30 10:28:16 -03:00
@@ -1,3 +1,5 @@
+set @old_concurrent_insert= @@global.concurrent_insert;
+set @@global.concurrent_insert= 0;
 create table t1 (
 `a&b` int,
 `a<b` int,
@@ -86,3 +88,4 @@ Empty set
 
 Bye
 drop table t1;
+set @@global.concurrent_insert= @old_concurrent_insert;
diff -Nrup a/mysql-test/r/federated.result b/mysql-test/r/federated.result
--- a/mysql-test/r/federated.result	2008-03-27 08:45:02 -03:00
+++ b/mysql-test/r/federated.result	2008-04-30 10:28:16 -03:00
@@ -9,6 +9,8 @@ DROP DATABASE IF EXISTS federated;
 CREATE DATABASE federated;
 DROP DATABASE IF EXISTS federated;
 CREATE DATABASE federated;
+SET @OLD_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;
+SET @@GLOBAL.CONCURRENT_INSERT= 0;
 DROP TABLE IF EXISTS federated.t1;
 Warnings:
 Note	1051	Unknown table 't1'
@@ -2123,3 +2125,4 @@ DROP TABLE IF EXISTS federated.t1;
 DROP DATABASE IF EXISTS federated;
 DROP TABLE IF EXISTS federated.t1;
 DROP DATABASE IF EXISTS federated;
+SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT;
diff -Nrup a/mysql-test/r/federated_bug_25714.result b/mysql-test/r/federated_bug_25714.result
--- a/mysql-test/r/federated_bug_25714.result	2007-07-24 03:35:40 -03:00
+++ b/mysql-test/r/federated_bug_25714.result	2008-04-30 10:28:16 -03:00
@@ -9,6 +9,8 @@ DROP DATABASE IF EXISTS federated;
 CREATE DATABASE federated;
 DROP DATABASE IF EXISTS federated;
 CREATE DATABASE federated;
+SET @OLD_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;
+SET @@GLOBAL.CONCURRENT_INSERT= 0;
 DROP TABLE IF EXISTS federated.bug_13118_table;
 CREATE TABLE federated.t1 (
 `id` int auto_increment primary key, 
@@ -54,3 +56,4 @@ DROP TABLE IF EXISTS federated.t1;
 DROP DATABASE IF EXISTS federated;
 DROP TABLE IF EXISTS federated.t1;
 DROP DATABASE IF EXISTS federated;
+SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT;
diff -Nrup a/mysql-test/t/client_xml.test b/mysql-test/t/client_xml.test
--- a/mysql-test/t/client_xml.test	2007-04-09 09:53:08 -03:00
+++ b/mysql-test/t/client_xml.test	2008-04-30 10:28:17 -03:00
@@ -1,6 +1,12 @@
 # Can't run with embedded server
 -- source include/not_embedded.inc
 
+# Disable concurrent inserts to avoid test failures when reading
+# data from concurrent connections (insert might return before
+# the data is actually in the table).
+set @old_concurrent_insert= @@global.concurrent_insert;
+set @@global.concurrent_insert= 0;
+
 # Test of the xml output of the 'mysql' and 'mysqldump' clients -- makes
 # sure that basic encoding issues are handled properly
 create table t1 (
@@ -21,3 +27,6 @@ insert into t1 values (1, 2, 'a&b a<b a>
 --exec $MYSQL --xml test -vv -e "select 1 limit 0"
 
 drop table t1;
+
+# Restore global concurrent_insert value
+set @@global.concurrent_insert= @old_concurrent_insert;
diff -Nrup a/mysql-test/t/federated.test b/mysql-test/t/federated.test
--- a/mysql-test/t/federated.test	2008-03-27 08:45:02 -03:00
+++ b/mysql-test/t/federated.test	2008-04-30 10:28:17 -03:00
@@ -2,6 +2,14 @@
 --source include/not_embedded.inc
 --source include/federated.inc
 
+connection default;
+
+# Disable concurrent inserts to avoid test failures when reading
+# data from concurrent connections (insert might return before
+# the data is actually in the table).
+SET @OLD_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;
+SET @@GLOBAL.CONCURRENT_INSERT= 0;
+
 connection slave;
 DROP TABLE IF EXISTS federated.t1;
 CREATE TABLE federated.t1 (
@@ -1857,3 +1865,7 @@ drop server 's1';
 
 --echo End of 5.1 tests
 source include/federated_cleanup.inc;
+
+connection default;
+
+SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT;
diff -Nrup a/mysql-test/t/federated_bug_25714.test b/mysql-test/t/federated_bug_25714.test
--- a/mysql-test/t/federated_bug_25714.test	2007-07-24 03:35:40 -03:00
+++ b/mysql-test/t/federated_bug_25714.test	2008-04-30 10:28:17 -03:00
@@ -1,6 +1,13 @@
 --source include/have_bug25714.inc
 source include/federated.inc;
 
+connection default;
+
+# Disable concurrent inserts to avoid test failures when reading
+# data from concurrent connections (insert might return before
+# the data is actually in the table).
+SET @OLD_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;
+SET @@GLOBAL.CONCURRENT_INSERT= 0;
 
 connection slave;
 --disable_warnings
@@ -42,6 +49,8 @@ DROP TABLE federated.t1;
 connection slave;
 DROP TABLE federated.t1;
 
-
 source include/federated_cleanup.inc;
 
+connection default;
+
+SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT;
Thread
bk commit into 5.1 tree (davi:1.2573) BUG#35788Davi Arnaut30 Apr