MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Hakan Kuecuekyilmaz Date:December 10 2008 9:46pm
Subject:bzr commit into mysql-6.0-falcon branch (hky:2932) Bug#41368
View as plain text  
#At file:///home/hakan/work/mysql/mysql-6.0-falcon/ based on revid:hky@stripped

 2932 Hakan Kuecuekyilmaz	2008-12-10
      * Workaround for Bug#41368 --replace_regex does
      not work as expected.
      
      * Fix for Bug #40636 falcon_bug_28095 test fails
      with "Server failed to restart".
      
      * Fix for Bug #41303 Using global variable makes mysql-test-run
      test fail.
      
      * Fixed a gcc warning in mysys/stacktrace.c.
      
      * Made falcon_unicode.test a --big-test test.
renamed:
  mysql-test/suite/falcon/r/falcon_unicode.result => mysql-test/suite/falcon/r/falcon_unicode-big.result
  mysql-test/suite/falcon/t/falcon_unicode.test => mysql-test/suite/falcon/t/falcon_unicode-big.test
modified:
  mysql-test/include/wait_until_disconnected.inc
  mysql-test/suite/falcon/r/falcon_options.result
  mysql-test/suite/falcon/r/falcon_options2.result
  mysql-test/suite/falcon/t/falcon_bug_22089.test
  mysql-test/suite/falcon/t/falcon_bug_28095.test
  mysql-test/suite/falcon/t/falcon_options.test
  mysql-test/suite/falcon/t/falcon_options2.test
  mysys/stacktrace.c
  mysql-test/suite/falcon/r/falcon_unicode-big.result
  mysql-test/suite/falcon/t/falcon_unicode-big.test

per-file messages:
  mysql-test/include/wait_until_disconnected.inc
    * Fix for Bug #40636 falcon_bug_28095 test fails
    with "Server failed to restart".
  mysql-test/suite/falcon/r/falcon_options.result
    Adjusted result file.
  mysql-test/suite/falcon/r/falcon_options2.result
    Adjusted result file.
  mysql-test/suite/falcon/r/falcon_unicode-big.result
    Adjusted result file.
  mysql-test/suite/falcon/t/falcon_bug_22089.test
    Added missing DROP TEMPORARY TABLE IF EXISTS ...
  mysql-test/suite/falcon/t/falcon_bug_28095.test
    Fix for Bug #41303 Using global variable makes mysql-test-run
    test fail.
  mysql-test/suite/falcon/t/falcon_options.test
    Fix for Bug #41303 Using global variable makes mysql-test-run
    test fail.
  mysql-test/suite/falcon/t/falcon_options2.test
    Fix for Bug #41303 Using global variable makes mysql-test-run
    test fail.
  mysql-test/suite/falcon/t/falcon_unicode-big.test
    Made test --big-test test. Also worked in
    comments and suggestions from John (johnemb).
  mysys/stacktrace.c
    Fix gcc warnings
    mysys/stacktrace.c: 67
    	unused parameter ‘mangled_name’
    mysys/stacktrace.c: 67
    	unused parameter ‘status’
=== modified file 'mysql-test/include/wait_until_disconnected.inc'
--- a/mysql-test/include/wait_until_disconnected.inc	2008-12-10 16:55:09 +0000
+++ b/mysql-test/include/wait_until_disconnected.inc	2008-12-10 21:45:53 +0000
@@ -4,13 +4,13 @@
 --disable_result_log
 --disable_query_log
 let $counter= 600;
