Commit d70df1b2 authored by unknown's avatar unknown
Browse files

Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 

into hundin.mysql.fi:/home/jan/mysql-4.1
parents cb8a461e 3f31ebd5

mysql-test/mysql-test-run.sh

+3 −1
Original line number Diff line number Diff line
@@ -507,6 +507,7 @@ if [ x$SOURCE_DIST = x1 ] ; then 
 fi



 CLIENT_BINDIR="$BASEDIR/client"

 TESTS_BINDIR="$BASEDIR/tests"

 MYSQLADMIN="$CLIENT_BINDIR/mysqladmin"

 WAIT_PID="$BASEDIR/extra/mysql_waitpid"

 MYSQL_MANAGER_CLIENT="$CLIENT_BINDIR/mysqlmanagerc"
@@ -525,6 +526,7 @@ else 
   MYSQLD="$VALGRIND $BASEDIR/bin/mysqld"

 fi

 CLIENT_BINDIR="$BASEDIR/bin"

 TESTS_BINDIR="$BASEDIR/tests"

 MYSQL_TEST="$CLIENT_BINDIR/mysqltest"

 MYSQL_DUMP="$CLIENT_BINDIR/mysqldump"

 MYSQL_BINLOG="$CLIENT_BINDIR/mysqlbinlog"
@@ -582,7 +584,7 @@ MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK --password= 
MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR $EXTRA_MYSQLBINLOG_OPT"

MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD --basedir=$BASEDIR --bindir=$CLIENT_BINDIR --verbose"

MYSQL="$MYSQL --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD"

export MYSQL MYSQL_DUMP MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES CLIENT_BINDIR

export MYSQL MYSQL_DUMP MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES CLIENT_BINDIR TESTS_BINDIR



MYSQL_TEST_ARGS="--no-defaults --socket=$MASTER_MYSOCK --database=$DB \

 --user=$DBUSER --password=$DBPASSWD --silent -v --skip-safemalloc \

mysql-test/r/order_by.result

+3 −6
Original line number Diff line number Diff line
@@ -680,6 +680,9 @@ order by col; 
ERROR 23000: Column 'col' in order clause is ambiguous

select col1 from t1, t2 where t1.col1=t2.col2 order by col;

ERROR 23000: Column 'col' in order clause is ambiguous

select t1.col as t1_col, t2.col2 from t1, t2 where t1.col1=t2.col2

order by col;

ERROR 23000: Column 'col' in order clause is ambiguous

select t1.col as t1_col, t2.col from t1, t2 where t1.col1=t2.col2

order by col;

t1_col	col
@@ -696,12 +699,6 @@ col col2 
1	3

2	2

3	1

select t1.col as t1_col, t2.col2 from t1, t2 where t1.col1=t2.col2

order by col;

t1_col	col2

1	1

2	2

3	3

select t2.col2, t2.col, t2.col from t2 order by col;

col2	col	col

3	1	1

mysql-test/t/client_test.test

+1 −1
Original line number Diff line number Diff line 
-- disable_result_log

--exec ../tests/client_test --testcase --user=root --socket=var/tmp/master.sock --port=$MYSQL_TCP_PORT
 
--exec $TESTS_BINDIR/client_test --testcase --user=root --socket=var/tmp/master.sock --port=$MYSQL_TCP_PORT

mysql-test/t/mysql_protocols.test

+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
--exec echo "select ' ok' as '<default>'" | $MYSQL

--exec echo "select ' ok' as 'TCP'"       | $MYSQL --protocol=TCP

--exec echo "select ' ok' as 'SOCKET'"    | $MYSQL --protocol=SOCKET

--exec echo "select ' ok' as 'PIPE'"      | $MYSQL --protocol=PIPE    2>&1

--exec echo "select ' ok' as 'MEMORY'"    | $MYSQL --protocol=MEMORY  2>&1

--exec echo "select ' ok' as 'NullS'"     | $MYSQL --protocol=NullS   2>&1

--exec echo "select ' ok' as 'PIPE'"      | $MYSQL --protocol=PIPE    2>&1 || true

--exec echo "select ' ok' as 'MEMORY'"    | $MYSQL --protocol=MEMORY  2>&1 || true

--exec echo "select ' ok' as 'NullS'"     | $MYSQL --protocol=NullS   2>&1 || true

mysql-test/t/order_by.test

+3 −2
Original line number Diff line number Diff line
@@ -472,13 +472,14 @@ select t1.col as c1, t2.col as c2 from t1, t2 where t1.col1=t2.col2 
  order by col;

--error 1052

select col1 from t1, t2 where t1.col1=t2.col2 order by col;

--error 1052

select t1.col as t1_col, t2.col2 from t1, t2 where t1.col1=t2.col2

  order by col;



select t1.col as t1_col, t2.col from t1, t2 where t1.col1=t2.col2

  order by col;

select col2 as c, col as c from t2 order by col;

select col2 as col, col as col2 from t2 order by col; 

select t1.col as t1_col, t2.col2 from t1, t2 where t1.col1=t2.col2

  order by col;

select t2.col2, t2.col, t2.col from t2 order by col;



select t2.col2 as col from t2 order by t2.col;