1. 09 Oct, 2007 1 commit
    • unknown's avatar
      Fix for bug #31249: Assertion `!table || (!table->write_set || · 1a5f13a1
      unknown authored
      bitmap_is_set(table->write_set, fiel
      
      Problem: creating a temporary table we allocate the group buffer if needed
      followed by table bitmaps (see create_tmp_table()). Reserving less memory for 
      the group buffer than actually needed (used) for values retrieval may lead 
      to overlapping with followed bitmaps in the memory pool that in turn leads 
      to unpredictable consequences.
      
      As we use Item->max_length sometimes to calculate group buffer size,
      it must be set to proper value. In this particular case 
      Item_datetime_typecast::max_length is too small.
      
      Another problem is that we use max_length to calculate the group buffer
      key length for items represented as DATE/TIME fields which is superfluous.
      
      Fix: set Item_datetime_typecast::max_length properly,
      accurately calculate the group buffer key length for items 
      represented as DATE/TIME fields in the buffer.
      
      
      mysql-test/r/type_datetime.result:
        Fix for bug #31249: Assertion `!table || (!table->write_set || 
        bitmap_is_set(table->write_set, fiel
          - test result.
      mysql-test/t/type_datetime.test:
        Fix for bug #31249: Assertion `!table || (!table->write_set || 
        bitmap_is_set(table->write_set, fiel
          - test case.
      sql/item_timefunc.h:
        Fix for bug #31249: Assertion `!table || (!table->write_set || 
        bitmap_is_set(table->write_set, fiel
          - set Item_datetime_typecast::max_length properly.
      sql/sql_select.cc:
        Fix for bug #31249: Assertion `!table || (!table->write_set || 
        bitmap_is_set(table->write_set, fiel
          - the group buffer key length for items represented as 
        DATE/TIME fields in the buffer should be calculated using
        the maximum pack length of such fields (== 8), using 
        max_length here is redundant.
      1a5f13a1
  2. 04 Oct, 2007 3 commits
    • unknown's avatar
      merging: results adjusted · 6dc4dfb3
      unknown authored
      6dc4dfb3
    • unknown's avatar
      Merge mysql.com:/home/ram/work/b31070/b31070.4.1 · 19810085
      unknown authored
      into  mysql.com:/home/ram/work/b31070/b31070.5.0
      
      
      mysql-test/r/ctype_big5.result:
        Auto merged
      mysql-test/r/ctype_gbk.result:
        Auto merged
      mysql-test/r/ctype_uca.result:
        Auto merged
      strings/ctype-big5.c:
        Auto merged
      strings/ctype-euc_kr.c:
        Auto merged
      strings/ctype-gb2312.c:
        Auto merged
      strings/ctype-sjis.c:
        Auto merged
      BitKeeper/deleted/.del-ctype-cp932.c:
        Auto merged
      19810085
    • unknown's avatar
      Fix for bug #31069: crash in 'sounds like' · db2d3104
      unknown authored
      and for bug #31070: crash during conversion of charsets
      
      Problem: passing a 0 byte length string to some my_mb_wc_XXX() 
      functions leads to server crash due to improper argument check.
      
      Fix: properly check arguments passed to my_mb_wc_XXX() functions.
      
      
      mysql-test/include/ctype_common.inc:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - test case.
      mysql-test/r/ctype_big5.result:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - test result.
      mysql-test/r/ctype_euckr.result:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - test result.
      mysql-test/r/ctype_gb2312.result:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - test result.
      mysql-test/r/ctype_gbk.result:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - test result.
      mysql-test/r/ctype_uca.result:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - test result.
      strings/ctype-big5.c:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - check the string length before testing its first byte.
      strings/ctype-cp932.c:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - check the string length before testing its first byte.
      strings/ctype-euc_kr.c:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - check the string length before testing its first byte.
      strings/ctype-gb2312.c:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - check the string length before testing its first byte.
      strings/ctype-sjis.c:
        Fix for bug #31069: crash in 'sounds like'
        and bug #31070: crash during conversion of charsets
          - check the string length before testing its first byte.
      db2d3104
  3. 28 Sep, 2007 1 commit
  4. 27 Sep, 2007 2 commits
  5. 26 Sep, 2007 1 commit
  6. 25 Sep, 2007 1 commit
  7. 24 Sep, 2007 3 commits
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · bc09b357
      unknown authored
      into  sita.local:/Users/tsmith/m/bk/maint/50
      
      
      bc09b357
    • unknown's avatar
      Add test for named pipes on windows · 562deff3
      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''
      562deff3
    • unknown's avatar
      Merge sita.local:/Users/tsmith/m/bk/50 · 139b563e
      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
      139b563e
  8. 22 Sep, 2007 3 commits
  9. 21 Sep, 2007 5 commits
    • unknown's avatar
      - Increase default connect_timeout to avoid intermittent · 1c078caa
      unknown authored
      disconnects when test servers are put under load
      
      
      1c078caa
    • unknown's avatar
      Bug #15327: configure: --with-tcp-port option being partially ignored · e8972b7a
      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.
      e8972b7a
    • unknown's avatar
      Bug#28359 Intermitted lost connection at 'reading authorization packet' errors · 885efe4c
      unknown authored
       - Increase default 'connect_timeout' value to 10 seconds
      
      
      sql/mysql_priv.h:
        Increase the default connect_timeout value to 10 seconds
      885efe4c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 89c7db56
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      89c7db56
    • unknown's avatar
      Bug#30843 Bad Test addition to t/archive.test · 8a421126
      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
      8a421126
  10. 20 Sep, 2007 2 commits
    • unknown's avatar
      result fix · ad57f912
      unknown authored
      ad57f912
    • unknown's avatar
      Bug#27747 database metadata doesn't return sufficient column default info · fac190a2
      unknown authored
      added get_field_default_value() function which obtains default value from the field
      (used in store_create_info() & get_schema_column_record() functions)
      
      
      mysql-test/r/alter_table.result:
        result fix
      mysql-test/r/create.result:
        result fix
      mysql-test/r/ctype_collate.result:
        result fix
      mysql-test/r/ctype_recoding.result:
        result fix
      mysql-test/r/default.result:
        result fix
      mysql-test/r/gis.result:
        result fix
      mysql-test/r/grant.result:
        result fix
      mysql-test/r/information_schema.result:
        result fix
      mysql-test/r/key.result:
        result fix
      mysql-test/r/mysql.result:
        result fix
      mysql-test/r/ps_1general.result:
        result fix
      mysql-test/r/show_check.result:
        result fix
      mysql-test/r/sp.result:
        result fix
      mysql-test/r/type_enum.result:
        result fix
      mysql-test/r/type_ranges.result:
        result fix
      mysql-test/t/information_schema.test:
        test case
      fac190a2
  11. 19 Sep, 2007 1 commit
  12. 15 Sep, 2007 2 commits
    • unknown's avatar
      select.test: · 692b686d
      unknown authored
        Post-fix for bug#27695.
      
      
      mysql-test/t/select.test:
        Post-fix for bug#27695.
      692b686d
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 613f7ff3
      unknown authored
      into  mysql.com:/home/tnurnberg/15327/50-15327
      
      
      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
      scripts/Makefile.am:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      613f7ff3
  13. 14 Sep, 2007 13 commits
  14. 13 Sep, 2007 2 commits
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · f2dd535b
      unknown authored
      into  trift2.:/MySQL/M50/tmp-5.0
      
      
      f2dd535b
    • unknown's avatar
      Bug #15327: configure: --with-tcp-port option being partially ignored · ee7f125d
      unknown authored
      make sure that if builder configured with a non-standard (!= 3306)
      default TCP port that value actually gets used throughout. if they
      didn't configure a value, assume "use a sensible default", which
      will be read from /etc/services or, failing that, from the factory
      default. That makes the order of preference
      - command-line option
      - my.cnf, where applicable
      - $MYSQL_TCP_PORT environment variable
      - /etc/services (unless configured --with-tcp-port)
      - default port (--with-tcp-port=... or factory default)
      
      
      client/mysql.cc:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      client/mysql_upgrade.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      client/mysqladmin.cc:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      client/mysqlbinlog.cc:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      client/mysqlcheck.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      client/mysqldump.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      client/mysqlimport.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      client/mysqlmanagerc.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      configure.in:
        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.
      client/mysqlshow.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      client/mysqltest.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      include/mysql_version.h.in:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make factory default for TCP port available as MYSQL_PORT_DEFAULT
        if build-time configured with a different default.  (0 if unchanged)
      libmysql/libmysql.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        initialize default tcp port for client, like so:
        - if user configured --with-tcp-port, use that value as default
        - otherwise assume "use a good default": search mysqld/tcp in
          /etc/services; if that doesn't exist, use factory default (3306)
        - environment variable MYSQL_TCP_PORT overrides this default
        - command-line option overrides all of the above
      mysql-test/Makefile.am:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT
        if build-time configured with a different default.  (0 if unchanged)
      mysql-test/mysql-test-run-shell.sh:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        set up MYSQL_TCP_PORT if not already set in environment:
        - if user configured --with-tcp-port, use that value as default
        - otherwise assume "use a good default": search mysqld/tcp in
          /etc/services; if that doesn't exist, use factory default (3306)
      netware/mysql_test_run.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        account for non-standard default port-no. configured at build-time
      netware/mysqld_safe.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        account for non-standard default port-no. configured at build-time
      scripts/Makefile.am:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT
        if build-time configured with a different default.  (0 if unchanged)
      scripts/mysql_config.sh:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        set up MYSQL_TCP_PORT if not already set in environment:
        - if user configured --with-tcp-port, use that value as default
        - otherwise assume "use a good default": search mysqld/tcp in
          /etc/services; if that doesn't exist, use factory default (3306)
      scripts/mysql_fix_privilege_tables.sh:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        clarifying notice only
      scripts/mysqld_safe-watch.sh:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        account for non-standard default port-no. configured at build-time
      server-tools/instance-manager/priv.h:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        account for non-standard default port-no. configured at build-time
      sql/mysqld.cc:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        if builder specifically requested a default port, use that
        (even if it coincides with our factory default).
        only if they didn't do we check /etc/services (and, failing
        on that, fall back to the factory default of 3306).
        either default can be overridden by the environment variable
        MYSQL_TCP_PORT, which in turn can be overridden with command
        line options.
      tests/mysql_client_test.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      tests/ssl_test.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        account for non-standard default port-no. configured at build-time
      tests/thread_test.c:
        Bug #15327: configure: --with-tcp-port option being partially ignored
        
        make help on --port a little more clear
      ee7f125d