diff options
author | unknown <bell@sanja.is.com.ua> | 2002-06-05 21:32:22 +0300 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2002-06-05 21:32:22 +0300 |
commit | 954a0583f8408927184f12ef67527037e10b36d2 (patch) | |
tree | 945cc821cedde0c371ca804a2556598b1d087da7 /sql/share/serbian | |
parent | a532bfb2ea0a0d1cfc0c8d25e6a18cf5a8c0c5bc (diff) | |
parent | fa86b948379ca3929ebd8a7b941d6c2fbb26f8ec (diff) | |
download | mariadb-git-954a0583f8408927184f12ef67527037e10b36d2.tar.gz |
merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/share/serbian')
-rw-r--r-- | sql/share/serbian/errmsg.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt index 8e3b6e2a318..78febb65c3c 100644 --- a/sql/share/serbian/errmsg.txt +++ b/sql/share/serbian/errmsg.txt @@ -233,6 +233,8 @@ "Ne mogu da izvršim upit zbog toga što imate zaključavanja čitanja podataka u konfliktu", "Mešanje tabela koje podržavaju transakcije i onih koje ne podržavaju transakcije je isključeno", "Opcija '%s' je upotrebljena dva puta u istom iskazu", -"User '%-64s' has exceeded the '%s' resource (current value: %ld)", +"User '%-.64s' has exceeded the '%s' resource (current value: %ld)", +"Wrong foreign key definition for '%-.64s': %s", +"Key reference and table reference doesn't match", "Subselect return more than 1 field", "Subselect return more than 1 record", |