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

Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql

Browse Source 
Docs/manual.texi:
  Auto merged
This commit is contained in:
unknown 2001-06-28 15:24:53 +03:00
commit 1a5643b4b1
5 changed files with 1252 additions and 1210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2423
Docs/manual.texi
View File

File diff suppressed because it is too large Load Diff

7
myisam/myisamchk.c
View File

@ -201,7 +201,7 @@ static struct option long_options[] =
static void print_version(void) static void print_version(void)
{ {
printf("%s Ver 1.46 for %s at %s\n",my_progname,SYSTEM_TYPE, printf("%s Ver 1.47 for %s at %s\n",my_progname,SYSTEM_TYPE,
MACHINE_TYPE); MACHINE_TYPE);
} }
@ -234,7 +234,8 @@ static void usage(void)
-F, --fast Check only tables that hasn't been closed properly\n\ -F, --fast Check only tables that hasn't been closed properly\n\
-C, --check-only-changed\n\ -C, --check-only-changed\n\
Check only tables that has changed since last check\n\ Check only tables that has changed since last check\n\
-f, --force Restart with -r if there are any errors in the table\n\ -f, --force Restart with -r if there are any errors in the table.\n\
States will be updated as with --update-state\n\
-i, --information Print statistics information about table that is checked\n\ -i, --information Print statistics information about table that is checked\n\
-m, --medium-check Faster than extended-check, but only finds 99.99% of\n\ -m, --medium-check Faster than extended-check, but only finds 99.99% of\n\
all errors. Should be good enough for most cases\n\ all errors. Should be good enough for most cases\n\
@ -359,7 +360,7 @@ static void get_options(register int *argc,register char ***argv)
break; break;
case 'f': case 'f':
check_param.tmpfile_createflag= O_RDWR | O_TRUNC; check_param.tmpfile_createflag= O_RDWR | O_TRUNC;
check_param.testflag|=T_FORCE_CREATE; check_param.testflag|= T_FORCE_CREATE | T_UPDATE_STATE;
break; break;
case 'F': case 'F':
check_param.testflag|=T_FAST; check_param.testflag|=T_FAST;

3
mysql-test/t/type_float.test
View File

@ -3,7 +3,8 @@
# Numeric floating point. # Numeric floating point.
SELECT 10,10.0,10.,.1e+2,100.0e-1; SELECT 10,10.0,10.,.1e+2,100.0e-1;
select 6e-05, -6e-05, --6e-05, -6e-05+1.000000; SELECT 6e-05, -6e-05, --6e-05, -6e-05+1.000000;
SELECT 1e1,1.e1,1.0e1,1e+1,1.e+1,1.0e+1,1e-1,1.e-1,1.0e-1;
drop table if exists t1; drop table if exists t1;
create table t1 (f1 float(24),f2 float(52)); create table t1 (f1 float(24),f2 float(52));

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

@ -199,15 +199,15 @@
"La tabella '%-.64s' e` segnalata come corrotta e l'ultima ricostruzione (automatica?) e` fallita", "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)", "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', "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',
"This operation cannot be performed with a running slave, run SLAVE STOP first", "Questa operazione non puo' essere eseguita con un database 'slave' che gira, lanciare prima SLAVE STOP",
"This operation requires a running slave, configure slave and do SLAVE START", "Questa operaione richiede un database 'slave', configurarlo ed eseguire SLAVE START",
"The server is not configured as slave, fix in config file or with CHANGE MASTER TO", "Il server non e' configurato come 'slave', correggere il file di configurazione cambiando CHANGE MASTER TO",
"Could not initialize master info structure, check permisions on master.info", "Impossibile inizializzare la struttura 'master info', controllare i permessi sul file master.info",
"Could not create slave thread, check system resources", "Impossibile creare il thread 'slave', controllare le risorse di sistema",
"User %-.64s has already more than 'max_user_connections' active connections", "L'utente %-.64s ha gia' piu' di 'max_user_connections' connessioni attive",
"You may only use constant expressions with SET", "Si possono usare solo espressioni costanti con SET",
"Lock wait timeout exceeded", "E' scaduto il timeout per l'attesa del lock",
"The total number of locks exceeds the lock table size", "Il numero totale di lock e' maggiore della grandezza della tabella di lock",
"Update locks cannot be acquired during a READ UNCOMMITTED transaction", "I lock di aggiornamento non possono essere acquisiti durante una transazione 'READ UNCOMMITTED'",
"DROP DATABASE not allowed while thread is holding global read lock", "DROP DATABASE not allowed while thread is holding global read lock",
"CREATE DATABASE not allowed while thread is holding global read lock", "CREATE DATABASE not allowed while thread is holding global read lock",

9
sql/sql_lex.cc
View File

@ -650,12 +650,9 @@ int yylex(void *arg)
if (c == 'e' || c == 'E') if (c == 'e' || c == 'E')
{ {
c = yyGet(); c = yyGet();
if (c != '-' && c != '+' && !isdigit(c)) if (c == '-' || c == '+')
{ // No exp sig found c = yyGet(); // Skipp sign
state= STATE_CHAR; if (!isdigit(c))
break;
}
if (!isdigit(yyGet()))
{ // No digit after sign { // No digit after sign
state= STATE_CHAR; state= STATE_CHAR;
break; break;