1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Small optimization of sending big blocks.

Browse Source 
Updated Italian error messages
This commit is contained in:
monty@mashka.mysql.fi 2003-01-02 14:29:26 +02:00
parent 3ca695ea0b
commit 9b3968586b
2 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sql/net_serv.cc
View File

@ -285,6 +285,7 @@ net_write_command(NET *net,uchar command,const char *packet,ulong len)
/*
Caching the data in a local buffer before sending it.
One can force the buffer to be flushed with 'net_flush'.
*/
static int
@ -292,15 +293,24 @@ net_write_buff(NET *net,const char *packet,ulong len)
{
ulong left_length=(ulong) (net->buff_end - net->write_pos);
while (len > left_length)
if (len > left_length)
{
memcpy((char*) net->write_pos,packet,left_length);
if (net_real_write(net,(char*) net->buff,net->max_packet))
return 1;
net->write_pos=net->buff;
packet+=left_length;
len-=left_length;
left_length=net->max_packet;
len-= left_length;
left_length= net->max_packet;
/* Send out rest of the blocks as full sized blocks */
while (len > left_length)
{
if (net_real_write(net, packet, left_length))
return 1;
packet+= left_length;
len-= left_length;
}
}
memcpy((char*) net->write_pos,packet,len);
net->write_pos+=len;
@ -633,7 +643,10 @@ my_real_read(NET *net, ulong *complen)
#ifdef HAVE_COMPRESS
if (net->compress)
{
/* complen is > 0 if package is really compressed */
/*
If the packet is compressed then complen > 0 and contains the
number of bytes in the uncompressed packet
*/
*complen=uint3korr(&(net->buff[net->where_b + NET_HEADER_SIZE]));
}
#endif
@ -704,7 +717,7 @@ my_net_read(NET *net)
{
net->where_b += len;
total_length += len;
len = my_real_read (net,&complen);
len = my_real_read(net,&complen);
} while (len == MAX_THREE_BYTES);
if (len != packet_error)
len+= total_length;
@ -732,7 +745,7 @@ my_net_read(NET *net)
}
else
{
/* reuse buffer, as there is noting in it that we need */
/* reuse buffer, as there is nothing in it that we need */
buf_length=start_of_packet=first_packet_offset=0;
}
for (;;)

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

@ -219,22 +219,22 @@
"Impossibile aggiungere il vincolo di integrita' referenziale (foreign key constraint)",
"Impossibile aggiungere la riga: un vincolo d'integrita' referenziale non e' soddisfatto",
"Impossibile cancellare la riga: un vincolo d'integrita' referenziale non e' soddisfatto",
"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)",
"Access denied. You need the %-.128s privilege for this operation",
"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL",
"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL",
"Variable '%-.64s' doesn't have a default value",
"Variable '%-.64s' can't be set to the value of '%-.64s'",
"Wrong argument type to variable '%-.64s'",
"Variable '%-.64s' can only be set, not read",
"Wrong usage/placement of '%s'",
"This version of MySQL doesn't yet support '%s'",
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
"Errore durante la connessione al master: %-.128s",
"Errore eseguendo una query sul master: %-.128s",
"Errore durante l'esecuzione del comando %s: %-.128s",
"Uso errato di %s e %s",
"La SELECT utilizzata ha un numero di colonne differente",
"Impossibile eseguire la query perche' c'e' un conflitto con in lock di lettura",
"E' disabilitata la possibilita' di mischiare tabelle transazionali e non-transazionali",
"L'opzione '%s' e' stata usata due volte nel comando",
"L'utente '%-.64s' ha ecceduto la risorsa '%s' (valore corrente: %ld)",
"Accesso non consentito. Serve il privilegio %-.128s per questa operazione",
"La variabile '%-.64s' e' una variabile locale ( LOCAL ) e non puo' essere cambiata usando SET GLOBAL",
"La variabile '%-.64s' e' una variabile globale ( GLOBAL ) e deve essere cambiata usando SET GLOBAL",
"La variabile '%-.64s' non ha un valore di default",
"Alla variabile '%-.64s' non puo' essere assegato il valore '%-.64s'",
"Tipo di valore errato per la variabile '%-.64s'",
"Alla variabile '%-.64s' e' di sola scrittura quindi puo' essere solo assegnato un valore, non letto",
"Uso/posizione di '%s' sbagliato",
"Questa versione di MySQL non supporta ancora '%s'",
"Errore fatale %d: '%-.128s' dal master leggendo i dati dal log binario",