diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-09-18 10:55:20 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-09-18 10:55:20 +0400 |
| commit | adb4d9c4a6e779376ddb185e2bc08ed8f5844420 (patch) | |
| tree | 42f29dfbc6c858fdd12ddcfaeffc2c78c0004e2f /mysql-test | |
| parent | d3502127f3029c6ce02e7ef65d5e160868d4e479 (diff) | |
| parent | 2535ede7138cb4d1e8986d18b4154c377ba37f3f (diff) | |
| download | mariadb-git-adb4d9c4a6e779376ddb185e2bc08ed8f5844420.tar.gz | |
Merge 5.1-bugteam -> trunk-alik (up to revno:3111).
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/trigger_notembedded.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/myisam-system.test | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/mysql-test/r/trigger_notembedded.result b/mysql-test/r/trigger_notembedded.result index 335e6910a3a..d66308a9bd7 100644 --- a/mysql-test/r/trigger_notembedded.result +++ b/mysql-test/r/trigger_notembedded.result @@ -180,8 +180,6 @@ NULL mysqltest_db1 trg5 DELETE NULL mysqltest_db1 t1 0 NULL SET @a = 5 ROW BEFOR DROP USER mysqltest_dfn@localhost; DROP USER mysqltest_inv@localhost; DROP DATABASE mysqltest_db1; -Warnings: -Warning 1454 No definer attribute for trigger 'mysqltest_db1'.'trg1'. The trigger will be activated under the authorization of the invoker, which may have insufficient privileges. Please recreate the trigger. DELETE FROM mysql.user WHERE User LIKE 'mysqltest_%'; DELETE FROM mysql.db WHERE User LIKE 'mysqltest_%'; DELETE FROM mysql.tables_priv WHERE User LIKE 'mysqltest_%'; diff --git a/mysql-test/t/myisam-system.test b/mysql-test/t/myisam-system.test index dc5bb58b6a2..d908e639a4e 100644 --- a/mysql-test/t/myisam-system.test +++ b/mysql-test/t/myisam-system.test @@ -12,11 +12,11 @@ let $MYSQLD_DATADIR= `select @@datadir`; drop table if exists t1; create table t1 (a int) engine=myisam; --remove_file $MYSQLD_DATADIR/test/t1.MYI ---error 1051,6 +--error ER_BAD_TABLE_ERROR,6 drop table t1; create table t1 (a int) engine=myisam; --remove_file $MYSQLD_DATADIR/test/t1.MYD ---error 1105,6,29 +--error ER_BAD_TABLE_ERROR,6,29 drop table t1; ---error 1051 +--error ER_BAD_TABLE_ERROR drop table t1; |