Commit 23145c51 authored by unknown's avatar unknown
Browse files

Privileges columns were removed from output to be able 

to reuse test results for both server and --embedded-server
versions.


BitKeeper/deleted/.del-ctype_big5.result.es~f75ebc9f8836316f:
  Delete: mysql-test/r/ctype_big5.result.es
BitKeeper/deleted/.del-ctype_uca.result.es~9fab42f7561fa166:
  Delete: mysql-test/r/ctype_uca.result.es
parent 220edcf5

mysql-test/include/ctype_common.inc

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ USE d1; 
CREATE TABLE t1 (c CHAR(10), KEY(c));

--enable_warnings

# check the column was created with the expected charset/collation

--replace_result select,insert,update,references ""

SHOW FULL COLUMNS FROM t1;

INSERT INTO t1 VALUES ('aaa'),('aaaa'),('aaaaa');

SELECT c as want3results FROM t1 WHERE c LIKE 'aaa%';
@@ -37,6 +38,7 @@ DROP TABLE t1; 
CREATE TABLE t1 (c1 varchar(15), KEY c1 (c1(2)));

--enable_warnings

# check the column was created with the expected charset/collation

--replace_result select,insert,update,references ""

SHOW FULL COLUMNS FROM t1;

INSERT INTO t1 VALUES ('location'),('loberge'),('lotre'),('boabab');

SELECT c1 as want3results from t1 where c1 like 'l%';

mysql-test/r/ctype_big5.result

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ USE d1; 
CREATE TABLE t1 (c CHAR(10), KEY(c));

SHOW FULL COLUMNS FROM t1;

Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment

c	char(10)	big5_chinese_ci	YES	MUL	NULL		select,insert,update,references	

c	char(10)	big5_chinese_ci	YES	MUL	NULL			

INSERT INTO t1 VALUES ('aaa'),('aaaa'),('aaaaa');

SELECT c as want3results FROM t1 WHERE c LIKE 'aaa%';

want3results
@@ -21,7 +21,7 @@ DROP TABLE t1; 
CREATE TABLE t1 (c1 varchar(15), KEY c1 (c1(2)));

SHOW FULL COLUMNS FROM t1;

Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment

c1	varchar(15)	big5_chinese_ci	YES	MUL	NULL		select,insert,update,references	

c1	varchar(15)	big5_chinese_ci	YES	MUL	NULL			

INSERT INTO t1 VALUES ('location'),('loberge'),('lotre'),('boabab');

SELECT c1 as want3results from t1 where c1 like 'l%';

want3results

mysql-test/r/ctype_big5.result.es

deleted100644 → 0
+0 −58
Original line number Diff line number Diff line 
drop table if exists t1;

SET @test_character_set= 'big5';

SET @test_collation= 'big5_chinese_ci';

SET @safe_character_set_server= @@character_set_server;

SET @safe_collation_server= @@collation_server;

SET character_set_server= @test_character_set;

SET collation_server= @test_collation;

CREATE DATABASE d1;

USE d1;

CREATE TABLE t1 (c CHAR(10), KEY(c));

SHOW FULL COLUMNS FROM t1;

Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment

c	char(10)	big5_chinese_ci	YES	MUL	NULL			

INSERT INTO t1 VALUES ('aaa'),('aaaa'),('aaaaa');

SELECT c as want3results FROM t1 WHERE c LIKE 'aaa%';

want3results

aaa

aaaa

aaaaa

DROP TABLE t1;

CREATE TABLE t1 (c1 varchar(15), KEY c1 (c1(2)));

SHOW FULL COLUMNS FROM t1;

Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment

c1	varchar(15)	big5_chinese_ci	YES	MUL	NULL			

INSERT INTO t1 VALUES ('location'),('loberge'),('lotre'),('boabab');

SELECT c1 as want3results from t1 where c1 like 'l%';

want3results

location

loberge

lotre

SELECT c1 as want3results from t1 where c1 like 'lo%';

want3results

location

loberge

lotre

SELECT c1 as want1result  from t1 where c1 like 'loc%';

want1result

location

SELECT c1 as want1result  from t1 where c1 like 'loca%';

want1result

location

SELECT c1 as want1result  from t1 where c1 like 'locat%';

want1result

location

SELECT c1 as want1result  from t1 where c1 like 'locati%';

want1result

location

SELECT c1 as want1result  from t1 where c1 like 'locatio%';

want1result

location

SELECT c1 as want1result  from t1 where c1 like 'location%';

want1result

location

DROP TABLE t1;

DROP DATABASE d1;

USE test;

SET character_set_server= @safe_character_set_server;

SET collation_server= @safe_collation_server;

mysql-test/r/ctype_uca.result

+2 −2
Original line number Diff line number Diff line
@@ -2329,7 +2329,7 @@ USE d1; 
CREATE TABLE t1 (c CHAR(10), KEY(c));

SHOW FULL COLUMNS FROM t1;

Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment

c	char(10)	utf8_swedish_ci	YES	MUL	NULL		select,insert,update,references	

c	char(10)	utf8_swedish_ci	YES	MUL	NULL			

INSERT INTO t1 VALUES ('aaa'),('aaaa'),('aaaaa');

SELECT c as want3results FROM t1 WHERE c LIKE 'aaa%';

want3results
@@ -2340,7 +2340,7 @@ DROP TABLE t1; 
CREATE TABLE t1 (c1 varchar(15), KEY c1 (c1(2)));

SHOW FULL COLUMNS FROM t1;

Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment

c1	varchar(15)	utf8_swedish_ci	YES	MUL	NULL		select,insert,update,references	

c1	varchar(15)	utf8_swedish_ci	YES	MUL	NULL			

INSERT INTO t1 VALUES ('location'),('loberge'),('lotre'),('boabab');

SELECT c1 as want3results from t1 where c1 like 'l%';

want3results

mysql-test/r/ctype_uca.result.es

deleted100644 → 0
+0 −2377

File deleted.

Preview size limit exceeded, changes collapsed.