- developers - lists.mariadb.org

[Maria-developers] Updated (by Knielsen): Improved upgrade testing in Buildbot (109)
by worklog-noreply＠askmonty.org 19 Mar '10

19 Mar '10

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Improved upgrade testing in Buildbot CREATION DATE..: Fri, 19 Mar 2010, 07:56 SUPERVISOR.....: Knielsen IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Other TASK ID........: 109 (http://askmonty.org/worklog/?tid=109) VERSION........: Server-9.x STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 50 (hours remain) ORIG. ESTIMATE.: 50 PROGRESS NOTES: -=-=(Knielsen - Fri, 19 Mar 2010, 08:00)=-=- High-Level Specification modified. --- /tmp/wklog.109.old.3875 2010-03-19 08:00:03.000000000 +0000 +++ /tmp/wklog.109.new.3875 2010-03-19 08:00:03.000000000 +0000 @@ -1 +1,15 @@ +The main tasks here is to prepare sample data, and scripts to first insert the +data, and second to verify the data. Possibly some existing sample databases +could be used for this. +There needs to be also developed or found some script/automatic way to check the +contents of the database. + +Such scripts need to be included in the MariaDB source tree (and packages). + +Once this is available, the next step is to set up virtual kvm images with this +sample data for MySQL and MariaDB, to replace the current images used for +upgrade tests. + +It is then a simple matter to re-configure Buildbot to use this new more +comprehensive upgrade test. DESCRIPTION: The current .deb upgrade test is very simplistic. It mainly tests that the .deb package scripts pre/postinst work correctly. The actual test of the data is only a single table with a single value, and only that the table is present. There is no test to check that the data is actually preserved correctly. It would be nice to extend this to include a set of example databases, covering a reasonable range of commonly used column types, indexes, storage engines, etc. It would also need some facility for checking that the data is correct after the upgrade. HIGH-LEVEL SPECIFICATION: The main tasks here is to prepare sample data, and scripts to first insert the data, and second to verify the data. Possibly some existing sample databases could be used for this. There needs to be also developed or found some script/automatic way to check the contents of the database. Such scripts need to be included in the MariaDB source tree (and packages). Once this is available, the next step is to set up virtual kvm images with this sample data for MySQL and MariaDB, to replace the current images used for upgrade tests. It is then a simple matter to re-configure Buildbot to use this new more comprehensive upgrade test. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] New (by Knielsen): Improved upgrade testing in Buildbot (109)
by worklog-noreply＠askmonty.org 19 Mar '10

19 Mar '10

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Improved upgrade testing in Buildbot CREATION DATE..: Fri, 19 Mar 2010, 07:56 SUPERVISOR.....: Knielsen IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Other TASK ID........: 109 (http://askmonty.org/worklog/?tid=109) VERSION........: Server-9.x STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 50 (hours remain) ORIG. ESTIMATE.: 50 PROGRESS NOTES: DESCRIPTION: The current .deb upgrade test is very simplistic. It mainly tests that the .deb package scripts pre/postinst work correctly. The actual test of the data is only a single table with a single value, and only that the table is present. There is no test to check that the data is actually preserved correctly. It would be nice to extend this to include a set of example databases, covering a reasonable range of commonly used column types, indexes, storage engines, etc. It would also need some facility for checking that the data is correct after the upgrade. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] Updated (by Knielsen): Buildbot upgrade test from MariaDB 5.1.42->newest (108)
by worklog-noreply＠askmonty.org 19 Mar '10

19 Mar '10

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Buildbot upgrade test from MariaDB 5.1.42->newest CREATION DATE..: Fri, 19 Mar 2010, 07:48 SUPERVISOR.....: Knielsen IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Other TASK ID........: 108 (http://askmonty.org/worklog/?tid=108) VERSION........: Server-9.x STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 25 (hours remain) ORIG. ESTIMATE.: 25 PROGRESS NOTES: -=-=(Knielsen - Fri, 19 Mar 2010, 07:52)=-=- Low Level Design modified. --- /tmp/wklog.108.old.3290 2010-03-19 07:52:59.000000000 +0000 +++ /tmp/wklog.108.new.3290 2010-03-19 07:52:59.000000000 +0000 @@ -1 +1,11 @@ +Tasks needed to do this: + + - For all the .deb kvm builders, set up a new virtual machine image. Based on + -serial or -install, pre-install the appropriate MariaDB 5.1.42 package + with some data. Similar to how the -upgrade images are set up with MySQL + pre-installed. + + - Add a test step in the Buildbot configuration that runs another upgrade + test, similar to the existing upgrade test, but with the images with + MariaDB preinstalled rather than MySQL. DESCRIPTION: Buildbot currently does automatic upgrade test for .debs from the official MySQL 5.0/5.1 package to the newest MariaDB package. In addition to this, we need an upgrade test from older MariaDB release. Probably 5.1.42, the first stable release, is the one to use. This is particularly important for the 5.2/5.3 trees, to test that upgrade from 5.1->5.2/5.3 works. LOW-LEVEL DESIGN: Tasks needed to do this: - For all the .deb kvm builders, set up a new virtual machine image. Based on -serial or -install, pre-install the appropriate MariaDB 5.1.42 package with some data. Similar to how the -upgrade images are set up with MySQL pre-installed. - Add a test step in the Buildbot configuration that runs another upgrade test, similar to the existing upgrade test, but with the images with MariaDB preinstalled rather than MySQL. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] New (by Knielsen): Buildbot upgrade test from MariaDB 5.1.42->newest (108)
by worklog-noreply＠askmonty.org 19 Mar '10

19 Mar '10

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Buildbot upgrade test from MariaDB 5.1.42->newest CREATION DATE..: Fri, 19 Mar 2010, 07:48 SUPERVISOR.....: Knielsen IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Other TASK ID........: 108 (http://askmonty.org/worklog/?tid=108) VERSION........: Server-9.x STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 25 (hours remain) ORIG. ESTIMATE.: 25 PROGRESS NOTES: DESCRIPTION: Buildbot currently does automatic upgrade test for .debs from the official MySQL 5.0/5.1 package to the newest MariaDB package. In addition to this, we need an upgrade test from older MariaDB release. Probably 5.1.42, the first stable release, is the one to use. This is particularly important for the 5.2/5.3 trees, to test that upgrade from 5.1->5.2/5.3 works. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] bzr commit into Mariadb 5.2, with Maria 2.0:maria/5.2 branch (igor:2746)
by Igor Babaev 19 Mar '10

19 Mar '10

#At lp:maria/5.2 based on revid:igor@askmonty.org-20100319062332-4ghnaoaxcgagwj3m 2746 Igor Babaev 2010-03-19 [merge] Merge modified: configure.in mysql-test/Makefile.am === modified file 'configure.in' --- a/configure.in 2010-03-15 11:51:23 +0000 +++ b/configure.in 2010-03-18 12:08:39 +0000 @@ -4,9 +4,6 @@ dnl Process this file with autoconf to p # Minimum Autoconf version required. AC_PREREQ(2.59) -# Minimum Autoconf version required. -AC_PREREQ(2.59) - # Remember to also update version.c in ndb. # When changing major version number please also check switch statement # in client/mysqlbinlog.cc / check_master_version(). @@ -15,7 +12,7 @@ AC_PREREQ(2.59) # MySQL version number. # # Note: the following line must be parseable by win/configure.js:GetVersion() -AC_INIT([MariaDB Server], [5.2.0-MariaDB], [], [mysql]) +AC_INIT([MariaDB Server], [5.2.0-MariaDB-alpha], [], [mysql]) AC_CONFIG_SRCDIR([sql/mysqld.cc]) AC_CANONICAL_SYSTEM # USTAR format gives us the possibility to store longer path names in === modified file 'mysql-test/Makefile.am' --- a/mysql-test/Makefile.am 2009-12-03 11:19:05 +0000 +++ b/mysql-test/Makefile.am 2010-03-18 12:08:39 +0000 @@ -102,7 +102,8 @@ TEST_DIRS = t r include std_data std_dat suite/rpl_ndb suite/rpl_ndb/t suite/rpl_ndb/r \ suite/parts suite/parts/t suite/parts/r suite/parts/inc \ suite/pbxt/t suite/pbxt/r \ - suite/innodb suite/innodb/t suite/innodb/r suite/innodb/include + suite/innodb suite/innodb/t suite/innodb/r suite/innodb/include \ + suite/vcol suite/vcol/t suite/vcol/r suite/vcol/inc # Used by dist-hook and install-data-local to copy all # test files into either dist or install directory

1 0

[Maria-developers] bzr commit into Mariadb 5.2, with Maria 2.0:maria/5.2 branch (igor:2745)
by Igor Babaev 19 Mar '10

19 Mar '10

#At lp:maria/5.2 based on revid:igor@askmonty.org-20100317023231-w7h0euroof0lul8e 2745 Igor Babaev 2010-03-18 Made the vcol suite independent on time zone. modified: mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result === modified file 'mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc' --- a/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc 2009-10-16 22:57:48 +0000 +++ b/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc 2010-03-19 06:23:32 +0000 @@ -912,6 +912,7 @@ let $rows = 1; let $cols = a long, b datetime as (from_unixtime(a)); let $values1 = 1196440219,default; let $rows = 1; +set time_zone='UTC'; --source suite/vcol/inc/vcol_supported_sql_funcs.inc --echo # GET_FORMAT() === modified file 'mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result' --- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result 2010-03-17 02:32:31 +0000 +++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result 2010-03-19 06:23:32 +0000 @@ -2194,6 +2194,7 @@ a b drop table t1; set sql_warnings = 0; # FROM_UNIXTIME() +set time_zone='UTC'; set sql_warnings = 1; create table t1 (a long, b datetime as (from_unixtime(a))); show create table t1; @@ -2205,7 +2206,7 @@ t1 CREATE TABLE `t1` ( insert into t1 values (1196440219,default); select * from t1; a b -1196440219 2007-11-30 08:30:19 +1196440219 2007-11-30 16:30:19 drop table t1; set sql_warnings = 0; # GET_FORMAT() === modified file 'mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result' --- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result 2010-03-17 02:32:31 +0000 +++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result 2010-03-19 06:23:32 +0000 @@ -2194,6 +2194,7 @@ a b drop table t1; set sql_warnings = 0; # FROM_UNIXTIME() +set time_zone='UTC'; set sql_warnings = 1; create table t1 (a long, b datetime as (from_unixtime(a))); show create table t1; @@ -2205,7 +2206,7 @@ t1 CREATE TABLE `t1` ( insert into t1 values (1196440219,default); select * from t1; a b -1196440219 2007-11-30 08:30:19 +1196440219 2007-11-30 16:30:19 drop table t1; set sql_warnings = 0; # GET_FORMAT()

1 0

Re: [Maria-developers] Creating an external branch of sql-bench
by Kristian Nielsen 19 Mar '10

19 Mar '10

Hakan Kuecuekyilmaz <hakan(a)askmonty.org> writes: > we had some emails from Mark Callaghan, Patrick Galbraith, and Brian Aker > asking for an external branch of our sql-bench directory. They want to extend > and enhance the sql-bench benchmark suite. > > After a short phone call with Monty, he told me that there is a way to export > a directory structure with bzr in such a way, that merging it back to our > main tree would be easier. > > I checked http://askmonty.org/wiki/MariaDB::MergingMySQL but I could not find > a hint there. > > Monty told me, that we are doing something like that with the PBXT sources. > > Do you have an idea, what Monty meant? I know how to take an external project and merge it into MariaDB. This uses the "merge-into" bzr plugin. However, I do not know how to go in the opposite direction, that is take a part od the MariaDB tree and split it out in a separate project, and still allow merging it back in. Unless we want to delete it from our tree, re-create as a separate project, and merge that external project using merge-into. This would loose the revision history (I think). Also note that there seems to be a number of problems with this approach due to this bug: https://bugs.launchpad.net/bzr/+bug/375898 (For us, it works for xtradb, but not pbxt. Recently, some more people seem to also be hit by this, including MySQL people.) - Kristian.

1 0

[Maria-developers] Rev 2833: Fixed bug in view code when numeric reference in ORDER BY makes unusable View. in file:///Users/bell/maria/bzr/work-maria-5.1-view-order-bug/
by sanja＠askmonty.org 18 Mar '10

18 Mar '10

At file:///Users/bell/maria/bzr/work-maria-5.1-view-order-bug/ ------------------------------------------------------------ revno: 2833 revision-id: sanja(a)askmonty.org-20100318191914-wupwctzwixm1144h parent: sergii(a)pisem.net-20100312190521-jw1nggiv4427l5sm committer: sanja(a)askmonty.org branch nick: work-maria-5.1-view-order-bug timestamp: Thu 2010-03-18 21:19:14 +0200 message: Fixed bug in view code when numeric reference in ORDER BY makes unusable View. In view representation we prints expresion instead of its numeric reference. === modified file 'mysql-test/r/view.result' --- a/mysql-test/r/view.result 2010-02-10 19:06:24 +0000 +++ b/mysql-test/r/view.result 2010-03-18 19:19:14 +0000 @@ -3844,6 +3844,53 @@ ALTER TABLE v1; DROP VIEW v1; DROP TABLE t1; +# +# Maria Bug #???: ORDER BY column reference in view leads +# to unusable view +# +create table t1 (a int, b int); +insert into t1 values (2,70), (8, 30), (1, 20); +create view v1 as select a, b from t1 order by 2; +select v1.a from v1; +a +1 +8 +2 +show create view v1; +View Create View character_set_client collation_connection +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a`,`t1`.`b` AS `b` from `t1` order by `t1`.`b` latin1 latin1_swedish_ci +drop view v1; +create view v1 as select a, b+3 as d from t1 order by 2; +select v1.a from v1; +a +1 +8 +2 +show create view v1; +View Create View character_set_client collation_connection +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a`,(`t1`.`b` + 3) AS `d` from `t1` order by (`t1`.`b` + 3) latin1 latin1_swedish_ci +drop view v1; +create view v1 (a,v) as select a, b+3 as d from t1 order by 2; +select v1.a from v1; +a +1 +8 +2 +show create view v1; +View Create View character_set_client collation_connection +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a`,(`t1`.`b` + 3) AS `v` from `t1` order by (`t1`.`b` + 3) latin1 latin1_swedish_ci +drop view v1; +create view v1 as select a, 3 as d from t1 order by 2; +select v1.a from v1; +a +2 +8 +1 +show create view v1; +View Create View character_set_client collation_connection +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a`,3 AS `d` from `t1` order by (2 + 0) latin1 latin1_swedish_ci +drop view v1; +drop table t1; # ----------------------------------------------------------------- # -- End of 5.1 tests. # ----------------------------------------------------------------- === modified file 'mysql-test/t/view.test' --- a/mysql-test/t/view.test 2010-02-10 19:06:24 +0000 +++ b/mysql-test/t/view.test 2010-03-18 19:19:14 +0000 @@ -3869,6 +3869,29 @@ DROP VIEW v1; DROP TABLE t1; +--echo # +--echo # Maria Bug #???: ORDER BY column reference in view leads +--echo # to unusable view +--echo # +create table t1 (a int, b int); +insert into t1 values (2,70), (8, 30), (1, 20); +create view v1 as select a, b from t1 order by 2; +select v1.a from v1; +show create view v1; +drop view v1; +create view v1 as select a, b+3 as d from t1 order by 2; +select v1.a from v1; +show create view v1; +drop view v1; +create view v1 (a,v) as select a, b+3 as d from t1 order by 2; +select v1.a from v1; +show create view v1; +drop view v1; +create view v1 as select a, 3 as d from t1 order by 2; +select v1.a from v1; +show create view v1; +drop view v1; +drop table t1; --echo # ----------------------------------------------------------------- --echo # -- End of 5.1 tests. === modified file 'sql/item.cc' --- a/sql/item.cc 2010-03-04 08:03:07 +0000 +++ b/sql/item.cc 2010-03-18 19:19:14 +0000 @@ -2410,7 +2410,7 @@ void Item_string::print(String *str, enum_query_type query_type) { - if (query_type == QT_ORDINARY && is_cs_specified()) + if (query_type != QT_IS && is_cs_specified()) { str->append('_'); str->append(collation.collation->csname); @@ -2418,7 +2418,7 @@ str->append('\''); - if (query_type == QT_ORDINARY || + if (query_type != QT_IS || my_charset_same(str_value.charset(), system_charset_info)) { str_value.print(str); === modified file 'sql/mysql_priv.h' --- a/sql/mysql_priv.h 2010-03-04 08:03:07 +0000 +++ b/sql/mysql_priv.h 2010-03-18 19:19:14 +0000 @@ -52,12 +52,15 @@ QT_ORDINARY -- ordinary SQL query. QT_IS -- SQL query to be shown in INFORMATION_SCHEMA (in utf8 and without + QT_VIEW_INTERNAL -- view internal representation (like QT_ORDINARY except + ORDER BY clause) character set introducers). */ enum enum_query_type { QT_ORDINARY, - QT_IS + QT_IS, + QT_VIEW_INTERNAL }; /* TODO convert all these three maps to Bitmap classes */ === modified file 'sql/sql_lex.cc' --- a/sql/sql_lex.cc 2010-03-10 10:32:14 +0000 +++ b/sql/sql_lex.cc 2010-03-18 19:19:14 +0000 @@ -2057,9 +2057,27 @@ { if (order->counter_used) { - char buffer[20]; - size_t length= my_snprintf(buffer, 20, "%d", order->counter); - str->append(buffer, (uint) length); + if (query_type != QT_VIEW_INTERNAL) + { + char buffer[20]; + size_t length= my_snprintf(buffer, 20, "%d", order->counter); + str->append(buffer, (uint) length); + } + else + { + /* replace numeric reference with expression */ + if (order->item[0]->type() == Item::INT_ITEM && + order->item[0]->basic_const_item()) + { + char buffer[20]; + size_t length= my_snprintf(buffer, 20, "%d", order->counter); + str->append(buffer, (uint) length); + /* make it expression instead of integer constant */ + str->append(STRING_WITH_LEN("+0")); + } + else + (*order->item)->print(str, query_type); + } } else (*order->item)->print(str, query_type); @@ -2069,7 +2087,7 @@ str->append(','); } } - + void st_select_lex::print_limit(THD *thd, String *str, === modified file 'sql/sql_view.cc' --- a/sql/sql_view.cc 2010-03-04 08:03:07 +0000 +++ b/sql/sql_view.cc 2010-03-18 19:19:14 +0000 @@ -814,7 +814,7 @@ ulong sql_mode= thd->variables.sql_mode & MODE_ANSI_QUOTES; thd->variables.sql_mode&= ~MODE_ANSI_QUOTES; - lex->unit.print(&view_query, QT_ORDINARY); + lex->unit.print(&view_query, QT_VIEW_INTERNAL); lex->unit.print(&is_query, QT_IS); thd->variables.sql_mode|= sql_mode;

1 0

[Maria-developers] bzr commit into Mariadb 5.2, with Maria 2.0:maria/5.2 branch (knielsen:2745)
by knielsen＠knielsen-hq.org 18 Mar '10

18 Mar '10

#At lp:maria/5.2 2745 knielsen(a)knielsen-hq.org 2010-03-18 Fix merge errors in configure.in Add vcol test suite to `make dist`. modified: configure.in mysql-test/Makefile.am === modified file 'configure.in' --- a/configure.in 2010-03-15 11:51:23 +0000 +++ b/configure.in 2010-03-18 12:08:39 +0000 @@ -4,9 +4,6 @@ dnl Process this file with autoconf to p # Minimum Autoconf version required. AC_PREREQ(2.59) -# Minimum Autoconf version required. -AC_PREREQ(2.59) - # Remember to also update version.c in ndb. # When changing major version number please also check switch statement # in client/mysqlbinlog.cc / check_master_version(). @@ -15,7 +12,7 @@ AC_PREREQ(2.59) # MySQL version number. # # Note: the following line must be parseable by win/configure.js:GetVersion() -AC_INIT([MariaDB Server], [5.2.0-MariaDB], [], [mysql]) +AC_INIT([MariaDB Server], [5.2.0-MariaDB-alpha], [], [mysql]) AC_CONFIG_SRCDIR([sql/mysqld.cc]) AC_CANONICAL_SYSTEM # USTAR format gives us the possibility to store longer path names in === modified file 'mysql-test/Makefile.am' --- a/mysql-test/Makefile.am 2009-12-03 11:19:05 +0000 +++ b/mysql-test/Makefile.am 2010-03-18 12:08:39 +0000 @@ -102,7 +102,8 @@ TEST_DIRS = t r include std_data std_dat suite/rpl_ndb suite/rpl_ndb/t suite/rpl_ndb/r \ suite/parts suite/parts/t suite/parts/r suite/parts/inc \ suite/pbxt/t suite/pbxt/r \ - suite/innodb suite/innodb/t suite/innodb/r suite/innodb/include + suite/innodb suite/innodb/t suite/innodb/r suite/innodb/include \ + suite/vcol suite/vcol/t suite/vcol/r suite/vcol/inc # Used by dist-hook and install-data-local to copy all # test files into either dist or install directory

1 0

[Maria-developers] bzr commit into Mariadb 5.2, with Maria 2.0:maria/5.2 branch (knielsen:2745)
by knielsen＠knielsen-hq.org 18 Mar '10

18 Mar '10

#At lp:maria/5.2 2745 knielsen(a)knielsen-hq.org 2010-03-18 Fix merge errors in configure.in modified: configure.in === modified file 'configure.in' --- a/configure.in 2010-03-15 11:51:23 +0000 +++ b/configure.in 2010-03-18 11:51:40 +0000 @@ -4,9 +4,6 @@ dnl Process this file with autoconf to p # Minimum Autoconf version required. AC_PREREQ(2.59) -# Minimum Autoconf version required. -AC_PREREQ(2.59) - # Remember to also update version.c in ndb. # When changing major version number please also check switch statement # in client/mysqlbinlog.cc / check_master_version(). @@ -15,7 +12,7 @@ AC_PREREQ(2.59) # MySQL version number. # # Note: the following line must be parseable by win/configure.js:GetVersion() -AC_INIT([MariaDB Server], [5.2.0-MariaDB], [], [mysql]) +AC_INIT([MariaDB Server], [5.2.0-MariaDB-alpha], [], [mysql]) AC_CONFIG_SRCDIR([sql/mysqld.cc]) AC_CANONICAL_SYSTEM # USTAR format gives us the possibility to store longer path names in

1 0