diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-09-10 11:40:57 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-09-10 11:40:57 +0400 |
| commit | 2716d7b9f16c1ebcf2209546a1e58ec7b4a28c95 (patch) | |
| tree | f332b397551f70643c53f9145deb685070a683a9 /sql/mysqld.cc | |
| parent | 401704f2fcc06653e1df6a5829e89a3cd479e1dd (diff) | |
| download | mariadb-git-2716d7b9f16c1ebcf2209546a1e58ec7b4a28c95.tar.gz | |
A patch for Bug#45118 (mysqld.exe crashed in debug mode
on Windows in dbug.c) -- part 2: a patch for the DBUG subsystem
to detect misuse of DBUG_ENTER / DBUG_RETURN macros.
5.1 version.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 3e2f8eabd39..3f536f01094 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4789,10 +4789,10 @@ static bool read_init_file(char *file_name) DBUG_ENTER("read_init_file"); DBUG_PRINT("enter",("name: %s",file_name)); if (!(file=my_fopen(file_name,O_RDONLY,MYF(MY_WME)))) - return(1); + DBUG_RETURN(TRUE); bootstrap(file); (void) my_fclose(file,MYF(MY_WME)); - return 0; + DBUG_RETURN(FALSE); } |