1. 01 Jul, 2005 11 commits
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2 · a58edfc5
      unknown authored
      into neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      client/mysqltest.c:
        Auto merged
      a58edfc5
    • unknown's avatar
      Win port fixes · d305f6d3
      unknown authored
      
      client/mysqltest.c:
        Check for HAVE_SYS_WAIT_H
        Define WEXITSTATUS if not defined
      d305f6d3
    • unknown's avatar
      tests/mysql_client_test.c · eb4cb6eb
      unknown authored
          Add a test case for Bug#11656 "Server crash with mysql_stmt_fetch 
          (cursors)", the bug itself is no longer present.
      
      
      tests/mysql_client_test.c:
        Add a test case for Bug#11656 "Server crash with mysql_stmt_fetch 
        (cursors)", the bug itself is no longer present.
      eb4cb6eb
    • unknown's avatar
      - fix -ansi -pedantic error · 6c8d3975
      unknown authored
      6c8d3975
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · dc22424b
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-11172-new
      
      
      sql/sql_class.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      dc22424b
    • unknown's avatar
      A fix and a test case for Bug#11172 "mysql_stmt_attr_set · d36c14f7
      unknown authored
      CURSOR_TYPE_READ_ONLY date/datetime filter server crash".
      The fix adds support for Item_change_list in cursors (proper rollback
      of the modified item tree). 
      
      
      sql/sql_class.cc:
        No need to call fatal_error() twice.
      sql/sql_prepare.cc:
        - implement proper cleanup of the prepared statement in mysql_stmt_reset
          if there is a cursor.
        - take into account thd->change_list when fetching data through a
          cursor.
      sql/sql_select.cc:
        - take into account thd->change_list when fetching data from a cursor:
          grab it when we open a cursor, and rollback the changes to the parsed
          tree when we close it.
      sql/sql_select.h:
        - Cursor::change_list added
      tests/mysql_client_test.c:
        - a test case for Bug#11172 "mysql_stmt_attr_set CURSOR_TYPE_READ_ONLY date/datetime
         filter server crash"
      d36c14f7
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8ec6c354
      unknown authored
      into mysql.com:/usr/home/bar/mysql-5.0
      
      
      8ec6c354
    • unknown's avatar
      fix bugs found by gcc 3.4 compiler · 497b8865
      unknown authored
      
      sql/sp_head.h:
        removed unused parameter
      sql/sql_lex.cc:
        make correct operation order
      sql/sql_yacc.yy:
        removed unused parameter
      497b8865
    • unknown's avatar
      sql_table.cc: · 0e6a93ec
      unknown authored
        Bug#11657 Creation of secondary index fails:
      
        If TINYBLOB key part length is 255, it is equal
        to field length. For BLOB, unlike for CHAR/VARCHAR,
        we should keep a non-zero key part length, otherwise
        "BLOB/TEXT column used in key specification without a key length"
        error is produced afterwards.
      
      type_blob.result, type_blob.test:
        fixing tests accordinly
      
      
      sql/sql_table.cc:
        Bug#11657 Creation of secondary index fails
        For TINYBLOB key part length can be equal to field length.
        We should still keep a non-zero key part length,
      mysql-test/t/type_blob.test:
        fixing tests accordinly
      mysql-test/r/type_blob.result:
        fixing tests accordinly
      0e6a93ec
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 8e08a14b
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-bug7-5.0
      
      
      8e08a14b
    • unknown's avatar
      Name resolution context added (BUG#6443) · b4f595b9
      unknown authored
      
      include/my_bitmap.h:
        new bitmap operation
      mysql-test/r/view.result:
        added warnings
        Correct inserting data check (absence of default value) for view underlying tables (BUG#6443)
      mysql-test/t/view.test:
        Correct inserting data check (absence of default value) for view underlying tables (BUG#6443)
      mysys/my_bitmap.c:
        new bitmap operation
      sql/field.h:
        index of field in table added
      sql/item.cc:
        Name resolution context added
        table list removed from fix_fields() arguments
      sql/item.h:
        Name resolution context added
        table list removed from fix_fields() arguments
      sql/item_cmpfunc.cc:
        table list removed from fix_fields() arguments
      sql/item_cmpfunc.h:
        table list removed from fix_fields() arguments
      sql/item_func.cc:
        table list removed from fix_fields() arguments
      sql/item_func.h:
        table list removed from fix_fields() arguments
      sql/item_row.cc:
        table list removed from fix_fields() arguments
      sql/item_row.h:
        table list removed from fix_fields() arguments
      sql/item_strfunc.cc:
        fixed server crash on NULL argument
      sql/item_strfunc.h:
        table list removed from fix_fields() arguments
      sql/item_subselect.cc:
        table list removed from fix_fields() arguments
      sql/item_subselect.h:
        table list removed from fix_fields() arguments
      sql/item_sum.cc:
        table list removed from fix_fields() arguments
      sql/item_sum.h:
        table list removed from fix_fields() arguments
      sql/item_timefunc.cc:
        table list removed from fix_fields() arguments
      sql/item_timefunc.h:
        table list removed from fix_fields() arguments
      sql/item_uniq.h:
        table list removed from fix_fields() arguments
      sql/log_event.cc:
        Name resolution context added
      sql/log_event.h:
        Name resolution context added
      sql/mysql_priv.h:
        Name resolution context added
      sql/set_var.cc:
        table list removed from fix_fields() arguments
      sql/share/errmsg.txt:
        new error message
      sql/sp.cc:
        Name resolution context added
      sql/sp_head.cc:
        table list removed from fix_fields() arguments
      sql/sp_head.h:
        Name resolution context added
      sql/sql_base.cc:
        table list removed from fix_fields() arguments
        Name resolution context added
      sql/sql_class.cc:
        renamed variable
      sql/sql_delete.cc:
        Name resolution context added
      sql/sql_derived.cc:
        Name resolution context added
      sql/sql_do.cc:
        table list removed from fix_fields() arguments
      sql/sql_handler.cc:
        Name resolution context added
      sql/sql_help.cc:
        Name resolution context added
      sql/sql_insert.cc:
        Name resolution context added
        table list removed from fix_fields() arguments
      sql/sql_lex.cc:
        Name resolution context added
      sql/sql_lex.h:
        removed resolve mode (information stored into name resolution context)
      sql/sql_load.cc:
        table list removed from fix_fields() arguments
      sql/sql_olap.cc:
        Name resolution context added
      sql/sql_parse.cc:
        Name resolution context added
      sql/sql_prepare.cc:
        table list removed from fix_fields() arguments
      sql/sql_select.cc:
        table list removed from fix_fields() arguments
      sql/sql_show.cc:
        Name resolution context added
      sql/sql_trigger.cc:
        table list removed from fix_fields() arguments
      sql/sql_udf.h:
        table list removed from fix_fields() arguments
      sql/sql_union.cc:
        Name resolution context added
      sql/sql_update.cc:
        Name resolution context added
      sql/sql_view.cc:
        Name resolution context added
      sql/sql_view.h:
        table list removed from fix_fields() arguments
      sql/sql_yacc.yy:
        Name resolution context added
      sql/table.cc:
        Name resolution context added
        merged view processing moved
      sql/table.h:
        merged view processing moved
      b4f595b9
  2. 30 Jun, 2005 10 commits
    • unknown's avatar
      Tests readded for bug 10927 · 77532a6f
      unknown authored
      
      mysql-test/r/mysqldump.result:
        Add tests for bug#10927
      mysql-test/t/mysqldump.test:
        Add tests for bug#10927
      77532a6f
    • unknown's avatar
      Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050630172241|15421 · 0aecf3f2
      unknown authored
      
      mysql-test/r/mysqldump.result:
        Exclude
      mysql-test/t/mysqldump.test:
        Exclude
      0aecf3f2
    • unknown's avatar
      Should not be here, same procedure every time.. · d10debf6
      unknown authored
      
      mysql-test/r/mysqldump.result:
        Will be removed	
      mysql-test/t/mysqldump.test:
        Will be removed
      d10debf6
    • unknown's avatar
      Merge · 19769cbf
      unknown authored
      
      client/mysqldump.c:
        Auto merged
      19769cbf
    • unknown's avatar
      After review fixes · 11dc2506
      unknown authored
      
      client/mysqldump.c:
        Use uppercase for all SQL statements
        Use WHERE 0 instead of WHERE 1=0
      11dc2506
    • unknown's avatar
      Fixing comment format in sp_head.cc. · 6a5ba8fd
      unknown authored
      
      sql/sp_head.cc:
        Fixing comment format.
      6a5ba8fd
    • unknown's avatar
      Fixed BUG#11529: crash server after use stored procedure · a95bb38a
      unknown authored
      Make sure to cleanup the items for a cursor query after each open, otherwise
      it's done too late, after the run-time mem_root is freed.
      
      
      mysql-test/r/sp.result:
        New test case for BUG#11529.
      mysql-test/t/sp.test:
        New test case for BUG#11529.
      sql/sp_head.cc:
        Add a back pointer from a sp_cursor to its cpush instruction, and use it to set
        the arena and cleanup the items for the cursor's query when opening it.
      sql/sp_rcontext.cc:
        Store pointer in sp_cursor to its cpush instruction.
      sql/sp_rcontext.h:
        Store pointer in sp_cursor to its cpush instruction.
      a95bb38a
    • unknown's avatar
      A fix and a test case for Bug#10794 "mysql_stmt_attr_set no · ec9ac3fe
      unknown authored
      open cursor after mysql_stmt_execute" + post-review fixes.
      The bug was caused by wrong flags in stmt->server_status on the client
      side: if there was no cursor, the server didn't send server_status
      flags to the client, and the old flags were used to set up the
      fetch function of a statement. Consequently, stmt_read_row_from_cursor was
      used when there was no cursor. The fix fixes the server to always
      send server flags to the client.
      
      
      include/mysql_com.h:
        Update stale comments.
      libmysql/libmysql.c:
        Remove an extra assignment.
      libmysqld/lib_sql.cc:
        Update to correspond to the changed signature of send_eof
      sql/protocol.cc:
        Actual fix for bug#10794: create a function that writes the eof
        packet to network and use it from send_fields. We need to send
        a full eof packet from send_fields to inform the client about
        the cursor status (that there is no cursor in this case).
      sql/protocol.h:
        Remove an unused parameter for send_eof.
      tests/mysql_client_test.c:
        A test case for Bug#10794 "mysql_stmt_attr_set no open cursor 
        after mysql_stmt_execute"
      ec9ac3fe
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 7a5ec760
      unknown authored
      into  linux.site:/home/marty/MySQL/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysys/default.c:
        Auto merged
      ndb/include/transporter/TransporterDefinitions.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      ndb/test/ndbapi/testBlobs.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      strings/ctype-big5.c:
        Auto merged
      strings/ctype-ucs2.c:
        Auto merged
      7a5ec760
    • unknown's avatar
      a fix. · 9996c3d8
      unknown authored
      bug #10617: Insert from same table to same table give incorrect result for bit(4) column.
      bug #11091: union involving BIT: assertion failure in Item::tmp_table_field_from_field_type
      bug #11572: MYSQL_TYPE_BIT not taken care of in temp. table creation for VIEWs 
      
      
      mysql-test/r/type_bit.result:
        test case.
        bug #10617: Insert from same table to same table give incorrect result for bit(4) column.
        bug #11091: union involving BIT: assertion failure in Item::tmp_table_field_from_field_type
        bug #11572: MYSQL_TYPE_BIT not taken care of in temp. table creation for VIEWs
      mysql-test/t/type_bit.test:
        test case.
        bug #10617: Insert from same table to same table give incorrect result for bit(4) column.
        bug #11091: union involving BIT: assertion failure in Item::tmp_table_field_from_field_type
        bug #11572: MYSQL_TYPE_BIT not taken care of in temp. table creation for VIEWs
      sql/field.h:
        a fix.
        bug #10617: Insert from same table to same table give incorrect result for bit(4) column.
        bug #11091: union involving BIT: assertion failure in Item::tmp_table_field_from_field_type
        bug #11572: MYSQL_TYPE_BIT not taken care of in temp. table creation for VIEWs 
        
        - max_length() returns length in bits.
        - introduced set_bit_ptr() function, which sets bit_ptr and bit_ofs.
      sql/item.cc:
        a fix.
        bug #10617: Insert from same table to same table give incorrect result for bit(4) column.
        bug #11091: union involving BIT: assertion failure in Item::tmp_table_field_from_field_type
        bug #11572: MYSQL_TYPE_BIT not taken care of in temp. table creation for VIEWs
        
        - create Field_bit_as_char in case of MYSQL_TYPE_BIT in the Item::tmp_table_field_from_field_type()
          (we cannot create Field_bit here because of lack of information: bit_ptr, bit_ofs)
      sql/mysql_priv.h:
        a fix.
        bug #10617: Insert from same table to same table give incorrect result for bit(4) column.
        bug #11091: union involving BIT: assertion failure in Item::tmp_table_field_from_field_type
        bug #11572: MYSQL_TYPE_BIT not taken care of in temp. table creation for VIEWs 
        
        - table_cant_handle_bit_fields parameter added to the create_tmp_field()
      sql/sql_select.cc:
        a fix.
        bug #10617: Insert from same table to same table give incorrect result for bit(4) column.
        bug #11091: union involving BIT: assertion failure in Item::tmp_table_field_from_field_type
        bug #11572: MYSQL_TYPE_BIT not taken care of in temp. table creation for VIEWs
        
        - create_tmp_field() changes to return create_tmp_field_from_item() result 
          (actually, Field_bit_as_char) if table_cant_handle_bit_fields=1 for bit fields.
        - create_tmp_field() calls accordingly changed 
        - call set_bit_ptr() for bit fields after the move_field() call during 
          temporary table creation.
      sql/sql_table.cc:
        a fix.
        bug #10617: Insert from same table to same table give incorrect result for bit(4) column.
        bug #11091: union involving BIT: assertion failure in Item::tmp_table_field_from_field_type
        bug #11572: MYSQL_TYPE_BIT not taken care of in temp. table creation for VIEWs
        
        - changed the create_tmp_field() call
      9996c3d8
  3. 29 Jun, 2005 11 commits
  4. 28 Jun, 2005 8 commits
    • unknown's avatar
      post review fixes to a patch · e29f5221
      unknown authored
      
      mysys/default_modify.c:
        post revew fixes to a patch
      e29f5221
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 10986dba
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-5.0
      
      
      sql/opt_range.cc:
        Auto merged
      10986dba
    • unknown's avatar
      opt_range.cc: · 19103bf3
      unknown authored
        Fixed a compilation error.
      
      
      sql/opt_range.cc:
        Fixed a compilation error.
      19103bf3
    • unknown's avatar
      Fixed comments. · d2f7623d
      unknown authored
      
      sql/opt_range.cc:
        comment fixed.
      sql/sp_head.cc:
        An obsolete comment removed.
      d2f7623d
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · 95fd25f2
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      sql/opt_range.cc:
        Auto merged
      95fd25f2
    • unknown's avatar
      A fix and a test case for Bug#10736 "mysql_stmt_attr_set · 79c1be9e
      unknown authored
      CURSOR_TYPE_READ_ONLY select within select".
      The bug was caused by the reset of thd->mem_root to thd->main_mem_root in 
      Item_subselect::exec, which in turn triggered too early free_root() for
      data which was needed on subsequent fetches from a cursor.
      This reset also caused a memory leak in stored procedures, as 
      subsequent executions of instructions containing a subselect
      were allocating memory in thd->main_mem_root, which is not freed
      until the end of the entire SP, instead of the per-call mem_root,
      which is freed in the end of execution of the instruction.
      
      
      sql/item_subselect.cc:
        Don't try to protect subqueries from the code that assumes that
        it can reset thd->mem_root and get away with it: it's responsibility
        of the caller to ensure that no assumption about the life span
        of the allocated memory made by the called code is broken.
        Besides, this didn't work well with cursors and stored procedures, 
        where the runtime memory root is not the same as &thd->main_mem_root.
      sql/opt_range.cc:
        In get_mm_leaf restore the original mem_root of the thd which has
        been temporarily reset with the quick select mem_root earlier: if 
        thd->mem_root points to the QUICK...::mem_root, the memory allocated
        in JOIN::exec during evaluation of a subquery gets freed too early.
      tests/mysql_client_test.c:
        A test case for Bug#10736 "mysql_stmt_attr_set CURSOR_TYPE_READ_ONLY
         select within select"
      79c1be9e
    • unknown's avatar
      range.result, range.test: · 1031b871
      unknown authored
        Added a test case for bug #10031.
      opt_range.cc:
        Fixed bug #10031: range condition was not used with
        views. Range analyzer did not take into account that
        view columns were always referred through Item_ref.
      
      
      sql/opt_range.cc:
        Fixed bug #10031: range condition was not used with
        views. Range analyzer did not take into account that
        view columns were always referred through Item_ref.
      mysql-test/t/range.test:
        Added a test case for bug #10031.
      mysql-test/r/range.result:
        Added a test case for bug #10031.
      1031b871
    • unknown's avatar
      Merge hundin.mysql.fi:/home/marko/mysql-4.1 · 26a52bbe
      unknown authored
      into hundin.mysql.fi:/home/marko/mysql-5.0-current
      
      
      innobase/fil/fil0fil.c:
        SCCS merged
      innobase/include/os0file.h:
        SCCS merged
      innobase/os/os0file.c:
        SCCS merged
      26a52bbe