1. 02 Nov, 2005 1 commit
  2. 01 Nov, 2005 25 commits
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-clean · a486b3d7
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      scripts/mysqld_safe.sh:
        Auto merged
      a486b3d7
    • unknown's avatar
      merge · c973948f
      unknown authored
      c973948f
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1752d848
      unknown authored
      into moonbone.local:/work/14186-bug-5.0-mysql
      
      
      1752d848
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7dba8c53
      unknown authored
      into lmy004.:/work/mysql-5.0-bug14381
      
      
      7dba8c53
    • unknown's avatar
      fix for bug #14381 · 778088a5
      unknown authored
      (BDB keylength limitted to 255)
      
      
      mysql-test/r/bdb.result:
        fix bdb test after fixing the maximal length of BDB keys to 2^32-1
      sql/ha_berkeley.h:
        use the maximal possible length of 2^32 - 1
      778088a5
    • unknown's avatar
      sql_update.cc: · 7d8e8032
      unknown authored
        After merge fix
      
      
      sql/sql_update.cc:
        After merge fix
      7d8e8032
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-13774 · 75c45caf
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      75c45caf
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · fe116472
      unknown authored
      into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
      
      
      fe116472
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · 252f72a0
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
      
      
      252f72a0
    • unknown's avatar
      Manually merged · 70536ba1
      unknown authored
      
      client/mysqltest.c:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      mysql-test/r/update.result:
        Auto merged
      mysql-test/t/update.test:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/spatial.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
        Auto merged
      70536ba1
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · fc076961
      unknown authored
      into mysql.com:/data0/mysqldev/lenz/mysql-4.1
      
      
      fc076961
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · ca4e27b0
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
      
      
      ca4e27b0
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 45feb666
      unknown authored
      into mysql.com:/data0/mysqldev/lenz/mysql-5.0
      
      
      configure.in:
        Auto merged
      45feb666
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 03ed0d1d
      unknown authored
      into moonbone.local:/work/14186-bug-4.1-mysql
      
      
      sql/sql_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      03ed0d1d
    • unknown's avatar
      Reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort · ee380a07
      unknown authored
      Fix for bug #14536: SELECT @A,@A:=... fails with prepared statements
      
      
      mysql-test/r/func_sapdb.result:
        Correct tests after reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort)
      mysql-test/r/type_newdecimal.result:
        Correct tests after reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort)
      mysql-test/r/user_var.result:
        More test with SELECT @A:=
      mysql-test/t/disabled.def:
        Enable user_var.test for
      mysql-test/t/user_var.test:
        More test with SELECT @A:=
      sql/item.cc:
        Simple optimization during review of new code
      sql/item_func.cc:
        Reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort)
      sql/item_timefunc.h:
        timediff() can return NULL for not NULL arguments
      sql/sql_base.cc:
        Remove usage of current_thd() in mysql_make_view()
      sql/sql_lex.h:
        Remove usage of current_thd() in mysql_make_view()
      sql/sql_select.cc:
        Fix for bug #14536: SELECT @A,@A:=... fails with prepared statements
      sql/sql_view.cc:
        Remove usage of current_thd() in mysql_make_view()
        Simple optimization of new code
      sql/sql_view.h:
        Remove usage of current_thd() in mysql_make_view()
      sql/table.cc:
        Simple optimization of new code
      ee380a07
    • unknown's avatar
      Additional fix for bug #14445 (analyse.test fails) · f9dbcd55
      unknown authored
      
      mysql-test/r/analyse.result:
        test result fixed
      mysql-test/t/disabled.def:
        user_var disabled
      sql/sql_analyse.cc:
        rounding added
      f9dbcd55
    • unknown's avatar
      Review of new pushed code · fffe7417
      unknown authored
      Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
      Mark that add_time(), time_diff() and str_to_date() can return null values
      
      
      myisam/mi_check.c:
        keyoffset is not a position (no %lx here)
      mysql-test/r/func_sapdb.result:
        Fixed test after marking that timediff() can return NULL
      sql/item_func.cc:
        Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
      sql/item_timefunc.cc:
        Mark that add_time and str_to_date() can return null values
      sql/item_timefunc.h:
        Mark that time_diff can return 0
      sql/spatial.cc:
        Simple cleanups during review of new code
      fffe7417
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · d8dac8bf
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
      
      
      d8dac8bf
    • unknown's avatar
      Fix for bug #14445 (analyse.test fails) · cc6db6d8
      unknown authored
      
      mysql-test/r/analyse.result:
        test result fixed
      sql/sql_analyse.cc:
        missing sqrt(std_sqr) added
      cc6db6d8
    • unknown's avatar
      gis.test fixed · 38901828
      unknown authored
      
      mysql-test/r/gis.result:
        test result fixed
      38901828
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · cc953ed3
      unknown authored
      into  mysql.com:/usr/home/ram/work/mysql-4.1
      
      
      cc953ed3
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 81aa2a35
      unknown authored
      into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
      
      
      81aa2a35
    • unknown's avatar
      BUG# 14532 · 31b67962
      unknown authored
      Post-review fixes
      
      
      mysql-test/r/federated.result:
        BUG# 14532
        
        Regenerated test results
      mysql-test/t/federated.test:
        BUG# 14532 
        
        Added comments to test
      31b67962
    • unknown's avatar
      mysql-test-run.pl: · fe3d5732
      unknown authored
        Make IM ports change with MTR_BUILD_THREAD
      
      
      mysql-test/mysql-test-run.pl:
        Make IM ports change with MTR_BUILD_THREAD
      fe3d5732
    • unknown's avatar
      BUG #14532 · 67c6d0f0
      unknown authored
      Added FIELD_TYPE_BIT to field method 'needs_quotes' to make BIT columns
      work.
      
      
      mysql-test/r/federated.result:
        BUG# 14532
        
        Test fix by creating table with bit column and inserting,selecting
      mysql-test/t/federated.test:
        BUG# 14532
        
        Test fix by creating table with bit column and inserting,selecting
      sql/field.cc:
        BUG #14532
        
        Just needed to quote/escape bit field, add FIELD_TYPE_BIT to switch
      67c6d0f0
  3. 31 Oct, 2005 14 commits