diff options
| author | unknown <tnurnberg@salvation.intern.azundris.com> | 2006-07-19 16:50:55 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@salvation.intern.azundris.com> | 2006-07-19 16:50:55 +0200 |
| commit | 846a99dcd7830bf03e708edb5d669bb2dc3f45bb (patch) | |
| tree | 2dcaa11f3dec6e6346710204a033ce07ea1234e0 | |
| parent | 92bbb54092902fb1f178605d99fa88960feebbd6 (diff) | |
| download | mariadb-git-846a99dcd7830bf03e708edb5d669bb2dc3f45bb.tar.gz | |
manual merge, part 2/2
mysql-test/r/mysqldump.result:
manual mergies, part 2/2
| -rw-r--r-- | mysql-test/r/mysqldump.result | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 9abc83b2239..ff745021efb 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -2818,7 +2818,6 @@ create database mysqldump_views; use mysqldump_views; create view nasishnasifu as select mysqldump_tables.basetable.id from mysqldump_tables.basetable; - CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_tables` /*!40100 DEFAULT CHARACTER SET latin1 */; USE `mysqldump_tables`; |