diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-06 16:38:40 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-06 16:38:40 +0100 |
| commit | 1b3c15f1995531a1263139fe1bdde570f1b93b19 (patch) | |
| tree | f4bc1013d3b67a3b971f66b553ce0e1728529cc8 /storage/connect | |
| parent | c73718d917e903bddf7059cd8a515066f04311d1 (diff) | |
| parent | 313f18be5a4b9c56d9c7331227f72e3f2fa4f9fe (diff) | |
| download | mariadb-git-1b3c15f1995531a1263139fe1bdde570f1b93b19.tar.gz | |
merge with 10.0-monty
Diffstat (limited to 'storage/connect')
| -rw-r--r-- | storage/connect/ha_connect.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index ac1d0539d19..3d4ec2dbc13 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -2766,8 +2766,8 @@ int ha_connect::info(uint flag) if (flag & HA_STATUS_CONST) { // This is imported from the previous handler and must be reconsidered - stats.max_data_file_length= 4294967295; - stats.max_index_file_length= 4398046510080; + stats.max_data_file_length= 4294967295LL; + stats.max_index_file_length= 4398046510080LL; stats.create_time= 0; data_file_name= xinfo.data_file_name; index_file_name= NULL; @@ -4051,7 +4051,7 @@ static int connect_assisted_discovery(handlerton *hton, THD* thd, TABLE_SHARE *table_s, HA_CREATE_INFO *create_info) { - char v, spc= ',', qch= 0; + char v=0, spc= ',', qch= 0; const char *fncn= "?"; const char *user, *fn, *db, *host, *pwd, *sep, *tbl, *src; const char *col, *ocl, *rnk, *pic, *fcl; @@ -4115,7 +4115,9 @@ static int connect_assisted_discovery(handlerton *hton, THD* thd, cls= GetListOption(g, "class", topt->oplist); #endif // WIN32 port= atoi(GetListOption(g, "port", topt->oplist, "0")); +#if defined(ODBC_SUPPORT) mxr= atoi(GetListOption(g,"maxres", topt->oplist, "0")); +#endif mxe= atoi(GetListOption(g,"maxerr", topt->oplist, "0")); #if defined(PROMPT_OK) cop= atoi(GetListOption(g, "checkdsn", topt->oplist, "0")); |