diff options
| author | monty@narttu.mysql.fi <> | 2003-06-04 18:28:51 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-06-04 18:28:51 +0300 |
| commit | 23145cfed72954c29f5a47e82af22898164be4b0 (patch) | |
| tree | f2e86edc169afb1fed9cecefdecd9f13561780c9 /mysql-test/r/merge.result | |
| parent | 7df5635ff2845bd708711f6b790997a3c68d5f2a (diff) | |
| download | mariadb-git-23145cfed72954c29f5a47e82af22898164be4b0.tar.gz | |
Added SQLSTATE to client/server protocol
bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86
Diffstat (limited to 'mysql-test/r/merge.result')
| -rw-r--r-- | mysql-test/r/merge.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index b28607218d1..323931ae3eb 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -177,9 +177,9 @@ t3 CREATE TABLE `t3` ( ) TYPE=MRG_MyISAM CHARSET=latin1 UNION=(t1,t2) create table t4 (a int not null, b char(10), key(a)) type=MERGE UNION=(t1,t2); select * from t4; -Can't open file: 't4.MRG'. (errno: 143) +ERROR HY000: Can't open file: 't4.MRG'. (errno: 143) create table t5 (a int not null, b char(10), key(a)) type=MERGE UNION=(test.t1,test_2.t2); -Incorrect table definition; All MERGE tables must be in the same database +ERROR HY000: Incorrect table definition; All MERGE tables must be in the same database drop table if exists t5,t4,t3,t1,t2; Warnings: Note 1051 Unknown table 't5' |