← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_connect.cc

merge latest dev work

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_connect.cc
176
176
  {
177
177
    /* buff[] needs to big enough to hold the server_version variable */
178
178
    char buff[SERVER_VERSION_LENGTH + SCRAMBLE_LENGTH + 64];
 
179
 
179
180
    server_capabilites= CLIENT_BASIC_FLAGS;
180
181
 
181
182
    if (opt_using_transactions)
205
206
      part at the end of packet.
206
207
    */
207
208
    end= strncpy(end, session->scramble, SCRAMBLE_LENGTH_323);
208
 
    end+= SCRAMBLE_LENGTH_323 + 1;
 
209
    end+= SCRAMBLE_LENGTH_323;
 
210
 
 
211
    *end++= 0; /* an empty byte for some reason */
209
212
 
210
213
    int2store(end, server_capabilites);
211
214
    /* write server characteristics: up to 16 bytes allowed */
216
219
    /* write scramble tail */
217
220
    size_t scramble_len= SCRAMBLE_LENGTH - SCRAMBLE_LENGTH_323;
218
221
    end= strncpy(end, session->scramble + SCRAMBLE_LENGTH_323, scramble_len);
219
 
    end+= scramble_len + 1;
 
222
    end+= scramble_len;
 
223
 
 
224
    *end++= 0; /* an empty byte for some reason */
220
225
 
221
226
    /* At this point we write connection message and read reply */
222
227
    if (drizzleclient_net_write_command(net, (unsigned char) protocol_version, (unsigned char*) "", 0,