1. 17 Oct, 2007 1 commit
    • unknown's avatar
      Further clean-up. · 1fc9612c
      unknown authored
      
      configure.in:
        Change description of profiling option.
      mysql-test/r/information_schema.result:
        Remove community-server-only feature test.  It's already in 
        "variables+c" test.
      1fc9612c
  2. 07 May, 2007 10 commits
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-unified02 · 3279ee0a
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unification
      
      
      configure.in:
        Auto merged
      libmysqld/Makefile.am:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_base.cc:
        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_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.h:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      sql/Makefile.am:
        SCCS merged
      3279ee0a
    • unknown's avatar
      merging fix · 59ae1777
      unknown authored
      
      mysql-test/r/sp-vars.result:
        merging
      59ae1777
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 6e07c2e6
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/sp-vars.result:
        merging
      mysql-test/r/type_datetime.result:
        SCCS merged
      mysql-test/t/type_datetime.test:
        SCCS merged
      sql/item_func.h:
        merging
      sql/mysql_priv.h:
        merging
      6e07c2e6
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt · 187ccf4b
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
      
      
      187ccf4b
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0 · 3a04df06
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
      
      
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      3a04df06
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-4.1 · 30b4f5d0
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
      
      
      30b4f5d0
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1 · 42c714fd
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      42c714fd
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 632e03f8
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
      
      
      632e03f8
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 2e1ce777
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      2e1ce777
    • unknown's avatar
      fixed Solaris compilation failure · 17da0553
      unknown authored
      
      sql/field.cc:
        parameters fixed to not interfere with the Field_blob members
      sql/field.h:
        BIGENDIAN machine will require 'table' member. so cannot be static
      17da0553
  3. 04 May, 2007 17 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · e63cc253
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/27759-bug-5.0-opt-mysql
      
      
      sql/item_func.cc:
        Auto merged
      e63cc253
    • unknown's avatar
      bug #27531: · 359b0e59
      unknown authored
       fixed coverage of out-of-mem errors
      
      
      359b0e59
    • unknown's avatar
      bug #27531: 5.1 part of the fix: · 0c835da8
      unknown authored
       - added join cache indication in EXPLAIN (Extra column).
       - prefer filesort over full scan over 
         index for ORDER BY (because it's faster).
       - when switching from REF to RANGE because
         RANGE uses longer key turn off sort on
         the head table only as the resulting 
         RANGE access is a candidate for join cache
         and we don't want to disable it by sorting
         on the first table only. 
      
      
      mysql-test/r/archive_gis.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/compress.result:
        bug #27531:
         - join cache in EXPLAIN. 
         - prefer filesort over full scan over index for ORDER BY.
      mysql-test/r/ctype_utf8.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/derived.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/distinct.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/func_group.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/func_group_innodb.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/gis.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/greedy_optimizer.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/group_by.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/group_min_max.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/index_merge_myisam.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/information_schema.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/innodb_gis.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/innodb_mysql.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/join.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/join_nested.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/key_diff.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/myisam.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/ndb_condition_pushdown.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/ndb_gis.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/range.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/row.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/select.result:
        bug #27531:
         - join cache in EXPLAIN.
         - prefer filesort over full scan over index for ORDER BY.
      mysql-test/r/ssl.result:
        bug #27531:
         - join cache in EXPLAIN.
         - prefer filesort over full scan over index for ORDER BY.
      mysql-test/r/ssl_compress.result:
        bug #27531:
         - join cache in EXPLAIN.
         - prefer filesort over full scan over index for ORDER BY.
      mysql-test/r/subselect.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/subselect3.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/union.result:
        bug #27531: join cache in EXPLAIN
      mysql-test/r/view.result:
        bug #27531: join cache in EXPLAIN
      sql/sql_select.cc:
        bug #27531:
         - join cache in EXPLAIN.
         - prefer filesort over full scan over
           index for ORDER BY.
         - disable sorting on the first table only
           when switching from REF to RANGE.
      0c835da8
    • unknown's avatar
      Bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions. · 99bde6d9
      unknown authored
      The LEAST/GREATEST functions compared DATE/DATETIME values as
      strings which in some cases could lead to a wrong result.
      
      A new member function called cmp_datetimes() is added to the
      Item_func_min_max class. It compares arguments in DATETIME context
      and returns index of the least/greatest argument.
      The Item_func_min_max::fix_length_and_dec() function now detects when
      arguments should be compared in DATETIME context and sets the newly
      added flag compare_as_dates. It indicates that the cmp_datetimes() function
      should be called to get a correct result.
      Item_func_min_max::val_xxx() methods are corrected to call the
      cmp_datetimes() function when needed.
      Objects of the Item_splocal class now stores and reports correct original
      field type.
      
      
      mysql-test/t/type_datetime.test:
        Added a test case for the bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
      mysql-test/r/type_datetime.result:
        Added a test case for the bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
      mysql-test/r/sp-vars.result:
        A test case result corrected after the fix for the bug#27759.
      sql/mysql_priv.h:
        Bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
        Added the prototype of the get_datetime_value() function.
      sql/item_func.h:
        Bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
        A new member function called cmp_datetimes() is added to the
        Item_func_min_max class.
      sql/item_func.cc:
        Bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
        A new member function called cmp_datetimes() is added to the
        Item_func_min_max class. It compares arguments in DATETIME context
        and returns index of the least/greatest argument.
        The Item_func_min_max::fix_length_and_dec() function now detects when
        arguments should be compared in DATETIME context and sets the newly
        added flag compare_as_dates. It indicates that the cmp_datetimes() function
        should be called to get a correct result.
        Item_func_min_max::val_xxx() methods are corrected to call the
        cmp_datetimes() function when needed.
      sql/item_cmpfunc.cc:
        Bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
        The get_datetime_value() function is no longer static.
      sql/item.h:
        Bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
        Objects of the Item_splocal class now stores and reports correct original
        field type.
      sql/item.cc:
        Bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
        Objects of the Item_splocal class now stores and reports correct original
        field type.
      99bde6d9
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/B27531-5.0-opt · 27aeb9e0
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B27531-5.1-opt-after-merge
      
      
      mysql-test/r/join.result:
        Auto merged
      mysql-test/t/join.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      27aeb9e0
    • unknown's avatar
      post merge (5.0-opt -> 5.1-opt) fixes · 67e5e123
      unknown authored
      67e5e123
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/B27531-4.1-opt · 7539cb43
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B27531-5.0-opt
      
      
      mysql-test/t/join.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/join.result:
        SCCS merged
      7539cb43
    • unknown's avatar
      Bug #27531: the 4.1 fix. · 353b6f26
      unknown authored
      When checking for applicability of join cache
      we must disable its usage only if there is no
      temp table in use.
      When a temp table is used we can use join
      cache (and it will not make the result-set 
      unordered) to fill the temp table. The filesort() 
      operation is then applied to the data in the temp 
      table and hence is not affected by join cache
      usage.
      Fixed by narrowing the condition for disabling 
      join cache to exclude the case where temp table
      is used.
      
      
      mysql-test/r/join.result:
        Bug #27531: test case
      mysql-test/t/join.test:
        Bug #27531: test case
      sql/sql_select.cc:
        Bug #27531: 
        Disable join cache only if not using temp table
      353b6f26
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/B27531-5.0-opt · 27f581a0
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B27531-5.1-opt
      
      
      mysql-test/r/cast.result:
        Auto merged
      mysql-test/r/join_outer.result:
        Auto merged
      mysql-test/t/cast.test:
        Auto merged
      mysql-test/t/join_outer.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      mysql-test/r/subselect.result:
        merge of 5.0-opt -> 5.1-opt
      mysql-test/t/subselect.test:
        merge of 5.0-opt -> 5.1-opt
      27f581a0
    • unknown's avatar
      bugfix in checksum with force varpart · 764e010e
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        bigger needed for running some tests
      764e010e
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 1084f2d6
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      1084f2d6
    • unknown's avatar
      Bug#28181 Access denied to 'information_schema when select into out file (regression) · 13cfc477
      unknown authored
      allow select into out file from I_S if user has FILE privilege
      otherwise issue an error
      
      
      mysql-test/r/outfile.result:
        test result
      mysql-test/t/outfile.test:
        test case
      sql/sql_parse.cc:
        allow select into out file from I_S if user has FILE privilege
        otherwise issue an error
      13cfc477
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · 5c6dec8d
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      5c6dec8d
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 3ebd2e55
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B27807-5.0-opt
      
      
      3ebd2e55
    • unknown's avatar
      Merge moonbone.local:/mnt/gentoo64/work/23656-bug-4.1-opt-mysql · 74c794d0
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/23656-bug-5.0-opt-mysql
      
      
      mysql-test/r/cast.result:
        Auto merged
      mysql-test/t/cast.test:
        Auto merged
      sql/item_func.cc:
        Manual merge
      74c794d0
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · ad06c4c0
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B27807-5.0-opt
      
      
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/subselect.result:
        merge to 5.0-opt
      mysql-test/t/subselect.test:
        merge to 5.0-opt
      ad06c4c0
    • unknown's avatar
      Bug #27807. · 0ad4e1b2
      unknown authored
      Non-correlated scalar subqueries may get executed
      in EXPLAIN at the optimization phase if they are
      part of a right hand sargable expression.
      If the scalar subquery uses a temp table to 
      materialize its results it will replace the 
      subquery structure from the parser with a simple
      select from the materialization table.
      As a result the EXPLAIN will crash as the 
      temporary materialization table is not to be shown
      in EXPLAIN at all.
      Fixed by preserving the original query structure
      right after calling optimize() for scalar subqueries
      with temp tables executed during EXPLAIN.
      
      
      mysql-test/r/subselect.result:
        Bug #27807: test case
      mysql-test/t/subselect.test:
        Bug #27807: test case
      sql/item_subselect.cc:
        Bug #27807: preserve the join structure
      sql/sql_select.cc:
        Bug #27807: introduce initialization function for tmp_join
      sql/sql_select.h:
        Bug #27807: introduce initialization function for tmp_join
      0ad4e1b2
  4. 03 May, 2007 4 commits
    • unknown's avatar
      Bug#23656: Wrong conversion result of a DATETIME to integer using CAST function. · 1a0e3a28
      unknown authored
      The generic string to int conversion was used by the Item_func_signed and
      the Item_func_unsigned classes to convert DATE/DATETIME values to the
      SIGNED/UNSIGNED type. But this conversion produces wrong results for such
      values.
      
      Now if the item which result has to be converted can return its result as
      longlong then the item->val_int() method is used to allow the item to carry
      out the conversion itself and return the correct result.
      This condition is checked in the Item_func_signed::val_int() and the
      Item_func_unsigned::val_int() functions.
      
      
      mysql-test/t/cast.test:
        Added a test case for the bug#23656: Wrong conversion result of a DATETIME to integer using CAST function.
      mysql-test/r/cast.result:
        Added a test case for the bug#23656: Wrong conversion result of a DATETIME to integer using CAST function.
      sql/item_func.cc:
        Bug#23656: Wrong conversion result of a DATETIME to integer using CAST function.
        Now if the item which result has to be converted can return its result as
        longlong then the item->val_int() method is used to allow the item to carry
        out the conversion itself and return the correct result.
        This condition is checked in the Item_func_signed::val_int() and the
        Item_func_unsigned::val_int() functions.
      1a0e3a28
    • unknown's avatar
      Merge trift2.:/MySQL/M50/netware-cross-5.0 · 70d440ac
      unknown authored
      into  trift2.:/MySQL/M51/netware-cross-5.1
      
      
      scripts/Makefile.am:
        Manual merge.
      70d440ac
    • unknown's avatar
      Better distinction between "CLEANFILES" and "DISTCLEANFILES" for some generated files · ad33a48a
      unknown authored
      (here: "scripts/mysql_fix_privilege_tables{.sql,_sql.c}"). Important for cross-builds.
      
      
      scripts/Makefile.am:
        Generated files like "mysql_fix_privilege_tables{.sql,_sql.c}" should survive
        a "make clean", this is essential for cross-builds.
        So move them from "CLEANFILES" to "DISTCLEANFILES".
      ad33a48a
    • unknown's avatar
      Updated funcs_1 files to 5.1.18 level · f32d1e9b
      unknown authored
       - validating current result files
       - updating with new features in information_schema / error messages
       - forced order by and removed time stamps
      removed a_version files that are not needed (now that the suite is in the main tree
      Note: datadict tests still fail as a result of bug 28181 (a regression introduced in 
            5.0.42 - and 5.1.18(?) - tests should runn clean once it is fixed
      
      
      BitKeeper/deleted/.del-a_version_check.test~82ea7fb267df9e58:
        Delete: mysql-test/suite/funcs_1/t/a_version_check.test
      BitKeeper/deleted/.del-a_version_check.result~97a8ec1e3211c26:
        Delete: mysql-test/suite/funcs_1/r/a_version_check.result
      mysql-test/suite/funcs_1/datadict/datadict_load.inc:
        Modified to correct failiure to return host name on some systems
      mysql-test/suite/funcs_1/datadict/datadict_master.inc:
        corrections to fooce order by on queries, replace time stamps with strings and enable the
        testing of referential_constraints table
      mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
        corrections to force order by on queries
      mysql-test/suite/funcs_1/r/innodb__datadict.result:
        Updated result file with order by selects, elimination of time stamps and selects
        of empty user (that we don't have anymore) and adding the testing 
        of referential_constraints table
      mysql-test/suite/funcs_1/r/innodb_func_view.result:
        confirming existing results as correct - old result file had wrong cast values
      mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
        Corrected error with long trigger name (that was previously quietly trimmed)
      mysql-test/suite/funcs_1/r/innodb_trig_08.result:
        confirmed existing results as corrects ones - updated error message
      mysql-test/suite/funcs_1/r/innodb_views.result:
        confirmed current results as correct - returned results included a wrong 'expected' error message
      mysql-test/suite/funcs_1/r/memory__datadict.result:
        Updated result file with order by selects, elimination of time stamps and selects
        of empty user (that we don't have anymore) and adding the testing 
        of referential_constraints table
      mysql-test/suite/funcs_1/r/memory_func_view.result:
        confirming existing results as correct - old result file had wrong cast values
      mysql-test/suite/funcs_1/r/memory_trig_0102.result:
        Corrected error with long trigger name (that was previously quietly trimmed)
      mysql-test/suite/funcs_1/r/memory_trig_08.result:
        confirmed existing results as corrects ones - updated error message
      mysql-test/suite/funcs_1/r/memory_views.result:
        confirmed current results as correct - returned results included a wrong 'expected' error message
      mysql-test/suite/funcs_1/r/myisam__datadict.result:
        Updated result file with order by selects, elimination of time stamps and selects
        of empty user (that we don't have anymore) and adding the testing 
        of referential_constraints table
      mysql-test/suite/funcs_1/r/myisam_func_view.result:
        confirming existing results as correct - old result file had wrong cast values
      mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
        Corrected error with long trigger name (that was previously quietly trimmed)
      mysql-test/suite/funcs_1/r/myisam_trig_08.result:
        confirmed existing results as corrects ones - updated error message
      mysql-test/suite/funcs_1/r/myisam_views.result:
        confirmed current results as correct - returned results included a wrong 'expected' error message
      mysql-test/suite/funcs_1/r/ndb__datadict.result:
        Updated result file with order by selects, elimination of time stamps and selects
        of empty user (that we don't have anymore) and adding the testing 
        of referential_constraints table
      mysql-test/suite/funcs_1/r/ndb_func_view.result:
        confirming existing results as correct - old result file had wrong cast values
      mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
        Corrected error with long trigger name (that was previously quietly trimmed)
      mysql-test/suite/funcs_1/r/ndb_trig_08.result:
        confirmed existing results as corrects ones - updated error message
      mysql-test/suite/funcs_1/r/ndb_views.result:
        confirmed current results as correct - returned results included a wrong 'expected' error message
      mysql-test/suite/funcs_1/t/disabled.def:
        Updated disabled messages with clearer ones
      mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
        Added code to test for error in case of a trigger name that is to long
      mysql-test/suite/funcs_1/views/views_master.inc:
        Correction to remove wrong '--eror' meaningless tag that generated warnings
      f32d1e9b
  5. 02 May, 2007 8 commits
    • unknown's avatar
      Merge linux.site:/home/omer/source/bld50_tmp · 9460b8c4
      unknown authored
      into  linux.site:/home/omer/source/bld51_2
      
      
      BitKeeper/deleted/.del-a_version_check.result:
        Auto merged
      BitKeeper/deleted/.del-a_version_check.test:
        Auto merged
      BitKeeper/deleted/.del-datadict_load.inc:
        Auto merged
      BitKeeper/deleted/.del-datadict_master.inc:
        Auto merged
      BitKeeper/deleted/.del-datadict_show_schema.inc:
        Auto merged
      BitKeeper/deleted/.del-disabled.def~1:
        Auto merged
      BitKeeper/deleted/.del-innodb__datadict.result:
        Auto merged
      BitKeeper/deleted/.del-innodb_trig_08.result:
        Auto merged
      BitKeeper/deleted/.del-innodb_views.result:
        Auto merged
      BitKeeper/deleted/.del-memory__datadict.result:
        Auto merged
      BitKeeper/deleted/.del-memory_trig_08.result:
        Auto merged
      BitKeeper/deleted/.del-memory_views.result:
        Auto merged
      BitKeeper/deleted/.del-myisam__datadict.result:
        Auto merged
      BitKeeper/deleted/.del-myisam_trig_08.result:
        Auto merged
      BitKeeper/deleted/.del-views_master.inc:
        Auto merged
      BitKeeper/deleted/.del-innodb_func_view.result:
        manual merge - using local file
      BitKeeper/deleted/.del-memory_func_view.result:
        manual merge - using local file
      BitKeeper/deleted/.del-myisam_func_view.result:
        manual merge - using local file
      BitKeeper/deleted/.del-myisam_views.result:
        manual merge - using local file
      9460b8c4
    • unknown's avatar
      Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.0-build · dc39e2c2
      unknown authored
      into  linux.site:/home/omer/source/bld50_2
      
      
      dc39e2c2
    • unknown's avatar
      Fix up merge. Some macros are now functions. Some functions are · 0901dbc5
      unknown authored
      renamed.  Some new THD proc_info states are new.  Directories must be
      encountered in make in a specific order, to have symlinks already set.
      Move community-server-specific tests into own tests, so that we can 
      exempt them from testing on enterprise servers.
      
      
      BitKeeper/deleted/.del-profiling.inc:
        Delete: mysql-test/include/profiling.inc
      BitKeeper/deleted/.del-profiling.require:
        Delete: mysql-test/r/profiling.require
      configure.in:
        Set a new order of sql_client_dirs, so that the make directory traversal
        doesn't miss symlink dependencies.
      mysql-test/r/not_embedded_server.result:
        Account for new "executing" state.
      mysql-test/t/information_schema.test:
        Move community-feature test to another test file.
      mysql-test/t/profiling.test:
        Make test more generic to community features.
      sql/lex.h:
        Add symbol lost in manual merge.
      sql/mysql_priv.h:
        Insert a preprocessor layer between setting the caller and the function
        that sets the thread state, so we can get caller information.
      sql/mysqld.cc:
        Add new server variable "have_community_features".
      sql/set_var.cc:
        Add new server variable "have_community_features".
      sql/sql_class.cc:
        Insert a preprocessor layer between setting the caller and the function
        that sets the thread state, so we can get caller information.
      sql/sql_profile.cc:
        Function name change, my_strndup()
      sql/sql_profile.h:
        Insert a preprocessor layer between setting the caller and the function
        that sets the thread state, so we can get caller information.
      mysql-test/include/have_community_features.inc:
        New BitKeeper file ``mysql-test/include/have_community_features.inc''
      mysql-test/r/have_community_features.require:
        New BitKeeper file ``mysql-test/r/have_community_features.require''
      mysql-test/r/variables+c.result:
        New BitKeeper file ``mysql-test/r/variables+c.result''
      mysql-test/t/variables+c.test:
        New BitKeeper file ``mysql-test/t/variables+c.test''
      0901dbc5
    • unknown's avatar
      Resolve a possible timing issue with "scripts/mysql_fix_privilege_tables_sql.c" in the · 2478a8be
      unknown authored
      source tarball, this is essential for cross builds, like for NetWare.
      
      
      scripts/Makefile.am:
        On a fast build machine, both the source (mysql_fix_privilege_tables.sql) 
        and the generated file (mysql_fix_privilege_tables_sql.c) may have identical timestamps
        (granularity is one second only, may be too coarse).
        If that happens, the Makefile rule will fire, and "comp_sql" will be built and called -
        which fails in a cross build, like for NetWare.
        
        Prevent that by sleeping for 5 (five) seconds, this will ensure a time difference.
      2478a8be
    • unknown's avatar
      Merge trift2.:/MySQL/M50/spec-5.0 · 2f2f11b3
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      2f2f11b3
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · e817a16a
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      scripts/Makefile.am:
        Auto merged
      BitKeeper/deleted/.del-CMakeLists.txt~1:
        Auto merged
      e817a16a
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · eb92ed03
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      
      CMakeLists.txt:
        Auto merged
      eb92ed03
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · c444c3b5
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      BitKeeper/deleted/.del-CMakeLists.txt~1:
        Auto merged
      c444c3b5