diff options
| author | unknown <monty@mysql.com> | 2005-04-28 00:41:39 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-04-28 00:41:39 +0300 |
| commit | df0a4ed64e255c1ae3aa9bf4202f2b5e1f41e940 (patch) | |
| tree | 7fb8cb0e958d8b306b4dc2a7ed2c3de1d6d5beca /sql/sql_insert.cc | |
| parent | 57d9c6d077bd6f2d437457e1bc4aa86607e80f46 (diff) | |
| parent | 167ce823942355b908f4cc70ebbe09d77adbf91c (diff) | |
| download | mariadb-git-df0a4ed64e255c1ae3aa9bf4202f2b5e1f41e940.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 31393b2173a..3ced5921076 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -72,7 +72,7 @@ static int check_insert_fields(THD *thd, TABLE *table, List<Item> &fields, { my_printf_error(ER_WRONG_VALUE_COUNT_ON_ROW, ER(ER_WRONG_VALUE_COUNT_ON_ROW), - MYF(0), 1); + MYF(0), 1L); return -1; } #ifndef NO_EMBEDDED_ACCESS_CHECKS @@ -89,7 +89,7 @@ static int check_insert_fields(THD *thd, TABLE *table, List<Item> &fields, { my_printf_error(ER_WRONG_VALUE_COUNT_ON_ROW, ER(ER_WRONG_VALUE_COUNT_ON_ROW), - MYF(0), 1); + MYF(0), 1L); return -1; } TABLE_LIST table_list; |