diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-12-13 18:07:13 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-12-13 18:07:13 +0100 |
| commit | 637232d90bf9c0a7eae7c3a56f8a9889a6b1f971 (patch) | |
| tree | b822a919a3564d199504421023e30dc743db56d7 /mysql-test/r/mysqltest.result | |
| parent | 6576b3849dcce8ae4437249f7f7171c1228c437f (diff) | |
| download | mariadb-git-637232d90bf9c0a7eae7c3a56f8a9889a6b1f971.tar.gz | |
Fix tests after merge
Straighten out and comment behaviour for --require and --result in run_query
client/mysqltest.c:
If --require or --result has been provided for a query command->record_file file be set.
In that case it should either dump to file if recording or check with content in file if running.
mysql-test/r/mysqltest.result:
Fix up tests and results after merge
mysql-test/t/mysqltest.test:
Fix up tests and results after merge
Diffstat (limited to 'mysql-test/r/mysqltest.result')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 8ea3a48e948..2e78f468f93 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -396,20 +396,20 @@ root@localhost -------------------------------------------------------------------------------- this will be executed this will be executed +mysqltest: Result length mismatch +mysqltest: The test didn't produce any output +Failing multi statement query mysqltest: At line 3: query 'create table t1 (a int primary key); insert into t1 values (1); select 'select-me'; insertz 'error query'' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insertz 'error query'' at line 1 drop table t1; -drop table t1; -create table t1 (a int primary key); +mysqltest: At line 3: query 'create table t1 (a int primary key); insert into t1 values (1); select 'select-me'; -insertz error query|||| -select-me -select-me -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insertz error query' at line 1 +insertz 'error query'' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insertz 'error query'' at line 1 drop table t1; +Multi statement using expected error create table t1 (a int primary key); insert into t1 values (1); select 'select-me'; @@ -418,5 +418,4 @@ select-me select-me ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insertz error query' at line 1 drop table t1; -mysqltest: Result length mismatch -mysqltest: The test didn't produce any output +drop table t1; |