diff options
| author | Michael Widenius <monty@mysql.com> | 2010-08-18 10:52:57 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2010-08-18 10:52:57 +0300 |
| commit | 909e4eb08d7ea38cf09575756cff79648e326fd5 (patch) | |
| tree | 84729e5a7b409cbe8b58a888fb76762ed3900f0d /mysql-test | |
| parent | 6795a545e382a2de7104cdc57e0a2834e4aa9b67 (diff) | |
| download | mariadb-git-909e4eb08d7ea38cf09575756cff79648e326fd5.tar.gz | |
Added verbose mode to recovery
More DBUG
Added convert-debug-for-diff
Added missing (from last push) federated test case
.bzrignore:
Ignore generated files
mysql-test/README:
Updated documentation for --extern
mysql-test/suite/federated/federated_bug_32426.result:
Added test for federatedx
mysql-test/suite/federated/federated_bug_32426.test:
Added test for federatedx
scripts/Makefile.am:
Added convert-debug-for-diff
scripts/convert-debug-for-diff.sh:
Added script for converting
sql/log.cc:
Added DBUG
sql/mysqld.cc:
Added DBUG
storage/maria/ma_recovery.c:
If verbose, write dirty pages (for debugging)
storage/maria/ma_static.c:
Added verbose mode to recovery
storage/maria/maria_def.h:
Added verbose mode to recovery
storage/maria/maria_read_log.c:
Added verbose mode to recovery
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/README | 2 | ||||
| -rw-r--r-- | mysql-test/suite/federated/federated_bug_32426.result | 30 | ||||
| -rw-r--r-- | mysql-test/suite/federated/federated_bug_32426.test | 24 |
3 files changed, 55 insertions, 1 deletions
diff --git a/mysql-test/README b/mysql-test/README index 77b398ebf39..3c8303ca070 100644 --- a/mysql-test/README +++ b/mysql-test/README @@ -18,7 +18,7 @@ the test suite expects you to provide the names of the tests to run. For example, here is the command to run the "alias" and "analyze" tests with an external server: -mysql-test-run --extern alias analyze +mysql-test-run --extern socket=/tmp/mysql.sock alias analyze To match your setup, you might also need to provide --socket, --user, and other relevant options. diff --git a/mysql-test/suite/federated/federated_bug_32426.result b/mysql-test/suite/federated/federated_bug_32426.result new file mode 100644 index 00000000000..fbfa6dc3d52 --- /dev/null +++ b/mysql-test/suite/federated/federated_bug_32426.result @@ -0,0 +1,30 @@ +CREATE DATABASE federated; +CREATE DATABASE federated; +# +# Bug #32426: FEDERATED query returns corrupt results for ORDER BY +# on a TEXT column +# +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'; +SELECT * FROM federated.t1 ORDER BY A; +a +abc +de +f +gh +ijk +SELECT * FROM federated.t1 ORDER BY A DESC; +a +ijk +gh +f +de +abc +DROP TABLE federated.t1; +DROP TABLE federated.t1; +DROP TABLE IF EXISTS federated.t1; +DROP DATABASE IF EXISTS federated; +DROP TABLE IF EXISTS federated.t1; +DROP DATABASE IF EXISTS federated; diff --git a/mysql-test/suite/federated/federated_bug_32426.test b/mysql-test/suite/federated/federated_bug_32426.test new file mode 100644 index 00000000000..254dfaa610a --- /dev/null +++ b/mysql-test/suite/federated/federated_bug_32426.test @@ -0,0 +1,24 @@ +source federated.inc; + +--echo # +--echo # Bug #32426: FEDERATED query returns corrupt results for ORDER BY +--echo # on a TEXT column +--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'; +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; + +source federated_cleanup.inc; |