diff options
| author | unknown <serg@serg.mylan> | 2005-06-04 07:28:26 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-06-04 07:28:26 +0200 |
| commit | a681af904d4fc8e02042b93b9035855ea989a155 (patch) | |
| tree | db7d327e6149b5935a40f30c4902a6bdca6cf286 /mysql-test/r | |
| parent | 15eb5a1f34cdc4f338962fbbfc87a939bc82a195 (diff) | |
| parent | 61c12aa299890bfbde8d8726c623c7af4eee5ec6 (diff) | |
| download | mariadb-git-a681af904d4fc8e02042b93b9035855ea989a155.tar.gz | |
mergemerged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/create.result | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index a504823a2a9..de3840447dc 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -497,9 +497,9 @@ drop database mysqltest; select database(); database() NULL -select database(); -database() -NULL +select database(), user(); +database() user() +NULL mysqltest_1@localhost use test; create table t1 (a int, index `primary` (a)); ERROR 42000: Incorrect index name 'primary' @@ -563,7 +563,6 @@ select * from t2; b 1 drop table t1,t2; -use test; create table t1 (a int); create table t1 select * from t1; ERROR HY000: You can't specify target table 't1' for update in FROM clause |