diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2012-02-17 11:52:51 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2012-02-17 11:52:51 +0200 |
| commit | 4ea57c80b27b7d84ada535eb7fbc1e1b93545b04 (patch) | |
| tree | 995264b4b6367bc603db31e70cd57025ae8f39ce /storage/innobase/mtr | |
| parent | 2837fba743733ced6a5e0beecb67eb307ed44bfe (diff) | |
| parent | f77329ace9a8a415b05ad473970de6dc187327e7 (diff) | |
| download | mariadb-git-4ea57c80b27b7d84ada535eb7fbc1e1b93545b04.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage/innobase/mtr')
| -rw-r--r-- | storage/innobase/mtr/mtr0mtr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/mtr/mtr0mtr.c b/storage/innobase/mtr/mtr0mtr.c index c192b3be83c..d852ed6f496 100644 --- a/storage/innobase/mtr/mtr0mtr.c +++ b/storage/innobase/mtr/mtr0mtr.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 1995, 2012, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software |