Commit 3a175bab authored by unknown's avatar unknown

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

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
parents b2a4889c 7b985391
...@@ -167,6 +167,7 @@ int main(int argc, char *argv[]) ...@@ -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)))
......
...@@ -299,7 +299,7 @@ int handle_rtc_failure(int err_type, const char *file, int line, ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment