summaryrefslogtreecommitdiff
path: root/sql/unireg.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-07-15 18:01:22 +0200
committerSergei Golubchik <sergii@pisem.net>2013-07-15 18:01:22 +0200
commite1c76b80d91c43a9f17d9ec4c96e4dcb72efb1a2 (patch)
treeba4f3d737607d1a87e68b4e48e1f41119bee3b82 /sql/unireg.cc
parentb427da7651f348550deb886024c0d3101720f00e (diff)
downloadmariadb-git-e1c76b80d91c43a9f17d9ec4c96e4dcb72efb1a2.tar.gz
Fixes for innodb suite, merging tests from 5.6.
Includes 5.6 changesets for: ***** Fix for BUG#13489996 valgrind:conditional jump or move depends on uninitialised values-field_blob. blob_ptr_size was not initialized properly: remove this variable. ***** Bug#14021323 CRASH IN FIELD::SET_NULL WHEN INSERTING ROWS TO NEW TABLE *****
Diffstat (limited to 'sql/unireg.cc')
-rw-r--r--sql/unireg.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc
index a546fb769b3..fca4dc200c3 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -1122,7 +1122,6 @@ static bool make_empty_rec(THD *thd, File file,enum legacy_db_type table_type,
}
table.in_use= thd;
- table.s->blob_ptr_size= portable_sizeof_char_ptr;
null_count=0;
if (!(table_options & HA_OPTION_PACK_RECORD))