Bug #12876932 - INCORRECT SELECT RESULT ON FEDERATED TABLE

vsmurthys · vsmurthys · commit f13beb934958 · 2012-07-26T17:56:06.000+05:30
Merged from mysql-5.5 to mysql-5.6
diff --git a/mysql-test/suite/federated/federated.test b/mysql-test/suite/federated/federated.test
@@ -4,7 +4,7 @@
 #
 
 
---source federated.inc
+--source suite/federated/include/federated.inc
 
 connection default;
 
@@ -1997,4 +1997,4 @@ connection slave;
 SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;
 
 connection default;
-source federated_cleanup.inc;
+source suite/federated/include/federated_cleanup.inc;
diff --git a/mysql-test/suite/federated/federated_archive.test b/mysql-test/suite/federated/federated_archive.test
@@ -1,5 +1,5 @@
 source include/have_archive.inc;
-source federated.inc;
+source suite/federated/include/federated.inc;
 
 
 connection slave;
@@ -54,5 +54,5 @@ connection slave;
 DROP TABLE federated.archive_table;
 
 
-source federated_cleanup.inc;
+source suite/federated/include/federated_cleanup.inc;
 
diff --git a/mysql-test/suite/federated/federated_bug_13118.test b/mysql-test/suite/federated/federated_bug_13118.test
@@ -1,4 +1,4 @@
-source federated.inc;
+source suite/federated/include/federated.inc;
 
 connection slave;
 --disable_warnings
@@ -37,5 +37,5 @@ connection slave;
 DROP TABLE federated.bug_13118_table;
 
 
-source federated_cleanup.inc;
+source suite/federated/include/federated_cleanup.inc;
 
diff --git a/mysql-test/suite/federated/federated_bug_25714.test b/mysql-test/suite/federated/federated_bug_25714.test
@@ -4,7 +4,7 @@ if (!$MYSQL_BUG25714)
   skip Need bug25714 test program;
 }
 
-source federated.inc;
+source suite/federated/include/federated.inc;
 
 connection master;
 # Disable concurrent inserts to avoid test failures when reading
@@ -59,4 +59,4 @@ SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;
 
 
 
-source federated_cleanup.inc;
+source suite/federated/include/federated_cleanup.inc;
diff --git a/mysql-test/suite/federated/federated_bug_35333.test b/mysql-test/suite/federated/federated_bug_35333.test
@@ -9,7 +9,7 @@
 --echo # to complete while still indicating a problem. This fix applies to any non-fatal system
 --echo # error that occurs during a query against I_S.TABLES.de
 
---source federated.inc
+--source suite/federated/include/federated.inc
 
 --disable_warnings
 CREATE DATABASE IF NOT EXISTS realdb;
@@ -71,4 +71,4 @@ DROP TABLE IF EXISTS federated.t0;
 DROP DATABASE realdb;
 --enable_warnings
 
---source federated_cleanup.inc
+--source suite/federated/include/federated_cleanup.inc
diff --git a/mysql-test/suite/federated/federated_debug.test b/mysql-test/suite/federated/federated_debug.test
@@ -1,5 +1,5 @@
 --source include/have_debug.inc
---source federated.inc
+--source suite/federated/include/federated.inc
 
 --echo #
 --echo # Bug#47525: MySQL crashed (Federated)
@@ -36,4 +36,4 @@ DROP TABLE t1;
 
 connection default;
 --echo # Federated cleanup
-source federated_cleanup.inc;
+source suite/federated/include/federated_cleanup.inc;
diff --git a/mysql-test/suite/federated/federated_innodb.test b/mysql-test/suite/federated/federated_innodb.test
@@ -4,7 +4,7 @@
 # See Bug #40645 Test main.federated_innodb does not always clean up after itself
 
 source include/have_innodb.inc;
-source federated.inc;
+source suite/federated/include/federated.inc;
 
 #
 # Bug#25513 Federated transaction failures
