← Back to branch summary

~jan-kneschke/mysql-proxy/packet-tracking-assertions

« back to all changes in this revision

Viewing changes to src/network-mysqld-packet.c

  • Committer: Kay Roepke
  • Date: 2008-11-12 14:10:22 UTC
  • Revision ID: kay@mysql.com-20081112141022-ccx7xglj8nxd32m9
merge head

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/network-mysqld-packet.c
150
150
 
151
151
                        break;
152
152
                case MYSQLD_PACKET_EOF:
153
 
#if MYSQL_VERSION_ID >= 50000
154
153
                        /**
155
154
                         * in 5.0 we have CURSORs which have no rows, just a field definition
156
155
                         */
157
 
                        eof_packet = network_mysqld_eof_packet_new();
158
 
 
159
 
                        err = err || network_mysqld_proto_get_eof_packet(packet, eof_packet);
160
 
 
161
 
                        if (!err) {
162
 
                                if (eof_packet->server_status & SERVER_STATUS_CURSOR_EXISTS) {
163
 
                                        is_finished = 1;
164
 
                                } else {
 
156
                        if (packet->data->len == 9) {
 
157
                                eof_packet = network_mysqld_eof_packet_new();
 
158
 
 
159
                                err = err || network_mysqld_proto_get_eof_packet(packet, eof_packet);
 
160
 
 
161
                                if (!err) {
 
162
#if MYSQL_VERSION_ID >= 50000
 
163
                                        if (eof_packet->server_status & SERVER_STATUS_CURSOR_EXISTS) {
 
164
                                                is_finished = 1;
 
165
                                        } else {
 
166
                                                query->state = PARSE_COM_QUERY_RESULT;
 
167
                                        }
 
168
#else
165
169
                                        query->state = PARSE_COM_QUERY_RESULT;
 
170
#endif
166
171
                                }
 
172
 
 
173
                                network_mysqld_eof_packet_free(eof_packet);
 
174
                        } else {
 
175
                                query->state = PARSE_COM_QUERY_RESULT;
167
176
                        }
168
 
 
169
 
                        network_mysqld_eof_packet_free(eof_packet);
170
 
#else
171
 
                        query->state = PARSE_COM_QUERY_RESULT;
172
 
#endif
173
177
                        break;
174
178
                default:
175
179
                        break;