mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Merge olga.mysql.com:/home/igor/mysql-5.1
into olga.mysql.com:/home/igor/mysql-5.1-opt-merge mysql-test/r/alter_table.result: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/innodb_mysql.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/user_var.result: Auto merged mysql-test/t/alter_table.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/strict.test: Auto merged mysql-test/t/subselect3.test: Auto merged sql/field.h: Auto merged sql/handler.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/mysqld.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_update.cc: Auto merged mysql-test/r/ps_2myisam.result: Manual merge. mysql-test/r/ps_3innodb.result: Manual merge. mysql-test/r/ps_4heap.result: Manual merge. mysql-test/r/ps_5merge.result: Manual merge. mysql-test/r/ps_7ndb.result: Manual merge. sql/sql_table.cc: Manual merge. sql/sql_view.cc: Manual merge.
This commit is contained in:
@ -846,6 +846,25 @@ id
|
||||
50
|
||||
51
|
||||
drop table t1;
|
||||
set @orig_sql_mode = @@sql_mode;
|
||||
set sql_mode="no_zero_date";
|
||||
create table t1(f1 int);
|
||||
alter table t1 add column f2 datetime not null, add column f21 date not null;
|
||||
insert into t1 values(1,'2000-01-01','2000-01-01');
|
||||
alter table t1 add column f3 datetime not null;
|
||||
ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'f3' at row 1
|
||||
alter table t1 add column f3 date not null;
|
||||
ERROR 22007: Incorrect date value: '0000-00-00' for column 'f3' at row 1
|
||||
alter table t1 add column f4 datetime not null default '2002-02-02',
|
||||
add column f41 date not null;
|
||||
ERROR 22007: Incorrect date value: '0000-00-00' for column 'f41' at row 1
|
||||
alter table t1 add column f4 datetime not null default '2002-02-02',
|
||||
add column f41 date not null default '2002-02-02';
|
||||
select * from t1;
|
||||
f1 f2 f21 f4 f41
|
||||
1 2000-01-01 00:00:00 2000-01-01 2002-02-02 00:00:00 2002-02-02
|
||||
drop table t1;
|
||||
set sql_mode= @orig_sql_mode;
|
||||
create table t1 (v varchar(32));
|
||||
insert into t1 values ('def'),('abc'),('hij'),('3r4f');
|
||||
select * from t1;
|
||||
@ -1137,3 +1156,17 @@ Field Type Null Key Default Extra
|
||||
unsigned_int_field bigint(20) unsigned NO MUL
|
||||
char_field char(10) YES NULL
|
||||
DROP TABLE t2;
|
||||
CREATE TABLE t1 (f1 INT, f2 INT, f3 INT);
|
||||
INSERT INTO t1 VALUES (1, 2, NULL);
|
||||
SELECT * FROM t1;
|
||||
f1 f2 f3
|
||||
1 2 NULL
|
||||
ALTER TABLE t1 MODIFY COLUMN f3 INT AFTER f1;
|
||||
SELECT * FROM t1;
|
||||
f1 f3 f2
|
||||
1 NULL 2
|
||||
ALTER TABLE t1 MODIFY COLUMN f3 INT AFTER f2;
|
||||
SELECT * FROM t1;
|
||||
f1 f2 f3
|
||||
1 2 NULL
|
||||
DROP TABLE t1;
|
||||
|
Reference in New Issue
Block a user