1. 10 Feb, 2006 14 commits
  2. 09 Feb, 2006 8 commits
    • unknown's avatar
      a bunch of IM fixes from the GUI team · e316c433
      unknown authored
      
      mysql-test/r/im_life_cycle.result:
        correct result
      mysql-test/t/im_life_cycle.imtest:
        check that wrong command is processed correctly
      server-tools/instance-manager/Makefile.am:
        always look for passwords in /etc/ on unixes
      server-tools/instance-manager/commands.cc:
        fix warning
      server-tools/instance-manager/instance.cc:
        fix monitoring capabilities, when no port was specified
        for an instance
      server-tools/instance-manager/instance_map.cc:
        allow relative paths in --defaults-file option
      server-tools/instance-manager/mysqlmanager.cc:
        fix windows warning
      server-tools/instance-manager/options.cc:
        add vars to allow relative paths in --defaults-file option
      server-tools/instance-manager/options.h:
        add an option
      server-tools/instance-manager/parse.cc:
        check for get_text_id return value
      server-tools/instance-manager/portability.h:
        add _snprintf define, move platfrom-independent
        ifdefs to priv.h
      server-tools/instance-manager/priv.cc:
        increase net timeout. it should be equal to mysqld's
      server-tools/instance-manager/priv.h:
        move platform-independent ifdefs here
      e316c433
    • unknown's avatar
      Merge mysql.com:/usr/home/ram/work/4.1.heap · efc7ab51
      unknown authored
      into  mysql.com:/usr/home/ram/work/mysql-5.0
      
      
      mysql-test/t/heap.test:
        Auto merged
      mysql-test/r/heap.result:
        merge
      efc7ab51
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 57621cae
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
      
      57621cae
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster · 8c23c558
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      8c23c558
    • unknown's avatar
      Force stop of old cluster · cdd88626
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Set $using_ndbcluster_master to 1 if cluster is supported, to force a stop of old running cluster
      cdd88626
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster · 30abbe64
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      30abbe64
    • unknown's avatar
      Start cluster only for testcases that really needs it and stop it when · 66ea1b6d
      unknown authored
      not needed by the tescases. This will save test time for those testcases
      that does not need cluster, but need a restart, as they dont have to wait
      the extra time it would take for cluster to restart. It will also save
      time for other testcases, as cluster does not 
      need to be contacted for each table to be dropped or created.
      Backport from 5.1
      
      
      mysql-test/lib/mtr_cases.pl:
        Mark all test cases where name contains "ndb" as ndbcluster needed
      mysql-test/lib/mtr_match.pl:
        Add mtr_match_substring function
      mysql-test/lib/mtr_stress.pl:
        Extre param to mysqld_start
      mysql-test/mysql-test-run.pl:
        Only start ndbcluster for testcases that needs it.
      66ea1b6d
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · a79227a9
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
      
      a79227a9
  3. 08 Feb, 2006 6 commits
  4. 07 Feb, 2006 12 commits
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7e302276
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my50
      
      7e302276
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 488eb0a0
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
      
      
      mysql-test/t/kill.test:
        Auto merged
      mysql-test/r/kill.result:
        merge
      488eb0a0
    • unknown's avatar
      Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2b23e013
      unknown authored
      into  mysql.com.:/data/BK/mysql-5.0
      
      2b23e013
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1a052686
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my50
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      1a052686
    • unknown's avatar
      ndb - bug#15918 fix · c7a4a874
      unknown authored
      
      mysql-test/r/ndb_index_unique.result:
        bug#15918 fix
      mysql-test/t/ndb_index_unique.test:
        bug#15918 fix
      ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
        bug#15918 fix
      sql/ha_ndbcluster.cc:
        bug#15918 fix
      sql/ha_ndbcluster.h:
        bug#15918 fix
      c7a4a874
    • unknown's avatar
      ndb - add option ndbd --foreground for manual debugging · 6b09dc82
      unknown authored
      
      ndb/src/kernel/main.cpp:
        add option ndbd --foreground for manual debugging
      ndb/src/kernel/vm/Configuration.cpp:
        add option ndbd --foreground for manual debugging
      ndb/src/kernel/vm/Configuration.hpp:
        add option ndbd --foreground for manual debugging
      6b09dc82
    • unknown's avatar
      Merge mysql.com.:/data/BK/mysql-5.0 · ad1094ba
      unknown authored
      into  mysql.com.:/data/BK/mysql-5.0_8461_b
      
      ad1094ba
    • unknown's avatar
      ndb - main.cpp: avoid SEGV if fetch_configuration fails before fork · 98d99971
      unknown authored
      
      ndb/src/kernel/main.cpp:
        avoid SEGV if fetch_configuration fails before fork
      98d99971
    • unknown's avatar
      item_func.cc: · 05f658a3
      unknown authored
        fix for bug#8461
      
        BUG 8461 - TRUNCATE returns incorrect result if 2nd argument is negative
        Reason: Both TRUNCATE/ROUND converts INTEGERS to DOUBLE and back to INTEGERS
        Changed the integer routine to work on integers only.
        This bug affects 4.1, 5.0 and 5.1
        Fixing in 4.1 will need to change the routine to handle different types individually.
        5.0 did had different routines for different types already just the INTEGER routine was bad.
      
      
      sql/item_func.cc:
        fix for bug#8461
        BUG 8461 - TRUNCATE returns incorrect result if 2nd argument is negative
        Reason: TRUNCATE converts INTEGERS to DOUBLE and back to INTEGERS
        Both ROUND and TRUNCATE are affected by this.
        Changed the integer routine to work on integers only.
        This bug affects 4.1 5,0 and 5
        Fixing in 4.1 will need to change the routine to handle different types individually.
      05f658a3
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 25655fb0
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
      
      25655fb0
    • unknown's avatar
      kill.test fixed for kill on Mac OS X (which do not send OK) · 31b504fc
      unknown authored
      
      mysql-test/r/kill.result:
        This result chenged because of the correspondent test change.
      mysql-test/t/kill.test:
        This test fixed for kill on Mac OS X (which do not send OK)
      31b504fc
    • unknown's avatar
      Merge april.(none):/home/svoj/devel/mysql/merge/mysql-4.1 · cae3d21e
      unknown authored
      into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0
      
      
      mysql-test/r/fulltext.result:
        Manual merge.
      mysql-test/t/fulltext.test:
        Manual merge.
      sql/item_func.h:
        Manual merge.
      sql/sql_base.cc:
        Manual merge: use local.
      cae3d21e