diff options
| author | unknown <acurtis/antony@xiphis.org/ltantony.xiphis.org> | 2006-08-14 21:27:36 -0700 |
|---|---|---|
| committer | unknown <acurtis/antony@xiphis.org/ltantony.xiphis.org> | 2006-08-14 21:27:36 -0700 |
| commit | 131f9a71d101db6551176cf7dff0528395fa751a (patch) | |
| tree | 51e2422c10878ea5a789059de1577c5827adafdb /mysql-test/r/ps_4heap.result | |
| parent | 61d5563ba413c18b2674e97016093c082b9918d0 (diff) | |
| parent | afa49a5930492ecd5e2b27dd7ba97467a3b3bc82 (diff) | |
| download | mariadb-git-131f9a71d101db6551176cf7dff0528395fa751a.tar.gz | |
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
into xiphis.org:/home/antony/work2/mysql-5.0-merge
mysql-test/r/create.result:
Auto merged
mysql-test/r/federated.result:
Auto merged
mysql-test/r/insert_select.result:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
mysql-test/r/strict.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/r/warnings.result:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/ps_4heap.result')
| -rw-r--r-- | mysql-test/r/ps_4heap.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/ps_4heap.result b/mysql-test/r/ps_4heap.result index fe4de89d6c7..8a0da364598 100644 --- a/mysql-test/r/ps_4heap.result +++ b/mysql-test/r/ps_4heap.result @@ -1288,7 +1288,7 @@ set @arg00=NULL; set @arg01=2; execute stmt1 using @arg00, @arg01; Warnings: -Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'a' at row 1 +Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 1 select a,b from t1 order by a; a b 0 two |