diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2019-05-11 22:19:05 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2019-05-11 22:19:05 +0300 |
| commit | cb248f880619431850e5638009a6098048050edf (patch) | |
| tree | 32858b1936d56c8391abf003fbdf6a9d6ba9a5e9 /sql-common | |
| parent | c0ac0b886047496e105a566a063bf1bd932d00a4 (diff) | |
| parent | 5543b75550962f07b4adcd47a6e52accec0a7d0f (diff) | |
| download | mariadb-git-cb248f880619431850e5638009a6098048050edf.tar.gz | |
Merge branch '5.5' into 10.1
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 2 | ||||
| -rw-r--r-- | sql-common/client_plugin.c | 2 | ||||
| -rw-r--r-- | sql-common/my_time.c | 2 | ||||
| -rw-r--r-- | sql-common/my_user.c | 2 | ||||
| -rw-r--r-- | sql-common/pack.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 4420a1afc17..fe73887106e 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -12,7 +12,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, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ /* This file is included by both libmysql.c (the MySQL client C API) diff --git a/sql-common/client_plugin.c b/sql-common/client_plugin.c index f93e50125c5..bd1c8863143 100644 --- a/sql-common/client_plugin.c +++ b/sql-common/client_plugin.c @@ -12,7 +12,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, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /** @file diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 7cf8692a3f6..01b4d1fc2c9 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -13,7 +13,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, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include <my_time.h> #include <m_string.h> diff --git a/sql-common/my_user.c b/sql-common/my_user.c index a486f77bc1e..0f0b21cc1ad 100644 --- a/sql-common/my_user.c +++ b/sql-common/my_user.c @@ -12,7 +12,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, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include <my_user.h> #include <m_string.h> diff --git a/sql-common/pack.c b/sql-common/pack.c index 4bb4a0b7a4e..57abeffab22 100644 --- a/sql-common/pack.c +++ b/sql-common/pack.c @@ -12,7 +12,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, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include <my_global.h> #include <mysql_com.h> |