1. 06 Feb, 2006 6 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 8edf166a
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
      
      
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      8edf166a
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · d54712d2
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      d54712d2
    • unknown's avatar
      bug#13966 - ndb · 6e7adf7c
      unknown authored
        better error message on invalid config change
      
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        fix typo
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Change error message...note that this is a guess
      6e7adf7c
    • unknown's avatar
      bug#13965 · 42cb2c60
      unknown authored
        ndb - error while restarting in dict
              improve error message when changed config leads to failed restart
      
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        improve error message
      42cb2c60
    • unknown's avatar
      bug#16873 - · 53d9303f
      unknown authored
        Print creating of dd objects during ndb_restore
      
      
      storage/ndb/tools/restore/consumer_restore.cpp:
        Print creating of dd objects
      53d9303f
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · c56af3aa
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
      
      c56af3aa
  2. 05 Feb, 2006 4 commits
    • unknown's avatar
      ndb - TUP scan: unlock outstanding locks on scan close (lost+found patch) · fc1d926c
      unknown authored
      
      storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
        unlock outstanding locks on scan close
      fc1d926c
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 676a9d68
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51
      
      676a9d68
    • unknown's avatar
      ndb - rbr blobs works now (or again) · 13a5adc9
      unknown authored
      
      mysql-test/t/disabled.def:
        ndb_blob.test works again, sort of
      storage/ndb/include/ndbapi/NdbBlob.hpp:
        better getNull & replace+tinyblob forward-patch from 5.0
      storage/ndb/src/ndbapi/NdbBlob.cpp:
        better getNull & replace+tinyblob forward-patch from 5.0
      storage/ndb/test/ndbapi/test_event.cpp:
        getEvent()->getTable()
      sql/ha_ndbcluster.cc:
        return more error codes from blob calls
      sql/ha_ndbcluster_binlog.cc:
        return more error codes from blob calls
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        return more error codes from blob calls
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        copy and invalidate blob tables as part of main table.  TODO: do not cache blob tables
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        copy and invalidate blob tables as part of main table.  TODO: do not cache blob tables
      13a5adc9
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 89d6552b
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
      
      
      configure.in:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      89d6552b
  3. 04 Feb, 2006 1 commit
  4. 03 Feb, 2006 3 commits
    • unknown's avatar
      A post-merge fix. · 5e724324
      unknown authored
      5e724324
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · bf56afcc
      unknown authored
      into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
      
      
      sql/field.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      bf56afcc
    • unknown's avatar
      Merge mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1.6-release-15588 · 3d24236a
      unknown authored
      into  mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1-tree
      
      The idea of this merge is to "synchronize" 5.1-release tree (5.1.6) and
      the main 5.1 tree. A patch for BUG#15588/BUG#16621 was copied into
      5.1-release from 5.0 since it is important. This patch is expected to
      come into the 5.1 tree after resolving 5.0 -> 5.1 megrge logjam.
      
      
      storage/example/ha_example.cc:
        Auto merged
      sql/field.cc:
        Ignore changes in 5.1-release (5.1.6).
      sql/sp_head.cc:
        Ignore changes in 5.1-release (5.1.6).
      3d24236a
  5. 02 Feb, 2006 26 commits
    • unknown's avatar
      Copied patch for BUG#15588 (BUG#16621) from 5.0 into 5.1-release. · f0c0b0bf
      unknown authored
      
      sql/field.cc:
        Use memmove() instead of memcpy() -- after implementation of WL#2984
        (Make stored routine variables work according to the standard) it is
        possible to store in the field the value from this field. For instance,
        this can happen for the following statement:
          SET sp_var = SUBSTR(sp_var, 1, 3);
      sql/sp_head.cc:
        Work correctly with String:
        - String length has to be be reset before use;
        - qs_append() does not allocate memory, so the memory should
          be reserved beforehand.
      f0c0b0bf
    • unknown's avatar
      Merge mysql.com:/home/kostja/mysql/tmp_merge · 630ae29c
      unknown authored
      into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
      
      
      BitKeeper/etc/ignore:
        auto-union
      configure.in:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/ndb/ndbcluster.sh:
        Auto merged
      mysql-test/r/rpl_sp.result:
        Auto merged
      mysql-test/r/sp-error.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/type_float.result:
        Auto merged
      mysql-test/t/rpl_sp.test:
        Auto merged
      mysql-test/t/sp-error.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      storage/myisam/ft_update.c:
        Auto merged
      storage/ndb/include/logger/LogHandler.hpp:
        Auto merged
      storage/ndb/include/logger/Logger.hpp:
        Auto merged
      storage/ndb/include/mgmapi/mgmapi.h:
        Auto merged
      storage/ndb/include/mgmcommon/ConfigRetriever.hpp:
        Auto merged
      storage/ndb/src/common/logger/FileLogHandler.cpp:
        Auto merged
      storage/ndb/src/common/logger/LogHandler.cpp:
        Auto merged
      storage/ndb/src/common/logger/Logger.cpp:
        Auto merged
      storage/ndb/src/common/logger/SysLogHandler.cpp:
        Auto merged
      storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        Auto merged
      storage/ndb/src/common/util/SocketServer.cpp:
        Auto merged
      storage/ndb/src/kernel/main.cpp:
        Auto merged
      storage/ndb/src/kernel/vm/Configuration.cpp:
        Auto merged
      storage/ndb/src/kernel/vm/Configuration.hpp:
        Auto merged
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      storage/ndb/src/mgmclient/CommandInterpreter.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
        Auto merged
      storage/ndb/src/mgmsrv/Services.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/Services.hpp:
        Auto merged
      storage/ndb/src/mgmsrv/main.cpp:
        Auto merged
      storage/ndb/tools/ndb_size.pl:
        Auto merged
      zlib/Makefile.am:
        Auto merged
      mysql-test/r/information_schema.result:
        SCCS merged
      mysql-test/t/information_schema.test:
        Manual merge.
      sql/ha_archive.cc:
        Manual merge.
      sql/share/errmsg.txt:
        SCCS merged
      tests/mysql_client_test.c:
        Manual merge.
      630ae29c
    • unknown's avatar
      Merge mysql.com:/home/dlenev/src/mysql-5.1-bfix · 6c34cbca
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.1-merges
      
      
      mysql-test/t/disabled.def:
        SCCS merged
      6c34cbca
    • unknown's avatar
      storage/example/ha_example.cc · 5325471e
      unknown authored
          Copied from the general tree, to solve a build problem:
          ChangeSet 1.2121.1.5 2006/02/02 11:02:09 stewart@mysql.com
            build fix when building with example storage engine.
      
      
      storage/example/ha_example.cc:
        Copied from the general tree, to solve a build problem:
        ChangeSet 1.2121.1.5 2006/02/02 11:02:09 stewart@mysql.com
          build fix when building with example storage engine.
      5325471e
    • unknown's avatar
      Merge bk://localhost:6667 · 3e6ccec8
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
      
      3e6ccec8
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0cde82d5
      unknown authored
      into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
      
      
      client/mysqldump.c:
        Auto merged
      0cde82d5
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6acb54cb
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
      
      6acb54cb
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 12c8c091
      unknown authored
      into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new
      
      12c8c091
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new · 5499e422
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql51
      
      
      mysql-test/t/disabled.def:
        Auto merged
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      5499e422
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · a95d92f8
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql51
      
      a95d92f8
    • unknown's avatar
      added more logging in ndb handler · aca168aa
      unknown authored
          enable extra logging in ndb handler during test runs
      
      
      mysql-test/mysql-test-run.pl:
        enable extra logging in ndb handler during test runs
      sql/ha_ndbcluster_binlog.cc:
        added more logging in ndb handler
      aca168aa
    • unknown's avatar
      0321006e
    • unknown's avatar
      disbled sporadically failing testcase · 10b73938
      unknown authored
      10b73938
    • unknown's avatar
      Several Netware specific fixes. · bb4d2354
      unknown authored
      
      configure.in:
        To configure InnoDB for cross compilation.
      include/config-netware.h:
        NetWare specific change to fix the compilation errors caused by event.h
        NetWare specific change required for WINE PATH and for new versions LibC(Jun 05)
        and zlib(1.2.3)
      netware/BUILD/compile-AUTOTOOLS:
        Netware specific change reflecting the change in source code
        directory structure.
      netware/BUILD/compile-linux-tools:
        Netware specific change to fix the location where gen_lex_hash
        gets created. Fixed also directory structure reflecting changes.
      netware/BUILD/compile-netware-END:
        Netware specific change for creating mysqld_error.h
      netware/BUILD/mwenv:
        Netware specific change required for WINE PATH and for
        new versions LibC(Jun 05) and zlib(1.2.3).
      netware/BUILD/nwbootstrap:
        NetWare Specific change to produce absoulte path for XDC file.
      netware/Makefile.am:
        Netware specific changes to fix to match new
        directory structure.
      netware/my_manage.h:
        Netware specific change required for WINE PATH and for new versions
        LibC(Jun 05) and zlib(1.2.3).
      netware/mysql_test_run.c:
        Netware specific change, added --autoclose option for mysql_test_run.nlm.
      scripts/make_binary_distribution.sh:
        Fix to reflect change in directory structure.
      sql/mysqld.cc:
        Stacksize change for Netware.
        Netware specific change to fix the compilation errors caused by event.h
      sql/set_var.cc:
        Minor indending related fix.
      sql/sql_class.cc:
        Added #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION macro.
      storage/innobase/os/os0thread.c:
        Netware specific change to increase the thread stack size.
      storage/myisam/mi_locking.c:
        Enclosed MMAP related code under HAVE_MMAP preprocessor directive.
      bb4d2354
    • unknown's avatar
      Merge mysql.com:/home/kostja/mysql/tmp_merge1 · c64e7e10
      unknown authored
      into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
      
      
      mysql-test/r/innodb.result:
        Manual merge: null merge, use local.
      mysql-test/t/innodb.test:
        Manual merge: null merge, use local.
      sql/ha_innodb.cc:
        Manual merge: null merge, use local.
      sql/ha_innodb.h:
        Manual merge: null merge, use local.
      sql/mysqld.cc:
        Manual merge: null merge, use local.
      sql/set_var.cc:
        Manual merge: null merge, use local.
      storage/innobase/include/srv0srv.h:
        Manual merge: null merge, use local.
      storage/innobase/srv/srv0srv.c:
        Manual merge: null merge, use local.
      c64e7e10
    • unknown's avatar
      Merge mysql.com:/home/kostja/mysql/tmp_merge · 8932b4ac
      unknown authored
      into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
      
      
      client/mysqlbinlog.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      include/my_base.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      sql/field.h:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/opt_range.h:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/slave.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_help.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_test.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/myisam/mi_delete.c:
        Auto merged
      storage/myisam/myisampack.c:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      mysys/my_bitmap.c:
        Manual merge
      sql/field.cc:
        e
        Manual merge
      sql/item.cc:
        Manual merge (new Field_bit_as_char constructor signature)
      sql/item_func.cc:
        Manual merge: use local
      sql/sql_insert.cc:
        Manual merge: add VOID() around bitmap_init
      8932b4ac
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 477e46e0
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
      
      477e46e0
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.1-release/ · dc354ec8
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.1-bfix
      
      dc354ec8
    • unknown's avatar
      Yet another addition to the fix for BUG#9412 "Triggers: should have trigger · b7089166
      unknown authored
      privilege".
      
      Corrected addition of TRIGGER privilege by "mysql_fix_privilege_tables" script.
      Problem with it should have been caught by system_mysql_db/system_mysql_db_fix
      tests but they were disabled. Enabled them back.
      
      
      mysql-test/r/system_mysql_db.result:
        Updated test results after addition of TRIGGER privilege.
      mysql-test/t/disabled.def:
        Enabled back test system_mysql_db/system_mysql_db_fix tests.
      scripts/mysql_fix_privilege_tables.sql:
        Corrected addition of TRIGGER privilege.
      b7089166
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-release · e24b662d
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql51
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      e24b662d
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6519ebab
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql51
      
      6519ebab
    • unknown's avatar
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e3a947b6
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
      
      e3a947b6
    • unknown's avatar
      Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge · 5a3c3045
      unknown authored
      into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/r/alter_table.result:
        Auto merged
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/sp-error.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/type_decimal.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/r/view_grant.result:
        Auto merged
      mysql-test/t/alter_table.test:
        Auto merged
      mysql-test/t/create.test:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      mysql-test/mysql-test-run.pl:
        SCCS merged
      sql/sql_yacc.yy:
        Manual merge: resolve the conflict with moved sp_if rule
      5a3c3045
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f61c2323
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.1/new
      
      f61c2323
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · cc853bc8
      unknown authored
      into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge
      
      cc853bc8