summaryrefslogtreecommitdiff
path: root/sql/sql_insert.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/sql_insert.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/sql_insert.cc')
-rw-r--r--sql/sql_insert.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 12222fddca9..37b355f1d66 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -3839,7 +3839,6 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,
init_tmp_table_share(thd, &share, "", 0, "", "");
tmp_table.s->db_create_options=0;
- tmp_table.s->blob_ptr_size= portable_sizeof_char_ptr;
tmp_table.null_row= 0;
tmp_table.maybe_null= 0;