diff options
| author | Luis Soares <luis.soares@sun.com> | 2009-01-08 19:03:56 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2009-01-08 19:03:56 +0000 |
| commit | b2cdc3b6cb8d3f811284fdaef0cbc220848a09fd (patch) | |
| tree | 189ec4f5502f19a5a31cd1b6a09beb965f2f87c7 /sql/log.cc | |
| parent | 75017750c3407850be09189b1bc2e77f647a3cfa (diff) | |
| parent | 6f25dee2ac6ac199d48fe1d8ec5959b77f5e5dcd (diff) | |
| download | mariadb-git-b2cdc3b6cb8d3f811284fdaef0cbc220848a09fd.tar.gz | |
merge: 5.1 -> 5.1-rpl
conflicts:
Text conflict in mysql-test/lib/mtr_report.pm
Text conflict in mysql-test/mysql-test-run.pl
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc index 6536be1b6ef..37cbf50bfeb 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. 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 |