bzr commit into mysql-trunk-bugfixing branch (luis.soares:3396) Bug#57035

[Luis Soares]

#At file:///home/lsoares/Workspace/bzr/work/bugfixing/45441/mysql-trunk-bugfixing/ based on revid:luis.soares@stripped

 3396 Luis Soares	2010-11-29
      BUG#57035: 'ulonglong sql_mode' stored into ulong, is risky
                  and causes compiler warning
      
      Post-push fix.

    modified:
      sql/set_var.h
=== modified file 'sql/set_var.h'
--- a/sql/set_var.h	2010-11-29 16:27:58 +0000
+++ b/sql/set_var.h	2010-11-29 18:48:29 +0000
@@ -309,7 +309,7 @@ int sql_set_variables(THD *thd, List<set
 
 bool fix_delay_key_write(sys_var *self, THD *thd, enum_var_type type);
 
-ulong expand_sql_mode(sql_mode_t sql_mode);
+sql_mode_t expand_sql_mode(sql_mode_t sql_mode);
 bool sql_mode_string_representation(THD *thd, sql_mode_t sql_mode, LEX_STRING *ls);
 
 extern sys_var *Sys_autocommit_ptr;


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