Sergei Golubchik ffa8c4cfcc Percona-Server-5.6.14-rel62.0 merge ...

support ha_innodb.so as a dynamic plugin.
* remove obsolete *,innodb_plugin.rdiff files
* s/--plugin-load=/--plugin-load-add=/
* MYSQL_PLUGIN_IMPORT glob_hostname[]
* use my_error instead of push_warning_printf(ER_DEFAULT)
* don't use tdc_size and tc_size in a module

update test cases (XtraDB is 5.6.14, InnoDB is 5.6.10)
* copy new tests over
* disable some tests for (old) InnoDB
* delete XtraDB tests that no longer apply

small compatibility changes:
* s/HTON_EXTENDED_KEYS/HTON_SUPPORTS_EXTENDED_KEYS/
* revert unnecessary InnoDB changes to make it a bit closer to the upstream

fix XtraDB to compile on Windows (both as a static and a dynamic plugin)

disable XtraDB on Windows (deadlocks) and where no atomic ops are available (e.g. CentOS 5)


storage/innobase/handler/ha_innodb.cc:
  revert few unnecessary changes to make it a bit closer to the original InnoDB
storage/innobase/include/univ.i:
  correct the version to match what it was merged from

2013-12-22 17:06:50 +01:00

..

charset_collation.result

Fix for Bug#40545, Bug#40209, Bug#40618, Bug#38346

2009-06-19 17:04:25 +02:00

innodb_bitdata.result

WL#4203 Reorganize and fix the data dictionary tests of

2008-03-07 17:33:07 +01:00

innodb_cursors.result

WL#4203 Reorganize and fix the data dictionary tests of

2008-03-07 17:33:07 +01:00

innodb_func_view.result

merge 10.0-base -> 10.0

2013-10-29 22:20:45 +02:00

innodb_storedproc_02.result

More test result updates:

2013-07-08 11:16:11 +04:00

innodb_storedproc_03.result

Rename std_data_ln to std_data.

2009-01-31 17:22:59 -02:00

innodb_storedproc_06.result

merge mysql-5.1->mysql-5.5

2011-03-09 16:04:50 +02:00

innodb_storedproc_07.result

Bug #21099 MySQL 5.0.22 silently creates MyISAM tables even though

2009-10-09 16:52:02 +02:00

innodb_storedproc_08.result

after merge changes:

2011-12-12 23:58:40 +01:00

innodb_storedproc_10.result

Merge from mysql-trunk

2010-06-02 18:08:06 +02:00

innodb_trig_03.result

Fixed many funcs_1 tests after 43588

2010-03-19 10:02:42 +01:00

innodb_trig_03e.result

Remove the very old historical but never documented behavior,

2013-10-18 11:38:13 -07:00

innodb_trig_08.result

after merge changes:

2011-12-12 23:58:40 +01:00

innodb_trig_09.result

