Skip to content

Commit 3402800

Browse files
author
Erlend Dahl
committed
This patch implements
WL#7620: Deprecate and remove mysqlaccess WL#7034: Deprecate and remove mysql_convert_table_format WL#7036: Deprecate and remove mysql_fix_extensions WL#7621: Deprecate and remove mysql_find_rows.sh WL#7033: Deprecate and remove mysql_setpermission WL#7035: Deprecate and remove msql2mysql See also Bug#18179576, Bug#16699317, Bug#16699284, Bug#11746603, Bug#16699279 and Bug#16699248
1 parent 3cc20db commit 3402800

6 files changed

Lines changed: 18 additions & 7 deletions

File tree

‎scripts/msql2mysql.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
# Copyright (C) 1979-2007 MySQL AB
2+
# Copyright (c) 1979, 2014, Oracle and/or its affiliates. All rights reserved.
33
#
44
# This program is free software; you can redistribute it and/or modify
55
# it under the terms of the GNU General Public License as published by
@@ -15,4 +15,6 @@
1515
# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston
1616
# MA 02110-1301 USA.
1717

18+
echo "Warning: $0 is deprecated and will be removed in a future version.\n" 1>&2;
19+
1820
@bindir@/replace msqlConnect mysql_connect msqlListDBs mysql_list_dbs msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row msqlFetchField mysql_fetch_field msqlFreeResult mysql_free_result msqlListFields mysql_list_fields msqlListTables mysql_list_tables msqlErrMsg 'mysql_error(mysql)' msqlStoreResult mysql_store_result msqlQuery mysql_query msqlField mysql_field msqlSelect mysql_select msqlSelectDB mysql_select_db msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB mysql_drop_db msqlFieldSeek mysql_field_seek -- $*

‎scripts/mysql_convert_table_format.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/perl
2-
# Copyright (c) 2000-2002, 2006, 2007 MySQL AB, 2009 Sun Microsystems, Inc.
2+
# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
33
# Use is subject to license terms.
44
#
55
# This program is free software; you can redistribute it and/or modify
@@ -41,6 +41,8 @@ GetOptions(
4141
"P|port=i" => \$opt_port
4242
) || usage(0);
4343

44+
print STDERR "Warning: $0 is deprecated and will be removed in a future version.\n";
45+
4446
usage($opt_version) if ($#ARGV < 0 || $opt_help || $opt_version);
4547

4648
$opt_database=shift(@ARGV);

‎scripts/mysql_find_rows.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/perl
2-
# Copyright (c) 2000, 2004, 2006 MySQL AB, 2009 Sun Microsystems, Inc.
2+
# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
33
# Use is subject to license terms.
44
#
55
# This program is free software; you can redistribute it and/or modify
@@ -23,6 +23,8 @@ $opt_help=$opt_Information=$opt_skip_use_db=0;
2323
$opt_regexp=$opt_dbregexp=".*";
2424
$opt_start_row=1; $opt_rows=9999999999;
2525

26+
print STDERR "Warning: $0 is deprecated and will be removed in a future version.\n";
27+
2628
GetOptions("Information","help","regexp=s","start_row=i","rows=i",
2729
"dbregexp=s", "skip-use-db")
2830
|| usage();

‎scripts/mysql_fix_extensions.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/perl
22

3-
# Copyright (c) 2001 MySQL AB, 2009 Sun Microsystems, Inc.
3+
# Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
44
# Use is subject to license terms.
55
#
66
# This program is free software; you can redistribute it and/or
@@ -26,6 +26,7 @@
2626
# makes .frm lowercase and .MYI/MYD/ISM/ISD uppercase
2727
# useful when datafiles are copied from windows
2828

29+
print STDERR "Warning: $0 is deprecated and will be removed in a future version.\n";
2930
die "Usage: $0 datadir\n" unless -d $ARGV[0];
3031

3132
for $a (<$ARGV[0]/*/*.*>) { $_=$a;

‎scripts/mysql_setpermission.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/perl
22
## Emacs, this is -*- perl -*- mode? :-)
33

4-
# Copyright (c) 2000, 2007 MySQL AB, 2009 Sun Microsystems, Inc.
4+
# Copyright (c) 2000, 2014 Oracle and/or its affiliates. All rights reserved.
55
# Use is subject to license terms.
66
#
77
# This program is free software; you can redistribute it and/or
@@ -59,6 +59,8 @@ my $user = "";
5959
$dbh=$host=$opt_user= $opt_password= $opt_help= $opt_host= $opt_socket= "";
6060
$opt_port=0;
6161

62+
print STDERR "Warning: $0 is deprecated and will be removed in a future version.\n";
63+
6264
read_my_cnf(); # Read options from ~/.my.cnf
6365

6466
GetOptions("user=s","password=s","help","host=s","socket=s","port=i");

‎scripts/mysqlaccess.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/perl
22

3-
# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
44
#
55
# This program is free software; you can redistribute it and/or
66
# modify it under the terms of the GNU Library General Public
@@ -2393,7 +2393,8 @@ sub Print_Header {
23932393
print "$MySQLaccess::script Version $MySQLaccess::VERSION\n"
23942394
."By RUG-AIV, by Yves Carlier (Yves.Carlier\@rug.ac.be)\n"
23952395
."Changes by Steve Harvey (sgh\@vex.net)\n"
2396-
."This software comes with ABSOLUTELY NO WARRANTY.\n";
2396+
."This software comes with ABSOLUTELY NO WARRANTY.\n"
2397+
."\nWarning: $MySQLaccess::script is deprecated and will be removed in a future version.\n";
23972398
}
23982399
if ($MySQLaccess::CGI) { #CGI-BIN mode
23992400
print "content-type: text/html\n\n"
@@ -2407,6 +2408,7 @@ sub Print_Header {
24072408
."By RUG-AIV, by Yves Carlier (<a href=mailto:Yves.Carlier\@rug.ac.be>Yves.Carlier\@rug.ac.be</a>)<BR>\n"
24082409
."Changes by Steve Harvey (<a href=mailto:sgh\@vex.net>sgh\@vex.net</a>)<BR>\n"
24092410
."This software comes with ABSOLUTELY NO WARRANTY.<BR>\n"
2411+
."<BR>\nWarning: $MySQLaccess::script is deprecated and will be removed in a future version.<BR>\n"
24102412
."</ADDRESS>\n</CENTER>\n"
24112413
."<HR>\n";
24122414
Print_Taskbar();

0 commit comments

Comments
 (0)