1. 18 Jun, 2007 1 commit
    • unknown's avatar
      Bug#28677: SELECT on missing column gives extra error · 3d31e3d6
      unknown authored
      The method select_insert::send_error does two things, it rolls back a statement
      being executed and outputs an error message. But when a 
      nonexistent column is referenced, an error message has been published already and
      there is no need to publish another.
      Fixed by moving all functionality beyond publishing an error message into 
      select_insert::abort() and calling only that function.
      
      
      mysql-test/r/errors.result:
        Bug#28677: test result
      mysql-test/t/errors.test:
        Bug#28677: test case
      sql/sql_class.h:
        Bug#28677: overriding abort()
      sql/sql_insert.cc:
        Bug#28677: 
        - moved everything beyond producing an error message out of select_insert::send_error 
        and into new override select_insert::abort() 
        - made corresponding move of code from select_create::send_error to select_create::abort
      sql/sql_select.cc:
        Bug#28677: No need to pusblish an error here
      3d31e3d6
  2. 21 May, 2007 10 commits
    • unknown's avatar
      14cb59d8
    • unknown's avatar
      Bug#27507: Wrong DATETIME value was allowed by ALTER TABLE in the NO_ZERO_DATE · f3b78f34
      unknown authored
      mode.
      
      When a new DATE/DATETIME field without default value is being added by the
      ALTER TABLE the '0000-00-00' value is used as the default one. But it wasn't
      checked whether such value was allowed by the set sql mode. Due to this
      '0000-00-00' values was allowed for DATE/DATETIME fields even in the
      NO_ZERO_DATE mode.
      
      Now the mysql_alter_table() function checks whether the '0000-00-00' value
      is allowed for DATE/DATETIME fields by the set sql mode.
      The new error_if_not_empty flag is used in the mysql_alter_table() function
      to indicate that it should abort if the table being altered isn't empty.
      The new new_datetime_field field is used in the mysql_alter_table() function
      for error throwing purposes. 
      The new error_if_not_empty parameter is added to the copy_data_between_tables()
      function to indicate the it should return error if the source table isn't empty.
      
      
      mysql-test/t/alter_table.test:
        Added a test case for the bug#27507: Wrong DATETIME value was allowed by
        ALTER TABLE in the NO_ZERO_DATE mode.
      mysql-test/r/alter_table.result:
        Added a test case for the bug#27507: Wrong DATETIME value was allowed by
        ALTER TABLE in the NO_ZERO_DATE mode.
      sql/sql_table.cc:
        Bug#27507: Wrong DATETIME value was allowed by ALTER TABLE in the NO_ZERO_DATE
        mode.
        Now the mysql_alter_table() function checks whether the '0000-00-00' value
        is allowed for DATE/DATETIME fields by the set sql mode.
        The new error_if_not_empty flag is used in the mysql_alter_table() function
        to indicate that it should abort if the table being altered isn't empty.
        The new new_datetime_field field is used in the mysql_alter_table() function
        for error throwing purposes. 
        The new error_if_not_empty parameter is added to the copy_data_between_tables()
        function to indicate the it should return error if the source table isn't empty.
      f3b78f34
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · bc31b650
      unknown authored
      into  mysql.com:/home/hf/work/27984/my50-27984
      
      
      bc31b650
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · 741bbb75
      unknown authored
      into  mysql.com:/home/hf/work/27984/my50-27984
      
      
      mysql-test/r/type_newdecimal.result:
        merging
      mysql-test/t/type_newdecimal.test:
        merging
      741bbb75
    • unknown's avatar
      Bug #27984 Long Decimal Maths produces truncated results. · cfb9378b
      unknown authored
      decimal_round failed to perform a correct rounding 
      of a decimal number if its first nine digits were '9'.
      It just sets those digits to 0.
      
      
      mysql-test/r/type_newdecimal.result:
        Bug #27984 Long Decimal Maths produces truncated results.
        test result
      mysql-test/t/type_newdecimal.test:
        Bug #27984 Long Decimal Maths produces truncated results.
        test case
      strings/decimal.c:
        Bug #27984 Long Decimal Maths produces truncated results.
        when to == from we break the data if we do to->buf[0]=0
        So now doing this after the data is moved and only
        if we really need to set to->buf[0] to zero
      cfb9378b
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 00ed873c
      unknown authored
      into  mysql.com:/home/hf/work/28361/my50-28361
      
      
      00ed873c
    • unknown's avatar
      test result fixed · 786adf87
      unknown authored
      786adf87
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · be043a5e
      unknown authored
      into  mysql.com:/home/hf/work/27894/my50-27894
      
      
      be043a5e
    • unknown's avatar
      Bug #28361 Buffer overflow in DECIMAL code on Windows · d2c985e3
      unknown authored
      result max length changed for the 'decimal' fields
      so test results have to be fixed
      
      
      mysql-test/r/ps_2myisam.result:
        Bug #28361 Buffer overflow in DECIMAL code on Windows 
        test result fixed
      mysql-test/r/ps_3innodb.result:
        Bug #28361 Buffer overflow in DECIMAL code on Windows 
        test result fixed
      mysql-test/r/ps_4heap.result:
        Bug #28361 Buffer overflow in DECIMAL code on Windows 
        test result fixed
      mysql-test/r/ps_5merge.result:
        Bug #28361 Buffer overflow in DECIMAL code on Windows 
        test result fixed
      mysql-test/r/ps_7ndb.result:
        Bug #28361 Buffer overflow in DECIMAL code on Windows 
        test result fixed
      d2c985e3
    • unknown's avatar
      Merge macbook:mysql/work/B22855-5.0-opt · 330a82f0
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B22855-5.0-opt
      
      
      sql/item_subselect.cc:
        Auto merged
      mysql-test/r/subselect3.result:
        manual merge
      mysql-test/t/subselect3.test:
        manual merge
      330a82f0
  3. 20 May, 2007 1 commit
    • unknown's avatar
      bug #28361 Buffer overflow in DECIMAL code on Windows · 59a7e066
      unknown authored
      my_decimal in some cases can contain more decimal digits than
      is officially supported (DECIMAL_MAX_PRECISION), so we need to
      prepare bigger buffer for the resulting string.
      
      
      mysql-test/r/type_newdecimal.result:
        bug #28361 Buffer overflow in DECIMAL code on Windows
        test result
      mysql-test/t/type_newdecimal.test:
        bug #28361 Buffer overflow in DECIMAL code on Windows
        test case
        This test case doesn't fall in most cases even without the fix
        Still valgrind shows the problemn
      sql/my_decimal.h:
        bug #28361 Buffer overflow in DECIMAL code on Windows
        DECIMAL_MAX_POSSIBLE_PRECISION introduced to be used in places,
        when we need to check for the number of digits technicaly possible
        in my_decimal.
        DECIMAL_MAX_STR_LENGTH fixed as it has to fit for the MAX_POSSIBLE_PRECISION
      59a7e066
  4. 18 May, 2007 7 commits
  5. 17 May, 2007 4 commits
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 042b1717
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28337
      
      
      042b1717
    • unknown's avatar
      Bug#28261: Wrong DATETIME comparison result when the GET_USER_VAR function · c4a4df5a
      unknown authored
      is involved.
      
      The Arg_comparator::compare_datetime() comparator caches its arguments if
      they are constants i.e. const_item() returns true. The
      Item_func_get_user_var::const_item() returns true or false based on
      the current query_id and the query_id where the variable was created.
      Thus even if a query can change its value its const_item() still will return
      true. All this leads to a wrong comparison result when an object of the
      Item_func_get_user_var class is involved.
      
      Now the Arg_comparator::can_compare_as_dates() and the
      get_datetime_value() functions never cache result of the GET_USER_VAR()
      function (the Item_func_get_user_var class).
      
      
      mysql-test/t/type_datetime.test:
        A test case is added for the bug#28261: Wrong DATETIME comparison result when the GET_USER_VAR function
        is involved.
      mysql-test/r/type_datetime.result:
        A test case is added for the bug#28261: Wrong DATETIME comparison result when the GET_USER_VAR function
        is involved.
      sql/item_cmpfunc.cc:
        Bug#28261: Wrong DATETIME comparison result when the GET_USER_VAR function
        is involved.
        Now the Arg_comparator::can_compare_as_dates() and the
        get_datetime_value() functions never cache result of the GET_USER_VAR()
        function (the Item_func_get_user_var class).
      c4a4df5a
    • unknown's avatar
      Bug#22855: · 455352b0
      unknown authored
      Conversion errors when constructing the condition for an
      IN predicates were treated as if the affected column contains
      NULL. If such a IN predicate is inside NOT we get wrong 
      results.
      Corrected the handling of conversion errors in an IN predicate 
      that is resolved by unique_subquery (through 
      subselect_uniquesubquery_engine).
      
      
      mysql-test/r/subselect3.result:
        Bug#22855: test case
      mysql-test/t/subselect3.test:
        Bug#22855: test case
      sql/item_subselect.cc:
        Bug#22855: corrected the handling of conversion errors and
        NULL key values in IN predicate that is resolved by index
        lookup.
      455352b0
    • unknown's avatar
      Fixed bug #28337: wrong results for grouping queries with correlated · dd1a1180
      unknown authored
      subqueries in WHERE conditions.
      This bug was introduced by the patch for bug 27321.
      
      
      mysql-test/r/subselect.result:
        Added a test case for bug #28337.
      mysql-test/t/subselect.test:
        Added a test case for bug #28337.
      sql/item.cc:
        Fixed bug #28337: wrong results for grouping queries with correlated
        subqueries in WHERE conditions.
        This bug was introduced by the patch for bug 27321.
        
        Now in the Item_field::fix_outer_field function we create an Item_outer_ref
        object for an outer reference only if it is used in the SELECT list or
        in the HAVING clause of the subquery against which the reference is resolved.
      dd1a1180
  6. 16 May, 2007 17 commits
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 867d3460
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      867d3460
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 2d38d4d6
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      2d38d4d6
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · b015146e
      unknown authored
      into  mysql.com:/home/hf/work/8663/my50-8663
      
      
      b015146e
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · 5e00d4b7
      unknown authored
      into  mysql.com:/home/hf/work/8663/my50-8663
      
      
      5e00d4b7
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build · b7cf6fcb
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      
      b7cf6fcb
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build-work · 42dae8f5
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
      
      
      42dae8f5
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · 2428326f
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      
      2428326f
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-runtime · 38553bcd
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      
      38553bcd
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · fe206129
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      
      fe206129
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · edd8df1c
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
      
      
      edd8df1c
    • unknown's avatar
      Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 7c70011e
      unknown authored
      into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
      
      
      7c70011e
    • unknown's avatar
      Bug#27415 Text Variables in stored procedures · d9ce3033
      unknown authored
       - Problem was reported as a SP variable using itself as 
         right value inside SUBSTR caused corruption of data. 
       - This bug could not be verified in either 5.0bk or 5.1bk
       - Added test case to prevent future regressions.
      
      
      mysql-test/r/sp-vars.result:
        Added test case for a reported regression which couldn't be
        verified.
      mysql-test/t/sp-vars.test:
        Added test case for a reported regression which couldn't be
        verified.
      d9ce3033
    • unknown's avatar
      Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt · 418a2983
      unknown authored
      into  linux-st28.site:/home/martin/mysql/src/5.0o-bug27573
      
      
      mysql-test/r/func_group.result:
        Auto merged
      mysql-test/t/func_group.test:
        bug#27573: hand merged test case
      418a2983
    • unknown's avatar
      Fix a failing assert. · 75392f37
      unknown authored
      
      sql/sql_insert.cc:
        Do not access delayed thread memory without a mutex.
      75392f37
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 7e628372
      unknown authored
      into  vajra.(none):/opt/local/work/mysql-5.0-21483
      
      
      sql/sp_head.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      7e628372
    • unknown's avatar
      A fix and a test case for · 3395c53e
      unknown authored
      Bug#21483 "Server abort or deadlock on INSERT DELAYED with another
      implicit insert"
      Also fixes and adds test cases for bugs:
      20497 "Trigger with INSERT DELAYED causes Error 1165"
      21714 "Wrong NEW.value and server abort on INSERT DELAYED to a
      table with a trigger".
      Post-review fixes.
      
      Problem:
      In MySQL INSERT DELAYED is a way to pipe all inserts into a
      given table through a dedicated thread. This is necessary for
      simplistic storage engines like MyISAM, which do not have internal
      concurrency control or threading and thus can not
      achieve efficient INSERT throughput without support from SQL layer.
      DELAYED INSERT works as follows:
      For every distinct table, which can accept DELAYED inserts and has
      pending data to insert, a dedicated thread is created to write data
      to disk. All user connection threads that attempt to
      delayed-insert into this table interact with the dedicated thread in
      producer/consumer fashion: all records to-be inserted are pushed
      into a queue of the dedicated thread, which fetches the records and 
      writes them.
      In this design, client connection threads never open or lock
      the delayed insert table.
      This functionality was introduced in version 3.23 and does not take 
      into account existence of triggers, views, or pre-locking.
      E.g. if INSERT DELAYED is called from a stored function, which,
      in turn, is called from another stored function that uses the delayed
      table, a deadlock can occur, because delayed locking by-passes
      pre-locking. Besides:
       * the delayed thread works directly with the subject table through
         the storage engine API and does not invoke triggers
       * even if it was patched to invoke triggers, if triggers,
         in turn, used other tables, the delayed thread would
         have to open and lock involved tables (use pre-locking).
       * even if it was patched to use pre-locking, without deadlock
         detection the delayed thread could easily lock out user 
         connection threads in case when the same table is used both
         in a trigger and on the right side of the insert query: 
         the delayed thread would not release locks until all inserts 
         are complete, and user connection can not complete inserts 
         without having locks on the tables used on the right side of the
         query.
      
      Solution:
      
      These considerations suggest two general alternatives for the
      future of INSERT DELAYED:
       * it is considered a full-fledged alternative to normal INSERT
       * it is regarded as an optimisation that is only relevant 
         for simplistic engines.
      Since we missed our chance to provide complete support of new
      features when 5.0 was in development, the first alternative
      currently renders infeasible.
      However, even the second alternative, which is to detect
      new features and convert DELAYED insert into a normal insert, 
      is not easy to implement.
      The catch-22 is that we don't know if the subject table has triggers
      or is a view before we open it, and we only open it in the
      delayed thread. We don't know if the query involves pre-locking
      until we have opened all tables, and we always first create
      the delayed thread, and only then open the remaining tables.
      This patch detects the problematic scenarios and converts
      DELAYED INSERT to a normal INSERT using the following approach:
       * if the statement is executed under pre-locking (e.g. from
         within a stored function or trigger) or the right
         side may require pre-locking, we detect the situation
         before creating a delayed insert thread and convert the statement
         to a conventional INSERT.
        * if the subject table is a view or has triggers, we shutdown
         the delayed thread and convert the statement to a conventional
         INSERT.
      
      
      mysql-test/r/insert.result:
        Update test results.
      mysql-test/t/insert.test:
        Add a test case for Bug#21483, Bug#20497, Bug#21714 (INSERT DELAYED
        and stored routines, triggers).
      sql/sp_head.cc:
        Upgrade lock type to TL_WRITE when computing the pre-locking set.
      sql/sql_base.cc:
        Use a new method.
      sql/sql_insert.cc:
        INSERT DELAYED and pre-locking:
        - if  under pre-locking, upgrade the lock type to TL_WRITE
        and proceed as a normal write
        - if DELAYED table has triggers, also request a lock upgrade.
        - make sure errors in the delayed thread are propagated
        correctly
      sql/sql_lex.h:
        Add a method to check if a parsed tree refers to stored
        routines.
      3395c53e
    • unknown's avatar
      bug #8663 cant use bigint unsigned as input to cast · 1e33cfb3
      unknown authored
      in the case of the overflow in the decimal->integer conversion
      we didn't return the proper boundary value, but just the result
      of the conversion we calculated on the moment of the error
      
      
      mysql-test/r/bigint.result:
        bug #8663 cant use bigint unsigned as input to cast
        test result fixed
      mysql-test/t/bigint.test:
        bug #8663 cant use bigint unsigned as input to cast
        test case
      strings/decimal.c:
        bug #8663 cant use bigint unsigned as input to cast
        decimal->int conversion fixed to return proper boundary value
        in the case of overflow
      1e33cfb3