diff options
| author | unknown <ram@mysql.r18.ru> | 2003-02-26 19:23:11 +0400 |
|---|---|---|
| committer | unknown <ram@mysql.r18.ru> | 2003-02-26 19:23:11 +0400 |
| commit | 29a99fa0bee7136d10214d84aa3b484168b60c46 (patch) | |
| tree | dc2dc0d975a191c52bdf40ae8e82b0ae8256c7cc /sql/share/english/errmsg.txt | |
| parent | d2b0d3fa88a894c6380e577eaa8d10b81f667566 (diff) | |
| parent | e0100ed8865823b724f899be74a3092db120bbf6 (diff) | |
| download | mariadb-git-29a99fa0bee7136d10214d84aa3b484168b60c46.tar.gz | |
Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
sql/spatial.cc:
Auto merged
Diffstat (limited to 'sql/share/english/errmsg.txt')
| -rw-r--r-- | sql/share/english/errmsg.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index 954b7cd2fb3..84d100cfae9 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -166,7 +166,7 @@ "Result string is longer than max_allowed_packet", "The used table type doesn't support BLOB/TEXT columns", "The used table type doesn't support AUTO_INCREMENT columns", -"INSERT DELAYED can't be used with table '%-.64s', because it is locked with LOCK TABLES", +"INSERT DELAYED can't be used with table '%-.64s' because it is locked with LOCK TABLES", "Incorrect column name '%-.100s'", "The used table handler can't index column '%-.64s'", "All tables in the MERGE table are not identically defined", @@ -198,7 +198,7 @@ "Table '%-.64s' is marked as crashed and should be repaired", "Table '%-.64s' is marked as crashed and last (automatic?) repair failed", "Some non-transactional changed tables couldn't be rolled back", -"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again', +"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again", "This operation cannot be performed with a running slave, run STOP SLAVE first", "This operation requires a running slave, configure slave and do START SLAVE", "The server is not configured as slave, fix in config file or with CHANGE MASTER TO", |