1. 02 Nov, 2005 2 commits
    • unknown's avatar
      #view.test#: · 5fa6dbea
      unknown authored
        new file
      sql_table.cc, handler.h:
        Fixed bug #14540.
        Added error mnemonic code HA_ADMIN_NOT_BASE_TABLE
        to report that an operation cannot be applied for views.
      view.test, view.result:
        Added a test case for bug #14540.
      errmsg.txt:
        Fixed bug #14540.
        Added error ER_CHECK_NOT_BASE_TABLE.
      
      
      mysql-test/r/view.result:
        Added a test case for bug #14540.
      mysql-test/t/view.test:
        Added a test case for bug #14540.
      sql/handler.h:
        Fixed bug #14540.
        Added error mnemonic code HA_ADMIN_NOT_BASE_TABLE
        to report that an operation cannot be applied for views.
      sql/share/errmsg.txt:
        Added error ER_CHECK_NOT_BASE_TABLE.
      sql/sql_table.cc:
        Fixed bug #14540.
        Added error mnemonic code HA_ADMIN_NOT_BASE_TABLE
        to report that an operation cannot be applied for views.
      5fa6dbea
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · d6b2fc2f
      unknown authored
      into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
      
      d6b2fc2f
  2. 01 Nov, 2005 25 commits
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-clean · 6e11a867
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      scripts/mysqld_safe.sh:
        Auto merged
      6e11a867
    • unknown's avatar
      merge · b87ecea8
      unknown authored
      b87ecea8
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · dd3fd08a
      unknown authored
      into moonbone.local:/work/14186-bug-5.0-mysql
      
      dd3fd08a
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 · f97c30e4
      unknown authored
      into lmy004.:/work/mysql-5.0-bug14381
      
      f97c30e4
    • unknown's avatar
      fix for bug #14381 · 6974dd50
      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
      6974dd50
    • unknown's avatar
      sql_update.cc: · 953a9ecb
      unknown authored
        After merge fix
      
      
      sql/sql_update.cc:
        After merge fix
      953a9ecb
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-13774 · 8ff74e9e
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      8ff74e9e
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8ce4bafb
      unknown authored
      into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
      
      8ce4bafb
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · aac68f0d
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
      
      aac68f0d
    • unknown's avatar
      Manually merged · c87b03e9
      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
      c87b03e9
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · a0e17d5a
      unknown authored
      into mysql.com:/data0/mysqldev/lenz/mysql-4.1
      
      a0e17d5a
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · 5d430263
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
      
      5d430263
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 86a74ba4
      unknown authored
      into mysql.com:/data0/mysqldev/lenz/mysql-5.0
      
      
      configure.in:
        Auto merged
      86a74ba4
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · edd45658
      unknown authored
      into moonbone.local:/work/14186-bug-4.1-mysql
      
      
      sql/sql_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      edd45658
    • unknown's avatar
      Reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort · 5bd8c9de
      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
      5bd8c9de
    • unknown's avatar
      Additional fix for bug #14445 (analyse.test fails) · e4a99a4f
      unknown authored
      
      mysql-test/r/analyse.result:
        test result fixed
      mysql-test/t/disabled.def:
        user_var disabled
      sql/sql_analyse.cc:
        rounding added
      e4a99a4f
    • unknown's avatar
      Review of new pushed code · ac79bc2b
      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
      ac79bc2b
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · 1186708f
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
      
      1186708f
    • unknown's avatar
      Fix for bug #14445 (analyse.test fails) · 4a4c2133
      unknown authored
      
      mysql-test/r/analyse.result:
        test result fixed
      sql/sql_analyse.cc:
        missing sqrt(std_sqr) added
      4a4c2133
    • unknown's avatar
      gis.test fixed · 40639956
      unknown authored
      
      mysql-test/r/gis.result:
        test result fixed
      40639956
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9f89127f
      unknown authored
      into  mysql.com:/usr/home/ram/work/mysql-4.1
      
      9f89127f
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 33d335b2
      unknown authored
      into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
      
      33d335b2
    • unknown's avatar
      BUG# 14532 · 6a30c0de
      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
      6a30c0de
    • unknown's avatar
      mysql-test-run.pl: · bce108ec
      unknown authored
        Make IM ports change with MTR_BUILD_THREAD
      
      
      mysql-test/mysql-test-run.pl:
        Make IM ports change with MTR_BUILD_THREAD
      bce108ec
    • unknown's avatar
      BUG #14532 · 29a3923d
      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
      29a3923d
  3. 31 Oct, 2005 13 commits