Commit cce8d045 authored by unknown's avatar unknown
Browse files

Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8 

See mysqldump.test comments for more details
parent ef1971ec

client/mysqldump.c

+6 −0
Original line number Diff line number Diff line
@@ -613,6 +613,12 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
      }

      if (end!=compatible_mode_normal_str)

	end[-1]= 0;

      /* 

        Set charset to the default compiled value if it hasn't

        been reset yet by --default-character-set=xxx.

      */

      if (default_charset == (char*) MYSQL_UNIVERSAL_CLIENT_CHARSET)

        default_charset= (char*) MYSQL_DEFAULT_CHARSET_NAME;

      break;

    }

  case (int) OPT_MYSQL_PROTOCOL:

mysql-test/r/mysqldump.result

+106 −0
Original line number Diff line number Diff line
@@ -374,3 +374,109 @@ USE `mysqldump_test_db`; 
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;



drop database mysqldump_test_db;

CREATE TABLE t1 (a  CHAR(10));

INSERT INTO t1  VALUES (_latin1 '');



/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;

/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;

/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;

/*!40101 SET NAMES 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 `t1`;

CREATE TABLE `t1` (

  `a` char(10) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;





/*!40000 ALTER TABLE `t1` DISABLE KEYS */;

LOCK TABLES `t1` WRITE;

INSERT INTO `t1` VALUES ('ÄÖÜß');

UNLOCK TABLES;

/*!40000 ALTER TABLE `t1` ENABLE KEYS */;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;

/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;



/*!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,MYSQL323" */;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

  `a` char(10) default NULL

) TYPE=MyISAM;





/*!40000 ALTER TABLE `t1` DISABLE KEYS */;

LOCK TABLES `t1` WRITE;

INSERT INTO `t1` VALUES ('');

UNLOCK TABLES;

/*!40000 ALTER TABLE `t1` ENABLE KEYS */;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;



/*!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,MYSQL323" */;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

  `a` char(10) default NULL

) TYPE=MyISAM;





/*!40000 ALTER TABLE `t1` DISABLE KEYS */;

LOCK TABLES `t1` WRITE;

INSERT INTO `t1` VALUES ('');

UNLOCK TABLES;

/*!40000 ALTER TABLE `t1` ENABLE KEYS */;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;



/*!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,MYSQL323" */;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

  `a` char(10) default NULL

) TYPE=MyISAM;





/*!40000 ALTER TABLE `t1` DISABLE KEYS */;

LOCK TABLES `t1` WRITE;

INSERT INTO `t1` VALUES ('');

UNLOCK TABLES;

/*!40000 ALTER TABLE `t1` ENABLE KEYS */;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;



/*!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,MYSQL323" */;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

  `a` char(10) default NULL

) TYPE=MyISAM;





/*!40000 ALTER TABLE `t1` DISABLE KEYS */;

LOCK TABLES `t1` WRITE;

INSERT INTO `t1` VALUES ('ÄÖÜß');

UNLOCK TABLES;

/*!40000 ALTER TABLE `t1` ENABLE KEYS */;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;



DROP TABLE t1;

mysql-test/t/mysqldump.test

+16 −0
Original line number Diff line number Diff line
@@ -137,3 +137,19 @@ drop table t1; 
create database mysqldump_test_db character set latin2 collate latin2_bin;

--exec $MYSQL_DUMP --skip-comments --databases mysqldump_test_db;

drop database mysqldump_test_db;



#

# Bug #7020

# Check that we don't dump in UTF8 in compatible mode by default,

# but use the default compiled values, or the values given in

# --default-character-set=xxx. However, we should dump in UTF8

# if it is explicitely set.



CREATE TABLE t1 (a  CHAR(10));

INSERT INTO t1  VALUES (_latin1 '');

--exec $MYSQL_DUMP --skip-comments test t1

--exec $MYSQL_DUMP --skip-comments --compatible=mysql323 test t1

--exec $MYSQL_DUMP --skip-comments --compatible=mysql323 --default-character-set=cp850 test t1

--exec $MYSQL_DUMP --skip-comments --default-character-set=cp850 --compatible=mysql323 test t1

--exec $MYSQL_DUMP --skip-comments --default-character-set=utf8 --compatible=mysql323 test t1

DROP TABLE t1;