database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge from mysql-5.1 to mysql-5.5.

Browse Source
This commit is contained in:
Jon Olav Hauglid
2011-07-04 09:48:14 +02:00
parent 621ed7f055 c2e8aacb3f
commit c5a294e828
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mysql-test/include/mtr_check.sql
View File

@ -1,17 +1,17 @@
# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. -- Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
# --
# This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. -- the Free Software Foundation; version 2 of the License.
# --
# This program is distributed in the hope that it will be useful, -- This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of -- but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. -- GNU General Public License for more details.
# --
# You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation, -- along with this program; if not, write to the Free Software Foundation,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
delimiter ||; delimiter ||;

28
mysql-test/include/mtr_warnings.sql
View File

@ -1,17 +1,17 @@
# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. -- Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
# --
# This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. -- the Free Software Foundation; version 2 of the License.
# --
# This program is distributed in the hope that it will be useful, -- This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of -- but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. -- GNU General Public License for more details.
# --
# You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation, -- along with this program; if not, write to the Free Software Foundation,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
delimiter ||; delimiter ||;