bk commit into 6.0 tree (rafal:1.2611)

[rsomla]

Below is the list of changes that have just been committed into a local
6.0 repository of rafal.  When rafal 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@stripped, 2008-04-21 15:11:02+02:00, rafal@quant.(none) +1 -0
  Post-merge fix. Names of virtual primitives in obs::Obj class have been changed but 
  the code was not updated accordingly. This patch fixes it.

  sql/si_objects.cc@stripped, 2008-04-21 15:09:58+02:00, rafal@quant.(none) +4 -4
    Rename TablespaceObj methods: serialize -> do_serialize, execute-> do_execute, as required by the current code.

diff -Nrup a/sql/si_objects.cc b/sql/si_objects.cc
--- a/sql/si_objects.cc	2008-04-17 12:42:26 +02:00
+++ b/sql/si_objects.cc	2008-04-21 15:09:58 +02:00
@@ -710,12 +710,12 @@ public:
   TablespaceObj(const String *ts_name);
   
 public:
-  virtual bool serialize(THD *thd, String *serialization);
+  virtual bool do_serialize(THD *thd, String *serialization);
 
   virtual bool materialize(uint serialization_version,
                            const String *serialization);
 
-  virtual bool execute(THD *thd);
+  virtual bool do_execute(THD *thd);
 
   const String *describe();
 
@@ -2433,7 +2433,7 @@ TablespaceObj::TablespaceObj(const Strin
     @retval FALSE on success
     @retval TRUE on error
 */
-bool TablespaceObj::serialize(THD *thd, String *serialization)
+bool TablespaceObj::do_serialize(THD *thd, String *serialization)
 {
   DBUG_ENTER("TablespaceObj::serialize()");
   build_serialization();
@@ -2528,7 +2528,7 @@ const String *TablespaceObj::build_seria
     @retval FALSE on success
     @retval TRUE on error
 */
-bool TablespaceObj::execute(THD *thd)
+bool TablespaceObj::do_execute(THD *thd)
 {
   DBUG_ENTER("TablespaceObj::execute()");
   build_serialization(); // Build the CREATE command.