diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-03-28 01:04:46 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-03-28 01:04:46 +0200 |
| commit | 20e706689df1eb87c696304797e9d6184c0a75bb (patch) | |
| tree | ff3eab8fa3e060b34687c6e9819cb559ac67d5c5 /strings | |
| parent | 3d0775e9af2fcf3fe92b7f19e299ea23068eca1e (diff) | |
| parent | bfaebe3f5e4b917c4498e234bad7a9d45d07ca62 (diff) | |
| download | mariadb-git-20e706689df1eb87c696304797e9d6184c0a75bb.tar.gz | |
mysql-5.5.22 merge
mysql-test/suite/innodb/t/group_commit_crash.test:
remove autoincrement to avoid rbr being used for insert ... select
mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test:
remove autoincrement to avoid rbr being used for insert ... select
mysys/my_addr_resolve.c:
a pointer to a buffer is returned to the caller -> the buffer cannot be on the stack
mysys/stacktrace.c:
my_vsnprintf() is ok here, in 5.5
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-uca.c | 5 | ||||
| -rw-r--r-- | strings/ctype-ucs2.c | 4 | ||||
| -rw-r--r-- | strings/ctype-utf8.c | 5 | ||||
| -rw-r--r-- | strings/dtoa.c | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index 7dc1527002f..e4a8d7a4067 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -1,6 +1,5 @@ -/* Copyright (c) 2004-2007 MySQL AB, 2009 Sun Microsystems, Inc. - Copyright (c) 2009-2011, Monty Program Ab - Use is subject to license terms. +/* Copyright (c) 2004, 2011, Oracle and/or its affiliates. + Copyright (c) 2009, 2011, Monty Program Ab This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c index 7fd1e595eca..83ea3739f4c 100644 --- a/strings/ctype-ucs2.c +++ b/strings/ctype-ucs2.c @@ -1,5 +1,5 @@ -/* Copyright (c) 2003, 2010, Oracle and/or its affiliates - Copyright (c) 2009-2011, Monty Program Ab +/* Copyright (c) 2003, 2012, Oracle and/or its affiliates + Copyright (c) 2009, 2011, Monty Program Ab This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index b9f8b57c6b0..466114f9c6b 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -1,6 +1,5 @@ -/* Copyright (c) 2002-2008 MySQL AB, 2009 Sun Microsystems, Inc. - Copyright (c) 2009-2011, Monty Program Ab - Use is subject to license terms. +/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. + Copyright (c) 2009, 2011, Monty Program Ab This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/strings/dtoa.c b/strings/dtoa.c index 2af561d0564..6b216056f66 100644 --- a/strings/dtoa.c +++ b/strings/dtoa.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public |