mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Adding support for MySQL-5.6 temporal column types:
TIME, DATETIME, TIMESTAMP added: mysql-test/r/type_temporal_mysql56.result mysql-test/std_data/mysql56datetime.MYD mysql-test/std_data/mysql56datetime.MYI mysql-test/std_data/mysql56datetime.frm mysql-test/std_data/mysql56time.MYD mysql-test/std_data/mysql56time.MYI mysql-test/std_data/mysql56time.frm mysql-test/std_data/mysql56timestamp.MYD mysql-test/std_data/mysql56timestamp.MYI mysql-test/std_data/mysql56timestamp.frm mysql-test/suite/rpl/r/rpl_temporal_mysql56.result mysql-test/suite/rpl/t/rpl_temporal_mysql56.test mysql-test/t/type_temporal_mysql56.test sql/compat56.cc sql/compat56.h modified: client/mysqlbinlog.cc include/my_time.h include/mysql.h.pp include/mysql_com.h mysql-test/r/statistics.result mysql-test/r/strict.result mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result sql-common/my_time.c sql/CMakeLists.txt sql/field.cc sql/field.h sql/item.cc sql/item_strfunc.cc sql/item_sum.cc sql/item_timefunc.cc sql/log_event.cc sql/opt_range.cc sql/opt_table_elimination.cc sql/protocol.cc sql/rpl_utility.cc sql/rpl_utility.h sql/sql_partition.cc sql/sql_prepare.cc sql/sql_select.cc sql/sql_table.cc sql/table.cc storage/perfschema/pfs_engine_table.cc
This commit is contained in:
@ -65,6 +65,14 @@ public:
|
||||
ulong size() const { return m_size; }
|
||||
|
||||
|
||||
/**
|
||||
Returns internal binlog type code for one field,
|
||||
without translation to real types.
|
||||
*/
|
||||
enum_field_types binlog_type(ulong index) const
|
||||
{
|
||||
return static_cast<enum_field_types>(m_type[index]);
|
||||
}
|
||||
/*
|
||||
Return a representation of the type data for one field.
|
||||
|
||||
@ -82,7 +90,7 @@ public:
|
||||
either MYSQL_TYPE_STRING, MYSQL_TYPE_ENUM, or MYSQL_TYPE_SET, so
|
||||
we might need to modify the type to get the real type.
|
||||
*/
|
||||
enum_field_types source_type= static_cast<enum_field_types>(m_type[index]);
|
||||
enum_field_types source_type= binlog_type(index);
|
||||
uint16 source_metadata= m_field_metadata[index];
|
||||
switch (source_type)
|
||||
{
|
||||
|
Reference in New Issue
Block a user