Skip to content

Commit 156ff40

Browse files
author
Bogdan Degtyariov
committed
Removed obsolete options NO_SCHEMA, DISABLE_SSL_DEFAULT and SSL_ENFORCE
1 parent a70da5f commit 156ff40

10 files changed

+288
-385
lines changed

‎driver/connect.cc

+27-40
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
// Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
2-
//
3-
// This program is free software; you can redistribute it and/or modify
4-
// it under the terms of the GNU General Public License, version 2.0, as
5-
// published by the Free Software Foundation.
6-
//
7-
// This program is also distributed with certain software (including
8-
// but not limited to OpenSSL) that is licensed under separate terms,
9-
// as designated in a particular file or component or in included license
10-
// documentation. The authors of MySQL hereby grant you an
11-
// additional permission to link the program and your derivative works
12-
// with the separately licensed software that they have included with
13-
// MySQL.
14-
//
15-
// Without limiting anything contained in the foregoing, this file,
16-
// which is part of MySQL Connector/ODBC, is also subject to the
17-
// Universal FOSS Exception, version 1.0, a copy of which can be found at
18-
// http://oss.oracle.com/licenses/universal-foss-exception.
19-
//
20-
// This program is distributed in the hope that it will be useful, but
21-
// WITHOUT ANY WARRANTY; without even the implied warranty of
22-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
23-
// See the GNU General Public License, version 2.0, for more details.
24-
//
25-
// You should have received a copy of the GNU General Public License
26-
// along with this program; if not, write to the Free Software Foundation, Inc.,
27-
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1+
// Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
2+
//
3+
// This program is free software; you can redistribute it and/or modify
4+
// it under the terms of the GNU General Public License, version 2.0, as
5+
// published by the Free Software Foundation.
6+
//
7+
// This program is also distributed with certain software (including
8+
// but not limited to OpenSSL) that is licensed under separate terms,
9+
// as designated in a particular file or component or in included license
10+
// documentation. The authors of MySQL hereby grant you an
11+
// additional permission to link the program and your derivative works
12+
// with the separately licensed software that they have included with
13+
// MySQL.
14+
//
15+
// Without limiting anything contained in the foregoing, this file,
16+
// which is part of MySQL Connector/ODBC, is also subject to the
17+
// Universal FOSS Exception, version 1.0, a copy of which can be found at
18+
// http://oss.oracle.com/licenses/universal-foss-exception.
19+
//
20+
// This program is distributed in the hope that it will be useful, but
21+
// WITHOUT ANY WARRANTY; without even the implied warranty of
22+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
23+
// See the GNU General Public License, version 2.0, for more details.
24+
//
25+
// You should have received a copy of the GNU General Public License
26+
// along with this program; if not, write to the Free Software Foundation, Inc.,
27+
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2828

