diff options
| author | unknown <evgen@moonbone.local> | 2006-04-26 22:35:40 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-04-26 22:35:40 +0400 |
| commit | 2d85fd80835564e540a7e2d350b756c65a447a86 (patch) | |
| tree | de96ca431eb2fe86ad2c54fe1d6636dea552c2fe /sql/share | |
| parent | 8f38fc670b5b13522805bb7455463a5524079e1d (diff) | |
| parent | 4235378e8c0f3b749cd5de0b1b19fbbece5302ab (diff) | |
| download | mariadb-git-2d85fd80835564e540a7e2d350b756c65a447a86.tar.gz | |
Merge
sql/item.cc:
Auto merged
sql/share/errmsg.txt:
SCCS merged
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index f174ba559d8..7665a7425cd 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5614,6 +5614,6 @@ ER_SP_NO_AGGREGATE 42000 ER_MAX_PREPARED_STMT_COUNT_REACHED 42000 eng "Can't create more than max_prepared_stmt_count statements (current value: %lu)" ER_VIEW_RECURSIVE - eng "`%-.64s`.`%-.64s` contain view recursion" + eng "`%-.64s`.`%-.64s` contains view recursion" ER_NON_GROUPING_FIELD_USED 42000 eng "non-grouping field '%-.64s' is used in %-.64s clause" |