- developers - lists.mariadb.org

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2769)
by knielsen＠knielsen-hq.org 08 Oct '09

08 Oct '09

#At lp:maria 2769 knielsen(a)knielsen-hq.org 2009-10-08 Revert change of package name in configure.in, as it breaks too much stuff. modified: configure.in === modified file 'configure.in' --- a/configure.in 2009-10-07 22:57:43 +0000 +++ b/configure.in 2009-10-08 09:43:31 +0000 @@ -12,10 +12,10 @@ AC_CANONICAL_SYSTEM # in mysqlbinlog.cc / check_master_version(). # # When merging new MySQL releases, update the version number to match the -# MySQL version number, but reset the maria subrelease (m1). +# MySQL version number. # # Note: the following line must be parseable by win/configure.js:GetVersion() -AM_INIT_AUTOMAKE(mariadb, 5.1.38-beta) +AM_INIT_AUTOMAKE(mysql, 5.1.38-maria-beta) AM_CONFIG_HEADER([include/config.h:config.h.in]) PROTOCOL_VERSION=10

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2768)
by knielsen＠knielsen-hq.org 08 Oct '09

08 Oct '09

#At lp:maria 2768 knielsen(a)knielsen-hq.org 2009-10-08 [merge] Merge. modified: mysql-test/lib/mtr_cases.pm === modified file 'mysql-test/lib/mtr_cases.pm' --- a/mysql-test/lib/mtr_cases.pm 2009-10-07 22:57:43 +0000 +++ b/mysql-test/lib/mtr_cases.pm 2009-10-07 22:59:07 +0000 @@ -1084,6 +1084,17 @@ sub collect_one_test_case { $tinfo->{template_path}= $config; } + if ( $tinfo->{'example_plugin_test'} ) + { + if ( !$ENV{'EXAMPLE_PLUGIN'} ) + { + $tinfo->{'skip'}= 1; + $tinfo->{'comment'}= "Test requires the 'example' plugin"; + return $tinfo; + } + } + + # Set extra config file to use if (defined $defaults_extra_file) { $tinfo->{extra_template_path}= $defaults_extra_file; @@ -1136,6 +1147,7 @@ my @tags= ["federated.inc", "federated_test", 1], ["include/not_embedded.inc", "not_embedded", 1], ["include/not_valgrind.inc", "not_valgrind", 1], + ["include/have_example_plugin.inc", "example_plugin_test", 1] );

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2767)
by knielsen＠knielsen-hq.org 08 Oct '09

08 Oct '09

