diff options
| author | unknown <monty@mysql.com> | 2005-02-15 19:25:42 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-02-15 19:25:42 +0200 |
| commit | 6992c010292fb005175a4ee41311742aea20046c (patch) | |
| tree | cc53b9a772b251181aee602ac07260728fd3856c /mysql-test | |
| parent | e2edf02421de2e94264f1b64e7e5ece43a67ac5b (diff) | |
| download | mariadb-git-6992c010292fb005175a4ee41311742aea20046c.tar.gz | |
After merge fixes
mysql-test/r/ctype_ucs.result:
Fixed warning after merge
sql/field.cc:
After merge fix
sql/item_cmpfunc.cc:
Style & comment changes
sql/sql_yacc.yy:
After merge fix
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ctype_ucs.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/ctype_ucs.result b/mysql-test/r/ctype_ucs.result index 7302ff930ae..7a2bdc83584 100644 --- a/mysql-test/r/ctype_ucs.result +++ b/mysql-test/r/ctype_ucs.result @@ -635,6 +635,6 @@ DROP TABLE t1; CREATE TABLE t1 (Field1 int(10) unsigned default '0'); INSERT INTO t1 VALUES ('-1'); Warnings: -Warning 1265 Data truncated for column 'Field1' at row 1 +Warning 1264 Out of range value adjusted for column 'Field1' at row 1 DROP TABLE t1; SET NAMES latin1; |