diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-11-29 15:22:47 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-11-29 15:22:47 +0200 |
| commit | 66e3b9d7e66a89b73c8e13ee76dbfcaf47098034 (patch) | |
| tree | 8c28fa812c9913c1cfeb3c2d0e52df0f97c0cfcc /sql/share/french | |
| parent | b226e15a096ad9493162f2d8dc81e40c69f848c7 (diff) | |
| parent | 1b921a995e3defb62aa51fc09fc4eaed9b0f4eab (diff) | |
| download | mariadb-git-66e3b9d7e66a89b73c8e13ee76dbfcaf47098034.tar.gz | |
many, many changes
mysql-test/r/subselect.result:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
include/mysqld_error.h:
Merging changes ...
mysql-test/t/subselect.test:
Merging changes ...
sql/share/czech/errmsg.txt:
Merging changes ...
sql/share/danish/errmsg.txt:
Merging changes ...
sql/share/dutch/errmsg.txt:
Merging changes ...
sql/share/english/errmsg.txt:
Merging changes ...
sql/share/estonian/errmsg.txt:
Merging changes ...
sql/share/french/errmsg.txt:
Merging changes ...
sql/share/german/errmsg.txt:
Merging changes ...
sql/share/greek/errmsg.txt:
Merging changes ...
sql/share/hungarian/errmsg.txt:
Merging changes ...
sql/share/italian/errmsg.txt:
Merging changes ...
sql/share/japanese/errmsg.txt:
Merging changes ...
sql/share/korean/errmsg.txt:
Merging changes ...
sql/share/norwegian-ny/errmsg.txt:
Merging changes ...
sql/share/norwegian/errmsg.txt:
Merging changes ...
sql/share/polish/errmsg.txt:
Merging changes ...
sql/share/portuguese/errmsg.txt:
Merging changes ...
sql/share/romanian/errmsg.txt:
Merging changes ...
sql/share/russian/errmsg.txt:
Merging changes ...
sql/share/serbian/errmsg.txt:
Merging changes ...
sql/share/slovak/errmsg.txt:
Merging changes ...
sql/share/spanish/errmsg.txt:
Merging changes ...
sql/share/swedish/errmsg.txt:
Merging changes ...
sql/share/ukrainian/errmsg.txt:
Merging changes ...
Diffstat (limited to 'sql/share/french')
| -rw-r--r-- | sql/share/french/errmsg.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt index fa732ed10e4..43952d848c4 100644 --- a/sql/share/french/errmsg.txt +++ b/sql/share/french/errmsg.txt @@ -247,4 +247,5 @@ "Cyclic reference on subqueries", "Converting column '%s' from %s to %s", "Reference '%-.64s' not supported (%s)", +"Every derived table must have it's own alias" "Select %u was reduced during optimisation", |