diff options
| author | unknown <evgen@moonbone.local> | 2006-04-24 17:52:15 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-04-24 17:52:15 +0400 |
| commit | ccee4036c2a542dd2eb6dfae8f8e0a4d1190dc15 (patch) | |
| tree | ceaf1389974db4bb5e61c87360323618e16642aa /sql/share | |
| parent | 2a138695bf6eecb3c8f6b4e3fcb9a1a224b53c2d (diff) | |
| parent | 4b7c4cd27f68b9aac1970b9f21c50d4eee35df7d (diff) | |
| download | mariadb-git-ccee4036c2a542dd2eb6dfae8f8e0a4d1190dc15.tar.gz | |
Manually merged
sql/item.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 9519e77903d..f174ba559d8 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5615,3 +5615,5 @@ 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" +ER_NON_GROUPING_FIELD_USED 42000 + eng "non-grouping field '%-.64s' is used in %-.64s clause" |