List:Commits« Previous MessageNext Message »
From:Olav Sandstaa Date:April 14 2011 12:05pm
Subject:bzr push into mysql-trunk branch (olav.sandstaa:3315 to 3316)
View as plain text  
 3316 Olav Sandstaa	2011-04-14
      Remove two compile warnings from the Sun Studio compiler in the ICP 
      implementation in MyISAM.
     @ storage/myisam/myisamdef.h
        Added C_MODE declartion to index_cond_func_t typedef since this is used in 
        both C and C++ code.

    modified:
      storage/myisam/myisamdef.h
 3315 Serge Kozlov	2011-04-14 [merge]
      autocommit 5.5 -> trunk

    modified:
      mysql-test/suite/binlog/r/binlog_bug23533.result
      mysql-test/suite/binlog/t/binlog_bug23533.test
=== modified file 'storage/myisam/myisamdef.h'

=== modified file 'storage/myisam/myisamdef.h'
--- a/storage/myisam/myisamdef.h	2011-03-28 08:51:35 +0000
+++ b/storage/myisam/myisamdef.h	2011-04-14 12:04:53 +0000
@@ -226,8 +226,9 @@
   uint error;
 } MI_BIT_BUFF;
 
-
+C_MODE_START
 typedef ICP_RESULT (*index_cond_func_t)(void *param);
+C_MODE_END
 
 struct st_myisam_info {
   MYISAM_SHARE *s;			/* Shared between open:s */

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (olav.sandstaa:3315 to 3316) Olav Sandstaa14 Apr