1. 02 Nov, 2006 7 commits
  2. 01 Nov, 2006 3 commits
  3. 31 Oct, 2006 13 commits
  4. 30 Oct, 2006 6 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1-maint · 9711d722
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      9711d722
    • unknown's avatar
      Bug#18654 Test is timing-dependent and fails from scheduling effects (?) · c2b8a63c
      unknown authored
       - Wait in loop with small sleep until tables has been renamed
      
      
      mysql-test/t/rename.test:
        To avoid scheduling effects wait for the tables to be renamed in a loop with small sleeps
        before continuing with tests
      mysql-test/include/wait_for_query_to_suceed.inc:
        New BitKeeper file ``mysql-test/include/wait_for_query_to_suceed.inc''
      c2b8a63c
    • unknown's avatar
      Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · 2e35e448
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      mysql-test/include/mix1.inc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/mysqld.cc:
        Manual merge
      storage/myisam/sort.c:
        Manual merge
      2e35e448
    • unknown's avatar
      Improve comments around FLUSH STATUS · e948c64f
      unknown authored
      It's not possible to flush the global status variables in 5.0
      Update test case so it works by recording the value of handle_rollback
      before and compare it to the value after
      
      
      mysql-test/r/innodb_mysql.result:
        Update result file
      mysql-test/t/innodb_mysql.test:
        It's not possible to reset the global status variables in 5.0 so intead its value
        is recorded and compared to the after value.
        It should not have changed.
      sql/mysqld.cc:
        Improve comments
      sql/set_var.cc:
        Improve comments
      sql/sql_class.cc:
        Improve comments
      sql/sql_class.h:
        Improve comments
      e948c64f
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · c1b29d29
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      c1b29d29
  5. 27 Oct, 2006 5 commits
  6. 26 Oct, 2006 6 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new-maint · ab619991
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      sql/sql_select.cc:
        Auto merged
      ab619991
    • unknown's avatar
      Update for 5.1 · 931aa19a
      unknown authored
      
      include/mysql_h_abi.ic:
        Update for 5.1, don't include the info_buffer it should be an error
      931aa19a
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · b2ea3624
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/t/ctype_utf8.test:
        Auto merged
      b2ea3624
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 2215e7b1
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      include/Makefile.am:
        Manual merge
      2215e7b1
    • unknown's avatar
      Bug#23427 incompatible ABI change in 5.0.26? · fc72e762
      unknown authored
       - Improve icheck rules in Makefile.am
      
      
      include/Makefile.am:
        Remove m_ctype from BUILT_SOURCES, it has been in bk for a looong time.
        Improve the icheck rules
         - Abort make if icheck fails to compare, very important.
         - Don't include include files from /usr into the icheck file. Avoids problem when running
           icheck on different machines.
         - If no icheck is availabel, touch the mysql_h.ic file so it exists for "make dist"
      include/mysql_h_abi.ic:
        Remove all include files from /usr, no need to check that!
      fc72e762
    • unknown's avatar
      Post Merge Cleanup · b4649198
      unknown authored
      b4649198