#At lp:maria 2767 knielsen(a)knielsen-hq.org 2009-10-08 Fixes for package name change mysql -> mariadb. - Don't need any m1 prefix for the first release based on given MySQL version number. - Fix mysql-test-run to understand that some stuff is installed under share/mariadb rather than share/mysql. modified: configure.in mysql-test/lib/My/ConfigFactory.pm mysql-test/lib/mtr_cases.pm mysql-test/mysql-test-run.pl === modified file 'configure.in' --- a/configure.in 2009-10-07 17:26:36 +0000 +++ b/configure.in 2009-10-07 22:57:43 +0000 @@ -15,7 +15,7 @@ AC_CANONICAL_SYSTEM # MySQL version number, but reset the maria subrelease (m1). # # Note: the following line must be parseable by win/configure.js:GetVersion() -AM_INIT_AUTOMAKE(mariadb, 5.1.38m1-beta) +AM_INIT_AUTOMAKE(mariadb, 5.1.38-beta) AM_CONFIG_HEADER([include/config.h:config.h.in]) PROTOCOL_VERSION=10 === modified file 'mysql-test/lib/My/ConfigFactory.pm' --- a/mysql-test/lib/My/ConfigFactory.pm 2009-04-25 09:04:38 +0000 +++ b/mysql-test/lib/My/ConfigFactory.pm 2009-10-07 22:57:43 +0000 @@ -19,7 +19,7 @@ my @pre_rules= ); -my @share_locations= ("share/mysql", "sql/share", "share"); +my @share_locations= ("share/mariadb", "share/mysql", "sql/share", "share"); sub get_basedir { === modified file 'mysql-test/lib/mtr_cases.pm' --- a/mysql-test/lib/mtr_cases.pm 2009-09-07 20:50:10 +0000 +++ b/mysql-test/lib/mtr_cases.pm 2009-10-07 22:57:43 +0000 @@ -490,6 +490,8 @@ sub collect_one_suite($) my $lib_innodb_plugin= mtr_file_exists(::vs_config_dirs('storage/innodb_plugin', 'ha_innodb_plugin.dll'), "$::basedir/storage/innodb_plugin/.libs/ha_innodb_plugin.so", + "$::basedir/lib/mariadb/plugin/ha_innodb_plugin.so", + "$::basedir/lib/mariadb/plugin/ha_innodb_plugin.dll", "$::basedir/lib/mysql/plugin/ha_innodb_plugin.so", "$::basedir/lib/mysql/plugin/ha_innodb_plugin.dll"); if ($::mysql_version_id >= 50100 && !(IS_WINDOWS && $::opt_embedded_server) && === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-10-06 14:02:53 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-10-07 22:57:43 +0000 @@ -1018,7 +1018,8 @@ sub command_line_setup { } # Look for language files and charsetsdir, use same share - $path_language= mtr_path_exists("$basedir/share/mysql/english", + $path_language= mtr_path_exists("$basedir/share/mariadb/english", + "$basedir/share/mysql/english", "$basedir/sql/share/english", "$basedir/share/english"); @@ -1887,6 +1888,7 @@ sub environment_setup { my $lib_udf_example= mtr_file_exists(vs_config_dirs('sql', 'udf_example.dll'), "$basedir/sql/.libs/udf_example.so", + "$basedir/lib/mariadb/plugin/udf_example.so", "$basedir/lib/mysql/plugin/udf_example.so",); if ( $lib_udf_example ) @@ -1915,6 +1917,7 @@ sub environment_setup { my $lib_example_plugin= mtr_file_exists(vs_config_dirs('storage/example',$plugin_filename), "$basedir/storage/example/.libs/".$plugin_filename, + "$basedir/lib/mariadb/plugin/".$plugin_filename, "$basedir/lib/mysql/plugin/".$plugin_filename); $ENV{'EXAMPLE_PLUGIN'}= ($lib_example_plugin ? basename($lib_example_plugin) : ""); @@ -1931,6 +1934,7 @@ sub environment_setup { my $lib_simple_parser= mtr_file_exists(vs_config_dirs('plugin/fulltext', 'mypluglib.dll'), "$basedir/plugin/fulltext/.libs/mypluglib.so", + "$basedir/lib/mariadb/plugin/mypluglib.so", "$basedir/lib/mysql/plugin/mypluglib.so",); $ENV{'SIMPLE_PARSER'}= @@ -2074,6 +2078,7 @@ sub environment_setup { my $file_mysql_fix_privilege_tables= mtr_file_exists("$basedir/scripts/mysql_fix_privilege_tables.sql", "$basedir/share/mysql_fix_privilege_tables.sql", + "$basedir/share/mariadb/mysql_fix_privilege_tables.sql", "$basedir/share/mysql/mysql_fix_privilege_tables.sql"); $ENV{'MYSQL_FIX_PRIVILEGE_TABLES'}= $file_mysql_fix_privilege_tables; @@ -2870,8 +2875,8 @@ sub mysql_install_db { my $bootstrap_sql_file= "$opt_vardir/tmp/bootstrap.sql"; my $path_sql= my_find_file($install_basedir, - ["mysql", "sql/share", "share/mysql", - "share", "scripts"], + ["mysql", "sql/share", "share/mariadb", + "share/mysql", "share", "scripts"], "mysql_system_tables.sql", NOT_REQUIRED);

1 0

[Maria-developers] Rev 2767: MBUG#442254: mysql-test-run --embedded fails on Windows with: ERROR: .opt file references 'EXAMPLE_PLUGIN_OPT' in file:///home/psergey/bzr-new/maria-5.1-build2/
by Sergey Petrunya 08 Oct '09

