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

Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint

Browse Source 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint


client/mysqldump.c:
  Auto merged
extra/comp_err.c:
  Auto merged
mysys/my_init.c:
  Auto merged
This commit is contained in:
unknown
2007-10-05 19:58:20 +02:00
parent b2a4889c9b 7b98539199
commit 3a175bab38
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
extra/comp_err.c
View File

@@ -167,6 +167,7 @@ int main(int argc, char *argv[])
DBUG_ENTER("main"); DBUG_ENTER("main");
charsets_dir= DEFAULT_CHARSET_DIR; charsets_dir= DEFAULT_CHARSET_DIR;
my_umask_dir= 0777;
if (get_options(&argc, &argv)) if (get_options(&argc, &argv))
DBUG_RETURN(1); DBUG_RETURN(1);
if (!(row_count= parse_input_file(TXTFILE, &error_head, &lang_head))) if (!(row_count= parse_input_file(TXTFILE, &error_head, &lang_head)))

2
mysys/my_init.c
View File

@@ -299,7 +299,7 @@ int handle_rtc_failure(int err_type, const char *file, int line,
return 0; /* Error is handled */ return 0; /* Error is handled */
} }
#pragma runtime_checks("", on) #pragma runtime_checks("", restore)
#endif #endif