diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-07-07 12:43:10 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-07-07 12:43:10 +0400 |
| commit | 8b2c7c9444db2369d2ecdaa1f14fbc8826a8fb39 (patch) | |
| tree | 72fa33f92344a89792845bab9225cef56b4138c4 /storage/spider | |
| parent | 3f327432942ef5db14dd905ffd147f234dc74bfb (diff) | |
| parent | 3b862aaa10942e7405b90cf80d0c3baca4cda55d (diff) | |
| download | mariadb-git-8b2c7c9444db2369d2ecdaa1f14fbc8826a8fb39.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'storage/spider')
| -rw-r--r-- | storage/spider/spd_table.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc index 56931f47f24..e980a42eef0 100644 --- a/storage/spider/spd_table.cc +++ b/storage/spider/spd_table.cc @@ -8573,7 +8573,7 @@ int spider_discover_table_structure( } #ifdef SPIDER_HAS_DISCOVER_TABLE_STRUCTURE_COMMENT if (!(part_syntax = generate_partition_syntax(thd, part_info, &part_syntax_len, - FALSE, TRUE, info, NULL, NULL))) + TRUE, info, NULL))) #else if (!(part_syntax = generate_partition_syntax(part_info, &part_syntax_len, FALSE, TRUE, info, NULL))) @@ -8586,7 +8586,6 @@ int spider_discover_table_structure( DBUG_RETURN(HA_ERR_OUT_OF_MEM); } str.q_append(part_syntax, part_syntax_len); - my_free(part_syntax, MYF(0)); } #endif DBUG_PRINT("info",("spider str=%s", str.c_ptr_safe())); |