1. 08 Sep, 2006 1 commit
    • unknown's avatar
      This is another patch for test suite to make IM tests work smoothly. · e701346d
      unknown authored
      The patch affects only test suite and has the following changes:
      
      1. On starting Instance Manager -- added code for waiting for guarded
      mysqld instances to create PID files;
      2. Polishing;
      3. Move IM-related operations out of mtr_process.pl into new dedicated
      for IM file -- mtr_im.pl
      
      
      mysql-test/mysql-test-run.pl:
        1. Require new file with IM-related operations;
        2. Added timeout to wait for PID files of guarded instances;
        3. Polishing.
      mysql-test/lib/mtr_process.pl:
        Move IM-related operations to new file.
      mysql-test/lib/mtr_im.pl:
        File for IM-related operations.
      e701346d
  2. 06 Sep, 2006 2 commits
  3. 05 Sep, 2006 1 commit
  4. 04 Sep, 2006 11 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 6f843c13
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      sql/log.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      6f843c13
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 14bebaa2
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      sql/log.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_repl.cc:
        merge
      14bebaa2
    • unknown's avatar
      bug#21965 - replication · d2d605e4
      unknown authored
        fix deadlock if master switches log file in parallell with "show master logs"
        
      
      
      sql/log.cc:
        add raw_get_current_log which dont take log mutex
      sql/sql_class.h:
        add raw_get_current_log which dont take log mutex
      sql/sql_repl.cc:
        Fix lock order i.e first log_lock then index_lock
      d2d605e4
    • unknown's avatar
      Merge dl145s:/data/tkatchaounov/5.0-bug-21787 · eb0cc3bf
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      sql/sql_select.cc:
        Auto merged
      eb0cc3bf
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 4cd43a1a
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      4cd43a1a
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-opt · 259689f8
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      259689f8
    • unknown's avatar
      Fix problem where mysql-test-run.pl fails to start up the mysqld after a... · 3dd1ef7b
      unknown authored
      Fix problem where mysql-test-run.pl fails to start up the mysqld after a failed test. Shows up on win hosts where one failed test case make subsequent ones fails with error "Could not open connection 'default': 2003 Can't connect to MySQL server on 'localhost'" 
      
      
      mysql-test/lib/mtr_process.pl:
        Reset the associated "pid" of masters and slave when building the list of processes to shutdown.
      3dd1ef7b
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-cmake · b4401f8a
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      b4401f8a
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 2ed26cd7
      unknown authored
      into  maint1.mysql.com:/data/localhome/tnurnberg/my50-21913
      
      
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      2ed26cd7
    • unknown's avatar
      Merge salvation.intern.azundris.com:/home/tnurnberg/21913/my41-21913 · 8ce43f8d
      unknown authored
      into  salvation.intern.azundris.com:/home/tnurnberg/21913/my50-21913
      
      21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
      
      Variable character_set_results can legally be NULL (for "no conversion.")
      This could result in a NULL deref that crashed the server.  Fixed.
      
      (Although ran some additional precursory tests to see whether I could break
      anything else, but no breakage so far.)
      
      
      mysql-test/r/func_time.result:
        Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
        
        Prove DATE_FORMAT() no longer crashes the server when character_set_results is
        NULL (which is a legal value and means, "no conversion").
      mysql-test/t/func_time.test:
        Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
        
        Prove DATE_FORMAT() no longer crashes the server when character_set_results is
        NULL (which is a legal value and means, "no conversion").
      sql/sql_string.cc:
        Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
        
        Avoid NULL deref in my_charset_same() -- if !to_cs, we won't need to compare
        because it is magic for, "no conversion."
      8ce43f8d
    • unknown's avatar
      Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver. · 61718995
      unknown authored
      Variable character_set_results can legally be NULL (for "no conversion.")
      This could result in a NULL deref that crashed the server.  Fixed.
      
      (Although ran some additional precursory tests to see whether I could break
      anything else, but no breakage so far.)
      
      
      mysql-test/r/func_time.result:
        Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
        
        Prove DATE_FORMAT() no longer crashes the server when character_set_results is
        NULL (which is a legal value and means, "no conversion").
      mysql-test/t/func_time.test:
        Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
        
        Prove DATE_FORMAT() no longer crashes the server when character_set_results is
        NULL (which is a legal value and means, "no conversion").
      sql/sql_string.cc:
        Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
        
        Avoid NULL deref in my_charset_same() -- if !to_cs, we won't need to compare
        because it is magic for, "no conversion."
      61718995
  5. 03 Sep, 2006 1 commit
  6. 02 Sep, 2006 5 commits
  7. 01 Sep, 2006 19 commits