• unknown's avatar
    merge · 0a03601f
    unknown authored
    BitKeeper/etc/logging_ok:
      auto-union
    configure.in:
      Auto merged
    BitKeeper/deleted/.del-identity.result~e41453a364242503:
      Auto merged
    BitKeeper/deleted/.del-identity.test~326f469b59105404:
      Auto merged
    include/my_pthread.h:
      Auto merged
    innobase/dict/dict0crea.c:
      Auto merged
    innobase/dict/dict0dict.c:
      Auto merged
    innobase/dict/dict0load.c:
      Auto merged
    innobase/include/univ.i:
      Auto merged
    innobase/lock/lock0lock.c:
      Auto merged
    innobase/pars/pars0opt.c:
      Auto merged
    innobase/que/que0que.c:
      Auto merged
    innobase/row/row0ins.c:
      Auto merged
    innobase/row/row0mysql.c:
      Auto merged
    innobase/row/row0sel.c:
      Auto merged
    innobase/row/row0upd.c:
      Auto merged
    innobase/srv/srv0srv.c:
      Auto merged
    innobase/sync/sync0sync.c:
      Auto merged
    innobase/trx/trx0trx.c:
      Auto merged
    libmysql/libmysql.c:
      Auto merged
    myisam/myisampack.c:
      Auto merged
    mysql-test/t/func_test.test:
      Auto merged
    mysql-test/t/show_check.test:
      Auto merged
    mysql-test/t/variables.test:
      Auto merged
    mysys/my_pthread.c:
      Auto merged
    sql/item_cmpfunc.cc:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/share/danish/errmsg.txt:
      Auto merged
    sql/share/english/errmsg.txt:
      Auto merged
    sql/share/french/errmsg.txt:
      Auto merged
    sql/share/german/errmsg.txt:
      Auto merged
    sql/share/greek/errmsg.txt:
      Auto merged
    sql/share/hungarian/errmsg.txt:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    sql/share/italian/errmsg.txt:
      Auto merged
    sql/share/japanese/errmsg.txt:
      Auto merged
    sql/share/korean/errmsg.txt:
      Auto merged
    sql/share/norwegian-ny/errmsg.txt:
      Auto merged
    sql/share/norwegian/errmsg.txt:
      Auto merged
    sql/share/polish/errmsg.txt:
      Auto merged
    sql/share/portuguese/errmsg.txt:
      Auto merged
    sql/share/romanian/errmsg.txt:
      Auto merged
    sql/share/russian/errmsg.txt:
      Auto merged
    sql/share/slovak/errmsg.txt:
      Auto merged
    sql/share/spanish/errmsg.txt:
      Auto merged
    sql/share/swedish/errmsg.txt:
      Auto merged
    sql/share/ukrainian/errmsg.txt:
      Auto merged
    0a03601f
errmsg.txt 13.7 KB
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
   This file is public domain and comes with NO WARRANTY of any kind */

