merge with work

mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
myisam/rt_test.c:
  Merge
myisam/sp_key.c:
  Merge
myisam/sp_test.c:
  Merge
mysql-test/r/create.result:
  Merge
sql/share/english/errmsg.txt:
  Merge
sql/sql_yacc.yy:
  Merge

2 files changed, 3 insertions, 5 deletions

diff --git a/myisam/rt_test.c b/myisam/rt_test.c
index 5cf4262e804..b959c18806f 100644
--- a/myisam/rt_test.c
+++ b/myisam/rt_test.c
@@ -32,7 +32,7 @@ static void print_record(char * record,my_off_t offs,const char * tail);
 static  int run_test(const char *filename);
 
 
-int main(int argc __attribute__((unused)),char *argv[])
+int main(int argc __attribute__((unused)),char *argv[] __attribute__((unused)))
 {
   MY_INIT(argv[0]);
   exit(run_test("rt_test"));
@@ -198,7 +198,6 @@ int run_test(const char *filename)
     }
   }
 
-/*
 
   if (!silent)
     printf("- Updating rows with position\n");
@@ -226,8 +225,6 @@ int run_test(const char *filename)
     }
   }
 
-*/
-
 
   if((error=read_with_pos(file,silent)))
     goto err;
diff --git a/myisam/sp_test.c b/myisam/sp_test.c
index b8b5880cf67..1a7c2785964 100644
--- a/myisam/sp_test.c
+++ b/myisam/sp_test.c
@@ -330,7 +330,8 @@ static void bprint_record(char * record,
   i=(unsigned char)record[0];
   printf("%02X ",i);
   
-  for( pos=record+1, i=0; i<32; i++,pos++){
+  for( pos=record+1, i=0; i<32; i++,pos++)
+  {
     int b=(unsigned char)*pos;
     printf("%02X",b);
   }