08 Oct '09

At file:///home/psergey/bzr-new/maria-5.1-build2/ ------------------------------------------------------------ revno: 2767 revision-id: psergey(a)askmonty.org-20091007212904-81yqfkvgidlatwjc parent: psergey(a)askmonty.org-20091007210029-bxfk4r2xo0128uhq committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: maria-5.1-build2 timestamp: Thu 2009-10-08 01:29:04 +0400 message: MBUG#442254: mysql-test-run --embedded fails on Windows with: ERROR: .opt file references 'EXAMPLE_PLUGIN_OPT' - Fix suggested by Kristian on review: ignore the test using mtr's facilities === modified file 'mysql-test/lib/mtr_cases.pm' --- a/mysql-test/lib/mtr_cases.pm 2009-09-07 20:50:10 +0000 +++ b/mysql-test/lib/mtr_cases.pm 2009-10-07 21:29:04 +0000 @@ -1082,6 +1082,17 @@ $tinfo->{template_path}= $config; } + if ( $tinfo->{'example_plugin_test'} ) + { + if ( !$ENV{'EXAMPLE_PLUGIN'} ) + { + $tinfo->{'skip'}= 1; + $tinfo->{'comment'}= "Test requires the 'example' plugin"; + return $tinfo; + } + } + + # Set extra config file to use if (defined $defaults_extra_file) { $tinfo->{extra_template_path}= $defaults_extra_file; @@ -1134,6 +1145,7 @@ ["federated.inc", "federated_test", 1], ["include/not_embedded.inc", "not_embedded", 1], ["include/not_valgrind.inc", "not_valgrind", 1], + ["include/have_example_plugin.inc", "example_plugin_test", 1] );

2 1

[Maria-developers] Rev 2766: Fix win/configure.js: now configure.in has AM_INIT_AUTOMAKE(mariadb, ...) in file:///home/psergey/bzr-new/maria-5.1-build1/
by Sergey Petrunya 07 Oct '09

07 Oct '09

At file:///home/psergey/bzr-new/maria-5.1-build1/ ------------------------------------------------------------ revno: 2766 revision-id: psergey(a)askmonty.org-20091007210029-bxfk4r2xo0128uhq parent: psergey(a)askmonty.org-20091007172636-oan0ue1yxk41bza1 committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: maria-5.1-build1 timestamp: Thu 2009-10-08 01:00:29 +0400 message: Fix win/configure.js: now configure.in has AM_INIT_AUTOMAKE(mariadb, ...) - Part 2. make it really work. === modified file 'win/configure.js' --- a/win/configure.js 2009-10-07 17:26:36 +0000 +++ b/win/configure.js 2009-10-07 21:00:29 +0000 @@ -157,11 +157,15 @@ { var key = "AM_INIT_AUTOMAKE(mysql, "; var key2 = "AM_INIT_AUTOMAKE(mariadb, "; + var key_len = key.length; var pos = str.indexOf(key); //5.0.6-beta) if (pos == -1) + { pos = str.indexOf(key2); + key_len= key2.length; + } if (pos == -1) return null; - pos += key.length; + pos += key_len; var end = str.indexOf(")", pos); if (end == -1) return null; return str.substring(pos, end);

1 0

[Maria-developers] Rev 2765: Fix win/configure.js: now configure.in has AM_INIT_AUTOMAKE(mariadb, ...) in file:///home/psergey/bzr-new/maria-5.1-build2/
by Sergey Petrunya 07 Oct '09

07 Oct '09

