database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

merge fixes

Browse Source
This commit is contained in:
Sinisa@sinisa.nasamreza.org
2002-12-26 20:04:22 +02:00
parent 672a695f8f d85a01db2c
commit 5a44f2bc26
38 changed files with 223 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View File

@ -24,6 +24,7 @@ heikki@work.mysql.com
hf@deer.mysql.r18.ru
hf@genie.(none)
jani@dsl-jkl1657.dial.inet.fi
jani@dsl-kpogw4gb5.dial.inet.fi
jani@hynda.(none)
jani@hynda.mysql.fi
jani@janikt.pp.saunalahti.fi

6
bdb/db/db_open.c
View File

@ -536,11 +536,9 @@ swap_retry:
* and even a checksum error isn't a reason to panic the environment.
*/
if ((ret = __db_chk_meta(dbenv, dbp, meta, do_metachk)) != 0) {
if (ret == -1) {
if (ret == -1)
__db_err(dbenv,
"%s: metadata page checksum error", name);
ret = EINVAL;
}
goto bad_format;
}
@ -577,7 +575,7 @@ swap_retry:
bad_format:
__db_err(dbenv, "%s: unexpected file type or format", name);
return (ret);
return (ret == 0 ? EINVAL : ret);
}
/*

2
bdb/log/log_put.c
View File

@ -268,6 +268,8 @@ __log_txn_lsn(dbenv, lsnp, mbytesp, bytesp)
if (mbytesp != NULL) {
*mbytesp = lp->stat.st_wc_mbytes;
*bytesp = (u_int32_t)(lp->stat.st_wc_bytes + lp->b_off);
lp->stat.st_wc_mbytes = lp->stat.st_wc_bytes = 0;
}
R_UNLOCK(dbenv, &dblp->reginfo);

35
bdb/mp/mp_fopen.c
View File

@ -344,6 +344,23 @@ __memp_fopen_int(dbmfp, mfp, path, flags, mode, pagesize)
goto err;
}
/*
* Figure out the file's size.
*
* !!!
* We can't use off_t's here, or in any code in the mainline library
* for that matter. (We have to use them in the os stubs, of course,
* as there are system calls that take them as arguments.) The reason
* is some customers build in environments where an off_t is 32-bits,
* but still run where offsets are 64-bits, and they pay us a lot of
* money.
*/
if ((ret = __os_ioinfo(
dbenv, rpath, dbmfp->fhp, &mbytes, &bytes, NULL)) != 0) {
__db_err(dbenv, "%s: %s", rpath, db_strerror(ret));
goto err;
}
/*
* Get the file id if we weren't given one. Generated file id's
* don't use timestamps, otherwise there'd be no chance of any
@ -470,6 +487,7 @@ alloc: /* Allocate and initialize a new MPOOLFILE. */
F_SET(mfp, MP_DIRECT);
if (LF_ISSET(DB_EXTENT))
F_SET(mfp, MP_EXTENT);
F_SET(mfp, MP_CAN_MMAP);
if (path == NULL)
F_SET(mfp, MP_TEMP);
@ -479,21 +497,6 @@ alloc: /* Allocate and initialize a new MPOOLFILE. */
* and find the number of the last page in the file, all the
* time being careful not to overflow 32 bits.
*
* !!!
* We can't use off_t's here, or in any code in the mainline
* library for that matter. (We have to use them in the os
* stubs, of course, as there are system calls that take them
* as arguments.) The reason is that some customers build in
* environments where an off_t is 32-bits, but still run where
* offsets are 64-bits, and they pay us a lot of money.
*/
if ((ret = __os_ioinfo(
dbenv, rpath, dbmfp->fhp, &mbytes, &bytes, NULL)) != 0) {
__db_err(dbenv, "%s: %s", rpath, db_strerror(ret));
goto err;
}
/*
* During verify or recovery, we might have to cope with a
* truncated file; if the file size is not a multiple of the
* page size, round down to a page, we'll take care of the
@ -582,7 +585,7 @@ check_map:
* compiler will perpetrate, doing the comparison in a portable way is
* flatly impossible. Hope that mmap fails if the file is too large.
*/
#define DB_MAXMMAPSIZE (10 * 1024 * 1024) /* 10 Mb. */
#define DB_MAXMMAPSIZE (10 * 1024 * 1024) /* 10 MB. */
if (F_ISSET(mfp, MP_CAN_MMAP)) {
if (path == NULL)
F_CLR(mfp, MP_CAN_MMAP);

3
bdb/rep/rep_record.c
View File

@ -1198,6 +1198,9 @@ gap_check: lp->wait_recs = 0;
* replica get flushed now and again.
*/
ret = dbenv->log_flush(dbenv, &ckp_lsn);
/* Update the last_ckp in the txn region. */
if (ret == 0)
__txn_updateckp(dbenv, &rp->lsn);
break;
case DB___txn_regop:
if (!F_ISSET(dbenv, DB_ENV_REP_LOGSONLY))

46
bdb/txn/txn.c
View File

@ -1209,18 +1209,7 @@ do_ckp: /* Look through the active transactions for the lowest begin LSN. */
return (ret);
}
/*
* We want to make sure last_ckp only moves forward; since
* we drop locks above and in log_put, it's possible
* for two calls to __txn_ckp_log to finish in a different
* order from how they were called.
*/
R_LOCK(dbenv, &mgr->reginfo);
if (log_compare(&region->last_ckp, &ckp_lsn) < 0) {
region->last_ckp = ckp_lsn;
(void)time(&region->time_ckp);
}
R_UNLOCK(dbenv, &mgr->reginfo);
__txn_updateckp(dbenv, &ckp_lsn);
}
return (0);
}
@ -1404,3 +1393,36 @@ __txn_reset(dbenv)
return (__txn_recycle_log(dbenv,
NULL, &scrap, 0, TXN_MINIMUM, TXN_MAXIMUM));
}
/*
* __txn_updateckp --
* Update the last_ckp field in the transaction region. This happens
* at the end of a normal checkpoint and also when a replication client
* receives a checkpoint record.
*
* PUBLIC: void __txn_updateckp __P((DB_ENV *, DB_LSN *));
*/
void
__txn_updateckp(dbenv, lsnp)
DB_ENV *dbenv;
DB_LSN *lsnp;
{
DB_TXNMGR *mgr;
DB_TXNREGION *region;
mgr = dbenv->tx_handle;
region = mgr->reginfo.primary;
/*
* We want to make sure last_ckp only moves forward; since
* we drop locks above and in log_put, it's possible
* for two calls to __txn_ckp_log to finish in a different
* order from how they were called.
*/
R_LOCK(dbenv, &mgr->reginfo);
if (log_compare(&region->last_ckp, lsnp) < 0) {
region->last_ckp = *lsnp;
(void)time(&region->time_ckp);
}
R_UNLOCK(dbenv, &mgr->reginfo);
}