after-push test update (bug #39265)

2009-02-05 17:51:00 +04:00

innodb_trig_0102.result

More trivial test results updates

2013-07-08 13:42:38 +04:00

innodb_trig_0407.result

after merge changes:

2011-12-12 23:58:40 +01:00

innodb_trig_1011ext.result

Rename std_data_ln to std_data.

2009-01-31 17:22:59 -02:00

innodb_trig_frkey.result

1. Upmerge of fix for the bugs

2008-06-18 19:23:55 +02:00

innodb_views.result

MDEV-3862 Lift limitation for merging VIEWS with Subqueries in SELECT list.

2012-11-20 15:11:22 +02:00

is_basics_mixed.result

merge

2010-07-09 15:40:38 +03:00

is_character_sets.result

Bug#35789 wrong datatypes for collation and charset columns in EVENTS, ROUTINES, TRIGGERS

2008-11-13 13:50:20 +04:00

is_cml_innodb.result

merge with 5.3

2011-10-19 21:45:18 +02:00

is_cml_memory.result

merge with 5.3

2011-10-19 21:45:18 +02:00

is_cml_myisam.result

merge with 5.3

2011-10-19 21:45:18 +02:00

is_coll_char_set_appl.result

Fix for Bug#43383 main.variables-big : Weak testing code and result

2009-03-26 19:12:19 +01:00

is_collations.result

Bug#35789 wrong datatypes for collation and charset columns in EVENTS, ROUTINES, TRIGGERS

2008-11-13 13:50:20 +04:00

is_column_privileges_is_mysql_test.result

WL#4203 Reorganize and fix the data dictionary tests of

2008-03-07 17:33:07 +01:00

is_column_privileges.result

update test results

2013-10-18 11:38:01 -07:00

is_columns_innodb.result

merge with MySQL 5.5.27

2012-08-09 17:22:00 +02:00

is_columns_is_embedded.result

Percona-Server-5.6.14-rel62.0 merge

2013-12-22 17:06:50 +01:00

is_columns_is.result

Percona-Server-5.6.14-rel62.0 merge

2013-12-22 17:06:50 +01:00

is_columns_memory.result

merge with MySQL 5.5.27

2012-08-09 17:22:00 +02:00

is_columns_myisam_embedded.result

merge with MySQL 5.5.27

2012-08-09 17:22:00 +02:00

is_columns_myisam.result

merge with MySQL 5.5.27

2012-08-09 17:22:00 +02:00

is_columns_mysql_embedded.result

merge 10.0-base into 10.0

2013-11-04 08:43:56 +01:00

is_columns_mysql.result

merge 10.0-base into 10.0

2013-11-04 08:43:56 +01:00

is_columns.result

merge with 5.3

2011-10-19 21:45:18 +02:00

is_engines_archive.result

Post merge fixes after

2008-03-07 20:18:14 +01:00

is_engines_blackhole.result

Post merge fixes after

2008-03-07 20:18:14 +01:00

is_engines_csv.result

Post merge fixes after

2008-03-07 20:18:14 +01:00

is_engines_federated.result

Result file update for new FederatedX

2009-11-07 07:29:10 +01:00

is_engines_innodb,innodb_plugin.rdiff

allow suite.pm to skip combinations that originate from test/include files.

2012-02-07 16:22:36 +01:00

is_engines_innodb.result

Fixing test cases

2012-08-23 00:32:25 +03:00

is_engines_memory.result

Post merge fixes after

2008-03-07 20:18:14 +01:00

is_engines_merge.result

simplify the handler api - table_type() is no longer abstract, not even virtual

2012-12-17 11:00:39 +01:00

is_engines_myisam.result

BUG#54832 - Comment for MyISAM says it is a default engine

2010-07-05 11:34:29 +04:00

is_engines.result

Fixed test failures

2010-08-05 18:38:06 +03:00

is_events.result

MDEV-4519 SHOW EVENTS and SHOW PROCEDURE STATUS truncate long user names

2013-06-13 20:18:40 +02:00

is_key_column_usage_embedded.result

1. Upmerge of fix for the bugs

2008-06-18 19:23:55 +02:00

is_key_column_usage.result

10.0-base merge (roles)

2013-10-29 15:08:44 +01:00

is_routines_embedded.result

1. Upmerge of fix for the bugs

2008-06-18 19:23:55 +02:00

is_routines.result

MDEV-4519 SHOW EVENTS and SHOW PROCEDURE STATUS truncate long user names

2013-06-13 20:18:40 +02:00

is_schema_privileges_is_mysql_test.result

Bug#35427 INFORMATION_SCHEMA.TABLES.TABLE_CATALOG is NULL, should be "def"

2009-10-23 16:02:20 +05:00

is_schema_privileges.result

update test results

2013-10-18 11:38:01 -07:00

is_schemata_embedded.result

1. Upmerge of fix for the bugs

2008-06-18 19:23:55 +02:00

is_schemata_is_mysql_test.result

Bug#35427 INFORMATION_SCHEMA.TABLES.TABLE_CATALOG is NULL, should be "def"

2009-10-23 16:02:20 +05:00

is_schemata.result

WL#2360 Performance schema

2010-01-11 18:47:27 -07:00

is_statistics_is.result

Patch for WL#3736: Extended Table, Column and Index Comments.

2010-02-20 13:07:32 +03:00

is_statistics_mysql_embedded.result

10.0-base merge (roles)

2013-10-29 15:08:44 +01:00

is_statistics_mysql.result

10.0-base merge (roles)

2013-10-29 15:08:44 +01:00

is_statistics.result

10.0-base merge (roles)

2013-10-29 15:08:44 +01:00

is_table_constraints_is.result

WL#4203 Reorganize and fix the data dictionary tests of

2008-03-07 17:33:07 +01:00

is_table_constraints_mysql_embedded.result

10.0-base merge (roles)

2013-10-29 15:08:44 +01:00

is_table_constraints_mysql.result

10.0-base merge (roles)

2013-10-29 15:08:44 +01:00

is_table_constraints.result

10.0-base merge (roles)

2013-10-29 15:08:44 +01:00

is_table_privileges.result

update test results

2013-10-18 11:38:01 -07:00

is_tables_embedded.result

Fix for

2008-06-16 20:39:58 +02:00

is_tables_innodb.result

Bug#35427 INFORMATION_SCHEMA.TABLES.TABLE_CATALOG is NULL, should be "def"

2009-10-23 16:02:20 +05:00

is_tables_is_embedded.result

fixes for embedded

2013-10-18 18:56:28 -07:00

is_tables_is.result

INFORMATION_SCHEMA.APPLICABLE_ROLES table

2013-10-18 09:15:55 -07:00

is_tables_memory.result

Bug#35427 INFORMATION_SCHEMA.TABLES.TABLE_CATALOG is NULL, should be "def"

2009-10-23 16:02:20 +05:00

is_tables_myisam_embedded.result

merge.

2010-11-25 18:17:28 +01:00

is_tables_myisam.result

merge.

2010-11-25 18:17:28 +01:00

is_tables_mysql_embedded.result

10.0-base merge (roles)

2013-10-29 15:08:44 +01:00

is_tables_mysql.result

10.0-base merge (roles)

2013-10-29 15:08:44 +01:00

is_tables.result

Patch for WL#3736: Extended Table, Column and Index Comments.

2010-02-20 13:07:32 +03:00

is_triggers_embedded.result

Fix for

2008-06-16 20:39:58 +02:00

is_triggers.result

MDEV-4519 SHOW EVENTS and SHOW PROCEDURE STATUS truncate long user names

2013-06-13 20:18:40 +02:00

is_user_privileges.result

10.0-base merge (roles)

2013-10-29 15:08:44 +01:00

is_views_embedded.result

Fix for

2008-06-16 20:39:58 +02:00

is_views.result

MDEV-4519 SHOW EVENTS and SHOW PROCEDURE STATUS truncate long user names

2013-06-13 20:18:40 +02:00

memory_bitdata.result

1. Upmerge of fix for the bugs

2008-06-18 19:23:55 +02:00

memory_cursors.result

1. Upmerge of fix for the bugs

2008-06-18 19:23:55 +02:00

memory_func_view.result

merge 10.0-base -> 10.0

2013-10-29 22:20:45 +02:00

memory_storedproc_02.result

More test result updates:

2013-07-08 11:16:11 +04:00

memory_storedproc_03.result

Rename std_data_ln to std_data.

2009-01-31 17:22:59 -02:00

memory_storedproc_06.result

merge mysql-5.1->mysql-5.5

2011-03-09 16:04:50 +02:00

memory_storedproc_07.result

Bug #21099 MySQL 5.0.22 silently creates MyISAM tables even though

2009-10-09 16:52:02 +02:00

memory_storedproc_08.result

after merge changes:

2011-12-12 23:58:40 +01:00

memory_storedproc_10.result

Merge from mysql-trunk

2010-06-02 18:08:06 +02:00

memory_trig_03.result

Fixed many funcs_1 tests after 43588

2010-03-19 10:02:42 +01:00

memory_trig_03e.result

Remove the very old historical but never documented behavior,

2013-10-18 11:38:13 -07:00

memory_trig_08.result

after merge changes:

2011-12-12 23:58:40 +01:00

memory_trig_09.result

after-push test update (bug #39265)

2009-02-05 17:51:00 +04:00

memory_trig_0102.result

More trivial test result updates

2013-07-08 18:29:52 +04:00

memory_trig_0407.result

after merge changes:

2011-12-12 23:58:40 +01:00

memory_trig_1011ext.result

Rename std_data_ln to std_data.

2009-01-31 17:22:59 -02:00

memory_views.result

MDEV-3862 Lift limitation for merging VIEWS with Subqueries in SELECT list.

2012-11-20 15:11:22 +02:00

myisam_bitdata.result

1. Upmerge of fix for the bugs

2008-06-18 19:23:55 +02:00

myisam_cursors.result

1. Upmerge of fix for the bugs

2008-06-18 19:23:55 +02:00

myisam_func_view.result

merge 10.0-base -> 10.0

2013-10-29 22:20:45 +02:00

myisam_storedproc_02.result

More test result updates:

2013-07-08 11:16:11 +04:00

myisam_storedproc_03.result

Rename std_data_ln to std_data.

2009-01-31 17:22:59 -02:00

myisam_storedproc_06.result

merge mysql-5.1->mysql-5.5

2011-03-09 16:04:50 +02:00

myisam_storedproc_07.result

Bug #21099 MySQL 5.0.22 silently creates MyISAM tables even though

2009-10-09 16:52:02 +02:00

myisam_storedproc_08.result

after merge changes:

2011-12-12 23:58:40 +01:00

myisam_storedproc_10.result

Merge from mysql-trunk

2010-06-02 18:08:06 +02:00

myisam_trig_03.result

Fixed many funcs_1 tests after 43588

2010-03-19 10:02:42 +01:00

myisam_trig_03e.result

Remove the very old historical but never documented behavior,

2013-10-18 11:38:13 -07:00

myisam_trig_08.result

after merge changes:

2011-12-12 23:58:40 +01:00

myisam_trig_09.result

after-push test update (bug #39265)

2009-02-05 17:51:00 +04:00

myisam_trig_0102.result

More trivial test result updates

2013-07-08 18:29:52 +04:00

myisam_trig_0407.result

after merge changes:

2011-12-12 23:58:40 +01:00

myisam_trig_1011ext.result

Rename std_data_ln to std_data.

2009-01-31 17:22:59 -02:00

myisam_views-big.result

New results of --big test (MDEV-3862 fix).

2012-12-12 19:54:04 +02:00

processlist_priv_no_prot.result

10.0-base merge (roles)

2013-10-29 15:08:44 +01:00

processlist_priv_ps.result

10.0-base merge (roles)

2013-10-29 15:08:44 +01:00

processlist_val_no_prot.result

misc fixes for buildbot

2013-11-07 14:30:21 +01:00

processlist_val_ps.result

misc fixes for buildbot

2013-11-07 14:30:21 +01:00

row_count_func.result

Patch for Bug#21818 (Return value of ROW_COUNT() is incorrect

2010-05-14 09:28:51 +04:00

storedproc.result

10.0-monty merge

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