-let $mysql_errno= 9999;
+let $mysql_errno= 0;
 while (!$mysql_errno)
 {
   # Strangely enough, the server might return "Too many connections"
   # while being shutdown, thus 1040 is an "allowed" error.
   # See BUG#36228.
-  --error 0,1040,1053,2002,2006
+  --error 0,1040,1053,2002,2006,2013
   show status;
 
   dec $counter;

=== modified file 'mysql-test/suite/falcon/r/falcon_options.result'
--- a/mysql-test/suite/falcon/r/falcon_options.result	2008-08-14 11:24:18 +0000
+++ b/mysql-test/suite/falcon/r/falcon_options.result	2008-12-10 21:45:53 +0000
@@ -1,9 +1,11 @@
-SHOW VARIABLES where variable_name LIKE 'falcon_%' and variable_name <>'falcon_serial_log_dir';
+SHOW VARIABLES
+WHERE variable_name LIKE 'falcon_%'
+    AND variable_name <> 'falcon_serial_log_dir'
+    AND variable_name <> 'falcon_debug_mask';
 Variable_name	Value
 falcon_checkpoint_schedule	7 * * * * *
 falcon_checksums	ON
 falcon_consistent_read	ON
-falcon_debug_mask	0
 falcon_debug_server	OFF
 falcon_debug_trace	0
 falcon_direct_io	1
@@ -27,6 +29,9 @@ falcon_support_xa	OFF
 falcon_use_deferred_index_hash	OFF
 falcon_use_sectorcache	OFF
 falcon_use_supernodes	ON
+SHOW VARIABLES WHERE variable_name LIKE 'falcon_debug_mask';
+Variable_name	Value
+falcon_debug_mask	0
 SELECT @@GLOBAL.falcon_debug_server;
 @@GLOBAL.falcon_debug_server
 0

=== modified file 'mysql-test/suite/falcon/r/falcon_options2.result'
--- a/mysql-test/suite/falcon/r/falcon_options2.result	2008-08-14 11:24:18 +0000
+++ b/mysql-test/suite/falcon/r/falcon_options2.result	2008-12-10 21:45:53 +0000
@@ -1,10 +1,11 @@
 SELECT * FROM INFORMATION_SCHEMA.global_variables
-WHERE variable_name LiKE 'falcon_%' AND variable_name <> 'falcon_serial_log_dir';
+WHERE variable_name LiKE 'falcon_%'
+    AND variable_name <> 'falcon_serial_log_dir'
+    AND variable_name <> 'falcon_debug_mask';
 VARIABLE_NAME	VARIABLE_VALUE
 FALCON_CHECKPOINT_SCHEDULE	7 * * * * *
 FALCON_CHECKSUMS	ON
 FALCON_CONSISTENT_READ	ON
-FALCON_DEBUG_MASK	0
 FALCON_DEBUG_SERVER	OFF
 FALCON_DEBUG_TRACE	0
 FALCON_DIRECT_IO	1
@@ -28,6 +29,10 @@ FALCON_SUPPORT_XA	OFF
 FALCON_USE_DEFERRED_INDEX_HASH	OFF
 FALCON_USE_SECTORCACHE	OFF
 FALCON_USE_SUPERNODES	ON
+SELECT * FROM INFORMATION_SCHEMA.global_variables
+WHERE variable_name LiKE 'falcon_debug_mask';
+VARIABLE_NAME	VARIABLE_VALUE
+FALCON_DEBUG_MASK	0
 SELECT @@falcon_checkpoint_schedule;
 @@falcon_checkpoint_schedule
 7 * * * * *

=== renamed file 'mysql-test/suite/falcon/r/falcon_unicode.result' => 'mysql-test/suite/falcon/r/falcon_unicode-big.result'
--- a/mysql-test/suite/falcon/r/falcon_unicode.result	2008-12-07 02:10:46 +0000
+++ b/mysql-test/suite/falcon/r/falcon_unicode-big.result	2008-12-10 21:45:53 +0000
@@ -11,47 +11,47 @@ DROP TABLE IF EXISTS t5;
 DROP TABLE IF EXISTS t_err;
 CREATE TABLE t0 (
 id int auto_increment not null primary key,
-a varchar(1) binary character set utf8,
+a varchar(1) character set utf8 collate utf8_bin,
 category  varchar(100),
 comment   varchar(80),
-uppercase varchar(1) binary character set utf8 default null,
-lowercase varchar(1) binary character set utf8 default null
+uppercase varchar(1) character set utf8 collate utf8_bin default null,
+lowercase varchar(1) character set utf8 collate utf8_bin default null
 ) Engine 'MyISAM';
 CREATE TABLE t1 (
 id int,
-a varchar(1) binary  character set utf8,
-uppercase varchar(1) binary character set utf8 default null,
-lowercase varchar(1) binary character set utf8 default null
+a varchar(1) character set utf8 collate utf8_bin,
+uppercase varchar(1) character set utf8 collate utf8_bin default null,
+lowercase varchar(1) character set utf8 collate utf8_bin default null
 );
 CREATE TABLE t2 (
 id int,
-a varchar(1) binary  character set utf8 primary key,
-uppercase varchar(1) binary character set utf8 default null,
-lowercase varchar(1) binary character set utf8 default null
+a varchar(1) character set utf8 collate utf8_bin primary key,
+uppercase varchar(1) character set utf8 collate utf8_bin default null,
+lowercase varchar(1) character set utf8 collate utf8_bin default null
 );
 CREATE TABLE t3 (
 id int,
-a varchar(1) binary  character set utf8,
-uppercase varchar(1) binary character set utf8 default null,
-lowercase varchar(1) binary character set utf8 default null,
+a varchar(1) character set utf8 collate utf8_bin,
+uppercase varchar(1) character set utf8 collate utf8_bin default null,
+lowercase varchar(1) character set utf8 collate utf8_bin default null,
 key (a),
 key (uppercase),
 key (lowercase)
 );
 CREATE TABLE t4 (
 id int,
-a varchar(1) binary  character set utf8,
-uppercase varchar(1) binary character set utf8 default null,
-lowercase varchar(1) binary character set utf8 default null,
+a varchar(1) character set utf8 collate utf8_bin,
+uppercase varchar(1) character set utf8 collate utf8_bin default null,
+lowercase varchar(1) character set utf8 collate utf8_bin default null,
 unique key (a),
 key (uppercase),
 key (lowercase)
 );
 CREATE TABLE t5 (
 id int,
-a varchar(1) binary  character set utf8 not null,
-uppercase varchar(1) binary character set utf8 default null,
-lowercase varchar(1) binary character set utf8 default null,
+a varchar(1) character set utf8 collate utf8_bin not null,
+uppercase varchar(1) character set utf8 collate utf8_bin default null,
+lowercase varchar(1) character set utf8 collate utf8_bin default null,
 unique key (a)
 );
 CREATE TABLE t_err (
@@ -60,7 +60,8 @@ expected varchar(1) character set utf8,
 actual varchar(1) character set utf8,
 category varchar(100),
 comment varchar(80),
-test varchar(50)
+test varchar(50),
+hits int
 ) Engine 'MyISAM';
 CREATE FUNCTION transform(a varchar(8))
 RETURNS varchar(8)
@@ -91,6 +92,8 @@ IF d = surrogate1 || d = surrogate2 || d
 return '';
 END IF;
 IF d <= one_byte THEN
+# Without the 16-base to 16-base conversion a 0009 gets 00,
+# which is wrong.
 return CONV(a, 16, 16);
 ELSEIF d <= two_byte THEN
 return
@@ -117,7 +120,6 @@ FIELDS TERMINATED BY ';'
   LINES TERMINATED BY '\n'
   (@var1, @category, @dummy3, @dummy4, @dummy5, @dummy6, @dummy7,
 @dummy8, @dummy9, @dummy10, @comment, @dummy12, @uppercase, @lowercase, @dummy15)
-# @todo Skip empty strings (surrogates).
 SET a = (UNHEX((SELECT transform(@var1)))),
 category = @category,
 comment = @comment,
@@ -147,9 +149,8 @@ count(*)
 SELECT count(*) FROM t5;
 count(*)
 0
-SELECT count(*) FROM t_err;
-count(*)
-0
+SELECT * FROM t_err;
+id	expected	actual	category	comment	test	hits
 DROP FUNCTION transform;
 DROP TABLE t0;
 DROP TABLE t1;

=== modified file 'mysql-test/suite/falcon/t/falcon_bug_22089.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_22089.test	2008-02-05 14:10:24 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_22089.test	2008-12-10 21:45:53 +0000
@@ -1,4 +1,5 @@
 --source include/have_falcon.inc
+
 #
 # Bug #22089: Can't create temporary tables
 #
@@ -10,6 +11,10 @@
 let $engine = 'Falcon';
 eval SET @@storage_engine = $engine;
 
+--disable_warnings
+DROP TEMPORARY TABLE IF EXISTS t1;
+--enable_warnings
+
 # ----------------------------------------------------- #
 # --- Test                                          --- #
 # ----------------------------------------------------- #

=== modified file 'mysql-test/suite/falcon/t/falcon_bug_28095.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_28095.test	2008-11-13 14:55:42 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_28095.test	2008-12-10 21:45:53 +0000
@@ -37,6 +37,8 @@ CREATE TABLE t2 (b int);
 # following restart really works. Global variables
 # should be resetted after a server restart.
 #
+--let $debug = `SELECT @@GLOBAL.falcon_debug_mask;`
+--replace_result $debug 0
 SELECT @@GLOBAL.falcon_debug_mask;
 SET GLOBAL falcon_debug_mask = 4096;
 SELECT @@GLOBAL.falcon_debug_mask;
@@ -53,6 +55,7 @@ SELECT * FROM t1 ORDER BY a;
 # --- Check                                         --- #
 # ----------------------------------------------------- #
 SELECT count(*) FROM t1;
+--replace_result $debug 0
 SELECT @@GLOBAL.falcon_debug_mask;
 
 # ----------------------------------------------------- #

=== modified file 'mysql-test/suite/falcon/t/falcon_options.test'
--- a/mysql-test/suite/falcon/t/falcon_options.test	2008-08-14 11:24:18 +0000
+++ b/mysql-test/suite/falcon/t/falcon_options.test	2008-12-10 21:45:53 +0000
@@ -1,6 +1,17 @@
 --source include/have_falcon.inc
 
-SHOW VARIABLES where variable_name LIKE 'falcon_%' and variable_name <>'falcon_serial_log_dir';
+#
+# We exclude falcon_debug_mask as workaround for
+# Bug#41368 --replace_regex does not work as expected.
+#
+SHOW VARIABLES
+  WHERE variable_name LIKE 'falcon_%'
+    AND variable_name <> 'falcon_serial_log_dir'
+    AND variable_name <> 'falcon_debug_mask';
+
+--let $debug = `SELECT @@GLOBAL.falcon_debug_mask;`
+--replace_result $debug 0
+SHOW VARIABLES WHERE variable_name LIKE 'falcon_debug_mask';
 
 # Test that these server variables are READ ONLY.
 
@@ -25,6 +36,7 @@ SET GLOBAL falcon_serial_log_buffers = 1
 
 # These variables are r/w.
 SELECT @@GLOBAL.falcon_debug_mask INTO @previous_falcon_debug_mask;
+--replace_result $debug 0
 SELECT @@GLOBAL.falcon_debug_mask;
 SET GLOBAL falcon_debug_mask = 4096;
 SELECT @@GLOBAL.falcon_debug_mask;

=== modified file 'mysql-test/suite/falcon/t/falcon_options2.test'
--- a/mysql-test/suite/falcon/t/falcon_options2.test	2008-08-14 11:24:18 +0000
+++ b/mysql-test/suite/falcon/t/falcon_options2.test	2008-12-10 21:45:53 +0000
@@ -2,12 +2,24 @@
 
 # Check the command line options pass through
 
+#
+# We exclude falcon_debug_mask as workaround for
+# Bug#41368 --replace_regex does not work as expected.
+#
 --sorted_result
 SELECT * FROM INFORMATION_SCHEMA.global_variables
-         WHERE variable_name LiKE 'falcon_%' AND variable_name <> 'falcon_serial_log_dir';
+  WHERE variable_name LiKE 'falcon_%'
+    AND variable_name <> 'falcon_serial_log_dir'
+    AND variable_name <> 'falcon_debug_mask';
+
+--let $debug = `SELECT @@GLOBAL.falcon_debug_mask;`
+--replace_result $debug 0
+SELECT * FROM INFORMATION_SCHEMA.global_variables
+  WHERE variable_name LiKE 'falcon_debug_mask';
 
 SELECT @@falcon_checkpoint_schedule;
 SELECT @@falcon_consistent_read;
+--replace_result $debug 0
 SELECT @@falcon_debug_mask;
 SELECT @@falcon_debug_server;
 SELECT @@falcon_debug_trace;

=== renamed file 'mysql-test/suite/falcon/t/falcon_unicode.test' => 'mysql-test/suite/falcon/t/falcon_unicode-big.test'
--- a/mysql-test/suite/falcon/t/falcon_unicode.test	2008-12-07 02:10:46 +0000
+++ b/mysql-test/suite/falcon/t/falcon_unicode-big.test	2008-12-10 21:45:53 +0000
@@ -1,4 +1,5 @@
 --source include/have_falcon.inc
+--source include/big_test.inc
 
 #
 # Unicode related tests for Falcon
@@ -7,6 +8,9 @@
 # All rights reserved. Distributed under the Terms of Use
 # in http://www.unicode.org/copyright.html.
 #
+# Currently we are using this file:
+#     http://www.unicode.org/Public/5.1.0/ucd/UnicodeData.txt
+#
 # Notes
 #    Six Unicode code points are invalid in UTF-8,
 #    but they get translated, leading to empty
@@ -33,8 +37,9 @@
 #      * DC00;<Low Surrogate, First>
 #      * DFFF;<Low Surrogate, Last>
 #
-#    The following two code points look suspicios but they
-#    get translated to UTF-8:
+#    The following two code points look suspicious but they
+#    get translated to UTF-8. They mark the start and the
+#    end of the private plane.
 #      * E000;<Private Use, First>
 #      * F8FF;<Private Use, Last>
 #
@@ -44,7 +49,10 @@
 # --- Initialisation                                --- #
 # ----------------------------------------------------- #
 let $engine = 'Falcon';
+# We use $other_engine here for easier storage engine
+# change. Currently we use MyISAM as reference table.
 let $other_engine = 'MyISAM';
+
 eval SET @@storage_engine = $engine;
 
 SET NAMES UTF8;
@@ -64,35 +72,35 @@ DROP TABLE IF EXISTS t_err;
 eval
 CREATE TABLE t0 (
   id int auto_increment not null primary key,
-  a varchar(1) binary character set utf8,
+  a varchar(1) character set utf8 collate utf8_bin,
   category  varchar(100),
   comment   varchar(80),
-  uppercase varchar(1) binary character set utf8 default null,
-  lowercase varchar(1) binary character set utf8 default null
+  uppercase varchar(1) character set utf8 collate utf8_bin default null,
+  lowercase varchar(1) character set utf8 collate utf8_bin default null
 ) Engine $other_engine;
 
 # Falcon test table without any keys.
 CREATE TABLE t1 (
   id int,
-  a varchar(1) binary  character set utf8,
-  uppercase varchar(1) binary character set utf8 default null,
-  lowercase varchar(1) binary character set utf8 default null
+  a varchar(1) character set utf8 collate utf8_bin,
+  uppercase varchar(1) character set utf8 collate utf8_bin default null,
+  lowercase varchar(1) character set utf8 collate utf8_bin default null
 );
 
 # Falcon test table with PK.
 CREATE TABLE t2 (
   id int,
-  a varchar(1) binary  character set utf8 primary key,
-  uppercase varchar(1) binary character set utf8 default null,
-  lowercase varchar(1) binary character set utf8 default null
+  a varchar(1) character set utf8 collate utf8_bin primary key,
+  uppercase varchar(1) character set utf8 collate utf8_bin default null,
+  lowercase varchar(1) character set utf8 collate utf8_bin default null
 );
 
 # Falcon test table with index.
 CREATE TABLE t3 (
   id int,
-  a varchar(1) binary  character set utf8,
-  uppercase varchar(1) binary character set utf8 default null,
-  lowercase varchar(1) binary character set utf8 default null,
+  a varchar(1) character set utf8 collate utf8_bin,
+  uppercase varchar(1) character set utf8 collate utf8_bin default null,
+  lowercase varchar(1) character set utf8 collate utf8_bin default null,
   key (a),
   key (uppercase),
   key (lowercase)
@@ -101,9 +109,9 @@ CREATE TABLE t3 (
 # Falcon test table with unique index.
 CREATE TABLE t4 (
   id int,
-  a varchar(1) binary  character set utf8,
-  uppercase varchar(1) binary character set utf8 default null,
-  lowercase varchar(1) binary character set utf8 default null,
+  a varchar(1) character set utf8 collate utf8_bin,
+  uppercase varchar(1) character set utf8 collate utf8_bin default null,
+  lowercase varchar(1) character set utf8 collate utf8_bin default null,
   unique key (a),
   key (uppercase),
   key (lowercase)
@@ -112,9 +120,9 @@ CREATE TABLE t4 (
 # Falcon test table with unique index not null.
 CREATE TABLE t5 (
   id int,
-  a varchar(1) binary  character set utf8 not null,
-  uppercase varchar(1) binary character set utf8 default null,
-  lowercase varchar(1) binary character set utf8 default null,
+  a varchar(1) character set utf8 collate utf8_bin not null,
+  uppercase varchar(1) character set utf8 collate utf8_bin default null,
+  lowercase varchar(1) character set utf8 collate utf8_bin default null,
   unique key (a)
 );
 
@@ -126,7 +134,8 @@ CREATE TABLE t_err (
   actual varchar(1) character set utf8,
   category varchar(100),
   comment varchar(80),
-  test varchar(50)
+  test varchar(50),
+  hits int
 ) Engine $other_engine;
 
 #
@@ -170,6 +179,8 @@ CREATE FUNCTION transform(a varchar(8))
     END IF;
 
     IF d <= one_byte THEN
+      # Without the 16-base to 16-base conversion a 0009 gets 00,
+      # which is wrong.
       return CONV(a, 16, 16);
     ELSEIF d <= two_byte THEN
       return
@@ -200,6 +211,9 @@ DELIMITER ;//
 # is done in place, so that the Unicode code point file
 # can be updated in an easy fashion.
 #
+# The fields in UnicodeData.txt are described here:
+#     http://www.unicode.org/Public/5.1.0/ucd/UCD.html#UnicodeData.txt
+#
 # Load should produce no warnings like truncation or so.
 LOAD DATA LOCAL INFILE 'include/UnicodeData.txt' INTO TABLE t0
   FIELDS TERMINATED BY ';'
@@ -207,7 +221,6 @@ LOAD DATA LOCAL INFILE 'include/UnicodeD
   LINES TERMINATED BY '\n'
   (@var1, @category, @dummy3, @dummy4, @dummy5, @dummy6, @dummy7,
    @dummy8, @dummy9, @dummy10, @comment, @dummy12, @uppercase, @lowercase, @dummy15)
-# @todo Skip empty strings (surrogates).
 SET a = (UNHEX((SELECT transform(@var1)))),
     category = @category,
     comment = @comment,
@@ -239,11 +252,10 @@ INSERT INTO t3 (id, a, uppercase, lowerc
 # --- Test                                          --- #
 # ----------------------------------------------------- #
 --let $i = $count
+--disable_query_log
+--disable_result_log
 while ($i)
 {
-  --disable_query_log
-  --disable_result_log
-
   eval SELECT @id := id, @reference := a, @category := category, @comment := comment FROM t0 WHERE id = $i;
 
   #
@@ -252,9 +264,12 @@ while ($i)
   SELECT @hit := count(*) FROM t1 WHERE t1.id = @id AND t1.a = @reference;
   --let $hit = `SELECT @hit`;
 
+  # If the character in question is not found, thus $hit is 0, we insert
+  # a row into t_err for further examination. In case of errors the final
+  # "SELECT * FROM t_err" we be non-zero showing the number of errors occured.
   if (!$hit)
   {
-    INSERT INTO t_err VALUES (@id, @reference, (SELECT a FROM t1 WHERE id = @id), @category, @comment, 't1');
+    INSERT INTO t_err VALUES (@id, @reference, (SELECT a FROM t1 WHERE id = @id), @category, @comment, 't1', @hit);
   }
 
   #
@@ -265,14 +280,13 @@ while ($i)
 
   if (!$hit)
   {
-    INSERT INTO t_err VALUES (@id, @reference, (SELECT a FROM t3 WHERE id = @id), @category, @comment, 't3');
+    INSERT INTO t_err VALUES (@id, @reference, (SELECT a FROM t3 WHERE id = @id), @category, @comment, 't3', @hit);
   }
 
-  --enable_result_log
-  --enable_query_log
-
   --dec $i
 }
+--enable_result_log
+--enable_query_log
 
 # Uppercase and lowercase tests.
 
@@ -288,7 +302,7 @@ SELECT count(*) FROM t2;
 SELECT count(*) FROM t3;
 SELECT count(*) FROM t4;
 SELECT count(*) FROM t5;
-SELECT count(*) FROM t_err;
+SELECT * FROM t_err;
 
 # ----------------------------------------------------- #
 # --- Final cleanup                                 --- #

=== modified file 'mysys/stacktrace.c'
--- a/mysys/stacktrace.c	2008-10-01 12:02:28 +0000
+++ b/mysys/stacktrace.c	2008-12-10 21:45:53 +0000
@@ -64,7 +64,9 @@ void my_safe_print_str(const char* name,
 
 #if BACKTRACE_DEMANGLE
 
-char __attribute__ ((weak)) *my_demangle(const char *mangled_name, int *status)
+char __attribute__ ((weak))
+*my_demangle(const char *mangled_name __attribute__((unused)),
+             int *status __attribute__((unused)))
 {
   return NULL;
 }

Thread
bzr commit into mysql-6.0-falcon branch (hky:2932) Bug#41368Hakan Kuecuekyilmaz10 Dec