bk commit into 5.0 tree

Below is the list of changes that have just been committed into a local
5.0 repository of pem. When pem does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1407 02/11/30 13:02:54 pem@xxxxxxxxx +1 -0
  Another post-merge fix.

  sql/sql_yacc.yy
    1.211 02/11/30 13:02:37 pem@xxxxxxxxx +2 -1
    Another post-merge fix.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: pem
# Host: mysql.telia.com
# Root: /home/pem/work/mysql-5.0

--- 1.210/sql/sql_yacc.yy       Fri Nov 29 19:21:45 2002
+++ 1.211/sql/sql_yacc.yy       Sat Nov 30 13:02:37 2002
@@ -1289,7 +1289,7 @@
        | BYTE_SYM                      { Lex->charset=my_charset_bin; }
        | BINARY                        { Lex->charset=my_charset_bin; }
        | CHAR_SYM SET charset_name     { Lex->charset=$3; }
-
+       ;
 
 opt_primary:
        /* empty */
@@ -1723,6 +1723,7 @@
            }
             /* select in braces, can't contain global parameters */
             sel->master_unit()->global_parameters=
+               sel->master_unit();
           } union_opt;
 
 select_init2:

---------------------------------------------------------------------
Before posting, please check:
   http://www.mysql.com/manual.php   (the manual)
   http://lists.mysql.com/           (the list archive)

To request this thread, e-mail internals-thread5848@xxxxxxxxxxxxxxx
To unsubscribe, e-mail <internals-unsubscribe@xxxxxxxxxxxxxxx>