1. 08 Nov, 2006 1 commit
    • unknown's avatar
      Bug#10963: LEFT/RIGHT/SUBSTR/.. string functions returns wrong result \ · a86a98ba
      unknown authored
        on large length
        
      Problem:  Most (all) of the numeric inputs were being coerced into
      int (32 bit) sized variables.  Works OK for sane inputs; any input
      larger than 2^32 (or 2^31 for signed vars) exihibited predictable
      wrapping behavior (up to about 10^18) and then started having really
      strange behaviour past that point (since the conversion to 64 bit int
      from the DECIMAL type can do weird things on out of range numbers).
      
      Solution: 1)  Add many tests.  2)  Convert input from (u)long type to
      (u)longlong.  3)  Do (sometimes multiple) sanity checks on input,
      keeping in mind that sometimes a negative longlong is not a negative
      longlong (if the unsigned_flag is set).  4) Emulate existing behavior
      w/rt negative and "small" out-of-bounds values.
      
      
      mysql-test/r/func_str.result:
        Additional test results for #10963
      mysql-test/t/func_str.test:
        Additional test results for #10963
      sql/item_func.cc:
        Used larger type for counting, to avoid truncation.
      sql/item_strfunc.cc:
        Fix for #10963, including comments and cleaned up logic
      a86a98ba
  2. 07 Nov, 2006 2 commits
  3. 06 Nov, 2006 2 commits
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my41-bug23411 · c055a9c4
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my50-bug23411
      
      
      BitKeeper/deleted/.del-collapsed~fbec3523369aae99:
        Delete: BitKeeper/etc/collapsed
      BitKeeper/etc/collapsed:
        'Auto converge'
      mysql-test/r/func_test.result:
        Manual merge.
      mysql-test/t/func_test.test:
        Manual merge.
      sql/item_func.cc:
        Manual merge.
      c055a9c4
    • unknown's avatar
      Bug#23411: ... MOD-ing zero returns strange result · 97610ded
      unknown authored
        
      The Item_func_mod objects never had maybe_null set, so users had no reason 
      to expect that they can be NULL, and may therefore deduce wrong results.
      Now, set maybe_null.
      
      
      mysql-test/r/func_test.result:
        Verify that the predictions are true.
      mysql-test/t/func_test.test:
        Verify that the predictions are true.
      sql/item_func.cc:
        MOD functions may be NULL.
      97610ded
  4. 04 Nov, 2006 4 commits
  5. 03 Nov, 2006 12 commits
  6. 02 Nov, 2006 16 commits
    • unknown's avatar
      Fix merge collision. · 3a645df9
      unknown authored
      3a645df9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 39b2f4a3
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
      
      
      mysql-test/r/innodb_mysql.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      mysql-test/t/im_daemon_life_cycle.imtest:
        Auto merged
      mysql-test/t/innodb_mysql.test:
        Auto merged
      mysql-test/t/sp-error.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Manual merge.
      mysql-test/r/ps.result:
        Manual merge.
      mysql-test/t/ps.test:
        Manual merge.
      39b2f4a3
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c6913415
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
      
      
      configure.in:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      myisam/sort.c:
        Manual merge.
      mysql-test/r/innodb_mysql.result:
        Manual merge.
      mysql-test/t/innodb_mysql.test:
        Manual merge.
      mysys/mf_iocache.c:
        Manual merge.
      c6913415
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1-maint · d3bf5536
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      d3bf5536
    • unknown's avatar
      configure.in: · 490d07cf
      unknown authored
        Raise version number to 4.1.23
      
      
      configure.in:
        Raise version number to 4.1.23
      490d07cf
    • unknown's avatar
      Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config · 8799830b
      unknown authored
      into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      8799830b
    • unknown's avatar
      Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my41-mtr_vs_config · 472b8c3b
      unknown authored
      into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/lib/mtr_misc.pl:
        manual merge
      472b8c3b
    • unknown's avatar
      Bug#23865 mysql-test-run.pl on Windows only supports debug and release configurations · 2a96b014
      unknown authored
      Visual Studio builds each configuration in a different sub-directory.  Only the sub-
      directories for release and debug are currently searched.
      
      
      mysql-test/lib/mtr_misc.pl:
        Bug#23865 mysql-test-run.pl on Windows only supports debug and release configurations
        - Added usage comments.
      mysql-test/mysql-test-run.pl:
        Bug#23865 mysql-test-run.pl on Windows only supports debug and release configurations
        - Moved Initial_Setup function to the command_line_setup function.
        - Defined new argument vs-config which can be used to inidicate the VS Configuration
        used to create the test executables. Argument can also be controlled with
        MTR_VS_CONFIG environment variable.
      2a96b014
    • unknown's avatar
      Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint · 2c31b05a
      unknown authored
      into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
      
      2c31b05a
    • unknown's avatar
      Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint · f6e27d87
      unknown authored
      into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
      
      f6e27d87
    • unknown's avatar
      Bug#22828 complementary patch: · c39c8cba
      unknown authored
      - 'false' not defined in C, use FALSE instead.
      
      
      mysys/my_lock.c:
        Fixed error in windows built:
        'false' not defined in C, use FALSE instead.
      c39c8cba
    • unknown's avatar
      Bug#22828 complementary patch: · 20c7358f
      unknown authored
      - 'false' not defined in C, use FALSE instead.
      
      
      mysys/my_lock.c:
        Fixed error for windwos built:
        'false' not defined in C, use FALSE instead.
      20c7358f
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 9f548a27
      unknown authored
      into  mysql.com:/usr/home/ram/work/bug22913/my41-bug22913
      
      
      client/mysql.cc:
        Auto merged
      9f548a27
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · e7706c1e
      unknown authored
      into  mysql.com:/usr/home/ram/work/bug22913/my50-bug22913
      
      
      client/mysql.cc:
        Auto merged
      e7706c1e
    • unknown's avatar
      Merge mysql.com:/usr/home/ram/work/bug22913/my41-bug22913 · 78abde4d
      unknown authored
      into  mysql.com:/usr/home/ram/work/bug22913/my50-bug22913
      
      
      client/mysql.cc:
        Auto merged
      78abde4d
    • unknown's avatar
      Fix for bug #22913: mysql --quick doesn't report some errors. · 8eb433ac
      unknown authored
      We don't check for errors that may occur during data printing.
      
      
      client/mysql.cc:
        Fix for bug #22913: mysql --quick doesn't report some errors.
          - check for errors after the data output.
      8eb433ac
  7. 01 Nov, 2006 3 commits
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · e0fc5ef7
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
      
      
      mysql-test/r/ndb_update.result:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      e0fc5ef7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 1276efd4
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
      
      
      sql/item_sum.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      1276efd4
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · b6102f67
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-4.1-runtime
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      b6102f67