database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge to latest mysql-next-mr

Browse Source
This commit is contained in:
Mikael Ronstrom
2009-12-16 09:49:16 +01:00
parent a893a64e23 5cd3dffebb
commit a2a4c70c1b
242 changed files with 5392 additions and 1733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_class.cc
View File

@@ -385,6 +385,8 @@ char *thd_security_context(THD *thd, char *buffer, unsigned int length,
str.append(proc_info);
}
pthread_mutex_lock(&thd->LOCK_thd_data);
if (thd->query())
{
if (max_query_len < 1)
@@ -394,6 +396,9 @@ char *thd_security_context(THD *thd, char *buffer, unsigned int length,
str.append('\n');
str.append(thd->query(), len);
}
pthread_mutex_unlock(&thd->LOCK_thd_data);
if (str.c_ptr_safe() == buffer)
return buffer;