MDEV-36979 Same alias name with different case on same table is not working in functions

table keys {db,table,alias} must be compared with table_alias_charset

Author: vuvova

mysql-test/main/lowercase_fs_off.result

@@ -271,3 +271,21 @@ CREATE TABLE t1 (a Mariadb_schema.date);
 ERROR HY000: Unknown data type: 'Mariadb_schema.date'
 CREATE TABLE t1 (a mariadb_schema.date);
 DROP TABLE t1;
+# End of 10.3 tests
+#
+# MDEV-36979 Same alias name with different case on same table is not working in functions
+#
+create table t1 (a int);
+insert t1 values (1);
+create table T1 (b int);
+insert T1 values (10);
+create function t1test(val int) returns int
+begin
+return (select a from t1 where exists (select b from T1 where b > val));
+end//
+select t1test(1);
+t1test(1)
+1
+drop function t1test;
+drop table t1, T1;
+# End of 10.11 tests

mysql-test/main/lowercase_fs_off.test

@@ -146,3 +146,24 @@ CREATE TABLE t1 (a Mariadb_schema.date);
 
 CREATE TABLE t1 (a mariadb_schema.date);
 DROP TABLE t1;
+
+--echo # End of 10.3 tests
+
+--echo #
+--echo # MDEV-36979 Same alias name with different case on same table is not working in functions
+--echo #
+create table t1 (a int);
+insert t1 values (1);
+create table T1 (b int);
+insert T1 values (10);
+delimiter //;
+create function t1test(val int) returns int
+begin
+  return (select a from t1 where exists (select b from T1 where b > val));
+end//
+delimiter ;//
+select t1test(1);
+drop function t1test;
+drop table t1, T1;
+
+--echo # End of 10.11 tests

mysql-test/main/sp-bugs2.result

@@ -21,3 +21,25 @@ Warnings:
 Note	1050	Table 't2' already exists
 DROP PROCEDURE sp;
 DROP TABLE t1, t2;
+#
+# MDEV-36979 Same alias name with different case on same table is not working in functions
+#
+create table t1 ( id int primary key auto_increment, name varchar(10));
+insert into t1 (name) values ('wrbyviwb');
+insert into t1 (name) values ('wrbyrwb1');
+insert into t1 (name) values ('wrbrwb3');
+select cnt.name from t1 cnt join ( select CMT.id from t1 CMT where CMT.id=1) t2 on t2.id=cnt.id;
+name
+wrbyviwb
+create function t1test(val int) returns varchar(400) charset utf8
+begin
+declare output varchar(400) default '';
+set output = (select cnt.name from t1 cnt join ( select CMT.id from t1 CMT where CMT.id=val) t2 on t2.id=cnt.id);
+return output;
+end//
+select t1test(1);
+t1test(1)
+wrbyviwb
+drop function t1test;
+drop table t1;
+# End of 10.11 tests

mysql-test/main/sp-bugs2.test

@@ -27,3 +27,24 @@ CALL sp();
 DROP PROCEDURE sp;
 DROP TABLE t1, t2;
 
+--echo #
+--echo # MDEV-36979 Same alias name with different case on same table is not working in functions
+--echo #
+create table t1 ( id int primary key auto_increment, name varchar(10));
+insert into t1 (name) values ('wrbyviwb');
+insert into t1 (name) values ('wrbyrwb1');
+insert into t1 (name) values ('wrbrwb3');
+select cnt.name from t1 cnt join ( select CMT.id from t1 CMT where CMT.id=1) t2 on t2.id=cnt.id;
+delimiter //;
+create function t1test(val int) returns varchar(400) charset utf8
+begin
+  declare output varchar(400) default '';
+  set output = (select cnt.name from t1 cnt join ( select CMT.id from t1 CMT where CMT.id=val) t2 on t2.id=cnt.id);
+  return output;
+end//
+delimiter ;//
+select t1test(1);
+drop function t1test;
+drop table t1;
+
+--echo # End of 10.11 tests

mysql-test/suite/binlog/r/binlog_unsafe.result

@@ -2544,13 +2544,13 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
 master-bin.000001	#	Annotate_rows	#	#	insert into t2(a) values(new.a)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
-master-bin.000001	#	Table_map	#	#	table_id: # (test.t3)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t3)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Annotate_rows	#	#	insert into t3(a) values(new.a)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
-master-bin.000001	#	Table_map	#	#	table_id: # (test.t3)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t3)
 master-bin.000001	#	Write_rows_v1	#	#	table_id: #
 master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT

sql/sp_head.cc

@@ -606,7 +606,7 @@ sp_head::sp_head(MEM_ROOT *mem_root_arg, sp_package *parent,
   m_lex.empty();
   my_init_dynamic_array(key_memory_sp_head_main_root, &m_instr,
                         sizeof(sp_instr *), 16, 8, MYF(0));
-  my_hash_init(key_memory_sp_head_main_root, &m_sptabs, system_charset_info, 0,
+  my_hash_init(key_memory_sp_head_main_root, &m_sptabs, table_alias_charset, 0,
                0, 0, sp_table_key, 0, 0);
   my_hash_init(key_memory_sp_head_main_root, &m_sroutines, system_charset_info,
                0, 0, 0, sp_sroutine_key, 0, 0);