diff options
| author | Igor Babaev <igor@askmonty.org> | 2010-07-13 07:34:14 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2010-07-13 07:34:14 -0700 |
| commit | 73be27c07f3283cb35e0fb7085b5068ab360bc01 (patch) | |
| tree | cffb27f04190da0612b553bcaf451235463c194f /sql/share/errmsg.txt | |
| parent | 6197332366ec1908af34b2415f01ccca7757f0c2 (diff) | |
| download | mariadb-git-73be27c07f3283cb35e0fb7085b5068ab360bc01.tar.gz | |
Fixed bug #604549.
There was no error thrown when creating a table with a virtual table
computed by an expression returning a row.
This caused a crash when inserting into the table.
Removed periods at the end of the error messages for virtual columns.
Adjusted output in test result files accordingly.
Diffstat (limited to 'sql/share/errmsg.txt')
| -rw-r--r-- | sql/share/errmsg.txt | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 117a4b8e1e6..023bd57e14f 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6211,28 +6211,31 @@ ER_VCOL_BASED_ON_VCOL eng "A computed column cannot be based on a computed column" ER_VIRTUAL_COLUMN_FUNCTION_IS_NOT_ALLOWED - eng "Function or expression is not allowed for column '%s'." + eng "Function or expression is not allowed for column '%s'" ER_DATA_CONVERSION_ERROR_FOR_VIRTUAL_COLUMN - eng "Generated value for computed column '%s' cannot be converted to type '%s'." + eng "Generated value for computed column '%s' cannot be converted to type '%s'" ER_PRIMARY_KEY_BASED_ON_VIRTUAL_COLUMN - eng "Primary key cannot be defined upon a computed column." + eng "Primary key cannot be defined upon a computed column" ER_KEY_BASED_ON_GENERATED_VIRTUAL_COLUMN - eng "Key/Index cannot be defined on a non-stored computed column." + eng "Key/Index cannot be defined on a non-stored computed column" ER_WRONG_FK_OPTION_FOR_VIRTUAL_COLUMN - eng "Cannot define foreign key with %s clause on a computed column." + eng "Cannot define foreign key with %s clause on a computed column" ER_WARNING_NON_DEFAULT_VALUE_FOR_VIRTUAL_COLUMN - eng "The value specified for computed column '%s' in table '%s' ignored." + eng "The value specified for computed column '%s' in table '%s' ignored" ER_UNSUPPORTED_ACTION_ON_VIRTUAL_COLUMN - eng "'%s' is not yet supported for computed columns." + eng "'%s' is not yet supported for computed columns" ER_CONST_EXPR_IN_VCOL - eng "Constant expression in computed column function is not allowed." + eng "Constant expression in computed column function is not allowed" + +ER_ROW_EXPR_FOR_VCOL + eng "Expression for computed column cannot return a row" ER_DEBUG_SYNC_TIMEOUT eng "debug sync point wait timed out" |