summaryrefslogtreecommitdiff
path: root/sql/tztime.cc
diff options
context:
space:
mode:
authormonty@narttu.mysql.fi <>2006-11-30 22:38:12 +0200
committermonty@narttu.mysql.fi <>2006-11-30 22:38:12 +0200
commit430d215c58ba78a018ff1299cb537d66f41deaae (patch)
treeed9e2b22ed77e3ea701164ea1905e9d4c8da0cf5 /sql/tztime.cc
parent0a673596a288505374b6232d4e17f08934829767 (diff)
parent601e6f4b2a78921304bc1d779991c615ee229f89 (diff)
downloadmariadb-git-430d215c58ba78a018ff1299cb537d66f41deaae.tar.gz
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'sql/tztime.cc')
-rw-r--r--sql/tztime.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc
index 493afd09d55..c44a907c07b 100644
--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@@ -2057,7 +2057,7 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables)
tz_info->timecnt++;
DBUG_PRINT("info",
- ("time_zone_transition table: tz_id: %u tt_time:%lu tt_id: %u",
+ ("time_zone_transition table: tz_id: %u tt_time: %lu tt_id: %u",
tzid, (ulong) ttime, ttid));
res= table->file->index_next_same(table->record[0],