← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_connect.cc

  • Committer: Brian Aker
  • Date: 2008-12-24 00:27:06 UTC
  • mfrom: (741.1.2 protocol_fixes)
  • Revision ID: brian@tangent.org-20081224002706-3pyon2nk2k5gnj4v
Merging in fixes by Eric

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_connect.cc
262
262
    server_capabilites|= CLIENT_COMPRESS;
263
263
#endif /* HAVE_COMPRESS */
264
264
 
265
 
    end= strncpy(buff, server_version, SERVER_VERSION_LENGTH);
266
 
    end+= SERVER_VERSION_LENGTH+1;
 
265
    end= buff + strlen(server_version);
 
266
    if ((end - buff) >= SERVER_VERSION_LENGTH)
 
267
      end= buff + (SERVER_VERSION_LENGTH - 1);
 
268
    memcpy(buff, server_version, end - buff);
 
269
    *end= 0;
 
270
    end++;
267
271
 
268
272
    int4store((unsigned char*) end, session->thread_id);
269
273
    end+= 4;