diff options
| author | Alexander Barkov <bar@mariadb.org> | 2013-07-10 11:49:17 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2013-07-10 11:49:17 +0400 |
| commit | 5b0774ee1c5a32ef694ce18413fa003bc6646c48 (patch) | |
| tree | 8fb45c65fcf34d2f7e7288a8971a1a38c1200a3a /mysql-test/suite/binlog | |
| parent | 99019afccc2b60ba0f65df70c1f59288744b3608 (diff) | |
| download | mariadb-git-5b0774ee1c5a32ef694ce18413fa003bc6646c48.tar.gz | |
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
Diffstat (limited to 'mysql-test/suite/binlog')
| -rw-r--r-- | mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result | 8 | ||||
| -rw-r--r-- | mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result index a209ec141fe..0c44061c4e9 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result @@ -2404,7 +2404,7 @@ BEGIN ### @28='1000:01:01' /* DATE meta=0 nullable=1 is_null=0 */ ### @29=1000-01-01 00:00:00 /* DATETIME meta=0 nullable=1 is_null=0 */ ### @30=75601 /* TIMESTAMP meta=0 nullable=0 is_null=0 */ -### @31='839:12:57' /* TIME meta=0 nullable=1 is_null=0 */ +### @31='-838:59:59' /* TIME meta=0 nullable=1 is_null=0 */ ### @32=1901 /* YEAR meta=0 nullable=1 is_null=0 */ ### @33='' /* STRING(1) meta=65025 nullable=1 is_null=0 */ ### @34='' /* STRING(0) meta=65024 nullable=1 is_null=0 */ @@ -2766,7 +2766,7 @@ BEGIN ### @28='1000:01:01' /* DATE meta=0 nullable=1 is_null=0 */ ### @29=1000-01-01 00:00:00 /* DATETIME meta=0 nullable=1 is_null=0 */ ### @30=75601 /* TIMESTAMP meta=0 nullable=0 is_null=0 */ -### @31='839:12:57' /* TIME meta=0 nullable=1 is_null=0 */ +### @31='-838:59:59' /* TIME meta=0 nullable=1 is_null=0 */ ### @32=1901 /* YEAR meta=0 nullable=1 is_null=0 */ ### @33='' /* STRING(1) meta=65025 nullable=1 is_null=0 */ ### @34='' /* STRING(0) meta=65024 nullable=1 is_null=0 */ @@ -3019,7 +3019,7 @@ BEGIN ### @28='1000:01:01' /* DATE meta=0 nullable=1 is_null=0 */ ### @29=1000-01-01 00:00:00 /* DATETIME meta=0 nullable=1 is_null=0 */ ### @30=75601 /* TIMESTAMP meta=0 nullable=0 is_null=0 */ -### @31='839:12:57' /* TIME meta=0 nullable=1 is_null=0 */ +### @31='-838:59:59' /* TIME meta=0 nullable=1 is_null=0 */ ### @32=1901 /* YEAR meta=0 nullable=1 is_null=0 */ ### @33='' /* STRING(1) meta=65025 nullable=1 is_null=0 */ ### @34='' /* STRING(0) meta=65024 nullable=1 is_null=0 */ @@ -3551,7 +3551,7 @@ BEGIN ### @28='1000:01:01' /* DATE meta=0 nullable=1 is_null=0 */ ### @29=1000-01-01 00:00:00 /* DATETIME meta=0 nullable=1 is_null=0 */ ### @30=75601 /* TIMESTAMP meta=0 nullable=0 is_null=0 */ -### @31='839:12:57' /* TIME meta=0 nullable=1 is_null=0 */ +### @31='-838:59:59' /* TIME meta=0 nullable=1 is_null=0 */ ### @32=1901 /* YEAR meta=0 nullable=1 is_null=0 */ ### @33='' /* STRING(1) meta=65025 nullable=1 is_null=0 */ ### @34='' /* STRING(0) meta=65024 nullable=1 is_null=0 */ diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result index ff4f26b93e5..e54e33283fd 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result @@ -2404,7 +2404,7 @@ BEGIN ### @28='1000:01:01' /* DATE meta=0 nullable=1 is_null=0 */ ### @29=1000-01-01 00:00:00 /* DATETIME meta=0 nullable=1 is_null=0 */ ### @30=75601 /* TIMESTAMP meta=0 nullable=0 is_null=0 */ -### @31='839:12:57' /* TIME meta=0 nullable=1 is_null=0 */ +### @31='-838:59:59' /* TIME meta=0 nullable=1 is_null=0 */ ### @32=1901 /* YEAR meta=0 nullable=1 is_null=0 */ ### @33='' /* STRING(1) meta=65025 nullable=1 is_null=0 */ ### @34='' /* STRING(0) meta=65024 nullable=1 is_null=0 */ @@ -2773,7 +2773,7 @@ BEGIN ### @28='1000:01:01' /* DATE meta=0 nullable=1 is_null=0 */ ### @29=1000-01-01 00:00:00 /* DATETIME meta=0 nullable=1 is_null=0 */ ### @30=75601 /* TIMESTAMP meta=0 nullable=0 is_null=0 */ -### @31='839:12:57' /* TIME meta=0 nullable=1 is_null=0 */ +### @31='-838:59:59' /* TIME meta=0 nullable=1 is_null=0 */ ### @32=1901 /* YEAR meta=0 nullable=1 is_null=0 */ ### @33='' /* STRING(1) meta=65025 nullable=1 is_null=0 */ ### @34='' /* STRING(0) meta=65024 nullable=1 is_null=0 */ @@ -3028,7 +3028,7 @@ BEGIN ### @28='1000:01:01' /* DATE meta=0 nullable=1 is_null=0 */ ### @29=1000-01-01 00:00:00 /* DATETIME meta=0 nullable=1 is_null=0 */ ### @30=75601 /* TIMESTAMP meta=0 nullable=0 is_null=0 */ -### @31='839:12:57' /* TIME meta=0 nullable=1 is_null=0 */ +### @31='-838:59:59' /* TIME meta=0 nullable=1 is_null=0 */ ### @32=1901 /* YEAR meta=0 nullable=1 is_null=0 */ ### @33='' /* STRING(1) meta=65025 nullable=1 is_null=0 */ ### @34='' /* STRING(0) meta=65024 nullable=1 is_null=0 */ @@ -3568,7 +3568,7 @@ BEGIN ### @28='1000:01:01' /* DATE meta=0 nullable=1 is_null=0 */ ### @29=1000-01-01 00:00:00 /* DATETIME meta=0 nullable=1 is_null=0 */ ### @30=75601 /* TIMESTAMP meta=0 nullable=0 is_null=0 */ -### @31='839:12:57' /* TIME meta=0 nullable=1 is_null=0 */ +### @31='-838:59:59' /* TIME meta=0 nullable=1 is_null=0 */ ### @32=1901 /* YEAR meta=0 nullable=1 is_null=0 */ ### @33='' /* STRING(1) meta=65025 nullable=1 is_null=0 */ ### @34='' /* STRING(0) meta=65024 nullable=1 is_null=0 */ |