diff --git a/.bzrignore b/.bzrignore index 692355e2022..682518d38ce 100644 --- a/.bzrignore +++ b/.bzrignore @@ -400,3 +400,4 @@ mysql-test/var/lib/test/test2.MYD mysql-test/var/lib/test/test2.MYI mysql-test/var/run/mysqld.pid mysql-test/var/tmp/mysql.sock +mysql-test/var/lib/mysql-bin.008 diff --git a/mysql-test/r/3.23/sel000100.res b/mysql-test/r/3.23/sel000100.res deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/mysql-test/r/3.23/sel000100.result b/mysql-test/r/3.23/sel000100.result new file mode 100644 index 00000000000..6c204279c28 --- /dev/null +++ b/mysql-test/r/3.23/sel000100.result @@ -0,0 +1,2 @@ +key_link_id link +NULL NULL diff --git a/mysql-test/t/3.23/sel000100.test b/mysql-test/t/3.23/sel000100.test index 20d5a3e2e3a..cd3f7005445 100644 --- a/mysql-test/t/3.23/sel000100.test +++ b/mysql-test/t/3.23/sel000100.test @@ -21,7 +21,7 @@ CREATE TABLE test2 ( KEY NAME (NAME) ); -@r/3.23/sel000100.res SELECT DISTINCT +@r/3.23/sel000100.result SELECT DISTINCT test2.id AS key_link_id, test2.name AS link FROM test1