diff options
| author | konstantin@mysql.com <> | 2004-08-03 03:32:21 -0700 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2004-08-03 03:32:21 -0700 |
| commit | d3e520ce7e840df5f119e8fc2f5b5bb9640e53df (patch) | |
| tree | 90caa835d0b6af4148caf934c5d80616cb5c25ae /libmysqld | |
| parent | 7e6bade23bf5fbaf6cdb76e2fce2f76cfc533a7a (diff) | |
| download | mariadb-git-d3e520ce7e840df5f119e8fc2f5b5bb9640e53df.tar.gz | |
Port of cursors to be pushed into 5.0 tree:
- client side part is simple and may be considered stable
- server side part now just joggles with THD state to save execution
state and has no additional locking wisdom.
Lot's of it are to be rewritten.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index b3db54d305a..7e32df82e80 100644 --- a/libmysqld/examples/Makefile.am +++ b/libmysqld/examples/Makefile.am @@ -27,7 +27,7 @@ mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \ mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD) client_test_LINK = $(CXXLINK) -client_test_SOURCES = client_test.c +client_test_SOURCES = client_test.cc clean: rm -f $(client_sources) diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 0adf9aeb86a..1f37b115f6c 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -568,7 +568,7 @@ err: C_MODE_END -bool Protocol::send_fields(List<Item> *list, uint flag) +bool Protocol::send_fields(List<Item> *list, uint flags) { List_iterator_fast<Item> it(*list); Item *item; @@ -615,7 +615,7 @@ bool Protocol::send_fields(List<Item> *list, uint flag) if (INTERNAL_NUM_FIELD(client_field)) client_field->flags|= NUM_FLAG; - if (flag & 2) + if (flags & Protocol::SEND_DEFAULTS) { char buff[80]; String tmp(buff, sizeof(buff), default_charset_info), *res; |