1. 22 Sep, 2005 6 commits
  2. 21 Sep, 2005 20 commits
    • unknown's avatar
      Manual merge · ffda62c2
      unknown authored
      
      mysql-test/r/update.result:
        Auto merged
      mysql-test/t/update.test:
        Auto merged
      ffda62c2
    • unknown's avatar
      Fix bug #13180 thd->allow_sum_funcs wasn't reset before query processing. · 9fb8042d
      unknown authored
      thd->allow_sum_func was left 'true' after previous statement thus allowing
      sum funcs to be present in conditions.
      
      thd->allow_sum_func should be set to 0 for each query and each prepared
      statement reinitialization. This is done in lex_start() and 
      reset_stmt_for_execute().
      
      
      sql/sql_lex.cc:
        Fix bug#13180 thd->allow_sum_func wasn't reset obefore query processing.
        thd->allow_sum_func is set to 0 in lex_start().
      sql/sql_prepare.cc:
        Fix bug#13180 thd->allow_sum_func wasn't reset obefore query processing.
        thd->allow_sum_func is set to 0 in  reset_stmt_for_execute().
      mysql-test/t/update.test:
        Test case for bug#13180 thd->allow_sum_funcs wasn't reset before query
        processing.
      mysql-test/r/update.result:
        Test case for bug#13180 thd->allow_sum_funcs wasn't reset before query
        processing.
      9fb8042d
    • unknown's avatar
      Merge stamagawa@bk-internal.mysql.com:/home/bk/mysql-5.0 · c68107d2
      unknown authored
      into  mysql.com:/home/shuichi/apps/mysql/bk/mysql-5.0b
      
      
      configure.in:
        Auto merged
      c68107d2
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 0e554abd
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0-merged
      
      
      sql/ha_myisam.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      0e554abd
    • unknown's avatar
      aftermerge fix · 1f603a9e
      unknown authored
      1f603a9e
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · a9fe230e
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-5.0-rollback-comment
      
      a9fe230e
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 · 895da5bf
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
      
      895da5bf
    • unknown's avatar
      ndb merge fix · e2845b48
      unknown authored
      e2845b48
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 8ce8ef20
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
        merge
      8ce8ef20
    • unknown's avatar
      bug#12950 · d9adfe17
      unknown authored
          ndb backup with charsets and simultanious updates
          make sure that backup _dont_ read xfrm data
      
      
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Backup can do dirty read
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Fix so that backup dont read xfrm data
      ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
        Fix so that backup dont read xfrm data
      d9adfe17
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · b8ac4e9e
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-5.0-rollback-comment
      
      b8ac4e9e
    • unknown's avatar
      sql/item_func.cc · 314e6f63
      unknown authored
        remove extra ";" after function
      
      
      sql/item_func.cc:
        remove extra ";" after function
      314e6f63
    • unknown's avatar
    • unknown's avatar
      merged · 02ee24a8
      unknown authored
      
      VC++Files/mysys/mysys.dsp:
        Auto merged
      VC++Files/mysys/mysys_ia64.dsp:
        Auto merged
      client/mysql.cc:
        Auto merged
      include/my_sys.h:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/rpl_multi_delete2.result:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/t/rpl_multi_delete2-slave.opt:
        Auto merged
      mysql-test/t/rpl_multi_delete2.test:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/opt_sum.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      02ee24a8
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 12960e51
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      12960e51
    • unknown's avatar
      ndb post merge fixes (show engine ndb status) · d17080fd
      unknown authored
      
      sql/ha_ndbcluster.cc:
        ndb post merge fixes
      d17080fd
    • unknown's avatar
      merged · e6e4003d
      unknown authored
      e6e4003d
    • unknown's avatar
      Don't add all args to mysqltest to MYSQL_TEST env var · f7918883
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Not all args to mysqltest should be added to the MYSQL_TEST environment variable. The MYSQL_TEST var is used when testing mysqltest and --record and result_file should not be set.
      f7918883
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 36e6e409
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner5-5.0
      
      36e6e409
    • unknown's avatar
      postmerge fixes · 20647176
      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
      20647176
  3. 20 Sep, 2005 14 commits
    • unknown's avatar
      Fixed a typo in handler.cc if CSV was built. I also added CSV to the default... · 246334fc
      unknown authored
      Fixed a  typo in handler.cc if CSV was built. I also added CSV to the default MAX builds so that more people test it. 
      
      
      BUILD/SETUP.sh:
        Adding CVS engine to default max builds.
      sql/handler.cc:
        Fixed typo
      246334fc
    • unknown's avatar
      Merge mysql.com:/home/psergey/bk-trees/mysql-4.1 · 12a960fa
      unknown authored
      into mysql.com:/home/psergey/mysql-4.1-csc6030-r3
      
      
      sql/mysqld.cc:
        Auto merged
      12a960fa
    • unknown's avatar
      BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index · 2e18bba6
      unknown authored
      statistics (like 4.0 did) (patch #3, with review #1 & #2 feedback addressed)
      
      
      include/myisam.h:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      myisam/mi_check.c:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      myisam/myisamchk.c:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      mysql-test/r/myisam.result:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      mysql-test/t/myisam.test:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/ha_myisam.cc:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/handler.h:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/mysqld.cc:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/set_var.cc:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/sql_class.h:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      2e18bba6
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 702996f1
      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
      702996f1
    • unknown's avatar
      WL#2787 (Add view definer/owner to the view definition (.frm) to check... · a95d74bb
      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
      a95d74bb
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · d83141db
      unknown authored
      into moonbone.local:/work/12812-bug-5.0-mysql
      
      d83141db
    • unknown's avatar
      item_func.cc: · 930b6b7d
      unknown authored
        Fixed mistake in fix for bug#12812
      
      
      sql/item_func.cc:
        Fixed mistake in fix for bug#12812
      930b6b7d
    • unknown's avatar
      Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1 · b49ba2a1
      unknown authored
      into  selena.:H:/MYSQL/src/#12929-mysql-4.1
      
      
      include/my_sys.h:
        Auto merged
      b49ba2a1
    • unknown's avatar
      cc46fc9f
    • unknown's avatar
      Fix fur BUG#13348: "multi-table updates and deletes are not logged if no rows were affected". · 68684767
      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.
      68684767
    • unknown's avatar
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · f04dd297
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
      
      f04dd297
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · abfc8b17
      unknown authored
      into  mysql.com:/home/timka/mysql/src/5.0-bug-13127
      
      abfc8b17
    • unknown's avatar
      Fix for BUG#13127. · 5968baf8
      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.
      5968baf8