1. 06 Oct, 2007 1 commit
  2. 05 Oct, 2007 2 commits
    • unknown's avatar
      Merge sin.intern.azundris.com:/home/tnurnberg/31253/50-31253 · c26e31bb
      unknown authored
      into  sin.intern.azundris.com:/home/tnurnberg/31253/51-31253
      
      
      sql/item.cc:
        Auto merged
      mysql-test/r/type_datetime.result:
        SCCS merged
      mysql-test/t/type_datetime.test:
        SCCS merged
      c26e31bb
    • unknown's avatar
      Bug #31253: crash comparing datetime to double · ea3a3aa8
      unknown authored
      convert(<invalid time>, datetime) in WHERE caused crash as function
      returned (void*)NULL, but did not flag SQL NULL. It does now.
      
      
      mysql-test/r/type_datetime.result:
        show that convert() to datetime in a WHERE-clause will no longer crash
        the server on invalid input.
      mysql-test/t/type_datetime.test:
        show that convert() to datetime in a WHERE-clause will no longer crash
        the server on invalid input.
      sql/item.cc:
        When failing to process time values, do not just return (void*)NULL,
        but flag SQL NULL as well so no caller will try to process the 0x0L.
        This makes behaviour for Item::Item::val_decimal_from_date() and
        Item::Item::val_decimal_from_time() identical.
      ea3a3aa8
  3. 28 Sep, 2007 3 commits
  4. 27 Sep, 2007 2 commits
  5. 26 Sep, 2007 2 commits
  6. 25 Sep, 2007 3 commits
  7. 24 Sep, 2007 7 commits
    • unknown's avatar
      Merge sita.local:/Users/tsmith/m/bk/maint/50 · 8e7decbf
      unknown authored
      into  sita.local:/Users/tsmith/m/bk/maint/51
      
      
      mysql-test/include/windows.inc:
        SCCS merged
      8e7decbf
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · cef45d82
      unknown authored
      into  sita.local:/Users/tsmith/m/bk/maint/50
      
      cef45d82
    • unknown's avatar
      Add test for named pipes on windows · 43a4facc
      unknown authored
      Improve test for  shm on windows
      
      
      mysql-test/include/windows.inc:
        improve "skip message" and don't require a result file
      mysql-test/r/shm.result:
        Update result after adding more tests
      mysql-test/t/shm-master.opt:
        Add $MTR_BUILD_THREAD to get a unique shared memory base name
      mysql-test/t/shm.test:
        Run a bunch of more test to check shm
      mysql-test/r/named_pipe.result:
        New BitKeeper file ``mysql-test/r/named_pipe.result''
      mysql-test/t/named_pipe-master.opt:
        New BitKeeper file ``mysql-test/t/named_pipe-master.opt''
      mysql-test/t/named_pipe.test:
        New BitKeeper file ``mysql-test/t/named_pipe.test''
      43a4facc
    • unknown's avatar
      Merge production.mysql.com:/usersnfs/jperkin/bk/build-5.0 · 281e6d03
      unknown authored
      into  production.mysql.com:/usersnfs/jperkin/bk/build-5.1
      
      
      BitKeeper/deleted/.del-CMakeLists.txt~dd682cce1d53c0b4:
        Auto merged
      281e6d03
    • unknown's avatar
      Merge sita.local:/Users/tsmith/m/bk/maint/50 · 2b663b4c
      unknown authored
      into  sita.local:/Users/tsmith/m/bk/maint/51
      
      
      client/mysql.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      2b663b4c
    • unknown's avatar
      Merge sita.local:/Users/tsmith/m/bk/51 · 9f27ede2
      unknown authored
      into  sita.local:/Users/tsmith/m/bk/maint/51
      
      
      client/mysql.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      9f27ede2
    • unknown's avatar
      Merge sita.local:/Users/tsmith/m/bk/50 · 9f5f0a49
      unknown authored
      into  sita.local:/Users/tsmith/m/bk/maint/50
      
      
      client/mysql.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      9f5f0a49
  8. 22 Sep, 2007 6 commits
    • unknown's avatar
      Revert previous attempt to fix bug#27693, the files removed from the · 21f2b3cd
      unknown authored
      cmake list are auto-generated and thus still required.  Correct fix
      not yet known.
      
      
      bdb/CMakeLists.txt:
        Revert previous change, it is incorrect as those files are automatically
        generated.
      21f2b3cd
    • unknown's avatar
      Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · 1a6ab3e9
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/my51-bug30843
      
      
      mysql-test/r/archive.result:
        Merge 5.0->5.1
      mysql-test/t/archive.test:
        Merge 5.0->5.1
      1a6ab3e9
    • unknown's avatar
      Bug#30843 Bad Test addition to t/archive.test · 8bf0dc20
      unknown authored
      
      mysql-test/r/archive.result:
        Don't care about the "after insert delayed" record when since
        we can't guarantee the order it's been inserted
      mysql-test/t/archive.test:
        Don't care about the "after insert delayed" record when since
        we can't guarantee the order it's been inserted
      8bf0dc20
    • unknown's avatar
      Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · de2bcae5
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/my51-bug30843
      
      
      BitKeeper/deleted/.del-configure.js:
        Auto merged
      client/mysql.cc:
        Auto merged
      client/mysql_upgrade.c:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      configure.in:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/udf.result:
        Auto merged
      mysql-test/t/udf.test:
        Auto merged
      scripts/Makefile.am:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/udf_example.def:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      sql/udf_example.c:
        Merge 5.0->5.1
      de2bcae5
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-maint · 42d117e7
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/my51-bug30843
      
      42d117e7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 7884652d
      unknown authored
      into  alf.(none):/src/bug15327/my50-bug15327
      
      
      win/configure.js:
        Auto merged
      7884652d
  9. 21 Sep, 2007 11 commits
    • unknown's avatar
      Bug #15327: configure: --with-tcp-port option being partially ignored · 59d85c74
      unknown authored
          
      make sure that if builder configured with a non-standard (!= 3306)
      default TCP port that value actually gets used throughout.
      
      
      win/configure.js:
        Bug #15327: configure: --with-tcp-port option being partially ignored
                
        If MYSQL_TCP_PORT defaulted in configure (factory default 3306
        at the time of this writing), set MYSQL_TCP_PORT to factory
        default, then clear factory default after. That way, we lose no
        information, and we can distinguish between "defaulted" and the
        pathological case "builder specifically configured a port that
        coincides with factory default." This can in theory happen if
        builder configures and builds several servers from a script
        (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326).
        Not all that probable, but much preferable to having more "magic"
        happen in the server when we can solve this without any guesswork.
      59d85c74
    • unknown's avatar
      - Increase default connect_timeout to avoid intermittent · b2f27486
      unknown authored
      disconnects when test servers are put under load
      
      b2f27486
    • unknown's avatar
      Merge alf.(none):/src/bug15327/my50-bug15327 · 463bce81
      unknown authored
      into  alf.(none):/src/bug15327/my51-bug15327
      
      
      BitKeeper/deleted/.del-configure.js:
        Auto merged
      463bce81
    • unknown's avatar
      Bug #15327: configure: --with-tcp-port option being partially ignored · 0896ee9f
      unknown authored
        
      make sure that if builder configured with a non-standard (!= 3306)
      default TCP port that value actually gets used throughout.
      
      
      win/configure.js:
        Bug #15327: configure: --with-tcp-port option being partially ignored
            
        If MYSQL_TCP_PORT defaulted in configure (factory default 3306
        at the time of this writing), set MYSQL_TCP_PORT to factory
        default, then clear factory default after. That way, we lose no
        information, and we can distinguish between "defaulted" and the
        pathological case "builder specifically configured a port that
        coincides with factory default." This can in theory happen if
        builder configures and builds several servers from a script
        (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326).
        Not all that probable, but much preferable to having more "magic"
        happen in the server when we can solve this without any guesswork.
      0896ee9f
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-maint · d30a9e20
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/my51-bug30843
      
      d30a9e20
    • unknown's avatar
      Bug#28359 Intermitted lost connection at 'reading authorization packet' errors · c6d4de10
      unknown authored
       - Increase default 'connect_timeout' value to 10 seconds
      
      
      sql/mysql_priv.h:
        Increase the default connect_timeout value to 10 seconds
      c6d4de10
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 8feb2474
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      8feb2474
    • unknown's avatar
      fixed warnings by bug 30639 · 6c509577
      unknown authored
      6c509577
    • unknown's avatar
      Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · babd7e9e
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/my51-bug30843
      
      
      mysql-test/t/archive.test:
        Auto merged
      mysql-test/r/archive.result:
        SCCS merged
      babd7e9e
    • unknown's avatar
      2d40efbf
    • unknown's avatar
      Bug#30843 Bad Test addition to t/archive.test · 90ce6f81
      unknown authored
       - Add extra insert
      
      
      mysql-test/r/archive.result:
        Add an extra insert to guarantee that the delayed
        insert shows up in the table
      mysql-test/t/archive.test:
        Add an extra insert to guarantee that the delayed
        insert shows up in the table
      90ce6f81
  10. 20 Sep, 2007 3 commits