diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2013-02-08 00:46:10 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-02-08 00:46:10 +0100 |
| commit | 38edf74a3c13941110f3bf85e19a905b850d923e (patch) | |
| tree | 1d8e1fbe7d9f9ac0fe435e5255d8fd94079b671e /storage/connect/mycat.cc | |
| parent | 60c4cab3bd00621cc03afb1be6de01c8fab0c5f0 (diff) | |
| download | mariadb-git-38edf74a3c13941110f3bf85e19a905b850d923e.tar.gz | |
1) Fix bug on strange sprintf
2) Fix bug on bad sprintf
3) Fix bug on cast from pointer to int
4) Begin implementing the "info" tables.
Already existing were the ODBC sata source table and the
WMI column info table.
A common way to handle them will permit to develop many
other such tables. Implemented:
The ODBC column info table.
Modified:
ha_connect.cc (4)
odbconn.cpp (4)
tabodbc.h (4)
tabodbc.cpp (4)
tabsys.h (3)
rcmsg.c (4)
tabfmt.cpp (2)
tabtbl.cpp (1)
resource.h (4)
mycat.h (4)
Diffstat (limited to 'storage/connect/mycat.cc')
| -rw-r--r-- | storage/connect/mycat.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/connect/mycat.cc b/storage/connect/mycat.cc index 073c16f18ec..f58fc0bdda2 100644 --- a/storage/connect/mycat.cc +++ b/storage/connect/mycat.cc @@ -99,9 +99,9 @@ extern int xtrace; /* General DB routines. */
/**************************************************************************/
//bool PlugCheckPattern(PGLOBAL, LPCSTR, LPCSTR);
-#if !defined(WIN32)
+//#if !defined(WIN32)
extern "C" int GetRcString(int id, char *buf, int bufsize);
-#endif // !WIN32
+//#endif // !WIN32
//void ptrc(char const *fmt, ...);
/**************************************************************************/
@@ -149,9 +149,9 @@ PQRYRES PlgAllocResult(PGLOBAL g, int ncol, int maxres, int ids, // Get header from message file
strncpy(cname, PlugReadMessage(g, ids + crp->Ncol, NULL), NAM_LEN);
cname[NAM_LEN] = 0; // for truncated long names
-#elif defined(WIN32)
+//#elif defined(WIN32)
// Get header from ressource file
- LoadString(s_hModule, ids + crp->Ncol, cname, sizeof(cname));
+// LoadString(s_hModule, ids + crp->Ncol, cname, sizeof(cname));
#else // !WIN32
GetRcString(ids + crp->Ncol, cname, sizeof(cname));
#endif // !WIN32
|