Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3

MariaDB · Apr 8, 2017 · 48319b0 · 48319b0
2 parents 329946c + 099e87e
commit 48319b0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/mysql-test/suite/funcs_1/r/myisam_views-big.result b/mysql-test/suite/funcs_1/r/myisam_views-big.result
@@ -4784,7 +4784,7 @@ CREATE VIEW      v2 AS Select * from test.v1;
 ERROR 42S02: Table 'test.v1' doesn't exist
 DROP VIEW IF EXISTS v2;
 Warnings:
-Note	1051	Unknown table 'test.v2'
+Note	4067	Unknown VIEW: 'test.v2'
 
 Testcase 3.3.1.25 
 --------------------------------------------------------------------------------
@@ -8387,7 +8387,7 @@ Call sp1() ;
 ERROR 42000: PROCEDURE test.sp1 does not exist
 Drop view if exists test.v1 ;
 Warnings:
-Note	1051	Unknown table 'test.v1'
+Note	4067	Unknown VIEW: 'test.v1'
 Drop procedure sp1 ;
 ERROR 42000: PROCEDURE test.sp1 does not exist
 
@@ -22984,12 +22984,12 @@ CREATE TABLE t1 ( f1 VARCHAR(1000) ) ENGINE = myisam ;
 CREATE VIEW  v1 AS SELECT f1 FROM t1;
 DROP VIEW v1;
 DROP VIEW v1;
-ERROR 42S02: Unknown table 'test.v1'
+ERROR 42S02: Unknown VIEW: 'test.v1'
 CREATE VIEW  v1 AS SELECT f1 FROM t1;
 DROP VIEW IF EXISTS v1;
 DROP VIEW IF EXISTS v1;
 Warnings:
-Note	1051	Unknown table 'test.v1'
+Note	4067	Unknown VIEW: 'test.v1'
 
 Testcase 3.3.1.68 
 --------------------------------------------------------------------------------
@@ -23001,31 +23001,31 @@ CREATE VIEW  v1_base AS SELECT * FROM t1;
 CREATE VIEW  v1_top AS SELECT * FROM v1_base;
 DROP VIEW v1_top  ;
 DROP VIEW v1_top;
-ERROR 42S02: Unknown table 'test.v1_top'
+ERROR 42S02: Unknown VIEW: 'test.v1_top'
 CREATE VIEW  v1_top AS SELECT * FROM v1_base;
 DROP VIEW v1_base  ;
 DROP VIEW v1_base;
-ERROR 42S02: Unknown table 'test.v1_base'
+ERROR 42S02: Unknown VIEW: 'test.v1_base'
 DROP VIEW v1_top;
 CREATE VIEW  v1_base AS SELECT * FROM t1;
 CREATE VIEW  v1_top AS SELECT * FROM v1_base;
 DROP VIEW v1_top CASCADE ;
 DROP VIEW v1_top;
-ERROR 42S02: Unknown table 'test.v1_top'
+ERROR 42S02: Unknown VIEW: 'test.v1_top'
 CREATE VIEW  v1_top AS SELECT * FROM v1_base;
 DROP VIEW v1_base CASCADE ;
 DROP VIEW v1_base;
-ERROR 42S02: Unknown table 'test.v1_base'
+ERROR 42S02: Unknown VIEW: 'test.v1_base'
 DROP VIEW v1_top;
 CREATE VIEW  v1_base AS SELECT * FROM t1;
 CREATE VIEW  v1_top AS SELECT * FROM v1_base;
 DROP VIEW v1_top RESTRICT ;
 DROP VIEW v1_top;
-ERROR 42S02: Unknown table 'test.v1_top'
+ERROR 42S02: Unknown VIEW: 'test.v1_top'
 CREATE VIEW  v1_top AS SELECT * FROM v1_base;
 DROP VIEW v1_base RESTRICT ;
 DROP VIEW v1_base;
-ERROR 42S02: Unknown table 'test.v1_base'
+ERROR 42S02: Unknown VIEW: 'test.v1_base'
 DROP VIEW v1_top;
 
 Testcase 3.3.1.69, 3.3.1.70, 3.3.1.A5 

diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
@@ -2909,9 +2909,9 @@ READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_STATEMENT_CLASSES
 SESSION_VALUE	NULL
-GLOBAL_VALUE	187
+GLOBAL_VALUE	189
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	187
+DEFAULT_VALUE	189
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
 VARIABLE_COMMENT	Maximum number of statement instruments.

diff --git a/storage/rocksdb/rdb_datadic.cc b/storage/rocksdb/rdb_datadic.cc
@@ -1303,7 +1303,7 @@ static int rdb_unpack_floating_point(
   // On little-endian, swap the bytes around
   swap_func(dst, tmp);
 #else
-  static_assert(swap_func == nullptr, "Assuming that no swapping is needed.");
+  DBUG_ASSERT(swap_func == nullptr);
 #endif
 
   return UNPACK_SUCCESS;