Merge branch 'mysql/5.5' into 5.5

This commit is contained in:
Sergei Golubchik 2015-12-09 10:00:49 +01:00
commit abf9d35213
37 changed files with 254 additions and 98 deletions

View file

@ -1,6 +1,6 @@
/*
Copyright (c) 2001, 2011, Oracle and/or its affiliates.
Copyright (c) 2010, 2011, Monty Program Ab.
Copyright (c) 2010, 2015, MariaDB
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