5.3 merge

This commit is contained in:
Sergei Golubchik 2012-01-13 15:50:02 +01:00
commit 4f435bddfd
750 changed files with 17312 additions and 7063 deletions

View file

@ -6,7 +6,8 @@
./conf_to_src ../sql/share/charsets/ > FILE
*/
/* Copyright (c) 2003, 2010, Oracle and/or its affiliates.
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
Copyright (c) 2000, 2011, Oracle and/or its affiliates.
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