1. 02 Nov, 2006 1 commit
    • unknown's avatar
      Better fix for bug#22830 · 63db4999
      unknown authored
      Events: crash with procedure which alters events with function
      
      Post-review CS
      
      This fix also changes the handling of KILL command combined with
      subquery. It changes the error message given back to "not supported",
      from parse error. The error for CREATE|ALTER EVENT has also been changed
      to generate "not supported yet" instead of parse error.
      In case of a SP call, the error is "not supported yet". This change
      cleans the parser from code which should not belong to there. Still
      LEX::expr_allows_subselect is existant because it simplifies the handling
       of SQLCOM_HA_READ which forbids subselects.
      
      
      mysql-test/r/events_bugs.result:
        update resut
      mysql-test/r/events_grant.result:
        update result
      mysql-test/r/kill.result:
        the error message has been changed for KILL
      mysql-test/t/events_bugs.test:
        Update old tests with the new emitted error
        
        Add a test case for
        BUG#22830 Events: crash with procedure which alters events with function
      mysql-test/t/events_grant.test:
        add ORDER BY clause to keep the result deterministic.
      mysql-test/t/kill.test:
        use name of the error, and change the error
        from parse error, to not supported
      sql/sql_lex.cc:
        Add an auxiliary function that checks whether SP and/or
        tables are used in the statement. This function is helpful for
        statements that cannot handle subqueries ans SP calls. Adding out
        of the parser cleans the latter of handling of special cases and
        letting it do its job of parsing.
      sql/sql_lex.h:
        helper function to check whether a table or SP was used
      sql/sql_parse.cc:
        Use LEX::table_or_sp_used() for SQLCOM_CREATE_EVENT, SQLCOM_ALTER_EVENT
        and SQLCOM_KILL. SQLCOM_DROP event does not use `expr` rule and thus a check is
        not needed.
      sql/sql_yacc.yy:
        Remove usage of LEX::expr_allows_subselect for CREATE|ALTER EVENT
        and KILL. There is only one left occurence - SQLCOM_HAREAD, but it 
        adds one table to the list of tables
      63db4999
  2. 30 Oct, 2006 3 commits
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21915 · 65e4643e
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21915
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Manual merge.
      65e4643e
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21915 · 453fb88b
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21915
      
      
      sql/mysql_priv.h:
        SCCS merged
      sql/mysqld.cc:
        SCCS merged
      453fb88b
    • unknown's avatar
      BUG#21915: Changing limits of table_cache when setting max_connections · 96002dcc
      unknown authored
      If the user has specified --max-connections=N or --table-open-cache=M
      options to the server, a warning could be given that some values were
      recalculated, and table-open-cache could be assigned greater value.
      
      Note that both warning and increase of table-open-cache were totally
      harmless.
      
      This patch fixes recalculation code to ensure that table-open-cache will
      be never increased automatically and that a warning will be given only if
      some values had to be decreased due to operating system limits.
      
      No test case is provided because we neither can't predict nor control
      operating system limits for maximal number of open files.
      
      
      sql/mysql_priv.h:
        Add constants for table_cache minimum and default values.
      sql/mysqld.cc:
        Fix max_connections and table_cache_size re-computation.
      96002dcc
  3. 27 Oct, 2006 2 commits
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug22584 · 9ba57d82
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug22584
      
      
      mysql-test/r/view.result:
        Manual merge.
      mysql-test/t/view.test:
        Manual merge.
      sql/sql_parse.cc:
        Manual merge.
      9ba57d82
    • unknown's avatar
      BUG#22584: last_insert_id not updated after inserting a record through · c7cd2f8d
      unknown authored
      a updatable view.
      
      When there's a VIEW on a base table that have AUTO_INCREMENT column, and
      this VIEW doesn't provide an access such column, after INSERT to such
      VIEW LAST_INSERT_ID() did not return the value just generated.
      
      This behaviour is intended and correct, because if the VIEW doesn't list
      some columns then these columns are effectively hidden from the user,
      and so any side effects of inserting default values to them.
      
      However, there was a bug that such statement inserting into a view would
      reset LAST_INSERT_ID() instead of leaving it unchanged.
      
      This patch restores the original value of LAST_INSERT_ID() instead of
      resetting it to zero.
      
      
      mysql-test/r/view.result:
        Add result for bug#22584: last_insert_id not updated after inserting
        a record through a updatable view.
      mysql-test/t/view.test:
        Add test case for bug#22584: last_insert_id not updated after inserting
        a record through a updatable view.
      sql/sql_parse.cc:
        When we have inserted into a view, and AUTO_INCREMENT column is not
        accessed from this view, instead of setting LAST_INSERT_ID to zero set
        it to the value it had before this statement was executed.
      c7cd2f8d
  4. 25 Oct, 2006 9 commits
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 · 1686c744
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug18819
      
      
      mysql-test/include/mix1.inc:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      1686c744
    • unknown's avatar
      After merge fix. · 63276a0a
      unknown authored
      63276a0a
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18819 · 53039d2e
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug18819
      
      
      mysql-test/r/innodb_mysql.result:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      mysql-test/include/mix1.inc:
        Auto merged
      53039d2e
    • unknown's avatar
      Fix after manual merge. · 5c3a71f3
      unknown authored
      5c3a71f3
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug18819 · c41fe961
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18819
      
      
      mysql-test/r/innodb_mysql.result:
        Manual merge.
      mysql-test/t/innodb_mysql.test:
        Manual merge.
      sql/sql_delete.cc:
        Manual merge.
      c41fe961
    • unknown's avatar
      BUG#18819: DELETE IGNORE hangs on foreign key parent delete · 6ec77042
      unknown authored
      If the error happens during DELETE IGNORE, nothing could be send to the
      client, thus leaving it frozen expecting the reply.
      
      The problem was that if some error occurred, it wouldn't be reported to
      the client because of IGNORE, but neither success would be reported.
      
      MySQL 4.1 would not freeze the client, but will report
      
        ERROR 1105 (HY000): Unknown error
      
      instead, which is also a bug.
      
      The solution is to report success if we are in DELETE IGNORE and some
      non-fatal error has happened.
      
      
      mysql-test/r/innodb_mysql.result:
        Add result for bug#18819: DELETE IGNORE hangs on foreign key parent
        delete.
      mysql-test/t/innodb_mysql.test:
        Add test case for bug#18819: DELETE IGNORE hangs on foreign key parent
        delete.
      sql/sql_delete.cc:
        Report success if we have got an error, but we are in DELETE IGNORE, and
        the error is not fatal (if it is, it would be reported to the client).
      6ec77042
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 5c263d50
      unknown authored
      into  mysql.com:/home/cps/mysql/devel/5.1-rename-bug
      
      5c263d50
    • unknown's avatar
      fix test failures in the runtime tree · 5caef2e0
      unknown authored
      
      sql/log.cc:
        NULL table pointer during initilization
      sql/sql_table.cc:
        don't lock the destination table with table lock, but use name lock instead
      5caef2e0
    • unknown's avatar
      Fixed build break. · be96f6f1
      unknown authored
      be96f6f1
  5. 24 Oct, 2006 5 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · f4eb8911
      unknown authored
      into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-bug17486
      
      f4eb8911
    • unknown's avatar
      IM polishing: log more information in log. · 6ac85164
      unknown authored
      
      server-tools/instance-manager/log.cc:
        Add pid/thread id to the each log record; split date time fields.
      6ac85164
    • unknown's avatar
      f70a1fbf
    • unknown's avatar
      Fix for BUG#17486: IM: race condition on exit. · 0a469192
      unknown authored
      The problem was that IM stoped guarded instances on shutdown,
      but didn't wait for them to stop.
      
      The fix is to wait for guarded instances to stop before exitting
      from the main thread.
      
      The idea is that Instance-monitoring thread should add itself
      to Thread_registry so that it will be taken into account on shutdown.
      However, Thread_registry should not signal it on shutdown in order to
      not interrupt wait()/waitpid().
      
      
      server-tools/instance-manager/guardian.cc:
        Be more verbose.
      server-tools/instance-manager/instance.cc:
        Register mysqld-monitoring thread in Thread_registry.
      server-tools/instance-manager/instance.h:
        Add reference to Thread_registry.
      server-tools/instance-manager/instance_map.cc:
        Pass Thread_registry reference to Instance.
      server-tools/instance-manager/instance_map.h:
        Add reference to Thread_registry.
      server-tools/instance-manager/listener.cc:
        Be more verbose.
      server-tools/instance-manager/manager.cc:
        Be more verbose.
      server-tools/instance-manager/mysql_connection.cc:
        Eliminate type-conversion warnings.
      server-tools/instance-manager/thread_registry.cc:
        Be more verbose.
      server-tools/instance-manager/thread_registry.h:
        Eliminate copy&paste, make impl-specific constructor private.
      0a469192
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · b5fc0d46
      unknown authored
      into  mysql.com:/home/cps/mysql/devel/5.1-rename-bug
      
      
      mysql-test/r/log_tables.result:
        Auto merged
      mysql-test/t/log_tables.test:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/log.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_rename.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/csv/ha_tina.cc:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      sql/log.cc:
        manual merge
      sql/share/errmsg.txt:
        manual merge
      sql/sql_table.cc:
        manual merge
      b5fc0d46
  6. 23 Oct, 2006 3 commits
    • unknown's avatar
      Post-merge fixes. · c53bf462
      unknown authored
      
      mysql-test/r/sp.result:
        Update results.
      mysql-test/r/view.result:
        Update results.
      server-tools/instance-manager/guardian.cc:
        Post-merge fixes (instance_name is a LEX_STRING).
      server-tools/instance-manager/instance.cc:
        Post-merge fixes (instance_name is a LEX_STRING).
      c53bf462
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 20899cc9
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      mysql-test/r/im_daemon_life_cycle.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/rpl_insert_id.result:
        Auto merged
      mysql-test/r/sp-vars.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      mysql-test/t/im_daemon_life_cycle.imtest:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/rpl_insert_id.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      server-tools/instance-manager/guardian.cc:
        Auto merged
      server-tools/instance-manager/guardian.h:
        Auto merged
      server-tools/instance-manager/instance_map.cc:
        Auto merged
      server-tools/instance-manager/listener.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_sum.h:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/sp-error.result:
        Use local
      mysql-test/r/sp.result:
        Use local
        (will overwrite)
      mysql-test/t/view.test:
        Use local.
      mysql-test/mysql-test-run.pl:
        Manual merge.
      mysql-test/t/sp-error.test:
        Manual merge.
      server-tools/instance-manager/instance.cc:
        Manual merge.
      server-tools/instance-manager/manager.cc:
        Manual merge.
      server-tools/instance-manager/options.cc:
        Manual merge.
      server-tools/instance-manager/options.h:
        Manual merge.
      sql/log_event.cc:
        Manual merge.
      sql/set_var.cc:
        Manual merge.
      sql/sql_class.h:
        Manual merge.
      sql/sql_insert.cc:
        Manual merge.
      sql/sql_load.cc:
        Manual merge.
      sql/sql_select.cc:
        Manual merge.
      sql/sql_update.cc:
        Manual merge.
      20899cc9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 9bd73c11
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/view.result:
        Manual merge.
      mysql-test/t/view.test:
        Manual merge.
      9bd73c11
  7. 20 Oct, 2006 10 commits
    • unknown's avatar
      Instance Manager polishing. · e0a59773
      unknown authored
      
      server-tools/instance-manager/guardian.cc:
        1. Removed unused stop_instances_arg from request_shutdown() and
        stop_instances() methods.
        
        2. Changed log-output statements so that instance name is passed
        correctly (char *, not LEX_STRING)
      server-tools/instance-manager/guardian.h:
        Removed unused stop_instances_arg from request_shutdown() and
        stop_instances() methods.
      server-tools/instance-manager/instance.cc:
        Removed unused stop_instances_arg from request_shutdown() and
        stop_instances() methods.
      server-tools/instance-manager/listener.cc:
        Be more verbose in log.
      server-tools/instance-manager/manager.cc:
        Removed unused stop_instances argument.
      e0a59773
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 5e3bd2be
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg15228-2
      
      
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      5e3bd2be
    • unknown's avatar
      Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg15228-2 · 187fad8b
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg15228
      
      
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      187fad8b
    • unknown's avatar
      Fix for bug#15228 "'invalid access to non-static data member' · de8c5dd9
      unknown authored
      warnings in sql_trigger.cc and sql_view.cc".
      
      According to the current version of C++ standard offsetof() macro
      can't be used for non-POD types. So warnings were emitted when we
      tried to use this macro for TABLE_LIST and Table_triggers_list
      classes. Note that despite of these warnings it was probably safe
      thing to do.
      
      This fix tries to circumvent this limitation by implementing
      custom version of offsetof() macro to be used with these
      classes. This hack should go away once we will refactor
      File_parser class.
      
      Alternative approaches such as disabling this warning for
      sql_trigger.cc/sql_view.cc or for the whole server were
      considered less explicit. Also I was unable to find a way
      to disable particular warning for particular _part_ of
      file in GCC.
      
      
      sql/parse_file.h:
        Introduced auxillary macro which can be used instead of offsetof()
        to get offsets of members in class for non-POD types without getting
        warnings (assuming that all instances of the class has same offsets
        for same members).
      sql/sql_trigger.cc:
        Use my_offsetof() macro instead of standard offsetof() macro with
        Table_triggers_list class in order to avoid warnings (offsetof()
        cannot be used for non-POD types according to the standard).
      sql/sql_view.cc:
        Use my_offsetof() macro instead of standard offsetof() macro with
        TABLE_LIST class in order to avoid warnings (offsetof() cannot
        be used for non-POD types according to the standard).
      de8c5dd9
    • unknown's avatar
      Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt · da87029a
      unknown authored
      into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
      
      
      mysql-test/r/myisam.result:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      da87029a
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1 · 20755b2a
      unknown authored
      into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
      
      
      mysql-test/r/myisam.result:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      20755b2a
    • unknown's avatar
      Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt · a5a18a77
      unknown authored
      into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
      
      
      sql/sql_base.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      a5a18a77
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 6e7da3ee
      unknown authored
      into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
      
      
      mysql-test/r/myisam.result:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      6e7da3ee
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · a2a77ea2
      unknown authored
      into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
      
      
      sql/sql_base.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      a2a77ea2
    • unknown's avatar
      sql_rename.cc, sql_table.cc, type_decimal.result, mix2_myisam.result: · 736b9f65
      unknown authored
        merge fixes
      
      
      mysql-test/r/mix2_myisam.result:
        merge fixes
      mysql-test/r/type_decimal.result:
        merge fixes
      sql/sql_rename.cc:
        merge fixes
      sql/sql_table.cc:
        merge fixes
      736b9f65
  8. 19 Oct, 2006 7 commits
    • unknown's avatar
      Bug#20028 (Function with select return no data) · b834856e
      unknown authored
      This patch reverts a change introduced by Bug 6951, which incorrectly
      set thd->abort_on_warning for stored procedures.
      
      As per internal discussions about the SQL_MODE=TRADITIONAL,
      the correct behavior is to *not* abort on warnings even inside an INSERT/UPDATE
      trigger.
      
      Tests for Stored Procedures, Stored Functions, Triggers involving SQL_MODE
      have been included or revised, to reflect the intended behavior.
      
      (reposting approved patch, to work around source control issues, no review needed)
      
      
      mysql-test/include/sp-vars.inc:
        Tests for SQL_MODE='TRADITIONAL'
      mysql-test/r/sp-vars.result:
        Tests for SQL_MODE='TRADITIONAL'
      mysql-test/r/sp.result:
        Tests for SQL_MODE='TRADITIONAL'
      mysql-test/r/trigger.result:
        Tests for SQL_MODE='TRADITIONAL'
      mysql-test/t/sp-vars.test:
        Tests for SQL_MODE='TRADITIONAL'
      mysql-test/t/sp.test:
        Tests for SQL_MODE='TRADITIONAL'
      mysql-test/t/trigger.test:
        Tests for SQL_MODE='TRADITIONAL'
      sql/sp_head.cc:
        For SQL_MODE='TRADITIONAL',
        thd->abort_on_warning should be set only when assigning a *column*
      b834856e
    • unknown's avatar
      After merge fix. · 95f4e5b3
      unknown authored
      95f4e5b3
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines · 30df5ede
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines
      
      
      mysql-test/t/repair.test:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      mysql-test/r/repair.result:
        Manual merge.
      30df5ede
    • unknown's avatar
      Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt · c634eca2
      unknown authored
      into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
      
      
      BitKeeper/deleted/.del-bdb.result:
        Auto merged
      mysql-test/r/func_gconcat.result:
        Auto merged
      mysql-test/r/group_min_max.result:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/merge.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/r/olap.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/r/type_decimal.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      mysql-test/t/group_min_max.test:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/opt_range.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      include/my_base.h:
        SCCS merged
      mysql-test/include/mix1.inc:
        SCCS merged
      mysql-test/r/group_by.result:
        SCCS merged
      mysql-test/r/innodb_mysql.result:
        SCCS merged
      mysql-test/t/group_by.test:
        SCCS merged
      sql/sql_select.cc:
        SCCS merged
      c634eca2
    • unknown's avatar
      Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1 · 170bfde5
      unknown authored
      into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/table.cc:
        Auto merged
      170bfde5
    • unknown's avatar
      After merge fix. · f00728f6
      unknown authored
      f00728f6
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines · ea709466
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
      
      
      myisam/sort.c:
        Auto merged
      mysql-test/r/repair.result:
        Auto merged
      mysql-test/t/repair.test:
        Auto merged
      sql/sql_base.cc:
        Use local.
      ea709466