summaryrefslogtreecommitdiff
path: root/sql/authors.h
diff options
context:
space:
mode:
authorMats Kindahl <mats.kindahl@oracle.com>2010-08-16 14:50:27 +0200
committerMats Kindahl <mats.kindahl@oracle.com>2010-08-16 14:50:27 +0200
commitb0836bd309e5b7857771ccae7096f0fdcdfc58e2 (patch)
tree60ab98cb19a6a71445b167b4cbc5308f59767cc9 /sql/authors.h
parent0ea3fb557deb017cd96f1e57694d56a5ace8c80c (diff)
parent7017775fd11c4249c1b64ff45564c88b94cf526f (diff)
downloadmariadb-git-b0836bd309e5b7857771ccae7096f0fdcdfc58e2.tar.gz
Merging with mysql-5.5-stage.
Diffstat (limited to 'sql/authors.h')
-rw-r--r--sql/authors.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/authors.h b/sql/authors.h
index 5de2659f098..db0ab00fb86 100644
--- a/sql/authors.h
+++ b/sql/authors.h
@@ -93,6 +93,7 @@ struct show_table_authors_st show_table_authors[]= {
{ "Arjen Lentz", "Brisbane, Australia",
"Documentation (2001-2004), Dutch error messages, LOG2()" },
{ "Marc Liyanage", "", "Created Mac OS X packages" },
+ { "Kelly Long", "Denver, CO, USA", "Pool Of Threads" },
{ "Zarko Mocnik", "", "Sorting for Slovenian language" },
{ "Per-Erik Martin", "Uppsala, Sweden", "Stored Procedures (5.0)" },
{ "Alexis Mikhailov", "", "User-defined functions" },