Merge branch 'mysql-8.0' into mysql-8.4

Change-Id: I504b1d86cf1febcd30473c3f2501103f6d026b09

Author: frazerclement

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

@@ -411,3 +411,42 @@ PRIMARY(a) - OrderedIndex
 -- AutoIncrement info
 AutoIncrement: 17
 drop table test.t3;
+Show embedded-metadata behaviour
+sys/def/SYSTAB_0 has no embedded metadata
+-- SYSTAB_0 --
+Version: Any
+Fragment type: HashMapPartition
+K Value: 6
+Min load factor: 78
+Max load factor: 80
+Temporary table: no
+Number of attributes: 2
+Number of primary keys: 1
+Length of frm data: XXX
+Max Rows: 0
+Row Checksum: 1
+Row GCI: 1
+SingleUserMode: 2
+ForceVarPart: 0
+PartitionCount: 8
+FragmentCount: 8
+PartitionBalance: FOR_RP_BY_LDM
+ExtraRowGciBits: 0
+ExtraRowAuthorBits: 0
+TableStatus: Retrieved
+Table options:
+HashMap: DEFAULT-HASHMAP-3840-8
+-- Attributes --
+SYSKEY_0 Unsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
+NEXTID Bigunsigned NOT NULL AT=FIXED ST=MEMORY
+-- Indexes -- 
+PRIMARY KEY(SYSKEY_0) - UniqueHashIndex
+-- Embedded metadata
+Packed len : 0
+
+mysql/def/ndb_apply_status has embedded frm
+include/assert_grep.inc [Version 1 embedded metadata (frm)]
+User table has SDI with creating mysqld version
+create table test.user_tab(a int primary key, b varchar(50) default 'Hello', c blob, d json) engine=ndb;
+include/assert_grep.inc [SDI contains MySQL Server version]
+drop table test.user_tab;

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

@@ -98,3 +98,39 @@ drop table test.t3;
 --disable_query_log
 set ndb_autoincrement_prefetch_sz = @old_ndb_autoincrement_prefetch_sz;
 --enable_query_log
+
+--echo Show embedded-metadata behaviour
+
+--echo sys/def/SYSTAB_0 has no embedded metadata
+--let $ndb_desc_opts= --embedded-metadata -dsys SYSTAB_0
+--source suite/ndb/include/ndb_desc_print.inc
+
+
+--let $OUTPUT_FILE = $MYSQLTEST_VARDIR/tmp/ndb_desc_extra.txt
+
+--echo mysql/def/ndb_apply_status has embedded frm
+--exec $NDB_DESC -m -dmysql ndb_apply_status > $OUTPUT_FILE
+
+--let $assert_text= Version 1 embedded metadata (frm)
+--let $assert_file= $OUTPUT_FILE
+--let $assert_select= Metadata version : 1
+--let $assert_count= 1
+
+--source include/assert_grep.inc
+
+--remove_file $OUTPUT_FILE
+
+--echo User table has SDI with creating mysqld version
+create table test.user_tab(a int primary key, b varchar(50) default 'Hello', c blob, d json) engine=ndb;
+
+--exec $NDB_DESC -m -dtest user_tab > $OUTPUT_FILE
+--let $assert_text= SDI contains MySQL Server version
+--let $assert_file= $OUTPUT_FILE
+--let $assert_select= mysqld_version_id
+--let $assert_count= 1
+
+--source include/assert_grep.inc
+
+--remove_file $OUTPUT_FILE
+
+drop table test.user_tab;

storage/ndb/tools/desc.cpp

@@ -54,6 +54,7 @@ static int _indexinfo = 0;
 static int _nodeinfo = 0;
 static int _autoinc = 0;
 static int _context = 0;
+static int _metadata = 0;
 
 static int _retries = 0;
 
@@ -91,11 +92,15 @@ static struct my_option my_long_options[] = {
  nullptr, GET_BOOL, NO_ARG, 0, 0, 0, nullptr, 0, nullptr},
  {"context", 'x', "Show context information", &_context, nullptr, nullptr,
  GET_BOOL, NO_ARG, 0, 0, 0, nullptr, 0, nullptr},
