1. 29 Jan, 2007 2 commits
    • unknown's avatar
      bug #25895 (compiling the embedded server fails on some 64-bit platforms) · de63c6d4
      unknown authored
      it can't be compile everywhere if we just cast pointer to pthread_t
      So now we use correct pthread_self() value as the pthread_t and
      pointer where we need to identify the thread exactly.
      
      
      libmysqld/lib_sql.cc:
        pthread_self() can be used here as we use pointer to thread
        when we need to identify the thread exactly
      sql/item_func.cc:
        now we use pthread_t value for thread identification in 'standalone'
        server only, in the embedded server we can use the pointer to THD
        structure
      de63c6d4
    • unknown's avatar
      bug #25890 (mysqltest_embedded crashes on start) · a00d38e9
      unknown authored
      binlog_filter and rpl_filter are initialized in server's 'main' function
      which doesn't work in the embedded server. So this code moved to
      function working in both cases.
      
      
      sql/mysqld.cc:
        rpl_filter/binlog_filter initializations moved to
        init_common_variables() function.
        That will be called by both 'standalone' and 'embedded' servers
      a00d38e9
  2. 26 Jan, 2007 3 commits
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 6db6be5a
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1
      
      
      sql/item.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      6db6be5a
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.1-opt · 33b73c20
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/item.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      33b73c20
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 92a7c1ed
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0
      
      
      sql/item.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      92a7c1ed
  3. 25 Jan, 2007 13 commits
  4. 24 Jan, 2007 22 commits
    • unknown's avatar
      Merge mysql.com:/home/psergey/mysql-5.0-bug8804-r12 · a8580967
      unknown authored
      into  mysql.com:/home/psergey/mysql-5.1-bug8804-r12-merge
      
      
      sql/mysqld.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      a8580967
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 24903ed5
      unknown authored
      into  mysql.com:/home/psergey/mysql-5.0-bug8804-r12
      
      
      sql/mysqld.cc:
        Auto merged
      24903ed5
    • unknown's avatar
      BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...): · a3416606
      unknown authored
      Fixed typo problem that surfaced after the merge
      
      
      a3416606
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines · 247bd923
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
      
      
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/r/myisam.result:
        Use local.
      mysql-test/t/myisam.test:
        Use local.
      247bd923
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-5.1 · 1cf81178
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
      
      
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/federated/ha_federated.cc:
        Auto merged
      storage/myisam/mi_check.c:
        Auto merged
      storage/myisam/mi_packrec.c:
        Auto merged
      mysql-test/r/myisam.result:
        Manually merged.
      mysql-test/t/myisam.test:
        Manually merged.
      1cf81178
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 53491b18
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.1-21029
      
      
      Makefile.am:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      53491b18
    • unknown's avatar
      Bug#21029 (Dependencies between sql_yacc.cc and dependent headers not detected) · 39cc6d11
      unknown authored
      The build scripts in general, using automake, autoconf, etc, contain several
      special commands and work around all related to the way the bison code in the
      parser is built, for sql/sql_yacc.yy. These work arounds, accumulated over
      time during development, ultimately cause the build scripts to be unstable
      and cause build defects by not enforcing dependencies.
      
      This fix simplifies the build process and aligns it with the automake tooling,
      which provides native support for bison and *.yy files.
      
      In particular, the following problem have been fixed:
      - dependencies with sql_yacc.cc were not honored (Bug 21029), leading to
        corrupted builds,
      - the work around introduced by Bug 24557, to cleanup the generated files
        sql_yacc.h and sql_yacc.cc, has been removed,
      - the generated makefile, in a source distribution, used to destroy the files
        sql_yacc.h and sql_yacc.cc on a 'make clean' target. This has been fixed:
        these files are now removed by make maintainer-clean.
      - The root cause of the problem found with gcc 4.1 (see Bug 24619) has been
        clearly documented, and the "sed" hack has been replaced by a cleaner
        work around, when building the code with bison 1.875.
      - Removed the file sql/sql_yacc.yy.bak, added by WL 3031 by accident.
      - Removed the unnecessary AM_YFLAG= --debug introduced by WL 3432, since
        the compiling option DBUG_OFF takes precedence when setting YYDEBUG.
      
      
      BitKeeper/deleted/.del-sql_yacc.yy.bak:
        Rename: sql/sql_yacc.yy.bak -> BitKeeper/deleted/.del-sql_yacc.yy.bak
      Makefile.am:
        General cleanup of the build process for sql_yacc.yy
      sql/Makefile.am:
        General cleanup of the build process for sql_yacc.yy
      sql/sql_yacc.yy:
        General cleanup of the build process for sql_yacc.yy
      39cc6d11
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 · 2ed7eaf5
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
      
      
      mysql-test/t/myisam.test:
        Auto merged
      2ed7eaf5
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 · c26ffedb
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
      
      
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/r/myisam.result:
        Manually merged.
      mysql-test/t/myisam.test:
        Manually merged.
      c26ffedb
    • unknown's avatar
      Merge mysql.com:/home/psergey/mysql-5.0-bug8804-r12 · 713bb7a0
      unknown authored
      into  mysql.com:/home/psergey/mysql-5.1-bug8804-r12-merge
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_subselect.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      mysql-test/r/ndb_subquery.result:
        Manual merge
      mysql-test/r/subselect.result:
        Manual merge
      mysql-test/r/subselect3.result:
        Manual merge
      sql/item_subselect.cc:
        Manual merge
      713bb7a0
    • unknown's avatar
      BUG#24127: merge fixes: If subselect is a union, dont allocate several · 130523af
      unknown authored
      identical pushed_cond_guards arrays. Allocate only one always.
      
      
      mysql-test/r/subselect.result:
        BUG#24127: merge
      mysql-test/t/subselect3.test:
        BUG#24127: merge
      130523af
    • unknown's avatar
      Merge mockturtle.local:/home/dlenev/src/mysql-5.0-merge · 5c0216c5
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge
      
      
      mysql-test/t/ps.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      mysql-test/t/disabled.def:
        Manual merge.
      5c0216c5
    • unknown's avatar
      Disabling back im_daemon_life_cycle.test, which was temporarily enabled in · 259a4658
      unknown authored
      the team tree for additional investigation.
      
      
      259a4658
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 7b109de6
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.0-merge
      
      
      mysql-test/t/disabled.def:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      7b109de6
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 491ef6af
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge
      
      
      mysql-test/t/disabled.def:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      491ef6af
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · dfeac169
      unknown authored
      into  mysql.com:/home/psergey/mysql-5.0-bug8804-r12
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/subselect.result:
        Manual Merge
      dfeac169
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 4ee9e407
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      mysql-test/r/fulltext_left_join.result:
        Auto merged
      mysql-test/r/func_in.result:
        Auto merged
      mysql-test/r/range.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/r/sp-code.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/fulltext_left_join.test:
        Auto merged
      mysql-test/t/func_in.test:
        Auto merged
      mysql-test/t/range.test:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      4ee9e407
    • unknown's avatar
      after merge fix · e715019f
      unknown authored
      e715019f
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · d663a343
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/r/func_in.result:
        Auto merged
      mysql-test/r/range.result:
        Auto merged
      mysql-test/r/sp-code.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/r/udf.result:
        Auto merged
      mysql-test/t/func_in.test:
        Auto merged
      mysql-test/t/range.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      mysql-test/r/select.result:
        manual merge
      mysql-test/r/view.result:
        manual merge
      mysql-test/t/select.test:
        manual merge
      mysql-test/t/view.test:
        manual merge
      d663a343
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · e396abc9
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      e396abc9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 6bb5fd6b
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-bug24607
      
      
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      6bb5fd6b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines · e8ca911f
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-bug24607
      
      
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      e8ca911f