mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'mysql/5.5' into 5.5

Browse source
This commit is contained in:
Sergei Golubchik 2017-04-11 10:18:04 -04:00
commit 663068c6ee
41 changed files with 379 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/mysql_upgrade.c
View file

@ -1,6 +1,6 @@
/*
Copyright (c) 2006, 2013, Oracle and/or its affiliates.
Copyright (c) 2010, 2016, MariaDB
Copyright (c) 2010, 2017, MariaDB
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
@ -1095,4 +1095,3 @@ end:
my_end(my_end_arg);
exit(0);
}