diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-06 22:31:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-06 22:31:30 +0200 |
| commit | b838d081ad346e52787753b1799c627922c4a6c7 (patch) | |
| tree | dc8f1e21e6b40d5b72668571c570c9a3214fbf32 /storage/innobase/include/trx0roll.ic | |
| parent | 824db55ce53963a64fcf648b54500df22c57e9b2 (diff) | |
| parent | 72c36f4415815d55ddb82b23682f3c549906c00e (diff) | |
| download | mariadb-git-b838d081ad346e52787753b1799c627922c4a6c7.tar.gz | |
mysql-5.5.33 merge
Diffstat (limited to 'storage/innobase/include/trx0roll.ic')
| -rw-r--r-- | storage/innobase/include/trx0roll.ic | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/include/trx0roll.ic b/storage/innobase/include/trx0roll.ic index 3460832b18c..6a4a5f54459 100644 --- a/storage/innobase/include/trx0roll.ic +++ b/storage/innobase/include/trx0roll.ic @@ -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 St, Fifth Floor, Boston, MA 02110-1301 USA *****************************************************************************/ |