1. 20 Sep, 2005 10 commits
    • unknown's avatar
      Fix fur BUG#13348: "multi-table updates and deletes are not logged if no rows were affected". · 68684767
      unknown authored
      Not fixed in 4.1 as not critical. Also I'm correcting error checking of multi-UPDATE/DELETE
      when it comes to binlogging, to make it consistent with when we rollback the statement.
      
      
      mysql-test/r/rpl_multi_delete.result:
        result update
      mysql-test/r/rpl_multi_update.result:
        result update
      mysql-test/t/rpl_multi_delete.test:
        test for BUG#13348
      mysql-test/t/rpl_multi_update.test:
        test of BUG#13348
      sql/sql_delete.cc:
        We now binlog multi-DELETE even if no row was updated (like we do for DELETE).
        I'm also correcting some error checking (< instead of <=), basing myself on when we rollback.
      sql/sql_update.cc:
        we now binlog multi-UPDATE even if no row was updated (like we do for UPDATE).
        Adding to existing tests to test new behaviour.
        I'm also correcting some error checking (< instead of <=), basing myself on when we rollback.
      68684767
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · abfc8b17
      unknown authored
      into  mysql.com:/home/timka/mysql/src/5.0-bug-13127
      
      abfc8b17
    • unknown's avatar
      Fix for BUG#13127. · 5968baf8
      unknown authored
      The problem was in the way table references are pre-filtered when
      resolving a qualified field. When resolving qualified table references
      we search recursively in the operands of the join. If there is
      natural/using join with a merge view, the first call to find_field_in_table_ref
      makes a recursive call to itself with the view as the new table reference
      to search for the column. However the view has both nested_join and
      join_columns != NULL so it skipped the test whether the view name matches
      the field qualifier. As a result the field was found in the view since the
      view already has a field with the same name. Thus the field was incorrectly
      resolved as the view field.
      
      
      mysql-test/r/select.result:
        Test for BUG#13127.
      mysql-test/t/select.test:
        Test for BUG#13127.
      sql/sql_base.cc:
        The patch contains two independent changes:
        
        - When searching for qualified fields, include merge views and information schema tables
        used with SHOW (both using TABLE_LIST::field_translation to represent result fields) in
        the test that compares the qualifying table with the name of the table reference being
        searched. This change fixes the bug.
        
        - Do not search the materialized list of columns of a NATURAL/USING join if 'table_list'
        is a stored table or merge view. Instead search directly in the table or view as if it
        is not under a natural join. This is a performance improvement since if 'table_list'
        is a stored table, then the search can utilize the name hash for table names.
      5968baf8
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · f75faa84
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
      
      f75faa84
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1757a8b6
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      1757a8b6
    • unknown's avatar
      Fix for bug#9896, each fragment has a twin fragment (in 4.1,5.0), pages in... · 33e33ab9
      unknown authored
      Fix for bug#9896, each fragment has a twin fragment (in 4.1,5.0), pages in this were not counted, giving incorrect memory consumption
      
      
      33e33ab9
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 87ebd98e
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
      
      87ebd98e
    • unknown's avatar
      Fixed a missing cast. · efa6e8ec
      unknown authored
      efa6e8ec
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · f3a6c341
      unknown authored
      into  zim.(none):/home/brian/mysql/mysql-5.0
      
      f3a6c341
    • unknown's avatar
      Cleanups for storage engine patch. Changed two test results to now reflect the... · 84272e94
      unknown authored
      Cleanups for storage engine patch. Changed two test results to now reflect the changes in storage engines and a couple of comment changes in the code. 
      
      
      mysql-test/r/ps_1general.result:
        Redoing test output with straightened up output for storage engine names.
      mysql-test/r/variables.result:
        Fixed test case.
      sql/handler.cc:
        Couple of format cleanups and a change in a comment.
      84272e94
  2. 19 Sep, 2005 15 commits
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 12830fe6
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
      
      12830fe6
    • unknown's avatar
      fix warnings · 2260bbdf
      unknown authored
      
      server-tools/instance-manager/buffer.cc:
        perform initialization of static consts in .cc file to respect VC6
      server-tools/instance-manager/buffer.h:
        fix compiler warning
      server-tools/instance-manager/commands.cc:
        fix compiler warning
      server-tools/instance-manager/user_map.cc:
        fix compiler warning
      2260bbdf
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2b07724e
      unknown authored
      into  zim.(none):/home/brian/mysql/mysql-5.0
      
      
      sql/ha_federated.cc:
        Auto merged
      2b07724e
    • unknown's avatar
      Cleanup for handlerton structure to allow for loadable engine work. This is... · ebb199e9
      unknown authored
      Cleanup for handlerton structure to allow for loadable engine work. This is the first in a series of patches. 
      
      
      sql/examples/ha_archive.cc:
        Now declared externally.
      sql/examples/ha_example.cc:
        Now declared externally
      sql/examples/ha_tina.cc:
        Now declared externally
      sql/ha_berkeley.cc:
        Now declared externally
      sql/ha_blackhole.cc:
        Now declared externally
      sql/ha_federated.cc:
        Now declared externally.
      sql/ha_heap.cc:
        Now declared externally.
      sql/ha_innodb.cc:
        Now declared externally.
      sql/ha_myisam.cc:
        Now declared externally
      sql/ha_myisammrg.cc:
        Now declared externally.
      sql/ha_ndbcluster.cc:
        Now declared externally.
      sql/handler.cc:
        Changes for eventual loadable engines. This will allow us to gain faster access to the handlerton (eventually this will just be a handlteron array).
      sql/handler.h:
        New alias structure and change to show_table_st to place handlerton in the structure.
      ebb199e9
    • unknown's avatar
      Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 · 093f60cd
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
      
      
      client/mysqltest.c:
        Merged from 4.1.
      093f60cd
    • unknown's avatar
      Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 · ae181fd6
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
      
      
      client/mysqltest.c:
        Merged from 4.0.
      ae181fd6
    • unknown's avatar
      Fixed Bug#13275 mysqltest empty file bug · e8f17e9f
      unknown authored
      e8f17e9f
    • unknown's avatar
      Corrected last fix for · f42ec4e0
      unknown authored
        Bug #13152 bit fields and fields that follow become corrupted when dumped from NDB tables
      
      f42ec4e0
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · 96dc3a3d
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      ndb/src/ndbapi/Ndbinit.cpp:
        Auto merged
      96dc3a3d
    • unknown's avatar
      mysql-test-run.pl: · 6cf6db2a
      unknown authored
        Added flag --valgrind-mysqltest
      
      
      mysql-test/mysql-test-run.pl:
        Added flag --valgrind-mysqltest
      6cf6db2a
    • unknown's avatar
      bug#9282 - ndb · 861ad147
      unknown authored
        big delete from causing NdbObjectIdMap::expand at same time 
        as receiver thread perform getObjectId 
      
      
      ndb/src/ndbapi/Ndbinit.cpp:
        Protect NdbObjectIdMap::expand from getObjectId
      ndb/src/ndbapi/ObjectMap.hpp:
        Protect NdbObjectIdMap::expand from getObjectId
      861ad147
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · 91ac5f3f
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      91ac5f3f
    • unknown's avatar
      ctype_utf8.result, ctype_utf8.test: · 52319ff3
      unknown authored
        Bug#10504: additional test
      
      
      mysql-test/t/ctype_utf8.test:
        Bug#10504: additional test
      mysql-test/r/ctype_utf8.result:
        Bug#10504: additional test
      52319ff3
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · e849da61
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b10504
      
      e849da61
    • unknown's avatar
      Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5f0ce9f7
      unknown authored
      into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0-master
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      5f0ce9f7
  3. 18 Sep, 2005 5 commits
  4. 17 Sep, 2005 1 commit
    • unknown's avatar
      Brian's "he is too lazy to commit this so Eric is going to have to do it"... · 3829684f
      unknown authored
      Brian's "he is too lazy to commit this so Eric is going to have to do it" environmental variable hack for prefix. This allows you to just set a prefix in your profile which will be used in all of your builds. AKA you can be even lazier(!) about calling BUILD scripts. Don't blame Eric, Brian borrowed his keyboard.
      
      
      BUILD/SETUP.sh:
        Added option to set environmental variable in case you are lazy about setting prefix (ala Brian)
      BUILD/autorun.sh:
        Change of syntax
      3829684f
  5. 16 Sep, 2005 9 commits