← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.cc

  • Committer: Eric Day
  • Date: 2009-03-26 09:22:55 UTC
  • mto: (968.1.1 lib-merge)
  • mto: This revision was merged to the branch mainline in revision 969.
  • Revision ID: eday@oddments.org-20090326092255-m51lu07ve4trwynq
Tools mostly converted, still fixing bugs from test suite.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.cc
3898
3898
}
3899
3899
 
3900
3900
static const char *
3901
 
server_version_string(drizzle_con_st *con)
 
3901
server_version_string(drizzle_con_st *local_con)
3902
3902
{
3903
3903
  static string buf("");
3904
3904
  static bool server_version_string_reserved= false;
3914
3914
    drizzle_result_st result;
3915
3915
    drizzle_return_t ret;
3916
3916
 
3917
 
    buf.append(drizzle_con_server_version(con));
 
3917
    buf.append(drizzle_con_server_version(local_con));
3918
3918
 
3919
3919
    /* "limit 1" is protection against SQL_SELECT_LIMIT=0 */
3920
 
    (void)drizzle_query_str(con, &result, "select @@version_comment limit 1",
3921
 
                            &ret);
 
3920
    (void)drizzle_query_str(local_con, &result,
 
3921
                            "select @@version_comment limit 1", &ret);
3922
3922
    if (ret == DRIZZLE_RETURN_OK &&
3923
3923
        drizzle_result_buffer(&result) == DRIZZLE_RETURN_OK)
3924
3924
    {
4010
4010
 
4011
4011
 
4012
4012
static int
4013
 
put_error(drizzle_con_st *con, drizzle_result_st *res)
 
4013
put_error(drizzle_con_st *local_con, drizzle_result_st *res)
4014
4014
{
4015
4015
  const char *error;
4016
4016
 
4018
4018
  {
4019
4019
    error= drizzle_result_error(res);
4020
4020
    if (!strcmp(error, ""))
4021
 
      error= drizzle_con_error(con);
 
4021
      error= drizzle_con_error(local_con);
4022
4022
  }
4023
4023
  else
4024
 
    error= drizzle_con_error(con);
 
4024
    error= drizzle_con_error(local_con);
4025
4025
 
4026
 
  return put_info(error, INFO_ERROR, res == NULL ? drizzle_con_errno(con) :
4027
 
                                     drizzle_result_error_code(res),
 
4026
  return put_info(error, INFO_ERROR,
 
4027
                  res == NULL ? drizzle_con_errno(local_con) :
 
4028
                                drizzle_result_error_code(res),
4028
4029
                  res == NULL ? NULL : drizzle_result_sqlstate(res));
4029
4030
}
4030
4031