Commit 6b1450d9 authored by unknown's avatar unknown
Browse files

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/mysql_src/mysql-4.1-clean


sql/handler.cc:
  Auto merged
parents 71196720 b6eb77f7

include/mysqld_error.h

+1 −2
Original line number Diff line number Diff line
@@ -319,5 +319,4 @@ 
#define ER_INVALID_CHARACTER_STRING 1300

#define ER_WARN_ALLOWED_PACKET_OVERFLOWED 1301

#define ER_CONFLICTING_DECLARATIONS 1302

#define ER_NO_CONS_READ_ENGINE 1303

#define ER_ERROR_MESSAGES 304
 
#define ER_ERROR_MESSAGES 303

sql/handler.cc

+3 −2
Original line number Diff line number Diff line
@@ -786,8 +786,9 @@ int ha_start_consistent_snapshot(THD *thd) 
    Same idea as when one wants to CREATE TABLE in one engine which does not

    exist:

  */

  push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,

               ER_NO_CONS_READ_ENGINE, ER(ER_NO_CONS_READ_ENGINE));

  push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_UNKNOWN_ERROR,

               "This MySQL server does not support any "

               "consistent-read capable storage engine");

  return 0;

}

sql/share/czech/errmsg.txt

+0 −1
Original line number Diff line number Diff line
@@ -331,4 +331,3 @@ character-set=latin2 
"Invalid %s character string: '%.64s'",

"Result of %s() was larger than max_allowed_packet (%ld) - truncated"

"Conflicting declarations: '%s%s' and '%s%s'"
 
"This MySQL server does not support any consistent-read capable storage engine"

sql/share/danish/errmsg.txt

+0 −1
Original line number Diff line number Diff line
@@ -322,4 +322,3 @@ character-set=latin1 
"Invalid %s character string: '%.64s'",

"Result of %s() was larger than max_allowed_packet (%ld) - truncated"

"Conflicting declarations: '%s%s' and '%s%s'"
 
"This MySQL server does not support any consistent-read capable storage engine"

sql/share/dutch/errmsg.txt

+0 −1
Original line number Diff line number Diff line
@@ -331,4 +331,3 @@ character-set=latin1 
"Invalid %s character string: '%.64s'",

"Result of %s() was larger than max_allowed_packet (%ld) - truncated"

"Conflicting declarations: '%s%s' and '%s%s'"
 
"This MySQL server does not support any consistent-read capable storage engine"