← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

  • Committer: Monty Taylor
  • Date: 2008-07-23 23:51:18 UTC
  • mto: (202.1.22 codestyle)
  • mto: This revision was merged to the branch mainline in revision 212.
  • Revision ID: monty@inaugust.com-20080723235118-i1egav1qeazuljs6
Merged mysql_server_init into drizzle_create()

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzletest.cc
126
126
 
127
127
static CHARSET_INFO *charset_info= &my_charset_latin1; /* Default charset */
128
128
 
129
 
static const char *embedded_server_groups[]=
130
 
{
131
 
  "server",
132
 
  "embedded",
133
 
  "mysqltest_SERVER",
134
 
  NullS
135
 
};
136
 
 
137
129
static int embedded_server_arg_count=0;
138
130
static char *embedded_server_args[MAX_EMBEDDED_SERVER_ARGS];
139
131
 
5655
5647
  init_dynamic_string(&ds_warning_messages, "", 0, 2048);
5656
5648
  parse_args(argc, argv);
5657
5649
 
5658
 
  if (mysql_server_init(embedded_server_arg_count,
5659
 
                        embedded_server_args,
5660
 
                        (char**) embedded_server_groups))
5661
 
    die("Can't initialize MySQL server");
5662
5650
  server_initialized= 1;
5663
5651
  if (cur_file == file_stack && cur_file->file == 0)
5664
5652
  {