Commit c323a2cb authored by unknown's avatar unknown
Browse files

Fixing and checking result for mysqldump test. 


mysql-test/r/mysqldump.result:
  Result change
parent 2aca61db

mysql-test/r/mysqldump.result

+98 −144
Original line number Diff line number Diff line
@@ -1492,7 +1492,7 @@ create view v2 as select * from t2 where a like 'a%' with check option; 
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

DROP TABLE IF EXISTS `t2`;

CREATE TABLE `t2` (

  `a` varchar(30) default NULL,

  `a` varchar(30) DEFAULT NULL,

  KEY `a` (`a`(5))

) ENGINE=MyISAM DEFAULT CHARSET=latin1;
@@ -1765,6 +1765,9 @@ select * from t1; 
a	b

Osnabrck	Kln

drop table t1;

#

# BUG#15328 Segmentation fault occured if my.cnf is invalid for escape sequence

#

--fields-optionally-enclosed-by="

#

# Bug #19025 mysqldump doesn't correctly dump "auto_increment = [int]"
@@ -1806,6 +1809,9 @@ t1 CREATE TABLE `t1` ( 
  KEY `t1_name` (`t1_name`)

) ENGINE=MyISAM AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1

drop table `t1`;

#

# Bug #18536: wrong table order

#

create table t1(a int);

create table t2(a int);

create table t3(a int);
@@ -1843,6 +1849,9 @@ CREATE TABLE `t2` ( 
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;



drop table t1, t2, t3;

#

# Bug #21288: mysqldump segmentation fault when using --where

#

create table t1 (a int);

mysqldump: Couldn't execute 'SELECT /*!40001 SQL_NO_CACHE */ * FROM `t1` WHERE xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx': You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 (1064)

mysqldump: Got error: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 when retrieving data from server
@@ -1873,6 +1882,9 @@ CREATE TABLE `t1` ( 
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;



drop table t1;

#

# Bug #10213 mysqldump crashes when dumping VIEWs(on MacOS X)

#

create database db1;

use db1;

CREATE TABLE t2 (
@@ -1932,6 +1944,9 @@ drop table t2; 
drop view v2;

drop database db1;

use test;

#

# Bug 10713 mysqldump includes database in create view and referenced tables

#

create database db2;

use db2;

create table t1 (a int);
@@ -2836,74 +2851,6 @@ DELIMITER ; 
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;



DROP TRIGGER tr1;

DROP TABLE t1;

create table t1 (a binary(1), b blob);

insert into t1 values ('','');



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

/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;

/*!40103 SET TIME_ZONE='+00:00' */;

/*!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' */;

/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

  `a` binary(1) DEFAULT NULL,

  `b` blob

) ENGINE=MyISAM DEFAULT CHARSET=latin1;



LOCK TABLES `t1` WRITE;

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

INSERT INTO `t1` VALUES (0x00,'');

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

UNLOCK TABLES;

/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;



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

/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;





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

/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;

/*!40103 SET TIME_ZONE='+00:00' */;

/*!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' */;

/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

  `a` binary(1) DEFAULT NULL,

  `b` blob

) ENGINE=MyISAM DEFAULT CHARSET=latin1;



LOCK TABLES `t1` WRITE;

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

INSERT INTO `t1` VALUES (0x00,'');

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

UNLOCK TABLES;

/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;



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

/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;



DROP TRIGGER tr1;

DROP TABLE t1;

#
@@ -2924,7 +2871,7 @@ insert into t1 values ('',''); 
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

  `a` binary(1) default NULL,

  `a` binary(1) DEFAULT NULL,

  `b` blob

) ENGINE=MyISAM DEFAULT CHARSET=latin1;
@@ -2956,7 +2903,7 @@ UNLOCK TABLES; 
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

  `a` binary(1) default NULL,

  `a` binary(1) DEFAULT NULL,

  `b` blob

) ENGINE=MyISAM DEFAULT CHARSET=latin1;
@@ -2995,15 +2942,15 @@ create table t3(a int); 
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

DROP TABLE IF EXISTS `t3`;

