diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-06-01 13:42:39 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-06-01 13:42:39 -0700 |
| commit | 27ab01243cbc7ddba29704afe31d0812652be19b (patch) | |
| tree | b50e061d5fe668cc49d270664a67422dd043e9d5 /libmysqld | |
| parent | 6ac0363426f96c26c64447f0aa7fbd8a13ecc313 (diff) | |
| parent | afedd72e225654225b20a91b072b012e4c57a9d4 (diff) | |
| download | mariadb-git-27ab01243cbc7ddba29704afe31d0812652be19b.tar.gz | |
Merge
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libmysqld/examples/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index bbfa7722fe0..490fbe936a2 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -135,7 +135,7 @@ FOREACH(LIB ${LIBS}) ENDFOREACH() MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS} - OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded) + OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Development) # Visual Studio users need debug static library IF(MSVC) @@ -149,7 +149,7 @@ ENDIF() IF(NOT DISABLE_SHARED) MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${CLIENT_API_FUNCTIONS} - COMPONENT Embedded) + COMPONENT Server) IF(UNIX) # Name the shared library, handle versioning (provides same api as client # library hence the same version) diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt index e607f3c685a..146e51d79c7 100644 --- a/libmysqld/examples/CMakeLists.txt +++ b/libmysqld/examples/CMakeLists.txt @@ -26,7 +26,7 @@ ADD_DEFINITIONS(-DEMBEDDED_LIBRARY -UMYSQL_CLIENT) MYSQL_ADD_EXECUTABLE(mysql_embedded ../../client/completion_hash.cc ../../client/mysql.cc ../../client/readline.cc - COMPONENT Test) + COMPONENT Client) TARGET_LINK_LIBRARIES(mysql_embedded mysqlserver) IF(UNIX) TARGET_LINK_LIBRARIES(mysql_embedded ${MY_READLINE_LIBRARY}) diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 1ba54350883..b454fc0d2e0 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -344,6 +344,8 @@ static int emb_stmt_execute(MYSQL_STMT *stmt) set_stmt_errmsg(stmt, net); DBUG_RETURN(1); } + else if (stmt->mysql->status == MYSQL_STATUS_GET_RESULT) + stmt->mysql->status= MYSQL_STATUS_STATEMENT_GET_RESULT; DBUG_RETURN(0); } |