1. 07 Aug, 2007 1 commit
    • unknown's avatar
      Reversing additional change suggested by Serg · c6e88899
      unknown authored
      under terms of bug#28875 for better performance.
      The change appeared to require more changes in item_cmpfunc.cc,
      which is dangerous in 5.0.
          
      Conversion between a latin1 column and an ascii string constant
      stopped to work.
      
      
      mysql-test/r/ctype_recoding.result:
        Adding test case.
      mysql-test/t/ctype_recoding.test:
        Adding test case.
      c6e88899
  2. 03 Aug, 2007 4 commits
    • unknown's avatar
      Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 6c1edb11
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team
      
      
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      6c1edb11
    • unknown's avatar
      After merge fix · be04bf55
      unknown authored
      be04bf55
    • unknown's avatar
      Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875 · 0d1972aa
      unknown authored
      into  mysql.com:/home/bar/mysql-work/mysql-5.0-rpl
      
      
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      strings/conf_to_src.c:
        Auto merged
      strings/ctype-extra.c:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        After merge fix
      mysql-test/t/ctype_ucs.test:
        After merge fix
      0d1972aa
    • unknown's avatar
      Bug#28875 Conversion between ASCII and LATIN1 charsets does not function · 53df09a9
      unknown authored
      (Regression, caused by a patch for the bug 22646).
      Problem: when result type of date_format() was changed from
      binary string to character string, mixing date_format()
      with a ascii column in CONCAT() stopped to work.
      Fix:
      - adding "repertoire" flag into DTCollation class,
      to mark items which can return only pure ASCII strings.
      - allow character set conversion from pure ASCII to other character sets.
      
      
      include/m_ctype.h:
        Defining new flags.
        Adding new function prototypes.
      mysql-test/r/ctype_ucs.result:
        Adding tests.
      mysql-test/r/ctype_utf8.result:
        Adding tests.
      mysql-test/r/func_time.result:
        Adding tests.
      mysql-test/t/ctype_ucs.test:
        Adding tests.
      mysql-test/t/ctype_utf8.test:
        Adding tests.
      mysql-test/t/func_time.test:
        Adding test.
      mysys/charset.c:
        Adding pure ASCII detection when loading a dynamic character set.
      sql/item.cc:
        - Moving detection of a Unicode superset into function.
        - Adding detection of a ASCII subset.
        - Adding creation of to-ASCII character set convertor when
          safe_charset_converter() failed and when the argument.
          repertoire is know to be pure ASCII.
      sql/item.h:
        - Adding "repertoire" member into DTCollation class.
        - Adding "repertoire" argument to constructors.
        - Adding new methods:
          set_repertoire_from_charset()
          set_repertoire_from_value()
      sql/item_func.cc:
        Adding "repertoire" argument.
      sql/item_strfunc.cc:
        Adding "repertoire" argument.
      sql/item_timefunc.cc:
        Initializing the result repertoire taking into account the "is_ascii"
        flag of the current locale.
      sql/sql_lex.cc:
        Detect 7bit strings, return in Lex->text_string_is_7bit.
      sql/sql_lex.h:
        Adding new member into LEX structure.
        Adding new member into Lex_input_stream
      sql/sql_string.cc:
        Allow simple copy from pure ASCII to a ASCII-based character set.
      sql/sql_yacc.yy:
        Depening on Lex->text_string_is_7bit and character set features,
        create Item_string with MY_REPERTOIRE_ASCII when it is possible.
      strings/conf_to_src.c:
        - Adding printing of the "MY_CS_PUREASCII" flag
        - Adding printing of copyright
      strings/ctype-extra.c:
        Recreating ctype-extra.c: ascii_general_ci and ascii_bin
        are now marked with MY_CS_PUREASCII flag.
      strings/ctype.c:
        Adding new functions.
      53df09a9
  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 14 commits