MySQL Lists: commits: bzr commit into mysql-6.0-backup branch (hema:2683) WL#4227

List:	Commits	« Previous Message Next Message »
From:	Hema Sridharan	Date:	August 15 2008 10:22pm
Subject:	bzr commit into mysql-6.0-backup branch (hema:2683) WL#4227
View as plain text
#At file:///data0/wl4227/mysql-6.0-backup/

 2683 Hema Sridharan	2008-08-16
      WL#4227(Test of identifiers and objects for different character sets and 
      collations). The testcases for this WL is committied according to changes       requested by Chuck and Rafal.
      There is a seperate backup_charsets suite created which will have list of 
      all combinations of storage engine + character set + collation.
      Each test case from this suite will run against all these combinations.
      Right now this suite includes the following tests:
      backup_triggers.test
      backup_functions.test
      backup_procedures.test
      backup_datatypes.test
      backup_partitions.test
added:
  mysql-test/suite/backup_charsets/
  mysql-test/suite/backup_charsets/combinations
  mysql-test/suite/backup_charsets/include/
  mysql-test/suite/backup_charsets/include/charset.inc
  mysql-test/suite/backup_charsets/r/
  mysql-test/suite/backup_charsets/r/backup_datatypes.result
  mysql-test/suite/backup_charsets/r/backup_functions.result
  mysql-test/suite/backup_charsets/r/backup_partitions.result
  mysql-test/suite/backup_charsets/r/backup_procedures.result
  mysql-test/suite/backup_charsets/r/backup_triggers.result
  mysql-test/suite/backup_charsets/t/
  mysql-test/suite/backup_charsets/t/backup_datatypes.test
  mysql-test/suite/backup_charsets/t/backup_functions.test
  mysql-test/suite/backup_charsets/t/backup_partitions.test
  mysql-test/suite/backup_charsets/t/backup_procedures.test
  mysql-test/suite/backup_charsets/t/backup_triggers.test
modified:
  mysql-test/suite/backup/r/backup_functions.result
  mysql-test/suite/backup/r/backup_procedures.result
  mysql-test/suite/backup/r/backup_triggers.result
  mysql-test/suite/backup/t/backup_functions.test
  mysql-test/suite/backup/t/backup_procedures.test
  mysql-test/suite/backup/t/backup_triggers.test

=== modified file 'mysql-test/suite/backup/r/backup_functions.result'
--- a/mysql-test/suite/backup/r/backup_functions.result	2008-08-12 03:22:05 +0000
+++ b/mysql-test/suite/backup/r/backup_functions.result	2008-08-15 22:15:12 +0000
@@ -99,27 +99,13 @@ RETURN side * side;
 SELECT square_area(11);
 square_area(11)
 121
