Merge ../mysql-5.6-cluster-7.3 into mysql-5.6-cluster-7.4

Author: frazerclement

mysql-test/suite/ndb/r/ndbinfo.result

@@ -238,6 +238,15 @@ SELECT count(*) >= 20 FROM blocks;
 count(*) >= 20
 1
 
+show create table ndb$test;
+Table	Create Table
+ndb$test	CREATE TABLE `ndb$test` (
+  `node_id` int(10) unsigned DEFAULT NULL,
+  `block_number` int(10) unsigned DEFAULT NULL,
+  `block_instance` int(10) unsigned DEFAULT NULL,
+  `counter` int(10) unsigned DEFAULT NULL,
+  `counter2` bigint(20) unsigned DEFAULT NULL
+) ENGINE=NDBINFO DEFAULT CHARSET=latin1 COMMENT='for testing'
 ## 1) More columns in NDB -> allowed, with warning
 DROP TABLE ndb$test;
 CREATE TABLE ndb$test (node_id int unsigned) ENGINE = ndbinfo;
@@ -354,6 +363,15 @@ ERROR 42000: The used table type doesn't support BLOB/TEXT columns
 CREATE TABLE ndb$test (node_id int AUTO_INCREMENT) ENGINE = ndbinfo;
 ERROR 42000: The used table type doesn't support AUTO_INCREMENT columns
 
+## Restore original allowing repeated test execution
+CREATE TABLE `ndb$test` (
+  `node_id` int unsigned DEFAULT NULL,
+  `block_number` int unsigned DEFAULT NULL,
+  `block_instance` int unsigned DEFAULT NULL,
+  `counter` int unsigned DEFAULT NULL,
+  `counter2` bigint unsigned DEFAULT NULL
+) ENGINE=NDBINFO COMMENT='for testing';
+
 select distinct node_id
 from ndbinfo.diskpagebuffer;
 node_id
@@ -706,6 +724,54 @@ select table_schema, table_name, definer from information_schema.views
         definer != 'root@localhost';
 table_schema	table_name	definer
 
+set @@optimizer_switch='block_nested_loop=off';
+
+select @a:=0;
+
+select
+  @a:=@a+1,
+  a.node_id, b.node_id,
+  a.block_name, b.block_name,
+  a.block_instance, b.block_instance,
+  a.counter_id, b.counter_id,
+  a.counter_name, b.counter_name,
+  a.val, b.val
+from
+  ndbinfo.counters a join
+  ndbinfo.counters b
+on
+  a.node_id = b.node_id;
+
+select @b:=0;
+
+select
+  @b:=@b+1,
+  a.node_id, b.node_id,
+  a.block_name, b.block_name,
+  a.block_instance, b.block_instance,
+  a.counter_id, b.counter_id,
+  a.counter_name, b.counter_name,
+  a.val, b.val
+from
+  ndbinfo.counters a join
+  ndbinfo.counters b
+on
+  a.node_id = b.node_id;
+
+Expect both joins to give same row count
+(0 diff)
+select @a - @b;
+@a - @b
+0
+
+create temporary table old_count
+       select counter_name, sum(val) as val
+       from ndbinfo.counters
+       where block_name='DBSPJ'
+       group by counter_name;
+drop table old_count;
+set @@optimizer_switch=default;
+
 create table numbers(
   i int
 );

mysql-test/suite/ndb/t/ndbinfo.test

@@ -103,6 +103,7 @@ SELECT count(*) >= 20 FROM blocks;
 
 # Test incompatible table definition between NDB and MySQL Server
 # using the ndb$test table which originally looks like
+show create table ndb$test;
 # CREATE TABLE `ndb$test` (
 #   `node_id` int unsigned DEFAULT NULL,
 #   `block_number` int unsigned DEFAULT NULL,
@@ -189,6 +190,15 @@ CREATE TABLE ndb$test (node_id int, block_number blob) ENGINE = ndbinfo;
 --error ER_TABLE_CANT_HANDLE_AUTO_INCREMENT
 CREATE TABLE ndb$test (node_id int AUTO_INCREMENT) ENGINE = ndbinfo;
 
