bzr push into mysql-trunk-wl3584 branch (luis.soares:3468 to 3469) WL#3584

[Luis Soares]

 3469 Luis Soares	2011-09-28
      WL#3584
      
      Fixing one more compiler warning.

    modified:
      sql/sys_vars.h
 3468 Luis Soares	2011-09-28
      WL#3584
      
      Fixing tree name.

    modified:
      .bzr-mysql/default.conf
=== modified file 'sql/sys_vars.h'
--- a/sql/sys_vars.h	2011-09-25 16:01:57 +0000
+++ b/sql/sys_vars.h	2011-09-28 15:03:11 +0000
@@ -2009,7 +2009,7 @@ public:
                        flag_enum flag_arg)
     : sys_var(&all_sys_vars, name_arg, comment, flag_arg,
               0/*off*/, NO_CMD_LINE.id, NO_CMD_LINE.arg_type,
-              SHOW_CHAR, (intptr)NULL/*def_val*/,
+              SHOW_CHAR, (intptr)0/*def_val*/,
               NULL/*polylock*/, VARIABLE_NOT_IN_BINLOG,
               NULL/*on_check_func*/, NULL/*on_update_func*/,
               NULL/*substitute*/, PARSE_NORMAL/*parse_flag*/)

No bundle (reason: useless for push emails).