From: Luis Soares
Date: November 29 2010 6:48pm
Subject: bzr commit into mysql-trunk-bugfixing branch (luis.soares:3396) Bug#57035
List-Archive: http://lists.mysql.com/commits/125414
X-Bug: 57035
Message-Id: <201011291850.oATGqvJP013630@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0093962850780687037=="

--===============0093962850780687037==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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;


--===============0093962850780687037==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/luis.soares@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: luis.soares@stripped
# target_branch: file:///home/lsoares/Workspace/bzr/work/bugfixing\
#   /45441/mysql-trunk-bugfixing/
# testament_sha1: 56c404c548aa954b817f6d4c12e83050dc81b666
# timestamp: 2010-11-29 18:48:39 +0000
# source_branch: /home/lsoares/Workspace/bzr/clones/mysql-trunk-\
#   bugfixing
# base_revision_id: luis.soares@stripped\
#   g35mgjhmcvyvnr6j
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWe3NRV8AAWRfgABQWOf//1KE
SgC////wUAOG694x51U3u3e7hkSNU2aNSeSemJip4aTyp41TR6AaHqglIibRT/UZU/IFHlD1MgAA
GQASSCYTUE02kbQ1QYjRtJoYaRkDFEj1AaANBk9RoAaAAAEoim0amp+hNpGJkjaTQGQAAC832Vp5
/3MU7M9ApnheQKILWNsgY2DvLLmauliIg9ep7QNciqihOw/yQ9fSmho3P7IYro90AtbrdJNpth/Z
VCMp6wmTaanIRwOTCz5LdTCbehjjX/a7aEjYrYiNTqxwgKNSAFhIpCaFqgG3AIJijkikbZvVQ1Gi
k+EESubENFZSEanEI0eUqIlzaaei/J/L6nrp327XoN7y4BulZ5DPG5hY5op4AkTKwiO1X1khC8Sd
EK1B9RdNSZGDemJKwhkMMAtEqil3Olr6oSHN+iH2Xpew45PhiolBYhYZrsLlMovrap+aBw1o9I+n
FUPoir5E6PVFoGwddO6EE18k8xZbkmNlbx2t5pbom/Qkw4jvSUSZRYWgiSfOOYZ4wqcHJGB0KFLb
KlB3u4UaZ5lxF2t97RFe4uuemc0CQXSbw8DV9uevbrexu8uL/kIjVhmbLk/2fDNttnkjaiv4gWiO
Twea23HHE7vmkUiRsAylkZ7aL95Ui8kZ1meXw4hRhGEv1GgSDoDkLXgstAx7hFFYIFuhfydeNIi6
Nst1IhI5kiKSot2iTk/VursoenajkY0FqIyhHYhFhgaRJR5xEl33IoJ3cucdGGb2OyGGzZVgiyyg
PHGPC6vhMmjT5WTP/iR+yiQUFDNNNHbi5iiGNo1GhucmaCXFtBkaDVi4qKCFPzrqL+e5g4hzDidp
C7tZRYeo8dmJrCgK7geV5M5/VyCkPnzOTCTArTW0t3hyZ/TN9bIu0he5RDoCvCkdXSQOKcyQ4D8V
rZpEbaGwhwNYMClgNQ3PRBUhlbqapAfUv0fsZ2PekbV3q0cx91h1G+k9nQitSN7Dr3IyiPBNYEEp
Z9q28tvhyKRRhfYH6MEMIdhIOkUNCO6MtH2SHESHFTn4PBeh14VKhkEIbesdKtqqHHxBlJm43Ysm
UVZJQaABTs0HZPJ8lSfHC605QZOxZkjaMEM1LKI9MRjRk7wVZkq4CCiTdSy7YvWzso0LQGplzi+U
zcxyTtjSZ9lK8tZsK1QYEdTUwxwzEaMX+eCN/f9ul7rtuI0VGmY1AWHgMDprB5ZDnWPIRgYQ0HEM
G1KYs6MKuan/F3JFOFCQ7c1FXw==


--===============0093962850780687037==--