diff options
| author | unknown <monty@mysql.com> | 2004-07-12 08:20:24 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-07-12 08:20:24 +0300 |
| commit | 677d60bc61a36be16af964eaae47cc88b0ecc33f (patch) | |
| tree | 4b4523bbabccb4e51b85fc209e3274f249f85ef8 /sql/share/italian/errmsg.txt | |
| parent | c4645f84047585b12523d8d111044bf040880bb4 (diff) | |
| parent | 18d974a3e7b48eec96c8837d42ebbc698e68ca55 (diff) | |
| download | mariadb-git-677d60bc61a36be16af964eaae47cc88b0ecc33f.tar.gz | |
Merge with 4.1
BitKeeper/etc/logging_ok:
auto-union
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/bdb.result:
Auto merged
mysql-test/r/connect.result:
Auto merged
mysql-test/r/multi_update.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/system_mysql_db.result:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_heap.h:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/opt_range.cc:
Merge with 4.1
true -> TRUE and false -> FALSE
Diffstat (limited to 'sql/share/italian/errmsg.txt')
| -rw-r--r-- | sql/share/italian/errmsg.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt index 33ea2cb2a9d..525fd7eced9 100644 --- a/sql/share/italian/errmsg.txt +++ b/sql/share/italian/errmsg.txt @@ -303,6 +303,7 @@ character-set=latin1 "Got temporary error %d '%-.100s' from %s", "Unknown or incorrect time zone: '%-.64s'", "Invalid TIMESTAMP value in column '%s' at row %ld", +"Invalid %s character string: '%.64s'", "Can't create a %s from within another stored routine" "%s %s already exists" "%s %s does not exist" |