Nirbhay Choubey 3c9137deeb Merge branch '5.5' into 5.5-galera ... Merge banch 5.5 till revision : fdd6c11 - MDEV-7419 Function cli_safe_read not exported Conflicts: .bzrignore debian/dist/Debian/mariadb-galera-server-5.5.files.in debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in storage/tokudb/CMakeLists.txt support-files/build-tags		2015-02-18 17:15:57 -05:00
..
ha_innodb.cc	Merge branch '5.5' into 5.5-galera	2015-02-18 17:15:57 -05:00
ha_innodb.h	Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.	2014-04-16 12:13:43 +03:00
handler0alter.cc	Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.	2014-04-16 12:13:43 +03:00
i_s.cc	mysql-5.5.39 merge	2014-08-02 21:26:16 +02:00
i_s.h	Fixing the bug 16919882 - WRONG FSF ADDRESS IN LICENSES HEADERS	2013-06-10 22:29:41 +02:00