From 7576f1a81f75009fe12becfd220bff80389506e6 Mon Sep 17 00:00:00 2001
From: "ram@gw.mysql.r18.ru" <>
Date: Wed, 10 Dec 2003 15:27:33 +0400
Subject: [PATCH] changed usc2 -> koi8r to don't depend on extra-charset
 option.

---
 mysql-test/r/mysqldump.result | 8 ++++----
 mysql-test/t/mysqldump.test   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index f5d98143f9e..ff1bee2923d 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -62,8 +62,8 @@ INSERT INTO t1 VALUES ("1\""), ("\"2");
 </database>
 </mysqldump>
 DROP TABLE t1;
-CREATE TABLE t1 (a  VARCHAR(255)) DEFAULT CHARSET ucs2;
-INSERT INTO t1  VALUES (_ucs2 x'05D005D505DC05D9');
+CREATE TABLE t1 (a  VARCHAR(255)) DEFAULT CHARSET koi8r;
+INSERT INTO t1  VALUES (_koi8r x'C1C2C3C4C5');
 -- MySQL dump 10.2
 --
 -- Host: localhost    Database: test
@@ -82,7 +82,7 @@ INSERT INTO t1  VALUES (_ucs2 x'05D005D505DC05D9');
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (
   a varchar(255) default NULL
-) TYPE=MyISAM DEFAULT CHARSET=ucs2;
+) ENGINE=MyISAM DEFAULT CHARSET=koi8r;
 
 --
 -- Dumping data for table `t1`
@@ -91,7 +91,7 @@ CREATE TABLE t1 (
 
 /*!40000 ALTER TABLE t1 DISABLE KEYS */;
 LOCK TABLES t1 WRITE;
-INSERT INTO t1 VALUES ('אולי');
+INSERT INTO t1 VALUES ('абцде');
 UNLOCK TABLES;
 /*!40000 ALTER TABLE t1 ENABLE KEYS */;
 
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index 2004d5122f1..582fae0da36 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -27,7 +27,7 @@ DROP TABLE t1;
 # Bug #1994
 #
 
-CREATE TABLE t1 (a  VARCHAR(255)) DEFAULT CHARSET ucs2;
-INSERT INTO t1  VALUES (_ucs2 x'05D005D505DC05D9');
+CREATE TABLE t1 (a  VARCHAR(255)) DEFAULT CHARSET koi8r;
+INSERT INTO t1  VALUES (_koi8r x'C1C2C3C4C5');
 --exec $MYSQL_DUMP test t1
 DROP TABLE t1;