Commit cb121e0c authored by unknown's avatar unknown
Browse files

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

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents 84ce207b f2e153e5

extra/yassl/include/yassl_int.hpp

+6 −1
Original line number Diff line number Diff line
@@ -164,7 +164,12 @@ private: 


// openSSL bignum

struct BIGNUM {

    Integer int_;

    /*

      gcc 2.96 fix: because of two Integer classes (yaSSL::Integer and

      TaoCrypt::Integer), we need to explicitly state the namespace

      here to let gcc 2.96 deduce the correct type.

    */

    yaSSL::Integer int_;

    void assign(const byte* b, uint s) { int_.assign(b,s); }

};

extra/yassl/include/yassl_types.hpp

+10 −1
Original line number Diff line number Diff line
@@ -445,6 +445,15 @@ const opaque master_label[MASTER_LABEL_SZ + 1] = "master secret"; 
const opaque key_label   [KEY_LABEL_SZ + 1]    = "key expansion";





} // naemspace

} // namespace



#if __GNUC__ == 2 && __GNUC_MINOR__ <= 96

/*

  gcc 2.96 bails out because of two declarations of byte: yaSSL::byte and

  TaoCrypt::byte. TODO: define global types.hpp and move the declaration of

  'byte' there.

*/

using yaSSL::byte;

#endif



#endif // yaSSL_TYPES_HPP

mysql-test/include/rpl_stmt_seq.inc

+25 −4
Original line number Diff line number Diff line
@@ -4,6 +4,12 @@ 
# the $variables is extreme sensitive. 

#



###############################################################

# Debug options : To debug this test script

###############################################################

let $showbinlog= 0;

let $manipulate= 1;



######## The typical test sequence

# 1. INSERT without commit

#    check table content of master and slave
@@ -52,9 +58,12 @@ let $MAX= `SELECT MAX(f1) FROM t1` ; 
eval INSERT INTO t1 SET f1= $MAX + 1;

# results before DDL(to be tested)

SELECT MAX(f1) FROM t1;

if ($show_binlog)

{

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

eval SHOW BINLOG EVENTS IN 'master-bin.$_log_num_s';

}

sync_slave_with_master;



connection slave;
@@ -63,9 +72,12 @@ SELECT '-------- switch to slave --------' as ""; 
--enable_query_log

# results before DDL(to be tested)

SELECT MAX(f1) FROM t1;

if ($show_binlog)

{

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

eval SHOW BINLOG EVENTS IN 'slave-bin.$_log_num_s';

}



###############################################################

# command to be tested
@@ -79,9 +91,12 @@ eval $my_stmt; 
let $my_stmt= ERROR: YOU FORGOT TO FILL IN THE STATEMENT;

# results after DDL(to be tested)

SELECT MAX(f1) FROM t1;

if ($show_binlog)

{

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

eval SHOW BINLOG EVENTS IN 'master-bin.$_log_num_s';

}

sync_slave_with_master;



connection slave;
@@ -90,9 +105,12 @@ SELECT '-------- switch to slave --------' as ""; 
--enable_query_log

# results after DDL(to be tested)

SELECT MAX(f1) FROM t1;

if ($show_binlog)

{

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

eval SHOW BINLOG EVENTS IN 'slave-bin.$_log_num_s';

}



###############################################################

# ROLLBACK
@@ -114,9 +132,12 @@ eval SELECT CONCAT(CONCAT('TEST-INFO: MASTER: The INSERT is ', 
                ' (Failed)')) AS "" 

               FROM mysqltest1.t1;

--enable_query_log

if ($show_binlog)

{

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

eval SHOW BINLOG EVENTS IN 'master-bin.$_log_num_s';

}

sync_slave_with_master;



connection slave;
@@ -133,16 +154,17 @@ eval SELECT CONCAT(CONCAT('TEST-INFO: SLAVE: The INSERT is ', 
                ' (Failed)')) AS "" 

               FROM mysqltest1.t1;

--enable_query_log

if ($show_binlog)

{

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

eval SHOW BINLOG EVENTS IN 'slave-bin.$_log_num_s';

}



###############################################################

# Manipulate binlog

###############################################################

#let $manipulate= 0;

let $manipulate= 1;

while ($manipulate)

if ($manipulate)

{

#### Manipulate the binary logs,

# so that the output of SHOW BINLOG EVENTS IN <current log>
@@ -171,7 +193,6 @@ flush logs; 
# sleep 1;

# eval SHOW BINLOG EVENTS IN 'slave-bin.$_log_num_s';

inc $_log_num_n;

let $manipulate= 0;

}



connection master;

mysql-test/lib/mtr_cases.pl

+6 −8
Original line number Diff line number Diff line
@@ -171,8 +171,8 @@ sub collect_one_test_case($$$$$) { 
  my $slave_sh=        "$testdir/$tname-slave.sh";

  my $disabled=        "$testdir/$tname.disabled";



  $tinfo->{'master_opt'}= [];

  $tinfo->{'slave_opt'}=  [];

  $tinfo->{'master_opt'}= ["--default-time-zone=+3:00"];

  $tinfo->{'slave_opt'}=  ["--default-time-zone=+3:00"];

  $tinfo->{'slave_mi'}=   [];



  if ( -f $master_opt_file )
@@ -180,9 +180,9 @@ sub collect_one_test_case($$$$$) { 
    $tinfo->{'master_restart'}= 1;    # We think so for now

    # This is a dirty hack from old mysql-test-run, we use the opt file

    # to flag other things as well, it is not a opt list at all

    my $extra_master_opt= mtr_get_opts_from_file($master_opt_file);

    $tinfo->{'master_opt'}= mtr_get_opts_from_file($master_opt_file);



    foreach my $opt (@$extra_master_opt)

    foreach my $opt (@{$tinfo->{'master_opt'}})

    {

      my $value;
@@ -191,7 +191,7 @@ sub collect_one_test_case($$$$$) { 
      if ( defined $value )

      {

        $tinfo->{'timezone'}= $value;

        $extra_master_opt= [];

        $tinfo->{'master_opt'}= [];

        $tinfo->{'master_restart'}= 0;

        last;

      }
@@ -206,13 +206,11 @@ sub collect_one_test_case($$$$$) { 
        {

          $tinfo->{'result_file'}.= $::opt_result_ext;

        }

        $extra_master_opt= [];

        $tinfo->{'master_opt'}= [];

        $tinfo->{'master_restart'}= 0;

        last;

      }

    }



    $tinfo->{'master_opt'}= $extra_master_opt;

  }



  if ( -f $slave_opt_file )

mysql-test/lib/mtr_process.pl

+2 −0
Original line number Diff line number Diff line
@@ -669,6 +669,8 @@ sub mtr_mysqladmin_shutdown () { 
    last;                               # If we got here, we are done

  }



  sleep(5) if $::glob_win32;            # FIXME next startup fails if no sleep



  return $res;

}