mirror of
https://github.com/MariaDB/server.git
synced 2025-11-01 19:36:12 +01:00
- Adding optional qualifiers to data types:
CREATE TABLE t1 (a schema.DATE);
Qualifiers now work only for three pre-defined schemas:
mariadb_schema
oracle_schema
maxdb_schema
These schemas are virtual (hard-coded) for now, but may turn into real
databases on disk in the future.
- mariadb_schema.TYPE now always resolves to a true MariaDB data
type TYPE without sql_mode specific translations.
- oracle_schema.DATE translates to MariaDB DATETIME.
- maxdb_schema.TIMESTAMP translates to MariaDB DATETIME.
- Fixing SHOW CREATE TABLE to use a qualifier for a data type TYPE
if the current sql_mode translates TYPE to something else.
The above changes fix the reported problem, so this script:
SET sql_mode=ORACLE;
CREATE TABLE t2 AS SELECT mariadb_date_column FROM t1;
is now replicated as:
SET sql_mode=ORACLE;
CREATE TABLE t2 (mariadb_date_column mariadb_schema.DATE);
and the slave can unambiguously treat DATE as the true MariaDB DATE
without ORACLE specific translation to DATETIME.
Similar,
SET sql_mode=MAXDB;
CREATE TABLE t2 AS SELECT mariadb_timestamp_column FROM t1;
is now replicated as:
SET sql_mode=MAXDB;
CREATE TABLE t2 (mariadb_timestamp_column mariadb_schema.TIMESTAMP);
so the slave treats TIMESTAMP as the true MariaDB TIMESTAMP
without MAXDB specific translation to DATETIME.
34 lines
780 B
Text
34 lines
780 B
Text
--source include/have_binlog_format_row.inc
|
|
--source include/master-slave.inc
|
|
|
|
--echo #
|
|
--echo # MDEV-19632 Replication aborts with ER_SLAVE_CONVERSION_FAILED upon CREATE ... SELECT in ORACLE mode
|
|
--echo #
|
|
|
|
SET timestamp=UNIX_TIMESTAMP('2001-01-01 10:00:00');
|
|
SET sql_mode=DEFAULT;
|
|
CREATE TABLE t1 (a TIMESTAMP);
|
|
INSERT INTO t1 VALUES (NULL);
|
|
INSERT INTO t1 VALUES ('2001-01-01 10:20:30');
|
|
SET sql_mode=MAXDB;
|
|
CREATE TABLE t2 SELECT * FROM t1;
|
|
SET timestamp=DEFAULT;
|
|
|
|
--let $binlog_file = LAST
|
|
source include/show_binlog_events.inc;
|
|
|
|
|
|
--sync_slave_with_master
|
|
SELECT * FROM t1;
|
|
SET sql_mode=DEFAULT;
|
|
SHOW CREATE TABLE t1;
|
|
SHOW CREATE TABLE t2;
|
|
|
|
SET sql_mode=MAXDB;
|
|
SHOW CREATE TABLE t1;
|
|
SHOW CREATE TABLE t2;
|
|
|
|
--connection master
|
|
DROP TABLE t1, t2;
|
|
|
|
--source include/rpl_end.inc
|