1. 28 Jun, 2005 12 commits
    • unknown's avatar
      fixed substring() length calculation in case of constant negative argument (BUG#10269) · 26373380
      unknown authored
      
      mysql-test/r/func_str.result:
        Correct length reporting from substring()
      mysql-test/t/func_str.test:
        Correct length reporting from substring()
      sql/item_strfunc.cc:
        fixed substring() length calculation in case of constant negative argument
      26373380
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · dadf91f0
      unknown authored
      into hundin.mysql.fi:/home/marko/mysql-4.1
      
      
      dadf91f0
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · d8edc2db
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      
      d8edc2db
    • unknown's avatar
      Move reset of insert_values to ensure it's done also during error conditions · 05c7edf6
      unknown authored
      This fixed a failure of insert_update.test on some platforms
      
      
      mysys/thr_alarm.c:
        Fixed problem noticed by valgrind
      sql/opt_range.cc:
        Simple optimization for common case
      sql/sql_base.cc:
        Safety assert
      sql/sql_insert.cc:
        Added comment
      05c7edf6
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · 69f29348
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      
      sql/sql_select.cc:
        Auto merged
      69f29348
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 27478af9
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      
      sql/field.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      27478af9
    • unknown's avatar
      group_by.result, group_by.test: · 67abd491
      unknown authored
        Added a test case for bug #11414.
      sql_select.cc:
        Fixed bug #11414: crash on Windows with some simple
        GROUP BY queries.
        It happened to an allocation of an array containing
        0 Copy_field elements in setup_copy_fields.
        The bug had been already fixed in 5.0.
      
      
      sql/sql_select.cc:
        Fixed bug #11414: crash on Windows with some simple
        GROUP BY queries.
        It happened to an allocation of an array containing
        0 Copy_field elements in setup_copy_fields.
        The bug had been already fixed in 5.0.
      mysql-test/t/group_by.test:
        Added a test case for bug #11414.
      mysql-test/r/group_by.result:
        Added a test case for bug #11414.
      67abd491
    • unknown's avatar
      ctype_ucs.result, ctype_ucs.test, ctype_utf8.result, ctype_utf8.test: · 2776aa35
      unknown authored
        Fixing tests accordingly.
      ctype-ucs2.c:
        The same fix for UCS2.
      ctype-utf8.c:
        Bug #9557
        MyISAM utf8 table crash
        The problem was that my_strnncollsp_xxx could
        return big value in the range 0..0xffff.
        for some constant pairs it could return 32738,
        which is defined as MI_FOUND_WRONG_KEY in
        myisamdef.h. As a result, table considered to
        be crashed. 
        Fix to return -1,0 or 1.
      
      
      strings/ctype-utf8.c:
        Bug #9557
        MyISAM utf8 table crash
        The problem was that my_strnncollsp_xxx could
        return big value in the range 0..0xffff.
        for some constant pairs it could return 32738,
        which is defined as MI_FOUND_WRONG_KEY in
        myisamdef.h. As a result, table considered to
        be crashed. 
        Fix to return -1,0 or 1.
      strings/ctype-ucs2.c:
        The same fix for UCS2.
      mysql-test/t/ctype_utf8.test:
        Fixing tests accordingly.
      mysql-test/r/ctype_utf8.result:
        Fixing tests accordingly.
      mysql-test/t/ctype_ucs.test:
        Fixing tests accordingly.
      mysql-test/r/ctype_ucs.result:
        Fixing tests accordingly.
      2776aa35
    • unknown's avatar
      Makefile.am: · 0037781f
      unknown authored
        Bug#9873, reenabled --without-man option to work
      
      
      Makefile.am:
        Bug#9873, reenabled --without-man option to work
      0037781f
    • unknown's avatar
      configure.in: · c7e157e7
      unknown authored
        Enable build with CXX=gcc and gcc version 4
      
      
      configure.in:
        Enable build with CXX=gcc and gcc version 4
      c7e157e7
    • unknown's avatar
      mysqld.dsp: · 9c41fbda
      unknown authored
        Corrected quoting of string "pro-nt"
      
      
      VC++Files/sql/mysqld.dsp:
        Corrected quoting of string "pro-nt"
      9c41fbda
    • unknown's avatar
      opt_range.cc: · f7780a1c
      unknown authored
        Added missing `;' to DBUG_RETURN()
      
      
      sql/opt_range.cc:
        Added missing `;' to DBUG_RETURN()
      f7780a1c
  2. 27 Jun, 2005 11 commits
    • unknown's avatar
      Fix test after last push · f3dd8151
      unknown authored
      f3dd8151
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 07de1f82
      unknown authored
      into mysql.com:/my/mysql-4.1
      
      
      07de1f82
    • unknown's avatar
      Portability fixes · 76d444fc
      unknown authored
      Fixes while reviewing new pushed code
      NULL as argument to encrypt/decrypt should return NULL without a warning
      
      
      client/mysqldump.c:
        Cleanup
        Ensure we free allocated memory
        Portability fixes
      client/mysqltest.c:
        Cleanup of code during review
        Portability fixes (Don't use 'bool')
      mysql-test/r/func_encrypt.result:
        NULL as argument to encrypt/decrypt should return NULL without a warning
      mysql-test/r/func_encrypt_nossl.result:
        Added test of NULL argument
      mysql-test/t/func_encrypt_nossl.test:
        Added test of NULL argument
      sql/handler.cc:
        Cleanup during code review
      sql/item_strfunc.cc:
        NULL as argument to encrypt/decrypt should return NULL without a warning
      sql/sql_parse.cc:
        Fix wrong merge (fix was not needed as the previous code was reverted)
      sql/sql_table.cc:
        Removed extra new line
      76d444fc
    • unknown's avatar
      InnoDB: After review fixes · b608f091
      unknown authored
      
      innobase/os/os0file.c:
        os_file_set_size(): After review fixes (prevent overflows)
      b608f091
    • unknown's avatar
      InnoDB: Optimize the extension of files. This will greatly speed · 1084e540
      unknown authored
      up CREATE TABLE in innodb_file_per_table=1 mode.
      
      
      innobase/fil/fil0fil.c:
        fil_extend_space_to_desired_size(): Do not allocate or initialize
        more memory than is necessary.  Write at most one megabyte at a time.
      innobase/include/os0file.h:
        os_file_set_size(): Corrected the synopsis
      innobase/os/os0file.c:
        os_file_set_size(): Corrected the synopsis and some comments.
        s/offset/current_size; s/low/desired_size/;
        Do not allocate or initialize more memory than is necessary.
        Write at most one megabyte at a time.
      1084e540
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 78b35bc0
      unknown authored
      into mysql.com:/my/mysql-4.1
      
      
      78b35bc0
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 6c46a993
      unknown authored
      into  mishka.local:/home/my/mysql-4.1
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      6c46a993
    • unknown's avatar
      Better bug fix for: · d10877ce
      unknown authored
      #9728  'Decreased functionality in "on duplicate key update
      #8147  'a column proclaimed ambigous in INSERT ... SELECT .. ON DUPLICATE'
      
      This ensures fields are uniquely qualified and also that one can't update other tables in the ON DUPLICATE KEY UPDATE part
      
      
      mysql-test/r/insert_select.result:
        More tests for bug #9728 and #8147
      mysql-test/r/insert_update.result:
        Updated tests after changing how INSERT ... SELECT .. ON DUPLICATE KEY works
      mysql-test/t/insert_select.test:
        More tests for bug #9728 and #8147
      mysql-test/t/insert_update.test:
        Updated tests after changing how INSERT ... SELECT .. ON DUPLICATE KEY works
      mysys/my_access.c:
        Cleanup (shorter loop variable names)
      sql/ha_ndbcluster.cc:
        Indentation fixes
      sql/item.cc:
        Remove item_flags
      sql/item.h:
        Remove item_flags
      sql/mysql_priv.h:
        New arguments to mysql_prepare_insert
      sql/sql_base.cc:
        Remove old fix for bug #8147
      sql/sql_insert.cc:
        Extend mysql_prepare_insert() with new field list for tables that can be used in the values port of ON DUPLICATE KEY UPDATE
      sql/sql_parse.cc:
        Revert fix for #9728
        Allow one to use other tables in ON DUPLICATE_KEY for INSERT ... SELECT if there is no GROUP BY clause
      sql/sql_prepare.cc:
        New arguments to mysql_prepare_insert
      sql/sql_yacc.yy:
        Revert bug fix for #9728
      d10877ce
    • unknown's avatar
      Include <sys/wait.h> to get WEXITSTATUS · e00981bb
      unknown authored
      e00981bb
    • unknown's avatar
      Add "#include <stdlib.h>" to define WEXITSTATUS · 8478223a
      unknown authored
      8478223a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · f40f711e
      unknown authored
      into neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      
      f40f711e
  3. 25 Jun, 2005 1 commit
  4. 24 Jun, 2005 3 commits
    • unknown's avatar
      Bug#10178 - failure to find a row in heap table by concurrent UPDATEs · a7e66efc
      unknown authored
      Moved the key statistics update to info().
      The table is not locked in open(). This made wrong stats possible.
      
      No test case for the test suite.
      This happens only with heavy concurrency.
      A test script is added to the bug report.
      
      
      mysql-test/r/heap_hash.result:
        Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
        Updated test results to reflect the new  statistics behaviour.
      mysql-test/t/heap_hash.test:
        Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
        Added a FLUSH TABLES to avoid statistics differences between normal 
        and ps-protocol tests.
      sql/ha_heap.cc:
        Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
        Moved the key statistics update to info().
        The table is not locked in open(). This made wrong stats possible.
      sql/ha_heap.h:
        Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
        Added an element to track the validity of the key statistics.
      a7e66efc
    • unknown's avatar
    • unknown's avatar
      an improvement (bug #7851: C++ 'new' conflicts with kernel header asm/system.h). · 77dc5c42
      unknown authored
      
      include/my_global.h:
        an improvement (bug #7851: C++ 'new' conflicts with kernel header asm/system.h).
        redefine 'new' before #include <asm/atomic.h> in any case.
      77dc5c42
  5. 23 Jun, 2005 13 commits