~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/mysql_priv.h

  • Committer: Monty Taylor
  • Date: 2008-07-29 22:39:18 UTC
  • mfrom: (212.5.36 remove-include-dir)
  • mto: This revision was merged to the branch mainline in revision 236.
  • Revision ID: monty@inaugust.com-20080729223918-yk8ulswu4adh6qpq
MergedĀ inĀ remove-include-dir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
29
29
#ifndef MYSQL_CLIENT
30
30
 
31
31
#include <my_global.h>
32
 
#include <drizzle_version.h>
 
32
#include "version.h"
33
33
#include <mysys/my_sys.h>
34
34
#include <libdrizzle/my_time.h>
35
35
#include <mystrings/m_string.h>
105
105
                               CHARSET_INFO *from_cs,
106
106
                               size_t max_res_length,
107
107
                               CHARSET_INFO *to_cs, size_t *result_length);
108
 
uint kill_one_thread(THD *thd, ulong id, bool only_kill_query);
109
108
void sql_kill(THD *thd, ulong id, bool only_kill_query);
110
109
bool net_request_file(NET* net, const char* fname);
111
110
char* query_table_status(THD *thd,const char *db,const char *table_name);