diff options
| author | acurtis/antony@xiphis.org/ltantony.xiphis.org <> | 2006-08-14 21:27:36 -0700 |
|---|---|---|
| committer | acurtis/antony@xiphis.org/ltantony.xiphis.org <> | 2006-08-14 21:27:36 -0700 |
| commit | e2d4aa2ca4a7cdb451020b47a50eb340b18dbc32 (patch) | |
| tree | 51e2422c10878ea5a789059de1577c5827adafdb /mysql-test/r/ps_4heap.result | |
| parent | c43a332859b6d216d5fe4eef3ef639b1f117f6bd (diff) | |
| parent | 6b9629422323fdfa1709776d63b0eae1bd72cd1f (diff) | |
| download | mariadb-git-e2d4aa2ca4a7cdb451020b47a50eb340b18dbc32.tar.gz | |
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
into xiphis.org:/home/antony/work2/mysql-5.0-merge
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 |