1. 07 Nov, 2005 3 commits
    • unknown's avatar
      corrected compile error in ndb · 9ea37cf2
      unknown authored
      9ea37cf2
    • unknown's avatar
      ndb - Fix problematic handling of TUP_ALLOC/DEALLOC REQ wrt varsize · 6be5f8a3
      unknown authored
          same row -
            prepare delete, prepare insert (with different size), commit delete, commit insert would lead to assertion
              as prepare insert didnt call handle_size_change_after_update
      
      
      6be5f8a3
    • unknown's avatar
      Import ndb varsize · ee740746
      unknown authored
      
      BitKeeper/deleted/.del-MetaData.cpp~146ae9865dd35829:
        Delete: storage/ndb/src/kernel/vm/MetaData.cpp
      BitKeeper/deleted/.del-MetaData.hpp~538342afcd8ac53c:
        Delete: storage/ndb/src/kernel/vm/MetaData.hpp
      BitKeeper/deleted/.del-DbtupLCP.cpp~855b1ed3fbc86a42:
        Delete: storage/ndb/src/kernel/blocks/dbtup/DbtupLCP.cpp
      BitKeeper/deleted/.del-DbtupSystemRestart.cpp~15b54d7e4e75d2d:
        Delete: storage/ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp
      BitKeeper/deleted/.del-DbtupUndoLog.cpp~5a2ef6e86b1404e9:
        Delete: storage/ndb/src/kernel/blocks/dbtup/DbtupUndoLog.cpp
      storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp:
        New BitKeeper file ``storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp''
      storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp:
        New BitKeeper file ``storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp''
      storage/ndb/include/kernel/signaldata/CreateObj.hpp:
        New BitKeeper file ``storage/ndb/include/kernel/signaldata/CreateObj.hpp''
      storage/ndb/include/kernel/signaldata/DictObjOp.hpp:
        New BitKeeper file ``storage/ndb/include/kernel/signaldata/DictObjOp.hpp''
      storage/ndb/include/kernel/signaldata/DropFilegroup.hpp:
        New BitKeeper file ``storage/ndb/include/kernel/signaldata/DropFilegroup.hpp''
      storage/ndb/include/kernel/signaldata/DropFilegroupImpl.hpp:
        New BitKeeper file ``storage/ndb/include/kernel/signaldata/DropFilegroupImpl.hpp''
      storage/ndb/include/kernel/signaldata/DropObj.hpp:
        New BitKeeper file ``storage/ndb/include/kernel/signaldata/DropObj.hpp''
      storage/ndb/include/kernel/signaldata/Extent.hpp:
        New BitKeeper file ``storage/ndb/include/kernel/signaldata/Extent.hpp''
      storage/ndb/include/kernel/signaldata/LgmanContinueB.hpp:
        New BitKeeper file ``storage/ndb/include/kernel/signaldata/LgmanContinueB.hpp''
      storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp:
        New BitKeeper file ``storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp''
      storage/ndb/include/kernel/signaldata/RestoreContinueB.hpp:
        New BitKeeper file ``storage/ndb/include/kernel/signaldata/RestoreContinueB.hpp''
      storage/ndb/include/kernel/signaldata/RestoreImpl.hpp:
        New BitKeeper file ``storage/ndb/include/kernel/signaldata/RestoreImpl.hpp''
      storage/ndb/include/kernel/signaldata/TsmanContinueB.hpp:
        New BitKeeper file ``storage/ndb/include/kernel/signaldata/TsmanContinueB.hpp''
      storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp:
        New BitKeeper file ``storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp''
      storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
        New BitKeeper file ``storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp''
      storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
        New BitKeeper file ``storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp''
      storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp:
        New BitKeeper file ``storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp''
      storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp:
        New BitKeeper file ``storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp''
      storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp:
        New BitKeeper file ``storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp''
      storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp:
        New BitKeeper file ``storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp''
      storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp:
        New BitKeeper file ``storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp''
      storage/ndb/src/kernel/blocks/diskpage.cpp:
        New BitKeeper file ``storage/ndb/src/kernel/blocks/diskpage.cpp''
      storage/ndb/src/kernel/blocks/diskpage.hpp:
        New BitKeeper file ``storage/ndb/src/kernel/blocks/diskpage.hpp''
      storage/ndb/src/kernel/blocks/lgman.cpp:
        New BitKeeper file ``storage/ndb/src/kernel/blocks/lgman.cpp''
      storage/ndb/src/kernel/blocks/lgman.hpp:
        New BitKeeper file ``storage/ndb/src/kernel/blocks/lgman.hpp''
      storage/ndb/src/kernel/blocks/pgman.cpp:
        New BitKeeper file ``storage/ndb/src/kernel/blocks/pgman.cpp''
      storage/ndb/src/kernel/blocks/pgman.hpp:
        New BitKeeper file ``storage/ndb/src/kernel/blocks/pgman.hpp''
      storage/ndb/src/kernel/blocks/print_file.cpp:
        New BitKeeper file ``storage/ndb/src/kernel/blocks/print_file.cpp''
      storage/ndb/src/kernel/blocks/restore.cpp:
        New BitKeeper file ``storage/ndb/src/kernel/blocks/restore.cpp''
      storage/ndb/src/kernel/blocks/restore.hpp:
        New BitKeeper file ``storage/ndb/src/kernel/blocks/restore.hpp''
      storage/ndb/src/kernel/blocks/tsman.cpp:
        New BitKeeper file ``storage/ndb/src/kernel/blocks/tsman.cpp''
      storage/ndb/src/kernel/blocks/tsman.hpp:
        New BitKeeper file ``storage/ndb/src/kernel/blocks/tsman.hpp''
      storage/ndb/src/kernel/vm/DLCFifoList.hpp:
        New BitKeeper file ``storage/ndb/src/kernel/vm/DLCFifoList.hpp''
      storage/ndb/src/kernel/vm/DLCHashTable.hpp:
        New BitKeeper file ``storage/ndb/src/kernel/vm/DLCHashTable.hpp''
      storage/ndb/src/kernel/vm/KeyTable2Ref.hpp:
        New BitKeeper file ``storage/ndb/src/kernel/vm/KeyTable2Ref.hpp''
      storage/ndb/src/kernel/vm/Rope.cpp:
        New BitKeeper file ``storage/ndb/src/kernel/vm/Rope.cpp''
      storage/ndb/src/kernel/vm/Rope.hpp:
        New BitKeeper file ``storage/ndb/src/kernel/vm/Rope.hpp''
      ee740746
  2. 06 Nov, 2005 12 commits
    • unknown's avatar
      init_db.sql: · 8a224ed8
      unknown authored
        Added system table 'mysql.plugin'
      
      
      mysql-test/lib/init_db.sql:
        Added system table 'mysql.plugin'
      8a224ed8
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 696d7fe4
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
      
      
      696d7fe4
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · df33aacd
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      df33aacd
    • unknown's avatar
      configure.in: · 7d3bb433
      unknown authored
        Changed back version to 5.1.2-alpha
      
      
      configure.in:
        Changed back version to 5.1.2-alpha
      7d3bb433
    • unknown's avatar
      monty review: fixes after reapplying plugin patch from "crashed" 5.1 tree · 3e550890
      unknown authored
      
      include/my_global.h:
        removed double commit of same code
      sql/mysqld.cc:
        monty review: moved initialiation of opt_plugin_dir_ptr
      sql/table.cc:
        monty review: reset key_info->flags after plugin_unlock in closefrm()
      3e550890
    • unknown's avatar
      NdbIndexStat.cpp, NdbIndexStat.hpp, Suma.hpp portability changes from pekka · 9979b037
      unknown authored
      
      storage/ndb/src/kernel/blocks/suma/Suma.hpp:
        Added a friend declaration to solve a HP-UX C++ scoping issue
      storage/ndb/include/ndbapi/NdbIndexStat.hpp:
        Pekka added forward declarations needed by several C++ compilers
      storage/ndb/src/ndbapi/NdbIndexStat.cpp:
        Get rid of an uninitialized
      9979b037
    • unknown's avatar
      WL#2575 - Fulltext: Parser plugin for FTS · 66002e45
      unknown authored
      WL#2763 - MySQL plugin interface: step 1
      Manual merge from CNET tree.
      
      
      include/ft_global.h:
        Default parser added.
      include/my_global.h:
        dlopen related code moved from sql_udf.cc into my_global.h
      include/myisam.h:
        Added fulltext parser to MI_KEYDEF
      libmysqld/Makefile.am:
        Added LIBDIR macro.
      mysql-test/r/connect.result:
        Test result fixed: added plugin table
      mysql-test/r/information_schema.result:
        Test result fixed: added plugin table.
      mysql-test/r/mysqlcheck.result:
        Test result fixed: added plugin table.
      mysql-test/r/system_mysql_db.result:
         Test fixed: added plugin table
      mysql-test/t/system_mysql_db_fix.test:
         Test fixed: added plugin table
      scripts/mysql_create_system_tables.sh:
        Added mysql.plugin table.
      scripts/mysql_fix_privilege_tables.sql:
        Added mysql.plugin table.
      sql/Makefile.am:
        Added LIBDIR macro.
      sql/ha_myisam.cc:
        Pass fulltext parser from sql to myisam layer.
      sql/lex.h:
        Plugin related symbols.
      sql/mysqld.cc:
        Initialize/deinitialize plugins, pass opt_plugin_dir.
        plugin-dir renamed to plugin_dir.
        plugin_dir is relative to mysql_home now.
      sql/set_var.cc:
        plugin_dir added to SHOW VARIABLES.
      sql/share/errmsg.txt:
        Plugin related error messages.
      sql/sql_class.h:
        Added parser to Key class.
        Hold parser_name instead of plugin in Key class.
      sql/sql_lex.h:
        INSTALL/UNINSTALL PLUGIN commands.
      sql/sql_parse.cc:
        INSTALL/UNINSTALL PLUGIN commands.
      sql/sql_show.cc:
        SHOW CREATE TABLE: output parser name if index was created WITH PARSER.
      sql/sql_table.cc:
        Pass fulltext parser from yacc to sql layer.
      sql/sql_udf.cc:
        dlopen related code moved into my_global.h.
        Implemented better check for UDF path.
        UDF loads libraries that are under plugin_dir now.
      sql/sql_yacc.yy:
        INSTALL/UNINSTALL PLUGIN syntax.
        Added WITH PARSER syntax to CREATE/ALTER TABLE/INDEX.
        opt_fulltext_parser must allocate memory, since it will be used afterwards.
      sql/table.cc:
        Save/restore fulltext parser in extra data segment.
        Added DBUG_PRINTs.
      storage/myisam/ft_boolean_search.c:
        Split functions so they can be used by fulltext parser.
        Use fulltext parser if specified.
      storage/myisam/ft_nlq_search.c:
        Use fulltext parser.
      storage/myisam/ft_parser.c:
        Split functions so they can be used by fulltext parser.
        Use fulltext parser if specified.
      storage/myisam/ft_static.c:
        Default fulltext parser added.
      storage/myisam/ft_update.c:
        Use fulltext parser.
      storage/myisam/ftdefs.h:
        FTB_PARAM moved into plugin.h and renamed to MYSQL_FTPARSER_BOOLEAN_INFO.
      storage/myisam/mi_open.c:
        Set default parser.
      66002e45
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 2bddb076
      unknown authored
      into ndbmaster.mysql.com:/home/ndbdev/tomas/mysql-5.1-new
      
      
      sql/handler.h:
        Auto merged
      2bddb076
    • unknown's avatar
      WL #528: Faster free_tmp_table · 89288fac
      unknown authored
      89288fac
    • unknown's avatar
      Reapplied portability changes, from changesets by kent, joerg and msvensson · dbfe5a96
      unknown authored
      
      mysys/base64.c:
        Portability change for SCO/HP, compiler don't like
        doing pointer arithmetic on void* variable
      include/my_bitmap.h:
        "inline" functions (especially in header files) should be declared "static",
        or else we may get "multiply defined" when they are used in several modules.
        (Solaris compiler problem)
      sql/handler.h:
        Compatibility change for AIX compiler
      storage/bdb/Makefile.in:
        Added bdb "sequence" directory to "make dist"
      cmd-line-utils/readline/complete.c:
        Avoid FreeBSD 5.3 problems including <sys/file.h>
      mysql-test/t/disabled.def:
        Disable compress.test for now
      storage/bdb/build_unix/.IGNORE_ME:
        File that is copied to prevent empty directories in source TAR
      dbfe5a96
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · efe3703a
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      efe3703a
    • unknown's avatar
      1. sys_variables[] array is removed. · d090acf3
      unknown authored
      2. All have_xxx variables are now selectable.
      
      
      sql/set_var.cc:
        1. sys_have_xxx variables added.
        2. Removed sys_var *sys_variables[] array as we don't need it any more.
        3. void set_var_init() changed to use sys_var_xxx chain insted of sys_variables[] array.
      sql/set_var.h:
        1. add_sys_var() method added to the sys_var class. It's called from constructors
        to chain all successor objects. The first one is stored in the 'static sys_var *first'.
        The total number of variables is in the 'static uint sys_vars'. Each sys_var successor object
        has the 'sys_var *next' pointer to the next one in the chain. 
        2. sys_var_have_variable class introduced to make all have_xxx variables selectable.
      sql/sql_lex.cc:
        trg_new_row_fake_var(0, 0) replaced with '(sys_var*) 0x01' as we don't want to have such fake variables in the sys_var_xxx chain.
      sql/sql_lex.h:
        Proper use of the changed trg_new_row_fake_var.
      sql/sql_yacc.yy:
        Proper use of the changed trg_new_row_fake_var.
      d090acf3
  3. 05 Nov, 2005 9 commits
    • unknown's avatar
      myisammrg.vcproj, myisam.vcproj, innobase.vcproj, heap.vcproj, bdb.vcproj: · 40bff5be
      unknown authored
        updated include directory after move to storage directory
      mysql.sln:
        updated locations of storage engines
      myisam.vcproj:
        Rename: VC++Files/myisam/myisam.vcproj -> VC++Files/storage/myisam/myisam.vcproj
      heap.vcproj:
        Rename: VC++Files/heap/heap.vcproj -> VC++Files/storage/heap/heap.vcproj
      innobase.vcproj:
        Rename: VC++Files/innobase/innobase.vcproj -> VC++Files/storage/innobase/innobase.vcproj
      myisammrg.vcproj:
        Rename: VC++Files/myisammrg/myisammrg.vcproj -> VC++Files/storage/myisammrg/myisammrg.vcproj
      bdb.vcproj:
        Rename: VC++Files/bdb/bdb.vcproj -> VC++Files/storage/bdb/bdb.vcproj
      
      
      VC++Files/mysql.sln:
        updated locations of storage engines
      VC++Files/storage/bdb/bdb.vcproj:
        updated include directory after move to storage directory
      VC++Files/storage/heap/heap.vcproj:
        updated include directory after move to storage directory
      VC++Files/storage/innobase/innobase.vcproj:
        updated include directory after move to storage directory
      VC++Files/storage/myisam/myisam.vcproj:
        updated include directory after move to storage directory
      VC++Files/storage/myisammrg/myisammrg.vcproj:
        updated include directory after move to storage directory
      40bff5be
    • unknown's avatar
      Ndb handler cleanup: · cf02f52c
      unknown authored
        - removed some returns on ndb internal error codes, return ndb cause in warnings
        - moved all errorcode mapping mysqld-ndb to ndberror.c
        - ndb util thread to discover all ndb tables at startup
        - ndb util thread to wait for mysqld startup
      
      
      cf02f52c
    • unknown's avatar
      ndb - · cff12b93
      unknown authored
          update test result for conflicting error codes
      
      
      cff12b93
    • unknown's avatar
      ndb - fix conflicting error codes · cca0ce5b
      unknown authored
      cca0ce5b
    • unknown's avatar
      ndb - test_event · e610dc13
      unknown authored
          Fix problem when creating shadow table
      
      
      e610dc13
    • unknown's avatar
      ndb - bug with index build of unique index with 32 attributes · 854ff21d
      unknown authored
           since NDB$FRAGMENT is automatically added, there was a over run in the struct
      
      
      storage/ndb/include/kernel/AttributeList.hpp:
        Fix unique index with 32 attributes
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Fix unique index with 32 attributes
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Fix unique index with 32 attributes
      854ff21d
    • unknown's avatar
      Fixed results in test result · 3d7e31f9
      unknown authored
      3d7e31f9
    • unknown's avatar
      Added inclusion of dlfcn.h from old 5.1 tree · 88699f5e
      unknown authored
      88699f5e
    • unknown's avatar
      Fix of crashed 5.1 tree (wrong merge + wrong pullout patch forced us to create a new 5.1 tree) · 9314a207
      unknown authored
      This is a merge of 5.0 -> 5.1 + some code from old 5.1 tree to get all tests to work and keep the .frm format the same as the old 5.1 tree.
      
      
      BitKeeper/etc/ignore:
        added libmysqld/sql_plugin.cc
      include/Makefile.am:
        Added plugin.hd
      include/m_ctype.h:
        Added my_strchr
      include/my_base.h:
        Added HA_USES_PARSER
        Merge with old 5.1 tree
      libmysqld/Makefile.am:
        Added sql_plugin.cc
      mysql-test/r/ndb_gis.result:
        Fixed results after merge
      sql/Makefile.am:
        Addes sql_plugin.h and sql_plugin.cc
      sql/ha_heap.h:
        Indentation fix
      sql/ha_partition.cc:
        Made partition_hton visible outside
        After merge fixes (for call to get_new_handler)
      sql/handler.cc:
        Added partition_hton to handlerton
      sql/handler.h:
        Added partion to handlerton
        Updated mysql_unpack_partion() from old 5.1 tree
      sql/mysql_priv.h:
        Added sql_plugin.h
      sql/records.cc:
        After merge fix
      sql/share/errmsg.txt:
        Added new errors messages from old 5.1 tree
      sql/sql_partition.cc:
        Removed compiler warnings
        Updated mysql_unpack_partition() from latest 5.1 tree
      sql/structs.h:
        Update KEY from latest 5.1 tree (to get table.cc to compile)
      sql/table.cc:
        Merged .frm format from 5.0, new 5.1 and old 5.1 tree
        (We now use same format as the old 5.1 tree)
        Note that this patch includes code for HA_USE_PARSER which is not usable until rest of 5.1 tree is restored
      sql/unireg.cc:
        Merged .frm format from 5.0, new 5.1 and old 5.1 tree
        (We now use same format as the old 5.1 tree)
        Note that this patch includes code for HA_USE_PARSER which is not usable until rest of 5.1 tree is restored
      strings/Makefile.am:
        Added my_strchr.c
      include/plugin.h:
        New BitKeeper file ``include/plugin.h''
      sql/sql_plugin.cc:
        New BitKeeper file ``sql/sql_plugin.cc''
      sql/sql_plugin.h:
        New BitKeeper file ``sql/sql_plugin.h''
      strings/my_strchr.c:
        New BitKeeper file ``strings/my_strchr.c''
      9314a207
  4. 04 Nov, 2005 6 commits
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-5.0 · 2361720c
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      BUILD/FINISH.sh:
        Auto merged
      BitKeeper/deleted/.del-makefilewin.i~5c8479dcb8a455b2:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~13888739357b3025:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~14f24a4a173e2fcd:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~15e9e5c9e8fa870b:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~1c53f31b88dd36e:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~1dbc058d76ebf1db:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~2e0407fe123f8365:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~2fc379bd4065c995:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~389ee2dcf79afb79:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~4d139e182457e553:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~5104767c73775697:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~608ed49dcd88e0f7:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~63acd666293282a:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~6ba64863bce3d0b8:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~72a64128bacce71b:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~78000390c783b1c5:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~7a9d7d5a42bbfaf5:
        Auto merged
      Makefile.am:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~a40ea12eebdd6ef0:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~aeea7c82f21f7cf5:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~b643e38d8da389ac:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~c7b621c745e5de95:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~c8273a47b90f52bb:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~d1a9d1f7d33fcb73:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~d37b6b303348c871:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~d90f35fdc3f2ee5f:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~dc4b8ad5ea53bd:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~dea10ec1c94f7be:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~ef3a208fa0e9b0db:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~f1e3b890aa1c9ea3:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~f4b7b99a887b7de:
        Auto merged
      BitKeeper/deleted/.del-makefilewin~fdda94ad32fa9e34:
        Auto merged
      BitKeeper/deleted/.del-my_cnf~977f69858affc57b:
        Auto merged
      BitKeeper/etc/config:
        Auto merged
      VC++Files/libmysqld/libmysqld.dsp:
        Auto merged
      VC++Files/sql/mysqld.dsp:
        Auto merged
      client/mysqltest.c:
        Auto merged
      include/Makefile.am:
        Auto merged
      include/base64.h:
        Auto merged
      include/my_base.h:
        Auto merged
      include/mysql_com.h:
        Auto merged
      libmysqld/Makefile.am:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/ndb_basic.result:
        Auto merged
      mysql-test/r/ndb_condition_pushdown.result:
        Auto merged
      mysql-test/t/alter_table.test:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysys/Makefile.am:
        Auto merged
      mysys/base64.c:
        Auto merged
      scripts/make_win_src_distribution.sh:
        Auto merged
      scripts/mysql_create_system_tables.sh:
        Auto merged
      scripts/mysql_fix_privilege_tables.sql:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_berkeley.h:
        Auto merged
      sql/ha_federated.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/slave.h:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_help.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.h:
        Auto merged
      storage/heap/_check.c:
        Auto merged
      storage/heap/hp_create.c:
        Auto merged
      storage/innobase/include/Makefile.am:
        Auto merged
      storage/innobase/include/rem0rec.h:
        Auto merged
      storage/innobase/include/rem0rec.ic:
        Auto merged
      storage/innobase/row/row0ins.c:
        Auto merged
      storage/innobase/row/row0upd.c:
        Auto merged
      storage/myisam/mi_check.c:
        Auto merged
      storage/myisam/mi_delete.c:
        Auto merged
      storage/myisam/mi_rkey.c:
        Auto merged
      storage/myisam/mi_rnext_same.c:
        Auto merged
      storage/myisam/mi_search.c:
        Auto merged
      storage/myisam/mi_write.c:
        Auto merged
      storage/myisam/myisamchk.c:
        Auto merged
      storage/myisam/myisamdef.h:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      storage/myisammrg/myrg_queue.c:
        Auto merged
      storage/ndb/config/type_util.mk.am:
        Auto merged
      storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
        Auto merged
      storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
        Auto merged
      storage/ndb/include/mgmapi/ndbd_exit_codes.h:
        Auto merged
      storage/ndb/include/transporter/TransporterCallback.hpp:
        Auto merged
      storage/ndb/src/common/mgmcommon/IPCConfig.cpp:
        Auto merged
      storage/ndb/src/common/transporter/SHM_Transporter.cpp:
        Auto merged
      storage/ndb/src/common/transporter/SHM_Transporter.hpp:
        Auto merged
      storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp:
        Auto merged
      storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp:
        Auto merged
      storage/ndb/src/common/transporter/Transporter.hpp:
        Auto merged
      storage/ndb/src/common/transporter/TransporterRegistry.cpp:
        Auto merged
      storage/ndb/src/common/util/Makefile.am:
        Auto merged
      storage/ndb/src/common/util/Parser.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Auto merged
      storage/ndb/src/kernel/error/ndbd_exit_codes.c:
        Auto merged
      storage/ndb/src/kernel/vm/FastScheduler.cpp:
        Auto merged
      storage/ndb/src/kernel/vm/TransporterCallback.cpp:
        Auto merged
      storage/ndb/src/kernel/vm/VMSignal.hpp:
        Auto merged
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/InitConfigFileParser.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/ndbapi/TransporterFacade.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testBackup.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testOperations.cpp:
        Auto merged
      storage/ndb/test/src/HugoCalculator.cpp:
        Auto merged
      storage/ndb/tools/ndb_condig.cpp:
        Auto merged
      strings/ctype-big5.c:
        Auto merged
      strings/ctype-ucs2.c:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      BUILD/SETUP.sh:
        manual merge
      configure.in:
        manual merge
      mysql-test/r/alter_table.result:
        manual merge
      sql/handler.cc:
        manual merge
      sql/mysql_priv.h:
        manual merge
      sql/records.cc:
        manual merge
      sql/share/errmsg.txt:
        manual merge
      sql/sql_table.cc:
        manual merge
        Fix labels
      sql/sql_update.cc:
        manual merge
      sql/table.cc:
        manual merge
      sql/unireg.cc:
        manual merge
      storage/ndb/config/type_ndbapi.mk.am:
        manual merge
      2361720c
    • unknown's avatar
      Reorder struct elements to be more optimal for 64 bit computers · d4a7867a
      unknown authored
      (Main reason for reordering was to get rid of compiler warnings for order of element initialization)
      
      
      sql/log.cc:
        Remove compiler warning
      sql/sql_class.h:
        Reorder MYSQL_LOG struct elements to be more optimal for 64 bit computers
        (Main reason for reordering was to get rid of compiler warnings for order of element initialization)
      d4a7867a
    • unknown's avatar
      Merge monty@192.168.0.9:/my/mysql-5.0 · 29e07bcb
      unknown authored
      into  mysql.com:/my/mysql-5.0
      
      
      29e07bcb
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4e60227f
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      sql/mysqld.cc:
        Auto merged
      4e60227f
    • unknown's avatar
      DROP created procedures · 5dcd44e3
      unknown authored
      (Caused sp-security to fail)
      
      
      5dcd44e3
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-9815 · 71898b3e
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      71898b3e
  5. 03 Nov, 2005 10 commits