diff options
author | unknown <mleich@five.local.lan> | 2008-03-07 17:44:03 +0100 |
---|---|---|
committer | unknown <mleich@five.local.lan> | 2008-03-07 17:44:03 +0100 |
commit | 71fb657743d32652d35bdd149d2db44a23c08caf (patch) | |
tree | da3a73090bfb8ea0e5c81a35151070bf5f500286 /mysql-test/suite/funcs_1/r/innodb_trig_03.result | |
parent | b2a68038cecdd9881ef420fcbe984acfaa934b7a (diff) | |
parent | d6e42aace333c5bbb7d1b76835e6947d1dac916c (diff) | |
download | mariadb-git-71fb657743d32652d35bdd149d2db44a23c08caf.tar.gz |
Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
into five.local.lan:/work/merge/mysql-5.1-funcs_1
BitKeeper/deleted/.del-create_database.inc:
Auto merged
BitKeeper/deleted/.del-create_user_lowest_priv.inc:
Auto merged
BitKeeper/deleted/.del-create_user_no_super.inc:
Auto merged
BitKeeper/deleted/.del-datadict_master.inc:
Auto merged
BitKeeper/deleted/.del-datadict_show_schema.inc:
Auto merged
BitKeeper/deleted/.del-datadict_show_table_design.inc:
Auto merged
BitKeeper/deleted/.del-datadict_tables.inc:
Auto merged
BitKeeper/deleted/.del-datadict_tables_error.inc:
Auto merged
BitKeeper/deleted/.del-datadict_tables_error_1.inc:
Auto merged
BitKeeper/deleted/.del-datadict_tables_error_1049.inc:
Auto merged
BitKeeper/deleted/.del-datadict_tables_error_1051.inc:
Auto merged
BitKeeper/deleted/.del-datadict_tables_error_1146.inc:
Auto merged
BitKeeper/deleted/.del-datadict_tables_error_1288.inc:
Auto merged
BitKeeper/deleted/.del-innodb__datadict.result:
Auto merged
BitKeeper/deleted/.del-innodb__datadict.test:
Auto merged
BitKeeper/deleted/.del-innodb__load.result:
Auto merged
BitKeeper/deleted/.del-innodb__load.test:
Auto merged
BitKeeper/deleted/.del-memory__datadict.result:
Auto merged
BitKeeper/deleted/.del-memory__datadict.test:
Auto merged
BitKeeper/deleted/.del-memory__load.result:
Auto merged
BitKeeper/deleted/.del-memory__load.test:
Auto merged
BitKeeper/deleted/.del-myisam__datadict.result:
Auto merged
BitKeeper/deleted/.del-myisam__datadict.test:
Auto merged
BitKeeper/deleted/.del-myisam__load.result:
Auto merged
BitKeeper/deleted/.del-myisam__load.test:
Auto merged
mysql-test/suite/funcs_1/include/memory_tb1.inc:
Auto merged
mysql-test/suite/funcs_1/include/memory_tb2.inc:
Auto merged
mysql-test/suite/funcs_1/include/memory_tb3.inc:
Auto merged
mysql-test/suite/funcs_1/include/memory_tb4.inc:
Auto merged
mysql-test/suite/funcs_1/include/sp_tb.inc:
Auto merged
mysql-test/suite/funcs_1/r/innodb_bitdata.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_cursors.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_views.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_bitdata.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_cursors.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
Auto merged
BitKeeper/deleted/.del-datadict_tables_error_1044.inc:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_03.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_08.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_09.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_bitdata.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_cursors.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
Auto merged
mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_07.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_08.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
Auto merged
mysql-test/suite/funcs_1/t/innodb_storedproc_02.test:
Auto merged
mysql-test/suite/funcs_1/t/innodb_storedproc_03.test:
Auto merged
mysql-test/suite/funcs_1/t/innodb_storedproc_06.test:
Auto merged
mysql-test/suite/funcs_1/t/innodb_storedproc_07.test:
Auto merged
mysql-test/suite/funcs_1/t/innodb_storedproc_08.test:
Auto merged
mysql-test/suite/funcs_1/t/innodb_storedproc_10.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
Auto merged
mysql-test/suite/funcs_1/t/innodb_bitdata.test:
SCCS merged
mysql-test/suite/funcs_1/t/innodb_cursors.test:
SCCS merged
mysql-test/suite/funcs_1/t/innodb_trig_0102.test:
SCCS merged
mysql-test/suite/funcs_1/t/innodb_trig_03.test:
SCCS merged
mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
SCCS merged
mysql-test/suite/funcs_1/t/innodb_trig_08.test:
SCCS merged
mysql-test/suite/funcs_1/t/innodb_trig_09.test:
SCCS merged
mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test:
SCCS merged
mysql-test/suite/funcs_1/t/innodb_trig_frkey.test:
SCCS merged
mysql-test/suite/funcs_1/t/innodb_views.test:
SCCS merged
mysql-test/suite/funcs_1/t/memory_bitdata.test:
SCCS merged
mysql-test/suite/funcs_1/t/memory_cursors.test:
SCCS merged
mysql-test/suite/funcs_1/t/memory_trig_0102.test:
SCCS merged
mysql-test/suite/funcs_1/t/memory_trig_03.test:
SCCS merged
mysql-test/suite/funcs_1/t/memory_trig_0407.test:
SCCS merged
mysql-test/suite/funcs_1/t/memory_trig_08.test:
SCCS merged
mysql-test/suite/funcs_1/t/memory_trig_09.test:
SCCS merged
mysql-test/suite/funcs_1/t/memory_trig_1011ext.test:
SCCS merged
mysql-test/suite/funcs_1/t/memory_views.test:
SCCS merged
mysql-test/suite/funcs_1/t/myisam_cursors.test:
SCCS merged
mysql-test/suite/funcs_1/t/myisam_trig_0102.test:
SCCS merged
mysql-test/suite/funcs_1/t/myisam_trig_0407.test:
ur
mysql-test/suite/funcs_1/t/myisam_views.test:
ur
mysql-test/suite/funcs_1/r/myisam_views.result:
Manual merge
Diffstat (limited to 'mysql-test/suite/funcs_1/r/innodb_trig_03.result')
-rw-r--r-- | mysql-test/suite/funcs_1/r/innodb_trig_03.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_03.result b/mysql-test/suite/funcs_1/r/innodb_trig_03.result index f4a47b03e19..b20e249f51f 100644 --- a/mysql-test/suite/funcs_1/r/innodb_trig_03.result +++ b/mysql-test/suite/funcs_1/r/innodb_trig_03.result @@ -1,4 +1,3 @@ -SET @NO_REFRESH = IF( '' = '', 0, 1); USE test; drop table if exists tb3 ; create table tb3 ( @@ -698,3 +697,4 @@ drop database if exists priv_db; drop user test_yesprivs@localhost; drop user test_noprivs@localhost; drop user test_noprivs; +DROP TABLE test.tb3; |