diff options
| author | unknown <pem@mysql.com> | 2003-04-23 09:22:54 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2003-04-23 09:22:54 +0200 |
| commit | f525047d1eb2d1bad50cf453210939ceb15d7282 (patch) | |
| tree | 9fbeeb35b26b022c208e85d02e688a47350e8cb5 /sql/sp_head.h | |
| parent | 4ed94fcd8ec8afc11e4208a5a3e83bd90b5fc644 (diff) | |
| download | mariadb-git-f525047d1eb2d1bad50cf453210939ceb15d7282.tar.gz | |
Made multiple queries (SELECT without INTO) work in SPs.
This included bug fixes in the 4.1 protocol (actually send and receive the
server_status flags).
libmysql/libmysql.c:
Pick up the server_status (with the 4.1 protocol) as well.
mysql-test/r/sp-error.result:
Test for "bad selects" in non-CLIENT_MULTI_QUERIES clients (as mysqltest for the
momen; this test will have to go away eventually).
mysql-test/t/sp-error.test:
Test for "bad selects" in non-CLIENT_MULTI_QUERIES clients (as mysqltest for the
momen; this test will have to go away eventually).
sql/protocol.cc:
Actually send the server_status flags in send_eof() (4.1 protocol), not just zero.
sql/sp_head.cc:
Made multiple queries (SELECT without INTO) work in SPs.
sql/sp_head.h:
Made multiple queries (SELECT without INTO) work in SPs.
sql/sql_parse.cc:
Made multiple queries (SELECT without INTO) work in SPs.
sql/sql_yacc.yy:
Made multiple queries (SELECT without INTO) work in SPs.
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index afc7822cca3..b79dfdab8e9 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -46,6 +46,8 @@ public: int m_type; // TYPE_ENUM_FUNCTION or TYPE_ENUM_PROCEDURE enum enum_field_types m_returns; // For FUNCTIONs only my_bool m_simple_case; // TRUE if parsing simple case, FALSE otherwise + my_bool m_multi_query; // TRUE if a procedure with SELECT(s) + uint m_old_cmq; // Old CLIENT_MULTI_QUERIES value #if 0 // We're not using this at the moment. List<char *> m_calls; // Called procedures. |