1. 30 Apr, 2004 5 commits
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2b84899f
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-bug3420
      
      
      tests/client_test.c:
        Auto merged
      2b84899f
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6a5d2703
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-bug3420
      
      
      tests/client_test.c:
        Auto merged
      6a5d2703
    • unknown's avatar
      Only calculate MYSQL_FIELD->max_length if mysql_stmt_attr_set(...,... · b8dc907a
      unknown authored
      Only calculate MYSQL_FIELD->max_length if mysql_stmt_attr_set(..., STMT_ATTR_UPDATE_MAX_LENGTH) is done.
      
      
      tests/client_test.c:
        Test mysql_stmt_attr_set(...STMT_ATTR_UPDATE_MAX_LENGTH)
      b8dc907a
    • unknown's avatar
      Merge · 70557a67
      unknown authored
      
      libmysql/libmysql.c:
        Auto merged
      tests/client_test.c:
        Auto merged
      include/mysql.h:
        SCCS merged
      70557a67
    • unknown's avatar
      Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result() (Bug #1647) · 72163289
      unknown authored
      Added checking of cut read lines in bootstrap thread (Bug #2874)
      
      
      include/mysql.h:
        Added length to MYSQL_ROWS to enable sanity checking of packets
        Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result()
      libmysql/libmysql.c:
        Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result() (Bug #1647)
      scripts/fill_help_tables.sh:
        Added checking of maximum length of line in output (Bug #2874)
      scripts/mysql_install_db.sh:
        Added error message if help tables couldn't be done (Bug #2874)
      sql/sql_parse.cc:
        Added checking of cut read lines in bootstrap thread (Bug #2874)
      tests/client_test.c:
        Added --debug
        Changed some strange define names
        Less output
        Added testing of max_length for prepared statements
      72163289
  2. 29 Apr, 2004 12 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 9cba14c1
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.1-u2
      
      
      include/mysql.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      tests/client_test.c:
        Auto merged
      9cba14c1
    • unknown's avatar
      Fix for Bug#3035 "Prepared statement integer inserts": now unsigned · b8585472
      unknown authored
      flag is sent to server with placeholder types.
      There were no need to extend the protocol as one additional byte
      was reserved for placeholder code, when placeholder code is in range 0-255.
      So this byte is now used for flags. Post-review fixes added.
      
      
      include/config-win.h:
        added floaststore implementation
      include/my_global.h:
        added floatstore implementation
      include/mysql.h:
        Bug#3035:
        added 'is_unsigned' member
        binary_data wasn't used, removed
        null_field wasn't necessary, removed
      include/mysql_com.h:
        Unused defines were removed.
      libmysql/libmysql.c:
        Function store_param_type was removed - too much for a function, especially
        with bug in it.
        New implementation is inline and takes into account signedness of 
        placeholder.
        Fixed store functions to not perform double network-host order conversion
        on high-byte-first systems (should also fix Bug#3578 "Prepared statement 
        integer conversions work wrong in 64-bit Power Mac G5 CPUs").
        null_field removed.
      sql/sql_prepare.cc:
        Placeholder sign is taken into account when reading data from network.
      tests/client_test.c:
        Test for BUG#3035 added: insert and retrieve minimum and maximum of all
        integer types.
      b8585472
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 1d36e9ff
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.1-root
      
      1d36e9ff
    • unknown's avatar
      Implementation of mysql_stmt_attr_get and mysql_stmt_attr_set · 858856d5
      unknown authored
      requested by Monty for Bug#1647 (No way to determine what size 
      blob/clob is being returned into bound buffer)
      
      
      include/mysql.h:
        Implementation of mysql_stmt_attr_get and mysql_stmt_attr_set 
        requested by Monty for Bug#1647.
      libmysql/libmysql.c:
        Implementation of mysql_stmt_attr_get and mysql_stmt_attr_set 
        requested by Monty for Bug#1647.
      libmysql/libmysql.def:
        Windows .defs added for new API calls
      858856d5
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 082383f1
      unknown authored
      into mc05.(none):/space/tomas/mysql-4.1-make
      
      082383f1
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 429f996a
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-my-ps-bugs
      
      
      tests/client_test.c:
        Auto merged
      429f996a
    • unknown's avatar
      SrcDist.sh, Epilogue.mk: · 834aa383
      unknown authored
        improved distdir
      
      
      ndb/Epilogue.mk:
        improved distdir
      ndb/SrcDist.sh:
        improved distdir
      834aa383
    • unknown's avatar
      configure.in: · be96b613
      unknown authored
        added configure options PACKAGE and VERSION for ndb
      GuessConfig.sh:
        added options for PACKAGE and VERSION
      Epilogue.mk:
        Added target distdir
      
      
      ndb/Epilogue.mk:
        Added target distdir
      ndb/config/GuessConfig.sh:
        added options for PACKAGE and VERSION
      configure.in:
        added configure options PACKAGE and VERSION for ndb
      be96b613
    • unknown's avatar
      SrcDist.sh: · 8a8acc6b
      unknown authored
        new file
      
      8a8acc6b
    • unknown's avatar
      - added option for building/packaging the NDB cluster to Do-compile · 09b44a9e
      unknown authored
      
      Build-tools/Do-compile:
         - added option for building/packaging the NDB cluster
      09b44a9e
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · ef19df96
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      ef19df96
    • unknown's avatar
      postreview fixes · cca7fc87
      unknown authored
      cca7fc87
  3. 28 Apr, 2004 2 commits
    • unknown's avatar
      Allow one to send empty strings with mysql_stmt_send_long_data() · 752f4e7b
      unknown authored
      mysql_stmt_reset() now resets param->long_data_used
      Abort if --defaults-file=path-name uses a non-existing file (Bug #3413)
      Fixed problem with symlink test (bug in 4.1.2)
      
      
      libmysql/libmysql.c:
        Allow one to send empty strings with mysql_stmt_send_long_data()
        mysql_stmt_reset() now resets param->long_data_used
      mysys/default.c:
        Abort if --defaults-file=path-name uses a non-existing file (Bug #3413)
      sql/unireg.cc:
        Fixed problem with symlink test:  .frm table was not properly deleted if handler create failed
      752f4e7b
    • unknown's avatar
      removed ndb odbc from compile and release · 9c2b3277
      unknown authored
      9c2b3277
  4. 27 Apr, 2004 6 commits
    • unknown's avatar
      e8d9e882
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · f46ec79a
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-bug3567
      
      f46ec79a
    • unknown's avatar
      after-merge fix: make concurrent-insert-skip code ft2-aware · a5f4bc77
      unknown authored
      
      mysql-test/t/func_group.test:
        no innodb is not an error
      a5f4bc77
    • unknown's avatar
      Fixed results for previous patch · 967d5a39
      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)
      967d5a39
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 89cb7623
      unknown authored
      into mishka.local:/home/my/mysql-4.1
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/set_var.cc:
        Auto merged
      89cb7623
    • unknown's avatar
      After merge fixes · 6fdb9848
      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
      6fdb9848
  5. 26 Apr, 2004 8 commits
    • unknown's avatar
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · d82d4cbe
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-bug3567
      
      d82d4cbe
    • unknown's avatar
      Fixed client_test to run with MAX_KEY=64. · 262b9b00
      unknown authored
      262b9b00
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · fcea6e3b
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      fcea6e3b
    • unknown's avatar
      - disabled the NDB Cluster from the embedded server · 9e689ddc
      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
      9e689ddc
    • unknown's avatar
      MAX_KEY limit doubled (32->64) · f6ab789f
      unknown authored
      f6ab789f
    • unknown's avatar
      Merge with 4.0 · 196b976e
      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
      196b976e
    • unknown's avatar
      symlink a whole dir, not individual files (symlinking individual files is one... · b9619ecf
      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
      b9619ecf
  6. 24 Apr, 2004 1 commit
    • unknown's avatar
      ha_innodb.h: · f096bee6
      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
      f096bee6
  7. 22 Apr, 2004 1 commit
  8. 21 Apr, 2004 2 commits
    • unknown's avatar
      symlink, not hardlink · c740d66c
      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
      c740d66c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 0377e733
      unknown authored
      into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
      
      0377e733
  9. 19 Apr, 2004 1 commit
    • unknown's avatar
      mysqld.cc: · 7f3ac5b8
      unknown authored
        changed default for nbdcluster to DISABLED
      
      
      sql/mysqld.cc:
        changed default for nbdcluster to DISABLED
      7f3ac5b8
  10. 18 Apr, 2004 2 commits