manual merge, part 2/2

56e1d961 · tnurnberg@salvation.intern.azundris.com · 199bb148 · 56e1d961
Commit 56e1d961 authored Jul 19, 2006 by tnurnberg@salvation.intern.azundris.com
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

mysql-test/r/mysqldump.result mysql-test/r/mysqldump.result +0 -1

No files found.
--- 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`;