diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-15 18:01:22 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-15 18:01:22 +0200 |
| commit | e1c76b80d91c43a9f17d9ec4c96e4dcb72efb1a2 (patch) | |
| tree | ba4f3d737607d1a87e68b4e48e1f41119bee3b82 /sql/opt_subselect.cc | |
| parent | b427da7651f348550deb886024c0d3101720f00e (diff) | |
| download | mariadb-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/opt_subselect.cc')
| -rw-r--r-- | sql/opt_subselect.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index c3ddf3831c4..aa31c44a385 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -3919,7 +3919,6 @@ SJ_TMP_TABLE::create_sj_weedout_tmp_table(THD *thd) table->s= share; init_tmp_table_share(thd, share, "", 0, tmpname, tmpname); share->blob_field= blob_field; - share->blob_ptr_size= portable_sizeof_char_ptr; share->table_charset= NULL; share->primary_key= MAX_KEY; // Indicate no primary key share->keys_for_keyread.init(); |