1. 30 Aug, 2006 1 commit
  2. 01 Aug, 2006 3 commits
  3. 31 Jul, 2006 3 commits
  4. 30 Jul, 2006 1 commit
  5. 29 Jul, 2006 2 commits
    • unknown's avatar
      Make innodb_flush_log_at_trx_commit a settable global variable. · bc2a948a
      unknown authored
      
      sql/ha_innodb.cc:
        Remove innobase_flush_log_at_trx_commit
        (set srv_flush_log_at_trx_commit directly).
      sql/ha_innodb.h:
        Remove innobase_flush_log_at_trx_commit.
        Declare srv_flush_log_at_trx_commit.
      sql/mysqld.cc:
        Bypass the innobase_flush_log_at_trx_commit variable.
      storage/innobase/include/srv0srv.h:
        Change the type of srv_flush_log_at_trx_commit.
      storage/innobase/srv/srv0srv.c:
        Change the type of srv_flush_log_at_trx_commit.
      bc2a948a
    • unknown's avatar
      Fix tests after merge and disable rpl_ndb_dd_advance due to bug 18679. · 98ceb853
      unknown authored
      
      mysql-test/r/date_formats.result:
        Fix results after merge
      mysql-test/r/mysqldump.result:
        Fix results after merge
      mysql-test/t/disabled.def:
        Add randomly-failing test with open bug
      mysql-test/t/mysqldump.test:
        Clean up test after merge and fix 'End of test' markers
      98ceb853
  6. 28 Jul, 2006 7 commits
    • unknown's avatar
      Make innodb_thread_concurrency 0 by default, and extend · 38688f37
      unknown authored
       the usable range to 0..1000 (0 disables the thread throttling).
      
      
      sql/mysqld.cc:
        innodb_thread_concurrency is 0..1000 now, and
         0 (the default) disables the thread throttling.
      38688f37
    • unknown's avatar
      Merge rama.(none):/home/jimw/my/tmp_merge · 80d4fa0a
      unknown authored
      into  rama.(none):/home/jimw/my/mysql-5.1-clean
      
      
      client/mysql.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      configure.in:
        Auto merged
      extra/yassl/include/openssl/ssl.h:
        Auto merged
      extra/yassl/include/yassl_int.hpp:
        Auto merged
      extra/yassl/src/ssl.cpp:
        Auto merged
      extra/yassl/src/template_instnt.cpp:
        Auto merged
      extra/yassl/src/yassl_imp.cpp:
        Auto merged
      extra/yassl/src/yassl_int.cpp:
        Auto merged
      include/mysql.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      libmysqld/embedded_priv.h:
        Auto merged
      BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      libmysqld/libmysqld.c:
        Auto merged
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/mysqldump-max.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      scripts/mysqld_safe.sh:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_string.h:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      sql/time.cc:
        Auto merged
      storage/myisam/mi_create.c:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      BitKeeper/deleted/.del-have_case_sensitive_file_system.inc:
        Delete: mysql-test/include/have_case_sensitive_file_system.inc
      BitKeeper/deleted/.del-case_sensitive_file_system.require:
        Delete: mysql-test/r/case_sensitive_file_system.require
      mysql-test/lib/mtr_cases.pl:
        Resolve conflict
      mysql-test/mysql-test-run.pl:
        Resolve conflict
      mysql-test/r/mysqldump.result:
        Resolve conflict
      mysql-test/t/mysqldump.test:
        Resolve conflict
      sql/sql_parse.cc:
        Resolve conflict
      80d4fa0a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 0e17c165
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      mysql-test/r/create_not_windows.result:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      0e17c165
    • unknown's avatar
      Add sql_locale.cc to cmake scripts. · a354bbba
      unknown authored
      a354bbba
    • unknown's avatar
      Removing temporary changes. · 0452244d
      unknown authored
      0452244d
    • unknown's avatar
      Removing temporary changes. · 7c6110d8
      unknown authored
      7c6110d8
    • unknown's avatar
      e804eb02
  7. 27 Jul, 2006 6 commits
  8. 26 Jul, 2006 17 commits
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/tmp_merge · ef256aea
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
        Auto merged
      BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0:
        Auto merged
      BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
        Auto merged
      BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
        Auto merged
      libmysqld/Makefile.am:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/r/view_grant.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      mysql-test/t/init_connect.test:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysql-test/t/view_grant.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_create.cc:
        Auto merged
      sql/item_create.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_udf.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      storage/ndb/include/kernel/GlobalSignalNumbers.h:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ndberror.c:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      mysql-test/r/federated.result:
        Use local.
      mysql-test/r/myisam.result:
        Manual merge.
      mysql-test/t/federated.test:
        Manual merge.
      mysql-test/t/myisam.test:
        Manual merge.
      sql/Makefile.am:
        Manual merge.
      sql/set_var.cc:
        Manual merge.
      sql/sql_parse.cc:
        Manual merge.
      sql/sql_update.cc:
        Manual merge.
      storage/myisam/mi_create.c:
        Manual merge.
      ef256aea
    • unknown's avatar
      Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my51 · f6d2231c
      unknown authored
      into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug14935
      
      
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/ERROR_codes.txt:
        manual
      f6d2231c
    • unknown's avatar
      ndb - bug#14935 - post-review · c7a75373
      unknown authored
      
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        bug#14935 - post-review
      storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
        bug#14935 - post-review
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        bug#14935 - post-review
      c7a75373
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 8a1692e1
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      sql/sql_table.cc:
        Auto merged
      8a1692e1
    • unknown's avatar
      Add support for valgrind with callgrind · 65e0db67
      unknown authored
      65e0db67
    • unknown's avatar
      Merge 192.168.0.20:mysql/my51-m-bug21039 · 6710ecdb
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
      
      6710ecdb
    • unknown's avatar
      Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060721184912|58688 · 04455dff
      unknown authored
      
      mysql-test/r/sp.result:
        Exclude
      mysql-test/t/sp.test:
        Exclude
      04455dff
    • unknown's avatar
      Disable rpl_insert due to bug#21297 · c68866a6
      unknown authored
      c68866a6
    • unknown's avatar
      Bug#21039 Transaction cache not flushed after SELECT CREATE · d47d675f
      unknown authored
       - Add prelocking for stored procedures that uses sp or sf
       - Update test result for sp_error(reported as bug#21294)
       - Make note about new error message from sp-error(bug#17244)
      
      
      mysql-test/r/sp-error.result:
        Update test result(reported as bug#21294)
      mysql-test/r/sp_notembedded.result:
        Update test result after disabling test case
      mysql-test/t/sp-error.test:
        Add note about the faulty error message
      mysql-test/t/sp_notembedded.test:
        Disable test case until bug#17244 has been fixed
      sql/sp.cc:
        Add prelocking for all stored procedures that uses another sp or sf
      sql/sp.h:
        Add prelocking for all stored procedures that uses another sp or sf
      sql/sql_base.cc:
        Add prelocking for all stored procedures that uses another sp or sf
      d47d675f
    • unknown's avatar
      Change mtr_error to mtr_warning allowing processing to continue when mysqld fails to start · eddde986
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Report warining when failure to start mysqld was detected, this will allow the testcase to continue executing.
        The failure to start mysqld will be caugt when executing mysqltest
      eddde986
    • unknown's avatar
      Disabled ndb_restore_compat for BUG#21283. · c5d677a3
      unknown authored
      c5d677a3
    • unknown's avatar
      Applied innodb-5.1-ss660 snapshot. · 731cf774
      unknown authored
       Changes in SQL parser:
       * Change default mode of SELECT from "lock in share mode"
         to "consistent read".
       * Remove support from SELECT for specifying "consistent read".
       * Add support in SELECT for specifying "lock in share mode".
       * Change all uses of SQL parser to specify "lock in share mode".
       * Modify syntax so that the only valid top-level statement is
         a procedure definition, since it's the only one that actually
         works.
       * Add support for lock waits.
      
      
      sql/ha_innodb.cc:
        Applied innodb-5.1-ss660 snapshot.
         Document better the "bool table_id" flag.
      storage/innobase/btr/btr0cur.c:
        Applied innodb-5.1-ss660 snapshot.
         btr_cur_search_to_nth_level(): Reacquire btr_search_latch after
         inserting to the insert buffer. This was noticed while analysing
         Bug#19801, but this should not fix this bug since, according to
         Heikki, btr_search_latch is not reserved during an insert.
      storage/innobase/configure.in:
        Applied innodb-5.1-ss660 snapshot.
         Add -Wpointer-arith to CFLAGS when using GCC.
      storage/innobase/data/data0type.c:
        Applied innodb-5.1-ss660 snapshot.
      storage/innobase/dict/dict0crea.c:
        Applied innodb-5.1-ss660 snapshot.
      storage/innobase/dict/dict0dict.c:
        Applied innodb-5.1-ss660 snapshot.
         Make dict_remove_db_name() non-static.
      storage/innobase/ibuf/ibuf0ibuf.c:
        Applied innodb-5.1-ss660 snapshot.
         ibuf_fixed_addr_page(): Add parameter space. As the insert buffer
         B-tree is only located in the system tablespace (space 0),
         IBUF_TREE_ROOT_PAGE_NO is only special in space 0.
      storage/innobase/include/data0type.h:
        Applied innodb-5.1-ss660 snapshot.
      storage/innobase/include/dict0dict.h:
        Applied innodb-5.1-ss660 snapshot.
         Make dict_remove_db_name() non-static.
      storage/innobase/include/pars0grm.h:
        Applied innodb-5.1-ss660 snapshot.
      storage/innobase/include/pars0pars.h:
        Applied innodb-5.1-ss660 snapshot.
      storage/innobase/include/que0que.h:
        Applied innodb-5.1-ss660 snapshot.
      storage/innobase/include/sync0rw.ic:
        Applied innodb-5.1-ss660 snapshot.
         rw_lock_s_unlock_func(): Change a debug assertion to a
         production assertion in order to track down Bug#19081.
      storage/innobase/include/trx0trx.h:
        Applied innodb-5.1-ss660 snapshot.
         trx_sig_send() always succeeds or asserts.
      storage/innobase/include/ut0ut.h:
        Applied innodb-5.1-ss660 snapshot.
         Document better the "bool table_id" flags.
      storage/innobase/mem/mem0mem.c:
        Applied innodb-5.1-ss660 snapshot.
      storage/innobase/pars/lexyy.c:
        Applied innodb-5.1-ss660 snapshot.
      storage/innobase/pars/pars0grm.c:
        Applied innodb-5.1-ss660 snapshot.
      storage/innobase/pars/pars0grm.h:
        Applied innodb-5.1-ss660 snapshot.
      storage/innobase/pars/pars0grm.y:
        Applied innodb-5.1-ss660 snapshot.
      storage/innobase/pars/pars0lex.l:
        Applied innodb-5.1-ss660 snapshot.
      storage/innobase/pars/pars0pars.c:
        Applied innodb-5.1-ss660 snapshot.
      storage/innobase/que/que0que.c:
        Applied innodb-5.1-ss660 snapshot.
      storage/innobase/row/row0mysql.c:
        Applied innodb-5.1-ss660 snapshot.
      storage/innobase/row/row0sel.c:
        Applied innodb-5.1-ss660 snapshot.
         * Disable prefetch and adaptive hash index for tables
           with rows over 1024 bytes in InnoDB's SQL parser.
         * row_sel_try_search_shortcut(): Do not return SEL_FOUND
           when the record was not found. This bug was introduced
           in MySQL/InnoDB 5.0.3, but luckily it should never
           manifest itself, given that existing InnoDB SQL code
           never makes use of consistent reads.
         * Don't take unnecesary locks on supremum records when the
           srv_locks_unsafe_for_binlog option is enabled. Fixes an
           assertion failure in the innodb_unsafe_binlog testcase
           when compiled with UNIV_DEBUG.
      storage/innobase/row/row0upd.c:
        Applied innodb-5.1-ss660 snapshot.
      storage/innobase/trx/trx0roll.c:
        Applied innodb-5.1-ss660 snapshot.
         trx_sig_send() always succeeds or asserts.
      storage/innobase/trx/trx0trx.c:
        Applied innodb-5.1-ss660 snapshot.
         trx_sig_send() always succeeds or asserts.
      storage/innobase/ut/ut0ut.c:
        Applied innodb-5.1-ss660 snapshot.
         Document better the "bool table_id" flags.
      731cf774
    • unknown's avatar
    • unknown's avatar
      Fix problem with detecting wheter im processes has shutdown cleanly · ef1ce168
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Fix problem with checking that all im processes has shutdown cleanly
        When it was detected that one of "im mysqlds" didn't shutdown, last was called to break the loop, but it only broke the inner loop.
        Remove the while(0) loop and make this easier by setting $clean_shutdown to 0 if any such problem is detected.
      ef1ce168
    • unknown's avatar
    • unknown's avatar
      Merge mysql.com:/home/alexi/innodb/mysql-5.0-work · 3f037796
      unknown authored
      into  mysql.com:/home/alexi/innodb/mysql-5.1-work
       Null merge.
      
      
      storage/innobase/btr/btr0cur.c:
        Null merge.
      storage/innobase/ibuf/ibuf0ibuf.c:
        Null merge.
      storage/innobase/include/sync0rw.ic:
        Null merge.
      3f037796
    • unknown's avatar
      Applied innodb-5.0-ss660 snapshot. · 1c65e1f7
      unknown authored
      
      innobase/btr/btr0cur.c:
        Applied innodb-5.0-ss660 snapshot.
         btr_cur_search_to_nth_level(): Reacquire btr_search_latch after
         inserting to the insert buffer. This was noticed while analyzing
         Bug#19081 but this shold not fix this bug since according to
         Heikki, btr_search_latch is not reserved during an insert.
      innobase/ibuf/ibuf0ibuf.c:
        Applied innodb-5.0-ss660 snapshot.
         ibuf_fixed_addr_page(): Add parameter space. As the insert buffer
         B-tree is only located in the system tablespace (space 0),
         IBUF_TREE_ROOT_PAGE_NO is only special in space 0.
      innobase/include/sync0rw.ic:
        Applied innodb-5.0-ss660 snapshot.
         rw_lock_s_unlock_func(): Change a debug assertion to a
         production assertion in order to track down Bug#19081.
      1c65e1f7