Fixed errors found during review

mysql-test/r/drop.result

@@ -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;

mysql-test/r/kill.result

@@ -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

mysql-test/t/kill.test

@@ -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()

mysys/my_sync.c

@@ -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)

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);
 

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-Bm 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 "Neznma tabuka '%-.180s'"
-	spa "Tabla '%-.180s' desconocida"
-	swe "Oknd tabell '%-.180s'"
-	ukr "צ  '%-.180s'"
+	cze "Nezn-Bm 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 "Neznma tabuka '%-.100s'"
+	spa "Tabla '%-.100s' desconocida"
+	swe "Oknd 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"

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)
   {

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);