1. 19 Sep, 2006 1 commit
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0 · 82a72ee1
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty
      
      
      BitKeeper/etc/ignore:
        auto-union
      include/my_global.h:
        Auto merged
      myisam/mi_rkey.c:
        Manual null merge as a better fix is already present.
      mysql-test/r/myisam.result:
        Manual null merge as a better fix is already present.
      mysql-test/t/myisam.test:
        Manual null merge as a better fix is already present.
      sql/sql_select.cc:
        Manual merge of purify improvements.
      82a72ee1
  2. 15 Sep, 2006 1 commit
  3. 14 Sep, 2006 1 commit
  4. 12 Sep, 2006 1 commit
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 562763f1
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-bug14400
      
      
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      myisam/mi_rkey.c:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Manual merge
      562763f1
  5. 07 Sep, 2006 2 commits
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.0-bug14400 · 203d0999
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-bug14400
      
      
      myisam/mi_rkey.c:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Manual merge from 4.0
      mysql-test/r/myisam.result:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Manual merge from 4.0
      mysql-test/t/myisam.test:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Manual merge from 4.0
      203d0999
    • unknown's avatar
      Bug#14400 - Query joins wrong rows from table which is subject of · 71314617
      unknown authored
                  "concurrent insert"
      Additional fix for full keys and test case.
      
      
      myisam/mi_rkey.c:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Additional fix for full keys.
      mysql-test/r/myisam.result:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Additional results.
      mysql-test/t/myisam.test:
        Bug#14400 - Query joins wrong rows from table which is subject of
                    "concurrent insert"
        Additional test case.
      71314617
  6. 29 Aug, 2006 2 commits
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.0-bug14400 · a32f6b89
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-bug14400
      
      
      myisam/mi_rkey.c:
        Bug#14400 - Query joins wrong rows from table which is
                    subject of "concurrent insert"
        Manual merge from 4.0.
      mysql-test/r/myisam.result:
        Bug#14400 - Query joins wrong rows from table which is
                    subject of "concurrent insert"
        Manual merge from 4.0.
      mysql-test/t/myisam.test:
        Bug#14400 - Query joins wrong rows from table which is
                    subject of "concurrent insert"
        Manual merge from 4.0.
      a32f6b89
    • unknown's avatar
      Bug#14400 - Query joins wrong rows from table which is · 7d600f71
      unknown authored
                  subject of "concurrent insert"
      Better fix by Monty: "The previous bug fix didn't work
      when using partial keys."
      
      
      mysql-test/r/myisam.result:
        Bug#14400 - Query joins wrong rows from table which is
                    subject of "concurrent insert"
        Added test result
      mysql-test/t/myisam.test:
        Bug#14400 - Query joins wrong rows from table which is
                    subject of "concurrent insert"
        Added test case
      7d600f71
  7. 22 Aug, 2006 1 commit
  8. 19 Aug, 2006 2 commits
  9. 17 Aug, 2006 2 commits
  10. 16 Aug, 2006 2 commits
  11. 15 Aug, 2006 4 commits
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · 80684559
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-4.1
      
      
      80684559
    • unknown's avatar
      ndb_lock.test, ndb_lock.result: · 87b7363c
      unknown authored
        bug #18184  SELECT ... FOR UPDATE does not work..: New test case
      ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      
      
      mysql-test/r/ndb_lock.result:
        bug #18184  SELECT ... FOR UPDATE does not work..: New test case
      mysql-test/t/ndb_lock.test:
        bug #18184  SELECT ... FOR UPDATE does not work..: New test case
      ndb/include/ndbapi/NdbConnection.hpp:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      sql/ha_ndbcluster.cc:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      sql/ha_ndbcluster.h:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      87b7363c
    • unknown's avatar
      Fix for bug #20695: Charset introducer overrides charset definition for column. · fe3dee06
      unknown authored
        - if there are two character set definitions in the column declaration,
          we replace the first one with the second one as we store both in the LEX->charset
          slot. Add a separate slot to the LEX structure to store underscore charset.
        - convert default values to the column charset of STRING, VARSTRING fields 
          if necessary as well.
      
      
      mysql-test/r/ctype_recoding.result:
        Fix for bug #20695: Charset introducer overrides charset definition for column.
          - test result.
      mysql-test/t/ctype_recoding.test:
        Fix for bug #20695: Charset introducer overrides charset definition for column.
          - test case.
      sql/sql_lex.cc:
        Fix for bug #20695: Charset introducer overrides charset definition for column.
          - LEX->underscore_charset introduced to store UNDERSCORE_CHARSET
      sql/sql_lex.h:
        Fix for bug #20695: Charset introducer overrides charset definition for column.
          - LEX->underscore_charset introduced to store UNDERSCORE_CHARSET
      sql/sql_table.cc:
        Fix for bug #20695: Charset introducer overrides charset definition for column.
          - convert default values to the column charset of VARSTRING, STRING, ENUM, 
            SET fields if necessary.
      sql/sql_yacc.yy:
        Fix for bug #20695: Charset introducer overrides charset definition for column.
          - LEX->underscore_charset introduced to store UNDERSCORE_CHARSET
      fe3dee06
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1 · 73c1453e
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b17939
      
      
      client/mysql.cc:
        Auto merged
      73c1453e
  12. 14 Aug, 2006 6 commits
  13. 11 Aug, 2006 3 commits
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 49591aa3
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b15276
      
      
      49591aa3
    • unknown's avatar
      mysqld --collation-server=xxx --character-set-server=yyy · edc8900b
      unknown authored
      didn't work as expected: collation_server was set not to xxx,
      but to the default collation of character set "yyy".
          
      With different argument order it worked as expected:
      mysqld --character-set-server=yyy --collation-server=yyy 
          
      Fix:
      initializate default_collation_name to 0
      when processing --character-set-server
      only if --collation-server has not been specified
      in command line.
      
      
      mysql-test/r/ctype_ucs2_def.result:
        Adding test cast
      mysql-test/t/ctype_ucs2_def-master.opt:
        Adding test case
      mysql-test/t/ctype_ucs2_def.test:
        Adding test case
      sql/mysqld.cc:
        Don't clear default_collation_name when processing 
        --character-set-server if collation has already
        been specified using --collation-server
      edc8900b
    • unknown's avatar
      Bug#7192 Specify --with-collation doesn't work for connections? · 256ac388
      unknown authored
      --with-collation worked only on the server side.
      Client side ignored this argument, so collation_connection
      was not properly set (remained latin1_swedish_ci).
      
      
      
      sql-common/client.c:
        - Take into account MYSQL_DEFAULT_COLLATION_NAME if
        character set is not set using mysql_option(), to
        honor --with-collation argument to configure.
        - Use default collation for the character set when it's
        not set using mysql_option().
      256ac388
  14. 10 Aug, 2006 2 commits
    • unknown's avatar
      Better bug fix for #14400 "Query joins wrong rows from table which is subject... · dcb66590
      unknown authored
      Better bug fix for #14400 "Query joins wrong rows from table which is subject of "concurrent insert""
      The previous bug fix didn't work when using partial keys.
      Don't use GNUC min/max operations are they are depricated.
      Fixed valgrind warning
      
      
      BitKeeper/etc/ignore:
        Added */.libs/*
      include/my_global.h:
        Don't use GNUC min/max operations are they are depricated
      myisam/mi_rkey.c:
        Better bug fix for #14400 "Query joins wrong rows from table which is subject of "concurrent insert""
        The previous bug fix didn't work when using partial keys.
      myisam/mi_test_all.res:
        Updated results to match mi_test_all.sh
      myisam/mi_test_all.sh:
        Removed confusing warning
      mysql-test/r/myisam.result:
        Added test case for #14400
      mysql-test/t/myisam.test:
        Added test case for #14400
      sql/sql_select.cc:
        Fixed valgrind warning (in field_string::val_int())
      dcb66590
    • unknown's avatar
      Fix for bug #20709: Collation not used in group by on 4.1. · bfdbb780
      unknown authored
      myisam/mi_uniue.c:mi_check_unique() should skip trailing spaces comparing 
      TEXT and VARTTEXT key segments.
      
      
      myisam/mi_unique.c:
        Fix for bug #20709: Collation not used in group by on 4.1.    
        
        myisam/mi_uniue.c:mi_check_unique() should skip trailing spaces comparing 
        TEXT and VARTTEXT key segments.
          
        Example: assume, we have a 'char(200) collate utf8_unicode_ci' field,
        there are two records with _utf8"0x65" and _utf8"0xC3A9" characters;
        these values are equal according
        to the utf8_unicode_ci collation, but two 600 byte length corresponding keys:  
        "0x65<0x20 repeats 599 times>" and "0xC3A9<0x20 repeats 598 times>" are not    
        equal if we count trailing spaces and it may cause inconsequent behavior.
        
        So, let's pass 1 as the skip_end_space parameter value to the mi_compare_text()
        function for proper TEXT and VARTTEXT key segments comparison.
      mysql-test/r/ctype_utf8.result:
        Fix for bug #20709: Collation not used in group by on 4.1.    
          - test results.
      mysql-test/t/ctype_utf8.test:
        Fix for bug #20709: Collation not used in group by on 4.1.    
          - test case.
      bfdbb780
  15. 09 Aug, 2006 3 commits
    • unknown's avatar
      Removed iggy's accidentally checked-in test files. · 70269a09
      unknown authored
      
      BitKeeper/deleted/.del-bug20328.test:
        Delete: mysql-test/t/bug20328.test
      BitKeeper/deleted/.del-bug20328.result:
        Delete: mysql-test/r/bug20328.result
      70269a09
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8f88400d
      unknown authored
      into  may.pils.ru:/home/svoj/devel/mysql/BUG20060/mysql-4.1
      
      
      8f88400d
    • unknown's avatar
      BUG#20060 - mysqld option "--flush " doesn't work for update statement · a2a5f2b5
      unknown authored
      Problem described in this bug report affects MyISAM tables only.
      
      Running mysqld --flush instructs mysqld to sync all changes to disk
      after each SQL statement. It worked well for INSERT and DELETE
      statements, but it did sync for UPDATE only in case if there was
      index change (change of colum that has an index). If no updated column
      has an index, data wasn't synced to disk.
      
      This fix makes UPDATE statement to sync data to disk even if there is
      no index change (that is only data change) and mysqld is run with
      --flush option.
      
      
      myisam/mi_update.c:
        Every myisam function that updates myisam table must end with
        call to _mi_writeinfo(). If operation (second param of
        _mi_writeinfo()) is not 0 it sets share->changed to 1, that is
        flags that data has changed. If operation is 0, this function
        equals to no-op in this case.
        
        mi_update() must always pass !0 value as operation, since even if
        there is no index change there could be data change.
      a2a5f2b5
  16. 07 Aug, 2006 1 commit
  17. 03 Aug, 2006 5 commits
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 · dba52b53
      unknown authored
      into  may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1
      
      
      dba52b53
    • unknown's avatar
      Bug#21419 test case lowercase_fs_off fails on Windows · 842ec233
      unknown authored
       - Backport patch from 5.0
      
      
      sql/mysqld.cc:
        Add else case to set "lower_case_file_system" also when lower_case_table_names are 1
      842ec233
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/my41-bug21218 · 135ffa63
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      
      mysql-test/t/mysqlbinlog.test:
        Auto merged
      135ffa63
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 · 485510a2
      unknown authored
      into  may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1
      
      
      485510a2
    • unknown's avatar
      BUG#7391 - Cross-database multi-table UPDATE uses active database · 74465080
      unknown authored
                 privileges
      
      This problem is 4.1 specific. It doesn't affect 4.0 and was fixed
      in 5.x before.
      
      Having any mysql user who is allowed to issue multi table update
      statement and any column/table grants, allows this user to update
      any table on a server (mysql grant tables are not exception).
      
      check_grant() accepts number of tables (in table list) to be checked
      in 5-th param. While checking grants for multi table update, number
      of tables must be 1. It must never be 0 (actually we have
      DBUG_ASSERT(number > 0) in 5.x in grant_check() function).
      
      
      mysql-test/r/grant.result:
        Addition to test case for bug#7391:
        - Added grant statement to trigger this problem in 4.1.
        - Fixed error messages.
      mysql-test/t/grant.test:
        Addition to test case for bug#7391:
        - Added grant statement to trigger this problem in 4.1.
        - Fixed error messages.
      sql/sql_update.cc:
        check_grant() accepts number of tables (in table list) to be checked
        in 5-th param. For this particular check number of tables must be 1.
        It must never be 0 (actually we have DBUG_ASSERT(number > 0) in 5.x
        in grant_check() function).
      74465080
  18. 02 Aug, 2006 1 commit