1. 22 Jul, 2005 1 commit
  2. 21 Jul, 2005 39 commits
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1f7389cd
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      
      1f7389cd
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.0-release · 02f2ea3e
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      
      02f2ea3e
    • unknown's avatar
      Post-review fixes for WL#2713 "Change IM behaviour so, that it only reads and... · a38f5cd5
      unknown authored
      Post-review fixes for WL#2713 "Change IM behaviour so, that it only reads and alters one config file only."
      
      
      server-tools/instance-manager/commands.cc:
        get rid of single_defaults_file_option and use Options::config_file instead
      server-tools/instance-manager/commands.h:
        get rid of single_defaults_file_option and use Options::config_file instead
      server-tools/instance-manager/instance_map.cc:
        get rid of single_defaults_file_option and use Options::config_file instead
      server-tools/instance-manager/instance_map.h:
        get rid of single_defaults_file_option and use Options::config_file instead
      server-tools/instance-manager/manager.cc:
        get rid of single_defaults_file_option and use Options::config_file instead
      server-tools/instance-manager/options.cc:
        Disable --defaults-extra-file and --no-defaults options for the IM as they have no sence. 
        Don't use print_defaults as it prints out wrong "first option" information for IM. Use only
        Options::config_file to process options
      server-tools/instance-manager/options.h:
        get rid of single_defaults_file_option and use Options::config_file instead
      a38f5cd5
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · f653a686
      unknown authored
      into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
      
      
      f653a686
    • unknown's avatar
      sync0sync.c, sync0sync.h: · 98f8091d
      unknown authored
        Declare 'mutex_list' and 'mutex_list_mutex' extern,
        to avoid link error on OS X and gcc flag "-fno-common"
      
      
      innobase/include/sync0sync.h:
        Use 'extern' variable declarations, to avoid
        "ld: multiple definitions of symbol" for 'mutex_list'
        and 'mutex_list_mutex' on OS X and gcc flag "-fno-common"
      innobase/sync/sync0sync.c:
        Use 'extern' variable declarations, to avoid
        "ld: multiple definitions of symbol" for 'mutex_list'
        and 'mutex_list_mutex' on OS X and gcc flag "-fno-common"
      98f8091d
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0821e118
      unknown authored
      into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
      
      
      scripts/Makefile.am:
        Auto merged
      storage/myisam/mi_create.c:
        Auto merged
      0821e118
    • unknown's avatar
      merge fix · 482cf550
      unknown authored
      482cf550
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · 4ca63ea4
      unknown authored
      into mysql.com:/home/gluh/MySQL/Merge/5.0
      
      
      sql/share/charsets/Index.xml:
        Auto merged
      strings/ctype-latin1.c:
        Auto merged
      4ca63ea4
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 · 0f6030b1
      unknown authored
      into mysql.com:/M51/mysql-5.1
      
      
      configure.in:
        Auto merged
      0f6030b1
    • unknown's avatar
      40d895d8
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · b5487d1a
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b11216
      
      
      b5487d1a
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4ad99802
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.10839
      
      
      4ad99802
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 824f512e
      unknown authored
      into  mysql.com:/home/jonas/src/mysql-4.1-push
      
      
      824f512e
    • unknown's avatar
      ctype-latin1.c: · 84904fbb
      unknown authored
        removing extra empty line
        ,
      
      
      strings/ctype-latin1.c:
        removing extra empty line
        ,
      84904fbb
    • unknown's avatar
      Bug#11216: 'show character set' describes latin1 incorrectly · e5c4a3e1
      unknown authored
      Index.xml:
        Fixing latin1 comment:
        it is actually cp1252, not iso-8859-1
      ctype_latin1.result:
        changeing test results accordingly.
      ctype-latin1.c:
        Fixed to- and from-Unicode conversion maps
        for better Unicode round trip of undefined
        characters.
      
      
      
      strings/ctype-latin1.c:
        Bug#11216: 'show character set' describes latin1 incorrectly
        Fixed to- and from-Unicode conversion maps.
      mysql-test/r/ctype_latin1.result:
        changeing test results accordingly.
      sql/share/charsets/Index.xml:
        Fixing comment: iso-8859-1 -> cp1252
      e5c4a3e1
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · f3174388
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.10839
      
      
      f3174388
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · dca732f1
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      
      dca732f1
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5805fd26
      unknown authored
      into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      storage/ndb/include/kernel/signaldata/AlterTable.hpp:
        Auto merged
      storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
        Auto merged
      storage/ndb/include/kernel/signaldata/DropTable.hpp:
        Auto merged
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/backup/Backup.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/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ndberror.c:
        Auto merged
      storage/ndb/test/include/HugoOperations.hpp:
        Auto merged
      storage/ndb/test/ndbapi/testBackup.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testBlobs.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testNdbApi.cpp:
        Auto merged
      storage/ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      storage/ndb/test/run-test/ndb-autotest.sh:
        Auto merged
      storage/ndb/test/src/HugoOperations.cpp:
        Auto merged
      storage/ndb/tools/drop_index.cpp:
        Auto merged
      storage/ndb/tools/listTables.cpp:
        Auto merged
      5805fd26
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2e92355b
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      
      2e92355b
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · 1bbc69c7
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.10839
      
      
      myisam/mi_create.c:
        Auto merged
      1bbc69c7
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · b54bec55
      unknown authored
      into  mysql.com:/home/jonas/src/mysql-4.1-push
      
      
      b54bec55
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 552e4711
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      
      552e4711
    • unknown's avatar
      WL #2713 Change IM behaviour so, that it only reads and alters one config file only. · 34fa3be5
      unknown authored
      Implemented on brian's request.
      
      
      server-tools/instance-manager/Makefile.am:
        define default config file
      server-tools/instance-manager/commands.cc:
        Use specified or default file to edit with SET commands instead of hardcoded file
      server-tools/instance-manager/commands.h:
        add member to SET commands
      server-tools/instance-manager/instance_map.cc:
        rename first_option -> single_defaults_option, made logging a bit more verbose
      server-tools/instance-manager/instance_map.h:
        rename first_option -> single_defaults_file + made it public
      server-tools/instance-manager/manager.cc:
        rename first_option -> single_defaults_file
      server-tools/instance-manager/mysqlmanager.cc:
        goto generic error label instead of simple return
      server-tools/instance-manager/options.cc:
        skip --defaults-extra file and give a message if it was specified, made IM
        to read one config file only
      server-tools/instance-manager/options.h:
        added new members to the option structure
      34fa3be5
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0aca86a8
      unknown authored
      into  mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      0aca86a8
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-5.0 · 8cf24577
      unknown authored
      into  mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      8cf24577
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1 · c556acbf
      unknown authored
      into  mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      c556acbf
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1 · bacc9e9e
      unknown authored
      into  mysql.com:/home/jonas/src/mysql-4.1-push
      
      
      bacc9e9e
    • unknown's avatar
      bug#11942 - ndb - backup during DDL · 3f916d29
      unknown authored
        fix bug introduced in alter table
      
      
      3f916d29
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · bdf9d193
      unknown authored
      into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
      
      
      sql/handler.cc:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      storage/myisam/rt_split.c:
        Auto merged
      bdf9d193
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 13ed403f
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      
      13ed403f
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1 · 718942d8
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0
      
      
      BitKeeper/deleted/.del-ctype-cp932.c:
        Auto merged
      718942d8
    • unknown's avatar
      ctype-cp932.c: · e9687c10
      unknown authored
        After backporting from 5.0 fix.
        There is no an extra argument in 4.1.
      
      
      strings/ctype-cp932.c:
        After backporting from 5.0 fix.
        There is no an extra argument in 4.1.
      e9687c10
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · a29829b7
      unknown authored
      into  mysql.com:/home/jonas/src/mysql-4.1-push
      
      
      a29829b7
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 09e07ceb
      unknown authored
      into  mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      09e07ceb
    • unknown's avatar
      Included partitioning into embedded server · 15424cb9
      unknown authored
      15424cb9
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-5.0 · 83587008
      unknown authored
      into  mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      83587008
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · 8a1a13e5
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      
      8a1a13e5
    • unknown's avatar
      merge · de5af58d
      unknown authored
      de5af58d
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 51ddea89
      unknown authored
      into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
      
      
      sql/handler.cc:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      storage/myisam/rt_split.c:
        Auto merged
      51ddea89