An error occurred fetching the project authors.
  1. 03 Feb, 2006 2 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 2b1185ed
      unknown authored
      into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
      
      
      sql/field.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      2b1185ed
    • unknown's avatar
      Merge mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1.6-release-15588 · a2da9aed
      unknown authored
      into  mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1-tree
      
      The idea of this merge is to "synchronize" 5.1-release tree (5.1.6) and
      the main 5.1 tree. A patch for BUG#15588/BUG#16621 was copied into
      5.1-release from 5.0 since it is important. This patch is expected to
      come into the 5.1 tree after resolving 5.0 -> 5.1 megrge logjam.
      
      
      storage/example/ha_example.cc:
        Auto merged
      sql/field.cc:
        Ignore changes in 5.1-release (5.1.6).
      sql/sp_head.cc:
        Ignore changes in 5.1-release (5.1.6).
      a2da9aed
  2. 02 Feb, 2006 26 commits
    • unknown's avatar
      Copied patch for BUG#15588 (BUG#16621) from 5.0 into 5.1-release. · 733b1c40
      unknown authored
      sql/field.cc:
        Use memmove() instead of memcpy() -- after implementation of WL#2984
        (Make stored routine variables work according to the standard) it is
        possible to store in the field the value from this field. For instance,
        this can happen for the following statement:
          SET sp_var = SUBSTR(sp_var, 1, 3);
      sql/sp_head.cc:
        Work correctly with String:
        - String length has to be be reset before use;
        - qs_append() does not allocate memory, so the memory should
          be reserved beforehand.
      733b1c40
    • unknown's avatar
      Merge mysql.com:/home/kostja/mysql/tmp_merge · d297a221
      unknown authored
      into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
      
      
      BitKeeper/etc/ignore:
        auto-union
      configure.in:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/ndb/ndbcluster.sh:
        Auto merged
      mysql-test/r/rpl_sp.result:
        Auto merged
      mysql-test/r/sp-error.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/type_float.result:
        Auto merged
      mysql-test/t/rpl_sp.test:
        Auto merged
      mysql-test/t/sp-error.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      storage/myisam/ft_update.c:
        Auto merged
      storage/ndb/include/logger/LogHandler.hpp:
        Auto merged
      storage/ndb/include/logger/Logger.hpp:
        Auto merged
      storage/ndb/include/mgmapi/mgmapi.h:
        Auto merged
      storage/ndb/include/mgmcommon/ConfigRetriever.hpp:
        Auto merged
      storage/ndb/src/common/logger/FileLogHandler.cpp:
        Auto merged
      storage/ndb/src/common/logger/LogHandler.cpp:
        Auto merged
      storage/ndb/src/common/logger/Logger.cpp:
        Auto merged
      storage/ndb/src/common/logger/SysLogHandler.cpp:
        Auto merged
      storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        Auto merged
      storage/ndb/src/common/util/SocketServer.cpp:
        Auto merged
      storage/ndb/src/kernel/main.cpp:
        Auto merged
      storage/ndb/src/kernel/vm/Configuration.cpp:
        Auto merged
      storage/ndb/src/kernel/vm/Configuration.hpp:
        Auto merged
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      storage/ndb/src/mgmclient/CommandInterpreter.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
        Auto merged
      storage/ndb/src/mgmsrv/Services.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/Services.hpp:
        Auto merged
      storage/ndb/src/mgmsrv/main.cpp:
        Auto merged
      storage/ndb/tools/ndb_size.pl:
        Auto merged
      zlib/Makefile.am:
        Auto merged
      mysql-test/r/information_schema.result:
        SCCS merged
      mysql-test/t/information_schema.test:
        Manual merge.
      sql/ha_archive.cc:
        Manual merge.
      sql/share/errmsg.txt:
        SCCS merged
      tests/mysql_client_test.c:
        Manual merge.
      d297a221
    • unknown's avatar
      Merge mysql.com:/home/dlenev/src/mysql-5.1-bfix · 7de9b1c6
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.1-merges
      
      
      mysql-test/t/disabled.def:
        SCCS merged
      7de9b1c6
    • unknown's avatar
      storage/example/ha_example.cc · 16a849f2
      unknown authored
          Copied from the general tree, to solve a build problem:
          ChangeSet 1.2121.1.5 2006/02/02 11:02:09 stewart@mysql.com
            build fix when building with example storage engine.
      
      
      storage/example/ha_example.cc:
        Copied from the general tree, to solve a build problem:
        ChangeSet 1.2121.1.5 2006/02/02 11:02:09 stewart@mysql.com
          build fix when building with example storage engine.
      16a849f2
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 5610e9ab
      unknown authored
      into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
      
      
      client/mysqldump.c:
        Auto merged
      5610e9ab
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new · c93a8ebb
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql51
      
      
      mysql-test/t/disabled.def:
        Auto merged
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      c93a8ebb
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 87606e8c
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql51
      
      
      87606e8c
    • unknown's avatar
      added more logging in ndb handler · eaf466d2
      unknown authored
          enable extra logging in ndb handler during test runs
      
      
      mysql-test/mysql-test-run.pl:
        enable extra logging in ndb handler during test runs
      sql/ha_ndbcluster_binlog.cc:
        added more logging in ndb handler
      eaf466d2
    • unknown's avatar
      d588ef9b
    • unknown's avatar
      disbled sporadically failing testcase · 77152d00
      unknown authored
      77152d00
    • unknown's avatar
      Merge mysql.com:/home/kostja/mysql/tmp_merge1 · 1344cab1
      unknown authored
      into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
      
      
      mysql-test/r/innodb.result:
        Manual merge: null merge, use local.
      mysql-test/t/innodb.test:
        Manual merge: null merge, use local.
      sql/ha_innodb.cc:
        Manual merge: null merge, use local.
      sql/ha_innodb.h:
        Manual merge: null merge, use local.
      sql/mysqld.cc:
        Manual merge: null merge, use local.
      sql/set_var.cc:
        Manual merge: null merge, use local.
      storage/innobase/include/srv0srv.h:
        Manual merge: null merge, use local.
      storage/innobase/srv/srv0srv.c:
        Manual merge: null merge, use local.
      1344cab1
    • unknown's avatar
      Merge mysql.com:/home/kostja/mysql/tmp_merge · 97dae003
      unknown authored
      into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
      
      
      client/mysqlbinlog.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      include/my_base.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      sql/field.h:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/opt_range.h:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/slave.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_help.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_test.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/myisam/mi_delete.c:
        Auto merged
      storage/myisam/myisampack.c:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      mysys/my_bitmap.c:
        Manual merge
      sql/field.cc:
        e
        Manual merge
      sql/item.cc:
        Manual merge (new Field_bit_as_char constructor signature)
      sql/item_func.cc:
        Manual merge: use local
      sql/sql_insert.cc:
        Manual merge: add VOID() around bitmap_init
      97dae003
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.1-release/ · a5295c9b
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.1-bfix
      
      
      a5295c9b
    • unknown's avatar
      Yet another addition to the fix for BUG#9412 "Triggers: should have trigger · c20d9474
      unknown authored
      privilege".
      
      Corrected addition of TRIGGER privilege by "mysql_fix_privilege_tables" script.
      Problem with it should have been caught by system_mysql_db/system_mysql_db_fix
      tests but they were disabled. Enabled them back.
      
      
      mysql-test/r/system_mysql_db.result:
        Updated test results after addition of TRIGGER privilege.
      mysql-test/t/disabled.def:
        Enabled back test system_mysql_db/system_mysql_db_fix tests.
      scripts/mysql_fix_privilege_tables.sql:
        Corrected addition of TRIGGER privilege.
      c20d9474
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-release · 3b561f28
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql51
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      3b561f28
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ff297775
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql51
      
      
      ff297775
    • unknown's avatar
    • unknown's avatar
      Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge · f0263ac4
      unknown authored
      into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/r/alter_table.result:
        Auto merged
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/sp-error.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/type_decimal.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/r/view_grant.result:
        Auto merged
      mysql-test/t/alter_table.test:
        Auto merged
      mysql-test/t/create.test:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      mysql-test/mysql-test-run.pl:
        SCCS merged
      sql/sql_yacc.yy:
        Manual merge: resolve the conflict with moved sp_if rule
      f0263ac4
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7088b39d
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.1/new
      
      
      7088b39d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6aa51035
      unknown authored
      into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge
      
      
      6aa51035
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 5312aafc
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.1.new.ctype
      
      
      5312aafc
    • unknown's avatar
      WL#1386 - CTYPE table for unicode character sets · 4fa4383b
      unknown authored
      A prerequisite for several fulltext and XML bugs.
      MY_CHARSET_HANDLER now has a new function "ctype"
      to detect a type of the next character in a string
      (i.e. digit, letter, space, punctuation, control, etc),
      which now works correctly for both 8bit and multibyte charsets.
      Previously only 8bit charsets worked correctly,
      while any multibyte character was considered as letter
      in multibyte charsets.
      Many files:
        Adding new function
      Makefile.am:
        Adding build rules for uctypedump,
        a dump tool to create my_uctype.h
        using Unicode Character Database file.
      m_ctype.h:
        Adding declaration of my_uni_ctype,
        ctype data for Unicode.
        Adding new member into MY_CHARSET_HANDLER
      Makefile.am:
        Adding my_uctype.h into noinst_HEADERS
      my_uctype.h, uctypedump.c:
        new files:
        ctype data for unicode,
        and the tool to generate it from 
        a Unicode Character Database file.
      
      
      
      include/Makefile.am:
        Adding my_uctype.h
      include/m_ctype.h:
        Adding declaration of my_uni_ctype,
        ctype data for Unicode.
      strings/Makefile.am:
        Adding build rules for uctypedump,
        a dump tool to create my_uctype.h
        using Unicode Character Database file.
      strings/ctype-big5.c:
        Adding new function
      strings/ctype-bin.c:
        Adding new function
      strings/ctype-cp932.c:
        Adding new function
      strings/ctype-euc_kr.c:
        Adding new function
      strings/ctype-eucjpms.c:
        Adding new function
      strings/ctype-gb2312.c:
        Adding new function
      strings/ctype-gbk.c:
        Adding new function
      strings/ctype-latin1.c:
        Adding new function
      strings/ctype-mb.c:
        Adding new function
      strings/ctype-simple.c:
        Adding new function
      strings/ctype-sjis.c:
        Adding new function
      strings/ctype-tis620.c:
        Adding new function
      strings/ctype-ucs2.c:
        Adding new function
      strings/ctype-ujis.c:
        Adding new function
      strings/ctype-utf8.c:
        Adding new function
      4fa4383b
    • unknown's avatar
      Post-merge fixes. · 409719cc
      unknown authored
      mysql-test/t/disabled.def:
        disabling new test that was added during null-merge from 5.0
        the new test innodb_unsafe_binlog will be re-enabled when the
        5.1 snapshot for InnoDB is applied. Disabling test rather than
        removing files to make future merges easier (removing the files
        would cause merge conflicts when the files are re-added in the
        5.1 snapshot).
      409719cc
    • unknown's avatar
      build fix for solaris 10 sparc -max · f31f6643
      unknown authored
      sql/ha_ndbcluster.cc:
        ndbcluster_fill_files_table should return int
      f31f6643
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · a2f42831
      unknown authored
      into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge
      
      
      sql/ha_innodb.cc:
        Auto merged
      a2f42831
    • unknown's avatar
      build fix when building with example storage engine. · 921ceda3
      unknown authored
      storage/example/ha_example.cc:
        add handlerton call for fill files table
      921ceda3
  3. 01 Feb, 2006 12 commits