diff options
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libmysqld/examples/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 6 | ||||
| -rw-r--r-- | libmysqld/libmysqld.c | 4 |
4 files changed, 9 insertions, 6 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 9fa7d46d466..b1895e98014 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -183,7 +183,7 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/sql_show.cc ../sql/sql_state.c ../sql/sql_string.cc ../sql/sql_tablespace.cc ../sql/sql_table.cc ../sql/sql_test.cc ../sql/sql_trigger.cc ../sql/sql_udf.cc ../sql/sql_union.cc - ../sql/sql_update.cc ../sql/sql_view.cc + ../sql/sql_update.cc ../sql/sql_view.cc ../sql/sql_profile.cc ../sql/strfunc.cc ../sql/table.cc ../sql/thr_malloc.cc ../sql/time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc ../sql/partition_info.cc ../sql/sql_connect.cc diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt index ee129ff2df0..a07d089c757 100644 --- a/libmysqld/examples/CMakeLists.txt +++ b/libmysqld/examples/CMakeLists.txt @@ -23,6 +23,9 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include IF(WIN32) ADD_DEFINITIONS(-DUSE_TLS) ENDIF(WIN32) + +ADD_DEFINITIONS(-DEMBEDDED_LIBRARY) + ADD_EXECUTABLE(mysql_embedded ../../client/completion_hash.cc ../../client/mysql.cc ../../client/readline.cc ../../client/sql_string.cc) diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 447868fab4d..ec9356ce98d 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -63,8 +63,8 @@ void embedded_get_error(MYSQL *mysql, MYSQL_DATA *data) { NET *net= &mysql->net; struct embedded_query_result *ei= data->embedded_info; - net->client_last_errno= ei->last_errno; - strmake(net->client_last_error, ei->info, sizeof(net->client_last_error)-1); + net->last_errno= ei->last_errno; + strmake(net->last_error, ei->info, sizeof(net->last_error)-1); memcpy(net->sqlstate, ei->sqlstate, sizeof(net->sqlstate)); mysql->server_status= ei->server_status; my_free(data, MYF(0)); @@ -687,7 +687,7 @@ int check_embedded_connection(MYSQL *mysql, const char *db) err: { NET *net= &mysql->net; - strmake(net->client_last_error, thd->main_da.message(), sizeof(net->client_last_error)-1); + strmake(net->last_error, thd->main_da.message(), sizeof(net->last_error)-1); memcpy(net->sqlstate, mysql_errno_to_sqlstate(thd->main_da.sql_errno()), sizeof(net->sqlstate)-1); diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index a8542f6fca9..aff9391e015 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -210,8 +210,8 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, error: DBUG_PRINT("error",("message: %u (%s)", - mysql->net.client_last_errno, - mysql->net.client_last_error)); + mysql->net.last_errno, + mysql->net.last_error)); { /* Free alloced memory */ my_bool free_me=mysql->free_me; |