1. 22 Jun, 2006 2 commits
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-5.0-root · 8eb00d0a
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-runtime
      
      
      8eb00d0a
    • unknown's avatar
      A fix and a test case for Bug#15217 "Using a SP cursor on a table created · 67fd3c4a
      unknown authored
       with PREPARE fails with weird error".
      More generally, re-executing a stored procedure with a complex SP cursor query
      could lead to a crash.
      
      The cause of the problem was that SP cursor queries were not optimized 
      properly at first execution: their parse tree belongs to sp_instr_cpush,
      not sp_instr_copen, and thus the tree was tagged "EXECUTED" when the
      cursor was declared, not when it was opened. This led to loss of optimization
      transformations performed at first execution, as sp_instr_copen saw that the
      query is already "EXECUTED" and therefore either not ran first-execution 
      related blocks or wrongly rolled back the transformations caused by 
      first-execution code.
      The fix is to update the state of the parsed tree only when the tree is
      executed, as opposed to when the instruction containing the tree is executed.
      Assignment if i->state is moved to reset_lex_and_exec_core.
      
      
      mysql-test/r/sp.result:
        Test results fixed (Bug#15217)
      mysql-test/t/sp.test:
        Add a test case for Bug#15217
      sql/sp_head.cc:
        Move assignment of stmt_arena->state to reset_lex_and_exec_core
      67fd3c4a
  2. 21 Jun, 2006 21 commits
  3. 20 Jun, 2006 17 commits
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 59de72a2
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0
      
      
      59de72a2
    • unknown's avatar
      Fix for Bug#18246 "compilation error with tcp_wrapper" · 72cb1d50
      unknown authored
      
      sql/mysqld.cc:
        Fix for Bug#18246 "compilation error with tcp_wrapper"
        
        Added wrapper functions.
      72cb1d50
    • unknown's avatar
      Fix for bug#19634 "Re-execution of multi-delete which involve trigger/stored · e9452db1
      unknown authored
      function crashes server".
      
      Attempts to execute prepared multi-delete statement which involved trigger or
      stored function caused server crashes (the same happened for such statements
      included in stored procedures in cases when one tried to execute them more
      than once).
      
      The problem was caused by yet another incorrect usage of check_table_access()
      routine (the latter assumes that table list which it gets as argument
      corresponds to value LEX::query_tables_own_last). We solve this problem by
      juggling with LEX::query_tables_own_last value when we call
      check_table_access() for LEX::auxilliary_table_list (better solution is too
      intrusive and should be done in 5.1).
      
      
      mysql-test/r/sp-prelocking.result:
        Added test for bug#19634 "Re-execution of multi-delete which involve trigger/
        stored function crashes server".
      mysql-test/t/sp-prelocking.test:
        Added test for bug#19634 "Re-execution of multi-delete which involve trigger/
        stored function crashes server".
      sql/sql_parse.cc:
        To call safely check_table_access() for LEX::auxilliary_table_list we have
        to juggle with LEX::query_tables_own_last value.
      e9452db1
    • unknown's avatar
      field.cc, field.h: · 406a7ba9
      unknown authored
        Additional fix for #16377 for bigendian platforms
      sql_select.cc, select.result, select.test:
        After merge fix
      
      
      mysql-test/t/select.test:
        After merge fix
      mysql-test/r/select.result:
        After merge fix
      sql/sql_select.cc:
        After merge fix
      sql/field.h:
        Additional fix for #16377 for bigendian platforms
      sql/field.cc:
        Additional fix for #16377 for bigendian platforms
      406a7ba9
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5805bba6
      unknown authored
      into moonbone.local:/work/tmp_merge-5.0-opt-mysql
      
      
      5805bba6
    • unknown's avatar
      Fix for bug#18516 (also #19353, reported for 5.1): · 99740b3f
      unknown authored
      In addition to include "mysql_upgrade" in a RPM, it should also be called
      when the RPM is upgraded.
      
      
      support-files/mysql.server.sh:
        Support getting additional arguments, which need to be passed on to the server.
        This works only if the server is started through "mysqld_safe", as the IM will not pass such arguments.
        So if the IM would be used, additional arguments cause the start to fail (voluntarily).
        
        This feature is needed so that tools like RPM can start the server in an "isolated" way,
        see the patch to the RPM spec file (also in this changeset) to call "mysql_upgrade".
      support-files/mysql.spec.sh:
        Call "mysql_upgrade" during an RPM upgrade.
        
        "mysql_upgrade" needs a server to run, as it issues SQL commands.
        (This had been neglected previously.)
        It also needs to connect as "root", but in an RPM upgrade the password is unknown.
        To allow this, the server is started "--skip-grant-tables".
        Normally, this would open big security holes, so it is also started "--skip-networking",
        and access to the socket is limited to "mysql" + "root" by temporarily setting mode 700.
      99740b3f
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 49042de5
      unknown authored
      into moonbone.local:/work/tmp_merge-4.1-opt-mysql
      
      
      49042de5
    • unknown's avatar
      Manually merged · b6a416ff
      unknown authored
      
      mysql-test/t/select.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      b6a416ff
    • unknown's avatar
      select.result: · 3e7d68b1
      unknown authored
        Added test case for bug#18759 Incorrect string to numeric conversion.  
      select.test:
        Added test case for bug#18759 Incorrect string to numeric conversion.
      item_cmpfunc.cc:
        Cleanup after fix for bug#18360 removal
      
      
      sql/item_cmpfunc.cc:
        Cleanup after fix for bug#18360 removal
      mysql-test/t/select.test:
        Added test case for bug#18759 Incorrect string to numeric conversion.
      mysql-test/r/select.result:
        Added test case for bug#18759 Incorrect string to numeric conversion.
      3e7d68b1
    • unknown's avatar
      Bug#19437 (Connection refused by server: "2002 Can't connect... /master.sock"): · dad508ea
      unknown authored
      Clearing active VIO before calling mysql_close() in the slave I/O
      thread. 
      
      
      sql/slave.cc:
        Clearing active VIO before calling mysql_close() in the slave I/O thread.
      dad508ea
    • unknown's avatar
      Manually merged · 4d3803f0
      unknown authored
      
      mysql-test/r/insert_select.result:
        Auto merged
      mysql-test/t/insert_select.test:
        Auto merged
      4d3803f0
    • unknown's avatar
      Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.0 · 783866ff
      unknown authored
      into  mysql.com:/home/emurphy/mysql-5.0-heikki
      
      
      783866ff
    • unknown's avatar
      Applying patch from SergeyV · b2507220
      unknown authored
      Fixes bug#17264, for alter table on win32 for successfull operation completion
      it is used TL_WRITE(=10) lock instead of TL_WRITE_ALLOW_READ(=6), however here
      in innodb handler TL_WRTIE is lifted to TL_WRITE_ALLOW_WRITE, which causes
      race condition when several clients do alter table simultaneously.
      
      
      mysql-test/r/lock_multi.result:
        Test case for bug#17264.
      mysql-test/t/lock_multi.test:
        Test case for bug#17264
      b2507220
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · d6b48592
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
      
      
      ndb/src/ndbapi/ndberror.c:
        Auto merged
      d6b48592
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · f62bb051
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/ndbapi/ndberror.c:
        Auto merged
      f62bb051
    • unknown's avatar
      Bug #17297 Fix error messages · c2620e1f
      unknown authored
      c2620e1f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 9ef50ebe
      unknown authored
      into  mysql.com:/mnt/storeage/mysql-5.0
      
      
      9ef50ebe