diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-08-02 21:26:16 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-08-02 21:26:16 +0200 |
commit | 1c6ad62a269a3a03d8a343e1412876e04e9e9c37 (patch) | |
tree | 1e837eb728452ebaf749b5f9eedc018404798ed6 /strings/ctype-bin.c | |
parent | 14200dfa43756a0f9cb50c0b5d47d99b4fb1b6fa (diff) | |
parent | e9b2f5bf15281583b38a56b12f9ae2420c46a6d1 (diff) | |
download | mariadb-git-1c6ad62a269a3a03d8a343e1412876e04e9e9c37.tar.gz |
mysql-5.5.39 merge
~40% bugfixed(*) applied
~40$ bugfixed reverted (incorrect or we're not buggy)
~20% bugfixed applied, despite us being not buggy
(*) only changes in the server code, e.g. not cmakefiles
Diffstat (limited to 'strings/ctype-bin.c')
-rw-r--r-- | strings/ctype-bin.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c index 07cf9d45f07..77b7e0e18c3 100644 --- a/strings/ctype-bin.c +++ b/strings/ctype-bin.c @@ -1,5 +1,6 @@ /* Copyright (c) 2002-2007 MySQL AB & tommy@valley.ne.jp - Copyright (c) 2009-2011, Monty Program Ab + Copyright (c) 2002, 2014, Oracle and/or its affiliates. + Copyright (c) 2009, 2014, SkySQL Ab. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public |