At http://bazaar.launchpad.net/~maria-captains/maria/5.2/ ------------------------------------------------------------ revno: 2835 revision-id: sergii@pisem.net-20100824164858-ycioywdcm9t82e3l parent: sergii@pisem.net-20100824125057-rji2hwi0f9cngg8a committer: Sergei Golubchik <sergii@pisem.net> branch nick: 5.2 timestamp: Tue 2010-08-24 18:48:58 +0200 message: after merge fixes === modified file 'BUILD/SETUP.sh' --- a/BUILD/SETUP.sh 2010-08-24 12:47:26 +0000 +++ b/BUILD/SETUP.sh 2010-08-24 16:48:58 +0000 @@ -182,7 +182,7 @@ max_no_embedded_configs="$SSL_LIBRARY -- max_no_qc_configs="$SSL_LIBRARY --with-plugins=max --without-query-cache" max_no_ndb_configs="$SSL_LIBRARY --with-plugins=max-no-ndb --with-embedded-server --with-libevent" max_configs="$SSL_LIBRARY --with-plugins=max --with-embedded-server --with-libevent" -all_configs="$SSL_LIBRARY --with-plugins=max --with-plugin-ndbcluster --with-embedded-server --with-libevent" +all_configs="$SSL_LIBRARY --with-plugins=max --with-plugin-ndbcluster --with-embedded-server --with-innodb_plugin --with-libevent" # # CPU and platform specific compilation flags. === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2010-08-24 12:47:26 +0000 +++ b/mysql-test/mysql-test-run.pl 2010-08-24 16:48:58 +0000 @@ -130,7 +130,7 @@ my $path_config_file; # The ge # executables will be used by the test suite. our $opt_vs_config = $ENV{'MTR_VS_CONFIG'}; -my $DEFAULT_SUITES= "main,binlog,federated,rpl,maria,parts,innodb,innodb_plugin,percona,ndb,vcol,oqgraph"; +my $DEFAULT_SUITES= "main,binlog,federated,rpl,maria,parts,innodb,innodb_plugin,percona,ndb,vcol,oqgraph,sphinx"; my $opt_suites; our $opt_verbose= 0; # Verbose output, enable with --verbose === modified file 'mysql-test/r/select_pkeycache.result' --- a/mysql-test/r/select_pkeycache.result 2010-06-01 19:52:20 +0000 +++ b/mysql-test/r/select_pkeycache.result 2010-08-24 16:48:58 +0000 @@ -4781,4 +4781,19 @@ a b c SELECT * FROM t1 WHERE 102 < c; a b c DROP TABLE t1; +# +# Bug #54459: Assertion failed: param.sort_length, +# file .\filesort.cc, line 149 (part II) +# +CREATE TABLE t1(a ENUM('') NOT NULL); +INSERT INTO t1 VALUES (), (), (); +EXPLAIN SELECT 1 FROM t1 ORDER BY a COLLATE latin1_german2_ci; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 ALL NULL NULL NULL NULL 3 +SELECT 1 FROM t1 ORDER BY a COLLATE latin1_german2_ci; +1 +1 +1 +1 +DROP TABLE t1; End of 5.1 tests === modified file 'storage/xtradb/handler/ha_innodb.cc' --- a/storage/xtradb/handler/ha_innodb.cc 2010-08-24 12:47:26 +0000 +++ b/storage/xtradb/handler/ha_innodb.cc 2010-08-24 16:48:58 +0000 @@ -11546,8 +11546,8 @@ maria_declare_plugin(xtradb) MYSQL_STORAGE_ENGINE_PLUGIN, &innobase_storage_engine, innobase_hton_name, - "Innobase Oy", - "Supports transactions, row-level locking, and foreign keys", + "Percona", + "XtraDB engine based on InnoDB plugin. Supports transactions, row-level locking, and foreign keys", PLUGIN_LICENSE_GPL, innobase_init, /* Plugin Init */ NULL, /* Plugin Deinit */