1. 23 Mar, 2006 5 commits
  2. 20 Mar, 2006 3 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b26cf869
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.0
      
      b26cf869
    • unknown's avatar
      Fix for bug#18224 VIEW on information_schema crashes the server · e10ec04a
      unknown authored
        additional check for subselect
      
      
      mysql-test/r/information_schema.result:
        Fix for bug#18224 VIEW on information_schema crashes the server
          test case
      mysql-test/t/information_schema.test:
        Fix for bug#18224 VIEW on information_schema crashes the server
          test case
      e10ec04a
    • unknown's avatar
      Fix for bug #18113 "SELECT * FROM information_schema.xxx crashes server" · 2f0459df
      unknown authored
      Crash happened when one selected data from one of INFORMATION_SCHEMA
      tables and in order to build its contents server had to open view which
      used stored function and table or view on which one had not global or
      database-level privileges (e.g. had only table-level or had no
      privileges at all).
      
      The crash was caused by usage of check_grant() function, which assumes
      that either number of tables to be inspected by it is limited explicitly
      or table list used and thd->lex->query_tables_own_last value correspond
      to each other (the latter should be either 0 or point to next_global
      member of one of elements of this table list), in conditions when
      above assumptions were not true. This fix just explicitly limits
      number of tables to be inspected. Other negative effects which are
      caused by the fact that thd->lex->query_tables_own_last might not
      be set properly during processing of I_S tables are less disastrous
      and will be reported and fixed separetely.
      
      
      
      mysql-test/r/information_schema_db.result:
        Fix for bug #18113 "SELECT * FROM information_schema.xxx crashes server"
          test case
      mysql-test/t/information_schema_db.test:
        Fix for bug #18113 "SELECT * FROM information_schema.xxx crashes server"
          test case
      sql/sql_acl.cc:
          added note
      2f0459df
  3. 18 Mar, 2006 1 commit
    • unknown's avatar
      Merge · 274fdeb0
      unknown authored
      
      sql/ha_innodb.cc:
        Auto merged
      274fdeb0
  4. 17 Mar, 2006 7 commits
  5. 16 Mar, 2006 8 commits
  6. 15 Mar, 2006 1 commit
    • unknown's avatar
      We should prohobit concurent read of inserting file in SP · 9289f979
      unknown authored
      because it can couse problem with Query cache (BUG#14767)
      
      
      mysql-test/r/query_cache_notembedded.result:
        BUG#14767 test suite.
      mysql-test/t/query_cache_notembedded.test:
        BUG#14767 test suite.
      sql/sql_insert.cc:
        Query cache invalidation table we was inserting in just after
        unlocking table added to avoid the race condition as we had
        with SP.
      sql/sql_parse.cc:
        Query cache invalidation table we was inserting in just after
        unlocking table added to avoid the race condition as we had
        with SP.
      sql/sql_yacc.yy:
        We should prohibit concurent read of unserting file in SP
        because it can cause problem with query cache.
      9289f979
  7. 14 Mar, 2006 5 commits
  8. 13 Mar, 2006 10 commits
    • unknown's avatar
      Fixed bug#17366: Unchecked Item_int results in server crash · 1da91c4a
      unknown authored
      When there is conjunction of conds, the substitute_for_best_equal_field()
      will call the eliminate_item_equal() function in loop to build final
      expression. But if eliminate_item_equal() finds that some cond will always
      evaluate to 0, then that cond will be substituted by Item_int with value ==
      0. In this case on the next iteration eliminate_item_equal() will get that 
      Item_int and treat it as Item_cond. This is leads to memory corruption and
      server crash on cleanup phase.
      
      To the eliminate_item_equal() function was added DBUG_ASSERT for checking
      that all items treaten as Item_cond are really Item_cond.
      The substitute_for_best_equal_field() now checks that if
      eliminate_item_equal() returns Item_int and it's value is 0 then this 
      value is returned as the result of whole conjunction.
      
      
      mysql-test/t/subselect.test:
        Added test for bug#17366: Unchecked Item_int results in server crash
      mysql-test/r/subselect.result:
         Added test for bug#17366: Unchecked Item_int results in server crash
      sql/sql_select.cc:
        Fixed bug#17366: Unchecked Item_int results in server crash
         
        To the eliminate_item_equal() function was added DBUG_ASSERT for checking
        that all items treaten as Item_cond are really Item_cond.
        The substitute_for_best_equal_field() now checks that if
        eliminate_item_equal() returns something other than Item_cond and if it is
        then this value is returned as the result of whole conjunction.
      1da91c4a
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 8e119caf
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      8e119caf
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 49acc6b1
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
      
      
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      49acc6b1
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · e3294222
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      e3294222
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 034ba964
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
      
      034ba964
    • unknown's avatar
      bug#14028 - · aa5af689
      unknown authored
          ndb crash if trigger record get to big, fix incorrect max size of trigger record
      
      
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Increase size of max trigger record
      aa5af689
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · e5090085
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      e5090085
    • unknown's avatar
      bug#14028 - · e4d87fd6
      unknown authored
        ndb crash if trigger record get to big, fix incorrect max size of trigger record
      
      
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Increase size of max trigger record
      e4d87fd6
    • unknown's avatar
      Merge shellback.(none):/home/msvensson/mysql/init_rm/my50-init_rm · 41d9937a
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.0
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      41d9937a
    • unknown's avatar
      Remove printouts · acd7211c
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Remove extra printouts
      acd7211c