1. 07 Aug, 2007 1 commit
    • unknown's avatar
      Bug#20037 mysqltest requires cygwin on windows(part 1, new mysqltest commands) · 04e8c93c
      unknown authored
       - Update comments
       - Make "write_file" fail if file already exist
       - Remove temporary files created by test cases
      
      
      client/mysqltest.c:
        Improve function comments
        Make write_file fail if file already exist
      mysql-test/r/mysqltest.result:
        Update test result after adding new test and updating description
        of argumements to chmod
      mysql-test/t/bootstrap.test:
        Remove temporary file created by testcase
      mysql-test/t/mysql.test:
        Remove temporary file created by testcase
      mysql-test/t/mysqladmin.test:
        Remove temporary file created by testcase
      mysql-test/t/mysqltest.test:
        Remove temporary file created by testcase 
        Add test to show that "write_file" fails if file already exist
      mysql-test/t/sp-destruct.test:
        Remove temporary file created by testcase
      04e8c93c
  2. 03 Aug, 2007 9 commits
    • unknown's avatar
      841ae673
    • unknown's avatar
      Merge 192.168.0.7:mysql/mysql-5.0-maint · 942cb3e1
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        SCCS merged
      942cb3e1
    • unknown's avatar
      WL#3935 Improve mysqltest report and exitcode for diff · 2cedc54d
      unknown authored
       - Move the code to generate test report to the test tool(in this
         case mysqltest) where the best control of what failed is
      - Simplify the code in mysql-test-run.pl
      - mysqltest will now find what diff to use in a best effort attempt
        using "diff -u", "diff -c" and finally dumping the two files verbatim
        in the report.
      
      
      client/mysqltest.c:
        - Add new option --tail-lines indicating how many lines of the result to output
          when generating report for a failure
        - Remove eval_result, noone knows what it should do and it's not used.
        - Add support for best effort execution of systems builtin "diff",
          try with "diff -u" and "diff -c" and if that fails dump the whole content
           of teh two files to report
        - Use one common function when comapring two files, used when test 
          has completed and the result should be compared to the .result file
          as well as using it from myqltest's builtin diff_files command.
        - Output the last lines og the result so far  in the report that mysqltest
          generates in case of a test failure.
      mysql-test/lib/mtr_report.pl:
        - Remove code for generating diff between .reject and .result file,
          that is handled by mysqltest(or the test tool) from now on.
        - Add better comments
      mysql-test/mysql-test-run.pl:
        - Remove the --udiff flag to mysql-test-run.pl, if the systems diff supports
          unified diff it will be used automatically
        - Remove the code for "mtr_show_failed_diff", the report from mysqltest
          will know include the diff so if mysqltest(or another test tool)
          fails, just display it's report what went wrong
        - Pass --tail-lines=20 to mysqltest to it will shos the last 20 lines 
          from the result in the report in case of failure.	
      mysql-test/r/mysqltest.result:
        Update result file now when the output from mysqltest has been sent to /dev/null
      mysql-test/t/mysqltest.test:
        - Improve tests for --diff_files
        - Remove temporary files in var/tmp generated in the fly
        - Send output from test for --diff_files to /deb/null since only the error
          code it returns are of interest and tyhe outpu may vary depending
          on what builtin diff is being used.
      2cedc54d
    • unknown's avatar
      Merge 192.168.0.7:mysql/mysql-5.0-maint · 02d18d3c
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      02d18d3c
    • unknown's avatar
      Cleanup created procedures in sp.test · 8b265ffc
      unknown authored
      
      mysql-test/r/sp.result:
        Cleanup created procedures
      mysql-test/t/sp.test:
        Cleanup created procedures
      8b265ffc
    • unknown's avatar
      Remove the temporary file created by mysql_upgrade · a1552e8f
      unknown authored
      
      client/mysql_upgrade.c:
        Remove the temporary file after it's been used
      a1552e8f
    • unknown's avatar
      Merge 192.168.0.7:mysql/mtr_log/my50-mtr_log · 0716ccab
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        Merge
      0716ccab
    • unknown's avatar
      Improve report on test execution time · 78a3a625
      unknown authored
      Define tot_real_tim locally in mtr_report.pl
      
      
      mysql-test/mysql-test-run.pl:
        Move global variable to local scope in the file it's being used
      78a3a625
    • unknown's avatar
      Send output to var/log/mysql-test-run.log to facilitate easier debugging · f98f1258
      unknown authored
      of mysql-test-run.pl
      
      
      mysql-test/lib/mtr_process.pl:
        Change from "print" to "mtr_debug" to get messages logged to file as well
      mysql-test/lib/mtr_report.pl:
        - Add "mtr_log_init" function used for opening the log file
        - Change from "print" to "mtr_report" to get the messages logged
        - Make printout functions log to the log file
      mysql-test/mysql-test-run.pl:
        - Open the mysql-test-run log file as soon as var/log has been created
        - Change from "print" to "mtr_report" to get the messgages to log as well
      f98f1258
  3. 02 Aug, 2007 11 commits
  4. 01 Aug, 2007 10 commits
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 1b04b4b1
      unknown authored
      into  mysql.com:/home/ram/work/b29928.new/b29928.new.5.0
      
      
      1b04b4b1
    • unknown's avatar
      Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect · f87acb59
      unknown authored
      restores from mysqlbinlog out
      
      Problem: using "mysqlbinlog | mysql" for recoveries the connection_id() 
      result may differ from what was used when issuing the statement.
      
      Fix: if there is a connection_id() in a statement, write to binlog
      SET pseudo_thread_id= XXX; before it and use the value later on.
      
      
      mysql-test/r/mysqlbinlog.result:
        Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
        restores from mysqlbinlog out
          - test result.
      mysql-test/t/mysqlbinlog.test:
        Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
        restores from mysqlbinlog out
          - test case.
      sql/item_create.cc:
        Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
        restores from mysqlbinlog out
          - set thread_specific_used flag for the connection_id() function.
      sql/item_func.cc:
        Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
        restores from mysqlbinlog out
          - always return thd->variables.pseudo_thread_id as a connection_id() 
        result, as it contains a proper value for both master and slave.
      sql/log_event.cc:
        Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
        restores from mysqlbinlog out
          - set LOG_EVENT_THREAD_SPECIFIC_F event flag if thread_specific_used
        is set.
      sql/sql_class.cc:
        Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
        restores from mysqlbinlog out
          - thd->thread_specific_used introduced, which is set if thread specific 
        value(s) used in a statement.
      sql/sql_class.h:
        Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
        restores from mysqlbinlog out
          - thd->thread_specific_used introduced, which is set if thread specific 
        value(s) used in a statement.
      f87acb59
    • unknown's avatar
      Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · ce045a82
      unknown authored
      into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint
      
      
      ce045a82
    • unknown's avatar
      Merge production.mysql.com:/usersnfs/jperkin/bk/mysql-4.1-maint · 12235197
      unknown authored
      into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint
      
      
      12235197
    • unknown's avatar
      Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · bb88e1ee
      unknown authored
      into  production.mysql.com:/usersnfs/jperkin/bk/mysql-4.1-maint
      
      
      bb88e1ee
    • unknown's avatar
      Option 6 tries to grant global privileges at the database level · c517fea5
      unknown authored
      which does not work.  Removing these attempted privileges makes
      this identical to option 5 so remove it completely.  The spirit
      of the program appears to be aimed at database privileges, so do
      not add another option for granting global privileges as it may
      be unexpected.  Fixes bug#14618 (same as previous patch, this
      time applied to -maint tree).
      
      
      scripts/mysql_setpermission.sh:
        Option 6 tries to apply global privileges at the database
        level which does not work - remove it.
      c517fea5
    • unknown's avatar
      Fix an unstable test. It was reliant on the current time. · 25723542
      unknown authored
      
      mysql-test/r/func_time.result:
        Update results (use fixed datetime values instead of NOW()).
      mysql-test/t/func_time.test:
        Use fixed datetime values instead of NOW(): the test would have a sporadic
        failure when current day changed between two consequtive calls to
        NOW(). The test actually tests FROM_DAYS/TO_DAYS functions, 
        so use of NOW() is not necessary.
      25723542
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · c5ff0a0d
      unknown authored
      into  sin.intern.azundris.com:/home/tnurnberg/10776/50-10776
      
      
      configure.in:
        Auto merged
      c5ff0a0d
    • unknown's avatar
      Fix for bug #30088: Can't disable myisam-recover by a value of "". · 1281fbc5
      unknown authored
        - test result.
      
      Problem: we don't proper handle "" value of the --myisam-recover option.
      
      Fix: turn off myisam recovering if --myisam-recover="" is set.
      
      
      mysql-test/r/show_check.result:
        Fix for bug #30088: Can't disable myisam-recover by a value of "".
          - test result.
      mysql-test/t/show_check-master.opt:
        Fix for bug #30088: Can't disable myisam-recover by a value of "".
          - test case.
      mysql-test/t/show_check.test:
        Fix for bug #30088: Can't disable myisam-recover by a value of "".
          - test case.
      sql/mysqld.cc:
        Fix for bug #30088: Can't disable myisam-recover by a value of "".
          - turn off myisam recovering if --myisam-recover="" is passed.
      1281fbc5
    • unknown's avatar
      Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 · f5b95d0b
      unknown authored
      mysqld hasn't been built on AIX with ndb-everything in quite a while.
      this allowed a variety of changes to be added that broke the AIX build
      for both the GNU and IBM compilers (but the IBM suite in particular).
      Changeset lets build to complete on AIX 5.2 for users of the GNU and
      the IBM suite both. Tudo bem?
      
      
      config/ac-macros/large_file.m4:
        Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (2)
        
        we no longer declare anything large-file on AIX.  the
        GNU C++ compiler declares _LARGE_FILE_API all of its
        own, and either way we're now pulling in <standards.h>
        when on AIX, which defines _LARGE_FILE_API (if not
        already defined).
      configure.in:
        Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (1)
        
        build NDB binaries as static on AIX. because that actually
        *works*.
        
        when building dynamic, with the IBM compiler (xlC_r), and
        the build breaks on AIX due to missing symbols
        (__vec__delete2 et al.), try adding -lhC to the Makefile.
      include/mysql.h:
        Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (2)
        
        we're now pulling in <standards.h> when on AIX, which
        defines _LARGE_FILE_API (if not already defined).
      ndb/src/common/util/File.cpp:
        Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (3)
        
        do not de-scope the standards, for they may be funky macros
      ndb/src/mgmclient/Makefile.am:
        Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)
        
        make IBM C++ compiler happy on AIX
      ndb/src/mgmsrv/Makefile.am:
        Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (5)
        
        GNU compiler has no sense of humour about this
      ndb/test/ndbapi/benchronja.cpp:
        Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
        
        MAXTHREADS collides with a #define from <sys/thread.h> on AIX
        (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
        #undef it here lest someone use it by habit and get really funny
        results.  (K&R says we may #undef non-existent symbols.)
      ndb/test/ndbapi/flexAsynch.cpp:
        Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
        
        MAXTHREADS collides with a #define from <sys/thread.h> on AIX
        (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
        #undef it here lest someone use it by habit and get really funny
        results.  (K&R says we may #undef non-existent symbols.)
      ndb/test/ndbapi/flexHammer.cpp:
        Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
        
        MAXTHREADS collides with a #define from <sys/thread.h> on AIX
        (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
        #undef it here lest someone use it by habit and get really funny
        results.  (K&R says we may #undef non-existent symbols.)
      ndb/test/ndbapi/flexScan.cpp:
        Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
        
        MAXTHREADS collides with a #define from <sys/thread.h> on AIX
        (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
        #undef it here lest someone use it by habit and get really funny
        results.  (K&R says we may #undef non-existent symbols.)
      ndb/test/ndbapi/flexTT.cpp:
        Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
        
        MAXTHREADS collides with a #define from <sys/thread.h> on AIX
        (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
        #undef it here lest someone use it by habit and get really funny
        results.  (K&R says we may #undef non-existent symbols.)
      ndb/test/ndbapi/flexTimedAsynch.cpp:
        Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
        
        MAXTHREADS collides with a #define from <sys/thread.h> on AIX
        (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
        #undef it here lest someone use it by habit and get really funny
        results.  (K&R says we may #undef non-existent symbols.)
      ndb/test/ndbapi/initronja.cpp:
        Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
        
        MAXTHREADS collides with a #define from <sys/thread.h> on AIX
        (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
        #undef it here lest someone use it by habit and get really funny
        results.  (K&R says we may #undef non-existent symbols.)
      ndb/test/ndbapi/testOperations.cpp:
        Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (7)
        
        IBM C compiler on AIX is not happy with the re-def.
      ndb/test/ndbapi/testScanFilter.cpp:
        Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (8)
        
        The IBM C++ compiler on AIX doesn't like initializing from pow().
        This works, but breaks a VAL (bool res_cal[TUPLE_NUM] ...) later on.
      ndb/test/odbc/SQL99_test/SQL99_test.cpp:
        Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
        
        MAXTHREADS collides with a #define from <sys/thread.h> on AIX
        (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
        #undef it here lest someone use it by habit and get really funny
        results.  (K&R says we may #undef non-existent symbols.)
      f5b95d0b
  5. 31 Jul, 2007 9 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 91f54bf1
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/r/mysqldump.result:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Manual merge.
      mysql-test/t/innodb_mysql.test:
        Manual merge.
      sql/sql_table.cc:
        Manual merge.
      91f54bf1
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · ed483685
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/24989-bug-5.0-opt-mysql
      
      
      ed483685
    • unknown's avatar
      ha_innodb.cc: · a0af9b7e
      unknown authored
        Warning fixed.
      
      
      sql/ha_innodb.cc:
        Warning fixed.
      a0af9b7e
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 125bc936
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B27417-5.0-opt
      
      
      sql/handler.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      125bc936
    • unknown's avatar
      Post-merge fixes · 6c589f90
      unknown authored
      6c589f90
    • unknown's avatar
      addendum for the fix for bug 27417: · 21d639e5
      unknown authored
      extend the assert so it will run the testsuite
      
      
      21d639e5
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · a66cb1f2
      unknown authored
      into  mysql.com:/home/psergey/mysql-5.0-bug29582
      
      
      sql/sql_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      a66cb1f2
    • unknown's avatar
      BUG#29582: huge memory consumption with union, subselect, joins: · 8a68e7d2
      unknown authored
      - Don't call mysql_select() several times for the select that enumerates
        a temporary table with the results of the UNION. Making this call for
        every subquery execution caused O(#enumerated-rows-in-the-outer-query) 
        memory allocations.
      - Instead, call join->reinit() and join->exec(), and
        = disable constant table detection for such joins,  
        = provide special handling for table-less constant subqueries.
      
      
      sql/sql_select.cc:
        BUG#29582: huge memory consumption with union, subselect, joins:
         - Don't mark tables as constant if JOIN::no_const_tables flag is set
      sql/sql_select.h:
        BUG#29582: huge memory consumption with union, subselect, joins:
         - Don't mark tables as constant if JOIN::no_const_tables flag is set
      sql/sql_union.cc:
        BUG#29582: huge memory consumption with union, subselect, joins:
        - Don't call mysql_select() several times for the select that enumerates
          a temporary table with UNION results. 
        - Instead, call join->reinit() and join->exec().
        - Provide special handling for table-less constant subqueries.
      8a68e7d2
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · a9610aa0
      unknown authored
      into  mysql.com:/home/hf/work/29717/my50-29717
      
      
      a9610aa0