diff options
| author | unknown <msvensson@shellback.(none)> | 2006-11-02 23:09:32 +0100 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-11-02 23:09:32 +0100 |
| commit | 2772d9e182a4c6832ed903cb143d25861292e786 (patch) | |
| tree | 52f3a4aaf12eb0435cb6ad86a2cb93a07cfdf98f | |
| parent | 07978008414fb2df9aca88038fbde198d048bf85 (diff) | |
| parent | aae0caf608f0401eea239092b01c14108130b3e1 (diff) | |
| download | mariadb-git-2772d9e182a4c6832ed903cb143d25861292e786.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1-maint
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
| -rw-r--r-- | client/mysql.cc | 2 | ||||
| -rw-r--r-- | mysys/my_lock.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 5c4e2b4db65..d8810ba3c28 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -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) diff --git a/mysys/my_lock.c b/mysys/my_lock.c index c9641f46f5c..b8307f366c0 100644 --- a/mysys/my_lock.c +++ b/mysys/my_lock.c @@ -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) { |