diff options
| author | Anel Husakovic <anel@mariadb.org> | 2019-07-10 02:27:35 -0700 |
|---|---|---|
| committer | Anel Husakovic <anel@mariadb.org> | 2019-07-11 00:52:27 -0700 |
| commit | 81ad7b12d09f5c4b50fdfa5d7105fed82f9a463c (patch) | |
| tree | 9d732508b86d8c24fbca5dc4efdfe63275c268c4 /sql/table.cc | |
| parent | 0a3aec0a75cfd929c3383d034270c15166db83ee (diff) | |
| download | mariadb-git-bb-anel-json-v2-10.3-recursion.tar.gz | |
After review fixesbb-anel-json-v2-10.3-recursion
- Indentation fixed
- Logic of empty string fixed
- Added read_variable_length() to opaque data type
- Added logic and test case for MYSQL_TYPE_NEWDECIMAL
- Added new utf8 test
- Added support encoding for other opaque data types
(MYSQL_TYPE_{LONG/MEDIUM/TINY}BLOB, MYSQL_TYPE_VARCHAR, MYSQL_TYPE_YEAR) found in json
suite of mysql and test cases
- Added big array test (--do-test=anel/mysql_j)
- alter force @todo
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/table.cc b/sql/table.cc index e335abe4e8d..1124ef788f1 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1856,16 +1856,14 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write, } /* - if ((uchar)field_type == (uchar)MYSQL_TYPE_VIRTUAL) if ((uchar)field_type == (uchar)MYSQL_TYPE_VIRTUAL) Special handling to be able to read MySQL JSON types when - converting a MySQL table to MariaDB table. + converting a MySQL table (MyISAM) to MariaDB table. */ if (share->mysql_version >= 50700 && share->mysql_version < 100000 && strpos[13] == (uchar) MYSQL_TYPE_VIRTUAL) { field_type= (enum_field_types) MYSQL_TYPE_MYSQL_JSON; - // strpos[13]= (uchar) MYSQL_TYPE_MYSQL_JSON; // read only } else if ((uchar)field_type == (uchar)MYSQL_TYPE_VIRTUAL) { |