Misc: code cleanup

a1d42a6f · kevg · Aleksey Midenkov · 06ad9c01 · a1d42a6f · a1d42a6f
Commit a1d42a6f authored Apr 11, 2017 by kevg Committed by Aleksey Midenkov May 05, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

sql/sql_update.cc sql/sql_update.cc +2 -1

storage/innobase/vers/vers0vtq.cc storage/innobase/vers/vers0vtq.cc +7 -2

No files found.
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -366,7 +366,8 @@ int mysql_update(THD *thd,
  {
    DBUG_RETURN(1);
  }
-  bool has_vers_fields= check_has_vers_fields(fields);
+  bool has_vers_fields=
+      table->versioned() ? check_has_vers_fields(fields) : false;
  if (check_key_in_view(thd, table_list))
  {
    my_error(ER_NON_UPDATABLE_TABLE, MYF(0), table_list->alias, "UPDATE");

--- a/storage/innobase/vers/vers0vtq.cc
+++ b/storage/innobase/vers/vers0vtq.cc
@@ -243,8 +243,13 @@ read_trx_id(const rec_t *rec) {
 */
 static
 void
-find_best_match(mtr_t &mtr, btr_pcur_t &pcur, bool backwards,
+find_best_match(
-	timeval commit_ts, const rec_t *rec) {
+	mtr_t &mtr,
+	btr_pcur_t &pcur,
+	bool backwards,
+	timeval commit_ts,
+	const rec_t *rec)
+{
 	btr_pcur_t best;
 	btr_pcur_init(&best);
 	btr_pcur_copy_stored_position(&best, &pcur);