1. 18 Oct, 2005 15 commits
  2. 17 Oct, 2005 25 commits
    • unknown's avatar
      0122ca60
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 49242dda
      unknown authored
      into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
      
      
      49242dda
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4ba953f5
      unknown authored
      into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
      
      
      4ba953f5
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 83c1adb4
      unknown authored
      into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1
      
      
      83c1adb4
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · cf584ced
      unknown authored
      into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1
      
      
      cf584ced
    • unknown's avatar
      BUG# 13052 Changed text in options to TIMESTAMP · 98b4390f
      unknown authored
      
      client/mysqldump.c:
        BUG# 13052 Changed text in option to TIMESTAMP
      98b4390f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 5727309d
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-bg12739
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      5727309d
    • unknown's avatar
      Fix for bug #12739 "Deadlock in multithreaded environment during creating/ · dd02b98d
      unknown authored
      droping trigger on InnoDB table".
      
      Deadlock occured in cases when we were trying to create two triggers for
      the same InnoDB table concurrently and both threads were able to reach
      close_cached_table() simultaneously. Bugfix implements new approach to
      table locking and table cache invalidation during creation/dropping
      of trigger.
      
      No testcase is supplied since bug was repeatable only under high concurrency.
      
      
      sql/mysql_priv.h:
        reopen_name_locked_table():
          Changed function signature to make it more robust against erroneous usage.
      sql/sql_base.cc:
        reopen_name_locked_table():
          Changed function signature to make it more robust against erroneous usage.
          Obtaining LOCK_open lock is now resposibility of caller.
          When searching for the table to open we should not prefer connection's current
          database over database which was explicitly specified in TABLE_LIST::db member
          (even if database is not explicitly specified for table in original query
          TABLE_LIST::db will be set properly at parsing stage).
          Fixed behavior of function in cases when error occurs during opening of table.
      sql/sql_table.cc:
        prepare_for_restore()/prepare_for_repair():
          We should not prefer connection's current database over database which was
          specified in TABLE_LIST::db member (even if database is not explicitly
          specified for table in original query TABLE_LIST::db will be set properly
          at parsing stage). Fixed behavior in unlikely case when we are unable
          to open table which we are restoring/reparing at the end of preparation
          stage.
      sql/sql_trigger.cc:
        mysql_create_or_drop_trigger():
          Now instead of opening and locking table, creating trigger, and then trying
          to invalidate all instances of this table in table cache, we obtain name
          lock on table first (thus ensuring that no other thread has this table
          open), open it, create trigger and then close table therefore releasing lock.
          New approach is more in line with other places where change .frm files
          (i.e. change table meta-data).
          With this change we also get rid of deadlock which occured in cases when we
          were trying to create two triggers for the same InnoDB table concurrently
          and both threads were able to reach close_cached_table() simultaneously.
          (Alternative was to forbid to InnoDB downgrade locks for CREATE/DROP
           TRIGGER statements in one way or another but I think that proposed
           solution is better long term).
      dd02b98d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 22af54a9
      unknown authored
      into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
      
      
      22af54a9
    • unknown's avatar
      BUG#13900 DATETIME data changes after inserting a new row in a InnoDB table · 955798d2
      unknown authored
      Applying patch from Marko.
      All tests pass in pentium-debug-max build on Linux.
      
      
      innobase/include/rem0rec.h:
        BUG#13900 DATETIME data changes after inserting a new row in a InnoDB table
        Applying patch from Marko.
      innobase/include/rem0rec.ic:
        BUG#13900 DATETIME data changes after inserting a new row in a InnoDB table
        Applying patch from Marko.
      innobase/row/row0upd.c:
        BUG#13900 DATETIME data changes after inserting a new row in a InnoDB table
        Applying patch from Marko.
      955798d2
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · dddc50f2
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      dddc50f2
    • unknown's avatar
      Bug #13377. Small update, code formatting. · c1a658cd
      unknown authored
      c1a658cd
    • unknown's avatar
      Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 · b63b06dc
      unknown authored
      into  selena.:H:/MYSQL/src/#13377-mysql-5.0
      
      
      mysql-test/include/check_var_limit.inc:
        Auto merged
      mysql-test/include/have_big5.inc:
        Auto merged
      mysql-test/include/have_compress.inc:
        Auto merged
      mysql-test/include/have_crypt.inc:
        Auto merged
      mysql-test/include/have_outfile.inc:
        Auto merged
      mysql-test/include/have_query_cache.inc:
        Auto merged
      mysql-test/include/have_tis620.inc:
        Auto merged
      mysql-test/include/have_ucs2.inc:
        Auto merged
      mysql-test/include/have_ujis.inc:
        Auto merged
      mysql-test/include/not_embedded.inc:
        Auto merged
      mysql-test/include/system_db_struct.inc:
        Auto merged
      mysql-test/include/test_outfile.inc:
        Auto merged
      mysql-test/r/greedy_optimizer.result:
        Auto merged
      mysql-test/r/index_merge.result:
        Auto merged
      mysql-test/r/index_merge_bdb.result:
        Auto merged
      mysql-test/r/index_merge_innodb.result:
        Auto merged
      mysql-test/r/index_merge_innodb2.result:
        Auto merged
      mysql-test/r/index_merge_ror.result:
        Auto merged
      mysql-test/r/index_merge_ror_cpk.result:
        Auto merged
      mysql-test/r/join_nested.result:
        Auto merged
      mysql-test/r/rowid_order_bdb.result:
        Auto merged
      mysql-test/r/rowid_order_innodb.result:
        Auto merged
      mysql-test/r/rpl_session_var.result:
        Auto merged
      mysql-test/r/sp-error.result:
        Auto merged
      mysql-test/r/sp-security.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/sum_distinct.result:
        Auto merged
      mysql-test/std_data/des_key_file:
        Auto merged
      mysql-test/std_data/init_file.dat:
        Auto merged
      mysql-test/std_data/loaddata1.dat:
        Auto merged
      mysql-test/std_data/loaddata2.dat:
        Auto merged
      mysql-test/std_data/loaddata3.dat:
        Auto merged
      mysql-test/std_data/loaddata4.dat:
        Auto merged
      mysql-test/std_data/rpl_loaddata.dat:
        Auto merged
      mysql-test/std_data/rpl_loaddata2.dat:
        Auto merged
      mysql-test/std_data/warnings_loaddata.dat:
        Auto merged
      mysql-test/t/greedy_optimizer.test:
        Auto merged
      mysql-test/t/index_merge.test:
        Auto merged
      mysql-test/t/index_merge_bdb.test:
        Auto merged
      mysql-test/t/index_merge_innodb.test:
        Auto merged
      mysql-test/t/index_merge_innodb2.test:
        Auto merged
      mysql-test/t/index_merge_ror.test:
        Auto merged
      mysql-test/t/index_merge_ror_cpk.test:
        Auto merged
      mysql-test/t/join_nested.test:
        Auto merged
      mysql-test/t/rowid_order_bdb.test:
        Auto merged
      mysql-test/t/rowid_order_innodb.test:
        Auto merged
      mysql-test/t/rpl_session_var.test:
        Auto merged
      mysql-test/t/sp-error.test:
        Auto merged
      mysql-test/t/sp-security.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/sum_distinct.test:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      b63b06dc
    • unknown's avatar
      Small update for #13377 patch · b1338c21
      unknown authored
      
      sql/log.cc:
        Small update to apply patch to *nix builds as well
      b1338c21
    • unknown's avatar
      Turn off EOLN_NATIVE for test files · 8c2edb46
      unknown authored
      
      mysql-test/include/check_var_limit.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_big5.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_compress.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_crypt.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_outfile.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_query_cache.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_tis620.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_ucs2.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/have_ujis.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/not_embedded.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/system_db_struct.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/include/test_outfile.inc:
        Turn off EOLN_NATIVE flag
      mysql-test/r/greedy_optimizer.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/index_merge.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/index_merge_bdb.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/index_merge_innodb.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/index_merge_innodb2.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/index_merge_ror.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/index_merge_ror_cpk.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/join_nested.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rowid_order_bdb.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rowid_order_innodb.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_session_var.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/sp-error.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/sp-security.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/sp.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/sum_distinct.result:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/des_key_file:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/init_file.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/loaddata1.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/loaddata2.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/loaddata3.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/loaddata4.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/rpl_loaddata.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/rpl_loaddata2.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/std_data/warnings_loaddata.dat:
        Turn off EOLN_NATIVE flag
      mysql-test/t/greedy_optimizer.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/index_merge.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/index_merge_bdb.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/index_merge_innodb.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/index_merge_innodb2.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/index_merge_ror.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/index_merge_ror_cpk.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/join_nested.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rowid_order_bdb.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rowid_order_innodb.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_session_var.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/sp-error.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/sp-security.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/sp.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/sum_distinct.test:
        Turn off EOLN_NATIVE flag
      8c2edb46
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · ad45b9a1
      unknown authored
      into  mysql.com:/home/pem/work/bug7049/mysql-5.0
      
      
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      ad45b9a1
    • unknown's avatar
      Additional fix for BUG#7049, after review. · c8a2ff6f
      unknown authored
      Make sure "select" aborts when finding a SP condition handler beyond the current scope.
      
      
      mysql-test/r/sp.result:
        Updated test results after fixing error handling in select.
      sql/mysqld.cc:
        Make sure "select" aborts when finding a SP condition handler beyond the current scope.
      sql/protocol.cc:
        Make sure "select" aborts when finding a SP condition handler beyond the current scope.
      sql/sp_rcontext.h:
        Added method for checking if the handler was found in the current context.
      sql/sql_error.cc:
        Make sure "select" aborts when finding a SP condition handler beyond the current scope.
      c8a2ff6f
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release · 40017c6f
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      40017c6f
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 · 06f10b7f
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      06f10b7f
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · d3d218c2
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      d3d218c2
    • unknown's avatar
      ndb - hugo · 1f844d35
      unknown authored
        Disable tests of lock upgrade paths that are currently unsupported
      
      
      ndb/test/ndbapi/testOperations.cpp:
        Disable lock upgrade paths that currently unsupported
      1f844d35
    • unknown's avatar
      Fix testDict -n FragmentTypeSingle T1 · f06c72f6
      unknown authored
      Init KeyDescriptor before sending to DIH, 
        make sure that its always inited
      
      
      f06c72f6
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0b7a0b85
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      0b7a0b85
    • unknown's avatar
      ndb - ndbapi testprogram bugfix · cb04d581
      unknown authored
        testBackup, fix assertion
      
      
      ndb/test/ndbapi/testBackup.cpp:
        Fetch table before verifying
      cb04d581
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.0-release · 8a92bba6
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      
      8a92bba6