At file:///home/psergey/bzr-new/maria-5.1-build2/ ------------------------------------------------------------ revno: 2765 revision-id: psergey(a)askmonty.org-20091007172636-oan0ue1yxk41bza1 parent: psergey(a)askmonty.org-20091007165611-nah5830oiz64lbnw committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: maria-5.1-build2 timestamp: Wed 2009-10-07 21:26:36 +0400 message: Fix win/configure.js: now configure.in has AM_INIT_AUTOMAKE(mariadb, ...) === modified file 'configure.in' --- a/configure.in 2009-10-07 11:48:58 +0000 +++ b/configure.in 2009-10-07 17:26:36 +0000 @@ -13,6 +13,8 @@ # # When merging new MySQL releases, update the version number to match the # MySQL version number, but reset the maria subrelease (m1). +# +# Note: the following line must be parseable by win/configure.js:GetVersion() AM_INIT_AUTOMAKE(mariadb, 5.1.38m1-beta) AM_CONFIG_HEADER([include/config.h:config.h.in]) === modified file 'win/configure.js' --- a/win/configure.js 2009-09-07 20:50:10 +0000 +++ b/win/configure.js 2009-10-07 17:26:36 +0000 @@ -156,7 +156,10 @@ function GetVersion(str) { var key = "AM_INIT_AUTOMAKE(mysql, "; + var key2 = "AM_INIT_AUTOMAKE(mariadb, "; var pos = str.indexOf(key); //5.0.6-beta) + if (pos == -1) + pos = str.indexOf(key2); if (pos == -1) return null; pos += key.length; var end = str.indexOf(")", pos);

1 0

[Maria-developers] Rev 2764: Fix pbxt test suite failures: in file:///home/psergey/bzr-new/maria-5.1-build1/
by Sergey Petrunya 07 Oct '09

07 Oct '09

