diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2013-11-22 16:03:54 +0100 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-11-22 16:03:54 +0100 |
commit | aaa982e7908b4d8464e9ac799336c5d890f72fad (patch) | |
tree | 5b6b8e48816f17505200d0626eb1e3c2e233035d /storage/connect/odbconn.cpp | |
parent | 8780e1ab24ff2671d200bd6eb14cd98d620ab361 (diff) | |
download | mariadb-git-aaa982e7908b4d8464e9ac799336c5d890f72fad.tar.gz |
- Fix good recognition of MYSQL table column types.
modified:
storage/connect/ha_connect.cc
storage/connect/myconn.cpp
storage/connect/myutil.cpp
storage/connect/odbccat.h
storage/connect/odbconn.cpp
storage/connect/tabmysql.cpp
- Add tests on new MYSQL features
added:
storage/connect/mysql-test/connect/my.cnf
storage/connect/mysql-test/connect/r/mysql_discovery.result
storage/connect/mysql-test/connect/r/mysql_exec.result
storage/connect/mysql-test/connect/r/mysql_new.result
storage/connect/mysql-test/connect/t/myconn.inc
storage/connect/mysql-test/connect/t/myconn_cleanup.inc
storage/connect/mysql-test/connect/t/mysql_discovery.test
storage/connect/mysql-test/connect/t/mysql_exec.test
storage/connect/mysql-test/connect/t/mysql_new.test
Diffstat (limited to 'storage/connect/odbconn.cpp')
-rw-r--r-- | storage/connect/odbconn.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/connect/odbconn.cpp b/storage/connect/odbconn.cpp index 36cdd8e7330..3ae1bb9b9fb 100644 --- a/storage/connect/odbconn.cpp +++ b/storage/connect/odbconn.cpp @@ -174,6 +174,7 @@ int TranslateSQLType(int stp, int prec, int& len, char& v) return type; } // end of TranslateSQLType +#if defined(PROMPT_OK) /***********************************************************************/ /* ODBCCheckConnection: Check completeness of connection string. */ /***********************************************************************/ @@ -205,6 +206,7 @@ char *ODBCCheckConnection(PGLOBAL g, char *dsn, int cop) ocp->Close(); return newdsn; // Return complete connection string } // end of ODBCCheckConnection +#endif // PROMPT_OK /***********************************************************************/ /* Allocate the structure used to refer to the result set. */ |