| List: | Commits | « Previous MessageNext Message » | |
| From: | tomas | Date: | September 5 2007 6:26am |
| Subject: | bk commit into 5.2 tree (tomas:1.2558) | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.2 repository of tomas. When tomas does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2007-09-05 06:26:02+02:00, tomas@stripped +8 -0 post merge result file fix mysql-test/suite/ndb/r/ndb_alter_table.result@stripped, 2007-09-05 06:26:00+02:00, tomas@stripped +1 -1 post merge result file fix mysql-test/suite/ndb/r/ndb_alter_table_online.result@stripped, 2007-09-05 06:26:00+02:00, tomas@stripped +6 -6 post merge result file fix mysql-test/suite/ndb/r/ndb_binlog_basic.result@stripped, 2007-09-05 06:26:00+02:00, tomas@stripped +1 -1 post merge result file fix mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result@stripped, 2007-09-05 06:26:00+02:00, tomas@stripped +1 -1 post merge result file fix mysql-test/suite/ndb/r/ndb_binlog_log_bin.result@stripped, 2007-09-05 06:26:00+02:00, tomas@stripped +1 -1 post merge result file fix mysql-test/suite/ndb/r/ndb_dd_alter.result@stripped, 2007-09-05 06:26:00+02:00, tomas@stripped +7 -7 post merge result file fix mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result@stripped, 2007-09-05 06:26:00+02:00, tomas@stripped +2 -1 post merge result file fix mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result@stripped, 2007-09-05 06:26:00+02:00, tomas@stripped +1 -1 post merge result file fix diff -Nrup a/mysql-test/suite/ndb/r/ndb_alter_table.result b/mysql-test/suite/ndb/r/ndb_alter_table.result --- a/mysql-test/suite/ndb/r/ndb_alter_table.result 2007-09-04 21:15:57 +02:00 +++ b/mysql-test/suite/ndb/r/ndb_alter_table.result 2007-09-05 06:26:00 +02:00 @@ -298,7 +298,7 @@ a b 6 203 alter table t2 add c int; Warnings: -Warning 1475 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN +Warning 1476 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN insert into t2 (b) values (301),(302),(303); select * from t2 where a = 9; a b c diff -Nrup a/mysql-test/suite/ndb/r/ndb_alter_table_online.result b/mysql-test/suite/ndb/r/ndb_alter_table_online.result --- a/mysql-test/suite/ndb/r/ndb_alter_table_online.result 2007-09-04 21:15:57 +02:00 +++ b/mysql-test/suite/ndb/r/ndb_alter_table_online.result 2007-09-05 06:26:00 +02:00 @@ -69,9 +69,9 @@ insert into t1 values (6,6); update t1 set b = 0 where a = 6; ALTER TABLE t1 ADD c CHAR(19), ADD d VARCHAR(255), ADD e char(255); Warnings: -Warning 1475 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN -Warning 1475 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN -Warning 1475 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN +Warning 1476 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN +Warning 1476 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN +Warning 1476 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN update t1 set b = 0 where a = 2; update t1 set b = 0 where a = 4; update t1 set b = 0 where a = 5; @@ -102,9 +102,9 @@ insert into t1 values (6,6); update t1 set b = 0 where a = 6; ALTER TABLE t1 ADD c CHAR(19), ADD d VARCHAR(255), ADD e char(255); Warnings: -Warning 1475 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN -Warning 1475 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN -Warning 1475 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN +Warning 1476 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN +Warning 1476 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN +Warning 1476 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN update t1 set b = 0 where a = 2; update t1 set b = 0 where a = 4; update t1 set b = 0 where a = 5; diff -Nrup a/mysql-test/suite/ndb/r/ndb_binlog_basic.result b/mysql-test/suite/ndb/r/ndb_binlog_basic.result --- a/mysql-test/suite/ndb/r/ndb_binlog_basic.result 2007-08-30 07:31:28 +02:00 +++ b/mysql-test/suite/ndb/r/ndb_binlog_basic.result 2007-09-05 06:26:00 +02:00 @@ -12,7 +12,7 @@ select @max_epoch:=max(epoch)-1 from mys delete from t1; alter table t1 add (b int); Warnings: -Warning 1475 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN +Warning 1476 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN insert into t1 values (3,3),(4,4); alter table t1 rename t2; begin; diff -Nrup a/mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result b/mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result --- a/mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result 2007-08-30 07:31:28 +02:00 +++ b/mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result 2007-09-05 06:26:00 +02:00 @@ -22,7 +22,7 @@ reset master; reset master; alter table t2 add column (b int); Warnings: -Warning 1475 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN +Warning 1476 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN show binlog events from <binlog_start>; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query 102 # use `test`; alter table t2 add column (b int) diff -Nrup a/mysql-test/suite/ndb/r/ndb_binlog_log_bin.result b/mysql-test/suite/ndb/r/ndb_binlog_log_bin.result --- a/mysql-test/suite/ndb/r/ndb_binlog_log_bin.result 2007-08-30 07:31:28 +02:00 +++ b/mysql-test/suite/ndb/r/ndb_binlog_log_bin.result 2007-09-05 06:26:00 +02:00 @@ -10,7 +10,7 @@ create table t2 (a int key, b int) engin insert into t1 values (1,1); alter table t1 add c int; Warnings: -Warning 1475 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN +Warning 1476 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN show binlog events from <binlog_start>; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query 1 # BEGIN diff -Nrup a/mysql-test/suite/ndb/r/ndb_dd_alter.result b/mysql-test/suite/ndb/r/ndb_dd_alter.result --- a/mysql-test/suite/ndb/r/ndb_dd_alter.result 2007-09-04 21:15:57 +02:00 +++ b/mysql-test/suite/ndb/r/ndb_dd_alter.result 2007-09-05 06:26:00 +02:00 @@ -317,8 +317,8 @@ TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PA NULL test t1 p0 NULL 1 NULL KEY NULL NULL NULL 0 0 0 NULL 0 0 NULL NULL NULL NULL default ts ALTER TABLE test.t1 ADD a2 FLOAT, ADD a3 DOUBLE; Warnings: -Warning 1475 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN -Warning 1475 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN +Warning 1476 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN +Warning 1476 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN SELECT * FROM information_schema.partitions WHERE table_name= 't1' AND partition_name = 'p0'; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PARTITION_NAME SUBPARTITION_NAME PARTITION_ORDINAL_POSITION SUBPARTITION_ORDINAL_POSITION PARTITION_METHOD SUBPARTITION_METHOD PARTITION_EXPRESSION SUBPARTITION_EXPRESSION PARTITION_DESCRIPTION TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE CREATE_TIME UPDATE_TIME CHECK_TIME CHECKSUM PARTITION_COMMENT NODEGROUP TABLESPACE_NAME NULL test t1 p0 NULL 1 NULL KEY NULL NULL NULL 0 0 0 NULL 0 0 NULL NULL NULL NULL default ts @@ -346,11 +346,11 @@ a1 a2 a3 20 21.2345 20000020 ALTER TABLE test.t1 ADD a4 BIT, ADD a5 TINYINT, ADD a6 BIGINT, ADD a7 DATE, ADD a8 TIME; Warnings: -Warning 1475 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN -Warning 1475 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN -Warning 1475 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN -Warning 1475 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN -Warning 1475 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN +Warning 1476 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN +Warning 1476 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN +Warning 1476 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN +Warning 1476 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN +Warning 1476 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN SELECT a1,a2,a3,hex(a4), a5,a6,a7,a8 FROM test.t1 ORDER BY a1; a1 a2 a3 hex(a4) a5 a6 a7 a8 1 2.2345 20000001 0 1 23457 2006-01-01 07:04:00 diff -Nrup a/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result b/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result --- a/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result 2007-09-04 20:01:45 +02:00 +++ b/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result 2007-09-05 06:26:00 +02:00 @@ -867,7 +867,8 @@ master-bin.000001 # Query 1 # use `test_ master-bin.000001 # Xid 1 # # master-bin.000001 # Query 1 # use `test_rpl`; DELETE FROM t2 master-bin.000001 # Xid 1 # # -master-bin.000001 # Begin_load_query 1 # ;file_id=1;block_len=30 +master-bin.000001 # Begin_load_query 1 # ;file_id=#;block_len=# +master-bin.000001 # Execute_load_query 1 # use `test_rpl`; LOAD DATA INFILE '../tmp/rpl_mixed.dat' INTO TABLE t1 FIELDS TERMINATED BY '|' ;file_id=# master-bin.000001 # Xid 1 # # master-bin.000001 # Query 1 # use `test_rpl`; DELETE FROM t1 master-bin.000001 # Xid 1 # # diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result 2007-09-04 21:15:58 +02:00 +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result 2007-09-05 06:26:00 +02:00 @@ -193,7 +193,7 @@ CREATE TABLE t1 (c1 INT KEY) ENGINE=NDB; INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10); ALTER TABLE t1 ADD c2 INT; Warnings: -Warning 1475 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN +Warning 1476 Converted FIXED field to DYNAMIC to enable on-line ADD COLUMN SELECT * FROM t1 ORDER BY c1; c1 c2 1 NULL
| Thread | ||
|---|---|---|
| • bk commit into 5.2 tree (tomas:1.2558) | tomas | 5 Sep |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.062 sec. using MySQL 5.1.14-beta-log