Add back changes lost in merge

# test the branch of the code that deals with the query buffer overflow

--disable_query_log

let $1=1000;

let $1=50;

while ($1)

{

  eval create table mysqltest1.t$1(n int);

  eval create table mysqltest1.mysqltest_long_table_name$1 (n int);

  dec $1;

}

--enable_query_log