1. 01 Feb, 2007 1 commit
  2. 30 Jan, 2007 1 commit
  3. 29 Jan, 2007 2 commits
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch · c8630927
      unknown authored
      into  zim.(none):/home/brian/mysql/archive-newformat-5.1
      
      
      c8630927
    • unknown's avatar
      Extended mysqlslap.c for auto tests (see the comment on the mysqlslap.c file).... · cdc6bd71
      unknown authored
      Extended mysqlslap.c for auto tests (see the comment on the mysqlslap.c file). I also fixed a bug where limit was not being reached. 
      
      
      client/client_priv.h:
        More options
      client/mysqlslap.c:
        Extended the auto-sql in the following ways:
        1) You can now specify a load type of either "mixed", "read", or "write". Not great, but a definite improvement.
        2) A new option allows you to specify how many rows are inserted for the "read" load. 
        
        I also fixed a bug where limit was not being reached by running threads.
      mysql-test/r/mysqlslap.result:
        Updated results
      cdc6bd71
  4. 27 Jan, 2007 1 commit
  5. 26 Jan, 2007 11 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 0447c1e5
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
      
      
      0447c1e5
    • unknown's avatar
      Two things: · 5b8985cf
      unknown authored
      1) Two small windows cleanups for Archive.
      2) Patch from Calvin for Falcon to be able to have its own I_S loaded. One example added for this, does hello world. 
      
      
      include/mysql/plugin.h:
        Added new I_S type.
      mysql-test/r/archive.result:
        Fixed not dropped table.
      mysql-test/t/archive.test:
        Added additional drop table
      sql/sql_plugin.cc:
        Adding support in for the I_S.
      sql/sql_show.cc:
        Added schema type for plugin I_S. Additional loops were added to pop these on to the end of requests.
      storage/archive/ha_archive.cc:
        Windwos typo
      5b8985cf
    • unknown's avatar
      For performance reasons we remove the ability in unique indexes on... · c95bc8dc
      unknown authored
      For performance reasons we remove the ability in unique indexes on autoincrements to remove the ability to insert key lower then the current autoincrement value.
      
      
      mysql-test/r/archive.result:
        Modified error output
      mysql-test/t/archive.test:
        Fix for the change in behavior
      storage/archive/ha_archive.cc:
        ifdef of the search record code
      c95bc8dc
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch · f69cfbf8
      unknown authored
      into  zim.(none):/home/brian/mysql/archive-newformat-5.1
      
      
      f69cfbf8
    • unknown's avatar
      This fixes a bug in show create table displaying auto_increment field when it should not. · 0bdc5a92
      unknown authored
      It also refactors the test case for Archive (removed two bad tests).
      
      
      mysql-test/r/archive.result:
        refactor archive test
      mysql-test/t/archive.test:
        Large  refactoring of Archive test
      storage/archive/ha_archive.cc:
        Updated comments.
        Added NULL packing hack
        Fixed bug in wrong display of auto increment in show create table
      0bdc5a92
    • unknown's avatar
      Fixed a warning. Added the -A option so that the autoincrement could be set outside of the file. · 45a46fa1
      unknown authored
      
      storage/archive/archive_reader.c:
        Add option to autoincrement file.
      storage/archive/ha_archive.cc:
        Fixed warning
      45a46fa1
    • 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
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · d6759bed
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
      
      
      d6759bed
    • unknown's avatar
      Made the example actually do something :) · 8664552c
      unknown authored
      It now demonstrates creating its own thread and shows off how to clean up after itself (creates a really simple heartbeat file)
      
      
      plugin/daemon_example/Makefile.am:
        Added additional include
      plugin/daemon_example/daemon_example.cc:
        Created heart beat code.
      8664552c
  6. 25 Jan, 2007 13 commits
  7. 24 Jan, 2007 11 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