Merge with 5.2

This commit is contained in:
Michael Widenius 2011-03-09 15:47:59 +02:00
commit 139a2b64bf
1617 changed files with 28742 additions and 44152 deletions

View file

@ -1,4 +1,4 @@
/* Copyright (c) 2000, 2010 Oracle and/or its affiliates. All rights reserved.
/* Copyright (c) 2000, 2010, 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