Commit ff509df7 authored by unknown's avatar unknown
Browse files

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 

into  siva.hindu.god:/usr/home/tim/m/bk/51


mysql-test/mysql-test-run.pl:
  Auto merged
parents 8e1f5450 610afd42

mysql-test/include/have_multi_ndb.inc

+4 −0
Original line number Diff line number Diff line
@@ -24,5 +24,9 @@ flush tables; 
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';

enable_query_log;



# Check should be here as well...

# # Check that second master mysqld has come out of redonly mode

# --source include/ndb_not_readonly.inc



# Set the default connection to 'server1'

connection server1;

mysql-test/include/have_ndb.inc

+4 −0
Original line number Diff line number Diff line
@@ -4,4 +4,8 @@ disable_query_log; 
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';

enable_query_log;



# Check that master mysqld has come out of redonly mode

--source include/ndb_not_readonly.inc

mysql-test/include/ndb_not_readonly.inc

0 → 100644
+31 −0
Original line number Diff line number Diff line 
# Check that server has come out ot readonly mode

--disable_query_log

let $counter= 100;

let $mysql_errno= 1;

while ($mysql_errno)

{

  --error 0, 1005

  create table check_read_only(a int) engine=NDB;

  sleep 0.1;

  if (!$counter)

  {

    die("Failed while waiting for mysqld to come out of readonly mode");

  }

  dec $counter;

}



let $counter= 100;

let $mysql_errno= 1;

while ($mysql_errno)

{

  --error 0, 1036

  insert into check_read_only values(1);

  sleep 0.1;

  if (!$counter)

  {

    die("Failed while waiting for mysqld to come out of readonly mode");

  }

  dec $counter;

}

drop table check_read_only;

--enable_query_log

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ our $opt_mark_progress; 
our $opt_skip;

our $opt_skip_rpl;

our $max_slave_num= 0;

our $max_master_num= 0;

our $max_master_num= 1;

our $use_innodb;

our $opt_skip_test;

our $opt_skip_im;

mysql-test/r/ctype_hebrew.result

0 → 100644
+11 −0
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1;

SET NAMES hebrew;

CREATE TABLE t1 (a char(1)) DEFAULT CHARSET=hebrew;

INSERT INTO t1 VALUES (0xFD),(0xFE);

ALTER TABLE t1 CONVERT TO CHARACTER SET utf8;

SELECT HEX(a) FROM t1;

HEX(a)

E2808E

E2808F

DROP TABLE t1;

End of 4.1 tests