← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Elan Ruusamäe
  • Date: 2008-12-02 20:06:31 UTC
  • mfrom: (637 drizzle)
  • mto: (641.3.10 devel)
  • mto: This revision was merged to the branch mainline in revision 649.
  • Revision ID: glen@haarber.alkohol.ee-20081202200631-f6h3vbnjaojvk3uq
- merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
383
383
  m_affected_rows= affected_rows_arg;
384
384
  m_last_insert_id= last_insert_id_arg;
385
385
  if (message_arg)
386
 
    strmake(m_message, message_arg, sizeof(m_message) - 1);
 
386
    strncpy(m_message, message_arg, sizeof(m_message) - 1);
387
387
  else
388
388
    m_message[0]= '\0';
389
389
  m_status= DA_OK;
441
441
    return;
442
442
 
443
443
  m_sql_errno= sql_errno_arg;
444
 
  strmake(m_message, message_arg, sizeof(m_message) - 1);
 
444
  strncpy(m_message, message_arg, sizeof(m_message) - 1);
445
445
 
446
446
  m_status= DA_ERROR;
447
447
}
1523
1523
  bool string_results= false, non_string_results= false;
1524
1524
  unit= u;
1525
1525
  if ((uint) strlen(exchange->file_name) + NAME_LEN >= FN_REFLEN)
1526
 
    strmake(path,exchange->file_name,FN_REFLEN-1);
 
1526
    strncpy(path,exchange->file_name,FN_REFLEN-1);
1527
1527
 
1528
1528
  if ((file= create_file(session, path, exchange, &cache)) < 0)
1529
1529
    return 1;