2929
/**
3030
@file connect.c
@@ -336,19 +336,6 @@ SQLRETURN myodbc_do_connect(DBC *dbc, DataSource *ds)
336336
}
337337
#endif
338338

339-
#if (MYSQL_VERSION_ID < 80003)
340-
mysql->options.use_ssl = !ds->disable_ssl_default;
341-
#endif
342-
343-
#if (MYSQL_VERSION_ID >= 50703 && MYSQL_VERSION_ID < 80003)
344-
{
345-
if (ds->ssl_enforce)
346-
{
347-
mysql_options(mysql, MYSQL_OPT_SSL_ENFORCE, (char *)&on);
348-
}
349-
}
350-
#endif
351-
352339
#if MYSQL_VERSION_ID >= 50711
353340
if (ds->sslmode)
354341
{

‎installer/myodbc-installer.cc

+27-28
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
// Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
2-
//
3-
// This program is free software; you can redistribute it and/or modify
4-
// it under the terms of the GNU General Public License, version 2.0, as
5-
// published by the Free Software Foundation.
6-
//
7-
// This program is also distributed with certain software (including
8-
// but not limited to OpenSSL) that is licensed under separate terms,
9-
// as designated in a particular file or component or in included license
10-
// documentation. The authors of MySQL hereby grant you an
11-
// additional permission to link the program and your derivative works
12-
// with the separately licensed software that they have included with
13-
// MySQL.
14-
//
15-
// Without limiting anything contained in the foregoing, this file,
16-
// which is part of <MySQL Product>, is also subject to the
17-
// Universal FOSS Exception, version 1.0, a copy of which can be found at
18-
// http://oss.oracle.com/licenses/universal-foss-exception.
19-
//
20-
// This program is distributed in the hope that it will be useful, but
21-
// WITHOUT ANY WARRANTY; without even the implied warranty of
22-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
23-
// See the GNU General Public License, version 2.0, for more details.
24-
//
25-
// You should have received a copy of the GNU General Public License
26-
// along with this program; if not, write to the Free Software Foundation, Inc.,
27-
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1+
// Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
2+
//
3+
// This program is free software; you can redistribute it and/or modify
4+
// it under the terms of the GNU General Public License, version 2.0, as
5+
// published by the Free Software Foundation.
6+
//
7+
// This program is also distributed with certain software (including
8+
// but not limited to OpenSSL) that is licensed under separate terms,
9+
// as designated in a particular file or component or in included license
10+
// documentation. The authors of MySQL hereby grant you an
11+
// additional permission to link the program and your derivative works
12+
// with the separately licensed software that they have included with
13+
// MySQL.
14+
//
15+
// Without limiting anything contained in the foregoing, this file,
16+
// which is part of <MySQL Product>, is also subject to the
17+
// Universal FOSS Exception, version 1.0, a copy of which can be found at
18+
// http://oss.oracle.com/licenses/universal-foss-exception.
19+
//
20+
// This program is distributed in the hope that it will be useful, but
21+
// WITHOUT ANY WARRANTY; without even the implied warranty of
22+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
23+
// See the GNU General Public License, version 2.0, for more details.
24+
//
25+
// You should have received a copy of the GNU General Public License
26+
// along with this program; if not, write to the Free Software Foundation, Inc.,
27+
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2828

2929
/*!
3030
@brief This program will aid installers when installing/uninstalling
@@ -513,7 +513,6 @@ int list_datasource_details(DataSource *ds)
513513
if (ds->allow_big_results) printf("\tBIG_PACKETS\n");
514514
if (ds->dont_prompt_upon_connect) printf("\tNO_PROMPT\n");
515515
if (ds->dynamic_cursor) printf("\tDYNAMIC_CURSOR\n");
516-
if (ds->ignore_N_in_name_table) printf("\tNO_SCHEMA\n");
517516
if (ds->user_manager_cursor) printf("\tNO_DEFAULT_CURSOR\n");
518517
if (ds->dont_use_set_locale) printf("\tNO_LOCALE\n");
519518
if (ds->pad_char_to_full_length) printf("\tPAD_SPACE\n");

‎setupgui/callbacks.cc

+27-31
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
// Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
2-
//
3-
// This program is free software; you can redistribute it and/or modify
4-
// it under the terms of the GNU General Public License, version 2.0, as
5-
// published by the Free Software Foundation.
6-
//
7-
// This program is also distributed with certain software (including
8-
// but not limited to OpenSSL) that is licensed under separate terms,
9-
// as designated in a particular file or component or in included license
10-
// documentation. The authors of MySQL hereby grant you an
11-
// additional permission to link the program and your derivative works
12-
// with the separately licensed software that they have included with
13-
// MySQL.
14-
//
15-
// Without limiting anything contained in the foregoing, this file,
16-
// which is part of MySQL Connector/ODBC, is also subject to the
17-
// Universal FOSS Exception, version 1.0, a copy of which can be found at
18-
// http://oss.oracle.com/licenses/universal-foss-exception.
19-
//
20-
// This program is distributed in the hope that it will be useful, but
21-
// WITHOUT ANY WARRANTY; without even the implied warranty of
22-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
23-
// See the GNU General Public License, version 2.0, for more details.
24-
//
25-
// You should have received a copy of the GNU General Public License
26-
// along with this program; if not, write to the Free Software Foundation, Inc.,
27-
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1+
// Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
2+
//
3+
// This program is free software; you can redistribute it and/or modify
4+
// it under the terms of the GNU General Public License, version 2.0, as
5+
// published by the Free Software Foundation.
6+
//
7+
// This program is also distributed with certain software (including
8+
// but not limited to OpenSSL) that is licensed under separate terms,
9+
// as designated in a particular file or component or in included license
10+
// documentation. The authors of MySQL hereby grant you an
11+
// additional permission to link the program and your derivative works
12+
// with the separately licensed software that they have included with
13+
// MySQL.
14+
//
15+
// Without limiting anything contained in the foregoing, this file,
16+
// which is part of MySQL Connector/ODBC, is also subject to the
17+
// Universal FOSS Exception, version 1.0, a copy of which can be found at
18+
// http://oss.oracle.com/licenses/universal-foss-exception.
19+
//
20+
// This program is distributed in the hope that it will be useful, but
21+
// WITHOUT ANY WARRANTY; without even the implied warranty of
22+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
23+
// See the GNU General Public License, version 2.0, for more details.
24+
//
25+
// You should have received a copy of the GNU General Public License
26+
// along with this program; if not, write to the Free Software Foundation, Inc.,
27+
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2828

2929

3030
/* TODO no L"" */
@@ -341,7 +341,6 @@ void syncTabsData(HWND hwnd, DataSource *params)
341341
GET_BOOL_TAB(CONNECTION_TAB, clientinteractive);
342342
GET_BOOL_TAB(CONNECTION_TAB, can_handle_exp_pwd);
343343
GET_BOOL_TAB(CONNECTION_TAB, enable_cleartext_plugin);
344-
GET_BOOL_TAB(CONNECTION_TAB, disable_ssl_default);
345344
GET_BOOL_TAB(CONNECTION_TAB, get_server_public_key);
346345

347346
GET_COMBO_TAB(CONNECTION_TAB, charset);
@@ -352,7 +351,6 @@ void syncTabsData(HWND hwnd, DataSource *params)
352351
/* 2 - Metadata*/
353352
GET_BOOL_TAB(METADATA_TAB, change_bigint_columns_to_int);
354353
GET_BOOL_TAB(METADATA_TAB, handle_binary_as_char);
355-
GET_BOOL_TAB(METADATA_TAB, ignore_N_in_name_table);
356354
GET_BOOL_TAB(METADATA_TAB, return_table_names_for_SqlDescribeCol);
357355
GET_BOOL_TAB(METADATA_TAB, no_catalog);
358356
GET_BOOL_TAB(METADATA_TAB, limit_column_size);
@@ -419,7 +417,6 @@ void syncTabs(HWND hwnd, DataSource *params)
419417
SET_BOOL_TAB(CONNECTION_TAB, clientinteractive);
420418
SET_BOOL_TAB(CONNECTION_TAB, can_handle_exp_pwd);
421419
SET_BOOL_TAB(CONNECTION_TAB, enable_cleartext_plugin);
422-
SET_BOOL_TAB(CONNECTION_TAB, disable_ssl_default);
423420
SET_BOOL_TAB(CONNECTION_TAB, get_server_public_key);
424421

425422
#ifdef _WIN32
@@ -436,7 +433,6 @@ void syncTabs(HWND hwnd, DataSource *params)
436433
SET_BOOL_TAB(METADATA_TAB, change_bigint_columns_to_int);
437434
SET_BOOL_TAB(METADATA_TAB, handle_binary_as_char);
438435
SET_BOOL_TAB(METADATA_TAB, return_table_names_for_SqlDescribeCol);
439-
SET_BOOL_TAB(METADATA_TAB, ignore_N_in_name_table);
440436
SET_BOOL_TAB(METADATA_TAB, no_catalog);
441437
SET_BOOL_TAB(METADATA_TAB, limit_column_size);
442438
SET_BOOL_TAB(METADATA_TAB, no_information_schema);

‎setupgui/gtk/ODBCINSTGetProperties.cc

