diff options
| author | Michael Widenius <monty@mysql.com> | 2008-12-04 02:36:55 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2008-12-04 02:36:55 +0200 |
| commit | d83f6470243057fdd542bed0410dcabe09766713 (patch) | |
| tree | 982a6bdd41bd78853cdbbbd0f307330272374c36 /sql/protocol.cc | |
| parent | fb68158856f8d74372c8fa0c14553cd18dc9811b (diff) | |
| download | mariadb-git-d83f6470243057fdd542bed0410dcabe09766713.tar.gz | |
Fixed warnings and errors discovered by pushbuild2
mysys/my_init.c:
Fixed link error when compiling without thread support
sql/item_create.cc:
Fixed compiler warning
sql/mysqld.cc:
Fixed compile error on windows
sql/protocol.cc:
Fixed compiler warning
sql/sql_class.cc:
Fixed compiler warning
sql/sql_class.h:
Fixed compiler warning
storage/myisam/mi_open.c:
Fixed compiler warning
storage/myisammrg/ha_myisammrg.cc:
Fixed compiler warning (shadow variable)
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index bb69cdb36af..e608420f21a 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -477,9 +477,10 @@ void Protocol::init(THD *thd_arg) for the error. */ -void Protocol::end_partial_result_set(THD *thd) +void Protocol::end_partial_result_set(THD *thd_arg) { - net_send_eof(thd, thd->server_status, 0 /* no warnings, we're inside SP */); + net_send_eof(thd_arg, thd_arg->server_status, + 0 /* no warnings, we're inside SP */); } |