diff options
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | libmysql/errmsg.c | 8 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 7 |
3 files changed, 30 insertions, 9 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index 0bad5934659..e2888ba25f9 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -16,7 +16,8 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/libmysql - ${CMAKE_SOURCE_DIR}/regex + ${CMAKE_BINARY_DIR}/pcre + ${CMAKE_SOURCE_DIR}/pcre ${CMAKE_SOURCE_DIR}/strings ${SSL_INCLUDE_DIRS} ${SSL_INTERNAL_INCLUDE_DIRS} @@ -219,11 +220,30 @@ dynamic_column_create dynamic_column_create_many dynamic_column_update dynamic_column_update_many -dynamic_column_delete dynamic_column_exists dynamic_column_list dynamic_column_get dynamic_column_prepare_decimal +mariadb_dyncol_create_many +mariadb_dyncol_create_many_named +mariadb_dyncol_update_many +mariadb_dyncol_update_many_named +mariadb_dyncol_exists +mariadb_dyncol_exists_named +mariadb_dyncol_list +mariadb_dyncol_list_named +mariadb_dyncol_get +mariadb_dyncol_get_named +mariadb_dyncol_has_names +mariadb_dyncol_check +mariadb_dyncol_json +mariadb_dyncol_val_str +mariadb_dyncol_val_long +mariadb_dyncol_val_double +mariadb_dyncol_unpack +mariadb_dyncol_column_cmp_named +mariadb_dyncol_column_count +mariadb_dyncol_prepare_decimal ) SET(CLIENT_API_FUNCTIONS diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c index 498ba6e9829..4c4485f7ec4 100644 --- a/libmysql/errmsg.c +++ b/libmysql/errmsg.c @@ -27,9 +27,9 @@ const char *client_errors[]= { "Unknown MySQL error", "Can't create UNIX socket (%d)", - "Can't connect to local MySQL server through socket '%-.100s' (%d)", - "Can't connect to MySQL server on '%-.100s' (%d)", - "Can't create TCP/IP socket (%d)", + "Can't connect to local MySQL server through socket '%-.100s' (%M)", + "Can't connect to MySQL server on '%-.100s' (%M)", + "Can't create TCP/IP socket (%M)", "Unknown MySQL server host '%-.100s' (%d)", "MySQL server has gone away", "Protocol mismatch; server version = %d, client version = %d", @@ -80,7 +80,7 @@ const char *client_errors[]= "Prepared statement contains no metadata", "Attempt to read a row while there is no result set associated with the statement", "This feature is not implemented yet", - "Lost connection to MySQL server at '%s', system error: %d", + "Lost connection to MySQL server at '%s', system error: %M", "Statement closed indirectly because of a preceeding %s() call", "The number of columns in the result set differs from the number of bound buffers. You must reset the statement, rebind the result set columns, and execute the statement again", "This handle is already connected. Use a separate handle for each connection.", diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 242144abc50..6cc44c26aa3 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1520,8 +1520,8 @@ mysql_stmt_init(MYSQL *mysql) DBUG_RETURN(NULL); } - init_alloc_root(&stmt->mem_root, 2048, 2048); - init_alloc_root(&stmt->result.alloc, 4096, 4096); + init_alloc_root(&stmt->mem_root, 2048, 2048, MYF(MY_THREAD_SPECIFIC)); + init_alloc_root(&stmt->result.alloc, 4096, 4096, MYF(MY_THREAD_SPECIFIC)); stmt->result.alloc.min_malloc= sizeof(MYSQL_ROWS); mysql->stmts= list_add(mysql->stmts, &stmt->list); stmt->list.data= stmt; @@ -1532,7 +1532,8 @@ mysql_stmt_init(MYSQL *mysql) strmov(stmt->sqlstate, not_error_sqlstate); /* The rest of statement members was bzeroed inside malloc */ - init_alloc_root(&stmt->extension->fields_mem_root, 2048, 0); + init_alloc_root(&stmt->extension->fields_mem_root, 2048, 0, + MYF(MY_THREAD_SPECIFIC)); DBUG_RETURN(stmt); } |