diff options
| author | unknown <dlenev@mysql.com> | 2004-09-09 19:52:10 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2004-09-09 19:52:10 +0400 |
| commit | eb75a9fd8dc7d22b2e7f3de5abbdecb25a464f9f (patch) | |
| tree | b2916e292af539d345d86ad24396d1654c22552b /sql/share/serbian | |
| parent | 12ce293a7fc18fdc2c6f8d7ec951d816d3661cf8 (diff) | |
| parent | bc787254247cb66a5e1adc0af6834c10737ecc6e (diff) | |
| download | mariadb-git-eb75a9fd8dc7d22b2e7f3de5abbdecb25a464f9f.tar.gz | |
Yet another manual merge with main tree for patch for WL#1218 "Triggers"
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/lex.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/serbian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
include/mysqld_error.h:
Manual merge.
sql/Makefile.am:
Manual merge.
sql/mysql_priv.h:
Manual merge.
sql/sp_head.cc:
Manual merge.
sql/sql_lex.cc:
Manual merge.
sql/sql_yacc.yy:
Manual merge.
Diffstat (limited to 'sql/share/serbian')
| -rw-r--r-- | sql/share/serbian/errmsg.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt index a3ecba11e2e..6e7826e33d6 100644 --- a/sql/share/serbian/errmsg.txt +++ b/sql/share/serbian/errmsg.txt @@ -310,7 +310,8 @@ character-set=cp1250 "Unknown or incorrect time zone: '%-.64s'", "Invalid TIMESTAMP value in column '%s' at row %ld", "Invalid %s character string: '%.64s'", -"Result of %s() was larger than max_allowed_packet (%d) - truncated" +"Result of %s() was larger than max_allowed_packet (%ld) - truncated" +"Conflicting declarations: '%s%s' and '%s%s'" "Can't create a %s from within another stored routine" "%s %s already exists" "%s %s does not exist" |