1. 13 Feb, 2006 5 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · e35100c5
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      tests/mysql_client_test.c:
        Auto merged
      e35100c5
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4794ec97
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      4794ec97
    • unknown's avatar
      Discoved while debugging in 5.1 that there was a bug where a certain crash... · f62cc1e6
      unknown authored
      Discoved while debugging in 5.1 that there was a bug where a certain crash could lead to two problems. 1) An additional share in memory that was allocated but did not have the correct use_count (so it would never be fulled deleted). Also discovered that a thread that called repair would write new rows, but would not see them. All other threads were ok, and the data was fine, but the thread doing the repair was unable to see the new rows.
      
      
      sql/ha_archive.cc:
        Fix for leaked share and hidden rows.
      sql/ha_archive.h:
        Change in method
      f62cc1e6
    • unknown's avatar
      ndb: · 12de2b7a
      unknown authored
      add optional reporting of of a "name" tied to a nodeid in the cluster log
      reporting added for mysql server and ndb_restore
      
      
      12de2b7a
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug14013/my50-bug14013 · ef51aa60
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      client/mysqltest.c:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      ef51aa60
  2. 12 Feb, 2006 4 commits
    • unknown's avatar
      Merge · 4e8f2a12
      unknown authored
      
      mysql-test/lib/mtr_cases.pl:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/spatial.cc:
        Auto merged
      4e8f2a12
    • unknown's avatar
      spatial.cc: · 0f3d8813
      unknown authored
        Added { ... } around float8get() macro, avoids VC7 error
        message "illegal else without matching if"
      mtr_report.pl:
        Parse error logs to create "warnings" file
      mtr_cases.pl:
        Added optoion --ignore-disabled-def
        Windows build now let TZ pass, removed
        work around
      mysql-test-run.pl, mtr_process.pl:
        Back port of changes from 5.0
      
      
      mysql-test/lib/mtr_process.pl:
        Back port of changes from 5.0
      mysql-test/mysql-test-run.pl:
        Back port of changes from 5.0
      mysql-test/lib/mtr_cases.pl:
        Added optoion --ignore-disabled-def
        Windows build now let TZ pass, removed
        work around
      mysql-test/lib/mtr_report.pl:
        Parse error logs to create "warnings" file
      sql/spatial.cc:
        Added { ... } around float8get() macro, avoids VC7 error
        message "illegal else without matching if"
      0f3d8813
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 · e1474218
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      scripts/make_binary_distribution.sh:
        Auto merged
      e1474218
    • unknown's avatar
      make_binary_distribution.sh: · cd93a5aa
      unknown authored
        print => echo in shell script
      
      
      scripts/make_binary_distribution.sh:
        print => echo in shell script
      cd93a5aa
  3. 11 Feb, 2006 4 commits
    • unknown's avatar
      Merge mysql.com:/usr/local/mysql/mysql-4.1-fixrace · fe9663c7
      unknown authored
      into  mysql.com:/usr/local/mysql/mysql-5.0
      
      
      mysql-test/lib/mtr_process.pl:
        Auto merged
      fe9663c7
    • unknown's avatar
      Merge · e1809d1b
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      e1809d1b
    • unknown's avatar
      mysql-test-run.{pl,sh}: · 18faf002
      unknown authored
        Give space for second and third slave port
      
      
      mysql-test/mysql-test-run.pl:
        Give space for second and third slave port
        Define shell variables for all ports, and
        list these at startup
      mysql-test/mysql-test-run.sh:
        Give space for second and third slave port
      18faf002
    • unknown's avatar
      Fix a race on some platforms in mysql-test-run.pl, where it would sometimes · 50319386
      unknown authored
      errorneously abort reporting failure to kill child processes, where in
      reality the problem was merely that the child had become a zombie because
      of missing waitpid() call.
      
      
      mysql-test/lib/mtr_process.pl:
        Fix race (on some platforms) when killing processes.
      50319386
  4. 10 Feb, 2006 24 commits
    • unknown's avatar
      mysql-test-run.pl: · 8824fd1c
      unknown authored
        Display instance manager port
      mysql-test-run.sh:
        Give port space for more than one slave
      
      
      mysql-test/mysql-test-run.sh:
        Give port space for more than one slave
      mysql-test/mysql-test-run.pl:
        Display instance manager port
      8824fd1c
    • unknown's avatar
      Merge · a183a425
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Rearranged the port numbers to fit into the range
      a183a425
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 34d8502a
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      34d8502a
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · b2b4e18f
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      b2b4e18f
    • unknown's avatar
      manual merge · a45c39e7
      unknown authored
      a45c39e7
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9a68ba18
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      9a68ba18
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 76d98963
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      sql/ha_ndbcluster.h:
        Auto merged
      mysql-test/r/ndb_basic.result:
        manual merge
      mysql-test/t/ndb_basic.test:
        manual merge
      sql/ha_ndbcluster.cc:
        manual merge
      76d98963
    • unknown's avatar
      Bug #17249 ndb, delete statement with join where clause fails when table do not have pk · 26287714
      unknown authored
      Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key
      
      change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
      
      
      mysql-test/r/ndb_basic.result:
        Bug #17249 delete statement with join where clause fails when table do not have pk
        Bug #17257 update fails for inner joins if tables do not have Primary Key
      mysql-test/t/ndb_basic.test:
        Bug #17249 delete statement with join where clause fails when table do not have pk
        Bug #17257 update fails for inner joins if tables do not have Primary Key
      sql/ha_ndbcluster.cc:
        Bug #17249 delete statement with join where clause fails when table do not have pk
        Bug #17257 update fails for inner joins if tables do not have Primary Key
        
        change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
      sql/ha_ndbcluster.h:
        Bug #17249 delete statement with join where clause fails when table do not have pk
        Bug #17257 update fails for inner joins if tables do not have Primary Key
        
        change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
      26287714
    • unknown's avatar
      Bug#14013 mysql_stmt_store_result() bombs if a cursor is open · 101e618f
      unknown authored
       - Add code to 'mysql_stmt_store_result' to allow it to be called on 
         a prepared statement with open server side cursor.
       - Add tests to mysql_client_test that uses 'mysql_stmt_store_result'
      
      
      client/mysqltest.c:
        Enable cursor protocol(remove the ifdef BUG14013_FIXED)
        When running in cursor mode, the warnings from execute needs 
        to be extracted after mysql_stmt_execute, put them in a dynamic string 
        for later use.
        Untabify some tabs.
      libmysql/libmysql.c:
        Allow 'mysql_stmt_store_result' to be called on a statement with an open server side cursor.
        Detect that a server side cursor is open and send a "fetch" to ask for all rows to be sent to the client.
        Read all binary rows as normal store.
        Check that server said last row was sent after all binary rows has been sent.
      tests/mysql_client_test.c:
        Update 'fetch_n' function to take parameter indicating if 'mysql_stmt_store_result' should be used on the statement.
        Call fetch_n with parameter set to use 'mysql_stmt_store_result'
      101e618f
    • unknown's avatar
      fix test of bug 12744 on OSX · 2a098077
      unknown authored
      2a098077
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0f23bab6
      unknown authored
      into  mysql.com:/home/cps/mysql/devel/5.0-mike
      
      
      0f23bab6
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 941c883d
      unknown authored
      into  mysql.com:/home/cps/mysql/devel/5.0-mike
      
      
      941c883d
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9cf0a6c6
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      9cf0a6c6
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 655ea368
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      655ea368
    • unknown's avatar
      merge · 72a0f506
      unknown authored
      72a0f506
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · c1a6def2
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      c1a6def2
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · f553ac19
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      f553ac19
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · a33f4938
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      a33f4938
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · b053fdbe
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      b053fdbe
    • unknown's avatar
      bug#10987 - ndb - unable to find restorable replica · 165d5390
      unknown authored
        Introduce new variable c_newest_restorable_gci
          which is set _after_ both GCP_SAVE and COPY_GCI
          
        This variable is used when cutting redo (calcKeepGci)
        
        Also make sure complete GCI is run inbetween LCP's
      
      
      ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Introduce new variable c_newest_restorable_gci
          which is set _after_ both GCP_SAVE and COPY_GCI
        
        This variable is used when cutting redo (calcKeepGci)
        Also make sure complete GCI is run inbetween LCP's
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Introduce new variable c_newest_restorable_gci
          which is set _after_ both GCP_SAVE and COPY_GCI
        
        This variable is used when cutting redo (calcKeepGci)
        Also make sure complete GCI is run inbetween LCP's
      165d5390
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · d06766b4
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      d06766b4
    • unknown's avatar
      bug#17295 - ndb - error while reading REDO log · bbcb4a56
      unknown authored
        fix corruption due to page 0, file 0 gets released
      
      
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Make sure that page 0, file 0 isnt released
      bbcb4a56
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7c6102eb
      unknown authored
      into  mysql.com:/home/cps/mysql/devel/5.0-mike
      
      
      7c6102eb
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3443892a
      unknown authored
      into  mysql.com:/usr/home/ram/work/5.0.b16511
      
      
      3443892a
  5. 09 Feb, 2006 3 commits
    • unknown's avatar
      a bunch of IM fixes from the GUI team · d7ddf0e0
      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
      d7ddf0e0
    • unknown's avatar
      Merge mysql.com:/usr/home/ram/work/4.1.heap · 550a988a
      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
      550a988a
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · bd1be027
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
      
      
      bd1be027