1. 30 Aug, 2005 1 commit
    • unknown's avatar
      Fixes bug #11815. Convert file path to UNIX format to build correct query · 111fdcdd
      unknown authored
      string while replicating LOAD DATA INFILE statement.
      
      
      VC++Files/mysys/mysys.dsp:
        added mf_unixpath.c into mysys.dsp
      include/my_sys.h:
        Added an option for fn_format function to convert path from system representation
        to UNIX format.
      mysys/mf_format.c:
        Added an option for fn_format function to convert path from system
        representation to UNIX format.
      sql/log_event.cc:
        Convert file path to UNIX format to build correct query string while replicating
        LOAD DATA INFILE statement.
      111fdcdd
  2. 28 Aug, 2005 6 commits
  3. 27 Aug, 2005 13 commits
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · e24fbb63
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      e24fbb63
    • unknown's avatar
      gis.test corrected with Pem's wishes · 209df2de
      unknown authored
      
      mysql-test/r/gis.result:
        result fixed
      mysql-test/t/gis.test:
        test corrected
      209df2de
    • unknown's avatar
      Merge deer.(none):/home/hf/work/mysql-5.0.11207 · fec5bb76
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.clean
      
      
      sql/sql_yacc.yy:
        Auto merged
      fec5bb76
    • unknown's avatar
      Addition to the fix for #11207 (SET GLOBAL TRANSACTION ISOLATION LEVEL) · 31fa6725
      unknown authored
      
      sql/sql_yacc.yy:
        exact types specified for opt_var_type and similar
      31fa6725
    • unknown's avatar
      Merge deer.(none):/home/hf/work/mysql-5.0.10499 · c40a2fe3
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.clean
      
      
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      c40a2fe3
    • unknown's avatar
      Merge deer.(none):/home/hf/work/mysql-4.1.clean · 9fa818c8
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.clean
      
      
      myisam/mi_check.c:
        Auto merged
      mysql-test/r/gis-rtree.result:
        Auto merged
      mysql-test/t/gis-rtree.test:
        Auto merged
      9fa818c8
    • unknown's avatar
      Merge deer.(none):/home/hf/work/mysql-4.1.9645 · 51077559
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.clean
      
      51077559
    • unknown's avatar
      retest the fix for bug #10362 (SHOW PROCEDURE always qualifies name with database) · 638367f3
      unknown authored
      (already approved)
      
      
      mysql-test/r/information_schema.result:
        update test results
      mysql-test/r/sp.result:
        update test results
      mysql-test/r/sql_mode.result:
        update test results
      sql/sp.cc:
        don qualify the name
      638367f3
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 · fd63981f
      unknown authored
      into lmy004.:/work/mysql-5.0-bug11904
      
      
      sql/sql_select.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      fd63981f
    • unknown's avatar
      Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 · 825aa183
      unknown authored
      into  xiphis.org:/usr/home/antony/work2/p3-bug9048.2
      
      825aa183
    • unknown's avatar
      Bug#9048 · 363fcbf8
      unknown authored
        "Creating a function with char binary IN parameter fails"
        Parse BINARY as part of type declaration, not as 
        a column attribute.
      
      
      mysql-test/r/sp.result:
        test for bug 9048
      mysql-test/t/sp.test:
        test for bug 9048
      sql/sql_yacc.yy:
        fix bug 9048
        parse BINARY as part of type declaration and not as column modifier.
      363fcbf8
    • unknown's avatar
      func_str.result, null.result: · e1ebf33f
      unknown authored
        Corrected results after the fix for bug #12791.
      func_test.result, func_test.test:
        Added test cases for bug #12791.
      item_func.h, item_func.cc:
        Fixed bug #12791.
        Made LEAST/GREATES fully Oracle compliant.
        LEAST/GREATEST did not return NULL if only some
        arguments were NULLs. This did not comply with Oracle.
      
      
      sql/item_func.cc:
        Fixed bug #12791.
        Made LEAST/GREATES fully Oracle compliant.
        LEAST/GREATEST did not return NULL if only some
        arguments were NULLs. This did not comply with Oracle.
      sql/item_func.h:
        Fixed bug #12791.
        Made LEAST/GREATES fully Oracle compliant.
        LEAST/GREATEST did not return NULL if only some
        arguments were NULLs. This did not comply with Oracle.
      mysql-test/t/func_test.test:
        Added test cases for bug #12791.
      mysql-test/r/func_test.result:
        Added test cases for bug #12791.
      mysql-test/r/null.result:
        Corrected results after the fix for bug #12791.
      mysql-test/r/func_str.result:
        Corrected results after the fix for bug #12791.
      e1ebf33f
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release · defda87d
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      defda87d
  4. 26 Aug, 2005 20 commits
    • unknown's avatar
      unireg.h: · 01b03535
      unknown authored
        Max index key length increased from 1024 to 3072
        for 64 bit builds.
      
      
      sql/unireg.h:
        Max index key length increased from 1024 to 3072
        for 64 bit builds.
      01b03535
    • unknown's avatar
      No commit message · 3006ce01
      unknown authored
      No commit message
      3006ce01
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0548d2d0
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-rpl-bug
      
      0548d2d0
    • unknown's avatar
      mtr_timer.pl: · 6a9e982f
      unknown authored
        Simplified and corrected mtr_timer_stop_all()
      
      
      mysql-test/lib/mtr_timer.pl:
        Simplified and corrected mtr_timer_stop_all()
      6a9e982f
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · d03f018b
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-rpl-bug
      
      
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      d03f018b
    • unknown's avatar
      Slightly amended Monty's SP replication code cleanup patch · aab0abb8
      unknown authored
      
      sql/item.cc:
        Code cleanup
      sql/item.h:
        Code cleanup
      sql/log.cc:
        Added comments
      sql/sp_head.cc:
        Code cleanup patch from Monty: 
        in subst_spvars()
        - Move local variables first in block
        - Use res|= instead of res |=
        - Use strmake() instead of alloc + memcpy
        Added:
        - Fail the query if we don't have enough memory to produce a binlog-suitable query string: 
          if we're so low on memory we're likely to fail the query anyway, and failing now removes
          the need for hack with THD::query_str_binlog_suitable.
      sql/sql_class.cc:
        Remove THD::query_str_binlog_unsuitable
      sql/sql_class.h:
        Remove THD::query_str_binlog_unsuitable
      sql/sql_delete.cc:
        Remove THD::query_str_binlog_unsuitable
      sql/sql_insert.cc:
        Remove THD::query_str_binlog_unsuitable
      sql/sql_parse.cc:
        Code cleanup
      sql/sql_update.cc:
        Remove THD::query_str_binlog_unsuitable
      aab0abb8
    • unknown's avatar
      Merge radha.local:/Users/patg/mysql-build/mysql-4.1 · bc502739
      unknown authored
      into  radha.local:/Users/patg/mysql-build/mysql-5.0.clean
      
      
      sql/ha_blackhole.cc:
        Resolve of fixed typo application to both 4.1 and 5.0
      bc502739
    • unknown's avatar
      typo to DBUG_RETURN fixed · a7fdf1f3
      unknown authored
      
      sql/ha_blackhole.cc:
        Typo to DBUG_RETURN fixed
      a7fdf1f3
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · d12e56b5
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
      
      d12e56b5
    • unknown's avatar
      bad blind change fixed · a9e984ca
      unknown authored
      a9e984ca
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 24527ba3
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      24527ba3
    • unknown's avatar
      Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 · 2cf81e9d
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
      
      
      BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f:
        Auto merged
      BitKeeper/etc/config:
        Auto merged
      client/mysql.cc:
        Auto merged
      client/mysqlcheck.c:
        Auto merged
      BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqlimport.c:
        Auto merged
      client/mysqlshow.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      extra/my_print_defaults.c:
        Auto merged
      extra/perror.c:
        Auto merged
      extra/resolve_stack_dump.c:
        Auto merged
      include/help_end.h:
        Auto merged
      include/help_start.h:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      myisam/myisamlog.c:
        Auto merged
      myisam/myisampack.c:
        Auto merged
      netware/myisamchk.def:
        Auto merged
      netware/mysql.def:
        Auto merged
      netware/mysql_test_run.c:
        Auto merged
      netware/mysqladmin.def:
        Auto merged
      netware/mysqlbinlog.def:
        Auto merged
      netware/mysqlcheck.def:
        Auto merged
      netware/mysqld_safe.c:
        Auto merged
      netware/mysqldump.def:
        Auto merged
      netware/mysqlimport.def:
        Auto merged
      netware/mysqlshow.def:
        Auto merged
      sql/ha_blackhole.cc:
        Auto merged
      sql/ha_blackhole.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      client/client_priv.h:
        Merged from 4.1
      client/mysqladmin.cc:
        Merged from 4.1
      client/mysqlbinlog.cc:
        Merged from 4.1
      mysys/charset.c:
        Merged from 4.1
      2cf81e9d
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release · 4fc708a9
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      configure.in:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      4fc708a9
    • unknown's avatar
      after merge fix · e15d3387
      unknown authored
      e15d3387
    • unknown's avatar
      mysql-test-run.sh, mtr_report.pl: · 45fd1c9a
      unknown authored
        Corrected typo
      
      
      mysql-test/lib/mtr_report.pl:
        Corrected typo
      mysql-test/mysql-test-run.sh:
        Corrected typo
      45fd1c9a
    • unknown's avatar
      merged · 45db47cf
      unknown authored
      
      mysys/my_alloc.c:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      45db47cf
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 5d5f8c5f
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
      
      
      sql/sql_show.cc:
        Auto merged
      5d5f8c5f
    • unknown's avatar
      fix for bug #11904 (select statement, cursor, grouping wrong results) · 380493f2
      unknown authored
      
      sql/sql_select.cc:
        reset the group functions and copy the values of the first row before exiting because of
        maximal number of rows has been read for this cursor fetch. the additional variable is needed
        to save code duplication.
      tests/mysql_client_test.c:
        test for bug #11904 (cursor grouping wrong result)
      380493f2
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1 · 34aeca1f
      unknown authored
      into  radha.local:/Users/patg/mysql-build/mysql-4.1
      
      34aeca1f
    • unknown's avatar
      ha_blackhole changes, same patch as http://lists.mysql.com/internals/27878, per brian · 7599030e
      unknown authored
      
      sql/ha_blackhole.cc:
        Blackhole Lock changes to blackhole per Brian, reapplied
      sql/ha_blackhole.h:
        blackhold lock changes added per brian
      7599030e