From 8dc567dbed7ab9c6489d0b2f2c72d723c87c68e5 Mon Sep 17 00:00:00 2001
From: unknown <guilhem@mysql.com>
Date: Sat, 18 Feb 2006 17:32:15 +0100
Subject: [PATCH] Fix for BUG#13897 "failure to do SET SQL_MODE=N where N is a
 number > 31" (the original bug's title isn't the simplest symptom).
 sys_var::check_set() was wrong. mysqlbinlog makes use of such SET SQL_MODE=N
 (where N is interpreted like if SQL_MODE was a field of type SET), so this
 bug affected recovery from binlogs if the server was running with certain
 SQL_MODE values, for example the default values on Windows
 (STRICT_TRANS_TABLES); to work around this bug people had to edit
 mysqlbinlog's output.

mysql-test/r/sql_mode.result:
  result update
mysql-test/t/sql_mode.test:
  test for various numeric SQL_MODE values
sql/set_var.cc:
  For a set, it does not make sense to test if the supplied argument exceeds the number of elements in the set
  (such test would make sense for an enum), but rather to check if it exceeds 2^this (to verify
  that only reasonable bits are set).
---
 mysql-test/r/sql_mode.result | 16 ++++++++++++++++
 mysql-test/t/sql_mode.test   |  9 +++++++++
 sql/set_var.cc               |  7 ++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/sql_mode.result b/mysql-test/r/sql_mode.result
index 7d9d7fb333c..66df424919b 100644
--- a/mysql-test/r/sql_mode.result
+++ b/mysql-test/r/sql_mode.result
@@ -478,4 +478,20 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER="root"@"localhost" SQL SECURITY DEFINER VI
 create view v2 as select a from t2 where a in (select a from v1);
 drop view v2, v1;
 drop table t1, t2;
+select @@sql_mode;
+@@sql_mode
+ANSI_QUOTES
+set sql_mode=2097152;
+select @@sql_mode;
+@@sql_mode
+STRICT_TRANS_TABLES
+set sql_mode=16384+(65536*4);
+select @@sql_mode;
+@@sql_mode
+REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,NO_TABLE_OPTIONS,ANSI
+set sql_mode=2147483648;
+ERROR 42000: Variable 'sql_mode' can't be set to the value of '2147483648'
+select @@sql_mode;
+@@sql_mode
+REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,NO_TABLE_OPTIONS,ANSI
 SET @@SQL_MODE=@OLD_SQL_MODE;
diff --git a/mysql-test/t/sql_mode.test b/mysql-test/t/sql_mode.test
index 8ae9ced6c68..b67f1a73db6 100644
--- a/mysql-test/t/sql_mode.test
+++ b/mysql-test/t/sql_mode.test
@@ -255,4 +255,13 @@ create view v2 as select a from t2 where a in (select a from v1);
 drop view v2, v1;
 drop table t1, t2;
 
+select @@sql_mode;
+set sql_mode=2097152;
+select @@sql_mode;
+set sql_mode=16384+(65536*4);
+select @@sql_mode;
+--error 1231
+set sql_mode=2147483648; # that mode does not exist
+select @@sql_mode;
+
 SET @@SQL_MODE=@OLD_SQL_MODE;
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 02216fb2113..7be79ab59f0 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -1659,7 +1659,12 @@ bool sys_var::check_set(THD *thd, set_var *var, TYPELIB *enum_names)
   else
   {
     ulonglong tmp= var->value->val_int();
-    if (tmp >= enum_names->count)
+   /*
+     For when the enum is made to contain 64 elements, as 1ULL<<64 is
+     undefined, we guard with a "count<64" test.
+   */
+    if (unlikely((tmp >= ((ULL(1)) << enum_names->count)) &&
+                 (enum_names->count < 64)))
     {
       llstr(tmp, buff);
       goto err;