Commit 3db93f80 authored by unknown's avatar unknown
Browse files

lower_case_table_names=2 (Keep case for table names) was not honored 

with ALTER TABLE and CREATE/DROP INDEX. (Bug #3109)
Make net_buffer_length visible for mysql clients (Bug #4206)


include/mysql.h:
  Make net_buffer_length visible for mysql clients
libmysql/libmysql.c:
  Make net_buffer_length visible for mysql clients
mysql-test/mysql-test-run.sh:
  Don't give warning for some common 'safe' warnings
mysql-test/r/lowercase_table2.result:
  Test name conversion with ALTER TABLE / CREATE INDEX (Bug #3109)
mysql-test/t/lowercase_table2.test:
  Test name conversion with ALTER TABLE / CREATE INDEX (Bug #3109)
scripts/mysql_install_db.sh:
  Removed not used variable
sql/sql_table.cc:
  lower_case_table_names=2 (Keep case for table names) was not honored
  with ALTER TABLE and CREATE/DROP INDEX. (Bug #3109)
parent 5fa063ba

include/mysql.h

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ typedef struct st_mysql_parameters 
  unsigned long *p_net_buffer_length;

} MYSQL_PARAMETERS;



#if !defined(MYSQL_CLIENT) && !defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY)

#if !defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY)

#define max_allowed_packet (*mysql_get_parameters()->p_max_allowed_packet)

#define net_buffer_length (*mysql_get_parameters()->p_net_buffer_length)

#endif

libmysql/libmysql.c

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ 
#define INADDR_NONE	-1

#endif



#undef net_buffer_length

#undef max_allowed_packet

static my_bool	mysql_client_init=0;

uint		mysql_port=0;

my_string	mysql_unix_port=0;

mysql-test/mysql-test-run.sh

+1 −1
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ report_stats () { 
    #

    $RM -f $MY_LOG_DIR/warnings $MY_LOG_DIR/warnings.tmp

    # Remove some non fatal warnings from the log files

    $SED -e 's!Warning:  Table:.* on delete!!g' \

    $SED -e 's!Warning:  Table:.* on delete!!g' -e 's!Warning: Setting lower_case_table_names=2!!g' -e 's!Warning: One can only use the --user.*root!!g' \

         $MY_LOG_DIR/*.err > $MY_LOG_DIR/warnings.tmp



    found_error=0

mysql-test/r/lowercase_table2.result

+10 −0
Original line number Diff line number Diff line
@@ -121,3 +121,13 @@ LOCATION 
Mic-5

Mic-6

drop table T1;

create table T1 (A int);

alter table T1 add index (A);

show tables like 'T1%';

Tables_in_test (T1%)

T1

alter table t1 add index (A);

show tables like 't1%';

Tables_in_test (t1%)

t1

drop table t1;

mysql-test/t/lowercase_table2.test

+11 −0
Original line number Diff line number Diff line
@@ -89,3 +89,14 @@ SELECT LOCATION FROM T1 WHERE EVENT_ID=2 UNION ALL SELECT LOCATION FROM T1 WHER 
SELECT LOCATION FROM T1 WHERE EVENT_ID=2 UNION ALL  SELECT LOCATION FROM T1 WHERE EVENT_ID=3;

SELECT LOCATION FROM T1 WHERE EVENT_ID=2 UNION ALL  SELECT LOCATION FROM T1 WHERE EVENT_ID=3;

drop table T1;



#

# Test name conversion with ALTER TABLE / CREATE INDEX (Bug #3109)

#



create table T1 (A int);

alter table T1 add index (A);

show tables like 'T1%';

alter table t1 add index (A);

show tables like 't1%';

drop table t1;