1. 17 Feb, 2008 6 commits
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 1e62af86
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/sp.result:
        Null merge.
      mysql-test/t/sp.test:
        Null merge.
      1e62af86
    • unknown's avatar
      Post-merge fix. · e3180667
      unknown authored
      e3180667
    • unknown's avatar
      Merge kaamos.(none):/data/src/mysql-5.1 · 695865fe
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      libmysqld/lib_sql.cc:
        Auto merged
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      BitKeeper/deleted/.del-rpl_ndb_charset.result:
        Auto merged
      BitKeeper/deleted/.del-rpl_row_charset.result:
        Auto merged
      BitKeeper/deleted/.del-rpl_row_charset.test:
        Auto merged
      BitKeeper/deleted/.del-rpl_row_charset_innodb.result:
        Auto merged
      mysql-test/t/create.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        Manual merge.
      mysql-test/r/sp.result:
        Manual merge.
      695865fe
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/mysql-4.1-opt · b546edb4
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.0-opt
      
      
      b546edb4
    • unknown's avatar
      Merge kaamos.(none):/data/src/mysql-5.0 · 4a834b4b
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.0-opt
      
      
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/sp.result:
        Manual merge.
      mysql-test/t/sp.test:
        Manual merge.
      4a834b4b
    • unknown's avatar
      Merge kaamos.(none):/data/src/mysql-4.1 · f364c099
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-4.1-opt
      
      
      f364c099
  2. 15 Feb, 2008 1 commit
  3. 14 Feb, 2008 6 commits
  4. 13 Feb, 2008 9 commits
    • unknown's avatar
      Merge host.loc:/home/uchum/work/5.1-opt-gca · 801cc51c
      unknown authored
      into  host.loc:/home/uchum/work/5.1-opt
      
      
      801cc51c
    • unknown's avatar
      Post-merge fixes. · 3d35b019
      unknown authored
      3d35b019
    • unknown's avatar
      Merge host.loc:/home/uchum/work/5.0-opt-gca · be891fc6
      unknown authored
      into  host.loc:/home/uchum/work/5.0-opt
      
      
      be891fc6
    • unknown's avatar
      Merge host.loc:/home/uchum/work/5.0-opt-gca · 22e27626
      unknown authored
      into  host.loc:/home/uchum/work/5.1-opt-gca
      
      
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      22e27626
    • unknown's avatar
      Fixed bug#31194: Privilege ordering does not order properly · 7a290b55
      unknown authored
                       for wildcard values.
      The server ignored escape character before wildcards during
      the calculation of priority values for sorting of a privilege
      list. (Actually the server counted an escape character as an
      ordinary wildcard like % or _). I.e. the table name template
      with a wildcard character like 'tbl_1' had higher priority in
      a privilege list than concrete table name without wildcards
      like 'tbl\_1', and some privileges of 'tbl\_1' was hidden
      by privileges for 'tbl_1'.
      
      The get_sort function has been modified to ignore escaped
      wildcards as usual.
      
      
      
      mysql-test/r/grant3.result:
        Added test case for bug#31194.
      mysql-test/t/grant3.test:
        Added test case for bug#31194.
      sql/sql_acl.cc:
        Fixed bug#31194.
        The server used the wild_prefix escape character (usually \-character)
        like % and _ wildcards in the get_sort function for sorting weights
        calculation.
        
        The get_sort function has been modified to ignore escaped wildcards
        and alone escapes like in the wild_case_compare function.
      7a290b55
    • unknown's avatar
      Fixed bug#33764: Wrong result with IN(), CONCAT() and implicit · 247efb9c
      unknown authored
                       type conversion.
      
      Instead of copying of whole character string from a temporary
      buffer, the server copied a short-living pointer to that string
      into a long-living structure. That has been fixed.
      
      
      mysql-test/r/select.result:
        Added test case for bug#33764.
      mysql-test/t/select.test:
        Added test case for bug#33764.
      sql/item_cmpfunc.cc:
        Fixed bug#33764.
        Copying of a pointer has been replaced with an optional copying of
        a whole array to a newly allocated memory space in case of a
        functional source item.
      247efb9c
    • unknown's avatar
      Removing non-deterministic tests from events_scheduling test. · 0f19e844
      unknown authored
      
      mysql-test/r/events_scheduling.result:
        Result change.
      mysql-test/t/events_scheduling.test:
        Removing a test that only confirms that event scheduling is
        inexact, hence causing sporadic failures on loaded machines.
      0f19e844
    • unknown's avatar
      The test rpl_row_charset and it dependent rpl_ndb_charset is · 4a7d3293
      unknown authored
      irrelevant to execute since the charset information does not
      affect replication for row-based replication. The row-based
      versions of the tests were removed, and the statement-based
      version of the test was made executable by all three modes.
      
      This involves removing any lines that causes the test to be
      dependent on the contents of the binary log, and instead we
      just check that the replication works as it should.
      
      
      BitKeeper/deleted/.del-rpl_ndb_charset.test:
        Delete: mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test
      BitKeeper/deleted/.del-rpl_ndb_charset.result:
        Delete: mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result
      BitKeeper/deleted/.del-rpl_row_charset.test:
        Delete: mysql-test/extra/rpl_tests/rpl_row_charset.test
      BitKeeper/deleted/.del-rpl_row_charset.test~739be9df1baaee3e:
        Delete: mysql-test/suite/rpl/t/rpl_row_charset.test
      BitKeeper/deleted/.del-rpl_row_charset_innodb.test:
        Delete: mysql-test/suite/rpl/t/rpl_row_charset_innodb.test
      BitKeeper/deleted/.del-rpl_row_charset_innodb-master.opt:
        Delete: mysql-test/suite/rpl/t/rpl_row_charset_innodb-master.opt
      BitKeeper/deleted/.del-rpl_row_charset_innodb-slave.opt:
        Delete: mysql-test/suite/rpl/t/rpl_row_charset_innodb-slave.opt
      BitKeeper/deleted/.del-rpl_row_charset_innodb.result:
        Delete: mysql-test/suite/rpl/r/rpl_row_charset_innodb.result
      BitKeeper/deleted/.del-rpl_row_charset.result:
        Delete: mysql-test/suite/rpl/r/rpl_row_charset.result
      mysql-test/extra/rpl_tests/rpl_charset.test:
        Test is not dependent on binlog format any more.
        Using --echo instead of "select" to print text.
        Removing lines causing the test to be dependent on binlog contents.
      mysql-test/suite/rpl/r/rpl_charset.result:
        Result change.
      mysql-test/suite/rpl/t/rpl_charset.test:
        Using renamed version of test file.
      4a7d3293
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 91123903
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      mysql-test/r/heap.result:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      BitKeeper/deleted/.del-bdb.result:
        Auto merged
      mysql-test/r/strict.result:
        Auto merged
      mysql-test/r/type_binary.result:
        Auto merged
      mysql-test/r/type_set.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/r/warnings.result:
        Auto merged
      mysql-test/t/range.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      mysql-test/t/warnings.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/mysqld.cc:
        Null merge.
      mysql-test/include/mix1.inc:
        Manual merge.
      mysql-test/r/innodb_mysql.result:
        Manual merge.
      mysql-test/r/range.result:
        Manual merge.
      mysql-test/r/sp.result:
        Manual merge.
      mysql-test/t/sp.test:
        Manual merge.
      sql/handler.cc:
        Manual merge.
      91123903
  5. 12 Feb, 2008 7 commits
    • unknown's avatar
      Merge mbp:src/opt/bug33389/my51-bug25162 · 00b17696
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      00b17696
    • unknown's avatar
      Merge mbp:src/opt/bug33389/my50-bug25162 · c6610b57
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.0-opt
      
      
      sql/item.cc:
        Auto merged
      c6610b57
    • unknown's avatar
      Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt · 8fe44ccb
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      8fe44ccb
    • unknown's avatar
      Merge mbp.:/Users/kaa/src/opt/bug33389/my50-bug25162 · 9b483c31
      unknown authored
      into  mbp.:/Users/kaa/src/opt/bug33389/my51-bug25162
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Manual merge.
      sql/item.cc:
        Manual merge.
      9b483c31
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · d83cd214
      unknown authored
      into  moonbone.local:/work/31590-bug-5.0-opt-mysql
      
      
      d83cd214
    • unknown's avatar
      Various fixes to fix memory leaks after merging replication · abe4c14a
      unknown authored
      tree with main.
      
      
      sql/sql_binlog.cc:
        Adding code to free memory after execution of BINLOG statement.
        It caused a memory leak in the case that the execution failed
        for any reason.
      sql/sql_class.cc:
        Since rli_fake is checked for NULL at various occations to mean
        that no rli_fake is assigned, NULL is assigned to rli_fake after
        deleting the instance.
      abe4c14a
    • unknown's avatar
      Fix for bug #33389: Selecting from a view into a table from within SP · d5092fa9
      unknown authored
                          or trigger crashes server
      
      Under some circumstances a combination of VIEWs, subselects with outer
      references and PS/SP/triggers could lead to use of uninitialized memory
      and server crash as a result.
      
      Fixed by changing the code in Item_field::fix_fields() so that in cases
      when the field is a VIEW reference, we first check whether the field
      is also an outer reference, and mark it appropriately before returning.
      
      
      mysql-test/r/view.result:
        Added a test case for bug #33389.
      mysql-test/t/view.test:
        Added a test case for bug #33389.
      sql/item.cc:
        In cases when in Item_field::fix_fields() from_field is a view reference,
        do not return too early, i.e. before marking the reference as an outer
        one when needed.
      d5092fa9
  6. 11 Feb, 2008 11 commits