database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

WL#3915 : (NDB) master's cols > slave

Browse Source 
Patch corrects minor test anomolies and build warnings.
This commit is contained in:
cbell/Chuck@mysql_cab_desk.
2007-07-27 23:11:36 -04:00
parent b87fc5c5d4
commit 06df6fc137
5 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test
View File

@ -99,7 +99,7 @@ connection master;
#connection slave; #connection slave;
sync_slave_with_master; sync_slave_with_master;
--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # --replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #
--query_vertical show slave status; --query_vertical show slave status;
select * from t1 order by f3; select * from t1 order by f3;
@ -373,7 +373,7 @@ connection master;
select * from t31; select * from t31;
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # --replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #
--query_vertical show slave status; --query_vertical show slave status;
#### Clean Up #### #### Clean Up ####

BIN
mysql-test/r/rpl_extraColmaster_innodb.result
View File

Binary file not shown.

BIN
mysql-test/r/rpl_extraColmaster_myisam.result
View File

Binary file not shown.

BIN
mysql-test/r/rpl_row_extraColmaster_ndb.result
View File

Binary file not shown.

3
sql/field.cc
View File

@ -6404,7 +6404,8 @@ const char *Field_string::unpack(char *to,
{ {
uint from_len= param_data & 0x00ff; // length. uint from_len= param_data & 0x00ff; // length.
uint length= 0; uint length= 0;
uint f_length= (from_len < field_length) ? from_len : field_length; uint f_length;
f_length= (from_len < field_length) ? from_len : field_length;
DBUG_ASSERT(f_length <= 255); DBUG_ASSERT(f_length <= 255);
length= (uint) *from++; length= (uint) *from++;
bitmap_set_bit(table->write_set,field_index); bitmap_set_bit(table->write_set,field_index);