Bug#16805643 MTR ERROR "COULD NOT FIND INNOCHECKSUM" IN "MAKE INSTALL"

             OUT-OF-SOURCE BUILD

1) Change the extra/CMakeLists.txt to build the innochecksum as per user
   defined build option.
2) Removed the --debug option for non-debug build of innochecksum.
3) Created new test, innodb-wl6045-debug.test which will run only on
   innochecksum build in debug.

Approved by Kevin, Mattiasj rb#2531

Author: Anil Toshniwal

extra/CMakeLists.txt

@@ -96,17 +96,9 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
       ../storage/innobase/page/page0zip.cc
      )
 
-  ADD_VERSION_INFO(innochecksum EXECUTABLE INNOBASE_SOURCES)
-  ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
+  MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
   TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
   ADD_DEPENDENCIES(innochecksum GenError)
-
-  IF(WITH_VALGRIND)
-    MYSQL_INSTALL_TARGETS(innochecksum DESTINATION ${INSTALL_BINDIR})
-  ENDIF()
-  # Note that this will overwrite the non debug "innochecksum" with the
-  # debug one
-  INSTALL_DEBUG_TARGET(innochecksum DESTINATION ${INSTALL_BINDIR})
 ENDIF()
 
 IF(UNIX)

extra/innochecksum.cc

