Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats 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
1.2163 06/06/13 12:54:21 mats@stripped +5 -0
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into mysql.com:/home/bk/b19066-mysql-5.1-new
sql/sql_class.h
1.297 06/06/13 12:54:16 mats@stripped +1 -2
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into mysql.com:/home/bk/b19066-mysql-5.1-new
mysql-test/t/disabled.def
1.158 06/06/13 12:54:15 mats@stripped +0 -1
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into mysql.com:/home/bk/b19066-mysql-5.1-new
mysql-test/r/binlog_row_mix_innodb_myisam.result
1.9 06/06/13 12:54:15 mats@stripped +1 -17
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into mysql.com:/home/bk/b19066-mysql-5.1-new
mysql-test/r/view.result
1.160 06/06/13 12:45:47 mats@stripped +0 -0
Auto merged
mysql-test/r/show_check.result
1.95 06/06/13 12:45:47 mats@stripped +0 -0
Auto merged
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: mats
# Host: romeo.(none)
# Root: /home/bk/b19066-mysql-5.1-new/RESYNC
--- 1.296/sql/sql_class.h 2006-05-31 19:21:42 +02:00
+++ 1.297/sql/sql_class.h 2006-06-13 12:54:16 +02:00
@@ -1395,6 +1395,10 @@
{
current_stmt_binlog_row_based= TRUE;
}
+ inline void clear_current_stmt_binlog_row_based()
+ {
+ current_stmt_binlog_row_based= FALSE;
+ }
#endif
inline void reset_current_stmt_binlog_row_based()
{
@@ -1405,7 +1409,6 @@
current_stmt_binlog_row_based= FALSE;
#endif
}
-#endif /*HAVE_ROW_BASED_REPLICATION*/
};
--- 1.159/mysql-test/r/view.result 2006-05-17 12:29:12 +02:00
+++ 1.160/mysql-test/r/view.result 2006-06-13 12:45:47 +02:00
@@ -1106,21 +1106,21 @@
Warnings:
Error 1369 CHECK OPTION failed 'test.v1'
Error 1369 CHECK OPTION failed 'test.v1'
-select * from t1;
+select * from t1 order by a desc;
a
1
0
update v1 set a=-1 where a=0;
update v1 set a=2 where a=1;
ERROR HY000: CHECK OPTION failed 'test.v1'
-select * from t1;
+select * from t1 order by a desc;
a
1
-1
update v1 set a=0 where a=0;
insert into t2 values (1);
update v1,t2 set v1.a=v1.a-1 where v1.a=t2.a;
-select * from t1;
+select * from t1 order by a desc;
a
0
-1
@@ -1310,12 +1310,12 @@
Error 1369 CHECK OPTION failed 'test.v1'
Warning 1264 Out of range value for column 'a' at row 4
Error 1369 CHECK OPTION failed 'test.v1'
-select * from t1;
+select * from t1 order by a,b;
a b
1 row 1
2 row 2
3 row 3
-select * from v1;
+select * from v1 order by a,b;
a b
1 row 1
2 row 2
--- 1.8/mysql-test/r/binlog_row_mix_innodb_myisam.result 2006-05-31 19:21:40 +02:00
+++ 1.9/mysql-test/r/binlog_row_mix_innodb_myisam.result 2006-06-13 12:54:15 +02:00
@@ -262,23 +262,27 @@
master-bin.000001 243 Table_map 1 # table_id: # (test.t1)
master-bin.000001 282 Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 316 Xid 1 # COMMIT /* xid= */
-master-bin.000001 343 Query 1 # use `test`; delete from t1
-master-bin.000001 420 Xid 1 # COMMIT /* xid= */
-master-bin.000001 447 Query 1 # use `test`; delete from t2
-master-bin.000001 524 Xid 1 # COMMIT /* xid= */
-master-bin.000001 551 Query 1 # use `test`; alter table t2 engine=MyISAM
-master-bin.000001 642 Table_map 1 # table_id: # (test.t1)
-master-bin.000001 681 Write_rows 1 # table_id: # flags: STMT_END_F
-master-bin.000001 715 Xid 1 # COMMIT /* xid= */
-master-bin.000001 742 Table_map 1 # table_id: # (test.t2)
-master-bin.000001 781 Write_rows 1 # table_id: # flags: STMT_END_F
-master-bin.000001 815 Query 1 # use `test`; drop table t1,t2
-master-bin.000001 894 Query 1 # use `test`; create table t0 (n int)
-master-bin.000001 980 Table_map 1 # table_id: # (test.t0)
-master-bin.000001 1019 Write_rows 1 # table_id: # flags: STMT_END_F
-master-bin.000001 1053 Table_map 1 # table_id: # (test.t0)
-master-bin.000001 1092 Write_rows 1 # table_id: # flags: STMT_END_F
-master-bin.000001 1126 Query 1 # use `test`; create table t2 (n int) engine=innodb
+master-bin.000001 343 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 382 Delete_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 421 Xid 1 # COMMIT /* xid= */
+master-bin.000001 448 Table_map 1 # table_id: # (test.t2)
+master-bin.000001 487 Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 516 Xid 1 # COMMIT /* xid= */
+master-bin.000001 543 Query 1 # use `test`; alter table t2 engine=MyISAM
+master-bin.000001 634 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 673 Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 707 Xid 1 # COMMIT /* xid= */
+master-bin.000001 734 Query 1 # use `test`; BEGIN
+master-bin.000001 802 Table_map 1 # table_id: # (test.t1)
+master-bin.000001 841 Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 870 Xid 1 # COMMIT /* xid= */
+master-bin.000001 897 Query 1 # use `test`; drop table t1,t2
+master-bin.000001 976 Query 1 # use `test`; create table t0 (n int)
+master-bin.000001 1062 Table_map 1 # table_id: # (test.t0)
+master-bin.000001 1101 Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 1135 Table_map 1 # table_id: # (test.t0)
+master-bin.000001 1174 Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 1208 Query 1 # use `test`; create table t2 (n int) engine=innodb
do release_lock("lock1");
drop table t0,t2;
reset master;
--- 1.94/mysql-test/r/show_check.result 2006-05-09 17:13:32 +02:00
+++ 1.95/mysql-test/r/show_check.result 2006-06-13 12:45:47 +02:00
@@ -382,9 +382,9 @@
t1 MEMORY 10 Fixed 4 # # # # # NULL NULL NULL NULL latin1_swedish_ci NULL
t2 MEMORY 10 Fixed 4 # # # # # NULL NULL NULL NULL latin1_swedish_ci NULL
t3 MEMORY 10 Fixed 4 # # # # # NULL NULL NULL NULL latin1_swedish_ci NULL
-delete from t1;
-delete from t2;
-delete from t3;
+truncate table t1;
+truncate table t2;
+truncate table t3;
show table status;
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
t1 MEMORY 10 Fixed 0 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL
| Thread |
|---|
| • bk commit into 5.1 tree (mats:1.2163) | Mats Kindahl | 20 Jun |
