diff options
| author | unknown <bell@sanja.is.com.ua> | 2006-04-24 13:32:07 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2006-04-24 13:32:07 +0300 |
| commit | 4cfc649d2564ffda3de451e4f9073b6d1266f596 (patch) | |
| tree | b4b53f9873d5ee576a5ea0a905753163cd7fc022 /sql/share | |
| parent | c7a5f503420c56522ccc63fdcac80177e00dabb1 (diff) | |
| parent | 8dc06e0f064194489ab5cb56b11537a822ad844c (diff) | |
| download | mariadb-git-4cfc649d2564ffda3de451e4f9073b6d1266f596.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.1
configure.in:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/share/errmsg.txt:
merge
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 1a505afb509..c63c5f21a54 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5836,3 +5836,5 @@ ER_WRONG_PARTITION_NAME swe "Felaktigt partitionsnamn" 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" |