1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug #12876932 - INCORRECT SELECT RESULT ON FEDERATED TABLE

Browse Source 
Merged from mysql-5.1 to mysql-5.5
This commit is contained in:
Venkata Sidagam 2012-07-26 15:29:19 +05:30
commit fdaafddd80
14 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/federated/federated.test
View File

@ -4,7 +4,7 @@
# #
--source federated.inc --source suite/federated/include/federated.inc
connection default; connection default;
@ -1997,4 +1997,4 @@ connection slave;
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT; SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;
connection default; connection default;
source federated_cleanup.inc; source suite/federated/include/federated_cleanup.inc;

4
mysql-test/suite/federated/federated_archive.test
View File

@ -1,5 +1,5 @@
source include/have_archive.inc; source include/have_archive.inc;
source federated.inc; source suite/federated/include/federated.inc;
connection slave; connection slave;
@ -54,5 +54,5 @@ connection slave;
DROP TABLE federated.archive_table; DROP TABLE federated.archive_table;
source federated_cleanup.inc; source suite/federated/include/federated_cleanup.inc;

4
mysql-test/suite/federated/federated_bug_13118.test
View File

@ -1,4 +1,4 @@
source federated.inc; source suite/federated/include/federated.inc;
connection slave; connection slave;
--disable_warnings --disable_warnings
@ -37,5 +37,5 @@ connection slave;
DROP TABLE federated.bug_13118_table; DROP TABLE federated.bug_13118_table;
source federated_cleanup.inc; source suite/federated/include/federated_cleanup.inc;

4
mysql-test/suite/federated/federated_bug_25714.test
View File

@ -4,7 +4,7 @@ if (!$MYSQL_BUG25714)
skip Need bug25714 test program; skip Need bug25714 test program;
} }
source federated.inc; source suite/federated/include/federated.inc;
connection master; connection master;
# Disable concurrent inserts to avoid test failures when reading # 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;

4
mysql-test/suite/federated/federated_bug_35333.test
View File

@ -9,7 +9,7 @@
--echo # to complete while still indicating a problem. This fix applies to any non-fatal system --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 --echo # error that occurs during a query against I_S.TABLES.de
--source federated.inc --source suite/federated/include/federated.inc
--disable_warnings --disable_warnings
CREATE DATABASE IF NOT EXISTS realdb; CREATE DATABASE IF NOT EXISTS realdb;
@ -71,4 +71,4 @@ DROP TABLE IF EXISTS federated.t0;
DROP DATABASE realdb; DROP DATABASE realdb;
--enable_warnings --enable_warnings
--source federated_cleanup.inc --source suite/federated/include/federated_cleanup.inc

4
mysql-test/suite/federated/federated_debug.test
View File

@ -1,5 +1,5 @@
--source include/have_debug.inc --source include/have_debug.inc
--source federated.inc --source suite/federated/include/federated.inc
--echo # --echo #
--echo # Bug#47525: MySQL crashed (Federated) --echo # Bug#47525: MySQL crashed (Federated)
@ -36,4 +36,4 @@ DROP TABLE t1;
connection default; connection default;
--echo # Federated cleanup --echo # Federated cleanup
source federated_cleanup.inc; source suite/federated/include/federated_cleanup.inc;

4
mysql-test/suite/federated/federated_innodb.test
View File

@ -4,7 +4,7 @@
# See Bug #40645 Test main.federated_innodb does not always clean up after itself # See Bug #40645 Test main.federated_innodb does not always clean up after itself
source include/have_innodb.inc; source include/have_innodb.inc;
source federated.inc; source suite/federated/include/federated.inc;
# #
# Bug#25513 Federated transaction failures # Bug#25513 Federated transaction failures
@ -36,4 +36,4 @@ connection slave;
drop table federated.t1; drop table federated.t1;
source federated_cleanup.inc; source suite/federated/include/federated_cleanup.inc;

4
mysql-test/suite/federated/federated_server.test
View File

@ -1,6 +1,6 @@
# WL #3031 This test tests the new servers table as well as # WL #3031 This test tests the new servers table as well as
# if federated can utilise the servers table # if federated can utilise the servers table
-- source federated.inc -- source suite/federated/include/federated.inc
connection slave; connection slave;
create database first_db; create database first_db;
@ -333,4 +333,4 @@ drop table t1;
drop server if exists s; drop server if exists s;
source federated_cleanup.inc; source suite/federated/include/federated_cleanup.inc;

4
mysql-test/suite/federated/federated_transactions.test
View File

@ -1,5 +1,5 @@
source include/have_innodb.inc; source include/have_innodb.inc;
source federated.inc; source suite/federated/include/federated.inc;
connection slave; connection slave;
DROP TABLE IF EXISTS federated.t1; DROP TABLE IF EXISTS federated.t1;
@ -35,4 +35,4 @@ INSERT INTO federated.t1 (id, name) VALUES (6, 'fig');
SELECT * FROM federated.t1; SELECT * FROM federated.t1;
DELETE FROM federated.t1; DELETE FROM federated.t1;
source federated_cleanup.inc; source suite/federated/include/federated_cleanup.inc;

2
mysql-test/suite/federated/federated.inc → mysql-test/suite/federated/include/federated.inc
View File

@ -1,5 +1,5 @@
--source include/not_embedded.inc --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 (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,); connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,);

0
mysql-test/suite/federated/federated_cleanup.inc → mysql-test/suite/federated/include/federated_cleanup.inc
View File

0
mysql-test/suite/federated/have_federated_db.inc → mysql-test/suite/federated/include/have_federated_db.inc
View File

2
mysql-test/t/partition_federated.test
View File

@ -3,7 +3,7 @@
# #
-- source include/have_partition.inc -- source include/have_partition.inc
-- source include/not_embedded.inc -- source include/not_embedded.inc
-- source suite/federated/have_federated_db.inc -- source suite/federated/include/have_federated_db.inc
--disable_warnings --disable_warnings
drop table if exists t1; drop table if exists t1;

2
storage/federated/ha_federated.cc
View File

@ -1397,7 +1397,7 @@ bool ha_federated::create_where_from_key(String *to,
break; break;
} }
DBUG_PRINT("info", ("federated HA_READ_AFTER_KEY %d", i)); 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)) if (emit_key_part_name(&tmp, key_part))
goto err; goto err;