database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge remote-tracking branch 'origin/10.0' into 10.0

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2017-05-18 15:45:55 +03:00
parent 0e3ca225ad 648d866150
commit 45898c2092
104 changed files with 576 additions and 645 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/connect/array.cpp
View File

@@ -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: