1. 28 Apr, 2004 1 commit
  2. 27 Apr, 2004 6 commits
    • unknown's avatar
      f1ab98d4
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2976f954
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-bug3567
      
      
      2976f954
    • unknown's avatar
      after-merge fix: make concurrent-insert-skip code ft2-aware · e35880e0
      unknown authored
      
      mysql-test/t/func_group.test:
        no innodb is not an error
      e35880e0
    • unknown's avatar
      Fixed results for previous patch · 39ec9e1e
      unknown authored
      Ensure that mysqldump doesn't give an error about missing Index.xml when it's not needed
      
      
      client/mysqldump.c:
        Added better default --debug option
      mysql-test/r/show_check.result:
        Fixed result after Type->Engine conversion
      mysys/charset.c:
        Don't give error if Index.xml doesn't exists
        (If we can't find the character set, the later error will include the used patch to the Index.xml file)
      39ec9e1e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 4f44862b
      unknown authored
      into mishka.local:/home/my/mysql-4.1
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/set_var.cc:
        Auto merged
      4f44862b
    • unknown's avatar
      After merge fixes · a3828081
      unknown authored
      Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type'
      
      
      client/client_priv.h:
        Added option 'create_options' for mysqldump
      client/mysqldump.c:
        Changed '--all' to '--create-options' as the old name was meaningless
      innobase/buf/buf0buf.c:
        After merge fixes
      innobase/buf/buf0lru.c:
        After merge fixes
      innobase/buf/buf0rea.c:
        After merge fixes
      innobase/dict/dict0load.c:
        After merge fixes
      innobase/fil/fil0fil.c:
        After merge fixes
      innobase/ibuf/ibuf0ibuf.c:
        After merge fixes
      innobase/include/fil0fil.h:
        After merge fixes
      innobase/include/row0mysql.h:
        After merge fixes
      innobase/include/ut0mem.h:
        After merge fixes
      innobase/log/log0recv.c:
        After merge fixes
      innobase/row/row0mysql.c:
        After merge fixes
      innobase/row/row0sel.c:
        After merge fixes
      innobase/srv/srv0start.c:
        After merge fixes
      innobase/sync/sync0rw.c:
        After merge fixes
      innobase/sync/sync0sync.c:
        After merge fixes
      myisam/ft_boolean_search.c:
        After merge fixes
      myisam/ft_nlq_search.c:
        After merge fixes
      mysql-test/r/mysqldump.result:
        After merge fixes
      mysql-test/t/mysqldump.test:
        Make result file smaller
        Some new tests
      sql/ha_innodb.cc:
        After merge fixes
      sql/set_var.cc:
        Removed compiler warning
      sql/slave.cc:
        After merge fixes
      sql/slave.h:
        After merge fixes
      sql/sql_show.cc:
        Type -> Engine
      a3828081
  3. 26 Apr, 2004 8 commits
    • unknown's avatar
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · c41919f3
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-bug3567
      
      
      c41919f3
    • unknown's avatar
      Fixed client_test to run with MAX_KEY=64. · 59b41f91
      unknown authored
      59b41f91
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · 9f4ae480
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      
      9f4ae480
    • unknown's avatar
      - disabled the NDB Cluster from the embedded server · 4959571d
      unknown authored
       - added compiling of the NDB Cluster to compile-pentium-max
      
      
      BUILD/compile-pentium-max:
         - added NDB Cluster
      include/mysql_embed.h:
         - disable NDB cluster for the embedded server by #undef'ing
           HAVE_NDBCLUSTER_DB
      libmysqld/Makefile.am:
         - remove ndbcluster_includes and ndbcluster_libs as NDB is not
           part of libmysqld anyway
      4959571d
    • unknown's avatar
      MAX_KEY limit doubled (32->64) · 2c3f5b9a
      unknown authored
      2c3f5b9a
    • unknown's avatar
      Merge with 4.0 · 1065f2bb
      unknown authored
      
      innobase/dict/dict0boot.c:
        Auto merged
      innobase/dict/dict0load.c:
        Auto merged
      innobase/dict/dict0mem.c:
        Auto merged
      innobase/fut/fut0lst.c:
        Auto merged
      innobase/include/buf0lru.h:
        Auto merged
      innobase/include/dict0mem.h:
        Auto merged
      innobase/include/fsp0fsp.h:
        Auto merged
      innobase/include/ha0ha.h:
        Auto merged
      innobase/include/ibuf0ibuf.h:
        Auto merged
      innobase/include/lock0lock.h:
        Auto merged
      innobase/include/log0log.h:
        Auto merged
      innobase/include/mem0pool.h:
        Auto merged
      innobase/include/mtr0mtr.h:
        Auto merged
      innobase/include/os0file.h:
        Auto merged
      innobase/include/rem0rec.h:
        Auto merged
      innobase/include/rem0rec.ic:
        Auto merged
      innobase/include/srv0srv.h:
        Auto merged
      innobase/include/sync0sync.h:
        Auto merged
      innobase/include/trx0sys.h:
        Auto merged
      innobase/include/ut0byte.h:
        Auto merged
      innobase/include/ut0ut.h:
        Auto merged
      innobase/mem/mem0pool.c:
        Auto merged
      innobase/mtr/mtr0mtr.c:
        Auto merged
      innobase/os/os0proc.c:
        Auto merged
      innobase/pars/lexyy.c:
        Auto merged
      innobase/pars/pars0opt.c:
        Auto merged
      innobase/row/row0ins.c:
        Auto merged
      innobase/row/row0purge.c:
        Auto merged
      innobase/row/row0uins.c:
        Auto merged
      innobase/row/row0umod.c:
        Auto merged
      innobase/row/row0undo.c:
        Auto merged
      innobase/row/row0upd.c:
        Auto merged
      innobase/trx/trx0purge.c:
        Auto merged
      innobase/trx/trx0roll.c:
        Auto merged
      innobase/trx/trx0sys.c:
        Auto merged
      innobase/trx/trx0undo.c:
        Auto merged
      innobase/ut/ut0byte.c:
        Auto merged
      pstack/bucomm.h:
        Auto merged
      pstack/budbg.h:
        Auto merged
      sql/item_sum.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      tests/insert_test.c:
        Auto merged
      mysql-test/t/func_group.test:
        Merge with 4.0
        Put 4.1 tests lasts
      sql/ha_innodb.cc:
        Merge with 4.0
        Added checking of results from my_malloc()
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      1065f2bb
    • unknown's avatar
      symlink a whole dir, not individual files (symlinking individual files is one... · 6c01a22d
      unknown authored
      symlink a whole dir, not individual files (symlinking individual files is one subdir below and results in broken links)
      
      
      cmd-line-utils/readline/Makefile.am:
        revert
      BitKeeper/etc/ignore:
        added include/readline
      6c01a22d
  4. 24 Apr, 2004 1 commit
    • unknown's avatar
      ha_innodb.h: · 39ef383c
      unknown authored
        Allow a key path length in InnoDB to be up to 3500 bytes; this is needed so that one can create an index on a column with 255 UTF-8 characters
      
      
      sql/ha_innodb.h:
        Allow a key path length in InnoDB to be up to 3500 bytes; this is needed so that one can create an index on a column with 255 UTF-8 characters
      39ef383c
  5. 22 Apr, 2004 1 commit
  6. 21 Apr, 2004 2 commits
    • unknown's avatar
      symlink, not hardlink · 465bb046
      unknown authored
      mkdir in Makefile, not in configure
      chmod a-x
      
      
      sql/ha_ndbcluster.cc:
        Change mode to -rw-rw-r--
      sql/ha_ndbcluster.h:
        Change mode to -rw-rw-r--
      BitKeeper/etc/ignore:
        added libmysqld/discover.cc
      configure.in:
        symlink, not hardlink
        mkdir in Makefile, not in configure
      include/Makefile.am:
        mkdir in Makefile, not in configure
      mysql-test/std_data/init_file.dat:
        add EOL
        make a test faster
      465bb046
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 8c1153d9
      unknown authored
      into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      8c1153d9
  7. 19 Apr, 2004 1 commit
    • unknown's avatar
      mysqld.cc: · fd6ae5aa
      unknown authored
        changed default for nbdcluster to DISABLED
      
      
      sql/mysqld.cc:
        changed default for nbdcluster to DISABLED
      fd6ae5aa
  8. 18 Apr, 2004 3 commits
  9. 16 Apr, 2004 5 commits
  10. 15 Apr, 2004 10 commits
    • unknown's avatar
      Attempt to decrease non-English coefficient, · 65dae9fc
      unknown authored
      at least slightly.
      
      
      65dae9fc
    • unknown's avatar
      Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 · c68a8a50
      unknown authored
      into neptunus.(none):/home/magnus/mysql-4.1
      
      
      c68a8a50
    • unknown's avatar
      Fix mysql-test-run to work better with NDB · e19deec1
      unknown authored
      Fix broken string constant in mysqld.cc
      
      
      mysql-test/mysql-test-run.sh:
        Don't enable NDB when the slave mysqld is started
        Remove the ndbcluster dir from var/ when restarting test
        Set datadir for NDB to @MYSQL_TEST_DIR/var so that ndbcluster dir is created there. Otherwise it will appear as a database in mysqld.
      sql/mysqld.cc:
        The string was broken in two lines and failed to compile on some compiler.
        Remove ifdefs around OPT_NDBCLUSTER, it should always be available even when not supported.
      e19deec1
    • unknown's avatar
      make_binary_distribution.sh: · 84c571d8
      unknown authored
        added --with-ndbcluster switch
      
      
      scripts/make_binary_distribution.sh:
        added --with-ndbcluster switch
      84c571d8
    • unknown's avatar
      Updated mysql-test-run to work with the started NDB Cluster · 689d0a0a
      unknown authored
      Added one test case for ndb to mysql-test-run, ndb_basic. It will show that
      NDB Cluster is supported.
      
      
      mysql-test/install_test_db.sh:
        Added --skip-ndb wile installing test db
      mysql-test/mysql-test-run.sh:
        To enable NDB use --ndbcluster and to disable it --skip-ndbcluster or --skip-ndb
      mysql-test/r/ndb_basic.result:
        Updated testcase to use all uppercase
      mysql-test/t/ndb_basic.test:
        Updated testcase to use all uppercase
      689d0a0a
    • unknown's avatar
      Merge conflicts with EXAMPLE handler · 90cf1745
      unknown authored
      
      include/my_base.h:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      90cf1745
    • unknown's avatar
      Formatting changes requested by Monty · 43dcf48e
      unknown authored
      
      sql/gen_lex_hash.cc:
        Minor changes 
         - fix space between for and (
      sql/item_subselect.cc:
        Minor changes 
         - fix space between for and (
      sql/sql_lex.cc:
        Minor changes 
         - fix space between for and (
      sql/sql_string.cc:
        Minor changes 
         - fix space between for and (
      43dcf48e
    • unknown's avatar
      Added NDB storage engine · b43af929
      unknown authored
      
      include/my_base.h:
        Added three new errorcodes to be returned by the handler
      sql/Makefile.am:
        Add new files discover.cc, ha_ndbcluster.cc and ha_ndbcluster.h
        Add include path of NDB files
      sql/handler.cc:
        Added variable for keeping track of number of "discovers"
        Added NDB to list of storage engines
        Added calls to NDB for commit, rollback etc.
        Added function ha_discover for discovering a table from handler
      sql/handler.h:
        Added NDB to list of storage engines
        Added vbariable in transaction for keeping a ndb transaction handle
      sql/lex.h:
        Changed AND to AND_SYM and OR to OR_SYM to avoid nameclash
      sql/mysql_priv.h:
        Added prototypes for new functions readfrm, writefrm and create_table_from_handler
      sql/mysqld.cc:
        Added NDB support
        Disable NDB with --skip-ndbcluster
      sql/set_var.cc:
        Add posibilty to show if NDB handler is supported
      sql/ha_ndbcluster.cc:
        Add ifdef for whole file for not compiling anything if NDB sholdn't be included
        Updated timestamp handling to use new vars timestamp_default_now and timestamp_on_update_now
      sql/sql_base.cc:
        If frm file is not found on disk, ask handler if it knows about the table. Then retry the open.
        This new functionality is called "discover" and can be used by any handler.
      sql/sql_class.h:
        Added variable for keeping a NDB connection handle
      sql/sql_table.cc:
        Before trying to create a table, ask handler if a table with that name already exists.
        If user said CREATE TABLE IF NOT EXISTS, disocver the table from handler
      sql/sql_yacc.yy:
        Add NDBCLUSTER_SYM
        Change AND to AND_SYM
        Change OR to OR_SYM
      sql/table.cc:
        Fixe for probelm when NullS is returned from bas_ext of a handler.
      b43af929
    • unknown's avatar
      make the code to build with libtool 1.4.2 · e75657c6
      unknown authored
      e75657c6
    • unknown's avatar
      - Fixed compile error in sql_parse.cc · 4cc26335
      unknown authored
      
      sql/sql_parse.cc:
         - Fixed compile error
      4cc26335
  11. 14 Apr, 2004 2 commits