List:Commits« Previous MessageNext Message »
From:Hema Sridharan Date:December 5 2008 10:20pm
Subject:bzr commit into mysql-6.0-backup branch (hema:2740)
View as plain text  
#At file:///export/home/tmp/wl4227/mysql-6.0-backup/

 2740 Hema Sridharan	2008-12-05
      bzr_try. Please ignore
added:
  mysql-test/suite/backup/r/backup_datatypes.result
  mysql-test/suite/backup/t/backup_datatypes.test
  mysql-test/t/bzr_try.test

=== added file 'mysql-test/suite/backup/r/backup_datatypes.result'
--- a/mysql-test/suite/backup/r/backup_datatypes.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/backup/r/backup_datatypes.result	2008-12-05 22:20:02 +0000
@@ -0,0 +1,221 @@
+
+starting the test for backup
+
+DROP DATABASE IF EXISTS `¥ü`;
+SET NAMES latin1;
+CREATE DATABASE `¥ü`;
+USE `¥ü`;
+Create table with all datatypes and load with data.
+CREATE TABLE `§Æ`(
+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,
+dt DATETIME NOT NULL,
+dob DATE,
+time TIME,
+y YEAR
+);
+creating table with blob and text columns
+CREATE TABLE `§Æ2`(
+region TEXT,
+summary LONGTEXT,
+data BLOB,
+details MEDIUMBLOB,
+queries TINYTEXT,
+query2 TINYBLOB,
+extract LONGBLOB,
+paras MEDIUMTEXT
+);
+CREATE TABLE `§¶œ`(b1 BINARY(3), b2 VARBINARY(2),bitvalue BIT(64));
+INSERT INTO `§¶œ` VALUES(0x61,0x2130,b'1111111111111111111111111111111111111111111111111111111111111111'), (0x6120,0x4100,b'101010101010101'), (0x612020, 0x4120,b'000000001');
+SELECT HEX(b1), HEX(b2), HEX(bitvalue) FROM `§¶œ`;
+HEX(b1)	HEX(b2)	HEX(bitvalue)
+610000	2130	FFFFFFFFFFFFFFFF
+612000	4100	5555
+612020	4120	1
+INSERT INTO `§Æ` VALUES
+(785,127,7288,278829899,3777,'testing1','sweden','678.299',200.23,829899.909,
+'red','Asia','2008-06-01 16:23:30','98/12/31 11*30*45','1984-09-08','7:05','1984');
+INSERT INTO `§Æ2` VALUES
+('xxxxxxxx','Testofonline backup','aaaaaaaaaa','bbbbbbbbbbb','hhhhhhhhhhh',
+'kkkkkkkkkkkkk','mmmmmmmmmmmm','onlinebackup1');
+UPDATE `§Æ2` SET extract=repeat('z',100);
+SELECT * FROM `§Æ`;;
+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
+dt	1998-12-31 11:30:45
+dob	1984-09-08
+time	07:05:00
+y	1984
+SELECT * FROM `§Æ2`;
+region	summary	data	details	queries	query2	extract	paras
+xxxxxxxx	Testofonline backup	aaaaaaaaaa	bbbbbbbbbbb	hhhhhhhhhhh	kkkkkkkkkkkkk	zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz	onlinebackup1
+DESCRIBE `§Æ`;
+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	
+dt	datetime	NO		NULL	
+dob	date	YES		NULL	
+time	time	YES		NULL	
+y	year(4)	YES		NULL	
+DESCRIBE `§Æ2`;
+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	
+DESCRIBE `§¶œ`;
+Field	Type	Null	Key	Default	Extra
+b1	binary(3)	YES		NULL	
+b2	varbinary(2)	YES		NULL	
+bitvalue	bit(64)	YES		NULL	
+** Backup data **
+
+BACKUP DATABASE `¥ü` to 'bup_datatype.bak';
+backup_id
+#
+** dropping  database**
+DROP DATABASE `¥ü`;
+**Restore**
+RESTORE FROM 'bup_datatype.bak' OVERWRITE;
+backup_id
+#
+** checking the character set **
+SELECT @@character_set_client;
+@@character_set_client
+latin1
+SELECT @@character_set_results;
+@@character_set_results
+latin1
+SELECT @@character_set_connection;
+@@character_set_connection
+latin1
+DESCRIBE `§Æ`;
+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	
+dt	datetime	NO		NULL	
+dob	date	YES		NULL	
+time	time	YES		NULL	
+y	year(4)	YES		NULL	
+DESCRIBE `§Æ2`;
+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	
+DESCRIBE `§¶œ`;
+Field	Type	Null	Key	Default	Extra
+b1	binary(3)	YES		NULL	
+b2	varbinary(2)	YES		NULL	
+bitvalue	bit(64)	YES		NULL	
+SELECT * FROM `§Æ`;;
+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
+dt	1998-12-31 11:30:45
+dob	1984-09-08
+time	07:05:00
+y	1984
+SELECT * FROM `§Æ2`;
+region	summary	data	details	queries	query2	extract	paras
+xxxxxxxx	Testofonline backup	aaaaaaaaaa	bbbbbbbbbbb	hhhhhhhhhhh	kkkkkkkkkkkkk	zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz	onlinebackup1
+SELECT HEX(b1), HEX(b2),HEX(bitvalue) FROM `§¶œ`;
+HEX(b1)	HEX(b2)	HEX(bitvalue)
+610000	2130	FFFFFFFFFFFFFFFF
+612000	4100	5555
+612020	4120	1
+INSERT INTO `§¶œ` VALUES(0x7120,0x41,b'1010101010101010101010101010101010101010101010101010101010101010'), (0x5122, 0x6120,b'1000000000000000000000000000000000000000000000000000000000000000');
+SELECT HEX(b1), HEX(b2), HEX(bitvalue) FROM `§¶œ`;
+HEX(b1)	HEX(b2)	HEX(bitvalue)
+610000	2130	FFFFFFFFFFFFFFFF
+612000	4100	5555
+612020	4120	1
+712000	41	AAAAAAAAAAAAAAAA
+512200	6120	8000000000000000
+Perform restore again by changing the character set
+SET NAMES latin5;
+**Restore**
+RESTORE FROM 'bup_datatype.bak' OVERWRITE;
+backup_id
+#
+SHOW TABLES FROM `¥ü`;
+Tables_in_¥ü
+§¶�
+§�
+§�2
+** checking client character set **
+SELECT @@character_set_client;
+@@character_set_client
+latin5
+SELECT @@character_set_results;
+@@character_set_results
+latin5
+SELECT @@character_set_connection;
+@@character_set_connection
+latin5
+
+***  DROP `¥ü` DATABASE ****
+
+DROP DATABASE `¥ü`;

