1. 24 Jan, 2007 5 commits
  2. 23 Jan, 2007 9 commits
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 964f502c
      unknown authored
      into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
      
      
      964f502c
    • unknown's avatar
      Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb · a7174850
      unknown authored
      into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug25487
      
      
      a7174850
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 5f544ed0
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg24491
      
      
      sql/item.h:
        Auto merged
      mysql-test/r/ps.result:
        Manual merge.
      mysql-test/t/ps.test:
        Manual merge.
      5f544ed0
    • unknown's avatar
      Proposed fix for bug#24491 "using alias from source table in insert ... · 1dead07d
      unknown authored
      on duplicate key".
      
      INSERT ... SELECT ... ON DUPLICATE KEY UPDATE which was used in
      stored routine or as prepared statement and which in its ON DUPLICATE
      KEY clause erroneously tried to assign value to a column mentioned only
      in its SELECT part was properly emitting error on the first execution
      but succeeded on the second and following executions.
      
      Code which is responsible for name resolution of fields mentioned in
      UPDATE clause (e.g. see select_insert::prepare()) modifies table list
      and Name_resolution_context used in this process. It uses
      Name_resolution_context_state::save_state/restore_state() to revert
      these modifications. Unfortunately those two methods failed to revert
      properly modifications to TABLE_LIST::next_name_resolution_table
      and this broke name resolution process for successive executions.
      
      This patch fixes Name_resolution_context_state::save_state/restore_state()
      in such way that it properly handles TABLE_LIST::next_name_resolution_table.
      
      
      mysql-test/r/ps.result:
        Added test case for bug#24491 "using alias from source table in insert ...
        on duplicate key"
      mysql-test/r/sp-error.result:
        Added test case for bug#24491 "using alias from source table in insert ...
        on duplicate key"
      mysql-test/t/ps.test:
        Added test case for bug#24491 "using alias from source table in insert ...
        on duplicate key"
      mysql-test/t/sp-error.test:
        Added test case for bug#24491 "using alias from source table in insert ...
        on duplicate key"
      sql/item.h:
        Name_resolution_context::save_state/restore_state():
          At the moment these methods are used only by code implementing
          INSERT and INSERT ... SELECT statements. This code doesn't modify
         'next_name_resolution_table' member of table list element
          corresponding to the first table of SELECT clause (pointed by
          'first_name_resolution_table'). But it modifies table list element
          corresponding to the target table of INSERT (pointed by 'table_list')
          So these methods were changed to reflect this.
      1dead07d
    • unknown's avatar
      ndb - bug#25562 use byte-size max_data_length() when setting blob part size · 25fb32ef
      unknown authored
      
      sql/ha_ndbcluster.cc:
        bug#25562 use byte-size max_data_length() when setting blob part size
      25fb32ef
    • unknown's avatar
      round up Transporter connect timeout · 68ab0996
      unknown authored
      
      ndb/src/common/transporter/Transporter.cpp:
        change so timeout is rounded up to nearest second
      68ab0996
    • unknown's avatar
      Bug #25487 deleting ndb_cluster_connection object takes long time · 8deeb2f9
      unknown authored
        
        aim is to:
        a) if set_connect_timeout called, timeout connect attempt (for retry on
        next call) after timeout period
        b) preserve existing blocking behaviour otherwise (for, e.g. mgmapi)
        
        Related to customer issue with long time deleting ndb_cluster_connection
        object. believe we're hanging on the connect(2) call until timeout (when
        we then realise we should exit the thread).
      
      
      ndb/include/mgmapi/mgmapi.h:
        add ndb_mgm_set_connect_timeout
      ndb/include/util/SocketClient.hpp:
        add timeout (seconds) for max time to wait for connection
      ndb/src/common/transporter/Transporter.cpp:
        set limit on amount of time we'll wait for tcp connect
      ndb/src/common/util/SocketClient.cpp:
        only try to connect for a maximum of timeout time
      ndb/src/mgmapi/mgmapi.cpp:
        add ndb_mgm_set_connect_timeout
      8deeb2f9
    • unknown's avatar
      ndb - bug#22013 · ab8355fa
      unknown authored
          Fix bug in event handling wrt early node shutdown
      
      
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Fix bug in event handling wrt early node shutdown
      ndb/src/ndbapi/ClusterMgr.cpp:
        Fix reportNodeFailed if only connected wo/ having received any API_REGCONF
      ndb/src/ndbapi/ClusterMgr.hpp:
        Fix reportNodeFailed if only connected wo/ having received any API_REGCONF
      ndb/src/ndbapi/SignalSender.cpp:
        Fix memleak
      ab8355fa
    • unknown's avatar
      bug#25746 ndb: 4209 error with 2 VARCHAR primary keys · 188899cd
      unknown authored
      - post review changes
      
      
      188899cd
  3. 22 Jan, 2007 2 commits
    • unknown's avatar
      bug#25746 ndb: 4209 error with 2 VARCHAR primary keys · 5f9e20de
      unknown authored
      - make sure keys are copied correctly when varchar has 2 length bytes
      - test case
      
      
      mysql-test/r/ndb_basic.result:
        bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
        - test case
      mysql-test/t/ndb_basic.test:
        bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
        - test case
      sql/ha_ndbcluster.cc:
        bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
        - make sure keys are copied correctly when varchar has 2 length bytes
      5f9e20de
    • unknown's avatar
      Enabling im_daemon_life_cycle.imtest in team tree. · 356893a6
      unknown authored
      Do not propagate this change into main trees.
      
      
      mysql-test/t/disabled.def:
        Enbled im_daemon_life_cycle.imtest
      356893a6
  4. 20 Jan, 2007 1 commit
  5. 19 Jan, 2007 13 commits
    • unknown's avatar
      Fix for bug #25044 "ALTER TABLE ... ENABLE KEYS acquires global 'opening · ac5e6f60
      unknown authored
      tables' lock."
      
      Execution of ALTER TABLE ... ENABLE KEYS on a table (which can take rather
      long time) prevented concurrent execution of all statements using tables.
      
      The problem was caused by the fact that we were holding LOCK_open mutex
      during whole duration of this statement and particularly during call
      to handler::enable_indexes(). This behavior was introduced as part of the
      fix for bug 14262 "SP: DROP PROCEDURE|VIEW (maybe more) write to binlog
      too late (race cond)"
      
      The patch simply restores old behavior. Note that we can safely do this as
      this operation takes exclusive lock (similar to name-lock) which blocks both
      DML and DDL on the table being altered.
      
      It also introduces mysql-test/include/wait_show_pattern.inc helper script
      which is used to make test-case for this bug robust enough.
      
      
      mysql-test/include/wait_slave_status.inc:
        Now wait_slave_status.inc reuses more generic wait_output_matches.inc script.
      sql/sql_table.cc:
        mysql_alter_table():
          Changed ALTER TABLE ... ENABLE/DISABLE KEYS not to hold LOCK_open mutex
          during call to handler::enable_indexes() as the latter can take rather
          long time and therefore such ALTER would block execution of all other
          statements that use tables. We can safely do this as this operation takes 
          exclusive lock (similar to name-lock) on the table which is altered.
      mysql-test/include/wait_show_pattern.inc:
        New BitKeeper file ``mysql-test/include/wait_show_pattern.inc''
      mysql-test/r/alter_table-big.result:
        New BitKeeper file ``mysql-test/r/alter_table-big.result''
      mysql-test/t/alter_table-big.test:
        New BitKeeper file ``mysql-test/t/alter_table-big.test''
      ac5e6f60
    • unknown's avatar
      Merge recycle.(none):/src/bug22807/my50-bug22807 · 644e6c7f
      unknown authored
      into  recycle.(none):/src/mysql-5.0-maint
      
      
      mysys/string.c:
        Auto merged
      644e6c7f
    • unknown's avatar
      Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces · 4032c303
      unknown authored
      - Corrected compiler warnings and performance problems with new 
      dynstr_append_os_quoted function.
      
      
      mysys/string.c:
        Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
        - Fix compiler warnings.
        - Used dynstr_append_mem where string length is known.
      4032c303
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 636a5b3f
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
      
      
      636a5b3f
    • unknown's avatar
      The rpl tree added a test case, and another source added a warning, · df1b8242
      unknown authored
      and combined, they add a platform-specific warning.  The warnings 
      are not the goal of the test, in any case.
      
      
      mysql-test/t/ps.test:
        Quash platform-specific warnings.
      df1b8242
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 0c10457e
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
      
      
      0c10457e
    • unknown's avatar
      Bug #15518 Reusing a stmt that has failed during prepare does not clear error · d6e4472f
      unknown authored
       - Additional patch removing check for mysql_errno on already closed
         mysql1
      
      
      tests/mysql_client_test.c:
        No need to check mysql_errno of mysql1 which has already been closed.
      d6e4472f
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · fd534e03
      unknown authored
      into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
      
      
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      fd534e03
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 030e5f92
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      ndb/src/common/util/ConfigValues.cpp:
        Auto merged
      030e5f92
    • unknown's avatar
      ndb - bug#25711 · 3c09c1c3
      unknown authored
        fix cpu peak in big clusters during unpack of config
      
      
      ndb/src/common/util/ConfigValues.cpp:
        use bin-search instead of hash (as keys collide too much)
      3c09c1c3
    • unknown's avatar
      Manual merge · 6c6a2785
      unknown authored
      6c6a2785
    • unknown's avatar
      Merge weblab.(none):/home/marcsql/TREE/mysql-4.1-24562 · 65d0e46d
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.0-24562-merge
      
      
      mysql-test/t/alter_table.test:
        Auto merged
      65d0e46d
  6. 18 Jan, 2007 10 commits
    • unknown's avatar
      Bug#24562 (ALTER TABLE ... ORDER BY ... with complex expression asserts) · d4ee8ceb
      unknown authored
      WL#3681 (ALTER TABLE ORDER BY)
      
      Before this fix, the ALTER TABLE statement implemented an ORDER BY option
      with the following characteristics :
      
      1) The order by clause accepts a list of criteria, with optional ASC or
      DESC keywords
      
      2) Each criteria can be a general expression, involving operators,
      native functions, stored functions, user defined functions, subselects ...
      
      With this fix :
      
      1) has been left unchanged, since it's a de-facto existing feature,
      that was already present in the code base and partially covered in the test
      suite. Code coverage for ASC and DESC was missing and has been improved.
      
      2) has been changed to limit the kind of criteria that are permissible:
      now only a column name is valid.
      
      
      mysql-test/r/alter_table.result:
        Prevent ALTER TABLE ORDER BY clauses to use general expressions.
      mysql-test/t/alter_table.test:
        Prevent ALTER TABLE ORDER BY clauses to use general expressions.
      sql/sql_yacc.yy:
        Prevent ALTER TABLE ORDER BY clauses to use general expressions.
      d4ee8ceb
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41 · b8ae1138
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
      
      
      mysql-test/r/ndb_types.result:
        Auto merged
      mysql-test/t/ndb_types.test:
        Auto merged
      b8ae1138
    • unknown's avatar
      ndb_types.test: sleep a bit longer, to ensure that timestamp > @now · 4fda992b
      unknown authored
      
      mysql-test/r/ndb_types.result:
        update results
      mysql-test/t/ndb_types.test:
        Sleep a bit longer, to ensure that timestamp changes between:
        set @now = now();
        and:
        insert into/update t1
        
        Test case failed (select timestamp>@now from t1 ==> 0, should be 1), and passed when run again.  This should(?) avoid that fluke.
        
        Clean up test file a bit while I'm here.
      4fda992b
    • unknown's avatar
      Makefile.am: Fix previous bad merge. Re-enable the test-ps target. · d0cfcce4
      unknown authored
      
      Makefile.am:
        Fix previous bad merge.  Re-enable the test-ps target.
      d0cfcce4
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41 · 377fc51a
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
      
      
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      377fc51a
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40 · d1824f12
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
      
      
      d1824f12
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · c90839bb
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
      
      
      c90839bb
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50 · e594d616
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
      
      
      client/mysqlbinlog.cc:
        Auto merged
      include/my_pthread.h:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_parse.cc:
        Manual merge
      e594d616
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 · 3d62df33
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
      
      
      sql/sql_show.cc:
        Auto merged
      sql/sql_parse.cc:
        Manual merge
      3d62df33
    • unknown's avatar
      Merge recycle.(none):/src/bug22807/my50-bug22807 · 45b9c2dc
      unknown authored
      into  recycle.(none):/src/mysql-5.0-maint
      
      
      client/mysql_upgrade.c:
        Auto merged
      include/my_sys.h:
        Auto merged
      mysys/string.c:
        Auto merged
      45b9c2dc