diff options
| author | hf@deer.(none) <> | 2004-01-07 21:30:15 +0400 |
|---|---|---|
| committer | hf@deer.(none) <> | 2004-01-07 21:30:15 +0400 |
| commit | 334856444774152ac68464408f8d0fd1bc5f4002 (patch) | |
| tree | d20819ba4aaa9081734e46a63958402010176176 /sql/sql_class.cc | |
| parent | 2e7a5d3e7452040dafe37aacfb7786d380fee0c9 (diff) | |
| download | mariadb-git-334856444774152ac68464408f8d0fd1bc5f4002.tar.gz | |
Fix for 1224 (USER() CURRENT_USER() functions in embedded library)
Now we return user@host for USER() in embedded library
CURRENT_USER returns empty string if library compiled with
NO_EMBEDDED_ACCESS_CHECKS
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 60220ffc889..89b812eb205 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -323,12 +323,14 @@ THD::~THD() #endif DBUG_PRINT("info", ("freeing host")); +#ifndef EMBEDDED_LIBRARY if (host != my_localhost) // If not pointer to constant safeFree(host); if (user != delayed_user) safeFree(user); - safeFree(db); safeFree(ip); +#endif + safeFree(db); free_root(&warn_root,MYF(0)); free_root(&transaction.mem_root,MYF(0)); mysys_var=0; // Safety (shouldn't be needed) |