diff options
| -rw-r--r-- | myisam/rt_index.c | 2 | ||||
| -rw-r--r-- | scripts/mysqld_safe.sh | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/myisam/rt_index.c b/myisam/rt_index.c index d55d01fa4a3..ad0d593ee0a 100644 --- a/myisam/rt_index.c +++ b/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 */ diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index febc7b8e595..e937789e6ef 100644 --- a/scripts/mysqld_safe.sh +++ b/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 |