mariadb

mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00

Files

Alexey Kopytov 940ad61b71 Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.

Conflicts:

Text conflict in configure.in
Text conflict in dbug/dbug.c
Text conflict in mysql-test/r/ps.result
Text conflict in mysql-test/t/ps.test
Text conflict in sql/CMakeLists.txt
Text conflict in sql/ha_ndbcluster.cc
Text conflict in sql/mysqld.cc
Text conflict in sql/sql_plugin.cc
Text conflict in sql/sql_table.cc

2010-04-30 00:33:06 +04:00

psi

WL#5030: Split and remove mysql_priv.h

2010-03-31 16:05:33 +02:00

innodb_priv.h

WL#5030: Splitting mysql_priv.h

2010-04-21 00:29:30 +02:00

plugin_audit.h

BUG#47059 - In audit plugin I cannot see the event subclasses,

2010-04-15 13:05:17 +04:00

plugin_ftparser.h

Backport from 6.0-codebase.