diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-12-16 15:34:11 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-12-16 15:34:11 +0100 |
| commit | 2ff2d1873a989e1c7f304f64c57ff236d7c48750 (patch) | |
| tree | 6ef380be281adedf087a0aeebda5286409211a25 /client | |
| parent | f31b16543a7b0f1c07ecb54113df5b70ceef6550 (diff) | |
| parent | b3d99069077cd24e1cf4bb07857fdb12aee895a0 (diff) | |
| download | mariadb-git-2ff2d1873a989e1c7f304f64c57ff236d7c48750.tar.gz | |
merge
Diffstat (limited to 'client')
| -rw-r--r-- | client/.cvsignore | 14 | ||||
| -rw-r--r-- | client/mysql.cc | 8 |
2 files changed, 3 insertions, 19 deletions
diff --git a/client/.cvsignore b/client/.cvsignore deleted file mode 100644 index 54bbaed97f5..00000000000 --- a/client/.cvsignore +++ /dev/null @@ -1,14 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -insert_test -mysql -mysql-test -mysql_test -mysqladmin -mysqldump -mysqlimport -mysqlshow -select_test -thread_test diff --git a/client/mysql.cc b/client/mysql.cc index 5e3260e486b..be3c13bf362 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -4429,7 +4429,7 @@ com_status(String *buffer __attribute__((unused)), Don't remove "limit 1", it is protection againts SQL_SELECT_LIMIT=0 */ - if (mysql_store_result_for_lazy(&result)) + if (!mysql_store_result_for_lazy(&result)) { MYSQL_ROW cur=mysql_fetch_row(result); if (cur) @@ -4473,7 +4473,7 @@ com_status(String *buffer __attribute__((unused)), if (mysql_errno(&mysql) == CR_SERVER_GONE_ERROR) return 0; } - if (mysql_store_result_for_lazy(&result)) + if (!mysql_store_result_for_lazy(&result)) { MYSQL_ROW cur=mysql_fetch_row(result); if (cur) @@ -4568,9 +4568,7 @@ server_version_string(MYSQL *con) */ if (server_version == NULL) - { - server_version= strdup(mysql_get_server_info(con)); - } + server_version= my_strdup(mysql_get_server_info(con), MYF(MY_WME)); } return server_version ? server_version : ""; |