1. 25 Aug, 2005 16 commits
    • unknown's avatar
      Merge fix · 1fe7e815
      unknown authored
      1fe7e815
    • unknown's avatar
      Merge fix · 32fdfc72
      unknown authored
      32fdfc72
    • unknown's avatar
      Manual merge 5.0 -> 5.1 after WL 2486 · 6eed2f98
      unknown authored
      6eed2f98
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5c0dc1ac
      unknown authored
      into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
      
      
      BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667:
        Auto merged
      BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387:
        Auto merged
      BitKeeper/deleted/.del-GrepInit.cpp~df28ab3a892455fd:
        Auto merged
      BitKeeper/deleted/.del-Makefile.am~f73be89578d3b6cc:
        Auto merged
      BitKeeper/deleted/.del-Makefile~b293ae88e4394490:
        Auto merged
      BitKeeper/deleted/.del-Makefile~e0b7d67078f0fae0:
        Auto merged
      BitKeeper/deleted/.del-grep_systab_test.cpp~c7305578bec8cb62:
        Auto merged
      BitKeeper/etc/config:
        Auto merged
      config/ac-macros/ha_ndbcluster.m4:
        Auto merged
      include/my_global.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      BitKeeper/deleted/.del-testGrep.cpp~2106eb0a6bf2a1b5:
        Auto merged
      mysql-test/r/alter_table.result:
        Auto merged
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/r/ps_6bdb.result:
        Auto merged
      mysql-test/r/ps_7ndb.result:
        Auto merged
      mysys/Makefile.am:
        Auto merged
      scripts/make_win_src_distribution.sh:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_berkeley.h:
        Auto merged
      sql/ha_heap.h:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_handler.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_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      storage/heap/hp_delete.c:
        Auto merged
      storage/innobase/btr/btr0pcur.c:
        Auto merged
      storage/innobase/btr/btr0sea.c:
        Auto merged
      storage/innobase/include/read0read.h:
        Auto merged
      storage/innobase/include/srv0srv.h:
        Auto merged
      storage/innobase/include/trx0trx.h:
        Auto merged
      storage/innobase/include/univ.i:
        Auto merged
      storage/innobase/lock/lock0lock.c:
        Auto merged
      storage/innobase/read/read0read.c:
        Auto merged
      storage/innobase/row/row0ins.c:
        Auto merged
      storage/innobase/row/row0sel.c:
        Auto merged
      storage/innobase/row/row0umod.c:
        Auto merged
      storage/innobase/row/row0upd.c:
        Auto merged
      storage/innobase/srv/srv0srv.c:
        Auto merged
      storage/innobase/srv/srv0start.c:
        Auto merged
      storage/innobase/trx/trx0trx.c:
        Auto merged
      storage/myisam/ft_boolean_search.c:
        Auto merged
      storage/myisam/myisampack.c:
        Auto merged
      storage/myisammrg/myrg_static.c:
        Auto merged
      storage/ndb/include/kernel/AttributeDescriptor.hpp:
        Auto merged
      storage/ndb/include/kernel/BlockNumbers.h:
        Auto merged
      storage/ndb/include/kernel/GlobalSignalNumbers.h:
        Auto merged
      storage/ndb/include/kernel/kernel_types.h:
        Auto merged
      storage/ndb/include/kernel/signaldata/AlterTable.hpp:
        Auto merged
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Auto merged
      storage/ndb/include/portlib/NdbTCP.h:
        Auto merged
      storage/ndb/src/common/debugger/BlockNames.cpp:
        Auto merged
      storage/ndb/src/common/logger/LogHandler.cpp:
        Auto merged
      storage/ndb/src/common/portlib/NdbTCP.cpp:
        Auto merged
      storage/ndb/src/common/portlib/win32/NdbTCP.c:
        Auto merged
      storage/ndb/src/common/transporter/TransporterRegistry.cpp:
        Auto merged
      storage/ndb/src/kernel/Makefile.am:
        Auto merged
      storage/ndb/src/kernel/SimBlockList.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/Makefile.am:
        Auto merged
      storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
        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/dbdict/printSchemaFile.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        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/Qmgr.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/suma/Suma.cpp:
        Auto merged
      storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
        Auto merged
      storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
        Auto merged
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      storage/ndb/src/ndbapi/DictCache.cpp:
        Auto merged
      storage/ndb/src/ndbapi/DictCache.hpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      storage/ndb/src/ndbapi/TransporterFacade.cpp:
        Auto merged
      storage/ndb/tools/Makefile.am:
        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
      VC++Files/sql/mysqld.dsp:
        Manual 5.0 - 5.1 merge
      configure.in:
        Manual 5.0 - 5.1 merge
      sql/mysql_priv.h:
        Manual 5.0 - 5.1 merge
      sql/share/errmsg.txt:
        Manual 5.0 - 5.1 merge
      sql/sql_base.cc:
        Manual 5.0 - 5.1 merge
      sql/sql_prepare.cc:
        Manual 5.0 - 5.1 merge
      storage/ndb/src/common/util/version.c:
        Manual 5.0 - 5.1 merge
      storage/ndb/src/kernel/blocks/dblqh/Makefile.am:
        Manual 5.0 - 5.1 merge
      5c0dc1ac
    • unknown's avatar
      config: · 7887d8b8
      unknown authored
        updated tomas default checkout
      
      
      BitKeeper/etc/config:
        updated tomas default checkout
      7887d8b8
    • unknown's avatar
      Make test predictable · 8bd9992e
      unknown authored
      
      mysql-test/r/information_schema.result:
        Ensure that rows are in given order
      mysql-test/t/information_schema.test:
        Ensure that rows are in given order
      8bd9992e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 95410549
      unknown authored
      into  mishka.mysql.com:/home/my/mysql-5.0
      
      
      95410549
    • unknown's avatar
      Merge lmy004.:/work/mysql-5.0-clean · b224e52c
      unknown authored
      into lmy004.:/work/mysql-5.0-bug12533-2
      
      
      mysql-test/r/view.result:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      b224e52c
    • unknown's avatar
      fix for bug #12533 (crash on DESCRIBE <view> after renaming base table column) · 750a0588
      unknown authored
      
      mysql-test/r/view.result:
        result of test for bug #12533
      mysql-test/t/view.test:
        test for bug #12533 (crash on DESCRIBE <view> after renaming base table column)
      sql/sql_show.cc:
        close thread tables even if process_table bails out
      750a0588
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 00c05c1e
      unknown authored
      into  mishka.local:/home/my/mysql-5.0
      
      
      configure.in:
        Auto merged
      00c05c1e
    • unknown's avatar
      After merge fixes · 5baa13ce
      unknown authored
      
      mysql-test/r/subselect2.result:
        After merge fix
      sql/handler.cc:
        Remove compiler warning
      sql/sql_acl.cc:
        After merge fix
      sql/sql_db.cc:
        After merge fix
      5baa13ce
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 · ea199d52
      unknown authored
      into lmy004.:/work/mysql-5.0-clean
      
      
      ea199d52
    • unknown's avatar
      Merge lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0-master · e56e1abe
      unknown authored
      into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0_5501
      
      
      mysql-test/r/information_schema.result:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      e56e1abe
    • unknown's avatar
      Merge mishka.local:/home/my/mysql-4.1 · 173e5df3
      unknown authored
      into  mishka.local:/home/my/mysql-5.0
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667:
        Auto merged
      BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387:
        Auto merged
      BitKeeper/deleted/.del-ctype_cp932.result:
        Auto merged
      BitKeeper/deleted/.del-ctype_cp932.test:
        Auto merged
      BitKeeper/deleted/.del-have_lowercase0.inc:
        Delete: mysql-test/include/have_lowercase0.inc
      VC++Files/mysql-test/mysql_test_run_new.dsp:
        Auto merged
      configure.in:
        Auto merged
      mysql-test/include/ps_conv.inc:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/examples/ha_archive.cc:
        Auto merged
      sql/examples/ha_example.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      VC++Files/client/mysqltest.dsp:
        manual merge
      VC++Files/sql/mysqld.dsp:
        manual merge
      mysql-test/r/grant2.result:
        patch merge
      mysql-test/r/subselect2.result:
        manual merge
      mysql-test/t/grant2.test:
        patch merge
      mysys/charset.c:
        Remove already deleted function
      sql/examples/ha_archive.h:
        Manual merge
      sql/sql_acl.cc:
        manual merge
      sql/sql_db.cc:
        merge (no differences)
      sql/sql_select.cc:
        manual merge
      sql/table.h:
        merge (no differences)
      tests/mysql_client_test.c:
        patch merge
      173e5df3
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 26d07cd0
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      26d07cd0
    • unknown's avatar
      Fix for building without --without-server, which was broken by fix · ae450d8a
      unknown authored
      for building with --without-server.
      
      
      configure.in:
        Re-add mysys to sql_server_dirs, so it is built before dbug.
      ae450d8a
  2. 24 Aug, 2005 24 commits