Merge lp:~hingo/drizzle/drizzle-drizzledump-and-other-version-fixes into lp:~drizzle-trunk/drizzle/development

[Henrik Ingo]

This fixes the tests that fail if you do bzr tag 7.1.31-rc.

Note:
 - the main.comments test will fail against current trunk as long as it is on versions 2012.yy.zz. You need to tag a 7.1.x version. If this is a problem, then the test must be disabled for a transition period until the next release is out.
 - I've tested this with "bzr tag 7.1.31". I am now also running tests with "bzr tag 7.1.31-rc", will report back.

[Henrik Ingo (hingo)]

Also "bzr tag 7.1.31-rc" passes the tests.

[lp:~hingo/drizzle/drizzle-drizzledump-and-other-version-fixes]

2503. By Henrik Ingo on 2012-02-06

Previous fix to server detection then only works against 7.1 series and
wouldn't correctly identify Drizzle 2011.xx.yy series. Now tests both
separetely.

[Mark Atwood (fallenpegasus)]

Failed in Jenkins build test

http://jenkins.drizzle.org/view/Drizzle-build/job/drizzle-build-ubuntu11.04-32bit/282/console
http://jenkins.drizzle.org/job/drizzle-build-ubuntu10.10-32bit/1198/console
http://jenkins.drizzle.org/view/Drizzle-build/job/drizzle-build-fedora15/48/console

Please fix and resubmit. Thank you.

review: Needs Fixing

[Henrik Ingo (hingo)]

Those errors happen because you removed the pre-requisite branch. You need to merge both.

On current trunk without these two branches, this:
create temporary table t1 (a int not null auto_increment primary key) /*!40102 engine=MEMORY */;

becomes an InnoDB table when you do bzr tag 7.1.31 because the release_id becomes 7131 which is < 40102. InnoDB result set is then sorted differently from memory engine.

[Henrik Ingo (hingo)]

Let's close this thread. Please go to: https://code.launchpad.net/~hingo/drizzle/drizzle-7.1.x-versioning-plus-all-fixes

=== modified file 'client/server_detect.cc'
--- client/server_detect.cc	2011-08-07 20:48:33 +0000
+++ client/server_detect.cc	2012-02-06 22:58:19 +0000
@@ -30,12 +30,22 @@
 {
   boost::match_flag_type flags = boost::match_default;
 
-  boost::regex mysql_regex("^([3-9]\\.[0-9]+\\.[0-9]+)");
-  boost::regex drizzle_regex("^(20[0-9]{2}\\.(0[1-9]|1[012])\\.[0-9]+)");
+  // FIXME: Detecting capabilities from a version number is a recipe for
+  // disaster, like we've seen with 15 years of JavaScript :-)
+  // Anyway, as there is no MySQL 7.x yet, this will do for tonight.
+  // I will get back to detect something tangible after the release (like
+  // presence of some table or its record in DATA_DICTIONARY.
+  boost::regex mysql_regex("^([3-6]\\.[0-9]+\\.[0-9]+)");
+  boost::regex drizzle_regex7("^(20[0-9]{2}\\.(0[1-9]|1[012])\\.[0-9]+)");
+  boost::regex drizzle_regex71("^([7-9]\\.[0-9]+\\.[0-9]+)");
 
   version= drizzle_con_server_version(connection);
 
-  if (regex_search(version, drizzle_regex, flags))
+  if (regex_search(version, drizzle_regex7, flags))
+  {
+    type= SERVER_DRIZZLE_FOUND;
+  }
+  else if (regex_search(version, drizzle_regex71, flags))
   {
     type= SERVER_DRIZZLE_FOUND;
   }

=== modified file 'tests/r/comments.result'
--- tests/r/comments.result	2011-03-06 23:59:06 +0000
+++ tests/r/comments.result	2012-02-06 22:58:19 +0000
@@ -11,8 +11,8 @@
 1  +1
 2
 select 1 /*!72301 +1 */;
-1  +1
-2
+1
+1
 select 1--1;
 1--1
 2