bk commit into 5.0 tree (elliot:1.2011)

[Elliot Murphy]

Below is the list of changes that have just been committed into a local
5.0 repository of emurphy. When emurphy 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.2011 05/10/10 16:01:00 elliot@stripped +2 -0
  Post merge fixes

  sql/sql_parse.cc
    1.472 05/10/10 16:00:53 elliot@stripped +3 -1
    picking up a compile fix from 4.1

  ndb/src/mgmsrv/Services.cpp
    1.56 05/10/10 16:00:53 elliot@stripped +0 -1
    post-merge fixes, Vector<BaseString> explicit instantiation causes duplicate
symbol errors during
    linking.

# 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:	elliot
# Host:	agony.local
# Root:	/Users/emurphy/src/work/mysql-5.0-wl1012

--- 1.471/sql/sql_parse.cc	2005-10-10 14:23:42 -04:00
+++ 1.472/sql/sql_parse.cc	2005-10-10 16:00:53 -04:00
@@ -2402,7 +2402,7 @@
     }
 #endif
   }
-#endif /* !HAVE_REPLICATION */
+#endif /* HAVE_REPLICATION */
 
   /*
     When option readonly is set deny operations which change tables.
@@ -3208,6 +3208,7 @@
       if ((res= mysql_multi_update_prepare(thd)))
 	break;
 
+#ifdef HAVE_REPLICATION
       /* Check slave filtering rules */
       if (thd->slave_thread && all_tables_not_ok(thd, all_tables))
       {
@@ -3215,6 +3216,7 @@
 	my_error(ER_SLAVE_IGNORED_TABLE, MYF(0));
 	break;
       }
+#endif /* HAVE_REPLICATION */
 
       res= mysql_multi_update(thd, all_tables,
                               &select_lex->item_list,

--- 1.55/ndb/src/mgmsrv/Services.cpp	2005-10-10 03:38:15 -04:00
+++ 1.56/ndb/src/mgmsrv/Services.cpp	2005-10-10 16:00:53 -04:00
@@ -1574,4 +1574,3 @@
 
 template class MutexVector<int>;
 template class Vector<ParserRow<MgmApiSession> const*>;
-template class Vector<BaseString>;