@@ -856,8 +856,10 @@ static struct my_option innochecksum_options[] = {
     0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"verbose", 'v', "Verbose (prints progress every 5 seconds).",
     &verbose, &verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+#ifndef DBUG_OFF
   {"debug", '#', "Output debug log. See " REFMAN "dbug-package.html",
     &dbug_setting, &dbug_setting, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
+#endif /* !DBUG_OFF */
   {"count", 'c', "Print the count of pages in the file and exits.",
     &just_count, &just_count, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"start_page", 's', "Start on this page number (0 based).",
@@ -893,9 +895,15 @@ static struct my_option innochecksum_options[] = {
 /* Print out the Innodb version and machine information. */
 static void print_version(void)
 {
+#ifdef DBUG_OFF
 	printf("%s Ver %s, for %s (%s)\n",
 		my_progname, INNODB_VERSION_STR,
 		SYSTEM_TYPE, MACHINE_TYPE);
+#else
+	printf("%s-debug Ver %s, for %s (%s)\n",
+		my_progname, INNODB_VERSION_STR,
+		SYSTEM_TYPE, MACHINE_TYPE);
+#endif /* DBUG_OFF */
 }
 
 static void usage(void)
@@ -919,13 +927,15 @@ innochecksum_get_one_option(
 	char			*argument __attribute__((unused)))
 {
 	switch (optid) {
+#ifndef DBUG_OFF
 	case '#':
 		dbug_setting = argument
 			? argument
 			: IF_WIN("d:O,innochecksum.trace",
 				 "d:o,/tmp/innochecksum.trace");
 		DBUG_PUSH(dbug_setting);
 		break;
+#endif /* !DBUG_OFF */
 	case 'e':
 		use_end_page = true;
 		break;

mysql-test/include/have_innochecksum_debug.inc

@@ -0,0 +1,19 @@
+let FILE= $MYSQLTEST_VARDIR/tmp/innochecksum-debug;
+--exec $INNOCHECKSUM --version > $FILE
+perl;
+use strict;
+open(FILE, $ENV{FILE}) or die;
+$_ = <FILE>;
+close(FILE);
+my $debug = /innochecksum-debug /;
+open(FILE, ">$ENV{FILE}") or die;
+print FILE "let \$debug= $debug;\n";
+close(FILE);
+EOF
+
+--source $FILE
+--remove_file $FILE
+
+if (!$debug) {
+  --skip Test requires innochecksum-debug
+}

mysql-test/suite/innodb/r/innodb-wl6045-2.result

@@ -1,4 +1,3 @@
-# Set the environmental variables
 SET GLOBAL innodb_file_per_table=on;
 SET GLOBAL innodb_file_format='barracuda';
 SELECT @@innodb_compression_level;
@@ -33,13 +32,10 @@ owners.
 
 InnoDB offline file checksum utility.
 Usage: innochecksum [-c] [-s <start page>] [-e <end page>] [-p <page>] [-v]  [-a <allow mismatches>] [-n] [-C <strict-check>] [-w <write>] [-S] [-D <page type dump>] [-d <dbug-package name>] <filename or [-]>
-See REFMAN for usage hints.
   -?, --help          Displays this help and exits.
   -I, --info          Synonym for --help.
   -V, --version       Displays version information and exits.
   -v, --verbose       Verbose (prints progress every 5 seconds).
-  -#, --debug[=name]  Output debug log. See
-                      REFMAN
   -c, --count         Print the count of pages in the file and exits.
   -s, --start-page=#  Start on this page number (0 based).
   -e, --end-page=#    End at this page number (0 based).
@@ -59,7 +55,6 @@ Variables (--variable-name=value)
 and boolean options {FALSE|TRUE}  Value (after reading options)
 --------------------------------- ----------------------------------------
 verbose                           FALSE
-debug                             FALSE
 count                             FALSE
 start-page                        0
 end-page                          0
@@ -137,7 +132,7 @@ insert into t1 values(3,"COMPRESSED");
 # Restart the DB server
 select * from t1;
 drop table t1;
-# Test[38] completed
+# Test[5] completed
 # Restart the server
 SET GLOBAL innodb_file_per_table=default;
 SET GLOBAL innodb_file_format=default;

mysql-test/suite/innodb/r/innodb-wl6045-linux.result

@@ -1,5 +1,4 @@
 call mtr.add_suppression("InnoDB: Unable to lock");
-DROP TABLE IF EXISTS t1;
 SET GLOBAL innodb_file_per_table=on;
 SET GLOBAL innodb_file_format='barracuda';
 SHOW variables like '%innodb_checksum_algorithm%';
@@ -83,7 +82,10 @@ main: info: page::#; log sequence number:first = #; second = #
 main: info: Page::# is empty and uncorrupted
 #Replace the t.ibd with the newly created a.ibd having crc32 checksum.
 # Start the server to validate the t1.ibd having crc32 checksum.
-# Server Started normally
+select * from t1;
+c1	c2
+1	Innochecksum InnoDB
+2	Innochecksum CRC32
 # Shutdown the server
 # Test[2] End
 # Test[3] for read from standard input for innochecksum tool with rewrite of "none" checksum.
@@ -171,7 +173,10 @@ main: info: Page::# is empty and uncorrupted
 main: info: page::#; log sequence number:first = #; second = #
 main: info: Page::# is empty and uncorrupted
 # Start the server to validate the t1.ibd having "none" checksum.
-# Server Started normally
+select * from t1;
+c1	c2
+1	Innochecksum InnoDB
+2	Innochecksum CRC32
 # Shutdown the server
 # Test[3] End
 # Test[4] for read from standard input for innochecksum tool with rewrite of "innodb" checksum.
@@ -224,15 +229,13 @@ main: info: page::#; log sequence number:first = #; second = #
 main: info: Page::# is empty and uncorrupted
 # Replace the t.ibd with the newly created a.ibd having "innodb" checksum.
 # Start the server to validate the t1.ibd having "innodb" checksum.
-# Server Started normally
-# Test[4] End
-# Test[5] for lock.
-# Test Scenario: As mysqld is running, & then start the innochecksum which must fail.
 select * from t1;
 c1	c2
 1	Innochecksum InnoDB
 2	Innochecksum CRC32
-# INNOCHECKSUM MYSQLD_DATADIR/test/t1.ibd
+# Test[4] End
+# Test[5] for lock.
+# Test Scenario: As mysqld is running, & then start the innochecksum which must fail.
 # create a base table,Index & insert a record
 CREATE TABLE tab1(c1 INT PRIMARY KEY,c2 VARCHAR(20)) ENGINE=InnoDB;
 CREATE INDEX idx1 ON tab1(c2(10));