diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-02-26 00:23:22 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-02-26 00:23:22 +0200 |
| commit | bebafeba4480537414e11dbe8ce08414077e5c78 (patch) | |
| tree | 9dcb92795f3526fa1e17627cf560f70d85a87d5a /mysql-test | |
| parent | e0ba590fc9f40739b4268366d6a370ac47f25656 (diff) | |
| parent | b9c69c1609ad2590b6c0130c0d3fcc5e7a033e76 (diff) | |
| download | mariadb-git-bebafeba4480537414e11dbe8ce08414077e5c78.tar.gz | |
Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 2 | ||||
| -rw-r--r-- | mysql-test/r/bigint.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/bigint.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/rpl000015.slave-mi (renamed from mysql-test/t/rpl000015-slave-master-info.opt) | 0 | ||||
| -rw-r--r-- | mysql-test/t/rpl_rotate_logs.slave-mi (renamed from mysql-test/t/rpl_rotate_logs-slave-master-info.opt) | 0 |
5 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index b05779e8af2..48bb94ea0e4 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1118,7 +1118,7 @@ run_testcase () slave_opt_file=$TESTDIR/$tname-slave.opt master_init_script=$TESTDIR/$tname-master.sh slave_init_script=$TESTDIR/$tname-slave.sh - slave_master_info_file=$TESTDIR/$tname-slave-master-info.opt + slave_master_info_file=$TESTDIR/$tname.slave-mi echo $tname > $CURRENT_TEST SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0` if [ $USE_MANAGER = 1 ] ; then diff --git a/mysql-test/r/bigint.result b/mysql-test/r/bigint.result index 8522ef0212f..40d29e17237 100644 --- a/mysql-test/r/bigint.result +++ b/mysql-test/r/bigint.result @@ -7,6 +7,9 @@ select 9223372036854775807,-009223372036854775808; select +9999999999999999999,-9999999999999999999; +9999999999999999999 -9999999999999999999 10000000000000000000 -10000000000000000000 +select cast(9223372036854775808 as unsigned)+1; +cast(9223372036854775808 as unsigned)+1 +9223372036854775809 select 9223372036854775808+1; 9223372036854775808+1 9223372036854775808 diff --git a/mysql-test/t/bigint.test b/mysql-test/t/bigint.test index 0a58fe32d10..287d157e5d6 100644 --- a/mysql-test/t/bigint.test +++ b/mysql-test/t/bigint.test @@ -4,6 +4,7 @@ select 0,256,00000000000000065536,2147483647,-2147483648,2147483648,+4294967296; select 9223372036854775807,-009223372036854775808; select +9999999999999999999,-9999999999999999999; +select cast(9223372036854775808 as unsigned)+1; # # We need to do a REPLACE here as the atof() function returns different diff --git a/mysql-test/t/rpl000015-slave-master-info.opt b/mysql-test/t/rpl000015.slave-mi index 28bc753dd56..28bc753dd56 100644 --- a/mysql-test/t/rpl000015-slave-master-info.opt +++ b/mysql-test/t/rpl000015.slave-mi diff --git a/mysql-test/t/rpl_rotate_logs-slave-master-info.opt b/mysql-test/t/rpl_rotate_logs.slave-mi index 80190bf6d29..80190bf6d29 100644 --- a/mysql-test/t/rpl_rotate_logs-slave-master-info.opt +++ b/mysql-test/t/rpl_rotate_logs.slave-mi |