Commit aae0caf6 authored by unknown's avatar unknown
Browse files

Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint

into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint

parents e9f182b3 4868875c
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ int my_lock(File fd, int locktype, my_off_t start, my_off_t length,
#elif defined(HAVE_LOCKING)
  /* Windows */
  {
    my_bool error= false;
    my_bool error= FALSE;
    pthread_mutex_lock(&my_file_info[fd].mutex);
    if (MyFlags & MY_SEEK_NOT_DONE) 
    {