diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2016-06-13 14:28:02 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2016-06-13 14:28:02 +0200 |
| commit | 0a96c9c4aab671ddcd1ac6af2c0bacf84405b0ff (patch) | |
| tree | 0c3e5c84eadd5b485daf82c3e8a1e3879edca7c7 /storage/connect/myconn.h | |
| parent | a9ac3506d21135373f9ced92c79c0d9d7c7dca13 (diff) | |
| download | mariadb-git-0a96c9c4aab671ddcd1ac6af2c0bacf84405b0ff.tar.gz | |
- Possibly fix MDEV-10179 Reset remote tables when re-opening
modified: storage/connect/tabtbl.cpp
- Add trace and make m_Stmt conditional
modified: storage/connect/myconn.cpp
modified: storage/connect/myconn.h
- Protect trace from null string (for Linux)
modified: storage/connect/tabcol.cpp
- Record error changes
modified: storage/connect/mysql-test/connect/r/jdbc_new.result
- Typo
modified: storage/connect/jdbconn.cpp
modified: storage/connect/jsonudf.cpp
Diffstat (limited to 'storage/connect/myconn.h')
| -rw-r--r-- | storage/connect/myconn.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/connect/myconn.h b/storage/connect/myconn.h index 79f095f5c93..9ebd37527a6 100644 --- a/storage/connect/myconn.h +++ b/storage/connect/myconn.h @@ -90,8 +90,10 @@ class DllItem MYSQLC { // Members MYSQL *m_DB; // The return from MySQL connection - MYSQL_STMT *m_Stmt; // Prepared statement handle - MYSQL_RES *m_Res; // Points to MySQL Result +#if defined (MYSQL_PREPARED_STATEMENTS) + MYSQL_STMT *m_Stmt; // Prepared statement handle +#endif // MYSQL_PREPARED_STATEMENTS + MYSQL_RES *m_Res; // Points to MySQL Result MYSQL_ROW m_Row; // Point to current row int m_Rows; // The number of rows of the result int N; |