Commit 0670a02c authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-9500 

into  mysql.com:/home/jimw/my/mysql-4.1-clean
parents 41bb9bf9 c23ef5e1

mysql-test/r/lowercase_table2.result

+6 −1
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1,t2,T1,T2,t3,T3;

DROP TABLE IF EXISTS t1,t2,t3;

DROP DATABASE IF EXISTS `TEST_$1`;

DROP DATABASE IF EXISTS `test_$1`;

CREATE TABLE T1 (a int);
@@ -159,3 +159,8 @@ select * from myUC; 
i

use test;

drop database mysqltest_LC2;

create table t2aA (col1 int);

create table t1Aa (col1 int);

select t1Aa.col1 from t1aA,t2Aa where t1Aa.col1 = t2aA.col1;

col1

drop table t2aA, t1Aa;

mysql-test/t/lowercase_table2.test

+9 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ show variables like "lower_case_table_names"; 
enable_query_log;



--disable_warnings

DROP TABLE IF EXISTS t1,t2,T1,T2,t3,T3;

DROP TABLE IF EXISTS t1,t2,t3;

DROP DATABASE IF EXISTS `TEST_$1`;

DROP DATABASE IF EXISTS `test_$1`;

--enable_warnings
@@ -128,3 +128,11 @@ create table myUC (i int); 
select * from myUC;

use test;

drop database mysqltest_LC2;



#

# Bug #9500: Problem with WHERE clause

#

create table t2aA (col1 int);

create table t1Aa (col1 int);

select t1Aa.col1 from t1aA,t2Aa where t1Aa.col1 = t2aA.col1;

drop table t2aA, t1Aa;

sql/mysqld.cc

+5 −3
Original line number Diff line number Diff line
@@ -2988,6 +2988,11 @@ You should consider changing lower_case_table_names to 1 or 2", 
    lower_case_table_names= 0;

  }



  /* Reset table_alias_charset, now that lower_case_table_names is set. */

  table_alias_charset= (lower_case_table_names ?

			files_charset_info :

			&my_charset_bin);



  select_thread=pthread_self();

  select_thread_in_use=1;

  init_ssl();
@@ -6509,9 +6514,6 @@ static void get_options(int argc,char **argv) 


  /* Set global variables based on startup options */

  myisam_block_size=(uint) 1 << my_bit_log2(opt_myisam_block_size);

  table_alias_charset= (lower_case_table_names ?

			files_charset_info :

			&my_charset_bin);



  if (opt_short_log_format)

    opt_specialflag|= SPECIAL_SHORT_LOG_FORMAT;