Merge sinisa@work.mysql.com:/home/bk/mysql-4.1

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

myisam/rt_index.c

@@ -503,7 +503,7 @@ static int rtree_insert_level(MI_INFO *info, uint keynr, uchar *key,
     return res;
   }
 
-  switch ((res = rtree_insert_req(info, &keyinfo[keynr], key, key_length, 
+  switch ((res = rtree_insert_req(info, keyinfo, key, key_length, 
                                   old_root, &new_page, ins_level, 0)))
   {
     case 0: /* root was not split */

scripts/mysqld_safe.sh

@@ -270,7 +270,6 @@ echo "Starting $MYSQLD daemon with databases from $DATADIR"
 echo "`date +'%y%m%d %H:%M:%S  mysqld started'`" >> $err_log
 while true
 do
-  rm -f $MYSQL_UNIX_PORT $pid_file	# Some extra safety
   if test -z "$args"
   then
     $NOHUP_NICENESS $ledir/$MYSQLD $defaults --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR $USER_OPTION --pid-file=$pid_file @MYSQLD_DEFAULT_SWITCHES@ >> $err_log 2>&1
@@ -309,7 +308,7 @@ do
 	I=`expr $I + 1`
     done
   fi
-
+  rm -f $MYSQL_UNIX_PORT $pid_file	# Some extra safety
   echo "`date +'%y%m%d %H:%M:%S'`  mysqld restarted" | tee -a $err_log
 done