diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2006-11-30 22:00:05 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2006-11-30 22:00:05 +0200 |
| commit | 9e5ec3539e2c99924c132730297d1e9db47f5959 (patch) | |
| tree | 731e64ce46a0d46ff8ee40e79504c9a5f12cc25d /sql-common | |
| parent | 1e87cfee19303a3ee3de027c27fef90c153ad4bf (diff) | |
| download | mariadb-git-9e5ec3539e2c99924c132730297d1e9db47f5959.tar.gz | |
Don't abort if we call my_thread_end() multiple times
Fixed new introduced bug in my_time.c
BitKeeper/deleted/.del-valgrind.supp.orig:
Delete: mysql-test/valgrind.supp.orig
mysys/my_thr_init.c:
More comments
Don't abort if we call my_thread_end() multiple times
sql-common/my_time.c:
Fixed wrong patch in last commit
sql/sql_cache.cc:
Fixed old bad merge (not critical)
sql/tztime.cc:
Portability fix
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/my_time.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 4e4139ad780..fe6933c1c96 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -547,9 +547,9 @@ my_bool str_to_time(const char *str, uint length, MYSQL_TIME *l_time, { /* String given as one number; assume HHMMSS format */ date[0]= 0; - date[1]= ((ulong) value)/10000; - date[2]= ((ulong) value)/100 % 100; - date[3]= ((ulong) value) % 100; + date[1]= (ulong) (value/10000); + date[2]= (ulong) (value/100 % 100); + date[3]= (ulong) (value % 100); state=4; goto fractional; } |