Merge bb-10.2-compatibility into 10.3

.gitignore

@@ -161,6 +161,8 @@ sql/mysqld
 sql/sql_builtin.cc
 sql/sql_yacc.cc
 sql/sql_yacc.h
+sql/sql_yacc_ora.cc
+sql/sql_yacc_ora.h
 storage/heap/hp_test1
 storage/heap/hp_test2
 storage/maria/aria_chk

cmake/bison.cmake

@@ -50,7 +50,7 @@ MACRO (RUN_BISON input_yy output_cc output_h)
     ADD_CUSTOM_COMMAND(
       OUTPUT ${output_cc}
              ${output_h}
-      COMMAND ${BISON_EXECUTABLE}  -y -p MYSQL 
+      COMMAND ${BISON_EXECUTABLE}  -y
        --output=${output_cc}
        --defines=${output_h}
         ${input_yy}

libmysqld/CMakeLists.txt

@@ -30,6 +30,8 @@ ${SSL_INTERNAL_INCLUDE_DIRS}
 SET(GEN_SOURCES
 ${CMAKE_BINARY_DIR}/sql/sql_yacc.h 
 ${CMAKE_BINARY_DIR}/sql/sql_yacc.cc
+${CMAKE_BINARY_DIR}/sql/sql_yacc_ora.h
+${CMAKE_BINARY_DIR}/sql/sql_yacc_ora.cc
 ${CMAKE_BINARY_DIR}/sql/lex_hash.h 
 )
 

mysql-test/mysql-test-run.pl

@@ -171,6 +171,7 @@ END
     binlog-
     binlog_encryption-
     csv-
+    compat/oracle-
     encryption-
     federated-
     funcs_1-

mysql-test/r/keywords.result

@@ -274,7 +274,7 @@ drop table option;
 set option=1;
 ERROR HY000: Unknown system variable 'option'
 set option option=1;
-ERROR HY000: Unknown system variable 'option'
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'option=1' at line 1
 #
 # MDEV-9979 Keywords UNBOUNDED, PRECEDING, FOLLOWING, TIES, OTHERS should be non-reserved
 #
@@ -331,3 +331,30 @@ DROP TABLE OTHERS;
 #
 CREATE TABLE immediate (immediate int);
 DROP TABLE immediate;
+#
+# MDEV-10142 Pluggable parser
+# Testing keywords that were added into lex.h for Oracle compatibility
+# that are not reserved keywords in MariaDB
+#
+CREATE TABLE clob (clob int);
+DROP TABLE clob;
+CREATE TABLE elsif (elsif INT);
+DROP TABLE elsif;
+CREATE TABLE exception (exception INT);
+DROP TABLE exception;
+CREATE TABLE raw (raw int);
+DROP TABLE raw;
+CREATE TABLE varchar2 (varchar2 int);
+DROP TABLE varchar2;
+CREATE TABLE decode (decode int);
+DROP TABLE decode;
+CREATE TABLE rowcount (rowcount int);
+DROP TABLE rowcount;
+CREATE TABLE isopen (isopen int);
+DROP TABLE isopen;
+CREATE TABLE notfound (notfound int);
+DROP TABLE notfound;
+CREATE TABLE raise (raise int);
+DROP TABLE raise;
+CREATE TABLE reuse (reuse int);
+DROP TABLE reuse;

mysql-test/r/parser.result

@@ -1319,3 +1319,12 @@ t1	CREATE TABLE `t1` (
   UNIQUE KEY `id` (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
+#
+# MDEV-10343 Providing compatibility for basic SQL data types
+#
+CREATE TABLE clob (clob int);
+DROP TABLE clob;
+CREATE TABLE raw (raw int);
+DROP TABLE raw;
+CREATE TABLE varchar2 (varchar2 int);
+DROP TABLE varchar2;

mysql-test/r/sp-error.result

@@ -1504,7 +1504,7 @@ ERROR 42000: FUNCTION inexistent does not exist
 SELECT .inexistent();
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '()' at line 1
 SELECT ..inexistent();
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '.inexistent()' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '..inexistent()' at line 1
 USE test;
 create function f1() returns int
 begin