diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-21 03:38:35 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-21 03:38:35 +0300 |
| commit | c1a80bc0615f15535bb297e0f065091b2945af21 (patch) | |
| tree | bd27d62de7286eca9070d981c59b7cc1c889d9f1 /mysql-test | |
| parent | 5dbd7397bd0d268b02d2aacb16b8c288fcfa2e93 (diff) | |
| download | mariadb-git-c1a80bc0615f15535bb297e0f065091b2945af21.tar.gz | |
Integrated table->ref_primary_key into table->part_of_key
Fixed bug in UNION
client/mysqlbinlog.cc:
Added error message handling to read_log_event()
heap/hp_write.c:
More debug info
myisam/myisampack.c:
Cleanup
mysql-test/mysql-test-run.sh:
Portability fixes.
mysql-test/r/union.result:
More tests cases for UNION
mysql-test/t/union.test:
More tests cases for UNION
sql/Makefile.am:
Added mysql_embed.h
sql/item.cc:
Fixed bug when using the same table multiple times in union.
sql/log_event.cc:
Removed use of ## construct (Portability problem)
sql/log_event.h:
Added error message handling to read_log_event()
sql/mysql_priv.h:
Added mysql_embed.h
sql/opt_sum.cc:
Cleanup
sql/slave.cc:
cleanup
sql/sql_base.cc:
Integrated table->ref_primary_key into table->part_of_key
sql/sql_union.cc:
Cleanup
sql/table.cc:
Integrated table->ref_primary_key into table->part_of_key
sql/table.h:
Integrated table->ref_primary_key into table->part_of_key
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 | 3 |
3 files changed, 21 insertions, 5 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 3a925372085..3bfdbb0349a 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -269,8 +269,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" @@ -502,7 +501,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 \ @@ -519,7 +518,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 \ @@ -576,7 +576,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..4c67ec10bb3 100644 --- a/mysql-test/t/union.test +++ b/mysql-test/t/union.test @@ -62,4 +62,7 @@ INSERT INTO t1 (pseudo,pseudo1,same) VALUES ('joce', 'testtt', 1),('joce', 'tses 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 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; |