1. 03 Apr, 2003 22 commits
  2. 02 Apr, 2003 13 commits
    • unknown's avatar
      correct code of warning of group_concat · 1e8cc909
      unknown authored
      1e8cc909
    • unknown's avatar
      mysqld.cc: · 0f2e3ab8
      unknown authored
        missing comma
      
      
      sql/mysqld.cc:
        missing comma
      0f2e3ab8
    • unknown's avatar
      Merge vkishkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · b2fe3588
      unknown authored
      into kishkin.ru:/home/wax/mysql-4n
      
      
      b2fe3588
    • unknown's avatar
      resolve new updates group_concat · 6adb27c6
      unknown authored
      
      include/mysqld_error.h:
        resolve error message
      sql/mysqld.cc:
        resolve option
      sql/set_var.cc:
        resolve variable
      sql/share/english/errmsg.txt:
        resolve error message
      sql/sql_class.h:
        resolve
      6adb27c6
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · d8dd1cea
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      
      d8dd1cea
    • unknown's avatar
      - increased bdb_max_lock value to pass sql-bench · 59e8c553
      unknown authored
       - re-enabled OpenSSL for the Max RPM package
      
      
      Build-tools/Do-compile:
         - increased bdb_max_lock value from 60000 -> 240000
           (got many errors "Lock table is out of available locks" when running
           sql-bench with InnoDB)
      support-files/mysql.spec.sh:
         - re-enabled OpenSSL for the 4.1 Max RPM
      59e8c553
    • unknown's avatar
      Auto merged · aee0d02a
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      aee0d02a
    • unknown's avatar
      SCRUM · 6feda00d
      unknown authored
      correct sql_alloc, ORDER BY and NULL value in group_concat
      add comments
      move test msg_arg
      add test on NULL
      
      
      mysql-test/r/func_gconcat.result:
        change work with NULL
      mysql-test/t/func_gconcat.test:
        add test on NULL
      sql/item_sum.cc:
        correct sql_alloc, ORDER BY and NULL value
        add comments
      sql/sql_class.h:
        move test msg_arg
      6feda00d
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 69b8b99a
      unknown authored
      into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp
      
      
      69b8b99a
    • unknown's avatar
      GEOMCOLLFROMWKB(), GEOMETRYCOLLECTIONFROMWKB(), · c709993b
      unknown authored
      LINEFROMWKB(), LINESTRINGFROMWKB(), MLINEFROMWKB(), MPOINTFROMWKB(),
      MPOLYFROMWKB(), MULTILINESTRINGFROMWKB(), MULTIPOINTFROMWKB(),
      MULTIPOLYGONFROMWKB(), POINTFROMWKB(), POLYFROMWKB(), POLYGONFROMWKB()
      functions have been added (as synonyms for GEOMFROMWKB()).
      
      
      mysql-test/t/gis.test:
        GEOMCOLLFROMWKB(), GEOMETRYCOLLECTIONFROMWKB(),
        LINEFROMWKB(), LINESTRINGFROMWKB(), MLINEFROMWKB(), MPOINTFROMWKB(),
        MPOLYFROMWKB(), MULTILINESTRINGFROMWKB(), MULTIPOINTFROMWKB(),
        MULTIPOLYGONFROMWKB(), POINTFROMWKB(), POLYFROMWKB(), POLYGONFROMWKB()
        functions have been added (as synonyms for GEOMFROMWKB()).
      sql/lex.h:
        GEOMCOLLFROMWKB(), GEOMETRYCOLLECTIONFROMWKB(),
        LINEFROMWKB(), LINESTRINGFROMWKB(), MLINEFROMWKB(), MPOINTFROMWKB(),
        MPOLYFROMWKB(), MULTILINESTRINGFROMWKB(), MULTIPOINTFROMWKB(),
        MULTIPOLYGONFROMWKB(), POINTFROMWKB(), POLYFROMWKB(), POLYGONFROMWKB()
        functions have been added (as synonyms for GEOMFROMWKB()).
      c709993b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 0aa16ffd
      unknown authored
      into george.bitbike.com:/home/arjen/mysql-4.1
      
      
      0aa16ffd
    • unknown's avatar
      prepare.texi merged into manual (mysqldoc tree), file removed. · 18f5da44
      unknown authored
      
      BitKeeper/deleted/.del-prepare.texi~20a263ee73a181f:
        Delete: Docs/prepare.texi
      18f5da44
    • unknown's avatar
      Fixed problem with const table named with crashed test suite on MacOSX · fb9a9394
      unknown authored
      
      myisam/mi_test3.c:
        Fixed compiler warning
      myisam/rt_test.c:
        Fixed compiler warning
      fb9a9394
  3. 01 Apr, 2003 5 commits
    • unknown's avatar
      Sprint task #856 : make table exclusion rules (in replication) · 3258bb72
      unknown authored
      apply to GRANT and REVOKE too. For example if replicate-wild-ignore-table=mysql.%,
      GRANT and REVOKE will not be replicated on the slave.
      
      
      3258bb72
    • unknown's avatar
      Small-and-safe fix for bug #218: "LOAD DATA INFILE IGNORE is well · 241b6c05
      unknown authored
      logged, but read as LOAD DATA INFILE REPLACE"
      This was just bad && instead of &, but nasty consequences.
      This should be merged to 4.0 BUT it will not be automatic (some code
      has moved from log_event.h to log_event.cc, and log_event.cc has changed);
      please Merging Man, do 'bk grep REPLACE_FLAG' in 4.0/sql
      to find all the new places.
      
      
      sql/log_event.cc:
        & instead of && when testing flags
      sql/slave.cc:
        & instead of && when testing flags
      241b6c05
    • unknown's avatar
      cp1257.xml, Index.xml: · 4b06bc84
      unknown authored
        cp1257 is Lithuanian sorting
      
      
      sql/share/charsets/Index.xml:
        cp1257 is Lithuanian sorting
      sql/share/charsets/cp1257.xml:
        cp1257 is Lithuanian sorting
      4b06bc84
    • unknown's avatar
      2c7fdb5d
    • unknown's avatar
      Standard charset names: · cc2c0b6d
      unknown authored
      pclatin1 -> cp850
      pclatin2 -> cp852
      
      
      BitKeeper/deleted/.del-pclatin1.xml~d42c4a35e61526fa:
        Delete: sql/share/charsets/pclatin1.xml
      BitKeeper/deleted/.del-pclatin2.xml~419e68f6672a99a:
        Delete: sql/share/charsets/pclatin2.xml
      cc2c0b6d