diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2008-01-25 10:37:29 -0700 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2008-01-25 10:37:29 -0700 |
| commit | bf541d14f29a589c01989d4da2540283f7f9d66f (patch) | |
| tree | 74fe704d2ae83b58d06940ffcf7a36638868fee0 /mysql-test/t/warnings.test | |
| parent | 0a1832268d84af51622699bedd8e2fd34c79f308 (diff) | |
| parent | 8f9e655dab1802d31be5c01ea5b5e9ccee01363c (diff) | |
| download | mariadb-git-bf541d14f29a589c01989d4da2540283f7f9d66f.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/handler.cc:
Manual merge
sql/item.cc:
Manual merge
Diffstat (limited to 'mysql-test/t/warnings.test')
| -rw-r--r-- | mysql-test/t/warnings.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/warnings.test b/mysql-test/t/warnings.test index b5bae109f5f..d0eaaf1a764 100644 --- a/mysql-test/t/warnings.test +++ b/mysql-test/t/warnings.test @@ -65,6 +65,7 @@ create table t1(a tinyint NOT NULL, b tinyint unsigned, c char(5)); insert into t1 values(NULL,100,'mysql'),(10,-1,'mysql ab'),(500,256,'open source'),(20,NULL,'test'); alter table t1 modify c char(4); alter table t1 add d char(2); +--error 1048 update t1 set a=NULL where a=10; update t1 set c='mysql ab' where c='test'; update t1 set d=c; |