@@ -36,4 +36,4 @@ connection slave;
 drop table federated.t1;
 
 
-source federated_cleanup.inc;
+source suite/federated/include/federated_cleanup.inc;
diff --git a/mysql-test/suite/federated/federated_server.test b/mysql-test/suite/federated/federated_server.test
@@ -1,6 +1,6 @@
 # WL #3031 This test tests the new servers table as well as
 # if federated can utilise the servers table
--- source federated.inc
+-- source suite/federated/include/federated.inc
 
 connection slave;
 create database first_db;
@@ -333,4 +333,4 @@ drop table t1;
 drop server if exists s;
 
 
-source federated_cleanup.inc;
+source suite/federated/include/federated_cleanup.inc;
diff --git a/mysql-test/suite/federated/federated_transactions.test b/mysql-test/suite/federated/federated_transactions.test
@@ -1,5 +1,5 @@
 source include/have_innodb.inc;
-source federated.inc;
+source suite/federated/include/federated.inc;
 
 connection slave;
 DROP TABLE IF EXISTS federated.t1;
@@ -35,4 +35,4 @@ INSERT INTO federated.t1 (id, name) VALUES (6, 'fig');
 SELECT * FROM federated.t1;
 DELETE FROM federated.t1;
 
-source federated_cleanup.inc;
+source suite/federated/include/federated_cleanup.inc;
diff --git a/mysql-test/suite/federated/include/federated.inc b/mysql-test/suite/federated/include/federated.inc
@@ -1,5 +1,5 @@
 --source include/not_embedded.inc
---source have_federated_db.inc
+--source suite/federated/include/have_federated_db.inc
 
 connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
 connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,);
diff --git a/mysql-test/suite/federated/include/federated_cleanup.inc b/mysql-test/suite/federated/include/federated_cleanup.inc
diff --git a/mysql-test/suite/federated/include/have_federated_db.inc b/mysql-test/suite/federated/include/have_federated_db.inc
diff --git a/mysql-test/t/partition_federated.test b/mysql-test/t/partition_federated.test
@@ -3,7 +3,7 @@
 #
 -- source include/have_partition.inc
 -- source include/not_embedded.inc
--- source suite/federated/have_federated_db.inc
+-- source suite/federated/include/have_federated_db.inc
 
 --disable_warnings
 drop table if exists t1;
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
@@ -1395,7 +1395,7 @@ bool ha_federated::create_where_from_key(String *to,
           break;
         }
         DBUG_PRINT("info", ("federated HA_READ_AFTER_KEY %d", i));
-        if (store_length >= length) /* end key */
+        if ((store_length >= length) || (i > 0)) /* for all parts of end key*/
         {
           if (emit_key_part_name(&tmp, key_part))
             goto err;

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`
`6`	`6`
`7`		`---source federated.inc`
	`7`	`+--source suite/federated/include/federated.inc`
`8`	`8`
`9`	`9`	`connection default;`
`10`	`10`
`@@ -1997,4 +1997,4 @@ connection slave;`
`1997`	`1997`	`SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;`
`1998`	`1998`
`1999`	`1999`	`connection default;`
`2000`		`-source federated_cleanup.inc;`
	`2000`	`+source suite/federated/include/federated_cleanup.inc;`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ if (!$MYSQL_BUG25714)`
`4`	`4`	`skip Need bug25714 test program;`
`5`	`5`	`}`
`6`	`6`
`7`		`-source federated.inc;`
	`7`	`+source suite/federated/include/federated.inc;`
`8`	`8`
`9`	`9`	`connection master;`
`10`	`10`	`# Disable concurrent inserts to avoid test failures when reading`
`@@ -59,4 +59,4 @@ SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;`
`59`	`59`
`60`	`60`
`61`	`61`
`62`		`-source federated_cleanup.inc;`
	`62`	`+source suite/federated/include/federated_cleanup.inc;`