1. 16 Aug, 2005 5 commits
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 · ef5cafdf
      unknown authored
      into lmy004.wdf.sap.corp:/work/mysql-5.0-clean
      
      
      ef5cafdf
    • unknown's avatar
      fix for bug #12183 "SHOW OPEN TABLES behavior doesn't match grammar" · 1566ec35
      unknown authored
      (after review commit)
      
      
      mysql-test/r/show_check.result:
        test the extended functionality (so far not documented) of SHOW OPEN FILES
      mysql-test/t/show_check.test:
        test the extended functionality (so far not documented) of SHOW OPEN FILES
      sql/mysql_priv.h:
        pass the name of the database for checking
      sql/sql_base.cc:
        first check against the db if present (SHOW OPEN FILES FROM xxx)
        then do wild compare but only against the table name
      sql/sql_show.cc:
        pass the DB if specified
      1566ec35
    • unknown's avatar
      Manual merge · 5082c41b
      unknown authored
      5082c41b
    • unknown's avatar
      subselect.result: · 4161d7cb
      unknown authored
        Added missing drop statement
      subselect.test:
        Added missing drop statement.
      
      
      mysql-test/t/subselect.test:
        Added missing dro statement.
      mysql-test/r/subselect.result:
        Added missing drop statement
      4161d7cb
    • unknown's avatar
      sql_select.cc: · 4b49cbfb
      unknown authored
        Fixed bug #11479.
        The JOIN::reinit method cannot call setup_tables
        after the optimization phase since this function
        removes some optimization settings for joined
        tables. E.g. it resets values of the null_row flag to 0.
      subselect.result, subselect.test:
        Added a test case for bug #11479.
      
      
      mysql-test/t/subselect.test:
        Added a test case for bug #11479.
      mysql-test/r/subselect.result:
        Added a test case for bug #11479.
      sql/sql_select.cc:
        Fixed bug #11479.
        The JOIN::reinit method cannot call setup_tables
        after the optimization phase since this function
        removes some optimization settings for joined
        tables. E.g. it resets values of the null_row flag to 0.
      4b49cbfb
  2. 15 Aug, 2005 21 commits
    • unknown's avatar
      Clean up merge from 4.1 · c78623fa
      unknown authored
      
      mysql-test/r/func_date_add.result:
        Update results
      mysql-test/r/func_time.result:
        Update results
      server-tools/instance-manager/protocol.cc:
        Fix call to list_rest()
      sql/sp_head.cc:
        sp_change_db() removed, call mysql_change_db() instead.
      c78623fa
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-12318 · d6a6a488
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      d6a6a488
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-10627 · 163b04c3
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      sql/share/errmsg.txt:
        SCCS merged
      163b04c3
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-clean · f6de082b
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      myisam/myisampack.c:
        Auto merged
      mysql-test/r/metadata.result:
        Auto merged
      mysys/list.c:
        Auto merged
      mysys/thr_lock.c:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_test.cc:
        Auto merged
      sql/mysqld.cc:
        SCCS merged
      f6de082b
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-11688 · 000a09ba
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      000a09ba
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 219c84fa
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      sql/sql_show.cc:
        Auto merged
      219c84fa
    • unknown's avatar
      Don't clear warnings for functions or triggers · 51919db0
      unknown authored
      Fixed failing test
      
      
      mysql-test/t/rpl_trigger.test:
        Added missing option that caused the test to fail sometimes
      sql/sql_parse.cc:
        Don't clear warnings for functions or triggers
      51919db0
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-12235 · 4566d12f
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      4566d12f
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-11796 · 3b1eabe8
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      sql/mysqld.cc:
        Auto merged
      3b1eabe8
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-12327 · 21bb08e8
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      21bb08e8
    • unknown's avatar
      Bug#12518 · 2fc78cb3
      unknown authored
        "COLUMN_DEFAULT has wrong value if NOT NULL is set"
        Show NULL instead of empty string when no default value is set
      
      
      mysql-test/r/information_schema.result:
        test for bug 12518
      mysql-test/t/information_schema.test:
        test for bug 12518
      sql/sql_show.cc:
        report NULL for information schema result when there is no default value
      2fc78cb3
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · c5aac211
      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
      c5aac211
    • unknown's avatar
      Fixed typo in error numbers · e8b26c09
      unknown authored
      e8b26c09
    • unknown's avatar
      Save and clear run context before executing a stored function or trigger and restore it afterwards. · a914b527
      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''
      a914b527
    • unknown's avatar
      - Removed a non-fatal error when running the Mac OS X 10.4 PackageMaker: · 3b422187
      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)
      3b422187
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · a875ceaf
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
      
      
      a875ceaf
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 73c6702f
      unknown authored
      into moonbone.local:/work/mysql-5.0-bug-11864
      
      
      73c6702f
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 58e86f9b
      unknown authored
      into moonbone.local:/work/mysql-5.0-bug-10802
      
      
      58e86f9b
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6ed49352
      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
      6ed49352
    • unknown's avatar
      Fix bug #10802 Index is not used if table using BDB engine on HP-UX · 9c18002f
      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
      9c18002f
  3. 14 Aug, 2005 3 commits
    • unknown's avatar
      forgotten 'return' · 6843d1d8
      unknown authored
      
      BitKeeper/etc/ignore:
        Added support-files/MacOSX/postflight support-files/MacOSX/preflight to the ignore list
      6843d1d8
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 33f04ca9
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
      
      
      33f04ca9
    • unknown's avatar
      client/mysql.cc · ec619beb
      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
      ec619beb
  4. 13 Aug, 2005 9 commits
    • unknown's avatar
      table.cc: · 7b91cd9a
      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
      7b91cd9a
    • unknown's avatar
      Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6ff38ce7
      unknown authored
      into  hasky.mysql.fi:/home/sanja/work-merge-5.0
      
      
      sql/sql_parse.cc:
        Auto merged
      6ff38ce7
    • unknown's avatar
      item_subselect.cc: · 5afacbab
      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
      5afacbab
    • unknown's avatar
      after merge · 731f4720
      unknown authored
      731f4720
    • unknown's avatar
      Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · ad888850
      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
      ad888850
    • unknown's avatar
      Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 · e8d9dccb
      unknown authored
      into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
      
      
      e8d9dccb
    • unknown's avatar
      Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 · 208be175
      unknown authored
      into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
      
      
      208be175
    • unknown's avatar
      fixed convertion and handling IN subqueries with rows (BUG#11867) · 19b4760f
      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
      19b4760f
    • unknown's avatar
      sql_parse.cc: · 66b97195
      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)
      66b97195
  5. 12 Aug, 2005 2 commits