1. 30 Jun, 2006 19 commits
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-4.1 · 9606675b
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      libmysql/libmysql.c:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/t/key.test:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/r/key.result:
        Manual merge
      mysql-test/t/mysqldump.test:
        Manual merge
        (Now we have same code as in 4.1 and 5.1)
      sql/ha_ndbcluster.cc:
        Manual merge
        Change %ll -> llstr()
      tests/mysql_client_test.c:
        manual merge
      9606675b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · e0171231
      unknown authored
      into  mysql.com:/home/my/mysql-4.1
      
      
      e0171231
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · a6d2cafd
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
      
      
      a6d2cafd
    • unknown's avatar
      Reverted wrong bug fix (Bug#11228) · 66a59b10
      unknown authored
      
      mysql-test/r/key.result:
        Fixed result after removing wrong bug fix
      mysql-test/t/key.test:
        Added SHOW CREATE TABLE, which is the proper way to check for table definitions
      sql/table.cc:
        Reverted wrong bug fix.
        The intention with the original code was to show that MySQL treats the first
        given unique key as a primary key. Clients can use the marked primary key as a
        real primary key to validate row changes in case of conflicting updates.  The
        ODBC driver (and other drivers) may also use this fact to optimize/check
        updates and handle conflicts.  The marked key also shows what some engines, like InnoDB or NDB,
        will use as it's internal primary key.
        
        For checking if someone has declared a true PRIMARY KEY, one should use 'SHOW CREATE TABLE'
      66a59b10
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · e410532a
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      e410532a
    • unknown's avatar
      adopted ndb handler code for tables without primary key and with unique index · 437afbfd
      unknown authored
      - added missing retrieval of hidden primary key
      
      
      437afbfd
    • unknown's avatar
      Merge mysqldev@production:my/mysql-5.0-release · b138b55d
      unknown authored
      into  mysql.com:/usr/local/mysql/tmp-5.0
      
      
      include/my_global.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      b138b55d
    • unknown's avatar
      Fix Windows build problem following previous push. · 949ad5b4
      unknown authored
      
      strings/strtod.c:
        Fix Windows build problem, EOVERFLOW is defined in my_base.h on Windows.
      949ad5b4
    • unknown's avatar
      Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1 · 618bd69d
      unknown authored
      into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug20152
      
      
      618bd69d
    • unknown's avatar
      bug #20152: mysql_stmt_execute() overwrites parameter buffers · 86155590
      unknown authored
      When using a parameter bind MYSQL_TYPE_DATE in a prepared statement,
      the time part of the MYSQL_TIME buffer was written to zero in
      mysql_stmt_execute(). The param_store_date() function in libmysql.c
      worked directly on the provided buffer.
      Changed to use a copy of the buffer.
      
      
      libmysql/libmysql.c:
        fix for bug #20152
      tests/mysql_client_test.c:
        added test for bug#20152
      86155590
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.0-release · 4a6a237f
      unknown authored
      into  mysql.com:/usr/local/mysql/mysql-5.0-release
      
      
      4a6a237f
    • unknown's avatar
      BUG#20769: Dangling pointer in ctype_recoding test case. · d9cb536a
      unknown authored
      In some functions dealing with strings and character sets, the wrong
      pointers were saved for restoration in THD::rollback_item_tree_changes().
      This could potentially cause random corruption or crashes.
      
      Fixed by passing the original Item ** locations, not local stack copies.
      
      Also remove unnecessary use of default arguments.
      
      
      sql/item.cc:
        Function agg_item_charsets() now handles non-consequtive Item *'s.
      sql/item.h:
        Remove use of default argument.
      sql/item_cmpfunc.cc:
        Remove use of default argument.
      sql/item_func.cc:
        Remove use of default argument.
      sql/item_func.h:
        Function agg_item_charsets() now handles non-consequtive Item *'s.
      sql/item_strfunc.cc:
        Pass original Item **'s to agg_arg_charsets(), not local copies, to ensure
        proper restoration in THD::rollback_item_tree_changes().
      sql/item_sum.cc:
        Remove use of default argument.
      d9cb536a
    • unknown's avatar
      Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1 · 29423c2d
      unknown authored
      into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
      
      
      configure.in:
        Auto merged
      29423c2d
    • unknown's avatar
      Fixing windows build. · a14c9ddf
      unknown authored
      
      strings/strtod.c:
        Reverting previous change to include files (angle brackets instead of
        quotes) that broke windows build
      a14c9ddf
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · de1499ea
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/func_sapdb.test:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      de1499ea
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 0343a80b
      unknown authored
      into  mysql.com:/home/my/mysql-4.1
      
      
      0343a80b
    • unknown's avatar
      Merge monty@192.168.0.9:/home/my/mysql-4.1 · c8a5b35d
      unknown authored
      into  mysql.com:/home/my/mysql-4.1
      
      
      c8a5b35d
    • unknown's avatar
      Don't read ~/.my.cnf in mysqldump.test · c5ed64a4
      unknown authored
      
      heap/hp_test1.c:
        Changed type from last commit
      mysql-test/mysql-test-run.sh:
        Fixed problem with running with --gdb and two masters
        Don't disable ndb becasue we run gdb
      mysql-test/t/mysqldump.test:
        Don't read ~/.my.cnf
      sql/ha_ndbcluster.cc:
        Portability fix
      c5ed64a4
    • unknown's avatar
      mysql.spec.sh: · b76a6873
      unknown authored
        Disable old RPM strip
      my_global.h:
        Fixed wrong cast, which caused problems with gcc 4.0 and
        floats in prepared statements (Bug #19694)
      mysqlmanager.vcproj:
        Place output files in common release/debug directory
      
      
      server-tools/instance-manager/mysqlmanager.vcproj:
        Place output files in common release/debug directory
      include/my_global.h:
        Fixed wrong cast, which caused problems with gcc 4.0 and
        floats in prepared statements (Bug #19694)
      support-files/mysql.spec.sh:
        Disable old RPM strip
      b76a6873
  2. 29 Jun, 2006 21 commits