Merge maint2.mysql.com:/data/localhome/tsmith/bk/g41 (0f342b6a) · Commits · Software / OSDI20 Artifacts / mariadb

include/mysql_com.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,9 @@
		#define USERNAME_LENGTH 16
		#define SERVER_VERSION_LENGTH 60
		#define SQLSTATE_LENGTH 5
		#define SYSTEM_CHARSET_MBMAXLEN 3
		#define NAME_BYTE_LEN NAME_LEN*SYSTEM_CHARSET_MBMAXLEN
		#define USERNAME_BYTE_LENGTH USERNAME_LENGTH*SYSTEM_CHARSET_MBMAXLEN

		#define LOCAL_HOST "localhost"
		#define LOCAL_HOST_NAMEDPIPE "."

+12 −0

Original line number	Diff line number	Diff line
		@@ -1340,3 +1340,15 @@ select a from t1 group by a;
		a
		e
		drop table t1;
		set names utf8;
		grant select on test.* to юзер_юзер@localhost;
		user()
		юзер_юзер@localhost
		revoke all on test.* from юзер_юзер@localhost;
		drop user юзер_юзер@localhost;
		create database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
		use имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
		select database();
		database()
		имя_базы_в_кодировке_утф8_длиной_больше_чем_45
		drop database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;

+21 −0

Original line number	Diff line number	Diff line
		@@ -83,3 +83,24 @@ b a
		3 3
		3 3
		DROP TABLE t1, t2, t3;
		CREATE TABLE `t1` (`id1` INT) ;
		INSERT INTO `t1` (`id1`) VALUES (1),(5),(2);
		CREATE TABLE `t2` (
		`id1` INT,
		`id2` INT NOT NULL,
		`id3` INT,
		`id4` INT NOT NULL,
		UNIQUE (`id2`,`id4`),
		KEY (`id1`)
		) ENGINE=InnoDB;
		INSERT INTO `t2`(`id1`,`id2`,`id3`,`id4`) VALUES
		(1,1,1,0),
		(1,1,2,1),
		(5,1,2,2),
		(6,1,2,3),
		(1,2,2,2),
		(1,2,1,1);
		SELECT `id1` FROM `t1` WHERE `id1` NOT IN (SELECT `id1` FROM `t2` WHERE `id2` = 1 AND `id3` = 2);
		id1
		2
		DROP TABLE t1, t2;

+22 −0

Original line number	Diff line number	Diff line
		@@ -2895,3 +2895,25 @@ select * from t1 where NOT(s1 = ALL (select s1/s1 from t1));
		s1
		2
		drop table t1;
		create table t1 (
		retailerID varchar(8) NOT NULL,
		statusID int(10) unsigned NOT NULL,
		changed datetime NOT NULL,
		UNIQUE KEY retailerID (retailerID, statusID, changed)
		);
		INSERT INTO t1 VALUES("0026", "1", "2005-12-06 12:18:56");
		INSERT INTO t1 VALUES("0026", "2", "2006-01-06 12:25:53");
		INSERT INTO t1 VALUES("0037", "1", "2005-12-06 12:18:56");
		INSERT INTO t1 VALUES("0037", "2", "2006-01-06 12:25:53");
		INSERT INTO t1 VALUES("0048", "1", "2006-01-06 12:37:50");
		INSERT INTO t1 VALUES("0059", "1", "2006-01-06 12:37:50");
		select * from t1 r1
		where (r1.retailerID,(r1.changed)) in
		(SELECT r2.retailerId,(max(changed)) from t1 r2
		group by r2.retailerId);
		retailerID statusID changed
		0026 2 2006-01-06 12:25:53
		0037 2 2006-01-06 12:25:53
		0048 1 2006-01-06 12:37:50
		0059 1 2006-01-06 12:37:50
		drop table t1;

+16 −0

Original line number	Diff line number	Diff line
		@@ -1072,4 +1072,20 @@ explain select a from t1 group by a;
		select a from t1 group by a;
		drop table t1;

		#
		# Bug#20393: User name truncation in mysql client
		# Bug#21432: Database/Table name limited to 64 bytes, not chars, problems with multi-byte
		#
		set names utf8;
		#create user юзер_юзер@localhost;
		grant select on test.* to юзер_юзер@localhost;
		--exec $MYSQL --default-character-set=utf8 --user=юзер_юзер -e "select user()"
		revoke all on test.* from юзер_юзер@localhost;
		drop user юзер_юзер@localhost;

		create database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
		use имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
		select database();
		drop database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;

		# End of 4.1 tests