diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2012-02-16 12:28:49 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2012-02-16 12:28:49 +0200 |
| commit | 6ff320e0f644a9d3eb3cfb59c829a72de3ebbd44 (patch) | |
| tree | be91fa4aa01352f1e0fb53efec15a4966772bd39 /storage/innobase/mtr | |
| parent | ee9359840f659ce15a27aee1b2133e6f56b0b304 (diff) | |
| parent | 4045c9976cf475b3f42f4133440c1d9a9060fb25 (diff) | |
| download | mariadb-git-6ff320e0f644a9d3eb3cfb59c829a72de3ebbd44.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage/innobase/mtr')
| -rw-r--r-- | storage/innobase/mtr/mtr0mtr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/mtr/mtr0mtr.c b/storage/innobase/mtr/mtr0mtr.c index 08234609ff0..c192b3be83c 100644 --- a/storage/innobase/mtr/mtr0mtr.c +++ b/storage/innobase/mtr/mtr0mtr.c @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ |