Commit 7503894a authored by unknown's avatar unknown
Browse files

Fixed errors found during review 


mysql-test/r/drop.result:
  Made error message smaller to not get into trouble with clients with smaller error buffers
  The proper way to fix this is to generate a separate warning for each not found table if there was more than one table in the DROP
  but
mysql-test/r/kill.result:
  Portablity fix
mysql-test/t/kill.test:
  Portablity fix
mysys/my_sync.c:
  Fixed possible compiler warning
sql/records.cc:
  Fixed possible compiler warning
sql/share/errmsg.txt:
  Made error message smaller to not get into trouble with clients with smaller error buffers
sql/sql_class.cc:
  Don't put code in comments
sql/sql_show.cc:
  Cleanup
parent d958b636

mysql-test/r/drop.result

+2 −2
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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);