bk commit into 5.0 tree (aivanov:1.2052) BUG#1234

[Alex Ivanov]

Below is the list of changes that have just been committed into a local
5.0 repository of alexi. When alexi 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.2052 06/01/20 18:20:15 aivanov@stripped +3 -0
  BUG #1234 WL #4321
  Test bk triggers

  sql/ha_archive.h
    1.32 06/01/20 18:20:06 aivanov@stripped +1 -0
    Test bk triggers

  mysql-test/t/innodb-lock.test
    1.13 06/01/20 18:20:06 aivanov@stripped +1 -0
    Test bk triggers

  innobase/read/read0read.c
    1.11 06/01/20 18:20:06 aivanov@stripped +1 -0
    Test bk triggers

# 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:	aivanov
# Host:	mysql.creware.com
# Root:	/home/alexi/triggers/mysql-5.0-child

--- 1.31/sql/ha_archive.h	2005-10-25 10:20:26 +04:00
+++ 1.32/sql/ha_archive.h	2006-01-20 18:20:06 +03:00
@@ -29,6 +29,7 @@
 typedef struct st_archive_share {
   char *table_name;
   char data_file_name[FN_REFLEN];
+  /* changes */
   uint table_name_length,use_count;
   pthread_mutex_t mutex;
   THR_LOCK lock;

--- 1.12/mysql-test/t/innodb-lock.test	2005-09-15 23:17:37 +04:00
+++ 1.13/mysql-test/t/innodb-lock.test	2006-01-20 18:20:06 +03:00
@@ -4,6 +4,7 @@
 
 #
 # Check and select innodb lock type
+# changes
 #
 
 set global innodb_table_locks=1;

--- 1.10/innobase/read/read0read.c	2005-08-18 07:37:49 +04:00
+++ 1.11/innobase/read/read0read.c	2006-01-20 18:20:06 +03:00
@@ -18,6 +18,7 @@
 /*************************************************************************
 Creates a read view object. */
 UNIV_INLINE
+/* changes */
 read_view_t*
 read_view_create_low(
 /*=================*/