1. 25 Oct, 2005 1 commit
  2. 24 Oct, 2005 2 commits
  3. 21 Oct, 2005 14 commits
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · c924903d
      unknown authored
      into  mysql.com:/usr/home/pem/bug13941/mysql-5.0
      
      c924903d
    • unknown's avatar
      ctype_utf8.result: · 58e09e24
      unknown authored
        After merge fix.
      
      
      mysql-test/r/ctype_utf8.result:
        After merge fix.
      58e09e24
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1 · 8c044507
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b12371
      
      
      mysql-test/t/ctype_utf8.test:
        Auto merged
      mysql-test/t/show_check.test:
        Auto merged
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        After merge fix.
      mysql-test/r/show_check.result:
        After merge fix.
      sql/item_strfunc.h:
        After merge fix.
      tests/mysql_client_test.c:
        After merge fix.
      8c044507
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 01cc9f1a
      unknown authored
      into  mysql.com:/usr/home/pem/bug13941/mysql-5.0
      
      01cc9f1a
    • unknown's avatar
      Merge abarkov@bk-internal:/home/bk/mysql-5.0 · f3ee1afe
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b12371
      
      f3ee1afe
    • unknown's avatar
      Post-review fix. · d9dc38a8
      unknown authored
      
      sql/sp_head.cc:
        Post-review fix; changed string copying method (+ fixed comment typo and indention).
      d9dc38a8
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · baa9876c
      unknown authored
      into mysql.com:/home/gluh/MySQL/Bugs/5.0.14089
      
      baa9876c
    • unknown's avatar
      Bug#13233 · cfc78dae
      unknown authored
        select distinct char(column) fails with utf8
      ctype_utf8.result, ctype_utf8.test:
        Adding test case
      sql_yacc.yy:
        Adding new syntax.
      item_strfunc.h:
        Fixing wrong max_length calculation.
        Also, adding CHAR(x USING charset),
        for easier migrating from 4.1 to 5.0,
        according to Monty's suggestion.
      
      
      sql/item_strfunc.h:
        Bug#13233
        select distinct char(column) fails with utf8
        Also, adding CHAR(x USING charset),
        for easier migrating from 4.1 to 5.0.
      sql/sql_yacc.yy:
        Adding new syntax.
      mysql-test/t/ctype_utf8.test:
        Adding test case
      mysql-test/r/ctype_utf8.result:
        Adding test case
      cfc78dae
    • unknown's avatar
      fix for bug#14089 FROM list subquery always fails when · cb76c37b
      unknown authored
                        information_schema is current database
        skip the check of I_S tables if table is derived table
      
      
      mysql-test/r/information_schema.result:
        fix for bug#14089 FROM list subquery always fails when 
                          information_schema is current database
          test case
      mysql-test/t/information_schema.test:
        fix for bug#14089 FROM list subquery always fails when 
                          information_schema is current database
          test case
      cb76c37b
    • unknown's avatar
      Merge abarkov@bk-internal:/home/bk/mysql-5.0 · 3bacfc84
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b12371
      
      3bacfc84
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 35100d95
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
      
      35100d95
    • unknown's avatar
      bug#14199 - ndb leak of index opertaions in TC leading to error 288 · 58852bb0
      unknown authored
      
      ndb/include/kernel/signaldata/DumpStateOrd.hpp:
        New dump for index operation count
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        New dump for index operation count
        Fix leak on index ops
      58852bb0
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 73223e9a
      unknown authored
      into lmy004.:/work/mysql-5.0-bug12595-4
      
      73223e9a
    • unknown's avatar
      fix for bug #12595 (ESCAPE must be exactly 1 character long) · 8a20d641
      unknown authored
      ESCAPE has length of 1 if specified and sql_mode is NO_BACKSLASH_ESCAPES
      or has length of 0 or 1 in every other situation.
      (approved patch applied on a up-to-date tree re-commit) 
      
      
      mysql-test/r/select.result:
        results of test for bug 12595
      mysql-test/t/select.test:
        test for bug #12595 (ESCAPE must be exactly one character long)
      sql/item_cmpfunc.cc:
        if ESCAPE was in the statement check whether its length is
        different than 1. In NO_BACKSLASH_ESCAPES mode only length of 1 is
        allowed, otherwise the length could be 0 or 1 character (code point
        in the sense of Unicode).
      sql/item_cmpfunc.h:
        pass variable from the parsing stage - whether
        ESCAPE clause was found in the statement
      sql/sql_help.cc:
        pass FALSE for escape_used_in_parsing because we
        want the default mode of no error checking - our internal code.
      sql/sql_lex.cc:
        initialized variable used to transfer information during
        parsing up in the stack when reducing in the grammar
      sql/sql_lex.h:
        new variable used for transfering information when
        reducing in the grammar.
      sql/sql_yacc.yy:
        initialize Lex->escape_used and then use it when reducing.
        This is needed as fix for bug #12595 to distinguish between
        situation where ESCAPE was found and when not because internally
        we may pass a string an empty string and there is no other way
        to find out whether this is correct or not in case of 
        NO_BACKSLASH_ESCAPES mode, which allows only length of 1 if
        ESCAPE is part of the SQL statement.
      8a20d641
  4. 20 Oct, 2005 8 commits
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 699e5183
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      699e5183
    • unknown's avatar
      Fix Bug#14107 (IM test failures on QNX) · c588524b
      unknown authored
      (v.2 with post-review fixes)
      
      
      server-tools/instance-manager/instance.cc:
        On QNX one cannot use fork() in multithreaded environment. Therefore we should use QNX's spawn()
      c588524b
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release · 31b90749
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      31b90749
    • unknown's avatar
      configure.in: · d6a2f896
      unknown authored
        Set the version number to 5.0.16
      
      
      configure.in:
        Set the version number to 5.0.16
      d6a2f896
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c4959c3d
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      c4959c3d
    • unknown's avatar
      Bug#12371: executing prepared statement fails (illegal mix of collations) · 0f8ab213
      unknown authored
      ctype_utf8.test, ctype_utf8.result:
        Adding test case.
      item.h:
      item.cc:
        Adding Item_param::safe_charset_converter
      
      
      sql/item.cc:
         Bug#12371: executing prepared statement fails (illegal mix of collations)
        Adding Item_param::safe_charset_converter
      sql/item.h:
        Adding Item_param::safe_charset_converter
      mysql-test/r/ctype_utf8.result:
        Adding test case.
      mysql-test/t/ctype_utf8.test:
        Adding test case.
      0f8ab213
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1 · 2aaea324
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0
      
      
      mysys/charset.c:
        Auto merged
      2aaea324
    • unknown's avatar
      charset.c: · 5ca9ae1b
      unknown authored
        Bug#13238 mysqldump and mysqladmin hangs
        Avoid recursion into init_available_charsets.
        Serg's version didn't work for me: I got 
        double mutex locking.
        Pushing this version instead
        (It was approved by Serg anyway)
      
      
      mysys/charset.c:
        Bug#13238 mysqldump and mysqladmin hangs
        Avoid recursion into init_available_charsets.
        Serg's version didn't work for me: I got 
        double mutex locking.
        Pushing this version instead
        (It was approved by Serg anyway)
      5ca9ae1b
  5. 19 Oct, 2005 15 commits
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-clean · c31c5d97
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      mysql-test/my_manage.c:
        Auto merged
      mysql-test/mysql_test_run_new.c:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      mysql-test/r/variables.result:
        Resolve conflicts
      mysql-test/t/variables.test:
        Resolve conflicts
      sql/sql_acl.cc:
        Resolve conflicts
      strings/ctype-simple.c:
        Resolve conflicts
      strings/ctype-ucs2.c:
        Resolve conflicts
      c31c5d97
    • unknown's avatar
      mysql.spec.sh: · 860a20b3
      unknown authored
        Made yaSSL support an option (off by default)
      
      
      support-files/mysql.spec.sh:
        Made yaSSL support an option (off by default)
      860a20b3
    • unknown's avatar
      Merge mysql.com:/home/emurphy/src/bk-innodb/mysql-5.0 · 72066cff
      unknown authored
      into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
      
      72066cff
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · 75f8dba6
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
      
      
      client/mysqlbinlog.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      75f8dba6
    • unknown's avatar
      mysqlbinlog --hexdump patch 4: · 35e61274
      unknown authored
      Rename last_event_info to print_event_info to better reflect the new semantics
      
      
      client/mysqlbinlog.cc:
        Rename last_event_info to print_event_info
      sql/log_event.cc:
        Rename last_event_info to print_event_info
      sql/log_event.h:
        Rename last_event_info to print_event_info
      35e61274
    • unknown's avatar
      Merge bk-innodb.mysql.com:/home/bk/mysql-5.0 · fb25902a
      unknown authored
      into  mysql.com:/home/emurphy/src/bk-innodb/mysql-5.0
      
      
      innobase/include/rem0rec.h:
        Auto merged
      innobase/include/rem0rec.ic:
        Auto merged
      innobase/row/row0upd.c:
        Auto merged
      fb25902a
    • unknown's avatar
      Merge mysql.com:/home/alexi/mysql-4.1 · 89edbeae
      unknown authored
      into  mysql.com:/home/alexi/dev/mysql-4.1-4375
      
      89edbeae
    • unknown's avatar
      BUG#14056 Column prefix index on UTF-8 primary key column causes 'Can't find record..' · bb98e7c1
      unknown authored
      Applying InnoDB patch from Jan Lindstrom
      
      bb98e7c1
    • unknown's avatar
      Fix for BUG#4375: Windows specific directories are copied · 18cfe4ec
      unknown authored
       during replication.
       Modified my_dir(). Now this function skips hidden and system
       files which sometimes are created by Windows.
       NOTE. The fix is similar to the previuos one (05 July 2004)
       except for correct setting of the 'attrib' variable value
       (within the previous fix this variable was left uninitialized
       when my_dir() was called with My_flags & MY_WANT_STAT == 0).
      
      
      mysys/my_lib.c:
        Modified my_dir().
         Now this function skips hidden and system files
         which sometimes are created by Windows.
      18cfe4ec
    • unknown's avatar
      Fixed BUG#13941: replace() string fuction behaves badly inside stored · 2e5d668d
      unknown authored
                       procedure
        For some functions returning strings (like "replace" and "ifnull" - where
        val_str() is returning a pointer into one of the parameters) - we ended
        up with a dangling pointer after the new operator destroyed the reuse item
        in the eval function.
        A working, if not very elegant, solution is to simply copy the string in
        such cases.
      
      
      mysql-test/r/sp.result:
        New test case for BUG#13941.
      mysql-test/t/sp.test:
        New test case for BUG#13941.
      sql/sp_head.cc:
        Copy the string when evaluating some string functions (e.g. "replace" and "ifnull")
        to avoid using a dangling pointer.
      2e5d668d
    • unknown's avatar
      A fix and a test case for Bug#13587 "Server crash when SP is created · 9a5dd3b4
      unknown authored
      without database"
      
      
      mysql-test/r/sp-error.result:
        Test results fixed (a test case for Bug#13587)
      mysql-test/t/sp-error.test:
        A test case for Bug#13587 "Server crash when SP is created without 
        database"
      sql/sql_parse.cc:
        - move initialization of lex->sphead->m_db before it's used.
        - cleanup; comment why right now can't be cleaned any more
      9a5dd3b4
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2f222cc7
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-bug12915-merge
      
      2f222cc7
    • unknown's avatar
      Post-merge fixes · 188ce9ec
      unknown authored
      188ce9ec
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 68fdec49
      unknown authored
      into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
      
      68fdec49
    • unknown's avatar
      Changeset: · f415d919
      unknown authored
        Changed option text in mysqldump.c
      mysqldump.c:
        Changed text to read "+00:00" as opposed to "UTC" (per what the code does)
      
      
      client/mysqldump.c:
        Changed text to read "+00:00" as opposed to "UTC" (per what the code does)
      f415d919