mirror of
https://github.com/MariaDB/server.git
synced 2026-04-24 17:25:31 +02:00
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
This commit is contained in:
parent
1e87cfee19
commit
9e5ec3539e
5 changed files with 55 additions and 210 deletions
|
|
@ -1743,9 +1743,9 @@ my_tz_init(THD *org_thd, const char *default_tzname, my_bool bootstrap)
|
|||
tz_leapcnt++;
|
||||
|
||||
DBUG_PRINT("info",
|
||||
("time_zone_leap_second table: tz_leapcnt:%u tt_time: %lu offset: %ld",
|
||||
tz_leapcnt, (ulong) tz_lsis[tz_leapcnt-1].ls_trans,
|
||||
tz_lsis[tz_leapcnt-1].ls_corr));
|
||||
("time_zone_leap_second table: tz_leapcnt: %u tt_time: %lu offset: %ld",
|
||||
tz_leapcnt, (ulong) tz_lsis[tz_leapcnt-1].ls_trans,
|
||||
tz_lsis[tz_leapcnt-1].ls_corr));
|
||||
|
||||
res= table->file->index_next(table->record[0]);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue