diff options
| author | cmiller@zippy.cornsilk.net <> | 2007-05-02 14:13:33 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2007-05-02 14:13:33 -0400 |
| commit | 587290cf00e787992e08282b416b4a74eb675556 (patch) | |
| tree | a3f368b5c0fe064f88744b2233b685ef3bb63d8a /sql/sql_profile.cc | |
| parent | 71a0ecee6e2241f6f1fcf8216b37067b5ac0161b (diff) | |
| download | mariadb-git-587290cf00e787992e08282b416b4a74eb675556.tar.gz | |
Fix up merge. Some macros are now functions. Some functions are
renamed. Some new THD proc_info states are new. Directories must be
encountered in make in a specific order, to have symlinks already set.
Move community-server-specific tests into own tests, so that we can
exempt them from testing on enterprise servers.
Diffstat (limited to 'sql/sql_profile.cc')
| -rw-r--r-- | sql/sql_profile.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_profile.cc b/sql/sql_profile.cc index 77dea4f9954..fa1728895b8 100644 --- a/sql/sql_profile.cc +++ b/sql/sql_profile.cc @@ -177,7 +177,7 @@ void QUERY_PROFILE::set_query_source(char *query_source_arg, DBUG_ASSERT(query_source == NULL); if (query_source_arg != NULL) - query_source= my_strdup_with_length(query_source_arg, length, MYF(0)); + query_source= my_strndup(query_source_arg, length, MYF(0)); } QUERY_PROFILE::~QUERY_PROFILE() |