database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Post merge changes.

Browse Source 
mysql-test/r/mysqldump.result:
  post-merge fix.
mysql-test/t/mysqldump.test:
  post-merge fix.
This commit is contained in:
unknown
2006-08-28 21:13:55 -04:00
parent 80bb699f92
commit a9a675a8e5
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/r/mysqldump.result
View File

@ -434,7 +434,7 @@ USE `mysqldump_test_db`;
drop database mysqldump_test_db; drop database mysqldump_test_db;
CREATE TABLE t1 (a CHAR(10)); CREATE TABLE t1 (a CHAR(10));
INSERT INTO t1 VALUES (_latin1 'ÄÖÜß'); INSERT INTO t1 VALUES (_latin1 '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>');
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@ -479,7 +479,7 @@ CREATE TABLE `t1` (
LOCK TABLES `t1` WRITE; LOCK TABLES `t1` WRITE;
/*!40000 ALTER TABLE `t1` DISABLE KEYS */; /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
INSERT INTO `t1` VALUES ('Ž™šá'); INSERT INTO `t1` VALUES ('<EFBFBD><EFBFBD><EFBFBD><EFBFBD>');
/*!40000 ALTER TABLE `t1` ENABLE KEYS */; /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@ -502,7 +502,7 @@ CREATE TABLE `t1` (
LOCK TABLES `t1` WRITE; LOCK TABLES `t1` WRITE;
/*!40000 ALTER TABLE `t1` DISABLE KEYS */; /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
INSERT INTO `t1` VALUES ('Ž™šá'); INSERT INTO `t1` VALUES ('<EFBFBD><EFBFBD><EFBFBD><EFBFBD>');
/*!40000 ALTER TABLE `t1` ENABLE KEYS */; /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@ -1676,11 +1676,11 @@ create table t1 (a text character set utf8, b text character set latin1);
insert t1 values (0x4F736E616272C3BC636B, 0x4BF66C6E); insert t1 values (0x4F736E616272C3BC636B, 0x4BF66C6E);
select * from t1; select * from t1;
a b a b
Osnabrück Köln Osnabr<EFBFBD>ck K<EFBFBD>ln
test.t1: Records: 1 Deleted: 0 Skipped: 0 Warnings: 0 test.t1: Records: 1 Deleted: 0 Skipped: 0 Warnings: 0
select * from t1; select * from t1;
a b a b
Osnabrück Köln Osnabr<EFBFBD>ck K<EFBFBD>ln
drop table t1; drop table t1;
create table `t1` ( create table `t1` (
t1_name varchar(255) default null, t1_name varchar(255) default null,

2
mysql-test/t/mysqldump.test
View File

@ -153,7 +153,7 @@ drop database mysqldump_test_db;
# if it is explicitely set. # if it is explicitely set.
CREATE TABLE t1 (a CHAR(10)); CREATE TABLE t1 (a CHAR(10));
INSERT INTO t1 VALUES (_latin1 'ÄÖÜß'); INSERT INTO t1 VALUES (_latin1 '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>');
--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments test t1 --exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments test t1
# #
# Bug#8063: make test mysqldump [ fail ] # Bug#8063: make test mysqldump [ fail ]