summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
authorunknown <gkodinov/kgeorge@macbook.gmz>2008-03-23 14:29:35 +0200
committerunknown <gkodinov/kgeorge@macbook.gmz>2008-03-23 14:29:35 +0200
commit7bcbc7f2d5078d308c25f7d1c92995c64af7b8bc (patch)
tree42bf964a58bf1e828b9069d52e035f8fc72699d3 /sql/log.cc
parent1b6118190ef30d4211609e284d164873f11c8688 (diff)
downloadmariadb-git-7bcbc7f2d5078d308c25f7d1c92995c64af7b8bc.tar.gz
merge bug 26461 to 5.1-opt
Diffstat (limited to 'sql/log.cc')
-rw-r--r--sql/log.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc
index c2e0c85acfe..67438da6008 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1005,7 +1005,7 @@ bool LOGGER::general_log_write(THD *thd, enum enum_server_command command,
current_time= my_time(0);
while (*current_handler)
- error+= (*current_handler++)->
+ error|= (*current_handler++)->
log_general(thd, current_time, user_host_buff,
user_host_len, id,
command_name[(uint) command].str,