diff options
| author | monty@mysql.com <> | 2003-12-19 16:25:50 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2003-12-19 16:25:50 +0200 |
| commit | 031390a9a4904924c21929314dcd42886c84c175 (patch) | |
| tree | 87e8ff9b43e2e71fc79bfa2e296018b89b08a9e1 /mysql-test/r/warnings.result | |
| parent | e0cc6799ecc831d296c568c5068947c1421fcaa5 (diff) | |
| download | mariadb-git-031390a9a4904924c21929314dcd42886c84c175.tar.gz | |
Fixes after merge with 4.0
Cleaned up embedded library access and query cache handling
Changed min stack size to 128K (to allow longer MyISAM keys)
Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
Diffstat (limited to 'mysql-test/r/warnings.result')
| -rw-r--r-- | mysql-test/r/warnings.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index 2769e284a95..fce2ddfd57a 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -49,9 +49,9 @@ Warnings: Warning 1262 Data truncated, NULL supplied to NOT NULL column 'b' at row 2 Warning 1264 Data truncated for column 'd' at row 3 Warning 1264 Data truncated for column 'c' at row 4 -Warning 1260 Record count is fewer than the column count at row 5 +Warning 1260 Row 5 doesn't contain data for all columns Warning 1264 Data truncated for column 'b' at row 6 -Warning 1261 Record count is more than the column count at row 7 +Warning 1261 Row 7 was truncated; It contained more data than there where input columns Warning 1263 Data truncated, out of range for column 'a' at row 8 select @@warning_count; @@warning_count |