+37-38
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
// Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
2-
//
3-
// This program is free software; you can redistribute it and/or modify
4-
// it under the terms of the GNU General Public License, version 2.0, as
5-
// published by the Free Software Foundation.
6-
//
7-
// This program is also distributed with certain software (including
8-
// but not limited to OpenSSL) that is licensed under separate terms,
9-
// as designated in a particular file or component or in included license
10-
// documentation. The authors of MySQL hereby grant you an
11-
// additional permission to link the program and your derivative works
12-
// with the separately licensed software that they have included with
13-
// MySQL.
14-
//
15-
// Without limiting anything contained in the foregoing, this file,
16-
// which is part of MySQL Connector/ODBC, is also subject to the
17-
// Universal FOSS Exception, version 1.0, a copy of which can be found at
18-
// http://oss.oracle.com/licenses/universal-foss-exception.
19-
//
20-
// This program is distributed in the hope that it will be useful, but
21-
// WITHOUT ANY WARRANTY; without even the implied warranty of
22-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
23-
// See the GNU General Public License, version 2.0, for more details.
24-
//
25-
// You should have received a copy of the GNU General Public License
26-
// along with this program; if not, write to the Free Software Foundation, Inc.,
27-
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1+
// Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
2+
//
3+
// This program is free software; you can redistribute it and/or modify
4+
// it under the terms of the GNU General Public License, version 2.0, as
5+
// published by the Free Software Foundation.
6+
//
7+
// This program is also distributed with certain software (including
8+
// but not limited to OpenSSL) that is licensed under separate terms,
9+
// as designated in a particular file or component or in included license
10+
// documentation. The authors of MySQL hereby grant you an
11+
// additional permission to link the program and your derivative works
12+
// with the separately licensed software that they have included with
13+
// MySQL.
14+
//
15+
// Without limiting anything contained in the foregoing, this file,
16+
// which is part of MySQL Connector/ODBC, is also subject to the
17+
// Universal FOSS Exception, version 1.0, a copy of which can be found at
18+
// http://oss.oracle.com/licenses/universal-foss-exception.
19+
//
20+
// This program is distributed in the hope that it will be useful, but
21+
// WITHOUT ANY WARRANTY; without even the implied warranty of
22+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
23+
// See the GNU General Public License, version 2.0, for more details.
24+
//
25+
// You should have received a copy of the GNU General Public License
26+
// along with this program; if not, write to the Free Software Foundation, Inc.,
27+
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2828

2929
#ifdef UNICODE
30-
/*
30+
/*
3131
Unicode must be disabled, otherwise we will have lots of compiler errors
3232
about conflicting declarations in odbcinstext.h and odbcinst.h
3333
*/
@@ -59,7 +59,6 @@ static const char *MYODBC_OPTIONS[][3] = {
5959
{"BIG_PACKETS", "C", "Allow big result set"},
6060
{"NO_PROMPT", "C", "Don't prompt when connecting"},
6161
{"DYNAMIC_CURSOR", "C", "Enable Dynamic Cursors"},
62-
{"NO_SCHEMA", "C", "Ignore schema in column specifications"},
6362
{"NO_DEFAULT_CURSOR", "C", "Disable driver-provided cursor support"},
6463
{"NO_LOCALE", "C", "Don't use setlocale()"},
6564
{"PAD_SPACE", "C", "Pad CHAR to full length with space"},
@@ -100,17 +99,17 @@ int ODBCINSTGetProperties(HODBCINSTPROPERTY propertyList)
10099
/* Allocate next element */
101100
propertyList->pNext= (HODBCINSTPROPERTY)malloc(sizeof(ODBCINSTPROPERTY));
102101
propertyList= propertyList->pNext;
103-
102+
104103
/* Reset everything to zero */
105104
memset(propertyList, 0, sizeof(ODBCINSTPROPERTY));
106-
105+
107106
/* copy the option name */
108-
strncpy( propertyList->szName, MYODBC_OPTIONS[i][0],
107+
strncpy( propertyList->szName, MYODBC_OPTIONS[i][0],
109108
strlen(MYODBC_OPTIONS[i][0]));
110-
109+
111110
/* We make the value always empty by default */
112111
propertyList->szValue[0]= '\0';
113-
112+
114113
switch(MYODBC_OPTIONS[i][1][0])
115114
{
116115
/* COMBOBOX */
@@ -119,14 +118,14 @@ int ODBCINSTGetProperties(HODBCINSTPROPERTY propertyList)
119118

120119
/* Prepare data for the combobox */
121120
propertyList->aPromptData= (char**)malloc(sizeof(paramsOnOff));
122-
memcpy(propertyList->aPromptData, paramsOnOff, sizeof(paramsOnOff));
121+
memcpy(propertyList->aPromptData, paramsOnOff, sizeof(paramsOnOff));
123122
break;
124123

125124
/* FILE NAME */
126125
case 'F':
127126
propertyList->nPromptType= ODBCINST_PROMPTTYPE_FILENAME;
128127
break;
129-
128+
130129
/* TEXTBOX */
131130
case 'T':
132131
default:
@@ -135,8 +134,8 @@ int ODBCINSTGetProperties(HODBCINSTPROPERTY propertyList)
135134

136135
/* Finally, set the help text */
137136
propertyList->pszHelp= strdup(MYODBC_OPTIONS[i][2]);
138-
137+
139138
}while (MYODBC_OPTIONS[++i][0]);
140-
139+
141140
return 1;
142141
}

0 commit comments

Comments
 (0)