Commit 762bee96 authored by unknown's avatar unknown
Browse files

After merge fixes 


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
parent fe937a2b

mysql-test/mysql-test-run.sh

+1 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ SLAVE_MYERR="$MYSQL_TEST_DIR/var/log/slave.err" 
CURRENT_TEST="$MYSQL_TEST_DIR/var/log/current_test"

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

 MY_BASEDIR=$MYSQL_TEST_DIR

mysql-test/r/lowercase_table.result

+4 −8
Original line number Diff line number Diff line
@@ -45,10 +45,11 @@ count(bags.a) 
drop table t1;

create database mysqltest;

use MYSQLTEST;

create table t1 (a int);

select T1.a from MYSQLTEST.T1;

a

select t1.a from MYSQLTEST.T1;

Unknown table 't1' in field list

a

select mysqltest.t1.* from MYSQLTEST.t1;

a

select MYSQLTEST.t1.* from MYSQLTEST.t1;
@@ -59,7 +60,9 @@ select MYSQLTEST.T1.* from T1; 
a

alter table t1 rename to T1;

select MYSQLTEST.t1.* from MYSQLTEST.t1;

a

drop database mysqltest;

use test;

create table t1 (a int);

create table t2 (a int);

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;

show tables;

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;

mysql-test/t/alter_table.test

+2 −2
Original line number Diff line number Diff line
@@ -110,14 +110,14 @@ drop database mysqltest; 
#

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

--disable_warnings

create database mysqltest;

--enable_warnings

create table mysqltest.t1 (a int,b int,c int);

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;

-- error 1142

alter table t1 rename t2;

mysql-test/t/lowercase_table.test

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ create database mysqltest; 
use MYSQLTEST;

create table t1 (a int);

select T1.a from MYSQLTEST.T1;

--error 1109

select t1.a 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;

select MYSQLTEST.t1.* from MYSQLTEST.t1;

drop database mysqltest;

use test;



#

# multiupdate/delete & --lower-case-table-names

sql/sql_base.cc

+1 −1
Original line number Diff line number Diff line
@@ -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

    */

    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;

  }