diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-14 12:25:39 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-14 12:25:39 +0400 |
| commit | c30d924dd5485f24818264d8e533820bcf1bcba0 (patch) | |
| tree | 1b3260f72106f50b182546dff41127a389144fa1 /libmysqld | |
| parent | 829525756e7a769b0c0de716f6207f5f21daa994 (diff) | |
| parent | 310833ff2e6a3c1e3ef397e78605661eee430198 (diff) | |
| download | mariadb-git-c30d924dd5485f24818264d8e533820bcf1bcba0.tar.gz | |
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libmysqld/Makefile.am | 1 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 3 | ||||
| -rw-r--r-- | libmysqld/libmysqld.c | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index bce14b38338..eb155908461 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -120,6 +120,7 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/sql_list.cc ../sql/sql_load.cc ../sql/sql_locale.cc ../sql/sql_binlog.cc ../sql/sql_manager.cc ../sql/sql_map.cc ../sql/sql_parse.cc ../sql/sql_partition.cc ../sql/sql_plugin.cc + ../sql/debug_sync.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 diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 80a7c74a266..b80381de5be 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -75,6 +75,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \ parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \ rpl_filter.cc sql_partition.cc sql_builtin.cc sql_plugin.cc \ + debug_sync.cc \ sql_tablespace.cc \ rpl_injector.cc my_user.c partition_info.cc \ sql_servers.cc event_parse_data.cc sql_signal.cc diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index f01a6b3f3df..dc39fb54f8c 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -142,6 +142,8 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command, if (!skip_check) result= thd->is_error() ? -1 : 0; + thd->mysys_var= 0; + #if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER) thd->profiling.finish_current_query(); #endif @@ -634,6 +636,7 @@ void *create_embedded_thd(int client_flag) thread_count++; threads.append(thd); + thd->mysys_var= 0; return thd; err: delete(thd); diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index 31ad8844650..c7b37d98f2b 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -164,6 +164,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, port=0; unix_socket=0; + client_flag|=mysql->options.client_flag; /* Send client information for access check */ client_flag|=CLIENT_CAPABILITIES; if (client_flag & CLIENT_MULTI_STATEMENTS) |