Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 (c7a681ff) · Commits · Software / OSDI20 Artifacts / mariadb

BitKeeper/etc/logging_ok

+2 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,7 @@ hf@deer.mysql.r18.ru
		hf@genie.(none)
		holyfoot@mysql.com
		igor@hundin.mysql.fi
		igor@igor-inspiron.creware.com
		igor@linux.local
		igor@rurik.mysql.com
		ingo@mysql.com
		@@ -176,6 +177,7 @@ mysqldev@melody.local
		mysqldev@mysql.com
		mysqldev@o2k.irixworld.net
		ndbdev@dl145b.mysql.com
		ndbdev@dl145c.mysql.com
		ndbdev@eel.hemma.oreland.se
		ndbdev@ndbmaster.mysql.com
		nick@mysql.com

mysql-test/r/ctype_utf8.result

+34 −0

Original line number	Diff line number	Diff line
		@@ -905,3 +905,37 @@ select * from t1 where city = 'Durban ';
		id city
		2 Durban
		drop table t1;
		SET NAMES UTF8;
		CREATE TABLE t1 (
		`id` int(20) NOT NULL auto_increment,
		`country` varchar(100) NOT NULL default '',
		`shortcode` varchar(100) NOT NULL default '',
		`operator` varchar(100) NOT NULL default '',
		`momid` varchar(30) NOT NULL default '',
		`keyword` varchar(160) NOT NULL default '',
		`content` varchar(160) NOT NULL default '',
		`second_token` varchar(160) default NULL,
		`gateway_id` int(11) NOT NULL default '0',
		`created` datetime NOT NULL default '0000-00-00 00:00:00',
		`msisdn` varchar(15) NOT NULL default '',
		PRIMARY KEY (`id`),
		UNIQUE KEY `MSCCSPK_20030521130957121` (`momid`),
		KEY `IX_mobile_originated_message_keyword` (`keyword`),
		KEY `IX_mobile_originated_message_created` (`created`),
		KEY `IX_mobile_originated_message_support` (`msisdn`,`momid`,`keyword`,`gateway_id`,`created`)
		) ENGINE=MyISAM DEFAULT CHARSET=utf8;
		INSERT INTO t1 VALUES
		(1,'blah','464','aaa','fkc1c9ilc20x0hgae7lx6j09','ERR','ERR Имри.Афимим.Аеимимримдмримрмрирор имримримримр имридм ирбднримрфмририримрфмфмим.Ад.Д имдимримрад.Адимримримрмдиримримримр м.Дадимфшьмримд им.Адимимрн имадми','ИМРИ.АФИМИМ.АЕИМИМРИМДМРИМРМРИРОР',3,'2005-06-01 17:30:43','1234567890'),
		(2,'blah','464','aaa','haxpl2ilc20x00bj4tt2m5ti','11','11 g','G',3,'2005-06-02 22:43:10','1234567890');
		CREATE TABLE t2 (
		`msisdn` varchar(15) NOT NULL default '',
		`operator_id` int(11) NOT NULL default '0',
		`created` datetime NOT NULL default '0000-00-00 00:00:00',
		UNIQUE KEY `PK_user` (`msisdn`)
		) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		INSERT INTO t2 VALUES ('1234567890',2,'2005-05-24 13:53:25');
		SELECT content, t2.msisdn FROM t1, t2 WHERE t1.msisdn = '1234567890';
		content msisdn
		ERR Имри.Афимим.Аеимимримдмримрмрирор имримримримр имридм ирбднримрфмририримрфмфмим.Ад.Д имдимримрад.Адимримримрмдиримримримр м.Дадимфшьмримд им.Адимимрн имадми 1234567890
		11 g 1234567890
		DROP TABLE t1,t2;

mysql-test/r/func_if.result

+13 −0

