Commit b2563ca8 authored by Ingo Struewing's avatar Ingo Struewing
Browse files

auto-merge

parents 6baa973d 33f51cb6

mysql-test/r/ctype_filesystem.result

0 → 100644
+11 −0
Original line number Diff line number Diff line 
SET CHARACTER SET utf8;

SHOW VARIABLES like 'character_sets_dir';

Variable_name	Value

character_sets_dir	/ß/

SHOW VARIABLES like 'character_set_filesystem';

Variable_name	Value

character_set_filesystem	latin1

SHOW VARIABLES like 'character_set_client';

Variable_name	Value

character_set_client	utf8

SET CHARACTER SET default;

mysql-test/r/update.result

+11 −0
Original line number Diff line number Diff line
@@ -491,4 +491,15 @@ update t1 join t2 on (t1.a=t2.a) set t1.id=t2.id; 
affected rows: 127

info: Rows matched: 128  Changed: 127  Warnings: 0

drop table t1,t2;

DROP TABLE IF EXISTS t1;

DROP FUNCTION IF EXISTS f1;

CREATE FUNCTION f1() RETURNS INT RETURN f1();

CREATE TABLE t1 (i INT);

INSERT INTO t1 VALUES (1);

UPDATE t1 SET i = 3 WHERE f1();

ERROR HY000: Recursive stored functions and triggers are not allowed.

UPDATE t1 SET i = f1();

ERROR HY000: Recursive stored functions and triggers are not allowed.

DROP TABLE t1;

DROP FUNCTION f1;

End of 5.0 tests

mysql-test/r/view.result

+29 −4
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ drop table t1; 
create table t1 (a int, b int);

create view v1 as select a, sum(b) from t1 group by a;

select b from v1 use index (some_index) where b=1;

ERROR HY000: Incorrect usage of index hints and VIEW

ERROR 42000: Key 'some_index' doesn't exist in table 'v1'

drop view v1;

drop table t1;

create table t1 (col1 char(5),col2 char(5));
@@ -3562,11 +3562,11 @@ CREATE TABLE t1 (a INT); 
INSERT INTO t1 VALUES (1),(2);

CREATE VIEW v1 AS SELECT * FROM t1;

SELECT * FROM v1 USE KEY(non_existant);

ERROR HY000: Incorrect usage of index hints and VIEW

ERROR 42000: Key 'non_existant' doesn't exist in table 'v1'

SELECT * FROM v1 FORCE KEY(non_existant);

ERROR HY000: Incorrect usage of index hints and VIEW

ERROR 42000: Key 'non_existant' doesn't exist in table 'v1'

SELECT * FROM v1 IGNORE KEY(non_existant);

ERROR HY000: Incorrect usage of index hints and VIEW

ERROR 42000: Key 'non_existant' doesn't exist in table 'v1'

DROP VIEW v1;

DROP TABLE t1;

CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT, b INT NOT NULL DEFAULT 0,
@@ -3674,6 +3674,31 @@ DROP VIEW v1; 


CREATE VIEW v1 AS SELECT 1;

DROP VIEW v1;

CREATE TABLE t1 (c1 INT PRIMARY KEY, c2 INT, INDEX (c2));

INSERT INTO t1 VALUES (1,1), (2,2), (3,3);

SELECT * FROM t1 USE INDEX (PRIMARY) WHERE c1=2;

c1	c2

2	2

SELECT * FROM t1 USE INDEX (c2) WHERE c2=2;

c1	c2

2	2

CREATE VIEW v1 AS SELECT c1, c2 FROM t1;

SHOW INDEX FROM v1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

SELECT * FROM v1 USE INDEX (PRIMARY) WHERE c1=2;

ERROR 42000: Key 'PRIMARY' doesn't exist in table 'v1'

SELECT * FROM v1 FORCE INDEX (PRIMARY) WHERE c1=2;

ERROR 42000: Key 'PRIMARY' doesn't exist in table 'v1'

SELECT * FROM v1 IGNORE INDEX (PRIMARY) WHERE c1=2;

ERROR 42000: Key 'PRIMARY' doesn't exist in table 'v1'

SELECT * FROM v1 USE INDEX (c2) WHERE c2=2;

ERROR 42000: Key 'c2' doesn't exist in table 'v1'

SELECT * FROM v1 FORCE INDEX (c2) WHERE c2=2;

ERROR 42000: Key 'c2' doesn't exist in table 'v1'

SELECT * FROM v1 IGNORE INDEX (c2) WHERE c2=2;

ERROR 42000: Key 'c2' doesn't exist in table 'v1'

DROP VIEW v1;

DROP TABLE t1;

# -----------------------------------------------------------------

# -- End of 5.0 tests.

# -----------------------------------------------------------------

mysql-test/t/ctype_filesystem-master.opt

0 → 100644
+2 −0
Original line number Diff line number Diff line 
--character-sets-dir=/ß

--character-set-filesystem=latin1

mysql-test/t/ctype_filesystem.test

0 → 100644
+5 −0
Original line number Diff line number Diff line 
SET CHARACTER SET utf8;

SHOW VARIABLES like 'character_sets_dir';

SHOW VARIABLES like 'character_set_filesystem';

SHOW VARIABLES like 'character_set_client';

SET CHARACTER SET default;