diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/records.cc | 2 | ||||
| -rw-r--r-- | sql/share/errmsg.txt | 48 | ||||
| -rw-r--r-- | sql/sql_class.cc | 5 | ||||
| -rw-r--r-- | sql/sql_show.cc | 2 |
4 files changed, 29 insertions, 28 deletions
diff --git a/sql/records.cc b/sql/records.cc index cfb7cb3d065..b71bcf70865 100644 --- a/sql/records.cc +++ b/sql/records.cc @@ -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); diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 9a92f1f4f76..46c8fcc7863 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -1214,30 +1214,30 @@ ER_TABLE_EXISTS_ERROR 42S01 swe "Tabellen '%-.64s' finns redan" ukr "ôÁÂÌÉÃÑ '%-.64s' ×ÖÅ ¦ÓÎÕ¤" ER_BAD_TABLE_ERROR 42S02 - cze "Nezn-Bámá tabulka '%-.180s'" - dan "Ukendt tabel '%-.180s'" - nla "Onbekende tabel '%-.180s'" - eng "Unknown table '%-.180s'" - jps "table '%-.180s' ‚Í‚ ‚è‚Ü‚¹‚ñ.", - est "Tundmatu tabel '%-.180s'" - fre "Table '%-.180s' inconnue" - ger "Unbekannte Tabelle '%-.180s'" - greek "Áãíùóôïò ðßíáêáò '%-.180s'" - hun "Ervenytelen tabla: '%-.180s'" - ita "Tabella '%-.180s' sconosciuta" - jpn "table '%-.180s' ¤Ï¤¢¤ê¤Þ¤»¤ó." - kor "Å×À̺í '%-.180s'´Â ¾Ë¼ö ¾øÀ½" - nor "Ukjent tabell '%-.180s'" - norwegian-ny "Ukjent tabell '%-.180s'" - pol "Nieznana tabela '%-.180s'" - por "Tabela '%-.180s' desconhecida" - rum "Tabela '%-.180s' este invalida" - rus "îÅÉÚ×ÅÓÔÎÁÑ ÔÁÂÌÉÃÁ '%-.180s'" - serbian "Nepoznata tabela '%-.180s'" - slo "Neznáma tabuµka '%-.180s'" - spa "Tabla '%-.180s' desconocida" - swe "Okänd tabell '%-.180s'" - ukr "îÅצÄÏÍÁ ÔÁÂÌÉÃÑ '%-.180s'" + cze "Nezn-Bámá tabulka '%-.100s'" + dan "Ukendt tabel '%-.100s'" + nla "Onbekende tabel '%-.100s'" + eng "Unknown table '%-.100s'" + jps "table '%-.100s' ‚Í‚ ‚è‚Ü‚¹‚ñ.", + est "Tundmatu tabel '%-.100s'" + fre "Table '%-.100s' inconnue" + ger "Unbekannte Tabelle '%-.100s'" + greek "Áãíùóôïò ðßíáêáò '%-.100s'" + hun "Ervenytelen tabla: '%-.100s'" + ita "Tabella '%-.100s' sconosciuta" + jpn "table '%-.100s' ¤Ï¤¢¤ê¤Þ¤»¤ó." + kor "Å×À̺í '%-.100s'´Â ¾Ë¼ö ¾øÀ½" + nor "Ukjent tabell '%-.100s'" + norwegian-ny "Ukjent tabell '%-.100s'" + pol "Nieznana tabela '%-.100s'" + por "Tabela '%-.100s' desconhecida" + rum "Tabela '%-.100s' este invalida" + rus "îÅÉÚ×ÅÓÔÎÁÑ ÔÁÂÌÉÃÁ '%-.100s'" + serbian "Nepoznata tabela '%-.100s'" + slo "Neznáma tabuµka '%-.100s'" + spa "Tabla '%-.100s' desconocida" + swe "Okänd tabell '%-.100s'" + ukr "îÅצÄÏÍÁ ÔÁÂÌÉÃÑ '%-.100s'" ER_NON_UNIQ_ERROR 23000 cze "Sloupec '%-.64s' v %s nen-Bí zcela jasný" dan "Felt: '%-.64s' i tabel %s er ikke entydigt" diff --git a/sql/sql_class.cc b/sql/sql_class.cc index cdda013d23a..c68dc826147 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -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) { diff --git a/sql/sql_show.cc b/sql/sql_show.cc index d2cab6bf49f..8b906f133ba 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -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); |