Original line number	Diff line number	Diff line
		@@ -86,3 +86,16 @@ drop table t1;
		SELECT NULLIF(5,5) IS NULL, NULLIF(5,5) IS NOT NULL;
		NULLIF(5,5) IS NULL NULLIF(5,5) IS NOT NULL
		1 0
		CREATE TABLE t1 (a CHAR(10));
		INSERT INTO t1 VALUES ('aaa'), (NULL), (''), ('bbb');
		SELECT a, NULLIF(a,'') FROM t1;
		a NULLIF(a,'')
		aaa aaa
		NULL NULL
		NULL
		bbb bbb
		SELECT a, NULLIF(a,'') FROM t1 WHERE NULLIF(a,'') IS NULL;
		a NULLIF(a,'')
		NULL NULL
		NULL
		DROP TABLE t1;

mysql-test/t/ctype_utf8.test

+42 −0

Original line number	Diff line number	Diff line
		@@ -746,3 +746,45 @@ insert into t1 values (2,'Durban');
		select * from t1 where city = 'Durban';
		select * from t1 where city = 'Durban ';
		drop table t1;

		#
		# Test for bug #11167: join for utf8 varchar value longer than 255 bytes
		#

		SET NAMES UTF8;

		CREATE TABLE t1 (
		`id` int(20) NOT NULL auto_increment,
		`country` varchar(100) NOT NULL default '',
		`shortcode` varchar(100) NOT NULL default '',
		`operator` varchar(100) NOT NULL default '',
		`momid` varchar(30) NOT NULL default '',
		`keyword` varchar(160) NOT NULL default '',
		`content` varchar(160) NOT NULL default '',
		`second_token` varchar(160) default NULL,
		`gateway_id` int(11) NOT NULL default '0',
		`created` datetime NOT NULL default '0000-00-00 00:00:00',
		`msisdn` varchar(15) NOT NULL default '',
		PRIMARY KEY (`id`),
		UNIQUE KEY `MSCCSPK_20030521130957121` (`momid`),
		KEY `IX_mobile_originated_message_keyword` (`keyword`),
		KEY `IX_mobile_originated_message_created` (`created`),
		KEY `IX_mobile_originated_message_support` (`msisdn`,`momid`,`keyword`,`gateway_id`,`created`)
		) ENGINE=MyISAM DEFAULT CHARSET=utf8;

		INSERT INTO t1 VALUES
		(1,'blah','464','aaa','fkc1c9ilc20x0hgae7lx6j09','ERR','ERR Имри.Афимим.Аеимимримдмримрмрирор имримримримр имридм ирбднримрфмририримрфмфмим.Ад.Д имдимримрад.Адимримримрмдиримримримр м.Дадимфшьмримд им.Адимимрн имадми','ИМРИ.АФИМИМ.АЕИМИМРИМДМРИМРМРИРОР',3,'2005-06-01 17:30:43','1234567890'),
		(2,'blah','464','aaa','haxpl2ilc20x00bj4tt2m5ti','11','11 g','G',3,'2005-06-02 22:43:10','1234567890');

		CREATE TABLE t2 (
		`msisdn` varchar(15) NOT NULL default '',
		`operator_id` int(11) NOT NULL default '0',
		`created` datetime NOT NULL default '0000-00-00 00:00:00',
		UNIQUE KEY `PK_user` (`msisdn`)
		) ENGINE=InnoDB DEFAULT CHARSET=utf8;

		INSERT INTO t2 VALUES ('1234567890',2,'2005-05-24 13:53:25');

		SELECT content, t2.msisdn FROM t1, t2 WHERE t1.msisdn = '1234567890';

		DROP TABLE t1,t2;

mysql-test/t/func_if.test

+12 −0

Original line number	Diff line number	Diff line
		@@ -60,3 +60,15 @@ drop table t1;
		# Bug #5595 NULLIF() IS NULL returns false if NULLIF() returns NULL
		#
		SELECT NULLIF(5,5) IS NULL, NULLIF(5,5) IS NOT NULL;

		#
		# Test for bug #11142: evaluation of NULLIF when the first argument is NULL
		#

		CREATE TABLE t1 (a CHAR(10));
		INSERT INTO t1 VALUES ('aaa'), (NULL), (''), ('bbb');

		SELECT a, NULLIF(a,'') FROM t1;
		SELECT a, NULLIF(a,'') FROM t1 WHERE NULLIF(a,'') IS NULL;

		DROP TABLE t1;