DEV-10583 sql_mode=ORACLE: SQL%ROWCOUNT

Fixed that EXPLAIN EXTENDED erroneously returned "SQL%%ROWCOUNT" instead of "SQL%ROWCOUNT"
MariaDB · Apr 5, 2017 · 4bb8799 · 4bb8799
1 parent a2a196c
commit 4bb8799
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mysql-test/suite/compat/oracle/r/sp.result b/mysql-test/suite/compat/oracle/r/sp.result
@@ -1073,7 +1073,7 @@ EXPLAIN EXTENDED SELECT sql%rowcount;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
-Note	1003	select SQL%%ROWCOUNT AS "sql%rowcount"
+Note	1003	select SQL%ROWCOUNT AS "sql%rowcount"
 CREATE TABLE t1 AS SELECT SQL%ROWCOUNT;
 SHOW CREATE TABLE t1;
 Table	Create Table

diff --git a/sql/item_func.h b/sql/item_func.h
@@ -2604,7 +2604,7 @@ class Item_func_oracle_sql_rowcount :public Item_int_func
 public:
   Item_func_oracle_sql_rowcount(THD *thd): Item_int_func(thd) {}
   longlong val_int();
-  const char *func_name() const { return "SQL%%ROWCOUNT"; }
+  const char *func_name() const { return "SQL%ROWCOUNT"; }
   void print(String *str, enum_query_type query_type)
   {
     str->append(func_name());