1. 21 Sep, 2005 1 commit
    • unknown's avatar
      postmerge fixes · 21a62eb1
      unknown authored
      
      libmysqld/lib_sql.cc:
        struct st_security_context nad to class Security_context
      sql/item_func.cc:
        fixed method call, name and contence to be compatible with new code
      sql/item_func.h:
        fixed method to be compatible wit new code
      sql/sql_parse.cc:
        fixed typo
        removed compiler warnings
      21a62eb1
  2. 20 Sep, 2005 14 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · aa95f0d4
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner5-5.0
      
      
      sql/ha_innodb.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/item_func.cc:
        merge
      aa95f0d4
    • unknown's avatar
      WL#2787 (Add view definer/owner to the view definition (.frm) to check... · 3fe752f5
      unknown authored
      WL#2787 (Add view definer/owner to the view definition (.frm) to check privileges on used tables and stored routines when using a VIEW.)
      Part 2 postreview fixes.
      
      
      sql/ha_innodb.cc:
        Renamed structure st_security_context to class Security_context
      sql/item_func.cc:
        Renamed structure st_security_context to class Security_context
      sql/item_strfunc.cc:
        fixed USER() function
      sql/log.cc:
        variable used to optimize access to security context
      sql/mysql_priv.h:
        Renamed structure st_security_context to class Security_context
      sql/mysqld.cc:
        main security context used direcly
      sql/sp_head.cc:
        Renamed structure st_security_context to class Security_context
        removed unneed variable
      sql/sp_head.h:
        Comment inmroved
        Renamed structure st_security_context to class Security_context
      sql/sql_acl.cc:
        Renamed structure st_security_context to class Security_context
        fixed function comment and return value
        variable used to optimize access to security context
        Renamed method of Security_ontext
      sql/sql_acl.h:
        fixed return value type
      sql/sql_class.cc:
        Renamed structure st_security_context to class Security_context
      sql/sql_class.h:
        Renamed structure st_security_context to class Security_context
        Method renamed
      sql/sql_db.cc:
        Renamed structure st_security_context to class Security_context
        fixed layout
      sql/sql_parse.cc:
        registration of wanted access for underlying tables
      sql/sql_show.cc:
        Renamed structure st_security_context to class Security_context
        fixed layout
      sql/sql_yacc.yy:
        Renamed structure st_security_context to class Security_context
      3fe752f5
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 92e2dbb6
      unknown authored
      into moonbone.local:/work/12812-bug-5.0-mysql
      
      
      92e2dbb6
    • unknown's avatar
      item_func.cc: · 58dbcea4
      unknown authored
        Fixed mistake in fix for bug#12812
      
      
      sql/item_func.cc:
        Fixed mistake in fix for bug#12812
      58dbcea4
    • unknown's avatar
      Fix fur BUG#13348: "multi-table updates and deletes are not logged if no rows were affected". · 03045ee7
      unknown authored
      Not fixed in 4.1 as not critical. Also I'm correcting error checking of multi-UPDATE/DELETE
      when it comes to binlogging, to make it consistent with when we rollback the statement.
      
      
      mysql-test/r/rpl_multi_delete.result:
        result update
      mysql-test/r/rpl_multi_update.result:
        result update
      mysql-test/t/rpl_multi_delete.test:
        test for BUG#13348
      mysql-test/t/rpl_multi_update.test:
        test of BUG#13348
      sql/sql_delete.cc:
        We now binlog multi-DELETE even if no row was updated (like we do for DELETE).
        I'm also correcting some error checking (< instead of <=), basing myself on when we rollback.
      sql/sql_update.cc:
        we now binlog multi-UPDATE even if no row was updated (like we do for UPDATE).
        Adding to existing tests to test new behaviour.
        I'm also correcting some error checking (< instead of <=), basing myself on when we rollback.
      03045ee7
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · 2b24a2b5
      unknown authored
      into  mysql.com:/home/timka/mysql/src/5.0-bug-13127
      
      
      2b24a2b5
    • unknown's avatar
      Fix for BUG#13127. · 5f81fbb3
      unknown authored
      The problem was in the way table references are pre-filtered when
      resolving a qualified field. When resolving qualified table references
      we search recursively in the operands of the join. If there is
      natural/using join with a merge view, the first call to find_field_in_table_ref
      makes a recursive call to itself with the view as the new table reference
      to search for the column. However the view has both nested_join and
      join_columns != NULL so it skipped the test whether the view name matches
      the field qualifier. As a result the field was found in the view since the
      view already has a field with the same name. Thus the field was incorrectly
      resolved as the view field.
      
      
      mysql-test/r/select.result:
        Test for BUG#13127.
      mysql-test/t/select.test:
        Test for BUG#13127.
      sql/sql_base.cc:
        The patch contains two independent changes:
        
        - When searching for qualified fields, include merge views and information schema tables
        used with SHOW (both using TABLE_LIST::field_translation to represent result fields) in
        the test that compares the qualifying table with the name of the table reference being
        searched. This change fixes the bug.
        
        - Do not search the materialized list of columns of a NATURAL/USING join if 'table_list'
        is a stored table or merge view. Instead search directly in the table or view as if it
        is not under a natural join. This is a performance improvement since if 'table_list'
        is a stored table, then the search can utilize the name hash for table names.
      5f81fbb3
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · ba55d19f
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
      
      
      ba55d19f
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · ae3680c5
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      ae3680c5
    • unknown's avatar
      Fix for bug#9896, each fragment has a twin fragment (in 4.1,5.0), pages in... · 0c84cf4c
      unknown authored
      Fix for bug#9896, each fragment has a twin fragment (in 4.1,5.0), pages in this were not counted, giving incorrect memory consumption
      
      
      
      0c84cf4c
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · c6e85ac8
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
      
      
      c6e85ac8
    • unknown's avatar
      Fixed a missing cast. · c705f0c2
      unknown authored
      c705f0c2
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 614fb882
      unknown authored
      into  zim.(none):/home/brian/mysql/mysql-5.0
      
      
      614fb882
    • unknown's avatar
      Cleanups for storage engine patch. Changed two test results to now reflect the... · 91fbe52b
      unknown authored
      Cleanups for storage engine patch. Changed two test results to now reflect the changes in storage engines and a couple of comment changes in the code. 
      
      
      mysql-test/r/ps_1general.result:
        Redoing test output with straightened up output for storage engine names.
      mysql-test/r/variables.result:
        Fixed test case.
      sql/handler.cc:
        Couple of format cleanups and a change in a comment.
      91fbe52b
  3. 19 Sep, 2005 17 commits
    • unknown's avatar
      Manual merge · 7a47331f
      unknown authored
      
      sql/item_func.cc:
        Auto merged
      7a47331f
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8607842e
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
      
      
      8607842e
    • unknown's avatar
      fix warnings · c8c29f2d
      unknown authored
      
      server-tools/instance-manager/buffer.cc:
        perform initialization of static consts in .cc file to respect VC6
      server-tools/instance-manager/buffer.h:
        fix compiler warning
      server-tools/instance-manager/commands.cc:
        fix compiler warning
      server-tools/instance-manager/user_map.cc:
        fix compiler warning
      c8c29f2d
    • unknown's avatar
      Fix bug #12812 create view calling a function works without execute right on function · 43dd29df
      unknown authored
      Execution rigths on function was checked just before function execution,
      thus it was unknown on prepare stage whether user have right to execute 
      particular function.
      
      Added access rights checking function which is called right after fixing
      Item_func_sp.
      This have additional effect that if user don't have rights for execution
      query will fail on earlier stage and will not waste resources on optimizing
      with failing on execution stage.
      
      
      sql/item_func.h:
        Fix bug#12812 create view calling a function works without execute right on function
      sql/item_func.cc:
        Fix bug#12812 create view calling a function works without execute right on function
        Added function Item_func_sp::check_access() which checks access rights.
        Added function Item_func_sp::fix_field() which calls check_access() after fixing.
        Item_func_sp::execute() now calls to check_access() to check access rights.
      mysql-test/t/sp.test:
        Test case for bug#12812 create view calling a function works without execute right on function
      mysql-test/r/sp.result:
        Test case for bug#12812 create view calling a function works without execute right on function
      43dd29df
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7a1cc524
      unknown authored
      into  zim.(none):/home/brian/mysql/mysql-5.0
      
      
      sql/ha_federated.cc:
        Auto merged
      7a1cc524
    • unknown's avatar
      Cleanup for handlerton structure to allow for loadable engine work. This is... · fa8fcecb
      unknown authored
      Cleanup for handlerton structure to allow for loadable engine work. This is the first in a series of patches. 
      
      
      sql/examples/ha_archive.cc:
        Now declared externally.
      sql/examples/ha_example.cc:
        Now declared externally
      sql/examples/ha_tina.cc:
        Now declared externally
      sql/ha_berkeley.cc:
        Now declared externally
      sql/ha_blackhole.cc:
        Now declared externally
      sql/ha_federated.cc:
        Now declared externally.
      sql/ha_heap.cc:
        Now declared externally.
      sql/ha_innodb.cc:
        Now declared externally.
      sql/ha_myisam.cc:
        Now declared externally
      sql/ha_myisammrg.cc:
        Now declared externally.
      sql/ha_ndbcluster.cc:
        Now declared externally.
      sql/handler.cc:
        Changes for eventual loadable engines. This will allow us to gain faster access to the handlerton (eventually this will just be a handlteron array).
      sql/handler.h:
        New alias structure and change to show_table_st to place handlerton in the structure.
      fa8fcecb
    • unknown's avatar
      Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 · da0f9ece
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
      
      
      client/mysqltest.c:
        Merged from 4.1.
      da0f9ece
    • unknown's avatar
      Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 · d9315344
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
      
      
      client/mysqltest.c:
        Merged from 4.0.
      d9315344
    • unknown's avatar
      Fixed Bug#13275 mysqltest empty file bug · a8980733
      unknown authored
      a8980733
    • unknown's avatar
      Corrected last fix for · 380db368
      unknown authored
        Bug #13152 bit fields and fields that follow become corrupted when dumped from NDB tables
      
      
      380db368
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · 730fc415
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      ndb/src/ndbapi/Ndbinit.cpp:
        Auto merged
      730fc415
    • unknown's avatar
      mysql-test-run.pl: · 5df7f93d
      unknown authored
        Added flag --valgrind-mysqltest
      
      
      mysql-test/mysql-test-run.pl:
        Added flag --valgrind-mysqltest
      5df7f93d
    • unknown's avatar
      bug#9282 - ndb · 7150244e
      unknown authored
        big delete from causing NdbObjectIdMap::expand at same time 
        as receiver thread perform getObjectId 
      
      
      ndb/src/ndbapi/Ndbinit.cpp:
        Protect NdbObjectIdMap::expand from getObjectId
      ndb/src/ndbapi/ObjectMap.hpp:
        Protect NdbObjectIdMap::expand from getObjectId
      7150244e
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · a615084f
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      a615084f
    • unknown's avatar
      ctype_utf8.result, ctype_utf8.test: · cb0a436c
      unknown authored
        Bug#10504: additional test
      
      
      mysql-test/t/ctype_utf8.test:
        Bug#10504: additional test
      mysql-test/r/ctype_utf8.result:
        Bug#10504: additional test
      cb0a436c
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · fde37327
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b10504
      
      
      fde37327
    • unknown's avatar
      Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 · 015d55b7
      unknown authored
      into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0-master
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      015d55b7
  4. 18 Sep, 2005 5 commits
  5. 17 Sep, 2005 1 commit
    • unknown's avatar
      Brian's "he is too lazy to commit this so Eric is going to have to do it"... · 0031af06
      unknown authored
      Brian's "he is too lazy to commit this so Eric is going to have to do it" environmental variable hack for prefix. This allows you to just set a prefix in your profile which will be used in all of your builds. AKA you can be even lazier(!) about calling BUILD scripts. Don't blame Eric, Brian borrowed his keyboard.
      
      
      BUILD/SETUP.sh:
        Added option to set environmental variable in case you are lazy about setting prefix (ala Brian)
      BUILD/autorun.sh:
        Change of syntax
      0031af06
  6. 16 Sep, 2005 2 commits