diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-09-10 18:01:27 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-09-10 18:01:27 +0300 |
| commit | 3fb22ac5e146e1fe34d282c3c3ef6bd50af90ca5 (patch) | |
| tree | 4f069ae5398a3e17417f942cb6926c66efe968a6 /mysys/my_static.c | |
| parent | 3769841d9e706ee018d5273d2901954b9a281c3e (diff) | |
| parent | 0db9c26b05439f9d6fc29234966f50d8e393dfe2 (diff) | |
| download | mariadb-git-3fb22ac5e146e1fe34d282c3c3ef6bd50af90ca5.tar.gz | |
Merge with 5.2
Diffstat (limited to 'mysys/my_static.c')
| -rw-r--r-- | mysys/my_static.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/my_static.c b/mysys/my_static.c index c33a12c2ca0..a117bed1496 100644 --- a/mysys/my_static.c +++ b/mysys/my_static.c @@ -32,7 +32,8 @@ char NEAR curr_dir[FN_REFLEN]= {0}, ulong my_stream_opened=0,my_file_opened=0, my_tmp_file_created=0; ulong my_file_total_opened= 0; int NEAR my_umask=0664, NEAR my_umask_dir=0777; -myf my_global_flags; +myf my_global_flags= 0; +my_bool my_assert_on_error= 0; #ifndef THREAD int NEAR my_errno=0; #endif |