Skip to content

M
mariadb
Switch branch/tag
  1. 11 Jun, 2007 12 commits
  3. 08 Jun, 2007 6 commits
  5. 07 Jun, 2007 9 commits
    • unknown's avatar
      Merge quant.(none):/ext/mysql/bk/mysql-5.1-bug21123 · e8638b5c
      unknown authored 
      into  quant.(none):/ext/mysql/bkroot/mysql-5.1-new-rpl-a


sql/slave.cc:
  Auto merged
      e8638b5c
    • unknown's avatar
      Merge trift2.:/MySQL/M41/bug23504-4.1 · 35a948f7
      unknown authored 
      into  trift2.:/MySQL/M41/push-4.1
      35a948f7
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 73016f8f
      unknown authored 
      into  trift2.:/MySQL/M51/push-5.1


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
netware/myisam_ftdump.def:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged
      73016f8f
    • unknown's avatar
      Merge trift2.:/MySQL/M41/bug23504-4.1 · d37e1642
      unknown authored 
      into  trift2.:/MySQL/M50/push-5.0


netware/comp_err.def:
  Auto merged
netware/isamchk.def:
  Auto merged
netware/isamlog.def:
  Auto merged
netware/libmysql.def:
  Auto merged
netware/myisam_ftdump.def:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysql_install_db.def:
  Auto merged
netware/mysql_test_run.def:
  Auto merged
netware/mysql_waitpid.def:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqld.def:
  Auto merged
netware/mysqld_safe.def:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/mysqlshow.def:
  Auto merged
netware/mysqltest.def:
  Auto merged
netware/pack_isam.def:
  Auto merged
netware/perror.def:
  Auto merged
netware/replace.def:
  Auto merged
netware/resolve_stack_dump.def:
  Auto merged
netware/resolveip.def:
  Auto merged
netware/my_print_defaults.def:
  Use 5.0 version
      d37e1642
    • unknown's avatar
      Bug#28916 LDML doesn't work for utf8 · af0a3afe
      unknown authored 
      and is not described in the manual
- Adding missing initialization for utf8 collations
- Minor code clean-ups: renaming variables,
  moving code into a new separate function.
- Adding test, to check that both ucs2 and utf8 user
  defined collations work (ucs2_test_ci and utf8_test_ci)
- Adding Vietnamese collation as a complex user defined
  collation example.


include/m_ctype.h:
  Renaming variable names to match collation names (for convenience).
mysys/charset-def.c:
  - Removing redundant declarations for variables declared in m_ctype.h
  - Renaming variable names to match collation names (for convenience).
mysys/charset.c:
  - Renaming "new" to "newcs", to avoid using C reserved word as a variable name
  - Moving UCA initialization code into a separate function
  - The bug fix itself: adding initialization of utf8 collations
strings/ctype-uca.c:
  Renaming variable names to match collation names (for convenience).
strings/ctype.c:
  Increasing buffer size to fit tailoring for languages
  with complex rules (e.g. Vietnamese).
mysql-test/r/ctype_ldml.result:
  Adding test case
mysql-test/std_data/Index.xml:
  Adding Index.xml example with user defined collations.
mysql-test/t/ctype_ldml-master.opt:
  Adding OPT file for the test case,
  to use the example Index.xml file.
