summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-07-06 16:49:04 -0700
committerjimw@mysql.com <>2005-07-06 16:49:04 -0700
commitf1ac600a7ed15635288bc2d8d55ff3115338e2bb (patch)
treea8b80d8787143eca5e117b5eae0731a99f34dea2 /sql/sql_insert.cc
parent7d7a59e46f34cac967ee164b559edb19d754912f (diff)
parent7e70aee169ea8df771b64a2c0e516704d94b4379 (diff)
downloadmariadb-git-f1ac600a7ed15635288bc2d8d55ff3115338e2bb.tar.gz
Merge jwinstead@production.mysql.com:my/mysql-5.0-11045
into mysql.com:/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r--sql/sql_insert.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 576866cb17d..a2f3334d13d 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -199,7 +199,7 @@ static int check_update_fields(THD *thd, TABLE_LIST *insert_table_list,
List<Item> &update_fields)
{
TABLE *table= insert_table_list->table;
- ulong timestamp_query_id;
+ query_id_it timestamp_query_id;
LINT_INIT(timestamp_query_id);
/*