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 | |
| 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')
| -rw-r--r-- | sql/sql_cache.cc | 3 | ||||
| -rw-r--r-- | sql/tztime.cc | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 3362ec76fc2..01f8184341d 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1039,7 +1039,6 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length) while (sql[i]=='(') i++; - /* Test if the query is a SELECT (pre-space is removed in dispatch_command). @@ -1051,7 +1050,7 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length) if ((my_toupper(system_charset_info, sql[i]) != 'S' || my_toupper(system_charset_info, sql[i + 1]) != 'E' || my_toupper(system_charset_info, sql[i + 2]) != 'L') && - sql[0] != '/') + sql[i] != '/') { DBUG_PRINT("qcache", ("The statement is not a SELECT; Not cached")); goto err; diff --git a/sql/tztime.cc b/sql/tztime.cc index 6acf17520d9..493afd09d55 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -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]); } |