bk commit into 5.1 tree (monty:1.2455)

[monty]

Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-02-23 12:50:09+02:00, monty@stripped +7 -0
  Fixed compilation issue on windows
  Fixed or suppressed all warnings for all platforms (as detected by pushbuild)

  extra/yassl/include/openssl/ssl.h@stripped, 2007-02-23 12:50:03+02:00, monty@stripped +1 -0
    Try to fix windows compilation failure

  include/my_global.h@stripped, 2007-02-23 12:50:03+02:00, monty@stripped +13 -11
    Fixed warnings on win64 when using int5store and int6store

  sql/sql_table.cc@stripped, 2007-02-23 12:50:04+02:00, monty@stripped +1 -1
    Fixed warnings on win64

  storage/innobase/pars/pars0lex.l@stripped, 2007-02-23 12:50:04+02:00, monty@stripped +1 -1
    Fixed warnings on win64

  storage/ndb/src/kernel/blocks/backup/Backup.cpp@stripped, 2007-02-23 12:50:04+02:00,
monty@stripped +0 -1
    Removed not used variable

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-02-23 12:50:04+02:00,
monty@stripped +0 -1
    Removed not used variable

  support-files/compiler_warnings.supp@stripped, 2007-02-23 12:50:05+02:00, monty@stripped +8
-2
    Suppress all warnings

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	monty
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-5.1

--- 1.391/sql/sql_table.cc	2007-02-23 06:39:55 +02:00
+++ 1.392/sql/sql_table.cc	2007-02-23 12:50:04 +02:00
@@ -463,7 +463,7 @@
             (ulong) const_var);
   const_var= IO_SIZE;
   int4store(&global_ddl_log.file_entry_buf[DDL_LOG_IO_SIZE_POS],
-            const_var);
+            (ulong) const_var);
   if (write_ddl_log_file_entry(0UL))
   {
     sql_print_error("Error writing ddl log header");

--- 1.10/support-files/compiler_warnings.supp	2007-02-23 06:39:56 +02:00
+++ 1.11/support-files/compiler_warnings.supp	2007-02-23 12:50:05 +02:00
@@ -14,9 +14,8 @@
 SchemaFile.hpp : .*'struct SchemaFile::TableEntry' only defines private constructors and
has no friends.*
 sql_yacc.cc : .*switch statement contains 'default' but no 'case' labels.*
 
-
 #
-# Not fatal errors in innobase
+# Things that can be ignored in InnoDB
 #
 pars0grm.tab.c: .*'yyerrorlab' : unreferenced label.*
 _flex_tmp.c: .*not enough actual parameters for macro 'yywrap'.*
@@ -41,3 +40,10 @@
 # The following should be fixed by the ndb team
 #
 .*/ndb/.* : .*used uninitialized in this function.*
+
+#
+# Unexplanable (?) stuff
+#
+listener.cc : .*conversion from 'SOCKET' to 'int'.*
+net_serv.c : .*conversion from 'SOCKET' to 'int'.*
+mi_packrec.c : .*result of 32-bit shift implicitly converted to 64 bits.* : 567

--- 1.64/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2007-02-23 06:39:56 +02:00
+++ 1.65/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2007-02-23 12:50:04 +02:00
@@ -2151,7 +2151,6 @@
   
   DropTrigConf* conf = (DropTrigConf*)signal->getDataPtr();
   const Uint32 ptrI = conf->getConnectionPtr();
-  const Uint32 triggerId= conf->getTriggerId();
 
   BackupRecordPtr ptr LINT_SET_PTR;
   c_backupPool.getPtr(ptr, ptrI);

--- 1.109/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-02-23 06:39:56 +02:00
+++ 1.110/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-02-23 12:50:04 +02:00
@@ -10619,7 +10619,6 @@
   ndbrequire(!isMaster());
   Uint32 lcpNo = rep->lcpNo;
   Uint32 lcpId = rep->lcpId;
-  Uint32 replicaLcpNo = replicaPtr.p->nextLcp;
 
   warningEvent("Detected previous node failure of %d during lcp",
 	       rep->nodeId);

--- 1.14/storage/innobase/pars/pars0lex.l	2006-07-26 12:28:43 +03:00
+++ 1.15/storage/innobase/pars/pars0lex.l	2007-02-23 12:50:04 +02:00
@@ -109,7 +109,7 @@
 			yylval = sym_tab_add_bound_lit(pars_sym_tab_global,
 				yytext + 1, &type);
 
-			return(type);
+			return((int) type);
 }
 
 {BOUND_ID}	{

--- 1.159/include/my_global.h	2007-02-22 17:56:57 +02:00
+++ 1.160/include/my_global.h	2007-02-23 12:50:03 +02:00
@@ -1284,17 +1284,19 @@
                                   *(((char *)(T))+1)=(char) (((A) >> 8));\
                                   *(((char *)(T))+2)=(char) (((A) >> 16));\
                                   *(((char *)(T))+3)=(char) (((A) >> 24)); }
while(0)
-#define int5store(T,A)       do { *((char *)(T))=((A));\
-                                  *(((char *)(T))+1)=(((A) >> 8));\
-                                  *(((char *)(T))+2)=(((A) >> 16));\
-                                  *(((char *)(T))+3)=(((A) >> 24)); \
-                                  *(((char *)(T))+4)=(((A) >> 32)); } while(0)
-#define int6store(T,A)       do { *((char *)(T))=((A));\
-                                  *(((char *)(T))+1)=(((A) >> 8));  \
-                                  *(((char *)(T))+2)=(((A) >> 16)); \
-                                  *(((char *)(T))+3)=(((A) >> 24)); \
-                                  *(((char *)(T))+4)=(((A) >> 32)); \
-                                  *(((char *)(T))+5)=(((A) >> 40)); } while(0)
+#define int5store(T,A)       do { *((char *)(T))=     (char)((A));  \
+                                  *(((char *)(T))+1)= (char)(((A) >> 8)); \
+                                  *(((char *)(T))+2)= (char)(((A) >> 16)); \
+                                  *(((char *)(T))+3)= (char)(((A) >> 24)); \
+                                  *(((char *)(T))+4)= (char)(((A) >> 32)); \
+		                } while(0)
+#define int6store(T,A)       do { *((char *)(T))=     (char)((A)); \
+                                  *(((char *)(T))+1)= (char)(((A) >> 8)); \
+                                  *(((char *)(T))+2)= (char)(((A) >> 16)); \
+                                  *(((char *)(T))+3)= (char)(((A) >> 24)); \
+                                  *(((char *)(T))+4)= (char)(((A) >> 32)); \
+                                  *(((char *)(T))+5)= (char)(((A) >> 40)); \
+                                } while(0)
 #define int8store(T,A)       do { uint def_temp= (uint) (A), def_temp2= (uint) ((A)
>> 32); \
                                   int4store((T),def_temp); \
                                   int4store((T+4),def_temp2); } while(0)

--- 1.23/extra/yassl/include/openssl/ssl.h	2007-02-23 06:39:54 +02:00
+++ 1.24/extra/yassl/include/openssl/ssl.h	2007-02-23 12:50:03 +02:00
@@ -190,6 +190,7 @@
 };
 
 #if defined(_WIN32) || defined(_WIN64)
+    #include <winsock2.h>
     typedef SOCKET socket_t;
 #else
     typedef int socket_t;