Add MySQL 5.0 output samples for SchemaIterator tests. Fix mk references in daemonizes.pl so Daemon.t passes.

t/lib/SchemaIterator.t

@@ -133,7 +133,8 @@ SKIP: {
    # Test simple, unfiltered get_db_itr().
    # ########################################################################
    test_so(
-      result    => "$out/all-dbs-tbls.txt",
+      result    => $sandbox_version eq '5.1' ? "$out/all-dbs-tbls.txt"
+                                             : "$out/all-dbs-tbls-5.0.txt",
       test_name => "Iterate all schema objects with dbh",
    );
 
@@ -314,7 +315,8 @@ SKIP: {
    $du = new MySQLDump();
    test_so(
       filters   => [qw(-t mysql.user)],
-      result    => "$out/mysql-user-ddl.txt",
+      result    => $sandbox_version eq '5.1' ? "$out/mysql-user-ddl.txt"
+                                             : "$out/mysql-user-ddl-5.0.txt",
       test_name => "Get CREATE TABLE with dbh",
    );
 

t/lib/samples/SchemaIterator/all-dbs-tbls-5.0.txt

@@ -0,0 +1,33 @@
+mysql.columns_priv
+mysql.db
+mysql.func
+mysql.help_category
+mysql.help_keyword
+mysql.help_relation
+mysql.help_topic
+mysql.host
+mysql.proc
+mysql.procs_priv
+mysql.tables_priv
+mysql.time_zone
+mysql.time_zone_leap_second
+mysql.time_zone_name
+mysql.time_zone_transition
+mysql.time_zone_transition_type
+mysql.user
+sakila.actor
+sakila.address
+sakila.category
+sakila.city
+sakila.country
+sakila.customer
+sakila.film
+sakila.film_actor
+sakila.film_category
+sakila.film_text
+sakila.inventory
+sakila.language
+sakila.payment
+sakila.rental
+sakila.staff
+sakila.store

t/lib/samples/SchemaIterator/mysql-user-ddl-5.0.txt

@@ -0,0 +1,42 @@
+mysql.user
+CREATE TABLE `user` (
+  `Host` char(60) collate utf8_bin NOT NULL default '',
+  `User` char(16) collate utf8_bin NOT NULL default '',
+  `Password` char(41) character set latin1 collate latin1_bin NOT NULL default '',
+  `Select_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Insert_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Update_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Delete_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Create_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Drop_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Reload_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Shutdown_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Process_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `File_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Grant_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `References_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Index_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Alter_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Show_db_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Super_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Create_tmp_table_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Lock_tables_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Execute_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Repl_slave_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Repl_client_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Create_view_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Show_view_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Create_routine_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Alter_routine_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `Create_user_priv` enum('N','Y') character set utf8 NOT NULL default 'N',
+  `ssl_type` enum('','ANY','X509','SPECIFIED') character set utf8 NOT NULL default '',
+  `ssl_cipher` blob NOT NULL,
+  `x509_issuer` blob NOT NULL,
+  `x509_subject` blob NOT NULL,
+  `max_questions` int(11) unsigned NOT NULL default '0',
+  `max_updates` int(11) unsigned NOT NULL default '0',
+  `max_connections` int(11) unsigned NOT NULL default '0',
+  `max_user_connections` int(11) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`Host`,`User`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Users and global privileges'
+

t/lib/samples/daemonizes.pl

@@ -4,9 +4,9 @@
 # cannot daemonize itself.
 
 BEGIN {
-   die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.  See http://code.google.com/p/maatkit/wiki/Testing"
+   die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
       unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
-   unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/common";
+   unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
 };
 
 use strict;
@@ -17,9 +17,9 @@ use constant MKDEBUG => $ENV{MKDEBUG};
 
 use Daemon;
 use OptionParser;
-use MaatkitTest;
+use PerconaTest;
 
-my $o = new OptionParser(file => "$trunk/common/t/samples/daemonizes.pl");
+my $o = new OptionParser(file => "$trunk/t/lib/samples/daemonizes.pl");
 $o->get_specs();
 $o->get_opts();