mysql-test/t/ctype_ldml.test:
  Adding test case
      af0a3afe
    • unknown's avatar
      netware/*.def : Allocate 128K stack for all executables (bug#23504) · bc671e2f
      unknown authored 
      
netware/comp_err.def:
  Allocate 128K stack for all executables (bug#23504)
netware/isamchk.def:
  Allocate 128K stack for all executables (bug#23504)
netware/isamlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/libmysql.def:
  Allocate 128K stack for all executables (bug#23504)
netware/my_print_defaults.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisam_ftdump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisamchk.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisamlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisampack.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_install_db.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_test_run.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_waitpid.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqladmin.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlbinlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlcheck.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqld.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqld_safe.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqldump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlimport.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlshow.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqltest.def:
  Allocate 128K stack for all executables (bug#23504)
netware/pack_isam.def:
  Allocate 128K stack for all executables (bug#23504)
netware/perror.def:
  Allocate 128K stack for all executables (bug#23504)
netware/replace.def:
  Allocate 128K stack for all executables (bug#23504)
netware/resolve_stack_dump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/resolveip.def:
  Allocate 128K stack for all executables (bug#23504)
      bc671e2f
    • unknown's avatar
      Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b26711 · 2161964b
      unknown authored 
      into  mysql.com:/home/bar/mysql-work/mysql-5.1.b26711


sql/sql_class.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
      2161964b
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 3babaecc
      unknown authored 
      into  mysql.com:/home/bar/mysql-work/mysql-5.0.b26711
      3babaecc
    • unknown's avatar
      Bug#26711 "Binary content 0x00 sometimes becomes 0x5C 0x00 after dump/load" · 2971d645
      unknown authored 
      Problem: "SELECT INTO OUTFILE" created incorrect dumps for BLOBs,
so "LOAD DATA" later incorrectly interpreted 0x5C as the second
byte of a multi-byte sequence, instead of escape character.
Fix: adding escaping of multi-byte heads.


mysql-test/r/ctype_big5.result:
  Adding test case
mysql-test/t/ctype_big5.test:
  Adding test case
sql/sql_class.cc:
  Add escape characters before multi-byte heads.
strings/ctype-big5.c:
  Flagging character set as dangerous for escaping.
strings/ctype-gbk.c:
  Flagging character set as dangerous for escaping.
strings/ctype-sjis.c:
  Flagging character set as dangerous for escaping.
      2971d645
  7. 06 Jun, 2007 13 commits
    • unknown's avatar
      Merge trift2.:/MySQL/M41/mysql-4.1 · 1811c893
      unknown authored 
      into  trift2.:/MySQL/M41/push-4.1
      1811c893
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · cdf0327e
      unknown authored 
      into  trift2.:/MySQL/M50/push-5.0


CMakeLists.txt:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/ctype_cp932_binlog.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
      cdf0327e
    • unknown's avatar
      Merge trift2.:/MySQL/M51/mysql-5.1 · 92a46e05
      unknown authored 
      into  trift2.:/MySQL/M51/push-5.1


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
CMakeLists.txt:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
      92a46e05
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · cb17b801
      unknown authored 
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41
      cb17b801
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · d05a9580
      unknown authored 
      into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
      d05a9580
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 035b5005
      unknown authored 
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build


storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
      035b5005
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-build · 6b81af5f
      unknown authored 
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
storage/ndb/src/common/transporter/Packer.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  SCCS merged
      6b81af5f
    • unknown's avatar
      Merge trift2.:/MySQL/M41/push-4.1 · 8a9e32bc
      unknown authored 
      into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Version change in 4.1 does not propagate to 5.0
      8a9e32bc
    • unknown's avatar
      Merge trift2.:/MySQL/M41/mysql-4.1 · b33b1bc7
      unknown authored 
      into  trift2.:/MySQL/M41/push-4.1


configure.in:
  Auto merged
      b33b1bc7
    • unknown's avatar
      Raise version number after cloning 4.1.23 · d3e8ed2c
      unknown authored
      d3e8ed2c
    • unknown's avatar
      yellow warnings on pb. Setting the plug of a harmless warning. · 95ad9636
      unknown authored 
      
mysql-test/lib/mtr_report.pl:
  yellow warnings on pb: Statement is not safe to log in statement format is harmless
      95ad9636
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 7ffa8c91
      unknown authored 
      into  trift2.:/MySQL/M50/push-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
      7ffa8c91
    • unknown's avatar
      mtr_report.pl: · 10a21ed0
      unknown authored 
        Add another exception to the acceptable mysqld errors, for test case for bug 28436


mysql-test/lib/mtr_report.pl:
  Add another exception to the acceptable mysqld errors, for test case for bug 28436
      10a21ed0
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7