Commit a67bb033 authored by unknown's avatar unknown

Merge sita.local:/Users/tsmith/m/bk/maint/50

into  sita.local:/Users/tsmith/m/bk/maint/51


client/mysqldump.c:
  Auto merged
mysys/my_init.c:
  Auto merged
parents 49dbbfee ad379957
...@@ -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