1. 10 Aug, 2005 1 commit
  2. 09 Aug, 2005 2 commits
  3. 08 Aug, 2005 13 commits
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · 310bb7e2
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      310bb7e2
    • unknown's avatar
      subselect.test, subselect.result: · 6f0a6260
      unknown authored
        Added a test case for bug #12392.
      item_cmpfunc.cc:
        Fixed bug #12392.
        Missing handling of rows containing NULL components
        when evaluating IN predicates caused a crash.
      
      
      sql/item_cmpfunc.cc:
        Fixed bug #12392.
        Missing handling of rows containing NULL components
        when evaluating IN predicates caused a crash.
      mysql-test/r/subselect.result:
        Added a test case for bug #12392.
      mysql-test/t/subselect.test:
        Added a test case for bug #12392.
      6f0a6260
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · e6ed39b4
      unknown authored
      into  mysql.com:/home/my/mysql-4.1
      
      
      e6ed39b4
    • unknown's avatar
      Review of new pushed code · 97988099
      unknown authored
      - Fixed some error condtion when handling dates with 'T'
      - Added extra test for bug #11867 (Wrong result with "... WHERE ROW( a, b ) IN ( SELECT DISTINCT a, b WHERE ...)" to show it's not yet fixed
      - Safety fixes and cleanups
      
      
      mysql-test/r/subselect.result:
        Added extra test case to test case for bug #11867
        (Result shows that current code is not yet right and needs to be fixed)
      mysql-test/r/type_datetime.result:
        More tests for dates of type CCYYMMDDTHHMMSS
      mysql-test/t/subselect.test:
        Added extra test case to test case for bug #11867
      mysql-test/t/type_datetime.test:
        More tests for dates of type CCYYMMDDTHHMMSS
      sql-common/my_time.c:
        Fixed handling of dates of type CCYYMMDDTHHMMSS
        (Old code couldn't handle 2003-0304 or 2003-0003-02)
      sql/slave.cc:
        Indentation cleanup
      sql/sql_parse.cc:
        Added test of return value of get_system_var()
      sql/sql_select.cc:
        Removed unnecessary call to field->table->maybe_null
      sql/sql_union.cc:
        Indentation fixes
      97988099
    • unknown's avatar
      BUG #12119 · b1067014
      unknown authored
      Removed unnecessary error message from mysql.cc (client program)
      
      
      client/mysql.cc:
        BUG #12119
        
        The error message "Didn't find any fields in table ..." would 
        be printed out when a table was created and dropped in rapid succession 
        via a perl script. The client would get a list of tables, meanwhile, the 
        one table would be deleted, and then this error message printed when the 
        table was not found, which it should just quietly not print the fields.
        Removing the error message fixes this issue.
      b1067014
    • unknown's avatar
      item_strfunc.cc: · 10805ec2
      unknown authored
        BUG #11104 
            Took out the offset-=delimiter_length-1 out of the for loop. It was causing
            basically this: 
            select substring_index('the king of the the hill', 'the', -2) to not work.
            The first iteration, offset would be initialised to 24, then strstr would 
            point at 'the king of the the* hill' ('*'means right before the 
            character following), returning a offset of 16. The for loop would then 
            decrement offset by two (3 - 1), to 14, now pointing at 
            "the king of th*e the hill", _skipping_ past the 'e' in the second to last
            'the', and therefore strstr would never have a chance of matching the 
            second to last 'the', then moving on to the 'the' at the begginning of the 
            string!
            In a nutshell, offset was being decremented by too great a value, preventing
            the second to last 'the' from being ever found, hence the result of 
            'king of the the hill' from the query that is reported in the bug report
      func_str.test:
        BUG #11104
        Added tests to make sure fix addresses issues in original bug report
      func_str.result:
        BUG #11104 
        New results for new tests
      
      
      mysql-test/r/func_str.result:
        BUG #11104 
        
        New results for new tests
      mysql-test/t/func_str.test:
        BUG #11104
        
        Added tests to make sure fix addresses issues in original bug report
      sql/item_strfunc.cc:
        BUG #11104 
            Took out the offset-=delimiter_length-1 out of the for loop. It was causing
            basically this: 
            select substring_index('the king of the the hill', 'the', -2) to not work.
            The first iteration, offset would be initialised to 24, then strstr would 
            point at 'the king of the the* hill' ('*'means right before the 
            character following), returning a offset of 16. The for loop would then 
            decrement offset by two (3 - 1), to 14, now pointing at 
            "the king of th*e the hill", _skipping_ past the 'e' in the second to last
            'the', and therefore strstr would never have a chance of matching the 
            second to last 'the', then moving on to the 'the' at the begginning of the 
            string!
        
            In a nutshell, offset was being decremented by too great a value, preventing
            the second to last 'the' from being ever found, hence the result of 
            'king of the the hill' from the query that is reported in the bug report
      10805ec2
    • unknown's avatar
      Bug#5439 : mysql_server_init() crashes if ShiftJIS path is passed · 4112dc21
      unknown authored
      (important for Adobe).
      
      mf_pack.c, mf_dirname.c, charset.c, my_sys.h:
      
        - adding fs_character_set() function on Windows
        - ignoring fake slashes which are just multibyte
          parts in several functions in /mysys
      
      Verified by Shu to work on WinXP and Win2k.
      Test is not possible, or very hard to do.
      
      
      include/my_sys.h:
        Bug#5439 : mysql_server_init() crashes if ShiftJIS path is passed
        (important for Adobe)
        - adding fs_character_set() function on Windows
        - ignoring fake slashes which are just multibyte
          parts in several functions in /mysys
      mysys/charset.c:
        d
      mysys/mf_dirname.c:
        d
      mysys/mf_pack.c:
        d
      4112dc21
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · e6301003
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b10892
      
      
      e6301003
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 00267b9f
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b10892
      
      
      00267b9f
    • unknown's avatar
      item.cc: · b9ffa4db
      unknown authored
        After review fix
      
      
      sql/item.cc:
        After review fix
      b9ffa4db
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 00e74048
      unknown authored
      into  mishka.local:/home/my/mysql-4.1
      
      
      00e74048
    • unknown's avatar
      Fix for BUG #11642: [Patch]es x86 Assembler and text relocations · 38b4ccf5
      unknown authored
      Changed assembler functions to not access global variables or variables in text segement
      Added wrapper function in C to longlong2str() to pass _dig_vec_upper as an argument
      
      
      mysql-test/r/bigint.result:
        More tests for parsing of bigint's
        More tests for different values to conv()
      mysql-test/t/bigint.test:
        More tests for parsing of bigint's
        More tests for different values to conv()
      strings/Makefile.am:
        Added longlong2str_asm.c
      strings/longlong2str-x86.s:
        Changed functions to not access variables in text segment
        Fixed this by adding global variable '_dig_vec_upper' as an argument to longlong2str_with_dig_vector()
      strings/my_strtoll10-x86.s:
        Removd array lfactor by calculating the value in code
        (this is to to make the code position independent)
      strings/longlong2str_asm.c:
        New BitKeeper file ``strings/longlong2str_asm.c''
      38b4ccf5
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 22a73084
      unknown authored
      into  mysql.com:/home/my/mysql-4.1
      
      
      22a73084
  4. 07 Aug, 2005 7 commits
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 23095e27
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      
      23095e27
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 25201f23
      unknown authored
      into  mysql.com:/home/mydev/mysql-4.1-4100
      
      
      25201f23
    • unknown's avatar
      subselect.result: · 84d34d9d
      unknown authored
        Added test case for bug #11867.
        Fixed results for two existing test cases.
      subselect.test:
        Added test case for bug #11867.
      item_subselect.cc:
        Fixed bug #11867.
        Added missing code in Item_in_subselect::row_value_transformer
        that caused problems for queries with
        ROW(elems) IN (SELECT DISTINCT cols FROM ...).
      
      
      sql/item_subselect.cc:
        Fixed bug #11867.
        Added missing code in Item_in_subselect::row_value_transformer
        that caused problems for queries with
        ROW(elems) IN (SELECT DISTINCT cols FROM ...).
      mysql-test/t/subselect.test:
        Added test case for bug #11867.
      mysql-test/r/subselect.result:
        Added test case for bug #11867.
        Fixed results for two existing test cases.
      84d34d9d
    • unknown's avatar
      BUG#11869: part2: post-review fixes: · b9e04cf1
      unknown authored
      In init_prepare_fake_select_lex() don't empty ftfunc_list. UNION's ORDER BY clause may 
      contain MATCH(...), for which fix_index() should be called.
      
      
      mysql-test/r/fulltext_order_by.result:
        BUG#11869 part2 : added another test case
      mysql-test/t/fulltext_order_by.test:
        BUG#11869 part2 : added another test case
      b9e04cf1
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 1ab80cf4
      unknown authored
      into  mysql.com:/home/mydev/mysql-4.1-4100
      
      
      1ab80cf4
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1b431c42
      unknown authored
      into mysql.com:/home/psergey/mysql-4.1-bug11869-part2
      
      
      1b431c42
    • unknown's avatar
      Bug#10109 · fdb4d307
      unknown authored
        "INSERT .. SELECT ... ON DUPLICATE KEY UPDATE fails"
        Ensure that check_insert_fields() is only called once when
        doing an INSERT..SELECT
      
      
      mysql-test/r/insert_update.result:
        Test for bug 10109
      mysql-test/t/insert_update.test:
        Test for bug 10109
      sql/sql_class.h:
        select_insert needs more state
      sql/sql_insert.cc:
        ensure that check_insert_fields() is only called once when
        doing an INSERT...SELECT
      sql/sql_parse.cc:
        more args for select_insert constructor
      fdb4d307
  5. 06 Aug, 2005 1 commit
    • unknown's avatar
      BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error): · 852dcb75
      unknown authored
      When creating temporary table for UNION, pass TMP_TABLE_FORCE_MYISAM flag to 
      create_tmp_table if we will be using fulltext function(s) when reading from the 
      temp. table.
      
      
      mysql-test/r/fulltext_order_by.result:
        Testcase for BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error)
      mysql-test/t/fulltext_order_by.test:
        Testcase for BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error)
      sql/mysql_priv.h:
        BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error):
        Added TMP_TABLE_FORCE_MYISAM flag
      sql/sql_select.cc:
        BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error):
        In create_tmp_table(), honor the TMP_TABLE_FORCE_MYISAM flag
      852dcb75
  6. 05 Aug, 2005 1 commit
    • unknown's avatar
      Bug#9459 - deadlock with flush with lock, and lock table write · 2977a3a4
      unknown authored
      Added a check before taking a global read lock if
      the own thread has a write locked table.
      
      
      mysql-test/r/flush.result:
        Bug#9459 - deadlock with flush with lock, and lock table write
        The test result.
      mysql-test/t/flush.test:
        Bug#9459 - deadlock with flush with lock, and lock table write
        The test case.
      2977a3a4
  7. 04 Aug, 2005 15 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 75c06af2
      unknown authored
      into moonbone.local:/work/mysql-4.1-bug-12266
      
      
      75c06af2
    • unknown's avatar
      Update test to deal with more relaxed datetime parsing. · 1beb95e3
      unknown authored
      
      mysql-test/r/query_cache.result:
        Updated results
      mysql-test/t/query_cache.test:
        Change test to use a truly invalid date, now that dates like 
        '20050327 0:0:0' are handled as they are in 4.0.
      1beb95e3
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-12328 · c566fc08
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      c566fc08
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-7308 · cd0f12b5
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      cd0f12b5
    • unknown's avatar
      Fix bug#12266 GROUP BY DATE(LEFT(column,8)) returns result strings with reduced · b2dc376a
      unknown authored
      length.
      
      When temporary field created for DATE(LEFT(column,8)) expression, max_length
      value is taken from Item_date_typecast, and it is getting it from underlaid
      Item_func_left and it's max_length is 8 in given expression. And all this
      results in stripping last 2 digits.
      
      To Item_date_typecast class added its own fix_length_and_dec() function 
      that sets max_length value to 10, which is proper for DATE field.
      
      
      mysql-test/t/group_by.test:
        Test case for bug#12266 GROUP BY DATE(LEFT(column,8)) returns result strings with reduced length.
      mysql-test/r/group_by.result:
        Test case for bug#12266 GROUP BY DATE(LEFT(column,8)) returns result strings with reduced length.
      sql/item_timefunc.h:
        Fix bug#12266 GROUP BY DATE(LEFT(column,8)) returns result strings with reduced length.
        To Item_date_typecast class added its own fix_length_and_dec() which sets proper max_length value.
      b2dc376a
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 · 82f674f9
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.clean
      
      
      82f674f9
    • unknown's avatar
      mysql-test-run.pl: · 2747666d
      unknown authored
        Back ported ndbcluster_support() from 5.0
        Corrected the server id handling
      
      
      mysql-test/mysql-test-run.pl:
        Back ported ndbcluster_support() from 5.0
        Corrected the server id handling
      2747666d
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3b4f3173
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      3b4f3173
    • unknown's avatar
      mysqld.dsp: · 5ba9aad2
      unknown authored
        Added the blackhole storage engine to the Max builds
      
      
      VC++Files/sql/mysqld.dsp:
        Added the blackhole storage engine to the Max builds
      5ba9aad2
    • unknown's avatar
      Merge deer.(none):/home/hf/work/mysql-4.1.clean · 6b761d86
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.9508
      
      
      6b761d86
    • unknown's avatar
      Merge deer.(none):/home/hf/work/mysql-4.1.clean · 999b0638
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.11083
      
      
      mysql-test/t/myisam.test:
        Auto merged
      999b0638
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · e012ec52
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      
      sql/ha_innodb.cc:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      e012ec52
    • unknown's avatar
      - manual merge from 4.0 into 4.1: used the local version of ha_innodb.cc, merged · 3986a1f8
      unknown authored
        the rpm spec file changelog
      
      
      sql/ha_innodb.cc:
        - Merge: used local version (as the fix in 4.0 was a backport)
      support-files/mysql.spec.sh:
        - manual merge from 4.0
      3986a1f8
    • unknown's avatar
      grant.result, grant.test: · 9e3562d7
      unknown authored
        fixing tests accordingly
      item.cc:
        Bug #10892 user variables not auto cast for comparisons
        When mixing strings with different character sets,
        and coercibility is the same, we allow conversion
        if one character set is superset for other character set.
      
      
      sql/item.cc:
        Bug #10892 user variables not auto cast for comparisons
        When mixing strings with different character sets,
        and coercibility is the same, we allow conversion
        if one character set is superset for other character set.
      mysql-test/t/grant.test:
        fixing tests accordingly
      mysql-test/r/grant.result:
        fixing tests accordingly
      9e3562d7
    • unknown's avatar
      Fix for bug #12177 (errorlog file isn't closed) · 36a2a092
      unknown authored
      4.1 version of the patch
      
      
      libmysql/libmysql.c:
        here we close errorlog file
      sql/mysql_priv.h:
        stderror_file declared
      sql/mysqld.cc:
        stderror_file saved
      36a2a092