Commit 2ca5f52b authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0-ndb


sql/sql_parse.cc:
  Auto merged
parents d9007935 f46729c2

sql/sql_parse.cc

+1 −8
Original line number Diff line number Diff line
@@ -1865,11 +1865,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, 
    mysqld_list_fields(thd,&table_list,fields);

    thd->lex->unit.cleanup();

    thd->cleanup_after_query();

#ifdef HAVE_INNOBASE_DB

    release_local_lock(thd, locked_tables, old_innodb_table_locks);

#else

    release_local_lock(thd, locked_tables, false);

#endif

    break;

  }

#endif
@@ -4605,11 +4601,8 @@ mysql_execute_command(THD *thd) 
    if (thd->lock == thd->locked_tables)

      thd->lock= 0;

  }

#ifdef HAVE_INNOBASE_DB



  release_local_lock(thd, locked_tables, old_innodb_table_locks);

#else

  release_local_lock(thd, locked_tables, false);

#endif

  DBUG_RETURN(res || thd->net.report_error);

}