bk commit into 4.1 tree (serg:1.2268) BUG#10175

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
4.1 repository of serg. When serg 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.2268 05/05/13 21:43:26 serg@stripped +2 -0
  sql/ha_blackhole.cc
      bug#10175 - blackhole.test hangs with "Warning: prev link 1 didn't point at previous
lock at read: read lock with no write locks"
  sql/sql_base.cc
      libmysqld/examples/mysql.cc linking problem

  sql/sql_base.cc
    1.247 05/05/13 21:43:18 serg@stripped +1 -1
    libmysqld/examples/mysql.cc linking problem

  sql/ha_blackhole.cc
    1.4 05/05/13 21:43:18 serg@stripped +2 -1
    bug#10175 - blackhole.test hangs with "Warning: prev link 1 didn't point at previous
lock at read: read lock with no write locks"

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-4.1

--- 1.246/sql/sql_base.cc	Fri May  6 17:16:01 2005
+++ 1.247/sql/sql_base.cc	Fri May 13 21:43:18 2005
@@ -2522,7 +2522,7 @@
     if ((pos= find_type(&table->keynames, name->ptr(), name->length(), 1))
<=
 	0)
     {
-      my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), name->c_ptr(),
+      my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), name->c_ptr_safe(),
 	       table->real_name);
       map->set_all();
       return 1;

--- 1.3/sql/ha_blackhole.cc	Sat May  7 22:04:05 2005
+++ 1.4/sql/ha_blackhole.cc	Fri May 13 21:43:18 2005
@@ -129,8 +129,9 @@
                                          THR_LOCK_DATA **to,
                                          enum thr_lock_type lock_type)
 {
+  if (lock_type != TL_IGNORE && lock.type == TL_UNLOCK)
+    lock.type=lock_type;
   *to++= &lock;
-
   return to;
 }