diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2014-04-19 16:41:25 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-04-19 16:41:25 +0200 |
| commit | 50953a0e9de6ae36a62fc195f3fc97d6d319493e (patch) | |
| tree | 33689c716390d4e5f3abf302937322baaae3cf04 /storage/connect/myconn.cpp | |
| parent | 812520315318e358d2d9daf9ca709578af1efe40 (diff) | |
| parent | 213ecbbb4f3d252ba2d653eacf756e123821c41a (diff) | |
| download | mariadb-git-50953a0e9de6ae36a62fc195f3fc97d6d319493e.tar.gz | |
- Commit merge files
modified:
storage/connect/catalog.h
storage/connect/filamvct.cpp
storage/connect/filamzip.cpp
storage/connect/ha_connect.cc
storage/connect/ha_connect.h
storage/connect/mycat.cc
storage/connect/mycat.h
storage/connect/myconn.cpp
storage/connect/mysql-test/connect/r/xml.result
storage/connect/plgdbutl.cpp
storage/connect/reldef.cpp
storage/connect/reldef.h
storage/connect/tabdos.cpp
storage/connect/tabfmt.cpp
storage/connect/tabmul.cpp
storage/connect/tabmysql.cpp
storage/connect/taboccur.cpp
storage/connect/tabodbc.cpp
storage/connect/tabpivot.cpp
storage/connect/tabpivot.h
storage/connect/tabsys.cpp
storage/connect/tabtbl.cpp
storage/connect/tabutil.cpp
storage/connect/tabvct.cpp
storage/connect/tabwmi.cpp
storage/connect/tabxcl.cpp
storage/connect/tabxml.cpp
storage/connect/xindex.cpp
Diffstat (limited to 'storage/connect/myconn.cpp')
| -rw-r--r-- | storage/connect/myconn.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/myconn.cpp b/storage/connect/myconn.cpp index 18c80f2b24e..02309e78d55 100644 --- a/storage/connect/myconn.cpp +++ b/storage/connect/myconn.cpp @@ -365,7 +365,7 @@ int MYSQLC::Open(PGLOBAL g, const char *host, const char *db, int pt) { const char *pipe = NULL; - uint cto = 60, nrt = 120; + uint cto = 6000, nrt = 12000; m_DB = mysql_init(NULL); |