diff options
| author | Monty <monty@mariadb.org> | 2016-10-05 01:09:52 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-10-05 01:11:08 +0300 |
| commit | 14b1c8c80d89ab54cadedf94fa7604b8f917aecd (patch) | |
| tree | 7a0d4ffa14fb4335b5c387b857d0af4870de3456 /sql | |
| parent | af7490f95d9a0e99dafb70ae3ee5cc7cf044572e (diff) | |
| download | mariadb-git-14b1c8c80d89ab54cadedf94fa7604b8f917aecd.tar.gz | |
After merge and bug fixes
- Fixed compiler warnings
- Removed have_debug.inc from innochecksum_3
- Fixed race condition in innodb_buffer_pool_load
- Fixed merge issue in innodb-bad-key-change.test
- Fixed missing array allocation that could cause
function_defaults_notembedded to fail
- Fixed thread_cache_size_func
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 97e9464deb6..1abfd5925b8 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -2521,7 +2521,7 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd) bitmaps_used++; copy->vcol_set= copy->def_vcol_set; } - if (share->default_fields) + if (share->default_fields || share->default_expressions) { if (!(copy->has_value_set= (MY_BITMAP*) alloc_root(client_thd->mem_root, sizeof(MY_BITMAP)))) |