- developers - lists.mariadb.org

[Maria-developers] FYI - Buildbots
by Adam M. Dutko 19 Mar '10

19 Mar '10

I've recently increased my down/up link to the Internet so checkouts should be extremely fast. Builds on the hosts should obviously remain roughly the same, but turnaround time due to download/upload bottlenecks should no longer be an issue. The bots that should see an improvement are: adutko-ultrasparc3 adutko-centos5-amd64 mariadb-brs

1 0

[Maria-developers] Updated (by Knielsen): Update packaging scripts for MariaDB 5.2 (88)
by worklog-noreply＠askmonty.org 19 Mar '10

19 Mar '10

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Update packaging scripts for MariaDB 5.2 CREATION DATE..: Sat, 27 Feb 2010, 16:39 SUPERVISOR.....: Knielsen IMPLEMENTOR....: Knielsen COPIES TO......: CATEGORY.......: Server-Sprint TASK ID........: 88 (http://askmonty.org/worklog/?tid=88) VERSION........: Server-5.2 STATUS.........: Complete PRIORITY.......: 60 WORKED HOURS...: 10 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 30 PROGRESS NOTES: -=-=(Knielsen - Fri, 19 Mar 2010, 08:05)=-=- Status updated. --- /tmp/wklog.88.old.4249 2010-03-19 08:05:09.000000000 +0000 +++ /tmp/wklog.88.new.4249 2010-03-19 08:05:09.000000000 +0000 @@ -1 +1 @@ -Assigned +Complete -=-=(Knielsen - Fri, 19 Mar 2010, 08:04)=-=- Low Level Design modified. --- /tmp/wklog.88.old.4242 2010-03-19 08:04:40.000000000 +0000 +++ /tmp/wklog.88.new.4242 2010-03-19 08:04:40.000000000 +0000 @@ -7,5 +7,3 @@ - Fix provides: / replaces: and similar to ensure proper upgrade from mysql 5.0/5.1 and mariadb 5.1. - - Setup Buildbot upgrade test from MariaDB 5.1.42 - -=-=(Knielsen - Fri, 19 Mar 2010, 08:04)=-=- High Level Description modified. --- /tmp/wklog.88.old.4232 2010-03-19 08:04:28.000000000 +0000 +++ /tmp/wklog.88.new.4232 2010-03-19 08:04:28.000000000 +0000 @@ -5,6 +5,4 @@ The .rpm also need to be checked. -Buildbot needs to be updated to do the new upgrade tests (mariadb-5.1 -> -mariadb 5.2) - +See also WL#108 and WL#109 for upgrade testing related to this. -=-=(Knielsen - Fri, 19 Mar 2010, 08:03)=-=- The .deb and .rpm scripts have been fixed, and packages are working ok now in Buildbot for 5.2. I moved the upgrade testing to separate worklogs WL#108 and WL#109. It was decided that enhanced upgrade test is not a blocker for the 5.2 alpha releases (and I do not have time to work on in now). Worked 10 hours and estimate 0 hours remain (original estimate decreased by 20 hours). -=-=(Knielsen - Sat, 13 Mar 2010, 08:14)=-=- Low Level Design modified. --- /tmp/wklog.88.old.22266 2010-03-13 08:14:47.000000000 +0000 +++ /tmp/wklog.88.new.22266 2010-03-13 08:14:47.000000000 +0000 @@ -1 +1,11 @@ +Some of the tasks that need to be done. + + - Setup a 5.2 version of .deb files and .rpm spec file. + + - Rename 5.1->5.2 in relevant places. + + - Fix provides: / replaces: and similar to ensure proper upgrade from mysql + 5.0/5.1 and mariadb 5.1. + + - Setup Buildbot upgrade test from MariaDB 5.1.42 -=-=(Guest - Sat, 13 Mar 2010, 08:12)=-=- Category updated. --- /tmp/wklog.88.old.22167 2010-03-13 08:12:01.000000000 +0000 +++ /tmp/wklog.88.new.22167 2010-03-13 08:12:01.000000000 +0000 @@ -1 +1 @@ -Server-RawIdeaBin +Server-Sprint DESCRIPTION: The packaging scripts need to be updated to work for MariaDB 5.2 Currently, 5.2 package builds fail in Buildbot. The .debs are missing a debian-5.2 subdirectory. The .rpm also need to be checked. See also WL#108 and WL#109 for upgrade testing related to this. LOW-LEVEL DESIGN: Some of the tasks that need to be done. - Setup a 5.2 version of .deb files and .rpm spec file. - Rename 5.1->5.2 in relevant places. - Fix provides: / replaces: and similar to ensure proper upgrade from mysql 5.0/5.1 and mariadb 5.1. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] Updated (by Knielsen): Update packaging scripts for MariaDB 5.2 (88)
by worklog-noreply＠askmonty.org 19 Mar '10

19 Mar '10

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Update packaging scripts for MariaDB 5.2 CREATION DATE..: Sat, 27 Feb 2010, 16:39 SUPERVISOR.....: Knielsen IMPLEMENTOR....: Knielsen COPIES TO......: CATEGORY.......: Server-Sprint TASK ID........: 88 (http://askmonty.org/worklog/?tid=88) VERSION........: Server-5.2 STATUS.........: Assigned PRIORITY.......: 60 WORKED HOURS...: 10 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 30 PROGRESS NOTES: -=-=(Knielsen - Fri, 19 Mar 2010, 08:04)=-=- Low Level Design modified. --- /tmp/wklog.88.old.4242 2010-03-19 08:04:40.000000000 +0000 +++ /tmp/wklog.88.new.4242 2010-03-19 08:04:40.000000000 +0000 @@ -7,5 +7,3 @@ - Fix provides: / replaces: and similar to ensure proper upgrade from mysql 5.0/5.1 and mariadb 5.1. - - Setup Buildbot upgrade test from MariaDB 5.1.42 - -=-=(Knielsen - Fri, 19 Mar 2010, 08:04)=-=- High Level Description modified. --- /tmp/wklog.88.old.4232 2010-03-19 08:04:28.000000000 +0000 +++ /tmp/wklog.88.new.4232 2010-03-19 08:04:28.000000000 +0000 @@ -5,6 +5,4 @@ The .rpm also need to be checked. -Buildbot needs to be updated to do the new upgrade tests (mariadb-5.1 -> -mariadb 5.2) - +See also WL#108 and WL#109 for upgrade testing related to this. -=-=(Knielsen - Fri, 19 Mar 2010, 08:03)=-=- The .deb and .rpm scripts have been fixed, and packages are working ok now in Buildbot for 5.2. I moved the upgrade testing to separate worklogs WL#108 and WL#109. It was decided that enhanced upgrade test is not a blocker for the 5.2 alpha releases (and I do not have time to work on in now). Worked 10 hours and estimate 0 hours remain (original estimate decreased by 20 hours). -=-=(Knielsen - Sat, 13 Mar 2010, 08:14)=-=- Low Level Design modified. --- /tmp/wklog.88.old.22266 2010-03-13 08:14:47.000000000 +0000 +++ /tmp/wklog.88.new.22266 2010-03-13 08:14:47.000000000 +0000 @@ -1 +1,11 @@ +Some of the tasks that need to be done. + + - Setup a 5.2 version of .deb files and .rpm spec file. + + - Rename 5.1->5.2 in relevant places. + + - Fix provides: / replaces: and similar to ensure proper upgrade from mysql + 5.0/5.1 and mariadb 5.1. + + - Setup Buildbot upgrade test from MariaDB 5.1.42 -=-=(Guest - Sat, 13 Mar 2010, 08:12)=-=- Category updated. --- /tmp/wklog.88.old.22167 2010-03-13 08:12:01.000000000 +0000 +++ /tmp/wklog.88.new.22167 2010-03-13 08:12:01.000000000 +0000 @@ -1 +1 @@ -Server-RawIdeaBin +Server-Sprint DESCRIPTION: The packaging scripts need to be updated to work for MariaDB 5.2 Currently, 5.2 package builds fail in Buildbot. The .debs are missing a debian-5.2 subdirectory. The .rpm also need to be checked. See also WL#108 and WL#109 for upgrade testing related to this. LOW-LEVEL DESIGN: Some of the tasks that need to be done. - Setup a 5.2 version of .deb files and .rpm spec file. - Rename 5.1->5.2 in relevant places. - Fix provides: / replaces: and similar to ensure proper upgrade from mysql 5.0/5.1 and mariadb 5.1. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] Updated (by Knielsen): Update packaging scripts for MariaDB 5.2 (88)
by worklog-noreply＠askmonty.org 19 Mar '10

19 Mar '10

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Update packaging scripts for MariaDB 5.2 CREATION DATE..: Sat, 27 Feb 2010, 16:39 SUPERVISOR.....: Knielsen IMPLEMENTOR....: Knielsen COPIES TO......: CATEGORY.......: Server-Sprint TASK ID........: 88 (http://askmonty.org/worklog/?tid=88) VERSION........: Server-5.2 STATUS.........: Assigned PRIORITY.......: 60 WORKED HOURS...: 10 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 30 PROGRESS NOTES: -=-=(Knielsen - Fri, 19 Mar 2010, 08:04)=-=- High Level Description modified. --- /tmp/wklog.88.old.4232 2010-03-19 08:04:28.000000000 +0000 +++ /tmp/wklog.88.new.4232 2010-03-19 08:04:28.000000000 +0000 @@ -5,6 +5,4 @@ The .rpm also need to be checked. -Buildbot needs to be updated to do the new upgrade tests (mariadb-5.1 -> -mariadb 5.2) - +See also WL#108 and WL#109 for upgrade testing related to this. -=-=(Knielsen - Fri, 19 Mar 2010, 08:03)=-=- The .deb and .rpm scripts have been fixed, and packages are working ok now in Buildbot for 5.2. I moved the upgrade testing to separate worklogs WL#108 and WL#109. It was decided that enhanced upgrade test is not a blocker for the 5.2 alpha releases (and I do not have time to work on in now). Worked 10 hours and estimate 0 hours remain (original estimate decreased by 20 hours). -=-=(Knielsen - Sat, 13 Mar 2010, 08:14)=-=- Low Level Design modified. --- /tmp/wklog.88.old.22266 2010-03-13 08:14:47.000000000 +0000 +++ /tmp/wklog.88.new.22266 2010-03-13 08:14:47.000000000 +0000 @@ -1 +1,11 @@ +Some of the tasks that need to be done. + + - Setup a 5.2 version of .deb files and .rpm spec file. + + - Rename 5.1->5.2 in relevant places. + + - Fix provides: / replaces: and similar to ensure proper upgrade from mysql + 5.0/5.1 and mariadb 5.1. + + - Setup Buildbot upgrade test from MariaDB 5.1.42 -=-=(Guest - Sat, 13 Mar 2010, 08:12)=-=- Category updated. --- /tmp/wklog.88.old.22167 2010-03-13 08:12:01.000000000 +0000 +++ /tmp/wklog.88.new.22167 2010-03-13 08:12:01.000000000 +0000 @@ -1 +1 @@ -Server-RawIdeaBin +Server-Sprint DESCRIPTION: The packaging scripts need to be updated to work for MariaDB 5.2 Currently, 5.2 package builds fail in Buildbot. The .debs are missing a debian-5.2 subdirectory. The .rpm also need to be checked. See also WL#108 and WL#109 for upgrade testing related to this. LOW-LEVEL DESIGN: Some of the tasks that need to be done. - Setup a 5.2 version of .deb files and .rpm spec file. - Rename 5.1->5.2 in relevant places. - Fix provides: / replaces: and similar to ensure proper upgrade from mysql 5.0/5.1 and mariadb 5.1. - Setup Buildbot upgrade test from MariaDB 5.1.42 ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[Maria-developers] Progress (by Knielsen): Update packaging scripts for MariaDB 5.2 (88)
by worklog-noreply＠askmonty.org 19 Mar '10

19 Mar '10

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Update packaging scripts for MariaDB 5.2 CREATION DATE..: Sat, 27 Feb 2010, 16:39 SUPERVISOR.....: Knielsen IMPLEMENTOR....: Knielsen COPIES TO......: CATEGORY.......: Server-Sprint TASK ID........: 88 (http://askmonty.org/worklog/?tid=88) VERSION........: Server-5.2 STATUS.........: Assigned PRIORITY.......: 60 WORKED HOURS...: 10 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 30 PROGRESS NOTES: -=-=(Knielsen - Fri, 19 Mar 2010, 08:03)=-=- The .deb and .rpm scripts have been fixed, and packages are working ok now in Buildbot for 5.2. I moved the upgrade testing to separate worklogs WL#108 and WL#109. It was decided that enhanced upgrade test is not a blocker for the 5.2 alpha releases (and I do not have time to work on in now). Worked 10 hours and estimate 0 hours remain (original estimate decreased by 20 hours). -=-=(Knielsen - Sat, 13 Mar 2010, 08:14)=-=- Low Level Design modified. --- /tmp/wklog.88.old.22266 2010-03-13 08:14:47.000000000 +0000 +++ /tmp/wklog.88.new.22266 2010-03-13 08:14:47.000000000 +0000 @@ -1 +1,11 @@ +Some of the tasks that need to be done. + + - Setup a 5.2 version of .deb files and .rpm spec file. + + - Rename 5.1->5.2 in relevant places. + + - Fix provides: / replaces: and similar to ensure proper upgrade from mysql + 5.0/5.1 and mariadb 5.1. + + - Setup Buildbot upgrade test from MariaDB 5.1.42 -=-=(Guest - Sat, 13 Mar 2010, 08:12)=-=- Category updated. --- /tmp/wklog.88.old.22167 2010-03-13 08:12:01.000000000 +0000 +++ /tmp/wklog.88.new.22167 2010-03-13 08:12:01.000000000 +0000 @@ -1 +1 @@ -Server-RawIdeaBin +Server-Sprint DESCRIPTION: The packaging scripts need to be updated to work for MariaDB 5.2 Currently, 5.2 package builds fail in Buildbot. The .debs are missing a debian-5.2 subdirectory. The .rpm also need to be checked. Buildbot needs to be updated to do the new upgrade tests (mariadb-5.1 -> mariadb 5.2) LOW-LEVEL DESIGN: Some of the tasks that need to be done. - Setup a 5.2 version of .deb files and .rpm spec file. - Rename 5.1->5.2 in relevant places. - Fix provides: / replaces: and similar to ensure proper upgrade from mysql 5.0/5.1 and mariadb 5.1. - Setup Buildbot upgrade test from MariaDB 5.1.42 ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v3.5.9)

1 0

[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