~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzleslap.cc

Committer: Mark Atwood
Date: 2011-08-13 14:57:16 UTC
mfrom: (2385.3.6 rf)
Revision ID: me@mark.atwood.name-20110813145716-u4om752lt4gdpfc7

merge lp:~olafvdspek/drizzle/refactor6

files removed:
drizzled/ctype.cc

files modified:
client/drizzleslap.cc

drizzled/dtcollation.cc

drizzled/dtcollation.h

drizzled/dtoa.cc

drizzled/execute/context.h

drizzled/include.am

drizzled/module/vertex.h

drizzled/module/vertex_handle.h

drizzled/name_resolution_context_state.cc

drizzled/name_resolution_context_state.h

drizzled/named_savepoint.h

drizzled/optimizer/key_field.h

drizzled/plugin/storage_engine.cc

drizzled/session.cc

drizzled/session.h

drizzled/sql_list.h

drizzled/table.h

plugin/myisam/keycache.h

Show diffs side-by-side

added added

removed removed

client/drizzleslap.cc

1259

process_options(void)

1260

{

1261

struct stat sbuf;

1262

uint32_t sql_type_count= 0;

1263

1262

ssize_t bytes_read= 0;

1264

1263

1265

1264

if (user.empty())

1343

1342

option_cleanup(str);

1344

1343

}

1345

1344

1345

uint32_t sql_type_count= 0;

1346

if (not num_blob_cols_opt.empty())

1347

{

1348

OptionString *str;

Older »