diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-04-07 15:58:46 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-04-07 15:58:46 +0200 |
| commit | f860b2aad41cd1b5ed0438ea211dcd78eec82b94 (patch) | |
| tree | 650133297bec368a1cdeb50ea1950e1b4d1b679e /strings | |
| parent | b43494620f6cd57e8249940f4fb0406ffff8dff7 (diff) | |
| parent | b95ae56b9f47cc19d3498d4be3142b2449a04600 (diff) | |
| download | mariadb-git-f860b2aad41cd1b5ed0438ea211dcd78eec82b94.tar.gz | |
merge
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-utf8.c | 2 | ||||
| -rw-r--r-- | strings/decimal.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index 466114f9c6b..88bab1fac76 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -1678,7 +1678,7 @@ MY_UNICASE_INFO *const my_unicase_default[256]={ /* Reproduce old utf8_general_ci behaviour before we fixed Bug#27877. */ -MY_UNICASE_INFO *my_unicase_mysql500[256]={ +MY_UNICASE_INFO *const my_unicase_mysql500[256]={ plane00_mysql500, plane01, plane02, plane03, plane04, plane05, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, diff --git a/strings/decimal.c b/strings/decimal.c index 1a99816b914..51c4457d934 100644 --- a/strings/decimal.c +++ b/strings/decimal.c @@ -1,5 +1,5 @@ /* Copyright (c) 2004, 2011, Oracle and/or its affiliates. - Copyright (c) 2009-2011, Monty Program Ab + Copyright (c) 2009, 2011, Monty Program Ab 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 |