An error occurred fetching the project authors.
  1. 28 May, 2007 2 commits
    • unknown's avatar
      Merge polly.local:/home/kaa/src/maint/bug28121/my50-bug28121 · 71e78d16
      unknown authored
      into  polly.local:/home/kaa/src/maint/bug28121/my51-bug28121
      
      
      include/m_string.h:
        Auto merged
      mysql-test/r/type_float.result:
        Auto merged
      mysql-test/t/type_float.test:
        Auto merged
      sql/init.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/field.cc:
        Manual merge.
      sql/field.h:
        Manual merge.
      71e78d16
    • unknown's avatar
      Fix for bug #28121 "INSERT or UPDATE into DOUBLE(200,0) field being truncated to 31 digits" · e3af3c21
      unknown authored
      When storing a large number to a FLOAT or DOUBLE field with fixed length, it could be incorrectly truncated if the field's length was greater than 31.
      
      This patch also does some code cleanups to be able to reuse code which is common between Field_float::store() and Field_double::store().
      
      
      include/m_string.h:
        Added declarations for log_10 and log_01 from strtod.c
      mysql-test/r/type_float.result:
        Added the testcase for bug #28121 "INSERT or UPDATE into DOUBLE(200,0) field being truncated to 31 digits"
      mysql-test/t/type_float.test:
        Added the testcase for bug #28121 "INSERT or UPDATE into DOUBLE(200,0) field being truncated to 31 digits"
      sql/field.cc:
        Moved common code from Field_float::store() and Field_double:store() to Field_real::truncate()
        Fixed the algorithm to not truncate large input numbers if the field length is greater than 31.
        Fixed rounding to not depend on FLT_MAX/DBL_MAX constants.
      sql/field.h:
        Moved not_fixed member from Field_double to Field_real to allow code reuse between Field_float::store() and Field_double::store()
        Added truncate() method to Field_real which is used by both Field_float and Field_double
      sql/init.cc:
        log_10[] and log_01[] are now defined as statical arrays in strtod.c, no need to pre-computed them.
      sql/item_cmpfunc.cc:
        log_01[] now starts from 1e0, not from 1e-1 for consistency.
      sql/mysql_priv.h:
        Moved log_10[] and log_01[] from mysqld.cc to libmystrings.
      sql/mysqld.cc:
        Moved log_10[] and log_01[] from mysqld.cc to libmystrings.
      strings/strtod.c:
        Define and use log_10[] and log_01[] as static arrays of constants instead of values pre-computed at startup.
      e3af3c21
  2. 01 May, 2007 11 commits
  3. 30 Apr, 2007 24 commits
    • unknown's avatar
      Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 0fc282bb
      unknown authored
      into  damien-katzs-computer.local:/Users/dkatz/mysql50
      
      
      0fc282bb
    • unknown's avatar
      Merge damien-katzs-computer.local:/Users/dkatz/mysql50 · 0671a012
      unknown authored
      into  damien-katzs-computer.local:/Users/dkatz/mysql51
      
      
      mysys/my_copy.c:
        Auto merged
      0671a012
    • unknown's avatar
      Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50 · 2127e26d
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
      
      
      2127e26d
    • unknown's avatar
      Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · 3a89563e
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
      
      
      client/mysqldump.c:
        Auto merge
      mysql-test/r/mysqldump.result:
        Manual merge
      mysql-test/t/mysqldump.test:
        SCCS merged
      3a89563e
    • unknown's avatar
      Bug #27653: Temp table can't be created if lower_case_table_names=1 and · 36dea21b
      unknown authored
                  tmpdir has uppercase
      
      Fix: don't convert mysql_tmpdir to lower case when building the path to a
      temporary table
      
      
      mysql-test/include/have_lowercase1.inc:
        BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50/mysql-test/include/have_lowercase1.inc
      mysql-test/r/lowercase1.require:
        BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50/mysql-test/r/lowercase1.require
      mysql-test/r/lowercase_mixed_tmpdir.result:
        BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50/mysql-test/r/lowercase_mixed_tmpdir.result
      mysql-test/t/lowercase_mixed_tmpdir-master.opt:
        BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50/mysql-test/t/lowercase_mixed_tmpdir-master.opt
      mysql-test/t/lowercase_mixed_tmpdir-master.sh:
        BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50/mysql-test/t/lowercase_mixed_tmpdir-master.sh
      mysql-test/t/lowercase_mixed_tmpdir.test:
        BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50/mysql-test/t/lowercase_mixed_tmpdir.test
      sql/sql_table.cc:
        When building the path for a temporary table file, do not
        convert mysql_tmpdir to lower case; lower_case_table_names
        should not apply to mysql_tmpdir.
      36dea21b
    • unknown's avatar
      Merge damien-katzs-computer.local:/Users/dkatz/mysql50 · 930912f8
      unknown authored
      into  damien-katzs-computer.local:/Users/dkatz/50_frm_files
      
      
      930912f8
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · f353f7ef
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      mysql-test/t/disabled.def:
        Auto merged
      f353f7ef
    • unknown's avatar
      shorten filenames · 3df9f94f
      unknown authored
      mysql-test/suite/parts/r/ndb_blob_partition.result:
        Rename: mysql-test/suite/partitions/r/ndb_blob_partition.result -> mysql-test/suite/parts/r/ndb_blob_partition.result
      mysql-test/suite/parts/r/ndb_dd_backuprestore.result:
        Rename: mysql-test/suite/partitions/r/ndb_dd_backuprestore.result -> mysql-test/suite/parts/r/ndb_dd_backuprestore.result
      mysql-test/suite/parts/r/ndb_partition_error.result:
        Rename: mysql-test/suite/partitions/r/ndb_partition_error.result -> mysql-test/suite/parts/r/ndb_partition_error.result
      mysql-test/suite/parts/r/ndb_partition_list.result:
        Rename: mysql-test/suite/partitions/r/ndb_partition_list.result -> mysql-test/suite/parts/r/ndb_partition_list.result
      mysql-test/suite/parts/r/ndb_partition_range.result:
        Rename: mysql-test/suite/partitions/r/ndb_partition_range.result -> mysql-test/suite/parts/r/ndb_partition_range.result
      mysql-test/suite/parts/r/partition_alter1_innodb.result:
        Rename: mysql-test/suite/partitions/r/partition_alter1_innodb.result -> mysql-test/suite/parts/r/partition_alter1_innodb.result
      mysql-test/suite/parts/r/partition_alter1_myisam.result:
        Rename: mysql-test/suite/partitions/r/partition_alter1_myisam.result -> mysql-test/suite/parts/r/partition_alter1_myisam.result
      mysql-test/suite/parts/r/partition_alter2_innodb.result:
        Rename: mysql-test/suite/partitions/r/partition_alter2_innodb.result -> mysql-test/suite/parts/r/partition_alter2_innodb.result
      mysql-test/suite/parts/r/partition_alter2_myisam.result:
        Rename: mysql-test/suite/partitions/r/partition_alter2_myisam.result -> mysql-test/suite/parts/r/partition_alter2_myisam.result
      mysql-test/suite/parts/r/partition_alter3_innodb.result:
        Rename: mysql-test/suite/partitions/r/partition_alter3_innodb.result -> mysql-test/suite/parts/r/partition_alter3_innodb.result
      mysql-test/suite/parts/r/partition_alter3_myisam.result:
        Rename: mysql-test/suite/partitions/r/partition_alter3_myisam.result -> mysql-test/suite/parts/r/partition_alter3_myisam.result
      mysql-test/suite/parts/r/partition_alter4_innodb.result:
        Rename: mysql-test/suite/partitions/r/partition_alter4_innodb.result -> mysql-test/suite/parts/r/partition_alter4_innodb.result
      mysql-test/suite/parts/r/partition_alter4_myisam.result:
        Rename: mysql-test/suite/partitions/r/partition_alter4_myisam.result -> mysql-test/suite/parts/r/partition_alter4_myisam.result
      mysql-test/suite/parts/r/partition_basic_innodb.result:
        Rename: mysql-test/suite/partitions/r/partition_basic_innodb.result -> mysql-test/suite/parts/r/partition_basic_innodb.result
      mysql-test/suite/parts/r/partition_basic_myisam.result:
        Rename: mysql-test/suite/partitions/r/partition_basic_myisam.result -> mysql-test/suite/parts/r/partition_basic_myisam.result
      mysql-test/suite/parts/r/partition_bit_innodb.result:
        Rename: mysql-test/suite/partitions/r/partition_bit_innodb.result -> mysql-test/suite/parts/r/partition_bit_innodb.result
      mysql-test/suite/parts/r/partition_bit_myisam.result:
        Rename: mysql-test/suite/partitions/r/partition_bit_myisam.result -> mysql-test/suite/parts/r/partition_bit_myisam.result
      mysql-test/suite/parts/r/partition_bit_ndb.result:
        Rename: mysql-test/suite/partitions/r/partition_bit_ndb.result -> mysql-test/suite/parts/r/partition_bit_ndb.result
      mysql-test/suite/parts/r/partition_char_innodb.result:
        Rename: mysql-test/suite/partitions/r/partition_char_innodb.result -> mysql-test/suite/parts/r/partition_char_innodb.result
      mysql-test/suite/parts/r/partition_char_myisam.result:
        Rename: mysql-test/suite/partitions/r/partition_char_myisam.result -> mysql-test/suite/parts/r/partition_char_myisam.result
      mysql-test/suite/parts/r/partition_datetime_innodb.result:
        Rename: mysql-test/suite/partitions/r/partition_datetime_innodb.result -> mysql-test/suite/parts/r/partition_datetime_innodb.result
      mysql-test/suite/parts/r/partition_datetime_myisam.result:
        Rename: mysql-test/suite/partitions/r/partition_datetime_myisam.result -> mysql-test/suite/parts/r/partition_datetime_myisam.result
      mysql-test/suite/parts/r/partition_decimal_innodb.result:
        Rename: mysql-test/suite/partitions/r/partition_decimal_innodb.result -> mysql-test/suite/parts/r/partition_decimal_innodb.result
      mysql-test/suite/parts/r/partition_decimal_myisam.result:
        Rename: mysql-test/suite/partitions/r/partition_decimal_myisam.result -> mysql-test/suite/parts/r/partition_decimal_myisam.result
      mysql-test/suite/parts/r/partition_engine_innodb.result:
        Rename: mysql-test/suite/partitions/r/partition_engine_innodb.result -> mysql-test/suite/parts/r/partition_engine_innodb.result
      mysql-test/suite/parts/r/partition_engine_myisam.result:
        Rename: mysql-test/suite/partitions/r/partition_engine_myisam.result -> mysql-test/suite/parts/r/partition_engine_myisam.result
      mysql-test/suite/parts/r/partition_engine_ndb.result:
        Rename: mysql-test/suite/partitions/r/partition_engine_ndb.result -> mysql-test/suite/parts/r/partition_engine_ndb.result
      mysql-test/suite/parts/r/partition_float_innodb.result:
        Rename: mysql-test/suite/partitions/r/partition_float_innodb.result -> mysql-test/suite/parts/r/partition_float_innodb.result
      mysql-test/suite/parts/r/partition_float_myisam.result:
        Rename: mysql-test/suite/partitions/r/partition_float_myisam.result -> mysql-test/suite/parts/r/partition_float_myisam.result
      mysql-test/suite/parts/r/partition_int_innodb.result:
        Rename: mysql-test/suite/partitions/r/partition_int_innodb.result -> mysql-test/suite/parts/r/partition_int_innodb.result
      mysql-test/suite/parts/r/partition_int_myisam.result:
        Rename: mysql-test/suite/partitions/r/partition_int_myisam.result -> mysql-test/suite/parts/r/partition_int_myisam.result
      mysql-test/suite/parts/r/partition_int_ndb.result:
        Rename: mysql-test/suite/partitions/r/partition_int_ndb.result -> mysql-test/suite/parts/r/partition_int_ndb.result
      mysql-test/suite/parts/r/partition_special_innodb.result:
        Rename: mysql-test/suite/partitions/r/partition_special_innodb.result -> mysql-test/suite/parts/r/partition_special_innodb.result
      mysql-test/suite/parts/r/partition_special_myisam.result:
        Rename: mysql-test/suite/partitions/r/partition_special_myisam.result -> mysql-test/suite/parts/r/partition_special_myisam.result
      mysql-test/suite/parts/r/partition_syntax_innodb.result:
        Rename: mysql-test/suite/partitions/r/partition_syntax_innodb.result -> mysql-test/suite/parts/r/partition_syntax_innodb.result
      mysql-test/suite/parts/r/partition_syntax_myisam.result:
        Rename: mysql-test/suite/partitions/r/partition_syntax_myisam.result -> mysql-test/suite/parts/r/partition_syntax_myisam.result
      mysql-test/suite/parts/r/partition_syntax_ndb.result:
        Rename: mysql-test/suite/partitions/r/partition_syntax_ndb.result -> mysql-test/suite/parts/r/partition_syntax_ndb.result
      mysql-test/suite/parts/r/partition_t55.out:
        Rename: mysql-test/suite/partitions/r/partition_t55.out -> mysql-test/suite/parts/r/partition_t55.out
      mysql-test/suite/parts/r/partition_value_innodb.result:
        Rename: mysql-test/suite/partitions/r/partition_value_innodb.result -> mysql-test/suite/parts/r/partition_value_innodb.result
      mysql-test/suite/parts/r/partition_value_myisam.result:
        Rename: mysql-test/suite/partitions/r/partition_value_myisam.result -> mysql-test/suite/parts/r/partition_value_myisam.result
      mysql-test/suite/parts/r/partition_value_ndb.result:
        Rename: mysql-test/suite/partitions/r/partition_value_ndb.result -> mysql-test/suite/parts/r/partition_value_ndb.result
      mysql-test/suite/parts/r/rpl_ndb_dd_partitions.result:
        Rename: mysql-test/suite/partitions/r/rpl_ndb_dd_partitions.result -> mysql-test/suite/parts/r/rpl_ndb_dd_partitions.result
      mysql-test/suite/parts/t/disabled.def:
        Rename: mysql-test/suite/partitions/t/disabled.def -> mysql-test/suite/parts/t/disabled.def
      mysql-test/suite/parts/t/ndb_blob_partition.test:
        Rename: mysql-test/suite/partitions/t/ndb_blob_partition.test -> mysql-test/suite/parts/t/ndb_blob_partition.test
      mysql-test/suite/parts/t/ndb_dd_backuprestore.test:
        Rename: mysql-test/suite/partitions/t/ndb_dd_backuprestore.test -> mysql-test/suite/parts/t/ndb_dd_backuprestore.test
      mysql-test/suite/parts/t/ndb_partition_error.test:
        Rename: mysql-test/suite/partitions/t/ndb_partition_error.test -> mysql-test/suite/parts/t/ndb_partition_error.test
      mysql-test/suite/parts/t/ndb_partition_key.test:
        Rename: mysql-test/suite/partitions/t/ndb_partition_key.test -> mysql-test/suite/parts/t/ndb_partition_key.test
      mysql-test/suite/parts/t/ndb_partition_list.test:
        Rename: mysql-test/suite/partitions/t/ndb_partition_list.test -> mysql-test/suite/parts/t/ndb_partition_list.test
      mysql-test/suite/parts/t/ndb_partition_range.test:
        Rename: mysql-test/suite/partitions/t/ndb_partition_range.test -> mysql-test/suite/parts/t/ndb_partition_range.test
      mysql-test/suite/parts/t/partition_sessions.test:
        Rename: mysql-test/suite/partitions/t/partition_sessions.test -> mysql-test/suite/parts/t/partition_sessions.test
      mysql-test/suite/parts/t/rpl_ndb_dd_partitions.test:
        Rename: mysql-test/suite/partitions/t/rpl_ndb_dd_partitions.test -> mysql-test/suite/parts/t/rpl_ndb_dd_partitions.test
      mysql-test/suite/parts/inc/partition.pre:
        Rename: mysql-test/suite/parts/include/partition.pre -> mysql-test/suite/parts/inc/partition.pre
      mysql-test/suite/parts/inc/partition_20.inc:
        Rename: mysql-test/suite/parts/include/partition_20.inc -> mysql-test/suite/parts/inc/partition_20.inc
      mysql-test/suite/parts/inc/partition_bigint.inc:
        Rename: mysql-test/suite/parts/include/partition_bigint.inc -> mysql-test/suite/parts/inc/partition_bigint.inc
      mysql-test/suite/parts/inc/partition_binary.inc:
        Rename: mysql-test/suite/parts/include/partition_binary.inc -> mysql-test/suite/parts/inc/partition_binary.inc
      mysql-test/suite/parts/inc/partition_bit.inc:
        Rename: mysql-test/suite/parts/include/partition_bit.inc -> mysql-test/suite/parts/inc/partition_bit.inc
      mysql-test/suite/parts/inc/partition_blob.inc:
        Rename: mysql-test/suite/parts/include/partition_blob.inc -> mysql-test/suite/parts/inc/partition_blob.inc
      mysql-test/suite/parts/inc/partition_blocked_sql_funcs.inc:
        Rename: mysql-test/suite/parts/include/partition_blocked_sql_funcs.inc -> mysql-test/suite/parts/inc/partition_blocked_sql_funcs.inc
      mysql-test/suite/parts/inc/partition_char.inc:
        Rename: mysql-test/suite/parts/include/partition_char.inc -> mysql-test/suite/parts/inc/partition_char.inc
      mysql-test/suite/parts/inc/partition_check_drop.inc:
        Rename: mysql-test/suite/parts/include/partition_check_drop.inc -> mysql-test/suite/parts/inc/partition_check_drop.inc
      mysql-test/suite/parts/inc/partition_check_read.inc:
        Rename: mysql-test/suite/parts/include/partition_check_read.inc -> mysql-test/suite/parts/inc/partition_check_read.inc
      mysql-test/suite/parts/inc/partition_check_read1.inc:
        Rename: mysql-test/suite/parts/include/partition_check_read1.inc -> mysql-test/suite/parts/inc/partition_check_read1.inc
      mysql-test/suite/parts/inc/partition_check_read2.inc:
        Rename: mysql-test/suite/parts/include/partition_check_read2.inc -> mysql-test/suite/parts/inc/partition_check_read2.inc
      mysql-test/suite/parts/inc/partition_cleanup.inc:
        Rename: mysql-test/suite/parts/include/partition_cleanup.inc -> mysql-test/suite/parts/inc/partition_cleanup.inc
      mysql-test/suite/parts/inc/partition_date.inc:
        Rename: mysql-test/suite/parts/include/partition_date.inc -> mysql-test/suite/parts/inc/partition_date.inc
      mysql-test/suite/parts/inc/partition_datetime.inc:
        Rename: mysql-test/suite/parts/include/partition_datetime.inc -> mysql-test/suite/parts/inc/partition_datetime.inc
      mysql-test/suite/parts/inc/partition_decimal.inc:
        Rename: mysql-test/suite/parts/include/partition_decimal.inc -> mysql-test/suite/parts/inc/partition_decimal.inc
      mysql-test/suite/parts/inc/partition_double.inc:
        Rename: mysql-test/suite/parts/include/partition_double.inc -> mysql-test/suite/parts/inc/partition_double.inc
      mysql-test/suite/parts/inc/partition_enum.inc:
        Rename: mysql-test/suite/parts/include/partition_enum.inc -> mysql-test/suite/parts/inc/partition_enum.inc
      mysql-test/suite/parts/inc/partition_float.inc:
        Rename: mysql-test/suite/parts/include/partition_float.inc -> mysql-test/suite/parts/inc/partition_float.inc
      mysql-test/suite/parts/inc/partition_int.inc:
        Rename: mysql-test/suite/parts/include/partition_int.inc -> mysql-test/suite/parts/inc/partition_int.inc
      mysql-test/suite/parts/inc/partition_key_16col.inc:
        Rename: mysql-test/suite/parts/include/partition_key_16col.inc -> mysql-test/suite/parts/inc/partition_key_16col.inc
      mysql-test/suite/parts/inc/partition_key_32col.inc:
        Rename: mysql-test/suite/parts/include/partition_key_32col.inc -> mysql-test/suite/parts/inc/partition_key_32col.inc
      mysql-test/suite/parts/inc/partition_key_4col.inc:
        Rename: mysql-test/suite/parts/include/partition_key_4col.inc -> mysql-test/suite/parts/inc/partition_key_4col.inc
      mysql-test/suite/parts/inc/partition_key_8col.inc:
        Rename: mysql-test/suite/parts/include/partition_key_8col.inc -> mysql-test/suite/parts/inc/partition_key_8col.inc
      mysql-test/suite/parts/inc/partition_layout_check1.inc:
        Rename: mysql-test/suite/parts/include/partition_layout_check1.inc -> mysql-test/suite/parts/inc/partition_layout_check1.inc
      mysql-test/suite/parts/inc/partition_layout_check2.inc:
        Rename: mysql-test/suite/parts/include/partition_layout_check2.inc -> mysql-test/suite/parts/inc/partition_layout_check2.inc
      mysql-test/suite/parts/inc/partition_mediumint.inc:
        Rename: mysql-test/suite/parts/include/partition_mediumint.inc -> mysql-test/suite/parts/inc/partition_mediumint.inc
      mysql-test/suite/parts/inc/partition_set.inc:
        Rename: mysql-test/suite/parts/include/partition_set.inc -> mysql-test/suite/parts/inc/partition_set.inc
      mysql-test/suite/parts/inc/partition_smallint.inc:
        Rename: mysql-test/suite/parts/include/partition_smallint.inc -> mysql-test/suite/parts/inc/partition_smallint.inc
      mysql-test/suite/parts/inc/partition_text.inc:
        Rename: mysql-test/suite/parts/include/partition_text.inc -> mysql-test/suite/parts/inc/partition_text.inc
      mysql-test/suite/parts/inc/partition_time.inc:
        Rename: mysql-test/suite/parts/include/partition_time.inc -> mysql-test/suite/parts/inc/partition_time.inc
      mysql-test/suite/parts/inc/partition_timestamp.inc:
        Rename: mysql-test/suite/parts/include/partition_timestamp.inc -> mysql-test/suite/parts/inc/partition_timestamp.inc
      mysql-test/suite/parts/inc/partition_tinyint.inc:
        Rename: mysql-test/suite/parts/include/partition_tinyint.inc -> mysql-test/suite/parts/inc/partition_tinyint.inc
      mysql-test/suite/parts/inc/partition_trigg1.inc:
        Rename: mysql-test/suite/parts/include/partition_trigg1.inc -> mysql-test/suite/parts/inc/partition_trigg1.inc
      mysql-test/suite/parts/inc/partition_trigg2.inc:
        Rename: mysql-test/suite/parts/include/partition_trigg2.inc -> mysql-test/suite/parts/inc/partition_trigg2.inc
      mysql-test/suite/parts/inc/partition_trigg3.inc:
        Rename: mysql-test/suite/parts/include/partition_trigg3.inc -> mysql-test/suite/parts/inc/partition_trigg3.inc
      mysql-test/suite/parts/inc/partition_value.inc:
        Rename: mysql-test/suite/parts/include/partition_value.inc -> mysql-test/suite/parts/inc/partition_value.inc
      mysql-test/suite/parts/inc/partition_varbinary.inc:
        Rename: mysql-test/suite/parts/include/partition_varbinary.inc -> mysql-test/suite/parts/inc/partition_varbinary.inc
      mysql-test/suite/parts/inc/partition_varchar.inc:
        Rename: mysql-test/suite/parts/include/partition_varchar.inc -> mysql-test/suite/parts/inc/partition_varchar.inc
      mysql-test/suite/parts/inc/partition_year.inc:
        Rename: mysql-test/suite/parts/include/partition_year.inc -> mysql-test/suite/parts/inc/partition_year.inc
      mysql-test/suite/parts/inc/part_supported_sql_funcs_int_ch1.inc:
        Rename: mysql-test/suite/parts/inc/partition_supported_sql_funcs_int_ch1.in -> mysql-test/suite/parts/inc/part_supported_sql_funcs_int_ch1.inc
      mysql-test/suite/parts/inc/part_supported_sql_funcs_int_date.inc:
        Rename: mysql-test/suite/parts/inc/partition_supported_sql_funcs_int_date.in -> mysql-test/suite/parts/inc/part_supported_sql_funcs_int_date.inc
      mysql-test/suite/parts/inc/part_supported_sql_funcs_int_float.inc:
        Rename: mysql-test/suite/parts/inc/partition_supported_sql_funcs_int_float.in -> mysql-test/suite/parts/inc/part_supported_sql_funcs_int_float.inc
      mysql-test/suite/parts/inc/part_supported_sql_funcs_int_int.inc:
        Rename: mysql-test/suite/parts/inc/partition_supported_sql_funcs_int_int.in -> mysql-test/suite/parts/inc/part_supported_sql_funcs_int_int.inc
      mysql-test/suite/parts/r/part_blocked_sql_func_innodb.result:
        Rename: mysql-test/suite/parts/r/partition_blocked_sql_func_innodb.result -> mysql-test/suite/parts/r/part_blocked_sql_func_innodb.result
      mysql-test/suite/parts/r/part_blocked_sql_func_myisam.result:
        Rename: mysql-test/suite/parts/r/partition_blocked_sql_func_myisam.result -> mysql-test/suite/parts/r/part_blocked_sql_func_myisam.result
      mysql-test/suite/parts/r/part_supported_sql_func_ndb.result:
        Rename: mysql-test/suite/parts/r/partition_supported_sql_func_ndb.result -> mysql-test/suite/parts/r/part_supported_sql_func_ndb.result
      mysql-test/suite/parts/inc/part_supported_sql_funcs_int_time.inc:
        Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_time.cin -> mysql-test/suite/parts/inc/part_supported_sql_funcs_int_time.inc
      3df9f94f
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 1fb5a61c
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      1fb5a61c
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 93d6958f
      unknown authored
      into  maint1.mysql.com:/data/localhome/tnurnberg/51-27293
      
      
      93d6958f
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · da27ed3e
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
        Auto merged
      da27ed3e
    • unknown's avatar
      ndb - bug#28161 · e618e271
      unknown authored
        fix commit triggers with DD but not using DD
      
      
      storage/ndb/include/kernel/signaldata/TupCommit.hpp:
        add diskpage
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        add diskpage
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        pass disk/nodisk down detachedtrigger-path
      storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
        use TUPCOMMIT req for signaling diskpage back and forth
          so that I can init pointers (VM_TRACE) when from LQH
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        remove niclude
      storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
        only derefence disk pointer if needed
      e618e271
    • unknown's avatar
      Bug#27293: mysqldump crashes when dumping procedure defined by different user · 8f8244df
      unknown authored
      mysqldump didn't properly handle getting no data on
      SHOW CREATE PROCEDURE.  If S/C/P fails (due to dumping
      user's insufficient privileges on mysql.proc, say),
      mysqldump will print a comment to that effect to the
      output and return an error-code.  If the -f (force) option
      is used, the dump will continue, otherwise, it will abort
      right there and then.
      
      Also fixes Bug#22761, "mysqldump reports no errors when using
      --routines without mysql.proc privileges"
      ---
      Merge mysql.com:/home/tnurnberg/27293/50-27293
      into  mysql.com:/home/tnurnberg/27293/51-27293
      ---
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
      into  mysql.com:/home/tnurnberg/27293/51-27293
      
      
      client/mysqldump.c:
        Bug#27293: mysqldump crashes when dumping procedure defined by different user
        
        handle failure of SHOW CREATE PROCEDURE, give user diagnostics,
        heed -f (force) option
        ---
        manual merge
      mysql-test/r/mysqldump.result:
        Bug#27293: mysqldump crashes when dumping procedure defined by different user
        
        show that trying to mysqldump --routines with insufficient
        privileges will no longer crash the client
        ---
        manual merge
      mysql-test/t/mysqldump.test:
        Bug#27293: mysqldump crashes when dumping procedure defined by different user
        
        show that trying to mysqldump --routines with insufficient
        privileges will no longer crash the client
        ---
        manual merge
      8f8244df
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 0f6f3aa0
      unknown authored
      into  maint1.mysql.com:/data/localhome/tnurnberg/50-27293
      
      
      0f6f3aa0
    • unknown's avatar
      ndb_restore to set correct value force varpart · 140f5191
      unknown authored
      + some tests
      
      
      140f5191
    • unknown's avatar
      Merge polly.local:/home/kaa/src/maint/mysql-5.0-maint · 748a0832
      unknown authored
      into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
      
      
      include/my_global.h:
        Auto merged
      748a0832
    • unknown's avatar
      Bug#27293: mysqldump crashes when dumping procedure defined by different user · 3f18c6bc
      unknown authored
      mysqldump didn't properly handle getting no data on
      SHOW CREATE PROCEDURE.  If S/C/P fails (due to dumping
      user's insufficient privileges on mysql.proc, say),
      mysqldump will print a comment to that effect to the
      output and return an error-code.  If the -f (force) option
      is used, the dump will continue, otherwise, it will abort
      right there and then.
      
      Also fixes Bug#22761, "mysqldump reports no errors when using
      --routines without mysql.proc privileges"
      ---
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
      into  mysql.com:/home/tnurnberg/27293/50-27293
      
      
      client/mysqldump.c:
        Bug#27293: mysqldump crashes when dumping procedure defined by different user
        
        handle failure of SHOW CREATE PROCEDURE, give user diagnostics,
        heed -f (force) option
      mysql-test/r/mysqldump.result:
        Bug#27293: mysqldump crashes when dumping procedure defined by different user
        
        show that trying to mysqldump --routines with insufficient
        privileges will no longer crash the client
        ---
        manual merge
      mysql-test/t/mysqldump.test:
        Bug#27293: mysqldump crashes when dumping procedure defined by different user
        
        show that trying to mysqldump --routines with insufficient
        privileges will no longer crash the client
        ---
        manual merge
      3f18c6bc
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 5e14c3cd
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        Auto merged
      5e14c3cd
    • unknown's avatar
      ndb - force var part, part III · 2df58d26
      unknown authored
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Fix forceVarPart also for ordered indexes
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Add new table flag
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        set null ref in case of force var part
      storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        add varref also for force var part
      storage/ndb/test/src/NDBT_Tables.cpp:
        "randomly" set forcevart on NDBT tables
      2df58d26
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca · b32c72a4
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
      
      
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Auto merged
      b32c72a4
    • unknown's avatar
      merging fix · 9be5c10f
      unknown authored
      9be5c10f
    • unknown's avatar
      Post-merge fix. · 5352b41d
      unknown authored
      5352b41d
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-4.1-opt · 532f2e84
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug24856
      
      
      sql/item_func.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/olap.result:
        Manual merge.
      mysql-test/t/olap.test:
        Manual merge.
      532f2e84
    • unknown's avatar
      Fix in comments. · c004ad09
      unknown authored
      c004ad09
  4. 29 Apr, 2007 3 commits
    • unknown's avatar
      Fixed bug #24856: the result set of a ROLLUP query with DISTINCT could lack · dd34042e
      unknown authored
      some rollup rows (rows with NULLs for grouping attributes) if GROUP BY
      list contained constant expressions.
      
      This happened because the results of constant expressions were not put
      in the temporary table used for duplicate elimination. In fact a constant
      item from the GROUP BY list of a ROLLUP query can be replaced for an
      Item_null_result object when a rollup row is produced . 
      
      Now the JOIN::rollup_init function wraps any constant item referenced in
      the GROYP BY list of a ROLLUP query into an Item_func object of a special
      class that is never detected as constant item. This ensures creation of
      fields for such  constant items in temporary tables and guarantees right
      results when the result of the rollup operation first has to be written
      into a temporary table, e.g. in the cases when duplicate elimination is
      required.  
      
      
      mysql-test/r/olap.result:
        Added a test case for bug #24856.
      mysql-test/t/olap.test:
        Added a test case for bug #24856.
      sql/item_func.h:
        Fixed bug #24856: the result set of a ROLLUP query with DISTINCT could lack
        some rollup rows (rows with NULLs for grouping attributes) if GROUP BY
        list contained constant expressions.
        
        Itroduced class Item_func_rollup_const derived from Item_func. The object of
        this class are never detected as constant items.
        We use them for wrapping constant items from the GROUP BY list of any ROLLUP
        query. This wrapping allows us to ensure writing constant items into temporary
        tables whenever the result of the ROLLUP operation has to be written into a
        temporary table, e.g. when ROLLUP is used together with DISTINCT in the SELECT
        list.
      sql/sql_select.cc:
        Fixed bug #24856: the result set of a ROLLUP query with DISTINCT could lack
        some rollup rows (rows with NULLs for grouping attributes) if GROUP BY
        list contained constant expressions.
        
        Now the JOIN::rollup_init function wraps any constant item referenced in
        the GROYP BY list of a ROLLUP query into an Item_func object of a special
        class that is never detected as constant item. This ensures creation of
        fields for such  constant items in temporary tables and guarantees right
        results when the result of the rollup operation first has to be written
        into a temporary table, e.g. in the cases when duplicate elimination is
        required.
      dd34042e
    • unknown's avatar
      'no DBUG_RETURN' warning fixed · dd038260
      unknown authored
      storage/ndb/src/mgmapi/mgmapi.cpp:
        DBUG_ENTER requires DBUG_CHECK_TIMEDOUT_RET
      dd038260
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · ba967f5b
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/16377-bug-5.0-opt-mysql
      
      
      ba967f5b