1. 24 Aug, 2005 12 commits
  2. 23 Aug, 2005 15 commits
    • unknown's avatar
      BUG#12532: Fixes after review · e5f4b4c6
      unknown authored
      
      sql/log_event.cc:
        Review fixes
      sql/sql_parse.cc:
        Review fixes
      e5f4b4c6
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/ltx/root/mysql-5.0 · 2667bbd9
      unknown authored
      into  mysql.com:/users/lthalmann/ltx/dev/mysql-5.0-bug12532
      
      
      sql/log_event.cc:
        Auto merged
      2667bbd9
    • unknown's avatar
      Test for BUG#6495. · e9a3d1b0
      unknown authored
      The bug itself is fixed by WL#2486.
      
      
      mysql-test/r/select.result:
        Test for BUG#6495.
      mysql-test/t/select.test:
        Test for BUG#6495.
      e9a3d1b0
    • unknown's avatar
      Test for BUG#4889 - inconsistent resilts of more than 2-way natural join · 359ed9a0
      unknown authored
      due to incorrect transformation to JOIN ... ON.
      
      The bug itself is fixed by WL#2486.
      
      
      mysql-test/r/select.result:
        Test for BUG#4889.
      mysql-test/t/select.test:
        Test for BUG#4889.
      359ed9a0
    • unknown's avatar
      Fix for BUG#6276. · 3bfeefff
      unknown authored
      
      mysql-test/r/select.result:
        Test for BUG#6276.
      mysql-test/t/select.test:
        Test for BUG#6276.
      sql/sql_base.cc:
        Add a true ON condition for outer joins without common columns.
      3bfeefff
    • unknown's avatar
      Test case for BUG#10972 - Natural join of view and underlying table gives wrong result. · 98d63231
      unknown authored
      The bug itself is fixed by WL#2486.
      
      
      mysql-test/r/select.result:
        Test case for BUG#10972.
      mysql-test/t/select.test:
        Test case for BUG#10972.
      98d63231
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · e7f4f49d
      unknown authored
      into  mysql.com:/home/timka/mysql/src/5.0-2486
      
      
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      e7f4f49d
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · 1f91a6dc
      unknown authored
      into  mysql.com:/home/timka/mysql/src/5.0-dbg
      
      1f91a6dc
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · de209ff6
      unknown authored
      into  mysql.com:/home/timka/mysql/src/5.0-2486
      
      
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      de209ff6
    • unknown's avatar
      WL#2486 - natural and using join according to SQL:2003 · 1647932c
      unknown authored
      * Provide backwards compatibility extension to name resolution of
        coalesced columns. The patch allows such columns to be qualified
        with a table (and db) name, as it is in 4.1.
        Based on a patch from Monty.
      
      * Adjusted tests accordingly to test both backwards compatible name
        resolution of qualified columns, and ANSI-style resolution of
        non-qualified columns.
        For this, each affected test has two versions - one with qualified
        columns, and one without. 
      
      
      mysql-test/include/ps_query.inc:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/r/bdb.result:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/r/innodb.result:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/r/join.result:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/r/join_nested.result:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/r/join_outer.result:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/r/null_key.result:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/r/order_by.result:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/r/ps_2myisam.result:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/r/ps_3innodb.result:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/r/ps_4heap.result:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/r/ps_5merge.result:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/r/ps_6bdb.result:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/r/ps_7ndb.result:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/r/select.result:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/r/subselect.result:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/r/type_ranges.result:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/t/bdb.test:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/t/innodb.test:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/t/join.test:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/t/join_nested.test:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/t/join_outer.test:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/t/null_key.test:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/t/order_by.test:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/t/select.test:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/t/subselect.test:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      mysql-test/t/type_ranges.test:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      sql/sql_base.cc:
        * Applied Monty's patch for backwards compatible name resolution
          of qualified columns. The idea is:
          - When a column is qualified, search for the column in all
            tables/views underlying each natural join. In this case
            natural joins are *not* considered leaves.
          - If a column is not qualified, then consider natural joins
            as leaves, thus directly search the result columns of
            natural joins.
        * Simplified 'find_field_in_tables()' - unified two similar
          loops into one.
      sql/table.cc:
        - Removed method & members not needed after Monty's patch.
      sql/table.h:
        - Removed method & members not needed after Monty's patch.
      tests/mysql_client_test.c:
        Put back old tests to test that coalesced columns of natural joins can be qualified.
      1647932c
    • unknown's avatar
      configure.in: · 2d7996ce
      unknown authored
        fixed build bug with ndb grep block
      
      
      configure.in:
        fixed build bug with ndb grep block
      2d7996ce
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 0c20af41
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-bg11896
      
      
      mysql-test/t/sp-error.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      mysql-test/r/trigger.result:
        Manual merge.
      sql/share/errmsg.txt:
        Manual merge.
      0c20af41
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · 4864e595
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      4864e595
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · ca1b06bd
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-5.0
      
      ca1b06bd
    • unknown's avatar
      sql_show.cc: · ce9b8cea
      unknown authored
        Database name was set incorrectly for any show command
        that used sunqueries in its where condition.
      information_schema.test, information_schema.result:
        Added a test case for bug #12636.
      
      
      mysql-test/r/information_schema.result:
        Added a test case for bug #12636.
      mysql-test/t/information_schema.test:
        Added a test case for bug #12636.
      sql/sql_show.cc:
        Database name was set incorrectly for any show command
        that used sunqueries in its where condition.
      ce9b8cea
  3. 22 Aug, 2005 13 commits