summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
authorLuis Soares <luis.soares@sun.com>2010-02-09 12:10:47 +0000
committerLuis Soares <luis.soares@sun.com>2010-02-09 12:10:47 +0000
commit349513d1e8c568073630c6640634cd5d50ee6aee (patch)
treedeb232a97959000978b5956ed80003a6e217bc22 /sql/log.cc
parent735aac91e32f9af3a60a1ede63ce25423f413d5e (diff)
parent943f9217ab8a48de046e72f0c30069acf1af178d (diff)
downloadmariadb-git-349513d1e8c568073630c6640634cd5d50ee6aee.tar.gz
auto merge from mysql-5.1-rep+3.
Diffstat (limited to 'sql/log.cc')
-rw-r--r--sql/log.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc
index 5a583e9e134..1c0e1ac5fef 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -4680,12 +4680,19 @@ bool MYSQL_BIN_LOG::write(Log_event *event_info)
{
BINLOG_USER_VAR_EVENT *user_var_event;
get_dynamic(&thd->user_var_events,(uchar*) &user_var_event, i);
+
+ /* setting flags for user var log event */
+ uchar flags= User_var_log_event::UNDEF_F;
+ if (user_var_event->user_var_event->unsigned_flag)
+ flags|= User_var_log_event::UNSIGNED_F;
+
User_var_log_event e(thd, user_var_event->user_var_event->name.str,
user_var_event->user_var_event->name.length,
user_var_event->value,
user_var_event->length,
user_var_event->type,
- user_var_event->charset_number);
+ user_var_event->charset_number,
+ flags);
if (e.write(file))
goto err;
}