← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

Merged from Andrey.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzletest.cc
587
587
    unsigned int i;
588
588
    unsigned int row_num= 0;
589
589
    unsigned int num_fields= drizzle_num_fields(res);
590
 
    DRIZZLE_FIELD *fields= drizzle_fetch_fields(res);
 
590
    const DRIZZLE_FIELD *fields= drizzle_fetch_fields(res);
591
591
 
592
592
    fprintf(stderr, "=== %s ===\n", query);
593
593
    while ((row= drizzle_fetch_row(res)))
1933
1933
    /* Find column number from the given column name */
1934
1934
    uint i;
1935
1935
    uint num_fields= drizzle_num_fields(res);
1936
 
    DRIZZLE_FIELD *fields= drizzle_fetch_fields(res);
 
1936
    const DRIZZLE_FIELD *fields= drizzle_fetch_fields(res);
1937
1937
 
1938
1938
    for (i= 0; i < num_fields; i++)
1939
1939
    {
4869
4869
  Append the result for one field to the dynamic string ds
4870
4870
*/
4871
4871
 
4872
 
static void append_field(DYNAMIC_STRING *ds, uint col_idx, DRIZZLE_FIELD* field,
 
4872
static void append_field(DYNAMIC_STRING *ds, uint col_idx, const DRIZZLE_FIELD* field,
4873
4873
                         const char* val, uint64_t len, bool is_null)
4874
4874
{
4875
4875
  if (col_idx < max_replace_column && replace_column[col_idx])
4908
4908
{
4909
4909
  DRIZZLE_ROW row;
4910
4910
  uint32_t num_fields= drizzle_num_fields(res);
4911
 
  DRIZZLE_FIELD *fields= drizzle_fetch_fields(res);
 
4911
  const DRIZZLE_FIELD *fields= drizzle_fetch_fields(res);
4912
4912
  uint32_t *lengths;
4913
4913
 
4914
4914
  while ((row = drizzle_fetch_row(res)))
4929
4929
*/
4930
4930
 
4931
4931
static void append_metadata(DYNAMIC_STRING *ds,
4932
 
                            DRIZZLE_FIELD *field,
 
4932
                            const DRIZZLE_FIELD *field,
4933
4933
                            uint num_fields)
4934
4934
{
4935
 
  DRIZZLE_FIELD *field_end;
 
4935
  const DRIZZLE_FIELD *field_end;
4936
4936
  dynstr_append(ds,"Catalog\tDatabase\tTable\tTable_alias\tColumn\t"
4937
4937
                "Column_alias\tType\tLength\tMax length\tIs_null\t"
4938
4938
                "Flags\tDecimals\tCharsetnr\n");
5000
5000
*/
5001
5001
 
5002
5002
static void append_table_headings(DYNAMIC_STRING *ds,
5003
 
                                  DRIZZLE_FIELD *field,
 
5003
                                  const DRIZZLE_FIELD *field,
5004
5004
                                  uint num_fields)
5005
5005
{
5006
5006
  uint col_idx;
5125
5125
 
5126
5126
      if (res)
5127
5127
      {
5128
 
  DRIZZLE_FIELD *fields= drizzle_fetch_fields(res);
5129
 
  uint num_fields= drizzle_num_fields(res);
 
5128
        const DRIZZLE_FIELD *fields= drizzle_fetch_fields(res);
 
5129
        uint num_fields= drizzle_num_fields(res);
5130
5130
 
5131
 
  if (display_metadata)
 
5131
        if (display_metadata)
5132
5132
          append_metadata(ds, fields, num_fields);
5133
5133
 
5134
 
  if (!display_result_vertically)
5135
 
    append_table_headings(ds, fields, num_fields);
 
5134
        if (!display_result_vertically)
 
5135
          append_table_headings(ds, fields, num_fields);
5136
5136
 
5137
 
  append_result(ds, res);
 
5137
        append_result(ds, res);
5138
5138
      }
5139
5139
 
5140
5140
      /*