diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2019-05-11 19:15:57 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2019-05-11 19:15:57 +0300 |
| commit | f177f125d4bfa8817833960286a5f18efe2fef1f (patch) | |
| tree | 12c6aa853460beb2ff9510d0547c55586dccfa83 /mysys | |
| parent | 3e8cab51cb78f3e60e139af944eef8f25502fc81 (diff) | |
| parent | 15f1e03d46dfa704beeed4880ed72c0163869dc3 (diff) | |
| download | mariadb-git-f177f125d4bfa8817833960286a5f18efe2fef1f.tar.gz | |
Merge branch '5.5' into 10.1
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/file_logger.c | 2 | ||||
| -rw-r--r-- | mysys/my_chmod.c | 2 | ||||
| -rw-r--r-- | mysys/my_port.c | 2 | ||||
| -rw-r--r-- | mysys/my_rnd.c | 2 | ||||
| -rw-r--r-- | mysys/my_safehash.c | 2 | ||||
| -rw-r--r-- | mysys/my_safehash.h | 2 | ||||
| -rw-r--r-- | mysys/my_uuid.c | 2 | ||||
| -rw-r--r-- | mysys/test_thr_mutex.c | 2 | ||||
| -rw-r--r-- | mysys/waiting_threads.c | 2 | ||||
| -rw-r--r-- | mysys/wqueue.c | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/mysys/file_logger.c b/mysys/file_logger.c index 078286cd7d0..8420ee075b0 100644 --- a/mysys/file_logger.c +++ b/mysys/file_logger.c @@ -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, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #ifndef FLOGGER_SKIP_INCLUDES diff --git a/mysys/my_chmod.c b/mysys/my_chmod.c index 095ac858834..3d0863936a7 100644 --- a/mysys/my_chmod.c +++ b/mysys/my_chmod.c @@ -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, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include "mysys_priv.h" #include "mysys_err.h" diff --git a/mysys/my_port.c b/mysys/my_port.c index 75a07b03efe..c0e36eafc2d 100644 --- a/mysys/my_port.c +++ b/mysys/my_port.c @@ -13,7 +13,7 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - MA 02111-1301, USA */ + MA 02110-1335 USA */ /* Small functions to make code portable diff --git a/mysys/my_rnd.c b/mysys/my_rnd.c index fc38d5586ce..c38682a2012 100644 --- a/mysys/my_rnd.c +++ b/mysys/my_rnd.c @@ -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, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include "mysys_priv.h" #include <my_rnd.h> diff --git a/mysys/my_safehash.c b/mysys/my_safehash.c index c34f3c456cd..e4e72bd6506 100644 --- a/mysys/my_safehash.c +++ b/mysys/my_safehash.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 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ /* Handling of multiple key caches diff --git a/mysys/my_safehash.h b/mysys/my_safehash.h index 3d3aa1e6006..71aaf5d0c6f 100644 --- a/mysys/my_safehash.h +++ b/mysys/my_safehash.h @@ -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 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ /* Handling of multiple key caches diff --git a/mysys/my_uuid.c b/mysys/my_uuid.c index f167ebe1d6e..da947b09c48 100644 --- a/mysys/my_uuid.c +++ b/mysys/my_uuid.c @@ -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, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ /* implements Universal Unique Identifiers (UUIDs), as in diff --git a/mysys/test_thr_mutex.c b/mysys/test_thr_mutex.c index fa5b6f74ba3..00b1f5f412c 100644 --- a/mysys/test_thr_mutex.c +++ b/mysys/test_thr_mutex.c @@ -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, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ /* Testing of deadlock detector */ diff --git a/mysys/waiting_threads.c b/mysys/waiting_threads.c index 2549bd8a587..35f19aa7edb 100644 --- a/mysys/waiting_threads.c +++ b/mysys/waiting_threads.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 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ /** @file diff --git a/mysys/wqueue.c b/mysys/wqueue.c index 1dafc03b935..6e4081a26e1 100644 --- a/mysys/wqueue.c +++ b/mysys/wqueue.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 Street, Fifth Floor, Boston, MA 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include <wqueue.h> |