summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-02-09 17:43:14 +0100
committerSergei Golubchik <serg@mariadb.org>2017-02-13 18:12:16 +0100
commit87075e7f87868eb5438f4f5c191e3b1c1a1ea212 (patch)
tree36fa0a41c01ae25732a40fd7d838217d8fbb2efe /sql
parent239790d92f73e73afaba5292162738c838fdcba2 (diff)
downloadmariadb-git-87075e7f87868eb5438f4f5c191e3b1c1a1ea212.tar.gz
MDEV-11704 InnoDB: Failing assertion: dfield_is_null(dfield2) || dfield2->data
relax innodb assertion, because Field_blob::store() clearly says that a data pointer can be zero if the length is zero.
Diffstat (limited to 'sql')
-rw-r--r--sql/table.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc
index 1c6cc4205a6..404c43bef17 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -6243,7 +6243,7 @@ void TABLE::mark_columns_needed_for_delete()
void TABLE::mark_columns_needed_for_update()
{
- DBUG_ENTER("mark_columns_needed_for_update");
+ DBUG_ENTER("TABLE::mark_columns_needed_for_update");
bool need_signal= false;
mark_columns_per_binlog_row_image();