bk commit into 5.1 tree (patg:1.2303)

[Patrick Galbraith]

Below is the list of changes that have just been committed into a local
5.1 repository of patg. When patg 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2303 06/05/15 14:53:29 patg@stripped +2 -0
  WL#3031 Small changes to private tree

  sql/sql_yacc.yy
    1.453 06/05/15 14:53:24 patg@stripped +1 -0
    WL# 3031
    
    Added SERVER_SYM to allow "server" (either case) in table/column names.

  libmysqld/Makefile.am
    1.82 06/05/15 14:53:24 patg@stripped +1 -1
    wl #3031 Makefile.am fix in libmysqld build

# 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:	patg
# Host:	govinda.patg.net
# Root:	/home/patg/mysql-build/mysql-5.1-wl3031

--- 1.452/sql/sql_yacc.yy	2006-04-08 14:47:21 -07:00
+++ 1.453/sql/sql_yacc.yy	2006-05-15 14:53:24 -07:00
@@ -9459,6 +9459,7 @@
 	| ROLLBACK_SYM		{}
 	| SAVEPOINT_SYM		{}
 	| SECURITY_SYM		{}
+        | SERVER_SYM            {}
 	| SIGNED_SYM		{}
 	| SOCKET_SYM		{}
 	| SLAVE			{}

--- 1.81/libmysqld/Makefile.am	2006-04-08 14:47:20 -07:00
+++ 1.82/libmysqld/Makefile.am	2006-05-15 14:53:24 -07:00
@@ -68,7 +68,7 @@
         event_executor.cc event.cc event_timed.cc \
         rpl_filter.cc sql_partition.cc handlerton.cc sql_plugin.cc \
         sql_tablespace.cc \
-        rpl_injector.cc my_user.c partition_info.cc
+        rpl_injector.cc my_user.c partition_info.cc \
 	sql_servers.cc
 
 libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)