diff options
| author | unknown <monty@mysql.com> | 2004-03-26 11:06:53 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-26 11:06:53 +0200 |
| commit | 918519ea1e19e4b35f011b744d040f91cb7c24c3 (patch) | |
| tree | c3ba76141820fb96b49667dc85d806de3ffc412b /mysql-test | |
| parent | 526b25e2633bbc44b867b548f5c7f633517e5b0f (diff) | |
| download | mariadb-git-918519ea1e19e4b35f011b744d040f91cb7c24c3.tar.gz | |
After merge fixes + simple optimizations
mysql-test/r/alter_table.result:
Updated results after merge
mysql-test/r/drop_temp_table.result:
Updated results after merge
mysql-test/r/union.result:
Updated results after merge
sql/sql_db.cc:
optimization: Use my_stat() instead of my_dir() to test if directory exists
sql/sql_union.cc:
Fixed error in merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/alter_table.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/drop_temp_table.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/union.result | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result index c82f181da81..571ba7429fc 100644 --- a/mysql-test/r/alter_table.result +++ b/mysql-test/r/alter_table.result @@ -121,7 +121,7 @@ create database mysqltest; create table mysqltest.t1 (a int,b int,c int); grant all on mysqltest.t1 to mysqltest_1@localhost; alter table t1 rename t2; -insert command denied to user: 'mysqltest_1@localhost' for table 't2' +ERROR 42000: insert command denied to user: 'mysqltest_1'@'localhost' for table 't2' revoke all privileges on mysqltest.t1 from mysqltest_1@localhost; delete from mysql.user where user='mysqltest_1'; drop database mysqltest; diff --git a/mysql-test/r/drop_temp_table.result b/mysql-test/r/drop_temp_table.result index 78efc9d90e2..99ee0143c05 100644 --- a/mysql-test/r/drop_temp_table.result +++ b/mysql-test/r/drop_temp_table.result @@ -13,6 +13,6 @@ Log_name Pos Event_type Server_id Orig_log_pos Info master-bin.000001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3 master-bin.000001 79 Query 1 79 use `test`; create database `drop-temp+table-test` master-bin.000001 152 Query 1 152 use `drop-temp+table-test`; create temporary table `table:name` (a int) -master-bin.000001 246 Query 1 246 use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE `drop-temp+table-test`.`table:name` -master-bin.000001 365 Query 1 365 use `drop-temp+table-test`; DO RELEASE_LOCK("a") +master-bin.000001 246 Query 1 246 use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`table:name` +master-bin.000001 375 Query 1 375 use `drop-temp+table-test`; DO RELEASE_LOCK("a") drop database `drop-temp+table-test`; diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result index 908c1d285f5..ece2970198b 100644 --- a/mysql-test/r/union.result +++ b/mysql-test/r/union.result @@ -435,7 +435,7 @@ drop temporary table t1; create table t1 select a from t1 union select a from t2; ERROR HY000: You can't specify target table 't1' for update in FROM clause select a from t1 union select a from t2 order by t2.a; -Unknown column 't2.a' in 'ORDER BY' +ERROR 42S22: Unknown column 't2.a' in 'ORDER BY' drop table t1,t2; select length(version()) > 1 as `*` UNION select 2; * |