1. 23 Jun, 2005 8 commits
  2. 22 Jun, 2005 11 commits
  3. 21 Jun, 2005 12 commits
    • unknown's avatar
      BUG#10442 Minor changes from code review · 86001f22
      unknown authored
      
      mysql-test/r/rpl_multi_update3.result:
        Changes from code review
      mysql-test/t/rpl_multi_update3.test:
        Changes from code review
      sql/sql_parse.cc:
        Changes from code review
      86001f22
    • unknown's avatar
      Bug #9148 Denial of Service · bbd893b3
      unknown authored
      
      my_access.c:
        Fixed problem where in some cases check_if_legal_filename was returning 0 for illegal names
      
      
      mysys/my_access.c:
        Fixed problem where in some cases check_if_legal_filename was returning 0 for illegal names
      bbd893b3
    • unknown's avatar
      Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1 · c2ff4fa0
      unknown authored
      into  mysql.com:/Users/emurphy/src/work/mysql-4.1-bug10442
      
      c2ff4fa0
    • unknown's avatar
      mysql-test-run.pl: · ed883c17
      unknown authored
        Added optional paths for finding mysqld on Windows
        Added language/charset options to embedded mysql_client_test
      
      
      mysql-test/mysql-test-run.pl:
        Added optional paths for finding mysqld on Windows
        Added language/charset options to embedded mysql_client_test
      ed883c17
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · e210017d
      unknown authored
      into  moonbone.local:/work/mysql-4.1-bug-10886
      
      
      sql/sql_insert.cc:
        Auto merged
      e210017d
    • unknown's avatar
      Fix bug #10886 - INSERT ... SELECT ... ON DUPLICATE KEY UPDATE produces bad results · 47133461
      unknown authored
      Temporary field wasn't restored to default values after ON DUPLICATE KEY
       UPDATE event, which results in wrong data being inserted in new record.
      
      
      sql/sql_insert.cc:
        Fix bug #10886 - INSERT ... SELECT ... ON DUPLICATE KEY UPDATE produces bad results
      mysql-test/t/insert_select.test:
        Test case for bug #10886 - INSERT ... SELECT ... ON DUPLICATE KEY 
        UPDATE produces bad results
      mysql-test/r/insert_select.result:
        Test case for bug #10886 - INSERT ... SELECT ... ON DUPLICATE KEY UPDATE 
        produces bad results
      47133461
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2122ba09
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      2122ba09
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · 7506094b
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-1
      
      7506094b
    • unknown's avatar
      group_by.result, group_by.test: · f4f19bdf
      unknown authored
        Added a test case for bug #11295.
      item_buff.cc:
        Fixed bug #11295.
        This a correction for the patch of bug #11088 that takes into
        account a possible NULL values of the BLOB column.
      
      
      sql/item_buff.cc:
        Fixed bug #11295.
        This a correction for the patch of bug #11088 that takes into
        account a possible NULL values of the BLOB column.
      mysql-test/t/group_by.test:
        Added a test case for bug #11295.
      mysql-test/r/group_by.result:
        Added a test case for bug #11295.
      f4f19bdf
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 60cfa8f3
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      60cfa8f3
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9a69ad6e
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
      
      9a69ad6e
    • unknown's avatar
      mysql-test-run.pl: · 474362ba
      unknown authored
        More compact and safe handling of path names.
        Support for running in Windows source tree.
        Use libtool wrapper, instead of messing with
        library path names, and objects in .libs dir.
      mtr_misc.pl:
        Utility function that search aand check path names
      mtr_report.pl:
        Patch by Carsten, set correct reject/result/eval if not main suite
      
      
      mysql-test/lib/mtr_report.pl:
        Patch by Carsten, set correct reject/result/eval if not main suite
      mysql-test/lib/mtr_misc.pl:
        Utility function that search aand check path names
      mysql-test/mysql-test-run.pl:
        More compact and safe handling of path names.
        Support for running in Windows source tree.
        Use libtool wrapper, instead of messing with
        library path names, and objects in .libs dir.
      474362ba
  4. 20 Jun, 2005 9 commits