A previous changeset by me today about SQL_LOG_BIN had the problem

that it tested the privilege in ::update() whereas it should be
in ::check() (see email from Serg, subject
"Re: bk commit - 4.1 tree (guilhem:1.1706)").
So I add instead a check_func function to sys_var_thd_bit.
I do the same addition to sys_var_thd_ulong, to unify handling
of PSEUDO_THREAD_ID with the one of SQL_LOG_BIN. So class
sys_var_pseudo_thread_id is not needed anymore, removing it.


mysql-test/r/rpl_temporary.result:
  result update
mysql-test/t/rpl_temporary.test:
  tests after new way of fixing; verify that when second variable
  assignment is refused then first is not done.
sql/set_var.cc:
  a check_func (check_log_update) when setting SQL_LOG_BIN,
  and one when setting PSEUDO_THREAD_ID.
  Removing class sys_var_pseudo_thread_id.
  Updates for new prototypes of constructor in sys_var_thd_bit
  and sys_var_thd_ulong.
sql/set_var.h:
  Adding check_func to sys_var_thd_bit.
  Adding check_func to sys_var_thd_ulong, so class sys_var_pseudo_thread_id
  is not needed anymore, removing it.

1 files changed, 5 insertions, 2 deletions

diff --git a/mysql-test/t/rpl_temporary.test b/mysql-test/t/rpl_temporary.test
index c456562f0e5..f84c9b09aef 100644
--- a/mysql-test/t/rpl_temporary.test
+++ b/mysql-test/t/rpl_temporary.test
@@ -28,11 +28,14 @@ connect (con3,localhost,zedjzlcsjhd,,);
 # check that it requires the SUPER privilege.
 
 connection con3;
+SET @save_select_limit=@@session.sql_select_limit;
 --error 1227
-SET @@session.pseudo_thread_id=100;
+SET @@session.sql_select_limit=10, @@session.pseudo_thread_id=100;
+SELECT @@session.sql_select_limit = @save_select_limit; #shouldn't have changed
 # While we are here we also test that SQL_LOG_BIN can't be set
 --error 1227
-SET @@session.sql_log_bin=0;
+SET @@session.sql_select_limit=10, @@session.sql_log_bin=0;
+SELECT @@session.sql_select_limit = @save_select_limit; #shouldn't have changed
 # Now as root, to be sure it works
 connection con2;
 SET @@session.pseudo_thread_id=100;