Data type plugins - minor fixes

typos, comments

11 files changed, 28 insertions, 19 deletions

diff --git a/plugin/func_test/plugin.cc b/plugin/func_test/plugin.cc
index 2da1feca24e..811189773f1 100644
--- a/plugin/func_test/plugin.cc
+++ b/plugin/func_test/plugin.cc
@@ -1,6 +1,5 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates.
-   Copyright (c) 2009, 2019, MariaDB
+   Copyright (c) 2019, MariaDB Corporation
 
    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
@@ -79,7 +78,7 @@ maria_declare_plugin(type_test)
   PLUGIN_LICENSE_GPL,           // the plugin license (see include/mysql/plugin.h)
   0,                            // Pointer to plugin initialization function
   0,                            // Pointer to plugin deinitialization function
-  0x0100,                       // Numeric version 0xAABB means AA.BB veriosn
+  0x0100,                       // Numeric version 0xAABB means AA.BB version
   NULL,                         // Status variables
   NULL,                         // System variables
   "1.0",                        // String version representation
diff --git a/plugin/locale_info/locale_info.cc b/plugin/locale_info/locale_info.cc
index 2685552d4ae..fe7d8dc9faa 100644
--- a/plugin/locale_info/locale_info.cc
+++ b/plugin/locale_info/locale_info.cc
@@ -118,7 +118,7 @@ maria_declare_plugin(locales)
   PLUGIN_LICENSE_BSD,      	             	/* the plugin license (see include/mysql/plugin.h) */
   locale_info_plugin_init_locales,          	/* Pointer to plugin initialization function */
   0,            	                        /* Pointer to plugin deinitialization function */
-  0x0100, 	                             	/* Numeric version 0xAABB means AA.BB veriosn */
+  0x0100, 	                             	/* Numeric version 0xAABB means AA.BB version */
   NULL,                                 	/* Status variables */
   NULL,                                 	/* System variables */
   "1.0",                                	/* String version representation */
diff --git a/plugin/type_geom/plugin.cc b/plugin/type_geom/plugin.cc
index aa2f9255f17..0f4dccc6a06 100644
--- a/plugin/type_geom/plugin.cc
+++ b/plugin/type_geom/plugin.cc
@@ -230,7 +230,7 @@ maria_declare_plugin(type_geom)
   PLUGIN_LICENSE_GPL,                // the plugin license (see include/mysql/plugin.h)
   Show::plugin_init_spatial_ref_sys, // Pointer to plugin initialization function
   0,                                 // Pointer to plugin deinitialization function
-  0x0100,                            // Numeric version 0xAABB means AA.BB veriosn
+  0x0100,                            // Numeric version 0xAABB means AA.BB version
   NULL,                              // Status variables
   NULL,                              // System variables
   "1.0",                             // String version representation
@@ -245,7 +245,7 @@ maria_declare_plugin(type_geom)
   PLUGIN_LICENSE_GPL,                // the plugin license (see include/mysql/plugin.h)
   Show::plugin_init_geometry_columns,// Pointer to plugin initialization function
   0,                                 // Pointer to plugin deinitialization function
-  0x0100,                            // Numeric version 0xAABB means AA.BB veriosn
+  0x0100,                            // Numeric version 0xAABB means AA.BB version
   NULL,                              // Status variables
   NULL,                              // System variables
   "1.0",                             // String version representation
diff --git a/plugin/type_inet/CMakeLists.txt b/plugin/type_inet/CMakeLists.txt
index d2a9d9f5fb0..0040ceec256 100644
--- a/plugin/type_inet/CMakeLists.txt
+++ b/plugin/type_inet/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2019, MariaDB corporation. All rights reserved.
+# Copyright (c) 2019, MariaDB corporation.
 # 
 # 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
diff --git a/plugin/type_inet/mysql-test/type_inet/suite.pm b/plugin/type_inet/mysql-test/type_inet/suite.pm
new file mode 100644
index 00000000000..5893fcb78cc
--- /dev/null
+++ b/plugin/type_inet/mysql-test/type_inet/suite.pm
@@ -0,0 +1,9 @@
+package My::Suite::Type_inet;
+
+@ISA = qw(My::Suite);
+
+#return "No inet6 plugin" unless $::mysqld_variables{'inet6'} eq "ON";
+
+sub is_default { 1 }
+
+bless { };
diff --git a/plugin/type_inet/plugin.cc b/plugin/type_inet/plugin.cc
index f2fa7ea74af..4c8f299a0c7 100644
--- a/plugin/type_inet/plugin.cc
+++ b/plugin/type_inet/plugin.cc
@@ -1,6 +1,4 @@
-/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-   Copyright (c) 2014 MariaDB Foundation
-   Copyright (c) 2019 MariaDB Corporation
+/* Copyright (c) 2019 MariaDB Corporation
 
    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
diff --git a/plugin/type_test/CMakeLists.txt b/plugin/type_test/CMakeLists.txt
index b85168d1bd2..132458cb719 100644
--- a/plugin/type_test/CMakeLists.txt
+++ b/plugin/type_test/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2016, MariaDB corporation. All rights reserved.
+# Copyright (c) 2019, MariaDB corporation
 # 
 # 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
diff --git a/plugin/type_test/mysql-test/type_test/type_test_double-debug.test b/plugin/type_test/mysql-test/type_test/type_test_double-debug.test
index e275d8222d7..ee5cf430cfe 100644
--- a/plugin/type_test/mysql-test/type_test/type_test_double-debug.test
+++ b/plugin/type_test/mysql-test/type_test/type_test_double-debug.test
@@ -9,11 +9,11 @@
 
 SET @old_debug_dbug=@@debug_dbug;
 SET @@debug_dbug="+d,frm_data_type_info";
---disable_ps_protocol
 CREATE TABLE t1 (a TEST_DOUBLE);
+--enable_prepare_warnings
 SHOW CREATE TABLE t1;
+--disable_prepare_warnings
 DROP TABLE t1;
---enable_ps_protocol
 SET @@debug_dbug=@old_debug_dbug;
 
 
diff --git a/plugin/type_test/mysql-test/type_test/type_test_int8-debug.test b/plugin/type_test/mysql-test/type_test/type_test_int8-debug.test
index 131a500ba29..7e60bf3efd1 100644
--- a/plugin/type_test/mysql-test/type_test/type_test_int8-debug.test
+++ b/plugin/type_test/mysql-test/type_test/type_test_int8-debug.test
@@ -9,11 +9,11 @@
 
 SET @old_debug_dbug=@@debug_dbug;
 SET @@debug_dbug="+d,frm_data_type_info";
---disable_ps_protocol
 CREATE TABLE t1 (a TEST_INT8);
+--enable_prepare_warnings
 SHOW CREATE TABLE t1;
+--disable_prepare_warnings
 DROP TABLE t1;
---enable_ps_protocol
 SET @@debug_dbug=@old_debug_dbug;
 
 
diff --git a/plugin/type_test/mysql-test/type_test/type_test_mysql.test b/plugin/type_test/mysql-test/type_test/type_test_mysql.test
index 95fafe67fb1..93a0e08eab3 100644
--- a/plugin/type_test/mysql-test/type_test/type_test_mysql.test
+++ b/plugin/type_test/mysql-test/type_test/type_test_mysql.test
@@ -2,5 +2,9 @@
 -- source include/not_embedded.inc
 
 CREATE TABLE t1 (a TEST_INT8, b TEST_DOUBLE);
+#
+# doesn't report the correct type name yet
+# to be fixed
+#
 --exec $MYSQL -t test --column-type-info -e "SELECT * FROM t1" 2>&1 
 DROP TABLE t1;
diff --git a/plugin/type_test/plugin.cc b/plugin/type_test/plugin.cc
index efc5627cade..a519c197835 100644
--- a/plugin/type_test/plugin.cc
+++ b/plugin/type_test/plugin.cc
@@ -1,6 +1,5 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates.
-   Copyright (c) 2009, 2019, MariaDB
+   Copyright (c) 2019, MariaDB Corporation
 
    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
@@ -309,7 +308,7 @@ maria_declare_plugin(type_test)
   PLUGIN_LICENSE_GPL,           // the plugin license (see include/mysql/plugin.h)
   0,                            // Pointer to plugin initialization function
   0,                            // Pointer to plugin deinitialization function
-  0x0100,                       // Numeric version 0xAABB means AA.BB veriosn
+  0x0100,                       // Numeric version 0xAABB means AA.BB version
   NULL,                         // Status variables
   NULL,                         // System variables
   "1.0",                        // String version representation
@@ -324,7 +323,7 @@ maria_declare_plugin(type_test)
   PLUGIN_LICENSE_GPL,           // the plugin license (see include/mysql/plugin.h)
   0,                            // Pointer to plugin initialization function
   0,                            // Pointer to plugin deinitialization function
-  0x0100,                       // Numeric version 0xAABB means AA.BB veriosn
+  0x0100,                       // Numeric version 0xAABB means AA.BB version
   NULL,                         // Status variables
   NULL,                         // System variables
   "1.0",                        // String version representation