1. 04 Oct, 2006 4 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 835fb471
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug19356/my50-bug19356
      
      
      BitKeeper/etc/collapsed:
        auto-union
      835fb471
    • unknown's avatar
      Bug#19356: Assert on undefined @uservar in prepared statement execute · f60ea288
      unknown authored
      The executing code had a safety assertion so that it refused to free Items
      that it didn't create.  However, there is a case, undefined user variables,
      which would put Items into the list to be freed.
      
      Instead, do something that is more risky in expectation that the code will 
      be refactored soon, as Kostja wants to do:  Remove the assertions from 
      prepare() and execute().  Put one assertion at a higher level, before 
      stmt->set_params_from_vars(), which may then create new to-be-freed Items .
      
      
      mysql-test/r/ps_11bugs.result:
        Create tests to prove that undefined variables work, as keys and not, and 
        that variables explicitly assigned to Null work.
      mysql-test/t/ps_11bugs.test:
        Create tests to prove that undefined variables work, as keys and not, and 
        that variables explicitly assigned to Null work.
      sql/sql_prepare.cc:
        Move a safety assertion up one level and higher, because there is 
        legitimately a case where thd->free_list is not NULL going into 
        Prepared_statement::{prepare,execute} methods.
        
        Kostja plans to refactor this code so that it is both safe and works.  
        (Now it works, but isn't very safe.)
      f60ea288
    • unknown's avatar
      Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19024/my50-bug19024 · b056cc3b
      unknown authored
      into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
      
      
      sql/set_var.cc:
        Auto merged
      b056cc3b
    • unknown's avatar
      Bug #19024- SHOW COUNT(*) WARNINGS not return Errors · aaef575f
      unknown authored
        
      The server variable warning_count should include the number of warnings, errors and notes according to the manual
      
      
      mysql-test/r/user_var.result:
        Added warning_count results.
      mysql-test/t/user_var.test:
        Added test case for warning_count.
      sql/set_var.cc:
        Added number errors to warning_count.
      aaef575f
  2. 03 Oct, 2006 8 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-runtime · 1535da65
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      BitKeeper/etc/collapsed:
        auto-union
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      1535da65
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-rpl · 7d748765
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      client/mysql.cc:
        Auto merged
      include/m_ctype.h:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/strict.result:
        Auto merged
      mysql-test/r/warnings.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      7d748765
    • unknown's avatar
      Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · b274c522
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      scripts/mysqlhotcopy.sh:
        Auto merged
      b274c522
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1-rpl.b8663 · c317c2d2
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0-rpl
      
      
      mysql-test/r/cast.result:
        null merge for bug#8663
        It will beed another fix for 5.0
        - changes in new DECIMAL instead of FLOAT
      mysql-test/r/ps.result:
        null merge
      mysql-test/t/cast.test:
        null merge
      mysql-test/t/count_distinct3.test:
        null merge
      sql/item_func.cc:
        null merge
      c317c2d2
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 2f040528
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      2f040528
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1-maint · 387aa13c
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      387aa13c
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1.b8663 · dc62ff55
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1-rpl
      
      
      mysql-test/r/cast.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      sql/item_func.cc:
        Auto merged
      dc62ff55
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · f0cd4a83
      unknown authored
      into  mysql.com:/usr/home/ram/work/bug22271/my50-bug22271
      
      
      sql/field.cc:
        Auto merged
      f0cd4a83
  3. 02 Oct, 2006 28 commits
    • unknown's avatar
      Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · 55badb12
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      include/m_ctype.h:
        Auto merged
      include/my_global.h:
        Manual merge
      55badb12
    • unknown's avatar
      Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 · 5d5ef846
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      BitKeeper/etc/ignore:
        auto-union
      sql/item_func.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      5d5ef846
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · e9275f47
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.0
      
      
      e9275f47
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1-maint · 61758d08
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      61758d08
    • unknown's avatar
      Add ATTRIBUTE_FORMAT_FPTR macro for setting format specifier also on function pointers · cdec7323
      unknown authored
      This was available from gcc 3.1, so diable it before that
      Update m_ctype.h to use the new macro
      
      
      include/m_ctype.h:
        Use macro ATTRIBUTE_FORMAT_FPTR on function pointer
      include/my_global.h:
        Add ATTRIBUTE_FORMAT_FPTR macro for setting format specifier also on function pointers
        This was available from gcc 3.1, so diable it before that
      cdec7323
    • unknown's avatar
      Merge siva.hindu.god:/usr/home/tim/m/bk/40 · 1b665fa7
      unknown authored
      into  siva.hindu.god:/usr/home/tim/m/bk/41
      
      
      scripts/mysqlhotcopy.sh:
        Auto merged
      1b665fa7
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · ce1a7d99
      unknown authored
      into  siva.hindu.god:/usr/home/tim/m/bk/41
      
      
      ce1a7d99
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.0 · 2f7849df
      unknown authored
      into  siva.hindu.god:/usr/home/tim/m/bk/40
      
      
      2f7849df
    • unknown's avatar
      Merge siva.hindu.god:/usr/home/tim/m/bk/50 · b2003316
      unknown authored
      into  siva.hindu.god:/usr/home/tim/m/bk/wl3516/50
      
      
      b2003316
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 2e219863
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      2e219863
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 60dc71eb
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      include/my_global.h:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Manual merge
      sql/mysqld.cc:
        Manual merge
      60dc71eb
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 · 72bff0c9
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21081
      
      
      72bff0c9
    • unknown's avatar
      Raise version number · 84000c37
      unknown authored
      84000c37
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 990763fe
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726
      
      
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      990763fe
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl · 0ca2e21b
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
      
      
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      0ca2e21b
    • unknown's avatar
      Remove faulty merge · c71ecd92
      unknown authored
      c71ecd92
    • unknown's avatar
      When compiling with qcc on QNC the define __GNUC__will be set although it... · 5bd5f55e
      unknown authored
      When compiling with qcc on QNC the define __GNUC__will be set although it doesn't support full GNU syntax
       - disable __attribute__ when using qcc
      
      
      include/my_global.h:
        Disable __attribute__ when compiling with qcc
      5bd5f55e
    • unknown's avatar
      Remove faulty merge causing ctype_utf8 failure · 4c59fcea
      unknown authored
      4c59fcea
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1-maint · b85d8034
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      b85d8034
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · 1672af1f
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      mysql-test/r/ctype_utf8.result:
        Manual merge
      mysql-test/t/ctype_utf8.test:
        Manual merge
      1672af1f
    • unknown's avatar
      BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID · be929087
      unknown authored
      Non-upper-level INSERTs (the ones in the body of stored procedure,
      stored function, or trigger) into a table that have AUTO_INCREMENT
      column didn't affected the result of LAST_INSERT_ID() on this level.
      
      The problem was introduced with the fix of bug 6880, which in turn was
      introduced with the fix of bug 3117, where current insert_id value was
      remembered on the first call to LAST_INSERT_ID() (bug 3117) and was
      returned from that function until it was reset before the next
      _upper-level_ statement (bug 6880).
      
      The fix for bug#21726 brings back the behaviour of version 4.0, and
      implements the following: remember insert_id value at the beginning
      of the statement or expression (which at that point equals to
      the first insert_id value generated by the previous statement), and
      return that remembered value from LAST_INSERT_ID() or @@LAST_INSERT_ID.
      
      Thus, the value returned by LAST_INSERT_ID() is not affected by values
      generated by current statement, nor by LAST_INSERT_ID(expr) calls in
      this statement.
      
      Version 5.1 does not have this bug (it was fixed by WL 3146).
      
      
      mysql-test/r/rpl_insert_id.result:
        Add results for bug#21726: Incorrect result with multiple invocations
        of LAST_INSERT_ID, and bug#20339: stored procedure using LAST_INSERT_ID()
        does not replicate statement-based.
      mysql-test/t/rpl_insert_id.test:
        Add test cases for bug#21726: Incorrect result with multiple invocations
        of LAST_INSERT_ID, and bug#20339: stored procedure using LAST_INSERT_ID()
        does not replicate statement-based.
      sql/item_func.cc:
        Add implementation of Item_func_last_insert_id::fix_fields(), where we
        remember in THD::current_insert_id the first value generated during
        execution of the previous statement, which is returned then from
        Item_func_last_insert_id::val_int().
      sql/item_func.h:
        Add declaration of Item_func_last_insert_id::fix_fields().
      sql/log_event.cc:
        Do not set THD::last_insert_id_used on LAST_INSERT_ID_EVENT.  Though we
        know the statement will call LAST_INSERT_ID(), it wasn't called yet.
      sql/set_var.cc:
        In sys_var_last_insert_id::value_ptr() remember in
        THD::current_insert_id the first value generated during execution of the
        previous statement, and return this value for @@LAST_INSERT_ID.
      sql/sql_class.cc:
        Reset THD::last_insert_id_used after each statement execution.
      sql/sql_class.h:
        Rather then remember current insert_id value on first invocation of
        THD::insert_id(), remember it in Item_func_last_insert_id::fix_fields(),
        sys_var_last_insert_id::value_ptr(), or mysql_execute_command().
        Remove THD::insert_id(), as it lost its value now.
      sql/sql_insert.cc:
        THD::insert_id() is removed, use THD::last_insert_id directly.
      sql/sql_load.cc:
        THD::insert_id() is removed, using THD::last_insert_id directly is OK.
      sql/sql_parse.cc:
        Remember in THD::current_insert_id first generated insert id value of
        the previous statement in mysql_execute_command().
        No need to reset THD::last_insert_id_used in
        mysql_reset_thd_for_next_command(), it will be reset after each
        statement.
      sql/sql_select.cc:
        If "IS NULL" is replaced with "= <LAST_INSERT_ID>", use right value,
        which is THD::current_insert_id, and also set THD::last_insert_id_used
        to issue binary log LAST_INSERT_ID_EVENT.
      sql/sql_update.cc:
        THD::insert_id() is removed, use THD::last_insert_id directly.
      tests/mysql_client_test.c:
        Add test case for bug#21726: Incorrect result with multiple invocations
        of LAST_INSERT_ID.
      be929087
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines · 3ab74528
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
      
      
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      sql/table.cc:
        Auto merged
      3ab74528
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · ef5fe1f2
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
      
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/table.cc:
        Auto merged
      ef5fe1f2
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.0 · 9076d70e
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
      
      
      9076d70e
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 · 350ec8b1
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
      
      
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      sql/table.cc:
        Auto merged
      350ec8b1
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · afc1f9f8
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      afc1f9f8