mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-27 01:18:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Data type plugins - minor fixes

Browse source 
typos, comments
This commit is contained in:
Sergei Golubchik 2019-10-10 17:40:21 +02:00
parent 82b62924d7
commit 779978217c
12 changed files with 28 additions and 20 deletions

1
mysql-test/mysql-test-run.pl
View file

@ -203,7 +203,6 @@ my @DEFAULT_SUITES= qw(
rpl-
sys_vars-
sql_sequence-
type_inet-
unit-
vcol-
versioning-

5
plugin/func_test/plugin.cc
View file

@ -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

2
plugin/locale_info/locale_info.cc
View file

@ -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 */

4
plugin/type_geom/plugin.cc
View file

@ -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

2
plugin/type_inet/CMakeLists.txt
View file

@ -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

9
plugin/type_inet/mysql-test/type_inet/suite.pm Normal file
View file

@ -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 { };

4
plugin/type_inet/plugin.cc
View file

@ -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

2
plugin/type_test/CMakeLists.txt
View file

@ -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

4
plugin/type_test/mysql-test/type_test/type_test_double-debug.test
View file

@ -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;

4
plugin/type_test/mysql-test/type_test/type_test_int8-debug.test
View file

@ -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;

4
plugin/type_test/mysql-test/type_test/type_test_mysql.test
View file

@ -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;

7
plugin/type_test/plugin.cc
View file

@ -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