1. 11 Mar, 2008 1 commit
  2. 10 Mar, 2008 1 commit
  3. 07 Mar, 2008 13 commits
    • unknown's avatar
      Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 1bffc510
      unknown authored
      into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
      
      
      1bffc510
    • unknown's avatar
      Merge... · fd826522
      unknown authored
      Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0
      into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
      
      
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      fd826522
    • unknown's avatar
      Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines · 7b5da0aa
      unknown authored
      into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
      
      
      configure.in:
        Auto merged
      include/mysql/plugin.h:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/r/partition_innodb.result:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      mysql-test/t/partition_innodb.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/slave.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_partition.cc:
        Auto merged
      sql/sql_plugin.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      storage/myisam/mi_dynrec.c:
        Auto merged
      7b5da0aa
    • unknown's avatar
      Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines · 1e8b11c6
      unknown authored
      into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0
      
      
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      1e8b11c6
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 0f5c6669
      unknown authored
      into  mysql.com:/home/bar/mysql-work/mysql-5.1.b27580
      
      
      0f5c6669
    • unknown's avatar
      After merge fix · 215c9456
      unknown authored
      215c9456
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG34656/mysql-5.1-engines · e0075179
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines
      
      
      e0075179
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines · 0d4fb8b4
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines
      
      
      0d4fb8b4
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-5.1-engines · 928c449a
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines
      
      
      928c449a
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines · e78f6284
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines
      
      
      e78f6284
    • unknown's avatar
      BUG#34656 - KILL a query = Assertion failed: m_status == DA_ERROR || · 44df0f6e
      unknown authored
                  m_status == DA_OK
      
      Reading from information_scema.tables or information_schema.columns
      may cause assertion failure in debug builds. This may happen under
      rare circumstances when information_schema fails to get information
      about a table (e.g. when a connection is killed).
      
      This happens because open_normal_and_derived_tables() can return an
      error without setting an error message in THD. But information_schema
      attempts to get an error message from THD unconditionally.
      
      With this fix information_schema attempts to get an error message
      from THD only in case error message is set in THD.
      
      
      mysql-test/r/information_schema.result:
        A test case for BUG#34656.
      mysql-test/t/information_schema.test:
        A test case for BUG#34656.
      sql/item_func.cc:
        Set proc info to "User sleep".
      sql/sql_show.cc:
        open_normal_and_derived_tables() can return an error without
        setting an error message in THD. That means we must access
        error message conditionally, only in case thd->is_error() is
        true.
      44df0f6e
    • unknown's avatar
      Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b27580v2 · a03f1a4c
      unknown authored
      into  mysql.com:/home/bar/mysql-work/mysql-5.1.b27580
      Additonal after merge fix
      
      
      mysql-test/r/ctype_cp1250_ch.result:
        Auto merged
      mysql-test/r/ctype_euckr.result:
        Auto merged
      mysql-test/r/ctype_uca.result:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/t/ctype_cp1250_ch.test:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result:
        Auto merged
      sql/item_create.cc:
        After merge fix
      a03f1a4c
    • unknown's avatar
      Merge mysql.com:/home/bar/mysql-work/mysql-5.0-engines · 613fe6ac
      unknown authored
      into  mysql.com:/home/bar/mysql-work/mysql-5.1-engines
      
      
      613fe6ac
  4. 06 Mar, 2008 2 commits
    • unknown's avatar
      additional test fixes for bug 27580 · f2c9483d
      unknown authored
      f2c9483d
    • unknown's avatar
      Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b27580 · 89fb97c5
      unknown authored
      into  mysql.com:/home/bar/mysql-work/mysql-5.0.b27580v2
      
      
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/include/ctype_common.inc:
        after merge fix
      mysql-test/r/ctype_big5.result:
        after merge fix
      mysql-test/r/ctype_euckr.result:
        after merge fix
      mysql-test/r/ctype_gb2312.result:
        after merge fix
      mysql-test/r/ctype_gbk.result:
        after merge fix
      mysql-test/r/ctype_uca.result:
        after merge fix
      89fb97c5
  5. 04 Mar, 2008 1 commit
    • unknown's avatar
      Bug#23097 mysql can't insert korean on mysql prompt. · 8e4a3fcb
      unknown authored
      Problem: libedit is a very pure-ASCII oriented library,
      and it is not aware of extended (0x80..0xFF) or even multi-byte
      characters. It considered such characters as non-printable
      and didn't allow to input them.
      Fix: make libedit think that all bytes >= 0x80 are printable.
      
      
      cmd-line-utils/libedit/el.h:
        Defining macro, a locale's isprint() replacement.
        We'll consider all 8bit values as printable characters.
      cmd-line-utils/libedit/key.c:
        Changing isprint() to el_isprint().
      cmd-line-utils/libedit/map.c:
        Changing isprint() to el_isprint().
      cmd-line-utils/libedit/read.c:
        Changing isprint() to el_isprint().
      cmd-line-utils/libedit/refresh.c:
        Changing isprint() to el_isprint().
      8e4a3fcb
  6. 03 Mar, 2008 3 commits
  7. 29 Feb, 2008 3 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 29cfe316
      unknown authored
      into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
      
      
      29cfe316
    • unknown's avatar
      Bug#23924 general_log truncates queries with character set introducers. · 1ed34fed
      unknown authored
      Problem: logging of utf8-incompatible binary strings didn't work
      Fix: hex-encoding of incompatible sequences.
      
      
      mysql-test/r/log_tables.result:
        Adding test
      mysql-test/t/log_tables.test:
        Adding test
      sql/field.cc:
        Copying with hex escaping
      sql/field.h:
        New field flag
      sql/log.cc:
        Marking the column "general_log.argument" as hex-escaping field.
      sql/sql_string.cc:
        New function to copy strings with hex-encoding of incompatible characters.
      sql/sql_string.h:
        Prototype for the new function
      1ed34fed
    • unknown's avatar
      Fix for Bug#31947: Declare with a reserved word succeeded. · de534f2b
      unknown authored
      READ_ONLY token was accidentally placed into wrong place
      ('ident' rule). The proper place is in the 'keyword_sp' rule.
      
      The manual should be re-generated after this patch, because
      the manual depends on the 'keyword_sp' rule.
      
      
      sql/sql_yacc.yy:
        Move READ_ONLY token to the 'keyword_sp' rule.
      de534f2b
  8. 28 Feb, 2008 6 commits
    • unknown's avatar
      Merge buzz.(none):/home/davi/mysql-5.0-runtime · 05480a88
      unknown authored
      into  buzz.(none):/home/davi/mysql-5.1-runtime
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/limit.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/item.cc:
        Auto merged
      mysql-test/suite/rpl/r/rpl_user_variables.result:
        Manual merge
      mysql-test/suite/rpl/t/rpl_user_variables.test:
        Manual merge
      sql/sql_yacc.yy:
        Manual merge
      05480a88
    • unknown's avatar
      Post-merge fix for Bug 33851. The initialization order of members · 8b779456
      unknown authored
      must match the order which they were declared in the class definition. 
      
      
      sql/item.cc:
        Fix initialization order, parameter was the last one declared.
      8b779456
    • unknown's avatar
      Bug#34655 Compile error · 33a4e760
      unknown authored
      Rename client_last_error to last_error and client_last_errno to last_errno
      to not break connectors which use the internal net structure for error handling.
      
      
      include/mysql_com.h:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      include/mysql_h.ic:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      libmysql/libmysql.c:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      libmysql/manager.c:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      libmysqld/lib_sql.cc:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      libmysqld/libmysqld.c:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      server-tools/instance-manager/mysql_connection.cc:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      sql/log_event.cc:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      sql-common/client.c:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      sql/log_event_old.cc:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      sql/net_serv.cc:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      sql/repl_failsafe.cc:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      33a4e760
    • unknown's avatar
      Bug#33851 Passing UNSIGNED param to EXECUTE returns ERROR 1210 · 1164e2bc
      unknown authored
      The problem is that passing anything other than a integer to a limit
      clause in a prepared statement would fail. This limitation was introduced
      to avoid replication problems (e.g: replicating the statement with a
      string argument would cause a parse failure in the slave).
      
      The solution is to convert arguments to the limit clause to a integer
      value and use this converted value when persisting the query to the log.
      
      
      mysql-test/r/limit.result:
        Update test case result.
      mysql-test/r/ps.result:
        Add test case result for Bug#33851
      mysql-test/r/rpl_user_variables.result:
        Test case result for replication of prepared statement with
        limit clause.
      mysql-test/t/limit.test:
        Test parameters to limit clause.
      mysql-test/t/ps.test:
        Add test case for Bug#33851
      mysql-test/t/rpl_user_variables.test:
        Test replication of a parameter which value is converted.
      sql/item.cc:
        Convert value to integer if it's a parameter to a limit clause.
      sql/item.h:
        Flag signal that item is a parameter to a limit clause.
      sql/item_func.cc:
        Const member functions, object is not mutated.
      sql/sql_class.h:
        Const member functions, object is not mutated.
      sql/sql_yacc.yy:
        Flag that item is a parameter to a limit clause.
      1164e2bc
    • unknown's avatar
      Disable test case due to Bug#34891: sp_notembedded.test fails · 944f2599
      unknown authored
      sporadically.
      
      
      mysql-test/r/sp_notembedded.result:
        Disable test case.
      mysql-test/t/sp_notembedded.test:
        Disable test case.
      944f2599
    • unknown's avatar
      Fix for Bug#34852: SHOW OPEN TABLES output is not repeatable · ce7b8e12
      unknown authored
      (show_check.test fails sporadically).
      
      Fix test case for Bug#12183 to make it stable.
      
      
      mysql-test/r/show_check.result:
        Fix result file.
      mysql-test/t/show_check.test:
        Make test case for Bug#12183 stable.
      ce7b8e12
  9. 27 Feb, 2008 10 commits