database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge MySQL 5.1.46 into MariaDB.

Browse Source 
Still two test failures to be solved: main.myisam and main.subselect.
This commit is contained in:
unknown
2010-04-28 14:52:24 +02:00
parent 1f683a7270 c9cfd2df5f
commit b1e00b6be8
1343 changed files with 951110 additions and 3875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/suite/federated/federated.result
View File

@ -2145,6 +2145,15 @@ DROP TABLE t1;
End of 5.0 tests
create server 's1' foreign data wrapper 'mysql' options (port 3306);
drop server 's1';
#
# Bug #32426: FEDERATED query returns corrupt results for ORDER BY on a TEXT
#
CREATE TABLE federated.t1(a TEXT);
INSERT INTO federated.t1 VALUES('abc'), ('gh'), ('f'), ('ijk'), ('de');
CREATE TABLE federated.t1(a TEXT) ENGINE=FEDERATED
CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1';
DROP TABLE federated.t1;
DROP TABLE federated.t1;
End of 5.1 tests
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_MASTER_CONCURRENT_INSERT;
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;

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

@ -1971,6 +1971,29 @@ connection default;
create server 's1' foreign data wrapper 'mysql' options (port 3306);
drop server 's1';
--echo #
--echo # Bug #32426: FEDERATED query returns corrupt results for ORDER BY on a TEXT
--echo #
connection slave;
CREATE TABLE federated.t1(a TEXT);
INSERT INTO federated.t1 VALUES('abc'), ('gh'), ('f'), ('ijk'), ('de');
connection master;
--replace_result $SLAVE_MYPORT SLAVE_PORT
eval CREATE TABLE federated.t1(a TEXT) ENGINE=FEDERATED
CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
# MBug#571200: Need to port fix for MySQL Bug#32426 and re-enable this test.
#SELECT * FROM federated.t1 ORDER BY A;
#SELECT * FROM federated.t1 ORDER BY A DESC;
DROP TABLE federated.t1;
connection slave;
DROP TABLE federated.t1;
connection default;
--echo End of 5.1 tests
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_MASTER_CONCURRENT_INSERT;
connection slave;