summaryrefslogtreecommitdiff
path: root/mysql-test/include/mtr_warnings.sql
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2019-05-11 22:19:05 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2019-05-11 22:19:05 +0300
commitcb248f880619431850e5638009a6098048050edf (patch)
tree32858b1936d56c8391abf003fbdf6a9d6ba9a5e9 /mysql-test/include/mtr_warnings.sql
parentc0ac0b886047496e105a566a063bf1bd932d00a4 (diff)
parent5543b75550962f07b4adcd47a6e52accec0a7d0f (diff)
downloadmariadb-git-cb248f880619431850e5638009a6098048050edf.tar.gz
Merge branch '5.5' into 10.1
Diffstat (limited to 'mysql-test/include/mtr_warnings.sql')
-rw-r--r--mysql-test/include/mtr_warnings.sql2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql
index 535090b75dd..40dcfadf12a 100644
--- a/mysql-test/include/mtr_warnings.sql
+++ b/mysql-test/include/mtr_warnings.sql
@@ -11,7 +11,7 @@
--
-- You should have received a copy of the GNU General Public License
-- 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-1335 USA
delimiter ||;