1. 02 Feb, 2007 3 commits
  2. 01 Feb, 2007 12 commits
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-axmrg · 8c6ebbd8
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      client/mysql.cc:
        Auto merged
      include/my_global.h:
        Auto merged
      include/thr_alarm.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      mysys/default.c:
        Auto merged
      mysys/my_pthread.c:
        Auto merged
      mysys/my_thr_init.c:
        Auto merged
      mysys/thr_alarm.c:
        Auto merged
      sql/field_conv.cc:
        Auto merged
      sql/gen_lex_hash.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      vio/viosslfactories.c:
        Auto merged
      BitKeeper/deleted/.del-mysqld.cc.rej:
        Delete: sql/mysqld.cc.rej
      BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb:
        Auto merged
      BitKeeper/deleted/.del-my_manage.c~4de50e721d227d19:
        Auto merged
      BitKeeper/deleted/.del-my_manage.h~9d2cbc1e8bc894f:
        Auto merged
      BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
        Null merged
      BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
        Null merged
      BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
        Auto merged
      BitKeeper/deleted/.del-mysql_test_run_new.dsp~9d8078f3f02fcc8e:
        Auto merged
      BitKeeper/deleted/.del-mysql_test_run_new.vcproj~1ddaed30361efefe:
        Auto merged
      BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp~e7ee71ec8d2995e3:
        Auto merged
      BUILD/SETUP.sh:
        Manual merged
      Makefile.am:
        Manual merged
      configure.in:
        Manual merged
      include/my_pthread.h:
        Manual merged
      mysql-test/Makefile.am:
        Manual merged
      sql/mysqld.cc:
        Manual merged
      support-files/mysql.spec.sh:
        Manual merged
      8c6ebbd8
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.1-axmrg · 41555dcd
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      BitKeeper/deleted/.del-valgrind.supp:
        Delete: mysql-test/valgrind.supp
      mysql-test/r/ps.result:
        SCCS merged
      mysql-test/r/symlink.result:
        Null merged
      mysql-test/t/ps.test:
        SCCS merged
      mysql-test/t/symlink.test:
        Null merged
      sql/field_conv.cc:
        Null merged
      sql/mysqld.cc:
        Null merged
      vio/viosslfactories.c:
        Null merged
      41555dcd
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 977d05c1
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      BUILD/SETUP.sh:
        Auto merged
      configure.in:
        Auto merged
      977d05c1
    • unknown's avatar
      Bug#25844: "make test" does not find mysql-test-run.pl · 991613e1
      unknown authored
      Need to change directory before calling mysql-test-run.pl
      
      991613e1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 6b6acacd
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-axmrg
      
      
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      6b6acacd
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 0dd09da0
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      mysql-test/t/merge.test:
        Auto merged
      0dd09da0
    • unknown's avatar
      Valgrind error fixes · 6aab89c5
      unknown authored
      Notes:
      This patch doesn't fix all issues in the tree and we need jani's fix for that
      This patch shoud not be merged into 5.0
      
      
      mysql-test/r/ps.result:
        result fix
      mysql-test/r/symlink.result:
        result fix
      mysql-test/t/ps.test:
        test is moved to 'symlink' test
      mysql-test/t/symlink.test:
        test from 'ps' test
      sql/field_conv.cc:
        valgrind error fix: backport from 5.0
      sql/mysqld.cc:
        release of ssl_context
      vio/viosslfactories.c:
        release of ssl_context
      mysql-test/valgrind.supp:
        New BitKeeper file ``mysql-test/valgrind.supp''
        This file is backported from 5.0, added suppressing of OpenSSL errors
      6aab89c5
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.1-axmrg · c7452cd6
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      include/my_global.h:
        Auto merged
      include/thr_alarm.h:
        Auto merged
      mysys/my_pthread.c:
        Auto merged
      mysys/thr_alarm.c:
        Auto merged
      include/my_pthread.h:
        Manual merged
      mysys/default.c:
        Manual merged
      mysys/my_thr_init.c:
        Manual merged
      sql/mysqld.cc:
        Manual merged
      c7452cd6
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 6aa2f37c
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      6aa2f37c
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.0-axmrg · 622cbf39
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-axmrg
      
      
      include/my_global.h:
        Auto merged
      include/my_pthread.h:
        Auto merged
      include/thr_alarm.h:
        Auto merged
      mysys/default.c:
        Auto merged
      mysys/my_pthread.c:
        Auto merged
      mysys/thr_alarm.c:
        Auto merged
      mysys/my_thr_init.c:
        Manual merged
      sql/mysqld.cc:
        Manual merged
      622cbf39
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 79fe1494
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-axmrg
      
      79fe1494
    • unknown's avatar
      Reworked a section of code that caused valgrind errors (and that partitioning... · 5c31f4c5
      unknown authored
      Reworked a section of code that caused valgrind errors (and that partitioning was not happy about). 
      
      
      storage/archive/ha_archive.cc:
        Put checks around the code
      5c31f4c5
  3. 31 Jan, 2007 10 commits
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · f4ffc764
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
      
      
      support-files/mysql.spec.sh:
        Auto merged
      f4ffc764
    • unknown's avatar
      MTR_BUILD_THREAD=auto for test runs during RPM build · 1ff0f010
      unknown authored
      
      support-files/mysql.spec.sh:
        MTR_BUILD_THREAD=auto for test runs
      1ff0f010
    • unknown's avatar
      Merge trift2.:/MySQL/M50/bug23293-5.0 · 68ce7550
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      68ce7550
    • unknown's avatar
      Merge trift2.:/MySQL/M50/bug12676-5.0 · 720c3576
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      configure.in:
        Auto merged
      720c3576
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/WL3567/mysql-5.0-engines · ac6cbd13
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/WL3567/mysql-5.1-engines
      
      
      mysql-test/r/merge.result:
        Auto merged
      mysql-test/t/merge.test:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Manually merged.
      storage/myisammrg/ha_myisammrg.cc:
        Manually merged.
      ac6cbd13
    • unknown's avatar
      After merge fix (WL#3567). · 3a84562c
      unknown authored
      3a84562c
    • unknown's avatar
      Fix bug#23293 "readline detection broken on NetBSD": · d28b5cec
      unknown authored
      Its root cause is a difference between the "readline" and "libedit" (header files)
      definitions of "rl_completion_entry_function", where the "libedit" one is wrong anyway:
      This variable is used as a pointer to a function returning "char *",
      but "libedit" declares it as returning "int" and then adds casts on usage.
      
      Change it to "CPFunction *" and get rid of the casts.
      
      
      client/mysql.cc:
        Fix bug#23293 "readline detection broken on NetBSD":
        
        Now that the "libedit" header files declares "rl_completion_entry_function" correctly,
        it need not be cast on usage, and "no_completion()" can be declared to return "char *".
      cmd-line-utils/libedit/readline.c:
        Fix bug#23293 "readline detection broken on NetBSD":
        
        Now that the "libedit" header files declares "rl_completion_entry_function" correctly,
        it need not be cast on usage, and "complet_func()" is a "CPFunction *" as well.
      cmd-line-utils/libedit/readline/readline.h:
        Fix bug#23293 "readline detection broken on NetBSD":
        
        Declare "rl_completion_entry_function()" to be a "CPFunction *", this avoids casts
        and brings "libedit" in sync with "readline".
      d28b5cec
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/WL3567/mysql-4.1-engines · 82a8ef7e
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/WL3567/mysql-5.0-engines
      
      
      mysql-test/t/merge.test:
        Auto merged
      mysql-test/r/merge.result:
        Manually merged.
      sql/ha_myisam.cc:
        Manually merged.
      sql/ha_myisammrg.cc:
        Manually merged.
      82a8ef7e
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines · effd1801
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/WL3567/mysql-4.1-engines
      
      effd1801
    • unknown's avatar
      WL#3567 - MERGE engine: a check for underlying table conformance · 0ab6e9f6
      unknown authored
      When a merge table is opened compare column and key definition of
      underlying tables against column and key definition of merge table.
      
      If any of underlying tables have different column/key definition
      refuse to open merge table.
      
      
      mysql-test/r/merge.result:
        A test case for WL#3456.
      mysql-test/t/merge.test:
        A test case for WL#3456.
      sql/ha_myisam.cc:
        Moved a part of code that converts TABLE object to MyISAM key and column
        definition to a separate function.
        
        Added check_definition() function that compares MyISAM table definitions.
      sql/ha_myisammrg.cc:
        Check if underlying table definition conforms to merge table definition,
        and in case underlying table definition differs, refuse to open merge
        table.
      0ab6e9f6
  4. 30 Jan, 2007 5 commits
    • unknown's avatar
      b0d63539
    • unknown's avatar
      gen_lex_hash.cc: · 06ea7ed5
      unknown authored
        If inserting a GPL header, include a complete one
      Makefile.am, mysql.dsw, mysql.sln:
        Removed C version of mysql-test-run
      mysql.spec.sh:
        Specify GPL license only in GPL sources
      .del-my_manage.h:
        Delete: mysql-test/my_manage.h
      mysql.spec.sh:
        Added GPL header
      .del-mysql_test_run_new.c:
        Delete: mysql-test/mysql_test_run_new.c
      .del-mysql_test_run_new.dsp:
        Delete: VC++Files/mysql-test/mysql_test_run_new.dsp
      .del-my_create_tables.c:
        Delete: mysql-test/my_create_tables.c
      .del-mysql_test_run_new_ia64.dsp:
        Delete: VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
      msql2mysql.sh:
        Use up-to-date GPL header
      .del-mysql_test_run_new.vcproj:
        Delete: VC++Files/mysql-test/mysql_test_run_new.vcproj
      .del-my_manage.c:
        Delete: mysql-test/my_manage.c
      
      
      scripts/msql2mysql.sh:
        Use up-to-date GPL header
      support-files/mysql.spec.sh:
        Added GPL header
      sql/gen_lex_hash.cc:
        If inserting a GPL header, include a complete one
      BitKeeper/deleted/.del-mysql_test_run_new.c:
        Delete: mysql-test/mysql_test_run_new.c
      BitKeeper/deleted/.del-mysql_test_run_new.dsp:
        Delete: VC++Files/mysql-test/mysql_test_run_new.dsp
      BitKeeper/deleted/.del-mysql_test_run_new.vcproj:
        Delete: VC++Files/mysql-test/mysql_test_run_new.vcproj
      BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp:
        Delete: VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
      BitKeeper/deleted/.del-my_create_tables.c:
        Delete: mysql-test/my_create_tables.c
      BitKeeper/deleted/.del-my_manage.c:
        Delete: mysql-test/my_manage.c
      BitKeeper/deleted/.del-my_manage.h:
        Delete: mysql-test/my_manage.h
      VC++Files/mysql.dsw:
        Removed C version of mysql-test-run
      VC++Files/mysql.sln:
        Removed C version of mysql-test-run
      mysql-test/Makefile.am:
        Removed C version of mysql-test-run
      06ea7ed5
    • unknown's avatar
      Merge bk://localhost:5559 · fb02a22b
      unknown authored
      into  production.mysql.com:/usersnfs/jamppa/mysql-4.0
      
      
      include/my_global.h:
        Auto merged
      include/my_pthread.h:
        Auto merged
      mysys/default.c:
        Auto merged
      mysys/my_pthread.c:
        Auto merged
      mysys/my_thr_init.c:
        Auto merged
      mysys/thr_alarm.c:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      fb02a22b
    • unknown's avatar
      Cleanup of thread-type (linuxthread or NTPL) detection code · dada1535
      unknown authored
      Move get_thread_lib to mysys/my_pthread.c
      Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms
      
      
      include/my_global.h:
        Fixed to be same as in 5.1
      include/my_pthread.h:
        Move things around to be more in line with rest of code
      mysys/default.c:
        Fixed two wrong pointer incrementations.
      mysys/my_pthread.c:
        Cleanup: Use variable thr_client_alarm
      mysys/my_thr_init.c:
        Detect thread library at startup.
        Set also thr_client_alarm signal here, so that we get
        it in init_signals() in mysqld
      mysys/thr_alarm.c:
        Set thr_client_alarm depending on which thread library we are using
      sql/mysqld.cc:
        Move get_thread_lib to mysys/my_pthread.c
      dada1535
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · fc321cfd
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-25530
      
      fc321cfd
  5. 29 Jan, 2007 4 commits
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch · 6b7d867c
      unknown authored
      into  zim.(none):/home/brian/mysql/archive-newformat-5.1
      
      6b7d867c
    • unknown's avatar
      Extended mysqlslap.c for auto tests (see the comment on the mysqlslap.c file).... · 3c380442
      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
      3c380442
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.1-axmrg · 432de623
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      BUILD/SETUP.sh:
        Auto merged
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      include/thr_alarm.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      mysys/my_pthread.c:
        Auto merged
      sql/item_func.cc:
        Auto merged
      include/my_pthread.h:
        Manual merged
      mysql-test/r/myisam.result:
        Manual merged
      mysys/thr_alarm.c:
        Manual merged
      sql/ha_ndbcluster.cc:
        Manual merged
      sql/mysqld.cc:
        Manual merged
      432de623
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · ab8e3ee5
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-axmrg
      
      
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      mysql-test/r/myisam.result:
        Manual merged
      mysql-test/t/myisam.test:
        Manual merged
      ab8e3ee5
  6. 27 Jan, 2007 1 commit
  7. 26 Jan, 2007 5 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · ab3abfec
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
      
      ab3abfec
    • unknown's avatar
      Two things: · 02d71f7b
      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
      02d71f7b
    • unknown's avatar
      For performance reasons we remove the ability in unique indexes on... · 0c1d02e4
      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
      0c1d02e4
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch · 4386c296
      unknown authored
      into  zim.(none):/home/brian/mysql/archive-newformat-5.1
      
      4386c296
    • unknown's avatar
      This fixes a bug in show create table displaying auto_increment field when it should not. · 91d802c4
      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
      91d802c4