Drizzle

1	=== modified file 'drizzled/execute/scanner.l'
2	--- drizzled/execute/scanner.l 2012-04-22 00:50:10 +0000
3	+++ drizzled/execute/scanner.l 2012-08-19 13:33:23 +0000
4	@@ -40,6 +40,7 @@
5	%top{
6
7	#include <config.h>
8	+#include <unistd.h>
9	#include <drizzled/execute/parser.h>
10	#include <drizzled/execute/context.h>
11	#include <drizzled/execute/symbol.h>
12
13	=== modified file 'plugin/rabbitmq/rabbitmq_handler.cc'
14	--- plugin/rabbitmq/rabbitmq_handler.cc 2011-04-01 19:31:01 +0000
15	+++ plugin/rabbitmq/rabbitmq_handler.cc 2012-08-19 13:33:23 +0000
16	@@ -22,8 +22,11 @@
17	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18	*/
19
20	+
21	#include <config.h>
22
23	+#include <unistd.h>
24	+
25	#include <drizzled/gettext.h>
26
27	#include "rabbitmq_handler.h"

Merge lp:~tobi-coldtobi/drizzle/trunk-bug-1038658 into lp:drizzle