diff options
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | libmysqld/emb_qcache.cc | 2 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 12 |
3 files changed, 12 insertions, 7 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 5af5f5e1807..0f08ecd76bb 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -44,6 +44,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql-common/client_plugin.c ../sql-common/mysql_async.c ../sql/password.c ../sql/discover.cc ../sql/derror.cc ../sql/field.cc ../sql/field_conv.cc + ../sql/filesort_utils.cc ../sql/filesort.cc ../sql/gstream.cc ../sql/slave.cc ../sql/signal_handler.cc ../sql/handler.cc ../sql/hash_filo.cc ../sql/hostname.cc @@ -73,7 +74,8 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/debug_sync.cc ../sql/opt_table_elimination.cc ../sql/sql_prepare.cc ../sql/sql_rename.cc ../sql/sql_repl.cc ../sql/sql_select.cc ../sql/sql_servers.cc - ../sql/sql_show.cc ../sql/sql_state.c ../sql/sql_string.cc + ../sql/sql_show.cc ../sql/sql_state.c + ../sql/sql_statistics.cc ../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_profile.cc @@ -95,6 +97,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/create_options.cc ../sql/rpl_utility.cc ../sql/rpl_reporting.cc ../sql/sql_expression_cache.cc + ../sql/my_apc.cc ../sql/my_apc.h ${GEN_SOURCES} ${MYSYS_LIBWRAP_SOURCE} ) diff --git a/libmysqld/emb_qcache.cc b/libmysqld/emb_qcache.cc index d263e5d5fe8..abb0631ebfb 100644 --- a/libmysqld/emb_qcache.cc +++ b/libmysqld/emb_qcache.cc @@ -415,7 +415,7 @@ int emb_load_querycache_result(THD *thd, Querycache_stream *src) if (!data) goto err; - init_alloc_root(&data->alloc, 8192,0); + init_alloc_root(&data->alloc, 8192,0,MYF(0)); f_alloc= &data->alloc; data->fields= src->load_int(); diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index b454fc0d2e0..5332003885d 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -520,7 +520,8 @@ int init_embedded_server(int argc, char **argv, char **groups) if (!groups) groups= (char**) fake_groups; - my_progname= (char *)"mysql_embedded"; + if (!my_progname) + my_progname= (char *)"mysql_embedded"; /* Perform basic logger initialization logger. Should be called after @@ -634,7 +635,7 @@ void init_embedded_mysql(MYSQL *mysql, int client_flag) mysql->server_version= server_version; mysql->client_flag= client_flag; //mysql->server_capabilities= client_flag; - init_alloc_root(&mysql->field_alloc, 8192, 0); + init_alloc_root(&mysql->field_alloc, 8192, 0, MYF(0)); } /** @@ -906,8 +907,9 @@ int Protocol::begin_dataset() if (!data) return 1; alloc= &data->alloc; - init_alloc_root(alloc,8192,0); /* Assume rowlength < 8192 */ - alloc->min_malloc=sizeof(MYSQL_ROWS); + /* Assume rowlength < 8192 */ + init_alloc_root(alloc, 8192, 0, MYF(0)); + alloc->min_malloc= sizeof(MYSQL_ROWS); return 0; } @@ -1004,7 +1006,7 @@ bool Protocol::send_result_set_metadata(List<Item> *list, uint flags) thd_cs->mbmaxlen); } client_field->type= server_field.type; - client_field->flags= server_field.flags; + client_field->flags= (uint16) server_field.flags; client_field->decimals= server_field.decimals; client_field->db_length= strlen(client_field->db); client_field->table_length= strlen(client_field->table); |