Commit 316577d6 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  zippy.(none):/home/cmiller/work/mysql/m50--07C2P
parents b974fa85 e553b828

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ AC_ARG_ENABLE(assembler, 


AC_MSG_CHECKING(if we should use assembler functions)

# For now we only support assembler on i386 and sparc systems

AM_CONDITIONAL(ASSEMBLER_x86, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "i386")

AM_CONDITIONAL(ASSEMBLER_x86, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "i386" && $AS strings/strings-x86.s -o checkassembler >/dev/null 2>&1 && test -f checkassembler && (rm -f checkassembler; exit 0;))

AM_CONDITIONAL(ASSEMBLER_sparc32, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "sparc")

AM_CONDITIONAL(ASSEMBLER_sparc64, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "sparcv9")

AM_CONDITIONAL(ASSEMBLER, test "$ASSEMBLER_x86_TRUE" = "" -o "$ASSEMBLER_sparc32_TRUE" = "")

mysql-test/lib/mtr_cases.pl

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ sub collect_test_cases ($) { 
      while ( <DISABLED> )

      {

        chomp;

        if ( /^\s*(\S+)\s*:\s*(.*?)\s*$/ )

        if ( /^\s*([^\s:]+)\s*:\s*(.*?)\s*$/ )

        {

          $disabled{$1}= $2;

        }

mysql-test/mysql-test-run.pl

+1 −0
Original line number Diff line number Diff line
@@ -3074,6 +3074,7 @@ sub run_mysqltest ($) { 
  my $cmdline_mysql_client_test=

    "$exe_mysql_client_test --no-defaults --testcase --user=root --silent " .

    "--port=$master->[0]->{'path_myport'} " .

    "--vardir=$opt_vardir " .

    "--socket=$master->[0]->{'path_mysock'}";



  if ( $glob_use_embedded_server )

scripts/mysql_explain_log.sh

+13 −11
Original line number Diff line number Diff line 
#!@PERL@ -w

#!@PERL@

use strict;

use warnings;

use DBI;



use Getopt::Long;
@@ -58,7 +59,7 @@ else { 
  }

  else {

    $Param->{Start} = time;

    while(<STDIN>) {

    while(<>) {

      $Param->{LineCount} ++ ;



      if ($Param->{ViewDate} ) {
@@ -317,6 +318,8 @@ Usage: $0 [OPTIONS] < LOGFILE 
-p=PASSWORD

--socket=SOCKET     mysqld socket file to connect

-s=SOCKET

--printerror=1      enable error output

-e 1



Read logfile from STDIN an try to EXPLAIN all SELECT statements. All UPDATE statements are rewritten to an EXPLAIN SELECT statement. The results of the EXPLAIN statement are collected and counted. All results with type=ALL are collected in an separete list. Results are printed to STDOUT.
@@ -331,7 +334,7 @@ __END__ 


=head1 NAME



explain_log.pl

mysql_explain_log



Feed a mysqld general logfile (created with mysqld --log) back into mysql

and collect statistics about index usage with EXPLAIN.
@@ -348,7 +351,7 @@ Then add indices to avoid table scans and remove those which aren't used. 


=head1 USAGE



explain_log.pl [--date=YYMMDD] --host=dbhost] [--user=dbuser] [--password=dbpw] [--socket=/path/to/socket] < logfile

mysql_explain_log [--date=YYMMDD] --host=dbhost] [--user=dbuser] [--password=dbpw] [--socket=/path/to/socket] < logfile



--date=YYMMDD       select only entrys of date
@@ -370,21 +373,20 @@ explain_log.pl [--date=YYMMDD] --host=dbhost] [--user=dbuser] [--password=dbpw] 


-s=SOCKET



--printerror=1      enable error output



-e 1



=head1 EXAMPLE



explain_log.pl --host=localhost --user=foo --password=bar < /var/lib/mysql/mobile.log

mysql_explain_log --host=localhost --user=foo --password=bar < /var/lib/mysql/mobile.log



=head1 AUTHORS



  Stefan Nitz

  Jan Willamowius <jan@mobile.de>, http://www.mobile.de

  Jan Willamowius <jan@willamowius.de>, http://www.willamowius.de

  Dennis Haney <davh@davh.dk> (Added socket support)



=head1 RECRUITING



If you are looking for a MySQL or Perl job, take a look at http://www.mobile.de

and send me an email with your resume (you must be speaking German!).



=head1 SEE ALSO



mysql documentation

scripts/mysqld_safe.sh

+7 −4
Original line number Diff line number Diff line
@@ -321,11 +321,14 @@ then 
    ulimit -n $open_files

    args="--open-files-limit=$open_files $args"

  fi

fi



# Try to set the core file size (even if we aren't root) because many systems

# don't specify a hard limit on core file size.

if test -n "$core_file_size"

then

  ulimit -c $core_file_size

fi

fi



#

# If there exists an old pid file, check if the daemon is already running