• unknown's avatar
    Cleanups after merge from 4.1. · ccc3052d
    unknown authored
    
    mysql-test/r/ps_1general.result:
      Update results
    mysql-test/r/ps_2myisam.result:
      Update results
    mysql-test/r/ps_3innodb.result:
      Update results
    mysql-test/r/ps_4heap.result:
      Update results
    mysql-test/r/ps_5merge.result:
      Update results
    mysql-test/r/ps_6bdb.result:
      Update results
    mysql-test/r/ps_7ndb.result:
      Update results
    mysql-test/r/select.result:
      Update results
    mysql-test/t/disabled.def:
      Disable ndb_condition_pushdown test
    mysql-test/t/select.test:
      Fix bad merge
    sql/field_conv.cc:
      Update name of warning message
    sql/mysqld.cc:
      Set proper thd->killed
    tests/mysql_client_test.c:
      Update test cases, change verify_prepared_field() help function
      so it is passed the filename and line from where it is called
      and includes that in the error message.
    ccc3052d
ps_5merge.result 201 KB