+ {"embedded-metadata", 'm', "Show embedded metadata", &_metadata, nullptr,
+ nullptr, GET_BOOL, NO_ARG, 0, 0, 0, nullptr, 0, nullptr},
  NdbStdOpt::end_of_options};
 
 static void print_context_info(Ndb *pNdb, NdbDictionary::Table const *pTab);
 static void print_autoinc_info(Ndb *pNdb, NdbDictionary::Table const *pTab);
 static void print_part_info(Ndb *pNdb, NdbDictionary::Table const *pTab);
+static void print_embedded_metadata(Ndb *myndb,
+ NdbDictionary::Table const *pTab);
 
 int main(int argc, char **argv) {
  NDB_INIT(argv[0]);
@@ -334,6 +339,11 @@ int desc_table(Ndb *myndb, char const *name) {
  }
  }
 
+ if (_metadata) {
+ print_embedded_metadata(myndb, pTab);
+ ndbout << endl;
+ }
+
  return 1;
 }
 
@@ -499,3 +509,91 @@ int desc_hashmap(Ndb_cluster_connection &con, Ndb *myndb, char const *name) {
  }
  return 0;
 }
+
+static void print_binary(const void *data, Uint32 len) {
+ const Uint32 digitsPerLine = 8;
+ char readable[digitsPerLine + 1];
+ Uint32 offset = 0;
+ /* Line format
+ * 0x00000000: 0x41 0x42 0x43 0x44 0x45 0x46 0x47 0x48 ABCDEFGH
+ * Offset Bytes as hex Printable chars
+ */
+
+ ndbout << hex << offset << ": ";
+ while (offset < len) {
+ const uint8 digit = ((const uint8 *)data)[offset];
+
+ ndbout << hex << digit << " ";
+
+ readable[offset % digitsPerLine] = isprint(digit) ? digit : ' ';
+
+ offset++;
+
+ if ((offset % digitsPerLine) == 0) {
+ /* End of line */
+ readable[digitsPerLine] = 0;
+ ndbout << " " << readable << endl;
+ if (offset < len) ndbout << hex << offset << ": ";
+ }
+ }
+
+ Uint32 lastLineDigits = offset % digitsPerLine;
+ if (lastLineDigits > 0) {
+ /* Pad out last line */
+ Uint32 padDigits = digitsPerLine - lastLineDigits;
+ for (; padDigits; padDigits--)
+ // 0xHH_
+ ndbout << " ";
+
+ readable[lastLineDigits] = 0;
+ ndbout << " " << readable << endl;
+ }
+
+ ndbout << endl;
+}
+
+static void print_embedded_metadata(Ndb *myndb,
+ NdbDictionary::Table const *pTab) {
+ ndbout << "-- Embedded metadata" << endl;
+
+ const Uint32 packed_len = pTab->getFrmLength();
+
+ ndbout << "Packed len : " << packed_len << endl;
+
+ if (packed_len > 0) {
+ Uint32 metadata_version = 0;
+ void *metadata_ptr = nullptr;
+ Uint32 metadata_len = 0;
+
+ const int res =
+ pTab->getExtraMetadata(metadata_version, &metadata_ptr, &metadata_len);
+
+ if (res == 0) {
+ ndbout << "Metadata version : " << metadata_version << endl;
+ ndbout << "Unpacked length : " << metadata_len << endl;
+
+ bool text = true;
+ for (Uint32 i = 0; i < metadata_len; i++) {
+ if (!isprint(((const char *)metadata_ptr)[i])) {
+ text = false;
+ break;
+ }
+ }
+
+ ndbout << "Metadata begin" << endl;
+ if (!text) {
+ print_binary(metadata_ptr, metadata_len);
+ } else {
+ /* All text, direct print, ensuring null termination */
+ BaseString null_terminated_copy(static_cast<char *>(metadata_ptr),
+ metadata_len);
+ ndbout << null_terminated_copy.c_str() << endl;
+ }
+ ndbout << "Metadata end" << endl;
+
+ free(metadata_ptr);
+ } else {
+ ndbout << "Problem reading : " << res << endl;
+ }
+ }
+}