• unknown's avatar
    Merge mysql.com:/home/timka/mysql/src/5.0-virgin · 2b53b711
    unknown authored
    into  mysql.com:/home/timka/mysql/src/5.0-2486-merge
    
    
    mysql-test/r/errors.result:
      Auto merged
    mysql-test/r/fulltext.result:
      Auto merged
    mysql-test/r/fulltext_order_by.result:
      Auto merged
    mysql-test/r/innodb.result:
      Auto merged
    mysql-test/r/join_nested.result:
      Auto merged
    mysql-test/r/subselect.result:
      Auto merged
    mysql-test/t/errors.test:
      Auto merged
    mysql-test/t/fulltext.test:
      Auto merged
    mysql-test/t/fulltext_order_by.test:
      Auto merged
    mysql-test/t/innodb.test:
      Auto merged
    mysql-test/t/join_nested.test:
      Auto merged
    mysql-test/t/subselect.test:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/sp.cc:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_delete.cc:
      Auto merged
    sql/sql_lex.cc:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    sql/sql_update.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    sql/table.h:
      Auto merged
    tests/mysql_client_test.c:
      Auto merged
    sql/sql_insert.cc:
      merge WL#2486
    sql/sql_show.cc:
      merge WL#2486
    2b53b711
fulltext_order_by.test 5.24 KB