CREATE TABLE `t3` (

  `a` int(11) default NULL

  `a` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

  `a` int(11) default NULL

  `a` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

DROP TABLE IF EXISTS `t2`;

CREATE TABLE `t2` (

  `a` int(11) default NULL

  `a` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -3155,7 +3102,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_test_db` /*!40100 DEFAULT CH 
USE `mysqldump_test_db`;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

  `id` int(11) default NULL

  `id` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;



LOCK TABLES `t1` WRITE;
@@ -3225,7 +3172,7 @@ drop database mysqldump_views; 
drop table mysqldump_tables.basetable;

drop database mysqldump_tables;

#

# Bug20221 Dumping of multiple databases containing view(s) yields maleformed dumps

# Bug #20221 Dumping of multiple databases containing view(s) yields maleformed dumps

#

create database mysqldump_dba;

use mysqldump_dba;
@@ -3271,14 +3218,66 @@ grant RELOAD on *.* to mysqltest_1@localhost; 
mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need the SUPER,REPLICATION CLIENT privilege for this operation (1227)

mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need the SUPER,REPLICATION CLIENT privilege for this operation (1227)

grant REPLICATION CLIENT on *.* to mysqltest_1@localhost;

CHANGE MASTER TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=537;

CREATE TABLE `t1` (

  `a` int(11) default NULL,

  `b` varchar(34) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

drop table t1;

drop user mysqltest_1@localhost;

#

# Bug #21527 mysqldump incorrectly tries to LOCK TABLES on the 

# information_schema database.

#

create database mysqldump_myDB;

use mysqldump_myDB;

create user myDB_User;

grant create view, select on mysqldump_myDB.* to myDB_User@localhost;

create table t1 (c1 int);

insert into t1 values (3);

use mysqldump_myDB;

create view v1 (c1) as select * from t1;

use mysqldump_myDB;

drop view v1;

drop table t1;

revoke all privileges on mysqldump_myDB.* from myDB_User@localhost;

drop user myDB_User;

drop database mysqldump_myDB;

use test;

drop table if exists t1;

CREATE TABLE t1(a int, b int);

INSERT INTO t1 VALUES (1,1);

INSERT INTO t1 VALUES (2,3);

INSERT INTO t1 VALUES (3,4), (4,5);



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

/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;

/*!40103 SET TIME_ZONE='+00:00' */;

/*!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' */;

/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL,

  `b` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;



LOCK TABLES `t1` WRITE;

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

REPLACE INTO `t1` VALUES (1,1),(2,3),(3,4),(4,5);

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

UNLOCK TABLES;

/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;



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

/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;



DROP TABLE t1;

#

# Bug #13926: --order-by-primary fails if PKEY contains quote character

#

DROP TABLE IF EXISTS `t1`;
@@ -3297,9 +3296,9 @@ insert into t1 values (0815, 4711, 2006); 
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

DROP TABLE IF EXISTS "t1";

CREATE TABLE "t1" (

  "a b" int(11) NOT NULL default '0',

  "c""d" int(11) NOT NULL default '0',

  "e`f" int(11) NOT NULL default '0',

  "a b" int(11) NOT NULL DEFAULT '0',

  "c""d" int(11) NOT NULL DEFAULT '0',

  "e`f" int(11) NOT NULL DEFAULT '0',

  PRIMARY KEY ("a b","c""d","e`f")

);
@@ -3328,9 +3327,9 @@ UNLOCK TABLES; 
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

  `a b` int(11) NOT NULL default '0',

  `c"d` int(11) NOT NULL default '0',

  `e``f` int(11) NOT NULL default '0',

  `a b` int(11) NOT NULL DEFAULT '0',

  `c"d` int(11) NOT NULL DEFAULT '0',

  `e``f` int(11) NOT NULL DEFAULT '0',

  PRIMARY KEY (`a b`,`c"d`,`e``f`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1;
@@ -3350,60 +3349,12 @@ UNLOCK TABLES; 
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;



DROP TABLE `t1`;

create database mysqldump_myDB;

use mysqldump_myDB;

create user myDB_User;

grant create view, select on mysqldump_myDB.* to myDB_User@localhost;

create table t1 (c1 int);

insert into t1 values (3);

use mysqldump_myDB;

create view v1 (c1) as select * from t1;

use mysqldump_myDB;

drop view v1;

drop table t1;

revoke all privileges on mysqldump_myDB.* from myDB_User@localhost;

drop user myDB_User;

drop database mysqldump_myDB;

use test;

End of 5.0 tests

drop table if exists t1;

CREATE TABLE t1(a int, b int);

INSERT INTO t1 VALUES (1,1);

INSERT INTO t1 VALUES (2,3);

INSERT INTO t1 VALUES (3,4), (4,5);



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

/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;

/*!40103 SET TIME_ZONE='+00:00' */;

/*!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' */;

/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL,

  `b` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;



LOCK TABLES `t1` WRITE;

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

REPLACE INTO `t1` VALUES (1,1),(2,3),(3,4),(4,5);

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

UNLOCK TABLES;

/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;



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

/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;



DROP TABLE t1;

#

# End of 5.0 tests

#

#

# Added for use-thread option

#

create table t1 (a text , b text);

create table t2 (a text , b text);

insert t1 values ("Duck, Duck", "goose");
@@ -3579,6 +3530,9 @@ mysql-import: Error: 1146, Table 'test.words' doesn't exist, when using table: w 
drop table t1;

drop table t2;

drop table words2;

#

# Bug #16853: mysqldump doesn't show events

#

create database first;

use first;

set time_zone = 'UTC';
@@ -3677,5 +3631,5 @@ drop view v1; 
drop table t1;

drop database mysqldump_test_db;

#

# End of 5.0 tests

# End of 5.1 tests

#