summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorunknown <georg@lmy002.wdf.sap.corp>2006-09-01 14:34:37 +0200
committerunknown <georg@lmy002.wdf.sap.corp>2006-09-01 14:34:37 +0200
commit5d3e6c275857fabffe9e38d979a12017cc257494 (patch)
treeb624943770ca093aa4373ff91f83fddb3b932094 /extra
parentcce4cc25a9a3927d4d947d4ce006343f4503729e (diff)
downloadmariadb-git-5d3e6c275857fabffe9e38d979a12017cc257494.tar.gz
Fixes for crashes and test failures
scripts/make_win_bin_dist: BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/scripts/make_win_bin_dist client/mysqlbinlog.cc: Fix for cmake build: Cmake doesn't use the VC++ files extra/comp_err.c: fixed windows crash (debug): We can't call DBUG_RETURN after my_end. include/my_dbug.h: added missing empty define for DBUG_LEAVE to prevent precompiler errors when compiling in non_debug mode mysql-test/mysql-test-run.pl: Added support for new cmake release and debug paths. mysql-test/t/system_mysql_db_fix.test: This test requires unix shell script mysql_fix_previleges_tables -> skip under windows mysys/my_seek.c: Fix for windows debug crash. However this solution is bad: we should never call lseek with an invalid file pointer. sql/ha_archive.cc: Fixed windows crash: We need dup in gzdopen to keep the filehandle open, otherwise subsequent calls to mysql_close will fail/crash.
Diffstat (limited to 'extra')
-rw-r--r--extra/comp_err.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/extra/comp_err.c b/extra/comp_err.c
index 65fc131a5fc..14774c87a28 100644
--- a/extra/comp_err.c
+++ b/extra/comp_err.c
@@ -188,8 +188,9 @@ int main(int argc, char *argv[])
DBUG_RETURN(1);
}
clean_up(lang_head, error_head);
+ DBUG_LEAVE; /* we can't call my_end after DBUG_RETURN */
my_end(info_flag ? MY_CHECK_ERROR | MY_GIVE_INFO : 0);
- DBUG_RETURN(0);
+ return(0);
}
}