diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-09-22 21:51:17 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-09-22 21:51:17 -0600 |
| commit | 30bba5dffcc400268446b12fa8ed8b875737c802 (patch) | |
| tree | e4a77b49f0d4e78f22c4bc9ef9ac9b30a8a00624 /mysql-test | |
| parent | 08b94f415bbce53a9bbc5a11330b7c8fadf92b81 (diff) | |
| parent | 5e0851e1b37debb59dbe184fcc3485470872ac64 (diff) | |
| download | mariadb-git-30bba5dffcc400268446b12fa8ed8b875737c802.tar.gz | |
merged
include/Makefile.am:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
client/Makefile.am:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/Makefile.am:
Auto merged
sql/sql_lex.h:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 11 | ||||
| -rw-r--r-- | mysql-test/r/union.result | 12 | ||||
| -rw-r--r-- | mysql-test/t/union.test | 5 |
3 files changed, 22 insertions, 6 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 04b0b27cdb8..559e2774403 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -270,8 +270,7 @@ DASH72=`$ECHO '----------------------------------------------------------------- # on binary, use what is installed if [ x$SOURCE_DIST = x1 ] ; then MYSQLD="$BASEDIR/sql/mysqld" - if [ -e "$BASEDIR/client/.libs/mysqltest" ] ; then - [ -e "$BASEDIR/client/.libs/lt-mysqltest" ] || $BASEDIR/client/mysqltest -V + if [ -f "$BASEDIR/client/.libs/lt-mysqltest" ] ; then MYSQL_TEST="$BASEDIR/client/.libs/lt-mysqltest" else MYSQL_TEST="$BASEDIR/client/mysqltest" @@ -533,7 +532,7 @@ start_master() #start master if [ -z "$DO_BENCH" ] then - master_args="--no-defaults --log-bin=master-bin \ + master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin \ --server-id=1 \ --basedir=$MY_BASEDIR \ --port=$MASTER_MYPORT \ @@ -550,7 +549,8 @@ start_master() $SMALL_SERVER \ $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT" else - master_args="--no-defaults --log-bin=master-bin --server-id=1 \ + master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin \ + --server-id=1 \ --basedir=$MY_BASEDIR \ --port=$MASTER_MYPORT \ --datadir=$MASTER_MYDDIR \ @@ -607,7 +607,8 @@ start_slave() $RM -f $SLAVE_MYDDIR/log.* slave_args="--no-defaults $master_info \ --exit-info=256 \ - --log-bin=slave-bin --log-slave-updates \ + --log-bin=$MYSQL_TEST_DIR/var/log/slave-bin + --log-slave-updates \ --basedir=$MY_BASEDIR \ --datadir=$SLAVE_MYDDIR \ --pid-file=$SLAVE_MYPID \ diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result index 0598bfb9ca0..16cdaafc262 100644 --- a/mysql-test/r/union.result +++ b/mysql-test/r/union.result @@ -70,3 +70,15 @@ pseudo pseudo1 same joce tsestset 1 joce testtt 1 dekad joce 1 +pseudo1 +testtt +tsestset +dekad +pseudo1 +testtt +tsestset +dekad +pseudo1 +testtt +tsestset +1 diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test index a4a29c76e65..5c4a62d5c41 100644 --- a/mysql-test/t/union.test +++ b/mysql-test/t/union.test @@ -61,5 +61,8 @@ CREATE TABLE t1 ( INSERT INTO t1 (pseudo,pseudo1,same) VALUES ('joce', 'testtt', 1),('joce', 'tsestset', 1),('dekad', 'joce', 1); SELECT pseudo FROM t1 WHERE pseudo1='joce' UNION SELECT pseudo FROM t1 WHERE pseudo='joce'; SELECT pseudo1 FROM t1 WHERE pseudo1='joce' UNION SELECT pseudo1 FROM t1 WHERE pseudo='joce'; -SELECT * FROM t1 WHERE pseudo1='joce' UNION SELECT * FROM t1 WHERE pseudo='joce' order by pseudo desc; +SELECT * FROM t1 WHERE pseudo1='joce' UNION SELECT * FROM t1 WHERE pseudo='joce' order by pseudo desc,pseudo1 desc; +SELECT pseudo1 FROM t1 WHERE pseudo='joce' UNION SELECT pseudo FROM t1 WHERE pseudo1='joce'; +SELECT pseudo1 FROM t1 WHERE pseudo='joce' UNION ALL SELECT pseudo FROM t1 WHERE pseudo1='joce'; +SELECT pseudo1 FROM t1 WHERE pseudo='joce' UNION SELECT 1; drop table t1; |