← Back to branch summary

~brianaker/libdrizzle/windows-support-via-mingw

« back to all changes in this revision

Viewing changes to libdrizzle/conn.cc

  • Committer: Continuous Integration
  • Date: 2013-01-05 11:52:21 UTC
  • mfrom: (79.1.5 5.1-api-fixes)
  • Revision ID: ci@drizzle.org-20130105115221-qxd0g29jljekx7q9
Merge lp:~linuxjedi/libdrizzle/5.1-api-fixes Build: jenkins-Libdrizzle-33

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/conn.cc
567
567
  return con->thread_id;
568
568
}
569
569
 
570
 
const uint8_t *drizzle_scramble(const drizzle_st *con)
 
570
const unsigned char *drizzle_scramble(const drizzle_st *con)
571
571
{
572
572
  if (con == NULL)
573
573
  {
671
671
  return DRIZZLE_RETURN_INVALID_ARGUMENT;
672
672
}
673
673
 
674
 
drizzle_result_st *drizzle_select_db(drizzle_st *con,
675
 
                                         const char *db,
676
 
                                         drizzle_return_t *ret_ptr)
 
674
drizzle_return_t drizzle_select_db(drizzle_st *con,
 
675
                                         const char *db)
677
676
{
 
677
  drizzle_result_st *result;
 
678
  drizzle_return_t ret;
678
679
  drizzle_set_db(con, db);
679
 
  return drizzle_command_write(con, NULL, DRIZZLE_COMMAND_INIT_DB,
680
 
                                   db, strlen(db), strlen(db), ret_ptr);
 
680
  result= drizzle_command_write(con, NULL, DRIZZLE_COMMAND_INIT_DB,
 
681
                                   db, strlen(db), strlen(db), &ret);
 
682
  drizzle_result_free(result);
 
683
  return ret;
681
684
}
682
685
 
683
686
drizzle_result_st *drizzle_shutdown(drizzle_st *con,
780
783
    }
781
784
 
782
785
    con->command= command;
783
 
    con->command_data= (uint8_t *)data;
 
786
    con->command_data= (unsigned char *)data;
784
787
    con->command_size= size;
785
788
    con->command_offset= 0;
786
789
    con->command_total= total;
789
792
  }
790
793
  else if (con->command_data == NULL)
791
794
  {
792
 
    con->command_data= (uint8_t *)data;
 
795
    con->command_data= (unsigned char *)data;
793
796
    con->command_size= size;
794
797
  }
795
798