1. 15 Aug, 2005 9 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · d7b68578
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      sql/ha_berkeley.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_derived.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/sql_class.cc:
        Manual merge
      d7b68578
    • unknown's avatar
      Fixed typo in error numbers · b49978e3
      unknown authored
      b49978e3
    • unknown's avatar
      Save and clear run context before executing a stored function or trigger and restore it afterwards. · 262075d1
      unknown authored
      This allows us to use statement replication with functions and triggers
      The following things are fixed with this patch:
      - NOW() and automatic timestamps takes the value from the main event for functions and triggers (which allows these to replicate with statement level logging)
      - No side effects for triggers or functions with auto-increment values(), last_insert_id(), rand() or found_rows()
      - Triggers can't return result sets
      
      Fixes bugs:
      #12480: NOW() is not constant in a trigger
      #12481: Using NOW() in a stored function breaks statement based replication
      #12482: Triggers has side effects with auto_increment values
      #11587: trigger causes lost connection error
      
      
      mysql-test/r/trigger.result:
        Added test fpr big
      mysql-test/t/sp-error.test:
        Changed error message numbers
      mysql-test/t/trigger.test:
        Added test for trigger returning result (#11587)
      sql/item_func.cc:
        Store the first used seed value for RAND() value.
        (This makes rand() replicatable in functions and triggers)
        Save and clear run context before executing a stored function and restore it afterwards.
        This removes side effects of stored functions for RAND(), auto-increment values and NOW() and makes most stored function replicatable
      sql/share/errmsg.txt:
        Reuse error message also for triggers
      sql/sp_head.cc:
        If in function or trigger, don't change value of NOW()
        (This allows us to use statement replication with functions that directly or indirectly uses timestamps)
      sql/sql_class.cc:
        Added framework for storing and retrieving run context while exceuting triggers or stored functions.
      sql/sql_class.h:
        Added framework for storing and retrieving run context while exceuting triggers or stored functions.
      sql/sql_parse.cc:
        If in function or trigger, don't change value of NOW()
        (This allows us to use statement replication with functions that directly or indirectly uses timestamps)
      sql/sql_trigger.cc:
        Moved process_triggers function from sql_trigger.h
        Use reset/restore sub_statement_state while executing triggers to avoid side effects and make them replicatable
      sql/sql_trigger.h:
        Moved process_triggers function from sql_trigger.h
        Use reset/restore sub_statement_state while executing triggers to avoid side effects and make them replicatable
      sql/sql_yacc.yy:
        Give error message if trigger can return a result set (Bug #11587)
      tests/fork_big2.pl:
        Removed return from end of lines
      mysql-test/r/rpl_trigger.result:
        New BitKeeper file ``mysql-test/r/rpl_trigger.result''
      mysql-test/t/rpl_trigger.test:
        New BitKeeper file ``mysql-test/t/rpl_trigger.test''
      262075d1
    • unknown's avatar
      - Removed a non-fatal error when running the Mac OS X 10.4 PackageMaker: · fabe2c04
      unknown authored
        CFBundleShortVersionString in Info.plist may not include a version
        suffix like "-beta" (BUG#12584)
      - Minor cleanup: removed two unused keys from Info.plist: IFMajorVersion
        and IFMinorVersion
      
      
      support-files/MacOSX/Info.plist.sh:
        - Set CFBundleShortVersionString to MYSQL_NO_DASH_VERSION, not VERSION
          (BUG#12584)
        - removed two obsolete keys: IFMajorVersion and IFMinorVersion - they
          are not actually used according to the "Software Distribution"
          documentation at http://developer.apple.com/
      support-files/MacOSX/Makefile.am:
        - added an sed call to replace @MYSQL_NO_DASH_VERSION@ (e.g. for
          Info.plist (BUG#12584)
      fabe2c04
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · ab852dee
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
      
      ab852dee
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · b6b7bab7
      unknown authored
      into moonbone.local:/work/mysql-5.0-bug-11864
      
      b6b7bab7
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 733de625
      unknown authored
      into moonbone.local:/work/mysql-5.0-bug-10802
      
      733de625
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3ef038cb
      unknown authored
      into moonbone.local:/work/mysql-5.0-bug-11864
      
      
      mysql-test/r/derived.result:
        Auto merged
      sql/sql_derived.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      3ef038cb
    • unknown's avatar
      Fix bug #10802 Index is not used if table using BDB engine on HP-UX · df971160
      unknown authored
      HP-UX compiler was generating code which makes wrong conversion from double to
      ulonglong which results in not using index in some cases.
      
      Changed type cast operators odrer with which generated code makes proper 
      conversion.
      
      
      sql/ha_berkeley.cc:
        Fix bug #10802 Index is not used if table using BDB engine on HP-UX
      mysql-test/include/varchar.inc:
        Test case for bug #10802 "Index is not used if table using BDB engine on HP-UX" is same as for bug #9489
      df971160
  2. 14 Aug, 2005 3 commits
    • unknown's avatar
      forgotten 'return' · 3c983241
      unknown authored
      
      BitKeeper/etc/ignore:
        Added support-files/MacOSX/postflight support-files/MacOSX/preflight to the ignore list
      3c983241
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 850bc229
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
      
      850bc229
    • unknown's avatar
      client/mysql.cc · ddcb9d31
      unknown authored
          mysql default port cleanup (it's set in libmysql.c, NOT in my_getopt)
      configure.in
          autoconf 2.52 is enough to build mysql-5.0
      
      
      client/mysql.cc:
        mysql default port cleanup (it's set in libmysql.c, NOT in my_getopt)
      configure.in:
        autoconf 2.52 is enough to build mysql-5.0
      ddcb9d31
  3. 13 Aug, 2005 9 commits
    • unknown's avatar
      table.cc: · 9065d0ea
      unknown authored
        remove unneeded multitable_view assignment
      sql_view.cc:
        fix potential memorry overrun in ref_array
        asssign multitable_view in time of view creation (BUG#12569)
      
      
      sql/sql_view.cc:
        fix potential memorry overrun in ref_array
        asssign multitable_view in time of view creation
      sql/table.cc:
        remove unneeded multitable_view assignment
      9065d0ea
    • unknown's avatar
      Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5363ab4c
      unknown authored
      into  hasky.mysql.fi:/home/sanja/work-merge-5.0
      
      
      sql/sql_parse.cc:
        Auto merged
      5363ab4c
    • unknown's avatar
      item_subselect.cc: · 76018034
      unknown authored
        postmerge fix
      subselect.result:
        new 5.0 result (postmerge)
      
      
      mysql-test/r/subselect.result:
        new 5.0 result (postmerge)
      sql/item_subselect.cc:
        postmerge fix
      76018034
    • unknown's avatar
      after merge · 7a06856a
      unknown authored
      7a06856a
    • unknown's avatar
      Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 309c1ab5
      unknown authored
      into  hasky.mysql.fi:/home/sanja/work-merge-5.0
      
      
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/item_subselect.cc:
        merge
      309c1ab5
    • unknown's avatar
      Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 · dca1e4b6
      unknown authored
      into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
      
      dca1e4b6
    • unknown's avatar
      Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 · 27ff98c3
      unknown authored
      into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
      
      27ff98c3
    • unknown's avatar
      fixed convertion and handling IN subqueries with rows (BUG#11867) · cc28684b
      unknown authored
      
      mysql-test/r/subselect.result:
        testst of IN subqueries with row
      mysql-test/t/subselect.test:
        tests of ion subqueries with row
      sql/item.h:
        add method to prevent of removing Item_ref_null_helper from HAVING
      sql/item_cmpfunc.h:
        Prevented removing of Item_test_isnotnull from HAVING
      sql/item_subselect.cc:
        fixed converting row IN subqueries
      sql/sql_select.cc:
        fixed debug print
      cc28684b
    • unknown's avatar
      sql_parse.cc: · 07633828
      unknown authored
        Don't skip SET command even if --replicate-wild* says to.
        E.g., SET ONE_SHOT TIME_ZONE = 'XYZ' should be executed (BUG #12542)
      
      
      sql/sql_parse.cc:
        Don't skip SET command even if --replicate-wild* says to.
        E.g., SET ONE_SHOT TIME_ZONE = 'XYZ' should be executed (BUG #12542)
      07633828
  4. 12 Aug, 2005 19 commits
    • unknown's avatar
      merged · cc211f95
      unknown authored
      
      sql/ha_innodb.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      cc211f95
    • unknown's avatar
      BUG#12162 - one can start two transactions with the same XID. · a0725e13
      unknown authored
      Now we keep all active XID's in a hash
      
      a0725e13
    • unknown's avatar
      Fix bug #12298 Typo in timestampdiff() function name results in erroneous · 1bdc0d17
      unknown authored
      view being created.
      
      Item_func_timestamp_diff::func_name() were returning function name as
      "timestamp_diff" thus when view was executed function parameters wasn't 
      properly recognized and error was raised.
      
      
      mysql-test/r/func_time.result:
        Fix test result after bugfix #12298
      sql/item_timefunc.h:
        Fix bug #12298 Typo in timestampdiff() function name results in wrong view being created.
      mysql-test/t/view.test:
        Test case for bug #12298 Typo in timestampdiff()  function name results in erroneous view being created.
      mysql-test/r/view.result:
        Test case for bug #12298 Typo in timestampdiff() function name results in erroneous view being created.
      1bdc0d17
    • unknown's avatar
      WL#2486 · 9bf6e15d
      unknown authored
      Disabled one test case because it is still a problem due to the fix for WL#2486.
      Pushed to enable code review.
      
      
      mysql-test/r/join.result:
        Disabled one test case because it is still a problem due to the fix for WL#2486.
        Pushed to enable code review.
      9bf6e15d
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · f1ff2f8f
      unknown authored
      into  mysql.com:/home/timka/mysql/src/5.0-2486-merge
      
      
      mysql-test/r/errors.result:
        Auto merged
      mysql-test/r/fulltext.result:
        Auto merged
      mysql-test/r/fulltext_order_by.result:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/join_nested.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/errors.test:
        Auto merged
      mysql-test/t/fulltext.test:
        Auto merged
      mysql-test/t/fulltext_order_by.test:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/t/join_nested.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.h:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      sql/sql_insert.cc:
        merge WL#2486
      sql/sql_show.cc:
        merge WL#2486
      f1ff2f8f
    • unknown's avatar
      Implementation of WL#2486 - · bcc00c1f
      unknown authored
      "Process NATURAL and USING joins according to SQL:2003".
      
      * Some of the main problems fixed by the patch:
        - in "select *" queries the * expanded correctly according to
          ANSI for arbitrary natural/using joins
        - natural/using joins are correctly transformed into JOIN ... ON
          for any number/nesting of the joins.
        - column references are correctly resolved against natural joins
          of any nesting and combined with arbitrary other joins.
      
      * This patch also contains a fix for name resolution of items
        inside the ON condition of JOIN ... ON - in this case items must
        be resolved only against the JOIN operands. To support such
        'local' name resolution, the patch introduces a stack of
        name resolution contexts used at parse time.
      
      NOTICE:
      - This patch is not complete in the sense that
        - there are 2 test cases that still do not pass -
          one in join.test, one in select.test. Both are marked
          with a comment "TODO: WL#2486".
        - it does not include a new test specific for the task
      
      
      mysql-test/include/ps_query.inc:
        Adjusted according to standard NATURAL/USING join semantics.,
      mysql-test/r/bdb.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/derived.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/errors.result:
        The column as a whole cannot be resolved, so different error message.
      mysql-test/r/fulltext.result:
        Adjusted according to standard JOIN ... ON semantics =>
        the ON condition can refer only to the join operands.
      mysql-test/r/fulltext_order_by.result:
        More detailed error message.
      mysql-test/r/innodb.result:
        Adjusted according to standard NATURAL/USING join semantics.
        This test doesn't pass completetly yet!
      mysql-test/r/insert_select.result:
        More detailed error message.
      mysql-test/r/join.result:
        Adjusted according to standard NATURAL/USING join semantics.
        
        NOTICE: there is one test case that still fails, and it is
        commeted out and marked with WL#2486 in the test file.
      mysql-test/r/join_crash.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/join_nested.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/join_outer.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/multi_update.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/null_key.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/order_by.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/ps_2myisam.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/ps_3innodb.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/ps_4heap.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/ps_5merge.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/ps_6bdb.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/ps_7ndb.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/select.result:
        Adjusted according to standard NATURAL/USING join semantics.
        
        NOTICE: there is one failing test case which is commented with
        WL#2486 in the test file.
      mysql-test/r/subselect.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/type_ranges.result:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/r/union.result:
        More detailed error message.
      mysql-test/t/bdb.test:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/t/errors.test:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/t/fulltext.test:
        Adjusted according to standard JOIN ... ON semantics =>
        the ON condition can refer only to the join operands.
      mysql-test/t/fulltext_order_by.test:
        More detailed error message.
      mysql-test/t/innodb.test:
        Adjusted according to standard NATURAL/USING join semantics.
        This test doesn't pass completetly yet!
      mysql-test/t/insert_select.test:
        More detailed error message.
      mysql-test/t/join.test:
        Adjusted according to standard NATURAL/USING join semantics.
        
        NOTICE: there is one test case that still fails, and it is
        commeted out and marked with WL#2486 in the test file.
      mysql-test/t/join_crash.test:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/t/join_nested.test:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/t/join_outer.test:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/t/null_key.test:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/t/order_by.test:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/t/select.test:
        Adjusted according to standard NATURAL/USING join semantics.
        
        NOTICE: there is one test case that still fails, and it is
        commeted out and marked with WL#2486 in the test file.
      mysql-test/t/subselect.test:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/t/type_ranges.test:
        Adjusted according to standard NATURAL/USING join semantics.
      mysql-test/t/union.test:
        More detailed error message.
      sql/item.cc:
        - extra parameter to find_field_in_tables
        - find_field_in_real_table renamed to find_field_in_table
        - fixed comments/typos
      sql/item.h:
        - added [first | last]_name_resolution_table to class
          Name_resolution_context
        - commented old code
        - standardized formatting
      sql/mysql_priv.h:
        - refactored the find_field_in_XXX procedures,
        - added a new procedure for natural join table references,
        - renamed the find_field_in_XXX procedures to clearer names
      sql/sp.cc:
        - pass the top-most list of the FROM clause to setup_tables
        - extra parameter to find_field_in_tables
      sql/sql_acl.cc:
        - renamed find_field_in_table => find_field_in_table_ref
        - extra parameter to find_field_in_table_ref
        - commented old code
      sql/sql_base.cc:
        This file contains the core of the implementation of the processing
        of NATURAL/USING joins (WL#2486).
        - added many comments to old code
        - refactored the group of find_field_in_XXX procedures, and added a
          new procedure for natural joins. There is one find_field_in_XXX procedure
          per each type of table reference (stored table, merge view, or natural
          join); one meta-procedure that selects the correct one depeneding on the
          table reference; and one procedure that goes over a list of table
          referenes.
        - NATURAL/USING joins are processed through the procedures:
            mark_common_columns, store_natural_using_join_columns,
            store_top_level_join_columns, setup_natural_join_row_types.
          The entry point to processing NATURAL/USING joins is the
          procedure 'setup_natural_join_row_types'.
        - Replaced the specialized Field_iterator_XXX iterators with one
          generic iterator over the fields of a table reference.
        - Simplified 'insert_fields' and 'setup_conds' due to encapsulation of
          the processing of natural joins in a separate set of procedures.
      sql/sql_class.h:
        - Commented old code.
      sql/sql_delete.cc:
        - Pass the FROM clause to setup_tables.
      sql/sql_help.cc:
        - pass the end name resolution table to find_field_in_tables
        - adjust the list of tables for name resolution
      sql/sql_insert.cc:
        - Changed the code that saves and restores the current context to
          support the list of tables for name resolution -
          context->first_name_resolution_table, and
          table_list->next_name_resolution_table.
          Needed to support an ugly trick to resolve inserted columns only in
          the first table.
        - Added Name_resolution_context::[first | last]_name_resolution_table.
        - Commented old code
      sql/sql_lex.cc:
        - set select_lex.parent_lex correctly
        - set correct state of the current name resolution context
      sql/sql_lex.h:
        - Added a stack of name resolution contexts to support local
          contexts for JOIN ... ON conditions.
        - Commented old code.
      sql/sql_load.cc:
        - Pass the FROM clause to setup_tables.
      sql/sql_olap.cc:
        - Pass the FROM clause to setup_tables.
      sql/sql_parse.cc:
        - correctly set SELECT_LEX::parent_lex
        - set the first table of the current name resoltion context
        - added support for NATURAL/USING joins
        - commented old code
      sql/sql_select.cc:
        - Pass the FROM clause to setup_tables.
        - Pass the end table to find_field_in_tables
        - Improved comments
      sql/sql_show.cc:
        - Set SELECT_LEX::parent_lex.
      sql/sql_update.cc:
        - Pass the FROM clause to setup_tables.
      sql/sql_yacc.yy:
        - Added support for a stack of name resolution contexts needed to
          implement name resolution for JOIN ... ON. A context is pushed
          for each new JOIN ... ON, and popped afterwards.
        - Added support for NATURAL/USING joins.
      sql/table.cc:
        - Added new class Natural_join_column to hide the heterogeneous
          representation of column references for stored tables and for
          views.
        - Added a new list TABLE_LIST::next_name_resolution_table to
          support name resolution with NATURAL/USING joins. Also added
          other members to TABLE_LIST to support NATURAL/USING joins.
        - Added a generic iterator over the fields of table references
          of various types - class Field_iterator_table_ref
      sql/table.h:
        - Added new class Natural_join_column to hide the heterogeneous
          representation of column references for stored tables and for
          views.
        - Added a new list TABLE_LIST::next_name_resolution_table to
          support name resolution with NATURAL/USING joins. Also added
          other members to TABLE_LIST to support NATURAL/USING joins.
        - Added a generic iterator over the fields of table references
          of various types - class Field_iterator_table_ref
      tests/mysql_client_test.c:
        Adjusted according to standard NATURAL JOIN syntax.
      bcc00c1f
    • unknown's avatar
      Merge lgrimmer@bk-internal:/home/bk/mysql-5.0 · 2eb1006f
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      2eb1006f
    • unknown's avatar
      Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 · b4d7b8ec
      unknown authored
      into  127.(none):/home/osku/mysql-5.0
      
      b4d7b8ec
    • unknown's avatar
      item_strfunc.cc: · de8efccd
      unknown authored
        After merge change.
        4.1 method was replaced in 5.0.
      
      
      sql/item_strfunc.cc:
        After merge change.
        4.1 method was replaced in 5.0.
      de8efccd
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · 4d9e9db6
      unknown authored
      into mysql.com:/space/my/mysql-4.1-merge
      
      4d9e9db6
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-5.0 · b10399e7
      unknown authored
      into mysql.com:/space/my/mysql-5.0-build
      
      b10399e7
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1.b12351 · ec66827e
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0
      
      
      client/mysqlcheck.c:
        Auto merged
      mysql-test/r/func_system.result:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      ec66827e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · ae8f5845
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_union.cc:
        Manual merge (trivial)
      ae8f5845
    • unknown's avatar
      Fixes during review of new pushed code · efcca089
      unknown authored
      Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
      
      
      sql/ha_berkeley.cc:
        Removed not used variable (and options)
      sql/ha_berkeley.h:
        Removed not used argument
      sql/ha_ndbcluster.cc:
        Remove compiler warning
      sql/init.cc:
        Simplify code
      sql/item_sum.cc:
        Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
      sql/mysql_priv.h:
        Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
      sql/mysqld.cc:
        Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
      sql/sql_class.h:
        Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
      sql/sql_delete.cc:
        Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
      sql/sql_derived.cc:
        Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
      sql/sql_lex.h:
        Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
      sql/sql_parse.cc:
        Indentation fixes
      sql/sql_select.cc:
        Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
      sql/sql_select.h:
        Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
      sql/sql_show.cc:
        Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
      sql/sql_union.cc:
        Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
      sql/sql_update.cc:
        Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
      sql/sql_yacc.yy:
        Changed variable name i to more descriptive name
        Removed compiler warning
      efcca089
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 64941444
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b12351
      
      
      sql/item_strfunc.cc:
        Auto merged
      64941444
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1-merge · a1d9f919
      unknown authored
      into mysql.com:/space/my/mysql-5.0-build
      
      
      support-files/Makefile.am:
        Auto merged
      a1d9f919
    • unknown's avatar
      sql_view.cc: · 73f13424
      unknown authored
        A safety correction.
      
      
      sql/sql_view.cc:
        A safety correction.
      73f13424
    • unknown's avatar
      Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5ff7819c
      unknown authored
      into  127.(none):/home/osku/mysql-5.0
      
      
      innobase/srv/srv0srv.c:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      5ff7819c
    • unknown's avatar
      InnoDB: Print more than 300 characters of queries in various error conditions, · 4b8f312e
      unknown authored
      most notably deadlocked ones in SHOW INNODB STATUS. Fixes bug #7819.
      
      
      innobase/btr/btr0pcur.c:
        Adapt to changes in trx_print.
      innobase/include/trx0trx.h:
        Add max_query_len parameter to trx_print.
      innobase/lock/lock0lock.c:
        Adapt to changes in trx_print.
      innobase/row/row0ins.c:
        Adapt to changes in trx_print.
      innobase/row/row0sel.c:
        Adapt to changes in trx_print.
      innobase/row/row0umod.c:
        Adapt to changes in trx_print.
      innobase/row/row0upd.c:
        Adapt to changes in trx_print.
      innobase/srv/srv0srv.c:
        Adapt to changes in trx_print.
      innobase/trx/trx0trx.c:
        Add max_query_len parameter to trx_print.
      sql/ha_innodb.cc:
        Add max_query_len parameter to innobase_mysql_print_thd.
      4b8f312e