Merge branch 'develop-1.1' into 1.1-merge-up-20180817

dbcon/ddlpackage/CMakeLists.txt

@@ -1,4 +1,3 @@
-
 INCLUDE_DIRECTORIES( ${ENGINE_COMMON_INCLUDES} )
 
 ADD_CUSTOM_COMMAND(
@@ -13,7 +12,7 @@ ADD_CUSTOM_TARGET(ddl-lexer DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ddl-scan.cpp)
 ADD_CUSTOM_TARGET(ddl-parser DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ddl-gram.cpp)
 # Parser puts extra info to stderr.
 INCLUDE(../../check_compiler_flag.cmake)
-MY_CHECK_AND_SET_COMPILER_FLAG("-DYYDEBUG" DEBUG)
+MY_CHECK_AND_SET_COMPILER_FLAG("-DYYDEBUG=1" DEBUG)
 
 ########### next target ###############
 

dbcon/ddlpackage/ddl.l

@@ -33,6 +33,9 @@
 
 using namespace ddlpackage;
 typedef enum { NOOP, STRIP_QUOTES } copy_action_t;
+#if YYDEBUG == 0
+int ddldebug = 0;
+#endif
 int lineno = 1;
 void ddlerror(struct pass_to_bison* x, char const *s);
 

dbcon/ddlpackage/ddl.y

@@ -63,7 +63,6 @@ char* copy_string(const char *str);
 %pure-parser
 %lex-param {void * scanner}
 %parse-param {struct ddlpackage::pass_to_bison * x}
-%debug
 
  /* Bison uses this to generate a C union definition.  This is used to
 	store the application created values associated with syntactic