=== added file 'mysql-test/suite/backup/t/backup_datatypes.test'
--- a/mysql-test/suite/backup/t/backup_datatypes.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/backup/t/backup_datatypes.test	2008-12-05 22:20:02 +0000
@@ -0,0 +1,142 @@
+####################################################################
+# Author: Hema
+# Date: 2008-03-11
+# Purpose: To test the backup/restore of all datatypes using accented letters.
+# We will ensure that backup stores identifiers properly in utf8 format and
+# is retreived during restore without changing the client character set.
+#########################################################################
+
+--source include/not_embedded.inc
+--source include/have_debug.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 `¥ü`;
+--enable_warnings
+
+SET NAMES latin1;
+CREATE DATABASE `¥ü`;
+USE `¥ü`;
+
+--echo Create table with all datatypes and load with data.
+
+CREATE TABLE `§Æ`(
+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,
+dt DATETIME NOT NULL,
+dob DATE,
+time TIME,
+y YEAR
+);
+
+--echo creating table with blob and text columns
+
+CREATE TABLE `§Æ2`(
+region TEXT,
+summary LONGTEXT,
+data BLOB,
+details MEDIUMBLOB,
+queries TINYTEXT,
+query2 TINYBLOB,
+extract LONGBLOB,
+paras MEDIUMTEXT
+);
+
+CREATE TABLE `§¶œ`(b1 BINARY(3), b2 VARBINARY(2),bitvalue BIT(64));
+INSERT INTO `§¶œ` VALUES(0x61,0x2130,b'1111111111111111111111111111111111111111111111111111111111111111'), (0x6120,0x4100,b'101010101010101'), (0x612020, 0x4120,b'000000001');
+SELECT HEX(b1), HEX(b2), HEX(bitvalue) FROM `§¶œ`;
+
+INSERT INTO `§Æ` VALUES
+(785,127,7288,278829899,3777,'testing1','sweden','678.299',200.23,829899.909,
+'red','Asia','2008-06-01 16:23:30','98/12/31 11*30*45','1984-09-08','7:05','1984');
+
+INSERT INTO `§Æ2` VALUES
+('xxxxxxxx','Testofonline backup','aaaaaaaaaa','bbbbbbbbbbb','hhhhhhhhhhh',
+'kkkkkkkkkkkkk','mmmmmmmmmmmm','onlinebackup1');
+
+# Bug #37212  Restore crashes if table has longblob of size 1MB
+UPDATE `§Æ2` SET extract=repeat('z',100);
+--query_vertical SELECT * FROM `§Æ`;
+SELECT * FROM `§Æ2`;
+
+DESCRIBE `§Æ`;
+DESCRIBE `§Æ2`;
+DESCRIBE `§¶œ`;
+
+--echo ** Backup data **
+--echo
+--replace_column 1 #
+BACKUP DATABASE `¥ü` to 'bup_datatype.bak';
+
+--echo ** dropping  database**
+DROP DATABASE `¥ü`;
+
+--echo **Restore**
+--replace_column 1 #
+RESTORE FROM 'bup_datatype.bak' OVERWRITE;
+
+--echo ** checking the character set **
+SELECT @@character_set_client;
+SELECT @@character_set_results;
+SELECT @@character_set_connection;
+
+#show data and table columns
+DESCRIBE `§Æ`;
+DESCRIBE `§Æ2`;
+DESCRIBE `§¶œ`;
+
+--query_vertical SELECT * FROM `§Æ`;
+SELECT * FROM `§Æ2`;
+SELECT HEX(b1), HEX(b2),HEX(bitvalue) FROM `§¶œ`;
+
+INSERT INTO `§¶œ` VALUES(0x7120,0x41,b'1010101010101010101010101010101010101010101010101010101010101010'), (0x5122, 0x6120,b'1000000000000000000000000000000000000000000000000000000000000000');
+SELECT HEX(b1), HEX(b2), HEX(bitvalue) FROM `§¶œ`;
+
+--echo Perform restore again by changing the character set
+SET NAMES latin5;
+
+--echo **Restore**
+--replace_column 1 #
+RESTORE FROM 'bup_datatype.bak' OVERWRITE;
+
+#show data and table columns
+SHOW TABLES FROM `¥ü`;
+
+--echo ** checking client character set **
+SELECT @@character_set_client;
+SELECT @@character_set_results;
+SELECT @@character_set_connection;
+
+# Test cleanup section
+--echo
+--echo ***  DROP `¥ü` DATABASE ****
+--echo
+
+DROP DATABASE `¥ü`;
+
+--remove_file $MYSQLTEST_VARDIR/master-data/bup_datatype.bak
+

