1. 29 Dec, 2006 1 commit
  2. 23 Dec, 2006 1 commit
  3. 22 Dec, 2006 31 commits
  4. 21 Dec, 2006 7 commits
    • unknown's avatar
      Merge neptunus:mysql/mysql-4.1-maint · 2218cbb0
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
      
      
      2218cbb0
    • unknown's avatar
      Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · 1acf0e78
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      include/mysql_h.ic:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      mysql-test/t/rpl_rotate_logs.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      vio/viossl.c:
        Auto merged
      1acf0e78
    • unknown's avatar
      Bug #23125 [patch] trigger test fails when run as root · b461c41c
      unknown authored
       - Skip tests using chmod when running as root
      
      
      mysql-test/t/information_schema_chmod.test:
        Use mysqltest builtin "chmode"
      mysql-test/t/mysqltest.test:
        Dont run as root - test chmod
      mysql-test/t/rpl_rotate_logs.test:
        Use mysqltest builtin "chmode"
        Use 'write_file' and 'chmod' instead of system
      mysql-test/t/trigger.test:
        Don't run as root
        Use 'write_file' and 'chmod'
      mysql-test/t/varbinary.test:
        Don't run as root
      b461c41c
    • unknown's avatar
      Bug#24148 regression tests hang with SSL enabled · fd988f5b
      unknown authored
       - Don't call SSL_shutdown a second time
      
      
      vio/viossl.c:
        SSL_shutdown might return 0 indicating that it should be called once
        again for a graceful shutdown. Since the socket are going to be closed
        anyway ther is no need for the second call.
      fd988f5b
    • unknown's avatar
      configure.in : Update of the NDB version number was missing, do it. · 377cfb8b
      unknown authored
      
      configure.in:
        Fix an omission: Version number for NDB is still kept separate (up to 5.0)
        and must be changed in sync with the general version number in AM_INIT_AUTOMAKE.
      377cfb8b
    • unknown's avatar
      Merge trift2.:/MySQL/M50/clone-5.0 · b95a0676
      unknown authored
      into  trift2.:/MySQL/M51/tmp-5.1
      
      
      client/mysql_upgrade.c:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      mysql-test/t/query_cache_notembedded.test:
        Auto merged
      mysql-test/t/rpl_rotate_logs.test:
        Auto merged
      mysql-test/t/rpl000017.test:
        Null merge: Socket name change of 5.0 does not apply here.
      mysql-test/t/rpl_000015.test:
        SCCS merged
      b95a0676
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 9498307c
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      configure.in:
        Null-merge: The new 5.0 version does not affect 5.1 at all
      9498307c