bk commit into 5.1 tree (igreenhoe:1.2199)

[Ian Greenhoe]

Below is the list of changes that have just been committed into a local
5.1 repository of greenman. When greenman 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.2199 06/06/12 19:26:54 igreenhoe@stripped +1 -0
  Merge igreenhoe@stripped:/home/bk/mysql-5.1-new-maint
  into  mysql.com:/home/greenman/workspace-mysql/mysql/mysql-5.1-new

  sql/authors.h
    1.14 06/06/12 19:26:41 igreenhoe@stripped +0 -0
    Auto merged

# 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:	igreenhoe
# Host:	anubis.greendragongames.com
# Root:	/home/greenman/workspace-mysql/mysql/mysql-5.1-new/RESYNC

--- 1.13/sql/authors.h	2006-04-05 17:35:54 -07:00
+++ 1.14/sql/authors.h	2006-06-12 19:26:41 -07:00
@@ -57,7 +57,8 @@
   { "Yves Carlier", "", "mysqlaccess" },
   { "Joshua Chamas", "Cupertino, CA, USA",
     "Concurrent insert, extended date syntax" },
-  { "Petr Chardin", "Moscow, Russia", "Instance Manager (5.0)" },
+  { "Petr Chardin", "Moscow, Russia",
+    "Instance Manager (5.0), Server log tables (5.1)" },
   { "Wei-Jou Chen", "", "Chinese (Big5) character set" },
   { "Albert Chin-A-Young", "",
     "Tru64 port, large file support, better TCP wrappers support" },
@@ -74,6 +75,7 @@
   { "Nikolay Grishakin", "Austin, TX, USA", "Testing - Server" },
   { "Wei He", "", "Chinese (GBK) character set" },
   { "Eric Herman", "Amsterdam, Netherlands", "Bug fixing - federated" },
+  { "Andrey Hristov", "Walldorf, Germany", "Event scheduler (5.1)" },
   { "Alexander (Alexi) Ivanov", "St. Petersburg, Russia", "Replication" },
   { "Alexander (Salle) Keremidarski", "Sofia, Bulgaria",
     "Bug fixing" },