diff options
| author | unknown <tsmith@sita.local> | 2007-10-04 13:51:27 -0600 |
|---|---|---|
| committer | unknown <tsmith@sita.local> | 2007-10-04 13:51:27 -0600 |
| commit | cfaf9ded66285b372b889dbc65e0ea4ee8972931 (patch) | |
| tree | dcfd0b32f5b3beee3c1573f7289c07658a2ac6cc /mysys/my_init.c | |
| parent | 7c1098292d721093eebaa1c39b977d43030025d7 (diff) | |
| parent | e96d53642a7469df2babea64aaf5d055ec946637 (diff) | |
| download | mariadb-git-cfaf9ded66285b372b889dbc65e0ea4ee8972931.tar.gz | |
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
Diffstat (limited to 'mysys/my_init.c')
| -rw-r--r-- | mysys/my_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index b2eefe97ee8..6d1b9ec04be 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -299,7 +299,7 @@ int handle_rtc_failure(int err_type, const char *file, int line, return 0; /* Error is handled */ } -#pragma runtime_checks("", on) +#pragma runtime_checks("", restore) #endif |