1. 24 Oct, 2003 3 commits
    • unknown's avatar
      Merge · 1f32eb5f
      unknown authored
      
      mysql-test/r/subselect.result:
        SCCS merged
      mysql-test/t/subselect.test:
        SCCS merged
      1f32eb5f
    • unknown's avatar
      added comment · 4ed1b23c
      unknown authored
      4ed1b23c
    • unknown's avatar
      support 'parallel' updates and rallback of whole statement in case of error in... · ce2c46dd
      unknown authored
      support 'parallel' updates and rallback of whole statement in case of error in evalueting value which should be assigned
      (BUG#1484)
      
      
      mysql-test/r/variables.result:
        test of swaping variables
      mysql-test/t/variables.test:
        test of swaping variables
      sql/item_func.cc:
        new method of user variables to pre-fetch value
      sql/item_func.h:
        new method of user variables to pre-fetch value
      sql/set_var.cc:
        check() methods fetch & store value
      sql/set_var.h:
        check() methods fetch & store value
      ce2c46dd
  2. 23 Oct, 2003 5 commits
    • unknown's avatar
      added check of cardinality to IN/ALL/ANY subquery transformer · e5386bcb
      unknown authored
      (BUG#1638)
      
      
      mysql-test/r/subselect.result:
        test for BUG#1638
      mysql-test/t/subselect.test:
        test for BUG#1638
      sql/item_subselect.cc:
        always check cardinality first
      e5386bcb
    • unknown's avatar
      Merge · 5ee2807c
      unknown authored
      
      mysql-test/r/subselect.result:
        SCCS merged
      mysql-test/t/subselect.test:
        SCCS merged
      5ee2807c
    • unknown's avatar
      Merge · fdc78a76
      unknown authored
      
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/subselect.result:
        SCCS merged
      mysql-test/t/subselect.test:
        SCCS merged
      fdc78a76
    • unknown's avatar
      Merge · e94666f8
      unknown authored
      
      sql/item.cc:
        Auto merged
      mysql-test/r/subselect.result:
        SCCS merged
      mysql-test/t/subselect.test:
        SCCS merged
      e94666f8
    • unknown's avatar
      ufter review fix (BUG#1444) · d3d001fd
      unknown authored
      
      sql/item.cc:
        used variable to avoid using prev_unit->item which should be more clean
      sql/item_subselect.cc:
        uncachable tested on fix fields and correct bits set
      d3d001fd
  3. 21 Oct, 2003 2 commits
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9a4aa997
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.clean
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      9a4aa997
    • unknown's avatar
      Fix for Windows bug reported throuhg Miguel · 8d94e500
      unknown authored
      
      libmysqld/lib_sql.cc:
        This code seems to be superfluous
      sql/derror.cc:
        in embedded server these functions should return the sign of the error
        instead of halting the program
      sql/init.cc:
        my_abort_hook left unchanged
      sql/mysql_priv.h:
        declaration of init_errmessage changed
        unireg_abort was replaced with DBUG_RETURN for embedded server
      sql/mysqld.cc:
        these functions don't work in embedded server thus #ifdef-ed
      8d94e500
  4. 20 Oct, 2003 6 commits
  5. 19 Oct, 2003 2 commits
    • unknown's avatar
      made more fine error message in scripts/fill_help_tables.sh · 2a98f294
      unknown authored
      
      scripts/fill_help_tables.sh:
        made more fine error message
      2a98f294
    • unknown's avatar
      correct table name assigned to temporary table field: · be4e254b
      unknown authored
       - correct table name shown in EXPLAIN Iindex reference)
       - pointer on freed memmory (reallocation of table name in reusing table entry) can't be used in EXPLAIN
      (BUG#1584)
      
      
      mysql-test/r/derived.result:
        test moved to derived table tests
        added test of BUG#1584
      mysql-test/r/subselect.result:
        test moved to derived table tests
      mysql-test/t/derived.test:
        test moved to derived table tests
        added test of BUG#1584
      mysql-test/t/subselect.test:
        test moved to derived table tests
      sql/item.cc:
        layout fix
      sql/sql_select.cc:
        correct table name assigned to temporary table field
      be4e254b
  6. 17 Oct, 2003 2 commits
    • unknown's avatar
      thr0loc.c, srv0start.c, srv0srv.c, srv0srv.h, os0thread.h: · 6713bb09
      unknown authored
        Reduce InnoDB memory allocation if buffer pool < 8 MB
      
      
      innobase/include/os0thread.h:
        Reduce InnoDB memory allocation if buffer pool < 8 MB
      innobase/include/srv0srv.h:
        Reduce InnoDB memory allocation if buffer pool < 8 MB
      innobase/srv/srv0srv.c:
        Reduce InnoDB memory allocation if buffer pool < 8 MB
      innobase/srv/srv0start.c:
        Reduce InnoDB memory allocation if buffer pool < 8 MB
      innobase/thr/thr0loc.c:
        Reduce InnoDB memory allocation if buffer pool < 8 MB
      6713bb09
    • unknown's avatar
      fixed deleting derived table tree after using (BUG#1536) · 6795b264
      unknown authored
      
      mysql-test/r/subselect.result:
        fixed drop table statement
        test for BUG#1536
      mysql-test/t/subselect.test:
        fixed drop table statement
        test for BUG#1536
      sql/sql_derived.cc:
        all tree of derived table should be deleted
      sql/sql_lex.cc:
        delete subtree method
      sql/sql_lex.h:
        delete subtree method
      6795b264
  7. 16 Oct, 2003 10 commits
    • unknown's avatar
      fixed support of used_tables() and const_item() in subqueries · e4b7aaac
      unknown authored
      (BUG#1444)
      
      
      mysql-test/r/subselect.result:
        BUG#1444 test
      mysql-test/t/subselect.test:
        BUG#1444 test
      sql/item.cc:
        storing used tables in Item_subselect
      sql/item_subselect.cc:
        fixed support of used_tables() and const_item() in subqueries
      sql/item_subselect.h:
        fixed support of used_tables() and const_item() in subqueries
      e4b7aaac
    • unknown's avatar
      - portability fix: fix compile bug on HP-UX (thanks to acurtis for the · d894f233
      unknown authored
         patch)
        (BUG#1440: Redundant class name confusing hpux compiler)
      
      
      d894f233
    • unknown's avatar
      fixed sqlstate for ER_WRONG_INDEX_NAME · 0d28ff84
      unknown authored
      removed unnesessary code from create.test
      
      
      include/sql_state.h:
        added sqlstate for ER_WRONG_INDEX_NAME
      mysql-test/r/create.result:
        changed sqlstate for ER_WRONG_INDEX_NAME
        remove unnesesary warning
      mysql-test/t/create.test:
        remove unnesessary drop table
      0d28ff84
    • unknown's avatar
      added checking for empty index name (fixed bug #1419) · ff50211d
      unknown authored
      
      include/mysqld_error.h:
        added error "Incorrect index name"
      mysql-test/r/create.result:
        added test for empty index name
      mysql-test/t/create.test:
        added test for empty index name
      sql/share/czech/errmsg.txt:
        added error "Incorrect index name"
      sql/share/danish/errmsg.txt:
        added error "Incorrect index name"
      sql/share/dutch/errmsg.txt:
        added error "Incorrect index name"
      sql/share/english/errmsg.txt:
        added error "Incorrect index name"
      sql/share/estonian/errmsg.txt:
        added error "Incorrect index name"
      sql/share/french/errmsg.txt:
        added error "Incorrect index name"
      sql/share/german/errmsg.txt:
        added error "Incorrect index name"
      sql/share/greek/errmsg.txt:
        added error "Incorrect index name"
      sql/share/hungarian/errmsg.txt:
        added error "Incorrect index name"
      sql/share/italian/errmsg.txt:
        added error "Incorrect index name"
      sql/share/japanese/errmsg.txt:
        added error "Incorrect index name"
      sql/share/korean/errmsg.txt:
        added error "Incorrect index name"
      sql/share/norwegian-ny/errmsg.txt:
        added error "Incorrect index name"
      sql/share/norwegian/errmsg.txt:
        added error "Incorrect index name"
      sql/share/polish/errmsg.txt:
        added error "Incorrect index name"
      sql/share/portuguese/errmsg.txt:
        added error "Incorrect index name"
      sql/share/romanian/errmsg.txt:
        added error "Incorrect index name"
      sql/share/russian/errmsg.txt:
        added error "Incorrect index name"
      sql/share/serbian/errmsg.txt:
        added error "Incorrect index name"
      sql/share/slovak/errmsg.txt:
        added error "Incorrect index name"
      sql/share/spanish/errmsg.txt:
        added error "Incorrect index name"
      sql/share/swedish/errmsg.txt:
        added error "Incorrect index name"
      sql/share/ukrainian/errmsg.txt:
        added error "Incorrect index name"
      sql/sql_table.cc:
        added checking for wrong index name
      ff50211d
    • unknown's avatar
      Fix test after merge · e83a7c2c
      unknown authored
      
      mysql-test/r/create.result:
        update test results
      e83a7c2c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 9c9ff4cc
      unknown authored
      into mashka.mysql.fi:/home/my/mysql-4.1
      
      
      9c9ff4cc
    • unknown's avatar
      Update results after merge · a474f8c3
      unknown authored
      a474f8c3
    • unknown's avatar
      Merge · 48d49976
      unknown authored
      
      sql/set_var.cc:
        SCCS merged
      48d49976
    • unknown's avatar
    • unknown's avatar
      merge with 4.0 · aff45e1b
      unknown authored
      
      BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1:
        Auto merged
      client/client_priv.h:
        Auto merged
      extra/resolveip.c:
        Auto merged
      include/mysql.h:
        Auto merged
      include/thr_alarm.h:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      scripts/mysql_config.sh:
        Auto merged
      scripts/mysqld_safe.sh:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_test.cc:
        Auto merged
      aff45e1b
  8. 15 Oct, 2003 10 commits
    • unknown's avatar
      Created small scripts to manage in-tree diffs for NetWare platform, so changes... · efd76a94
      unknown authored
      Created small scripts to manage in-tree diffs for NetWare platform, so changes are visible in the tree but cannot affect other platforms
      
      
      
      efd76a94
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 893797be
      unknown authored
      into mashka.mysql.fi:/home/my/mysql-4.1
      
      
      sql/item_strfunc.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      893797be
    • unknown's avatar
      Portability fixes for windows · ddbc8428
      unknown authored
      After merge fixes
      
      
      include/my_base.h:
        Fix comment syntax
      libmysql/client_settings.h:
        Portability fixes for windows
      libmysql/libmysql.c:
        Portability fixes for windows
      libmysql/libmysql.def:
        Portability fixes for windows
      mysql-test/r/variables.result:
        Fix result after merge
      sql-common/client.c:
        Portability fixes for windows
      sql/ha_berkeley.cc:
        Use defines instead of constants
      sql/item_strfunc.cc:
        Portability fixes for windows
      sql/mysql_priv.h:
        Use defines instead of defines
      sql/mysqld.cc:
        After merge fix
      sql/opt_range.h:
        After merge fix
      sql/set_var.h:
        Portability fixes for windows
      sql/sql_class.cc:
        Defines instead of constants
      sql/sql_help.cc:
        after merge fixes
        More OOM error checking
      sql/sql_prepare.cc:
        After merge fixes
      sql/sql_table.cc:
        Portability fixes for windows
      ddbc8428
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 0fc97bc9
      unknown authored
      into mashka.mysql.fi:/home/my/mysql-4.0
      
      
      0fc97bc9
    • unknown's avatar
      Better fix for CREATE TABLE IF NOT EXISTS ... SELECT · b06eb4d8
      unknown authored
      Fixed chsize() problem on windows
      Extend default timeout on windows clients to 1 year (to avoid timeout problems)
      
      
      include/mysql.h:
        Added client timeouts (for TCP/IP)
      libmysql/libmysql.c:
        Added client timeouts (for TCP/IP)
      mysql-test/r/create.result:
        More tests for CREATE TABLE IF NOT EXISTS ... SELECT
      mysql-test/t/create.test:
        More tests for CREATE TABLE IF NOT EXISTS ... SELECT
      mysys/my_chsize.c:
        Fix for windows
      sql/handler.h:
        Remove not used field 'if_not_exists'
        Ordered fields to be more optimized for new CPU's
        Added field 'table_existed'
      sql/slave.cc:
        Cleanup temporary tables when slave ends
      sql/sql_class.h:
        Remove not used 'do_not_drop' field
      sql/sql_insert.cc:
        Better fix for CREATE TABLE IF NOT EXISTS ... SELECT
      sql/sql_table.cc:
        Better fix for CREATE TABLE IF NOT EXISTS ... SELECT
      b06eb4d8
    • unknown's avatar
      dummy resize_thr_alarm for Netware · e115c1f4
      unknown authored
      e115c1f4
    • unknown's avatar
      Updated comments · 48446c0f
      unknown authored
      
      mysys/queues.c:
        Comments for new functions (no code change)
      mysys/thr_alarm.c:
        Updated comment
      48446c0f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 60fb31dd
      unknown authored
      into mashka.mysql.fi:/home/my/mysql-4.0
      
      
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      60fb31dd
    • unknown's avatar
      ctype-simple.c, ctype-mb.c: · 14573a71
      unknown authored
        Win compilation problem fix
      ctype-bin.c:
        Win compilation problem fix
        ,
        ,
      m_ctype.h:
        Win compilation problem fix
        ,
      
      
      include/m_ctype.h:
        Win compilation problem fix
        ,
      strings/ctype-bin.c:
        Win compilation problem fix
        ,
        ,
      strings/ctype-mb.c:
        Win compilation problem fix
      strings/ctype-simple.c:
        Win compilation problem fix
      14573a71
    • unknown's avatar
      Add more information about memory usage to debug log · 4f5887b2
      unknown authored
      
      sql/sql_test.cc:
        Add more information about memory usage
      4f5887b2