database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091208092611-pbno5awyb0v38hs7

Browse Source 
Fixed conflicts in:

- binlog.binlog_unsafe
- rpl.rpl_slow_query_log
This commit is contained in:
Alfranio Correia
2009-12-17 00:09:52 +00:00
parent 42cfe5b43c d6e7402d42
commit 013cc668df
234 changed files with 5903 additions and 1591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_class.cc
View File

@ -412,6 +412,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)
@ -421,6 +423,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;