diff options
| author | unknown <monty@mysql.com> | 2004-11-11 00:36:56 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-11-11 00:36:56 +0200 |
| commit | 71196720d1d50a2d84b0af894db248c5cafd03f3 (patch) | |
| tree | 3ebfa72b3730e7aa8ee735c40286d02aea15377c /mysys/my_init.c | |
| parent | 8eae81ba317f8bb29312da53412755db99fcbcc3 (diff) | |
| parent | 5205078ef93edb0b9752285a98aa3616057aad35 (diff) | |
| download | mariadb-git-71196720d1d50a2d84b0af894db248c5cafd03f3.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
sql/handler.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysys/my_init.c')
| -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 |