mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
4fa2747a63
don't include my_progname in the error message, my_error starts from it automatically, resulting in, like /usr/bin/mysqladmin: Notice: /usr/bin/mysqladmin is deprecated and will be removed in a future release, use command 'mariadb-admin' and remove "Notice" so that the problem description would directly follow the executable name. make the check to work when the executable is in the PATH (so, invoked simply like 'mysql' and thus readlink cannot find it) fix the check in mysql_install_db and mysql_secure_installation to not print the warning if the intermediate path contains "mysql" substring add this message also to * mysql_waitpid * mysql_convert_table_format * mysql_find_rows * mysql_setpermissions * mysqlaccess * mysqld_multi * mysqld_safe * mysqldumpslow * mysqlhotcopy * mysql_ldb Closes #2273
162 lines
3.4 KiB
Bash
162 lines
3.4 KiB
Bash
#!@PERL_PATH@
|
|
# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
|
|
#
|
|
# 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
|
|
# the Free Software Foundation; version 2 of the License.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
|
|
|
|
$version="1.02";
|
|
|
|
use Getopt::Long;
|
|
|
|
warn "$0: Deprecated program name. It will be removed in a future release, use 'mariadb-find-rows' instead\n"
|
|
if $0 =~ m/mysql_find_rows$/;
|
|
|
|
$opt_help=$opt_Information=$opt_skip_use_db=0;
|
|
$opt_regexp=$opt_dbregexp=".*";
|
|
$opt_start_row=1; $opt_rows=9999999999;
|
|
|
|
GetOptions("Information","help","regexp=s","start_row=i","rows=i",
|
|
"dbregexp=s", "skip-use-db")
|
|
|| usage();
|
|
usage() if ($opt_help || $opt_Information);
|
|
|
|
$query=$search=$database=$set=""; $eoq=0;
|
|
while (<>)
|
|
{
|
|
next if (length($query) == 0 && /^\#/); # Skip comments
|
|
$query.=search($_);
|
|
if ($eoq)
|
|
{
|
|
if ($query =~ /^use /i || $query =~ /^SET / ||
|
|
($query =~ /$opt_regexp/o && $database =~ /$opt_dbregexp/o))
|
|
{
|
|
if ($opt_skip_use_db && $query =~ /^use /i)
|
|
{
|
|
$query="";
|
|
next;
|
|
}
|
|
if ($opt_start_row <= 1)
|
|
{
|
|
if ($database)
|
|
{
|
|
print $database, $set;
|
|
$database=$set="";
|
|
}
|
|
print $query;
|
|
last if (--$opt_rows == 0);
|
|
}
|
|
else
|
|
{
|
|
$opt_start_row--;
|
|
if ($query =~ /^use /)
|
|
{
|
|
$database=$query;
|
|
$set="";
|
|
}
|
|
elsif ($query =~ /^SET/)
|
|
{
|
|
$set=$query;
|
|
}
|
|
else
|
|
{
|
|
$set="";
|
|
}
|
|
}
|
|
}
|
|
$query=""; $search=""; $eoq=0;
|
|
}
|
|
}
|
|
|
|
exit 0;
|
|
|
|
sub search
|
|
{
|
|
my($row)=shift;
|
|
my($i);
|
|
|
|
for ($i=0 ; $i < length($row) ; $i++)
|
|
{
|
|
if (length($search))
|
|
{
|
|
if (length($search) > 1)
|
|
{ # Comment
|
|
next if (substr($row,$i,length($search)) ne $search);
|
|
$i+=length($search)-1;
|
|
$search="";
|
|
}
|
|
elsif (substr($row,$i,1) eq '\\') # Escaped char in string
|
|
{
|
|
$i++;
|
|
}
|
|
elsif (substr($row,$i,1) eq $search)
|
|
{
|
|
if (substr($row,$i+1,1) eq $search) # Double " or '
|
|
{
|
|
$i++;
|
|
}
|
|
else
|
|
{
|
|
$search="";
|
|
}
|
|
}
|
|
next;
|
|
}
|
|
if (substr($row,$i,2) eq '/*') # Comment
|
|
{
|
|
$search="*/";
|
|
$i++;
|
|
}
|
|
elsif (substr($row,$i,1) eq "'" || substr($row,$i,1) eq '"')
|
|
{
|
|
$search=substr($row,$i,1);
|
|
}
|
|
}
|
|
$eoq=1 if (!length($search) && $row =~ /;\s*$/);
|
|
return $row;
|
|
}
|
|
|
|
|
|
sub usage
|
|
{
|
|
print <<EOF;
|
|
$0 Ver $version
|
|
|
|
Prints all SQL queries that matches a regexp or contains a 'use
|
|
database' or 'set ..' command to stdout. A SQL query may contain
|
|
newlines. This is useful to find things in a MariaDB update log.
|
|
|
|
$0 takes the following options:
|
|
|
|
--help or --Information
|
|
Shows this help
|
|
|
|
--regexp=#
|
|
Print queries that matches this.
|
|
|
|
--start_row=#
|
|
Start output from this row (first row = 1)
|
|
|
|
--skip-use-db
|
|
Don\'t include \'use database\' commands in the output.
|
|
|
|
--rows=#
|
|
Quit after this many rows.
|
|
|
|
Example:
|
|
|
|
$0 --regexp "problem_table" < update.log
|
|
|
|
$0 --regexp "problem_table" update-log.1 update-log.2
|
|
EOF
|
|
exit(0);
|
|
}
|