1. 18 Aug, 2005 6 commits
    • unknown's avatar
      Undo the test cset that shouldn't have been pushed (ChangeSet@1.1988,... · 4f0facff
      unknown authored
      Undo the test cset that shouldn't have been pushed (ChangeSet@1.1988, 2005-08-16 00:03:50+04:00, aivanov@mysql.com
       )
      
      
      4f0facff
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 3d1c8ed0
      unknown authored
      into mysql.com:/usersnfs/pchardin/mysql-5.0
      
      3d1c8ed0
    • unknown's avatar
      Fix for Bug#11247 Stored procedures: Function calls in long loops leak memory · 026c1f55
      unknown authored
          and Bug#12297 SP crashes the server if data inserted inside a lon loop
      Third commit attempt. With fixes to the issues, showed up after full rebuild and
      tests on other hosts.
      
      
      mysql-test/r/rpl_sp.result:
        New warnings appeared in result file, as now we always create spcont in a stored routine.
        This is correct behaviour. We swallowed some warnings, as we used thd->spcont to check whether
        we are in the SP though we didn't set spcont in certain cases. This is fixed now.
      mysql-test/r/sp.result:
        fixed result file to reflect new tests
      mysql-test/t/sp.test:
        Added tests for bugs. Though one of them is disabled, as it fails because of the other bug.
        It should be enabled, when bug 12297 is fixed.
      sql/sp_head.cc:
        Per-instruction arena is implemented
      sql/sp_rcontext.cc:
         Now we should deal with callers_arena->free_list when we employ reuse mechanism with callers_arena
         switched during sp_eval_func_item
      sql/sp_rcontext.h:
        Add new member to sp_rcontext class, in order to handle instructions with assignment
        and/or with nested SP processing properly.
      026c1f55
    • unknown's avatar
      WL#2486 - natural and using join according to SQL:2003 · ba021e5f
      unknown authored
      - Fixed minor error after Monty's review.
      
      
      sql/table.cc:
        cur_table_ref is used in the first pass of the loop *before* it is set later in the loop.
      ba021e5f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · d8f09108
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      sql/sql_parse.cc:
        Auto merged
      d8f09108
    • unknown's avatar
      Cleanups and optimization during review of new code · 514ee67a
      unknown authored
      
      mysql-test/t/kill.test:
        Moved --disable_reconnect earlier to avoid race condition
      sql/sql_help.cc:
        Cleanup during review of new code
        (Moved variable definitions first in function
      sql/sql_insert.cc:
        Cleanup during review of new code
      sql/sql_lex.cc:
        Cleanup during review of new code
      sql/sql_parse.cc:
        Cleanup during review of new code
        Changed potential problem with previous_table_ref where it dependent that TABLE_LIST first element would be next_local
        Rearanged code in add_table_to_list() to remove extra if
        Combined 2 calls to calloc() to one
      sql/sql_view.cc:
        Remove extra indentation level
        Combined common 'on error' exit
      sql/sql_yacc.yy:
        Fixed comment style
      sql/table.cc:
        Cleanup during review of new code
        - Changed while() loops to for() loop (to make code more readable)
        - Removed not needed initialization of variables
        - Removed not needed 'else' cases
        - Removed trivial ASSERT's that was checked by previous code
        - Moved comment setting last in Natural_join_column::check_grants()
      514ee67a
  2. 17 Aug, 2005 11 commits
  3. 16 Aug, 2005 18 commits
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · ac21bbe6
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      mysql-test/lib/mtr_cases.pl:
        Auto merged
      ac21bbe6
    • unknown's avatar
      mtr_process.pl: · 4c2c6e9d
      unknown authored
        Bug#11792: Check all of status code, to catch a crash as a failure
      mtr_cases.pl:
        Code cleanup for skipped/disabled handling
      mtr_process.pl:
        In debug mode, report if mysqladmin did not at least
        make the server stop listening to the port.
        Increased the time waiting for terminating to 20 seconds,
        to wait for really slow slave shutdown.
        Added call to start_reap_all(), to avoid zombies.
      mtr_report.pl:
        Removed prototype for unused function mtr_report_test_disabled()
      
      
      mysql-test/lib/mtr_report.pl:
        Removed prototype for unused function mtr_report_test_disabled()
      mysql-test/lib/mtr_cases.pl:
        Code cleanup for skipped/disabled handling
      mysql-test/lib/mtr_process.pl:
        Bug#11792: Check all of status code, to catch a crash as a failure
      4c2c6e9d
    • unknown's avatar
      Merge mysql.com:/home/alexi/mysql-5.0 · 19bec180
      unknown authored
      into  mysql.com:/home/alexi/dev/mysql-5.0-1
      
      19bec180
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · b01324d1
      unknown authored
      into  mysql.com:/home/alexi/mysql-5.0
      
      
      mysql-test/t/select.test:
        Auto merged
      b01324d1
    • unknown's avatar
      information_schema.test: · 9a8ea2f9
      unknown authored
        Added a comment line for a test case used for bug #12301.
      information_schema.result:
        Fixed some test cases results (bug #12301).
      sql_show.cc:
        Fixed bug #12301.
        The bug was due to a missing value setting for the NUMERIC_SCALE column
         in the get_schema_column_record() function (sql_show.cc).
      
      
      sql/sql_show.cc:
        Fixed bug #12301.
        The bug was due to a missing value setting for the NUMERIC_SCALE column
         in the get_schema_column_record() function (sql_show.cc).
      mysql-test/r/information_schema.result:
        Fixed some test cases results (bug #12301).
      mysql-test/t/information_schema.test:
        Added a comment line for a test case used for bug #12301.
      9a8ea2f9
    • unknown's avatar
      Merge lmy004.:/work/mysql-5.0-clean · ab0931d2
      unknown authored
      into lmy004.:/work/mysql-5.0-bug12595
      
      ab0931d2
    • unknown's avatar
      after review fix for bug #12595 · 26f7e36e
      unknown authored
      
      sql/item_cmpfunc.cc:
        remove a line with trailing spaces
      26f7e36e
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · e9fbf37d
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      ndb/tools/Makefile.am:
        Auto merged
      ndb/tools/ndb_config.cpp:
        Auto merged
      e9fbf37d
    • unknown's avatar
      mtr_process.pl: · be030cb2
      unknown authored
        Bug#12094: Let sleep_until_file_created() return the pid as intended
      
      
      mysql-test/lib/mtr_process.pl:
        Bug#12094: Let sleep_until_file_created() return the pid as intended
      be030cb2
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · a86df355
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      a86df355
    • unknown's avatar
      fix for bug #12595 (Escape character has to be exactly one) · 7c524e0d
      unknown authored
      
      mysql-test/r/select.result:
        results for test of bug 12595
      mysql-test/t/select.test:
        test for bug #12595
      sql/item_cmpfunc.cc:
        check whether the size of the escape string is exactly 1 (bug #12595)
      7c524e0d
    • unknown's avatar
      31a03634
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 67c4bf97
      unknown authored
      into  mysql.com:/home/alexi/mysql-5.0
      
      67c4bf97
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 · f41bf600
      unknown authored
      into lmy004.wdf.sap.corp:/work/mysql-5.0-clean
      
      f41bf600
    • unknown's avatar
      fix for bug #12183 "SHOW OPEN TABLES behavior doesn't match grammar" · 881e2a50
      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
      881e2a50
    • unknown's avatar
      Manual merge · ec98f5a5
      unknown authored
      ec98f5a5
    • unknown's avatar
      subselect.result: · 2a1af62e
      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
      2a1af62e
    • unknown's avatar
      sql_select.cc: · 37a8584f
      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.
      37a8584f
  4. 15 Aug, 2005 5 commits
    • unknown's avatar
      Clean up merge from 4.1 · ac8d4a4d
      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.
      ac8d4a4d
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4f7bbb32
      unknown authored
      into  mysql.com:/home/alexi/mysql-5.0
      
      
      mysql-test/t/select.test:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      4f7bbb32
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-12318 · 1639a9a4
      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
      1639a9a4
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-10627 · 8024ef77
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      sql/share/errmsg.txt:
        SCCS merged
      8024ef77
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-clean · 96153160
      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
      96153160