mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
MDEV-7268 Column of table cannot be converted from type 'decimal(0,?)' to type ' 'decimal(10,7)'
Changing the error message to: "...from type 'decimal(0,?)/*old*/' to type ' 'decimal(10,7)'..." So it's now clear that the master data type is OLD decimal.
This commit is contained in:
9
mysql-test/suite/rpl/r/rpl_old_decimal.result
Normal file
9
mysql-test/suite/rpl/r/rpl_old_decimal.result
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
include/master-slave.inc
|
||||||
|
[connection master]
|
||||||
|
CREATE TABLE t1dec102 (a DECIMAL(10,2));
|
||||||
|
INSERT INTO t1dec102 VALUES(999.99);
|
||||||
|
call mtr.add_suppression("Slave SQL.*Column 0 of table .* cannot be converted from type.* Error_code: 1677");
|
||||||
|
include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
|
||||||
|
Last_SQL_Error = 'Column 0 of table 'test.t1dec102' cannot be converted from type 'decimal(0,?)/*old*/' to type 'decimal(10,2)''
|
||||||
|
DROP TABLE t1dec102;
|
||||||
|
include/rpl_end.inc
|
25
mysql-test/suite/rpl/t/rpl_old_decimal.test
Normal file
25
mysql-test/suite/rpl/t/rpl_old_decimal.test
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
--source include/have_binlog_format_row.inc
|
||||||
|
--source include/master-slave.inc
|
||||||
|
|
||||||
|
|
||||||
|
--connection slave
|
||||||
|
CREATE TABLE t1dec102 (a DECIMAL(10,2));
|
||||||
|
|
||||||
|
--connection master
|
||||||
|
let $MYSQLD_DATADIR= `select @@datadir`;
|
||||||
|
|
||||||
|
--copy_file std_data/old_decimal/t1dec102.frm $MYSQLD_DATADIR/test/t1dec102.frm
|
||||||
|
--copy_file std_data/old_decimal/t1dec102.MYD $MYSQLD_DATADIR/test/t1dec102.MYD
|
||||||
|
--copy_file std_data/old_decimal/t1dec102.MYI $MYSQLD_DATADIR/test/t1dec102.MYI
|
||||||
|
INSERT INTO t1dec102 VALUES(999.99);
|
||||||
|
|
||||||
|
--let $slave_sql_errno=1677
|
||||||
|
--let $show_slave_sql_error= 1
|
||||||
|
call mtr.add_suppression("Slave SQL.*Column 0 of table .* cannot be converted from type.* Error_code: 1677");
|
||||||
|
--source include/wait_for_slave_sql_error_and_skip.inc
|
||||||
|
|
||||||
|
--connection master
|
||||||
|
DROP TABLE t1dec102;
|
||||||
|
--sync_slave_with_master
|
||||||
|
|
||||||
|
--source include/rpl_end.inc
|
@@ -417,7 +417,7 @@ void show_sql_type(enum_field_types type, uint16 metadata, String *str, CHARSET_
|
|||||||
CHARSET_INFO *cs= str->charset();
|
CHARSET_INFO *cs= str->charset();
|
||||||
uint32 length=
|
uint32 length=
|
||||||
cs->cset->snprintf(cs, (char*) str->ptr(), str->alloced_length(),
|
cs->cset->snprintf(cs, (char*) str->ptr(), str->alloced_length(),
|
||||||
"decimal(%d,?)", metadata);
|
"decimal(%d,?)/*old*/", metadata);
|
||||||
str->length(length);
|
str->length(length);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
Reference in New Issue
Block a user