MCOL-66 - Make the DDL and DML parsers re-entrant.

Serialize all DDL because the VVS can't handle modifying the same block simultaneously
Fix the CTRL+C logic in DML that caused COMMIT issues.

dbcon/dmlpackage/dmlparser.h

@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 MariaDB Corporation
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -35,9 +36,20 @@ namespace dmlpackage
 	
     typedef SqlStatementList ParseTree;
 
-    /** @brief BISON parser wrapper class
-     */
-    class DMLParser
+	// instance data for the parser
+	typedef std::vector<char*> valbuf_t;
+
+	struct scan_data
+	{
+		/* Handles to the buffer that the lexer uses internally */
+		char* scanbuf;
+		void* scanbufhandle; // This is a YY_BUFFER_STATE defined in ddl-scan.cpp
+		valbuf_t valbuf;
+	};
+
+	/** @brief BISON parser wrapper class
+	 */
+	class DMLParser
     {
         public:
             /** @brief ctor
@@ -73,6 +85,8 @@ namespace dmlpackage
             ParseTree fParseTree;
             int fStatus;
             bool fDebug;
+			void* scanner;   // yyscan_t * needed for re-entrant flex scanner
+			scan_data scanData;
 
         private: