Michael Widenius e63c03db8d Merge with 10.0-base ...

Automatic merge, except for server_audit.cc that had to be modified slightly
Changes to xtradb and innobase where ignored was these made no sence for 10.0

2014-03-13 16:43:11 +02:00

..

psi

Merge with 10.0-base

2014-03-13 16:43:11 +02:00

auth_dialog_client.h

move authentication_windows_client and mysql_clear_password clear client auth plugins

2011-07-12 14:34:47 +02:00

client_plugin.h

5.3 merge

2012-01-13 15:50:02 +01:00

client_plugin.h.pp

move authentication_windows_client and mysql_clear_password clear client auth plugins

2011-07-12 14:34:47 +02:00

plugin_audit.h

MySQL-5.5.36 merge

2014-02-17 11:00:51 +01:00

plugin_audit.h.pp

remove a deprecated API function from the plugin.h

2013-12-22 17:11:20 +01:00

plugin_auth_common.h

10.0-monty merge

2013-07-21 16:39:19 +02:00

plugin_auth.h

MDEV-4307 Support at least 48 utf8 characters in username in server and PAM

2013-03-26 19:17:26 +01:00

plugin_auth.h.pp

remove a deprecated API function from the plugin.h

2013-12-22 17:11:20 +01:00

plugin_ftparser.h

mysql-5.5.18 merge

2011-11-03 19:17:05 +01:00

plugin_ftparser.h.pp

remove a deprecated API function from the plugin.h

2013-12-22 17:11:20 +01:00

plugin.h

10.0-base merge

2014-02-26 15:28:07 +01:00

service_debug_sync.h

Temporary commit of 10.0-merge

2013-03-26 00:03:13 +02:00

service_kill_statement.h

MDEV-4065 thd_kill_statement service

2013-01-18 19:04:23 +01:00

service_logger.h

Fixed compiler errors and warnings

2013-12-02 22:22:43 +02:00

service_my_plugin_log.h

Temporary commit of 10.0-merge

2013-03-26 00:03:13 +02:00

service_my_snprintf.h

mysql-5.5.31 merge

2013-05-07 13:05:09 +02:00

service_progress_report.h

Added progress reporting for alter table, LOAD DATA INFILE and for aria tables: check table, repair table, analyze table.

2011-07-01 15:08:30 +03:00

service_sha1.h

SHA1 service

2013-07-13 17:48:06 +02:00

service_thd_alloc.h

Updated/added copyright headers

2011-06-30 17:46:53 +02:00

service_thd_autoinc.h

MroongaSE: addint thd_autoinc and thd_error_context plugin services

2013-12-12 19:18:49 +04:00

service_thd_error_context.h

MroongaSE: addint thd_autoinc and thd_error_context plugin services

2013-12-12 19:18:49 +04:00

service_thd_timezone.h

Fixing the problem with my_bool_t defined two times.

2013-06-03 11:57:34 +04:00

service_thd_wait.h

MDEV-156 Threadpool - add thd_wait_begin/thd_wait_end to the network IO functions

2013-02-19 20:44:33 +01:00

services.h

MroongaSE: addint thd_autoinc and thd_error_context plugin services

2013-12-12 19:18:49 +04:00