diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-12-22 22:24:55 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-12-22 22:24:55 +0100 |
| commit | 7fc695195ddac3c20931b38b2d472afbe9ede526 (patch) | |
| tree | aa5a2e7f0cbb199d3f4c3ce16b601d092dcd0373 /libmysql | |
| parent | f16fea29ee3e20477d2c0ce549d1790e6fd3b97c (diff) | |
| parent | 09f8e195f6f66385072dff678e9c5cfdbfbbbe23 (diff) | |
| download | mariadb-git-7fc695195ddac3c20931b38b2d472afbe9ede526.tar.gz | |
merge
Diffstat (limited to 'libmysql')
| -rwxr-xr-x | libmysql/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libmysql/client_settings.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index f8b6a4ac9e2..c7a0a80cbeb 100755 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -128,6 +128,7 @@ mysql_server_init mysql_server_end mysql_set_character_set mysql_get_character_set_info +mysql_stmt_next_result CACHE INTERNAL "Functions exported by client API" diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h index aaec08d1b1e..fa92dfb2687 100644 --- a/libmysql/client_settings.h +++ b/libmysql/client_settings.h @@ -27,8 +27,7 @@ extern char * mysql_unix_port; CLIENT_TRANSACTIONS | \ CLIENT_PROTOCOL_41 | \ CLIENT_SECURE_CONNECTION | \ - CLIENT_MULTI_RESULTS | \ - CLIENT_PS_MULTI_RESULTS) + CLIENT_MULTI_RESULTS) sig_handler my_pipe_sig_handler(int sig); void read_user_name(char *name); |