1. 01 Nov, 2004 3 commits
  2. 30 Oct, 2004 1 commit
    • unknown's avatar
      Enable REPLACE ... SELECT in prepared statements. · d46c7366
      unknown authored
      
      mysql-test/include/ps_modify.inc:
        replace ... select now works.
      mysql-test/r/ps_2myisam.result:
        replace ... select now works.
      mysql-test/r/ps_3innodb.result:
        replace ... select now works.
      mysql-test/r/ps_4heap.result:
        replace ... select now works.
      mysql-test/r/ps_5merge.result:
        replace ... select now works.
      mysql-test/r/ps_6bdb.result:
        replace ... select now works.
      mysql-test/r/ps_7ndb.result:
        replace ... select now works.
      mysql-test/t/ps_7ndb.test:
        replace ... select now works.
      sql/sql_prepare.cc:
        Enable SQLCOM_REPLACE_SELECT: no need for any code changes but
        enable this SQLCOM in the switch.
      d46c7366
  3. 29 Oct, 2004 17 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6ca39e96
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      6ca39e96
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · a2a9da4f
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      a2a9da4f
    • unknown's avatar
      added define flag SNPRINTF_RETURN_ZERO to indicate that snprintf returns... · 90218123
      unknown authored
          added define flag SNPRINTF_RETURN_ZERO to indicate that snprintf returns zero if buffer too small
          use flag SNPRINTF_RETURN_ZERO
          emulate snprintf behavior by writing to _big_ buffer if set
          use my_vsnprintf if HAVE_SNPRINTF is not set and set SNPRINTF_RETURN_ZERO in that case
      
      
      configure.in:
        added define flag to indicate that snprintf returns zero if buffer too small
      ndb/src/common/util/basestring_vsnprintf.c:
        use flag SNPRINTF_RETURN_ZERO
        emulate snprintf behavior by writing to _big_ buffer if set
        use my_vsnprintf if HAVE_SNPRINTF is not set and set SNPRINTF_RETURN_ZERO in that case
      90218123
    • unknown's avatar
      These modifications are the result of · c24a6280
      unknown authored
      WL#2067 add features to mysqltest: "disable_error_abort" + "$mysql_errno"
      
      $mysql_errno is a new builtin variable of mysqltest and contains the
      return code of the last command send to the server.
      
      "--disable_abort_on_error" switches the abort of mysqltest
      after "unmasked" failing statements off.
      "--enable_abort_on_error" switches the abort of mysqltest
      after "unmasked" failing statements on. (default)
      
      "Maskings" are
          !$<error number>  and  --error <error number>
      in the line before the statement to be checked.
      
      The benefit of the option "--disable_abort_on_error" is that
      - all statements after the failing statement are executed
      - a r/<test>.reject will be produced
      - it is possible to write test cases, which perform
        code sequences depending on the return code of a single
        statement
      
      
      client/mysqltest.c:
        Implementation of the features
        - "--disable_abort_on_error"/"--enable_abort_on_error" switch
        - "$mysql_errno" variable
      mysql-test/r/mysqltest.result:
        test cases for the features added
      mysql-test/t/mysqltest.test:
        updated results
      c24a6280
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 16ed686a
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      mysql-test/r/fulltext.result:
        Auto merged
      16ed686a
    • unknown's avatar
      proper max_records estimation for sort-repair of fulltext indexes · 13ff3fa4
      unknown authored
      
      mysql-test/t/ctype_utf8.test:
        bad merge fixed
      13ff3fa4
    • unknown's avatar
      A fix according to Monty's request: · 6e781e11
      unknown authored
      "uint *errors" is now a non-optional parameter in String:copy()
      and copy_and_convert().
      
      
      6e781e11
    • unknown's avatar
      bumped up version for ndb · 731b06f4
      unknown authored
         protocal change in create table, now allows for more than 91 attributes
         upgrade compatability with 3.5.3
      
      
      configure.in:
        bumped up version for ndb
        protocal change in create table, now allows for more than 91 attributes
      ndb/src/common/util/version.c:
        upgrade compatability with 3.5.3
      731b06f4
    • unknown's avatar
      item_strfunc.cc: · fcb32227
      unknown authored
        Unnecessary code was removed.
      
      
      sql/item_strfunc.cc:
        Unnecessary code was removed.
      fcb32227
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 96929f72
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      configure.in:
        Auto merged
      96929f72
    • unknown's avatar
      configure.in: · eb865dc6
      unknown authored
         -I/usr/include needed for cxx on Tru64
      
      
      configure.in:
         -I/usr/include needed for cxx on Tru64
      eb865dc6
    • unknown's avatar
      Allow to convert to non-Unicode charset when mixing a string · a739f2d6
      unknown authored
      constant with a column. The string is converted into the column
      character set. It conversion doesn't lose data, then operation
      is possible. Otherwise, give an error, as it was earlier.
      
      
      sql/item.h:
        Change bool argument to uint flags:
        we have now two different flags.
      a739f2d6
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 3b1b2aae
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      ndb/include/ndbapi/ndbapi_limits.h:
        Auto merged
      3b1b2aae
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9ca7aadf
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      configure.in:
        Auto merged
      9ca7aadf
    • unknown's avatar
      Tru64 cxx compiler fix · 3b658d07
      unknown authored
          cxx does not include -I/ust/include.dtk as it should
          removed dependency on ndb_types
      
      
      configure.in:
        Tru64 cxx compiler fix
        cxx does not include -I/ust/include.dtk as it should
      ndb/include/ndbapi/ndbapi_limits.h:
        removed dependency on ndb_types
      sql/ha_ndbcluster.h:
        removed dependency on ndb_types
      3b658d07
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · facda8f3
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      facda8f3
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7223b9c1
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.6117
      
      
      7223b9c1
  4. 28 Oct, 2004 17 commits
  5. 27 Oct, 2004 2 commits