Commit 02fadb6d authored by unknown's avatar unknown
Browse files

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

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0


sql/sql_yacc.yy:
  Auto merged
parents 95772f45 e33ef0d9

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ miguel@light. 
miguel@light.local

miguel@sartre.local

mikael@mc04.(none)

mikael@orca.ndb.mysql.com

mikron@c-fb0ae253.1238-1-64736c10.cust.bredbandsbolaget.se

mikron@mikael-ronstr-ms-dator.local

mleich@mysql.com

client/mysqlbinlog.cc

+9 −0
Original line number Diff line number Diff line
@@ -488,6 +488,15 @@ Create_file event for file_id: %u\n",exv->file_id); 


static struct my_option my_long_options[] =

{

  /*

    mysqlbinlog needs charsets knowledge, to be able to convert a charset

    number found in binlog to a charset name (to be able to print things

    like this:

    SET @`a`:=_cp850 0x4DFC6C6C6572 COLLATE `cp850_general_ci`;

  */

  {"character-sets-dir", OPT_CHARSETS_DIR,

   "Directory where character sets are.", (gptr*) &charsets_dir,

   (gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

#ifndef DBUG_OFF

  {"debug", '#', "Output debug log.", (gptr*) &default_dbug_option,

   (gptr*) &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},

mysql-test/lib/mtr_io.pl

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ use strict; 


sub mtr_get_pid_from_file ($);

sub mtr_get_opts_from_file ($);

sub mtr_fromfile ($);

sub mtr_tofile ($@);

sub mtr_tonewfile($@);
@@ -107,6 +108,8 @@ sub mtr_fromfile ($) { 
  open(FILE,"<",$file) or mtr_error("can't open file \"$file\": $!");

  my $text= join('', <FILE>);

  close FILE;

  $text =~ s/^\s+//;                    # Remove starting space, incl newlines

  $text =~ s/\s+$//;                    # Remove ending space, incl newlines

  return $text;

}

mysql-test/lib/mtr_process.pl

+465 −207

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/lib/mtr_report.pl

+21 −4

File changed.

Preview size limit exceeded, changes collapsed.