bzr commit into mysql-5.1-bugteam branch (azundris:2832) Bug#40657

[Tatiana A. Nurnberg]

#At file:///misc/mysql/forest/40657/51-40657/ based on revid:joro@stripped

 2832 Tatiana A. Nurnberg	2009-03-11
      Bug#40657: assertion with out of range variables and traditional sql_mode
      
      normalize error-messages
     @ mysql-test/r/variables.result
        show that warning uses underscore
        (sysvar-name), not hyphens (option-name)
     @ mysql-test/t/variables.test
        show that warning uses underscore
        (sysvar-name), not hyphens (option-name)
     @ sql/set_var.cc
        normalize error-messages

    modified:
      mysql-test/r/variables.result
      mysql-test/t/variables.test
      sql/set_var.cc
=== modified file 'mysql-test/r/variables.result'
--- a/mysql-test/r/variables.result	2009-03-06 15:11:34 +0000
+++ b/mysql-test/r/variables.result	2009-03-11 22:32:53 +0000
@@ -1421,6 +1421,12 @@ SELECT @@global.expire_logs_days;
 @@global.expire_logs_days
 99
 SET GLOBAL expire_logs_days = @old_eld;
+SET GLOBAL auto_increment_offset=-1;
+Warnings:
+Warning	1292	Truncated incorrect auto_increment_offset value: '-1'
+SET GLOBAL auto_increment_offset=0;
+Warnings:
+Warning	1292	Truncated incorrect auto_increment_offset value: '0'
 select @@storage_engine;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
 def					@@storage_engine	253	6	6	N	1	31	8

=== modified file 'mysql-test/t/variables.test'
--- a/mysql-test/t/variables.test	2009-03-09 14:26:53 +0000
+++ b/mysql-test/t/variables.test	2009-03-11 22:32:53 +0000
@@ -1155,6 +1155,11 @@ SELECT @@global.expire_logs_days;
 # cleanup
 SET GLOBAL expire_logs_days = @old_eld;
 
+# show that warning uses underscore (sysvar-name), not hyphens (option-name)
+SET GLOBAL auto_increment_offset=-1;
+SET GLOBAL auto_increment_offset=0;
+
+
 
 #
 # Bug#41030 Wrong meta data (incorrect fieldlen)

=== modified file 'sql/set_var.cc'
--- a/sql/set_var.cc	2009-03-06 15:11:34 +0000
+++ b/sql/set_var.cc	2009-03-11 22:32:53 +0000
@@ -1520,9 +1520,10 @@ static bool get_unsigned(THD *thd, set_v
 
     var->save_result.ulonglong_value= getopt_ull_limit_value(var->save_result.
                                                              ulonglong_value,
-							     limits, &fixed);
+                                                             limits, &fixed);
 
-    if ((warnings == 0) && throw_bounds_warning(thd, fixed, TRUE, limits->name,
+    if ((warnings == 0) && throw_bounds_warning(thd, fixed, TRUE,
+                                                var->var->name,
                                                 (longlong) unadjusted))
       return TRUE;
   }


Attachment: [text/bzr-bundle] bzr/[e-mail]