1. 14 Dec, 2006 14 commits
  2. 13 Dec, 2006 3 commits
  3. 11 Dec, 2006 14 commits
  4. 10 Dec, 2006 1 commit
  5. 08 Dec, 2006 8 commits
    • unknown's avatar
      Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/41 · fdf1a633
      unknown authored
      into  siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50
      
      
      sql/sql_class.h:
        Auto merged
      Makefile.am:
        Manual merge.
      fdf1a633
    • unknown's avatar
      Makefile.am · b8151c7e
      unknown authored
          - test* targets are identical (as much as possible) to 5.0 & 5.1 versions
          - use @PERL@ ./mysql-test-run.pl, instead of depending on /usr/bin/perl location
          - PHONY: target includes all test targets
      
      
      Makefile.am:
        - test* targets are identical (as much as possible) to 5.0 & 5.1 versions
        - use @PERL@ ./mysql-test-run.pl, instead of depending on /usr/bin/perl location
        - PHONY: target includes all test targets
      b8151c7e
    • unknown's avatar
      Merge polly.local:/tmp/maint/bug24261/my50-bug24261 · 3288ddf6
      unknown authored
      into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
      
      
      mysql-test/r/func_in.result:
        Auto merged
      mysql-test/t/func_in.test:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      3288ddf6
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 8ba0259a
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/t/kill.test:
        Auto merged
      8ba0259a
    • unknown's avatar
      Bug#19410 Test 'kill' fails on Windows + SCO · 0abeff72
      unknown authored
      
      mysql-test/t/kill.test:
        Move the connect of second connection to just before the query to be killed are sent.
        This introduces less variance since the connect time is not included in the delay
        we want between send of query and kill.
      0abeff72
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 47b8d63d
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/t/mysqladmin.test:
        Auto merged
      sql/sql_class.h:
        Auto merged
      47b8d63d
    • unknown's avatar
      Add missing space · 8fc4864e
      unknown authored
      8fc4864e
    • unknown's avatar
      Bug#19410 Test 'kill' fails on Windows + SCO · e8d82549
      unknown authored
       - Use "mysql_field_count" to determine if there is a need to
         call "mysql_store_result"
      
      
      client/mysqltest.c:
        Only call 'mysql_store_result' if 'mysql_field_count' is greater than 0
        indicating that this query has a result set.  This change is mainly since
        if mysql_store_result fails the value returned by mysql_field_count will be reset.
      e8d82549