Merge bk-internal.mysql.com:/home/bk/mysql-4.1/

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

.bzrignore

@@ -791,3 +791,4 @@ sql/my_time.c
 libmysql/my_time.c
 libmysqld/my_time.c
 sql/mysql_tzinfo_to_sql
+sql/mysql_tzinfo_to_sql.cc

include/my_global.h

@@ -1076,13 +1076,14 @@ do { doubleget_union _tmp; \
 
 #if defined(__FLOAT_WORD_ORDER) && (__FLOAT_WORD_ORDER == __BIG_ENDIAN)
 #define doublestore(T,V) do { *(T)= ((byte *) &V)[4];\
-                              *((T)+1)=(char) ((byte *) &V)[5];\
-                              *((T)+2)=(char) ((byte *) &V)[6];\
-                              *((T)+3)=(char) ((byte *) &V)[7];\
-                              *((T)+4)=(char) ((byte *) &V)[0];\
-                              *((T)+5)=(char) ((byte *) &V)[1];\
-                              *((T)+6)=(char) ((byte *) &V)[2];\
-                              *((T)+7)=(char) ((byte *) &V)[3]; } while(0)
+                              *(((char*)T)+1)=(char) ((byte *) &V)[5];\
+                              *(((char*)T)+2)=(char) ((byte *) &V)[6];\
+                              *(((char*)T)+3)=(char) ((byte *) &V)[7];\
+                              *(((char*)T)+4)=(char) ((byte *) &V)[0];\
+                              *(((char*)T)+5)=(char) ((byte *) &V)[1];\
+                              *(((char*)T)+6)=(char) ((byte *) &V)[2];\
+                              *(((char*)T)+7)=(char) ((byte *) &V)[3]; }\
+                         while(0)
 #define doubleget(V,M)   do { double def_temp;\
                               ((byte*) &def_temp)[0]=(M)[4];\
                               ((byte*) &def_temp)[1]=(M)[5];\
@@ -1134,12 +1135,12 @@ do { doubleget_union _tmp; \
                             ((byte*) &def_temp)[3]=(M)[3];\
                             (V)=def_temp; } while(0)
 #define shortstore(T,A) do { uint def_temp=(uint) (A) ;\
-                             *(T+1)=(char)(def_temp); \
-                             *(T+0)=(char)(def_temp >> 8); } while(0)
-#define longstore(T,A)  do { *((T)+3)=((A));\
-                             *((T)+2)=(((A) >> 8));\
-                             *((T)+1)=(((A) >> 16));\
-                             *((T)+0)=(((A) >> 24)); } while(0)
+                             *(((char*)T)+1)=(char)(def_temp); \
+                             *(((char*)T)+0)=(char)(def_temp >> 8); } while(0)
+#define longstore(T,A)  do { *(((char*)T)+3)=((A));\
+                             *(((char*)T)+2)=(((A) >> 8));\
+                             *(((char*)T)+1)=(((A) >> 16));\
+                             *(((char*)T)+0)=(((A) >> 24)); } while(0)
 
 #define floatstore(T,V) memcpy_fixed((byte*)(T), (byte*)(&V), sizeof(float))
 #define doubleget(V,M)	 memcpy_fixed((byte*) &V,(byte*) (M),sizeof(double))

libmysql/libmysql.c

@@ -3122,7 +3122,7 @@ static uint read_binary_date(MYSQL_TIME *tm, uchar **pos)
 static void send_data_long(MYSQL_BIND *param, MYSQL_FIELD *field,
 			   longlong value)
 {
-  char *buffer= param->buffer;
+  char *buffer= (char *)param->buffer;
   uint field_is_unsigned= (field->flags & UNSIGNED_FLAG);
 
   switch (param->buffer_type) {
@@ -3178,7 +3178,7 @@ static void send_data_long(MYSQL_BIND *param, MYSQL_FIELD *field,
 
 static void send_data_double(MYSQL_BIND *param, double value)
 {
-  char *buffer= param->buffer;
+  char *buffer= (char *)param->buffer;
 
   switch(param->buffer_type) {
   case MYSQL_TYPE_NULL: /* do nothing */
@@ -3231,7 +3231,7 @@ static void send_data_double(MYSQL_BIND *param, double value)
 
 static void send_data_str(MYSQL_BIND *param, char *value, uint length)
 {
-  char *buffer= param->buffer;
+  char *buffer= (char *)param->buffer;
   int err=0;
 
   switch(param->buffer_type) {

scripts/make_win_src_distribution.sh

@@ -161,13 +161,16 @@ vreplace()
   done
 }
 
-for d in 4.0.XX-gpl 4.0.XX-pro 4.0.XX-classic
-do
-  cd $BASE/InstallShield/$d/String\ Tables/0009-English
-  vreplace value.shl
-  cd ../../Setup\ Files/Compressed\ Files/Language\ Independent/OS\ Independent
-  vreplace infolist.txt
-done
+if test -d $BASE/InstallShield
+then
+  for d in 4.1.XX-gpl 4.1.XX-pro 4.1.XX-classic
+  do
+    cd $BASE/InstallShield/$d/String\ Tables/0009-English
+    vreplace value.shl
+    cd ../../Setup\ Files/Compressed\ Files/Language\ Independent/OS\ Independent
+    vreplace infolist.txt
+  done
+fi
 
 #
 # Move all error message files to root directory

scripts/mysql_create_system_tables.sh

@@ -160,7 +160,9 @@ then
            INSERT INTO user (host,user) values ('localhost','');"
     else
       i_u="$i_u
-	   INSERT INTO user VALUES ('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
+	   INSERT INTO user VALUES ('%','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
+	   INSERT INTO user VALUES ('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
+	   INSERT INTO user VALUES ('%','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0);"
     fi
   fi 
 fi