1. 18 Aug, 2005 10 commits
    • unknown's avatar
      5d1a7fe7
    • unknown's avatar
      merge fix · b0dee441
      unknown authored
      
      ndb/src/mgmapi/mgmapi.cpp:
        merge
      b0dee441
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 749f599e
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
      
      
      749f599e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 8d593d49
      unknown authored
      into mysql.com:/usersnfs/pchardin/mysql-5.0
      
      
      8d593d49
    • unknown's avatar
      Fix for Bug#11247 Stored procedures: Function calls in long loops leak memory · fa19a9f2
      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.
      fa19a9f2
    • unknown's avatar
      WL#2486 - natural and using join according to SQL:2003 · 34bf64bc
      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.
      34bf64bc
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 320d451d
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
      
      
      320d451d
    • unknown's avatar
      Fix merge of BUG#11538 fix. · 3fad8218
      unknown authored
      
      config/ac-macros/ha_ndbcluster.m4:
        Merge fix for BUG#11538 fix.
      3fad8218
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4d2bf4be
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      sql/sql_parse.cc:
        Auto merged
      4d2bf4be
    • unknown's avatar
      Cleanups and optimization during review of new code · 44086a62
      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()
      44086a62
  2. 17 Aug, 2005 11 commits
  3. 16 Aug, 2005 19 commits
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · dfffd467
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      mysql-test/lib/mtr_cases.pl:
        Auto merged
      dfffd467
    • unknown's avatar
      mtr_process.pl: · ee793d03
      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
      ee793d03
    • unknown's avatar
      BUG#10950 · f2727ff2
      unknown authored
      make previous patch portable by abstracting to Ndb_check_socket_hup.
      Is in portlib rather than mysys due to the socket parameter being NDB_SOCKET_TYPE
      
      
      ndb/include/portlib/NdbTCP.h:
        Add Ndb_check_socket_hup prototype
      ndb/src/common/portlib/NdbTCP.cpp:
        Implement Ndb_check_socket_hup for unix like systems using the poll system call.
      ndb/src/common/portlib/win32/NdbTCP.c:
        Implement Ndb_check_socket_hup(NDB_SOCKET_TYPE) for win32 using the select() call.
        
        (should work okay - unable to test on win32 due to status of ndb port though)
      ndb/src/mgmapi/mgmapi.cpp:
        Use the portable (portlib) Ndb_check_socket_hup to check socket status
      f2727ff2
    • unknown's avatar
      Merge mysql.com:/home/alexi/mysql-5.0 · 3eb66207
      unknown authored
      into  mysql.com:/home/alexi/dev/mysql-5.0-1
      
      
      3eb66207
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · f792dd0c
      unknown authored
      into  mysql.com:/home/alexi/mysql-5.0
      
      
      mysql-test/t/select.test:
        Auto merged
      f792dd0c
    • unknown's avatar
      information_schema.test: · c1f11183
      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.
      c1f11183
    • unknown's avatar
      Merge lmy004.:/work/mysql-5.0-clean · 8fd77a04
      unknown authored
      into lmy004.:/work/mysql-5.0-bug12595
      
      
      8fd77a04
    • unknown's avatar
      after review fix for bug #12595 · c9fe6b9f
      unknown authored
      
      sql/item_cmpfunc.cc:
        remove a line with trailing spaces
      c9fe6b9f
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · ace647d1
      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
      ace647d1
    • unknown's avatar
      mtr_process.pl: · 996eb5df
      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
      996eb5df
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · af13588c
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      af13588c
    • unknown's avatar
      fix for bug #12595 (Escape character has to be exactly one) · 8056a7df
      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)
      8056a7df
    • unknown's avatar
      97441bb1
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 107f7482
      unknown authored
      into  mysql.com:/home/alexi/mysql-5.0
      
      
      107f7482
    • 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
      Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug11538 · 9649a7e4
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
      
      
      BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
        Auto merged
      9649a7e4
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main · bd197673
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/4.1/bug11538
      
      
      acinclude.m4:
        Auto merged
      bd197673
    • unknown's avatar
      Manual merge · 5082c41b
      unknown authored
      5082c41b