1. 24 Jan, 2005 2 commits
  2. 23 Jan, 2005 3 commits
  3. 22 Jan, 2005 5 commits
    • unknown's avatar
      Manual merge · 3ddbe4ae
      unknown authored
      
      mysql-test/r/select_found.result:
        Auto merged
      3ddbe4ae
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0 · 2ee6296f
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      
      mysql-test/r/select_found.result:
        Auto merged
      mysql-test/t/select_found.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      2ee6296f
    • unknown's avatar
      select_found.result, select_found.test: · 2afeecfc
      unknown authored
        Added a test case for bug #7945.
      sql_select.cc:
        Fixed bug #7945. If DISTINCT is used only with constants
        in a query with GROUP BY, we can apply an optimization
        that set LIMIT to 1 only in the case when there is 
        no SQL_CALC_FOUND_ROWS.
      
      
      sql/sql_select.cc:
        Fixed bug #7945. If DISTINCT is used only with constants
        in a query with GROUP BY, we can apply an optimization
        that set LIMIT to 1 only in the case when there is 
        no SQL_CALC_FOUND_ROWS.
      mysql-test/t/select_found.test:
        Added a test case for bug #7945.
      mysql-test/r/select_found.result:
        Added a test case for bug #7945.
      2afeecfc
    • unknown's avatar
      Merge hundin.mysql.fi:/home/heikki/mysql-4.1 · 882da5b3
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-5.0
      
      
      innobase/fil/fil0fil.c:
        Auto merged
      882da5b3
    • unknown's avatar
      fil0fil.c: · 9a68e748
      unknown authored
        Fix a race condition that could cause the assertion space->n_pending_flushes == 0 to fail in fil0fil.c, in fil_space_free(), in DROP TABLE or in ALTER TABLE
      
      
      innobase/fil/fil0fil.c:
        Fix a race condition that could cause the assertion space->n_pending_flushes == 0 to fail in fil0fil.c, in fil_space_free()
      9a68e748
  4. 21 Jan, 2005 30 commits