1. 13 Jul, 2006 1 commit
  2. 10 Jul, 2006 4 commits
    • unknown's avatar
      more 4.1->5.0 merge fixes for bug#14553 · fbd9103b
      unknown authored
      
      mysql-test/r/rpl_insert_id.result:
        more merge fixes for bug#14553
      mysql-test/t/rpl_insert_id.test:
        more merge fixes for bug#14553
      fbd9103b
    • unknown's avatar
      Merge macbook.gmz:/Users/kgeorge/mysql/work/B14553-4.1-opt · a8a6361b
      unknown authored
      into  macbook.gmz:/Users/kgeorge/mysql/work/B14553-5.0-opt
      
      
      mysql-test/r/odbc.result:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/rpl_insert_id.result:
        merge the test at the end of 4.1 test
      mysql-test/t/rpl_insert_id.test:
        merge the test at the end of 4.1 test
      sql/sql_class.cc:
        merged
      sql/sql_class.h:
        merged
      a8a6361b
    • unknown's avatar
      Merge rakia:mysql/4.1/B14553 · ca1e4aab
      unknown authored
      into  macbook.gmz:/Users/kgeorge/mysql/work/B14553-4.1-opt
      
      
      sql/sql_class.cc:
        SCCS merged
      sql/sql_select.cc:
        SCCS merged
      ca1e4aab
    • unknown's avatar
      BUG#14553: NULL in WHERE resets LAST_INSERT_ID · 0806d9a8
      unknown authored
      To make MySQL compatible with some ODBC applications, you can find
      the AUTO_INCREMENT value for the last inserted row with the following query:
       SELECT * FROM tbl_name WHERE auto_col IS NULL.
      This is done with a special code that replaces 'auto_col IS NULL' with
      'auto_col = LAST_INSERT_ID'.
      However this also resets the LAST_INSERT_ID to 0 as it uses it for a flag
      so as to ensure that only the first SELECT ... WHERE auto_col IS NULL
      after an INSERT has this special behaviour.
      In order to avoid resetting the LAST_INSERT_ID a special flag is introduced
      in the THD class. This flag is used to restrict the second and subsequent
      SELECTs instead of LAST_INSERT_ID.
      
      
      mysql-test/r/odbc.result:
        test suite for the bug
      mysql-test/r/rpl_insert_id.result:
        test for the fix in replication
      mysql-test/t/odbc.test:
        test suite for the bug
      mysql-test/t/rpl_insert_id.test:
        test for the fix in replication
      sql/sql_class.cc:
        initialize the flag
      sql/sql_class.h:
        flag's declaration and set code when setting the last_insert_id
      sql/sql_select.cc:
        the special flag is used instead of last_insert_id
      0806d9a8
  3. 07 Jul, 2006 1 commit
  4. 06 Jul, 2006 6 commits
    • unknown's avatar
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-4.1-opt · cba001b7
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-5.0-opt
      
      
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/t/func_str.test:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      cba001b7
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt · 8cb368bc
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-4.1-opt
      
      
      8cb368bc
    • unknown's avatar
      Fixed bug #18243. · cf7627bc
      unknown authored
      The implementation of the method Item_func_reverse::val_str
      for the REVERSE function modified the argument of the function.
      This led to wrong results for expressions that contained
      REVERSE(ref) if ref occurred somewhere else in the expressions.
      
      
      mysql-test/r/func_str.result:
        Added a test case for bug #18243.
      mysql-test/t/func_str.test:
        Added a test case for bug #18243.
      sql/item_strfunc.cc:
        Fixed bug #18243.
        The implementation of the method Item_func_reverse::val_str
        for the REVERSE function modified the argument of the function.
        This led to wrong results for expressions that contained
        REVERSE(ref) if ref occurred somewhere else in the expressions.
        
        The implementation of Item_func_reverse::val_str has been changed
        to make the argument intact.
      sql/item_strfunc.h:
        Fixed bug #18243.
        Added tmp_value to the Item_func_reverse class to store
        the result of the function. It erroneously replaced the 
        argument before this fix.
      cf7627bc
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 665d46e1
      unknown authored
      into  rakia.(none):/home/kgeorge/mysql/autopush/test
      
      
      665d46e1
    • unknown's avatar
      Bug #20569 Garbage in DECIMAL results from some mathematical functions · 8e354677
      unknown authored
        Adding decimal "digits" in multiplication resulted in signed overflow and
      producing wrong results.
      
        Fixed by using large enough buffers and intermediary result types :
      dec2 (currently longlong) to hold result of adding decimal "digits" 
      (currently int32). 
      
      
      mysql-test/r/select.result:
        Bug #20569 Garbage in DECIMAL results from some mathematical functions
          * test suite for the bug
      mysql-test/t/select.test:
        Bug #20569 Garbage in DECIMAL results from some mathematical functions
          * test suite for the bug
      strings/decimal.c:
        Bug #20569 Garbage in DECIMAL results from some mathematical functions
          * fixed the overflow in adding decimal "digits"
      8e354677
  5. 05 Jul, 2006 3 commits
  6. 04 Jul, 2006 12 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 3f659cbe
      unknown authored
      into  mysql.com:/data0/knielsen/tmp-5.0
      
      
      3f659cbe
    • unknown's avatar
      ndb - ps_7ndb as discovered by pb · 95e37a4a
      unknown authored
        fix race in scan close
      
      
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Fix race in scan close
      95e37a4a
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 0e1005a4
      unknown authored
      into  mysql.com:/data0/knielsen/tmp-5.0
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      0e1005a4
    • unknown's avatar
      Merge tomas@poseidon:mysql-5.0-main · 05348e41
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      05348e41
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 19096dc0
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      19096dc0
    • unknown's avatar
      Merge mysqldev@production:my/mysql-5.0-release · 520cd485
      unknown authored
      into  rt.int.sifira.dk:/usr/local/mysql/tmp-5.0
      
      
      include/my_sys.h:
        Auto merged
      mysql-test/r/key.result:
        Auto merged
      mysql-test/t/key.test:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      520cd485
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · ce3e4de9
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-release
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      ce3e4de9
    • unknown's avatar
      Bug #20784 Uninitialized memory in update on table with PK not on first column · 8597f663
      unknown authored
      - partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update
      
      
      8597f663
    • unknown's avatar
      Better comments for void Item::top_level_item() · 1401c2c7
      unknown authored
      1401c2c7
    • unknown's avatar
      Merge mysql.com:/home/kgeorge/mysql/5.0/teamclean · 8a67bdd0
      unknown authored
      into  mysql.com:/home/kgeorge/mysql/5.0/B16110
      
      
      mysql-test/r/view.result:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      8a67bdd0
    • unknown's avatar
      Bug #16110: insert permitted into view col w/o default value · e08ff115
      unknown authored
      When compiling INSERT statements the check whether columns are provided values
      depends on the flag whether a field is used in that query (Field::query_id).
      However the check for updatability of VIEW columns (check_view_insertability())
      was calling fix_fields() and thus setting the Field::query_id even for the 
      view fields that are not referenced in the current INSERT statement.
      So the correct check for columns without default values 
      ( check_that_all_fields_are_given_values() ) is assuming that all the VIEW
      columns were mentioned in the INSERT field list and was issuing no 
      warnings or errors.
      Fixed check_view_insertability() to turn off the flag whether or not to set
      Field::query_id (THREAD::set_query_id) before calling fix fields and restore
      it when it's done.
      
      
      mysql-test/r/view.result:
        Bug #16110: insert permitted into view col w/o default value
          * test case
      mysql-test/t/view.test:
        Bug #16110: insert permitted into view col w/o default value
          * test case
      sql/sql_insert.cc:
        Bug #16110: insert permitted into view col w/o default value
          * avoid setting the "field used" flag for fields when checking view columns 
            for updatability.
          * a missing DBUG_RETURN added.
      e08ff115
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 27181aa1
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      27181aa1
  7. 03 Jul, 2006 7 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 06af76d2
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      06af76d2
    • unknown's avatar
      Bug#20783: Valgrind uninitialised warning in test case ctype_uca · c3ef0267
      unknown authored
        
      Two functions have different ideas of what a string should look like;
      one of them reads memory it assumes the other one may have written.
      And "if you assume ..."
        
      We now use a more defensive variety of the assuming function, this fixes
      a warning thrown by the valgrind tool.
      
      
      sql/item_cmpfunc.cc:
        c_ptr() makes incorrect assumptions about the string we get from
        out of args[0]->val_str(&tmp); c_str_safe() is more defensive.
      c3ef0267
    • unknown's avatar
      client.c: · e34b9cfb
      unknown authored
        Define 'mysql_get_ssl_cipher' even if no SSL built in, it is referenced in libmysql.def
      
      
      sql-common/client.c:
        Define 'mysql_get_ssl_cipher' even if no SSL built in, it is referenced in libmysql.def
      e34b9cfb
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.0-release · 3702ae2d
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
      
      
      3702ae2d
    • unknown's avatar
      mwldnlm, mwccnlm, mwasmnlm: · 9ecc01a9
      unknown authored
        Use Perl for filtering, do more filtering
      
      
      netware/BUILD/mwasmnlm:
        Use Perl for filtering, do more filtering
      netware/BUILD/mwccnlm:
        Use Perl for filtering, do more filtering
      netware/BUILD/mwldnlm:
        Use Perl for filtering, do more filtering
      9ecc01a9
    • unknown's avatar
      Makefile.am: · 97c21888
      unknown authored
        Avoid duplicate symbol errors on Netware
      mwldnlm, mwccnlm, mwasmnlm:
        Filter garbage characters from output
      
      
      netware/BUILD/mwasmnlm:
        Filter garbage characters from output
      netware/BUILD/mwccnlm:
        Filter garbage characters from output
      netware/BUILD/mwldnlm:
        Filter garbage characters from output
      tests/Makefile.am:
        Avoid duplicate symbol errors on Netware
      97c21888
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3e085bd8
      unknown authored
      into mysql.com:/home/gluh/MySQL/Merge/5.0-kt
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      3e085bd8
  8. 01 Jul, 2006 5 commits
    • unknown's avatar
      mysqld.vcproj: · 84e72c2b
      unknown authored
        Don't define __NT__ for 'Max' target
      
      
      VC++Files/sql/mysqld.vcproj:
        Don't define __NT__ for 'Max' target
      84e72c2b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4c2db1be
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-runtime
      
      
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/t/func_sapdb.test:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      4c2db1be
    • unknown's avatar
      my_sys.h: · 805e8554
      unknown authored
        Added missing parameter type change for _my_strdup_with_length()
      
      
      include/my_sys.h:
        Added missing parameter type change for _my_strdup_with_length()
      805e8554
    • unknown's avatar
      Post-merge fix · 047e2be2
      unknown authored
      047e2be2
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 87d04015
      unknown authored
      into  mysql.com:/home/psergey/mysql-5.0-bug16168-merge
      
      
      87d04015
  9. 30 Jun, 2006 1 commit