diff options
| author | unknown <knielsen@mysql.com> | 2005-11-26 15:30:09 +0100 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2005-11-26 15:30:09 +0100 |
| commit | cd22085abd152380609cb8551211c94d70d5c215 (patch) | |
| tree | 2f2f629a9d2913dd099c25e65a91d19573a3b607 | |
| parent | 25d34b2324816eb76d1059edf3167aad02550a15 (diff) | |
| parent | 0a3d70a0444fb9e3123102781852c39f789ffe62 (diff) | |
| download | mariadb-git-cd22085abd152380609cb8551211c94d70d5c215.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-new
into mysql.com:/tmp/x/mysql-5.1-new
| -rw-r--r-- | mysql-test/r/show_check.result | 2 | ||||
| -rw-r--r-- | sql/authors.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index 3a3ee5735f0..d1fb8d25d09 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -583,3 +583,5 @@ Petr Chardin Moscow, Russia Instance Manager (5.0) Sergey Vojtovich Izhevsk, Russia Plugins infrastructure (5.1) Alexander Nozdrin Moscow, Russia Bugfixing (Stored Procedures, 5.0) Per-Erik Martin Uppsala, Sweden Stored Procedures (5.0) +Alexey Botchkov (Holyfoot) Izhevsk Russia GIS extentions (4.1), Embedded Server (4.1), precision math (5.0) +Eric Herman Amsterdam, Netherlands Bugfixing - federated diff --git a/sql/authors.h b/sql/authors.h index 88882ca8f23..8d15f4656a0 100644 --- a/sql/authors.h +++ b/sql/authors.h @@ -31,5 +31,6 @@ struct show_table_authors_st show_table_authors[]= { { "Alexander Nozdrin", "Moscow, Russia", "Bugfixing (Stored Procedures, 5.0)" }, { "Per-Erik Martin", "Uppsala, Sweden", "Stored Procedures (5.0)" }, { "Alexey Botchkov (Holyfoot)", "Izhevsk Russia", "GIS extentions (4.1), Embedded Server (4.1), precision math (5.0)"}, + { "Eric Herman", "Amsterdam, Netherlands", "Bugfixing - federated" }, {NULL, NULL, NULL} }; |