1. 16 Feb, 2006 3 commits
  2. 26 Jan, 2006 1 commit
    • unknown's avatar
      Bug #15719 MYSQL_OPT_RECONNECT option is modified by mysql_real_connect · f220f892
      unknown authored
       - Move init of "reconnect" variable to mysql_init 
       - Add test case to mysql_client_test.
      
      
      sql-common/client.c:
        Move initialisation of reconnect variable to mysql_init instead of doing it in mysql_real_connect.
      tests/mysql_client_test.c:
        Add test to check that reconnect is not modified by a call to mysql_real_connect
      f220f892
  3. 16 Jan, 2006 2 commits
    • unknown's avatar
      extra/comp_err.c : Fix a merge error. · db5fe0fc
      unknown authored
      
      extra/comp_err.c:
        Fix a merge error (closing '}' was lost), correct formatting (tab -> blanks).
      db5fe0fc
    • unknown's avatar
      Manual merge of the fix for bug#16106. · 111cacfc
      unknown authored
      Currently failing tests (for me) in non-debug build:
      blackhole fulltext fulltext_cache fulltext_left_join fulltext_multi
      
      
      scripts/mysqld_multi.sh:
        Auto merged
      extra/comp_err.c:
        Manual merge: From 4.1 to 5.0, the license line was moved to a different place.
      111cacfc
  4. 13 Jan, 2006 18 commits
  5. 12 Jan, 2006 16 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 3bf3bb20
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-bg12198-2
      
      
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      3bf3bb20
    • unknown's avatar
      Fix for bug #12198 "Temporary table aliasing does not work inside stored · c12a3dfe
      unknown authored
      functions".
      
      We should ignore alias when we check if table was already marked as temporary
      when we calculate set of tables to be prelocked. Otherwise we will erroneously
      treat tables which are used in same routine and have same name but different
      alias as non-temporary.
      
      
      mysql-test/r/sp.result:
        Added test for bug #12198 "Temporary table aliasing does not work inside stored
        functions" and other tests which cover handling of temporary tables in prelocked
        mode.
      mysql-test/t/sp.test:
        Added test for bug #12198 "Temporary table aliasing does not work inside stored
        functions" and other tests which cover handling of temporary tables in prelocked
        mode.
      sql/sp_head.cc:
        sp_head::merge_table_list():
          We should ignore alias when we check if table was already marked as temporary
          when we calculate set of tables to be prelocked. Otherwise we will erroneously
          treat tables which are used in same routine and have same name but different
          alias as non-temporary.
      c12a3dfe
    • unknown's avatar
      Fixed a bug in merge. · 0f4962c3
      unknown authored
      0f4962c3
    • unknown's avatar
      Fix for Netware build. · 5c28e9c8
      unknown authored
      5c28e9c8
    • unknown's avatar
      Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 · a48380cd
      unknown authored
      into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
      
      
      client/mysqlimport.c:
        Auto merged
      include/config-netware.h:
        Auto merged
      innobase/os/os0thread.c:
        Auto merged
      netware/mysqld_safe.c:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/mysqld.cc:
        Merged from 4.1.
      sql/sql_base.cc:
        Merged from 4.1.
      sql/sql_handler.cc:
        Merged from 4.1.
      sql/sql_select.cc:
        Merged from 4.1.
      a48380cd
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 26252fa2
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      26252fa2
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup · 9e49c77c
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      9e49c77c
    • unknown's avatar
      7b77b4c7
    • unknown's avatar
      Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0 · 1665d237
      unknown authored
      into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
      
      
      include/config-netware.h:
        Auto merged
      innobase/os/os0thread.c:
        Auto merged
      netware/mysqld_safe.c:
        Merge from 4.0 to 4.1
      sql/mysqld.cc:
        Merge from 4.0 to 4.1
      1665d237
    • unknown's avatar
      NetWare specific change to increase thread stack size. · 2946f9a6
      unknown authored
      Changes to Netware specific mysqld_safe.c
      
      
      include/config-netware.h:
        NetWare specific change to increase thread stack size.
      innobase/os/os0thread.c:
        NetWare specific change to increase thread stack size.
      netware/mysqld_safe.c:
        NetWare specific change to make multiple mysqld_safe instances
        work when called through a NCF file.
      sql/mysqld.cc:
        NetWare specific change to increase thread stack size.
      2946f9a6
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 0fa2fdb9
      unknown authored
      into  mysql.com:/home/my/mysql-4.1
      
      
      0fa2fdb9
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 35d46cee
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0
      
      
      35d46cee
    • unknown's avatar
      sql_show.cc: · 46fdcba4
      unknown authored
        after-merge fix for
        bug#15581 COALESCE function truncates mutli-byte TINYTEXT values
      
      
      sql/sql_show.cc:
        after-merge fix for bug#15581 COALESCE function truncates mutli-byte TINYTEXT values
        ,
      46fdcba4
    • unknown's avatar
      ctype_utf8.result: · cd1f75e9
      unknown authored
        After merge fix:
        fixing order of results.
      
      
      mysql-test/r/ctype_utf8.result:
        After merge fix:
        fixing order of results.
      cd1f75e9
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 29505f38
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-bug16166-r2
      
      
      29505f38
    • unknown's avatar
      Fix typo bug in previous cset · 9878a35a
      unknown authored
      9878a35a