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

Fixed errors found during review

Browse Source
This commit is contained in:
monty@mysql.com
2005-04-06 19:43:35 +03:00
parent beb28b27e0
commit a7c6348192
8 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/drop.result
View File

@ -30,13 +30,13 @@ table7, table8, table9, table10, table11, table12, table13,
table14, table15, table16, table17, table18, table19, table20,
table21, table22, table23, table24, table25, table26, table27,
table28;
ERROR 42S02: Unknown table 'table1,table2,table3,table4,table5,table6,table7,table8,table9,table10,table11,table12,table13,table14,table15,table16,table17,table18,table19,table20,table21,table22,table23,table'
ERROR 42S02: Unknown table 'table1,table2,table3,table4,table5,table6,table7,table8,table9,table10,table11,table12,table13,table'
drop table table1, table2, table3, table4, table5, table6,
table7, table8, table9, table10, table11, table12, table13,
table14, table15, table16, table17, table18, table19, table20,
table21, table22, table23, table24, table25, table26, table27,
table28, table29, table30;
ERROR 42S02: Unknown table 'table1,table2,table3,table4,table5,table6,table7,table8,table9,table10,table11,table12,table13,table14,table15,table16,table17,table18,table19,table20,table21,table22,table23,table'
ERROR 42S02: Unknown table 'table1,table2,table3,table4,table5,table6,table7,table8,table9,table10,table11,table12,table13,table'
use test;
drop database mysqltest;
flush tables with read lock;

2
mysql-test/r/kill.result
View File

@ -6,7 +6,7 @@ select ((@id := kill_id) - kill_id) from t1;
0
kill @id;
select 1;
ERROR HY000: MySQL server has gone away
Got one of the listed errors
select ((@id := kill_id) - kill_id) from t1;
((@id := kill_id) - kill_id)
0

2
mysql-test/t/kill.test
View File

@ -27,7 +27,7 @@ connection con1;
--disable_reconnect
# this statement should fail
--error 2006
--error 2006,2013
select 1;
--enable_reconnect
# this should work, and we should have a new connection_id()

2
mysys/my_sync.c
View File

@ -65,7 +65,7 @@ int my_sync(File fd, myf my_flags)
int er= errno;
if (!(my_errno= er))
my_errno= -1; /* Unknown error */
if (my_flags & MY_IGNORE_BADFD &&
if ((my_flags & MY_IGNORE_BADFD) &&
(er == EBADF || er == EINVAL || er == EROFS))
res= 0;
else if (my_flags & MY_WME)

2
sql/records.cc
View File

@ -131,7 +131,7 @@ void init_read_record(READ_RECORD *info,THD *thd, TABLE *table,
/* Condition pushdown to storage engine */
if (thd->variables.engine_condition_pushdown &&
select && select->cond &&
select->cond->used_tables() & table->map &&
(select->cond->used_tables() & table->map) &&
!table->file->pushed_cond)
table->file->cond_push(select->cond);

48
sql/share/errmsg.txt
View File

@ -1214,30 +1214,30 @@ ER_TABLE_EXISTS_ERROR 42S01
swe "Tabellen '%-.64s' finns redan"
ukr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s' <20><><EFBFBD> <20><><EFBFBD>դ"
ER_BAD_TABLE_ERROR 42S02
cze "Nezn-B<>m<EFBFBD> tabulka '%-.180s'"
dan "Ukendt tabel '%-.180s'"
nla "Onbekende tabel '%-.180s'"
eng "Unknown table '%-.180s'"
jps "table '%-.180s' <20>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>.",
est "Tundmatu tabel '%-.180s'"
fre "Table '%-.180s' inconnue"
ger "Unbekannte Tabelle '%-.180s'"
greek "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.180s'"
hun "Ervenytelen tabla: '%-.180s'"
ita "Tabella '%-.180s' sconosciuta"
jpn "table '%-.180s' <20>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>."
kor "<22><><EFBFBD>̺<EFBFBD> '%-.180s'<27><> <20>˼<EFBFBD> <20><><EFBFBD><EFBFBD>"
nor "Ukjent tabell '%-.180s'"
norwegian-ny "Ukjent tabell '%-.180s'"
pol "Nieznana tabela '%-.180s'"
por "Tabela '%-.180s' desconhecida"
rum "Tabela '%-.180s' este invalida"
rus "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.180s'"
serbian "Nepoznata tabela '%-.180s'"
slo "Nezn<7A>ma tabu<62>ka '%-.180s'"
spa "Tabla '%-.180s' desconocida"
swe "Ok<4F>nd tabell '%-.180s'"
ukr "<22><>צ<EFBFBD><D7A6><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.180s'"
cze "Nezn-B<>m<EFBFBD> tabulka '%-.100s'"
dan "Ukendt tabel '%-.100s'"
nla "Onbekende tabel '%-.100s'"
eng "Unknown table '%-.100s'"
jps "table '%-.100s' <20>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>.",
est "Tundmatu tabel '%-.100s'"
fre "Table '%-.100s' inconnue"
ger "Unbekannte Tabelle '%-.100s'"
greek "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.100s'"
hun "Ervenytelen tabla: '%-.100s'"
ita "Tabella '%-.100s' sconosciuta"
jpn "table '%-.100s' <20>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>."
kor "<22><><EFBFBD>̺<EFBFBD> '%-.100s'<27><> <20>˼<EFBFBD> <20><><EFBFBD><EFBFBD>"
nor "Ukjent tabell '%-.100s'"
norwegian-ny "Ukjent tabell '%-.100s'"
pol "Nieznana tabela '%-.100s'"
por "Tabela '%-.100s' desconhecida"
rum "Tabela '%-.100s' este invalida"
rus "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.100s'"
serbian "Nepoznata tabela '%-.100s'"
slo "Nezn<7A>ma tabu<62>ka '%-.100s'"
spa "Tabla '%-.100s' desconocida"
swe "Ok<4F>nd tabell '%-.100s'"
ukr "<22><>צ<EFBFBD><D7A6><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.100s'"
ER_NON_UNIQ_ERROR 23000
cze "Sloupec '%-.64s' v %s nen-B<> zcela jasn<73>"
dan "Felt: '%-.64s' i tabel %s er ikke entydigt"

5
sql/sql_class.cc
View File

@ -343,8 +343,9 @@ void THD::change_user(void)
void THD::cleanup(void)
{
DBUG_ENTER("THD::cleanup");
/* TODO uncomment the line below when binlog will be able to prepare */
// if (transaction.xa_state != XA_PREPARED)
#ifdef ENABLE_WHEN_BINLOG_WILL_BE_ABLE_TO_PREPARE
if (transaction.xa_state != XA_PREPARED)
#endif
ha_rollback(this);
if (locked_tables)
{

2
sql/sql_show.cc
View File

@ -2312,7 +2312,7 @@ static int get_schema_column_record(THD *thd, struct st_table_list *tables,
}
}
#else
end=strmov(end,"");
*end= 0;
#endif
table->field[17]->store(tmp+1,end == tmp ? 0 : (uint) (end-tmp-1), cs);