diff options
| author | unknown <monty@mysql.com> | 2003-12-19 16:34:48 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-12-19 16:34:48 +0200 |
| commit | 245b1385a10a12a955c95338b08190cac5cfcbd4 (patch) | |
| tree | 05b144ca850fc0bb99c1922907bfb2e9ba19fc77 /mysql-test/r/warnings.result | |
| parent | 060122db13c995908835ca338aeeab848024e266 (diff) | |
| parent | 9c2a63e35eec7a1af94dde1f10331361124a69f4 (diff) | |
| download | mariadb-git-245b1385a10a12a955c95338b08190cac5cfcbd4.tar.gz | |
merge
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/r/warnings.result:
Auto merged
mysql-test/t/type_enum.test:
Auto merged
sql/field.cc:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
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 39435d24ee1..5c7c75bac00 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 |