diff options
| -rw-r--r-- | mysql-test/r/bigint.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/bigint.test | 1 | ||||
| -rw-r--r-- | mysys/thr_alarm.c | 2 | ||||
| -rw-r--r-- | netware/mysql_test_run.c | 2 |
4 files changed, 7 insertions, 1 deletions
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/mysys/thr_alarm.c b/mysys/thr_alarm.c index 6697b9d3360..add5335a7af 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -402,6 +402,8 @@ void end_thr_alarm(void) void thr_alarm_kill(pthread_t thread_id) { uint i; + if (alarm_aborted) + return; pthread_mutex_lock(&LOCK_alarm); for (i=0 ; i < alarm_queue.elements ; i++) { diff --git a/netware/mysql_test_run.c b/netware/mysql_test_run.c index 7392a96cc73..f19cee32e92 100644 --- a/netware/mysql_test_run.c +++ b/netware/mysql_test_run.c @@ -760,7 +760,7 @@ void run_test(char *test) // create files snprintf(master_opt_file, PATH_MAX, "%s/%s-master.opt", test_dir, test); snprintf(slave_opt_file, PATH_MAX, "%s/%s-slave.opt", test_dir, test); - snprintf(slave_master_info_file, PATH_MAX, "%s/%s-slave-master-info.opt", test_dir, test); + snprintf(slave_master_info_file, PATH_MAX, "%s/%s.slave-mi", test_dir, test); snprintf(reject_file, PATH_MAX, "%s/%s%s", result_dir, test, REJECT_SUFFIX); snprintf(out_file, PATH_MAX, "%s/%s%s", result_dir, test, OUT_SUFFIX); snprintf(err_file, PATH_MAX, "%s/%s%s", result_dir, test, ERR_SUFFIX); |