diff options
| author | brian@avenger.(none) <> | 2004-11-11 18:58:57 -0800 |
|---|---|---|
| committer | brian@avenger.(none) <> | 2004-11-11 18:58:57 -0800 |
| commit | f05daf02ba845b820d6a817c9e2058654b4a764b (patch) | |
| tree | 46fde821aa292e663e9f48d37f44657e025a1271 /mysys | |
| parent | 7073829fbb3515edca83a87dbfd428c88f47a3e0 (diff) | |
| parent | 6f39bf2b9c31f78ef6940dacb81e80d6772640b9 (diff) | |
| download | mariadb-git-f05daf02ba845b820d6a817c9e2058654b4a764b.tar.gz | |
Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_init.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index 0ef938b434c..e9a61b1833c 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -42,8 +42,8 @@ static void netware_init(); #define netware_init() #endif - -my_bool my_init_done=0; +my_bool my_init_done= 0; +uint mysys_usage_id= 0; /* Incremented for each my_init() */ static ulong atoi_octal(const char *str) { @@ -51,7 +51,7 @@ static ulong atoi_octal(const char *str) while (*str && my_isspace(&my_charset_latin1, *str)) str++; str2int(str, - (*str == '0' ? 8 : 10), /* Octalt or decimalt */ + (*str == '0' ? 8 : 10), /* Octalt or decimalt */ 0, INT_MAX, &tmp); return (ulong) tmp; } @@ -74,6 +74,7 @@ my_bool my_init(void) if (my_init_done) return 0; my_init_done=1; + mysys_usage_id++; #if defined(THREAD) && defined(SAFE_MUTEX) safe_mutex_global_init(); /* Must be called early */ #endif |