107
client/mysql.cc
View File

@ -40,7 +40,7 @@
#include <signal.h>
#include <violite.h>
const char *VER= "13.1";
const char *VER= "13.3";
/* Don't try to make a nice table if the data is too big */
#define MAX_COLUMN_LENGTH 1024
@ -195,7 +195,7 @@ static void end_pager();
static int init_tee(char *);
static void end_tee();
static const char* construct_prompt();
static char *get_arg(char *line);
static char *get_arg(char *line, my_bool get_next_arg);
static void init_username();
static void add_int_to_prompt(int toadd);
@ -280,7 +280,8 @@ static void initialize_readline (char *name);
#endif
static COMMANDS *find_command (char *name,char cmd_name);
static bool add_line(String &buffer,char *line,char *in_string);
static bool add_line(String &buffer,char *line,char *in_string,
bool *ml_comment);
static void remove_cntrl(String &buffer);
static void print_table_data(MYSQL_RES *result);
static void print_table_data_html(MYSQL_RES *result);
@ -805,6 +806,7 @@ static int read_lines(bool execute_commands)
char *line;
char in_string=0;
ulong line_number=0;
bool ml_comment= 0;
COMMANDS *com;
status.exit_status=1;
@ -873,7 +875,7 @@ static int read_lines(bool execute_commands)
#endif
continue;
}
if (add_line(glob_buffer,line,&in_string))
if (add_line(glob_buffer,line,&in_string,&ml_comment))
break;
}
/* if in batch mode, send last query even if it doesn't end with \g or go */
@ -934,7 +936,8 @@ static COMMANDS *find_command (char *name,char cmd_char)
}
static bool add_line(String &buffer,char *line,char *in_string)
static bool add_line(String &buffer,char *line,char *in_string,
bool *ml_comment)
{
uchar inchar;
char buff[80],*pos,*out;
@ -965,7 +968,7 @@ static bool add_line(String &buffer,char *line,char *in_string)
continue;
}
#endif
if (inchar == '\\')
if (!*ml_comment && inchar == '\\')
{ // mSQL or postgreSQL style command ?
if (!(inchar = (uchar) *++pos))
break; // readline adds one '\'
@ -999,7 +1002,7 @@ static bool add_line(String &buffer,char *line,char *in_string)
continue;
}
}
else if (inchar == ';' && !*in_string)
else if (!*ml_comment && inchar == ';' && !*in_string)
{ // ';' is end of command
if (out != line)
buffer.append(line,(uint) (out-line)); // Add this line
@ -1019,17 +1022,33 @@ static bool add_line(String &buffer,char *line,char *in_string)
buffer.length(0);
out=line;
}
else if (!*in_string && (inchar == '#' ||
inchar == '-' && pos[1] == '-' &&
my_isspace(system_charset_info,pos[2])))
else if (!*ml_comment && (!*in_string && (inchar == '#' ||
inchar == '-' && pos[1] == '-' &&
my_isspace(system_charset_info,pos[2]))))
break; // comment to end of line
else if (!*in_string && inchar == '/' && *(pos+1) == '*')
{
pos++;
*ml_comment= 1;
if (out != line)
{
buffer.append(line,(uint) (out-line));
out=line;
}
}
else if (*ml_comment && !*in_string && inchar == '*' && *(pos+1) == '/')
{
pos++;
*ml_comment= 0;
}
else
{ // Add found char to buffer
if (inchar == *in_string)
*in_string=0;
else if (!*in_string && (inchar == '\'' || inchar == '"'))
*in_string=(char) inchar;
*out++ = (char) inchar;
if (!(*ml_comment))
*out++ = (char) inchar;
}
}
if (out != line || !buffer.is_empty())
@ -1038,7 +1057,7 @@ static bool add_line(String &buffer,char *line,char *in_string)
uint length=(uint) (out-line);
if (buffer.length() + length >= buffer.alloced_length())
buffer.realloc(buffer.length()+length+IO_SIZE);
if (buffer.append(line,length))
if (!(*ml_comment) && buffer.append(line,length))
return 1;
}
return 0;
@ -2212,23 +2231,21 @@ com_print(String *buffer,char *line __attribute__((unused)))
static int
com_connect(String *buffer, char *line)
{
char *tmp,buff[256];
char *tmp, buff[256];
bool save_rehash= rehash;
int error;
bzero(buff, sizeof(buff));
if (buffer)
{
while (my_isspace(system_charset_info,*line))
line++;
strnmov(buff,line,sizeof(buff)-1); // Don't destroy history
if (buff[0] == '\\') // Short command
buff[1]=' ';
tmp=(char *) strtok(buff," \t"); // Skip connect command
if (tmp && (tmp=(char *) strtok(NullS," \t;")))
strmov(buff, line);
tmp= get_arg(buff, 0);
if (tmp && *tmp)
{
my_free(current_db,MYF(MY_ALLOW_ZERO_PTR));
current_db=my_strdup(tmp,MYF(MY_WME));
if ((tmp=(char *) strtok(NullS," \t;")))
my_free(current_db, MYF(MY_ALLOW_ZERO_PTR));
current_db= my_strdup(tmp, MYF(MY_WME));
tmp= get_arg(buff, 1);
if (tmp)
{
my_free(current_host,MYF(MY_ALLOW_ZERO_PTR));
current_host=my_strdup(tmp,MYF(MY_WME));
@ -2314,8 +2331,9 @@ com_use(String *buffer __attribute__((unused)), char *line)
char *tmp;
char buff[256];
bzero(buff, sizeof(buff));
strmov(buff, line);
tmp= get_arg(buff);
tmp= get_arg(buff, 0);
if (!tmp || !*tmp)
{
put_info("USE must be followed by a database name", INFO_ERROR);
@ -2357,9 +2375,20 @@ com_use(String *buffer __attribute__((unused)), char *line)
}
/*
Gets argument from a command on the command line. If get_next_arg is
not defined, skips the command and returns the first argument. The
line is modified by adding zero to the end of the argument. If
get_next_arg is defined, then the function searches for end of string
first, after found, returns the next argument and adds zero to the
end. If you ever wish to use this feature, remember to initialize all
items in the array to zero first.
*/
enum quote_type { NO_QUOTE, SQUOTE, DQUOTE, BTICK };
char *get_arg(char *line)
char *get_arg(char *line, my_bool get_next_arg)
{
char *ptr;
my_bool quoted= 0, valid_arg= 0;
@ -2367,13 +2396,22 @@ char *get_arg(char *line)
enum quote_type qtype= NO_QUOTE;
ptr= line;
/* skip leading white spaces */
while (my_isspace(system_charset_info, *ptr))
ptr++;
if (*ptr == '\\') // short command was used
ptr+= 2;
while (!my_isspace(system_charset_info, *ptr)) // skip command
ptr++;
if (get_next_arg)
{
for (; ptr && *ptr; ptr++);
if ((ptr + 1) && *(ptr + 1))
ptr++;
}
else
{
/* skip leading white spaces */
while (my_isspace(system_charset_info, *ptr))
ptr++;
if (*ptr == '\\') // short command was used
ptr+= 2;
while (!my_isspace(system_charset_info, *ptr)) // skip command
ptr++;
}
while (my_isspace(system_charset_info, *ptr))
ptr++;
if ((*ptr == '\'' && (qtype= SQUOTE)) ||
@ -2396,9 +2434,8 @@ char *get_arg(char *line)
ptr= line;
ptr+= count;
}
else if (!quoted && *ptr == ' ')
*(ptr + 1) = 0;
else if ((*ptr == '\'' && qtype == SQUOTE) ||
else if ((!quoted && *ptr == ' ') ||
(*ptr == '\'' && qtype == SQUOTE) ||
(*ptr == '\"' && qtype == DQUOTE) ||
(*ptr == '`' && qtype == BTICK))
{

5
mysql-test/mysql-test-run.sh
View File

@ -778,8 +778,6 @@ start_master()
if [ x$MASTER_RUNNING = x1 ] || [ x$LOCAL_MASTER = x1 ] ; then
return
fi
# Remove old berkeley db log files that can confuse the server
$RM -f $MASTER_MYDDIR/log.*
# Remove stale binary logs
$RM -f $MYSQL_TEST_DIR/var/log/master-bin.*
# Remove old master.info files
@ -1286,6 +1284,9 @@ then
# Remove files that can cause problems
$RM -f $MYSQL_TEST_DIR/var/run/* $MYSQL_TEST_DIR/var/tmp/*
# Remove old berkeley db log files that can confuse the server
$RM -f $MASTER_MYDDIR/log.*
wait_for_master=$SLEEP_TIME_FOR_FIRST_MASTER
wait_for_slave=$SLEEP_TIME_FOR_FIRST_SLAVE
$ECHO "Installing Test Databases"

7
mysql-test/r/derived.result
View File

@ -1,3 +1,10 @@
select * from (select 2 from DUAL) b;
2
2
SELECT 1 as a FROM (SELECT 1 UNION SELECT a) b;
Unknown column 'a' in 'field list'
SELECT 1 as a FROM (SELECT a UNION SELECT 1) b;
Unknown column 'a' in 'field list'
drop table if exists t1,t2,t3;
CREATE TABLE t1 (a int not null, b char (10) not null);
insert into t1 values(1,'a'),(2,'b'),(3,'c'),(3,'c');

5
mysql-test/t/derived.test
View File

@ -1,3 +1,8 @@
select * from (select 2 from DUAL) b;
-- error 1054
SELECT 1 as a FROM (SELECT 1 UNION SELECT a) b;
-- error 1054
SELECT 1 as a FROM (SELECT a UNION SELECT 1) b;
drop table if exists t1,t2,t3;
CREATE TABLE t1 (a int not null, b char (10) not null);
insert into t1 values(1,'a'),(2,'b'),(3,'c'),(3,'c');

18
sql/ha_berkeley.cc
View File

@ -1940,6 +1940,24 @@ int ha_berkeley::delete_table(const char *name)
DBUG_RETURN(error);
}
int ha_berkeley::rename_table(const char * from, const char * to)
{
int error;
char from_buff[FN_REFLEN];
char to_buff[FN_REFLEN];
if ((error= db_create(&file, db_env, 0)))
my_errno= error;
else
error= file->rename(file,
fn_format(from_buff, from, "", ha_berkeley_ext, 2 | 4),
NULL, fn_format(to_buff, to, "", ha_berkeley_ext,
2 | 4), 0);
return error;
}
/*
How many seeks it will take to read through the table
This is to be comparable to the number returned by records_in_range so

1
sql/ha_berkeley.h
View File

@ -152,6 +152,7 @@ class ha_berkeley: public handler
int create(const char *name, register TABLE *form,
HA_CREATE_INFO *create_info);
int delete_table(const char *name);
int rename_table(const char* from, const char* to);
THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
enum thr_lock_type lock_type);

9
sql/item.cc
View File

@ -586,7 +586,8 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
REPORT_EXCEPT_NOT_FOUND)) !=
(Item **)not_found_item)
break;
if (sl->linkage == DERIVED_TABLE_TYPE)
if (sl->master_unit()->first_select()->linkage ==
DERIVED_TABLE_TYPE)
break; // do not look over derived table
}
if (!tmp)
@ -1024,7 +1025,8 @@ bool Item_ref::fix_fields(THD *thd,TABLE_LIST *tables, Item **reference)
if ((ref= find_item_in_list(this,
*(thd->lex.current_select->get_item_list()),
((sl &&
thd->lex.current_select->linkage !=
thd->lex.current_select->master_unit()->
first_select()->linkage !=
DERIVED_TABLE_TYPE) ?
REPORT_EXCEPT_NOT_FOUND :
REPORT_ALL_ERRORS))) ==
@ -1050,7 +1052,8 @@ bool Item_ref::fix_fields(THD *thd,TABLE_LIST *tables, Item **reference)
if ((tmp= find_field_in_tables(thd, this,
sl->get_table_list(),
0)) != not_found_field);
if (sl->linkage == DERIVED_TABLE_TYPE)
if (sl->master_unit()->first_select()->linkage ==
DERIVED_TABLE_TYPE)
break; // do not look over derived table
}

4
sql/share/czech/errmsg.txt
View File

@ -208,8 +208,8 @@ v/*
"Tabulka '%-.64s' je ozna-B<>ena jako poru<72>en<65> a posledn<64> (automatick<63>?) oprava se nezda<64>ila",
"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",
"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",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",

4
sql/share/danish/errmsg.txt
View File

@ -202,8 +202,8 @@
"Tabellen '%-.64s' er markeret med fejl og sidste (automatiske?) REPAIR fejlede",
"Advarsel: Visse data i tabeller der ikke underst<73>tter transaktioner kunne ikke tilbagestilles",
"Fler-udtryks transaktion kr<6B>vede mere plads en 'max_binlog_cache_size' bytes. Forh<72>j v<>rdien af denne variabel og pr<70>v igen',
"Denne handling kunne ikke udf<64>res med k<>rende slave, brug f<>rst kommandoen SLAVE STOP",
"Denne handling kr<6B>ver en k<>rende slave. Konfigurer en slave og brug kommandoen SLAVE START",
"Denne handling kunne ikke udf<64>res med k<>rende slave, brug f<>rst kommandoen STOP SLAVE",
"Denne handling kr<6B>ver en k<>rende slave. Konfigurer en slave og brug kommandoen START SLAVE",
"Denne server er ikke konfigureret som slave. Ret in config-filen eller brug kommandoen CHANGE MASTER TO",
"Kunne ikke initialisere master info-struktur. Check om rettigheder i master.info",
"Kunne ikke danne en slave-tr<74>d. Check systemressourcerne",

4
sql/share/dutch/errmsg.txt
View File

@ -210,8 +210,8 @@
"Tabel '%-.64s' staat als gecrashed gemarkeerd en de laatste (automatische?) reparatie poging mislukte",
"Waarschuwing: Roll back mislukt voor sommige buiten transacties gewijzigde tabellen",
"Multi-statement transactie vereist meer dan 'max_binlog_cache_size' bytes opslag. Verhoog deze mysqld variabele en probeer opnieuw',
"Deze operatie kan niet worden uitgevoerd met een actieve slave, doe eerst SLAVE STOP",
"Deze operatie vereist een actieve slave, configureer slave en doe dan SLAVE START",
"Deze operatie kan niet worden uitgevoerd met een actieve slave, doe eerst STOP SLAVE",
"Deze operatie vereist een actieve slave, configureer slave en doe dan START SLAVE",
"De server is niet geconfigureerd als slave, fix in configuratie bestand of met CHANGE MASTER TO",
"Kon master info structuur niet initialiseren, controleer permissies in master.info",
"Kon slave thread niet aanmaken, controleer systeem resources",

4
sql/share/english/errmsg.txt
View File

@ -199,8 +199,8 @@
"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',
"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",
"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",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",

4
sql/share/estonian/errmsg.txt
View File

@ -204,8 +204,8 @@
"Tabel '%-.64s' on m<>rgitud vigaseks ja viimane (automaatne?) parandus eba<62>nnestus",
"Hoiatus: m<>nesid transaktsioone mittetoetavaid tabeleid ei suudetud tagasi kerida",
"Mitme lausendiga transaktsioon n<>udis rohkem ruumi kui lubatud 'max_binlog_cache_size' muutujaga. Suurenda muutuja v<><76>rtust ja proovi uuesti",
"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",
"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",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",

4
sql/share/french/errmsg.txt
View File

@ -199,8 +199,8 @@
"La table '%-.64s' est marqu<71>e 'crashed' et le dernier 'repair' a <20>chou<6F>",
"Attention: certaines tables ne supportant pas les transactions ont <20>t<EFBFBD> chang<6E>es et elles ne pourront pas <20>tre restitu<74>es",
"Cette transaction <20> commandes multiples n<>cessite plus de 'max_binlog_cache_size' octets de stockage, augmentez cette variable de mysqld et r<>essayez',
"Cette op<6F>ration ne peut <20>tre r<>alis<69>e avec un esclave actif, faites SLAVE STOP d'abord",
"Cette op<6F>ration n<>cessite un esclave actif, configurez les esclaves et faites SLAVE START",
"Cette op<6F>ration ne peut <20>tre r<>alis<69>e avec un esclave actif, faites STOP SLAVE d'abord",
"Cette op<6F>ration n<>cessite un esclave actif, configurez les esclaves et faites START SLAVE",
"Le server n'est pas configur<75> comme un esclave, changez le fichier de configuration ou utilisez CHANGE MASTER TO",
"Impossible d'initialiser les structures d'information de ma<6D>tre, v<>rifiez les permissions sur master.info",
"Impossible de cr<63>er une t<>che esclave, v<>rifiez les ressources syst<73>me",

4
sql/share/german/errmsg.txt
View File

@ -208,8 +208,8 @@
"Tabelle '%-.64s' ist als defekt makiert und der letzte (automatische) Reparaturversuch schlug fehl.",
"Warnung: Das Rollback konnte bei einigen Tabellen, die nicht mittels Transaktionen ge<67>ndert wurden, nicht ausgef<65>hrt werden.",
"Multi-Statement Transaktionen ben<65>tigen mehr als 'max_binlog_cache_size' Bytes An Speicher. Diese mysqld-Variable vergr<67>ssern und erneut versuchen.',
"Diese Operation kann nicht bei einem aktiven Slave durchgef<65>hrt werden. Das Kommand SLAVE STOP muss zuerst ausgef<65>hrt werden.",
"Diese Operation ben<65>tigt einen aktiven Slave. Slave konfigurieren und mittels SLAVE START aktivieren.",
"Diese Operation kann nicht bei einem aktiven Slave durchgef<65>hrt werden. Das Kommand STOP SLAVE muss zuerst ausgef<65>hrt werden.",
"Diese Operation ben<65>tigt einen aktiven Slave. Slave konfigurieren und mittels START SLAVE aktivieren.",
"Der Server ist nicht als Slave konfigiriert. Im Konfigurations-File oder mittel CHANGE MASTER TO beheben.",
"Konnte Master-Info-Struktur nicht initialisieren; Berechtigungen von master.info pr<70>fen.",
"Konnte keinen Slave-Thread starten. System-Resourcen <20>berpr<70>fen.",

4
sql/share/greek/errmsg.txt
View File

@ -199,8 +199,8 @@
"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',
"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",
"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",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",

4
sql/share/hungarian/errmsg.txt
View File

@ -201,8 +201,8 @@
"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',
"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",
"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",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",

4
sql/share/italian/errmsg.txt
View File

@ -199,8 +199,8 @@
"La tabella '%-.64s' e` segnalata come corrotta e l'ultima ricostruzione (automatica?) e` fallita",
"Attenzione: Alcune delle modifiche alle tabelle non transazionali non possono essere ripristinate (roll back impossibile)",
"La transazione a comandi multipli (multi-statement) ha richiesto piu` di 'max_binlog_cache_size' bytes di disco: aumentare questa variabile di mysqld e riprovare',
"Questa operazione non puo' essere eseguita con un database 'slave' che gira, lanciare prima SLAVE STOP",
"Questa operaione richiede un database 'slave', configurarlo ed eseguire SLAVE START",
"Questa operazione non puo' essere eseguita con un database 'slave' che gira, lanciare prima STOP SLAVE",
"Questa operaione richiede un database 'slave', configurarlo ed eseguire START SLAVE",
"Il server non e' configurato come 'slave', correggere il file di configurazione cambiando CHANGE MASTER TO",
"Impossibile inizializzare la struttura 'master info', controllare i permessi sul file master.info",
"Impossibile creare il thread 'slave', controllare le risorse di sistema",

4
sql/share/japanese/errmsg.txt
View File

@ -201,8 +201,8 @@
"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',
"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",
"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",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",

4
sql/share/korean/errmsg.txt
View File

@ -199,8 +199,8 @@
"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',
"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",
"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",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",

4
sql/share/norwegian-ny/errmsg.txt
View File

@ -201,8 +201,8 @@
"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',
"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",
"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",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",

4
sql/share/norwegian/errmsg.txt
View File

@ -201,8 +201,8 @@
"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',
"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",
"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",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",

4
sql/share/polish/errmsg.txt
View File

@ -203,8 +203,8 @@
"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',
"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",
"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",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",

4
sql/share/portuguese/errmsg.txt
View File

@ -199,8 +199,8 @@
"Tabela '%-.64s' est<73> marcada como danificada e a <20>ltima repara<72><61>o (autom<6F>tica?) falhou",
"Aviso: Algumas tabelas n<>o-transacionais alteradas n<>o puderam ser reconstitu<74>das (rolled back)",
"Transa<73><61>es multi-declaradas (multi-statement transactions) requeriram mais do que o valor limite (max_binlog_cache_size) de bytes para armazenagem. Aumente o valor desta vari<72>vel do mysqld e tente novamente",
"Esta opera<72><61>o n<>o pode ser realizada com um 'slave' em execu<63><75>o. Execute SLAVE STOP primeiro",
"Esta opera<72><61>o requer um 'slave' em execu<63><75>o. Configure o 'slave' e execute SLAVE START",
"Esta opera<72><61>o n<>o pode ser realizada com um 'slave' em execu<63><75>o. Execute STOP SLAVE primeiro",
"Esta opera<72><61>o requer um 'slave' em execu<63><75>o. Configure o 'slave' e execute START SLAVE",
"O servidor n<>o est<73> configurado como 'slave'. Acerte o arquivo de configura<72><61>o ou use CHANGE MASTER TO",
"N<>o pode inicializar a estrutura de informa<6D><61>o do 'master'. Verifique as permiss<73>es em 'master.info'",
"N<>o conseguiu criar 'thread' de 'slave'. Verifique os recursos do sistema",

4
sql/share/romanian/errmsg.txt
View File

@ -203,8 +203,8 @@
"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',
"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",
"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",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",

4
sql/share/russian/errmsg.txt
View File

@ -202,8 +202,8 @@
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?) <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ROLLBACK",
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 'max_binlog_cache_size' - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD>",
"<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> slave, <20><><EFBFBD><EFBFBD> SLAVE STOP",
"<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> slave, <20><><EFBFBD><EFBFBD> SLAVE START",
"<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> slave, <20><><EFBFBD><EFBFBD> STOP SLAVE",
"<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> slave, <20><><EFBFBD><EFBFBD> START SLAVE",
"<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> slave, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CHANGE MASTER TO",
"<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> master info, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> persmissions <20><> <20><><EFBFBD><EFBFBD><EFBFBD> master.info",
"<22><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> SLAVE, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",

4
sql/share/serbian/errmsg.txt
View File

@ -205,8 +205,8 @@
"Tabela '%-.64s' je markirana kao o<>te<74>ena, a zadnja (automatska?) popravka je bila neuspela",
"Upozorenje: Neke izmenjene tabele ne podr<64>avaju komandu 'ROLLBACK'",
"Transakcija sa vi<76>e stavki zahtevala je vi<76>e od 'max_binlog_cache_size' bajtova skladi<64>nog prostora. Uve<76>ajte ovu promenljivu servera i poku<6B>ajte ponovo',
"Ova operacija ne mo<6D>e biti izvr<76>ena dok je aktivan podre<72>eni server. Zadajte prvo komandu 'SLAVE STOP' da zaustavite podre<72>eni server.",
"Ova operacija zahteva da je aktivan podre<72>eni server. Konfiguri<72>ite prvo podre<72>eni server i onda izvr<76>ite komandu 'SLAVE START'",
"Ova operacija ne mo<6D>e biti izvr<76>ena dok je aktivan podre<72>eni server. Zadajte prvo komandu 'STOP SLAVE' da zaustavite podre<72>eni server.",
"Ova operacija zahteva da je aktivan podre<72>eni server. Konfiguri<72>ite prvo podre<72>eni server i onda izvr<76>ite komandu 'START SLAVE'",
"Server nije konfigurisan kao podre<72>eni server, ispravite konfiguracioni file ili na njemu izvr<76>ite komandu 'CHANGE MASTER TO'",
"Nisam mogao da inicijalizujem informacionu strukturu glavnog servera, proverite da li imam privilegije potrebne za pristup file-u 'master.info'",
"Nisam mogao da startujem thread za podre<72>eni server, proverite sistemske resurse",

4
sql/share/slovak/errmsg.txt
View File

@ -207,8 +207,8 @@
"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',
"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",
"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",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",

4
sql/share/spanish/errmsg.txt
View File

@ -200,8 +200,8 @@
"Tabla '%-.64s' est<73> marcada como crashed y la <20>ltima reparaci<63>n (automactica?) fall<6C>",
"Aviso: Algunas tablas no transancionales no pueden tener rolled back",
"Multipla transici<63>n necesita mas que 'max_binlog_cache_size' bytes de almacenamiento. Aumente esta variable mysqld y tente de nuevo',
"Esta operaci<63>n no puede ser hecha con el esclavo funcionando, primero use SLAVE STOP",
"Esta operaci<63>n necesita el esclavo funcionando, configure esclavo y haga el SLAVE START",
"Esta operaci<63>n no puede ser hecha con el esclavo funcionando, primero use STOP SLAVE",
"Esta operaci<63>n necesita el esclavo funcionando, configure esclavo y haga el START SLAVE",
"El servidor no est<73> configurado como esclavo, edite el archivo config file o con CHANGE MASTER TO",
"No puedo inicializar la estructura info del master, verifique permisiones en el master.info",
"No puedo crear el thread esclavo, verifique recursos del sistema",

4
sql/share/swedish/errmsg.txt
View File

@ -199,8 +199,8 @@
"Tabell '%-.64s' <20>r crashad och senast (automatiska?) reparation misslyckades",
"N<>gra icke transaktionella tabeller kunde inte <20>terst<73>llas vid ROLLBACK",
"Transaktionen kr<6B>vde mera <20>n 'max_binlog_cache_size' minne. Ut<55>ka denna mysqld variabel och f<>rs<72>k p<> nytt",
"Denna operation kan inte g<>ras under replikering; G<>r SLAVE STOP f<>rst",
"Denna operation kan endast g<>ras under replikering; Konfigurera slaven och g<>r SLAVE START",
"Denna operation kan inte g<>ras under replikering; G<>r STOP SLAVE f<>rst",
"Denna operation kan endast g<>ras under replikering; Konfigurera slaven och g<>r START SLAVE",
"Servern <20>r inte konfigurerade som en replikations slav. <20>ndra konfigurationsfilen eller g<>r CHANGE MASTER TO",
"Kunde inte initializera replications-strukturerna. Kontrollera privilegerna f<>r 'master.info'",
"Kunde inte starta en tr<74>d f<>r replikering",

4
sql/share/ukrainian/errmsg.txt
View File

@ -204,8 +204,8 @@
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> ڦ<><DAA6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>Τ (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?) צ<><D7A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: <20><><EFBFBD>˦ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>æ<EFBFBD>Φ <20>ͦ<EFBFBD><CDA6> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>æ<EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ¦<><C2A6><EFBFBD><EFBFBD> Φ<> 'max_binlog_cache_size' <20><><EFBFBD>Ԧ<EFBFBD> <20><><EFBFBD> <20><><EFBFBD>Ҧ<EFBFBD><D2A6><EFBFBD><EFBFBD><EFBFBD>. <20>¦<EFBFBD><C2A6><EFBFBD><EFBFBD><EFBFBD> <20><> <20>ͦ<EFBFBD><CDA6><EFBFBD> mysqld <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>',
"<22><><EFBFBD><EFBFBD><EFBFBD>æ<EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ц<><D0A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> SLAVE STOP",
"<22><><EFBFBD><EFBFBD><EFBFBD>æ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ц<><D0A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD>Ʀ<EFBFBD><C6A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ц<><D0A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> SLAVE START",
"<22><><EFBFBD><EFBFBD><EFBFBD>æ<EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ц<><D0A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> STOP SLAVE",
"<22><><EFBFBD><EFBFBD><EFBFBD>æ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ц<><D0A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD>Ʀ<EFBFBD><C6A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ц<><D0A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> START SLAVE",
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD>Ʀ<EFBFBD><C6A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> Ц<><D0A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20> <20><><EFBFBD>̦ <20><><EFBFBD>Ʀ<EFBFBD><C6A6><EFBFBD><EFBFBD>æ<EFBFBD> <20><><EFBFBD> <20> CHANGE MASTER TO",
"<22><> <20><><EFBFBD><EFBFBD> <20>Φæ<CEA6>̦<EFBFBD><CCA6><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>æ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD>צ<EFBFBD><D7A6><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> master.info",
"<22><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ц<><D0A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ǧ<><C7A6><EFBFBD>, <20><><EFBFBD><EFBFBD>צ<EFBFBD><D7A6><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Φ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",

4
sql/sql_select.cc
View File

@ -7515,7 +7515,7 @@ static void select_describe(JOIN *join, bool need_tmp_table, bool need_order,
item_list.push_back(new Item_string(message,strlen(message),
default_charset_info));
if (result->send_data(item_list))
result->send_error(0,NullS);
join->error= 1;
}
else
{
@ -7656,7 +7656,7 @@ static void select_describe(JOIN *join, bool need_tmp_table, bool need_order,
// For next iteration
used_tables|=table->map;
if (result->send_data(item_list))
result->send_error(0,NullS);
join->error= 1;
}
}
for (SELECT_LEX_UNIT *unit= join->select_lex->first_inner_unit();

1
sql/sql_yacc.yy
View File

@ -997,6 +997,7 @@ merge_insert_types:
opt_select_from:
opt_limit_clause {}
| FROM DUAL_SYM {}
| select_from select_lock_type;
udf_func_type: