database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

After merge fixes

Browse Source 
mysql-test/mysql-test-run.sh:
  Export MASTER_MYSOCK (used in some tests)
mysql-test/t/alter_table.test:
  Use MASTER_MYSOCK instead of master.sock
This commit is contained in:
unknown
2004-09-02 16:57:26 +03:00
parent fe937a2b1b
commit 762bee96d2
7 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -438,7 +438,7 @@ SLAVE_MYERR="$MYSQL_TEST_DIR/var/log/slave.err"
CURRENT_TEST="$MYSQL_TEST_DIR/var/log/current_test" CURRENT_TEST="$MYSQL_TEST_DIR/var/log/current_test"
SMALL_SERVER="--key_buffer_size=1M --sort_buffer=256K --max_heap_table_size=1M" SMALL_SERVER="--key_buffer_size=1M --sort_buffer=256K --max_heap_table_size=1M"
export MASTER_MYPORT SLAVE_MYPORT MYSQL_TCP_PORT export MASTER_MYPORT SLAVE_MYPORT MYSQL_TCP_PORT MASTER_MYSOCK
if [ x$SOURCE_DIST = x1 ] ; then if [ x$SOURCE_DIST = x1 ] ; then
MY_BASEDIR=$MYSQL_TEST_DIR MY_BASEDIR=$MYSQL_TEST_DIR

12
mysql-test/r/lowercase_table.result
View File

@ -45,10 +45,11 @@ count(bags.a)
drop table t1; drop table t1;
create database mysqltest; create database mysqltest;
use MYSQLTEST; use MYSQLTEST;
create table t1 (a int);
select T1.a from MYSQLTEST.T1; select T1.a from MYSQLTEST.T1;
a a
select t1.a from MYSQLTEST.T1; select t1.a from MYSQLTEST.T1;
Unknown table 't1' in field list a
select mysqltest.t1.* from MYSQLTEST.t1; select mysqltest.t1.* from MYSQLTEST.t1;
a a
select MYSQLTEST.t1.* from MYSQLTEST.t1; select MYSQLTEST.t1.* from MYSQLTEST.t1;
@ -59,7 +60,9 @@ select MYSQLTEST.T1.* from T1;
a a
alter table t1 rename to T1; alter table t1 rename to T1;
select MYSQLTEST.t1.* from MYSQLTEST.t1; select MYSQLTEST.t1.* from MYSQLTEST.t1;
a
drop database mysqltest; drop database mysqltest;
use test;
create table t1 (a int); create table t1 (a int);
create table t2 (a int); create table t2 (a int);
delete p1.*,P2.* from t1 as p1, t2 as p2 where p1.a=P2.a; delete p1.*,P2.* from t1 as p1, t2 as p2 where p1.a=P2.a;
@ -76,10 +79,3 @@ ERROR 42000: Not unique table/alias: 'C'
drop table t1, t2; drop table t1, t2;
show tables; show tables;
Tables_in_test Tables_in_test
create table t1 (a int);
select TEST.t1.* from TEST.t1;
a
alter table t1 rename to T1;
select TEST.t1.* from TEST.t1;
a
drop table t1;

4
mysql-test/t/alter_table.test
View File

@ -110,14 +110,14 @@ drop database mysqltest;
# #
# Rights for renaming test (Bug #3270) # Rights for renaming test (Bug #3270)
# #
connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock); connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
connection root; connection root;
--disable_warnings --disable_warnings
create database mysqltest; create database mysqltest;
--enable_warnings --enable_warnings
create table mysqltest.t1 (a int,b int,c int); create table mysqltest.t1 (a int,b int,c int);
grant all on mysqltest.t1 to mysqltest_1@localhost; grant all on mysqltest.t1 to mysqltest_1@localhost;
connect (user1,localhost,mysqltest_1,,mysqltest,$MASTER_MYPORT,master.sock); connect (user1,localhost,mysqltest_1,,mysqltest,$MASTER_MYPORT,$MASTER_MYSOCK);
connection user1; connection user1;
-- error 1142 -- error 1142
alter table t1 rename t2; alter table t1 rename t2;

2
mysql-test/t/lowercase_table.test
View File

@ -39,7 +39,6 @@ create database mysqltest;
use MYSQLTEST; use MYSQLTEST;
create table t1 (a int); create table t1 (a int);
select T1.a from MYSQLTEST.T1; select T1.a from MYSQLTEST.T1;
--error 1109
select t1.a from MYSQLTEST.T1; select t1.a from MYSQLTEST.T1;
select mysqltest.t1.* from MYSQLTEST.t1; select mysqltest.t1.* from MYSQLTEST.t1;
select MYSQLTEST.t1.* from MYSQLTEST.t1; select MYSQLTEST.t1.* from MYSQLTEST.t1;
@ -48,6 +47,7 @@ select MYSQLTEST.T1.* from T1;
alter table t1 rename to T1; alter table t1 rename to T1;
select MYSQLTEST.t1.* from MYSQLTEST.t1; select MYSQLTEST.t1.* from MYSQLTEST.t1;
drop database mysqltest; drop database mysqltest;
use test;
# #
# multiupdate/delete & --lower-case-table-names # multiupdate/delete & --lower-case-table-names

2
sql/sql_base.cc
View File

@ -2458,7 +2458,7 @@ insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name,
'name' of the item which may be used in the select list 'name' of the item which may be used in the select list
*/ */
strmake(name_buff, db_name, sizeof(name_buff)-1); strmake(name_buff, db_name, sizeof(name_buff)-1);
my_casedn_str(name_buff); my_casedn_str(files_charset_info, name_buff);
db_name= name_buff; db_name= name_buff;
} }

1
sql/table.cc
View File

@ -1120,7 +1120,6 @@ void append_unescaped(String *res, const char *pos, uint length)
res->append(*pos); res->append(*pos);
break; break;
} }
pos++;
} }
res->append('\''); res->append('\'');
} }

2
tests/client_test.c
View File

@ -10189,7 +10189,7 @@ static void get_options(int argc, char **argv)
int ho_error; int ho_error;
if ((ho_error= handle_options(&argc, &argv, client_test_long_options, if ((ho_error= handle_options(&argc, &argv, client_test_long_options,
get_one_option, 0))) get_one_option)))
exit(ho_error); exit(ho_error);
if (tty_password) if (tty_password)