1. 17 Jul, 2005 3 commits
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0d0aa7a4
      unknown authored
      into  krsna.patg.net:/home/patg/mysql-5.0
      
      
      0d0aa7a4
    • unknown's avatar
      Federated Storage Engine, bug 9925 "Federated query processor (step 2 or step 3) not using logic in · 6771f8d0
      unknown authored
      WHERE statement"
      
      
      sql/ha_federated.cc:
        Changes per Jimw's review. 
        
        notes about some suggestions:
        
        1. Tried to replace my_sprintf with strxmov, but had problems. Couldn't 
           get the test suite to run at all, and could not find any particular
           error. Since this is something that is not critical, I'll leave it
           as is for now.
        2. I would like to use my_error to create all of my error messages, but 
           cannot figure out how to get it to take more than one argument to be
           passed to the error message (I tried this once but had errors, and 
           cannot find an example of how to get it to work despite seeing messages
           with obviously more than one arg
        3. Replaced all string building from literals to defined SQL string pieces
           such as "SELECT ", "FROM " ...
        4. Format fixes, spacing fixes completed
        5. Removed records_in_range records calculation functionality
      sql/ha_federated.h:
        Formatting changes, new defines for SQL query string tokens
      sql/share/errmsg.txt:
        changed 'SRC' to 'SOURCE' per Jimw's review
      6771f8d0
    • unknown's avatar
      func_in.result, func_in.test: · e155a0c0
      unknown authored
        Fixed bug #11885.
      sql_select.cc:
        Fixed bug #11885.
        Predicates of the forms 'a IN (v)' 'a NOT IN (v)' now
        is replaced by 'a=v' and 'a<>v' at the parsing stage.
      sql_yacc.yy:
        Fixed bug #11885.
        Predicates of the forms 'a IN (v)' 'a NOT IN (v)' now 
        is replaced by 'a=v' and 'a<>v' at the parsing stage.
      
      
      sql/sql_yacc.yy:
        Fixed bug #11885.
        Predicates of the forms 'a IN (v)' 'a NOT IN (v) now 
        is replaced by 'a=v' and 'a<>v' at the parsing stage.
      sql/sql_select.cc:
        Fixed bug #11885.
        Predicates of the forms 'a IN (v)' 'a NOT IN (v) now
        is replaced by 'a=v' and 'a<>v' at the parsing stage.
      mysql-test/t/func_in.test:
        Fixed bug #11885.
      mysql-test/r/func_in.result:
        Fixed bug #11885.
      e155a0c0
  2. 16 Jul, 2005 10 commits
    • unknown's avatar
      opt_range.cc: · e2bd7401
      unknown authored
        Fixed bug #11853.
        Corrected the code of the range optimization for
        NOT IN and NOT BETWEEN.
      range.test, range.result:
        Fixed bug #11853.
      
      
      mysql-test/t/range.test:
        Fixed bug #11853.
      sql/opt_range.cc:
        Fixed bug #11853.
        Corrected the code of the range optimization for
        NOT IN and NOT BETWEEN.
      e2bd7401
    • unknown's avatar
      After-merge fixes (4.1 -> 5.0). · 7bdc4dd0
      unknown authored
      
      mysql-test/r/sp.result:
        Test results fixed: rewritten test for Bug#6129
      mysql-test/r/view.result:
        Push a change to the result file from Sanja's patch.
      mysql-test/t/sp.test:
        Rewrite the test for Bug#6129 (now that stored procedures don't
        evaluate system variables at parse, the test produced different results).
        The old test failed with 1 in the second invocation (the old
        result was wrong).
      sql/item_func.cc:
        After-merge fix.
      sql/item_func.h:
        After-merge fix.
      sql/mysql_priv.h:
        After-merge fix.
      sql/mysqld.cc:
        Rollback the patch for Bug#7403 (it breaks the test suite).
      7bdc4dd0
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-4.1-root · 40efb362
      unknown authored
      into  mysql.com:/media/sda1/mysql/mysql-5.0-merge
      
      
      mysql-test/r/select.result:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/ps.result:
        Manual merge (again).
      mysql-test/t/ps.test:
        Manual merge (again).
      mysql-test/t/select.test:
        Manual merge (again).
      sql/item_func.cc:
        Manual merge (again).
      sql/item_func.h:
        Manual merge (again).
      sql/set_var.h:
        Manual merge (again).
      40efb362
    • unknown's avatar
      cs fixes · 0789b177
      unknown authored
      0789b177
    • unknown's avatar
      Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 · 757ad317
      unknown authored
      into lmy002.wdf.sap.corp:/home/georg/work/mysql-5.0
      
      
      tests/mysql_client_test.c:
        Auto merged
      757ad317
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 58f67c6d
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0
      
      
      58f67c6d
    • unknown's avatar
      Restore previous used client charset in mysql_reconnect · 90002cdc
      unknown authored
      Moved mysql_set_character_set function to client.c
      Changed function prototype for mysql_set_character_set (as suggested
      by Konstantin)
      
      
      include/mysql.h:
        Changed function prototype
      libmysql/libmysql.c:
        moved mysql_set_character_set to client.c
      sql-common/client.c:
        moved mysql_set_character_set to client.c
      90002cdc
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2f4fd88a
      unknown authored
      into  zim.(none):/home/brian/mysql/foo-5.0
      
      
      2f4fd88a
    • unknown's avatar
      Added federated to max base test. · 48995b9a
      unknown authored
      
      BUILD/SETUP.sh:
        Added federated to base_max tests.
      48995b9a
    • unknown's avatar
      This is the same patch as 1.1937, with small variable declaration changes, memory · d887a692
      unknown authored
      deallocation cleanup
      
      
      mysql-test/r/federated.result:
        new test results
      mysql-test/t/federated.test:
        New tests, and added explains per Timour's suggestion. This will keep
                track of whether changes have been made to the optimiser that might affect
                Federated.
                Also changed the error codes to federated error codes in the error tests
      sql/ha_federated.cc:
        1. Not using MAX_REMOTE_SIZE, so removed
                 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE
                 3. Now using Federated Error Codes
                 4. Implemented ::info (gets valid 'records' number)
                 5. Implemented ::read_range_first - now uses indexes in range operations
                 6. Better allocation in get_share
                 7. Cleaned up memory bug in get_share
                 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src
                 9. emit_key_part_name and emit_key_part_element for read_range_first to not
                    have redundancy
                 10. Made sure all 'append's pass length, and use append("") to ensure proper
                     null termination of strings being built.
                 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass
                     the actual error code and message from the foreign data src.
                 12. Cleaned up how the result set and share->scheme is freed.
      sql/share/errmsg.txt:
        New Federated error messages that are more tailored to the type of information
        we want to see when federated has an error.
      mysql-test/include/federated.inc:
        New bitkeeper file, include file for separating setup from main test suite
      mysql-test/include/federated_cleanup.inc:
        New BitKeeper file ``mysql-test/include/federated_cleanup.inc''
      sql/ha_federated.h:
        Added comments where needed, one was already commented about
      d887a692
  3. 15 Jul, 2005 27 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · d5b80a78
      unknown authored
      into  mysql.com:/opt/local/work/mysql-4.1-root
      
      
      d5b80a78
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 · e81337d8
      unknown authored
      into  linux.site:/home/reggie/bk/bug7403
      
      
      e81337d8
    • unknown's avatar
      A fix and a test case for Bug#9359 "Prepared statements take snapshot · e83e1053
      unknown authored
       of system vars at PREPARE time": implement a special Item
      to handle system variables. This item substitutes itself with 
      a basic constant containing variable value at fix_fields.
      
      
      mysql-test/r/ps.result:
        - test results fixed (Bug#9359).
      mysql-test/t/ps.test:
        - add a test case for Bug#9359 "Prepared statements take snapshot
         of system vars at PREPARE time"
      sql/item_func.cc:
        - implement Item_func_get_system_var: we should not evaluate system
        variables in the parser, but instead should create an item which 
        is evaluated to a constant at execute.
        - remove an unused function
      sql/item_func.h:
        Add a new item, Item_func_get_system_var
      sql/mysql_priv.h:
        Move necessary declarations to make set_var.h objects visible in 
        item_func.h
      sql/set_var.cc:
        - we should not print to network from get_system_var: if it's called
        from prepared statement prepare, we get packets out of order when using
        the binary protocol. Instead report the error to be sent to the user later.
        This is a backport from 5.0.
      sql/set_var.h:
        - declaration of enum_var_type moved to mysql_priv.h
      e83e1053
    • unknown's avatar
      Fix bug#11482 4.1.12 produces different resultset for a complex query · 0f41fb42
      unknown authored
        than in previous 4.1.x
      
      Wrongly applied optimization were adding NOT NULL constraint which results in
      rejecting valid rows and reduced result set.
      
      The problem was that add_notnull_conds() while checking subquery were adding
      NOT NULL constraint to left joined table, to which, normally, optimization 
      don't have to be applied.
      
      
      sql/sql_select.cc:
        Fix bug #11482 Wrongly applied optimization was erroneously rejecting valid rows
        Constraint were added to optimization appliance test.
      mysql-test/t/select.test:
        Test case for bug #11482  Wrongly applied optimization was erroneously rejecting valid rows
      mysql-test/r/select.result:
        Test case for bug #11482  Wrongly applied optimization was erroneously rejecting valid rows
      0f41fb42
    • unknown's avatar
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 213c0540
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0
      
      
      BitKeeper/etc/config:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/sp-security.result:
        merge
      mysql-test/r/view.result:
        merge
      mysql-test/t/sp-security.test:
        merge
      mysql-test/t/view.test:
        merge
      sql/item_cmpfunc.cc:
        merge
      sql/sql_class.h:
        merge
      213c0540
    • unknown's avatar
      stop evaluation constant functions in WHERE (BUG#4663) · e84229b0
      unknown authored
      correct value of CURRENT_USER() in SP with "security definer" (BUG#7291)
      
      
      BitKeeper/etc/config:
        switch off open logging
      mysql-test/r/sp-security.result:
        correct value from current_user() in function run from "security definer"
      mysql-test/r/view.result:
        evaluation constant functions in WHERE (BUG#4663)
      mysql-test/t/sp-security.test:
        correct value from current_user() in function run from "security definer"
      mysql-test/t/view.test:
        evaluation constant functions in WHERE (BUG#4663)
      sql/item.cc:
        Item_static_string_func creation if it is need
      sql/item.h:
        support of Item_static_string_func creation
      sql/item_cmpfunc.cc:
        do not evaluate items during view creation
      sql/item_create.cc:
        create Item_func_user
      sql/item_strfunc.cc:
        Item_func_sysconst in case of converting value still have to correctly print itself
        => use Item_static_string_func instead of Item_string
            Item_func_user return USER() or CURRENT_USER()
      sql/item_strfunc.h:
        support of correct charset conversion procedure in Item_func_sysconst
      sql/sql_class.h:
        new method
      sql/sql_yacc.yy:
        Item_func_user now support both USER() and CURRENT_USER(), so we have to pass parametr what it is
      e84229b0
    • unknown's avatar
      Merge linux.site:/home/reggie/bk/bug7403 · d49ddbd7
      unknown authored
      into  linux.site:/home/reggie/bk/mysql-5.0
      
      
      sql/mysqld.cc:
        merging in changes from 4.1
      d49ddbd7
    • unknown's avatar
      Removed dead options, fixed pentium script to no longer ask for isam (its not included in 5.0). · ba52e741
      unknown authored
      
      BUILD/SETUP.sh:
        Removed dead options, added blackhole option
      BUILD/compile-pentium-debug-max-no-embedded:
        Updated option to remove unused option
      ba52e741
    • unknown's avatar
      Post-review fix: Made test bug9538 test robust. · 51308e23
      unknown authored
      
      mysql-test/r/sp.result:
        Made test bug9538 test robust.
      mysql-test/t/sp.test:
        Made test bug9538 test robust.
      51308e23
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 5bbb1a69
      unknown authored
      into  mysql.com:/home/pem/work/mysql-5.0
      
      
      5bbb1a69
    • unknown's avatar
      b5d9a764
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3a92d85a
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      tests/mysql_client_test.c:
        Auto merged
      3a92d85a
    • unknown's avatar
      Fixed BUG#9538: SProc: Creation fails if we try to SET system variable · 6f619804
      unknown authored
                        using @@var_name in proc
        Made sure we don't lose the tokenizer state when swapping lex in during SET
        parsing.
      
      
      mysql-test/r/sp.result:
        New test case for BUG#9538.
      mysql-test/t/sp.test:
        New test case for BUG#9538.
      sql/sp_head.cc:
        Keep lex->next_state when swapping lex during SP parsing (for SET mainly),
        otherwise the tokenizer gets confused.
      6f619804
    • unknown's avatar
      Made .c files compile with a C compiler. · c5d4befb
      unknown authored
      
      ndb/src/common/portlib/NdbMutex.c:
        Turned into C code.
      ndb/src/common/portlib/NdbThread.c:
        Turned into C code.
      c5d4befb
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9e1cf0e2
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      tests/mysql_client_test.c:
        Auto merged
      9e1cf0e2
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · f9e9cd93
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      f9e9cd93
    • unknown's avatar
      minor fix for restoring the previous characterset in · e54cc5b9
      unknown authored
      test_client_character_set
      
      
      tests/mysql_client_test.c:
        minor fix for restoring the previous characterset.
      e54cc5b9
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 435846b8
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      435846b8
    • unknown's avatar
      Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 · d4c6b820
      unknown authored
      into lmy002.wdf.sap.corp:/home/georg/work/mysql-5.0
      
      
      d4c6b820
    • unknown's avatar
      Fix for bug #11037. · 6fcb9c8e
      unknown authored
      When all rows are fetched subsequent calls to mysql_stmt_fetch return
      now MYSQL_NO_DATA instead of errorcode 1.
      
      
      libmysql/libmysql.c:
        fix for bug#11037
      tests/mysql_client_test.c:
        added new testcase for bug #11037
      6fcb9c8e
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0589559e
      unknown authored
      into  linux.site:/home/reggie/bk/bug7403
      
      
      0589559e
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · dba31904
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new
      
      
      tests/mysql_client_test.c:
        Auto merged
      dba31904
    • unknown's avatar
      Merge · 51229d4b
      unknown authored
      
      mysql-test/t/ctype_utf8.test:
        Auto merged
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        Auto merged
      ndb/src/common/transporter/Transporter.hpp:
        Auto merged
      ndb/src/common/transporter/TransporterRegistry.cpp:
        Auto merged
      ndb/src/mgmclient/CommandInterpreter.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Auto merged
      ndb/src/mgmsrv/Services.cpp:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      ndb/include/transporter/TransporterRegistry.hpp:
        SCCS merged
      ndb/src/common/transporter/Transporter.cpp:
        SCCS merged
      51229d4b
    • unknown's avatar
      minor type fixes to prev patch · dbbd54e5
      unknown authored
      dbbd54e5
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-release · 2a48132e
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new
      
      
      mysql-test/t/ctype_utf8.test:
        Auto merged
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        Auto merged
      ndb/src/common/transporter/TransporterRegistry.cpp:
        Auto merged
      ndb/src/mgmclient/CommandInterpreter.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Auto merged
      ndb/src/mgmsrv/Services.cpp:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      2a48132e
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-4.1-release · 130cd50d
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-release
      
      
      130cd50d