← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_udf.cc

Giant merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_udf.cc
25
25
#endif
26
26
 
27
27
#include "mysql_priv.h"
28
 
#include <my_pthread.h>
 
28
#include <mysys/my_pthread.h>
29
29
 
30
30
extern "C"
31
31
{
32
32
#include <stdarg.h>
33
 
#include <hash.h>
 
33
#include <mysys/hash.h>
34
34
}
35
35
 
36
36
static bool udf_startup= false; /* We do not lock because startup is single threaded */