database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

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

Browse Source 
with ALTER TABLE and CREATE/DROP INDEX. (Bug #3109)
Make net_buffer_length visible for mysql clients (Bug #4206)
This commit is contained in:
monty@mysql.com
2004-06-23 16:44:34 +03:00
parent f56df164f0
commit ad86016e2f
7 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mysql.h
View File

@ -250,7 +250,7 @@ typedef struct st_mysql_parameters
unsigned long *p_net_buffer_length; unsigned long *p_net_buffer_length;
} MYSQL_PARAMETERS; } 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 max_allowed_packet (*mysql_get_parameters()->p_max_allowed_packet)
#define net_buffer_length (*mysql_get_parameters()->p_net_buffer_length) #define net_buffer_length (*mysql_get_parameters()->p_net_buffer_length)
#endif #endif

2
libmysql/libmysql.c
View File

@ -59,6 +59,8 @@
#define INADDR_NONE -1 #define INADDR_NONE -1
#endif #endif
#undef net_buffer_length
#undef max_allowed_packet
static my_bool mysql_client_init=0; static my_bool mysql_client_init=0;
uint mysql_port=0; uint mysql_port=0;
my_string mysql_unix_port=0; my_string mysql_unix_port=0;

2
mysql-test/mysql-test-run.sh
View File

@ -668,7 +668,7 @@ report_stats () {
# #
$RM -f $MY_LOG_DIR/warnings $MY_LOG_DIR/warnings.tmp $RM -f $MY_LOG_DIR/warnings $MY_LOG_DIR/warnings.tmp
# Remove some non fatal warnings from the log files # 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 $MY_LOG_DIR/*.err > $MY_LOG_DIR/warnings.tmp
found_error=0 found_error=0

10
mysql-test/r/lowercase_table2.result
View File

@ -121,3 +121,13 @@ LOCATION
Mic-5 Mic-5
Mic-6 Mic-6
drop table T1; 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;

11
mysql-test/t/lowercase_table2.test
View File

@ -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;
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; 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;

2
scripts/mysql_install_db.sh
View File

@ -342,7 +342,7 @@ fi
echo "Installing all prepared tables" echo "Installing all prepared tables"
if eval "$mysqld $defaults $mysqld_opt --bootstrap --skip-grant-tables \ if eval "$mysqld $defaults $mysqld_opt --bootstrap --skip-grant-tables \
--basedir=$basedir --datadir=$ldata --skip-innodb --skip-bdb \ --basedir=$basedir --datadir=$ldata --skip-innodb --skip-bdb \
$extra_arg $args" << END_OF_DATA $args" << END_OF_DATA
use mysql; use mysql;
$c_d $c_d
$i_d $i_d

5
sql/sql_table.cc
View File

@ -1545,7 +1545,10 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
} }
} }
else else
new_alias= new_name= table_name; {
new_alias= (lower_case_table_names == 2) ? alias : table_name;
new_name= table_name;
}
old_db_type=table->db_type; old_db_type=table->db_type;
if (create_info->db_type == DB_TYPE_DEFAULT) if (create_info->db_type == DB_TYPE_DEFAULT)