diff options
| author | unknown <hf@deer.(none)> | 2004-05-28 15:59:29 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-05-28 15:59:29 +0500 |
| commit | 2c38f5fbc005d743d4c4ccc141edb5428e3d4c57 (patch) | |
| tree | 9ba2527c9a95020c3a8e8492a1fdec59513b2591 /sql/ha_myisam.cc | |
| parent | dad0008927729c3b79c341aee742784f470fb271 (diff) | |
| download | mariadb-git-2c38f5fbc005d743d4c4ccc141edb5428e3d4c57.tar.gz | |
Proposed fix for bug #3412 (embedded server: prepared statement returns
empty recordset where some records should be found)
sql/ha_myisam.cc:
Code simplified with vio_ok()
sql/mysqld.cc:
vio_ok used
sql/slave.cc:
vio_ok used
sql/sql_class.cc:
Here is the place of the error - we should not examine net.vio in
embedded library
sql/sql_class.h:
method added to always return TRUE in embedded library, and to
sheck thd.net.vio otherwise
sql/sql_show.cc:
code simplified with vio_ok()
Diffstat (limited to 'sql/ha_myisam.cc')
| -rw-r--r-- | sql/ha_myisam.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index 3c7852c703a..318e0fbb507 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -60,13 +60,11 @@ static void mi_check_print_msg(MI_CHECK *param, const char* msg_type, DBUG_PRINT(msg_type,("message: %s",msgbuf)); -#ifndef EMBEDDED_LIBRARY - if (thd->net.vio == 0) + if (!thd->vio_ok()) { sql_print_error(msgbuf); return; } -#endif if (param->testflag & (T_CREATE_MISSING_KEYS | T_SAFE_REPAIR | T_AUTO_REPAIR)) |