Skip to content

M
MariaDB
Commit 1e9c2b23 authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Merge 10.1 into 10.2

parents c676f58c a6585d5c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 478 additions and 422 deletions
client/mysql.cc
View file @ 1e9c2b23
...@@ -3789,9 +3789,10 @@ print_table_data_html(MYSQL_RES *result) ...@@ -3789,9 +3789,10 @@ print_table_data_html(MYSQL_RES *result)
MYSQL_FIELD *field; MYSQL_FIELD *field;
mysql_field_seek(result,0); mysql_field_seek(result,0);
(void) tee_fputs("<TABLE BORDER=1><TR>", PAGER); (void) tee_fputs("<TABLE BORDER=1>", PAGER);
if (column_names) if (column_names)
{ {
(void) tee_fputs("<TR>", PAGER);
while((field = mysql_fetch_field(result))) while((field = mysql_fetch_field(result)))
{ {
tee_fputs("<TH>", PAGER); tee_fputs("<TH>", PAGER);
......
mysql-test/include/mix2.inc
View file @ 1e9c2b23
...@@ -1153,7 +1153,7 @@ checksum table t1, t2, t3, t4, t5, t6, t7 extended; ...@@ -1153,7 +1153,7 @@ checksum table t1, t2, t3, t4, t5, t6, t7 extended;
drop table t1,t2,t3, t4, t5, t6; drop table t1,t2,t3, t4, t5, t6;
# #
# Test problem with refering to different fields in same table in UNION # Test problem with referring to different fields in same table in UNION
# (Bug#2552: UNION returns NULL instead of expected value (innoDB only tables)) # (Bug#2552: UNION returns NULL instead of expected value (innoDB only tables))
# #
eval create table t1 (id int, name char(10) not null, name2 char(10) not null) engine=$engine_type; eval create table t1 (id int, name char(10) not null, name2 char(10) not null) engine=$engine_type;
......
mysql-test/r/ddl_i18n_koi8r.result
View file @ 1e9c2b23
This diff is collapsed.
mysql-test/r/ddl_i18n_utf8.result
View file @ 1e9c2b23
This diff is collapsed.
mysql-test/r/events_1.result
View file @ 1e9c2b23
...@@ -55,7 +55,7 @@ SECOND 10 SELECT 1 ...@@ -55,7 +55,7 @@ SECOND 10 SELECT 1
SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test'; SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';
execute_at IS NULL starts IS NULL ends IS NULL comment execute_at IS NULL starts IS NULL ends IS NULL comment
1 0 1 1 0 1
ALTER EVENT event_starts_test ON SCHEDULE AT '2020-02-02 20:00:02'; ALTER EVENT event_starts_test ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE;
SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test'; SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';
execute_at IS NULL starts IS NULL ends IS NULL comment execute_at IS NULL starts IS NULL ends IS NULL comment
0 1 1 0 1 1
...@@ -68,7 +68,7 @@ SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.even ...@@ -68,7 +68,7 @@ SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.even
execute_at IS NULL starts IS NULL ends IS NULL comment execute_at IS NULL starts IS NULL ends IS NULL comment
0 1 1 0 1 1
DROP EVENT event_starts_test; DROP EVENT event_starts_test;
CREATE EVENT event_starts_test ON SCHEDULE EVERY 20 SECOND STARTS '2020-02-02 20:00:02' ENDS '2022-02-02 20:00:02' DO SELECT 2; CREATE EVENT event_starts_test ON SCHEDULE EVERY 20 SECOND STARTS '1970-01-02 00:00:00' ENDS '1970-01-03 00:00:00' ON COMPLETION PRESERVE DISABLE DO SELECT 2;
SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test'; SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';
execute_at IS NULL starts IS NULL ends IS NULL comment execute_at IS NULL starts IS NULL ends IS NULL comment
1 0 0 1 0 0
......
mysql-test/r/mysql.result
View file @ 1e9c2b23
...@@ -626,3 +626,7 @@ count(*) ...@@ -626,3 +626,7 @@ count(*)
0 0
truncate table t1; truncate table t1;
drop table t1; drop table t1;
#
# MDEV-15538 '-N' Produce html output wrong
#
<TABLE BORDER=1><TR><TD>1</TD></TR></TABLE>
\ No newline at end of file
mysql-test/r/show_check.result
View file @ 1e9c2b23
...@@ -1448,7 +1448,7 @@ CREATE TABLE t1(c1 CHAR(10)); ...@@ -1448,7 +1448,7 @@ CREATE TABLE t1(c1 CHAR(10));
CREATE TRIGGER t1_bi BEFORE INSERT ON t1 CREATE TRIGGER t1_bi BEFORE INSERT ON t1
FOR EACH ROW FOR EACH ROW
SET NEW.c1 = ''; SET NEW.c1 = '';
CREATE EVENT ev1 ON SCHEDULE AT '2030-01-01 00:00:00' DO SELECT '' AS test; CREATE EVENT ev1 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO SELECT '' AS test;
set names utf8; set names utf8;
SHOW CREATE VIEW v1; SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection View Create View character_set_client collation_connection
...@@ -1468,7 +1468,7 @@ FOR EACH ROW ...@@ -1468,7 +1468,7 @@ FOR EACH ROW
SET NEW.c1 = 'тест' koi8r koi8r_general_ci latin1_swedish_ci # SET NEW.c1 = 'тест' koi8r koi8r_general_ci latin1_swedish_ci #
SHOW CREATE EVENT ev1; SHOW CREATE EVENT ev1;
Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation
ev1 STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO SELECT 'тест' AS test koi8r koi8r_general_ci latin1_swedish_ci ev1 STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO SELECT 'тест' AS test koi8r koi8r_general_ci latin1_swedish_ci
DROP VIEW v1; DROP VIEW v1;
DROP PROCEDURE p1; DROP PROCEDURE p1;
DROP FUNCTION f1; DROP FUNCTION f1;
......
mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test
View file @ 1e9c2b23
...@@ -10,15 +10,15 @@ set global binlog_checksum=NONE; ...@@ -10,15 +10,15 @@ set global binlog_checksum=NONE;
--disable_warnings --disable_warnings
drop table if exists t1; drop table if exists t1;
--enable_warnings --enable_warnings
reset master;
# We need this for getting fixed timestamps inside of this test. # We need this for getting fixed timestamps inside of this test.
# I use a date in the future to keep a growing timestamp along the # I use a date in the past to keep a growing timestamp along the
# binlog (including the Start_log_event). This test will work # binlog (including the Start_log_event). This test will work
# unchanged everywhere, because mysql-test-run has fixed TZ, which it # unchanged everywhere, because mysql-test-run has fixed TZ, which it
# exports (so mysqlbinlog has same fixed TZ). # exports (so mysqlbinlog has same fixed TZ).
set @a=UNIX_TIMESTAMP("2020-01-21 15:32:22"); set @a=UNIX_TIMESTAMP("1970-01-21 15:32:22");
set timestamp=@a; set timestamp=@a;
reset master;
create table t1 (a int auto_increment not null primary key, b char(3)); create table t1 (a int auto_increment not null primary key, b char(3));
insert into t1 values(null, "a"); insert into t1 values(null, "a");
insert into t1 values(null, "b"); insert into t1 values(null, "b");
...@@ -72,11 +72,11 @@ let $stop_pos= `select @binlog_start_pos + 857`; ...@@ -72,11 +72,11 @@ let $stop_pos= `select @binlog_start_pos + 857`;
--disable_query_log --disable_query_log
select "--- start-datetime --" as ""; select "--- start-datetime --" as "";
--enable_query_log --enable_query_log
--exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 --exec $MYSQL_BINLOG --short-form "--start-datetime=1970-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001
--disable_query_log --disable_query_log
select "--- stop-datetime --" as ""; select "--- stop-datetime --" as "";
--enable_query_log --enable_query_log
--exec $MYSQL_BINLOG --short-form "--stop-datetime=2020-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 --exec $MYSQL_BINLOG --short-form "--stop-datetime=1970-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001
--disable_query_log --disable_query_log
select "--- Local with 2 binlogs on command line --" as ""; select "--- Local with 2 binlogs on command line --" as "";
...@@ -104,11 +104,11 @@ let $stop_pos= `select @binlog_start_pos + 134`; ...@@ -104,11 +104,11 @@ let $stop_pos= `select @binlog_start_pos + 134`;
--disable_query_log --disable_query_log
select "--- start-datetime --" as ""; select "--- start-datetime --" as "";
--enable_query_log --enable_query_log
--exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 --exec $MYSQL_BINLOG --short-form "--start-datetime=1970-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002
--disable_query_log --disable_query_log
select "--- stop-datetime --" as ""; select "--- stop-datetime --" as "";
--enable_query_log --enable_query_log
--exec $MYSQL_BINLOG --short-form "--stop-datetime=2020-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 --exec $MYSQL_BINLOG --short-form "--stop-datetime=1970-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002
--disable_query_log --disable_query_log
select "--- Remote --" as ""; select "--- Remote --" as "";
...@@ -139,11 +139,11 @@ let $stop_pos= `select @binlog_start_pos + 812`; ...@@ -139,11 +139,11 @@ let $stop_pos= `select @binlog_start_pos + 812`;
--disable_query_log --disable_query_log
select "--- start-datetime --" as ""; select "--- start-datetime --" as "";
--enable_query_log --enable_query_log
--exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 --exec $MYSQL_BINLOG --short-form "--start-datetime=1970-01-21 15:32:24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
--disable_query_log --disable_query_log
select "--- stop-datetime --" as ""; select "--- stop-datetime --" as "";
--enable_query_log --enable_query_log
--exec $MYSQL_BINLOG --short-form "--stop-datetime=2020-01-21 15:32:24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 --exec $MYSQL_BINLOG --short-form "--stop-datetime=1970-01-21 15:32:24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
--disable_query_log --disable_query_log
select "--- Remote with 2 binlogs on command line --" as ""; select "--- Remote with 2 binlogs on command line --" as "";
...@@ -168,11 +168,11 @@ let $stop_pos= `select @binlog_start_pos + 109`; ...@@ -168,11 +168,11 @@ let $stop_pos= `select @binlog_start_pos + 109`;
--disable_query_log --disable_query_log
select "--- start-datetime --" as ""; select "--- start-datetime --" as "";
--enable_query_log --enable_query_log
--exec $MYSQL_BINLOG --short-form "--start-datetime=20200121153224" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 --exec $MYSQL_BINLOG --short-form "--start-datetime=19700121153224" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002
--disable_query_log --disable_query_log
select "--- stop-datetime --" as ""; select "--- stop-datetime --" as "";
--enable_query_log --enable_query_log
--exec $MYSQL_BINLOG --short-form "--stop-datetime=2020/01/21 15@32@24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 --exec $MYSQL_BINLOG --short-form "--stop-datetime=1970/01/21 15@32@24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002
--disable_query_log --disable_query_log
select "--- to-last-log --" as ""; select "--- to-last-log --" as "";
......
mysql-test/suite/gcol/r/gcol_column_def_options_innodb.result
View file @ 1e9c2b23
...@@ -357,14 +357,14 @@ DROP TABLE t1; ...@@ -357,14 +357,14 @@ DROP TABLE t1;
SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR
CREATE TABLE t1 (c1 INT, c2 INT AS (c1 * 2)) SELECT 1 AS c1, 5 AS c2; CREATE TABLE t1 (c1 INT, c2 INT AS (c1 * 2)) SELECT 1 AS c1, 5 AS c2;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'c2' in table 't1' ignored Warning 1906 The value specified for generated column 'c2' in table 't1' has been ignored
CREATE TABLE t2 (a int); CREATE TABLE t2 (a int);
INSERT INTO t2 values(1); INSERT INTO t2 values(1);
DROP TABLE t1; DROP TABLE t1;
SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR
CREATE TABLE t1 (c1 INT, c2 INT AS (c1 * 2)) SELECT 1 AS c1, a AS c2 from t2; CREATE TABLE t1 (c1 INT, c2 INT AS (c1 * 2)) SELECT 1 AS c1, a AS c2 from t2;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'c2' in table 't1' ignored Warning 1906 The value specified for generated column 'c2' in table 't1' has been ignored
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 (c1 INT, c2 INT AS (c1 * 2)) SELECT 1 AS c1, 5; CREATE TABLE t1 (c1 INT, c2 INT AS (c1 * 2)) SELECT 1 AS c1, 5;
SELECT * FROM t1; SELECT * FROM t1;
......
mysql-test/suite/gcol/r/gcol_column_def_options_myisam.result
View file @ 1e9c2b23
...@@ -357,14 +357,14 @@ DROP TABLE t1; ...@@ -357,14 +357,14 @@ DROP TABLE t1;
SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR
CREATE TABLE t1 (c1 INT, c2 INT AS (c1 * 2)) SELECT 1 AS c1, 5 AS c2; CREATE TABLE t1 (c1 INT, c2 INT AS (c1 * 2)) SELECT 1 AS c1, 5 AS c2;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'c2' in table 't1' ignored Warning 1906 The value specified for generated column 'c2' in table 't1' has been ignored
CREATE TABLE t2 (a int); CREATE TABLE t2 (a int);
INSERT INTO t2 values(1); INSERT INTO t2 values(1);
DROP TABLE t1; DROP TABLE t1;
SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR
CREATE TABLE t1 (c1 INT, c2 INT AS (c1 * 2)) SELECT 1 AS c1, a AS c2 from t2; CREATE TABLE t1 (c1 INT, c2 INT AS (c1 * 2)) SELECT 1 AS c1, a AS c2 from t2;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'c2' in table 't1' ignored Warning 1906 The value specified for generated column 'c2' in table 't1' has been ignored
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 (c1 INT, c2 INT AS (c1 * 2)) SELECT 1 AS c1, 5; CREATE TABLE t1 (c1 INT, c2 INT AS (c1 * 2)) SELECT 1 AS c1, 5;
SELECT * FROM t1; SELECT * FROM t1;
......
mysql-test/suite/gcol/r/gcol_ins_upd_innodb.result
View file @ 1e9c2b23
...@@ -25,8 +25,8 @@ a b c ...@@ -25,8 +25,8 @@ a b c
# INSERT INTO tbl_name VALUES... a non-NULL value is specified against gcols # INSERT INTO tbl_name VALUES... a non-NULL value is specified against gcols
insert ignore into t1 values (1,2,3); insert ignore into t1 values (1,2,3);
Warnings: Warnings:
Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
Warning 1906 The value specified for generated column 'c' in table 't1' ignored Warning 1906 The value specified for generated column 'c' in table 't1' has been ignored
select * from t1; select * from t1;
a b c a b c
1 -1 -1 1 -1 -1
...@@ -65,8 +65,8 @@ a b c ...@@ -65,8 +65,8 @@ a b c
# against gcols # against gcols
insert ignore into t1 (a,b) values (1,3), (2,4); insert ignore into t1 (a,b) values (1,3), (2,4);
Warnings: Warnings:
Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
select * from t1; select * from t1;
a b c a b c
1 -1 -1 1 -1 -1
...@@ -153,7 +153,7 @@ a b c ...@@ -153,7 +153,7 @@ a b c
2 -2 -2 2 -2 -2
update ignore t1 set c=3 where a=2; update ignore t1 set c=3 where a=2;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'c' in table 't1' ignored Warning 1906 The value specified for generated column 'c' in table 't1' has been ignored
select * from t1 order by a; select * from t1 order by a;
a b c a b c
1 -1 -1 1 -1 -1
...@@ -183,7 +183,7 @@ a b c ...@@ -183,7 +183,7 @@ a b c
2 -2 -2 2 -2 -2
update ignore t1 set c=3 where b=-2; update ignore t1 set c=3 where b=-2;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'c' in table 't1' ignored Warning 1906 The value specified for generated column 'c' in table 't1' has been ignored
select * from t1 order by a; select * from t1 order by a;
a b c a b c
1 -1 -1 1 -1 -1
......
mysql-test/suite/gcol/r/gcol_ins_upd_myisam.result
View file @ 1e9c2b23
...@@ -25,8 +25,8 @@ a b c ...@@ -25,8 +25,8 @@ a b c
# INSERT INTO tbl_name VALUES... a non-NULL value is specified against gcols # INSERT INTO tbl_name VALUES... a non-NULL value is specified against gcols
insert ignore into t1 values (1,2,3); insert ignore into t1 values (1,2,3);
Warnings: Warnings:
Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
Warning 1906 The value specified for generated column 'c' in table 't1' ignored Warning 1906 The value specified for generated column 'c' in table 't1' has been ignored
select * from t1; select * from t1;
a b c a b c
1 -1 -1 1 -1 -1
...@@ -65,8 +65,8 @@ a b c ...@@ -65,8 +65,8 @@ a b c
# against gcols # against gcols
insert ignore into t1 (a,b) values (1,3), (2,4); insert ignore into t1 (a,b) values (1,3), (2,4);
Warnings: Warnings:
Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
select * from t1; select * from t1;
a b c a b c
1 -1 -1 1 -1 -1
...@@ -153,7 +153,7 @@ a b c ...@@ -153,7 +153,7 @@ a b c
2 -2 -2 2 -2 -2
update ignore t1 set c=3 where a=2; update ignore t1 set c=3 where a=2;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'c' in table 't1' ignored Warning 1906 The value specified for generated column 'c' in table 't1' has been ignored
select * from t1 order by a; select * from t1 order by a;
a b c a b c
1 -1 -1 1 -1 -1
...@@ -183,7 +183,7 @@ a b c ...@@ -183,7 +183,7 @@ a b c
2 -2 -2 2 -2 -2
update ignore t1 set c=3 where b=-2; update ignore t1 set c=3 where b=-2;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'c' in table 't1' ignored Warning 1906 The value specified for generated column 'c' in table 't1' has been ignored
select * from t1 order by a; select * from t1 order by a;
a b c a b c
1 -1 -1 1 -1 -1
......
mysql-test/suite/gcol/r/gcol_partition_innodb.result
View file @ 1e9c2b23
...@@ -99,7 +99,7 @@ INSERT IGNORE INTO t1 (d) VALUES ('2015-04-14'); ...@@ -99,7 +99,7 @@ INSERT IGNORE INTO t1 (d) VALUES ('2015-04-14');
SET sql_mode= ''; SET sql_mode= '';
REPLACE INTO t1 SELECT * FROM t1; REPLACE INTO t1 SELECT * FROM t1;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'vd' in table 't1' ignored Warning 1906 The value specified for generated column 'vd' in table 't1' has been ignored
DROP TABLE t1; DROP TABLE t1;
InnoDB 0 transactions not purged InnoDB 0 transactions not purged
DROP VIEW IF EXISTS v1,v2; DROP VIEW IF EXISTS v1,v2;
......
mysql-test/suite/innodb/t/innodb.test
View file @ 1e9c2b23
...@@ -1132,7 +1132,7 @@ checksum table t1, t2, t3, t4 extended; ...@@ -1132,7 +1132,7 @@ checksum table t1, t2, t3, t4 extended;
drop table t1,t2,t3; drop table t1,t2,t3;
# #
# Test problem with refering to different fields in same table in UNION # Test problem with referring to different fields in same table in UNION
# (Bug #2552) # (Bug #2552)
# #
create table t1 (id int, name char(10) not null, name2 char(10) not null) engine=innodb; create table t1 (id int, name char(10) not null, name2 char(10) not null) engine=innodb;
......
mysql-test/suite/plugins/t/thread_pool_server_audit.test
View file @ 1e9c2b23
...@@ -42,8 +42,10 @@ select 1, ...@@ -42,8 +42,10 @@ select 1,
3; 3;
insert into t2 values (1), (2); insert into t2 values (1), (2);
select * from t2; select * from t2;
--disable_ps_protocol
--error ER_NO_SUCH_TABLE --error ER_NO_SUCH_TABLE
select * from t_doesnt_exist; select * from t_doesnt_exist;
--enable_ps_protocol
--error 1064 --error 1064
syntax_error_query; syntax_error_query;
drop table renamed_t1, t2; drop table renamed_t1, t2;
......
mysql-test/suite/rpl/r/rpl_rewrt_db.result
View file @ 1e9c2b23
include/master-slave.inc include/master-slave.inc
[connection master] [connection master]
connection slave;
set sql_log_bin=0;
create database y;
set sql_log_bin=1;
connection master;
drop database if exists mysqltest1; drop database if exists mysqltest1;
drop database if exists x;
create database mysqltest1; create database mysqltest1;
set sql_log_bin=0;
create database x;
set sql_log_bin=1;
use mysqltest1; use mysqltest1;
create table t1 (a int); create table t1 (a int);
insert into t1 values(9); insert into t1 values(9);
use x;
create table t1 (a int);
insert into t1 values(9);
select * from mysqltest1.t1; select * from mysqltest1.t1;
a a
9 9
select * from x.t1;
a
9
connection slave; connection slave;
show databases like 'mysqltest1'; show databases like 'mysqltest1';
Database (mysqltest1) Database (mysqltest1)
...@@ -15,7 +30,11 @@ mysqltest1 ...@@ -15,7 +30,11 @@ mysqltest1
select * from test.t1; select * from test.t1;
a a
9 9
select * from y.t1;
a
9
connection master; connection master;
use mysqltest1;
drop table t1; drop table t1;
drop database mysqltest1; drop database mysqltest1;
connection slave; connection slave;
...@@ -259,12 +278,14 @@ SET sql_log_bin= 0; ...@@ -259,12 +278,14 @@ SET sql_log_bin= 0;
DROP DATABASE database_master_temp_01; DROP DATABASE database_master_temp_01;
DROP DATABASE database_master_temp_02; DROP DATABASE database_master_temp_02;
DROP DATABASE database_master_temp_03; DROP DATABASE database_master_temp_03;
DROP DATABASE x;
SET sql_log_bin= 1; SET sql_log_bin= 1;
connection slave; connection slave;
SET sql_log_bin= 0; SET sql_log_bin= 0;
DROP DATABASE database_slave_temp_01; DROP DATABASE database_slave_temp_01;
DROP DATABASE database_slave_temp_02; DROP DATABASE database_slave_temp_02;
DROP DATABASE database_slave_temp_03; DROP DATABASE database_slave_temp_03;
DROP DATABASE y;
SET sql_log_bin= 1; SET sql_log_bin= 1;
connection master; connection master;
connection slave; connection slave;
......
mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt
View file @ 1e9c2b23
"--replicate-rewrite-db=test->rewrite" "--replicate-rewrite-db=mysqltest1->test" "--replicate-rewrite-db=database_master_temp_01->database_slave_temp_01" "--replicate-rewrite-db=database_master_temp_02->database_slave_temp_02" "--replicate-rewrite-db=database_master_temp_03->database_slave_temp_03" "--replicate-rewrite-db=test->rewrite" "--replicate-rewrite-db=mysqltest1 -> test" "--replicate-rewrite-db=x -> y" "--replicate-rewrite-db=database_master_temp_01->database_slave_temp_01" "--replicate-rewrite-db=database_master_temp_02->database_slave_temp_02" "--replicate-rewrite-db=database_master_temp_03->database_slave_temp_03"
mysql-test/suite/rpl/t/rpl_rewrt_db.test
View file @ 1e9c2b23
...@@ -2,20 +2,37 @@ ...@@ -2,20 +2,37 @@
-- source include/have_binlog_format_mixed_or_statement.inc -- source include/have_binlog_format_mixed_or_statement.inc
-- source include/master-slave.inc -- source include/master-slave.inc
--connection slave
set sql_log_bin=0;
create database y;
set sql_log_bin=1;
--connection master
--disable_warnings --disable_warnings
drop database if exists mysqltest1; drop database if exists mysqltest1;
drop database if exists x;
--enable_warnings --enable_warnings
create database mysqltest1; create database mysqltest1;
set sql_log_bin=0;
create database x;
set sql_log_bin=1;
use mysqltest1; use mysqltest1;
create table t1 (a int); create table t1 (a int);
insert into t1 values(9); insert into t1 values(9);
use x;
create table t1 (a int);
insert into t1 values(9);
select * from mysqltest1.t1; select * from mysqltest1.t1;
select * from x.t1;
sync_slave_with_master; sync_slave_with_master;
#TODO no it is no empty
show databases like 'mysqltest1'; # should be empty show databases like 'mysqltest1'; # should be empty
select * from test.t1; select * from test.t1;
select * from y.t1;
# cleanup # cleanup
connection master; connection master;
use mysqltest1;
drop table t1; drop table t1;
drop database mysqltest1; drop database mysqltest1;
sync_slave_with_master; sync_slave_with_master;
...@@ -215,6 +232,7 @@ SET sql_log_bin= 0; ...@@ -215,6 +232,7 @@ SET sql_log_bin= 0;
DROP DATABASE database_master_temp_01; DROP DATABASE database_master_temp_01;
DROP DATABASE database_master_temp_02; DROP DATABASE database_master_temp_02;
DROP DATABASE database_master_temp_03; DROP DATABASE database_master_temp_03;
DROP DATABASE x;
SET sql_log_bin= 1; SET sql_log_bin= 1;
connection slave; connection slave;
...@@ -222,6 +240,7 @@ SET sql_log_bin= 0; ...@@ -222,6 +240,7 @@ SET sql_log_bin= 0;
DROP DATABASE database_slave_temp_01; DROP DATABASE database_slave_temp_01;
DROP DATABASE database_slave_temp_02; DROP DATABASE database_slave_temp_02;
DROP DATABASE database_slave_temp_03; DROP DATABASE database_slave_temp_03;
DROP DATABASE y;
SET sql_log_bin= 1; SET sql_log_bin= 1;
connection master; connection master;
......
mysql-test/suite/storage_engine/vcol.result
View file @ 1e9c2b23
...@@ -7,8 +7,8 @@ b int(11) # # VIRTUAL GENERATED ...@@ -7,8 +7,8 @@ b int(11) # # VIRTUAL GENERATED
INSERT INTO t1 (a) VALUES (1),(2); INSERT INTO t1 (a) VALUES (1),(2);
INSERT INTO t1 (a,b) VALUES (3,3),(4,4); INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
Warnings: Warnings:
Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
SELECT a,b FROM t1; SELECT a,b FROM t1;
a b a b
1 2 1 2
...@@ -24,8 +24,8 @@ b int(11) # # STORED GENERATED ...@@ -24,8 +24,8 @@ b int(11) # # STORED GENERATED
INSERT INTO t1 (a) VALUES (1),(2); INSERT INTO t1 (a) VALUES (1),(2);
INSERT INTO t1 (a,b) VALUES (3,3),(4,4); INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
Warnings: Warnings:
Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
SELECT a,b FROM t1; SELECT a,b FROM t1;
a b a b
1 2 1 2
...@@ -41,8 +41,8 @@ b int(11) # # VIRTUAL GENERATED ...@@ -41,8 +41,8 @@ b int(11) # # VIRTUAL GENERATED
INSERT INTO t1 (a) VALUES (1),(2); INSERT INTO t1 (a) VALUES (1),(2);
INSERT INTO t1 (a,b) VALUES (3,3),(4,4); INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
Warnings: Warnings:
Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
SELECT a,b FROM t1; SELECT a,b FROM t1;
a b a b
1 2 1 2
...@@ -58,8 +58,8 @@ b int(11) # # STORED GENERATED ...@@ -58,8 +58,8 @@ b int(11) # # STORED GENERATED
INSERT INTO t1 (a) VALUES (1),(2); INSERT INTO t1 (a) VALUES (1),(2);
INSERT INTO t1 (a,b) VALUES (3,3),(4,4); INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
Warnings: Warnings:
Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
SELECT a,b FROM t1; SELECT a,b FROM t1;
a b a b
1 2 1 2
......
mysql-test/suite/vcol/r/binlog.result
View file @ 1e9c2b23
...@@ -18,10 +18,10 @@ set binlog_row_image="FULL"; ...@@ -18,10 +18,10 @@ set binlog_row_image="FULL";
CREATE VIEW v1 AS SELECT * FROM t1; 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; REPLACE INTO v1 SELECT pk, vcol_date, vcol_int, vcol_year, vcol_blob, col_date, col_int, col_blob, 1982 FROM t1;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'vcol_date' 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' 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' 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' 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; select col_date,col_int,col_blob,col_year from v1;
col_date col_int col_blob col_year col_date col_int col_blob col_year
2010-04-24 5 foo 1982 2010-04-24 5 foo 1982
...@@ -35,10 +35,10 @@ set binlog_row_image="MINIMAL"; ...@@ -35,10 +35,10 @@ set binlog_row_image="MINIMAL";
CREATE VIEW v1 AS SELECT * FROM t1; 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; REPLACE INTO v1 SELECT pk, vcol_date, vcol_int, vcol_year, vcol_blob, col_date, col_int, col_blob, 1983 FROM t1;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'vcol_date' 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' 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' 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' 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; select col_date,col_int,col_blob,col_year from v1;
col_date col_int col_blob col_year col_date col_int col_blob col_year
2010-04-24 5 foo 1983 2010-04-24 5 foo 1983
...@@ -52,10 +52,10 @@ set @@binlog_row_image="NOBLOB"; ...@@ -52,10 +52,10 @@ set @@binlog_row_image="NOBLOB";
CREATE VIEW v1 AS SELECT * FROM t1; 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; REPLACE INTO v1 SELECT pk, vcol_date, vcol_int, vcol_year, vcol_blob, col_date, col_int, col_blob, 1984 FROM t1;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'vcol_date' 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' 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' 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' 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; select col_date,col_int,col_blob,col_year from v1;
col_date col_int col_blob col_year col_date col_int col_blob col_year
2010-04-24 5 foo 1984 2010-04-24 5 foo 1984
......
mysql-test/suite/vcol/r/partition.result
View file @ 1e9c2b23
...@@ -26,5 +26,5 @@ partition pn values less than (maxvalue)); ...@@ -26,5 +26,5 @@ partition pn values less than (maxvalue));
insert t1 set i= 0; insert t1 set i= 0;
set statement sql_mode= '' for update t1 set i= 1, v= 2; set statement sql_mode= '' for update t1 set i= 1, v= 2;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'v' in table 't1' ignored Warning 1906 The value specified for generated column 'v' in table 't1' has been ignored
drop table t1; drop table t1;
mysql-test/suite/vcol/r/update.result
View file @ 1e9c2b23
...@@ -74,10 +74,10 @@ b int, c blob as (b), index (c(57)), ...@@ -74,10 +74,10 @@ b int, c blob as (b), index (c(57)),
d blob, e blob as (d), index (e(57))) d blob, e blob as (d), index (e(57)))
replace select * from t1; replace select * from t1;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'c' in table 't' ignored Warning 1906 The value specified for generated column 'c' in table 't' has been ignored
Warning 1906 The value specified for generated column 'e' in table 't' ignored Warning 1906 The value specified for generated column 'e' in table 't' has been ignored
Warning 1906 The value specified for generated column 'c' in table 't' ignored Warning 1906 The value specified for generated column 'c' in table 't' has been ignored
Warning 1906 The value specified for generated column 'e' in table 't' ignored Warning 1906 The value specified for generated column 'e' in table 't' has been ignored
check table t; check table t;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t check status OK test.t check status OK
......
mysql-test/suite/vcol/r/update_binlog.result
View file @ 1e9c2b23
...@@ -76,10 +76,10 @@ b int, c blob as (b), index (c(57)), ...@@ -76,10 +76,10 @@ b int, c blob as (b), index (c(57)),
d blob, e blob as (d), index (e(57))) d blob, e blob as (d), index (e(57)))
replace select * from t1; replace select * from t1;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'c' in table 't' ignored Warning 1906 The value specified for generated column 'c' in table 't' has been ignored
Warning 1906 The value specified for generated column 'e' in table 't' ignored Warning 1906 The value specified for generated column 'e' in table 't' has been ignored
Warning 1906 The value specified for generated column 'c' in table 't' ignored Warning 1906 The value specified for generated column 'c' in table 't' has been ignored
Warning 1906 The value specified for generated column 'e' in table 't' ignored Warning 1906 The value specified for generated column 'e' in table 't' has been ignored
check table t; check table t;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t check status OK test.t check status OK
...@@ -256,10 +256,10 @@ b int, c blob as (b), index (c(57)), ...@@ -256,10 +256,10 @@ b int, c blob as (b), index (c(57)),
d blob, e blob as (d), index (e(57))) d blob, e blob as (d), index (e(57)))
replace select * from t1; replace select * from t1;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'c' in table 't' ignored Warning 1906 The value specified for generated column 'c' in table 't' has been ignored
Warning 1906 The value specified for generated column 'e' in table 't' ignored Warning 1906 The value specified for generated column 'e' in table 't' has been ignored
Warning 1906 The value specified for generated column 'c' in table 't' ignored Warning 1906 The value specified for generated column 'c' in table 't' has been ignored
Warning 1906 The value specified for generated column 'e' in table 't' ignored Warning 1906 The value specified for generated column 'e' in table 't' has been ignored
check table t; check table t;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t check status OK test.t check status OK
......
mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result
View file @ 1e9c2b23
...@@ -25,8 +25,8 @@ a b c ...@@ -25,8 +25,8 @@ a b c
# INSERT INTO tbl_name VALUES... a non-NULL value is specified against vcols # INSERT INTO tbl_name VALUES... a non-NULL value is specified against vcols
insert ignore into t1 values (1,2,3); insert ignore into t1 values (1,2,3);
Warnings: Warnings:
Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
Warning 1906 The value specified for generated column 'c' in table 't1' ignored Warning 1906 The value specified for generated column 'c' in table 't1' has been ignored
select * from t1; select * from t1;
a b c a b c
1 -1 -1 1 -1 -1
...@@ -65,8 +65,8 @@ a b c ...@@ -65,8 +65,8 @@ a b c
# against vcols # against vcols
insert ignore into t1 (a,b) values (1,3), (2,4); insert ignore into t1 (a,b) values (1,3), (2,4);
Warnings: Warnings:
Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
select * from t1; select * from t1;
a b c a b c
1 -1 -1 1 -1 -1
...@@ -107,8 +107,8 @@ a b c ...@@ -107,8 +107,8 @@ a b c
create table t2 like t1; create table t2 like t1;
insert ignore into t2 select * from t1; insert ignore into t2 select * from t1;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'b' in table 't2' ignored Warning 1906 The value specified for generated column 'b' in table 't2' has been ignored
Warning 1906 The value specified for generated column 'c' in table 't2' ignored Warning 1906 The value specified for generated column 'c' in table 't2' has been ignored
select * from t1; select * from t1;
a b c a b c
2 -2 -2 2 -2 -2
...@@ -123,8 +123,8 @@ a b c ...@@ -123,8 +123,8 @@ a b c
create table t2 like t1; create table t2 like t1;
insert ignore into t2 (a,b) select a,b from t1; insert ignore into t2 (a,b) select a,b from t1;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'b' in table 't2' ignored Warning 1906 The value specified for generated column 'b' in table 't2' has been ignored
Warning 1906 The value specified for generated column 'b' in table 't2' ignored Warning 1906 The value specified for generated column 'b' in table 't2' has been ignored
select * from t2; select * from t2;
a b c a b c
2 -2 -2 2 -2 -2
...@@ -159,7 +159,7 @@ a b c ...@@ -159,7 +159,7 @@ a b c
2 -2 -2 2 -2 -2
update ignore t1 set c=3 where a=2; update ignore t1 set c=3 where a=2;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'c' in table 't1' ignored Warning 1906 The value specified for generated column 'c' in table 't1' has been ignored
select * from t1; select * from t1;
a b c a b c
1 -1 -1 1 -1 -1
...@@ -189,7 +189,7 @@ a b c ...@@ -189,7 +189,7 @@ a b c
2 -2 -2 2 -2 -2
update ignore t1 set c=3 where b=-2; update ignore t1 set c=3 where b=-2;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'c' in table 't1' ignored Warning 1906 The value specified for generated column 'c' in table 't1' has been ignored
select * from t1; select * from t1;
a b c a b c
1 -1 -1 1 -1 -1
......
mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result
View file @ 1e9c2b23
...@@ -25,8 +25,8 @@ a b c ...@@ -25,8 +25,8 @@ a b c
# INSERT INTO tbl_name VALUES... a non-NULL value is specified against vcols # INSERT INTO tbl_name VALUES... a non-NULL value is specified against vcols
insert ignore into t1 values (1,2,3); insert ignore into t1 values (1,2,3);
Warnings: Warnings:
Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
Warning 1906 The value specified for generated column 'c' in table 't1' ignored Warning 1906 The value specified for generated column 'c' in table 't1' has been ignored
select * from t1; select * from t1;
a b c a b c
1 -1 -1 1 -1 -1
...@@ -65,8 +65,8 @@ a b c ...@@ -65,8 +65,8 @@ a b c
# against vcols # against vcols
insert ignore into t1 (a,b) values (1,3), (2,4); insert ignore into t1 (a,b) values (1,3), (2,4);
Warnings: Warnings:
Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
select * from t1; select * from t1;
a b c a b c
1 -1 -1 1 -1 -1
...@@ -107,8 +107,8 @@ a b c ...@@ -107,8 +107,8 @@ a b c
create table t2 like t1; create table t2 like t1;
insert ignore into t2 select * from t1; insert ignore into t2 select * from t1;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'b' in table 't2' ignored Warning 1906 The value specified for generated column 'b' in table 't2' has been ignored
Warning 1906 The value specified for generated column 'c' in table 't2' ignored Warning 1906 The value specified for generated column 'c' in table 't2' has been ignored
select * from t1; select * from t1;
a b c a b c
2 -2 -2 2 -2 -2
...@@ -123,8 +123,8 @@ a b c ...@@ -123,8 +123,8 @@ a b c
create table t2 like t1; create table t2 like t1;
insert ignore into t2 (a,b) select a,b from t1; insert ignore into t2 (a,b) select a,b from t1;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'b' in table 't2' ignored Warning 1906 The value specified for generated column 'b' in table 't2' has been ignored
Warning 1906 The value specified for generated column 'b' in table 't2' ignored Warning 1906 The value specified for generated column 'b' in table 't2' has been ignored
select * from t2; select * from t2;
a b c a b c
2 -2 -2 2 -2 -2
...@@ -159,7 +159,7 @@ a b c ...@@ -159,7 +159,7 @@ a b c
2 -2 -2 2 -2 -2
update ignore t1 set c=3 where a=2; update ignore t1 set c=3 where a=2;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'c' in table 't1' ignored Warning 1906 The value specified for generated column 'c' in table 't1' has been ignored
select * from t1; select * from t1;
a b c a b c
1 -1 -1 1 -1 -1
...@@ -189,7 +189,7 @@ a b c ...@@ -189,7 +189,7 @@ a b c
2 -2 -2 2 -2 -2
update ignore t1 set c=3 where b=-2; update ignore t1 set c=3 where b=-2;
Warnings: Warnings:
Warning 1906 The value specified for generated column 'c' in table 't1' ignored Warning 1906 The value specified for generated column 'c' in table 't1' has been ignored
select * from t1; select * from t1;
a b c a b c
1 -1 -1 1 -1 -1
......
mysql-test/suite/vcol/r/vcol_misc.result
View file @ 1e9c2b23
...@@ -108,10 +108,10 @@ DROP TABLE t1,t2; ...@@ -108,10 +108,10 @@ DROP TABLE t1,t2;
CREATE TABLE t1 (p int, a double NOT NULL, v double AS (ROUND(a,p)) VIRTUAL); CREATE TABLE t1 (p int, a double NOT NULL, v double AS (ROUND(a,p)) VIRTUAL);
INSERT IGNORE INTO t1 VALUES (0,1,0); INSERT IGNORE INTO t1 VALUES (0,1,0);
Warnings: Warnings:
Warning 1906 The value specified for generated column 'v' in table 't1' ignored Warning 1906 The value specified for generated column 'v' in table 't1' has been ignored
INSERT IGNORE INTO t1 VALUES (NULL,0,0); INSERT IGNORE INTO t1 VALUES (NULL,0,0);
Warnings: Warnings:
Warning 1906 The value specified for generated column 'v' in table 't1' ignored Warning 1906 The value specified for generated column 'v' in table 't1' has been ignored
SELECT a, p, v, ROUND(a,p), ROUND(a,p+NULL) FROM t1; SELECT a, p, v, ROUND(a,p), ROUND(a,p+NULL) FROM t1;
a p v ROUND(a,p) ROUND(a,p+NULL) a p v ROUND(a,p) ROUND(a,p+NULL)
1 0 1 1 NULL 1 0 1 1 NULL
...@@ -302,15 +302,15 @@ d varchar(5) latin1_swedish_ci YES NULL STORED GENERATED # ...@@ -302,15 +302,15 @@ d varchar(5) latin1_swedish_ci YES NULL STORED GENERATED #
INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,NULL); INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,NULL);
UPDATE IGNORE `test`.`t1` SET `d`='b' WHERE `a`='1' AND `b`='a' AND `c`='1' AND `d`='a'; UPDATE IGNORE `test`.`t1` SET `d`='b' WHERE `a`='1' AND `b`='a' AND `c`='1' AND `d`='a';
Warnings: Warnings:
Warning 1906 The value specified for generated column 'd' in table 't1' ignored Warning 1906 The value specified for generated column 'd' in table 't1' has been ignored
INSERT IGNORE INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,'a'); INSERT IGNORE INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,'a');
Warnings: Warnings:
Warning 1906 The value specified for generated column 'd' in table 't1' ignored Warning 1906 The value specified for generated column 'd' in table 't1' has been ignored
set sql_mode='strict_all_tables'; set sql_mode='strict_all_tables';
UPDATE `test`.`t1` SET `d`='b' WHERE `a`='1' AND `b`='a' AND `c`='1' AND `d`='a'; UPDATE `test`.`t1` SET `d`='b' WHERE `a`='1' AND `b`='a' AND `c`='1' AND `d`='a';
ERROR HY000: The value specified for generated column 'd' in table 't1' ignored ERROR HY000: The value specified for generated column 'd' in table 't1' has been ignored
INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,'a'); INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,'a');
ERROR HY000: The value specified for generated column 'd' in table 't1' ignored ERROR HY000: The value specified for generated column 'd' in table 't1' has been ignored
drop table t1; drop table t1;
# #
# MDEV-5611: self-referencing virtual column # MDEV-5611: self-referencing virtual column
......
mysql-test/suite/vcol/r/vcol_select_myisam.result
View file @ 1e9c2b23
...@@ -273,9 +273,9 @@ INSERT INTO t1 VALUES (NULL),( 78), (185), (0), (154); ...@@ -273,9 +273,9 @@ INSERT INTO t1 VALUES (NULL),( 78), (185), (0), (154);
CREATE TABLE t2 (a int, b int AS (a) VIRTUAL); CREATE TABLE t2 (a int, b int AS (a) VIRTUAL);
INSERT IGNORE INTO t2 VALUES (187,187), (9,9), (187,187); INSERT IGNORE INTO t2 VALUES (187,187), (9,9), (187,187);
Warnings: Warnings:
Warning 1906 The value specified for generated column 'b' in table 't2' ignored Warning 1906 The value specified for generated column 'b' in table 't2' has been ignored
Warning 1906 The value specified for generated column 'b' in table 't2' ignored Warning 1906 The value specified for generated column 'b' in table 't2' has been ignored
Warning 1906 The value specified for generated column 'b' in table 't2' ignored Warning 1906 The value specified for generated column 'b' in table 't2' has been ignored
EXPLAIN EXTENDED EXPLAIN EXTENDED
SELECT * FROM t1 JOIN t2 USING (b); SELECT * FROM t1 JOIN t2 USING (b);
id select_type table type possible_keys key key_len ref rows filtered Extra id select_type table type possible_keys key key_len ref rows filtered Extra
......
mysql-test/t/ddl_i18n_koi8r.test
View file @ 1e9c2b23
...@@ -802,7 +802,7 @@ use mysqltest1| ...@@ -802,7 +802,7 @@ use mysqltest1|
# - Event ev1 # - Event ev1
CREATE EVENT ev1 ON SCHEDULE AT '2030-01-01 00:00:00' DO CREATE EVENT ev1 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO
BEGIN BEGIN
DECLARE 1 CHAR(10); DECLARE 1 CHAR(10);
...@@ -819,7 +819,7 @@ END| ...@@ -819,7 +819,7 @@ END|
# - Event ev2 # - Event ev2
CREATE EVENT ev2 ON SCHEDULE AT '2030-01-01 00:00:00' DO CREATE EVENT ev2 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO
BEGIN BEGIN
DECLARE 1 CHAR(10) CHARACTER SET utf8; DECLARE 1 CHAR(10) CHARACTER SET utf8;
...@@ -836,7 +836,7 @@ END| ...@@ -836,7 +836,7 @@ END|
# - Event ev3 # - Event ev3
CREATE EVENT mysqltest2.ev3 ON SCHEDULE AT '2030-01-01 00:00:00' DO CREATE EVENT mysqltest2.ev3 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO
BEGIN BEGIN
DECLARE 1 CHAR(10) CHARACTER SET utf8; DECLARE 1 CHAR(10) CHARACTER SET utf8;
...@@ -853,7 +853,7 @@ END| ...@@ -853,7 +853,7 @@ END|
# - Event ev4 # - Event ev4
CREATE EVENT mysqltest2.ev4 ON SCHEDULE AT '2030-01-01 00:00:00' DO CREATE EVENT mysqltest2.ev4 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO
BEGIN BEGIN
DECLARE 1 CHAR(10) CHARACTER SET utf8; DECLARE 1 CHAR(10) CHARACTER SET utf8;
......
mysql-test/t/ddl_i18n_utf8.test
View file @ 1e9c2b23
...@@ -805,7 +805,7 @@ use mysqltest1| ...@@ -805,7 +805,7 @@ use mysqltest1|
# - Event ev1 # - Event ev1
CREATE EVENT ev1 ON SCHEDULE AT '2030-01-01 00:00:00' DO CREATE EVENT ev1 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO
BEGIN BEGIN
DECLARE перем1 CHAR(10); DECLARE перем1 CHAR(10);
...@@ -822,7 +822,7 @@ END| ...@@ -822,7 +822,7 @@ END|
# - Event ev2 # - Event ev2
CREATE EVENT ev2 ON SCHEDULE AT '2030-01-01 00:00:00' DO CREATE EVENT ev2 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO
BEGIN BEGIN
DECLARE перем1 CHAR(10) CHARACTER SET utf8; DECLARE перем1 CHAR(10) CHARACTER SET utf8;
...@@ -839,7 +839,7 @@ END| ...@@ -839,7 +839,7 @@ END|
# - Event ev3 # - Event ev3
CREATE EVENT mysqltest2.ev3 ON SCHEDULE AT '2030-01-01 00:00:00' DO CREATE EVENT mysqltest2.ev3 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO
BEGIN BEGIN
DECLARE перем1 CHAR(10) CHARACTER SET utf8; DECLARE перем1 CHAR(10) CHARACTER SET utf8;
...@@ -856,7 +856,7 @@ END| ...@@ -856,7 +856,7 @@ END|
# - Event ev4 # - Event ev4
CREATE EVENT mysqltest2.ev4 ON SCHEDULE AT '2030-01-01 00:00:00' DO CREATE EVENT mysqltest2.ev4 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO
BEGIN BEGIN
DECLARE перем1 CHAR(10) CHARACTER SET utf8; DECLARE перем1 CHAR(10) CHARACTER SET utf8;
......
mysql-test/t/events_1.test
View file @ 1e9c2b23
...@@ -69,7 +69,7 @@ drop event event2; ...@@ -69,7 +69,7 @@ drop event event2;
CREATE EVENT event_starts_test ON SCHEDULE EVERY 10 SECOND COMMENT "" DO SELECT 1; CREATE EVENT event_starts_test ON SCHEDULE EVERY 10 SECOND COMMENT "" DO SELECT 1;
SELECT interval_field, interval_value, body FROM mysql.event WHERE db='events_test' AND name='event_starts_test'; SELECT interval_field, interval_value, body FROM mysql.event WHERE db='events_test' AND name='event_starts_test';
SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test'; SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';
ALTER EVENT event_starts_test ON SCHEDULE AT '2020-02-02 20:00:02'; ALTER EVENT event_starts_test ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE;
SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test'; SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';
ALTER EVENT event_starts_test COMMENT "non-empty comment"; ALTER EVENT event_starts_test COMMENT "non-empty comment";
SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test'; SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';
...@@ -77,7 +77,7 @@ ALTER EVENT event_starts_test COMMENT ""; ...@@ -77,7 +77,7 @@ ALTER EVENT event_starts_test COMMENT "";
SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test'; SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';
DROP EVENT event_starts_test; DROP EVENT event_starts_test;
CREATE EVENT event_starts_test ON SCHEDULE EVERY 20 SECOND STARTS '2020-02-02 20:00:02' ENDS '2022-02-02 20:00:02' DO SELECT 2; CREATE EVENT event_starts_test ON SCHEDULE EVERY 20 SECOND STARTS '1970-01-02 00:00:00' ENDS '1970-01-03 00:00:00' ON COMPLETION PRESERVE DISABLE DO SELECT 2;
SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test'; SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';
ALTER EVENT event_starts_test COMMENT "non-empty comment"; ALTER EVENT event_starts_test COMMENT "non-empty comment";
SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test'; SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';
......
mysql-test/t/insert.test
View file @ 1e9c2b23
# #
# Test of refering to old values # Test of referring to old values
# #
--disable_warnings --disable_warnings
......
mysql-test/t/mysql.test
View file @ 1e9c2b23
...@@ -702,3 +702,9 @@ select count(*) from t1; truncate table t1; ...@@ -702,3 +702,9 @@ select count(*) from t1; truncate table t1;
--exec $MYSQL --disable-local-infile -e "/*q*/$ldli" --exec $MYSQL --disable-local-infile -e "/*q*/$ldli"
select count(*) from t1; truncate table t1; select count(*) from t1; truncate table t1;
drop table t1; drop table t1;
--echo #
--echo # MDEV-15538 '-N' Produce html output wrong
--echo #
--exec $MYSQL -NHe "select 1 as a"
mysql-test/t/show_check.test
View file @ 1e9c2b23
...@@ -1209,7 +1209,7 @@ CREATE TRIGGER t1_bi BEFORE INSERT ON t1 ...@@ -1209,7 +1209,7 @@ CREATE TRIGGER t1_bi BEFORE INSERT ON t1
FOR EACH ROW FOR EACH ROW
SET NEW.c1 = ''; SET NEW.c1 = '';
CREATE EVENT ev1 ON SCHEDULE AT '2030-01-01 00:00:00' DO SELECT '' AS test; CREATE EVENT ev1 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO SELECT '' AS test;
# Test: switch the character set and show that SHOW CREATE output is # Test: switch the character set and show that SHOW CREATE output is
# automatically converted to the new character_set_client. # automatically converted to the new character_set_client.
......
sql/mysqld.cc
View file @ 1e9c2b23
...@@ -9142,7 +9142,8 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument) ...@@ -9142,7 +9142,8 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
val= p--; val= p--;
while (my_isspace(mysqld_charset, *p) && p > argument) while (my_isspace(mysqld_charset, *p) && p > argument)
*p-- = 0; *p-- = 0;
if (p == argument) /* Db name can be one char also */
if (p == argument && my_isspace(mysqld_charset, *p))
{ {
sql_print_error("Bad syntax in replicate-rewrite-db - empty FROM db!\n"); sql_print_error("Bad syntax in replicate-rewrite-db - empty FROM db!\n");
return 1; return 1;
......
sql/share/errmsg-utf8.txt
View file @ 1e9c2b23
...@@ -7175,7 +7175,7 @@ ER_KEY_BASED_ON_GENERATED_VIRTUAL_COLUMN ...@@ -7175,7 +7175,7 @@ ER_KEY_BASED_ON_GENERATED_VIRTUAL_COLUMN
ER_WRONG_FK_OPTION_FOR_GENERATED_COLUMN ER_WRONG_FK_OPTION_FOR_GENERATED_COLUMN
eng "Cannot define foreign key with %s clause on a generated column" eng "Cannot define foreign key with %s clause on a generated column"
ER_WARNING_NON_DEFAULT_VALUE_FOR_GENERATED_COLUMN ER_WARNING_NON_DEFAULT_VALUE_FOR_GENERATED_COLUMN
eng "The value specified for generated column '%s' in table '%s' ignored" eng "The value specified for generated column '%s' in table '%s' has been ignored"
ER_UNSUPPORTED_ACTION_ON_GENERATED_COLUMN ER_UNSUPPORTED_ACTION_ON_GENERATED_COLUMN
eng "This is not yet supported for generated columns" eng "This is not yet supported for generated columns"
ER_UNUSED_20 ER_UNUSED_20
......
storage/innobase/CMakeLists.txt
View file @ 1e9c2b23
# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2014, 2018, MariaDB Corporation. # Copyright (c) 2014, 2019, MariaDB Corporation.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
...@@ -165,12 +165,9 @@ ENDIF() ...@@ -165,12 +165,9 @@ ENDIF()
# A GCC bug causes crash when compiling these files on ARM64 with -O1+ # A GCC bug causes crash when compiling these files on ARM64 with -O1+
# Compile them with -O0 as a workaround. # Compile them with -O0 as a workaround.
IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64") IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64"
# Bug was fixed in GCC 5.2, so workaround only needed < 5.2 AND CMAKE_C_COMPILER_VERSION VERSION_LESS "5.2.0")
EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion ADD_COMPILE_FLAGS(
OUTPUT_VARIABLE GCC_VERSION)
IF(GCC_VERSION VERSION_LESS 5.2)
ADD_COMPILE_FLAGS(
btr/btr0btr.cc btr/btr0btr.cc
btr/btr0cur.cc btr/btr0cur.cc
buf/buf0buf.cc buf/buf0buf.cc
...@@ -183,7 +180,6 @@ IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64") ...@@ -183,7 +180,6 @@ IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
srv/srv0srv.cc srv/srv0srv.cc
COMPILE_FLAGS "-O0" COMPILE_FLAGS "-O0"
) )
ENDIF()
ENDIF() ENDIF()
IF(MSVC) IF(MSVC)
# silence "switch statement contains 'default' but no 'case' label # silence "switch statement contains 'default' but no 'case' label
......
storage/innobase/innodb.cmake
View file @ 1e9c2b23
# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2017, MariaDB Corporation. # Copyright (c) 2017, 2019, MariaDB Corporation.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
...@@ -163,6 +163,12 @@ IF(HAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE) ...@@ -163,6 +163,12 @@ IF(HAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE)
ENDIF() ENDIF()
IF(NOT MSVC) IF(NOT MSVC)
# Work around MDEV-18417, MDEV-18656, MDEV-18417
IF(WITH_ASAN AND CMAKE_COMPILER_IS_GNUCC AND
CMAKE_C_COMPILER_VERSION VERSION_LESS "6.0.0")
SET_SOURCE_FILES_PROPERTIES(trx/trx0rec.cc PROPERTIES COMPILE_FLAGS -O1)
ENDIF()
# workaround for old gcc on x86, gcc atomic ops only work under -march=i686 # workaround for old gcc on x86, gcc atomic ops only work under -march=i686
IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "i686" AND CMAKE_COMPILER_IS_GNUCC AND IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "i686" AND CMAKE_COMPILER_IS_GNUCC AND
CMAKE_C_COMPILER_VERSION VERSION_LESS "4.4.0") CMAKE_C_COMPILER_VERSION VERSION_LESS "4.4.0")
......
storage/myisammrg/mysql-test/storage_engine/vcol.rdiff
View file @ 1e9c2b23
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
-INSERT INTO t1 (a) VALUES (1),(2); -INSERT INTO t1 (a) VALUES (1),(2);
-INSERT INTO t1 (a,b) VALUES (3,3),(4,4); -INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
-Warnings: -Warnings:
-Warning 1906 The value specified for generated column 'b' in table 't1' ignored -Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
-Warning 1906 The value specified for generated column 'b' in table 't1' ignored -Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
-SELECT a,b FROM t1; -SELECT a,b FROM t1;
-a b -a b
-1 2 -1 2
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
-INSERT INTO t1 (a) VALUES (1),(2); -INSERT INTO t1 (a) VALUES (1),(2);
-INSERT INTO t1 (a,b) VALUES (3,3),(4,4); -INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
-Warnings: -Warnings:
-Warning 1906 The value specified for generated column 'b' in table 't1' ignored -Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
-Warning 1906 The value specified for generated column 'b' in table 't1' ignored -Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
-SELECT a,b FROM t1; -SELECT a,b FROM t1;
-a b -a b
-1 2 -1 2
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
-INSERT INTO t1 (a) VALUES (1),(2); -INSERT INTO t1 (a) VALUES (1),(2);
-INSERT INTO t1 (a,b) VALUES (3,3),(4,4); -INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
-Warnings: -Warnings:
-Warning 1906 The value specified for generated column 'b' in table 't1' ignored -Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
-Warning 1906 The value specified for generated column 'b' in table 't1' ignored -Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
-SELECT a,b FROM t1; -SELECT a,b FROM t1;
-a b -a b
-1 2 -1 2
...@@ -61,8 +61,8 @@ ...@@ -61,8 +61,8 @@
-INSERT INTO t1 (a) VALUES (1),(2); -INSERT INTO t1 (a) VALUES (1),(2);
-INSERT INTO t1 (a,b) VALUES (3,3),(4,4); -INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
-Warnings: -Warnings:
-Warning 1906 The value specified for generated column 'b' in table 't1' ignored -Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
-Warning 1906 The value specified for generated column 'b' in table 't1' ignored -Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
-SELECT a,b FROM t1; -SELECT a,b FROM t1;
-a b -a b
-1 2 -1 2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7