=== added file 'mysql-test/t/bzr_try.test'
--- a/mysql-test/t/bzr_try.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/bzr_try.test	2008-12-05 22:20:02 +0000
@@ -0,0 +1,18 @@
+#COMMENTS JUST TRYING BZR IS WORKING FINE
+#COMMENTS JUST TRYING BZR IS WORKING FINE
+#COMMENTS JUST TRYING BZR IS WORKING FINE
+#COMMENTS JUST TRYING BZR IS WORKING FINE
+#COMMENTS JUST TRYING BZR IS WORKING FINE
+#COMMENTS JUST TRYING BZR IS WORKING FINE
+#COMMENTS JUST TRYING BZR IS WORKING FINE
+#COMMENTS JUST TRYING BZR IS WORKING FINE
+#COMMENTS JUST TRYING BZR IS WORKING FINE
+#COMMENTS JUST TRYING BZR IS WORKING FINE
+#COMMENTS JUST TRYING BZR IS WORKING FINE
+#COMMENTS JUST TRYING BZR IS WORKING FINE
+#COMMENTS JUST TRYING BZR IS WORKING FINE
+#COMMENTS JUST TRYING BZR IS WORKING FINE
+#COMMENTS JUST TRYING BZR IS WORKING FINE
+#COMMENTS JUST TRYING BZR IS WORKING FINE
+#COMMENTS JUST TRYING BZR IS WORKING FINE
+

Thread
bzr commit into mysql-6.0-backup branch (hema:2740) Hema Sridharan5 Dec