1. 23 Jun, 2006 1 commit
  2. 22 Jun, 2006 2 commits
  3. 21 Jun, 2006 10 commits
  4. 20 Jun, 2006 23 commits
    • unknown's avatar
      field.cc, field.h: · 406a7ba9
      unknown authored
        Additional fix for #16377 for bigendian platforms
      sql_select.cc, select.result, select.test:
        After merge fix
      
      
      mysql-test/t/select.test:
        After merge fix
      mysql-test/r/select.result:
        After merge fix
      sql/sql_select.cc:
        After merge fix
      sql/field.h:
        Additional fix for #16377 for bigendian platforms
      sql/field.cc:
        Additional fix for #16377 for bigendian platforms
      406a7ba9
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5805bba6
      unknown authored
      into moonbone.local:/work/tmp_merge-5.0-opt-mysql
      
      
      5805bba6
    • unknown's avatar
      Fix for bug#18516 (also #19353, reported for 5.1): · 99740b3f
      unknown authored
      In addition to include "mysql_upgrade" in a RPM, it should also be called
      when the RPM is upgraded.
      
      
      support-files/mysql.server.sh:
        Support getting additional arguments, which need to be passed on to the server.
        This works only if the server is started through "mysqld_safe", as the IM will not pass such arguments.
        So if the IM would be used, additional arguments cause the start to fail (voluntarily).
        
        This feature is needed so that tools like RPM can start the server in an "isolated" way,
        see the patch to the RPM spec file (also in this changeset) to call "mysql_upgrade".
      support-files/mysql.spec.sh:
        Call "mysql_upgrade" during an RPM upgrade.
        
        "mysql_upgrade" needs a server to run, as it issues SQL commands.
        (This had been neglected previously.)
        It also needs to connect as "root", but in an RPM upgrade the password is unknown.
        To allow this, the server is started "--skip-grant-tables".
        Normally, this would open big security holes, so it is also started "--skip-networking",
        and access to the socket is limited to "mysql" + "root" by temporarily setting mode 700.
      99740b3f
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 49042de5
      unknown authored
      into moonbone.local:/work/tmp_merge-4.1-opt-mysql
      
      
      49042de5
    • unknown's avatar
      Manually merged · b6a416ff
      unknown authored
      
      mysql-test/t/select.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      b6a416ff
    • unknown's avatar
      select.result: · 3e7d68b1
      unknown authored
        Added test case for bug#18759 Incorrect string to numeric conversion.  
      select.test:
        Added test case for bug#18759 Incorrect string to numeric conversion.
      item_cmpfunc.cc:
        Cleanup after fix for bug#18360 removal
      
      
      sql/item_cmpfunc.cc:
        Cleanup after fix for bug#18360 removal
      mysql-test/t/select.test:
        Added test case for bug#18759 Incorrect string to numeric conversion.
      mysql-test/r/select.result:
        Added test case for bug#18759 Incorrect string to numeric conversion.
      3e7d68b1
    • unknown's avatar
      Manually merged · 4d3803f0
      unknown authored
      
      mysql-test/r/insert_select.result:
        Auto merged
      mysql-test/t/insert_select.test:
        Auto merged
      4d3803f0
    • unknown's avatar
      Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.0 · 783866ff
      unknown authored
      into  mysql.com:/home/emurphy/mysql-5.0-heikki
      
      
      783866ff
    • unknown's avatar
      Applying patch from SergeyV · b2507220
      unknown authored
      Fixes bug#17264, for alter table on win32 for successfull operation completion
      it is used TL_WRITE(=10) lock instead of TL_WRITE_ALLOW_READ(=6), however here
      in innodb handler TL_WRTIE is lifted to TL_WRITE_ALLOW_WRITE, which causes
      race condition when several clients do alter table simultaneously.
      
      
      mysql-test/r/lock_multi.result:
        Test case for bug#17264.
      mysql-test/t/lock_multi.test:
        Test case for bug#17264
      b2507220
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · d6b48592
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
      
      
      ndb/src/ndbapi/ndberror.c:
        Auto merged
      d6b48592
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · f62bb051
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/ndbapi/ndberror.c:
        Auto merged
      f62bb051
    • unknown's avatar
      Bug #17297 Fix error messages · c2620e1f
      unknown authored
      c2620e1f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 9ef50ebe
      unknown authored
      into  mysql.com:/mnt/storeage/mysql-5.0
      
      
      9ef50ebe
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · 7070c9c1
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
      
      
      7070c9c1
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 70a087e5
      unknown authored
      into sunlight.local:/home/evgen/tmp_merge-5.0-opt-mysql
      
      
      70a087e5
    • unknown's avatar
      item_cmpfunc.cc: · 739248f9
      unknown authored
        After merge fix
      
      
      sql/item_cmpfunc.cc:
        After merge fix
      739248f9
    • unknown's avatar
      func_time.result: · ac2c480f
      unknown authored
        After merge fix
      
      
      mysql-test/r/func_time.result:
        After merge fix
      ac2c480f
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main · 0f6a24ad
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmerge
      
      
      ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      0f6a24ad
    • unknown's avatar
      BUG#20333 valgrind: mgmd event reporting dep on uninit value · 773e91d5
      unknown authored
      
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        user correct pointer
      773e91d5
    • unknown's avatar
      Merge mysql.com:/usr/home/ram/work/mysql-4.0 · 9a7da931
      unknown authored
      into  mysql.com:/usr/home/ram/work/mysql-4.1
      
      
      mysql-test/r/func_str.result:
        merge (ul)
      mysql-test/t/func_str.test:
        merge (ul)
      sql/item_strfunc.cc:
        merge (ul)
      sql/item_strfunc.h:
        merge (ul)
      9a7da931
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 91a76683
      unknown authored
      into  mysql.com:/usr/home/ram/work/mysql-4.1
      
      
      91a76683
    • unknown's avatar
      Bug#19407 Test 'func_regexp' fails on Windows x64 · c21f2373
      unknown authored
      
      regex/regexec.c:
        The Win64 pre-processor evaluates state1 at the end of the chain at replace-time not at definition-time.  This causes states1 to be defined as char *.
      c21f2373
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 · 953ffa7d
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
      
      
      953ffa7d
  5. 19 Jun, 2006 4 commits