diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2015-12-16 11:09:54 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2015-12-16 11:09:54 +0100 |
| commit | 71eee693b2ffadaf3d3ae9f68d5a723d9e4b503a (patch) | |
| tree | 084d1f77d3912a4e14b1635fbe533d4affb78241 /mysys/ma_dyncol.c | |
| parent | bd69d7b3f30267011675747e4a74959b71a7ebc6 (diff) | |
| download | mariadb-git-71eee693b2ffadaf3d3ae9f68d5a723d9e4b503a.tar.gz | |
MDEV-9167: COLUMN_CHECK fails on valid decimal data
Check now allows zero length decimals too.
(backporting Adam Chainz patch to 10.0)
Diffstat (limited to 'mysys/ma_dyncol.c')
| -rw-r--r-- | mysys/ma_dyncol.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/ma_dyncol.c b/mysys/ma_dyncol.c index 06820a0c3c5..d7d4a127a75 100644 --- a/mysys/ma_dyncol.c +++ b/mysys/ma_dyncol.c @@ -3725,7 +3725,8 @@ mariadb_dyncol_check(DYNAMIC_COLUMN *str) /* It is not first entry */ if (prev_data_offset > data_offset || ((prev_type != DYN_COL_INT && - prev_type != DYN_COL_UINT) && prev_data_offset == data_offset)) + prev_type != DYN_COL_UINT && + prev_type != DYN_COL_DECIMAL) && prev_data_offset == data_offset)) { DBUG_PRINT("info", ("Field order: %u Previous data offset: %u" " >(=) Current data offset: %u", |