An error occurred fetching the project authors.
  1. 07 Aug, 2005 5 commits
    • unknown's avatar
      Manual merge · a658f8b2
      unknown authored
      BitKeeper/deleted/.del-not_windows.inc:
        Delete: mysql-test/include/not_windows.inc
      mysql-test/r/fulltext_order_by.result:
        Auto merged
      mysql-test/r/type_datetime.result:
        Auto merged
      mysql-test/t/fulltext_order_by.test:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysql-test/t/rpl_flush_tables.test:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      a658f8b2
    • unknown's avatar
      BUG#11869:part 2: post-review fixes: merging into 5.0 · 8b6185c3
      unknown authored
      We're out of bits in st_select_lex->options so make TMP_TABLE_FORCE_MYISAM ==
      OPTION_FOUND_COMMENT (the latter is not used by create_tmp_table).
      
      
      mysql-test/r/create.result:
        Updated the test result
      mysql-test/r/fulltext_order_by.result:
        Drop all tables this test uses
      mysql-test/t/fulltext_order_by.test:
        Drop all tables this test uses
      8b6185c3
    • unknown's avatar
      BUG#11869: part2: post-review fixes: · 6327a667
      unknown authored
      In init_prepare_fake_select_lex() don't empty ftfunc_list. UNION's ORDER BY clause may 
      contain MATCH(...), for which fix_index() should be called.
      
      
      mysql-test/r/fulltext_order_by.result:
        BUG#11869 part2 : added another test case
      mysql-test/t/fulltext_order_by.test:
        BUG#11869 part2 : added another test case
      6327a667
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · b13c44aa
      unknown authored
      into mysql.com:/home/psergey/mysql-4.1-bug11869-part2
      
      b13c44aa
    • unknown's avatar
      Manual merge · f9f3a0eb
      unknown authored
      mysql-test/t/fulltext_order_by.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      f9f3a0eb
  2. 06 Aug, 2005 1 commit
    • unknown's avatar
      BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error): · 432ea422
      unknown authored
      When creating temporary table for UNION, pass TMP_TABLE_FORCE_MYISAM flag to 
      create_tmp_table if we will be using fulltext function(s) when reading from the 
      temp. table.
      
      
      mysql-test/r/fulltext_order_by.result:
        Testcase for BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error)
      mysql-test/t/fulltext_order_by.test:
        Testcase for BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error)
      sql/mysql_priv.h:
        BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error):
        Added TMP_TABLE_FORCE_MYISAM flag
      sql/sql_select.cc:
        BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error):
        In create_tmp_table(), honor the TMP_TABLE_FORCE_MYISAM flag
      432ea422
  3. 04 Aug, 2005 34 commits