Merge branch 'bb-10.1-explain-analyze' of github.com:MariaDB/server into bb-10.1-explain-analyze

mysql-test/r/analyze_format_json.result

@@ -412,7 +412,7 @@ create table t0 (a int);
 INSERT INTO t0 VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 create table t1 (a int);
 INSERT INTO t1 select * from t0;
-analyze format=json (select * from t1 A where a<5) union (select * from t1 B where a in (2,3));
+analyze format=json (select * from t1 tbl1 where a<5) union (select * from t1 tbl2 where a in (2,3));
 ANALYZE
 {
   "query_block": {
@@ -428,7 +428,7 @@ ANALYZE
             "r_loops": 1,
             "r_total_time_ms": "REPLACED",
             "table": {
-              "table_name": "A",
+              "table_name": "tbl1",
               "access_type": "ALL",
               "r_loops": 1,
               "rows": 10,
@@ -436,7 +436,7 @@ ANALYZE
               "r_total_time_ms": "REPLACED",
               "filtered": 100,
               "r_filtered": 50,
-              "attached_condition": "(A.a < 5)"
+              "attached_condition": "(tbl1.a < 5)"
             }
           }
         },
@@ -446,7 +446,7 @@ ANALYZE
             "r_loops": 1,
             "r_total_time_ms": "REPLACED",
             "table": {
-              "table_name": "B",
+              "table_name": "tbl2",
               "access_type": "ALL",
               "r_loops": 1,
               "rows": 10,
@@ -454,7 +454,7 @@ ANALYZE
               "r_total_time_ms": "REPLACED",
               "filtered": 100,
               "r_filtered": 20,
-              "attached_condition": "(B.a in (2,3))"
+              "attached_condition": "(tbl2.a in (2,3))"
             }
           }
         }

mysql-test/r/log_tables.result

@@ -542,7 +542,8 @@ CREATE TABLE `db_17876.slow_log_data` (
 `insert_id` int(11) default NULL,
 `server_id` int(11) default NULL,
 `sql_text` mediumtext,
-`thread_id` bigint(21) unsigned default NULL
+`thread_id` bigint(21) unsigned default NULL,
+`rows_affected` int(11) default NULL
 );
 CREATE TABLE `db_17876.general_log_data` (
 `event_time` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,

mysql-test/t/analyze_format_json.test

@@ -145,7 +145,7 @@ create table t1 (a int);
 INSERT INTO t1 select * from t0;
 
 --replace_regex /"r_total_time_ms": [0-9]*[.]?[0-9]*/"r_total_time_ms": "REPLACED"/
-analyze format=json (select * from t1 A where a<5) union (select * from t1 B where a in (2,3));
+analyze format=json (select * from t1 tbl1 where a<5) union (select * from t1 tbl2 where a in (2,3));
 
 drop table t0, t1;
 

mysql-test/t/log_tables.test

@@ -727,7 +727,8 @@ CREATE TABLE `db_17876.slow_log_data` (
   `insert_id` int(11) default NULL,
   `server_id` int(11) default NULL,
   `sql_text` mediumtext,
-  `thread_id` bigint(21) unsigned default NULL
+  `thread_id` bigint(21) unsigned default NULL,
+  `rows_affected` int(11) default NULL
 );
 
 CREATE TABLE `db_17876.general_log_data` (

storage/innobase/include/buf0buf.ic

@@ -275,13 +275,6 @@ buf_page_set_state(
 	}
 #endif /* UNIV_DEBUG */
 	bpage->state = state;
-#ifdef UNIV_DEBUG
-	if( buf_page_get_state(bpage) != state) {
-		fprintf(stderr, "InnoDB: Error: Requested state %d current state %d old_state %d\n",
-			state, buf_page_get_state(bpage), old_state);
-	}
-#endif
-	ut_ad(buf_page_get_state(bpage) == state);
 }
 
 /*********************************************************************//**

storage/xtradb/include/buf0buf.ic

@@ -279,13 +279,6 @@ buf_page_set_state(
 #endif /* UNIV_DEBUG */
 
 	bpage->state = state;
-#ifdef UNIV_DEBUG
-	if( buf_page_get_state(bpage) != state) {
-		fprintf(stderr, "InnoDB: Error: Requested state %d current state %d old_state %d\n",
-			state, buf_page_get_state(bpage), old_state);
-	}
-#endif
-	ut_ad(buf_page_get_state(bpage) == state);
 }
 
 /*********************************************************************//**