"hashchk",
"isamchk",
"",
"",
"     '%-.64s' ( : %d)",
"     '%-.64s' ( : %d)",
"      '%-.64s'. ( : %d)",
"      '%-.64s'.     ",
"      '%-.64s'.     ",
"        (   '%-.64s',  : %d)",
"        (     '%-.64s',  : %d)",
"     '%-.64s' ( : %d)",
"       ",
"        '%-.64s' ( : %d)",
"     ( : %d)",
"      ( : %d)",
"      : '%-.64s'. ( : %d)",
"   : '%-.64s' ( : %d)",
"        '%-.64s' ( : %d)",
"       '%-.64s' ( : %d)",
"             '%-.64s'",
"     (%s). ,    ....",
"    ,       '%-.64s'",
"    '%-.64s' ( : %d)",
"      '%-.64s' ( : %d)",
"      '%-.64s' to '%-.64s' ( : %d)",
"      '%-.64s' ( : %d)",
"'%-.64s'   ",
"   ",
" View '%-.64s'    '%-.64s'",
"   %d     (table handler)",
"   (table handler)  '%-.64s'     ",
"     '%-.64s'",
"   : '%-.64s'",
"   (key file)   : '%-.64s'. ,  !",
"   (key file)    '%-.64s'; ,  !",
"'%-.64s'    ",
"   .  ,    (demon) ( %d bytes)",
"     .   sort buffer size    (demon)",
"    ,       '%-.64s' ( : %d)",
"  ...",
"     (Out of thread space/memory)",
"    hostname   address ",
"  (handshake)   ",
"     : '%-.32s@%-.64s'    '%-.64s'",
"     : '%-.32s@%-.64s' ( password: %s)",
"   ",
" ",
"  '%-.64s'      (null)",
"   '%-.64s'",
"  '%-.64s'  ",
"  '%-.64s'",
" : '%-.64s'  %-.64s   ",
"     (server shutdown)",
"  '%-.64s'  '%-.64s'",
" '%-.64s'     group by",
"   (group on) '%-.64s'",
"   sum functions  columns   ",
" Column count     value count",
" identifier name '%-.100s'   ",
" column name '%-.64s'",
" key name '%-.64s'",
"  '%-.64s'    %d",
" column specifier    '%-.64s'",
"%s  '%-.80s'   %d",
"  (query)    ",
"   unique table/alias: '%-.64s'",
"   (default value)  '%-.64s'",
"   primary key ",
"  key .   %d ",
"  key parts .   %d ",
"      .     %d",
"   '%-.64s'    ",
"  Blob '%-.64s'         (key specification)",
"      '%-.64s' (max = %d).     BLOB",
"     auto field       key",
"%s:   \n",
"%s:   shutdown\n",
"%s:    %d.   !\n",
"%s:   Shutdown \n",
"%s:  thread   %ld  user: '%-.64s'\n",
"     IP socket",
"  '%-.64s'    (index)      CREATE INDEX. ,   ",
"       .    manual",
"    fixed rowlength  BLOBs.   'fields terminated by'.",
"  '%-.64s'     database directory       ",
"  '%-.64s'  ",
": %ld  : %ld  : %ld  : %ld",
": %ld  : %ld",
" sub part key.   key part   string      ",
"         ALTER TABLE.   DROP TABLE",
"   (DROP) '%-.64s'.     / ",
": %ld  : %ld  : %ld",
"INSERT TABLE '%-.64s'    FROM table list",
" thread id: %lu",
"  owner  thread %lu",
"  ",
"  strings    %-.64s  SET",
"   unique log-filename %-.64s.(1-999)\n",
"  '%-.64s'    READ lock    ",
"  '%-.64s'     LOCK TABLES",
" Blob  '%-.64s'       (default value)",
"    '%-.100s'",
"   '%-.100s'",
" SELECT         .      WHERE   SET OPTION SQL_BIG_SELECTS=1   SELECT  ",
"  ",
"  '%-.64s'",
"     '%-.64s'",
"    '%-.64s'",
"  '%-.64s'  %s",
"  '%-.64s'    ",
"   group function",
"  '%-.64s'   extension        MySQL",
"       ",
"  '%-.64s'  ",
" character set: '%-.64s'",
"   .  MySQL    %d    join",
"   ",
"   .    ,     blobs,  %d.       blobs",
"Stack overrun  thread:  Used: %ld of a %ld stack.    'mysqld -O thread_stack=#'      stack  ",
"Cross dependency   OUTER JOIN.         ON",
"  '%-.64s'   UNIQUE  INDEX      NOT NULL",
"     load    '%-.64s'",
"       '%-.64s'; %-.80s",
"  paths   shared library",
"  '%-.64s'  ",
"      shared library '%-.64s' ( : %d %s)",
"       '%-.64s'  '",
"  '%-.64s'   ",
"       .     'mysqladmin flush-hosts'",
"        MySQL server",
"  MySQL  anonymous user        passwords  ",
"      (update)    mysql       passwords  ",
"           ",
"Rows matched: %ld  Changed: %ld  Warnings: %ld",
"Can't create a new thread (errno %d). If you are not out of available memory, you can consult the manual for a possible OS-dependent bug",
"Column count doesn't match value count at row %ld",
"Can't reopen table: '%-.64s'",
"Invalid use of NULL value",
"Got error '%-.64s' from regexp",
"Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause",
"There is no such grant defined for user '%-.32s' on host '%-.64s'",
"%-.16s command denied to user: '%-.32s@%-.64s' for table '%-.64s'",
"%-.16s command denied to user: '%-.32s@%-.64s' for column '%-.64s' in table '%-.64s'",
"Illegal GRANT/REVOKE command. Please consult the manual which privileges can be used.",
"The host or user argument to GRANT is too long",
"Table '%-.64s.%-.64s' doesn't exist",
"There is no such grant defined for user '%-.32s' on host '%-.64s' on table '%-.64s'",
"The used command is not allowed with this MySQL version",
"You have an error in your SQL syntax",
"Delayed insert thread couldn't get requested lock for table %-.64s",
"Too many delayed threads in use",
"Aborted connection %ld to db: '%-.64s' user: '%-32s' (%-.64s)",
"Got a packet bigger than 'max_allowed_packet'",
"Got a read error from the connection pipe",
"Got an error from fcntl()",
"Got packets out of order",
"Couldn't uncompress communication packet",
"Got an error reading communication packets"
"Got timeout reading communication packets",
"Got an error writing communication packets",
"Got timeout writing communication packets",
"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",
"Incorrect column name '%-.100s'",
"The used table handler can't index column '%-.64s'",
"All tables in the MERGE table are not identically defined",
"Can't write, because of unique constraint, to table '%-.64s'",
"BLOB column '%-.64s' used in key specification without a key length",
"All parts of a PRIMARY KEY must be NOT NULL;  If you need NULL in a key, use UNIQUE instead",
"Result consisted of more than one row",
"This table type requires a primary key",
"This version of MySQL is not compiled with RAID support",
"You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column",
"Key '%-.64s' doesn't exist in table '%-.64s'",
"Can't open table",
"The handler for the table doesn't support check/repair",
"You are not allowed to execute this command in a transaction",
"Got error %d during COMMIT",
"Got error %d during ROLLBACK",
"Got error %d during FLUSH_LOGS",
"Got error %d during CHECKPOINT",
"Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s)",
"The handler for the table does not support binary table dump",
"Binlog closed while trying to FLUSH MASTER",
"Failed rebuilding the index of dumped table '%-.64s'",
"Error from master: '%-.64s'",
"Net error reading from master",
"Net error writing to master",
"Can't find FULLTEXT index matching the column list",
"Can't execute the given command because you have active locked tables or an active transaction",
"Unknown system variable '%-.64s'",
"Table '%-.64s' is marked as crashed and should be repaired",
"Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
"Warning:  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',
"This operation cannot be performed with a running slave, run SLAVE STOP first",
"This operation requires a running slave, configure slave and do SLAVE START",
"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
"Lock wait timeout exceeded",
"The total number of locks exceeds the lock table size",
"Update locks cannot be acquired during a READ UNCOMMITTED transaction",
"DROP DATABASE not allowed while thread is holding global read lock",
"CREATE DATABASE not allowed while thread is holding global read lock",
"Wrong arguments to %s",
"%-.32s@%-.64s is not allowed to create new users",
"Incorrect table definition; All MERGE tables must be in the same database",
"Deadlock found when trying to get lock; Try restarting transaction",
"The used table type doesn't support FULLTEXT indexes",
"Cannot add foreign key constraint",
"Cannot add a child row: a foreign key constraint fails",
"Cannot delete a parent row: a foreign key constraint fails",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
"Error when executing command %s: %-.128s",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Option '%s' used twice in statement",
"User '%-64s' has exceeded the '%s' resource (current value: %ld)",