At file:///home/psergey/bzr-new/maria-5.1-build1/ ------------------------------------------------------------ revno: 2764 revision-id: psergey(a)askmonty.org-20091007165611-nah5830oiz64lbnw parent: knielsen(a)knielsen-hq.org-20091007131559-afwjs2l485ghhhci committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: maria-5.1-build1 timestamp: Wed 2009-10-07 20:56:11 +0400 message: Fix pbxt test suite failures: - Update EXPLAIN results after table elimination - mysqlslap now specifies 'Engine=' in CREATE TABLE instead of using SET storage_engine=... - For some reason, mysqltest logs "connect" command differently when PBXT is the default storage engine. This is probably a bug in mysqltest which we can't be bothered to investigate at the moment, so add --replace === modified file 'mysql-test/suite/pbxt/r/connect.result' --- a/mysql-test/suite/pbxt/r/connect.result 2009-04-02 10:03:14 +0000 +++ b/mysql-test/suite/pbxt/r/connect.result 2009-10-07 16:56:11 +0000 @@ -61,8 +61,8 @@ Tables_in_test connect(localhost,test,,test2,MASTER_PORT,MASTER_SOCKET); ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO) -connect(localhost,test,,"",MASTER_PORT,MASTER_SOCKET); -ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO) +connect(localhost,,,,MASTER_PORT,MASTER_SOCKET); +ERROR 28000: Access denied for user ''@'localhost' (using password: NO) connect(localhost,test,zorro,test2,MASTER_PORT,MASTER_SOCKET); ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES) connect(localhost,test,zorro,test,MASTER_PORT,MASTER_SOCKET); === modified file 'mysql-test/suite/pbxt/r/mysqlslap.result' --- a/mysql-test/suite/pbxt/r/mysqlslap.result 2009-04-02 10:03:14 +0000 +++ b/mysql-test/suite/pbxt/r/mysqlslap.result 2009-10-07 16:56:11 +0000 @@ -122,82 +122,76 @@ DROP SCHEMA IF EXISTS `mysqlslap`; CREATE SCHEMA `mysqlslap`; use mysqlslap; -set storage_engine=`heap`; -CREATE TABLE t1 (id int, name varchar(64)); -create table t2(foo1 varchar(32), foo2 varchar(32)); -INSERT INTO t1 VALUES (1, 'This is a test'); -insert into t2 values ('test', 'test2'); -select * from t1; -select * from t2; -DROP SCHEMA IF EXISTS `mysqlslap`; -DROP SCHEMA IF EXISTS `mysqlslap`; -CREATE SCHEMA `mysqlslap`; -use mysqlslap; -set storage_engine=`myisam`; -CREATE TABLE t1 (id int, name varchar(64)); -create table t2(foo1 varchar(32), foo2 varchar(32)); -INSERT INTO t1 VALUES (1, 'This is a test'); -insert into t2 values ('test', 'test2'); -select * from t1; -select * from t2; -DROP SCHEMA IF EXISTS `mysqlslap`; -DROP SCHEMA IF EXISTS `mysqlslap`; -CREATE SCHEMA `mysqlslap`; -use mysqlslap; -set storage_engine=`heap`; -CREATE TABLE t1 (id int, name varchar(64)); -create table t2(foo1 varchar(32), foo2 varchar(32)); -INSERT INTO t1 VALUES (1, 'This is a test'); -insert into t2 values ('test', 'test2'); -SHOW TABLES; -select * from t1; -select * from t2; -SHOW TABLES; -DROP SCHEMA IF EXISTS `mysqlslap`; -DROP SCHEMA IF EXISTS `mysqlslap`; -CREATE SCHEMA `mysqlslap`; -use mysqlslap; -set storage_engine=`myisam`; -CREATE TABLE t1 (id int, name varchar(64)); -create table t2(foo1 varchar(32), foo2 varchar(32)); -INSERT INTO t1 VALUES (1, 'This is a test'); -insert into t2 values ('test', 'test2'); -SHOW TABLES; -select * from t1; -select * from t2; -SHOW TABLES; -DROP SCHEMA IF EXISTS `mysqlslap`; -DROP SCHEMA IF EXISTS `mysqlslap`; -CREATE SCHEMA `mysqlslap`; -use mysqlslap; -set storage_engine=`heap`; -CREATE TABLE t1 (id int, name varchar(64)); -create table t2(foo1 varchar(32), foo2 varchar(32)); -INSERT INTO t1 VALUES (1, 'This is a test'); -insert into t2 values ('test', 'test2'); -SET AUTOCOMMIT=0; -SHOW TABLES; -SET AUTOCOMMIT=0; -select * from t1; -COMMIT; -select * from t2; -COMMIT; -select * from t1; -COMMIT; -select * from t2; -COMMIT; -select * from t1; -COMMIT; -select * from t2; -COMMIT; -COMMIT; -SHOW TABLES; -DROP SCHEMA IF EXISTS `mysqlslap`; -DROP SCHEMA IF EXISTS `mysqlslap`; -CREATE SCHEMA `mysqlslap`; -use mysqlslap; -set storage_engine=`myisam`; -CREATE TABLE t1 (id int, name varchar(64)); +CREATE TABLE t1 (id int, name varchar(64)) Engine = heap; +create table t2(foo1 varchar(32), foo2 varchar(32)); +INSERT INTO t1 VALUES (1, 'This is a test'); +insert into t2 values ('test', 'test2'); +select * from t1; +select * from t2; +DROP SCHEMA IF EXISTS `mysqlslap`; +DROP SCHEMA IF EXISTS `mysqlslap`; +CREATE SCHEMA `mysqlslap`; +use mysqlslap; +CREATE TABLE t1 (id int, name varchar(64)) Engine = myisam; +create table t2(foo1 varchar(32), foo2 varchar(32)); +INSERT INTO t1 VALUES (1, 'This is a test'); +insert into t2 values ('test', 'test2'); +select * from t1; +select * from t2; +DROP SCHEMA IF EXISTS `mysqlslap`; +DROP SCHEMA IF EXISTS `mysqlslap`; +CREATE SCHEMA `mysqlslap`; +use mysqlslap; +CREATE TABLE t1 (id int, name varchar(64)) Engine = heap; +create table t2(foo1 varchar(32), foo2 varchar(32)); +INSERT INTO t1 VALUES (1, 'This is a test'); +insert into t2 values ('test', 'test2'); +SHOW TABLES; +select * from t1; +select * from t2; +SHOW TABLES; +DROP SCHEMA IF EXISTS `mysqlslap`; +DROP SCHEMA IF EXISTS `mysqlslap`; +CREATE SCHEMA `mysqlslap`; +use mysqlslap; +CREATE TABLE t1 (id int, name varchar(64)) Engine = myisam; +create table t2(foo1 varchar(32), foo2 varchar(32)); +INSERT INTO t1 VALUES (1, 'This is a test'); +insert into t2 values ('test', 'test2'); +SHOW TABLES; +select * from t1; +select * from t2; +SHOW TABLES; +DROP SCHEMA IF EXISTS `mysqlslap`; +DROP SCHEMA IF EXISTS `mysqlslap`; +CREATE SCHEMA `mysqlslap`; +use mysqlslap; +CREATE TABLE t1 (id int, name varchar(64)) Engine = heap; +create table t2(foo1 varchar(32), foo2 varchar(32)); +INSERT INTO t1 VALUES (1, 'This is a test'); +insert into t2 values ('test', 'test2'); +SET AUTOCOMMIT=0; +SHOW TABLES; +SET AUTOCOMMIT=0; +select * from t1; +COMMIT; +select * from t2; +COMMIT; +select * from t1; +COMMIT; +select * from t2; +COMMIT; +select * from t1; +COMMIT; +select * from t2; +COMMIT; +COMMIT; +SHOW TABLES; +DROP SCHEMA IF EXISTS `mysqlslap`; +DROP SCHEMA IF EXISTS `mysqlslap`; +CREATE SCHEMA `mysqlslap`; +use mysqlslap; +CREATE TABLE t1 (id int, name varchar(64)) Engine = myisam; create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2'); === modified file 'mysql-test/suite/pbxt/r/ps_11bugs.result' --- a/mysql-test/suite/pbxt/r/ps_11bugs.result 2009-04-02 10:03:14 +0000 +++ b/mysql-test/suite/pbxt/r/ps_11bugs.result 2009-10-07 16:56:11 +0000 @@ -121,8 +121,8 @@ explain select * from t1 where 3 in (select (1+1) union select 1); id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL No tables used -3 DEPENDENT UNION NULL NULL NULL NULL NULL NULL NULL No tables used +2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible HAVING +3 DEPENDENT UNION NULL NULL NULL NULL NULL NULL NULL Impossible HAVING NULL UNION RESULT <union2,3> ALL NULL NULL NULL NULL NULL select * from t1 where 3 in (select (1+1) union select 1); a === modified file 'mysql-test/suite/pbxt/r/select.result' --- a/mysql-test/suite/pbxt/r/select.result 2009-08-17 15:57:58 +0000 +++ b/mysql-test/suite/pbxt/r/select.result 2009-10-07 16:56:11 +0000 @@ -3585,7 +3585,6 @@ EXPLAIN SELECT t1.a FROM t1 LEFT JOIN t2 ON t2.b=t1.b WHERE t1.a=3; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 const PRIMARY PRIMARY 4 const 1 -1 SIMPLE t2 const b b 22 const 1 Using index DROP TABLE t1,t2; CREATE TABLE t1(id int PRIMARY KEY, b int, e int); CREATE TABLE t2(i int, a int, INDEX si(i), INDEX ai(a)); === modified file 'mysql-test/suite/pbxt/r/union.result' --- a/mysql-test/suite/pbxt/r/union.result 2009-08-17 15:57:58 +0000 +++ b/mysql-test/suite/pbxt/r/union.result 2009-10-07 16:56:11 +0000 @@ -480,7 +480,7 @@ 2 UNION t2 const PRIMARY PRIMARY 4 const 1 100.00 NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL NULL Warnings: -Note 1003 (select '1' AS `a`,'1' AS `b` from `test`.`t1` where ('1' = 1)) union (select '1' AS `a`,'10' AS `b` from `test`.`t2` where ('1' = 1)) +Note 1003 (select '1' AS `a`,'1' AS `b` from `test`.`t1` where 1) union (select '1' AS `a`,'10' AS `b` from `test`.`t2` where 1) (select * from t1 where a=5) union (select * from t2 where a=1); a b 1 10 === modified file 'mysql-test/suite/pbxt/t/connect.test' --- a/mysql-test/suite/pbxt/t/connect.test 2009-04-02 10:03:14 +0000 +++ b/mysql-test/suite/pbxt/t/connect.test 2009-10-07 16:56:11 +0000 @@ -42,7 +42,7 @@ --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT --error 1045 connect (fail_con,localhost,test,,test2); ---replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT +--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT test "" --error 1045 connect (fail_con,localhost,test,,""); --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2762)
by knielsen＠knielsen-hq.org 07 Oct '09

