← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/sql_parse.cc

Removed my_vsnprintf and my_snprintf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_parse.cc
857
857
    if (alloc_query(thd, packet, packet_length))
858
858
      break;                                    // fatal error is set
859
859
    char *packet_end= thd->query + thd->query_length;
860
 
    /* 'b' stands for 'buffer' parameter', special for 'my_snprintf' */
861
860
    const char* end_of_stmt= NULL;
862
861
 
863
862
    general_log_write(thd, command, thd->query, thd->query_length);
1050
1049
    else
1051
1050
      queries_per_second1000= thd->query_id * LL(1000) / uptime;
1052
1051
 
1053
 
    length= my_snprintf((char*) buff, buff_len - 1,
1054
 
                        "Uptime: %lu  Threads: %d  Questions: %lu  "
1055
 
                        "Slow queries: %lu  Opens: %lu  Flush tables: %lu  "
1056
 
                        "Open tables: %u  Queries per second avg: %u.%u",
1057
 
                        uptime,
1058
 
                        (int) thread_count, (ulong) thd->query_id,
1059
 
                        current_global_status_var.long_query_count,
1060
 
                        current_global_status_var.opened_tables,
1061
 
                        refresh_version,
1062
 
                        cached_open_tables(),
1063
 
                        (uint) (queries_per_second1000 / 1000),
1064
 
                        (uint) (queries_per_second1000 % 1000));
 
1052
    length= snprintf((char*) buff, buff_len - 1,
 
1053
                     "Uptime: %lu  Threads: %d  Questions: %lu  "
 
1054
                     "Slow queries: %lu  Opens: %lu  Flush tables: %lu  "
 
1055
                     "Open tables: %u  Queries per second avg: %u.%u",
 
1056
                     uptime,
 
1057
                     (int) thread_count, (ulong) thd->query_id,
 
1058
                     current_global_status_var.long_query_count,
 
1059
                     current_global_status_var.opened_tables,
 
1060
                     refresh_version,
 
1061
                     cached_open_tables(),
 
1062
                     (uint) (queries_per_second1000 / 1000),
 
1063
                     (uint) (queries_per_second1000 % 1000));
1065
1064
    /* Store the buffer in permanent memory */
1066
1065
    my_ok(thd, 0, 0, buff);
1067
1066
    VOID(my_net_write(net, (uchar*) buff, length));