← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzleslap.cc

Fix merge issues with 1.0 CC fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzleslap.cc
72
72
*/
73
73
 
74
74
#include <config.h>
75
 
#include "client_priv.h"
 
75
#include "client/client_priv.h"
76
76
 
77
 
#include "option_string.h"
78
 
#include "stats.h"
79
 
#include "thread_context.h"
80
 
#include "conclusions.h"
81
 
#include "wakeup.h"
 
77
#include "client/option_string.h"
 
78
#include "client/stats.h"
 
79
#include "client/thread_context.h"
 
80
#include "client/conclusions.h"
 
81
#include "client/wakeup.h"
82
82
 
83
83
#include <signal.h>
84
84
#include <stdarg.h>