-showing objects and create statements.
-SHOW CREATE FUNCTION number_of_players;;
-Function	number_of_players
-sql_mode	STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER
-Create Function	CREATE DEFINER=`root`@`localhost` FUNCTION `number_of_players`() RETURNS int(11)
-BEGIN
-RETURN (SELECT COUNT(*) FROM players);
-END
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
-SHOW CREATE TABLE players;;
-Table	players
-Create Table	CREATE TABLE `players` (
-  `playerno` int(11) NOT NULL,
-  `name` char(10) DEFAULT NULL,
-  `Bdate` date DEFAULT NULL,
-  `sex` char(2) DEFAULT NULL,
-  `joined` year(4) DEFAULT NULL,
-  PRIMARY KEY (`playerno`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+describe players;
+Field	Type	Null	Key	Default	Extra
+playerno	int(11)	NO	PRI	NULL	
+name	char(10)	YES		NULL	
+Bdate	date	YES		NULL	
+sex	char(2)	YES		NULL	
+joined	year(4)	YES		NULL	
 describe penalties;
 Field	Type	Null	Key	Default	Extra
 paymentno	int(11)	NO	PRI	NULL	
@@ -135,9 +121,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sfs
 Name	fcount
 Type	FUNCTION
@@ -146,9 +132,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sfs
 Name	number_of_players
 Type	FUNCTION
@@ -157,9 +143,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sfs
 Name	number_of_players1
 Type	FUNCTION
@@ -168,9 +154,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sfs
 Name	square_area
 Type	FUNCTION
@@ -179,9 +165,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 backup data
 BACKUP DATABASE bup_sfs TO 'bup_sfs.bak';
 backup_id
@@ -195,20 +181,6 @@ backup_id
 SELECT @@SQL_MODE;
 @@SQL_MODE
 STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER
-showing objects and create statements
-SHOW CREATE DATABASE bup_sfs;;
-Database	bup_sfs
-Create Database	CREATE DATABASE `bup_sfs` /*!40100 DEFAULT CHARACTER SET latin1 */
-SHOW CREATE FUNCTION number_of_players;;
-Function	number_of_players
-sql_mode	STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER
-Create Function	CREATE DEFINER=`root`@`localhost` FUNCTION `number_of_players`() RETURNS int(11)
-BEGIN
-RETURN (SELECT COUNT(*) FROM players);
-END
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
 describe penalties;
 Field	Type	Null	Key	Default	Extra
 paymentno	int(11)	NO	PRI	NULL	
@@ -231,9 +203,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sfs
 Name	fcount
 Type	FUNCTION
@@ -242,9 +214,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sfs
 Name	number_of_players
 Type	FUNCTION
@@ -253,9 +225,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sfs
 Name	number_of_players1
 Type	FUNCTION
@@ -264,9 +236,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sfs
 Name	square_area
 Type	FUNCTION
@@ -275,9 +247,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 INSERT INTO bup_sfs.players VALUES
 (57,'brown','1971-08-17','M','1985'),(95,'Miller','1963-05-14','M','1972');
 INSERT INTO bup_sfs.matches VALUES(11,2,6,0,3);
@@ -307,20 +279,6 @@ backup_id
 SELECT @@SQL_MODE;
 @@SQL_MODE
 REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI
-showing objects and create statements
-SHOW CREATE DATABASE bup_sfs;;
-Database	bup_sfs
-Create Database	CREATE DATABASE "bup_sfs" /*!40100 DEFAULT CHARACTER SET latin1 */
-SHOW CREATE FUNCTION number_of_players;;
-Function	number_of_players
-sql_mode	STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER
-Create Function	CREATE DEFINER=`root`@`localhost` FUNCTION `number_of_players`() RETURNS int(11)
-BEGIN
-RETURN (SELECT COUNT(*) FROM players);
-END
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
 SHOW FUNCTION STATUS;;
 Db	bup_sfs
 Name	dollars
@@ -330,9 +288,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sfs
 Name	fcount
 Type	FUNCTION
@@ -341,9 +299,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sfs
 Name	number_of_players
 Type	FUNCTION
@@ -352,9 +310,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sfs
 Name	number_of_players1
 Type	FUNCTION
@@ -363,9 +321,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sfs
 Name	square_area
 Type	FUNCTION
@@ -374,9 +332,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 SELECT square_area(13);
 square_area(13)
 169
@@ -395,20 +353,6 @@ backup_id
 SELECT @@SQL_MODE;
 @@SQL_MODE
 PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER
-showing objects and create statements
-SHOW CREATE DATABASE bup_sfs;;
-Database	bup_sfs
-Create Database	CREATE DATABASE "bup_sfs" /*!40100 DEFAULT CHARACTER SET latin1 */
-SHOW CREATE FUNCTION number_of_players;;
-Function	number_of_players
-sql_mode	STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER
-Create Function	CREATE DEFINER=`root`@`localhost` FUNCTION `number_of_players`() RETURNS int(11)
-BEGIN
-RETURN (SELECT COUNT(*) FROM players);
-END
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
 SHOW FUNCTION STATUS;;
 Db	bup_sfs
 Name	dollars
@@ -418,9 +362,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sfs
 Name	fcount
 Type	FUNCTION
@@ -429,9 +373,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sfs
 Name	number_of_players
 Type	FUNCTION
@@ -440,9 +384,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sfs
 Name	number_of_players1
 Type	FUNCTION
@@ -451,9 +395,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sfs
 Name	square_area
 Type	FUNCTION
@@ -462,9 +406,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 SELECT square_area(14);
 square_area(14)
 196
@@ -491,29 +435,13 @@ SELECT @@SQL_MODE;
 @@SQL_MODE
 
 showing objects and create statements
-SHOW CREATE DATABASE bup_sfs;;
-Database	bup_sfs
-Create Database	CREATE DATABASE `bup_sfs` /*!40100 DEFAULT CHARACTER SET latin1 */
-SHOW CREATE FUNCTION number_of_players;;
-Function	number_of_players
-sql_mode	STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER
-Create Function	CREATE DEFINER=`root`@`localhost` FUNCTION `number_of_players`() RETURNS int(11)
-BEGIN
-RETURN (SELECT COUNT(*) FROM players);
-END
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
-SHOW CREATE TABLE players;;
-Table	players
-Create Table	CREATE TABLE `players` (
-  `playerno` int(11) NOT NULL,
-  `name` char(10) DEFAULT NULL,
-  `Bdate` date DEFAULT NULL,
-  `sex` char(2) DEFAULT NULL,
-  `joined` year(4) DEFAULT NULL,
-  PRIMARY KEY (`playerno`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+describe players;
+Field	Type	Null	Key	Default	Extra
+playerno	int(11)	NO	PRI	NULL	
+name	char(10)	YES		NULL	
+Bdate	date	YES		NULL	
+sex	char(2)	YES		NULL	
+joined	year(4)	YES		NULL	
 describe matches;
 Field	Type	Null	Key	Default	Extra
 Matchno	int(11)	NO	PRI	NULL	
@@ -530,9 +458,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sfs
 Name	fcount
 Type	FUNCTION
@@ -541,9 +469,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sfs
 Name	number_of_players
 Type	FUNCTION
@@ -552,9 +480,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sfs
 Name	number_of_players1
 Type	FUNCTION
@@ -563,9 +491,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sfs
 Name	square_area
 Type	FUNCTION
@@ -574,9 +502,9 @@ Modified	#
 Created	#
 Security_type	DEFINER
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 SELECT square_area(20);
 square_area(20)
 400

=== modified file 'mysql-test/suite/backup/r/backup_procedures.result'
--- a/mysql-test/suite/backup/r/backup_procedures.result	2008-08-12 03:22:05 +0000
+++ b/mysql-test/suite/backup/r/backup_procedures.result	2008-08-15 22:15:12 +0000
@@ -14,16 +14,16 @@ city VARCHAR(10)
 );
 *********loading data*********
 INSERT INTO bup_sp.country VALUES
-('IND','chennai'),('US','sfo'),('US','austin'),
-('IND','Bomb'),('US','Richmond'),('IND','hyd');
+('IND','JAIPUR'),('US','SFO'),('US','AUSTIN'),
+('IND','BOMBAY'),('US','RICHMOND'),('IND','HYD');
 SELECT * FROM bup_sp.country ORDER BY ccode, city;
 ccode	city
-IND	Bomb
-IND	chennai
-IND	hyd
-US	austin
-US	Richmond
-US	sfo
+IND	BOMBAY
+IND	HYD
+IND	JAIPUR
+US	AUSTIN
+US	RICHMOND
+US	SFO
 CREATE PROCEDURE countryinfo (IN loc CHAR(5))
 BEGIN
 SELECT * FROM country WHERE ccode=loc;
@@ -36,35 +36,23 @@ REPEAT SET @x = @x + 1; UNTIL @x > p1 EN
 END ;||
 CALL countryinfo('US');
 ccode	city
-US	sfo
-US	austin
-US	Richmond
+US	SFO
+US	AUSTIN
+US	RICHMOND
 CALL countryinfo('IND');
 ccode	city
-IND	chennai
-IND	Bomb
-IND	hyd
+IND	JAIPUR
+IND	BOMBAY
+IND	HYD
 CALL dorepeat(1000);
 SELECT @x;
 @x
 1001
 showing objects and create statements.
-SHOW CREATE PROCEDURE countryinfo;;
-Procedure	countryinfo
-sql_mode	
-Create Procedure	CREATE DEFINER=`root`@`localhost` PROCEDURE `countryinfo`(IN loc CHAR(5))
-BEGIN
-SELECT * FROM country WHERE ccode=loc;
-END
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
-SHOW CREATE TABLE country;;
-Table	country
-Create Table	CREATE TABLE `country` (
-  `ccode` char(10) DEFAULT NULL,
-  `city` varchar(10) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+describe country;
+Field	Type	Null	Key	Default	Extra
+ccode	char(10)	YES		NULL	
+city	varchar(10)	YES		NULL	
 SHOW PROCEDURE STATUS;;
 Db	bup_sp
 Name	countryinfo
@@ -74,9 +62,9 @@ Modified	#
 Created	#
 Security_type	#
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sp
 Name	dorepeat
 Type	PROCEDURE
@@ -85,9 +73,9 @@ Modified	#
 Created	#
 Security_type	#
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 backup data
 
 BACKUP DATABASE bup_sp TO 'bup_sp.bak';
@@ -100,22 +88,10 @@ RESTORE FROM 'bup_sp.bak';
 backup_id
 #
 showing objects and create statements
-SHOW CREATE PROCEDURE countryinfo;;
-Procedure	countryinfo
-sql_mode	
-Create Procedure	CREATE DEFINER=`root`@`localhost` PROCEDURE `countryinfo`(IN loc CHAR(5))
-BEGIN
-SELECT * FROM country WHERE ccode=loc;
-END
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
-SHOW CREATE TABLE country;;
-Table	country
-Create Table	CREATE TABLE `country` (
-  `ccode` char(10) DEFAULT NULL,
-  `city` varchar(10) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+describe country;
+Field	Type	Null	Key	Default	Extra
+ccode	char(10)	YES		NULL	
+city	varchar(10)	YES		NULL	
 SHOW PROCEDURE STATUS;;
 Db	bup_sp
 Name	countryinfo
@@ -125,9 +101,9 @@ Modified	#
 Created	#
 Security_type	#
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Db	bup_sp
 Name	dorepeat
 Type	PROCEDURE
@@ -136,35 +112,35 @@ Modified	#
 Created	#
 Security_type	#
 Comment	
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 INSERT INTO bup_sp.country VALUES
-('US','boston'),('IND','jaipur'),('US','natick');
+('US','BOSTON'),('IND','JAIPUR'),('US','NATICK');
 SELECT * FROM bup_sp.country ORDER BY  ccode, city;
 ccode	city
-IND	Bomb
-IND	chennai
-IND	hyd
-IND	jaipur
-US	austin
-US	boston
-US	natick
-US	Richmond
-US	sfo
+IND	BOMBAY
+IND	HYD
+IND	JAIPUR
+IND	JAIPUR
+US	AUSTIN
+US	BOSTON
+US	NATICK
+US	RICHMOND
+US	SFO
 CALL countryinfo('IND');
 ccode	city
-IND	chennai
-IND	Bomb
-IND	hyd
-IND	jaipur
+IND	JAIPUR
+IND	BOMBAY
+IND	HYD
+IND	JAIPUR
 CALL countryinfo('US');
 ccode	city
-US	sfo
-US	austin
-US	Richmond
-US	boston
-US	natick
+US	SFO
+US	AUSTIN
+US	RICHMOND
+US	BOSTON
+US	NATICK
 CALL dorepeat(99);
 SELECT @x;
 @x

=== modified file 'mysql-test/suite/backup/r/backup_triggers.result'
--- a/mysql-test/suite/backup/r/backup_triggers.result	2008-08-12 03:22:05 +0000
+++ b/mysql-test/suite/backup/r/backup_triggers.result	2008-08-15 22:15:12 +0000
@@ -75,25 +75,25 @@ INSERT INTO bup_ts.city VALUES
 (4,'dd','IK',73287328),(5,'ee','YU',89399),(6,'ff','IL',90880),
 (7,'gg','TY',345),(8,'hh','WE',9239084);
 Updating the table to fire trigger with event update
-UPDATE cap SET capital='Delhi' WHERE country='Ind';
+UPDATE cap SET capital='Delhi' WHERE country='IND';
 UPDATE cap SET capital='Washington DC' WHERE country='US';
 SELECT @country as country, @capital_old as 'old capital',
 @capital_new as 'new capital';
 country	old capital	new capital
 US	DC	Washington DC
 showing the tables to check the trigger is fired  with event insert
-SELECT * FROM bup_ts.cap ORDER BY city;
+SELECT * FROM bup_ts.cap ORDER BY id;
 id	country	city	population	capital
-2	US	Austin	0	Washington DC
-4	IND	bang	0	Delhi
 1	IND	chn	87874646000	Delhi
-8	IND	hyd	647000	Delhi
-6	IND	jammu	3848000	Delhi
+2	US	Austin	0	Washington DC
 3	Russia	moscow	76487623235000	moscow
+4	IND	bang	0	Delhi
 5	US	sacramento	0	Washington DC
+6	IND	jammu	3848000	Delhi
 7	Russia	xx	0	moscow
+8	IND	hyd	647000	Delhi
 selecting data from table city
-SELECT * FROM bup_ts.city ORDER BY name;
+SELECT * FROM bup_ts.city ORDER BY id;
 id	name	ccode	population
 1	aa	AD	263768
 2	bb	PO	8839898
@@ -109,7 +109,7 @@ DELETE FROM bup_ts.city WHERE name='bb';
 
 Checking table contents of city and dropcity to verify if trigger is
 fired for event delete.
-SELECT * FROM city ORDER BY name;
+SELECT * FROM city ORDER BY id;
 id	name	ccode	population
 1	aa	AD	263768
 3	cc	KL	898778
@@ -162,9 +162,9 @@ Timing	BEFORE
 Created	NULL
 sql_mode	
 Definer	root@localhost
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Trigger	capu_tri
 Event	UPDATE
 Table	cap
@@ -177,9 +177,9 @@ Timing	BEFORE
 Created	NULL
 sql_mode	
 Definer	root@localhost
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Trigger	cityin_d
 Event	DELETE
 Table	city
@@ -188,9 +188,9 @@ Timing	AFTER
 Created	NULL
 sql_mode	
 Definer	root@localhost
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Trigger	trai
 Event	INSERT
 Table	t2
@@ -201,9 +201,9 @@ Timing	AFTER
 Created	NULL
 sql_mode	
 Definer	root@localhost
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Trigger	trau
 Event	UPDATE
 Table	t2
@@ -214,72 +214,18 @@ Timing	AFTER
 Created	NULL
 sql_mode	
 Definer	root@localhost
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
-SHOW CREATE TRIGGER cap_tri;;
-Trigger	cap_tri
-sql_mode	
-SQL Original Statement	CREATE DEFINER=`root`@`localhost` TRIGGER cap_tri BEFORE INSERT ON cap FOR EACH ROW
-SET new.population= if(new.population<0,0,truncate(new.population,-3))
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
-SHOW CREATE TRIGGER capu_tri;;
-Trigger	capu_tri
-sql_mode	
-SQL Original Statement	CREATE DEFINER=`root`@`localhost` TRIGGER capu_tri BEFORE UPDATE ON cap FOR EACH ROW
-BEGIN
-SET @country=old.country;
-SET @capital_old=old.capital;
-SET @capital_new=new.capital;
-END
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
-SHOW CREATE TRIGGER cityin_d;;
-Trigger	cityin_d
-sql_mode	
-SQL Original Statement	CREATE DEFINER=`root`@`localhost` TRIGGER cityin_d AFTER
-DELETE ON city FOR EACH ROW
-INSERT INTO dropcity(id, name) VALUES(old.id, old.name)
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
-SHOW CREATE TRIGGER trai;;
-Trigger	trai
-sql_mode	
-SQL Original Statement	CREATE DEFINER=`root`@`localhost` TRIGGER trai AFTER INSERT ON t2 FOR EACH ROW
-BEGIN
-INSERT INTO t3 VALUES('H'),('E'),('L'),('L'),('O');
-END
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
-SHOW CREATE TRIGGER trau;;
-Trigger	trau
-sql_mode	
-SQL Original Statement	CREATE DEFINER=`root`@`localhost` TRIGGER trau AFTER UPDATE ON t2 FOR EACH ROW
-BEGIN
-INSERT INTO t4 VALUES('J'),('O'),('B');
-END
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
-SHOW CREATE TABLE city;;
-Table	city
-Create Table	CREATE TABLE `city` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `name` varchar(20) DEFAULT NULL,
-  `ccode` char(10) DEFAULT NULL,
-  `population` bigint(20) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=ENGINE AUTO_INCREMENT=9 DEFAULT CHARSET=latin1
-SHOW CREATE TABLE t2;;
-Table	t2
-Create Table	CREATE TABLE `t2` (
-  `a` char(4) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+character_set_client	#
+collation_connection	#
+Database Collation	#
+DESCRIBE city;
+Field	Type	Null	Key	Default	Extra
+id	int(10) unsigned	NO	PRI	NULL	auto_increment
+name	varchar(20)	YES		NULL	
+ccode	char(10)	YES		NULL	
+population	bigint(20)	YES		NULL	
+DESCRIBE t2;
+Field	Type	Null	Key	Default	Extra
+a	char(4)	YES		NULL	
 backup data
 BACKUP DATABASE bup_ts TO 'bup_ts.bak';
 backup_id
@@ -292,46 +238,6 @@ backup_id
 #
 show data and create statements after Restore
 showing objects and create statements
-SHOW CREATE DATABASE bup_ts;;
-Database	bup_ts
-Create Database	CREATE DATABASE `bup_ts` /*!40100 DEFAULT CHARACTER SET latin1 */
-SHOW CREATE TRIGGER cap_tri;;
-Trigger	cap_tri
-sql_mode	
-SQL Original Statement	CREATE DEFINER=`root`@`localhost` TRIGGER cap_tri BEFORE INSERT ON cap FOR EACH ROW
-SET new.population= if(new.population<0,0,truncate(new.population,-3))
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
-SHOW CREATE TRIGGER cityin_d;;
-Trigger	cityin_d
-sql_mode	
-SQL Original Statement	CREATE DEFINER=`root`@`localhost` TRIGGER cityin_d AFTER
-DELETE ON city FOR EACH ROW
-INSERT INTO dropcity(id, name) VALUES(old.id, old.name)
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
-SHOW CREATE TRIGGER trai;;
-Trigger	trai
-sql_mode	
-SQL Original Statement	CREATE DEFINER=`root`@`localhost` TRIGGER trai AFTER INSERT ON t2 FOR EACH ROW
-BEGIN
-INSERT INTO t3 VALUES('H'),('E'),('L'),('L'),('O');
-END
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
-SHOW CREATE TRIGGER trau;;
-Trigger	trau
-sql_mode	
-SQL Original Statement	CREATE DEFINER=`root`@`localhost` TRIGGER trau AFTER UPDATE ON t2 FOR EACH ROW
-BEGIN
-INSERT INTO t4 VALUES('J'),('O'),('B');
-END
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
 SHOW TRIGGERS;;
 Trigger	cap_tri
 Event	INSERT
@@ -341,9 +247,9 @@ Timing	BEFORE
 Created	NULL
 sql_mode	
 Definer	root@localhost
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Trigger	capu_tri
 Event	UPDATE
 Table	cap
@@ -356,9 +262,9 @@ Timing	BEFORE
 Created	NULL
 sql_mode	
 Definer	root@localhost
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Trigger	cityin_d
 Event	DELETE
 Table	city
@@ -367,9 +273,9 @@ Timing	AFTER
 Created	NULL
 sql_mode	
 Definer	root@localhost
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Trigger	trai
 Event	INSERT
 Table	t2
@@ -380,9 +286,9 @@ Timing	AFTER
 Created	NULL
 sql_mode	
 Definer	root@localhost
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Trigger	trau
 Event	UPDATE
 Table	t2
@@ -393,29 +299,27 @@ Timing	AFTER
 Created	NULL
 sql_mode	
 Definer	root@localhost
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Inserting some more values in the table to check the trigger with event insert
 INSERT INTO bup_ts.cap VALUES
-(9,'US','houston',-33399587677866656555655555655,'texas');
-Warnings:
-Warning	1264	Out of range value for column 'population' at row 1
-SELECT * FROM bup_ts.cap ORDER BY city;
+(9,'US','houston',-333995876778666565,'texas');
+SELECT * FROM bup_ts.cap ORDER BY id;
 id	country	city	population	capital
-2	US	Austin	0	Washington DC
-4	IND	bang	0	Delhi
 1	IND	chn	87874646000	Delhi
-9	US	houston	0	texas
-8	IND	hyd	647000	Delhi
-6	IND	jammu	3848000	Delhi
+2	US	Austin	0	Washington DC
 3	Russia	moscow	76487623235000	moscow
+4	IND	bang	0	Delhi
 5	US	sacramento	0	Washington DC
+6	IND	jammu	3848000	Delhi
 7	Russia	xx	0	moscow
+8	IND	hyd	647000	Delhi
+9	US	houston	0	texas
 Deleting some rows from city to check the trigger with event delete
 DELETE FROM city WHERE name='aa';
 Checking table city and drop city
-SELECT * FROM bup_ts.city ORDER BY name;
+SELECT * FROM bup_ts.city ORDER BY id;
 id	name	ccode	population
 3	cc	KL	898778
 5	ee	YU	89399
@@ -499,9 +403,9 @@ Timing	BEFORE
 Created	NULL
 sql_mode	
 Definer	root@localhost
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Trigger	capu_tri
 Event	UPDATE
 Table	cap
@@ -514,9 +418,9 @@ Timing	BEFORE
 Created	NULL
 sql_mode	
 Definer	root@localhost
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Trigger	cityin_d
 Event	DELETE
 Table	city
@@ -525,9 +429,9 @@ Timing	AFTER
 Created	NULL
 sql_mode	
 Definer	root@localhost
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Trigger	trai
 Event	INSERT
 Table	t2
@@ -538,9 +442,9 @@ Timing	AFTER
 Created	NULL
 sql_mode	
 Definer	root@localhost
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
+character_set_client	#
+collation_connection	#
+Database Collation	#
 Trigger	trau
 Event	UPDATE
 Table	t2
@@ -551,45 +455,38 @@ Timing	AFTER
 Created	NULL
 sql_mode	
 Definer	root@localhost
-character_set_client	latin1
-collation_connection	latin1_swedish_ci
-Database Collation	latin1_swedish_ci
-SHOW CREATE TABLE t2;;
-Table	t2
-Create Table	CREATE TABLE `t2` (
-  `a` char(4) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
-SHOW CREATE TABLE city;;
-Table	city
-Create Table	CREATE TABLE `city` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `name` varchar(20) DEFAULT NULL,
-  `ccode` char(10) DEFAULT NULL,
-  `population` bigint(20) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=ENGINE AUTO_INCREMENT=9 DEFAULT CHARSET=latin1
-SHOW CREATE TABLE cap;;
-Table	cap
-Create Table	CREATE TABLE `cap` (
-  `id` smallint(6) DEFAULT NULL,
-  `country` char(20) DEFAULT NULL,
-  `city` varchar(20) DEFAULT NULL,
-  `population` bigint(20) DEFAULT NULL,
-  `capital` char(20) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+character_set_client	#
+collation_connection	#
+Database Collation	#
+DESCRIBE t2;
+Field	Type	Null	Key	Default	Extra
+a	char(4)	YES		NULL	
+DESCRIBE city;
+Field	Type	Null	Key	Default	Extra
+id	int(10) unsigned	NO	PRI	NULL	auto_increment
+name	varchar(20)	YES		NULL	
+ccode	char(10)	YES		NULL	
+population	bigint(20)	YES		NULL	
+DESCRIBE cap;
+Field	Type	Null	Key	Default	Extra
+id	smallint(6)	YES		NULL	
+country	char(20)	YES		NULL	
+city	varchar(20)	YES		NULL	
+population	bigint(20)	YES		NULL	
+capital	char(20)	YES		NULL	
 Check contents after Restore and change of SQL mode
 INSERT INTO bup_ts.cap VALUES(10,'India','Daund',36637782899,'maharashtra');
-SELECT * FROM bup_ts.cap ORDER BY city;
+SELECT * FROM bup_ts.cap ORDER BY id;
 id	country	city	population	capital
-2	US	Austin	0	Washington DC
-4	IND	bang	0	Delhi
 1	IND	chn	87874646000	Delhi
-10	India	Daund	36637782000	maharashtra
-8	IND	hyd	647000	Delhi
-6	IND	jammu	3848000	Delhi
+2	US	Austin	0	Washington DC
 3	Russia	moscow	76487623235000	moscow
+4	IND	bang	0	Delhi
 5	US	sacramento	0	Washington DC
+6	IND	jammu	3848000	Delhi
 7	Russia	xx	0	moscow
+8	IND	hyd	647000	Delhi
+10	India	Daund	36637782000	maharashtra
 INSERT INTO bup_ts.t2 VALUES('i'),('w');
 SELECT * FROM t3;
 a
@@ -640,17 +537,17 @@ backup_id
 #
 Check contents after Restore and change of SQL mode
 INSERT INTO bup_ts.cap VALUES(11,'UK','Edenburg',-36637782899,'london');
-SELECT * FROM bup_ts.cap ORDER BY city;
+SELECT * FROM bup_ts.cap ORDER BY id;
 id	country	city	population	capital
-2	US	Austin	0	Washington DC
-4	IND	bang	0	Delhi
 1	IND	chn	87874646000	Delhi
-11	UK	Edenburg	0	london
-8	IND	hyd	647000	Delhi
-6	IND	jammu	3848000	Delhi
+2	US	Austin	0	Washington DC
 3	Russia	moscow	76487623235000	moscow
+4	IND	bang	0	Delhi
 5	US	sacramento	0	Washington DC
+6	IND	jammu	3848000	Delhi
 7	Russia	xx	0	moscow
+8	IND	hyd	647000	Delhi
+11	UK	Edenburg	0	london
 INSERT INTO bup_ts.t2 VALUES('i'),('w'),('h');
 SELECT * FROM bup_ts.t3;
 a
@@ -706,17 +603,17 @@ backup_id
 #
 Check contents after Restore and change of SQL mode
 INSERT INTO bup_ts.cap VALUES(12,'India','vooty',789,'Tamilnadu');
-SELECT * FROM bup_ts.cap ORDER BY city;
+SELECT * FROM bup_ts.cap ORDER BY id;
 id	country	city	population	capital
-2	US	Austin	0	Washington DC
-4	IND	bang	0	Delhi
 1	IND	chn	87874646000	Delhi
-8	IND	hyd	647000	Delhi
-6	IND	jammu	3848000	Delhi
+2	US	Austin	0	Washington DC
 3	Russia	moscow	76487623235000	moscow
+4	IND	bang	0	Delhi
 5	US	sacramento	0	Washington DC
-12	India	vooty	0	Tamilnadu
+6	IND	jammu	3848000	Delhi
 7	Russia	xx	0	moscow
+8	IND	hyd	647000	Delhi
+12	India	vooty	0	Tamilnadu
 INSERT INTO bup_ts.t2 VALUES('i'),('w'),('h'),('b');
 SELECT * FROM bup_ts.t3;
 a

=== modified file 'mysql-test/suite/backup/t/backup_functions.test'
--- a/mysql-test/suite/backup/t/backup_functions.test	2008-08-12 03:22:05 +0000
+++ b/mysql-test/suite/backup/t/backup_functions.test	2008-08-15 22:15:12 +0000
@@ -138,12 +138,9 @@ RETURN side * side;
 SELECT square_area(11);
 
 #Show data and create statements.
---echo showing objects and create statements.
---query_vertical SHOW CREATE FUNCTION number_of_players;
---replace_result $ENGINE ENGINE
---query_vertical SHOW CREATE TABLE players;
+describe players;
 describe penalties;
---replace_column  4 # 5 # 6 #
+--replace_column  4 # 5 # 6 # 9 # 10 # 11 #
 --query_vertical SHOW FUNCTION STATUS;
 
 #Backup and restore data.
@@ -164,13 +161,9 @@ RESTORE FROM 'bup_sfs.bak';
 SELECT @@SQL_MODE;
 
 #show data and create statements
---echo showing objects and create statements
---query_vertical SHOW CREATE DATABASE bup_sfs;
---query_vertical SHOW CREATE FUNCTION number_of_players;
 describe penalties;
 describe matches;
---replace_column  4 # 5 # 6 #
-
+--replace_column  4 # 5 # 6 # 9 # 10 # 11 #
 --query_vertical SHOW FUNCTION STATUS;
 
 #Again calling function to check if Sf are backed up and restored properly or
@@ -198,11 +191,7 @@ RESTORE FROM 'bup_sfs.bak';
 SELECT @@SQL_MODE;
 
 #show data and create statements
---echo showing objects and create statements
---query_vertical SHOW CREATE DATABASE bup_sfs;
---query_vertical SHOW CREATE FUNCTION number_of_players;
---replace_column  4 # 5 # 6 #
-
+--replace_column  4 # 5 # 6 # 9 # 10 # 11 #
 --query_vertical SHOW FUNCTION STATUS;
 
 #Again calling function to check if Sf are backed up and restored
@@ -222,10 +211,7 @@ RESTORE FROM 'bup_sfs.bak';
 SELECT @@SQL_MODE;
 
 #show data and create statements
---echo showing objects and create statements
---query_vertical SHOW CREATE DATABASE bup_sfs;
---query_vertical SHOW CREATE FUNCTION number_of_players;
---replace_column  4 # 5 # 6 #
+--replace_column  4 # 5 # 6 # 9 # 10 # 11 #
 --query_vertical SHOW FUNCTION STATUS;
 
 #Again calling function to check if Sf are backed up and restored properly
@@ -245,12 +231,9 @@ RESTORE FROM 'bup_sfs.bak';
 SELECT @@SQL_MODE;
 #show data and create statements
 --echo showing objects and create statements
---query_vertical SHOW CREATE DATABASE bup_sfs;
---query_vertical SHOW CREATE FUNCTION number_of_players;
---replace_result $ENGINE ENGINE
---query_vertical SHOW CREATE TABLE players;
+describe players;
 describe matches;
---replace_column  4 # 5 # 6 #
+--replace_column  4 # 5 # 6 # 9 # 10 # 11 #
 --query_vertical SHOW FUNCTION STATUS;
 
 #Again calling function to check if Sf are backed up and restored properly

=== modified file 'mysql-test/suite/backup/t/backup_procedures.test'
--- a/mysql-test/suite/backup/t/backup_procedures.test	2008-08-12 03:22:05 +0000
+++ b/mysql-test/suite/backup/t/backup_procedures.test	2008-08-15 22:15:12 +0000
@@ -42,8 +42,8 @@ city VARCHAR(10)
 
 --echo *********loading data*********
 INSERT INTO bup_sp.country VALUES
-('IND','chennai'),('US','sfo'),('US','austin'),
-('IND','Bomb'),('US','Richmond'),('IND','hyd');
+('IND','JAIPUR'),('US','SFO'),('US','AUSTIN'),
+('IND','BOMBAY'),('US','RICHMOND'),('IND','HYD');
 
 SELECT * FROM bup_sp.country ORDER BY ccode, city;
 
@@ -72,10 +72,8 @@ SELECT @x;
 #Show the data and Create statements
 
 --echo showing objects and create statements.
---query_vertical SHOW CREATE PROCEDURE countryinfo;
---replace_result $ENGINE ENGINE
---query_vertical SHOW CREATE TABLE country;
---replace_column 4 # 5 # 6 # 7 #
+describe country;
+--replace_column 4 # 5 # 6 # 7 # 9 # 10 # 11 #
 --query_vertical SHOW PROCEDURE STATUS;
 
 #Backup and restore data.
@@ -94,18 +92,15 @@ RESTORE FROM 'bup_sp.bak';
 
 #show data and create statements
 --echo showing objects and create statements
---query_vertical SHOW CREATE PROCEDURE countryinfo;
---replace_result $ENGINE ENGINE
---query_vertical SHOW CREATE TABLE country;
---replace_column 4 # 5 # 6 # 7 #
+describe country;
+--replace_column 4 # 5 # 6 # 7 # 9 # 10 # 11 #
 --query_vertical SHOW PROCEDURE STATUS;
 
-
 #Excercise the objects after restore to make sure if objects are backedup and
 #restored properly.
 
 INSERT INTO bup_sp.country VALUES
-('US','boston'),('IND','jaipur'),('US','natick');
+('US','BOSTON'),('IND','JAIPUR'),('US','NATICK');
 SELECT * FROM bup_sp.country ORDER BY  ccode, city;
 CALL countryinfo('IND');
 CALL countryinfo('US');

=== modified file 'mysql-test/suite/backup/t/backup_triggers.test'
--- a/mysql-test/suite/backup/t/backup_triggers.test	2008-08-12 03:22:05 +0000
+++ b/mysql-test/suite/backup/t/backup_triggers.test	2008-08-15 22:15:12 +0000
@@ -135,18 +135,18 @@ INSERT INTO bup_ts.city VALUES
 
 --echo  Updating the table to fire trigger with event update
 
-UPDATE cap SET capital='Delhi' WHERE country='Ind';
+UPDATE cap SET capital='Delhi' WHERE country='IND';
 UPDATE cap SET capital='Washington DC' WHERE country='US';
 SELECT @country as country, @capital_old as 'old capital',
 @capital_new as 'new capital';
 
 --echo showing the tables to check the trigger is fired  with event insert
 
-SELECT * FROM bup_ts.cap ORDER BY city;
+SELECT * FROM bup_ts.cap ORDER BY id;
 
 --echo selecting data from table city
 
-SELECT * FROM bup_ts.city ORDER BY name;
+SELECT * FROM bup_ts.city ORDER BY id;
 
 --echo deleting few rows from table city to fire trigger with event delete.
 #*****Bug#35249******
@@ -159,7 +159,7 @@ DELETE FROM bup_ts.city WHERE name='bb';
 --echo
 --echo Checking table contents of city and dropcity to verify if trigger is
 --echo fired for event delete.
-SELECT * FROM city ORDER BY name;
+SELECT * FROM city ORDER BY id;
 SELECT * FROM dropcity ORDER BY id;
 
 --echo ******Firing Trigger after insert and after update *********
@@ -172,17 +172,10 @@ SELECT * FROM bup_ts.t4;
 --echo Show the data and Create statements
 
 --echo showing objects and create statements.
+--replace_column 9 # 10 # 11 #
 --query_vertical SHOW TRIGGERS;
---query_vertical SHOW CREATE TRIGGER cap_tri;
---query_vertical SHOW CREATE TRIGGER capu_tri;
---query_vertical SHOW CREATE TRIGGER cityin_d;
---query_vertical SHOW CREATE TRIGGER trai;
---query_vertical SHOW CREATE TRIGGER trau;
---replace_result $ENGINE ENGINE
---query_vertical SHOW CREATE TABLE city;
---replace_result $ENGINE ENGINE
---query_vertical SHOW CREATE TABLE t2;
-
+DESCRIBE city;
+DESCRIBE t2;
 
 #Backup and restore data.
 --echo backup data
@@ -200,18 +193,14 @@ RESTORE FROM 'bup_ts.bak';
 
 --echo show data and create statements after Restore
 --echo showing objects and create statements
---query_vertical SHOW CREATE DATABASE bup_ts;
---query_vertical SHOW CREATE TRIGGER cap_tri;
---query_vertical SHOW CREATE TRIGGER cityin_d;
---query_vertical SHOW CREATE TRIGGER trai;
---query_vertical SHOW CREATE TRIGGER trau;
+--replace_column 9 # 10 # 11 #
 --query_vertical SHOW TRIGGERS;
 --echo  Inserting some more values in the table to check the trigger with event insert
 
 INSERT INTO bup_ts.cap VALUES
-(9,'US','houston',-33399587677866656555655555655,'texas');
+(9,'US','houston',-333995876778666565,'texas');
 
-SELECT * FROM bup_ts.cap ORDER BY city;
+SELECT * FROM bup_ts.cap ORDER BY id;
 
 --echo Deleting some rows from city to check the trigger with event delete
 
@@ -219,7 +208,7 @@ DELETE FROM city WHERE name='aa';
 
 --echo Checking table city and drop city
 
-SELECT * FROM bup_ts.city ORDER BY name;
+SELECT * FROM bup_ts.city ORDER BY id;
 SELECT * FROM bup_ts.dropcity ORDER BY id;
 INSERT INTO bup_ts.t2 VALUES('m'),('s1'),('s'),('q'),('l');
 SELECT * FROM bup_ts.t3;
@@ -233,17 +222,16 @@ SET SQL_MODE=TRADITIONAL;
 --replace_column 1 #
 RESTORE FROM 'bup_ts.bak';
 
+--replace_column 9 # 10 # 11 #
 --query_vertical SHOW TRIGGERS;
---replace_result $ENGINE ENGINE
---query_vertical SHOW CREATE TABLE t2;
---replace_result $ENGINE ENGINE
---query_vertical SHOW CREATE TABLE city;
---replace_result $ENGINE ENGINE
---query_vertical SHOW CREATE TABLE cap;
+DESCRIBE t2;
+DESCRIBE city;
+DESCRIBE cap;
+
 --echo Check contents after Restore and change of SQL mode
 
 INSERT INTO bup_ts.cap VALUES(10,'India','Daund',36637782899,'maharashtra');
-SELECT * FROM bup_ts.cap ORDER BY city;
+SELECT * FROM bup_ts.cap ORDER BY id;
 INSERT INTO bup_ts.t2 VALUES('i'),('w');
 SELECT * FROM t3;
 UPDATE t2 SET a='^' WHERE a='w';
@@ -260,7 +248,7 @@ RESTORE FROM 'bup_ts.bak';
 --echo Check contents after Restore and change of SQL mode
 
 INSERT INTO bup_ts.cap VALUES(11,'UK','Edenburg',-36637782899,'london');
-SELECT * FROM bup_ts.cap ORDER BY city;
+SELECT * FROM bup_ts.cap ORDER BY id;
 INSERT INTO bup_ts.t2 VALUES('i'),('w'),('h');
 SELECT * FROM bup_ts.t3;
 UPDATE t2 SET a='p' WHERE a='h';
@@ -278,7 +266,7 @@ RESTORE FROM 'bup_ts.bak';
 
 INSERT INTO bup_ts.cap VALUES(12,'India','vooty',789,'Tamilnadu');
 
-SELECT * FROM bup_ts.cap ORDER BY city;
+SELECT * FROM bup_ts.cap ORDER BY id;
 INSERT INTO bup_ts.t2 VALUES('i'),('w'),('h'),('b');
 
 SELECT * FROM bup_ts.t3;

=== added directory 'mysql-test/suite/backup_charsets'
=== added file 'mysql-test/suite/backup_charsets/combinations'
--- a/mysql-test/suite/backup_charsets/combinations	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/backup_charsets/combinations	2008-08-15 22:15:12 +0000
@@ -0,0 +1,1500 @@
+[myisam big5 big5_chinese_ci]
+--default-storage-engine=myisam
+--default-character-set=big5 
+--default-collation=big5_chinese_ci 
+[innodb big5 big5_chinese_ci]
+--default-storage-engine=innodb
+--default-character-set=big5 
+--default-collation=big5_chinese_ci 
+[falcon big5 big5_chinese_ci]
+--default-storage-engine=falcon
+--default-character-set=big5 
+--default-collation=big5_chinese_ci 
+[myisam big5 big5_bin]
+--default-storage-engine=myisam
+--default-character-set=big5 
+--default-collation=big5_bin 
+[innodb big5 big5_bin]
+--default-storage-engine=innodb
+--default-character-set=big5 
+--default-collation=big5_bin 
+[falcon big5 big5_bin]
+--default-storage-engine=falcon
+--default-character-set=big5 
+--default-collation=big5_bin 
+[myisam dec8 dec8_swedish_ci]
+--default-storage-engine=myisam
+--default-character-set=dec8 
+--default-collation=dec8_swedish_ci 
+[innodb dec8 dec8_swedish_ci]
+--default-storage-engine=innodb
+--default-character-set=dec8 
+--default-collation=dec8_swedish_ci 
+[falcon dec8 dec8_swedish_ci]
+--default-storage-engine=falcon
+--default-character-set=dec8 
+--default-collation=dec8_swedish_ci 
+[myisam dec8 dec8_bin]
+--default-storage-engine=myisam
+--default-character-set=dec8 
+--default-collation=dec8_bin 
+[innodb dec8 dec8_bin]
+--default-storage-engine=innodb
+--default-character-set=dec8 
+--default-collation=dec8_bin 
+[falcon dec8 dec8_bin]
+--default-storage-engine=falcon
+--default-character-set=dec8 
+--default-collation=dec8_bin 
+[myisam cp850 cp850_general_ci]
+--default-storage-engine=myisam
+--default-character-set=cp850 
+--default-collation=cp850_general_ci 
+[innodb cp850 cp850_general_ci]
+--default-storage-engine=innodb
+--default-character-set=cp850 
+--default-collation=cp850_general_ci 
+[falcon cp850 cp850_general_ci]
+--default-storage-engine=falcon
+--default-character-set=cp850 
+--default-collation=cp850_general_ci 
+[myisam cp850 cp850_bin]
+--default-storage-engine=myisam
+--default-character-set=cp850 
+--default-collation=cp850_bin 
+[innodb cp850 cp850_bin]
+--default-storage-engine=innodb
+--default-character-set=cp850 
+--default-collation=cp850_bin 
+[falcon cp850 cp850_bin]
+--default-storage-engine=falcon
+--default-character-set=cp850 
+--default-collation=cp850_bin 
+[myisam hp8 hp8_english_ci]
+--default-storage-engine=myisam
+--default-character-set=hp8 
+--default-collation=hp8_english_ci 
+[innodb hp8 hp8_english_ci]
+--default-storage-engine=innodb
+--default-character-set=hp8 
+--default-collation=hp8_english_ci 
+[falcon hp8 hp8_english_ci]
+--default-storage-engine=falcon
+--default-character-set=hp8 
+--default-collation=hp8_english_ci 
+[myisam hp8 hp8_bin]
+--default-storage-engine=myisam
+--default-character-set=hp8 
+--default-collation=hp8_bin 
+[innodb hp8 hp8_bin]
+--default-storage-engine=innodb
+--default-character-set=hp8 
+--default-collation=hp8_bin 
+[falcon hp8 hp8_bin]
+--default-storage-engine=falcon
+--default-character-set=hp8 
+--default-collation=hp8_bin 
+[myisam koi8r koi8r_general_ci]
+--default-storage-engine=myisam
+--default-character-set=koi8r 
+--default-collation=koi8r_general_ci 
+[innodb koi8r koi8r_general_ci]
+--default-storage-engine=innodb
+--default-character-set=koi8r 
+--default-collation=koi8r_general_ci 
+[falcon koi8r koi8r_general_ci]
+--default-storage-engine=falcon
+--default-character-set=koi8r 
+--default-collation=koi8r_general_ci 
+[myisam koi8r koi8r_bin]
+--default-storage-engine=myisam
+--default-character-set=koi8r 
+--default-collation=koi8r_bin 
+[innodb koi8r koi8r_bin]
+--default-storage-engine=innodb
+--default-character-set=koi8r 
+--default-collation=koi8r_bin 
+[falcon koi8r koi8r_bin]
+--default-storage-engine=falcon
+--default-character-set=koi8r 
+--default-collation=koi8r_bin 
+[myisam latin1 latin1_german1_ci]
+--default-storage-engine=myisam
+--default-character-set=latin1 
+--default-collation=latin1_german1_ci 
+[innodb latin1 latin1_german1_ci]
+--default-storage-engine=innodb
+--default-character-set=latin1 
+--default-collation=latin1_german1_ci 
+[falcon latin1 latin1_german1_ci]
+--default-storage-engine=falcon
+--default-character-set=latin1 
+--default-collation=latin1_german1_ci 
+[myisam latin1 latin1_swedish_ci]
+--default-storage-engine=myisam
+--default-character-set=latin1 
+--default-collation=latin1_swedish_ci 
+[innodb latin1 latin1_swedish_ci]
+--default-storage-engine=innodb
+--default-character-set=latin1 
+--default-collation=latin1_swedish_ci 
+[falcon latin1 latin1_swedish_ci]
+--default-storage-engine=falcon
+--default-character-set=latin1 
+--default-collation=latin1_swedish_ci 
+[myisam latin1 latin1_danish_ci]
+--default-storage-engine=myisam
+--default-character-set=latin1 
+--default-collation=latin1_danish_ci 
+[innodb latin1 latin1_danish_ci]
+--default-storage-engine=innodb
+--default-character-set=latin1 
+--default-collation=latin1_danish_ci 
+[falcon latin1 latin1_danish_ci]
+--default-storage-engine=falcon
+--default-character-set=latin1 
+--default-collation=latin1_danish_ci 
+[myisam latin1 latin1_german2_ci]
+--default-storage-engine=myisam
+--default-character-set=latin1 
+--default-collation=latin1_german2_ci 
+[innodb latin1 latin1_german2_ci]
+--default-storage-engine=innodb
+--default-character-set=latin1 
+--default-collation=latin1_german2_ci 
+[falcon latin1 latin1_german2_ci]
+--default-storage-engine=falcon
+--default-character-set=latin1 
+--default-collation=latin1_german2_ci 
+[myisam latin1 latin1_bin]
+--default-storage-engine=myisam
+--default-character-set=latin1 
+--default-collation=latin1_bin 
+[innodb latin1 latin1_bin]
+--default-storage-engine=innodb
+--default-character-set=latin1 
+--default-collation=latin1_bin 
+[falcon latin1 latin1_bin]
+--default-storage-engine=falcon
+--default-character-set=latin1 
+--default-collation=latin1_bin 
+[myisam latin1 latin1_general_ci]
+--default-storage-engine=myisam
+--default-character-set=latin1 
+--default-collation=latin1_general_ci 
+[innodb latin1 latin1_general_ci]
+--default-storage-engine=innodb
+--default-character-set=latin1 
+--default-collation=latin1_general_ci 
+[falcon latin1 latin1_general_ci]
+--default-storage-engine=falcon
+--default-character-set=latin1 
+--default-collation=latin1_general_ci 
+[myisam latin1 latin1_general_cs]
+--default-storage-engine=myisam
+--default-character-set=latin1 
+--default-collation=latin1_general_cs 
+[innodb latin1 latin1_general_cs]
+--default-storage-engine=innodb
+--default-character-set=latin1 
+--default-collation=latin1_general_cs 
+[falcon latin1 latin1_general_cs]
+--default-storage-engine=falcon
+--default-character-set=latin1 
+--default-collation=latin1_general_cs 
+[myisam latin1 latin1_spanish_ci]
+--default-storage-engine=myisam
+--default-character-set=latin1 
+--default-collation=latin1_spanish_ci 
+[innodb latin1 latin1_spanish_ci]
+--default-storage-engine=innodb
+--default-character-set=latin1 
+--default-collation=latin1_spanish_ci 
+[falcon latin1 latin1_spanish_ci]
+--default-storage-engine=falcon
+--default-character-set=latin1 
+--default-collation=latin1_spanish_ci 
+[myisam latin2 latin2_czech_cs]
+--default-storage-engine=myisam
+--default-character-set=latin2 
+--default-collation=latin2_czech_cs 
+[innodb latin2 latin2_czech_cs]
+--default-storage-engine=innodb
+--default-character-set=latin2 
+--default-collation=latin2_czech_cs 
+[falcon latin2 latin2_czech_cs]
+--default-storage-engine=falcon
+--default-character-set=latin2 
+--default-collation=latin2_czech_cs 
+[myisam latin2 latin2_general_ci]
+--default-storage-engine=myisam
+--default-character-set=latin2 
+--default-collation=latin2_general_ci 
+[innodb latin2 latin2_general_ci]
+--default-storage-engine=innodb
+--default-character-set=latin2 
+--default-collation=latin2_general_ci 
+[falcon latin2 latin2_general_ci]
+--default-storage-engine=falcon
+--default-character-set=latin2 
+--default-collation=latin2_general_ci 
+[myisam latin2 latin2_hungarian_ci]
+--default-storage-engine=myisam
+--default-character-set=latin2 
+--default-collation=latin2_hungarian_ci 
+[innodb latin2 latin2_hungarian_ci]
+--default-storage-engine=innodb
+--default-character-set=latin2 
+--default-collation=latin2_hungarian_ci 
+[falcon latin2 latin2_hungarian_ci]
+--default-storage-engine=falcon
+--default-character-set=latin2 
+--default-collation=latin2_hungarian_ci 
+[myisam latin2 latin2_croatian_ci]
+--default-storage-engine=myisam
+--default-character-set=latin2 
+--default-collation=latin2_croatian_ci 
+[innodb latin2 latin2_croatian_ci]
+--default-storage-engine=innodb
+--default-character-set=latin2 
+--default-collation=latin2_croatian_ci 
+[falcon latin2 latin2_croatian_ci]
+--default-storage-engine=falcon
+--default-character-set=latin2 
+--default-collation=latin2_croatian_ci 
+[myisam latin2 latin2_bin]
+--default-storage-engine=myisam
+--default-character-set=latin2 
+--default-collation=latin2_bin 
+[innodb latin2 latin2_bin]
+--default-storage-engine=innodb
+--default-character-set=latin2 
+--default-collation=latin2_bin 
+[falcon latin2 latin2_bin]
+--default-storage-engine=falcon
+--default-character-set=latin2 
+--default-collation=latin2_bin 
+[myisam ascii ascii_general_ci]
+--default-storage-engine=myisam
+--default-character-set=ascii 
+--default-collation=ascii_general_ci 
+[innodb ascii ascii_general_ci]
+--default-storage-engine=innodb
+--default-character-set=ascii 
+--default-collation=ascii_general_ci 
+[falcon ascii ascii_general_ci]
+--default-storage-engine=falcon
+--default-character-set=ascii 
+--default-collation=ascii_general_ci 
+[myisam ascii ascii_bin]
+--default-storage-engine=myisam
+--default-character-set=ascii 
+--default-collation=ascii_bin 
+[innodb ascii ascii_bin]
+--default-storage-engine=innodb
+--default-character-set=ascii 
+--default-collation=ascii_bin 
+[falcon ascii ascii_bin]
+--default-storage-engine=falcon
+--default-character-set=ascii 
+--default-collation=ascii_bin 
+[myisam ujis ujis_japanese_ci]
+--default-storage-engine=myisam
+--default-character-set=ujis 
+--default-collation=ujis_japanese_ci 
+[innodb ujis ujis_japanese_ci]
+--default-storage-engine=innodb
+--default-character-set=ujis 
+--default-collation=ujis_japanese_ci 
+[falcon ujis ujis_japanese_ci]
+--default-storage-engine=falcon
+--default-character-set=ujis 
+--default-collation=ujis_japanese_ci 
+[myisam ujis ujis_bin]
+--default-storage-engine=myisam
+--default-character-set=ujis 
+--default-collation=ujis_bin 
+[innodb ujis ujis_bin]
+--default-storage-engine=innodb
+--default-character-set=ujis 
+--default-collation=ujis_bin 
+[falcon ujis ujis_bin]
+--default-storage-engine=falcon
+--default-character-set=ujis 
+--default-collation=ujis_bin 
+[myisam sjis sjis_japanese_ci]
+--default-storage-engine=myisam
+--default-character-set=sjis 
+--default-collation=sjis_japanese_ci 
+[innodb sjis sjis_japanese_ci]
+--default-storage-engine=innodb
+--default-character-set=sjis 
+--default-collation=sjis_japanese_ci 
+[falcon sjis sjis_japanese_ci]
+--default-storage-engine=falcon
+--default-character-set=sjis 
+--default-collation=sjis_japanese_ci 
+[myisam sjis sjis_bin]
+--default-storage-engine=myisam
+--default-character-set=sjis 
+--default-collation=sjis_bin 
+[innodb sjis sjis_bin]
+--default-storage-engine=innodb
+--default-character-set=sjis 
+--default-collation=sjis_bin 
+[falcon sjis sjis_bin]
+--default-storage-engine=falcon
+--default-character-set=sjis 
+--default-collation=sjis_bin 
+[myisam hebrew hebrew_general_ci]
+--default-storage-engine=myisam
+--default-character-set=hebrew 
+--default-collation=hebrew_general_ci 
+[innodb hebrew hebrew_general_ci]
+--default-storage-engine=innodb
+--default-character-set=hebrew 
+--default-collation=hebrew_general_ci 
+[falcon hebrew hebrew_general_ci]
+--default-storage-engine=falcon
+--default-character-set=hebrew 
+--default-collation=hebrew_general_ci 
+[myisam hebrew hebrew_bin]
+--default-storage-engine=myisam
+--default-character-set=hebrew 
+--default-collation=hebrew_bin 
+[innodb hebrew hebrew_bin]
+--default-storage-engine=innodb
+--default-character-set=hebrew 
+--default-collation=hebrew_bin 
+[falcon hebrew hebrew_bin]
+--default-storage-engine=falcon
+--default-character-set=hebrew 
+--default-collation=hebrew_bin 
+[myisam tis620 tis620_thai_ci]
+--default-storage-engine=myisam
+--default-character-set=tis620 
+--default-collation=tis620_thai_ci 
+[innodb tis620 tis620_thai_ci]
+--default-storage-engine=innodb
+--default-character-set=tis620 
+--default-collation=tis620_thai_ci 
+[falcon tis620 tis620_thai_ci]
+--default-storage-engine=falcon
+--default-character-set=tis620 
+--default-collation=tis620_thai_ci 
+[myisam tis620 tis620_bin]
+--default-storage-engine=myisam
+--default-character-set=tis620 
+--default-collation=tis620_bin 
+[innodb tis620 tis620_bin]
+--default-storage-engine=innodb
+--default-character-set=tis620 
+--default-collation=tis620_bin 
+[falcon tis620 tis620_bin]
+--default-storage-engine=falcon
+--default-character-set=tis620 
+--default-collation=tis620_bin 
+[myisam euckr euckr_korean_ci]
+--default-storage-engine=myisam
+--default-character-set=euckr 
+--default-collation=euckr_korean_ci 
+[innodb euckr euckr_korean_ci]
+--default-storage-engine=innodb
+--default-character-set=euckr 
+--default-collation=euckr_korean_ci 
+[falcon euckr euckr_korean_ci]
+--default-storage-engine=falcon
+--default-character-set=euckr 
+--default-collation=euckr_korean_ci 
+[myisam euckr euckr_bin]
+--default-storage-engine=myisam
+--default-character-set=euckr 
+--default-collation=euckr_bin 
+[innodb euckr euckr_bin]
+--default-storage-engine=innodb
+--default-character-set=euckr 
+--default-collation=euckr_bin 
+[falcon euckr euckr_bin]
+--default-storage-engine=falcon
+--default-character-set=euckr 
+--default-collation=euckr_bin 
+[myisam koi8u koi8u_general_ci]
+--default-storage-engine=myisam
+--default-character-set=koi8u 
+--default-collation=koi8u_general_ci 
+[innodb koi8u koi8u_general_ci]
+--default-storage-engine=innodb
+--default-character-set=koi8u 
+--default-collation=koi8u_general_ci 
+[falcon koi8u koi8u_general_ci]
+--default-storage-engine=falcon
+--default-character-set=koi8u 
+--default-collation=koi8u_general_ci 
+[myisam koi8u koi8u_bin]
+--default-storage-engine=myisam
+--default-character-set=koi8u 
+--default-collation=koi8u_bin 
+[innodb koi8u koi8u_bin]
+--default-storage-engine=innodb
+--default-character-set=koi8u 
+--default-collation=koi8u_bin 
+[falcon koi8u koi8u_bin]
+--default-storage-engine=falcon
+--default-character-set=koi8u 
+--default-collation=koi8u_bin 
+[myisam gb2312 gb2312_chinese_ci]
+--default-storage-engine=myisam
+--default-character-set=gb2312 
+--default-collation=gb2312_chinese_ci 
+[innodb gb2312 gb2312_chinese_ci]
+--default-storage-engine=innodb
+--default-character-set=gb2312 
+--default-collation=gb2312_chinese_ci 
+[falcon gb2312 gb2312_chinese_ci]
+--default-storage-engine=falcon
+--default-character-set=gb2312 
+--default-collation=gb2312_chinese_ci 
+[myisam gb2312 gb2312_bin]
+--default-storage-engine=myisam
+--default-character-set=gb2312 
+--default-collation=gb2312_bin 
+[innodb gb2312 gb2312_bin]
+--default-storage-engine=innodb
+--default-character-set=gb2312 
+--default-collation=gb2312_bin 
+[falcon gb2312 gb2312_bin]
+--default-storage-engine=falcon
+--default-character-set=gb2312 
+--default-collation=gb2312_bin 
+[myisam greek greek_general_ci]
+--default-storage-engine=myisam
+--default-character-set=greek 
+--default-collation=greek_general_ci 
+[innodb greek greek_general_ci]
+--default-storage-engine=innodb
+--default-character-set=greek 
+--default-collation=greek_general_ci 
+[falcon greek greek_general_ci]
+--default-storage-engine=falcon
+--default-character-set=greek 
+--default-collation=greek_general_ci 
+[myisam greek greek_bin]
+--default-storage-engine=myisam
+--default-character-set=greek 
+--default-collation=greek_bin 
+[innodb greek greek_bin]
+--default-storage-engine=innodb
+--default-character-set=greek 
+--default-collation=greek_bin 
+[falcon greek greek_bin]
+--default-storage-engine=falcon
+--default-character-set=greek 
+--default-collation=greek_bin 
+[myisam cp1250 cp1250_general_ci]
+--default-storage-engine=myisam
+--default-character-set=cp1250 
+--default-collation=cp1250_general_ci 
+[innodb cp1250 cp1250_general_ci]
+--default-storage-engine=innodb
+--default-character-set=cp1250 
+--default-collation=cp1250_general_ci 
+[falcon cp1250 cp1250_general_ci]
+--default-storage-engine=falcon
+--default-character-set=cp1250 
+--default-collation=cp1250_general_ci 
+[myisam cp1250 cp1250_czech_cs]
+--default-storage-engine=myisam
+--default-character-set=cp1250 
+--default-collation=cp1250_czech_cs 
+[innodb cp1250 cp1250_czech_cs]
+--default-storage-engine=innodb
+--default-character-set=cp1250 
+--default-collation=cp1250_czech_cs 
+[falcon cp1250 cp1250_czech_cs]
+--default-storage-engine=falcon
+--default-character-set=cp1250 
+--default-collation=cp1250_czech_cs 
+[myisam cp1250 cp1250_croatian_ci]
+--default-storage-engine=myisam
+--default-character-set=cp1250 
+--default-collation=cp1250_croatian_ci 
+[innodb cp1250 cp1250_croatian_ci]
+--default-storage-engine=innodb
+--default-character-set=cp1250 
+--default-collation=cp1250_croatian_ci 
+[falcon cp1250 cp1250_croatian_ci]
+--default-storage-engine=falcon
+--default-character-set=cp1250 
+--default-collation=cp1250_croatian_ci 
+[myisam cp1250 cp1250_bin]
+--default-storage-engine=myisam
+--default-character-set=cp1250 
+--default-collation=cp1250_bin 
+[innodb cp1250 cp1250_bin]
+--default-storage-engine=innodb
+--default-character-set=cp1250 
+--default-collation=cp1250_bin 
+[falcon cp1250 cp1250_bin]
+--default-storage-engine=falcon
+--default-character-set=cp1250 
+--default-collation=cp1250_bin 
+[myisam cp1250 cp1250_polish_ci]
+--default-storage-engine=myisam
+--default-character-set=cp1250 
+--default-collation=cp1250_polish_ci 
+[innodb cp1250 cp1250_polish_ci]
+--default-storage-engine=innodb
+--default-character-set=cp1250 
+--default-collation=cp1250_polish_ci 
+[falcon cp1250 cp1250_polish_ci]
+--default-storage-engine=falcon
+--default-character-set=cp1250 
+--default-collation=cp1250_polish_ci 
+[myisam gbk gbk_chinese_ci]
+--default-storage-engine=myisam
+--default-character-set=gbk 
+--default-collation=gbk_chinese_ci 
+[innodb gbk gbk_chinese_ci]
+--default-storage-engine=innodb
+--default-character-set=gbk 
+--default-collation=gbk_chinese_ci 
+[falcon gbk gbk_chinese_ci]
+--default-storage-engine=falcon
+--default-character-set=gbk 
+--default-collation=gbk_chinese_ci 
+[myisam gbk gbk_bin]
+--default-storage-engine=myisam
+--default-character-set=gbk 
+--default-collation=gbk_bin 
+[innodb gbk gbk_bin]
+--default-storage-engine=innodb
+--default-character-set=gbk 
+--default-collation=gbk_bin 
+[falcon gbk gbk_bin]
+--default-storage-engine=falcon
+--default-character-set=gbk 
+--default-collation=gbk_bin 
+[myisam latin5 latin5_turkish_ci]
+--default-storage-engine=myisam
+--default-character-set=latin5 
+--default-collation=latin5_turkish_ci 
+[innodb latin5 latin5_turkish_ci]
+--default-storage-engine=innodb
+--default-character-set=latin5 
+--default-collation=latin5_turkish_ci 
+[falcon latin5 latin5_turkish_ci]
+--default-storage-engine=falcon
+--default-character-set=latin5 
+--default-collation=latin5_turkish_ci 
+[myisam latin5 latin5_bin]
+--default-storage-engine=myisam
+--default-character-set=latin5 
+--default-collation=latin5_bin 
+[innodb latin5 latin5_bin]
+--default-storage-engine=innodb
+--default-character-set=latin5 
+--default-collation=latin5_bin 
+[falcon latin5 latin5_bin]
+--default-storage-engine=falcon
+--default-character-set=latin5 
+--default-collation=latin5_bin 
+[myisam armscii8 armscii8_general_ci]
+--default-storage-engine=myisam
+--default-character-set=armscii8 
+--default-collation=armscii8_general_ci 
+[innodb armscii8 armscii8_general_ci]
+--default-storage-engine=innodb
+--default-character-set=armscii8 
+--default-collation=armscii8_general_ci 
+[falcon armscii8 armscii8_general_ci]
+--default-storage-engine=falcon
+--default-character-set=armscii8 
+--default-collation=armscii8_general_ci 
+[myisam armscii8 armscii8_bin]
+--default-storage-engine=myisam
+--default-character-set=armscii8 
+--default-collation=armscii8_bin 
+[innodb armscii8 armscii8_bin]
+--default-storage-engine=innodb
+--default-character-set=armscii8 
+--default-collation=armscii8_bin 
+[falcon armscii8 armscii8_bin]
+--default-storage-engine=falcon
+--default-character-set=armscii8 
+--default-collation=armscii8_bin 
+[myisam utf8mb3 utf8mb3_general_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_general_ci 
+[innodb utf8mb3 utf8mb3_general_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_general_ci 
+[falcon utf8mb3 utf8mb3_general_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_general_ci 
+[myisam utf8mb3 utf8mb3_bin]
+--default-storage-engine=myisam
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_bin 
+[innodb utf8mb3 utf8mb3_bin]
+--default-storage-engine=innodb
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_bin 
+[falcon utf8mb3 utf8mb3_bin]
+--default-storage-engine=falcon
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_bin 
+[myisam utf8mb3 utf8mb3_unicode_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_unicode_ci 
+[innodb utf8mb3 utf8mb3_unicode_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_unicode_ci 
+[falcon utf8mb3 utf8mb3_unicode_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_unicode_ci 
+[myisam utf8mb3 utf8mb3_icelandic_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_icelandic_ci 
+[innodb utf8mb3 utf8mb3_icelandic_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_icelandic_ci 
+[falcon utf8mb3 utf8mb3_icelandic_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_icelandic_ci 
+[myisam utf8mb3 utf8mb3_latvian_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_latvian_ci 
+[innodb utf8mb3 utf8mb3_latvian_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_latvian_ci 
+[falcon utf8mb3 utf8mb3_latvian_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_latvian_ci 
+[myisam utf8mb3 utf8mb3_romanian_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_romanian_ci 
+[innodb utf8mb3 utf8mb3_romanian_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_romanian_ci 
+[falcon utf8mb3 utf8mb3_romanian_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_romanian_ci 
+[myisam utf8mb3 utf8mb3_slovenian_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_slovenian_ci 
+[innodb utf8mb3 utf8mb3_slovenian_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_slovenian_ci 
+[falcon utf8mb3 utf8mb3_slovenian_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_slovenian_ci 
+[myisam utf8mb3 utf8mb3_polish_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_polish_ci 
+[innodb utf8mb3 utf8mb3_polish_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_polish_ci 
+[falcon utf8mb3 utf8mb3_polish_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_polish_ci 
+[myisam utf8mb3 utf8mb3_estonian_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_estonian_ci 
+[innodb utf8mb3 utf8mb3_estonian_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_estonian_ci 
+[falcon utf8mb3 utf8mb3_estonian_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_estonian_ci 
+[myisam utf8mb3 utf8mb3_spanish_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_spanish_ci 
+[innodb utf8mb3 utf8mb3_spanish_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_spanish_ci 
+[falcon utf8mb3 utf8mb3_spanish_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_spanish_ci 
+[myisam utf8mb3 utf8mb3_swedish_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_swedish_ci 
+[innodb utf8mb3 utf8mb3_swedish_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_swedish_ci 
+[falcon utf8mb3 utf8mb3_swedish_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_swedish_ci 
+[myisam utf8mb3 utf8mb3_turkish_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_turkish_ci 
+[innodb utf8mb3 utf8mb3_turkish_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_turkish_ci 
+[falcon utf8mb3 utf8mb3_turkish_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_turkish_ci 
+[myisam utf8mb3 utf8mb3_czech_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_czech_ci 
+[innodb utf8mb3 utf8mb3_czech_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_czech_ci 
+[falcon utf8mb3 utf8mb3_czech_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_czech_ci 
+[myisam utf8mb3 utf8mb3_danish_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_danish_ci 
+[innodb utf8mb3 utf8mb3_danish_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_danish_ci 
+[falcon utf8mb3 utf8mb3_danish_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_danish_ci 
+[myisam utf8mb3 utf8mb3_lithuanian_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_lithuanian_ci 
+[innodb utf8mb3 utf8mb3_lithuanian_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_lithuanian_ci 
+[falcon utf8mb3 utf8mb3_lithuanian_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_lithuanian_ci 
+[myisam utf8mb3 utf8mb3_slovak_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_slovak_ci 
+[innodb utf8mb3 utf8mb3_slovak_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_slovak_ci 
+[falcon utf8mb3 utf8mb3_slovak_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_slovak_ci 
+[myisam utf8mb3 utf8mb3_spanish2_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_spanish2_ci 
+[innodb utf8mb3 utf8mb3_spanish2_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_spanish2_ci 
+[falcon utf8mb3 utf8mb3_spanish2_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_spanish2_ci 
+[myisam utf8mb3 utf8mb3_roman_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_roman_ci 
+[innodb utf8mb3 utf8mb3_roman_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_roman_ci 
+[falcon utf8mb3 utf8mb3_roman_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_roman_ci 
+[myisam utf8mb3 utf8mb3_persian_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_persian_ci 
+[innodb utf8mb3 utf8mb3_persian_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_persian_ci 
+[falcon utf8mb3 utf8mb3_persian_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_persian_ci 
+[myisam utf8mb3 utf8mb3_esperanto_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_esperanto_ci 
+[innodb utf8mb3 utf8mb3_esperanto_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_esperanto_ci 
+[falcon utf8mb3 utf8mb3_esperanto_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_esperanto_ci 
+[myisam utf8mb3 utf8mb3_hungarian_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_hungarian_ci 
+[innodb utf8mb3 utf8mb3_hungarian_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_hungarian_ci 
+[falcon utf8mb3 utf8mb3_hungarian_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8mb3 
+--default-collation=utf8mb3_hungarian_ci 
+[myisam cp866 cp866_general_ci]
+--default-storage-engine=myisam
+--default-character-set=cp866 
+--default-collation=cp866_general_ci 
+[innodb cp866 cp866_general_ci]
+--default-storage-engine=innodb
+--default-character-set=cp866 
+--default-collation=cp866_general_ci 
+[falcon cp866 cp866_general_ci]
+--default-storage-engine=falcon
+--default-character-set=cp866 
+--default-collation=cp866_general_ci 
+[myisam cp866 cp866_bin]
+--default-storage-engine=myisam
+--default-character-set=cp866 
+--default-collation=cp866_bin 
+[innodb cp866 cp866_bin]
+--default-storage-engine=innodb
+--default-character-set=cp866 
+--default-collation=cp866_bin 
+[falcon cp866 cp866_bin]
+--default-storage-engine=falcon
+--default-character-set=cp866 
+--default-collation=cp866_bin 
+[myisam keybcs2 keybcs2_general_ci]
+--default-storage-engine=myisam
+--default-character-set=keybcs2 
+--default-collation=keybcs2_general_ci 
+[innodb keybcs2 keybcs2_general_ci]
+--default-storage-engine=innodb
+--default-character-set=keybcs2 
+--default-collation=keybcs2_general_ci 
+[falcon keybcs2 keybcs2_general_ci]
+--default-storage-engine=falcon
+--default-character-set=keybcs2 
+--default-collation=keybcs2_general_ci 
+[myisam keybcs2 keybcs2_bin]
+--default-storage-engine=myisam
+--default-character-set=keybcs2 
+--default-collation=keybcs2_bin 
+[innodb keybcs2 keybcs2_bin]
+--default-storage-engine=innodb
+--default-character-set=keybcs2 
+--default-collation=keybcs2_bin 
+[falcon keybcs2 keybcs2_bin]
+--default-storage-engine=falcon
+--default-character-set=keybcs2 
+--default-collation=keybcs2_bin 
+[myisam macce macce_general_ci]
+--default-storage-engine=myisam
+--default-character-set=macce 
+--default-collation=macce_general_ci 
+[innodb macce macce_general_ci]
+--default-storage-engine=innodb
+--default-character-set=macce 
+--default-collation=macce_general_ci 
+[falcon macce macce_general_ci]
+--default-storage-engine=falcon
+--default-character-set=macce 
+--default-collation=macce_general_ci 
+[myisam macce macce_bin]
+--default-storage-engine=myisam
+--default-character-set=macce 
+--default-collation=macce_bin 
+[innodb macce macce_bin]
+--default-storage-engine=innodb
+--default-character-set=macce 
+--default-collation=macce_bin 
+[falcon macce macce_bin]
+--default-storage-engine=falcon
+--default-character-set=macce 
+--default-collation=macce_bin 
+[myisam macroman macroman_general_ci]
+--default-storage-engine=myisam
+--default-character-set=macroman 
+--default-collation=macroman_general_ci 
+[innodb macroman macroman_general_ci]
+--default-storage-engine=innodb
+--default-character-set=macroman 
+--default-collation=macroman_general_ci 
+[falcon macroman macroman_general_ci]
+--default-storage-engine=falcon
+--default-character-set=macroman 
+--default-collation=macroman_general_ci 
+[myisam macroman macroman_bin]
+--default-storage-engine=myisam
+--default-character-set=macroman 
+--default-collation=macroman_bin 
+[innodb macroman macroman_bin]
+--default-storage-engine=innodb
+--default-character-set=macroman 
+--default-collation=macroman_bin 
+[falcon macroman macroman_bin]
+--default-storage-engine=falcon
+--default-character-set=macroman 
+--default-collation=macroman_bin 
+[myisam cp852 cp852_general_ci]
+--default-storage-engine=myisam
+--default-character-set=cp852 
+--default-collation=cp852_general_ci 
+[innodb cp852 cp852_general_ci]
+--default-storage-engine=innodb
+--default-character-set=cp852 
+--default-collation=cp852_general_ci 
+[falcon cp852 cp852_general_ci]
+--default-storage-engine=falcon
+--default-character-set=cp852 
+--default-collation=cp852_general_ci 
+[myisam cp852 cp852_bin]
+--default-storage-engine=myisam
+--default-character-set=cp852 
+--default-collation=cp852_bin 
+[innodb cp852 cp852_bin]
+--default-storage-engine=innodb
+--default-character-set=cp852 
+--default-collation=cp852_bin 
+[falcon cp852 cp852_bin]
+--default-storage-engine=falcon
+--default-character-set=cp852 
+--default-collation=cp852_bin 
+[myisam latin7 latin7_estonian_cs]
+--default-storage-engine=myisam
+--default-character-set=latin7 
+--default-collation=latin7_estonian_cs 
+[innodb latin7 latin7_estonian_cs]
+--default-storage-engine=innodb
+--default-character-set=latin7 
+--default-collation=latin7_estonian_cs 
+[falcon latin7 latin7_estonian_cs]
+--default-storage-engine=falcon
+--default-character-set=latin7 
+--default-collation=latin7_estonian_cs 
+[myisam latin7 latin7_general_ci]
+--default-storage-engine=myisam
+--default-character-set=latin7 
+--default-collation=latin7_general_ci 
+[innodb latin7 latin7_general_ci]
+--default-storage-engine=innodb
+--default-character-set=latin7 
+--default-collation=latin7_general_ci 
+[falcon latin7 latin7_general_ci]
+--default-storage-engine=falcon
+--default-character-set=latin7 
+--default-collation=latin7_general_ci 
+[myisam latin7 latin7_general_cs]
+--default-storage-engine=myisam
+--default-character-set=latin7 
+--default-collation=latin7_general_cs 
+[innodb latin7 latin7_general_cs]
+--default-storage-engine=innodb
+--default-character-set=latin7 
+--default-collation=latin7_general_cs 
+[falcon latin7 latin7_general_cs]
+--default-storage-engine=falcon
+--default-character-set=latin7 
+--default-collation=latin7_general_cs 
+[myisam latin7 latin7_bin]
+--default-storage-engine=myisam
+--default-character-set=latin7 
+--default-collation=latin7_bin 
+[innodb latin7 latin7_bin]
+--default-storage-engine=innodb
+--default-character-set=latin7 
+--default-collation=latin7_bin 
+[falcon latin7 latin7_bin]
+--default-storage-engine=falcon
+--default-character-set=latin7 
+--default-collation=latin7_bin 
+[myisam utf8 utf8_general_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_general_ci 
+[innodb utf8 utf8_general_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_general_ci 
+[falcon utf8 utf8_general_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_general_ci 
+[myisam utf8 utf8_bin]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_bin 
+[innodb utf8 utf8_bin]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_bin 
+[falcon utf8 utf8_bin]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_bin 
+[myisam utf8 utf8_unicode_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_unicode_ci 
+[innodb utf8 utf8_unicode_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_unicode_ci 
+[falcon utf8 utf8_unicode_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_unicode_ci 
+[myisam utf8 utf8_icelandic_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_icelandic_ci 
+[innodb utf8 utf8_icelandic_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_icelandic_ci 
+[falcon utf8 utf8_icelandic_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_icelandic_ci 
+[myisam utf8 utf8_latvian_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_latvian_ci 
+[innodb utf8 utf8_latvian_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_latvian_ci 
+[falcon utf8 utf8_latvian_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_latvian_ci 
+[myisam utf8 utf8_romanian_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_romanian_ci 
+[innodb utf8 utf8_romanian_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_romanian_ci 
+[falcon utf8 utf8_romanian_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_romanian_ci 
+[myisam utf8 utf8_slovenian_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_slovenian_ci 
+[innodb utf8 utf8_slovenian_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_slovenian_ci 
+[falcon utf8 utf8_slovenian_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_slovenian_ci 
+[myisam utf8 utf8_polish_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_polish_ci 
+[innodb utf8 utf8_polish_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_polish_ci 
+[falcon utf8 utf8_polish_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_polish_ci 
+[myisam utf8 utf8_estonian_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_estonian_ci 
+[innodb utf8 utf8_estonian_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_estonian_ci 
+[falcon utf8 utf8_estonian_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_estonian_ci 
+[myisam utf8 utf8_spanish_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_spanish_ci 
+[innodb utf8 utf8_spanish_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_spanish_ci 
+[falcon utf8 utf8_spanish_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_spanish_ci 
+[myisam utf8 utf8_swedish_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_swedish_ci 
+[innodb utf8 utf8_swedish_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_swedish_ci 
+[falcon utf8 utf8_swedish_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_swedish_ci 
+[myisam utf8 utf8_turkish_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_turkish_ci 
+[innodb utf8 utf8_turkish_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_turkish_ci 
+[falcon utf8 utf8_turkish_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_turkish_ci 
+[myisam utf8 utf8_czech_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_czech_ci 
+[innodb utf8 utf8_czech_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_czech_ci 
+[falcon utf8 utf8_czech_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_czech_ci 
+[myisam utf8 utf8_danish_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_danish_ci 
+[innodb utf8 utf8_danish_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_danish_ci 
+[falcon utf8 utf8_danish_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_danish_ci 
+[myisam utf8 utf8_lithuanian_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_lithuanian_ci 
+[innodb utf8 utf8_lithuanian_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_lithuanian_ci 
+[falcon utf8 utf8_lithuanian_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_lithuanian_ci 
+[myisam utf8 utf8_slovak_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_slovak_ci 
+[innodb utf8 utf8_slovak_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_slovak_ci 
+[falcon utf8 utf8_slovak_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_slovak_ci 
+[myisam utf8 utf8_spanish2_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_spanish2_ci 
+[innodb utf8 utf8_spanish2_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_spanish2_ci 
+[falcon utf8 utf8_spanish2_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_spanish2_ci 
+[myisam utf8 utf8_roman_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_roman_ci 
+[innodb utf8 utf8_roman_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_roman_ci 
+[falcon utf8 utf8_roman_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_roman_ci 
+[myisam utf8 utf8_persian_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_persian_ci 
+[innodb utf8 utf8_persian_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_persian_ci 
+[falcon utf8 utf8_persian_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_persian_ci 
+[myisam utf8 utf8_esperanto_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_esperanto_ci 
+[innodb utf8 utf8_esperanto_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_esperanto_ci 
+[falcon utf8 utf8_esperanto_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_esperanto_ci 
+[myisam utf8 utf8_hungarian_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_hungarian_ci 
+[innodb utf8 utf8_hungarian_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_hungarian_ci 
+[falcon utf8 utf8_hungarian_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_hungarian_ci 
+[myisam utf8 utf8_sinhala_ci]
+--default-storage-engine=myisam
+--default-character-set=utf8 
+--default-collation=utf8_sinhala_ci 
+[innodb utf8 utf8_sinhala_ci]
+--default-storage-engine=innodb
+--default-character-set=utf8 
+--default-collation=utf8_sinhala_ci 
+[falcon utf8 utf8_sinhala_ci]
+--default-storage-engine=falcon
+--default-character-set=utf8 
+--default-collation=utf8_sinhala_ci 
+[myisam cp1251 cp1251_bulgarian_ci]
+--default-storage-engine=myisam
+--default-character-set=cp1251 
+--default-collation=cp1251_bulgarian_ci 
+[innodb cp1251 cp1251_bulgarian_ci]
+--default-storage-engine=innodb
+--default-character-set=cp1251 
+--default-collation=cp1251_bulgarian_ci 
+[falcon cp1251 cp1251_bulgarian_ci]
+--default-storage-engine=falcon
+--default-character-set=cp1251 
+--default-collation=cp1251_bulgarian_ci 
+[myisam cp1251 cp1251_ukrainian_ci]
+--default-storage-engine=myisam
+--default-character-set=cp1251 
+--default-collation=cp1251_ukrainian_ci 
+[innodb cp1251 cp1251_ukrainian_ci]
+--default-storage-engine=innodb
+--default-character-set=cp1251 
+--default-collation=cp1251_ukrainian_ci 
+[falcon cp1251 cp1251_ukrainian_ci]
+--default-storage-engine=falcon
+--default-character-set=cp1251 
+--default-collation=cp1251_ukrainian_ci 
+[myisam cp1251 cp1251_bin]
+--default-storage-engine=myisam
+--default-character-set=cp1251 
+--default-collation=cp1251_bin 
+[innodb cp1251 cp1251_bin]
+--default-storage-engine=innodb
+--default-character-set=cp1251 
+--default-collation=cp1251_bin 
+[falcon cp1251 cp1251_bin]
+--default-storage-engine=falcon
+--default-character-set=cp1251 
+--default-collation=cp1251_bin 
+[myisam cp1251 cp1251_general_ci]
+--default-storage-engine=myisam
+--default-character-set=cp1251 
+--default-collation=cp1251_general_ci 
+[innodb cp1251 cp1251_general_ci]
+--default-storage-engine=innodb
+--default-character-set=cp1251 
+--default-collation=cp1251_general_ci 
+[falcon cp1251 cp1251_general_ci]
+--default-storage-engine=falcon
+--default-character-set=cp1251 
+--default-collation=cp1251_general_ci 
+[myisam cp1251 cp1251_general_cs]
+--default-storage-engine=myisam
+--default-character-set=cp1251 
+--default-collation=cp1251_general_cs 
+[innodb cp1251 cp1251_general_cs]
+--default-storage-engine=innodb
+--default-character-set=cp1251 
+--default-collation=cp1251_general_cs 
+[falcon cp1251 cp1251_general_cs]
+--default-storage-engine=falcon
+--default-character-set=cp1251 
+--default-collation=cp1251_general_cs 
+[myisam cp1256 cp1256_general_ci]
+--default-storage-engine=myisam
+--default-character-set=cp1256 
+--default-collation=cp1256_general_ci 
+[innodb cp1256 cp1256_general_ci]
+--default-storage-engine=innodb
+--default-character-set=cp1256 
+--default-collation=cp1256_general_ci 
+[falcon cp1256 cp1256_general_ci]
+--default-storage-engine=falcon
+--default-character-set=cp1256 
+--default-collation=cp1256_general_ci 
+[myisam cp1256 cp1256_bin]
+--default-storage-engine=myisam
+--default-character-set=cp1256 
+--default-collation=cp1256_bin 
+[innodb cp1256 cp1256_bin]
+--default-storage-engine=innodb
+--default-character-set=cp1256 
+--default-collation=cp1256_bin 
+[falcon cp1256 cp1256_bin]
+--default-storage-engine=falcon
+--default-character-set=cp1256 
+--default-collation=cp1256_bin 
+[myisam cp1257 cp1257_lithuanian_ci]
+--default-storage-engine=myisam
+--default-character-set=cp1257 
+--default-collation=cp1257_lithuanian_ci 
+[innodb cp1257 cp1257_lithuanian_ci]
+--default-storage-engine=innodb
+--default-character-set=cp1257 
+--default-collation=cp1257_lithuanian_ci 
+[falcon cp1257 cp1257_lithuanian_ci]
+--default-storage-engine=falcon
+--default-character-set=cp1257 
+--default-collation=cp1257_lithuanian_ci 
+[myisam cp1257 cp1257_bin]
+--default-storage-engine=myisam
+--default-character-set=cp1257 
+--default-collation=cp1257_bin 
+[innodb cp1257 cp1257_bin]
+--default-storage-engine=innodb
+--default-character-set=cp1257 
+--default-collation=cp1257_bin 
+[falcon cp1257 cp1257_bin]
+--default-storage-engine=falcon
+--default-character-set=cp1257 
+--default-collation=cp1257_bin 
+[myisam cp1257 cp1257_general_ci]
+--default-storage-engine=myisam
+--default-character-set=cp1257 
+--default-collation=cp1257_general_ci 
+[innodb cp1257 cp1257_general_ci]
+--default-storage-engine=innodb
+--default-character-set=cp1257 
+--default-collation=cp1257_general_ci 
+[falcon cp1257 cp1257_general_ci]
+--default-storage-engine=falcon
+--default-character-set=cp1257 
+--default-collation=cp1257_general_ci 
+[myisam geostd8 geostd8_general_ci]
+--default-storage-engine=myisam
+--default-character-set=geostd8 
+--default-collation=geostd8_general_ci 
+[innodb geostd8 geostd8_general_ci]
+--default-storage-engine=innodb
+--default-character-set=geostd8 
+--default-collation=geostd8_general_ci 
+[falcon geostd8 geostd8_general_ci]
+--default-storage-engine=falcon
+--default-character-set=geostd8 
+--default-collation=geostd8_general_ci 
+[myisam geostd8 geostd8_bin]
+--default-storage-engine=myisam
+--default-character-set=geostd8 
+--default-collation=geostd8_bin 
+[innodb geostd8 geostd8_bin]
+--default-storage-engine=innodb
+--default-character-set=geostd8 
+--default-collation=geostd8_bin 
+[falcon geostd8 geostd8_bin]
+--default-storage-engine=falcon
+--default-character-set=geostd8 
+--default-collation=geostd8_bin 
+[myisam cp932 cp932_japanese_ci]
+--default-storage-engine=myisam
+--default-character-set=cp932 
+--default-collation=cp932_japanese_ci 
+[innodb cp932 cp932_japanese_ci]
+--default-storage-engine=innodb
+--default-character-set=cp932 
+--default-collation=cp932_japanese_ci 
+[falcon cp932 cp932_japanese_ci]
+--default-storage-engine=falcon
+--default-character-set=cp932 
+--default-collation=cp932_japanese_ci 
+[myisam cp932 cp932_bin]
+--default-storage-engine=myisam
+--default-character-set=cp932 
+--default-collation=cp932_bin 
+[innodb cp932 cp932_bin]
+--default-storage-engine=innodb
+--default-character-set=cp932 
+--default-collation=cp932_bin 
+[falcon cp932 cp932_bin]
+--default-storage-engine=falcon
+--default-character-set=cp932 
+--default-collation=cp932_bin 
+[myisam eucjpms eucjpms_japanese_ci]
+--default-storage-engine=myisam
+--default-character-set=eucjpms 
+--default-collation=eucjpms_japanese_ci 
+[innodb eucjpms eucjpms_japanese_ci]
+--default-storage-engine=innodb
+--default-character-set=eucjpms 
+--default-collation=eucjpms_japanese_ci 
+[falcon eucjpms eucjpms_japanese_ci]
+--default-storage-engine=falcon
+--default-character-set=eucjpms 
+--default-collation=eucjpms_japanese_ci 
+[myisam eucjpms eucjpms_bin]
+--default-storage-engine=myisam
+--default-character-set=eucjpms 
+--default-collation=eucjpms_bin 
+[innodb eucjpms eucjpms_bin]
+--default-storage-engine=innodb
+--default-character-set=eucjpms 
+--default-collation=eucjpms_bin 
+[falcon eucjpms eucjpms_bin]
+--default-storage-engine=falcon
+--default-character-set=eucjpms 
+--default-collation=eucjpms_bin 

=== added directory 'mysql-test/suite/backup_charsets/include'
=== added file 'mysql-test/suite/backup_charsets/include/charset.inc'
--- a/mysql-test/suite/backup_charsets/include/charset.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/backup_charsets/include/charset.inc	2008-08-15 22:15:12 +0000
@@ -0,0 +1,15 @@
+###############################################################################
+# Author: Hema
+# Date: 2008-04-01
+# Purpose:To define the charset and collate variable.
+###############################################################################
+
+
+--replace_column 2 #
+SHOW VARIABLES LIKE 'character_set_database';
+let $cset=query_get_value(SHOW VARIABLES LIKE 'character_set_database', Value,1);
+
+--replace_column 2 #
+SHOW VARIABLES LIKE 'collation_database';
+let $coll=query_get_value(SHOW VARIABLES LIKE 'collation_database', Value, 1);
+

=== added directory 'mysql-test/suite/backup_charsets/r'
=== added file 'mysql-test/suite/backup_charsets/r/backup_datatypes.result'
--- a/mysql-test/suite/backup_charsets/r/backup_datatypes.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/backup_charsets/r/backup_datatypes.result	2008-08-15 22:15:12 +0000
@@ -0,0 +1,157 @@
+SHOW VARIABLES LIKE 'storage_engine';
+Variable_name	Value
+storage_engine	#
+SHOW VARIABLES LIKE 'character_set_database';
+Variable_name	Value
+character_set_database	#
+SHOW VARIABLES LIKE 'collation_database';
+Variable_name	Value
+collation_database	#
+
+starting the test for backup
+
+DROP DATABASE IF EXISTS bup_datatype;
+SET NAMES cset;
+CREATE DATABASE bup_datatype;
+USE bup_datatype;
+CREATE TABLE d1(
+rint INT,
+tint TINYINT,
+sint SMALLINT,
+bint BIGINT,
+mint MEDIUMINT,
+name CHAR(100),
+city  VARCHAR(100),
+fl FLOAT(7,4),
+pers DECIMAL(8,2),
+sal DOUBLE,
+colours SET('red','blue','yellow'),
+continent ENUM('Asia', 'Europe','Africa','Antartica'),
+ts TIMESTAMP DEFAULT 0,
+dob DATE,
+y YEAR
+);
+creating table with blob and text columns
+CREATE TABLE d2(
+region TEXT,
+summary LONGTEXT,
+data BLOB,
+details MEDIUMBLOB,
+queries TINYTEXT,
+query2 TINYBLOB,
+extract LONGBLOB,
+paras MEDIUMTEXT
+);
+INSERT INTO d1 VALUES
+(785,127,7288,278829899,3777,'testing1','sweden','678.299',200.23,829899.909,
+'red','Asia','2008-06-01 16:23:30','1984-09-08','1984');
+INSERT INTO d2 VALUES
+('xxxxxxxx','Testofonline backup','aaaaaaaaaa','bbbbbbbbbbb','hhhhhhhhhhh',
+'kkkkkkkkkkkkk','mmmmmmmmmmmm','onlinebackup1');
+UPDATE d2 SET extract=repeat('z',100);
+SELECT * FROM d1;;
+rint	785
+tint	127
+sint	7288
+bint	278829899
+mint	3777
+name	testing1
+city	sweden
+fl	678.2990
+pers	200.23
+sal	829899.909
+colours	red
+continent	Asia
+ts	2008-06-01 16:23:30
+dob	1984-09-08
+y	1984
+SELECT * FROM d2;
+region	summary	data	details	queries	query2	extract	paras
+xxxxxxxx	Testofonline backup	aaaaaaaaaa	bbbbbbbbbbb	hhhhhhhhhhh	kkkkkkkkkkkkk	zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz	onlinebackup1
+DESCRIBE d1;
+Field	Type	Null	Key	Default	Extra
+rint	int(11)	YES		NULL	
+tint	tinyint(4)	YES		NULL	
+sint	smallint(6)	YES		NULL	
+bint	bigint(20)	YES		NULL	
+mint	mediumint(9)	YES		NULL	
+name	char(100)	YES		NULL	
+city	varchar(100)	YES		NULL	
+fl	float(7,4)	YES		NULL	
+pers	decimal(8,2)	YES		NULL	
+sal	double	YES		NULL	
+colours	set('red','blue','yellow')	YES		NULL	
+continent	enum('Asia','Europe','Africa','Antartica')	YES		NULL	
+ts	timestamp	NO		0000-00-00 00:00:00	
+dob	date	YES		NULL	
+y	year(4)	YES		NULL	
+DESCRIBE d2;
+Field	Type	Null	Key	Default	Extra
+region	text	YES		NULL	
+summary	longtext	YES		NULL	
+data	blob	YES		NULL	
+details	mediumblob	YES		NULL	
+queries	tinytext	YES		NULL	
+query2	tinyblob	YES		NULL	
+extract	longblob	YES		NULL	
+paras	mediumtext	YES		NULL	
+**backup data**
+
+BACKUP DATABASE bup_datatype TO 'bup_datatype.bak';
+backup_id
+#
+DROP DATABASE bup_datatype;
+**Restore**
+RESTORE FROM 'bup_datatype.bak';
+backup_id
+#
+DESCRIBE d1;
+Field	Type	Null	Key	Default	Extra
+rint	int(11)	YES		NULL	
+tint	tinyint(4)	YES		NULL	
+sint	smallint(6)	YES		NULL	
+bint	bigint(20)	YES		NULL	
+mint	mediumint(9)	YES		NULL	
+name	char(100)	YES		NULL	
+city	varchar(100)	YES		NULL	
+fl	float(7,4)	YES		NULL	
+pers	decimal(8,2)	YES		NULL	
+sal	double	YES		NULL	
+colours	set('red','blue','yellow')	YES		NULL	
+continent	enum('Asia','Europe','Africa','Antartica')	YES		NULL	
+ts	timestamp	NO		0000-00-00 00:00:00	
+dob	date	YES		NULL	
+y	year(4)	YES		NULL	
+DESCRIBE d2;
+Field	Type	Null	Key	Default	Extra
+region	text	YES		NULL	
+summary	longtext	YES		NULL	
+data	blob	YES		NULL	
+details	mediumblob	YES		NULL	
+queries	tinytext	YES		NULL	
+query2	tinyblob	YES		NULL	
+extract	longblob	YES		NULL	
+paras	mediumtext	YES		NULL	
+SELECT * FROM d1;;
+rint	785
+tint	127
+sint	7288
+bint	278829899
+mint	3777
+name	testing1
+city	sweden
+fl	678.2990
+pers	200.23
+sal	829899.909
+colours	red
+continent	Asia
+ts	2008-06-01 16:23:30
+dob	1984-09-08
+y	1984
+SELECT * FROM d2;
+region	summary	data	details	queries	query2	extract	paras
+xxxxxxxx	Testofonline backup	aaaaaaaaaa	bbbbbbbbbbb	hhhhhhhhhhh	kkkkkkkkkkkkk	zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz	onlinebackup1
+
+***  DROP bup_datatype DATABASE ****
+
+DROP DATABASE bup_datatype;

=== added file 'mysql-test/suite/backup_charsets/r/backup_functions.result'
--- a/mysql-test/suite/backup_charsets/r/backup_functions.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/backup_charsets/r/backup_functions.result	2008-08-15 22:15:12 +0000
@@ -0,0 +1,536 @@
+SHOW VARIABLES LIKE 'character_set_database';
+Variable_name	Value
+character_set_database	#
+SHOW VARIABLES LIKE 'collation_database';
+Variable_name	Value
+collation_database	#
+SET NAMES cset;
+SHOW VARIABLES LIKE 'storage_engine';
+Variable_name	Value
+storage_engine	#
+
+starting the test for backup
+
+DROP DATABASE IF EXISTS bup_sfs;
+CREATE DATABASE bup_sfs;
+USE bup_sfs;
+SET SQL_MODE=TRADITIONAL;
+Creating table
+CREATE TABLE bup_sfs.players(
+playerno INT not null PRIMARY KEY,
+name CHAR(10),
+Bdate DATE,
+sex CHAR(2),
+joined YEAR
+);
+CREATE TABLE bup_sfs.teams(
+teamno INT NOT NULL PRIMARY KEY,
+playerno INT,
+division CHAR(10),
+FOREIGN KEY(playerno) REFERENCES players(playerno)
+);
+CREATE TABLE bup_sfs.matches(
+Matchno INT NOT NULL PRIMARY KEY,
+teamno INT ,
+playerno INT,
+won INT,
+lost INT,
+FOREIGN KEY(teamno) REFERENCES teams(teamno),
+FOREIGN KEY(playerno) REFERENCES players(playerno)
+);
+CREATE TABLE bup_sfs.penalties(
+paymentno INT not null PRIMARY KEY,
+playerno INT,
+paymentdate DATE,
+amount FLOAT,
+FOREIGN KEY(playerno) REFERENCES players(playerno)
+);
+Load Data in tables
+INSERT INTO bup_sfs.players VALUES
+(1,'aa1','1948-10-09','M','1960'),(2,'aa2','1950-05-09','M','1965'),
+(3,'aa3','1953-10-10','F','1970'),(4,'aa4','1970-10-19','M','1985'),
+(5,'aa5','1972-04-28','F','1994'),(6,'aa6','1945-01-26','M','1960');
+INSERT INTO bup_sfs.teams VALUES(1,3,'first'),(2,4,'division');
+INSERT INTO bup_sfs.matches VALUES
+(1,1,2,3,1),(2,2,1,4,2),(3,1,5,0,1),(4,2,4,3,0),(5,2,5,2,2),
+(6,1,3,3,1),(7,2,1,4,2),(8,1,5,0,1),(9,2,2,3,0),(10,2,2,2,2);
+INSERT INTO bup_sfs.penalties VALUES
+(1,5,'1980-10-10',100.23),(2,3,'1967-12-10',123.23),
+(3,3,'1983-05-25',25.25), (4,4,'1981-11-10',210.23) ,
+(5,5,'1980-12-12',300), (6,1,'1984-07-02',10),
+(7,1,'1985-10-10',23.90);
+CREATE FUNCTION number_of_players() RETURNS INTEGER
+BEGIN
+RETURN (SELECT COUNT(*) FROM players);
+END;
+||
+CREATE FUNCTION number_of_players1() RETURNS INTEGER
+BEGIN
+RETURN (SELECT COUNT(*) FROM players WHERE playerno > 2);
+END;
+||
+CREATE FUNCTION fcount() RETURNS INTEGER
+BEGIN
+DECLARE v_out INT;
+SELECT count(*) FROM matches INTO v_out;
+RETURN v_out;
+END;
+||
+CREATE FUNCTION dollars(amount FLOAT(7,2)) RETURNS FLOAT(7,2)
+BEGIN
+RETURN amount * (1/0.8);
+END;
+||
+SELECT number_of_players();
+number_of_players()
+6
+SELECT number_of_players1();
+number_of_players1()
+4
+SELECT fcount();
+fcount()
+10
+SELECT paymentno,amount, dollars(amount) FROM penalties;
+paymentno	amount	dollars(amount)
+1	100.23	125.29
+2	123.23	154.04
+3	25.25	31.56
+4	210.23	262.79
+5	300	375.00
+6	10	12.50
+7	23.9	29.87
+creating stored functions which is not dependent on table
+CREATE FUNCTION square_area(side tinyINT)
+RETURNS FLOAT
+RETURN side * side;
+SELECT square_area(11);
+square_area(11)
+121
+describe players;
+Field	Type	Null	Key	Default	Extra
+playerno	int(11)	NO	PRI	NULL	
+name	char(10)	YES		NULL	
+Bdate	date	YES		NULL	
+sex	char(2)	YES		NULL	
+joined	year(4)	YES		NULL	
+describe penalties;
+Field	Type	Null	Key	Default	Extra
+paymentno	int(11)	NO	PRI	NULL	
+playerno	int(11)	YES	MUL	NULL	
+paymentdate	date	YES		NULL	
+amount	float	YES		NULL	
+SHOW FUNCTION STATUS;;
+Db	bup_sfs
+Name	dollars
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sfs
+Name	fcount
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sfs
+Name	number_of_players
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sfs
+Name	number_of_players1
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sfs
+Name	square_area
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+backup data
+BACKUP DATABASE bup_sfs TO 'bup_sfs.bak';
+backup_id
+#
+dropping  database.
+DROP DATABASE bup_sfs;
+Restoring Database
+RESTORE FROM 'bup_sfs.bak';
+backup_id
+#
+SELECT @@SQL_MODE;
+@@SQL_MODE
+STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER
+describe penalties;
+Field	Type	Null	Key	Default	Extra
+paymentno	int(11)	NO	PRI	NULL	
+playerno	int(11)	YES	MUL	NULL	
+paymentdate	date	YES		NULL	
+amount	float	YES		NULL	
+describe matches;
+Field	Type	Null	Key	Default	Extra
+Matchno	int(11)	NO	PRI	NULL	
+teamno	int(11)	YES	MUL	NULL	
+playerno	int(11)	YES	MUL	NULL	
+won	int(11)	YES		NULL	
+lost	int(11)	YES		NULL	
+SHOW FUNCTION STATUS;;
+Db	bup_sfs
+Name	dollars
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sfs
+Name	fcount
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sfs
+Name	number_of_players
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sfs
+Name	number_of_players1
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sfs
+Name	square_area
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+INSERT INTO bup_sfs.players VALUES
+(57,'brown','1971-08-17','M','1985'),(95,'Miller','1963-05-14','M','1972');
+INSERT INTO bup_sfs.matches VALUES(11,2,6,0,3);
+SELECT square_area(12);
+square_area(12)
+144
+SELECT number_of_players();
+number_of_players()
+8
+SELECT number_of_players1();
+number_of_players1()
+6
+SELECT fcount();
+fcount()
+11
+SELECT paymentno,amount, dollars(amount) FROM penalties WHERE paymentno<=3;
+paymentno	amount	dollars(amount)
+1	100.23	125.29
+2	123.23	154.04
+3	25.25	31.56
+DROP DATABASE bup_sfs;
+change SQL_MODE and then perform RESTORE operation
+SET SQL_MODE=ANSI;
+RESTORE FROM 'bup_sfs.bak';
+backup_id
+#
+SELECT @@SQL_MODE;
+@@SQL_MODE
+REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI
+SHOW FUNCTION STATUS;;
+Db	bup_sfs
+Name	dollars
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sfs
+Name	fcount
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sfs
+Name	number_of_players
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sfs
+Name	number_of_players1
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sfs
+Name	square_area
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+SELECT square_area(13);
+square_area(13)
+169
+SELECT number_of_players();
+number_of_players()
+6
+SELECT fcount();
+fcount()
+10
+DROP DATABASE bup_sfs;
+change SQL_MODE and then perform RESTORE
+SET SQL_MODE=MAXDB;
+RESTORE FROM 'bup_sfs.bak';
+backup_id
+#
+SELECT @@SQL_MODE;
+@@SQL_MODE
+PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER
+SHOW FUNCTION STATUS;;
+Db	bup_sfs
+Name	dollars
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sfs
+Name	fcount
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sfs
+Name	number_of_players
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sfs
+Name	number_of_players1
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sfs
+Name	square_area
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+SELECT square_area(14);
+square_area(14)
+196
+SELECT number_of_players();
+number_of_players()
+6
+SELECT fcount();
+fcount()
+10
+SELECT paymentno,amount, dollars(amount) FROM penalties WHERE paymentno >=3;
+paymentno	amount	dollars(amount)
+3	25.25	31.56
+4	210.23	262.79
+5	300	375.00
+6	10	12.50
+7	23.9	29.87
+DROP DATABASE bup_sfs;
+change SQL_MODE and then perform RESTORE
+SET SQL_MODE=' ';
+RESTORE FROM 'bup_sfs.bak';
+backup_id
+#
+SELECT @@SQL_MODE;
+@@SQL_MODE
+
+showing objects and create statements
+describe players;
+Field	Type	Null	Key	Default	Extra
+playerno	int(11)	NO	PRI	NULL	
+name	char(10)	YES		NULL	
+Bdate	date	YES		NULL	
+sex	char(2)	YES		NULL	
+joined	year(4)	YES		NULL	
+describe matches;
+Field	Type	Null	Key	Default	Extra
+Matchno	int(11)	NO	PRI	NULL	
+teamno	int(11)	YES	MUL	NULL	
+playerno	int(11)	YES	MUL	NULL	
+won	int(11)	YES		NULL	
+lost	int(11)	YES		NULL	
+SHOW FUNCTION STATUS;;
+Db	bup_sfs
+Name	dollars
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sfs
+Name	fcount
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sfs
+Name	number_of_players
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sfs
+Name	number_of_players1
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sfs
+Name	square_area
+Type	FUNCTION
+Definer	#
+Modified	#
+Created	#
+Security_type	DEFINER
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+SELECT square_area(20);
+square_area(20)
+400
+SELECT number_of_players();
+number_of_players()
+6
+SELECT fcount();
+fcount()
+10
+SELECT paymentno,amount, dollars(amount) FROM penalties;
+paymentno	amount	dollars(amount)
+1	100.23	125.29
+2	123.23	154.04
+3	25.25	31.56
+4	210.23	262.79
+5	300	375.00
+6	10	12.50
+7	23.9	29.87
+
+***  DROP bup_sfs DATABASE ****
+
+DROP DATABASE bup_sfs;

=== added file 'mysql-test/suite/backup_charsets/r/backup_partitions.result'
--- a/mysql-test/suite/backup_charsets/r/backup_partitions.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/backup_charsets/r/backup_partitions.result	2008-08-15 22:15:12 +0000
@@ -0,0 +1,479 @@
+SHOW VARIABLES LIKE 'storage_engine';
+Variable_name	Value
+storage_engine	#
+SHOW VARIABLES LIKE 'character_set_database';
+Variable_name	Value
+character_set_database	#
+SHOW VARIABLES LIKE 'collation_database';
+Variable_name	Value
+collation_database	#
+
+starting the test for backup
+
+DROP DATABASE IF EXISTS partitions;
+Bug #34391 Character sets: crash if char(), utf32, innodb
+Bug #33566 Backup: crash with partitions and Falcon
+Bug #37551 Junk detected in data contents sometimes when utf8mb3
+character set is used.
+Bug #37554 Use of character set and collate as 'filename' shows
+unusual behaviour.
+Bug #35499 View when created with swe7 character set fails.
+Bug#38784 Mysql server crash if table is altered by partition changes.
+SET NAMES cset;
+CREATE DATABASE partitions;
+USE partitions;
+*****Creating table with range partition*********
+CREATE TABLE `range`(
+ID INT NOT NULL,
+NAME CHAR(20),
+AGE TINYINT,
+DOB DATE,
+SAL FLOAT,
+PRIMARY KEY(DOB)) PARTITION BY RANGE(Year(DOB))(
+PARTITION P0 values less than (1970),
+PARTITION P1 values less than (1980),
+PARTITION P2 values less than (1990),
+PARTITION P3 values less than (2000),
+PARTITION P4 values less than maxvalue);
+loading data
+INSERT INTO `range`VALUES
+(10,'aa','20','1988-12-19',2345.89),(11,'bb',31,'1977-10-19',6009.89),
+(12,'cc',78,'1945-09-12',3897),(13,'dd',12,'1994-09-18',7892.78),
+(14,'ee',45,'1960-12-23',7845.90),(15,'ff',25,'1984-02-07',3500.89);
+select data
+SELECT * FROM `range` ORDER BY DOB;
+ID	NAME	AGE	DOB	SAL
+12	cc	78	1945-09-12	3897
+14	ee	45	1960-12-23	7845.9
+11	bb	31	1977-10-19	6009.89
+15	ff	25	1984-02-07	3500.89
+10	aa	20	1988-12-19	2345.89
+13	dd	12	1994-09-18	7892.78
+SELECT COUNT(*) FROM `range`;
+COUNT(*)
+6
+
+******Creating table partition with List**************
+CREATE TABLE `left`(`numeric` INT, `char` CHAR(20))
+PARTITION BY LIST (`numeric`)
+(
+PARTITION p0 VALUES IN (1,3,5),
+PARTITION p1 VALUES IN (2,4,6)
+);
+insert data
+INSERT INTO `left` VALUES(1,'a'),(6,'c'),(5,'j'),(2,'l');
+selecting data
+SELECT * FROM `left` ORDER BY `numeric`;
+numeric	char
+1	a
+2	l
+5	j
+6	c
+SELECT COUNT(*) FROM `left`;
+COUNT(*)
+4
+
+*******Creating table partition with Hash***********
+CREATE TABLE `modifies`(
+col1 INT,
+col2 CHAR(20),
+col3 DATE)
+PARTITION BY HASH (YEAR(col3))
+PARTITIONS 4;
+Insert data
+INSERT INTO `modifies` VALUES
+(1,'a','1942-10-09'),(2,'b','1950-08-07'),
+(3,'c','1952-10-10'),(4,'d','1954-10-04');
+selecting data
+SELECT * FROM `modifies` ORDER BY col3;
+col1	col2	col3
+1	a	1942-10-09
+2	b	1950-08-07
+3	c	1952-10-10
+4	d	1954-10-04
+SELECT COUNT(*) FROM `modifies`;
+COUNT(*)
+4
+********Creating table partition with keys*******
+CREATE TABLE `key`(id INT)
+PARTITION BY KEY(id)
+PARTITIONS 2;
+insert data
+INSERT INTO `key` VALUES(1),(2),(3),(4);
+selecting the data
+SELECT * FROM `key`;
+id
+1
+3
+2
+4
+SELECT COUNT(*) FROM `key`;
+COUNT(*)
+4
+***Creating views from partitoned Tables****
+CREATE VIEW `values` AS SELECT * FROM `range`;
+Obtaining information about Partitions
+SHOW FULL TABLES;
+Tables_in_partitions	Table_type
+key	BASE TABLE
+left	BASE TABLE
+modifies	BASE TABLE
+range	BASE TABLE
+values	VIEW
+EXPLAIN PARTITIONS SELECT * FROM `key`;;
+id	#
+select_type	SIMPLE
+table	key
+partitions	p0,p1
+type	ALL
+possible_keys	NULL
+key	NULL
+key_len	NULL
+ref	NULL
+rows	#
+Extra	
+EXPLAIN PARTITIONS SELECT * FROM `modifies`;;
+id	#
+select_type	SIMPLE
+table	modifies
+partitions	p0,p1,p2,p3
+type	ALL
+possible_keys	NULL
+key	NULL
+key_len	NULL
+ref	NULL
+rows	#
+Extra	
+EXPLAIN PARTITIONS SELECT * FROM `left`;;
+id	#
+select_type	SIMPLE
+table	left
+partitions	p0,p1
+type	ALL
+possible_keys	NULL
+key	NULL
+key_len	NULL
+ref	NULL
+rows	#
+Extra	
+EXPLAIN PARTITIONS SELECT * FROM `range`;;
+id	#
+select_type	SIMPLE
+table	range
+partitions	P0,P1,P2,P3,P4
+type	ALL
+possible_keys	NULL
+key	NULL
+key_len	NULL
+ref	NULL
+rows	#
+Extra	
+backup data
+BACKUP DATABASE partitions TO 'partitions.bak';
+backup_id
+#
+dropping  database.
+DROP DATABASE partitions;
+Restore
+RESTORE FROM 'partitions.bak';
+backup_id
+#
+
+** RESULTS AFTER RESTORE **
+
+Obtaining Information about Partitions
+SHOW FULL TABLES;;
+Tables_in_partitions	key
+Table_type	BASE TABLE
+Tables_in_partitions	left
+Table_type	BASE TABLE
+Tables_in_partitions	modifies
+Table_type	BASE TABLE
+Tables_in_partitions	range
+Table_type	BASE TABLE
+Tables_in_partitions	values
+Table_type	VIEW
+EXPLAIN PARTITIONS SELECT * FROM `key`;;
+id	#
+select_type	SIMPLE
+table	key
+partitions	p0,p1
+type	ALL
+possible_keys	NULL
+key	NULL
+key_len	NULL
+ref	NULL
+rows	#
+Extra	
+EXPLAIN PARTITIONS SELECT * FROM `modifies`;;
+id	#
+select_type	SIMPLE
+table	modifies
+partitions	p0,p1,p2,p3
+type	ALL
+possible_keys	NULL
+key	NULL
+key_len	NULL
+ref	NULL
+rows	#
+Extra	
+EXPLAIN PARTITIONS SELECT * FROM `left`;;
+id	#
+select_type	SIMPLE
+table	left
+partitions	p0,p1
+type	ALL
+possible_keys	NULL
+key	NULL
+key_len	NULL
+ref	NULL
+rows	#
+Extra	
+EXPLAIN PARTITIONS SELECT * FROM `range`;;
+id	#
+select_type	SIMPLE
+table	range
+partitions	P0,P1,P2,P3,P4
+type	ALL
+possible_keys	NULL
+key	NULL
+key_len	NULL
+ref	NULL
+rows	#
+Extra	
+ALTER TABLE `range` PARTITION BY KEY(DOB) PARTITIONS 2;
+INSERT INTO `values` VALUES(17,'kk','90','2020-12-19',2000);
+SELECT COUNT(*) FROM `values`;
+COUNT(*)
+7
+SELECT COUNT(*) FROM  `range`;
+COUNT(*)
+7
+
+**Creating table with subpartitions**
+CREATE TABLE `change` (`int` INT)
+PARTITION BY range (`int`)
+SUBPARTITION BY key (`int`)
+(PARTITION p0 VALUES LESS THAN (2));
+INSERT INTO `change` VALUES(0),(1);
+SHOW FULL TABLES;
+Tables_in_partitions	Table_type
+change	BASE TABLE
+key	BASE TABLE
+left	BASE TABLE
+modifies	BASE TABLE
+range	BASE TABLE
+values	VIEW
+EXPLAIN PARTITIONS SELECT * FROM `left`;;
+id	#
+select_type	SIMPLE
+table	left
+partitions	p0,p1
+type	ALL
+possible_keys	NULL
+key	NULL
+key_len	NULL
+ref	NULL
+rows	#
+Extra	
+EXPLAIN PARTITIONS SELECT * FROM `range`;;
+id	#
+select_type	SIMPLE
+table	range
+partitions	p0,p1
+type	ALL
+possible_keys	NULL
+key	NULL
+key_len	NULL
+ref	NULL
+rows	#
+Extra	
+EXPLAIN PARTITIONS SELECT * FROM `change`;;
+id	#
+select_type	SIMPLE
+table	change
+partitions	p0_p0sp0
+type	ALL
+possible_keys	NULL
+key	NULL
+key_len	NULL
+ref	NULL
+rows	#
+Extra	
+BACKUP DATABASE partitions TO 'partitions.bak';
+backup_id
+#
+DROP DATABASE partitions;
+RESTORE FROM 'partitions.bak';
+backup_id
+#
+showing objects and create statements
+EXPLAIN PARTITIONS SELECT * FROM `key`;;
+id	#
+select_type	SIMPLE
+table	key
+partitions	p0,p1
+type	ALL
+possible_keys	NULL
+key	NULL
+key_len	NULL
+ref	NULL
+rows	#
+Extra	
+EXPLAIN PARTITIONS SELECT * FROM `modifies`;;
+id	#
+select_type	SIMPLE
+table	modifies
+partitions	p0,p1,p2,p3
+type	ALL
+possible_keys	NULL
+key	NULL
+key_len	NULL
+ref	NULL
+rows	#
+Extra	
+EXPLAIN PARTITIONS SELECT * FROM `left`;;
+id	#
+select_type	SIMPLE
+table	left
+partitions	p0,p1
+type	ALL
+possible_keys	NULL
+key	NULL
+key_len	NULL
+ref	NULL
+rows	#
+Extra	
+EXPLAIN PARTITIONS SELECT * FROM `range`;;
+id	#
+select_type	SIMPLE
+table	range
+partitions	p0,p1
+type	ALL
+possible_keys	NULL
+key	NULL
+key_len	NULL
+ref	NULL
+rows	#
+Extra	
+SELECT * FROM `left` ORDER BY `numeric`;
+numeric	char
+1	a
+2	l
+5	j
+6	c
+SELECT * FROM `key`;
+id
+1
+3
+2
+4
+SELECT * FROM `modifies` ORDER BY col3;
+col1	col2	col3
+1	a	1942-10-09
+2	b	1950-08-07
+3	c	1952-10-10
+4	d	1954-10-04
+SELECT * FROM `range`  ORDER BY DOB;
+ID	NAME	AGE	DOB	SAL
+12	cc	78	1945-09-12	3897
+14	ee	45	1960-12-23	7845.9
+11	bb	31	1977-10-19	6009.89
+15	ff	25	1984-02-07	3500.89
+10	aa	20	1988-12-19	2345.89
+13	dd	12	1994-09-18	7892.78
+17	kk	90	2020-12-19	2000
+SELECT * FROM `range`  ORDER BY DOB;
+ID	NAME	AGE	DOB	SAL
+12	cc	78	1945-09-12	3897
+14	ee	45	1960-12-23	7845.9
+11	bb	31	1977-10-19	6009.89
+15	ff	25	1984-02-07	3500.89
+10	aa	20	1988-12-19	2345.89
+13	dd	12	1994-09-18	7892.78
+17	kk	90	2020-12-19	2000
+SELECT * FROM `change`;
+int
+0
+1
+**creating view from view***
+CREATE VIEW v2 AS SELECT * FROM `values`;
+INSERT INTO v2 VALUES(18,'pp',51,'1990-10-19',6009.89);
+SELECT COUNT(*) FROM `values`;
+COUNT(*)
+8
+SELECT COUNT(*) FROM  `range`;
+COUNT(*)
+8
+Make some changes and then perform Restore.
+EXPLAIN PARTITIONS SELECT * FROM `change`;;
+id	#
+select_type	SIMPLE
+table	change
+partitions	p0_p0sp0
+type	ALL
+possible_keys	NULL
+key	NULL
+key_len	NULL
+ref	NULL
+rows	#
+Extra	
+SHOW FULL TABLES;
+Tables_in_partitions	Table_type
+change	BASE TABLE
+key	BASE TABLE
+left	BASE TABLE
+modifies	BASE TABLE
+range	BASE TABLE
+v2	VIEW
+values	VIEW
+ALTER TABLE `change` REMOVE PARTITIONING;
+BACKUP DATABASE partitions to 'partitions.bak';
+backup_id
+#
+DROP DATABASE partitions;
+RESTORE FROM 'partitions.bak';
+backup_id
+#
+SHOW FULL TABLES;
+Tables_in_partitions	Table_type
+change	BASE TABLE
+key	BASE TABLE
+left	BASE TABLE
+modifies	BASE TABLE
+range	BASE TABLE
+v2	VIEW
+values	VIEW
+SELECT * FROM `change`;
+int
+0
+1
+EXPLAIN PARTITIONS SELECT * FROM `change`;;
+id	#
+select_type	SIMPLE
+table	change
+partitions	NULL
+type	ALL
+possible_keys	NULL
+key	NULL
+key_len	NULL
+ref	NULL
+rows	#
+Extra	
+SELECT * FROM `values` ORDER BY DOB;
+ID	NAME	AGE	DOB	SAL
+12	cc	78	1945-09-12	3897
+14	ee	45	1960-12-23	7845.9
+11	bb	31	1977-10-19	6009.89
+15	ff	25	1984-02-07	3500.89
+10	aa	20	1988-12-19	2345.89
+18	pp	51	1990-10-19	6009.89
+13	dd	12	1994-09-18	7892.78
+17	kk	90	2020-12-19	2000
+SELECT COUNT(*) FROM  `range`;
+COUNT(*)
+8
+
+***  DROP partitions DATABASE ****
+
+DROP DATABASE partitions;

=== added file 'mysql-test/suite/backup_charsets/r/backup_procedures.result'
--- a/mysql-test/suite/backup_charsets/r/backup_procedures.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/backup_charsets/r/backup_procedures.result	2008-08-15 22:15:12 +0000
@@ -0,0 +1,158 @@
+SHOW VARIABLES LIKE 'character_set_database';
+Variable_name	Value
+character_set_database	#
+SHOW VARIABLES LIKE 'collation_database';
+Variable_name	Value
+collation_database	#
+SET NAMES cset;
+SHOW VARIABLES LIKE 'storage_engine';
+Variable_name	Value
+storage_engine	#
+
+starting the test for backup
+
+DROP DATABASE IF EXISTS bup_sp;
+CREATE DATABASE bup_sp;
+USE bup_sp;
+*******Creating table******
+CREATE TABLE bup_sp.country(
+ccode CHAR(10),
+city VARCHAR(10)
+);
+*********loading data*********
+INSERT INTO bup_sp.country VALUES
+('IND','JAIPUR'),('US','SFO'),('US','AUSTIN'),
+('IND','BOMBAY'),('US','RICHMOND'),('IND','HYD');
+SELECT * FROM bup_sp.country ORDER BY ccode, city;
+ccode	city
+IND	BOMBAY
+IND	HYD
+IND	JAIPUR
+US	AUSTIN
+US	RICHMOND
+US	SFO
+CREATE PROCEDURE countryinfo (IN loc CHAR(5))
+BEGIN
+SELECT * FROM country WHERE ccode=loc;
+END;
+||
+CREATE PROCEDURE dorepeat(p1 INT)
+BEGIN
+SET @x = 0;
+REPEAT SET @x = @x + 1; UNTIL @x > p1 END REPEAT;
+END ;||
+CALL countryinfo('US');
+ccode	city
+US	SFO
+US	AUSTIN
+US	RICHMOND
+CALL countryinfo('IND');
+ccode	city
+IND	JAIPUR
+IND	BOMBAY
+IND	HYD
+CALL dorepeat(1000);
+SELECT @x;
+@x
+1001
+showing objects and create statements.
+describe country;
+Field	Type	Null	Key	Default	Extra
+ccode	char(10)	YES		NULL	
+city	varchar(10)	YES		NULL	
+SHOW PROCEDURE STATUS;;
+Db	bup_sp
+Name	countryinfo
+Type	PROCEDURE
+Definer	#
+Modified	#
+Created	#
+Security_type	#
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sp
+Name	dorepeat
+Type	PROCEDURE
+Definer	#
+Modified	#
+Created	#
+Security_type	#
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+backup data
+
+BACKUP DATABASE bup_sp TO 'bup_sp.bak';
+backup_id
+#
+dropping  database.
+DROP DATABASE bup_sp;
+
+RESTORE FROM 'bup_sp.bak';
+backup_id
+#
+showing objects and create statements
+describe country;
+Field	Type	Null	Key	Default	Extra
+ccode	char(10)	YES		NULL	
+city	varchar(10)	YES		NULL	
+SHOW PROCEDURE STATUS;;
+Db	bup_sp
+Name	countryinfo
+Type	PROCEDURE
+Definer	#
+Modified	#
+Created	#
+Security_type	#
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Db	bup_sp
+Name	dorepeat
+Type	PROCEDURE
+Definer	#
+Modified	#
+Created	#
+Security_type	#
+Comment	
+character_set_client	#
+collation_connection	#
+Database Collation	#
+INSERT INTO bup_sp.country VALUES
+('US','BOSTON'),('IND','JAIPUR'),('US','NATICK');
+SELECT * FROM bup_sp.country ORDER BY  ccode, city;
+ccode	city
+IND	BOMBAY
+IND	HYD
+IND	JAIPUR
+IND	JAIPUR
+US	AUSTIN
+US	BOSTON
+US	NATICK
+US	RICHMOND
+US	SFO
+CALL countryinfo('IND');
+ccode	city
+IND	JAIPUR
+IND	BOMBAY
+IND	HYD
+IND	JAIPUR
+CALL countryinfo('US');
+ccode	city
+US	SFO
+US	AUSTIN
+US	RICHMOND
+US	BOSTON
+US	NATICK
+CALL dorepeat(99);
+SELECT @x;
+@x
+100
+
+***  DROP bup_sp DATABASE ****
+
+DROP DATABASE bup_sp;

=== added file 'mysql-test/suite/backup_charsets/r/backup_triggers.result'
--- a/mysql-test/suite/backup_charsets/r/backup_triggers.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/backup_charsets/r/backup_triggers.result	2008-08-15 22:15:12 +0000
@@ -0,0 +1,679 @@
+SHOW VARIABLES LIKE 'character_set_database';
+Variable_name	Value
+character_set_database	#
+SHOW VARIABLES LIKE 'collation_database';
+Variable_name	Value
+collation_database	#
+SET NAMES cset;
+SHOW VARIABLES LIKE 'storage_engine';
+Variable_name	Value
+storage_engine	#
+
+starting the test for backup
+
+DROP DATABASE IF EXISTS bup_ts;
+CREATE DATABASE bup_ts;
+USE bup_ts;
+SELECT @@SQL_MODE;
+@@SQL_MODE
+
+*****Creating table cap ******
+CREATE TABLE bup_ts.cap(
+id SMALLINT,
+country CHAR(20),
+city VARCHAR(20),
+population BIGINT,
+capital CHAR(20)
+);
+******* Creating table city*****.
+CREATE TABLE bup_ts.city(
+id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
+name VARCHAR(20),
+ccode CHAR(10),
+population bigint
+);
+*******Creating table dropcity *****
+CREATE TABLE bup_ts.dropcity(
+id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
+name VARCHAR(20)
+);
+******Create Trigger for the table*******
+*******creating trigger with event before insert**********
+CREATE TRIGGER cap_tri BEFORE INSERT ON cap FOR EACH ROW
+SET new.population= if(new.population<0,0,truncate(new.population,-3));||
+********creating trigger with event before Update******
+CREATE  TRIGGER capu_tri BEFORE UPDATE ON cap FOR EACH ROW
+BEGIN
+SET @country=old.country;
+SET @capital_old=old.capital;
+SET @capital_new=new.capital;
+END;
+||
+*****creating trigger with event after delete********
+CREATE TRIGGER cityin_d AFTER
+DELETE ON city FOR EACH ROW
+INSERT INTO dropcity(id, name) VALUES(old.id, old.name);||
+Creating Tables
+CREATE TABLE bup_ts.t2(a CHAR(4));
+CREATE TABLE bup_ts.t3(a CHAR(4));
+CREATE TABLE bup_ts.t4(a CHAR(4));
+Creating Triggers
+Creating trigger with event after insert
+CREATE TRIGGER trai AFTER INSERT ON t2 FOR EACH ROW
+BEGIN
+INSERT INTO t3 VALUES('H'),('E'),('L'),('L'),('O');
+END;
+||
+Creating trigger with event after Update
+CREATE TRIGGER trau AFTER UPDATE ON t2 FOR EACH ROW
+BEGIN
+INSERT INTO t4 VALUES('J'),('O'),('B');
+END;
+||
+Load data in to table
+********Inserting Values in tables*********
+INSERT INTO bup_ts.cap VALUES
+(1,'IND','chn',87874646468,'deli'),(2,'US','Austin',-6466547,'DC'),
+(3,'Russia','moscow',76487623235682,'moscow'),(4,'IND','bang',-83875477,'deli'),
+(5,'US','sacramento',-388348,'DC'),(6,'IND','jammu',3848488,'deli'),
+(7,'Russia','xx',-373788,'moscow'),(8,'IND','hyd',647747,'deli');
+INSERT INTO bup_ts.city VALUES
+(1,'aa','AD',263768),(2,'bb','PO',8839898),(3,'cc','KL',898778),
+(4,'dd','IK',73287328),(5,'ee','YU',89399),(6,'ff','IL',90880),
+(7,'gg','TY',345),(8,'hh','WE',9239084);
+Updating the table to fire trigger with event update
+UPDATE cap SET capital='Delhi' WHERE country='IND';
+UPDATE cap SET capital='Washington DC' WHERE country='US';
+SELECT @country as country, @capital_old as 'old capital',
+@capital_new as 'new capital';
+country	old capital	new capital
+US	DC	Washington DC
+showing the tables to check the trigger is fired  with event insert
+SELECT * FROM bup_ts.cap ORDER BY id;
+id	country	city	population	capital
+1	IND	chn	87874646000	Delhi
+2	US	Austin	0	Washington DC
+3	Russia	moscow	76487623235000	moscow
+4	IND	bang	0	Delhi
+5	US	sacramento	0	Washington DC
+6	IND	jammu	3848000	Delhi
+7	Russia	xx	0	moscow
+8	IND	hyd	647000	Delhi
+selecting data from table city
+SELECT * FROM bup_ts.city ORDER BY id;
+id	name	ccode	population
+1	aa	AD	263768
+2	bb	PO	8839898
+3	cc	KL	898778
+4	dd	IK	73287328
+5	ee	YU	89399
+6	ff	IL	90880
+7	gg	TY	345
+8	hh	WE	9239084
+deleting few rows from table city to fire trigger with event delete.
+DELETE FROM bup_ts.city WHERE name='dd';
+DELETE FROM bup_ts.city WHERE name='bb';
+
+Checking table contents of city and dropcity to verify if trigger is
+fired for event delete.
+SELECT * FROM city ORDER BY id;
+id	name	ccode	population
+1	aa	AD	263768
+3	cc	KL	898778
+5	ee	YU	89399
+6	ff	IL	90880
+7	gg	TY	345
+8	hh	WE	9239084
+SELECT * FROM dropcity ORDER BY id;
+id	name
+2	bb
+4	dd
+******Firing Trigger after insert and after update *********
+INSERT INTO bup_ts.t2 values('a'),('k'),('*'),('i');
+SELECT * FROM bup_ts.t3;
+a
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+UPDATE t2 SET a='*' WHERE a='k';
+SELECT * FROM bup_ts.t4;
+a
+J
+O
+B
+Show the data and Create statements
+showing objects and create statements.
+SHOW TRIGGERS;;
+Trigger	cap_tri
+Event	INSERT
+Table	cap
+Statement	SET new.population= if(new.population<0,0,truncate(new.population,-3))
+Timing	BEFORE
+Created	NULL
+sql_mode	
+Definer	root@localhost
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Trigger	capu_tri
+Event	UPDATE
+Table	cap
+Statement	BEGIN
+SET @country=old.country;
+SET @capital_old=old.capital;
+SET @capital_new=new.capital;
+END
+Timing	BEFORE
+Created	NULL
+sql_mode	
+Definer	root@localhost
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Trigger	cityin_d
+Event	DELETE
+Table	city
+Statement	INSERT INTO dropcity(id, name) VALUES(old.id, old.name)
+Timing	AFTER
+Created	NULL
+sql_mode	
+Definer	root@localhost
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Trigger	trai
+Event	INSERT
+Table	t2
+Statement	BEGIN
+INSERT INTO t3 VALUES('H'),('E'),('L'),('L'),('O');
+END
+Timing	AFTER
+Created	NULL
+sql_mode	
+Definer	root@localhost
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Trigger	trau
+Event	UPDATE
+Table	t2
+Statement	BEGIN
+INSERT INTO t4 VALUES('J'),('O'),('B');
+END
+Timing	AFTER
+Created	NULL
+sql_mode	
+Definer	root@localhost
+character_set_client	#
+collation_connection	#
+Database Collation	#
+DESCRIBE city;
+Field	Type	Null	Key	Default	Extra
+id	int(10) unsigned	NO	PRI	NULL	auto_increment
+name	varchar(20)	YES		NULL	
+ccode	char(10)	YES		NULL	
+population	bigint(20)	YES		NULL	
+DESCRIBE t2;
+Field	Type	Null	Key	Default	Extra
+a	char(4)	YES		NULL	
+backup data
+BACKUP DATABASE bup_ts TO 'bup_ts.bak';
+backup_id
+#
+dropping  database.
+DROP DATABASE bup_ts;
+perform restore
+RESTORE FROM 'bup_ts.bak';
+backup_id
+#
+show data and create statements after Restore
+showing objects and create statements
+SHOW TRIGGERS;;
+Trigger	cap_tri
+Event	INSERT
+Table	cap
+Statement	SET new.population= if(new.population<0,0,truncate(new.population,-3))
+Timing	BEFORE
+Created	NULL
+sql_mode	
+Definer	root@localhost
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Trigger	capu_tri
+Event	UPDATE
+Table	cap
+Statement	BEGIN
+SET @country=old.country;
+SET @capital_old=old.capital;
+SET @capital_new=new.capital;
+END
+Timing	BEFORE
+Created	NULL
+sql_mode	
+Definer	root@localhost
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Trigger	cityin_d
+Event	DELETE
+Table	city
+Statement	INSERT INTO dropcity(id, name) VALUES(old.id, old.name)
+Timing	AFTER
+Created	NULL
+sql_mode	
+Definer	root@localhost
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Trigger	trai
+Event	INSERT
+Table	t2
+Statement	BEGIN
+INSERT INTO t3 VALUES('H'),('E'),('L'),('L'),('O');
+END
+Timing	AFTER
+Created	NULL
+sql_mode	
+Definer	root@localhost
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Trigger	trau
+Event	UPDATE
+Table	t2
+Statement	BEGIN
+INSERT INTO t4 VALUES('J'),('O'),('B');
+END
+Timing	AFTER
+Created	NULL
+sql_mode	
+Definer	root@localhost
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Inserting some more values in the table to check the trigger with event insert
+INSERT INTO bup_ts.cap VALUES
+(9,'US','houston',-333995876778666565,'texas');
+SELECT * FROM bup_ts.cap ORDER BY id;
+id	country	city	population	capital
+1	IND	chn	87874646000	Delhi
+2	US	Austin	0	Washington DC
+3	Russia	moscow	76487623235000	moscow
+4	IND	bang	0	Delhi
+5	US	sacramento	0	Washington DC
+6	IND	jammu	3848000	Delhi
+7	Russia	xx	0	moscow
+8	IND	hyd	647000	Delhi
+9	US	houston	0	texas
+Deleting some rows from city to check the trigger with event delete
+DELETE FROM city WHERE name='aa';
+Checking table city and drop city
+SELECT * FROM bup_ts.city ORDER BY id;
+id	name	ccode	population
+3	cc	KL	898778
+5	ee	YU	89399
+6	ff	IL	90880
+7	gg	TY	345
+8	hh	WE	9239084
+SELECT * FROM bup_ts.dropcity ORDER BY id;
+id	name
+1	aa
+2	bb
+4	dd
+INSERT INTO bup_ts.t2 VALUES('m'),('s1'),('s'),('q'),('l');
+SELECT * FROM bup_ts.t3;
+a
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+UPDATE t2 SET a='y' WHERE a='s1';
+SELECT * FROM bup_ts.t4;
+a
+J
+O
+B
+J
+O
+B
+DROP DATABASE bup_ts;
+Change sql mode and perform Restore and check the table contents.
+SET SQL_MODE=TRADITIONAL;
+RESTORE FROM 'bup_ts.bak';
+backup_id
+#
+SHOW TRIGGERS;;
+Trigger	cap_tri
+Event	INSERT
+Table	cap
+Statement	SET new.population= if(new.population<0,0,truncate(new.population,-3))
+Timing	BEFORE
+Created	NULL
+sql_mode	
+Definer	root@localhost
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Trigger	capu_tri
+Event	UPDATE
+Table	cap
+Statement	BEGIN
+SET @country=old.country;
+SET @capital_old=old.capital;
+SET @capital_new=new.capital;
+END
+Timing	BEFORE
+Created	NULL
+sql_mode	
+Definer	root@localhost
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Trigger	cityin_d
+Event	DELETE
+Table	city
+Statement	INSERT INTO dropcity(id, name) VALUES(old.id, old.name)
+Timing	AFTER
+Created	NULL
+sql_mode	
+Definer	root@localhost
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Trigger	trai
+Event	INSERT
+Table	t2
+Statement	BEGIN
+INSERT INTO t3 VALUES('H'),('E'),('L'),('L'),('O');
+END
+Timing	AFTER
+Created	NULL
+sql_mode	
+Definer	root@localhost
+character_set_client	#
+collation_connection	#
+Database Collation	#
+Trigger	trau
+Event	UPDATE
+Table	t2
+Statement	BEGIN
+INSERT INTO t4 VALUES('J'),('O'),('B');
+END
+Timing	AFTER
+Created	NULL
+sql_mode	
+Definer	root@localhost
+character_set_client	#
+collation_connection	#
+Database Collation	#
+DESCRIBE t2;
+Field	Type	Null	Key	Default	Extra
+a	char(4)	YES		NULL	
+DESCRIBE city;
+Field	Type	Null	Key	Default	Extra
+id	int(10) unsigned	NO	PRI	NULL	auto_increment
+name	varchar(20)	YES		NULL	
+ccode	char(10)	YES		NULL	
+population	bigint(20)	YES		NULL	
+DESCRIBE cap;
+Field	Type	Null	Key	Default	Extra
+id	smallint(6)	YES		NULL	
+country	char(20)	YES		NULL	
+city	varchar(20)	YES		NULL	
+population	bigint(20)	YES		NULL	
+capital	char(20)	YES		NULL	
+Check contents after Restore and change of SQL mode
+INSERT INTO bup_ts.cap VALUES(10,'India','Daund',36637782899,'maharashtra');
+SELECT * FROM bup_ts.cap ORDER BY id;
+id	country	city	population	capital
+1	IND	chn	87874646000	Delhi
+2	US	Austin	0	Washington DC
+3	Russia	moscow	76487623235000	moscow
+4	IND	bang	0	Delhi
+5	US	sacramento	0	Washington DC
+6	IND	jammu	3848000	Delhi
+7	Russia	xx	0	moscow
+8	IND	hyd	647000	Delhi
+10	India	Daund	36637782000	maharashtra
+INSERT INTO bup_ts.t2 VALUES('i'),('w');
+SELECT * FROM t3;
+a
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+UPDATE t2 SET a='^' WHERE a='w';
+SELECT * FROM t4;
+a
+J
+O
+B
+J
+O
+B
+DROP DATABASE bup_ts;
+change of SQL mode
+SET SQL_MODE=MAXDB;
+RESTORE FROM 'bup_ts.bak';
+backup_id
+#
+Check contents after Restore and change of SQL mode
+INSERT INTO bup_ts.cap VALUES(11,'UK','Edenburg',-36637782899,'london');
+SELECT * FROM bup_ts.cap ORDER BY id;
+id	country	city	population	capital
+1	IND	chn	87874646000	Delhi
+2	US	Austin	0	Washington DC
+3	Russia	moscow	76487623235000	moscow
+4	IND	bang	0	Delhi
+5	US	sacramento	0	Washington DC
+6	IND	jammu	3848000	Delhi
+7	Russia	xx	0	moscow
+8	IND	hyd	647000	Delhi
+11	UK	Edenburg	0	london
+INSERT INTO bup_ts.t2 VALUES('i'),('w'),('h');
+SELECT * FROM bup_ts.t3;
+a
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+UPDATE t2 SET a='p' WHERE a='h';
+SELECT * FROM bup_ts.t4;
+a
+J
+O
+B
+J
+O
+B
+DROP DATABASE bup_ts;
+Chnage SQL mode and then perform Restore.
+SET SQL_MODE=ANSI;
+RESTORE FROM 'bup_ts.bak';
+backup_id
+#
+Check contents after Restore and change of SQL mode
+INSERT INTO bup_ts.cap VALUES(12,'India','vooty',789,'Tamilnadu');
+SELECT * FROM bup_ts.cap ORDER BY id;
+id	country	city	population	capital
+1	IND	chn	87874646000	Delhi
+2	US	Austin	0	Washington DC
+3	Russia	moscow	76487623235000	moscow
+4	IND	bang	0	Delhi
+5	US	sacramento	0	Washington DC
+6	IND	jammu	3848000	Delhi
+7	Russia	xx	0	moscow
+8	IND	hyd	647000	Delhi
+12	India	vooty	0	Tamilnadu
+INSERT INTO bup_ts.t2 VALUES('i'),('w'),('h'),('b');
+SELECT * FROM bup_ts.t3;
+a
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+H
+E
+L
+L
+O
+UPDATE bup_ts.t2 SET a='#' WHERE a='w';
+SELECT * FROM bup_ts.t4;
+a
+J
+O
+B
+J
+O
+B
+
+***  DROP bup_ts DATABASE ****
+
+DROP DATABASE bup_ts;

=== added directory 'mysql-test/suite/backup_charsets/t'
=== added file 'mysql-test/suite/backup_charsets/t/backup_datatypes.test'
--- a/mysql-test/suite/backup_charsets/t/backup_datatypes.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/backup_charsets/t/backup_datatypes.test	2008-08-15 22:15:12 +0000
@@ -0,0 +1,118 @@
+########################################################################
+# Author: Hema
+# Date: 2008-03-11
+# Purpose: To test the backup/restore of all datatypes for different storage
+# engines, character sets and collations
+#########################################################################
+--source include/not_embedded.inc
+--source include/have_debug.inc
+--source suite/backup/include/backup_engine.inc
+--source suite/backup_charsets/include/charset.inc
+
+connect (backup,localhost,root,,);
+connect (breakpoints,localhost,root,,);
+
+##############################################################
+--echo
+--echo starting the test for backup
+--echo
+##############################################################
+
+--error 0,1
+--remove_file $MYSQLTEST_VARDIR/master-data/bup_datatype.bak
+
+#Create Database and tables with different datatypes for this test.
+
+--disable_warnings
+DROP DATABASE IF EXISTS bup_datatype;
+--enable_warnings
+
+--replace_result $cset cset
+eval SET NAMES $cset;
+CREATE DATABASE bup_datatype;
+USE bup_datatype;
+
+#Bug#37854 Test fails/aborts for collate latin2_czech_cs used with SET
+#and ENUM datatypes
+--replace_result $coll coll
+if(`SELECT '$coll'='latin2_czech_cs'`)
+{
+ skip "This test does'nt support latin2_czech_cs collation BUG#37854" ;
+}
+
+#Create table and load with data.
+
+CREATE TABLE d1(
+rint INT,
+tint TINYINT,
+sint SMALLINT,
+bint BIGINT,
+mint MEDIUMINT,
+name CHAR(100),
+city  VARCHAR(100),
+fl FLOAT(7,4),
+pers DECIMAL(8,2),
+sal DOUBLE,
+colours SET('red','blue','yellow'),
+continent ENUM('Asia', 'Europe','Africa','Antartica'),
+ts TIMESTAMP DEFAULT 0,
+dob DATE,
+y YEAR
+);
+
+--echo creating table with blob and text columns
+CREATE TABLE d2(
+region TEXT,
+summary LONGTEXT,
+data BLOB,
+details MEDIUMBLOB,
+queries TINYTEXT,
+query2 TINYBLOB,
+extract LONGBLOB,
+paras MEDIUMTEXT
+);
+
+INSERT INTO d1 VALUES
+(785,127,7288,278829899,3777,'testing1','sweden','678.299',200.23,829899.909,
+'red','Asia','2008-06-01 16:23:30','1984-09-08','1984');
+
+INSERT INTO d2 VALUES
+('xxxxxxxx','Testofonline backup','aaaaaaaaaa','bbbbbbbbbbb','hhhhhhhhhhh',
+'kkkkkkkkkkkkk','mmmmmmmmmmmm','onlinebackup1');
+
+# Bug #37212  Restore crashes if table has longblob of size 1MB
+UPDATE d2 SET extract=repeat('z',100);
+--query_vertical SELECT * FROM d1;
+SELECT * FROM d2;
+
+DESCRIBE d1;
+DESCRIBE d2;
+
+--echo **backup data**
+--echo
+--replace_column 1 #
+BACKUP DATABASE bup_datatype TO 'bup_datatype.bak';
+
+--echo** dropping  database**
+DROP DATABASE bup_datatype;
+
+--echo **Restore**
+--replace_column 1 #
+RESTORE FROM 'bup_datatype.bak';
+
+#show data table columns
+DESCRIBE d1;
+DESCRIBE d2;
+
+--query_vertical SELECT * FROM d1;
+SELECT * FROM d2;
+
+# Test cleanup section
+
+--echo
+--echo ***  DROP bup_datatype DATABASE ****
+--echo
+
+DROP DATABASE bup_datatype;
+--remove_file $MYSQLTEST_VARDIR/master-data/bup_datatype.bak
+

=== added file 'mysql-test/suite/backup_charsets/t/backup_functions.test'
--- a/mysql-test/suite/backup_charsets/t/backup_functions.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/backup_charsets/t/backup_functions.test	2008-08-15 22:15:12 +0000
@@ -0,0 +1,12 @@
+########################################################################
+# Author: Hema
+# Date: 2008-07-28
+# Purpose: To test the backup/restore of object stored functions
+# for different storage engine, character sets and collations.
+#########################################################################
+
+--source suite/backup_charsets/include/charset.inc
+--replace_result $cset cset
+eval SET NAMES $cset;
+--source suite/backup/t/backup_functions.test
+

=== added file 'mysql-test/suite/backup_charsets/t/backup_partitions.test'
--- a/mysql-test/suite/backup_charsets/t/backup_partitions.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/backup_charsets/t/backup_partitions.test	2008-08-15 22:15:12 +0000
@@ -0,0 +1,294 @@
+###########################################################################
+# Author: Hema
+# Date: 2008-06-28
+# Purpose: To test the backup and Restore of different partitions using
+# Reserved words as  identifiers for all Character sets, coll and SE
+###############################################################################
+--source include/not_embedded.inc
+--source include/have_debug.inc
+--source suite/backup/include/backup_engine.inc
+--source suite/backup_charsets/include/charset.inc
+
+connect (backup,localhost,root,,);
+connect (breakpoints,localhost,root,,);
+
+##############################################################
+--echo
+--echo starting the test for backup
+--echo
+##############################################################
+
+--error 0,1
+--remove_file $MYSQLTEST_VARDIR/master-data/partitions.bak
+
+#Create Database and and tables with different types of partitions.
+
+--disable_warnings
+DROP DATABASE IF EXISTS partitions;
+--enable_warnings
+
+--echo Bug #34391 Character sets: crash if char(), utf32, innodb
+--echo Bug #33566 Backup: crash with partitions and Falcon
+--echo Bug #37551 Junk detected in data contents sometimes when utf8mb3
+--echo character set is used.
+--echo Bug #37554 Use of character set and collate as 'filename' shows
+--echo unusual behaviour.
+--echo Bug #35499 View when created with swe7 character set fails.
+--echo Bug#38784 Mysql server crash if table is altered by partition changes.
+
+#Bug #33566 Backup: crash with partitions and Falcon.
+#Remove this condition once the bug#33566 is fixed.
+--replace_result $ENGINE ENGINE
+if(`SELECT '$ENGINE'='falcon'`)
+{
+ skip "This test does'nt support falcon engine BUG#33566" ;
+}
+
+--replace_result $cset cset
+eval SET NAMES $cset;
+
+CREATE DATABASE partitions;
+USE partitions;
+
+#Create table and load with data.
+
+--echo *****Creating table with range partition*********
+
+CREATE TABLE `range`(
+ ID INT NOT NULL,
+NAME CHAR(20),
+AGE TINYINT,
+DOB DATE,
+SAL FLOAT,
+PRIMARY KEY(DOB)) PARTITION BY RANGE(Year(DOB))(
+        PARTITION P0 values less than (1970),
+        PARTITION P1 values less than (1980),
+        PARTITION P2 values less than (1990),
+        PARTITION P3 values less than (2000),
+        PARTITION P4 values less than maxvalue);
+
+--echo loading data
+
+INSERT INTO `range`VALUES
+(10,'aa','20','1988-12-19',2345.89),(11,'bb',31,'1977-10-19',6009.89),
+(12,'cc',78,'1945-09-12',3897),(13,'dd',12,'1994-09-18',7892.78),
+(14,'ee',45,'1960-12-23',7845.90),(15,'ff',25,'1984-02-07',3500.89);
+
+--echo select data
+
+SELECT * FROM `range` ORDER BY DOB;
+SELECT COUNT(*) FROM `range`;
+
+--echo
+--echo ******Creating table partition with List**************
+
+CREATE TABLE `left`(`numeric` INT, `char` CHAR(20))
+PARTITION BY LIST (`numeric`)
+(
+   PARTITION p0 VALUES IN (1,3,5),
+   PARTITION p1 VALUES IN (2,4,6)
+);
+--echo insert data
+
+INSERT INTO `left` VALUES(1,'a'),(6,'c'),(5,'j'),(2,'l');
+
+--echo selecting data
+
+SELECT * FROM `left` ORDER BY `numeric`;
+SELECT COUNT(*) FROM `left`;
+
+--echo
+--echo *******Creating table partition with Hash***********
+
+CREATE TABLE `modifies`(
+col1 INT,
+col2 CHAR(20),
+col3 DATE)
+PARTITION BY HASH (YEAR(col3))
+PARTITIONS 4;
+
+--echo Insert data
+
+INSERT INTO `modifies` VALUES
+(1,'a','1942-10-09'),(2,'b','1950-08-07'),
+(3,'c','1952-10-10'),(4,'d','1954-10-04');
+
+--echo selecting data
+
+SELECT * FROM `modifies` ORDER BY col3;
+SELECT COUNT(*) FROM `modifies`;
+--echo ********Creating table partition with keys*******
+
+CREATE TABLE `key`(id INT)
+PARTITION BY KEY(id)
+PARTITIONS 2;
+
+--echo insert data
+
+INSERT INTO `key` VALUES(1),(2),(3),(4);
+
+--echo selecting the data
+
+SELECT * FROM `key`;
+SELECT COUNT(*) FROM `key`;
+
+--echo ***Creating views from partitoned Tables****
+
+CREATE VIEW `values` AS SELECT * FROM `range`;
+
+# We mask some of the columns in Explain Partitions command because of
+# Bug #37532 Explain command shows incorrect rows,
+# when table is partitioned and innodb.
+
+--echo Obtaining information about Partitions
+SHOW FULL TABLES;
+--replace_column 1 # 10 #
+--query_vertical EXPLAIN PARTITIONS SELECT * FROM `key`;
+--replace_column 1 # 10 #
+--query_vertical EXPLAIN PARTITIONS SELECT * FROM `modifies`;
+--replace_column 1 # 10 #
+--query_vertical EXPLAIN PARTITIONS SELECT * FROM `left`;
+--replace_column 1 # 10 #
+--query_vertical EXPLAIN PARTITIONS SELECT * FROM `range`;
+
+--echo backup data
+--replace_column 1 #
+BACKUP DATABASE partitions TO 'partitions.bak';
+
+--echo dropping  database.
+
+DROP DATABASE partitions;
+
+--echo Restore
+--replace_column 1 #
+RESTORE FROM 'partitions.bak';
+--remove_file $MYSQLTEST_VARDIR/master-data/partitions.bak
+
+--echo
+--echo ** RESULTS AFTER RESTORE **
+--echo
+
+#show data and create statements
+--echo Obtaining Information about Partitions
+--query_vertical SHOW FULL TABLES;
+--replace_column 1 # 10 #
+--query_vertical EXPLAIN PARTITIONS SELECT * FROM `key`;
+--replace_column 1 # 10 #
+--query_vertical EXPLAIN PARTITIONS SELECT * FROM `modifies`;
+--replace_column 1 # 10 #
+--query_vertical EXPLAIN PARTITIONS SELECT * FROM `left`;
+--replace_column 1 # 10 #
+--query_vertical EXPLAIN PARTITIONS SELECT * FROM `range`;
+
+# Make some changes to existing partitions, take backup and then perform
+# Restore
+
+ALTER TABLE `range` PARTITION BY KEY(DOB) PARTITIONS 2;
+
+#All the maintenence operations of partitions like ANALYZE, OPTIMIZE
+#REPAIR are currently disabled in 6.0 and 5.0.
+#Bug#20129
+# We can include these operations in the test case once this bug is fixed.
+
+#Bug#38784 Mysql server crash if table is altered with partition changes.
+#This happens only in Windows OS. The # can be removed once the bug#38784
+#is fixed.
+
+#ALTER TABLE `left` ADD PARTITION (PARTITION p2 VALUES IN (10,20,30));
+#INSERT INTO `left` VALUES(10,'h'),(3,'b'),(10,'s'),(5,'l');
+#SELECT * FROM `left`;
+#SELECT COUNT(*) FROM `left`;
+
+INSERT INTO `values` VALUES(17,'kk','90','2020-12-19',2000);
+SELECT COUNT(*) FROM `values`;
+SELECT COUNT(*) FROM  `range`;
+--echo
+--echo **Creating table with subpartitions**
+
+CREATE TABLE `change` (`int` INT)
+PARTITION BY range (`int`)
+SUBPARTITION BY key (`int`)
+(PARTITION p0 VALUES LESS THAN (2));
+
+INSERT INTO `change` VALUES(0),(1);
+
+#show data and create statements
+SHOW FULL TABLES;
+--replace_column 1 # 10 #
+--query_vertical EXPLAIN PARTITIONS SELECT * FROM `left`;
+--replace_column 1 # 10 #
+--query_vertical EXPLAIN PARTITIONS SELECT * FROM `range`;
+--replace_column 1 # 10 #
+--query_vertical EXPLAIN PARTITIONS SELECT * FROM `change`;
+
+--replace_column 1 #
+BACKUP DATABASE partitions TO 'partitions.bak';
+DROP DATABASE partitions;
+--replace_column 1 #
+RESTORE FROM 'partitions.bak';
+--remove_file $MYSQLTEST_VARDIR/master-data/partitions.bak
+
+#show data and create statements
+--echo showing objects and create statements
+--replace_column 1 # 10 #
+--query_vertical EXPLAIN PARTITIONS SELECT * FROM `key`;
+--replace_column 1 # 10 #
+--query_vertical EXPLAIN PARTITIONS SELECT * FROM `modifies`;
+--replace_column 1 # 10 #
+--query_vertical EXPLAIN PARTITIONS SELECT * FROM `left`;
+--replace_column 1 # 10 #
+--query_vertical EXPLAIN PARTITIONS SELECT * FROM `range`;
+
+SELECT * FROM `left` ORDER BY `numeric`;
+SELECT * FROM `key`;
+SELECT * FROM `modifies` ORDER BY col3;
+SELECT * FROM `range`  ORDER BY DOB;
+SELECT * FROM `range`  ORDER BY DOB;
+SELECT * FROM `change`;
+
+--echo **creating view from view***
+CREATE VIEW v2 AS SELECT * FROM `values`;
+INSERT INTO v2 VALUES(18,'pp',51,'1990-10-19',6009.89);
+
+SELECT COUNT(*) FROM `values`;
+SELECT COUNT(*) FROM  `range`;
+
+--echo Make some changes and then perform Restore.
+
+#Bug#38784 Mysql server crash if table is altered with partition changes.
+#This happens only in Windows OS. The # can be removed once the bug#38784
+#is fixed.
+
+#ALTER TABLE `change` ADD PARTITION (PARTITION p1 VALUES LESS THAN (4));
+#INSERT INTO `change` VALUES(2),(3),(1);
+
+--replace_column 1 # 10 #
+--query_vertical EXPLAIN PARTITIONS SELECT * FROM `change`;
+SHOW FULL TABLES;
+ALTER TABLE `change` REMOVE PARTITIONING;
+
+--replace_column 1 #
+BACKUP DATABASE partitions to 'partitions.bak';
+
+DROP DATABASE partitions;
+--replace_column 1 #
+RESTORE FROM 'partitions.bak';
+
+SHOW FULL TABLES;
+SELECT * FROM `change`;
+--replace_column 1 # 10 #
+--query_vertical EXPLAIN PARTITIONS SELECT * FROM `change`;
+SELECT * FROM `values` ORDER BY DOB;
+SELECT COUNT(*) FROM  `range`;
+
+# Test cleanup section
+
+--echo
+--echo ***  DROP partitions DATABASE ****
+--echo
+DROP DATABASE partitions;
+
+--remove_file $MYSQLTEST_VARDIR/master-data/partitions.bak
+
+
+

=== added file 'mysql-test/suite/backup_charsets/t/backup_procedures.test'
--- a/mysql-test/suite/backup_charsets/t/backup_procedures.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/backup_charsets/t/backup_procedures.test	2008-08-15 22:15:12 +0000
@@ -0,0 +1,12 @@
+########################################################################
+# Author: Hema
+# Date: 2008-07-28
+# Purpose: To test the backup/restore of object stored procedures
+# for different storage engine, character sets and collations.
+#########################################################################
+
+--source suite/backup_charsets/include/charset.inc
+--replace_result $cset cset
+eval SET NAMES $cset;
+--source suite/backup/t/backup_procedures.test
+

=== added file 'mysql-test/suite/backup_charsets/t/backup_triggers.test'
--- a/mysql-test/suite/backup_charsets/t/backup_triggers.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/backup_charsets/t/backup_triggers.test	2008-08-15 22:15:12 +0000
@@ -0,0 +1,12 @@
+########################################################################
+# Author: Hema
+# Date: 2008-03-11
+# Purpose:To test the backup/restore of object triggers
+# for different storage engine, character sets and collations.
+#########################################################################
+
+--source suite/backup_charsets/include/charset.inc
+--replace_result $cset cset
+eval SET NAMES $cset;
+--source suite/backup/t/backup_triggers.test
+
Thread
• bzr commit into mysql-6.0-backup branch (hema:2683) WL#4227	Hema Sridharan	16 Aug
• RE: bzr commit into mysql-6.0-backup branch (hema:2683) WL#4227	Chuck Bell	18 Aug
• Re: bzr commit into mysql-6.0-backup branch (hema:2683) WL#4227	Jørgen Løland	19 Aug
• RE: bzr commit into mysql-6.0-backup branch (hema:2683) WL#4227	Hema Sridharan	19 Aug