[Commits] 234a933cd25: Spider Patch Integration

jacob.mathew at mariadb.com jacob.mathew at mariadb.com
Thu Jun 1 23:45:52 EEST 2017


revision-id: 234a933cd25d58e1766a76f5bff0061320e08c2a (mariadb-10.2.3-96-g234a933cd25)
parent(s): 4976eedc863cd6f514c8347d826b4b1c00070daf
author: Jacob Mathew
committer: Jacob Mathew
timestamp: 2017-06-01 13:35:49 -0700
message:

Spider Patch Integration

Fixed assertion failure introduced in patch 011.

---
 sql/handler.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/handler.cc b/sql/handler.cc
index 9dbcbe6c431..722b13bce1d 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -6062,7 +6062,6 @@ int handler::ha_direct_update_rows_init(
     (and the old record is in record[1]).
   */
   DBUG_ASSERT(!new_data || new_data == table->record[0]);
-  DBUG_ASSERT(inited != NONE);
 
   error=
     direct_update_rows_init(mode, ranges, range_count, sorted, new_data);
@@ -6082,6 +6081,7 @@ int handler::ha_direct_update_rows(
     (and the old record is in record[1]).
   */
   DBUG_ASSERT(!new_data || new_data == table->record[0]);
+  DBUG_ASSERT(inited != NONE);
 
   MYSQL_UPDATE_ROW_START(table_share->db.str, table_share->table_name.str);
   mark_trx_read_write();


More information about the commits mailing list