• unknown's avatar
    Merge mysql.com:/home/hf/work/mysql-5.0-mrg · 45989298
    unknown authored
    into  mysql.com:/home/hf/work/mysql-5.1-mrg
    
    
    Makefile.am:
      Auto merged
    client/mysqltest.c:
      Auto merged
    include/mysql.h:
      Auto merged
    BitKeeper/deleted/.del-bdb-deadlock.test:
      Auto merged
    libmysql/libmysql.c:
      Auto merged
    libmysqld/lib_sql.cc:
      Auto merged
    mysql-test/r/order_by.result:
      Auto merged
    mysql-test/r/subselect.result:
      Auto merged
    mysql-test/t/lock_multi.test:
      Auto merged
    mysql-test/t/rename.test:
      Auto merged
    mysql-test/t/show_check.test:
      Auto merged
    mysql-test/t/status.test:
      Auto merged
    mysql-test/t/subselect.test:
      Auto merged
    sql/item_subselect.cc:
      Auto merged
    sql/item_subselect.h:
      Auto merged
    sql/protocol.cc:
      Auto merged
    sql-common/client.c:
      Auto merged
    sql/protocol.h:
      Auto merged
    sql/sql_class.h:
      Auto merged
    mysql-test/include/deadlock.inc:
      SCCS merged
    mysql-test/t/disabled.def:
      merging
    sql/item.cc:
      merging
    45989298
order_by.result 28.7 KB