diff options
| author | unknown <serg@serg.mylan> | 2004-11-17 18:04:36 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-11-17 18:04:36 +0100 |
| commit | 4f6413094c069cb78aee0c9b1b7d77b34eb3ae5d (patch) | |
| tree | 35f1caf73d4e61d1cb7338841a38299682005317 /mysql-test/r/select.result | |
| parent | 7f5be1b65460bea40661bbeefe209831b528c67d (diff) | |
| parent | 6ce9ed784e5507073a33b8c4771fba16f29f840f (diff) | |
| download | mariadb-git-4f6413094c069cb78aee0c9b1b7d77b34eb3ae5d.tar.gz | |
merged
client/Makefile.am:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/heap_hash.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
mysql-test/t/user_var.test:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/structs.h:
Auto merged
Diffstat (limited to 'mysql-test/r/select.result')
| -rw-r--r-- | mysql-test/r/select.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index b49f7758c4a..ffc7c176a48 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -2058,6 +2058,10 @@ t2 1 fld3 1 fld3 A NULL NULL NULL BTREE drop table t4, t3, t2, t1; DO 1; DO benchmark(100,1+1),1,1; +do default; +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 '' at line 1 +do foobar; +ERROR 42S22: Unknown column 'foobar' in 'field list' CREATE TABLE t1 ( id mediumint(8) unsigned NOT NULL auto_increment, pseudo varchar(35) NOT NULL default '', |