diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-03-11 16:32:42 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-03-11 16:32:42 +0100 |
| commit | e64f438ec7d50f18c82719a3d1c2e5597ea27aab (patch) | |
| tree | ee09976ab4dd9dee924a4c7e30eb0fc9f5e7d63f /mysql-test/r/ps_2myisam.result | |
| parent | f34ec421e6d61cbc09feaf86633fd376048952bd (diff) | |
| parent | 197bb45e0c3a97c1e927ea8771d386e63f70c69e (diff) | |
| download | mariadb-git-e64f438ec7d50f18c82719a3d1c2e5597ea27aab.tar.gz | |
merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.
Diffstat (limited to 'mysql-test/r/ps_2myisam.result')
| -rw-r--r-- | mysql-test/r/ps_2myisam.result | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/ps_2myisam.result b/mysql-test/r/ps_2myisam.result index 4e732db493e..3fc39be7594 100644 --- a/mysql-test/r/ps_2myisam.result +++ b/mysql-test/r/ps_2myisam.result @@ -1303,11 +1303,12 @@ a b set @arg00=NULL; set @arg01=2; execute stmt1 using @arg00, @arg01; -ERROR 23000: Column 'a' cannot be null +Warnings: +Warning 1048 Column 'a' cannot be null select a,b from t1 order by a; a b +0 two 1 one -2 two 3 three 4 four set @arg00=0; |