1. 05 Nov, 2005 8 commits
    • 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
  2. 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
  3. 03 Nov, 2005 26 commits