Commit 2772d9e1 authored by unknown's avatar unknown
Browse files

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

into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
parents 07978008 aae0caf6

client/mysql.cc

+2 −0
Original line number Diff line number Diff line
@@ -2012,6 +2012,8 @@ com_go(String *buffer,char *line __attribute__((unused))) 
		(long) mysql_num_rows(result),

		(long) mysql_num_rows(result) == 1 ? "row" : "rows");

	end_pager();

        if (mysql_errno(&mysql))

          error= put_error(&mysql);

      }

    }

    else if (mysql_affected_rows(&mysql) == ~(ulonglong) 0)

mysys/my_lock.c

+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) 

    {