1. 24 Mar, 2006 10 commits
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · d29e9a20
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      d29e9a20
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 98dfa6a1
      unknown authored
      into  mysql.com:/home/dlenev/mysql-5.0-bg18153
      
      
      98dfa6a1
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 77a92169
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      mysql-test/lib/mtr_timer.pl:
        Auto merged
      ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      77a92169
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 5d119bf6
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      5d119bf6
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0abaf88c
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      0abaf88c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · c62de1d5
      unknown authored
      into  mysql.com:/home/dlenev/mysql-5.0-bg18153
      
      
      c62de1d5
    • unknown's avatar
      Fix for bug #18153 "ALTER/OPTIMIZE/REPAIR on transactional tables corrupt · a389ec0b
      unknown authored
      triggers".
      
      Applying ALTER/OPTIMIZE/REPAIR TABLE statements to transactional table or to
      table of any type on Windows caused disappearance of its triggers.
      Bug was introduced in 5.0.19 by my fix for bug #13525 "Rename table does not
      keep info of triggers" (see comment for sql_table.cc for more info).
      .
      
      
      mysql-test/r/trigger.result:
        Added test-case covering handling of triggers when one does ALTER TABLE which
        should move table to different database.
      mysql-test/t/trigger.test:
        Added test-case covering handling of triggers when one does ALTER TABLE which
        should move table to different database.
      sql/sql_table.cc:
        mysql_alter_table():
          Removal of strdup() which is no longer necessary allows us to preserve
          nice assumption that "(new_db != db || new_table != table_name) indicates
          that table will be renamed. So now we really can use this condition to
          avoid updating trigger definitions when table is not renamed.
          Note that we can't use (alter_info->flags & ALTER_RENAME) condition instead
          since it can be also true when we do "ALTER TABLE t1 RENAME TO t1".
      sql/sql_trigger.cc:
        Table_triggers_list::change_table_name():
          Mentioned assumption that subject table is not renamed to itself in method
          description. Added DBUG_ASSERT() to catch wrong usage of this method.
      mysql-test/r/trigger-trans.result:
        New BitKeeper file ``mysql-test/r/trigger-trans.result''
      mysql-test/t/trigger-trans.test:
        New BitKeeper file ``mysql-test/t/trigger-trans.test''
      a389ec0b
    • unknown's avatar
      Fix 'metaphon' function to correctly calculate the length of the returned string · 7c8acd59
      unknown authored
      
      sql/udf_example.cc:
        Calculate length of returned string correctly
      7c8acd59
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 72470a98
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      72470a98
    • unknown's avatar
      If doing write, then peeking is not needed · cebcd282
      unknown authored
      cebcd282
  2. 23 Mar, 2006 30 commits