summaryrefslogtreecommitdiff
path: root/mysql-test/suite/vcol/r/binlog.result
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/suite/vcol/r/binlog.result')
-rw-r--r--mysql-test/suite/vcol/r/binlog.result24
1 files changed, 12 insertions, 12 deletions
diff --git a/mysql-test/suite/vcol/r/binlog.result b/mysql-test/suite/vcol/r/binlog.result
index 35bfb50ba2f..83382d47511 100644
--- a/mysql-test/suite/vcol/r/binlog.result
+++ b/mysql-test/suite/vcol/r/binlog.result
@@ -18,10 +18,10 @@ set binlog_row_image="FULL";
CREATE VIEW v1 AS SELECT * FROM t1;
REPLACE INTO v1 SELECT pk, vcol_date, vcol_int, vcol_year, vcol_blob, col_date, col_int, col_blob, 1982 FROM t1;
Warnings:
-Warning 1906 The value specified for generated column 'vcol_date' in table 't1' ignored
-Warning 1906 The value specified for generated column 'vcol_int' in table 't1' ignored
-Warning 1906 The value specified for generated column 'vcol_year' in table 't1' ignored
-Warning 1906 The value specified for generated column 'vcol_blob' in table 't1' ignored
+Warning 1906 The value specified for generated column 'vcol_date' in table 't1' has been ignored
+Warning 1906 The value specified for generated column 'vcol_int' in table 't1' has been ignored
+Warning 1906 The value specified for generated column 'vcol_year' in table 't1' has been ignored
+Warning 1906 The value specified for generated column 'vcol_blob' in table 't1' has been ignored
select col_date,col_int,col_blob,col_year from v1;
col_date col_int col_blob col_year
2010-04-24 5 foo 1982
@@ -35,10 +35,10 @@ set binlog_row_image="MINIMAL";
CREATE VIEW v1 AS SELECT * FROM t1;
REPLACE INTO v1 SELECT pk, vcol_date, vcol_int, vcol_year, vcol_blob, col_date, col_int, col_blob, 1983 FROM t1;
Warnings:
-Warning 1906 The value specified for generated column 'vcol_date' in table 't1' ignored
-Warning 1906 The value specified for generated column 'vcol_int' in table 't1' ignored
-Warning 1906 The value specified for generated column 'vcol_year' in table 't1' ignored
-Warning 1906 The value specified for generated column 'vcol_blob' in table 't1' ignored
+Warning 1906 The value specified for generated column 'vcol_date' in table 't1' has been ignored
+Warning 1906 The value specified for generated column 'vcol_int' in table 't1' has been ignored
+Warning 1906 The value specified for generated column 'vcol_year' in table 't1' has been ignored
+Warning 1906 The value specified for generated column 'vcol_blob' in table 't1' has been ignored
select col_date,col_int,col_blob,col_year from v1;
col_date col_int col_blob col_year
2010-04-24 5 foo 1983
@@ -52,10 +52,10 @@ set @@binlog_row_image="NOBLOB";
CREATE VIEW v1 AS SELECT * FROM t1;
REPLACE INTO v1 SELECT pk, vcol_date, vcol_int, vcol_year, vcol_blob, col_date, col_int, col_blob, 1984 FROM t1;
Warnings:
-Warning 1906 The value specified for generated column 'vcol_date' in table 't1' ignored
-Warning 1906 The value specified for generated column 'vcol_int' in table 't1' ignored
-Warning 1906 The value specified for generated column 'vcol_year' in table 't1' ignored
-Warning 1906 The value specified for generated column 'vcol_blob' in table 't1' ignored
+Warning 1906 The value specified for generated column 'vcol_date' in table 't1' has been ignored
+Warning 1906 The value specified for generated column 'vcol_int' in table 't1' has been ignored
+Warning 1906 The value specified for generated column 'vcol_year' in table 't1' has been ignored
+Warning 1906 The value specified for generated column 'vcol_blob' in table 't1' has been ignored
select col_date,col_int,col_blob,col_year from v1;
col_date col_int col_blob col_year
2010-04-24 5 foo 1984