diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-13 08:09:07 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-13 08:09:07 +0100 |
| commit | 5f5d2db1415cb32f03b39224267b83ac721ff68c (patch) | |
| tree | 17b38a2b1bdac8f32b34cfa8171371bbeed560df /mysql-test | |
| parent | 52f038c5c3a065d2c68197535d844f6ed00a09cc (diff) | |
| download | mariadb-git-5f5d2db1415cb32f03b39224267b83ac721ff68c.tar.gz | |
fix embedded tests
(mainly by backporting 5.5. changes)
mysql-test/suite/maria/t/distinct.test:
Remove the test that requires SSL. One test case for a bug is enough.
sql/scheduler.cc:
make it the same as in 5.5
storage/innodb_plugin/row/row0mysql.c:
make it the same as in 5.5
storage/innodb_plugin/row/row0sel.c:
make it the same as in 5.5
storage/xtradb/row/row0mysql.c:
make it the same as in 5.5
storage/xtradb/row/row0sel.c:
make it the same as in 5.5
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/maria/r/distinct.result | 8 | ||||
| -rw-r--r-- | mysql-test/suite/maria/t/distinct.test | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/mysql-test/suite/maria/r/distinct.result b/mysql-test/suite/maria/r/distinct.result index 04d5e3d6a2c..cceb6b82005 100644 --- a/mysql-test/suite/maria/r/distinct.result +++ b/mysql-test/suite/maria/r/distinct.result @@ -15,11 +15,3 @@ GROUP_CONCAT(a) 3 1 DROP TABLE t1; -CREATE TABLE t1 (a INT, b VARCHAR(1)) ENGINE=MyISAM; -INSERT INTO t1 VALUES (7,'q'),(2,NULL),(7,'g'),(6,'x'); -SELECT DISTINCT MAX( a ) FROM t1 GROUP BY b ORDER BY DES_DECRYPT( b ); -MAX( a ) -2 -7 -6 -DROP TABLE t1; diff --git a/mysql-test/suite/maria/t/distinct.test b/mysql-test/suite/maria/t/distinct.test index b30d97b8383..f326b5a691f 100644 --- a/mysql-test/suite/maria/t/distinct.test +++ b/mysql-test/suite/maria/t/distinct.test @@ -19,7 +19,3 @@ SELECT GROUP_CONCAT(a) FROM t1 GROUP BY b; SELECT DISTINCT GROUP_CONCAT(a) FROM t1 GROUP BY b; DROP TABLE t1; -CREATE TABLE t1 (a INT, b VARCHAR(1)) ENGINE=MyISAM; -INSERT INTO t1 VALUES (7,'q'),(2,NULL),(7,'g'),(6,'x'); -SELECT DISTINCT MAX( a ) FROM t1 GROUP BY b ORDER BY DES_DECRYPT( b ); -DROP TABLE t1; |