1. 20 Aug, 2004 40 commits
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · f473be3f
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      
      sql/item_sum.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      f473be3f
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · e01ab1d8
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      e01ab1d8
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 683befe8
      unknown authored
      into mysql.com:/home/kostja/work/mysql-4.1-4912
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      683befe8
    • unknown's avatar
      Fix for bug#4912 "mysqld crashs in case a statement is executed · 48bb5630
      unknown authored
       a second time". The bug was caused by incompatibility of
      negations elimination algorithm and PS: during first statement 
      execute a subtree with negation was replaced with equivalent 
      subtree without NOTs.
      The problem was that although this transformation was permanent, 
      items of the new subtree were created in execute-local memory.
      The patch adds means to check if it is the first execute of a
      prepared statement, and if this is the case, to allocate items
      in memory of the prepared statement.
      The implementation:
      - backports Item_arena from 5.0
      - adds Item_arena::is_stmt_prepare(), 
        Item_arena::is_first_stmt_execute().
      - deletes THD::allocate_temporary_pool_for_ps_preparing(),
        THD::free_temporary_pool_for_ps_preparing(); they
        were redundant.
      and adds a few invariants:
      - thd->free_list never contains junk (= freed items)
      - thd->current_arena is never null. If there is no
        prepared statement, it points at the thd. 
      The rest of the patch contains mainly mechanical changes and
      cleanups.
      
      
      mysql-test/r/ps.result:
        Test results updated (test case for Bug#4912)
      mysql-test/t/ps.test:
        A test case for Bug#4912 "mysqld crashs in case a statement is 
        executed a second time"
      sql/item_cmpfunc.cc:
        current_statement -> current_arena
      sql/item_subselect.cc:
        Statement -> Item_arena, current_statement -> current_arena
      sql/item_subselect.h:
        Item_subselect does not need to save thd->current_statement.
      sql/item_sum.cc:
        Statement -> Item_arena
      sql/item_sum.h:
        Statement -> Item_arena
      sql/mysql_priv.h:
        Statement -> Item_arena
      sql/sql_base.cc:
        current_statement -> current_arena
      sql/sql_class.cc:
        - Item_arena
        - convenient set_n_backup_statement, restore_backup_statement
        (nice idea, Sanja)
      sql/sql_class.h:
        - Item_arena: backport from 5.0
        - allocate_temporary_pool_for_ps_preparing,
          free_temporary_pool_for_ps_preparing removed.
      sql/sql_derived.cc:
        current_statement -> current_arena
      sql/sql_lex.cc:
        current_statement -> current_arena
      sql/sql_parse.cc:
        Deploy invariant that thd->free_list never contains junk items
        (backport from 5.0).
      sql/sql_prepare.cc:
        - backporting Item_arena
        - no need to allocate_temporary_pool_for_ps_preparing().
      sql/sql_select.cc:
        Fix for bug#4912 "mysqld crashs in case a statement is 
        executed a second time": if this is the first execute of
        a prepared statement, negation elimination is
        done in memory of the prepared statement.
      sql/sql_union.cc:
        Backporting Item_arena from 5.0.
      48bb5630
    • unknown's avatar
      mysql-copyright: · 137191c4
      unknown authored
        Fixed it to work, added function to fix include/mysql_version.h LICENSE tag from GPL to Commercial
      
      
      Build-tools/mysql-copyright:
        Fixed it to work, added function to fix include/mysql_version.h LICENSE tag from GPL to Commercial
      137191c4
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 496549b3
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      
      sql/sql_select.cc:
        Auto merged
      496549b3
    • unknown's avatar
      after merge fix · c984b763
      unknown authored
      
      myisam/Makefile.am:
        put zlib at the end (libtool adds the whole bunch of dependencies right after that)
      sql/Makefile.am:
        put zlib at the end (libtool adds the whole bunch of dependencies right after that)
      c984b763
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 31fe7556
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      sql/mysql_priv.h:
        Auto merged
      31fe7556
    • unknown's avatar
      variable scoop, compile fix · 2abbbcac
      unknown authored
      2abbbcac
    • unknown's avatar
      merged · de33e792
      unknown authored
      
      sql/lock.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      de33e792
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2d8c7288
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      2d8c7288
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 · f4af817c
      unknown authored
      into build.mysql.com:/users/rburnett/mysql-4.1
      
      
      sql/mysql_priv.h:
        Auto merged
      f4af817c
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · 6b5586fb
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      
      sql/item_sum.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      6b5586fb
    • unknown's avatar
      removed debug printout · e884a109
      unknown authored
      e884a109
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7bdc49df
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      7bdc49df
    • unknown's avatar
      sql_select.cc: compilation failure fixed · 059d85fe
      unknown authored
      
      
      sql/sql_select.cc:
        why cannot I compare (type) to (const type) ?????
      059d85fe
    • unknown's avatar
      Bug#4594 "column index make = failed for gbk, but like works" · 5ea7ca10
      unknown authored
      Fix for MyISAM. Tests for MyISAM and HASH+BTREE.
      
      5ea7ca10
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-ndb · 5e586169
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      5e586169
    • unknown's avatar
      compile error fixes for some platforms · 8e76eb2d
      unknown authored
      8e76eb2d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 2be1f4d8
      unknown authored
      into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4302
      
      2be1f4d8
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0c4a1521
      unknown authored
      into poseidon.(none):/home/tomas/mysql-4.1
      
      0c4a1521
    • unknown's avatar
      fix compile error on some platforms · 3b36370f
      unknown authored
      3b36370f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c5413da0
      unknown authored
      into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4302
      
      
      sql/sql_select.cc:
        Auto merged
      c5413da0
    • unknown's avatar
      Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 · ec3b79ad
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      ec3b79ad
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · c1eae670
      unknown authored
      into poseidon.(none):/home/tomas/mysql-4.1
      
      c1eae670
    • unknown's avatar
      small helptext fix · 43f84987
      unknown authored
      43f84987
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 · 8003fee8
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.0
      
      8003fee8
    • unknown's avatar
      Making FLUSH TABLES WITH READ LOCK block COMMITs of existing transactions, · 79b2593f
      unknown authored
      in a deadlock-free manner. This splits locking the global read lock in two steps.
      This fixes a consequence of this bug, known as:
      BUG#4953 'mysqldump --master-data may report incorrect binlog position if using InnoDB'
      And a test.
      
      
      sql/handler.cc:
        making COMMIT wait if FLUSH TABLES WITH READ LOCK happened.
      sql/lock.cc:
        an additional stage so that FLUSH TABLES WITH READ LOCK blocks COMMIT:
        make_global_read_lock_block_commit():
        taking the global read lock is TWO steps (2nd step is optional; without
        it, COMMIT of existing transactions will be allowed):
        lock_global_read_lock() THEN make_global_read_lock_block_commit().
      sql/mysql_priv.h:
        new argument to wait_if_global_read_lock()
      sql/sql_class.h:
        THD::global_read_lock now an uint to reflect the 2 steps of global read lock (does not block COMMIT / does)
      sql/sql_db.cc:
        update for new prototype
      sql/sql_parse.cc:
        implementing the two steps of global read lock so that FLUSH TABLES WITH READ LOCK can block COMMIT without deadlocking with COMMITs.
      79b2593f
    • unknown's avatar
      bug#5128 - remove need of unique fs-path · 054aac65
      unknown authored
      bug#4761 - more validation of hosts
      bug#4511 - only non depricated should be saved in config
               - fix ConfigInfo::BOOL w.r.t deprication
      
      
      mysql-test/ndb/ndb_config_2_node.ini:
        Removed need of unique filesystem
      mysql-test/ndb/ndbcluster.sh:
        Removed need of unique filesystem
        Add "" around variables for increased portability
      ndb/src/common/mgmcommon/ConfigInfo.cpp:
        Added checking of hostnames already in InitConfigFileParser
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        Add checking of hostnames when retreiving configuration
      ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
        Added ndb_%u to filesystempath
      ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
        Added ndb_%u to filesystempath
      ndb/src/kernel/blocks/ndbfs/Filename.cpp:
        Added ndb_%u to filesystempath
      ndb/src/kernel/blocks/ndbfs/Filename.hpp:
        Added ndb_%u to filesystempath
      ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
        Added ndb_%u to filesystempath
      054aac65
    • unknown's avatar
      Fix for bug#4302 "ambiguos order by when renamed column is identical to another in result" · 0f5fa0eb
      unknown authored
      When in find_item_in_list() we are looking for item we should take into account unaliased 
      names of the fields but only if item with such aliased name is not found.
      Also we should ignore aliases when looking for fully specified field.
      
      
      mysql-test/r/order_by.result:
        Fixed wrong (non-standard) test results
        Added test case for bug #4302
        Added tests for other ambiguos and potentially ambigous cases in order by clause
      mysql-test/t/order_by.test:
        Fixed wrong (non-standard) test results
        Added test case for bug #4302
        Added tests for other ambiguos and potentially ambigous cases in order by clause
      sql/sql_select.cc:
        We should ignore only not_found_item errors when searching for item in find_order_in_list() 
        to be able to catch ambiguities.
      0f5fa0eb
    • unknown's avatar
      - do not link statically on our IA64 and AMD64 build hosts, as · 57a0cc4a
      unknown authored
         static linking against an unpatched glibc 2.3 is causing trouble
       - add "glibc23" to the release suffix in this case
       - re-ordered the Changelog that was messed up by a BK merge
         (RPM is picky about this)
      
      57a0cc4a
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 · 54ce377c
      unknown authored
      into mysql.com:/Users/mikron/mysql-4.1
      
      54ce377c
    • unknown's avatar
      Compile fixes for Mac OS X · 34fa24e7
      unknown authored
      34fa24e7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 7f52e3ec
      unknown authored
      into mysql.com:/home/pem/work/mysql-4.1
      
      7f52e3ec
    • unknown's avatar
      Bugfix for bug#5072, removed table version in BLOB table name since this is... · 12ccfad9
      unknown authored
      Bugfix for bug#5072, removed table version in BLOB table name since this is incremented at alter table
      
      
      12ccfad9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 3ff72ee3
      unknown authored
      into mysql.com:/home/pem/work/mysql-4.1
      
      3ff72ee3
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 036656ef
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.emb
      
      036656ef
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · e63e52c7
      unknown authored
      into poseidon.(none):/home/tomas/mysql-4.1-clean
      
      e63e52c7
    • unknown's avatar
      fixed some help tests for ndb executables · 7dcc41e1
      unknown authored
      7dcc41e1
    • unknown's avatar
      Fixed compiler warnings in sql/field.h. · 8ee433db
      unknown authored
      
      sql/field.h:
        Fixed compiler warnings.
      8ee433db