3158 Bjorn Munch 2011-01-25 [merge]
null upmerge
3157 Bjorn Munch 2011-01-25 [merge]
merge from 5.5 main
modified:
mysql-test/r/grant.result
mysql-test/r/type_datetime.result
mysql-test/t/type_datetime.test
sql/item_cmpfunc.cc
sql/slave.cc
sql/sql_acl.cc
sql/sql_repl.cc
sql/sql_show.cc
strings/bchange.c
strings/bmove_upp.c
strings/conf_to_src.c
strings/ctype-big5.c
strings/ctype-bin.c
strings/ctype-cp932.c
strings/ctype-czech.c
strings/ctype-euc_kr.c
strings/ctype-eucjpms.c
strings/ctype-extra.c
strings/ctype-gb2312.c
strings/ctype-gbk.c
strings/ctype-latin1.c
strings/ctype-mb.c
strings/ctype-simple.c
strings/ctype-sjis.c
strings/ctype-tis620.c
strings/ctype-uca.c
strings/ctype-ucs2.c
strings/ctype-ujis.c
strings/ctype-utf8.c
strings/ctype-win1250ch.c
strings/ctype.c
strings/do_ctype.c
strings/dtoa.c
strings/dump_map.c
strings/int2str.c
strings/is_prefix.c
strings/llstr.c
strings/longlong2str.c
strings/my_strchr.c
strings/my_strtoll10.c
strings/my_vsnprintf.c
strings/str2int.c
strings/str_alloc.c
strings/strappend.c
strings/strcend.c
strings/strcont.c
strings/strend.c
strings/strfill.c
strings/strmake.c
strings/strmov.c
strings/strnlen.c
strings/strnmov.c
strings/strxmov.c
strings/strxnmov.c
strings/uca-dump.c
strings/uctypedump.c
strings/utr11-dump.c
strings/xml.c
3156 Magnus Blåudd 2011-01-24 [merge]
Merge
modified:
mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/r/grant.result'
--- a/mysql-test/r/grant.result 2010-10-19 09:26:45 +0000
+++ b/mysql-test/r/grant.result 2011-01-14 14:57:13 +0000
@@ -594,6 +594,7 @@ Index Tables To create or drop indexes
Insert Tables To insert data into tables
Lock tables Databases To use LOCK TABLES (together with SELECT privilege)
Process Server Admin To view the plain text of currently executing queries
+Proxy Server Admin To make proxy user possible
References Databases,Tables To have references on tables
Reload Server Admin To reload or refresh tables, logs and privileges
Replication client Server Admin To ask where the slave or master servers are
=== modified file 'mysql-test/r/type_datetime.result'
--- a/mysql-test/r/type_datetime.result 2010-10-07 16:16:30 +0000
+++ b/mysql-test/r/type_datetime.result 2011-01-19 14:12:43 +0000
@@ -637,6 +637,17 @@ CAST(CAST('2008-07-29T10:42:51.1234567'
20080729104251.1234560
Warnings:
Warning 1292 Truncated incorrect datetime value: '2008-07-29T10:42:51.1234567'
+#
+# Bug#59173: Failure to handle DATE(TIME) values where Year, Month or
+# Day is ZERO
+#
+CREATE TABLE t1 (dt1 DATETIME);
+INSERT INTO t1 (dt1) VALUES ('0000-00-01 00:00:01');
+DELETE FROM t1 WHERE dt1 = '0000-00-01 00:00:01';
+# Should be empty
+SELECT * FROM t1;
+dt1
+DROP TABLE t1;
End of 5.1 tests
#
# Start of 5.5 tests
=== modified file 'mysql-test/t/type_datetime.test'
--- a/mysql-test/t/type_datetime.test 2010-10-07 16:16:30 +0000
+++ b/mysql-test/t/type_datetime.test 2011-01-19 14:12:43 +0000
@@ -445,6 +445,17 @@ SELECT CAST(CAST('00000002006-000008-000
# show we truncate microseconds from the right
SELECT CAST(CAST('2008-07-29T10:42:51.1234567' AS DateTime) AS DECIMAL(30,7));
+--echo #
+--echo # Bug#59173: Failure to handle DATE(TIME) values where Year, Month or
+--echo # Day is ZERO
+--echo #
+CREATE TABLE t1 (dt1 DATETIME);
+INSERT INTO t1 (dt1) VALUES ('0000-00-01 00:00:01');
+DELETE FROM t1 WHERE dt1 = '0000-00-01 00:00:01';
+--echo # Should be empty
+SELECT * FROM t1;
+DROP TABLE t1;
+
--echo End of 5.1 tests
--echo #
=== modified file 'sql/item_cmpfunc.cc'
--- a/sql/item_cmpfunc.cc 2011-01-14 09:05:14 +0000
+++ b/sql/item_cmpfunc.cc 2011-01-19 14:12:43 +0000
@@ -918,7 +918,7 @@ int Arg_comparator::set_cmp_func(Item_re
cache_converted_constant can't be used here because it can't
correctly convert a DATETIME value from string to int representation.
*/
- Item_cache_int *cache= new Item_cache_int();
+ Item_cache_int *cache= new Item_cache_int(MYSQL_TYPE_DATETIME);
/* Mark the cache as non-const to prevent re-caching. */
cache->set_used_tables(1);
if (!(*a)->is_datetime())
=== modified file 'sql/slave.cc'
--- a/sql/slave.cc 2011-01-18 17:38:10 +0000
+++ b/sql/slave.cc 2011-01-24 03:52:29 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (C) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc 2010-12-17 11:11:34 +0000
+++ b/sql/sql_acl.cc 2011-01-14 15:48:11 +0000
@@ -8014,7 +8014,7 @@ static bool send_server_handshake_packet
end= strmake(end, plugin_name(mpvio->plugin)->str,
plugin_name(mpvio->plugin)->length);
- int res= my_net_write(mpvio->net, (uchar*) buff, (size_t) (end - buff)) ||
+ int res= my_net_write(mpvio->net, (uchar*) buff, (size_t) (end - buff + 1)) ||
net_flush(mpvio->net);
my_afree(buff);
DBUG_RETURN (res);
=== modified file 'sql/sql_repl.cc'
--- a/sql/sql_repl.cc 2011-01-18 17:38:10 +0000
+++ b/sql/sql_repl.cc 2011-01-24 03:52:29 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB & Sasha, 2008-2009 Sun Microsystems, Inc
+/* Copyright (C) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc 2011-01-07 11:56:50 +0000
+++ b/sql/sql_show.cc 2011-01-14 14:57:13 +0000
@@ -336,6 +336,7 @@ static struct show_privileges_st sys_pri
{"Insert", "Tables", "To insert data into tables"},
{"Lock tables","Databases","To use LOCK TABLES (together with SELECT privilege)"},
{"Process", "Server Admin", "To view the plain text of currently executing queries"},
+ {"Proxy", "Server Admin", "To make proxy user possible"},
{"References", "Databases,Tables", "To have references on tables"},
{"Reload", "Server Admin", "To reload or refresh tables, logs and privileges"},
{"Replication client","Server Admin","To ask where the slave or master servers are"},
=== modified file 'strings/bchange.c'
--- a/strings/bchange.c 2007-05-10 09:59:39 +0000
+++ b/strings/bchange.c 2011-01-19 13:17:52 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/bmove_upp.c'
--- a/strings/bmove_upp.c 2010-07-26 21:16:48 +0000
+++ b/strings/bmove_upp.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/conf_to_src.c'
--- a/strings/conf_to_src.c 2009-10-15 10:17:32 +0000
+++ b/strings/conf_to_src.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
@@ -252,7 +252,7 @@ static void
fprint_copyright(FILE *file)
{
fprintf(file,
-"/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.\n"
+"/* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.\n"
"\n"
" This program is free software; you can redistribute it and/or modify\n"
" it under the terms of the GNU General Public License as published by\n"
=== modified file 'strings/ctype-big5.c'
--- a/strings/ctype-big5.c 2010-07-26 06:47:03 +0000
+++ b/strings/ctype-big5.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/ctype-bin.c'
--- a/strings/ctype-bin.c 2009-11-11 16:03:02 +0000
+++ b/strings/ctype-bin.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 MySQL AB & tommy@stripped.
+/* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. & tommy@stripped.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
=== modified file 'strings/ctype-cp932.c'
--- a/strings/ctype-cp932.c 2010-07-26 06:47:03 +0000
+++ b/strings/ctype-cp932.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/ctype-czech.c'
--- a/strings/ctype-czech.c 2010-07-15 11:16:06 +0000
+++ b/strings/ctype-czech.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/ctype-euc_kr.c'
--- a/strings/ctype-euc_kr.c 2010-07-26 06:47:03 +0000
+++ b/strings/ctype-euc_kr.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/ctype-eucjpms.c'
--- a/strings/ctype-eucjpms.c 2010-07-26 06:47:03 +0000
+++ b/strings/ctype-eucjpms.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 MySQL AB & tommy@stripped.
+/* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. & tommy@stripped.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
=== modified file 'strings/ctype-extra.c'
--- a/strings/ctype-extra.c 2010-11-26 14:22:06 +0000
+++ b/strings/ctype-extra.c 2011-01-19 13:31:17 +0000
@@ -6,7 +6,7 @@
./conf_to_src ../sql/share/charsets/ > FILE
*/
-/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/ctype-gb2312.c'
--- a/strings/ctype-gb2312.c 2010-07-26 06:47:03 +0000
+++ b/strings/ctype-gb2312.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/ctype-gbk.c'
--- a/strings/ctype-gbk.c 2010-07-26 06:47:03 +0000
+++ b/strings/ctype-gbk.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/ctype-latin1.c'
--- a/strings/ctype-latin1.c 2009-11-11 16:03:02 +0000
+++ b/strings/ctype-latin1.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/ctype-mb.c'
--- a/strings/ctype-mb.c 2010-11-26 10:44:39 +0000
+++ b/strings/ctype-mb.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/ctype-simple.c'
--- a/strings/ctype-simple.c 2010-07-23 20:09:27 +0000
+++ b/strings/ctype-simple.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 MySQL AB
+/* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/ctype-sjis.c'
--- a/strings/ctype-sjis.c 2010-07-26 06:47:03 +0000
+++ b/strings/ctype-sjis.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/ctype-tis620.c'
--- a/strings/ctype-tis620.c 2010-07-15 11:16:06 +0000
+++ b/strings/ctype-tis620.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/ctype-uca.c'
--- a/strings/ctype-uca.c 2010-11-26 10:44:39 +0000
+++ b/strings/ctype-uca.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 2011, 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
=== modified file 'strings/ctype-ucs2.c'
--- a/strings/ctype-ucs2.c 2010-12-17 11:11:34 +0000
+++ b/strings/ctype-ucs2.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, 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
=== modified file 'strings/ctype-ujis.c'
--- a/strings/ctype-ujis.c 2010-07-26 06:47:03 +0000
+++ b/strings/ctype-ujis.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 MySQL AB & tommy@stripped.
+/* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. & tommy@stripped.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
=== modified file 'strings/ctype-utf8.c'
--- a/strings/ctype-utf8.c 2010-11-24 14:52:57 +0000
+++ b/strings/ctype-utf8.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, 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
=== modified file 'strings/ctype-win1250ch.c'
--- a/strings/ctype-win1250ch.c 2010-07-15 11:16:06 +0000
+++ b/strings/ctype-win1250ch.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/ctype.c'
--- a/strings/ctype.c 2009-11-09 09:45:40 +0000
+++ b/strings/ctype.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/do_ctype.c'
--- a/strings/do_ctype.c 2010-07-23 20:16:29 +0000
+++ b/strings/do_ctype.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/dtoa.c'
--- a/strings/dtoa.c 2010-06-01 17:37:45 +0000
+++ b/strings/dtoa.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (c) 2007, 2011, 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
=== modified file 'strings/dump_map.c'
--- a/strings/dump_map.c 2006-12-31 00:02:27 +0000
+++ b/strings/dump_map.c 2011-01-19 13:17:52 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2004 MySQL AB
+/* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/int2str.c'
--- a/strings/int2str.c 2010-07-15 11:16:06 +0000
+++ b/strings/int2str.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/is_prefix.c'
--- a/strings/is_prefix.c 2006-12-23 19:17:15 +0000
+++ b/strings/is_prefix.c 2011-01-19 13:17:52 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/llstr.c'
--- a/strings/llstr.c 2007-11-30 05:32:04 +0000
+++ b/strings/llstr.c 2011-01-19 13:17:52 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/longlong2str.c'
--- a/strings/longlong2str.c 2009-12-22 09:35:56 +0000
+++ b/strings/longlong2str.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/my_strchr.c'
--- a/strings/my_strchr.c 2010-12-01 12:54:50 +0000
+++ b/strings/my_strchr.c 2011-01-19 13:17:52 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB
+/* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/my_strtoll10.c'
--- a/strings/my_strtoll10.c 2010-07-15 11:13:30 +0000
+++ b/strings/my_strtoll10.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/my_vsnprintf.c'
--- a/strings/my_vsnprintf.c 2010-10-08 14:52:39 +0000
+++ b/strings/my_vsnprintf.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/str2int.c'
--- a/strings/str2int.c 2006-12-23 19:17:15 +0000
+++ b/strings/str2int.c 2011-01-19 13:17:52 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/str_alloc.c'
--- a/strings/str_alloc.c 2006-12-23 19:17:15 +0000
+++ b/strings/str_alloc.c 2011-01-19 13:17:52 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/strappend.c'
--- a/strings/strappend.c 2007-05-10 09:59:39 +0000
+++ b/strings/strappend.c 2011-01-19 13:17:52 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/strcend.c'
--- a/strings/strcend.c 2010-07-26 21:16:48 +0000
+++ b/strings/strcend.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/strcont.c'
--- a/strings/strcont.c 2007-05-10 09:59:39 +0000
+++ b/strings/strcont.c 2011-01-19 13:17:52 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/strend.c'
--- a/strings/strend.c 2010-07-26 21:16:48 +0000
+++ b/strings/strend.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 MySQL AB
+/* Copyright (c) 2002, 2011, 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
=== modified file 'strings/strfill.c'
--- a/strings/strfill.c 2007-05-10 09:59:39 +0000
+++ b/strings/strfill.c 2011-01-19 13:17:52 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/strmake.c'
--- a/strings/strmake.c 2009-07-16 13:17:47 +0000
+++ b/strings/strmake.c 2011-01-19 13:17:52 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/strmov.c'
--- a/strings/strmov.c 2010-07-26 21:16:48 +0000
+++ b/strings/strmov.c 2011-01-19 13:31:17 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/strnlen.c'
--- a/strings/strnlen.c 2007-05-10 09:59:39 +0000
+++ b/strings/strnlen.c 2011-01-19 13:17:52 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/strnmov.c'
--- a/strings/strnmov.c 2007-05-10 09:59:39 +0000
+++ b/strings/strnmov.c 2011-01-19 13:17:52 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/strxmov.c'
--- a/strings/strxmov.c 2006-12-23 19:17:15 +0000
+++ b/strings/strxmov.c 2011-01-19 13:17:52 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 MySQL AB
+/* Copyright (c) 2002, 2011, 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
=== modified file 'strings/strxnmov.c'
--- a/strings/strxnmov.c 2007-05-10 09:59:39 +0000
+++ b/strings/strxnmov.c 2011-01-19 13:17:52 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 MySQL AB
+/* Copyright (c) 2002, 2011, 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
=== modified file 'strings/uca-dump.c'
--- a/strings/uca-dump.c 2006-12-31 00:02:27 +0000
+++ b/strings/uca-dump.c 2011-01-19 13:17:52 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/uctypedump.c'
--- a/strings/uctypedump.c 2006-12-31 01:29:11 +0000
+++ b/strings/uctypedump.c 2011-01-19 13:17:52 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/utr11-dump.c'
--- a/strings/utr11-dump.c 2006-12-31 00:02:27 +0000
+++ b/strings/utr11-dump.c 2011-01-19 13:17:52 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
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
=== modified file 'strings/xml.c'
--- a/strings/xml.c 2011-01-18 06:38:41 +0000
+++ b/strings/xml.c 2011-01-19 13:17:52 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
No bundle (reason: useless for push emails).| Thread |
|---|
| • bzr push into mysql-5.5-mtr branch (bjorn.munch:3156 to 3158) | Bjorn Munch | 25 Jan |
