diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-11 20:02:50 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-11 20:02:50 +0400 |
| commit | a6cf28a7a17b9b5fc85035f4ac965f7167ce6ff1 (patch) | |
| tree | 89c163aad88a201330e15a7e904ca11d6c1001e5 /sql/authors.h | |
| parent | db9672cfded3403f4145564bad8e6b78f47ba13c (diff) | |
| parent | af2de573256ec02dfe71db97ee1f80aa4e6c1e92 (diff) | |
| download | mariadb-git-a6cf28a7a17b9b5fc85035f4ac965f7167ce6ff1.tar.gz | |
Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in sql/sql_base.cc
Text conflict in sql/sql_partition.cc
Text conflict in sql/sql_priv.h
Text conflict in sql/sql_show.cc
Diffstat (limited to 'sql/authors.h')
| -rw-r--r-- | sql/authors.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/authors.h b/sql/authors.h index 555fe2ae43a..5de2659f098 100644 --- a/sql/authors.h +++ b/sql/authors.h @@ -80,6 +80,7 @@ struct show_table_authors_st show_table_authors[]= { { "Eric Herman", "Amsterdam, Netherlands", "Bug fixing - federated" }, { "Andrey Hristov", "Walldorf, Germany", "Event scheduler (5.1)" }, { "Alexander (Alexi) Ivanov", "St. Petersburg, Russia", "Replication" }, + { "Mattias Jonsson", "Uppsala, Sweden", "Partitioning" }, { "Alexander (Salle) Keremidarski", "Sofia, Bulgaria", "Bug fixing" }, { "Mats Kindahl", "Storvreta, Sweden", "Replication" }, |