bzr push into mysql-5.0-bugteam branch (satya.bn:2747)

[Satya B]

 2747 Satya B	2009-04-07 [merge]
      merge to latest 5.0-bugteam
      modified:
        myisam/mi_packrec.c
        mysql-test/r/lock_multi.result
        mysql-test/r/myisampack.result
        mysql-test/t/lock_multi.test
        mysql-test/t/myisampack.test
        scripts/mysqld_multi.sh
        sql/sql_lex.cc
        sql/sql_lex.h
        sql/sql_parse.cc
        sql/sql_yacc.yy

=== modified file 'myisam/mi_close.c'
--- a/myisam/mi_close.c	2007-03-28 17:46:42 +0000
+++ b/myisam/mi_close.c	2009-03-20 09:18:14 +0000
@@ -35,8 +35,6 @@ int mi_close(register MI_INFO *info)
   if (info->lock_type == F_EXTRA_LCK)
     info->lock_type=F_UNLCK;			/* HA_EXTRA_NO_USER_CHANGE */
 
-  if (share->reopen == 1 && share->kfile >= 0)
-    _mi_decrement_open_count(info);
 
   if (info->lock_type != F_UNLCK)
   {
@@ -78,6 +76,8 @@ int mi_close(register MI_INFO *info)
       */
       if (share->mode != O_RDONLY && mi_is_crashed(info))
 	mi_state_info_write(share->kfile, &share->state, 1);
+      /* Decrement open count must be last I/O on this file. */
+      _mi_decrement_open_count(info);
       if (my_close(share->kfile,MYF(0)))
         error = my_errno;
     }