diff options
| author | unknown <lars@mysql.com> | 2006-06-16 01:15:19 +0200 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2006-06-16 01:15:19 +0200 |
| commit | a9568d6452b640b2d533daf4c7355596ba33c34a (patch) | |
| tree | 3d62694dfc5e3c919e109127dafeb40e4a665a75 /mysql-test/t/trigger-grant.test | |
| parent | 9be84e4ab4470f085e223aee21bcb7d81e9d4ad8 (diff) | |
| parent | 3c8abd340a722c74853bf78eb2ad60c73301b2e8 (diff) | |
| download | mariadb-git-a9568d6452b640b2d533daf4c7355596ba33c34a.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
mysql-test/r/binlog_row_mix_innodb_myisam.result:
Auto merged
mysql-test/r/federated.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/extra/rpl_tests/rpl_ddl.test:
Auto merged
mysql-test/r/rpl_ddl.result:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/rpl_ndb_charset.result:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/r/trigger-grant.result:
Auto merged
mysql-test/t/archive.test:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/federated.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/innodb_mysql.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/trigger-grant.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/r/create.result:
Manual merge
mysql-test/r/innodb_mysql.result:
Manual merge
sql/handler.cc:
Manual merge
sql/share/errmsg.txt:
Manual merge
sql/sql_class.h:
Manual merge
sql/sql_delete.cc:
Manual merge
sql/sql_insert.cc:
Manual merge
sql/sql_table.cc:
Manual merge
Diffstat (limited to 'mysql-test/t/trigger-grant.test')
| -rw-r--r-- | mysql-test/t/trigger-grant.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/trigger-grant.test b/mysql-test/t/trigger-grant.test index 8ca8ffe904b..6dd0c83dc92 100644 --- a/mysql-test/t/trigger-grant.test +++ b/mysql-test/t/trigger-grant.test @@ -151,8 +151,8 @@ INSERT INTO t1 VALUES(0); # Cleanup for further tests. DROP TRIGGER trg1; -DELETE FROM t1; -DELETE FROM t2; +TRUNCATE TABLE t1; +TRUNCATE TABLE t2; --disconnect wl2818_definer_con |