+## Restore original allowing repeated test execution
+CREATE TABLE `ndb$test` (
+  `node_id` int unsigned DEFAULT NULL,
+  `block_number` int unsigned DEFAULT NULL,
+  `block_instance` int unsigned DEFAULT NULL,
+  `counter` int unsigned DEFAULT NULL,
+  `counter2` bigint unsigned DEFAULT NULL
+) ENGINE=NDBINFO COMMENT='for testing';
+
 # wl#5567 - exercise table...
 #   only node_id is guranteed to be same...
 #   (unless we change cluster config for test)
@@ -316,6 +326,66 @@ select table_schema, table_name, definer from information_schema.views
   where table_schema = 'ndbinfo' and
         definer != 'root@localhost';
 
+
+#
+# Test buffered joining
+#
+# BUG#20075747 RND_INIT() ON AN OPEN SCAN IS USED TO REPOSITION THE CURSOR
+# - rnd_init() on an open scan is used to reposition the "cursor"
+#   back to first row
+#
+set @@optimizer_switch='block_nested_loop=off';
+
+
+--disable_result_log
+
+select @a:=0;
+
+select
+  @a:=@a+1,
+  a.node_id, b.node_id,
+  a.block_name, b.block_name,
+  a.block_instance, b.block_instance,
+  a.counter_id, b.counter_id,
+  a.counter_name, b.counter_name,
+  a.val, b.val
+from
+  ndbinfo.counters a join
+  ndbinfo.counters b
+on
+  a.node_id = b.node_id;
+
+select @b:=0;
+
+select
+  @b:=@b+1,
+  a.node_id, b.node_id,
+  a.block_name, b.block_name,
+  a.block_instance, b.block_instance,
+  a.counter_id, b.counter_id,
+  a.counter_name, b.counter_name,
+  a.val, b.val
+from
+  ndbinfo.counters a join
+  ndbinfo.counters b
+on
+  a.node_id = b.node_id;
+
+--enable_result_log
+
+--echo Expect both joins to give same row count
+--echo (0 diff)
+select @a - @b;
+
+
+create temporary table old_count
+       select counter_name, sum(val) as val
+       from ndbinfo.counters
+       where block_name='DBSPJ'
+       group by counter_name;
+drop table old_count;
+set @@optimizer_switch=default;
+
 # ################################
 # Test memory_per_fragment table.
 # ################################
@@ -682,4 +752,5 @@ drop view frag_ops;
 drop table t1;
 drop table t2;
 
+
 --source ndbinfo_drop.inc

sql/ha_ndbinfo.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -475,6 +475,33 @@ int ha_ndbinfo::rnd_init(bool scan)
   }
 
   assert(is_open());
+
+  if (m_impl.m_scan_op)
+  {
+    /*
+      It should be impossible to come here with an already open
+      scan, assumption is that rnd_end() would be called to indicate
+      that the previous scan should be closed or perhaps like it says
+      in decsription of rnd_init() that it "may be called two times". Once
+      to open the cursor and once to position te cursor at first row.
+
+      Unfortunately the assumption and description of rnd_init() is not
+      correct. The rnd_init function is used on an open scan to reposition
+      it back to first row. For ha_ndbinfo this means closing
+      the scan and letting it be reopened.
+    */
+    assert(scan); // "only makes sense if scan=1" (from rnd_init() description)
+
+    DBUG_PRINT("info", ("Closing scan to position it back to first row"));
+
+    // Release the scan operation
+    g_ndbinfo->releaseScanOperation(m_impl.m_scan_op);
+    m_impl.m_scan_op = NULL;
+
+    // Release pointers to the columns
+    m_impl.m_columns.clear();
+  }
+
   assert(m_impl.m_scan_op == NULL); // No scan already ongoing
 
   if (m_impl.m_first_use)