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/05/18 10:02:45 monty@stripped +2 -0
  After merge fix

  BUILD/compile-pentium64
    1.1 05/05/18 10:02:20 monty@stripped +10 -0

  BUILD/compile-pentium64
    1.0 05/05/18 10:02:20 monty@stripped +0 -0
    BitKeeper file /my/mysql-5.0/BUILD/compile-pentium64

  sql/sql_base.cc
    1.243 05/05/16 21:56:30 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:	hasky.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 21:56:30 +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;
     }
--- New file ---
+++ BUILD/compile-pentium64	05/05/18 10:02:20
#! /bin/sh

path=`dirname $0`
. "$path/SETUP.sh"

extra_flags="$pentium64_cflags $fast_cflags"
extra_configs="$pentium_configs $static_link"
strip=yes

. "$path/FINISH.sh"