bk commit into 5.0 tree (monty:1.1838)

[monty]

Below is the list of changes that have just been committed into a local
5.0 repository of monty. When monty 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.1838 05/10/28 16:13:42 monty@stripped +2 -0
  After merge fix

  BitKeeper/etc/config
    1.12 05/10/28 02:42:11 monty@stripped +1 -1
    no open logging

  sql/sql_base.cc
    1.243 05/05/16 22:23:46 monty@stripped +1 -1
    After 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:	monty
# Host:	hundin.mysql.fi
# Root:	/my/mysql-5.0

--- 1.242/sql/sql_base.cc	2005-05-16 20:21:34 +03:00
+++ 1.243/sql/sql_base.cc	2005-05-16 22:23:46 +03:00
@@ -3307,7 +3307,7 @@
         0)
     {
       my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), name->c_ptr(),
-	       table->real_name);
+	       table->s->table_name);
       map->set_all();
       return 1;
     }

--- 1.11/BitKeeper/etc/config	2005-05-13 10:34:57 +03:00
+++ 1.12/BitKeeper/etc/config	2005-10-28 02:42:11 +03:00
@@ -24,7 +24,7 @@
 # repository is commercial it can be an internal email address or "none"
 # to disable logging.
 # 
-logging:  logging@stripped
+logging:  none
 # 
 # If this field is set, all checkins will appear to be made by this user,
 # in effect making this a single user package.  Single user packages are