Commit b165734a authored by unknown's avatar unknown
Browse files

Merge dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0 

into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
parents 66e49dc5 70f16456

client/mysqldump.c

+2 −1
Original line number Diff line number Diff line
@@ -2059,7 +2059,8 @@ static void dump_table(uint numFields, char *table) 
	   we'll dump in hex only BLOB columns.

	*/

        is_blob= (opt_hex_blob && field->charsetnr == 63 &&

                  (field->type == MYSQL_TYPE_STRING ||

                  (field->type == MYSQL_TYPE_BIT ||

                   field->type == MYSQL_TYPE_STRING ||

                   field->type == MYSQL_TYPE_VAR_STRING ||

                   field->type == MYSQL_TYPE_VARCHAR ||

                   field->type == MYSQL_TYPE_BLOB ||

mysql-test/lib/mtr_process.pl

+5 −5
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ sub spawn_impl ($$$$$$$$) { 
      {

        if ( ! open(STDOUT,$log_file_open_mode,$output) )

        {

          mtr_error("can't redirect STDOUT to \"$output\": $!");

          mtr_child_error("can't redirect STDOUT to \"$output\": $!");

        }

      }
@@ -176,14 +176,14 @@ sub spawn_impl ($$$$$$$$) { 
        {

          if ( ! open(STDERR,">&STDOUT") )

          {

            mtr_error("can't dup STDOUT: $!");

            mtr_child_error("can't dup STDOUT: $!");

          }

        }

        else

        {

          if ( ! open(STDERR,$log_file_open_mode,$error) )

          {

            mtr_error("can't redirect STDERR to \"$error\": $!");

            mtr_child_error("can't redirect STDERR to \"$error\": $!");

          }

        }

      }
@@ -192,13 +192,13 @@ sub spawn_impl ($$$$$$$$) { 
      {

        if ( ! open(STDIN,"<",$input) )

        {

          mtr_error("can't redirect STDIN to \"$input\": $!");

          mtr_child_error("can't redirect STDIN to \"$input\": $!");

        }

      }



      if ( ! exec($path,@$arg_list_t) )

      {

        mtr_error("failed to execute \"$path\": $!");

        mtr_child_error("failed to execute \"$path\": $!");

      }

    }

  }

mysql-test/lib/mtr_report.pl

+9 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ sub mtr_print_header (); 
sub mtr_report (@);

sub mtr_warning (@);

sub mtr_error (@);

sub mtr_child_error (@);

sub mtr_debug (@);
@@ -74,7 +75,7 @@ sub mtr_show_failed_diff ($) { 
sub mtr_report_test_name ($) {

  my $tinfo= shift;



  printf "%-31s ", $tinfo->{'name'};

  printf "%-30s ", $tinfo->{'name'};

}



sub mtr_report_test_skipped ($) {
@@ -122,13 +123,13 @@ sub mtr_report_test_failed ($) { 
  # we should write out into $::path_timefile when the error occurs.

  if ( -f $::path_timefile )

  {

    print "Errors are (from $::path_timefile) :\n";

    print "\nErrors are (from $::path_timefile) :\n";

    print mtr_fromfile($::path_timefile); # FIXME print_file() instead

    print "\n(the last lines may be the most important ones)\n";

  }

  else

  {

    print "Unexpected termination, probably when starting mysqld\n";

    print "\nUnexpected termination, probably when starting mysqld\n";

  }

}
@@ -286,6 +287,11 @@ sub mtr_error (@) { 
  mtr_exit(1);

}



sub mtr_child_error (@) {

  print STDERR "mysql-test-run: *** ERROR(child): ",join(" ", @_),"\n";

  exit(1);

}



sub mtr_debug (@) {

  if ( $::opt_script_debug )

  {

mysql-test/r/ndb_bitfield.result

+8 −8
Original line number Diff line number Diff line
@@ -188,14 +188,14 @@ INSERT INTO `t1` VALUES 
(6,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'100000',b'010010',b'011111',4,5,5,5,5,5,5,5,5,5,3,2,1),

(7,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'000000',b'001100',b'111111',4,5,5,5,5,5,5,5,5,5,3,2,1),

(8,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'111111',b'000000',b'000000',4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (1,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'','?','>',4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (2,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'','\0','=',4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (3,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'','',';',4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (4,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'','0','7',4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (5,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'','!','/',4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (6,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,' ','','',4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (7,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'\0','','?',4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (8,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'?','\0','\0',4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (1,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x01,0x3F,0x3E,4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (2,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x02,0x00,0x3D,4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (3,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x04,0x0F,0x3B,4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (4,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x08,0x30,0x37,4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (5,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x10,0x21,0x2F,4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (6,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x20,0x12,0x1F,4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (7,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x00,0x0C,0x3F,4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (8,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x3F,0x00,0x00,4,5,5,5,5,5,5,5,5,5,3,2,1);

drop table t1;

create table t1 (

pk1 bit(9) not null primary key,

mysql-test/t/ndb_bitfield.test

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ INSERT INTO `t1` VALUES 
(6,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'100000',b'010010',b'011111',4,5,5,5,5,5,5,5,5,5,3,2,1),

(7,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'000000',b'001100',b'111111',4,5,5,5,5,5,5,5,5,5,3,2,1),

(8,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'111111',b'000000',b'000000',4,5,5,5,5,5,5,5,5,5,3,2,1);

--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test t1

--exec $MYSQL_DUMP --hex-blob --compact --order-by-primary --skip-extended-insert --no-create-info test t1

drop table t1;



--error 1005