From 1a17d7e8079b4cbda51c311eceaea38b407556f3 Mon Sep 17 00:00:00 2001
From: unknown <Li-Bing.Song@sun.com>
Date: Sun, 4 Jul 2010 12:02:49 +0800
Subject: The following statements support the CURRENT_USER() where a user is
 needed. DROP USER RENAME USER CURRENT_USER() ... GRANT ... TO CURRENT_USER()
 REVOKE ... FROM CURRENT_USER() ALTER DEFINER = CURRENT_USER() EVENTbut, When
 these statements are binlogged, CURRENT_USER() just is binlogged as
 'CURRENT_USER()', it is not expanded to the real user name. When slave
 executes the log event, 'CURRENT_USER()' is expand to the user of slave SQL
 thread, but SQL thread's user name always NULL. This breaks the replication.

After this patch, session's user will be written into query log events
if these statements call CURREN_USER() or 'ALTER EVENT' does not assign a definer.


mysql-test/include/diff_tables.inc:
  Expend its abilities.
  Now it can diff not only in sessions of 'master' and 'slave', but
  other sessions as well.
sql/log_event.cc:
  session's user will be written into Query_log_event, if is_current_user_used() is TRUE.
  On slave SQL thread, Only thd->invoker is written into Query_log_event,
  if it exists.
sql/sql_acl.cc:
  On slave SQL thread, grantor should copy from thd->invoker, if it exists
sql/sql_class.h:
  On slave SQL thread, thd->invoker is used to store the applying event's
  invoker.
---
 sql/sql_class.cc | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'sql/sql_class.cc')

diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 93aa6a8268c..2ce03708a9a 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -736,6 +736,9 @@ THD::THD()
   thr_lock_owner_init(&main_lock_id, &lock_info);
 
   m_internal_handler= NULL;
+  current_user_used= FALSE;
+  memset(&invoker_user, 0, sizeof(invoker_user));
+  memset(&invoker_host, 0, sizeof(invoker_host));
 }
 
 
@@ -1236,6 +1239,7 @@ void THD::cleanup_after_query()
   where= THD::DEFAULT_WHERE;
   /* reset table map for multi-table update */
   table_map_for_update= 0;
+  clean_current_user_used();
 }
 
 
@@ -3267,6 +3271,22 @@ void THD::set_query(char *query_arg, uint32 query_length_arg)
   pthread_mutex_unlock(&LOCK_thd_data);
 }
 
+void THD::get_definer(LEX_USER *definer)
+{
+  set_current_user_used();
+#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
+  if (slave_thread && has_invoker())
+  {
+    definer->user = invoker_user;
+    definer->host= invoker_host;
+    definer->password.str= NULL;
+    definer->password.length= 0;
+  }
+  else
+#endif
+    get_default_definer(this, definer);
+}
+
 
 /**
   Mark transaction to rollback and mark error as fatal to a sub-statement.
-- 
cgit v1.2.1


From 678640019debce6c77109dc5f52e323eaee45a9f Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
Date: Wed, 14 Jul 2010 11:50:17 +0300
Subject: Bug #53493 : add_to_status does not handle the longlong fields in
 STATUS_VAR

bytes_received/bytes_sent are ulonglong so they cannot be handled by the
ulong handling code in add_to_status/add_diff_to_status().

Fixed by adding code to handle these two variables in
add_to_status()/add_diff_to_status() and making sure they are not a subject
to the ulong handling code.
---
 sql/sql_class.cc | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'sql/sql_class.cc')

diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 2ce03708a9a..1028a9fccf4 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -1063,6 +1063,9 @@ void add_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var)
 
   while (to != end)
     *(to++)+= *(from++);
+
+  to_var->bytes_received+= from_var->bytes_received;
+  to_var->bytes_sent+= from_var->bytes_sent;
 }
 
 /*
@@ -1088,6 +1091,9 @@ void add_diff_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var,
 
   while (to != end)
     *(to++)+= *(from++) - *(dec++);
+
+  to_var->bytes_received+= from_var->bytes_received - dec_var->bytes_received;;
+  to_var->bytes_sent+= from_var->bytes_sent - dec_var->bytes_sent;
 }
 
 
-- 
cgit v1.2.1