summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqldump.result
diff options
context:
space:
mode:
authorunknown <vva@eagle.mysql.r18.ru>2004-02-10 19:29:28 +0400
committerunknown <vva@eagle.mysql.r18.ru>2004-02-10 19:29:28 +0400
commite4f3eb79be9dc5da27097f73e9477d9318373105 (patch)
tree6964c34fa051cc24f9993d4f83a9e503b6e0a291 /mysql-test/r/mysqldump.result
parente711cc30a7552f736a4a43dd4f86763e433c1a74 (diff)
downloadmariadb-git-e4f3eb79be9dc5da27097f73e9477d9318373105.tar.gz
correcting mysql-test/r/mysqldump.result after merge
mysql-test/r/mysqldump.result: correcting result after merge
Diffstat (limited to 'mysql-test/r/mysqldump.result')
-rw-r--r--mysql-test/r/mysqldump.result5
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index 37a604258d9..fd9e2a1f42b 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -180,6 +180,11 @@ UNLOCK TABLES;
DROP TABLE t1;
create table ```a` (i int);
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT, CHARACTER_SET_CLIENT=utf8 */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE=NO_AUTO_VALUE_ON_ZERO */;
DROP TABLE IF EXISTS ```a`;
CREATE TABLE ``a` (
`i` int(11) default NULL