07 Oct '09

#At lp:maria 2762 knielsen(a)knielsen-hq.org 2009-10-07 Change naming of our package to mariadb rather than mysql. modified: configure.in === modified file 'configure.in' --- a/configure.in 2009-10-02 12:55:16 +0000 +++ b/configure.in 2009-10-07 11:48:58 +0000 @@ -12,8 +12,8 @@ AC_CANONICAL_SYSTEM # in mysqlbinlog.cc / check_master_version(). # # When merging new MySQL releases, update the version number to match the -# MySQL version number, but reset the maria subrelease (-beta1). -AM_INIT_AUTOMAKE(mysql, 5.1.38-MariaDB-beta1) +# MySQL version number, but reset the maria subrelease (m1). +AM_INIT_AUTOMAKE(mariadb, 5.1.38m1-beta) AM_CONFIG_HEADER([include/config.h:config.h.in]) PROTOCOL_VERSION=10

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2761)
by knielsen＠knielsen-hq.org 07 Oct '09

07 Oct '09

#At lp:maria 2761 knielsen(a)knielsen-hq.org 2009-10-07 Fix test case partition_recover_myisam for --embedded-server. modified: mysql-test/suite/parts/t/partition_recover_myisam.test === modified file 'mysql-test/suite/parts/t/partition_recover_myisam.test' --- a/mysql-test/suite/parts/t/partition_recover_myisam.test 2009-02-01 12:00:48 +0000 +++ b/mysql-test/suite/parts/t/partition_recover_myisam.test 2009-10-07 07:57:48 +0000 @@ -16,6 +16,8 @@ FLUSH TABLES; let $MYSQLD_DATADIR= `select @@datadir`; --remove_file $MYSQLD_DATADIR/test/t1_will_crash.MYI --copy_file std_data/corrupt_t1.MYI $MYSQLD_DATADIR/test/t1_will_crash.MYI +# Embedded server doesn't chdir to data directory +--replace_regex /Table '.*\/data\/test\/t1_will_crash/Table '.\/test\/t1_will_crash/ SELECT * FROM t1_will_crash; DROP TABLE t1_will_crash; CREATE TABLE t1_will_crash (a INT, KEY (a)) @@ -29,5 +31,7 @@ FLUSH TABLES; --echo # head -c1024 t1#P#p1.MYI > corrupt_t1#P#p1.MYI --remove_file $MYSQLD_DATADIR/test/t1_will_crash#P#p1.MYI --copy_file std_data/corrupt_t1#P#p1.MYI $MYSQLD_DATADIR/test/t1_will_crash#P#p1.MYI +# Embedded server doesn't chdir to data directory +--replace_regex /Table '.*\/data\/test\/t1_will_crash/Table '.\/test\/t1_will_crash/ SELECT * FROM t1_will_crash; DROP TABLE t1_will_crash;

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2760)
by knielsen＠knielsen-hq.org 07 Oct '09

07 Oct '09

#At lp:maria 2760 knielsen(a)knielsen-hq.org 2009-10-07 Add missing PBXT windows file to `make dist`. modified: storage/pbxt/src/Makefile.am === modified file 'storage/pbxt/src/Makefile.am' --- a/storage/pbxt/src/Makefile.am 2009-10-06 18:26:11 +0000 +++ b/storage/pbxt/src/Makefile.am 2009-10-07 07:40:56 +0000 @@ -49,4 +49,4 @@ libpbxt_a_SOURCES = $(libpbxt_la_SOURCE libpbxt_a_CXXFLAGS = $(AM_CXXFLAGS) libpbxt_a_CFLAGS = $(AM_CFLAGS) -std=c99 -EXTRA_DIST = pbms_enabled.cc +EXTRA_DIST = pbms_enabled.cc win_inttypes.h

1 0