summaryrefslogtreecommitdiff
path: root/client/mysqltest.c
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-05-27 16:40:14 +0300
committerunknown <monty@narttu.mysql.fi>2003-05-27 16:40:14 +0300
commit4920a3326fc96be2cfa661232b6fe5f731b22eae (patch)
tree3dbb25b0c8865f6a219078ba4e0aa4d829addb42 /client/mysqltest.c
parent515ca2c4b41c077898660117d3faccc337f059da (diff)
downloadmariadb-git-4920a3326fc96be2cfa661232b6fe5f731b22eae.tar.gz
Fixed problem with mysql prompt when server disconnect. (Bug 356)
Fixed problem with localtime -> gmt where some times resulted in different (but correct) timestamps. Now MySQL should use the smallest possible timestamp value in this case. (Bug 316) client/mysql.cc: Fixed problem with prompt when server disconnect. (Bug 356) client/mysqltest.c: More debug information mysql-test/mysql-test-run.sh: Added support for --timezone in -master.opt mysql-test/t/raid.test: Fixed test if raid is enabled sql/field.cc: New my_gmt_sec() parameters sql/mysql_priv.h: New my_gmt_sec() parameters sql/mysqld.cc: Remove LOCK_timezone. Code cleanup sql/time.cc: Fixed problem with localtime -> gmt where some times resulted in different (but correct) timestamps. Now MySQL should use the smallest possible timestamp value in this case. (Bug 316)
Diffstat (limited to 'client/mysqltest.c')
-rw-r--r--client/mysqltest.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 4bc941e8b56..f6c999b18e4 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -515,8 +515,12 @@ int dyn_string_cmp(DYNAMIC_STRING* ds, const char* fname)
if (!my_stat(eval_file, &stat_info, MYF(MY_WME)))
die(NullS);
- if (!eval_result && stat_info.st_size != ds->length)
+ if (!eval_result && (uint) stat_info.st_size != ds->length)
+ {
+ DBUG_PRINT("info",("Size differs: result size: %u file size: %u",
+ ds->length, stat_info.st_size));
DBUG_RETURN(2);
+ }
if (!(tmp = (char*) my_malloc(stat_info.st_size + 1, MYF(MY_WME))))
die(NullS);