diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2014-03-30 22:52:54 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-03-30 22:52:54 +0200 |
| commit | fe3cbcdffa6d419bcc3658fb6dda9ea371b19d35 (patch) | |
| tree | 350473c8efff19ee2c6edc266a454b78c43558e1 /storage/connect/tabmysql.cpp | |
| parent | 5c5834b09123f46b2807dcf76872846a2185bf8a (diff) | |
| download | mariadb-git-fe3cbcdffa6d419bcc3658fb6dda9ea371b19d35.tar.gz | |
- Add system variables type_conv and conv_size. This addresses the eventual
conversion from TEXT to VARCHAR in PROXY and MYSQL tables.
modified:
storage/connect/ha_connect.cc
storage/connect/myconn.cpp
storage/connect/myconn.h
storage/connect/myutil.cpp
storage/connect/tabmysql.cpp
storage/connect/tabutil.cpp
- Add the xmap system variable addressing whether file mapping should be used
to handle indexing.
modified:
storage/connect/CMakeLists.txt
storage/connect/ha_connect.cc
storage/connect/xindex.cpp
storage/connect/xindex.h
- Do take care of ~ in Linux version of _fullpath (not tested yet)
modified:
storage/connect/osutil.c
Diffstat (limited to 'storage/connect/tabmysql.cpp')
| -rw-r--r-- | storage/connect/tabmysql.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/storage/connect/tabmysql.cpp b/storage/connect/tabmysql.cpp index 692cad9b9ff..2bebad276c6 100644 --- a/storage/connect/tabmysql.cpp +++ b/storage/connect/tabmysql.cpp @@ -1134,9 +1134,12 @@ MYSQLCOL::MYSQLCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i, PSZ am) MYSQLCOL::MYSQLCOL(MYSQL_FIELD *fld, PTDB tdbp, int i, PSZ am) : COLBLK(NULL, tdbp, i) { + const char *chset = get_charset_name(fld->charsetnr); + char v = (!strcmp(chset, "binary")) ? 'B' : 0; + Name = fld->name; Precision = Long = fld->length; - Buf_Type = MYSQLtoPLG(fld->type); + Buf_Type = MYSQLtoPLG(fld->type, &v); strcpy(Format.Type, GetFormatType(Buf_Type)); Format.Length = Long; Format.Prec = fld->decimals; @@ -1615,5 +1618,5 @@ TDBMCL::TDBMCL(PMYDEF tdp) : TDBCAT(tdp) /***********************************************************************/ PQRYRES TDBMCL::GetResult(PGLOBAL g) { - return MyColumns(g, Host, Db, User, Pwd, Tab, NULL, Port, false); + return MyColumns(g, NULL, Host, Db, User, Pwd, Tab, NULL, Port, false); } // end of GetResult |