ChangeSet
  1.2184.1.2 06/05/26 17:11:21 elliot@mysql.com +2 -0
  BUG#15868 InnoDB thread thrashing
  Restoring default innodb_thread_concurrency to 8
  This default now matches 5.0

  sql/mysqld.cc
    1.550 06/05/26 17:11:17 elliot@mysql.com +1 -1
    BUG#15868 InnoDB thread thrashing
    Restoring default innodb_thread_concurrency to 8

  mysql-test/r/innodb.result
    1.178 06/05/26 17:11:17 elliot@mysql.com +1 -1
    BUG#15868 InnoDB thread thrashing
    Restoring default innodb_thread_concurrency to 8

ChangeSet
  1.1810.1611.2 06/05/24 11:33:17 kent@mysql.com +1 -0
  configure.in:
    Changed version to 5.0.22

  configure.in
    1.245.46.4 06/05/24 11:32:34 kent@mysql.com +2 -2
    Changed version to 5.0.22

ChangeSet
  1.2185 06/05/24 13:28:24 holyfoot@deer.(none) +3 -0
  bug #19650 (Embedded crashes in 5.1.10)

  sql/sql_insert.cc
    1.202 06/05/24 13:25:01 holyfoot@mysql.com +2 -0
    code shouldn't work without row based replication

  sql/log.cc
    1.209 06/05/24 13:25:01 holyfoot@mysql.com +2 -4
    code shouldn't work without row based replication

  mysql-test/extra/binlog_tests/innodb_stat.test
    1.2 06/05/24 13:25:01 holyfoot@mysql.com +2 -0
    test doesn't work with the embedded server

ChangeSet
  1.1616.2593.2 06/05/24 01:05:20 kent@mysql.com +1 -0
  configure.in:
    Updated release number 4.1.16a

  configure.in
    1.201.66.1 06/05/24 01:04:58 kent@mysql.com +1 -1
    Updated release number 4.1.16a

ChangeSet
  1.1616.2593.1 06/05/24 00:55:53 kent@mysql.com +4 -0
  don't let bugfix for bug#8303 break the bugfix for bug#8378
  revert the fix for bug#8303
  correct the test for bug#8378

  tests/mysql_client_test.c
    1.51.29.1 06/05/24 00:54:56 kent@mysql.com +14 -7
    correct the test for bug#8378

  sql/sql_lex.cc
    1.97.22.1 06/05/24 00:54:56 kent@mysql.com +5 -25
    revert the fix for bug#8303

  mysql-test/t/ctype_sjis.test
    1.10 06/05/24 00:54:56 kent@mysql.com +1 -1
    updated

  mysql-test/r/ctype_sjis.result
    1.8.1.1 06/05/24 00:54:56 kent@mysql.com +2 -2
    updated

ChangeSet
  1.1810.1176.22 06/05/23 20:43:48 kent@mysql.com +1 -0
  configure.in:
    Changed version to 5.0.17c

  configure.in
    1.245.41.4 06/05/23 20:14:34 kent@mysql.com +1 -1
    Changed version to 5.0.17c

ChangeSet
  1.2184 06/05/23 17:47:17 kent@mysql.com +2 -0
  event_scheduler.h, event_scheduler.cc:
    Rename load_event() to load_named_event(), to avoid name clash on HP-UX

  sql/event_scheduler.h
    1.4 06/05/23 17:46:28 kent@mysql.com +1 -1
    Rename load_event() to load_named_event(), to avoid name clash on HP-UX

  sql/event_scheduler.cc
    1.4 06/05/23 17:46:28 kent@mysql.com +4 -4
    Rename load_event() to load_named_event(), to avoid name clash on HP-UX

ChangeSet
  1.2178.1.5 06/05/23 16:50:01 andrey@lmy004. +1 -0
  __FUNCTION__ is not available everywhere.
  make us see at least with gcc the function proto. this can be extended
  probably for windows too.
  Fix build on intelxeon3 (sun compiler and others)

  sql/event_scheduler.cc
    1.3 06/05/23 16:49:54 andrey@lmy004. +9 -2
    __FUNCTION__ is not available everywhere.
    make us see at least with gcc the function proto. this can be extended
    probably for windows too.

ChangeSet
  1.2178.1.4 06/05/23 15:01:23 andrey@lmy004. +2 -0
  update log_tables.test so it is less fragile

  mysql-test/t/log_tables.test
    1.9 06/05/23 15:01:14 andrey@lmy004. +3 -3
    update test so it is less fragile

  mysql-test/r/log_tables.result
    1.4 06/05/23 15:01:14 andrey@lmy004. +6 -6
    update result so test is less fragile

ChangeSet
  1.2178.1.3 06/05/23 13:32:22 andrey@lmy004. +4 -0
  various fixes after push of fix for bug#17619

  sql/mysqld.cc
    1.549 06/05/23 13:32:13 andrey@lmy004. +4 -1
    fix problem with --init-file which was expecting to be the only running
    thread. nevertheless Events should be started as close as possible to the
    place connections are handled.

  sql/event_scheduler.h
    1.3 06/05/23 13:32:12 andrey@lmy004. +1 -1
    fix build error with SUN compiler

  mysql-test/r/sp-threads.result
    1.7 06/05/23 13:32:12 andrey@lmy004. +1 -0
    update result

  mysql-test/r/not_embedded_server.result
    1.5 06/05/23 13:32:12 andrey@lmy004. +1 -0
    update result

ChangeSet
  1.2178.1.2 06/05/23 12:10:07 andrey@lmy004. +5 -0
  update result
  drop users at the end of events_stress

  mysql-test/t/events_stress.test
    1.4 06/05/23 12:10:00 andrey@lmy004. +4 -0
    drop users created in the test

  mysql-test/r/status.result
    1.11 06/05/23 12:10:00 andrey@lmy004. +5 -5
    update result

  mysql-test/r/sp_notembedded.result
    1.4 06/05/23 12:10:00 andrey@lmy004. +2 -0
    update result

  mysql-test/r/skip_name_resolve.result
    1.6 06/05/23 12:10:00 andrey@lmy004. +1 -0
    update result

  mysql-test/r/ps_1general.result
    1.59 06/05/23 12:10:00 andrey@lmy004. +1 -1
    update result

ChangeSet
  1.2178.1.1 06/05/23 10:49:09 andrey@lmy004. +2 -0
  make it less stressful. some pushbuild boxes cannot cope with it

  mysql-test/t/events_stress.test
    1.3 06/05/23 10:48:57 andrey@lmy004. +6 -6
    make it less stressful. some pushbuild boxes cannot cope with it

  mysql-test/r/events_stress.result
    1.4 06/05/23 10:48:57 andrey@lmy004. +4 -4
    make it less stressful. some pushbuild boxes cannot cope with it

ChangeSet
  1.2180 06/05/23 10:07:07 msvensson@neptunus.(none) +1 -0
  Bug#20002 Old --with-openssl and --with-yassl options just silently ignored
   - Terminate configure with error(and message) if --with-yassl or --with-openssl is used.

  config/ac-macros/ssl.m4
    1.2 06/05/23 10:06:53 msvensson@neptunus.(none) +12 -2
    Add error message if --with-yassl or --with-openssl is used

ChangeSet
  1.2179 06/05/23 09:25:07 msvensson@neptunus.(none) +1 -0
  Bug#20018 Class declared inside of function causes problem with gcc 2.95.3
   - Move class MY_HOOKS out of function

  sql/sql_insert.cc
    1.201 06/05/23 09:24:59 msvensson@neptunus.(none) +13 -13
    Move class MY_HOOKS out of function 'select_create::prepare'

ChangeSet
  1.2178 06/05/23 01:10:32 andrey@lmy004. +1 -0
  fix endianess on ppc. seems for sys_var_long_ptr we have to fetch
  var->save_result.ulonglong_value and not var->save_result.ulong_value

  sql/set_var.cc
    1.176 06/05/23 01:10:21 andrey@lmy004. +5 -4
    fix endianess on ppc. seems for sys_var_long_ptr we have to fetch
    var->save_result.ulonglong_value and not var->save_result.ulong_value

ChangeSet
  1.2177 06/05/23 00:19:02 andrey@lmy004. +3 -0
  fix win32 build after push for bug#17619

  sql/event_timed.cc
    1.53 06/05/23 00:18:54 andrey@lmy004. +0 -4
    remove unused code & variables

  sql/event_scheduler.h
    1.2 06/05/23 00:18:54 andrey@lmy004. +2 -2
    pthread_mutex_lock() is void on win32. This fixes the win32 build.

  sql/event_scheduler.cc
    1.2 06/05/23 00:18:54 andrey@lmy004. +7 -19
    remove unused variables
    fix win32 build problem - pthread_mutex_lock() is void there

ChangeSet
  1.2175 06/05/22 21:51:28 msvensson@shellback.(none) +1 -0
  Change = to == in ndbrequire

  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.32 06/05/22 21:51:23 msvensson@shellback.(none) +1 -1
    Change = to == in ndbrequire

ChangeSet
  1.2169.1.2 06/05/22 21:30:34 msvensson@shellback.(none) +1 -0
  Add m4.cpp to CMakeLists.txt for taocrypt

  extra/yassl/taocrypt/CMakeLists.txt
    1.7 06/05/22 21:30:28 msvensson@shellback.(none) +1 -1
    Add md4.cpp

ChangeSet
  1.2119.493.12 06/05/22 20:46:13 andrey@lmy004. +41 -0
  fix for bug #17619 Scheduler race conditions
  - Scheduler is either initialized at server start or never.
    Starting & stopping is now suspending & resuming.
  - The scheduler has clear OO interface
  - Now all calls to the scheduler are synchronous
  - GLOBAL event_scheduler uses thd::sys_var_tmp (see set_var.cc)
  - External API is encapsulated into class Events
  - Includes fixes for all comments of Kostja's review of 19.05.2005
  
  Starting to merge into 5.1-release (5.1.10) and push

  sql/event_scheduler.h
    1.1 06/05/22 20:46:02 andrey@lmy004. +254 -0

  sql/event_scheduler.h
    1.0 06/05/22 20:46:02 andrey@lmy004. +0 -0
    BitKeeper file /work/mysql-5.1-release-17619-try3/sql/event_scheduler.h

  sql/event_scheduler.cc
    1.1 06/05/22 20:46:01 andrey@lmy004. +2423 -0

  sql/table.cc
    1.213.1.1 06/05/22 20:46:01 andrey@lmy004. +1 -3
    Fix valgrind warning.

  sql/event_scheduler.cc
    1.0 06/05/22 20:46:01 andrey@lmy004. +0 -0
    BitKeeper file /work/mysql-5.1-release-17619-try3/sql/event_scheduler.cc

  sql/sql_yacc.yy
    1.475.1.1 06/05/22 20:45:59 andrey@lmy004. +17 -6
    remove FULL from SHOW EVENTS
    add SHOW SCHEDULER STATUS in debug builds

  sql/sql_show.cc
    1.330.1.1 06/05/22 20:45:59 andrey@lmy004. +13 -14
    fix verbosity handling (this will be obsoleted anyway by the fix for 17394).

  sql/sql_parse.cc
    1.540.1.5 06/05/22 20:45:58 andrey@lmy004. +41 -10
    refactor kill_one_thread() -> does the *dirty* work, and sql_kill
    just the reporting.
    add handler for SQLCOM_SHOW_SCHEDULER_STATUS

  sql/sql_lex.h
    1.228.2.1 06/05/22 20:45:58 andrey@lmy004. +2 -1
    new command SHOW SCHEDULER STATUS, available only in debug build and
    for debug purposes.

  sql/sql_error.h
    1.2 06/05/22 20:45:58 andrey@lmy004. +2 -0
    export warning_level_names

  sql/sql_db.cc
    1.134 06/05/22 20:45:58 andrey@lmy004. +1 -1
    get the error from evex_drop_schema_events

  sql/sql_class.h
    1.294 06/05/22 20:45:58 andrey@lmy004. +17 -6
    refactor thd::system_thread to be an enum . more type-safety

  sql/sql_class.cc
    1.258.1.1 06/05/22 20:45:58 andrey@lmy004. +12 -1
    refactor thd::system_thread to be an enum . more type-safety

  sql/share/errmsg.txt
    1.98.1.1 06/05/22 20:45:58 andrey@lmy004. +5 -1
    3 new error messages

  sql/set_var.h
    1.85.1.1 06/05/22 20:45:58 andrey@lmy004. +4 -3
    executor -> scheduler

  sql/set_var.cc
    1.164.7.1 06/05/22 20:45:58 andrey@lmy004. +67 -5
    move sys_var_event_executor::update() to set_var.cc
    executor -> scheduler
    use thd::sys_var_tmp

  sql/repl_failsafe.cc
    1.66 06/05/22 20:45:58 andrey@lmy004. +2 -1
    refactor thd::system_thread to be an enum

  sql/mysqld.cc
    1.534.16.2 06/05/22 20:45:58 andrey@lmy004. +28 -8
    In close_connections, called by kill_server() skip the main scheduler
    thread and use events_shutdown() for shutting down the scheduler, in the same
    manner it's done for RPL.
    Add a new value to --event-scheduler :
    0 <- No scheduler available
    1 <- Start with scheduler enabled
    2 <- Start with scheduler suspended

  sql/mysql_priv.h
    1.399.2.1 06/05/22 20:45:57 andrey@lmy004. +5 -1
    refactor kill_one_thread
    export sql_print_message_func and sql_print_message_handlers

  sql/log.cc
    1.208 06/05/22 20:45:57 andrey@lmy004. +8 -0
    move these from event_scheduler.cc

  sql/lex.h
    1.161 06/05/22 20:45:57 andrey@lmy004. +1 -0
    new word scheduler for SHOW SCHEDULER STATUS (available only debug builds)

  sql/event_timed.cc
    1.52 06/05/22 20:45:57 andrey@lmy004. +384 -192
    - fix calculation of time when ENDS is set (STARTS is always set)
    - during Event_timed::compile() set the right Security_ctx. Prevents a crash
          during Event_scheduler::load_events_from_db()
    - add Event_timed::kill_thread()
    - implement event_timed_*_equal()
    - made change_security_context() and restore_security_context() free functions.
    - Comments cleanups

  sql/event_priv.h
    1.21 06/05/22 20:45:57 andrey@lmy004. +41 -36
    - more things in the private header
    - remove event queue abstraction functions. tightly bind to QUEUE
    - export privately db_drop_event, db_find_event, db_create_event()
    - made change_security_context() and restore_security_context() free functions

  sql/event_executor.cc
    1.44 06/05/22 20:45:57 andrey@lmy004. +0 -995
    make it empty, will delete after that

  sql/event.h
    1.28 06/05/22 20:45:57 andrey@lmy004. +129 -201
    - add COND_finished so if one thread kills a running event it waits on this
    - export callback event_timed_definer_equal, event_timed_identifier_equal(),
      event_timed_name_equal and event_timed_db_equal()
      to be used by Event_scheduler::drop_matching_events()
    - cleanup event.h
    - encapsulated all external interface into class Events

  sql/event.cc
    1.40 06/05/22 20:45:57 andrey@lmy004. +425 -604
    - remove todo comments
    - remove unneded evex_queue abstraction functions
    - move events_init() and events_shutdown() from event_executor.cc to here
    - export db_create_event
    - remove evex_load_and_compile_event, part of class Event_scheduler
    - integrate the public interface found in event.h and used by sql_parse.cc
      to use the new class Event_scheduler.

  sql/cmakelists.txt
    1.18.1.1 06/05/22 20:45:57 andrey@lmy004. +1 -1
    executor -> scheduler

  sql/Makefile.am
    1.137.1.1 06/05/22 20:45:57 andrey@lmy004. +2 -2
    executor -> scheduler

  mysql-test/t/events_stress.test
    1.2 06/05/22 20:45:57 andrey@lmy004. +78 -36
    Rework the test to the new architecture of suspending/resuming.
    Use less events, no need for thousands, hundreds is still ok.

  mysql-test/t/events_scheduling.test
    1.4 06/05/22 20:45:57 andrey@lmy004. +3 -3
    broader test

  mysql-test/t/events_microsec.test
    1.3 06/05/22 20:45:57 andrey@lmy004. +5 -45
     Skip irrelevant for the current design tests - all events are loaded
        on server startup. Change in mysql.event will be visible on next server start.
        Don't use numeric error codes.

  mysql-test/t/events_logs_tests.test
    1.7 06/05/22 20:45:57 andrey@lmy004. +10 -9
    optimize the test a bit for speed

  mysql-test/t/events_bugs.test
    1.7 06/05/22 20:45:57 andrey@lmy004. +11 -11
    Skip irrelevant for the current design tests - all events are loaded
    on server startup. Change in mysql.event will be visible on next server start.
    Don't use numeric error codes.

  mysql-test/t/events.test
    1.29 06/05/22 20:45:57 andrey@lmy004. +27 -35
    optimize the test a bit for speed, save some seconds runtime
    remove FULL from SHOW EVENTS
    mostly use I_S.EVENTS

  mysql-test/t/disabled.def
    1.152.3.1 06/05/22 20:45:57 andrey@lmy004. +4 -4
    enable these tests

  mysql-test/r/events_stress.result
    1.1.1.1 06/05/22 20:45:57 andrey@lmy004. +43 -28
    update result

  mysql-test/r/events_scheduling.result
    1.3 06/05/22 20:45:57 andrey@lmy004. +6 -3
    update result

  mysql-test/r/events_microsec.result
    1.2.1.1 06/05/22 20:45:56 andrey@lmy004. +0 -46
    update result

  mysql-test/r/events_logs_tests.result
    1.6.1.1 06/05/22 20:45:56 andrey@lmy004. +12 -11
    update result

  mysql-test/r/events_bugs.result
    1.8.1.1 06/05/22 20:45:56 andrey@lmy004. +4 -4
    update result

  mysql-test/r/events.result
    1.32.1.1 06/05/22 20:45:56 andrey@lmy004. +25 -27
    update result

  libmysqld/Makefile.am
    1.89.1.1 06/05/22 20:45:56 andrey@lmy004. +1 -1
    executor -> scheduler

  BitKeeper/etc/ignore
    1.241 06/05/22 20:45:56 andrey@lmy004. +1 -0
    Added libmysqld/event_scheduler.cc to the ignore list

ChangeSet
  1.1810.1697.1 06/05/22 16:27:37 tomas@poseidon.ndb.mysql.com +1 -0
  ndb: corrected option handeling to give correct help in ndbd

  ndb/src/kernel/vm/Configuration.cpp
    1.39.7.1 06/05/22 16:27:22 tomas@poseidon.ndb.mysql.com +5 -3
    ndb: corrected option handeling to give correct help in ndbd

ChangeSet
  1.1810.1695.1 06/05/22 15:49:57 msvensson@shellback.(none) +20 -0
  Import from yaSSL
  Fixes for HPUX etc. 
  Don't define exceptions operator new on hpux as the linker will look for the function

  extra/yassl/taocrypt/src/Makefile.am
    1.13 06/05/22 15:49:49 msvensson@shellback.(none) +1 -1
    Add md4.cpp to Makefile.am

  extra/yassl/mySTL/stdexcept.hpp
    1.4 06/05/22 15:49:49 msvensson@shellback.(none) +2 -0
    Don't define exceptions operator new on hpux as the linker will look for the function

  extra/yassl/testsuite/test.hpp
    1.5 06/05/22 12:03:23 msvensson@shellback.(none)[msvensson] +7 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/test/test.cpp
    1.3 06/05/16 00:17:55 msvensson@shellback.(none)[msvensson] +53 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/taocrypt.dsp
    1.4 06/05/16 00:17:55 msvensson@shellback.(none)[msvensson] +8 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/template_instnt.cpp
    1.10 06/04/26 18:28:18 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/src/md4.cpp
    1.1 06/05/16 00:17:55 msvensson@shellback.(none)[msvensson] +154 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/runtime.hpp
    1.14 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +0 -4
    Import patch yassl.diff

  extra/yassl/taocrypt/src/md4.cpp
    1.0 06/05/16 00:17:55 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/yassl_import/my50-yassl_import/extra/yassl/taocrypt/src/md4.cpp

  extra/yassl/taocrypt/include/md4.hpp
    1.1 06/05/16 00:17:55 msvensson@shellback.(none)[msvensson] +65 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/block.hpp
    1.7 06/05/22 11:10:25 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp
    1.17 06/05/22 11:12:59 msvensson@shellback.(none)[msvensson] +10 -10
    Import patch yassl.diff

  extra/yassl/src/yassl_error.cpp
    1.5 06/05/15 01:40:59 msvensson@shellback.(none)[msvensson] +6 -0
    Import patch yassl.diff

  extra/yassl/src/timer.cpp
    1.7 06/05/22 14:49:55 msvensson@shellback.(none)[msvensson] +7 -5
    Import patch yassl.diff

  extra/yassl/src/template_instnt.cpp
    1.9 06/04/28 01:10:59 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/src/ssl.cpp
    1.15 06/05/16 00:17:55 msvensson@shellback.(none)[msvensson] +11 -1
    Import patch yassl.diff

  extra/yassl/src/socket_wrapper.cpp
    1.10 06/05/15 01:40:59 msvensson@shellback.(none)[msvensson] +14 -4
    Import patch yassl.diff

  extra/yassl/src/handshake.cpp
    1.9 06/05/16 00:17:55 msvensson@shellback.(none)[msvensson] +13 -2
    Import patch yassl.diff

  extra/yassl/include/socket_wrapper.hpp
    1.6 06/05/15 01:40:59 msvensson@shellback.(none)[msvensson] +4 -2
    Import patch yassl.diff

  extra/yassl/include/openssl/ssl.h
    1.11 06/05/16 00:17:55 msvensson@shellback.(none)[msvensson] +2 -1
    Import patch yassl.diff

  extra/yassl/examples/echoserver/echoserver.cpp
    1.3 06/05/22 11:59:03 msvensson@shellback.(none)[msvensson] +2 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/include/md4.hpp
    1.0 06/05/16 00:17:55 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/yassl_import/my50-yassl_import/extra/yassl/taocrypt/include/md4.hpp

ChangeSet
  1.1810.1349.98 06/05/22 16:10:53 gkodinov@mysql.com +4 -0
  Bug#18745: Test case 'func_group' fails if "classic" 5.0 configuration
  
  Moved the InnoDB related test from func_group.test to innodb_mysql.test

  mysql-test/t/innodb_mysql.test
    1.4 06/05/22 16:10:48 gkodinov@mysql.com +72 -0
    Moved a test to innodb_mysql

  mysql-test/t/func_group.test
    1.46 06/05/22 16:10:48 gkodinov@mysql.com +0 -71
    Moved a test to innodb_mysql

  mysql-test/r/innodb_mysql.result
    1.4 06/05/22 16:10:48 gkodinov@mysql.com +138 -0
    moved a test to innodb_mysql

  mysql-test/r/func_group.result
    1.47.1.1 06/05/22 16:10:48 gkodinov@mysql.com +0 -138
    Moved a test to innodb_mysql

ChangeSet
  1.1810.1349.96 06/05/21 11:04:57 pekka@mysql.com +4 -0
  ndb - bug#19956 (occurs only in v5.0)

  ndb/src/ndbapi/NdbOperationSearch.cpp
    1.24.1.1 06/05/21 11:03:25 pekka@mysql.com +14 -0
    bug#19956 - check var* length bytes and zero rest of value if any blob attribute

  ndb/src/ndbapi/NdbDictionaryImpl.hpp
    1.30.4.1 06/05/21 11:03:25 pekka@mysql.com +25 -0
    bug#19956 - check var* length bytes and zero rest of value if any blob attribute

  mysql-test/t/ndb_blob.test
    1.18 06/05/21 11:01:16 pekka@mysql.com +56 -0
    bug#19956 : var* pk

  mysql-test/r/ndb_blob.result
    1.15.1.4 06/05/21 11:01:16 pekka@mysql.com +66 -0
    bug#19956 : var* pk

ChangeSet
  1.1346.1.835 06/05/20 22:47:20 kent@mysql.com +1 -0
  mysql.spec.sh:
    Always compile position independent

  support-files/mysql.spec.sh
    1.61.1.35 06/05/20 22:46:00 kent@mysql.com +5 -0
    Always compile position independent

ChangeSet
  1.2166 06/05/20 14:12:42 kent@mysql.com +1 -0
  Makefile.am:
    Specify yaSSL .a file, not .la (bug#19966)
    Don't use Mac OS X "__.SYMDEF SORTED" file in archives

  libmysqld/Makefile.am
    1.90 06/05/20 14:04:57 kent@mysql.com +5 -5
    Specify yaSSL .a file, not .la (bug#19966)
    Don't use Mac OS X "__.SYMDEF SORTED" file in archives

ChangeSet
  1.2165 06/05/20 12:36:58 kent@mysql.com +47 -0
  Many files:
    Change mode to -rw-rw-r--

  storage/example/plug.in
    1.3 06/05/20 12:35:05 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  storage/archive/plug.in
    1.3 06/05/20 12:35:05 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  plugin/fulltext/configure.in
    1.3 06/05/20 12:35:05 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  plugin/fulltext/README
    1.2 06/05/20 12:35:05 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  plugin/fulltext/NEWS
    1.2 06/05/20 12:35:05 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  plugin/fulltext/ChangeLog
    1.2 06/05/20 12:35:05 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  plugin/fulltext/AUTHORS
    1.2 06/05/20 12:35:04 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/rpl_ndb_insert_ignore.test
    1.3 06/05/20 12:35:04 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/rpl_ndb_commit_afterflush.test
    1.3 06/05/20 12:35:03 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/events_logs_tests-master.opt
    1.3 06/05/20 12:35:03 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/binlog_row_mix_innodb_myisam-master.opt
    1.4 06/05/20 12:35:03 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/type_newdecimal-big.result
    1.3 06/05/20 12:35:02 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_stm_EE_err2.result
    1.3 06/05/20 12:35:02 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_row_mysqlbinlog.result
    1.3 06/05/20 12:35:01 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_row_log_innodb.result
    1.8 06/05/20 12:35:01 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_row_blob_myisam.result
    1.5 06/05/20 12:35:01 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_row_blob_innodb.result
    1.5 06/05/20 12:35:01 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_relay_space_innodb.result
    1.3 06/05/20 12:35:00 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_ndb_trig004.result
    1.2 06/05/20 12:35:00 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_ndb_UUID.result
    1.5 06/05/20 12:35:00 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_ndb_sp006.result
    1.2 06/05/20 12:34:59 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_ndb_row_001.result
    1.3 06/05/20 12:34:59 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_ndb_relayrotate.result
    1.2 06/05/20 12:34:59 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_ndb_multi_update3.result
    1.2 06/05/20 12:34:59 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_ndb_multi_update2.result
    1.2 06/05/20 12:34:59 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_ndb_log.result
    1.8 06/05/20 12:34:58 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_ndb_func003.result
    1.2 06/05/20 12:34:58 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_ndb_dd_advance.result
    1.6 06/05/20 12:34:58 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_ndb_charset.result
    1.4 06/05/20 12:34:58 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_ndb_blob2.result
    1.2 06/05/20 12:34:57 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_ndb_blob.result
    1.7 06/05/20 12:34:57 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_ndb_2myisam.result
    1.2 06/05/20 12:34:57 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_ndb_2innodb.result
    1.2 06/05/20 12:34:56 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_insert_id_pk.result
    1.2 06/05/20 12:34:56 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ndb_dd_disk2memory.result
    1.6 06/05/20 12:34:56 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ndb_dd_ddl.result
    1.9 06/05/20 12:34:56 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ndb_config2.result
    1.2 06/05/20 12:34:56 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/myisam-system.result
    1.2 06/05/20 12:34:55 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/federated_transactions.result
    1.2 06/05/20 12:34:55 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/events_stress.result
    1.2 06/05/20 12:34:55 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/events_microsec.result
    1.3 06/05/20 12:34:54 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/events_logs_tests.result
    1.7 06/05/20 12:34:54 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/events_bugs.result
    1.9 06/05/20 12:34:54 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/events.result
    1.33 06/05/20 12:34:53 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ctype_cp932_binlog_row.result
    1.3 06/05/20 12:34:53 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/binlog_row_binlog.result
    1.3 06/05/20 12:34:53 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/archive_bitfield.result
    1.4 06/05/20 12:34:53 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

ChangeSet
  1.2153.1.9 06/05/19 20:31:02 tomas@poseidon.ndb.mysql.com +1 -0
  ha_ndbcluster_binlog.cc:
    ndb: fix compile error on solaris

  sql/ha_ndbcluster_binlog.cc
    1.60 06/05/19 20:30:42 tomas@poseidon.ndb.mysql.com +2 -2
    ndb: fix compile error on solaris

ChangeSet
  1.2153.1.7 06/05/19 18:11:47 tomas@poseidon.ndb.mysql.com +1 -0
  ndb: moved startup order back for ndb binlog thread from previous push that seems to be causing startup issues

  sql/ha_ndbcluster_binlog.cc
    1.59 06/05/19 18:11:39 tomas@poseidon.ndb.mysql.com +14 -12
    ndb: moved startup order back for ndb binlog thread from previous push that seems to be causing startup issues

ChangeSet
  1.2153.4.1 06/05/19 17:34:50 tomas@poseidon.ndb.mysql.com +2 -0
  Bug #19885 master1 crash in ndb_condition_pushdown test
  - record structure wrongly deallocated during online alter on remote mysqld
  - change so that ndb handler allocates the buffer itself, so it can be reused after alter

  sql/ha_ndbcluster_binlog.cc
    1.58 06/05/19 17:34:42 tomas@poseidon.ndb.mysql.com +31 -8
    Bug #19885 master1 crash in ndb_condition_pushdown test
    - record structure wrongly deallocated during online alter on remote mysqld
    - change so that ndb handler allocates the buffer itself, so it can be reused after alter

  sql/ha_ndbcluster.h
    1.134 06/05/19 17:34:42 tomas@poseidon.ndb.mysql.com +1 -0
    Bug #19885 master1 crash in ndb_condition_pushdown test
    - record structure wrongly deallocated during online alter on remote mysqld
    - change so that ndb handler allocates the buffer itself, so it can be reused after alter

ChangeSet
  1.2153.3.1 06/05/19 16:17:38 jonas@perch.ndb.mysql.com +2 -0
  ndb -
    Fix recursive mutex lock in drop index (ndbapi programs only)

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
    1.58 06/05/19 16:17:35 jonas@perch.ndb.mysql.com +72 -73
    Fix recursive mutex lock in drop index (ndbapi programs only)

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.133 06/05/19 16:17:35 jonas@perch.ndb.mysql.com +3 -57
    Fix recursive mutex lock in drop index (ndbapi programs only)

ChangeSet
  1.2153.1.5 06/05/19 15:17:31 tulin@mysql.com +1 -0
  NdbEventOperationImpl.hpp:
    corrected compile error

ChangeSet
  1.2153.1.4 06/05/19 15:44:46 tomas@poseidon.ndb.mysql.com +2 -0
  ndb: changed to use mem root to allocate table structure for ndb share

  sql/ha_ndbcluster_binlog.cc
    1.57 06/05/19 15:44:37 tomas@poseidon.ndb.mysql.com +2 -7
    ndb: changed to use mem root to allocate table structure for ndb share

  sql/ha_ndbcluster.cc
    1.307 06/05/19 15:44:36 tomas@poseidon.ndb.mysql.com +0 -4
    ndb: changed to use mem root to allocate table structure for ndb share

  storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
    1.24 06/05/19 15:16:37 tulin@mysql.com +1 -1
    corrected compile error

ChangeSet
  1.2159.1.5 06/05/19 13:20:35 msvensson@neptunus.(none) +1 -0
  Change from --wioth-yassl to --with-ssl

  BUILD/compile-dist
    1.11 06/05/19 13:20:30 msvensson@neptunus.(none) +1 -1
    Change from --wioth-yassl to --with-ssl

ChangeSet
  1.1616.2591.1 06/05/19 13:07:24 msvensson@neptunus.(none) +2 -0
  Bug#15869  Cannot shutdown the server - it restarts
   - A segfault occured when the function 'kill_server' called 
     'my_sigset' with signal number 0. 'my_sigset' is a macro which
     uses 'sigaction' to install the signal handler with an invalid
     signal number will on most platforms return EINVAL but yields
     a segfauilt on IRIX 6.5
   - The server crash was detected by mysqld_safe and it was restarted although
     a shutdown was requested. 
   - Semantics of kill_server(0) is not known, leaving it intact

  sql/mysqld.cc
    1.356.98.24 06/05/19 13:07:20 msvensson@neptunus.(none) +2 -1
    Don't call my_sigset if signo is 0 

  include/my_pthread.h
    1.65.1.17 06/05/19 13:07:20 msvensson@neptunus.(none) +4 -2
    Check return value from sigaction with a DBUG_ASSERT
    Also DBUG_ASSERT if signal number 0 is passed

ChangeSet
  1.2153.2.1 06/05/19 12:54:12 tomas@poseidon.ndb.mysql.com +4 -0
  Bug #19395 mysqld does not always detect cluster shutdown

  storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
    1.23 06/05/19 12:54:04 tomas@poseidon.ndb.mysql.com +1 -1
    Bug #19395 mysqld does not always detect cluster shutdown

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.59 06/05/19 12:54:04 tomas@poseidon.ndb.mysql.com +2 -3
    Bug #19395 mysqld does not always detect cluster shutdown

  sql/ha_ndbcluster_binlog.cc
    1.56 06/05/19 12:54:04 tomas@poseidon.ndb.mysql.com +35 -30
    Bug #19395 mysqld does not always detect cluster shutdown

  sql/ha_ndbcluster.cc
    1.306 06/05/19 12:54:04 tomas@poseidon.ndb.mysql.com +10 -2
    Bug #19395 mysqld does not always detect cluster shutdown

ChangeSet
  1.1810.1691.1 06/05/19 09:59:34 jonas@perch.ndb.mysql.com +3 -0
  ndb - bug#19930
    Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"

  ndb/src/mgmsrv/Services.cpp
    1.45.20.1 06/05/19 09:59:31 jonas@perch.ndb.mysql.com +2 -0
    Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"

  ndb/src/common/util/SocketServer.cpp
    1.15.5.1 06/05/19 09:59:31 jonas@perch.ndb.mysql.com +35 -9
    Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"

  ndb/include/util/SocketServer.hpp
    1.6.4.1 06/05/19 09:59:31 jonas@perch.ndb.mysql.com +5 -3
    Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"

ChangeSet
  1.2153.1.1 06/05/18 23:38:07 tomas@poseidon.ndb.mysql.com +10 -0
      Bug #19395 mysqld does not always detect cluster shutdown
      Bug #17610 ndbapi: dropEventOperation leaves object behind, memleak

  storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
    1.22 06/05/18 23:37:53 tomas@poseidon.ndb.mysql.com +9 -5
    Bug #17610 ndbapi: dropEventOperation leaves object behind, memleak

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.58 06/05/18 23:37:53 tomas@poseidon.ndb.mysql.com +230 -108
    Bug #17610 ndbapi: dropEventOperation leaves object behind, memleak

  storage/ndb/src/ndbapi/Ndb.cpp
    1.70 06/05/18 23:37:53 tomas@poseidon.ndb.mysql.com +6 -0
    Bug #19395 mysqld does not always detect cluster shutdown

  storage/ndb/src/kernel/blocks/suma/Suma.cpp
    1.42 06/05/18 23:37:53 tomas@poseidon.ndb.mysql.com +16 -1
    Bug #17610 ndbapi: dropEventOperation leaves object behind, memleak

  storage/ndb/include/ndbapi/NdbDictionary.hpp
    1.75 06/05/18 23:37:53 tomas@poseidon.ndb.mysql.com +2 -1
    Bug #17610 ndbapi: dropEventOperation leaves object behind, memleak

  storage/ndb/include/ndbapi/Ndb.hpp
    1.50 06/05/18 23:37:53 tomas@poseidon.ndb.mysql.com +1 -0
    Bug #19395 mysqld does not always detect cluster shutdown

  sql/ha_ndbcluster_binlog.cc
    1.55 06/05/18 23:37:53 tomas@poseidon.ndb.mysql.com +3 -0
    Bug #19395 mysqld does not always detect cluster shutdown

  mysql-test/t/ndb_autodiscover3.test
    1.4 06/05/18 23:37:53 tomas@poseidon.ndb.mysql.com +4 -0
    Bug #19395 mysqld does not always detect cluster shutdown

  mysql-test/t/disabled.def
    1.157 06/05/18 23:37:53 tomas@poseidon.ndb.mysql.com +1 -1
    Bug #19395 mysqld does not always detect cluster shutdown

  mysql-test/r/ndb_autodiscover3.result
    1.5 06/05/18 23:37:53 tomas@poseidon.ndb.mysql.com +4 -0
    Bug #19395 mysqld does not always detect cluster shutdown

ChangeSet
  1.2159.4.2 06/05/18 21:40:52 lars@mysql.com +5 -0
  After merge fixes

  sql/sql_base.cc
    1.324 06/05/18 21:40:39 lars@mysql.com +8 -3
    After merge fixes

  sql/mysql_priv.h
    1.404 06/05/18 21:40:35 lars@mysql.com +0 -11
    After merge fixes

  mysql-test/t/rpl_temporary.test
    1.24 06/05/18 21:40:34 lars@mysql.com +1 -1
    After merge fixes

  mysql-test/r/rpl_temporary.result
    1.29 06/05/18 21:40:31 lars@mysql.com +0 -1
    After merge fixes

  mysql-test/r/rpl_stm_until.result
    1.26 06/05/18 21:40:31 lars@mysql.com +9 -9
    After merge fixes

ChangeSet
  1.1810.1690.2 06/05/18 10:34:01 jimw@mysql.com +3 -0
  Bug #13975: "same string" + 0 has 2 different results
  
    The 'decimals' member of Item_func was being improperly initialized,
    which resulted in improper results when handling large numeric values.

  sql/item_strfunc.h
    1.101.1.5 06/05/18 10:33:57 jimw@mysql.com +1 -1
    Remove unnecessary reset of decimals in Item_func_conv::fix_length_and_dec().

  mysql-test/t/func_str.test
    1.87 06/05/18 10:33:57 jimw@mysql.com +6 -0
    Add new regression test

  mysql-test/r/func_str.result
    1.110.1.3 06/05/18 10:33:57 jimw@mysql.com +6 -0
    Add test results

ChangeSet
  1.2159.3.2 06/05/18 18:11:54 msvensson@neptunus.(none) +1 -0
  Fix "glibc detected double free"
  Remove extra call to vio_end

  sql/mysqld.cc
    1.545 06/05/18 18:11:49 msvensson@neptunus.(none) +0 -1
    Remove the second call to vio_end as it should only be called once when the server shutdown.

ChangeSet
  1.2159.2.2 06/05/18 13:35:15 knielsen@mysql.com +4 -0
  After-merge fix.

  sql/sql_insert.cc
    1.200 06/05/18 13:35:11 knielsen@mysql.com +14 -5
    After-merge fixes

  mysql-test/t/trigger-grant.test
    1.11 06/05/18 13:35:11 knielsen@mysql.com +1 -1
    After-merge fixes

  mysql-test/r/trigger-grant.result
    1.10 06/05/18 13:35:11 knielsen@mysql.com +1 -1
    After-merge fixes

  mysql-test/r/sp.result
    1.206 06/05/18 13:35:11 knielsen@mysql.com +2 -2
    After-merge fixes

ChangeSet
  1.1810.1689.1 06/05/18 16:46:48 stewart@mysql.com +1 -0
  BUG#13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd
  
  A further reduction in CPU usage by ndb_mgmd with failed data nodes.

  ndb/src/common/util/socket_io.cpp
    1.7.1.1 06/05/18 16:46:40 stewart@mysql.com +39 -31
    Use a nonblocking socket to peek at the buffer to know how much to read for socket_readln.
    
    This saves us a lot of syscalls. By a lot, I've observed about halving the CPU
    usage of ndb_mgmd with 1 failed node on a 6 node cluster.

ChangeSet
  1.1810.1650.24 06/05/17 20:48:48 igor@rurik.mysql.com +3 -0
  Fixed bug #19816.
  This bug was introduced when the patch resolving the
  performance problem 17164 was applied. As a result
  of that modification the not_null_tables attributes
  were calculated incorrectly for constant OR conditions.
  This triggered invalid conversion of outer joins into
  inner joins.

  sql/item_cmpfunc.cc
    1.187.4.1 06/05/17 20:48:38 igor@rurik.mysql.com +3 -1
    Fixed bug #19816.
    This bug was introduced when the patch resolving the
    performance problem 17164 was applied. As a result
    of that modification the not_null_tables attributes
    were calculated incorrectly for constant OR conditions.
    This triggered invalid conversion of outer joins into
    inner joins.

  mysql-test/t/join_outer.test
    1.37 06/05/17 20:48:37 igor@rurik.mysql.com +18 -0
    Added a test case for bug #19816.

  mysql-test/r/join_outer.result
    1.44.1.4 06/05/17 20:48:37 igor@rurik.mysql.com +37 -2
    Added a test case for bug #19816.

ChangeSet
  1.2159 06/05/18 00:42:07 kent@mysql.com +2 -0
  type_newdecimal.result, case.result:
    Adjusted merge

  mysql-test/r/type_newdecimal.result
    1.44 06/05/18 00:40:47 kent@mysql.com +2 -2
    Adjusted merge

  mysql-test/r/case.result
    1.29 06/05/17 23:57:33 kent@mysql.com +3 -3
    Adjusted merge

ChangeSet
  1.1810.1687.1 06/05/18 00:55:28 evgen@moonbone.local +9 -0
  Fixed bug#19077: A nested materialized derived table is used before being populated.
  
  The convert_constant_item() function converts constant items to ints on
  prepare phase to optimize execution speed. In this case it tries to evaluate
  subselect which contains a derived table and is contained in a derived table. 
  All derived tables are filled only after all derived tables are prepared.
  So evaluation of subselect with derived table at the prepare phase will
  return a wrong result.
  
  A new flag with_subselect is added to the Item class. It indicates that
  expression which this item represents is a subselect or contains a subselect.
  It is set to 0 by default. It is set to 1 in the Item_subselect constructor
  for subselects.
  For Item_func and Item_cond derived classes it is set after fixing any argument
  in Item_func::fix_fields() and Item_cond::fix_fields accordingly.
  The convert_constant_item() function now doesn't convert a constant item
  if the with_subselect flag set in it. 

  sql/item.h
    1.183.1.14 06/05/18 00:53:32 evgen@moonbone.local +3 -0
    Fixed bug#19077: A nested materialized derived table is used before being populated.
    A new flag with_subselect is added to the Item class. It indicates that
    expression which this item represents is a subselect or contains a subselect.
    It is set to 0 by default.

  sql/item.cc
    1.113.44.1 06/05/18 00:52:54 evgen@moonbone.local +1 -0
    Fixed bug#19077: A nested materialized derived table is used before being populated.
    Set new with_subselect flag to default value - 0 in the Item constructor.

  sql/item_cmpfunc.cc
    1.187.1.14 06/05/18 00:52:19 evgen@moonbone.local +24 -5
    Fixed bug#19077: A nested materialized derived table is used before being populated.
    The convert_constant_item() function now doesn't convert a constant item
    with the with_subselect flag set.
    The Item_cond::fix_fields() sets new with_subselect flag from with_subselect flags of its arguments.

  sql/item_func.cc
    1.270.1.17 06/05/18 00:51:53 evgen@moonbone.local +1 -0
    Fixed bug#19077: A nested materialized derived table is used before being populated.
    
    The Item_func::fix_fields() sets new with_subselect flag from with_subselect flags of its arguments.

  sql/item_subselect.cc
    1.113.1.12 06/05/18 00:51:35 evgen@moonbone.local +1 -0
    Fixed bug#19077: A nested materialized derived table is used before being populated.
    The Item_subselect class constructor sets new with_subselect flag to 1.

  mysql-test/r/subselect.result
    1.134.1.9 06/05/18 00:51:16 evgen@moonbone.local +6 -0
    Added test case for bug#19077: A nested materialized derived table is used before being populated.

  mysql-test/r/view.result
    1.138.5.1 06/05/18 00:51:12 evgen@moonbone.local +9 -0
    Added test case for bug#19077: A nested materialized derived table is used before being populated.

  mysql-test/t/subselect.test
    1.118 06/05/18 00:50:57 evgen@moonbone.local +9 -0
    Added test case for bug#19077: A nested materialized derived table is used before being populated.

  mysql-test/t/view.test
    1.126.7.1 06/05/18 00:50:47 evgen@moonbone.local +11 -0
    Added test case for bug#19077: A nested materialized derived table is used before being populated.

ChangeSet
  1.1810.1684.2 06/05/17 19:08:18 joerg@mysql.com +1 -0
  Include "config.h" (if it exists) in all yaSSL files via their "runtime.hpp".
  Fixes bug#19040 "yaSSL does not compile on AIX".

  extra/yassl/taocrypt/include/runtime.hpp
    1.13 06/05/17 19:08:12 joerg@mysql.com +4 -0
    Include "config.h" (if it exists) in all yaSSL files. This is needed to ensure the same 
    configure settings are used for yaSSL as for the other modules linked together.
    Example: the settings for "large file" on AIX.
    Fixes bug#19040 "yaSSL does not compile on AIX".

ChangeSet
  1.2119.546.5 06/05/17 15:01:48 knielsen@mysql.com +1 -0
  After-merge fixes.

  dbug/dbug.c
    1.27 06/05/17 15:01:44 knielsen@mysql.com +14 -8
    After-merge fixes.

ChangeSet
  1.2119.541.4 06/05/17 13:59:37 msvensson@neptunus.(none) +7 -0
  BUG#18818 configure: No longer finds OpenSSL on Mac OS X
   - Implement new switch --with-ssl to configure used for both bundled yaSSL or OpenSSL

  config/ac-macros/ssl.m4
    1.1 06/05/17 13:59:32 msvensson@neptunus.(none) +200 -0
    New BitKeeper file ``config/ac-macros/ssl.m4''

  configure.in
    1.349.1.2 06/05/17 13:59:32 msvensson@neptunus.(none) +2 -4
    Change to use the MYSQL_CHECK_SSL macro from ssl.m4

  config/ac-macros/ssl.m4
    1.0 06/05/17 13:59:32 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug18818/my51-bug18818/config/ac-macros/ssl.m4

  BUILD/compile-pentium-debug-yassl
    1.3 06/05/17 13:59:32 msvensson@neptunus.(none) +1 -1
    Use switch --with-ssl to configure

  BUILD/compile-pentium-debug-openssl
    1.5 06/05/17 13:59:32 msvensson@neptunus.(none) +1 -1
    Use switch --with-ssl to configure

  BUILD/SETUP.sh
    1.60 06/05/17 13:59:32 msvensson@neptunus.(none) +5 -2
    Use switch --with-ssl to configure

  BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769
    1.8 06/05/17 13:57:05 msvensson@neptunus.(none) +0 -0
    Delete: config/ac-macros/openssl.m4

  BitKeeper/deleted/.del-yassl.m4~e55e55c1e863abaf
    1.18 06/05/17 13:57:02 msvensson@neptunus.(none) +0 -0
    Delete: config/ac-macros/yassl.m4

ChangeSet
  1.2152 06/05/17 08:34:48 tomas@poseidon.ndb.mysql.com +5 -0
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  storage/ndb/tools/desc.cpp
    1.24 06/05/17 08:34:41 tomas@poseidon.ndb.mysql.com +7 -1
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
    - added retry option so that ndb_desc can be used to wait for a table to be created

  storage/ndb/src/ndbapi/DictCache.cpp
    1.25 06/05/17 08:34:41 tomas@poseidon.ndb.mysql.com +14 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
    - cache not released properly

  sql/ha_ndbcluster_binlog.cc
    1.54 06/05/17 08:34:41 tomas@poseidon.ndb.mysql.com +2 -1
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
    - small correction of previous patch

  mysql-test/t/ndb_autodiscover3.test
    1.3 06/05/17 08:34:41 tomas@poseidon.ndb.mysql.com +6 -2
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  mysql-test/r/ndb_autodiscover3.result
    1.4 06/05/17 08:34:41 tomas@poseidon.ndb.mysql.com +4 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

ChangeSet
  1.1810.1650.23 06/05/16 22:19:44 igor@rurik.mysql.com +4 -0
  Fixed bug #19573.
  The select statement that specified a view could be
  slightly changed when the view was saved in a frm file.
  In particular references to an alias name in the HAVING
  clause could be substituted for the expression named by
  this alias.
  This could result in an error message for a query of
  the form SELECT * FROM <view>. Yet no such message
  appeared when executing the query specifying the view.

  sql/item.cc
    1.113.1.110 06/05/16 22:19:36 igor@rurik.mysql.com +10 -1
    Fixed bug #19573.
    The select statement that specified a view could be
    slightly changed when the view was saved in a frm file.
    In particular references to an alias name in the HAVING
    clause could be substituted for the expression named by
    this alias.
    This could result in an error message for a query of
    the form SELECT * FROM <view>. Yet no such message
    appeared when executing the query specifying the view.  

  mysql-test/t/view.test
    1.126.1.18 06/05/16 22:19:36 igor@rurik.mysql.com +28 -0
    Added a test case for bug #19573.

  mysql-test/r/view.result
    1.138.1.19 06/05/16 22:19:36 igor@rurik.mysql.com +25 -0
    Added a test case for bug #19573.

  mysql-test/r/having.result
    1.26 06/05/16 22:19:36 igor@rurik.mysql.com +1 -1
    Adjusted results after fixing bug #19573.

ChangeSet
  1.1616.2588.5 06/05/17 00:22:43 tomas@poseidon.ndb.mysql.com +2 -0
      ndb: added some missing error codes to mgmapi
      ndb: ndb_waiter disconnect/reconnect on get status error

  ndb/tools/waiter.cpp
    1.19.1.3 06/05/17 00:22:37 tomas@poseidon.ndb.mysql.com +6 -0
    ndb: ndb_waiter disconnect/reconnect on get status error

  ndb/src/mgmapi/mgmapi.cpp
    1.23.1.8 06/05/17 00:22:37 tomas@poseidon.ndb.mysql.com +3 -0
    ndb: added some missing error codes to mgmapi

ChangeSet
  1.2119.493.11 06/05/16 22:47:22 kent@mysql.com +7 -0
  mysql.spec.sh:
    Removed Berkeley DB
  configure.in:
    Adjusted Netware support
  basic.t.c:
    Change for Netware
  Makefile.am:
    Use thread safe libmysqlclient_r if it was built
  valgrind.supp:
    Hide report about strlen/_dl_init_paths
  ha_tina.cc:
    Temporarely disable CSV engine on Netware,
    as the engine depends on mmap()
  net_serv.cc:
    Include <sys/select.h> for Netware

  support-files/mysql.spec.sh
    1.140.1.1 06/05/16 22:44:47 kent@mysql.com +4 -1
    Removed Berkeley DB

  configure.in
    1.347.2.1 06/05/16 22:35:29 kent@mysql.com +4 -23
    Adjusted Netware support

  unittest/mytap/t/basic.t.c
    1.4 06/05/16 22:35:07 kent@mysql.com +1 -1
    Change for Netware

  tests/Makefile.am
    1.27.1.1 06/05/16 22:34:43 kent@mysql.com +8 -1
    Use thread safe libmysqlclient_r if it was built

  mysql-test/valgrind.supp
    1.7 06/05/16 22:34:02 kent@mysql.com +9 -0
    Hide report about strlen/_dl_init_paths

  storage/csv/ha_tina.cc
    1.45 06/05/16 22:23:46 kent@mysql.com +6 -0
    Temporarely disable CSV engine on Netware,
    as the engine depends on mmap()

ChangeSet
  1.2149 06/05/16 20:56:45 tomas@poseidon.ndb.mysql.com +6 -0
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
  - adoptions to handle binlog

  storage/ndb/src/ndbapi/Ndb.cpp
    1.69 06/05/16 20:56:38 tomas@poseidon.ndb.mysql.com +3 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
    - adoptions to handle binlog

  storage/ndb/src/ndbapi/ClusterMgr.hpp
    1.11 06/05/16 20:56:38 tomas@poseidon.ndb.mysql.com +6 -1
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
    - adoptions to handle binlog

  storage/ndb/src/ndbapi/ClusterMgr.cpp
    1.26 06/05/16 20:56:38 tomas@poseidon.ndb.mysql.com +13 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
    - adoptions to handle binlog

  sql/ha_ndbcluster_binlog.cc
    1.53 06/05/16 20:56:38 tomas@poseidon.ndb.mysql.com +100 -4
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
    - adoptions to handle binlog

  mysql-test/t/ndb_autodiscover3.test
    1.2 06/05/16 20:56:38 tomas@poseidon.ndb.mysql.com +6 -3
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
    - adoptions to handle binlog

  mysql-test/r/ndb_autodiscover3.result
    1.3 06/05/16 20:56:38 tomas@poseidon.ndb.mysql.com +6 -6
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
    - adoptions to handle binlog

ChangeSet
  1.1616.2589.1 06/05/16 16:50:05 aelkin@mysql.com +1 -0
  BUG#14157: utf8 encoding in binlog without set character_set_client: e.g DROP temporary
  
  fixing encoding example because of table names can not be in koi8r 
  on some platforms.

  mysql-test/t/rpl_temporary.test
    1.13.1.7 06/05/16 16:47:38 aelkin@mysql.com +1 -1
    koi8r encoding to name tables is changed for latin1 for the former does not work
    on some platforms.
    The effect of the test remains: a test table is named to have multibyte utf8 representation,
    which is the essence of the bug.

ChangeSet
  1.2119.549.2 06/05/16 15:38:21 jmiller@mysql.com +4 -0
  Updated to fix bug in AIX

  mysql-test/r/rpl_row_log_innodb.result
    1.7 06/05/16 15:37:55 jmiller@mysql.com +4 -0
    New results file

  mysql-test/r/rpl_row_log.result
    1.8 06/05/16 15:37:48 jmiller@mysql.com +4 -0
    New results file

  mysql-test/r/rpl_stm_log.result
    1.68 06/05/16 15:37:39 jmiller@mysql.com +4 -0
    New results file

  mysql-test/extra/rpl_tests/rpl_log.test
    1.37 06/05/16 15:37:17 jmiller@mysql.com +0 -4
    Remove disable log per lars

ChangeSet
  1.2119.549.1 06/05/16 14:59:44 jmiller@mysql.com +1 -0
  rpl_log.test:
    Fix for failure in aix52 failure during push build

  mysql-test/extra/rpl_tests/rpl_log.test
    1.36 06/05/16 14:59:13 jmiller@mysql.com +1 -1
    Fix for failure in aix52 failure during push build

ChangeSet
  1.2143.2.1 06/05/16 12:05:15 andrey@lmy004. +1 -0
  disable events_logs_tests

  mysql-test/t/disabled.def
    1.154.1.1 06/05/16 12:05:06 andrey@lmy004. +1 -0
    disable events_logs_tests

ChangeSet
  1.2148 06/05/16 11:17:04 tulin@production.mysql.com +1 -0
  information_schema.result:
    corrected merge

ChangeSet
  1.1616.2588.4 06/05/16 11:47:33 tomas@poseidon.ndb.mysql.com +2 -0
  Bug #18591 Repeated "show" and "all status" calls to ndb_mgm causes mgmd to crash
  - not having lock can cause "block number list" to become corrupt => crash
  - also may result in 2 threads receiving same block no => possble cause of
  Bug #13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd

  ndb/src/ndbapi/SignalSender.cpp
    1.2.1.3 06/05/16 11:47:26 tomas@poseidon.ndb.mysql.com +2 -0
    Bug #18591 Repeated "show" and "all status" calls to ndb_mgm causes mgmd to crash
    - not having lock can cause "block number list" to become corrupt => crash
    - also may result in 2 threads receiving same block no => possble cause of
    Bug #13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.51.1.23 06/05/16 11:47:26 tomas@poseidon.ndb.mysql.com +1 -0
    ndb: added missing lock of mutex

ChangeSet
  1.1810.1677.2 06/05/16 13:39:03 sergefp@mysql.com +1 -0
  BUG#19618: post-review fixes: better comments

  sql/opt_range.cc
    1.159.1.53 06/05/16 13:38:56 sergefp@mysql.com +39 -21
    BUG#19618: post-review fixes: better comments

ChangeSet
  1.2146 06/05/16 11:32:43 tomas@poseidon.ndb.mysql.com +1 -0
  corrected merge

  storage/ndb/src/ndbapi/TransporterFacade.hpp
    1.32 06/05/16 11:32:36 tomas@poseidon.ndb.mysql.com +1 -1
    corrected merge

  mysql-test/r/information_schema.result
    1.121 06/05/16 11:14:12 tulin@production.mysql.com +1 -1
    corrected merge

ChangeSet
  1.1810.1683.2 06/05/16 10:01:07 lars@mysql.com +2 -0
  Test used a charset not available on many platforms

  mysql-test/t/mysqlbinlog.test
    1.21.1.6 06/05/16 10:00:52 lars@mysql.com +10 -5
    Test used a charset not available on many platforms

  mysql-test/r/mysqlbinlog.result
    1.23 06/05/16 10:00:52 lars@mysql.com +1 -5
    Test used a charset not available on many platforms

ChangeSet
  1.1810.1683.1 06/05/16 09:26:57 lars@mysql.com +1 -0
  Fixed result file (rpl_temporary)

  mysql-test/r/rpl_temporary.result
    1.18.1.8 06/05/16 09:26:46 lars@mysql.com +12 -3
    Fixed result file

ChangeSet
  1.2142 06/05/16 03:32:24 tnurnberg@mysql.com +5 -0
  Bug#18997: DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value
  if input year for date_add() / date_sub() with INTERVAL is low enough for
  calc_daynr() to possibly return incorrect results (calc_daynr() has no information
  on whether the year is low because it was a two-digit year ('77) or because it
  was a really low four-digit year (0077) and will indiscriminately try to turn the
  value into a four-digit year by adding 1900 or 2000 respectively), the functions
  will now throw NULL.

  sql/item_timefunc.cc
    1.117 06/05/16 03:32:17 tnurnberg@mysql.com +3 -0
    throw NULL when year in date_add() / date_sub() would be affected by
    2 digit -> 4 digit magic.

  sql-common/my_time.c
    1.20 06/05/16 03:32:17 tnurnberg@mysql.com +1 -1
    use new const YY_MAGIC_BELOW, apply 2-digit -> 4-digit magic only to years
    below this threshold.

  mysql-test/t/func_time.test
    1.42 06/05/16 03:32:17 tnurnberg@mysql.com +21 -10
    test where 2 digit -> 4 digit year magic kicks in, and whether we throw NULL when
    it happens

  mysql-test/r/func_time.result
    1.52 06/05/16 03:32:17 tnurnberg@mysql.com +39 -18
    test where 2 digit -> 4 digit year magic kicks in, and whether we throw NULL when
    it happens

  include/my_time.h
    1.13 06/05/16 03:32:17 tnurnberg@mysql.com +3 -0
    new define YY_MAGIC_BELOW: if year is below this threshold, magic kicks in in
    calc_daynr(). the idea is to convert two-digit years to four-digit ones, adding
    1900 to values >= YY_PART_YEAR or adding 2000 otherwise.
    current value of YY_MAGIC_BELOW derived from original code in calc_daynr()

  sql/net_serv.cc
    1.90 06/05/16 01:14:51 kent@mysql.com +4 -0
    Include <sys/select.h> for Netware

ChangeSet
  1.2139 06/05/16 01:12:12 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
  Removed double enum value.

  client/client_priv.h
    1.58 06/05/16 01:12:03 jani@a193-229-222-105.elisa-laajakaista.fi +0 -1
    Removed double enum value.

ChangeSet
  1.2119.548.1 06/05/15 14:58:48 cmiller@zippy.(none) +1 -0
  Porting fix of Bug#19564 from 5.0/5.1 trees.

  client/mysql.cc
    1.206.2.1 06/05/15 14:58:44 cmiller@zippy.(none) +1 -2
    No longer use the length of data to infer whether it is null.

ChangeSet
  1.1810.1680.2 06/05/15 20:29:50 tomas@poseidon.ndb.mysql.com +1 -0
  correction of merge

  sql/ha_ndbcluster.cc
    1.175.1.72 06/05/15 20:29:44 tomas@poseidon.ndb.mysql.com +1 -1
    correction of merge

ChangeSet
  1.2119.493.9 06/05/15 20:05:12 msvensson@neptunus.(none) +1 -0
  Bug#19804 Tests run with valgrind shows uninitialised value in yaSSL
   - memset Connection.sessionID_ in Connection contructor
   - From upstream yaSSL

ChangeSet
  1.2119.493.8 06/05/15 20:24:50 tomas@poseidon.ndb.mysql.com +2 -0
  ndb: dict cache reference not released as it should

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.132 06/05/15 20:24:42 tomas@poseidon.ndb.mysql.com +5 -2
    ndb: dict cache reference not released as it should

  storage/ndb/src/ndbapi/DictCache.cpp
    1.23 06/05/15 20:24:41 tomas@poseidon.ndb.mysql.com +2 -2
    changed dbug printout

  extra/yassl/src/yassl_imp.cpp
    1.7.1.1 06/05/15 20:05:02 msvensson@neptunus.(none) +3 -1
    Set sessionID_ of Connection to zero when Connection constructor

ChangeSet
  1.1810.1681.3 06/05/15 13:28:15 knielsen@mysql.com +5 -0
  After-merge fixes; some function signatures changed from Item * to Item **.

ChangeSet
  1.1616.2586.3 06/05/15 16:31:23 pekka@mysql.com +3 -0
  ndb - bug#19537: arithmetic conversion Uint64 reg to Uint32 attr

ChangeSet
  1.2119.546.2 06/05/15 17:26:57 knielsen@mysql.com +1 -0
  After-merge fixes.

ChangeSet
  1.2119.1.278 06/05/15 19:38:11 jani@a193-229-222-105.elisa-laajakaista.fi +3 -0
  Fix, or a workaround for Bug#19386 "Multiple alter causes crashed table"
  
  The problem is that in a MyISAM table the following column
  after a varchar field gets corrupted, if varchar field is
  extended.
  
  This should be made to work without a copy in the future, but
  I'm not sure if this code is ready yet. This fix will force copy
  in this case. It will not do any harm to have it here, only makes
  alter table a bit slower in this case. If this should work for
  MyISAM, then the bug is somewhere else in that code.
  
  Until it works, I propose this as a temporary fix or a workaround.
  Test case for the bug has been added.

  sql/ha_myisam.cc
    1.181 06/05/15 19:38:03 jani@a193-229-222-105.elisa-laajakaista.fi +2 -1
    For MyISAM type, if varchar column is extended, it should return not
    compatible for now. In other words, it forces a copy of the table during
    alter table.

  mysql-test/t/alter_table.test
    1.49 06/05/15 19:38:03 jani@a193-229-222-105.elisa-laajakaista.fi +13 -0
    Added test case for Bug#19386: Multiple alter causes crashed table.

  mysql-test/r/alter_table.result
    1.64 06/05/15 19:38:03 jani@a193-229-222-105.elisa-laajakaista.fi +10 -0
    Added test case for Bug#19386: Multiple alter causes crashed table.

ChangeSet
  1.1810.1679.1 06/05/15 18:07:18 knielsen@mysql.com +7 -0
  Fix two Valgrind memory leak warnings.

  sql/mysqld.cc
    1.439.53.1 06/05/15 18:07:14 knielsen@mysql.com +4 -0
    Add missing my_thread_end() call, seems to occasionally trigger a memory
    leak (not repeatable).

  mysys/my_init.c
    1.44.1.1 06/05/15 18:07:14 knielsen@mysql.com +3 -1
    Change my_end() to deallocate DBUG memory by default (can be disabled with
    MY_DONT_FREE_DBUG option).

  libmysql/libmysql.c
    1.233.4.1 06/05/15 18:07:14 knielsen@mysql.com +1 -1
    Do not deallocate DBUG during cleanup.

  include/my_sys.h
    1.178.3.1 06/05/15 18:07:13 knielsen@mysql.com +1 -0
    Change my_end() to deallocate DBUG memory by default (can be disabled with
    MY_DONT_FREE_DBUG option).

  include/my_dbug.h
    1.16.2.1 06/05/15 18:07:13 knielsen@mysql.com +3 -0
    Add a facility to deallocate the debug stack, to avoid memory leak warnings
    in Valgrind.

  dbug/dbug.c
    1.21.2.1 06/05/15 18:07:13 knielsen@mysql.com +68 -16
    Add a facility to deallocate the debug stack, to avoid memory leak warnings
    in Valgrind.

  client/mysqlbinlog.cc
    1.123.1.2 06/05/15 18:07:13 knielsen@mysql.com +4 -2
    Now my_end() deallocates DBUG by default, but that fails in mysqlbinlog
    because of global destructors that use DBUG.

  sql/sp_head.cc
    1.220 06/05/15 17:26:52 knielsen@mysql.com +1 -1
    After-merge fixes.

ChangeSet
  1.1616.2588.2 06/05/15 17:16:21 tomas@poseidon.ndb.mysql.com +1 -0
  Bug #16875 , correction of previous patch

  mysql-test/r/ndb_autodiscover3.result
    1.2 06/05/15 17:16:18 tomas@poseidon.ndb.mysql.com +37 -1
    Bug #16875 , correction of previous patch

ChangeSet
  1.1810.1676.4 06/05/15 18:05:23 aelkin@mysql.com +2 -0
  BUG#14157: utf8 encoding in binlog without set character_set_client: e.g DROP temporary
  
  specific to 5.0 version of the patch is motivated by the fact that a wrapper over 
  MYSQLLOG::write can not help in 5.0 where query's charset is embedded into event instance in the constructor.

  sql/sql_base.cc
    1.235.56.3 06/05/15 18:05:18 aelkin@mysql.com +4 -1
    No wrapper similar to 4.1's version is done since Query_log_event constructor
    takes care of encodings in 5.0 whereas log::write method does it in 4.1.
    We can introduce an additional constuctor for Query_log_event to pass desired
    (i.e system_character_info) charset different from THD's version.
    But I am delaying this while there are not more bugs similar to this one reported.

  sql/mysql_priv.h
    1.290.1.98 06/05/15 18:05:18 aelkin@mysql.com +0 -13
    this 4.1 specific code does not help in 5.0

  ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
    1.11.1.1 06/05/15 16:27:30 pekka@mysql.com +6 -0
    bug#19537: write_attr: perform arithmetic conversion Uint64 to Uint32

ChangeSet
  1.1616.2588.1 06/05/15 16:23:59 tomas@poseidon.ndb.mysql.com +11 -0
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
  - invalidate ndb dict cache on cluster disconnect (ClusterMgr.cpp)
  - add check for correct frm on external lock when table cache is found invalid

  mysql-test/t/ndb_autodiscover3.test
    1.1 06/05/15 16:23:55 tomas@poseidon.ndb.mysql.com +65 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  mysql-test/t/ndb_autodiscover3.test
    1.0 06/05/15 16:23:55 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-4.1/mysql-test/t/ndb_autodiscover3.test

  mysql-test/r/ndb_autodiscover3.result
    1.1 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +9 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  sql/ha_ndbcluster.cc
    1.114.3.64 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +16 -1
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  ndb/src/ndbapi/ndb_cluster_connection_impl.hpp
    1.1.1.1 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +1 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  ndb/src/ndbapi/ndb_cluster_connection.cpp
    1.13.1.8 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +6 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  ndb/src/ndbapi/TransporterFacade.hpp
    1.18.1.4 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +6 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  ndb/src/ndbapi/DictCache.hpp
    1.6.4.2 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +3 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  ndb/src/ndbapi/DictCache.cpp
    1.11.1.3 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +36 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  ndb/src/ndbapi/ClusterMgr.hpp
    1.4.3.1 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +1 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  ndb/src/ndbapi/ClusterMgr.cpp
    1.13.1.4 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +5 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  ndb/include/ndbapi/ndb_cluster_connection.hpp
    1.4.1.5 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +1 -0
    Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

  mysql-test/r/ndb_autodiscover3.result
    1.0 06/05/15 16:23:54 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-4.1/mysql-test/r/ndb_autodiscover3.result

  ndb/test/ndbapi/testInterpreter.cpp
    1.3.1.1 06/05/15 16:19:56 pekka@mysql.com +162 -40
    add test case Bug19537
    the bug fix also fixed IncValue64 for whatever reason..

ChangeSet
  1.1810.1650.18 06/05/15 18:18:37 kroki@mysql.com +2 -0
  Remove 'const' that prevents Microsoft VC realize that
  Item_trigger_field::set_required_privilege(const bool rw) is an
  overloading of Settable_routine_parameter::set_required_privilege(bool rw).

  sql/item.h
    1.183.4.1 06/05/15 18:18:31 kroki@mysql.com +1 -1
    Remove 'const' that prevents Microsoft VC realize that
    Item_trigger_field::set_required_privilege(const bool rw) is an
    overloading of Settable_routine_parameter::set_required_privilege(bool rw).

  sql/item.cc
    1.113.43.1 06/05/15 18:18:30 kroki@mysql.com +1 -1
    Remove 'const' that prevents Microsoft VC realize that
    Item_trigger_field::set_required_privilege(const bool rw) is an
    overloading of Settable_routine_parameter::set_required_privilege(bool rw).

  ndb/test/ndbapi/Makefile.am
    1.14.2.4 06/05/15 16:15:44 pekka@mysql.com +3 -0
    enable testInterpreter

ChangeSet
  1.1810.1665.2 06/05/15 18:02:21 aivanov@mysql.com +2 -0
  Applied innodb-5.0-ss547 snapshot.
   Fix BUG#19542 "InnoDB doesn't increase the Handler_read_prev counter".

  sql/ha_innodb.cc
    1.202.1.92 06/05/15 18:02:16 aivanov@mysql.com +3 -0
    Applied innodb-5.0-ss547 snapshot.
     Increment statistic counter in ha_innobase::index_prev().

  innobase/os/os0file.c
    1.103.9.1 06/05/15 18:02:16 aivanov@mysql.com +38 -25
    Applied innodb-5.0-ss547 snapshot.
     Check the page trailers also after writing to disk.
     This improves the chances of diagnosing Bug 18886.
     os_file_check_page_trailers(): New function for checking
     that two copies of the LSN stamped on the pages match.
     os_aio_simulated_handle(): Call os_file_check_page_trailers()
     before and after os_file_write().

ChangeSet
  1.1616.2587.1 06/05/15 17:25:37 aivanov@mysql.com +2 -0
  Applied innodb-4.1-ss29 snapshot.
   Fix BUG#19542 "InnoDB doesn't increase the Handler_read_prev counter.
   

  sql/ha_innodb.cc
    1.90.16.44 06/05/15 17:25:33 aivanov@mysql.com +2 -0
    Applied innodb-4.1-ss29 snapshot.
     Increment statistic counter in ha_innobase::index_prev().

  innobase/os/os0file.c
    1.87.1.18 06/05/15 17:25:33 aivanov@mysql.com +38 -25
    Applied innodb-4.1-ss29 snapshot.
     Check the page trailers also after writing to disk.
     This improves the chances of diagnosing Bug 18886.
     os_file_check_page_trailers(): New function for checking
     that two copies of the LSN stamped on the pages match.
     os_aio_simulated_handle(): Call os_file_check_page_trailers()
     before and after os_file_write().

ChangeSet
  1.1810.1678.1 06/05/15 15:06:46 knielsen@mysql.com +1 -0
  Removed two duplicate/redundant suppressions.
  Added some suppressions needed for Valgrind on RHAS3 64-bit.

  mysql-test/valgrind.supp
    1.3.1.1 06/05/15 15:06:42 knielsen@mysql.com +161 -21
    Removed two duplicate/redundant suppressions.
    Added some suppressions needed for Valgrind on RHAS3 64-bit.

  sql/sp_head.cc
    1.200.1.13 06/05/15 13:28:10 knielsen@mysql.com +2 -2
    After-merge fixes.

  sql/item_func.h
    1.137.1.3 06/05/15 13:28:10 knielsen@mysql.com +1 -1
    After-merge fixes.

  sql/item_func.cc
    1.270.1.16 06/05/15 13:28:10 knielsen@mysql.com +3 -3
    After-merge fixes.

  sql/item.h
    1.183.1.12 06/05/15 13:28:10 knielsen@mysql.com +4 -4
    After-merge fixes.

  sql/item.cc
    1.113.1.108 06/05/15 13:28:10 knielsen@mysql.com +3 -3
    After-merge fixes.

ChangeSet
  1.1810.1677.1 06/05/15 14:18:23 sergefp@mysql.com +3 -0
  BUG#19618: Crash for unsigned_col NOT IN (-1, ... ) 
  - When manually constructing a SEL_TREE for "t.key NOT IN(...)", take into account that 
    get_mm_parts may return a tree with type SEL_TREE::IMPOSSIBLE
  - Added missing OOM checks
  - Added comments

  sql/opt_range.cc
    1.159.1.52 06/05/15 14:18:17 sergefp@mysql.com +51 -18
    BUG#19618: Crash for unsigned_col NOT IN (-1, ... ) 
    - When manually constructing a SEL_TREE for "t.key NOT IN(...)", take into account that 
      get_mm_parts may return a tree with type SEL_TREE::IMPOSSIBLE
    - Added missing OOM checks
    - Added comments

  mysql-test/t/func_in.test
    1.20 06/05/15 14:18:17 sergefp@mysql.com +12 -0
    Testcase for BUG#19618

  mysql-test/r/func_in.result
    1.25 06/05/15 14:18:17 sergefp@mysql.com +17 -0
    Testcase for BUG#19618

ChangeSet
  1.1810.1641.3 06/05/15 12:01:55 knielsen@mysql.com +5 -0
  BUG#18037: Fix stack corruption in THD::rollback_item_tree_changes().
    
  Stored procedure execution sometimes placed the address of auto variables
  in the list of Item changes to undo in THD::rollback_item_tree_changes().
  This could cause stack corruption.

  sql/sql_class.cc
    1.223.1.10 06/05/15 12:01:52 knielsen@mysql.com +1 -1
    Avoid storing address of auto variables in global rollback list, to
    prevent stack memory corruption.

  sql/sp_rcontext.h
    1.32 06/05/15 12:01:52 knielsen@mysql.com +4 -4
    Avoid storing address of auto variables in global rollback list, to
    prevent stack memory corruption.

  sql/sp_rcontext.cc
    1.42 06/05/15 12:01:52 knielsen@mysql.com +7 -6
    Avoid storing address of auto variables in global rollback list, to
    prevent stack memory corruption.

  sql/sp_head.h
    1.79.1.5 06/05/15 12:01:52 knielsen@mysql.com +1 -1
    Avoid storing address of auto variables in global rollback list, to
    prevent stack memory corruption.

  sql/sp_head.cc
    1.200.3.2 06/05/15 12:01:52 knielsen@mysql.com +15 -13
    Avoid storing address of auto variables in global rollback list, to
    prevent stack memory corruption.

ChangeSet
  1.2119.493.7 06/05/15 10:50:31 tomas@poseidon.ndb.mysql.com +2 -0
  Bug#16445 ndb, removed workaround in test to see if rewrite of dict cache has worked to remove this bug

  mysql-test/t/ndb_basic.test
    1.42 06/05/15 10:50:25 tomas@poseidon.ndb.mysql.com +10 -11
    Bug#16445 ndb, removed workaround in test to see if rewrite of dict cache has worked to remove this bug

  mysql-test/r/ndb_basic.result
    1.41 06/05/15 10:50:25 tomas@poseidon.ndb.mysql.com +0 -7
    Bug#16445 ndb, removed workaround in test to see if rewrite of dict cache has worked to remove this bug

ChangeSet
  1.1810.1633.12 06/05/15 11:56:02 kroki@mysql.com +1 -0
  Fix possible race.  Use LOCK_grant on access to grant_version.

  sql/sql_acl.cc
    1.128.24.1 06/05/15 11:55:55 kroki@mysql.com +3 -2
    Use LOCK_grant on access to grant_version.

ChangeSet
  1.1810.1676.2 06/05/14 20:31:42 aelkin@mysql.com +2 -0
  BUG#19188: incorrect temporary table name of DROP query in replication
  
  manual merge to account 5.0 specific names of TABLE class

  sql/sql_base.cc
    1.235.56.2 06/05/14 20:31:34 aelkin@mysql.com +13 -13
    manual merge: whitespaces and 5.0 TABLE's names

  sql/mysql_priv.h
    1.290.1.97 06/05/14 20:31:34 aelkin@mysql.com +1 -1
    manual merge: changing to 5.0's TABLE class names

ChangeSet
  1.1616.2586.1 06/05/14 20:09:09 aelkin@mysql.com +2 -0
  BUG#14157: utf8 encoding in binlog without set character_set_client
  
  fixing names length. Got an issue when merged to 5.0, decided to fix starting from 4.1

  mysql-test/t/rpl_temporary.test
    1.13.1.6 06/05/14 20:09:05 aelkin@mysql.com +1 -1
    fixing temp table name to fit to 64 bytes for 5.0

  mysql-test/t/mysqlbinlog.test
    1.8.1.11 06/05/14 20:09:05 aelkin@mysql.com +1 -1
    fixing temp table name to fit to 64 bytes for 5.0

ChangeSet
  1.1616.2144.127 06/05/14 21:49:33 holyfoot@deer.(none) +1 -0
  bug 15430 (init_connect test fails with the embedded server)
  mysqltest program should be really multithreaded to perform this
  test with the embedded server. So this test disabled until we
  redo mysqltest this way

  mysql-test/t/init_connect.test
    1.3.1.2 06/05/14 21:49:29 holyfoot@mysql.com +2 -0
    test can't work properly with the embedded server yet

ChangeSet
  1.1616.2144.126 06/05/14 21:43:22 holyfoot@deer.(none) +1 -0
  bug #15435 (wait_timeout.test fails with the embedded server)
  this test just can't work in the embedded server

  mysql-test/t/wait_timeout.test
    1.1.2.1 06/05/14 21:42:33 holyfoot@mysql.com +3 -0
    test can't work properly with the embedded server yet

ChangeSet
  1.2119.493.6 06/05/14 01:14:47 kent@mysql.com +1 -0
  valgrind.supp:
    Added suppressions for Red Hat AS 4

  mysql-test/valgrind.supp
    1.6 06/05/14 01:13:57 kent@mysql.com +73 -0
    Added suppressions for Red Hat AS 4

ChangeSet
  1.1810.1675.1 06/05/13 11:56:05 igor@rurik.mysql.com +3 -0
  Fixed bug #19396: a crash for a an outer join operation 
  over two views when using syntax with curly braces.
  Each outer join operation must be placed in a separate
  nest. This was not done when the syntax with curly braces
  was used. In some cases, in particular, for queries with outer
  join operation over views it could cause a crash.

  sql/sql_yacc.yy
    1.371.65.1 06/05/13 11:55:59 igor@rurik.mysql.com +4 -0
    Fixed bug #19396: a crash for a an outer join operation 
    over two views when using syntax with curly braces.
    Each outer join operation must be placed in a separate
    nest. This was not done when the syntax with curly braces
    was used. In some cases, in particular, for queries with outer
    join operation over views it could cause a crash.

  mysql-test/t/join_outer.test
    1.36 06/05/13 11:55:59 igor@rurik.mysql.com +26 -0
    Added a test case for bug #19396.

  mysql-test/r/join_outer.result
    1.44.1.3 06/05/13 11:55:58 igor@rurik.mysql.com +22 -0
    Added a test case for bug #19396.

ChangeSet
  1.1616.2144.125 06/05/13 12:14:20 aelkin@mysql.com +2 -0
  BUG#14157: utf8 encoding in binlog without set character_set_client
  fixing a path to find charset by $MYSQL client. I believe the fix is done what should be
  by default. 

  mysql-test/t/rpl_temporary.test
    1.13.1.5 06/05/13 12:14:17 aelkin@mysql.com +1 -1
    --character-sets-dir=../sql/share/charsets/

  mysql-test/t/mysqlbinlog.test
    1.8.1.10 06/05/13 12:14:17 aelkin@mysql.com +1 -1
    --character-sets-dir=../sql/share/charsets  is added otherwise client/.libs/lt-mysql
    searches in /usr/local/mysql ... A bug? 

ChangeSet
  1.1810.1650.14 06/05/13 13:13:05 gluh@eagle.intranet.mysql.r18.ru +11 -0
  Bug#17048 CREATE TABLE ... SELECT truncate values
  remove initialization of unsigned_flag for Item_decimal

  sql/item.cc
    1.113.42.1 06/05/13 13:11:37 gluh@mysql.com +0 -6
    Bug#17048 CREATE TABLE ... SELECT truncate values
    remove initialization of unsigned_flag for Item_decimal

  mysql-test/r/type_newdecimal.result
    1.36.1.3 06/05/13 13:11:37 gluh@mysql.com +7 -7
    Bug#17048 CREATE TABLE ... SELECT truncate values
    result fix

  mysql-test/r/type_float.result
    1.42.1.4 06/05/13 13:11:37 gluh@mysql.com +4 -4
    Bug#17048 CREATE TABLE ... SELECT truncate values
    result fix

  mysql-test/r/ps_7ndb.result
    1.26.1.16 06/05/13 13:11:37 gluh@mysql.com +2 -2
    Bug#17048 CREATE TABLE ... SELECT truncate values
    result fix

  mysql-test/r/ps_6bdb.result
    1.27.1.15 06/05/13 13:11:37 gluh@mysql.com +2 -2
    Bug#17048 CREATE TABLE ... SELECT truncate values
    result fix

  mysql-test/r/ps_5merge.result
    1.39.1.1 06/05/13 13:11:36 gluh@mysql.com +4 -4
    Bug#17048 CREATE TABLE ... SELECT truncate values
    result fix

  mysql-test/r/ps_4heap.result
    1.38.1.1 06/05/13 13:11:36 gluh@mysql.com +2 -2
    Bug#17048 CREATE TABLE ... SELECT truncate values
    result fix

  mysql-test/r/ps_3innodb.result
    1.42.1.1 06/05/13 13:11:36 gluh@mysql.com +2 -2
    Bug#17048 CREATE TABLE ... SELECT truncate values
    result fix

  mysql-test/r/ps_2myisam.result
    1.39.1.1 06/05/13 13:11:36 gluh@mysql.com +2 -2
    Bug#17048 CREATE TABLE ... SELECT truncate values
    result fix

  mysql-test/r/metadata.result
    1.14 06/05/13 13:11:36 gluh@mysql.com +1 -1
    Bug#17048 CREATE TABLE ... SELECT truncate values
    result fix

  mysql-test/r/case.result
    1.24.2.2 06/05/13 13:11:36 gluh@mysql.com +4 -4
    Bug#17048 CREATE TABLE ... SELECT truncate values
    result fix

ChangeSet
  1.2119.1.275 06/05/13 01:09:00 acurtis@xiphis.org +1 -0
  fix binlog results

  mysql-test/r/binlog_row_blackhole.result
    1.5 06/05/13 01:08:51 acurtis@xiphis.org +6 -0
    fix binlog results

ChangeSet
  1.2119.1.274 06/05/12 22:30:13 acurtis@xiphis.org +1 -0
  fix partition test

  mysql-test/r/partition.result
    1.42 06/05/12 22:29:56 acurtis@xiphis.org +9 -5
    fix results - bad automerge

ChangeSet
  1.1810.1674.1 06/05/12 18:24:38 igor@rurik.mysql.com +3 -0
  Fixed bug #19490. The bug that caused server crash manifested
  itself when executing queries referring to a view with GROUP BY
  an expression containing non-constant interval.
  It happened because Item_date_add_interval::eq neglected the
  fact that the method can be applied to an expression of the form
      date(col) + interval time_to_sec(col) second
  at the time when col could not be evaluated yet.
  An attempt to evaluate time_to_sec(col) in this method resulted
  in a crash.

  sql/item_timefunc.cc
    1.100.1.10 06/05/12 18:24:31 igor@rurik.mysql.com +7 -2
    Fixed bug #19490. The bug that caused server crash manifested
    itself when executing queries referring to a view with GROUP BY
    an expression containing non-constant interval.
    It happened because Item_date_add_interval::eq neglected the
    fact that the method can be applied to an expression of the form
        date(col) + interval time_to_sec(col) second
    at the time when col could not be evaluated yet.
    An attempt to evaluate time_to_sec(col) in this method resulted
    in a crash.
    The code of Item_date_add_interval::eq was corrected.

  mysql-test/t/view.test
    1.126.1.17 06/05/12 18:24:31 igor@rurik.mysql.com +16 -0
    Added a test case for bug #19490.

  mysql-test/r/view.result
    1.138.1.18 06/05/12 18:24:31 igor@rurik.mysql.com +11 -0
    Added a test case for bug #19490.

ChangeSet
  1.2119.545.1 06/05/13 01:30:44 ngrishakin@mysql.com +10 -0
  .del-ndb_partition_range.result~17fc1db754d4153d:
    Delete: mysql-test/r/ndb_partition_range.result
  .del-ndb_partition_list.result~7af68cd45e74abf:
    Delete: mysql-test/r/ndb_partition_list.result
  .del-ndb_partition_key.result~68b9a59cff8c9840:
    Delete: mysql-test/r/ndb_partition_key.result
  .del-ndb_partition_error.result~944f84894e323e9:
    Delete: mysql-test/r/ndb_partition_error.result
  .del-ndb_blob_partition.result~fda88ddfc5477a7e:
    Delete: mysql-test/r/ndb_blob_partition.result
  .del-ndb_partition_range.test~af8f9016b6648239:
    Delete: mysql-test/t/ndb_partition_range.test
  .del-ndb_partition_list.test~940289b3d58595ca:
    Delete: mysql-test/t/ndb_partition_list.test
  .del-ndb_partition_key.test~ed7b15c91f66558d:
    Delete: mysql-test/t/ndb_partition_key.test
  .del-ndb_partition_error.test~2da477be29be041f:
    Delete: mysql-test/t/ndb_partition_error.test
  .del-ndb_blob_partition.test~ea99ef9759705ce3:
    Delete: mysql-test/t/ndb_blob_partition.test

  BitKeeper/deleted/.del-ndb_partition_range.result~17fc1db754d4153d
    1.12 06/05/13 01:30:05 ngrishakin@mysql.com +0 -0
    Delete: mysql-test/r/ndb_partition_range.result

  BitKeeper/deleted/.del-ndb_partition_list.result~7af68cd45e74abf
    1.3 06/05/13 01:29:47 ngrishakin@mysql.com +0 -0
    Delete: mysql-test/r/ndb_partition_list.result

  BitKeeper/deleted/.del-ndb_partition_key.result~68b9a59cff8c9840
    1.16.3.1 06/05/13 01:29:28 ngrishakin@mysql.com +0 -0
    Delete: mysql-test/r/ndb_partition_key.result

  BitKeeper/deleted/.del-ndb_partition_error.result~944f84894e323e9
    1.10 06/05/13 01:29:11 ngrishakin@mysql.com +0 -0
    Delete: mysql-test/r/ndb_partition_error.result

  BitKeeper/deleted/.del-ndb_blob_partition.result~fda88ddfc5477a7e
    1.2 06/05/13 01:28:53 ngrishakin@mysql.com +0 -0
    Delete: mysql-test/r/ndb_blob_partition.result

  BitKeeper/deleted/.del-ndb_partition_range.test~af8f9016b6648239
    1.9 06/05/13 01:28:20 ngrishakin@mysql.com +0 -0
    Delete: mysql-test/t/ndb_partition_range.test

  BitKeeper/deleted/.del-ndb_partition_list.test~940289b3d58595ca
    1.4 06/05/13 01:28:01 ngrishakin@mysql.com +0 -0
    Delete: mysql-test/t/ndb_partition_list.test

  BitKeeper/deleted/.del-ndb_partition_key.test~ed7b15c91f66558d
    1.10.3.1 06/05/13 01:27:43 ngrishakin@mysql.com +2 -9
    Delete: mysql-test/t/ndb_partition_key.test

  BitKeeper/deleted/.del-ndb_partition_error.test~2da477be29be041f
    1.8 06/05/13 01:27:21 ngrishakin@mysql.com +0 -0
    Delete: mysql-test/t/ndb_partition_error.test

  BitKeeper/deleted/.del-ndb_blob_partition.test~ea99ef9759705ce3
    1.2 06/05/13 01:26:59 ngrishakin@mysql.com +0 -0
    Delete: mysql-test/t/ndb_blob_partition.test

ChangeSet
  1.2119.544.2 06/05/12 15:41:46 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  merge

  mysql-test/r/partition.result
    1.40 06/05/12 15:41:41 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    merge

ChangeSet
  1.2119.543.2 06/05/12 11:49:35 acurtis@xiphis.org +1 -0
  fix results after merge

  mysql-test/r/binlog_stm_blackhole.result
    1.11 06/05/12 11:49:30 acurtis@xiphis.org +0 -2
    fix results after merge

ChangeSet
  1.1616.2585.1 06/05/12 21:29:06 aelkin@mysql.com +4 -0
  BUG#19188: incorrect temporary table name of DROP query in replication
  
    A pattern to generate binlog for DROPped temp table in close_temporary_tables
    was buggy: could not deal with a grave-accent-in-name table.
  
    The fix exploits `append_identifier()' for quoting and duplicating accents.

  sql/sql_base.cc
    1.145.47.1 06/05/12 21:29:01 aelkin@mysql.com +69 -78
    Utilizing `append_identifier' to quote. `close_temporary_tables' once again recoded
    I hope to become much simplier than previously. No-binlog branch is separated completely the
    rest that adopts String's methods.

  sql/mysql_priv.h
    1.186.104.1 06/05/12 21:29:01 aelkin@mysql.com +12 -0
    bool is_user_table(TABLE * table) 
    is added to answer wheather temporary table was created explicitly.

  mysql-test/t/rpl_temporary.test
    1.13.2.1 06/05/12 21:29:00 aelkin@mysql.com +10 -5
    more correct internal table emulation; typo of @@session in bug#17263.

  mysql-test/r/rpl_temporary.result
    1.3.3.1 06/05/12 21:29:00 aelkin@mysql.com +8 -5
    results changed

ChangeSet
  1.1810.1650.12 06/05/12 19:00:11 kent@mysql.com +49 -0
  Many files:
    Change mode to -rw-rw-r--

  strings/decimal.c
    1.65.1.3 06/05/12 18:58:54 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  sql/sql_array.h
    1.2 06/05/12 18:58:53 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysys/my_mmap.c
    1.7.1.1 06/05/12 18:58:53 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/xa.test
    1.7 06/05/12 18:58:53 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/sp_trans.test
    1.9 06/05/12 18:58:53 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/flush_read_lock_kill.test
    1.5 06/05/12 18:58:52 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/flush_read_lock_kill-master.opt
    1.3 06/05/12 18:58:52 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/binlog.test
    1.4.2.1 06/05/12 18:58:52 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/binlog-master.opt
    1.1.1.1 06/05/12 18:58:52 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/std_data/vchar.frm
    1.2 06/05/12 18:58:52 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/std_data/bug16266.000001
    1.2 06/05/12 18:58:51 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/xa.result
    1.5 06/05/12 18:58:51 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/view_query_cache.result
    1.5 06/05/12 18:58:51 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/view_grant.result
    1.8.1.5 06/05/12 18:58:51 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/user_limits.result
    1.7 06/05/12 18:58:50 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/type_newdecimal.result
    1.36.1.2 06/05/12 18:58:50 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/type_bit_innodb.result
    1.3.1.2 06/05/12 18:58:50 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/trigger-trans.result
    1.2 06/05/12 18:58:50 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/trigger-grant.result
    1.3.2.1 06/05/12 18:58:49 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/trigger-compat.result
    1.3.1.1 06/05/12 18:58:49 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/sum_distinct-big.result
    1.3 06/05/12 18:58:49 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/sp_trans.result
    1.7.1.2 06/05/12 18:58:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/sp-vars.result
    1.1.1.1 06/05/12 18:58:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/sp-dynamic.result
    1.5 06/05/12 18:58:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/sp-destruct.result
    1.5 06/05/12 18:58:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/sp-code.result
    1.5.1.1 06/05/12 18:58:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_view.result
    1.3.1.1 06/05/12 18:58:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_trigger.result
    1.4.1.4 06/05/12 18:58:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_ignore_revoke.result
    1.3 06/05/12 18:58:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ndb_gis.result
    1.3.1.1 06/05/12 18:58:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ndb_condition_pushdown.result
    1.15.1.4 06/05/12 18:58:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ndb_bitfield.result
    1.4.1.3 06/05/12 18:58:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/mysqldump-max.result
    1.2.1.1 06/05/12 18:58:45 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/mysql.result
    1.10 06/05/12 18:58:45 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/innodb_notembedded.result
    1.2 06/05/12 18:58:45 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/innodb_gis.result
    1.2.2.1 06/05/12 18:58:45 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/innodb-big.result
    1.2 06/05/12 18:58:44 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/im_utils.result
    1.1.1.1 06/05/12 18:58:44 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/im_options_unset.result
    1.1.1.1 06/05/12 18:58:44 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/im_options_set.result
    1.1.1.1 06/05/12 18:58:44 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/im_life_cycle.result
    1.3.1.2 06/05/12 18:58:43 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/im_daemon_life_cycle.result
    1.2 06/05/12 18:58:43 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/federated_bug_13118.result
    1.2 06/05/12 18:58:43 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/federated_archive.result
    1.4 06/05/12 18:58:43 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/compress.result
    1.3 06/05/12 18:58:42 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/binlog.result
    1.4.2.1 06/05/12 18:58:42 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/bdb_gis.result
    1.2.2.1 06/05/12 18:58:42 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/archive_gis.result
    1.2.2.1 06/05/12 18:58:42 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  include/decimal.h
    1.15 06/05/12 18:58:41 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

ChangeSet
  1.1616.2144.122 06/05/12 18:28:48 kent@mysql.com +52 -0
  Many files:
    Change mode to -rw-rw-r--
  Ereport.pl, Ecreate.pl, Ecompare.pl:
    Change mode to -rwxrwxr--

  zlib/Makefile.am
    1.3.2.3 06/05/12 18:26:49 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  sql/sql_bitmap.h
    1.7.3.1 06/05/12 18:26:49 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  scripts/mysql_prepare_privilege_tables_for_5.sql
    1.1.1.1 06/05/12 18:26:49 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysys/my_getsystime.c
    1.5 06/05/12 18:26:49 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysys/my_gethwaddr.c
    1.3 06/05/12 18:26:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysys/my_crc32.c
    1.3 06/05/12 18:26:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysys/mf_tempdir.c
    1.3.1.1 06/05/12 18:26:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/union-master.opt
    1.3 06/05/12 18:26:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/subselect2.test
    1.6 06/05/12 18:26:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/rpl_rewrite_db.test
    1.4.2.1 06/05/12 18:26:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/rpl_rewrite_db-slave.opt
    1.2.1.1 06/05/12 18:26:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/rpl_multi_query.test
    1.2.1.2 06/05/12 18:26:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/rpl_insert_ignore.test
    1.2.1.1 06/05/12 18:26:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/rpl_ddl.test
    1.2.1.3 06/05/12 18:26:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/mysqltest.test
    1.3.1.17 06/05/12 18:26:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/insert_update.test
    1.13.1.4 06/05/12 18:26:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/grant2.test
    1.7.1.9 06/05/12 18:26:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/gis-rtree.test
    1.9.1.3 06/05/12 18:26:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/fulltext2.test
    1.14 06/05/12 18:26:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/ctype_latin1.test
    1.9 06/05/12 18:26:45 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/std_data/master-bin.000001
    1.2 06/05/12 18:26:45 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/timezone_grant.result
    1.1.1.2 06/05/12 18:26:45 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_trunc_temp.result
    1.2 06/05/12 18:26:44 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_slave_status.result
    1.4.1.1 06/05/12 18:26:44 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_multi_update4.result
    1.2 06/05/12 18:26:44 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_multi_update3.result
    1.4.1.1 06/05/12 18:26:44 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_insert_select.result
    1.2 06/05/12 18:26:43 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_dual_pos_advance.result
    1.2 06/05/12 18:26:43 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_drop_db.result
    1.4.1.1 06/05/12 18:26:43 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/rpl_create_database.result
    1.2.1.1 06/05/12 18:26:43 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/query_cache_notembedded.result
    1.2.2.1 06/05/12 18:26:43 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/not_embedded_server.result
    1.1.1.1 06/05/12 18:26:42 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ndb_update.result
    1.2.1.2 06/05/12 18:26:42 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ndb_database.result
    1.1.1.1 06/05/12 18:26:42 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/insert_update.result
    1.9.7.1 06/05/12 18:26:41 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/grant2.result
    1.8.8.1 06/05/12 18:26:41 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/func_des_encrypt.result
    1.2 06/05/12 18:26:41 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/fulltext2.result
    1.9.3.1 06/05/12 18:26:41 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ctype_ucs_binlog.result
    1.1.1.1 06/05/12 18:26:41 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ctype_gb2312.result
    1.2 06/05/12 18:26:40 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ctype_euckr.result
    1.2 06/05/12 18:26:40 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ctype_cp932_binlog.result
    1.1.1.1 06/05/12 18:26:40 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/ctype_cp1250_ch.result
    1.4 06/05/12 18:26:40 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/blackhole.result
    1.2.1.2 06/05/12 18:26:39 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/misc/kill_master.sh
    1.3 06/05/12 18:26:39 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/include/rpl_stmt_seq.inc
    1.3.1.1 06/05/12 18:26:39 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  myisammrg/myrg_rnext_same.c
    1.4.1.1 06/05/12 18:26:39 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  myisam/ftbench/README
    1.2.1.1 06/05/12 18:26:39 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  myisam/ftbench/Ereport.pl
    1.3.1.1 06/05/12 18:26:38 kent@mysql.com +0 -0
    Change mode to -rwxrwxr--

  myisam/ftbench/Ecreate.pl
    1.1.1.1 06/05/12 18:26:38 kent@mysql.com +0 -0
    Change mode to -rwxrwxr--

  myisam/ftbench/Ecompare.pl
    1.2.1.1 06/05/12 18:26:38 kent@mysql.com +0 -0
    Change mode to -rwxrwxr--

  bdb/dist/s_dir
    1.1.1.1 06/05/12 18:26:38 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

ChangeSet
  1.1346.1.834 06/05/12 17:51:37 kent@mysql.com +19 -0
  Many files:
    Change mode to -rw-rw-r--
  dbug_add_tags.pl:
    Change mode to -rwxrwxr--

  support-files/mysql-multi.server.sh
    1.4 06/05/12 17:50:49 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  sql/sql_handler.cc
    1.19.1.30 06/05/12 17:50:49 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  scripts/mysql_secure_installation.sh
    1.3 06/05/12 17:50:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/rpl_free_items.test
    1.1.1.2 06/05/12 17:50:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/rpl_free_items-slave.opt
    1.3 06/05/12 17:50:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/rpl_commit_after_flush.test
    1.1.1.2 06/05/12 17:50:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/repair.test
    1.1.1.5 06/05/12 17:50:48 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/mix_innodb_myisam_binlog-master.opt
    1.2.1.1 06/05/12 17:50:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/innodb_handler.test
    1.2.1.6 06/05/12 17:50:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/handler.test
    1.7.1.11 06/05/12 17:50:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/ctype_tis620.test
    1.2.1.2 06/05/12 17:50:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/create_select_tmp.test
    1.1.1.2 06/05/12 17:50:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/t/bulk_replace.test
    1.2.1.1 06/05/12 17:50:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/std_data/trunc_binlog.001
    1.1.1.1 06/05/12 17:50:47 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/std_data/master-bin.001
    1.2.1.1 06/05/12 17:50:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/repair.result
    1.4.1.1 06/05/12 17:50:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  mysql-test/r/innodb_handler.result
    1.2.1.5 06/05/12 17:50:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  myisammrg/myrg_range.c
    1.2.1.1 06/05/12 17:50:46 kent@mysql.com +0 -0
    Change mode to -rw-rw-r--

  dbug/dbug_add_tags.pl
    1.3 06/05/12 17:50:45 kent@mysql.com +0 -0
    Change mode to -rwxrwxr--

ChangeSet
  1.1810.1650.9 06/05/12 17:34:36 gluh@eagle.intranet.mysql.r18.ru +3 -0
  Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes
  replaced get_field(MEM_ROOT *mem, Field *field) with 
  get_field(MEM_ROOT *mem, Field *field, String *res).
  It allows to avoid strlen().

  sql/sql_show.cc
    1.253.1.63 06/05/12 17:34:30 gluh@mysql.com +12 -11
    Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes
    replaced get_field(MEM_ROOT *mem, Field *field) with 
    get_field(MEM_ROOT *mem, Field *field, String *res).
    It allows to avoid strlen().

  mysql-test/t/information_schema.test
    1.65.1.13 06/05/12 17:34:30 gluh@mysql.com +11 -0
    Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes
    test case

  mysql-test/r/information_schema.result
    1.87.1.17 06/05/12 17:34:30 gluh@mysql.com +9 -0
    Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes
    test case

ChangeSet
  1.2119.539.5 06/05/12 14:09:13 jmiller@mysql.com +4 -0
  rpl_row_basic_11bugs.test, rpl_multi_engine.test, rpl_flsh_tbls.test:
    Updated per lars
  rpl_row_flsh_tbls.test:
    updated per lars

  mysql-test/t/rpl_row_basic_11bugs.test
    1.6 06/05/12 14:08:49 jmiller@mysql.com +3 -1
    Updated per lars

  mysql-test/t/rpl_multi_engine.test
    1.7 06/05/12 14:06:54 jmiller@mysql.com +2 -1
    Updated per lars

  mysql-test/t/rpl_row_flsh_tbls.test
    1.3 06/05/12 14:05:26 jmiller@mysql.com +5 -0
    updated per lars

  mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
    1.16 06/05/12 14:05:04 jmiller@mysql.com +0 -2
    Updated per lars

ChangeSet
  1.1810.1673.1 06/05/12 12:31:22 tnurnberg@mysql.com +1 -0
  merge fixies BUG#10418 4.1 -> 5.0

  mysql-test/r/outfile.result
    1.6 06/05/12 12:26:52 tnurnberg@mysql.com +11 -10
    merge fixies BUG#10418 4.1 -> 5.0

ChangeSet
  1.1810.1671.1 06/05/12 15:09:25 gluh@eagle.intranet.mysql.r18.ru +4 -0
  Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH

  sql/sql_show.cc
    1.253.1.62 06/05/12 15:07:56 gluh@mysql.com +1 -1
    Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH

  mysql-test/t/information_schema.test
    1.65.1.12 06/05/12 15:07:56 gluh@mysql.com +9 -0
    Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH
    test case

  mysql-test/r/join.result
    1.37 06/05/12 15:07:56 gluh@mysql.com +2 -2
    Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH
    result fix

  mysql-test/r/information_schema.result
    1.87.1.16 06/05/12 15:07:56 gluh@mysql.com +8 -0
    Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH
    test case

ChangeSet
  1.1810.1633.11 06/05/12 13:55:21 kroki@mysql.com +12 -0
  Bug#14635: Accept NEW.x as INOUT parameters to stored procedures
  from within triggers
  
  Add support for passing NEW.x as INOUT and OUT parameters to stored
  procedures.  Passing NEW.x as INOUT parameter requires SELECT and
  UPDATE privileges on that column, and passing it as OUT parameter
  requires only UPDATE privilege.

  sql/sql_yacc.yy
    1.371.1.97 06/05/12 13:55:14 kroki@mysql.com +11 -3
    Set read_only and want_privilege members in Item_trigger_field
    appropriately.  For NEW.x trigger variable used in left-hand-side
    of SET statement the latter is set to UPDATE_ACL, otherwise it is
    set to SELECT_ACL (but see Item_trigger_field::set_required_privilege(),
    where it may be updated to different value).

  sql/sp_head.cc
    1.200.1.10 06/05/12 13:55:14 kroki@mysql.com +17 -49
    Use Settable_routine_parameter interface for parameter update.

  sql/share/errmsg.txt
    1.42.11.5 06/05/12 13:55:14 kroki@mysql.com +1 -1
    Update english ER_SP_NOT_VAR_ARG message.

  sql/item_func.h
    1.137.2.1 06/05/12 13:55:14 kroki@mysql.com +11 -1
    Item_func_get_user_var implements Settable_routine_parameter interface.

  sql/item_func.cc
    1.270.8.2 06/05/12 13:55:14 kroki@mysql.com +12 -0
    Add implementations of set_value() method of Settable_routine_parameter
    interface.

  sql/item.h
    1.183.1.11 06/05/12 13:55:14 kroki@mysql.com +93 -8
    Add interface class Settable_routine_parameter and interface query
    method to Item class.  Item_splocal and Item_trigger_field implement
    this interface.
    
    For Item_trigger_field:
     - add read_only attribute and is_read_only() method.
     - remove access_type and add original_privilege and want_privilege
       instead.
     - add set_value() method.
     - add reset_privilege() method.

  sql/item.cc
    1.113.1.106 06/05/12 13:55:14 kroki@mysql.com +27 -2
    Add implementations of set_value() and set_required_privilege() methods
    of Settable_routine_parameter interface.
    
    Use Item_trigger_field::want_privilege instead of
    Item_trigger_field::access_type.
    
    Reset privileges on Item_trigger_field::cleanup().

  mysql-test/t/trigger.test
    1.34.1.11 06/05/12 13:55:14 kroki@mysql.com +74 -0
    Add test case for bug#14635.

  mysql-test/t/trigger-grant.test
    1.1.1.6 06/05/12 13:55:14 kroki@mysql.com +173 -0
    Add test case for bug#14635.

  mysql-test/r/trigger.result
    1.29.1.11 06/05/12 13:55:14 kroki@mysql.com +56 -0
    Add result for bug#14635.

  mysql-test/r/trigger-grant.result
    1.3.1.1 06/05/12 13:55:14 kroki@mysql.com +84 -0
    Add result for bug#14635.

  mysql-test/r/sp-error.result
    1.102.1.4 06/05/12 13:55:13 kroki@mysql.com +2 -2
    Update the result for new message.

ChangeSet
  1.2119.542.1 06/05/12 12:32:44 aelkin@mysql.com +1 -0
  Bug#19728: Test mysqldump failure
  
  regex is fixed for windows.

  mysql-test/t/mysqldump.test
    1.95.1.2 06/05/12 12:32:39 aelkin@mysql.com +1 -1
    Windows' suffix is accounted.

ChangeSet
  1.1810.1658.3 06/05/12 11:29:31 msvensson@neptunus.(none) +2 -0
  Bug#18818 configure: No longer finds OpenSSL on Mac OS X
     - Remove usage of $shrext_cmds variable
     - Test for libs using all known library file endings

  config/ac-macros/zlib.m4
    1.7.1.2 06/05/12 11:29:26 msvensson@neptunus.(none) +5 -4
    Remove the usage of $shrext_cmds. instead test for all the library file
    endings we currently know, that is .a .so .sl and .dylib

  config/ac-macros/openssl.m4
    1.7 06/05/12 11:29:26 msvensson@neptunus.(none) +6 -4
    Remove the usage of $shrext_cmds. instead test for all the library file
    endings we currently know, that is .a .so .sl and .dylib

ChangeSet
  1.1616.2584.1 06/05/12 11:18:06 msvensson@neptunus.(none) +1 -0
  Bug#18818 configure: No longer finds OpenSSL on Mac OS X
   - Remove usage of $shrext_cmds variable
   - Test for libs using all known library file endings

  acinclude.m4
    1.123.20.1 06/05/12 11:18:02 msvensson@neptunus.(none) +11 -9
    Remove the usage of $shrext_cmds. instead test for all the library file
    endings we currently know, that is .a .so .sl and .dylib

ChangeSet
  1.1810.1669.2 06/05/12 11:00:34 msvensson@neptunus.(none) +1 -0
  Correct spelling errors

  include/sslopt-longopts.h
    1.11 06/05/12 11:00:30 msvensson@neptunus.(none) +1 -1
    Correct spelling errors

ChangeSet
  1.2119.535.8 06/05/12 10:51:07 msvensson@neptunus.(none) +24 -0
  Rename cmakelists.txt -> CMakeLists.txt

  zlib/Makefile.am
    1.10 06/05/12 10:51:02 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  vio/Makefile.am
    1.19 06/05/12 10:51:02 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  tests/Makefile.am
    1.28 06/05/12 10:51:02 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  strings/Makefile.am
    1.53 06/05/12 10:51:02 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  storage/myisammrg/Makefile.am
    1.17 06/05/12 10:51:02 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  storage/myisam/Makefile.am
    1.34 06/05/12 10:51:02 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  storage/innobase/Makefile.am
    1.14 06/05/12 10:51:02 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  storage/heap/Makefile.am
    1.15 06/05/12 10:51:02 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  storage/example/Makefile.am
    1.10 06/05/12 10:51:02 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  storage/csv/Makefile.am
    1.9 06/05/12 10:51:02 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  storage/blackhole/Makefile.am
    1.4 06/05/12 10:51:02 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  storage/bdb/Makefile.in
    1.11 06/05/12 10:51:02 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  storage/archive/Makefile.am
    1.7 06/05/12 10:51:02 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  sql/Makefile.am
    1.138 06/05/12 10:51:01 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  server-tools/instance-manager/Makefile.am
    1.35 06/05/12 10:51:01 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  regex/Makefile.am
    1.16 06/05/12 10:51:01 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  mysys/Makefile.am
    1.78 06/05/12 10:51:01 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  libmysql/Makefile.am
    1.51 06/05/12 10:51:01 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  extra/yassl/taocrypt/Makefile.am
    1.5 06/05/12 10:51:01 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  extra/yassl/Makefile.am
    1.6 06/05/12 10:51:01 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  extra/Makefile.am
    1.37 06/05/12 10:51:01 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  dbug/Makefile.am
    1.17 06/05/12 10:51:01 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  client/Makefile.am
    1.70 06/05/12 10:51:01 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

  Makefile.am
    1.93 06/05/12 10:51:01 msvensson@neptunus.(none) +1 -1
    Rename cmakelists.txt -> CMakeLists.txt

ChangeSet
  1.1810.1669.1 06/05/12 09:13:37 msvensson@neptunus.(none) +2 -0
  Bug#19709 rpl_tmporary fails on powermacg5
   - Don't kill the active connection to the server, instead read 
     the connection id, switch connection and kill the first one from there.

  mysql-test/t/rpl_temporary.test
    1.15.1.4 06/05/12 09:13:29 msvensson@neptunus.(none) +12 -2
    Don't kill our own connection to the server as the result code differs depending 
    on platform.

  mysql-test/r/rpl_temporary.result
    1.18.1.6 06/05/12 09:13:29 msvensson@neptunus.(none) +0 -2
    Update test result

ChangeSet
  1.2119.541.2 06/05/12 09:10:04 msvensson@neptunus.(none) +3 -0
  Fix after merge 5.0->5.1

  vio/viosslfactories.c
    1.26.1.2 06/05/12 09:09:59 msvensson@neptunus.(none) +1 -1
    Type changed st_VioSSLAcceptorFd-> sl_VioSSLFd

  include/violite.h
    1.46.1.2 06/05/12 09:09:59 msvensson@neptunus.(none) +1 -1
    Type changed st_VioSSLAcceptorFd-> sl_VioSSLFd

  client/mysqlimport.c
    1.71.1.2 06/05/12 09:09:59 msvensson@neptunus.(none) +1 -1
    Variable name changed mysql_connection -> mysql

ChangeSet
  1.1810.1650.4 06/05/11 19:47:00 igor@rurik.mysql.com +2 -0
  Added a test case for bug #18940:in 5.0 the optimizer chose
  a worse execution plan than in 4.1 for some queries.
  It happened due the fact that at some conditions the 
  optimizer always preferred range or full index scan access
  methods to lookup access methods even when the latter were much
  cheaper. 
  The problem was not observed in 4.1 for the reported query
  because the WHERE condition was not of a form that could
  cause the problem.
  Equality propagation introduced on 5.0 added an extra 
  predicate and changed the WHERE condition. The new condition
  provoked the optimizer to make a bad choice.
  
  The problem was fixed by the patch for bug 17379.

  mysql-test/t/select.test
    1.101 06/05/11 19:46:54 igor@rurik.mysql.com +21 -0
    Added a test case for bug #18940.
    The problem was fixed by the patch for bug 17379.

  mysql-test/r/select.result
    1.121.1.2 06/05/11 19:46:54 igor@rurik.mysql.com +19 -0
    Added a test case for bug #18940.
    The problem was fixed by the patch for bug 17379.

ChangeSet
  1.2119.535.7 06/05/11 13:57:23 reggie@linux.site +1 -0
  removed handlerton-win.cc (again)

  BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df
    1.6 06/05/11 13:53:44 reggie@linux.site +0 -0
    Delete: sql/handlerton-win.cc

ChangeSet
  1.1346.1.833 06/05/11 19:48:57 kent@mysql.com +1 -0
  configure.in:
    Stepped up to 4.0.28

  configure.in
    1.191.1.144 06/05/11 19:48:23 kent@mysql.com +1 -1
    Stepped up to 4.0.28

ChangeSet
  1.2119.535.4 06/05/11 11:29:08 reggie@big_geek. +26 -0
  performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1.
  This is being pushed to a private tree and tested before being sent to the mainline.

  CMakeLists.txt
    1.20 06/05/11 11:27:21 reggie@big_geek. +0 -0
    Rename: cmakelists.txt.tmp -> CMakeLists.txt

  cmakelists.txt.tmp
    1.19 06/05/11 11:27:19 reggie@big_geek. +0 -0
    Rename: cmakelists.txt -> cmakelists.txt.tmp

  storage/example/CMakeLists.txt
    1.3 06/05/11 11:27:12 reggie@big_geek. +0 -0
    Rename: storage/example/cmakelists.txt.tmp -> storage/example/CMakeLists.txt

  storage/example/cmakelists.txt.tmp
    1.2 06/05/11 11:27:10 reggie@big_geek. +0 -0
    Rename: storage/example/cmakelists.txt -> storage/example/cmakelists.txt.tmp

  storage/blackhole/CMakeLists.txt
    1.4 06/05/11 11:26:59 reggie@big_geek. +0 -0
    Rename: storage/blackhole/cmakelists.txt.tmp -> storage/blackhole/CMakeLists.txt

  storage/blackhole/cmakelists.txt.tmp
    1.3 06/05/11 11:26:58 reggie@big_geek. +0 -0
    Rename: storage/blackhole/cmakelists.txt -> storage/blackhole/cmakelists.txt.tmp

  storage/bdb/CMakeLists.txt
    1.5 06/05/11 11:26:51 reggie@big_geek. +0 -0
    Rename: storage/bdb/cmakelists.txt.tmp -> storage/bdb/CMakeLists.txt

  storage/bdb/cmakelists.txt.tmp
    1.4 06/05/11 11:26:50 reggie@big_geek. +0 -0
    Rename: storage/bdb/cmakelists.txt -> storage/bdb/cmakelists.txt.tmp

  storage/archive/CMakeLists.txt
    1.5 06/05/11 11:26:43 reggie@big_geek. +0 -0
    Rename: storage/archive/cmakelists.txt.tmp -> storage/archive/CMakeLists.txt

  storage/archive/cmakelists.txt.tmp
    1.4 06/05/11 11:26:41 reggie@big_geek. +0 -0
    Rename: storage/archive/cmakelists.txt -> storage/archive/cmakelists.txt.tmp

  mysys/CMakeLists.txt
    1.8 06/05/11 11:26:21 reggie@big_geek. +0 -0
    Rename: mysys/cmakelists.txt.tmp -> mysys/CMakeLists.txt

  mysys/cmakelists.txt.tmp
    1.7 06/05/11 11:26:19 reggie@big_geek. +0 -0
    Rename: mysys/cmakelists.txt -> mysys/cmakelists.txt.tmp

  regex/CMakeLists.txt
    1.6 06/05/11 11:26:10 reggie@big_geek. +0 -0
    Rename: regex/cmakelists.txt.tmp -> regex/CMakeLists.txt

  regex/cmakelists.txt.tmp
    1.5 06/05/11 11:26:08 reggie@big_geek. +0 -0
    Rename: regex/cmakelists.txt -> regex/cmakelists.txt.tmp

  strings/CMakeLists.txt
    1.6 06/05/11 11:26:01 reggie@big_geek. +0 -0
    Rename: strings/cmakelists.txt.tmp -> strings/CMakeLists.txt

  strings/cmakelists.txt.tmp
    1.5 06/05/11 11:26:00 reggie@big_geek. +0 -0
    Rename: strings/cmakelists.txt -> strings/cmakelists.txt.tmp

  dbug/CMakeLists.txt
    1.5 06/05/11 11:25:53 reggie@big_geek. +0 -0
    Rename: dbug/cmakelists.txt.tmp -> dbug/CMakeLists.txt

  dbug/cmakelists.txt.tmp
    1.4 06/05/11 11:25:52 reggie@big_geek. +0 -0
    Rename: dbug/cmakelists.txt -> dbug/cmakelists.txt.tmp

  vio/CMakeLists.txt
    1.6 06/05/11 11:25:41 reggie@big_geek. +0 -0
    Rename: vio/cmakelists.txt.tmp -> vio/CMakeLists.txt

  vio/cmakelists.txt.tmp
    1.5 06/05/11 11:25:39 reggie@big_geek. +0 -0
    Rename: vio/cmakelists.txt -> vio/cmakelists.txt.tmp

  libmysqld/examples/CMakeLists.txt
    1.3 06/05/11 11:17:08 reggie@big_geek. +0 -0
    Rename: libmysqld/examples/cmakelists.txt.tmp -> libmysqld/examples/CMakeLists.txt

  libmysqld/examples/cmakelists.txt.tmp
    1.2 06/05/11 11:17:07 reggie@big_geek. +0 -0
    Rename: libmysqld/examples/cmakelists.txt -> libmysqld/examples/cmakelists.txt.tmp

  server-tools/instance-manager/CMakeLists.txt
    1.7 06/05/11 11:16:56 reggie@big_geek. +0 -0
    Rename: server-tools/instance-manager/cmakelists.txt.tmp -> server-tools/instance-manager/CMakeLists.txt

  server-tools/instance-manager/cmakelists.txt.tmp
    1.6 06/05/11 11:16:55 reggie@big_geek. +0 -0
    Rename: server-tools/instance-manager/cmakelists.txt -> server-tools/instance-manager/cmakelists.txt.tmp

  storage/innobase/CMakeLists.txt
    1.6 06/05/11 11:16:42 reggie@big_geek. +0 -0
    Rename: storage/innobase/cmakelists.txt.tmp -> storage/innobase/CMakeLists.txt

  storage/innobase/cmakelists.txt.tmp
    1.5 06/05/11 11:16:41 reggie@big_geek. +0 -0
    Rename: storage/innobase/cmakelists.txt -> storage/innobase/cmakelists.txt.tmp

  storage/csv/CMakeLists.txt
    1.4 06/05/11 11:16:35 reggie@big_geek. +0 -0
    Rename: storage/csv/cmakelists.txt.tmp -> storage/csv/CMakeLists.txt

  storage/csv/cmakelists.txt.tmp
    1.3 06/05/11 11:16:33 reggie@big_geek. +0 -0
    Rename: storage/csv/cmakelists.txt -> storage/csv/cmakelists.txt.tmp

  storage/myisammrg/CMakeLists.txt
    1.5 06/05/11 11:16:27 reggie@big_geek. +0 -0
    Rename: storage/myisammrg/cmakelists.txt.tmp -> storage/myisammrg/CMakeLists.txt

  storage/myisammrg/cmakelists.txt.tmp
    1.4 06/05/11 11:16:26 reggie@big_geek. +0 -0
    Rename: storage/myisammrg/cmakelists.txt -> storage/myisammrg/cmakelists.txt.tmp

  storage/myisam/CMakeLists.txt
    1.6 06/05/11 11:16:19 reggie@big_geek. +0 -0
    Rename: storage/myisam/cmakelists.txt.tmp -> storage/myisam/CMakeLists.txt

  storage/myisam/cmakelists.txt.tmp
    1.5 06/05/11 11:16:18 reggie@big_geek. +0 -0
    Rename: storage/myisam/cmakelists.txt -> storage/myisam/cmakelists.txt.tmp

  storage/heap/CMakeLists.txt
    1.4 06/05/11 11:16:12 reggie@big_geek. +0 -0
    Rename: storage/heap/cmakelists.txt.tmp -> storage/heap/CMakeLists.txt

  storage/heap/cmakelists.txt.tmp
    1.3 06/05/11 11:16:09 reggie@big_geek. +0 -0
    Rename: storage/heap/cmakelists.txt -> storage/heap/cmakelists.txt.tmp

  extra/yassl/taocrypt/CMakeLists.txt
    1.6 06/05/11 11:15:44 reggie@big_geek. +0 -0
    Rename: extra/yassl/taocrypt/cmakelists.txt.tmp -> extra/yassl/taocrypt/CMakeLists.txt

  extra/yassl/taocrypt/cmakelists.txt.tmp
    1.5 06/05/11 11:15:43 reggie@big_geek. +0 -0
    Rename: extra/yassl/taocrypt/cmakelists.txt -> extra/yassl/taocrypt/cmakelists.txt.tmp

  extra/yassl/CMakeLists.txt
    1.4 06/05/11 11:15:37 reggie@big_geek. +0 -0
    Rename: extra/yassl/cmakelists.txt.tmp -> extra/yassl/CMakeLists.txt

  extra/yassl/cmakelists.txt.tmp
    1.3 06/05/11 11:15:36 reggie@big_geek. +0 -0
    Rename: extra/yassl/cmakelists.txt -> extra/yassl/cmakelists.txt.tmp

  tests/CMakeLists.txt
    1.7 06/05/11 11:15:25 reggie@big_geek. +0 -0
    Rename: tests/cmakelists.txt.tmp -> tests/CMakeLists.txt

  tests/cmakelists.txt.tmp
    1.6 06/05/11 11:15:24 reggie@big_geek. +0 -0
    Rename: tests/cmakelists.txt -> tests/cmakelists.txt.tmp

  extra/CMakeLists.txt
    1.10 06/05/11 11:15:06 reggie@big_geek. +0 -0
    Rename: extra/cmakelists.txt.tmp -> extra/CMakeLists.txt

  extra/cmakelists.txt.tmp
    1.9 06/05/11 11:15:04 reggie@big_geek. +0 -0
    Rename: extra/cmakelists.txt -> extra/cmakelists.txt.tmp

  zlib/CMakeLists.txt
    1.6 06/05/11 11:14:58 reggie@big_geek. +0 -0
    Rename: zlib/cmakelists.txt.tmp -> zlib/CMakeLists.txt

  zlib/cmakelists.txt.tmp
    1.5 06/05/11 11:14:56 reggie@big_geek. +0 -0
    Rename: zlib/cmakelists.txt -> zlib/cmakelists.txt.tmp

  sql/CMakeLists.txt
    1.20 06/05/11 11:14:46 reggie@big_geek. +0 -0
    Rename: sql/cmakelists.txt.tmp -> sql/CMakeLists.txt

  sql/cmakelists.txt.tmp
    1.19 06/05/11 11:14:44 reggie@big_geek. +0 -0
    Rename: sql/cmakelists.txt -> sql/cmakelists.txt.tmp

  libmysqld/CMakeLists.txt
    1.4 06/05/11 11:14:24 reggie@big_geek. +0 -0
    Rename: libmysqld/cmakelists.txt.tmp -> libmysqld/CMakeLists.txt

  libmysqld/cmakelists.txt.tmp
    1.3 06/05/11 11:14:21 reggie@big_geek. +0 -0
    Rename: libmysqld/cmakelists.txt -> libmysqld/cmakelists.txt.tmp

  libmysql/CMakeLists.txt
    1.10 06/05/11 11:14:11 reggie@big_geek. +0 -0
    Rename: libmysql/cmakelists.txt.tmp -> libmysql/CMakeLists.txt

  libmysql/cmakelists.txt.tmp
    1.9 06/05/11 11:14:04 reggie@big_geek. +0 -0
    Rename: libmysql/cmakelists.txt -> libmysql/cmakelists.txt.tmp

  client/CMakeLists.txt
    1.12 06/05/11 11:13:43 reggie@big_geek. +0 -0
    Rename: client/cmakelists.txt.tmp -> client/CMakeLists.txt

  client/cmakelists.txt.tmp
    1.11 06/05/11 11:13:34 reggie@big_geek. +0 -0
    Rename: client/cmakelists.txt -> client/cmakelists.txt.tmp

ChangeSet
  1.2119.537.1 06/05/11 18:12:06 jmiller@mysql.com +5 -0
  changes for when NDB is default engine

ChangeSet
  1.2132 06/05/11 16:34:10 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
  Removed duplicate test.

ChangeSet
  1.2119.535.3 06/05/11 09:43:58 reggie@big_geek. +1 -0
  bringing handlerton-win.cc back after incorrectly deleteing it.  It is not needed for 5.1 or later but is used by 5.0 

  mysql-test/t/rpl_row_basic_11bugs.test
    1.5 06/05/11 17:57:58 jmiller@mysql.com +4 -0
    Disables for when ndb is default as the show binlog events will cause failure

  mysql-test/t/rpl_multi_engine.test
    1.6 06/05/11 17:53:20 jmiller@mysql.com +3 -0
    Results will not match when ndb is default do to myisam table creates and show create

  mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
    1.15 06/05/11 17:44:41 jmiller@mysql.com +4 -0
    Updated to skip when ndb is default

  sql/handlerton-win.cc
    1.5 06/05/11 09:38:03 reggie@big_geek. +0 -0
    Rename: BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df -> sql/handlerton-win.cc

  mysql-test/r/rpl_sp004.result
    1.2 06/05/11 16:36:53 jmiller@mysql.com +8 -8
    updated to work with default NDB engine

  mysql-test/t/rpl_sp004.test
    1.4 06/05/11 16:36:38 jmiller@mysql.com +8 -8
    updated to work with default NDB engine

ChangeSet
  1.1810.1667.1 06/05/11 16:29:02 mats@mysql.com +2 -0
  Bug#15886 (Test: Timing issue in test "rpl_until"):
  Changed format for SHOW SLAVE STATUS to vertical output.

  mysql-test/t/rpl_until.test
    1.21.2.1 06/05/11 16:28:54 mats@mysql.com +4 -4
    Changed format for SHOW SLAVE STATUS to vertical output

  mysql-test/r/rpl_until.result
    1.23.1.1 06/05/11 16:28:54 mats@mysql.com +136 -12
    Result change

  mysql-test/t/mysqldump.test
    1.98 06/05/11 16:34:04 jani@a193-229-222-105.elisa-laajakaista.fi +0 -9
    Removed duplicate test. This is already in the test file.
    

ChangeSet
  1.1810.1666.1 06/05/11 15:30:54 gkodinov@mysql.com +5 -0
  BUG#7549: Missing error message for invalid view selection with subquery.
  
  When a view statement is compiled on CREATE VIEW time, most of the 
  optimizations should not be done. Finding the right optimization 
  for a subquery is one of them.
  Unfortunately the optimizer is resolving the column references of 
  the left expression of IN subqueries in the process of deciding 
  witch optimization to use (if needed). So there should be a 
  special case in Item_in_subselect::fix_fields() : check the 
  validity of the left expression of IN subqueries in CREATE VIEW 
  mode and then proceed as normal. 

  sql/item_subselect.h
    1.77 06/05/11 15:30:49 gkodinov@mysql.com +1 -0
    fix_fields overloaded so it can prepare left_expr

  sql/item_subselect.cc
    1.113.1.11 06/05/11 15:30:49 gkodinov@mysql.com +11 -0
    overloaded fix_fields to fix the left_expr in prepare_view_mode

  mysql-test/t/subselect.test
    1.117 06/05/11 15:30:49 gkodinov@mysql.com +15 -0
    test case

  mysql-test/r/view.result
    1.138.1.17 06/05/11 15:30:49 gkodinov@mysql.com +1 -1
    chnaged explain due to column being resolved

  mysql-test/r/subselect.result
    1.134.4.1 06/05/11 15:30:49 gkodinov@mysql.com +8 -0
    test case

ChangeSet
  1.2119.534.1 06/05/11 11:09:58 mats@mysql.com +7 -0
  Bug#17400 (CRBR: Delete and update of table w/o PK fails on slave):
  Fixing bug where UPDATE failed on slave and some cleanup of ndb_unpack_record().

  sql/log_event.cc
    1.220.1.1 06/05/11 11:09:48 mats@mysql.com +34 -38
    Starting and stopping range scan and index read inside find_and_fetch row
    instead of in calling function. There are storage engines that require the
    search to be restarted for every changed row.

  sql/ha_ndbcluster.cc
    1.304 06/05/11 11:09:47 mats@mysql.com +18 -8
    Using move_field_offset() to move field pointer.
    Using my_ptrdiff_t instead of uint for pointer difference.
    Removing ineffective cast.
    Calling member function directly, bypassing the virtual mechanism
    for Field_bit.

  mysql-test/t/rpl_ndb_myisam2ndb-slave.opt
    1.2 06/05/11 11:09:47 mats@mysql.com +1 -1
    Storage engine name change

  mysql-test/t/rpl_ndb_innodb2ndb-slave.opt
    1.2 06/05/11 11:09:47 mats@mysql.com +1 -1
    Storage engine name change

  mysql-test/t/rpl_bit_npk.test
    1.2 06/05/11 11:09:47 mats@mysql.com +16 -12
    Making test storage-engine independent

  mysql-test/t/disabled.def
    1.152.1.1 06/05/11 11:09:47 mats@mysql.com +2 -2
    Disabling tests

  mysql-test/r/rpl_bit_npk.result
    1.3 06/05/11 11:09:47 mats@mysql.com +36 -32
    Result change

ChangeSet
  1.2128 06/05/11 04:11:50 jani@a193-229-222-105.elisa-laajakaista.fi +3 -0
  Some fixes that were not done in original merge, compilation revealed.

  sql/sql_show.cc
    1.333 06/05/11 04:11:42 jani@a193-229-222-105.elisa-laajakaista.fi +5 -0
    Added missing variable.

  include/violite.h
    1.48 06/05/11 04:11:42 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Struct name changed, but forgot to change it here.
    

  client/mysqlimport.c
    1.73 06/05/11 04:11:42 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Fixed a problem with merge.

ChangeSet
  1.2119.494.29 06/05/11 00:59:34 jmiller@mysql.com +1 -0
  rpl_log.test:
    Remove comments not needed

  mysql-test/extra/rpl_tests/rpl_log.test
    1.35 06/05/11 00:59:21 jmiller@mysql.com +0 -4
    Remove comments not needed

ChangeSet
  1.2119.494.28 06/05/11 00:58:13 jmiller@mysql.com +1 -0
  rpl_log.test:
    Correct fix for test bug #19158

  mysql-test/extra/rpl_tests/rpl_log.test
    1.34 06/05/11 00:57:56 jmiller@mysql.com +6 -1
    Correct fix for test bug #19158

ChangeSet
  1.1616.2582.3 06/05/10 21:53:01 kent@mysql.com +1 -0
  mysql.spec.sh:
    Compile in all character sets in Max (bug#14918)

  support-files/mysql.spec.sh
    1.83.5.3 06/05/10 21:51:21 kent@mysql.com +8 -1
    Compile in all character sets in Max (bug#14918)

ChangeSet
  1.2119.1.261 06/05/10 21:35:05 msvensson@neptunus.(none) +2 -0
  Add missing drop table  

  mysql-test/t/trigger.test
    1.46 06/05/10 21:35:00 msvensson@neptunus.(none) +1 -0
    Add missing drop table  

  mysql-test/r/trigger.result
    1.42 06/05/10 21:35:00 msvensson@neptunus.(none) +1 -0
    Add missing drop table  

ChangeSet
  1.1810.1633.10 06/05/10 23:16:30 anozdrin@mysql.com +4 -0
  Fix for BUG#18587: Function that accepts and returns TEXT
  garbles data if longer than 766 chars.
  
  The problem is that a stored routine returns BLOBs to the previous
  caller, BLOBs are shallow-copied (i.e. only pointers to the data are
  copied). The fix is to also copy data of BLOBs.

  sql/item_func.cc
    1.270.8.1 06/05/10 23:16:27 anozdrin@mysql.com +1 -0
    Request copying BLOBs for the result table.

  sql/field_conv.cc
    1.52.1.3 06/05/10 23:16:27 anozdrin@mysql.com +2 -1
    Do not jump to optimization if the field type is BLOB and
    the destination table requires copying of BLOBs.

  mysql-test/t/sp.test
    1.174.1.13 06/05/10 23:16:27 anozdrin@mysql.com +47 -0
    Added a test case for BUG#18587.

  mysql-test/r/sp.result
    1.170.1.29 06/05/10 23:16:27 anozdrin@mysql.com +31 -0
    Updated result file.

ChangeSet
  1.2119.1.260 06/05/10 20:39:26 msvensson@neptunus.(none) +2 -0
  Update test results for 5.1

  mysql-test/r/auto_increment.result
    1.37.1.2 06/05/10 20:39:20 msvensson@neptunus.(none) +3 -3
    Update test results for 5.1

  mysql-test/r/ansi.result
    1.9 06/05/10 20:39:20 msvensson@neptunus.(none) +7 -7
    Update test results for 5.1

ChangeSet
  1.2119.494.27 06/05/10 13:57:58 serg@sergbook.mysql.com +1 -0
  apparently "sinclude" is consireded by aclocal (up to 1.9.5)
  by a dirty word, and it complains about it, even in a comment.

  config/ac-macros/plugins.m4
    1.15 06/05/10 13:57:52 serg@sergbook.mysql.com +1 -1
    apparently "sinclude" is consireded by aclocal (up to 1.9.5)
    by a dirty word, and it complains about it, even in a comment.

ChangeSet
  1.2119.518.3 06/05/10 11:33:36 tim@siva.hindu.god +1 -0
  Bug #6061 mysql-log-rotate script - error logging doesn't use new file
  
  - Fix mysqld_safe so that it always passes correct --log-error argument to mysqld
  - A few other minor clean-ups to mysqld_safe

  scripts/mysqld_safe.sh
    1.83 06/05/10 11:33:30 tim@siva.hindu.god +52 -16
    Bug #6061 mysql-log-rotate script - error logging doesn't use new file
    
    - Change mysqld_safe to pass --log-error to mysqld in all cases.  The old behavior was to usually "swallow" the --log-error=file.name argument, which caused mysqld to write to stderr and not be able to flush the error log file.  Ironically, passing --log-error (with no file name) seemed to work fine, because mysqld_safe didn't recognize it and passed it on to mysqld as an unknown option.
    - Ensure that the error log file matches what mysqld uses; in particular, add ".err" if given a --log-error argument with no extension, and add "$DATADIR" to the front of a relative path
    - Various other mysqld_safe clean-ups while there - quote arguments properly, remove some redundant code

ChangeSet
  1.2119.530.1 06/05/10 12:53:40 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +15 -0
  BUG#19010: Fix issues with that ALTER TABLE from auto-partitioned NDB table doesn't work unless primary key exists on table.

  sql/unireg.cc
    1.79.1.1 06/05/10 12:53:35 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +13 -5
    Fix code for writing frm to also write autopartition flag at end of partition info, fix some length issues
    at the same time that was in this part that caused no problems since partition info always was the last info
    in the file.

  sql/table.h
    1.138.1.1 06/05/10 12:53:35 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    New flag for auto partition on share object

  sql/table.cc
    1.212.1.1 06/05/10 12:53:34 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +10 -1
    Fix reading of frm file where new auto-partition flag is introduced.

  sql/sql_table.cc
    1.326.3.1 06/05/10 12:53:34 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    Set auto partition flag when auto partitions are generated in create table

  sql/sql_show.cc
    1.326.4.1 06/05/10 12:53:34 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    Only print partition info for non-auto-partitioned tables

  sql/sql_partition.cc
    1.67.2.1 06/05/10 12:53:34 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +24 -1
    Ensure that auto-partitiong flag is reset when partitions are dropped, added, reorganised or coalesced.
    Ensure that auto-partitioned tables are altered into non-partitioned table when ALTER TABLE t1 engine=X
    is performed.

  sql/partition_info.h
    1.11 06/05/10 12:53:33 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
    New boolean to keep track of auto partitioned or not

  mysql-test/t/ndb_partition_key.test
    1.10.2.1 06/05/10 12:53:33 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +20 -0
    New test cases for auto-partitioning change that was made to fix bug

  mysql-test/r/rpl_ndb_dd_advance.result
    1.5 06/05/10 12:53:33 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +6 -6
    Test cases changes now that auto-partitioning is remembered in frm file

  mysql-test/r/rpl_ndb_UUID.result
    1.4 06/05/10 12:53:33 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Test cases changes now that auto-partitioning is remembered in frm file

  mysql-test/r/ndb_partition_key.result
    1.16.2.1 06/05/10 12:53:33 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +38 -1
    New test cases for auto-partitioning change that was made to fix bug

  mysql-test/r/ndb_gis.result
    1.9 06/05/10 12:53:32 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -2
    Test cases changes now that auto-partitioning is remembered in frm file

  mysql-test/r/ndb_dd_disk2memory.result
    1.5 06/05/10 12:53:32 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -4
    Test cases changes now that auto-partitioning is remembered in frm file

  mysql-test/r/ndb_dd_basic.result
    1.7.1.1 06/05/10 12:53:32 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Test cases changes now that auto-partitioning is remembered in frm file

  mysql-test/r/ndb_bitfield.result
    1.14 06/05/10 12:53:32 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Test cases changes now that auto-partitioning is remembered in frm file

ChangeSet
  1.2119.529.1 06/05/10 17:29:28 joerg@mysql.com +4 -0
  Several "unittest" files  :  Ensure that the configure result is used when compiling them.

  unittest/mytap/t/basic.t.c
    1.3 06/05/10 17:29:22 joerg@mysql.com +2 -0
    Ensure that the configure result is used when compiling this module.

  unittest/examples/todo.t.c
    1.2 06/05/10 17:29:22 joerg@mysql.com +2 -0
    Ensure that the configure result is used when compiling this module.

  unittest/examples/skip_all.t.c
    1.3 06/05/10 17:29:22 joerg@mysql.com +2 -0
    Ensure that the configure result is used when compiling this module.

  unittest/examples/no_plan.t.c
    1.2 06/05/10 17:29:22 joerg@mysql.com +2 -0
    Ensure that the "configure" result is used when compiling this module.

ChangeSet
  1.2119.528.2 06/05/10 11:27:38 serg@sergbook.mysql.com +1 -0
  a workaround for aclocal-1.8 bug

  config/ac-macros/plugins.m4
    1.14 06/05/10 11:26:58 serg@sergbook.mysql.com +4 -1
    a workaround for aclocal-1.8 bug

ChangeSet
  1.2119.1.258 06/05/10 16:58:44 msvensson@neptunus.(none) +1 -0
  Update results to 5.1 format

  mysql-test/r/mysqldump.result
    1.104.1.2 06/05/10 16:58:39 msvensson@neptunus.(none) +6 -6
    Update results to 5.1 format

ChangeSet
  1.2119.523.7 06/05/10 16:54:29 tomas@poseidon.ndb.mysql.com +1 -0
  ndb: added extra printout on failed "internal" discovery for binlog
  + removed extra (not needed) discovery done at online create/drop index

  sql/ha_ndbcluster_binlog.cc
    1.52 06/05/10 16:54:21 tomas@poseidon.ndb.mysql.com +16 -7
    ndb: added extra printout on failed "internal" discovery for binlog
    + removed extra (not needed) discovery done at online create/drop index

ChangeSet
  1.1810.1633.9 06/05/10 18:53:28 anozdrin@mysql.com +1 -0
  Make it compilable on Windows.

  server-tools/instance-manager/options.cc
    1.30.2.2 06/05/10 18:53:25 anozdrin@mysql.com +2 -0
    Make it compilable on Windows.

ChangeSet
  1.2119.1.257 06/05/10 15:54:51 msvensson@neptunus.(none) +1 -0
  Merge 5.0 to 5.1

  sql/sql_show.cc
    1.331.1.2 06/05/10 15:54:46 msvensson@neptunus.(none) +3 -0
    Add the variable "limited_mysql_mode" to function 'store_create_info'

ChangeSet
  1.1810.1665.1 06/05/10 17:40:20 sergefp@mysql.com +6 -0
  BUG#17379 Wrong reuse of E(#rows(range)) as E(#rows(ref(const))):
  Re-work best_access_path() and find_best() to reuse E(#rows(range access)) as
  E(#rows(ref[_or_null](const) access) only when it is appropriate.
  [This is the final cumulative patch]

  sql/table.h
    1.102.1.25 06/05/10 17:40:15 sergefp@mysql.com +1 -0
    BUG#17379: Wrong reuse of E(#rows(range)) as E(#rows(ref(const))):
    Make range optimizer together with TABLE::quick_* also return TABLE::quick_n_ranges

  sql/sql_select.cc
    1.312.1.104 06/05/10 17:40:15 sergefp@mysql.com +112 -19
    BUG#17379: Wrong reuse of E(#rows(range)) as E(#rows(ref(const))):
    Re-work best_access_path() to reuse E(#rows(range access)) as
    E(#rows(ref[_or_null](const) access) only when it is appropriate.

  sql/opt_range.cc
    1.159.1.51 06/05/10 17:40:15 sergefp@mysql.com +9 -2
    BUG#17379: Wrong reuse of E(#rows(range)) as E(#rows(ref(const))):
    Make range optimizer together with TABLE::quick_* also return TABLE::quick_n_ranges

  mysql-test/t/select.test
    1.100 06/05/10 17:40:15 sergefp@mysql.com +13 -0
    BUG#17379: Testcase

  mysql-test/r/subselect.result
    1.134.1.7 06/05/10 17:40:15 sergefp@mysql.com +1 -1
    BUG#17379: Updated test results

  mysql-test/r/select.result
    1.121.1.1 06/05/10 17:40:15 sergefp@mysql.com +16 -0
    BUG#17379: Testcase

ChangeSet
  1.2119.523.6 06/05/10 13:33:17 tomas@poseidon.ndb.mysql.com +1 -0
  ndb: fix assertion code in event code during cluster shutdown

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.57 06/05/10 13:32:50 tomas@poseidon.ndb.mysql.com +27 -17
    ndb: fix assertion code in event code during cluster shutdown

ChangeSet
  1.1810.1664.2 06/05/10 14:34:03 anozdrin@mysql.com +2 -0
  Commit forgotten changes for BUG#14106.

  mysql-test/r/im_options_unset.result
    1.2 06/05/10 14:34:00 anozdrin@mysql.com +3 -3
    Fixed result file.

  mysql-test/r/im_options_set.result
    1.2 06/05/10 14:34:00 anozdrin@mysql.com +3 -3
    Fixed result file.

ChangeSet
  1.1810.1633.6 06/05/10 14:12:32 dlenev@mysql.com +1 -0
  Follow-up for the patch for bugs #12472/#15137 "CREATE TABLE ... SELECT ...
  which explicitly or implicitly uses stored function gives 'Table not locked'
  error"
  
  Test case for these bugs crashed in --ps-protocol mode. The crash was caused
  by incorrect usage of check_grant() routine from create_table_precheck()
  routine. The former assumes that either number of tables to be inspected by
  it is limited explicitly (i.e. is is not UINT_MAX) or table list used and
  thd->lex->query_tables_own_last value correspond to each other.
  create_table_precheck() was not fulfilling this condition and crash happened.
  The fix simply sets number of tables to be inspected by check_grant() to 1.

  sql/sql_parse.cc
    1.426.1.118 06/05/10 14:12:25 dlenev@mysql.com +1 -1
    create_table_precheck():
      At the moment when create_table_precheck() is called TABLE_LIST element
      representing table to be created does not belong to global table list
      therefore we should limit number of tables to be inspected by check_grant()
      explicitly (as in this case table list passed to this function does not
      correspond to thd->lex->query_tables_own_last value).

ChangeSet
  1.1810.1661.3 06/05/09 22:22:46 cmiller@zippy.(none) +3 -0
  Bug#19564:  mysql displays NULL instead of space
  
  Correct a bug (that I introduced, after using Oracle's database software for 
  too many years) where the length of the database-sent data is incorrectly 
  used to infer NULLness.

  mysql-test/t/mysql.test
    1.4.1.6 06/05/09 22:22:42 cmiller@zippy.(none) +8 -0
    Add test and version marker

  mysql-test/r/mysql.result
    1.9 06/05/09 22:22:42 cmiller@zippy.(none) +10 -2
    Add result and version marker, and correct previous result.

  client/mysql.cc
    1.199.4.1 06/05/09 22:22:42 cmiller@zippy.(none) +1 -1
    No longer use the length of the data to infer whether it is NULL or not.

ChangeSet
  1.1810.1659.1 06/05/09 13:31:46 acurtis@xiphis.org +8 -0
  bug#10952
    "alter table from MyISAM to MERGE lost data without errors and warnings"
    Add new handlerton flag which prevent user from altering table storage
    engine to storage engines which would lose data. Both 'blackhole' and 
    'merge' are marked with the new flag.
    Tests included.

  sql/sql_table.cc
    1.239.23.2 06/05/09 13:31:42 acurtis@xiphis.org +3 -1
    Bug#10952
      If alter is changing engine, check if new engine allows creating table
      via ALTER statement.

  sql/handler.h
    1.138.10.3 06/05/09 13:31:42 acurtis@xiphis.org +1 -0
    Bug#10952
      new handlerton flag

  sql/ha_myisammrg.cc
    1.59.1.18 06/05/09 13:31:42 acurtis@xiphis.org +1 -1
    Bug#10952
      shouldn't be able to alter a table into a merge

  sql/ha_blackhole.cc
    1.21.1.1 06/05/09 13:31:42 acurtis@xiphis.org +1 -1
    Bug#10952
      shouldn't be able to alter a table into a blackhole

  mysql-test/t/merge.test
    1.37.1.3 06/05/09 13:31:42 acurtis@xiphis.org +12 -0
    test for bug#10952

  mysql-test/t/blackhole.test
    1.4.3.1 06/05/09 13:31:42 acurtis@xiphis.org +12 -0
    test for bug#10952

  mysql-test/r/merge.result
    1.43.1.4 06/05/09 13:31:42 acurtis@xiphis.org +8 -0
    test for bug#10952

  mysql-test/r/blackhole.result
    1.5.2.1 06/05/09 13:31:42 acurtis@xiphis.org +8 -0
    test for bug#10952

ChangeSet
  1.1616.2583.1 06/05/09 23:01:31 aelkin@mysql.com +8 -0
  BUG#14157: utf8 encoding in binlog without set character_set_client e.g DROP temporary
  
  Binlog lacks encoding info about DROPped temporary table.
  
  Idea of the fix is to switch temporary to system_charset_info when a temporary table
  is DROPped for binlog. Since that is the server, that automatically, but not the client, who generates the query
  the binlog should be updated on the server's encoding for the coming DROP.
  The `write_binlog_with_system_charset()' is introduced to replace similar problematic places in the code.

  sql/sql_base.cc
    1.145.1.123 06/05/09 23:01:28 aelkin@mysql.com +1 -1
    Idea of the fix is to switch temporary to system_charset_info when a temporary table
    is DROPped for binlog. Since that is the server, not the client, who generates the query
    the binlog should be updated on server's encoding for the coming DROP.

  sql/mysql_priv.h
    1.186.91.49 06/05/09 23:01:28 aelkin@mysql.com +7 -0
    `write_binlog_with_system_charset()' is added to be called when a binlog event
    is created "implicitly" like DROP temporary table is case of closing connection.

  mysql-test/t/rpl_temporary.test
    1.13.1.3 06/05/09 23:01:27 aelkin@mysql.com +12 -0
    Check slave digests binlog with DROP temporary tables created in koi8r.

  mysql-test/t/mysqlbinlog.test
    1.8.1.9 06/05/09 23:01:27 aelkin@mysql.com +10 -1
    Check roll-forward recovery from binlog where there are DROP temporary tables created
    in koi8r.

  mysql-test/r/rpl_temporary.result
    1.3.1.11 06/05/09 23:01:27 aelkin@mysql.com +4 -0
    results changed

  mysql-test/r/mysqlbinlog.result
    1.3.1.8 06/05/09 23:01:27 aelkin@mysql.com +6 -1
    results changed

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.6.1.7 06/05/09 23:01:27 aelkin@mysql.com +3 -2
    results changed

  mysql-test/r/drop_temp_table.result
    1.4.1.7 06/05/09 23:01:27 aelkin@mysql.com +1 -0
    results changed

ChangeSet
  1.2119.528.1 06/05/09 15:14:29 serg@sergbook.mysql.com +2 -0
  fix HA_ERR_RECORD_DELETED for falcon

  sql/opt_range.cc
    1.216 06/05/09 15:13:45 serg@sergbook.mysql.com +84 -75
    fix HA_ERR_RECORD_DELETED for falcon

  include/my_base.h
    1.88 06/05/09 15:13:43 serg@sergbook.mysql.com +1 -1
    fix HA_ERR_RECORD_DELETED for falcon

ChangeSet
  1.2119.527.2 06/05/09 21:08:12 tomas@poseidon.ndb.mysql.com +3 -0
  stilled more valgrind memleaks

  storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
    1.21 06/05/09 21:08:01 tomas@poseidon.ndb.mysql.com +28 -0
    stilled more valgrind memleaks

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.56 06/05/09 21:08:01 tomas@poseidon.ndb.mysql.com +47 -57
    stilled more valgrind memleaks

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.131 06/05/09 21:08:01 tomas@poseidon.ndb.mysql.com +13 -13
    stilled more valgrind memleaks

ChangeSet
  1.2119.524.5 06/05/09 11:14:31 serg@sergbook.mysql.com +4 -0
  results fixed

  mysql-test/r/sql_mode.result
    1.38 06/05/09 11:13:37 serg@sergbook.mysql.com +3 -3
    results fixed

  mysql-test/r/show_check.result
    1.94 06/05/09 11:13:32 serg@sergbook.mysql.com +7 -7
    results fixed

  mysql-test/r/heap.result
    1.49 06/05/09 11:13:31 serg@sergbook.mysql.com +3 -3
    results fixed

  mysql-test/r/ctype_utf8.result
    1.89 06/05/09 11:13:26 serg@sergbook.mysql.com +4 -4
    results fixed

ChangeSet
  1.1810.1658.1 06/05/09 18:13:01 gkodinov@mysql.com +5 -0
  BUG#18068: SELECT DISTINCT (with duplicates and covering index)
  
  When converting DISTINCT to GROUP BY where the columns are from the covering
  index and they are quoted twice in the SELECT list the optimizer is creating
  improper processing sequence. This is because of the fact that the columns
  of the covering index are not recognized as such and treated as non-index
  columns.
  
  Generally speaking duplicate columns can safely be removed from the GROUP
  BY/DISTINCT list because this will not add or remove new rows in the
  resulting set. Duplicates can be removed even if they are not consecutive
  (as is the case for ORDER BY, where the duplicate columns can be removed
  only if they are consecutive).
  
  So we can safely transform "SELECT DISTINCT a,a FROM ... ORDER BY a" to
  "SELECT a,a FROM ... GROUP BY a ORDER BY a" instead of 
  "SELECT a,a FROM .. GROUP BY a,a ORDER BY a". We can even transform 
  "SELECT DISTINCT a,b,a FROM ... ORDER BY a,b" to
  "SELECT a,b,a FROM ... GROUP BY a,b ORDER BY a,b".
  
  The fix to this bug consists of checking for duplicate columns in the SELECT
  list when constructing the GROUP BY list in transforming DISTINCT to GROUP
  BY and skipping the ones that are already in.

  sql/sql_select.cc
    1.312.69.1 06/05/09 18:12:55 gkodinov@mysql.com +11 -0
    duplicates check and removal

  mysql-test/t/group_min_max.test
    1.21 06/05/09 18:12:55 gkodinov@mysql.com +16 -0
    test case for the bug

  mysql-test/t/distinct.test
    1.23 06/05/09 18:12:55 gkodinov@mysql.com +16 -0
    test case for the bug without loose index scan

  mysql-test/r/group_min_max.result
    1.23 06/05/09 18:12:55 gkodinov@mysql.com +22 -0
    test case for the bug

  mysql-test/r/distinct.result
    1.44 06/05/09 18:12:55 gkodinov@mysql.com +12 -0
    test case for the bug without loose index scan

ChangeSet
  1.2119.524.4 06/05/09 16:24:57 midom@flute.local +1 -0
  Fix InnoDB building on MacOSX when autorun.sh is used

  BUILD/autorun.sh
    1.9 06/05/09 16:24:46 midom@flute.local +10 -7
    Add libtoolize/glibtoolize hook for InnoDB auto-stuff too

ChangeSet
  1.2119.527.1 06/05/09 14:51:42 tomas@poseidon.ndb.mysql.com +2 -0
  stilled some valgrind memleak warnings

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.55 06/05/09 14:51:35 tomas@poseidon.ndb.mysql.com +11 -0
    stilled some valgrind memleak warnings

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.130 06/05/09 14:51:35 tomas@poseidon.ndb.mysql.com +49 -4
    stilled some valgrind memleak warnings

ChangeSet
  1.1810.1657.1 06/05/09 16:39:11 dlenev@mysql.com +6 -0
  Fix for bugs#12472/#15137 'CREATE TABLE ... SELECT ... which explicitly
  or implicitly uses stored function gives "Table not locked" error'
  
  CREATE TABLE ... SELECT ... statement which was explicitly or implicitly
  (through view) using stored function gave "Table not locked" error.
  
  The actual bug resides in the current locking scheme of CREATE TABLE SELECT
  code, which first opens and locks tables of the SELECT statement itself,
  and then, having SELECT tables locked, creates the .FRM, opens the .FRM and
  acquires lock on it. This scheme opens a possibility for a deadlock, which
  was present and ignored since version 3.23 or earlier. This scheme also
  conflicts with the invariant of the prelocking algorithm -- no table can
  be open and locked while there are tables locked in prelocked mode.
  
  The patch makes an exception for this invariant when doing CREATE TABLE ...
  SELECT, thus extending the possibility of a deadlock to the prelocked mode.
  We can't supply a better fix in 5.0.

  sql/sql_table.cc
    1.239.24.1 06/05/09 16:39:06 dlenev@mysql.com +0 -99
    Moved create_table_from_items() routine into sql_insert.cc, since it was not
    used anywhere outside of this file and contains logic which is specific for
    CREATE TABLE ... SELECT statement.

  sql/sql_insert.cc
    1.146.20.1 06/05/09 16:39:06 dlenev@mysql.com +147 -0
    Moved create_table_from_items() from sql_table.cc to sql_insert.cc as it was
    not used outside of sql_insert.cc and contains code which is specific for
    CREATE TABLE ... SELECT.
    Also now when we are executing CREATE TABLE ... SELECT ... statement which
    SELECT part requires execution in prelocked mode we ignore set of locked
    tables in order to get access to the table we just have created.
    We probably don't want to do this if we are under real LOCK TABLES since
    it will widen window for deadlock too much.

  sql/sql_base.cc
    1.235.55.1 06/05/09 16:39:06 dlenev@mysql.com +4 -1
    open_table():
      Added flag which allows open table ignoring set of locked tables and
      prelocked mode.

  sql/mysql_priv.h
    1.290.47.1 06/05/09 16:39:06 dlenev@mysql.com +2 -7
    Added flag which can be passed to open_table() routine in order to ignore
    set of locked tables and prelocked mode.
    We don't need declaration of create_table_from_items() any longer as it was
    moved into sql_insert.cc and made static.

  mysql-test/t/sp.test
    1.174.10.1 06/05/09 16:39:06 dlenev@mysql.com +23 -0
    Added tests for bugs#12472/#15137 'CREATE TABLE ... SELECT ... which
    explicitly or implicitly uses stored function gives "Table not locked" error'

  mysql-test/r/sp.result
    1.170.16.1 06/05/09 16:39:06 dlenev@mysql.com +25 -0
    Added tests for bugs#12472/#15137 'CREATE TABLE ... SELECT ... which
    explicitly or implicitly uses stored function gives "Table not locked" error'

ChangeSet
  1.2119.526.1 06/05/09 12:30:06 mats@mysql.com +2 -0
  Plugging memory leak in row-based replication triggered by
  test rpl_err_ignoredtables.

  sql/rpl_rli.h
    1.3 06/05/09 12:30:00 mats@mysql.com +5 -6
    Adding assert to ensure post-condition of clear_tables_to_lock().
    Minor rewrites.

  sql/log_event.cc
    1.221 06/05/09 12:29:59 mats@mysql.com +15 -15
    Clearing tables to lock list in the event of errors.
    Adding asserts to catch failing to clear the list of tables to lock.
    Releasing allocated memory if the table will not be replicated.

ChangeSet
  1.2119.524.3 06/05/09 12:06:50 mskold@mysql.com +4 -0
  Changed to use new syntax for PRIMARY/UNIQUE KEY USING HASH

  mysql-test/r/ndb_partition_key.result
    1.16.1.1 06/05/09 12:05:58 mskold@mysql.com +2 -2
    Changed to use new syntax for PRIMARY/UNIQUE KEY USING HASH

  mysql-test/t/ndb_partition_key.test
    1.10.1.1 06/05/09 12:05:57 mskold@mysql.com +1 -1
    Changed to use new syntax for PRIMARY/UNIQUE KEY USING HASH

  mysql-test/t/ndb_index_unique.test
    1.22 06/05/09 12:05:56 mskold@mysql.com +3 -3
    Changed to use new syntax for PRIMARY/UNIQUE KEY USING HASH

  mysql-test/r/ndb_index_unique.result
    1.24 06/05/09 12:05:56 mskold@mysql.com +3 -3
    Changed to use new syntax for PRIMARY/UNIQUE KEY USING HASH

ChangeSet
  1.1616.2582.1 06/05/09 11:55:41 mskold@mysql.com +1 -0
  bug #19623  UniqueHashIndexes resource leak: allocate array pool based on MaxNoOfTables

  ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
    1.8.4.1 06/05/09 11:54:46 mskold@mysql.com +1 -1
    bug #19623  UniqueHashIndexes resource leak: allocate array pool based on MaxNoOfTables

ChangeSet
  1.1810.1654.2 06/05/09 11:01:50 msvensson@neptunus.(none) +1 -0
  BUG#16803 "ln -s /dev/null .mysql_history" doesn't work!
   - Add a check to see if the .mysql_history file a symlink to /dev/null 
     and in such case, skip reading and writing to it. 
       

  client/mysql.cc
    1.199.1.5 06/05/09 11:01:46 msvensson@neptunus.(none) +9 -1
    Add check to detect if the "mysql_history" file is a symlink to /dev/null.
    In that case, don't create histfile variable.
    That will make read_history and write_history to be skipped.

ChangeSet
  1.2119.525.1 06/05/08 21:41:10 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +6 -0
  BUG#19140: Create index caused crash

  sql/sql_table.cc
    1.326.2.1 06/05/08 21:41:04 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +8 -2
    Editorial changes + added a comment to a path in code I didn't remember myself what it was good for.

  sql/sql_partition.cc
    1.67.1.1 06/05/08 21:41:04 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -2
    Use stack variable, not variable on lex object, caused havoc when doing a create index.

  mysql-test/t/partition.test
    1.37.3.1 06/05/08 21:41:04 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +14 -0
    New test case for bug

  mysql-test/t/ndb_partition_key.test
    1.11 06/05/08 21:41:04 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +7 -0
    New test case to ensure path in code is tested

  mysql-test/r/partition.result
    1.36.3.1 06/05/08 21:41:03 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -0
    New test case for bug

  mysql-test/r/ndb_partition_key.result
    1.17 06/05/08 21:41:03 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -0
    New test case to ensure path in code is tested

ChangeSet
  1.1810.1653.1 06/05/08 16:38:45 jimw@mysql.com +8 -0
  Bug #1039: tmpdir and datadir not available via @@ system variable syntax
  Bug #19606: ssl variables are not displayed in show variables
  Bug #19616: log_queries_not_using_indexes  is not listed in show variables
  
    Make basedir, datadir, tmpdir, log_queries_not_using_indexes, ssl_ca,
    ssl_capath, ssl_cert, ssl_cipher, and ssl_key all available both from
    SHOW VARIABLES and as @@variables.
  
    As a side-effect of this change, log_queries_not_using_indexes can
    be changed at runtime (but only globally, not per-connection).

  sql/set_var.h
    1.68.2.4 06/05/08 16:38:42 jimw@mysql.com +29 -0
    Add new sys_var_constr_str_ptr class, for when we have a system variable
    that is only set via the command-line that is a pointer to a string.

  sql/set_var.cc
    1.125.5.13 06/05/08 16:38:42 jimw@mysql.com +66 -3
    Handle basedir, datadir, tmpdir, log_queries_not_using_indexes, and
    various ssl settings so that they are accessible as server variables
    and listed in SHOW VARIABLES.

  sql/mysqld.cc
    1.439.52.1 06/05/08 16:38:41 jimw@mysql.com +2 -1
    Handle opt_log_queries_not_using_indexes as extern, and define
    SSL_VARS_NO_STATIC so they can be accessed outside of mysqld.cc

  sql/mysql_priv.h
    1.290.46.2 06/05/08 16:38:41 jimw@mysql.com +1 -0
    Add extern for opt_log_queries_not_using_indexes

  mysql-test/t/variables.test
    1.51.5.1 06/05/08 16:38:41 jimw@mysql.com +30 -0
    Add new regression tests

  mysql-test/r/variables.result
    1.76.5.1 06/05/08 16:38:41 jimw@mysql.com +28 -0
    Add new results

  include/sslopt-vars.h
    1.5.1.1 06/05/08 16:38:41 jimw@mysql.com +11 -6
    Allow define of SSL_VARS_NOT_STATIC to prevent variables from not being
    made static.

  include/sslopt-longopts.h
    1.9.1.1 06/05/08 16:38:41 jimw@mysql.com +6 -6
    Put options in alphabetical order

ChangeSet
  1.2119.523.3 06/05/09 00:49:16 joerg@mysql.com +1 -0
  libmysqld/Makefile.am  :    Another undetected typo ...

  libmysqld/Makefile.am
    1.89 06/05/09 00:49:10 joerg@mysql.com +1 -1
    Another undetected typo ...

ChangeSet
  1.2119.523.2 06/05/09 00:33:07 joerg@mysql.com +1 -0
  libmysqld/Makefile.am  :    Silly typo: Lacking a trailing semicolon after shell "if".

  libmysqld/Makefile.am
    1.88 06/05/09 00:33:01 joerg@mysql.com +1 -1
    Silly typo: Lacking a trailing semicolon after shell "if".

ChangeSet
  1.2119.524.2 06/05/08 18:14:39 serg@sergbook.mysql.com +2 -0
  typo fixed

  BUILD/compile-dist
    1.10 06/05/08 18:14:34 serg@sergbook.mysql.com +1 -1
    typo fixed

  BUILD/autorun.sh
    1.8 06/05/08 18:14:34 serg@sergbook.mysql.com +1 -1
    typo fixed

ChangeSet
  1.1810.1652.2 06/05/09 00:11:54 kent@mysql.com +1 -0
  

  configure.in
    1.245.1.143 06/05/09 00:10:19 kent@mysql.com +2 -2

ChangeSet
  1.2119.524.1 06/05/08 18:02:05 serg@sergbook.mysql.com +2 -0
  innodb also need libtoolize

  BUILD/compile-dist
    1.9 06/05/08 18:01:59 serg@sergbook.mysql.com +3 -1
    innodb also need libtoolize

  BUILD/autorun.sh
    1.7 06/05/08 18:01:59 serg@sergbook.mysql.com +3 -1
    innodb also need libtoolize

ChangeSet
  1.2119.523.1 06/05/08 23:47:58 joerg@mysql.com +1 -0
  libmysqld/Makefile.am  :   Workaround against the empty variable "$sqlstoragesources",
  shell "for" loops without values to loop over cause syntax errors.

  libmysqld/Makefile.am
    1.87 06/05/08 23:47:52 joerg@mysql.com +7 -4
    Workaround:  The variable "$sqlstoragesources" expands to empty, this causes shell errors.
    The clean solution would be to check the reason for this, whether it will be permanent etc,
    but for a quick fix it is sufficient to prevent shell syntax errors.

ChangeSet
  1.2119.522.1 06/05/08 23:34:54 joerg@mysql.com +1 -0
  configure.in  :    Now that 5.1.10 has been cloned, bump up the version.

  configure.in
    1.347.1.1 06/05/08 23:34:47 joerg@mysql.com +1 -1
    Now that 5.1.10 has been cloned, bump up the version.

ChangeSet
  1.2119.494.22 06/05/08 17:10:04 serg@sergbook.mysql.com +1 -0
  bootstrap is not using BUILD/autorun.sh :(

  BUILD/compile-dist
    1.8 06/05/08 17:09:29 serg@sergbook.mysql.com +2 -2
    bootstrap is not using BUILD/autorun.sh :(

ChangeSet
  1.2119.494.21 06/05/08 16:50:29 serg@sergbook.mysql.com +1 -0
  autorun.sh:
    autotool-ize plugins before the main source tree

  BUILD/autorun.sh
    1.6 06/05/08 16:47:00 serg@sergbook.mysql.com +3 -2
    autotool-ize plugins before the main source tree

ChangeSet
  1.2119.494.20 06/05/08 16:06:16 serg@sergbook.mysql.com +4 -0
  don't introduce a deprecated syntax

  sql/sql_yacc.yy
    1.476 06/05/08 16:05:48 serg@sergbook.mysql.com +12 -8
    don't introduce a deprecated syntax

  sql/sql_show.cc
    1.331 06/05/08 16:05:37 serg@sergbook.mysql.com +1 -10
    don't introduce a deprecated syntax

  mysql-test/t/myisam.test
    1.57 06/05/08 16:05:26 serg@sergbook.mysql.com +2 -8
    don't introduce a deprecated syntax

  mysql-test/r/myisam.result
    1.80 06/05/08 16:05:21 serg@sergbook.mysql.com +2 -10
    don't introduce a deprecated syntax

ChangeSet
  1.2119.494.18 06/05/08 18:09:01 tomas@poseidon.ndb.mysql.com +2 -0
  Bug #19572 Memory leaks in cluster when running make test

  sql/ha_ndbcluster_binlog.cc
    1.51 06/05/08 18:08:53 tomas@poseidon.ndb.mysql.com +6 -2
    Bug #19572 Memory leaks in cluster when running make test

  sql/ha_ndbcluster.cc
    1.303 06/05/08 18:08:52 tomas@poseidon.ndb.mysql.com +4 -1
    Bug #19572 Memory leaks in cluster when running make test

ChangeSet
  1.1810.1620.18 06/05/08 17:14:06 msvensson@neptunus.(none) +8 -0
  Remove valgrind and compiler warnings
  Add function 'vio_end' that will cleanup resources allocated by vio and the components it uses.

  vio/viosslfactories.c
    1.26 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +1 -1
    Import patch warnings.patch

  vio/vio.c
    1.28 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +13 -0
    Import patch warnings.patch

  vio/test-sslserver.c
    1.11 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +2 -2
    Import patch warnings.patch

  vio/test-sslclient.c
    1.9 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +1 -1
    Import patch warnings.patch

  vio/test-ssl.c
    1.10 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +2 -2
    Import patch warnings.patch

  sql/mysqld.cc
    1.439.1.107 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +2 -0
    Import patch warnings.patch

  libmysql/libmysql.c
    1.233.1.9 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +1 -0
    Import patch warnings.patch

  include/violite.h
    1.46 06/05/08 17:09:02 msvensson@neptunus.(none)[msvensson] +4 -0
    Import patch warnings.patch

ChangeSet
  1.1810.1650.1 06/05/08 14:59:29 tnurnberg@mysql.com +3 -0
  Bug#19263: variables.test doesn't clean up after itself
  
  save global server variables before fiddling with them and restore them later

  mysql-test/t/variables.test
    1.51.1.8 06/05/08 14:59:25 tnurnberg@mysql.com +62 -0
    save and restore globals

  mysql-test/r/variables.result
    1.76.1.7 06/05/08 14:59:25 tnurnberg@mysql.com +54 -0
    save and restore globals

  BitKeeper/deleted/.del-variables-master.opt~8a6cb6459b54545
    1.8 06/05/08 14:53:28 tnurnberg@mysql.com +0 -0
    Delete: mysql-test/t/variables-master.opt

ChangeSet
  1.2119.519.2 06/05/08 14:11:15 tomas@poseidon.ndb.mysql.com +1 -0
  removed lead of ndb eventoperations on ndb object delete

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.54 06/05/08 14:11:07 tomas@poseidon.ndb.mysql.com +7 -0
    removed lead of ndb eventoperations on ndb object delete

ChangeSet
  1.2119.520.1 06/05/08 07:47:34 tnurnberg@mysql.com +1 -0
  Bug#19509: Redundant check in sql_acl.cc
  
  Remove duplicate source line.

  sql/sql_acl.cc
    1.189 06/05/08 07:47:27 tnurnberg@mysql.com +0 -1
    remove redundant if-statement

ChangeSet
  1.1616.2144.119 06/05/08 04:37:58 tnurnberg@mysql.com +5 -0
  Bug#10418: LOAD_FILE does not behave like in manual if file does not exist
  
  load_file() string-function should return NULL rather than throw an error if
  the file doesn't exist, as per the manual.

  sql/item_strfunc.cc
    1.196.6.8 06/05/08 03:39:19 tnurnberg@mysql.com +1 -1
    load_file() should return NULL as per the docs if file not found,
    rather than throw an error

  mysql-test/r/func_str.result
    1.70.1.29 06/05/08 03:38:08 tnurnberg@mysql.com +7 -0
    expect NULL rather than error if file given to load_file() doesn't exist

  mysql-test/r/outfile.result
    1.3.1.1 06/05/08 03:38:00 tnurnberg@mysql.com +11 -11
    expect NULL rather than error if file given to load_file() doesn't exist

  mysql-test/t/func_str.test
    1.64.1.17 06/05/08 03:37:13 tnurnberg@mysql.com +8 -1
    show that load_file() will return NULL rather than throw an error
    if file doesn't exist

  mysql-test/t/outfile.test
    1.11.1.1 06/05/08 03:36:18 tnurnberg@mysql.com +0 -1
    expect NULL rather than error if file given to load_file() doesn't exist

ChangeSet
  1.1810.1649.2 06/05/07 16:14:43 igor@rurik.mysql.com +3 -0
  Post-merge fixes.

  sql/sql_prepare.cc
    1.142.1.36 06/05/07 16:14:38 igor@rurik.mysql.com +15 -12
    Post-merge fixes.

  sql/sql_lex.cc
    1.142.1.41 06/05/07 16:14:38 igor@rurik.mysql.com +1 -1
    Post-merge fixes.

  mysql-test/r/rpl_user_variables.result
    1.14.2.2 06/05/07 16:14:38 igor@rurik.mysql.com +30 -29
    Post-merge fixes.

ChangeSet
  1.1810.1647.2 06/05/07 19:54:57 aelkin@mysql.com +1 -0
  Bug#19136: Crashing log-bin and uninitialized user variables in a derived table
  
  recalculating results

  mysql-test/r/rpl_user_variables.result
    1.14.1.2 06/05/07 19:54:51 aelkin@mysql.com +1 -0
    fixing results

ChangeSet
  1.1810.1349.82 06/05/07 19:01:49 sergefp@mysql.com +1 -0
  BUG#16798: Merge into 5.0: s/used_tables()/!const_item()/, added comment about its effects.

  sql/sql_select.cc
    1.312.1.99 06/05/07 19:01:43 sergefp@mysql.com +14 -2
    BUG#16798: Merge into 5.0: s/used_tables()/!const_item()/, added comment about its effects.

ChangeSet
  1.1810.1648.1 06/05/07 18:07:08 sergefp@mysql.com +1 -0
  Refactoring: Factor out common code from find_best() and best_access_path(): make 
  find_best() call best_access_path().

  sql/sql_select.cc
    1.312.67.1 06/05/07 18:07:01 sergefp@mysql.com +5 -338
    Refactoring: Factor out common code from find_best() and best_access_path(): make 
    find_best() call best_access_path().

ChangeSet
  1.1616.2144.117 06/05/06 23:48:13 igor@rurik.mysql.com +6 -0
  Fixed bug #14927.
  A query with a group by and having clauses could return a wrong
  result set if the having condition contained a constant conjunct 
  evaluated to FALSE.
  It happened because the pushdown condition for table with
  grouping columns lost its constant conjuncts.
  Pushdown conditions are always built by the function make_cond_for_table
  that ignores constant conjuncts. This is apparently not correct when
  constant false conjuncts are present.
  

  sql/sql_select.cc
    1.216.125.5 06/05/06 23:48:09 igor@rurik.mysql.com +19 -9
    Fixed bug #14927.
    Performed evaluation of constant expressions in having clauses.
    If the having condition contains a constant conjunct that is always false
    an empty result set is returned after the optimization phase.
    In this case the corresponding EXPLAIN command now returns 
    "Impossible HAVING" in the last column.
    

  sql/sql_prepare.cc
    1.34.36.2 06/05/06 23:48:09 igor@rurik.mysql.com +8 -2
    Fixed bug #14927.
    Added code to restore havinf conditions for execution in SP and PS.
    

  sql/sql_lex.h
    1.102.41.2 06/05/06 23:48:09 igor@rurik.mysql.com +1 -0
    Fixed bug #14927.
    Added a field to restore having condititions for execution in SP and PS.
    

  sql/sql_lex.cc
    1.97.21.1 06/05/06 23:48:09 igor@rurik.mysql.com +2 -0
    Fixed bug #14927.
    Initialized fields for having conditions in  st_select_lex::init_query().

  mysql-test/t/having.test
    1.11.2.1 06/05/06 23:48:09 igor@rurik.mysql.com +16 -0
    Added a test case for bug #14927.

  mysql-test/r/having.result
    1.10.2.1 06/05/06 23:48:09 igor@rurik.mysql.com +17 -0
    Added a test case for bug #14927.

ChangeSet
  1.1616.2578.1 06/05/06 18:24:41 kroki@mysql.com +2 -0
  Fix race condition in the test for bug#16501.

  mysql-test/t/func_misc.test
    1.11.1.4 06/05/06 18:24:37 kroki@mysql.com +3 -1
    Fix race condition in the test for bug#16501.

  mysql-test/r/func_misc.result
    1.16.1.3 06/05/06 18:24:37 kroki@mysql.com +2 -2
    Update the result.

ChangeSet
  1.2119.513.3 06/05/06 07:43:18 serg@sergbook.mysql.com +3 -0
  auto-set MYSQL_PLUGIN_DIRECTORY for plug.in files

  storage/example/plug.in
    1.2 06/05/06 07:43:11 serg@sergbook.mysql.com +0 -1
    MYSQL_PLUGIN_DIRECTORY for plug.in files is set automagically

  storage/archive/plug.in
    1.2 06/05/06 07:43:11 serg@sergbook.mysql.com +0 -1
    MYSQL_PLUGIN_DIRECTORY for plug.in files is set automagically

  config/ac-macros/plugins.m4
    1.13 06/05/06 07:43:11 serg@sergbook.mysql.com +6 -0
    auto-set MYSQL_PLUGIN_DIRECTORY for plug.in files

ChangeSet
  1.1810.1646.1 06/05/06 13:57:56 anozdrin@mysql.com +7 -0
  Partial fix for BUG#14106: IM: im_life_cycle and im_utils
  tests fail on FreeBSD.
  
  The patch contains of the following:
    - make Instance Manager, running in the daemon mode, dump
      the pid of angel-process in the special file;
    - default value of angel-pid-file-name is 'mysqlmanager.angel.pid';
    - if ordinary (IM) pid-file-name is specified in the configuration,
      angel-pid-file-name is updated according to the following
      rule: extension of the basename of pid-file-name is replaced by
      '.angel.pid.
      For example:
      - pid-file-name: /tmp/im.pid
        => angel-pid-file-name: /tmp/im.angel.pid
      - pid-file-name: /tmp/im.txt
        => angel-pid-file-name: /tmp/im.angel.pid
      - pid-file-name: /tmp/5.0/im
        => angel-pid-file-name: /tmp/5.0/im.angel.pid
    - add support for configuration option to customize angel
      pid file name;
    - fix test suite to use angel pid to kill Instance Manager
      by all means if something went wrong.
  
  Background
  ----------
  
  The problem is that on some OSes (FreeBSD for one) Instance
  Manager does not get SIGTERM, so can not shutdown gracefully.
  Test suite wasn't able to cope with it, so this leads to the
  mess in test results.
  
  The problem should be split into two:
    - fix signal handling;
    - fix test suite.
  
  This patch fixes test suite so that it will be able to kill
  uncooperative Instance Manager. In order to achieve this,
  test suite needs to know PID of IM Angel process.

  server-tools/instance-manager/options.h
    1.14.1.1 06/05/06 13:57:53 anozdrin@mysql.com +1 -0
    Added an option to allow to customize angel pid file name.

  server-tools/instance-manager/options.cc
    1.30.2.1 06/05/06 13:57:53 anozdrin@mysql.com +56 -1
    Added an option to allow to customize angel pid file name.

  server-tools/instance-manager/mysqlmanager.cc
    1.17 06/05/06 13:57:53 anozdrin@mysql.com +8 -0
    Dump PID of angel process into file.

  server-tools/instance-manager/manager.h
    1.5 06/05/06 13:57:53 anozdrin@mysql.com +2 -0
    Made create_pid_file() available for the whole project. 

  server-tools/instance-manager/manager.cc
    1.32 06/05/06 13:57:53 anozdrin@mysql.com +9 -4
    Made create_pid_file() available for the whole project.

  mysql-test/mysql-test-run.pl
    1.30.28.1 06/05/06 13:57:53 anozdrin@mysql.com +73 -13
    Changed procedure of stopping Instance Manager.
    1. Try to stop IM normally (by sending SIGTERM);
    2. If one of IM-related processes is still alive,
    kill them all by SIGKILL and complain in the log.

  mysql-test/lib/mtr_process.pl
    1.25.2.5 06/05/06 13:57:53 anozdrin@mysql.com +20 -0
    Added a function to send a signal to a process.

ChangeSet
  1.1810.1633.4 06/05/06 13:51:35 dlenev@mysql.com +1 -0
  Fix for bug #17260 "Multiple invocations of triggers or stored functions
  hog memory".
  
  During each invocation of stored function or trigger some objects which
  lifetime is one function call (e.g. sp_rcontext) were allocated on
  arena/memroot of calling statement. This led to consumption of fixed amount
  of memory for each function/trigger invocation and so statements which
  involve lot of them were hogging memory. This in its return led to OOM
  crashes or freezes.
  
  This fix introduces new memroot and arena for objects which lifetime is
  whole duration of function call. So all memory consumed by such objects
  is freed at the end of function call.

  sql/sp_head.cc
    1.200.1.9 06/05/06 13:51:31 dlenev@mysql.com +87 -68
    sp_head::execute_function():
      Introduced new memroot and arena for objects which lifetime is whole
      duration of function call (e.g. sp_rcontext, sp_cursor). We can't
      use caller's arena/memroot for those objects because in this case 
      some fixed amount of memory will be consumed for each function/trigger
      invocation and so statements which involve lot of them will hog memory.
      Got rid of param_values array to avoid excessive juggling with arenas.

ChangeSet
  1.1616.2576.1 06/05/06 13:15:00 sergefp@mysql.com +3 -0
  BUG#16798: Inapplicable ref_or_null query plan and bad query result on random occasions 
  The bug was as follows: When merge_key_fields() encounters "t.key=X OR t.key=Y" it will 
  try to join them into ref_or_null access via "t.key=X OR NULL". In order to make this 
  inference it checks if Y<=>NULL, ignoring the fact that value of Y may be not yet known.
  
  The fix is that the check if Y<=>NULL is made only if value of Y is known (i.e. it is a
  constant).
  TODO: When merging to 5.0, replace used_tables() with const_item() everywhere in merge_key_fields().

  sql/sql_select.cc
    1.216.125.4 06/05/06 13:14:50 sergefp@mysql.com +2 -1
    BUG#16798: Inapplicable ref_or_null query plan and bad query result on random occasions 
    In merge_key_fields() don't call val->is_null() if the value of val is not known.

  mysql-test/t/innodb_mysql.test
    1.3 06/05/06 13:14:50 sergefp@mysql.com +55 -1
    Testcase for BUG16798

  mysql-test/r/innodb_mysql.result
    1.3 06/05/06 13:14:49 sergefp@mysql.com +56 -1
    Testcase for BUG16798

ChangeSet
  1.1810.1349.78 06/05/06 11:25:59 kroki@mysql.com +3 -0
  Reapply fix for bug#16372 (Server crashes when test 'conc_sys' is running)
  after merge.
  
  Concurrent read and update of privilege structures (like simultaneous
  run of SHOW GRANTS and ADD USER) could result in server crash.
  
  Ensure that proper locking of ACL structures is done.
  
  No test case is provided because this bug can't be reproduced
  deterministically.

  sql/sql_parse.cc
    1.426.84.1 06/05/06 11:25:53 kroki@mysql.com +2 -2
    Use is_acl_user() instead of check_acl_user().

  sql/sql_acl.h
    1.28.1.22 06/05/06 11:25:53 kroki@mysql.com +0 -1
    Remove check_acl_user() declaration.

  sql/sql_acl.cc
    1.128.23.2 06/05/06 11:25:53 kroki@mysql.com +61 -47
    Ensure that access to ACL data is protected by acl_cache->lock mutex.
    Use system_charset_info for host names consistently.
    Remove check_acl_user().  Use find_acl_user() instead.

ChangeSet
  1.1810.1633.3 06/05/06 09:41:24 kroki@mysql.com +1 -0
  Fix race condition of concurrent RENAME and SHOW TABLES which caused
  random test failures.

  mysql-test/t/rename.test
    1.12 06/05/06 09:41:07 kroki@mysql.com +7 -1
    Fix race condition and add cleanup code.

ChangeSet
  1.2119.519.1 06/05/06 01:25:44 tomas@poseidon.ndb.mysql.com +1 -0
  Bug #19492 --binlog-do-db option cuases tables create issues for ndb master
  - ndb system tables not created because of filter, moved chack of filter

  sql/ha_ndbcluster_binlog.cc
    1.50 06/05/06 01:25:36 tomas@poseidon.ndb.mysql.com +8 -9
    Bug #19492 --binlog-do-db option cuases tables create issues for ndb master
    - ndb system tables not created because of filter, moved chack of filter

ChangeSet
  1.2119.516.3 06/05/05 20:08:40 monty@mysql.com +15 -0
  Don't use row level logging on optimize or repair table.
  (Fixes core dump in rpl_failed_optimize.test)
  Ensure we end active transcations if we do an admin command (like optimize, repair etc)

  sql/sql_table.cc
    1.331 06/05/05 20:08:37 monty@mysql.com +15 -1
    Ensure we end active transcations if we do an admin command (like optimize, repair etc)

  sql/sql_parse.cc
    1.540.2.4 06/05/05 20:08:37 monty@mysql.com +14 -18
    Make end_active_trans() global

  sql/sql_class.cc
    1.256.1.1 06/05/05 20:08:37 monty@mysql.com +1 -2
    Indentation fix

  sql/sql_base.cc
    1.318.1.3 06/05/05 20:08:37 monty@mysql.com +8 -8
    Better name for define

  sql/mysql_priv.h
    1.399 06/05/05 20:08:37 monty@mysql.com +1 -0
    Added prototype

  sql/log.cc
    1.206 06/05/05 20:08:36 monty@mysql.com +11 -7
    Simplify code (no logic changes)

  sql/handler.cc
    1.231 06/05/05 20:08:36 monty@mysql.com +3 -2
    Don't use row level logging on optimize or repair table.

  mysql-test/t/innodb.test
    1.145 06/05/05 20:08:36 monty@mysql.com +10 -0
    Extra test to see that we can do an optimize table on an active transaction

  mysql-test/t/exampledb.test
    1.3 06/05/05 20:08:36 monty@mysql.com +4 -0
    Cleanup of events_tests (as this caused a lot of problems if it didn't work)

  mysql-test/r/rpl_failed_optimize.result
    1.6 06/05/05 20:08:36 monty@mysql.com +5 -0
    Added extra test + drop of table at end of test

  mysql-test/r/innodb.result
    1.177 06/05/05 20:08:36 monty@mysql.com +7 -0
    Extra test to see that we can do an optimize table on an active transaction

  mysql-test/r/exampledb.result
    1.2 06/05/05 20:08:36 monty@mysql.com +2 -0
    Cleanup of events_tests (as this caused a lot of problems if it didn't work)

  mysql-test/mysql-test-run.sh
    1.323 06/05/05 20:08:36 monty@mysql.com +2 -2
    Fail if mysqld asserts or prints stack

  mysql-test/lib/mtr_report.pl
    1.25 06/05/05 20:08:36 monty@mysql.com +4 -2
    Fail if mysqld asserts or prints stack

  mysql-test/extra/rpl_tests/rpl_failed_optimize.test
    1.2 06/05/05 20:08:36 monty@mysql.com +5 -0
    Added extra test + drop of table at end of test

ChangeSet
  1.2119.518.1 06/05/05 15:34:46 tomas@poseidon.ndb.mysql.com +2 -0
      do not install ndb slave if no slaves
      fixed memleak in ndbcluster_end

  sql/ha_ndbcluster.cc
    1.298.2.1 06/05/05 15:34:38 tomas@poseidon.ndb.mysql.com +2 -2
    fixed memleak in ndbcluster_end

  mysql-test/mysql-test-run.pl
    1.109.2.1 06/05/05 15:34:38 tomas@poseidon.ndb.mysql.com +1 -1
    do not install ndb slave if no slaves

ChangeSet
  1.2119.517.1 06/05/05 14:25:57 mskold@mysql.com +1 -0
  Bug #18798: mysqld cores on update in ha_ndbcluster call if cluster has failed before, added extra check that transaction is started

  sql/ha_ndbcluster.cc
    1.298.1.2 06/05/05 14:25:29 mskold@mysql.com +2 -1
    Bug #18798: mysqld cores on update in ha_ndbcluster call if cluster has failed before, added extra check that transaction is started

ChangeSet
  1.2119.516.2 06/05/05 13:10:42 monty@mysql.com +1 -0
  Fixed wrong merge

  sql/sql_view.cc
    1.92 06/05/05 13:10:38 monty@mysql.com +0 -1
    Fixed wrong merge

ChangeSet
  1.1810.1630.8 06/05/05 10:35:12 msvensson@shellback.(none) +2 -0
  Import from yaSSL

  extra/yassl/testsuite/test.hpp
    1.1.1.2 06/05/05 10:32:04 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/include/openssl/ssl.h
    1.10 06/05/05 10:26:02 msvensson@shellback.(none)[msvensson] +8 -1
    Import patch yassl.diff

ChangeSet
  1.1810.1630.7 06/05/05 10:33:04 msvensson@shellback.(none) +15 -0
  Import from yaSSL

ChangeSet
  1.1616.2574.4 06/05/05 11:21:21 aelkin@mysql.com +3 -0
  Bug#19136: Crashing log-bin and uninitialized user variables in a derived table
  
  The reason of the bug is in that `get_var_with_binlog' performs missed
  assingment of
  the variables as side-effect. Doing that it eventually calls
  `free_underlaid_joins' to pass as an argument `thd->lex->select_lex' of the lex
  which belongs to the user query, not 
  to one which is emulated i.e SET @var1:=NULL.
  
  
  `get_var_with_binlog' is refined to supply a temporary lex to sql_set_variables's stack.

  sql/item_func.cc
    1.124.46.1 06/05/05 11:21:18 aelkin@mysql.com +10 -0
    BUG#19136: Crashing log-bin and uninitialized user variables
    
    The reason of the bug is in that how `get_var_with_binlog' performs missed
    assingment of the variables: `free_underlaid_joins' gets as an argument `thd->lex->select_lex'
    which belongs to the user query, not to one which is emulated i.e SET @var1:=NULL.
    
    `get_var_with_binlog' is refined to supply a temporary lex to sql_set_variables's stack.
    

  mysql-test/t/rpl_user_variables.test
    1.4.1.4 06/05/05 11:21:17 aelkin@mysql.com +6 -0
    a problematic query to be binlogged is added

  mysql-test/r/rpl_user_variables.result
    1.5.1.6 06/05/05 11:21:17 aelkin@mysql.com +1 -0
    results changed

  extra/yassl/testsuite/testsuite.cpp
    1.3 06/05/04 22:23:39 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/testsuite/make.bat
    1.2 06/05/04 22:23:39 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/test/make.bat
    1.2 06/05/04 22:23:39 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/src/make.bat
    1.1.1.2 06/05/04 22:23:39 msvensson@shellback.(none)[msvensson] +0 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/benchmark/make.bat
    1.2 06/05/04 22:23:39 msvensson@shellback.(none)[msvensson] +2 -3
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp
    1.16 06/05/04 22:23:10 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/src/yassl_imp.cpp
    1.8 06/05/04 22:23:10 msvensson@shellback.(none)[msvensson] +3 -1
    Import patch yassl.diff

  extra/yassl/src/ssl.cpp
    1.12.1.1 06/05/03 19:20:53 msvensson@shellback.(none)[msvensson] +49 -45
    Import patch yassl.diff

  extra/yassl/src/make.bat
    1.2 06/05/04 22:23:10 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/include/yassl_types.hpp
    1.12 06/05/04 22:23:38 msvensson@shellback.(none)[msvensson] +0 -4
    Import patch yassl.diff

  extra/yassl/include/openssl/ssl.h
    1.9 06/05/04 22:23:38 msvensson@shellback.(none)[msvensson] +6 -0
    Import patch yassl.diff

  extra/yassl/examples/server/server.cpp
    1.2 06/05/04 22:23:38 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

  extra/yassl/examples/echoserver/echoserver.cpp
    1.2 06/05/04 22:23:38 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

  extra/yassl/examples/echoclient/echoclient.cpp
    1.2 06/05/04 22:23:38 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/examples/client/client.cpp
    1.3 06/05/04 22:23:38 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

ChangeSet
  1.2119.495.33 06/05/05 04:52:32 monty@mysql.com +1 -0
  After merge fix

  mysql-test/r/select.result
    1.122 06/05/05 04:52:28 monty@mysql.com +3 -3
    After merge fix

ChangeSet
  1.2119.494.12 06/05/05 00:59:27 tomas@poseidon.ndb.mysql.com +1 -0
  ndb: fix compile error

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
    1.36 06/05/05 00:59:21 tomas@poseidon.ndb.mysql.com +1 -1
    ndb: fix compile error

ChangeSet
  1.1810.1642.2 06/05/05 00:53:34 pekka@mysql.com +5 -0
  ndb - bug#17421, changes NDB API pushdown LIKE arg to plain char

  ndb/src/common/util/NdbSqlUtil.cpp
    1.29.2.1 06/05/05 00:52:29 pekka@mysql.com +13 -11
    bug#17421, changes NDB API pushdown LIKE arg to plain char

  ndb/include/util/NdbSqlUtil.hpp
    1.23.2.1 06/05/05 00:52:29 pekka@mysql.com +3 -6
    bug#17421, changes NDB API pushdown LIKE arg to plain char

  ndb/include/ndbapi/NdbOperation.hpp
    1.31.3.1 06/05/05 00:52:29 pekka@mysql.com +4 -0
    bug#17421, changes NDB API pushdown LIKE arg to plain char

  mysql-test/t/ndb_condition_pushdown.test
    1.16.1.1 06/05/05 00:52:29 pekka@mysql.com +37 -0
    bug#17421, changes NDB API pushdown LIKE arg to plain char

  mysql-test/r/ndb_condition_pushdown.result
    1.15.1.3 06/05/05 00:52:28 pekka@mysql.com +60 -0
    bug#17421, changes NDB API pushdown LIKE arg to plain char

ChangeSet
  1.2119.494.11 06/05/05 00:33:12 tomas@poseidon.ndb.mysql.com +1 -0
  ndb: added missing ifdef

  storage/ndb/src/kernel/blocks/pgman.cpp
    1.16 06/05/05 00:33:04 tomas@poseidon.ndb.mysql.com +2 -2
    ndb: added missing ifdef

ChangeSet
  1.2119.494.10 06/05/05 00:06:44 tomas@poseidon.ndb.mysql.com +1 -0
  ndb disabled test case against verified bug

  mysql-test/t/disabled.def
    1.151 06/05/05 00:06:36 tomas@poseidon.ndb.mysql.com +1 -0
    ndb disabled test case against verified bug

ChangeSet
  1.2119.494.9 06/05/04 23:35:37 tomas@poseidon.ndb.mysql.com +1 -0
  disable test case since it causes failure in ndb_lock occationally, bug report referenced

  mysql-test/t/disabled.def
    1.150 06/05/04 23:35:29 tomas@poseidon.ndb.mysql.com +1 -0
    disable test case since it causes failure in ndb_lock occationally, bug report referenced

ChangeSet
  1.1810.1643.2 06/05/05 00:27:12 jani@ua141d10.elisa.omakaista.fi +1 -0
  Added more comments to the test cases.

  mysql-test/t/date_formats.test
    1.14.1.4 06/05/05 00:27:08 jani@ua141d10.elisa.omakaista.fi +8 -0
    Added more comments to the test cases.

ChangeSet
  1.1810.1642.1 06/05/04 16:21:10 paul@polar.kitebird.com +1 -0
  .del-changelog-5.0.xml~f4c50926ccdd7434:
    Delete: Docs/changelog-5.0.xml

  BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434
    1.1.1.1 06/05/04 16:21:01 paul@polar.kitebird.com +0 -0
    Delete: Docs/changelog-5.0.xml

ChangeSet
  1.1616.2568.9 06/05/04 16:16:18 paul@polar.kitebird.com +1 -0
  .del-changelog-4.1.xml~8aa496ebed09d868:
    Delete: Docs/changelog-4.1.xml

  BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868
    1.1.1.1 06/05/04 16:16:10 paul@polar.kitebird.com +0 -0
    Delete: Docs/changelog-4.1.xml

ChangeSet
  1.2119.513.2 06/05/04 17:14:56 serg@sergbook.mysql.com +4 -0
  auto-include plug.in, remove the need for plugins to modify configure.in

  storage/example/plug.in
    1.1 06/05/04 17:14:49 serg@sergbook.mysql.com +5 -0

  storage/archive/plug.in
    1.1 06/05/04 17:14:49 serg@sergbook.mysql.com +5 -0

  storage/example/plug.in
    1.0 06/05/04 17:14:49 serg@sergbook.mysql.com +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-5.1/storage/example/plug.in

  storage/archive/plug.in
    1.0 06/05/04 17:14:49 serg@sergbook.mysql.com +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-5.1/storage/archive/plug.in

  configure.in
    1.346.1.1 06/05/04 17:14:43 serg@sergbook.mysql.com +0 -12
    plug.in examples

  config/ac-macros/plugins.m4
    1.12 06/05/04 17:14:43 serg@sergbook.mysql.com +21 -1
    auto-include plug.in, remove the need for plugins to modify configure.in

ChangeSet
  1.1346.1.831 06/05/04 16:14:19 paul@polar.kitebird.com +1 -0
  .del-changelog-4.0.xml~8f56ee8a913e848b:
    Delete: Docs/changelog-4.0.xml

  BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b
    1.2.1.1 06/05/04 16:14:05 paul@polar.kitebird.com +0 -0
    Delete: Docs/changelog-4.0.xml

ChangeSet
  1.2119.495.32 06/05/04 22:30:01 monty@mysql.com +2 -0
  After merge fix

  mysql-test/r/ndb_dd_ddl.result
    1.8 06/05/04 22:29:57 monty@mysql.com +1 -1
    After merge fix

  mysql-test/r/ndb_dd_basic.result
    1.8 06/05/04 22:29:57 monty@mysql.com +3 -3
    After merge fix

ChangeSet
  1.1810.1641.2 06/05/04 22:19:31 monty@mysql.com +4 -0
  Fixed wrong free in sql_view.cc
  mysql-test-run now fails in case of warnings

  sql/sql_view.cc
    1.78.1.10 06/05/04 22:19:28 monty@mysql.com +3 -2
    Fixed problem with unaligned memory (wrong free)

  sql/sql_lex.cc
    1.142.1.39 06/05/04 22:19:28 monty@mysql.com +5 -1
    Initalize st_lex properly

  mysql-test/mysql-test-run.sh
    1.262.1.42 06/05/04 22:19:28 monty@mysql.com +7 -5
    Fail if find warnings

  mysql-test/lib/mtr_report.pl
    1.21.1.1 06/05/04 22:19:28 monty@mysql.com +4 -2
    Fail if find warnings

ChangeSet
  1.2119.515.1 06/05/04 15:15:25 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -0
  BUG#19502: Enable/Disable index routines not working for partitioned handlers
  Implemented enable/disable index routines for partition handler

  sql/ha_partition.h
    1.17 06/05/04 15:15:20 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -3
    Implemented enable/disable index routines for partition handler

  sql/ha_partition.cc
    1.45.2.1 06/05/04 15:15:20 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +76 -0
    Implemented enable/disable index routines for partition handler

  mysql-test/t/partition.test
    1.37.2.1 06/05/04 15:15:20 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +7 -0
    New test case

  mysql-test/r/partition.result
    1.36.2.1 06/05/04 15:15:19 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -0
    New test case

ChangeSet
  1.2119.514.1 06/05/04 14:38:42 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
  BUG#19501: Data_Free incorrectly handled for partitioned tables 

  sql/ha_partition.cc
    1.45.1.1 06/05/04 14:38:37 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -0
    Handle delete_length in info call (was forgotten)

  mysql-test/t/partition.test
    1.37.1.1 06/05/04 14:38:37 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +15 -0
    New test case

  mysql-test/r/partition.result
    1.36.1.1 06/05/04 14:38:36 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +14 -0
    New test case

ChangeSet
  1.1810.1349.70 06/05/04 21:21:22 jani@ua141d10.elisa.omakaista.fi +1 -0
  Fixed a test case that got broken during merge.

  mysql-test/r/symlink.result
    1.21.1.2 06/05/04 21:21:17 jani@ua141d10.elisa.omakaista.fi +1 -1
    Fixed a test case that got broken during merge.

ChangeSet
  1.2119.513.1 06/05/04 14:15:37 serg@sergbook.mysql.com +1 -0
  cleanup - don't test in configure what belongs to m4

  config/ac-macros/plugins.m4
    1.11 06/05/04 14:15:30 serg@sergbook.mysql.com +5 -5
    cleanup - don't test in configure what belongs to m4

ChangeSet
  1.2119.512.1 06/05/04 10:26:10 acurtis@xiphis.org +1 -0
  Bug#19536
    "NDB replication fails when no explicit--binlog-format given"
    fix initialization, storage engine initialization must occur after
    logging type is configured

  sql/mysqld.cc
    1.534.15.1 06/05/04 10:26:05 acurtis@xiphis.org +44 -43
    Bug#19536
      fix initialization, storage engine initialization must occur after
      logging type is configured

ChangeSet
  1.1616.2575.2 06/05/04 20:19:37 jani@ua141d10.elisa.omakaista.fi +3 -0
  Fixed Bug#11324:
  TIME_FORMAT using "%l:%i" returns 36:00 with 24:00:00 in TIME column

  sql/item_timefunc.cc
    1.51.3.2 06/05/04 20:19:33 jani@ua141d10.elisa.omakaista.fi +1 -1
    Fixed Bug#11324:
    TIME_FORMAT using "%l:%i" returns 36:00 with 24:00:00 in TIME column

  mysql-test/t/date_formats.test
    1.11.1.6 06/05/04 20:19:33 jani@ua141d10.elisa.omakaista.fi +11 -0
    Added test case for Bug#11324,
    "TIME_FORMAT using "%l:%i" returns 36:00 with 24:00:00 in TIME column"

  mysql-test/r/date_formats.result
    1.15.1.5 06/05/04 20:19:33 jani@ua141d10.elisa.omakaista.fi +18 -0
    Added test case for Bug#11324,
    "TIME_FORMAT using "%l:%i" returns 36:00 with 24:00:00 in TIME column"

ChangeSet
  1.2119.511.1 06/05/04 13:18:55 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
  BUG 19062: CREATE TABLE ... PARTITION BY ... AS SELECT don't create partitioned table

  sql/sql_parse.cc
    1.540.4.1 06/05/04 13:18:50 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +11 -9
    Moved code to clone the partition info object such that also
    CREATE TABLE ... AS SELECT benefits from it

  mysql-test/t/partition.test
    1.38 06/05/04 13:18:49 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +10 -0
    New test case

  mysql-test/r/partition.result
    1.37 06/05/04 13:18:49 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +9 -0
    New test case

ChangeSet
  1.2119.495.29 06/05/04 19:39:47 monty@mysql.com +21 -0
  Fixed compiler warnings
  Move plugin declarations after system functions have been checked
  (Fixes problem with ndb_config failing becasue SHM is not declared)
  Fixed some memory leaks

  mysql-test/t/ndb_config2.test
    1.1 06/05/04 19:39:43 monty@mysql.com +7 -0
    New BitKeeper file ``mysql-test/t/ndb_config2.test''

  mysql-test/r/ndb_config2.result
    1.1 06/05/04 19:39:43 monty@mysql.com +1 -0
    New BitKeeper file ``mysql-test/r/ndb_config2.result''

  sql/sql_view.cc
    1.90 06/05/04 19:39:43 monty@mysql.com +1 -0
    Fixed memory leak

  sql/sql_partition.cc
    1.68 06/05/04 19:39:43 monty@mysql.com +1 -0
    Fixed memory leak

  sql/sql_lex.cc
    1.177 06/05/04 19:39:43 monty@mysql.com +11 -5
    More debugging
    Faster lex_end()

  sql/share/errmsg.txt
    1.98 06/05/04 19:39:43 monty@mysql.com +5 -11
    Removed wrong error messages

  sql/mysqld.cc
    1.534.1.18 06/05/04 19:39:43 monty@mysql.com +1 -1
    Fixed memory leak in skip_grant.test

  mysql-test/t/ndb_config2.test
    1.0 06/05/04 19:39:43 monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.1/mysql-test/t/ndb_config2.test

  mysql-test/r/ndb_config2.result
    1.0 06/05/04 19:39:43 monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.1/mysql-test/r/ndb_config2.result

  sql/mysql_priv.h
    1.397 06/05/04 19:39:42 monty@mysql.com +1 -1
    After merge fix

  sql/ha_partition.cc
    1.48 06/05/04 19:39:42 monty@mysql.com +2 -1
    Fixed compiler warning

  sql/ha_ndbcluster.cc
    1.299 06/05/04 19:39:42 monty@mysql.com +1 -0
    Fixed compiler warning

  sql/ha_myisammrg.cc
    1.86 06/05/04 19:39:42 monty@mysql.com +2 -1
    Fixed compiler warning

  sql/ha_myisam.cc
    1.180 06/05/04 19:39:42 monty@mysql.com +2 -1
    Fixed compiler warning

  sql/ha_innodb.cc
    1.273 06/05/04 19:39:42 monty@mysql.com +1 -0
    Fixed compiler warning

  sql/ha_heap.cc
    1.89 06/05/04 19:39:42 monty@mysql.com +1 -0
    Fixed compiler warning

  sql/ha_berkeley.cc
    1.176 06/05/04 19:39:42 monty@mysql.com +2 -1
    Fixed compiler warning

  sql/event_timed.cc
    1.51 06/05/04 19:39:42 monty@mysql.com +0 -4
    Removed not needed line

  mysql-test/t/ndb_partition_error.test
    1.7 06/05/04 19:39:42 monty@mysql.com +1 -1
    Update error numbers

  mysql-test/t/ndb_config.test
    1.13 06/05/04 19:39:42 monty@mysql.com +0 -6
    Moved test depending on SHM to ndb_config2.test

  mysql-test/t/log_tables.test
    1.8 06/05/04 19:39:42 monty@mysql.com +4 -4
    Update error numbers

  mysql-test/t/disabled.def
    1.147.1.4 06/05/04 19:39:42 monty@mysql.com +2 -1
    Disabled ndb_load, as it is in 5.0
    (Fails randomly in binlog_close_connection())

  configure.in
    1.347 06/05/04 19:39:42 monty@mysql.com +96 -96
    Move plugin declarations after system functions have been checked
    (Fixes problem with ndb_config failing becasue SHM is not declared)

ChangeSet
  1.1616.2575.1 06/05/04 19:31:10 jani@ua141d10.elisa.omakaista.fi +3 -0
  Fix for Bug#11326.

  sql/item_timefunc.cc
    1.51.3.1 06/05/04 19:31:06 jani@ua141d10.elisa.omakaista.fi +2 -1
    Fix for Bug#11326.

  mysql-test/t/date_formats.test
    1.11.1.5 06/05/04 19:31:06 jani@ua141d10.elisa.omakaista.fi +11 -0
    Added test cases for Bug#11326

  mysql-test/r/date_formats.result
    1.15.1.4 06/05/04 19:31:06 jani@ua141d10.elisa.omakaista.fi +18 -0
    Added test cases for Bug#11326

ChangeSet
  1.2119.494.5 06/05/04 18:26:36 tomas@poseidon.ndb.mysql.com +4 -0
  ndb: now no difference in behaviour between row and statement based

  mysql-test/t/ndb_alter_table3.test
    1.8 06/05/04 18:26:27 tomas@poseidon.ndb.mysql.com +0 -1
    ndb: now no difference in behaviour between row and statement based

  BitKeeper/deleted/.del-ndb_alter_table_stm.result~2aef3740f2ed685a
    1.5 06/05/04 18:25:05 tomas@poseidon.ndb.mysql.com +0 -0
    Delete: mysql-test/r/ndb_alter_table_stm.result

  BitKeeper/deleted/.del-ndb_alter_table_stm.test~477011b3a3164cb3
    1.5 06/05/04 18:24:59 tomas@poseidon.ndb.mysql.com +0 -0
    Delete: mysql-test/t/ndb_alter_table_stm.test

  mysql-test/t/ndb_alter_table3.test
    1.7 06/05/04 18:24:48 tomas@poseidon.ndb.mysql.com +0 -0
    Rename: mysql-test/t/ndb_alter_table_row.test -> mysql-test/t/ndb_alter_table3.test

  mysql-test/r/ndb_alter_table3.result
    1.7 06/05/04 18:24:28 tomas@poseidon.ndb.mysql.com +0 -0
    Rename: mysql-test/r/ndb_alter_table_row.result -> mysql-test/r/ndb_alter_table3.result

ChangeSet
  1.2119.477.10 06/05/04 18:22:16 jonas@perch.ndb.mysql.com +1 -0
  ndb dd -
    fix buglet when nr-delete-op gets page fault

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.104 06/05/04 18:22:13 jonas@perch.ndb.mysql.com +179 -108
    fix buglet when nr-delete-op gets page fault

ChangeSet
  1.1810.1620.16 06/05/04 17:47:25 msvensson@neptunus.(none) +4 -0
  Bug#18474 Unlistable directories yield no info from information_schema, part2
   - Move "chmod" part of information_schema test to separate file

  mysql-test/t/information_schema_chmod.test
    1.1 06/05/04 17:47:21 msvensson@neptunus.(none) +20 -0
    Move "chmod" part of information_schema test to separate file

  mysql-test/r/information_schema_chmod.result
    1.1 06/05/04 17:47:21 msvensson@neptunus.(none) +5 -0
    Move "chmod" part of information_schema test to separate file

  mysql-test/t/information_schema_chmod.test
    1.0 06/05/04 17:47:21 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-bug18474/mysql-test/t/information_schema_chmod.test

  mysql-test/t/information_schema.test
    1.65.1.11 06/05/04 17:47:21 msvensson@neptunus.(none) +0 -9
    Move "chmod" part of information_schema test to separate file

  mysql-test/r/information_schema_chmod.result
    1.0 06/05/04 17:47:21 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-bug18474/mysql-test/r/information_schema_chmod.result

  mysql-test/r/information_schema.result
    1.87.1.15 06/05/04 17:47:21 msvensson@neptunus.(none) +0 -5
    Move "chmod" part of information_schema test to separate file

ChangeSet
  1.1810.1620.15 06/05/04 17:44:09 msvensson@neptunus.(none) +1 -0
  Move "check_running_as_root" to after var directory has been created

  mysql-test/mysql-test-run.pl
    1.30.26.7 06/05/04 17:44:04 msvensson@neptunus.(none) +1 -1
    Move "check_running_as_root" to after var directory has been created

ChangeSet
  1.1810.1635.3 06/05/04 17:11:40 monty@mysql.com +1 -0
  Fixed an (unlikely) memory leak

  sql/sql_view.cc
    1.78.1.9 06/05/04 17:11:35 monty@mysql.com +1 -0
    Fixed an (unlikely) memory leak

ChangeSet
  1.1810.1638.1 06/05/04 17:05:21 jani@ua141d10.elisa.omakaista.fi +2 -0
  Added test case for Bug#18712: Truncation problem. The test
  is only to make sure that this will not be fixed, as it is
  intended behaviour. Documentation will be improved accordingly.

  mysql-test/t/select.test
    1.99 06/05/04 17:05:16 jani@ua141d10.elisa.omakaista.fi +15 -0
    Added test case for Bug#18712: Truncation problem. The test
    is only to make sure that this will not be fixed, as it is
    intended behaviour. Documentation will be improved accordingly.

  mysql-test/r/select.result
    1.121 06/05/04 17:05:16 jani@ua141d10.elisa.omakaista.fi +21 -0
    Added test case for Bug#18712: Truncation problem. The test
    is only to make sure that this will not be fixed, as it is
    intended behaviour. Documentation will be improved accordingly.

ChangeSet
  1.2119.477.9 06/05/04 16:01:37 jonas@perch.ndb.mysql.com +1 -0
  ndb dd -
  Fix bug where page is read, modified and then transaction abort
    and then puge is flushed causing lsn on page to be 0

  storage/ndb/src/kernel/blocks/pgman.cpp
    1.15 06/05/04 16:01:34 jonas@perch.ndb.mysql.com +18 -0
    Fix bug where page is read, modified and then transaction abort
      and then puge is flushed causing lsn on page to be 0

ChangeSet
  1.2119.477.8 06/05/04 15:58:15 jonas@perch.ndb.mysql.com +3 -0
  ndb dd - Impl. support for using delayed page request, to simulate "full" page buffer cache

  storage/ndb/src/kernel/blocks/pgman.hpp
    1.9 06/05/04 15:58:12 jonas@perch.ndb.mysql.com +18 -2
    Impl. support for using delayed page request, to simulate "full" page buffer cache

  storage/ndb/src/kernel/blocks/pgman.cpp
    1.14 06/05/04 15:58:12 jonas@perch.ndb.mysql.com +30 -5
    Impl. support for using delayed page request, to simulate "full" page buffer cache

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
    1.35 06/05/04 15:58:12 jonas@perch.ndb.mysql.com +37 -0
    Impl. support for using delayed page request, to simulate "full" page buffer cache

ChangeSet
  1.2119.494.4 06/05/04 15:55:38 tomas@poseidon.ndb.mysql.com +2 -0
  ndb:
  
  stilled small memleak
  + changed clear/init indexes code a litter

  sql/ha_ndbcluster.h
    1.133 06/05/04 15:55:30 tomas@poseidon.ndb.mysql.com +0 -2
    ndb:
    
    stilled small memleak
    + changed clear/init indexes code a litter

  sql/ha_ndbcluster.cc
    1.295.1.4 06/05/04 15:55:30 tomas@poseidon.ndb.mysql.com +24 -26
    ndb:
    
    stilled small memleak
    + changed clear/init indexes code a litter

ChangeSet
  1.1810.1637.1 06/05/04 15:30:38 monty@mysql.com +4 -0
  Fixed memory leak in sql_parse.cc (lex_end() was not called)
  This caused sp-vars.test to fail

  sql/sp_head.h
    1.79.1.4 06/05/04 15:30:35 monty@mysql.com +3 -0
    Fixed memory leak in sql_parse.cc

  sql/sp_head.cc
    1.200.3.1 06/05/04 15:30:35 monty@mysql.com +4 -0
    Fixed memory leak in sql_parse.cc

  sql/sp.cc
    1.82.1.30 06/05/04 15:30:35 monty@mysql.com +1 -1
    Fixed memory leak in sql_parse.cc

  sql/item_func.h
    1.137.1.1 06/05/04 15:30:35 monty@mysql.com +1 -0
    Removed compiler warning

ChangeSet
  1.2119.494.3 06/05/04 13:58:17 tomas@poseidon.ndb.mysql.com +16 -0
  removing the usage if the ndb local dict cache to adress the 241 errors we get now and then

  storage/ndb/src/ndbapi/Ndbinit.cpp
    1.37 06/05/04 13:58:07 tomas@poseidon.ndb.mysql.com +4 -0
    removing the usage if the ndb local dict cache to adress the 241 errors we get now and then

  storage/ndb/src/ndbapi/NdbIndexStat.cpp
    1.4 06/05/04 13:58:07 tomas@poseidon.ndb.mysql.com +1 -1
    removing the usage if the ndb local dict cache to adress the 241 errors we get now and then

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
    1.57 06/05/04 13:58:07 tomas@poseidon.ndb.mysql.com +194 -16
    removing the usage if the ndb local dict cache to adress the 241 errors we get now and then

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.129 06/05/04 13:58:06 tomas@poseidon.ndb.mysql.com +165 -78
    removing the usage if the ndb local dict cache to adress the 241 errors we get now and then

  storage/ndb/src/ndbapi/NdbDictionary.cpp
    1.56 06/05/04 13:58:06 tomas@poseidon.ndb.mysql.com +65 -0
    removing the usage if the ndb local dict cache to adress the 241 errors we get now and then

  storage/ndb/src/ndbapi/Ndb.cpp
    1.68 06/05/04 13:58:06 tomas@poseidon.ndb.mysql.com +24 -16
    removing the usage if the ndb local dict cache to adress the 241 errors we get now and then

  storage/ndb/src/ndbapi/DictCache.hpp
    1.12 06/05/04 13:58:06 tomas@poseidon.ndb.mysql.com +2 -2
    removing the usage if the ndb local dict cache to adress the 241 errors we get now and then

  storage/ndb/src/ndbapi/DictCache.cpp
    1.22 06/05/04 13:58:06 tomas@poseidon.ndb.mysql.com +44 -69
    removing the usage if the ndb local dict cache to adress the 241 errors we get now and then

  storage/ndb/include/ndbapi/NdbIndexStat.hpp
    1.4 06/05/04 13:58:06 tomas@poseidon.ndb.mysql.com +1 -1
    removing the usage if the ndb local dict cache to adress the 241 errors we get now and then

  storage/ndb/include/ndbapi/NdbDictionary.hpp
    1.74 06/05/04 13:58:06 tomas@poseidon.ndb.mysql.com +11 -0
    removing the usage if the ndb local dict cache to adress the 241 errors we get now and then

  storage/ndb/include/ndbapi/Ndb.hpp
    1.49 06/05/04 13:58:06 tomas@poseidon.ndb.mysql.com +3 -0
    removing the usage if the ndb local dict cache to adress the 241 errors we get now and then

  sql/ha_ndbcluster_binlog.h
    1.12 06/05/04 13:58:06 tomas@poseidon.ndb.mysql.com +44 -4
    removing the usage if the ndb local dict cache to adress the 241 errors we get now and then

  sql/ha_ndbcluster_binlog.cc
    1.47.1.1 06/05/04 13:58:06 tomas@poseidon.ndb.mysql.com +162 -115
    removing the usage if the ndb local dict cache to adress the 241 errors we get now and then

  sql/ha_ndbcluster.h
    1.132 06/05/04 13:58:06 tomas@poseidon.ndb.mysql.com +4 -10
    removing the usage if the ndb local dict cache to adress the 241 errors we get now and then

  sql/ha_ndbcluster.cc
    1.295.1.3 06/05/04 13:58:06 tomas@poseidon.ndb.mysql.com +353 -462
    removing the usage if the ndb local dict cache to adress the 241 errors we get now and then

  mysql-test/r/ndb_multi_row.result
    1.4 06/05/04 13:58:06 tomas@poseidon.ndb.mysql.com +2 -0
    removing the usage if the ndb local dict cache to adress the 241 errors we get now and then

ChangeSet
  1.1810.1635.1 06/05/04 15:52:09 svoj@april.(none) +1 -0
  Fixed heap_btree test failure on 64-bit boxes.

  mysql-test/t/heap_btree.test
    1.16 06/05/04 15:52:05 svoj@april.(none) +2 -0
    Fixed heap_btree test failure on 64-bit boxes.

ChangeSet
  1.1810.1620.14 06/05/04 10:30:08 msvensson@neptunus.(none) +2 -0
  Fix warnings

  vio/viosslfactories.c
    1.25 06/05/04 10:30:04 msvensson@neptunus.(none) +1 -1
    Remove warning about wrong cast

  vio/viossl.c
    1.34 06/05/04 10:30:04 msvensson@neptunus.(none) +31 -29
    Remove warnings about unused variables

ChangeSet
  1.1810.1620.13 06/05/04 10:28:49 msvensson@neptunus.(none) +1 -0
  Put the "test_running_as_root.txt" file in the vardir to avoid that two mysql-test-run's running in parallel uses the same file

  mysql-test/mysql-test-run.pl
    1.30.26.6 06/05/04 10:28:45 msvensson@neptunus.(none) +1 -1
    Put the "test_running_as_root.txt" file in the vardir to avoid that two mysql-test-run's running in parallel uses the same file

ChangeSet
  1.1616.2568.6 06/05/04 09:58:03 holyfoot@deer.(none) +1 -0
  test result fixed

  mysql-test/r/mysqltest.result
    1.3.1.12 06/05/04 09:57:16 holyfoot@mysql.com +2 -2
    result fixed

ChangeSet
  1.1810.1349.66 06/05/03 21:35:27 igor@rurik.mysql.com +1 -0
  Post-review changes.

  sql/sql_test.cc
    1.43.1.3 06/05/03 21:35:22 igor@rurik.mysql.com +2 -2
    Post-review changes.

ChangeSet
  1.2119.495.27 06/05/04 06:28:24 monty@mysql.com +15 -0
  After merge fixes
  Remove compiler warnings
  Fix some broken tests
  Workaround for syncronization bug in NDB (Bug #16445)

  sql/sql_table.cc
    1.329 06/05/04 06:28:20 monty@mysql.com +4 -3
    Fixed file-not-closed error

  mysys/my_open.c
    1.27 06/05/04 06:28:20 monty@mysql.com +21 -0
    Added function to print names of open files

  mysys/my_init.c
    1.49 06/05/04 06:28:20 monty@mysql.com +1 -0
    In case of EXTRA_DEBUG, print names of open files

  mysys/my_file.c
    1.4 06/05/04 06:28:20 monty@mysql.com +8 -1
    Ensure that structs are cleared and copyied properly so that my_print_open_files() works.

  mysys/errors.c
    1.21 06/05/04 06:28:20 monty@mysql.com +2 -0
    Print names of open files

  mysql-test/t/ndb_config.test
    1.12 06/05/04 06:28:20 monty@mysql.com +5 -0
    Remove not portable test

  mysql-test/t/ndb_basic.test
    1.41 06/05/04 06:28:20 monty@mysql.com +12 -0
    Workaround for syncronization bug in NDB

  mysql-test/r/ndb_config.result
    1.9 06/05/04 06:28:20 monty@mysql.com +0 -1
    Remove not portable test

  mysql-test/r/ndb_basic.result
    1.40 06/05/04 06:28:20 monty@mysql.com +7 -0
    Workaround for syncronization bug in NDB

  mysql-test/r/mysqldump.result
    1.104 06/05/04 06:28:20 monty@mysql.com +3 -2
    After merge fix

  mysql-test/lib/mtr_report.pl
    1.23 06/05/04 06:28:20 monty@mysql.com +5 -5
    Only print warning once

  mysql-test/include/have_ndb.inc
    1.9 06/05/04 06:28:20 monty@mysql.com +2 -0
    Added comment

  include/mysys_err.h
    1.15 06/05/04 06:28:20 monty@mysql.com +2 -1
    Print names of open files

  include/my_sys.h
    1.193 06/05/04 06:28:20 monty@mysql.com +7 -0
    Added function to print names of open files

  client/mysqltest.c
    1.208 06/05/04 06:28:20 monty@mysql.com +11 -8
    Added more information to output from abort_not_supported_test()
    Removed compiler warnings

ChangeSet
  1.1616.2572.2 06/05/04 03:12:51 tnurnberg@mysql.com +7 -0
  Bug#19025 4.1 mysqldump doesn't correctly dump "auto_increment = [int]"
  
  mysqldump / SHOW CREATE TABLE will show the NEXT available value for
  the PK, rather than the *first* one that was available (that named in
  the original CREATE TABLE ... AUTO_INCREMENT = ... statement).
  
  This should produce correct and robust behaviour for the obvious use
  cases -- when no data were inserted, then we'll produce a statement
  featuring the same value the original CREATE TABLE had; if we dump
  with values, INSERTing the values on the target machine should set the
  correct next_ID anyway (and if not, we'll still have our AUTO_INCREMENT =
  ... to do that). Lastly, just the CREATE statement (with no data) for
  a table that saw inserts would still result in a table that new values
  could safely be inserted to).
  
  There seems to be no robust way however to see whether the next_ID
  field is > 1 because it was set to something else with CREATE TABLE
  ... AUTO_INCREMENT = ..., or because there is an AUTO_INCREMENT column
  in  the table (but no initial value was set with AUTO_INCREMENT = ...)
  and then one or more rows were INSERTed, counting up next_ID. This
  means that in both cases, we'll generate an AUTO_INCREMENT =
  ... clause in SHOW CREATE TABLE / mysqldump.  As we also show info on,
  say, charsets even if the user did not explicitly give that info in
  their own CREATE TABLE, this shouldn't be an issue.
  
  As per above, the next_ID will be affected by any INSERTs that have
  taken place, though.  This /should/ result in correct and robust
  behaviour, but it may look non-intuitive to some users if they CREATE
  TABLE ... AUTO_INCREMENT = 1000 and later (after some INSERTs) have
  SHOW CREATE TABLE give them a different value (say, CREATE TABLE
  ... AUTO_INCREMENT = 1006), so the docs should possibly feature a
  caveat to that effect.
  
  It's not very intuitive the way it works now (with the fix), but it's
  *correct*.  We're not storing the original value anyway, if we wanted
  that, we'd have to change on-disk representation?
  
  If we do dump/load cycles with empty DBs, nothing will change.  This
  changeset includes an additional test case that proves that tables
  with rows will create the same next_ID for AUTO_INCREMENT = ... across
  dump/restore cycles.
  
  Confirmed by support as likely solution for client's problem.

  sql/sql_show.cc
    1.122.24.1 06/05/04 03:12:47 tnurnberg@mysql.com +18 -0
    Add AUTO_INCREMENT=... to output of SHOW CREATE TABLE if there is an
    AUTO_INCREMENT column, and NEXT_ID > 1 (the default).  We must not print
    the clause for engines that do not support this as it would break the
    import of dumps, but as of this writing, the test for whether
    AUTO_INCREMENT columns are allowed and wether AUTO_INCREMENT=...
    is supported is identical, !(file->table_flags() & HA_NO_AUTO_INCREMENT))
    Because of that, we do not explicitly test for the feature,
    but may extrapolate its existence from that of an AUTO_INCREMENT column.

  mysql-test/t/mysqldump.test
    1.19.1.23 06/05/04 03:12:47 tnurnberg@mysql.com +31 -1
    show that AUTO_INCREMENT=... will survive dump/restore cycles

  mysql-test/t/auto_increment.test
    1.22.1.2 06/05/04 03:12:47 tnurnberg@mysql.com +20 -1
    test for creation of AUTO_INCREMENT=... clause

  mysql-test/r/symlink.result
    1.11.1.9 06/05/04 03:12:47 tnurnberg@mysql.com +2 -2
    Add AUTO_INCREMENT=... clauses where appropriate

  mysql-test/r/mysqldump.result
    1.9.1.42 06/05/04 03:12:47 tnurnberg@mysql.com +38 -0
    show that AUTO_INCREMENT=... will survive dump/restore cycles

  mysql-test/r/gis-rtree.result
    1.8.1.4 06/05/04 03:12:47 tnurnberg@mysql.com +1 -1
    Add AUTO_INCREMENT=... clauses where appropriate

  mysql-test/r/auto_increment.result
    1.29.1.3 06/05/04 03:12:47 tnurnberg@mysql.com +24 -0
    test for creation of AUTO_INCREMENT=... clause

ChangeSet
  1.2119.495.22 06/05/03 11:10:10 acurtis@xiphis.org +3 -0
  fix include path in windows build

ChangeSet
  1.2119.495.21 06/05/03 09:59:04 acurtis@xiphis.org +1 -0
  fix legacy configure option handling

ChangeSet
  1.1810.1628.3 06/05/04 00:32:34 aivanov@mysql.com +1 -0
  Applied innodb-5.0-ss521 snapshot.
   Fixed BUG#19366: "consistent_snapshot.test fails".

  innobase/include/dict0dict.ic
    1.11.2.1 06/05/04 00:32:29 aivanov@mysql.com +0 -2
    Applied innodb-5.0-ss521 snapshot.
     Remove too strict assertions from some dict_table_t
     accessor functions (bug #19366).

ChangeSet
  1.1616.2571.1 06/05/03 23:25:01 aivanov@mysql.com +1 -0
  Applied innodb-4.1-ss26 snapshot.
   Fixed BUG#19366: "consistent_snapshot.test fails".

  innobase/include/dict0dict.ic
    1.9.1.1 06/05/03 23:24:59 aivanov@mysql.com +0 -2
    Applied innodb-4.1-ss26 snapshot.
     Remove too strict assertions from some dict_table_t
     accessor functions (Bug#19366).

  storage/csv/cmakelists.txt
    1.2 06/05/03 11:10:06 acurtis@xiphis.org +2 -1
    fix include path

  storage/blackhole/cmakelists.txt
    1.2 06/05/03 11:10:06 acurtis@xiphis.org +2 -1
    fix include path

  storage/archive/cmakelists.txt
    1.3 06/05/03 11:10:06 acurtis@xiphis.org +3 -1
    fix include path

ChangeSet
  1.1810.1620.12 06/05/03 20:04:57 msvensson@neptunus.(none) +1 -0
  Check if "../libtool" is available and use it only when it is.

  mysql-test/mysql-test-run.pl
    1.30.26.5 06/05/03 20:04:54 msvensson@neptunus.(none) +19 -12
    Check if "../libtool" is available and use it only when it is.

  config/ac-macros/plugins.m4
    1.10 06/05/03 09:59:01 acurtis@xiphis.org +3 -2
    fix legacy configure option handling

ChangeSet
  1.2119.496.8 06/05/03 19:40:52 monty@mysql.com +10 -0
  Cleanups after review of WL#602
  Fixed warnings from test suite
  Some fixes in mysql-test-run script to catch more warnings

  sql/sql_yacc.yy
    1.473.1.2 06/05/03 19:40:49 monty@mysql.com +11 -11
    Review change: key_info -> key_create_info

  sql/sql_table.cc
    1.326.1.2 06/05/03 19:40:48 monty@mysql.com +21 -13
    Review change: key_info -> key_create_info
    Don't call mysql_close() if init_ddl_log is not called.
    Better error handling in init_ddl_log

  sql/sql_lex.h
    1.228 06/05/03 19:40:48 monty@mysql.com +1 -1
    Review change: key_info -> key_create_info

  sql/sql_class.h
    1.291.1.2 06/05/03 19:40:48 monty@mysql.com +3 -3
    Review change: key_info -> key_create_info

  sql/log.cc
    1.202.2.1 06/05/03 19:40:48 monty@mysql.com +2 -1
    true -> TRUE

  sql/handler.cc
    1.226.1.3 06/05/03 19:40:48 monty@mysql.com +1 -1
    Initialize all elements

  mysys/errors.c
    1.20 06/05/03 19:40:48 monty@mysql.com +2 -2
    Ensure that mysql-test-run catches if we call my_close() too many times

  mysql-test/t/mysqldump.test
    1.93.1.1 06/05/03 19:40:48 monty@mysql.com +1 -1
    Add key_block_size to catch future changes in information schema

  mysql-test/mysql-test-run.sh
    1.320 06/05/03 19:40:48 monty@mysql.com +1 -1
    Catch warnings from mysqld

  mysql-test/lib/mtr_report.pl
    1.22 06/05/03 19:40:48 monty@mysql.com +3 -1
    Catch more warnings

ChangeSet
  1.1810.1632.3 06/05/03 17:55:30 msvensson@neptunus.(none) +1 -0
  Use "const char*" for variable found, forte complains "Cannot use const char* to initialize char*" otherwise

  extra/yassl/src/ssl.cpp
    1.13 06/05/03 17:55:25 msvensson@neptunus.(none) +1 -1
    Use "const char*" for variable found, forte complains "Cannot use const char* to initialize char*" otherwise

ChangeSet
  1.1810.1632.2 06/05/03 16:59:02 msvensson@neptunus.(none) +1 -0
  Remove C++ comments
  Formatting

  sql-common/client.c
    1.83.1.7 06/05/03 16:58:57 msvensson@neptunus.(none) +5 -5
    Remove C++ comments
    Formatting

ChangeSet
  1.1810.1633.1 06/05/03 18:02:43 kroki@mysql.com +4 -0
  Bug#15463: EXPLAIN SELECT..INTO hangs the client (QB, command line)
  
  There were two distict bugs: parse error was returned for valid
  statement and that error wasn't reported to the client.
  
  The fix ensures that EXPLAIN SELECT..INTO is accepted by parser and any
  other parse error will be reported to the client.

  sql/sql_yacc.yy
    1.371.1.96 06/05/03 18:02:37 kroki@mysql.com +15 -5
    If there is no lex->result in select_var_ident rule, then we have
    to be in DESCRIBE mode.

  sql/sql_parse.cc
    1.426.1.117 06/05/03 18:02:37 kroki@mysql.com +1 -0
    Assert that if parsing error has occured then apropriate error message
    has been pushed into error stack.

  mysql-test/t/explain.test
    1.9 06/05/03 18:02:36 kroki@mysql.com +9 -0
    Add test case for bug#15463.

  mysql-test/r/explain.result
    1.16 06/05/03 18:02:36 kroki@mysql.com +4 -0
    Add result for bug#15463.

ChangeSet
  1.1810.1631.6 06/05/03 19:01:29 holyfoot@deer.(none) +2 -0
  merging fix

  mysql-test/t/sp_notembedded.test
    1.4 06/05/03 19:01:23 holyfoot@mysql.com +0 -1
    merging fix

  mysql-test/t/innodb.test
    1.118.2.5 06/05/03 19:01:23 holyfoot@mysql.com +0 -6
    merging fix

ChangeSet
  1.2119.500.2 06/05/03 09:55:34 cmiller@zippy.(none) +3 -0
  Added code to remove closing comment code from event text, as would be
  supplied inside a  /*!VERSION event-text */  segment.  (Fixes Bug#18078

  sql/event_timed.cc
    1.50 06/05/03 09:55:30 cmiller@zippy.(none) +43 -3
    Remove  */  close-comment characters at the end, just as sp_head does.
        
    The parser should be smarter about not giving us text that jumps semantic 
    levels, but that's an issue for another day.

  mysql-test/t/mysqldump.test
    1.94 06/05/03 09:55:30 cmiller@zippy.(none) +5 -5
    Add spaces and tabs to the end of statements, to prove trimming of 
    whitespace.

  mysql-test/t/disabled.def
    1.147.1.3 06/05/03 09:55:30 cmiller@zippy.(none) +0 -1
    Enabling 'mysqldump' test because events should load normally now.

ChangeSet
  1.1810.1632.1 06/05/03 15:53:59 msvensson@neptunus.(none) +1 -0
  Move "max-connect-retries" option to get alpabetichal order

  client/mysqltest.c
    1.155.9.44 06/05/03 15:53:55 msvensson@neptunus.(none) +4 -4
    Move "max-connect-retries" option to get alpabetichal order

ChangeSet
  1.2119.495.18 06/05/03 09:46:19 serg@sergbook.mysql.com +1 -0
  Fixed dependency checking

  config/ac-macros/plugins.m4
    1.9 06/05/03 09:46:10 serg@sergbook.mysql.com +4 -3
    Fixed dependency checking

ChangeSet
  1.2119.503.1 06/05/03 15:59:17 monty@mysql.com +39 -0
  Added support for key_block_size for key and table level (WL#602)
  Added support for key_block_size to MyISAM.
  Simplify interface to 'new Key' to make it easier to add new key options.
  mysqld option --new is used to define where key options are printed.
  (In 5.3 we should move all key options to after key part definition to avoid problem with reserved names)
  Fixed some compiler warnings and a memory leak in ssl

  mysql-test/t/myisam-system.test
    1.1 06/05/03 15:59:13 monty@mysql.com +21 -0
    New BitKeeper file ``mysql-test/t/myisam-system.test''

  mysql-test/r/myisam-system.result
    1.1 06/05/03 15:59:13 monty@mysql.com +13 -0
    New BitKeeper file ``mysql-test/r/myisam-system.result''

  vio/viosslfactories.c
    1.20.1.1 06/05/03 15:59:13 monty@mysql.com +9 -1
    Fixed memory leak in ssl (new_VioSSLAcceptorFd)

  storage/myisam/myisampack.c
    1.53 06/05/03 15:59:13 monty@mysql.com +2 -1
    Removed compiler warning
    block_size -> block_size_index

  storage/myisam/myisamdef.h
    1.86 06/05/03 15:59:13 monty@mysql.com +4 -2
    block_size -> block_size_index to avoid confusion with 'block_size' in MySQL
    Added block_size as argument to MI_BLOCK_SIZE
    Added missing prototypes to get rid of compiler warnings

  storage/myisam/mi_test3.c
    1.19 06/05/03 15:59:13 monty@mysql.com +2 -0
    Set block_length to 0 to get default key page size

  storage/myisam/mi_test2.c
    1.31 06/05/03 15:59:13 monty@mysql.com +10 -4
    Set block_length to 0 to get default key page size

  storage/myisam/mi_test1.c
    1.30 06/05/03 15:59:13 monty@mysql.com +1 -0
    Set block_length to 0 to get default key page size

  storage/myisam/mi_page.c
    1.24 06/05/03 15:59:13 monty@mysql.com +5 -4
    block_size -> block_size_index

  storage/myisam/mi_open.c
    1.102 06/05/03 15:59:13 monty@mysql.com +5 -5
    block_size -> block_size_index

  storage/myisam/mi_create.c
    1.57 06/05/03 15:59:13 monty@mysql.com +20 -7
    Added support for block size per key.
    Block size is rounded up to next power of two and enforced between MIN and MAX KEY_BLOCK_LENGTH.
    Align start of key block to start at an even offset of max_key_block_length to ensure key cache works good if all key pages are of same size.

  storage/myisam/mi_check.c
    1.143 06/05/03 15:59:13 monty@mysql.com +5 -5
    block_size -> block_size_index

  storage/myisam/ft_test1.c
    1.21 06/05/03 15:59:13 monty@mysql.com +1 -0
    Set block_length to 0 to get default key page size

  storage/myisam/ft_eval.c
    1.19 06/05/03 15:59:13 monty@mysql.com +1 -0
    Set block_length to 0 to get default key page size

  mysql-test/t/myisam-system.test
    1.0 06/05/03 15:59:13 monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.1/mysql-test/t/myisam-system.test

  mysql-test/r/myisam-system.result
    1.0 06/05/03 15:59:13 monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-5.1/mysql-test/r/myisam-system.result

  sql/unireg.cc
    1.80 06/05/03 15:59:12 monty@mysql.com +4 -4
    Remember key_block_size for key

  sql/table.h
    1.139 06/05/03 15:59:12 monty@mysql.com +1 -0
    Added default key_block_size for table

  sql/table.cc
    1.213 06/05/03 15:59:12 monty@mysql.com +7 -0
    Remmeber and read key_block_size for table and key level

  sql/structs.h
    1.59 06/05/03 15:59:12 monty@mysql.com +1 -0
    Added block_size to keys

  sql/sql_yacc.yy
    1.473.1.1 06/05/03 15:59:12 monty@mysql.com +72 -33
    Add support for key_block_size
    Allow key options before and after key_parts (In future they should be always after the key_part defintion)
    Use new interface to 'new Key'

  sql/sql_table.cc
    1.326.1.1 06/05/03 15:59:12 monty@mysql.com +36 -13
    Use new interface to 'new Key'
    Add support for key_block_size
    

  sql/sql_show.cc
    1.326.1.2 06/05/03 15:59:12 monty@mysql.com +65 -24
    Added support for key_block_size
    If --new is used, key options are printed after the key part definition.

  sql/sql_parse.cc
    1.540.3.1 06/05/03 15:59:12 monty@mysql.com +4 -2
    Use new interface to 'new Key'

  sql/sql_lex.h
    1.227 06/05/03 15:59:12 monty@mysql.com +1 -0
    Added key create options

  sql/sql_class.h
    1.291.1.1 06/05/03 15:59:12 monty@mysql.com +7 -8
    Change 'new Key' to use KEY_CREATE_INFO instead of 'algoritm', parser, key_page_size.
    This makes it easier to add new key options in the future.

  sql/mysqld.cc
    1.534.14.3 06/05/03 15:59:12 monty@mysql.com +14 -4
    Fixed memory leak in ssl (new_VioSSLAcceptorFd)

  sql/lex.h
    1.160 06/05/03 15:59:12 monty@mysql.com +1 -0
    Added new symbol

  sql/item_func.h
    1.138 06/05/03 15:59:12 monty@mysql.com +1 -0
    Removed compiler warning

  sql/handler.h
    1.205.1.1 06/05/03 15:59:12 monty@mysql.com +12 -0
    Added KEY_CREATE_INFO, to be used as for general options for KEY's

  sql/handler.cc
    1.226.1.2 06/05/03 15:59:12 monty@mysql.com +2 -0
    Added 'default_key_create_info' to be used as 'dummy' argument to 'new Key'

  sql/ha_myisam.cc
    1.175.1.1 06/05/03 15:59:12 monty@mysql.com +4 -1
    Tell MyISAM to use the specified key_block_size
    MyISAM also updates the global key_block_size from the used values.

  mysys/my_bit.c
    1.5 06/05/03 15:59:12 monty@mysql.com +30 -0
    Added new support function to round up to a power of two

  mysys/mf_keycache.c
    1.58 06/05/03 15:59:12 monty@mysql.com +2 -8
    Simplify code

  mysql-test/t/myisam.test
    1.56 06/05/03 15:59:12 monty@mysql.com +69 -17
    Added test for key_block_size

  mysql-test/r/myisam.result
    1.79 06/05/03 15:59:11 monty@mysql.com +154 -12
    Added test for key_block_size

  mysql-test/mysql-test-run.pl
    1.109.1.4 06/05/03 15:59:11 monty@mysql.com +15 -12
    Don't print port number info when we use --extern

  include/violite.h
    1.44.1.1 06/05/03 15:59:11 monty@mysql.com +1 -0
    Added function to free memory after new_VioSSLAcceptorFd
    (Will rename all vio_ssl functions in a future changeset)

  include/myisam.h
    1.77 06/05/03 15:59:11 monty@mysql.com +1 -1
    Rename block_size -> block_size_index to avoid confusion with 'block_size'

  include/my_sys.h
    1.190.1.1 06/05/03 15:59:11 monty@mysql.com +1 -0
    Added new support function to round up to a power of two

  include/my_base.h
    1.87 06/05/03 15:59:11 monty@mysql.com +1 -0
    Added flag to check if block size for key was secified

ChangeSet
  1.1810.1631.5 06/05/03 17:43:32 holyfoot@deer.(none) +1 -0
  merging fix

  sql/sql_table.cc
    1.239.1.67 06/05/03 17:42:05 holyfoot@mysql.com +1 -1
    merging fix

ChangeSet
  1.1810.1620.9 06/05/03 14:10:22 msvensson@neptunus.(none) +1 -0
  Add an untrusted cacert used when testing

  mysql-test/std_data/untrusted-cacert.pem
    1.1 06/05/03 14:09:45 msvensson@neptunus.(none) +64 -0

  mysql-test/std_data/untrusted-cacert.pem
    1.0 06/05/03 14:09:45 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-5.0-maint/mysql-test/std_data/untrusted-cacert.pem

ChangeSet
  1.1810.1620.8 06/05/03 14:09:08 msvensson@neptunus.(none) +2 -0
  Load CA certs before setting local certs.
  Make it possible to get the yaSSL error message printed in the DBUG log file.

  vio/viosslfactories.c
    1.24 06/05/03 14:09:03 msvensson@neptunus.(none) +11 -10
    Load the CA certs before loading the certs for this client or server.
    Improved comments.

  vio/viossl.c
    1.33 06/05/03 14:09:03 msvensson@neptunus.(none) +18 -8
    Add possibility to print out the error from yaSSL.

ChangeSet
  1.1810.1620.7 06/05/03 14:06:34 msvensson@neptunus.(none) +2 -0
  Add tests for connecting to server with invalid and blank certs.

  mysql-test/t/openssl_1.test
    1.15 06/05/03 14:06:30 msvensson@neptunus.(none) +40 -2
    Add tests for connecting to server with invalid and blank certs.

  mysql-test/r/openssl_1.result
    1.14 06/05/03 14:06:30 msvensson@neptunus.(none) +9 -2
    Add tests for connecting to server with invalid and blank certs.

ChangeSet
  1.1810.1620.6 06/05/03 14:04:54 msvensson@neptunus.(none) +1 -0
  Add support for specifyihng the number of reconnec retries oin the command line

  client/mysqltest.c
    1.155.9.43 06/05/03 14:04:50 msvensson@neptunus.(none) +19 -14
    Add support for specifyihng the number of reconnec retries oin the command line

ChangeSet
  1.1810.1630.6 06/05/03 13:20:51 msvensson@shellback.(none) +5 -0
  Add original unmodified certs file

  extra/yassl/certs/dsa512.der
    1.2 06/05/03 13:20:46 msvensson@shellback.(none) +1 -1
    Add original unmodified file

  extra/yassl/certs/client-key.der
    1.2 06/05/03 13:20:46 msvensson@shellback.(none) +1 -1
    Add original unmodified file

  extra/yassl/certs/client-cert.der
    1.2 06/05/03 13:20:46 msvensson@shellback.(none) +1 -1
    Add original unmodified file

  extra/yassl/certs/dh1024.dat
    1.1 06/05/03 13:20:07 msvensson@shellback.(none) +8 -0

  extra/yassl/certs/dh1024.dat
    1.0 06/05/03 13:20:07 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/dh1024.dat

  BitKeeper/deleted/.del-dh1024.dat~eb7af7494ea8ec62
    1.2 06/05/03 13:15:41 msvensson@shellback.(none) +1 -2
    Delete: extra/yassl/certs/dh1024.dat

ChangeSet
  1.1810.1630.5 06/05/03 13:11:04 msvensson@shellback.(none) +4 -0
  Add certs/ file

  extra/yassl/certs/dsa512.der
    1.1 06/05/03 13:10:56 msvensson@shellback.(none) +7 -0
    New BitKeeper file ``extra/yassl/certs/dsa512.der''

  extra/yassl/certs/dh1024.dat
    1.1 06/05/03 13:10:56 msvensson@shellback.(none) +2 -0
    New BitKeeper file ``extra/yassl/certs/dh1024.dat''

  extra/yassl/certs/dsa512.der
    1.0 06/05/03 13:10:56 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/dsa512.der

  extra/yassl/certs/dh1024.dat
    1.0 06/05/03 13:10:56 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/dh1024.dat

  extra/yassl/certs/client-key.der
    1.1 06/05/03 13:10:55 msvensson@shellback.(none) +9 -0
    New BitKeeper file ``extra/yassl/certs/client-key.der''

  extra/yassl/certs/client-cert.der
    1.1 06/05/03 13:10:55 msvensson@shellback.(none) +17 -0
    New BitKeeper file ``extra/yassl/certs/client-cert.der''

  extra/yassl/certs/client-key.der
    1.0 06/05/03 13:10:55 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/client-key.der

  extra/yassl/certs/client-cert.der
    1.0 06/05/03 13:10:55 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/client-cert.der

ChangeSet
  1.1810.1630.4 06/05/03 13:08:24 msvensson@shellback.(none) +33 -0
  Update yaSSL to version 1.3.0

  extra/yassl/certs/taoCert.txt
    1.1 06/05/03 13:08:19 msvensson@shellback.(none) +50 -0
    New BitKeeper file ``extra/yassl/certs/taoCert.txt''

  extra/yassl/certs/server-key.pem
    1.1 06/05/03 13:08:19 msvensson@shellback.(none) +9 -0
    New BitKeeper file ``extra/yassl/certs/server-key.pem''

  extra/yassl/certs/taoCert.txt
    1.0 06/05/03 13:08:19 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/taoCert.txt

  extra/yassl/certs/server-key.pem
    1.0 06/05/03 13:08:19 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/server-key.pem

  extra/yassl/certs/server-cert.pem
    1.1 06/05/03 13:08:18 msvensson@shellback.(none) +38 -0
    New BitKeeper file ``extra/yassl/certs/server-cert.pem''

  extra/yassl/certs/dsa512.pem
    1.1 06/05/03 13:08:18 msvensson@shellback.(none) +8 -0
    New BitKeeper file ``extra/yassl/certs/dsa512.pem''

  extra/yassl/certs/server-cert.pem
    1.0 06/05/03 13:08:18 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/server-cert.pem

  extra/yassl/certs/dsa512.pem
    1.0 06/05/03 13:08:18 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/dsa512.pem

  extra/yassl/certs/dsa-cert.pem
    1.1 06/05/03 13:08:17 msvensson@shellback.(none) +68 -0
    New BitKeeper file ``extra/yassl/certs/dsa-cert.pem''

  extra/yassl/certs/dsa-cert.pem
    1.0 06/05/03 13:08:17 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/dsa-cert.pem

  extra/yassl/certs/client-key.pem
    1.1 06/05/03 13:08:15 msvensson@shellback.(none) +9 -0
    New BitKeeper file ``extra/yassl/certs/client-key.pem''

  extra/yassl/certs/client-key.pem
    1.0 06/05/03 13:08:15 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/client-key.pem

  extra/yassl/certs/client-cert.pem
    1.1 06/05/03 13:08:14 msvensson@shellback.(none) +52 -0
    New BitKeeper file ``extra/yassl/certs/client-cert.pem''

  extra/yassl/certs/client-cert.pem
    1.0 06/05/03 13:08:14 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/client-cert.pem

  extra/yassl/certs/ca-cert.pem
    1.1 06/05/03 13:08:11 msvensson@shellback.(none) +53 -0
    New BitKeeper file ``extra/yassl/certs/ca-cert.pem''

  extra/yassl/certs/ca-cert.pem
    1.0 06/05/03 13:08:11 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/certs/ca-cert.pem

  extra/yassl/lib/dummy
    1.1 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/x509v3.h
    1.1 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/x509.h
    1.1 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/pem.h
    1.1 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/md4.h
    1.1 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/testsuite/testsuite.dsp
    1.2 06/04/27 01:56:15 msvensson@shellback.(none)[msvensson] +2 -2
    Import patch yassl.diff

  extra/yassl/testsuite/testsuite.cpp
    1.2 06/04/28 01:10:59 msvensson@shellback.(none)[msvensson] +3 -3
    Import patch yassl.diff

  extra/yassl/testsuite/test.hpp
    1.1.1.1 06/04/24 23:55:04 msvensson@shellback.(none)[msvensson] +2 -2
    Import patch yassl.diff

  extra/yassl/taocrypt/taocrypt.dsp
    1.3 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +2 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/src/misc.cpp
    1.12 06/04/27 01:56:15 msvensson@shellback.(none)[msvensson] +9 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/make.bat
    1.1.1.1 06/04/24 21:55:44 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/src/integer.cpp
    1.22 06/05/02 22:59:39 msvensson@shellback.(none)[msvensson] +3 -3
    Import patch yassl.diff

  extra/yassl/taocrypt/src/asn.cpp
    1.5.1.1 06/04/27 01:56:15 msvensson@shellback.(none)[msvensson] +62 -12
    Import patch yassl.diff

  extra/yassl/taocrypt/include/asn.hpp
    1.4.1.1 06/04/27 01:56:15 msvensson@shellback.(none)[msvensson] +18 -7
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp
    1.15 06/04/28 01:10:59 msvensson@shellback.(none)[msvensson] +98 -5
    Import patch yassl.diff

  extra/yassl/src/template_instnt.cpp
    1.6.1.1 06/04/28 01:10:59 msvensson@shellback.(none)[msvensson] +5 -0
    Import patch yassl.diff

  extra/yassl/src/ssl.cpp
    1.12 06/04/28 01:10:59 msvensson@shellback.(none)[msvensson] +281 -9
    Import patch yassl.diff

  extra/yassl/src/cert_wrapper.cpp
    1.7 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +6 -3
    Import patch yassl.diff

  extra/yassl/mySTL/helpers.hpp
    1.9.1.1 06/04/24 21:55:44 msvensson@shellback.(none)[msvensson] +5 -0
    Import patch yassl.diff

  extra/yassl/lib/dummy
    1.0 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/lib/dummy

  extra/yassl/include/yassl_int.hpp
    1.10 06/05/03 12:24:48 msvensson@shellback.(none)[msvensson] +40 -1
    Import patch yassl.diff

  extra/yassl/include/openssl/x509v3.h
    1.0 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/include/openssl/x509v3.h

  extra/yassl/include/openssl/x509.h
    1.0 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/include/openssl/x509.h

  extra/yassl/include/openssl/ssl.h
    1.8 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +109 -3
    Import patch yassl.diff

  extra/yassl/include/openssl/pem.h
    1.0 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/include/openssl/pem.h

  extra/yassl/include/openssl/md5.h
    1.2 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +3 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/md4.h
    1.0 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-maint-yassl/extra/yassl/include/openssl/md4.h

  extra/yassl/include/openssl/err.h
    1.2 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/examples/client/client.cpp
    1.2 06/04/27 01:56:14 msvensson@shellback.(none)[msvensson] +3 -3
    Import patch yassl.diff

  extra/yassl/README
    1.3 06/04/27 20:46:11 msvensson@shellback.(none)[msvensson] +34 -1
    Import patch yassl.diff

ChangeSet
  1.1810.1620.4 06/05/03 12:05:04 msvensson@neptunus.(none) +1 -0
  Make cert's in std_data that we cpoy from SSL/ depend on the cert's in SSL/

  mysql-test/Makefile.am
    1.66.1.3 06/05/03 12:05:00 msvensson@neptunus.(none) +5 -5
    Make cert's in std_data that we cpoy from SSL/ depend on the cert's in SSL/

ChangeSet
  1.1810.1630.3 06/05/03 11:53:16 msvensson@shellback.(none) +3 -0
  Remove client-req-pem and server-req.pem

  SSL/Makefile.am
    1.1.1.1 06/05/03 11:53:10 msvensson@shellback.(none) +2 -2
    Remove client-req-pem and server-req.pem

  BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8
    1.2.1.2 06/05/03 11:51:59 msvensson@shellback.(none) +0 -0
    Delete: SSL/client-req.pem

  BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4
    1.2.1.2 06/05/03 11:51:52 msvensson@shellback.(none) +0 -0
    Delete: SSL/server-req.pem

ChangeSet
  1.1810.1630.2 06/05/03 11:50:45 msvensson@shellback.(none) +1 -0
  Update NOTES with information how we generate new keys

  SSL/NOTES
    1.2.1.1 06/05/03 11:50:40 msvensson@shellback.(none) +62 -0
    Update NOTES with information how we generate new keys

ChangeSet
  1.1810.1630.1 06/05/03 11:31:23 msvensson@shellback.(none) +7 -0
  Generate new ca, client and server cert.
  Set CN in the server cert to localhost so that we can test --ssl-verify-server-cert

  SSL/server-req.pem
    1.2.1.1 06/05/03 11:31:18 msvensson@shellback.(none) +7 -10
    Generate new server cert since we have a new CA cert and set it's CN to localhost so that we can test --ssl-verify-server-cert

  SSL/server-key.pem
    1.4.1.1 06/05/03 11:31:18 msvensson@shellback.(none) +7 -13
    Generate new server cert since we have a new CA cert and set it's CN to localhost so that we can test --ssl-verify-server-cert

  SSL/server-cert.pem
    1.5.2.1 06/05/03 11:31:18 msvensson@shellback.(none) +32 -57
    Generate new server cert since we have a new CA cert and set it's CN to localhost so that we can test --ssl-verify-server-cert

  SSL/client-req.pem
    1.2.1.1 06/05/03 11:31:18 msvensson@shellback.(none) +7 -10
    Generate new client cert since we have a new CA cert

  SSL/client-key.pem
    1.4.1.1 06/05/03 11:31:18 msvensson@shellback.(none) +7 -13
    Generate new client cert since we have a new CA cert

  SSL/client-cert.pem
    1.5.1.1 06/05/03 11:31:17 msvensson@shellback.(none) +31 -56
    Generate new client cert since we have a new CA cert

  SSL/cacert.pem
    1.5.1.1 06/05/03 11:31:17 msvensson@shellback.(none) +15 -19
    Generate new CA cert to get the CA's private key

ChangeSet
  1.2119.496.5 06/05/03 09:06:22 knielsen@mysql.com +2 -0
  Windows build fixes for CMake

  tests/cmakelists.txt
    1.5 06/05/03 09:06:18 knielsen@mysql.com +1 -1
    Add new dependency on mysys

  mysys/cmakelists.txt
    1.6 06/05/03 09:06:18 knielsen@mysql.com +1 -1
    Add new file to build.

ChangeSet
  1.1810.1629.1 06/05/02 18:31:20 igor@rurik.mysql.com +5 -0
  Fixed bug #14292: performance degradation for a benchmark query.
  This performance degradation was due to the fact that some
  cost evaluation code added into 4.1 in the function find_best was
  not merged into the code of the function best_access_path added
  together with other code for greedy optimizer.
  Added a parameter to the function print_plan. The parameter contains
  accumulated cost for a given partial join.
   
  The patch does not include a special test case since this performance
  degradation is hard to reproduse with a simple example.
  
  TODO: make the function find_best use the function best_access_path
  in order to remove duplication of code which might result in incomplete
  merges in the future.

  sql/sql_test.cc
    1.43.1.2 06/05/02 18:31:14 igor@rurik.mysql.com +8 -6
    Fixed bug #14292: performance degradation for a benchmark query.
    Added a parameter to the function print_plan. The parameter contains
    accumulated cost for a given partial join.

  sql/sql_select.cc
    1.312.65.1 06/05/02 18:31:14 igor@rurik.mysql.com +61 -33
    Fixed bug #14292: performance degradation for a benchmark query.
    This performance degradation was due to the fact that some
    cost evaluation code added into 4.1 in the function find_best was
    not merged into the code of the function best_access_path added
    together with other code for greedy optimizer.

  sql/mysql_priv.h
    1.290.45.1 06/05/02 18:31:13 igor@rurik.mysql.com +2 -2
    Fixed bug #14292: performance degradation for a benchmark query.
    Added a parameter to the function print_plan. The parameter contains
    accumulated cost for a given partial join.

  mysql-test/r/subselect.result
    1.134.3.1 06/05/02 18:31:13 igor@rurik.mysql.com +3 -3
    Fixed bug #14292: performance degradation for a benchmark query.
    Adjusted test results.

  mysql-test/r/delete.result
    1.23 06/05/02 18:31:13 igor@rurik.mysql.com +2 -2
    Fixed bug #14292: performance degradation for a benchmark query.
    Adjusted test results.

ChangeSet
  1.1810.1176.21 06/05/02 23:49:21 kent@mysql.com +2 -0
  sql_parse.cc:
    buffer overflow and information exposure bugs fixed
    (reported by Stefano Di Paola)
  configure.in:
    Changed version to 5.0.17b

  sql/sql_parse.cc
    1.426.72.3 06/05/02 23:45:56 kent@mysql.com +18 -1
    buffer overflow and information exposure bugs fixed
    (reported by Stefano Di Paola)

  configure.in
    1.245.41.3 06/05/02 23:32:49 kent@mysql.com +1 -1
    Changed version to 5.0.17b

ChangeSet
  1.2119.498.2 06/05/02 22:56:53 jmiller@mysql.com +2 -0
  rpl_loaddatalocal.result, rpl_loaddatalocal.test:
    updated for ndb cluster testing

  mysql-test/r/rpl_loaddatalocal.result
    1.7 06/05/02 22:56:39 jmiller@mysql.com +2 -2
    updated for ndb cluster testing

  mysql-test/t/rpl_loaddatalocal.test
    1.9 06/05/02 22:56:27 jmiller@mysql.com +2 -2
    updated for ndb cluster testing

ChangeSet
  1.1810.1613.19 06/05/02 21:47:53 pekka@mysql.com +1 -0
  pekka:get - push push push

  BitKeeper/etc/config
    1.13.1.10 06/05/02 21:47:00 pekka@mysql.com +1 -0
    pekka:get

ChangeSet
  1.2119.499.1 06/05/02 23:08:22 aivanov@mysql.com +3 -0
  WL#3148: Modifying sizes of i_s.processlist columns ('time', 'info').

  sql/sql_show.cc
    1.326.2.1 06/05/02 23:08:17 aivanov@mysql.com +4 -7
    Modifying sizes of i_s.processlist columns ('time', 'info').

  sql/mysql_priv.h
    1.396 06/05/02 23:08:17 aivanov@mysql.com +2 -0
    Defined new constant used as the size of the
     i_s.processlist.info column.

  mysql-test/r/information_schema.result
    1.115.1.1 06/05/02 23:08:17 aivanov@mysql.com +1 -0
    Fixing test case result (after modifying the size of the
     i_s.processlist.info column).

ChangeSet
  1.2119.497.3 06/05/02 15:07:00 cmiller@zippy.(none) +1 -0
  More merging assistence.
  
  Logging behavior changed in early 5.1.  (The filename was never right, but
  the "opt" file is unnecessary in 5.0 anyway.)

  mysql-test/t/mysql_client_test-master.opt
    1.3 06/05/02 15:06:55 cmiller@zippy.(none) +1 -1
    Logging behavior changed in early 5.1.

ChangeSet
  1.2119.495.17 06/05/02 12:04:20 acurtis@xiphis.org +2 -0
  WL#3201 post-review fixups

  sql/log.cc
    1.204 06/05/02 12:04:14 acurtis@xiphis.org +8 -4
    fixup static initializers

  config/ac-macros/plugins.m4
    1.8 06/05/02 12:04:14 acurtis@xiphis.org +19 -3
    WL#3201
      fixup dynamic-only plugin support.

  mysql-test/t/mysql_client_test-master.opt
    1.2 06/05/02 15:02:36 cmiller@zippy.(none) +0 -0
    Rename: mysql-test/t/mysql_client_test.opt -> mysql-test/t/mysql_client_test-master.opt

ChangeSet
  1.2119.498.1 06/05/02 20:10:02 jmiller@mysql.com +2 -0
  rpl_sp_effects.result, rpl_sp_effects.test:
    Updated with order by's to allow ndb engine to pass when using this test.

  mysql-test/r/rpl_sp_effects.result
    1.4 06/05/02 20:09:44 jmiller@mysql.com +49 -28
    Updated with order by's to allow ndb engine to pass when using this test.

  mysql-test/t/rpl_sp_effects.test
    1.6 06/05/02 20:09:27 jmiller@mysql.com +22 -16
    Updated with order by's to allow ndb engine to pass when using this test.

ChangeSet
  1.2119.497.2 06/05/02 13:56:43 cmiller@zippy.(none) +2 -0
  Manually merged

  tests/mysql_client_test.c
    1.187 06/05/02 13:56:39 cmiller@zippy.(none) +1 -0
    Manually merged

  sql/sql_parse.cc
    1.540.2.2 06/05/02 13:56:39 cmiller@zippy.(none) +1 -2
    Manually merged

ChangeSet
  1.1810.1628.1 06/05/02 13:42:35 cmiller@zippy.(none) +1 -0
  An update to as-yet unused new feature of snprintf, which was added to bring 
  our sprintf()-alike in sync with our fprintf()-alike features.

  strings/my_vsnprintf.c
    1.35 06/05/02 13:42:30 cmiller@zippy.(none) +5 -1
    Advance the destination pointer properly.
    
    Also, pay attention to the "n" in snprintf() -- never write too much.

ChangeSet
  1.2119.496.2 06/05/02 09:13:58 elliot@mysql.com +5 -0
  Fix spelling in comments as requested by Osku
  This will make charset code easier to understand

  strings/CHARSET_INFO.txt
    1.5 06/05/02 09:13:52 elliot@mysql.com +2 -2
    Fix spelling in comments

  sql/sql_string.cc
    1.92 06/05/02 09:13:52 elliot@mysql.com +1 -1
    Fix spelling in comments

  mysql-test/t/query_cache.test
    1.60 06/05/02 09:13:52 elliot@mysql.com +1 -1
    Fix spelling in comments

  mysql-test/t/cast.test
    1.32 06/05/02 09:13:52 elliot@mysql.com +1 -1
    Fix spelling in comments

  include/m_ctype.h
    1.124 06/05/02 09:13:52 elliot@mysql.com +3 -3
    Fix spelling in comments

ChangeSet
  1.1810.1621.2 06/05/02 14:46:18 msvensson@neptunus.(none) +1 -0
  Use libtool --mode=execute when starting the mysqld as well.
  Add $exe_libtool to be used throughout the script

  mysql-test/mysql-test-run.pl
    1.30.26.4 06/05/02 14:46:13 msvensson@neptunus.(none) +16 -3
    Use libtool --mode=execute when starting the mysqld as well.
    Add $exe_libtool to be used throughout the script

ChangeSet
  1.1616.2568.3 06/05/02 14:33:55 pekka@mysql.com +7 -0
  ndb - bug#19201 (4.1), see comment in NdbBlob.cpp

  ndb/src/ndbapi/NdbBlob.cpp
    1.17.3.3 06/05/02 14:31:23 pekka@mysql.com +23 -1
    bug#19201

  ndb/include/ndbapi/NdbBlob.hpp
    1.8.1.3 06/05/02 14:31:23 pekka@mysql.com +1 -0
    bug#19201

  ndb/include/kernel/signaldata/TcKeyReq.hpp
    1.4.1.1 06/05/02 14:31:23 pekka@mysql.com +1 -0
    bug#19201

  mysql-test/t/ndb_blob.test
    1.14.1.2 06/05/02 14:31:23 pekka@mysql.com +22 -3
    bug#19201

  mysql-test/r/ndb_blob.result
    1.13.1.3 06/05/02 14:31:23 pekka@mysql.com +13 -5
    bug#19201

  ndb/tools/delete_all.cpp
    1.9.1.4 06/05/02 14:29:24 pekka@mysql.com +14 -17
    option --transactional (default remains truncate)

  ndb/test/ndbapi/testBlobs.cpp
    1.18.1.7 06/05/02 14:28:32 pekka@mysql.com +9 -14
    option -fac (fetch across commit)

ChangeSet
  1.2119.496.1 06/05/02 16:31:39 gluh@eagle.intranet.mysql.r18.ru +7 -0
  WL#2257 REFERENTIAL_CONSTRAINTS view
  added I_S.REFARENTIAL_CONSTRAINTS table

  sql/table.h
    1.138 06/05/02 16:31:32 gluh@mysql.com +3 -1
    WL#2257 REFERENTIAL_CONSTRAINTS view
    added I_S.REFARENTIAL_CONSTRAINTS table

  sql/sql_show.cc
    1.326.1.1 06/05/02 16:31:32 gluh@mysql.com +88 -0
    WL#2257 REFERENTIAL_CONSTRAINTS view
    added I_S.REFARENTIAL_CONSTRAINTS table

  sql/ha_innodb.cc
    1.268.1.4 06/05/02 16:31:32 gluh@mysql.com +49 -28
    WL#2257 REFERENTIAL_CONSTRAINTS view

  mysql-test/t/information_schema_inno.test
    1.6 06/05/02 16:31:32 gluh@mysql.com +32 -0
    WL#2257 REFERENTIAL_CONSTRAINTS view
     test case

  mysql-test/r/information_schema_inno.result
    1.9 06/05/02 16:31:32 gluh@mysql.com +31 -0
    WL#2257 REFERENTIAL_CONSTRAINTS view
     test case

  mysql-test/r/information_schema_db.result
    1.15 06/05/02 16:31:32 gluh@mysql.com +1 -0
    WL#2257 REFERENTIAL_CONSTRAINTS view
     result fix

  mysql-test/r/information_schema.result
    1.116 06/05/02 16:31:32 gluh@mysql.com +4 -2
    WL#2257 REFERENTIAL_CONSTRAINTS view
     result fix

ChangeSet
  1.2119.495.16 06/05/02 04:11:00 acurtis@xiphis.org +15 -0
  WL#3201 additional post-review fixes

  storage/example/ha_example.cc
    1.37 06/05/02 04:10:55 acurtis@xiphis.org +7 -4
    store strings statically for use in handlerton and plugin structures

  storage/csv/ha_tina.cc
    1.44 06/05/02 04:10:55 acurtis@xiphis.org +7 -4
    store strings statically for use in handlerton and plugin structures

  storage/blackhole/ha_blackhole.cc
    1.32 06/05/02 04:10:55 acurtis@xiphis.org +8 -4
    store strings statically for use in handlerton and plugin structures

  storage/archive/ha_archive.cc
    1.90 06/05/02 04:10:55 acurtis@xiphis.org +7 -4
    store strings statically for use in handlerton and plugin structures

  sql/ha_partition.cc
    1.47 06/05/02 04:10:55 acurtis@xiphis.org +7 -4
    store strings statically for use in handlerton and plugin structures

  sql/ha_ndbcluster.cc
    1.298 06/05/02 04:10:55 acurtis@xiphis.org +5 -2
    store strings statically for use in handlerton and plugin structures

  sql/ha_myisammrg.cc
    1.85 06/05/02 04:10:55 acurtis@xiphis.org +8 -4
    store strings statically for use in handlerton and plugin structures

  sql/ha_myisam.cc
    1.177 06/05/02 04:10:55 acurtis@xiphis.org +8 -4
    store strings statically for use in handlerton and plugin structures

  sql/ha_innodb.cc
    1.271 06/05/02 04:10:55 acurtis@xiphis.org +8 -4
    store strings statically for use in handlerton and plugin structures

  sql/ha_heap.cc
    1.88 06/05/02 04:10:55 acurtis@xiphis.org +9 -5
    store strings statically for use in handlerton and plugin structures

  sql/ha_federated.cc
    1.58 06/05/02 04:10:54 acurtis@xiphis.org +7 -4
    store strings statically for use in handlerton and plugin structures

  sql/ha_berkeley.cc
    1.175 06/05/02 04:10:54 acurtis@xiphis.org +9 -5
    store strings statically for use in handlerton and plugin structures

  include/mysql/plugin.h
    1.13 06/05/02 04:10:54 acurtis@xiphis.org +5 -5
    change macro name

  configure.in
    1.346 06/05/02 04:10:54 acurtis@xiphis.org +1 -1
    change description for heap engine

  config/ac-macros/plugins.m4
    1.7 06/05/02 04:10:54 acurtis@xiphis.org +4 -4
    remove unneccessary `ifelse'
    add comment, add missing dnl

ChangeSet
  1.1810.1613.16 06/05/02 09:19:54 knielsen@mysql.com +5 -0
  Fix a bunch of non-Linux compile failures.

  tests/mysql_client_test.c
    1.167.1.16 06/05/02 09:19:50 knielsen@mysql.com +2 -1
    No declarations after statement in C code.

  tests/Makefile.am
    1.23.1.2 06/05/02 09:19:50 knielsen@mysql.com +1 -1
    -L must go before -l

  mysys/my_memmem.c
    1.2 06/05/02 09:19:50 knielsen@mysql.com +3 -2
    Fix illegal pointer arithmetics on void *.

  VC++Files/mysys/mysys.vcproj
    1.2.1.2 06/05/02 09:19:50 knielsen@mysql.com +43 -0
    Add new file missing in previous push.

  VC++Files/mysql.sln
    1.5.1.3 06/05/02 09:19:50 knielsen@mysql.com +1 -0
    mysql_client_test depends on mysys.

ChangeSet
  1.2119.474.5 06/05/01 21:33:09 acurtis@xiphis.org +7 -0
  WL#3201 post-review fixups
    end plugin/module naming schizophrenia
    fixup shell code and m4 macro comments
    cmakelists.txt included in EXTRA_DIST

  storage/example/Makefile.am
    1.9 06/05/01 21:33:05 acurtis@xiphis.org +1 -0
    cmakelists.txt needed in EXTRA_DIST

  storage/csv/Makefile.am
    1.8 06/05/01 21:33:05 acurtis@xiphis.org +1 -0
    cmakelists.txt needed in EXTRA_DIST

  storage/blackhole/Makefile.am
    1.3 06/05/01 21:33:05 acurtis@xiphis.org +1 -0
    cmakelists.txt needed in EXTRA_DIST

  storage/archive/Makefile.am
    1.6 06/05/01 21:33:05 acurtis@xiphis.org +1 -0
    cmakelists.txt needed in EXTRA_DIST

  configure.in
    1.344 06/05/01 21:33:04 acurtis@xiphis.org +35 -35
    change module -> plugin
    move plugin mandatory declarations near rest of plugin declaration

  config/ac-macros/plugins.m4
    1.6 06/05/01 21:33:04 acurtis@xiphis.org +288 -263
    change module -> plugin
    rename some macros
    fixup comments
    alter shell code to use similar 'test "X$var" = Xfoo"' which autoconf generates

  BUILD/SETUP.sh
    1.59 06/05/01 21:33:04 acurtis@xiphis.org +3 -3
    change module -> plugin

ChangeSet
  1.1810.1626.1 06/05/02 08:59:49 holyfoot@deer.(none) +1 -0
  Win build fix

  client/mysql_upgrade.c
    1.3 06/05/02 08:59:44 holyfoot@mysql.com +1 -1
    Win build fix

ChangeSet
  1.1810.1625.1 06/05/01 22:10:50 cmiller@zippy.(none) +9 -0
  SECURITY FIX
  
  Bug#17667: An attacker has the opportunity to bypass query logging.
  
  This adds a new, local-only printf format specifier to our *printf functions
  that allows us to print known-size buffers that must not be interpreted as 
  NUL-terminated "strings."
  
  It uses this format-specifier to print to the log, thus fixing this 
  problem.

  mysys/my_memmem.c
    1.1 06/05/01 22:10:44 cmiller@zippy.(none) +65 -0
    New BitKeeper file ``mysys/my_memmem.c''
    
    Implement memmem, a black-box work-alike of the GNU memmem(), which functions
    like strstr() but for arbitrary blocks of memory.

  mysql-test/t/mysql_client_test.opt
    1.1 06/05/01 22:10:44 cmiller@zippy.(none) +1 -0
    New BitKeeper file ``mysql-test/t/mysql_client_test.opt''
    
    Add '--log' server parameter.

  tests/mysql_client_test.c
    1.167.1.15 06/05/01 22:10:44 cmiller@zippy.(none) +66 -0
    Add a "%.1234b" and "%.*b" percent-code.  It takes a width, just like "%s", 
    but unlike the string-indicator, it requires the width and doesn't stop printing
    at NUL characters.

  tests/Makefile.am
    1.23.1.1 06/05/01 22:10:44 cmiller@zippy.(none) +1 -1
    We may need some of our local functions.

  strings/my_vsnprintf.c
    1.34 06/05/01 22:10:44 cmiller@zippy.(none) +8 -1
    Add a "%.1234b" and "%.*b" percent-code.  It takes a width, just like "%s", 
    but unlike the string-indicator, it requires the width and doesn't stop printing
    at NUL characters.

  sql/sql_parse.cc
    1.426.83.1 06/05/01 22:10:44 cmiller@zippy.(none) +1 -1
    The query is not a C-string, but is a sized buffer, containing any character 
    at all, which may include NUL characters.

  mysys/my_memmem.c
    1.0 06/05/01 22:10:44 cmiller@zippy.(none) +0 -0
    BitKeeper file /home/cmiller/work/mysql/mysql-5.0__bug17667/mysys/my_memmem.c

  mysys/mf_iocache2.c
    1.27 06/05/01 22:10:44 cmiller@zippy.(none) +72 -20
    Add a "%.1234b" and "%.*b" percent-code.  It takes a width, just like "%s", 
    but unlike the string-indicator, it requires the width and doesn't stop printing
    at NUL characters.
    
    Also, simplify the code a bit.
    
    TODO:  This code should be unified with the strings/my_vnsprintf.c code in 
    the future.

  mysys/Makefile.am
    1.62.3.1 06/05/01 22:10:44 cmiller@zippy.(none) +1 -0
    Add reference to new file, my_memmem.c

  mysql-test/t/mysql_client_test.opt
    1.0 06/05/01 22:10:44 cmiller@zippy.(none) +0 -0
    BitKeeper file /home/cmiller/work/mysql/mysql-5.0__bug17667/mysql-test/t/mysql_client_test.opt

  include/my_sys.h
    1.178.2.1 06/05/01 22:10:44 cmiller@zippy.(none) +5 -0
    Add prototype for my_memmem() .

ChangeSet
  1.2119.495.13 06/05/01 17:12:51 jimw@mysql.com +1 -0
  Fix name of error in view_grant test

  mysql-test/t/view_grant.test
    1.15 06/05/01 17:12:47 jimw@mysql.com +1 -1
    Fix error name

ChangeSet
  1.1616.2567.2 06/05/01 21:30:09 jani@a193-229-222-105.elisa-laajakaista.fi +2 -0
  Added tests for Bug#14515

  mysql-test/t/ansi.test
    1.9 06/05/01 21:30:05 jani@a193-229-222-105.elisa-laajakaista.fi +12 -0
    Added tests for Bug#14515

  mysql-test/r/ansi.result
    1.4.1.2 06/05/01 21:30:05 jani@a193-229-222-105.elisa-laajakaista.fi +30 -1
    Added tests for Bug#14515

ChangeSet
  1.1616.2568.1 06/05/01 19:48:31 kent@mysql.com +1 -0
  mysql.spec.sh:
    Use "./libtool --mode=execute" to find real path to executables

  support-files/mysql.spec.sh
    1.83.5.2 06/05/01 19:46:52 kent@mysql.com +11 -15
    Use "./libtool --mode=execute" to find real path to executables

ChangeSet
  1.1810.1623.1 06/05/01 22:16:08 holyfoot@deer.(none) +3 -0
  Fix for Win build

  include/config-win.h
    1.71.1.8 06/05/01 22:14:40 holyfoot@mysql.com +1 -0
    fixed for Win build

  client/mysql_upgrade.c
    1.2 06/05/01 22:14:40 holyfoot@mysql.com +4 -2
    fixed for Win build

  BitKeeper/etc/ignore
    1.210.1.10 06/05/01 22:14:40 holyfoot@mysql.com +1 -0
    Added client/mysql_upgrade to the ignore list

ChangeSet
  1.2119.495.9 06/05/01 00:14:32 jimw@mysql.com +6 -0
  Clean up after big merge

  sql/set_var.cc
    1.164.6.5 06/05/01 00:14:28 jimw@mysql.com +0 -1
    Remove duplicate of prepared_stmt_count (bad merge)

  sql/mysqld.cc
    1.534.14.2 06/05/01 00:14:28 jimw@mysql.com +1 -1
    Remove duplicate of have_dlopen (bad merge)

  mysql-test/r/rpl_openssl.result
    1.12.1.2 06/05/01 00:14:28 jimw@mysql.com +1 -1
    Update results

  mysql-test/mysql-test-run.pl
    1.109.1.3 06/05/01 00:14:28 jimw@mysql.com +4 -3
    Don't start up ndbcluster slave if we don't need it, and fix how
    NDB_STATUS_OK is defined

  mysql-test/lib/mtr_process.pl
    1.32 06/05/01 00:14:28 jimw@mysql.com +1 -0
    Re-add line accidently cut out during merge

  config/ac-macros/yassl.m4
    1.17 06/05/01 00:14:28 jimw@mysql.com +4 -1
    Fix like of yassl makefiles after merge

ChangeSet
  1.2119.495.7 06/04/30 13:06:28 jimw@mysql.com +1 -0
  Fix error in having.test to use name instead of number (fixes merge problem)

  mysql-test/t/having.test
    1.23 06/04/30 13:06:00 jimw@mysql.com +1 -1
    Use error name instead of number

ChangeSet
  1.2119.474.4 06/04/30 15:52:30 serg@sergbook.mysql.com +7 -0
  fixes

  sql/sql_show.cc
    1.328 06/04/30 15:52:24 serg@sergbook.mysql.com +2 -10
    revert

  plugin/fulltext/Makefile.am
    1.6 06/04/30 15:52:24 serg@sergbook.mysql.com +6 -41
    revert

  plugin/Makefile.am
    1.5 06/04/30 15:52:24 serg@sergbook.mysql.com +3 -0
    restore comment

  configure.in
    1.343 06/04/30 15:52:24 serg@sergbook.mysql.com +1 -4
    fixes

  BitKeeper/etc/ignore
    1.239 06/04/30 15:52:24 serg@sergbook.mysql.com +3 -0
    Added compile libmysqld/sql_builtin.cc sql/sql_builtin.cc to the ignore list

  config/ac-macros/plugins.m4
    1.5 06/04/30 15:52:23 serg@sergbook.mysql.com +39 -41
    simplifications, style fixes

  Makefile.am
    1.92 06/04/30 15:52:23 serg@sergbook.mysql.com +2 -2
    plugin/ must be built before sql/

ChangeSet
  1.1616.2566.1 06/04/30 16:01:34 jani@a193-229-222-105.elisa-laajakaista.fi +2 -0
  Fix for Bug#14515.

  sql/sql_show.cc
    1.122.1.85 06/04/30 16:01:30 jani@a193-229-222-105.elisa-laajakaista.fi +3 -4
    Fix for Bug#14515.

  sql/set_var.cc
    1.34.64.1 06/04/30 16:01:30 jani@a193-229-222-105.elisa-laajakaista.fi +0 -4
    Fix for Bug#14515. These modes do not need restrictions, they're handled
    separately in sql_show.cc

ChangeSet
  1.2119.474.3 06/04/29 09:33:34 serg@sergbook.mysql.com +11 -0
  make distcheck and cosmetic fixes

  storage/innobase/Makefile.am
    1.13 06/04/29 09:30:01 serg@sergbook.mysql.com +5 -6
    make distcheck and cosmetic fixes

  storage/example/Makefile.am
    1.8 06/04/29 09:30:01 serg@sergbook.mysql.com +1 -1
    make distcheck and cosmetic fixes

  storage/blackhole/Makefile.am
    1.2 06/04/29 09:30:01 serg@sergbook.mysql.com +1 -1
    make distcheck and cosmetic fixes

  storage/archive/Makefile.am
    1.5 06/04/29 09:30:00 serg@sergbook.mysql.com +4 -4
    make distcheck and cosmetic fixes

  sql/Makefile.am
    1.137 06/04/29 09:30:00 serg@sergbook.mysql.com +2 -2
    make distcheck and cosmetic fixes

  plugin/Makefile.am
    1.4 06/04/29 09:30:00 serg@sergbook.mysql.com +1 -3
    make distcheck and cosmetic fixes

  configure.in
    1.342 06/04/29 09:30:00 serg@sergbook.mysql.com +13 -24
    make distcheck and cosmetic fixes

  config/ac-macros/plugins.m4
    1.4 06/04/29 09:29:59 serg@sergbook.mysql.com +298 -289
    make distcheck and cosmetic fixes

  config/ac-macros/misc.m4
    1.13 06/04/29 09:29:59 serg@sergbook.mysql.com +4 -4
    make distcheck and cosmetic fixes

  config/ac-macros/ha_ndbcluster.m4
    1.16 06/04/29 09:29:59 serg@sergbook.mysql.com +1 -1
    make distcheck and cosmetic fixes

  config/ac-macros/ha_berkeley.m4
    1.6 06/04/29 09:29:59 serg@sergbook.mysql.com +6 -9
    make distcheck and cosmetic fixes

ChangeSet
  1.1616.2565.1 06/04/29 15:58:02 kent@mysql.com +1 -0
  config-win.h:
    Fix strange "double" define for popen.
    Avoid warnings about sprintf() etc. being unsafe.
    Corrected typo "#endfif"

  include/config-win.h
    1.48.1.10 06/04/29 15:55:53 kent@mysql.com +7 -2
    Fix strange "double" define for popen.
    Avoid warnings about sprintf() etc. being unsafe.
    Corrected typo "#endfif"

ChangeSet
  1.1616.2560.6 06/04/29 07:32:12 kent@mysql.com +1 -0
  configure.in:
    Changed version to 4.1.20

  configure.in
    1.201.64.3 06/04/29 07:31:32 kent@mysql.com +2 -2
    Changed version to 4.1.20

ChangeSet
  1.1616.2560.5 06/04/29 01:28:04 kent@mysql.com +1 -0
  mysql.spec.sh:
    Backport of changes in 5.0 (bug#18294)

  support-files/mysql.spec.sh
    1.83.5.1 06/04/29 01:26:46 kent@mysql.com +57 -15
    Backport of changes in 5.0 (bug#18294)

ChangeSet
  1.1616.2562.5 06/04/28 12:15:29 elliot@mysql.com +3 -0
  BUG#19145: mysqld crashes if you set the default value of an enum field to NULL
  
  Now test for NULLness the pointers returned from objects created from the
  default value. Pushing patch on behalf of cmiller.

  sql/sql_table.cc
    1.157.58.4 06/04/28 12:15:27 elliot@mysql.com +39 -10
    No longer blindly dereference pointer of the string representation of the
    values, where "NULL" is NUL. Raise INVALID DEFAULT error messages where
    appropriate.
    
    Note that the -O1 optimization flag made debugging this extremely tricky, with
    misleading results, and that removing it from the Makefile during debugging can
    be invaluable.

  mysql-test/t/null.test
    1.10.1.6 06/04/28 12:15:26 elliot@mysql.com +41 -0
    Add test case

  mysql-test/r/null.result
    1.18.1.9 06/04/28 12:15:26 elliot@mysql.com +42 -0
    Add test case

ChangeSet
  1.2119.495.4 06/04/28 10:44:08 paul@polar.kitebird.com +1 -0
  mysqlslap.c:
    Avoid embedding a bunch of whitespace in --help message.

  client/mysqlslap.c
    1.34 06/04/28 10:43:38 paul@polar.kitebird.com +2 -2
    Avoid embedding a bunch of whitespace in --help message.

ChangeSet
  1.1810.1622.1 06/04/28 17:03:11 kent@mysql.com +1 -0
  mysql.spec.sh:
    Include and run mysql_upgrade if needed (bug#19353)

  support-files/mysql.spec.sh
    1.99.4.1 06/04/28 17:02:53 kent@mysql.com +10 -1
    Include and run mysql_upgrade if needed (bug#19353)

ChangeSet
  1.1810.1613.6 06/04/28 13:55:40 msvensson@neptunus.(none) +2 -0
  Bug#18818 configure: No longer finds OpenSSL on Mac OS X
   - Eval shrext_cmds variable before using it
   - Moved from acinclude.m4 to openssl.m4 and zlib.m4 when merging 4.1 -> 5.0

  config/ac-macros/zlib.m4
    1.7.1.1 06/04/28 13:55:36 msvensson@neptunus.(none) +2 -1
    Move from acinclude.m4

  config/ac-macros/openssl.m4
    1.6 06/04/28 13:55:36 msvensson@neptunus.(none) +3 -2
    Move from acinclude.m4

ChangeSet
  1.1810.1621.1 06/04/28 11:37:20 msvensson@shellback.(none) +3 -0
  Fix small bug in udf_example.cc, it was processing one char too much and thus returning junk
  Add more DBUG_PRINT's in udf_handler::val_str
  Enable udf.test

  sql/udf_example.cc
    1.24 06/04/28 11:37:14 msvensson@shellback.(none) +1 -1
    Bug fix, break for loop when "n < n_end"

  sql/item_func.cc
    1.270.1.13 06/04/28 11:37:14 msvensson@shellback.(none) +10 -5
    Add DBUG_ printouts for easier debugging of installed udf's

  mysql-test/t/disabled.def
    1.2.4.11 06/04/28 11:37:14 msvensson@shellback.(none) +0 -1
    Enable udf.test

ChangeSet
  1.1616.2564.2 06/04/28 11:23:31 gkodinov@lsmy3.wdf.sap.corp +6 -0
  BUG#18492: mysqld reports ER_ILLEGAL_REFERENCE in --ps-protocol
  
  In the code that converts IN predicates to EXISTS predicates it is changing
  the select list elements to constant 1. Example :
  SELECT ... FROM ...  WHERE a IN (SELECT c FROM ...)
  is transformed to :
  SELECT ... FROM ... WHERE EXISTS (SELECT 1 FROM ...  HAVING a = c)
  However there can be no FROM clause in the IN subquery and it may not be
  a simple select : SELECT ... FROM ... WHERE a IN (SELECT f(..) AS
  c UNION SELECT ...) This query is transformed to : SELECT ... FROM ...
  WHERE EXISTS (SELECT 1 FROM (SELECT f(..) AS c UNION SELECT ...)
  x HAVING a = c) In the above query c in the HAVING clause is made to be
  an Item_null_helper (a subclass of Item_ref) pointing to the real
  Item_field (which is not referenced anywhere else in the query anymore).
  This is done because Item_ref_null_helper collects information whether
  there are NULL values in the result.  This is OK for directly executed
  statements, because the Item_field pointed by the Item_null_helper is
  already fixed when the transformation is done.  But when executed as
  a prepared statement all the Item instances are "un-fixed" before the
  recompilation of the prepared statement. So when the Item_null_helper
  gets fixed it discovers that the Item_field it points to is not fixed
  and issues an error.  The remedy is to keep the original select list
  references when there are no tables in the FROM clause. So the above
  becomes : SELECT ... FROM ...  WHERE EXISTS (SELECT c FROM (SELECT f(..)
  AS c UNION SELECT ...) x HAVING a = c) In this way c is referenced
  directly in the select list as well as by reference in the HAVING
  clause. So it gets correctly fixed even with prepared statements.  And
  since the Item_null_helper subclass of Item_ref_null_helper is not used
  anywhere else it's taken out.

  sql/item_subselect.cc
    1.60.1.80 06/04/28 11:23:28 gkodinov@lsmy3.wdf.sap.corp +9 -7
    The described change to the IN->EXISTS transformation

  sql/item.h
    1.56.1.137 06/04/28 11:23:28 gkodinov@lsmy3.wdf.sap.corp +0 -13
    Taking out Item_null_helper as it's no longer needed

  sql/item.cc
    1.58.1.174 06/04/28 11:23:28 gkodinov@lsmy3.wdf.sap.corp +0 -8
    Taking out Item_null_helper as it's no longer needed

  mysql-test/t/ps_11bugs.test
    1.6 06/04/28 11:23:28 gkodinov@lsmy3.wdf.sap.corp +14 -0
    Testcase for the bug

  mysql-test/r/subselect.result
    1.67.1.108 06/04/28 11:23:28 gkodinov@lsmy3.wdf.sap.corp +1 -1
    Explain updated because of the tranformation

  mysql-test/r/ps_11bugs.result
    1.4 06/04/28 11:23:28 gkodinov@lsmy3.wdf.sap.corp +14 -0
    Test case for the bug

ChangeSet
  1.2119.495.3 06/04/28 09:29:40 knielsen@mysql.com +1 -0
  Disable unstable test case.

  mysql-test/t/disabled.def
    1.147.1.1 06/04/28 09:29:30 knielsen@mysql.com +1 -0
    Disable unstable test case.

ChangeSet
  1.1810.1618.1 06/04/28 09:07:25 holyfoot@deer.(none) +8 -0
  bug #18115 (mysql_upgrade on Windows)
  pushed in 5.0

  client/mysql_upgrade.c
    1.1 06/04/28 09:05:59 holyfoot@mysql.com +400 -0

  client/mysql_upgrade.c
    1.0 06/04/28 09:05:59 holyfoot@mysql.com +0 -0
    BitKeeper file /home/hf/work/mysql-5.0.upgd/client/mysql_upgrade.c

  VC++Files/client/mysql_upgrade_ia64.dsp
    1.1 06/04/28 09:05:58 holyfoot@mysql.com +124 -0

  VC++Files/client/mysql_upgrade.vcproj
    1.1 06/04/28 09:05:58 holyfoot@mysql.com +232 -0

  VC++Files/client/mysql_upgrade_ia64.dsp
    1.0 06/04/28 09:05:58 holyfoot@mysql.com +0 -0
    BitKeeper file /home/hf/work/mysql-5.0.upgd/VC++Files/client/mysql_upgrade_ia64.dsp

  VC++Files/client/mysql_upgrade.vcproj
    1.0 06/04/28 09:05:58 holyfoot@mysql.com +0 -0
    BitKeeper file /home/hf/work/mysql-5.0.upgd/VC++Files/client/mysql_upgrade.vcproj

  VC++Files/client/mysql_upgrade.dsp
    1.1 06/04/28 09:05:57 holyfoot@mysql.com +124 -0

  client/Makefile.am
    1.52.1.2 06/04/28 09:05:57 holyfoot@mysql.com +5 -1
    mysql_upgrade tool added

  VC++Files/mysql_ia64.dsw
    1.4.1.1 06/04/28 09:05:57 holyfoot@mysql.com +18 -0
    mysql_upgrade tool added

  VC++Files/mysql.sln
    1.5.1.2 06/04/28 09:05:57 holyfoot@mysql.com +8 -0
    mysql_upgrade tool added

  VC++Files/mysql.dsw
    1.26.1.1 06/04/28 09:05:57 holyfoot@mysql.com +21 -0
    mysql_upgrade tool added

  VC++Files/client/mysql_upgrade.dsp
    1.0 06/04/28 09:05:57 holyfoot@mysql.com +0 -0
    BitKeeper file /home/hf/work/mysql-5.0.upgd/VC++Files/client/mysql_upgrade.dsp

ChangeSet
  1.2119.495.2 06/04/27 17:42:55 elliot@mysql.com +1 -0
  Fix merge

  sql/set_var.cc
    1.164.6.2 06/04/27 17:42:51 elliot@mysql.com +60 -192
    Fix merge.

ChangeSet
  1.1810.1615.4 06/04/27 22:30:14 msvensson@shellback.(none) +1 -0
  Disable udf.test

  mysql-test/t/disabled.def
    1.2.4.10 06/04/27 22:30:08 msvensson@shellback.(none) +1 -0
    Disable udf.test

ChangeSet
  1.1810.1617.1 06/04/27 22:21:23 msvensson@shellback.(none) +2 -0
  Fix merge error

  extra/yassl/taocrypt/src/integer.cpp
    1.21 06/04/27 22:21:11 msvensson@shellback.(none) +0 -8
    Fix merge error, duplicate function definition

  extra/yassl/src/yassl_int.cpp
    1.14 06/04/27 22:21:11 msvensson@shellback.(none) +1 -1
    Fix merge error, missing {

ChangeSet
  1.1810.1615.2 06/04/27 21:26:24 msvensson@shellback.(none) +2 -0
  Return empty string if file does not exist
  Set LD_LIBRARY_PATH and UDF_EXAMPLE_LIB from $lib_udf_example

  mysql-test/mysql-test-run.pl
    1.30.26.2 06/04/27 21:26:19 msvensson@shellback.(none) +3 -2
    Set LD_LIBRARY_PATH and UDF_EXAMPLE_LIB from $lib_udf_example variable

  mysql-test/lib/mtr_misc.pl
    1.12 06/04/27 21:26:19 msvensson@shellback.(none) +1 -8
    Return empty string if file does not exist

ChangeSet
  1.1810.1612.4 06/04/27 10:53:19 jimw@mysql.com +1 -0
  Bug #19393: Federated tests fail on Windows under pushbuild
  
    Supplying --skip-rpl to mysql-test-run.pl would always disable the
    slaves, but those slaves may still be needed for the federated tests.
    Now we only disable the slaves when they are not used by any of the
    tests.

  mysql-test/mysql-test-run.pl
    1.30.27.1 06/04/27 10:53:15 jimw@mysql.com +5 -5
    Decide whether to set up and start slave databases based entirely on
    which tests are used, and don't allow --skip-rpl to ruin the party,
    since other tests than replication rely on the slaves (namely federated).

ChangeSet
  1.1810.1614.1 06/04/27 16:32:40 msvensson@shellback.(none) +7 -0
  Add test to mysql-test-run.pl to see if the udf_example.so is availble. Set envioronment variable UDF_EXAMPLE_LIB if it is.
  Then check in have_udf if that variable is set. Finally use tahe variable when loading the shared library. 

  mysql-test/r/have_udf_example.require
    1.1 06/04/27 16:32:36 msvensson@shellback.(none) +2 -0
    New BitKeeper file ``mysql-test/r/have_udf_example.require''

  mysql-test/r/have_udf_example.require
    1.0 06/04/27 16:32:36 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-5.0-maint/mysql-test/r/have_udf_example.require

  mysql-test/t/udf.test
    1.4 06/04/27 16:32:35 msvensson@shellback.(none) +18 -10
    Use variable UDF_EXAMPLE_LIB when looking for shared library to load

  mysql-test/t/disabled.def
    1.2.4.8 06/04/27 16:32:35 msvensson@shellback.(none) +0 -1
    Remove udf.test from disabled tests

  mysql-test/r/udf.result
    1.3.1.1 06/04/27 16:32:35 msvensson@shellback.(none) +8 -8
    Update result

  mysql-test/mysql-test-run.pl
    1.30.25.8 06/04/27 16:32:35 msvensson@shellback.(none) +4 -0
    Add checks to find the udf_example.so library

  mysql-test/lib/mtr_misc.pl
    1.11 06/04/27 16:32:35 msvensson@shellback.(none) +16 -0
    Add funcion "mtr_file_exist" to search for files

  mysql-test/include/have_udf.inc
    1.1.1.2 06/04/27 16:32:35 msvensson@shellback.(none) +8 -0
    Add check if udf_example.so(or similar) is available

ChangeSet
  1.2119.490.4 06/04/27 15:29:10 mskold@mysql.com +1 -0
  Disabled rpl_ndb_dd_partitions, new slogan

  mysql-test/t/disabled.def
    1.146.1.2 06/04/27 15:28:55 mskold@mysql.com +1 -0
    Disabled rpl_ndb_dd_partitions, new slogan

ChangeSet
  1.2119.494.1 06/04/27 15:13:21 mskold@mysql.com +3 -0
  Added verification test of on-line (non-copying) alter table

  storage/ndb/tools/listTables.cpp
    1.26 06/04/27 15:12:33 mskold@mysql.com +2 -0
    Added verification test of on-line (non-copying) alter table

  mysql-test/t/ndb_alter_table.test
    1.31 06/04/27 15:12:33 mskold@mysql.com +56 -0
    Added verification test of on-line (non-copying) alter table

  mysql-test/r/ndb_alter_table.result
    1.37 06/04/27 15:12:33 mskold@mysql.com +42 -0
    Added verification test of on-line (non-copying) alter table

ChangeSet
  1.1616.2564.1 06/04/27 07:51:56 paul@polar.kitebird.com +1 -0
  set_var.cc:
    System variable was added out of lexical order.

  sql/set_var.cc
    1.34.52.35 06/04/27 07:51:25 paul@polar.kitebird.com +1 -1
    System variable was added out of lexical order.

ChangeSet
  1.1616.2563.1 06/04/27 14:54:36 kroki@mysql.com +1 -0
  Bug#16372: Server crashes when test 'conc_sys' is running
  
  Concurrent read and update of privilege structures (like simultaneous
  run of SHOW GRANTS and ADD USER) could result in server crash.
  
  Ensure that proper locking of ACL structures is done.
  
  No test case is provided because this bug can't be reproduced
  deterministically.

  sql/sql_acl.cc
    1.74.1.101 06/04/27 14:54:31 kroki@mysql.com +31 -6
    Ensure that access to ACL data is protected by acl_cache->lock mutex.
    Use system_charset_info for host names consistently.

ChangeSet
  1.2119.490.3 06/04/27 10:20:33 mskold@mysql.com +1 -0
  Enabled rpl_ndb_dd_partitions to see if it still fails

  mysql-test/t/disabled.def
    1.146.1.1 06/04/27 10:20:18 mskold@mysql.com +0 -1
    Enabled rpl_ndb_dd_partitions to see if it still fails

ChangeSet
  1.1810.1349.61 06/04/27 12:51:33 svoj@april.(none) +1 -0
  BUG#17810 - REPAIR says ok, CHECK says broken (repeatable)
  
  Write operations on tables created in 4.x with index on variable
  length column results in index crash. Even REPAIR TABLE wasn't able
  to fix broken index.
  
  Problem was that packed key length size wasn't restored correctly.
  In 5.0 packed key length size is either 1 or 2. In 4.x this length
  is always 2, but is saved as 0.
  
  This fix ensures that key length size is restored correctly for 4.x
  tables.

  myisam/mi_key.c
    1.38.10.1 06/04/27 12:51:29 svoj@april.(none) +1 -1
    Ensure that pack_length is either 1 or 2 (compatibility with 4.x).

ChangeSet
  1.1810.1612.3 06/04/26 20:50:27 jimw@mysql.com +1 -0
  Fix bug in ndbcluster.sh on Solaris (now that line is the same as in 5.1)

  mysql-test/ndb/ndbcluster.sh
    1.41.1.5 06/04/26 20:49:39 jimw@mysql.com +1 -1
    redirect to /dev/null to avoid grep -q

ChangeSet
  1.1810.1612.2 06/04/26 17:09:41 jimw@mysql.com +2 -0
  Remove obsolete test

  mysql-test/t/user_var.test
    1.33 06/04/26 17:09:37 jimw@mysql.com +0 -2
    Remove unnecessary test

  mysql-test/r/user_var.result
    1.37.1.1 06/04/26 17:09:37 jimw@mysql.com +0 -3
    Update results

ChangeSet
  1.1810.1611.1 06/04/26 18:26:26 kent@mysql.com +1 -0
  configure.in:
    Recloning, set back to 5.0.21

  configure.in
    1.245.46.3 06/04/26 18:26:04 kent@mysql.com +2 -2
    Recloning, set back to 5.0.21

ChangeSet
  1.1810.1610.1 06/04/26 09:21:53 jimw@mysql.com +3 -0
  Bug #17849: sql_big_selects not shown in SHOW VARIABLES output
    
    This patch simply adds sql_big_selects to the list of variables
    output by SHOW VARIABLES.

  sql/set_var.cc
    1.125.10.2 06/04/26 09:21:50 jimw@mysql.com +2 -1
    Add sql_big_selects to SHOW VARIABLES output

  mysql-test/t/variables.test
    1.51.4.1 06/04/26 09:21:50 jimw@mysql.com +9 -1
    Add new regression test (and make end-of-tests marker add output)

  mysql-test/r/variables.result
    1.76.4.1 06/04/26 09:21:50 jimw@mysql.com +7 -0
    Update results

ChangeSet
  1.1810.1594.3 06/04/26 18:10:14 msvensson@shellback.(none) +2 -0
  Move inclusion of "ripemd.hpp" from yassl to taocrypt

  extra/yassl/taocrypt/src/template_instnt.cpp
    1.6.1.5 06/04/26 18:10:09 msvensson@shellback.(none) +1 -0
    Move inclusion of "ripemd.hpp" from yassl to taocrypt

  extra/yassl/src/template_instnt.cpp
    1.4.1.3 06/04/26 18:10:09 msvensson@shellback.(none) +0 -1
    Move inclusion of "ripemd.hpp" from yassl to taocrypt

ChangeSet
  1.1810.1609.1 06/04/26 11:55:26 elliot@mysql.com +1 -0
  The fix for bug#17248 accidentally removed the sync_binlog variable.
  This patch restores sync_binlog.

  sql/set_var.cc
    1.125.10.1 06/04/26 11:55:23 elliot@mysql.com +9 -0
    restoring sync_binlog variable

ChangeSet
  1.2119.487.2 06/04/26 15:38:11 mskold@mysql.com +2 -0
  Added test for violation of uniqueness constraint at create index

ChangeSet
  1.2119.487.1 06/04/26 11:57:29 mskold@mysql.com +1 -0
  Corrected include path to work under Windows

ChangeSet
  1.1810.1608.3 06/04/26 15:55:30 tomas@poseidon.ndb.mysql.com +7 -0
  Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart
  - addded more retries to wait for nodefailure to complete
  Bug #19039 multi node failure causes node failure handling not to complete
  - patch to avoid this scenario when the management server is used to perform the stop
  - wait for NF_COMPLETE_REP in management server before returning
  ndb: allocate nodeid
  - only retry on retryable error

ChangeSet
  1.1810.1608.2 06/04/26 15:47:28 tomas@poseidon.ndb.mysql.com +1 -0
  Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error
  - added retry handling of temporary transaction errors

ChangeSet
  1.1810.1607.1 06/04/26 13:21:05 tomas@poseidon.ndb.mysql.com +4 -0
  ndb: added timeout handling to alloc node id to avoid the usage of purge stale sessions

ChangeSet
  1.1810.1600.9 06/04/26 11:13:16 bell@sanja.is.com.ua +2 -0
  fixed error message text

ChangeSet
  1.2119.477.7 06/04/26 16:11:20 jonas@perch.ndb.mysql.com +1 -0
  ndb - backup 5.0->5.1 merge

  storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
    1.23 06/04/26 16:11:17 jonas@perch.ndb.mysql.com +3 -2
    backup 5.0->5.1 merge

ChangeSet
  1.1810.1522.11 06/04/26 16:02:35 jonas@perch.ndb.mysql.com +1 -0
  ndb - backup 4.1->5.0 merge

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.15.21.1 06/04/26 16:02:32 jonas@perch.ndb.mysql.com +3 -2
    merge

ChangeSet
  1.1616.2536.7 06/04/26 15:57:48 jonas@perch.ndb.mysql.com +3 -0
  ndb -
    Unleash backup to write more than 32k at a time
    Using parameter BackupMaxWriteSize
    (greatly affect LCP time in 5.1, set default value to 256k)

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.50.2.12 06/04/26 15:57:46 jonas@perch.ndb.mysql.com +13 -1
    Add config fro max write size in backup

  ndb/src/kernel/blocks/backup/BackupInit.cpp
    1.8.1.5 06/04/26 15:57:46 jonas@perch.ndb.mysql.com +3 -2
    Unleash backup to write more than 32k at a time

  ndb/include/mgmapi/mgmapi_config_parameters.h
    1.13.1.5 06/04/26 15:57:46 jonas@perch.ndb.mysql.com +1 -0
    Add config fro max write size in backup

  ndb/src/mgmsrv/Services.cpp
    1.45.16.2 06/04/26 15:55:24 tomas@poseidon.ndb.mysql.com +15 -2
    Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart
    - addded more retries to wait for nodefailure to complete
    Bug #19039 multi node failure causes node failure handling not to complete
    - patch to avoid this scenario when the management server is used to perform the stop
    - wait for NF_COMPLETE_REP in management server before returning
    ndb: allocate nodeid
    - only retry on retryable error

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.30.11.2 06/04/26 15:55:24 tomas@poseidon.ndb.mysql.com +4 -2
    Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart
    - addded more retries to wait for nodefailure to complete
    Bug #19039 multi node failure causes node failure handling not to complete
    - patch to avoid this scenario when the management server is used to perform the stop
    - wait for NF_COMPLETE_REP in management server before returning
    ndb: allocate nodeid
    - only retry on retryable error

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.73.20.2 06/04/26 15:55:24 tomas@poseidon.ndb.mysql.com +107 -39
    Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart
    - addded more retries to wait for nodefailure to complete
    Bug #19039 multi node failure causes node failure handling not to complete
    - patch to avoid this scenario when the management server is used to perform the stop
    - wait for NF_COMPLETE_REP in management server before returning
    ndb: allocate nodeid
    - only retry on retryable error

  ndb/src/mgmapi/mgmapi.cpp
    1.44.16.1 06/04/26 15:55:24 tomas@poseidon.ndb.mysql.com +9 -4
    Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart
    - addded more retries to wait for nodefailure to complete
    Bug #19039 multi node failure causes node failure handling not to complete
    - patch to avoid this scenario when the management server is used to perform the stop
    - wait for NF_COMPLETE_REP in management server before returning
    ndb: allocate nodeid
    - only retry on retryable error

  ndb/src/kernel/vm/Configuration.cpp
    1.39.6.1 06/04/26 15:55:24 tomas@poseidon.ndb.mysql.com +2 -1
    Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart
    - addded more retries to wait for nodefailure to complete
    Bug #19039 multi node failure causes node failure handling not to complete
    - patch to avoid this scenario when the management server is used to perform the stop
    - wait for NF_COMPLETE_REP in management server before returning
    ndb: allocate nodeid
    - only retry on retryable error

  ndb/src/common/mgmcommon/ConfigRetriever.cpp
    1.24.9.1 06/04/26 15:55:24 tomas@poseidon.ndb.mysql.com +4 -2
    Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart
    - addded more retries to wait for nodefailure to complete
    Bug #19039 multi node failure causes node failure handling not to complete
    - patch to avoid this scenario when the management server is used to perform the stop
    - wait for NF_COMPLETE_REP in management server before returning
    ndb: allocate nodeid
    - only retry on retryable error

  ndb/include/mgmapi/mgmapi.h
    1.42.7.1 06/04/26 15:55:24 tomas@poseidon.ndb.mysql.com +7 -1
    Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart
    - addded more retries to wait for nodefailure to complete
    Bug #19039 multi node failure causes node failure handling not to complete
    - patch to avoid this scenario when the management server is used to perform the stop
    - wait for NF_COMPLETE_REP in management server before returning
    ndb: allocate nodeid
    - only retry on retryable error

  sql/ha_ndbcluster.cc
    1.175.1.70 06/04/26 15:47:20 tomas@poseidon.ndb.mysql.com +27 -5
    Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error
    - added retry handling of temporary transaction errors

  mysql-test/r/ndb_index_unique.result
    1.23 06/04/26 15:37:19 mskold@mysql.com +2 -0
    Added test for violation of uniqueness constraint at create index

  mysql-test/t/ndb_index_unique.test
    1.21 06/04/26 15:37:18 mskold@mysql.com +2 -2
    Added test for violation of uniqueness constraint at create index

ChangeSet
  1.1810.1594.2 06/04/26 15:29:52 msvensson@shellback.(none) +6 -0
  Import from upstream yassl

  extra/yassl/testsuite/test.hpp
    1.2 06/04/24 23:55:04 msvensson@shellback.(none)[msvensson] +2 -2
    Import patch yassl.diff

  extra/yassl/taocrypt/src/template_instnt.cpp
    1.6.1.4 06/04/24 21:55:44 msvensson@shellback.(none)[msvensson] +0 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/src/make.bat
    1.2 06/04/24 21:55:44 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/src/asn.cpp
    1.6 06/04/24 23:55:04 msvensson@shellback.(none)[msvensson] +52 -12
    Import patch yassl.diff

  extra/yassl/taocrypt/include/asn.hpp
    1.5 06/04/24 23:55:04 msvensson@shellback.(none)[msvensson] +13 -6
    Import patch yassl.diff

  extra/yassl/mySTL/helpers.hpp
    1.10 06/04/24 21:55:44 msvensson@shellback.(none)[msvensson] +5 -0
    Import patch yassl.diff

ChangeSet
  1.2119.477.4 06/04/26 15:15:30 jonas@perch.ndb.mysql.com +1 -0
  ndb dd -
    fix dirty page handling during opt.nr

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
    1.34 06/04/26 15:15:27 jonas@perch.ndb.mysql.com +2 -1
    fix dirty page handling during opt.nr

ChangeSet
  1.1616.2536.6 06/04/26 15:12:32 jonas@perch.ndb.mysql.com +2 -0
  ndb - backport from 5.1
    Fix alignment of sockaddr(_in)

  ndb/src/mgmsrv/Services.cpp
    1.31.1.9 06/04/26 15:12:30 jonas@perch.ndb.mysql.com +3 -3
    Fix alignment of sockaddr(_in)

  ndb/src/common/transporter/Transporter.cpp
    1.12.1.2 06/04/26 15:12:30 jonas@perch.ndb.mysql.com +6 -6
    Fix alignment of sockaddr(_in)

ChangeSet
  1.1616.2536.5 06/04/26 14:54:20 jonas@perch.ndb.mysql.com +1 -0
  Add ndb_config to rpm spec

  support-files/mysql.spec.sh
    1.83.1.32 06/04/26 14:54:18 jonas@perch.ndb.mysql.com +1 -0
    Add ndb_config to rpm spec

ChangeSet
  1.1616.2536.4 06/04/26 14:53:43 jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#17150
    ndb_mgmd limited no of api nodes, by restricting no of mgmsessions
    (these are used for dynamic port allocation)

  ndb/src/common/util/SocketServer.cpp
    1.10.1.3 06/04/26 14:53:42 jonas@perch.ndb.mysql.com +2 -2
    Increase default max session to ~0

  ndb/include/util/SocketServer.hpp
    1.5.1.2 06/04/26 14:53:41 jonas@perch.ndb.mysql.com +1 -1
    Increase default max session to ~0

ChangeSet
  1.1810.1457.107 06/04/26 13:22:18 msvensson@neptunus.(none) +1 -0
  Change sleep_until_file_created to sleep 100 millisecond instead of sleeping 1 seconds between each iteration.

  mysql-test/lib/mtr_process.pl
    1.25.2.4 06/04/26 13:22:14 msvensson@neptunus.(none) +14 -8
    Change sleep_until_file_created to sleep 100 millisecond instead of sleeping 1 seconds between each iteration.

  ndb/src/mgmsrv/Services.hpp
    1.13.4.1 06/04/26 13:20:59 tomas@poseidon.ndb.mysql.com +1 -0
    ndb: added timeout handling to alloc node id to avoid the usage of purge stale sessions

  ndb/src/mgmsrv/Services.cpp
    1.45.16.1 06/04/26 13:20:59 tomas@poseidon.ndb.mysql.com +45 -12
    ndb: added timeout handling to alloc node id to avoid the usage of purge stale sessions

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.30.11.1 06/04/26 13:20:59 tomas@poseidon.ndb.mysql.com +3 -1
    ndb: added timeout handling to alloc node id to avoid the usage of purge stale sessions

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.73.20.1 06/04/26 13:20:58 tomas@poseidon.ndb.mysql.com +16 -1
    ndb: added timeout handling to alloc node id to avoid the usage of purge stale sessions

ChangeSet
  1.1810.1605.1 06/04/26 15:58:27 holyfoot@deer.(none) +3 -0
  bug #18455 (embedded server Win32 build)

  VC++Files/libmysqld/libmysqld_ia64.dsp
    1.4 06/04/26 15:57:12 holyfoot@mysql.com +4 -0
    my_user.c added

  VC++Files/libmysqld/libmysqld.vcproj
    1.2.2.2 06/04/26 15:57:12 holyfoot@mysql.com +36 -0
    my_user.c file added

  VC++Files/libmysqld/libmysqld.dsp
    1.27.1.3 06/04/26 15:57:12 holyfoot@mysql.com +4 -0
    my_user.c file added

ChangeSet
  1.1810.1457.106 06/04/26 12:45:22 msvensson@neptunus.(none) +2 -0
  Bug#19362 im_daemon_lifecycle fails when built from source distribution
  - Add function "mysqld_real_path" which is needed if the mysqld_path is a symlink or a script(like libtool) that executes the real mysqld.
  - Add new variable mysqld_real_path
  - Use mysqld_real_path from fill_instance_version

  server-tools/instance-manager/instance_options.h
    1.19 06/04/26 12:45:18 msvensson@neptunus.(none) +4 -1
    Add new variable "mysqld_real_path"

  server-tools/instance-manager/instance_options.cc
    1.29.1.1 06/04/26 12:45:18 msvensson@neptunus.(none) +57 -2
    Add function "mysqld_real_path" which is needed if the mysqld_path is a symlink or a script(like libtool) that executes the real mysqld.
    Add new variable mysqld_real_path
    Use mysqld_real_path from fill_instance_version

ChangeSet
  1.1810.1457.105 06/04/26 12:16:57 msvensson@neptunus.(none) +1 -0
  Remove hacks for building shared libs on aix and qnx

  configure.in
    1.245.1.139 06/04/26 12:16:52 msvensson@neptunus.(none) +0 -39
    Remove hacks for building shared libs on aix and qnx

  client/mysqldump.c
    1.235 06/04/26 11:57:04 mskold@mysql.com +1 -1
    Corrected include path to work under Windows

ChangeSet
  1.2119.473.2 06/04/26 13:25:09 holyfoot@deer.(none) +1 -0
  bug #18518 (embedded server crashes starting)

  include/my_global.h
    1.123.1.1 06/04/26 13:25:03 holyfoot@mysql.com +9 -0
    we #define HAVE_ROW_BASED_REPLICATION and HAVE_NDB_BINLOG if it's
    the case

  sql/share/errmsg.txt
    1.42.13.1 06/04/26 11:13:11 bell@sanja.is.com.ua +1 -1
    fixed error message text

  mysql-test/r/view.result
    1.138.1.16 06/04/26 11:13:11 bell@sanja.is.com.ua +1 -1
    fixed error message text

ChangeSet
  1.1616.2557.2 06/04/26 11:15:09 aivanov@mysql.com +2 -0
  Make innodb_mysql produce a non-empty output.

  mysql-test/t/innodb_mysql.test
    1.2 06/04/26 11:15:06 aivanov@mysql.com +4 -0
    Make innodb_mysql produce a non-empty output.

  mysql-test/r/innodb_mysql.result
    1.2 06/04/26 11:15:06 aivanov@mysql.com +1 -1
    Fix result.

ChangeSet
  1.1810.1600.7 06/04/26 08:26:33 bpontz@mysql.com +1 -0
  configure.in:
    clone-off for 5.0.21

  configure.in
    1.245.46.2 06/04/26 08:24:29 bpontz@mysql.com +2 -2
    clone-off for 5.0.21

ChangeSet
  1.1616.2557.1 06/04/26 09:51:57 aivanov@mysql.com +3 -0
  Files innodb.[test|result] are to be used by Innobase only.
   Use files innodb_mysql.[test|result] instead.

  mysql-test/t/innodb_mysql.test
    1.1 06/04/26 09:51:53 aivanov@mysql.com +1 -0
    New BitKeeper file ``mysql-test/t/innodb_mysql.test''
     Use this file instead of innodb.test.
    

  mysql-test/r/innodb_mysql.result
    1.1 06/04/26 09:51:53 aivanov@mysql.com +1 -0
    New BitKeeper file ``mysql-test/r/innodb_mysql.result''
     Use this file instead of innodb.result.
    

  mysql-test/t/innodb_mysql.test
    1.0 06/04/26 09:51:53 aivanov@mysql.com +0 -0
    BitKeeper file /home/alexi/innodb/mysql-4.1-innodb-work/mysql-test/t/innodb_mysql.test

  mysql-test/t/innodb.test
    1.62.1.18 06/04/26 09:51:53 aivanov@mysql.com +13 -0
    This file is to be used by Innobase only.

  mysql-test/r/innodb_mysql.result
    1.0 06/04/26 09:51:53 aivanov@mysql.com +0 -0
    BitKeeper file /home/alexi/innodb/mysql-4.1-innodb-work/mysql-test/r/innodb_mysql.result

ChangeSet
  1.1810.1600.6 06/04/25 22:39:59 serg@sergbook.mysql.com +1 -0
  after merge

  sql/sql_parse.cc
    1.426.81.4 06/04/25 22:38:53 serg@sergbook.mysql.com +2 -2
    after merge

ChangeSet
  1.2119.482.2 06/04/26 08:30:37 aivanov@mysql.com +12 -0
  Applied innodb-5.1-ss492 snapshot.
   * Fix BUG#19217 "dict_load_indexes() may read the delete-mark incorrectly".
   * Remove obsolete and unused variables from srv0srv.c.
   * Remove srv_sys->operational since it is unused.
   * Make thread_id parameter in os_thread_create() optional.
   * Add platform-specific os_thread_ret_t and OS_THREAD_DUMMY_RETURN,
     and convert thread start functions to use them.

  storage/innobase/trx/trx0roll.c
    1.30 06/04/26 08:30:32 aivanov@mysql.com +2 -12
    Applied innodb-5.1-ss492 snapshot.

  storage/innobase/srv/srv0start.c
    1.92 06/04/26 08:30:32 aivanov@mysql.com +2 -15
    Applied innodb-5.1-ss492 snapshot.

  storage/innobase/srv/srv0srv.c
    1.99 06/04/26 08:30:32 aivanov@mysql.com +7 -59
    Applied innodb-5.1-ss492 snapshot.

  storage/innobase/que/que0que.c
    1.25 06/04/26 08:30:31 aivanov@mysql.com +0 -8
    Applied innodb-5.1-ss492 snapshot.

  storage/innobase/os/os0thread.c
    1.34 06/04/26 08:30:31 aivanov@mysql.com +7 -3
    Applied innodb-5.1-ss492 snapshot.

  storage/innobase/log/log0recv.c
    1.54 06/04/26 08:30:31 aivanov@mysql.com +1 -2
    Applied innodb-5.1-ss492 snapshot.

  storage/innobase/include/univ.i
    1.52 06/04/26 08:30:31 aivanov@mysql.com +12 -0
    Applied innodb-5.1-ss492 snapshot.

  storage/innobase/include/trx0roll.h
    1.12 06/04/26 08:30:31 aivanov@mysql.com +1 -5
    Applied innodb-5.1-ss492 snapshot.

  storage/innobase/include/srv0srv.h
    1.61 06/04/26 08:30:31 aivanov@mysql.com +3 -39
    Applied innodb-5.1-ss492 snapshot.

  storage/innobase/include/os0thread.h
    1.19 06/04/26 08:30:31 aivanov@mysql.com +1 -1
    Applied innodb-5.1-ss492 snapshot.

  storage/innobase/dict/dict0load.c
    1.49 06/04/26 08:30:31 aivanov@mysql.com +1 -1
    Applied innodb-5.1-ss492 snapshot.
     dict_load_indexes(): pass comp=0 to rec_get_deleted_flag(), because
     SYS_INDEXES always is in ROW_FORMAT=REDUNDANT (Bug #19217).

  storage/innobase/dict/dict0dict.c
    1.81 06/04/26 08:30:31 aivanov@mysql.com +3 -4
    Applied innodb-5.1-ss492 snapshot.

ChangeSet
  1.2119.460.12 06/04/26 07:29:26 andrey@lmy004. +1 -0
  disable before investigation why test case for 19170 is failing on
  some platforms.

  mysql-test/t/disabled.def
    1.144.1.1 06/04/26 07:29:18 andrey@lmy004. +1 -0
    disable before investigation why test case for 19170 is failing on
    some platforms.

ChangeSet
  1.1810.1602.1 06/04/26 07:50:29 aivanov@mysql.com +1 -0
  Applied innodb-5.0-ss492 snapshot.
   Fixed BUG#19217 "dict_load_indexes() may read the delete-mark incorrectly".

  innobase/dict/dict0load.c
    1.37.7.1 06/04/26 07:50:25 aivanov@mysql.com +1 -1
    Applied innodb-5.0-ss492 snapshot.
     dict_load_indexes(): pass comp=0 to rec_get_deleted_flag(), because
     SYS_INDEXES always is in ROW_FORMAT=REDUNDANT (Bug #19217).

ChangeSet
  1.1616.2556.2 06/04/25 17:12:06 serg@sergbook.mysql.com +1 -0
  after merge fix

  sql/sql_parse.cc
    1.271.1.208 06/04/25 17:11:28 serg@sergbook.mysql.com +3 -3
    after merge fix

ChangeSet
  1.1346.1.830 06/04/25 16:41:12 serg@sergbook.mysql.com +1 -0
  small optimization of the previous bugfix
  (based on the fact that packet is ALWAYS \0 terminated, see my_net_read)

  sql/sql_parse.cc
    1.218.44.8 06/04/25 16:41:10 serg@sergbook.mysql.com +1 -1
    small optimization of the previous bugfix
    (based on the fact that packet is ALWAYS \0 terminated, see my_net_read)

ChangeSet
  1.2119.1.240 06/04/26 01:11:40 tomas@poseidon.ndb.mysql.com +6 -0
  ndb: break out ndb backup compatability test, so that it can be disabled on mac

  mysql-test/t/ndb_restore_compat.test
    1.1 06/04/26 01:11:32 tomas@poseidon.ndb.mysql.com +43 -0
    New BitKeeper file ``mysql-test/t/ndb_restore_compat.test''

  mysql-test/r/ndb_restore_compat.result
    1.1 06/04/26 01:11:32 tomas@poseidon.ndb.mysql.com +104 -0
    New BitKeeper file ``mysql-test/r/ndb_restore_compat.result''

  mysql-test/t/ndb_restore_compat.test
    1.0 06/04/26 01:11:32 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/t/ndb_restore_compat.test

  mysql-test/r/ndb_restore_compat.result
    1.0 06/04/26 01:11:32 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/r/ndb_restore_compat.result

  mysql-test/r/case_sensitive_file_system.require
    1.1 06/04/26 01:11:31 tomas@poseidon.ndb.mysql.com +2 -0
    New BitKeeper file ``mysql-test/r/case_sensitive_file_system.require''

  mysql-test/include/have_case_sensitive_file_system.inc
    1.1 06/04/26 01:11:31 tomas@poseidon.ndb.mysql.com +4 -0
    New BitKeeper file ``mysql-test/include/have_case_sensitive_file_system.inc''

  mysql-test/t/ndb_restore.test
    1.20 06/04/26 01:11:31 tomas@poseidon.ndb.mysql.com +0 -37
    ndb: break out ndb backup compatability test, so that it can be disabled on mac

  mysql-test/r/ndb_restore.result
    1.16 06/04/26 01:11:31 tomas@poseidon.ndb.mysql.com +0 -104
    ndb: break out ndb backup compatability test, so that it can be disabled on mac

  mysql-test/r/case_sensitive_file_system.require
    1.0 06/04/26 01:11:31 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/r/case_sensitive_file_system.require

  mysql-test/include/have_case_sensitive_file_system.inc
    1.0 06/04/26 01:11:31 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/include/have_case_sensitive_file_system.inc

ChangeSet
  1.2119.481.1 06/04/25 14:33:54 mikael@zim.(none) +1 -0
  BUG#19313: Crash after mysqld starts and stops immediately afterwards.

  sql/sql_table.cc
    1.324.1.1 06/04/25 14:33:48 mikael@zim.(none) +11 -5
    Making sure all initialisations are properly done even
    when memory allocations fail.

ChangeSet
  1.1810.1600.4 06/04/26 01:21:33 sergefp@mysql.com +1 -0
  Fix compile failure on Win32

  sql/item_cmpfunc.h
    1.124 06/04/26 01:21:24 sergefp@mysql.com +1 -1
    Fix compile failure on Win32

ChangeSet
  1.1346.1.829 06/04/25 13:37:33 serg@sergbook.mysql.com +1 -0
  buffer overflow and information exposure bugs fixed
  (reported by Stefano Di Paola)

  sql/sql_parse.cc
    1.218.44.7 06/04/25 13:37:30 serg@sergbook.mysql.com +15 -0
    buffer overflow and information exposure bugs fixed
    (reported by Stefano Di Paola)

ChangeSet
  1.2119.480.2 06/04/25 22:53:50 aelkin@mysql.com +1 -0
  BUG#17263: incorrect DROP query in temporary tables replication
  
  the fix from 5.0 with necessary modifications applied.

  sql/sql_base.cc
    1.318 06/04/25 22:53:41 aelkin@mysql.com +122 -39
    Manual merge with 5.0.

ChangeSet
  1.1810.1601.1 06/04/25 23:33:31 sergefp@mysql.com +6 -0
  BUG#15872: Don't run the range analyzer on "t1.keypart NOT IN (const1, ..., )", as that consumes
  too much memory. Instead, either create the equvalent SEL_TREE manually, or create only two ranges that
  strictly include the area to scan
  (Note: just to re-iterate: increasing NOT_IN_IGNORE_THRESHOLD will make optimization run slower for big 
  IN-lists, but the server will not run out of memory. O(N^2) memory use has been eliminated)

  sql/opt_range.cc
    1.159.1.50 06/04/25 23:33:26 sergefp@mysql.com +84 -9
    BUG#15872: Don't run the range analyzer on "t1.keypart NOT IN (const1, ..., )", as that 
    consumes too much memory. Instead, either 
     A) create the equivalent SEL_TREE manually, making use of the fact that item_not_in->array
        has an ordered IN-list, or
     B) create only two ranges: (-inf|NULL) < X < min_value_from_in_list,  max_value_from_in_list < X
    (Choose #B if the IN-list has > 10K elements) 

  sql/item_cmpfunc.h
    1.123 06/04/25 23:33:26 sergefp@mysql.com +74 -3
    BUG#15872: Added in_vector::create_item(), in_vector::value_to_item() and their implementations in concrete
    classes.

  sql/item.h
    1.183.1.9 06/04/25 23:33:26 sergefp@mysql.com +1 -0
    UG#15872: Added Item_decimal::set_decimal_value()

  sql/item.cc
    1.113.41.1 06/04/25 23:33:26 sergefp@mysql.com +10 -0
    BUG#15872: Added Item_decimal::set_decimal_value()

  mysql-test/t/func_in.test
    1.19 06/04/25 23:33:26 sergefp@mysql.com +93 -1
    Testcase for BUG#15872

  mysql-test/r/func_in.result
    1.24 06/04/25 23:33:26 sergefp@mysql.com +102 -1
    Testcase for BUG#15872

ChangeSet
  1.1810.1600.2 06/04/25 10:04:46 stewart@mysql.com +1 -0
  BUG#19340 small leak in ndbd
  
  small cleanup fixes in kernel/vm/Configuration

  ndb/src/kernel/vm/Configuration.cpp
    1.39.5.1 06/04/25 10:04:42 stewart@mysql.com +8 -0
    clean up m_logLevel
    
    free the connectstring if we allocated one

ChangeSet
  1.2119.479.1 06/04/25 18:28:29 mleich@mysql.com +2 -0
  Post merge correction for the Changeset
    Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to MySQL 4.1
    and Bug#16920 rpl_deadlock_innodb fails in show slave status (reported for MySQL 5.1)
  - Reactivation of testcase rpl_deadlock_innodb + updated file with expected results
  - Removal of wrong entry within disabled.def

  mysql-test/t/disabled.def
    1.141.3.1 06/04/25 18:28:22 mleich@mysql.com +0 -2
    - Reactivation of testcase rpl_deadlock_innodb
    - Removal of entry for not existing testcase rpl_until

  mysql-test/r/rpl_deadlock_innodb.result
    1.11 06/04/25 18:28:22 mleich@mysql.com +9 -9
    Updated result

ChangeSet
  1.2119.475.5 06/04/25 17:44:35 pem@mysql.com +2 -0
  Post-merge fixes from 5.0.

  sql/sql_yacc.yy
    1.470.2.3 06/04/25 17:44:25 pem@mysql.com +1 -97
    Post-merge fix. Removed GOTO/LABEL from parser.

  mysql-test/extra/rpl_tests/rpl_insert_id.test
    1.5 06/04/25 17:44:25 pem@mysql.com +70 -0
    Post-merge fix. Added new 5.0 test case manually.

ChangeSet
  1.2119.1.238 06/04/25 16:16:16 jonas@perch.ndb.mysql.com +1 -0
  reenable ndb_cache2 & ndb_cach_multi2 as I've fixed bug-18597

ChangeSet
  1.2119.1.236 06/04/25 16:06:38 jonas@perch.ndb.mysql.com +1 -0
  ndb -
    Fix bootstrap/compile error

ChangeSet
  1.2119.1.234 06/04/25 17:02:46 tomas@poseidon.ndb.mysql.com +1 -0
  ndb_restore: more compatablitity checks

  storage/ndb/tools/restore/restore_main.cpp
    1.45 06/04/25 16:06:35 jonas@perch.ndb.mysql.com +1 -1
    Fix bootstrap/compile error

  storage/ndb/tools/restore/restore_main.cpp
    1.44 06/04/25 17:02:39 tomas@poseidon.ndb.mysql.com +20 -1
    ndb_restore: more compatablitity checks

ChangeSet
  1.2119.477.2 06/04/25 16:30:44 jonas@perch.ndb.mysql.com +1 -0
  ndb -
    Fix so that testDict can use/handle disk tables

  storage/ndb/test/ndbapi/testDict.cpp
    1.26 06/04/25 16:30:41 jonas@perch.ndb.mysql.com +6 -6
    Fix so that testDict can use/handle disk tables

  mysql-test/t/disabled.def
    1.141.1.1 06/04/25 16:16:13 jonas@perch.ndb.mysql.com +2 -2
    reenable ndb_cache2 & ndb_cach_multi2 as I've fixed bug-18597

ChangeSet
  1.1616.2536.3 06/04/25 16:01:08 jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#18597
    Handle early abort of scan, so that resources are correctly freed

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.42.1.23 06/04/25 16:01:06 jonas@perch.ndb.mysql.com +25 -12
    Handle early abort so that require on running.empty() does not fire

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp
    1.18.1.6 06/04/25 16:01:06 jonas@perch.ndb.mysql.com +3 -2
    Handle early abort

ChangeSet
  1.2119.1.232 06/04/25 14:02:15 tomas@poseidon.ndb.mysql.com +9 -0
  modified ndb backup/restore to be byte order independant
  - the replica info was not stored in byte order indepentent format
  - backup/restore still compatible 5.0->5.1
  - but patch makes previous 5.1 versions completely incompatible

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.125.1.2 06/04/25 14:02:07 tomas@poseidon.ndb.mysql.com +3 -3
    modified ndb backup/restore to be byte order independant
    - the replica info was not stored in byte order indepentent format
    - backup/restore still compatible 5.0->5.1
    - but patch makes previous 5.1 versions completely incompatible

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.87 06/04/25 14:02:07 tomas@poseidon.ndb.mysql.com +2 -0
    modified ndb backup/restore to be byte order independant
    - the replica info was not stored in byte order indepentent format
    - backup/restore still compatible 5.0->5.1
    - but patch makes previous 5.1 versions completely incompatible

  mysql-test/std_data/ndb_backup51/BACKUP-1.2.log
    1.2 06/04/25 14:02:07 tomas@poseidon.ndb.mysql.com +156 -423
    modified ndb backup/restore to be byte order independant
    - the replica info was not stored in byte order indepentent format
    - backup/restore still compatible 5.0->5.1
    - but patch makes previous 5.1 versions completely incompatible

  mysql-test/std_data/ndb_backup51/BACKUP-1.2.ctl
    1.2 06/04/25 14:02:07 tomas@poseidon.ndb.mysql.com +16 -16
    modified ndb backup/restore to be byte order independant
    - the replica info was not stored in byte order indepentent format
    - backup/restore still compatible 5.0->5.1
    - but patch makes previous 5.1 versions completely incompatible

  mysql-test/std_data/ndb_backup51/BACKUP-1.1.log
    1.2 06/04/25 14:02:07 tomas@poseidon.ndb.mysql.com +169 -484
    modified ndb backup/restore to be byte order independant
    - the replica info was not stored in byte order indepentent format
    - backup/restore still compatible 5.0->5.1
    - but patch makes previous 5.1 versions completely incompatible

  mysql-test/std_data/ndb_backup51/BACKUP-1.1.ctl
    1.2 06/04/25 14:02:07 tomas@poseidon.ndb.mysql.com +16 -16
    modified ndb backup/restore to be byte order independant
    - the replica info was not stored in byte order indepentent format
    - backup/restore still compatible 5.0->5.1
    - but patch makes previous 5.1 versions completely incompatible

  mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data
    1.2 06/04/25 14:00:57 tomas@poseidon.ndb.mysql.com +2285 -4016
    modified ndb backup/restore to be byte order independant
    - the replica info was not stored in byte order indepentent format
    - backup/restore still compatible 5.0->5.1
    - but patch makes previous 5.1 versions completely incompatible

  mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data
    1.2 06/04/25 14:00:57 tomas@poseidon.ndb.mysql.com +2314 -3960
    modified ndb backup/restore to be byte order independant
    - the replica info was not stored in byte order indepentent format
    - backup/restore still compatible 5.0->5.1
    - but patch makes previous 5.1 versions completely incompatible

  mysql-test/r/ndb_restore.result
    1.15 06/04/25 14:00:56 tomas@poseidon.ndb.mysql.com +24 -39
    modified ndb backup/restore to be byte order independant
    - the replica info was not stored in byte order indepentent format
    - backup/restore still compatible 5.0->5.1
    - but patch makes previous 5.1 versions completely incompatible

ChangeSet
  1.2119.477.1 06/04/25 13:32:10 jonas@perch.ndb.mysql.com +3 -0
  ndb - 
  
  1) relax version check for restore block since no changes has happend since 5.1.6
     and improve error message on check failure
     
  2) improve lcp/backup max write size...

  storage/ndb/src/kernel/blocks/restore.hpp
    1.5 06/04/25 13:32:07 jonas@perch.ndb.mysql.com +1 -0
    Relax version check for restore block since no changes has happend since 5.1.6

  storage/ndb/src/kernel/blocks/restore.cpp
    1.6 06/04/25 13:32:07 jonas@perch.ndb.mysql.com +25 -4
    Relax version check for restore block since no changes has happend since 5.1.6

  storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
    1.21 06/04/25 13:32:07 jonas@perch.ndb.mysql.com +1 -1
    Increase max write size to 256k (currently not configurable...)

ChangeSet
  1.1810.1587.2 06/04/25 12:40:31 mskold@mysql.com +1 -0
  Fixed memleak detected by valgrind

  sql/ha_ndbcluster.cc
    1.175.1.69 06/04/25 12:40:16 mskold@mysql.com +3 -1
    Fixed memleak detected by valgrind

ChangeSet
  1.1616.2555.1 06/04/25 15:27:28 ramil@mysql.com +1 -0
  Fix for bug #7643: ALTER TABLE fails for CSV, EXAMPLE, ARCHIVE engines
  

  sql/sql_table.cc
    1.157.60.1 06/04/25 15:27:24 ramil@mysql.com +3 -1
    Fix for bug #7643: ALTER TABLE fails for CSV, EXAMPLE, ARCHIVE engines
      - issue an ER_NOT_SUPPORTED_YET if an engine doesn't support ALTER TABLE.

ChangeSet
  1.1616.2554.1 06/04/25 14:34:19 ramil@mysql.com +3 -0
  Fix for bug #18501: Server crashes with monthname().

  sql/item_timefunc.cc
    1.51.1.48 06/04/25 14:34:14 ramil@mysql.com +2 -2
    Fix for bug #18501: Server crashes with monthname().
      - check null_value as well.

  mysql-test/t/func_time.test
    1.21.1.12 06/04/25 14:34:13 ramil@mysql.com +7 -0
    Fix for bug #18501: Server crashes with monthname().
      - test case

  mysql-test/r/func_time.result
    1.23.1.15 06/04/25 14:34:13 ramil@mysql.com +4 -0
    Fix for bug #18501: Server crashes with monthname().
      - test case

ChangeSet
  1.1810.1598.2 06/04/25 04:27:23 konstantin@mysql.com +6 -0
  A fix and a test case for Bug#19308 "REPAIR/OPTIMIZE/ANALYZE 
  supported in SP but not in PS": just enable them in prepared
  statements, the supporting functionality was implemented when
  they were enabled in stored procedures.

  sql/sql_prepare.cc
    1.142.1.34 06/04/25 04:27:16 konstantin@mysql.com +3 -0
    Enable ANALYZE, OPTIMIZE, REPAIR in prepared statements.

  mysql-test/t/ps_1general.test
    1.25.1.2 06/04/25 04:27:16 konstantin@mysql.com +0 -3
    Adjust existing test cases (ANALYZE/OPTIMIZE/REPAIR are now
    allowed in prepared statements.

  mysql-test/t/ps.test
    1.56.1.7 06/04/25 04:27:16 konstantin@mysql.com +36 -0
    Add a test case for Bug#19308 "REPAIR/OPTIMIZE/ANALYZE supported 
    in SP but not in PS"

  mysql-test/r/sp-dynamic.result
    1.4 06/04/25 04:27:16 konstantin@mysql.com +3 -3
    Adjust existing test cases (ANALYZE/OPTIMIZE/REPAIR are now
    allowed in prepared statements.

  mysql-test/r/ps_1general.result
    1.50.1.3 06/04/25 04:27:16 konstantin@mysql.com +0 -3
    Adjust existing test cases (ANALYZE/OPTIMIZE/REPAIR are now
    allowed in prepared statements.

  mysql-test/r/ps.result
    1.56.1.9 06/04/25 04:27:16 konstantin@mysql.com +101 -0
    Bug#19308: test results fixed.

ChangeSet
  1.2119.474.2 06/04/24 14:32:45 acurtis@xiphis.org +2 -0
  WL#3201
    post-merge fixes

  sql/sql_plugin.cc
    1.20 06/04/24 14:32:40 acurtis@xiphis.org +1 -1
    WL#3201
      post-merge fixes

  config/ac-macros/plugins.m4
    1.3 06/04/24 14:32:40 acurtis@xiphis.org +18 -0
    WL#3201
      post-merge fixes

ChangeSet
  1.2119.470.4 06/04/24 23:29:33 tomas@poseidon.ndb.mysql.com +2 -0
  Bug #14516 Restart of cluster can cause NDB API replication failure
  - this behavior was already changed, adding testcase

  mysql-test/t/ndb_binlog_discover.test
    1.1 06/04/24 23:29:25 tomas@poseidon.ndb.mysql.com +19 -0
    New BitKeeper file ``mysql-test/t/ndb_binlog_discover.test''

  mysql-test/r/ndb_binlog_discover.result
    1.1 06/04/24 23:29:25 tomas@poseidon.ndb.mysql.com +13 -0
    New BitKeeper file ``mysql-test/r/ndb_binlog_discover.result''

  mysql-test/t/ndb_binlog_discover.test
    1.0 06/04/24 23:29:25 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/t/ndb_binlog_discover.test

  mysql-test/r/ndb_binlog_discover.result
    1.0 06/04/24 23:29:25 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/r/ndb_binlog_discover.result

ChangeSet
  1.2119.462.14 06/04/24 16:05:57 cmiller@zippy.(none) +1 -0
  Manual merge fix.

  mysql-test/r/innodb.result
    1.174 06/04/24 16:05:53 cmiller@zippy.(none) +2 -2
    Corrected from manual merge.  I know the numbers are right (it's a 
    7,7-seeded fibbonaci sequence), but I don't know how I missed the latter 
    line.

ChangeSet
  1.1810.1457.104 06/04/24 21:42:44 msvensson@neptunus.(none) +1 -0
  Revert use of octal numbers for chmod

  mysql-test/t/information_schema.test
    1.65.1.10 06/04/24 21:42:40 msvensson@neptunus.(none) +2 -2
    Revert use of octal numbers for chmod

ChangeSet
  1.1810.1349.56 06/04/24 20:59:23 evgen@moonbone.local +1 -0
  having.test:
    After merge fix for bug#18739

  mysql-test/t/having.test
    1.22 06/04/24 20:58:48 evgen@moonbone.local +1 -1
    After merge fix for bug#18739

ChangeSet
  1.2119.470.3 06/04/24 18:26:30 tomas@poseidon.ndb.mysql.com +5 -0
  bug#18604 create logfile for MyISAM tables
  - changed alter tablespace truct to work with handlerton pointer (to avoid crash in parser on unknown db type"
  - pushed warnings when default storage engine is used and/or tablespace stuff is not supported by storage engine

  sql/sql_yacc.yy
    1.471 06/04/24 18:26:21 tomas@poseidon.ndb.mysql.com +2 -2
    bug#18604 create logfile for MyISAM tables
    - changed alter tablespace truct to work with handlerton pointer (to avoid crash in parser on unknown db type"
    - pushed warnings when default storage engine is used and/or tablespace stuff is not supported by storage engine

  sql/sql_tablespace.cc
    1.4 06/04/24 18:26:21 tomas@poseidon.ndb.mysql.com +35 -16
    bug#18604 create logfile for MyISAM tables
    - changed alter tablespace truct to work with handlerton pointer (to avoid crash in parser on unknown db type"
    - pushed warnings when default storage engine is used and/or tablespace stuff is not supported by storage engine

  sql/handler.h
    1.205 06/04/24 18:26:21 tomas@poseidon.ndb.mysql.com +5 -4
    bug#18604 create logfile for MyISAM tables
    - changed alter tablespace truct to work with handlerton pointer (to avoid crash in parser on unknown db type"
    - pushed warnings when default storage engine is used and/or tablespace stuff is not supported by storage engine

  mysql-test/t/ndb_dd_basic.test
    1.6 06/04/24 18:26:21 tomas@poseidon.ndb.mysql.com +20 -2
    bug#18604 create logfile for MyISAM tables

  mysql-test/r/ndb_dd_basic.result
    1.7 06/04/24 18:26:21 tomas@poseidon.ndb.mysql.com +22 -1
    bug#18604 create logfile for MyISAM tables

ChangeSet
  1.2119.462.12 06/04/24 20:19:32 svoj@april.(none) +1 -0
  after merge fix

  storage/myisam/mi_dynrec.c
    1.43 06/04/24 20:19:28 svoj@april.(none) +5 -0
    after merge fix

ChangeSet
  1.1810.1597.1 06/04/24 18:57:00 dlenev@mysql.com +4 -0
  Fix for bug#11081 "Using a CONVERT_TZ function in a stored function or
  trigger fails".
  
  In cases when CONVERT_TZ() function was used in trigger or stored function
  (or in stored procedure which was called from trigger or stored function)
  error about non existing '.' table was reported.
  
  Statements that use CONVERT_TZ() function should have time zone related
  tables in their table list. tz_init_table_list() function which is used
  to produce part of table list containing those tables didn't set
  TABLE_LIST::db_length/table_name_length members properly. As result time
  zone tables needed for CONVERT_TZ() function were incorrectly handled by
  prelocking algorithm and "Table '.' doesn't exist' error was emitted.
  This fix changes tz_init_table_list() in such way that it properly inits
  TABLE_LIST::table_name_length/db_length members and thus produces table list
  which can be handled by prelocking algorithm correctly.

  sql/tztime.h
    1.12.1.2 06/04/24 18:56:56 dlenev@mysql.com +11 -2
    Added MY_TZ_TABLES_COUNT constant to be used as number of time zone related
    tables which are needed for dynamical loading of time zone descriptions.

  sql/tztime.cc
    1.24.1.7 06/04/24 18:56:56 dlenev@mysql.com +52 -30
    Now tz_init_table_list() inits table_name_length and db_length members in
    TABLE_LIST objects, so table lists produced with its help can be handled 
    by prelocking algorithm properly.
    
    Also two clean-ups are included:
    - Now we use MY_TZ_TABLES_COUNT instead of magical number 4 in places where
      it is appropriate.
    - TZ_NAMES_ENTRY structure was converted to Tz_names_entry class in order 
      to emphasize its non-POD nature.

  mysql-test/t/timezone2.test
    1.10 06/04/24 18:56:56 dlenev@mysql.com +20 -0
    Added test for bug #11081 "Using a CONVERT_TZ function in a stored function
    or trigger fails".

  mysql-test/r/timezone2.result
    1.12.1.1 06/04/24 18:56:56 dlenev@mysql.com +15 -0
    Added test for bug #11081 "Using a CONVERT_TZ function in a stored function
    or trigger fails".

ChangeSet
  1.2119.473.1 06/04/24 19:39:33 holyfoot@deer.(none) +9 -0
  bug #18518 (embedded server crashes starting)
  The problem is that now server works properly only with the 
  row-based replication

  sql/sql_parse.cc
    1.534.1.1 06/04/24 19:38:05 holyfoot@mysql.com +4 -0
    some #ifdef HAVE_ROW_BASED_REPLICATION added

  sql/sql_class.h
    1.283.4.1 06/04/24 19:38:05 holyfoot@mysql.com +2 -0
    some #ifdef HAVE_ROW_BASED_REPLICATION added

  sql/sql_class.cc
    1.251.2.1 06/04/24 19:38:05 holyfoot@mysql.com +10 -1
    some #ifdef HAVE_ROW_BASED_REPLICATION added

  sql/sql_base.cc
    1.311.3.1 06/04/24 19:38:05 holyfoot@mysql.com +2 -0
    some #ifdef HAVE_ROW_BASED_REPLICATION added

  sql/set_var.cc
    1.164.5.1 06/04/24 19:38:05 holyfoot@mysql.com +4 -0
    some #ifdef HAVE_ROW_BASED_REPLICATION added

  sql/mysqld.cc
    1.534.12.1 06/04/24 19:38:04 holyfoot@mysql.com +1 -1
    some #ifdef HAVE_ROW_BASED_REPLICATION added

  sql/log.cc
    1.199.6.1 06/04/24 19:38:04 holyfoot@mysql.com +10 -0
    some #ifdef HAVE_ROW_BASED_REPLICATION added

  config/ac-macros/replication.m4
    1.3 06/04/24 19:38:04 holyfoot@mysql.com +1 -1
    WITH_ROW_BASED_REPLICATION instead of HAVE_ROW_BASED_REPLICATION in
    config.h

  config/ac-macros/ha_ndbcluster.m4
    1.13.1.1 06/04/24 19:38:04 holyfoot@mysql.com +1 -1
    WITH_NDB_BINLOG instead of HAVE_NDB_BINLOG in config.h

ChangeSet
  1.1616.2553.1 06/04/24 18:06:43 kroki@mysql.com +3 -0
  Bug#16501: IS_USED_LOCK does not appear to work
  
  Update User_level_lock::thread_id on acquiring an existing lock,
  and reset it on lock release.

  sql/item_func.cc
    1.124.42.8 06/04/24 18:06:39 kroki@mysql.com +2 -0
    Update User_level_lock::thread_id on acquiring an existing lock,
    and reset it on lock release (for safety).

  mysql-test/t/func_misc.test
    1.11.1.3 06/04/24 18:06:39 kroki@mysql.com +38 -0
    Add test case for bug#16501.

  mysql-test/r/func_misc.result
    1.16.1.2 06/04/24 18:06:38 kroki@mysql.com +36 -0
    Add result for bug#16501.

ChangeSet
  1.2119.470.2 06/04/24 16:05:02 tomas@poseidon.ndb.mysql.com +2 -0
  Bug #18935 restore of apply_status table fails using old ndb backup

  mysql-test/t/ndb_restore.test
    1.19 06/04/24 16:04:56 tomas@poseidon.ndb.mysql.com +4 -2
    Bug #18935 restore of apply_status table fails using old ndb backup

  mysql-test/r/ndb_restore.result
    1.14 06/04/24 16:04:56 tomas@poseidon.ndb.mysql.com +6 -0
    Bug #18935 restore of apply_status table fails using old ndb backup

ChangeSet
  1.2119.471.2 06/04/24 15:50:05 mskold@mysql.com +1 -0
  Fix for Bug #17840  mysqldump should not dump tables in database cluster, reuse existing define

  client/mysqldump.c
    1.234 06/04/24 15:49:53 mskold@mysql.com +2 -2
    Fix for Bug #17840  mysqldump should not dump tables in database cluster, reuse existing define

ChangeSet
  1.2119.471.1 06/04/24 15:39:49 mskold@mysql.com +1 -0
  Fix for Bug #17840  mysqldump should not dump tables in database cluster, skip cluster internal database

  client/mysqldump.c
    1.233 06/04/24 15:38:45 mskold@mysql.com +3 -1
    Fix for Bug #17840  mysqldump should not dump tables in database , skip cluster internal database

ChangeSet
  1.1616.2144.109 06/04/24 15:34:01 knielsen@mysql.com +1 -0
  Fix typo in mysql-test-run.pl (not caught by aotupush since it uses mysql-test-run.sh).

  mysql-test/mysql-test-run.pl
    1.8.10.2 06/04/24 15:33:44 knielsen@mysql.com +1 -1
    Fix typo.

ChangeSet
  1.1810.1457.103 06/04/24 14:25:34 msvensson@neptunus.(none) +1 -0
  Update disabled message to include bug no.

  mysql-test/t/disabled.def
    1.2.4.7 06/04/24 14:25:30 msvensson@neptunus.(none) +1 -1
    Update disabled message

ChangeSet
  1.1810.1457.102 06/04/24 13:51:21 msvensson@neptunus.(none) +1 -0
  Test it it works better to set no read access for a file by using 000 instead of -r
  Looks like the trigger.test works that way

  mysql-test/t/information_schema.test
    1.65.1.9 06/04/24 13:51:17 msvensson@neptunus.(none) +2 -2
    Test it it works better to set no read access for a file by using 000 instead of -r

ChangeSet
  1.2119.469.2 06/04/24 13:44:57 tomas@poseidon.ndb.mysql.com +1 -0
  Bug #19247 Huge memleak in replication of blobs

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.53 06/04/24 13:44:50 tomas@poseidon.ndb.mysql.com +9 -2
    Bug #19247 Huge memleak in replication of blobs

ChangeSet
  1.1810.1457.101 06/04/24 13:33:33 msvensson@neptunus.(none) +1 -0
  Update help message for start-and-exit

  mysql-test/mysql-test-run.pl
    1.30.25.7 06/04/24 13:33:28 msvensson@neptunus.(none) +1 -1
    Update help message for start-and-exit

ChangeSet
  1.2119.469.1 06/04/24 13:31:24 tomas@poseidon.ndb.mysql.com +1 -0
  Bug #18603  	Lost connection on poorly formed "create logfile" and "create tablespace"

  sql/sql_tablespace.cc
    1.3 06/04/24 13:31:17 tomas@poseidon.ndb.mysql.com +2 -1
    Bug #18603  	Lost connection on poorly formed "create logfile" and "create tablespace"

ChangeSet
  1.1810.1457.100 06/04/24 13:25:50 msvensson@neptunus.(none) +1 -0
  Ad file "have_ndb_status_ok.require"

  mysql-test/r/have_ndb_status_ok.require
    1.1 06/04/24 13:25:46 msvensson@neptunus.(none) +2 -0
    New BitKeeper file ``mysql-test/r/have_ndb_status_ok.require''

  mysql-test/r/have_ndb_status_ok.require
    1.0 06/04/24 13:25:45 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-5.0-maint/mysql-test/r/have_ndb_status_ok.require

ChangeSet
  1.1810.1457.99 06/04/24 12:01:16 msvensson@neptunus.(none) +1 -0
  Use "eval select" when evaluating the environment variable "$MYSQL_TEST_ROOT" 

  mysql-test/include/not_as_root.inc
    1.2 06/04/24 12:01:12 msvensson@neptunus.(none) +1 -1
    Use "eval select" when evaluating the environment variable "$MYSQL_TEST_ROOT" 

ChangeSet
  1.1810.1457.98 06/04/24 12:00:11 msvensson@neptunus.(none) +2 -0
  Make have_ndb.in portable

  mysql-test/mysql-test-run.pl
    1.30.25.6 06/04/24 12:00:07 msvensson@neptunus.(none) +3 -2
    Move initializetion of NDB_STATUS_OK and only do it once in init part of scripot. This will make it possible to  set 
    it to NO if we detect that cluster can't be started.

  mysql-test/include/have_ndb.inc
    1.8 06/04/24 12:00:07 msvensson@neptunus.(none) +8 -1
    Remove the "exec test" and instead use the portable way to
    check an environment variable using "eval select". The value of 
    $NDB_STATUS_OK will this be replace by mysqltest and the query 
    "select "YES" and ndb_status_ok" will be sent to the server and back.

ChangeSet
  1.2119.460.8 06/04/24 12:30:17 andrey@lmy004. +1 -0
  enable logs_tests

  mysql-test/t/disabled.def
    1.143 06/04/24 12:30:09 andrey@lmy004. +0 -1
    enable logs_tests

ChangeSet
  1.1810.1457.97 06/04/24 11:26:41 msvensson@neptunus.(none) +2 -0
  Bug#19084  	./mysql-test-run.pl do not print bootstrap run info
   - Log boostratp/install to var/log/boostrap.log
   - Log output from mysqladmin to var/log/mysqladmin.log
   - Remove old manager references

  mysql-test/mysql-test-run.pl
    1.30.25.5 06/04/24 11:26:37 msvensson@neptunus.(none) +11 -14
    Log output from boostrap/install of db's to var/log/bootstrap.log
    Remove references to old manager

  mysql-test/lib/mtr_process.pl
    1.25.2.3 06/04/24 11:26:37 msvensson@neptunus.(none) +5 -4
    Log output from mysqladmin to var/log/mysqladmin.log

ChangeSet
  1.2119.460.6 06/04/24 12:17:28 andrey@lmy004. +1 -0
  enable events_scheduling

  mysql-test/t/disabled.def
    1.142 06/04/24 12:17:16 andrey@lmy004. +0 -1
    enable events_scheduling

ChangeSet
  1.2119.460.5 06/04/24 12:12:15 andrey@lmy004. +4 -0
  test case for bug 19170

  mysql-test/t/events_scheduling.test
    1.3 06/04/24 12:12:04 andrey@lmy004. +5 -1
    add test case for bug 19170

  mysql-test/t/events_logs_tests.test
    1.6 06/04/24 12:12:04 andrey@lmy004. +2 -0
    fix test

  mysql-test/r/events_scheduling.result
    1.2 06/04/24 12:12:04 andrey@lmy004. +8 -2
    update result

  mysql-test/r/events_logs_tests.result
    1.6 06/04/24 12:12:04 andrey@lmy004. +2 -2
    update result

ChangeSet
  1.1810.1457.96 06/04/24 10:39:56 msvensson@neptunus.(none) +2 -0
  Cleanup formatting

  mysql-test/mysql-test-run.pl
    1.30.25.4 06/04/24 10:39:52 msvensson@neptunus.(none) +44 -38
    Cleanup formatting

  BitKeeper/etc/ignore
    1.210.1.9 06/04/24 10:39:52 msvensson@neptunus.(none) +3 -0
    Added extra/yassl/taocrypt/benchmark/benchmark extra/yassl/taocrypt/test/test extra/yassl/testsuite/testsuite to the ignore list

ChangeSet
  1.1810.1457.95 06/04/24 10:33:24 msvensson@neptunus.(none) +1 -0
  Remove the old unused code for setting a PATH

  mysql-test/mysql-test-run.pl
    1.30.25.3 06/04/24 10:33:20 msvensson@neptunus.(none) +0 -5
    Remove the old unused code for setting a PATH

ChangeSet
  1.1810.1457.94 06/04/24 10:27:13 msvensson@neptunus.(none) +2 -0
  Move copy_dir to mtr_misc and rename it to mtr_copy_dir

  mysql-test/mysql-test-run.pl
    1.30.25.2 06/04/24 10:27:09 msvensson@neptunus.(none) +2 -22
    Move copy_dir to mtr_misc and rename it to mtr_copy_dir

  mysql-test/lib/mtr_misc.pl
    1.10 06/04/24 10:27:09 msvensson@neptunus.(none) +17 -8
    Move copy_dir to mtr_misc and rename it to mtr_copy_dir

ChangeSet
  1.1810.1457.93 06/04/24 10:22:26 msvensson@neptunus.(none) +1 -0
  Remove 5 second sleep for win32

  mysql-test/lib/mtr_process.pl
    1.25.2.2 06/04/24 10:22:22 msvensson@neptunus.(none) +0 -2
    Remove 5 second sleep for win32

ChangeSet
  1.1810.1457.92 06/04/24 10:21:09 msvensson@neptunus.(none) +5 -0
  Bug#17002  mysql-test-run as root user
   - Add test to see if tests are running with root permissions
   - Disables tests that uses chmod if that is the case

  mysql-test/r/not_as_root.require
    1.1 06/04/24 10:21:05 msvensson@neptunus.(none) +2 -0
    New BitKeeper file ``mysql-test/r/not_as_root.require''

  mysql-test/r/not_as_root.require
    1.0 06/04/24 10:21:05 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-5.0-maint/mysql-test/r/not_as_root.require

  mysql-test/include/not_as_root.inc
    1.1 06/04/24 10:21:04 msvensson@neptunus.(none) +4 -0
    New BitKeeper file ``mysql-test/include/not_as_root.inc''

  mysql-test/t/rpl_rotate_logs.test
    1.63.1.2 06/04/24 10:21:04 msvensson@neptunus.(none) +3 -0
    Disable test if running as root.

  mysql-test/t/information_schema.test
    1.65.1.8 06/04/24 10:21:04 msvensson@neptunus.(none) +3 -0
    Disable test if running as root 

  mysql-test/mysql-test-run.pl
    1.30.25.1 06/04/24 10:21:04 msvensson@neptunus.(none) +29 -0
    Add test to check if mysql-test-run is run with root permission. 
    Set environment variable MYSQL_TEST_ROOT to 'YES' or 'NO'.

  mysql-test/include/not_as_root.inc
    1.0 06/04/24 10:21:04 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-5.0-maint/mysql-test/include/not_as_root.inc

ChangeSet
  1.1616.2552.1 06/04/24 13:07:53 holyfoot@vva.(none) +1 -0
  bug #16892 (mysql_client_test fails in embedded server)

  mysql-test/t/mysql_client_test.test
    1.14.2.1 06/04/24 13:07:14 holyfoot@mysql.com +3 -0
    test disabled in embedded server

ChangeSet
  1.2119.455.6 06/04/24 09:02:46 jonas@perch.ndb.mysql.com +5 -0
  ndb - bug#18780
    Fix various abort cases (mainly MM but also 1 DD)
      that has been found running dbt2

  storage/ndb/test/run-test/daily-basic-tests.txt
    1.43 06/04/24 09:02:43 jonas@perch.ndb.mysql.com +7 -3
    Add autotest of various abort cases

  storage/ndb/test/ndbapi/testBasic.cpp
    1.12 06/04/24 09:02:43 jonas@perch.ndb.mysql.com +45 -0
    Add new testcases for various abort cases

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
    1.33 06/04/24 09:02:43 jonas@perch.ndb.mysql.com +4 -5
    Fix abort case

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
    1.16 06/04/24 09:02:43 jonas@perch.ndb.mysql.com +3 -8
    Set page dirty even if in cache

  storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
    1.9 06/04/24 09:02:43 jonas@perch.ndb.mysql.com +12 -2
    Fix abort case

ChangeSet
  1.1616.2551.1 06/04/23 19:26:56 paul@polar.kitebird.com +1 -0
  myisam_ftdump.c:
    myisam_ftdump options: --help first, then rest in
    lexical order.

  myisam/myisam_ftdump.c
    1.36.2.1 06/04/23 19:25:28 paul@polar.kitebird.com +7 -7
    myisam_ftdump options: --help first, then rest in
    lexical order.

ChangeSet
  1.1810.1595.1 06/04/23 19:59:43 aelkin@mysql.com +3 -0
  Bug#17263 temporary tables and replication
  The fix refines the algorithm of generating DROPs for binlog. 
  Temp tables with common pseudo_thread_id are clustered into one query. 
  Consequently one replication event per pseudo_thread_id is generated.

  sql/sql_base.cc
    1.235.54.1 06/04/23 19:59:26 aelkin@mysql.com +122 -38
    close_temporary_tables is rewritten to generate sequence of DROP temprorary tables with common preudo_thread_id stored in temp table definition.

  mysql-test/t/rpl_temporary.test
    1.15.2.1 06/04/23 19:59:22 aelkin@mysql.com +29 -1
    Creating temp tables associated with a set of pseudo_thread_id values within a connection.
    The aim is to see that slave digest master's binlog consisting of DROP temprorary tables.

  mysql-test/r/rpl_temporary.result
    1.18.2.1 06/04/23 19:59:19 aelkin@mysql.com +14 -0
    results

ChangeSet
  1.1616.2538.12 06/04/23 19:42:26 aelkin@mysql.com +1 -0
  Bug#17263: incorrect DROP query in temporary tables replication
  accounting non-ai32 in tmpkeyval. This changeset is supposed to be specifically for 4.1.
  Another changeset is going to push into 5. 

  sql/sql_base.cc
    1.145.1.122 06/04/23 19:42:21 aelkin@mysql.com +3 -4
    correction due to uint4korr definition: can not sizeof on not ia32.

ChangeSet
  1.2119.462.9 06/04/23 18:15:41 knielsen@mysql.com +1 -0
  Fix cmakelists.txt removed by innodb snapshot.

  storage/innobase/Makefile.am
    1.10.1.2 06/04/23 18:15:30 knielsen@mysql.com +2 -1
    Fix cmakelists.txt removed by innodb snapshot.

ChangeSet
  1.2119.467.2 06/04/23 16:05:11 aivanov@mysql.com +1 -0
  Corrected merge mistake.

  mysql-test/t/innodb.test
    1.140 06/04/23 16:05:05 aivanov@mysql.com +1 -12
    Corrected merge mistake.

ChangeSet
  1.1810.1584.10 06/04/23 12:10:56 aelkin@mysql.com +2 -0
  manual merge use local

ChangeSet
  1.1616.2538.11 06/04/23 11:55:08 aelkin@mysql.com +3 -0
  Bug#17263 temporary tables and replication
    Backporting a changeset made for 5.0. Comments from there:
  
    The fix refines the algorithm of generating DROPs for binlog.
    Temp tables with common pseudo_thread_id are clustered into one query.
    Consequently one replication event per pseudo_thread_id is generated.
  
  

  sql/sql_base.cc
    1.235.53.1 06/04/23 12:10:52 aelkin@mysql.com +15 -121
    manual merge use local

  mysql-test/t/rpl_temporary.test
    1.15.1.2 06/04/23 12:10:52 aelkin@mysql.com +1 -27
    manual merge use local

  sql/sql_base.cc
    1.145.1.121 06/04/23 11:55:04 aelkin@mysql.com +121 -40
    change in drop temprorary tables alg in close_temporary_tables.
    
    

  mysql-test/t/rpl_temporary.test
    1.13.1.2 06/04/23 11:55:04 aelkin@mysql.com +27 -1
    test to generate problematic drop in binlog to feed it to restarting slave
    to see no stop.

  mysql-test/r/rpl_temporary.result
    1.3.1.10 06/04/23 11:55:04 aelkin@mysql.com +14 -0
    results changed

ChangeSet
  1.2119.453.2 06/04/23 12:48:31 aivanov@mysql.com +75 -0
  Applied innodb-5.1-ss475 snapshot.
  * Fix BUG#15650: "DELETE with LEFT JOIN crashes server with innodb_locks_unsafe_for binlog"
  * Fix BUG#17134: "Partitions: uncommitted changes are visible"
  * Fix BUG#17992: "Partitions: InnoDB, somehow rotten table after UPDATE"
    row0ins.c: MySQL's partitioned table code does not set preduilt->sql_stat_start right
    if it does an insert in the same statement after doing a search first in the same
    partition table. We now write trx id always to the buffer, not just when flag
    sql_stat_start is on. This will waste CPU time very sightly.
  * Fix BUG#18077: "InnoDB uses full explicit table locks in stored FUNCTION"
  * Fix BUG#18238: "When locks exhaust the buffer pool, InnoDB does not roll back the trx"
  * Fix BUG#18252" "Disk space leak in updates of InnoDB BLOB rows in 5.0 and 5.1"
  * Fix BUG#18283: "When InnoDB returns error 'lock table full', MySQL can write to binlog too much"
  * Fix BUG#18350: "Use consistent read in CREATE ... SELECT ... if innodb_locks_unsafe_for_binlog"
  * Fix BUG#18384: "InnoDB memory leak on duplicate key errors in 5.0 if row has many columns"
  * Fix BUG#18934: "InnoDB crashes when table uses column names like DB_ROW_ID"
    Refuse tables that use reserved column names.
  * InnoDB's SQL parser:
    - Add support for UNSIGNED types, EXIT keyword, quoted identifiers, user-function callbacks
      for processing results of FETCH statements, bound literals, DATA_VARCHAR for bound literals.
    - Allow bound literals of type non-INTEGER to be of length 0.
    - Add make_flex.sh and update lexer/parser generation documentation.
    - Add comment clarifying the difference between 'alias' and 'indirection' fields in sym_node_t.
    - Remove never reached duplicate code in pars_set_dfield_type().
    - Rewrite pars_info datatypes and APIs, add a few helper functions.
    - Since the functions definitions in pars_info_t are accessed after pars_sql() returns
      in the query graph execution stage, we can't free pars_info_t in pars_sql(). Instead,
      make pars_sql() transfer ownership of pars_info_t to the created query graph, and
      make que_graph_free() free it if needed.
    - Allow access to system columns like DB_ROW_ID.
  * Use bound literals in row_truncate_table_for_mysql, row_drop_table_for_mysql,
    row_discard_tablespace_for_mysql, and row_rename_table_for_mysql.
  * Setting an isolation level of the transaction to read committed weakens the locks for
    this session similarly like the option innodb_locks_unsafe_for binlog. This patch removes
    alnost all gap locking (used in next-key locking) and makes MySQL to release the row locks
    on the rows which does not belong to result set. Additionally, nonlocking selects on
    INSERT INTO SELECT, UPDATE ... (SELECT ...), and CREATE ... SELECT ... use a nonlocking
    consistent read. If a binlog is used, then binlog format should be set to row based
    binloging to make the execution of the complex SQL statements.
  * Disable the statistic variables btr_search_n_hash_fail and n_hash_succ, n_hash_fail,
    n_patt_succ, and n_searches of btr_search_t in builds without #ifdef UNIV_SEARCH_PERF_STAT.
  * Make innodb.test faster. Group all consistent read test cases to a one test case and
    wait their lock timeout after all have been send to the server. Decrease amount of rows
    inserted in a certain test - this has no effect on the effectiveness of the test and
    reduces the running time by ~10 sec. Remove temporary work-arounds from innodb.result
    now that ALTER TABLE DROP FOREIGN KEY works once again.
  * Make innodb_unsafe_binlog.test faster. Grout all consistent read test cases to a one
    test case amd wait their lock timeout after all have been sent to the server. Remove
    unnecessary option --loose_innodb_lock_wait_timeout.
  * Print dictionary memory size in SHOW INNODB STATUS.
  * Fix memory leaks in row_create_table_for_mysql() in rare corner cases.
  * Remove code related to clustered tables. They were never implemented, and the
    implementation would be challenging with ROW_FORMAT=COMPACT. Remove the table types
    DICT_TABLE_CLUSTER_MEMBER and DICT_TABLE_CLUSTER and all related tests and functions.
    dict_table_t: Remove mix_id, mix_len, mix_id_len, mix_id_buf, and cluster_name.
    plan_t: Remove mixed_index.
    dict_create_sys_tables_tuple(): Set MIX_ID=0, MIX_LEN=0, CLUSTER_NAME=NULL when
    inserting into SYS_TABLES.
    dict_tree_check_search_tuple(): Enclose in #ifdef UNIV_DEBUG.
  * Move calling of thr_local_free() from trx_free_for_mysql() to
    innobase_close_connection().

  storage/innobase/ut/ut0vec.c
    1.1 06/04/23 12:48:25 aivanov@mysql.com +54 -0
    Applied innodb-5.1-ss475 snapshot.
    

  storage/innobase/ut/ut0vec.c
    1.0 06/04/23 12:48:25 aivanov@mysql.com +0 -0
    BitKeeper file /home/alexi/innodb/mysql-5.1/storage/innobase/ut/ut0vec.c

  storage/innobase/pars/make_flex.sh
    1.1 06/04/23 12:48:24 aivanov@mysql.com +20 -0
    Applied innodb-5.1-ss475 snapshot.
    

  storage/innobase/include/ut0vec.ic
    1.1 06/04/23 12:48:24 aivanov@mysql.com +26 -0
    Applied innodb-5.1-ss475 snapshot.
    

  storage/innobase/pars/make_flex.sh
    1.0 06/04/23 12:48:24 aivanov@mysql.com +0 -0
    BitKeeper file /home/alexi/innodb/mysql-5.1/storage/innobase/pars/make_flex.sh

  storage/innobase/include/ut0vec.ic
    1.0 06/04/23 12:48:24 aivanov@mysql.com +0 -0
    BitKeeper file /home/alexi/innodb/mysql-5.1/storage/innobase/include/ut0vec.ic

  storage/innobase/include/ut0vec.h
    1.1 06/04/23 12:48:23 aivanov@mysql.com +73 -0
    Applied innodb-5.1-ss475 snapshot.
    

  storage/innobase/ut/ut0mem.c
    1.31 06/04/23 12:48:23 aivanov@mysql.com +93 -0
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/ut/Makefile.am
    1.4 06/04/23 12:48:23 aivanov@mysql.com +1 -1
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/trx/trx0trx.c
    1.64 06/04/23 12:48:23 aivanov@mysql.com +3 -2
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/sync/sync0sync.c
    1.39 06/04/23 12:48:23 aivanov@mysql.com +6 -6
    Applied innodb-5.1-ss475 snapshot.
     Add (void*) cast when using the %p printf format specifier.

  storage/innobase/sync/sync0rw.c
    1.22 06/04/23 12:48:23 aivanov@mysql.com +9 -8
    Applied innodb-5.1-ss475 snapshot.
     Add (void*) cast when using the %p printf format specifier.

  storage/innobase/sync/sync0arr.c
    1.23 06/04/23 12:48:23 aivanov@mysql.com +5 -5
    Applied innodb-5.1-ss475 snapshot.
     Add (void*) cast when using the %p printf format specifier.

  storage/innobase/srv/srv0srv.c
    1.98 06/04/23 12:48:23 aivanov@mysql.com +2 -0
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/row/row0upd.c
    1.42 06/04/23 12:48:23 aivanov@mysql.com +17 -1
    Applied innodb-5.1-ss475 snapshot.
     row_upd_index_replace_new_col_vals_index_pos(): Add a parameter
     order_only for limiting the replacement to the ordering fields
     of the index.

  storage/innobase/row/row0sel.c
    1.103 06/04/23 12:48:23 aivanov@mysql.com +159 -56
    Applied innodb-5.1-ss475 snapshot.
     Remove UNIV_RELEASE_NOT_YET_STABLE and related checks.
     row_sel_field_store_in_mysql_format(): Turn the assertions on
     mbminlen, mbmaxlen, and templ->type into debug assertions.
     fetch_step(): Print a more usefull error message when the cursor is closed.

  storage/innobase/row/row0mysql.c
    1.124 06/04/23 12:48:23 aivanov@mysql.com +300 -401
    Applied innodb-5.1-ss475 snapshot.
     row_mysql_is_system_table(): Use strncmp, not memcmp, since we
     don't know how long the input string is.

  storage/innobase/row/row0ins.c
    1.79 06/04/23 12:48:23 aivanov@mysql.com +35 -23
    Applied innodb-5.1-ss475 snapshot.
     Remove a memory leak when trying to insert a duplicate record to a
     clustered inedx comprising more than about 90 columns (Bug#18384).
     row_ins_duplicate_error_in_clust(): Call mem_heap_free(heap) at
     func_exit if needed.

  storage/innobase/que/que0que.c
    1.24 06/04/23 12:48:23 aivanov@mysql.com +124 -2
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/pars/pars0sym.c
    1.7 06/04/23 12:48:23 aivanov@mysql.com +70 -1
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/pars/pars0pars.c
    1.17 06/04/23 12:48:23 aivanov@mysql.com +301 -37
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/pars/pars0opt.c
    1.14 06/04/23 12:48:23 aivanov@mysql.com +2 -48
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/include/ut0vec.h
    1.0 06/04/23 12:48:23 aivanov@mysql.com +0 -0
    BitKeeper file /home/alexi/innodb/mysql-5.1/storage/innobase/include/ut0vec.h

  storage/innobase/pars/pars0lex.l
    1.12 06/04/23 12:48:22 aivanov@mysql.com +67 -20
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/pars/pars0grm.y
    1.10 06/04/23 12:48:22 aivanov@mysql.com +48 -13
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/pars/pars0grm.h
    1.5 06/04/23 12:48:22 aivanov@mysql.com +176 -166
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/pars/pars0grm.c
    1.12 06/04/23 12:48:22 aivanov@mysql.com +926 -858
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/pars/make_bison.sh
    1.2 06/04/23 12:48:22 aivanov@mysql.com +1 -2
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/pars/lexyy.c
    1.20 06/04/23 12:48:22 aivanov@mysql.com +588 -495
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/os/os0sync.c
    1.30 06/04/23 12:48:22 aivanov@mysql.com +1 -1
    Applied innodb-5.1-ss475 snapshot.
     Add (void*) cast when using the %p printf format specifier.

  storage/innobase/mem/mem0mem.c
    1.14 06/04/23 12:48:22 aivanov@mysql.com +25 -0
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/mem/mem0dbg.c
    1.20 06/04/23 12:48:22 aivanov@mysql.com +1 -1
    Applied innodb-5.1-ss475 snapshot.
     Add (void*) cast when using the %p printf format specifier.

  storage/innobase/log/log0recv.c
    1.53 06/04/23 12:48:22 aivanov@mysql.com +3 -3
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/lock/lock0lock.c
    1.67 06/04/23 12:48:22 aivanov@mysql.com +53 -7
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/include/ut0mem.h
    1.21 06/04/23 12:48:22 aivanov@mysql.com +24 -0
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/include/univ.i
    1.51 06/04/23 12:48:22 aivanov@mysql.com +11 -8
    Applied innodb-5.1-ss475 snapshot.
     Remove UNIV_RELEASE_NOT_YET_STABLE and related checks.
     When using GCC, use __inline__ instead of inline.

  storage/innobase/include/trx0trx.h
    1.53 06/04/23 12:48:22 aivanov@mysql.com +3 -1
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/include/row0upd.h
    1.16 06/04/23 12:48:22 aivanov@mysql.com +4 -0
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/include/row0sel.h
    1.10 06/04/23 12:48:22 aivanov@mysql.com +34 -2
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/include/row0mysql.h
    1.48 06/04/23 12:48:22 aivanov@mysql.com +2 -1
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/include/que0que.h
    1.15 06/04/23 12:48:21 aivanov@mysql.com +19 -1
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/include/pars0types.h
    1.5 06/04/23 12:48:21 aivanov@mysql.com +4 -0
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/include/pars0sym.h
    1.7 06/04/23 12:48:21 aivanov@mysql.com +25 -0
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/include/pars0pars.h
    1.10 06/04/23 12:48:21 aivanov@mysql.com +171 -2
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/include/pars0grm.h
    1.5 06/04/23 12:48:21 aivanov@mysql.com +176 -166
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/include/page0page.ic
    1.17 06/04/23 12:48:21 aivanov@mysql.com +0 -13
    Applied innodb-5.1-ss475 snapshot.
     Remove UNIV_RELEASE_NOT_YET_STABLE and related checks.

  storage/innobase/include/mem0mem.h
    1.16 06/04/23 12:48:21 aivanov@mysql.com +11 -0
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/include/lock0lock.h
    1.28 06/04/23 12:48:21 aivanov@mysql.com +9 -0
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/include/hash0hash.h
    1.9 06/04/23 12:48:21 aivanov@mysql.com +26 -0
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/include/eval0proc.h
    1.4 06/04/23 12:48:21 aivanov@mysql.com +8 -0
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/include/dict0mem.h
    1.29 06/04/23 12:48:21 aivanov@mysql.com +11 -44
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/include/dict0dict.ic
    1.14 06/04/23 12:48:21 aivanov@mysql.com +0 -2
    Applied innodb-5.1-ss475 snapshot.
     Remove too strict assertions from some dict_table_t
     accessor functions.

  storage/innobase/include/dict0dict.h
    1.44 06/04/23 12:48:21 aivanov@mysql.com +23 -32
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/include/buf0lru.h
    1.12 06/04/23 12:48:21 aivanov@mysql.com +2 -2
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/include/btr0sea.h
    1.11 06/04/23 12:48:21 aivanov@mysql.com +3 -1
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/include/btr0cur.ic
    1.6 06/04/23 12:48:21 aivanov@mysql.com +2 -4
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/include/btr0cur.h
    1.19 06/04/23 12:48:21 aivanov@mysql.com +4 -1
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/ibuf/ibuf0ibuf.c
    1.42 06/04/23 12:48:21 aivanov@mysql.com +3 -3
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/eval/eval0proc.c
    1.5 06/04/23 12:48:21 aivanov@mysql.com +32 -0
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/dict/dict0mem.c
    1.21 06/04/23 12:48:20 aivanov@mysql.com +13 -37
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/dict/dict0load.c
    1.47 06/04/23 12:48:20 aivanov@mysql.com +8 -30
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/dict/dict0dict.c
    1.80 06/04/23 12:48:20 aivanov@mysql.com +75 -199
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/dict/dict0crea.c
    1.36 06/04/23 12:48:20 aivanov@mysql.com +174 -196
    Applied innodb-5.1-ss475 snapshot.
     Use bound literals in all SQL statements instead of elaborately
     constructing correctly allocated and quoted strings to pass the
     data in ASCII form.

  storage/innobase/data/data0type.c
    1.24 06/04/23 12:48:20 aivanov@mysql.com +42 -7
    Applied innodb-5.1-ss475 snapshot.
     dtype_print(): Recognize DATA_FIXBINARY and DATA_BLOB types.
     Print known flags from prtype. Use a switch statement instead
     of else-if chain.

  storage/innobase/configure.in
    1.34 06/04/23 12:48:20 aivanov@mysql.com +19 -0
    Applied innodb-5.1-ss475 snapshot.
     Add disabled-by-default logic to switch GCC to a strict C89-mode.
     Add -Werror-implicit-function_declaration to CFLAGS when using gcc.

  storage/innobase/cmakelists.txt
    1.4 06/04/23 12:48:20 aivanov@mysql.com +1 -1
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/buf/buf0lru.c
    1.29 06/04/23 12:48:20 aivanov@mysql.com +10 -10
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/btr/btr0sea.c
    1.44 06/04/23 12:48:20 aivanov@mysql.com +18 -12
    Applied innodb-5.1-ss475 snapshot.
     Fix compilation problem with non-C99 compilers.

  storage/innobase/btr/btr0pcur.c
    1.20 06/04/23 12:48:20 aivanov@mysql.com +1 -4
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/btr/btr0cur.c
    1.51 06/04/23 12:48:20 aivanov@mysql.com +12 -11
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/btr/btr0btr.c
    1.43 06/04/23 12:48:20 aivanov@mysql.com +13 -16
    Applied innodb-5.1-ss475 snapshot.

  storage/innobase/Makefile.am
    1.10.1.1 06/04/23 12:48:20 aivanov@mysql.com +1 -2
    Applied innodb-5.1-ss475 snapshot.

  sql/ha_innodb.cc
    1.268.2.1 06/04/23 12:48:20 aivanov@mysql.com +77 -48
    Applied innodb-5.1-ss475 snapshot.
     Do not use inlined functions in ha_innodb.cc.
     Remove assertion ut_error which crashes the mysqld server
     if it prints a warning about the adaptive latch.

  mysql-test/t/innodb_unsafe_binlog.test
    1.2 06/04/23 12:48:20 aivanov@mysql.com +196 -3
    Applied innodb-5.1-ss475 snapshot.

  mysql-test/t/innodb_unsafe_binlog-master.opt
    1.2 06/04/23 12:48:20 aivanov@mysql.com +1 -1
    Applied innodb-5.1-ss475 snapshot.

  mysql-test/t/innodb.test
    1.135.1.4 06/04/23 12:48:20 aivanov@mysql.com +257 -21
    Applied innodb-5.1-ss475 snapshot.

  mysql-test/t/innodb-master.opt
    1.3 06/04/23 12:48:20 aivanov@mysql.com +1 -1
    Applied innodb-5.1-ss475 snapshot.

  mysql-test/r/innodb_unsafe_binlog.result
    1.2 06/04/23 12:48:20 aivanov@mysql.com +86 -1
    Applied innodb-5.1-ss475 snapshot.

  mysql-test/r/innodb.result
    1.168.1.4 06/04/23 12:48:19 aivanov@mysql.com +132 -26
    Applied innodb-5.1-ss475 snapshot.

ChangeSet
  1.2119.466.2 06/04/23 04:09:56 konstantin@mysql.com +1 -0
  A post-merge fix.

  sql/mysqld.cc
    1.534.1.13 06/04/23 04:09:47 konstantin@mysql.com +2 -1
    A post-merge fix.

ChangeSet
  1.1810.1594.1 06/04/22 21:53:33 msvensson@shellback.(none) +1 -0
  Fix for building shared libraries on AIX with 64-bit mode
  Set building of shared libraries on QNX to defatul OFF

  configure.in
    1.245.1.138 06/04/22 21:53:28 msvensson@shellback.(none) +47 -0
    -Libtool forgets to pass the -q64 and -X64 flags to "nm" and "xlc_r" when building
    for 64-bit on AIX. Add some hacks before we create libtool that fixes this.
    This test should be integrated into autoconf/libtool
    
    -Set default to not build shared librarues on QNX. When building libmysqlclient and libmysqlclient_r
    so many objects are passed to libtool that sh propably runs out of stack  and segfaults.

ChangeSet
  1.2119.462.6 06/04/22 13:29:05 Magnus@hugo. +1 -0
  Fix windows compile problem

  sql/sql_table.cc
    1.324 06/04/22 13:28:54 Magnus@hugo. +2 -2
    Fix windows compile problem

ChangeSet
  1.2119.462.5 06/04/22 01:12:02 elliot@mysql.com +1 -0
  Post merge fix.

ChangeSet
  1.2119.465.1 06/04/22 04:38:19 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  Fixed merge issue

  sql/sql_table.cc
    1.323 06/04/22 04:38:15 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Fixed merge issue

  sql/sql_partition.cc
    1.67 06/04/22 04:38:14 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -0
    Added some debug printouts

ChangeSet
  1.1810.1592.1 06/04/22 11:54:25 dlenev@mysql.com +5 -0
  Fix for bug#15153 "CONVERT_TZ() is not allowed in all places in VIEWs".
  
  Error was emitted when one tried to select information from view which used
  merge algorithm and which also had CONVERT_TZ() function in its select list.
  
  This bug was caused by wrong assumption that global table list for view
  which is handled using merge algorithm begins from tables belonging to
  the main select of this view. Nowadays the above assumption is not true only
  when one uses convert_tz() function in view's select list, but in future
  other cases may be added (for example we may support merging of views
  with subqueries in select list one day). Relying on this false assumption
  led to the usage of wrong table list for field lookups and therefor errors. 
  
  With this fix we explicitly use pointer to the beginning of main select's
  table list.

  sql/sql_view.cc
    1.78.1.8 06/04/22 11:54:21 dlenev@mysql.com +12 -4
    mysql_make_view():
      We should not assume that global table list for view which is handled using
      merge algorithm begins from tables belonging to the main select of this
      view. Nowadays the above assumption is not true only when one uses
      convert_tz() function in view's select list, but in future other cases
      may be added (for example we may support merging of views with subqueries
      in select list one day). So let us instead explicitly use pointer to the
      beginning of main select's table list.

  mysql-test/t/view.test
    1.126.1.16 06/04/22 11:54:21 dlenev@mysql.com +27 -0
    Added test case for bug#15153 "CONVERT_TZ() is not allowed in all places in 
    VIEWs".

  mysql-test/t/timezone_grant.test
    1.5 06/04/22 11:54:21 dlenev@mysql.com +31 -0
    Added additional test case for bug#15153 "CONVERT_TZ() is not allowed in
    all places in VIEWs" that checks that usage of CONVERT_TZ() function in view
    does not require additional privileges.

  mysql-test/r/view.result
    1.138.1.15 06/04/22 11:54:21 dlenev@mysql.com +26 -0
    Added test case for bug#15153 "CONVERT_TZ() is not allowed in all places in 
    VIEWs".

  mysql-test/r/timezone_grant.result
    1.3.1.1 06/04/22 11:54:21 dlenev@mysql.com +17 -0
    Added additional test case for bug#15153 "CONVERT_TZ() is not allowed in
    all places in VIEWs" that checks that usage of CONVERT_TZ() function in view
    does not require additional privileges.

  mysql-test/t/rpl_view-slave.opt
    1.1.1.1 06/04/22 01:11:57 elliot@mysql.com +0 -4
    Post-merge fix

ChangeSet
  1.2119.464.2 06/04/21 19:29:22 jimw@mysql.com +2 -0
  Bug #18495: mysqltest does not use the correct error number
  
    When looking up the error number for named errors in mysqltest .test
    files, we inadvertantly would match ER_WRONG_VALUE against
    ER_WRONG_VALUE_COUNT because we were using the length of the shorter
    string in strncmp(). Now we double-check the length of matches to
    make sure it was a complete match.

  mysql-test/t/events.test
    1.28 06/04/21 19:29:18 jimw@mysql.com +2 -2
    Replace error numbers with error names, with side-effect of testing
    Bug #18495.

  client/mysqltest.c
    1.206 06/04/21 19:29:18 jimw@mysql.com +7 -1
    Check the length of the error name to make sure it wasn't just a
    partial match

ChangeSet
  1.1810.1591.1 06/04/21 18:26:39 jimw@mysql.com +1 -0
  Bug #18607: LOAD DATA FROM MASTER fails because of INFORMATION_SCHEMA database
  
    Simply exclude INFORMATION_SCHEMA from LOAD DATA FROM MASTER just like
    we exclude the `mysql` database.
  
    There's no test for this, because it requires an unfiltered 'LOAD DATA
    FROM MASTER' which is too likely to cause chaos (such as when running
    the test suite against an external server).

  sql/repl_failsafe.cc
    1.53.1.8 06/04/21 18:26:36 jimw@mysql.com +2 -1
    Exclude information_schema from LOAD DATA FROM MASTER.

ChangeSet
  1.1810.1457.90 06/04/22 00:48:13 msvensson@neptunus.(none) +5 -0
  Backport fix for mysql client not using SSl library directly
   - Add function mysql_get_ssl_cipher
   - Use function mysql_get_ssl_cipher from mysql

  sql-common/client.c
    1.83.2.5 06/04/22 00:48:09 msvensson@neptunus.(none) +21 -0
    Backport fix for mysql client not using SSl library directly

  libmysqld/libmysqld.def
    1.14.1.1 06/04/22 00:48:09 msvensson@neptunus.(none) +1 -0
    Backport fix for mysql client not using SSl library directly

  libmysql/libmysql.def
    1.43.1.1 06/04/22 00:48:08 msvensson@neptunus.(none) +1 -0
    Backport fix for mysql client not using SSl library directly

  include/mysql.h
    1.154.2.1 06/04/22 00:48:08 msvensson@neptunus.(none) +1 -0
    Backport fix for mysql client not using SSl library directly

  client/mysql.cc
    1.199.3.1 06/04/22 00:48:08 msvensson@neptunus.(none) +2 -3
    Backport fix for mysql client not using SSl library directly

ChangeSet
  1.1810.1584.5 06/04/21 20:24:52 kent@mysql.com +1 -0
  innodb_unsafe_binlog-master.opt:
    Make InnoDB option "loose", as the server might be
    started with this option just to find out the test
    is to be skipped in the configuration (bug#17359)

  mysql-test/t/innodb_unsafe_binlog-master.opt
    1.1.1.1 06/04/21 20:22:01 kent@mysql.com +1 -1
    Make InnoDB option "loose", as the server might be
    started with this option just to find out the test
    is to be skipped in the configuration (bug#17359)

ChangeSet
  1.2119.461.2 06/04/21 14:21:17 elliot@mysql.com +5 -0
  After merge fixes.

  sql/sql_class.h
    1.283.1.13 06/04/21 14:21:11 elliot@mysql.com +0 -5
    After merge fixes.

  sql/set_var.cc
    1.164.3.9 06/04/21 14:21:11 elliot@mysql.com +0 -13
    After merge fixes.

  sql/mysqld.cc
    1.534.10.5 06/04/21 14:21:11 elliot@mysql.com +0 -17
    After merge fixes.

  sql/ha_innodb.h
    1.120 06/04/21 14:21:11 elliot@mysql.com +0 -3
    After merge fixes.

  sql/ha_innodb.cc
    1.268.1.2 06/04/21 14:21:11 elliot@mysql.com +0 -130
    After merge fixes.

ChangeSet
  1.1810.1457.89 06/04/21 19:53:30 msvensson@neptunus.(none) +1 -0
  Remove -Wall  etc, not so portable compiler options

  extra/yassl/testsuite/Makefile.am
    1.2 06/04/21 19:53:26 msvensson@neptunus.(none) +3 -3
    Remove -Wall  etc, not so portable compiler options

ChangeSet
  1.1810.1585.4 06/04/21 10:48:53 jimw@mysql.com +1 -0
  Bug #18312: mysqltest: --sleep=0 doesn't disable sleep
  
    Allow --sleep=0 to be specified to mysqltest, so that sleep calls
    can be disabled.
  
    Original patch from Paul DuBois.

  client/mysqltest.c
    1.155.19.1 06/04/21 10:48:49 jimw@mysql.com +5 -4
    Handle --sleep=0 being specified.

ChangeSet
  1.1810.1590.1 06/04/21 09:48:49 jimw@mysql.com +2 -0
  Bug #19083 ./mysql-test-run.pl starts NDB when it is not needed
  
    Now NDB is only initialized and started when the tests that are
    being run will make use of it. The same thing is also done for the
    slave databases and the instance manager.
  
    After review from Magnus: Only take a snapshot of the data directories
    that are in use.

  mysql-test/ndb/ndbcluster.sh
    1.41.2.1 06/04/21 09:48:45 jimw@mysql.com +2 -2
    Fix text message that has always annoyed me

  mysql-test/mysql-test-run.pl
    1.30.24.1 06/04/21 09:48:45 jimw@mysql.com +69 -38
    Only initialize (and start) NDB, the instance manager, and the slaves
    when we have tests that require them. Also, only snapshot the data
    directories that we are going to use.

ChangeSet
  1.2119.460.2 06/04/21 09:11:39 jimw@mysql.com +15 -0
  Delete some more NDB cruft.

ChangeSet
  1.2119.459.5 06/04/21 18:28:00 tomas@poseidon.ndb.mysql.com +1 -0
  ndb: minor modification in replication timer code
  added missing setting of latest applied epoch

  sql/ha_ndbcluster_binlog.cc
    1.47 06/04/21 18:27:53 tomas@poseidon.ndb.mysql.com +9 -7
    ndb: minor modification in replication timer code
    added missing setting of latest applied epoch

ChangeSet
  1.1810.1457.88 06/04/21 18:19:50 msvensson@neptunus.(none) +2 -0
  Move telpate instantiations of taocrypt objects to taocrypt/template_instnt.cpp

  extra/yassl/taocrypt/src/template_instnt.cpp
    1.6.1.3 06/04/21 18:19:46 msvensson@neptunus.(none) +3 -0
    Move telpate instantiations of taocrypt objects to taocrypt/template_instnt.cpp

  extra/yassl/src/template_instnt.cpp
    1.4.1.2 06/04/21 18:19:46 msvensson@neptunus.(none) +0 -7
    Move telpate instantiations of taocrypt objects to taocrypt/template_instnt.cpp

  BitKeeper/deleted/.del-uniq_blocks.awk~c98f28fca67bec81
    1.3 06/04/21 09:09:51 jimw@mysql.com +0 -0
    Delete: storage/ndb/home/bin/signallog2html.lib/uniq_blocks.awk

  BitKeeper/deleted/.del-stripcr~87d0d3d45e5dcf97
    1.3 06/04/21 09:09:51 jimw@mysql.com +0 -0
    Delete: storage/ndb/home/bin/stripcr

  BitKeeper/deleted/.del-signallog2list.awk~9e3c7272618f8a3e
    1.3 06/04/21 09:09:51 jimw@mysql.com +0 -0
    Delete: storage/ndb/home/bin/signallog2html.lib/signallog2list.awk

  BitKeeper/deleted/.del-signallog2html.sh~11f078f3616cece4
    1.3 06/04/21 09:09:51 jimw@mysql.com +0 -0
    Delete: storage/ndb/home/bin/signallog2html.sh

  BitKeeper/deleted/.del-setup-test.sh~57acbf006ee61516
    1.3 06/04/21 09:09:51 jimw@mysql.com +0 -0
    Delete: storage/ndb/home/bin/setup-test.sh

  BitKeeper/deleted/.del-parseConfigFile.awk~17f70292f412959a
    1.3 06/04/21 09:09:51 jimw@mysql.com +0 -0
    Delete: storage/ndb/home/bin/parseConfigFile.awk

  BitKeeper/deleted/.del-ngcalc~9f8fb4a518060935
    1.3 06/04/21 09:09:51 jimw@mysql.com +0 -0
    Delete: storage/ndb/home/bin/ngcalc

  BitKeeper/deleted/.del-ndbdoxy.pl~cc153c886e5d1085
    1.3 06/04/21 09:09:51 jimw@mysql.com +0 -0
    Delete: storage/ndb/home/bin/ndbdoxy.pl

  BitKeeper/deleted/.del-funcs.sh~19e11fb1f65b19e1
    1.3 06/04/21 09:09:51 jimw@mysql.com +0 -0
    Delete: storage/ndb/home/lib/funcs.sh

  BitKeeper/deleted/.del-ndb_deploy~1d70ed639d03fc07
    1.3 06/04/21 09:09:50 jimw@mysql.com +0 -0
    Delete: storage/ndb/home/bin/ndb_deploy

  BitKeeper/deleted/.del-import-from-bk.sh~fd7b3609d1cb93cc
    1.3 06/04/21 09:09:50 jimw@mysql.com +0 -0
    Delete: storage/ndb/home/bin/import-from-bk.sh

  BitKeeper/deleted/.del-fix-cvs-root~85b114dffe4dcd71
    1.3 06/04/21 09:09:50 jimw@mysql.com +0 -0
    Delete: storage/ndb/home/bin/fix-cvs-root

  BitKeeper/deleted/.del-cvs2cl.pl~f6dd53614cca3bd7
    1.3 06/04/21 09:09:50 jimw@mysql.com +0 -0
    Delete: storage/ndb/home/bin/cvs2cl.pl

  BitKeeper/deleted/.del-Solarismkisofs~f2352aa3eb74bf81
    1.3 06/04/21 09:09:50 jimw@mysql.com +0 -0
    Delete: storage/ndb/home/bin/Solarismkisofs

  BitKeeper/deleted/.del-Linuxmkisofs~c3340108ee428bfd
    1.3 06/04/21 09:09:50 jimw@mysql.com +0 -0
    Delete: storage/ndb/home/bin/Linuxmkisofs

ChangeSet
  1.2119.459.4 06/04/21 17:28:45 tomas@poseidon.ndb.mysql.com +2 -0
  disabled.def cleanup

  storage/ndb/test/ndbapi/bank/Bank.cpp
    1.16 06/04/21 17:28:35 tomas@poseidon.ndb.mysql.com +2 -1
    added skip create option to bank test program

  mysql-test/t/disabled.def
    1.141 06/04/21 17:28:35 tomas@poseidon.ndb.mysql.com +2 -15
    disabled.def cleanup

ChangeSet
  1.1810.1584.2 06/04/21 08:19:38 igor@rurik.mysql.com +4 -0
  Post merge fixes

  sql/sql_yacc.yy
    1.371.64.2 06/04/21 08:19:31 igor@rurik.mysql.com +1 -1
    Post merge fixes

  sql/sql_union.cc
    1.130.1.2 06/04/21 08:19:31 igor@rurik.mysql.com +1 -1
    Post merge fixes

  sql/sql_parse.cc
    1.426.81.2 06/04/21 08:19:31 igor@rurik.mysql.com +3 -2
    Post merge fixes

  mysql-test/r/func_gconcat.result
    1.52.1.6 06/04/21 08:19:31 igor@rurik.mysql.com +10 -0
    Post merge fixes

ChangeSet
  1.1810.1572.6 06/04/21 18:55:04 kroki@mysql.com +5 -0
  Bug#15728: LAST_INSERT_ID function inside a stored function returns 0
  
  Do not reset value of LAST_INSERT_ID() in sub-statement.

  sql/sql_class.cc
    1.223.1.9 06/04/21 18:54:58 kroki@mysql.com +3 -2
    Do not reset value of LAST_INSERT_ID() in sub-statement.

  mysql-test/t/sp.test
    1.174.1.11 06/04/21 18:54:57 kroki@mysql.com +25 -0
    Add test case for bug#15728.

  mysql-test/t/rpl_insert_id.test
    1.13.1.2 06/04/21 18:54:57 kroki@mysql.com +70 -0
    Add test case for bug#15728.

  mysql-test/r/sp.result
    1.170.1.27 06/04/21 18:54:57 kroki@mysql.com +17 -0
    Add result for bug#15728.

  mysql-test/r/rpl_insert_id.result
    1.12.3.1 06/04/21 18:54:56 kroki@mysql.com +58 -0
    Add result for bug#15728.

ChangeSet
  1.2119.459.1 06/04/21 16:05:42 tomas@poseidon.ndb.mysql.com +3 -0
  added skip create option to bank test program

  storage/ndb/test/ndbapi/bank/bankCreator.cpp
    1.12 06/04/21 16:05:33 tomas@poseidon.ndb.mysql.com +3 -0
    added skip create option to bank test program

  storage/ndb/test/ndbapi/bank/BankLoad.cpp
    1.13 06/04/21 16:05:33 tomas@poseidon.ndb.mysql.com +2 -2
    added skip create option to bank test program

  storage/ndb/test/ndbapi/bank/Bank.hpp
    1.12 06/04/21 16:05:33 tomas@poseidon.ndb.mysql.com +2 -0
    added skip create option to bank test program

ChangeSet
  1.1810.1457.87 06/04/21 15:57:03 msvensson@neptunus.(none) +1 -0
  Disable udf test

  mysql-test/t/disabled.def
    1.2.4.6 06/04/21 15:56:58 msvensson@neptunus.(none) +1 -0
    Disable udf test

ChangeSet
  1.2119.455.4 06/04/21 15:36:10 tomas@poseidon.ndb.mysql.com +2 -0
  Bug #19255 ndb: restore of ndb backup from different endian does not work
  + removed not needed --

  storage/ndb/tools/restore/Restore.cpp
    1.39 06/04/21 15:35:57 tomas@poseidon.ndb.mysql.com +3 -1
    Bug #19255 ndb: restore of ndb backup from different endian does not work
    + removed not needed --

  mysql-test/mysql-test-run.pl
    1.108 06/04/21 15:35:57 tomas@poseidon.ndb.mysql.com +1 -1
    post merge fix

ChangeSet
  1.2119.451.3 06/04/21 08:37:09 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  BUG#18962: Crash of ALTER TABLE .. DROP PARTITION ...
  Review fixes

  sql/partition_info.h
    1.5.1.4 06/04/21 08:37:05 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    Review fixes

  sql/partition_info.cc
    1.9.1.2 06/04/21 08:37:05 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -2
    Review fixes

ChangeSet
  1.2119.449.3 06/04/21 08:35:25 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  Final review fixes

  sql/sql_table.cc
    1.322 06/04/21 08:35:20 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +6 -6
    Final review fixes

  sql/mysql_priv.h
    1.391.1.2 06/04/21 08:35:20 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +0 -6
    Final review fixes

ChangeSet
  1.1810.1572.5 06/04/21 14:30:44 pem@mysql.com +1 -0
  Post-push fix for BUG#18344: DROP DATABASE does not drop associated routines
  Fixed windows compile error in sql/sp.cc (missing cast to byte*)

  sql/sp.cc
    1.82.1.29 06/04/21 14:30:40 pem@mysql.com +2 -2
    Fixed windows compile error. (missing cast to byte*)

ChangeSet
  1.2119.454.5 06/04/21 14:13:19 jonas@perch.ndb.mysql.com +3 -0
  ndb -
    bug#19141, bug#18575
    
    Maek sure global dict lock is taken during create/drop file/filegroup

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.123.1.1 06/04/21 14:13:16 jonas@perch.ndb.mysql.com +2 -2
    Fix not master for create/drop file

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.86 06/04/21 14:13:16 jonas@perch.ndb.mysql.com +74 -9
    Fix c_blockState lock for createdrop file/filegroup

  storage/ndb/include/kernel/signaldata/DropFilegroup.hpp
    1.3 06/04/21 14:13:16 jonas@perch.ndb.mysql.com +1 -0
    Fix error code

ChangeSet
  1.2119.454.4 06/04/21 13:58:55 jonas@perch.ndb.mysql.com +1 -0
  ndb -
    Fix error handling when out of diskspace

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
    1.32 06/04/21 13:58:52 jonas@perch.ndb.mysql.com +9 -4
    Fix error handling when out of diskspace

ChangeSet
  1.1810.1587.1 06/04/21 13:53:48 tomas@poseidon.ndb.mysql.com +4 -0
  Bug #17230 Can't change character-sets-dir for ndbd

  ndb/include/util/ndb_opts.h
    1.10.5.1 06/04/21 13:53:41 tomas@poseidon.ndb.mysql.com +5 -1
    Bug #17230 Can't change character-sets-dir for ndbd

  mysql-test/ndb/ndbcluster.sh
    1.41.1.3 06/04/21 13:53:41 tomas@poseidon.ndb.mysql.com +5 -1
    Bug #17230 Can't change character-sets-dir for ndbd

  mysql-test/mysql-test-run.sh
    1.262.12.1 06/04/21 13:53:41 tomas@poseidon.ndb.mysql.com +1 -1
    Bug #17230 Can't change character-sets-dir for ndbd

  mysql-test/mysql-test-run.pl
    1.30.23.1 06/04/21 13:53:41 tomas@poseidon.ndb.mysql.com +2 -1
    Bug #17230 Can't change character-sets-dir for ndbd

ChangeSet
  1.2119.455.2 06/04/21 13:51:58 tomas@poseidon.ndb.mysql.com +2 -0
      ndb: corrected install dir
      ndb: corrected initialization of records

  sql/ha_ndbcluster.cc
    1.288.1.15 06/04/21 13:51:50 tomas@poseidon.ndb.mysql.com +2 -2
    ndb: corrected initialization of records

  mysql-test/Makefile.am
    1.76 06/04/21 13:51:50 tomas@poseidon.ndb.mysql.com +2 -2
    ndb: corrected install dir

ChangeSet
  1.1810.1586.1 06/04/21 12:30:33 msvensson@neptunus.(none) +1 -0
  Don't run mysqld when started in ddd
  Maybe we should do the same for gdb?

  mysql-test/mysql-test-run.pl
    1.30.22.1 06/04/21 12:30:28 msvensson@neptunus.(none) +1 -2
    Don't run mysqld when started in ddd
    Maybe we should do the same for gdb?

ChangeSet
  1.2119.415.44 06/04/21 11:26:21 tomas@poseidon.ndb.mysql.com +1 -0
  bug#18594 ndb_restore log boken in 5.1
  - corrected previous patch
  - read log entry variables out into explicit variables for siimpler code (and backwards compatability code)

  storage/ndb/tools/restore/Restore.cpp
    1.38 06/04/21 11:26:15 tomas@poseidon.ndb.mysql.com +39 -47
    bug#18594 ndb_restore log boken in 5.1
    - corrected previous patch
    - read log entry variables out into explicit variables for siimpler code (and backwards compatability code)

ChangeSet
  1.1810.1576.2 06/04/21 10:17:55 mskold@mysql.com +1 -0
  Fix for bug#19088: NDBAPI: Segfault in NdbIndexScanOperation::setBound(...)

  ndb/src/ndbapi/NdbScanOperation.cpp
    1.66.3.1 06/04/21 10:17:41 mskold@mysql.com +5 -0
    Fix for bug#19088: NDBAPI: Segfault in NdbIndexScanOperation::setBound(...)

ChangeSet
  1.2119.415.43 06/04/21 09:43:21 tomas@poseidon.ndb.mysql.com +1 -0
  added one more missing install path for new files

  mysql-test/Makefile.am
    1.75 06/04/21 09:43:14 tomas@poseidon.ndb.mysql.com +2 -0
    added one more missing install path for new files

ChangeSet
  1.2119.454.3 06/04/21 09:09:33 jonas@perch.ndb.mysql.com +4 -0
  ndb - bug#19245
    A-insert/B-insert/A-rollback/B-rollback leads to node crash, as bits in tuple header gets incorrectly assigned in second insert
    this also likely fixes bug 18589 and explains 18808

  storage/ndb/test/run-test/daily-basic-tests.txt
    1.42 06/04/21 09:09:30 jonas@perch.ndb.mysql.com +4 -0
    testcase for bug#19245

  storage/ndb/test/ndbapi/testBasic.cpp
    1.11 06/04/21 09:09:30 jonas@perch.ndb.mysql.com +39 -0
    testcase for bug#19245

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
    1.31 06/04/21 09:09:30 jonas@perch.ndb.mysql.com +4 -0
    Make sure that alloc bit is set if insert and first_op

  storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
    1.8 06/04/21 09:09:30 jonas@perch.ndb.mysql.com +0 -1
    remove debug printout

ChangeSet
  1.2119.415.42 06/04/21 08:53:25 tomas@poseidon.ndb.mysql.com +1 -0
  added missing install paths for new files

  mysql-test/Makefile.am
    1.74 06/04/21 08:53:05 tomas@poseidon.ndb.mysql.com +6 -0
    added missing install paths for new files

ChangeSet
  1.1616.2513.2 06/04/21 11:48:00 ramil@mysql.com +1 -0
  Bug #17896: MIN of CASE WHEN returns non-minimum value!
  - after review fixes

  sql/item_cmpfunc.cc
    1.111.23.4 06/04/21 11:47:53 ramil@mysql.com +5 -1
    Bug #17896: MIN of CASE WHEN returns non-minimum value!
    - after review fixes.

ChangeSet
  1.1616.2549.1 06/04/20 22:15:38 igor@rurik.mysql.com +7 -0
  Fixed bug #18767.
  The bug caused wrong result sets for union constructs of the form
  (SELECT ... ORDER BY order_list1 [LIMIT n]) ORDER BY order_list2.
  For such queries order lists were concatenated and limit clause was
  completely neglected. 

  sql/sql_yacc.yy
    1.203.1.195 06/04/20 22:15:34 igor@rurik.mysql.com +21 -3
    Fixed bug #18767.
    Changed the condition at which a SELECT is treated as part of a UNION.
    The SELECT in 
    (SELECT ... ORDER BY order_list1 [LIMIT n]) ORDER BY order_list2 
    now is handled in the same way as the first SELECT in a UNION
    sequence. In the same way is handled the SELECT in
    (SELECT ... LIMIT n) ORDER BY order list.
    Yet if there is neither ORDER BY nor LIMIT in the single-select
    union construct
    (SELECT ...) ORDER BY order_list
    then it is still handled as simple select with an order clause.

  sql/sql_union.cc
    1.74.1.71 06/04/20 22:15:34 igor@rurik.mysql.com +1 -1
    Fixed bug #18767.
    Changed the condition at which a SELECT is treated as part of a UNION.
    The SELECT in 
    (SELECT ... ORDER BY order_list1 [LIMIT n]) ORDER BY order_list2 
    now is handled in the same way as the first SELECT in a UNION
    sequence.

  sql/sql_select.cc
    1.216.125.3 06/04/20 22:15:34 igor@rurik.mysql.com +1 -1
    Fixed bug #18767.
    Changed the condition on which a SELECT is treated as part of a UNION.
    The SELECT in 
    (SELECT ... ORDER BY order_list1 [LIMIT n]) ORDER BY order_list2 
    now is handled in the same way as the first SELECT in a UNION
    sequence.  

  sql/sql_parse.cc
    1.271.1.206 06/04/20 22:15:34 igor@rurik.mysql.com +57 -17
    Fixed bug #18767.
    Placed the code the created a fake SELECT_LEX into a separate function.

  sql/sql_lex.h
    1.102.41.1 06/04/20 22:15:34 igor@rurik.mysql.com +1 -0
    Fixed bug #18767.
    Placed the code the created a fake SELECT_LEX into a separate function.  

  mysql-test/t/order_by.test
    1.29.1.5 06/04/20 22:15:34 igor@rurik.mysql.com +14 -0
    Added a test case for bug #18767.

  mysql-test/r/order_by.result
    1.40.1.7 06/04/20 22:15:34 igor@rurik.mysql.com +32 -0
    Added a test case for bug #18767.

ChangeSet
  1.1810.1583.1 06/04/20 21:56:53 jimw@mysql.com +4 -0
  Bug #12792: @@system_time_zone is not SELECTable
  Bug #15684: @@version_* are not all SELECTable
  
    Added the appropriate information as read-only system variables, and
    also removed some special-case handling of @@version along the way.
  
    @@version_bdb was added, but isn't included in the test because it
    depends on the presence of BDB.

  sql/set_var.cc
    1.125.9.1 06/04/20 21:56:50 jimw@mysql.com +26 -7
    Add system_time_zone and various version-related system variables

  sql/item_func.cc
    1.270.5.1 06/04/20 21:56:50 jimw@mysql.com +0 -6
    Remove special-case handling of VERSION, it's just a read-only server
    variable like the others now.

  mysql-test/t/variables.test
    1.51.3.1 06/04/20 21:56:50 jimw@mysql.com +19 -2
    Fix error from setting @@version, reset sql_select_limit to avoid confusion
    in later tests, and add new regression tests.

  mysql-test/r/variables.result
    1.76.3.1 06/04/20 21:56:49 jimw@mysql.com +10 -1
    Update results

ChangeSet
  1.2119.454.2 06/04/21 06:51:58 jonas@perch.ndb.mysql.com +2 -0
  ndb -
    fix bug#19244, dd page got locked in page cache
    likely fix bug 18780

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
    1.15 06/04/21 06:51:55 jonas@perch.ndb.mysql.com +8 -0
    Set page to dirty when aborting prealloc

  storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
    1.16 06/04/21 06:51:55 jonas@perch.ndb.mysql.com +29 -4
    Fix so that insert/delete on DD does not lock page forever in memory

ChangeSet
  1.2119.454.1 06/04/21 06:40:47 jonas@perch.ndb.mysql.com +2 -0
  ndb -
    fix memory corruption in event-api
    maybe bug fix for 18621, 19154, 19172, 19174

  storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
    1.20 06/04/21 06:40:43 jonas@perch.ndb.mysql.com +6 -1
    Make sure that nasty c++ features arent run on Gci_container as it's supposed to be POD!

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.52 06/04/21 06:40:43 jonas@perch.ndb.mysql.com +23 -11
    Make sure that nasty c++ features arent run on Gci_container as it's supposed to be POD!

ChangeSet
  1.1810.1582.1 06/04/20 20:41:12 jimw@mysql.com +3 -0
  Bug #16195: SHOW VARIABLES doesn't report correctly sql_warnings and sql_notes values
  
    SQL_WARNINGS and SQL_NOTES were being displayed with SHOW_BOOL, but they
    are system variables that need SHOW_SYS to be used.

  sql/set_var.cc
    1.125.8.4 06/04/20 20:41:08 jimw@mysql.com +2 -2
    Fix display of sql_notes and sql_warnings in SHOW VARIABLES.

  mysql-test/t/variables.test
    1.51.1.5 06/04/20 20:41:08 jimw@mysql.com +12 -1
    Add new regression test

  mysql-test/r/variables.result
    1.76.1.4 06/04/20 20:41:08 jimw@mysql.com +15 -0
    Add new results

ChangeSet
  1.1810.1581.1 06/04/20 19:17:14 jimw@mysql.com +1 -0
  Bug #18617: mysql-test-run.pl, partially wrong handling of option "start-dirty"
  
    This was a case of too much code. The --start-dirty option should act
    just like --start-and-exit, except it skips the database initialization
    step. Now it does, which means it picks up the options from the specified
    test case.

  mysql-test/mysql-test-run.pl
    1.30.1.58 06/04/20 19:17:09 jimw@mysql.com +10 -23
    Fix handle of --start-dirty to be like --start-and-exit, without the
    database initialization, as it was (sort of) documented.

ChangeSet
  1.1810.1575.5 06/04/20 18:23:04 brian@zim.(none) +2 -0
  Dean noticed that constant flush calls caused the archive stream file to flush empty buffers. This patch removes that behavior. 

  sql/ha_archive.h
    1.31.1.2 06/04/20 18:22:59 brian@zim.(none) +2 -0
    Added a variable to determine state, and a new method for encapsulating the opening of archive writers.

  sql/ha_archive.cc
    1.60.1.7 06/04/20 18:22:59 brian@zim.(none) +32 -11
    Modifications for more of a lazy approach to opening up archive files for writing. 

ChangeSet
  1.2119.415.41 06/04/21 02:05:27 tomas@poseidon.ndb.mysql.com +4 -0
  added missing files

  mysql-test/std_data/ndb_backup51/BACKUP-1.2.ctl
    1.1 06/04/21 02:05:20 tomas@poseidon.ndb.mysql.com +275 -0
    New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1.2.ctl''

  mysql-test/std_data/ndb_backup51/BACKUP-1.1.ctl
    1.1 06/04/21 02:05:20 tomas@poseidon.ndb.mysql.com +275 -0
    New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1.1.ctl''

  mysql-test/std_data/ndb_backup51/BACKUP-1.2.ctl
    1.0 06/04/21 02:05:20 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/std_data/ndb_backup51/BACKUP-1.2.ctl

  mysql-test/std_data/ndb_backup51/BACKUP-1.1.ctl
    1.0 06/04/21 02:05:20 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/std_data/ndb_backup51/BACKUP-1.1.ctl

  mysql-test/std_data/ndb_backup50/BACKUP-1.2.ctl
    1.1 06/04/21 02:05:19 tomas@poseidon.ndb.mysql.com +178 -0
    New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.2.ctl''

  mysql-test/std_data/ndb_backup50/BACKUP-1.1.ctl
    1.1 06/04/21 02:05:19 tomas@poseidon.ndb.mysql.com +178 -0
    New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.1.ctl''

  mysql-test/std_data/ndb_backup50/BACKUP-1.2.ctl
    1.0 06/04/21 02:05:19 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/std_data/ndb_backup50/BACKUP-1.2.ctl

  mysql-test/std_data/ndb_backup50/BACKUP-1.1.ctl
    1.0 06/04/21 02:05:19 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/std_data/ndb_backup50/BACKUP-1.1.ctl

ChangeSet
  1.2119.415.40 06/04/21 02:01:13 tomas@poseidon.ndb.mysql.com +2 -0
  added missing files

  mysql-test/std_data/ndb_backup51/BACKUP-1.2.log
    1.1 06/04/21 01:59:57 tomas@poseidon.ndb.mysql.com +424 -0

  mysql-test/std_data/ndb_backup51/BACKUP-1.1.log
    1.1 06/04/21 01:59:57 tomas@poseidon.ndb.mysql.com +485 -0

  mysql-test/std_data/ndb_backup51/BACKUP-1.2.log
    1.0 06/04/21 01:59:57 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/std_data/ndb_backup51/BACKUP-1.2.log

  mysql-test/std_data/ndb_backup51/BACKUP-1.1.log
    1.0 06/04/21 01:59:57 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/std_data/ndb_backup51/BACKUP-1.1.log

ChangeSet
  1.2119.415.39 06/04/21 01:59:22 tomas@poseidon.ndb.mysql.com +1 -0
  diabled failing tests again

  mysql-test/t/disabled.def
    1.140 06/04/21 01:59:16 tomas@poseidon.ndb.mysql.com +2 -1
    diabled failing tests again

ChangeSet
  1.2119.452.2 06/04/21 01:51:58 tomas@poseidon.ndb.mysql.com +14 -0
  Bug#18594 ndb_restore log boken in 5.1
  - added compatability with 5.0
  - added test case for compatability with 5.0 and 5.1

  mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data
    1.1 06/04/21 01:39:42 tomas@poseidon.ndb.mysql.com +4025 -0
    New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data''

  mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data
    1.0 06/04/21 01:39:42 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data

  mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data
    1.1 06/04/21 01:39:41 tomas@poseidon.ndb.mysql.com +4105 -0
    New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data''

  mysql-test/std_data/ndb_backup50/BACKUP-1.2.log
    1.1 06/04/21 01:39:41 tomas@poseidon.ndb.mysql.com +160 -0
    New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.2.log''

  mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data
    1.0 06/04/21 01:39:41 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data

  mysql-test/std_data/ndb_backup50/BACKUP-1.2.log
    1.0 06/04/21 01:39:41 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/std_data/ndb_backup50/BACKUP-1.2.log

  mysql-test/std_data/ndb_backup50/BACKUP-1.1.log
    1.1 06/04/21 01:39:40 tomas@poseidon.ndb.mysql.com +170 -0
    New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.1.log''

  mysql-test/std_data/ndb_backup50/BACKUP-1.1.log
    1.0 06/04/21 01:39:40 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/std_data/ndb_backup50/BACKUP-1.1.log

  mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data
    1.1 06/04/21 01:39:27 tomas@poseidon.ndb.mysql.com +2525 -0
    New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data''

  mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data
    1.1 06/04/21 01:39:27 tomas@poseidon.ndb.mysql.com +2584 -0
    New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data''

  storage/ndb/tools/restore/restore_main.cpp
    1.43 06/04/21 01:39:27 tomas@poseidon.ndb.mysql.com +1 -4
    Bug#18594 ndb_restore log boken in 5.1
    - added compatability with 5.0
    - added test case for compatability with 5.0 and 5.1

  storage/ndb/tools/restore/Restore.hpp
    1.25 06/04/21 01:39:27 tomas@poseidon.ndb.mysql.com +1 -1
    Bug#18594 ndb_restore log boken in 5.1
    - added compatability with 5.0
    - added test case for compatability with 5.0 and 5.1

  storage/ndb/tools/restore/Restore.cpp
    1.37 06/04/21 01:39:27 tomas@poseidon.ndb.mysql.com +31 -13
    Bug#18594 ndb_restore log boken in 5.1
    - added compatability with 5.0
    - added test case for compatability with 5.0 and 5.1

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
    1.56 06/04/21 01:39:27 tomas@poseidon.ndb.mysql.com +2 -1
    Bug#18594 ndb_restore log boken in 5.1
    - added compatability with 5.0
    - added test case for compatability with 5.0 and 5.1

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.124 06/04/21 01:39:27 tomas@poseidon.ndb.mysql.com +11 -2
    Bug#18594 ndb_restore log boken in 5.1
    - added compatability with 5.0
    - added test case for compatability with 5.0 and 5.1

  storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp
    1.7 06/04/21 01:39:27 tomas@poseidon.ndb.mysql.com +11 -0
    Bug#18594 ndb_restore log boken in 5.1
    - added compatability with 5.0
    - added test case for compatability with 5.0 and 5.1

  mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data
    1.0 06/04/21 01:39:27 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data

  mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data
    1.0 06/04/21 01:39:27 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data

  mysql-test/t/ndb_restore.test
    1.18 06/04/21 01:39:26 tomas@poseidon.ndb.mysql.com +35 -0
    Bug#18594 ndb_restore log boken in 5.1
    - added compatability with 5.0
    - added test case for compatability with 5.0 and 5.1

  mysql-test/r/ndb_restore.result
    1.13 06/04/21 01:39:26 tomas@poseidon.ndb.mysql.com +113 -0
    Bug#18594 ndb_restore log boken in 5.1
    - added compatability with 5.0
    - added test case for compatability with 5.0 and 5.1

ChangeSet
  1.1810.1580.1 06/04/21 01:52:59 evgen@moonbone.local +5 -0
  Fixed bug#18739: non-standard HAVING extension was allowed in strict ANSI sql mode.
  
  The SQL standard doesn't allow to use in HAVING clause fields that are not 
  present in GROUP BY clause and not under any aggregate function in the HAVING
  clause. However, mysql allows using such fields. This extension assume that 
  the non-grouping fields will have the same group-wise values. Otherwise, the 
  result will be unpredictable. This extension allowed in strict 
  MODE_ONLY_FULL_GROUP_BY sql mode results in misunderstanding of HAVING 
  capabilities.
  
  The new error message ER_NON_GROUPING_FIELD_USED message is added. It says
  "non-grouping field '%-.64s' is used in %-.64s clause". This message is
  supposed to be used for reporting errors when some field is not found in the
  GROUP BY clause but have to be present there. Use cases for this message are 
  this bug and when a field is present in a SELECT item list not under any 
  aggregate function and there is GROUP BY clause present which doesn't mention 
  that field. It renders the ER_WRONG_FIELD_WITH_GROUP error message obsolete as
  being more descriptive.
  The resolve_ref_in_select_and_group() function now reports the 
  ER_NON_GROUPING_FIELD_FOUND error if the strict mode is set and the field for 
  HAVING clause is found in the SELECT item list only.
  

  sql/item.cc
    1.113.40.1 06/04/21 01:50:59 evgen@moonbone.local +16 -2
    Fixed bug#18739: non-standard HAVING extension was allowed in strict ANSI sql mode.
    The resolve_ref_in_select_and_group() function now reports the
    ER_NON_GROUPING_FIELD_FOUND error if the strict MODE_ONLY_FULL_GROUP_BY mode
    is set and the field for HAVING clause is found in the SELECT item list only.

  sql/sql_select.cc
    1.312.64.1 06/04/21 01:49:30 evgen@moonbone.local +4 -0
    Added TODO comment to change the ER_WRONG_FIELD_WITH_GROUP to more detailed ER_NON_GROUPING_FIELD_USED message.

  mysql-test/r/having.result
    1.24 06/04/21 01:49:19 evgen@moonbone.local +13 -0
    Added test case for the bug#18739:  non-standard HAVING extension was allowed in strict ANSI sql mode.

  mysql-test/t/having.test
    1.21 06/04/21 01:49:05 evgen@moonbone.local +13 -0
    Added test case for the bug#18739:  non-standard HAVING extension was allowed in strict ANSI sql mode.

  sql/share/errmsg.txt
    1.42.12.1 06/04/21 01:48:27 evgen@moonbone.local +2 -0
    Added the new ER_NON_GROUPING_FIELD_USED error message for the bug#14169.

ChangeSet
  1.1810.1579.3 06/04/21 01:37:31 aivanov@mysql.com +2 -0
  Restoring changes erroneously removed by applying
   the innodb-5.0-ss476 snapshot.

  mysql-test/t/innodb.test
    1.118.4.2 06/04/21 01:37:26 aivanov@mysql.com +12 -0
    Restoring changes erroneously removed by applying
     the innodb-5.0-ss476 snapshot.

  mysql-test/r/innodb.result
    1.145.4.2 06/04/21 01:37:26 aivanov@mysql.com +10 -1
    Restoring changes erroneously removed by applying
     the innodb-5.0-ss476 snapshot.

ChangeSet
  1.1810.1579.2 06/04/21 01:07:37 aivanov@mysql.com +11 -0
  Applied innodb-5.0-ss476 snapshot.
   Fix BUG#18934: "InnoDB crashes when table uses column like DB_ROW_ID".
   Also, fix memory leaks in row_create_table_for_mysql() in rare
   corner cases.

  mysql-test/t/innodb.test
    1.118.4.1 06/04/21 01:07:33 aivanov@mysql.com +3 -11
    Applied innodb-5.0-ss476 snapshot.
     Fix result for test case for Bug#18934.
     (Removed test case for Bug#14360 is to be restored by the next cset).

  mysql-test/r/innodb.result
    1.145.4.1 06/04/21 01:07:33 aivanov@mysql.com +3 -10
    Applied innodb-5.0-ss476 snapshot.
     Fix result for test case for Bug#18934.
     (Other changes are to be restored by the next cset).

  innobase/row/row0mysql.c
    1.103.13.2 06/04/21 01:07:33 aivanov@mysql.com +18 -0
    Applied innodb-5.0-ss476 snapshot.
     Refuse tables that use reserved column names (Bug#18934).

  innobase/log/log0recv.c
    1.46.4.1 06/04/21 01:07:32 aivanov@mysql.com +3 -3
    Applied innodb-5.0-ss476 snapshot.

  innobase/include/univ.i
    1.40.6.2 06/04/21 01:07:32 aivanov@mysql.com +3 -0
    Applied innodb-5.0-ss476 snapshot.

  innobase/include/dict0mem.h
    1.24.2.2 06/04/21 01:07:32 aivanov@mysql.com +7 -0
    Applied innodb-5.0-ss476 snapshot.
     Add dict_mem_table_free(), use it instead of duplicating
     the code everywhere.

  innobase/include/dict0dict.h
    1.31.8.2 06/04/21 01:07:32 aivanov@mysql.com +9 -0
    Applied innodb-5.0-ss476 snapshot.
     Refuse tables that use reserved column name (Bug#18934).

  innobase/ibuf/ibuf0ibuf.c
    1.36.3.1 06/04/21 01:07:32 aivanov@mysql.com +3 -3
    Applied innodb-5.0-ss476 snapshot.

  innobase/dict/dict0mem.c
    1.16.2.2 06/04/21 01:07:32 aivanov@mysql.com +18 -0
    Applied innodb-5.0-ss476 snapshot.
     Add dict_mem_table_free(), use it instead of duplicating
     the code everywhere.

  innobase/dict/dict0load.c
    1.37.6.1 06/04/21 01:07:32 aivanov@mysql.com +11 -6
    Applied innodb-5.0-ss476 snapshot.
     dict_load_table(): Refuse to load tables with other TYPE
     than DICT_TABLE_ORDINARY.

  innobase/dict/dict0dict.c
    1.65.10.2 06/04/21 01:07:32 aivanov@mysql.com +34 -4
    Applied innodb-5.0-ss476 snapshot.
     Refuse tables that use reserved column names (Bug#18934).

ChangeSet
  1.2119.447.10 06/04/20 23:04:55 serg@serg.mylan +2 -0
  fix for make distcheck

  unittest/mytap/t/Makefile.am
    1.6 06/04/20 23:04:40 serg@serg.mylan +1 -2
    fix for make distcheck

  unittest/examples/Makefile.am
    1.5 06/04/20 23:04:40 serg@serg.mylan +2 -2
    fix for make distcheck

ChangeSet
  1.2119.447.9 06/04/20 23:03:13 serg@serg.mylan +1 -0
  bug#19220
  mi_open() should accept filename w/i extension and with .MYI

  storage/myisam/mi_open.c
    1.101 06/04/20 23:02:57 serg@serg.mylan +1 -1
    bug#19220
    mi_open() should accept filename w/i extension and with .MYI

ChangeSet
  1.2119.452.1 06/04/20 22:04:09 tomas@poseidon.ndb.mysql.com +2 -0
  BUG#18594 ndb_restore log boken in 5.1
  - corrected log read after fragment id addition

  storage/ndb/tools/restore/Restore.cpp
    1.36 06/04/20 22:04:02 tomas@poseidon.ndb.mysql.com +1 -1
    BUG#18594 ndb_restore log boken in 5.1
    - corrected log read after fragment id addition

  storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp
    1.6 06/04/20 22:04:02 tomas@poseidon.ndb.mysql.com +1 -1
    BUG#18594 ndb_restore log boken in 5.1
    - corrected log read after fragment id addition

ChangeSet
  1.1616.2548.1 06/04/20 23:09:49 aivanov@mysql.com +6 -0
  Applied innodb-4.1-ss22 snapshot.
   Fix BUG#16814: "SHOW INNODB STATUS format error in LATEST FOREIGN KEY ERROR section"
       Add a missing newline to the LAST FOREIGN KEY ERROR section in SHOW INNODB STATUS
       output.
   Fix BUG#18934: "InnoDB crashes when table uses column names like DB_ROW_ID".
       Refuse tables that use reserved column names.

  innobase/row/row0mysql.c
    1.79.1.15 06/04/20 23:09:46 aivanov@mysql.com +14 -0
    Applied innodb-4.1-ss22 snapshot.
     Refuse tables that use reserved column names (Bug#18934).

  innobase/include/univ.i
    1.34.1.5 06/04/20 23:09:46 aivanov@mysql.com +3 -0
    Applied innodb-4.1-ss22 snapshot.

  innobase/include/dict0mem.h
    1.22.1.1 06/04/20 23:09:46 aivanov@mysql.com +7 -0
    Applied innodb-4.1-ss22 snapshot.
     Refuse tables that use reserved column names (Bug#18934).

  innobase/include/dict0dict.h
    1.27.1.7 06/04/20 23:09:46 aivanov@mysql.com +9 -0
    Applied innodb-4.1-ss22 snapshot.
     Refuse tables that use reserved column names (Bug#18934).

  innobase/dict/dict0mem.c
    1.15.1.1 06/04/20 23:09:46 aivanov@mysql.com +15 -0
    Applied innodb-4.1-ss22 snapshot.
     Refuse tables that use reserved column names (Bug#18934).

  innobase/dict/dict0dict.c
    1.52.1.15 06/04/20 23:09:46 aivanov@mysql.com +34 -1
    Applied innodb-4.1-ss22 snapshot.
     dict_foreign_error_report(): Always print a newline after invoking
      dict_print_info_on_foreign_key_in_create_format() (Bug#16814).
     Refuse tables that use reserved column names (Bug#18934).

ChangeSet
  1.2119.420.4 06/04/20 10:44:21 acurtis@xiphis.org +1 -0
  WL#3201
    handlerton -> sql_builtin

  cmakelists.txt
    1.18 06/04/20 10:44:10 acurtis@xiphis.org +2 -2
    WL#3201
      handlerton -> sql_builtin

ChangeSet
  1.1810.1575.4 06/04/20 19:43:02 mleich@mysql.com +1 -0
  Post merge correction for the Changesset
  Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to MySQL 4.1
  and Bug#16920 rpl_deadlock_innodb fails in show slave status (reported for MySQL 5.1)

  mysql-test/r/rpl_deadlock.result
    1.8.1.2 06/04/20 19:41:02 mleich@three.local.lan +6 -6
    Updated result

ChangeSet
  1.2119.420.3 06/04/20 10:37:37 acurtis@xiphis.org +4 -0
  WL#3201
    cmake changes

  storage/blackhole/cmakelists.txt
    1.1 06/04/20 10:37:24 acurtis@xiphis.org +5 -0
    New BitKeeper file ``storage/blackhole/cmakelists.txt''

  storage/blackhole/cmakelists.txt
    1.0 06/04/20 10:37:24 acurtis@xiphis.org +0 -0
    BitKeeper file /home/antony/work2/wl3201.3/storage/blackhole/cmakelists.txt

  storage/archive/cmakelists.txt
    1.2 06/04/20 10:37:24 acurtis@xiphis.org +1 -1
    WL#3201
      cmake changes

  sql/cmakelists.txt
    1.18 06/04/20 10:37:23 acurtis@xiphis.org +10 -3
    WL#3201
      cmake changes

  cmakelists.txt
    1.17 06/04/20 10:37:23 acurtis@xiphis.org +26 -23
    WL#3201
      cmake changes

ChangeSet
  1.2119.420.2 06/04/20 10:03:15 acurtis@xiphis.org +5 -0
  WL#3201
    Fixes after first review

  sql/handler.cc
    1.228 06/04/20 10:03:11 acurtis@xiphis.org +3 -0
    WL#3201
      Add comment describing installed_htons array

  sql/ha_partition.cc
    1.39.1.8 06/04/20 10:03:11 acurtis@xiphis.org +1 -1
    WL#3201
      Remove use of word "engine" when desribing partition module

  configure.in
    1.333.18.2 06/04/20 10:03:11 acurtis@xiphis.org +2 -4
    WL#3201
      Remove use of word "engine" when desribing partition module
      Undo ndb config files change

  config/ac-macros/plugins.m4
    1.2 06/04/20 10:03:11 acurtis@xiphis.org +128 -66
    WL#3201
      Remove unneccesary use of AC_DEFUN
      fix shell script to be more portable

  config/ac-macros/ha_ndbcluster.m4
    1.15 06/04/20 10:03:11 acurtis@xiphis.org +0 -2
    WL#3201
      Undo change

ChangeSet
  1.2119.415.36 06/04/20 18:53:23 pekka@mysql.com +4 -0
  ndb/repl - bug#19004 rpl_ndb_2myisam ok, rpl_ndb_2innodb new bug(number)19227

  mysql-test/t/disabled.def
    1.139 06/04/20 18:50:23 pekka@mysql.com +1 -2
    enable rpl_ndb_2myisam but keep rpl_ndb_2innodb disabled, new bug#19227

  mysql-test/include/rpl_multi_engine3.inc
    1.4 06/04/20 18:49:14 pekka@mysql.com +3 -1
    add some sleep for __slow__ replication

  mysql-test/r/rpl_ndb_2myisam.result
    1.1 06/04/20 18:43:01 pekka@mysql.com +855 -0

  mysql-test/r/rpl_ndb_2innodb.result
    1.1 06/04/20 18:43:01 pekka@mysql.com +855 -0

  mysql-test/r/rpl_ndb_2myisam.result
    1.0 06/04/20 18:43:01 pekka@mysql.com +0 -0
    BitKeeper file /space/pekka/ndb/version/my51-ndb/mysql-test/r/rpl_ndb_2myisam.result

  mysql-test/r/rpl_ndb_2innodb.result
    1.0 06/04/20 18:43:01 pekka@mysql.com +0 -0
    BitKeeper file /space/pekka/ndb/version/my51-ndb/mysql-test/r/rpl_ndb_2innodb.result

ChangeSet
  1.2119.415.35 06/04/20 15:28:31 tomas@poseidon.ndb.mysql.com +2 -0
  added missing cleanup in test causing later test to fail

  mysql-test/t/rpl_ndb_dd_partitions.test
    1.2 06/04/20 15:28:25 tomas@poseidon.ndb.mysql.com +9 -0
    added missing cleanup in test causing later test to fail

  mysql-test/r/rpl_ndb_dd_partitions.result
    1.2 06/04/20 15:28:24 tomas@poseidon.ndb.mysql.com +8 -0
    added missing cleanup in test causing later test to fail

ChangeSet
  1.2119.415.33 06/04/20 14:44:16 tomas@poseidon.ndb.mysql.com +1 -0
  Bug #19214  	running mysqld without binlog causes 10s timeout to drigger on schema ops
  - binlog thread should not wait for apply status share if binlog is not enabled

  sql/ha_ndbcluster_binlog.cc
    1.46 06/04/20 14:44:10 tomas@poseidon.ndb.mysql.com +2 -1
    Bug #19214  	running mysqld without binlog causes 10s timeout to drigger on schema ops
    - binlog thread should not wait for apply status share if binlog is not enabled

ChangeSet
  1.2119.415.32 06/04/20 14:43:06 tomas@poseidon.ndb.mysql.com +1 -0
  add mysql test run (from shell script) option to skip binlogs

  mysql-test/mysql-test-run.pl
    1.106 06/04/20 14:42:58 tomas@poseidon.ndb.mysql.com +15 -5
    add mysql test run (from shell script) option to skip binlogs

ChangeSet
  1.2119.447.7 06/04/20 13:32:41 mskold@mysql.com +1 -0
  Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code: updated with new expected error codes

  mysql-test/r/ndb_bitfield.result
    1.13 06/04/20 13:31:59 mskold@mysql.com +6 -6
    Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code: updated with new expected error codes

ChangeSet
  1.1810.1576.1 06/04/20 12:06:22 mskold@mysql.com +6 -0
  Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.74.16.1 06/04/20 12:05:53 mskold@mysql.com +11 -7
    Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code

  ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp
    1.17.1.1 06/04/20 12:05:53 mskold@mysql.com +3 -2
    Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code

  ndb/src/common/util/NdbSqlUtil.cpp
    1.29.1.1 06/04/20 12:05:53 mskold@mysql.com +28 -24
    Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code

  ndb/include/util/NdbSqlUtil.hpp
    1.23.1.1 06/04/20 12:05:53 mskold@mysql.com +3 -3
    Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code

  mysql-test/r/ndb_bitfield.result
    1.4.1.2 06/04/20 12:05:53 mskold@mysql.com +2 -2
    Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code

  ndb/include/kernel/signaldata/TupFrag.hpp
    1.7.1.1 06/04/20 12:04:28 mskold@mysql.com +2 -1
    Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code

ChangeSet
  1.2119.451.1 06/04/20 11:59:12 msvensson@win2003-x86. +1 -0
  Fix build of taocrypt. Don't mention /GX or /EHsc as that will turn ON exception handling and not off as we want.

  extra/yassl/taocrypt/cmakelists.txt
    1.4 06/04/20 11:59:05 msvensson@win2003-x86. +0 -3
    Don't write anything about /GX or /EHsc as cmake will detect that and turn exception handling ON. Since it's off by default, that is what we want.

ChangeSet
  1.1810.1575.1 06/04/20 13:34:14 evgen@moonbone.local +2 -0
  func_gconcat.result, func_gconcat.test:
    Remove duplicate test case for bug#14169

  mysql-test/r/func_gconcat.result
    1.52.1.5 06/04/20 13:33:34 evgen@moonbone.local +0 -10
    Remove duplicate test case for bug#14169

  mysql-test/t/func_gconcat.test
    1.43 06/04/20 13:33:03 evgen@moonbone.local +0 -11
    Remove duplicate test case for bug#14169

ChangeSet
  1.1616.2543.4 06/04/20 12:35:33 evgen@moonbone.local +1 -0
  func_gconcat.test:
    Clean up test case for bug#14169

  mysql-test/t/func_gconcat.test
    1.23.1.14 06/04/20 12:34:12 evgen@moonbone.local +0 -1
    Clean up test case for bug#14169

ChangeSet
  1.1810.1349.50 06/04/20 00:42:12 igor@rurik.mysql.com +5 -0
  Post merge fix

  sql/sql_select.cc
    1.312.1.94 06/04/20 00:42:06 igor@rurik.mysql.com +6 -13
    Post merge fix

  sql/item_sum.h
    1.102 06/04/20 00:42:06 igor@rurik.mysql.com +2 -2
    Post merge fix

  sql/item_sum.cc
    1.170.1.5 06/04/20 00:42:06 igor@rurik.mysql.com +2 -2
    Post merge fix

  sql/item_func.cc
    1.270.3.4 06/04/20 00:42:06 igor@rurik.mysql.com +1 -4
    Post merge fix

  mysql-test/r/func_gconcat.result
    1.52.1.4 06/04/20 00:42:06 igor@rurik.mysql.com +1 -1
    Post merge fix

ChangeSet
  1.2119.450.1 06/04/20 08:56:47 mats@mysql.com +2 -0
  Bug#16993 (ALTER TABLE ADD col AUTO_INCREMENT does not replicate):
  Removed rpl_ndb_relay_space test since it does not make sense (in
  its current form) for NDB.

  BitKeeper/deleted/.del-rpl_ndb_relay_space.result~a44835cdd2210d18
    1.3 06/04/20 08:49:25 mats@mysql.com +0 -0
    Delete: mysql-test/r/rpl_ndb_relay_space.result

  BitKeeper/deleted/.del-rpl_ndb_relay_space.test~55e5e4b13d3936d0
    1.4 06/04/20 08:49:12 mats@mysql.com +0 -0
    Delete: mysql-test/t/rpl_ndb_relay_space.test

ChangeSet
  1.2119.449.2 06/04/19 21:43:30 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  Fixed up create_handler_files call

  sql/unireg.cc
    1.79 06/04/19 21:43:25 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Fixed up create_handler_files call

  sql/sql_table.cc
    1.321 06/04/19 21:43:25 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +7 -6
    Fixed up create_handler_files call

  sql/handler.h
    1.203 06/04/19 21:43:25 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
    Fixed up create_handler_files call

  sql/ha_partition.cc
    1.45 06/04/19 21:43:25 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -2
    Fixed up create_handler_files call

  sql/ha_ndbcluster.cc
    1.293 06/04/19 21:43:24 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Fixed up create_handler_files call

ChangeSet
  1.2119.415.29 06/04/20 03:05:50 tomas@poseidon.ndb.mysql.com +2 -0
  ndb uncomitted row count cont'd, applying new fix since last one was no good

  sql/ha_ndbcluster.h
    1.126.1.7 06/04/20 03:05:42 tomas@poseidon.ndb.mysql.com +0 -1
    ndb uncomitted row count cont'd, applying new fix since last one was no good

  sql/ha_ndbcluster.cc
    1.288.1.14 06/04/20 03:05:42 tomas@poseidon.ndb.mysql.com +11 -22
    ndb uncomitted row count cont'd, applying new fix since last one was no good

ChangeSet
  1.2119.326.10 06/04/19 20:57:42 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  WL2826: Error handling of ALTER TABLE for partitioning
  Actual error reported in my_errno from my_delete

  sql/sql_table.cc
    1.319 06/04/19 20:57:37 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -3
    Actual error reported in my_errno from my_delete

ChangeSet
  1.2119.326.9 06/04/19 20:04:00 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  Various bug fixes (mostly mixed to and from in replace methods)

  sql/sql_table.cc
    1.318 06/04/19 20:03:55 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +39 -33
    Various bug fixes (mostly mixed to and from in replace methods)

  sql/sql_partition.cc
    1.65 06/04/19 20:03:55 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +8 -7
    Various bug fixes (mostly mixed to and from in replace methods)

ChangeSet
  1.1616.2543.3 06/04/19 16:08:37 igor@rurik.mysql.com +2 -0
  Temporarily commented out a query from the test case for bug 14169 to make it pass with --ps-protocol.

  mysql-test/t/func_gconcat.test
    1.23.1.13 06/04/19 16:08:33 igor@rurik.mysql.com +3 -1
    Temporarily commented out a query from the test case for bug 14169 to make it pass with --ps-protocol.

  mysql-test/r/func_gconcat.result
    1.27.1.19 06/04/19 16:08:32 igor@rurik.mysql.com +1 -0
    Added DROP TABLE command to the test case for bug 14169.

ChangeSet
  1.1810.1573.3 06/04/20 01:02:33 tnurnberg@mysql.com +1 -0
  Bug#18964 "return 0 instead of DBUG_RETURN(0) in sql_base.cc::open_table()"
  
  fixlet corrects return to DBUG_RETURN to restore the balance.

  sql/sql_base.cc
    1.235.1.98 06/04/20 01:02:26 tnurnberg@mysql.com +1 -1
    DBUG_ENTER without DBUG_RETURN in open_table()

ChangeSet
  1.1810.1573.2 06/04/20 00:55:30 tnurnberg@mysql.com +1 -0
  debugging a BK issue

  sql/sql_base.cc
    1.235.1.97 06/04/20 00:55:24 tnurnberg@mysql.com +1 -1
    debugging a BK issue

ChangeSet
  1.2119.415.28 06/04/19 23:50:51 tomas@poseidon.ndb.mysql.com +1 -0
  cluster: letting first mysql server startup properly before tstarting next

  mysql-test/mysql-test-run.pl
    1.103.1.1 06/04/19 23:50:45 tomas@poseidon.ndb.mysql.com +8 -0
    cluster: letting first mysql server startup properly before tstarting next

ChangeSet
  1.2119.415.27 06/04/19 23:49:51 tomas@poseidon.ndb.mysql.com +1 -0
  small correction in thd_ndb hash_init

  sql/ha_ndbcluster.cc
    1.288.1.13 06/04/19 23:49:43 tomas@poseidon.ndb.mysql.com +1 -1
    small correction in thd_ndb hash_init

ChangeSet
  1.2119.415.26 06/04/19 23:46:40 tomas@poseidon.ndb.mysql.com +2 -0
  BUG#17400 enabled rpl_ndb_dd_partitions

  mysql-test/r/rpl_ndb_dd_partitions.result
    1.1 06/04/19 23:46:32 tomas@poseidon.ndb.mysql.com +718 -0
    BUG#17400 enabled rpl_ndb_dd_partitions

  mysql-test/t/disabled.def
    1.138 06/04/19 23:46:32 tomas@poseidon.ndb.mysql.com +1 -1
    BUG#17400 enabled rpl_ndb_dd_partitions

  mysql-test/r/rpl_ndb_dd_partitions.result
    1.0 06/04/19 23:46:32 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/r/rpl_ndb_dd_partitions.result

ChangeSet
  1.2119.447.3 06/04/19 14:09:49 jimw@mysql.com +1 -0
  Turn on test timing in mysql-test-run.pl by default, and clean up usage docs.

  mysql-test/mysql-test-run.pl
    1.104 06/04/19 14:08:39 jimw@mysql.com +28 -22
    Turn on test timing by default, but make it so it can be turned off with
    --notimer. Also clean up the mysql-test-run.pl usage information a little
    bit, and add --benchdir to it.

ChangeSet
  1.1810.1573.1 06/04/19 22:56:48 tnurnberg@mysql.com +1 -0
  Bug#18964 "return 0 instead of DBUG_RETURN(0) in sql_base.cc::open_table()"
  
  fixlet corrects return to DBUG_RETURN to restore the balance.

  sql/sql_base.cc
    1.235.1.96 06/04/19 22:56:38 tnurnberg@mysql.com +1 -1
    DBUG_ENTER without DBUG_RETURN in open_table()

ChangeSet
  1.1616.2547.1 06/04/20 00:27:43 evgen@moonbone.local +1 -0
  func_gconcat.result:
    Corrected test case for the bug#14169 to make it pass in --ps-protocol mode.

  mysql-test/r/func_gconcat.result
    1.27.1.18 06/04/20 00:26:29 evgen@moonbone.local +0 -7
    Corrected test case for the bug#14169 to make it pass in --ps-protocol mode.

ChangeSet
  1.2119.446.2 06/04/19 16:08:59 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  Fixed a number of bugs

  sql/sql_table.cc
    1.315.1.1 06/04/19 16:08:54 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +11 -9
    Fixed a number of bugs

ChangeSet
  1.2119.448.2 06/04/19 21:30:22 tomas@poseidon.ndb.mysql.com +1 -0
  corrected wrong usage of hash

  sql/ha_ndbcluster.cc
    1.288.1.12 06/04/19 21:30:14 tomas@poseidon.ndb.mysql.com +5 -2
    corrected wrong usage of hash

ChangeSet
  1.1616.2546.1 06/04/19 20:26:40 msvensson@neptunus.(none) +1 -0
  Bug#18818 configure: No longer finds OpenSSL on Mac OS X
   - Eval shrext_cmds variable before using it

  acinclude.m4
    1.123.19.1 06/04/19 20:26:36 msvensson@neptunus.(none) +5 -3
    eval the shrext_cmds variable before using it. This is the same fix as in ltmain.sh which has a comment describing how this works on Darwin.
    The bug describes it as not working for openSSL but as the same syntax and variable is used for zlib it has to be fixed there as well.

ChangeSet
  1.1616.2545.1 06/04/19 22:54:25 svoj@april.(none) +1 -0
  Bug#18544 - LOCK TABLES timeout causes MyISAM table corruption
  
  After a locking error the open table(s) were not fully
  cleaned up for reuse. But they were put into the open table
  cache even before the lock was tried. The next statement
  reused the table(s) with a wrong lock type set up. This
  tricked MyISAM into believing that it don't need to update
  the table statistics. Hence CHECK TABLE reported a mismatch
  of record count and table size.
  
  Fortunately nothing worse has been detected yet. The effect
  of the test case was that the insert worked on a read locked
  table. (!)
  
  I added a new function that clears the lock type from all
  tables that were prepared for a lock. I call this function
  when a lock failes.
  
  No test case. One test would add 50 seconds to the
  test suite. Another test requires file mode modifications.
  I added a test script to the bug report. It contains three
  cases for failing locks. All could reproduce a table
  corruption. All are fixed by this patch.
  
  This bug was not lock timeout specific.

  sql/lock.cc
    1.42.1.25 06/04/19 22:54:22 svoj@april.(none) +53 -1
    Bug#18544 - LOCK TABLES timeout causes MyISAM table corruption
    Resetting the lock type in the open table(s) lock data
    after a locking error.

ChangeSet
  1.2119.447.1 06/04/19 19:53:17 mats@mysql.com +1 -0
  Disabling test that fails. There is already a bug for the failure.

  mysql-test/t/disabled.def
    1.136 06/04/19 19:53:11 mats@mysql.com +1 -0
    Disabling failing test.

ChangeSet
  1.2119.415.23 06/04/20 01:09:39 stewart@mysql.com +1 -0
  BUG#19198 mysqld failure during DBT2
  
  crash of mysqld due to null tOp in
  NdbTransaction::getNdbIndexScanOperation(NdbIndexImpl*,NdbTableImpl*)

ChangeSet
  1.2119.415.22 06/04/19 18:29:25 tomas@poseidon.ndb.mysql.com +2 -0
  removed use of local data in local cache in preparation for removing local cache usage all together

  sql/ha_ndbcluster.h
    1.126.1.6 06/04/19 18:29:18 tomas@poseidon.ndb.mysql.com +18 -1
    removed use of local data in local cache in preparation for removing local cache usage all together

  sql/ha_ndbcluster.cc
    1.288.1.11 06/04/19 18:29:18 tomas@poseidon.ndb.mysql.com +46 -24
    removed use of local data in local cache in preparation for removing local cache usage all together

ChangeSet
  1.2119.446.1 06/04/19 12:05:44 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  Moved error inject from being flags to compiler to being part of config.h
  Also error inject only defined if debug is also defined
  +Small fixes

  sql/handler.h
    1.201 06/04/19 12:05:38 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +7 -5
    Small fixes

  configure.in
    1.338 06/04/19 12:05:37 mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se +15 -12
    Moved error inject from being flags to compiler to being part of config.h
    Also error inject only defined if debug is also defined

ChangeSet
  1.1810.1572.1 06/04/19 19:13:03 dlenev@mysql.com +2 -0
  Added test case for bug #16021 "Wrong index given to function in trigger"
  which was caused by the same bulk insert optimization as bug #17764 but
  had slightly different symptoms.

  mysql-test/t/trigger.test
    1.34.4.1 06/04/19 19:12:59 dlenev@mysql.com +25 -1
    Added test case for bug #16021 "Wrong index given to function in trigger"
    which was caused by the same bulk insert optimization as bug #17764 but
    had slightly different symptoms.

  mysql-test/r/trigger.result
    1.29.4.1 06/04/19 19:12:59 dlenev@mysql.com +34 -1
    Added test case for bug #16021 "Wrong index given to function in trigger"
    which was caused by the same bulk insert optimization as bug #17764 but
    had slightly different symptoms.

  storage/ndb/src/ndbapi/NdbTransaction.cpp
    1.56 06/04/20 01:09:34 stewart@mysql.com +2 -2
    tOp could be null, don't fiddle with it if it is.

ChangeSet
  1.1810.1571.1 06/04/19 16:23:35 msvensson@neptunus.(none) +1 -0
  Bug#19190  	syntax error in mysql-test/mysql-test-run.sh script

  mysql-test/mysql-test-run.sh
    1.262.1.39 06/04/19 16:23:30 msvensson@neptunus.(none) +3 -1
    Use 'test', not '[' as the shell builtin might not have '-L

ChangeSet
  1.2119.444.2 06/04/19 15:29:49 mats@mysql.com +5 -0
  Bug#16993 (ALTER TABLE ZEROFILL AUTO_INCREMENT not replicated correctly):
  This is not a bug. Enabling disabled test and adding comment.

  mysql-test/t/disabled.def
    1.135 06/04/19 15:29:44 mats@mysql.com +1 -1
    Enabling test

  mysql-test/r/rpl_relay_space_myisam.result
    1.16 06/04/19 15:29:44 mats@mysql.com +4 -4
    Result change.

  mysql-test/r/rpl_relay_space_innodb.result
    1.2 06/04/19 15:29:44 mats@mysql.com +4 -4
    Result change.

  mysql-test/r/rpl_ndb_relay_space.result
    1.2 06/04/19 15:29:44 mats@mysql.com +4 -4
    Result change.

  mysql-test/extra/rpl_tests/rpl_sv_relay_space.test
    1.18 06/04/19 15:29:44 mats@mysql.com +12 -10
    Adding comment about test.

ChangeSet
  1.2119.433.7 06/04/19 14:54:39 tomas@poseidon.ndb.mysql.com +8 -0
  BUG#18094 Slave caches invalid table definition after atlters causes select failure
  - return correct object status from ndb dictionary
  - check for validity of index retrieved from index, and retry if invalid

  storage/ndb/src/ndbapi/NdbDictionary.cpp
    1.55 06/04/19 14:54:32 tomas@poseidon.ndb.mysql.com +33 -3
    BUG#18094 Slave caches invalid table definition after atlters causes select failure
    - return correct object status from ndb dictionary
    - check for validity of index retrieved from index, and retry if invalid

  storage/ndb/include/ndbapi/NdbDictionary.hpp
    1.73 06/04/19 14:54:32 tomas@poseidon.ndb.mysql.com +4 -0
    BUG#18094 Slave caches invalid table definition after atlters causes select failure
    - return correct object status from ndb dictionary
    - check for validity of index retrieved from index, and retry if invalid

  sql/ha_ndbcluster_binlog.cc
    1.45 06/04/19 14:54:32 tomas@poseidon.ndb.mysql.com +15 -7
    BUG#18094 Slave caches invalid table definition after atlters causes select failure
    - return correct object status from ndb dictionary
    - check for validity of index retrieved from index, and retry if invalid

  sql/ha_ndbcluster.h
    1.126.1.5 06/04/19 14:54:32 tomas@poseidon.ndb.mysql.com +3 -2
    BUG#18094 Slave caches invalid table definition after atlters causes select failure
    - return correct object status from ndb dictionary
    - check for validity of index retrieved from index, and retry if invalid

  sql/ha_ndbcluster.cc
    1.288.1.10 06/04/19 14:54:32 tomas@poseidon.ndb.mysql.com +58 -26
    BUG#18094 Slave caches invalid table definition after atlters causes select failure
    - return correct object status from ndb dictionary
    - check for validity of index retrieved from index, and retry if invalid

  mysql-test/t/rpl_ndb_basic.test
    1.5 06/04/19 14:54:32 tomas@poseidon.ndb.mysql.com +31 -0
    BUG#18094 Slave caches invalid table definition after atlters causes select failure
    - return correct object status from ndb dictionary
    - check for validity of index retrieved from index, and retry if invalid

  mysql-test/t/disabled.def
    1.133.1.1 06/04/19 14:54:32 tomas@poseidon.ndb.mysql.com +2 -2
    BUG#18094 Slave caches invalid table definition after atlters causes select failure
    - return correct object status from ndb dictionary
    - check for validity of index retrieved from index, and retry if invalid

  mysql-test/r/rpl_ndb_basic.result
    1.3 06/04/19 14:54:31 tomas@poseidon.ndb.mysql.com +25 -0
    BUG#18094 Slave caches invalid table definition after atlters causes select failure
    - return correct object status from ndb dictionary
    - check for validity of index retrieved from index, and retry if invalid

ChangeSet
  1.1810.1570.1 06/04/19 14:27:59 kroki@mysql.com +3 -0
  Bug#6951: Triggers/Traditional: SET @ result wrong
  
  While executing a trigger, we have to set thd->abort_on_warning to the value
  it had at trigger creation time.

  sql/sp_head.cc
    1.200.2.1 06/04/19 14:27:53 kroki@mysql.com +6 -0
    While executing a trigger, set thd->abort_on_warning to the value it had at
    trigger creation time.

  mysql-test/t/trigger.test
    1.34.3.1 06/04/19 14:27:53 kroki@mysql.com +48 -0
    Add test case for bug#6951.

  mysql-test/r/trigger.result
    1.29.3.1 06/04/19 14:27:52 kroki@mysql.com +36 -0
    Add result for bug#6951.

ChangeSet
  1.1810.1569.1 06/04/19 15:13:50 svoj@april.(none) +6 -0
  BUG#18160 - Memory-/HEAP Table endless growing indexes
  
  Updating data in HEAP table with BTREE index results in wrong index_length
  counter value, which keeps growing after each update.
  
  When inserting new record into tree counter is incremented by:
  sizeof(TREE_ELEMENT) + key_size + tree->size_of_element
  But when deleting element from tree it doesn't decrement counter by key_size:
  sizeof(TREE_ELEMENT) + tree->size_of_element
  
  This fix makes accurate allocated memory counter for tree. That is
  decrease counter by key_size when deleting tree element.

  mysys/tree.c
    1.29 06/04/19 15:13:46 svoj@april.(none) +2 -3
    Added size of the key to tree_delete() for accurate allocated memory counter.
    Note that this size is optional. If one doesn't need precise counter it is safe
    to pass 0 as key_size.

  mysql-test/t/heap_btree.test
    1.15 06/04/19 15:13:46 svoj@april.(none) +10 -0
    Testcase for BUG#18160.

  mysql-test/r/heap_btree.result
    1.18.1.1 06/04/19 15:13:45 svoj@april.(none) +10 -0
    Testcase for BUG#18160.

  myisam/myisamlog.c
    1.29.4.1 06/04/19 15:13:45 svoj@april.(none) +1 -1
    Added size of the key to tree_delete() for accurate allocated memory counter.

  include/my_tree.h
    1.18 06/04/19 15:13:45 svoj@april.(none) +1 -1
    Added size of the key to tree_delete() for accurate allocated memory counter.

  heap/hp_delete.c
    1.14.2.1 06/04/19 15:13:45 svoj@april.(none) +2 -1
    Added size of the key to tree_delete() for accurate allocated memory counter.

ChangeSet
  1.1810.1523.7 06/04/19 11:42:55 msvensson@shellback.(none) +3 -0
  Add the .der files used by yaSSL benchmark

  extra/yassl/taocrypt/benchmark/rsa1024.der
    1.1 06/04/19 11:42:49 msvensson@shellback.(none) +15 -0
    New BitKeeper file ``extra/yassl/taocrypt/benchmark/rsa1024.der''

  extra/yassl/taocrypt/benchmark/dsa1024.der
    1.1 06/04/19 11:42:49 msvensson@shellback.(none) +11 -0
    New BitKeeper file ``extra/yassl/taocrypt/benchmark/dsa1024.der''

  extra/yassl/taocrypt/benchmark/rsa1024.der
    1.0 06/04/19 11:42:49 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl_3/extra/yassl/taocrypt/benchmark/rsa1024.der

  extra/yassl/taocrypt/benchmark/dsa1024.der
    1.0 06/04/19 11:42:49 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl_3/extra/yassl/taocrypt/benchmark/dsa1024.der

  extra/yassl/taocrypt/benchmark/dh1024.der
    1.1 06/04/19 11:42:48 msvensson@shellback.(none) +5 -0
    New BitKeeper file ``extra/yassl/taocrypt/benchmark/dh1024.der''

  extra/yassl/taocrypt/benchmark/dh1024.der
    1.0 06/04/19 11:42:48 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl_3/extra/yassl/taocrypt/benchmark/dh1024.der

ChangeSet
  1.1810.1523.6 06/04/19 11:33:49 msvensson@shellback.(none) +1 -0
  Add .der files, used by yaSSL benchmark
  Add benchamrk to dirs to build

  extra/yassl/taocrypt/Makefile.am
    1.1.1.2 06/04/19 11:33:37 msvensson@shellback.(none) +1 -1
    Add benchmark to dirs to build

ChangeSet
  1.2119.415.20 06/04/19 12:21:33 monty@mysql.com +4 -0
  Fixed timeing problem by ignoring failures and results from first select after table definition change

  mysql-test/t/ndb_alter_table_stm.test
    1.4 06/04/19 12:21:30 monty@mysql.com +6 -0
    Fixed timeing problem by ignoring failures and results from first select after table definition change

  mysql-test/t/ndb_alter_table2.test
    1.3 06/04/19 12:21:30 monty@mysql.com +3 -0
    Fixed timeing problem by ignoring failures and results from first select after table definition change

  mysql-test/r/ndb_alter_table_stm.result
    1.4 06/04/19 12:21:30 monty@mysql.com +1 -0
    Fixed timeing problem by ignoring failures and results from first select after table definition changethe 

  mysql-test/r/ndb_alter_table2.result
    1.3 06/04/19 12:21:30 monty@mysql.com +0 -1
    Fixed timeing problem by ignoring failures and results from first select after table definition changethe 

ChangeSet
  1.1810.1523.5 06/04/19 10:21:00 msvensson@shellback.(none) +4 -0
  Import from upstream yaSSL

  extra/yassl/taocrypt/test/test.cpp
    1.2 06/04/18 22:17:39 msvensson@shellback.(none)[msvensson] +51 -57
    Import patch yassl.diff

  extra/yassl/taocrypt/src/template_instnt.cpp
    1.6.1.2 06/04/18 22:17:39 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/misc.hpp
    1.11 06/04/19 10:19:12 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/src/template_instnt.cpp
    1.4.1.1 06/04/18 22:17:38 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

ChangeSet
  1.2119.415.19 06/04/19 11:20:11 monty@mysql.com +3 -0
  Only run test with row based logging

  mysql-test/t/rpl_ndb_multi_update3.test
    1.2 06/04/19 11:20:08 monty@mysql.com +1 -0
    Only run test with row based logging

  mysql-test/t/rpl_ndb_insert_ignore.test
    1.2 06/04/19 11:20:08 monty@mysql.com +1 -0
    Only run test with row based logging

  mysql-test/t/rpl_ndb_delete_nowhere.test
    1.3 06/04/19 11:20:08 monty@mysql.com +1 -0
    Only run test with row based logging

ChangeSet
  1.2119.415.18 06/04/19 11:17:32 monty@mysql.com +1 -0
  Fix wrong auto merge

  mysys/my_access.c
    1.12 06/04/19 11:17:28 monty@mysql.com +0 -8
    Fix wrong auto merge

ChangeSet
  1.2119.442.2 06/04/19 11:08:22 monty@mysql.com +1 -0
  Fixed compilation error
  ensure check_if_legal_table_name is also defined on unix

  mysys/my_access.c
    1.9.1.1 06/04/19 11:08:19 monty@mysql.com +10 -1
    Fixed compilation error
    ensure check_if_legal_table_name is also defined on unix

ChangeSet
  1.2119.443.1 06/04/19 12:51:30 bar@mysql.com +1 -0
  my_access.c:
    After merge fix.

  mysys/my_access.c
    1.10 06/04/19 12:51:06 bar@mysql.com +0 -1
    After merge fix.

ChangeSet
  1.2119.436.3 06/04/19 10:39:57 monty@mysql.com +4 -0
  Fix compilation failure when compiling with BUILD/compile-pentium-debug-max
  (Problem with embedded server and ndb)
  Fix broken mysql-test-run.sh
  Removed memory leak in ha_example.cc

  storage/example/ha_example.cc
    1.34.1.1 06/04/19 10:39:53 monty@mysql.com +27 -11
    Removed memory leak
    (example_done_func was not called)

  mysql-test/mysql-test-run.sh
    1.317 06/04/19 10:39:53 monty@mysql.com +7 -11
    Remove deprication message until speed of mysql-test-run.pl is comparable to mysql-test-run.sh
    Fix code that jimw broke in his last change

  mysql-test/mysql-test-run.pl
    1.103 06/04/19 10:39:53 monty@mysql.com +4 -4
    Make the port number in a nice range

  libmysqld/Makefile.am
    1.85 06/04/19 10:39:53 monty@mysql.com +5 -2
    Fix compiler failure (libmysqld.a was empty)
    Reason was that 'cd' did an echo that confused 'ar'

ChangeSet
  1.2119.415.12 06/04/19 11:11:47 bar@mysql.com +1 -0
  item_xmlfunc.cc:
    After review minor fixes for bug#16319
    Thanks to Gluh for suggestions.

  sql/item_xmlfunc.cc
    1.15 06/04/19 11:10:41 bar@mysql.com +1 -3
    After review minor fixes.
    Thanks Gluh for suggestions.

ChangeSet
  1.1616.2543.1 06/04/18 20:57:31 igor@rurik.mysql.com +3 -0
  Fixed bug #19079.
  The bug caused a reported index corruption in the cases when
  key_cache_block_size was not a multiple of myisam_block_size,
  e.g. when key_cache_block_size=1536 while myisam_block_size=1024.

  mysys/mf_keycache.c
    1.46.1.7 06/04/18 20:57:27 igor@rurik.mysql.com +7 -5
    Fixed bug #19079.
    The bug caused a reported index corruption in the cases when
    key_cache_block_size was not a multiple of myisam_block_size,
    e.g. when key_cache_block_size=1536 while myisam_block_size=1024.

  mysql-test/t/key_cache.test
    1.16.1.1 06/04/18 20:57:27 igor@rurik.mysql.com +40 -1
    Added a test case for bug #19079.

  mysql-test/r/key_cache.result
    1.13.1.2 06/04/18 20:57:27 igor@rurik.mysql.com +42 -0
    Added a test case for bug #19079.

ChangeSet
  1.2119.439.2 06/04/18 22:21:43 andrey@lmy004. +1 -0
  fix for bug #19170 (Event creation leads to 100% CPU usage)

  sql/event_timed.cc
    1.49 06/04/18 22:21:33 andrey@lmy004. +17 -14
    - fix 100% cpu usage problem. If time_now==last_exec then don't schedule
      the event for time_now but increase the multiplier
    - if time_now is between STARTS and ENDS (the latter is set) or after STARTS
      (ENDS is not set) and there was no previous execution (imagine disabled
      scheduler being started) then don't schedule for time_now but for STARTS
      and then get_next_time() will find the correct time.

ChangeSet
  1.2119.440.1 06/04/18 12:12:46 jimw@mysql.com +581 -0
  Nuke all of the old_* directories in the ndb tree.

  storage/ndb/Makefile.am
    1.17 06/04/18 12:12:36 jimw@mysql.com +0 -1
    Remove reference to old_files directory

ChangeSet
  1.1810.1568.1 06/04/18 18:10:47 msvensson@neptunus.(none) +14 -0
  Cleanup test cases that leaves "stuff" behind

  mysql-test/t/trigger.test
    1.34.1.7 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -1
    Drop table

  mysql-test/t/sp_notembedded.test
    1.1.1.1 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
    Drop table

  mysql-test/t/sp-security.test
    1.28.1.4 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
    Drop users

  mysql-test/t/rpl_openssl.test
    1.11.1.1 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
    Drop users

  mysql-test/t/openssl_1.test
    1.14 06/04/18 18:10:42 msvensson@neptunus.(none) +3 -3
    Drop users

  mysql-test/t/grant2.test
    1.31.2.3 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
    Drop users

  mysql-test/t/ctype_latin2_ch.test
    1.2 06/04/18 18:10:42 msvensson@neptunus.(none) +2 -0
    Drop table

  mysql-test/r/trigger.result
    1.29.1.7 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -1
    Drop table

  mysql-test/r/sp_notembedded.result
    1.1.1.1 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
    Drop table

  mysql-test/r/sp-security.result
    1.25.1.4 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
    Drop users

  mysql-test/r/rpl_openssl.result
    1.11.1.1 06/04/18 18:10:42 msvensson@neptunus.(none) +2 -1
    Drop users

  mysql-test/r/openssl_1.result
    1.13 06/04/18 18:10:42 msvensson@neptunus.(none) +2 -3
    Drop users

  mysql-test/r/grant2.result
    1.25.2.3 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
    Drop users

  mysql-test/r/ctype_latin2_ch.result
    1.2 06/04/18 18:10:42 msvensson@neptunus.(none) +1 -0
    Drot table at end of test

ChangeSet
  1.1810.1550.3 06/04/18 17:58:27 msvensson@neptunus.(none) +13 -0
  Bug#17208 SSL: client does not verify server certificate
   - Add new function 'ssl_verify_server_cert' which is used if we are 
     connecting to the server with SSL. It will compare the hostname in 
     the server's cert against the hostname that we used when connecting 
     to the server. Will reject the connection if hostname does not match.
   - Add new option "OPT_SSL_VERIFY_SERVER_CERT" to be passed to mysql_options
     which will turn on checking of servers cert.
   - Add new argument "ssl-verify-server-cert" to all mysql* clients which 
     will activate the above option.
   - Generate a new server cert with 1024 bits that has "localhost" as the server name.

  vio/viosslfactories.c
    1.23 06/04/18 17:58:22 msvensson@neptunus.(none) +4 -4
    Ask the SSL library to verify servers cert by setting the SSL_VERIFY_PEER flag

  sql-common/client.c
    1.83.1.5 06/04/18 17:58:22 msvensson@neptunus.(none) +84 -2
    Add ssl_vertify_server_cert function which is executed if user has set the option ssl_verify_cerver_cert

  include/sslopt-vars.h
    1.6 06/04/18 17:58:22 msvensson@neptunus.(none) +3 -0
    Add opt_ssl_varify_server_cert to all clients.

  include/sslopt-longopts.h
    1.10 06/04/18 17:58:22 msvensson@neptunus.(none) +6 -1
    Add ssl-verify-server-cert options to all clients.

  include/mysql.h
    1.154.1.3 06/04/18 17:58:22 msvensson@neptunus.(none) +3 -1
    Add variable ssl_verify_cerver_cert

  client/mysqltest.c
    1.155.9.42 06/04/18 17:58:22 msvensson@neptunus.(none) +10 -1
    Always set opt_ssl_verify_server_cert on in mysqltest if we are using SSL

  client/mysqlshow.c
    1.48 06/04/18 17:58:22 msvensson@neptunus.(none) +2 -0
    Pass the variable "opt_ssl_verify_server_cert" to the mysql_options function. It's processed/included by include/sslopt*.h files

  client/mysqlimport.c
    1.58.1.1 06/04/18 17:58:22 msvensson@neptunus.(none) +2 -0
    Pass the variable "opt_ssl_verify_server_cert" to the mysql_options function. It's processed/included by include/sslopt*.h files

  client/mysqldump.c
    1.214.1.12 06/04/18 17:58:22 msvensson@neptunus.(none) +2 -0
    Pass the variable "opt_ssl_verify_server_cert" to the mysql_options function. It's processed/included by include/sslopt*.h files

  client/mysqladmin.cc
    1.115 06/04/18 17:58:22 msvensson@neptunus.(none) +2 -0
    Pass the variable "opt_ssl_verify_server_cert" to the mysql_options function. It's processed/included by include/sslopt*.h files

  client/mysql.cc
    1.199.2.1 06/04/18 17:58:22 msvensson@neptunus.(none) +2 -0
    Pass the variable "opt_ssl_verify_server_cert" to the mysql_options function. It's processed/included by include/sslopt*.h files

  client/client_priv.h
    1.43.2.1 06/04/18 17:58:22 msvensson@neptunus.(none) +1 -1
    Add OPT_SSL_VERIFY_CERT

  SSL/server-cert.pem
    1.5.1.1 06/04/18 17:58:22 msvensson@neptunus.(none) +38 -40
    Generate a new server cert that has "localhost" as CN, so that we can test to verify the hostname we connected against with the hostname in the cert

ChangeSet
  1.2119.326.6 06/04/18 16:58:12 mikron@c-ae09e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  Use \0 to indicate frm-file
  Add more comments
  Add more #ifdef code missing previously

  sql/sql_table.cc
    1.316 06/04/18 16:57:55 mikron@c-ae09e253.1238-1-64736c10.cust.bredbandsbolaget.se +11 -1
    Use \0 to indicate frm-file
    Add more comments
    Add more #ifdef code missing previously

  sql/sql_partition.cc
    1.64 06/04/18 16:57:55 mikron@c-ae09e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Use \0 to indicate frm-file

ChangeSet
  1.1810.1560.4 06/04/18 16:01:01 pem@mysql.com +3 -0
  Fixed BUG#18344: DROP DATABASE does not drop associated routines
    We must use the db key length in sp_drop_db_routines (and not the
    number of characters), or long db names will be truncated in the key.

  sql/sp.cc
    1.82.1.28 06/04/18 16:00:57 pem@mysql.com +8 -12
    In sp_drop_db_routines(), give the key field's ("db") key length
    instead of the number of characters to index_read(), or the key
    packing will truncate long db names.

  mysql-test/t/sp.test
    1.174.1.10 06/04/18 16:00:57 pem@mysql.com +32 -0
    Added new test case for BUG#18344.

  mysql-test/r/sp.result
    1.170.1.26 06/04/18 16:00:57 pem@mysql.com +29 -0
    Updated results for new test case (BUG#18344)

ChangeSet
  1.2119.411.5 06/04/18 15:21:39 jonas@perch.ndb.mysql.com +2 -0
  ndb - replication
    Make sure that SUB_GCP_COMPLETE_ACK is sent uncond, failure to do so can lead to problems...

  storage/ndb/src/ndbapi/TransporterFacade.cpp
    1.50 06/04/18 15:21:36 jonas@perch.ndb.mysql.com +1 -1
    Make sure that SUB_GCP_COMPLETE_ACK is sent uncond

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
    1.31 06/04/18 15:21:36 jonas@perch.ndb.mysql.com +9 -2
    retry on O_DIRECT

ChangeSet
  1.2119.438.1 06/04/18 15:05:29 pekka@mysql.com +1 -0
  ndb - drop blob events: table is known so use it

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.123 06/04/18 15:03:32 pekka@mysql.com +4 -3
    dropBlobEvents knows which table, so use it to avoid search by name

ChangeSet
  1.1810.1523.4 06/04/18 14:41:43 msvensson@shellback.(none) +22 -0
  Import from yaSSL upstream

ChangeSet
  1.1810.1522.7 06/04/18 14:36:29 jonas@perch.ndb.mysql.com +1 -0
  ndb -
    post merge

  ndb/src/ndbapi/TransporterFacade.hpp
    1.23.3.2 06/04/18 14:36:27 jonas@perch.ndb.mysql.com +1 -1
    merge fix

ChangeSet
  1.1616.2536.2 06/04/18 14:34:11 jonas@perch.ndb.mysql.com +3 -0
  ndb -
    fix api_signal_log print of uncond signals

  ndb/src/ndbapi/TransporterFacade.hpp
    1.18.1.3 06/04/18 14:34:09 jonas@perch.ndb.mysql.com +2 -1
    Fix printout of uncond signals

  ndb/src/ndbapi/TransporterFacade.cpp
    1.26.1.9 06/04/18 14:34:09 jonas@perch.ndb.mysql.com +4 -3
    Fix printout of uncond signals

  ndb/src/ndbapi/Ndbif.cpp
    1.24.2.3 06/04/18 14:34:09 jonas@perch.ndb.mysql.com +2 -2
    Send TC_COMMIT_ACK uncond

  extra/yassl/taocrypt/src/template_instnt.cpp
    1.6.1.1 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +9 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/random.cpp
    1.8 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +3 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/misc.cpp
    1.11 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +0 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/src/integer.cpp
    1.19 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +16 -4
    Import patch yassl.diff

  extra/yassl/taocrypt/src/algebra.cpp
    1.8 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +3 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/include/types.hpp
    1.9 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/runtime.hpp
    1.11 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +21 -3
    Import patch yassl.diff

  extra/yassl/taocrypt/include/misc.hpp
    1.10 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +11 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/include/integer.hpp
    1.7.1.1 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +0 -3
    Import patch yassl.diff

  extra/yassl/taocrypt/benchmark/benchmark.cpp
    1.2 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +6 -6
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp
    1.12 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +16 -4
    Import patch yassl.diff

  extra/yassl/src/yassl_imp.cpp
    1.7 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/src/ssl.cpp
    1.11 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +4 -0
    Import patch yassl.diff

  extra/yassl/src/socket_wrapper.cpp
    1.9 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +7 -3
    Import patch yassl.diff

  extra/yassl/src/handshake.cpp
    1.7 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +10 -6
    Import patch yassl.diff

  extra/yassl/mySTL/vector.hpp
    1.6 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +2 -1
    Import patch yassl.diff

  extra/yassl/mySTL/list.hpp
    1.7 06/04/11 22:53:08 msvensson@shellback.(none)[msvensson] +2 -2
    Import patch yassl.diff

  extra/yassl/mySTL/helpers.hpp
    1.9 06/04/11 22:53:08 msvensson@shellback.(none)[msvensson] +4 -8
    Import patch yassl.diff

  extra/yassl/include/yassl_types.hpp
    1.10 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +5 -0
    Import patch yassl.diff

  extra/yassl/include/yassl_int.hpp
    1.8 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +0 -4
    Import patch yassl.diff

  extra/yassl/include/openssl/ssl.h
    1.6 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +2 -1
    Import patch yassl.diff

  extra/yassl/include/openssl/rsa.h
    1.1.1.1 06/04/11 22:34:30 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

ChangeSet
  1.1810.1500.6 06/04/18 13:26:41 kent@mysql.com +1 -0
  configure.in:
    Stepped up version to 5.0.20a

  configure.in
    1.245.45.1 06/04/18 13:26:21 kent@mysql.com +1 -1
    Stepped up version to 5.0.20a

ChangeSet
  1.2119.433.4 06/04/18 12:16:27 mskold@mysql.com +1 -0
  Updated result file

  mysql-test/r/ndb_basic.result
    1.39 06/04/18 12:16:03 mskold@mysql.com +0 -7
    Updated result file

ChangeSet
  1.1810.1566.1 06/04/18 12:08:06 msvensson@neptunus.(none) +13 -0
  Bug#18815 libmysql using yassl can't be linked with c program
   - Apply patch to remove dependency on C++ libs when linking "libmysql" from c

  extra/yassl/taocrypt/src/template_instnt.cpp
    1.7 06/04/18 12:08:02 msvensson@neptunus.(none) +1 -0
    Add instantiation of one new template

  extra/yassl/taocrypt/src/integer.cpp
    1.17.1.1 06/04/18 12:08:02 msvensson@neptunus.(none) +17 -4
    Use static pointers for singletons
    Add cleanup function

  extra/yassl/taocrypt/src/algebra.cpp
    1.6.1.1 06/04/18 12:08:02 msvensson@neptunus.(none) +3 -1
    Use mySTL::vector to avoid array of Element being on the stack

  extra/yassl/taocrypt/include/runtime.hpp
    1.9.1.1 06/04/18 12:08:02 msvensson@neptunus.(none) +21 -5
    Add runtime for Solaris

  extra/yassl/taocrypt/include/misc.hpp
    1.8.1.1 06/04/18 12:08:02 msvensson@neptunus.(none) +5 -0
    Add clenaup function

  extra/yassl/taocrypt/include/integer.hpp
    1.8 06/04/18 12:08:02 msvensson@neptunus.(none) +0 -2
    Remove statoc singletons from class scope

  extra/yassl/src/yassl_int.cpp
    1.10.1.1 06/04/18 12:08:02 msvensson@neptunus.(none) +17 -5
    Use static pointers for singletons

  extra/yassl/src/template_instnt.cpp
    1.5 06/04/18 12:08:02 msvensson@neptunus.(none) +2 -0
    Add instantiation of two new templates

  extra/yassl/src/handshake.cpp
    1.5.1.1 06/04/18 12:08:02 msvensson@neptunus.(none) +10 -7
    Use buffered.reset(0) instead of null_buffer

  extra/yassl/include/yassl_types.hpp
    1.8.1.1 06/04/18 12:08:02 msvensson@neptunus.(none) +5 -0
    Add CleanUp function for static singletons

  extra/yassl/include/yassl_int.hpp
    1.6.1.1 06/04/18 12:08:02 msvensson@neptunus.(none) +0 -4
    Remove static instance

  extra/yassl/include/openssl/ssl.h
    1.4.1.1 06/04/18 12:08:02 msvensson@neptunus.(none) +1 -1
    Fix spelling error

  extra/yassl/include/openssl/rsa.h
    1.2 06/04/18 12:08:02 msvensson@neptunus.(none) +1 -1
    Fix spelling error

ChangeSet
  1.1810.1525.4 06/04/18 11:16:39 pem@mysql.com +1 -0
  Post-review fix for BUG#18787. Renamed a local variable in
  Item_func_sp::tmp_table_field() to something more descriptive.

  sql/item_func.cc
    1.270.1.8 06/04/18 11:16:35 pem@mysql.com +6 -6
    Renamed local variable 'res' to 'field' in Item_func_sp::tmp_table_field(),
    because it is.

ChangeSet
  1.1810.1553.3 06/04/18 11:07:34 pem@mysql.com +9 -0
  Fixed BUG#18949: Test case sp-goto is disabled
    Removed sp-goto.test, sp-goto.result and all (disabled) GOTO code.
    Also removed some related code that's not needed any more (no possible
    unresolved label references any more, so no need to check for them).
    NB: Keeping the ER_SP_GOTO_IN_HNDLR in errmsg.txt; it might become useful
        in the future, and removing it (and thus re-enumerating error codes)
        might upset things. (Anything referring to explicit error codes.)

  sql/sql_yacc.yy
    1.371.63.1 06/04/18 11:07:30 pem@mysql.com +0 -90
    Removed GOTO symbols and (disabled) code, and the no longer needed
    sp_head::check_backpatch() calls.

  sql/sp_pcontext.h
    1.29 06/04/18 11:07:30 pem@mysql.com +3 -4
    Removed SP_LAB_REF (no longer needed) and renamed SP_LAB_GOTO
    to SP_LAB_IMPL, since it's only used for implicit labels now.

  sql/sp_pcontext.cc
    1.31 06/04/18 11:07:30 pem@mysql.com +1 -1
    SP_LAB_GOTO was renamed to SP_LAB_IMPL

  sql/sp_head.h
    1.79.1.3 06/04/18 11:07:30 pem@mysql.com +0 -7
    Removed sp_head::check_backpatch(). (Not needed with no GOTO)

  sql/sp_head.cc
    1.200.1.7 06/04/18 11:07:30 pem@mysql.com +2 -35
    Removed sp_head::check_backpatch() and simplified sp_head::backpatch().
    Without GOTO, unresolved label references are not possible, so no need
    to check for them.

  sql/lex.h
    1.137.1.7 06/04/18 11:07:30 pem@mysql.com +0 -7
    Removed (disabled) GOTO definitions.

  mysql-test/t/disabled.def
    1.2.6.1 06/04/18 11:07:30 pem@mysql.com +0 -1
    sp-goto.test no longer exists.

ChangeSet
  1.1810.1458.3 06/04/18 10:46:17 msvensson@shellback.(none) +3 -0
  BUG#13310 incorrect user parsing by SP
   - Strip surrounding ''s from username when a new user connects. There
     is no user 'a@', it should be a@

  sql/sql_parse.cc
    1.426.80.1 06/04/18 10:46:11 msvensson@shellback.(none) +12 -3
    Strip surrounding ''s from username when a new user connects. There 
    is no user 'a@', it should be a@

  mysql-test/t/grant2.test
    1.31.2.2 06/04/18 10:46:11 msvensson@shellback.(none) +25 -0
    Add tests for bug 13310

  mysql-test/r/grant2.result
    1.25.2.2 06/04/18 10:46:11 msvensson@shellback.(none) +13 -0
    Update test result

ChangeSet
  1.2119.411.3 06/04/18 10:41:56 jonas@perch.ndb.mysql.com +1 -0
  ndb -
    Add abort in reception of invalid/inconsistent SUB_GCP_COMPLETE_REP
    as proceeding (in release wo/ asserts) make mysqld crash in mysterious ways

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.51 06/04/18 10:41:54 jonas@perch.ndb.mysql.com +23 -2
    Add abort in reception of invalid/inconsistent SUB_GCP_COMPLETE_REP
      as proceeding (in release wo/ asserts) make mysqld crash in mysterious ways

ChangeSet
  1.2119.411.2 06/04/18 10:33:40 jonas@perch.ndb.mysql.com +1 -0
  ndb -
    handle open(O_DIRECT) -> EINVAL
    remove need for NDB_NO_ODIRECT

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
    1.30 06/04/18 10:33:37 jonas@perch.ndb.mysql.com +42 -19
    handle open(O_DIRECT) -> EINVAL

ChangeSet
  1.1810.1500.4 06/04/18 10:16:06 serg@mysql.com +1 -0
  mysql.cc:
    revert bug#16855 "fix" per Monty's request

  client/mysql.cc
    1.198.2.1 06/04/18 10:15:22 serg@mysql.com +2 -9
    revert bug#16855 "fix" per Monty's request

ChangeSet
  1.2119.435.1 06/04/18 10:46:28 monty@mysql.com +1 -0
  Remove warnings about missing DBUG_RETURN's

  storage/ndb/src/mgmapi/mgmapi.cpp
    1.61 06/04/18 10:46:24 monty@mysql.com +15 -9
    Remove warnings about missing DBUG_RETURN's

  BitKeeper/deleted/.del-sp-goto.test~5054d3f729692d3d
    1.2 06/04/18 09:27:27 pem@mysql.com +0 -0
    Delete: mysql-test/t/sp-goto.test

  BitKeeper/deleted/.del-sp-goto.result~f343103c63f64b7a
    1.2 06/04/18 09:27:27 pem@mysql.com +0 -0
    Delete: mysql-test/r/sp-goto.result

ChangeSet
  1.2119.404.2 06/04/18 08:57:37 mskold@mysql.com +1 -0
  Invalidate old table at rename

  sql/ha_ndbcluster_binlog.cc
    1.43 06/04/18 08:57:21 mskold@mysql.com +18 -2
    Invalidate old table at rename

ChangeSet
  1.2119.434.1 06/04/18 08:43:13 petr@mysql.com +1 -0
  fix for Bug#18848  "SIGHUP crashes the server" (v2)

  sql/log.cc
    1.199.5.2 06/04/18 08:43:01 petr@mysql.com +27 -11
    check whether log tables were initialized, before trying to
    flush them during sighup processing. Then use logger THD
    for flush.

ChangeSet
  1.2119.433.1 06/04/18 00:30:55 elliot@mysql.com +1 -0
  BUG#19158 Fixing rpl_row_log_innodb test for pushbuild.

  mysql-test/extra/rpl_tests/rpl_log.test
    1.33 06/04/18 00:30:50 elliot@mysql.com +5 -0
    Sleep to avoid race condition on pushbuild test machine

ChangeSet
  1.2119.422.20 06/04/17 20:01:07 jimw@mysql.com +3 -0
  Delete unused (and unmaintained) scripts.

  BitKeeper/deleted/.del-mysql_prepare_privilege_tables_for_5.sql~76ea3c82bdbbead4
    1.2 06/04/17 19:50:50 jimw@mysql.com +0 -0
    Delete: scripts/mysql_prepare_privilege_tables_for_5.sql

  BitKeeper/deleted/.del-mysqld_safe-watch.sh~37cbc9a97ffd2555
    1.6 06/04/17 19:50:44 jimw@mysql.com +0 -0
    Delete: scripts/mysqld_safe-watch.sh

  BitKeeper/deleted/.del-watchdog_mysqld~279cf39e994b36e2
    1.3 06/04/17 19:50:32 jimw@mysql.com +0 -0
    Delete: sql/watchdog_mysqld

ChangeSet
  1.2119.432.1 06/04/17 17:32:20 cmiller@zippy.(none) +2 -0
  Fixing a merge from a few days ago.
  
  Without a flush this test is nondeterministic for "row" binlog-format.

ChangeSet
  1.2119.431.2 06/04/17 13:05:19 brian@zim.(none) +7 -0
  UNIXWARE removal

ChangeSet
  1.2119.431.1 06/04/17 18:56:58 mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  BUG#18752
  Fixed forgotten merge fix

  mysql-test/r/partition.result
    1.36 06/04/17 18:56:54 mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -14
    Fixed forgotten merge fix

  mysql-test/t/innodb.test
    1.135.1.2 06/04/17 17:32:15 cmiller@zippy.(none) +1 -0
    Without a flush this test is nondeterministic for "row" binlog-format.

  mysql-test/r/innodb.result
    1.168.1.2 06/04/17 17:32:15 cmiller@zippy.(none) +4 -3
    Without a flush this test is nondeterministic for "row" binlog-format.

  mysys/my_pthread.c
    1.46 06/04/17 13:05:14 brian@zim.(none) +1 -4
    UNIXWare removal

  mysys/my_init.c
    1.48 06/04/17 13:05:14 brian@zim.(none) +0 -3
    UNIXWare removal

  include/my_pthread.h
    1.95 06/04/17 13:05:14 brian@zim.(none) +0 -62
    UNIXWare removal

  include/my_no_pthread.h
    1.9 06/04/17 13:05:13 brian@zim.(none) +0 -4
    UNIXWare removal

  include/my_global.h
    1.130 06/04/17 13:05:13 brian@zim.(none) +0 -5
    UNIXWare removal.

  include/m_string.h
    1.41 06/04/17 13:05:13 brian@zim.(none) +0 -13
    UNIXWare removal

  extra/resolveip.c
    1.25 06/04/17 13:05:13 brian@zim.(none) +1 -1
    UNIXWARE removal

ChangeSet
  1.2119.430.1 06/04/17 20:24:41 pekka@mysql.com +4 -0
  ndb - bug#16796

ChangeSet
  1.2119.429.1 06/04/17 09:38:50 jimw@mysql.com +3 -0
  Bug #19059: Failure to get version information when running from source tree
  
    Fix the way that instance manager finds the version number of instances,
    so that it works properly when the executable name isn't the same as what
    the instance-manager launched, such as when wrapping a libtool-wrapped
    executable from the source tree.
  
    This removes the 'Ver ' reported in the version column output by
    'SHOW INSTANCE STATUS ...', but the format of this column is not
    documented (and is pretty free-form to begin with).

  sql/mysqld.cc
    1.534.11.1 06/04/17 09:38:45 jimw@mysql.com +4 -0
    Note that the instance manager relies on 'Ver' in mysqld --version

  server-tools/instance-manager/parse_output.cc
    1.19 06/04/17 09:38:45 jimw@mysql.com +3 -3
    Make parse_output_and_get_value() look at the whole line to find
    the word, instead of just at the beginning of each line.

  server-tools/instance-manager/instance_options.cc
    1.31 06/04/17 09:38:45 jimw@mysql.com +1 -1
    Look for 'Ver' to get version from running mysqld --version

  storage/ndb/src/ndbapi/NdbOperationSearch.cpp
    1.30 06/04/17 16:19:33 pekka@mysql.com +4 -0
    log partition id set/get

  storage/ndb/src/ndbapi/NdbBlob.cpp
    1.43 06/04/17 16:18:52 pekka@mysql.com +2 -0
    set part id from main table op (may not be complete fix)

  mysql-test/r/ndb_blob_partition.result
    1.1 06/04/17 16:17:18 pekka@mysql.com +104 -0

  mysql-test/r/ndb_blob_partition.result
    1.0 06/04/17 16:17:18 pekka@mysql.com +0 -0
    BitKeeper file /space/pekka/ndb/version/my51/mysql-test/r/ndb_blob_partition.result

  mysql-test/t/ndb_blob_partition.test
    1.1 06/04/17 16:17:07 pekka@mysql.com +93 -0

  mysql-test/t/ndb_blob_partition.test
    1.0 06/04/17 16:17:07 pekka@mysql.com +0 -0
    BitKeeper file /space/pekka/ndb/version/my51/mysql-test/t/ndb_blob_partition.test

ChangeSet
  1.1810.1563.3 06/04/17 16:46:56 gkodinov@mysql.com +2 -0
  BUG#17152: Wrong result with BINARY comparison on aliased column
  
    Testsuite added

  mysql-test/t/innodb.test
    1.118.3.1 06/04/17 16:46:51 gkodinov@mysql.com +34 -0
    BUG#17152: Wrong result with BINARY comparison on aliased column
    
      Testsuite added

  mysql-test/r/innodb.result
    1.145.3.1 06/04/17 16:46:51 gkodinov@mysql.com +35 -0
    BUG#17152: Wrong result with BINARY comparison on aliased column
    
      Testsuite added

ChangeSet
  1.1810.1563.2 06/04/17 15:36:25 bar@mysql.com +1 -0
  item_timefunc.cc:
    5.0 additional fix for b#18691
    Handle DECIMAL the same with INT and REAL.

  sql/item_timefunc.cc
    1.100.1.7 06/04/17 15:35:11 bar@mysql.com +1 -0
    5.0 additional fix for b#18691
    Handle DECIMAL the same with INT and REAL.

ChangeSet
  1.2119.428.1 06/04/17 11:49:20 bar@mysql.com +3 -0
  Bug#18170: XML: ExtractValue(): XPath expression can't use QNames (colon in names)
  
  Problem source:
  Qualified names (aka QName) didn't work as tag names and attribute names,
  because the parser lacked a real rule to scan QName, so it understood
  only non-qualified names without prefixes.
  
  Solution:
  New rule was added to check both "ident" and "ident:ident" sequences.

  sql/item_xmlfunc.cc
    1.12.1.2 06/04/17 11:49:04 bar@mysql.com +25 -1
    Adding real QName parser rule and using it in NodeTest rule.

  mysql-test/t/xml.test
    1.12.1.1 06/04/17 11:49:04 bar@mysql.com +8 -0
    Adding test case

  mysql-test/r/xml.result
    1.12.1.1 06/04/17 11:49:03 bar@mysql.com +9 -0
    Adding test case

ChangeSet
  1.2119.422.16 06/04/16 22:10:56 brian@zim.(none) +1 -0
  Found one piece I missed when I removed HAVE_mit (just broke on windows and I don't have windows locally). This I believe should fix it.

  include/my_global.h
    1.129 06/04/16 22:10:51 brian@zim.(none) +1 -1
    Fix from removing HAVE_MIT

ChangeSet
  1.2119.422.15 06/04/16 21:55:02 brian@zim.(none) +4 -0
  Fixed a few pieces around support for data directory. 

  sql/ha_archive.h
    1.42.1.1 06/04/16 21:54:57 brian@zim.(none) +4 -1
    Added real_path to share (will come in handy in later code)

  sql/ha_archive.cc
    1.85.1.1 06/04/16 21:54:57 brian@zim.(none) +70 -19
    Updated comments, added printable bits for support of "data directory"

  mysql-test/t/archive.test
    1.20 06/04/16 21:54:56 brian@zim.(none) +3 -0
    Added test for "data directory" support in archive. 

  mysql-test/r/archive.result
    1.20 06/04/16 21:54:56 brian@zim.(none) +7 -0
    Adding test case for data directory support in create table. 

ChangeSet
  1.1810.1457.77 06/04/16 17:17:36 cmiller@zippy.(none) +3 -0
  Only expand the empty string to the letters "NULL" if the column
  does not have "NOT NULL" attribute set.  Also, calculate the padding
  characters more safely, so that a negative number doesn't cause it to 
  print MAXINT-n spaces.

  mysql-test/t/mysql.test
    1.4.1.5 06/04/16 17:17:33 cmiller@zippy.(none) +5 -0
    Add test.

  mysql-test/r/mysql.result
    1.8 06/04/16 17:17:33 cmiller@zippy.(none) +12 -0
    Add test result.

  client/mysql.cc
    1.199.1.1 06/04/16 17:17:33 cmiller@zippy.(none) +10 -8
    Only expand the empty string to the letters "NULL" if the column
    does not have "NOT NULL" attribute set.  Also, calculate the padding
    characters more safely, so that a negative number doesn't cause it to 
    print MAXINT-n spaces.

ChangeSet
  1.2119.422.14 06/04/16 13:08:14 brian@zim.(none) +1 -0
  Adding back support for loadable engines. 

  sql/sql_plugin.cc
    1.17.1.1 06/04/16 13:08:09 brian@zim.(none) +10 -2
    Adding back in support for loadable engines. 

ChangeSet
  1.2119.427.1 06/04/16 14:38:52 petr@mysql.com +1 -0
  fix broken compile

  include/m_string.h
    1.40 06/04/16 14:38:46 petr@mysql.com +1 -1
    add missing bracket

ChangeSet
  1.2119.422.12 06/04/16 01:50:25 brian@zim.(none) +5 -0
  This completes the work done in 5.0 to remove mit_pthread support (most was pulled in 5.0, but there were some pieces left in the tree)

  mysys/my_thr_init.c
    1.34 06/04/16 01:50:20 brian@zim.(none) +2 -2
    Removal of mit_thread

  mysys/my_pthread.c
    1.45 06/04/16 01:50:20 brian@zim.(none) +2 -2
    Removal of mit_thread

  mysys/my_file.c
    1.3 06/04/16 01:50:20 brian@zim.(none) +1 -1
    mit_thread removal

  include/my_pthread.h
    1.94 06/04/16 01:50:20 brian@zim.(none) +1 -16
    mit_thread removal

  include/my_global.h
    1.128 06/04/16 01:50:20 brian@zim.(none) +1 -24
    mit_thread removal

ChangeSet
  1.2119.326.5 06/04/15 21:49:13 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +11 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  After review changes

  sql/table.cc
    1.211 06/04/15 21:49:08 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +8 -7
    Fixed upgrade code

  sql/sql_table.cc
    1.315 06/04/15 21:49:08 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +25 -54
    Lots of after review changes

  sql/sql_partition.cc
    1.63 06/04/15 21:49:07 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +42 -39
    Moved print_error to mysql server part

  sql/sql_base.cc
    1.315 06/04/15 21:49:07 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -5
    Interface changes

  sql/mysqld.cc
    1.534.1.8 06/04/15 21:49:07 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Moved close of DDL log until all user threads been closed

  sql/mysql_priv.h
    1.388.1.3 06/04/15 21:49:07 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +10 -11
    Fixed error injects
    Externalised Global DDL log mutex
    Some interface changes

  sql/ha_partition.h
    1.15 06/04/15 21:49:06 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Fixed interface to create_handler_files

  sql/ha_partition.cc
    1.43 06/04/15 21:49:06 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +12 -12
    Fixed interface to create_handler_files and made it two-stage for rename
    Removed print_error and now it's used by MySQL Server parts instead

  sql/ha_ndbcluster.h
    1.129 06/04/15 21:49:06 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Fixed interface to create_handler_files

  sql/ha_ndbcluster.cc
    1.291 06/04/15 21:49:06 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -2
    Fixed interface to create_handler_files

  mysql-test/r/ndb_partition_key.result
    1.16 06/04/15 21:49:05 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    Fixed result file

ChangeSet
  1.2119.422.11 06/04/15 18:17:32 brian@zim.(none) +31 -0
  Final patch to remove the last of the OS2 support. 

  vio/viossl.c
    1.30.1.1 06/04/15 18:17:26 brian@zim.(none) +2 -2
    OS2 removal

  vio/viosocket.c
    1.38 06/04/15 18:17:26 brian@zim.(none) +5 -9
    OS2 removal

  vio/vio.c
    1.26.1.1 06/04/15 18:17:26 brian@zim.(none) +2 -2
    OS2 removal

  storage/ndb/src/mgmsrv/main.cpp
    1.49 06/04/15 18:17:26 brian@zim.(none) +1 -1
    OS2 removal

  storage/ndb/src/mgmclient/main.cpp
    1.24 06/04/15 18:17:26 brian@zim.(none) +1 -1
    OS2 removal

  storage/myisam/myisamchk.c
    1.122 06/04/15 18:17:26 brian@zim.(none) +0 -4
    OS2 removal

  sql/sql_table.cc
    1.308.11.1 06/04/15 18:17:26 brian@zim.(none) +2 -10
    OS2 removal

  sql/sql_parse.cc
    1.538 06/04/15 18:17:26 brian@zim.(none) +3 -9
    OS2 removal

  sql/sql_load.cc
    1.97 06/04/15 18:17:26 brian@zim.(none) +1 -3
    OS2 removal

  sql/sql_insert.cc
    1.196.1.2 06/04/15 18:17:25 brian@zim.(none) +2 -2
    OS2 removal

  sql/sql_base.cc
    1.311.1.3 06/04/15 18:17:25 brian@zim.(none) +2 -2
    OS2 removal

  sql/slave.cc
    1.270 06/04/15 18:17:25 brian@zim.(none) +1 -1
    OS2 removal

  sql/repl_failsafe.cc
    1.64 06/04/15 18:17:25 brian@zim.(none) +1 -1
    OS2 removal

  sql/net_serv.cc
    1.89 06/04/15 18:17:25 brian@zim.(none) +5 -5
    OS2 removal

  sql/mysqld.cc
    1.534.10.1 06/04/15 18:17:25 brian@zim.(none) +12 -102
    OS2 removal

  sql/mysql_priv.h
    1.391 06/04/15 18:17:25 brian@zim.(none) +1 -5
    OS2 removal

  sql/my_lock.c
    1.10 06/04/15 18:17:25 brian@zim.(none) +1 -1
    OS2 removal

  sql/log_event.h
    1.133 06/04/15 18:17:25 brian@zim.(none) +0 -4
    OS2 removal

  sql/log.cc
    1.199.5.1 06/04/15 18:17:25 brian@zim.(none) +0 -4
    OS2 removal

  sql/hostname.cc
    1.35 06/04/15 18:17:25 brian@zim.(none) +1 -1
    OS2 removal

  sql/event_executor.cc
    1.43 06/04/15 18:17:25 brian@zim.(none) +1 -1
    OS2 removal

  sql-common/client.c
    1.95 06/04/15 18:17:25 brian@zim.(none) +4 -9
    OS2 removal

  libmysql/manager.c
    1.16 06/04/15 18:17:25 brian@zim.(none) +1 -3
    OS2 removal

  libmysql/libmysql.c
    1.250 06/04/15 18:17:25 brian@zim.(none) +1 -1
    OS2 removal

  libmysql/get_password.c
    1.15 06/04/15 18:17:24 brian@zim.(none) +2 -2
    OS2 removal

  libmysql/dll.c
    1.12 06/04/15 18:17:24 brian@zim.(none) +0 -23
    OS2 removal

  include/my_global.h
    1.127 06/04/15 18:17:24 brian@zim.(none) +0 -1
    Cleanup for have_mit

  include/m_string.h
    1.39 06/04/15 18:17:24 brian@zim.(none) +3 -3
    OS2 removal

  dbug/dbug.c
    1.21.1.5 06/04/15 18:17:24 brian@zim.(none) +1 -1
    OS2 removal

  client/mysql.cc
    1.201 06/04/15 18:17:24 brian@zim.(none) +9 -41
    OS2 removal

  client/client_priv.h
    1.55 06/04/15 18:17:24 brian@zim.(none) +0 -2
    OS2 removal

ChangeSet
  1.2119.418.3 06/04/15 08:49:00 brian@zim.(none) +31 -0
  Another long patch to remove the rest of the OS2 support. 

  storage/myisam/myisamchk.c
    1.121 06/04/15 08:48:54 brian@zim.(none) +1 -5
    OS2 removal

  mysys/thr_alarm.c
    1.50 06/04/15 08:48:54 brian@zim.(none) +1 -150
    OS2 removal 

  mysys/my_thr_init.c
    1.33 06/04/15 08:48:54 brian@zim.(none) +3 -3
    OS2 removal

  mysys/my_static.c
    1.18 06/04/15 08:48:54 brian@zim.(none) +1 -1
    OS2 removal

  mysys/my_sleep.c
    1.8 06/04/15 08:48:54 brian@zim.(none) +0 -2
    OS2 removal

  mysys/my_redel.c
    1.11 06/04/15 08:48:54 brian@zim.(none) +1 -1
    OS2 removal

  mysys/my_pthread.c
    1.44 06/04/15 08:48:54 brian@zim.(none) +1 -1
    OS2 removal

  mysys/my_open.c
    1.26 06/04/15 08:48:54 brian@zim.(none) +2 -2
    OS2 removal

  mysys/my_mkdir.c
    1.8 06/04/15 08:48:54 brian@zim.(none) +1 -1
    OS2 removal

  mysys/my_lock.c
    1.13 06/04/15 08:48:54 brian@zim.(none) +0 -10
    OS2 removal

  mysys/my_lib.c
    1.23.1.1 06/04/15 08:48:54 brian@zim.(none) +0 -6
    OS2 removal

  mysys/my_init.c
    1.47 06/04/15 08:48:54 brian@zim.(none) +1 -1
    OS2 removal

  mysys/my_getwd.c
    1.18 06/04/15 08:48:54 brian@zim.(none) +2 -15
    OS2 removal

  mysys/my_file.c
    1.2 06/04/15 08:48:54 brian@zim.(none) +0 -19
    OS2 removal

  mysys/my_dup.c
    1.5 06/04/15 08:48:54 brian@zim.(none) +1 -1
    OS2 removal

  mysys/my_create.c
    1.14 06/04/15 08:48:54 brian@zim.(none) +3 -3
    OS2 removal

  mysys/my_copy.c
    1.15 06/04/15 08:48:54 brian@zim.(none) +1 -1
    OS2 removal

  mysys/my_clock.c
    1.9 06/04/15 08:48:54 brian@zim.(none) +2 -2
    OS2 removal

  mysys/my_access.c
    1.7.1.1 06/04/15 08:48:54 brian@zim.(none) +1 -9
    OS2 removal

  mysys/mf_tempfile.c
    1.25 06/04/15 08:48:54 brian@zim.(none) +3 -12
    OS2 removal

  mysys/mf_tempdir.c
    1.7 06/04/15 08:48:54 brian@zim.(none) +2 -2
    OS2 removal

  mysys/mf_path.c
    1.10 06/04/15 08:48:54 brian@zim.(none) +1 -1
    OS2 removal 

  mysys/default.c
    1.80 06/04/15 08:48:54 brian@zim.(none) +1 -5
    OS2 removal

  include/thr_alarm.h
    1.18 06/04/15 08:48:54 brian@zim.(none) +0 -8
    OS2 removal

  include/my_pthread.h
    1.93 06/04/15 08:48:53 brian@zim.(none) +3 -42
    OS2 removal

  include/my_no_pthread.h
    1.8 06/04/15 08:48:53 brian@zim.(none) +1 -1
    OS2 removal

  include/my_net.h
    1.16 06/04/15 08:48:53 brian@zim.(none) +0 -6
    OS2 removal

  include/my_global.h
    1.126 06/04/15 08:48:53 brian@zim.(none) +3 -24
    OS2 removal

  include/m_string.h
    1.38 06/04/15 08:48:53 brian@zim.(none) +2 -2
    OS2 removal

  include/errmsg.h
    1.28 06/04/15 08:48:53 brian@zim.(none) +1 -3
    Removing OS2 stuff

  include/config-win.h
    1.86 06/04/15 08:48:53 brian@zim.(none) +2 -2
    Removing OS2 stuff

  BitKeeper/deleted/.del-CounterViewer.java~e83264ff6a5be97
    1.4 06/04/14 11:13:10 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/src/counterviewer/CounterViewer.java

  BitKeeper/deleted/.del-Makefile~62f516a16a0cf773
    1.4 06/04/14 11:13:09 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/select_all/Makefile

  BitKeeper/deleted/.del-Makefile~3d1cd223b42a8fa0
    1.4 06/04/14 11:13:09 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/select_count/Makefile

  BitKeeper/deleted/.del-Makefile~b15469c2fbde2dec
    1.4 06/04/14 11:13:08 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbsql/Makefile

  BitKeeper/deleted/.del-SocketUNIX.pm~9ffab2ada7f61530
    1.4 06/04/14 11:13:07 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketUNIX.pm

  BitKeeper/deleted/.del-SocketINET.pm~db8a45b1360b69f2
    1.4 06/04/14 11:13:06 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketINET.pm

  BitKeeper/deleted/.del-Socket.pm~371ccd6c5a818fa0
    1.4 06/04/14 11:13:05 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Socket.pm

  BitKeeper/deleted/.del-Log.pm~e0da9468a6f9213a
    1.4 06/04/14 11:13:05 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Log.pm

  BitKeeper/deleted/.del-Lock.pm~366e56786358b3d8
    1.4 06/04/14 11:13:04 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Lock.pm

  BitKeeper/deleted/.del-IO.pm~6c6a63ce63fe2ee5
    1.4 06/04/14 11:13:03 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/IO.pm

  BitKeeper/deleted/.del-File.pm~48da8e977f39bf7
    1.4 06/04/14 11:13:03 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/File.pm

  BitKeeper/deleted/.del-Event.pm~f445c1c094f57cf
    1.4 06/04/14 11:13:02 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Event.pm

  BitKeeper/deleted/.del-Dir.pm~4cbe8dd8c57149a7
    1.4 06/04/14 11:13:01 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Dir.pm

  BitKeeper/deleted/.del-Util.pm~9be64f1195ec502d
    1.4 06/04/14 11:13:00 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util.pm

  BitKeeper/deleted/.del-Base.pm~f39906f304e8a49
    1.4 06/04/14 11:13:00 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Base.pm

  BitKeeper/deleted/.del-Run.pm~9b414f2b4b76a4da
    1.4 06/04/14 11:12:59 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run.pm

  BitKeeper/deleted/.del-Node.pm~339139ded5fcf795
    1.4 06/04/14 11:12:58 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Node.pm

  BitKeeper/deleted/.del-Net.pm~425c84165071d5f6
    1.4 06/04/14 11:12:58 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net.pm

  BitKeeper/deleted/.del-Env.pm~a343841fae6d0514
    1.4 06/04/14 11:12:57 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Env.pm

  BitKeeper/deleted/.del-Database.pm~ec533cd5dd6a54a2
    1.4 06/04/14 11:12:56 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Database.pm

  BitKeeper/deleted/.del-Base.pm~dd382c9eec2c38b1
    1.4 06/04/14 11:12:56 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Base.pm

  BitKeeper/deleted/.del-ServerUNIX.pm~ad3e25435fceb8d0
    1.4 06/04/14 11:12:55 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerUNIX.pm

  BitKeeper/deleted/.del-ServerINET.pm~fc72d28fedd17795
    1.4 06/04/14 11:12:54 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerINET.pm

  BitKeeper/deleted/.del-Server.pm~70208c964371fd4d
    1.4 06/04/14 11:12:53 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Server.pm

  BitKeeper/deleted/.del-NodeMgmt.pm~5123fbffcfce73cb
    1.4 06/04/14 11:12:52 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeMgmt.pm

  BitKeeper/deleted/.del-NodeDb.pm~9e3055381da679ce
    1.4 06/04/14 11:12:52 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeDb.pm

  BitKeeper/deleted/.del-NodeApi.pm~3abf1d7bc947d3d0
    1.4 06/04/14 11:12:51 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeApi.pm

  BitKeeper/deleted/.del-Node.pm~276106bf4000fe2b
    1.4 06/04/14 11:12:50 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Node.pm

  BitKeeper/deleted/.del-Env.pm~ffeca4ab253818c3
    1.4 06/04/14 11:12:50 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Env.pm

  BitKeeper/deleted/.del-Database.pm~cc02e455b02c557
    1.4 06/04/14 11:12:49 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Database.pm

  BitKeeper/deleted/.del-Config.pm~24456d4beba19604
    1.4 06/04/14 11:12:48 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Config.pm

  BitKeeper/deleted/.del-Command.pm~a20dff1bfd06ea7a
    1.4 06/04/14 11:12:48 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Command.pm

  BitKeeper/deleted/.del-Client.pm~45adb527c5cfdaf6
    1.4 06/04/14 11:12:47 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Client.pm

  BitKeeper/deleted/.del-ndbrun~5db549d7436ac81b
    1.4 06/04/14 11:12:46 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/ndbrun

  BitKeeper/deleted/.del-Base.pm~50a6f0d38fa1a57c
    1.4 06/04/14 11:12:46 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Base.pm

  BitKeeper/deleted/.del-ndbnetd.pl~e44f1cfe7e8bbe14
    1.4 06/04/14 11:12:45 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/ndbnetd.pl

  BitKeeper/deleted/.del-ndbnet.pl~8f8f1b18f0458269
    1.4 06/04/14 11:12:44 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/ndbnet.pl

  BitKeeper/deleted/.del-Makefile.PL~81be90388548652f
    1.4 06/04/14 11:12:44 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/ndbnet/Makefile.PL

  BitKeeper/deleted/.del-Makefile~b95bfed632918157
    1.4 06/04/14 11:12:43 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/list_tables/Makefile

  BitKeeper/deleted/.del-Makefile~62140e0b68eb516c
    1.4 06/04/14 11:12:43 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/drop_tab/Makefile

  BitKeeper/deleted/.del-Makefile~1b4547a47a5607
    1.4 06/04/14 11:12:42 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/drop_index/Makefile

  BitKeeper/deleted/.del-Makefile~b25e897a378dd139
    1.4 06/04/14 11:12:41 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/delete_all/Makefile

  BitKeeper/deleted/.del-Makefile~57f187037bf9e65d
    1.4 06/04/14 11:12:41 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/desc/Makefile

  BitKeeper/deleted/.del-Makefile~77a4d0f4c11f13b5
    1.4 06/04/14 11:12:40 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/create_index/Makefile

  BitKeeper/deleted/.del-Makefile~6dbecfdfc2878bb3
    1.4 06/04/14 11:12:39 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/cpcc/Makefile

  BitKeeper/deleted/.del-Makefile~65110e0a5cb381
    1.4 06/04/14 11:12:39 jimw@mysql.com +0 -0
    Delete: storage/ndb/tools/old_dirs/copy_tab/Makefile

  BitKeeper/deleted/.del-waiter.cpp~b188e4bfddf2cf98
    1.6 06/04/14 11:12:14 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/tools/old_dirs/waiter/waiter.cpp

  BitKeeper/deleted/.del-Makefile~f1d6329f42d0922d
    1.4 06/04/14 11:12:13 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/tools/old_dirs/verify_index/Makefile

  BitKeeper/deleted/.del-Makefile~b9e514baf06145d5
    1.4 06/04/14 11:12:13 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/tools/old_dirs/restart/Makefile

  BitKeeper/deleted/.del-Makefile~2f05dedf982dcd9
    1.4 06/04/14 11:12:13 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/tools/old_dirs/transproxy/Makefile

  BitKeeper/deleted/.del-Makefile~2a7bcc03f802d4f
    1.4 06/04/14 11:12:13 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/tools/old_dirs/hugoScanUpdate/Makefile

  BitKeeper/deleted/.del-Makefile~e918384f46b2aef0
    1.4 06/04/14 11:12:12 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/tools/old_dirs/hugoPkUpdate/Makefile

  BitKeeper/deleted/.del-Makefile~a6a5bd72a2311773
    1.4 06/04/14 11:12:12 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/tools/old_dirs/hugoScanRead/Makefile

  BitKeeper/deleted/.del-Makefile~89557cc224193d4
    1.4 06/04/14 11:12:12 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/tools/old_dirs/hugoPkReadRecord/Makefile

  BitKeeper/deleted/.del-Makefile~3ae1e42a4d7b1d6a
    1.4 06/04/14 11:12:12 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/tools/old_dirs/hugoPkRead/Makefile

  BitKeeper/deleted/.del-Makefile~f90065821a932b3f
    1.4 06/04/14 11:12:11 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/tools/old_dirs/hugoFill/Makefile

  BitKeeper/deleted/.del-Makefile~c2b94348137b633a
    1.4 06/04/14 11:12:11 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/tools/old_dirs/hugoPkDelete/Makefile

  BitKeeper/deleted/.del-Makefile~79e81dfed9112c7
    1.4 06/04/14 11:12:11 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/tools/old_dirs/hugoLoad/Makefile

  BitKeeper/deleted/.del-Makefile~54e6a2262bbe162a
    1.4 06/04/14 11:12:11 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/tools/old_dirs/hugoLockRecords/Makefile

  BitKeeper/deleted/.del-Makefile~62207a82b90e653
    1.4 06/04/14 11:12:10 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/tools/old_dirs/hugoCalculator/Makefile

  BitKeeper/deleted/.del-NdbTick.c~aa6385567216509d
    1.4 06/04/14 11:11:46 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/win32/NdbTick.c

  BitKeeper/deleted/.del-NdbThread.c~2fe1fa5f47801772
    1.6 06/04/14 11:11:46 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/win32/NdbThread.c

  BitKeeper/deleted/.del-NdbTCP.c~b09cdcbef3ea2c57
    1.4 06/04/14 11:11:46 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/win32/NdbTCP.c

  BitKeeper/deleted/.del-NdbSleep.c~b643ea3e7103eb62
    1.4 06/04/14 11:11:45 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/win32/NdbSleep.c

  BitKeeper/deleted/.del-NdbMutex.c~768131269bccca10
    1.6 06/04/14 11:11:45 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/win32/NdbMutex.c

  BitKeeper/deleted/.del-NdbMem.c~6285b159985d46da
    1.6 06/04/14 11:11:45 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/win32/NdbMem.c

  BitKeeper/deleted/.del-NdbHost.c~2c29816c77396d7b
    1.4 06/04/14 11:11:45 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/win32/NdbHost.c

  BitKeeper/deleted/.del-NdbEnv.c~207f9ce9754c9e8a
    1.4 06/04/14 11:11:44 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/win32/NdbEnv.c

  BitKeeper/deleted/.del-NdbDaemon.c~3b8101f376b28df
    1.5 06/04/14 11:11:44 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/win32/NdbDaemon.c

  BitKeeper/deleted/.del-NdbCondition.c~ad83464328ab37af
    1.6 06/04/14 11:11:44 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/win32/NdbCondition.c

  BitKeeper/deleted/.del-Makefile~d04b4a185b6e1071
    1.4 06/04/14 11:11:44 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/test/Makefile

  BitKeeper/deleted/.del-Makefile~aa96712c481bc8e
    1.4 06/04/14 11:11:44 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/win32/Makefile

  BitKeeper/deleted/.del-NdbTick.c~b76feba2cf1493d1
    1.4 06/04/14 11:11:43 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbTick.c

  BitKeeper/deleted/.del-NdbThread.c~fe71a67b5c3a4724
    1.6 06/04/14 11:11:43 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbThread.c

  BitKeeper/deleted/.del-NdbTCP.c~1e9f416992352f6d
    1.4 06/04/14 11:11:43 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbTCP.c

  BitKeeper/deleted/.del-NdbSleep.c~b88fbc5b140de10d
    1.4 06/04/14 11:11:42 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbSleep.c

  BitKeeper/deleted/.del-NdbOut.cpp~8caa99a0d729540c
    1.6 06/04/14 11:11:42 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbOut.cpp

  BitKeeper/deleted/.del-NdbMutex.c~f4bdd19be08b84ab
    1.6 06/04/14 11:11:42 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbMutex.c

  BitKeeper/deleted/.del-NdbMem_SoftOse.cpp~9c61e311ec168d44
    1.4 06/04/14 11:11:42 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbMem_SoftOse.cpp

  BitKeeper/deleted/.del-NdbMem.c~6c2b317c1ce230ab
    1.6 06/04/14 11:11:41 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbMem.c

  BitKeeper/deleted/.del-NdbHost.c~cf18d6b3c825180c
    1.4 06/04/14 11:11:41 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbHost.c

  BitKeeper/deleted/.del-NdbEnv.c~bb6fe7572d45288a
    1.4 06/04/14 11:11:41 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbEnv.c

  BitKeeper/deleted/.del-NdbConditionOSE.h~455dd2c29c2e6344
    1.4 06/04/14 11:11:41 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbConditionOSE.h

  BitKeeper/deleted/.del-NdbCondition.c~ee56562abdd718cf
    1.6 06/04/14 11:11:41 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbCondition.c

  BitKeeper/deleted/.del-Makefile~dcc8c444bf25ce41
    1.4 06/04/14 11:11:40 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/memtest/Makefile

  BitKeeper/deleted/.del-Makefile~b50f189dfbc87d8a
    1.4 06/04/14 11:11:40 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/memtest/munmaptest/Makefile

  BitKeeper/deleted/.del-Makefile~ae168985806f34e8
    1.4 06/04/14 11:11:40 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/common/portlib/old_dirs/ose/Makefile

  BitKeeper/deleted/.del-vcdrfunc.h~85803875180684cd
    1.4 06/04/14 11:11:03 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/vw_test/vcdrfunc.h

  BitKeeper/deleted/.del-utv.h~f64af026b9705ebb
    1.4 06/04/14 11:11:03 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/vw_test/utv.h

  BitKeeper/deleted/.del-client_start~1ecfaed180a75edd
    1.4 06/04/14 11:11:03 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/vw_test/script/client_start

  BitKeeper/deleted/.del-bcd.h~81fbfcc1530534da
    1.6 06/04/14 11:11:02 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/vw_test/bcd.h

  BitKeeper/deleted/.del-Makefile~ddc74468722656bb
    1.4 06/04/14 11:11:02 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/test_event/Makefile

  BitKeeper/deleted/.del-Makefile~91dad370d76274be
    1.4 06/04/14 11:11:02 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/vw_test/Makefile

  BitKeeper/deleted/.del-Makefile~2e74033e6077aa3a
    1.4 06/04/14 11:11:02 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testTransactions/Makefile

  BitKeeper/deleted/.del-Makefile~f5c05697b5c6a926
    1.4 06/04/14 11:11:01 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testTimeout/Makefile

  BitKeeper/deleted/.del-Makefile~c6f264b16640c32b
    1.4 06/04/14 11:11:01 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testScan/Makefile

  BitKeeper/deleted/.del-Makefile~b3c2cd57699a958c
    1.4 06/04/14 11:11:01 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testSystemRestart/Makefile

  BitKeeper/deleted/.del-Makefile~8ec0ddece8d8bd18
    1.4 06/04/14 11:11:01 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testScanInterpreter/Makefile

  BitKeeper/deleted/.del-times.txt~76ffa76ca8708af1
    1.4 06/04/14 11:11:00 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testOIBasic/times.txt

  BitKeeper/deleted/.del-Makefile~c9fac39964fe2f77
    1.4 06/04/14 11:11:00 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testOperations/Makefile

  BitKeeper/deleted/.del-Makefile~3e916b320b0dc88
    1.4 06/04/14 11:11:00 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testOrderedIndex/Makefile

  BitKeeper/deleted/.del-Makefile~3a1d081f812432e3
    1.4 06/04/14 11:11:00 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testRestartGci/Makefile

  BitKeeper/deleted/.del-Makefile~b90fa88b1071a3f3
    1.4 06/04/14 11:10:59 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testMgm/Makefile

  BitKeeper/deleted/.del-Makefile~b76c5fcf57c53a58
    1.4 06/04/14 11:10:59 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testOIBasic/Makefile

  BitKeeper/deleted/.del-Makefile~79ba0e5994952ae9
    1.4 06/04/14 11:10:59 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testNdbApi/Makefile

  BitKeeper/deleted/.del-Makefile~664fcd5e178e659a
    1.4 06/04/14 11:10:59 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testNodeRestart/Makefile

  BitKeeper/deleted/.del-Makefile~4da89995b201a972
    1.4 06/04/14 11:10:58 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testInterpreter/Makefile

  BitKeeper/deleted/.del-Makefile~348a4f3067115b99
    1.4 06/04/14 11:10:58 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testIndex/Makefile

  BitKeeper/deleted/.del-Makefile~1e91adbf308b09
    1.6 06/04/14 11:10:58 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testGrep/verify/Makefile

  BitKeeper/deleted/.del-Makefile~13237b5015038e7b
    1.6 06/04/14 11:10:58 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testGrep/Makefile

  BitKeeper/deleted/.del-Makefile~c72222538e5e4e48
    1.4 06/04/14 11:10:57 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testBlobs/Makefile

  BitKeeper/deleted/.del-Makefile~7b08d94bc77f36b5
    1.4 06/04/14 11:10:57 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testDict/Makefile

  BitKeeper/deleted/.del-Makefile~11a681d847711b20
    1.4 06/04/14 11:10:57 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testDataBuffers/Makefile

  BitKeeper/deleted/.del-readme~2bb11c8fe8e713de
    1.4 06/04/14 11:10:56 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/telco/readme

  BitKeeper/deleted/.del-Makefile~a8998c89d7ad17d0
    1.4 06/04/14 11:10:56 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/telco/Makefile

  BitKeeper/deleted/.del-Makefile~8f8a72ead5c0dcbe
    1.6 06/04/14 11:10:56 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testBackup/Makefile

  BitKeeper/deleted/.del-Makefile~7246dc45283fec4f
    1.4 06/04/14 11:10:56 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/testBasic/Makefile

  BitKeeper/deleted/.del-Makefile~edc1824919a8e593
    1.4 06/04/14 11:10:55 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/ronja/Makefile

  BitKeeper/deleted/.del-Makefile~d19ef6b3a02430e7
    1.4 06/04/14 11:10:55 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/restarts/Makefile

  BitKeeper/deleted/.del-Makefile~2fdd0e2bfef9eab7
    1.4 06/04/14 11:10:55 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/ronja/benchronja/Makefile

  BitKeeper/deleted/.del-Makefile~23f3806c8505ea8f
    1.4 06/04/14 11:10:55 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/ronja/initronja/Makefile

  BitKeeper/deleted/.del-userTransaction.c~f50661b4f54b0bdd
    1.6 06/04/14 11:10:54 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userTransaction.c

  BitKeeper/deleted/.del-userInterface.c~92a20032f7d1e91
    1.6 06/04/14 11:10:54 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userInterface.c

  BitKeeper/deleted/.del-Makefile~c4a8d15a64d73ee8
    1.4 06/04/14 11:10:54 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/restarter/Makefile

  BitKeeper/deleted/.del-Makefile~6a739ef75a821406
    1.4 06/04/14 11:10:54 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/restarter2/Makefile

  BitKeeper/deleted/.del-userTransaction.c~438012ecc761b776
    1.6 06/04/14 11:10:53 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userTransaction.c

  BitKeeper/deleted/.del-userInterface.cpp~82ee612ab14b3d48
    1.8 06/04/14 11:10:53 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userInterface.cpp

  BitKeeper/deleted/.del-userHandle.h~3275bb415e1ca2c2
    1.4 06/04/14 11:10:53 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userHandle.h

  BitKeeper/deleted/.del-Makefile~b6d0cd4d8c9d339b
    1.4 06/04/14 11:10:53 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/Makefile

  BitKeeper/deleted/.del-userHandle.h~ec22dc7a7ed2f81b
    1.4 06/04/14 11:10:52 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userHandle.h

  BitKeeper/deleted/.del-ndb_error.hpp~24468bb7f20a0b41
    1.6 06/04/14 11:10:52 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/ndb_error.hpp

  BitKeeper/deleted/.del-macros.h~58097d584e29b5df
    1.6 06/04/14 11:10:52 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/macros.h

  BitKeeper/deleted/.del-localDbPrepare.c~33a2c46afc8fac9a
    1.6 06/04/14 11:10:52 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/localDbPrepare.c

  BitKeeper/deleted/.del-mainPopulate.c~37def9a44980b8ec
    1.6 06/04/14 11:10:51 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/mainPopulate.c

  BitKeeper/deleted/.del-dbPopulate.h~229a894b59d4da73
    1.4 06/04/14 11:10:51 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.h

  BitKeeper/deleted/.del-dbPopulate.c~5dcff1c99783d83b
    1.6 06/04/14 11:10:51 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.c

  BitKeeper/deleted/.del-Makefile~548d94b487507bbf
    1.4 06/04/14 11:10:51 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/Makefile

  BitKeeper/deleted/.del-userInterface.h~1f76ad2f28b283fd
    1.4 06/04/14 11:10:50 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/include/userInterface.h

  BitKeeper/deleted/.del-testData.h~696038ea2623a90b
    1.4 06/04/14 11:10:50 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/include/testData.h

  BitKeeper/deleted/.del-Makefile~c3c3d76f731f62
    1.4 06/04/14 11:10:50 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/Makefile

  BitKeeper/deleted/.del-makevars.sparc~42a7f929ba44ea5
    1.4 06/04/14 11:10:49 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.sparc

  BitKeeper/deleted/.del-mainGenerator.c~2d1c8016f72b2517
    1.6 06/04/14 11:10:49 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/mainGenerator.c

  BitKeeper/deleted/.del-dbGenerator.h~e1aaa6725999d458
    1.4 06/04/14 11:10:49 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.h

  BitKeeper/deleted/.del-dbGenerator.c~7509c19f70cad0bf
    1.6 06/04/14 11:10:49 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.c

  BitKeeper/deleted/.del-Makefile~e5ecf4cfa15f5316
    1.4 06/04/14 11:10:49 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/Makefile

  BitKeeper/deleted/.del-makevars.linux~9a7c7e0df35184fa
    1.4 06/04/14 11:10:48 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.linux

  BitKeeper/deleted/.del-async-lmc-bench.sh~40ca1b63e69d2bdd
    1.4 06/04/14 11:10:48 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench.sh

  BitKeeper/deleted/.del-README~3c1d85ad9efb4a23
    1.4 06/04/14 11:10:48 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/README

  BitKeeper/deleted/.del-Makefile~a3e9f0384cf8455d
    1.4 06/04/14 11:10:48 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/Makefile

  BitKeeper/deleted/.del-async-lmc-bench-p10.sh~45cfc4a130b43f6a
    1.4 06/04/14 11:10:47 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-p10.sh

  BitKeeper/deleted/.del-async-lmc-bench-l.sh~9b204c8488dfdb86
    1.4 06/04/14 11:10:47 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l.sh

  BitKeeper/deleted/.del-async-lmc-bench-l-p10.sh~8f06283d361eec9e
    1.4 06/04/14 11:10:47 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l-p10.sh

  BitKeeper/deleted/.del-Makefile~28e0b82e1322e47
    1.4 06/04/14 11:10:47 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/Makefile

  BitKeeper/deleted/.del-testDefinitions.h~f18a4553579a3725
    1.6 06/04/14 11:10:46 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/include/testDefinitions.h

  BitKeeper/deleted/.del-ndb_schema.hpp~de9c21185d6bfe4e
    1.4 06/04/14 11:10:46 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/include/ndb_schema.hpp

  BitKeeper/deleted/.del-.empty~f804b62cd167f0b3
    1.4 06/04/14 11:10:46 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/bin/.empty

  BitKeeper/deleted/.del-.empty~9401b7f68791202e
    1.4 06/04/14 11:10:46 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/lib/.empty

  BitKeeper/deleted/.del-userInterface.h~49139f029bbdaabc
    1.4 06/04/14 11:10:45 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/userInterface.h

  BitKeeper/deleted/.del-ndb_error.hpp~45a2fef922beae3
    1.6 06/04/14 11:10:45 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/ndb_error.hpp

  BitKeeper/deleted/.del-macros.h~742871fab0681964
    1.6 06/04/14 11:10:45 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/macros.h

  BitKeeper/deleted/.del-Makefile~16dd9625cf816bed
    1.4 06/04/14 11:10:45 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/Makefile

  BitKeeper/deleted/.del-testData.h~898b71d7c639319e
    1.4 06/04/14 11:10:44 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/testData.h

  BitKeeper/deleted/.del-dbGenerator.h~63f1aeb98260bcb7
    1.4 06/04/14 11:10:44 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/dbGenerator.h

  BitKeeper/deleted/.del-Makefile~fe3f7192bcd1e342
    1.4 06/04/14 11:10:44 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/generator/Makefile

  BitKeeper/deleted/.del-Makefile~607887f555e1a07f
    1.4 06/04/14 11:10:44 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/Makefile

  BitKeeper/deleted/.del-Makefile~b77f2b2aa6db29a7
    1.4 06/04/14 11:10:43 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/Makefile

  BitKeeper/deleted/.del-Makefile~b384a346d7cc0f3c
    1.4 06/04/14 11:10:43 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/interpreterInTup/Makefile

  BitKeeper/deleted/.del-Makefile~837866d85a01b2c
    1.4 06/04/14 11:10:43 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/indexTest/Makefile

  BitKeeper/deleted/.del-Makefile~7cd666ff39dc1c5d
    1.4 06/04/14 11:10:43 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/indexTest2/Makefile

  BitKeeper/deleted/.del-Makefile~d280c4556dcab9cd
    1.4 06/04/14 11:10:42 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/flexTimedAsynch/Makefile

  BitKeeper/deleted/.del-Makefile~d254d59f274b1d3
    1.4 06/04/14 11:10:42 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/flex_bench_mysql/Makefile

  BitKeeper/deleted/.del-README~a6f5f72344539aae
    1.4 06/04/14 11:10:41 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/flexScan/README

  BitKeeper/deleted/.del-Makefile~d36727b854d37c9
    1.4 06/04/14 11:10:41 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/flexScan/Makefile

  BitKeeper/deleted/.del-Makefile~c05a674b968916ec
    1.5 06/04/14 11:10:41 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/flexTT/Makefile

  BitKeeper/deleted/.del-ndbplot.pl~ef4de5b461b880c1
    1.4 06/04/14 11:10:40 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/flexBench/ndbplot.pl

  BitKeeper/deleted/.del-README~d85a7f1125dc7a50
    1.4 06/04/14 11:10:40 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/flexHammer/README

  BitKeeper/deleted/.del-Makefile~99efd87dd2a67e6
    1.4 06/04/14 11:10:40 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/flexHammer/Makefile

  BitKeeper/deleted/.del-Makefile.am~ae6c03d81bf83c09
    1.4 06/04/14 11:10:40 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/flexBench/Makefile.am

  BitKeeper/deleted/.del-Makefile~e4f93944b8c44f09
    1.4 06/04/14 11:10:39 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/drop_all_tabs/Makefile

  BitKeeper/deleted/.del-Makefile~8ede26305d647424
    1.4 06/04/14 11:10:39 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/create_all_tabs/Makefile

  BitKeeper/deleted/.del-Makefile~1bcf05f0a26d7d6f
    1.4 06/04/14 11:10:39 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/create_tab/Makefile

  BitKeeper/deleted/.del-Makefile~15b0005e7dc1fbf8
    1.5 06/04/14 11:10:39 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/flexAsynch/Makefile

  BitKeeper/deleted/.del-VerifyNdbApi.hpp~f417f78f7cd05935
    1.4 06/04/14 11:10:38 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/acid2/VerifyNdbApi.hpp

  BitKeeper/deleted/.del-TraceNdbApi.hpp~7a7f0ae5b70358bc
    1.4 06/04/14 11:10:38 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/acid2/TraceNdbApi.hpp

  BitKeeper/deleted/.del-Makefile~d86129c4e794eaaf
    1.4 06/04/14 11:10:38 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/basicAsynch/Makefile

  BitKeeper/deleted/.del-Makefile~53e91df162e177a4
    1.4 06/04/14 11:10:38 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/bulk_copy/Makefile

  BitKeeper/deleted/.del-Makefile~5823323f9308952b
    1.4 06/04/14 11:10:37 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/acid/Makefile

  BitKeeper/deleted/.del-Makefile~4cef97177c0cd8d1
    1.4 06/04/14 11:10:37 jimw@mysql.com +0 -0
    Delete: storage/ndb/test/ndbapi/old_dirs/acid2/Makefile

  BitKeeper/deleted/.del-TransSSSubscriptions.cpp~6bc55e474f33e023
    1.4 06/04/14 11:08:25 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/transfer/TransSSSubscriptions.cpp

  BitKeeper/deleted/.del-TransSS.hpp~7718b5e4ce9a4007
    1.7 06/04/14 11:08:25 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/transfer/TransSS.hpp

  BitKeeper/deleted/.del-TransSS.cpp~8f12a062b240eecf
    1.8 06/04/14 11:08:25 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/transfer/TransSS.cpp

  BitKeeper/deleted/.del-TransPS.hpp~846b26eaa80632a1
    1.7 06/04/14 11:08:25 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/transfer/TransPS.hpp

  BitKeeper/deleted/.del-TransPS.cpp~7a88ca746987ac10
    1.8 06/04/14 11:08:24 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/transfer/TransPS.cpp

  BitKeeper/deleted/.del-NodeGroupInfo.hpp~7fd3b74f4b59a503
    1.6 06/04/14 11:08:24 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/storage/NodeGroupInfo.hpp

  BitKeeper/deleted/.del-NodeGroupInfo.cpp~b1130e3c42777658
    1.4 06/04/14 11:08:24 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/storage/NodeGroupInfo.cpp

  BitKeeper/deleted/.del-Makefile~6b43df78ea480db1
    1.4 06/04/14 11:08:24 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/transfer/Makefile

  BitKeeper/deleted/.del-NodeGroup.hpp~3fcddc2da5d10e45
    1.4 06/04/14 11:08:23 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/storage/NodeGroup.hpp

  BitKeeper/deleted/.del-NodeGroup.cpp~adebbefb11cd1670
    1.4 06/04/14 11:08:23 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/storage/NodeGroup.cpp

  BitKeeper/deleted/.del-NodeConnectInfo.hpp~35a7682fd9dba464
    1.4 06/04/14 11:08:23 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/storage/NodeConnectInfo.hpp

  BitKeeper/deleted/.del-Makefile~a955d34726662aba
    1.4 06/04/14 11:08:23 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/storage/Makefile

  BitKeeper/deleted/.del-LogRecord.hpp~11644fe7c5f5d36
    1.6 06/04/14 11:08:22 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/storage/LogRecord.hpp

  BitKeeper/deleted/.del-GCIPage.hpp~4197e2278326515e
    1.4 06/04/14 11:08:22 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/storage/GCIPage.hpp

  BitKeeper/deleted/.del-GCIPage.cpp~42fa918fbf36828a
    1.4 06/04/14 11:08:22 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/storage/GCIPage.cpp

  BitKeeper/deleted/.del-GCIContainerPS.hpp~9a801ffe939e192e
    1.4 06/04/14 11:08:22 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/storage/GCIContainerPS.hpp

  BitKeeper/deleted/.del-GCIContainerPS.cpp~116168903a2c617a
    1.4 06/04/14 11:08:22 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/storage/GCIContainerPS.cpp

  BitKeeper/deleted/.del-GCIContainer.hpp~ac28cea9114659fd
    1.7 06/04/14 11:08:21 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/storage/GCIContainer.hpp

  BitKeeper/deleted/.del-GCIContainer.cpp~9c53acd16fc5ac74
    1.4 06/04/14 11:08:21 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/storage/GCIContainer.cpp

  BitKeeper/deleted/.del-GCIBuffer.hpp~703e2016a7ec616f
    1.6 06/04/14 11:08:21 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/storage/GCIBuffer.hpp

  BitKeeper/deleted/.del-GCIBuffer.cpp~6e8c6f38ab63d1d6
    1.7 06/04/14 11:08:21 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/storage/GCIBuffer.cpp

  BitKeeper/deleted/.del-testRequestor.hpp~583208c83ff5b554
    1.4 06/04/14 11:08:20 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/state/testRepState/testRequestor.hpp

  BitKeeper/deleted/.del-testRequestor.cpp~4a943fae5be63c79
    1.4 06/04/14 11:08:20 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/state/testRepState/testRequestor.cpp

  BitKeeper/deleted/.del-testInterval.cpp~993f4118f616e80
    1.4 06/04/14 11:08:20 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/state/testInterval/testInterval.cpp

  BitKeeper/deleted/.del-Makefile~f5a6d9415d7e0977
    1.4 06/04/14 11:08:20 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/state/testRepState/Makefile

  BitKeeper/deleted/.del-RepStateRequests.cpp~393882166df6929
    1.4 06/04/14 11:08:19 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/state/RepStateRequests.cpp

  BitKeeper/deleted/.del-RepStateEvent.cpp~f51d7eb7b7aca0b
    1.4 06/04/14 11:08:19 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/state/RepStateEvent.cpp

  BitKeeper/deleted/.del-RepState.hpp~94d7c472c8a7367
    1.5 06/04/14 11:08:19 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/state/RepState.hpp

  BitKeeper/deleted/.del-Makefile~e33e587a7947ac36
    1.4 06/04/14 11:08:19 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/state/testInterval/Makefile

  BitKeeper/deleted/.del-RepState.cpp~3d60b0a46e9477c1
    1.5 06/04/14 11:08:18 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/state/RepState.cpp

  BitKeeper/deleted/.del-Makefile~6a9cedaeedcc4650
    1.4 06/04/14 11:08:18 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/state/Makefile

  BitKeeper/deleted/.del-Interval.hpp~85aa46fc419bb109
    1.4 06/04/14 11:08:18 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/state/Interval.hpp

  BitKeeper/deleted/.del-Interval.cpp~3d079ca9cc21124d
    1.6 06/04/14 11:08:18 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/state/Interval.cpp

  BitKeeper/deleted/.del-repapi.h~6f8cf6b53a86a5ae
    1.4 06/04/14 11:08:17 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/repapi/repapi.h

  BitKeeper/deleted/.del-repapi.cpp~82b9b00c67cfdcf7
    1.6 06/04/14 11:08:17 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/repapi/repapi.cpp

  BitKeeper/deleted/.del-Channel.hpp~71c1d63ef4b2cbfe
    1.4 06/04/14 11:08:17 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/state/Channel.hpp

  BitKeeper/deleted/.del-Channel.cpp~1d5f62245962b839
    1.5 06/04/14 11:08:17 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/state/Channel.cpp

  BitKeeper/deleted/.del-TableInfoPs.hpp~56b1f8f75fe7cb1c
    1.4 06/04/14 11:08:16 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/adapters/TableInfoPs.hpp

  BitKeeper/deleted/.del-Makefile~bcb9d87fd69a7911
    1.4 06/04/14 11:08:16 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/adapters/Makefile

  BitKeeper/deleted/.del-Makefile~25c4b35b84d945b4
    1.4 06/04/14 11:08:16 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/repapi/Makefile

  BitKeeper/deleted/.del-ExtNDB.hpp~ee245e7e2c707685
    1.7 06/04/14 11:08:16 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/adapters/ExtNDB.hpp

  BitKeeper/deleted/.del-ExtNDB.cpp~38cccb80529c02c6
    1.8 06/04/14 11:08:15 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/adapters/ExtNDB.cpp

  BitKeeper/deleted/.del-ExtAPI.hpp~32bcb96bcd2d60c
    1.4 06/04/14 11:08:15 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/adapters/ExtAPI.hpp

  BitKeeper/deleted/.del-ExtAPI.cpp~d98f38669b10ca97
    1.4 06/04/14 11:08:15 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/adapters/ExtAPI.cpp

  BitKeeper/deleted/.del-AppNDB.hpp~2c3081224b4ff75f
    1.6 06/04/14 11:08:15 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/adapters/AppNDB.hpp

  BitKeeper/deleted/.del-rep_version.hpp~82a23fe4dbb13cab
    1.7 06/04/14 11:08:14 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/rep_version.hpp

  BitKeeper/deleted/.del-dbug_hack.cpp~f090906a24103f0
    1.7 06/04/14 11:08:14 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/dbug_hack.cpp

  BitKeeper/deleted/.del-TODO~187896dd2e5dfd02
    1.4 06/04/14 11:08:14 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/TODO

  BitKeeper/deleted/.del-SignalQueue.hpp~b92204ff36f399d1
    1.5 06/04/14 11:08:14 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/SignalQueue.hpp

  BitKeeper/deleted/.del-AppNDB.cpp~1db5eafacdeda3b7
    1.5 06/04/14 11:08:14 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/adapters/AppNDB.cpp

  BitKeeper/deleted/.del-SignalQueue.cpp~6d32d876acc1a598
    1.4 06/04/14 11:08:13 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/SignalQueue.cpp

  BitKeeper/deleted/.del-RequestorSubscriptions.cpp~f0643f7cc9aa9654
    1.4 06/04/14 11:08:13 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/RequestorSubscriptions.cpp

  BitKeeper/deleted/.del-Requestor.hpp~a499054c9a128dbd
    1.6 06/04/14 11:08:13 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/Requestor.hpp

  BitKeeper/deleted/.del-Requestor.cpp~c653fa987f84ce43
    1.6 06/04/14 11:08:13 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/Requestor.cpp

  BitKeeper/deleted/.del-RepMain.cpp~de79cb7b6f3acd18
    1.7 06/04/14 11:08:12 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/RepMain.cpp

  BitKeeper/deleted/.del-RepComponents.hpp~9e632beac4f8bbf8
    1.6 06/04/14 11:08:12 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/RepComponents.hpp

  BitKeeper/deleted/.del-RepComponents.cpp~fb067aee8e5a4a1f
    1.4 06/04/14 11:08:12 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/RepComponents.cpp

  BitKeeper/deleted/.del-RepCommandInterpreter.hpp~fb6f22895e8c8679
    1.4 06/04/14 11:08:12 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/RepCommandInterpreter.hpp

  BitKeeper/deleted/.del-RepCommandInterpreter.cpp~f661a8ff312213f8
    1.4 06/04/14 11:08:11 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/RepCommandInterpreter.cpp

  BitKeeper/deleted/.del-RepApiService.hpp~42f5ffb7e3baa54e
    1.4 06/04/14 11:08:11 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/RepApiService.hpp

  BitKeeper/deleted/.del-RepApiService.cpp~93d4005333167a0f
    1.6 06/04/14 11:08:11 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/RepApiService.cpp

  BitKeeper/deleted/.del-RepApiInterpreter.hpp~31be5af2ba72d263
    1.4 06/04/14 11:08:11 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/RepApiInterpreter.hpp

  BitKeeper/deleted/.del-RepApiInterpreter.cpp~8ba561cb831ae353
    1.4 06/04/14 11:08:10 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/RepApiInterpreter.cpp

  BitKeeper/deleted/.del-README~6939b06d192a6b99
    1.4 06/04/14 11:08:10 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/README

  BitKeeper/deleted/.del-NodeConnectInfo.hpp~9c4318dd55f3f84
    1.4 06/04/14 11:08:10 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/NodeConnectInfo.hpp

  BitKeeper/deleted/.del-Makefile~954f853c2d812c2c
    1.5 06/04/14 11:08:10 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/Makefile

  BitKeeper/deleted/.del-dba_schema.cpp~1c3b8399853c108
    1.5 06/04/14 11:08:09 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/newtonapi/dba_schema.cpp

  BitKeeper/deleted/.del-dba_process.hpp~f0ddefb3b2d6a662
    1.4 06/04/14 11:08:09 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/newtonapi/dba_process.hpp

  BitKeeper/deleted/.del-ExtSender.hpp~10ae62ec85ee6692
    1.4 06/04/14 11:08:09 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/ExtSender.hpp

  BitKeeper/deleted/.del-ExtSender.cpp~1851d559cfddae43
    1.4 06/04/14 11:08:09 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/rep/ExtSender.cpp

  BitKeeper/deleted/.del-dba_process.cpp~509e54294bc7efd2
    1.4 06/04/14 11:08:08 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/newtonapi/dba_process.cpp

  BitKeeper/deleted/.del-dba_internal.hpp~54884404e30c8823
    1.6 06/04/14 11:08:08 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/newtonapi/dba_internal.hpp

  BitKeeper/deleted/.del-dba_init.cpp~80da7e3fa0775346
    1.4 06/04/14 11:08:08 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/newtonapi/dba_init.cpp

  BitKeeper/deleted/.del-dba_error.cpp~a58b4a1628a2d4b9
    1.6 06/04/14 11:08:08 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/newtonapi/dba_error.cpp

  BitKeeper/deleted/.del-dba_dac.cpp~4615e3d0d8a15bff
    1.4 06/04/14 11:08:08 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/newtonapi/dba_dac.cpp

  BitKeeper/deleted/.del-dba_config.cpp~38acf2ad3a932420
    1.4 06/04/14 11:08:07 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/newtonapi/dba_config.cpp

  BitKeeper/deleted/.del-dba_bulkread.cpp~4ddfe02a93d2ba11
    1.4 06/04/14 11:08:07 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/newtonapi/dba_bulkread.cpp

  BitKeeper/deleted/.del-dba_binding.cpp~dcc4fb57f9ab6cba
    1.5 06/04/14 11:08:07 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/newtonapi/dba_binding.cpp

  BitKeeper/deleted/.del-Makefile~bcbd9a7282094cc
    1.4 06/04/14 11:08:07 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/newtonapi/Makefile

  BitKeeper/deleted/.del-ndbclient_dummy.cpp~73154070f5d0bfbf
    1.4 06/04/14 11:08:06 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/ndbclient/ndbclient_dummy.cpp

  BitKeeper/deleted/.del-ndbbaseclient_dummy.cpp~daee9eb6acbc94
    1.4 06/04/14 11:08:06 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/ndbbaseclient/ndbbaseclient_dummy.cpp

  BitKeeper/deleted/.del-Makefile~f993f3afae0d4308
    1.4 06/04/14 11:08:06 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/ndbclient/Makefile

  BitKeeper/deleted/.del-Makefile~4b92d5e5b416dd0
    1.4 06/04/14 11:08:06 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/ndbbaseclient/Makefile

  BitKeeper/deleted/.del-handles.hpp~bfe0b6a7a95ac142
    1.4 06/04/14 11:08:05 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/handles.hpp

  BitKeeper/deleted/.del-PoolNdb.hpp~db9e1a04d2fe705d
    1.5 06/04/14 11:08:05 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/PoolNdb.hpp

  BitKeeper/deleted/.del-PoolNdb.cpp~793fa032699b7d98
    1.5 06/04/14 11:08:05 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/PoolNdb.cpp

  BitKeeper/deleted/.del-Makefile~3d8d1529ad26ce76
    1.4 06/04/14 11:08:05 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/Makefile

  BitKeeper/deleted/.del-InfoTab.cpp~f89104b9c6fe7489
    1.4 06/04/14 11:08:04 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/InfoTab.cpp

  BitKeeper/deleted/.del-HandleStmt.hpp~6508fc97f3c772e1
    1.4 06/04/14 11:08:04 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/HandleStmt.hpp

  BitKeeper/deleted/.del-HandleStmt.cpp~782f96bda9eaf13c
    1.4 06/04/14 11:08:04 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/HandleStmt.cpp

  BitKeeper/deleted/.del-HandleRoot.hpp~2fcfca742c13cfb3
    1.4 06/04/14 11:08:04 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/HandleRoot.hpp

  BitKeeper/deleted/.del-HandleRoot.cpp~aa5044f74554fa9c
    1.5 06/04/14 11:08:03 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/HandleRoot.cpp

  BitKeeper/deleted/.del-HandleEnv.hpp~572a7b4af6816f8b
    1.4 06/04/14 11:08:03 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/HandleEnv.hpp

  BitKeeper/deleted/.del-HandleEnv.cpp~6b96fc6b188f252b
    1.4 06/04/14 11:08:03 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/HandleEnv.cpp

  BitKeeper/deleted/.del-HandleDesc.hpp~553aeb842b3da88e
    1.4 06/04/14 11:08:03 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/HandleDesc.hpp

  BitKeeper/deleted/.del-HandleDesc.cpp~e77eb1d73d171a98
    1.4 06/04/14 11:08:02 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/HandleDesc.cpp

  BitKeeper/deleted/.del-HandleDbc.hpp~9abc692ac6b0abb3
    1.4 06/04/14 11:08:02 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/HandleDbc.hpp

  BitKeeper/deleted/.del-HandleDbc.cpp~2a79fea6477b2c63
    1.4 06/04/14 11:08:02 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/HandleDbc.cpp

  BitKeeper/deleted/.del-HandleBase.hpp~8cf9a1e94d272328
    1.4 06/04/14 11:08:02 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/HandleBase.hpp

  BitKeeper/deleted/.del-HandleBase.cpp~2ba63dce2dfec07b
    1.4 06/04/14 11:08:01 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/HandleBase.cpp

  BitKeeper/deleted/.del-FuncTab.cpp~e77abea11a532708
    1.4 06/04/14 11:08:01 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/FuncTab.cpp

  BitKeeper/deleted/.del-DescSpec.cpp~cd50c1c855f1905
    1.4 06/04/14 11:08:01 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/DescSpec.cpp

  BitKeeper/deleted/.del-AttrStmt.cpp~5363ba63b35ff8f4
    1.4 06/04/14 11:08:01 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/AttrStmt.cpp

  BitKeeper/deleted/.del-Makefile~a08f437558c2d3b4
    1.4 06/04/14 11:08:00 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Makefile

  BitKeeper/deleted/.del-AttrRoot.cpp~5def5d7e228eedf0
    1.4 06/04/14 11:08:00 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/AttrRoot.cpp

  BitKeeper/deleted/.del-AttrEnv.cpp~7d74bcba78e149d0
    1.4 06/04/14 11:08:00 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/AttrEnv.cpp

  BitKeeper/deleted/.del-AttrDbc.cpp~24a034fbb22cdb23
    1.4 06/04/14 11:08:00 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/handles/AttrDbc.cpp

  BitKeeper/deleted/.del-Executor.hpp~c94d916ae5af2506
    1.4 06/04/14 11:07:59 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Executor.hpp

  BitKeeper/deleted/.del-Executor.cpp~ccb54cc8ffe18bae
    1.4 06/04/14 11:07:59 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Executor.cpp

  BitKeeper/deleted/.del-Exec_update_scan.cpp~2285c72106cffe0
    1.4 06/04/14 11:07:59 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_update_scan.cpp

  BitKeeper/deleted/.del-Exec_update_lookup.cpp~b7a7387620cf42ab
    1.4 06/04/14 11:07:59 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_update_lookup.cpp

  BitKeeper/deleted/.del-Exec_update_index.cpp~86140a945f790890
    1.4 06/04/14 11:07:59 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_update_index.cpp

  BitKeeper/deleted/.del-Exec_query_sys.cpp~d66abe07cd519163
    1.4 06/04/14 11:07:58 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_query_sys.cpp

  BitKeeper/deleted/.del-Exec_query_scan.cpp~7c66194f7f93346f
    1.4 06/04/14 11:07:58 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_query_scan.cpp

  BitKeeper/deleted/.del-Exec_query_range.cpp~7c4e148e81a292d6
    1.4 06/04/14 11:07:58 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_query_range.cpp

  BitKeeper/deleted/.del-Exec_query_lookup.cpp~79dfe29b088d832
    1.4 06/04/14 11:07:58 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_query_lookup.cpp

  BitKeeper/deleted/.del-Exec_query_index.cpp~4cada676fa178001
    1.4 06/04/14 11:07:57 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_query_index.cpp

  BitKeeper/deleted/.del-Exec_pred_op.cpp~ebe7b65ba81e5185
    1.4 06/04/14 11:07:57 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_pred_op.cpp

  BitKeeper/deleted/.del-Exec_insert.cpp~71dd4bf2fb913f2e
    1.4 06/04/14 11:07:57 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_insert.cpp

  BitKeeper/deleted/.del-Exec_expr_op.cpp~5e341b2e63495ba4
    1.4 06/04/14 11:07:57 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_expr_op.cpp

  BitKeeper/deleted/.del-Exec_expr_func.cpp~c78ab0e67d54f38c
    1.4 06/04/14 11:07:56 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_expr_func.cpp

  BitKeeper/deleted/.del-Exec_expr_conv.cpp~b5452bd4fbd7c945
    1.4 06/04/14 11:07:56 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_expr_conv.cpp

  BitKeeper/deleted/.del-Exec_drop_table.cpp~639a2faba4da14f4
    1.4 06/04/14 11:07:56 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_drop_table.cpp

  BitKeeper/deleted/.del-Exec_drop_index.cpp~3a3871ec6ee48c28
    1.4 06/04/14 11:07:56 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_drop_index.cpp

  BitKeeper/deleted/.del-Exec_delete_scan.cpp~810aa4058f73c941
    1.4 06/04/14 11:07:55 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_delete_scan.cpp

  BitKeeper/deleted/.del-Exec_delete_lookup.cpp~5d24028ce16b6623
    1.4 06/04/14 11:07:55 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_delete_lookup.cpp

  BitKeeper/deleted/.del-Exec_delete_index.cpp~1ffe5af6eb160a68
    1.4 06/04/14 11:07:55 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_delete_index.cpp

  BitKeeper/deleted/.del-Exec_create_table.cpp~76904d417bc0a59a
    1.4 06/04/14 11:07:55 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_create_table.cpp

  BitKeeper/deleted/.del-driver.hpp~f108f4eef34ec8ea
    1.4 06/04/14 11:07:54 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/driver.hpp

  BitKeeper/deleted/.del-driver.cpp~f8f1eeec35b08f18
    1.5 06/04/14 11:07:54 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/driver.cpp

  BitKeeper/deleted/.del-Exec_create_index.cpp~c6b8e670198adfa9
    1.4 06/04/14 11:07:54 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_create_index.cpp

  BitKeeper/deleted/.del-Exec_comp_op.cpp~eacbd7512b32d68b
    1.4 06/04/14 11:07:54 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_comp_op.cpp

  BitKeeper/deleted/.del-SQLTransact.cpp~eb33c2f66ee85738
    1.4 06/04/14 11:07:53 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLTransact.cpp

  BitKeeper/deleted/.del-SQLTables.cpp~c8b201068baec393
    1.4 06/04/14 11:07:53 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLTables.cpp

  BitKeeper/deleted/.del-SQLTablePrivileges.cpp~fa16ea0fffa4edeb
    1.4 06/04/14 11:07:53 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLTablePrivileges.cpp

  BitKeeper/deleted/.del-SQLStatistics.cpp~87e0359f237aa66a
    1.4 06/04/14 11:07:53 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLStatistics.cpp

  BitKeeper/deleted/.del-SQLSpecialColumns.cpp~1877b4c368825de5
    1.4 06/04/14 11:07:52 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSpecialColumns.cpp

  BitKeeper/deleted/.del-SQLSetStmtOption.cpp~87af3125a48c27fa
    1.4 06/04/14 11:07:52 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetStmtOption.cpp

  BitKeeper/deleted/.del-SQLSetStmtAttr.cpp~e99b7e6025a1ae1f
    1.4 06/04/14 11:07:52 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetStmtAttr.cpp

  BitKeeper/deleted/.del-SQLSetScrollOptions.cpp~6f8250379bb0cac8
    1.4 06/04/14 11:07:52 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetScrollOptions.cpp

  BitKeeper/deleted/.del-SQLSetPos.cpp~39a3e69960041aa7
    1.4 06/04/14 11:07:51 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetPos.cpp

  BitKeeper/deleted/.del-SQLSetParam.cpp~e0dd2d5e8d3ec450
    1.4 06/04/14 11:07:51 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetParam.cpp

  BitKeeper/deleted/.del-SQLSetEnvAttr.cpp~7b50aeae6228c2db
    1.4 06/04/14 11:07:51 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetEnvAttr.cpp

  BitKeeper/deleted/.del-SQLSetDescRec.cpp~f8dd72467d5012ab
    1.4 06/04/14 11:07:51 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetDescRec.cpp

  BitKeeper/deleted/.del-SQLSetDescField.cpp~c4db694d1b9e8f77
    1.4 06/04/14 11:07:50 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetDescField.cpp

  BitKeeper/deleted/.del-SQLSetCursorName.cpp~ccfc33dd2cf6abeb
    1.4 06/04/14 11:07:50 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetCursorName.cpp

  BitKeeper/deleted/.del-SQLSetConnectOption.cpp~dadc980d9f9cad1b
    1.4 06/04/14 11:07:50 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetConnectOption.cpp

  BitKeeper/deleted/.del-SQLSetConnectAttr.cpp~c2c520c34c41bd88
    1.4 06/04/14 11:07:50 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetConnectAttr.cpp

  BitKeeper/deleted/.del-SQLRowCount.cpp~d4ac5b273afdb154
    1.4 06/04/14 11:07:49 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLRowCount.cpp

  BitKeeper/deleted/.del-SQLPutData.cpp~9dbf69ea9d369dbd
    1.4 06/04/14 11:07:49 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLPutData.cpp

  BitKeeper/deleted/.del-SQLProcedures.cpp~c59d025b22e2d1a6
    1.4 06/04/14 11:07:49 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLProcedures.cpp

  BitKeeper/deleted/.del-SQLProcedureColumns.cpp~c7a0535e9f50ff39
    1.4 06/04/14 11:07:49 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLProcedureColumns.cpp

  BitKeeper/deleted/.del-SQLPrimaryKeys.cpp~5d7b2a0ae08a267
    1.4 06/04/14 11:07:48 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLPrimaryKeys.cpp

  BitKeeper/deleted/.del-SQLPrepare.cpp~1d339fe24888087
    1.4 06/04/14 11:07:48 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLPrepare.cpp

  BitKeeper/deleted/.del-SQLParamOptions.cpp~bdcbccb961fff044
    1.4 06/04/14 11:07:48 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLParamOptions.cpp

  BitKeeper/deleted/.del-SQLParamData.cpp~163b046513f1e4ae
    1.4 06/04/14 11:07:48 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLParamData.cpp

  BitKeeper/deleted/.del-SQLNumResultCols.cpp~4d2b6527ffe81059
    1.4 06/04/14 11:07:48 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLNumResultCols.cpp

  BitKeeper/deleted/.del-SQLNumParams.cpp~8921304c3bcf4835
    1.4 06/04/14 11:07:47 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLNumParams.cpp

  BitKeeper/deleted/.del-SQLNativeSql.cpp~eeae6067f4a85c
    1.4 06/04/14 11:07:47 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLNativeSql.cpp

  BitKeeper/deleted/.del-SQLMoreResults.cpp~483d94cb57379e81
    1.4 06/04/14 11:07:47 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLMoreResults.cpp

  BitKeeper/deleted/.del-SQLGetTypeInfo.cpp~333196b07473dff6
    1.4 06/04/14 11:07:47 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetTypeInfo.cpp

  BitKeeper/deleted/.del-SQLGetStmtOption.cpp~2ff900ebdd167077
    1.4 06/04/14 11:07:46 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetStmtOption.cpp

  BitKeeper/deleted/.del-SQLGetStmtAttr.cpp~de7dabc8c2acea7
    1.4 06/04/14 11:07:46 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetStmtAttr.cpp

  BitKeeper/deleted/.del-SQLGetInfo.cpp~e4e09d6bedbf02b1
    1.4 06/04/14 11:07:46 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetInfo.cpp

  BitKeeper/deleted/.del-SQLGetFunctions.cpp~72de050fbfb4a9bb
    1.4 06/04/14 11:07:46 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetFunctions.cpp

  BitKeeper/deleted/.del-SQLGetEnvAttr.cpp~e742277d8bdf234d
    1.4 06/04/14 11:07:45 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetEnvAttr.cpp

  BitKeeper/deleted/.del-SQLGetDiagRec.cpp~bea0f68f5b940ab8
    1.4 06/04/14 11:07:45 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetDiagRec.cpp

  BitKeeper/deleted/.del-SQLGetDiagField.cpp~673e1ea0f9d5121f
    1.4 06/04/14 11:07:45 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetDiagField.cpp

  BitKeeper/deleted/.del-SQLGetDescRec.cpp~f54cc69bcd1238ad
    1.4 06/04/14 11:07:45 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetDescRec.cpp

  BitKeeper/deleted/.del-SQLGetDescField.cpp~62828192a7d1d954
    1.4 06/04/14 11:07:44 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetDescField.cpp

  BitKeeper/deleted/.del-SQLGetData.cpp~3d837348460c219d
    1.4 06/04/14 11:07:44 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetData.cpp

  BitKeeper/deleted/.del-SQLGetCursorName.cpp~8266b920671b6d01
    1.4 06/04/14 11:07:44 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetCursorName.cpp

  BitKeeper/deleted/.del-SQLGetConnectOption.cpp~3e0bc4e1af95c682
    1.4 06/04/14 11:07:44 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetConnectOption.cpp

  BitKeeper/deleted/.del-SQLGetConnectAttr.cpp~b29ff18aeedd8966
    1.4 06/04/14 11:07:43 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetConnectAttr.cpp

  BitKeeper/deleted/.del-SQLFreeStmt.cpp~8f8cb0a43c02a67
    1.4 06/04/14 11:07:43 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLFreeStmt.cpp

  BitKeeper/deleted/.del-SQLFreeHandle.cpp~2dc029edf912c2d
    1.4 06/04/14 11:07:43 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLFreeHandle.cpp

  BitKeeper/deleted/.del-SQLFreeEnv.cpp~64f1776817464807
    1.4 06/04/14 11:07:43 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLFreeEnv.cpp

  BitKeeper/deleted/.del-SQLFreeConnect.cpp~92359420501ebc5b
    1.4 06/04/14 11:07:42 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLFreeConnect.cpp

  BitKeeper/deleted/.del-SQLForeignKeys.cpp~4b8a9af2f6bf92cb
    1.4 06/04/14 11:07:42 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLForeignKeys.cpp

  BitKeeper/deleted/.del-SQLFetchScroll.cpp~cdb16803511963a1
    1.4 06/04/14 11:07:42 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLFetchScroll.cpp

  BitKeeper/deleted/.del-SQLFetch.cpp~fa1606aa2dd901db
    1.4 06/04/14 11:07:42 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLFetch.cpp

  BitKeeper/deleted/.del-SQLExtendedFetch.cpp~8b9d604580a83cfd
    1.4 06/04/14 11:07:41 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLExtendedFetch.cpp

  BitKeeper/deleted/.del-SQLExecute.cpp~1692a85f8639f71
    1.4 06/04/14 11:07:41 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLExecute.cpp

  BitKeeper/deleted/.del-SQLExecDirect.cpp~5e6274e76315339d
    1.4 06/04/14 11:07:41 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLExecDirect.cpp

  BitKeeper/deleted/.del-SQLError.cpp~593b81885c15187b
    1.4 06/04/14 11:07:41 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLError.cpp

  BitKeeper/deleted/.del-SQLEndTran.cpp~c37cce04cc303c01
    1.4 06/04/14 11:07:41 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLEndTran.cpp

  BitKeeper/deleted/.del-SQLDrivers.cpp~400e7453e70f6e99
    1.4 06/04/14 11:07:40 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLDrivers.cpp

  BitKeeper/deleted/.del-SQLDriverConnect.cpp~8dad42af7d17a9d9
    1.4 06/04/14 11:07:40 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLDriverConnect.cpp

  BitKeeper/deleted/.del-SQLDisconnect.cpp~9fb4c3d7a84db50a
    1.4 06/04/14 11:07:40 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLDisconnect.cpp

  BitKeeper/deleted/.del-SQLDescribeParam.cpp~70b016fa795ed275
    1.4 06/04/14 11:07:40 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLDescribeParam.cpp

  BitKeeper/deleted/.del-SQLDescribeCol.cpp~1d1faafbcd3ecb3c
    1.4 06/04/14 11:07:39 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLDescribeCol.cpp

  BitKeeper/deleted/.del-SQLDataSources.cpp~12792108aac5b2ca
    1.4 06/04/14 11:07:39 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLDataSources.cpp

  BitKeeper/deleted/.del-SQLCopyDesc.cpp~286522b25a029761
    1.4 06/04/14 11:07:39 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLCopyDesc.cpp

  BitKeeper/deleted/.del-SQLConnect.cpp~868e02a519b72743
    1.4 06/04/14 11:07:39 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLConnect.cpp

  BitKeeper/deleted/.del-SQLColumns.cpp~1c31107df60bb544
    1.4 06/04/14 11:07:39 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLColumns.cpp

  BitKeeper/deleted/.del-SQLColumnPrivileges.cpp~39a3020da4c3485b
    1.4 06/04/14 11:07:38 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLColumnPrivileges.cpp

  BitKeeper/deleted/.del-SQLColAttributes.cpp~d4007908ee1309d
    1.4 06/04/14 11:07:38 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLColAttributes.cpp

  BitKeeper/deleted/.del-SQLColAttribute.cpp~f2c858b16a9360d
    1.4 06/04/14 11:07:38 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLColAttribute.cpp

  BitKeeper/deleted/.del-SQLCloseCursor.cpp~6cbf193aadaf1058
    1.4 06/04/14 11:07:38 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLCloseCursor.cpp

  BitKeeper/deleted/.del-SQLCancel.cpp~27eab683f6fa6ec6
    1.4 06/04/14 11:07:37 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLCancel.cpp

  BitKeeper/deleted/.del-SQLBulkOperations.cpp~7a96be04250a388
    1.4 06/04/14 11:07:37 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLBulkOperations.cpp

  BitKeeper/deleted/.del-SQLBrowseConnect.cpp~120b61a1ff6edee3
    1.4 06/04/14 11:07:37 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLBrowseConnect.cpp

  BitKeeper/deleted/.del-SQLBindParameter.cpp~533b1992496e2775
    1.4 06/04/14 11:07:37 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLBindParameter.cpp

  BitKeeper/deleted/.del-SQLBindParam.cpp~a50b619a23efaab
    1.4 06/04/14 11:07:36 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLBindParam.cpp

  BitKeeper/deleted/.del-SQLBindCol.cpp~fec3a78088d4951d
    1.4 06/04/14 11:07:36 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLBindCol.cpp

  BitKeeper/deleted/.del-SQLAllocStmt.cpp~362331ef456ec879
    1.4 06/04/14 11:07:36 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLAllocStmt.cpp

  BitKeeper/deleted/.del-SQLAllocHandleStd.cpp~7d145f6e3640d913
    1.4 06/04/14 11:07:36 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLAllocHandleStd.cpp

  BitKeeper/deleted/.del-SQLAllocHandle.cpp~c0921921e84d1a10
    1.4 06/04/14 11:07:35 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLAllocHandle.cpp

  BitKeeper/deleted/.del-SQLAllocEnv.cpp~eaf36cf2285ec2ac
    1.4 06/04/14 11:07:35 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLAllocEnv.cpp

  BitKeeper/deleted/.del-SQLAllocConnect.cpp~246af836b028d810
    1.4 06/04/14 11:07:35 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/SQLAllocConnect.cpp

  BitKeeper/deleted/.del-Makefile~80d21270fc3ad931
    1.4 06/04/14 11:07:35 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/Makefile

  BitKeeper/deleted/.del-type.txt~feec700c81f5095f
    1.4 06/04/14 11:07:34 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/docs/type.txt

  BitKeeper/deleted/.del-systables.pl~1fa2191648bdb629
    1.4 06/04/14 11:07:34 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/docs/systables.pl

  BitKeeper/deleted/.del-Func.pl~aefb901bc3941d32
    1.4 06/04/14 11:07:34 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/Func.pl

  BitKeeper/deleted/.del-Func.data~9e75f15d921063f3
    1.4 06/04/14 11:07:34 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/driver/Func.data

  BitKeeper/deleted/.del-select.fig~34f5222b5012e1d7
    1.4 06/04/14 11:07:33 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/docs/select.fig

  BitKeeper/deleted/.del-ndbodbc.html~a2f14fdd978b62cc
    1.4 06/04/14 11:07:33 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/docs/ndbodbc.html

  BitKeeper/deleted/.del-main.hpp~7b15eb7ffad488a0
    1.4 06/04/14 11:07:33 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/docs/main.hpp

  BitKeeper/deleted/.del-handleattr.pl~b0c2a2901b68342e
    1.4 06/04/14 11:07:33 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/docs/handleattr.pl

  BitKeeper/deleted/.del-gettypeinfo.pl~2ea4c0589eac4e73
    1.4 06/04/14 11:07:32 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/docs/gettypeinfo.pl

  BitKeeper/deleted/.del-getinfo.pl~2142ecf1567a66f6
    1.4 06/04/14 11:07:32 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/docs/getinfo.pl

  BitKeeper/deleted/.del-diag.txt~b66a7e227391335f
    1.4 06/04/14 11:07:32 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/docs/diag.txt

  BitKeeper/deleted/.del-descfield.pl~e0bd59c2824824cc
    1.4 06/04/14 11:07:32 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/docs/descfield.pl

  BitKeeper/deleted/.del-class.fig~c0754ccad74d380a
    1.4 06/04/14 11:07:31 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/docs/class.fig

  BitKeeper/deleted/.del-Makefile~4c1a6148787bdc2f
    1.4 06/04/14 11:07:31 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/dictionary/Makefile

  BitKeeper/deleted/.del-DictTable.hpp~cf99a9ac3dd49206
    1.4 06/04/14 11:07:31 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictTable.hpp

  BitKeeper/deleted/.del-DictTable.cpp~8f4a9ee5a8038f87
    1.4 06/04/14 11:07:31 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictTable.cpp

  BitKeeper/deleted/.del-DictSys.hpp~76583ba8aa88fd6f
    1.4 06/04/14 11:07:30 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictSys.hpp

  BitKeeper/deleted/.del-DictSys.cpp~fb89465b10c32bb0
    1.4 06/04/14 11:07:30 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictSys.cpp

  BitKeeper/deleted/.del-DictSchema.hpp~5aa7dc8ade17e94c
    1.4 06/04/14 11:07:30 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictSchema.hpp

  BitKeeper/deleted/.del-DictSchema.cpp~639403c84a47dfdd
    1.4 06/04/14 11:07:30 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictSchema.cpp

  BitKeeper/deleted/.del-DictIndex.hpp~f53b91a41bb96663
    1.4 06/04/14 11:07:29 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictIndex.hpp

  BitKeeper/deleted/.del-DictIndex.cpp~a456d3039e6a39e3
    1.4 06/04/14 11:07:29 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictIndex.cpp

  BitKeeper/deleted/.del-DictColumn.hpp~c2da1b7bd0408bd1
    1.4 06/04/14 11:07:29 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictColumn.hpp

  BitKeeper/deleted/.del-DictColumn.cpp~b69d90c53e5b618
    1.4 06/04/14 11:07:29 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictColumn.cpp

  BitKeeper/deleted/.del-common.hpp~25369fa6c80eff53
    1.6 06/04/14 11:07:28 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/common.hpp

  BitKeeper/deleted/.del-common.cpp~4792b9ecddd99482
    1.4 06/04/14 11:07:28 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/common.cpp

  BitKeeper/deleted/.del-StmtInfo.hpp~6698d657391692fc
    1.4 06/04/14 11:07:28 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/StmtInfo.hpp

  BitKeeper/deleted/.del-DictCatalog.hpp~cace2fb2f6bb65e5
    1.4 06/04/14 11:07:28 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictCatalog.hpp

  BitKeeper/deleted/.del-DictCatalog.cpp~9804b0ff3eac2f8
    1.4 06/04/14 11:07:28 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictCatalog.cpp

  BitKeeper/deleted/.del-StmtInfo.cpp~54ee4040e5807214
    1.4 06/04/14 11:07:27 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/StmtInfo.cpp

  BitKeeper/deleted/.del-StmtArea.hpp~9662e56ae164eb7f
    1.4 06/04/14 11:07:27 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/StmtArea.hpp

  BitKeeper/deleted/.del-StmtArea.cpp~5c5f8613156e06b2
    1.4 06/04/14 11:07:27 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/StmtArea.cpp

  BitKeeper/deleted/.del-Sqlstate.hpp~60006ee1c27c6e5
    1.4 06/04/14 11:07:27 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/Sqlstate.hpp

  BitKeeper/deleted/.del-Sqlstate.cpp~b844144af963c22c
    1.4 06/04/14 11:07:26 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/Sqlstate.cpp

  BitKeeper/deleted/.del-ResultArea.hpp~8d4646b94be475d1
    1.4 06/04/14 11:07:26 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/ResultArea.hpp

  BitKeeper/deleted/.del-ResultArea.cpp~8bcc2a2d9a98b9b0
    1.4 06/04/14 11:07:26 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/ResultArea.cpp

  BitKeeper/deleted/.del-OdbcData.hpp~2125814c1293c0b3
    1.4 06/04/14 11:07:26 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/OdbcData.hpp

  BitKeeper/deleted/.del-OdbcData.cpp~e557009c1ed1e017
    1.7 06/04/14 11:07:25 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/OdbcData.cpp

  BitKeeper/deleted/.del-Makefile~8505f6b38fe5c219
    1.4 06/04/14 11:07:25 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/Makefile

  BitKeeper/deleted/.del-DiagArea.hpp~1c6595b5fac06eb2
    1.4 06/04/14 11:07:25 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/DiagArea.hpp

  BitKeeper/deleted/.del-DiagArea.cpp~e3662d8977947e67
    1.4 06/04/14 11:07:25 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/DiagArea.cpp

  BitKeeper/deleted/.del-DescArea.hpp~20ba9b6484762f0f
    1.4 06/04/14 11:07:24 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/DescArea.hpp

  BitKeeper/deleted/.del-DescArea.cpp~aab4edd7e336acdd
    1.4 06/04/14 11:07:24 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/DescArea.cpp

  BitKeeper/deleted/.del-DataType.hpp~adef26bc1dc940eb
    1.5 06/04/14 11:07:24 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/DataType.hpp

  BitKeeper/deleted/.del-DataType.cpp~29b8ddd51fdd3a2f
    1.7 06/04/14 11:07:24 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/DataType.cpp

  BitKeeper/deleted/.del-DataRow.hpp~66a65eee1a1b2f23
    1.4 06/04/14 11:07:23 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/DataRow.hpp

  BitKeeper/deleted/.del-DataRow.cpp~8764a23cee4f9481
    1.4 06/04/14 11:07:23 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/DataRow.cpp

  BitKeeper/deleted/.del-DataField.hpp~d324898a9a86463d
    1.4 06/04/14 11:07:23 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/DataField.hpp

  BitKeeper/deleted/.del-DataField.cpp~6bb1fe1cb971c8f9
    1.7 06/04/14 11:07:23 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/DataField.cpp

  BitKeeper/deleted/.del-Ctx.hpp~bc88aba55ab71063
    1.4 06/04/14 11:07:22 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/Ctx.hpp

  BitKeeper/deleted/.del-Ctx.cpp~ce1c13ba8a312eba
    1.7 06/04/14 11:07:22 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/Ctx.cpp

  BitKeeper/deleted/.del-ConnArea.hpp~ffe99deedf7dc1ee
    1.4 06/04/14 11:07:22 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/ConnArea.hpp

  BitKeeper/deleted/.del-ConnArea.cpp~103182cf445f0bc3
    1.4 06/04/14 11:07:22 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/ConnArea.cpp

  BitKeeper/deleted/.del-CodeTree.hpp~dcb603cce390eafa
    1.4 06/04/14 11:07:21 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/CodeTree.hpp

  BitKeeper/deleted/.del-CodeTree.cpp~1a4912632b0a61ee
    1.4 06/04/14 11:07:21 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/CodeTree.cpp

  BitKeeper/deleted/.del-AttrArea.hpp~f3d78ccd37af4e6
    1.4 06/04/14 11:07:21 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/AttrArea.hpp

  BitKeeper/deleted/.del-AttrArea.cpp~1570da617a1a6c4b
    1.4 06/04/14 11:07:21 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/common/AttrArea.cpp

  BitKeeper/deleted/.del-SimpleScan.lpp~e11862b97fe39faf
    1.5 06/04/14 11:07:20 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/SimpleScan.lpp

  BitKeeper/deleted/.del-SimpleParser.hpp~4fdff7ee3839efc4
    1.4 06/04/14 11:07:20 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/SimpleParser.hpp

  BitKeeper/deleted/.del-SimpleParser.cpp~549f93e2a7fd01b5
    1.5 06/04/14 11:07:20 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/SimpleParser.cpp

  BitKeeper/deleted/.del-SimpleGram.ypp~6301cedf92524710
    1.5 06/04/14 11:07:20 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/SimpleGram.ypp

  BitKeeper/deleted/.del-Makefile~420b8378d374f069
    1.4 06/04/14 11:07:20 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Makefile

  BitKeeper/deleted/.del-Code_update_scan.hpp~287f193ad48fbefd
    1.4 06/04/14 11:07:19 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_update_scan.hpp

  BitKeeper/deleted/.del-Code_update_scan.cpp~35e5b7d4619b3e09
    1.4 06/04/14 11:07:19 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_update_scan.cpp

  BitKeeper/deleted/.del-Code_update_lookup.hpp~ee335822c3496863
    1.4 06/04/14 11:07:19 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_update_lookup.hpp

  BitKeeper/deleted/.del-Code_update_lookup.cpp~3491782088e97384
    1.4 06/04/14 11:07:19 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_update_lookup.cpp

  BitKeeper/deleted/.del-Code_update_index.hpp~b57bbe5c8d927df9
    1.4 06/04/14 11:07:18 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_update_index.hpp

  BitKeeper/deleted/.del-Code_update_index.cpp~a0c6ad33ffbbc00e
    1.4 06/04/14 11:07:18 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_update_index.cpp

  BitKeeper/deleted/.del-Code_update.hpp~c1de760c7b580b0c
    1.4 06/04/14 11:07:18 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_update.hpp

  BitKeeper/deleted/.del-Code_update.cpp~ed36f4a7a928a91b
    1.4 06/04/14 11:07:18 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_update.cpp

  BitKeeper/deleted/.del-Code_table_list.hpp~c1e880e9949d3a
    1.4 06/04/14 11:07:17 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_table_list.hpp

  BitKeeper/deleted/.del-Code_table_list.cpp~40948eccedfae7bb
    1.4 06/04/14 11:07:17 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_table_list.cpp

  BitKeeper/deleted/.del-Code_table.hpp~a48d57a0375a6d56
    1.4 06/04/14 11:07:17 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_table.hpp

  BitKeeper/deleted/.del-Code_table.cpp~c46b7a6e2ecf4f61
    1.4 06/04/14 11:07:17 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_table.cpp

  BitKeeper/deleted/.del-Code_stmt.hpp~fab11fc487e74d05
    1.4 06/04/14 11:07:17 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_stmt.hpp

  BitKeeper/deleted/.del-Code_stmt.cpp~c0e9903aa90df90b
    1.4 06/04/14 11:07:16 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_stmt.cpp

  BitKeeper/deleted/.del-Code_set_row.hpp~32ac3de384b91229
    1.4 06/04/14 11:07:16 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_set_row.hpp

  BitKeeper/deleted/.del-Code_set_row.cpp~1bda7e6f86f18aef
    1.4 06/04/14 11:07:16 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_set_row.cpp

  BitKeeper/deleted/.del-Code_select.hpp~f9fadc322d78033a
    1.4 06/04/14 11:07:16 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_select.hpp

  BitKeeper/deleted/.del-Code_select.cpp~75b2a39f282d8ef5
    1.4 06/04/14 11:07:15 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_select.cpp

  BitKeeper/deleted/.del-Code_root.hpp~de1fd878505d9e26
    1.4 06/04/14 11:07:15 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_root.hpp

  BitKeeper/deleted/.del-Code_root.cpp~4c26a01ced583e41
    1.4 06/04/14 11:07:15 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_root.cpp

  BitKeeper/deleted/.del-Code_query_sys.hpp~f5182823da25f097
    1.4 06/04/14 11:07:15 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_sys.hpp

  BitKeeper/deleted/.del-Code_query_sys.cpp~1d6a4a1cec789001
    1.4 06/04/14 11:07:14 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_sys.cpp

  BitKeeper/deleted/.del-Code_query_sort.hpp~84edb5e128eda962
    1.4 06/04/14 11:07:14 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_sort.hpp

  BitKeeper/deleted/.del-Code_query_sort.cpp~c08fc07f739de097
    1.4 06/04/14 11:07:14 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_sort.cpp

  BitKeeper/deleted/.del-Code_query_scan.hpp~b93c277da5b2509b
    1.4 06/04/14 11:07:14 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_scan.hpp

  BitKeeper/deleted/.del-Code_query_scan.cpp~855e56d6f56de938
    1.4 06/04/14 11:07:13 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_scan.cpp

  BitKeeper/deleted/.del-Code_query_repeat.hpp~c20e10d0db9ad53c
    1.4 06/04/14 11:07:13 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_repeat.hpp

  BitKeeper/deleted/.del-Code_query_repeat.cpp~ce8f2a065897d6e3
    1.4 06/04/14 11:07:13 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_repeat.cpp

  BitKeeper/deleted/.del-Code_query_range.hpp~81546843616efefa
    1.4 06/04/14 11:07:13 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_range.hpp

  BitKeeper/deleted/.del-Code_query_range.cpp~62ddafd2d17063cc
    1.4 06/04/14 11:07:12 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_range.cpp

  BitKeeper/deleted/.del-Code_query_project.hpp~2734cdf1f907e0a4
    1.4 06/04/14 11:07:12 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_project.hpp

  BitKeeper/deleted/.del-Code_query_project.cpp~ebc22f71bb7ec98c
    1.4 06/04/14 11:07:12 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_project.cpp

  BitKeeper/deleted/.del-Code_query_lookup.hpp~73332533e5196630
    1.4 06/04/14 11:07:12 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_lookup.hpp

  BitKeeper/deleted/.del-Code_query_lookup.cpp~3d80e3ddbdae531d
    1.4 06/04/14 11:07:11 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_lookup.cpp

  BitKeeper/deleted/.del-Code_query_join.hpp~c4d17d18c4e3b4a0
    1.4 06/04/14 11:07:11 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_join.hpp

  BitKeeper/deleted/.del-Code_query_join.cpp~36e07422c67d6838
    1.4 06/04/14 11:07:11 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_join.cpp

  BitKeeper/deleted/.del-Code_query_index.hpp~6baaf1abbb704bb1
    1.4 06/04/14 11:07:11 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_index.hpp

  BitKeeper/deleted/.del-Code_query_index.cpp~f0312c9e2f22daf6
    1.4 06/04/14 11:07:10 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_index.cpp

  BitKeeper/deleted/.del-Code_query_group.hpp~ba4691be942c6e2a
    1.4 06/04/14 11:07:10 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_group.hpp

  BitKeeper/deleted/.del-Code_query_group.cpp~4443c844308f9a98
    1.4 06/04/14 11:07:10 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_group.cpp

  BitKeeper/deleted/.del-Code_query_filter.hpp~d0a341f2e40f0183
    1.4 06/04/14 11:07:10 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_filter.hpp

  BitKeeper/deleted/.del-Code_query_filter.cpp~a3d067d5d8fb40c
    1.4 06/04/14 11:07:10 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_filter.cpp

  BitKeeper/deleted/.del-Code_query_distinct.hpp~c12b2b7ff6b2e7b3
    1.4 06/04/14 11:07:09 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_distinct.hpp

  BitKeeper/deleted/.del-Code_query_distinct.cpp~3ba18528aa67b9dd
    1.4 06/04/14 11:07:09 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_distinct.cpp

  BitKeeper/deleted/.del-Code_query_count.hpp~bdbe6e4734abc0c5
    1.4 06/04/14 11:07:09 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_count.hpp

  BitKeeper/deleted/.del-Code_query_count.cpp~9fa96a57d2dde660
    1.4 06/04/14 11:07:09 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_count.cpp

  BitKeeper/deleted/.del-Code_query.hpp~f86fbd9a108206c0
    1.4 06/04/14 11:07:08 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query.hpp

  BitKeeper/deleted/.del-Code_query.cpp~4ac293821c9b4602
    1.4 06/04/14 11:07:08 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query.cpp

  BitKeeper/deleted/.del-Code_pred_op.hpp~b42256983d2bda7b
    1.4 06/04/14 11:07:08 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_pred_op.hpp

  BitKeeper/deleted/.del-Code_pred_op.cpp~47d693dde1a6d907
    1.4 06/04/14 11:07:08 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_pred_op.cpp

  BitKeeper/deleted/.del-Code_pred.hpp~eada43753e8b1e6c
    1.4 06/04/14 11:07:07 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_pred.hpp

  BitKeeper/deleted/.del-Code_pred.cpp~56faa755aa42ddfa
    1.4 06/04/14 11:07:07 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_pred.cpp

  BitKeeper/deleted/.del-Code_insert.hpp~cc96fa9b81169471
    1.4 06/04/14 11:07:07 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_insert.hpp

  BitKeeper/deleted/.del-Code_insert.cpp~7d0ef7cc8f657fd5
    1.4 06/04/14 11:07:07 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_insert.cpp

  BitKeeper/deleted/.del-Code_idx_column.hpp~caabaafa34722be7
    1.4 06/04/14 11:07:06 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_idx_column.hpp

  BitKeeper/deleted/.del-Code_idx_column.cpp~7d4d074ce5daea0a
    1.4 06/04/14 11:07:06 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_idx_column.cpp

  BitKeeper/deleted/.del-Code_expr_row.hpp~c541c49ea8c0c4f2
    1.4 06/04/14 11:07:06 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_row.hpp

  BitKeeper/deleted/.del-Code_expr_row.cpp~bc73d8f9c681d418
    1.4 06/04/14 11:07:06 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_row.cpp

  BitKeeper/deleted/.del-Code_expr_param.hpp~ec441ad8ef21aa2b
    1.4 06/04/14 11:07:06 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_param.hpp

  BitKeeper/deleted/.del-Code_expr_param.cpp~a5e94ee7c5821611
    1.4 06/04/14 11:07:05 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_param.cpp

  BitKeeper/deleted/.del-Code_expr_op.hpp~4eb8c02dd0602f
    1.4 06/04/14 11:07:05 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_op.hpp

  BitKeeper/deleted/.del-Code_expr_op.cpp~e1aaa0244f2efa4
    1.4 06/04/14 11:07:05 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_op.cpp

  BitKeeper/deleted/.del-Code_expr_func.hpp~22aee1e4f92c49b9
    1.4 06/04/14 11:07:01 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_func.hpp

  BitKeeper/deleted/.del-Code_expr_func.cpp~5d3996f062fa3f52
    1.4 06/04/14 11:07:00 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_func.cpp

  BitKeeper/deleted/.del-Code_expr_conv.hpp~5cbea39eecb92a43
    1.4 06/04/14 11:07:00 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_conv.hpp

  BitKeeper/deleted/.del-Code_expr_conv.cpp~d252fbfe8ef55fff
    1.4 06/04/14 11:07:00 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_conv.cpp

  BitKeeper/deleted/.del-Code_expr_const.hpp~9c8789cff376b832
    1.4 06/04/14 11:07:00 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_const.hpp

  BitKeeper/deleted/.del-Code_expr_const.cpp~bdb29dcd94ac5e73
    1.4 06/04/14 11:06:59 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_const.cpp

  BitKeeper/deleted/.del-Code_expr_column.hpp~9c4cbbdf432dc475
    1.4 06/04/14 11:06:59 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_column.hpp

  BitKeeper/deleted/.del-Code_expr_column.cpp~4c4fbcd5741cc8cf
    1.4 06/04/14 11:06:59 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_column.cpp

  BitKeeper/deleted/.del-Code_expr.hpp~9e8243e99e0ec84
    1.4 06/04/14 11:06:58 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr.hpp

  BitKeeper/deleted/.del-Code_expr.cpp~fafd271880c70cf3
    1.4 06/04/14 11:06:58 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr.cpp

  BitKeeper/deleted/.del-Code_drop_table.hpp~d671379125e4bbbe
    1.4 06/04/14 11:06:58 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_drop_table.hpp

  BitKeeper/deleted/.del-Code_drop_table.cpp~9637d93efa68996a
    1.4 06/04/14 11:06:57 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_drop_table.cpp

  BitKeeper/deleted/.del-Code_drop_index.hpp~377c9eb280ec2ee2
    1.4 06/04/14 11:06:55 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_drop_index.hpp

  BitKeeper/deleted/.del-Code_drop_index.cpp~fc5cab67ae58d9f6
    1.4 06/04/14 11:06:50 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_drop_index.cpp

  BitKeeper/deleted/.del-Code_dml_row.hpp~33c4cffdd238728d
    1.4 06/04/14 11:06:40 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_dml_row.hpp

  BitKeeper/deleted/.del-Code_dml_row.cpp~17c791507b36cc06
    1.4 06/04/14 11:06:34 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_dml_row.cpp

  BitKeeper/deleted/.del-Code_dml_column.hpp~a843b3418b30b7a3
    1.4 06/04/14 11:06:25 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_dml_column.hpp

  BitKeeper/deleted/.del-Code_dml_column.cpp~b71ce6186edf1655
    1.4 06/04/14 11:06:21 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_dml_column.cpp

  BitKeeper/deleted/.del-Code_dml.hpp~8fdbf19ad3174ca2
    1.4 06/04/14 11:06:05 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_dml.hpp

  BitKeeper/deleted/.del-Code_dml.cpp~6826ad60f0f566e7
    1.4 06/04/14 11:05:52 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_dml.cpp

  BitKeeper/deleted/.del-Code_delete_scan.hpp~b9a11b4ec895d159
    1.4 06/04/14 11:05:45 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_delete_scan.hpp

  BitKeeper/deleted/.del-Code_delete_scan.cpp~b040ad7670c24eb5
    1.4 06/04/14 11:05:32 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_delete_scan.cpp

  BitKeeper/deleted/.del-Code_delete_lookup.hpp~1be71525ed9ee69
    1.4 06/04/14 11:05:24 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_delete_lookup.hpp

  BitKeeper/deleted/.del-Code_delete_lookup.cpp~1a3728f8c896684
    1.4 06/04/14 11:05:08 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_delete_lookup.cpp

  BitKeeper/deleted/.del-Code_delete_index.hpp~18a9bb119b04636
    1.4 06/04/14 11:04:55 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_delete_index.hpp

  BitKeeper/deleted/.del-Code_delete_index.cpp~17ed96eca90fe4e7
    1.4 06/04/14 11:04:43 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_delete_index.cpp

  BitKeeper/deleted/.del-Code_delete.hpp~c852ee069a761aab
    1.4 06/04/14 11:04:33 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_delete.hpp

  BitKeeper/deleted/.del-Code_delete.cpp~feac77b440d04327
    1.4 06/04/14 11:04:18 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_delete.cpp

  BitKeeper/deleted/.del-Code_ddl_row.hpp~c18a43b3770ad25a
    1.4 06/04/14 11:04:11 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_row.hpp

  BitKeeper/deleted/.del-Code_ddl_row.cpp~ec2fbc3b8ab08a52
    1.4 06/04/14 11:03:53 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_row.cpp

  BitKeeper/deleted/.del-Code_ddl_constr.hpp~bca16806c57bc97e
    1.4 06/04/14 11:03:43 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_constr.hpp

  BitKeeper/deleted/.del-Code_ddl_constr.cpp~80ae32f83a6c2f00
    1.4 06/04/14 11:03:38 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_constr.cpp

  BitKeeper/deleted/.del-Code_ddl_column.hpp~c9e534e381b21599
    1.4 06/04/14 11:03:29 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_column.hpp

  BitKeeper/deleted/.del-Code_ddl_column.cpp~c524862773dd9f38
    1.4 06/04/14 11:03:15 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_column.cpp

  BitKeeper/deleted/.del-Code_ddl.hpp~75482ddd87b65036
    1.4 06/04/14 11:03:11 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_ddl.hpp

  BitKeeper/deleted/.del-Code_ddl.cpp~c38ee5368efaf688
    1.4 06/04/14 11:03:05 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_ddl.cpp

  BitKeeper/deleted/.del-Code_data_type.hpp~5e8928968d3c0107
    1.4 06/04/14 11:03:02 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_data_type.hpp

  BitKeeper/deleted/.del-Code_data_type.cpp~9e46a7ef85345d4
    1.4 06/04/14 11:02:49 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_data_type.cpp

  BitKeeper/deleted/.del-Code_create_table.hpp~9648f467f3f0418e
    1.4 06/04/14 11:02:47 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_create_table.hpp

  BitKeeper/deleted/.del-Code_create_table.cpp~c25e7cc06414a927
    1.4 06/04/14 11:02:37 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_create_table.cpp

  BitKeeper/deleted/.del-Code_create_row.hpp~38cb00cc1baa9ee7
    1.4 06/04/14 11:02:32 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_create_row.hpp

  BitKeeper/deleted/.del-Code_create_row.cpp~33f73454f8ddf2d5
    1.4 06/04/14 11:02:24 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_create_row.cpp

  BitKeeper/deleted/.del-Code_create_index.hpp~12bcb33350fc35c1
    1.4 06/04/14 11:02:19 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_create_index.hpp

  BitKeeper/deleted/.del-Code_create_index.cpp~d1f95c5917afab9
    1.4 06/04/14 11:02:12 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_create_index.cpp

  BitKeeper/deleted/.del-Code_comp_op.hpp~37cf1e4cee3a6bf1
    1.4 06/04/14 11:02:07 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_comp_op.hpp

  BitKeeper/deleted/.del-Code_comp_op.cpp~6ab02cc3b1e08985
    1.4 06/04/14 11:01:56 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_comp_op.cpp

  BitKeeper/deleted/.del-Code_column.hpp~5d5816d1c496e588
    1.4 06/04/14 11:01:41 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_column.hpp

  BitKeeper/deleted/.del-Code_column.cpp~5dd0e5c1215bd8bf
    1.4 06/04/14 11:01:32 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_column.cpp

  BitKeeper/deleted/.del-Code_base.hpp~794baaed32588409
    1.4 06/04/14 11:01:20 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_base.hpp

  BitKeeper/deleted/.del-Code_base.cpp~96f8ceaac8138bfe
    1.4 06/04/14 11:01:15 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_base.cpp

  BitKeeper/deleted/.del-CodeGen.hpp~738f834f80cceba8
    1.4 06/04/14 11:01:05 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/CodeGen.hpp

  BitKeeper/deleted/.del-CodeGen.cpp~170c83c0765b9160
    1.4 06/04/14 11:01:00 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/codegen/CodeGen.cpp

  BitKeeper/deleted/.del-NdbOdbc.def~cd3eed2c4a0121e9
    1.4 06/04/14 11:00:47 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/NdbOdbc.def

  BitKeeper/deleted/.del-NdbOdbc.cpp~aa491b06c9172d11
    1.4 06/04/14 11:00:36 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/NdbOdbc.cpp

  BitKeeper/deleted/.del-Makefile~9bc928a18aa88d66
    1.4 06/04/14 11:00:34 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/Makefile

  BitKeeper/deleted/.del-Extra.mk~eabbb28986ca817d
    1.4 06/04/14 11:00:25 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/odbc/Extra.mk

  BitKeeper/deleted/.del-Makefile~6c2778d2bf4954a2
    1.4 06/04/14 11:00:22 jimw@mysql.com +0 -0
    Delete: storage/ndb/src/old_files/client/Makefile

ChangeSet
  1.2119.424.1 06/04/14 19:36:06 kent@mysql.com +2 -0
  libmysqld.vcproj, mysqld.vcproj:
    Include "." in header search, to find #include <lex_hash.h>

  VC++Files/libmysqld/libmysqld.vcproj
    1.9 06/04/14 19:33:54 kent@mysql.com +4 -4
    Include "." in header search, to find #include <lex_hash.h>

  VC++Files/sql/mysqld.vcproj
    1.13 06/04/14 19:32:49 kent@mysql.com +9 -9
    Include "." in header search, to find #include <lex_hash.h>

ChangeSet
  1.2119.422.6 06/04/14 11:39:36 cmiller@zippy.(none) +2 -0
  Hand-merged test.

  mysql-test/t/innodb.test
    1.135.1.1 06/04/14 11:39:33 cmiller@zippy.(none) +43 -0
    Hand-merged test.

  mysql-test/r/innodb.result
    1.168.1.1 06/04/14 11:39:33 cmiller@zippy.(none) +38 -0
    Hand-merged test.

ChangeSet
  1.2119.423.1 06/04/14 10:36:36 elliot@mysql.com +1 -0
  Fixing HP-UX and AIX builds.

  unittest/mytap/tap.h
    1.5 06/04/14 10:36:31 elliot@mysql.com +1 -3
    Handle __attribute__ more portably, fixing builds for HP-UX and AIX.

ChangeSet
  1.2119.422.3 06/04/14 15:34:04 kent@mysql.com +1 -0
  Makefile.am:
    Move -lmystrings after -ldbug, to define strmov() on HP-UX

  unittest/mysys/Makefile.am
    1.4 06/04/14 15:32:09 kent@mysql.com +1 -1
    Move -lmystrings after -ldbug, to define strmov() on HP-UX

ChangeSet
  1.2119.422.2 06/04/14 14:59:21 kent@mysql.com +1 -0
  base64.t.c:
    Moved declarations to beginning of block

  unittest/mysys/base64.t.c
    1.2 06/04/14 14:57:20 kent@mysql.com +3 -3
    Moved declarations to beginning of block

ChangeSet
  1.2119.422.1 06/04/14 13:53:02 petr@mysql.com +1 -0
  add a file to EXTRA_DIST. Should fix broken bootstrap.

  unittest/Makefile.am
    1.5 06/04/14 13:52:53 petr@mysql.com +2 -0
    add unit.pl to the list of extra files, so that
    "make dist" picks it up.

ChangeSet
  1.1810.1457.75 06/04/14 12:13:26 aelkin@mysql.com +1 -0
  Bug#19097: rpl_view failed on some platforms
  removing comments from the opt file.

  mysql-test/t/rpl_view-slave.opt
    1.2 06/04/14 12:13:21 aelkin@mysql.com +0 -4
    removing `#' comments

ChangeSet
  1.2119.415.8 06/04/13 17:18:43 jimw@mysql.com +45 -0
  Remove ancient version of Debian packaging files.

  BitKeeper/deleted/.del-tb~8844e8c985e40d4e
    1.2 06/04/13 17:11:57 jimw@mysql.com +0 -0
    Delete: support-files/debian/patches/tb

  BitKeeper/deleted/.del-ta~ec794c5d9d922b6c
    1.2 06/04/13 17:11:57 jimw@mysql.com +0 -0
    Delete: support-files/debian/patches/ta

  BitKeeper/deleted/.del-az~45092291b7eff90a
    1.2 06/04/13 17:11:56 jimw@mysql.com +0 -0
    Delete: support-files/debian/patches/az

  BitKeeper/deleted/.del-ae~c54b032746985759
    1.3 06/04/13 17:11:56 jimw@mysql.com +0 -0
    Delete: support-files/debian/patches/ae

  BitKeeper/deleted/.del-ad~9296238d4d7d5bb3
    1.3 06/04/13 17:11:55 jimw@mysql.com +0 -0
    Delete: support-files/debian/patches/ad

  BitKeeper/deleted/.del-ac~66b41066a435209
    1.2 06/04/13 17:11:54 jimw@mysql.com +0 -0
    Delete: support-files/debian/patches/ac

  BitKeeper/deleted/.del-ab~1145a71fc2a5dbb8
    1.3 06/04/13 17:11:53 jimw@mysql.com +0 -0
    Delete: support-files/debian/patches/ab

  BitKeeper/deleted/.del-aa~f8c7e976fa99167f
    1.2 06/04/13 17:11:51 jimw@mysql.com +0 -0
    Delete: support-files/debian/patches/aa

  BitKeeper/deleted/.del-shlibs~3fe34471c220623c
    1.3 06/04/13 17:11:50 jimw@mysql.com +0 -0
    Delete: support-files/debian/shlibs

  BitKeeper/deleted/.del-rules~2018e0de32c6d936
    1.3 06/04/13 17:11:50 jimw@mysql.com +0 -0
    Delete: support-files/debian/rules

  BitKeeper/deleted/.del-mysql-server.prerm~4445eacc70e74899
    1.2 06/04/13 17:11:50 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-server.prerm

  BitKeeper/deleted/.del-mysql-server.postrm~68a988229b41c3bb
    1.2 06/04/13 17:11:49 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-server.postrm

  BitKeeper/deleted/.del-mysql-server.postinst~d72bf57a84001364
    1.2 06/04/13 17:11:49 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-server.postinst

  BitKeeper/deleted/.del-mysql-server.dirs~b12380a091807c5e
    1.2 06/04/13 17:11:49 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-server.dirs

  BitKeeper/deleted/.del-mysql-server.conffiles~566a6664d16909f0
    1.2 06/04/13 17:11:48 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-server.conffiles

  BitKeeper/deleted/.del-mysql-server-shared.postrm~f3d7f9c6bfb3ca9b
    1.2 06/04/13 17:11:48 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-server-shared.postrm

  BitKeeper/deleted/.del-mysql-server-shared.postinst~c6fee24788b634a7
    1.2 06/04/13 17:11:48 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-server-shared.postinst

  BitKeeper/deleted/.del-mysql-server-shared.dirs~cb56821f47811c7c
    1.2 06/04/13 17:11:47 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-server-shared.dirs

  BitKeeper/deleted/.del-mysql-server-debug.postrm~ae113145ebc34ac8
    1.2 06/04/13 17:11:47 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-server-debug.postrm

  BitKeeper/deleted/.del-mysql-server-debug.postinst~12af8ffb8a145fae
    1.2 06/04/13 17:11:47 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-server-debug.postinst

  BitKeeper/deleted/.del-mysql-server-debug.dirs~7b6329c9df635ce4
    1.2 06/04/13 17:11:46 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-server-debug.dirs

  BitKeeper/deleted/.del-mysql-max.postrm~66c355bd3081578b
    1.2 06/04/13 17:11:46 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-max.postrm

  BitKeeper/deleted/.del-mysql-max.postinst~cc8a0b3de02b23e0
    1.2 06/04/13 17:11:45 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-max.postinst

  BitKeeper/deleted/.del-mysql-max.dirs~be29c2b464db6050
    1.2 06/04/13 17:11:44 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-max.dirs

  BitKeeper/deleted/.del-mysql-max-shared.postrm~92193bedc2b75355
    1.2 06/04/13 17:11:42 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-max-shared.postrm

  BitKeeper/deleted/.del-mysql-max-shared.postinst~3406aa3bae283fe0
    1.2 06/04/13 17:11:41 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-max-shared.postinst

  BitKeeper/deleted/.del-mysql-max-shared.dirs~38f36e6773ac0e79
    1.2 06/04/13 17:11:41 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-max-shared.dirs

  BitKeeper/deleted/.del-mysql-max-debug.postrm~26bdf891820d3671
    1.2 06/04/13 17:11:40 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-max-debug.postrm

  BitKeeper/deleted/.del-mysql-max-debug.postinst~36f2faba601ed8a
    1.2 06/04/13 17:11:40 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-max-debug.postinst

  BitKeeper/deleted/.del-mysql-max-debug.dirs~58d766ce6caffa2b
    1.2 06/04/13 17:11:40 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-max-debug.dirs

  BitKeeper/deleted/.del-mysql-doc.dirs~a468f79189ff27ad
    1.2 06/04/13 17:11:39 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-doc.dirs

  BitKeeper/deleted/.del-mysql-dev.dirs~c6cacea9b3289f33
    1.2 06/04/13 17:11:39 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-dev.dirs

  BitKeeper/deleted/.del-mysql-client.dirs~3f347d1649db13e1
    1.2 06/04/13 17:11:39 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-client.dirs

  BitKeeper/deleted/.del-mysql-bench.dirs~3407d505223bf583
    1.2 06/04/13 17:11:35 jimw@mysql.com +0 -0
    Delete: support-files/debian/mysql-bench.dirs

  BitKeeper/deleted/.del-my.cnf~c8cce985cf5872e3
    1.2 06/04/13 17:11:35 jimw@mysql.com +0 -0
    Delete: support-files/debian/my.cnf

  BitKeeper/deleted/.del-move~6b750ba06050bc92
    1.3 06/04/13 17:11:34 jimw@mysql.com +0 -0
    Delete: support-files/debian/move

  BitKeeper/deleted/.del-libmysqlclient9.postinst~80ad5f1e4633a219
    1.2 06/04/13 17:11:34 jimw@mysql.com +0 -0
    Delete: support-files/debian/libmysqlclient9.postinst

  BitKeeper/deleted/.del-libmysqlclient9.dirs~4420713260a0eb40
    1.2 06/04/13 17:11:34 jimw@mysql.com +0 -0
    Delete: support-files/debian/libmysqlclient9.dirs

  BitKeeper/deleted/.del-libmysqlclient10.postinst~5829f4e4a7c0206b
    1.2 06/04/13 17:11:34 jimw@mysql.com +0 -0
    Delete: support-files/debian/libmysqlclient10.postinst

  BitKeeper/deleted/.del-libmysqlclient10.dirs~24c90ade3a371b6f
    1.2 06/04/13 17:11:33 jimw@mysql.com +0 -0
    Delete: support-files/debian/libmysqlclient10.dirs

  BitKeeper/deleted/.del-gomi~bcec57fe6195deee
    1.4 06/04/13 17:11:33 jimw@mysql.com +0 -0
    Delete: support-files/debian/gomi

  BitKeeper/deleted/.del-copyright~3c3485ee25f7cde0
    1.2 06/04/13 17:11:33 jimw@mysql.com +0 -0
    Delete: support-files/debian/copyright

  BitKeeper/deleted/.del-control~a2146883b4ed7c94
    1.3 06/04/13 17:11:32 jimw@mysql.com +0 -0
    Delete: support-files/debian/control

  BitKeeper/deleted/.del-changelog~8457b43736642c
    1.3 06/04/13 17:11:32 jimw@mysql.com +0 -0
    Delete: support-files/debian/changelog

  BitKeeper/deleted/.del-README.debian~223f0edd363d08af
    1.3 06/04/13 17:11:32 jimw@mysql.com +0 -0
    Delete: support-files/debian/README.debian

ChangeSet
  1.2119.420.1 06/04/13 13:49:29 acurtis@xiphis.org +52 -0
  WL#3201
    " Configure support for server plugins "

  storage/blackhole/Makefile.am
    1.1 06/04/13 13:49:24 acurtis@xiphis.org +51 -0
    New BitKeeper file ``storage/blackhole/Makefile.am''

  sql/sql_builtin.cc.in
    1.1 06/04/13 13:49:24 acurtis@xiphis.org +13 -0
    New BitKeeper file ``sql/sql_builtin.cc.in''

  config/ac-macros/plugins.m4
    1.1 06/04/13 13:49:24 acurtis@xiphis.org +603 -0
    New BitKeeper file ``config/ac-macros/plugins.m4''

  storage/innobase/Makefile.am
    1.11 06/04/13 13:49:24 acurtis@xiphis.org +29 -0
    WL#3201
      Lets make life easier and reduce innodb into a single library file

  storage/example/ha_example.cc
    1.35 06/04/13 13:49:24 acurtis@xiphis.org +3 -3
    WL#3201
      remove conditional compilation on MYSQL_PLUGIN
      mysql_declare_plugin macro change

  storage/example/Makefile.am
    1.7 06/04/13 13:49:24 acurtis@xiphis.org +21 -9
    WL#3201
      fix as new-style plugin makefile

  storage/csv/ha_tina.cc
    1.43 06/04/13 13:49:24 acurtis@xiphis.org +3 -3
    WL#3201
      remove conditional compilation on MYSQL_PLUGIN
      mysql_declare_plugin macro change

  storage/csv/Makefile.am
    1.7 06/04/13 13:49:24 acurtis@xiphis.org +9 -4
    WL#3201
      setup as plugin makefile

  storage/blackhole/ha_blackhole.cc
    1.31 06/04/13 13:49:24 acurtis@xiphis.org +14 -0
    WL#3201
      convert into a plugin

  storage/blackhole/Makefile.am
    1.0 06/04/13 13:49:24 acurtis@xiphis.org +0 -0
    BitKeeper file /home/antony/work2/wl3201.3/storage/blackhole/Makefile.am

  storage/archive/ha_archive.h
    1.44 06/04/13 13:49:24 acurtis@xiphis.org +1 -1
    WL#3201
      azlib.h now in local dir

  storage/archive/ha_archive.cc
    1.87 06/04/13 13:49:24 acurtis@xiphis.org +36 -14
    WL#3201
      Convert into a plugin

  storage/archive/Makefile.am
    1.4 06/04/13 13:49:24 acurtis@xiphis.org +39 -11
    WL#3201
      setup as plugin makefile

  sql/sql_builtin.cc.in
    1.0 06/04/13 13:49:24 acurtis@xiphis.org +0 -0
    BitKeeper file /home/antony/work2/wl3201.3/sql/sql_builtin.cc.in

  config/ac-macros/plugins.m4
    1.0 06/04/13 13:49:24 acurtis@xiphis.org +0 -0
    BitKeeper file /home/antony/work2/wl3201.3/config/ac-macros/plugins.m4

  sql/sql_yacc.yy
    1.464.1.25 06/04/13 13:49:23 acurtis@xiphis.org +1 -1
    WL#3201
      SHOW FULL PLUGIN

  sql/sql_show.cc
    1.327 06/04/13 13:49:23 acurtis@xiphis.org +28 -17
    WL#3201
      Fix to use plugin_foreach()

  sql/sql_plugin.cc
    1.18 06/04/13 13:49:23 acurtis@xiphis.org +64 -11
    WL#3201
      All compiled in plugins are in mysqld_builtins[]
      add funcs for plugin finalization
      install builtin plugins on initialization
      

  sql/sql_delete.cc
    1.181 06/04/13 13:49:23 acurtis@xiphis.org +2 -0
    WL#3201
      conditionally include ha_innodb.h

  sql/partition_info.cc
    1.10 06/04/13 13:49:23 acurtis@xiphis.org +2 -1
    WL#3201
      conditionally compile content

  sql/mysqld.cc
    1.534.2.18 06/04/13 13:49:23 acurtis@xiphis.org +13 -17
    WL#3201
      remove ha_register_builtin_plugins()
      alter init order so that storage engines are initialized before first use

  sql/log.cc
    1.199.1.5 06/04/13 13:49:23 acurtis@xiphis.org +15 -0
    WL#3201
      make into a plugin

  sql/handler.h
    1.197.1.5 06/04/13 13:49:23 acurtis@xiphis.org +3 -2
    WL#3201
      new DB_TYPE_FIRST_DYNAMIC
      new func ha_finalize_handlerton()
      remove ha_register_builtin_plugins()

  sql/handler.cc
    1.227 06/04/13 13:49:23 acurtis@xiphis.org +71 -82
    WL#3201
      Simplify how storage engines are found by db_type
      (hopefully we can get rid of it soon)
      Code cleanup

  sql/ha_partition.cc
    1.39.1.7 06/04/13 13:49:23 acurtis@xiphis.org +19 -0
    WL#3201
      make into a plugin
      conditionally compile content

  sql/ha_ndbcluster_binlog.cc
    1.41.2.1 06/04/13 13:49:23 acurtis@xiphis.org +2 -0
    WL#3201
      make into a plugin
      conditionally compile content

  sql/ha_ndbcluster.cc
    1.288.14.1 06/04/13 13:49:23 acurtis@xiphis.org +19 -0
    WL#3201
      make into a plugin
      conditionally compile content

  sql/ha_myisammrg.cc
    1.80.1.4 06/04/13 13:49:23 acurtis@xiphis.org +15 -0
    WL#3201
      make into a plugin

  sql/ha_myisam.cc
    1.176 06/04/13 13:49:23 acurtis@xiphis.org +16 -0
    WL#3201
      make into a plugin

  sql/ha_innodb.cc
    1.269 06/04/13 13:49:23 acurtis@xiphis.org +17 -0
    WL#3201
      make into a plugin
      conditionally compile content

  sql/ha_heap.cc
    1.82.1.5 06/04/13 13:49:23 acurtis@xiphis.org +13 -0
    WL#3201
      make into a plugin

  sql/ha_federated.cc
    1.57 06/04/13 13:49:23 acurtis@xiphis.org +19 -0
    WL#3201
      make into a plugin
      conditionally compile content

  sql/ha_berkeley.cc
    1.174 06/04/13 13:49:23 acurtis@xiphis.org +18 -0
    WL#3201
      make into a plugin
      conditionally compile content

  sql/Makefile.am
    1.136 06/04/13 13:49:22 acurtis@xiphis.org +15 -17
    WL#3201
      Storage engine files still left in sql subdir are not conditionally
      compiled. Should move them out soon,

  plugin/fulltext/plugin_example.c
    1.9 06/04/13 13:49:22 acurtis@xiphis.org +1 -1
    WL#3201
      change to mysql_declare_plugin macro

  plugin/fulltext/Makefile.am
    1.5 06/04/13 13:49:22 acurtis@xiphis.org +41 -6
    WL#3201
      update makefile

  plugin/Makefile.am
    1.1.1.1 06/04/13 13:49:22 acurtis@xiphis.org +27 -1
    WL#3201
      update makefile

  libmysqld/Makefile.am
    1.83.1.1 06/04/13 13:49:22 acurtis@xiphis.org +9 -15
    WL#3201
      Storage engine files still left in sql subdir are not conditionally
      compiled. Should move them out soon,

  include/mysql/plugin.h
    1.12 06/04/13 13:49:22 acurtis@xiphis.org +18 -3
    WL#3201
      support static and dynamic build - MYSQL_DYNAMIC_PLUGIN

  configure.in
    1.333.18.1 06/04/13 13:49:22 acurtis@xiphis.org +107 -78
    WL#3201
      out with storage.m4, in with plugins.m4
      change how plugins are declared
      include makefiles, remove handlerton.cc, add sql_builtin.cc

  config/ac-macros/ha_ndbcluster.m4
    1.14 06/04/13 13:49:22 acurtis@xiphis.org +3 -4
    WL#3201
      remove unused variables
      Split big macro

  config/ac-macros/ha_berkeley.m4
    1.5 06/04/13 13:49:22 acurtis@xiphis.org +0 -3
    WL#3201
      remove unused variable
      Makefile is always made

  Makefile.am
    1.86.2.1 06/04/13 13:49:22 acurtis@xiphis.org +1 -2
    WL#3201
      changes in build subst names

  BUILD/SETUP.sh
    1.53.1.5 06/04/13 13:49:22 acurtis@xiphis.org +3 -12
    WL#3201
      Changes in configure arguments

  BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df
    1.4 06/04/13 13:46:22 acurtis@xiphis.org +0 -0
    Delete: sql/handlerton-win.cc

  BitKeeper/deleted/.del-handlerton.cc.in~377156e7b06067cc
    1.2 06/04/13 13:46:17 acurtis@xiphis.org +0 -0
    Delete: sql/handlerton.cc.in

ChangeSet
  1.2119.419.1 06/04/13 13:26:22 jimw@mysql.com +2 -0
  Remove gcc-specific additions to AM_CFLAGS in unittest Makefile.am files

ChangeSet
  1.2119.418.2 06/04/13 23:26:02 andrey@lmy004. +1 -0
  update

  unittest/mytap/t/Makefile.am
    1.5 06/04/13 13:25:55 jimw@mysql.com +0 -2
    Don't add gcc-specific flags to AM_CFLAGS

  mysql-test/t/disabled.def
    1.133 06/04/13 23:25:54 andrey@lmy004. +4 -3
    update

  unittest/examples/Makefile.am
    1.4 06/04/13 13:25:47 jimw@mysql.com +0 -2
    Don't add gcc-specific flags to AM_CFLAGS

ChangeSet
  1.1810.1457.72 06/04/13 23:12:26 bell@sanja.is.com.ua +4 -0
  The check for recursive view definitions added. (BUG#14308)

  sql/sql_view.cc
    1.78.1.7 06/04/13 23:12:22 bell@sanja.is.com.ua +19 -1
    The check of view recursion.

  sql/share/errmsg.txt
    1.42.11.2 06/04/13 23:12:22 bell@sanja.is.com.ua +2 -0
    New error message about a recursive view.

  mysql-test/t/view.test
    1.126.1.15 06/04/13 23:12:22 bell@sanja.is.com.ua +31 -0
    BUG#14308 test suite.

  mysql-test/r/view.result
    1.138.1.14 06/04/13 23:12:22 bell@sanja.is.com.ua +23 -0
    BUG#14308 test suite.

ChangeSet
  1.2119.415.5 06/04/13 13:10:00 jimw@mysql.com +1 -0
  Clean up problem in mysql.spec caused by over-aggressive editor word-wrapping

  support-files/mysql.spec.sh
    1.138 06/04/13 13:08:33 jimw@mysql.com +3 -2
    Restore lines that got squished together by editor

ChangeSet
  1.2119.415.4 06/04/13 13:01:57 jimw@mysql.com +6 -0
  Fix 'make distcheck' problems with new unittest code, and a small
  portability problem.

  unittest/mytap/tap.c
    1.4 06/04/13 13:01:54 jimw@mysql.com +3 -2
    Fix portability problem (declarations after code in C code)

  unittest/mytap/t/Makefile.am
    1.4 06/04/13 13:01:54 jimw@mysql.com +1 -1
    Use builddir for finding mytap library

  unittest/mysys/Makefile.am
    1.3 06/04/13 13:01:54 jimw@mysql.com +1 -1
    Use srcdir to find mytap header

  unittest/examples/Makefile.am
    1.3 06/04/13 13:01:54 jimw@mysql.com +1 -1
    Use srcdir to find mytap header

  unittest/Makefile.am
    1.4 06/04/13 13:01:54 jimw@mysql.com +3 -1
    Add unit to DISTCLEANFILES, and make sure to copy it from srcdir

  BitKeeper/etc/ignore
    1.238 06/04/13 13:01:53 jimw@mysql.com +3 -7
    Use a wildcard to ignore all unittest *.t files

  BitKeeper/etc/ignore
    1.237 06/04/13 12:49:18 jimw@mysql.com +8 -0
    added unittest/examples/no_plan.t unittest/examples/simple.t unittest/examples/skip_all.t unittest/examples/skip.t unittest/examples/todo.t unittest/mysys/base64.t unittest/mysys/bitmap.t unittest/unit

ChangeSet
  1.2119.418.1 06/04/13 12:36:14 jimw@mysql.com +1 -0
  Don't remove mysql-test/std_data/*.pem in 'make clean'

  mysql-test/Makefile.am
    1.73 06/04/13 12:35:35 jimw@mysql.com +4 -3
    Don't clean *.pem files

ChangeSet
  1.1616.2535.2 06/04/13 20:42:48 mleich@mysql.com +6 -0
  Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to
  MySQL 4.1
    and Bug#16920 rpl_deadlock_innodb fails in show slave status (reported for MySQL 5.1)
    - backport of several fixes done in MySQL 5.0 to 4.1
    - fix for new discovered instability (see comment on Bug#12429 + Bug#16920)
    - reenabling of testcases

  mysql-test/t/rpl_until.test
    1.8.1.10 06/04/13 20:42:43 mleich@mysql.com +4 -0
    Add wait_for_slave_to_stop like in the current MySQL 5.0 version of this test.
    I assume this makes the test results more predictable.

  mysql-test/t/rpl_relayrotate.test
    1.7.1.6 06/04/13 20:42:43 mleich@mysql.com +3 -5
    - Replace select ... with select max(a)
    - add sync_with_master (backport fix done by Kristian in MySQL 5.0 because of timing
      problems similar to Bug#15624)

  mysql-test/t/rpl_deadlock.test
    1.1.1.5 06/04/13 20:42:43 mleich@mysql.com +11 -5
    - replace sleep with real_sleep (backport fix for Bug#15624 MySQL 5.0)
    - egalized value for Slave_IO_Running 
    - line 105 (backport fix for Bug#12429 MySQL 5.0)
    - line 85 (see comment in Bug#12429 
               + Bug#16920 rpl_deadlock_innodb fails in show slave status)
    - improve readability of show slave status output (--vertical_results)

  mysql-test/t/disabled.def
    1.1.3.1 06/04/13 20:42:43 mleich@mysql.com +0 -3
    Reenabling of tests

  mysql-test/r/rpl_relayrotate.result
    1.4.1.4 06/04/13 20:42:43 mleich@mysql.com +2 -5
    Updated results

  mysql-test/r/rpl_deadlock.result
    1.1.1.3 06/04/13 20:42:43 mleich@mysql.com +99 -6
    Updated results

ChangeSet
  1.2119.417.1 06/04/13 10:34:46 jimw@mysql.com +443 -0
  Remove sql-bench from the server repository -- it is being maintained
  in a distinct mysql-bench repository. Also add a new --benchdir option
  to mysql-test-run.pl so the location of the mysql-bench repository can
  be specified. The default location is adjacent to the source tree.

  support-files/mysql.spec.sh
    1.137 06/04/13 10:34:40 jimw@mysql.com +10 -27
    Deal with sql-bench being removed

  scripts/mysql_install_db.sh
    1.65 06/04/13 10:34:40 jimw@mysql.com +0 -3
    Deal with sql-bench being removed

  scripts/make_win_src_distribution.sh
    1.53 06/04/13 10:34:40 jimw@mysql.com +1 -1
    Deal with sql-bench being removed

  scripts/make_binary_distribution.sh
    1.119 06/04/13 10:34:40 jimw@mysql.com +3 -12
    Deal with sql-bench being removed

  mysql-test/mysql-test-run.pl
    1.102 06/04/13 10:34:40 jimw@mysql.com +6 -3
    Allow directory of mysql-bench to be specified with a new --benchdir
    option, and default to looking adjacent to the source tree.

  configure.in
    1.333.17.1 06/04/13 10:34:40 jimw@mysql.com +1 -17
    Deal with sql-bench being removed

  VC++Files/copy_mysql_files.bat
    1.4 06/04/13 10:34:39 jimw@mysql.com +0 -1
    Deal with sql-bench being removed

  Makefile.am
    1.87.2.1 06/04/13 10:34:39 jimw@mysql.com +2 -2
    @bench_dirs@ removed, just list mysql-test directly

ChangeSet
  1.2119.416.1 06/04/13 19:02:49 aelkin@mysql.com +1 -0
  Bug#19074:	rpl_row_func003 test failed
  disabled for now.

  mysql-test/t/disabled.def
    1.132 06/04/13 19:02:41 aelkin@mysql.com +1 -0
    disabled.

ChangeSet
  1.2119.414.1 06/04/13 16:19:19 ingo@mysql.com +1 -0
  Bug#18129 - Fast (online) add index leaves temporary table frm in case of errors
  
  ALTER TABLE temporarily creates a new table with a .frm
  file and optionally other files. For fast ALTER TABLE
  only the .frm file is created. If the operation succeeds,
  The temporary files are renamed to their final target.
  
  In case of an error, the temporary file was forgotten to
  remove.
  
  Manually tested. The test requires to look at files,
  which I think cannot be done portably with the test suite.
  The test file is attached to the bug report.

  sql/sql_table.cc
    1.308.1.17 06/04/13 16:19:11 ingo@mysql.com +18 -31
    Bug#18129 - Fast (online) add index leaves temporary table frm in case of errors
    Moved closing or removing of the temporary table
    to an 'err1' label at the end of mysql_alter_table().
    Added gotos to this label from all error checks between
    create or open and remove or close of the temporary table.

ChangeSet
  1.2119.412.4 06/04/13 15:34:38 tomas@poseidon.ndb.mysql.com +1 -0
  retested all disabled ndb tests in pushbuild for 5+ runs and updated disabled.def accordingly

  mysql-test/t/disabled.def
    1.131 06/04/13 15:34:32 tomas@poseidon.ndb.mysql.com +15 -11
    retested all disabled ndb tests in pushbuild for 5+ runs and updated disabled.def accordingly

ChangeSet
  1.2119.412.3 06/04/13 15:16:02 tomas@poseidon.ndb.mysql.com +3 -0
  BUG#18976 test workaround

  mysql-test/t/ndb_binlog_ddl_multi.test
    1.12 06/04/13 15:15:53 tomas@poseidon.ndb.mysql.com +11 -4
    BUG#18976 test workaround

  mysql-test/t/disabled.def
    1.130 06/04/13 15:15:53 tomas@poseidon.ndb.mysql.com +1 -11
    BUG#18976 test workaround

  mysql-test/r/ndb_binlog_ddl_multi.result
    1.12 06/04/13 15:15:53 tomas@poseidon.ndb.mysql.com +2 -6
    BUG#18976 test workaround

ChangeSet
  1.1810.1457.71 06/04/13 16:06:52 bell@sanja.is.com.ua +1 -0
  postmerge fix: added tinfo support.

  config/ac-macros/misc.m4
    1.12 06/04/13 16:06:48 bell@sanja.is.com.ua +4 -1
    postmerge fix: added tinfo support.

ChangeSet
  1.1810.1558.1 06/04/13 16:05:32 sergefp@mysql.com +3 -0
  BUG#19021, Crash in ROR-index_merge optimizer: 
  get_best_covering_ror_intersect() was copying ror_scans starting from the 
  end of the array and not from its beginning.

  sql/opt_range.cc
    1.159.1.49 06/04/13 16:05:29 sergefp@mysql.com +1 -1
    BUG#19021: In get_best_covering_ror_intersect(), the array of pointers to
    scans to be used is [tree->ror_scans, ror_scan_mark), and not
    [ror_scan_mark, ...)

  mysql-test/t/index_merge_innodb.test
    1.12 06/04/13 16:05:29 sergefp@mysql.com +52 -0
    Testcase for BUG#19021

  mysql-test/r/index_merge_innodb.result
    1.14.1.1 06/04/13 16:05:29 sergefp@mysql.com +22 -0
    Testcase for BUG#19021

ChangeSet
  1.2119.412.2 06/04/13 13:31:14 tomas@poseidon.ndb.mysql.com +1 -0
  disabled tests with accurate bug reports

  mysql-test/t/disabled.def
    1.129 06/04/13 13:31:07 tomas@poseidon.ndb.mysql.com +4 -4
    disabled tests with accurate bug reports

ChangeSet
  1.1616.2542.1 06/04/13 16:19:21 ramil@mysql.com +3 -0
  Fix for bug #18643: crazy UNCOMPRESS().

  sql/item_strfunc.cc
    1.196.6.7 06/04/13 16:19:16 ramil@mysql.com +1 -0
    Fix for bug #18643: crazy UNCOMPRESS().
      - set null_value.

  mysql-test/t/func_compress.test
    1.10.1.2 06/04/13 16:19:16 ramil@mysql.com +9 -0
    Fix for bug #18643: crazy UNCOMPRESS().
      - test-case

  mysql-test/r/func_compress.result
    1.16 06/04/13 16:19:16 ramil@mysql.com +7 -0
    Fix for bug #18643: crazy UNCOMPRESS().
      - test-case

ChangeSet
  1.1810.1557.1 06/04/13 13:02:58 msvensson@neptunus.(none) +1 -0
  Bug#18837 Many build and test failures when configuring without --disable-shared
  Build "NOINST" tools with -static flag to avoid  any ld problems when using them

  configure.in
    1.245.44.1 06/04/13 13:02:53 msvensson@neptunus.(none) +1 -1
    Build "NOINST" tools with -static flag to avoid  any ld problems when using them

ChangeSet
  1.1616.2541.1 06/04/13 14:06:46 konstantin@mysql.com +1 -0
  Fix a typo in the help message.

  sql/mysqld.cc
    1.356.98.23 06/04/13 14:06:37 konstantin@mysql.com +1 -1
    Fix a typo.

ChangeSet
  1.1616.2539.1 06/04/13 14:37:03 svoj@april.(none) +1 -0
  BUG#17917 - SELECT from compressed MyISAM table crashes MySQL server
  
  Retrieving data from compressed MyISAM table which is bigger than 4G on 32-bit box
  with mmap() support results in server crash.
  
  mmap() accepts length of bytes to be mapped in second param, which is 32-bit
  size_t. But we pass data_file_length, which is 64-bit my_off_t. As a result only
  first data_file_length % 4G were mapped.
  
  This fix adds additional condition for mmap() usage, that is use mmap() for
  compressed table which size is no more than 4G on 32-bit platform.

  myisam/mi_packrec.c
    1.25.1.3 06/04/13 14:37:00 svoj@april.(none) +10 -4
    Use mmap() for compressed table which size is no more than 4G on 32-bit platform.

ChangeSet
  1.2119.1.216 06/04/13 09:57:51 serg@serg.mylan +2 -0
  fix for distcheck

  sql/sql_lex.cc
    1.176 06/04/13 09:57:37 serg@serg.mylan +1 -1
    fix for distcheck

  configure.in
    1.333.15.2 06/04/13 09:57:36 serg@serg.mylan +2 -1
    fix the test for distcheck

ChangeSet
  1.1810.1457.68 06/04/13 17:22:56 grog@mysql.com[grog] +8 -0
  foo2

  sql/sql_repl.cc
    1.133.1.17 06/04/13 16:55:52 grog@mysql.com[grog] +0 -21
    Import patch foo2

  sql/sql_class.h
    1.230.1.58 06/04/13 16:55:52 grog@mysql.com[grog] +1 -5
    Import patch foo2

  sql/set_var.cc
    1.125.8.3 06/04/13 16:55:52 grog@mysql.com[grog] +0 -25
    Import patch foo2

  sql/mysqld.cc
    1.439.51.3 06/04/13 16:55:52 grog@mysql.com[grog] +0 -17
    Import patch foo2

  sql/handler.h
    1.138.10.2 06/04/13 16:55:52 grog@mysql.com[grog] +0 -5
    Import patch foo2

  sql/handler.cc
    1.167.1.45 06/04/13 16:55:52 grog@mysql.com[grog] +0 -53
    Import patch foo2

  sql/ha_innodb.h
    1.93.1.19 06/04/13 16:55:52 grog@mysql.com[grog] +0 -3
    Import patch foo2

  sql/ha_innodb.cc
    1.202.1.91 06/04/13 16:55:52 grog@mysql.com[grog] +1 -230
    Import patch foo2

ChangeSet
  1.1810.1457.67 06/04/13 17:20:33 grog@mysql.com[grog] +8 -0
  foo1

  sql/sql_repl.cc
    1.133.1.16 06/04/13 16:55:28 grog@mysql.com[grog] +9 -9
    Import patch foo1

  sql/sql_class.h
    1.230.1.57 06/04/13 17:19:33 grog@mysql.com[grog] +24 -24
    Import patch foo1

  sql/set_var.cc
    1.125.8.2 06/04/13 16:55:28 grog@mysql.com[grog] +25 -25
    Import patch foo1

  sql/mysqld.cc
    1.439.51.2 06/04/13 17:16:53 grog@mysql.com[grog] +48 -48
    Import patch foo1

  sql/handler.h
    1.138.10.1 06/04/13 16:55:28 grog@mysql.com[grog] +13 -13
    Import patch foo1

  sql/handler.cc
    1.167.1.44 06/04/13 16:55:28 grog@mysql.com[grog] +38 -38
    Import patch foo1

  sql/ha_innodb.h
    1.93.1.18 06/04/13 16:55:28 grog@mysql.com[grog] +8 -8
    Import patch foo1

  sql/ha_innodb.cc
    1.202.1.90 06/04/13 16:55:28 grog@mysql.com[grog] +139 -139
    Import patch foo1

ChangeSet
  1.2119.379.11 06/04/13 09:37:43 tomas@poseidon.ndb.mysql.com +1 -0
  wrong ndb object used to drop event operation causing DBUG_ASSERT in shutdown/cleanup

  sql/ha_ndbcluster_binlog.cc
    1.41.1.3 06/04/13 09:37:37 tomas@poseidon.ndb.mysql.com +8 -5
    wrong ndb object used to drop event operation causing DBUG_ASSERT in shutdown/cleanup

ChangeSet
  1.2119.411.1 06/04/13 08:47:22 jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#18622
    Fix 4 replica bug in packLqhKeyReq, problem introduced by opt. nr.

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.103 06/04/13 08:47:19 jonas@perch.ndb.mysql.com +37 -15
    Fix packLqhKeyReqLab when having full AI in this and appending gci/rowid (used to casue 23+3 = 26 in signal length)
    Note: This is a very ineffectice patch, but only for 4 replicas
    This will be fixed when sending lqhkeyreq as long signal (or even just attrinfo as long)

ChangeSet
  1.1616.2538.1 06/04/13 10:55:48 bar@mysql.com +4 -0
  Bug#18691: Converting number to UNICODE string returns invalid result.
  
  Conversion from int and real numbers to UCS2 didn't work fine: 
  CONVERT(100, CHAR(50) UNICODE)
  CONVERT(103.9, CHAR(50) UNICODE)
  
  The problem appeared because numbers have binary charset, so,
  simple charset recast binary->ucs2 was performed
  instead of real conversion.
  
  Fixed to make numbers pretend to be non-binary.

  sql/item_timefunc.h
    1.42.1.14 06/04/13 10:55:41 bar@mysql.com +1 -1
    Adding new member from_cs, to replace my_charset_bin
    to a non-binary charset when converting from numbers to UCS2

  sql/item_timefunc.cc
    1.51.1.47 06/04/13 10:55:41 bar@mysql.com +23 -5
    Adding new member from_cs, to replace my_charset_bin
    to a non-binary charset when converting from numbers to UCS2

  mysql-test/t/ctype_ucs.test
    1.15.1.14 06/04/13 10:55:41 bar@mysql.com +8 -0
    Adding test case

  mysql-test/r/ctype_ucs.result
    1.11.1.18 06/04/13 10:55:41 bar@mysql.com +12 -0
    Adding test case

  BitKeeper/deleted/.del-ha_tina.m4~f658506ebbc113ca
    1.3 06/04/12 21:42:03 acurtis@xiphis.org +0 -0
    Delete: config/ac-macros/ha_tina.m4

  BitKeeper/deleted/.del-ha_partition.m4~bc57067550be5f89
    1.4 06/04/12 21:41:58 acurtis@xiphis.org +0 -0
    Delete: config/ac-macros/ha_partition.m4

  BitKeeper/deleted/.del-ha_innodb.m4~6f141fb5b80c1f39
    1.4 06/04/12 21:41:47 acurtis@xiphis.org +0 -0
    Delete: config/ac-macros/ha_innodb.m4

  BitKeeper/deleted/.del-ha_federated.m4~7acddd58286acfd6
    1.3 06/04/12 21:41:33 acurtis@xiphis.org +0 -0
    Delete: config/ac-macros/ha_federated.m4

  BitKeeper/deleted/.del-ha_example.m4~1dfb268163297708
    1.3 06/04/12 21:41:26 acurtis@xiphis.org +0 -0
    Delete: config/ac-macros/ha_example.m4

  BitKeeper/deleted/.del-ha_blackhole.m4~8ed06eb91f6420ed
    1.2 06/04/12 21:41:21 acurtis@xiphis.org +0 -0
    Delete: config/ac-macros/ha_blackhole.m4

  BitKeeper/deleted/.del-ha_archive.m4~a07fac7110b39294
    1.3 06/04/12 21:41:16 acurtis@xiphis.org +0 -0
    Delete: config/ac-macros/ha_archive.m4

  BitKeeper/deleted/.del-storage.m4~24bf2fffdaa328ad
    1.5 06/04/12 21:40:35 acurtis@xiphis.org +137 -35
    Delete: config/ac-macros/storage.m4

  BitKeeper/deleted/.del-test-alpha-ccc~1d7b807aec2c6bf9
    1.3 06/04/12 19:02:52 jimw@mysql.com +0 -0
    Delete: BUILD/test-alpha-ccc

  BitKeeper/deleted/.del-sybase.cfg~c4636b12767b3f14
    1.3 06/04/12 18:55:46 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/sybase.cfg

  BitKeeper/deleted/.del-solid.cfg~5ae0e4342eadb0fb
    1.3 06/04/12 18:55:46 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/solid.cfg

  BitKeeper/deleted/.del-solid-nt4.cfg~cca779f0c9e29d31
    1.3 06/04/12 18:55:46 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/solid-nt4.cfg

  BitKeeper/deleted/.del-pg.cfg~db59cf39a5d417be
    1.9 06/04/12 18:55:45 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/pg.cfg

  BitKeeper/deleted/.del-oracle.cfg~affab21af8f438fd
    1.6 06/04/12 18:55:45 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/oracle.cfg

  BitKeeper/deleted/.del-mysql.cfg~9cab20a8771b93cf
    1.2 06/04/12 18:55:44 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/mysql.cfg

  BitKeeper/deleted/.del-mysql-4.1.cfg~b6c5e74aefc99e3c
    1.3 06/04/12 18:55:44 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/mysql-4.1.cfg

  BitKeeper/deleted/.del-mysql-4.0.cfg~6c9d63c85b5ef574
    1.25 06/04/12 18:55:44 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/mysql-4.0.cfg

  BitKeeper/deleted/.del-mysql-3.23.cfg~3cf9d6be54b77a3c
    1.12 06/04/12 18:55:43 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/mysql-3.23.cfg

  BitKeeper/deleted/.del-mysql-3.22.cfg~e706f26a161175cd
    1.4 06/04/12 18:55:43 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/mysql-3.22.cfg

  BitKeeper/deleted/.del-msql.cfg~52710b12932cceb9
    1.4 06/04/12 18:55:42 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/msql.cfg

  BitKeeper/deleted/.del-ms-sql65.cfg~6b9bc3c460dbee05
    1.3 06/04/12 18:55:42 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/ms-sql65.cfg

  BitKeeper/deleted/.del-ms-sql.cfg~1907964264d2786a
    1.8 06/04/12 18:55:41 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/ms-sql.cfg

  BitKeeper/deleted/.del-mimer.cfg~234e6c1c3c47b612
    1.5 06/04/12 18:55:41 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/mimer.cfg

  BitKeeper/deleted/.del-interbase.cfg~c6951a0376cc6ff3
    1.4 06/04/12 18:55:41 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/interbase.cfg

  BitKeeper/deleted/.del-interbase-superserver.cfg~22501198689243b0
    1.2 06/04/12 18:55:40 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/interbase-superserver.cfg

  BitKeeper/deleted/.del-interbase-dialect3.cfg~46277bdfc74c667a
    1.2 06/04/12 18:55:40 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/interbase-dialect3.cfg

  BitKeeper/deleted/.del-interbase-dialect1.cfg~659206b5b9a11036
    1.2 06/04/12 18:55:40 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/interbase-dialect1.cfg

  BitKeeper/deleted/.del-frontbase.cfg~71369e9c002696e
    1.3 06/04/12 18:55:39 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/frontbase.cfg

  BitKeeper/deleted/.del-empress.cfg~1f97f34d6560a499
    1.3 06/04/12 18:55:39 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/empress.cfg

  BitKeeper/deleted/.del-db2.cfg~711099b4d7906959
    1.4 06/04/12 18:55:38 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/db2.cfg

  BitKeeper/deleted/.del-access_odbc.cfg~34b4cf0eda56c4b1
    1.4 06/04/12 18:55:38 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/access_odbc.cfg

  BitKeeper/deleted/.del-access.cfg~5239ea3655b7bba0
    1.7 06/04/12 18:55:38 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/access.cfg

  BitKeeper/deleted/.del-uname.bat~a6d933d2ee9314c
    1.3 06/04/12 18:55:37 jimw@mysql.com +0 -0
    Delete: sql-bench/uname.bat

  BitKeeper/deleted/.del-Informix.cfg~b94188e1ececb51b
    1.3 06/04/12 18:55:37 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/Informix.cfg

  BitKeeper/deleted/.del-Adabas.cfg~343ed4e7f8b02111
    1.4 06/04/12 18:55:37 jimw@mysql.com +0 -0
    Delete: sql-bench/limits/Adabas.cfg

  BitKeeper/deleted/.del-test-wisconsin.sh~c0b86821b5f95f26
    1.13 06/04/12 18:55:36 jimw@mysql.com +0 -0
    Delete: sql-bench/test-wisconsin.sh

  BitKeeper/deleted/.del-test-transactions.sh~c1c892f10c40caf
    1.7 06/04/12 18:55:36 jimw@mysql.com +0 -0
    Delete: sql-bench/test-transactions.sh

  BitKeeper/deleted/.del-test-select.sh~6d5cc770acf11be6
    1.24 06/04/12 18:55:35 jimw@mysql.com +0 -0
    Delete: sql-bench/test-select.sh

  BitKeeper/deleted/.del-test-insert.sh~893bfac9dedb79a7
    1.42 06/04/12 18:55:35 jimw@mysql.com +0 -0
    Delete: sql-bench/test-insert.sh

  BitKeeper/deleted/.del-test-create.sh~f9a1ea38c191b17a
    1.12 06/04/12 18:55:35 jimw@mysql.com +0 -0
    Delete: sql-bench/test-create.sh

  BitKeeper/deleted/.del-test-connect.sh~382a728c949ee075
    1.14 06/04/12 18:55:35 jimw@mysql.com +0 -0
    Delete: sql-bench/test-connect.sh

  BitKeeper/deleted/.del-test-big-tables.sh~5b1b0c5fb623565a
    1.9 06/04/12 18:55:34 jimw@mysql.com +0 -0
    Delete: sql-bench/test-big-tables.sh

  BitKeeper/deleted/.del-test-alter-table.sh~eba6cfa9972fcced
    1.12 06/04/12 18:55:34 jimw@mysql.com +0 -0
    Delete: sql-bench/test-alter-table.sh

  BitKeeper/deleted/.del-test-ATIS.sh~e8ebff7086c95773
    1.13 06/04/12 18:55:34 jimw@mysql.com +0 -0
    Delete: sql-bench/test-ATIS.sh

  BitKeeper/deleted/.del-server-cfg.sh~556b3a2b6a11dcce
    1.52 06/04/12 18:55:33 jimw@mysql.com +0 -0
    Delete: sql-bench/server-cfg.sh

  BitKeeper/deleted/.del-run-all-tests.sh~41d6da1cf211ee95
    1.13 06/04/12 18:55:33 jimw@mysql.com +0 -0
    Delete: sql-bench/run-all-tests.sh

  BitKeeper/deleted/.del-pwd.bat~9b64050849abf51
    1.3 06/04/12 18:55:33 jimw@mysql.com +0 -0
    Delete: sql-bench/pwd.bat

  BitKeeper/deleted/.del-print-limit-table~b8e808031daa3758
    1.8 06/04/12 18:55:32 jimw@mysql.com +0 -0
    Delete: sql-bench/print-limit-table

  BitKeeper/deleted/.del-innotest2b.sh~7b99ece835e8dff3
    1.3 06/04/12 18:55:32 jimw@mysql.com +0 -0
    Delete: sql-bench/innotest2b.sh

  BitKeeper/deleted/.del-innotest2a.sh~e01d016a7cafdc0b
    1.3 06/04/12 18:55:32 jimw@mysql.com +0 -0
    Delete: sql-bench/innotest2a.sh

  BitKeeper/deleted/.del-innotest2.sh~9c14df528285603
    1.3 06/04/12 18:55:31 jimw@mysql.com +0 -0
    Delete: sql-bench/innotest2.sh

  BitKeeper/deleted/.del-innotest1b.sh~aafd0819ae84da7b
    1.3 06/04/12 18:55:31 jimw@mysql.com +0 -0
    Delete: sql-bench/innotest1b.sh

  BitKeeper/deleted/.del-innotest1a.sh~c64f4610ae1e26fe
    1.3 06/04/12 18:55:31 jimw@mysql.com +0 -0
    Delete: sql-bench/innotest1a.sh

  BitKeeper/deleted/.del-innotest1.sh~aa36bce09ca783c7
    1.3 06/04/12 18:55:30 jimw@mysql.com +0 -0
    Delete: sql-bench/innotest1.sh

  BitKeeper/deleted/.del-graph-compare-results.sh~7e4e28b3591b4542
    1.3 06/04/12 18:55:30 jimw@mysql.com +0 -0
    Delete: sql-bench/graph-compare-results.sh

  BitKeeper/deleted/.del-example.bat~22d0170bccf0f030
    1.3 06/04/12 18:55:30 jimw@mysql.com +0 -0
    Delete: sql-bench/example.bat

  BitKeeper/deleted/.del-crash-me.sh~2fa881d0b40339c8
    1.49 06/04/12 18:55:29 jimw@mysql.com +0 -0
    Delete: sql-bench/crash-me.sh

  BitKeeper/deleted/.del-copy-db.sh~e8116afb93144ccd
    1.7 06/04/12 18:55:29 jimw@mysql.com +0 -0
    Delete: sql-bench/copy-db.sh

  BitKeeper/deleted/.del-compare-results.sh~a9e26e2644c694b3
    1.11 06/04/12 18:55:29 jimw@mysql.com +0 -0
    Delete: sql-bench/compare-results.sh

  BitKeeper/deleted/.del-bench-init.pl.sh~db41ef36a289736c
    1.30 06/04/12 18:55:29 jimw@mysql.com +0 -0
    Delete: sql-bench/bench-init.pl.sh

  BitKeeper/deleted/.del-bench-count-distinct.sh~a92f174271a831d7
    1.3 06/04/12 18:55:28 jimw@mysql.com +0 -0
    Delete: sql-bench/bench-count-distinct.sh

  BitKeeper/deleted/.del-as3ap.sh~f54eebbd8d34c9b6
    1.3 06/04/12 18:55:28 jimw@mysql.com +0 -0
    Delete: sql-bench/as3ap.sh

  BitKeeper/deleted/.del-TODO~cac6d7a63c426ae5
    1.2 06/04/12 18:55:28 jimw@mysql.com +0 -0
    Delete: sql-bench/TODO

  BitKeeper/deleted/.del-README~b1aa0c1bf9f5eb5e
    1.9 06/04/12 18:55:27 jimw@mysql.com +0 -0
    Delete: sql-bench/README

  BitKeeper/deleted/.del-Makefile.am~7b07da85b2e9375
    1.21 06/04/12 18:55:27 jimw@mysql.com +0 -0
    Delete: sql-bench/Makefile.am

  BitKeeper/deleted/.del-ChangeLog~c7abb5abd266ca5b
    1.4 06/04/12 18:55:27 jimw@mysql.com +0 -0
    Delete: sql-bench/ChangeLog

  BitKeeper/deleted/.del-.cvsignore~ed869f4c40f3d576
    1.6 06/04/12 18:55:27 jimw@mysql.com +0 -0
    Delete: sql-bench/.cvsignore

  BitKeeper/deleted/.del-wisconsin-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid~f1c97174bd9c7f51
    1.3 06/04/12 18:55:26 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-wisconsin-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~ebdeb628338b7b51
    1.2 06/04/12 18:55:26 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg

  BitKeeper/deleted/.del-wisconsin-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid~ffdea7edff6f4fbe
    1.3 06/04/12 18:55:26 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-wisconsin-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~604f493a45201ad9
    1.2 06/04/12 18:55:26 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg

  BitKeeper/deleted/.del-wisconsin-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid~c031bfc63e5e5f2e
    1.3 06/04/12 18:55:25 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-wisconsin-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle~1778869029501916
    1.3 06/04/12 18:55:25 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle

  BitKeeper/deleted/.del-wisconsin-oracle-Linux_2.0.36_i686-cmp-mysql,oracle~6daa8be9afd8d66b
    1.3 06/04/12 18:55:25 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-oracle-Linux_2.0.36_i686-cmp-mysql,oracle

  BitKeeper/deleted/.del-wisconsin-mysql_odbc-win98~5bbc39935723fc64
    1.3 06/04/12 18:55:25 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-mysql_odbc-win98

  BitKeeper/deleted/.del-wisconsin-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql~488787578358cc35
    1.3 06/04/12 18:55:24 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-wisconsin-mysql-win98~795461eba3514b47
    1.4 06/04/12 18:55:24 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-mysql-win98

  BitKeeper/deleted/.del-wisconsin-mysql-SunOS_5.8_sun4u~c6dc13908e90176f
    1.2 06/04/12 18:55:24 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-mysql-SunOS_5.8_sun4u

  BitKeeper/deleted/.del-wisconsin-mysql-SunOS_5.7_sun4u~f27927f8c64ea8ad
    1.3 06/04/12 18:55:23 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-mysql-SunOS_5.7_sun4u

  BitKeeper/deleted/.del-wisconsin-mysql-SunOS_5.7_sun4m~580e8050e43e0005
    1.4 06/04/12 18:55:23 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-mysql-SunOS_5.7_sun4m

  BitKeeper/deleted/.del-wisconsin-mysql-SunOS_5.5.1_sun4u~379705afa2e12378
    1.3 06/04/12 18:55:23 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-mysql-SunOS_5.5.1_sun4u

  BitKeeper/deleted/.del-wisconsin-mysql-NT_4.0~283629367e086581
    1.12 06/04/12 18:55:23 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-mysql-NT_4.0

  BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.4.4_SMP_alpha~8b2f917fc876fc7a
    1.2 06/04/12 18:55:22 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-mysql-Linux_2.4.4_SMP_alpha

  BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.4.16_64GB_SMP_i686~e32f769c6188dd2
    1.2 06/04/12 18:55:22 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-mysql-Linux_2.4.16_64GB_SMP_i686

  BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.4.0_64GB_SMP_i686~7a02185b13c0b44e
    1.2 06/04/12 18:55:22 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-mysql-Linux_2.4.0_64GB_SMP_i686

  BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.1_i686-cmp-adabas,mysql~9c79427e739c735d
    1.3 06/04/12 18:55:22 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-mysql-Linux_2.2.1_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.16_SMP_alpha~8f9745c884aa92f4
    1.4 06/04/12 18:55:21 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-mysql-Linux_2.2.16_SMP_alpha

  BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.10_i686-cmp-msql,mysql~fc6765479b4b64cd
    1.3 06/04/12 18:55:21 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-mysql-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid~acc67b004dc75f98
    1.3 06/04/12 18:55:21 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.0.35_i686-cmp-adabas,mysql~e89ae8dfa5378f09
    1.3 06/04/12 18:55:21 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-mysql-Linux_2.0.35_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-wisconsin-mysql-HP_UX_B.10.20_9000_778~718acc72754fba97
    1.3 06/04/12 18:55:20 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-mysql-HP_UX_B.10.20_9000_778

  BitKeeper/deleted/.del-wisconsin-msql-Linux_2.2.10_i686-cmp-msql,mysql~d1dc6e639d4779e1
    1.3 06/04/12 18:55:20 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-msql-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-wisconsin-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql~d1d359e3c9dda9db
    1.2 06/04/12 18:55:20 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql

  BitKeeper/deleted/.del-wisconsin-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql~8489f0f6c0c7d18c
    1.3 06/04/12 18:55:20 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/wisconsin-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-transactions-mysql-Linux_2.4.4_SMP_alpha~3c3606d8f979f51
    1.2 06/04/12 18:55:19 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/transactions-mysql-Linux_2.4.4_SMP_alpha

  BitKeeper/deleted/.del-transactions-mysql-Linux_2.4.16_64GB_SMP_i686~3cf318d85adcc5cb
    1.2 06/04/12 18:55:19 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/transactions-mysql-Linux_2.4.16_64GB_SMP_i686

  BitKeeper/deleted/.del-select-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid~987c920c779705cf
    1.3 06/04/12 18:55:19 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-select-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~4a06e51b297d5570
    1.2 06/04/12 18:55:18 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg

  BitKeeper/deleted/.del-select-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid~79f7792e1422b43f
    1.3 06/04/12 18:55:18 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-select-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~fa83673053168348
    1.2 06/04/12 18:55:18 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg

  BitKeeper/deleted/.del-select-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid~ea1dfd1a49ff576c
    1.3 06/04/12 18:55:18 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-select-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle~81512da61e0cb2dc
    1.3 06/04/12 18:55:17 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle

  BitKeeper/deleted/.del-select-oracle-Linux_2.0.36_i686-cmp-mysql,oracle~de20213816f2cf80
    1.3 06/04/12 18:55:17 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-oracle-Linux_2.0.36_i686-cmp-mysql,oracle

  BitKeeper/deleted/.del-select-mysql_odbc-win98~bc95f67bab05b1bf
    1.3 06/04/12 18:55:17 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-mysql_odbc-win98

  BitKeeper/deleted/.del-select-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql~3f6a1a0d769f89e3
    1.3 06/04/12 18:55:16 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-select-mysql-win98~6c82dc82a2bd76ba
    1.4 06/04/12 18:55:16 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-mysql-win98

  BitKeeper/deleted/.del-select-mysql-SunOS_5.8_sun4u~b4d7791617c9c130
    1.2 06/04/12 18:55:16 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-mysql-SunOS_5.8_sun4u

  BitKeeper/deleted/.del-select-mysql-SunOS_5.7_sun4u~632c92971c61e34a
    1.3 06/04/12 18:55:16 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-mysql-SunOS_5.7_sun4u

  BitKeeper/deleted/.del-select-mysql-SunOS_5.7_sun4m~98faf6c7bb382fe
    1.4 06/04/12 18:55:15 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-mysql-SunOS_5.7_sun4m

  BitKeeper/deleted/.del-select-mysql-SunOS_5.5.1_sun4u~c9a1a498a052e268
    1.3 06/04/12 18:55:15 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-mysql-SunOS_5.5.1_sun4u

  BitKeeper/deleted/.del-select-mysql-NT_4.0~68e53f4d285f6c8
    1.12 06/04/12 18:55:15 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-mysql-NT_4.0

  BitKeeper/deleted/.del-select-mysql-Linux_2.4.4_SMP_alpha~feb1610a86f00654
    1.2 06/04/12 18:55:15 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-mysql-Linux_2.4.4_SMP_alpha

  BitKeeper/deleted/.del-select-mysql-Linux_2.4.16_64GB_SMP_i686~bf28885bfc7cc742
    1.2 06/04/12 18:55:14 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-mysql-Linux_2.4.16_64GB_SMP_i686

  BitKeeper/deleted/.del-select-mysql-Linux_2.4.0_64GB_SMP_i686~90c8074428c8a9bc
    1.2 06/04/12 18:55:14 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-mysql-Linux_2.4.0_64GB_SMP_i686

  BitKeeper/deleted/.del-select-mysql-Linux_2.2.1_i686-cmp-adabas,mysql~40d76ff0c6abd440
    1.3 06/04/12 18:55:14 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-mysql-Linux_2.2.1_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-select-mysql-Linux_2.2.16_SMP_alpha~d02b2891a4964e60
    1.4 06/04/12 18:55:14 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-mysql-Linux_2.2.16_SMP_alpha

  BitKeeper/deleted/.del-select-mysql-Linux_2.2.10_i686-cmp-msql,mysql~15cf41773458fdee
    1.3 06/04/12 18:55:13 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-mysql-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-select-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid~195a8803a505d0e6
    1.3 06/04/12 18:55:13 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-select-mysql-Linux_2.0.35_i686-cmp-adabas,mysql~e48d4b0a3b15a56d
    1.3 06/04/12 18:55:13 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-mysql-Linux_2.0.35_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-select-mysql-HP_UX_B.10.20_9000_778~f9b106ee9ff6b3d7
    1.3 06/04/12 18:55:13 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-mysql-HP_UX_B.10.20_9000_778

  BitKeeper/deleted/.del-select-msql-Linux_2.2.10_i686-cmp-msql,mysql~4fd08d95716e1d7e
    1.3 06/04/12 18:55:13 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-msql-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-select-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql~ebd8a4e44a0acf
    1.2 06/04/12 18:55:12 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql

  BitKeeper/deleted/.del-select-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql~26e212f592aecc3a
    1.3 06/04/12 18:55:12 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/select-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-insert-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid~eb25bd34abfb3f3e
    1.4 06/04/12 18:55:12 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-insert-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~10c38322f8bc83f
    1.2 06/04/12 18:55:12 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg

  BitKeeper/deleted/.del-insert-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid~a70aae8c2950405c
    1.4 06/04/12 18:55:11 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-insert-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~b93a767f8d81ba33
    1.2 06/04/12 18:55:11 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg

  BitKeeper/deleted/.del-insert-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid~d124baae1c17a384
    1.4 06/04/12 18:55:11 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-insert-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle~b1fda485df498a58
    1.4 06/04/12 18:55:11 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle

  BitKeeper/deleted/.del-insert-oracle-Linux_2.0.36_i686-cmp-mysql,oracle~7dbd79fec1e7e1b1
    1.4 06/04/12 18:55:10 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-oracle-Linux_2.0.36_i686-cmp-mysql,oracle

  BitKeeper/deleted/.del-insert-mysql_odbc-win98~52247fd8f94874c1
    1.4 06/04/12 18:55:10 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-mysql_odbc-win98

  BitKeeper/deleted/.del-insert-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql~a4814074b474fc72
    1.4 06/04/12 18:55:10 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-insert-mysql-win98~bbf7e244641d4003
    1.5 06/04/12 18:55:10 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-mysql-win98

  BitKeeper/deleted/.del-insert-mysql-SunOS_5.8_sun4u~54610b5db9b7be0f
    1.3 06/04/12 18:55:09 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-mysql-SunOS_5.8_sun4u

  BitKeeper/deleted/.del-insert-mysql-SunOS_5.7_sun4u~78efa132c6e252b9
    1.3 06/04/12 18:55:09 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-mysql-SunOS_5.7_sun4u

  BitKeeper/deleted/.del-insert-mysql-SunOS_5.7_sun4m~3f1912de8939606e
    1.5 06/04/12 18:55:09 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-mysql-SunOS_5.7_sun4m

  BitKeeper/deleted/.del-insert-mysql-SunOS_5.5.1_sun4u~8a9ae41f9a79f79
    1.3 06/04/12 18:55:09 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-mysql-SunOS_5.5.1_sun4u

  BitKeeper/deleted/.del-insert-mysql-NT_4.0~2da89ac977203b64
    1.13 06/04/12 18:55:08 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-mysql-NT_4.0

  BitKeeper/deleted/.del-insert-mysql-Linux_2.4.4_SMP_alpha~618312e541c41bf
    1.2 06/04/12 18:55:08 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-mysql-Linux_2.4.4_SMP_alpha

  BitKeeper/deleted/.del-insert-mysql-Linux_2.4.16_64GB_SMP_i686~58b5ab2783e8bed8
    1.2 06/04/12 18:55:08 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-mysql-Linux_2.4.16_64GB_SMP_i686

  BitKeeper/deleted/.del-insert-mysql-Linux_2.4.0_64GB_SMP_i686~4eaf16cd96aa5659
    1.2 06/04/12 18:55:08 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-mysql-Linux_2.4.0_64GB_SMP_i686

  BitKeeper/deleted/.del-insert-mysql-Linux_2.2.1_i686-cmp-adabas,mysql~5ce02dfcb05e552a
    1.4 06/04/12 18:55:07 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-mysql-Linux_2.2.1_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-insert-mysql-Linux_2.2.16_SMP_alpha~8376549c28db6e1b
    1.4 06/04/12 18:55:07 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-mysql-Linux_2.2.16_SMP_alpha

  BitKeeper/deleted/.del-insert-mysql-Linux_2.2.10_i686-cmp-msql,mysql~a0420d7e1cb49cd
    1.4 06/04/12 18:55:07 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-mysql-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-insert-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid~2092625178d751fe
    1.4 06/04/12 18:55:07 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-insert-mysql-Linux_2.0.35_i686-cmp-adabas,mysql~ecd1a95d10fdd9e
    1.4 06/04/12 18:55:07 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-mysql-Linux_2.0.35_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-insert-mysql-HP_UX_B.10.20_9000_778~c1dc0211819193a4
    1.4 06/04/12 18:55:06 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-mysql-HP_UX_B.10.20_9000_778

  BitKeeper/deleted/.del-insert-msql-Linux_2.2.10_i686-cmp-msql,mysql~53d8b6be20f6ca92
    1.4 06/04/12 18:55:06 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-msql-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-insert-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql~18e410adac84ea04
    1.2 06/04/12 18:55:06 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql

  BitKeeper/deleted/.del-insert-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql~c411901fbeb0f872
    1.4 06/04/12 18:55:06 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/insert-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-create-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid~fc92c9b657c058a5
    1.3 06/04/12 18:55:06 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-create-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~4eb5a8d4ec1e87f3
    1.2 06/04/12 18:55:06 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg

  BitKeeper/deleted/.del-create-pg_fast-Linux_2.2.14_my_SMP_i686-crashed~84bcc3931507a54b
    1.3 06/04/12 18:55:05 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-pg_fast-Linux_2.2.14_my_SMP_i686-crashed

  BitKeeper/deleted/.del-create-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid~c79bf4084081ea70
    1.3 06/04/12 18:55:05 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-create-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~a362ce64c2eaede9
    1.2 06/04/12 18:55:05 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg

  BitKeeper/deleted/.del-create-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid~3d947822c9d126ad
    1.3 06/04/12 18:55:05 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-create-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle~bf450a6242fd0667
    1.3 06/04/12 18:55:04 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle

  BitKeeper/deleted/.del-create-oracle-Linux_2.0.36_i686-cmp-mysql,oracle~e115689b8cc73378
    1.3 06/04/12 18:55:04 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-oracle-Linux_2.0.36_i686-cmp-mysql,oracle

  BitKeeper/deleted/.del-create-mysql_odbc-win98~601a99c5e6348c0c
    1.3 06/04/12 18:55:04 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-mysql_odbc-win98

  BitKeeper/deleted/.del-create-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql~c4faee34856851cb
    1.3 06/04/12 18:55:04 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-create-mysql-win98~e1d695d45ef2d0c
    1.4 06/04/12 18:55:04 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-mysql-win98

  BitKeeper/deleted/.del-create-mysql-SunOS_5.8_sun4u~59d3098ed93d40f3
    1.2 06/04/12 18:55:03 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-mysql-SunOS_5.8_sun4u

  BitKeeper/deleted/.del-create-mysql-SunOS_5.7_sun4u~7ee13bfcafeab498
    1.3 06/04/12 18:55:03 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-mysql-SunOS_5.7_sun4u

  BitKeeper/deleted/.del-create-mysql-SunOS_5.7_sun4m~b0ff2a8562097d63
    1.4 06/04/12 18:55:03 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-mysql-SunOS_5.7_sun4m

  BitKeeper/deleted/.del-create-mysql-SunOS_5.5.1_sun4u~bbb5de66fc56de7b
    1.3 06/04/12 18:55:03 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-mysql-SunOS_5.5.1_sun4u

  BitKeeper/deleted/.del-create-mysql-NT_4.0~b3acc3d0a2d6f9d9
    1.12 06/04/12 18:55:03 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-mysql-NT_4.0

  BitKeeper/deleted/.del-create-mysql-Linux_2.4.4_SMP_alpha~e5194a6b13b856d2
    1.2 06/04/12 18:55:02 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-mysql-Linux_2.4.4_SMP_alpha

  BitKeeper/deleted/.del-create-mysql-Linux_2.4.16_64GB_SMP_i686~3d16d9031a504bc1
    1.2 06/04/12 18:55:02 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-mysql-Linux_2.4.16_64GB_SMP_i686

  BitKeeper/deleted/.del-create-mysql-Linux_2.4.0_64GB_SMP_i686~99efec8ad04ae89e
    1.2 06/04/12 18:55:02 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-mysql-Linux_2.4.0_64GB_SMP_i686

  BitKeeper/deleted/.del-create-mysql-Linux_2.2.1_i686-cmp-adabas,mysql~3dbefde519d2fe7c
    1.3 06/04/12 18:55:02 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-mysql-Linux_2.2.1_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-create-mysql-Linux_2.2.16_SMP_alpha~14f7146539c3894
    1.4 06/04/12 18:55:02 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-mysql-Linux_2.2.16_SMP_alpha

  BitKeeper/deleted/.del-create-mysql-Linux_2.2.10_i686-cmp-msql,mysql~645c83b795615b50
    1.3 06/04/12 18:55:02 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-mysql-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-create-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid~66db97b8e6de6956
    1.3 06/04/12 18:55:01 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-create-mysql-Linux_2.0.35_i686-cmp-adabas,mysql~2380da175449191a
    1.3 06/04/12 18:55:01 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-mysql-Linux_2.0.35_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-create-mysql-HP_UX_B.10.20_9000_778~9ba93e8aace282f8
    1.3 06/04/12 18:55:01 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-mysql-HP_UX_B.10.20_9000_778

  BitKeeper/deleted/.del-create-msql-Linux_2.2.10_i686-cmp-msql,mysql~edee1dbef9553fce
    1.3 06/04/12 18:55:01 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-msql-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-create-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql~1eb70c89b45b81ca
    1.2 06/04/12 18:55:01 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql

  BitKeeper/deleted/.del-create-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql~c2970764e968682a
    1.3 06/04/12 18:55:00 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/create-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-connect-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid~4984dfca3ef56ece
    1.3 06/04/12 18:55:00 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-connect-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~568fd44bd76dfc6f
    1.2 06/04/12 18:55:00 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg

  BitKeeper/deleted/.del-connect-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid~f06b093a1aa4ff35
    1.3 06/04/12 18:55:00 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-connect-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~4591ef76c9e60c9d
    1.2 06/04/12 18:55:00 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg

  BitKeeper/deleted/.del-connect-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid~d518bd07b04f5b01
    1.3 06/04/12 18:55:00 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-connect-oracle-Linux_2.0.36_i686-cmp-mysql,oracle~ac92c49fb3587f32
    1.3 06/04/12 18:54:59 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-oracle-Linux_2.0.36_i686-cmp-mysql,oracle

  BitKeeper/deleted/.del-connect-mysql_odbc-win98~62020e7f60ca155b
    1.3 06/04/12 18:54:59 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-mysql_odbc-win98

  BitKeeper/deleted/.del-connect-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql~c1e45c134fb0c6
    1.3 06/04/12 18:54:59 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-connect-mysql-win98~3717948fdaeece0e
    1.4 06/04/12 18:54:59 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-mysql-win98

  BitKeeper/deleted/.del-connect-mysql-SunOS_5.8_sun4u~b843f0f83243241
    1.2 06/04/12 18:54:59 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-mysql-SunOS_5.8_sun4u

  BitKeeper/deleted/.del-connect-mysql-SunOS_5.7_sun4u~c67beb9e9d2cf32e
    1.3 06/04/12 18:54:58 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-mysql-SunOS_5.7_sun4u

  BitKeeper/deleted/.del-connect-mysql-SunOS_5.7_sun4m~4dfb6b3d571ddbad
    1.4 06/04/12 18:54:58 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-mysql-SunOS_5.7_sun4m

  BitKeeper/deleted/.del-connect-mysql-SunOS_5.5.1_sun4u~a9493110fe62e0b1
    1.3 06/04/12 18:54:58 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-mysql-SunOS_5.5.1_sun4u

  BitKeeper/deleted/.del-connect-mysql-NT_4.0~38e24bdd3be11952
    1.12 06/04/12 18:54:58 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-mysql-NT_4.0

  BitKeeper/deleted/.del-connect-mysql-Linux_2.4.4_SMP_alpha~89d632a1ac9a6b5
    1.2 06/04/12 18:54:58 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-mysql-Linux_2.4.4_SMP_alpha

  BitKeeper/deleted/.del-connect-mysql-Linux_2.4.16_64GB_SMP_i686~75f6059f6c9dba3c
    1.2 06/04/12 18:54:58 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-mysql-Linux_2.4.16_64GB_SMP_i686

  BitKeeper/deleted/.del-connect-mysql-Linux_2.4.0_64GB_SMP_i686~5120b0673110924
    1.2 06/04/12 18:54:57 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-mysql-Linux_2.4.0_64GB_SMP_i686

  BitKeeper/deleted/.del-connect-mysql-Linux_2.2.1_i686-cmp-adabas,mysql~89cc5af048bd639b
    1.3 06/04/12 18:54:57 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-mysql-Linux_2.2.1_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-connect-mysql-Linux_2.2.16_SMP_alpha~aaec79ca1156a08a
    1.4 06/04/12 18:54:57 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-mysql-Linux_2.2.16_SMP_alpha

  BitKeeper/deleted/.del-connect-mysql-Linux_2.2.10_i686-cmp-msql,mysql~cdc59ceceaf911fa
    1.3 06/04/12 18:54:57 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-mysql-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-connect-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid~8da27469bc2fb160
    1.3 06/04/12 18:54:57 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-connect-mysql-Linux_2.0.35_i686-cmp-adabas,mysql~db113f639769f768
    1.3 06/04/12 18:54:56 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-mysql-Linux_2.0.35_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-connect-mysql-HP_UX_B.10.20_9000_778~a1e538e24db4bb1c
    1.3 06/04/12 18:54:56 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-mysql-HP_UX_B.10.20_9000_778

  BitKeeper/deleted/.del-connect-msql-Linux_2.2.10_i686-cmp-msql,mysql~5b9f60756fd8f911
    1.3 06/04/12 18:54:56 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-msql-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-connect-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql~61676bd9c073f7fd
    1.2 06/04/12 18:54:56 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql

  BitKeeper/deleted/.del-connect-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql~db5313a35bb9b7f9
    1.3 06/04/12 18:54:56 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/connect-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-big-tables-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid~7071ff0b9ae77888
    1.3 06/04/12 18:54:56 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-big-tables-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~126a0afb2c471bfc
    1.2 06/04/12 18:54:55 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg

  BitKeeper/deleted/.del-big-tables-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid~6170bade4e184d8
    1.3 06/04/12 18:54:55 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-big-tables-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~5cf62715e9715066
    1.2 06/04/12 18:54:55 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg

  BitKeeper/deleted/.del-big-tables-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid~5c8d37e194a54236
    1.3 06/04/12 18:54:55 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-big-tables-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle~29e603e8899269b2
    1.3 06/04/12 18:54:55 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle

  BitKeeper/deleted/.del-big-tables-oracle-Linux_2.0.36_i686-cmp-mysql,oracle~9c838829d0ea5ced
    1.3 06/04/12 18:54:55 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-oracle-Linux_2.0.36_i686-cmp-mysql,oracle

  BitKeeper/deleted/.del-big-tables-mysql_odbc-win98~21acff849389336f
    1.3 06/04/12 18:54:54 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-mysql_odbc-win98

  BitKeeper/deleted/.del-big-tables-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql~db491cf46385914d
    1.3 06/04/12 18:54:54 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-big-tables-mysql-win98~cf6133ef1eabab0
    1.4 06/04/12 18:54:54 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-mysql-win98

  BitKeeper/deleted/.del-big-tables-mysql-SunOS_5.8_sun4u~ed47e6abb618412b
    1.2 06/04/12 18:54:54 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-mysql-SunOS_5.8_sun4u

  BitKeeper/deleted/.del-big-tables-mysql-SunOS_5.7_sun4u~ebc379b231312bbe
    1.3 06/04/12 18:54:54 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-mysql-SunOS_5.7_sun4u

  BitKeeper/deleted/.del-big-tables-mysql-SunOS_5.7_sun4m~2487c35a8fb6c2c7
    1.4 06/04/12 18:54:54 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-mysql-SunOS_5.7_sun4m

  BitKeeper/deleted/.del-big-tables-mysql-SunOS_5.5.1_sun4u~7d7b6c0bf58b9b79
    1.3 06/04/12 18:54:53 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-mysql-SunOS_5.5.1_sun4u

  BitKeeper/deleted/.del-big-tables-mysql-NT_4.0~b2a29b0b3838e2c0
    1.12 06/04/12 18:54:53 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-mysql-NT_4.0

  BitKeeper/deleted/.del-big-tables-mysql-Linux_2.4.4_SMP_alpha~c37784c19f9492d9
    1.2 06/04/12 18:54:53 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-mysql-Linux_2.4.4_SMP_alpha

  BitKeeper/deleted/.del-big-tables-mysql-Linux_2.4.16_64GB_SMP_i686~568eabe7958599fe
    1.2 06/04/12 18:54:53 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-mysql-Linux_2.4.16_64GB_SMP_i686

  BitKeeper/deleted/.del-big-tables-mysql-Linux_2.4.0_64GB_SMP_i686~af848bbe536498e3
    1.2 06/04/12 18:54:53 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-mysql-Linux_2.4.0_64GB_SMP_i686

  BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.1_i686-cmp-adabas,mysql~b8f1289f69f8053e
    1.3 06/04/12 18:54:53 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-mysql-Linux_2.2.1_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.16_SMP_alpha~2ee81c9b26bab375
    1.4 06/04/12 18:54:52 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-mysql-Linux_2.2.16_SMP_alpha

  BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.10_i686-cmp-msql,mysql~fbb71f81fc0f0a8
    1.3 06/04/12 18:54:52 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-mysql-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-big-tables-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid~cb8a32316137cf8d
    1.3 06/04/12 18:54:52 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-big-tables-mysql-Linux_2.0.35_i686-cmp-adabas,mysql~ab3cc8438d8e7370
    1.3 06/04/12 18:54:52 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-mysql-Linux_2.0.35_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-big-tables-mysql-HP_UX_B.10.20_9000_778~ca173309375a3dac
    1.3 06/04/12 18:54:52 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-mysql-HP_UX_B.10.20_9000_778

  BitKeeper/deleted/.del-big-tables-msql-Linux_2.2.10_i686-cmp-msql,mysql~a9c5dd96855d55c
    1.3 06/04/12 18:54:52 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-msql-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-big-tables-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql~22d5cdb6dbdd59da
    1.2 06/04/12 18:54:51 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql

  BitKeeper/deleted/.del-big-tables-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql~6840935a2089b3de
    1.3 06/04/12 18:54:51 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/big-tables-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-alter-table-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid~3b53b31dd0c8fee5
    1.3 06/04/12 18:54:51 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-alter-table-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~f6f633dab6c20ba4
    1.2 06/04/12 18:54:51 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg

  BitKeeper/deleted/.del-alter-table-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid~a8299da49808998c
    1.3 06/04/12 18:54:51 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-alter-table-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~c38836e848368fda
    1.2 06/04/12 18:54:51 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg

  BitKeeper/deleted/.del-alter-table-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid~bde11ba48bf8478b
    1.3 06/04/12 18:54:50 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-alter-table-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle~301fafaab11ba656
    1.3 06/04/12 18:54:50 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle

  BitKeeper/deleted/.del-alter-table-oracle-Linux_2.0.36_i686-cmp-mysql,oracle~c29737148bd279bb
    1.3 06/04/12 18:54:50 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-oracle-Linux_2.0.36_i686-cmp-mysql,oracle

  BitKeeper/deleted/.del-alter-table-mysql_odbc-win98~dda4d95beacdda97
    1.3 06/04/12 18:54:50 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-mysql_odbc-win98

  BitKeeper/deleted/.del-alter-table-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql~538627661a199cff
    1.3 06/04/12 18:54:50 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-alter-table-mysql-win98~ab9684a2b429211e
    1.4 06/04/12 18:54:50 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-mysql-win98

  BitKeeper/deleted/.del-alter-table-mysql-SunOS_5.8_sun4u~acec523136e781ca
    1.2 06/04/12 18:54:50 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-mysql-SunOS_5.8_sun4u

  BitKeeper/deleted/.del-alter-table-mysql-SunOS_5.7_sun4u~ce74c2f623d3bb3
    1.3 06/04/12 18:54:49 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-mysql-SunOS_5.7_sun4u

  BitKeeper/deleted/.del-alter-table-mysql-SunOS_5.7_sun4m~2e33be7cc2979840
    1.4 06/04/12 18:54:49 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-mysql-SunOS_5.7_sun4m

  BitKeeper/deleted/.del-alter-table-mysql-SunOS_5.5.1_sun4u~9d7e75667fcb29ec
    1.3 06/04/12 18:54:49 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-mysql-SunOS_5.5.1_sun4u

  BitKeeper/deleted/.del-alter-table-mysql-NT_4.0~5d3ab68c4994128b
    1.12 06/04/12 18:54:49 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-mysql-NT_4.0

  BitKeeper/deleted/.del-alter-table-mysql-Linux_2.4.4_SMP_alpha~5255af9a5ab466ae
    1.2 06/04/12 18:54:49 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-mysql-Linux_2.4.4_SMP_alpha

  BitKeeper/deleted/.del-alter-table-mysql-Linux_2.4.16_64GB_SMP_i686~64c3d83a5a4ae98f
    1.2 06/04/12 18:54:49 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-mysql-Linux_2.4.16_64GB_SMP_i686

  BitKeeper/deleted/.del-alter-table-mysql-Linux_2.4.0_64GB_SMP_i686~a37794066069af64
    1.2 06/04/12 18:54:48 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-mysql-Linux_2.4.0_64GB_SMP_i686

  BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.1_i686-cmp-adabas,mysql~511826ed45ffe8f9
    1.3 06/04/12 18:54:48 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-mysql-Linux_2.2.1_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.16_SMP_alpha~7cc192b0834a4038
    1.4 06/04/12 18:54:48 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-mysql-Linux_2.2.16_SMP_alpha

  BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.10_i686-cmp-msql,mysql~6f7cd759ed489bd7
    1.3 06/04/12 18:54:48 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-mysql-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-alter-table-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid~51ae1cd2edebbe7d
    1.3 06/04/12 18:54:48 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-alter-table-mysql-Linux_2.0.35_i686-cmp-adabas,mysql~fa0239597119372b
    1.3 06/04/12 18:54:48 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-mysql-Linux_2.0.35_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-alter-table-mysql-HP_UX_B.10.20_9000_778~81c128f3fe000f9
    1.3 06/04/12 18:54:47 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-mysql-HP_UX_B.10.20_9000_778

  BitKeeper/deleted/.del-alter-table-msql-Linux_2.2.10_i686-cmp-msql,mysql~ccc2918e3e87de90
    1.3 06/04/12 18:54:47 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-msql-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-alter-table-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql~c2153d9b70bc72e
    1.2 06/04/12 18:54:47 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql

  BitKeeper/deleted/.del-alter-table-AdabasD-Linux_2.0.35_i686-cmp-adabasd,mysql~874002116923758f
    1.3 06/04/12 18:54:47 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-AdabasD-Linux_2.0.35_i686-cmp-adabasd,mysql

  BitKeeper/deleted/.del-alter-table-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql~5290aabd82aa68e3
    1.3 06/04/12 18:54:47 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/alter-table-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-RUN-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid~4ee71323c2139220
    1.3 06/04/12 18:54:47 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-RUN-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~2ac3d3d136e516bf
    1.2 06/04/12 18:54:46 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg

  BitKeeper/deleted/.del-RUN-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid~600d532546f2b572
    1.3 06/04/12 18:54:46 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-RUN-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~1be8875a68b6b037
    1.2 06/04/12 18:54:46 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg

  BitKeeper/deleted/.del-RUN-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid~efed8b4e2d954513
    1.3 06/04/12 18:54:46 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-RUN-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle~2d89df0c87ff371f
    1.3 06/04/12 18:54:46 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle

  BitKeeper/deleted/.del-RUN-oracle-Linux_2.0.36_i686-cmp-mysql,oracle~6029da5a90dd60ab
    1.3 06/04/12 18:54:46 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-oracle-Linux_2.0.36_i686-cmp-mysql,oracle

  BitKeeper/deleted/.del-RUN-mysql_odbc-win98~8ebc5d1b267bafb2
    1.3 06/04/12 18:54:46 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-mysql_odbc-win98

  BitKeeper/deleted/.del-RUN-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql~ec77ef2a21cd2f91
    1.3 06/04/12 18:54:45 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-RUN-mysql-win98~ed3fe1907dedf8e1
    1.4 06/04/12 18:54:45 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-mysql-win98

  BitKeeper/deleted/.del-RUN-mysql-SunOS_5.8_sun4u~392b6a62a417b6ae
    1.3 06/04/12 18:54:45 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-mysql-SunOS_5.8_sun4u

  BitKeeper/deleted/.del-RUN-mysql-SunOS_5.7_sun4u~86e1dc0e25a8b8f
    1.3 06/04/12 18:54:45 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-mysql-SunOS_5.7_sun4u

  BitKeeper/deleted/.del-RUN-mysql-SunOS_5.7_sun4m~fddf3d3742a299b
    1.5 06/04/12 18:54:45 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-mysql-SunOS_5.7_sun4m

  BitKeeper/deleted/.del-RUN-mysql-SunOS_5.5.1_sun4u~afbba182428e20df
    1.3 06/04/12 18:54:45 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-mysql-SunOS_5.5.1_sun4u

  BitKeeper/deleted/.del-RUN-mysql-NT_4.0~b37cb36e88ef4ed1
    1.12 06/04/12 18:54:45 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-mysql-NT_4.0

  BitKeeper/deleted/.del-RUN-mysql-Linux_2.4.4_SMP_alpha~3003859ba3f32620
    1.2 06/04/12 18:54:44 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-mysql-Linux_2.4.4_SMP_alpha

  BitKeeper/deleted/.del-RUN-mysql-Linux_2.4.16_64GB_SMP_i686~a326ae0a947e8907
    1.2 06/04/12 18:54:44 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-mysql-Linux_2.4.16_64GB_SMP_i686

  BitKeeper/deleted/.del-RUN-mysql-Linux_2.4.0_64GB_SMP_i686~59c650992b3b5439
    1.2 06/04/12 18:54:44 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-mysql-Linux_2.4.0_64GB_SMP_i686

  BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.1_i686-cmp-adabas,mysql~11e47194a9a44732
    1.3 06/04/12 18:54:44 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-mysql-Linux_2.2.1_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.16_SMP_alpha~70cdf49ef31bf150
    1.4 06/04/12 18:54:44 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-mysql-Linux_2.2.16_SMP_alpha

  BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.10_i686-cmp-msql,mysql~8ef9e5442d6984be
    1.3 06/04/12 18:54:44 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-mysql-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-RUN-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid~b07630f1b74e4d98
    1.3 06/04/12 18:54:44 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-RUN-mysql-Linux_2.0.35_i686-cmp-adabas,mysql~35b46ebbfdcb9c93
    1.3 06/04/12 18:54:43 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-mysql-Linux_2.0.35_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-RUN-mysql-HP_UX_B.10.20_9000_778~a3472aecd32a4729
    1.3 06/04/12 18:54:43 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-mysql-HP_UX_B.10.20_9000_778

  BitKeeper/deleted/.del-RUN-msql-Linux_2.2.10_i686-cmp-msql,mysql~62e1375dfc4b360
    1.3 06/04/12 18:54:43 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-msql-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-RUN-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql~d05ed4f74d5a2238
    1.2 06/04/12 18:54:43 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql

  BitKeeper/deleted/.del-RUN-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql~94902a555b622558
    1.3 06/04/12 18:54:43 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/RUN-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-ATIS-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid~349a54b8d4522f42
    1.3 06/04/12 18:54:43 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-ATIS-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~53500617b9cf40f4
    1.2 06/04/12 18:54:42 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg

  BitKeeper/deleted/.del-ATIS-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid~e51a1b8588136948
    1.3 06/04/12 18:54:42 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-ATIS-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~b030f97867fa4b57
    1.2 06/04/12 18:54:42 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg

  BitKeeper/deleted/.del-ATIS-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid~3d89aca09b912aa4
    1.3 06/04/12 18:54:42 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-ATIS-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle~2c78defdd05c19fd
    1.3 06/04/12 18:54:42 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle

  BitKeeper/deleted/.del-ATIS-oracle-Linux_2.0.36_i686-cmp-mysql,oracle~cb97c4da6fe97a93
    1.3 06/04/12 18:54:42 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-oracle-Linux_2.0.36_i686-cmp-mysql,oracle

  BitKeeper/deleted/.del-ATIS-mysql_odbc-win98~a59be86edb75da78
    1.3 06/04/12 18:54:42 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-mysql_odbc-win98

  BitKeeper/deleted/.del-ATIS-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql~5a53d7ace908a675
    1.3 06/04/12 18:54:41 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-ATIS-mysql-win98~3f505a36bd73685
    1.4 06/04/12 18:54:41 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-mysql-win98

  BitKeeper/deleted/.del-ATIS-mysql-SunOS_5.8_sun4u~443e17fb4bd09be8
    1.2 06/04/12 18:54:41 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-mysql-SunOS_5.8_sun4u

  BitKeeper/deleted/.del-ATIS-mysql-SunOS_5.7_sun4u~be0d9789776c5ed7
    1.3 06/04/12 18:54:41 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-mysql-SunOS_5.7_sun4u

  BitKeeper/deleted/.del-ATIS-mysql-SunOS_5.7_sun4m~f5b3b906efab7c92
    1.4 06/04/12 18:54:41 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-mysql-SunOS_5.7_sun4m

  BitKeeper/deleted/.del-ATIS-mysql-SunOS_5.5.1_sun4u~dfb4c5f6b6db3b49
    1.3 06/04/12 18:54:41 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-mysql-SunOS_5.5.1_sun4u

  BitKeeper/deleted/.del-ATIS-mysql-NT_4.0~a6935fe6b593884f
    1.12 06/04/12 18:54:41 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-mysql-NT_4.0

  BitKeeper/deleted/.del-ATIS-mysql-Linux_2.4.4_SMP_alpha~9fe4132f71f4d40d
    1.2 06/04/12 18:54:40 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-mysql-Linux_2.4.4_SMP_alpha

  BitKeeper/deleted/.del-ATIS-mysql-Linux_2.4.16_64GB_SMP_i686~315fbbd917d87b9
    1.2 06/04/12 18:54:40 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-mysql-Linux_2.4.16_64GB_SMP_i686

  BitKeeper/deleted/.del-ATIS-mysql-Linux_2.4.0_64GB_SMP_i686~99be21d010d05671
    1.2 06/04/12 18:54:40 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-mysql-Linux_2.4.0_64GB_SMP_i686

  BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.1_i686-cmp-adabas,mysql~1ff82b62cff11171
    1.3 06/04/12 18:54:40 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-mysql-Linux_2.2.1_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.16_SMP_alpha~b52cdd166c25d07
    1.4 06/04/12 18:54:40 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-mysql-Linux_2.2.16_SMP_alpha

  BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.10_i686-cmp-msql,mysql~7c73a8eb856b9408
    1.3 06/04/12 18:54:40 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-mysql-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-ATIS-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid~20ec68b7771323d4
    1.3 06/04/12 18:54:40 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid

  BitKeeper/deleted/.del-wisconsin-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~305f7cfc79aff3be
    1.3 06/04/12 18:54:39 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/wisconsin-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-ATIS-mysql-Linux_2.0.35_i686-cmp-adabas,mysql~c63fc2fa7e3d02d1
    1.3 06/04/12 18:54:39 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-mysql-Linux_2.0.35_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-ATIS-mysql-HP_UX_B.10.20_9000_778~99d77d3d153a51c2
    1.3 06/04/12 18:54:39 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-mysql-HP_UX_B.10.20_9000_778

  BitKeeper/deleted/.del-ATIS-msql-Linux_2.2.10_i686-cmp-msql,mysql~af10f7cbc54ea3a
    1.3 06/04/12 18:54:39 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-msql-Linux_2.2.10_i686-cmp-msql,mysql

  BitKeeper/deleted/.del-ATIS-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql~8fe4954bfaca6502
    1.2 06/04/12 18:54:39 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql

  BitKeeper/deleted/.del-ATIS-AdabasD-Linux_2.0.35_i686-cmp-adabasd,mysql~442894a5f1918af1
    1.3 06/04/12 18:54:39 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-AdabasD-Linux_2.0.35_i686-cmp-adabasd,mysql

  BitKeeper/deleted/.del-ATIS-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql~e92bd2a1a4e633
    1.3 06/04/12 18:54:39 jimw@mysql.com +0 -0
    Delete: sql-bench/Results/ATIS-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql

  BitKeeper/deleted/.del-wisconsin-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~6d1ca2a1e562a3c9
    1.3 06/04/12 18:54:38 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/wisconsin-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-wisconsin-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~48e3985caa8f19d
    1.3 06/04/12 18:54:38 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/wisconsin-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-wisconsin-mysql-win98-cmp-access,mysql~2e4512a2a33998c9
    1.3 06/04/12 18:54:38 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/wisconsin-mysql-win98-cmp-access,mysql

  BitKeeper/deleted/.del-wisconsin-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~bec8c7f8274a4856
    1.3 06/04/12 18:54:38 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/wisconsin-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-wisconsin-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~33e15b4892f20135
    1.3 06/04/12 18:54:38 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/wisconsin-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-wisconsin-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~e022e2b23e2e748c
    1.3 06/04/12 18:54:38 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/wisconsin-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-wisconsin-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~7ffa0dd37d5ccd28
    1.3 06/04/12 18:54:38 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/wisconsin-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-wisconsin-access_odbc-win98-cmp-access,mysql~adc3a040e9570f10
    1.3 06/04/12 18:54:38 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/wisconsin-access_odbc-win98-cmp-access,mysql

  BitKeeper/deleted/.del-select-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~f6a1ce829a2cd309
    1.3 06/04/12 18:54:37 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/select-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-select-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~524aca6526618e51
    1.3 06/04/12 18:54:37 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/select-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-select-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~251faab981990cd2
    1.3 06/04/12 18:54:37 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/select-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-select-mysql-win98-cmp-access,mysql~65a07b39539f5f81
    1.3 06/04/12 18:54:37 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/select-mysql-win98-cmp-access,mysql

  BitKeeper/deleted/.del-select-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~bbaee458e784fb02
    1.3 06/04/12 18:54:37 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/select-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-select-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~31a4cd5d9f3fa6da
    1.3 06/04/12 18:54:37 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/select-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-select-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~1ed637acc6ced16a
    1.3 06/04/12 18:54:37 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/select-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-select-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~837cbd5eb7885009
    1.3 06/04/12 18:54:36 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/select-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-select-access_odbc-win98-cmp-access,mysql~de1140d430fbf8ea
    1.3 06/04/12 18:54:36 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/select-access_odbc-win98-cmp-access,mysql

  BitKeeper/deleted/.del-insert-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~4d1f539fc4d401b8
    1.3 06/04/12 18:54:36 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/insert-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-insert-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~a0c13214b06f94e5
    1.3 06/04/12 18:54:36 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/insert-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-insert-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~ce5012e433105830
    1.3 06/04/12 18:54:36 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/insert-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-insert-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~e7d65567662dd9
    1.3 06/04/12 18:54:36 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/insert-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-insert-mysql-win98-cmp-access,mysql~52ef0ddfd580252
    1.3 06/04/12 18:54:36 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/insert-mysql-win98-cmp-access,mysql

  BitKeeper/deleted/.del-insert-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~cd7489e3b45870c
    1.3 06/04/12 18:54:35 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/insert-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-insert-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~d80aabb5d9bb8a05
    1.3 06/04/12 18:54:35 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/insert-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-insert-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~2eca65f5baf638a4
    1.3 06/04/12 18:54:35 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/insert-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-insert-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~d926cccd5a7d062c
    1.3 06/04/12 18:54:35 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/insert-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-insert-access_odbc-win98-cmp-access,mysql~fc9adc049c6adabd
    1.3 06/04/12 18:54:35 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/insert-access_odbc-win98-cmp-access,mysql

  BitKeeper/deleted/.del-create-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~395b455d9ef7f4
    1.3 06/04/12 18:54:35 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/create-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-create-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~453eb2b4a5b53af9
    1.3 06/04/12 18:54:35 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/create-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-create-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~24ce4e6198123d5e
    1.3 06/04/12 18:54:34 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/create-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-create-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~6aa79e1f667bb274
    1.3 06/04/12 18:54:34 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/create-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-create-mysql-win98-cmp-access,mysql~c12a01f01cf5ba30
    1.3 06/04/12 18:54:34 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/create-mysql-win98-cmp-access,mysql

  BitKeeper/deleted/.del-create-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~5bcbfc4be09ddb06
    1.3 06/04/12 18:54:34 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/create-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-create-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~17b4546c2b66065c
    1.3 06/04/12 18:54:34 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/create-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-create-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~fe251460d092f0d8
    1.3 06/04/12 18:54:34 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/create-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-create-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~b33dfc00d34d87ec
    1.3 06/04/12 18:54:34 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/create-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-create-access_odbc-win98-cmp-access,mysql~4ef69855662496a8
    1.3 06/04/12 18:54:34 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/create-access_odbc-win98-cmp-access,mysql

  BitKeeper/deleted/.del-connect-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~f0d02f24e3ad10fa
    1.3 06/04/12 18:54:33 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/connect-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-connect-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~b6eafe91e867d39b
    1.3 06/04/12 18:54:33 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/connect-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-connect-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~55c2711c36dfede5
    1.3 06/04/12 18:54:33 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/connect-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-connect-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~46c24614cbf5761f
    1.3 06/04/12 18:54:33 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/connect-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-connect-mysql-win98-cmp-access,mysql~af5ead655cbb4ab
    1.3 06/04/12 18:54:33 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/connect-mysql-win98-cmp-access,mysql

  BitKeeper/deleted/.del-connect-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~50d3e0ae11bc8885
    1.3 06/04/12 18:54:33 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/connect-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-connect-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~27738719fee99842
    1.3 06/04/12 18:54:33 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/connect-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-connect-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~94fc13d92e1c3fd
    1.3 06/04/12 18:54:32 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/connect-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-connect-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~7f9c11978e6fbdfe
    1.3 06/04/12 18:54:32 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/connect-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-connect-access_odbc-win98-cmp-access,mysql~3fceb657fb175eff
    1.3 06/04/12 18:54:32 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/connect-access_odbc-win98-cmp-access,mysql

  BitKeeper/deleted/.del-big-tables-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~79aa5c4229ac2a54
    1.3 06/04/12 18:54:32 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/big-tables-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-big-tables-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~95c17531cd04597
    1.3 06/04/12 18:54:32 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/big-tables-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-big-tables-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~a8ca47f8d4938a5
    1.3 06/04/12 18:54:32 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/big-tables-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-big-tables-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~8836803f5814cdb4
    1.3 06/04/12 18:54:32 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/big-tables-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-big-tables-mysql-win98-cmp-access,mysql~9355ba8a86c60803
    1.3 06/04/12 18:54:31 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/big-tables-mysql-win98-cmp-access,mysql

  BitKeeper/deleted/.del-big-tables-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~e614c4382249eb36
    1.3 06/04/12 18:54:31 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/big-tables-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-big-tables-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~fe3de91fb98ac53a
    1.3 06/04/12 18:54:31 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/big-tables-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-big-tables-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~1fcac6f1bbc11bd5
    1.3 06/04/12 18:54:31 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/big-tables-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-big-tables-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~6d8c394f74cd4f87
    1.3 06/04/12 18:54:31 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/big-tables-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-big-tables-access_odbc-win98-cmp-access,mysql~1c065cababc3ce3a
    1.3 06/04/12 18:54:31 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/big-tables-access_odbc-win98-cmp-access,mysql

  BitKeeper/deleted/.del-alter-table-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~8649b870cdf3bdbe
    1.3 06/04/12 18:54:31 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/alter-table-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-alter-table-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~eaa3cb3093591b71
    1.3 06/04/12 18:54:30 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/alter-table-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-alter-table-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~e1a4030f1b4b1d80
    1.3 06/04/12 18:54:30 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/alter-table-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-alter-table-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~9c8a649ed09a166f
    1.3 06/04/12 18:54:30 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/alter-table-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-alter-table-mysql-win98-cmp-access,mysql~aef60113997bdd7f
    1.3 06/04/12 18:54:30 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/alter-table-mysql-win98-cmp-access,mysql

  BitKeeper/deleted/.del-alter-table-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~c07d53a5f3aaeae2
    1.3 06/04/12 18:54:30 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/alter-table-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-alter-table-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~ac0f0aba28d6b570
    1.3 06/04/12 18:54:30 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/alter-table-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-alter-table-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~ce25b78f2417bb07
    1.3 06/04/12 18:54:30 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/alter-table-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-alter-table-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~c093c1852127aa2b
    1.3 06/04/12 18:54:30 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/alter-table-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-alter-table-access_odbc-win98-cmp-access,mysql~d22b47893fb6b878
    1.3 06/04/12 18:54:29 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/alter-table-access_odbc-win98-cmp-access,mysql

  BitKeeper/deleted/.del-RUN-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~1ab9437b139d4e01
    1.3 06/04/12 18:54:29 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/RUN-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-RUN-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~f9910ea3c3814861
    1.3 06/04/12 18:54:29 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/RUN-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-RUN-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~e5adba3eea4b4238
    1.3 06/04/12 18:54:28 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/RUN-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-RUN-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~5588df8cee1c7f79
    1.3 06/04/12 18:54:28 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/RUN-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-RUN-mysql-win98-cmp-access,mysql~bee08e42a9db024c
    1.3 06/04/12 18:54:28 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/RUN-mysql-win98-cmp-access,mysql

  BitKeeper/deleted/.del-RUN-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~c6c3cf12f7c94e91
    1.3 06/04/12 18:54:28 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/RUN-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-RUN-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~c6648f0cc50580b
    1.3 06/04/12 18:54:28 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/RUN-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-RUN-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~35963ad67156029c
    1.3 06/04/12 18:54:28 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/RUN-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-RUN-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~854fc9dfffef9c12
    1.3 06/04/12 18:54:28 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/RUN-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-RUN-access_odbc-win98-cmp-access,mysql~65bb7f664ea75940
    1.3 06/04/12 18:54:27 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/RUN-access_odbc-win98-cmp-access,mysql

  BitKeeper/deleted/.del-ATIS-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~c1ee40e8e006ee8a
    1.3 06/04/12 18:54:27 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/ATIS-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-ATIS-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~77f2d5b7dd1ee1f5
    1.3 06/04/12 18:54:27 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/ATIS-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-ATIS-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~3550d5fb3894052b
    1.3 06/04/12 18:54:27 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/ATIS-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-ATIS-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~29550a64a25f238d
    1.3 06/04/12 18:54:27 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/ATIS-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-ATIS-mysql-win98-cmp-access,mysql~e8dda6ccf744e9b5
    1.3 06/04/12 18:54:27 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/ATIS-mysql-win98-cmp-access,mysql

  BitKeeper/deleted/.del-ATIS-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~d575a91f113311db
    1.3 06/04/12 18:54:27 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/ATIS-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-ATIS-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~92849dce40fc3f90
    1.3 06/04/12 18:54:27 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/ATIS-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-transport.txt~fa4ca40735f8354c
    1.3 06/04/12 18:54:26 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/transport.txt

  BitKeeper/deleted/.del-time_zone.txt~4171f9ca732f65c0
    1.3 06/04/12 18:54:26 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/time_zone.txt

  BitKeeper/deleted/.del-tenk.data~6aeaebdd534e458e
    1.3 06/04/12 18:54:26 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/Wisconsin/tenk.data

  BitKeeper/deleted/.del-onek.data~6cd1edaf596a7f7
    1.3 06/04/12 18:54:26 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/Wisconsin/onek.data

  BitKeeper/deleted/.del-ATIS-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~845a0538cc1d2a2a
    1.3 06/04/12 18:54:26 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/ATIS-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-ATIS-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~6460fdae8a234607
    1.3 06/04/12 18:54:26 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/ATIS-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase

  BitKeeper/deleted/.del-ATIS-access_odbc-win98-cmp-access,mysql~f3640493299135a
    1.3 06/04/12 18:54:26 jimw@mysql.com +0 -0
    Delete: sql-bench/Results-win32/ATIS-access_odbc-win98-cmp-access,mysql

  BitKeeper/deleted/.del-time_interval.txt~a1def62e267a59b2
    1.3 06/04/12 18:54:25 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/time_interval.txt

  BitKeeper/deleted/.del-stop1.txt~f09ba164ad44a288
    1.3 06/04/12 18:54:25 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/stop1.txt

  BitKeeper/deleted/.del-stop.txt~31fb564e1f415e34
    1.3 06/04/12 18:54:25 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/stop.txt

  BitKeeper/deleted/.del-state.txt~9dd470ce14075b90
    1.3 06/04/12 18:54:25 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/state.txt

  BitKeeper/deleted/.del-restriction.txt~6ae208924617784a
    1.3 06/04/12 18:54:25 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/restriction.txt

  BitKeeper/deleted/.del-restrict_class.txt~2f741bf0ea498f84
    1.3 06/04/12 18:54:25 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/restrict_class.txt

  BitKeeper/deleted/.del-restrict_carrier.txt~925b5492f3f9cba3
    1.3 06/04/12 18:54:25 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/restrict_carrier.txt

  BitKeeper/deleted/.del-month_name.txt~4c44f7a323d57d92
    1.3 06/04/12 18:54:25 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/month_name.txt

  BitKeeper/deleted/.del-ground_service.txt~1087e477e86e84c
    1.3 06/04/12 18:54:24 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/ground_service.txt

  BitKeeper/deleted/.del-food_service.txt~66d95a150c28458
    1.3 06/04/12 18:54:24 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/food_service.txt

  BitKeeper/deleted/.del-flight_fare.txt~d7322593c8530487
    1.3 06/04/12 18:54:24 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/flight_fare.txt

  BitKeeper/deleted/.del-flight_day.txt~76868d6d265d441e
    1.3 06/04/12 18:54:24 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/flight_day.txt

  BitKeeper/deleted/.del-flight_class.txt~1801101474c29098
    1.3 06/04/12 18:54:24 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/flight_class.txt

  BitKeeper/deleted/.del-flight.txt~e5065423760e99eb
    1.3 06/04/12 18:54:24 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/flight.txt

  BitKeeper/deleted/.del-fconnection.txt~e0ef6a8b5560a713
    1.4 06/04/12 18:54:24 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/fconnection.txt

  BitKeeper/deleted/.del-fare.txt~ea0652f490bc24a6
    1.3 06/04/12 18:54:24 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/fare.txt

  BitKeeper/deleted/.del-dual_carrier.txt~a7dd776224fbd92b
    1.3 06/04/12 18:54:23 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/dual_carrier.txt

  BitKeeper/deleted/.del-day_name.txt~f813b215955d894c
    1.3 06/04/12 18:54:23 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/day_name.txt

  BitKeeper/deleted/.del-date_day.txt~4e9a282fcf54cfd8
    1.3 06/04/12 18:54:23 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/date_day.txt

  BitKeeper/deleted/.del-connect_leg.txt~f97b6e94e108bb36
    1.3 06/04/12 18:54:23 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/connect_leg.txt

  BitKeeper/deleted/.del-compound_class.txt~d4a2f1b7f96340b9
    1.3 06/04/12 18:54:23 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/compound_class.txt

  BitKeeper/deleted/.del-code_description.txt~f9117373e438b0e2
    1.3 06/04/12 18:54:23 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/code_description.txt

  BitKeeper/deleted/.del-class_of_service.txt~21f6b9848b8c76d
    1.3 06/04/12 18:54:23 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/class_of_service.txt

  BitKeeper/deleted/.del-postgres.crash-me~eacac145c3e30f17
    1.4 06/04/12 18:54:22 jimw@mysql.com +0 -0
    Delete: sql-bench/Comments/postgres.crash-me

  BitKeeper/deleted/.del-postgres.benchmark~4d30890732b784a
    1.11 06/04/12 18:54:22 jimw@mysql.com +0 -0
    Delete: sql-bench/Comments/postgres.benchmark

  BitKeeper/deleted/.del-city.txt~d96dd6d073344d2e
    1.3 06/04/12 18:54:22 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/city.txt

  BitKeeper/deleted/.del-airport_service.txt~6ee6d5b852b3e38
    1.3 06/04/12 18:54:22 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/airport_service.txt

  BitKeeper/deleted/.del-airport.txt~59c78514130e1f45
    1.3 06/04/12 18:54:22 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/airport.txt

  BitKeeper/deleted/.del-airline.txt~a79f8eadf853f2c8
    1.3 06/04/12 18:54:22 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/airline.txt

  BitKeeper/deleted/.del-aircraft.txt~15e4de7ab37c92d3
    1.3 06/04/12 18:54:22 jimw@mysql.com +0 -0
    Delete: sql-bench/Data/ATIS/aircraft.txt

  BitKeeper/deleted/.del-mysql.benchmark~4d8729c0937456fc
    1.2 06/04/12 18:54:21 jimw@mysql.com +0 -0
    Delete: sql-bench/Comments/mysql.benchmark

  BitKeeper/deleted/.del-interbase~cdad59622b4d6f3
    1.2 06/04/12 18:54:21 jimw@mysql.com +0 -0
    Delete: sql-bench/Comments/interbase

  BitKeeper/deleted/.del-Informix.crash-me~51ab5b717cefe74
    1.4 06/04/12 18:54:21 jimw@mysql.com +0 -0
    Delete: sql-bench/Comments/Informix.crash-me

  BitKeeper/deleted/.del-FrontBase.benchmark~217041ef18274c2e
    1.2 06/04/12 18:54:21 jimw@mysql.com +0 -0
    Delete: sql-bench/Comments/FrontBase.benchmark

  BitKeeper/deleted/.del-Empress.crash-me~bdaff0c68ce10f02
    1.4 06/04/12 18:54:21 jimw@mysql.com +0 -0
    Delete: sql-bench/Comments/Empress.crash-me

  BitKeeper/deleted/.del-Adabas.crash-me~ce88ba1a540971ac
    1.4 06/04/12 18:54:21 jimw@mysql.com +0 -0
    Delete: sql-bench/Comments/Adabas.crash-me

  BitKeeper/deleted/.del-Access.crash-me~bb457ec282d939b6
    1.4 06/04/12 18:54:21 jimw@mysql.com +0 -0
    Delete: sql-bench/Comments/Access.crash-me

ChangeSet
  1.2119.409.5 06/04/12 18:15:39 igor@rurik.mysql.com +2 -0
  Fixes after manual merge.

  mysql-test/t/innodb.test
    1.137 06/04/12 18:15:31 igor@rurik.mysql.com +12 -11
    Fixes after manual merge.

  mysql-test/r/innodb.result
    1.170 06/04/12 18:15:31 igor@rurik.mysql.com +53 -4
    Fixes after manual merge.

ChangeSet
  1.1810.1554.2 06/04/13 01:46:44 konstantin@mysql.com +6 -0
  Post-merge fixes. Add a new error message for max_prepared_stmt_count
  limit.

  sql/sql_prepare.cc
    1.142.1.33 06/04/13 01:46:36 konstantin@mysql.com +6 -5
    Post-merge fixes.

  sql/sql_class.h
    1.230.1.56 06/04/13 01:46:36 konstantin@mysql.com +0 -10
    Post-merge fixes.

  sql/sql_class.cc
    1.223.1.8 06/04/13 01:46:36 konstantin@mysql.com +7 -18
    Post-merge fixes.

  sql/share/errmsg.txt
    1.42.11.1 06/04/13 01:46:36 konstantin@mysql.com +2 -0
    Add a new error message for max_prepared_stmt_count limit,
    we can do it in 5.0

  mysql-test/t/ps.test
    1.56.1.6 06/04/13 01:46:36 konstantin@mysql.com +14 -12
    Post-merge fixes.

  mysql-test/r/ps.result
    1.56.1.8 06/04/13 01:46:36 konstantin@mysql.com +130 -0
    Post-merge fixes.

ChangeSet
  1.2119.273.3 06/04/12 21:19:24 mats@mysql.com +4 -0
  Bug#17400 (Cluster Replication: Delete and update of row w/o PK fails):
  Restarting scan after call to delete_row().

  mysql-test/t/rpl_ndb_dd_partitions.test
    1.1 06/04/12 21:19:15 mats@mysql.com +301 -0
    New BitKeeper file ``mysql-test/t/rpl_ndb_dd_partitions.test''

  mysql-test/t/rpl_ndb_dd_partitions.test
    1.0 06/04/12 21:19:15 mats@mysql.com +0 -0
    BitKeeper file /home/bk/b17400-mysql-5.1-new/mysql-test/t/rpl_ndb_dd_partitions.test

  sql/log_event.cc
    1.220 06/04/12 21:19:14 mats@mysql.com +19 -12
    Moving scan init functions for Delete_rows_log_event.
    Restarting scan for each found row.

  mysql-test/t/disabled.def
    1.107.1.1 06/04/12 21:19:14 mats@mysql.com +2 -1
    Disabling some tests.

  mysql-test/include/rpl_multi_engine3.inc
    1.3 06/04/12 21:19:14 mats@mysql.com +1 -1
    Injector thread was not given enough time.

ChangeSet
  1.2119.338.7 06/04/12 21:14:32 mats@mysql.com +2 -0
  WL#3208 (Adding TAP support):
  Making it portable to non-gcc compilers by defining __attribute__
  macro for non-gcc compilers.

  unittest/mytap/tap.h
    1.4 06/04/12 21:14:27 mats@mysql.com +9 -5
    Defining __attribute__ macro for non-gcc builds.

  unittest/mytap/Doxyfile
    1.3 06/04/12 21:14:27 mats@mysql.com +27 -25
    Expanding macros while generating documentation.

ChangeSet
  1.2119.410.1 06/04/12 23:08:50 petr@mysql.com +1 -0
  cleanup: sort IM options alphabetically

  server-tools/instance-manager/options.cc
    1.30.1.1 06/04/12 23:08:45 petr@mysql.com +38 -31
    sort options

ChangeSet
  1.1616.2530.7 06/04/12 23:05:38 evgen@moonbone.local +6 -0
  Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was 
  used
  
  In a simple queries a result of the GROUP_CONCAT() function was always of 
  varchar type.
  But if length of GROUP_CONCAT() result is greater than 512 chars and temporary
  table is used during select then the result is converted to blob, due to
  policy to not to store fields longer than 512 chars in tmp table as varchar
  fields.
  
  In order to provide consistent behaviour, result of GROUP_CONCAT() now
  will always be converted to blob if it is longer than 512 chars.
  Item_func_group_concat::field_type() is modified accordingly.

  sql/item_func.cc
    1.124.42.7 06/04/12 23:02:02 evgen@moonbone.local +1 -1
    Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was used
    In the Item_func::tmp_table_field() function the unnamed constant 255 is changed to the CONVERT_IF_BIGGER_TO_BLOB constant.
    The Item_func::tmp_table_field() function now measures the result length in chars rather than bytes when converting string result to a blob.

  sql/item_sum.h
    1.48.1.35 06/04/12 23:00:06 evgen@moonbone.local +7 -0
    Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was used
    To the Item_func_group_concat calls added the member function field_type() which returns the BLOB or VAR_STRING type based on the items length.

  sql/sql_select.cc
    1.216.125.2 06/04/12 22:54:11 evgen@moonbone.local +4 -2
    Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was used
    The unnamed constant 255 in the create_tmp_field() and create_tmp_field_from_item() functions now defined as the CONVERT_IF_BIGGER_TO_BLOB constant.
    The create_tmp_field() function now converts the Item_sum string result to a blob field based on its char length.

  sql/unireg.h
    1.33.1.2 06/04/12 22:47:53 evgen@moonbone.local +1 -0
    Added the CONVERT_IF_BIGGER_TO_BLOB constant

  mysql-test/r/func_gconcat.result
    1.27.1.17 06/04/12 22:46:59 evgen@moonbone.local +16 -0
    Added test case for bug#14169: type of group_concat() result changed to blob if tmp_table was used

  mysql-test/t/func_gconcat.test
    1.23.1.12 06/04/12 22:46:32 evgen@moonbone.local +10 -0
    Added test case for bug#14169: type of group_concat() result changed to blob if tmp_table was used

ChangeSet
  1.2119.408.3 06/04/12 11:14:56 jimw@mysql.com +3 -0
  Support --debug/-# in instance manager.

  server-tools/instance-manager/options.h
    1.15 06/04/12 11:14:52 jimw@mysql.com +4 -0
    Handle --debug/-#

  server-tools/instance-manager/options.cc
    1.31 06/04/12 11:14:51 jimw@mysql.com +16 -1
    Handle --debug/-#

  mysql-test/mysql-test-run.pl
    1.101 06/04/12 11:14:51 jimw@mysql.com +6 -0
    Support tracing the instance manager

ChangeSet
  1.2119.379.10 06/04/12 19:38:40 tomas@poseidon.ndb.mysql.com +2 -0
  test update

  mysql-test/t/disabled.def
    1.123.1.4 06/04/12 19:38:15 tomas@poseidon.ndb.mysql.com +2 -2
    test update

  mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test
    1.4 06/04/12 19:38:14 tomas@poseidon.ndb.mysql.com +1 -1
    test update

ChangeSet
  1.1810.1556.1 06/04/12 22:05:23 holyfoot@deer.(none) +6 -0
  bug #15860 (SPATIAL keys in INNODB)

  sql/sql_table.cc
    1.239.1.65 06/04/12 22:03:59 holyfoot@mysql.com +6 -0
    check that the handler allows SPATIAL keys

  sql/share/errmsg.txt
    1.42.1.20 06/04/12 22:03:59 holyfoot@mysql.com +2 -0
    error message added

  sql/handler.h
    1.138.2.30 06/04/12 22:03:58 holyfoot@mysql.com +1 -0
    HA_CAN_RTREEKEYS defined

  sql/ha_myisam.cc
    1.147.1.19 06/04/12 22:03:58 holyfoot@mysql.com +1 -1
    HA_CAN_RTREEKEYS added to ha_myisam

  mysql-test/t/innodb.test
    1.118.2.3 06/04/12 22:03:58 holyfoot@mysql.com +7 -0
    testcase

  mysql-test/r/innodb.result
    1.145.1.15 06/04/12 22:03:58 holyfoot@mysql.com +2 -0
    result added

ChangeSet
  1.2119.379.9 06/04/12 18:52:32 tomas@poseidon.ndb.mysql.com +1 -0
  ndb: removed usage of unsupported binlog table: no pk + blob

  mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test
    1.3 06/04/12 18:52:26 tomas@poseidon.ndb.mysql.com +4 -1
    ndb: removed usage of unsupported binlog table: no pk + blob

ChangeSet
  1.2119.379.8 06/04/12 18:51:10 tomas@poseidon.ndb.mysql.com +1 -0
  diabling tests with correct bug number

  mysql-test/t/disabled.def
    1.123.1.3 06/04/12 18:51:02 tomas@poseidon.ndb.mysql.com +3 -3
    diabling tests with correct bug number

ChangeSet
  1.2119.379.7 06/04/12 18:01:19 tomas@poseidon.ndb.mysql.com +1 -0
  ndb:
  freeing non freed objects on server shutdown
  corrected timeout handling on schema events

  sql/ha_ndbcluster_binlog.cc
    1.41.1.2 06/04/12 18:01:11 tomas@poseidon.ndb.mysql.com +87 -54
    ndb:
    freeing non freed objects on server shutdown
    corrected timeout handling on schema events

ChangeSet
  1.1810.1555.1 06/04/12 19:31:00 kroki@mysql.com +7 -0
  Bug#16461: connection_id() does not work properly inside trigger
  
  CONNECTION_ID() was implemented as a constant Item, i.e. an instance of
  Item_static_int_func class holding value computed at creation time.
  Since Items are created on parsing, and trigger statements are parsed
  on table open, the first connection to open a particular table would
  effectively set its own CONNECTION_ID() inside trigger statements for
  that table.
  
  Re-implement CONNECTION_ID() as a class derived from Item_int_func, and
  compute connection_id on every call to fix_fields().

  sql/item_func.h
    1.137 06/04/12 19:30:52 kroki@mysql.com +12 -0
    Re-implement CONNECTION_ID() as Item_func_connection_id
    (was Item_static_int_func).

  sql/item_func.cc
    1.270.3.1 06/04/12 19:30:51 kroki@mysql.com +25 -0
    Re-implement CONNECTION_ID() as Item_func_connection_id
    (was Item_static_int_func).  Set max_length to 10, as it was before.
    Compute connection_id dynamically on every call to fix_fields().

  sql/item_create.cc
    1.58.1.1 06/04/12 19:30:51 kroki@mysql.com +2 -8
    Use new implementation of CONNECTION_ID().

  sql/item.h
    1.183.1.8 06/04/12 19:30:51 kroki@mysql.com +0 -12
    Remove now unused class Item_static_int_func.

  sql/item.cc
    1.113.39.1 06/04/12 19:30:51 kroki@mysql.com +0 -16
    Remove now unused class Item_static_int_func.

  mysql-test/t/trigger.test
    1.34.1.6 06/04/12 19:30:51 kroki@mysql.com +28 -0
    Add test case for bug#16461.

  mysql-test/r/trigger.result
    1.29.1.6 06/04/12 19:30:50 kroki@mysql.com +13 -0
    Add result for bug#16461.

ChangeSet
  1.2119.379.6 06/04/12 15:56:29 tomas@poseidon.ndb.mysql.com +2 -0
  new files

  mysql-test/include/ndb_setup_slave.inc
    1.1 06/04/12 15:56:20 tomas@poseidon.ndb.mysql.com +27 -0
    New BitKeeper file ``mysql-test/include/ndb_setup_slave.inc''

  mysql-test/include/master-slave-end.inc
    1.1 06/04/12 15:56:20 tomas@poseidon.ndb.mysql.com +6 -0
    New BitKeeper file ``mysql-test/include/master-slave-end.inc''

  mysql-test/include/ndb_setup_slave.inc
    1.0 06/04/12 15:56:20 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/include/ndb_setup_slave.inc

  mysql-test/include/master-slave-end.inc
    1.0 06/04/12 15:56:20 tomas@poseidon.ndb.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new/mysql-test/include/master-slave-end.inc

ChangeSet
  1.2119.379.5 06/04/12 15:55:41 tomas@poseidon.ndb.mysql.com +11 -0
  increase save_master_pos timeout to 30 seconds for higher test predictability
      better replicaiton test cleanup to ensure better test predictability
  + some ndb test cleanup

  mysql-test/t/rpl_ndb_sync.test
    1.8 06/04/12 15:55:32 tomas@poseidon.ndb.mysql.com +15 -47
    better replicaiton test cleanup to ensure better test predictability

  mysql-test/t/rpl_ndb_dd_basic.test
    1.5 06/04/12 15:55:32 tomas@poseidon.ndb.mysql.com +1 -1
    better replicaiton test cleanup to ensure better test predictability

  mysql-test/t/rpl_ndb_dd_advance.test
    1.5 06/04/12 15:55:32 tomas@poseidon.ndb.mysql.com +2 -22
    better replicaiton test cleanup to ensure better test predictability

  mysql-test/t/rpl_ndb_basic.test
    1.4 06/04/12 15:55:32 tomas@poseidon.ndb.mysql.com +1 -1
    better replicaiton test cleanup to ensure better test predictability

  mysql-test/t/rpl_ndb_bank.test
    1.6 06/04/12 15:55:32 tomas@poseidon.ndb.mysql.com +1 -28
    better replicaiton test cleanup to ensure better test predictability

  mysql-test/t/disabled.def
    1.123.1.2 06/04/12 15:55:32 tomas@poseidon.ndb.mysql.com +4 -4
    better replicaiton test cleanup to ensure better test predictability

  mysql-test/r/rpl_ndb_sync.result
    1.7 06/04/12 15:55:32 tomas@poseidon.ndb.mysql.com +5 -5
    better replicaiton test cleanup to ensure better test predictability

  mysql-test/r/rpl_ndb_dd_advance.result
    1.4 06/04/12 15:55:32 tomas@poseidon.ndb.mysql.com +0 -3
    better replicaiton test cleanup to ensure better test predictability

  mysql-test/extra/rpl_tests/rpl_row_UUID.test
    1.4 06/04/12 15:55:32 tomas@poseidon.ndb.mysql.com +1 -0
    better replicaiton test cleanup to ensure better test predictability

  mysql-test/extra/rpl_tests/rpl_ddl.test
    1.9 06/04/12 15:55:32 tomas@poseidon.ndb.mysql.com +1 -0
    better replicaiton test cleanup to ensure better test predictability

  client/mysqltest.c
    1.203.1.1 06/04/12 15:55:31 tomas@poseidon.ndb.mysql.com +18 -12
    increase save_master_pos timeout to 30 seconds for higher test predictability

ChangeSet
  1.1810.1552.1 06/04/12 17:37:57 kroki@mysql.com +2 -0
  In test for bug#15933 we have to wait for all disconnects to finish to avoid
  a race between updating and checking Max_used_connections.  This is done in
  a loop until either disconnect finished or timeout expired.  In a latter case
  the test will fail.

  mysql-test/t/status.test
    1.15 06/04/12 17:37:51 kroki@mysql.com +51 -14
    Close extra conections in previous test.
    In test for bug#15933 we have to wait for all disconnects to finish to avoid
    a race between updating and checking Max_used_connections.  This is done in
    a loop until either disconnect finished or timeout expired.  In a latter case
    the test will fail.
    Use con1, con2, con3 instead of con3, con4, con5.

  mysql-test/r/status.result
    1.10 06/04/12 17:37:50 kroki@mysql.com +5 -5
    Update result to match changes in test case.

ChangeSet
  1.1810.1551.1 06/04/12 15:13:16 msvensson@neptunus.(none) +6 -0
  Bug#18564  Test failure due to test not checking preconditions
   - Add variable "have_dynamic_loading" and use it to check if the udf test should be run.

  sql/set_var.cc
    1.125.5.9 06/04/12 15:13:10 msvensson@neptunus.(none) +1 -0
    Add have_dlopen variable and name it "have_dynamic_loading" in "SHOW VARIABLES"

  sql/mysqld.cc
    1.439.50.1 06/04/12 15:13:10 msvensson@neptunus.(none) +6 -1
    Add have_dlopen variable

  sql/mysql_priv.h
    1.290.43.1 06/04/12 15:13:10 msvensson@neptunus.(none) +1 -1
    Add have_dlopen variable

  mysql-test/t/disabled.def
    1.2.4.5 06/04/12 15:13:10 msvensson@neptunus.(none) +0 -1
    Remove udf from disabled

  mysql-test/r/have_udf.require
    1.1.1.1 06/04/12 15:13:10 msvensson@neptunus.(none) +2 -1
    Use variable "have_dynamic_loading" to to determine if there is support for udf's

  mysql-test/include/have_udf.inc
    1.1.1.1 06/04/12 15:13:10 msvensson@neptunus.(none) +5 -9
    Use variable "have_dynamic_loading" to to determine if there is support for udf's

ChangeSet
  1.1616.2144.107 06/04/12 14:32:34 knielsen@mysql.com +1 -0
  Fix broken --valgrind-options option.

  mysql-test/mysql-test-run.pl
    1.8.10.1 06/04/12 14:32:15 knielsen@mysql.com +1 -1
    Fix broken --valgrind-options option.

ChangeSet
  1.2119.365.2 06/04/12 14:08:24 serg@serg.mylan +12 -0
  fixes for 'make dist' and 'make distcheck'

  storage/ndb/Makefile.am
    1.16 06/04/12 14:08:11 serg@serg.mylan +1 -0
    fixes for 'make dist' and 'make distcheck'
    force common.mk.am out of DIST_COMMON (which is otherwise an
    auto-generated list of Makefile's sources) because it's listed
    indirectly in EXTRA_DIST, and with bk -r get, a file cannot be copied
    twice.

  storage/Makefile.am
    1.5 06/04/12 14:08:11 serg@serg.mylan +1 -2
    fixes for 'make dist' and 'make distcheck'
    remove SUBDIRS/DIST_SUBDIRS hack

  plugin/Makefile.am
    1.2 06/04/12 14:08:11 serg@serg.mylan +5 -0
    fixes for 'make dist' and 'make distcheck'
    include plugin/fulltext/configure.in template in the distribution

  mysql-test/ndb/Makefile.am
    1.8 06/04/12 14:08:11 serg@serg.mylan +3 -6
    fixes for 'make dist' and 'make distcheck'
    ndbcluster script is not a "source"
    don't forget to cleanup

  libmysqld/Makefile.am
    1.82.1.1 06/04/12 14:08:11 serg@serg.mylan +8 -2
    fixes for 'make dist' and 'make distcheck'
    remove fragile promiscuous search for object files
    if .o file is not where we look for it - extract it from the library

  libmysql_r/Makefile.am
    1.27 06/04/12 14:08:11 serg@serg.mylan +7 -4
    fixes for 'make dist' and 'make distcheck'
    when symlinking all files from libmysql/ take into account that
    srcdir != builddir

  extra/Makefile.am
    1.36 06/04/12 14:08:11 serg@serg.mylan +1 -4
    fixes for 'make dist' and 'make distcheck'
    remove SUBDIR/DIST_SUBDIR hack

  configure.in
    1.333.14.1 06/04/12 14:08:11 serg@serg.mylan +27 -12
    fixes for 'make dist' and 'make distcheck'
    create Makefile only if a feature is enabled
    storage engine dirs must not include /
    automatically disable readline/libedit/sql-bench if source dir is missing

  config/ac-macros/zlib.m4
    1.8 06/04/12 14:08:11 serg@serg.mylan +5 -1
    fixes for 'make dist' and 'make distcheck'
    create Makefile only if zlib is used

  config/ac-macros/yassl.m4
    1.15 06/04/12 14:08:10 serg@serg.mylan +5 -6
    fixes for 'make dist' and 'make distcheck'
    create Makefile's only if yassl is used
    yassl_dir must not include /

  Makefile.am
    1.84.2.1 06/04/12 14:08:10 serg@serg.mylan +5 -11
    fixes for 'make dist' and 'make distcheck'
    remove double-listing of everything in SUBDIRS and DIST_SUBDIRS
    remove @yassl_dir@, it belongs to extra/Makefile.am
    specify --basedir for mysql_install_db, in case builddir (where mysql_install_db is)
    differs from srcdir (where mysql_fix_privilege_tables.sql is)

  BUILD/compile-dist
    1.7 06/04/12 14:08:10 serg@serg.mylan +3 -1
    fixes for 'make dist' and 'make distcheck'
    include yassl in "dist"

ChangeSet
  1.1810.1550.2 06/04/12 14:06:05 msvensson@neptunus.(none) +3 -0
  Fix up patch

  vio/viosslfactories.c
    1.22 06/04/12 14:06:01 msvensson@neptunus.(none) +0 -1
    Remove comment

  vio/viossl.c
    1.32 06/04/12 14:06:01 msvensson@neptunus.(none) +12 -12
    Fix coding standard

  sql-common/client.c
    1.83.1.4 06/04/12 14:06:01 msvensson@neptunus.(none) +1 -67
    Remove the ssl_verify_server_cert will be added in separate patch

ChangeSet
  1.2119.407.1 06/04/12 16:54:00 holyfoot@deer.(none) +2 -0
  mysql_upgrade.sh removed.
  client/mysql_upgrade bunary should be used instead

  scripts/Makefile.am
    1.53 06/04/12 16:52:13 holyfoot@mysql.com +0 -3
    mysql_upgrade.sh removed

  BitKeeper/deleted/.del-mysql_upgrade.sh~826da969ccf96ef
    1.4 06/04/12 16:16:12 holyfoot@mysql.com +0 -0
    Delete: scripts/mysql_upgrade.sh

ChangeSet
  1.1810.1548.1 06/04/12 12:50:12 aelkin@mysql.com +2 -0
  #BUG18715 create view with replicate*ignore-table
  Fixed in parser. rpl_view gained no changes but rpl_view-slave.opt.

  mysql-test/t/rpl_view-slave.opt
    1.1 06/04/12 12:50:06 aelkin@mysql.com +5 -0
    The option is needed to force slave executes tables_ok which must return OK in conditions of this tests (no table foo is used.

  mysql-test/t/rpl_view-slave.opt
    1.0 06/04/12 12:50:06 aelkin@mysql.com +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug18715_drop_view_slave/mysql-test/t/rpl_view-slave.opt

  sql/sql_yacc.yy
    1.371.62.1 06/04/12 12:50:05 aelkin@mysql.com +2 -2
    UPDATING option for create/alter view is added for tables_ok to finds the view's
    TABLE_LIST.updating as true. FIXME: Regarding to UPDATING option `create view' should not have
    any difference from `create table'.

ChangeSet
  1.2119.406.1 06/04/12 14:45:37 bar@mysql.com +2 -0
  Bug#18736 test case 'upgrade' fails
  
  "upgrade" failed on windows, because of lower_case_table_name.
  This fix changes letters to lower case, not to depend on OS.
  
  Note, this change does not affect coverage of 
  Bug N 17142 "Crash if create with encoded name",
  which the test war originally written for.

  mysql-test/t/upgrade.test
    1.4 06/04/12 14:45:29 bar@mysql.com +11 -11
    Changing "P" to "p" not to depend on lower_case_table_name

  mysql-test/r/upgrade.result
    1.4 06/04/12 14:45:29 bar@mysql.com +12 -12
    Changing "P" to "p" not to depend on lower_case_table_name

ChangeSet
  1.2119.405.1 06/04/12 10:55:26 guilhem@mysql.com +1 -0
  mysql-test-run.pl now creates an innodb data file of 10M:autoextend instead of 128M:autoextend.
  This is faster under gdb/valgrind (this should speed up work of people who have to run
  a simple test 50 times to do debugging). Running without --big, which is the default, InnoDB tests
  take at most 18MB so 128 was overkill. Running with --big, InnoDB tests take 450MB so 128
  was not enough anyway.

  mysql-test/mysql-test-run.pl
    1.100 06/04/12 10:55:21 guilhem@mysql.com +1 -1
    10M is faster to create than 128M (especially under gdb or valgrind) and is enough for most tests.

ChangeSet
  1.2119.357.3 06/04/12 08:30:34 msvensson@neptunus.(none) +1 -0
  Bug#18415 mysql-test-run.pl does not run on ActiveState perl
   - Part 1, better handling of subprocess and stdout to be done

  mysql-test/lib/mtr_process.pl
    1.28.1.1 06/04/12 08:30:30 msvensson@neptunus.(none) +35 -47
    - Dont redirect stdout if ActiveState perl since fork creates a new thread and not another process.
    - Change waitpid to allow for negative pid as we get on Windows, strange but 
      that is how it is. It should never create a process with pid -1 though.
    - Remove an "if" for cygwin that does not do anything.
    - Add "print" in the potentially hanging while loop in "start_reap_all"
    - Dont use "getpgrp" on windows.
    - Remove "sleep 2" in mtr_exit
    - Remove the initial ping of mysqld's in 'mysql_admin_shutdown', instead just start one 
      mysqladmin for each expected mysqld server and wait for them to return.
      Then perform the ping of the mysqld server's. Those ping's normally return immediately.

  storage/blackhole/ha_blackhole.cc
    1.30 06/04/11 22:29:27 acurtis@xiphis.org +0 -0
    Rename: sql/ha_blackhole.cc -> storage/blackhole/ha_blackhole.cc

  storage/blackhole/ha_blackhole.h
    1.8 06/04/11 22:29:24 acurtis@xiphis.org +0 -0
    Rename: sql/ha_blackhole.h -> storage/blackhole/ha_blackhole.h

  storage/archive/ha_archive.cc
    1.86 06/04/11 22:28:19 acurtis@xiphis.org +0 -0
    Rename: sql/ha_archive.cc -> storage/archive/ha_archive.cc

  storage/archive/ha_archive.h
    1.43 06/04/11 22:28:15 acurtis@xiphis.org +0 -0
    Rename: sql/ha_archive.h -> storage/archive/ha_archive.h

ChangeSet
  1.2119.403.1 06/04/11 23:35:48 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -0
  BUG#18962: DROP PARTITION fails when partitions dropped for subpartitions with default naming procedure
  Fixed naming procedures for default partitioning and default subpartitioning

  sql/partition_info.h
    1.5.1.3 06/04/11 23:35:43 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Fixed naming procedures for default partitioning and default subpartitioning

  sql/partition_info.cc
    1.8.1.1 06/04/11 23:35:43 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +36 -12
    Fixed naming procedures for default partitioning and default subpartitioning

  mysql-test/t/partition_range.test
    1.6 06/04/11 23:35:42 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +28 -0
    New test case

  mysql-test/r/partition_range.result
    1.8 06/04/11 23:35:42 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +24 -0
    New test case

  mysql-test/r/partition_pruning.result
    1.12.1.1 06/04/11 23:35:42 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -5
    Fixed test cases for new naming of default subpartitions

ChangeSet
  1.2119.401.5 06/04/11 18:59:43 jimw@mysql.com +5 -0
  Remove Windows project files for mysql_test_run_new.

  VC++Files/mysql.sln
    1.17 06/04/11 18:59:38 jimw@mysql.com +0 -7
    Remove reference to mysql_test_run_new

  VC++Files/mysql.dsw
    1.29 06/04/11 18:59:38 jimw@mysql.com +0 -23
    Remove reference to mysql_test_run_new

  BitKeeper/deleted/.del-mysql_test_run_new.vcproj~1ddaed30361efefe
    1.2 06/04/11 18:57:49 jimw@mysql.com +0 -0
    Delete: VC++Files/mysql-test/mysql_test_run_new.vcproj

  BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp~e7ee71ec8d2995e3
    1.5 06/04/11 18:57:48 jimw@mysql.com +0 -0
    Delete: VC++Files/mysql-test/mysql_test_run_new_ia64.dsp

  BitKeeper/deleted/.del-mysql_test_run_new.dsp~9d8078f3f02fcc8e
    1.9 06/04/11 18:57:47 jimw@mysql.com +0 -0
    Delete: VC++Files/mysql-test/mysql_test_run_new.dsp

ChangeSet
  1.2119.401.4 06/04/11 18:54:24 jimw@mysql.com +106 -0
  Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new,
  and various stuff in Docs/. Also move the certificates used for testing
  into mysql-test/std_data from the top-level SSL directory (now gone).

  support-files/mysql.spec.sh
    1.136 06/04/11 18:54:19 jimw@mysql.com +5 -3
    Don't package mysqltestmanager

  scripts/make_binary_distribution.sh
    1.118 06/04/11 18:54:19 jimw@mysql.com +1 -4
    Don't package up mysqltestmanager

  mysql-test/Makefile.am
    1.72 06/04/11 18:54:19 jimw@mysql.com +0 -11
    Don't need to copy .pem files any more, they're now in std_data.

  configure.in
    1.333.1.27 06/04/11 18:54:19 jimw@mysql.com +1 -17
    Remove old tools directory

  client/Makefile.am
    1.68 06/04/11 18:54:19 jimw@mysql.com +0 -3
    Remove mysqltestmanager clients

  Makefile.am
    1.87 06/04/11 18:54:19 jimw@mysql.com +2 -2
    Remove tools and SSL directories

  Docs/Makefile.am
    1.59 06/04/11 18:54:19 jimw@mysql.com +2 -2
    Move generate-text-files.pl up a level, since it is the only Support file

  BitKeeper/etc/ignore
    1.236 06/04/11 18:53:52 jimw@mysql.com +1 -0
    added client/mysql_upgrade

  mysql-test/std_data/server-key.pem
    1.7 06/04/11 18:46:42 jimw@mysql.com +0 -0
    Rename: SSL/server-key.pem -> mysql-test/std_data/server-key.pem

  mysql-test/std_data/server-cert.pem
    1.8 06/04/11 18:46:42 jimw@mysql.com +0 -0
    Rename: SSL/server-cert.pem -> mysql-test/std_data/server-cert.pem

  mysql-test/std_data/client-key.pem
    1.7 06/04/11 18:46:41 jimw@mysql.com +0 -0
    Rename: SSL/client-key.pem -> mysql-test/std_data/client-key.pem

  mysql-test/std_data/client-cert.pem
    1.8 06/04/11 18:46:41 jimw@mysql.com +0 -0
    Rename: SSL/client-cert.pem -> mysql-test/std_data/client-cert.pem

  mysql-test/std_data/cacert.pem
    1.8 06/04/11 18:46:41 jimw@mysql.com +0 -0
    Rename: SSL/cacert.pem -> mysql-test/std_data/cacert.pem

  SSL/server-key.pem
    1.6 06/04/11 18:46:22 jimw@mysql.com +0 -0
    Rename: BitKeeper/deleted/.del-server-key.pem~c91d4cc7180d7fe7 -> SSL/server-key.pem

  SSL/server-cert.pem
    1.7 06/04/11 18:46:22 jimw@mysql.com +0 -0
    Rename: BitKeeper/deleted/.del-server-cert.pem~b069c8f3ecf97e5c -> SSL/server-cert.pem

  SSL/cacert.pem
    1.7 06/04/11 18:46:21 jimw@mysql.com +0 -0
    Rename: BitKeeper/deleted/.del-cacert.pem~b43e63242a6fbed -> SSL/cacert.pem

  SSL/client-cert.pem
    1.7 06/04/11 18:46:20 jimw@mysql.com +0 -0
    Rename: BitKeeper/deleted/.del-client-cert.pem~51b2932c83a5caca -> SSL/client-cert.pem

  SSL/client-key.pem
    1.6 06/04/11 18:46:19 jimw@mysql.com +0 -0
    Rename: BitKeeper/deleted/.del-client-key.pem~2a716939757711aa -> SSL/client-key.pem

  BitKeeper/deleted/.del-sp-implemented.txt~15f5c0033d848288
    1.12 06/04/11 18:04:04 jimw@mysql.com +0 -0
    Delete: Docs/sp-implemented.txt

  BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434
    1.2 06/04/11 18:01:46 jimw@mysql.com +0 -0
    Delete: Docs/changelog-5.0.xml

  BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868
    1.2 06/04/11 18:01:46 jimw@mysql.com +0 -0
    Delete: Docs/changelog-4.1.xml

  BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b
    1.3 06/04/11 18:01:45 jimw@mysql.com +0 -0
    Delete: Docs/changelog-4.0.xml

  BitKeeper/deleted/.del-.cvsignore~250f630140b90042
    1.3 06/04/11 18:01:36 jimw@mysql.com +0 -0
    Delete: Docs/Support/.cvsignore

  Docs/generate-text-files.pl
    1.5 06/04/11 18:00:53 jimw@mysql.com +0 -0
    Rename: Docs/Support/generate-text-files.pl -> Docs/generate-text-files.pl

  BitKeeper/deleted/.del-colspec-fix.pl~6c78d3332330b19e
    1.6 06/04/11 18:00:37 jimw@mysql.com +0 -0
    Delete: Docs/Support/colspec-fix.pl

  BitKeeper/deleted/.del-xwf~76b97805d9146b80
    1.2 06/04/11 18:00:36 jimw@mysql.com +0 -0
    Delete: Docs/Support/xwf

  BitKeeper/deleted/.del-trivial-makeinfo-4.0c.patch~40d336454ecf98db
    1.2 06/04/11 18:00:36 jimw@mysql.com +0 -0
    Delete: Docs/Support/trivial-makeinfo-4.0c.patch

  BitKeeper/deleted/.del-test-make-manual-de~33cad2886311b8a
    1.2 06/04/11 18:00:35 jimw@mysql.com +0 -0
    Delete: Docs/Support/test-make-manual-de

  BitKeeper/deleted/.del-test-make-manual~5da458f958a424ec
    1.8 06/04/11 18:00:34 jimw@mysql.com +0 -0
    Delete: Docs/Support/test-make-manual

  BitKeeper/deleted/.del-make-makefile~39fd454b487126e8
    1.3 06/04/11 18:00:33 jimw@mysql.com +0 -0
    Delete: Docs/Support/make-makefile

  BitKeeper/deleted/.del-make-docbook~ccac1eb717e92ac9
    1.6 06/04/11 18:00:32 jimw@mysql.com +0 -0
    Delete: Docs/Support/make-docbook

  BitKeeper/deleted/.del-docbook-split~be931c3922898d0
    1.4 06/04/11 18:00:31 jimw@mysql.com +0 -0
    Delete: Docs/Support/docbook-split

  BitKeeper/deleted/.del-docbook-prefix.pl~876c7d33c68c224a
    1.2 06/04/11 18:00:29 jimw@mysql.com +0 -0
    Delete: Docs/Support/docbook-prefix.pl

  BitKeeper/deleted/.del-docbook-fixup.pl~46cf3bdef147084e
    1.17 06/04/11 18:00:28 jimw@mysql.com +0 -0
    Delete: Docs/Support/docbook-fixup.pl

  BitKeeper/deleted/.del-mysql-compatible.jpg~56ecc684688a7382
    1.3 06/04/11 17:59:19 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql-compatible.jpg

  BitKeeper/deleted/.del-mysql_anim-06.gif~d9cffaf35d9d4719
    1.3 06/04/11 17:59:17 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql_anim-06.gif

  BitKeeper/deleted/.del-mysql_anim-05.gif~e63e7f003b77ad95
    1.3 06/04/11 17:59:13 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql_anim-05.gif

  BitKeeper/deleted/.del-mysql_anim-04.gif~14f429c87c0c718
    1.3 06/04/11 17:59:12 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql_anim-04.gif

  BitKeeper/deleted/.del-mysql_anim-03.gif~470dd9c9a8bd55fc
    1.3 06/04/11 17:59:10 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql_anim-03.gif

  BitKeeper/deleted/.del-mysql_anim-02.gif~476224d724007343
    1.3 06/04/11 17:59:09 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql_anim-02.gif

  BitKeeper/deleted/.del-mysql_anim-01.gif~d27d4f0c1a2a6da9
    1.3 06/04/11 17:59:09 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql_anim-01.gif

  BitKeeper/deleted/.del-mysql-17.gif~b07962578d0952b1
    1.3 06/04/11 17:59:08 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql-17.gif

  BitKeeper/deleted/.del-mysql-16.gif~6a6c86de2f85f0f5
    1.3 06/04/11 17:59:08 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql-16.gif

  BitKeeper/deleted/.del-mysql-15.gif~64c998fdd6fc1ae1
    1.3 06/04/11 17:59:07 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql-15.gif

  BitKeeper/deleted/.del-mysql-14.gif~a11e7df8653ad1b1
    1.3 06/04/11 17:59:07 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql-14.gif

  BitKeeper/deleted/.del-mysql-13.gif~1ad2eedf58da3aaa
    1.3 06/04/11 17:59:07 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql-13.gif

  BitKeeper/deleted/.del-mysql-12.gif~18d47c1ad5aef481
    1.3 06/04/11 17:59:06 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql-12.gif

  BitKeeper/deleted/.del-mysql-11.gif~8495404458978524
    1.3 06/04/11 17:59:06 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql-11.gif

  BitKeeper/deleted/.del-mysql-10.gif~a8b5306c4d911f8e
    1.3 06/04/11 17:59:05 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql-10.gif

  BitKeeper/deleted/.del-mysql-09.gif~17604ce9d92cd94a
    1.3 06/04/11 17:59:05 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql-09.gif

  BitKeeper/deleted/.del-mysql-08.gif~50fb4d886f82e8bc
    1.3 06/04/11 17:59:04 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql-08.gif

  BitKeeper/deleted/.del-mysql-07.gif~b86f918998a2114e
    1.3 06/04/11 17:59:03 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql-07.gif

  BitKeeper/deleted/.del-mysql-06.gif~8bb16461fd45634e
    1.3 06/04/11 17:59:02 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql-06.gif

  BitKeeper/deleted/.del-mysql-05.gif~230c28315136655
    1.3 06/04/11 17:59:01 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql-05.gif

  BitKeeper/deleted/.del-mysql-04.gif~6c3fdc91da64574
    1.3 06/04/11 17:59:01 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql-04.gif

  BitKeeper/deleted/.del-mysql-03.gif~a510e3599346cd5f
    1.3 06/04/11 17:59:00 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql-03.gif

  BitKeeper/deleted/.del-mysql-02.gif~5e03e2ffa6bd060f
    1.3 06/04/11 17:59:00 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql-02.gif

  BitKeeper/deleted/.del-mysql-01.gif~6f3f2e474b834ac6
    1.3 06/04/11 17:58:59 jimw@mysql.com +0 -0
    Delete: Docs/MySQL-logos/mysql-01.gif

  BitKeeper/deleted/.del-Tutorial-MySQL-final.txt~6e5b88fe4217504d
    1.3 06/04/11 17:58:59 jimw@mysql.com +0 -0
    Delete: Docs/Tutorial-MySQL-final.txt

  BitKeeper/deleted/.del-sql-99.txt~eff316adac3dd5b8
    1.2 06/04/11 17:57:14 jimw@mysql.com +0 -0
    Delete: Docs/Books/sql-99.txt

  BitKeeper/deleted/.del-sql-99.gif~df369376884a5689
    1.2 06/04/11 17:57:13 jimw@mysql.com +0 -0
    Delete: Docs/Books/sql-99.gif

  BitKeeper/deleted/.del-sql-99.eps~f85c06de7a016c7d
    1.2 06/04/11 17:57:12 jimw@mysql.com +0 -0
    Delete: Docs/Books/sql-99.eps

  BitKeeper/deleted/.del-realmen.txt~81c30565a8f06539
    1.2 06/04/11 17:57:12 jimw@mysql.com +0 -0
    Delete: Docs/Books/realmen.txt

  BitKeeper/deleted/.del-realmen.gif~86113e3b1fcbd597
    1.2 06/04/11 17:57:11 jimw@mysql.com +0 -0
    Delete: Docs/Books/realmen.gif

  BitKeeper/deleted/.del-realmen.eps~cc022325d3cb045
    1.2 06/04/11 17:57:10 jimw@mysql.com +0 -0
    Delete: Docs/Books/realmen.eps

  BitKeeper/deleted/.del-pthreads.txt~fc9e17d021335a39
    1.2 06/04/11 17:57:10 jimw@mysql.com +0 -0
    Delete: Docs/Books/pthreads.txt

  BitKeeper/deleted/.del-pthreads.gif~2d9460dec2577859
    1.2 06/04/11 17:57:09 jimw@mysql.com +0 -0
    Delete: Docs/Books/pthreads.gif

  BitKeeper/deleted/.del-pthreads.eps~2ca8ff2d1181b2c0
    1.2 06/04/11 17:57:09 jimw@mysql.com +0 -0
    Delete: Docs/Books/pthreads.eps

  BitKeeper/deleted/.del-prof.txt~9fc04ec3e5ce8361
    1.2 06/04/11 17:57:08 jimw@mysql.com +0 -0
    Delete: Docs/Books/prof.txt

  BitKeeper/deleted/.del-prof.gif~2fa8ed201d9d05fe
    1.2 06/04/11 17:57:08 jimw@mysql.com +0 -0
    Delete: Docs/Books/prof.gif

  BitKeeper/deleted/.del-prof.eps~1f54d9a56eb2b908
    1.2 06/04/11 17:57:07 jimw@mysql.com +0 -0
    Delete: Docs/Books/prof.eps

  BitKeeper/deleted/.del-msql.txt~235ae568824f4073
    1.2 06/04/11 17:57:06 jimw@mysql.com +0 -0
    Delete: Docs/Books/msql.txt

  BitKeeper/deleted/.del-msql.gif~72ea7c6d307b9108
    1.2 06/04/11 17:57:06 jimw@mysql.com +0 -0
    Delete: Docs/Books/msql.gif

  BitKeeper/deleted/.del-msql.eps~f3801b9d166ae4fc
    1.2 06/04/11 17:57:05 jimw@mysql.com +0 -0
    Delete: Docs/Books/msql.eps

  BitKeeper/deleted/.del-manual.txt~4702af61ea5e3c29
    1.2 06/04/11 17:57:05 jimw@mysql.com +0 -0
    Delete: Docs/Books/manual.txt

  BitKeeper/deleted/.del-manual.gif~657cf08119b1b3fc
    1.2 06/04/11 17:57:04 jimw@mysql.com +0 -0
    Delete: Docs/Books/manual.gif

  BitKeeper/deleted/.del-manual.eps~1c2ebcea50b4840c
    1.2 06/04/11 17:57:04 jimw@mysql.com +0 -0
    Delete: Docs/Books/manual.eps

  BitKeeper/deleted/.del-in_21.txt~448fb4b3d8c0b34e
    1.2 06/04/11 17:57:03 jimw@mysql.com +0 -0
    Delete: Docs/Books/in_21.txt

  BitKeeper/deleted/.del-in_21.gif~4a0b14f6d76458a9
    1.2 06/04/11 17:57:03 jimw@mysql.com +0 -0
    Delete: Docs/Books/in_21.gif

  BitKeeper/deleted/.del-in_21.eps~8150d06653dab178
    1.2 06/04/11 17:57:03 jimw@mysql.com +0 -0
    Delete: Docs/Books/in_21.eps

  BitKeeper/deleted/.del-ecomm.txt~27494674104ee9db
    1.2 06/04/11 17:57:02 jimw@mysql.com +0 -0
    Delete: Docs/Books/ecomm.txt

  BitKeeper/deleted/.del-ecomm.gif~f9bce6949b171613
    1.2 06/04/11 17:57:01 jimw@mysql.com +0 -0
    Delete: Docs/Books/ecomm.gif

  BitKeeper/deleted/.del-ecomm.eps~17833026ebd7656
    1.2 06/04/11 17:57:00 jimw@mysql.com +0 -0
    Delete: Docs/Books/ecomm.eps

  BitKeeper/deleted/.del-dubois.txt~998581cf9040fcc
    1.2 06/04/11 17:56:58 jimw@mysql.com +0 -0
    Delete: Docs/Books/dubois.txt

  BitKeeper/deleted/.del-dubois.gif~e02d361b13b1c4a4
    1.2 06/04/11 17:56:58 jimw@mysql.com +0 -0
    Delete: Docs/Books/dubois.gif

  BitKeeper/deleted/.del-dubois.eps~f24e09a7fa420436
    1.2 06/04/11 17:56:57 jimw@mysql.com +0 -0
    Delete: Docs/Books/dubois.eps

  BitKeeper/deleted/.del-dbi.txt~f5cf3fe321168fd5
    1.2 06/04/11 17:56:56 jimw@mysql.com +0 -0
    Delete: Docs/Books/dbi.txt

  BitKeeper/deleted/.del-dbi.gif~8f6861147437298b
    1.2 06/04/11 17:56:54 jimw@mysql.com +0 -0
    Delete: Docs/Books/dbi.gif

  BitKeeper/deleted/.del-dbi.eps~7b1032f98de7736d
    1.2 06/04/11 17:56:53 jimw@mysql.com +0 -0
    Delete: Docs/Books/dbi.eps

  BitKeeper/deleted/.del-algor.txt~37d2b5c1290e3cfa
    1.2 06/04/11 17:56:52 jimw@mysql.com +0 -0
    Delete: Docs/Books/algor.txt

  BitKeeper/deleted/.del-algor.gif~72c40c3bad198f2f
    1.2 06/04/11 17:56:51 jimw@mysql.com +0 -0
    Delete: Docs/Books/algor.gif

  BitKeeper/deleted/.del-bk.txt~ffd510fa9531f87c
    1.8 06/04/11 17:56:50 jimw@mysql.com +0 -0
    Delete: Docs/bk.txt

  BitKeeper/deleted/.del-algor.eps~1a57aff065918206
    1.2 06/04/11 17:56:50 jimw@mysql.com +0 -0
    Delete: Docs/Books/algor.eps

  BitKeeper/deleted/.del-mysqlmanagerc.c~4f6e3499e68508f6
    1.14 06/04/11 17:40:22 jimw@mysql.com +0 -0
    Delete: client/mysqlmanagerc.c

  BitKeeper/deleted/.del-mysqlmanager-pwgen.c~d8f5f91ec54432b9
    1.13 06/04/11 17:40:22 jimw@mysql.com +0 -0
    Delete: client/mysqlmanager-pwgen.c

  BitKeeper/deleted/.del-NOTES~e926d3e6929ac052
    1.3 06/04/11 17:38:50 jimw@mysql.com +0 -0
    Delete: SSL/NOTES

  BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6
    1.2 06/04/11 17:38:49 jimw@mysql.com +0 -0
    Delete: SSL/Makefile.am

  BitKeeper/deleted/.del-run-server~55426778bc206c48
    1.3 06/04/11 17:38:42 jimw@mysql.com +0 -0
    Delete: SSL/run-server

  BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4
    1.3 06/04/11 17:38:41 jimw@mysql.com +0 -0
    Delete: SSL/server-req.pem

  BitKeeper/deleted/.del-run-client~e683192d4f3821e0
    1.3 06/04/11 17:38:41 jimw@mysql.com +0 -0
    Delete: SSL/run-client

  BitKeeper/deleted/.del-server-key.pem~c91d4cc7180d7fe7
    1.5 06/04/11 17:38:40 jimw@mysql.com +0 -0
    Delete: SSL/server-key.pem

  BitKeeper/deleted/.del-server-cert.pem~b069c8f3ecf97e5c
    1.6 06/04/11 17:38:39 jimw@mysql.com +0 -0
    Delete: SSL/server-cert.pem

  BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8
    1.3 06/04/11 17:38:37 jimw@mysql.com +0 -0
    Delete: SSL/client-req.pem

  BitKeeper/deleted/.del-client-key.pem~2a716939757711aa
    1.5 06/04/11 17:38:34 jimw@mysql.com +0 -0
    Delete: SSL/client-key.pem

  BitKeeper/deleted/.del-client-cert.pem~51b2932c83a5caca
    1.6 06/04/11 17:38:33 jimw@mysql.com +0 -0
    Delete: SSL/client-cert.pem

  BitKeeper/deleted/.del-cacert.pem~b43e63242a6fbed
    1.6 06/04/11 17:38:32 jimw@mysql.com +0 -0
    Delete: SSL/cacert.pem

  BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b
    1.48 06/04/11 17:36:08 jimw@mysql.com +0 -0
    Delete: tools/mysqlmanager.c

  BitKeeper/deleted/.del-mysqlmanager-sample.pwd~712b89f01aaad84a
    1.2 06/04/11 17:36:08 jimw@mysql.com +0 -0
    Delete: tools/mysqlmanager-sample.pwd

  BitKeeper/deleted/.del-managertest1.nc~96a5c1c5c2d33085
    1.5 06/04/11 17:36:08 jimw@mysql.com +0 -0
    Delete: tools/managertest1.nc

  BitKeeper/deleted/.del-Makefile.am~abb265028eb9b6a7
    1.23 06/04/11 17:36:07 jimw@mysql.com +0 -0
    Delete: tools/Makefile.am

  mysql-test/mysql-test-run.sh
    1.316 06/04/11 17:35:43 jimw@mysql.com +23 -130
    Remove code that uses old mysqltestmanager

  mysql-test/Makefile.am
    1.71 06/04/11 17:26:48 jimw@mysql.com +0 -3
    Remove references to mysql_test_run_new

  BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad
    1.16 06/04/11 17:26:16 jimw@mysql.com +0 -0
    Delete: mysql-test/mysql_test_run_new.c

  BitKeeper/deleted/.del-my_manage.h~9d2cbc1e8bc894f
    1.5 06/04/11 17:26:16 jimw@mysql.com +0 -0
    Delete: mysql-test/my_manage.h

  BitKeeper/deleted/.del-my_manage.c~4de50e721d227d19
    1.11 06/04/11 17:26:16 jimw@mysql.com +0 -0
    Delete: mysql-test/my_manage.c

  BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb
    1.4 06/04/11 17:26:15 jimw@mysql.com +0 -0
    Delete: mysql-test/my_create_tables.c

  BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7
    1.3 06/04/11 17:26:15 jimw@mysql.com +0 -0
    Delete: mysql-test/init_db.sql

ChangeSet
  1.1810.1523.3 06/04/11 23:51:14 msvensson@shellback.(none) +7 -0
  Add new yaSSL files
  Add benchmark, testsuite and taocrypt/test as places where to 
  produce Makfiles and build - very useful for debugging

  extra/yassl/testsuite/Makefile.am
    1.1 06/04/11 23:51:08 msvensson@shellback.(none) +11 -0
    New BitKeeper file ``extra/yassl/testsuite/Makefile.am''

  extra/yassl/taocrypt/test/Makefile.am
    1.1 06/04/11 23:51:08 msvensson@shellback.(none) +8 -0
    New BitKeeper file ``extra/yassl/taocrypt/test/Makefile.am''

  extra/yassl/testsuite/Makefile.am
    1.0 06/04/11 23:51:08 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/testsuite/Makefile.am

  extra/yassl/taocrypt/test/Makefile.am
    1.0 06/04/11 23:51:08 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/test/Makefile.am

  extra/yassl/taocrypt/benchmark/Makefile.am
    1.1 06/04/11 23:51:00 msvensson@shellback.(none) +8 -0
    New BitKeeper file ``extra/yassl/taocrypt/benchmark/Makefile.am''

  extra/yassl/taocrypt/src/Makefile.am
    1.12 06/04/11 23:51:00 msvensson@shellback.(none) +6 -4
    Add all new files for yaSSL and organize them alphabetically

  extra/yassl/taocrypt/benchmark/Makefile.am
    1.0 06/04/11 23:51:00 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/benchmark/Makefile.am

  extra/yassl/taocrypt/Makefile.am
    1.1.1.1 06/04/11 23:51:00 msvensson@shellback.(none) +1 -1
    Add new subdir test for the taocrypt test

  extra/yassl/Makefile.am
    1.2.1.1 06/04/11 23:51:00 msvensson@shellback.(none) +1 -1
    Add new subdir testsuite

  config/ac-macros/yassl.m4
    1.10.1.4 06/04/11 23:50:59 msvensson@shellback.(none) +4 -1
    Add Makefiles for yassl testsuite and benchmark

ChangeSet
  1.2119.1.209 06/04/11 23:24:06 msvensson@neptunus.(none) +1 -0
  Protect from empty --query argument

  client/mysqlslap.c
    1.32 06/04/11 23:24:01 msvensson@neptunus.(none) +2 -2
    Protect from empty --query argument

ChangeSet
  1.2119.1.208 06/04/11 22:23:16 msvensson@neptunus.(none) +2 -0
  Bug#18012 mysqlslap fails if querystring starts with delimiter
  - Terminate loop not only when the limit is met, but alse when there is no more stmts  

  mysql-test/r/mysqlslap.result
    1.9 06/04/11 22:23:11 msvensson@neptunus.(none) +0 -2
    Remove the extra statmemnt

  client/mysqlslap.c
    1.31 06/04/11 22:23:11 msvensson@neptunus.(none) +2 -2
    Terminate loop not only when the limit is met, but alse when there is no more stmts  

ChangeSet
  1.2119.1.207 06/04/11 22:10:11 msvensson@neptunus.(none) +1 -0
  Fix syntax error

  client/mysqlslap.c
    1.30 06/04/11 22:10:06 msvensson@neptunus.(none) +1 -2
    Remove the %s, no string to print

ChangeSet
  1.2119.1.206 06/04/11 22:04:08 msvensson@neptunus.(none) +1 -0
  Bug#17478  mysqlslap not issuing any queries
   - Add more printouts it depending on verbose level
   - New common function 'run_query' to be used when executing a query

  client/mysqlslap.c
    1.29 06/04/11 22:04:02 msvensson@neptunus.(none) +75 -75
    Seed random number generator after options handling
    Make common function 'run_query' to take care of "opt_print_only" and "opt_verbose" level
    Better error message when failing to connect to MySQL Server
    Message when turning off "preserve-schema"
    Print auto generated statmements
    Print queries if verbose >= 2
    Print "connected" if verbose >= 3  

ChangeSet
  1.2119.399.2 06/04/11 23:06:47 aivanov@mysql.com +1 -0
  Removed test case erroneously merged from 5.0

  mysql-test/t/insert.test
    1.23 06/04/11 23:06:42 aivanov@mysql.com +0 -11
    Removed test case erroneously merged from 5.0

ChangeSet
  1.2119.1.205 06/04/11 20:49:31 msvensson@neptunus.(none) +1 -0
  Don't use the MYSQL* returned from mysql_real_connect to overwrite the already initalised mysql variable

  client/mysqlslap.c
    1.28 06/04/11 20:49:27 msvensson@neptunus.(none) +5 -5
    Only use the MYSQL* returned from mysql_reqal_connect as an indicator wether the connect was successfull or not.
    As the manual says about the return value from mysql_real_connect: "A MYSQL* connection handle if the connection
    was successful, NULL if the connection was unsuccessful. For a successful connection, the 
    return value is the same as the value of the first parameter."
    
     

ChangeSet
  1.1810.1545.1 06/04/11 20:41:05 msvensson@neptunus.(none) +1 -0
  Bug#18474 Unlistable directories yield no info from information_schema, part2
   - Improved solution by adding an else stetment so that do find next is avoided if erorr occurs, but we still return zero files found instaed of an error

  mysys/my_lib.c
    1.24 06/04/11 20:41:00 msvensson@neptunus.(none) +50 -47
    Add else statment so that if a directory can't be read because of access denied it will be skipped and zero files returned.
    Use strnmov instead of strmov to avoid writing after end of buffer

ChangeSet
  1.2119.338.6 06/04/11 20:31:02 mats@mysql.com +1 -0
  Added missing prototypes to mysys/my_bitmap.h

  include/my_bitmap.h
    1.22 06/04/11 20:30:58 mats@mysql.com +2 -0
    Added missing prototypes.

ChangeSet
  1.2119.338.5 06/04/11 20:29:34 mats@mysql.com +3 -0
  WL#3206 (Add unit tests):
  More changes according to review comments.

  unittest/unit.pl
    1.3 06/04/11 20:29:29 mats@mysql.com +2 -1
    Added test for version-specific function.

  unittest/mysys/bitmap.t.c
    1.3 06/04/11 20:29:29 mats@mysql.com +8 -13
    Removed unused functions and variables. Marked unused parameters
    as unused. No need to test every size up to 4096 bits, testing to 1024,
    but I think this is too much as well.

  unittest/README.txt
    1.2 06/04/11 20:29:29 mats@mysql.com +14 -11
    Changes to manifest.

ChangeSet
  1.1810.1544.1 06/04/11 10:03:37 igor@rurik.mysql.com +3 -0
  Fixed bug #18618.
  If the second or the third argument of a BETWEEN predicate was
  a constant expression, like '2005.09.01' - INTERVAL 6 MONTH,
  while the other two arguments were fields then the predicate 
  was evaluated incorrectly and the query returned a wrong
  result set.
  The bug was introduced in 5.0.17 when in the fix for 12612.

  sql/item_cmpfunc.cc
    1.187.1.12 06/04/11 10:03:30 igor@rurik.mysql.com +2 -10
    Fixed bug #18618.
    If the second or the third argument of a BETWEEN predicate was
    a constant expression, like '2005.09.01' - INTERVAL 6 MONTH,
    while the other two arguments were fields then the predicate 
    was evaluated incorrectly and the query returned a wrong
    result set.
    The bug was introduced in 5.0.17 when in the fix for 12612.

  mysql-test/t/func_time.test
    1.40 06/04/11 10:03:30 igor@rurik.mysql.com +22 -0
    Added a test case for bug #18618.

  mysql-test/r/func_time.result
    1.47.1.2 06/04/11 10:03:30 igor@rurik.mysql.com +25 -0
    Added a test case for bug #18618.

ChangeSet
  1.2119.379.4 06/04/11 15:38:32 jonas@perch.ndb.mysql.com +1 -0
  fix so that rpl_row_basic_8partition.test is only run when paritioning is enabled

  mysql-test/t/rpl_row_basic_8partition.test
    1.3 06/04/11 15:38:29 jonas@perch.ndb.mysql.com +1 -0
    this test requires partitioning

ChangeSet
  1.2119.397.1 06/04/11 18:16:14 bar@mysql.com +6 -0
  bug#17870 Table names conflict with Windows device names
  
  It was impossible to create some table names on Windows
  (e.g. LPT1, AUX, COM1, etc).
  
  Fixed to pad dangerous names with thee "at" signs
  (e.g. LPT1@@@, AUX@@@, COM1@@@, and so on).

  mysql-test/t/ctype_filename.test
    1.1 06/04/11 18:16:03 bar@mysql.com +21 -0
    New BitKeeper file ``mysql-test/t/ctype_filename.test''

  mysql-test/r/ctype_filename.result
    1.1 06/04/11 18:16:03 bar@mysql.com +13 -0
    New BitKeeper file ``mysql-test/r/ctype_filename.result''

  strings/ctype-utf8.c
    1.103 06/04/11 18:16:03 bar@mysql.com +5 -0
    Treat "@@@" sequence in a table name as a end-of-line.

  sql/sql_table.cc
    1.308.9.4 06/04/11 18:16:03 bar@mysql.com +10 -3
    Check if a dangerous table name and append @@@

  mysys/my_access.c
    1.8 06/04/11 18:16:03 bar@mysql.com +92 -5
    Adding new function check_if_legal_tablename().
    It works almost like check_if_legal_filename(),
    but accepts a table name without extension and path,
    and does not check "CLOCK$".

  mysql-test/t/ctype_filename.test
    1.0 06/04/11 18:16:03 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-5.1-new.b17870v1/mysql-test/t/ctype_filename.test

  mysql-test/r/ctype_filename.result
    1.0 06/04/11 18:16:03 bar@mysql.com +0 -0
    BitKeeper file /usr/home/bar/mysql-5.1-new.b17870v1/mysql-test/r/ctype_filename.result

  include/my_sys.h
    1.187.2.1 06/04/11 18:16:02 bar@mysql.com +1 -0
    Adding new function declaration 

ChangeSet
  1.2119.1.204 06/04/11 15:14:08 msvensson@neptunus.(none) +1 -0
  Add 'mysql_get_ssl_cipher' list of functions to export from libmysqld

  libmysqld/libmysqld.def
    1.16 06/04/11 15:14:02 msvensson@neptunus.(none) +1 -0
    Add 'mysql_get_ssl_cipher' list of functions to export from libmysqld

ChangeSet
  1.2119.394.2 06/04/11 14:09:04 marty@linux.site +1 -0
  Added --p for producing output parsable by LOAD TABLE INFILE

  storage/ndb/tools/listTables.cpp
    1.25 06/04/11 14:08:53 marty@linux.site +24 -7
    Added --p for producing output parsable by LOAD TABLE INFILE

ChangeSet
  1.2119.394.1 06/04/11 14:06:32 marty@linux.site +7 -0
  Fixes for fast alter table for ndbcluster

  sql/unireg.cc
    1.74.1.2 06/04/11 14:06:15 marty@linux.site +1 -1
    Fixes for fast alter table for ndbcluster

  sql/sql_table.cc
    1.308.1.16 06/04/11 14:06:15 marty@linux.site +16 -16
    Fixes for fast alter table for ndbcluster

  sql/handler.h
    1.197.1.4 06/04/11 14:06:15 marty@linux.site +3 -1
    Fixes for fast alter table for ndbcluster

  sql/ha_partition.h
    1.11.1.5 06/04/11 14:06:15 marty@linux.site +2 -1
    Fixes for fast alter table for ndbcluster

  sql/ha_partition.cc
    1.39.4.1 06/04/11 14:06:15 marty@linux.site +3 -1
    Fixes for fast alter table for ndbcluster

  sql/ha_ndbcluster.h
    1.126.1.4 06/04/11 14:06:15 marty@linux.site +2 -1
    Fixes for fast alter table for ndbcluster

  sql/ha_ndbcluster.cc
    1.288.11.1 06/04/11 14:06:14 marty@linux.site +26 -12
    Fixes for fast alter table for ndbcluster

ChangeSet
  1.1810.1543.1 06/04/11 16:13:57 ramil@mysql.com +4 -0
  Fix for bug #14360: Date Between Interval Broken.                               
                                     

  sql/item_timefunc.h
    1.63.1.1 06/04/11 16:13:48 ramil@mysql.com +1 -0
    Fix for bug #14360: Date Between Interval Broken.                               
      - Item_date_add_interval::eq() introduced.                                    

  sql/item_timefunc.cc
    1.100.1.5 06/04/11 16:13:48 ramil@mysql.com +35 -0
    Fix for bug #14360: Date Between Interval Broken.                               
      - Item_date_add_interval::eq() introduced.                                    

  mysql-test/t/innodb.test
    1.118.2.2 06/04/11 16:13:48 ramil@mysql.com +12 -0
    Fix for bug #14360: Date Between Interval Broken.                               
      - test case.                                  

  mysql-test/r/innodb.result
    1.145.1.14 06/04/11 16:13:48 ramil@mysql.com +9 -0
    Fix for bug #14360: Date Between Interval Broken.                               
      - test case.                                  

ChangeSet
  1.2119.1.203 06/04/11 12:38:21 msvensson@neptunus.(none) +1 -0
  Remove the my_seek calls as we have just opened the file for append with O_APPEND and the file pointer should be at end of the file already.

  storage/csv/ha_tina.cc
    1.42 06/04/11 12:38:16 msvensson@neptunus.(none) +0 -11
    Remove the my_seek calls as we have just opened the file for append with O_APPEND and the file pointer should be at end of the file already

ChangeSet
  1.1616.2530.5 06/04/11 15:26:18 ramil@mysql.com +1 -0
  after merge fix.

  mysql-test/t/func_op.test
    1.8 06/04/11 15:25:24 ramil@mysql.com +2 -0
    after merge fix.

ChangeSet
  1.1810.1525.3 06/04/11 12:17:57 pem@mysql.com +3 -0
  Fixed BUG#18787: Server crashed when calling a stored procedure containing
                   a misnamed function
    ... in the presence of a continue handler. The problem was that with a
    handler, it continued to execute as if function existed and had set a
    useful return value (which it hadn't).
    The fix is to set a null return value and do an error return when a function
    wasn't found.

  sql/item_func.cc
    1.270.1.7 06/04/11 12:17:52 pem@mysql.com +9 -3
    Don't set "out of resources" error in Item_func_sp::execute() if no
    result field is returned, it's simply wrong, it can be sometthing else,
    like a function not found. Instead set null_value and return error.
    Also, set "out of resources" when field creation fails in
    Item_func_sp::sp_result_field() and Item_func_sp::tmp_table_field().

  mysql-test/t/sp.test
    1.174.9.1 06/04/11 12:17:52 pem@mysql.com +18 -0
    New testcase for BUG#18787.

  mysql-test/r/sp.result
    1.170.15.1 06/04/11 12:17:52 pem@mysql.com +10 -0
    Updated results for a new test case (BUG#18787).

ChangeSet
  1.2119.382.6 06/04/11 12:15:57 msvensson@shellback. +2 -0
  Remove unused variable

  sql/sql_handler.cc
    1.82 06/04/11 12:15:49 msvensson@shellback. +0 -1
    Remove unused variable

  sql/sql_delete.cc
    1.180 06/04/11 12:15:49 msvensson@shellback. +0 -1
    Remove unused variable

ChangeSet
  1.2119.382.5 06/04/11 12:12:48 msvensson@shellback. +3 -0
  Close share->data_file in before renaming in ha_tina::repair
  Open and seek to end of data_file after rename 
  Fix comment for when file does not need repair.
  Set share->mapped_file to NULL always when it's been unmapped 
  Add test to see that file can be used after repair

  storage/csv/ha_tina.cc
    1.41 06/04/11 12:12:41 msvensson@shellback. +24 -4
    Close share->data_file in before renaming in ha_tina::repair
    Open and seek to end after rename
    Fix comment for when file does not need repair.
    Set share->mapped_file to NULL always when it's been unmapped 

  mysql-test/t/csv.test
    1.12 06/04/11 12:12:41 msvensson@shellback. +22 -1
    Add more test to see that the table can be used after repair

  mysql-test/r/csv.result
    1.9 06/04/11 12:12:40 msvensson@shellback. +30 -0
    Add more test to see that the table can be used after repair

ChangeSet
  1.1616.2537.1 06/04/11 15:01:21 holyfoot@deer.(none) +3 -0
  bug #15442 (mysqltest.test doesn't work with the embedded server)

  mysql-test/t/mysqltest.test
    1.3.1.16 06/04/11 15:00:37 holyfoot@mysql.com +1 -0
    this test shouldn't work with the embedded server

  mysql-test/mysql-test-run.sh
    1.208.1.57 06/04/11 15:00:37 holyfoot@mysql.com +1 -0
    no ndbcluster needed here

  mysql-test/mysql-test-run.pl
    1.8.9.4 06/04/11 15:00:37 holyfoot@mysql.com +1 -0
    no ndbcluster needed here

ChangeSet
  1.2119.392.1 06/04/11 13:25:02 bar@mysql.com +4 -0
  Bug#16233: XML: ExtractValue() fails with special characters
  
  ExtractValue didn't understand tag and attribute names
  consisting of "tricky" national letters (e.g. latin accenter letters).
  It happened because XPath lex parser recognized only basic
  latin letter a..z ad a part of an identifier.
  
  Fixed to recognize all letters by means of new "full ctype" which
  was added recently.

  strings/ctype-simple.c
    1.79 06/04/11 13:24:50 bar@mysql.com +1 -1
    A bug fix: ctype is array of 257 elements,
        adding offset to address correct element.

  sql/item_xmlfunc.cc
    1.12.1.1 06/04/11 13:24:50 bar@mysql.com +26 -38
    Using recently implemented "true" ctype functionality
        to treat all national letters as valid tag names,
        Only basic latin letters worked so far.

  mysql-test/t/xml.test
    1.10.2.1 06/04/11 13:24:50 bar@mysql.com +20 -0
    Adding test case

  mysql-test/r/xml.result
    1.10.2.1 06/04/11 13:24:50 bar@mysql.com +23 -0
    Adding test case

ChangeSet
  1.2119.391.1 06/04/11 10:15:08 tomas@poseidon.ndb.mysql.com +3 -0
  enabling all failing ndb tests to get current status in pushbuild

  mysql-test/t/ndb_binlog_ddl_multi.test
    1.11 06/04/11 10:15:02 tomas@poseidon.ndb.mysql.com +6 -1
    enabling all failing ndb tests to get current status in pushbuild

  mysql-test/t/disabled.def
    1.123.1.1 06/04/11 10:15:02 tomas@poseidon.ndb.mysql.com +19 -28
    enabling all failing ndb tests to get current status in pushbuild

  mysql-test/r/ndb_binlog_ddl_multi.result
    1.11 06/04/11 10:15:02 tomas@poseidon.ndb.mysql.com +35 -0
    enabling all failing ndb tests to get current status in pushbuild

ChangeSet
  1.2119.1.200 06/04/11 10:03:04 msvensson@neptunus.(none) +1 -0
  Remove extra ","

  sql/field.cc
    1.308.1.2 06/04/11 10:02:56 msvensson@neptunus.(none) +1 -1
    Remove extra ","

ChangeSet
  1.1810.1457.61 06/04/11 09:46:03 msvensson@neptunus.(none) +1 -0
  Add surrounding braces, move invalidate dictionary_cace to after declaration of variable "table_list"

  sql/ha_ndbcluster.cc
    1.175.1.68 06/04/11 09:45:45 msvensson@neptunus.(none) +4 -2
    Add surrounding braces, move invalidate dictionary_cace to after declaration of variable "table_list"

ChangeSet
  1.2119.374.2 06/04/10 22:29:11 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -0
  BUG#18752: Also handle NULL values in VALUES LESS THAN

  sql/sql_yacc.yy
    1.464.13.1 06/04/10 22:29:05 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -0
    Added error check for null value

  sql/share/errmsg.txt
    1.90.2.1 06/04/10 22:29:05 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
    Added new error message

  mysql-test/t/partition.test
    1.34.1.1 06/04/10 22:29:05 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -0
    Added test case to verify that VALUES LESS THAN (NULL) isn't allowed

  mysql-test/r/partition.result
    1.32.1.1 06/04/10 22:29:05 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -0
    Added test case to verify that VALUES LESS THAN (NULL) isn't allowed

ChangeSet
  1.2119.388.1 06/04/11 00:17:06 kent@mysql.com +1 -0
  mysql_upgrade.c:
    No declarations after first expression in block

ChangeSet
  1.2119.387.2 06/04/10 16:41:09 brian@zim.(none) +43 -0
  Drop a number of OS2 specific files. 

  mysys/Makefile.am
    1.74.1.1 06/04/10 16:41:03 brian@zim.(none) +1 -4
    Removed OS2 specific files. 

  include/my_global.h
    1.125 06/04/10 16:41:03 brian@zim.(none) +0 -9
    Removed OS2 specific files.

  include/Makefile.am
    1.64 06/04/10 16:41:03 brian@zim.(none) +1 -1
    Removed os2 specific config file.

  configure.in
    1.333.1.26 06/04/10 16:41:03 brian@zim.(none) +0 -1
    Removed OS2 specific os2 files.

  Makefile.am
    1.84.1.1 06/04/10 16:41:03 brian@zim.(none) +1 -1
    Removed os2 reference

  client/mysql_upgrade.c
    1.3 06/04/11 00:11:37 kent@mysql.com +3 -3
    No declarations after first expression in block

ChangeSet
  1.1810.1540.2 06/04/10 14:14:20 igor@rurik.mysql.com +2 -0
  Made the test case for bug #15917 independent on platforms.

  mysql-test/t/having.test
    1.20 06/04/10 14:14:13 igor@rurik.mysql.com +2 -0
    Made the test case for bug #15917 independent on platforms.

  mysql-test/r/having.result
    1.23 06/04/10 14:14:13 igor@rurik.mysql.com +0 -2
    Made the test case for bug #15917 independent on platforms.

ChangeSet
  1.2119.377.5 06/04/10 16:06:17 reggie@big_geek. +1 -0
  fix cmake generation error

  libmysqld/cmakelists.txt
    1.2 06/04/10 16:06:09 reggie@big_geek. +8 -2
    added generated flag to sql_yacc.cc and sql_yacc.h

  BitKeeper/deleted/.del-my_os2tls.c~58ade7a0f70ad5ea
    1.4 06/04/10 13:42:27 brian@zim.(none) +0 -0
    Delete: mysys/my_os2tls.c

  BitKeeper/deleted/.del-my_os2thread.c~65dca991548cec2a
    1.6 06/04/10 13:42:27 brian@zim.(none) +0 -0
    Delete: mysys/my_os2thread.c

  BitKeeper/deleted/.del-my_os2mutex.c~79f7438bfde5132a
    1.4 06/04/10 13:42:26 brian@zim.(none) +0 -0
    Delete: mysys/my_os2mutex.c

  BitKeeper/deleted/.del-my_os2file64.c~251fb8a1e950c31b
    1.6 06/04/10 13:42:26 brian@zim.(none) +0 -0
    Delete: mysys/my_os2file64.c

  BitKeeper/deleted/.del-my_os2dlfcn.h0~eae8edb8555eff87
    1.2 06/04/10 13:42:26 brian@zim.(none) +0 -0
    Delete: mysys/my_os2dlfcn.h0

  BitKeeper/deleted/.del-my_os2dlfcn.c~6d94b488717683dd
    1.3 06/04/10 13:42:25 brian@zim.(none) +0 -0
    Delete: mysys/my_os2dlfcn.c

  BitKeeper/deleted/.del-my_os2dirsrch.h~5011cbc657537d0
    1.4 06/04/10 13:42:25 brian@zim.(none) +0 -0
    Delete: mysys/my_os2dirsrch.h

  BitKeeper/deleted/.del-my_os2dirsrch.c~4e2479b2abb2eb5a
    1.4 06/04/10 13:42:24 brian@zim.(none) +0 -0
    Delete: mysys/my_os2dirsrch.c

  BitKeeper/deleted/.del-my_os2cond.c~e3b520af1c371bb5
    1.6 06/04/10 13:42:24 brian@zim.(none) +0 -0
    Delete: mysys/my_os2cond.c

  BitKeeper/deleted/.del-config-os2.h~a16b51851ddd317b
    1.6 06/04/10 13:39:34 brian@zim.(none) +0 -0
    Delete: include/config-os2.h

  BitKeeper/deleted/.del-file.h~90a5c4f6c7dfb5a
    1.2 06/04/10 12:42:36 brian@zim.(none) +0 -0
    Delete: os2/include/sys/file.h

  BitKeeper/deleted/.del-Makefile.am~ead19441cc5ff35c
    1.2 06/04/10 12:42:36 brian@zim.(none) +0 -0
    Delete: os2/include/sys/Makefile.am

  BitKeeper/deleted/.del-termio.h~b136a899c396cb69
    1.2 06/04/10 12:41:56 brian@zim.(none) +0 -0
    Delete: os2/include/termio.h

  BitKeeper/deleted/.del-sgtty.h~4321c310847cb55c
    1.2 06/04/10 12:41:56 brian@zim.(none) +0 -0
    Delete: os2/include/sgtty.h

  BitKeeper/deleted/.del-pwd.h~b26f27954da3a1be
    1.2 06/04/10 12:41:55 brian@zim.(none) +0 -0
    Delete: os2/include/pwd.h

  BitKeeper/deleted/.del-Makefile.am~f87185e232d7c4f
    1.2 06/04/10 12:41:55 brian@zim.(none) +0 -0
    Delete: os2/include/Makefile.am

  BitKeeper/deleted/.del-config.h~1e58e9b6b3735392
    1.2 06/04/10 12:41:54 brian@zim.(none) +0 -0
    Delete: os2/include/config.h

  BitKeeper/deleted/.del-rint.s~82358ca146718a12
    1.2 06/04/10 12:41:42 brian@zim.(none) +0 -0
    Delete: os2/rint.s

  BitKeeper/deleted/.del-rint.obj~e6bbb137ffb2f3d1
    1.3 06/04/10 12:41:42 brian@zim.(none) +0 -0
    Delete: os2/rint.obj

  BitKeeper/deleted/.del-rint.cmd~49a7df1e6a4214af
    1.2 06/04/10 12:41:41 brian@zim.(none) +0 -0
    Delete: os2/rint.cmd

  BitKeeper/deleted/.del-ReadMe.txt~573b1e4ebab241e1
    1.3 06/04/10 12:41:41 brian@zim.(none) +0 -0
    Delete: os2/ReadMe.txt

  BitKeeper/deleted/.del-mysql.wis~95ebdebeb470c823
    1.2 06/04/10 12:41:40 brian@zim.(none) +0 -0
    Delete: os2/mysql.wis

  BitKeeper/deleted/.del-MySQL-Util.irs~cc5eb078dbc0605c
    1.3 06/04/10 12:41:40 brian@zim.(none) +0 -0
    Delete: os2/MySQL-Util.irs

  BitKeeper/deleted/.del-MySQL-Util.icc~e6288097ceb9cbd2
    1.5 06/04/10 12:41:39 brian@zim.(none) +0 -0
    Delete: os2/MySQL-Util.icc

  BitKeeper/deleted/.del-MySQL-Sql.irs~266e93e2c9003567
    1.2 06/04/10 12:41:39 brian@zim.(none) +0 -0
    Delete: os2/MySQL-Sql.irs

  BitKeeper/deleted/.del-MySQL-Sql.icc~2ec2a87f4a096d31
    1.5 06/04/10 12:41:39 brian@zim.(none) +0 -0
    Delete: os2/MySQL-Sql.icc

  BitKeeper/deleted/.del-MySQL-Source.icc~edded3c3a5cf83b1
    1.6 06/04/10 12:41:38 brian@zim.(none) +0 -0
    Delete: os2/MySQL-Source.icc

  BitKeeper/deleted/.del-MySQL-Opt.icc~b9517e18e6cf6c05
    1.4 06/04/10 12:41:38 brian@zim.(none) +0 -0
    Delete: os2/MySQL-Opt.icc

  BitKeeper/deleted/.del-mysqlalt.wis~409d76f4dfd1e4c4
    1.2 06/04/10 12:41:37 brian@zim.(none) +0 -0
    Delete: os2/mysqlalt.wis

  BitKeeper/deleted/.del-mysql-inf.wis~fce577336b6bb0e
    1.2 06/04/10 12:41:37 brian@zim.(none) +0 -0
    Delete: os2/mysql-inf.wis

  BitKeeper/deleted/.del-MySQL-Client.icc~1d41cb9ed34c28ce
    1.4 06/04/10 12:41:37 brian@zim.(none) +0 -0
    Delete: os2/MySQL-Client.icc

  BitKeeper/deleted/.del-build-all.cmd~68479264bb9abe
    1.3 06/04/10 12:41:36 brian@zim.(none) +0 -0
    Delete: os2/build-all.cmd

  BitKeeper/deleted/.del-Makefile.am~e5b911533dad2713
    1.3 06/04/10 12:41:36 brian@zim.(none) +0 -0
    Delete: os2/Makefile.am

  BitKeeper/deleted/.del-ChangeLog.os2~c473e6f17539eb4
    1.5 06/04/10 12:41:36 brian@zim.(none) +0 -0
    Delete: os2/ChangeLog.os2

  BitKeeper/deleted/.del-BldLevel.rc~fdab305a1b550012
    1.3 06/04/10 12:41:35 brian@zim.(none) +0 -0
    Delete: os2/BldLevel.rc

  BitKeeper/deleted/.del-BldLevel.RES~6701a23a4d0b0f33
    1.2 06/04/10 12:41:35 brian@zim.(none) +0 -0
    Delete: os2/BldLevel.RES

  BitKeeper/deleted/.del-BldLevelInf.cmd~49e29c82b3527c4a
    1.2 06/04/10 12:41:34 brian@zim.(none) +0 -0
    Delete: os2/BldLevelInf.cmd

  BitKeeper/deleted/.del-BldLevel.cmd~d1a41ef0712190e1
    1.3 06/04/10 12:41:34 brian@zim.(none) +0 -0
    Delete: os2/BldLevel.cmd

ChangeSet
  1.1346.872.2 06/04/10 21:57:29 bell@sanja.is.com.ua +1 -0
  Avoid trying to include <asm/atomic.h> when it doesn't work in C++
  code. (Bug #13621)

  configure.in
    1.191.1.143 06/04/10 21:57:28 bell@sanja.is.com.ua +5 -0
    Test whether atomic_add() and atomic_sub() are available in C++
    code, since that is primarily where we will be using them.

ChangeSet
  1.1810.1536.2 06/04/10 22:44:01 aivanov@mysql.com +1 -0
  Fixed test case result (after BUG#15868 fix).

  mysql-test/r/innodb.result
    1.145.1.13 06/04/10 22:43:56 aivanov@mysql.com +1 -1
    Fixed test case result (after BUG#15868 fix).

ChangeSet
  1.2119.382.4 06/04/10 20:04:36 msvensson@shellback. +1 -0
  Make line endings consistent, use Unix format

  libmysql/mytest.c
    1.6 06/04/10 20:04:24 msvensson@shellback. +147 -0
    Make line endings consistent, use Unix format

ChangeSet
  1.2119.384.1 06/04/10 13:48:58 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +7 -0
  BUG#18750: Various problems with partition names, quotation marks

  sql/sql_yacc.yy
    1.464.1.24 06/04/10 13:48:53 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Partition names should identifers and not ident_or_text

  sql/sql_show.cc
    1.326 06/04/10 13:48:53 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -0
    require_quotes had a bug with identifiers that consisted of only digits,
    these are allowed identifiers but must be quoted and require_quote didn't
    tell this.

  sql/sql_partition.cc
    1.55.1.10 06/04/10 13:48:52 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +17 -2
    New method to add partition name strings, ignore OPTION_SHOW_QUOTE_CREATE
     

  sql/share/errmsg.txt
    1.90.1.1 06/04/10 13:48:52 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
    Added error code for wrong partition names

  sql/partition_info.cc
    1.9 06/04/10 13:48:52 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +12 -0
    Check partition names that they don't have trailing spaces

  mysql-test/t/partition.test
    1.33.2.1 06/04/10 13:48:52 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +24 -0
    Added new test cases

  mysql-test/r/partition.result
    1.31.2.1 06/04/10 13:48:51 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +17 -0
    Added new test cases

ChangeSet
  1.2119.383.1 06/04/10 13:07:50 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  BUG*#17946: New test case for already fixed bug (Problem with LIKE searches for partitioned tables)
  Added new test case for bug 17946

  mysql-test/t/partition_pruning.test
    1.12 06/04/10 13:07:40 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +12 -0
    Added new test case for bug 17946

  mysql-test/r/partition_pruning.result
    1.13 06/04/10 13:07:40 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +11 -0
    Added new test case for bug 17946

ChangeSet
  1.2119.382.3 06/04/10 18:44:55 msvensson@shellback. +1 -0
  Update readme file with instructions for VCExpress and Platform SDK

  win/README
    1.4 06/04/10 18:44:48 msvensson@shellback. +5 -0
    Update readme file with instructions for VCExpress and Platform SDK

ChangeSet
  1.2119.382.2 06/04/10 18:34:18 msvensson@shellback. +4 -0
  Remove unused variables and label

  sql/ha_partition.cc
    1.39.3.1 06/04/10 18:34:09 msvensson@shellback. +1 -3
    Remove unused variable(s) and an unused label

  server-tools/instance-manager/mysql_connection.cc
    1.15 06/04/10 18:34:08 msvensson@shellback. +1 -1
    Add cast to avoid warning

  server-tools/instance-manager/guardian.cc
    1.21 06/04/10 18:34:08 msvensson@shellback. +0 -2
    Remove unused variable

  libmysqld/lib_sql.cc
    1.114 06/04/10 18:34:07 msvensson@shellback. +0 -2
    Remove unused variable and unused label

ChangeSet
  1.2119.382.1 06/04/10 18:18:29 msvensson@shellback. +1 -0
  Add CSV storage engine to cmake files

  cmakelists.txt
    1.16 06/04/10 18:16:27 msvensson@shellback. +9 -0
    Add CSV storage engine to cmake files

ChangeSet
  1.2119.359.5 06/04/10 18:08:54 msvensson@neptunus.(none) +2 -0
  Step 1 in removing mysql-test-run.sh from 5.1 and up

  mysql-test/mysql-test-run.sh
    1.311.1.1 06/04/10 18:08:50 msvensson@neptunus.(none) +12 -0
    Add nag message to mysql-test-run.sh taht indicates it will soon be removed.

  Makefile.am
    1.85 06/04/10 18:08:50 msvensson@neptunus.(none) +11 -28
    Change make test, make test-full, make test-force and make test-force-full to use mysql-test-run.pl

ChangeSet
  1.2119.378.2 06/04/10 19:54:51 holyfoot@deer.(none) +1 -0
  WL#2645 (mysql_upgrade tool)

ChangeSet
  1.2119.380.1 06/04/10 17:17:45 lars@mysql.com +1 -0
  Updated disable.def file with BUG numbers, time of disable and disabler

ChangeSet
  1.2119.377.2 06/04/10 20:35:12 gluh@eagle.intranet.mysql.r18.ru +3 -0
  Fix for bug#18753 Partitions: auto_increment fails
  Current auto increment value is placed in partition in which latest
  record was saved. So to get auto_increment they have to scan
  all partitions and return max value.

ChangeSet
  1.1810.1536.1 06/04/10 19:47:41 aivanov@mysql.com +1 -0
  Fixed BUG#15868: InnoDB hangs under 200 threads making INSERTs: 'thread thrashing'.
   Applied changes due Heikki Tuuri.

  sql/mysqld.cc
    1.439.49.1 06/04/10 19:47:36 aivanov@mysql.com +1 -1
    Set innodb_thread_concurrency default value to 8 (Bug#15868).
     Changes due to Heikki Tuuri.

  sql/ha_partition.cc
    1.39.1.4 06/04/10 20:35:05 gluh@mysql.com +8 -6
    Fix for bug#18753 Partitions: auto_increment fails
    Current auto increment value is placed in partition in which latest
    record was saved. So to get auto_increment they have to scan
    all partitions and return max value.

  mysql-test/t/partition.test
    1.33.1.1 06/04/10 20:35:05 gluh@mysql.com +15 -0
    Fix for bug#18753 Partitions: auto_increment fails
    test case

  mysql-test/r/partition.result
    1.31.1.1 06/04/10 20:35:05 gluh@mysql.com +17 -0
    Fix for bug#18753 Partitions: auto_increment fails
    test case

  mysql-test/t/disabled.def
    1.124 06/04/10 17:17:35 lars@mysql.com +43 -42
    Updated disable.def file with BUG numbers, time of disable and disabler

ChangeSet
  1.2119.347.9 06/04/10 17:06:33 jonas@perch.ndb.mysql.com +8 -0
  ndb -
    fix all valgrind warnings in t/ndb_dd (except replication related)

  storage/ndb/src/ndbapi/ndberror.c
    1.58 06/04/10 17:06:30 jonas@perch.ndb.mysql.com +1 -0
    Fix valgrind warning

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.122 06/04/10 17:06:30 jonas@perch.ndb.mysql.com +7 -3
    Fix valgrind warning

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
    1.31 06/04/10 17:06:30 jonas@perch.ndb.mysql.com +1 -0
    Fix valgrind warning

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.85 06/04/10 17:06:29 jonas@perch.ndb.mysql.com +17 -1
    Fix valgrind warning

  storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
    1.16 06/04/10 17:06:29 jonas@perch.ndb.mysql.com +2 -2
    Fix valgrind warning

  storage/ndb/include/kernel/signaldata/DropFilegroup.hpp
    1.2 06/04/10 17:06:29 jonas@perch.ndb.mysql.com +5 -3
    Fix valgrind warning

  storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
    1.28 06/04/10 17:06:29 jonas@perch.ndb.mysql.com +5 -4
    Fix valgrind warning

  sql/ha_ndbcluster.cc
    1.288.9.1 06/04/10 17:06:29 jonas@perch.ndb.mysql.com +5 -4
    Fix memleak

ChangeSet
  1.2119.338.4 06/04/10 17:06:12 mats@mysql.com +7 -0
  WL#3206 (Adding unit tests):
  Added 'test' target to build and run tests. Added documentation.
  Added README.txt files. Fixing problem with initialization of
  the Test::Harness::Straps replacement. Added code to filter out non-
  test directories.

  unittest/README.txt
    1.1 06/04/10 17:06:06 mats@mysql.com +33 -0
    New BitKeeper file ``unittest/README.txt''

  unittest/README.txt
    1.0 06/04/10 17:06:06 mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3206-mysql-5.1-new/unittest/README.txt

  unittest/unit.pl
    1.2 06/04/10 17:06:05 mats@mysql.com +39 -8
    Initializing replacement Test::Harness::Straps properly.
    Adding code to filter non-test directories from default directories
    to use.

  unittest/mytap/tap.h
    1.3 06/04/10 17:06:05 mats@mysql.com +28 -8
    Adding copyright. Adding documentation.

  unittest/mytap/tap.c
    1.3 06/04/10 17:06:05 mats@mysql.com +137 -10
    Adding copyright. Adding documentation. Minor code changes.

  unittest/examples/skip_all.t.c
    1.2 06/04/10 17:06:05 mats@mysql.com +1 -1
    Changing text for skip reason.

  unittest/examples/skip.t.c
    1.2 06/04/10 17:06:05 mats@mysql.com +1 -1
    Changing text for skip reason.

  unittest/Makefile.am
    1.3 06/04/10 17:06:05 mats@mysql.com +6 -4
    Adding 'test' target to build and run tests.

  client/mysql_upgrade.c
    1.2 06/04/10 19:54:44 holyfoot@mysql.com +269 -77
    code fixed after the discussion

ChangeSet
  1.2119.375.1 06/04/10 10:44:47 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  BUG#18423: Added test case for this bug that was already fixed (was issue with hash partitions not showing all rows in BETWEEN range
  Added test case for bug 18423

  mysql-test/t/partition_hash.test
    1.4 06/04/10 10:44:42 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +19 -0
    Added test case for bug 18423

  mysql-test/r/partition_hash.result
    1.4 06/04/10 10:44:41 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +26 -0
    Added test case for bug 18423

ChangeSet
  1.2119.374.1 06/04/10 10:18:57 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  BUG#18752: Added test case for SHOW CREATE TABLE not showing NULL values properly in bug already fixed
  Added new test case for bug 18752 (bug already fixed by previous patch)

  mysql-test/t/partition.test
    1.34 06/04/10 10:18:44 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +9 -0
    Added new test case for bug 18752 (bug already fixed by previous patch)

  mysql-test/r/partition.result
    1.32 06/04/10 10:18:44 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +9 -0
    Added new test case for bug 18752 (bug already fixed by previous patch)

ChangeSet
  1.2119.333.7 06/04/10 16:08:40 tomas@poseidon.ndb.mysql.com +3 -0
  Bug #18932: Cluster binlog mysqld accepts updating although binlog not setup

  sql/ha_ndbcluster_binlog.h
    1.11 06/04/10 16:08:34 tomas@poseidon.ndb.mysql.com +4 -2
    Bug #18932: Cluster binlog mysqld accepts updating although binlog not setup

  sql/ha_ndbcluster_binlog.cc
    1.41.1.1 06/04/10 16:08:34 tomas@poseidon.ndb.mysql.com +103 -29
    Bug #18932: Cluster binlog mysqld accepts updating although binlog not setup
    - put ndb tables in read only until binlog is setup properly

  sql/ha_ndbcluster.cc
    1.288.5.6 06/04/10 16:08:33 tomas@poseidon.ndb.mysql.com +73 -20
    Bug #18932: Cluster binlog mysqld accepts updating although binlog not setup
    - put ndb tables in read only until binlog is setup properly

ChangeSet
  1.2119.333.6 06/04/10 16:06:28 tomas@poseidon.ndb.mysql.com +1 -0
  perform sync slave with master in rpl_ndb_blob2 to ensure that tables get properly dropped on slave...
  - has been causing failed later tests e.g. rpl_ndb_trig004

  mysql-test/extra/rpl_tests/rpl_row_blob.test
    1.6 06/04/10 16:06:22 tomas@poseidon.ndb.mysql.com +6 -0
    perform sync slave with master in rpl_ndb_blob2 to ensure that tables get properly dropped on slave...
    - has been causing failed later tests e.g. rpl_ndb_trig004

ChangeSet
  1.2119.1.188 06/04/10 10:00:08 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  BUG#15561: Possible to strange things with partitions defined although no partition support compiled in
  Added an #ifdef to ensure we get syntax error when using partitioned synytax and no partition support is compiled in.

  sql/lex.h
    1.158 06/04/10 09:59:54 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
    Added an #ifdef to ensure we get syntax error when using partitioned synytax and no partition support is compiled in.

ChangeSet
  1.1810.1535.1 06/04/10 15:11:37 msvensson@shellback.(none) +3 -0
  Bug#15069 [patch] my_print_defaults does'nt care --sysconfdir
   - Grab the path from "configure --sysconfdir=<path>" and set it as
     the first place to look for my.cnf files
     Do this both in Makefiles for libmysql and mysys
   - Patch provided by Francesco Riosa. Thank you!

  mysys/default.c
    1.72.1.9 06/04/10 15:11:32 msvensson@shellback.(none) +9 -1
    Use DEFAULT_SYSCONFDIR as first place to look for my.cnf file if "--sysconfdir=<path>" been specified as argument to configure

  mysys/Makefile.am
    1.62.1.6 06/04/10 15:11:32 msvensson@shellback.(none) +1 -0
    Grab the path from "--sysconfdir=<path>" into the defined variable DEFAULT_SYSYCONFDIR 

  libmysql/Makefile.shared
    1.66.1.1 06/04/10 15:11:32 msvensson@shellback.(none) +1 -0
    Grab the path from "--sysconfdir=<path>" into the defined variable DEFAULT_SYSYCONFDIR 

ChangeSet
  1.2119.347.8 06/04/10 14:14:28 jonas@perch.ndb.mysql.com +1 -0
  ndb -
    still some valgrind varnings

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.121 06/04/10 14:14:25 jonas@perch.ndb.mysql.com +24 -2
    still some valgrind varnings

ChangeSet
  1.2119.347.6 06/04/10 14:02:13 jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#17607
    5.0->5.1 merge

  storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
    1.19 06/04/10 14:02:10 jonas@perch.ndb.mysql.com +3 -4
    merge

ChangeSet
  1.1810.1522.5 06/04/10 13:51:43 jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#17607
    4.1->5.0 merge

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.15.20.1 06/04/10 13:51:40 jonas@perch.ndb.mysql.com +3 -4
    post merge fix

ChangeSet
  1.1616.2536.1 06/04/10 13:45:33 jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#17607
    fix correct frag count in Backup block

  ndb/src/kernel/blocks/backup/BackupInit.cpp
    1.8.1.4 06/04/10 13:45:31 jonas@perch.ndb.mysql.com +4 -5
    Fix correct no of fragment records

ChangeSet
  1.1346.873.1 06/04/10 13:38:56 ingo@mysql.com +1 -0
  Bug#10405 - myisamchk damages auto_increment columns when changing character set
  
  Whenever 'myisamchk' needed to recreate a table,
  the auto increment information was lost.
  
  Now the forgotten element of the table creation
  information is set correctly.

  myisam/mi_check.c
    1.86.1.50 06/04/10 13:38:54 ingo@mysql.com +17 -9
    Bug#10405 - myisamchk damages auto_increment columns when changing character set
    Added some DBUG statements.
    Enabled 'with_auto_increment' in 'create_info'
    when recreating a table.

ChangeSet
  1.2119.359.3 06/04/10 12:23:20 msvensson@neptunus.(none) +3 -0
  Update implementation of new function 'mysql_get_ssl_cipher' after review

  sql-common/client.c
    1.93 06/04/10 12:23:16 msvensson@neptunus.(none) +1 -1
    Add missing return(DBUG_RETURN)

  libmysql/libmysql.def
    1.44 06/04/10 12:23:16 msvensson@neptunus.(none) +1 -0
    Add new function mysql_get_ssl_cipher to exported functions in dll

  client/mysql.cc
    1.198.1.2 06/04/10 12:23:16 msvensson@neptunus.(none) +2 -2
    Only call mysql_get_ssl_cipher once, save the result in variable "status"

ChangeSet
  1.1810.1517.14 06/04/10 09:31:46 knielsen@mysql.com +1 -0
  Fix test case 'cast' on Windows, different floating point output format.

  mysql-test/t/cast.test
    1.31 06/04/10 09:31:27 knielsen@mysql.com +2 -0
    Fix test case 'cast' on Windows, different floating point output format.

ChangeSet
  1.2119.371.1 06/04/09 19:43:36 brian@zim.(none) +1 -0
  Disabling test, added bug #18928

  mysql-test/t/disabled.def
    1.123 06/04/09 19:43:30 brian@zim.(none) +1 -0
    Adding disabled test for bug

ChangeSet
  1.2119.1.184 06/04/09 11:57:25 brian@zim.(none) +1 -0
  Disabled two broken test, created P1 showstoppers from them.

  mysql-test/t/disabled.def
    1.122 06/04/09 11:57:20 brian@zim.(none) +2 -0
    Updating for broken tests

ChangeSet
  1.1810.1517.12 06/04/09 13:27:53 aelkin@mysql.com +2 -0
  BUG#18906 Test case rpl_temporary fails when using --vardir option
  env variable name is fixed.
  
  

  mysql-test/r/rpl_temporary.result
    1.18.1.3 06/04/09 13:27:48 aelkin@mysql.com +1 -0
    results

  mysql-test/include/get_binlog_dump_thread_id.inc
    1.3 06/04/09 13:27:48 aelkin@mysql.com +1 -3
    Fixing to right env $var name.

ChangeSet
  1.1616.2535.1 06/04/08 22:27:43 knielsen@mysql.com +1 -0
  $MYSQL_TEST was broken with --valgrind.

  mysql-test/mysql-test-run.pl
    1.8.9.3 06/04/08 22:27:27 knielsen@mysql.com +11 -5
    $MYSQL_TEST was broken with --valgrind.

ChangeSet
  1.1346.872.1 06/04/08 23:19:52 bell@sanja.is.com.ua +1 -0
  Check tinfo library presence and use it. (BUG#18912)

  acinclude.m4
    1.77.1.25 06/04/08 23:19:51 bell@sanja.is.com.ua +4 -1
    Check tinfo library presence and use it.

ChangeSet
  1.1810.1532.1 06/04/08 11:42:09 igor@rurik.mysql.com +3 -0
  Fixed bug #16069.
  The function agg_cmp_type in item_cmpfunc.cc neglected the fact that 
  the first argument in a BETWEEN/IN predicate could be a field of a view.
  As a result in the case when the retrieved table was hidden by a view 
  over it and the arguments in the BETWEEN/IN predicates are of 
  the date/time type the function did not perform conversion of 
  the constant arguments to the same format as the first field argument.
  If formats of the arguments differed it caused wrong a evaluation of
  the predicates.

  sql/item_cmpfunc.cc
    1.187.1.11 06/04/08 11:42:00 igor@rurik.mysql.com +2 -2
    Fixed bug #16069.
    The function agg_cmp_type in item_cmpfunc.cc neglected the fact that 
    the first argument in a BETWEEN/IN predicate could be a field of a view.
    As a result in the case when the retrieved table was hidden by a view 
    over it and the arguments in the BETWEEN/IN predicates are of 
    the date/time type the function did not perform conversion of 
    the constant arguments to the same format as the first field argument.
    If formats of the arguments differed it caused wrong a evaluation of
    the predicates. 

  mysql-test/t/view.test
    1.126.1.14 06/04/08 11:42:00 igor@rurik.mysql.com +20 -0
    Added a test case for bug #16069.

  mysql-test/r/view.result
    1.138.1.13 06/04/08 11:42:00 igor@rurik.mysql.com +21 -0
    Added a test case for bug #16069.

ChangeSet
  1.1810.1517.10 06/04/08 16:29:11 aelkin@mysql.com +2 -0
  #18906: bushbuild reports rpl_temporary fails on solaris, AIX, QNX
  Removing the problematic line from include test file.

  mysql-test/r/rpl_temporary.result
    1.18.1.2 06/04/08 16:29:07 aelkin@mysql.com +0 -1
    results

  mysql-test/include/get_binlog_dump_thread_id.inc
    1.2 06/04/08 16:29:07 aelkin@mysql.com +3 -1
    replacing replace_result by disable_query_log

ChangeSet
  1.2119.364.1 06/04/07 22:36:04 serg@serg.mylan +2 -0
  plugin/fulltext/configure.in
      no sense in building static library version of a plugin
  plugin/fulltext/plugin_example.c
      comments clarified. everything local to a plugin was declared static

  plugin/fulltext/plugin_example.c
    1.8 06/04/07 22:35:48 serg@serg.mylan +6 -5
    comments clarified. everything local to a plugin was declared static.

  plugin/fulltext/configure.in
    1.2 06/04/07 22:35:48 serg@serg.mylan +1 -0
    no sense in building static library version of a plugin

ChangeSet
  1.1810.1531.1 06/04/07 23:58:17 aivanov@mysql.com +3 -0
  Fixed BUG#15758: "Holding adaptive search latch in
   innobase_query_caching_of_table_permitted()".
   Applied the patch due to Heikki Tuuri.
   Also removed superfluous #ifdefs.

  sql/sql_cursor.cc
    1.4.1.2 06/04/07 23:58:12 aivanov@mysql.com +1 -2
    Removing superfluous #ifdefs (suggested by Sanja, also discussed with Serg).

  sql/sql_class.cc
    1.223.1.6 06/04/07 23:58:12 aivanov@mysql.com +0 -4
    Removing superfluous #ifdefs (suggested by Sanja, also discussed with Serg).

  sql/sql_cache.cc
    1.76.1.15 06/04/07 23:58:12 aivanov@mysql.com +5 -0
    Applied the patch due to Heikki Tuuri.
     Query_cache::store_query(): Make InnoDB to release the adaptive
     hash index latch before MySQL acquires the query cache mutex.

ChangeSet
  1.1616.2534.1 06/04/07 23:37:06 konstantin@mysql.com +9 -0
  A fix and a test case for Bug#16365 "Prepared Statements: DoS with 
  too many open statements". The patch adds a new global variable
  @@max_prepared_stmt_count. This variable limits the total number
  of prepared statements in the server. The default value of
  @@max_prepared_stmt_count is 16382. 16382 small statements
  (a select against 3 tables with GROUP, ORDER and LIMIT) consume 
  100MB of RAM. Once this limit has been reached, the server will 
  refuse to prepare a new statement and return ER_UNKNOWN_ERROR 
  (unfortunately, we can't add new errors to 4.1 without breaking 5.0). The limit is changeable after startup
  and can accept any value from 0 to 1 million. In case
  the new value of the limit is less than the current
  statement count, no new statements can be added, while the old
  still can be used. Additionally, the current count of prepared 
  statements is now available through a global read-only variable 
  @@prepared_stmt_count.

  sql/sql_prepare.cc
    1.34.36.1 06/04/07 23:36:57 konstantin@mysql.com +5 -3
    Statement_map::insert will now send a message in case of an
    error.

  sql/sql_class.h
    1.146.55.1 06/04/07 23:36:57 konstantin@mysql.com +5 -23
    Add accounting of the total number of prepared statements in the
    server to the methods of Statement_map.

  sql/sql_class.cc
    1.105.1.100 06/04/07 23:36:57 konstantin@mysql.com +110 -9
    Add accounting of the total number of prepared statements in the
    server to the methods of Statement_map.

  sql/set_var.h
    1.54.1.6 06/04/07 23:36:57 konstantin@mysql.com +41 -18
    New declarations to add support for @@max_prepared_stmt_count.
    Implement a new class, where the lock to be used when updating
    a variable is a parameter.

  sql/set_var.cc
    1.34.52.34 06/04/07 23:36:57 konstantin@mysql.com +37 -5
    Implement support for @@prepared_stmt_count and 
    @@max_prepared_stmt_count. Currently these variables are queried
    without acquiring LOCK_prepared_stmt_count due to limitations of
    the set_var/sys_var class design. Updates are, however, protected 
    with a lock.

  sql/mysqld.cc
    1.356.98.22 06/04/07 23:36:56 konstantin@mysql.com +32 -1
    Add definitions of max_prepared_stmt_count, prepared_stmt_count.

  sql/mysql_priv.h
    1.186.103.1 06/04/07 23:36:56 konstantin@mysql.com +3 -1
    Add declarations for new global variables.

  mysql-test/t/ps.test
    1.27.2.1 06/04/07 23:36:56 konstantin@mysql.com +123 -0
    A test case for Bug#16365 "Prepared Statements: DoS with too many 
    open statements". Also fix statement leaks in other tests.

  mysql-test/r/ps.result
    1.31.2.1 06/04/07 23:36:56 konstantin@mysql.com +108 -0
    Test results fixed (a test case for Bug#16365)

ChangeSet
  1.1616.2533.1 06/04/07 22:26:25 konstantin@mysql.com +4 -0
  A fix and a test case for Bug#16248 "WHERE (col1,col2) IN ((?,?)) 
  gives wrong results". Implement previously missing 
  Item_row::cleanup. The bug is not repeatable in 5.0, probably 
  due to a coincidence: the problem is present in 5.0 as well.

  sql/item_row.h
    1.13.1.4 06/04/07 22:26:15 konstantin@mysql.com +1 -2
    Remove a never used member 'array_holder'. Add declaration for
    Item_row::cleanup.

  sql/item_row.cc
    1.18.1.11 06/04/07 22:26:15 konstantin@mysql.com +15 -1
    Implement Item_row::cleanup(): we should reset used_tables_cache
    before reexecution of a prepared statement. In case ROW
    arguments contain a placeholder, used_tables_cache has PARAM_TABLE
    bit set in statement prepare. As a result, when executing a statement,
    the condition push down algorithm (make_cond_for_table) would think
    that the WHERE clause belongs to the non-existent PARAM_TABLE and
    wouldn't attach the WHERE clause to any of the real tables, 
    effectively optimizing the clause away.

  mysql-test/t/ps.test
    1.27.1.22 06/04/07 22:26:15 konstantin@mysql.com +18 -0
    Add a test case for Bug#16248 "WHERE (col1,col2) IN ((?,?)) gives 
    wrong results"

  mysql-test/r/ps.result
    1.31.1.17 06/04/07 22:26:15 konstantin@mysql.com +20 -0
    Update the result file (Bug#16248)

ChangeSet
  1.1810.1528.1 06/04/07 20:44:37 aelkin@mysql.com +4 -0
  Bug#17284 erroneous temp table cleanup on slave.
    
       Idea of the fix is for master to send FD event with `created' as 0
       to reconnecting slave (upon slave_net_timeout, no master crash) to avoid destroying temp tables.
       In a case of a connect by slave to the master after its crash temp tables have been already
       cleaned up so that slave can not keep `orphan' temp tables.

  mysql-test/include/get_binlog_dump_thread_id.inc
    1.1 06/04/07 20:44:32 aelkin@mysql.com +9 -0
    mysqltest's preudo-macro to calculate $id master dump thread id

  sql/sql_repl.cc
    1.133.1.15 06/04/07 20:44:32 aelkin@mysql.com +6 -0
    Storing zero for assigning to `created' of FD event on the reconnecting slave.

  mysql-test/t/rpl_temporary.test
    1.15.1.1 06/04/07 20:44:32 aelkin@mysql.com +26 -1
    wait-free addon to check temp tables are ok after slave reconnect.

  mysql-test/r/rpl_temporary.result
    1.18.1.1 06/04/07 20:44:32 aelkin@mysql.com +14 -0
    results

  mysql-test/include/get_binlog_dump_thread_id.inc
    1.0 06/04/07 20:44:32 aelkin@mysql.com +0 -0
    BitKeeper file /usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0.21-bug17284-temp_table/mysql-test/include/get_binlog_dump_thread_id.inc

ChangeSet
  1.1810.1522.3 06/04/07 17:10:56 jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#11034
    fix mem leak (not during running of transactions, but a few bytes when shutting down)

  ndb/src/ndbapi/NdbLinHash.hpp
    1.4.3.1 06/04/07 17:10:54 jonas@perch.ndb.mysql.com +10 -3
    Make sure that getNext(0) actually finds first element

ChangeSet
  1.1810.1527.1 06/04/07 16:53:15 pem@mysql.com +7 -0
  Renaming sp_pcontext members and methods; less cryptic and more consistent.
  Also added comments, and fixing some coding style (mostly in comments too).
  There are no functional changes, so no tests or documentation needed.
  (This was originally part of a bugfix, but it was decided to not include this
   in that patch; instead it's done separately.)

  sql/sql_yacc.yy
    1.371.1.92 06/04/07 16:53:11 pem@mysql.com +44 -42
    Renaming sp_pcontext members and methods; less cryptic and more consistent.

  sql/sp_rcontext.h
    1.31 06/04/07 16:53:11 pem@mysql.com +4 -4
    Renaming sp_pcontext members and methods; less cryptic and more consistent.

  sql/sp_rcontext.cc
    1.41 06/04/07 16:53:11 pem@mysql.com +12 -12
    Renaming sp_pcontext members and methods; less cryptic and more consistent.

  sql/sp_pcontext.h
    1.28 06/04/07 16:53:11 pem@mysql.com +78 -52
    Renaming sp_pcontext members and methods; less cryptic and more consistent.
    Also added comments, and fixing some coding style (mostly in comments too).

  sql/sp_pcontext.cc
    1.30 06/04/07 16:53:11 pem@mysql.com +82 -81
    Renaming sp_pcontext members and methods; less cryptic and more consistent.
    Also added comments, and fixing some coding style (mostly in comments too).

  sql/sp_head.h
    1.79.1.2 06/04/07 16:53:11 pem@mysql.com +3 -3
    Renaming sp_pcontext members and methods; less cryptic and more consistent.

  sql/sp_head.cc
    1.200.1.6 06/04/07 16:53:11 pem@mysql.com +11 -11
    Renaming sp_pcontext members and methods; less cryptic and more consistent.

ChangeSet
  1.1810.1522.2 06/04/07 15:48:13 jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#11033
    silent valgrind warnings 5.0, ndb_autodiscover

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.74.15.1 06/04/07 15:48:10 jonas@perch.ndb.mysql.com +6 -1
    append 4 bytes of 0's to end of buffer to shut valgrind up

ChangeSet
  1.2119.342.15 06/04/07 08:54:16 bpontz@shasta.mysql.com +1 -0
  configure.in:
    increase version number for clone

  configure.in
    1.333.1.25 06/04/07 08:53:42 bpontz@shasta.mysql.com +1 -1
    increase version number for clone

ChangeSet
  1.1810.1457.58 06/04/07 14:21:00 msvensson@neptunus.(none) +1 -0
  Remove #if 0

  client/mysqltest.c
    1.155.9.41 06/04/07 14:20:56 msvensson@neptunus.(none) +1 -1
    Remove #if 0

ChangeSet
  1.1810.1525.1 06/04/07 15:30:40 kroki@mysql.com +5 -0
  Bug#15933: max_used_connections is wrong after FLUSH STATUS if connections are cached
  
  After FLUSH STATUS max_used_connections was reset to 0, and haven't
  been updated while cached threads were reused, until the moment a new
  thread was created.
  
  The first suggested fix from original bug report was implemented:
  
    a) On flushing the status, set max_used_connections to
    threads_connected, not to 0.
  
    b) Check if it is necessary to increment max_used_connections when
    taking a thread from the cache as well as when creating new threads

  sql/sql_parse.cc
    1.426.79.1 06/04/07 15:30:34 kroki@mysql.com +0 -22
    refresh_status() moved to sql/mysqld.cc.

  sql/mysqld.cc
    1.439.1.102 06/04/07 15:30:33 kroki@mysql.com +57 -16
    Remove start_cached_thread() (code moved directly into create_new_thread()).
    Add comment for create_new_thread ().
    In create_new_thread() update max_used_connections when creating new thread
    and when reusing the cached one.
    Move refresh_status() from sql/sql_parse.cc here, on refresh set
    max_used_connections to the current number of connections.

  sql/mysql_priv.h
    1.290.1.91 06/04/07 15:30:32 kroki@mysql.com +1 -0
    Add declaration of refresh_status(), which is now external.

  mysql-test/t/status.test
    1.14 06/04/07 15:30:32 kroki@mysql.com +64 -1
    Add test case for bug#15933.
    Fixed typo.

  mysql-test/r/status.result
    1.9 06/04/07 15:30:31 kroki@mysql.com +20 -0
    Add result for bug#15933.

ChangeSet
  1.1810.1523.2 06/04/07 12:46:50 msvensson@shellback.(none) +1 -0
  Fix spelling error

  include/my_global.h
    1.96.1.21 06/04/07 12:46:44 msvensson@shellback.(none) +1 -1
    Fix spelling error

ChangeSet
  1.1810.1521.2 06/04/07 12:01:07 tomas@poseidon.ndb.mysql.com +2 -0
  multi node shutdown adabtions for restart of management servers

  ndb/src/mgmsrv/Services.cpp
    1.45.15.2 06/04/07 12:01:00 tomas@poseidon.ndb.mysql.com +0 -23
    multi node shutdown adabtions for restart of management servers

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.73.19.2 06/04/07 12:00:59 tomas@poseidon.ndb.mysql.com +31 -22
    multi node shutdown adabtions for restart of management servers

ChangeSet
  1.1810.1523.1 06/04/07 11:35:12 msvensson@shellback.(none) +91 -0
  Update yassl to 1.2.2

ChangeSet
  1.1616.2531.1 06/04/07 19:28:18 stewart@mysql.com +1 -0
  BUG#18881 valgrind: kernel memory leak in vm/Emulator.cpp

  ndb/src/kernel/vm/Emulator.cpp
    1.13.1.5 06/04/07 19:28:10 stewart@mysql.com +1 -0
    destroy theShutdownMutex in the destructor

ChangeSet
  1.2119.358.1 06/04/07 11:26:21 msvensson@neptunus.(none) +3 -0
  Add new function mysql_get_ssl_cipher to libmysl and use it from client to avoid dependency on SSL libs from mysql client.

  sql-common/client.c
    1.89.2.1 06/04/07 11:26:17 msvensson@neptunus.(none) +21 -0
    Add new function mysql_get_ssl_cipher, will return the cipher used for the current connection to the server. 

  include/mysql.h
    1.159 06/04/07 11:26:17 msvensson@neptunus.(none) +1 -0
    Add new function mysql_get_ssl_cipher

  client/mysql.cc
    1.198.1.1 06/04/07 11:26:17 msvensson@neptunus.(none) +2 -3
    Add new function mysql_get_ssl_cipher to libmysl and use it from client to avoid dependency on SSL libs from mysql client.

ChangeSet
  1.2119.255.2 06/04/07 11:18:45 msvensson@neptunus.(none) +3 -0
  Bug#13228 open table cache not flushed when table schema changed
  - Error 1296 is no longer returned on first select after DROP/CREATE.

  sql/ha_ndbcluster.cc
    1.288.1.2 06/04/07 11:18:39 msvensson@neptunus.(none) +2 -0
    Add sourrounding {'s

  mysql-test/t/ndb_alter_table2.test
    1.2 06/04/07 11:18:39 msvensson@neptunus.(none) +0 -1
    Error 1296 is no longer returned on first select after DROP/CREATE, handled proactive in ndb_handle_schema_change.

  mysql-test/r/ndb_alter_table2.result
    1.2 06/04/07 11:18:39 msvensson@neptunus.(none) +1 -1
    Error 1296 is no longer returned on first select after DROP/CREATE, handled proactive in ndb_handle_schema_change.

ChangeSet
  1.2119.356.1 06/04/07 14:07:56 bar@mysql.com +3 -0
  Bug#16319: XML: extractvalue() returns syntax errors for some functions

  sql/item_xmlfunc.cc
    1.13 06/04/07 14:07:45 bar@mysql.com +17 -1
    Adding support for missing XPath function string-length().
    Fixing function lookup to allow functions with one optional arguments
    (i.e. with 0 or 1 arguments)

  mysql-test/t/xml.test
    1.10.1.1 06/04/07 14:07:45 bar@mysql.com +14 -0
    Adding test case

  mysql-test/r/xml.result
    1.10.1.1 06/04/07 14:07:44 bar@mysql.com +24 -0
    Adding test case

ChangeSet
  1.1810.1521.1 06/04/07 10:39:47 tomas@poseidon.ndb.mysql.com +7 -0
  Support for ndb multi-node shutdown

  ndb/src/mgmsrv/Services.cpp
    1.45.15.1 06/04/07 10:39:41 tomas@poseidon.ndb.mysql.com +20 -17
    Support for ndb multi-node shutdown

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.30.10.1 06/04/07 10:39:41 tomas@poseidon.ndb.mysql.com +9 -5
    Support for ndb multi-node shutdown

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.73.19.1 06/04/07 10:39:41 tomas@poseidon.ndb.mysql.com +135 -69
    Support for ndb multi-node shutdown

  ndb/src/mgmclient/CommandInterpreter.cpp
    1.49.8.1 06/04/07 10:39:40 tomas@poseidon.ndb.mysql.com +177 -55
    Support for ndb multi-node shutdown

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.13.15.1 06/04/07 10:39:40 tomas@poseidon.ndb.mysql.com +89 -88
    Support for ndb multi-node shutdown

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
    1.14.9.1 06/04/07 10:39:40 tomas@poseidon.ndb.mysql.com +5 -0
    Support for ndb multi-node shutdown

  ndb/include/kernel/signaldata/StopReq.hpp
    1.1.3.1 06/04/07 10:39:40 tomas@poseidon.ndb.mysql.com +2 -1
    Support for ndb multi-node shutdown

ChangeSet
  1.1810.1471.12 06/04/07 10:10:09 jonas@perch.ndb.mysql.com +1 -0
  ndb -
    remove debug prinouts in Qmgr

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.13.14.1 06/04/07 10:10:06 jonas@perch.ndb.mysql.com +0 -3
    remove debug prinouts

ChangeSet
  1.2119.353.1 06/04/07 11:04:33 bar@mysql.com +3 -0
  Bug#18285: ExtractValue not returning character data within <![CDATA[]]> as expected

  strings/xml.c
    1.10 06/04/07 11:04:23 bar@mysql.com +22 -0
    Adding missing support of CDATA sections.

  mysql-test/t/xml.test
    1.11 06/04/07 11:04:23 bar@mysql.com +6 -0
    Adding test case

  mysql-test/r/xml.result
    1.11 06/04/07 11:04:23 bar@mysql.com +3 -0
    Adding test case

ChangeSet
  1.1810.1520.1 06/04/06 15:29:15 igor@rurik.mysql.com +3 -0
  Fixed bug #15917: unexpected complain for a NIST test case.
  The problem was due to the fact that with --lower-case-table-names set to 1 
  the function find_field_in_group did not convert the prefix 'HU' in
  HU.PROJ.CITY into lower case when looking for it in the group list. Yet the
  names in the group list were extended by the database name in lower case.

  sql/item.cc
    1.113.1.101 06/04/06 15:29:09 igor@rurik.mysql.com +9 -0
    Fixed bug #15917: unexpected complain for a NIST test case.
    The problem was due to the fact that with --lower-case-table-names set to 1 
    the function find_field_in_group did not convert the prefix 'HU' in
    HU.PROJ.CITY into lower case when looking for it in the group list. Yet the
    names in the group list were extended by the database name in lower case.
    The needed conversion was added to the code of find_field_in_group.
    

  mysql-test/t/having.test
    1.19 06/04/06 15:29:09 igor@rurik.mysql.com +44 -0
    Added a test case for bug #15917.

  mysql-test/r/having.result
    1.22 06/04/06 15:29:09 igor@rurik.mysql.com +35 -0
    Added a test case for bug #15917.

  extra/yassl/yassl.dsw
    1.2 06/03/29 01:56:34 msvensson@shellback.(none)[msvensson] +15 -0
    Import patch yassl.diff

  extra/yassl/yassl.dsp
    1.2 06/03/29 01:56:34 msvensson@shellback.(none)[msvensson] +2 -2
    Import patch yassl.diff

  extra/yassl/taocrypt/taocrypt.dsp
    1.2 06/03/29 01:56:34 msvensson@shellback.(none)[msvensson] +38 -2
    Import patch yassl.diff

  extra/yassl/taocrypt/src/sha.cpp
    1.3 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +476 -5
    Import patch yassl.diff

  extra/yassl/taocrypt/src/ripemd.cpp
    1.3 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +562 -13
    Import patch yassl.diff

  extra/yassl/taocrypt/src/random.cpp
    1.7 06/03/29 01:56:37 msvensson@shellback.(none)[msvensson] +3 -4
    Import patch yassl.diff

  extra/yassl/taocrypt/src/misc.cpp
    1.10 06/03/29 01:56:37 msvensson@shellback.(none)[msvensson] +29 -29
    Import patch yassl.diff

  extra/yassl/taocrypt/src/md5.cpp
    1.3 06/03/29 01:56:37 msvensson@shellback.(none)[msvensson] +341 -6
    Import patch yassl.diff

  extra/yassl/taocrypt/src/integer.cpp
    1.18 06/03/29 03:49:02 msvensson@shellback.(none)[msvensson] +9 -9
    Import patch yassl.diff

  extra/yassl/taocrypt/src/hash.cpp
    1.3 06/03/29 01:56:37 msvensson@shellback.(none)[msvensson] +22 -7
    Import patch yassl.diff

  extra/yassl/taocrypt/src/dh.cpp
    1.6 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +25 -3
    Import patch yassl.diff

  extra/yassl/taocrypt/src/des.cpp
    1.2 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +498 -125
    Import patch yassl.diff

  extra/yassl/testsuite/testsuite.dsp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +127 -0
    Import patch yassl.diff

  extra/yassl/testsuite/testsuite.cpp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +155 -0
    Import patch yassl.diff

  extra/yassl/testsuite/test.hpp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +352 -0
    Import patch yassl.diff

  extra/yassl/testsuite/quit
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

  extra/yassl/testsuite/make.bat
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +14 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/coding.cpp
    1.4 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +3 -4
    Import patch yassl.diff

  extra/yassl/taocrypt/src/asn.cpp
    1.5 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +22 -17
    Import patch yassl.diff

  extra/yassl/taocrypt/src/arc4.cpp
    1.4 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +136 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/algebra.cpp
    1.7 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/aestables.cpp
    1.4 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +0 -683
    Import patch yassl.diff

  extra/yassl/taocrypt/src/aes.cpp
    1.3 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +1442 -11
    Import patch yassl.diff

  extra/yassl/taocrypt/include/types.hpp
    1.8 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +1 -2
    Import patch yassl.diff

  extra/yassl/taocrypt/include/sha.hpp
    1.2 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/runtime.hpp
    1.10 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +6 -4
    Import patch yassl.diff

  extra/yassl/taocrypt/include/ripemd.hpp
    1.2 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/modes.hpp
    1.6 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +7 -8
    Import patch yassl.diff

  extra/yassl/taocrypt/include/misc.hpp
    1.9 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +125 -34
    Import patch yassl.diff

  extra/yassl/taocrypt/include/md5.hpp
    1.2 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +3 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/hmac.hpp
    1.4 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +5 -5
    Import patch yassl.diff

  extra/yassl/taocrypt/include/hash.hpp
    1.5 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +11 -2
    Import patch yassl.diff

  extra/yassl/taocrypt/include/dh.hpp
    1.2 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/include/des.hpp
    1.3 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +47 -33
    Import patch yassl.diff

  extra/yassl/taocrypt/include/block.hpp
    1.6 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/include/asn.hpp
    1.4 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +8 -5
    Import patch yassl.diff

  extra/yassl/taocrypt/include/arc4.hpp
    1.2 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +1 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/aes.hpp
    1.3 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +24 -18
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp
    1.11 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +92 -71
    Import patch yassl.diff

  extra/yassl/src/yassl_imp.cpp
    1.6 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +61 -51
    Import patch yassl.diff

  extra/yassl/src/yassl_error.cpp
    1.4 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +179 -0
    Import patch yassl.diff

  extra/yassl/src/timer.cpp
    1.6 06/03/29 01:56:40 msvensson@shellback.(none)[msvensson] +5 -7
    Import patch yassl.diff

  extra/yassl/testsuite/testsuite.dsp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/testsuite/testsuite.dsp

  extra/yassl/testsuite/testsuite.cpp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/testsuite/testsuite.cpp

  extra/yassl/testsuite/test.hpp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/testsuite/test.hpp

  extra/yassl/testsuite/quit
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/testsuite/quit

  extra/yassl/testsuite/make.bat
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/testsuite/make.bat

  extra/yassl/testsuite/input
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +107 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/test/test.cpp
    1.1 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +947 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/test/memory.cpp
    1.1 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +312 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/test/make.bat
    1.1 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +9 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/test.dsw
    1.1 06/03/29 01:56:34 msvensson@shellback.(none)[msvensson] +29 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/test.dsp
    1.1 06/03/29 01:56:34 msvensson@shellback.(none)[msvensson] +102 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/twofish.cpp
    1.1 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +591 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/tftables.cpp
    1.1 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +352 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/make.bat
    1.1 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +38 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/blowfish.cpp
    1.1 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +358 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/bftables.cpp
    1.1 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +306 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/twofish.hpp
    1.1 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +86 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/pwdbased.hpp
    1.1 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +93 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/kernelc.hpp
    1.1 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +49 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/blowfish.hpp
    1.1 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +79 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/benchmark/make.bat
    1.1 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +10 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/benchmark/benchmark.dsp
    1.1 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +101 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/benchmark/benchmark.cpp
    1.1 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +440 -0
    Import patch yassl.diff

  extra/yassl/src/yassl.cpp
    1.1 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +244 -0
    Import patch yassl.diff

  extra/yassl/src/ssl.cpp
    1.10 06/03/29 01:56:40 msvensson@shellback.(none)[msvensson] +105 -32
    Import patch yassl.diff

  extra/yassl/src/socket_wrapper.cpp
    1.8 06/03/29 01:56:40 msvensson@shellback.(none)[msvensson] +15 -11
    Import patch yassl.diff

  extra/yassl/src/make.bat
    1.1 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +27 -0
    Import patch yassl.diff

  extra/yassl/src/handshake.cpp
    1.6 06/03/29 01:56:40 msvensson@shellback.(none)[msvensson] +25 -22
    Import patch yassl.diff

  extra/yassl/src/crypto_wrapper.cpp
    1.7 06/03/29 01:56:40 msvensson@shellback.(none)[msvensson] +29 -29
    Import patch yassl.diff

  extra/yassl/src/cert_wrapper.cpp
    1.6 06/03/29 01:56:40 msvensson@shellback.(none)[msvensson] +24 -10
    Import patch yassl.diff

  extra/yassl/src/buffer.cpp
    1.6 06/03/29 01:56:40 msvensson@shellback.(none)[msvensson] +8 -7
    Import patch yassl.diff

  extra/yassl/mySTL/vector.hpp
    1.5 06/03/29 01:56:39 msvensson@shellback.(none)[msvensson] +1 -2
    Import patch yassl.diff

  extra/yassl/mySTL/list.hpp
    1.6 06/03/29 01:56:39 msvensson@shellback.(none)[msvensson] +2 -2
    Import patch yassl.diff

  extra/yassl/mySTL/helpers.hpp
    1.8 06/03/29 01:56:39 msvensson@shellback.(none)[msvensson] +7 -1
    Import patch yassl.diff

  extra/yassl/include/yassl_types.hpp
    1.9 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +50 -23
    Import patch yassl.diff

  extra/yassl/include/yassl_int.hpp
    1.7 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +5 -3
    Import patch yassl.diff

  extra/yassl/include/yassl_imp.hpp
    1.3 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/include/yassl_error.hpp
    1.3 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +4 -0
    Import patch yassl.diff

  extra/yassl/include/yassl.hpp
    1.1 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +88 -0
    Import patch yassl.diff

  extra/yassl/include/socket_wrapper.hpp
    1.5 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/include/openssl/ssl.h
    1.5 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +5 -2
    Import patch yassl.diff

  extra/yassl/include/crypto_wrapper.hpp
    1.3 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +3 -3
    Import patch yassl.diff

  extra/yassl/include/cert_wrapper.hpp
    1.2 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +3 -0
    Import patch yassl.diff

  extra/yassl/examples/server/server.dsp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +109 -0
    Import patch yassl.diff

  extra/yassl/examples/server/server.cpp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +73 -0
    Import patch yassl.diff

  extra/yassl/examples/echoserver/echoserver.dsp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +102 -0
    Import patch yassl.diff

  extra/yassl/examples/echoserver/echoserver.cpp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +126 -0
    Import patch yassl.diff

  extra/yassl/examples/echoclient/quit
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

  extra/yassl/examples/echoclient/input
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +93 -0
    Import patch yassl.diff

  extra/yassl/examples/echoclient/echoclient.dsp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +102 -0
    Import patch yassl.diff

  extra/yassl/examples/echoclient/echoclient.cpp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +89 -0
    Import patch yassl.diff

  extra/yassl/examples/client/client.dsp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +102 -0
    Import patch yassl.diff

  extra/yassl/README
    1.2 06/03/29 22:31:19 msvensson@shellback.(none)[msvensson] +134 -1
    Import patch yassl.diff

  extra/yassl/testsuite/input
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/testsuite/input

  extra/yassl/taocrypt/test/test.cpp
    1.0 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/test/test.cpp

  extra/yassl/taocrypt/test/memory.cpp
    1.0 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/test/memory.cpp

  extra/yassl/taocrypt/test/make.bat
    1.0 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/test/make.bat

  extra/yassl/taocrypt/test.dsw
    1.0 06/03/29 01:56:34 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/test.dsw

  extra/yassl/taocrypt/test.dsp
    1.0 06/03/29 01:56:34 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/test.dsp

  extra/yassl/taocrypt/src/twofish.cpp
    1.0 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/src/twofish.cpp

  extra/yassl/taocrypt/src/tftables.cpp
    1.0 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/src/tftables.cpp

  extra/yassl/taocrypt/src/make.bat
    1.0 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/src/make.bat

  extra/yassl/taocrypt/src/blowfish.cpp
    1.0 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/src/blowfish.cpp

  extra/yassl/taocrypt/src/bftables.cpp
    1.0 06/03/29 01:56:36 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/src/bftables.cpp

  extra/yassl/taocrypt/include/twofish.hpp
    1.0 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/include/twofish.hpp

  extra/yassl/taocrypt/include/pwdbased.hpp
    1.0 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/include/pwdbased.hpp

  extra/yassl/taocrypt/include/kernelc.hpp
    1.0 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/include/kernelc.hpp

  extra/yassl/taocrypt/include/blowfish.hpp
    1.0 06/03/29 01:56:35 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/include/blowfish.hpp

  extra/yassl/taocrypt/benchmark/make.bat
    1.0 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/benchmark/make.bat

  extra/yassl/taocrypt/benchmark/benchmark.dsp
    1.0 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/benchmark/benchmark.dsp

  extra/yassl/taocrypt/benchmark/benchmark.cpp
    1.0 06/03/29 01:56:38 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/taocrypt/benchmark/benchmark.cpp

  extra/yassl/src/yassl.cpp
    1.0 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/src/yassl.cpp

  extra/yassl/src/make.bat
    1.0 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/src/make.bat

  extra/yassl/include/yassl.hpp
    1.0 06/03/29 01:56:41 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/include/yassl.hpp

  extra/yassl/examples/server/server.dsp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/examples/server/server.dsp

  extra/yassl/examples/server/server.cpp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/examples/server/server.cpp

  extra/yassl/examples/echoserver/echoserver.dsp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/examples/echoserver/echoserver.dsp

  extra/yassl/examples/echoserver/echoserver.cpp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/examples/echoserver/echoserver.cpp

  extra/yassl/examples/echoclient/quit
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/examples/echoclient/quit

  extra/yassl/examples/echoclient/input
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/examples/echoclient/input

  extra/yassl/examples/echoclient/echoclient.dsp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/examples/echoclient/echoclient.dsp

  extra/yassl/examples/echoclient/echoclient.cpp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/examples/echoclient/echoclient.cpp

  extra/yassl/examples/client/client.dsp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/examples/client/client.dsp

  extra/yassl/examples/client/client.cpp
    1.1 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +96 -0
    Import patch yassl.diff

  extra/yassl/examples/client/client.cpp
    1.0 06/03/29 01:56:42 msvensson@shellback.(none)[msvensson] +0 -0
    BitKeeper file /home/msvensson/mysql/my50-yassl/extra/yassl/examples/client/client.cpp

ChangeSet
  1.2119.338.3 06/04/06 17:18:12 mats@mysql.com +13 -0
  WL#3206 (Adding unit tests):
  Moving mytap library into unittest/
  Adding 'test' target to make and run unit tests.
  Minor fixes.

  unittest/mysys/base64.t.c
    1.1 06/04/06 17:18:05 mats@mysql.com +89 -0
    New BitKeeper file ``unittest/mysys/base64.t.c''

  unittest/mytap/t/Makefile.am
    1.3 06/04/06 17:18:05 mats@mysql.com +2 -1
    Correcting after moving mytap/

  unittest/mytap/Makefile.am
    1.3 06/04/06 17:18:05 mats@mysql.com +0 -1
    Correcting after moving mytap/

  unittest/mysys/bitmap.t.c
    1.2 06/04/06 17:18:05 mats@mysql.com +21 -3
    Adding copyright notice.

  unittest/mysys/base64.t.c
    1.0 06/04/06 17:18:05 mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3206-2-mysql-5.1-new/unittest/mysys/base64.t.c

  unittest/mysys/Makefile.am
    1.2 06/04/06 17:18:05 mats@mysql.com +9 -8
    Correcting after moving mytap/

  unittest/examples/Makefile.am
    1.2 06/04/06 17:18:05 mats@mysql.com +3 -3
    Correcting after moving mytap/

  unittest/Makefile.am
    1.2 06/04/06 17:18:05 mats@mysql.com +21 -1
    Adding 'test' target to build and execute unit tests.

  configure.in
    1.333.13.2 06/04/06 17:18:05 mats@mysql.com +2 -1
    Correcting after moving mytap/

  Makefile.am
    1.82.1.3 06/04/06 17:18:05 mats@mysql.com +2 -2
    Correcting after moving mytap/

ChangeSet
  1.1616.2529.1 06/04/07 00:58:08 stewart@mysql.com +1 -0
  BUG#15530: Cluster start up "show" shows all data nodes as master during start
  
  along with the fix for 18843, this should fix the bug.

  ndb/src/mgmclient/CommandInterpreter.cpp
    1.44.1.8 06/04/07 00:57:39 stewart@mysql.com +1 -1
    Only show we have a master if one has been elected

ChangeSet
  1.1616.2520.21 06/04/06 16:18:42 jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#18612 - post review fixes
    1) make sure that check_multi_node_shutdown does not proceed (in stop case)
    2) Fix printout

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.12.1.9 06/04/06 16:18:41 jonas@perch.ndb.mysql.com +15 -5
    make sure that check_multi_node_shutdown does not proceed (in stop case)

  ndb/src/kernel/blocks/qmgr/Qmgr.hpp
    1.2.1.6 06/04/06 16:18:40 jonas@perch.ndb.mysql.com +1 -1
    make sure that check_multi_node_shutdown does not proceed (in stop case)

  unittest/mytap/tap.h
    1.2 06/04/06 15:10:38 mats@mysql.com +0 -0
    mvdir

  unittest/mytap/tap.c
    1.2 06/04/06 15:10:38 mats@mysql.com +0 -0
    mvdir

  unittest/mytap/t/basic.t.c
    1.2 06/04/06 15:10:38 mats@mysql.com +0 -0
    mvdir

  unittest/mytap/t/Makefile.am
    1.2 06/04/06 15:10:38 mats@mysql.com +0 -0
    mvdir

  unittest/mytap/Makefile.am
    1.2 06/04/06 15:10:38 mats@mysql.com +0 -0
    mvdir

  unittest/mytap/Doxyfile
    1.2 06/04/06 15:10:38 mats@mysql.com +0 -0
    mvdir

ChangeSet
  1.1616.2528.1 06/04/06 21:59:20 stewart@mysql.com +1 -0
  BUG#18833 valgrind: Mismatched free()/delete/delete[] in SimBlockList

  ndb/src/kernel/SimBlockList.cpp
    1.5.2.3 06/04/06 21:59:15 stewart@mysql.com +4 -0
    NEW_BLOCK allocates the elements with new, we should free them with delete
    but only if we're not building with VM_TRACE

ChangeSet
  1.1616.2527.4 06/04/06 21:59:13 stewart@mysql.com +1 -0
  BUG#18843 valgrind: cond jump on uninit in Qmgr::execAPI_REGREQ

  ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
    1.5.5.1 06/04/06 21:59:08 stewart@mysql.com +4 -1
    Also init a few internals before start phase 1 as they can be accessed before that

ChangeSet
  1.1810.1471.10 06/04/06 11:51:24 jonas@perch.ndb.mysql.com +1 -0
  post merge fixes

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.13.12.4 06/04/06 11:51:21 jonas@perch.ndb.mysql.com +3 -1
    post merge fixes

ChangeSet
  1.1810.1471.9 06/04/06 11:43:31 jonas@perch.ndb.mysql.com +10 -0
  ndb - wl1760/bug#18216 
    add two new start options that will decrease likelyhood of bug#18612
    push cntr-sp2 logic down into qmgr-sp1 to decrease likelyhood of bug#18612

  ndb/src/kernel/vm/Configuration.cpp
    1.39.4.1 06/04/06 11:43:28 jonas@perch.ndb.mysql.com +45 -0
    Add new flags
      --initial-start
      --nowait-nodes

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.13.12.3 06/04/06 11:43:28 jonas@perch.ndb.mysql.com +488 -56
    Push cntr sp2 logic down to QMGR to prevent the forming of multiple QMGR cluster
      that will lead to start problems (crashes...)

  ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
    1.4.3.2 06/04/06 11:43:28 jonas@perch.ndb.mysql.com +3 -0
    Push cntr sp2 logic down to QMGR to prevent the forming of multiple QMGR cluster
      that will lead to start problems (crashes...)

  ndb/src/kernel/blocks/qmgr/Qmgr.hpp
    1.3.6.2 06/04/06 11:43:28 jonas@perch.ndb.mysql.com +22 -6
    Push cntr sp2 logic down to QMGR to prevent the forming of multiple QMGR cluster
      that will lead to start problems (crashes...)

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
    1.14.8.2 06/04/06 11:43:28 jonas@perch.ndb.mysql.com +2 -14
    Remove timeouts as they are handled in QMGR nowadays

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.24.22.2 06/04/06 11:43:28 jonas@perch.ndb.mysql.com +52 -26
    Fix small bugs related to partial initial start

  ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
    1.6.4.1 06/04/06 11:43:28 jonas@perch.ndb.mysql.com +1 -0
    Init cntrref

  ndb/src/common/debugger/EventLogger.cpp
    1.21.4.1 06/04/06 11:43:28 jonas@perch.ndb.mysql.com +85 -0
    Add Start report during sp1

  ndb/include/mgmapi/ndb_logevent.h
    1.3.3.1 06/04/06 11:43:28 jonas@perch.ndb.mysql.com +12 -1
    Add Start report during sp1

  ndb/include/kernel/signaldata/CmRegSignalData.hpp
    1.1.1.1 06/04/06 11:43:27 jonas@perch.ndb.mysql.com +23 -6
    Expand CmRegReq with lots of stuff

ChangeSet
  1.2119.329.3 06/04/06 10:47:48 mskold@mysql.com +2 -0
  Fix for bug#16445 schema version error 241 after mysqld restart, always invalidate dictionary cache when receiving changed schema events drop table or alter table, regardless if done remotely or not (also includes cluster failures, but refreshing cache is a safe operation)

  sql/ha_ndbcluster_binlog.cc
    1.40.1.1 06/04/06 10:47:30 mskold@mysql.com +59 -58
    Fix for bug#16445 schema version error 241 after mysqld restart, always invalidate dictionary cache when receiving changed schema events drop table or alter table, regardless if done remotely or not (also includes cluster failures, but refreshing cache is a safe operation)

  mysql-test/t/ndb_basic.test
    1.40 06/04/06 10:47:30 mskold@mysql.com +0 -11
    Fix for bug#16445 schema version error 241 after mysqld restart, always invalidate dictionary cache when receiving changed schema events drop table or alter table, regardless if done remotely or not (also includes cluster failures, but refreshing cache is a safe operation)

ChangeSet
  1.1616.2483.43 06/04/06 00:43:58 kent@mysql.com +1 -0
  configure.in:
    Check for crypt() in libc first (bug#16478)

  configure.in
    1.201.64.1 06/04/06 00:39:50 kent@mysql.com +2 -3
    Check for crypt() in libc first (bug#16478)

ChangeSet
  1.1810.1515.1 06/04/05 17:41:40 holyfoot@vva.(none) +2 -0
  bug $17756 (sp_notembedded.test unstable)

  mysql-test/t/sp_notembedded.test
    1.2 06/04/05 17:41:35 holyfoot@mysql.com +5 -0
    test case fixed so as the previous test won't affect the result of
    SHOW PROCESSLIST command

  mysql-test/r/sp_notembedded.result
    1.2 06/04/05 17:41:35 holyfoot@mysql.com +2 -0
    result fixed

ChangeSet
  1.1810.1514.2 06/04/05 14:39:20 ingo@mysql.com +2 -0
  BUG#5390 - problems with merge tables
  Additional fix for INSERT DELAYED with subselect.
  Originally detected in 5.1, but 5.0 could also be affected.
  The user thread creates a dummy table object,
  which is not included in the lock. The 'real' table is
  opened and locked by the 'delayed' system thread.
  The dummy object is now marked as not locked and this is
  tested in mysql_lock_have_duplicate().

  sql/sql_insert.cc
    1.146.1.40 06/04/05 14:39:15 ingo@mysql.com +4 -1
    BUG#5390 - problems with merge tables
    Marked the dummy table object as not being
    included in the lock.

  sql/lock.cc
    1.64.1.22 06/04/05 14:39:15 ingo@mysql.com +9 -4
    BUG#5390 - problems with merge tables
    Additional fix for INSERT DELAYED with subselect.
    The user thread creates a dummy table object,
    which is not included in the lock.
    Changed to safer asserts.

ChangeSet
  1.1810.1471.8 06/04/05 11:52:35 jonas@perch.ndb.mysql.com +1 -0
  merge

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.13.12.2 06/04/05 11:52:32 jonas@perch.ndb.mysql.com +9 -4
    merge

ChangeSet
  1.1810.1457.55 06/04/05 11:47:12 msvensson@neptunus.(none) +1 -0
  Incorporate a patch to write a timestamp for every new line of the test that is executed.
  This makes it possible make a graph (with for example gnuplot) of a test run and spot where most time is consumed.
  Add the new code inside an "#if 0" until it's portable. 

  client/mysqltest.c
    1.155.9.40 06/04/05 11:47:08 msvensson@neptunus.(none) +30 -0
    Incorporate a patch to write a timestamp for every new line of the test that is executed.
    This makes it possible make a graph (with for example gnuplot) of a test run and spot where most time is consumed.

ChangeSet
  1.1810.1457.54 06/04/05 11:20:12 msvensson@neptunus.(none) +1 -0
  use "unsigned long" type just as in function declaration and add surrounding parentheses.

  sql/udf_example.cc
    1.23 06/04/05 11:20:04 msvensson@neptunus.(none) +1 -1
    use "unsigned long" type just as in function declaration and add surrounding parentheses.

ChangeSet
  1.2119.338.2 06/04/05 09:02:36 mats@mysql.com +2 -0
  WL#3206 (Adding unit tests):
  Added missing mytap/t/Makefile.am and minor fix to Makefile.am

  mytap/t/Makefile.am
    1.1 06/04/05 09:02:29 mats@mysql.com +14 -0
    New BitKeeper file ``mytap/t/Makefile.am''

  mytap/t/Makefile.am
    1.0 06/04/05 09:02:29 mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3206-2-mysql-5.1-new/mytap/t/Makefile.am

  Makefile.am
    1.82.1.2 06/04/05 09:02:28 mats@mysql.com +1 -1
    Missing directories 'mytap' and 'unittest' in DIST_SUBDIRS.

ChangeSet
  1.1810.1510.1 06/04/04 17:54:58 jimw@mysql.com +8 -0
  Bug #13601: Wrong int type for bit
    The wrong value was being reported as the field_length for BIT
    fields, resulting in confusion for at least Connector/J. The
    field_length is now always the number of bits in the field, as
    it should be.

  sql/key.cc
    1.34.1.2 06/04/04 17:54:54 jimw@mysql.com +2 -1
    Fix inappropriate use of field->field_length for BIT field.

  sql/ha_ndbcluster.cc
    1.175.27.1 06/04/04 17:54:54 jimw@mysql.com +1 -1
    Handle field_length of Field_bit actually being the display width (# of bits).

  sql/field.h
    1.153.7.1 06/04/04 17:54:54 jimw@mysql.com +6 -8
    Fix Field_bit::field_length to store the correct value, adding
    Field_bit::bytes_in_rec to remember the number of bytes used for
    storing the value. Remove Field_bit_as_char::create_length, as it
    is now redundant.

  sql/field.cc
    1.256.19.1 06/04/04 17:54:54 jimw@mysql.com +24 -29
    Fix Field_bit->field_length to actually report the display width, and
    store the bytes stored in the rec in the new bytes_in_rec member.

  mysql-test/t/type_bit_innodb.test
    1.5 06/04/04 17:54:53 jimw@mysql.com +12 -0
    Add new regression test

  mysql-test/t/type_bit.test
    1.15 06/04/04 17:54:53 jimw@mysql.com +12 -0
    Add new regression test

  mysql-test/r/type_bit_innodb.result
    1.3.1.1 06/04/04 17:54:53 jimw@mysql.com +9 -0
    Add new results

  mysql-test/r/type_bit.result
    1.14.1.2 06/04/04 17:54:53 jimw@mysql.com +9 -0
    Add new results

ChangeSet
  1.1810.1509.1 06/04/04 17:35:07 cmiller@zippy.(none) +3 -0
  Bug#18265: mysql client: No longer right-justifies numeric columns
  
  Also fixes a new bug for which "NULL" wasn't printed (because the 
  data it represents has length zero).  (Discovered my Paul DuBois.)

  mysql-test/t/mysql.test
    1.4.1.4 06/04/04 17:35:03 cmiller@zippy.(none) +6 -0
    Added new test case.

  mysql-test/r/mysql.result
    1.7 06/04/04 17:35:03 cmiller@zippy.(none) +12 -3
    Updated old result and added new case.

  client/mysql.cc
    1.199 06/04/04 17:35:03 cmiller@zippy.(none) +50 -29
    Cleaned up the interactive-session table-printing function.
    
    - No longer rely on the length of the data to pad column boundries.
    - Be smarter about how we detect if the column is NULL.
    - Document how multibyte characters affect the output printing.
    - Use more descriptive variable names.
    
    More importantly, (re-)add these features that were crippled in an
    earlier change:
    - Print "NULL".
    - Right-justify numbers.

ChangeSet
  1.1810.1464.4 06/04/05 01:09:07 aivanov@mysql.com +3 -0
  Fixed BUG#13683: INSERT DELAYED into a view creates an infinite loop.
   The bug was caused by wrong behaviour of mysql_insert() which in case
   of INSERT DELAYED into a view exited with thd->net.report_error == 0.
   This blocked error reporting to the client which started waiting
   infinitely for response to the query.

  sql/sql_insert.cc
    1.146.19.1 06/04/05 01:09:02 aivanov@mysql.com +1 -1
    Fixed BUG#13683: INSERT DELAYED into a view creates an infinite loop.
     Changed mysql_insert(): delayed_get_table() applied to a view exits
     with ER_WRONG_OBJECT error (and with thd->net.report_error == 1) and
     in this case we must just exit from mysql_insert().  Prior to this
     change, instead of exiting open_and_lock_tables() was invoked which
     cleared thd->net.report_error to zero and caused the bug.

  mysql-test/t/insert.test
    1.22 06/04/05 01:09:02 aivanov@mysql.com +12 -0
    Added test case.

  mysql-test/r/insert.result
    1.22.1.1 06/04/05 01:09:02 aivanov@mysql.com +6 -0
    Fixed results for the added test case.

ChangeSet
  1.2119.338.1 06/04/04 18:16:15 mats@mysql.com +17 -0
  WL#3206 (Add unit tests):
  An implementation of the TAP framework for writing unit tests.

  unittest/unit.pl
    1.1 06/04/04 18:16:10 mats@mysql.com +77 -0
    New BitKeeper file ``unittest/unit.pl''

  unittest/mysys/bitmap.t.c
    1.1 06/04/04 18:16:10 mats@mysql.com +374 -0
    New BitKeeper file ``unittest/mysys/bitmap.t.c''

  unittest/mysys/Makefile.am
    1.1 06/04/04 18:16:10 mats@mysql.com +14 -0
    New BitKeeper file ``unittest/mysys/Makefile.am''

  unittest/examples/todo.t.c
    1.1 06/04/04 18:16:10 mats@mysql.com +19 -0
    New BitKeeper file ``unittest/examples/todo.t.c''

  unittest/unit.pl
    1.0 06/04/04 18:16:10 mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3206-mysql-5.1-new/unittest/unit.pl

  unittest/mysys/bitmap.t.c
    1.0 06/04/04 18:16:10 mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3206-mysql-5.1-new/unittest/mysys/bitmap.t.c

  unittest/mysys/Makefile.am
    1.0 06/04/04 18:16:10 mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3206-mysql-5.1-new/unittest/mysys/Makefile.am

  unittest/examples/todo.t.c
    1.0 06/04/04 18:16:10 mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3206-mysql-5.1-new/unittest/examples/todo.t.c

  unittest/examples/skip_all.t.c
    1.1 06/04/04 18:16:09 mats@mysql.com +23 -0
    New BitKeeper file ``unittest/examples/skip_all.t.c''

  unittest/examples/skip.t.c
    1.1 06/04/04 18:16:09 mats@mysql.com +14 -0
    New BitKeeper file ``unittest/examples/skip.t.c''

  unittest/examples/simple.t.c
    1.1 06/04/04 18:16:09 mats@mysql.com +38 -0
    New BitKeeper file ``unittest/examples/simple.t.c''

  unittest/examples/skip_all.t.c
    1.0 06/04/04 18:16:09 mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3206-mysql-5.1-new/unittest/examples/skip_all.t.c

  unittest/examples/skip.t.c
    1.0 06/04/04 18:16:09 mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3206-mysql-5.1-new/unittest/examples/skip.t.c

  unittest/examples/simple.t.c
    1.0 06/04/04 18:16:09 mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3206-mysql-5.1-new/unittest/examples/simple.t.c

  unittest/examples/no_plan.t.c
    1.1 06/04/04 18:16:08 mats@mysql.com +19 -0
    New BitKeeper file ``unittest/examples/no_plan.t.c''

  unittest/examples/Makefile.am
    1.1 06/04/04 18:16:08 mats@mysql.com +20 -0
    New BitKeeper file ``unittest/examples/Makefile.am''

  unittest/Makefile.am
    1.1 06/04/04 18:16:08 mats@mysql.com +1 -0
    New BitKeeper file ``unittest/Makefile.am''

  mytap/tap.h
    1.1 06/04/04 18:16:08 mats@mysql.com +187 -0
    New BitKeeper file ``mytap/tap.h''

  unittest/examples/no_plan.t.c
    1.0 06/04/04 18:16:08 mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3206-mysql-5.1-new/unittest/examples/no_plan.t.c

  unittest/examples/Makefile.am
    1.0 06/04/04 18:16:08 mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3206-mysql-5.1-new/unittest/examples/Makefile.am

  unittest/Makefile.am
    1.0 06/04/04 18:16:08 mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3206-mysql-5.1-new/unittest/Makefile.am

  mytap/tap.h
    1.0 06/04/04 18:16:08 mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3206-mysql-5.1-new/mytap/tap.h

  mytap/tap.c
    1.1 06/04/04 18:16:07 mats@mysql.com +171 -0
    New BitKeeper file ``mytap/tap.c''

  mytap/t/basic.t.c
    1.1 06/04/04 18:16:07 mats@mysql.com +17 -0
    New BitKeeper file ``mytap/t/basic.t.c''

  mytap/Makefile.am
    1.1 06/04/04 18:16:07 mats@mysql.com +10 -0
    New BitKeeper file ``mytap/Makefile.am''

  mytap/tap.c
    1.0 06/04/04 18:16:07 mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3206-mysql-5.1-new/mytap/tap.c

  mytap/t/basic.t.c
    1.0 06/04/04 18:16:07 mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3206-mysql-5.1-new/mytap/t/basic.t.c

  mytap/Makefile.am
    1.0 06/04/04 18:16:07 mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3206-mysql-5.1-new/mytap/Makefile.am

  mytap/Doxyfile
    1.1 06/04/04 18:16:06 mats@mysql.com +1153 -0
    New BitKeeper file ``mytap/Doxyfile''

  mytap/Doxyfile
    1.0 06/04/04 18:16:06 mats@mysql.com +0 -0
    BitKeeper file /home/bk/w3206-mysql-5.1-new/mytap/Doxyfile

  configure.in
    1.333.13.1 06/04/04 18:16:06 mats@mysql.com +3 -0
    Building Makefiles for mytap and unittest directories.

  Makefile.am
    1.82.1.1 06/04/04 18:16:06 mats@mysql.com +1 -1
    Adding directories mytap and unittest

ChangeSet
  1.1616.2520.20 06/04/03 20:43:14 jonas@perch.ndb.mysql.com +1 -0
  ndb -
    fix testprogam if only 1 node group

  ndb/test/ndbapi/testNodeRestart.cpp
    1.8.1.13 06/04/03 20:43:12 jonas@perch.ndb.mysql.com +8 -2
    fix testprogam if only 1 node group

ChangeSet
  1.2119.326.4 06/04/03 12:26:35 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
  Fixes

  sql/sql_table.cc
    1.314 06/04/03 12:26:31 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -6
    Fixes

  sql/sql_partition.cc
    1.62 06/04/03 12:26:30 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -1
    Fixes

  sql/mysql_priv.h
    1.388.1.2 06/04/03 12:26:30 mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Fixes

ChangeSet
  1.2119.330.1 06/04/03 13:25:28 mskold@mysql.com +1 -0
  Fix for bug#18133: Adding index to unsigned int causes on-line add index not to be used

  sql/field.cc
    1.304.2.1 06/04/03 13:25:00 mskold@mysql.com +5 -5
    Fix for bug#18133: Adding index to unsigned int causes on-line add index not to be used

ChangeSet
  1.1616.2520.19 06/04/03 13:12:23 jonas@perch.ndb.mysql.com +1 -0
  ndb -
    Fix compile error...when compiling debug

  ndb/include/kernel/signaldata/FailRep.hpp
    1.1.1.3 06/04/03 13:12:21 jonas@perch.ndb.mysql.com +1 -0
    Fix compile error...when compiling debug

ChangeSet
  1.1616.2520.18 06/04/03 12:09:50 jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#18612 - partitioned startup
    add testprg for SR case aswell

  ndb/test/run-test/daily-basic-tests.txt
    1.13.2.11 06/04/03 12:09:48 jonas@perch.ndb.mysql.com +5 -1
    Test also partitioned start during SR

  ndb/test/ndbapi/testNodeRestart.cpp
    1.8.1.12 06/04/03 12:09:48 jonas@perch.ndb.mysql.com +96 -0
    Test also partitioned start during SR

ChangeSet
  1.1616.2520.17 06/04/03 11:26:29 jonas@perch.ndb.mysql.com +5 -0
  ndb - bug#18612
    post weeked fixes :-)
    change impl. to use READ_NODESREQ to query state of other qmgr(partition)
      this as it has no (current) side effects, so that it's possible only to kill
      starting cluster (if one started and one starting)

  ndb/test/ndbapi/testNodeRestart.cpp
    1.8.1.11 06/04/03 11:26:27 jonas@perch.ndb.mysql.com +2 -2
    Require that only starting cluster dies

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.12.1.8 06/04/03 11:26:27 jonas@perch.ndb.mysql.com +105 -121
    Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)

  ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
    1.3.1.3 06/04/03 11:26:27 jonas@perch.ndb.mysql.com +3 -0
    Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)

  ndb/src/kernel/blocks/qmgr/Qmgr.hpp
    1.2.1.5 06/04/03 11:26:27 jonas@perch.ndb.mysql.com +5 -2
    Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)

  ndb/include/kernel/signaldata/FailRep.hpp
    1.1.1.2 06/04/03 11:26:27 jonas@perch.ndb.mysql.com +9 -2
    Add paritioned FAIL_REP

ChangeSet
  1.2119.250.5 06/04/01 16:37:36 mikron@c-2509e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  More review fixes

  sql/sql_table.cc
    1.312 06/04/01 16:35:15 mikron@c-2509e253.1238-1-64736c10.cust.bredbandsbolaget.se +103 -54
    More review fixes

  sql/sql_partition.cc
    1.60 06/04/01 16:35:14 mikron@c-2509e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -1
    More review fixes

  sql/mysql_priv.h
    1.385.1.3 06/04/01 16:35:14 mikron@c-2509e253.1238-1-64736c10.cust.bredbandsbolaget.se +6 -0
    More review fixes

ChangeSet
  1.1616.2520.16 06/03/31 18:53:07 jonas@perch.ndb.mysql.com +1 -0
  ndb - autotest
    add new testpgrom for bug#18612 to autotest

  ndb/test/run-test/daily-basic-tests.txt
    1.13.2.10 06/03/31 18:53:06 jonas@perch.ndb.mysql.com +5 -1
    Add new testprogram to autotest

ChangeSet
  1.1616.2520.15 06/03/31 16:46:28 jonas@perch.ndb.mysql.com +10 -0
  ndb - bug#18612 (detection of partitioned cluster)
    this also impl. gcp safe multi node shutdown
    1) block gcp
    2) wait for ongoing gcp
    3) inform all stopping QMGR's (so that they don't start with error handler)
    4) wait for all QMGR's to reply
    5) broadcast failrep for stopping nodes
    6) (if !master died) unblock gcp
  
    

  ndb/test/ndbapi/testNodeRestart.cpp
    1.8.1.10 06/03/31 16:46:26 jonas@perch.ndb.mysql.com +111 -1
    test program for bug#18612

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.12.1.7 06/03/31 16:46:26 jonas@perch.ndb.mysql.com +45 -1
    Impl. GCP safe multi node shutdown in order to test bug#18612

  ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
    1.3.1.2 06/03/31 16:46:26 jonas@perch.ndb.mysql.com +2 -0
    Impl. GCP safe multi node shutdown in order to test bug#18612

  ndb/src/kernel/blocks/qmgr/Qmgr.hpp
    1.2.1.4 06/03/31 16:46:26 jonas@perch.ndb.mysql.com +5 -1
    Impl. GCP safe multi node shutdown in order to test bug#18612

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
    1.10.1.6 06/03/31 16:46:26 jonas@perch.ndb.mysql.com +301 -50
    Impl. GCP safe multi node shutdown in order to test bug#18612

  ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
    1.5.3.1 06/03/31 16:46:26 jonas@perch.ndb.mysql.com +1 -0
    Impl. GCP safe multi node shutdown in order to test bug#18612

  ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp
    1.2.3.1 06/03/31 16:46:26 jonas@perch.ndb.mysql.com +11 -0
    Impl. GCP safe multi node shutdown in order to test bug#18612

  ndb/include/kernel/signaldata/StopReq.hpp
    1.1.2.1 06/03/31 16:46:25 jonas@perch.ndb.mysql.com +22 -16
    Impl. GCP safe multi node shutdown in order to test bug#18612

  ndb/include/kernel/signaldata/FailRep.hpp
    1.1.1.1 06/03/31 16:46:25 jonas@perch.ndb.mysql.com +4 -2
    Impl. GCP safe multi node shutdown in order to test bug#18612

  ndb/include/kernel/signaldata/DumpStateOrd.hpp
    1.3.5.1 06/03/31 16:46:25 jonas@perch.ndb.mysql.com +1 -0
    Impl. GCP safe multi node shutdown in order to test bug#18612

ChangeSet
  1.1616.2520.14 06/03/31 16:36:43 jonas@perch.ndb.mysql.com +2 -0
  ndb - add support for blocking/unblocking GCP using WAIT_GCP_REQ

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.14.1.22 06/03/31 16:36:41 jonas@perch.ndb.mysql.com +28 -0
    Add supprt for block/unblocking GCP

  ndb/include/kernel/signaldata/WaitGCP.hpp
    1.1.1.1 06/03/31 16:36:41 jonas@perch.ndb.mysql.com +5 -2
    Add supprt for block/unblocking GCP

ChangeSet
  1.1616.2520.13 06/03/31 11:39:35 jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#16447
    correct return value in check_cm_cmregreq

  ndb/test/src/NdbRestarts.cpp
    1.3.1.3 06/03/31 11:39:34 jonas@perch.ndb.mysql.com +1 -2
    Fix bug in test program

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.12.1.6 06/03/31 11:39:34 jonas@perch.ndb.mysql.com +8 -2
    Fix bug in bug#16447

ChangeSet
  1.2119.315.1 06/03/30 20:55:54 ingo@mysql.com +5 -0
  Bug#18477 - MySQL/InnoDB Ignoring Foreign Keys in ALTER TABLE
  
  InnoDB requires a full table rebuild for foreign key changes.
  It was not possible in compare_tables() to detect such changes.
  
  On Heikkis proposal I added a new flag to the syntax parser
  where foreign key definition changes are done. I test for
  this flag in compare_tables() now.

  sql/sql_yacc.yy
    1.464.1.22 06/03/30 20:55:48 ingo@mysql.com +4 -1
    Bug#18477 - MySQL/InnoDB Ignoring Foreign Keys in ALTER TABLE
    Marked foreign key definitions with the new flag.
    This flag is tested in ALTER TABLE only. It is
    ignored otherwise.

  sql/sql_table.cc
    1.308.1.14 06/03/30 20:55:48 ingo@mysql.com +1 -1
    Bug#18477 - MySQL/InnoDB Ignoring Foreign Keys in ALTER TABLE
    Check for foreign key definition changes in 
    compare_tables(). If present, a table rebuild is required.

  sql/sql_lex.h
    1.225 06/03/30 20:55:48 ingo@mysql.com +1 -0
    Bug#18477 - MySQL/InnoDB Ignoring Foreign Keys in ALTER TABLE
    Added a flag for foreign key definition changes.

  mysql-test/t/innodb.test
    1.132.2.1 06/03/30 20:55:48 ingo@mysql.com +25 -0
    Bug#18477 - MySQL/InnoDB Ignoring Foreign Keys in ALTER TABLE
    Added the new test case.

  mysql-test/r/innodb.result
    1.167 06/03/30 20:55:48 ingo@mysql.com +32 -3
    Bug#18477 - MySQL/InnoDB Ignoring Foreign Keys in ALTER TABLE
    Fixed an old test result.
    Added the new test result.

ChangeSet
  1.1616.2520.12 06/03/30 14:20:54 jonas@perch.ndb.mysql.com +3 -0
  ndb - bug#15695 bug#16447 bug#18612
    For various reasone have a partitioned cluster been created
    This patch makes sure that when they connect
    1) it's detected
    2) shutdown is forced

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.12.1.5 06/03/30 14:20:52 jonas@perch.ndb.mysql.com +251 -30
    1) Activly detect paritioned cluster(s)
    2) add some documentation

  ndb/src/kernel/blocks/qmgr/Qmgr.hpp
    1.2.1.3 06/03/30 14:20:52 jonas@perch.ndb.mysql.com +17 -2
    1) Activly detect paritioned cluster(s)
    2) add some documentation

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
    1.15.1.5 06/03/30 14:20:52 jonas@perch.ndb.mysql.com +53 -13
    New dump/error insert for simulating network failure

ChangeSet
  1.2119.250.4 06/03/24 18:19:13 pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se +10 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  
  Loads of review comments fixed
  inactivate => deactivate
  table log => ddl log
  Commented on Error Inject Module added
  Put various #defines into enums
  Fixed abort_and_upgrade_lock, removed unnecessary parameter
  Fixed mysqlish method intro's
  Fixed warning statements
  5.1.7 was released still with partition states in clear text
  
  Fixed io_size bug
  Fixed bug in open that TRUNCATED before reading :)
  file_entry => file_entry_buf
  Don't open DDL log until first write call to DDL log
  handler_type => handler_name
  no => num
  

  sql/table.cc
    1.209 06/03/24 18:19:08 pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -2
    Loads of review comments fixed
    inactivate => deactivate
    table log => ddl log
    Commented on Error Inject Module added
    Put various #defines into enums
    Fixed abort_and_upgrade_lock, removed unnecessary parameter
    Fixed mysqlish method intro's
    Fixed warning statements
    5.1.7 was released still with partition states in clear text
    
    Fixed io_size bug
    Fixed bug in open that TRUNCATED before reading :)
    file_entry => file_entry_buf
    Don't open DDL log until first write call to DDL log
    handler_type => handler_name
    no => num
    

  sql/sql_table.cc
    1.311 06/03/24 18:19:07 pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se +311 -317
    Loads of review comments fixed
    inactivate => deactivate
    table log => ddl log
    Commented on Error Inject Module added
    Put various #defines into enums
    Fixed abort_and_upgrade_lock, removed unnecessary parameter
    Fixed mysqlish method intro's
    Fixed warning statements
    Fixed io_size bug
    Fixed bug in open that TRUNCATED before reading :)
    file_entry => file_entry_buf
    Don't open DDL log until first write call to DDL log
    handler_type => handler_name
    no => num
    

  sql/sql_partition.cc
    1.59 06/03/24 18:19:07 pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se +225 -271
    Loads of review comments fixed
    inactivate => deactivate
    table log => ddl log
    Commented on Error Inject Module added
    Put various #defines into enums
    Fixed abort_and_upgrade_lock, removed unnecessary parameter
    Fixed mysqlish method intro's
    Fixed warning statements

  sql/sql_base.cc
    1.313 06/03/24 18:19:07 pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -9
    Loads of review comments fixed
    inactivate => deactivate
    table log => ddl log
    Commented on Error Inject Module added
    Put various #defines into enums
    Fixed abort_and_upgrade_lock, removed unnecessary parameter
    

  sql/share/errmsg.txt
    1.89.1.2 06/03/24 18:19:06 pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -2
    Loads of review comments fixed
    inactivate => deactivate
    table log => ddl log
    Commented on Error Inject Module added
    Put various #defines into enums
    Fixed abort_and_upgrade_lock, removed unnecessary parameter
    

  sql/partition_info.h
    1.7 06/03/24 18:19:06 pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -4
    Loads of review comments fixed
    inactivate => deactivate
    table log => ddl log
    Commented on Error Inject Module added
    Put various #defines into enums
    Fixed abort_and_upgrade_lock, removed unnecessary parameter
    

  sql/partition_element.h
    1.6 06/03/24 18:19:06 pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -2
    Loads of review comments fixed
    inactivate => deactivate
    table log => ddl log
    Commented on Error Inject Module added
    Put various #defines into enums
    Fixed abort_and_upgrade_lock, removed unnecessary parameter
    

  sql/mysqld.cc
    1.534.1.6 06/03/24 18:19:06 pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -2
    Loads of review comments fixed
    inactivate => deactivate
    table log => ddl log
    Commented on Error Inject Module added
    Put various #defines into enums
    Fixed abort_and_upgrade_lock, removed unnecessary parameter
    

  sql/mysql_priv.h
    1.385.1.2 06/03/24 18:19:06 pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se +102 -39
    Loads of review comments fixed
    inactivate => deactivate
    table log => ddl log
    Commented on Error Inject Module added
    Put various #defines into enums
    Fixed abort_and_upgrade_lock, removed unnecessary parameter
    

  sql/ha_partition.cc
    1.41 06/03/24 18:19:05 pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se +10 -10
    Loads of review comments fixed
    inactivate => deactivate
    table log => ddl log

ChangeSet
  1.2119.250.3 06/03/22 10:52:12 pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -0
  OPTIMIZE, ANALYZE, CHECK, REPAIR and REBUILD only supported if fast_alter_partition flag set

  sql/sql_partition.cc
    1.58 06/03/22 10:52:07 pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -0
    OPTIMIZE, ANALYZE, CHECK, REPAIR and REBUILD only supported if fast_alter_partition flag set

  sql/handler.h
    1.199 06/03/22 10:52:07 pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    ensure we don't get hanging after calling change_partition

  mysql-test/t/ndb_partition_key.test
    1.9 06/03/22 10:52:07 pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se +19 -0
    New test cases for BUG #16819, 16821, and 16822

  mysql-test/r/ndb_partition_key.result
    1.14 06/03/22 10:52:06 pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se +14 -0
    New test cases for BUG #16819, 16821, and 16822

ChangeSet
  1.2119.250.2 06/03/22 00:17:22 pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
  manual merge

  sql/sql_partition.cc
    1.57 06/03/22 00:17:17 pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -2
    manual merge

  sql/partition_info.h
    1.6 06/03/22 00:17:17 pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se +7 -2
    manual merge

  sql/partition_element.h
    1.5 06/03/22 00:17:17 pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -1
    manual merge

ChangeSet
  1.2119.237.1 06/03/18 17:56:24 holyfoot@deer.(none) +6 -0
  bug #18115 (mysql_upgrade missing in Windows binary)

  client/mysql_upgrade.c
    1.1 06/03/18 17:54:41 holyfoot@mysql.com +208 -0

  client/mysql_upgrade.c
    1.0 06/03/18 17:54:41 holyfoot@mysql.com +0 -0
    BitKeeper file /home/hf/work/mysql-5.1.upgrd/client/mysql_upgrade.c

  VC++Files/client/mysql_upgrade_ia64.dsp
    1.1 06/03/18 17:54:40 holyfoot@mysql.com +77 -0

  VC++Files/client/mysql_upgrade.dsp
    1.1 06/03/18 17:54:40 holyfoot@mysql.com +71 -0

  client/Makefile.am
    1.66 06/03/18 17:54:40 holyfoot@mysql.com +5 -2
    mysql_upgrade programm added

  VC++Files/mysql_ia64.dsw
    1.6 06/03/18 17:54:40 holyfoot@mysql.com +20 -0
    mysql_upgrade project added

  VC++Files/mysql.dsw
    1.28 06/03/18 17:54:40 holyfoot@mysql.com +25 -0
    mysql_upgrade project added

  VC++Files/client/mysql_upgrade_ia64.dsp
    1.0 06/03/18 17:54:40 holyfoot@mysql.com +0 -0
    BitKeeper file /home/hf/work/mysql-5.1.upgrd/VC++Files/client/mysql_upgrade_ia64.dsp

  VC++Files/client/mysql_upgrade.dsp
    1.0 06/03/18 17:54:40 holyfoot@mysql.com +0 -0
    BitKeeper file /home/hf/work/mysql-5.1.upgrd/VC++Files/client/mysql_upgrade.dsp

ChangeSet
  1.1810.1349.47 06/03/14 02:04:43 jimw@mysql.com +4 -0
  Bug #17043: Casting trimmed string to decimal loses precision
    Results of string functions were being converted to decimals by first
    being converted to integers, resulting in a loss of precision.

  sql/item_strfunc.h
    1.101.1.4 06/03/14 02:03:38 jimw@mysql.com +1 -0
    Add Item_str_func::val_decimal()

  sql/item_strfunc.cc
    1.261.1.3 06/03/14 02:03:12 jimw@mysql.com +14 -0
    Convert string function results to decimal using string-to-decimal conversion

  mysql-test/t/func_str.test
    1.85 06/03/14 02:02:56 jimw@mysql.com +8 -1
    Add new regression test

  mysql-test/r/func_str.result
    1.110.1.1 06/03/14 02:02:51 jimw@mysql.com +10 -0
    Add new results

ChangeSet
  1.1810.1452.1 06/03/10 16:41:14 msvensson@neptunus.(none) +9 -0
  Cleanup SSL implementation
  Remove duplicate code
  Merge common functions
  Enforce MySQL coding standard

  vio/viosslfactories.c
    1.21 06/03/10 16:41:10 msvensson@neptunus.(none) +130 -173
    Cleanup SSL implementation

  vio/viossl.c
    1.31 06/03/10 16:41:10 msvensson@neptunus.(none) +91 -247
    Cleanup SSL implementation

  vio/vio_priv.h
    1.6 06/03/10 16:41:10 msvensson@neptunus.(none) +1 -19
    Cleanup SSL implementation

  vio/vio.c
    1.27 06/03/10 16:41:10 msvensson@neptunus.(none) +8 -8
    Cleanup SSL implementation

  sql/sql_acl.cc
    1.128.22.1 06/03/10 16:41:10 msvensson@neptunus.(none) +2 -2
    Cleanup SSL implementation

  sql/mysqld.cc
    1.439.48.1 06/03/10 16:41:10 msvensson@neptunus.(none) +5 -2
    Cleanup SSL implementation

  sql/mysql_priv.h
    1.290.41.1 06/03/10 16:41:10 msvensson@neptunus.(none) +1 -1
    Cleanup SSL implementation

  sql-common/client.c
    1.83.1.2 06/03/10 16:41:09 msvensson@neptunus.(none) +89 -17
    Cleanup SSL implementation

  include/violite.h
    1.45 06/03/10 16:41:09 msvensson@neptunus.(none) +5 -16
    Cleanup SSL implementation

ChangeSet
  1.2119.154.1 06/03/07 12:42:23 jimw@mysql.com +3 -0
  Bug #17139: Partitions: unprivileged user can effectively drop table
  
  Now the DROP privilege is also required on a table in order to be able
  to drop a partition from the table using ALTER TABLE.

  mysql-test/t/partition_grant.test
    1.1 06/03/07 12:42:20 jimw@mysql.com +51 -0
    New BitKeeper file ``mysql-test/t/partition_grant.test''

  mysql-test/t/partition_grant.test
    1.0 06/03/07 12:42:20 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-5.1-17139/mysql-test/t/partition_grant.test

  mysql-test/r/partition_grant.result
    1.1 06/03/07 12:42:19 jimw@mysql.com +23 -0
    New BitKeeper file ``mysql-test/r/partition_grant.result''

  sql/sql_parse.cc
    1.523.1.4 06/03/07 12:42:19 jimw@mysql.com +7 -2
    Require DROP privilege in addition to ALTER for dropping a partition

  mysql-test/r/partition_grant.result
    1.0 06/03/07 12:42:19 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-5.1-17139/mysql-test/r/partition_grant.result

ChangeSet
  1.1616.2513.1 06/03/06 16:38:35 ramil@mysql.com +3 -0
  Fix for bug #17896: MIN of CASE WHEN returns non-minimum value!

  sql/item_cmpfunc.cc
    1.111.23.3 06/03/06 16:38:28 ramil@mysql.com +15 -4
    Fix for bug #17896: MIN of CASE WHEN returns non-minimum value!
    - NULL items should not affect the result type.

  mysql-test/t/case.test
    1.14.1.3 06/03/06 16:38:28 ramil@mysql.com +11 -0
    Fix for bug #17896: MIN of CASE WHEN returns non-minimum value!

  mysql-test/r/case.result
    1.14.1.3 06/03/06 16:38:28 ramil@mysql.com +8 -0
    Fix for bug #17896: MIN of CASE WHEN returns non-minimum value!

ChangeSet
  1.2119.73.2 06/03/01 11:48:33 mats@mysql.com +1 -0
  Removing unnecessary assertion.

  sql/sql_base.cc
    1.303.3.2 06/03/01 11:48:27 mats@mysql.com +0 -2
    Removing unnecessary assertion.

ChangeSet
  1.2119.30.3 06/02/21 07:49:25 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  Final fixes

  sql/mysql_priv.h
    1.378.2.3 06/02/21 07:49:20 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Removed error_inject_code variable

  dbug/dbug_long.h
    1.5 06/02/21 07:49:20 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +0 -13
    Removed patch from dbug_long.h (file not in use anymore)

ChangeSet
  1.2119.30.2 06/02/20 21:50:44 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  Merged error injects with dbug push

  sql/mysql_priv.h
    1.378.2.2 06/02/20 21:50:40 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +6 -3
    Merged error injects with dbug push

ChangeSet
  1.2065.71.35 06/02/20 16:22:19 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  Bug fixes

  sql/sql_table.cc
    1.299.1.21 06/02/20 16:22:15 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -1
    Bug fixes

  sql/sql_partition.cc
    1.28.1.26 06/02/20 16:22:15 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -3
    Bug fixes

  sql/ha_partition.cc
    1.25.1.9 06/02/20 16:22:15 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +7 -7
    Bug fixes

ChangeSet
  1.2065.71.34 06/02/20 15:07:03 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  Fix compiler issues

  sql/sql_table.cc
    1.299.1.20 06/02/20 15:06:58 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +31 -17
    Fix compiler issues

  sql/sql_partition.cc
    1.28.1.25 06/02/20 15:06:58 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +41 -26
    Fix compiler issues

  sql/log.cc
    1.188.4.1 06/02/20 15:06:58 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -1
    Fix compiler warnings

  sql/ha_myisammrg.cc
    1.78.1.1 06/02/20 15:06:58 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -1
    Fix compiler warnings

  sql/ha_heap.cc
    1.79.1.1 06/02/20 15:06:57 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -1
    Fix compiler warnings

ChangeSet
  1.1810.1324.4 06/02/20 18:04:50 ingo@mysql.com +1 -0
  BUG#5390 - problems with merge tables
  Fix for merge from 4.1.

  sql/lock.cc
    1.64.1.21 06/02/20 18:04:45 ingo@mysql.com +0 -2
    BUG#5390 - problems with merge tables
    Fix for merge from 4.1.

ChangeSet
  1.1810.1324.2 06/02/20 15:23:57 ingo@mysql.com +2 -0
  BUG#5390 - problems with merge tables 
  Merge from 4.1

  sql/table.h
    1.102.1.23 06/02/20 15:23:52 ingo@mysql.com +6 -11
    BUG#5390 - problems with merge tables 
    Merge from 4.1

  sql/lock.cc
    1.64.1.19 06/02/20 15:23:52 ingo@mysql.com +64 -83
    BUG#5390 - problems with merge tables 
    Merge from 4.1

ChangeSet
  1.1346.1.827 06/02/20 12:28:07 ingo@mysql.com +1 -0
  BUG#5390 - problems with merge tables
  This fix is necessary because thr_multi_lock()
  reorderes the lock data references array.

  sql/lock.cc
    1.38.1.19 06/02/20 12:28:05 ingo@mysql.com +16 -4
    BUG#5390 - problems with merge tables
    This fix is necessary because thr_multi_lock()
    reorderes the lock data references array.

ChangeSet
  1.2065.71.33 06/02/15 14:05:15 mikron@mikael-ronstr-ms-dator.local +1 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  Final part of the error handling of ALTER TABLE for partitioning

  sql/sql_partition.cc
    1.28.1.24 06/02/15 14:05:02 mikron@mikael-ronstr-ms-dator.local +34 -14
    Final part of the error handling of ALTER TABLE for partitioning

ChangeSet
  1.2065.71.32 06/02/15 11:08:08 mikron@c-6b09e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  Started writing detailed error handler of
  ALTER TABLE for partitioning.
  Philosophical issue, should one always attempt to make recovery
  automatic or should one rely on manual means also.

  sql/sql_partition.cc
    1.28.1.23 06/02/15 11:07:54 mikron@c-6b09e253.1238-1-64736c10.cust.bredbandsbolaget.se +118 -57
    Started writing detailed error handler of
    ALTER TABLE for partitioning.
    Philosophical issue, should one always attempt to make recovery
    automatic or should one rely on manual means also.

  sql/sql_base.cc
    1.298.2.1 06/02/15 11:07:53 mikron@c-6b09e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -2
    Flag to ensure we can't be killed in a very critical spot

  sql/mysql_priv.h
    1.374.1.19 06/02/15 11:07:53 mikron@c-6b09e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -1
    Flag to ensure we can't be killed in a very critical spot

ChangeSet
  1.2065.71.31 06/02/14 17:03:47 mikron@c-ba0ae253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  Some more error handling

  sql/sql_partition.cc
    1.28.1.22 06/02/14 17:03:35 mikron@c-ba0ae253.1238-1-64736c10.cust.bredbandsbolaget.se +47 -27
    Some more error handling

ChangeSet
  1.2065.71.30 06/02/14 14:22:21 mikron@mikael-ronstr-ms-dator.local +3 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  First step for handling errors in ALTER TABLE for partitioning

  sql/sql_table.cc
    1.299.1.19 06/02/14 14:22:06 mikron@mikael-ronstr-ms-dator.local +28 -16
    First step for handling errors in ALTER TABLE for partitioning

  sql/sql_partition.cc
    1.28.1.21 06/02/14 14:22:06 mikron@mikael-ronstr-ms-dator.local +44 -7
    First step for handling errors in ALTER TABLE for partitioning

  sql/ha_partition.cc
    1.25.1.8 06/02/14 14:22:06 mikron@mikael-ronstr-ms-dator.local +26 -16
    First step for handling errors in ALTER TABLE for partitioning

ChangeSet
  1.2065.71.29 06/02/14 11:08:58 mikron@mikael-ronstr-ms-dator.local +3 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  Added action code for recovery

  sql/sql_table.cc
    1.299.1.18 06/02/14 11:08:45 mikron@mikael-ronstr-ms-dator.local +97 -2
    Added action code for recovery

  sql/sql_partition.cc
    1.28.1.20 06/02/14 11:08:45 mikron@mikael-ronstr-ms-dator.local +6 -6
    Some renames to replace

  sql/mysql_priv.h
    1.374.1.18 06/02/14 11:08:44 mikron@mikael-ronstr-ms-dator.local +1 -0
    Added entry in table log struct

ChangeSet
  1.2065.71.28 06/02/13 13:52:23 mikron@mikael-ronstr-ms-dator.local +3 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  Introduce log entry to handle replace of frm file

  sql/sql_table.cc
    1.299.1.17 06/02/13 13:52:10 mikron@mikael-ronstr-ms-dator.local +5 -0
    Introduce log entry to handle replace of frm file

  sql/sql_partition.cc
    1.28.1.19 06/02/13 13:52:10 mikron@mikael-ronstr-ms-dator.local +14 -8
    Introduce log entry to handle replace of frm file

  sql/handler.h
    1.183.1.6 06/02/13 13:52:10 mikron@mikael-ronstr-ms-dator.local +2 -1
    Introduce log entry to handle replace of frm file

ChangeSet
  1.2065.71.27 06/02/11 00:41:52 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -0
  Compile fixes

  sql/sql_table.cc
    1.299.1.16 06/02/11 00:41:38 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -4
    Compile fixes

  sql/sql_partition.cc
    1.28.1.18 06/02/11 00:41:37 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +9 -9
    Compile fixes

  sql/mysql_priv.h
    1.374.1.17 06/02/11 00:41:37 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    Compile fixes

  sql/handler.h
    1.183.1.5 06/02/11 00:41:35 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -2
    Compile fixes

  sql/ha_partition.cc
    1.25.1.7 06/02/11 00:41:31 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +8 -7
    Compile fixes

ChangeSet
  1.2065.71.26 06/02/10 22:36:01 mikron@c-370be253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  Make lots of fixes to handle the most complex case of reorganising
  of partitions where two-phased processes are needed in some cases.

  sql/sql_table.cc
    1.299.1.15 06/02/10 22:35:48 mikron@c-370be253.1238-1-64736c10.cust.bredbandsbolaget.se +146 -68
    More constants with somewhat descriptive names
    Moved around some methods between internal part and external part
    Added new method to handle inactivation of log entries

  sql/sql_partition.cc
    1.28.1.17 06/02/10 22:35:48 mikron@c-370be253.1238-1-64736c10.cust.bredbandsbolaget.se +97 -6
    Fix change of partitions

  sql/mysql_priv.h
    1.374.1.16 06/02/10 22:35:47 mikron@c-370be253.1238-1-64736c10.cust.bredbandsbolaget.se +13 -0
    Converted 'd', 'e' and so forth to constants with somewhat more
    descriptive names
    Added method to inactivate log entries

  sql/handler.h
    1.183.1.4 06/02/10 22:35:47 mikron@c-370be253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -1
    Added new entry to partition_element to keep track of log entry for
    a partition during ALTER TABLE that reorganises existing partitions.

  sql/ha_partition.cc
    1.25.1.6 06/02/10 22:35:47 mikron@c-370be253.1238-1-64736c10.cust.bredbandsbolaget.se +68 -64
    Rewrote the rename partitions and drop partitions to align with how
    the table log handles things.

ChangeSet
  1.2065.71.25 06/02/10 13:33:08 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  Don't use free'd memory, bad idea
  Free all memory with mutex and destroy mutex as final step

  sql/sql_table.cc
    1.299.1.14 06/02/10 13:32:34 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +7 -5
    Don't use free'd memory, bad idea
    Free all memory with mutex and destroy mutex as final step

ChangeSet
  1.2065.71.24 06/02/10 12:30:51 mikron@c-370be253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  New function to set exec_log_entry
  Moving code outside lock of table log
  Fixing some initialisations of list reference to avoid
  releasing wrong parts

  sql/sql_table.cc
    1.299.1.13 06/02/10 12:30:37 mikron@c-370be253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Initialisation of write_header needed

  sql/sql_partition.cc
    1.28.1.16 06/02/10 12:30:37 mikron@c-370be253.1238-1-64736c10.cust.bredbandsbolaget.se +46 -25
    New function to set exec_log_entry
    Moving code outside lock of table log
    Fixing some initialisations of list reference to avoid
    releasing wrong parts

ChangeSet
  1.2065.71.23 06/02/09 23:57:54 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  Bug fixes + debug stuff

  sql/sql_table.cc
    1.299.1.12 06/02/09 23:57:49 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +10 -5
    Bug fixes + debug stuff

  sql/sql_partition.cc
    1.28.1.15 06/02/09 23:57:49 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +8 -4
    Bug fixes + debug stuff

ChangeSet
  1.2065.118.1 06/02/09 21:23:45 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  Bug fixes

  sql/sql_partition.cc
    1.28.2.1 06/02/09 21:23:41 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +37 -14
    Bug fixes

ChangeSet
  1.2065.71.21 06/02/09 20:25:10 mikron@c-d10be253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  Error handling
  Crash if any error after reaching beyond certain point in
  ALTER TABLE processing

  sql/sql_partition.cc
    1.28.1.13 06/02/09 20:24:58 mikron@c-d10be253.1238-1-64736c10.cust.bredbandsbolaget.se +19 -8
    Error handling
    Crash if any error after reaching beyond certain point in
    ALTER TABLE processing

  sql/ha_partition.cc
    1.25.1.5 06/02/09 20:24:58 mikron@c-d10be253.1238-1-64736c10.cust.bredbandsbolaget.se +15 -15
    Error handling
    Crash if any error after reaching beyond certain point in
    ALTER TABLE processing

ChangeSet
  1.2065.71.20 06/02/09 19:03:04 mikron@c-d10be253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  More work on table logging of ALTER TABLE for partitioning

ChangeSet
  1.2065.71.19 06/02/09 15:39:15 mikron@mikael-ronstr-ms-dator.local +3 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  A little more complete handling

ChangeSet
  1.2065.71.18 06/02/09 14:20:20 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  More fixes

  sql/sql_partition.cc
    1.28.1.12 06/02/09 19:02:51 mikron@c-d10be253.1238-1-64736c10.cust.bredbandsbolaget.se +229 -125
    More work on table logging of ALTER TABLE for partitioning

  sql/sql_partition.cc
    1.28.1.11 06/02/09 15:39:03 mikron@mikael-ronstr-ms-dator.local +20 -5
    A little more complete handling

  sql/sql_partition.cc
    1.28.1.10 06/02/09 14:20:15 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -2
    More fixes

ChangeSet
  1.2065.71.17 06/02/09 14:13:22 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  A number of fixes

  sql/mysql_priv.h
    1.374.1.15 06/02/09 19:02:51 mikron@c-d10be253.1238-1-64736c10.cust.bredbandsbolaget.se +0 -6
    More work on table logging of ALTER TABLE for partitioning

  sql/sql_table.cc
    1.299.1.11 06/02/09 15:39:03 mikron@mikael-ronstr-ms-dator.local +10 -2
    A little more complete handling

  sql/mysql_priv.h
    1.374.1.14 06/02/09 15:39:02 mikron@mikael-ronstr-ms-dator.local +1 -0
    Complete flag

  sql/sql_table.cc
    1.299.1.10 06/02/09 14:13:17 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +9 -5
    A numbre of fixes

  sql/sql_partition.cc
    1.28.1.9 06/02/09 14:13:17 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +19 -14
    A numbre of fixes

  sql/share/errmsg.txt
    1.74.5.1 06/02/09 14:13:17 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
    A numbre of fixes

  sql/mysql_priv.h
    1.374.1.13 06/02/09 14:13:17 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    A numbre of fixes

  sql/handler.h
    1.183.1.3 06/02/09 14:13:16 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -3
    A numbre of fixes

ChangeSet
  1.2065.115.1 06/02/09 11:05:05 mikron@c-e90be253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -0
  WL 2826: Error handling for ALTER TABLE for partitioning
  Step 14: First version of table log for add/Drop partition

  sql/sql_table.cc
    1.299.2.1 06/02/09 11:04:15 mikron@c-e90be253.1238-1-64736c10.cust.bredbandsbolaget.se +10 -1
    Add IO_SIZE to table log header

  sql/sql_partition.cc
    1.28.1.8 06/02/09 11:04:15 mikron@c-e90be253.1238-1-64736c10.cust.bredbandsbolaget.se +296 -2
    Moved create partition name code to sql_partition.cc
    First version of table log for add/drop partition

  sql/mysql_priv.h
    1.374.1.12 06/02/09 11:04:15 mikron@c-e90be253.1238-1-64736c10.cust.bredbandsbolaget.se +10 -0
    Moved create partition name code to sql_partition.cc

  sql/handler.h
    1.183.1.2 06/02/09 11:04:14 mikron@c-e90be253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -1
    Added entries in partition_info to keep track of table log entries

  sql/ha_partition.cc
    1.25.1.4 06/02/09 11:04:14 mikron@c-e90be253.1238-1-64736c10.cust.bredbandsbolaget.se +0 -82
    Moved create partition name code to sql_partition.cc

ChangeSet
  1.2065.71.15 06/02/08 20:26:56 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  Close down table log also at exit of main thread

  sql/sql_table.cc
    1.299.1.8 06/02/08 20:26:51 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    Close down table log also at exit of main thread

  sql/mysqld.cc
    1.524.1.8 06/02/08 20:26:51 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    Close down table log also at exit of main thread

ChangeSet
  1.2065.71.14 06/02/08 18:04:58 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
  WL 2826: Error handling for ALTER TABLE for partitioning Step 13
  Lots of compilation fixes

  sql/sql_table.cc
    1.299.1.7 06/02/08 18:04:54 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +59 -44
    Lots of compilation fixes

  sql/sql_partition.cc
    1.28.1.7 06/02/08 18:04:53 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +28 -28
    Lots of compilation fixes

  sql/mysql_priv.h
    1.374.1.11 06/02/08 18:04:53 pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -4
    Lots of compilation fixes

ChangeSet
  1.2065.71.13 06/02/08 15:14:15 mikron@c-9b0be253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
  WL 2826: Error handling for ALTER TABLE for partitioning
  Most of the code for handling the table log is in place now, except
  the action part at recovery and proper error handling in some places.

  sql/sql_table.cc
    1.299.1.6 06/02/08 15:14:02 mikron@c-9b0be253.1238-1-64736c10.cust.bredbandsbolaget.se +332 -151
    Most of the code for handling the table log is in place now, except
    the action part at recovery and proper error handling in some places.

  sql/mysqld.cc
    1.524.1.7 06/02/08 15:14:02 mikron@c-9b0be253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Added call to execute table log recovery

  sql/mysql_priv.h
    1.374.1.10 06/02/08 15:14:01 mikron@c-9b0be253.1238-1-64736c10.cust.bredbandsbolaget.se +11 -8
    Removed internal methods from external table log interface
    Added and changed interface

ChangeSet
  1.2065.71.12 06/02/07 16:26:34 mikron@mikael-ronstr-ms-dator.local +2 -0
  WL 2826: Step 12
  More table log code

  sql/sql_table.cc
    1.299.1.5 06/02/07 16:26:23 mikron@mikael-ronstr-ms-dator.local +112 -9
    New table log code

  sql/mysql_priv.h
    1.374.1.9 06/02/07 16:26:23 mikron@mikael-ronstr-ms-dator.local +1 -0
    Added new call

ChangeSet
  1.2065.71.11 06/02/07 10:45:07 mikron@c-fa09e253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -0
  WL 2826: Step 11
  Lots of new code for table log

  sql/sql_table.cc
    1.299.1.4 06/02/07 10:44:55 mikron@c-fa09e253.1238-1-64736c10.cust.bredbandsbolaget.se +226 -1
    Lots of new code for table log

  sql/sql_partition.cc
    1.28.1.6 06/02/07 10:44:55 mikron@c-fa09e253.1238-1-64736c10.cust.bredbandsbolaget.se +18 -0
    lock/unlock global table log mutex

  sql/mysql_priv.h
    1.374.1.8 06/02/07 10:44:55 mikron@c-fa09e253.1238-1-64736c10.cust.bredbandsbolaget.se +7 -0
    More structs and methods for table log

  include/my_sys.h
    1.188 06/02/07 10:44:54 mikron@c-fa09e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Spell error

ChangeSet
  1.2065.71.10 06/02/06 21:47:03 mikron@c-9c0ae253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  WL 2826: Step 10
  New methods to read/write/initialise table log

  sql/sql_table.cc
    1.299.1.3 06/02/06 21:46:52 mikron@c-9c0ae253.1238-1-64736c10.cust.bredbandsbolaget.se +115 -5
    New methods to read/write/initialise table log

  sql/mysql_priv.h
    1.374.1.7 06/02/06 21:46:51 mikron@c-9c0ae253.1238-1-64736c10.cust.bredbandsbolaget.se +18 -1
    New methods to read/write/initialise table log

ChangeSet
  1.2065.71.9 06/02/04 13:03:35 mikron@c-3009e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  WL 2826: Nineth step
  Updated error inject scripts

  sql/mysql_priv.h
    1.374.1.6 06/02/04 13:03:20 mikron@c-3009e253.1238-1-64736c10.cust.bredbandsbolaget.se +14 -2
    Updated error inject scripts

  dbug/dbug_long.h
    1.4 06/02/04 13:03:20 mikron@c-3009e253.1238-1-64736c10.cust.bredbandsbolaget.se +13 -0
    Updated scripts in dub_long.h as well

ChangeSet
  1.2065.71.8 06/02/03 16:53:35 mikron@c-130be253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
  WL 2826: Eigth step
  Inserted monty patch to allow for adding and dropping
  DBUG keywords per thread

ChangeSet
  1.2065.71.7 06/02/03 16:41:26 mikron@c-130be253.1238-1-64736c10.cust.bredbandsbolaget.se +6 -0
  WL 2826: Seventh step, more fixes for error injects
  Removed session variables for error injects
  started using DBUG macros for error injects

ChangeSet
  1.2065.71.6 06/02/03 12:05:29 pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +9 -0
  WL #2826: Sixth step, made it work with test cases

  sql/set_var.cc
    1.161.1.3 06/02/03 16:41:14 mikron@c-130be253.1238-1-64736c10.cust.bredbandsbolaget.se +0 -11
    Removed session variables for error injects

  sql/table.cc
    1.206 06/02/03 12:05:24 pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -0
    fix

  sql/sql_table.cc
    1.299.1.2 06/02/03 12:05:24 pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -3
    Fix a few bugs

  sql/sql_partition.cc
    1.28.1.5 06/02/03 12:05:24 pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +46 -25
    Fixing a bug with generate partition syntax
    A number of fixes

  sql/set_var.cc
    1.161.1.2 06/02/03 12:05:24 pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -1
    Some error inject fixes

  sql/mysqld.cc
    1.524.1.6 06/02/03 16:41:14 mikron@c-130be253.1238-1-64736c10.cust.bredbandsbolaget.se +0 -10
    Removed session variables for error injects

  sql/mysql_priv.h
    1.374.1.5 06/02/03 16:41:13 mikron@c-130be253.1238-1-64736c10.cust.bredbandsbolaget.se +20 -11
    Changed ERROR INJECT macros to use DBUG macros

  sql/mysqld.cc
    1.524.1.5 06/02/03 12:05:23 pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -0
    Some error inject fixes

  sql/mysql_priv.h
    1.374.1.4 06/02/03 12:05:23 pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +12 -9
    Some error inject fixes

  sql/ha_partition.cc
    1.25.1.3 06/02/03 12:05:23 pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -4
    Need to handle states differently when creating handler files

  BUILD/compile-pentium-debug-max
    1.19 06/02/03 12:05:23 pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -2
    Fixed BUILD scripts

  BUILD/SETUP.sh
    1.55 06/02/03 12:05:23 pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Fixed BUILD scripts

  include/my_dbug.h
    1.18 06/02/03 16:53:22 mikron@c-130be253.1238-1-64736c10.cust.bredbandsbolaget.se +7 -1
    Inserted monty patch to allow for adding and dropping
    DBUG keywords per thread

  dbug/dbug.c
    1.22 06/02/03 16:53:22 mikron@c-130be253.1238-1-64736c10.cust.bredbandsbolaget.se +82 -5
    Inserted monty patch to allow for adding and dropping
    DBUG keywords per thread

  sql/sql_class.h
    1.285 06/02/03 16:41:15 mikron@c-130be253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -4
    Removed session variables for error injects

  sql/sql_class.cc
    1.241.1.1 06/02/03 16:41:14 mikron@c-130be253.1238-1-64736c10.cust.bredbandsbolaget.se +3 -0
    Removed session variables for error injects

  include/my_dbug.h
    1.17 06/02/03 16:41:13 mikron@c-130be253.1238-1-64736c10.cust.bredbandsbolaget.se +6 -0
    Added new DBUG macros

ChangeSet
  1.2065.71.5 06/02/01 21:38:35 mikron@c-8108e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
  WL 2826: Fifth step
  Removed partition state from parser

  sql/sql_yacc.yy
    1.447.1.1 06/02/01 21:38:18 mikron@c-8108e253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -66
    Removed partition state from parser

ChangeSet
  1.2065.71.4 06/02/01 17:05:22 mikron@mikael-ronstr-ms-dator.local +2 -0
  WL 2826: Fourth step
  Remove partition state from frm file
  Ensure we can still load tables created in 5.1.6 for the time
  being

  sql/unireg.cc
    1.76 06/02/01 17:05:10 mikron@mikael-ronstr-ms-dator.local +0 -7
    Remove partition state from frm file
    Ensure we can still load tables created in 5.1.6 for the time
    being

  sql/table.cc
    1.205 06/02/01 17:05:10 mikron@mikael-ronstr-ms-dator.local +6 -29
    Remove partition state from frm file
    Ensure we can still load tables created in 5.1.6 for the time
    being

ChangeSet
  1.2065.71.3 06/02/01 16:38:08 mikron@mikael-ronstr-ms-dator.local +2 -0
  WL 2826: A third step, fixing generate_partition_syntax

  sql/sql_partition.cc
    1.28.1.4 06/02/01 16:37:57 mikron@mikael-ronstr-ms-dator.local +5 -81
    Fix generate_partition_syntax to handle shadow variant of frm file

  sql/mysql_priv.h
    1.374.1.3 06/02/01 16:37:57 mikron@mikael-ronstr-ms-dator.local +15 -0
    Make it possible to set injector code and value
    Declare header part of a set of new functions

ChangeSet
  1.2065.71.2 06/02/01 14:00:00 mikron@mikael-ronstr-ms-dator.local +2 -0
  WL 2826: Another step

  sql/sql_partition.cc
    1.28.1.3 06/02/01 13:59:46 mikron@mikael-ronstr-ms-dator.local +154 -9
    New entries for new functions

  sql/mysql_priv.h
    1.374.1.2 06/02/01 13:59:46 mikron@mikael-ronstr-ms-dator.local +7 -1
    Set error_inject_code to zero after firing error injection

ChangeSet
  1.2065.71.1 06/02/01 10:06:07 mikron@c-4d08e253.1238-1-64736c10.cust.bredbandsbolaget.se +15 -0
  WL 2826: First step in error handling of ALTER TABLE for partitioning

  sql/sql_partition.cc
    1.28.1.2 06/02/01 09:27:49 mikron@c-4d08e253.1238-1-64736c10.cust.bredbandsbolaget.se +70 -40
    Changes to ADD/DROP/CHANGE partitions

  sql/unireg.cc
    1.75 06/01/31 20:14:49 mikron@c-1909e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Add rename flag to handler file call

  sql/sql_table.cc
    1.299.1.1 06/01/31 20:14:49 mikron@c-1909e253.1238-1-64736c10.cust.bredbandsbolaget.se +98 -73
    Start modifying code for introducing table log, Step 1

  sql/sql_partition.cc
    1.28.1.1 06/01/31 20:14:49 mikron@c-1909e253.1238-1-64736c10.cust.bredbandsbolaget.se +50 -25
    Start modifying code for introducing table log, Step 1

  sql/sql_class.h
    1.284 06/01/31 20:14:49 mikron@c-1909e253.1238-1-64736c10.cust.bredbandsbolaget.se +4 -0
    Add error inject system variables

  sql/set_var.cc
    1.161.1.1 06/01/31 20:14:48 mikron@c-1909e253.1238-1-64736c10.cust.bredbandsbolaget.se +10 -0
    Add error inject system variables

  sql/mysqld.cc
    1.524.1.4 06/01/31 20:14:47 mikron@c-1909e253.1238-1-64736c10.cust.bredbandsbolaget.se +6 -0
    Add error inject system variables

  sql/mysql_priv.h
    1.374.1.1 06/01/31 20:14:47 mikron@c-1909e253.1238-1-64736c10.cust.bredbandsbolaget.se +27 -3
    Add error inject macros

  sql/handler.h
    1.183.1.1 06/01/31 20:14:47 mikron@c-1909e253.1238-1-64736c10.cust.bredbandsbolaget.se +5 -1
    Add possibility to rename handler file

  sql/ha_partition.h
    1.12 06/01/31 20:14:47 mikron@c-1909e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -1
    Add possibility to rename handler file

  sql/ha_partition.cc
    1.25.1.2 06/01/31 20:14:47 mikron@c-1909e253.1238-1-64736c10.cust.bredbandsbolaget.se +23 -4
    Add possibility to rename handler file

  sql/ha_ndbcluster.h
    1.111.2.1 06/01/31 20:14:47 mikron@c-1909e253.1238-1-64736c10.cust.bredbandsbolaget.se +2 -1
    Add possibility to rename handler file

  sql/ha_ndbcluster.cc
    1.244.3.1 06/01/31 20:14:46 mikron@c-1909e253.1238-1-64736c10.cust.bredbandsbolaget.se +7 -1
    Add possibility to rename handler file

  configure.in
    1.334 06/01/31 20:14:46 mikron@c-1909e253.1238-1-64736c10.cust.bredbandsbolaget.se +13 -0
    Add handling of --with-error-inject in configure script

  BUILD/compile-pentium-debug-max
    1.18 06/01/31 20:14:46 mikron@c-1909e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -1
    Add error inject flag to this script

  BUILD/SETUP.sh
    1.54 06/01/31 20:14:46 mikron@c-1909e253.1238-1-64736c10.cust.bredbandsbolaget.se +1 -0
    Add possibility for BUILD scripts to add error inject flag

ChangeSet
  1.1616.2490.1 06/01/27 13:38:15 kent@mysql.com +1 -0
  disabled.def:
    Enabled rpl_* tests now when bug fixed

  mysql-test/t/disabled.def
    1.1.2.1 06/01/27 13:37:51 kent@mysql.com +0 -3
    Enabled rpl_* tests now when bug fixed

ChangeSet
  1.1346.1.826 06/01/23 19:12:29 ingo@mysql.com +4 -0
  BUG#5390 - problems with merge tables
  After-fix optimizations proposed and finally
  implemented by Monty.

  sql/table.h
    1.31.1.17 06/01/23 19:12:27 ingo@mysql.com +3 -0
    BUG#5390 - problems with merge tables
    After-fix optimizations proposed and finally
    implemented by Monty.
    Additional elements of TABLE.

  sql/lock.cc
    1.38.1.18 06/01/23 19:12:27 ingo@mysql.com +166 -73
    BUG#5390 - problems with merge tables
    After-fix optimizations proposed and finally
    implemented by Monty.
    get_lock_data() gets a flag for storing the lock
    positions in the new TABLE elements.
    mysql_lock_remove() can now remove a lock faster
    and more precisely as it has needed info in TABLE now.
    mysql_unlock_read_tables() and mysql_lock_merge() must 
    now adjust the new elements of TABLE when modifying locks.
    mysql_lock_have_duplicate() can now work faster on
    the existing lock as the positions in the lock
    arrays are known for each table.
    get_lock_data() assigns the new TABLE elements 
    on request of the new flag.

  mysql-test/t/lock.test
    1.7.1.2 06/01/23 19:12:27 ingo@mysql.com +20 -0
    BUG#5390 - problems with merge tables
    After-fix optimizations proposed and finally
    implemented by Monty.
    Additional tests.

  mysql-test/r/lock.result
    1.9.1.2 06/01/23 19:12:27 ingo@mysql.com +11 -0
    BUG#5390 - problems with merge tables
    After-fix optimizations proposed and finally
    implemented by Monty.
    Additional test results.

ChangeSet
  1.1810.1239.1 06/01/10 11:35:21 msvensson@neptunus.(none) +3 -0
  Bug #13228  	open table cache not flushed when table schema changed
   - Close open unused handlers when a schema error occurs.

  mysql-test/t/ndb_alter_table2.test
    1.1 06/01/10 11:35:12 msvensson@neptunus.(none) +83 -0
    New BitKeeper file ``mysql-test/t/ndb_alter_table2.test''

  mysql-test/r/ndb_alter_table2.result
    1.1 06/01/10 11:35:12 msvensson@neptunus.(none) +42 -0
    New BitKeeper file ``mysql-test/r/ndb_alter_table2.result''

  sql/ha_ndbcluster.cc
    1.175.23.1 06/01/10 11:35:12 msvensson@neptunus.(none) +7 -0
    When a schema error occurs call close_cached_tables to close any open unused handlers that has opened this table.

  mysql-test/t/ndb_alter_table2.test
    1.0 06/01/10 11:35:12 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug13228/my50-bug13228_minimal/mysql-test/t/ndb_alter_table2.test

  mysql-test/r/ndb_alter_table2.result
    1.0 06/01/10 11:35:12 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug13228/my50-bug13228_minimal/mysql-test/r/ndb_alter_table2.result

ChangeSet
  1.1810.1176.20 06/01/03 22:07:31 joerg@mysql.com +1 -0
  NDB tools do not accept letters in "NDB_VERSION_BUILD", reduce it to plain "17".

  configure.in
    1.245.41.2 06/01/03 22:06:38 joerg@mysql.com +1 -1
    NDB tools do not accept letters in "NDB_VERSION_BUILD", reduce it to plain "17".

ChangeSet
  1.1810.1176.19 06/01/03 21:04:15 joerg@mysql.com +3 -0
  Copyright string fixes (bug#15974), version fix for 5.0.17a "certified".

  scripts/mysqld_multi.sh
    1.29 06/01/03 20:51:16 joerg@mysql.com +0 -3
    The "mysql_copyright" tool will not change non-C files, so do not mention the license.

  extra/comp_err.c
    1.22 06/01/03 20:51:16 joerg@mysql.com +4 -3
    Ensure that the license spelling is as expected by the "mysql_copyright" tool.

  configure.in
    1.245.41.1 06/01/03 20:51:16 joerg@mysql.com +2 -2
    Change the version identification for the "certified" builds.

ChangeSet
  1.1616.2444.1 05/12/10 18:02:36 holyfoot@deer.(none) +3 -0
  Fix for bug #15225 (ANALYZE temporary has no effect)

  sql/sql_table.cc
    1.157.57.7 05/12/10 18:01:53 holyfoot@mysql.com +9 -4
    we don't need to remove temporary table from the cache,
    but we need to reload it's info

  mysql-test/t/analyze.test
    1.6.1.1 05/12/10 18:01:53 holyfoot@mysql.com +9 -0
    test case added

  mysql-test/r/analyze.result
    1.3.1.1 05/12/10 18:01:53 holyfoot@mysql.com +9 -0
    test result fixed

ChangeSet
  1.1346.856.15 05/11/06 12:35:49 ramil@mysql.com +3 -0
  Fix for bug #13044: BIT_COUNT with NULL values.

  sql/item_func.cc
    1.60.1.53 05/11/06 12:35:46 ramil@mysql.com +1 -4
    Fix for bug #13044: BIT_COUNT with NULL values.
    Always set null_value.

  mysql-test/t/func_op.test
    1.3.1.2 05/11/06 12:35:46 ramil@mysql.com +12 -0
    Fix for bug #13044: BIT_COUNT with NULL values.

  mysql-test/r/func_op.result
    1.5.1.2 05/11/06 12:35:46 ramil@mysql.com +11 -0
    Fix for bug #13044: BIT_COUNT with NULL values.

ChangeSet
  1.1616.2343.1 05/10/05 12:54:04 jimw@mysql.com +1 -0
  In the command-line client, try to abort the current query by issuing a
  KILL command on a second connection when handling Ctrl-C. (WL#2852) 
  
  Based on patch by Harrison Fisk.

  client/mysql.cc
    1.121.15.2 05/10/05 12:54:01 jimw@mysql.com +53 -6
    When a query is executing, handle Ctrl-C by trying to make a second
    connection to the server and issuing a KILL command against the
    original connection.

