database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix

Browse Source 
into  mysql.com:/usr/local/mysql/tmp-5.1


client/mysqlbinlog.cc:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
dbug/dbug.c:
  Manual merge
include/my_dbug.h:
  Manual merge
This commit is contained in:
unknown
2006-05-16 14:34:35 +02:00
parent 39b5c0f50d a046322b4e
commit 771d3d8229
7 changed files with 81 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/mysqlbinlog.cc
View File

@@ -815,7 +815,8 @@ static void die(const char* fmt, ...)
fprintf(stderr, "\n");
va_end(args);
cleanup();
my_end(0);
/* We cannot free DBUG, it is used in global destructors after exit(). */
my_end(MY_DONT_FREE_DBUG);
exit(1);
}
@@ -1487,7 +1488,8 @@ int main(int argc, char** argv)
cleanup();
free_defaults(defaults_argv);
my_free_open_file_info();
my_end(0);
/* We cannot free DBUG, it is used in global destructors after exit(). */
my_end(MY_DONT_FREE_DBUG);
exit(exit_value);
DBUG_RETURN(exit_value); // Keep compilers happy
}