1. 09 Mar, 2002 1 commit
  2. 07 Mar, 2002 3 commits
  3. 06 Mar, 2002 12 commits
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · defcaaf4
      unknown authored
      
      Docs/manual.texi:
        Auto merged
      defcaaf4
    • unknown's avatar
      Update test results · 3d490dcb
      unknown authored
      3d490dcb
    • unknown's avatar
      manual.texi Document when --xml was added to mysql/mysqldump. · 47e83fde
      unknown authored
      
      Docs/manual.texi:
        Document when --xml was added to mysql/mysqldump.
      47e83fde
    • unknown's avatar
      Merge paul@work.mysql.com:/home/bk/mysql-4.0 · a36d59bc
      unknown authored
      into teton.kitebird.com:/home/paul/mysql-4.0
      
      
      Docs/manual.texi:
        Auto merged
      a36d59bc
    • unknown's avatar
      merge · 873963d4
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      Build-tools/Do-all-build-steps:
        Auto merged
      Build-tools/Do-compile:
        Auto merged
      Build-tools/Do-rpm:
        Auto merged
      Docs/manual.texi:
        Auto merged
      include/hash.h:
        Auto merged
      include/my_sys.h:
        Auto merged
      innobase/dict/dict0dict.c:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysys/array.c:
        Auto merged
      mysys/hash.c:
        Auto merged
      mysys/mf_qsort.c:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      strings/Makefile.am:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      873963d4
    • unknown's avatar
      merge · 4d710469
      unknown authored
      
      configure.in:
        Auto merged
      Docs/manual.texi:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      4d710469
    • unknown's avatar
      Portability fixes · 749246cc
      unknown authored
      Fix bug when using option groups
      
      
      libmysql/libmysql.c:
        Fix bug when using option groups
      myisam/myisamchk.c:
        Portability fix
      mysys/my_getopt.c:
        Portability fix
      749246cc
    • unknown's avatar
      Fix for --enable-local-infile · c13baf70
      unknown authored
      
      Docs/manual.texi:
        Changelog
      acinclude.m4:
        Cleanup --help output
      libmysql/libmysql.c:
        Fix for reading option groups in client
      c13baf70
    • unknown's avatar
      merge · b707a1ab
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      Build-tools/Do-all-build-steps:
        Auto merged
      Build-tools/Do-compile:
        Auto merged
      Build-tools/Do-rpm:
        Auto merged
      Docs/manual.texi:
        Auto merged
      include/hash.h:
        Auto merged
      include/my_sys.h:
        Auto merged
      innobase/dict/dict0dict.c:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/t/type_date.test:
        Auto merged
      mysys/array.c:
        Auto merged
      mysys/hash.c:
        Auto merged
      mysys/mf_qsort.c:
        Auto merged
      scripts/mysqld_safe.sh:
        Auto merged
      scripts/mysqlhotcopy.sh:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      sql-bench/server-cfg.sh:
        Auto merged
      strings/Makefile.am:
        Auto merged
      b707a1ab
    • unknown's avatar
      Fixed bug in DATE_FORMAT when used with GROUP BY · d6998363
      unknown authored
      
      Build-tools/Do-compile:
        Fixed typo
      Docs/manual.texi:
        Changelog
      mysql-test/r/type_date.result:
        Added test of bug in DATE_FORMAT
      mysql-test/t/type_date.test:
        Added test of bug in DATE_FORMAT
      scripts/mysqlhotcopy.sh:
        Fix for RAID files
      sql/table.cc:
        Fixed typo in last patch
      d6998363
    • unknown's avatar
      Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 · e578a2e2
      unknown authored
      into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
      
      
      e578a2e2
    • unknown's avatar
  4. 05 Mar, 2002 10 commits
  5. 04 Mar, 2002 3 commits
  6. 03 Mar, 2002 1 commit
    • unknown's avatar
      fixed the use of unitialized variable - code now works on the test system · ce2b2499
      unknown authored
      of one of our users which replicates from a live server. So I now have a
      lot of confidence in it and will push. It passes all tests, so I if I broke
      somebody's code in 3.23 merge this is your fault - you should have had a good test
      case :-)
      
      
      sql/slave.cc:
        added DBUG_ASSERT()
      sql/slave.h:
        fixed cache initialization problem
      ce2b2499
  7. 02 Mar, 2002 7 commits
    • unknown's avatar
      load local fix · 7e1edb01
      unknown authored
      overrun sentry in my_vsnprintf() test
      will not be pushed yet
      
      
      BUILD/FINISH.sh:
        load local fix
      BUILD/SETUP.sh:
        load local fix
      BUILD/compile-pentium-debug-max:
        load local fix
      configure.in:
        load local fix
      mysys/my_vsnprintf.c:
        added overrun sentry to the test
      7e1edb01
    • unknown's avatar
      merge · df663f50
      unknown authored
      
      sql/sql_acl.cc:
        Auto merged
      Docs/manual.texi:
        Merge
      sql/sql_select.cc:
        Merge
      df663f50
    • unknown's avatar
      Fix sorting of NULL values (Should always be first) · ad4fcb8a
      unknown authored
      Fix problem with HAVING and MAX() IS NOT NULL
      
      
      Docs/manual.texi:
        Changelog & NULL usage with ORDER BY
      client/mysqldump.c:
        Cleanup disable keys
      mysql-test/r/distinct.result:
        Fix results after ORDER BY with NULL fix
      mysql-test/r/group_by.result:
        Fix results after ORDER BY with NULL fix
      mysql-test/r/having.result:
        Testcase for bug with HAVING
      mysql-test/t/distinct.test:
        Test for DISTINCT + ORDER BY DESC bug
      mysql-test/t/having.test:
        Test of HAVING and MAX IS NOT NULL
      sql/filesort.cc:
        Fix sorting of NULL values (Should always be first)
      sql/item.h:
        Fix problem with HAVING and MAX() IS NOT NULL
      sql/item_sum.h:
        Fix problem with HAVING and MAX() IS NOT NULL
      sql/opt_range.cc:
        Fix problem with HAVING and MAX() IS NOT NULL
      sql/opt_range.h:
        Fix sorting of NULL values
      sql/sql_select.cc:
        Fix sorting of ORDER BY ... DESC on NULL values.
      ad4fcb8a
    • unknown's avatar
      post-merge fixup · 3eb9c0be
      unknown authored
      
      BitKeeper/etc/ignore:
        Added mysys/test_vsnprintf to the ignore list
      mysql-test/mysql-test-run.sh:
        post-merge fix
      mysys/my_vsnprintf.c:
        fixed newly introduced bug
      3eb9c0be
    • unknown's avatar
      merged from 3.23 to pull the LOAD DATA INFILE fix as rpl000001 was failing. · 2c9879ca
      unknown authored
      Let's hope this did not break anything. Will not push this one until Monty
      gets back
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      Build-tools/Do-all-build-steps:
        Auto merged
      Build-tools/Do-compile:
        Auto merged
      Build-tools/Do-rpm:
        Auto merged
      Docs/manual.texi:
        Auto merged
      include/hash.h:
        Auto merged
      include/my_sys.h:
        Auto merged
      innobase/dict/dict0dict.c:
        Auto merged
      mysys/array.c:
        Auto merged
      mysys/hash.c:
        Auto merged
      mysys/mf_qsort.c:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      strings/Makefile.am:
        Auto merged
      client/mysql.cc:
        merged from 3.23
      configure.in:
        merged from 3.23
      mysql-test/mysql-test-run.sh:
        merged from 3.23
      sql/mysqld.cc:
        merged from 3.23
      support-files/mysql.spec.sh:
        merged from 3.23
      2c9879ca
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 · 80d375b1
      unknown authored
      into mysql.sashanet.com:/reiser-data/mysql-4.0
      
      
      80d375b1
    • unknown's avatar
      make my_vsnprintf() work with oversized strings · 3b38d3d5
      unknown authored
      fixed replication bug - flush_master_info() needs to be called every time we read an 
          event from master
      
      this is will not be pushed yet
      
      
      mysys/my_vsnprintf.c:
        make my_vsnprintf() work with oversized strings
        corrected Swedish "skipp" in the comments
      sql/log.cc:
        wrong change - to be undone
      sql/slave.cc:
        fixed bug - flush_master_info() needs to be called every time we read an 
        event from master
      3b38d3d5
  8. 01 Mar, 2002 3 commits
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 · 19d37eca
      unknown authored
      into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
      
      
      Docs/manual.texi:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      19d37eca
    • unknown's avatar
      fulltext+const_table bug fixed · 43a1ef6c
      unknown authored
      
      mysql-test/r/fulltext.result:
        test added
      mysql-test/t/fulltext.test:
        test added
      sql/item_func.cc:
        fulltext+const_table problem fixed once and forever
      sql/item_func.h:
        fulltext+const_table problem fixed once and forever
      sql/sql_select.cc:
        fulltext+const_table problem fixed once and forever
      sql/table.h:
        fulltext+const_table problem fixed once and forever
      43a1ef6c
    • unknown's avatar
      Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 · e4e8b31c
      unknown authored
      into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
      
      
      e4e8b31c