diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-05-18 15:45:55 +0300 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-05-18 15:45:55 +0300 |
commit | 45898c20928ae71f2c28dca48e66c661b9545347 (patch) | |
tree | 4b12470d4ee5dc1845d6e5680f5a67ac210195a6 /storage/connect/array.cpp | |
parent | 0e3ca225ad65f14da79c9a73aeadcc2a3e1c0c2a (diff) | |
parent | 648d86615043e76633ac536b1000ba86abbc8af1 (diff) | |
download | mariadb-git-45898c20928ae71f2c28dca48e66c661b9545347.tar.gz |
Merge remote-tracking branch 'origin/10.0' into 10.0
Diffstat (limited to 'storage/connect/array.cpp')
-rw-r--r-- | storage/connect/array.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/connect/array.cpp b/storage/connect/array.cpp index 8eaeeea2d8a..5cf15c5ac18 100644 --- a/storage/connect/array.cpp +++ b/storage/connect/array.cpp @@ -155,6 +155,7 @@ ARRAY::ARRAY(PGLOBAL g, int type, int size, int length, int prec) switch (type) { case TYPE_STRING: Len = length; + /* fall through */ case TYPE_SHORT: case TYPE_INT: case TYPE_DOUBLE: @@ -592,6 +593,7 @@ int ARRAY::Convert(PGLOBAL g, int k, PVAL vp) switch (Type) { case TYPE_DOUBLE: prec = 2; + /* fall through */ case TYPE_SHORT: case TYPE_INT: case TYPE_DATE: |