1. 20 Oct, 2004 5 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · f7a7fdc7
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-secfix
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      f7a7fdc7
    • unknown's avatar
      Fix for bug #6173 "One can circumvent missing UPDATE privilege if · 4dbb8830
      unknown authored
      he has SELECT and INSERT privileges for table with primary key"
      
      Now we set lex->duplicates= DUP_UPDATE right in parser if INSERT has
      ON DUPLICATE KEY UPDATE clause, this simplifies insert_precheck()
      function (this also fixes a bug) and some other code.
      
      
      mysql-test/r/grant2.result:
        Added test for bug #6173 "One can circumvent missing UPDATE privilege if
        he has SELECT and INSERT privileges for table with primary key"
      mysql-test/t/grant2.test:
        Added test for bug #6173 "One can circumvent missing UPDATE privilege if
        he has SELECT and INSERT privileges for table with primary key"
      sql/mysql_priv.h:
        insert_precheck() don't need "update" parameter any longer since
        now we set lex->duplicates to DUP_UPDATE if INSERT has ON DUPLICATE
        KEY UPDATE clause.
      sql/sql_parse.cc:
        insert_precheck() don't need "update" parameter any longer since
        now we set lex->duplicates to DUP_UPDATE if INSERT has ON DUPLICATE
        KEY UPDATE clause, so it can determine whenever it is needed to
        require UPDATE_ACL by itself. Also calling of mysql_insert() is
        simplified.
      sql/sql_prepare.cc:
        insert_precheck() don't need "update" parameter any longer since
        now we set lex->duplicates to DUP_UPDATE if INSERT has ON DUPLICATE
        KEY UPDATE clause, so it can determine whenever it is needed to
        require UPDATE_ACL by itself. Also calling of mysql_insert() is
        simplified.
      sql/sql_yacc.yy:
        It is better to set Lex->duplicates= DUP_UPDATE right in parser if we
        have INSERT with ON DUPLICATE KEY UPDATE clause, rather doing this later.
      4dbb8830
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 9ebe2db5
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-bug6151
      
      9ebe2db5
    • unknown's avatar
      39c55b5c
    • unknown's avatar
      NDB dbtux compile fix for sol9x86 · 7aa495cb
      unknown authored
      
      ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
        compile fix for sol9x86
      ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
        compile fix for sol9x86
      ndb/test/ndbapi/testOIBasic.cpp:
        testing continues..
      7aa495cb
  2. 19 Oct, 2004 14 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5ae26fee
      unknown authored
      into mishka.local:/home/my/mysql-4.1
      
      
      client/mysqlimport.c:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      ndb/src/ndbapi/ndberror.c:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      5ae26fee
    • unknown's avatar
      485d1eb3
    • unknown's avatar
      Review of all code pushed since last review · da02110d
      unknown authored
      Simple optimzations and cleanups
      Removed compiler warnings and fixed portability issues
      Added client functions 'mysql_embedded()' to allow client to check if we are using embedded server
      Fixes for purify
      
      
      client/mysqlimport.c:
        Remove not used variable
      client/mysqltest.c:
        Remove usage of MAXPATHLEN (all MySQL code uses FN_REFLEN)
        Simplified code
        Remove usage of sprintf("%llu") as this is not portable
      include/mysql.h:
        Added mysql_embedded() to be able to easily check if we are using the embedded server
      innobase/srv/srv0start.c:
        Don't use memcmp() when using purify (to avoid false warnings)
      libmysql/libmysql.c:
        Added mysql_embedded() to be able to easily check if we are using the embedded server
      libmysql/libmysql.def:
        Added mysql_embedded() to be able to easily check if we are using the embedded server
      myisam/myisam_ftdump.c:
        Remove compiler warning
      myisam/myisamchk.c:
        Remove compiler warning
      myisam/rt_test.c:
        #ifdef not used code
      mysys/hash.c:
        Remove compiler warning (from last push)
      mysys/my_gethwaddr.c:
        Remove compiler warning
      ndb/src/ndbapi/ndberror.c:
        #ifdef not used code
      regex/regcomp.c:
        Remove not used code
      regex/regcomp.ih:
        Remove not used code (to remove compiler warnings)
      sql-common/client.c:
        Remove compiler warnings
      sql/field.cc:
        Simple optimization
      sql/ha_innodb.cc:
        Rename mysql_embedded -> mysqld_embedded
      sql/item.cc:
        Fix comments
        Move variables first on block
        Remove else after return
        Simple optimizations
        (no logic changes)
      sql/item_cmpfunc.cc:
        Added comment
      sql/mysql_priv.h:
        Rename mysql_embedded -> mysqld_embedded
      sql/mysqld.cc:
        Rename mysql_embedded -> mysqld_embedded
      sql/sql_acl.cc:
        Added comments
        simple optimization
        Fixed 'very unlikely' bug when doing REVOKE ALL PRIVILEGES
      sql/sql_select.cc:
        More comments
        Simple optimization
      sql/sql_show.cc:
        Simple changes to make similar code similar
        More comments
      sql/sql_string.cc:
        Trivial optimization and better code layout
      strings/Makefile.am:
        Change xml.c to use bcmp to avoid warnings from purify
      strings/xml.c:
        Change xml.c to use bcmp to avoid warnings from purify
      tests/client_test.c:
        Remove usage of MAXPATHLEN (all MySQL code uses FN_REFLEN)
      da02110d
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3fcd8b28
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      3fcd8b28
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 3419626e
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
      
      3419626e
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 426b4b2e
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      426b4b2e
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 458754fb
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
      
      458754fb
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 7b4ee6b4
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
      
      7b4ee6b4
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · f0d53aeb
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      f0d53aeb
    • unknown's avatar
      os0file.c: · 7ce482fc
      unknown authored
        InnoDB: print info about how many bytes we were able to read if a file read is not able to read as many bytes as we requested
      
      
      innobase/os/os0file.c:
        InnoDB: print info about how many bytes we were able to read if a file read is not able to read as many bytes as we requested
      7ce482fc
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5a6eb6ef
      unknown authored
      into hundin.mysql.fi:/home/marko/j/mysql-4.1
      
      5a6eb6ef
    • unknown's avatar
      CHARSET_INFO.txt: · cf181579
      unknown authored
        minor fixes
      
      
      strings/CHARSET_INFO.txt:
        minor fixes
      cf181579
    • unknown's avatar
      sql_union.cc: · 95d2a1bb
      unknown authored
        Check DERIVATION_NONE only for UNIONS.
      
      
      sql/sql_union.cc:
        Check DERIVATION_NONE only for UNIONS.
      95d2a1bb
    • unknown's avatar
      Dumping BLOBs in HEX notation. The patch was orinigally · 711264d8
      unknown authored
      contributed by Takeshi. I also added HEX support for 
      "extended-inserts".
      
      711264d8
  3. 18 Oct, 2004 20 commits
  4. 17 Oct, 2004 1 commit
    • unknown's avatar
      NDB wl-1533 tux optim: after wl-1942 can remove signal from many methods · f436f619
      unknown authored
      
      ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
        wl-1533 tux optim: after wl-1942 can remove signal from many methods
      ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
        wl-1533 tux optim: after wl-1942 can remove signal from many methods
      ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp:
        wl-1533 tux optim: after wl-1942 can remove signal from many methods
      ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
        wl-1533 tux optim: after wl-1942 can remove signal from many methods
      ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
        wl-1533 tux optim: after wl-1942 can remove signal from many methods
      ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
        wl-1533 tux optim: after wl-1942 can remove signal from many methods
      ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
        wl-1533 tux optim: after wl-1942 can remove signal from many methods
      ndb/test/ndbapi/testOIBasic.cpp:
        wl-1533 tux optim: after wl-1942 can remove signal from many methods
      f436f619